diff --git a/.browserslistrc b/.browserslistrc
deleted file mode 100644
index 427441dc93..0000000000
--- a/.browserslistrc
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major versions
-last 2 iOS major versions
-Firefox ESR
-not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
diff --git a/.editorconfig b/.editorconfig
index 15d4c87b14..590d1dea08 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -15,3 +15,6 @@ trim_trailing_whitespace = false
 
 [*.ts]
 quote_type = single
+
+[*.json5]
+ij_json_keep_blank_lines_in_code = 3
diff --git a/.eslintrc.json b/.eslintrc.json
index 6d5aa89db7..cb5775ef1f 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -6,7 +6,12 @@
     "eslint-plugin-import",
     "eslint-plugin-jsdoc",
     "eslint-plugin-deprecation",
-    "eslint-plugin-unused-imports"
+    "unused-imports",
+    "eslint-plugin-lodash",
+    "eslint-plugin-jsonc",
+    "eslint-plugin-rxjs",
+    "eslint-plugin-simple-import-sort",
+    "eslint-plugin-import-newlines"
   ],
   "overrides": [
     {
@@ -25,17 +30,29 @@
         "plugin:@typescript-eslint/recommended",
         "plugin:@typescript-eslint/recommended-requiring-type-checking",
         "plugin:@angular-eslint/recommended",
-        "plugin:@angular-eslint/template/process-inline-templates"
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "plugin:rxjs/recommended"
       ],
       "rules": {
+        "indent": [
+          "error",
+          2,
+          {
+            "SwitchCase": 1
+          }
+        ],
         "max-classes-per-file": [
           "error",
           1
         ],
         "comma-dangle": [
-          "off",
+          "error",
           "always-multiline"
         ],
+        "object-curly-spacing": [
+          "error",
+          "always"
+        ],
         "eol-last": [
           "error",
           "always"
@@ -102,15 +119,13 @@
             "allowTernary": true
           }
         ],
-        "prefer-const": "off",            // todo: re-enable & fix errors (more strict than it used to be in TSLint)
+        "prefer-const": "error",
+        "no-case-declarations": "error",
+        "no-extra-boolean-cast": "error",
         "prefer-spread": "off",
         "no-underscore-dangle": "off",
-
-        // todo: disabled rules from eslint:recommended, consider re-enabling & fixing
         "no-prototype-builtins": "off",
         "no-useless-escape": "off",
-        "no-case-declarations": "off",
-        "no-extra-boolean-cast": "off",
 
         "@angular-eslint/directive-selector": [
           "error",
@@ -181,7 +196,7 @@
         ],
         "@typescript-eslint/type-annotation-spacing": "error",
         "@typescript-eslint/unified-signatures": "error",
-        "@typescript-eslint/ban-types": "warn",  // todo: deal with {} type issues & re-enable
+        "@typescript-eslint/ban-types": "error",
         "@typescript-eslint/no-floating-promises": "warn",
         "@typescript-eslint/no-misused-promises": "warn",
         "@typescript-eslint/restrict-plus-operands": "warn",
@@ -201,8 +216,45 @@
 
         "deprecation/deprecation": "warn",
 
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error",
         "import/order": "off",
-        "import/no-deprecated": "warn"
+        "import/first": "error",
+        "import/newline-after-import": "error",
+        "import/no-duplicates": "error",
+        "import/no-deprecated": "warn",
+        "import/no-namespace": "error",
+        "import-newlines/enforce": [
+          "error",
+          {
+            "items": 1,
+            "semi": true,
+            "forceSingleLine": true
+          }
+        ],
+
+        "unused-imports/no-unused-imports": "error",
+        "lodash/import-scope": [
+          "error",
+          "method"
+        ],
+
+        "rxjs/no-nested-subscribe": "off"     // todo: go over _all_ cases
+      }
+    },
+    {
+      "files": [
+        "*.spec.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "./tsconfig.json",
+          "./cypress/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "rules": {
+        "prefer-const": "off"
       }
     },
     {
@@ -211,11 +263,42 @@
       ],
       "extends": [
         "plugin:@angular-eslint/template/recommended"
+      ]
+    },
+    {
+      "files": [
+        "*.json5"
+      ],
+      "extends": [
+        "plugin:jsonc/recommended-with-jsonc"
       ],
       "rules": {
-        // todo: re-enable & fix errors
-        "@angular-eslint/template/no-negated-async": "off",
-        "@angular-eslint/template/eqeqeq": "off"
+        "no-irregular-whitespace": "error",
+        "no-trailing-spaces": "error",
+        "jsonc/comma-dangle": [
+          "error",
+          "always-multiline"
+        ],
+        "jsonc/indent": [
+          "error",
+          2
+        ],
+        "jsonc/key-spacing": [
+          "error",
+          {
+            "beforeColon": false,
+            "afterColon": true,
+            "mode": "strict"
+          }
+        ],
+        "jsonc/no-dupe-keys": "off",
+        "jsonc/quotes": [
+          "error",
+          "double",
+          {
+            "avoidEscape": false
+          }
+        ]
       }
     }
   ]
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/pull_request_template.md b/.github/pull_request_template.md
index be15b0a507..e50105b879 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,7 +1,7 @@
 ## References
 _Add references/links to any related issues or PRs. These may include:_
-* Fixes #[issue-number]
-* Requires DSpace/DSpace#[pr-number] (if a REST API PR is required to test this)
+* Fixes #`issue-number` (if this fixes an issue ticket)
+* Requires DSpace/DSpace#`pr-number` (if a REST API PR is required to test this)
 
 ## Description
 Short summary of changes (1-2 sentences).
@@ -19,8 +19,10 @@ List of changes in this PR:
 _This checklist provides a reminder of what we are going to look for when reviewing your PR. You need not complete this checklist prior to creating your PR (draft PRs are always welcome). If you are unsure about an item in the checklist, don't hesitate to ask. We're here to help!_
 
 - [ ] My PR is small in size (e.g. less than 1,000 lines of code, not including comments & specs/tests), or I have provided reasons as to why that's not possible.
-- [ ] My PR passes [TSLint](https://palantir.github.io/tslint/) validation using `yarn run lint`
-- [ ] My PR doesn't introduce circular dependencies
+- [ ] My PR passes [ESLint](https://eslint.org/) validation using `yarn lint`
+- [ ] My PR doesn't introduce circular dependencies (verified via `yarn check-circ-deps`)
 - [ ] My PR includes [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. It also includes TypeDoc for large or complex private methods.
 - [ ] My PR passes all specs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
-- [ ] If my PR includes new, third-party dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] If my PR includes new libraries/dependencies (in `package.json`), I've made sure their licenses align with the [DSpace BSD License](https://github.com/DSpace/DSpace/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] If my PR includes new features or configurations, I've provided basic technical documentation in the PR itself.
+- [ ] If my PR fixes an issue ticket, I've [linked them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 04d426d091..52f20470a3 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,34 +6,50 @@ name: Build
 # Run this Build for all pushes / PRs to current branch
 on: [push, pull_request]
 
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
 jobs:
   tests:
     runs-on: ubuntu-latest
     env:
       # The ci step will test the dspace-angular code against DSpace REST.
       # Direct that step to utilize a DSpace REST service that has been started in docker.
-      DSPACE_REST_HOST: localhost
+      # NOTE: These settings should be kept in sync with those in [src]/docker/docker-compose-ci.yml
+      DSPACE_REST_HOST: 127.0.0.1
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: '/server'
       DSPACE_REST_SSL: false
+      # Spin up UI on 127.0.0.1 to avoid host resolution issues in e2e tests with Node 18+
+      DSPACE_UI_HOST: 127.0.0.1
+      DSPACE_UI_PORT: 4000
+      # Ensure all SSR caching is disabled in test environment
+      DSPACE_CACHE_SERVERSIDE_BOTCACHE_MAX: 0
+      DSPACE_CACHE_SERVERSIDE_ANONYMOUSCACHE_MAX: 0
+      # Tell Cypress to run e2e tests using the same UI URL
+      CYPRESS_BASE_URL: http://127.0.0.1:4000
       # When Chrome version is specified, we pin to a specific version of Chrome
       # Comment this out to use the latest release
       #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'
     strategy:
       # Create a matrix of Node versions to test against (in parallel)
       matrix:
-        node-version: [14.x, 16.x]
+        node-version: [16.x, 18.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@v2
+        uses: actions/checkout@v4
 
       # https://github.com/actions/setup-node
       - name: Install Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node-version }}
 
@@ -56,9 +72,9 @@ jobs:
       # https://github.com/actions/cache/blob/main/examples.md#node---yarn
       - name: Get Yarn cache directory
         id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
+        run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
       - name: Cache Yarn dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           # Cache entire Yarn cache directory (see previous step)
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -81,12 +97,16 @@ jobs:
       - name: Run specs (unit tests)
         run: yarn run test:headless
 
+      # Upload code coverage report to artifact (for one version of Node only),
+      # 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
-      # Upload coverage reports to Codecov (for one version of Node only)
-      # https://github.com/codecov/codecov-action
-      - name: Upload coverage to Codecov.io
-        uses: codecov/codecov-action@v2
-        if: matrix.node-version == '16.x'
+      - name: Upload code coverage report to Artifact
+        uses: actions/upload-artifact@v3
+        if: matrix.node-version == '18.x'
+        with:
+          name: dspace-angular coverage report
+          path: 'coverage/dspace-angular/lcov.info'
+          retention-days: 14
 
       # Using docker-compose start backend using CI configuration
       # and load assetstore from a cached copy
@@ -100,23 +120,22 @@ jobs:
       # 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@v2
+        uses: cypress-io/github-action@v6
         with:
-          # Run tests in Chrome, headless mode
+          # Run tests in Chrome, headless mode (default)
           browser: chrome
-          headless: true
           # Start app before running tests (will be stopped automatically after tests finish)
           start: yarn run serve:ssr
           # Wait for backend & frontend to be available
           # NOTE: We use the 'sites' REST endpoint to also ensure the database is ready
-          wait-on: http://localhost:8080/server/api/core/sites, http://localhost:4000
+          wait-on: http://127.0.0.1:8080/server/api/core/sites, http://127.0.0.1:4000
           # Wait for 2 mins max for everything to respond
           wait-on-timeout: 120
 
       # 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@v2
+        uses: actions/upload-artifact@v3
         if: always()
         with:
           name: e2e-test-videos
@@ -125,7 +144,7 @@ jobs:
       # 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@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: e2e-test-screenshots
@@ -144,7 +163,7 @@ jobs:
         run: |
           nohup yarn run serve:ssr &
           printf 'Waiting for app to start'
-          until curl --output /dev/null --silent --head --fail http://localhost:4000/home; do
+          until curl --output /dev/null --silent --head --fail http://127.0.0.1:4000/home; do
             printf '.'
             sleep 2
           done
@@ -155,7 +174,7 @@ jobs:
       # This step also prints entire HTML of homepage for easier debugging if grep fails.
       - name: Verify SSR (server-side rendering)
         run: |
-          result=$(wget -O- -q http://localhost:4000/home)
+          result=$(wget -O- -q http://127.0.0.1:4000/home)
           echo "$result"
           echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep DSpace
 
@@ -164,3 +183,36 @@ jobs:
 
       - name: Shutdown Docker containers
         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.
+  # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
+  codecov:
+    # Must run after 'tests' job above
+    needs: tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # Download artifacts from previous 'tests' job
+      - name: Download coverage artifacts
+        uses: actions/download-artifact@v3
+
+      # 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.
+      #
+      # 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.3.0
+        with:
+          action: codecov/codecov-action@v3
+          # 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
+          # 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
new file mode 100644
index 0000000000..d96e786cc3
--- /dev/null
+++ b/.github/workflows/codescan.yml
@@ -0,0 +1,53 @@
+# DSpace CodeQL code scanning configuration for GitHub
+# https://docs.github.com/en/code-security/code-scanning
+#
+# NOTE: Code scanning must be run separate from our default build.yml
+# because CodeQL requires a fresh build with all tests *disabled*.
+name: "Code Scanning"
+
+# Run this code scan for all pushes / PRs to main or maintenance branches. Also run once a week.
+on:
+  push:
+    branches:
+      - main
+      - 'dspace-**'
+  pull_request:
+    branches:
+      - main
+      - 'dspace-**'
+    # Don't run if PR is only updating static documentation
+    paths-ignore:
+      - '**/*.md'
+      - '**/*.txt'
+  schedule:
+    - cron: "37 0 * * 1"
+
+jobs:
+  analyze:
+    name: Analyze Code
+    runs-on: ubuntu-latest
+    # Limit permissions of this GitHub action. Can only write to security-events
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+      # https://github.com/actions/checkout
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      # https://github.com/github/codeql-action
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: javascript
+
+      # Autobuild attempts to build any compiled languages
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v2
+
+      # Perform GitHub Code Scanning.
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
\ No newline at end of file
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 64303ca8bb..85a7216113 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/main/.github/workflows/reusable-docker-build.yml
+# 
 on:
   push:
     branches:
@@ -12,76 +15,45 @@ on:
       - 'dspace-**'
   pull_request:
 
+permissions:
+  contents: read  #  to fetch code (actions/checkout)
+
 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@main
+    with:
+      build_id: dspace-angular
+      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@v2
-
-      # https://github.com/docker/setup-buildx-action
-      - name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      # 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@v1
-        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@v3
-        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@v2
-        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)
+  #############################################################
+  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@main
+    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 6b9a273ab6..b4436dca3a 100644
--- a/.github/workflows/issue_opened.yml
+++ b/.github/workflows/issue_opened.yml
@@ -5,25 +5,22 @@ on:
   issues:
     types: [opened]
 
+permissions: {}
 jobs:
   automation:
     runs-on: ubuntu-latest
     steps:
     # Add the new issue to a project board, if it needs triage
-    # See https://github.com/marketplace/actions/create-project-card-action
-    - name: Add issue to project board
+    # See https://github.com/actions/add-to-project
+    - name: Add issue to triage board
       # 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: technote-space/create-project-card-action@v1
+      uses: actions/add-to-project@v0.5.0
       # Note, the authentication token below is an ORG level Secret. 
-      # It must be created/recreated manually via a personal access token with "public_repo" and "admin:org" permissions
+      # 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
       # This is necessary because the "DSpace Backlog" project is an org level project (i.e. not repo specific)
       with:
-        GITHUB_TOKEN: ${{ secrets.ORG_PROJECT_TOKEN }}
-        PROJECT: DSpace Backlog
-        COLUMN: Triage
-        CHECK_ORG_PROJECT: true
-      # Ignore errors
-      continue-on-error: true
+        github-token: ${{ secrets.TRIAGE_PROJECT_TOKEN }}
+        project-url: https://github.com/orgs/DSpace/projects/24
diff --git a/.github/workflows/label_merge_conflicts.yml b/.github/workflows/label_merge_conflicts.yml
index dcbab18f1b..ccc6c401c0 100644
--- a/.github/workflows/label_merge_conflicts.yml
+++ b/.github/workflows/label_merge_conflicts.yml
@@ -1,25 +1,39 @@
 # 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
+      - '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:
+    types: [ synchronize ]
+
+permissions: {}
 
 jobs:
   triage:
+    # 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
+    permissions:
+      pull-requests: write
     steps:
-      # See: https://github.com/mschilde/auto-label-merge-conflicts/
+      # See: https://github.com/prince-chrismc/label-merge-conflicts-action
       - name: Auto-label PRs with merge conflicts
-        uses: mschilde/auto-label-merge-conflicts@v2.0
+        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
         with:
-          CONFLICT_LABEL_NAME: 'merge conflict'
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        # Ignore errors
-        continue-on-error: true
+          conflict_label_name: 'merge conflict'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          conflict_comment: |
+            Hi @${author},
+            Conflicts have been detected against the base branch.
+            Please [resolve these conflicts](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/about-merge-conflicts) as soon as you can. Thanks!
\ No newline at end of file
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..f16e81c9fd
--- /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.0.1
diff --git a/.gitignore b/.gitignore
index bdd0d4e589..7d065aca06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,5 @@ package-lock.json
 /nbproject/
 
 junit.xml
+
+/src/mirador-viewer/config.local.js
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000000..4e732302f4
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,46 @@
+# How to Contribute
+
+DSpace is a community built and supported project. We do not have a centralized development or support team, but have a dedicated group of volunteers who help us improve the software, documentation, resources, etc.
+
+* [Contribute new code via a Pull Request](#contribute-new-code-via-a-pull-request)
+* [Contribute documentation](#contribute-documentation)
+* [Help others on mailing lists or Slack](#help-others-on-mailing-lists-or-slack)
+* [Join a working or interest group](#join-a-working-or-interest-group)
+
+## Contribute new code via a Pull Request
+
+We accept [GitHub Pull Requests (PRs)](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork) at any time from anyone.
+Contributors to each release are recognized in our [Release Notes](https://wiki.lyrasis.org/display/DSDOC7x/Release+Notes).
+
+Code Contribution Checklist
+- [ ] PRs _should_ be smaller in size (ideally less than 1,000 lines of code, not including comments & tests)
+- [ ] PRs **must** pass [ESLint](https://eslint.org/) validation using `yarn lint`
+- [ ] PRs **must** not introduce circular dependencies (verified via `yarn check-circ-deps`)
+- [ ] PRs **must** include [TypeDoc](https://typedoc.org/) comments for _all new (or modified) public methods and classes_. Large or complex private methods should also have TypeDoc.
+- [ ] PRs **must** pass all automated pecs/tests and includes new/updated specs or tests based on the [Code Testing Guide](https://wiki.lyrasis.org/display/DSPACE/Code+Testing+Guide).
+- [ ] If a PR includes new libraries/dependencies (in `package.json`), then their software licenses **must** align with the [DSpace BSD License](https://github.com/DSpace/dspace-angular/blob/main/LICENSE) based on the [Licensing of Contributions](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines#CodeContributionGuidelines-LicensingofContributions) documentation.
+- [ ] Basic technical documentation _should_ be provided for any new features or configuration, either in the PR itself or in the DSpace Wiki documentation.
+- [ ] If a PR fixes an issue ticket, please [link them together](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+Additional details on the code contribution process can be found in our [Code Contribution Guidelines](https://wiki.lyrasis.org/display/DSPACE/Code+Contribution+Guidelines)
+
+## Contribute documentation
+
+DSpace Documentation is a collaborative effort in a shared Wiki. The latest documentation is at https://wiki.lyrasis.org/display/DSDOC7x 
+
+If you find areas of the DSpace Documentation which you wish to improve, please request a Wiki account by emailing wikihelp@lyrasis.org.
+Once you have an account setup, contact @tdonohue (via [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) or email) for access to edit our Documentation.
+
+## Help others on mailing lists or Slack
+
+DSpace has our own [Slack](https://wiki.lyrasis.org/display/DSPACE/Slack) community and [Mailing Lists](https://wiki.lyrasis.org/display/DSPACE/Mailing+Lists) where discussions take place and questions are answered.
+Anyone is welcome to join and help others. We just ask you to follow our [Code of Conduct](https://www.lyrasis.org/about/Pages/Code-of-Conduct.aspx) (adopted via LYRASIS).
+
+## Join a working or interest group
+
+Most of the work in building/improving DSpace comes via [Working Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Working+Groups) or [Interest Groups](https://wiki.lyrasis.org/display/DSPACE/DSpace+Interest+Groups).
+
+All working/interest groups are open to anyone to join and participate.  A few key groups to be aware of include:
+
+* [DSpace 7 Working Group](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+Working+Group) - This is the main (mostly volunteer) development team. We meet weekly to review our current development [project board](https://github.com/orgs/DSpace/projects), assigning tickets and/or PRs.
+* [DSpace Community Advisory Team (DCAT)](https://wiki.lyrasis.org/display/cmtygp/DSpace+Community+Advisory+Team) - This is an interest group for repository managers/administrators. We meet monthly to discuss DSpace, share tips & provide feedback back to developers.
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index a7c1640d0b..8fac7495e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,12 @@
 # This image will be published as dspace/dspace-angular
 # See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
 
-FROM node:14-alpine
+FROM node:18-alpine
+
+# Ensure Python and other build tools are available
+# These are needed to install some node modules, especially on linux/arm64
+RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+
 WORKDIR /app
 ADD . /app/
 EXPOSE 4000
@@ -10,8 +15,14 @@ EXPOSE 4000
 # See, for example https://github.com/yarnpkg/yarn/issues/5540
 RUN yarn install --network-timeout 300000
 
+# When running in dev mode, 4GB of memory is required to build & launch the app.
+# This default setting can be overridden as needed in your shell, via an env file or in docker-compose.
+# See Docker environment var precedence: https://docs.docker.com/compose/environment-variables/envvars-precedence/
+ENV NODE_OPTIONS="--max_old_space_size=4096"
+
 # On startup, run in DEVELOPMENT mode (this defaults to live reloading enabled, etc).
 # 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 IP. See https://github.com/DSpace/dspace-angular/issues/1485
+# if you have a public URL. See https://github.com/DSpace/dspace-angular/issues/1485
+ENV NODE_ENV development
 CMD yarn serve --host 0.0.0.0
diff --git a/Dockerfile.dist b/Dockerfile.dist
new file mode 100644
index 0000000000..e4b467ae26
--- /dev/null
+++ b/Dockerfile.dist
@@ -0,0 +1,31 @@
+# This image will be published as dspace/dspace-angular:$DSPACE_VERSION-dist
+# See https://github.com/DSpace/dspace-angular/tree/main/docker for usage details
+
+# Test build:
+# docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
+
+FROM 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
+RUN apk add --update python3 make g++ && rm -rf /var/cache/apk/*
+
+WORKDIR /app
+COPY package.json yarn.lock ./
+RUN yarn install --network-timeout 300000
+
+ADD . /app/
+RUN yarn build:prod
+
+FROM node:18-alpine
+RUN npm install --global pm2
+
+COPY --chown=node:node --from=build /app/dist /app/dist
+COPY --chown=node:node config /app/config
+COPY --chown=node:node docker/dspace-ui.json /app/dspace-ui.json
+
+WORKDIR /app
+USER node
+ENV NODE_ENV production
+EXPOSE 4000
+CMD pm2-runtime start dspace-ui.json --json
diff --git a/README.md b/README.md
index 837cb48004..ebc24f8b91 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ https://wiki.lyrasis.org/display/DSDOC7x/Installing+DSpace
 Quick start
 -----------
 
-**Ensure you're running [Node](https://nodejs.org) `v14.x` or `v16.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
+**Ensure you're running [Node](https://nodejs.org) `v16.x` or `v18.x`, [npm](https://www.npmjs.com/) >= `v5.x` and [yarn](https://yarnpkg.com) == `v1.x`**
 
 ```bash
 # clone the repo
@@ -90,7 +90,7 @@ Requirements
 ------------
 
 -	[Node.js](https://nodejs.org) and [yarn](https://yarnpkg.com)
--	Ensure you're running node `v14.x` or `v16.x` and yarn == `v1.x`
+-	Ensure you're running node `v16.x` or `v18.x` and yarn == `v1.x`
 
 If you have [`nvm`](https://github.com/creationix/nvm#install-script) or [`nvm-windows`](https://github.com/coreybutler/nvm-windows) installed, which is highly recommended, you can run `nvm install --lts && nvm use` to install and start using the latest Node LTS.
 
@@ -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:
        ```
@@ -351,7 +351,7 @@ Documentation
 
 Official DSpace documentation is available in the DSpace wiki at https://wiki.lyrasis.org/display/DSDOC7x/
 
-Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of htis codebase.
+Some UI specific configuration documentation is also found in the [`./docs`](docs) folder of this codebase.
 
 ### Building code documentation
 
@@ -379,10 +379,10 @@ To get the most out of TypeScript, you'll need a TypeScript-aware editor. We've
 	-	[Sublime Text](http://www.sublimetext.com/3)
 		-	[Typescript-Sublime-Plugin](https://github.com/Microsoft/Typescript-Sublime-plugin#installation)
 
-Collaborating
+Contributing
 -------------
 
-See [the guide on the wiki](https://wiki.lyrasis.org/display/DSPACE/DSpace+7+-+Angular+UI+Development#DSpace7-AngularUIDevelopment-Howtocontribute)
+See [Contributing documentation](CONTRIBUTING.md)
 
 File Structure
 --------------
@@ -413,8 +413,7 @@ dspace-angular
 │   ├── merge-i18n-files.ts                             *
 │   ├── serve.ts                                        *
 │   ├── sync-i18n-files.ts                              *
-│   ├── test-rest.ts                                    *
-│   └── webpack.js                                      *
+│   └── test-rest.ts                                    *
 ├── src                                                 * The source of the application
 │   ├── app                                             * The source code of the application, subdivided by module/page.
 │   ├── assets                                          * Folder for static resources
diff --git a/angular.json b/angular.json
index 2ece0c5e7d..5e597d4d30 100644
--- a/angular.json
+++ b/angular.json
@@ -25,12 +25,10 @@
               }
             },
             "allowedCommonJsDependencies": [
-              "angular2-text-mask",
               "cerialize",
               "core-js",
               "lodash",
               "jwt-decode",
-              "url-parse",
               "uuid",
               "webfontloader",
               "zone.js"
@@ -268,16 +266,26 @@
           "options": {
             "lintFilePatterns": [
               "src/**/*.ts",
-              "src/**/*.html"
+              "src/**/*.html",
+              "src/**/*.json5"
             ]
           }
         }
       }
     }
   },
-  "defaultProject": "dspace-angular",
   "cli": {
     "analytics": false,
-    "defaultCollection": "@angular-eslint/schematics"
+    "schematicCollections": [
+      "@angular-eslint/schematics"
+    ]
+  },
+  "schematics": {
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
+    }
   }
 }
diff --git a/config/config.example.yml b/config/config.example.yml
index 27400f0041..36d6a009d3 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -22,7 +22,7 @@ ui:
 # 'synced' with the 'dspace.server.url' setting in your backend's local.cfg.
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: sandbox.dspace.org
   port: 443
   # NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
   nameSpace: /server
@@ -32,12 +32,60 @@ cache:
   # NOTE: how long should objects be cached for by default
   msToLive:
     default: 900000 # 15 minutes
-  control: max-age=60 # revalidate browser
+  # Default 'Cache-Control' HTTP Header to set for all static content (including compiled *.js files)
+  # Defaults to max-age=604,800 seconds (one week). This lets a user's browser know that it can cache these
+  # files for one week, after which they will be "stale" and need to be redownloaded.
+  # NOTE: When updates are made to compiled *.js files, it will automatically bypass this browser cache, because
+  # all compiled *.js files include a unique hash in their name which updates when content is modified.
+  control: max-age=604800 # revalidate browser
   autoSync:
     defaultTime: 0
     maxBufferSize: 100
     timePerMethod:
       PATCH: 3 # time in seconds
+  # In-memory cache(s) of server-side rendered pages. These caches will store the most recently accessed public pages.
+  # Pages are automatically added/dropped from these caches based on how recently they have been used.
+  # Restarting the app clears all page caches.
+  # NOTE: To control the cache size, use the "max" setting. Keep in mind, individual cached pages are usually small (<100KB).
+  # Enabling *both* caches will mean that a page may be cached twice, once in each cache (but may expire at different times via timeToLive).
+  serverSide:
+    # Set to true to see all cache hits/misses/refreshes in your console logs. Useful for debugging SSR caching issues.
+    debug: false
+    # When enabled (i.e. max > 0), known bots will be sent pages from a server side cache specific for bots.
+    # (Keep in mind, bot detection cannot be guarranteed. It is possible some bots will bypass this cache.)
+    botCache:
+      # Maximum number of pages to cache for known bots. Set to zero (0) to disable server side caching for bots.
+      # Default is 1000, which means the 1000 most recently accessed public pages will be cached.
+      # As all pages are cached in server memory, increasing this value will increase memory needs.
+      # Individual cached pages are usually small (<100KB), so max=1000 should only require ~100MB of memory.
+      max: 1000
+      # 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.
+      # NOTE: For the bot cache, this setting may impact how quickly search engine bots will index new content on your site.
+      # For example, setting this to one week may mean that search engine bots may not find all new content for one week.
+      timeToLive: 86400000 # 1 day
+      # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+      # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+      # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+      # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+      allowStale: true
+    # When enabled (i.e. max > 0), all anonymous users will be sent pages from a server side cache.
+    # This allows anonymous users to interact more quickly with the site, but also means they may see slightly
+    # outdated content (based on timeToLive)
+    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.
+      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.
+      # NOTE: For the anonymous cache, it is recommended to keep this value low to avoid anonymous users seeing outdated content.
+      timeToLive: 10000 # 10 seconds
+      # When set to true, after timeToLive expires, the next request will receive the *cached* page & then re-render the page
+      # behind the scenes to update the cache. This ensures users primarily interact with the cache, but may receive stale pages (older than timeToLive).
+      # When set to false, after timeToLive expires, the next request will wait on SSR to complete & receive a fresh page (which is then saved to cache).
+      # This ensures stale pages (older than timeToLive) are never returned from the cache, but some users will wait on SSR.
+      allowStale: true
 
 # Authentication settings
 auth:
@@ -55,6 +103,8 @@ auth:
 
 # Form settings
 form:
+  # Sets the spellcheck textarea attribute value
+  spellCheck: true
   # NOTE: Map server-side validators to comparative Angular form validators
   validatorMap:
     required: required
@@ -81,12 +131,16 @@ submission:
     # NOTE: after how many time (milliseconds) submission is saved automatically
     # eg. timer: 5 * (1000 * 60); // 5 minutes
     timer: 0
+  # Always show the duplicate detection section if enabled, even if there are no potential duplicates detected
+  # (a message will be displayed to indicate no matches were found)
+  duplicateDetection:
+    alwaysShowSection: false
   icons:
     metadata:
       # NOTE: example of configuration
       #   # NOTE: metadata name
       # - name: dc.author
-      #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+      #   # NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
       #   style: fas fa-user
       - name: dc.author
         style: fas fa-user
@@ -97,18 +151,40 @@ submission:
       confidence:
         # NOTE: example of configuration
         #   # NOTE: confidence value
-        # - name: dc.author
-        #   # NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
-        #   style: fa-user
+        # - value: 600
+        #   # NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
+        #   style: text-success
+        #   icon: fa-circle-check
+        #   # NOTE: the class configured in property style is used by default, the icon property could be used in component
+        #           configured to use a 'icon mode' display (mainly in edit-item page)
         - value: 600
           style: text-success
+          icon: fa-circle-check
         - value: 500
           style: text-info
+          icon: fa-gear
         - value: 400
           style: text-warning
+          icon: fa-circle-question
+        - value: 300
+          style: text-muted
+          icon: fa-thumbs-down
+        - value: 200
+          style: text-muted
+          icon: fa-circle-exclamation
+        - value: 100
+          style: text-muted
+          icon: fa-circle-stop
+        - value: 0
+          style: text-muted
+          icon: fa-ban
+        - value: -1
+          style: text-muted
+          icon: fa-circle-xmark
         # default configuration
         - value: default
           style: text-muted
+          icon: fa-circle-xmark
 
 #  Default Language in which the UI will be rendered if the user's browser language is not an active language
 defaultLanguage: en
@@ -119,6 +195,9 @@ languages:
   - code: en
     label: English
     active: true
+  - code: ca
+    label: Català
+    active: true
   - code: cs
     label: Čeština
     active: true
@@ -134,6 +213,9 @@ languages:
   - code: gd
     label: Gàidhlig
     active: true
+  - code: it
+    label: Italiano
+    active: true
   - code: lv
     label: Latviešu
     active: true
@@ -143,12 +225,18 @@ languages:
   - 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: sr-lat
+    label: Srpski (lat)
+    active: true
   - code: fi
     label: Suomi
     active: true
@@ -158,6 +246,9 @@ languages:
   - code: tr
     label: Türkçe
     active: true
+  - code: vi
+    label: Tiếng Việt
+    active: true
   - code: kk
     label: Қазақ
     active: true
@@ -170,6 +261,13 @@ languages:
   - code: el
     label: Ελληνικά
     active: true
+  - code: sr-cyr
+    label: Српски
+    active: true
+  - code: uk
+    label: Yкраї́нська
+    active: true
+
 
 # Browse-By Pages
 browseBy:
@@ -200,6 +298,8 @@ homePage:
     # No. of communities to list per page on the home page
     # This will always round to the nearest number from the list of page sizes. e.g. if you set it to 7 it'll use 10
     pageSize: 5
+  # Enable or disable the Discover filters on the homepage
+  showDiscoverFilters: false
 
 # Item Config
 item:
@@ -207,9 +307,23 @@ item:
     undoTimeout: 10000 # 10 seconds
   # Show the item access status label in items lists
   showAccessStatuses: false
+  bitstream:
+    # Number of entries in the bitstream list in the item view page.
+    # Rounded to the nearest size in the list of selectable sizes on the
+    # settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
+    pageSize: 5
+
+# Community Page Config
+community:
+  # Search tab config
+  searchSection:
+    showSidebar: true
 
 # Collection Page Config
 collection:
+  # Search tab config
+  searchSection:
+    showSidebar: true
   edit:
     undoTimeout: 10000 # 10 seconds
 
@@ -221,33 +335,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
@@ -295,4 +409,89 @@ info:
 # display in supported metadata fields. By default, only dc.description.abstract is supported.
 markdown:
   enabled: false
-  mathjax: false
\ No newline at end of file
+  mathjax: false
+
+# Which vocabularies should be used for which search filters
+# and whether to show the filter in the search sidebar
+# Take a look at the filter-vocabulary-config.ts file for documentation on how the options are obtained
+vocabularies:
+  - filter: 'subject'
+    vocabulary: 'srsc'
+    enabled: true
+
+# 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'
+
+# Example of fallback collection for suggestions import
+# suggestion:
+  # - collectionId: 8f7df5ca-f9c2-47a4-81ec-8a6393d6e5af
+    # source: "openaire"
+
+
+# Search settings
+search:
+  # Settings to enable/disable or configure advanced search filters.
+  advancedFilters:
+    enabled: false
+    # List of filters to enable in "Advanced Search" dropdown
+    filter: [ 'title', 'author', 'subject', 'entityType' ]
+
+
+# Notify metrics
+# Configuration for Notify Admin Dashboard for metrics visualization
+notifyMetrics:
+  # Configuration for received messages
+- title: 'admin-notify-dashboard.received-ldn'
+  boxes:
+  - color: '#B8DAFF'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.accepted'
+    config: 'NOTIFY.incoming.accepted'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description'
+  - color: '#D4EDDA'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.processed'
+    config: 'NOTIFY.incoming.processed'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description'
+  - color: '#FDBBC7'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.failure'
+    config: 'NOTIFY.incoming.failure'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description'
+  - color: '#FDBBC7'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted'
+    config: 'NOTIFY.incoming.untrusted'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description'
+  - color: '#43515F'
+    title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems'
+    textColor: '#fff'
+    config: 'NOTIFY.incoming.involvedItems'
+    description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description'
+# Configuration for outgoing messages
+- title: 'admin-notify-dashboard.generated-ldn'
+  boxes:
+  - color: '#B8DAFF'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.queued'
+    config: 'NOTIFY.outgoing.queued'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description'
+  - color: '#FDEEBB'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry'
+    config: 'NOTIFY.outgoing.queued_for_retry'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description'
+  - color: '#FDBBC7'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.failure'
+    config: 'NOTIFY.outgoing.failure'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description'
+  - color: '#43515F'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems'
+    textColor: '#fff'
+    config: 'NOTIFY.outgoing.involvedItems'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description'
+  - color: '#D4EDDA'
+    title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered'
+    config: 'NOTIFY.outgoing.delivered'
+    description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description'
+
+
+
+
+
diff --git a/config/config.yml b/config/config.yml
index b5eecd112f..109db60ca9 100644
--- a/config/config.yml
+++ b/config/config.yml
@@ -1,5 +1,5 @@
 rest:
   ssl: true
-  host: api7.dspace.org
+  host: sandbox.dspace.org
   port: 443
   nameSpace: /server
diff --git a/cypress.config.ts b/cypress.config.ts
new file mode 100644
index 0000000000..458b035a48
--- /dev/null
+++ b/cypress.config.ts
@@ -0,0 +1,47 @@
+import { defineConfig } from 'cypress';
+
+export default defineConfig({
+  videosFolder: 'cypress/videos',
+  screenshotsFolder: 'cypress/screenshots',
+  fixturesFolder: 'cypress/fixtures',
+  retries: {
+    runMode: 2,
+    openMode: 0,
+  },
+  env: {
+    // 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_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: '6160810f-1e53-40db-81ef-f6621a727398',
+    // Search term (should return results) used in search tests
+    DSPACE_TEST_SEARCH_TERM: 'test',
+    // 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',
+  },
+  e2e: {
+    // Setup our plugins for e2e tests
+    setupNodeEvents(on, config) {
+      return require('./cypress/plugins/index.ts')(on, config);
+    },
+    // This is the base URL that Cypress will run all tests against
+    // It can be overridden via the CYPRESS_BASE_URL environment variable
+    // (By default we set this to a value which should work in most development environments)
+    baseUrl: 'http://localhost:4000',
+  },
+});
diff --git a/cypress.json b/cypress.json
deleted file mode 100644
index 80358eb6dd..0000000000
--- a/cypress.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "integrationFolder": "cypress/integration",
-  "supportFile": "cypress/support/index.ts",
-  "videosFolder": "cypress/videos",
-  "screenshotsFolder": "cypress/screenshots",
-  "pluginsFile": "cypress/plugins/index.ts",
-  "fixturesFolder": "cypress/fixtures",
-  "baseUrl": "http://localhost:4000",
-  "retries":  {
-    "runMode": 2,
-    "openMode": 0
-  },
-  "env": {
-    "DSPACE_TEST_ADMIN_USER": "dspacedemo+admin@gmail.com",
-    "DSPACE_TEST_ADMIN_PASSWORD": "dspace",
-    "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_SEARCH_TERM": "test",
-    "DSPACE_TEST_SUBMIT_COLLECTION_NAME": "Sample Collection",
-    "DSPACE_TEST_SUBMIT_COLLECTION_UUID": "9d8334e9-25d3-4a67-9cea-3dffdef80144",
-    "DSPACE_TEST_SUBMIT_USER": "dspacedemo+submit@gmail.com",
-    "DSPACE_TEST_SUBMIT_USER_PASSWORD": "dspace"
-  }
-}
\ No newline at end of file
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/integration/breadcrumbs.spec.ts b/cypress/e2e/breadcrumbs.cy.ts
similarity index 75%
rename from cypress/integration/breadcrumbs.spec.ts
rename to cypress/e2e/breadcrumbs.cy.ts
index 62b9a8ad1d..0cddbc723c 100644
--- a/cypress/integration/breadcrumbs.spec.ts
+++ b/cypress/e2e/breadcrumbs.cy.ts
@@ -1,10 +1,9 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
 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/' + 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/integration/browse-by-author.spec.ts b/cypress/e2e/browse-by-author.cy.ts
similarity index 73%
rename from cypress/integration/browse-by-author.spec.ts
rename to cypress/e2e/browse-by-author.cy.ts
index 07c20ad7c9..32c470231d 100644
--- a/cypress/integration/browse-by-author.spec.ts
+++ b/cypress/e2e/browse-by-author.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Author', () => {
         cy.visit('/browse/author');
 
         // Wait for <ds-browse-by-metadata-page> to be visible
-        cy.get('ds-browse-by-metadata-page').should('be.visible');
+        cy.get('ds-browse-by-metadata').should('be.visible');
 
         // Analyze <ds-browse-by-metadata-page> for accessibility
-        testA11y('ds-browse-by-metadata-page');
+        testA11y('ds-browse-by-metadata');
     });
 });
diff --git a/cypress/integration/browse-by-dateissued.spec.ts b/cypress/e2e/browse-by-dateissued.cy.ts
similarity index 74%
rename from cypress/integration/browse-by-dateissued.spec.ts
rename to cypress/e2e/browse-by-dateissued.cy.ts
index 4d22420227..7966f1c82e 100644
--- a/cypress/integration/browse-by-dateissued.spec.ts
+++ b/cypress/e2e/browse-by-dateissued.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Date Issued', () => {
         cy.visit('/browse/dateissued');
 
         // Wait for <ds-browse-by-date-page> to be visible
-        cy.get('ds-browse-by-date-page').should('be.visible');
+        cy.get('ds-browse-by-date').should('be.visible');
 
         // Analyze <ds-browse-by-date-page> for accessibility
-        testA11y('ds-browse-by-date-page');
+        testA11y('ds-browse-by-date');
     });
 });
diff --git a/cypress/integration/browse-by-subject.spec.ts b/cypress/e2e/browse-by-subject.cy.ts
similarity index 73%
rename from cypress/integration/browse-by-subject.spec.ts
rename to cypress/e2e/browse-by-subject.cy.ts
index 89b791f03c..57ca88d103 100644
--- a/cypress/integration/browse-by-subject.spec.ts
+++ b/cypress/e2e/browse-by-subject.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Subject', () => {
         cy.visit('/browse/subject');
 
         // Wait for <ds-browse-by-metadata-page> to be visible
-        cy.get('ds-browse-by-metadata-page').should('be.visible');
+        cy.get('ds-browse-by-metadata').should('be.visible');
 
         // Analyze <ds-browse-by-metadata-page> for accessibility
-        testA11y('ds-browse-by-metadata-page');
+        testA11y('ds-browse-by-metadata');
     });
 });
diff --git a/cypress/integration/browse-by-title.spec.ts b/cypress/e2e/browse-by-title.cy.ts
similarity index 73%
rename from cypress/integration/browse-by-title.spec.ts
rename to cypress/e2e/browse-by-title.cy.ts
index e4e027586a..09195c30df 100644
--- a/cypress/integration/browse-by-title.spec.ts
+++ b/cypress/e2e/browse-by-title.cy.ts
@@ -5,9 +5,9 @@ describe('Browse By Title', () => {
         cy.visit('/browse/title');
 
         // Wait for <ds-browse-by-title-page> to be visible
-        cy.get('ds-browse-by-title-page').should('be.visible');
+        cy.get('ds-browse-by-title').should('be.visible');
 
         // Analyze <ds-browse-by-title-page> for accessibility
-        testA11y('ds-browse-by-title-page');
+        testA11y('ds-browse-by-title');
     });
 });
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/integration/collection-page.spec.ts b/cypress/e2e/collection-page.cy.ts
similarity index 66%
rename from cypress/integration/collection-page.spec.ts
rename to cypress/e2e/collection-page.cy.ts
index a0140d8faf..55c10cc6e2 100644
--- a/cypress/integration/collection-page.spec.ts
+++ b/cypress/e2e/collection-page.cy.ts
@@ -1,13 +1,12 @@
-import { TEST_COLLECTION } from 'cypress/support';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Collection Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/collections/' + TEST_COLLECTION);
+        cy.visit('/collections/'.concat(Cypress.env('DSPACE_TEST_COLLECTION')));
 
         // <ds-collection-page> tag must be loaded
-        cy.get('ds-collection-page').should('exist');
+        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
new file mode 100644
index 0000000000..a08f8cb198
--- /dev/null
+++ b/cypress/e2e/collection-statistics.cy.ts
@@ -0,0 +1,37 @@
+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(Cypress.env('DSPACE_TEST_COLLECTION'));
+
+    it('should load if you click on "Statistics" from a Collection page', () => {
+        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);
+    });
+
+    it('should contain a "Total visits" section', () => {
+        cy.visit(COLLECTIONSTATISTICSPAGE);
+        cy.get('table[data-test="TotalVisits"]').should('be.visible');
+    });
+
+    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(Cypress.env('DSPACE_TEST_COLLECTION')).concat('_TotalVisitsPerMonth')).should('exist');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(COLLECTIONSTATISTICSPAGE);
+
+        // <ds-collection-statistics-page> tag must be loaded
+        cy.get('ds-collection-statistics-page').should('be.visible');
+
+        // Verify / wait until "Total Visits" table's label is non-empty
+        // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
+        cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').contains(REGEX_MATCH_NON_EMPTY_TEXT);
+
+        // Analyze <ds-collection-statistics-page> for accessibility issues
+        testA11y('ds-collection-statistics-page');
+    });
+});
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
new file mode 100644
index 0000000000..c371f6ceae
--- /dev/null
+++ b/cypress/e2e/community-list.cy.ts
@@ -0,0 +1,17 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Community List Page', () => {
+
+    it('should pass accessibility tests', () => {
+        cy.visit('/community-list');
+
+        // <ds-community-list-page> tag must be loaded
+        cy.get('ds-community-list-page').should('be.visible');
+
+        // Open every expand button on page, so that we can scan sub-elements as well
+        cy.get('[data-test="expand-button"]').click({ multiple: true });
+
+        // Analyze <ds-community-list-page> for accessibility issues
+        testA11y('ds-community-list-page');
+    });
+});
diff --git a/cypress/integration/community-page.spec.ts b/cypress/e2e/community-page.cy.ts
similarity index 57%
rename from cypress/integration/community-page.spec.ts
rename to cypress/e2e/community-page.cy.ts
index 79e21431ad..386bb592a0 100644
--- a/cypress/integration/community-page.spec.ts
+++ b/cypress/e2e/community-page.cy.ts
@@ -1,15 +1,14 @@
-import { TEST_COMMUNITY } from 'cypress/support';
 import { testA11y } from 'cypress/support/utils';
 
 describe('Community Page', () => {
 
     it('should pass accessibility tests', () => {
-        cy.visit('/communities/' + TEST_COMMUNITY);
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
 
         // <ds-community-page> tag must be loaded
-        cy.get('ds-community-page').should('exist');
+        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
new file mode 100644
index 0000000000..6cafed0350
--- /dev/null
+++ b/cypress/e2e/community-statistics.cy.ts
@@ -0,0 +1,37 @@
+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(Cypress.env('DSPACE_TEST_COMMUNITY'));
+
+    it('should load if you click on "Statistics" from a Community page', () => {
+        cy.visit('/communities/'.concat(Cypress.env('DSPACE_TEST_COMMUNITY')));
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
+        cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
+    });
+
+    it('should contain a "Total visits" section', () => {
+        cy.visit(COMMUNITYSTATISTICSPAGE);
+        cy.get('table[data-test="TotalVisits"]').should('be.visible');
+    });
+
+    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(Cypress.env('DSPACE_TEST_COMMUNITY')).concat('_TotalVisitsPerMonth')).should('exist');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(COMMUNITYSTATISTICSPAGE);
+
+        // <ds-community-statistics-page> tag must be loaded
+        cy.get('ds-community-statistics-page').should('be.visible');
+
+        // Verify / wait until "Total Visits" table's label is non-empty
+        // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
+        cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').contains(REGEX_MATCH_NON_EMPTY_TEXT);
+
+        // Analyze <ds-community-statistics-page> for accessibility issues
+        testA11y('ds-community-statistics-page');
+    });
+});
diff --git a/cypress/integration/footer.spec.ts b/cypress/e2e/footer.cy.ts
similarity index 100%
rename from cypress/integration/footer.spec.ts
rename to cypress/e2e/footer.cy.ts
diff --git a/cypress/e2e/header.cy.ts b/cypress/e2e/header.cy.ts
new file mode 100644
index 0000000000..9852216e43
--- /dev/null
+++ b/cypress/e2e/header.cy.ts
@@ -0,0 +1,13 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Header', () => {
+    it('should pass accessibility tests', () => {
+        cy.visit('/');
+
+        // Header must first be visible
+        cy.get('ds-header').should('be.visible');
+
+        // Analyze <ds-header> for accessibility
+        testA11y('ds-header');
+    });
+});
diff --git a/cypress/e2e/homepage-statistics.cy.ts b/cypress/e2e/homepage-statistics.cy.ts
new file mode 100644
index 0000000000..ece38686b9
--- /dev/null
+++ b/cypress/e2e/homepage-statistics.cy.ts
@@ -0,0 +1,31 @@
+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[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(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+        cy.generateViewEvent(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'), 'item');
+
+        cy.visit('/statistics');
+
+        // <ds-site-statistics-page> tag must be visable
+        cy.get('ds-site-statistics-page').should('be.visible');
+
+        // Verify / wait until "Total Visits" table's *last* label is non-empty
+        // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
+        cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').last().contains(REGEX_MATCH_NON_EMPTY_TEXT);
+        // Wait an extra 500ms, just so all entries in Total Visits have loaded.
+        cy.wait(500);
+
+        // Analyze <ds-site-statistics-page> for accessibility issues
+        testA11y('ds-site-statistics-page');
+    });
+});
diff --git a/cypress/integration/homepage.spec.ts b/cypress/e2e/homepage.cy.ts
similarity index 85%
rename from cypress/integration/homepage.spec.ts
rename to cypress/e2e/homepage.cy.ts
index 8fdf61dbf7..a387c31a2a 100644
--- a/cypress/integration/homepage.spec.ts
+++ b/cypress/e2e/homepage.cy.ts
@@ -6,8 +6,8 @@ describe('Homepage', () => {
     cy.visit('/');
   });
 
-  it('should display translated title "DSpace Angular :: Home"', () => {
-    cy.title().should('eq', 'DSpace Angular :: Home');
+  it('should display translated title "DSpace Repository :: Home"', () => {
+    cy.title().should('eq', 'DSpace Repository :: Home');
   });
 
   it('should contain a news section', () => {
diff --git a/cypress/e2e/item-edit.cy.ts b/cypress/e2e/item-edit.cy.ts
new file mode 100644
index 0000000000..b4c01a1a94
--- /dev/null
+++ b/cypress/e2e/item-edit.cy.ts
@@ -0,0 +1,135 @@
+import { Options } from 'cypress-axe';
+import { testA11y } from 'cypress/support/utils';
+
+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"]').click();
+
+        // <ds-edit-item-page> tag must be loaded
+        cy.get('ds-edit-item-page').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"]').click();
+
+        // <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"]').click();
+
+        // <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"]').click();
+
+        // <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"]').click();
+
+        // <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"]').click();
+
+        // <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"]').click();
+
+        // <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"]').click();
+
+        // <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
new file mode 100644
index 0000000000..a6a208e9f4
--- /dev/null
+++ b/cypress/e2e/item-page.cy.ts
@@ -0,0 +1,32 @@
+import { testA11y } from 'cypress/support/utils';
+
+describe('Item  Page', () => {
+    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.location('pathname').should('eq', ENTITYPAGE);
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(ENTITYPAGE);
+
+        // <ds-item-page> tag must be loaded
+        cy.get('ds-item-page').should('be.visible');
+
+        // Analyze <ds-item-page> for accessibility issues
+        testA11y('ds-item-page');
+    });
+
+    it('should pass accessibility tests on full item page', () => {
+        cy.visit(ENTITYPAGE + '/full');
+
+        // <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
new file mode 100644
index 0000000000..6caeacae8e
--- /dev/null
+++ b/cypress/e2e/item-statistics.cy.ts
@@ -0,0 +1,43 @@
+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(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'));
+
+    it('should load if you click on "Statistics" from an Item/Entity page', () => {
+        cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')));
+        cy.get('ds-navbar ds-link-menu-item a[data-test="link-menu-item.menu.section.statistics"]').click();
+        cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
+    });
+
+    it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+        cy.get('ds-item-statistics-page').should('be.visible');
+        cy.get('ds-item-page').should('not.exist');
+    });
+
+    it('should contain a "Total visits" section', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+        cy.get('table[data-test="TotalVisits"]').should('be.visible');
+    });
+
+    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(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION')).concat('_TotalVisitsPerMonth')).should('exist');
+    });
+
+    it('should pass accessibility tests', () => {
+        cy.visit(ITEMSTATISTICSPAGE);
+
+        // <ds-item-statistics-page> tag must be loaded
+        cy.get('ds-item-statistics-page').should('be.visible');
+
+        // Verify / wait until "Total Visits" table's label is non-empty
+        // (This table loads these labels asynchronously, so we want to wait for them before analyzing page)
+        cy.get('table[data-test="TotalVisits"] th[data-test="statistics-label"]').contains(REGEX_MATCH_NON_EMPTY_TEXT);
+
+        // Analyze <ds-item-statistics-page> for accessibility issues
+        testA11y('ds-item-statistics-page');
+    });
+});
diff --git a/cypress/integration/login-modal.spec.ts b/cypress/e2e/login-modal.cy.ts
similarity index 62%
rename from cypress/integration/login-modal.spec.ts
rename to cypress/e2e/login-modal.cy.ts
index fece28b425..673041e9f3 100644
--- a/cypress/integration/login-modal.spec.ts
+++ b/cypress/e2e/login-modal.cy.ts
@@ -1,33 +1,33 @@
-import { TEST_ADMIN_PASSWORD, TEST_ADMIN_USER, TEST_ENTITY_PUBLICATION } from 'cypress/support';
+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();
+        cy.get('ds-themed-header [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();
+        cy.get('ds-themed-header [data-test="user-menu"]').click();
     },
     submitLoginAndPasswordByPressingButton(email, password) {
         // Enter email
-        cy.get('ds-themed-navbar [data-test="email"]').type(email);
+        cy.get('ds-themed-header [data-test="email"]').type(email);
         // Enter password
-        cy.get('ds-themed-navbar [data-test="password"]').type(password);
+        cy.get('ds-themed-header [data-test="password"]').type(password);
         // Click login button
-        cy.get('ds-themed-navbar [data-test="login-button"]').click();
+        cy.get('ds-themed-header [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}');
+        cy.get('ds-themed-header [data-test="email"]').type(email);
+        cy.get('ds-themed-header [data-test="password"]').type(password);
+        cy.get('ds-themed-header [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();
+        cy.get('ds-themed-header [data-test="logout-button"]').click();
         // Wait until above POST command responds before continuing
         // (This ensures next action waits until logout completes)
         cy.wait('@logout');
@@ -36,7 +36,7 @@ const page = {
 
 describe('Login Modal', () => {
     it('should login when clicking button & stay on same page', () => {
-        const ENTITYPAGE = '/entities/publication/' + 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,7 +66,7 @@ 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);
+        page.submitLoginAndPasswordByPressingEnter(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
         cy.get('.form-login').should('not.exist');
 
         // Verify we are still on homepage
@@ -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/integration/my-dspace.spec.ts b/cypress/e2e/my-dspace.cy.ts
similarity index 74%
rename from cypress/integration/my-dspace.spec.ts
rename to cypress/e2e/my-dspace.cy.ts
index fa923dbcbc..c48656ffcc 100644
--- a/cypress/integration/my-dspace.spec.ts
+++ b/cypress/e2e/my-dspace.cy.ts
@@ -1,14 +1,13 @@
-import { Options } from 'cypress-axe';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME } from 'cypress/support';
 import { testA11y } from 'cypress/support/utils';
 
 describe('My DSpace page', () => {
     it('should display recent submissions and pass accessibility tests', () => {
-        cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
         cy.visit('/mydspace');
 
-        cy.get('ds-my-dspace-page').should('exist');
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
+
+        cy.get('ds-my-dspace-page').should('be.visible');
 
         // At least one recent submission should be displayed
         cy.get('[data-test="list-object"]').should('be.visible');
@@ -18,52 +17,33 @@ 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.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
         cy.visit('/mydspace');
 
-        cy.get('ds-my-dspace-page').should('exist');
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        cy.loginViaForm(Cypress.env('DSPACE_TEST_SUBMIT_USER'), Cypress.env('DSPACE_TEST_SUBMIT_USER_PASSWORD'));
+
+        cy.get('ds-my-dspace-page').should('be.visible');
 
         // Click button in sidebar to display detailed view
         cy.get('ds-search-sidebar [data-test="detail-view"]').click();
 
-        cy.get('ds-object-detail').should('exist');
+        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
     it('should let you start a new submission & edit in-progress submissions', () => {
-        cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
         cy.visit('/mydspace');
 
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        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();
         // Click on the "Item" type in that dropdown
@@ -73,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="' + TEST_SUBMIT_COLLECTION_NAME + '"]').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');
@@ -85,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
@@ -131,9 +111,11 @@ describe('My DSpace page', () => {
     });
 
     it('should let you import from external sources', () => {
-        cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
         cy.visit('/mydspace');
 
+        // This page is restricted, so we will be shown the login form. Fill it out & submit.
+        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();
         // Click on the "Item" type in that dropdown
@@ -144,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/integration/pagenotfound.spec.ts b/cypress/e2e/pagenotfound.cy.ts
similarity index 70%
rename from cypress/integration/pagenotfound.spec.ts
rename to cypress/e2e/pagenotfound.cy.ts
index 48520bcaa3..d02aa8541c 100644
--- a/cypress/integration/pagenotfound.spec.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('exist');
+        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/integration/search-navbar.spec.ts b/cypress/e2e/search-navbar.cy.ts
similarity index 82%
rename from cypress/integration/search-navbar.spec.ts
rename to cypress/e2e/search-navbar.cy.ts
index babd9b9dfd..28a72bcc78 100644
--- a/cypress/integration/search-navbar.spec.ts
+++ b/cypress/e2e/search-navbar.cy.ts
@@ -1,23 +1,21 @@
-import { TEST_SEARCH_TERM } from 'cypress/support';
-
 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('/');
@@ -27,7 +25,7 @@ describe('Search from Navigation Bar', () => {
         page.fillOutQueryInNavBar(query);
         page.submitQueryByPressingEnter();
         // New URL should include query param
-        cy.url().should('include', 'query=' + query);
+        cy.url().should('include', 'query='.concat(query));
         // Wait for search results to come back from the above GET command
         cy.wait('@search-results');
         // At least one search result should be displayed
@@ -42,7 +40,7 @@ describe('Search from Navigation Bar', () => {
         page.fillOutQueryInNavBar(query);
         page.submitQueryByPressingEnter();
         // New URL should include query param
-        cy.url().should('include', 'query=' + query);
+        cy.url().should('include', 'query='.concat(query));
         // Wait for search results to come back from the above GET command
         cy.wait('@search-results');
         // At least one search result should be displayed
@@ -57,7 +55,7 @@ describe('Search from Navigation Bar', () => {
         page.fillOutQueryInNavBar(query);
         page.submitQueryByPressingIcon();
         // New URL should include query param
-        cy.url().should('include', 'query=' + query);
+        cy.url().should('include', 'query='.concat(query));
         // Wait for search results to come back from the above GET command
         cy.wait('@search-results');
         // At least one search result should be displayed
diff --git a/cypress/integration/search-page.spec.ts b/cypress/e2e/search-page.cy.ts
similarity index 63%
rename from cypress/integration/search-page.spec.ts
rename to cypress/e2e/search-page.cy.ts
index 623c370c56..429f4e6da4 100644
--- a/cypress/integration/search-page.spec.ts
+++ b/cypress/e2e/search-page.cy.ts
@@ -1,8 +1,10 @@
 import { Options } from 'cypress-axe';
-import { TEST_SEARCH_TERM } from 'cypress/support';
 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,11 +15,11 @@ describe('Search Page', () => {
     });
 
     it('should load results and pass accessibility tests', () => {
-        cy.visit('/search?query=' + 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('exist');
+        cy.get('ds-search-page').should('be.visible');
 
         // At least one search result should be displayed
         cy.get('[data-test="list-object"]').should('be.visible');
@@ -27,31 +29,17 @@ 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=' + 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();
 
         // <ds-search-page> tag must be loaded
-        cy.get('ds-search-page').should('exist');
+        cy.get('ds-search-page').should('be.visible');
 
         // At least one grid object (card) should be displayed
         cy.get('[data-test="grid-object"]').should('be.visible');
@@ -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
new file mode 100644
index 0000000000..4402410f23
--- /dev/null
+++ b/cypress/e2e/submission.cy.ts
@@ -0,0 +1,227 @@
+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 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(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(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');
+
+        // The Submission edit form tag should be visible
+        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', Cypress.env('DSPACE_TEST_SUBMIT_COLLECTION_NAME'));
+
+        // 4 sections should be visible by default
+        cy.get('div#section_traditionalpageone').should('be.visible');
+        cy.get('div#section_traditionalpagetwo').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: {
+                    // 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();
+        cy.get('button#discard_submit').click();
+    });
+
+    it('should block submission & show errors if required fields are missing', () => {
+        // Create a new submission
+        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(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();
+
+        // A warning alert should display.
+        cy.get('ds-notification div.alert-success').should('not.exist');
+        cy.get('ds-notification div.alert-warning').should('be.visible');
+
+        // First section should have an exclamation error in the header
+        // (as it has required fields)
+        cy.get('div#traditionalpageone-header i.fa-exclamation-circle').should('be.visible');
+
+        // Title field should have class "is-invalid" applied, as it's required
+        cy.get('input#dc_title').should('have.class', 'is-invalid');
+
+        // Date Year field should also have "is-valid" class
+        cy.get('input#dc_date_issued_year').should('have.class', 'is-invalid');
+
+        // FINALLY, cleanup after ourselves. This also exercises the MyDSpace delete button.
+        // Get our Submission URL, to parse out the ID of this submission
+        cy.location().then(fullUrl => {
+            // This will be the full path (/workspaceitems/[id]/edit)
+            const path = fullUrl.pathname;
+            // Split on the slashes
+            const subpaths = path.split('/');
+            // Part 2 will be the [id] of the submission
+            const id = subpaths[2];
+
+            // Even though form is incomplete, the "Save for Later" button should still work
+            cy.get('button#saveForLater').click();
+
+            // "Save for Later" should send us to MyDSpace
+            cy.url().should('include', '/mydspace');
+
+            // A success alert should be visible
+            cy.get('ds-notification div.alert-success').should('be.visible');
+            // Now, dismiss any open alert boxes (may be multiple, as tests run quickly)
+            cy.get('[data-dismiss="alert"]').click({multiple: true});
+
+            // This is the GET command that will actually run the search
+            cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
+            // On MyDSpace, find the submission we just saved via its ID
+            cy.get('[data-test="search-box"]').type(id);
+            cy.get('[data-test="search-button"]').click();
+
+            // Wait for search results to come back from the above GET command
+            cy.wait('@search-results');
+
+            // Delete our created submission & confirm deletion
+            cy.get('button#delete_' + id).click();
+            cy.get('button#delete_confirm').click();
+        });
+    });
+
+    it('should allow for deposit if all required fields completed & file uploaded', () => {
+        // Create a new submission
+        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(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');
+        cy.get('input#dc_date_issued_year').type('2022');
+
+        // Confirm the required license by checking checkbox
+        // (NOTE: requires "force:true" cause Cypress claims this checkbox is covered by its own <span>)
+        cy.get('input#granted').check( {force: true} );
+
+        // Before using Cypress drag & drop, we have to manually trigger the "dragover" event.
+        // This ensures our UI displays the dropzone that covers the entire submission page.
+        // (For some reason Cypress drag & drop doesn't trigger this even itself & upload won't work without this trigger)
+        cy.get('ds-uploader').trigger('dragover');
+
+        // This is the POST command that will upload the file
+        cy.intercept('POST', '/server/api/submission/workspaceitems/*').as('upload');
+
+        // 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', {
+            action: 'drag-drop'
+        });
+
+        // Wait for upload to complete before proceeding
+        cy.wait('@upload');
+
+        // Wait for deposit button to not be disabled & click it.
+        cy.get('button#deposit').should('not.be.disabled').click();
+
+        // No warnings should exist. Instead, just successful deposit alert is displayed
+        cy.get('ds-notification div.alert-warning').should('not.exist');
+        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/integration/collection-statistics.spec.ts b/cypress/integration/collection-statistics.spec.ts
deleted file mode 100644
index 90b569c824..0000000000
--- a/cypress/integration/collection-statistics.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { TEST_COLLECTION } from 'cypress/support';
-import { testA11y } from 'cypress/support/utils';
-
-describe('Collection Statistics Page', () => {
-    const COLLECTIONSTATISTICSPAGE = '/statistics/collections/' + TEST_COLLECTION;
-
-    it('should load if you click on "Statistics" from a Collection page', () => {
-        cy.visit('/collections/' + TEST_COLLECTION);
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
-        cy.location('pathname').should('eq', COLLECTIONSTATISTICSPAGE);
-    });
-
-    it('should contain a "Total visits" section', () => {
-        cy.visit(COLLECTIONSTATISTICSPAGE);
-        cy.get('.' + TEST_COLLECTION + '_TotalVisits').should('exist');
-    });
-
-    it('should contain a "Total visits per month" section', () => {
-        cy.visit(COLLECTIONSTATISTICSPAGE);
-        cy.get('.' + TEST_COLLECTION + '_TotalVisitsPerMonth').should('exist');
-    });
-
-    it('should pass accessibility tests', () => {
-        cy.visit(COLLECTIONSTATISTICSPAGE);
-
-        // <ds-collection-statistics-page> tag must be loaded
-        cy.get('ds-collection-statistics-page').should('exist');
-
-        // Analyze <ds-collection-statistics-page> for accessibility issues
-        testA11y('ds-collection-statistics-page');
-    });
-});
diff --git a/cypress/integration/community-list.spec.ts b/cypress/integration/community-list.spec.ts
deleted file mode 100644
index a7ba72b74a..0000000000
--- a/cypress/integration/community-list.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { Options } from 'cypress-axe';
-import { testA11y } from 'cypress/support/utils';
-
-describe('Community List Page', () => {
-
-    it('should pass accessibility tests', () => {
-        cy.visit('/community-list');
-
-        // <ds-community-list-page> tag must be loaded
-        cy.get('ds-community-list-page').should('exist');
-
-        // Open first Community (to show Collections)...that way we scan sub-elements as well
-        cy.get('ds-community-list :nth-child(1) > .btn-group > .btn').click();
-
-        // 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
-        );
-    });
-});
diff --git a/cypress/integration/community-statistics.spec.ts b/cypress/integration/community-statistics.spec.ts
deleted file mode 100644
index cbf1783c0b..0000000000
--- a/cypress/integration/community-statistics.spec.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { TEST_COMMUNITY } from 'cypress/support';
-import { testA11y } from 'cypress/support/utils';
-
-describe('Community Statistics Page', () => {
-    const COMMUNITYSTATISTICSPAGE = '/statistics/communities/' + TEST_COMMUNITY;
-
-    it('should load if you click on "Statistics" from a Community page', () => {
-        cy.visit('/communities/' + TEST_COMMUNITY);
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
-        cy.location('pathname').should('eq', COMMUNITYSTATISTICSPAGE);
-    });
-
-    it('should contain a "Total visits" section', () => {
-        cy.visit(COMMUNITYSTATISTICSPAGE);
-        cy.get('.' + TEST_COMMUNITY + '_TotalVisits').should('exist');
-    });
-
-    it('should contain a "Total visits per month" section', () => {
-        cy.visit(COMMUNITYSTATISTICSPAGE);
-        cy.get('.' + TEST_COMMUNITY + '_TotalVisitsPerMonth').should('exist');
-    });
-
-    it('should pass accessibility tests', () => {
-        cy.visit(COMMUNITYSTATISTICSPAGE);
-
-        // <ds-community-statistics-page> tag must be loaded
-        cy.get('ds-community-statistics-page').should('exist');
-
-        // Analyze <ds-community-statistics-page> for accessibility issues
-        testA11y('ds-community-statistics-page');
-    });
-});
diff --git a/cypress/integration/header.spec.ts b/cypress/integration/header.spec.ts
deleted file mode 100644
index 236208db68..0000000000
--- a/cypress/integration/header.spec.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { testA11y } from 'cypress/support/utils';
-
-describe('Header', () => {
-    it('should pass accessibility tests', () => {
-        cy.visit('/');
-
-        // Header must first be visible
-        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
-            ],
-        });
-    });
-});
diff --git a/cypress/integration/homepage-statistics.spec.ts b/cypress/integration/homepage-statistics.spec.ts
deleted file mode 100644
index fe0311f87e..0000000000
--- a/cypress/integration/homepage-statistics.spec.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { testA11y } from 'cypress/support/utils';
-
-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.location('pathname').should('eq', '/statistics');
-    });
-
-    it('should pass accessibility tests', () => {
-        cy.visit('/statistics');
-
-        // <ds-site-statistics-page> tag must be loaded
-        cy.get('ds-site-statistics-page').should('exist');
-
-        // Analyze <ds-site-statistics-page> for accessibility issues
-        testA11y('ds-site-statistics-page');
-    });
-});
diff --git a/cypress/integration/item-page.spec.ts b/cypress/integration/item-page.spec.ts
deleted file mode 100644
index 6a454b678d..0000000000
--- a/cypress/integration/item-page.spec.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-import { Options } from 'cypress-axe';
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
-import { testA11y } from 'cypress/support/utils';
-
-describe('Item  Page', () => {
-    const ITEMPAGE = '/items/' + TEST_ENTITY_PUBLICATION;
-    const ENTITYPAGE = '/entities/publication/' + 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.location('pathname').should('eq', ENTITYPAGE);
-    });
-
-    it('should pass accessibility tests', () => {
-        cy.visit(ENTITYPAGE);
-
-        // <ds-item-page> tag must be loaded
-        cy.get('ds-item-page').should('exist');
-
-        // 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
-        );
-    });
-});
diff --git a/cypress/integration/item-statistics.spec.ts b/cypress/integration/item-statistics.spec.ts
deleted file mode 100644
index 66ebc228db..0000000000
--- a/cypress/integration/item-statistics.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { TEST_ENTITY_PUBLICATION } from 'cypress/support';
-import { testA11y } from 'cypress/support/utils';
-
-describe('Item Statistics Page', () => {
-    const ITEMSTATISTICSPAGE = '/statistics/items/' + TEST_ENTITY_PUBLICATION;
-
-    it('should load if you click on "Statistics" from an Item/Entity page', () => {
-        cy.visit('/entities/publication/' + TEST_ENTITY_PUBLICATION);
-        cy.get('ds-navbar ds-link-menu-item a[title="Statistics"]').click();
-        cy.location('pathname').should('eq', ITEMSTATISTICSPAGE);
-    });
-
-    it('should contain element ds-item-statistics-page when navigating to an item statistics page', () => {
-        cy.visit(ITEMSTATISTICSPAGE);
-        cy.get('ds-item-statistics-page').should('exist');
-        cy.get('ds-item-page').should('not.exist');
-    });
-
-    it('should contain a "Total visits" section', () => {
-        cy.visit(ITEMSTATISTICSPAGE);
-        cy.get('.' + TEST_ENTITY_PUBLICATION + '_TotalVisits').should('exist');
-    });
-
-    it('should contain a "Total visits per month" section', () => {
-        cy.visit(ITEMSTATISTICSPAGE);
-        cy.get('.' + TEST_ENTITY_PUBLICATION + '_TotalVisitsPerMonth').should('exist');
-    });
-
-    it('should pass accessibility tests', () => {
-        cy.visit(ITEMSTATISTICSPAGE);
-
-        // <ds-item-statistics-page> tag must be loaded
-        cy.get('ds-item-statistics-page').should('exist');
-
-        // Analyze <ds-item-statistics-page> for accessibility issues
-        testA11y('ds-item-statistics-page');
-    });
-});
diff --git a/cypress/integration/submission.spec.ts b/cypress/integration/submission.spec.ts
deleted file mode 100644
index 009c50115b..0000000000
--- a/cypress/integration/submission.spec.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { Options } from 'cypress-axe';
-import { TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD, TEST_SUBMIT_COLLECTION_NAME, TEST_SUBMIT_COLLECTION_UUID } from 'cypress/support';
-import { testA11y } from 'cypress/support/utils';
-
-describe('New Submission page', () => {
-    // NOTE: We already test that new submissions can be started from MyDSpace in my-dspace.spec.ts
-
-    it('should create a new submission when using /submit path & pass accessibility', () => {
-        cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
-        // Test that calling /submit with collection & entityType will create a new submission
-        cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
-
-        // Should redirect to /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 & it's value should be the selected collection
-        cy.get('#collectionControlsMenuButton span').should('have.text', TEST_SUBMIT_COLLECTION_NAME);
-
-        // 4 sections should be visible by default
-        cy.get('div#section_traditionalpageone').should('be.visible');
-        cy.get('div#section_traditionalpagetwo').should('be.visible');
-        cy.get('div#section_upload').should('be.visible');
-        cy.get('div#section_license').should('be.visible');
-
-        // Discard button should work
-        // Clicking it will display a confirmation, which we will confirm with another click
-        cy.get('button#discard').click();
-        cy.get('button#discard_submit').click();
-    });
-
-    it('should block submission & show errors if required fields are missing', () => {
-        cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
-        // Create a new submission
-        cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
-
-        // Attempt an immediate deposit without filling out any fields
-        cy.get('button#deposit').click();
-
-        // A warning alert should display.
-        cy.get('ds-notification div.alert-success').should('not.exist');
-        cy.get('ds-notification div.alert-warning').should('be.visible');
-
-        // First section should have an exclamation error in the header
-        // (as it has required fields)
-        cy.get('div#traditionalpageone-header i.fa-exclamation-circle').should('be.visible');
-
-        // Title field should have class "is-invalid" applied, as it's required
-        cy.get('input#dc_title').should('have.class', 'is-invalid');
-
-        // Date Year field should also have "is-valid" class
-        cy.get('input#dc_date_issued_year').should('have.class', 'is-invalid');
-
-        // FINALLY, cleanup after ourselves. This also exercises the MyDSpace delete button.
-        // Get our Submission URL, to parse out the ID of this submission
-        cy.location().then(fullUrl => {
-            // This will be the full path (/workspaceitems/[id]/edit)
-            const path = fullUrl.pathname;
-            // Split on the slashes
-            const subpaths = path.split('/');
-            // Part 2 will be the [id] of the submission
-            const id = subpaths[2];
-
-            // Even though form is incomplete, the "Save for Later" button should still work
-            cy.get('button#saveForLater').click();
-
-            // "Save for Later" should send us to MyDSpace
-            cy.url().should('include', '/mydspace');
-
-            // A success alert should be visible
-            cy.get('ds-notification div.alert-success').should('be.visible');
-            // Now, dismiss any open alert boxes (may be multiple, as tests run quickly)
-            cy.get('[data-dismiss="alert"]').click({multiple: true});
-
-            // This is the GET command that will actually run the search
-            cy.intercept('GET', '/server/api/discover/search/objects*').as('search-results');
-            // On MyDSpace, find the submission we just saved via its ID
-            cy.get('[data-test="search-box"]').type(id);
-            cy.get('[data-test="search-button"]').click();
-
-            // Wait for search results to come back from the above GET command
-            cy.wait('@search-results');
-
-            // Delete our created submission & confirm deletion
-            cy.get('button#delete_' + id).click();
-            cy.get('button#delete_confirm').click();
-        });
-    });
-
-    it('should allow for deposit if all required fields completed & file uploaded', () => {
-        cy.login(TEST_SUBMIT_USER, TEST_SUBMIT_USER_PASSWORD);
-
-        // Create a new submission
-        cy.visit('/submit?collection=' + TEST_SUBMIT_COLLECTION_UUID + '&entityType=none');
-
-        // Fill out all required fields (Title, Date)
-        cy.get('input#dc_title').type('DSpace logo uploaded via e2e tests');
-        cy.get('input#dc_date_issued_year').type('2022');
-
-        // Confirm the required license by checking checkbox
-        // (NOTE: requires "force:true" cause Cypress claims this checkbox is covered by its own <span>)
-        cy.get('input#granted').check( {force: true} );
-
-        // Before using Cypress drag & drop, we have to manually trigger the "dragover" event.
-        // This ensures our UI displays the dropzone that covers the entire submission page.
-        // (For some reason Cypress drag & drop doesn't trigger this even itself & upload won't work without this trigger)
-        cy.get('ds-uploader').trigger('dragover');
-
-        // This is the POST command that will upload the file
-        cy.intercept('POST', '/server/api/submission/workspaceitems/*').as('upload');
-
-        // 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', {
-            action: 'drag-drop'
-        });
-
-        // Wait for upload to complete before proceeding
-        cy.wait('@upload');
-        // Close the upload success notice
-        cy.get('[data-dismiss="alert"]').click({multiple: true});
-
-        // Wait for deposit button to not be disabled & click it.
-        cy.get('button#deposit').should('not.be.disabled').click();
-
-        // No warnings should exist. Instead, just successful deposit alert is displayed
-        cy.get('ds-notification div.alert-warning').should('not.exist');
-        cy.get('ds-notification div.alert-success').should('be.visible');
-    });
-
-});
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 30951d46f1..7da454e2d0 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -4,12 +4,13 @@
 // ***********************************************
 
 import { AuthTokenInfo, TOKENITEM } from 'src/app/core/auth/models/auth-token-info.model';
-import { FALLBACK_TEST_REST_BASE_URL } from '.';
+import { DSPACE_XSRF_COOKIE, XSRF_REQUEST_HEADER } from 'src/app/core/xsrf/xsrf.constants';
+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
-// tslint:disable-next-line:no-namespace
 declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
     namespace Cypress {
         interface Chainable<Subject = any> {
             /**
@@ -19,6 +20,30 @@ declare global {
              * @param password password to login as
              */
             login(email: string, password: string): typeof login;
+
+            /**
+             * Login via form before accessing the next page. Useful to fill out login
+             * form when a cy.visit() call is to an a page which requires authentication.
+             * @param email email to login as
+             * @param password password to login as
+             */
+             loginViaForm(email: string, password: string): typeof loginViaForm;
+
+            /**
+             * Generate view event for given object. Useful for testing statistics pages with
+             * pre-generated statistics. This just generates a single "hit", but can be called multiple times to
+             * generate multiple hits.
+             * @param uuid  UUID of object
+             * @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>;
         }
     }
 }
@@ -26,39 +51,21 @@ declare global {
 /**
  * Login user via REST API directly, and pass authentication token to UI via
  * the UI's dsAuthInfo cookie.
+ * WARNING: WHILE THIS METHOD WORKS, OCCASIONALLY RANDOM AUTHENTICATION ERRORS OCCUR.
+ * At this time "loginViaForm()" seems more consistent/stable.
  * @param email email to login as
  * @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);
-
-        // 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: " + config.rest.baseUrl);
-            baseRestUrl = config.rest.baseUrl;
-        }
-
-        // To login via REST, first we have to do a GET to obtain a valid CSRF token
-        cy.request( baseRestUrl + '/api/authn/status' )
-        .then((response) => {
-            // We should receive a CSRF token returned in a response header
-            expect(response.headers).to.have.property('dspace-xsrf-token');
-            const csrfToken = response.headers['dspace-xsrf-token'];
-
+    // 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: { 'X-XSRF-TOKEN' : csrfToken},
+                headers: { [XSRF_REQUEST_HEADER]: csrfToken},
                 form: true, // indicates the body should be form urlencoded
                 body: { user: email, password: password }
             }).then((resp) => {
@@ -76,8 +83,87 @@ function login(email: string, password: string): void {
                 cy.setCookie(TOKENITEM, JSON.stringify(authinfo));
             });
         });
-
     });
 }
 // Add as a Cypress command (i.e. assign to 'cy.login')
 Cypress.Commands.add('login', login);
+
+/**
+ * Login user via displayed login form
+ * @param email email to login as
+ * @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();
+}
+// Add as a Cypress command (i.e. assign to 'cy.loginViaForm')
+Cypress.Commands.add('loginViaForm', loginViaForm);
+
+
+/**
+ * Generate statistic view event for given object. Useful for testing statistics pages with
+ * pre-generated statistics. This just generates a single "hit", but can be called multiple times to
+ * generate multiple hits.
+ *
+ * NOTE: This requires that "solr-statistics.autoCommit=false" be set on the DSpace backend
+ * (as it is in our docker-compose-ci.yml used in CI).
+ * Otherwise, by default, new statistical events won't be saved until Solr's autocommit next triggers.
+ * @param uuid UUID of object
+ * @param dsoType type of DSpace Object (e.g. "item", "collection", "community")
+ */
+function generateViewEvent(uuid: string, dsoType: string): void {
+    // 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);
+            });
+        });
+    });
+}
+// 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
new file mode 100644
index 0000000000..b2255a7da6
--- /dev/null
+++ b/cypress/support/e2e.ts
@@ -0,0 +1,74 @@
+// ***********************************************************
+// This example support/index.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import all custom Commands (from commands.ts) for all tests
+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);
+});
+
+// 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
+
+// Match any string that contains at least one non-space character
+// Can be used with "contains()" to determine if an element has a non-empty text value
+export const REGEX_MATCH_NON_EMPTY_TEXT = /^(?!\s*$).+/;
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
deleted file mode 100644
index 70da23f044..0000000000
--- a/cypress/support/index.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-// Import all custom Commands (from commands.ts) for all tests
-import './commands';
-
-// Import Cypress Axe tools for all tests
-// https://github.com/component-driven/cypress-axe
-import 'cypress-axe';
-
-// 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}');
-});
-
-// 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)
-
-// 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 'getBaseRESTUrl()' in commands.ts
-export const FALLBACK_TEST_REST_BASE_URL = 'http://localhost:8080/server';
-
-// 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';
diff --git a/docker/README.md b/docker/README.md
index 1a9fee0a81..d0cee3f52a 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -6,21 +6,45 @@
 If you wish to run DSpace on Docker in production, we recommend building your own Docker images. You are welcome to borrow ideas/concepts from the below images in doing so. But, the below images should not be used "as is" in any production scenario.
 ***
 
-## 'Dockerfile' in root directory 
+## Overview
+The scripts in this directory can be used to start the DSpace User Interface (frontend) in Docker.
+Optionally, the backend (REST API) might also be started in Docker.
+
+For additional options/settings in starting the backend (REST API) in Docker, see the Docker Compose
+documentation for the backend: https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md
+
+## Root directory
+
+The root directory of this project contains all the Dockerfiles which may be referenced by
+the Docker compose scripts in this 'docker' folder.
+
+### Dockerfile
+
 This Dockerfile is used to build a *development* DSpace 7 Angular UI image, published as 'dspace/dspace-angular'
 
 ```
-docker build -t dspace/dspace-angular:dspace-7_x .
+docker build -t dspace/dspace-angular:latest .
 ```
 
 This image is built *automatically* after each commit is made to the `main` branch.
 
 Admins to our DockerHub repo can manually publish with the following command.
 ```
-docker push dspace/dspace-angular:dspace-7_x
+docker push dspace/dspace-angular:latest
 ```
 
-## docker directory
+### Dockerfile.dist
+
+The `Dockerfile.dist` is used to generate a *production* build and runtime environment.
+
+```bash
+# build the latest image
+docker build -f Dockerfile.dist -t dspace/dspace-angular:latest-dist .
+```
+
+A default/demo version of this image is built *automatically*.
+
+## 'docker' directory
 - docker-compose.yml
   - Starts DSpace Angular with Docker Compose from the current branch.  This file assumes that a DSpace 7 REST instance will also be started in Docker.
 - docker-compose-rest.yml
@@ -45,23 +69,47 @@ docker-compose -f docker/docker-compose.yml build
 
 ## To start DSpace (REST and Angular) from your branch
 
+This command provides a quick way to start both the frontend & backend from this single codebase
 ```
 docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d
 ```
 
+Keep in mind, you may also start the backend by cloning the 'DSpace/DSpace' GitHub repository separately. See the next section.
+
+
 ## Run DSpace REST and DSpace Angular from local branches.
+
+This section assumes that you have clones *both* the 'DSpace/DSpace' and 'DSpace/dspace-angular' GitHub
+repositories. When both are available locally, you can spin up both in Docker and have them work together.
+
 _The system will be started in 2 steps. Each step shares the same docker network._
 
-From DSpace/DSpace (build as needed)
+From 'DSpace/DSpace' clone (build first as needed):
 ```
 docker-compose -p d7 up -d
 ```
 
-From DSpace/DSpace-angular
+NOTE: More detailed instructions on starting the backend via Docker can be found in the [Docker Compose instructions for the Backend](https://github.com/DSpace/DSpace/blob/main/dspace/src/main/docker-compose/README.md).
+
+From 'DSpace/dspace-angular' clone (build first as needed)
 ```
 docker-compose -p d7 -f docker/docker-compose.yml up -d
 ```
 
+At this point, you should be able to access the UI from http://localhost:4000,
+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 or sandbox backend
+(https://demo.dspace.org/server/ or https://sandbox.dspace.org/server/).
+
+```
+docker-compose -f docker/docker-compose-dist.yml pull
+docker-compose -f docker/docker-compose-dist.yml build
+docker-compose -p d7 -f docker/docker-compose-dist.yml up -d
+```
+
 ## Ingest test data from AIPDIR
 
 Create an administrator
@@ -87,9 +135,10 @@ Load assetstore content and trigger a re-index of the repository
 docker-compose -p d7 -f docker/cli.yml -f docker/cli.assetstore.yml run --rm dspace-cli
 ```
 
-## End to end testing of the rest api (runs in travis).
-_In this instance, only the REST api runs in Docker using the Entities dataset. Travis will perform CI testing of Angular using Node to drive the tests._
+## End to end testing of the REST API (runs in GitHub Actions CI).
+_In this instance, only the REST api runs in Docker using the Entities dataset. GitHub Actions will perform CI testing of Angular using Node to drive the tests.  See `.github/workflows/build.yml` for more details._
 
+This command is only really useful for testing our Continuous Integration process.
 ```
-docker-compose -p d7ci -f docker/docker-compose-travis.yml up -d
+docker-compose -p d7ci -f docker/docker-compose-ci.yml up -d
 ```
diff --git a/docker/cli.assetstore.yml b/docker/cli.assetstore.yml
index 40e4974c7c..31bc53f64d 100644
--- a/docker/cli.assetstore.yml
+++ b/docker/cli.assetstore.yml
@@ -14,13 +14,8 @@
 # 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.yml b/docker/cli.yml
index 54b83d4503..cc266b186f 100644
--- a/docker/cli.yml
+++ b/docker/cli.yml
@@ -13,10 +13,16 @@
 #
 # 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_OWNER:-dspace}/dspace-cli:${DSPACE_VER:-latest}"
     container_name: dspace-cli
     environment:
       # Below syntax may look odd, but it is how to override dspace.cfg settings via env variables.
@@ -30,16 +36,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/docker-compose-ci.yml b/docker/docker-compose-ci.yml
index dbe9500499..07993e20c6 100644
--- a/docker/docker-compose-ci.yml
+++ b/docker/docker-compose-ci.yml
@@ -24,17 +24,20 @@ services:
       # __D__ => "-" (e.g. google__D__metadata => google-metadata)
       # dspace.dir, dspace.server.url and dspace.ui.url
       dspace__P__dir: /dspace
-      dspace__P__server__P__url: http://localhost:8080/server
-      dspace__P__ui__P__url: http://localhost:4000
+      dspace__P__server__P__url: http://127.0.0.1:8080/server
+      dspace__P__ui__P__url: http://127.0.0.1:4000
       # db.url: Ensure we are using the 'dspacedb' image for our database
       db__P__url: 'jdbc:postgresql://dspacedb:5432/dspace'
       # solr.server: Ensure we are using the 'dspacesolr' image for Solr
       solr__P__server: http://dspacesolr:8983/solr
+      # 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'
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
-    image: dspace/dspace:dspace-7_x-test
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -42,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)
@@ -67,21 +68,18 @@ services:
       PGDATA: /pgdata
     image: dspace/dspace-postgres-pgcrypto:loadsql
     networks:
-      dspacenet:
+      - dspacenet
     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_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -89,9 +87,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
@@ -100,14 +95,18 @@ 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
+      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       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
new file mode 100644
index 0000000000..38278085cd
--- /dev/null
+++ b/docker/docker-compose-dist.yml
@@ -0,0 +1,40 @@
+#
+# The contents of this file are subject to the license and copyright
+# detailed in the LICENSE and NOTICE files at the root of the source
+# tree and available online at
+#
+# http://www.dspace.org/license/
+#
+
+# Docker Compose for running the DSpace Angular UI dist build
+# for previewing with the DSpace Demo site backend
+version: '3.7'
+networks:
+  dspacenet:
+services:
+  dspace-angular:
+    container_name: dspace-angular
+    environment:
+      DSPACE_UI_SSL: 'false'
+      DSPACE_UI_HOST: dspace-angular
+      DSPACE_UI_PORT: '4000'
+      DSPACE_UI_NAMESPACE: /
+      # NOTE: When running the UI in production mode (which the -dist image does),
+      # these DSPACE_REST_* variables MUST point at a public, HTTPS URL.
+      # 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: sandbox.dspace.org
+      DSPACE_REST_PORT: 443
+      DSPACE_REST_NAMESPACE: /server
+    image: dspace/dspace-angular:${DSPACE_VER:-latest}-dist
+    build:
+      context: ..
+      dockerfile: Dockerfile.dist
+    networks:
+      dspacenet:
+    ports:
+    - published: 4000
+      target: 4000
+    stdin_open: true
+    tty: true
diff --git a/docker/docker-compose-rest.yml b/docker/docker-compose-rest.yml
index b73f1b7a39..e1577ec837 100644
--- a/docker/docker-compose-rest.yml
+++ b/docker/docker-compose-rest.yml
@@ -39,11 +39,11 @@ 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: dspace/dspace:dspace-7_x-test
+    image: "${DOCKER_OWNER:-dspace}/dspace:${DSPACE_VER:-latest-test}"
     depends_on:
     - dspacedb
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8080
       target: 8080
@@ -51,8 +51,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
@@ -69,26 +67,23 @@ services:
     container_name: dspacedb
     environment:
       PGDATA: /pgdata
-    image: dspace/dspace-postgres-pgcrypto
+    image: "${DOCKER_OWNER:-dspace}/dspace-postgres-pgcrypto:${DSPACE_VER:-latest}"
     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_OWNER:-dspace}/dspace-solr:${DSPACE_VER:-latest}"
     networks:
-      dspacenet:
+      - dspacenet
     ports:
     - published: 8983
       target: 8983
@@ -96,32 +91,30 @@ 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 local configsets (see above), then start Solr
     # * First, run precreate-core to create the core (if it doesn't yet exist). If exists already, this is a no-op
-    # * Second, copy updated configs from mounted configsets to this core. If it already existed, this updates core
-    #   to the latest configs. If it's a newly created core, this is a no-op.
+    # * Second, copy configsets to this core:
+    #   Updates to Solr configs require the container to be rebuilt/restarted:
+    #   `docker-compose -p d7 -f docker/docker-compose.yml -f docker/docker-compose-rest.yml up -d --build dspacesolr`
     entrypoint:
     - /bin/bash
     - '-c'
     - |
       init-var-solr
-      precreate-core authority /opt/solr/server/solr/configsets/dspace/authority
-      cp -r -u /opt/solr/server/solr/configsets/dspace/authority/* authority
-      precreate-core oai /opt/solr/server/solr/configsets/dspace/oai
-      cp -r -u /opt/solr/server/solr/configsets/dspace/oai/* oai
-      precreate-core search /opt/solr/server/solr/configsets/dspace/search
-      cp -r -u /opt/solr/server/solr/configsets/dspace/search/* search
-      precreate-core statistics /opt/solr/server/solr/configsets/dspace/statistics
-      cp -r -u /opt/solr/server/solr/configsets/dspace/statistics/* 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
+      precreate-core qaevent /opt/solr/server/solr/configsets/qaevent
+      cp -r /opt/solr/server/solr/configsets/qaevent/* qaevent
       exec solr -f
 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..1071b8d6ce 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -24,7 +24,7 @@ services:
       DSPACE_REST_HOST: localhost
       DSPACE_REST_PORT: 8080
       DSPACE_REST_NAMESPACE: /server
-    image: dspace/dspace-angular:dspace-7_x
+    image: dspace/dspace-angular:${DSPACE_VER:-latest}
     build:
       context: ..
       dockerfile: Dockerfile
diff --git a/docker/dspace-ui.json b/docker/dspace-ui.json
new file mode 100644
index 0000000000..0758679ab8
--- /dev/null
+++ b/docker/dspace-ui.json
@@ -0,0 +1,11 @@
+{
+  "apps": [
+      {
+         "name": "dspace-ui",
+         "cwd": "/app",
+         "script": "dist/server/main.js",
+         "instances": "max",
+         "exec_mode": "cluster"
+      }
+  ]
+}
\ No newline at end of file
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/karma.conf.js b/karma.conf.js
index 8418312b1a..f96558bfaf 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,7 +15,10 @@ module.exports = function (config) {
     ],
     client: {
       clearContext: false, // leave Jasmine Spec Runner output visible in browser
-      captureConsole: false
+      captureConsole: false,
+      jasmine: {
+        failSpecWithNoExpectations: true
+      }
     },
     coverageIstanbulReporter: {
       dir: require('path').join(__dirname, './coverage/dspace-angular'),
diff --git a/package.json b/package.json
index 1b1c7a4b00..c0a3843605 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dspace-angular",
-  "version": "7.4.0",
+  "version": "8.0.0-next",
   "scripts": {
     "ng": "ng",
     "config:watch": "nodemon",
@@ -15,14 +15,14 @@
     "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 --sourceMap=true --watch=false --configuration test",
-    "test:watch": "nodemon --exec \"ng test --sourceMap=true --watch=true --configuration test\"",
-    "test:headless": "ng test --sourceMap=true --watch=false --configuration test --browsers=ChromeHeadless --code-coverage",
+    "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",
@@ -30,8 +30,9 @@
     "clean:log": "rimraf *.log*",
     "clean:json": "rimraf *.records.json",
     "clean:node": "rimraf node_modules",
+    "clean:cli": "rimraf .angular/cache",
     "clean:prod": "yarn run clean:dist && yarn run clean:log && yarn run clean:doc && yarn run clean:coverage && yarn run clean:json",
-    "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:node",
+    "clean": "yarn run clean:prod && yarn run clean:dev:config && yarn run clean:cli && yarn run clean:node",
     "sync-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/sync-i18n-files.ts",
     "build:mirador": "webpack --config webpack/webpack.mirador.config.ts",
     "merge-i18n": "ts-node --project ./tsconfig.ts-node.json scripts/merge-i18n-files.ts",
@@ -54,169 +55,157 @@
     "ts-node": "10.2.1"
   },
   "dependencies": {
-    "@angular/animations": "~13.2.6",
-    "@angular/cdk": "^13.2.6",
-    "@angular/common": "~13.2.6",
-    "@angular/compiler": "~13.2.6",
-    "@angular/core": "~13.2.6",
-    "@angular/forms": "~13.2.6",
-    "@angular/localize": "13.2.6",
-    "@angular/platform-browser": "~13.2.6",
-    "@angular/platform-browser-dynamic": "~13.2.6",
-    "@angular/platform-server": "~13.2.6",
-    "@angular/router": "~13.2.6",
-    "@babel/runtime": "^7.17.2",
+    "@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",
     "@kolkov/ngx-gallery": "^2.0.1",
     "@material-ui/core": "^4.11.0",
-    "@material-ui/icons": "^4.9.1",
+    "@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",
-    "@ngrx/effects": "^13.0.2",
-    "@ngrx/router-store": "^13.0.2",
-    "@ngrx/store": "^13.0.2",
-    "@nguniversal/express-engine": "^13.0.2",
-    "@ngx-translate/core": "^13.0.0",
-    "@nicky-lenaers/ngx-scroll-to": "^9.0.0",
+    "@ngrx/effects": "^15.4.0",
+    "@ngrx/router-store": "^15.4.0",
+    "@ngrx/store": "^15.4.0",
+    "@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.0.0",
-    "axios": "^0.27.2",
-    "bootstrap": "4.3.1",
-    "caniuse-lite": "^1.0.30001165",
+    "angulartics2": "^12.2.0",
+    "axios": "^1.6.0",
+    "bootstrap": "^4.6.1",
     "cerialize": "0.1.18",
-    "cli-progress": "^3.8.0",
+    "cli-progress": "^3.12.0",
+    "colors": "^1.4.0",
     "compression": "^1.7.4",
-    "cookie-parser": "1.4.5",
-    "core-js": "^3.7.0",
-    "deepmerge": "^4.2.2",
-    "express": "^4.17.1",
+    "cookie-parser": "1.4.6",
+    "core-js": "^3.30.1",
+    "date-fns": "^2.29.3",
+    "date-fns-tz": "^1.3.7",
+    "deepmerge": "^4.3.1",
+    "ejs": "^3.1.9",
+    "express": "^4.18.2",
     "express-rate-limit": "^5.1.3",
-    "fast-json-patch": "^3.0.0-1",
-    "file-saver": "^2.0.5",
+    "fast-json-patch": "^3.1.1",
     "filesize": "^6.1.0",
-    "font-awesome": "4.7.0",
     "http-proxy-middleware": "^1.0.5",
-    "https": "1.0.0",
+    "http-terminator": "^3.2.0",
+    "isbot": "^3.6.10",
     "js-cookie": "2.2.1",
     "js-yaml": "^4.1.0",
-    "json5": "^2.1.3",
-    "jsonschema": "1.4.0",
+    "json5": "^2.2.3",
+    "jsonschema": "1.4.1",
     "jwt-decode": "^3.1.2",
-    "klaro": "^0.7.10",
+    "klaro": "^0.7.18",
     "lodash": "^4.17.21",
+    "lru-cache": "^7.14.1",
     "markdown-it": "^13.0.1",
-    "markdown-it-mathjax3": "^4.3.1",
+    "markdown-it-mathjax3": "^4.3.2",
     "mirador": "^3.3.0",
     "mirador-dl-plugin": "^0.13.0",
     "mirador-share-plugin": "^0.11.0",
-    "moment": "^2.29.4",
     "morgan": "^1.10.0",
-    "ng-mocks": "^13.1.1",
+    "ng-mocks": "^14.10.0",
     "ng2-file-upload": "1.4.0",
-    "ng2-nouislider": "^1.8.3",
-    "ngx-infinite-scroll": "^10.0.1",
-    "ngx-moment": "^5.0.0",
-    "ngx-pagination": "5.0.0",
+    "ng2-nouislider": "^2.0.0",
+    "ngx-infinite-scroll": "^15.0.0",
+    "ngx-pagination": "6.0.3",
     "ngx-sortablejs": "^11.1.0",
-    "ngx-ui-switch": "^11.0.1",
-    "nouislider": "^14.6.3",
-    "pem": "1.14.4",
-    "postcss-cli": "^9.1.0",
-    "prop-types": "^15.7.2",
-    "react-copy-to-clipboard": "^5.0.1",
+    "ngx-ui-switch": "^14.1.0",
+    "nouislider": "^15.7.1",
+    "pem": "1.14.7",
+    "prop-types": "^15.8.1",
+    "react-copy-to-clipboard": "^5.1.0",
     "reflect-metadata": "^0.1.13",
-    "rxjs": "^7.5.5",
-    "sanitize-html": "^2.7.2",
-    "sortablejs": "1.13.0",
-    "tslib": "^2.0.0",
-    "url-parse": "^1.5.6",
+    "rxjs": "^7.8.0",
+    "sanitize-html": "^2.12.1",
+    "sortablejs": "1.15.0",
     "uuid": "^8.3.2",
     "webfontloader": "1.6.28",
     "zone.js": "~0.11.5"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "~13.1.0",
-    "@angular-devkit/build-angular": "~13.2.6",
-    "@angular-eslint/builder": "13.1.0",
-    "@angular-eslint/eslint-plugin": "13.1.0",
-    "@angular-eslint/eslint-plugin-template": "13.1.0",
-    "@angular-eslint/schematics": "13.1.0",
-    "@angular-eslint/template-parser": "13.1.0",
-    "@angular/cli": "~13.2.6",
-    "@angular/compiler-cli": "~13.2.6",
-    "@angular/language-service": "~13.2.6",
+    "@angular-builders/custom-webpack": "~15.0.0",
+    "@angular-devkit/build-angular": "^15.2.6",
+    "@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": "^16.0.4",
+    "@angular/compiler-cli": "^15.2.8",
+    "@angular/language-service": "^15.2.8",
     "@cypress/schematic": "^1.5.0",
-    "@fortawesome/fontawesome-free": "^5.5.0",
-    "@ngrx/store-devtools": "^13.0.2",
-    "@ngtools/webpack": "^13.2.6",
-    "@nguniversal/builders": "^13.0.2",
+    "@fortawesome/fontawesome-free": "^6.4.0",
+    "@ngrx/store-devtools": "^15.4.0",
+    "@ngtools/webpack": "^15.2.6",
+    "@nguniversal/builders": "^15.2.1",
     "@types/deep-freeze": "0.1.2",
-    "@types/express": "^4.17.9",
-    "@types/file-saver": "^2.0.1",
+    "@types/ejs": "^3.1.2",
+    "@types/express": "^4.17.17",
     "@types/jasmine": "~3.6.0",
-    "@types/jasminewd2": "~2.0.8",
     "@types/js-cookie": "2.2.6",
-    "@types/lodash": "^4.14.165",
+    "@types/lodash": "^4.14.194",
     "@types/node": "^14.14.9",
-    "@types/sanitize-html": "^2.6.2",
-    "@typescript-eslint/eslint-plugin": "5.11.0",
-    "@typescript-eslint/parser": "5.11.0",
-    "axe-core": "^4.3.3",
+    "@types/sanitize-html": "^2.9.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.1",
+    "@typescript-eslint/parser": "^5.59.1",
+    "axe-core": "^4.7.2",
     "compression-webpack-plugin": "^9.2.0",
     "copy-webpack-plugin": "^6.4.1",
     "cross-env": "^7.0.3",
-    "css-loader": "^6.2.0",
-    "css-minimizer-webpack-plugin": "^3.4.1",
-    "cssnano": "^5.0.6",
-    "cypress": "9.5.1",
-    "cypress-axe": "^0.14.0",
-    "debug-loader": "^0.0.1",
+    "cypress": "12.17.4",
+    "cypress-axe": "^1.4.0",
     "deep-freeze": "0.0.1",
-    "dotenv": "^8.2.0",
-    "eslint": "^8.2.0",
-    "eslint-plugin-deprecation": "^1.3.2",
-    "eslint-plugin-import": "^2.25.4",
-    "eslint-plugin-jsdoc": "^38.0.6",
+    "eslint": "^8.39.0",
+    "eslint-plugin-deprecation": "^1.4.1",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-import-newlines": "^1.3.1",
+    "eslint-plugin-jsdoc": "^45.0.0",
+    "eslint-plugin-jsonc": "^2.6.0",
+    "eslint-plugin-lodash": "^7.4.0",
+    "eslint-plugin-rxjs": "^5.0.3",
+    "eslint-plugin-simple-import-sort": "^10.0.0",
     "eslint-plugin-unused-imports": "^2.0.0",
-    "express-static-gzip": "^2.1.5",
-    "fork-ts-checker-webpack-plugin": "^6.0.3",
-    "html-loader": "^1.3.2",
+    "express-static-gzip": "^2.1.7",
     "jasmine-core": "^3.8.0",
     "jasmine-marbles": "0.9.2",
-    "jasmine-spec-reporter": "~5.0.0",
-    "karma": "^6.3.14",
-    "karma-chrome-launcher": "~3.1.0",
-    "karma-coverage-istanbul-reporter": "~3.0.2",
+    "karma": "^6.4.2",
+    "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",
     "ngx-mask": "^13.1.7",
-    "nodemon": "^2.0.15",
-    "postcss": "^8.1",
+    "nodemon": "^2.0.22",
+    "postcss": "^8.4",
     "postcss-apply": "0.12.0",
     "postcss-import": "^14.0.0",
     "postcss-loader": "^4.0.3",
     "postcss-preset-env": "^7.4.2",
     "postcss-responsive-type": "1.0.0",
-    "protractor": "^7.0.0",
-    "protractor-istanbul-plugin": "2.0.0",
-    "raw-loader": "0.5.1",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "rimraf": "^3.0.2",
     "rxjs-spy": "^8.0.2",
-    "sass": "~1.32.6",
+    "sass": "~1.62.0",
     "sass-loader": "^12.6.0",
-    "sass-resources-loader": "^2.1.1",
-    "string-replace-loader": "^3.1.0",
-    "terser-webpack-plugin": "^2.3.1",
-    "ts-loader": "^5.2.0",
+    "sass-resources-loader": "^2.2.5",
     "ts-node": "^8.10.2",
-    "typescript": "~4.5.5",
-    "webpack": "^5.69.1",
-    "webpack-bundle-analyzer": "^4.4.0",
+    "typescript": "~4.8.4",
+    "webpack": "5.76.1",
+    "webpack-bundle-analyzer": "^4.8.0",
     "webpack-cli": "^4.2.0",
-    "webpack-dev-server": "^4.5.0"
+    "webpack-dev-server": "^4.13.3"
   }
 }
diff --git a/scripts/base-href.ts b/scripts/base-href.ts
index aee547b46d..7212e1c516 100644
--- a/scripts/base-href.ts
+++ b/scripts/base-href.ts
@@ -1,4 +1,4 @@
-import * as fs from 'fs';
+import { existsSync, writeFileSync } from 'fs';
 import { join } from 'path';
 
 import { AppConfig } from '../src/config/app-config.interface';
@@ -16,7 +16,7 @@ const appConfig: AppConfig = buildAppConfig();
 
 const angularJsonPath = join(process.cwd(), 'angular.json');
 
-if (!fs.existsSync(angularJsonPath)) {
+if (!existsSync(angularJsonPath)) {
   console.error(`Error:\n${angularJsonPath} does not exist\n`);
   process.exit(1);
 }
@@ -30,7 +30,7 @@ try {
 
   angularJson.projects['dspace-angular'].architect.build.options.baseHref = baseHref;
 
-  fs.writeFileSync(angularJsonPath, JSON.stringify(angularJson, null, 2) + '\n');
+  writeFileSync(angularJsonPath, JSON.stringify(angularJson, null, 2) + '\n');
 } catch (e) {
   console.error(e);
 }
diff --git a/scripts/env-to-yaml.ts b/scripts/env-to-yaml.ts
index c2dd1cf0ca..6e8153f4c1 100644
--- a/scripts/env-to-yaml.ts
+++ b/scripts/env-to-yaml.ts
@@ -1,5 +1,5 @@
-import * as fs from 'fs';
-import * as yaml from 'js-yaml';
+import { existsSync, writeFileSync } from 'fs';
+import { dump } from 'js-yaml';
 import { join } from 'path';
 
 /**
@@ -18,7 +18,7 @@ if (args[0] === undefined) {
 
 const envFullPath = join(process.cwd(), args[0]);
 
-if (!fs.existsSync(envFullPath)) {
+if (!existsSync(envFullPath)) {
   console.error(`Error:\n${envFullPath} does not exist\n`);
   process.exit(1);
 }
@@ -26,10 +26,10 @@ if (!fs.existsSync(envFullPath)) {
 try {
   const env = require(envFullPath).environment;
 
-  const config = yaml.dump(env);
+  const config = dump(env);
   if (args[1]) {
     const ymlFullPath = join(process.cwd(), args[1]);
-    fs.writeFileSync(ymlFullPath, config);
+    writeFileSync(ymlFullPath, config);
   } else {
     console.log(config);
   }
diff --git a/scripts/serve.ts b/scripts/serve.ts
index 99bfc822d4..ee8570a45c 100644
--- a/scripts/serve.ts
+++ b/scripts/serve.ts
@@ -1,4 +1,4 @@
-import * as child from 'child_process';
+import { spawn } from 'child_process';
 
 import { AppConfig } from '../src/config/app-config.interface';
 import { buildAppConfig } from '../src/config/config.server';
@@ -9,7 +9,7 @@ const appConfig: AppConfig = buildAppConfig();
  * Calls `ng serve` with the following arguments configured for the UI in the app config: host, port, nameSpace, ssl
  * Any CLI arguments given to this script are patched through to `ng serve` as well.
  */
-child.spawn(
+spawn(
   `ng serve --host ${appConfig.ui.host} --port ${appConfig.ui.port} --serve-path ${appConfig.ui.nameSpace} --ssl ${appConfig.ui.ssl} ${process.argv.slice(2).join(' ')} --configuration development`,
   { stdio: 'inherit', shell: true }
 );
diff --git a/scripts/test-rest.ts b/scripts/test-rest.ts
index 51822cf939..9066777c42 100644
--- a/scripts/test-rest.ts
+++ b/scripts/test-rest.ts
@@ -1,5 +1,5 @@
-import * as http from 'http';
-import * as https from 'https';
+import { request } from 'http';
+import { request as https_request } from 'https';
 
 import { AppConfig } from '../src/config/app-config.interface';
 import { buildAppConfig } from '../src/config/config.server';
@@ -20,7 +20,7 @@ console.log(`...Testing connection to REST API at ${restUrl}...\n`);
 
 // If SSL enabled, test via HTTPS, else via HTTP
 if (appConfig.rest.ssl) {
-    const req = https.request(restUrl, (res) => {
+    const req = https_request(restUrl, (res) => {
         console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
         // We will keep reading data until the 'end' event fires.
         // This ensures we don't just read the first chunk.
@@ -39,7 +39,7 @@ if (appConfig.rest.ssl) {
 
     req.end();
 } else {
-    const req = http.request(restUrl, (res) => {
+    const req = request(restUrl, (res) => {
         console.log(`RESPONSE: ${res.statusCode} ${res.statusMessage} \n`);
         // We will keep reading data until the 'end' event fires.
         // This ensures we don't just read the first chunk.
diff --git a/scripts/webpack.js b/scripts/webpack.js
deleted file mode 100644
index 93f17b4619..0000000000
--- a/scripts/webpack.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const path = require('path');
-const child_process = require('child_process');
-
-const heapSize = 4096;
-const webpackPath = path.join('node_modules', 'webpack', 'bin', 'webpack.js');
-
-const params = [
-  '--max_old_space_size=' + heapSize,
-  webpackPath,
-  ...process.argv.slice(2)
-];
-
-child_process.spawn('node', params, { stdio:'inherit' });
diff --git a/server.ts b/server.ts
index 81137ad56a..da085f372f 100644
--- a/server.ts
+++ b/server.ts
@@ -19,19 +19,24 @@ import 'zone.js/node';
 import 'reflect-metadata';
 import 'rxjs';
 
-import axios from 'axios';
-import * as pem from 'pem';
-import * as https from 'https';
+/* eslint-disable import/no-namespace */
 import * as morgan from 'morgan';
 import * as express from 'express';
-import * as bodyParser from 'body-parser';
+import * as ejs from 'ejs';
 import * as compression from 'compression';
 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 { createCertificate } from 'pem';
+import { createServer } from 'https';
+import { json } from 'body-parser';
+import { createHttpTerminator } from 'http-terminator';
 
-import { existsSync, readFileSync } from 'fs';
+import { readFileSync } from 'fs';
 import { join } from 'path';
 
-import { APP_BASE_HREF } from '@angular/common';
 import { enableProdMode } from '@angular/core';
 
 import { ngExpressEngine } from '@nguniversal/express-engine';
@@ -49,6 +54,8 @@ import { buildAppConfig } from './src/config/config.server';
 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';
+
 
 /*
  * Set path for the browser application's dist folder
@@ -57,12 +64,18 @@ const DIST_FOLDER = join(process.cwd(), 'dist/browser');
 // Set path fir IIIF viewer.
 const IIIF_VIEWER = join(process.cwd(), 'dist/iiif');
 
-const indexHtml = existsSync(join(DIST_FOLDER, 'index.html')) ? 'index.html' : 'index';
+const indexHtml = join(DIST_FOLDER, 'index.html');
 
 const cookieParser = require('cookie-parser');
 
 const appConfig: AppConfig = buildAppConfig(join(DIST_FOLDER, 'assets/config.json'));
 
+// cache of SSR pages for known bots, only enabled in production mode
+let botCache: LRU<string, any>;
+
+// cache of SSR pages for anonymous users. Disabled by default, and only available in production mode
+let anonymousCache: LRU<string, any>;
+
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
@@ -83,10 +96,12 @@ export function app() {
   /*
    * If production mode is enabled in the environment file:
    * - Enable Angular's production mode
+   * - Initialize caching of SSR rendered pages (if enabled in config.yml)
    * - Enable compression for SSR reponses. See [compression](https://github.com/expressjs/compression)
    */
   if (environment.production) {
     enableProdMode();
+    initCache();
     server.use(compression({
       // only compress responses we've marked as SSR
       // otherwise, this middleware may compress files we've chosen not to compress via compression-webpack-plugin
@@ -102,15 +117,15 @@ export function app() {
 
   /*
    * Add cookie parser middleware
-   * See [morgan](https://github.com/expressjs/cookie-parser)
+   * See [cookie-parser](https://github.com/expressjs/cookie-parser)
    */
   server.use(cookieParser());
 
   /*
-   * Add parser for request bodies
-   * See [morgan](https://github.com/expressjs/body-parser)
+   * Add JSON parser for request bodies
+   * See [body-parser](https://github.com/expressjs/body-parser)
    */
-  server.use(bodyParser.json());
+  server.use(json());
 
   // Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
   server.engine('html', (_, options, callback) =>
@@ -133,10 +148,23 @@ export function app() {
     })(_, (options as any), callback)
   );
 
+  server.engine('ejs', ejs.renderFile);
+
   /*
    * Register the view engines for html and ejs
    */
   server.set('view engine', 'html');
+  server.set('view engine', 'ejs');
+
+  /**
+   * Serve the robots.txt ejs template, filling in the origin variable
+   */
+  server.get('/robots.txt', (req, res) => {
+    res.setHeader('content-type', 'text/plain');
+    res.render('assets/robots.txt.ejs', {
+      'origin': req.protocol + '://' + req.headers.host
+    });
+  });
 
   /*
    * Set views folder path to directory where template files are stored
@@ -152,6 +180,15 @@ export function app() {
     changeOrigin: true
   }));
 
+  /**
+   * Proxy the linksets
+   */
+  router.use('/signposting**', createProxyMiddleware({
+    target: `${environment.rest.baseUrl}`,
+    pathRewrite: path => path.replace(environment.ui.nameSpace, '/'),
+    changeOrigin: true
+  }));
+
   /**
    * Checks if the rateLimiter property is present
    * When it is present, the rateLimiter will be enabled. When it is undefined, the rateLimiter will be disabled.
@@ -169,7 +206,7 @@ export function app() {
    * Serve static resources (images, i18n messages, …)
    * Handle pre-compressed files with [express-static-gzip](https://github.com/tkoenig89/express-static-gzip)
    */
-  router.get('*.*', cacheControl, expressStaticGzip(DIST_FOLDER, {
+  router.get('*.*', addCacheControl, expressStaticGzip(DIST_FOLDER, {
     index: false,
     enableBrotli: true,
     orderPreference: ['br', 'gzip'],
@@ -185,8 +222,11 @@ export function app() {
    */
   server.get('/app/health', healthCheck);
 
-  // Register the ngApp callback function to handle incoming requests
-  router.get('*', ngApp);
+  /**
+   * Default sending all incoming requests to ngApp() function, after first checking for a cached
+   * copy of the page (see cacheCheck())
+   */
+  router.get('*', cacheCheck, ngApp);
 
   server.use(environment.ui.nameSpace, router);
 
@@ -198,60 +238,281 @@ export function app() {
  */
 function ngApp(req, res) {
   if (environment.universal.preboot) {
-    res.render(indexHtml, {
-      req,
-      res,
-      preboot: environment.universal.preboot,
-      async: environment.universal.async,
-      time: environment.universal.time,
-      baseUrl: environment.ui.nameSpace,
-      originUrl: environment.ui.baseUrl,
-      requestUrl: req.originalUrl,
-      providers: [{ provide: APP_BASE_HREF, useValue: req.baseUrl }]
-    }, (err, data) => {
-      if (hasNoValue(err) && hasValue(data)) {
-        res.locals.ssr = true;  // mark response as SSR
-        res.send(data);
-      } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
-        // When this error occurs we can't fall back to CSR because the response has already been
-        // sent. These errors occur for various reasons in universal, not all of which are in our
-        // control to solve.
-        console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
-      } else {
-        console.warn('Error in SSR, serving for direct CSR.');
-        if (hasValue(err)) {
-          console.warn('Error details : ', err);
-        }
-        res.render(indexHtml, {
-          req,
-          providers: [{
-            provide: APP_BASE_HREF,
-            useValue: req.baseUrl
-          }]
-        });
-      }
-    });
+    // Render the page to user via SSR (server side rendering)
+    serverSideRender(req, res);
   } else {
     // If preboot is disabled, just serve the client
-    console.log('Universal off, serving for direct CSR');
-    res.render(indexHtml, {
-      req,
-      providers: [{
-        provide: APP_BASE_HREF,
-        useValue: req.baseUrl
-      }]
+    console.log('Universal off, serving for direct client-side rendering (CSR)');
+    clientSideRender(req, res);
+  }
+}
+
+/**
+ * Render page content on server side using Angular SSR. By default this page content is
+ * returned to the user.
+ * @param req current request
+ * @param res current response
+ * @param sendToUser if true (default), send the rendered content to the user.
+ * If false, then only save this rendered content to the in-memory cache (to refresh cache).
+ */
+function serverSideRender(req, res, sendToUser: boolean = true) {
+  // Render the page via SSR (server side rendering)
+  res.render(indexHtml, {
+    req,
+    res,
+    preboot: environment.universal.preboot,
+    async: environment.universal.async,
+    time: environment.universal.time,
+    baseUrl: environment.ui.nameSpace,
+    originUrl: environment.ui.baseUrl,
+    requestUrl: req.originalUrl,
+  }, (err, data) => {
+    if (hasNoValue(err) && hasValue(data)) {
+      // save server side rendered page to cache (if any are enabled)
+      saveToCache(req, data);
+      if (sendToUser) {
+        res.locals.ssr = true;  // mark response as SSR (enables text compression)
+        // send rendered page to user
+        res.send(data);
+      }
+    } else if (hasValue(err) && err.code === 'ERR_HTTP_HEADERS_SENT') {
+      // When this error occurs we can't fall back to CSR because the response has already been
+      // sent. These errors occur for various reasons in universal, not all of which are in our
+      // control to solve.
+      console.warn('Warning [ERR_HTTP_HEADERS_SENT]: Tried to set headers after they were sent to the client');
+    } else {
+      console.warn('Error in server-side rendering (SSR)');
+      if (hasValue(err)) {
+        console.warn('Error details : ', err);
+      }
+      if (sendToUser) {
+        console.warn('Falling back to serving direct client-side rendering (CSR).');
+        clientSideRender(req, res);
+      }
+    }
+  });
+}
+
+/**
+ * Send back response to user to trigger direct client-side rendering (CSR)
+ * @param req current request
+ * @param res current response
+ */
+function clientSideRender(req, res) {
+  res.sendFile(indexHtml);
+}
+
+
+/*
+ * Adds a Cache-Control HTTP header to the response.
+ * The cache control value can be configured in the config.*.yml file
+ * Defaults to max-age=604,800 seconds (1 week)
+ */
+function addCacheControl(req, res, next) {
+  // instruct browser to revalidate
+  res.header('Cache-Control', environment.cache.control || 'max-age=604800');
+  next();
+}
+
+/*
+ * Initialize server-side caching of pages rendered via SSR.
+ */
+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 (defined in default-app-config.ts)
+    botCache = new LRU( {
+      max: environment.cache.serverSide.botCache.max,
+      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 (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,
+      allowStale: environment.cache.serverSide.anonymousCache.allowStale
     });
   }
 }
 
-/*
- * Adds a cache control header to the response
- * The cache control value can be configured in the environments file and defaults to max-age=60
+/**
+ * Return whether bot-specific server side caching is enabled in configuration.
  */
-function cacheControl(req, res, next) {
-  // instruct browser to revalidate
-  res.header('Cache-Control', environment.cache.control || 'max-age=60');
-  next();
+function botCacheEnabled(): boolean {
+  // Caching is only enabled if SSR is enabled AND
+  // "max" pages to cache is greater than zero
+  return environment.universal.preboot && environment.cache.serverSide.botCache.max && (environment.cache.serverSide.botCache.max > 0);
+}
+
+/**
+ * Return whether anonymous user server side caching is enabled in configuration.
+ */
+function anonymousCacheEnabled(): boolean {
+  // Caching is only enabled if SSR is enabled AND
+  // "max" pages to cache is greater than zero
+  return environment.universal.preboot && environment.cache.serverSide.anonymousCache.max && (environment.cache.serverSide.anonymousCache.max > 0);
+}
+
+/**
+ * Check if the currently requested page is in our server-side, in-memory cache.
+ * Caching is ONLY done for SSR requests. Pages are cached base on their path (e.g. /home or /search?query=test)
+ */
+function cacheCheck(req, res, next) {
+  // Cached copy of page (if found)
+  let cachedCopy;
+
+  // If the bot cache is enabled and this request looks like a bot, check the bot cache for a cached page.
+  if (botCacheEnabled() && isbot(req.get('user-agent'))) {
+    cachedCopy = checkCacheForRequest('bot', botCache, req, res);
+  } else if (anonymousCacheEnabled() && !isUserAuthenticated(req)) {
+    cachedCopy = checkCacheForRequest('anonymous', anonymousCache, req, res);
+  }
+
+  // If cached copy exists, return it to the user.
+  if (cachedCopy && cachedCopy.page) {
+    if (cachedCopy.headers) {
+      Object.keys(cachedCopy.headers).forEach((header) => {
+        if (cachedCopy.headers[header]) {
+          if (environment.cache.serverSide.debug) {
+            console.log(`Restore cached ${header} header`);
+          }
+          res.setHeader(header, cachedCopy.headers[header]);
+        }
+      });
+    }
+    res.locals.ssr = true;  // mark response as SSR-generated (enables text compression)
+    res.send(cachedCopy.page);
+
+    // Tell Express to skip all other handlers for this path
+    // This ensures we don't try to re-render the page since we've already returned the cached copy
+    next('router');
+  } else {
+    // If nothing found in cache, just continue with next handler
+    // (This should send the request on to the handler that rerenders the page via SSR
+    next();
+  }
+}
+
+/**
+ * Checks if the current request (i.e. page) is found in the given cache. If it is found,
+ * the cached copy is returned. When found, this method also triggers a re-render via
+ * SSR if the cached copy is now expired (i.e. timeToLive has passed for this cached copy).
+ * @param cacheName name of cache (just useful for debug logging)
+ * @param cache LRU cache to check
+ * @param req current request to look for in the cache
+ * @param res current response
+ * @returns cached copy (if found) or undefined (if not found)
+ */
+function checkCacheForRequest(cacheName: string, cache: LRU<string, any>, req, res): any {
+  // Get the cache key for this request
+  const key = getCacheKey(req);
+
+  // Check if this page is in our cache
+  let cachedCopy = cache.get(key);
+  if (cachedCopy) {
+    if (environment.cache.serverSide.debug) { console.log(`CACHE HIT FOR ${key} in ${cacheName} cache`); }
+
+    // Check if cached copy is expired (If expired, the key will now be gone from cache)
+    // NOTE: This will only occur when "allowStale=true", as it means the "get(key)" above returned a stale value.
+    if (!cache.has(key)) {
+      if (environment.cache.serverSide.debug) { console.log(`CACHE EXPIRED FOR ${key} in ${cacheName} cache. Re-rendering...`); }
+      // Update cached copy by rerendering server-side
+      // NOTE: In this scenario the currently cached copy will be returned to the current user.
+      // This re-render is peformed behind the scenes to update cached copy for next user.
+      serverSideRender(req, res, false);
+    }
+  } else {
+    if (environment.cache.serverSide.debug) { console.log(`CACHE MISS FOR ${key} in ${cacheName} cache.`); }
+  }
+
+  // return page from cache
+  return cachedCopy;
+}
+
+/**
+ * Create a cache key from the current request.
+ * The cache key is the URL path (NOTE: this key will also include any querystring params).
+ * E.g. "/home" or "/search?query=test"
+ * @param req current request
+ * @returns cache key to use for this page
+ */
+function getCacheKey(req): string {
+  // NOTE: this will return the URL path *without* any baseUrl
+  return req.url;
+}
+
+/**
+ * Save page to server side cache(s), if enabled. If caching is not enabled or a user is authenticated, this is a noop
+ * If multiple caches are enabled, the page will be saved to any caches where it does not yet exist (or is expired).
+ * (This minimizes the number of times we need to run SSR on the same page.)
+ * @param req current page request
+ * @param page page data to save to cache
+ */
+function saveToCache(req, page: any) {
+  // Only cache if no one is currently authenticated. This means ONLY public pages can be cached.
+  // NOTE: It's not safe to save page data to the cache when a user is authenticated. In that situation,
+  // the page may include sensitive or user-specific materials. As the cache is shared across all users, it can only contain public info.
+  if (!isUserAuthenticated(req)) {
+    const key = getCacheKey(req);
+    // Avoid caching "/reload/[random]" paths (these are hard refreshes after logout)
+    if (key.startsWith('/reload')) { return; }
+    // Avoid caching not successful responses (status code different from 2XX status)
+    if (hasNotSucceeded(req.res.statusCode)) { return; }
+
+    // Retrieve response headers to save, if any
+    const headers = retrieveHeaders(req.res);
+    // If bot cache is enabled, save it to that cache if it doesn't exist or is expired
+    // (NOTE: has() will return false if page is expired in cache)
+    if (botCacheEnabled() && !botCache.has(key)) {
+      botCache.set(key, { page, headers });
+      if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in bot cache.`); }
+    }
+
+    // If anonymous cache is enabled, save it to that cache if it doesn't exist or is expired
+    if (anonymousCacheEnabled() && !anonymousCache.has(key)) {
+      anonymousCache.set(key, { page, headers });
+      if (environment.cache.serverSide.debug) { console.log(`CACHE SAVE FOR ${key} in anonymous cache.`); }
+    }
+  }
+}
+
+/**
+ * Check if status code is different from 2XX
+ * @param statusCode
+ */
+function hasNotSucceeded(statusCode) {
+  const rgx = new RegExp(/^20+/);
+  return !rgx.test(statusCode);
+}
+
+function retrieveHeaders(response) {
+  const headers = Object.create({});
+  if (Array.isArray(environment.cache.serverSide.headers) && environment.cache.serverSide.headers.length > 0) {
+    environment.cache.serverSide.headers.forEach((header) => {
+      if (response.hasHeader(header)) {
+        if (environment.cache.serverSide.debug) {
+          console.log(`Save ${header} header to cache`);
+        }
+        headers[header] = response.getHeader(header);
+      }
+    });
+  }
+
+  return headers;
+}
+/**
+ * Whether a user is authenticated or not
+ */
+function isUserAuthenticated(req): boolean {
+  // Check whether our DSpace authentication Cookie exists or not
+  return req.cookies[TOKENITEM];
 }
 
 /*
@@ -266,23 +527,46 @@ function serverStarted() {
  * @param keys SSL credentials
  */
 function createHttpsServer(keys) {
-  https.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() {
@@ -320,7 +604,7 @@ function start() {
 
       process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0'; // lgtm[js/disabling-certificate-validation]
 
-      pem.createCertificate({
+      createCertificate({
         days: 1,
         selfSigned: true
       }, (error, keys) => {
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index 259aa311e7..06ae032194 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';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 
-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 e64b0d170a..e85961fd13 100644
--- a/src/app/access-control/access-control-routing.module.ts
+++ b/src/app/access-control/access-control-routing.module.ts
@@ -1,55 +1,90 @@
 import { NgModule } from '@angular/core';
 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 { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { GroupPageGuard } from './group-registry/group-page.guard';
 import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
 import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import {
+  EPERSON_PATH,
+  GROUP_PATH,
+} from './access-control-routing-paths';
+import { BulkAccessComponent } from './bulk-access/bulk-access.component';
+import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
+import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
+import { EPersonResolver } from './epeople-registry/eperson-resolver.service';
+import { GroupFormComponent } from './group-registry/group-form/group-form.component';
+import { GroupPageGuard } from './group-registry/group-page.guard';
+import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
-        path: 'epeople',
+        path: EPERSON_PATH,
         component: EPeopleRegistryComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
-        canActivate: [SiteAdministratorGuard]
+        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
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
-        canActivate: [GroupAdministratorGuard]
+        canActivate: [GroupAdministratorGuard],
       },
       {
-        path: `${GROUP_EDIT_PATH}/newGroup`,
+        path: `${GROUP_PATH}/create`,
         component: GroupFormComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
-        canActivate: [GroupAdministratorGuard]
+        canActivate: [GroupAdministratorGuard],
       },
       {
-        path: `${GROUP_EDIT_PATH}/:groupId`,
+        path: `${GROUP_PATH}/:groupId/edit`,
         component: GroupFormComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'admin.access-control.groups.title.singleGroup', breadcrumbKey: 'admin.access-control.groups.singleGroup' },
-        canActivate: [GroupPageGuard]
-      }
-    ])
-  ]
+        canActivate: [GroupPageGuard],
+      },
+      {
+        path: 'bulk-access',
+        component: BulkAccessComponent,
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        data: { title: 'admin.access-control.bulk-access.title', breadcrumbKey: 'admin.access-control.bulk-access' },
+        canActivate: [SiteAdministratorGuard],
+      },
+    ]),
+  ],
 })
 /**
  * Routing module for the AccessControl section of the admin sidebar
diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts
index 891238bbed..87737987e0 100644
--- a/src/app/access-control/access-control.module.ts
+++ b/src/app/access-control/access-control.module.ts
@@ -1,15 +1,35 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+import { AbstractControl } from '@angular/forms';
 import { RouterModule } from '@angular/router';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DYNAMIC_ERROR_MESSAGES_MATCHER,
+  DynamicErrorMessagesMatcher,
+} from '@ng-dynamic-forms/core';
+
+import { AccessControlFormModule } from '../shared/access-control-form-container/access-control-form.module';
+import { FormModule } from '../shared/form/form.module';
+import { SearchModule } from '../shared/search/search.module';
 import { SharedModule } from '../shared/shared.module';
 import { AccessControlRoutingModule } from './access-control-routing.module';
+import { BulkAccessBrowseComponent } from './bulk-access/browse/bulk-access-browse.component';
+import { BulkAccessComponent } from './bulk-access/bulk-access.component';
+import { BulkAccessSettingsComponent } from './bulk-access/settings/bulk-access-settings.component';
 import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
 import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
 import { GroupFormComponent } from './group-registry/group-form/group-form.component';
 import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
 import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-import { FormModule } from '../shared/form/form.module';
+
+/**
+ * Condition for displaying error messages on email form field
+ */
+export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
+  (control: AbstractControl, model: any, hasFocus: boolean) => {
+    return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
+  };
 
 @NgModule({
   imports: [
@@ -17,7 +37,13 @@ import { FormModule } from '../shared/form/form.module';
     SharedModule,
     RouterModule,
     AccessControlRoutingModule,
-    FormModule
+    FormModule,
+    NgbAccordionModule,
+    SearchModule,
+    AccessControlFormModule,
+  ],
+  exports: [
+    MembersListComponent,
   ],
   declarations: [
     EPeopleRegistryComponent,
@@ -25,8 +51,17 @@ import { FormModule } from '../shared/form/form.module';
     GroupsRegistryComponent,
     GroupFormComponent,
     SubgroupsListComponent,
-    MembersListComponent
-  ]
+    MembersListComponent,
+    BulkAccessComponent,
+    BulkAccessBrowseComponent,
+    BulkAccessSettingsComponent,
+  ],
+  providers: [
+    {
+      provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
+      useValue: ValidateEmailErrorStateMatcher,
+    },
+  ],
 })
 /**
  * This module handles all components related to the access control pages
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
new file mode 100644
index 0000000000..6e967b53b5
--- /dev/null
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.html
@@ -0,0 +1,69 @@
+<ngb-accordion #acc="ngbAccordion" [activeIds]="'browse'">
+  <ngb-panel [id]="'browse'">
+    <ng-template ngbPanelHeader>
+      <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="bulk-access-browse-panel-content">
+          {{ 'admin.access-control.bulk-access-browse.header' | translate }}
+        </button>
+        <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>
+        </div>
+      </div>
+    </ng-template>
+    <ng-template ngbPanelContent>
+      <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)"
+                [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>
+    </ng-template>
+  </ngb-panel>
+</ngb-accordion>
diff --git a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
similarity index 100%
rename from src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss
rename to src/app/access-control/bulk-access/browse/bulk-access-browse.component.scss
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
new file mode 100644
index 0000000000..e99c25a195
--- /dev/null
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.spec.ts
@@ -0,0 +1,88 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  NgbAccordionModule,
+  NgbNavModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { SelectableObject } from '../../../shared/object-list/selectable-list/selectable-list.service.spec';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { BulkAccessBrowseComponent } from './bulk-access-browse.component';
+
+describe('BulkAccessBrowseComponent', () => {
+  let component: BulkAccessBrowseComponent;
+  let fixture: ComponentFixture<BulkAccessBrowseComponent>;
+
+  const listID1 = 'id1';
+  const value1 = 'Selected object';
+  const value2 = 'Another selected object';
+
+  const selected1 = new SelectableObject(value1);
+  const selected2 = new SelectableObject(value2);
+
+  const testSelection = { id: listID1, selection: [selected1, selected2] } ;
+
+  const selectableListService = jasmine.createSpyObj('SelectableListService', ['getSelectableList', 'deselectAll']);
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        NgbAccordionModule,
+        NgbNavModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [BulkAccessBrowseComponent],
+      providers: [ { provide: SelectableListService, useValue: selectableListService } ],
+      schemas: [
+        NO_ERRORS_SCHEMA,
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BulkAccessBrowseComponent);
+    component = fixture.componentInstance;
+    (component as any).selectableListService.getSelectableList.and.returnValue(of(testSelection));
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.destroy();
+    component = null;
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have an initial active nav id of "search"', () => {
+    expect(component.activateId).toEqual('search');
+  });
+
+  it('should have an initial pagination options object with default values', () => {
+    expect(component.paginationOptions$.getValue().id).toEqual('bas');
+    expect(component.paginationOptions$.getValue().pageSize).toEqual(5);
+    expect(component.paginationOptions$.getValue().currentPage).toEqual(1);
+  });
+
+  it('should have an initial remote data with a paginated list as value', () => {
+    const list = buildPaginatedList(new PageInfo({
+      'elementsPerPage': 5,
+      'totalElements': 2,
+      'totalPages': 1,
+      'currentPage': 1,
+    }), [selected1, selected2]) ;
+    const rd = createSuccessfulRemoteDataObject(list);
+
+    expect(component.objectsSelected$.value).toEqual(rd);
+  });
+
+});
diff --git a/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
new file mode 100644
index 0000000000..6b221f107e
--- /dev/null
+++ b/src/app/access-control/bulk-access/browse/bulk-access-browse.component.ts
@@ -0,0 +1,132 @@
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../../shared/empty.util';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { SelectableListState } from '../../../shared/object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+
+@Component({
+  selector: 'ds-bulk-access-browse',
+  templateUrl: 'bulk-access-browse.component.html',
+  styleUrls: ['./bulk-access-browse.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class BulkAccessBrowseComponent implements OnInit, OnDestroy {
+
+  /**
+   * The selection list id
+   */
+  @Input() listId!: string;
+
+  /**
+   * The active nav id
+   */
+  activateId = 'search';
+
+  /**
+   * The list of the objects already selected
+   */
+  objectsSelected$: BehaviorSubject<RemoteData<PaginatedList<ListableObject>>> = new BehaviorSubject<RemoteData<PaginatedList<ListableObject>>>(null);
+
+  /**
+   * The pagination options object used for the list of selected elements
+   */
+  paginationOptions$: BehaviorSubject<PaginationComponentOptions> = new BehaviorSubject<PaginationComponentOptions>(Object.assign(new PaginationComponentOptions(), {
+    id: 'bas',
+    pageSize: 5,
+    currentPage: 1,
+  }));
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   */
+  private subs: Subscription[] = [];
+
+  constructor(private selectableListService: SelectableListService) {}
+
+  /**
+   * Subscribe to selectable list updates
+   */
+  ngOnInit(): void {
+
+    this.subs.push(
+      this.selectableListService.getSelectableList(this.listId).pipe(
+        distinctUntilChanged(),
+        map((list: SelectableListState) => this.generatePaginatedListBySelectedElements(list)),
+      ).subscribe(this.objectsSelected$),
+    );
+  }
+
+  pageNext() {
+    this.paginationOptions$.next(Object.assign(new PaginationComponentOptions(), this.paginationOptions$.value, {
+      currentPage: this.paginationOptions$.value.currentPage + 1,
+    }));
+  }
+
+  pagePrev() {
+    this.paginationOptions$.next(Object.assign(new PaginationComponentOptions(), this.paginationOptions$.value, {
+      currentPage: this.paginationOptions$.value.currentPage - 1,
+    }));
+  }
+
+  private calculatePageCount(pageSize, totalCount = 0) {
+    // we suppose that if we have 0 items we want 1 empty page
+    return totalCount < pageSize ? 1 : Math.ceil(totalCount / pageSize);
+  }
+
+  /**
+   * Generate The RemoteData object containing the list of the selected elements
+   * @param list
+   * @private
+   */
+  private generatePaginatedListBySelectedElements(list: SelectableListState): RemoteData<PaginatedList<ListableObject>> {
+    const pageInfo = new PageInfo({
+      elementsPerPage: this.paginationOptions$.value.pageSize,
+      totalElements: list?.selection.length,
+      totalPages: this.calculatePageCount(this.paginationOptions$.value.pageSize, list?.selection.length),
+      currentPage: this.paginationOptions$.value.currentPage,
+    });
+    if (pageInfo.currentPage > pageInfo.totalPages) {
+      pageInfo.currentPage = pageInfo.totalPages;
+      this.paginationOptions$.next(Object.assign(new PaginationComponentOptions(), this.paginationOptions$.value, {
+        currentPage: pageInfo.currentPage,
+      }));
+    }
+    return createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, list?.selection || []));
+  }
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+    this.selectableListService.deselectAll(this.listId);
+  }
+}
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
new file mode 100644
index 0000000000..c164cc5c31
--- /dev/null
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -0,0 +1,20 @@
+<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>
+
+  <hr>
+
+  <div class="d-flex justify-content-end">
+    <button class="btn btn-outline-primary mr-3" (click)="reset()">
+      {{ 'access-control-cancel' | translate }}
+    </button>
+    <button class="btn btn-primary" [disabled]="!canExport()" (click)="submit()">
+      {{ 'access-control-execute' | translate }}
+    </button>
+  </div>
+</div>
+
+
+
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/access-control/bulk-access/bulk-access.component.scss
similarity index 100%
rename from src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
rename to src/app/access-control/bulk-access/bulk-access.component.scss
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
new file mode 100644
index 0000000000..e7ec28c132
--- /dev/null
+++ b/src/app/access-control/bulk-access/bulk-access.component.spec.ts
@@ -0,0 +1,160 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { Process } from '../../process-page/processes/process.model';
+import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { BulkAccessComponent } from './bulk-access.component';
+
+describe('BulkAccessComponent', () => {
+  let component: BulkAccessComponent;
+  let fixture: ComponentFixture<BulkAccessComponent>;
+  let bulkAccessControlService: any;
+  let selectableListService: any;
+
+  const selectableListServiceMock = jasmine.createSpyObj('SelectableListService', ['getSelectableList', 'deselectAll']);
+  const bulkAccessControlServiceMock = jasmine.createSpyObj('bulkAccessControlService', ['createPayloadFile', 'executeScript']);
+
+  const mockFormState = {
+    'bitstream': [],
+    'item': [
+      {
+        'name': 'embargo',
+        'startDate': {
+          'year': 2026,
+          'month': 5,
+          'day': 31,
+        },
+        'endDate': null,
+      },
+    ],
+    'state': {
+      'item': {
+        'toggleStatus': true,
+        'accessMode': 'replace',
+      },
+      'bitstream': {
+        'toggleStatus': false,
+        'accessMode': '',
+        'changesLimit': '',
+        'selectedBitstreams': [],
+      },
+    },
+  };
+
+  const mockFile = {
+    'uuids': [
+      '1234', '5678',
+    ],
+    'file': {  },
+  };
+
+  const mockSettings: any = jasmine.createSpyObj('AccessControlFormContainerComponent',  {
+    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'];
+
+  const selectableListStateEmpty: SelectableListState = { id: 'test', selection: [] };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        RouterTestingModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [ BulkAccessComponent ],
+      providers: [
+        { provide: BulkAccessControlService, useValue: bulkAccessControlServiceMock },
+        { provide: NotificationsService, useValue: NotificationsServiceStub },
+        { provide: SelectableListService, useValue: selectableListServiceMock },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BulkAccessComponent);
+    component = fixture.componentInstance;
+    bulkAccessControlService = TestBed.inject(BulkAccessControlService);
+    selectableListService = TestBed.inject(SelectableListService);
+
+  });
+
+  afterEach(() => {
+    fixture.destroy();
+  });
+
+  describe('when there are no elements selected', () => {
+
+    beforeEach(() => {
+
+      (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListStateEmpty));
+      fixture.detectChanges();
+      component.settings = mockSettings;
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should generate the id list by selected elements', () => {
+      expect(component.objectsSelected$.value).toEqual([]);
+    });
+
+    it('should disable the execute button when there are no objects selected', () => {
+      expect(component.canExport()).toBe(false);
+    });
+
+  });
+
+  describe('when there are elements selected', () => {
+
+    beforeEach(() => {
+
+      (component as any).selectableListService.getSelectableList.and.returnValue(of(selectableListState));
+      fixture.detectChanges();
+      component.settings = mockSettings;
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should generate the id list by selected elements', () => {
+      expect(component.objectsSelected$.value).toEqual(expectedIdList);
+    });
+
+    it('should enable the execute button when there are objects selected', () => {
+      component.objectsSelected$.next(['1234']);
+      expect(component.canExport()).toBe(true);
+    });
+
+    it('should call the settings reset method when reset is called', () => {
+      component.reset();
+      expect(component.settings.reset).toHaveBeenCalled();
+    });
+
+    it('should call the bulkAccessControlService executeScript method when submit is called', () => {
+      (component.settings as any).getValue.and.returnValue(mockFormState);
+      bulkAccessControlService.createPayloadFile.and.returnValue(mockFile);
+      bulkAccessControlService.executeScript.and.returnValue(createSuccessfulRemoteDataObject$(new Process()));
+      component.objectsSelected$.next(['1234']);
+      component.submit();
+      expect(bulkAccessControlService.executeScript).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/access-control/bulk-access/bulk-access.component.ts b/src/app/access-control/bulk-access/bulk-access.component.ts
new file mode 100644
index 0000000000..52faa97dbc
--- /dev/null
+++ b/src/app/access-control/bulk-access/bulk-access.component.ts
@@ -0,0 +1,103 @@
+import {
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
+
+import { BulkAccessControlService } from '../../shared/access-control-form-container/bulk-access-control.service';
+import { SelectableListState } from '../../shared/object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { BulkAccessSettingsComponent } from './settings/bulk-access-settings.component';
+
+@Component({
+  selector: 'ds-bulk-access',
+  templateUrl: './bulk-access.component.html',
+  styleUrls: ['./bulk-access.component.scss'],
+})
+export class BulkAccessComponent implements OnInit {
+
+  /**
+   * The selection list id
+   */
+  listId = 'bulk-access-list';
+
+  /**
+   * The list of the objects already selected
+   */
+  objectsSelected$: BehaviorSubject<string[]> = new BehaviorSubject<string[]>([]);
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * The SectionsDirective reference
+   */
+  @ViewChild('dsBulkSettings') settings: BulkAccessSettingsComponent;
+
+  constructor(
+    private bulkAccessControlService: BulkAccessControlService,
+    private selectableListService: SelectableListService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.subs.push(
+      this.selectableListService.getSelectableList(this.listId).pipe(
+        distinctUntilChanged(),
+        map((list: SelectableListState) => this.generateIdListBySelectedElements(list)),
+      ).subscribe(this.objectsSelected$),
+    );
+  }
+
+  canExport(): boolean {
+    return this.objectsSelected$.value?.length > 0;
+  }
+
+  /**
+   * Reset the form to its initial state
+   * This will also reset the state of the child components (bitstream and item access)
+   */
+  reset(): void {
+    this.settings.reset();
+  }
+
+  /**
+   * Submit the form
+   * This will create a payload file and execute the script
+   */
+  submit(): void {
+    const settings = this.settings.getValue();
+    const bitstreamAccess = settings.bitstream;
+    const itemAccess = settings.item;
+
+    const { file } = this.bulkAccessControlService.createPayloadFile({
+      bitstreamAccess,
+      itemAccess,
+      state: settings.state,
+    });
+
+    this.bulkAccessControlService.executeScript(
+      this.objectsSelected$.value || [],
+      file,
+    ).subscribe();
+  }
+
+  /**
+   * Generate The RemoteData object containing the list of the selected elements
+   * @param list
+   * @private
+   */
+  private generateIdListBySelectedElements(list: SelectableListState): string[] {
+    return list?.selection?.map((entry: any) => entry.indexableObject.uuid);
+  }
+}
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
new file mode 100644
index 0000000000..c41053874e
--- /dev/null
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.html
@@ -0,0 +1,21 @@
+<ngb-accordion #acc="ngbAccordion" [activeIds]="'settings'">
+  <ngb-panel [id]="'settings'">
+    <ng-template ngbPanelHeader>
+      <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 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>
+        </div>
+      </div>
+    </ng-template>
+    <ng-template ngbPanelContent>
+      <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/community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.scss
similarity index 100%
rename from src/app/community-page/sub-community-list/community-page-sub-community-list.component.scss
rename to src/app/access-control/bulk-access/settings/bulk-access-settings.component.scss
diff --git a/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
new file mode 100644
index 0000000000..f3c1cad04a
--- /dev/null
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.spec.ts
@@ -0,0 +1,85 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { BulkAccessSettingsComponent } from './bulk-access-settings.component';
+
+describe('BulkAccessSettingsComponent', () => {
+  let component: BulkAccessSettingsComponent;
+  let fixture: ComponentFixture<BulkAccessSettingsComponent>;
+  const mockFormState = {
+    'bitstream': [],
+    'item': [
+      {
+        'name': 'embargo',
+        'startDate': {
+          'year': 2026,
+          'month': 5,
+          'day': 31,
+        },
+        'endDate': null,
+      },
+    ],
+    'state': {
+      'item': {
+        'toggleStatus': true,
+        'accessMode': 'replace',
+      },
+      'bitstream': {
+        'toggleStatus': false,
+        'accessMode': '',
+        'changesLimit': '',
+        'selectedBitstreams': [],
+      },
+    },
+  };
+
+  const mockControl: any = jasmine.createSpyObj('AccessControlFormContainerComponent',  {
+    getFormValue: jasmine.createSpy('getFormValue'),
+    reset: jasmine.createSpy('reset'),
+  });
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [NgbAccordionModule, TranslateModule.forRoot()],
+      declarations: [BulkAccessSettingsComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BulkAccessSettingsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    component.controlForm = mockControl;
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have a method to get the form value', () => {
+    expect(component.getValue).toBeDefined();
+  });
+
+  it('should have a method to reset the form', () => {
+    expect(component.reset).toBeDefined();
+  });
+
+  it('should return the correct form value', () => {
+    const expectedValue = mockFormState;
+    (component.controlForm as any).getFormValue.and.returnValue(mockFormState);
+    const actualValue = component.getValue();
+    // @ts-ignore
+    expect(actualValue).toEqual(expectedValue);
+  });
+
+  it('should call reset on the control form', () => {
+    component.reset();
+    expect(component.controlForm.reset).toHaveBeenCalled();
+  });
+});
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
new file mode 100644
index 0000000000..d0f95377eb
--- /dev/null
+++ b/src/app/access-control/bulk-access/settings/bulk-access-settings.component.ts
@@ -0,0 +1,36 @@
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+
+import { AccessControlFormContainerComponent } from '../../../shared/access-control-form-container/access-control-form-container.component';
+
+@Component({
+  selector: 'ds-bulk-access-settings',
+  templateUrl: 'bulk-access-settings.component.html',
+  styleUrls: ['./bulk-access-settings.component.scss'],
+  exportAs: 'dsBulkSettings',
+})
+export class BulkAccessSettingsComponent {
+
+  /**
+   * The SectionsDirective reference
+   */
+  @ViewChild('dsAccessControlForm') controlForm: AccessControlFormContainerComponent<any>;
+
+  /**
+   * Will be used from a parent component to read the value of the form
+   */
+  getValue() {
+    return this.controlForm.getFormValue();
+  }
+
+  /**
+   * Reset the form to its initial state
+   * This will also reset the state of the child components (bitstream and item access)
+   */
+  reset() {
+    this.controlForm.reset();
+  }
+
+}
diff --git a/src/app/access-control/epeople-registry/epeople-registry.actions.ts b/src/app/access-control/epeople-registry/epeople-registry.actions.ts
index a07ea37df2..e6e7608ba3 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.actions.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { type } from '../../shared/ngrx/type';
 
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 2d87f21d26..92968d2e28 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,93 @@
   <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">{{labelPrefix + 'button.add' | translate}}</span>
+            <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>{{epersonDto.eperson.name}}</td>
-                <td>{{epersonDto.eperson.email}}</td>
-                <td>
-                  <div class="btn-group edit-field">
-                    <button class="delete-button" (click)="toggleEditEPerson(epersonDto.eperson)"
-                            class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
-                            title="{{labelPrefix + 'table.edit.buttons.edit' | translate: {name: epersonDto.eperson.name} }}">
-                      <i class="fas fa-edit fa-fw"></i>
-                    </button>
-                    <button [disabled]="!epersonDto.ableToDelete" (click)="deleteEPerson(epersonDto.eperson)"
-                            class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
-                            title="{{labelPrefix + 'table.edit.buttons.remove' | translate: {name: epersonDto.eperson.name} }}">
-                      <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) !== true"
+        [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 [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 c0d70fd0b2..ee4d5fa603 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
@@ -1,47 +1,72 @@
-import { Router } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  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 { EPerson } from '../../core/eperson/models/eperson.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
 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 { EPeopleRegistryComponent } from './epeople-registry.component';
-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 { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-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 { RouterStub } from '../../shared/testing/router.stub';
+import { EPeopleRegistryComponent } from './epeople-registry.component';
 
 describe('EPeopleRegistryComponent', () => {
   let component: EPeopleRegistryComponent;
   let fixture: ComponentFixture<EPeopleRegistryComponent>;
-  let translateService: TranslateService;
   let builderService: FormBuilderService;
 
-  let mockEPeople;
+  let mockEPeople: EPerson[];
   let ePersonDataServiceStub: any;
   let authorizationService: AuthorizationDataService;
-  let modalService;
+  let modalService: NgbModal;
+  let paginationService: PaginationServiceStub;
 
-  let paginationService;
-
-  beforeEach(waitForAsync(() => {
+  beforeEach(waitForAsync(async () => {
+    jasmine.getEnv().allowRespy(true);
     mockEPeople = [EPersonMock, EPersonMock2];
     ePersonDataServiceStub = {
       activeEPerson: null,
@@ -51,7 +76,7 @@ describe('EPeopleRegistryComponent', () => {
           elementsPerPage: this.allEpeople.length,
           totalElements: this.allEpeople.length,
           totalPages: 1,
-          currentPage: 1
+          currentPage: 1,
         }), this.allEpeople));
       },
       getActiveEPerson(): Observable<EPerson> {
@@ -66,7 +91,7 @@ describe('EPeopleRegistryComponent', () => {
             elementsPerPage: [result].length,
             totalElements: [result].length,
             totalPages: 1,
-            currentPage: 1
+            currentPage: 1,
           }), [result]));
         }
         if (scope === 'metadata') {
@@ -75,7 +100,7 @@ describe('EPeopleRegistryComponent', () => {
               elementsPerPage: this.allEpeople.length,
               totalElements: this.allEpeople.length,
               totalPages: 1,
-              currentPage: 1
+              currentPage: 1,
             }), this.allEpeople));
           }
           const result = this.allEpeople.find((ePerson: EPerson) => {
@@ -85,14 +110,14 @@ describe('EPeopleRegistryComponent', () => {
             elementsPerPage: [result].length,
             totalElements: [result].length,
             totalPages: 1,
-            currentPage: 1
+            currentPage: 1,
           }), [result]));
         }
         return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
           elementsPerPage: this.allEpeople.length,
           totalElements: this.allEpeople.length,
           totalPages: 1,
-          currentPage: 1
+          currentPage: 1,
         }), this.allEpeople));
       },
       deleteEPerson(ePerson: EPerson): Observable<boolean> {
@@ -112,23 +137,17 @@ describe('EPeopleRegistryComponent', () => {
       },
       getEPeoplePageRouterLink(): string {
         return '/access-control/epeople';
-      }
+      },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     builderService = getMockFormBuilderService();
-    translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+        TranslateModule.forRoot(),
       ],
       declarations: [EPeopleRegistryComponent],
       providers: [
@@ -138,16 +157,16 @@ describe('EPeopleRegistryComponent', () => {
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: new RouterStub() },
         { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(EPeopleRegistryComponent);
     component = fixture.componentInstance;
-    modalService = (component as any).modalService;
+    modalService = TestBed.inject(NgbModal);
     spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
     fixture.detectChanges();
   });
@@ -157,10 +176,10 @@ describe('EPeopleRegistryComponent', () => {
   });
 
   it('should display list of ePeople', () => {
-    const ePeopleIdsFound = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
+    const ePeopleIdsFound: DebugElement[] = fixture.debugElement.queryAll(By.css('#epeople tr td:first-child'));
     expect(ePeopleIdsFound.length).toEqual(2);
     mockEPeople.map((ePerson: EPerson) => {
-      expect(ePeopleIdsFound.find((foundEl) => {
+      expect(ePeopleIdsFound.find((foundEl: DebugElement) => {
         return (foundEl.nativeElement.textContent.trim() === ePerson.uuid);
       })).toBeTruthy();
     });
@@ -168,7 +187,7 @@ describe('EPeopleRegistryComponent', () => {
 
   describe('search', () => {
     describe('when searching with scope/query (scope metadata)', () => {
-      let ePeopleIdsFound;
+      let ePeopleIdsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ scope: 'metadata', query: EPersonMock2.name });
         tick();
@@ -178,14 +197,14 @@ describe('EPeopleRegistryComponent', () => {
 
       it('should display search result', () => {
         expect(ePeopleIdsFound.length).toEqual(1);
-        expect(ePeopleIdsFound.find((foundEl) => {
+        expect(ePeopleIdsFound.find((foundEl: DebugElement) => {
           return (foundEl.nativeElement.textContent.trim() === EPersonMock2.uuid);
         })).toBeTruthy();
       });
     });
 
     describe('when searching with scope/query (scope email)', () => {
-      let ePeopleIdsFound;
+      let ePeopleIdsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ scope: 'email', query: EPersonMock.email });
         tick();
@@ -195,43 +214,13 @@ describe('EPeopleRegistryComponent', () => {
 
       it('should display search result', () => {
         expect(ePeopleIdsFound.length).toEqual(1);
-        expect(ePeopleIdsFound.find((foundEl) => {
+        expect(ePeopleIdsFound.find((foundEl: DebugElement) => {
           return (foundEl.nativeElement.textContent.trim() === EPersonMock.uuid);
         })).toBeTruthy();
       });
     });
   });
 
-  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;
@@ -241,7 +230,7 @@ describe('EPeopleRegistryComponent', () => {
         const deleteButtons = fixture.debugElement.queryAll(By.css('.access-control-deleteEPersonButton'));
         deleteButtons[0].triggerEventHandler('click', {
           preventDefault: () => {/**/
-          }
+          },
         });
         tick();
         fixture.detectChanges();
@@ -257,20 +246,12 @@ describe('EPeopleRegistryComponent', () => {
     });
   });
 
-  describe('delete EPerson button when the isAuthorized returns false', () => {
-    let ePeopleDeleteButton;
-    beforeEach(() => {
-      authorizationService = jasmine.createSpyObj('authorizationService', {
-        isAuthorized: observableOf(false)
-      });
-    });
 
-    it('should be disabled', () => {
-      ePeopleDeleteButton = fixture.debugElement.queryAll(By.css('#epeople tr td div button.delete-button'));
-      ePeopleDeleteButton.forEach((deleteButton) => {
-        expect(deleteButton.nativeElement.disabled).toBe(true);
-      });
+  it('should hide delete EPerson button when the isAuthorized returns false', () => {
+    spyOn(authorizationService, 'isAuthorized').and.returnValue(observableOf(false));
+    component.initialisePage();
+    fixture.detectChanges();
 
-    });
+    expect(fixture.debugElement.query(By.css('#epeople tr td div button.delete-button'))).toBeNull();
   });
 });
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 55233d8173..ddf5fe7bfb 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.ts
@@ -1,26 +1,51 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+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 {
+  buildPaginatedList,
+  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 { EPerson } from '../../core/eperson/models/eperson.model';
+import { EpersonDtoModel } from '../../core/eperson/models/eperson-dto.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { NoContent } from '../../core/shared/NoContent.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+} from '../../core/shared/operators';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../shared/empty.util';
 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 { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { getAllSucceededRemoteData, getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RequestService } from '../../core/data/request.service';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
+import {
+  getEPersonEditRoute,
+  getEPersonsRoute,
+} from '../access-control-routing-paths';
 
 @Component({
   selector: 'ds-epeople-registry',
@@ -60,14 +85,9 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'elp',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
-  /**
-   * Whether or not to show the EPerson form
-   */
-  isEPersonFormShown: boolean;
-
   // The search form
   searchForm;
 
@@ -89,11 +109,13 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
               private authorizationService: AuthorizationDataService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private router: Router,
               private modalService: NgbModal,
               private paginationService: PaginationService,
-              public requestService: RequestService) {
+              public requestService: RequestService,
+              public dsoNameService: DSONameService,
+  ) {
     this.currentSearchQuery = '';
     this.currentSearchScope = 'metadata';
     this.searchForm = this.formBuilder.group(({
@@ -111,24 +133,18 @@ 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.search({ scope: this.currentSearchScope, query: this.currentSearchQuery });
     this.subs.push(this.ePeople$.pipe(
       switchMap((epeople: PaginatedList<EPerson>) => {
         if (epeople.pageInfo.totalElements > 0) {
-          return combineLatest(...epeople.page.map((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();
                 epersonDtoModel.ableToDelete = authorized;
                 epersonDtoModel.eperson = eperson;
                 return epersonDtoModel;
-              })
+              }),
             );
           })).pipe(map((dtos: EpersonDtoModel[]) => {
             return buildPaginatedList(epeople.pageInfo, dtos);
@@ -154,34 +170,34 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     }
     this.findListOptionsSub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
       switchMap((findListOptions) => {
-          const query: string = data.query;
-          const scope: string = data.scope;
-          if (query != null && this.currentSearchQuery !== query) {
-            this.router.navigate([this.epersonService.getEPeoplePageRouterLink()], {
-              queryParamsHandling: 'merge'
-            });
-            this.currentSearchQuery = query;
-            this.paginationService.resetPage(this.config.id);
-          }
-          if (scope != null && this.currentSearchScope !== scope) {
-            this.router.navigate([this.epersonService.getEPeoplePageRouterLink()], {
-              queryParamsHandling: 'merge'
-            });
-            this.currentSearchScope = scope;
-            this.paginationService.resetPage(this.config.id);
-
-          }
-          return this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
-            currentPage: findListOptions.currentPage,
-            elementsPerPage: findListOptions.pageSize
+        const query: string = data.query;
+        const scope: string = data.scope;
+        if (query != null && this.currentSearchQuery !== query) {
+          void this.router.navigate([getEPersonsRoute()], {
+            queryParamsHandling: 'merge',
           });
+          this.currentSearchQuery = query;
+          this.paginationService.resetPage(this.config.id);
         }
+        if (scope != null && this.currentSearchScope !== scope) {
+          void this.router.navigate([getEPersonsRoute()], {
+            queryParamsHandling: 'merge',
+          });
+          this.currentSearchScope = scope;
+          this.paginationService.resetPage(this.config.id);
+
+        }
+        return this.epersonService.searchByScope(this.currentSearchScope, this.currentSearchQuery, {
+          currentPage: findListOptions.currentPage,
+          elementsPerPage: findListOptions.pageSize,
+        });
+      },
       ),
       getAllSucceededRemoteData(),
     ).subscribe((peopleRD) => {
-        this.ePeople$.next(peopleRD.payload);
-        this.pageInfoState$.next(peopleRD.payload.pageInfo);
-      }
+      this.ePeople$.next(peopleRD.payload);
+      this.pageInfoState$.next(peopleRD.payload.pageInfo);
+    },
     );
   }
 
@@ -191,7 +207,7 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
    */
   isActive(eperson: EPerson): Observable<boolean> {
     return this.getActiveEPerson().pipe(
-      map((activeEPerson) => eperson === activeEPerson)
+      map((activeEPerson) => eperson === activeEPerson),
     );
   }
 
@@ -202,30 +218,13 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     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
    */
   deleteEPerson(ePerson: EPerson) {
     if (hasValue(ePerson.id)) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = ePerson;
+      modalRef.componentInstance.name = this.dsoNameService.getName(ePerson);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
@@ -237,9 +236,9 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
           if (hasValue(ePerson.id)) {
             this.epersonService.deleteEPerson(ePerson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData<NoContent>) => {
               if (restResponse.hasSucceeded) {
-                this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', {name: ePerson.name}));
+                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 }));
               }
             });
           }
@@ -261,16 +260,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
    */
@@ -278,20 +267,10 @@ export class EPeopleRegistryComponent implements OnInit, OnDestroy {
     this.searchForm.patchValue({
       query: '',
     });
-    this.search({query: ''});
+    this.search({ query: '' });
   }
 
-  /**
-   * This method will set everything to stale, which will cause the lists on this page to update.
-   */
-  reset() {
-    this.epersonService.getBrowseEndpoint().pipe(
-      take(1)
-    ).subscribe((href: string) => {
-      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/epeople-registry.reducers.spec.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
index 7158acc79b..6bee3f84e2 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.reducers.spec.ts
@@ -1,6 +1,12 @@
-import { EPeopleRegistryCancelEPersonAction, EPeopleRegistryEditEPersonAction } from './epeople-registry.actions';
-import { ePeopleRegistryReducer, EPeopleRegistryState } from './epeople-registry.reducers';
 import { EPersonMock } from '../../shared/testing/eperson.mock';
+import {
+  EPeopleRegistryCancelEPersonAction,
+  EPeopleRegistryEditEPersonAction,
+} from './epeople-registry.actions';
+import {
+  ePeopleRegistryReducer,
+  EPeopleRegistryState,
+} from './epeople-registry.reducers';
 
 const initialState: EPeopleRegistryState = {
   editEPerson: null,
diff --git a/src/app/access-control/epeople-registry/epeople-registry.reducers.ts b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
index 1e0319f3ba..3bab6769e1 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
+++ b/src/app/access-control/epeople-registry/epeople-registry.reducers.ts
@@ -2,7 +2,7 @@ import { EPerson } from '../../core/eperson/models/eperson.model';
 import {
   EPeopleRegistryAction,
   EPeopleRegistryActionTypes,
-  EPeopleRegistryEditEPersonAction
+  EPeopleRegistryEditEPersonAction,
 } from './epeople-registry.actions';
 
 /**
@@ -30,13 +30,13 @@ export function ePeopleRegistryReducer(state = initialState, action: EPeopleRegi
 
     case EPeopleRegistryActionTypes.EDIT_EPERSON: {
       return Object.assign({}, state, {
-        editEPerson: (action as EPeopleRegistryEditEPersonAction).eperson
+        editEPerson: (action as EPeopleRegistryEditEPersonAction).eperson,
       });
     }
 
     case EPeopleRegistryActionTypes.CANCEL_EDIT_EPERSON: {
       return Object.assign({}, state, {
-        editEPerson: null
+        editEPerson: null,
       });
     }
 
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 e9cc48aee3..9168bbaf8e 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,84 +1,97 @@
-<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="epersonService.getActiveEPerson() | 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"
-         (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 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" [disabled]="(canReset$ | async) !== true" 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="epersonService.getActiveEPerson() | 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 | dsHasNoValue"></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)]">{{group.name}}</a></td>
-          <td class="align-middle">{{(group.object | async)?.payload?.name}}</td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
+        <ds-pagination
+          *ngIf="(groups$ | async)?.payload?.totalElements > 0"
+          [paginationOptions]="config"
+          [pageInfoState]="groupsPageInfoState$"
+          [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(undefined) }}</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 a96c238f93..5196eee631 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,36 +1,70 @@
-import { Observable, of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+  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 { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  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 { EPerson } from '../../../core/eperson/models/eperson.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../shared/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { HasNoValuePipe } from '../../../shared/utils/has-no-value.pipe';
 import { EPeopleRegistryComponent } from '../epeople-registry.component';
 import { EPersonFormComponent } from './eperson-form.component';
-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';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-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';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
-import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
 
 describe('EPersonFormComponent', () => {
   let component: EPersonFormComponent;
@@ -43,6 +77,8 @@ describe('EPersonFormComponent', () => {
   let authorizationService: AuthorizationDataService;
   let groupsDataService: GroupDataService;
   let epersonRegistrationService: EpersonRegistrationService;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
 
   let paginationService;
 
@@ -106,70 +142,73 @@ 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(),{
       createFormGroup(formModel, options = null) {
         const controls = {};
         formModel.forEach( model => {
-            model.parent = parent;
-            const controlModel = model;
-            const controlState = { value: controlModel.value, disabled: controlModel.disabled };
-            const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
-            controls[model.id] = new FormControl(controlState, controlOptions);
+          model.parent = parent;
+          const controlModel = model;
+          const controlState = { value: controlModel.value, disabled: controlModel.disabled };
+          const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
+          controls[model.id] = new UntypedFormControl(controlState, controlOptions);
         });
-        return new FormGroup(controls, options);
+        return new UntypedFormGroup(controls, options);
       },
       createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
         return {
-            validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
+          validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
         };
       },
       getValidators(validatorsConfig) {
-          return this.getValidatorFns(validatorsConfig);
+        return this.getValidatorFns(validatorsConfig);
       },
       getValidatorFns(validatorsConfig, validatorsToken = this._NG_VALIDATORS) {
         let validatorFns = [];
         if (this.isObject(validatorsConfig)) {
-            validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
-                const validatorConfigValue = validatorsConfig[validatorConfigKey];
-                if (this.isValidatorDescriptor(validatorConfigValue)) {
-                    const descriptor = validatorConfigValue;
-                    return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
-                }
-                return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
-            });
+          validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
+            const validatorConfigValue = validatorsConfig[validatorConfigKey];
+            if (this.isValidatorDescriptor(validatorConfigValue)) {
+              const descriptor = validatorConfigValue;
+              return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
+            }
+            return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
+          });
         }
         return validatorFns;
       },
       getValidatorFn(validatorName, validatorArgs = null, validatorsToken = this._NG_VALIDATORS) {
         let validatorFn;
         if (Validators.hasOwnProperty(validatorName)) { // Built-in Angular Validators
-            validatorFn = Validators[validatorName];
+          validatorFn = Validators[validatorName];
         } else { // Custom Validators
-            if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
-                validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
-            } else if (validatorsToken) {
-                validatorFn = validatorsToken.find(validator => validator.name === validatorName);
-            }
+          if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
+            validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
+          } else if (validatorsToken) {
+            validatorFn = validatorsToken.find(validator => validator.name === validatorName);
+          }
         }
         if (validatorFn === undefined) { // throw when no validator could be resolved
-            throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
+          throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
         }
         if (validatorArgs !== null) {
-            return validatorFn(validatorArgs);
+          return validatorFn(validatorArgs);
         }
         return validatorFn;
-    },
+      },
       isValidatorDescriptor(value) {
-          if (this.isObject(value)) {
-              return value.hasOwnProperty('name') && value.hasOwnProperty('args');
-          }
-          return false;
+        if (this.isObject(value)) {
+          return value.hasOwnProperty('name') && value.hasOwnProperty('args');
+        }
+        return false;
       },
       isObject(value) {
         return typeof value === 'object' && value !== null;
-      }
+      },
     });
     authService = new AuthServiceStub();
     authorizationService = jasmine.createSpyObj('authorizationService', {
@@ -178,20 +217,25 @@ describe('EPersonFormComponent', () => {
     });
     groupsDataService = jasmine.createSpyObj('groupsDataService', {
       findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-      getGroupRegistryRouterLink: ''
+      getGroupRegistryRouterLink: '',
     });
 
     paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
     TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
-      declarations: [EPersonFormComponent],
+      declarations: [
+        EPersonFormComponent,
+        HasNoValuePipe,
+      ],
       providers: [
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataService },
@@ -200,16 +244,18 @@ describe('EPersonFormComponent', () => {
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring'])},
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
         { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
-        EPeopleRegistryComponent
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: router },
+        EPeopleRegistryComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
-    registerEmail: createSuccessfulRemoteDataObject$(null)
+    registerEmail: createSuccessfulRemoteDataObject$(null),
   });
 
   beforeEach(() => {
@@ -241,12 +287,12 @@ describe('EPersonFormComponent', () => {
         metadata: {
           'eperson.firstname': [
             {
-              value: firstName
-            }
+              value: firstName,
+            },
           ],
           'eperson.lastname': [
             {
-              value: lastName
+              value: lastName,
             },
           ],
         },
@@ -263,24 +309,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 +330,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(() => {
-          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(() => {
-          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(() => {
-          expect(component.formGroup.controls.email.valid).toBeTrue();
-          expect(component.formGroup.controls.email.errors).toBeNull();
-        });
-      }));
+      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', () => {
+        expect(component.formGroup.controls.lastName.valid).toBeTrue();
+        expect(component.formGroup.controls.lastName.errors).toBeNull();
+      });
+      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 +350,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(() => {
-          expect(component.formGroup.controls.email.valid).toBeFalse();
-          expect(component.formGroup.controls.email.errors.pattern).toBeTruthy();
-        });
-      }));
+      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', () => {
@@ -329,19 +361,17 @@ describe('EPersonFormComponent', () => {
         const ePersonServiceWithEperson = Object.assign(ePersonDataServiceStub,{
           getEPersonByEmail(): Observable<RemoteData<EPerson>> {
             return createSuccessfulRemoteDataObject$(EPersonMock);
-          }
+          },
         });
         component.formGroup.controls.email.setValue('test@test.com');
         component.formGroup.controls.email.setAsyncValidators(ValidateEmailNotTaken.createValidator(ePersonServiceWithEperson));
         fixture.detectChanges();
       });
 
-      it('email should not be valid because email is already taken', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.formGroup.controls.email.valid).toBeFalse();
-          expect(component.formGroup.controls.email.errors.emailTaken).toBeTruthy();
-        });
-      }));
+      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();
+      });
     });
 
 
@@ -366,12 +396,12 @@ describe('EPersonFormComponent', () => {
         metadata: {
           'eperson.firstname': [
             {
-              value: firstName
-            }
+              value: firstName,
+            },
           ],
           'eperson.lastname': [
             {
-              value: lastName
+              value: lastName,
             },
           ],
         },
@@ -393,11 +423,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', () => {
@@ -409,30 +437,28 @@ describe('EPersonFormComponent', () => {
           metadata: {
             'eperson.firstname': [
               {
-                value: firstName
-              }
+                value: firstName,
+              },
             ],
             'eperson.lastname': [
               {
-                value: lastName
+                value: lastName,
               },
             ],
           },
           email: email,
           canLogIn: canLogIn,
           requireCertificate: requireCertificate,
-          _links: undefined
+          _links: undefined,
         });
         spyOn(ePersonDataServiceStub, 'getActiveEPerson').and.returnValue(observableOf(expectedWithId));
         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);
+      });
     });
   });
 
@@ -443,7 +469,7 @@ describe('EPersonFormComponent', () => {
       spyOn(authService, 'impersonate').and.callThrough();
       ePersonId = 'testEPersonId';
       component.epersonInitial = Object.assign(new EPerson(), {
-        id: ePersonId
+        id: ePersonId,
       });
       component.impersonate();
     });
@@ -491,16 +517,16 @@ describe('EPersonFormComponent', () => {
 
     });
 
-    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', () => {
@@ -531,13 +557,13 @@ describe('EPersonFormComponent', () => {
       ePersonEmail = 'person.email@4science.it';
       component.epersonInitial = Object.assign(new EPerson(), {
         id: ePersonId,
-        email: ePersonEmail
+        email: ePersonEmail,
       });
       component.resetPassword();
     });
 
     it('should call epersonRegistrationService.registerEmail', () => {
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail);
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith(ePersonEmail, null, 'forgot');
     });
   });
 });
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 7d607647e3..7eb743f1ab 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
@@ -1,41 +1,68 @@
-import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicCheckboxModel,
   DynamicFormControlModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { debounceTime, switchMap, take } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  finalize,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+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 { EPerson } from '../../../core/eperson/models/eperson.model';
 import { Group } from '../../../core/eperson/models/group.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { Registration } from '../../../core/shared/registration.model';
+import { TYPE_REQUEST_FORGOT } from '../../../register-email-form/register-email-form.component';
+import { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
 import { hasValue } from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-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 { ConfirmationModalComponent } from '../../../shared/confirmation-modal/confirmation-modal.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RequestService } from '../../../core/data/request.service';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { PaginationService } from '../../../core/pagination/pagination.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { getEPersonsRoute } from '../../access-control-routing-paths';
 import { ValidateEmailNotTaken } from './validators/email-taken.validator';
-import { Registration } from '../../../core/shared/registration.model';
-import { EpersonRegistrationService } from '../../../core/data/eperson-registration.service';
 
 @Component({
   selector: 'ds-eperson-form',
@@ -79,35 +106,35 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     firstName: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     lastName: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     email: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     canLogIn: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     requireCertificate: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
   };
 
   /**
    * A FormGroup that combines all inputs
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * An EventEmitter that's fired whenever the form is being submitted
@@ -143,7 +170,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   /**
    * A list of all the groups this EPerson is a member of
    */
-  groups: Observable<RemoteData<PaginatedList<Group>>>;
+  groups$: Observable<RemoteData<PaginatedList<Group>>>;
+
+  /**
+   * The pagination of the {@link groups$} list.
+   */
+  groupsPageInfoState$: Observable<PageInfo>;
 
   /**
    * Pagination config used to display the list of groups
@@ -151,7 +183,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'gem',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -164,6 +196,15 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   isImpersonated = false;
 
+  /**
+   * A boolean that indicate if to display EPersonForm's Rest password button
+   */
+  displayResetPassword = false;
+
+  /**
+   * A string that indicate the label of Submit button
+   */
+  submitLabel = 'form.create';
   /**
    * Subscription to email field value change
    */
@@ -182,11 +223,16 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     private paginationService: PaginationService,
     public requestService: RequestService,
     private epersonRegistrationService: EpersonRegistrationService,
+    public dsoNameService: DSONameService,
+    protected route: ActivatedRoute,
+    protected router: Router,
   ) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
       this.epersonInitial = eperson;
       if (hasValue(eperson)) {
         this.isImpersonated = this.authService.isImpersonatingUser(eperson.id);
+        this.displayResetPassword = true;
+        this.submitLabel = 'form.submit';
       }
     }));
   }
@@ -199,15 +245,17 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * This method will initialise the page
    */
   initialisePage() {
-
-    observableCombineLatest(
+    this.subs.push(this.epersonService.findById(this.route.snapshot.params.id).subscribe((ePersonRD: RemoteData<EPerson>) => {
+      this.epersonService.editEPerson(ePersonRD.payload);
+    }));
+    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]) => {
+    ]).subscribe(([firstName, lastName, email, canLogIn, requireCertificate, emailHint]) => {
       this.firstName = new DynamicInputModel({
         id: 'firstName',
         label: firstName,
@@ -237,23 +285,23 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         required: true,
         errorMessages: {
           emailTaken: 'error.validation.emailTaken',
-          pattern: 'error.validation.NotValidEmail'
+          pattern: 'error.validation.NotValidEmail',
         },
-        hint: emailHint
+        hint: emailHint,
       });
       this.canLogIn = new DynamicCheckboxModel(
         {
           id: 'canLogIn',
           label: canLogIn,
           name: 'canLogIn',
-          value: (this.epersonInitial != null ? this.epersonInitial.canLogIn : true)
+          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)
+          value: (this.epersonInitial != null ? this.epersonInitial.requireCertificate : false),
         });
       this.formModel = [
         this.firstName,
@@ -265,9 +313,9 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       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, {
+          this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, {
             currentPage: 1,
-            elementsPerPage: this.config.pageSize
+            elementsPerPage: this.config.pageSize,
           });
         }
         this.formGroup.patchValue({
@@ -275,7 +323,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           lastName: eperson != null ? eperson.firstMetadataValue('eperson.lastname') : '',
           email: eperson != null ? eperson.email : '',
           canLogIn: eperson != null ? eperson.canLogIn : true,
-          requireCertificate: eperson != null ? eperson.requireCertificate : false
+          requireCertificate: eperson != null ? eperson.requireCertificate : false,
         });
 
         if (eperson === null && !!this.formGroup.controls.email) {
@@ -288,11 +336,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
 
       const activeEPerson$ = this.epersonService.getActiveEPerson();
 
-      this.groups = activeEPerson$.pipe(
+      this.groups$ = activeEPerson$.pipe(
         switchMap((eperson) => {
           return observableCombineLatest([observableOf(eperson), this.paginationService.getFindListOptions(this.config.id, {
             currentPage: 1,
-            elementsPerPage: this.config.pageSize
+            elementsPerPage: this.config.pageSize,
           })]);
         }),
         switchMap(([eperson, findListOptions]) => {
@@ -300,7 +348,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
             return this.groupsDataService.findListByHref(eperson._links.groups.href, findListOptions, true, true, followLink('object'));
           }
           return observableOf(undefined);
-        })
+        }),
+      );
+
+      this.groupsPageInfoState$ = this.groups$.pipe(
+        map(groupsRD => groupsRD.payload.pageInfo),
       );
 
       this.canImpersonate$ = activeEPerson$.pipe(
@@ -310,10 +362,10 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           } else {
             return observableOf(false);
           }
-        })
+        }),
       );
       this.canDelete$ = activeEPerson$.pipe(
-        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined))
+        switchMap((eperson) => this.authorizationService.isAuthorized(FeatureID.CanDelete, hasValue(eperson) ? eperson.self : undefined)),
       );
       this.canReset$ = observableOf(true);
     });
@@ -325,6 +377,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   onCancel() {
     this.epersonService.cancelEditEPerson();
     this.cancelForm.emit();
+    void this.router.navigate([getEPersonsRoute()]);
   }
 
   /**
@@ -340,12 +393,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
           metadata: {
             'eperson.firstname': [
               {
-                value: this.firstName.value
-              }
+                value: this.firstName.value,
+              },
             ],
             'eperson.lastname': [
               {
-                value: this.lastName.value
+                value: this.lastName.value,
               },
             ],
           },
@@ -358,7 +411,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
         } else {
           this.editEPerson(ePerson, values);
         }
-      }
+      },
     );
   }
 
@@ -371,13 +424,15 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
 
     const response = this.epersonService.create(ePersonToCreate);
     response.pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<EPerson>) => {
       if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.created.success', { name: ePersonToCreate.name }));
+        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: ePersonToCreate.name }));
+        this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.created.failure', { name: this.dsoNameService.getName(ePersonToCreate) }));
         this.cancelForm.emit();
       }
     });
@@ -395,12 +450,12 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
       metadata: {
         'eperson.firstname': [
           {
-            value: (this.firstName.value ? this.firstName.value : ePerson.firstMetadataValue('eperson.firstname'))
-          }
+            value: (this.firstName.value ? this.firstName.value : ePerson.firstMetadataValue('eperson.firstname')),
+          },
         ],
         'eperson.lastname': [
           {
-            value: (this.lastName.value ? this.lastName.value : ePerson.firstMetadataValue('eperson.lastname'))
+            value: (this.lastName.value ? this.lastName.value : ePerson.firstMetadataValue('eperson.lastname')),
           },
         ],
       },
@@ -413,10 +468,11 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     const response = this.epersonService.updateEPerson(editedEperson);
     response.pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<EPerson>) => {
       if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.edited.success', { name: editedEperson.name }));
+        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: editedEperson.name }));
+        this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.edited.failure', { name: this.dsoNameService.getName(editedEperson) }));
         this.cancelForm.emit();
       }
     });
@@ -433,7 +489,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
   onPageChange(event) {
     this.updateGroups({
       currentPage: event,
-      elementsPerPage: this.config.pageSize
+      elementsPerPage: this.config.pageSize,
     });
   }
 
@@ -449,31 +505,43 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Deletes the EPerson from the Repository. The EPerson will be the only that this form is showing.
    * It'll either show a success or error message depending on whether the delete was successful or not.
    */
-  delete() {
-    this.epersonService.getActiveEPerson().pipe(take(1)).subscribe((eperson: EPerson) => {
-      const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = eperson;
-      modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
-      modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
-      modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
-      modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm';
-      modalRef.componentInstance.brandColor = 'danger';
-      modalRef.componentInstance.confirmIcon = 'fas fa-trash';
-      modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => {
-        if (confirm) {
-          if (hasValue(eperson.id)) {
-            this.epersonService.deleteEPerson(eperson).pipe(getFirstCompletedRemoteData()).subscribe((restResponse: RemoteData<NoContent>) => {
-              if (restResponse.hasSucceeded) {
-                this.notificationsService.success(this.translateService.get(this.labelPrefix + 'notification.deleted.success', { name: eperson.name }));
-                this.submitForm.emit();
-              } else {
-                this.notificationsService.error('Error occured when trying to delete EPerson with id: ' + eperson.id + ' with code: ' + restResponse.statusCode + ' and message: ' + restResponse.errorMessage);
-              }
-              this.cancelForm.emit();
-            });
-          }
-        }
-      });
+  delete(): void {
+    this.epersonService.getActiveEPerson().pipe(
+      take(1),
+      switchMap((eperson: EPerson) => {
+        const modalRef = this.modalService.open(ConfirmationModalComponent);
+        modalRef.componentInstance.name = this.dsoNameService.getName(eperson);
+        modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-eperson.header';
+        modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-eperson.info';
+        modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-eperson.cancel';
+        modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-eperson.confirm';
+        modalRef.componentInstance.brandColor = 'danger';
+        modalRef.componentInstance.confirmIcon = 'fas fa-trash';
+
+        return modalRef.componentInstance.response.pipe(
+          take(1),
+          switchMap((confirm: boolean) => {
+            if (confirm && hasValue(eperson.id)) {
+              this.canDelete$ = observableOf(false);
+              return this.epersonService.deleteEPerson(eperson).pipe(
+                getFirstCompletedRemoteData(),
+                map((restResponse: RemoteData<NoContent>) => ({ restResponse, eperson })),
+              );
+            } else {
+              return observableOf(null);
+            }
+          }),
+          finalize(() => this.canDelete$ = observableOf(true)),
+        );
+      }),
+    ).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}`);
+      }
+      this.cancelForm.emit();
     });
   }
 
@@ -491,16 +559,16 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   resetPassword() {
     if (hasValue(this.epersonInitial.email)) {
-      this.epersonRegistrationService.registerEmail(this.epersonInitial.email).pipe(getFirstCompletedRemoteData())
+      this.epersonRegistrationService.registerEmail(this.epersonInitial.email, null, TYPE_REQUEST_FORGOT).pipe(getFirstCompletedRemoteData())
         .subscribe((response: RemoteData<Registration>) => {
-            if (response.hasSucceeded) {
-              this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'),
-                this.translateService.get('forgot-email.form.success.content', {email: this.epersonInitial.email}));
-            } else {
-              this.notificationsService.error(this.translateService.get('forgot-email.form.error.head'),
-                this.translateService.get('forgot-email.form.error.content', {email: this.epersonInitial.email}));
-            }
+          if (response.hasSucceeded) {
+            this.notificationsService.success(this.translateService.get('admin.access-control.epeople.actions.reset'),
+              this.translateService.get('forgot-email.form.success.content', { email: this.epersonInitial.email }));
+          } else {
+            this.notificationsService.error(this.translateService.get('forgot-email.form.error.head'),
+              this.translateService.get('forgot-email.form.error.content', { email: this.epersonInitial.email }));
           }
+        },
         );
     }
   }
@@ -509,7 +577,6 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    * Cancel the current edit when component is destroyed & unsub all subscriptions
    */
   ngOnDestroy(): void {
-    this.onCancel();
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
     this.paginationService.clearPagination(this.config.id);
     if (hasValue(this.emailValueChangeSubscribe)) {
@@ -517,16 +584,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
@@ -537,13 +594,13 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
     // Relevant message for email in use
     this.subs.push(this.epersonService.searchByScope('email', ePerson.email, {
       currentPage: 1,
-      elementsPerPage: 0
+      elementsPerPage: 0,
     }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
       .subscribe((list: PaginatedList<EPerson>) => {
         if (list.totalElements > 0) {
           this.notificationsService.error(this.translateService.get(this.labelPrefix + 'notification.' + notificationSection + '.failure.emailInUse', {
-            name: ePerson.name,
-            email: ePerson.email
+            name: this.dsoNameService.getName(ePerson),
+            email: ePerson.email,
           }));
         }
       }));
@@ -554,7 +611,7 @@ export class EPersonFormComponent implements OnInit, OnDestroy {
    */
   private updateGroups(options) {
     this.subs.push(this.epersonService.getActiveEPerson().subscribe((eperson: EPerson) => {
-      this.groups = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
+      this.groups$ = this.groupsDataService.findListByHref(eperson._links.groups.href, options);
     }));
   }
 }
diff --git a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts
index 5153abae7c..2a689c0d72 100644
--- a/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts
+++ b/src/app/access-control/epeople-registry/eperson-form/validators/email-taken.validator.ts
@@ -1,9 +1,12 @@
-import { AbstractControl, ValidationErrors } from '@angular/forms';
+import {
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { getFirstSucceededRemoteData, } from '../../../../core/shared/operators';
+import { getFirstSucceededRemoteData } from '../../../../core/shared/operators';
 
 export class ValidateEmailNotTaken {
 
@@ -17,8 +20,8 @@ export class ValidateEmailNotTaken {
         .pipe(
           getFirstSucceededRemoteData(),
           map(res => {
-            return !!res.payload ? { emailTaken: true } : null;
-          })
+            return res.payload ? { emailTaken: true } : null;
+          }),
         );
     };
   }
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..33233ba7e8
--- /dev/null
+++ b/src/app/access-control/epeople-registry/eperson-resolver.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ResolvedAction } from '../../core/resolving/resolver.actions';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+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 0fc5a574b7..dc477352e5 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,20 +2,31 @@
   <div class="group-form row">
     <div class="col-12">
 
-      <div *ngIf="groupDataService.getActiveGroup() | async; then editheader; else createHeader"></div>
+      <div *ngIf="groupDataService.getActiveGroup() | 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">{{messagePrefix + '.head.edit' | translate}}</h2>
+      <ng-template #editHeader>
+        <h1 class="border-bottom pb-2">
+          <span
+            *dsContextHelp="{
+              content: 'admin.access-control.groups.form.tooltip.editGroupPage',
+              id: 'edit-group-page',
+              iconPlacement: 'right',
+              tooltipPlacement: ['right', 'bottom']
+            }"
+          >
+            {{messagePrefix + '.head.edit' | translate}}
+          </span>
+        </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: (getLinkedDSO(groupBeingEdited) | async)?.payload?.name, comcol: (getLinkedDSO(groupBeingEdited) | async)?.payload?.type, comcolEditRolesRoute: (getLinkedEditRolesRoute(groupBeingEdited) | async) })">
+      <ds-alert *ngIf="(canEdit$ | async) !== true && (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>
 
       <ds-form [formId]="formId"
@@ -25,22 +36,21 @@
                [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) && !groupBeingEdited?.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"
+        <ds-members-list *ngIf="groupBeingEdited !== undefined"
                          [messagePrefix]="messagePrefix + '.members-list'"></ds-members-list>
       </div>
-      <ds-subgroups-list *ngIf="groupBeingEdited != null"
+      <ds-subgroups-list *ngIf="groupBeingEdited !== undefined"
                          [messagePrefix]="messagePrefix + '.subgroups-list'"></ds-subgroups-list>
 
 
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 09487a7eaa..aca6da2a74 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,41 +1,73 @@
 import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+  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 { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { DSOChangeAnalyzer } from '../../../core/data/dso-change-analyzer.service';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  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 { Group } from '../../../core/eperson/models/group.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { UUIDService } from '../../../core/shared/uuid.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 { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.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 { RouterMock } from '../../../shared/mocks/router.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../../shared/testing/group-mock';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { Operation } from 'fast-json-patch';
+import { TranslateLoaderMock } from '../../../shared/testing/translate-loader.mock';
+import { GroupFormComponent } from './group-form.component';
 import { ValidateGroupExists } from './validators/group-exists.validator';
-import { NoContent } from '../../../core/shared/NoContent.model';
 
 describe('GroupFormComponent', () => {
   let component: GroupFormComponent;
@@ -63,8 +95,8 @@ describe('GroupFormComponent', () => {
       metadata: {
         'dc.description': [
           {
-            value: groupDescription
-          }
+            value: groupDescription,
+          },
         ],
       },
     });
@@ -103,7 +135,7 @@ 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' } },
         });
         return createSuccessfulRemoteDataObject$(this.createdGroup);
       },
@@ -112,93 +144,94 @@ describe('GroupFormComponent', () => {
       },
       getGroupEditPageRouterLinkWithID(id: string) {
         return `group-edit-page-for-${id}`;
-      }
+      },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     dsoDataServiceStub = {
       findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
         return null;
-      }
+      },
     };
     builderService = Object.assign(getMockFormBuilderService(),{
       createFormGroup(formModel, options = null) {
         const controls = {};
         formModel.forEach( model => {
-            model.parent = parent;
-            const controlModel = model;
-            const controlState = { value: controlModel.value, disabled: controlModel.disabled };
-            const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
-            controls[model.id] = new FormControl(controlState, controlOptions);
+          model.parent = parent;
+          const controlModel = model;
+          const controlState = { value: controlModel.value, disabled: controlModel.disabled };
+          const controlOptions = this.createAbstractControlOptions(controlModel.validators, controlModel.asyncValidators, controlModel.updateOn);
+          controls[model.id] = new UntypedFormControl(controlState, controlOptions);
         });
-        return new FormGroup(controls, options);
+        return new UntypedFormGroup(controls, options);
       },
       createAbstractControlOptions(validatorsConfig = null, asyncValidatorsConfig = null, updateOn = null) {
         return {
-            validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
+          validators: validatorsConfig !== null ? this.getValidators(validatorsConfig) : null,
         };
       },
       getValidators(validatorsConfig) {
-          return this.getValidatorFns(validatorsConfig);
+        return this.getValidatorFns(validatorsConfig);
       },
       getValidatorFns(validatorsConfig, validatorsToken = this._NG_VALIDATORS) {
         let validatorFns = [];
         if (this.isObject(validatorsConfig)) {
-            validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
-                const validatorConfigValue = validatorsConfig[validatorConfigKey];
-                if (this.isValidatorDescriptor(validatorConfigValue)) {
-                    const descriptor = validatorConfigValue;
-                    return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
-                }
-                return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
-            });
+          validatorFns = Object.keys(validatorsConfig).map(validatorConfigKey => {
+            const validatorConfigValue = validatorsConfig[validatorConfigKey];
+            if (this.isValidatorDescriptor(validatorConfigValue)) {
+              const descriptor = validatorConfigValue;
+              return this.getValidatorFn(descriptor.name, descriptor.args, validatorsToken);
+            }
+            return this.getValidatorFn(validatorConfigKey, validatorConfigValue, validatorsToken);
+          });
         }
         return validatorFns;
       },
       getValidatorFn(validatorName, validatorArgs = null, validatorsToken = this._NG_VALIDATORS) {
         let validatorFn;
         if (Validators.hasOwnProperty(validatorName)) { // Built-in Angular Validators
-            validatorFn = Validators[validatorName];
+          validatorFn = Validators[validatorName];
         } else { // Custom Validators
-            if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
-                validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
-            } else if (validatorsToken) {
-                validatorFn = validatorsToken.find(validator => validator.name === validatorName);
-            }
+          if (this._DYNAMIC_VALIDATORS && this._DYNAMIC_VALIDATORS.has(validatorName)) {
+            validatorFn = this._DYNAMIC_VALIDATORS.get(validatorName);
+          } else if (validatorsToken) {
+            validatorFn = validatorsToken.find(validator => validator.name === validatorName);
+          }
         }
         if (validatorFn === undefined) { // throw when no validator could be resolved
-            throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
+          throw new Error(`validator '${validatorName}' is not provided via NG_VALIDATORS, NG_ASYNC_VALIDATORS or DYNAMIC_FORM_VALIDATORS`);
         }
         if (validatorArgs !== null) {
-            return validatorFn(validatorArgs);
+          return validatorFn(validatorArgs);
         }
         return validatorFn;
-    },
+      },
       isValidatorDescriptor(value) {
-          if (this.isObject(value)) {
-              return value.hasOwnProperty('name') && value.hasOwnProperty('args');
-          }
-          return false;
+        if (this.isObject(value)) {
+          return value.hasOwnProperty('name') && value.hasOwnProperty('args');
+        }
+        return false;
       },
       isObject(value) {
         return typeof value === 'object' && value !== null;
-      }
+      },
     });
     translateService = getMockTranslateService();
     router = new RouterMock();
     notificationService = new NotificationsServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [GroupFormComponent],
-      providers: [GroupFormComponent,
+      providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataServiceStub },
         { provide: DSpaceObjectDataService, useValue: dsoDataServiceStub },
@@ -213,12 +246,12 @@ describe('GroupFormComponent', () => {
         { provide: HALEndpointService, useValue: {} },
         {
           provide: ActivatedRoute,
-          useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) }
+          useValue: { data: observableOf({ dso: { payload: {} } }), params: observableOf({}) },
         },
         { provide: Router, useValue: router },
         { provide: AuthorizationDataService, useValue: authorizationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -240,8 +273,8 @@ describe('GroupFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new group using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      it('should emit a new group using the correct values', (async () => {
+        await fixture.whenStable().then(() => {
           expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
         });
       }));
@@ -254,8 +287,8 @@ describe('GroupFormComponent', () => {
           metadata: {
             'dc.description': [
               {
-                value: groupDescription
-              }
+                value: groupDescription,
+              },
             ],
           },
         });
@@ -266,8 +299,45 @@ describe('GroupFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit the existing group using the correct new values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
+      it('should edit with name and description operations', () => {
+        const operations = [{
+          op: 'add',
+          path: '/metadata/dc.description',
+          value: 'testDescription',
+        }, {
+          op: 'replace',
+          path: '/name',
+          value: 'newGroupName',
+        }];
+        expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+      });
+
+      it('should edit with description operations', () => {
+        component.groupName.value = null;
+        component.onSubmit();
+        fixture.detectChanges();
+        const operations = [{
+          op: 'add',
+          path: '/metadata/dc.description',
+          value: 'testDescription',
+        }];
+        expect(groupsDataServiceStub.patch).toHaveBeenCalledWith(expected, operations);
+      });
+
+      it('should edit with name operations', () => {
+        component.groupDescription.value = null;
+        component.onSubmit();
+        fixture.detectChanges();
+        const operations = [{
+          op: 'replace',
+          path: '/name',
+          value: 'newGroupName',
+        }];
+        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);
         });
       }));
@@ -298,8 +368,8 @@ describe('GroupFormComponent', () => {
         metadata: {
           'dc.description': [
             {
-              value: groupDescription
-            }
+              value: groupDescription,
+            },
           ],
         },
       });
@@ -336,7 +406,7 @@ describe('GroupFormComponent', () => {
         const groupsDataServiceStubWithGroup = Object.assign(groupsDataServiceStub,{
           searchGroups(query: string): Observable<RemoteData<PaginatedList<Group>>> {
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [expected]));
-          }
+          },
         });
         component.formGroup.controls.groupName.setValue('testName');
         component.formGroup.controls.groupName.setAsyncValidators(ValidateGroupExists.createValidator(groupsDataServiceStubWithGroup));
@@ -360,7 +430,7 @@ describe('GroupFormComponent', () => {
 
       component.canEdit$ = observableOf(true);
       component.groupBeingEdited = {
-        permanent: false
+        permanent: false,
       } as Group;
 
       fixture.detectChanges();
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 b0178f1294..89bb4c395f 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,24 +1,45 @@
-import { Component, EventEmitter, HostListener, OnDestroy, OnInit, Output, ChangeDetectorRef } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  HostListener,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormControlModel,
   DynamicFormLayout,
   DynamicInputModel,
-  DynamicTextAreaModel
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import {
-  ObservedValueOf,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   Subscription,
 } from 'rxjs';
-import { catchError, map, switchMap, take, filter, debounceTime } from 'rxjs/operators';
+import {
+  catchError,
+  debounceTime,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../environments/environment';
 import { getCollectionEditRolesRoute } from '../../../collection-page/collection-page-routing-paths';
 import { getCommunityEditRolesRoute } from '../../../community-page/community-page-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
@@ -31,25 +52,32 @@ 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 { NoContent } from '../../../core/shared/NoContent.model';
 import {
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
 } 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 {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { Operation } from 'fast-json-patch';
+import {
+  getGroupEditRoute,
+  getGroupsRoute,
+} from '../../access-control-routing-paths';
 import { ValidateGroupExists } from './validators/group-exists.validator';
 
 @Component({
   selector: 'ds-group-form',
-  templateUrl: './group-form.component.html'
+  templateUrl: './group-form.component.html',
 })
 /**
  * A form used for creating and editing groups
@@ -81,20 +109,20 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     groupName: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     groupDescription: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
   };
 
   /**
    * A FormGroup that combines all inputs
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * An EventEmitter that's fired whenever the form is being submitted
@@ -133,7 +161,8 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   groupNameValueChangeSubscribe: Subscription;
 
 
-  constructor(public groupDataService: GroupDataService,
+  constructor(
+    public groupDataService: GroupDataService,
     private ePersonDataService: EPersonDataService,
     private dSpaceObjectDataService: DSpaceObjectDataService,
     private formBuilderService: FormBuilderService,
@@ -144,7 +173,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     private authorizationService: AuthorizationDataService,
     private modalService: NgbModal,
     public requestService: RequestService,
-    protected changeDetectorRef: ChangeDetectorRef) {
+    protected changeDetectorRef: ChangeDetectorRef,
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   ngOnInit() {
@@ -160,19 +191,19 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     this.canEdit$ = this.groupDataService.getActiveGroup().pipe(
       hasValueOperator(),
       switchMap((group: Group) => {
-        return observableCombineLatest(
+        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;
-          });
-      })
+        ]).pipe(
+          map(([isAuthorized, hasLinkedDSO]: [boolean, boolean]) => isAuthorized && !hasLinkedDSO),
+        );
+      }),
     );
-    observableCombineLatest(
+    observableCombineLatest([
       this.translateService.get(`${this.messagePrefix}.groupName`),
       this.translateService.get(`${this.messagePrefix}.groupCommunity`),
-      this.translateService.get(`${this.messagePrefix}.groupDescription`)
-    ).subscribe(([groupName, groupCommunity, groupDescription]) => {
+      this.translateService.get(`${this.messagePrefix}.groupDescription`),
+    ]).subscribe(([groupName, groupCommunity, groupDescription]) => {
       this.groupName = new DynamicInputModel({
         id: 'groupName',
         label: groupName,
@@ -194,6 +225,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
         label: groupDescription,
         name: 'groupDescription',
         required: false,
+        spellCheck: environment.form.spellCheck,
       });
       this.formModel = [
         this.groupName,
@@ -201,7 +233,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
 
-      if (!!this.formGroup.controls.groupName) {
+      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();
@@ -209,12 +241,12 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       }
 
       this.subs.push(
-        observableCombineLatest(
+        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]) => {
+            .pipe(filter((activeGroup) => hasValue(activeGroup)),switchMap((activeGroup) => this.getLinkedDSO(activeGroup).pipe(getFirstSucceededRemoteDataPayload()))),
+        ]).subscribe(([activeGroup, canEdit, linkedObject]) => {
 
           if (activeGroup != null) {
 
@@ -224,12 +256,14 @@ export class GroupFormComponent implements OnInit, OnDestroy {
             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'),
-              });
+              if (!this.formGroup.controls.groupCommunity) {
+                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,
@@ -246,7 +280,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
               }
             }, 200);
           }
-        })
+        }),
       );
     });
   }
@@ -257,7 +291,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()]);
   }
 
   /**
@@ -274,9 +308,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
           metadata: {
             'dc.description': [
               {
-                value: this.groupDescription.value
-              }
-            ]
+                value: this.groupDescription.value,
+              },
+            ],
           },
         };
         if (group === null) {
@@ -284,7 +318,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
         } else {
           this.editGroup(group);
         }
-      }
+      },
     );
   }
 
@@ -295,7 +329,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   createNewGroup(values) {
     const groupToCreate = Object.assign(new Group(), values);
     this.groupDataService.create(groupToCreate).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Group>) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.created.success', { name: groupToCreate.name }));
@@ -304,7 +338,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 }));
@@ -324,12 +358,12 @@ export class GroupFormComponent implements OnInit, OnDestroy {
     // Relevant message for group name in use
     this.subs.push(this.groupDataService.searchGroups(group.name, {
       currentPage: 1,
-      elementsPerPage: 0
+      elementsPerPage: 0,
     }).pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
       .subscribe((list: PaginatedList<Group>) => {
         if (list.totalElements > 0) {
           this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.' + notificationSection + '.failure.groupNameInUse', {
-            name: group.name
+            name: this.dsoNameService.getName(group),
           }));
         }
       }));
@@ -344,9 +378,9 @@ export class GroupFormComponent implements OnInit, OnDestroy {
 
     if (hasValue(this.groupDescription.value)) {
       operations = [...operations, {
-        op: 'replace',
-        path: '/metadata/dc.description/0/value',
-        value: this.groupDescription.value
+        op: 'add',
+        path: '/metadata/dc.description',
+        value: this.groupDescription.value,
       }];
     }
 
@@ -354,18 +388,18 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       operations = [...operations, {
         op: 'replace',
         path: '/name',
-        value: this.groupName.value
+        value: this.groupName.value,
       }];
     }
 
     this.groupDataService.patch(group, operations).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Group>) => {
       if (rd.hasSucceeded) {
-        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.edited.success', { name: rd.payload.name }));
+        this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.edited.success', { name: this.dsoNameService.getName(rd.payload) }));
         this.submitForm.emit(rd.payload);
       } else {
-        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.edited.failure', { name: group.name }));
+        this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.edited.failure', { name: this.dsoNameService.getName(group) }));
         this.cancelForm.emit();
       }
     });
@@ -412,7 +446,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
   delete() {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((group: Group) => {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = group;
+      modalRef.componentInstance.name = this.dsoNameService.getName(group);
       modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-group.modal.header';
       modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-group.modal.info';
       modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-group.modal.cancel';
@@ -425,11 +459,11 @@ export class GroupFormComponent implements OnInit, OnDestroy {
             this.groupDataService.delete(group.id).pipe(getFirstCompletedRemoteData())
               .subscribe((rd: RemoteData<NoContent>) => {
                 if (rd.hasSucceeded) {
-                  this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: group.name }));
+                  this.notificationsService.success(this.translateService.get(this.messagePrefix + '.notification.deleted.success', { name: this.dsoNameService.getName(group) }));
                   this.onCancel();
                 } else {
                   this.notificationsService.error(
-                    this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: group.name }),
+                    this.translateService.get(this.messagePrefix + '.notification.deleted.failure.title', { name: this.dsoNameService.getName(group) }),
                     this.translateService.get(this.messagePrefix + '.notification.deleted.failure.content', { cause: rd.errorMessage }));
                 }
               });
@@ -498,7 +532,7 @@ export class GroupFormComponent implements OnInit, OnDestroy {
                 return getCollectionEditRolesRoute(rd.payload.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 e5932edf05..85aa987605 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,94 +1,12 @@
 <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">{{messagePrefix + '.search.head' | translate}}
+  <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
 
-  </h4>
-  <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()]">{{ePerson.eperson.name}}</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)"
-                      class="btn btn-outline-danger btn-sm"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: {name: ePerson.eperson.name} }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-
-              <button *ngIf="!(ePerson.memberOfGroup)"
-                      (click)="addMemberToGroup(ePerson)"
-                      class="btn btn-outline-primary btn-sm"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: {name: ePerson.eperson.name} }}">
-                <i class="fas fa-plus fa-fw"></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"
+                 [pageInfoState]="(ePeopleMembersOfGroup | async)"
+                 [collectionSize]="(ePeopleMembersOfGroup | async)?.totalElements"
                  [hideGear]="true"
                  [hidePagerWhenSinglePage]="true">
 
@@ -103,20 +21,24 @@
         </tr>
         </thead>
         <tbody>
-        <tr *ngFor="let ePerson of (ePeopleMembersOfGroupDtos | async)?.page">
-          <td class="align-middle">{{ePerson.eperson.id}}</td>
-          <td class="align-middle"><a (click)="ePersonDataService.startEditingNewEPerson(ePerson.eperson)"
-                 [routerLink]="[ePersonDataService.getEPeoplePageRouterLink()]">{{ePerson.eperson.name}}</a></td>
+        <tr *ngFor="let eperson of (ePeopleMembersOfGroup | async)?.page">
+          <td class="align-middle">{{eperson.id}}</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 : '-' }}
+            <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)="deleteMemberFromGroup(ePerson)"
-                      class="btn btn-outline-danger btn-sm"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: {name: ePerson.eperson.name} }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
+              <button (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) } }}">
+                <i [ngClass]="actionConfig.remove.icon"></i>
               </button>
             </div>
           </td>
@@ -127,9 +49,91 @@
 
   </ds-pagination>
 
-  <div *ngIf="(ePeopleMembersOfGroupDtos | async) == undefined || (ePeopleMembersOfGroupDtos | async)?.totalElements == 0" class="alert alert-info w-100 mb-2"
+  <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"
+                 [pageInfoState]="(ePeopleSearch | async)"
+                 [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)"
+                      [disabled]="actionConfig.add.disabled"
+                      [ngClass]="['btn btn-sm', actionConfig.add.css]"
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
+                <i [ngClass]="actionConfig.add.icon"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+
+  </ds-pagination>
+
+  <div *ngIf="(ePeopleSearch | async)?.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/members-list/members-list.component.spec.ts b/src/app/access-control/group-registry/group-form/members-list/members-list.component.spec.ts
index 8d0ddf0a85..c63ff40df8 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
@@ -1,33 +1,68 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  tick,
+  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 } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  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 { PaginationService } from '../../../../core/pagination/pagination.service';
 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 { MembersListComponent } from './members-list.component';
-import { EPersonMock, EPersonMock2 } from '../../../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterMock } from '../../../../shared/mocks/router.mock';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../../shared/testing/eperson.mock';
+import { GroupMock } from '../../../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { MembersListComponent } from './members-list.component';
+
+// todo: optimize imports
 
 describe('MembersListComponent', () => {
   let component: MembersListComponent;
@@ -37,28 +72,26 @@ describe('MembersListComponent', () => {
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
   let activeGroup;
-  let allEPersons;
-  let allGroups;
-  let epersonMembers;
-  let subgroupMembers;
+  let epersonMembers: EPerson[];
+  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,
-      findListByHref(href: string): Observable<RemoteData<PaginatedList<EPerson>>> {
+      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(), []));
       },
@@ -68,29 +101,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() {
@@ -103,28 +133,28 @@ 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'));
-      }
+      },
     };
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [MembersListComponent],
@@ -135,8 +165,9 @@ describe('MembersListComponent', () => {
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: new RouterMock() },
         { provide: PaginationService, useValue: paginationService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -147,27 +178,53 @@ describe('MembersListComponent', () => {
   });
   afterEach(fakeAsync(() => {
     fixture.destroy();
+    fixture.debugElement.nativeElement.remove();
     flush();
     component = null;
+    fixture.debugElement.nativeElement.remove();
   }));
 
   it('should create MembersListComponent', inject([MembersListComponent], (comp: 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);
+      });
     });
   });
 
   describe('search', () => {
     describe('when searching without query', () => {
-      let epersonsFound;
+      let epersonsFound: DebugElement[];
       beforeEach(fakeAsync(() => {
         component.search({ scope: 'metadata', query: '' });
         tick();
@@ -175,69 +232,34 @@ describe('MembersListComponent', () => {
         epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
       }));
 
-      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', () => {
-          activeGroup.epersons.map((eperson: EPerson) => {
-            epersonsFound.map((foundEPersonRowElement) => {
-              if (foundEPersonRowElement.debugElement !== undefined) {
-                const epersonId = foundEPersonRowElement.debugElement.query(By.css('td:first-child'));
-                const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
-                const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
-                if (epersonId.nativeElement.textContent === eperson.id) {
-                  expect(addButton).toBeUndefined();
-                  expect(deleteButton).toBeDefined();
-                } else {
-                  expect(deleteButton).toBeUndefined();
-                  expect(addButton).toBeDefined();
-                }
-              }
-            });
-          });
+      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(() => {
-          const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus'));
+        beforeEach(() => {
+          const addButton: DebugElement = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-plus'));
           addButton.nativeElement.click();
-          tick();
           fixture.detectChanges();
-        }));
-        it('all groups in search member of selected group', () => {
-          epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-          expect(epersonsFound.length).toEqual(2);
-          epersonsFound.map((foundEPersonRowElement) => {
-            if (foundEPersonRowElement.debugElement !== undefined) {
-              const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
-              const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
-              expect(addButton).toBeUndefined();
-              expect(deleteButton).toBeDefined();
-            }
-          });
         });
-      });
-
-      describe('if first delete button is pressed', () => {
-        beforeEach(fakeAsync(() => {
-          const addButton = fixture.debugElement.query(By.css('#epersonsSearch tbody .fa-trash-alt'));
-          addButton.nativeElement.click();
-          tick();
-          fixture.detectChanges();
-        }));
-        it('first eperson in search delete button, because now member', () => {
+        it('then all (two) ePersons are member of the active group. No non-members left', () => {
           epersonsFound = fixture.debugElement.queryAll(By.css('#epersonsSearch tbody tr'));
-          epersonsFound.map((foundEPersonRowElement) => {
-            if (foundEPersonRowElement.debugElement !== undefined) {
-              const addButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
-              const deleteButton = foundEPersonRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
-              expect(deleteButton).toBeUndefined();
-              expect(addButton).toBeDefined();
-            }
-          });
+          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 169d009d63..002e20524c 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
@@ -1,43 +1,83 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+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 {
-  Observable,
-  of as observableOf,
-  Subscription,
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
-  ObservedValueOf,
+  Observable,
+  Subscription,
 } 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 { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+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 { PaginationService } from '../../../../core/pagination/pagination.service';
 import {
-  getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData, getAllCompletedRemoteData, getRemoteDataPayload
+  getAllCompletedRemoteData,
+  getFirstCompletedRemoteData,
+  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 { getEPersonEditRoute } from '../../../access-control-routing-paths';
+
+// todo: optimize imports
 
 /**
  * Keys to keep track of specific subscriptions
  */
 enum SubKey {
   ActiveGroup,
-  MembersDTO,
-  SearchResultsDTO,
+  Members,
+  SearchResults,
+}
+
+/**
+ * The layout config of the buttons in the last column
+ */
+export interface EPersonActionConfig {
+  /**
+   * The css classes that should be added to the button
+   */
+  css?: string;
+  /**
+   * Whether the button should be disabled
+   */
+  disabled: boolean;
+  /**
+   * The Font Awesome icon that should be used
+   */
+  icon: string;
+}
+
+/**
+ * The {@link EPersonActionConfig} that should be used to display the button. The remove config will be used when the
+ * {@link EPerson} is already a member of the {@link Group} and the remove config will be used otherwise.
+ *
+ * *See {@link actionConfig} for an example*
+ */
+export interface EPersonListActionConfig {
+  add: EPersonActionConfig;
+  remove: EPersonActionConfig;
 }
 
 @Component({
   selector: 'ds-members-list',
-  templateUrl: './members-list.component.html'
+  templateUrl: './members-list.component.html',
 })
 /**
  * The list of members in the edit group page
@@ -45,16 +85,30 @@ enum SubKey {
 export class MembersListComponent implements OnInit, OnDestroy {
 
   @Input()
-  messagePrefix: string;
+    messagePrefix: string;
+
+  @Input()
+    actionConfig: EPersonListActionConfig = {
+      add: {
+        css: 'btn-outline-primary',
+        disabled: false,
+        icon: 'fas fa-plus fa-fw',
+      },
+      remove: {
+        css: 'btn-outline-danger',
+        disabled: false,
+        icon: 'fas fa-trash-alt fa-fw',
+      },
+    };
 
   /**
    * 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
@@ -62,7 +116,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
   configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'sml',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
   /**
    * Pagination config used to display the list of EPerson Membes of active group being edited
@@ -70,7 +124,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'ml',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -83,7 +137,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;
@@ -91,29 +144,30 @@ export class MembersListComponent implements OnInit, OnDestroy {
   // current active group being edited
   groupBeingEdited: Group;
 
-  paginationSub: Subscription;
+  readonly getEPersonEditRoute = getEPersonEditRoute;
 
-
-  constructor(private groupDataService: GroupDataService,
-              public ePersonDataService: EPersonDataService,
-              private translateService: TranslateService,
-              private notificationsService: NotificationsService,
-              private formBuilder: FormBuilder,
-              private paginationService: PaginationService,
-              private router: Router) {
+  constructor(
+    protected groupDataService: GroupDataService,
+    public ePersonDataService: EPersonDataService,
+    protected translateService: TranslateService,
+    protected notificationsService: NotificationsService,
+    protected formBuilder: UntypedFormBuilder,
+    protected paginationService: PaginationService,
+    protected router: Router,
+    public dsoNameService: DSONameService,
+  ) {
     this.currentSearchQuery = '';
-    this.currentSearchScope = 'metadata';
   }
 
-  ngOnInit() {
+  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: '' });
       }
     }));
   }
@@ -124,66 +178,29 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * @param page the number of the page to retrieve
    * @private
    */
-  private retrieveMembers(page: number) {
-    this.unsubFrom(SubKey.MembersDTO);
-    this.subs.set(SubKey.MembersDTO,
+  retrieveMembers(page: number): void {
+    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, {
-              currentPage: currentPagination.currentPage,
-              elementsPerPage: currentPagination.pageSize
-            }
+            currentPage: currentPagination.currentPage,
+            elementsPerPage: currentPagination.pageSize,
+          },
           );
         }),
-      getAllCompletedRemoteData(),
-      map((rd: RemoteData<any>) => {
-        if (rd.hasFailed) {
-          this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', {cause: rd.errorMessage}));
-        } else {
-          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);
+        getAllCompletedRemoteData(),
+        map((rd: RemoteData<any>) => {
+          if (rd.hasFailed) {
+            this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage }));
+          } else {
+            return rd;
+          }
+        }),
+        getRemoteDataPayload())
+        .subscribe((paginatedListOfEPersons: PaginatedList<EPerson>) => {
+          this.ePeopleMembersOfGroup.next(paginatedListOfEPersons);
         }));
-      }))
-      .subscribe((paginatedListOfDTOs: PaginatedList<EpersonDtoModel>) => {
-        this.ePeopleMembersOfGroupDtos.next(paginatedListOfDTOs);
-      }));
-  }
-
-  /**
-   * Whether or not 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);
-        }
-      }));
   }
 
   /**
@@ -193,7 +210,7 @@ export class MembersListComponent implements OnInit, OnDestroy {
    * @param key The key of the subscription to unsubscribe from
    * @private
    */
-  private unsubFrom(key: SubKey) {
+  protected unsubFrom(key: SubKey) {
     if (this.subs.has(key)) {
       this.subs.get(key).unsubscribe();
       this.subs.delete(key);
@@ -202,13 +219,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) {
+  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, ePerson.eperson.name, 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'));
       }
@@ -217,14 +239,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, ePerson.eperson.name, 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'));
       }
@@ -232,63 +258,37 @@ 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
-          });
+            elementsPerPage: paginationOptions.pageSize,
+          }, false, true);
         }),
         getAllCompletedRemoteData(),
         map((rd: RemoteData<any>) => {
           if (rd.hasFailed) {
-            this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', {cause: rd.errorMessage}));
+            this.notificationsService.error(this.translateService.get(this.messagePrefix + '.notification.failure', { cause: rd.errorMessage }));
           } else {
             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 e68612c317..ab7bd84f6b 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,7 +1,65 @@
 <ng-container>
   <h3 class="border-bottom pb-2">{{messagePrefix + '.head' | translate}}</h3>
 
-  <h4 id="search" class="border-bottom pb-2">{{messagePrefix + '.search.head' | translate}}
+  <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">
+
+    <div class="table-responsive">
+      <table id="subgroupsOfGroup" 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>{{messagePrefix + '.table.edit' | translate}}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let group of (subGroups$ | 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)="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>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </ds-pagination>
+
+  <div *ngIf="(subGroups$ | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2"
+       role="alert">
+    {{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">
@@ -44,24 +102,18 @@
         <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)]">{{group.name}}</a></td>
-          <td class="align-middle">{{(group.object | async)?.payload?.name}}</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: group.name} }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-
-              <p *ngIf="(isActiveGroup(group) | async)">{{ messagePrefix + '.table.edit.currentGroup' | translate }}</p>
-
-              <button *ngIf="!(isSubgroupOfGroup(group) | async) && !(isActiveGroup(group) | async)"
-                      (click)="addSubgroupToGroup(group)"
+              <button (click)="addSubgroupToGroup(group)"
                       class="btn btn-outline-primary btn-sm addButton"
-                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: {name: group.name} }}">
+                      title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
                 <i class="fas fa-plus fa-fw"></i>
               </button>
             </div>
@@ -72,54 +124,9 @@
     </div>
   </ds-pagination>
 
-  <div *ngIf="(searchResults$ | async)?.payload?.totalElements == 0 && searchDone" class="alert alert-info w-100 mb-2"
+  <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">
-
-    <div class="table-responsive">
-      <table id="subgroupsOfGroup" 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>{{messagePrefix + '.table.edit' | translate}}</th>
-        </tr>
-        </thead>
-        <tbody>
-        <tr *ngFor="let group of (subGroups$ | async)?.payload?.page">
-          <td class="align-middle">{{group.id}}</td>
-          <td class="align-middle"><a (click)="groupDataService.startEditingNewGroup(group)"
-                 [routerLink]="[groupDataService.getGroupEditPageRouterLink(group)]">{{group.name}}</a></td>
-          <td class="align-middle">{{(group.object | async)?.payload?.name}}</td>
-          <td class="align-middle">
-            <div class="btn-group edit-field">
-              <button (click)="deleteSubgroupFromGroup(group)"
-                      class="btn btn-outline-danger btn-sm deleteButton"
-                      title="{{messagePrefix + '.table.edit.buttons.remove' | translate: {name: group.name} }}">
-                <i class="fas fa-trash-alt fa-fw"></i>
-              </button>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
-    </div>
-  </ds-pagination>
-
-  <div *ngIf="(subGroups$ | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2"
-       role="alert">
-    {{messagePrefix + '.no-subgroups-yet' | 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 1ca6c88c5f..ca50406aea 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,42 +1,63 @@
 import { CommonModule } from '@angular/common';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
 import {
   ComponentFixture,
   fakeAsync,
   flush,
   inject,
   TestBed,
-  tick,
-  waitForAsync
+  waitForAsync,
 } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+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 {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { EPersonMock2 } from 'src/app/shared/testing/eperson.mock';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { RestResponse } from '../../../../core/cache/response.models';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  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 { PaginationService } from '../../../../core/pagination/pagination.service';
 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 { SubgroupsListComponent } from './subgroups-list.component';
-import {
-  createSuccessfulRemoteDataObject$,
-  createSuccessfulRemoteDataObject
-} from '../../../../shared/remote-data.utils';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
 import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../../../shared/testing/group-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 { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { SubgroupsListComponent } from './subgroups-list.component';
 
 describe('SubgroupsListComponent', () => {
   let component: SubgroupsListComponent;
@@ -45,44 +66,70 @@ describe('SubgroupsListComponent', () => {
   let builderService: FormBuilderService;
   let ePersonDataServiceStub: any;
   let groupsDataServiceStub: any;
-  let activeGroup;
-  let subgroups;
-  let allGroups;
+  let activeGroup: Group;
+  let subgroups: 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;
       },
-      findListByHref(href: string): Observable<RemoteData<PaginatedList<Group>>> {
-        return this.subgroups$.pipe(
-          map((currentGroups: Group[]) => {
-            return createSuccessfulRemoteDataObject(buildPaginatedList<Group>(new PageInfo(), currentGroups));
-          })
-        );
+      // This method is used to get all the current subgroups
+      findListByHref(_href: string): Observable<RemoteData<PaginatedList<Group>>> {
+        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() {
@@ -91,38 +138,42 @@ 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'));
-      }
+      },
     };
     routerStub = new RouterMock();
     builderService = getMockFormBuilderService();
     translateService = getMockTranslateService();
 
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [SubgroupsListComponent],
       providers: [SubgroupsListComponent,
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: GroupDataService, useValue: groupsDataServiceStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: FormBuilderService, useValue: builderService },
         { provide: Router, useValue: routerStub },
         { provide: PaginationService, useValue: paginationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -133,6 +184,7 @@ describe('SubgroupsListComponent', () => {
   });
   afterEach(fakeAsync(() => {
     fixture.destroy();
+    fixture.debugElement.nativeElement.remove();
     flush();
     component = null;
   }));
@@ -141,86 +193,78 @@ 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;
-    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);
     });
   });
 
   describe('search', () => {
     describe('when searching with empty query', () => {
-      let groupsFound;
+      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'));
-        const groupIdsFound = fixture.debugElement.queryAll(By.css('#groupsSearch tbody tr td:first-child'));
-        allGroups.map((group: Group) => {
-          expect(groupIdsFound.find((foundEl) => {
+      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'));
+        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) => {
-              if (foundGroupRowElement.debugElement !== undefined) {
-                const addButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
-                const deleteButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
-                expect(addButton).toBeUndefined();
-                expect(deleteButton).toBeDefined();
-              }
-            });
-          } else {
-            getSubgroups.map((group: Group) => {
-              groupsFound.map((foundGroupRowElement) => {
-                if (foundGroupRowElement.debugElement !== undefined) {
-                  const groupId = foundGroupRowElement.debugElement.query(By.css('td:first-child'));
-                  const addButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-plus'));
-                  const deleteButton = foundGroupRowElement.debugElement.query(By.css('td:last-child .fa-trash-alt'));
-                  if (groupId.nativeElement.textContent === group.id) {
-                    expect(addButton).toBeUndefined();
-                    expect(deleteButton).toBeDefined();
-                  } else {
-                    expect(deleteButton).toBeUndefined();
-                    expect(addButton).toBeDefined();
-                  }
-                }
-              });
-            });
-          }
+          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 5f1700e07d..ae677a5558 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
@@ -1,22 +1,37 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+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 { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 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 { PaginationService } from '../../../../core/pagination/pagination.service';
+import { NoContent } from '../../../../core/shared/NoContent.model';
 import {
+  getAllCompletedRemoteData,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteData,
-  getRemoteDataPayload
 } from '../../../../core/shared/operators';
+import { PageInfo } from '../../../../core/shared/page-info.model';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../../../../core/shared/NoContent.model';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
 import { followLink } from '../../../../shared/utils/follow-link-config.model';
 
 /**
@@ -30,7 +45,7 @@ enum SubKey {
 
 @Component({
   selector: 'ds-subgroups-list',
-  templateUrl: './subgroups-list.component.html'
+  templateUrl: './subgroups-list.component.html',
 })
 /**
  * The list of subgroups in the edit group page
@@ -38,7 +53,7 @@ enum SubKey {
 export class SubgroupsListComponent implements OnInit, OnDestroy {
 
   @Input()
-  messagePrefix: string;
+    messagePrefix: string;
 
   /**
    * Result of search groups, initially all groups
@@ -49,6 +64,8 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
    */
   subGroups$: BehaviorSubject<RemoteData<PaginatedList<Group>>> = new BehaviorSubject(undefined);
 
+  subGroupsPageInfoState$: Observable<PageInfo>;
+
   /**
    * Map of active subscriptions
    */
@@ -60,7 +77,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   configSearch: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'ssgl',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
   /**
    * Pagination config used to display the list of subgroups of currently active group being edited
@@ -68,7 +85,7 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'sgl',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   // The search form
@@ -86,9 +103,11 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
   constructor(public groupDataService: GroupDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private paginationService: PaginationService,
-              private router: Router) {
+              private router: Router,
+              public dsoNameService: DSONameService,
+  ) {
     this.currentSearchQuery = '';
   }
 
@@ -100,8 +119,12 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       if (activeGroup != null) {
         this.groupBeingEdited = activeGroup;
         this.retrieveSubGroups();
+        this.search({ query: '' });
       }
     }));
+    this.subGroupsPageInfoState$ = this.subGroups$.pipe(
+      map(subGroupsRD => subGroupsRD?.payload?.pageInfo),
+    );
   }
 
   /**
@@ -116,59 +139,18 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       SubKey.Members,
       this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
         switchMap((config) => this.groupDataService.findListByHref(this.groupBeingEdited._links.subgroups.href, {
-            currentPage: config.currentPage,
-            elementsPerPage: config.pageSize
-          },
-          true,
-          true,
-          followLink('object')
-        ))
+          currentPage: config.currentPage,
+          elementsPerPage: config.pageSize,
+        },
+        true,
+        true,
+        followLink('object'),
+        )),
       ).subscribe((rd: RemoteData<PaginatedList<Group>>) => {
         this.subGroups$.next(rd);
       }));
   }
 
-  /**
-   * 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
@@ -177,7 +159,12 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
     this.groupDataService.getActiveGroup().pipe(take(1)).subscribe((activeGroup: Group) => {
       if (activeGroup != null) {
         const response = this.groupDataService.deleteSubGroupFromGroup(activeGroup, subgroup);
-        this.showNotifications('deleteSubgroup', response, subgroup.name, activeGroup);
+        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'));
       }
@@ -193,7 +180,12 @@ export class SubgroupsListComponent implements OnInit, OnDestroy {
       if (activeGroup != null) {
         if (activeGroup.uuid !== subgroup.uuid) {
           const response = this.groupDataService.addSubGroupToGroup(activeGroup, subgroup);
-          this.showNotifications('addSubgroup', response, subgroup.name, activeGroup);
+          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'));
         }
@@ -204,28 +196,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/group-form/validators/group-exists.validator.ts b/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts
index 88f22413e9..056c54bf6a 100644
--- a/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts
+++ b/src/app/access-control/group-registry/group-form/validators/group-exists.validator.ts
@@ -1,10 +1,13 @@
-import { AbstractControl, ValidationErrors } from '@angular/forms';
+import {
+  AbstractControl,
+  ValidationErrors,
+} from '@angular/forms';
 import { Observable } from 'rxjs';
-import { map} from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 import { Group } from '../../../../core/eperson/models/group.model';
+import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
 
 export class ValidateGroupExists {
 
@@ -16,9 +19,9 @@ export class ValidateGroupExists {
   static createValidator(groupDataService: GroupDataService) {
     return (control: AbstractControl): Promise<ValidationErrors | null> | Observable<ValidationErrors | null> => {
       return groupDataService.searchGroups(control.value, {
-            currentPage: 1,
-            elementsPerPage: 100
-          })
+        currentPage: 1,
+        elementsPerPage: 100,
+      })
         .pipe(
           getFirstSucceededRemoteListPayload(),
           map( (groups: Group[]) => {
diff --git a/src/app/access-control/group-registry/group-page.guard.spec.ts b/src/app/access-control/group-registry/group-page.guard.spec.ts
index 48fa124c07..b1648f59ec 100644
--- a/src/app/access-control/group-registry/group-page.guard.spec.ts
+++ b/src/app/access-control/group-registry/group-page.guard.spec.ts
@@ -1,10 +1,14 @@
-import { GroupPageGuard } from './group-page.guard';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
 import { of as observableOf } from 'rxjs';
+
 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 { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { GroupPageGuard } from './group-page.guard';
 
 describe('GroupPageGuard', () => {
   const groupsEndpointUrl = 'https://test.org/api/eperson/groups';
@@ -13,7 +17,7 @@ describe('GroupPageGuard', () => {
   const routeSnapshotWithGroupId = {
     params: {
       groupId: groupUuid,
-    }
+    },
   } as unknown as ActivatedRouteSnapshot;
 
   let guard: GroupPageGuard;
@@ -50,10 +54,10 @@ describe('GroupPageGuard', () => {
 
       it('should return true', (done) => {
         guard.canActivate(
-          routeSnapshotWithGroupId, { url: 'current-url'} as any
+          routeSnapshotWithGroupId, { url: 'current-url' } as any,
         ).subscribe((result) => {
           expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
-            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined,
           );
           expect(result).toBeTrue();
           done();
@@ -68,10 +72,10 @@ describe('GroupPageGuard', () => {
 
       it('should not return true', (done) => {
         guard.canActivate(
-          routeSnapshotWithGroupId, { url: 'current-url'} as any
+          routeSnapshotWithGroupId, { url: 'current-url' } as any,
         ).subscribe((result) => {
           expect(authorizationService.isAuthorized).toHaveBeenCalledWith(
-            FeatureID.CanManageGroup, groupEndpointUrl, undefined
+            FeatureID.CanManageGroup, groupEndpointUrl, undefined,
           );
           expect(result).not.toBeTrue();
           done();
diff --git a/src/app/access-control/group-registry/group-page.guard.ts b/src/app/access-control/group-registry/group-page.guard.ts
index 057f67ddeb..928271887c 100644
--- a/src/app/access-control/group-registry/group-page.guard.ts
+++ b/src/app/access-control/group-registry/group-page.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-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 { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { SomeFeatureAuthorizationGuard } from '../../core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
 
@@ -28,7 +36,7 @@ export class GroupPageGuard extends SomeFeatureAuthorizationGuard {
 
   getObjectUrl(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<string> {
     return this.halEndpointService.getEndpoint(this.groupsEndpoint).pipe(
-      map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`)
+      map(groupsUrl => `${groupsUrl}/${route?.params?.groupId}`),
     );
   }
 
diff --git a/src/app/access-control/group-registry/group-registry.actions.ts b/src/app/access-control/group-registry/group-registry.actions.ts
index 8144bd0599..d1bc62a95c 100644
--- a/src/app/access-control/group-registry/group-registry.actions.ts
+++ b/src/app/access-control/group-registry/group-registry.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { Group } from '../../core/eperson/models/group.model';
 import { type } from '../../shared/ngrx/type';
 
diff --git a/src/app/access-control/group-registry/group-registry.reducers.spec.ts b/src/app/access-control/group-registry/group-registry.reducers.spec.ts
index de5b65f5ba..83a6df580d 100644
--- a/src/app/access-control/group-registry/group-registry.reducers.spec.ts
+++ b/src/app/access-control/group-registry/group-registry.reducers.spec.ts
@@ -1,6 +1,12 @@
 import { GroupMock } from '../../shared/testing/group-mock';
-import { GroupRegistryCancelGroupAction, GroupRegistryEditGroupAction } from './group-registry.actions';
-import { groupRegistryReducer, GroupRegistryState } from './group-registry.reducers';
+import {
+  GroupRegistryCancelGroupAction,
+  GroupRegistryEditGroupAction,
+} from './group-registry.actions';
+import {
+  groupRegistryReducer,
+  GroupRegistryState,
+} from './group-registry.reducers';
 
 const initialState: GroupRegistryState = {
   editGroup: null,
diff --git a/src/app/access-control/group-registry/group-registry.reducers.ts b/src/app/access-control/group-registry/group-registry.reducers.ts
index 8e288b7f3a..0bb3ad4b5c 100644
--- a/src/app/access-control/group-registry/group-registry.reducers.ts
+++ b/src/app/access-control/group-registry/group-registry.reducers.ts
@@ -1,5 +1,9 @@
 import { Group } from '../../core/eperson/models/group.model';
-import { GroupRegistryAction, GroupRegistryActionTypes, GroupRegistryEditGroupAction } from './group-registry.actions';
+import {
+  GroupRegistryAction,
+  GroupRegistryActionTypes,
+  GroupRegistryEditGroupAction,
+} from './group-registry.actions';
 
 /**
  * The metadata registry state.
@@ -27,13 +31,13 @@ export function groupRegistryReducer(state = initialState, action: GroupRegistry
 
     case GroupRegistryActionTypes.EDIT_GROUP: {
       return Object.assign({}, state, {
-        editGroup: (action as GroupRegistryEditGroupAction).group
+        editGroup: (action as GroupRegistryEditGroupAction).group,
       });
     }
 
     case GroupRegistryActionTypes.CANCEL_EDIT_GROUP: {
       return Object.assign({}, state, {
-        editGroup: null
+        editGroup: null,
       });
     }
 
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 ebbd223599..2ef67ddf54 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -2,22 +2,22 @@
   <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">{{messagePrefix + 'button.add' | translate}}</span>
+            <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">
             <input type="text" name="query" id="query" formControlName="query"
-                   class="form-control" attr.aria-label="{{messagePrefix + 'search.placeholder' | translate}}"
+                   class="form-control" [attr.aria-label]="messagePrefix + 'search.placeholder' | translate"
                    [placeholder]="(messagePrefix + 'search.placeholder' | translate)" >
             <span class="input-group-append">
               <button type="submit" class="search-button btn btn-primary">
@@ -35,7 +35,7 @@
 
       <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
       <ds-pagination
-        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && !(loading$ | async)"
+        *ngIf="(pageInfoState$ | async)?.totalElements > 0 && (loading$ | async) !== true"
         [paginationOptions]="config"
         [pageInfoState]="pageInfoState$"
         [collectionSize]="(pageInfoState$ | async)?.totalElements"
@@ -56,8 +56,8 @@
             <tbody>
             <tr *ngFor="let groupDto of (groupsDto$ | async)?.page">
               <td>{{groupDto.group.id}}</td>
-              <td>{{groupDto.group.name}}</td>
-              <td>{{(groupDto.group.object | async)?.payload?.name}}</td>
+              <td>{{ dsoNameService.getName(groupDto.group) }}</td>
+              <td>{{ dsoNameService.getName((groupDto.group.object | async)?.payload) }}</td>
               <td>{{groupDto.epersons?.totalElements + groupDto.subgroups?.totalElements}}</td>
               <td>
                 <div class="btn-group edit-field">
@@ -65,7 +65,7 @@
                     <button *ngSwitchCase="true"
                       [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
                       class="btn btn-outline-primary btn-sm btn-edit"
-                      title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: groupDto.group.name} }}"
+                      title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
                     >
                       <i class="fas fa-edit fa-fw"></i>
                     </button>
@@ -80,7 +80,7 @@
                   </ng-container>
                   <button *ngIf="!groupDto.group?.permanent && groupDto.ableToDelete"
                           (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
-                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: groupDto.group.name} }}">
+                          title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
                     <i class="fas fa-trash-alt fa-fw"></i>
                   </button>
                 </div>
@@ -91,7 +91,7 @@
         </div>
       </ds-pagination>
 
-      <div *ngIf="(pageInfoState$ | async)?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+      <div *ngIf="(pageInfoState$ | async)?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
         {{messagePrefix + 'no-items' | translate}}
       </div>
 
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 239939e70d..73bb2fe80a 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
@@ -1,39 +1,73 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  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 } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  buildPaginatedList,
+  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 { EPerson } from '../../core/eperson/models/eperson.model';
 import { Group } from '../../core/eperson/models/group.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
-import { GroupsRegistryComponent } from './groups-registry.component';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { NoContent } from '../../core/shared/NoContent.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  DSONameServiceMock,
+  UNDEFINED_NAME,
+} from '../../shared/mocks/dso-name.service.mock';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
+import { GroupsRegistryComponent } from './groups-registry.component';
 
-describe('GroupRegistryComponent', () => {
+describe('GroupsRegistryComponent', () => {
   let component: GroupsRegistryComponent;
   let fixture: ComponentFixture<GroupsRegistryComponent>;
   let ePersonDataServiceStub: any;
@@ -76,24 +110,24 @@ describe('GroupRegistryComponent', () => {
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/epersons':
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 1,
               totalPages: 1,
-              currentPage: 1
+              currentPage: 1,
             }), [EPersonMock]));
           default:
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
         }
-      }
+      },
     };
     groupsDataServiceStub = {
       allGroups: mockGroups,
@@ -104,21 +138,21 @@ describe('GroupRegistryComponent', () => {
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
           case 'https://dspace.4science.it/dspace-spring-rest/api/eperson/groups/testgroupid/groups':
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 1,
               totalPages: 1,
-              currentPage: 1
+              currentPage: 1,
             }), [GroupMock2]));
           default:
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo({
               elementsPerPage: 1,
               totalElements: 0,
               totalPages: 0,
-              currentPage: 1
+              currentPage: 1,
             }), []));
         }
       },
@@ -134,7 +168,7 @@ describe('GroupRegistryComponent', () => {
             elementsPerPage: this.allGroups.length,
             totalElements: this.allGroups.length,
             totalPages: 1,
-            currentPage: 1
+            currentPage: 1,
           }), this.allGroups));
         }
         const result = this.allGroups.find((group: Group) => {
@@ -144,7 +178,7 @@ describe('GroupRegistryComponent', () => {
           elementsPerPage: [result].length,
           totalElements: [result].length,
           totalPages: 1,
-          currentPage: 1
+          currentPage: 1,
         }), [result]));
       },
       delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
@@ -154,23 +188,24 @@ describe('GroupRegistryComponent', () => {
     dsoDataServiceStub = {
       findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
         return createSuccessfulRemoteDataObject$(undefined);
-      }
+      },
     };
 
     authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
     setIsAuthorized(true, true);
     paginationService = new PaginationServiceStub();
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [GroupsRegistryComponent],
       providers: [GroupsRegistryComponent,
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: EPersonDataService, useValue: ePersonDataServiceStub },
         { provide: GroupDataService, useValue: groupsDataServiceStub },
         { provide: DSpaceObjectDataService, useValue: dsoDataServiceStub },
@@ -179,9 +214,9 @@ describe('GroupRegistryComponent', () => {
         { provide: Router, useValue: new RouterMock() },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: PaginationService, useValue: paginationService },
-        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) }
+        { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeByHrefSubstring']) },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -208,7 +243,7 @@ describe('GroupRegistryComponent', () => {
   it('should display community/collection name if present', () => {
     const collectionNamesFound = fixture.debugElement.queryAll(By.css('#groups tr td:nth-child(3)'));
     expect(collectionNamesFound.length).toEqual(2);
-    expect(collectionNamesFound[0].nativeElement.textContent).toEqual('');
+    expect(collectionNamesFound[0].nativeElement.textContent).toEqual(UNDEFINED_NAME);
     expect(collectionNamesFound[1].nativeElement.textContent).toEqual('testgroupid2objectName');
   });
 
@@ -234,16 +269,16 @@ describe('GroupRegistryComponent', () => {
 
       it('should not check the canManageGroup permissions', () => {
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[0].self
+          FeatureID.CanManageGroup, mockGroups[0].self,
         );
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[0].self, undefined // treated differently
+          FeatureID.CanManageGroup, mockGroups[0].self, undefined, // treated differently
         );
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[1].self
+          FeatureID.CanManageGroup, mockGroups[1].self,
         );
         expect(authorizationService.isAuthorized).not.toHaveBeenCalledWith(
-          FeatureID.CanManageGroup, mockGroups[1].self, undefined // treated differently
+          FeatureID.CanManageGroup, mockGroups[1].self, undefined, // treated differently
         );
       });
     });
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 70c9b22852..24d6f9e4a9 100644
--- a/src/app/access-control/group-registry/groups-registry.component.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.ts
@@ -1,5 +1,9 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import {
@@ -8,34 +12,45 @@ import {
   EMPTY,
   Observable,
   of as observableOf,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { catchError, defaultIfEmpty, map, switchMap, tap } from 'rxjs/operators';
+import {
+  catchError,
+  defaultIfEmpty,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  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 { EPerson } from '../../core/eperson/models/eperson.model';
-import { GroupDtoModel } from '../../core/eperson/models/group-dto.model';
 import { Group } from '../../core/eperson/models/group.model';
+import { GroupDtoModel } from '../../core/eperson/models/group-dto.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { RouteService } from '../../core/services/route.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../core/shared/operators';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 
 @Component({
@@ -56,7 +71,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'gl',
     pageSize: 5,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -99,12 +114,14 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
               private dSpaceObjectDataService: DSpaceObjectDataService,
               private translateService: TranslateService,
               private notificationsService: NotificationsService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               protected routeService: RouteService,
               private router: Router,
               private authorizationService: AuthorizationDataService,
               private paginationService: PaginationService,
-              public requestService: RequestService) {
+              public requestService: RequestService,
+              public dsoNameService: DSONameService,
+  ) {
     this.currentSearchQuery = '';
     this.searchForm = this.formBuilder.group(({
       query: this.currentSearchQuery,
@@ -130,7 +147,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         const query: string = data.query;
         if (query != null && this.currentSearchQuery !== query) {
           this.currentSearchQuery = query;
-          this.paginationService.updateRouteWithUrl(this.config.id, [], {page: 1});
+          this.paginationService.updateRouteWithUrl(this.config.id, [], { page: 1 });
         }
         return this.groupService.searchGroups(this.currentSearchQuery.trim(), {
           currentPage: paginationOptions.currentPage,
@@ -152,19 +169,19 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
                   this.canManageGroup$(isSiteAdmin, group),
                   this.hasLinkedDSO(group),
                   this.getSubgroups(group),
-                  this.getMembers(group)
+                  this.getMembers(group),
                 ]).pipe(
                   map(([canDelete, canManageGroup, hasLinkedDSO, subgroups, members]:
                          [boolean, boolean, boolean, RemoteData<PaginatedList<Group>>, RemoteData<PaginatedList<EPerson>>]) => {
-                      const groupDtoModel: GroupDtoModel = new GroupDtoModel();
-                      groupDtoModel.ableToDelete = canDelete && !hasLinkedDSO;
-                      groupDtoModel.ableToEdit = canManageGroup;
-                      groupDtoModel.group = group;
-                      groupDtoModel.subgroups = subgroups.payload;
-                      groupDtoModel.epersons = members.payload;
-                      return groupDtoModel;
-                    }
-                  )
+                    const groupDtoModel: GroupDtoModel = new GroupDtoModel();
+                    groupDtoModel.ableToDelete = canDelete && !hasLinkedDSO;
+                    groupDtoModel.ableToEdit = canManageGroup;
+                    groupDtoModel.group = group;
+                    groupDtoModel.subgroups = subgroups.payload;
+                    groupDtoModel.epersons = members.payload;
+                    return groupDtoModel;
+                  },
+                  ),
                 );
               } else {
                 return EMPTY;
@@ -172,9 +189,9 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
             })]).pipe(defaultIfEmpty([]), map((dtos: GroupDtoModel[]) => {
               return buildPaginatedList(groups.pageInfo, dtos);
             }));
-          })
+          }),
         );
-      })
+      }),
     ).subscribe((value: PaginatedList<GroupDtoModel>) => {
       this.groupsDto$.next(value);
       this.pageInfoState$.next(value.pageInfo);
@@ -182,7 +199,7 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
     });
 
     this.subs.push(this.searchSub);
-      }
+  }
 
   canManageGroup$(isSiteAdmin: boolean, group: Group): Observable<boolean> {
     if (isSiteAdmin) {
@@ -201,30 +218,40 @@ export class GroupsRegistryComponent implements OnInit, OnDestroy {
         .subscribe((rd: RemoteData<NoContent>) => {
           if (rd.hasSucceeded) {
             this.deletedGroupsIds = [...this.deletedGroupsIds, group.group.id];
-            this.notificationsService.success(this.translateService.get(this.messagePrefix + 'notification.deleted.success', { name: group.group.name }));
+            this.notificationsService.success(this.translateService.get(this.messagePrefix + 'notification.deleted.success', { name: this.dsoNameService.getName(group.group) }));
           } else {
             this.notificationsService.error(
-              this.translateService.get(this.messagePrefix + 'notification.deleted.failure.title', { name: group.group.name }),
+              this.translateService.get(this.messagePrefix + 'notification.deleted.failure.title', { name: this.dsoNameService.getName(group.group) }),
               this.translateService.get(this.messagePrefix + 'notification.deleted.failure.content', { cause: rd.errorMessage }));
           }
-      });
+        });
     }
   }
 
   /**
    * 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-curation-tasks/admin-curation-tasks.component.spec.ts b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
index 358bd0d01e..5aabe0fda0 100644
--- a/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
+++ b/src/app/admin/admin-curation-tasks/admin-curation-tasks.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AdminCurationTasksComponent } from './admin-curation-tasks.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminCurationTasksComponent } from './admin-curation-tasks.component';
 
 describe('AdminCurationTasksComponent', () => {
   let comp: AdminCurationTasksComponent;
@@ -11,7 +16,7 @@ describe('AdminCurationTasksComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [AdminCurationTasksComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
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 dbc8c74437..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;
@@ -20,12 +20,29 @@
     </small>
   </div>
 
+  <ui-switch color="#ebebeb"
+             [checkedLabel]="'admin.metadata-import.page.toggle.upload' | translate"
+             [uncheckedLabel]="'admin.metadata-import.page.toggle.url' | translate"
+             [checked]="isUpload"
+             (change)="toggleUpload()" ></ui-switch>
+  <small class="form-text text-muted">
+    {{'admin.batch-import.page.toggle.help' | translate}}
+  </small>
+
+
   <ds-file-dropzone-no-uploader
+    *ngIf="isUpload"
+    data-test="file-dropzone"
     (onFileAdded)="setFile($event)"
     [dropMessageLabel]="'admin.batch-import.page.dropMsg'"
     [dropMessageLabelReplacement]="'admin.batch-import.page.dropMsgReplace'">
   </ds-file-dropzone-no-uploader>
 
+  <div class="form-group mt-2" *ngIf="!isUpload">
+    <input class="form-control" type="text" placeholder="{{'admin.metadata-import.page.urlMsg' | translate}}"
+           data-test="file-url-input" [(ngModel)]="fileURL">
+  </div>
+
   <div class="space-children-mr">
     <button class="btn btn-secondary" id="backButton"
             (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
index 36ba1137c9..752bd52e4d 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.spec.ts
@@ -1,22 +1,31 @@
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { BatchImportPageComponent } from './batch-import-page.component';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FormsModule } from '@angular/forms';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
-import { FileValidator } from '../../shared/utils/require-file.validator';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import {
-  BATCH_IMPORT_SCRIPT_NAME,
-  ScriptDataService
-} from '../../core/data/processes/script-data.service';
-import { Router } from '@angular/router';
 import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+  BATCH_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
+import { FileValidator } from '../../shared/utils/require-file.validator';
+import { BatchImportPageComponent } from './batch-import-page.component';
 
 describe('BatchImportPageComponent', () => {
   let component: BatchImportPageComponent;
@@ -31,14 +40,14 @@ describe('BatchImportPageComponent', () => {
     notificationService = new NotificationsServiceStub();
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '46' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '46' }),
+      },
     );
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     locationStub = jasmine.createSpyObj('location', {
-      back: jasmine.createSpy('back')
+      back: jasmine.createSpy('back'),
     });
   }
 
@@ -48,7 +57,7 @@ describe('BatchImportPageComponent', () => {
       imports: [
         FormsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [BatchImportPageComponent, FileValueAccessorDirective, FileValidator],
       providers: [
@@ -57,7 +66,7 @@ describe('BatchImportPageComponent', () => {
         { provide: Router, useValue: router },
         { provide: Location, useValue: locationStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -86,10 +95,18 @@ describe('BatchImportPageComponent', () => {
     let fileMock: File;
 
     beforeEach(() => {
+      component.isUpload = true;
       fileMock = new File([''], 'filename.zip', { type: 'application/zip' });
       component.setFile(fileMock);
     });
 
+    it('should show the file dropzone', () => {
+      const fileDropzone = fixture.debugElement.query(By.css('[data-test="file-dropzone"]'));
+      const fileUrlInput = fixture.debugElement.query(By.css('[data-test="file-url-input"]'));
+      expect(fileDropzone).toBeTruthy();
+      expect(fileUrlInput).toBeFalsy();
+    });
+
     describe('if proceed button is pressed without validate only', () => {
       beforeEach(fakeAsync(() => {
         component.validateOnly = false;
@@ -99,9 +116,9 @@ describe('BatchImportPageComponent', () => {
       }));
       it('metadata-import script is invoked with --zip fileName and the mockFile', () => {
         const parameterValues: ProcessParameter[] = [
+          Object.assign(new ProcessParameter(), { name: '--add' }),
           Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' }),
         ];
-        parameterValues.push(Object.assign(new ProcessParameter(), { name: '--add' }));
         expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
       });
       it('success notification is shown', () => {
@@ -121,8 +138,8 @@ describe('BatchImportPageComponent', () => {
       }));
       it('metadata-import script is invoked with --zip fileName and the mockFile and -v validate-only', () => {
         const parameterValues: ProcessParameter[] = [
-          Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' }),
           Object.assign(new ProcessParameter(), { name: '--add' }),
+          Object.assign(new ProcessParameter(), { name: '--zip', value: 'filename.zip' }),
           Object.assign(new ProcessParameter(), { name: '-v', value: true }),
         ];
         expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [fileMock]);
@@ -148,4 +165,77 @@ describe('BatchImportPageComponent', () => {
       });
     });
   });
+
+  describe('if url is set', () => {
+    beforeEach(fakeAsync(() => {
+      component.isUpload = false;
+      component.fileURL = 'example.fileURL.com';
+      fixture.detectChanges();
+    }));
+
+    it('should show the file url input', () => {
+      const fileDropzone = fixture.debugElement.query(By.css('[data-test="file-dropzone"]'));
+      const fileUrlInput = fixture.debugElement.query(By.css('[data-test="file-url-input"]'));
+      expect(fileDropzone).toBeFalsy();
+      expect(fileUrlInput).toBeTruthy();
+    });
+
+    describe('if proceed button is pressed without validate only', () => {
+      beforeEach(fakeAsync(() => {
+        component.validateOnly = false;
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('metadata-import script is invoked with --url and the file url', () => {
+        const parameterValues: ProcessParameter[] = [
+          Object.assign(new ProcessParameter(), { name: '--add' }),
+          Object.assign(new ProcessParameter(), { name: '--url', value: 'example.fileURL.com' }),
+        ];
+        expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [null]);
+      });
+      it('success notification is shown', () => {
+        expect(notificationService.success).toHaveBeenCalled();
+      });
+      it('redirected to process page', () => {
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/46');
+      });
+    });
+
+    describe('if proceed button is pressed with validate only', () => {
+      beforeEach(fakeAsync(() => {
+        component.validateOnly = true;
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('metadata-import script is invoked with --url and the file url and -v validate-only', () => {
+        const parameterValues: ProcessParameter[] = [
+          Object.assign(new ProcessParameter(), { name: '--add' }),
+          Object.assign(new ProcessParameter(), { name: '--url', value: 'example.fileURL.com' }),
+          Object.assign(new ProcessParameter(), { name: '-v', value: true }),
+        ];
+        expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_IMPORT_SCRIPT_NAME, parameterValues, [null]);
+      });
+      it('success notification is shown', () => {
+        expect(notificationService.success).toHaveBeenCalled();
+      });
+      it('redirected to process page', () => {
+        expect(router.navigateByUrl).toHaveBeenCalledWith('/processes/46');
+      });
+    });
+
+    describe('if proceed is pressed; but script invoke fails', () => {
+      beforeEach(fakeAsync(() => {
+        jasmine.getEnv().allowRespy(true);
+        spyOn(scriptService, 'invoke').and.returnValue(createFailedRemoteDataObject$('Error', 500));
+        const proceed = fixture.debugElement.query(By.css('#proceedButton')).nativeElement;
+        proceed.click();
+        fixture.detectChanges();
+      }));
+      it('error notification is shown', () => {
+        expect(notificationService.error).toHaveBeenCalled();
+      });
+    });
+  });
 });
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
index 7171c67585..2712610fd1 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.ts
@@ -1,26 +1,31 @@
-import { Component } from '@angular/core';
 import { Location } from '@angular/common';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { BATCH_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { Process } from '../../process-page/processes/process.model';
-import { isNotEmpty } from '../../shared/empty.util';
-import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
-import {
-  ImportBatchSelectorComponent
-} from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  BATCH_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+import { Process } from '../../process-page/processes/process.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { ImportBatchSelectorComponent } from '../../shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-batch-import-page',
-  templateUrl: './batch-import-page.component.html'
+  templateUrl: './batch-import-page.component.html',
 })
 export class BatchImportPageComponent {
   /**
@@ -32,11 +37,22 @@ export class BatchImportPageComponent {
    * The validate only flag
    */
   validateOnly = true;
+
   /**
    * dso object for community or collection
    */
   dso: DSpaceObject = null;
 
+  /**
+   * The flag between upload and url
+   */
+  isUpload = true;
+
+  /**
+   * File URL when flag is for url
+   */
+  fileURL: string;
+
   public constructor(private location: Location,
                      protected translate: TranslateService,
                      protected notificationsService: NotificationsService,
@@ -72,13 +88,22 @@ export class BatchImportPageComponent {
    * Starts import-metadata script with --zip fileName (and the selected file)
    */
   public importMetadata() {
-    if (this.fileObject == null) {
-      this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
+    if (this.fileObject == null && isEmpty(this.fileURL)) {
+      if (this.isUpload) {
+        this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFile'));
+      } else {
+        this.notificationsService.error(this.translate.get('admin.metadata-import.page.error.addFileUrl'));
+      }
     } else {
       const parameterValues: ProcessParameter[] = [
-        Object.assign(new ProcessParameter(), { name: '--zip', value: this.fileObject.name }),
-        Object.assign(new ProcessParameter(), { name: '--add' })
+        Object.assign(new ProcessParameter(), { name: '--add' }),
       ];
+      if (this.isUpload) {
+        parameterValues.push(Object.assign(new ProcessParameter(), { name: '--zip', value: this.fileObject.name }));
+      } else {
+        this.fileObject = null;
+        parameterValues.push(Object.assign(new ProcessParameter(), { name: '--url', value: this.fileURL }));
+      }
       if (this.dso) {
         parameterValues.push(Object.assign(new ProcessParameter(), { name: '--collection', value: this.dso.uuid }));
       }
@@ -97,9 +122,15 @@ export class BatchImportPageComponent {
             this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
           }
         } else {
-          const title = this.translate.get('process.new.notification.error.title');
-          const content = this.translate.get('process.new.notification.error.content');
-          this.notificationsService.error(title, content);
+          if (rd.statusCode === 413) {
+            const title = this.translate.get('process.new.notification.error.title');
+            const content = this.translate.get('process.new.notification.error.max-upload.content');
+            this.notificationsService.error(title, content);
+          } else {
+            const title = this.translate.get('process.new.notification.error.title');
+            const content = this.translate.get('process.new.notification.error.content');
+            this.notificationsService.error(title, content);
+          }
         }
       });
     }
@@ -121,4 +152,11 @@ export class BatchImportPageComponent {
   removeDspaceObject(): void {
     this.dso = null;
   }
+
+  /**
+   * toggle the flag between upload and url
+   */
+  toggleUpload() {
+    this.isUpload = !this.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-import-metadata-page/metadata-import-page.component.spec.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
index 814757ec71..131b4561c1 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.spec.ts
@@ -1,19 +1,31 @@
 import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
+
+import {
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { FileValueAccessorDirective } from '../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../shared/utils/require-file.validator';
 import { MetadataImportPageComponent } from './metadata-import-page.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('MetadataImportPageComponent', () => {
   let comp: MetadataImportPageComponent;
@@ -28,14 +40,14 @@ describe('MetadataImportPageComponent', () => {
     notificationService = new NotificationsServiceStub();
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' }),
+      },
     );
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     locationStub = jasmine.createSpyObj('location', {
-      back: jasmine.createSpy('back')
+      back: jasmine.createSpy('back'),
     });
   }
 
@@ -45,7 +57,7 @@ describe('MetadataImportPageComponent', () => {
       imports: [
         FormsModule,
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [MetadataImportPageComponent, FileValueAccessorDirective, FileValidator],
       providers: [
@@ -54,7 +66,7 @@ describe('MetadataImportPageComponent', () => {
         { provide: Router, useValue: router },
         { provide: Location, useValue: locationStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
index deb16c0d73..e554459286 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.ts
@@ -1,23 +1,23 @@
 import { Location } from '@angular/common';
-import { Component, OnInit } from '@angular/core';
+import { Component } from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { AuthService } from '../../core/auth/auth.service';
-import { METADATA_IMPORT_SCRIPT_NAME, ScriptDataService } from '../../core/data/processes/script-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+
+import {
+  METADATA_IMPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+import { Process } from '../../process-page/processes/process.model';
 import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
 import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { Process } from '../../process-page/processes/process.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
 
 @Component({
   selector: 'ds-metadata-import-page',
-  templateUrl: './metadata-import-page.component.html'
+  templateUrl: './metadata-import-page.component.html',
 })
 
 /**
diff --git a/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts b/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts
new file mode 100644
index 0000000000..c1bdff9818
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services-routing.module.ts
@@ -0,0 +1,50 @@
+import { NgModule } from '@angular/core';
+import {
+  RouterModule,
+  Routes,
+} from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { NavigationBreadcrumbResolver } from '../../core/breadcrumbs/navigation-breadcrumb.resolver';
+import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
+import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
+
+const moduleRoutes: Routes = [
+  {
+    path: '',
+    pathMatch: 'full',
+    component: LdnServicesOverviewComponent,
+    resolve: { breadcrumb: I18nBreadcrumbResolver },
+    data: { title: 'ldn-registered-services.title', breadcrumbKey: 'ldn-registered-services.new' },
+  },
+  {
+    path: 'new',
+    resolve: { breadcrumb: NavigationBreadcrumbResolver },
+    component: LdnServiceFormComponent,
+    data: { title: 'ldn-register-new-service.title', breadcrumbKey: 'ldn-register-new-service' },
+  },
+  {
+    path: 'edit/:serviceId',
+    resolve: { breadcrumb: NavigationBreadcrumbResolver },
+    component: LdnServiceFormComponent,
+    data: { title: 'ldn-edit-service.title', breadcrumbKey: 'ldn-edit-service' },
+  },
+];
+
+
+@NgModule({
+  imports: [
+    RouterModule.forChild(moduleRoutes.map(route => {
+      return { ...route, data: {
+        ...route.data,
+        relatedRoutes: moduleRoutes.filter(relatedRoute => relatedRoute.path !== route.path)
+          .map((relatedRoute) => {
+            return { path: relatedRoute.path, data: relatedRoute.data };
+          }),
+      } };
+    })),
+  ],
+})
+export class AdminLdnServicesRoutingModule {
+
+}
diff --git a/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts b/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
new file mode 100644
index 0000000000..59875158ef
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/admin-ldn-services.module.ts
@@ -0,0 +1,25 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+
+import { SharedModule } from '../../shared/shared.module';
+import { AdminLdnServicesRoutingModule } from './admin-ldn-services-routing.module';
+import { LdnServiceFormComponent } from './ldn-service-form/ldn-service-form.component';
+import { LdnItemfiltersService } from './ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesOverviewComponent } from './ldn-services-directory/ldn-services-directory.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    AdminLdnServicesRoutingModule,
+    FormsModule,
+  ],
+  declarations: [
+    LdnServicesOverviewComponent,
+    LdnServiceFormComponent,
+  ],
+  providers: [LdnItemfiltersService],
+})
+export class AdminLdnServicesModule {
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
new file mode 100644
index 0000000000..0a7bc39fa3
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -0,0 +1,315 @@
+<div class="container">
+  <form (ngSubmit)="onSubmit()" [formGroup]="formModel">
+    <div class="d-flex">
+      <h1 class="flex-grow-1">{{ isNewService ? ('ldn-create-service.title' | translate) : ('ldn-edit-registered-service.title' | translate) }}</h1>
+    </div>
+    <!-- In the toggle section -->
+    <div class="toggle-switch-container" *ngIf="!isNewService">
+      <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
+      <div>
+        <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
+        <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
+          <div class="slider"></div>
+        </div>
+      </div>
+    </div>
+    <!-- In the Name section -->
+    <div class="mb-5">
+      <label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
+      <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
+             [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
+             formControlName="name"
+             id="name"
+             name="name"
+             type="text">
+      <div *ngIf="formModel.get('name').invalid && formModel.get('name').touched" class="error-text">
+        {{ 'ldn-new-service.form.error.name' | translate }}
+      </div>
+    </div>
+
+    <!-- In the description section -->
+    <div class="mb-5 mt-5 d-flex flex-column">
+      <label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
+      <textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
+                class="form-control" formControlName="description" id="description" name="description"></textarea>
+    </div>
+
+    <div class="mb-5 mt-5">
+      <!-- In the url section -->
+      <div class="d-flex align-items-center">
+        <div class="d-flex flex-column w-50 mr-2">
+          <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
+          <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
+                 [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
+                 formControlName="url"
+                 id="url"
+                 name="url"
+                 type="text">
+          <div *ngIf="formModel.get('url').invalid && formModel.get('url').touched" class="error-text">
+            {{ 'ldn-new-service.form.error.url' | translate }}
+          </div>
+        </div>
+
+        <div class="d-flex flex-column w-50">
+          <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
+          <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
+                 [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
+                 id="score"
+                 name="score"
+                 min="0"
+                 max="1"
+                 step=".01"
+                 class="form-control"
+                 type="number">
+          <div *ngIf="formModel.get('score').invalid && formModel.get('score').touched" class="error-text">
+            {{ 'ldn-new-service.form.error.score' | translate }}
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <!-- In the IP range section -->
+    <div class="mb-5 mt-5">
+      <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
+      <div class="d-flex">
+        <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
+               [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control mr-2"
+               formControlName="lowerIp"
+               id="lowerIp"
+               name="lowerIp"
+               type="text">
+        <input [class.invalid-field]="formModel.get('upperIp').invalid && formModel.get('upperIp').touched"
+               [placeholder]="'ldn-new-service.form.placeholder.upperIp' | translate" class="form-control"
+               formControlName="upperIp"
+               id="upperIp"
+               name="upperIp"
+               type="text">
+      </div>
+      <div *ngIf="(formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched) || (formModel.get('upperIp').invalid && formModel.get('upperIp').touched)" class="error-text">
+        {{ 'ldn-new-service.form.error.ipRange' | translate }}
+      </div>
+      <div class="text-muted">
+        {{ 'ldn-new-service.form.hint.ipRange' | translate }}
+      </div>
+    </div>
+
+    <!-- In the ldnUrl section -->
+    <div class="mb-5 mt-5">
+      <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
+      <input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
+             [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
+             formControlName="ldnUrl"
+             id="ldnUrl"
+             name="ldnUrl"
+             type="text">
+      <div *ngIf="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched" >
+        <div *ngIf="formModel.get('ldnUrl').errors['required']" class="error-text">
+          {{ 'ldn-new-service.form.error.ldnurl' | translate }}
+        </div>
+        <div *ngIf="formModel.get('ldnUrl').errors['ldnUrlAlreadyAssociated']" class="error-text">
+          {{ 'ldn-new-service.form.error.ldnurl.ldnUrlAlreadyAssociated' | translate }}
+        </div>
+      </div>
+    </div>
+
+
+    <!-- In the Inbound Patterns Labels section -->
+    <div class="row mb-1 mt-5" *ngIf="areControlsInitialized">
+      <div class="col">
+        <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
+      </div>
+      <ng-container *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern">
+        <div class="col">
+          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+        </div>
+        <div class="col-sm-1">
+          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+        </div>
+      </ng-container>
+      <div class="col-sm-2">
+      </div>
+    </div>
+
+    <!-- In the Inbound Patterns section -->
+    <div *ngIf="areControlsInitialized">
+      <div *ngFor="let patternGroup of formModel.get('notifyServiceInboundPatterns')['controls']; let i = index"
+           [class.marked-for-deletion]="markedForDeletionInboundPattern.includes(i)"
+           formGroupName="notifyServiceInboundPatterns">
+
+        <ng-container [formGroupName]="i">
+
+
+          <div class="row mb-1 align-items-center">
+            <div class="col">
+              <div #inboundPatternDropdown="ngbDropdown" class="w-80" display="dynamic"
+                   id="additionalInboundPattern{{i}}"
+                   ngbDropdown placement="top-start">
+                <div class="position-relative right-addon" role="combobox"  aria-expanded="false" aria-controls="inboundPatternDropdownButton">
+                  <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                     ngbDropdownToggle></i>
+                  <input
+                    (click)="inboundPatternDropdown.open();"
+                    [readonly]="true"
+                    [value]="selectedInboundPatterns"
+                    class="form-control w-80 scrollable-dropdown-input"
+                    formControlName="patternLabel"
+                    id="inboundPatternDropdownButton"
+                    ngbDropdownAnchor
+                    type="text"
+                    [attr.aria-label]="'ldn-service-input-inbound-pattern-dropdown' | translate"
+                  />
+                  <div aria-labelledby="inboundPatternDropdownButton"
+                       class="dropdown-menu dropdown-menu-top w-100 "
+                       ngbDropdownMenu>
+                    <div class="scrollable-menu" role="listbox">
+                      <button (click)="selectInboundPattern(pattern, i); $event.stopPropagation()"
+                              *ngFor="let pattern of inboundPatterns; let internalIndex = index"
+                              [title]="'ldn-service.form.pattern.' + pattern + '.description' | translate"
+                              class="dropdown-item collection-item text-truncate w-100"
+                              ngbDropdownItem
+                              type="button">
+                        <div>{{ 'ldn-service.form.pattern.' + pattern + '.label' | translate }}</div>
+                      </button>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+
+            <div class="col">
+              <ng-container
+                *ngIf="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern">
+                <div #inboundItemfilterDropdown="ngbDropdown" class="w-100" id="constraint{{i}}" ngbDropdown
+                     placement="top-start">
+                  <div class="position-relative right-addon" aria-expanded="false" aria-controls="inboundItemfilterDropdown" role="combobox">
+                    <i aria-hidden="true" class="position-absolute scrollable-dropdown-toggle"
+                       ngbDropdownToggle></i>
+                    <input
+                      [readonly]="true"
+                      class="form-control d-none w-100 scrollable-dropdown-input"
+                      formControlName="constraint"
+                      id="inboundItemfilterDropdown"
+                      ngbDropdownAnchor
+                      type="text"
+                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                    />
+                    <input
+                      (click)="inboundItemfilterDropdown.open();"
+                      [readonly]="true"
+                      class="form-control w-100 scrollable-dropdown-input"
+                      formControlName="constraintFormatted"
+                      id="inboundItemfilterDropdownPrettified"
+                      ngbDropdownAnchor
+                      type="text"
+                      [attr.aria-label]="'ldn-service-input-inbound-item-filter-dropdown' | translate"
+                    />
+                    <div aria-labelledby="inboundItemfilterDropdownButton"
+                         class="dropdown-menu scrollable-dropdown-menu w-100 "
+                         ngbDropdownMenu>
+                      <div class="scrollable-menu" role="listbox">
+                        <button (click)="selectInboundItemFilter('', i); $event.stopPropagation()"
+                                class="dropdown-item collection-item text-truncate w-100" ngbDropdownItem type="button">
+                          <span> {{'ldn-service.control-constaint-select-none' | translate}} </span>
+                        </button>
+                        <button (click)="selectInboundItemFilter(constraint.id, i); $event.stopPropagation()"
+                                *ngFor="let constraint of (itemfiltersRD$ | async)?.payload?.page; let internalIndex = index"
+                                class="dropdown-item collection-item text-truncate w-100"
+                                ngbDropdownItem
+                                type="button">
+                          <div>{{ constraint.id + '.label' | translate }}</div>
+                        </button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </ng-container>
+            </div>
+
+            <div
+              [style.visibility]="formModel.get('notifyServiceInboundPatterns')['controls'][i].value.pattern ? 'visible' : 'hidden'"
+              class="col-sm-1">
+              <input formControlName="automatic" hidden id="automatic{{i}}" name="automatic{{i}}"
+                     type="checkbox">
+              <div (click)="toggleAutomatic(i)"
+                   [class.checked]="formModel.get('notifyServiceInboundPatterns.' + i + '.automatic').value"
+                   class="toggle-switch">
+                <div class="slider"></div>
+              </div>
+            </div>
+
+
+            <div class="col-sm-2">
+              <div class="btn-group">
+                <button (click)="markForInboundPatternDeletion(i)" class="btn btn-outline-dark trash-button"
+                        [title]="'ldn-service-button-mark-inbound-deletion' | translate"
+                        type="button">
+                  <i class="fas fa-trash"></i>
+                </button>
+
+
+                <button (click)="unmarkForInboundPatternDeletion(i)"
+                        *ngIf="markedForDeletionInboundPattern.includes(i)"
+                        [title]="'ldn-service-button-unmark-inbound-deletion' | translate"
+                        class="btn btn-warning "
+                        type="button">
+                  <i class="fas fa-undo"></i>
+                </button>
+              </div>
+            </div>
+          </div>
+        </ng-container>
+      </div>
+    </div>
+
+    <span (click)="addInboundPattern()"
+          class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
+
+    <div class="submission-form-footer my-1 position-sticky d-flex justify-content-between" role="group">
+      <button (click)="resetFormAndLeave()" class="btn btn-primary" type="button">
+        <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
+      </button>
+      <button class="btn btn-primary" type="submit">
+        <span><i class="fas fa-save"></i>&nbsp;{{ 'ldn-new-service.form.label.submit' | translate }}</span>
+      </button>
+    </div>
+  </form>
+</div>
+<ng-template #confirmModal>
+    <div class="modal-header">
+      <h4 *ngIf="!isNewService">{{'service.overview.edit.modal' | translate }}</h4>
+      <h4 *ngIf="isNewService">{{'service.overview.create.modal' | translate }}</h4>
+      <button (click)="closeModal()" aria-label="Close"
+              class="close" type="button">
+        <span aria-hidden="true">×</span>
+      </button>
+    </div>
+
+    <div class="modal-body">
+      <div *ngIf="!isNewService">
+        {{ 'service.overview.edit.body' | translate }}
+      </div>
+      <span *ngIf="isNewService">
+        {{ 'service.overview.create.body' | translate }}
+      </span>
+    </div>
+      <div class="modal-footer">
+        <div *ngIf="!isNewService">
+          <button (click)="closeModal()" class="btn btn-danger mr-2"
+                  id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
+          </button>
+          <button *ngIf="!isNewService" (click)="patchService()"
+                  class="btn btn-primary">{{ 'service.detail.update' | translate }}
+          </button>
+        </div>
+        <div *ngIf="isNewService">
+          <button (click)="closeModal()" class="btn btn-danger mr-2 "
+                  id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
+          </button>
+          <button (click)="createService()"
+                  class="btn btn-primary">{{ 'service.confirm.create' | translate }}
+          </button>
+        </div>
+      </div>
+</ng-template>
+
+
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
new file mode 100644
index 0000000000..afd5c80d1c
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.scss
@@ -0,0 +1,143 @@
+@import '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss';
+@import '../../../shared/form/form.component.scss';
+
+form {
+  font-size: 14px;
+  position: relative;
+}
+
+input,
+select {
+  max-width: 100%;
+  width: 100%;
+  padding: 8px;
+  font-size: 14px;
+}
+
+option:not(:first-child) {
+  font-weight: bold;
+}
+
+.trash-button {
+  width: 40px;
+  height: 40px;
+}
+
+textarea {
+  height: 200px;
+  resize: none;
+}
+
+.add-pattern-link {
+  color: #0048ff;
+  cursor: pointer;
+}
+
+.remove-pattern-link {
+  color: #e34949;
+  cursor: pointer;
+  margin-left: 10px;
+}
+
+.status-checkbox {
+  margin-top: 5px;
+}
+
+
+.invalid-field {
+  border: 1px solid red;
+  color: #000000;
+}
+
+.error-text {
+  color: red;
+  font-size: 0.8em;
+  margin-top: 5px;
+}
+
+.toggle-switch {
+  display: flex;
+  align-items: center;
+  opacity: 0.8;
+  position: relative;
+  width: 60px;
+  height: 30px;
+  background-color: #ccc;
+  border-radius: 15px;
+  cursor: pointer;
+  transition: background-color 0.3s;
+}
+
+.toggle-switch.checked {
+  background-color: #24cc9a;
+}
+
+.slider {
+  position: absolute;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  background-color: #fff;
+  transition: transform 0.3s;
+}
+
+
+.toggle-switch .slider {
+  width: 22px;
+  height: 22px;
+  border-radius: 50%;
+  margin: 0 auto;
+}
+
+.toggle-switch.checked .slider {
+  transform: translateX(30px);
+}
+
+.toggle-switch-container {
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-start;
+  align-items: flex-end;
+  margin-top: 10px;
+}
+
+.small-text {
+  font-size: 0.7em;
+  color: #888;
+}
+
+.toggle-switch {
+  cursor: pointer;
+  margin-top: 3px;
+  margin-right: 3px
+}
+
+.label-box {
+  margin-left: 11px;
+}
+
+.label-box-2 {
+  margin-left: 14px;
+}
+
+.label-box-3 {
+  margin-left: 5px;
+}
+
+.submission-form-footer {
+  border-radius: var(--bs-card-border-radius);
+  bottom: 0;
+  background-color: var(--bs-gray-400);
+  padding: calc(var(--bs-spacer) / 2);
+  z-index: calc(var(--ds-submission-footer-z-index) + 1);
+}
+
+.marked-for-deletion {
+  background-color: lighten($red, 30%);
+}
+
+.dropdown-menu-top, .scrollable-dropdown-menu  {
+  z-index: var(--ds-submission-footer-z-index);
+}
+
+
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
new file mode 100644
index 0000000000..b5d774b6c5
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.spec.ts
@@ -0,0 +1,267 @@
+import {
+  ChangeDetectorRef,
+  EventEmitter,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import {
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbDropdownModule,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { PaginationService } from 'ngx-pagination';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { RouteService } from '../../../core/services/route.service';
+import { MockActivatedRoute } from '../../../shared/mocks/active-router.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { LdnItemfiltersService } from '../ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
+import { LdnServiceFormComponent } from './ldn-service-form.component';
+
+describe('LdnServiceFormEditComponent', () => {
+  let component: LdnServiceFormComponent;
+  let fixture: ComponentFixture<LdnServiceFormComponent>;
+
+  let ldnServicesService: LdnServicesService;
+  let ldnItemfiltersService: any;
+  let cdRefStub: any;
+  let modalService: any;
+  let activatedRoute: MockActivatedRoute;
+
+  const testId = '1234';
+  const routeParams = {
+    serviceId: testId,
+  };
+  const routeUrlSegments = [{ path: 'path' }];
+  const formMockValue = {
+    'id': '',
+    'name': 'name',
+    'description': 'description',
+    'url': 'www.test.com',
+    'ldnUrl': 'https://test.com',
+    'lowerIp': '127.0.0.1',
+    'upperIp': '100.100.100.100',
+    'score': 1,
+    'inboundPattern': '',
+    'constraintPattern': '',
+    'enabled': '',
+    'type': 'ldnservice',
+    'notifyServiceInboundPatterns': [
+      {
+        'pattern': '',
+        'patternLabel': 'Select a pattern',
+        'constraint': '',
+        'automatic': false,
+      },
+    ],
+  };
+
+
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    instant: () => 'translated-text',
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  beforeEach(async () => {
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      create: observableOf(null),
+      update: observableOf(null),
+      findById: createSuccessfulRemoteDataObject$({}),
+    });
+
+    ldnItemfiltersService = {
+      findAll: () => of(['item1', 'item2']),
+    };
+    cdRefStub = Object.assign({
+      detectChanges: () => fixture.detectChanges(),
+    });
+    modalService = {
+      open: () => {/*comment*/
+      },
+    };
+
+
+    activatedRoute = new MockActivatedRoute(routeParams, routeUrlSegments);
+
+    await TestBed.configureTestingModule({
+      imports: [ReactiveFormsModule, TranslateModule.forRoot(), NgbDropdownModule],
+      declarations: [LdnServiceFormComponent],
+      providers: [
+        { provide: LdnServicesService, useValue: ldnServicesService },
+        { provide: LdnItemfiltersService, useValue: ldnItemfiltersService },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ChangeDetectorRef, useValue: cdRefStub },
+        { provide: NgbModal, useValue: modalService },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: PaginationService, useValue: {} },
+        FormBuilder,
+        RouteService,
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(LdnServiceFormComponent);
+    component = fixture.componentInstance;
+    spyOn(component, 'filterPatternObjectsAndAssignLabel').and.callFake((a) => a);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+    expect(component.formModel instanceof FormGroup).toBeTruthy();
+  });
+
+  it('should init properties correctly', fakeAsync(() => {
+    spyOn(component, 'fetchServiceData');
+    spyOn(component, 'setItemfilters');
+    component.ngOnInit();
+    tick(100);
+    expect((component as any).serviceId).toEqual(testId);
+    expect(component.isNewService).toBeFalsy();
+    expect(component.areControlsInitialized).toBeTruthy();
+    expect(component.formModel.controls.notifyServiceInboundPatterns).toBeDefined();
+    expect(component.fetchServiceData).toHaveBeenCalledWith(testId);
+    expect(component.setItemfilters).toHaveBeenCalled();
+  }));
+
+  it('should unsubscribe on destroy', () => {
+    spyOn((component as any).routeSubscription, 'unsubscribe');
+    component.ngOnDestroy();
+    expect((component as any).routeSubscription.unsubscribe).toHaveBeenCalled();
+  });
+
+  it('should handle create service with valid form', () => {
+    spyOn(component, 'fetchServiceData').and.callFake((a) => a);
+    component.formModel.addControl('notifyServiceInboundPatterns', (component as any).formBuilder.array([{ pattern: 'patternValue' }]));
+    const nameInput = fixture.debugElement.query(By.css('#name'));
+    const descriptionInput = fixture.debugElement.query(By.css('#description'));
+    const urlInput = fixture.debugElement.query(By.css('#url'));
+    const scoreInput = fixture.debugElement.query(By.css('#score'));
+    const lowerIpInput = fixture.debugElement.query(By.css('#lowerIp'));
+    const upperIpInput = fixture.debugElement.query(By.css('#upperIp'));
+    const ldnUrlInput = fixture.debugElement.query(By.css('#ldnUrl'));
+    component.formModel.patchValue(formMockValue);
+
+    nameInput.nativeElement.value = 'testName';
+    descriptionInput.nativeElement.value = 'testDescription';
+    urlInput.nativeElement.value = 'tetsUrl.com';
+    ldnUrlInput.nativeElement.value = 'tetsLdnUrl.com';
+    scoreInput.nativeElement.value = 1;
+    lowerIpInput.nativeElement.value = '127.0.0.1';
+    upperIpInput.nativeElement.value = '127.0.0.1';
+
+    fixture.detectChanges();
+
+    expect(component.formModel.valid).toBeTruthy();
+  });
+
+  it('should handle create service with invalid form', () => {
+    const nameInput = fixture.debugElement.query(By.css('#name'));
+
+    nameInput.nativeElement.value = 'testName';
+    fixture.detectChanges();
+
+    expect(component.formModel.valid).toBeFalsy();
+  });
+
+  it('should not create service with invalid form', () => {
+    spyOn(component.formModel, 'markAllAsTouched');
+    spyOn(component, 'closeModal');
+    component.createService();
+
+    expect(component.formModel.markAllAsTouched).toHaveBeenCalled();
+    expect(component.closeModal).toHaveBeenCalled();
+  });
+
+  it('should create service with valid form', () => {
+    spyOn(component.formModel, 'markAllAsTouched');
+    spyOn(component, 'closeModal');
+    spyOn(component, 'checkPatterns').and.callFake(() => true);
+    component.formModel.addControl('notifyServiceInboundPatterns', (component as any).formBuilder.array([{ pattern: 'patternValue' }]));
+    component.formModel.patchValue(formMockValue);
+    component.createService();
+
+    expect(component.formModel.markAllAsTouched).toHaveBeenCalled();
+    expect(component.closeModal).not.toHaveBeenCalled();
+    expect(ldnServicesService.create).toHaveBeenCalled();
+  });
+
+  it('should check patterns', () => {
+    const arrValid = new FormArray([
+      new FormGroup({
+        pattern: new FormControl('pattern'),
+      }),
+    ]);
+
+    const arrInvalid = new FormArray([
+      new FormGroup({
+        pattern: new FormControl(''),
+      }),
+    ]);
+
+    expect(component.checkPatterns(arrValid)).toBeTruthy();
+    expect(component.checkPatterns(arrInvalid)).toBeFalsy();
+  });
+
+  it('should fetch service data', () => {
+    component.fetchServiceData(testId);
+    expect(ldnServicesService.findById).toHaveBeenCalledWith(testId);
+    expect(component.filterPatternObjectsAndAssignLabel).toHaveBeenCalled();
+    expect((component as any).ldnService).toEqual({});
+  });
+
+  it('should generate patch operations', () => {
+    spyOn(component as any, 'createReplaceOperation');
+    spyOn(component as any, 'handlePatterns');
+    component.generatePatchOperations();
+    expect((component as any).createReplaceOperation).toHaveBeenCalledTimes(7);
+    expect((component as any).handlePatterns).toHaveBeenCalled();
+  });
+
+  it('should open modal on submit', () => {
+    spyOn(component, 'openConfirmModal');
+    component.onSubmit();
+    expect(component.openConfirmModal).toHaveBeenCalled();
+  });
+
+
+  it('should reset form and leave', () => {
+    spyOn(component as any, 'sendBack');
+
+    component.resetFormAndLeave();
+    expect((component as any).sendBack).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
new file mode 100644
index 0000000000..cae913ecfd
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.ts
@@ -0,0 +1,590 @@
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core';
+import {
+  FormArray,
+  FormBuilder,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import {
+  combineLatestWith,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { IpV4Validator } from '../../../shared/utils/ipV4.validator';
+import { LdnItemfiltersService } from '../ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
+import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
+import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters';
+import { NotifyServicePattern } from '../ldn-services-model/ldn-service-patterns.model';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+import { notifyPatterns } from '../ldn-services-patterns/ldn-service-coar-patterns';
+
+/**
+ * Component for editing LDN service through a form that allows to create or edit the properties of a service
+ */
+@Component({
+  selector: 'ds-ldn-service-form',
+  templateUrl: './ldn-service-form.component.html',
+  styleUrls: ['./ldn-service-form.component.scss'],
+  animations: [
+    trigger('toggleAnimation', [
+      state('true', style({})),
+      state('false', style({})),
+      transition('true <=> false', animate('300ms ease-in')),
+    ]),
+  ],
+})
+export class LdnServiceFormComponent implements OnInit, OnDestroy {
+  formModel: FormGroup;
+
+  @ViewChild('confirmModal', { static: true }) confirmModal: TemplateRef<any>;
+  @ViewChild('resetFormModal', { static: true }) resetFormModal: TemplateRef<any>;
+
+  public inboundPatterns: string[] = notifyPatterns;
+  public isNewService: boolean;
+  public areControlsInitialized: boolean;
+  public itemfiltersRD$: Observable<RemoteData<PaginatedList<Itemfilter>>>;
+  public config: FindListOptions = Object.assign(new FindListOptions(), {
+    elementsPerPage: 20,
+  });
+  public markedForDeletionInboundPattern: number[] = [];
+  public selectedInboundPatterns: string[];
+
+  protected serviceId: string;
+
+  private deletedInboundPatterns: number[] = [];
+  private modalRef: any;
+  private ldnService: LdnService;
+  private selectPatternDefaultLabeli18Key = 'ldn-service.form.label.placeholder.default-select';
+  private routeSubscription: Subscription;
+
+  constructor(
+    protected ldnServicesService: LdnServicesService,
+    private ldnItemfiltersService: LdnItemfiltersService,
+    private formBuilder: FormBuilder,
+    private router: Router,
+    private route: ActivatedRoute,
+    private cdRef: ChangeDetectorRef,
+    protected modalService: NgbModal,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
+    protected paginationService: PaginationService,
+  ) {
+
+    this.formModel = this.formBuilder.group({
+      id: [''],
+      name: ['', Validators.required],
+      description: [''],
+      url: ['', Validators.required],
+      ldnUrl: ['', Validators.required],
+      lowerIp: ['', [Validators.required, new IpV4Validator()]],
+      upperIp: ['', [Validators.required, new IpV4Validator()]],
+      score: ['', [Validators.required, Validators.pattern('^0*(\.[0-9]+)?$|^1(\.0+)?$')]], inboundPattern: [''],
+      constraintPattern: [''],
+      enabled: [''],
+      type: LDN_SERVICE.value,
+    });
+  }
+
+  ngOnInit(): void {
+    this.routeSubscription =  this.route.params.pipe(
+      combineLatestWith(this.route.url),
+    ).subscribe(([params, segment]) => {
+      this.serviceId = params.serviceId;
+      this.isNewService = segment[0].path === 'new';
+      this.formModel.addControl('notifyServiceInboundPatterns', this.formBuilder.array([this.createInboundPatternFormGroup()]));
+      this.areControlsInitialized = true;
+      if (this.serviceId && !this.isNewService) {
+        this.fetchServiceData(this.serviceId);
+      }
+    });
+    this.setItemfilters();
+  }
+
+  ngOnDestroy(): void {
+    this.routeSubscription.unsubscribe();
+  }
+
+  /**
+   * Sets item filters using LDN item filters service
+   */
+  setItemfilters() {
+    this.itemfiltersRD$ = this.ldnItemfiltersService.findAll().pipe(
+      getFirstCompletedRemoteData());
+  }
+
+  /**
+   * Handles the creation of an LDN service by retrieving and validating form fields,
+   * and submitting the form data to the LDN services endpoint.
+   */
+  createService() {
+    this.formModel.markAllAsTouched();
+    const notifyServiceInboundPatterns = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    const hasInboundPattern = notifyServiceInboundPatterns?.length > 0 ? this.checkPatterns(notifyServiceInboundPatterns) : false;
+
+    if (this.formModel.invalid) {
+      this.closeModal();
+      return;
+    }
+
+    if (!hasInboundPattern) {
+      this.notificationService.warning(this.translateService.get('ldn-service-notification.created.warning.title'));
+      this.closeModal();
+      return;
+    }
+
+
+    this.formModel.value.notifyServiceInboundPatterns = this.formModel.value.notifyServiceInboundPatterns.map((pattern: {
+      pattern: string;
+      patternLabel: string,
+      constraintFormatted: string;
+    }) => {
+      const { patternLabel, ...rest } = pattern;
+      delete rest.constraintFormatted;
+      return rest;
+    });
+
+    const values = { ...this.formModel.value, enabled: true };
+
+    const ldnServiceData = this.ldnServicesService.create(values);
+
+    ldnServiceData.pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<LdnService>) => {
+      if (rd.hasSucceeded) {
+        this.notificationService.success(this.translateService.get('ldn-service-notification.created.success.title'),
+          this.translateService.get('ldn-service-notification.created.success.body'));
+        this.closeModal();
+        this.sendBack();
+      } else {
+        if (!this.formModel.errors) {
+          this.setLdnUrlError();
+        }
+        this.notificationService.error(this.translateService.get('ldn-service-notification.created.failure.title'),
+          this.translateService.get('ldn-service-notification.created.failure.body'));
+        this.closeModal();
+      }
+    });
+  }
+
+  /**
+   * Checks if at least one pattern in the specified form array has a value.
+   *
+   * @param {FormArray} formArray - The form array containing patterns to check.
+   * @returns {boolean} - True if at least one pattern has a value, otherwise false.
+   */
+  checkPatterns(formArray: FormArray): boolean {
+    for (let i = 0; i < formArray.length; i++) {
+      const pattern = formArray.at(i).get('pattern').value;
+      if (pattern) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  /**
+   * Fetches LDN service data by ID and updates the form
+   * @param serviceId - The ID of the LDN service
+   */
+  fetchServiceData(serviceId: string): void {
+    this.ldnServicesService.findById(serviceId).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe(
+      (data: RemoteData<LdnService>) => {
+        if (data.hasSucceeded) {
+          this.ldnService = data.payload;
+          this.formModel.patchValue({
+            id: this.ldnService.id,
+            name: this.ldnService.name,
+            description: this.ldnService.description,
+            url: this.ldnService.url,
+            score: this.ldnService.score,
+            ldnUrl: this.ldnService.ldnUrl,
+            type: this.ldnService.type,
+            enabled: this.ldnService.enabled,
+            lowerIp: this.ldnService.lowerIp,
+            upperIp: this.ldnService.upperIp,
+          });
+          this.filterPatternObjectsAndAssignLabel('notifyServiceInboundPatterns');
+          const notifyServiceInboundPatternsFormArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+          notifyServiceInboundPatternsFormArray.controls.forEach(
+            control => {
+              const controlFormGroup = control as FormGroup;
+              const controlConstraint = controlFormGroup.get('constraint').value;
+              controlFormGroup.patchValue({
+                constraintFormatted: controlConstraint ? this.translateService.instant((controlConstraint as string) + '.label') : '',
+              });
+            },
+          );
+        }
+      },
+    );
+  }
+
+  /**
+   * Filters pattern objects, initializes form groups, assigns labels, and adds them to the specified form array so the correct string is shown in the dropdown..
+   * @param formArrayName - The name of the form array to be populated
+   */
+  filterPatternObjectsAndAssignLabel(formArrayName: string) {
+    const PatternsArray = this.formModel.get(formArrayName) as FormArray;
+    PatternsArray.clear();
+
+    const servicesToUse = this.ldnService.notifyServiceInboundPatterns;
+
+    servicesToUse.forEach((patternObj: NotifyServicePattern) => {
+      const patternFormGroup = this.initializeInboundPatternFormGroup();
+      const newPatternObjWithLabel = Object.assign(new NotifyServicePattern(), {
+        ...patternObj,
+        patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternObj?.pattern + '.label'),
+      });
+      patternFormGroup.patchValue(newPatternObjWithLabel);
+
+      PatternsArray.push(patternFormGroup);
+      this.cdRef.detectChanges();
+    });
+  }
+
+  /**
+   * Generates an array of patch operations based on form changes
+   * @returns Array of patch operations
+   */
+  generatePatchOperations(): any[] {
+    const patchOperations: any[] = [];
+
+    this.createReplaceOperation(patchOperations, 'name', '/name');
+    this.createReplaceOperation(patchOperations, 'description', '/description');
+    this.createReplaceOperation(patchOperations, 'ldnUrl', '/ldnurl');
+    this.createReplaceOperation(patchOperations, 'url', '/url');
+    this.createReplaceOperation(patchOperations, 'score', '/score');
+    this.createReplaceOperation(patchOperations, 'lowerIp', '/lowerIp');
+    this.createReplaceOperation(patchOperations, 'upperIp', '/upperIp');
+
+    this.handlePatterns(patchOperations, 'notifyServiceInboundPatterns');
+    this.deletedInboundPatterns.forEach(index => {
+      const removeOperation: Operation = {
+        op: 'remove',
+        path: `notifyServiceInboundPatterns[${index}]`,
+      };
+      patchOperations.push(removeOperation);
+    });
+
+    return patchOperations;
+  }
+
+  /**
+   * Submits the form by opening the confirmation modal
+   */
+  onSubmit() {
+    this.openConfirmModal(this.confirmModal);
+  }
+
+  /**
+   * Adds a new inbound pattern form group to the array of inbound patterns in the form
+   */
+  addInboundPattern() {
+    const notifyServiceInboundPatternsArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    notifyServiceInboundPatternsArray.push(this.createInboundPatternFormGroup());
+  }
+
+  /**
+   * Selects an inbound pattern by updating its values based on the provided pattern value and index
+   * @param patternValue - The selected pattern value
+   * @param index - The index of the inbound pattern in the array
+   */
+  selectInboundPattern(patternValue: string, index: number): void {
+    const patternArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray);
+    patternArray.controls[index].patchValue({ pattern: patternValue });
+    patternArray.controls[index].patchValue({ patternLabel: this.translateService.instant('ldn-service.form.pattern.' + patternValue + '.label') });
+  }
+
+  /**
+   * Selects an inbound item filter by updating its value based on the provided filter value and index
+   * @param filterValue - The selected filter value
+   * @param index - The index of the inbound pattern in the array
+   */
+  selectInboundItemFilter(filterValue: string, index: number): void {
+    const filterArray = (this.formModel.get('notifyServiceInboundPatterns') as FormArray);
+    filterArray.controls[index].patchValue({
+      constraint: filterValue,
+      constraintFormatted: this.translateService.instant((filterValue !== '' ? filterValue : 'ldn.no-filter') + '.label'),
+    });
+    filterArray.markAllAsTouched();
+  }
+
+  /**
+   * Toggles the automatic property of an inbound pattern at the specified index
+   * @param i - The index of the inbound pattern in the array
+   */
+  toggleAutomatic(i: number) {
+    const automaticControl = this.formModel.get(`notifyServiceInboundPatterns.${i}.automatic`);
+    if (automaticControl) {
+      automaticControl.markAsTouched();
+      automaticControl.setValue(!automaticControl.value);
+    }
+  }
+
+  /**
+   * Toggles the enabled status of the LDN service by sending a patch request
+   */
+  toggleEnabled() {
+    const newStatus = !this.formModel.get('enabled').value;
+
+    const patchOperation: Operation = {
+      op: 'replace',
+      path: '/enabled',
+      value: newStatus,
+    };
+
+    this.ldnServicesService.patch(this.ldnService, [patchOperation]).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe(
+      () => {
+        this.formModel.get('enabled').setValue(newStatus);
+        this.cdRef.detectChanges();
+      },
+    );
+  }
+
+  /**
+   * Closes the modal
+   */
+  closeModal() {
+    this.modalRef.close();
+    this.cdRef.detectChanges();
+  }
+
+  /**
+   * Opens a confirmation modal with the specified content
+   * @param content - The content to be displayed in the modal
+   */
+  openConfirmModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+
+  /**
+   * Patches the LDN service by retrieving and sending patch operations geenrated in generatePatchOperations()
+   */
+  patchService() {
+    this.deleteMarkedInboundPatterns();
+
+    const patchOperations = this.generatePatchOperations();
+    this.formModel.markAllAsTouched();
+    // If the form is invalid, close the modal and return
+    if (this.formModel.invalid) {
+      this.closeModal();
+      return;
+    }
+
+    const notifyServiceInboundPatterns = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+    const deletedInboundPatternsLength = this.deletedInboundPatterns.length;
+    // If no inbound patterns are specified, close the modal and return
+    // notify the user that no patterns are specified
+    if (notifyServiceInboundPatterns.length === deletedInboundPatternsLength) {
+      this.notificationService.warning(this.translateService.get('ldn-service-notification.created.warning.title'));
+      this.deletedInboundPatterns = [];
+      this.closeModal();
+      return;
+    }
+
+    this.ldnServicesService.patch(this.ldnService, patchOperations).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe(
+      (rd: RemoteData<LdnService>) => {
+        if (rd.hasSucceeded) {
+          this.closeModal();
+          this.sendBack();
+          this.notificationService.success(this.translateService.get('admin.registries.services-formats.modify.success.head'),
+            this.translateService.get('admin.registries.services-formats.modify.success.content'));
+        } else {
+          if (!this.formModel.errors) {
+            this.setLdnUrlError();
+          }
+          this.notificationService.error(this.translateService.get('admin.registries.services-formats.modify.failure.head'),
+            this.translateService.get('admin.registries.services-formats.modify.failure.content'));
+          this.closeModal();
+        }
+      });
+  }
+
+  /**
+   * Resets the form and navigates back to the LDN services page
+   */
+  resetFormAndLeave() {
+    this.sendBack();
+  }
+
+  /**
+   * Marks the specified inbound pattern for deletion
+   * @param index - The index of the inbound pattern in the array
+   */
+  markForInboundPatternDeletion(index: number) {
+    if (!this.markedForDeletionInboundPattern.includes(index)) {
+      this.markedForDeletionInboundPattern.push(index);
+    }
+  }
+
+  /**
+   * Unmarks the specified inbound pattern for deletion
+   * @param index - The index of the inbound pattern in the array
+   */
+  unmarkForInboundPatternDeletion(index: number) {
+    const i = this.markedForDeletionInboundPattern.indexOf(index);
+    if (i !== -1) {
+      this.markedForDeletionInboundPattern.splice(i, 1);
+    }
+  }
+
+  /**
+   * Deletes marked inbound patterns from the form model
+   */
+  deleteMarkedInboundPatterns() {
+    this.markedForDeletionInboundPattern.sort((a, b) => b - a);
+    const patternsArray = this.formModel.get('notifyServiceInboundPatterns') as FormArray;
+
+    for (const index of this.markedForDeletionInboundPattern) {
+      if (index >= 0 && index < patternsArray.length) {
+        const patternGroup = patternsArray.at(index) as FormGroup;
+        const patternValue = patternGroup.value;
+        if (patternValue.isNew) {
+          patternsArray.removeAt(index);
+        } else {
+          this.deletedInboundPatterns.push(index);
+        }
+      }
+    }
+
+    this.markedForDeletionInboundPattern = [];
+  }
+
+  /**
+   * Creates a replace operation and adds it to the patch operations if the form control is dirty
+   * @param patchOperations - The array to store patch operations
+   * @param formControlName - The name of the form control
+   * @param path - The JSON Patch path for the operation
+   */
+  private createReplaceOperation(patchOperations: any[], formControlName: string, path: string): void {
+    if (this.formModel.get(formControlName).dirty) {
+      patchOperations.push({
+        op: 'replace',
+        path,
+        value: this.formModel.get(formControlName).value.toString(),
+      });
+    }
+  }
+
+  /**
+   * Handles patterns in the form array, checking if an add or replace operations is required
+   * @param patchOperations - The array to store patch operations
+   * @param formArrayName - The name of the form array
+   */
+  private handlePatterns(patchOperations: any[], formArrayName: string): void {
+    const patternsArray = this.formModel.get(formArrayName) as FormArray;
+
+    for (let i = 0; i < patternsArray.length; i++) {
+      const patternGroup = patternsArray.at(i) as FormGroup;
+
+      const patternValue = patternGroup.value;
+      delete patternValue.constraintFormatted;
+      if (patternGroup.touched && patternGroup.valid) {
+        delete patternValue?.patternLabel;
+        if (patternValue.isNew) {
+          delete patternValue.isNew;
+          const addOperation = {
+            op: 'add',
+            path: `${formArrayName}/-`,
+            value: patternValue,
+          };
+          patchOperations.push(addOperation);
+        } else {
+          const replaceOperation = {
+            op: 'replace',
+            path: `${formArrayName}[${i}]`,
+            value: patternValue,
+          };
+          patchOperations.push(replaceOperation);
+        }
+      }
+    }
+  }
+
+  /**
+   * Navigates back to the LDN services page
+   */
+  private sendBack() {
+    this.router.navigateByUrl('admin/ldn/services');
+  }
+
+  /**
+   * Creates a form group for inbound patterns
+   * @returns The form group for inbound patterns
+   */
+  private createInboundPatternFormGroup(): FormGroup {
+    const inBoundFormGroup = {
+      pattern: '',
+      patternLabel: this.translateService.instant(this.selectPatternDefaultLabeli18Key),
+      constraint: '',
+      constraintFormatted: '',
+      automatic: false,
+      isNew: true,
+    };
+
+    if (this.isNewService) {
+      delete inBoundFormGroup.isNew;
+    }
+
+    return this.formBuilder.group(inBoundFormGroup);
+  }
+
+  /**
+   * Initializes an existing form group for inbound patterns
+   * @returns The initialized form group for inbound patterns
+   */
+  private initializeInboundPatternFormGroup(): FormGroup {
+    return this.formBuilder.group({
+      pattern: '',
+      patternLabel: '',
+      constraint: '',
+      constraintFormatted: '',
+      automatic: '',
+    });
+  }
+
+
+  /**
+   * set ldnUrl error in case of unprocessable entity and provided value
+   */
+  private setLdnUrlError(): void {
+    const control = this.formModel.controls.ldnUrl;
+    const controlErrors = control.errors || {};
+    control.setErrors({ ...controlErrors, ldnUrlAlreadyAssociated: true });
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts b/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts
new file mode 100644
index 0000000000..8494b67dab
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-service-serviceMock/ldnServicesRD$-mock.ts
@@ -0,0 +1,115 @@
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+
+export const mockLdnService: LdnService = {
+  uuid: '1',
+  enabled: false,
+  score: 0,
+  id: 1,
+  lowerIp: '192.0.2.146',
+  upperIp: '192.0.2.255',
+  name: 'Service Name',
+  description: 'Service Description',
+  url: 'Service URL',
+  ldnUrl: 'Service LDN URL',
+  notifyServiceInboundPatterns: [
+    {
+      pattern: 'patternA',
+      constraint: 'itemFilterA',
+      automatic: 'false',
+    },
+    {
+      pattern: 'patternB',
+      constraint: 'itemFilterB',
+      automatic: 'true',
+    },
+  ],
+  type: LDN_SERVICE,
+  _links: {
+    self: {
+      href: 'http://localhost/api/ldn/ldnservices/1',
+    },
+  },
+  get self(): string {
+    return '';
+  },
+};
+
+export const mockLdnServiceRD$ = createSuccessfulRemoteDataObject$(mockLdnService);
+
+
+export const mockLdnServices: LdnService[] = [{
+  uuid: '1',
+  enabled: false,
+  score: 0,
+  id: 1,
+  lowerIp: '192.0.2.146',
+  upperIp: '192.0.2.255',
+  name: 'Service Name',
+  description: 'Service Description',
+  url: 'Service URL',
+  ldnUrl: 'Service LDN URL',
+  notifyServiceInboundPatterns: [
+    {
+      pattern: 'patternA',
+      constraint: 'itemFilterA',
+      automatic: 'false',
+    },
+    {
+      pattern: 'patternB',
+      constraint: 'itemFilterB',
+      automatic: 'true',
+    },
+  ],
+  type: LDN_SERVICE,
+  _links: {
+    self: {
+      href: 'http://localhost/api/ldn/ldnservices/1',
+    },
+  },
+  get self(): string {
+    return '';
+  },
+}, {
+  uuid: '2',
+  enabled: false,
+  score: 0,
+  id: 2,
+  lowerIp: '192.0.2.146',
+  upperIp: '192.0.2.255',
+  name: 'Service Name',
+  description: 'Service Description',
+  url: 'Service URL',
+  ldnUrl: 'Service LDN URL',
+  notifyServiceInboundPatterns: [
+    {
+      pattern: 'patternA',
+      constraint: 'itemFilterA',
+      automatic: 'false',
+    },
+    {
+      pattern: 'patternB',
+      constraint: 'itemFilterB',
+      automatic: 'true',
+    },
+  ],
+  type: LDN_SERVICE,
+  _links: {
+    self: {
+      href: 'http://localhost/api/ldn/ldnservices/1',
+    },
+  },
+  get self(): string {
+    return '';
+  },
+},
+];
+export const mockLdnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>> = of((mockLdnServices as unknown) as RemoteData<PaginatedList<LdnService>>);
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts
new file mode 100644
index 0000000000..110a0779fb
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilter-data.service.spec.ts
@@ -0,0 +1,93 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { FindAllData } from '../../../core/data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { LdnItemfiltersService } from './ldn-itemfilters-data.service';
+
+describe('LdnItemfiltersService test', () => {
+  let scheduler: TestScheduler;
+  let service: LdnItemfiltersService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/ldn/itemfilters`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new LdnItemfiltersService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initFindAllService = () => new LdnItemfiltersService(null, null, null, null, null) as unknown as FindAllData<any>;
+    testFindAllDataImplementation(initFindAllService);
+  });
+
+  describe('get endpoint', () => {
+    it('should retrieve correct endpoint', (done) => {
+      service.getEndpoint().subscribe(() => {
+        expect(halService.getEndpoint).toHaveBeenCalledWith('itemfilters');
+        done();
+      });
+    });
+  });
+
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts
new file mode 100644
index 0000000000..8222c69d79
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service.ts
@@ -0,0 +1,63 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+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 { RequestService } from '../../../core/data/request.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { LDN_SERVICE_CONSTRAINT_FILTERS } from '../ldn-services-model/ldn-service.resource-type';
+import { Itemfilter } from '../ldn-services-model/ldn-service-itemfilters';
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the itemfilters endpoint
+ */
+@Injectable()
+@dataService(LDN_SERVICE_CONSTRAINT_FILTERS)
+export class LdnItemfiltersService extends IdentifiableDataService<Itemfilter> implements FindAllData<Itemfilter> {
+  private findAllData: FindAllDataImpl<Itemfilter>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('itemfilters', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Gets the endpoint URL for the itemfilters.
+   *
+   * @returns {string} - The endpoint URL.
+   */
+  getEndpoint() {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Finds all itemfilters based on the provided options and link configurations.
+   *
+   * @param {FindListOptions} options - The options for finding a list of itemfilters.
+   * @param {boolean} useCachedVersionIfAvailable - Whether to use the cached version if available.
+   * @param {boolean} reRequestOnStale - Whether to re-request the data if it's stale.
+   * @param {...FollowLinkConfig<Itemfilter>[]} linksToFollow - Configurations for following specific links.
+   * @returns {Observable<RemoteData<PaginatedList<Itemfilter>>>} - An observable of remote data containing a paginated list of itemfilters.
+   */
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Itemfilter>[]): Observable<RemoteData<PaginatedList<Itemfilter>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts
new file mode 100644
index 0000000000..4ff781f629
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.spec.ts
@@ -0,0 +1,134 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { CreateData } from '../../../core/data/base/create-data';
+import { testCreateDataImplementation } from '../../../core/data/base/create-data.spec';
+import { DeleteData } from '../../../core/data/base/delete-data';
+import { testDeleteDataImplementation } from '../../../core/data/base/delete-data.spec';
+import { FindAllData } from '../../../core/data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec';
+import { PatchData } from '../../../core/data/base/patch-data';
+import { testPatchDataImplementation } from '../../../core/data/base/patch-data.spec';
+import { SearchData } from '../../../core/data/base/search-data';
+import { testSearchDataImplementation } from '../../../core/data/base/search-data.spec';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { mockLdnService } from '../ldn-service-serviceMock/ldnServicesRD$-mock';
+import { LdnServicesService } from './ldn-services-data.service';
+
+describe('LdnServicesService test', () => {
+  let scheduler: TestScheduler;
+  let service: LdnServicesService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/ldn/ldnservices`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new LdnServicesService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildFromRequestUUID: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initFindAllService = () => new LdnServicesService(null, null, null, null, null) as unknown as FindAllData<any>;
+    const initDeleteService = () => new LdnServicesService(null, null, null, null, null) as unknown as DeleteData<any>;
+    const initSearchService = () => new LdnServicesService(null, null, null, null, null) as unknown as SearchData<any>;
+    const initPatchService = () => new LdnServicesService(null, null, null, null, null) as unknown as PatchData<any>;
+    const initCreateService = () => new LdnServicesService(null, null, null, null, null) as unknown as CreateData<any>;
+
+    testFindAllDataImplementation(initFindAllService);
+    testDeleteDataImplementation(initDeleteService);
+    testSearchDataImplementation(initSearchService);
+    testPatchDataImplementation(initPatchService);
+    testCreateDataImplementation(initCreateService);
+  });
+
+  describe('custom methods', () => {
+    it('should find service by inbound pattern', (done) => {
+      const params = [new RequestParam('pattern', 'testPattern')];
+      const findListOptions = Object.assign(new FindListOptions(), {}, { searchParams: params });
+      spyOn(service, 'searchBy').and.returnValue(observableOf(null));
+      spyOn((service as any).searchData, 'searchBy').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList([mockLdnService])));
+
+      service.findByInboundPattern('testPattern').subscribe(() => {
+        expect(service.searchBy).toHaveBeenCalledWith('byInboundPattern', findListOptions, undefined, undefined );
+        done();
+      });
+    });
+
+    it('should invoke service', (done) => {
+      const constraints = [{ void: true }];
+      const files = [new File([],'fileName')];
+      spyOn(service as any, 'getInvocationFormData');
+      spyOn(service, 'getBrowseEndpoint').and.returnValue(observableOf('testEndpoint'));
+      service.invoke('serviceName', 'serviceId', constraints, files).subscribe(result => {
+        expect((service as any).getInvocationFormData).toHaveBeenCalledWith(constraints, files);
+        expect(service.getBrowseEndpoint).toHaveBeenCalled();
+        expect(result).toBeInstanceOf(RemoteData);
+        done();
+      });
+
+    });
+  });
+
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts
new file mode 100644
index 0000000000..a41bf0c759
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service.ts
@@ -0,0 +1,230 @@
+import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../../../core/data/base/create-data';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../../../core/data/base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../../../core/data/base/patch-data';
+import { SearchDataImpl } from '../../../core/data/base/search-data';
+import { ChangeAnalyzer } from '../../../core/data/change-analyzer';
+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 { MultipartPostRequest } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { LdnServiceConstrain } from '../ldn-services-model/ldn-service.constrain.model';
+import { LDN_SERVICE } from '../ldn-services-model/ldn-service.resource-type';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+
+/**
+ * Injectable service responsible for fetching/sending data from/to the REST API on the ldnservices endpoint.
+ *
+ * @export
+ * @class LdnServicesService
+ * @extends {IdentifiableDataService<LdnService>}
+ * @implements {FindAllData<LdnService>}
+ * @implements {DeleteData<LdnService>}
+ * @implements {PatchData<LdnService>}
+ * @implements {CreateData<LdnService>}
+ */
+@Injectable()
+@dataService(LDN_SERVICE)
+export class LdnServicesService extends IdentifiableDataService<LdnService> implements FindAllData<LdnService>, DeleteData<LdnService>, PatchData<LdnService>, CreateData<LdnService> {
+  createData: CreateDataImpl<LdnService>;
+  private findAllData: FindAllDataImpl<LdnService>;
+  private deleteData: DeleteDataImpl<LdnService>;
+  private patchData: PatchDataImpl<LdnService>;
+  private comparator: ChangeAnalyzer<LdnService>;
+  private searchData: SearchDataImpl<LdnService>;
+
+  private findByPatternEndpoint = 'byInboundPattern';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('ldnservices', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    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);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+  }
+
+  /**
+   * Creates an LDN service by sending a POST request to the REST API.
+   *
+   * @param {LdnService} object - The LDN service object to be created.
+   * @param params Array with additional params to combine with query string
+   * @returns {Observable<RemoteData<LdnService>>} - Observable containing the result of the creation operation.
+   */
+  create(object: LdnService, ...params: RequestParam[]): Observable<RemoteData<LdnService>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * Updates an LDN service by applying a set of operations through a PATCH request to the REST API.
+   *
+   * @param {LdnService} object - The LDN service object to be updated.
+   * @param {Operation[]} operations - The patch operations to be applied.
+   * @returns {Observable<RemoteData<LdnService>>} - Observable containing the result of the update operation.
+   */
+  patch(object: LdnService, operations: Operation[]): Observable<RemoteData<LdnService>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  /**
+   * Updates an LDN service by sending a PUT request to the REST API.
+   *
+   * @param {LdnService} object - The LDN service object to be updated.
+   * @returns {Observable<RemoteData<LdnService>>} - Observable containing the result of the update operation.
+   */
+  update(object: LdnService): Observable<RemoteData<LdnService>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Commits pending updates by sending a PATCH request to the REST API.
+   *
+   * @param {RestRequestMethod} [method] - The HTTP method to be used for the request.
+   */
+  commitUpdates(method?: RestRequestMethod): void {
+    return this.patchData.commitUpdates(method);
+  }
+
+  /**
+   * Creates a patch representing the changes made to the LDN service in the cache.
+   *
+   * @param {LdnService} object - The LDN service object for which to create the patch.
+   * @returns {Observable<Operation[]>} - Observable containing the patch operations.
+   */
+  createPatchFromCache(object: LdnService): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  /**
+   * Retrieves all LDN services from the REST API based on the provided options.
+   *
+   * @param {FindListOptions} [options] - The options to be applied to the request.
+   * @param {boolean} [useCachedVersionIfAvailable] - Flag indicating whether to use cached data if available.
+   * @param {boolean} [reRequestOnStale] - Flag indicating whether to re-request data if it's stale.
+   * @param {...FollowLinkConfig<LdnService>[]} linksToFollow - Optional links to follow during the request.
+   * @returns {Observable<RemoteData<PaginatedList<LdnService>>>} - Observable containing the result of the request.
+   */
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Retrieves LDN services based on the inbound pattern from the REST API.
+   *
+   * @param {string} pattern - The inbound pattern to be used in the search.
+   * @param {FindListOptions} [options] - The options to be applied to the request.
+   * @param {boolean} [useCachedVersionIfAvailable] - Flag indicating whether to use cached data if available.
+   * @param {boolean} [reRequestOnStale] - Flag indicating whether to re-request data if it's stale.
+   * @param {...FollowLinkConfig<LdnService>[]} linksToFollow - Optional links to follow during the request.
+   * @returns {Observable<RemoteData<PaginatedList<LdnService>>>} - Observable containing the result of the request.
+   */
+  findByInboundPattern(pattern: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
+    const params = [new RequestParam('pattern', pattern)];
+    const findListOptions = Object.assign(new FindListOptions(), options, { searchParams: params });
+    return this.searchBy(this.findByPatternEndpoint, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Deletes an LDN service by sending a DELETE request to the REST API.
+   *
+   * @param {string} objectId - The ID of the LDN service to be deleted.
+   * @param {string[]} [copyVirtualMetadata] - Optional virtual metadata to be copied during the deletion.
+   * @returns {Observable<RemoteData<NoContent>>} - Observable containing the result of the deletion operation.
+   */
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Deletes an LDN service by its HATEOAS link.
+   *
+   * @param {string} href - The HATEOAS link of the LDN service to be deleted.
+   * @param {string[]} [copyVirtualMetadata] - Optional virtual metadata to be copied during the deletion.
+   * @returns {Observable<RemoteData<NoContent>>} - Observable containing the result of the deletion operation.
+   */
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @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
+   * @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<LdnService>[]): Observable<RemoteData<PaginatedList<LdnService>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  public invoke(serviceName: string, serviceId: string, parameters: LdnServiceConstrain[], files: File[]): Observable<RemoteData<LdnService>> {
+    const requestId = this.requestService.generateRequestId();
+    this.getBrowseEndpoint().pipe(
+      take(1),
+      map((endpoint: string) => new URLCombiner(endpoint, serviceName, 'processes', serviceId).toString()),
+      map((endpoint: string) => {
+        const body = this.getInvocationFormData(parameters, files);
+        return new MultipartPostRequest(requestId, endpoint, body);
+      }),
+    ).subscribe((request: RestRequest) => this.requestService.send(request));
+
+    return this.rdbService.buildFromRequestUUID<LdnService>(requestId);
+  }
+
+  private getInvocationFormData(constrain: LdnServiceConstrain[], files: File[]): FormData {
+    const form: FormData = new FormData();
+    form.set('properties', JSON.stringify(constrain));
+    files.forEach((file: File) => {
+      form.append('file', file);
+    });
+    return form;
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
new file mode 100644
index 0000000000..0aaa39bda2
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -0,0 +1,99 @@
+<div class="container">
+  <div class="d-flex">
+    <h1 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h1>
+  </div>
+  <div class="d-flex justify-content-end">
+    <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
+      class="fas fa-plus pr-2"></i>{{ 'process.overview.new' | translate }}</button>
+  </div>
+  <ds-pagination *ngIf="(ldnServicesRD$ | async)?.payload?.totalElements > 0"
+                 [collectionSize]="(ldnServicesRD$ | async)?.payload?.totalElements"
+                 [hideGear]="true"
+                 [hidePagerWhenSinglePage]="true"
+                 [pageInfoState]="(ldnServicesRD$ | async)?.payload"
+                 [paginationOptions]="pageConfig">
+    <div class="table-responsive">
+      <table class="table table-striped table-hover">
+        <thead>
+        <tr>
+          <th scope="col">{{ 'service.overview.table.name' | translate }}</th>
+          <th scope="col">{{ 'service.overview.table.description' | translate }}</th>
+          <th scope="col">{{ 'service.overview.table.status' | translate }}</th>
+          <th scope="col">{{ 'service.overview.table.actions' | translate }}</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr *ngFor="let ldnService of (ldnServicesRD$ | async)?.payload?.page">
+          <td class="col-3">{{ ldnService.name }}</td>
+          <td>
+            <ds-truncatable [id]="ldnService.id">
+              <ds-truncatable-part [id]="ldnService.id" [minLines]="2">
+                <div>
+                  {{ ldnService.description }}
+                </div>
+              </ds-truncatable-part>
+            </ds-truncatable>
+          </td>
+          <td>
+                        <span (click)="toggleStatus(ldnService, ldnServicesService)"
+                              [ngClass]="{ 'status-enabled': ldnService.enabled, 'status-disabled': !ldnService.enabled }"
+                              [title]="ldnService.enabled ? ('ldn-service.overview.table.clickToDisable' | translate) : ('ldn-service.overview.table.clickToEnable' | translate)"
+                              class="status-indicator">
+                            {{ ldnService.enabled ? ('ldn-service.overview.table.enabled' | translate) : ('ldn-service.overview.table.disabled' | translate) }}
+                        </span>
+          </td>
+          <td>
+            <div class="btn-group">
+              <button
+                (click)="selectServiceToDelete(ldnService.id)"
+                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                class="btn btn-outline-danger">
+                <i class="fas fa-trash"></i>
+              </button>
+              <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
+                      [attr.aria-label]="'ldn-service-overview-select-edit' | translate"
+                      class="btn btn-outline-dark">
+                <i class="fas fa-edit"></i>
+              </button>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </div>
+  </ds-pagination>
+</div>
+
+<ng-template #deleteModal>
+
+  <div>
+
+    <div class="modal-header">
+      <div>
+        <h4>{{'service.overview.delete.header' | translate }}</h4>
+      </div>
+      <button (click)="closeModal()" aria-label="Close"
+              [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+              class="close" type="button">
+        <span aria-hidden="true">×</span>
+      </button>
+    </div>
+
+    <div class="modal-body">
+      <div>
+        {{ 'service.overview.delete.body' | translate }}
+      </div>
+      <div class="mt-4">
+        <button (click)="closeModal()"
+                [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
+                class="btn btn-primary mr-2">{{ 'service.detail.delete.cancel' | translate }}</button>
+        <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
+                class="btn btn-danger"
+                [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
+                id="delete-confirm">{{ 'service.overview.delete' | translate }}
+        </button>
+      </div>
+    </div>
+  </div>
+</ng-template>
+
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss
new file mode 100644
index 0000000000..07377d63d5
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.scss
@@ -0,0 +1,29 @@
+.status-indicator {
+  padding: 2.5px 25px 2.5px 25px;
+  border-radius: 4px;
+  cursor: pointer;
+  transition: background-color 0.5s;
+}
+
+.status-enabled {
+  background-color: #daf7a6;
+  color: #4f5359;
+  font-size: 85%;
+  font-weight: bold;
+
+}
+
+.status-enabled:hover {
+  background-color: #faa0a0;
+}
+
+.status-disabled {
+  background-color: #faa0a0;
+  color: #4f5359;
+  font-size: 85%;
+  font-weight: bold;
+}
+
+.status-disabled:hover {
+  background-color: #daf7a6;
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts
new file mode 100644
index 0000000000..babab8a5ab
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.spec.ts
@@ -0,0 +1,176 @@
+import {
+  ChangeDetectorRef,
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { LdnServicesService } from '../ldn-services-data/ldn-services-data.service';
+import { LdnService } from '../ldn-services-model/ldn-services.model';
+import { LdnServicesOverviewComponent } from './ldn-services-directory.component';
+
+describe('LdnServicesOverviewComponent', () => {
+  let component: LdnServicesOverviewComponent;
+  let fixture: ComponentFixture<LdnServicesOverviewComponent>;
+  let ldnServicesService;
+  let paginationService;
+  let modalService: NgbModal;
+
+  const translateServiceStub = {
+    get: () => of('translated-text'),
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  beforeEach(async () => {
+    paginationService = new PaginationServiceStub();
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      'findAll': createSuccessfulRemoteDataObject$({}),
+      'delete': createSuccessfulRemoteDataObject$({}),
+      'patch': createSuccessfulRemoteDataObject$({}),
+    });
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [LdnServicesOverviewComponent],
+      providers: [
+        {
+          provide: LdnServicesService,
+          useValue: ldnServicesService,
+        },
+        { provide: PaginationService, useValue: paginationService },
+        {
+          provide: NgbModal, useValue: {
+            open: () => { /*comment*/
+            },
+          },
+        },
+        { provide: ChangeDetectorRef, useValue: {} },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: translateServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(LdnServicesOverviewComponent);
+    component = fixture.componentInstance;
+    ldnServicesService = TestBed.inject(LdnServicesService);
+    paginationService = TestBed.inject(PaginationService);
+    modalService = TestBed.inject(NgbModal);
+    component.modalRef = jasmine.createSpyObj({ close: null });
+    component.isProcessingSub = jasmine.createSpyObj({ unsubscribe: null });
+    component.ldnServicesRD$ = of({} as RemoteData<PaginatedList<LdnService>>);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('ngOnInit', () => {
+    it('should call setLdnServices', fakeAsync(() => {
+      spyOn(component, 'setLdnServices').and.callThrough();
+      component.ngOnInit();
+      tick();
+      expect(component.setLdnServices).toHaveBeenCalled();
+    }));
+
+    it('should set ldnServicesRD$ with mock data', fakeAsync(() => {
+      spyOn(component, 'setLdnServices').and.callThrough();
+      const testData: LdnService[] = Object.assign([new LdnService()], [
+        { id: 1, name: 'Service 1', description: 'Description 1', enabled: true },
+        { id: 2, name: 'Service 2', description: 'Description 2', enabled: false },
+        { id: 3, name: 'Service 3', description: 'Description 3', enabled: true }]);
+
+      const mockLdnServicesRD = createPaginatedList(testData);
+      component.ldnServicesRD$ = createSuccessfulRemoteDataObject$(mockLdnServicesRD);
+      fixture.detectChanges();
+
+      const tableRows = fixture.debugElement.nativeElement.querySelectorAll('tbody tr');
+      expect(tableRows.length).toBe(testData.length);
+      const firstRowContent = tableRows[0].textContent;
+      expect(firstRowContent).toContain('Service 1');
+      expect(firstRowContent).toContain('Description 1');
+    }));
+  });
+
+  describe('ngOnDestroy', () => {
+    it('should call paginationService.clearPagination and unsubscribe', () => {
+      // spyOn(paginationService, 'clearPagination');
+      // spyOn(component.isProcessingSub, 'unsubscribe');
+      component.ngOnDestroy();
+      expect(paginationService.clearPagination).toHaveBeenCalledWith(component.pageConfig.id);
+      expect(component.isProcessingSub.unsubscribe).toHaveBeenCalled();
+    });
+  });
+
+  describe('openDeleteModal', () => {
+    it('should open delete modal', () => {
+      spyOn(modalService, 'open');
+      component.openDeleteModal(component.deleteModal);
+      expect(modalService.open).toHaveBeenCalledWith(component.deleteModal);
+    });
+  });
+
+  describe('closeModal', () => {
+    it('should close modal and detect changes', () => {
+      // spyOn(component.modalRef, 'close');
+      spyOn(component.cdRef, 'detectChanges');
+      component.closeModal();
+      expect(component.modalRef.close).toHaveBeenCalled();
+      expect(component.cdRef.detectChanges).toHaveBeenCalled();
+    });
+  });
+
+  describe('deleteSelected', () => {
+    it('should delete selected service and update data', fakeAsync(() => {
+      const serviceId = '123';
+      const mockRemoteData = { /* just an empty object to retrieve as as RemoteData<PaginatedList<LdnService>>  */};
+      spyOn(component, 'setLdnServices').and.callThrough();
+      const deleteSpy = ldnServicesService.delete.and.returnValue(of(mockRemoteData as RemoteData<PaginatedList<LdnService>>));
+      component.selectedServiceId = serviceId;
+      component.deleteSelected(serviceId, ldnServicesService);
+      tick();
+      expect(deleteSpy).toHaveBeenCalledWith(serviceId);
+    }));
+  });
+
+  describe('selectServiceToDelete', () => {
+    it('should set service to delete', fakeAsync(() => {
+      spyOn(component, 'openDeleteModal');
+      const serviceId = 123;
+      component.selectServiceToDelete(serviceId);
+      expect(component.selectedServiceId).toEqual(serviceId);
+      expect(component.openDeleteModal).toHaveBeenCalled();
+    }));
+  });
+
+  describe('toggleStatus', () => {
+    it('should toggle status', (() => {
+      component.toggleStatus({ enabled: false }, ldnServicesService);
+      expect(ldnServicesService.patch).toHaveBeenCalled();
+    }));
+  });
+
+});
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
new file mode 100644
index 0000000000..aa85ff1cbe
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.ts
@@ -0,0 +1,182 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import { LdnServicesService } from 'src/app/admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { PaginationService } from 'src/app/core/pagination/pagination.service';
+
+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 { 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 { LdnService } from '../ldn-services-model/ldn-services.model';
+
+/**
+ * The `LdnServicesOverviewComponent` is a component that provides an overview of LDN (Linked Data Notifications) services.
+ * It displays a paginated list of LDN services, allows users to edit and delete services,
+ * toggle the status of each service directly form the page and allows for creation of new services redirecting the user on the creation/edit form
+ */
+@Component({
+  selector: 'ds-ldn-services-directory',
+  templateUrl: './ldn-services-directory.component.html',
+  styleUrls: ['./ldn-services-directory.component.scss'],
+  changeDetection: ChangeDetectionStrategy.Default,
+})
+export class LdnServicesOverviewComponent implements OnInit, OnDestroy {
+
+  selectedServiceId: string | number | null = null;
+  servicesData: any[] = [];
+  @ViewChild('deleteModal', { static: true }) deleteModal: TemplateRef<any>;
+  ldnServicesRD$: Observable<RemoteData<PaginatedList<LdnService>>>;
+  config: FindListOptions = Object.assign(new FindListOptions(), {
+    elementsPerPage: 10,
+  });
+  pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'po',
+    pageSize: 10,
+  });
+  isProcessingSub: Subscription;
+  modalRef: any;
+
+
+  constructor(
+    protected ldnServicesService: LdnServicesService,
+    protected paginationService: PaginationService,
+    protected modalService: NgbModal,
+    public cdRef: ChangeDetectorRef,
+    private notificationService: NotificationsService,
+    private translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.setLdnServices();
+  }
+
+  /**
+   * Sets up the LDN services by fetching and observing the paginated list of services.
+   */
+  setLdnServices() {
+    this.ldnServicesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
+      switchMap((config) => this.ldnServicesService.findAll(config, false, false).pipe(
+        getFirstCompletedRemoteData(),
+      )),
+    );
+  }
+
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.pageConfig.id);
+    if (hasValue(this.isProcessingSub)) {
+      this.isProcessingSub.unsubscribe();
+    }
+  }
+
+  /**
+   * Opens the delete confirmation modal.
+   *
+   * @param {any} content - The content of the modal.
+   */
+  openDeleteModal(content) {
+    this.modalRef = this.modalService.open(content);
+  }
+
+  /**
+   * Closes the currently open modal and triggers change detection.
+   */
+  closeModal() {
+    this.modalRef.close();
+    this.cdRef.detectChanges();
+  }
+
+  /**
+   * Sets the selected LDN service ID for deletion and opens the delete confirmation modal.
+   *
+   * @param {number} serviceId - The ID of the service to be deleted.
+   */
+  selectServiceToDelete(serviceId: number) {
+    this.selectedServiceId = serviceId;
+    this.openDeleteModal(this.deleteModal);
+  }
+
+  /**
+   * Deletes the selected LDN service.
+   *
+   * @param {string} serviceId - The ID of the service to be deleted.
+   * @param {LdnServicesService} ldnServicesService - The service for managing LDN services.
+   */
+  deleteSelected(serviceId: string, ldnServicesService: LdnServicesService): void {
+    if (this.selectedServiceId !== null) {
+      ldnServicesService.delete(serviceId).pipe(getFirstCompletedRemoteData()).subscribe((rd: RemoteData<LdnService>) => {
+        if (rd.hasSucceeded) {
+          this.servicesData = this.servicesData.filter(service => service.id !== serviceId);
+          this.ldnServicesRD$ = this.ldnServicesRD$.pipe(
+            map((remoteData: RemoteData<PaginatedList<LdnService>>) => {
+              if (remoteData.hasSucceeded) {
+                remoteData.payload.page = remoteData.payload.page.filter(service => service.id.toString() !== serviceId);
+              }
+              return remoteData;
+            }),
+          );
+          this.cdRef.detectChanges();
+          this.closeModal();
+          this.notificationService.success(this.translateService.get('ldn-service-delete.notification.success.title'),
+            this.translateService.get('ldn-service-delete.notification.success.content'));
+        } else {
+          this.notificationService.error(this.translateService.get('ldn-service-delete.notification.error.title'),
+            this.translateService.get('ldn-service-delete.notification.error.content'));
+          this.cdRef.detectChanges();
+        }
+      });
+    }
+  }
+
+  /**
+   * Toggles the status (enabled/disabled) of an LDN service.
+   *
+   * @param {any} ldnService - The LDN service object.
+   * @param {LdnServicesService} ldnServicesService - The service for managing LDN services.
+   */
+  toggleStatus(ldnService: any, ldnServicesService: LdnServicesService): void {
+    const newStatus = !ldnService.enabled;
+    const originalStatus = ldnService.enabled;
+
+    const patchOperation: Operation = {
+      op: 'replace',
+      path: '/enabled',
+      value: newStatus,
+    };
+
+    ldnServicesService.patch(ldnService, [patchOperation]).pipe(getFirstCompletedRemoteData()).subscribe(
+      (rd: RemoteData<LdnService>) => {
+        if (rd.hasSucceeded) {
+          ldnService.enabled = newStatus;
+          this.notificationService.success(this.translateService.get('ldn-enable-service.notification.success.title'),
+            this.translateService.get('ldn-enable-service.notification.success.content'));
+        } else {
+          ldnService.enabled = originalStatus;
+          this.notificationService.error(this.translateService.get('ldn-enable-service.notification.error.title'),
+            this.translateService.get('ldn-enable-service.notification.error.content'));
+        }
+      },
+    );
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts
new file mode 100644
index 0000000000..73af060413
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters.ts
@@ -0,0 +1,36 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { LDN_SERVICE_CONSTRAINT_FILTER } from './ldn-service.resource-type';
+
+/** A single filter value and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class Itemfilter extends CacheableObject {
+  static type = LDN_SERVICE_CONSTRAINT_FILTER;
+
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserialize
+    id: string;
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts
new file mode 100644
index 0000000000..650511005c
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model.ts
@@ -0,0 +1,13 @@
+import { autoserialize } from 'cerialize';
+
+/**
+ * A single notify service pattern and his properties
+ */
+export class NotifyServicePattern {
+  @autoserialize
+    pattern: string;
+  @autoserialize
+    constraint: string;
+  @autoserialize
+    automatic: string;
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
new file mode 100644
index 0000000000..040e4d37b8
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service-status.model.ts
@@ -0,0 +1,8 @@
+/**
+ * List of services statuses
+ */
+export enum LdnServiceStatus {
+  UNKOWN,
+  DISABLED,
+  ENABLED,
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts
new file mode 100644
index 0000000000..5121e47f69
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.constrain.model.ts
@@ -0,0 +1,3 @@
+export class LdnServiceConstrain {
+  void: any;
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts
new file mode 100644
index 0000000000..05a881e7e7
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-service.resource-type.ts
@@ -0,0 +1,12 @@
+/**
+ * The resource type for Ldn-Services
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../../core/shared/resource-type';
+
+export const LDN_SERVICE = new ResourceType('ldnservice');
+export const LDN_SERVICE_CONSTRAINT_FILTERS = new ResourceType('itemfilters');
+
+export const LDN_SERVICE_CONSTRAINT_FILTER = new ResourceType('itemfilter');
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
new file mode 100644
index 0000000000..69b84427d1
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/ldn-services.model.ts
@@ -0,0 +1,77 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { LDN_SERVICE } from './ldn-service.resource-type';
+import { NotifyServicePattern } from './ldn-service-patterns.model';
+
+/**
+ * LDN Services bounded to each selected pattern, relation set in service creation
+ */
+
+export interface LdnServiceByPattern {
+  allowsMultipleRequests: boolean;
+  services: LdnService[];
+}
+
+/** An LdnService  and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class LdnService extends CacheableObject {
+  static type = LDN_SERVICE;
+
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserialize
+    id: number;
+
+  @deserializeAs('id')
+    uuid: string;
+
+  @autoserialize
+    name: string;
+
+  @autoserialize
+    description: string;
+
+  @autoserialize
+    url: string;
+
+  @autoserialize
+    score: number;
+
+  @autoserialize
+    enabled: boolean;
+
+  @autoserialize
+    ldnUrl: string;
+
+  @autoserialize
+    lowerIp: string;
+
+  @autoserialize
+    upperIp: string;
+
+  @autoserialize
+    notifyServiceInboundPatterns?: NotifyServicePattern[];
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts b/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts
new file mode 100644
index 0000000000..c734503d95
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-model/service-constrain-type.model.ts
@@ -0,0 +1,10 @@
+/**
+ * List of parameter types used for scripts
+ */
+export enum LdnServiceConstrainType {
+  STRING = 'String',
+  DATE = 'date',
+  BOOLEAN = 'boolean',
+  FILE = 'InputStream',
+  OUTPUT = 'OutputStream'
+}
diff --git a/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts b/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
new file mode 100644
index 0000000000..faa7dc82d7
--- /dev/null
+++ b/src/app/admin/admin-ldn-services/ldn-services-patterns/ldn-service-coar-patterns.ts
@@ -0,0 +1,16 @@
+/**
+ * All available patterns for LDN service creation.
+ * They are used to populate a dropdown in the LDN service form creation
+ */
+
+export const notifyPatterns = [
+
+  'request-endorsement',
+
+  'request-ingest',
+
+  'request-review',
+
+];
+
+
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
new file mode 100644
index 0000000000..4d988e6908
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page-resolver.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface NotificationsSuggestionTargetsPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class NotificationsSuggestionTargetsPageResolver implements Resolve<NotificationsSuggestionTargetsPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminNotificationsSuggestionTargetsPageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): NotificationsSuggestionTargetsPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html
new file mode 100644
index 0000000000..b04e7132f1
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.html
@@ -0,0 +1 @@
+<ds-publication-claim [source]="'openaire'"></ds-publication-claim>
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.scss
similarity index 100%
rename from src/app/item-page/simple/item-types/versioned-item/versioned-item.component.html
rename to src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.scss
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
new file mode 100644
index 0000000000..0dcee41450
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.spec.ts
@@ -0,0 +1,42 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { NotificationsSuggestionTargetsPageComponent } from '../../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+
+describe('NotificationsSuggestionTargetsPageComponent', () => {
+  let component: NotificationsSuggestionTargetsPageComponent;
+  let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        NotificationsSuggestionTargetsPageComponent,
+      ],
+      providers: [
+        NotificationsSuggestionTargetsPageComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
new file mode 100644
index 0000000000..c25fc43d45
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-admin-notifications-publication-claim-page',
+  templateUrl: './admin-notifications-publication-claim-page.component.html',
+  styleUrls: ['./admin-notifications-publication-claim-page.component.scss'],
+})
+export class AdminNotificationsPublicationClaimPageComponent {
+
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
new file mode 100644
index 0000000000..9fcabedd64
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-routing-paths.ts
@@ -0,0 +1,7 @@
+
+export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance';
+export const PUBLICATION_CLAIMS_PATH = 'publication-claim';
+
+export function getQualityAssuranceEditRoute() {
+  return `/${QUALITY_ASSURANCE_EDIT_PATH}`;
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications-routing.module.ts b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
new file mode 100644
index 0000000000..abcc6587dd
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications-routing.module.ts
@@ -0,0 +1,123 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import { QualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
+import { QualityAssuranceBreadcrumbService } from '../../core/breadcrumbs/quality-assurance-breadcrumb.service';
+import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
+import { QualityAssuranceEventsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component';
+import { QualityAssuranceEventsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver';
+import { SourceDataResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver';
+import { QualityAssuranceSourcePageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceSourcePageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { QualityAssuranceTopicsPageComponent } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component';
+import { QualityAssuranceTopicsPageResolver } from '../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import {
+  PUBLICATION_CLAIMS_PATH,
+  QUALITY_ASSURANCE_EDIT_PATH,
+} from './admin-notifications-routing-paths';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${PUBLICATION_CLAIMS_PATH}`,
+        component: AdminNotificationsPublicationClaimPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          suggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.publicationclaim.page.title',
+          breadcrumbKey: 'admin.notifications.publicationclaim',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ SiteAdministratorGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
+        component: QualityAssuranceSourcePageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
+          sourceData: SourceDataResolver,
+        },
+        data: {
+          title: 'admin.notifications.source.breadcrumbs',
+          breadcrumbKey: 'admin.notifications.source',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
+        component: QualityAssuranceEventsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.event.page.title',
+          breadcrumbKey: 'admin.notifications.event',
+          showBreadcrumbsFluid: false,
+        },
+      },
+    ]),
+  ],
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+    AdminNotificationsPublicationClaimPageResolver,
+    SourceDataResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceTopicsPageResolver,
+    QualityAssuranceEventsPageResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceBreadcrumbResolver,
+    QualityAssuranceBreadcrumbService,
+  ],
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class AdminNotificationsRoutingModule {
+
+}
diff --git a/src/app/admin/admin-notifications/admin-notifications.module.ts b/src/app/admin/admin-notifications/admin-notifications.module.ts
new file mode 100644
index 0000000000..e2149cda7a
--- /dev/null
+++ b/src/app/admin/admin-notifications/admin-notifications.module.ts
@@ -0,0 +1,28 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { CoreModule } from '../../core/core.module';
+import { NotificationsModule } from '../../notifications/notifications.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminNotificationsPublicationClaimPageComponent } from './admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import { AdminNotificationsRoutingModule } from './admin-notifications-routing.module';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    AdminNotificationsRoutingModule,
+    NotificationsModule,
+  ],
+  declarations: [
+    AdminNotificationsPublicationClaimPageComponent,
+  ],
+  entryComponents: [],
+})
+/**
+ * This module handles all components related to the notifications pages
+ */
+export class AdminNotificationsModule {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
new file mode 100644
index 0000000000..dc9312ec28
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routing.module.ts
@@ -0,0 +1,59 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { NotifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
+import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
+import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
+        path: '',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        component: AdminNotifyDashboardComponent,
+        pathMatch: 'full',
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+        },
+      },
+      {
+        path: 'inbound',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        component: AdminNotifyIncomingComponent,
+        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+        },
+      },
+      {
+        path: 'outbound',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+        },
+        component: AdminNotifyOutgoingComponent,
+        canActivate: [SiteAdministratorGuard, NotifyInfoGuard],
+        data: {
+          title: 'admin.notify.dashboard.page.title',
+          breadcrumbKey: 'admin.notify.dashboard',
+        },
+      },
+    ]),
+  ],
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class AdminNotifyDashboardRoutingModule {
+
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
new file mode 100644
index 0000000000..3adb7e857b
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.html
@@ -0,0 +1,23 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h1>
+      <div class="my-4">{{'admin-notify-dashboard.description' | translate}}</div>
+      <div>
+        <ul class="nav nav-tabs">
+          <li class="nav-item">
+            <a class="nav-link active">{{'admin-notify-dashboard.metrics' | translate}}</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" [routerLink]="'inbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
+          </li>
+          <li class="nav-item">
+            <a class="nav-link" [routerLink]="'outbound'" [queryParams]="{view: 'table'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
+        </ul>
+        <div class="mt-2">
+          <ds-admin-notify-metrics *ngIf="(notifyMetricsRows$ | async)?.length" [boxesConfig]="notifyMetricsRows$ | async"></ds-admin-notify-metrics>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
new file mode 100644
index 0000000000..2629313363
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.spec.ts
@@ -0,0 +1,60 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyMessage } from './models/admin-notify-message.model';
+import { AdminNotifySearchResult } from './models/admin-notify-message-search-result.model';
+
+describe('AdminNotifyDashboardComponent', () => {
+  let component: AdminNotifyDashboardComponent;
+  let fixture: ComponentFixture<AdminNotifyDashboardComponent>;
+
+  let item1;
+  let item2;
+  let item3;
+  let searchResult1;
+  let searchResult2;
+  let searchResult3;
+  let results;
+
+  const mockBoxes = [
+    { title: 'admin-notify-dashboard.received-ldn', boxes: [ undefined, undefined, undefined, undefined, undefined ] },
+    { title: 'admin-notify-dashboard.generated-ldn', boxes: [ undefined, undefined, undefined, undefined, undefined ] },
+  ];
+
+  beforeEach(async () => {
+    item1 = Object.assign(new AdminNotifyMessage(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+    item2 = Object.assign(new AdminNotifyMessage(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+    item3 = Object.assign(new AdminNotifyMessage(), { uuid: 'c3bcbff5-ec0c-4831-8e4c-94b9c933ccac' });
+    searchResult1 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item1 });
+    searchResult2 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item2 });
+    searchResult3 = Object.assign(new AdminNotifySearchResult(), { indexableObject: item3 });
+    results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), NgbNavModule],
+      declarations: [ AdminNotifyDashboardComponent ],
+      providers: [{ provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } }],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyDashboardComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', (done) => {
+    component.notifyMetricsRows$.subscribe(boxes => {
+      expect(boxes).toEqual(mockBoxes);
+      done();
+    });
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
new file mode 100644
index 0000000000..40100d8684
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.component.ts
@@ -0,0 +1,104 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  forkJoin,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+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';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import {
+  AdminNotifyMetricsBox,
+  AdminNotifyMetricsRow,
+} from './admin-notify-metrics/admin-notify-metrics.model';
+
+@Component({
+  selector: 'ds-admin-notify-dashboard',
+  templateUrl: './admin-notify-dashboard.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+
+/**
+ * Component used for visual representation and search of LDN messages for Admins
+ */
+export class AdminNotifyDashboardComponent implements OnInit{
+
+  public notifyMetricsRows$: Observable<AdminNotifyMetricsRow[]>;
+
+  private metricsConfig = environment.notifyMetrics;
+  private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'single-result-options',
+    pageSize: 1,
+  });
+
+  constructor(private searchService: SearchService) {
+  }
+
+  ngOnInit() {
+    const mertricsRowsConfigurations = this.metricsConfig
+      .map(row => row.boxes)
+      .map(boxes => boxes.map(box => box.config).filter(config => !!config));
+    const flatConfigurations = [].concat(...mertricsRowsConfigurations.map((config) => config));
+    const searchConfigurations = flatConfigurations
+      .map(config => Object.assign(new PaginatedSearchOptions({}),
+        { configuration: config, pagination: this.singleResultOptions },
+      ));
+
+    this.notifyMetricsRows$ = forkJoin(searchConfigurations.map(config => this.searchService.search(config)
+      .pipe(
+        getFirstCompletedRemoteData(),
+        map(response => this.mapSearchObjectsToMetricsBox(response.payload)),
+      ),
+    ),
+    ).pipe(
+      map(metricBoxes => this.mapUpdatedBoxesToMetricsRows(metricBoxes)),
+    );
+  }
+
+  /**
+   * Function to map received SearchObjects to notify boxes config
+   *
+   * @param searchObject The object to map
+   * @private
+   */
+  private mapSearchObjectsToMetricsBox(searchObject: SearchObjects<DSpaceObject>): AdminNotifyMetricsBox {
+    const count = searchObject.pageInfo.totalElements;
+    const objectConfig = searchObject.configuration;
+    const metricsBoxes = [].concat(...this.metricsConfig.map((config) => config.boxes));
+
+    return {
+      ...metricsBoxes.find(box => box.config === objectConfig),
+      count,
+    };
+  }
+
+  /**
+   * Function to map updated boxes with count to each row of the configuration
+   *
+   * @param boxesWithCount The object to map
+   * @private
+   */
+  private mapUpdatedBoxesToMetricsRows(boxesWithCount: AdminNotifyMetricsBox[]): AdminNotifyMetricsRow[] {
+    return this.metricsConfig.map(row => {
+      return {
+        ...row,
+        boxes: row.boxes.map(rowBox => boxesWithCount.find(boxWithCount => boxWithCount.config === rowBox.config)),
+      };
+    });
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
new file mode 100644
index 0000000000..d840197ea7
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-dashboard.module.ts
@@ -0,0 +1,55 @@
+import {
+  CommonModule,
+  DatePipe,
+} from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { SearchPageModule } from '../../search-page/search-page.module';
+import { SearchModule } from '../../shared/search/search.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
+import { AdminNotifyDashboardRoutingModule } from './admin-notify-dashboard-routing.module';
+import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
+import { AdminNotifyLogsResultComponent } from './admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component';
+import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics/admin-notify-metrics.component';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result/admin-notify-search-result.component';
+import { AdminNotifyMessagesService } from './services/admin-notify-messages.service';
+
+const ENTRY_COMPONENTS = [
+  AdminNotifySearchResultComponent,
+];
+@NgModule({
+  imports: [
+    CommonModule,
+    RouterModule,
+    SharedModule,
+    AdminNotifyDashboardRoutingModule,
+    SearchModule,
+    SearchPageModule,
+  ],
+  providers: [
+    AdminNotifyMessagesService,
+    DatePipe,
+  ],
+  declarations: [
+    ...ENTRY_COMPONENTS,
+    AdminNotifyDashboardComponent,
+    AdminNotifyMetricsComponent,
+    AdminNotifyIncomingComponent,
+    AdminNotifyOutgoingComponent,
+    AdminNotifyDetailModalComponent,
+    AdminNotifySearchResultComponent,
+    AdminNotifyLogsResultComponent,
+  ],
+})
+export class AdminNotifyDashboardModule {
+  static withEntryComponents() {
+    return {
+      ngModule: AdminNotifyDashboardModule,
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
+    };
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
new file mode 100644
index 0000000000..52d93cbb62
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -0,0 +1,22 @@
+<div class="modal-header">
+  <h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body p-4">
+    <div *ngFor="let key of notifyMessageKeys">
+      <div class="row mb-4">
+        <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
+        <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
+      </div>
+    </div>
+
+  <div class="d-flex justify-content-end">
+    <button class="btn-primary" (click)="toggleCoarMessage()">
+      {{'notify-message-modal.show-message' | translate}}
+    </button>
+  </div>
+
+  <pre @fadeIn [innerHTML]="notifyMessage.message" class="bg-secondary text-white mt-2 p-2" *ngIf="isCoarMessageVisible"></pre>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
new file mode 100644
index 0000000000..7fddf170ff
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminNotifyDetailModalComponent } from './admin-notify-detail-modal.component';
+
+describe('AdminNotifyDetailModalComponent', () => {
+  let component: AdminNotifyDetailModalComponent;
+  let fixture: ComponentFixture<AdminNotifyDetailModalComponent>;
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyDetailModalComponent ],
+      providers: [{ provide: NgbActiveModal, useValue: modalStub }],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyDetailModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should close', () => {
+    spyOn(component.response, 'emit');
+    component.closeModal();
+    expect(modalStub.close).toHaveBeenCalled();
+    expect(component.response.emit).toHaveBeenCalledWith(true);
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
new file mode 100644
index 0000000000..3962d9cb50
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.ts
@@ -0,0 +1,55 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+
+import { fadeIn } from '../../../shared/animations/fade';
+import { MissingTranslationHelper } from '../../../shared/translate/missing-translation.helper';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+
+@Component({
+  selector: 'ds-admin-notify-detail-modal',
+  templateUrl: './admin-notify-detail-modal.component.html',
+  animations: [
+    fadeIn,
+  ],
+})
+/**
+ * Component for detailed view of LDN messages displayed in search result in AdminNotifyDashboardComponent
+ */
+
+export class AdminNotifyDetailModalComponent {
+  @Input() notifyMessage: AdminNotifyMessage;
+  @Input() notifyMessageKeys: string[];
+
+  /**
+   * An event fired when the modal is closed
+   */
+  @Output()
+    response = new EventEmitter<boolean>();
+
+  public isCoarMessageVisible = false;
+
+
+  constructor(protected activeModal: NgbActiveModal,
+              public translationsService: TranslateService) {
+    this.translationsService.missingTranslationHandler = new MissingTranslationHelper();
+  }
+
+
+  /**
+   * Close the modal and set the response to true so RootComponent knows the modal was closed
+   */
+  closeModal() {
+    this.activeModal.close();
+    this.response.emit(true);
+  }
+
+  toggleCoarMessage() {
+    this.isCoarMessageVisible = !this.isCoarMessageVisible;
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
new file mode 100644
index 0000000000..4c957ca630
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.html
@@ -0,0 +1,23 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h1>
+      <div>
+        <div>
+          <ul class="nav nav-tabs">
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link active">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../outbound'" [queryParams]="{view: 'table', configuration: 'NOTIFY.outgoing'}">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
+          </ul>
+
+          <ds-admin-notify-logs-result [defaultConfiguration]="'NOTIFY.incoming'" ></ds-admin-notify-logs-result>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
new file mode 100644
index 0000000000..70771bac54
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.spec.ts
@@ -0,0 +1,61 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyIncomingComponent } from './admin-notify-incoming.component';
+
+describe('AdminNotifyIncomingComponent', () => {
+  let component: AdminNotifyIncomingComponent;
+  let fixture: ComponentFixture<AdminNotifyIncomingComponent>;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+
+
+
+  beforeEach(async () => {
+    rdbService = getMockRemoteDataBuildService();
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api',
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': 'client/1234',
+      'send': '',
+    });
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyIncomingComponent ],
+      providers: [
+        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyIncomingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
new file mode 100644
index 0000000000..fc0f410ad5
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component.ts
@@ -0,0 +1,22 @@
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+
+@Component({
+  selector: 'ds-admin-notify-incoming',
+  templateUrl: './admin-notify-incoming.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class AdminNotifyIncomingComponent {
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
new file mode 100644
index 0000000000..f7c4f77a70
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -0,0 +1,25 @@
+<div class="container my-4">
+  <div class="row">
+    <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
+    <div class="col-md-9">
+      <div class="h4">
+        <button (click)="resetDefaultConfiguration()" *ngIf="(selectedSearchConfig$ | async) !== defaultConfiguration" class="badge badge-primary mr-1 mb-1">
+          {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
+          <span> ×</span>
+        </button>
+      </div>
+      <ds-search-labels [inPlaceSearch]="true"></ds-search-labels>
+    </div>
+  </div>
+</div>
+
+
+<div>
+  <ds-themed-search
+    [configuration]="selectedSearchConfig$ | async"
+    [showViewModes]="false"
+    [searchEnabled]="false"
+    [context]="context"
+  ></ds-themed-search>
+</div>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts
new file mode 100644
index 0000000000..16adbd17f3
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.spec.ts
@@ -0,0 +1,55 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
+import { AdminNotifyLogsResultComponent } from './admin-notify-logs-result.component';
+
+describe('AdminNotifyLogsResultComponent', () => {
+  let component: AdminNotifyLogsResultComponent;
+  let fixture: ComponentFixture<AdminNotifyLogsResultComponent>;
+  let objectCache: ObjectCacheService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let rdbService: RemoteDataBuildService;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyLogsResultComponent ],
+      providers: [
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyLogsResultComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
new file mode 100644
index 0000000000..626cd2da1f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.ts
@@ -0,0 +1,84 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { Context } from '../../../../core/shared/context.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+
+@Component({
+  selector: 'ds-admin-notify-logs-result',
+  templateUrl: './admin-notify-logs-result.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+
+/**
+ * Component for visualization of search page and related results for the logs of the Notify dashboard
+ */
+
+export class AdminNotifyLogsResultComponent implements OnInit {
+
+  @Input()
+    defaultConfiguration: string;
+
+
+  public selectedSearchConfig$: Observable<string>;
+  public isInbound$: Observable<boolean>;
+
+  protected readonly context = Context.CoarNotify;
+
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+              private router: Router,
+              private route: ActivatedRoute,
+              protected cdRef: ChangeDetectorRef) {
+  }
+
+  ngOnInit() {
+    this.selectedSearchConfig$ = this.searchConfigService.getCurrentConfiguration(this.defaultConfiguration);
+    this.isInbound$ = this.selectedSearchConfig$.pipe(
+      map(config => config.startsWith('NOTIFY.incoming')),
+    );
+  }
+
+  /**
+   * Reset route state to default configuration
+   */
+  public resetDefaultConfiguration() {
+    //Idle navigation to trigger rendering of result on same page
+    this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => {
+      this.router.navigate([this.getResolvedUrl(this.route.snapshot)], {
+        queryParams: {
+          configuration: this.defaultConfiguration,
+          view: ViewMode.Table,
+        },
+      });
+    });
+  }
+
+  /**
+   * Get resolved url from route
+   *
+   * @param route url path
+   * @returns url path
+   */
+  private getResolvedUrl(route: ActivatedRouteSnapshot): string {
+    return route.pathFromRoot.map(v => v.url.map(segment => segment.toString()).join('/')).join('/');
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
new file mode 100644
index 0000000000..e9bc1d10b2
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.html
@@ -0,0 +1,24 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 class="border-bottom pb-2">{{'admin-notify-dashboard.title'| translate}}</h1>
+      <div>
+        <div>
+          <ul class="nav nav-tabs">
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../'">{{'admin-notify-dashboard.metrics' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" [routerLink]="'../inbound'" [queryParams]="{view: 'table', configuration: 'NOTIFY.incoming'}">{{'admin.notify.dashboard.inbound-logs' | translate}}</a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link active">{{'admin.notify.dashboard.outbound-logs' | translate}}</a>
+          </ul>
+
+          <ds-admin-notify-logs-result [defaultConfiguration]="'NOTIFY.outgoing'" ></ds-admin-notify-logs-result>
+
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
new file mode 100644
index 0000000000..73773736ff
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.spec.ts
@@ -0,0 +1,60 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { MockActivatedRoute } from '../../../../shared/mocks/active-router.mock';
+import { getMockRemoteDataBuildService } from '../../../../shared/mocks/remote-data-build.service.mock';
+import { routeServiceStub } from '../../../../shared/testing/route-service.stub';
+import { AdminNotifyOutgoingComponent } from './admin-notify-outgoing.component';
+
+describe('AdminNotifyOutgoingComponent', () => {
+  let component: AdminNotifyOutgoingComponent;
+  let fixture: ComponentFixture<AdminNotifyOutgoingComponent>;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+
+
+  beforeEach(async () => {
+    rdbService = getMockRemoteDataBuildService();
+    requestService = jasmine.createSpyObj('requestService', {
+      'generateRequestId': 'client/1234',
+      'send': '',
+    });
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api',
+    });
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyOutgoingComponent ],
+      providers: [
+        { provide: SEARCH_CONFIG_SERVICE, useValue: SearchConfigurationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifyOutgoingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
new file mode 100644
index 0000000000..26d6d345be
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component.ts
@@ -0,0 +1,22 @@
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+
+@Component({
+  selector: 'ds-admin-notify-outgoing',
+  templateUrl: './admin-notify-outgoing.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class AdminNotifyOutgoingComponent {
+  constructor(@Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
new file mode 100644
index 0000000000..3257bdd5ba
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.html
@@ -0,0 +1,9 @@
+<div class="mb-5" *ngFor="let row of boxesConfig">
+  <div class="mb-2">{{ row.title | translate }}</div>
+  <div class="row justify-content-between">
+    <div class="col-sm" *ngFor="let box of row.boxes">
+      <ds-notification-box (selectedBoxConfig)="navigateToSelectedSearchConfig($event)" [boxConfig]="box"></ds-notification-box>
+    </div>
+  </div>
+</div>
+
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
new file mode 100644
index 0000000000..3411a6134f
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.spec.ts
@@ -0,0 +1,74 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { AdminNotifyMetricsComponent } from './admin-notify-metrics.component';
+
+describe('AdminNotifyMetricsComponent', () => {
+  let component: AdminNotifyMetricsComponent;
+  let fixture: ComponentFixture<AdminNotifyMetricsComponent>;
+  let router: RouterStub;
+
+  beforeEach(async () => {
+    router = Object.assign(new RouterStub(),
+      { url : '/notify-dashboard' },
+    );
+
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifyMetricsComponent ],
+      providers: [{ provide: Router, useValue: router }],
+    })
+      .compileComponents();
+
+
+
+    fixture = TestBed.createComponent(AdminNotifyMetricsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+  it('should navigate to correct url based on config', () => {
+    const searchConfig = 'test.involvedItems';
+    const incomingConfig = 'NOTIFY.incoming.test';
+    const outgoingConfig = 'NOTIFY.outgoing.test';
+    const adminPath =  '/admin/search';
+    const routeExtras = {
+      queryParams: {
+        configuration: searchConfig,
+        view: ViewMode.ListElement,
+      },
+    };
+
+    const routeExtrasTable = {
+      queryParams: {
+        configuration: incomingConfig,
+        view: ViewMode.Table,
+      },
+    };
+
+    const routeExtrasTableOutgoing = {
+      queryParams: {
+        configuration: outgoingConfig,
+        view: ViewMode.Table,
+      },
+    };
+    component.navigateToSelectedSearchConfig(searchConfig);
+    expect(router.navigate).toHaveBeenCalledWith([adminPath], routeExtras);
+
+    component.navigateToSelectedSearchConfig(incomingConfig);
+    expect(router.navigate).toHaveBeenCalledWith(['/notify-dashboard/inbound'], routeExtrasTable);
+
+    component.navigateToSelectedSearchConfig(outgoingConfig);
+    expect(router.navigate).toHaveBeenCalledWith(['/notify-dashboard/outbound'], routeExtrasTableOutgoing);
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
new file mode 100644
index 0000000000..6d08f21415
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.component.ts
@@ -0,0 +1,57 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Router } from '@angular/router';
+
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { AdminNotifyMetricsRow } from './admin-notify-metrics.model';
+
+@Component({
+  selector: 'ds-admin-notify-metrics',
+  templateUrl: './admin-notify-metrics.component.html',
+})
+/**
+ * Component used to display the number of notification for each configured box in the notifyMetrics section
+ */
+
+export class AdminNotifyMetricsComponent {
+
+  @Input()
+    boxesConfig: AdminNotifyMetricsRow[];
+
+  private incomingConfiguration = 'NOTIFY.incoming';
+  private involvedItemsSuffix = 'involvedItems';
+  private inboundPath = '/inbound';
+  private outboundPath = '/outbound';
+  private adminSearchPath = '/admin/search';
+
+  constructor(private router: Router) {
+  }
+
+
+  public navigateToSelectedSearchConfig(searchConfig: string) {
+    const isRelatedItemsConfig = searchConfig.endsWith(this.involvedItemsSuffix);
+
+    if (isRelatedItemsConfig) {
+      this.router.navigate([this.adminSearchPath], {
+        queryParams: {
+          configuration: searchConfig,
+          view: ViewMode.ListElement,
+        },
+      });
+
+      return;
+    }
+
+    const isIncomingConfig = searchConfig.startsWith(this.incomingConfiguration);
+    const selectedPath = isIncomingConfig ? this.inboundPath : this.outboundPath;
+
+    this.router.navigate([`${this.router.url}${selectedPath}`], {
+      queryParams: {
+        configuration: searchConfig,
+        view: ViewMode.Table,
+      },
+    });
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
new file mode 100644
index 0000000000..83b931c866
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model.ts
@@ -0,0 +1,19 @@
+/**
+ * The properties for each Box to be displayed in rows in the AdminNotifyMetricsComponent
+ */
+
+export interface AdminNotifyMetricsBox {
+  color: string;
+  textColor?: string;
+  title: string;
+  description: string;
+  config: string;
+  count?: number;
+}
+/**
+ * The properties for each Row containing a list of AdminNotifyMetricsBox to be displayed in the AdminNotifyMetricsComponent
+ */
+export interface AdminNotifyMetricsRow {
+  title: string;
+  boxes: AdminNotifyMetricsBox[]
+}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
new file mode 100644
index 0000000000..af540b094e
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -0,0 +1,51 @@
+<div class="table-responsive mt-2">
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr class="text-nowrap">
+        <th scope="col">{{ 'notify-message-result.timestamp' | translate}}</th>
+        <th scope="col">{{'notify-message-result.repositoryItem' | translate}}</th>
+        <th scope="col">{{ 'notify-message-result.ldnService' | translate}}</th>
+        <th scope="col">{{ 'notify-message-result.type' | translate }}</th>
+        <th scope="col">{{ 'notify-message-result.status' | translate  }}</th>
+        <th scope="col">{{ 'notify-message-result.action' | translate }}</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr *ngFor="let message of (messagesSubject$ | async)">
+        <td class="text-nowrap">
+          <div *ngIf="message.queueLastStartTime">{{ message.queueLastStartTime | date:"YYYY/MM/d hh:mm:ss" }}</div>
+          <div *ngIf="!message.queueLastStartTime">n/a</div>
+        </td>
+        <td>
+          <ds-truncatable [id]="message.id">
+            <ds-truncatable-part [id]="message.id" [minLines]="2">
+              <a *ngIf="message.relatedItem" [routerLink]="'/items/' + (message.context || message.object)">{{ message.relatedItem }}</a>
+            </ds-truncatable-part>
+          </ds-truncatable>
+          <div *ngIf="!message.relatedItem">n/a</div>
+        </td>
+        <td>
+          <div *ngIf="message.ldnService">{{ message.ldnService }}</div>
+          <div *ngIf="!message.ldnService">n/a</div>
+        </td>
+        <td>
+          <div>{{ message.activityStreamType }}</div>
+        </td>
+        <td>
+          <div class="text-nowrap">{{ 'notify-detail-modal.' + message.queueStatusLabel | translate }}</div>
+        </td>
+        <td>
+          <div class="d-flex flex-column">
+            <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
+            <button *ngIf="message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)"
+                    (click)="reprocessMessage(message)"
+                    class="btn btn-warning"
+            >
+              {{ 'notify-message-result.reprocess' | translate }}
+            </button>
+          </div>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
new file mode 100644
index 0000000000..1a6411cb60
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.spec.ts
@@ -0,0 +1,188 @@
+import { DatePipe } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { RouteService } from '../../../core/services/route.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
+import { AdminNotifySearchResultComponent } from './admin-notify-search-result.component';
+
+export const mockAdminNotifyMessages = [
+  {
+    'type': 'message',
+    'id': 'urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0',
+    'coarNotifyType': 'coar-notify:ReviewAction',
+    'activityStreamType': 'TentativeReject',
+    'inReplyTo': 'urn:uuid:f7289ad5-0955-4c86-834c-fb54a736778b',
+    'object': null,
+    'context': '24d50450-9ff0-485f-82d4-fba1be42f3f9',
+    'queueAttempts': 1,
+    'queueLastStartTime': '2023-11-24T14:44:00.064+00:00',
+    'origin': 12,
+    'target': null,
+    'queueStatusLabel': 'notify-queue-status.processed',
+    'queueTimeout': '2023-11-24T15:44:00.064+00:00',
+    'queueStatus': 3,
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/ldn/messages/urn:uuid:5fb3af44-d4f8-4226-9475-2d09c2d8d9e0',
+      },
+    },
+    'thumbnail': 'test',
+    'item': {},
+    'accessStatus': {},
+    'ldnService': 'NOTIFY inbox - Automatic service',
+    'relatedItem': 'test coar 2 demo',
+    'message': '{"@context":["https://www.w3.org/ns/activitystreams","https://purl.org/coar/notify"],"id":"urn:uuid:668f26e0-2e8d-4118-b0d2-ee713523bc45","type":["Reject","coar-notify:IngestAction"],"actor":{"id":"https://generic-service.com","type":["Service"],"name":"Generic Service"},"context":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Document"],"ietf:cite-as":"https://doi.org/10.4598/12123488"},"object":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Offer"]},"origin":{"id":"https://generic-service.com/system","type":["Service"],"inbox":"https://notify-inbox.info/inbox7"},"target":{"id":"https://some-organisation.org","type":["Organization"],"inbox":"https://dspace-coar.4science.cloud/server/ldn/inbox"},"inReplyTo":"urn:uuid:d9b4010a-f128-4815-abb2-83707a2ee9cf"}',
+  },
+  {
+    'type': 'message',
+    'id': 'urn:uuid:544c8777-e826-4810-a625-3e394cc3660d',
+    'coarNotifyType': 'coar-notify:IngestAction',
+    'activityStreamType': 'Announce',
+    'inReplyTo': 'urn:uuid:b2ad72d6-6ea9-464f-b385-29a78417f6b8',
+    'object': null,
+    'context': 'e657437a-0ee2-437d-916a-bba8c57bf40b',
+    'queueAttempts': 1,
+    'queueLastStartTime': null,
+    'origin': 12,
+    'target': null,
+    'queueStatusLabel': 'notify-queue-status.unmapped_action',
+    'queueTimeout': '2023-11-24T14:15:34.945+00:00',
+    'queueStatus': 6,
+    '_links': {
+      'self': {
+        'href': 'http://localhost:8080/server/api/ldn/messages/urn:uuid:544c8777-e826-4810-a625-3e394cc3660d',
+      },
+    },
+    'thumbnail': {},
+    'item': {},
+    'accessStatus': {},
+    'ldnService': 'NOTIFY inbox - Automatic service',
+    'relatedItem': 'test coar demo',
+    'message': '{"@context":["https://www.w3.org/ns/activitystreams","https://purl.org/coar/notify"],"id":"urn:uuid:668f26e0-2e8d-4118-b0d2-ee713523bc45","type":["Reject","coar-notify:IngestAction"],"actor":{"id":"https://generic-service.com","type":["Service"],"name":"Generic Service"},"context":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Document"],"ietf:cite-as":"https://doi.org/10.4598/12123488"},"object":{"id":"https://dspace-coar.4science.cloud/handle/123456789/28","type":["Offer"]},"origin":{"id":"https://generic-service.com/system","type":["Service"],"inbox":"https://notify-inbox.info/inbox7"},"target":{"id":"https://some-organisation.org","type":["Organization"],"inbox":"https://dspace-coar.4science.cloud/server/ldn/inbox"},"inReplyTo":"urn:uuid:d9b4010a-f128-4815-abb2-83707a2ee9cf"}',
+  },
+] as unknown as AdminNotifyMessage[];
+describe('AdminNotifySearchResultComponent', () => {
+  let component: AdminNotifySearchResultComponent;
+  let fixture: ComponentFixture<AdminNotifySearchResultComponent>;
+  let objectCache: ObjectCacheService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let rdbService: RemoteDataBuildService;
+  let adminNotifyMessageService: AdminNotifyMessagesService;
+  let searchConfigService: SearchConfigurationService;
+  let modalService: NgbModal;
+  const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
+  const testObject = {
+    uuid: 'test-property',
+    name: 'test-property',
+    values: ['value-1', 'value-2'],
+  } as ConfigurationProperty;
+
+  beforeEach(async () => {
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: '' }),
+    });
+    adminNotifyMessageService = jasmine.createSpyObj('adminNotifyMessageService', {
+      getDetailedMessages: of(mockAdminNotifyMessages),
+      reprocessMessage: of(mockAdminNotifyMessages),
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('a', {
+        a: {
+          payload: testObject,
+        },
+      }),
+    });
+
+    searchConfigService = jasmine.createSpyObj('searchConfigService', {
+      getCurrentConfiguration: of('NOTIFY.outgoing'),
+    });
+    objectCache = {} as ObjectCacheService;
+
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ AdminNotifySearchResultComponent, AdminNotifyDetailModalComponent ],
+      providers: [
+        { provide: AdminNotifyMessagesService, useValue: adminNotifyMessageService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: ActivatedRoute, useValue: new RouterStub() },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: searchConfigService },
+        DatePipe,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(AdminNotifySearchResultComponent);
+    component = fixture.componentInstance;
+    component.searchConfigService = searchConfigService;
+    modalService = (component as any).modalService;
+    spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ response: observableOf(true) }) }));
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+    expect(component.isInbound).toBeFalsy();
+  });
+
+  it('should open modal', () => {
+    component.openDetailModal(mockAdminNotifyMessages[0]);
+    expect(modalService.open).toHaveBeenCalledWith(AdminNotifyDetailModalComponent);
+  });
+
+  it('should map messages', (done) => {
+    component.messagesSubject$.subscribe((messages) => {
+      expect(messages).toEqual(mockAdminNotifyMessages);
+      done();
+    });
+  });
+
+  it('should reprocess message', (done) => {
+    component.reprocessMessage(mockAdminNotifyMessages[0]);
+    component.messagesSubject$.subscribe((messages) => {
+      expect(messages).toEqual(mockAdminNotifyMessages);
+      done();
+    });
+  });
+
+  it('should unsubscribe on destroy', () => {
+    (component as any).subs = [of(null).subscribe()];
+
+    spyOn((component as any).subs[0], 'unsubscribe');
+    component.ngOnDestroy();
+    expect((component as any).subs[0].unsubscribe).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
new file mode 100644
index 0000000000..a9a329d0b5
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.ts
@@ -0,0 +1,162 @@
+import { DatePipe } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { Context } from '../../../core/shared/context.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { tabulatableObjectsComponent } from '../../../shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator';
+import { TabulatableResultListElementsComponent } from '../../../shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { AdminNotifyDetailModalComponent } from '../admin-notify-detail-modal/admin-notify-detail-modal.component';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifySearchResult } from '../models/admin-notify-message-search-result.model';
+import { AdminNotifyMessagesService } from '../services/admin-notify-messages.service';
+
+@tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
+@Component({
+  selector: 'ds-admin-notify-search-result',
+  templateUrl: './admin-notify-search-result.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+/**
+ * Component for visualization in table format of the search results related to the AdminNotifyDashboardComponent
+ */
+
+
+export class AdminNotifySearchResultComponent extends TabulatableResultListElementsComponent<PaginatedList<AdminNotifySearchResult>, AdminNotifySearchResult> implements OnInit, OnDestroy{
+  public messagesSubject$: BehaviorSubject<AdminNotifyMessage[]> = new BehaviorSubject([]);
+  public reprocessStatus = 'QUEUE_STATUS_QUEUED_FOR_RETRY';
+  //we check on one type of config to render specific table headers
+  public isInbound: boolean;
+
+  /**
+   * Statuses for which we display the reprocess button
+   */
+  public validStatusesForReprocess = [
+    'QUEUE_STATUS_UNTRUSTED',
+    'QUEUE_STATUS_UNTRUSTED_IP',
+    'QUEUE_STATUS_FAILED',
+    'QUEUE_STATUS_UNMAPPED_ACTION',
+  ];
+
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  private subs: Subscription[] = [];
+
+  /**
+   * Keys to be formatted as date
+   * @private
+   */
+
+  private dateTypeKeys: string[] = ['queueLastStartTime', 'queueTimeout'];
+
+  /**
+   * Keys to be not shown in detail
+   * @private
+   */
+  private messageKeys: string[] = [
+    'type',
+    'id',
+    'coarNotifyType',
+    'activityStreamType',
+    'inReplyTo',
+    'queueAttempts',
+    'queueLastStartTime',
+    'queueStatusLabel',
+    'queueTimeout',
+  ];
+
+  /**
+   * The format for the date values
+   * @private
+   */
+  private dateFormat = 'YYYY/MM/d hh:mm:ss';
+
+  constructor(private modalService: NgbModal,
+                private adminNotifyMessagesService: AdminNotifyMessagesService,
+                private datePipe: DatePipe,
+                @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+    super();
+  }
+
+  /**
+   * Map messages on init for readable representation
+   */
+  ngOnInit() {
+    this.mapDetailsToMessages();
+    this.subs.push(this.searchConfigService.getCurrentConfiguration('')
+      .subscribe(configuration => {
+        this.isInbound = configuration.startsWith('NOTIFY.incoming');
+      }),
+    );
+  }
+
+  ngOnDestroy() {
+    this.subs.forEach(sub => sub.unsubscribe());
+  }
+
+  /**
+   * Open modal for details visualization
+   * @param notifyMessage the message to be displayed
+   */
+  openDetailModal(notifyMessage: AdminNotifyMessage) {
+    const modalRef = this.modalService.open(AdminNotifyDetailModalComponent);
+    const messageToOpen = { ...notifyMessage };
+
+    this.messageKeys.forEach(key => {
+      if (this.dateTypeKeys.includes(key)) {
+        messageToOpen[key] = this.datePipe.transform(messageToOpen[key], this.dateFormat);
+      }
+    });
+    // format COAR message for technical visualization
+    messageToOpen.message = JSON.stringify(JSON.parse(notifyMessage.message), null, 2);
+
+    modalRef.componentInstance.notifyMessage = messageToOpen;
+    modalRef.componentInstance.notifyMessageKeys = this.messageKeys;
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message the message to be reprocessed
+   */
+  reprocessMessage(message: AdminNotifyMessage) {
+    this.subs.push(
+      this.adminNotifyMessagesService.reprocessMessage(message, this.messagesSubject$)
+        .subscribe(response => {
+          this.messagesSubject$.next(response);
+        },
+        ),
+    );
+  }
+
+
+  /**
+   * Map readable results to messages
+   * @private
+   */
+  private mapDetailsToMessages() {
+    this.subs.push(this.adminNotifyMessagesService.getDetailedMessages(this.objects?.page.map(pageResult => pageResult.indexableObject))
+      .subscribe(response => {
+        this.messagesSubject$.next(response);
+      }));
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
new file mode 100644
index 0000000000..5115118993
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message-search-result.model.ts
@@ -0,0 +1,7 @@
+import { SearchResult } from '../../../shared/search/models/search-result.model';
+import { searchResultFor } from '../../../shared/search/search-result-element-decorator';
+import { AdminNotifyMessage } from './admin-notify-message.model';
+
+@searchResultFor(AdminNotifyMessage)
+export class AdminNotifySearchResult extends SearchResult<AdminNotifyMessage> {
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
new file mode 100644
index 0000000000..f32451eaff
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.model.ts
@@ -0,0 +1,171 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { ADMIN_NOTIFY_MESSAGE } from './admin-notify-message.resource-type';
+
+/**
+ * A message that includes admin notify info
+ */
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class AdminNotifyMessage extends DSpaceObject {
+  static type = ADMIN_NOTIFY_MESSAGE;
+
+  /**
+   * The type of the resource
+   */
+  @excludeFromEquals
+    type = ADMIN_NOTIFY_MESSAGE;
+
+  /**
+   * The id of the message
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The id of the notification
+   */
+  @autoserialize
+    notificationId: string;
+
+  /**
+   * The type of the notification
+   */
+  @autoserialize
+    notificationType: string;
+
+  /**
+   * The type of the notification
+   */
+  @autoserialize
+    coarNotifyType: string;
+
+  /**
+   * The type of the activity
+   */
+  @autoserialize
+    activityStreamType: string;
+
+  /**
+   * The object the message reply to
+   */
+  @autoserialize
+    inReplyTo: string;
+
+  /**
+   * The object the message relates to
+   */
+  @autoserialize
+    object: string;
+
+  /**
+   * The name of the related item
+   */
+  @autoserialize
+    relatedItem: string;
+
+  /**
+   * The name of the related ldn service
+   */
+  @autoserialize
+    ldnService: string;
+
+  /**
+   * The context of the message
+   */
+  @autoserialize
+    context: string;
+
+  /**
+   * The related COAR message
+   */
+  @autoserialize
+    message: string;
+
+  /**
+   * The attempts of the queue
+   */
+  @autoserialize
+    queueAttempts: number;
+
+  /**
+   * Timestamp of the last queue attempt
+   */
+  @autoserialize
+    queueLastStartTime: string;
+
+  /**
+   * The type of the activity stream
+   */
+  @autoserialize
+    origin: number | string;
+
+  /**
+   * The type of the activity stream
+   */
+  @autoserialize
+    target: number | string;
+
+  /**
+   * The label for the status of the queue
+   */
+  @autoserialize
+    queueStatusLabel: string;
+
+  /**
+   * The timeout of the queue
+   */
+  @autoserialize
+    queueTimeout: string;
+
+  /**
+   * The status of the queue
+   */
+  @autoserialize
+    queueStatus: number;
+
+  /**
+   * Thumbnail link used when browsing items with showThumbs config enabled.
+   */
+  @autoserialize
+    thumbnail: string;
+
+  /**
+   * The observable pointing to the item itself
+   */
+  @autoserialize
+    item: Observable<AdminNotifyMessage>;
+
+  /**
+   * The observable pointing to the access status of the item
+   */
+  @autoserialize
+    accessStatus: Observable<AdminNotifyMessage>;
+
+
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+
+  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+    return [this.constructor as GenericConstructor<ListableObject>];
+  }
+}
diff --git a/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
new file mode 100644
index 0000000000..994146adb3
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/models/admin-notify-message.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../core/shared/resource-type';
+
+/**
+ * The resource type for AdminNotifyMessage
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const ADMIN_NOTIFY_MESSAGE = new ResourceType('message');
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
new file mode 100644
index 0000000000..6178b20133
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.spec.ts
@@ -0,0 +1,117 @@
+import { deepClone } from 'fast-json-patch';
+import { cold } from 'jasmine-marbles';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { mockAdminNotifyMessages } from '../admin-notify-search-result/admin-notify-search-result.component.spec';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { AdminNotifyMessagesService } from './admin-notify-messages.service';
+
+describe('AdminNotifyMessagesService test', () => {
+  let service: AdminNotifyMessagesService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let ldnServicesService: LdnServicesService;
+  let itemDataService: ItemDataService;
+  let responseCacheEntry: RequestEntry;
+  let mockMessages: AdminNotifyMessage[];
+
+  const endpointURL = `https://rest.api/rest/api/ldn/messages`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+  const testLdnServiceName = 'testLdnService';
+  const testRelatedItemName = 'testRelatedItem';
+
+  function initTestService() {
+    return new AdminNotifyMessagesService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      ldnServicesService,
+      itemDataService,
+    );
+  }
+
+  beforeEach(() => {
+    mockMessages = deepClone(mockAdminNotifyMessages);
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: endpointURL } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+      buildFromRequestUUID: createSuccessfulRemoteDataObject$(mockMessages),
+    });
+
+    ldnServicesService = jasmine.createSpyObj('ldnServicesService', {
+      findById: createSuccessfulRemoteDataObject$({ name: testLdnServiceName }),
+    });
+
+    itemDataService = jasmine.createSpyObj('itemDataService', {
+      findById: createSuccessfulRemoteDataObject$({ name: testRelatedItemName }),
+    });
+
+    service = initTestService();
+  });
+
+  describe('Admin Notify service', () => {
+    it('should be defined', () => {
+      expect(service).toBeDefined();
+    });
+
+    it('should get details for messages', (done) => {
+      service.getDetailedMessages(mockMessages).pipe(take(1)).subscribe((detailedMessages) => {
+        expect(detailedMessages[0].ldnService).toEqual(testLdnServiceName);
+        expect(detailedMessages[0].relatedItem).toEqual(testRelatedItemName);
+        done();
+      });
+    });
+
+    it('should reprocess message', (done) => {
+      const behaviorSubject = new BehaviorSubject(mockMessages);
+      service.reprocessMessage(mockMessages[0], behaviorSubject).pipe(take(1)).subscribe((reprocessedMessages) => {
+        expect(reprocessedMessages.length).toEqual(2);
+        expect(reprocessedMessages).toEqual(mockMessages);
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
new file mode 100644
index 0000000000..04f26c29af
--- /dev/null
+++ b/src/app/admin/admin-notify-dashboard/services/admin-notify-messages.service.ts
@@ -0,0 +1,115 @@
+import { Injectable } from '@angular/core';
+import {
+  BehaviorSubject,
+  from,
+  Observable,
+  of,
+  scan,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { PostRequest } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+} from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { LdnServicesService } from '../../admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { AdminNotifyMessage } from '../models/admin-notify-message.model';
+import { ADMIN_NOTIFY_MESSAGE } from '../models/admin-notify-message.resource-type';
+
+/**
+ * Injectable service responsible for fetching/sending data from/to the REST API on the messages endpoint.
+ *
+ * @export
+ * @class AdminNotifyMessagesService
+ * @extends {IdentifiableDataService<AdminNotifyMessage>}
+ */
+@Injectable()
+@dataService(ADMIN_NOTIFY_MESSAGE)
+export class AdminNotifyMessagesService extends IdentifiableDataService<AdminNotifyMessage> {
+
+  protected reprocessEndpoint = 'enqueueretry';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    private ldnServicesService: LdnServicesService,
+    private itemDataService: ItemDataService,
+  ) {
+    super('messages', requestService, rdbService, objectCache, halService);
+  }
+
+
+  /**
+   * Add detailed information to each message
+   * @param messages the messages to which add detailded info
+   */
+  public getDetailedMessages(messages: AdminNotifyMessage[]): Observable<AdminNotifyMessage[]> {
+    return from(messages).pipe(
+      mergeMap(message =>
+        message.target || message.origin ? this.ldnServicesService.findById((message.target || message.origin).toString()).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({ ...message, ldnService: detail.name })),
+        ) : of(message),
+      ),
+      mergeMap(message =>
+        message.object || message.context  ? this.itemDataService.findById(message.object || message.context).pipe(
+          getAllSucceededRemoteDataPayload(),
+          map(detail => ({ ...message, relatedItem: detail.name })),
+        ) : of(message),
+      ),
+      scan((acc: any, value: any) => [...acc, value], []),
+    );
+  }
+
+  /**
+   * Reprocess message in status QUEUE_STATUS_QUEUED_FOR_RETRY and update results
+   * @param message the message to reprocess
+   * @param messageSubject the current visualised messages source
+   */
+  public reprocessMessage(message: AdminNotifyMessage, messageSubject: BehaviorSubject<AdminNotifyMessage[]>): Observable<AdminNotifyMessage[]> {
+    const requestId = this.requestService.generateRequestId();
+
+    return this.halService.getEndpoint(this.reprocessEndpoint).pipe(
+      map(endpoint => endpoint.replace('{id}', message.id)),
+      map((endpointURL: string) => new PostRequest(requestId, endpointURL)),
+      tap(request => this.requestService.send(request)),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<AdminNotifyMessage>(request.uuid)),
+      getFirstCompletedRemoteData(),
+      getAllSucceededRemoteDataPayload(),
+      mergeMap(reprocessedMessage => this.getDetailedMessages([reprocessedMessage])),
+    ).pipe(
+      mergeMap((newMessages) =>  messageSubject.pipe(
+        map(messages => {
+          const detailedReprocessedMessage = newMessages[0];
+          const messageToUpdate = messages.find(currentMessage => currentMessage.id === message.id);
+          const indexOfMessageToUpdate = messages.indexOf(messageToUpdate);
+          detailedReprocessedMessage.target = message.target;
+          detailedReprocessedMessage.object = message.object;
+          detailedReprocessedMessage.origin = message.origin;
+          detailedReprocessedMessage.context = message.context;
+          messages[indexOfMessageToUpdate] = detailedReprocessedMessage;
+
+          return messages;
+        }),
+      )),
+    );
+  }
+}
diff --git a/src/app/admin/admin-registries/admin-registries-routing.module.ts b/src/app/admin/admin-registries/admin-registries-routing.module.ts
index 49a76708cc..3134d3285e 100644
--- a/src/app/admin/admin-registries/admin-registries-routing.module.ts
+++ b/src/app/admin/admin-registries/admin-registries-routing.module.ts
@@ -1,9 +1,10 @@
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
+import { RouterModule } from '@angular/router';
+
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
+import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
+import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 
 @NgModule({
   imports: [
@@ -11,29 +12,29 @@ import { BITSTREAMFORMATS_MODULE_PATH } from './admin-registries-routing-paths';
       {
         path: 'metadata',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
-        data: {title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata'},
+        data: { title: 'admin.registries.metadata.title', breadcrumbKey: 'admin.registries.metadata' },
         children: [
           {
             path: '',
-            component: MetadataRegistryComponent
+            component: MetadataRegistryComponent,
           },
           {
             path: ':schemaName',
             resolve: { breadcrumb: I18nBreadcrumbResolver },
             component: MetadataSchemaComponent,
-            data: {title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema'}
-          }
-        ]
+            data: { title: 'admin.registries.schema.title', breadcrumbKey: 'admin.registries.schema' },
+          },
+        ],
       },
       {
         path: BITSTREAMFORMATS_MODULE_PATH,
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         loadChildren: () => import('./bitstream-formats/bitstream-formats.module')
           .then((m) => m.BitstreamFormatsModule),
-        data: {title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats'}
+        data: { title: 'admin.registries.bitstream-formats.title', breadcrumbKey: 'admin.registries.bitstream-formats' },
       },
-    ])
-  ]
+    ]),
+  ],
 })
 export class AdminRegistriesRoutingModule {
 
diff --git a/src/app/admin/admin-registries/admin-registries.module.ts b/src/app/admin/admin-registries/admin-registries.module.ts
index 65f7b61419..42432a90ed 100644
--- a/src/app/admin/admin-registries/admin-registries.module.ts
+++ b/src/app/admin/admin-registries/admin-registries.module.ts
@@ -1,14 +1,15 @@
-import { NgModule } from '@angular/core';
-import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
-import { AdminRegistriesRoutingModule } from './admin-registries-routing.module';
 import { CommonModule } from '@angular/common';
-import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { FormModule } from '../../shared/form/form.module';
 import { SharedModule } from '../../shared/shared.module';
+import { AdminRegistriesRoutingModule } from './admin-registries-routing.module';
+import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
+import { MetadataRegistryComponent } from './metadata-registry/metadata-registry.component';
 import { MetadataSchemaFormComponent } from './metadata-registry/metadata-schema-form/metadata-schema-form.component';
 import { MetadataFieldFormComponent } from './metadata-schema/metadata-field-form/metadata-field-form.component';
-import { BitstreamFormatsModule } from './bitstream-formats/bitstream-formats.module';
-import { FormModule } from '../../shared/form/form.module';
+import { MetadataSchemaComponent } from './metadata-schema/metadata-schema.component';
 
 @NgModule({
   imports: [
@@ -17,14 +18,14 @@ import { FormModule } from '../../shared/form/form.module';
     RouterModule,
     BitstreamFormatsModule,
     AdminRegistriesRoutingModule,
-    FormModule
+    FormModule,
   ],
   declarations: [
     MetadataRegistryComponent,
     MetadataSchemaComponent,
     MetadataSchemaFormComponent,
-    MetadataFieldFormComponent
-  ]
+    MetadataFieldFormComponent,
+  ],
 })
 export class AdminRegistriesModule {
 
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/add-bitstream-format/add-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
index 6787350d86..72d2795170 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.spec.ts
@@ -1,19 +1,27 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { RouterStub } from '../../../../shared/testing/router.stub';
 import { AddBitstreamFormatComponent } from './add-bitstream-format.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 
 describe('AddBitstreamFormatComponent', () => {
   let comp: AddBitstreamFormatComponent;
@@ -38,7 +46,7 @@ describe('AddBitstreamFormatComponent', () => {
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
       createBitstreamFormat: createSuccessfulRemoteDataObject$({}),
-      clearBitStreamFormatRequests: observableOf(null)
+      clearBitStreamFormatRequests: observableOf(null),
     });
 
     TestBed.configureTestingModule({
@@ -49,7 +57,7 @@ describe('AddBitstreamFormatComponent', () => {
         { provide: NotificationsService, useValue: notificationService },
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   };
 
@@ -78,7 +86,7 @@ describe('AddBitstreamFormatComponent', () => {
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
         createBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
-        clearBitStreamFormatRequests: observableOf(null)
+        clearBitStreamFormatRequests: observableOf(null),
       });
 
       TestBed.configureTestingModule({
@@ -89,7 +97,7 @@ describe('AddBitstreamFormatComponent', () => {
           { provide: NotificationsService, useValue: notificationService },
           { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
         ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA]
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
       }).compileComponents();
     }));
     beforeEach(initBeforeEach);
diff --git a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
index 132343dcf0..4dc43480c0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/add-bitstream-format/add-bitstream-format.component.ts
@@ -1,12 +1,13 @@
-import { Router } from '@angular/router';
 import { Component } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
+
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * This component renders the page to create a new bitstream format.
@@ -35,16 +36,16 @@ export class AddBitstreamFormatComponent {
     this.bitstreamFormatDataService.createBitstreamFormat(bitstreamFormat).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((response: RemoteData<BitstreamFormat>) => {
-        if (response.hasSucceeded) {
-          this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
-            this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
-          this.router.navigate([getBitstreamFormatsModuleRoute()]);
-          this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
-        } else {
-          this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),
-            this.translateService.get('admin.registries.bitstream-formats.create.failure.content'));
-        }
+      if (response.hasSucceeded) {
+        this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.create.success.head'),
+          this.translateService.get('admin.registries.bitstream-formats.create.success.content'));
+        this.router.navigate([getBitstreamFormatsModuleRoute()]);
+        this.bitstreamFormatDataService.clearBitStreamFormatRequests().subscribe();
+      } else {
+        this.notificationService.error(this.translateService.get('admin.registries.bitstream-formats.create.failure.head'),
+          this.translateService.get('admin.registries.bitstream-formats.create.failure.content'));
       }
+    },
     );
   }
 }
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
index c5bebb292b..874274af8b 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.actions.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
-import { type } from '../../../shared/ngrx/type';
+
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { type } from '../../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple
@@ -15,7 +16,7 @@ export const BitstreamFormatsRegistryActionTypes = {
 
   SELECT_FORMAT: type('dspace/bitstream-formats-registry/SELECT_FORMAT'),
   DESELECT_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_FORMAT'),
-  DESELECT_ALL_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_ALL_FORMAT')
+  DESELECT_ALL_FORMAT: type('dspace/bitstream-formats-registry/DESELECT_ALL_FORMAT'),
 };
 
 /**
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
index 76576afc7a..09c867bc72 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.spec.ts
@@ -1,11 +1,15 @@
 import { Action } from '@ngrx/store';
+
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
-import { bitstreamFormatReducer, BitstreamFormatRegistryState } from './bitstream-format.reducers';
 import {
   BitstreamFormatsRegistryDeselectAction,
   BitstreamFormatsRegistryDeselectAllAction,
-  BitstreamFormatsRegistrySelectAction
+  BitstreamFormatsRegistrySelectAction,
 } from './bitstream-format.actions';
+import {
+  bitstreamFormatReducer,
+  BitstreamFormatRegistryState,
+} from './bitstream-format.reducers';
 
 const bitstreamFormat1: BitstreamFormat = new BitstreamFormat();
 bitstreamFormat1.id = 'test-uuid-1';
@@ -16,15 +20,15 @@ bitstreamFormat2.id = 'test-uuid-2';
 bitstreamFormat2.shortDescription = 'test-short-2';
 
 const initialState: BitstreamFormatRegistryState = {
-  selectedBitstreamFormats: []
+  selectedBitstreamFormats: [],
 };
 
 const bitstream1SelectedState: BitstreamFormatRegistryState = {
-  selectedBitstreamFormats: [bitstreamFormat1]
+  selectedBitstreamFormats: [bitstreamFormat1],
 };
 
 const bitstream1and2SelectedState: BitstreamFormatRegistryState = {
-  selectedBitstreamFormats: [bitstreamFormat1, bitstreamFormat2]
+  selectedBitstreamFormats: [bitstreamFormat1, bitstreamFormat2],
 };
 
 describe('BitstreamFormatReducer', () => {
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
index 41880bf16c..40642a5fdb 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-format.reducers.ts
@@ -3,7 +3,7 @@ import {
   BitstreamFormatsRegistryAction,
   BitstreamFormatsRegistryActionTypes,
   BitstreamFormatsRegistryDeselectAction,
-  BitstreamFormatsRegistrySelectAction
+  BitstreamFormatsRegistrySelectAction,
 } from './bitstream-format.actions';
 
 /**
@@ -32,21 +32,21 @@ export function bitstreamFormatReducer(state = initialState, action: BitstreamFo
 
     case BitstreamFormatsRegistryActionTypes.SELECT_FORMAT: {
       return Object.assign({}, state, {
-        selectedBitstreamFormats: [...state.selectedBitstreamFormats, (action as BitstreamFormatsRegistrySelectAction).bitstreamFormat]
+        selectedBitstreamFormats: [...state.selectedBitstreamFormats, (action as BitstreamFormatsRegistrySelectAction).bitstreamFormat],
       });
     }
 
     case BitstreamFormatsRegistryActionTypes.DESELECT_FORMAT: {
       return Object.assign({}, state, {
         selectedBitstreamFormats: state.selectedBitstreamFormats.filter(
-          (selectedBitstreamFormats) => selectedBitstreamFormats !== (action as BitstreamFormatsRegistryDeselectAction).bitstreamFormat
-        )
+          (selectedBitstreamFormats) => selectedBitstreamFormats !== (action as BitstreamFormatsRegistryDeselectAction).bitstreamFormat,
+        ),
       });
     }
 
     case BitstreamFormatsRegistryActionTypes.DESELECT_ALL_FORMAT: {
       return Object.assign({}, state, {
-        selectedBitstreamFormats: []
+        selectedBitstreamFormats: [],
       });
     }
     default:
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
index 2f08f8257c..e4a2a36f26 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats-routing.module.ts
@@ -1,10 +1,11 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
 import { BitstreamFormatsResolver } from './bitstream-formats.resolver';
 import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
-import { I18nBreadcrumbResolver } from '../../../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 const BITSTREAMFORMAT_EDIT_PATH = ':id/edit';
 const BITSTREAMFORMAT_ADD_PATH = 'add';
@@ -14,28 +15,28 @@ const BITSTREAMFORMAT_ADD_PATH = 'add';
     RouterModule.forChild([
       {
         path: '',
-        component: BitstreamFormatsComponent
+        component: BitstreamFormatsComponent,
       },
       {
         path: BITSTREAMFORMAT_ADD_PATH,
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AddBitstreamFormatComponent,
-        data: {breadcrumbKey: 'admin.registries.bitstream-formats.create'}
+        data: { breadcrumbKey: 'admin.registries.bitstream-formats.create' },
       },
       {
         path: BITSTREAMFORMAT_EDIT_PATH,
         component: EditBitstreamFormatComponent,
         resolve: {
           bitstreamFormat: BitstreamFormatsResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
-        data: {breadcrumbKey: 'admin.registries.bitstream-formats.edit'}
+        data: { breadcrumbKey: 'admin.registries.bitstream-formats.edit' },
       },
-    ])
+    ]),
   ],
   providers: [
     BitstreamFormatsResolver,
-  ]
+  ],
 })
 export class BitstreamFormatsRoutingModule {
 
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 6569b2d4c8..b61d7ea525 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,7 +2,7 @@
   <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>
@@ -13,37 +13,41 @@
         [paginationOptions]="pageConfig"
         [pageInfoState]="(bitstreamFormats | async)?.payload"
         [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
-        [hideGear]="true"
+        [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">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
-                <th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
-                <th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
-              </tr>
+            <tr>
+              <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>
+              <th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
+            </tr>
             </thead>
             <tbody>
-              <tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
-                <td>
-                  <label>
-                    <input type="checkbox"
-                           [checked]="isSelected(bitstreamFormat) | async"
-                           (change)="selectBitStreamFormat(bitstreamFormat, $event)"
-                    >
-                  </label>
-                </td>
-                <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
-                <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} <span *ngIf="bitstreamFormat.internal">({{'admin.registries.bitstream-formats.table.internal' | translate}})</span></a></td>
-                <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
-              </tr>
+            <tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
+              <td>
+                <label class="mb-0">
+                  <input type="checkbox"
+                         [attr.aria-label]="'admin.registries.bitstream-formats.select' | translate"
+                         [checked]="isSelected(bitstreamFormat) | async"
+                         (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>
+              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
+              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} <span *ngIf="bitstreamFormat.internal">({{'admin.registries.bitstream-formats.table.internal' | translate}})</span></a></td>
+              <td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
+            </tr>
             </tbody>
           </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>
 
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 222804ca28..b63a6213eb 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
@@ -1,31 +1,40 @@
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
 import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 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 { HostWindowService } from '../../../shared/host-window.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
 import {
+  createFailedRemoteDataObject$,
   createNoContentRemoteDataObject$,
   createSuccessfulRemoteDataObject,
   createSuccessfulRemoteDataObject$,
-  createFailedRemoteDataObject$
 } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
 
 describe('BitstreamFormatsComponent', () => {
   let comp: BitstreamFormatsComponent;
@@ -79,7 +88,7 @@ describe('BitstreamFormatsComponent', () => {
     bitstreamFormat1,
     bitstreamFormat2,
     bitstreamFormat3,
-    bitstreamFormat4
+    bitstreamFormat4,
   ];
   const mockFormatsRD = createSuccessfulRemoteDataObject(createPaginatedList(mockFormatsList));
 
@@ -96,7 +105,7 @@ describe('BitstreamFormatsComponent', () => {
       deselectBitstreamFormat: {},
       deselectAllBitstreamFormats: {},
       delete: createSuccessfulRemoteDataObject$({}),
-      clearBitStreamFormatRequests: observableOf('cleared')
+      clearBitStreamFormatRequests: observableOf('cleared'),
     });
 
     paginationService = new PaginationServiceStub();
@@ -108,8 +117,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 },
+      ],
     }).compileComponents();
   };
 
@@ -129,16 +138,19 @@ describe('BitstreamFormatsComponent', () => {
     });
 
     it('should contain the correct formats', () => {
-      const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(2)')).nativeElement;
+      const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(3)')).nativeElement;
       expect(unknownName.textContent).toBe('Unknown');
 
-      const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(2)')).nativeElement;
+      const UUID: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(2)')).nativeElement;
+      expect(UUID.textContent).toBe('test-uuid-1');
+
+      const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(3)')).nativeElement;
       expect(licenseName.textContent).toBe('License');
 
-      const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(2)')).nativeElement;
+      const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(3)')).nativeElement;
       expect(ccLicenseName.textContent).toBe('CC License');
 
-      const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(2)')).nativeElement;
+      const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(3)')).nativeElement;
       expect(adobeName.textContent).toBe('Adobe PDF');
     });
   });
@@ -209,34 +221,34 @@ describe('BitstreamFormatsComponent', () => {
 
   describe('deleteFormats success', () => {
     beforeEach(waitForAsync(() => {
-        notificationsServiceStub = new NotificationsServiceStub();
+      notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
+      scheduler = getTestScheduler();
 
-        bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-          findAll: observableOf(mockFormatsRD),
-          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
-          getSelectedBitstreamFormats: observableOf(mockFormatsList),
-          selectBitstreamFormat: {},
-          deselectBitstreamFormat: {},
-          deselectAllBitstreamFormats: {},
-          delete: createNoContentRemoteDataObject$(),
-          clearBitStreamFormatRequests: observableOf('cleared')
-        });
+      bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+        findAll: observableOf(mockFormatsRD),
+        find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
+        getSelectedBitstreamFormats: observableOf(mockFormatsList),
+        selectBitstreamFormat: {},
+        deselectBitstreamFormat: {},
+        deselectAllBitstreamFormats: {},
+        delete: createNoContentRemoteDataObject$(),
+        clearBitStreamFormatRequests: observableOf('cleared'),
+      });
 
       paginationService = new PaginationServiceStub();
 
       TestBed.configureTestingModule({
-          imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-          declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
-          providers: [
-            { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
-            { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-            { provide: NotificationsService, useValue: notificationsServiceStub },
-            { provide: PaginationService, useValue: paginationService }
-          ]
-        }).compileComponents();
-      }
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+        declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+        providers: [
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+          { provide: NotificationsService, useValue: notificationsServiceStub },
+          { provide: PaginationService, useValue: paginationService },
+        ],
+      }).compileComponents();
+    },
     ));
 
     beforeEach(initBeforeEach);
@@ -258,34 +270,34 @@ describe('BitstreamFormatsComponent', () => {
 
   describe('deleteFormats error', () => {
     beforeEach(waitForAsync(() => {
-        notificationsServiceStub = new NotificationsServiceStub();
+      notificationsServiceStub = new NotificationsServiceStub();
 
-        scheduler = getTestScheduler();
+      scheduler = getTestScheduler();
 
-        bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-          findAll: observableOf(mockFormatsRD),
-          find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
-          getSelectedBitstreamFormats: observableOf(mockFormatsList),
-          selectBitstreamFormat: {},
-          deselectBitstreamFormat: {},
-          deselectAllBitstreamFormats: {},
-          delete: createFailedRemoteDataObject$(),
-          clearBitStreamFormatRequests: observableOf('cleared')
-        });
+      bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
+        findAll: observableOf(mockFormatsRD),
+        find: createSuccessfulRemoteDataObject$(mockFormatsList[0]),
+        getSelectedBitstreamFormats: observableOf(mockFormatsList),
+        selectBitstreamFormat: {},
+        deselectBitstreamFormat: {},
+        deselectAllBitstreamFormats: {},
+        delete: createFailedRemoteDataObject$(),
+        clearBitStreamFormatRequests: observableOf('cleared'),
+      });
 
       paginationService = new PaginationServiceStub();
 
       TestBed.configureTestingModule({
-          imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-          declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
-          providers: [
-            { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
-            { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-            { provide: NotificationsService, useValue: notificationsServiceStub },
-            { provide: PaginationService, useValue: paginationService }
-          ]
-        }).compileComponents();
-      }
+        imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+        declarations: [BitstreamFormatsComponent, PaginationComponent, EnumKeysPipe],
+        providers: [
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+          { provide: NotificationsService, useValue: notificationsServiceStub },
+          { provide: PaginationService, useValue: paginationService },
+        ],
+      }).compileComponents();
+    },
     ));
 
     beforeEach(initBeforeEach);
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 3e2f3ce8fc..522f466735 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,26 +1,39 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, zip } 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 { 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 { hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 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';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+
+import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 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 { PaginationService } from '../../../core/pagination/pagination.service';
+import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 /**
  * This component renders a list of bitstream formats
  */
 @Component({
   selector: 'ds-bitstream-formats',
-  templateUrl: './bitstream-formats.component.html'
+  templateUrl: './bitstream-formats.component.html',
 })
 export class BitstreamFormatsComponent implements OnInit, OnDestroy {
 
@@ -29,21 +42,14 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
    */
   bitstreamFormats: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
 
-  /**
-   * The current pagination configuration for the page used by the FindAll method
-   * Currently simply renders all bitstream formats
-   */
-  config: FindListOptions = Object.assign(new FindListOptions(), {
-    elementsPerPage: 20
-  });
-
   /**
    * The current pagination configuration for the page
    * Currently simply renders all bitstream formats
    */
   pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'rbp',
-    pageSize: 20
+    pageSize: 20,
+    pageSizeOptions: [20, 40, 60, 80, 100],
   });
 
   constructor(private notificationsService: NotificationsService,
@@ -51,7 +57,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
               private translateService: TranslateService,
               private bitstreamFormatService: BitstreamFormatDataService,
               private paginationService: PaginationService,
-              ) {
+  ) {
   }
 
 
@@ -72,7 +78,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
         map((response: RemoteData<NoContent>) => response.hasSucceeded),
       )),
       // wait for all responses to come in and return them as a single array
-      toArray()
+      toArray(),
     ).subscribe((results: boolean[]) => {
       // Count the number of succeeded and failed deletions
       const successResponses = results.filter((result: boolean) => result);
@@ -109,7 +115,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
     return this.bitstreamFormatService.getSelectedBitstreamFormats().pipe(
       map((bitstreamFormats: BitstreamFormat[]) => {
         return bitstreamFormats.find((selectedFormat) => selectedFormat.id === bitstreamFormat.id) != null;
-      })
+      }),
     );
   }
 
@@ -135,7 +141,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
 
     const messages = observableCombineLatest(
       this.translateService.get(`${prefix}.${suffix}.head`),
-      this.translateService.get(`${prefix}.${suffix}.amount`, {amount: amount})
+      this.translateService.get(`${prefix}.${suffix}.amount`, { amount: amount }),
     );
     messages.subscribe(([head, content]) => {
 
@@ -149,10 +155,10 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
 
-    this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
+    this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
       switchMap((findListOptions: FindListOptions) => {
         return this.bitstreamFormatService.findAll(findListOptions);
-      })
+      }),
     );
   }
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
index afbe35a1f6..4c8b3284b0 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.module.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { BitstreamFormatsComponent } from './bitstream-formats.component';
-import { SharedModule } from '../../../shared/shared.module';
-import { FormatFormComponent } from './format-form/format-form.component';
-import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
-import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
-import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+
 import { FormModule } from '../../../shared/form/form.module';
+import { SharedModule } from '../../../shared/shared.module';
+import { AddBitstreamFormatComponent } from './add-bitstream-format/add-bitstream-format.component';
+import { BitstreamFormatsComponent } from './bitstream-formats.component';
+import { BitstreamFormatsRoutingModule } from './bitstream-formats-routing.module';
+import { EditBitstreamFormatComponent } from './edit-bitstream-format/edit-bitstream-format.component';
+import { FormatFormComponent } from './format-form/format-form.component';
 
 @NgModule({
   imports: [
@@ -15,14 +16,14 @@ import { FormModule } from '../../../shared/form/form.module';
     SharedModule,
     RouterModule,
     BitstreamFormatsRoutingModule,
-    FormModule
+    FormModule,
   ],
   declarations: [
     BitstreamFormatsComponent,
     EditBitstreamFormatComponent,
     AddBitstreamFormatComponent,
-    FormatFormComponent
-  ]
+    FormatFormComponent,
+  ],
 })
 export class BitstreamFormatsModule {
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
index a00f660baf..4ab186cdc6 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.resolver.ts
@@ -1,9 +1,14 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../core/data/bitstream-format-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 /**
@@ -24,7 +29,7 @@ export class BitstreamFormatsResolver implements Resolve<RemoteData<BitstreamFor
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<BitstreamFormat>> {
     return this.bitstreamFormatDataService.findById(route.params.id)
       .pipe(
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       );
   }
 }
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/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
index b09c50c70a..5df6f74c13 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.spec.ts
@@ -1,24 +1,32 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../../../shared/testing/router.stub';
-import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../../shared/testing/router.stub';
+import { EditBitstreamFormatComponent } from './edit-bitstream-format.component';
 
 describe('EditBitstreamFormatComponent', () => {
   let comp: EditBitstreamFormatComponent;
@@ -36,8 +44,8 @@ describe('EditBitstreamFormatComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat)
-    })
+      bitstreamFormat: createSuccessfulRemoteDataObject(bitstreamFormat),
+    }),
   };
 
   let router;
@@ -48,7 +56,7 @@ describe('EditBitstreamFormatComponent', () => {
     router = new RouterStub();
     notificationService = new NotificationsServiceStub();
     bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-      updateBitstreamFormat: createSuccessfulRemoteDataObject$({})
+      updateBitstreamFormat: createSuccessfulRemoteDataObject$({}),
     });
 
     TestBed.configureTestingModule({
@@ -60,7 +68,7 @@ describe('EditBitstreamFormatComponent', () => {
         { provide: NotificationsService, useValue: notificationService },
         { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   };
 
@@ -99,7 +107,7 @@ describe('EditBitstreamFormatComponent', () => {
       router = new RouterStub();
       notificationService = new NotificationsServiceStub();
       bitstreamFormatDataService = jasmine.createSpyObj('bitstreamFormatDataService', {
-        updateBitstreamFormat: createFailedRemoteDataObject$('Error', 500)
+        updateBitstreamFormat: createFailedRemoteDataObject$('Error', 500),
       });
 
       TestBed.configureTestingModule({
@@ -111,7 +119,7 @@ describe('EditBitstreamFormatComponent', () => {
           { provide: NotificationsService, useValue: notificationService },
           { provide: BitstreamFormatDataService, useValue: bitstreamFormatDataService },
         ],
-        schemas: [CUSTOM_ELEMENTS_SCHEMA]
+        schemas: [CUSTOM_ELEMENTS_SCHEMA],
       }).compileComponents();
     }));
     beforeEach(initBeforeEach);
diff --git a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
index 14b109fe26..e7d1d501af 100644
--- a/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/edit-bitstream-format/edit-bitstream-format.component.ts
@@ -1,14 +1,21 @@
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Component, OnInit } from '@angular/core';
+import { map } from 'rxjs/operators';
+
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
  * This component renders the edit page of a bitstream format.
@@ -36,7 +43,7 @@ export class EditBitstreamFormatComponent implements OnInit {
 
   ngOnInit(): void {
     this.bitstreamFormatRD$ = this.route.data.pipe(
-      map((data) => data.bitstreamFormat as RemoteData<BitstreamFormat>)
+      map((data) => data.bitstreamFormat as RemoteData<BitstreamFormat>),
     );
   }
 
@@ -49,15 +56,15 @@ export class EditBitstreamFormatComponent implements OnInit {
     this.bitstreamFormatDataService.updateBitstreamFormat(bitstreamFormat).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((response: RemoteData<BitstreamFormat>) => {
-        if (response.hasSucceeded) {
-          this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
-            this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
-          this.router.navigate([getBitstreamFormatsModuleRoute()]);
-        } else {
-          this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
-            'admin.registries.bitstream-formats.create.edit.content');
-        }
+      if (response.hasSucceeded) {
+        this.notificationService.success(this.translateService.get('admin.registries.bitstream-formats.edit.success.head'),
+          this.translateService.get('admin.registries.bitstream-formats.edit.success.content'));
+        this.router.navigate([getBitstreamFormatsModuleRoute()]);
+      } else {
+        this.notificationService.error('admin.registries.bitstream-formats.edit.failure.head',
+          'admin.registries.bitstream-formats.create.edit.content');
       }
+    },
     );
   }
 }
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
index ca3fbcbc99..ceeb313a9d 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.spec.ts
@@ -1,17 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { RouterStub } from '../../../../shared/testing/router.stub';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { FormatFormComponent } from './format-form.component';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicCheckboxModel,
+  DynamicFormArrayModel,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
-import { DynamicCheckboxModel, DynamicFormArrayModel, DynamicInputModel } from '@ng-dynamic-forms/core';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { isEmpty } from '../../../../shared/empty.util';
+import { RouterStub } from '../../../../shared/testing/router.stub';
+import { FormatFormComponent } from './format-form.component';
 
 describe('FormatFormComponent', () => {
   let comp: FormatFormComponent;
@@ -45,7 +57,7 @@ describe('FormatFormComponent', () => {
       providers: [
         { provide: Router, useValue: router },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   };
 
diff --git a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
index 161cfa7ecf..42a1e4baff 100644
--- a/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
+++ b/src/app/admin/admin-registries/bitstream-formats/format-form/format-form.component.ts
@@ -1,6 +1,11 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
-import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Router } from '@angular/router';
 import {
   DynamicCheckboxModel,
   DynamicFormArrayModel,
@@ -9,11 +14,17 @@ import {
   DynamicFormService,
   DynamicInputModel,
   DynamicSelectModel,
-  DynamicTextAreaModel
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
-import { Router } from '@angular/router';
-import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { TranslateService } from '@ngx-translate/core';
+
+import { environment } from '../../../../../environments/environment';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../../../core/shared/bitstream-format-support-level';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../shared/empty.util';
 import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-paths';
 
 /**
@@ -21,7 +32,7 @@ import { getBitstreamFormatsModuleRoute } from '../../admin-registries-routing-p
  */
 @Component({
   selector: 'ds-bitstream-format-form',
-  templateUrl: './format-form.component.html'
+  templateUrl: './format-form.component.html',
 })
 export class FormatFormComponent implements OnInit {
 
@@ -39,9 +50,9 @@ export class FormatFormComponent implements OnInit {
   /**
    * The different supported support level of the bitstream format
    */
-  supportLevelOptions = [{label: BitstreamFormatSupportLevel.Known, value: BitstreamFormatSupportLevel.Known},
-    {label: BitstreamFormatSupportLevel.Unknown, value: BitstreamFormatSupportLevel.Unknown},
-    {label: BitstreamFormatSupportLevel.Supported, value: BitstreamFormatSupportLevel.Supported}];
+  supportLevelOptions = [{ label: BitstreamFormatSupportLevel.Known, value: BitstreamFormatSupportLevel.Known },
+    { label: BitstreamFormatSupportLevel.Unknown, value: BitstreamFormatSupportLevel.Unknown },
+    { label: BitstreamFormatSupportLevel.Supported, value: BitstreamFormatSupportLevel.Supported }];
 
   /**
    * Styling element for repeatable field
@@ -57,8 +68,8 @@ export class FormatFormComponent implements OnInit {
    */
   arrayInputElementLayout: DynamicFormControlLayout = {
     grid: {
-      host: 'col'
-    }
+      host: 'col',
+    },
   };
 
   /**
@@ -72,10 +83,10 @@ export class FormatFormComponent implements OnInit {
       hint: 'admin.registries.bitstream-formats.edit.shortDescription.hint',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'Please enter a name for this bitstream format'
+        required: 'Please enter a name for this bitstream format',
       },
     }),
     new DynamicInputModel({
@@ -90,6 +101,7 @@ export class FormatFormComponent implements OnInit {
       name: 'description',
       label: 'admin.registries.bitstream-formats.edit.description.label',
       hint: 'admin.registries.bitstream-formats.edit.description.hint',
+      spellCheck: environment.form.spellCheck,
 
     }),
     new DynamicSelectModel({
@@ -98,7 +110,7 @@ export class FormatFormComponent implements OnInit {
       options: this.supportLevelOptions,
       label: 'admin.registries.bitstream-formats.edit.supportLevel.label',
       hint: 'admin.registries.bitstream-formats.edit.supportLevel.hint',
-      value: this.supportLevelOptions[0].value
+      value: this.supportLevelOptions[0].value,
 
     }),
     new DynamicCheckboxModel({
@@ -115,8 +127,8 @@ export class FormatFormComponent implements OnInit {
         new DynamicInputModel({
           id: 'extension',
           placeholder: 'admin.registries.bitstream-formats.edit.extensions.placeholder',
-        }, this.arrayInputElementLayout)
-      ]
+        }, this.arrayInputElementLayout),
+      ],
     }, this.arrayElementLayout),
   ];
 
@@ -144,7 +156,7 @@ export class FormatFormComponent implements OnInit {
             for (let i = 0; i < extenstions.length; i++) {
               formArray.insertGroup(i).group[0] = new DynamicInputModel({
                 id: `extension-${i}`,
-                value: extenstions[i]
+                value: extenstions[i],
               }, this.arrayInputElementLayout);
             }
           }
@@ -163,7 +175,7 @@ export class FormatFormComponent implements OnInit {
   onSubmit() {
     const updatedBitstreamFormat = Object.assign(new BitstreamFormat(),
       {
-        id: this.bitstreamFormat.id
+        id: this.bitstreamFormat.id,
       });
 
     this.formModel.forEach(
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
index 3fc872ca43..2e06d168ce 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.actions.ts
@@ -1,8 +1,9 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
-import { type } from '../../../shared/ngrx/type';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { type } from '../../../shared/ngrx/type';
 
 /**
  * For each action type in an action group, make a simple
@@ -24,7 +25,7 @@ export const MetadataRegistryActionTypes = {
   CANCEL_EDIT_FIELD: type('dspace/metadata-registry/CANCEL_FIELD'),
   SELECT_FIELD: type('dspace/metadata-registry/SELECT_FIELD'),
   DESELECT_FIELD: type('dspace/metadata-registry/DESELECT_FIELD'),
-  DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD')
+  DESELECT_ALL_FIELD: type('dspace/metadata-registry/DESELECT_ALL_FIELD'),
 };
 
 /**
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 771f18ba4b..63242b4795 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>
@@ -29,11 +29,12 @@
                         <tr *ngFor="let schema of (metadataSchemas | async)?.payload?.page"
                             [ngClass]="{'table-primary' : isActive(schema) | async}">
                             <td>
-                                <label>
+                                <label class="mb-0">
                                     <input type="checkbox"
                                            [checked]="isSelected(schema) | async"
                                            (change)="selectMetadataSchema(schema, $event)"
                                     >
+                                    <span class="sr-only">{{((isSelected(schema) | async) ? '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>
@@ -46,7 +47,7 @@
 
             </ds-pagination>
 
-            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+            <div *ngIf="(metadataSchemas | async)?.payload?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
               {{'admin.registries.metadata.schemas.no-items' | translate}}
             </div>
 
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
index 98d8659570..4fbb788780 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.scss
@@ -1,3 +1,7 @@
 .selectable-row:hover {
   cursor: pointer;
 }
+
+:host ::ng-deep #metadatadataschemagroup {
+  display: flex;
+}
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 74bfc5f0a4..63acf0f258 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,28 +1,34 @@
-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';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { RegistryService } from '../../../core/registry/registry.service';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-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 { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../../core/cache/response.models';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { MetadataRegistryComponent } from './metadata-registry.component';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
@@ -34,22 +40,22 @@ describe('MetadataRegistryComponent', () => {
       id: 1,
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1',
         },
       },
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/'
+      namespace: 'http://dublincore.org/documents/dcmi-terms/',
     },
     {
       id: 2,
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2',
         },
       },
       prefix: 'mock',
-      namespace: 'http://dspace.org/mockschema'
-    }
+      namespace: 'http://dspace.org/mockschema',
+    },
   ];
   const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -64,7 +70,7 @@ describe('MetadataRegistryComponent', () => {
     deleteMetadataSchema: () => observableOf(new RestResponse(true, 200, 'OK')),
     deselectAllMetadataSchema: () => {
     },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
+    clearMetadataSchemaRequests: () => observableOf(undefined),
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
@@ -78,11 +84,11 @@ describe('MetadataRegistryComponent', () => {
         { provide: RegistryService, useValue: registryServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: PaginationService, useValue: paginationService },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataRegistryComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..976ab572cc 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,24 +1,35 @@
 import { Component } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, zip } 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 {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  zip,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
 import { NoContent } from '../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-metadata-registry',
   templateUrl: './metadata-registry.component.html',
-  styleUrls: ['./metadata-registry.component.scss']
+  styleUrls: ['./metadata-registry.component.scss'],
 })
 /**
  * A component used for managing all existing metadata schemas within the repository.
@@ -36,7 +47,7 @@ export class MetadataRegistryComponent {
    */
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'rm',
-    pageSize: 25
+    pageSize: 25,
   });
 
   /**
@@ -60,7 +71,7 @@ export class MetadataRegistryComponent {
     this.metadataSchemas = this.needsUpdate$.pipe(
       filter((update) => update === true),
       switchMap(() => this.paginationService.getCurrentPagination(this.config.id, this.config)),
-      switchMap((currentPagination) => this.registryService.getMetadataSchemas(toFindListOptions(currentPagination)))
+      switchMap((currentPagination) => this.registryService.getMetadataSchemas(toFindListOptions(currentPagination))),
     );
   }
 
@@ -92,7 +103,7 @@ export class MetadataRegistryComponent {
    */
   isActive(schema: MetadataSchema): Observable<boolean> {
     return this.getActiveSchema().pipe(
-      map((activeSchema) => schema === activeSchema)
+      map((activeSchema) => schema === activeSchema),
     );
   }
 
@@ -120,7 +131,7 @@ export class MetadataRegistryComponent {
    */
   isSelected(schema: MetadataSchema): Observable<boolean> {
     return this.registryService.getSelectedMetadataSchemas().pipe(
-      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null)
+      map((schemas) => schemas.find((selectedSchema) => selectedSchema === schema) != null),
     );
   }
 
@@ -148,7 +159,7 @@ export class MetadataRegistryComponent {
           this.registryService.deselectAllMetadataSchema();
           this.registryService.cancelEditMetadataSchema();
         });
-      }
+      },
     );
   }
 
@@ -162,7 +173,7 @@ export class MetadataRegistryComponent {
     const suffix = success ? 'success' : 'failure';
     const messages = observableCombineLatest(
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.deleted.${suffix}`, {amount: amount})
+      this.translateService.get(`${prefix}.deleted.${suffix}`, { amount: amount }),
     );
     messages.subscribe(([head, content]) => {
       if (success) {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
index 3e26a8fdc1..07d01b8dc3 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.spec.ts
@@ -1,3 +1,5 @@
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -8,11 +10,12 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from './metadata-registry.actions';
-import { metadataRegistryReducer, MetadataRegistryState } from './metadata-registry.reducers';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import {
+  metadataRegistryReducer,
+  MetadataRegistryState,
+} from './metadata-registry.reducers';
 
 class NullAction extends MetadataRegistryEditSchemaAction {
   type = null;
@@ -27,11 +30,11 @@ const schema: MetadataSchema = Object.assign(new MetadataSchema(),
     id: 'schema-id',
     _links: {
       self: {
-        href: 'http://rest.self/schema/dc'
+        href: 'http://rest.self/schema/dc',
       },
     },
     prefix: 'dc',
-    namespace: 'http://dublincore.org/documents/dcmi-terms/'
+    namespace: 'http://dublincore.org/documents/dcmi-terms/',
   });
 
 const schema2: MetadataSchema = Object.assign(new MetadataSchema(),
@@ -43,7 +46,7 @@ const schema2: MetadataSchema = Object.assign(new MetadataSchema(),
       },
     },
     prefix: 'dcterms',
-    namespace: 'http://purl.org/dc/terms/'
+    namespace: 'http://purl.org/dc/terms/',
   });
 
 const field: MetadataField = Object.assign(new MetadataField(),
@@ -57,7 +60,7 @@ const field: MetadataField = Object.assign(new MetadataField(),
     element: 'contributor',
     qualifier: 'author',
     scopeNote: 'Author of an item',
-    schema: schema
+    schema: schema,
   });
 
 const field2: MetadataField = Object.assign(new MetadataField(),
@@ -71,35 +74,35 @@ const field2: MetadataField = Object.assign(new MetadataField(),
     element: 'title',
     qualifier: null,
     scopeNote: 'Title of an item',
-    schema: schema
+    schema: schema,
   });
 
 const initialState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [],
   editField: null,
-  selectedFields: []
+  selectedFields: [],
 };
 
 const editState: MetadataRegistryState = {
   editSchema: schema,
   selectedSchemas: [],
   editField: field,
-  selectedFields: []
+  selectedFields: [],
 };
 
 const selectState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [schema2],
   editField: null,
-  selectedFields: [field2]
+  selectedFields: [field2],
 };
 
 const moreSelectState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [schema, schema2],
   editField: null,
-  selectedFields: [field, field2]
+  selectedFields: [field, field2],
 };
 
 describe('metadataRegistryReducer', () => {
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
index e805c8b8fc..6cb72a0a8b 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.reducers.ts
@@ -1,3 +1,5 @@
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import {
   MetadataRegistryAction,
   MetadataRegistryActionTypes,
@@ -6,10 +8,8 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from './metadata-registry.actions';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 
 /**
  * The metadata registry state.
@@ -29,7 +29,7 @@ const initialState: MetadataRegistryState = {
   editSchema: null,
   selectedSchemas: [],
   editField: null,
-  selectedFields: []
+  selectedFields: [],
 };
 
 /**
@@ -43,65 +43,65 @@ export function metadataRegistryReducer(state = initialState, action: MetadataRe
 
     case MetadataRegistryActionTypes.EDIT_SCHEMA: {
       return Object.assign({}, state, {
-        editSchema: (action as MetadataRegistryEditSchemaAction).schema
+        editSchema: (action as MetadataRegistryEditSchemaAction).schema,
       });
     }
 
     case MetadataRegistryActionTypes.CANCEL_EDIT_SCHEMA: {
       return Object.assign({}, state, {
-        editSchema: null
+        editSchema: null,
       });
     }
 
     case MetadataRegistryActionTypes.SELECT_SCHEMA: {
       return Object.assign({}, state, {
-        selectedSchemas: [...state.selectedSchemas, (action as MetadataRegistrySelectSchemaAction).schema]
+        selectedSchemas: [...state.selectedSchemas, (action as MetadataRegistrySelectSchemaAction).schema],
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_SCHEMA: {
       return Object.assign({}, state, {
         selectedSchemas: state.selectedSchemas.filter(
-          (selectedSchema) => selectedSchema !== (action as MetadataRegistryDeselectSchemaAction).schema
-        )
+          (selectedSchema) => selectedSchema !== (action as MetadataRegistryDeselectSchemaAction).schema,
+        ),
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_ALL_SCHEMA: {
       return Object.assign({}, state, {
-        selectedSchemas: []
+        selectedSchemas: [],
       });
     }
 
     case MetadataRegistryActionTypes.EDIT_FIELD: {
       return Object.assign({}, state, {
-        editField: (action as MetadataRegistryEditFieldAction).field
+        editField: (action as MetadataRegistryEditFieldAction).field,
       });
     }
 
     case MetadataRegistryActionTypes.CANCEL_EDIT_FIELD: {
       return Object.assign({}, state, {
-        editField: null
+        editField: null,
       });
     }
 
     case MetadataRegistryActionTypes.SELECT_FIELD: {
       return Object.assign({}, state, {
-        selectedFields: [...state.selectedFields, (action as MetadataRegistrySelectFieldAction).field]
+        selectedFields: [...state.selectedFields, (action as MetadataRegistrySelectFieldAction).field],
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_FIELD: {
       return Object.assign({}, state, {
         selectedFields: state.selectedFields.filter(
-          (selectedField) => selectedField !== (action as MetadataRegistryDeselectFieldAction).field
-        )
+          (selectedField) => selectedField !== (action as MetadataRegistryDeselectFieldAction).field,
+        ),
       });
     }
 
     case MetadataRegistryActionTypes.DESELECT_ALL_FIELD: {
       return Object.assign({}, state, {
-        selectedFields: []
+        selectedFields: [],
       });
     }
 
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..85d1e90692 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>
 
 <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 8d416c2df8..17fdb6cd3d 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,16 +1,21 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 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 { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { MetadataSchemaFormComponent } from './metadata-schema-form.component';
 
 describe('MetadataSchemaFormComponent', () => {
   let component: MetadataSchemaFormComponent;
@@ -23,27 +28,29 @@ describe('MetadataSchemaFormComponent', () => {
     createOrUpdateMetadataSchema: (schema: MetadataSchema) => observableOf(schema),
     cancelEditMetadataSchema: () => {
     },
-    clearMetadataSchemaRequests: () => observableOf(undefined)
+    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 */
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataSchemaFormComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: FormBuilderService, useValue: formBuilderServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -63,8 +70,8 @@ describe('MetadataSchemaFormComponent', () => {
 
     const expected = Object.assign(new MetadataSchema(), {
       namespace: namespace,
-      prefix: prefix
-    });
+      prefix: prefix,
+    } as MetadataSchema);
 
     beforeEach(() => {
       spyOn(component.submitForm, 'emit');
@@ -79,19 +86,18 @@ describe('MetadataSchemaFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new schema using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
+      it('should emit a new schema using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+      });
     });
 
     describe('with an active schema', () => {
       const expectedWithId = Object.assign(new MetadataSchema(), {
         id: 1,
         namespace: namespace,
-        prefix: prefix
-      });
+        prefix: prefix,
+      } as MetadataSchema);
 
       beforeEach(() => {
         spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(expectedWithId));
@@ -99,11 +105,10 @@ describe('MetadataSchemaFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should edit the existing schema using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
+      it('should edit the existing schema using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+      });
     });
   });
 });
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 5c6885ae72..640a9bff29 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
@@ -1,21 +1,35 @@
-import { Component, EventEmitter, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { FormGroup } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 import { RegistryService } from '../../../../core/registry/registry.service';
 import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
-import { take } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-import { combineLatest } from 'rxjs';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
 
 @Component({
   selector: 'ds-metadata-schema-form',
-  templateUrl: './metadata-schema-form.component.html'
+  templateUrl: './metadata-schema-form.component.html',
 })
 /**
  * A form used for creating and editing metadata schemas
@@ -53,20 +67,20 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     name: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     namespace: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
-    }
+        host: 'col col-sm-6 d-inline-block',
+      },
+    },
   };
 
   /**
    * A FormGroup that combines all inputs
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * An EventEmitter that's fired whenever the form is being submitted
@@ -77,44 +91,58 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    combineLatest(
+    combineLatest([
       this.translateService.get(`${this.messagePrefix}.name`),
-      this.translateService.get(`${this.messagePrefix}.namespace`)
-    ).subscribe(([name, namespace]) => {
+      this.translateService.get(`${this.messagePrefix}.namespace`),
+    ]).subscribe(([name, namespace]) => {
       this.name = new DynamicInputModel({
-          id: 'name',
-          label: name,
-          name: 'name',
-          validators: {
-            required: null,
-            pattern: '^[^ ,_]{1,32}$'
-          },
-          required: true,
-        });
+        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,
-          },
-          required: true,
-        });
+        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]
-          })
+            group:[this.namespace, this.name],
+          }),
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.registryService.getActiveMetadataSchema().subscribe((schema) => {
-        this.formGroup.patchValue({
-          metadatadataschemagroup:{
-            name: schema != null ? schema.prefix : '',
-            namespace: schema != null ? schema.namespace : ''
-          }
-        });
+      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;
+        }
       });
     });
   }
@@ -132,43 +160,57 @@ export class MetadataSchemaFormComponent implements OnInit, OnDestroy {
    * When the schema has no id attached -> Create new schema
    * Emit the updated/created schema using the EventEmitter submitForm
    */
-  onSubmit() {
-    this.registryService.clearMetadataSchemaRequests().subscribe();
-    this.registryService.getActiveMetadataSchema().pipe(take(1)).subscribe(
-      (schema) => {
-        const values = {
-          prefix: this.name.value,
-          namespace: this.namespace.value
-        };
-        if (schema == null) {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), values)).subscribe((newSchema) => {
-            this.submitForm.emit(newSchema);
-          });
-        } else {
-          this.registryService.createOrUpdateMetadataSchema(Object.assign(new MetadataSchema(), schema, {
-            id: schema.id,
-            prefix: (values.prefix ? values.prefix : schema.prefix),
-            namespace: (values.namespace ? values.namespace : schema.namespace)
-          })).subscribe((updatedSchema) => {
-            this.submitForm.emit(updatedSchema);
-          });
-        }
+  onSubmit(): void {
+    this.registryService
+      .getActiveMetadataSchema()
+      .pipe(
+        take(1),
+        switchMap((schema: MetadataSchema) => {
+          const metadataValues = {
+            prefix: this.name.value,
+            namespace: this.namespace.value,
+          };
+
+          let createOrUpdate$: Observable<MetadataSchema>;
+
+          if (schema == null) {
+            createOrUpdate$ =
+                  this.registryService.createOrUpdateMetadataSchema(
+                    Object.assign(new MetadataSchema(), metadataValues),
+                  );
+          } else {
+            const updatedSchema = Object.assign(
+              new MetadataSchema(),
+              schema,
+              {
+                namespace: metadataValues.namespace,
+              },
+            );
+            createOrUpdate$ =
+                  this.registryService.createOrUpdateMetadataSchema(
+                    updatedSchema,
+                  );
+          }
+
+          return createOrUpdate$;
+        }),
+        tap(() => {
+          this.registryService.clearMetadataSchemaRequests().subscribe();
+        }),
+      )
+      .subscribe((updatedOrCreatedSchema: MetadataSchema) => {
+        this.submitForm.emit(updatedOrCreatedSchema);
         this.clearFields();
         this.registryService.cancelEditMetadataSchema();
-      }
-    );
+      });
   }
 
   /**
    * Reset all input-fields to be empty
    */
-  clearFields() {
-    this.formGroup.patchValue({
-      metadatadataschemagroup:{
-        prefix: '',
-        namespace: ''
-      }
-    });
+  clearFields(): void {
+    this.formGroup.reset('metadatadataschemagroup');
+    this.name.disabled = false;
   }
 
   /**
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 e13180d633..fb9037b582 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
@@ -1,17 +1,22 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MetadataFieldFormComponent } from './metadata-field-form.component';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-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 {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { EnumKeysPipe } from '../../../../shared/utils/enum-keys-pipe';
+import { MetadataFieldFormComponent } from './metadata-field-form.component';
 
 describe('MetadataFieldFormComponent', () => {
   let component: MetadataFieldFormComponent;
@@ -21,7 +26,7 @@ describe('MetadataFieldFormComponent', () => {
   const metadataSchema = Object.assign(new MetadataSchema(), {
     id: 1,
     namespace: 'fake schema',
-    prefix: 'fake'
+    prefix: 'fake',
   });
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -33,27 +38,29 @@ describe('MetadataFieldFormComponent', () => {
     },
     cancelEditMetadataSchema: () => {
     },
-    clearMetadataFieldRequests: () => observableOf(undefined)
+    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(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [MetadataFieldFormComponent, EnumKeysPipe],
       providers: [
         { provide: RegistryService, useValue: registryServiceStub },
-        { provide: FormBuilderService, useValue: formBuilderServiceStub }
+        { provide: FormBuilderService, useValue: formBuilderServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -81,7 +88,7 @@ describe('MetadataFieldFormComponent', () => {
     const expected = Object.assign(new MetadataField(), {
       element: element,
       qualifier: qualifier,
-      scopeNote: scopeNote
+      scopeNote: scopeNote,
     });
 
     beforeEach(() => {
@@ -98,11 +105,10 @@ describe('MetadataFieldFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should emit a new field using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
-        });
-      }));
+      it('should emit a new field using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expected);
+      });
     });
 
     describe('with an active field', () => {
@@ -111,7 +117,7 @@ describe('MetadataFieldFormComponent', () => {
         schema: metadataSchema,
         element: element,
         qualifier: qualifier,
-        scopeNote: scopeNote
+        scopeNote: scopeNote,
       });
 
       beforeEach(() => {
@@ -120,11 +126,10 @@ describe('MetadataFieldFormComponent', () => {
         fixture.detectChanges();
       });
 
-      it('should edit the existing field using the correct values', waitForAsync(() => {
-        fixture.whenStable().then(() => {
-          expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
-        });
-      }));
+      it('should edit the existing field using the correct values', async () => {
+        await fixture.whenStable();
+        expect(component.submitForm.emit).toHaveBeenCalledWith(expectedWithId);
+      });
     });
   });
 });
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 1c000c3c76..48451357a0 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
@@ -1,22 +1,31 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
-  DynamicInputModel
+  DynamicInputModel,
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
-import { FormGroup } 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 { TranslateService } from '@ngx-translate/core';
 import { combineLatest } from 'rxjs';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { take } from 'rxjs/operators';
+
 import { MetadataField } from '../../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
+import { RegistryService } from '../../../../core/registry/registry.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 
 @Component({
   selector: 'ds-metadata-field-form',
-  templateUrl: './metadata-field-form.component.html'
+  templateUrl: './metadata-field-form.component.html',
 })
 /**
  * A form used for creating and editing metadata fields
@@ -51,7 +60,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
@@ -64,25 +73,25 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     element: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     qualifier: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     scopeNote: {
       grid: {
-        host: 'col col-sm-12 d-inline-block'
-      }
-    }
+        host: 'col col-sm-12 d-inline-block',
+      },
+    },
   };
 
   /**
    * A FormGroup that combines all inputs
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * An EventEmitter that's fired whenever the form is being submitted
@@ -98,48 +107,69 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
    * Initialize the component, setting up the necessary Models for the dynamic form
    */
   ngOnInit() {
-    combineLatest(
+    combineLatest([
       this.translateService.get(`${this.messagePrefix}.element`),
       this.translateService.get(`${this.messagePrefix}.qualifier`),
-      this.translateService.get(`${this.messagePrefix}.scopenote`)
-    ).subscribe(([element, qualifier, scopenote]) => {
+      this.translateService.get(`${this.messagePrefix}.scopenote`),
+    ]).subscribe(([element, qualifier, scopenote]) => {
       this.element = new DynamicInputModel({
         id: 'element',
         label: element,
         name: 'element',
         validators: {
           required: null,
+          pattern: '^[^. ,]*$',
+          maxLength: 64,
         },
         required: true,
+        errorMessages: {
+          pattern: 'error.validation.metadata.element.invalid-pattern',
+          maxLength: 'error.validation.metadata.element.max-length',
+        },
       });
       this.qualifier = new DynamicInputModel({
         id: 'qualifier',
         label: qualifier,
         name: 'qualifier',
+        validators: {
+          pattern: '^[^. ,]*$',
+          maxLength: 64,
+        },
         required: false,
+        errorMessages: {
+          pattern: 'error.validation.metadata.qualifier.invalid-pattern',
+          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(
-        {
-          id: 'metadatadatafieldgroup',
-          group:[this.element, this.qualifier, this.scopeNote]
-        })
+          {
+            id: 'metadatadatafieldgroup',
+            group:[this.element, this.qualifier, this.scopeNote],
+          }),
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
-      this.registryService.getActiveMetadataField().subscribe((field) => {
-        this.formGroup.patchValue({
-          metadatadatafieldgroup: {
-            element: field != null ? field.element : '',
-            qualifier: field != null ? field.qualifier : '',
-            scopeNote: field != null ? field.scopeNote : ''
-          }
-        });
+      this.registryService.getActiveMetadataField().subscribe((field: MetadataField): void => {
+        if (field == null) {
+          this.clearFields();
+        } else {
+          this.formGroup.patchValue({
+            metadatadatafieldgroup: {
+              element: field.element,
+              qualifier: field.qualifier,
+              scopeNote: field.scopeNote,
+            },
+          });
+          this.element.disabled = true;
+          this.qualifier.disabled = true;
+        }
       });
     });
   }
@@ -157,45 +187,40 @@ export class MetadataFieldFormComponent implements OnInit, OnDestroy {
    * When the field has no id attached -> Create new field
    * Emit the updated/created field using the EventEmitter submitForm
    */
-  onSubmit() {
+  onSubmit(): void {
     this.registryService.getActiveMetadataField().pipe(take(1)).subscribe(
-      (field) => {
-        const values = {
-          element: this.element.value,
-          qualifier: this.qualifier.value,
-          scopeNote: this.scopeNote.value
-        };
+      (field: MetadataField) => {
         if (field == null) {
-          this.registryService.createMetadataField(Object.assign(new MetadataField(), values), this.metadataSchema).subscribe((newField) => {
+          this.registryService.createMetadataField(Object.assign(new MetadataField(), {
+            element: this.element.value,
+            qualifier: this.qualifier.value,
+            scopeNote: this.scopeNote.value,
+          }), this.metadataSchema).subscribe((newField: MetadataField) => {
             this.submitForm.emit(newField);
           });
         } else {
           this.registryService.updateMetadataField(Object.assign(new MetadataField(), field, {
             id: field.id,
-            element: (values.element ? values.element : field.element),
-            qualifier: (values.qualifier ? values.qualifier : field.qualifier),
-            scopeNote: (values.scopeNote ? values.scopeNote : field.scopeNote)
-          })).subscribe((updatedField) => {
+            element: field.element,
+            qualifier: field.qualifier,
+            scopeNote: this.scopeNote.value,
+          })).subscribe((updatedField: MetadataField) => {
             this.submitForm.emit(updatedField);
           });
         }
         this.clearFields();
         this.registryService.cancelEditMetadataField();
-      }
+      },
     );
   }
 
   /**
    * Reset all input-fields to be empty
    */
-  clearFields() {
-    this.formGroup.patchValue({
-      metadatadatafieldgroup: {
-        element: '',
-        qualifier: '',
-        scopeNote: ''
-      }
-    });
+  clearFields(): void {
+    this.formGroup.reset('metadatadatafieldgroup');
+    this.element.disabled = false;
+    this.qualifier.disabled = false;
   }
 
   /**
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 49fed0c847..97123d29a5 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,7 +10,7 @@
         [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
@@ -24,7 +24,8 @@
             <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>
               </tr>
@@ -32,14 +33,14 @@
               <tbody>
               <tr *ngFor="let field of fields?.page"
                   [ngClass]="{'table-primary' : isActive(field) | async}">
-                <td>
-                  <label>
-                    <input type="checkbox"
-                           [checked]="isSelected(field) | async"
-                           (change)="selectMetadataField(field, $event)">
-                  </label>
+                <td *ngVar="(isSelected(field) | async) 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)">{{schema?.prefix}}.{{field.element}}<label *ngIf="field.qualifier">.</label>{{field.qualifier}}</td>
+                <td class="selectable-row" (click)="editField(field)">{{field.id}}</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>
@@ -47,7 +48,7 @@
           </div>
         </ds-pagination>
 
-        <div *ngIf="fields?.totalElements == 0" class="alert alert-info w-100 mb-2" role="alert">
+        <div *ngIf="fields?.totalElements === 0" class="alert alert-info w-100 mb-2" role="alert">
           {{'admin.registries.schema.fields.no-items' | translate}}
         </div>
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
index 98d8659570..49e0384661 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.scss
@@ -1,3 +1,8 @@
 .selectable-row:hover {
   cursor: pointer;
 }
+
+:host ::ng-deep #metadatadatafieldgroup {
+  display: flex;
+  flex-wrap: wrap;
+}
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 c4116dc9e0..6c4e62e45f 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
@@ -1,33 +1,39 @@
-import { MetadataSchemaComponent } from './metadata-schema.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 { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { By } from '@angular/platform-browser';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-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 { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../../core/cache/response.models';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponent } from '../../../shared/pagination/pagination.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataSchemaComponent } from './metadata-schema.component';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -42,7 +48,7 @@ describe('MetadataSchemaComponent', () => {
         },
       },
       prefix: 'dc',
-      namespace: 'http://dublincore.org/documents/dcmi-terms/'
+      namespace: 'http://dublincore.org/documents/dcmi-terms/',
     },
     {
       id: 2,
@@ -52,8 +58,8 @@ describe('MetadataSchemaComponent', () => {
         },
       },
       prefix: 'mock',
-      namespace: 'http://dspace.org/mockschema'
-    }
+      namespace: 'http://dspace.org/mockschema',
+    },
   ];
   const mockFieldsList = [
     {
@@ -66,7 +72,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'advisor',
       scopeNote: null,
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
     },
     {
       id: 2,
@@ -78,7 +84,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'author',
       scopeNote: null,
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0])
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
     },
     {
       id: 3,
@@ -90,7 +96,7 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'editor',
       scopeNote: 'test scope note',
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
     },
     {
       id: 4,
@@ -102,8 +108,8 @@ describe('MetadataSchemaComponent', () => {
       element: 'contributor',
       qualifier: 'illustrator',
       scopeNote: null,
-      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1])
-    }
+      schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
+    },
   ];
   const mockSchemas = createSuccessfulRemoteDataObject$(buildPaginatedList(null, mockSchemasList));
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -120,14 +126,14 @@ describe('MetadataSchemaComponent', () => {
     deleteMetadataField: () => observableOf(new RestResponse(true, 200, 'OK')),
     deselectAllMetadataField: () => {
     },
-    clearMetadataFieldRequests: () => observableOf(undefined)
+    clearMetadataFieldRequests: () => observableOf(undefined),
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   const schemaNameParam = 'mock';
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({
-      schemaName: schemaNameParam
-    })
+      schemaName: schemaNameParam,
+    }),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -142,9 +148,9 @@ describe('MetadataSchemaComponent', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: Router, useValue: new RouterStub() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -169,10 +175,10 @@ describe('MetadataSchemaComponent', () => {
   });
 
   it('should contain the correct fields', () => {
-    const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(2)')).nativeElement;
+    const editorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(1) td:nth-child(3)')).nativeElement;
     expect(editorField.textContent).toBe('mock.contributor.editor');
 
-    const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(2)')).nativeElement;
+    const illustratorField: HTMLElement = fixture.debugElement.query(By.css('#metadata-fields tr:nth-child(2) td:nth-child(3)')).nativeElement;
     expect(illustratorField.textContent).toBe('mock.contributor.illustrator');
   });
 
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..483aa9644e 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,38 +1,50 @@
-import { Component, OnInit } from '@angular/core';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
-  combineLatest as observableCombineLatest,
   combineLatest,
+  combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  zip
+  zip,
 } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 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 { RemoteData } from '../../../core/data/remote-data';
 import { MetadataField } from '../../../core/metadata/metadata-field.model';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
-import { NoContent } from '../../../core/shared/NoContent.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { toFindListOptions } from '../../../shared/pagination/pagination.utils';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-metadata-schema',
   templateUrl: './metadata-schema.component.html',
-  styleUrls: ['./metadata-schema.component.scss']
+  styleUrls: ['./metadata-schema.component.scss'],
 })
 /**
  * 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 OnInit, OnDestroy {
   /**
    * The metadata schema
    */
@@ -49,7 +61,7 @@ export class MetadataSchemaComponent implements OnInit {
   config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'rm',
     pageSize: 25,
-    pageSizeOptions: [25, 50, 100, 200]
+    pageSizeOptions: [25, 50, 100, 200],
   });
 
   /**
@@ -60,7 +72,6 @@ export class MetadataSchemaComponent implements OnInit {
   constructor(private registryService: RegistryService,
               private route: ActivatedRoute,
               private notificationsService: NotificationsService,
-              private router: Router,
               private paginationService: PaginationService,
               private translateService: TranslateService) {
 
@@ -86,13 +97,13 @@ 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);
         }
         return this.registryService.getMetadataFieldsBySchema(schema, toFindListOptions(currentPagination), !update, true);
-      })
+      }),
     );
   }
 
@@ -125,7 +136,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   isActive(field: MetadataField): Observable<boolean> {
     return this.getActiveField().pipe(
-      map((activeField) => field === activeField)
+      map((activeField) => field === activeField),
     );
   }
 
@@ -153,7 +164,7 @@ export class MetadataSchemaComponent implements OnInit {
    */
   isSelected(field: MetadataField): Observable<boolean> {
     return this.registryService.getSelectedMetadataFields().pipe(
-      map((fields) => fields.find((selectedField) => selectedField === field) != null)
+      map((fields) => fields.find((selectedField) => selectedField === field) != null),
     );
   }
 
@@ -181,7 +192,7 @@ export class MetadataSchemaComponent implements OnInit {
           this.registryService.deselectAllMetadataField();
           this.registryService.cancelEditMetadataField();
         });
-      }
+      },
     );
   }
 
@@ -193,10 +204,10 @@ export class MetadataSchemaComponent implements OnInit {
   showNotification(success: boolean, amount: number) {
     const prefix = 'admin.registries.schema.notification';
     const suffix = success ? 'success' : 'failure';
-    const messages = observableCombineLatest(
+    const messages = observableCombineLatest([
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount })
-    );
+      this.translateService.get(`${prefix}.field.deleted.${suffix}`, { amount: amount }),
+    ]);
     messages.subscribe(([head, content]) => {
       if (success) {
         this.notificationsService.success(head, content);
@@ -207,6 +218,7 @@ export class MetadataSchemaComponent implements OnInit {
   }
   ngOnDestroy(): void {
     this.paginationService.clearPagination(this.config.id);
+    this.registryService.deselectAllMetadataField();
   }
 
 }
diff --git a/src/app/admin/admin-reports/admin-reports-routing.module.ts b/src/app/admin/admin-reports/admin-reports-routing.module.ts
new file mode 100644
index 0000000000..e891fa9ad4
--- /dev/null
+++ b/src/app/admin/admin-reports/admin-reports-routing.module.ts
@@ -0,0 +1,38 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component';
+import { FilteredItemsComponent } from './filtered-items/filtered-items.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: 'collections',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'admin.reports.collections.title', breadcrumbKey: 'admin.reports.collections' },
+        children: [
+          {
+            path: '',
+            component: FilteredCollectionsComponent,
+          },
+        ],
+      },
+      {
+        path: 'queries',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'admin.reports.items.title', breadcrumbKey: 'admin.reports.items' },
+        children: [
+          {
+            path: '',
+            component: FilteredItemsComponent,
+          },
+        ],
+      },
+    ]),
+  ],
+})
+export class AdminReportsRoutingModule {
+
+}
diff --git a/src/app/admin/admin-reports/admin-reports.module.ts b/src/app/admin/admin-reports/admin-reports.module.ts
new file mode 100644
index 0000000000..6eb713f0a4
--- /dev/null
+++ b/src/app/admin/admin-reports/admin-reports.module.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { FormModule } from '../../shared/form/form.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminReportsRoutingModule } from './admin-reports-routing.module';
+import { FilteredCollectionsComponent } from './filtered-collections/filtered-collections.component';
+import { FilteredItemsComponent } from './filtered-items/filtered-items.component';
+import { FiltersComponent } from './filters-section/filters-section.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    RouterModule,
+    FormModule,
+    AdminReportsRoutingModule,
+    NgbAccordionModule,
+  ],
+  declarations: [
+    FilteredCollectionsComponent,
+    FilteredItemsComponent,
+    FiltersComponent,
+  ],
+})
+export class AdminReportsModule {
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collection.model.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collection.model.ts
new file mode 100644
index 0000000000..39b51424ed
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collection.model.ts
@@ -0,0 +1,36 @@
+export class FilteredCollection {
+
+  public label: string;
+  public handle: string;
+  public communityLabel: string;
+  public communityHandle: string;
+  public nbTotalItems: number;
+  public values = {};
+  public allFiltersValue: number;
+
+  public clear() {
+    this.label = '';
+    this.handle = '';
+    this.communityLabel = '';
+    this.communityHandle = '';
+    this.nbTotalItems = 0;
+    this.values = {};
+    this.allFiltersValue = 0;
+  }
+
+  public deserialize(object: any) {
+    this.clear();
+    this.label = object.label;
+    this.handle = object.handle;
+    this.communityLabel = object.community_label;
+    this.communityHandle = object.community_handle;
+    this.nbTotalItems = object.nb_total_items;
+    const valuesPerFilter = object.values;
+    for (const filter in valuesPerFilter) {
+      if (valuesPerFilter.hasOwnProperty(filter)) {
+        this.values[filter] = valuesPerFilter[filter];
+      }
+    }
+    this.allFiltersValue = object.all_filters_value;
+  }
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
new file mode 100644
index 0000000000..5199a115a6
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
@@ -0,0 +1,64 @@
+<div class="container">
+    <div class="metadata-registry row">
+        <div class="col-12">
+
+            <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" | translate }}</h1>
+
+            <div id="metadatadiv">
+                <ngb-accordion [closeOthers]="true" activeIds="filters" #acc="ngbAccordion">
+                    <ngb-panel id="filters">
+                        <ng-template ngbPanelTitle>
+                          {{ "admin.reports.commons.filters" | translate }}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div class="container">
+                                <div class="row">
+                                    <span class="col-3"></span>
+                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                                </div>
+                                <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+                                <div class="row">
+                                    <span class="col-3"></span>
+                                    <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                                </div>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="collections">
+                        <ng-template ngbPanelTitle>
+                          {{ "admin.reports.collections.collections-report" | translate }}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <table id="table" class="table table-striped">
+                                <thead>
+                                    <tr class="header">
+                                        <th rowspan="2">{{ "admin.reports.collections.community" | translate }}</th>
+                                        <th rowspan="2">{{ "admin.reports.collections.collection" | translate }}</th>
+                                        <th>{{ "admin.reports.collections.nb_items" | translate }}</th>
+                                        <th>{{ "admin.reports.collections.match_all_selected_filters" | translate }}</th>
+                                        <th *ngFor="let filter of results.summary.values | keyvalue">{{ ("admin.reports.commons.filters." + getGroup(filter.key) + "." + filter.key) | translate }}</th>
+                                    </tr>
+                                    <tr class="header">
+                                        <th class="num">{{ results.summary.nbTotalItems }}</th>
+                                        <th class="num">{{ results.summary.allFiltersValue }}</th>
+                                        <th class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ filter.value }}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr *ngFor="let coll of results.collections">
+                                        <td><a href="/handle/{{ coll.communityHandle }}" rel="noopener noreferrer" target="_blank">{{ coll.communityLabel }}</a></td>
+                                        <td><a href="/handle/{{ coll.handle }}" rel="noopener noreferrer" target="_blank">{{ coll.label }}</a></td>
+                                        <td class="num">{{ coll.nbTotalItems }}</td>
+                                        <td class="num">{{ coll.allFiltersValue }}</td>
+                                        <td class="num" *ngFor="let filter of results.summary.values | keyvalue">{{ coll.values[filter.key] || 0 }}</td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </ng-template>
+                    </ngb-panel>
+                </ngb-accordion>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.scss b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.scss
new file mode 100644
index 0000000000..73ce5275e5
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.scss
@@ -0,0 +1,3 @@
+.num {
+    text-align: center;
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
new file mode 100644
index 0000000000..1fa350645b
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.spec.ts
@@ -0,0 +1,94 @@
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormBuilder } from '@angular/forms';
+import {
+  NgbAccordion,
+  NgbAccordionModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
+import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
+
+import { FilteredCollectionsComponent } from './filtered-collections.component';
+
+describe('FiltersComponent', () => {
+  let component: FilteredCollectionsComponent;
+  let fixture: ComponentFixture<FilteredCollectionsComponent>;
+  let formBuilder: FormBuilder;
+
+  const expected = {
+    payload: {
+      collections: [],
+      summary: {
+        label: 'Test',
+      },
+    },
+    statusCode: 200,
+    statusText: 'OK',
+  } as RawRestResponse;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [FilteredCollectionsComponent],
+      imports: [
+        NgbAccordionModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        HttpClientTestingModule,
+      ],
+      providers: [
+        FormBuilder,
+        DspaceRestService,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+  }));
+
+  beforeEach(waitForAsync(() => {
+    formBuilder = TestBed.inject(FormBuilder);
+
+    fixture = TestBed.createComponent(FilteredCollectionsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should be displaying the filters panel initially', () => {
+    let accordion: NgbAccordion = component.accordionComponent;
+    expect(accordion.isExpanded('filters')).toBeTrue();
+  });
+
+  describe('toggle', () => {
+    beforeEach(() => {
+      spyOn(component, 'getFilteredCollections').and.returnValue(observableOf(expected));
+      spyOn(component.results, 'deserialize');
+      spyOn(component.accordionComponent, 'expand').and.callThrough();
+      component.submit();
+      fixture.detectChanges();
+    });
+
+    it('should be displaying the collections panel after submitting', waitForAsync(() => {
+      fixture.whenStable().then(() => {
+        expect(component.accordionComponent.expand).toHaveBeenCalledWith('collections');
+        expect(component.accordionComponent.isExpanded('collections')).toBeTrue();
+      });
+    }));
+  });
+});
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
new file mode 100644
index 0000000000..84e334e971
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.ts
@@ -0,0 +1,77 @@
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormGroup,
+} from '@angular/forms';
+import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
+import { Observable } from 'rxjs';
+import { RestRequestMethod } from 'src/app/core/data/rest-request-method';
+import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
+import { environment } from 'src/environments/environment';
+
+import { FiltersComponent } from '../filters-section/filters-section.component';
+import { FilteredCollections } from './filtered-collections.model';
+
+/**
+ * Component representing the Filtered Collections content report
+ */
+@Component({
+  selector: 'ds-report-filtered-collections',
+  templateUrl: './filtered-collections.component.html',
+  styleUrls: ['./filtered-collections.component.scss'],
+})
+export class FilteredCollectionsComponent {
+
+  queryForm: FormGroup;
+  results: FilteredCollections = new FilteredCollections();
+  @ViewChild('acc') accordionComponent: NgbAccordion;
+
+  constructor(
+    private formBuilder: FormBuilder,
+    private restService: DspaceRestService) {}
+
+  ngOnInit() {
+    this.queryForm = this.formBuilder.group({
+      filters: FiltersComponent.formGroup(this.formBuilder),
+    });
+  }
+
+  filtersFormGroup(): FormGroup {
+    return this.queryForm.get('filters') as FormGroup;
+  }
+
+  getGroup(filterId: string): string {
+    return FiltersComponent.getGroup(filterId).id;
+  }
+
+  submit() {
+    this
+      .getFilteredCollections()
+      .subscribe(
+        response => {
+          this.results.deserialize(response.payload);
+          this.accordionComponent.expand('collections');
+        },
+      );
+  }
+
+  getFilteredCollections(): Observable<RawRestResponse> {
+    let params = this.toQueryString();
+    if (params.length > 0) {
+      params = `?${params}`;
+    }
+    const scheme = environment.rest.ssl ? 'https' : 'http';
+    const urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
+    return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filteredcollections${params}`);
+  }
+
+  private toQueryString(): string {
+    const params = FiltersComponent.toQueryString(this.queryForm.value.filters);
+    return params;
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.model.ts b/src/app/admin/admin-reports/filtered-collections/filtered-collections.model.ts
new file mode 100644
index 0000000000..248924c761
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.model.ts
@@ -0,0 +1,26 @@
+import { FilteredCollection } from './filtered-collection.model';
+
+export class FilteredCollections {
+
+  public collections: Array<FilteredCollection> = [];
+  public summary: FilteredCollection = new FilteredCollection();
+
+  public clear() {
+    this.collections.splice(0, this.collections.length);
+    this.summary.clear();
+  }
+
+  public deserialize(object: any) {
+    this.clear();
+    const summary = object.summary;
+    this.summary.deserialize(summary);
+    const collections = object.collections;
+    for (let i = 0; i < collections.length; i++) {
+      const collection = collections[i];
+      const coll = new FilteredCollection();
+      coll.deserialize(collection);
+      this.collections.push(coll);
+    }
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
new file mode 100644
index 0000000000..b5bc55f6ff
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-model.ts
@@ -0,0 +1,23 @@
+import { Item } from 'src/app/core/shared/item.model';
+
+export class FilteredItems {
+
+  public items: Item[] = [];
+  public itemCount: number;
+
+  public clear() {
+    this.items.splice(0, this.items.length);
+  }
+
+  public deserialize(object: any, offset: number = 0) {
+    this.clear();
+    this.itemCount = object.itemCount;
+    const items = object.items;
+    for (let i = 0; i < items.length; i++) {
+      const item = items[i];
+      item.index = this.items.length + offset + 1;
+      this.items.push(item);
+    }
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
new file mode 100644
index 0000000000..4b6679bdbc
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -0,0 +1,175 @@
+<div class="container">
+    <div class="metadata-registry row">
+        <div class="col-12">
+
+            <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | translate}}</h1>
+
+            <div id="querydiv" [formGroup]="queryForm">
+                <ngb-accordion [closeOthers]="true" activeIds="collectionSelector" #acc="ngbAccordion">
+                    <ngb-panel id="collectionSelector">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.items.section.collectionSelector' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
+                                <option *ngFor="let item of collections" [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
+                            </select>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="metadataFieldQueries">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.items.section.metadataFieldQueries' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <fieldset id="predefqueries" class="form-group">
+                                <label>
+                                    {{'admin.reports.items.predefinedQueries' | translate}}
+                                </label>
+                                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
+                                    <option *ngFor="let item of presetQueries" [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
+                                </select>
+                            </fieldset>
+                            <div class="row">&nbsp;</div>
+                            <div id="queries">
+                                <div class="metadata" *ngFor="let pred of queryPredicatesArray().controls; let i = index">
+                                    <div [formGroup]="pred" class="form-group">
+                                        <div class="form-row">
+                                            <div class="col-4">
+                                                <select class="query-tool" formControlName="field" class="form-control">
+                                                    <option *ngFor="let item of metadataFieldsWithAny" [value]="item.id">{{item.name$ | async}}</option>
+                                                </select>
+                                            </div>
+                                            <div class="col-auto">
+                                                <select class="query-tool" formControlName="operator" class="form-control">
+                                                    <option *ngFor="let item of predicates" [value]="item.id">{{item.name$ | async | translate}}</option>
+                                                </select>
+                                            </div>
+                                            <div class="col">
+                                                <input class="form-control" formControlName="value"/>
+                                            </div>
+                                            <div class="col-auto">
+                                                <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
+                                                &nbsp;
+                                                <button class="btn btn-light" [disabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="limitPaginateQueries">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.items.section.limitPaginateQueries' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div class="row align-items-center">
+                                <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
+                                <div class="col-6">
+                                    <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
+                                        <option *ngFor="let item of pageLimits" value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <div class="row align-items-center">
+                                <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
+                                <div class="col-6">
+                                    <input id="offset" name="offset" value="0" class="form-control col-6">
+                                </div>
+                            </div>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="filters">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.commons.filters' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                            <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="additionalData">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.commons.additional-data' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <div id="show-fields">
+                                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
+                                    <option *ngFor="let item of metadataFields" [value]="item.id">{{item.name$ | async}}</option>
+                                </select>
+                            </div>
+                            <div class="row">
+                                <span class="col-3"></span>
+                                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                            </div>
+                        </ng-template>
+                    </ngb-panel>
+                    <ngb-panel id="itemResults">
+                        <ng-template ngbPanelTitle>
+                            {{'admin.reports.collections.item-results' | translate}}
+                        </ng-template>
+                        <ng-template ngbPanelContent>
+                            <table id="table" class="table table-striped">
+                                <thead>
+                                    <tr class="header">
+                                        <th>{{ "admin.reports.items.number" | translate }}</th>
+                                        <th>{{ "admin.reports.items.id" | translate }}</th>
+                                        <th>{{ "admin.reports.items.collection" | translate }}</th>
+                                        <th>{{ "admin.reports.items.handle" | translate }}</th>
+                                        <th>{{ "admin.reports.items.title" | translate }}</th>
+                                        <th *ngFor="let field of queryForm.value['additionalFields']">{{ field }}</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr *ngFor="let item of results$ | async">
+                                        <td class="num">{{ item.index }}</td>
+                                        <td>{{ item.uuid }}</td>
+                                        <td><a *ngIf="item.owningCollection" href="/handle/{{ item.owningCollection.handle }}" rel="noopener noreferrer" target="_blank">{{ item.owningCollection.name }}</a></td>
+                                        <td><a *ngIf="item.handle" href="/handle/{{ item.handle }}" rel="noopener noreferrer" target="_blank">{{ item.handle }}</a></td>
+                                        <td>{{ item.name }}</td>
+                                        <td class="num" *ngFor="let field of queryForm.value['additionalFields']">
+                                            <span *ngFor="let mdvalue of item.metadata[field]">
+                                                {{ mdvalue.value || "" }}
+                                            </span>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <div>
+                                {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
+                            </div>
+                            <div>
+                                <button id="prev" class="btn btn-light" (click)="prevPage()" [disabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                                <button id="next" class="btn btn-light" (click)="nextPage()" [disabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+<!--
+                                <button id="export">{{'admin.reports.commons.export' | translate}}</button>
+-->
+                            </div>
+                            <table id="itemtable" class="sortable"></table>
+                        </ng-template>
+                    </ngb-panel>
+                </ngb-accordion>
+            </div>
+
+        </div>
+    </div>
+</div>
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.scss b/src/app/admin/admin-reports/filtered-items/filtered-items.component.scss
new file mode 100644
index 0000000000..73ce5275e5
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.scss
@@ -0,0 +1,3 @@
+.num {
+    text-align: center;
+}
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss b/src/app/admin/admin-reports/filtered-items/filtered-items.component.spec.ts
similarity index 100%
rename from src/app/item-page/simple/item-types/versioned-item/versioned-item.component.scss
rename to src/app/admin/admin-reports/filtered-items/filtered-items.component.spec.ts
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
new file mode 100644
index 0000000000..c63880ae48
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.ts
@@ -0,0 +1,348 @@
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+import {
+  FormArray,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+} from '@angular/forms';
+import { NgbAccordion } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+import { CollectionDataService } from 'src/app/core/data/collection-data.service';
+import { CommunityDataService } from 'src/app/core/data/community-data.service';
+import { MetadataFieldDataService } from 'src/app/core/data/metadata-field-data.service';
+import { MetadataSchemaDataService } from 'src/app/core/data/metadata-schema-data.service';
+import { RestRequestMethod } from 'src/app/core/data/rest-request-method';
+import { DspaceRestService } from 'src/app/core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from 'src/app/core/dspace-rest/raw-rest-response.model';
+import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
+import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
+import { Collection } from 'src/app/core/shared/collection.model';
+import { Community } from 'src/app/core/shared/community.model';
+import { Item } from 'src/app/core/shared/item.model';
+import { getFirstSucceededRemoteListPayload } from 'src/app/core/shared/operators';
+import { isEmpty } from 'src/app/shared/empty.util';
+import { environment } from 'src/environments/environment';
+
+import { FiltersComponent } from '../filters-section/filters-section.component';
+import { FilteredItems } from './filtered-items-model';
+import { OptionVO } from './option-vo.model';
+import { PresetQuery } from './preset-query.model';
+import { QueryPredicate } from './query-predicate.model';
+
+/**
+ * Component representing the Filtered Items content report.
+ */
+@Component({
+  selector: 'ds-report-filtered-items',
+  templateUrl: './filtered-items.component.html',
+  styleUrls: ['./filtered-items.component.scss'],
+})
+export class FilteredItemsComponent {
+
+  collections: OptionVO[];
+  presetQueries: PresetQuery[];
+  metadataFields: OptionVO[];
+  metadataFieldsWithAny: OptionVO[];
+  predicates: OptionVO[];
+  pageLimits: OptionVO[];
+
+  queryForm: FormGroup;
+  currentPage = 0;
+  results: FilteredItems = new FilteredItems();
+  results$: Observable<Item[]>;
+  @ViewChild('acc') accordionComponent: NgbAccordion;
+
+  constructor(
+    private communityService: CommunityDataService,
+    private collectionService: CollectionDataService,
+    private metadataSchemaService: MetadataSchemaDataService,
+    private metadataFieldService: MetadataFieldDataService,
+    private translateService: TranslateService,
+    private formBuilder: FormBuilder,
+    private restService: DspaceRestService) {}
+
+  ngOnInit() {
+    this.loadCollections();
+    this.loadPresetQueries();
+    this.loadMetadataFields();
+    this.loadPredicates();
+    this.loadPageLimits();
+
+    const formQueryPredicates: FormGroup[] = [
+      new QueryPredicate().toFormGroup(this.formBuilder),
+    ];
+
+    this.queryForm = this.formBuilder.group({
+      collections: this.formBuilder.control([''], []),
+      presetQuery: this.formBuilder.control('new', []),
+      queryPredicates: this.formBuilder.array(formQueryPredicates),
+      pageLimit: this.formBuilder.control('10', []),
+      filters: FiltersComponent.formGroup(this.formBuilder),
+      additionalFields: this.formBuilder.control([], []),
+    });
+  }
+
+  loadCollections(): void {
+    this.collections = [];
+    const wholeRepo$ = this.translateService.stream('admin.reports.items.wholeRepo');
+    this.collections.push(OptionVO.collectionLoc('', wholeRepo$));
+
+    this.communityService.findAll({ elementsPerPage: 10000, currentPage: 1 }).pipe(
+      getFirstSucceededRemoteListPayload(),
+    ).subscribe(
+      (communitiesRest: Community[]) => {
+        communitiesRest.forEach(community => {
+          const commVO = OptionVO.collection(community.uuid, community.name, true);
+          this.collections.push(commVO);
+
+          this.collectionService.findByParent(community.uuid, { elementsPerPage: 10000, currentPage: 1 }).pipe(
+            getFirstSucceededRemoteListPayload(),
+          ).subscribe(
+            (collectionsRest: Collection[]) => {
+              collectionsRest.filter(collection => collection.firstMetadataValue('dspace.entity.type') === 'Publication')
+                .forEach(collection => {
+                  const collVO = OptionVO.collection(collection.uuid, '–' + collection.name);
+                  this.collections.push(collVO);
+                });
+            },
+          );
+        });
+      },
+    );
+  }
+
+  loadPresetQueries(): void {
+    this.presetQueries = [
+      PresetQuery.of('new', 'admin.reports.items.preset.new', []),
+      PresetQuery.of('q1', 'admin.reports.items.preset.hasNoTitle', [
+        QueryPredicate.of('dc.title', QueryPredicate.DOES_NOT_EXIST),
+      ]),
+      PresetQuery.of('q2', 'admin.reports.items.preset.hasNoIdentifierUri', [
+        QueryPredicate.of('dc.identifier.uri', QueryPredicate.DOES_NOT_EXIST),
+      ]),
+      PresetQuery.of('q3', 'admin.reports.items.preset.hasCompoundSubject', [
+        QueryPredicate.of('dc.subject.*', QueryPredicate.LIKE, '%;%'),
+      ]),
+      PresetQuery.of('q4', 'admin.reports.items.preset.hasCompoundAuthor', [
+        QueryPredicate.of('dc.contributor.author', QueryPredicate.LIKE, '% and %'),
+      ]),
+      PresetQuery.of('q5', 'admin.reports.items.preset.hasCompoundCreator', [
+        QueryPredicate.of('dc.creator', QueryPredicate.LIKE, '% and %'),
+      ]),
+      PresetQuery.of('q6', 'admin.reports.items.preset.hasUrlInDescription', [
+        QueryPredicate.of('dc.description', QueryPredicate.MATCHES, '^.*(http://|https://|mailto:).*$'),
+      ]),
+      PresetQuery.of('q7', 'admin.reports.items.preset.hasFullTextInProvenance', [
+        QueryPredicate.of('dc.description.provenance', QueryPredicate.MATCHES, '^.*No\. of bitstreams(.|\r|\n|\r\n)*\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$'),
+      ]),
+      PresetQuery.of('q8', 'admin.reports.items.preset.hasNonFullTextInProvenance', [
+        QueryPredicate.of('dc.description.provenance', QueryPredicate.DOES_NOT_MATCH, '^.*No\. of bitstreams(.|\r|\n|\r\n)*\.(PDF|pdf|DOC|doc|PPT|ppt|DOCX|docx|PPTX|pptx).*$'),
+      ]),
+      PresetQuery.of('q9', 'admin.reports.items.preset.hasEmptyMetadata', [
+        QueryPredicate.of('*', QueryPredicate.MATCHES, '^\s*$'),
+      ]),
+      PresetQuery.of('q10', 'admin.reports.items.preset.hasUnbreakingDataInDescription', [
+        QueryPredicate.of('dc.description.*', QueryPredicate.MATCHES, '^.*[^\s]{50,}.*$'),
+      ]),
+      PresetQuery.of('q12', 'admin.reports.items.preset.hasXmlEntityInMetadata', [
+        QueryPredicate.of('*', QueryPredicate.MATCHES, '^.*&#.*$'),
+      ]),
+      PresetQuery.of('q13', 'admin.reports.items.preset.hasNonAsciiCharInMetadata', [
+        QueryPredicate.of('*', QueryPredicate.MATCHES, '^.*[^[:ascii:]].*$'),
+      ]),
+    ];
+  }
+
+  loadMetadataFields(): void {
+    this.metadataFields = [];
+    this.metadataFieldsWithAny = [];
+    const anyField$ = this.translateService.stream('admin.reports.items.anyField');
+    this.metadataFieldsWithAny.push(OptionVO.itemLoc('*', anyField$));
+    this.metadataSchemaService.findAll({ elementsPerPage: 10000, currentPage: 1 }).pipe(
+      getFirstSucceededRemoteListPayload(),
+    ).subscribe(
+      (schemasRest: MetadataSchema[]) => {
+        schemasRest.forEach(schema => {
+          this.metadataFieldService.findBySchema(schema, { elementsPerPage: 10000, currentPage: 1 }).pipe(
+            getFirstSucceededRemoteListPayload(),
+          ).subscribe(
+            (fieldsRest: MetadataField[]) => {
+              fieldsRest.forEach(field => {
+                let fieldName = schema.prefix + '.' + field.toString();
+                let fieldVO = OptionVO.item(fieldName, fieldName);
+                this.metadataFields.push(fieldVO);
+                this.metadataFieldsWithAny.push(fieldVO);
+                if (isEmpty(field.qualifier)) {
+                  fieldName = schema.prefix + '.' + field.element + '.*';
+                  fieldVO = OptionVO.item(fieldName, fieldName);
+                  this.metadataFieldsWithAny.push(fieldVO);
+                }
+              });
+            },
+          );
+        });
+      },
+    );
+  }
+
+  loadPredicates(): void {
+    this.predicates = [
+      OptionVO.item(QueryPredicate.EXISTS, 'admin.reports.items.predicate.exists'),
+      OptionVO.item(QueryPredicate.DOES_NOT_EXIST, 'admin.reports.items.predicate.doesNotExist'),
+      OptionVO.item(QueryPredicate.EQUALS, 'admin.reports.items.predicate.equals'),
+      OptionVO.item(QueryPredicate.DOES_NOT_EQUAL, 'admin.reports.items.predicate.doesNotEqual'),
+      OptionVO.item(QueryPredicate.LIKE, 'admin.reports.items.predicate.like'),
+      OptionVO.item(QueryPredicate.NOT_LIKE, 'admin.reports.items.predicate.notLike'),
+      OptionVO.item(QueryPredicate.CONTAINS, 'admin.reports.items.predicate.contains'),
+      OptionVO.item(QueryPredicate.DOES_NOT_CONTAIN, 'admin.reports.items.predicate.doesNotContain'),
+      OptionVO.item(QueryPredicate.MATCHES, 'admin.reports.items.predicate.matches'),
+      OptionVO.item(QueryPredicate.DOES_NOT_MATCH, 'admin.reports.items.predicate.doesNotMatch'),
+    ];
+  }
+
+  loadPageLimits(): void {
+    this.pageLimits = [
+      OptionVO.item('10', '10'),
+      OptionVO.item('25', '25'),
+      OptionVO.item('50', '50'),
+      OptionVO.item('100', '100'),
+    ];
+  }
+
+  queryPredicatesArray(): FormArray {
+    return (this.queryForm.get('queryPredicates') as FormArray);
+  }
+
+  addQueryPredicate(newItem: FormGroup = new QueryPredicate().toFormGroup(this.formBuilder)) {
+    this.queryPredicatesArray().push(newItem);
+  }
+
+  deleteQueryPredicateDisabled(): boolean {
+    return this.queryPredicatesArray().length < 2;
+  }
+
+  deleteQueryPredicate(index: number, nbToDelete: number = 1) {
+    if (index > -1) {
+      this.queryPredicatesArray().removeAt(index);
+    }
+  }
+
+  setPresetQuery() {
+    const queryField = this.queryForm.controls.presetQuery as FormControl;
+    const value = queryField.value;
+    const query = this.presetQueries.find(q => q.id === value);
+    if (query !== undefined) {
+      this.queryPredicatesArray().clear();
+      query.predicates
+        .map(qp => qp.toFormGroup(this.formBuilder))
+        .forEach(qp => this.addQueryPredicate(qp));
+      if (query.predicates.length === 0) {
+        this.addQueryPredicate(new QueryPredicate().toFormGroup(this.formBuilder));
+      }
+    }
+  }
+
+  filtersFormGroup(): FormGroup {
+    return this.queryForm.get('filters') as FormGroup;
+  }
+
+  private pageSize() {
+    const form = this.queryForm.value;
+    return form.pageLimit;
+  }
+
+  canNavigatePrevious(): boolean {
+    return this.currentPage > 0;
+  }
+
+  prevPage() {
+    if (this.canNavigatePrevious()) {
+      this.currentPage--;
+      this.resubmit();
+    }
+  }
+
+  pageCount(): number {
+    const total = this.results.itemCount || 0;
+    return Math.ceil(total / this.pageSize());
+  }
+
+  canNavigateNext(): boolean {
+    return this.currentPage + 1 < this.pageCount();
+  }
+
+  nextPage() {
+    if (this.canNavigateNext()) {
+      this.currentPage++;
+      this.resubmit();
+    }
+  }
+
+  submit() {
+    this.accordionComponent.expand('itemResults');
+    this.currentPage = 0;
+    this.resubmit();
+  }
+
+  resubmit() {
+    this.results$ = this
+      .getFilteredItems()
+      .pipe(
+        map(response => {
+          const offset = this.currentPage * this.pageSize();
+          this.results.deserialize(response.payload, offset);
+          return this.results.items;
+        }),
+      );
+  }
+
+  getFilteredItems(): Observable<RawRestResponse> {
+    let params = this.toQueryString();
+    if (params.length > 0) {
+      params = `?${params}`;
+    }
+    const scheme = environment.rest.ssl ? 'https' : 'http';
+    const urlRestApp = `${scheme}://${environment.rest.host}:${environment.rest.port}${environment.rest.nameSpace}`;
+    return this.restService.request(RestRequestMethod.GET, `${urlRestApp}/api/contentreport/filtereditems${params}`);
+  }
+
+  private toQueryString(): string {
+    let params = `pageNumber=${this.currentPage}&pageLimit=${this.pageSize()}`;
+
+    const colls = this.queryForm.value.collections;
+    for (let i = 0; i < colls.length; i++) {
+      params += `&collections=${colls[i]}`;
+    }
+
+    const preds = this.queryForm.value.queryPredicates;
+    for (let i = 0; i < preds.length; i++) {
+      const field = preds[i].field;
+      const op = preds[i].operator;
+      const value = preds[i].value;
+      params += `&queryPredicates=${field}:${op}`;
+      if (value) {
+        params += `:${value}`;
+      }
+    }
+
+    const filters = FiltersComponent.toQueryString(this.queryForm.value.filters);
+    if (filters.length > 0) {
+      params += `&${filters}`;
+    }
+
+    const addFlds = this.queryForm.value.additionalFields;
+    for (let i = 0; i < addFlds.length; i++) {
+      params += `&additionalFields=${addFlds[i]}`;
+    }
+
+    return params;
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/option-vo.model.ts b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
new file mode 100644
index 0000000000..56334b041f
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/option-vo.model.ts
@@ -0,0 +1,50 @@
+import { Observable } from 'rxjs';
+
+/**
+ * Component representing an option in each selectable list of values
+ * used in the Filtered Items report query interface
+ */
+export class OptionVO {
+
+  id: string;
+  name$: Observable<string>;
+  disabled = false;
+
+  static collection(id: string, name: string, disabled: boolean = false): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = OptionVO.toObservable(name);
+    opt.disabled = disabled;
+    return opt;
+  }
+
+  static collectionLoc(id: string, name$: Observable<string>, disabled: boolean = false): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = name$;
+    opt.disabled = disabled;
+    return opt;
+  }
+
+  static item(id: string, name: string): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = OptionVO.toObservable(name);
+    return opt;
+  }
+
+  static itemLoc(id: string, name$: Observable<string>): OptionVO {
+    const opt = new OptionVO();
+    opt.id = id;
+    opt.name$ = name$;
+    return opt;
+  }
+
+  private static toObservable<T>(value: T): Observable<T> {
+    return new Observable<T>(subscriber => {
+      subscriber.next(value);
+      subscriber.complete();
+    });
+
+  }
+}
diff --git a/src/app/admin/admin-reports/filtered-items/preset-query.model.ts b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
new file mode 100644
index 0000000000..213819b70e
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/preset-query.model.ts
@@ -0,0 +1,17 @@
+import { QueryPredicate } from './query-predicate.model';
+
+export class PresetQuery {
+
+  id: string;
+  label: string;
+  predicates: QueryPredicate[];
+
+  static of(id: string, label: string, predicates: QueryPredicate[]) {
+    const query = new PresetQuery();
+    query.id = id;
+    query.label = label;
+    query.predicates = predicates;
+    return query;
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filtered-items/query-predicate.model.ts b/src/app/admin/admin-reports/filtered-items/query-predicate.model.ts
new file mode 100644
index 0000000000..1c12d72e27
--- /dev/null
+++ b/src/app/admin/admin-reports/filtered-items/query-predicate.model.ts
@@ -0,0 +1,40 @@
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+} from '@angular/forms';
+
+export class QueryPredicate {
+
+  static EXISTS = 'exists';
+  static DOES_NOT_EXIST = 'doesnt_exist';
+  static EQUALS = 'equals';
+  static DOES_NOT_EQUAL = 'not_equals';
+  static LIKE = 'like';
+  static NOT_LIKE = 'not_like';
+  static CONTAINS = 'contains';
+  static DOES_NOT_CONTAIN = 'doesnt_contain';
+  static MATCHES = 'matches';
+  static DOES_NOT_MATCH = 'doesnt_match';
+
+  field = '*';
+  operator: string;
+  value: string;
+
+  static of(field: string, operator: string, value: string = '') {
+    const pred = new QueryPredicate();
+    pred.field = field;
+    pred.operator = operator;
+    pred.value = value;
+    return pred;
+  }
+
+  toFormGroup(formBuilder: FormBuilder): FormGroup {
+    return formBuilder.group({
+      field: new FormControl(this.field),
+      operator: new FormControl(this.operator),
+      value: new FormControl(this.value),
+    });
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filters-section/filter-group.model.ts b/src/app/admin/admin-reports/filters-section/filter-group.model.ts
new file mode 100644
index 0000000000..975b43a986
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filter-group.model.ts
@@ -0,0 +1,19 @@
+import { Filter } from './filter.model';
+
+export class FilterGroup {
+
+  id: string;
+  key: string;
+
+  constructor(id: string, public filters: Filter[]) {
+    this.id = id;
+    this.key = 'admin.reports.commons.filters.' + id;
+    filters.forEach(filter => {
+      filter.key = this.key + '.' + filter.id;
+      if (filter.hasTooltip) {
+        filter.tooltipKey = filter.key + '.tooltip';
+      }
+    });
+  }
+
+}
diff --git a/src/app/admin/admin-reports/filters-section/filter.model.ts b/src/app/admin/admin-reports/filters-section/filter.model.ts
new file mode 100644
index 0000000000..63eeb114cd
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filter.model.ts
@@ -0,0 +1,8 @@
+export class Filter {
+
+  key: string;
+  tooltipKey: string;
+
+  constructor(public id: string, public hasTooltip: boolean = false) {}
+
+}
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
new file mode 100644
index 0000000000..1e7856f09c
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -0,0 +1,19 @@
+<fieldset class="row row-cols-2">
+    <ng-container>
+        <span class="col-12">&nbsp;</span>
+        <span class="col-1">&nbsp;</span>
+        <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
+        <span class="col-2">&nbsp;</span>
+        <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
+        <span class="col-1">&nbsp;</span>
+        <span class="col-12">&nbsp;</span>
+    </ng-container>
+</fieldset>
+<fieldset class="row row-cols-2" *ngFor="let group of allFilters()">
+    <legend>{{group.key | translate}}</legend>
+    <ng-container [formGroup]="filtersForm">
+        <div *ngFor="let filter of group.filters" class="col-6">
+            <input type="checkbox" id="flt-{{filter.id}}" value="{{filter.id}}" class="form-check-input col-1 align-baseline" formControlName="{{filter.id}}"><label for="flt-{{filter.id}}" class="col-11 align-middle" title="{{filter.tooltipKey | translate}}">{{filter.key | translate}}</label>
+        </div>
+    </ng-container>
+</fieldset>
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss b/src/app/admin/admin-reports/filters-section/filters-section.component.scss
similarity index 100%
rename from src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.scss
rename to src/app/admin/admin-reports/filters-section/filters-section.component.scss
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.spec.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.spec.ts
new file mode 100644
index 0000000000..6b8b069f93
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.spec.ts
@@ -0,0 +1,109 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormBuilder } from '@angular/forms';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { TranslateLoaderMock } from 'src/app/shared/mocks/translate-loader.mock';
+
+import { FiltersComponent } from './filters-section.component';
+
+describe('FiltersComponent', () => {
+  let component: FiltersComponent;
+  let fixture: ComponentFixture<FiltersComponent>;
+  let formBuilder: FormBuilder;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [FiltersComponent],
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      providers: [
+        FormBuilder,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+  }));
+
+  beforeEach(waitForAsync(() => {
+    formBuilder = TestBed.inject(FormBuilder);
+
+    fixture = TestBed.createComponent(FiltersComponent);
+    component = fixture.componentInstance;
+    component.filtersForm = FiltersComponent.formGroup(formBuilder);
+    fixture.detectChanges();
+  }));
+
+  const isOneSelected = (values: any): boolean => {
+    let oneSelected = false;
+    let allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; !oneSelected && i < allFilters.length; i++) {
+      let group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        let filter = group.filters[j];
+        oneSelected = oneSelected || values[filter.id];
+      }
+    }
+    return oneSelected;
+  };
+
+  const isAllSelected = (values: any): boolean => {
+    let allSelected = true;
+    let allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; allSelected && i < allFilters.length; i++) {
+      let group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        let filter = group.filters[j];
+        allSelected = allSelected && values[filter.id];
+      }
+    }
+    return allSelected;
+  };
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should select all checkboxes', () => {
+    // By default, nothing is selected, so at least one item is not selected.
+    let values = component.filtersForm.value;
+    let allSelected: boolean = isAllSelected(values);
+    expect(allSelected).toBeFalse();
+
+    // Now we select everything...
+    component.selectAll();
+
+    // We must retrieve the form values again since selectAll() injects a new dictionary.
+    values = component.filtersForm.value;
+    allSelected = isAllSelected(values);
+    expect(allSelected).toBeTrue();
+  });
+
+  it('should deselect all checkboxes', () => {
+    // Since nothing is selected by default, we select at least an item
+    // so that deselectAll() actually deselects something.
+    let values = component.filtersForm.value;
+    values.is_item = true;
+    let oneSelected: boolean = isOneSelected(values);
+    expect(oneSelected).toBeTrue();
+
+    // Now we deselect everything...
+    component.deselectAll();
+
+    // We must retrieve the form values again since deselectAll() injects a new dictionary.
+    values = component.filtersForm.value;
+    oneSelected = isOneSelected(values);
+    expect(oneSelected).toBeFalse();
+  });
+});
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.ts b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
new file mode 100644
index 0000000000..a739d849f8
--- /dev/null
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.ts
@@ -0,0 +1,157 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+} from '@angular/forms';
+
+import { Filter } from './filter.model';
+import { FilterGroup } from './filter-group.model';
+
+/**
+ * Component representing the Query Filters section used in both
+ * Filtered Collections and Filtered Items content reports
+ */
+@Component({
+  selector: 'ds-filters',
+  templateUrl: './filters-section.component.html',
+  styleUrls: ['./filters-section.component.scss'],
+})
+export class FiltersComponent {
+
+  static FILTERS = [
+    new FilterGroup('property', [
+      new Filter('is_item'),
+      new Filter('is_withdrawn'),
+      new Filter('is_not_withdrawn'),
+      new Filter('is_discoverable'),
+      new Filter('is_not_discoverable'),
+    ]),
+    new FilterGroup('bitstream', [
+      new Filter('has_multiple_originals'),
+      new Filter('has_no_originals'),
+      new Filter('has_one_original'),
+    ]),
+    new FilterGroup('bitstream_mime', [
+      new Filter('has_doc_original'),
+      new Filter('has_image_original'),
+      new Filter('has_unsupp_type'),
+      new Filter('has_mixed_original'),
+      new Filter('has_pdf_original'),
+      new Filter('has_jpg_original'),
+      new Filter('has_small_pdf'),
+      new Filter('has_large_pdf'),
+      new Filter('has_doc_without_text'),
+    ]),
+    new FilterGroup('mime', [
+      new Filter('has_only_supp_image_type'),
+      new Filter('has_unsupp_image_type'),
+      new Filter('has_only_supp_doc_type'),
+      new Filter('has_unsupp_doc_type'),
+    ]),
+    new FilterGroup('bundle', [
+      new Filter('has_unsupported_bundle'),
+      new Filter('has_small_thumbnail'),
+      new Filter('has_original_without_thumbnail'),
+      new Filter('has_invalid_thumbnail_name'),
+      new Filter('has_non_generated_thumb'),
+      new Filter('no_license'),
+      new Filter('has_license_documentation'),
+    ]),
+    new FilterGroup('permission', [
+      new Filter('has_restricted_original', true),
+      new Filter('has_restricted_thumbnail', true),
+      new Filter('has_restricted_metadata', true),
+    ]),
+  ];
+
+  @Input() filtersForm: FormGroup;
+
+  static formGroup(formBuilder: FormBuilder): FormGroup {
+    const fields = {};
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        fields[filter.id] = new FormControl(false);
+      }
+    }
+    return formBuilder.group(fields);
+  }
+
+  static getFilter(filterId: string): Filter {
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        if (filter.id === filterId) {
+          return filter;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  static getGroup(filterId: string): FilterGroup {
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        if (filter.id === filterId) {
+          return group;
+        }
+      }
+    }
+    return undefined;
+  }
+
+  static toQueryString(filters: { [key: string]: any }): string {
+    let params = '';
+    let first = true;
+    for (const key in filters) {
+      if (filters[key]) {
+        if (first) {
+          first = false;
+        } else {
+          params += '&';
+        }
+        params += `filters=${key}`;
+      }
+    }
+    return params;
+  }
+
+  allFilters(): FilterGroup[] {
+    return FiltersComponent.FILTERS;
+  }
+
+  private setAllFilters(value: boolean) {
+    // I don't know why, but patchValue() with individual controls doesn't work.
+    // I therefore use setValue() with the whole set, which mercifully works...
+    const fields = {};
+    const allFilters = FiltersComponent.FILTERS;
+    for (let i = 0; i < allFilters.length; i++) {
+      const group = allFilters[i];
+      for (let j = 0; j < group.filters.length; j++) {
+        const filter = group.filters[j];
+        fields[filter.id] = value;
+      }
+    }
+    this.filtersForm.setValue(fields);
+  }
+
+  selectAll(): void {
+    this.setAllFilters(true);
+  }
+
+  deselectAll(): void {
+    this.setAllFilters(false);
+  }
+
+}
diff --git a/src/app/admin/admin-routing-paths.ts b/src/app/admin/admin-routing-paths.ts
index 3168ea93c9..bfcd16d18d 100644
--- a/src/app/admin/admin-routing-paths.ts
+++ b/src/app/admin/admin-routing-paths.ts
@@ -1,8 +1,30 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAdminModuleRoute } from '../app-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { getQualityAssuranceEditRoute } from './admin-notifications/admin-notifications-routing-paths';
 
 export const REGISTRIES_MODULE_PATH = 'registries';
+export const NOTIFICATIONS_MODULE_PATH = 'notifications';
+export const LDN_PATH = 'ldn';
+export const REPORTS_MODULE_PATH = 'reports';
+export const NOTIFY_DASHBOARD_MODULE_PATH = 'notify-dashboard';
+
 
 export function getRegistriesModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
 }
+
+export function getLdnServicesModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), LDN_PATH).toString();
+}
+
+export function getNotificationsModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), NOTIFICATIONS_MODULE_PATH).toString();
+}
+
+export function getNotificatioQualityAssuranceRoute() {
+  return new URLCombiner(`/${NOTIFICATIONS_MODULE_PATH}`, getQualityAssuranceEditRoute()).toString();
+}
+
+export function getReportsModuleRoute() {
+  return new URLCombiner(getAdminModuleRoute(), REPORTS_MODULE_PATH).toString();
+}
diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts
index 1ea20bc9a0..d9255e6482 100644
--- a/src/app/admin/admin-routing.module.ts
+++ b/src/app/admin/admin-routing.module.ts
@@ -1,58 +1,105 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
-import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
+import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
+import {
+  LDN_PATH,
+  NOTIFICATIONS_MODULE_PATH,
+  NOTIFY_DASHBOARD_MODULE_PATH,
+  REGISTRIES_MODULE_PATH,
+  REPORTS_MODULE_PATH,
+} from './admin-routing-paths';
+import { AdminSearchPageComponent } from './admin-search-page/admin-search-page.component';
+import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
+      {
+        path: NOTIFICATIONS_MODULE_PATH,
+        loadChildren: () => import('./admin-notifications/admin-notifications.module')
+          .then((m) => m.AdminNotificationsModule),
+      },
       {
         path: REGISTRIES_MODULE_PATH,
         loadChildren: () => import('./admin-registries/admin-registries.module')
           .then((m) => m.AdminRegistriesModule),
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'search',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminSearchPageComponent,
-        data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' }
+        data: { title: 'admin.search.title', breadcrumbKey: 'admin.search' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'workflow',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminWorkflowPageComponent,
-        data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' }
+        data: { title: 'admin.workflow.title', breadcrumbKey: 'admin.workflow' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'curation-tasks',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: AdminCurationTasksComponent,
-        data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' }
+        data: { title: 'admin.curation-tasks.title', breadcrumbKey: 'admin.curation-tasks' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'metadata-import',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: MetadataImportPageComponent,
-        data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' }
+        data: { title: 'admin.metadata-import.title', breadcrumbKey: 'admin.metadata-import' },
+        canActivate: [SiteAdministratorGuard],
       },
       {
         path: 'batch-import',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
         component: BatchImportPageComponent,
-        data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' }
+        data: { title: 'admin.batch-import.title', breadcrumbKey: 'admin.batch-import' },
+        canActivate: [SiteAdministratorGuard],
       },
-    ])
+      {
+        path: 'system-wide-alert',
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        loadChildren: () => import('../system-wide-alert/system-wide-alert.module').then((m) => m.SystemWideAlertModule),
+        data: { title: 'admin.system-wide-alert.title', breadcrumbKey: 'admin.system-wide-alert' },
+        canActivate: [SiteAdministratorGuard],
+      },
+      {
+        path: LDN_PATH,
+        children: [
+          { path: '', pathMatch: 'full', redirectTo: 'services' },
+          {
+            path: 'services',
+            loadChildren: () => import('./admin-ldn-services/admin-ldn-services.module')
+              .then((m) => m.AdminLdnServicesModule),
+          },
+        ],
+      },
+      {
+        path: REPORTS_MODULE_PATH,
+        loadChildren: () => import('./admin-reports/admin-reports.module')
+          .then((m) => m.AdminReportsModule),
+      },
+      {
+        path: NOTIFY_DASHBOARD_MODULE_PATH,
+        loadChildren: () => import('./admin-notify-dashboard/admin-notify-dashboard.module')
+          .then((m) => m.AdminNotifyDashboardModule),
+      },
+    ]),
   ],
   providers: [
     I18nBreadcrumbResolver,
-    I18nBreadcrumbsService
-  ]
+    I18nBreadcrumbsService,
+  ],
 })
 export class AdminRoutingModule {
 
diff --git a/src/app/admin/admin-search-page/admin-search-page.component.spec.ts b/src/app/admin/admin-search-page/admin-search-page.component.spec.ts
index 7be486d7da..43c7d86a08 100644
--- a/src/app/admin/admin-search-page/admin-search-page.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-page.component.spec.ts
@@ -1,7 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 
 import { AdminSearchPageComponent } from './admin-search-page.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('AdminSearchPageComponent', () => {
   let component: AdminSearchPageComponent;
@@ -10,7 +14,7 @@ describe('AdminSearchPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [AdminSearchPageComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-page.component.ts b/src/app/admin/admin-search-page/admin-search-page.component.ts
index c9c6b84245..6508b20efa 100644
--- a/src/app/admin/admin-search-page/admin-search-page.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-page.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
 
 @Component({
   selector: 'ds-admin-search-page',
   templateUrl: './admin-search-page.component.html',
-  styleUrls: ['./admin-search-page.component.scss']
+  styleUrls: ['./admin-search-page.component.scss'],
 })
 
 /**
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
index 1ea27b36b6..249c6b15bb 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.spec.ts
@@ -1,27 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { SharedModule } from '../../../../../shared/shared.module';
-import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { AuthService } from '../../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
-import { FileService } from '../../../../../core/shared/file.service';
-import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
-import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { FileService } from '../../../../../core/shared/file.service';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionAdminSearchResultGridElementComponent } from './collection-admin-search-result-grid-element.component';
 
 describe('CollectionAdminSearchResultGridElementComponent', () => {
   let component: CollectionAdminSearchResultGridElementComponent;
@@ -37,7 +42,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
   }
 
   const linkService = jasmine.createSpyObj('linkService', {
-    resolveLink: {}
+    resolveLink: {},
   });
 
   beforeEach(waitForAsync(() => {
@@ -47,7 +52,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
         NoopAnimationsModule,
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([]),
-        SharedModule
+        SharedModule,
       ],
       declarations: [CollectionAdminSearchResultGridElementComponent],
       providers: [
@@ -58,7 +63,7 @@ describe('CollectionAdminSearchResultGridElementComponent', () => {
         { provide: FileService, useClass: FileServiceStub },
         { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: ThemeService, useValue: getMockThemeService() },
-      ]
+      ],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
index 1412090e0f..5d39b79da5 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
-import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-collection-admin-search-result-list-element',
   styleUrls: ['./collection-admin-search-result-grid-element.component.scss'],
-  templateUrl: './collection-admin-search-result-grid-element.component.html'
+  templateUrl: './collection-admin-search-result-grid-element.component.html',
 })
 /**
  * The component for displaying a list element for a collection search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
index 996366e20a..137f5be5f2 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.spec.ts
@@ -1,29 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { SharedModule } from '../../../../../shared/shared.module';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { AuthService } from '../../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
-import { FileService } from '../../../../../core/shared/file.service';
-import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
-import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { Community } from '../../../../../core/shared/community.model';
+import { FileService } from '../../../../../core/shared/file.service';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
 import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CommunityAdminSearchResultGridElementComponent } from './community-admin-search-result-grid-element.component';
 
 describe('CommunityAdminSearchResultGridElementComponent', () => {
   let component: CommunityAdminSearchResultGridElementComponent;
@@ -39,7 +43,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
   }
 
   const linkService = jasmine.createSpyObj('linkService', {
-    resolveLink: {}
+    resolveLink: {},
   });
 
   beforeEach(waitForAsync(() => {
@@ -49,7 +53,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
         NoopAnimationsModule,
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([]),
-        SharedModule
+        SharedModule,
       ],
       declarations: [CommunityAdminSearchResultGridElementComponent],
       providers: [
@@ -61,7 +65,7 @@ describe('CommunityAdminSearchResultGridElementComponent', () => {
         { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: ThemeService, useValue: getMockThemeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
index b0d603338b..9dd672e54c 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
-import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
+import { Community } from '../../../../../core/shared/community.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-community-admin-search-result-grid-element',
   styleUrls: ['./community-admin-search-result-grid-element.component.scss'],
-  templateUrl: './community-admin-search-result-grid-element.component.html'
+  templateUrl: './community-admin-search-result-grid-element.component.html',
 })
 /**
  * The component for displaying a list element for a community search result on the admin search page
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.html 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.html
index c4b737849b..639c47f7f8 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.html
+++ 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.html
@@ -1,4 +1,4 @@
-<ng-template dsListableObject>
+<ng-template dsDynamicComponentLoader>
 </ng-template>
 <div #badges>
   <ng-content></ng-content>
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.spec.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.spec.ts
index e478aa3ef3..80bd4469f6 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.spec.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.spec.ts
@@ -1,31 +1,36 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
+
+import { AuthService } from '../../../../../core/auth/auth.service';
+import { AccessStatusDataService } from '../../../../../core/data/access-status-data.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
 import { Bitstream } from '../../../../../core/shared/bitstream.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { SharedModule } from '../../../../../shared/shared.module';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
-import { AccessStatusDataService } from '../../../../../core/data/access-status-data.service';
-import { AccessStatusObject } from '../../../../../shared/object-list/access-status-badge/access-status.model';
-import { AuthService } from '../../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
 import { FileService } from '../../../../../core/shared/file.service';
-import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
-import { AuthorizationDataService } from '../../../../../core/data/feature-authorization/authorization-data.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { AccessStatusObject } from '../../../../../shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { AuthServiceStub } from '../../../../../shared/testing/auth-service.stub';
 import { AuthorizationDataServiceStub } from '../../../../../shared/testing/authorization-service.stub';
+import { FileServiceStub } from '../../../../../shared/testing/file-service.stub';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { ItemAdminSearchResultGridElementComponent } from './item-admin-search-result-grid-element.component';
 
 describe('ItemAdminSearchResultGridElementComponent', () => {
   let component: ItemAdminSearchResultGridElementComponent;
@@ -36,13 +41,13 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
 
   const mockAccessStatusDataService = {
     findAccessStatusFor(item: Item): Observable<RemoteData<AccessStatusObject>> {
       return createSuccessfulRemoteDataObject$(new AccessStatusObject());
-    }
+    },
   };
 
   const mockThemeService = getMockThemeService();
@@ -63,7 +68,7 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
           NoopAnimationsModule,
           TranslateModule.forRoot(),
           RouterTestingModule.withRoutes([]),
-          SharedModule
+          SharedModule,
         ],
         providers: [
           { provide: TruncatableService, useValue: mockTruncatableService },
@@ -74,7 +79,7 @@ describe('ItemAdminSearchResultGridElementComponent', () => {
           { provide: FileService, useClass: FileServiceStub },
           { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .compileComponents();
   }));
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 1ab8fee8c2..b337df8ed2 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,39 +1,52 @@
-import { Component, ComponentFactoryResolver, ElementRef, OnInit, ViewChild } from '@angular/core';
+import {
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { hasValue } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import {
   getListableObjectComponent,
-  listableObjectComponent
+  listableObjectComponent,
 } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement, Context.AdminSearch)
 @Component({
   selector: 'ds-item-admin-search-result-grid-element',
   styleUrls: ['./item-admin-search-result-grid-element.component.scss'],
-  templateUrl: './item-admin-search-result-grid-element.component.html'
+  templateUrl: './item-admin-search-result-grid-element.component.html',
 })
 /**
  * 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 {
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
+export class ItemAdminSearchResultGridElementComponent extends SearchResultGridElementComponent<ItemSearchResult, Item> implements OnDestroy, OnInit {
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) dynamicComponentLoaderDirective: DynamicComponentLoaderDirective;
   @ViewChild('badges', { static: true }) badges: ElementRef;
   @ViewChild('buttons', { static: true }) buttons: ElementRef;
 
-  constructor(protected truncatableService: TruncatableService,
-              protected bitstreamDataService: BitstreamDataService,
-              private themeService: ThemeService,
-              private componentFactoryResolver: ComponentFactoryResolver
+  protected compRef: ComponentRef<Component>;
+
+  constructor(
+    public dsoNameService: DSONameService,
+    protected truncatableService: TruncatableService,
+    protected bitstreamDataService: BitstreamDataService,
+    private themeService: ThemeService,
   ) {
-    super(truncatableService, bitstreamDataService);
+    super(dsoNameService, truncatableService, bitstreamDataService);
   }
 
   /**
@@ -41,23 +54,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;
+    const viewContainerRef = this.dynamicComponentLoaderDirective.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-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
index 8937847ff5..cd7e7a237b 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.spec.ts
@@ -1,20 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CollectionAdminSearchResultListElementComponent } from './collection-admin-search-result-list-element.component';
 
 describe('CollectionAdminSearchResultListElementComponent', () => {
   let component: CollectionAdminSearchResultListElementComponent;
@@ -34,13 +38,13 @@ describe('CollectionAdminSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [CollectionAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
index 8bcf20b230..4ca4c3af4d 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
-import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
-import { Collection } from '../../../../../core/shared/collection.model';
+
 import { getCollectionEditRoute } from '../../../../../collection-page/collection-page-routing-paths';
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../../../shared/object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
   selector: 'ds-collection-admin-search-result-list-element',
   styleUrls: ['./collection-admin-search-result-list-element.component.scss'],
-  templateUrl: './collection-admin-search-result-list-element.component.html'
+  templateUrl: './collection-admin-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for a collection search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
index 110d77b1e5..3c1315cc64 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.spec.ts
@@ -1,20 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
-import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../../../../core/shared/community.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { CommunityAdminSearchResultListElementComponent } from './community-admin-search-result-list-element.component';
 
 describe('CommunityAdminSearchResultListElementComponent', () => {
   let component: CommunityAdminSearchResultListElementComponent;
@@ -34,13 +38,13 @@ describe('CommunityAdminSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [CommunityAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
index 9419ae3f3f..a3f8b42a13 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
-import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
-import { Community } from '../../../../../core/shared/community.model';
+
 import { getCommunityEditRoute } from '../../../../../community-page/community-page-routing-paths';
+import { Community } from '../../../../../core/shared/community.model';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { CommunitySearchResult } from '../../../../../shared/object-collection/shared/community-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
   selector: 'ds-community-admin-search-result-list-element',
   styleUrls: ['./community-admin-search-result-list-element.component.scss'],
-  templateUrl: './community-admin-search-result-list-element.component.html'
+  templateUrl: './community-admin-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for a community search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
index 259512552c..991508335f 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.html
@@ -2,6 +2,5 @@
                                      [viewMode]="viewModes.ListElement"
                                      [index]="index"
                                      [linkType]="linkType"
-                                     [listID]="listID"
-                                     [hideBadges]="true"></ds-listable-object-component-loader>
+                                     [listID]="listID"></ds-listable-object-component-loader>
 <ds-item-admin-search-result-actions-element [item]="dso" [small]="false"></ds-item-admin-search-result-actions-element>
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
index 667e8edea9..f34c2709d8 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { ItemAdminSearchResultListElementComponent } from './item-admin-search-result-list-element.component';
 
 describe('ItemAdminSearchResultListElementComponent', () => {
   let component: ItemAdminSearchResultListElementComponent;
@@ -31,13 +36,13 @@ describe('ItemAdminSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [ItemAdminSearchResultListElementComponent],
       providers: [{ provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
index b1dea11341..c181640c2c 100644
--- a/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.AdminSearch)
 @Component({
   selector: 'ds-item-admin-search-result-list-element',
   styleUrls: ['./item-admin-search-result-list-element.component.scss'],
-  templateUrl: './item-admin-search-result-list-element.component.html'
+  templateUrl: './item-admin-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
index f354ac5f89..33a2cacb80 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.spec.ts
@@ -1,21 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Item } from '../../../core/shared/item.model';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 import {
   ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
+  ITEM_EDIT_WITHDRAW_PATH,
 } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
+import { ItemAdminSearchResultActionsComponent } from './item-admin-search-result-actions.component';
 
 describe('ItemAdminSearchResultActionsComponent', () => {
   let component: ItemAdminSearchResultActionsComponent;
@@ -34,10 +38,10 @@ describe('ItemAdminSearchResultActionsComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [ItemAdminSearchResultActionsComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
index fcc3cf0f17..54f6c82f3b 100644
--- a/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
+++ b/src/app/admin/admin-search-page/admin-search-results/item-admin-search-result-actions.component.ts
@@ -1,20 +1,24 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Item } from '../../../core/shared/item.model';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 import {
-  ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_DELETE_PATH,
-  ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_PRIVATE_PATH,
+  ITEM_EDIT_PUBLIC_PATH,
   ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
+  ITEM_EDIT_WITHDRAW_PATH,
 } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { getItemEditRoute } from '../../../item-page/item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-admin-search-result-actions-element',
   styleUrls: ['./item-admin-search-result-actions.component.scss'],
-  templateUrl: './item-admin-search-result-actions.component.html'
+  templateUrl: './item-admin-search-result-actions.component.html',
 })
 /**
  * The component for displaying the actions for a list element for an item search result on the admin search page
diff --git a/src/app/admin/admin-search-page/admin-search.module.ts b/src/app/admin/admin-search-page/admin-search.module.ts
index 353d6dd498..f8eec908ff 100644
--- a/src/app/admin/admin-search-page/admin-search.module.ts
+++ b/src/app/admin/admin-search-page/admin-search.module.ts
@@ -1,16 +1,17 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
-import { AdminSearchPageComponent } from './admin-search-page.component';
-import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
-import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
-import { CollectionAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
-import { ItemAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
-import { CommunityAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
-import { CollectionAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
-import { ItemAdminSearchResultActionsComponent } from './admin-search-results/item-admin-search-result-actions.component';
+
 import { JournalEntitiesModule } from '../../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../../entity-groups/research-entities/research-entities.module';
 import { SearchModule } from '../../shared/search/search.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminSearchPageComponent } from './admin-search-page.component';
+import { CollectionAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/collection-search-result/collection-admin-search-result-grid-element.component';
+import { CommunityAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/community-search-result/community-admin-search-result-grid-element.component';
+import { ItemAdminSearchResultGridElementComponent } from './admin-search-results/admin-search-result-grid-element/item-search-result/item-admin-search-result-grid-element.component';
+import { CollectionAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/collection-search-result/collection-admin-search-result-list-element.component';
+import { CommunityAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/community-search-result/community-admin-search-result-list-element.component';
+import { ItemAdminSearchResultListElementComponent } from './admin-search-results/admin-search-result-list-element/item-search-result/item-admin-search-result-list-element.component';
+import { ItemAdminSearchResultActionsComponent } from './admin-search-results/item-admin-search-result-actions.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -20,7 +21,7 @@ const ENTRY_COMPONENTS = [
   ItemAdminSearchResultGridElementComponent,
   CommunityAdminSearchResultGridElementComponent,
   CollectionAdminSearchResultGridElementComponent,
-  ItemAdminSearchResultActionsComponent
+  ItemAdminSearchResultActionsComponent,
 ];
 
 @NgModule({
@@ -28,12 +29,12 @@ const ENTRY_COMPONENTS = [
     SearchModule,
     SharedModule.withEntryComponents(),
     JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents()
+    ResearchEntitiesModule.withEntryComponents(),
   ],
   declarations: [
     AdminSearchPageComponent,
-    ...ENTRY_COMPONENTS
-  ]
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class AdminSearchModule {
   /**
@@ -43,7 +44,7 @@ export class AdminSearchModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
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 8706b40ee0..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: !hasLink }"
-       [attr.aria-disabled]="!hasLink"
-       [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 14d5d38199..3131899c49 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
@@ -1,15 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { MenuService } from '../../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
-import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service';
+import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
 import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
-import { Component } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { AdminSidebarSectionComponent } from './admin-sidebar-section.component';
-import { RouterTestingModule } from '@angular/router/testing';
-import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
 
 describe('AdminSidebarSectionComponent', () => {
   let component: AdminSidebarSectionComponent;
@@ -17,44 +21,92 @@ describe('AdminSidebarSectionComponent', () => {
   const menuService = new MenuServiceStub();
   const iconString = 'test';
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
-      declarations: [AdminSidebarSectionComponent, TestComponent],
-      providers: [
-        { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com' }, icon: iconString } },
-        { provide: MenuService, useValue: menuService },
-        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
-      ]
-    }).overrideComponent(AdminSidebarSectionComponent, {
-      set: {
-        entryComponents: [TestComponent]
-      }
-    })
-      .compileComponents();
-  }));
+  describe('when not disabled', () => {
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(AdminSidebarSectionComponent);
-    component = fixture.componentInstance;
-    spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
-    fixture.detectChanges();
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
+        declarations: [AdminSidebarSectionComponent, TestComponent],
+        providers: [
+          { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com' }, icon: iconString } },
+          { provide: MenuService, useValue: menuService },
+          { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        ],
+      }).overrideComponent(AdminSidebarSectionComponent, {
+        set: {
+          entryComponents: [TestComponent],
+        },
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(AdminSidebarSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should set the right icon', () => {
+      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', () => {
+      const disabled = fixture.debugElement.query(By.css('.disabled'));
+      expect(disabled).toBeFalsy();
+    });
+
+  });
+  describe('when disabled', () => {
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot()],
+        declarations: [AdminSidebarSectionComponent, TestComponent],
+        providers: [
+          { provide: 'sectionDataProvider', useValue: { model: { link: 'google.com', disabled: true }, icon: iconString } },
+          { provide: MenuService, useValue: menuService },
+          { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        ],
+      }).overrideComponent(AdminSidebarSectionComponent, {
+        set: {
+          entryComponents: [TestComponent],
+        },
+      })
+        .compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(AdminSidebarSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should set the right icon', () => {
+      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', () => {
+      const disabled = fixture.debugElement.query(By.css('.disabled'));
+      expect(disabled).toBeTruthy();
+    });
   });
 
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  it('should set the right icon', () => {
-    const icon = fixture.debugElement.query(By.css('.shortcut-icon')).query(By.css('i.fas'));
-    expect(icon.nativeElement.getAttribute('class')).toContain('fa-' + iconString);
-  });
 });
 
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
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 47f693cb99..d677c7f8ba 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
@@ -1,19 +1,24 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component';
-import { MenuService } from '../../../shared/menu/menu.service';
-import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
-import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
-import { MenuSection } from '../../../shared/menu/menu-section.model';
-import { MenuID } from '../../../shared/menu/menu-id.model';
-import { isNotEmpty } from '../../../shared/empty.util';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
+import { isEmpty } from '../../../shared/empty.util';
+import { MenuService } from '../../../shared/menu/menu.service';
+import { MenuID } from '../../../shared/menu/menu-id.model';
+import { LinkMenuItemModel } from '../../../shared/menu/menu-item/models/link.model';
+import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
+import { MenuSection } from '../../../shared/menu/menu-section.model';
+import { MenuSectionComponent } from '../../../shared/menu/menu-section/menu-section.component';
+
 /**
  * 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'],
 
@@ -26,7 +31,12 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
    */
   menuID: MenuID = MenuID.ADMIN;
   itemModel;
-  hasLink: boolean;
+
+  /**
+   * Boolean to indicate whether this section is disabled
+   */
+  isDisabled: boolean;
+
   constructor(
     @Inject('sectionDataProvider') menuSection: MenuSection,
     protected menuService: MenuService,
@@ -38,14 +48,22 @@ export class AdminSidebarSectionComponent extends MenuSectionComponent implement
   }
 
   ngOnInit(): void {
-    this.hasLink = isNotEmpty(this.itemModel?.link);
+    this.isDisabled = this.itemModel?.disabled || isEmpty(this.itemModel?.link);
     super.ngOnInit();
   }
 
   navigate(event: any): void {
     event.preventDefault();
-    if (this.hasLink) {
+    if (!this.isDisabled) {
       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..f3d5409a64 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)}
+      value: ((sidebarExpanded | async) !== true ? 'collapsed' : 'expanded'),
+      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) !== true" 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 b7fa396e80..b8de30031b 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.spec.ts
@@ -1,27 +1,36 @@
-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 { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { AdminSidebarComponent } from './admin-sidebar.component';
-import { MenuService } from '../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
-import { of as observableOf } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { RouterTestingModule } from '@angular/router/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+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 createSpy = jasmine.createSpy;
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
 import { Item } from '../../core/shared/item.model';
-import { ThemeService } from '../../shared/theme-support/theme.service';
+import { MenuService } from '../../shared/menu/menu.service';
 import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
+import { CSSVariableServiceStub } from '../../shared/testing/css-variable-service.stub';
+import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { AdminSidebarComponent } from './admin-sidebar.component';
 
 describe('AdminSidebarComponent', () => {
   let comp: AdminSidebarComponent;
@@ -38,23 +47,23 @@ describe('AdminSidebarComponent', () => {
     lastModified: '2018',
     _links: {
       self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
   });
 
 
   const routeStub = {
     data: observableOf({
-      dso: createSuccessfulRemoteDataObject(mockItem)
+      dso: createSuccessfulRemoteDataObject(mockItem),
     }),
-    children: []
+    children: [],
   };
 
 
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     scriptService = jasmine.createSpyObj('scriptService', { scriptWithNameExistsAndCanExecute: observableOf(true) });
     TestBed.configureTestingModule({
@@ -73,15 +82,15 @@ describe('AdminSidebarComponent', () => {
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
-          }
-        }
+            },
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(AdminSidebarComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-      }
+      },
     }).compileComponents();
   }));
 
@@ -144,10 +153,10 @@ 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: () => {/**/
-        }
+        },
       });
     });
 
@@ -162,7 +171,7 @@ describe('AdminSidebarComponent', () => {
       const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar'));
       sidebarToggler.triggerEventHandler('mouseenter', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick(99);
       expect(menuService.expandMenuPreview).not.toHaveBeenCalled();
@@ -177,7 +186,7 @@ describe('AdminSidebarComponent', () => {
       const sidebarToggler = fixture.debugElement.query(By.css('nav.navbar'));
       sidebarToggler.triggerEventHandler('mouseleave', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick(399);
       expect(menuService.collapseMenuPreview).not.toHaveBeenCalled();
diff --git a/src/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
index 8eb288daa2..37bc8bbf98 100644
--- a/src/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,14 +1,31 @@
-import { Component, HostListener, Injector, OnInit } from '@angular/core';
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import { debounceTime, distinctUntilChanged, first, map, withLatestFrom } from 'rxjs/operators';
+import {
+  Component,
+  HostListener,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  first,
+  map,
+  withLatestFrom,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { slideSidebar } from '../../shared/animations/slide';
 import { MenuComponent } from '../../shared/menu/menu.component';
 import { MenuService } from '../../shared/menu/menu.service';
-import { CSSVariableService } from '../../shared/sass-helper/sass-helper.service';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
-import { ActivatedRoute } from '@angular/router';
+import { CSSVariableService } from '../../shared/sass-helper/css-variable.service';
 import { ThemeService } from '../../shared/theme-support/theme.service';
 
 /**
@@ -18,7 +35,7 @@ import { ThemeService } from '../../shared/theme-support/theme.service';
   selector: 'ds-admin-sidebar',
   templateUrl: './admin-sidebar.component.html',
   styleUrls: ['./admin-sidebar.component.scss'],
-  animations: [slideSidebar]
+  animations: [slideSidebar],
 })
 export class AdminSidebarComponent extends MenuComponent implements OnInit {
   /**
@@ -28,9 +45,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 +66,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
    */
@@ -58,7 +86,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
     private authService: AuthService,
     public authorizationService: AuthorizationDataService,
     public route: ActivatedRoute,
-    protected themeService: ThemeService
+    protected themeService: ThemeService,
   ) {
     super(menuService, injector, authorizationService, route, themeService);
     this.inFocus$ = new BehaviorSubject(false);
@@ -69,7 +97,6 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarWidth = this.variableService.getVariable('sidebarItemsWidth');
     this.authService.isAuthenticated()
       .subscribe((loggedIn: boolean) => {
         if (loggedIn) {
@@ -83,13 +110,13 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
       });
     this.sidebarExpanded = combineLatest([this.menuCollapsed, this.menuPreviewCollapsed])
       .pipe(
-        map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed))
+        map(([collapsed, previewCollapsed]) => (!collapsed || !previewCollapsed)),
       );
     this.inFocus$.pipe(
       debounceTime(50),
       distinctUntilChanged(),  // disregard focusout in situations like --(focusout)-(focusin)--
       withLatestFrom(
-        combineLatest([this.menuCollapsed, this.menuPreviewCollapsed])
+        combineLatest([this.menuCollapsed, this.menuPreviewCollapsed]),
       ),
     ).subscribe(([inFocus, [collapsed, previewCollapsed]]) => {
       if (collapsed) {
@@ -100,6 +127,7 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         }
       }
     });
+    this.menuVisible = this.menuService.isMenuVisibleWithVisibleSections(this.menuID);
   }
 
   @HostListener('focusin')
@@ -133,6 +161,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') {
@@ -145,6 +174,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 734c3d2ef9..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,36 +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"
+     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 b1f3a63c06..d01f4693ef 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
@@ -1,17 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { ExpandableAdminSidebarSectionComponent } from './expandable-admin-sidebar-section.component';
-import { MenuService } from '../../../shared/menu/menu.service';
-import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
-import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
-import { of as observableOf } from 'rxjs';
 import { Component } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { MenuService } from '../../../shared/menu/menu.service';
+import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
+import { CSSVariableServiceStub } from '../../../shared/testing/css-variable-service.stub';
+import { MenuServiceStub } from '../../../shared/testing/menu-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
+import { ExpandableAdminSidebarSectionComponent } from './expandable-admin-sidebar-section.component';
 
 describe('ExpandableAdminSidebarSectionComponent', () => {
   let component: ExpandableAdminSidebarSectionComponent;
@@ -23,15 +27,15 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
       imports: [NoopAnimationsModule, TranslateModule.forRoot()],
       declarations: [ExpandableAdminSidebarSectionComponent, TestComponent],
       providers: [
-        { provide: 'sectionDataProvider', useValue: { icon: iconString } },
+        { provide: 'sectionDataProvider', useValue: { icon: iconString, model: {} } },
         { provide: MenuService, useValue: menuService },
         { provide: CSSVariableService, useClass: CSSVariableServiceStub },
         { provide: Router, useValue: new RouterStub() },
-      ]
+      ],
     }).overrideComponent(ExpandableAdminSidebarSectionComponent, {
       set: {
-        entryComponents: [TestComponent]
-      }
+        entryComponents: [TestComponent],
+      },
     })
       .compileComponents();
   }));
@@ -49,17 +53,17 @@ 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: () => {/**/
-        }
+        },
       });
     });
 
@@ -72,7 +76,7 @@ describe('ExpandableAdminSidebarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
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 7cd20b15d2..a43be47879 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
@@ -1,25 +1,33 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { rotate } from '../../../shared/animations/rotate';
-import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component';
-import { slide } from '../../../shared/animations/slide';
-import { CSSVariableService } from '../../../shared/sass-helper/sass-helper.service';
-import { bgColor } from '../../../shared/animations/bgColor';
-import { MenuService } from '../../../shared/menu/menu.service';
-import { combineLatest as combineLatestObservable, Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
-import { MenuID } from '../../../shared/menu/menu-id.model';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  combineLatest as combineLatestObservable,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { bgColor } from '../../../shared/animations/bgColor';
+import { rotate } from '../../../shared/animations/rotate';
+import { slide } from '../../../shared/animations/slide';
+import { MenuService } from '../../../shared/menu/menu.service';
+import { MenuID } from '../../../shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../../shared/menu/menu-section.decorator';
+import { CSSVariableService } from '../../../shared/sass-helper/css-variable.service';
+import { AdminSidebarSectionComponent } from '../admin-sidebar-section/admin-sidebar-section.component';
 
 /**
  * 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]
+  animations: [rotate, slide, bgColor],
 })
 
 @rendersSectionForMenu(MenuID.ADMIN, true)
@@ -32,23 +40,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 +73,20 @@ export class ExpandableAdminSidebarSectionComponent extends AdminSidebarSectionC
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.sidebarActiveBg = this.variableService.getVariable('adminSidebarActiveBg');
-    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..30f1a60ee2 100644
--- a/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
+++ b/src/app/admin/admin-sidebar/themed-admin-sidebar.component.ts
@@ -1,4 +1,9 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { AdminSidebarComponent } from './admin-sidebar.component';
 
@@ -11,6 +16,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-page.component.html b/src/app/admin/admin-workflow-page/admin-workflow-page.component.html
index 404af131d1..d12cefb331 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.html
@@ -1 +1 @@
-<ds-configuration-search-page configuration="workflowAdmin" [context]="context"></ds-configuration-search-page>
+<ds-configuration-search-page configuration="supervision" [context]="context"></ds-configuration-search-page>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
index c80bc677f2..b422cfd7c7 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.spec.ts
@@ -1,7 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 
 import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 
 describe('AdminSearchPageComponent', () => {
   let component: AdminWorkflowPageComponent;
@@ -10,7 +14,7 @@ describe('AdminSearchPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [AdminWorkflowPageComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
index c3ccc9555a..0b66fe711c 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-page.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
 
 @Component({
   selector: 'ds-admin-workflow-page',
   templateUrl: './admin-workflow-page.component.html',
-  styleUrls: ['./admin-workflow-page.component.scss']
+  styleUrls: ['./admin-workflow-page.component.scss'],
 })
 
 /**
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
similarity index 100%
rename from src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.html
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.html
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.scss
similarity index 100%
rename from src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.scss
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.scss
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts
similarity index 67%
rename from src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts
index 75e0e2e7a8..8aaec2bbf8 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.spec.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.spec.ts
@@ -1,27 +1,39 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { WorkflowItemAdminWorkflowActionsComponent } from './workflow-item-admin-workflow-actions.component';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
 import {
   getWorkflowItemDeleteRoute,
-  getWorkflowItemSendBackRoute
-} from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+  getWorkflowItemSendBackRoute,
+} from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { WorkflowItemAdminWorkflowActionsComponent } from './workflow-item-admin-workflow-actions.component';
 
 describe('WorkflowItemAdminWorkflowActionsComponent', () => {
   let component: WorkflowItemAdminWorkflowActionsComponent;
   let fixture: ComponentFixture<WorkflowItemAdminWorkflowActionsComponent>;
   let id;
   let wfi;
+  let item = new Item();
+  item.uuid = 'itemUUID1111';
+  const rd = new RemoteData(undefined, undefined, undefined, RequestEntryState.Success, undefined, item, 200);
 
   function init() {
     id = '780b2588-bda5-4112-a1cd-0b15000a5339';
     wfi = new WorkflowItem();
     wfi.id = id;
+    wfi.item = of(rd);
   }
 
   beforeEach(waitForAsync(() => {
@@ -29,10 +41,10 @@ describe('WorkflowItemAdminWorkflowActionsComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [WorkflowItemAdminWorkflowActionsComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -59,4 +71,5 @@ describe('WorkflowItemAdminWorkflowActionsComponent', () => {
     const link = a.nativeElement.href;
     expect(link).toContain(new URLCombiner(getWorkflowItemSendBackRoute(wfi.id)).toString());
   });
+
 });
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
similarity index 67%
rename from src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
index 32725a0e7a..1f724c351e 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/workflow-item-admin-workflow-actions.component.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component.ts
@@ -1,17 +1,21 @@
-import { Component, Input } from '@angular/core';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import {
-    getWorkflowItemSendBackRoute,
-    getWorkflowItemDeleteRoute
-} from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+  Component,
+  Input,
+} from '@angular/core';
+
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import {
+  getWorkflowItemDeleteRoute,
+  getWorkflowItemSendBackRoute,
+} from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
 
 @Component({
   selector: 'ds-workflow-item-admin-workflow-actions-element',
   styleUrls: ['./workflow-item-admin-workflow-actions.component.scss'],
-  templateUrl: './workflow-item-admin-workflow-actions.component.html'
+  templateUrl: './workflow-item-admin-workflow-actions.component.html',
 })
 /**
- * The component for displaying the actions for a list element for an item on the admin workflow search page
+ * The component for displaying the actions for a list element for a workflow-item on the admin workflow search page
  */
 export class WorkflowItemAdminWorkflowActionsComponent {
 
@@ -21,7 +25,7 @@ export class WorkflowItemAdminWorkflowActionsComponent {
   @Input() public wfi: WorkflowItem;
 
   /**
-   * Whether or not to use small buttons
+   * Whether to use small buttons or not
    */
   @Input() public small: boolean;
 
@@ -29,7 +33,6 @@ export class WorkflowItemAdminWorkflowActionsComponent {
    * Returns the path to the delete page of this workflow item
    */
   getDeleteRoute(): string {
-
     return getWorkflowItemDeleteRoute(this.wfi.id);
   }
 
@@ -39,4 +42,5 @@ export class WorkflowItemAdminWorkflowActionsComponent {
   getSendBackRoute(): string {
     return getWorkflowItemSendBackRoute(this.wfi.id);
   }
+
 }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
new file mode 100644
index 0000000000..3ad1dce0b8
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
@@ -0,0 +1,44 @@
+<div>
+    <div class="modal-header">{{'supervision-group-selector.header' | translate}}
+        <button type="button" class="close" (click)="close()" aria-label="Close">
+            <span aria-hidden="true">×</span>
+        </button>
+    </div>
+    <div class="modal-body">
+        <div class="row">
+            <div class="control-group col-sm-12">
+                <label for="supervisionOrder">{{'supervision-group-selector.select.type-of-order.label' | translate}}</label>
+                <select name="supervisionOrder" id="supervisionOrder" class="form-control"
+                        [(ngModel)]="selectedOrderType"
+                        attr.aria-label="{{'supervision-group-selector.select.type-of-order.label' | translate}}">
+                    <option value="EDITOR">{{'supervision-group-selector.select.type-of-order.option.editor' | translate}}</option>
+                    <option value="OBSERVER">{{'supervision-group-selector.select.type-of-order.option.observer' | translate}}</option>
+                </select>
+                <ds-error *ngIf="isSubmitted && (!selectedOrderType || selectedOrderType === '')"
+                          message="{{'supervision-group-selector.select.type-of-order.error' | translate}}"></ds-error>
+            </div>
+        </div>
+        <div class="row">
+            <div class="control-group col-sm-12">
+                <label for="supervisionGroup">{{'supervision-group-selector.select.group.label' | translate}}</label>
+                <ng-container class="mb-3">
+                    <input id="supervisionGroup" class="form-control" type="text" [value]="selectedGroup ? dsoNameService.getName(selectedGroup) : ''" disabled>
+                    <ds-error *ngIf="isSubmitted && !selectedGroup" message="{{'supervision-group-selector.select.group.error' | translate}}"></ds-error>
+                </ng-container>
+                <ds-eperson-group-list [isListOfEPerson]="false"
+                                       (select)="updateGroupObjectSelected($event)"></ds-eperson-group-list>
+            </div>
+        </div>
+<!--        <div class="d-flex flex-row-reverse m-2">          -->
+        <div class="modal-footer">
+          <button class="btn btn-outline-secondary"
+                  (click)="close()">
+            <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
+          </button>
+          <button class="btn btn-primary save"
+                  (click)="save()">
+            <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
+          </button>
+        </div>
+    </div>
+</div>
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.scss
similarity index 100%
rename from src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.scss
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.scss
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts
new file mode 100644
index 0000000000..9415c4f9fb
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.spec.ts
@@ -0,0 +1,78 @@
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { Group } from '../../../../../../core/eperson/models/group.model';
+import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
+import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service';
+import { NotificationsService } from '../../../../../../shared/notifications/notifications.service';
+import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector.component';
+
+describe('SupervisionOrderGroupSelectorComponent', () => {
+  let component: SupervisionOrderGroupSelectorComponent;
+  let fixture: ComponentFixture<SupervisionOrderGroupSelectorComponent>;
+  let debugElement: DebugElement;
+
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
+  const supervisionOrderDataService: any = jasmine.createSpyObj('supervisionOrderDataService', {
+    create: of(new SupervisionOrder()),
+  });
+
+  const selectedOrderType = 'NONE';
+  const itemUUID = 'itemUUID1234';
+
+  const selectedGroup = new Group();
+  selectedGroup.uuid = 'GroupUUID1234';
+
+  const supervisionDataObject = new SupervisionOrder();
+  supervisionDataObject.ordertype = selectedOrderType;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [SupervisionOrderGroupSelectorComponent],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub },
+        { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
+        { provide: NotificationsService, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(SupervisionOrderGroupSelectorComponent);
+    component = fixture.componentInstance;
+
+  }));
+
+  beforeEach(() => {
+    component.itemUUID = itemUUID;
+    component.selectedGroup = selectedGroup;
+    component.selectedOrderType = selectedOrderType;
+    debugElement = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should call create for supervision order', () => {
+    component.save();
+    fixture.detectChanges();
+    expect(supervisionOrderDataService.create).toHaveBeenCalledWith(supervisionDataObject, itemUUID, selectedGroup.uuid, selectedOrderType);
+  });
+
+});
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
new file mode 100644
index 0000000000..0ddc588c1a
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.ts
@@ -0,0 +1,102 @@
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { getFirstCompletedRemoteData } from 'src/app/core/shared/operators';
+import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
+
+import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { Group } from '../../../../../../core/eperson/models/group.model';
+import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
+import { SupervisionOrderDataService } from '../../../../../../core/supervision-order/supervision-order-data.service';
+
+/**
+ * Component to wrap a dropdown - for type of order -
+ * and a list of groups
+ * inside a modal
+ * Used to create a new supervision order
+ */
+
+@Component({
+  selector: 'ds-supervision-group-selector',
+  styleUrls: ['./supervision-order-group-selector.component.scss'],
+  templateUrl: './supervision-order-group-selector.component.html',
+})
+export class SupervisionOrderGroupSelectorComponent {
+
+  /**
+   * The item to perform the actions on
+   */
+  itemUUID: string;
+
+  /**
+   * The selected supervision order type
+   */
+  selectedOrderType: string;
+
+  /**
+   * selected group for supervision
+   */
+  selectedGroup: Group;
+
+  /**
+   * boolean flag for the validations
+   */
+  isSubmitted = false;
+
+  /**
+   * Event emitted when a new SupervisionOrder has been created
+   */
+  @Output() create: EventEmitter<SupervisionOrder> = new EventEmitter<SupervisionOrder>();
+
+  constructor(
+    public dsoNameService: DSONameService,
+    private activeModal: NgbActiveModal,
+    private supervisionOrderDataService: SupervisionOrderDataService,
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService,
+  ) { }
+
+  /**
+   * Close the modal
+   */
+  close() {
+    this.activeModal.close();
+  }
+
+  /**
+   * Assign the value of group on select
+   */
+  updateGroupObjectSelected(object) {
+    this.selectedGroup = object;
+  }
+
+  /**
+   * Save the supervision order
+   */
+  save() {
+    this.isSubmitted = true;
+    if (this.selectedOrderType && this.selectedGroup) {
+      const supervisionDataObject = new SupervisionOrder();
+      supervisionDataObject.ordertype = this.selectedOrderType;
+      this.supervisionOrderDataService.create(supervisionDataObject, this.itemUUID, this.selectedGroup.uuid, this.selectedOrderType).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((rd: RemoteData<SupervisionOrder>) => {
+        if (rd.state === 'Success') {
+          this.notificationsService.success(this.translateService.get('supervision-group-selector.notification.create.success.title', { name: this.dsoNameService.getName(this.selectedGroup) }));
+          this.create.emit(rd.payload);
+          this.close();
+        } else {
+          this.notificationsService.error(
+            this.translateService.get('supervision-group-selector.notification.create.failure.title'),
+            rd.statusCode === 422 ? this.translateService.get('supervision-group-selector.notification.create.already-existing') : rd.errorMessage);
+        }
+      });
+    }
+  }
+
+}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
new file mode 100644
index 0000000000..84d8c052cd
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.html
@@ -0,0 +1,15 @@
+<ng-container *ngVar="(supervisionOrderEntries$ | async) as supervisionOrders">
+  <div class="item-list-supervision" *ngIf="supervisionOrders?.length > 0">
+    <div>
+      <span>{{'workflow-item.search.result.list.element.supervised-by' | translate}} </span>
+    </div>
+    <div>
+      <a class="badge badge-primary mr-1 mb-1 text-capitalize mw-100 text-truncate" *ngFor="let supervisionOrder of supervisionOrders" data-test="soBadge"
+         [ngbTooltip]="'workflow-item.search.result.list.element.supervised.remove-tooltip' | translate"
+         (click)="$event.preventDefault(); $event.stopImmediatePropagation(); deleteSupervisionOrder(supervisionOrder)" aria-label="Close">
+        {{ dsoNameService.getName(supervisionOrder.group) }}
+        <span aria-hidden="true"> ×</span>
+      </a>
+    </div>
+  </div>
+</ng-container>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.scss
new file mode 100644
index 0000000000..7818e34054
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.scss
@@ -0,0 +1,3 @@
+.badge {
+  cursor: pointer;
+}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts
new file mode 100644
index 0000000000..1a30bff969
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.spec.ts
@@ -0,0 +1,69 @@
+import {
+  NO_ERRORS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../../../../shared/mocks/translate-loader.mock';
+import { supervisionOrderListMock } from '../../../../../../shared/testing/supervision-order.mock';
+import { VarDirective } from '../../../../../../shared/utils/var.directive';
+import { SupervisionOrderStatusComponent } from './supervision-order-status.component';
+
+describe('SupervisionOrderStatusComponent', () => {
+  let component: SupervisionOrderStatusComponent;
+  let fixture: ComponentFixture<SupervisionOrderStatusComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        NgbTooltipModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      declarations: [ SupervisionOrderStatusComponent, VarDirective ],
+      schemas: [
+        NO_ERRORS_SCHEMA,
+      ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SupervisionOrderStatusComponent);
+    component = fixture.componentInstance;
+    component.supervisionOrderList = supervisionOrderListMock;
+    component.ngOnChanges(    {
+      supervisionOrderList: new SimpleChange(null, supervisionOrderListMock, true),
+    });
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render badges properly', () => {
+    const badges = fixture.debugElement.queryAll(By.css('[data-test="soBadge"]'));
+    expect(badges.length).toBe(2);
+  });
+
+  it('should emit delete event on click', () => {
+    spyOn(component.delete, 'emit');
+    const badges = fixture.debugElement.queryAll(By.css('[data-test="soBadge"]'));
+    badges[0].nativeElement.click();
+    expect(component.delete.emit).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
new file mode 100644
index 0000000000..37b5903f0c
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component.ts
@@ -0,0 +1,102 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  from,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  reduce,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { Group } from '../../../../../../core/eperson/models/group.model';
+import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators';
+import { SupervisionOrder } from '../../../../../../core/supervision-order/models/supervision-order.model';
+import { isNotEmpty } from '../../../../../../shared/empty.util';
+
+export interface SupervisionOrderListEntry {
+  supervisionOrder: SupervisionOrder;
+  group: Group
+}
+
+@Component({
+  selector: 'ds-supervision-order-status',
+  templateUrl: './supervision-order-status.component.html',
+  styleUrls: ['./supervision-order-status.component.scss'],
+})
+export class SupervisionOrderStatusComponent implements OnChanges {
+
+  /**
+   * The list of supervision order object to show
+   */
+  @Input() supervisionOrderList: SupervisionOrder[] = [];
+
+  /**
+   * List of the supervision orders combined with the group
+   */
+  supervisionOrderEntries$: BehaviorSubject<SupervisionOrderListEntry[]> = new BehaviorSubject([]);
+
+  @Output() delete: EventEmitter<SupervisionOrderListEntry> = new EventEmitter<SupervisionOrderListEntry>();
+
+  constructor(
+    public dsoNameService: DSONameService,
+  ) {
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes && changes.supervisionOrderList) {
+      this.getSupervisionOrderEntries(changes.supervisionOrderList.currentValue)
+        .subscribe((supervisionOrderEntries: SupervisionOrderListEntry[]) => {
+          this.supervisionOrderEntries$.next(supervisionOrderEntries);
+        });
+    }
+  }
+
+  /**
+   * Create a list of SupervisionOrderListEntry by the given SupervisionOrder list
+   *
+   * @param supervisionOrderList
+   */
+  private getSupervisionOrderEntries(supervisionOrderList: SupervisionOrder[]): Observable<SupervisionOrderListEntry[]> {
+    return from(supervisionOrderList).pipe(
+      mergeMap((so: SupervisionOrder) => so.group.pipe(
+        getFirstCompletedRemoteData(),
+        map((sogRD: RemoteData<Group>) => {
+          if (sogRD.hasSucceeded) {
+            const entry: SupervisionOrderListEntry = {
+              supervisionOrder: so,
+              group: sogRD.payload,
+            };
+            return entry;
+          } else {
+            return null;
+          }
+        }),
+      )),
+      reduce((acc: SupervisionOrderListEntry[], value: any) => {
+        if (isNotEmpty(value)) {
+          return [...acc, value];
+        } else {
+          return acc;
+        }
+      }, []),
+    );
+  }
+
+  /**
+   * Emit a delete event with the given SupervisionOrderListEntry.
+   */
+  deleteSupervisionOrder(supervisionOrder: SupervisionOrderListEntry) {
+    this.delete.emit(supervisionOrder);
+  }
+}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
new file mode 100644
index 0000000000..2b904a5429
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.html
@@ -0,0 +1,16 @@
+<div class="my-1">
+  <ds-supervision-order-status [supervisionOrderList]="supervisionOrderList"
+                               (delete)="deleteSupervisionOrder($event)"></ds-supervision-order-status>
+</div>
+
+<div class="space-children-mr">
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 delete-link" [routerLink]="[getDeleteRoute()]" [title]="'admin.workflow.item.delete' | translate">
+    <i class="fa fa-trash"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{"admin.workflow.item.delete" | translate}}</span>
+  </a>
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 policies-link" [routerLink]="resourcePoliciesPageRoute" [title]="'admin.workflow.item.policies' | translate">
+    <i class="fas fa-edit"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{'admin.workflow.item.policies' | translate}}</span>
+  </a>
+  <a [ngClass]="{'btn-sm': small}" class="btn btn-light my-1 supervision-group-selector" [title]="'admin.workflow.item.supervision' | translate" (click)="openSupervisionModal()">
+    <i class="fas fa-users-cog"></i><span *ngIf="!small" class="d-none d-sm-inline"> {{'admin.workflow.item.supervision' | translate}}</span>
+  </a>
+</div>
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.scss
similarity index 100%
rename from src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.scss
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.scss
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts
new file mode 100644
index 0000000000..ee5aaa40af
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.spec.ts
@@ -0,0 +1,155 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { URLCombiner } from '../../../../../core/url-combiner/url-combiner';
+import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../../../shared/testing/notifications-service.stub';
+import { supervisionOrderEntryMock } from '../../../../../shared/testing/supervision-order.mock';
+import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component';
+import { WorkspaceItemAdminWorkflowActionsComponent } from './workspace-item-admin-workflow-actions.component';
+
+describe('WorkspaceItemAdminWorkflowActionsComponent', () => {
+  let component: WorkspaceItemAdminWorkflowActionsComponent;
+  let fixture: ComponentFixture<WorkspaceItemAdminWorkflowActionsComponent>;
+  let id;
+  let wsi;
+  let item = new Item();
+  item.uuid = 'itemUUID1111';
+  const rd = new RemoteData(undefined, undefined, undefined, RequestEntryState.Success, undefined, item, 200);
+  let supervisionOrderDataService;
+  let notificationService: NotificationsServiceStub;
+
+  function init() {
+    notificationService = new NotificationsServiceStub();
+    supervisionOrderDataService = jasmine.createSpyObj('supervisionOrderDataService', {
+      searchByItem: jasmine.createSpy('searchByItem'),
+      delete: jasmine.createSpy('delete'),
+    });
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    wsi = new WorkspaceItem();
+    wsi.id = id;
+    wsi.item = of(rd);
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        NgbModalModule,
+        TranslateModule.forRoot(),
+        RouterTestingModule.withRoutes([]),
+      ],
+      declarations: [WorkspaceItemAdminWorkflowActionsComponent],
+      providers: [
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WorkspaceItemAdminWorkflowActionsComponent);
+    component = fixture.componentInstance;
+    component.wsi = wsi;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should render a delete button with the correct link', () => {
+    const button = fixture.debugElement.query(By.css('a.delete-link'));
+    const link = button.nativeElement.href;
+    expect(link).toContain(new URLCombiner(getWorkspaceItemDeleteRoute(wsi.id)).toString());
+  });
+
+  it('should render a policies button with the correct link', () => {
+    const a = fixture.debugElement.query(By.css('a.policies-link'));
+    const link = a.nativeElement.href;
+    expect(link).toContain(new URLCombiner('/items/itemUUID1111/edit/authorizations').toString());
+  });
+
+  describe('deleteSupervisionOrder', () => {
+
+    beforeEach(() => {
+      spyOn(component.delete, 'emit');
+      spyOn((component as any).modalService, 'open').and.returnValue({
+        componentInstance: { response: of(true) },
+      });
+    });
+
+    describe('when delete succeeded', () => {
+
+      beforeEach(() => {
+        supervisionOrderDataService.delete.and.returnValue(of(true));
+      });
+
+      it('should notify success', () => {
+        component.deleteSupervisionOrder(supervisionOrderEntryMock);
+        expect((component as any).modalService.open).toHaveBeenCalledWith(ConfirmationModalComponent);
+        expect(notificationService.success).toHaveBeenCalled();
+        expect(component.delete.emit).toHaveBeenCalled();
+      });
+
+    });
+
+    describe('when delete failed', () => {
+
+      beforeEach(() => {
+        supervisionOrderDataService.delete.and.returnValue(of(false));
+      });
+
+      it('should notify success', () => {
+        component.deleteSupervisionOrder(supervisionOrderEntryMock);
+        expect((component as any).modalService.open).toHaveBeenCalledWith(ConfirmationModalComponent);
+        expect(notificationService.error).toHaveBeenCalled();
+        expect(component.delete.emit).not.toHaveBeenCalled();
+      });
+
+    });
+
+  });
+
+  describe('openSupervisionModal', () => {
+
+    beforeEach(() => {
+      spyOn(component.create, 'emit');
+      spyOn((component as any).modalService, 'open').and.returnValue({
+        componentInstance: { create: of(true) },
+      });
+    });
+
+    it('should emit create event properly', () => {
+      component.openSupervisionModal();
+      expect((component as any).modalService.open).toHaveBeenCalledWith(SupervisionOrderGroupSelectorComponent, {
+        size: 'lg',
+        backdrop: 'static',
+      });
+      expect(component.create.emit).toHaveBeenCalled();
+    });
+  });
+
+
+});
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
new file mode 100644
index 0000000000..7ef5896b3c
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component.ts
@@ -0,0 +1,203 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+import {
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { ConfirmationModalComponent } from '../../../../../shared/confirmation-modal/confirmation-modal.component';
+import { hasValue } from '../../../../../shared/empty.util';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { getSearchResultFor } from '../../../../../shared/search/search-result-element-decorator';
+import { getWorkspaceItemDeleteRoute } from '../../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { SupervisionOrderGroupSelectorComponent } from './supervision-order-group-selector/supervision-order-group-selector.component';
+import { SupervisionOrderListEntry } from './supervision-order-status/supervision-order-status.component';
+
+@Component({
+  selector: 'ds-workspace-item-admin-workflow-actions-element',
+  styleUrls: ['./workspace-item-admin-workflow-actions.component.scss'],
+  templateUrl: './workspace-item-admin-workflow-actions.component.html',
+})
+/**
+ * The component for displaying the actions for a list element for a workspace-item on the admin workflow search page
+ */
+export class WorkspaceItemAdminWorkflowActionsComponent implements OnInit {
+
+  /**
+   * The workspace item to perform the actions on
+   */
+  @Input() public wsi: WorkspaceItem;
+
+  /**
+   * Whether to use small buttons or not
+   */
+  @Input() public small: boolean;
+
+  /**
+   * The list of supervision order object to show
+   */
+  @Input() supervisionOrderList: SupervisionOrder[] = [];
+
+  /**
+   * The item related to the workspace item
+   */
+  item: Item;
+
+  /**
+   * An array containing the route to the resource policies page
+   */
+  resourcePoliciesPageRoute: string[];
+
+  /**
+   * The i18n keys prefix
+   * @private
+   */
+  private messagePrefix = 'workflow-item.search.result';
+
+  /**
+   * Event emitted when a new SupervisionOrder has been created
+   */
+  @Output() create: EventEmitter<DSpaceObject> = new EventEmitter<DSpaceObject>();
+
+  /**
+   * Event emitted when new SupervisionOrder has been deleted
+   */
+  @Output() delete: EventEmitter<DSpaceObject> = new EventEmitter<DSpaceObject>();
+
+  /**
+   * Event emitted when a new SupervisionOrder has been created
+   */
+  constructor(
+    protected dsoNameService: DSONameService,
+    protected modalService: NgbModal,
+    protected notificationsService: NotificationsService,
+    protected supervisionOrderDataService: SupervisionOrderDataService,
+    protected translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    const item$: Observable<Item> = this.wsi.item.pipe(
+      getFirstSucceededRemoteDataPayload(),
+    );
+
+    item$.pipe(
+      map((item: Item) => this.getPoliciesRoute(item)),
+    ).subscribe((route: string[]) => {
+      this.resourcePoliciesPageRoute = route;
+    });
+
+    item$.subscribe((item: Item) => {
+      this.item = item;
+    });
+  }
+
+  /**
+   * Returns the path to the delete page of this workspace item
+   */
+  getDeleteRoute(): string {
+    return getWorkspaceItemDeleteRoute(this.wsi.id);
+  }
+
+  /**
+   * Returns the path to the administrative edit page policies tab
+   */
+  getPoliciesRoute(item: Item): string[] {
+    return ['/items', item.uuid, 'edit', ITEM_EDIT_AUTHORIZATIONS_PATH];
+  }
+
+  /**
+   * Deletes the Group from the Repository. The Group will be the only that this form is showing.
+   * It'll either show a success or error message depending on whether delete was successful or not.
+   */
+  deleteSupervisionOrder(supervisionOrderEntry: SupervisionOrderListEntry) {
+    const modalRef = this.modalService.open(ConfirmationModalComponent);
+    modalRef.componentInstance.name = this.dsoNameService.getName(supervisionOrderEntry.group);
+    modalRef.componentInstance.headerLabel = this.messagePrefix + '.delete-supervision.modal.header';
+    modalRef.componentInstance.infoLabel = this.messagePrefix + '.delete-supervision.modal.info';
+    modalRef.componentInstance.cancelLabel = this.messagePrefix + '.delete-supervision.modal.cancel';
+    modalRef.componentInstance.confirmLabel = this.messagePrefix + '.delete-supervision.modal.confirm';
+    modalRef.componentInstance.brandColor = 'danger';
+    modalRef.componentInstance.confirmIcon = 'fas fa-trash';
+    modalRef.componentInstance.response.pipe(
+      take(1),
+      switchMap((confirm: boolean) => {
+        if (confirm && hasValue(supervisionOrderEntry.supervisionOrder.id)) {
+          return this.supervisionOrderDataService.delete(supervisionOrderEntry.supervisionOrder.id).pipe(
+            take(1),
+            tap((result: boolean) => {
+              if (result) {
+                this.notificationsService.success(
+                  null,
+                  this.translateService.get(
+                    this.messagePrefix + '.notification.deleted.success',
+                    { name: this.dsoNameService.getName(supervisionOrderEntry.group) },
+                  ),
+                );
+              } else {
+                this.notificationsService.error(
+                  null,
+                  this.translateService.get(
+                    this.messagePrefix + '.notification.deleted.failure',
+                    { name: this.dsoNameService.getName(supervisionOrderEntry.group) },
+                  ),
+                );
+              }
+            }),
+          );
+        }
+      }),
+    ).subscribe((result: boolean) => {
+      if (result) {
+        this.delete.emit(this.convertReloadedObject());
+      }
+    });
+  }
+
+  /**
+   * Opens the Supervision Modal to create a supervision order
+   */
+  openSupervisionModal() {
+    const supervisionModal: NgbModalRef = this.modalService.open(SupervisionOrderGroupSelectorComponent, {
+      size: 'lg',
+      backdrop: 'static',
+    });
+    supervisionModal.componentInstance.itemUUID = this.item.uuid;
+    supervisionModal.componentInstance.create.subscribe(() => {
+      this.create.emit(this.convertReloadedObject());
+    });
+  }
+
+  /**
+   * Convert the reloadedObject to the Type required by this dso.
+   */
+  private convertReloadedObject(): DSpaceObject {
+    const constructor = getSearchResultFor((this.wsi as any).constructor);
+    return Object.assign(new constructor(), this.wsi, {
+      indexableObject: this.wsi,
+    });
+  }
+}
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.html 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.html
index 87bae0c261..c5c2a5331a 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.html
+++ 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.html
@@ -1,4 +1,4 @@
-<ng-template dsListableObject>
+<ng-template dsDynamicComponentLoader>
 </ng-template>
 <div #badges class="position-absolute ml-1">
     <div class="workflow-badge">
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.spec.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.spec.ts
index 0b933d0859..732a691102 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.spec.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.spec.ts
@@ -1,28 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { RouterTestingModule } from '@angular/router/testing';
-import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './workflow-item-search-result-admin-workflow-grid-element.component';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { ItemGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
-import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
-import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../../../../shared/theme-support/theme.service';
 
-describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { ItemGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './workflow-item-search-result-admin-workflow-grid-element.component';
+
+describe('WorkflowItemSearchResultAdminWorkflowGridElementComponent', () => {
   let component: WorkflowItemSearchResultAdminWorkflowGridElementComponent;
   let fixture: ComponentFixture<WorkflowItemSearchResultAdminWorkflowGridElementComponent>;
   let id;
@@ -30,7 +34,7 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
   let itemRD$;
   let linkService;
   let object;
-  let themeService;
+  let themeService: ThemeService;
 
   function init() {
     itemRD$ = createSuccessfulRemoteDataObject$(new Item());
@@ -47,7 +51,11 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
     init();
     TestBed.configureTestingModule(
       {
-        declarations: [WorkflowItemSearchResultAdminWorkflowGridElementComponent, ItemGridElementComponent, ListableObjectDirective],
+        declarations: [
+          WorkflowItemSearchResultAdminWorkflowGridElementComponent,
+          ItemGridElementComponent,
+          DynamicComponentLoaderDirective,
+        ],
         imports: [
           NoopAnimationsModule,
           TranslateModule.forRoot(),
@@ -59,16 +67,16 @@ describe('WorkflowItemAdminWorkflowGridElementComponent', () => {
           {
             provide: TruncatableService, useValue: {
               isCollapsed: () => observableOf(true),
-            }
+            },
           },
           { provide: BitstreamDataService, useValue: {} },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .overrideComponent(WorkflowItemSearchResultAdminWorkflowGridElementComponent, {
         set: {
-          entryComponents: [ItemGridElementComponent]
-        }
+          entryComponents: [ItemGridElementComponent],
+        },
       })
       .compileComponents();
   }));
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 68f10916d5..a94a96e9d5 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,43 +1,53 @@
-import { Component, ComponentFactoryResolver, ElementRef, ViewChild } from '@angular/core';
-import { Item } from '../../../../../core/shared/item.model';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import {
-  getListableObjectComponent,
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from '../../../../../shared/object-collection/shared/listable-object/listable-object.directive';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { Item } from '../../../../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../../../core/shared/operators';
-import { take } from 'rxjs/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { hasValue } from '../../../../../shared/empty.util';
+import {
+  getListableObjectComponent,
+  listableObjectComponent,
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
 import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
 @Component({
   selector: 'ds-workflow-item-search-result-admin-workflow-grid-element',
   styleUrls: ['./workflow-item-search-result-admin-workflow-grid-element.component.scss'],
-  templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html'
+  templateUrl: './workflow-item-search-result-admin-workflow-grid-element.component.html',
 })
 /**
  * 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
    */
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) dynamicComponentLoaderDirective: DynamicComponentLoaderDirective;
 
   /**
    * The html child that contains the badges html
@@ -54,14 +64,16 @@ export class WorkflowItemSearchResultAdminWorkflowGridElementComponent extends S
    */
   public item$: Observable<Item>;
 
+  protected compRef: ComponentRef<Component>;
+
   constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
+    public dsoNameService: DSONameService,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
     private themeService: ThemeService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(truncatableService, bitstreamDataService);
+    super(dsoNameService, truncatableService, bitstreamDataService);
   }
 
   /**
@@ -73,26 +85,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.dynamicComponentLoaderDirective.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.html 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.html
new file mode 100644
index 0000000000..f78a0a3ca4
--- /dev/null
+++ 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.html
@@ -0,0 +1,16 @@
+<ng-template dsDynamicComponentLoader>
+</ng-template>
+<div #badges class="position-absolute ml-1">
+    <div class="workflow-badge">
+        <span class="badge badge-info">{{ "admin.workflow.item.workspace" | translate }}</span>
+    </div>
+</div>
+<ul #buttons class="list-group list-group-flush">
+    <li class="list-group-item">
+      <ds-workspace-item-admin-workflow-actions-element [small]="true"
+                                                        [supervisionOrderList]="supervisionOrder$ | async"
+                                                        [wsi]="dso"
+                                                        (create)="reloadObject($event)"
+                                                        (delete)="reloadObject($event)"></ds-workspace-item-admin-workflow-actions-element>
+    </li>
+</ul>
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.scss 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.scss
similarity index 100%
rename from src/app/shared/item/item-alerts/item-alerts.component.scss
rename to 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.scss
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.spec.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.spec.ts
new file mode 100644
index 0000000000..b9781fb4f9
--- /dev/null
+++ 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.spec.ts
@@ -0,0 +1,126 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { getMockThemeService } from '../../../../../shared/mocks/theme-service.mock';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { ItemGridElementComponent } from '../../../../../shared/object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import {
+  supervisionOrderPaginatedListRD,
+  supervisionOrderPaginatedListRD$,
+} from '../../../../../shared/testing/supervision-order.mock';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkspaceItemSearchResultAdminWorkflowGridElementComponent } from './workspace-item-search-result-admin-workflow-grid-element.component';
+
+describe('WorkspaceItemSearchResultAdminWorkflowGridElementComponent', () => {
+  let component: WorkspaceItemSearchResultAdminWorkflowGridElementComponent;
+  let fixture: ComponentFixture<WorkspaceItemSearchResultAdminWorkflowGridElementComponent>;
+  let id;
+  let wfi;
+  let itemRD$;
+  let linkService;
+  let object;
+  let themeService: ThemeService;
+  let supervisionOrderDataService;
+
+  function init() {
+    itemRD$ = createSuccessfulRemoteDataObject$(new Item());
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    object = new WorkflowItemSearchResult();
+    wfi = new WorkflowItem();
+    wfi.item = itemRD$;
+    object.indexableObject = wfi;
+    linkService = getMockLinkService();
+    themeService = getMockThemeService();
+    supervisionOrderDataService = jasmine.createSpyObj('supervisionOrderDataService', {
+      searchByItem: jasmine.createSpy('searchByItem'),
+      delete: jasmine.createSpy('delete'),
+    });
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule(
+      {
+        declarations: [
+          WorkspaceItemSearchResultAdminWorkflowGridElementComponent,
+          ItemGridElementComponent,
+          DynamicComponentLoaderDirective,
+        ],
+        imports: [
+          NoopAnimationsModule,
+          TranslateModule.forRoot(),
+          RouterTestingModule.withRoutes([]),
+        ],
+        providers: [
+          { provide: LinkService, useValue: linkService },
+          { provide: ThemeService, useValue: themeService },
+          {
+            provide: TruncatableService, useValue: {
+              isCollapsed: () => observableOf(true),
+            },
+          },
+          { provide: BitstreamDataService, useValue: {} },
+          { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
+        ],
+        schemas: [NO_ERRORS_SCHEMA],
+      })
+      .overrideComponent(WorkspaceItemSearchResultAdminWorkflowGridElementComponent, {
+        set: {
+          entryComponents: [ItemGridElementComponent],
+        },
+      })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    linkService.resolveLink.and.callFake((a) => a);
+    fixture = TestBed.createComponent(WorkspaceItemSearchResultAdminWorkflowGridElementComponent);
+    component = fixture.componentInstance;
+    component.object = object;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    supervisionOrderDataService.searchByItem.and.returnValue(supervisionOrderPaginatedListRD$);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should retrieve the item using the link service', () => {
+    expect(linkService.resolveLink).toHaveBeenCalledWith(wfi, followLink('item'));
+  });
+
+  it('should retrieve supervision order objects properly', () => {
+    expect(component.supervisionOrder$.value).toEqual(supervisionOrderPaginatedListRD.payload.page);
+  });
+
+  it('should emit reloadedObject properly ', () => {
+    spyOn(component.reloadedObject, 'emit');
+    const dso = new DSpaceObject();
+    component.reloadObject(dso);
+    expect(component.reloadedObject.emit).toHaveBeenCalledWith(dso);
+  });
+});
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
new file mode 100644
index 0000000000..a25b8c6f00
--- /dev/null
+++ 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
@@ -0,0 +1,180 @@
+import {
+  Component,
+  ComponentRef,
+  ElementRef,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { Item } from '../../../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { DynamicComponentLoaderDirective } from '../../../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { hasValue } from '../../../../../shared/empty.util';
+import {
+  getListableObjectComponent,
+  listableObjectComponent,
+} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { WorkspaceItemSearchResult } from '../../../../../shared/object-collection/shared/workspace-item-search-result.model';
+import { SearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/search-result-grid-element.component';
+import { ThemeService } from '../../../../../shared/theme-support/theme.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+
+@listableObjectComponent(WorkspaceItemSearchResult, ViewMode.GridElement, Context.AdminWorkflowSearch)
+@Component({
+  selector: 'ds-workflow-item-search-result-admin-workflow-grid-element',
+  styleUrls: ['./workspace-item-search-result-admin-workflow-grid-element.component.scss'],
+  templateUrl: './workspace-item-search-result-admin-workflow-grid-element.component.html',
+})
+/**
+ * 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 OnDestroy, OnInit {
+
+  /**
+   * The item linked to the workspace item
+   */
+  public item$: Observable<Item>;
+
+  /**
+   * The id of the item linked to the workflow item
+   */
+  public itemId: string;
+
+  /**
+   * The supervision orders linked to the workflow item
+   */
+  public supervisionOrder$: BehaviorSubject<SupervisionOrder[]> = new BehaviorSubject<SupervisionOrder[]>([]);
+
+  /**
+   * Directive used to render the dynamic component in
+   */
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) dynamicComponentLoaderDirective: DynamicComponentLoaderDirective;
+
+  /**
+   * The html child that contains the badges html
+   */
+  @ViewChild('badges', { static: true }) badges: ElementRef;
+
+  /**
+   * The html child that contains the button html
+   */
+  @ViewChild('buttons', { static: true }) buttons: ElementRef;
+
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
+  constructor(
+    public dsoNameService: DSONameService,
+    private linkService: LinkService,
+    protected truncatableService: TruncatableService,
+    private themeService: ThemeService,
+    protected bitstreamDataService: BitstreamDataService,
+    protected supervisionOrderDataService: SupervisionOrderDataService,
+  ) {
+    super(dsoNameService, truncatableService, bitstreamDataService);
+  }
+
+  /**
+   * Setup the dynamic child component
+   * Initialize the item object from the workflow item
+   */
+  ngOnInit(): void {
+    super.ngOnInit();
+    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 component: GenericConstructor<Component> = this.getComponent(item);
+
+      const viewContainerRef = this.dynamicComponentLoaderDirective.viewContainerRef;
+      viewContainerRef.clear();
+
+      this.compRef = viewContainerRef.createComponent(
+        component, {
+          index: 0,
+          projectableNodes: [
+            [this.badges.nativeElement],
+            [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();
+    },
+    );
+
+    this.item$.pipe(
+      take(1),
+      tap((item: Item) => this.itemId = item.id),
+      mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id)),
+    ).subscribe((supervisionOrderList: SupervisionOrder[]) => {
+      this.supervisionOrder$.next(supervisionOrderList);
+    });
+  }
+
+  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>}
+   */
+  private getComponent(item: Item): GenericConstructor<Component> {
+    return getListableObjectComponent(item.getRenderTypes(), ViewMode.GridElement, undefined, this.themeService.getThemeName());
+  }
+
+
+  /**
+   * Retrieve the list of SupervisionOrder object related to the given item
+   *
+   * @param itemId
+   * @private
+   */
+  private retrieveSupervisorOrders(itemId): Observable<SupervisionOrder[]> {
+    return this.supervisionOrderDataService.searchByItem(
+      itemId, false, true, followLink('group'),
+    ).pipe(
+      getFirstCompletedRemoteData(),
+      map((soRD: RemoteData<PaginatedList<SupervisionOrder>>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : []),
+    );
+  }
+
+  reloadObject(dso: DSpaceObject) {
+    this.reloadedObject.emit(dso);
+  }
+}
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 a489cb0e57..5b79a2ff8c 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
@@ -1,27 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { RouterTestingModule } from '@angular/router/testing';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './workflow-item-search-result-admin-workflow-list-element.component';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
-import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './workflow-item-search-result-admin-workflow-list-element.component';
 
-describe('WorkflowItemAdminWorkflowListElementComponent', () => {
+describe('WorkflowItemSearchResultAdminWorkflowListElementComponent', () => {
   let component: WorkflowItemSearchResultAdminWorkflowListElementComponent;
   let fixture: ComponentFixture<WorkflowItemSearchResultAdminWorkflowListElementComponent>;
   let id;
@@ -54,9 +58,9 @@ describe('WorkflowItemAdminWorkflowListElementComponent', () => {
           { provide: TruncatableService, useValue: mockTruncatableService },
           { provide: LinkService, useValue: linkService },
           { provide: DSONameService, useClass: DSONameServiceMock },
-          { provide: APP_CONFIG, useValue: environment }
+          { provide: APP_CONFIG, useValue: environment },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       })
       .compileComponents();
   }));
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.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.ts
index 3bc75de415..247ba9f354 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.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.ts
@@ -1,28 +1,39 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { Context } from '../../../../../core/shared/context.model';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
 import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
 
 @listableObjectComponent(WorkflowItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch)
 @Component({
   selector: 'ds-workflow-item-search-result-admin-workflow-list-element',
   styleUrls: ['./workflow-item-search-result-admin-workflow-list-element.component.scss'],
-  templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html'
+  templateUrl: './workflow-item-search-result-admin-workflow-list-element.component.html',
 })
 /**
- * The component for displaying a list element for an workflow item on the admin workflow search page
+ * The component for displaying a list element for a workflow item on the admin workflow search page
  */
 export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends SearchResultListElementComponent<WorkflowItemSearchResult, WorkflowItem> implements OnInit {
 
@@ -33,8 +44,8 @@ export class WorkflowItemSearchResultAdminWorkflowListElementComponent extends S
 
   constructor(private linkService: LinkService,
               protected truncatableService: TruncatableService,
-              protected dsoNameService: DSONameService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              public dsoNameService: DSONameService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
new file mode 100644
index 0000000000..ed877706c6
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.html
@@ -0,0 +1,13 @@
+<span class="badge badge-info">{{ "admin.workflow.item.workspace" | translate }}</span>
+<ds-listable-object-component-loader *ngIf="item$ | async"
+                                     [object]="item$ | async"
+                                     [viewMode]="viewModes.ListElement"
+                                     [index]="index"
+                                     [linkType]="linkType"
+                                     [listID]="listID"></ds-listable-object-component-loader>
+
+<ds-workspace-item-admin-workflow-actions-element [small]="false"
+                                                  [supervisionOrderList]="supervisionOrder$ | async"
+                                                  [wsi]="dso"
+                                                  (create)="reloadObject($event)"
+                                                  (delete)="reloadObject($event)"></ds-workspace-item-admin-workflow-actions-element>
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.scss
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.scss
rename to src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.scss
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-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/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts
new file mode 100644
index 0000000000..e196ab30d3
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.spec.ts
@@ -0,0 +1,110 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../../shared/mocks/link-service.mock';
+import { mockTruncatableService } from '../../../../../shared/mocks/mock-trucatable.service';
+import { CollectionElementLinkType } from '../../../../../shared/object-collection/collection-element-link.type';
+import { WorkflowItemSearchResult } from '../../../../../shared/object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import {
+  supervisionOrderPaginatedListRD,
+  supervisionOrderPaginatedListRD$,
+} from '../../../../../shared/testing/supervision-order.mock';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { WorkspaceItemSearchResultAdminWorkflowListElementComponent } from './workspace-item-search-result-admin-workflow-list-element.component';
+
+describe('WorkspaceItemSearchResultAdminWorkflowListElementComponent', () => {
+  let component: WorkspaceItemSearchResultAdminWorkflowListElementComponent;
+  let fixture: ComponentFixture<WorkspaceItemSearchResultAdminWorkflowListElementComponent>;
+  let id;
+  let wfi;
+  let itemRD$;
+  let linkService;
+  let object;
+  let supervisionOrderDataService;
+
+  function init() {
+    itemRD$ = createSuccessfulRemoteDataObject$(new Item());
+    id = '780b2588-bda5-4112-a1cd-0b15000a5339';
+    object = new WorkflowItemSearchResult();
+    wfi = new WorkflowItem();
+    wfi.item = itemRD$;
+    object.indexableObject = wfi;
+    linkService = getMockLinkService();
+    supervisionOrderDataService = jasmine.createSpyObj('supervisionOrderDataService', {
+      searchByItem: jasmine.createSpy('searchByItem'),
+      delete: jasmine.createSpy('delete'),
+    });
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule(
+      {
+        declarations: [WorkspaceItemSearchResultAdminWorkflowListElementComponent],
+        imports: [
+          NoopAnimationsModule,
+          TranslateModule.forRoot(),
+          RouterTestingModule.withRoutes([]),
+        ],
+        providers: [
+          { provide: TruncatableService, useValue: mockTruncatableService },
+          { provide: LinkService, useValue: linkService },
+          { provide: DSONameService, useClass: DSONameServiceMock },
+          { provide: SupervisionOrderDataService, useValue: supervisionOrderDataService },
+          { provide: APP_CONFIG, useValue: environment },
+        ],
+        schemas: [NO_ERRORS_SCHEMA],
+      })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    linkService.resolveLink.and.callFake((a) => a);
+    fixture = TestBed.createComponent(WorkspaceItemSearchResultAdminWorkflowListElementComponent);
+    component = fixture.componentInstance;
+    component.object = object;
+    component.linkTypes = CollectionElementLinkType;
+    component.index = 0;
+    component.viewModes = ViewMode;
+    supervisionOrderDataService.searchByItem.and.returnValue(supervisionOrderPaginatedListRD$);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should retrieve the item using the link service', () => {
+    expect(linkService.resolveLink).toHaveBeenCalledWith(wfi, followLink('item'));
+  });
+
+  it('should retrieve supervision order objects properly', () => {
+    expect(component.supervisionOrder$.value).toEqual(supervisionOrderPaginatedListRD.payload.page);
+  });
+
+  it('should emit reloadedObject properly ', () => {
+    spyOn(component.reloadedObject, 'emit');
+    const dso = new DSpaceObject();
+    component.reloadObject(dso);
+    expect(component.reloadedObject.emit).toHaveBeenCalledWith(dso);
+  });
+});
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
new file mode 100644
index 0000000000..aa3c601da6
--- /dev/null
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component.ts
@@ -0,0 +1,117 @@
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { SupervisionOrder } from '../../../../../core/supervision-order/models/supervision-order.model';
+import { SupervisionOrderDataService } from '../../../../../core/supervision-order/supervision-order-data.service';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { WorkspaceItemSearchResult } from '../../../../../shared/object-collection/shared/workspace-item-search-result.model';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+
+@listableObjectComponent(WorkspaceItemSearchResult, ViewMode.ListElement, Context.AdminWorkflowSearch)
+@Component({
+  selector: 'ds-workflow-item-search-result-admin-workflow-list-element',
+  styleUrls: ['./workspace-item-search-result-admin-workflow-list-element.component.scss'],
+  templateUrl: './workspace-item-search-result-admin-workflow-list-element.component.html',
+})
+/**
+ * The component for displaying a list element for a workflow item on the admin workflow search page
+ */
+export class WorkspaceItemSearchResultAdminWorkflowListElementComponent extends SearchResultListElementComponent<WorkspaceItemSearchResult, WorkspaceItem> implements OnInit {
+
+  /**
+   * The item linked to the workflow item
+   */
+  public item$: Observable<Item>;
+
+  /**
+   * The id of the item linked to the workflow item
+   */
+  public itemId: string;
+
+  /**
+   * The supervision orders linked to the workflow item
+   */
+  public supervisionOrder$: BehaviorSubject<SupervisionOrder[]> = new BehaviorSubject<SupervisionOrder[]>([]);
+
+  constructor(private linkService: LinkService,
+              public dsoNameService: DSONameService,
+              protected supervisionOrderDataService: SupervisionOrderDataService,
+              protected truncatableService: TruncatableService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
+    super(truncatableService, dsoNameService, appConfig);
+  }
+
+  /**
+   * Initialize the item object from the workflow item
+   */
+  ngOnInit(): void {
+    super.ngOnInit();
+    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),
+      tap((item: Item) => this.itemId = item.id),
+      mergeMap((item: Item) => this.retrieveSupervisorOrders(item.id)),
+    ).subscribe((supervisionOrderList: SupervisionOrder[]) => {
+      this.supervisionOrder$.next(supervisionOrderList);
+    });
+  }
+
+  /**
+   * Retrieve the list of SupervisionOrder object related to the given item
+   *
+   * @param itemId
+   * @private
+   */
+  private retrieveSupervisorOrders(itemId): Observable<SupervisionOrder[]> {
+    return this.supervisionOrderDataService.searchByItem(
+      itemId, false, true, followLink('group'),
+    ).pipe(
+      getFirstCompletedRemoteData(),
+      map((soRD: RemoteData<PaginatedList<SupervisionOrder>>) => soRD.hasSucceeded && !soRD.hasNoContent ? soRD.payload.page : []),
+    );
+  }
+
+  /**
+   * Reload list element after supervision order change.
+   */
+  reloadObject(dso: DSpaceObject) {
+    this.reloadedObject.emit(dso);
+  }
+
+}
diff --git a/src/app/admin/admin-workflow-page/admin-workflow.module.ts b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
index 85e8f00a46..97041ee64d 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow.module.ts
+++ b/src/app/admin/admin-workflow-page/admin-workflow.module.ts
@@ -1,31 +1,41 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
 
-import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
-import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/workflow-item-admin-workflow-actions.component';
-import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
-import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
 import { SearchModule } from '../../shared/search/search.module';
+import { SharedModule } from '../../shared/shared.module';
+import { AdminWorkflowPageComponent } from './admin-workflow-page.component';
+import { WorkflowItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/actions/workflow-item/workflow-item-admin-workflow-actions.component';
+import { SupervisionOrderGroupSelectorComponent } from './admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component';
+import { SupervisionOrderStatusComponent } from './admin-workflow-search-results/actions/workspace-item/supervision-order-status/supervision-order-status.component';
+import { WorkspaceItemAdminWorkflowActionsComponent } from './admin-workflow-search-results/actions/workspace-item/workspace-item-admin-workflow-actions.component';
+import { WorkflowItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workflow-item/workflow-item-search-result-admin-workflow-grid-element.component';
+import { WorkspaceItemSearchResultAdminWorkflowGridElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-grid-element/workspace-item/workspace-item-search-result-admin-workflow-grid-element.component';
+import { WorkflowItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workflow-item/workflow-item-search-result-admin-workflow-list-element.component';
+import { WorkspaceItemSearchResultAdminWorkflowListElementComponent } from './admin-workflow-search-results/admin-workflow-search-result-list-element/workspace-item/workspace-item-search-result-admin-workflow-list-element.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   WorkflowItemSearchResultAdminWorkflowListElementComponent,
   WorkflowItemSearchResultAdminWorkflowGridElementComponent,
+  WorkspaceItemSearchResultAdminWorkflowListElementComponent,
+  WorkspaceItemSearchResultAdminWorkflowGridElementComponent,
 ];
 
 @NgModule({
   imports: [
     SearchModule,
-    SharedModule.withEntryComponents()
+    SharedModule.withEntryComponents(),
   ],
   declarations: [
     AdminWorkflowPageComponent,
+    SupervisionOrderGroupSelectorComponent,
+    SupervisionOrderStatusComponent,
     WorkflowItemAdminWorkflowActionsComponent,
-    ...ENTRY_COMPONENTS
+    WorkspaceItemAdminWorkflowActionsComponent,
+    ...ENTRY_COMPONENTS,
   ],
   exports: [
-    AdminWorkflowPageComponent
-  ]
+    AdminWorkflowPageComponent,
+  ],
 })
 export class AdminWorkflowModuleModule {
   /**
@@ -35,7 +45,7 @@ export class AdminWorkflowModuleModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/admin/admin.module.ts b/src/app/admin/admin.module.ts
index 0ddbefd253..d75d4457f7 100644
--- a/src/app/admin/admin.module.ts
+++ b/src/app/admin/admin.module.ts
@@ -1,15 +1,19 @@
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
 import { AccessControlModule } from '../access-control/access-control.module';
+import { SharedModule } from '../shared/shared.module';
+import { UploadModule } from '../shared/upload/upload.module';
+import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
+import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
 import { MetadataImportPageComponent } from './admin-import-metadata-page/metadata-import-page.component';
 import { AdminRegistriesModule } from './admin-registries/admin-registries.module';
+import { AdminReportsModule } from './admin-reports/admin-reports.module';
 import { AdminRoutingModule } from './admin-routing.module';
-import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { AdminWorkflowModuleModule } from './admin-workflow-page/admin-workflow.module';
 import { AdminSearchModule } from './admin-search-page/admin-search.module';
 import { AdminSidebarSectionComponent } from './admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
 import { ExpandableAdminSidebarSectionComponent } from './admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
-import { BatchImportPageComponent } from './admin-import-batch-page/batch-import-page.component';
+import { AdminWorkflowModuleModule } from './admin-workflow-page/admin-workflow.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -22,16 +26,19 @@ const ENTRY_COMPONENTS = [
   imports: [
     AdminRoutingModule,
     AdminRegistriesModule,
+    AdminReportsModule,
     AccessControlModule,
     AdminSearchModule.withEntryComponents(),
     AdminWorkflowModuleModule.withEntryComponents(),
-    SharedModule
+    SharedModule,
+    UiSwitchModule,
+    UploadModule,
   ],
   declarations: [
     AdminCurationTasksComponent,
     MetadataImportPageComponent,
-    BatchImportPageComponent
-  ]
+    BatchImportPageComponent,
+  ],
 })
 export class AdminModule {
   /**
@@ -41,7 +48,7 @@ export class AdminModule {
   static withEntryComponents() {
     return {
       ngModule: AdminModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/app-routing-paths.ts b/src/app/app-routing-paths.ts
index e9a6376884..9b95ee0d0a 100644
--- a/src/app/app-routing-paths.ts
+++ b/src/app/app-routing-paths.ts
@@ -1,12 +1,15 @@
-import { DSpaceObject } from './core/shared/dspace-object.model';
-import { Community } from './core/shared/community.model';
-import { Collection } from './core/shared/collection.model';
-import { Item } from './core/shared/item.model';
-import { getCommunityPageRoute } from './community-page/community-page-routing-paths';
 import { getCollectionPageRoute } from './collection-page/collection-page-routing-paths';
-import { getItemModuleRoute, getItemPageRoute } from './item-page/item-page-routing-paths';
-import { hasValue } from './shared/empty.util';
+import { getCommunityPageRoute } from './community-page/community-page-routing-paths';
+import { Collection } from './core/shared/collection.model';
+import { Community } from './core/shared/community.model';
+import { DSpaceObject } from './core/shared/dspace-object.model';
+import { Item } from './core/shared/item.model';
 import { URLCombiner } from './core/url-combiner/url-combiner';
+import {
+  getItemModuleRoute,
+  getItemPageRoute,
+} from './item-page/item-page-routing-paths';
+import { hasValue } from './shared/empty.util';
 
 export const BITSTREAM_MODULE_PATH = 'bitstreams';
 
@@ -27,10 +30,11 @@ export function getBitstreamRequestACopyRoute(item, bitstream): { routerLink: st
   return {
     routerLink: url,
     queryParams: {
-      bitstream: bitstream.uuid
-    }
+      bitstream: bitstream.uuid,
+    },
   };
 }
+export const COAR_NOTIFY_SUPPORT = 'coar-notify-support';
 
 export const HOME_PAGE_PATH = 'admin';
 
@@ -126,3 +130,16 @@ export function getRequestCopyModulePath() {
 }
 
 export const HEALTH_PAGE_PATH = 'health';
+
+export const SUBSCRIPTIONS_MODULE_PATH = 'subscriptions';
+
+export function getSubscriptionsModuleRoute() {
+  return `/${SUBSCRIPTIONS_MODULE_PATH}`;
+}
+
+export const EDIT_ITEM_PATH = 'edit-items';
+export function getEditItemPageRoute() {
+  return `/${EDIT_ITEM_PATH}`;
+}
+export const CORRECTION_TYPE_PATH = 'corrections';
+
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index d426b041ce..84b6fa9275 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,11 +1,10 @@
 import { NgModule } from '@angular/core';
-import { RouterModule, NoPreloading } from '@angular/router';
-import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
-
-import { AuthenticatedGuard } from './core/auth/authenticated.guard';
 import {
-  SiteAdministratorGuard
-} from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+  NoPreloading,
+  RouterModule,
+} from '@angular/router';
+
+import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
 import {
   ACCESS_CONTROL_MODULE_PATH,
   ADMIN_MODULE_PATH,
@@ -24,22 +23,22 @@ import {
 } from './app-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 { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
-import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
-import { ReloadGuard } from './core/reload/reload.guard';
-import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
+import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
+import { AuthenticatedGuard } from './core/auth/authenticated.guard';
+import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
 import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
-import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
-import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
-import {
-  GroupAdministratorGuard
-} from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
-import {
-  ThemedPageInternalServerErrorComponent
-} from './page-internal-server-error/themed-page-internal-server-error.component';
+import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
+import { ReloadGuard } from './core/reload/reload.guard';
+import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
 import { ServerCheckGuard } from './core/server-check/server-check.guard';
+import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
+import { ITEM_MODULE_PATH } from './item-page/item-page-routing-paths';
 import { MenuResolver } from './menu.resolver';
 import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
+import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
+import { PROCESS_MODULE_PATH } from './process-page/process-page-routing.paths';
+import { SUGGESTION_MODULE_PATH } from './suggestions-page/suggestions-page-routing-paths';
 
 @NgModule({
   imports: [
@@ -57,182 +56,206 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
             path: 'reload/:rnd',
             component: ThemedPageNotFoundComponent,
             pathMatch: 'full',
-            canActivate: [ReloadGuard]
+            canActivate: [ReloadGuard],
           },
           {
             path: 'home',
             loadChildren: () => import('./home-page/home-page.module')
               .then((m) => m.HomePageModule),
             data: { showBreadcrumbs: false },
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'community-list',
             loadChildren: () => import('./community-list-page/community-list-page.module')
               .then((m) => m.CommunityListPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'id',
             loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
               .then((m) => m.LookupIdModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'handle',
             loadChildren: () => import('./lookup-by-id/lookup-by-id.module')
               .then((m) => m.LookupIdModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: REGISTER_PATH,
             loadChildren: () => import('./register-page/register-page.module')
               .then((m) => m.RegisterPageModule),
-            canActivate: [SiteRegisterGuard]
+            canActivate: [SiteRegisterGuard],
           },
           {
             path: FORGOT_PASSWORD_PATH,
             loadChildren: () => import('./forgot-password/forgot-password.module')
               .then((m) => m.ForgotPasswordModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard, ForgotPasswordCheckGuard],
           },
           {
             path: COMMUNITY_MODULE_PATH,
             loadChildren: () => import('./community-page/community-page.module')
               .then((m) => m.CommunityPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: COLLECTION_MODULE_PATH,
             loadChildren: () => import('./collection-page/collection-page.module')
               .then((m) => m.CollectionPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: ITEM_MODULE_PATH,
             loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'entities/:entity-type',
             loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: LEGACY_BITSTREAM_MODULE_PATH,
             loadChildren: () => import('./bitstream-page/bitstream-page.module')
               .then((m) => m.BitstreamPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: BITSTREAM_MODULE_PATH,
             loadChildren: () => import('./bitstream-page/bitstream-page.module')
               .then((m) => m.BitstreamPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'mydspace',
             loadChildren: () => import('./my-dspace-page/my-dspace-page.module')
               .then((m) => m.MyDSpacePageModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'search',
             loadChildren: () => import('./search-page/search-page-routing.module')
               .then((m) => m.SearchPageRoutingModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'browse',
             loadChildren: () => import('./browse-by/browse-by-page.module')
               .then((m) => m.BrowseByPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: ADMIN_MODULE_PATH,
             loadChildren: () => import('./admin/admin.module')
               .then((m) => m.AdminModule),
-            canActivate: [SiteAdministratorGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
+          },
+          {
+            path: NOTIFICATIONS_MODULE_PATH,
+            loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
+              .then((m) => m.AdminNotificationsModule),
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
+          },
+          {
+            path: NOTIFICATIONS_MODULE_PATH,
+            loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages.module')
+              .then((m) => m.NotificationsPageModule),
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'login',
             loadChildren: () => import('./login-page/login-page.module')
-              .then((m) => m.LoginPageModule)
+              .then((m) => m.LoginPageModule),
           },
           {
             path: 'logout',
             loadChildren: () => import('./logout-page/logout-page.module')
-              .then((m) => m.LogoutPageModule)
+              .then((m) => m.LogoutPageModule),
           },
           {
             path: 'submit',
             loadChildren: () => import('./submit-page/submit-page.module')
               .then((m) => m.SubmitPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'import-external',
             loadChildren: () => import('./import-external-page/import-external-page.module')
               .then((m) => m.ImportExternalPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: 'workspaceitems',
             loadChildren: () => import('./workspaceitems-edit-page/workspaceitems-edit-page.module')
               .then((m) => m.WorkspaceitemsEditPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: WORKFLOW_ITEM_MODULE_PATH,
             loadChildren: () => import('./workflowitems-edit-page/workflowitems-edit-page.module')
               .then((m) => m.WorkflowItemsEditPageModule),
-            canActivate: [EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: PROFILE_MODULE_PATH,
             loadChildren: () => import('./profile-page/profile-page.module')
               .then((m) => m.ProfilePageModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: PROCESS_MODULE_PATH,
             loadChildren: () => import('./process-page/process-page.module')
               .then((m) => m.ProcessPageModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
+          },
+          { path: SUGGESTION_MODULE_PATH,
+            loadChildren: () => import('./suggestions-page/suggestions-page.module')
+              .then((m) => m.SuggestionsPageModule),
+            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard],
           },
           {
             path: INFO_MODULE_PATH,
-            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule)
+            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule),
           },
           {
             path: REQUEST_COPY_MODULE_PATH,
             loadChildren: () => import('./request-copy/request-copy.module').then((m) => m.RequestCopyModule),
-            canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: FORBIDDEN_PATH,
-            component: ThemedForbiddenComponent
+            component: ThemedForbiddenComponent,
           },
           {
             path: 'statistics',
             loadChildren: () => import('./statistics-page/statistics-page-routing.module')
-              .then((m) => m.StatisticsPageRoutingModule)
+              .then((m) => m.StatisticsPageRoutingModule),
+            canActivate: [EndUserAgreementCurrentUserGuard],
           },
           {
             path: HEALTH_PAGE_PATH,
             loadChildren: () => import('./health-page/health-page.module')
-              .then((m) => m.HealthPageModule)
+              .then((m) => m.HealthPageModule),
           },
           {
             path: ACCESS_CONTROL_MODULE_PATH,
             loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
-            canActivate: [GroupAdministratorGuard],
+            canActivate: [GroupAdministratorGuard, EndUserAgreementCurrentUserGuard],
+          },
+          {
+            path: 'subscriptions',
+            loadChildren: () => import('./subscriptions-page/subscriptions-page-routing.module')
+              .then((m) => m.SubscriptionsPageRoutingModule),
+            canActivate: [AuthenticatedGuard],
           },
           { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
-        ]
-      }
+        ],
+      },
     ], {
       // enableTracing: true,
       useHash: false,
@@ -241,7 +264,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone
       initialNavigation: 'enabledBlocking',
       preloadingStrategy: NoPreloading,
       onSameUrlNavigation: 'reload',
-})
+    }),
   ],
   exports: [RouterModule],
 })
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 422ead99e1..70694a1fbb 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -1,52 +1,68 @@
-import { Store, StoreModule } from '@ngrx/store';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-// Load the implementations that should be tested
-import { AppComponent } from './app.component';
-import { HostWindowState } from './shared/search/host-window.reducer';
-import { HostWindowResizeAction } from './shared/host-window.actions';
-import { MetadataService } from './core/metadata/metadata.service';
-
-import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
-import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
-import { MetadataServiceMock } from './shared/mocks/metadata-service.mock';
-import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
-import { AuthServiceMock } from './shared/mocks/auth.service.mock';
-import { AuthService } from './core/auth/auth.service';
-import { MenuService } from './shared/menu/menu.service';
-import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from './shared/testing/css-variable-service.stub';
-import { MenuServiceStub } from './shared/testing/menu-service.stub';
-import { HostWindowService } from './shared/host-window.service';
-import { HostWindowServiceStub } from './shared/testing/host-window-service.stub';
-import { RouteService } from './core/services/route.service';
-import { MockActivatedRoute } from './shared/mocks/active-router.mock';
-import { RouterMock } from './shared/mocks/router.mock';
-import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { storeModuleConfig } from './app.reducer';
-import { LocaleService } from './core/locale/locale.service';
-import { authReducer } from './core/auth/auth.reducer';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { ThemeService } from './shared/theme-support/theme.service';
-import { getMockThemeService } from './shared/mocks/theme-service.mock';
-import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../config/app-config.interface';
 import { environment } from '../environments/environment';
+// Load the implementations that should be tested
+import { AppComponent } from './app.component';
+import { storeModuleConfig } from './app.reducer';
+import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import { authReducer } from './core/auth/auth.reducer';
+import { AuthService } from './core/auth/auth.service';
+import { LocaleService } from './core/locale/locale.service';
+import { MetadataService } from './core/metadata/metadata.service';
+import { RouteService } from './core/services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from './core/services/window.service';
+import { HostWindowResizeAction } from './shared/host-window.actions';
+import { HostWindowService } from './shared/host-window.service';
+import { MenuService } from './shared/menu/menu.service';
+import { MockActivatedRoute } from './shared/mocks/active-router.mock';
+import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
+import { AuthServiceMock } from './shared/mocks/auth.service.mock';
+import { MetadataServiceMock } from './shared/mocks/metadata-service.mock';
+import { RouterMock } from './shared/mocks/router.mock';
+import { getMockThemeService } from './shared/mocks/theme-service.mock';
+import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
+import { CSSVariableService } from './shared/sass-helper/css-variable.service';
+import { HostWindowState } from './shared/search/host-window.reducer';
+import { CSSVariableServiceStub } from './shared/testing/css-variable-service.stub';
+import { HostWindowServiceStub } from './shared/testing/host-window-service.stub';
+import { MenuServiceStub } from './shared/testing/menu-service.stub';
+import { ThemeService } from './shared/theme-support/theme.service';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 
 let comp: AppComponent;
 let fixture: ComponentFixture<AppComponent>;
 const menuService = new MenuServiceStub();
 const initialState = {
-  core: { auth: { loading: false } }
+  core: { auth: { loading: false } },
 };
 
 export function getMockLocaleService(): LocaleService {
   return jasmine.createSpyObj('LocaleService', {
-    setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode')
+    setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode'),
   });
 }
 
@@ -64,8 +80,8 @@ describe('App component', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [AppComponent], // declare the test component
@@ -85,9 +101,9 @@ describe('App component', () => {
         { provide: APP_CONFIG, useValue: environment },
         provideMockStore({ initialState }),
         AppComponent,
-        RouteService
+        RouteService,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     };
   };
 
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 7aa1043da1..edb1c7966b 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,5 +1,7 @@
-import { distinctUntilChanged, take, withLatestFrom } from 'rxjs/operators';
-import { DOCUMENT, isPlatformBrowser } from '@angular/common';
+import {
+  DOCUMENT,
+  isPlatformBrowser,
+} from '@angular/common';
 import {
   AfterViewInit,
   ChangeDetectionStrategy,
@@ -15,23 +17,39 @@ import {
   NavigationStart,
   Router,
 } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
-import { NgbModal, NgbModalConfig } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbModal,
+  NgbModalConfig,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { HostWindowResizeAction } from './shared/host-window.actions';
-import { HostWindowState } from './shared/search/host-window.reducer';
-import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
-import { isAuthenticationBlocking } from './core/auth/selectors';
-import { AuthService } from './core/auth/auth.service';
-import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  take,
+  withLatestFrom,
+} from 'rxjs/operators';
+
 import { environment } from '../environments/environment';
+import { AuthService } from './core/auth/auth.service';
+import { isAuthenticationBlocking } from './core/auth/selectors';
 import { models } from './core/core.module';
-import { ThemeService } from './shared/theme-support/theme.service';
-import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from './core/services/window.service';
 import { distinctNext } from './core/shared/distinct-next';
-import { ModalBeforeDismiss } from './shared/interfaces/modal-before-dismiss.interface';
+import { HostWindowResizeAction } from './shared/host-window.actions';
+import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
+import { CSSVariableService } from './shared/sass-helper/css-variable.service';
+import { HostWindowState } from './shared/search/host-window.reducer';
+import { ThemeService } from './shared/theme-support/theme.service';
 
 @Component({
   selector: 'ds-app',
@@ -103,25 +121,15 @@ export class AppComponent implements OnInit, AfterViewInit {
 
     this.isAuthBlocking$ = this.store.pipe(
       select(isAuthenticationBlocking),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
 
     this.dispatchWindowSize(this._window.nativeWindow.innerWidth, this._window.nativeWindow.innerHeight);
   }
 
   private storeCSSVariables() {
-    this.cssService.addCSSVariable('xlMin', '1200px');
-    this.cssService.addCSSVariable('mdMin', '768px');
-    this.cssService.addCSSVariable('lgMin', '576px');
-    this.cssService.addCSSVariable('smMin', '0');
-    this.cssService.addCSSVariable('adminSidebarActiveBg', '#0f1b28');
-    this.cssService.addCSSVariable('sidebarItemsWidth', '250px');
-    this.cssService.addCSSVariable('collapsedSidebarWidth', '53.234px');
-    this.cssService.addCSSVariable('totalSidebarWidth', '303.234px');
-    // const vars = variables.locals || {};
-    // Object.keys(vars).forEach((name: string) => {
-    //   this.cssService.addCSSVariable(name, vars[name]);
-    // })
+    this.cssService.clearCSSVariables();
+    this.cssService.addCSSVariables(this.cssService.getCSSVariablesFromStylesheets(this.document));
   }
 
   ngAfterViewInit() {
@@ -144,7 +152,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 
   private dispatchWindowSize(width, height): void {
     this.store.dispatch(
-      new HostWindowResizeAction(width, height)
+      new HostWindowResizeAction(width, height),
     );
   }
 
diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts
index 871fae8d6b..92b5d880d0 100644
--- a/src/app/app.effects.ts
+++ b/src/app/app.effects.ts
@@ -1,9 +1,9 @@
-import { StoreEffects } from './store.effects';
-import { NotificationsEffects } from './shared/notifications/notifications.effects';
 import { NavbarEffects } from './navbar/navbar.effects';
-import { SidebarEffects } from './shared/sidebar/sidebar-effects.service';
 import { RelationshipEffects } from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects';
+import { NotificationsEffects } from './shared/notifications/notifications.effects';
+import { SidebarEffects } from './shared/sidebar/sidebar-effects.service';
 import { ThemeEffects } from './shared/theme-support/theme.effects';
+import { StoreEffects } from './store.effects';
 
 export const appEffects = [
   StoreEffects,
@@ -11,5 +11,5 @@ export const appEffects = [
   NotificationsEffects,
   SidebarEffects,
   ThemeEffects,
-  RelationshipEffects
+  RelationshipEffects,
 ];
diff --git a/src/app/app.metareducers.ts b/src/app/app.metareducers.ts
index 4cdecdc797..559389ccd3 100644
--- a/src/app/app.metareducers.ts
+++ b/src/app/app.metareducers.ts
@@ -29,9 +29,9 @@ export function universalMetaReducer(reducer) {
 }
 
 export const debugMetaReducers = [
-  debugMetaReducer
+  debugMetaReducer,
 ];
 
 export const appMetaReducers = [
-  universalMetaReducer
+  universalMetaReducer,
 ];
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 392969d041..a452459a4a 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -1,36 +1,58 @@
-import { APP_BASE_HREF, CommonModule, DOCUMENT } from '@angular/common';
-import { HTTP_INTERCEPTORS, HttpClientModule } from '@angular/common/http';
+import {
+  APP_BASE_HREF,
+  CommonModule,
+  DOCUMENT,
+} from '@angular/common';
+import {
+  HTTP_INTERCEPTORS,
+  HttpClientModule,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { DYNAMIC_MATCHER_PROVIDERS } from '@ng-dynamic-forms/core';
 import { EffectsModule } from '@ngrx/effects';
-import { RouterStateSerializer, StoreRouterConnectingModule } from '@ngrx/router-store';
-import { MetaReducer, StoreModule, USER_PROVIDED_META_REDUCERS } from '@ngrx/store';
-import { DYNAMIC_ERROR_MESSAGES_MATCHER, DYNAMIC_MATCHER_PROVIDERS, DynamicErrorMessagesMatcher } from '@ng-dynamic-forms/core';
+import {
+  RouterStateSerializer,
+  StoreRouterConnectingModule,
+} from '@ngrx/router-store';
+import {
+  MetaReducer,
+  StoreModule,
+  USER_PROVIDED_META_REDUCERS,
+} from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
-import { AppRoutingModule } from './app-routing.module';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../config/app-config.interface';
+import { StoreDevModules } from '../config/store/devtools';
+import { environment } from '../environments/environment';
+import { EagerThemesModule } from '../themes/eager-themes.module';
 import { AppComponent } from './app.component';
 import { appEffects } from './app.effects';
-import { appMetaReducers, debugMetaReducers } from './app.metareducers';
-import { appReducers, AppState, storeModuleConfig } from './app.reducer';
+import {
+  appMetaReducers,
+  debugMetaReducers,
+} from './app.metareducers';
+import {
+  appReducers,
+  AppState,
+  storeModuleConfig,
+} from './app.reducer';
+import { AppRoutingModule } from './app-routing.module';
+import { AuthInterceptor } from './core/auth/auth.interceptor';
 import { CoreModule } from './core/core.module';
+import { LocaleInterceptor } from './core/locale/locale.interceptor';
+import { LogInterceptor } from './core/log/log.interceptor';
 import { ClientCookieService } from './core/services/client-cookie.service';
+import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
 import { NavbarModule } from './navbar/navbar.module';
+import { RootModule } from './root.module';
 import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
 import { SharedModule } from './shared/shared.module';
-import { environment } from '../environments/environment';
-import { AuthInterceptor } from './core/auth/auth.interceptor';
-import { LocaleInterceptor } from './core/locale/locale.interceptor';
-import { XsrfInterceptor } from './core/xsrf/xsrf.interceptor';
-import { LogInterceptor } from './core/log/log.interceptor';
-import { EagerThemesModule } from '../themes/eager-themes.module';
-import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
-import { NgxMaskModule } from 'ngx-mask';
-import { StoreDevModules } from '../config/store/devtools';
-import { RootModule } from './root.module';
 
 export function getConfig() {
   return environment;
@@ -46,14 +68,6 @@ export function getMetaReducers(appConfig: AppConfig): MetaReducer<AppState>[] {
   return appConfig.debug ? [...appMetaReducers, ...debugMetaReducers] : appMetaReducers;
 }
 
-/**
- * Condition for displaying error messages on email form field
- */
-export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
-  (control: AbstractControl, model: any, hasFocus: boolean) => {
-    return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
-  };
-
 const IMPORTS = [
   CommonModule,
   SharedModule,
@@ -64,7 +78,6 @@ const IMPORTS = [
   ScrollToModule.forRoot(),
   NgbModule,
   TranslateModule.forRoot(),
-  NgxMaskModule.forRoot(),
   EffectsModule.forRoot(appEffects),
   StoreModule.forRoot(appReducers, storeModuleConfig),
   StoreRouterConnectingModule.forRoot(),
@@ -77,46 +90,43 @@ const PROVIDERS = [
   {
     provide: APP_BASE_HREF,
     useFactory: getBaseHref,
-    deps: [DOCUMENT, APP_CONFIG]
+    deps: [DOCUMENT, APP_CONFIG],
   },
   {
     provide: USER_PROVIDED_META_REDUCERS,
     useFactory: getMetaReducers,
-    deps: [APP_CONFIG]
+    deps: [APP_CONFIG],
   },
   {
     provide: RouterStateSerializer,
-    useClass: DSpaceRouterStateSerializer
+    useClass: DSpaceRouterStateSerializer,
   },
   ClientCookieService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: AuthInterceptor,
-    multi: true
+    multi: true,
   },
   // register LocaleInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: LocaleInterceptor,
-    multi: true
+    multi: true,
   },
   // register XsrfInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: XsrfInterceptor,
-    multi: true
+    multi: true,
   },
   // register LogInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
     useClass: LogInterceptor,
-    multi: true
-  },
-  {
-    provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
-    useValue: ValidateEmailErrorStateMatcher
+    multi: true,
   },
+  // register the dynamic matcher used by form. MUST be provided by the app module
   ...DYNAMIC_MATCHER_PROVIDERS,
 ];
 
@@ -130,10 +140,10 @@ const EXPORTS = [
 @NgModule({
   imports: [
     BrowserModule.withServerTransition({ appId: 'dspace-angular' }),
-    ...IMPORTS
+    ...IMPORTS,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   declarations: [
     ...DECLARATIONS,
@@ -141,7 +151,7 @@ const EXPORTS = [
   exports: [
     ...EXPORTS,
     ...DECLARATIONS,
-  ]
+  ],
 })
 export class AppModule {
 
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index 1d6e86463d..d79a3c1aaa 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -1,65 +1,89 @@
-import * as fromRouter from '@ngrx/router-store';
-import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store';
+import {
+  routerReducer,
+  RouterReducerState,
+} from '@ngrx/router-store';
+import {
+  ActionReducerMap,
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
 import {
   ePeopleRegistryReducer,
-  EPeopleRegistryState
+  EPeopleRegistryState,
 } from './access-control/epeople-registry/epeople-registry.reducers';
 import {
   groupRegistryReducer,
-  GroupRegistryState
+  GroupRegistryState,
 } from './access-control/group-registry/group-registry.reducers';
 import {
   metadataRegistryReducer,
-  MetadataRegistryState
+  MetadataRegistryState,
 } from './admin/admin-registries/metadata-registry/metadata-registry.reducers';
 import {
   CommunityListReducer,
-  CommunityListState
+  CommunityListState,
 } from './community-list-page/community-list.reducer';
+import { correlationIdReducer } from './correlation-id/correlation-id.reducer';
+import {
+  contextHelpReducer,
+  ContextHelpState,
+} from './shared/context-help.reducer';
 import { hasValue } from './shared/empty.util';
 import {
   NameVariantListsState,
-  nameVariantReducer
+  nameVariantReducer,
 } from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
-import { formReducer, FormState } from './shared/form/form.reducer';
-import { menusReducer} from './shared/menu/menu.reducer';
+import {
+  formReducer,
+  FormState,
+} from './shared/form/form.reducer';
+import { menusReducer } from './shared/menu/menu.reducer';
+import { MenusState } from './shared/menu/menus-state.model';
 import {
   notificationsReducer,
-  NotificationsState
+  NotificationsState,
 } from './shared/notifications/notifications.reducers';
 import {
   selectableListReducer,
-  SelectableListsState
+  SelectableListsState,
 } from './shared/object-list/selectable-list/selectable-list.reducer';
 import {
   ObjectSelectionListState,
-  objectSelectionReducer
+  objectSelectionReducer,
 } from './shared/object-select/object-select.reducer';
-import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/sass-helper.reducer';
-
-import { hostWindowReducer, HostWindowState } from './shared/search/host-window.reducer';
+import {
+  cssVariablesReducer,
+  CSSVariablesState,
+} from './shared/sass-helper/css-variable.reducer';
+import {
+  hostWindowReducer,
+  HostWindowState,
+} from './shared/search/host-window.reducer';
 import {
   filterReducer,
-  SearchFiltersState
+  SearchFiltersState,
 } from './shared/search/search-filters/search-filter/search-filter.reducer';
 import {
-  sidebarFilterReducer,
-  SidebarFiltersState
-} from './shared/sidebar/filter/sidebar-filter.reducer';
-import { sidebarReducer, SidebarState } from './shared/sidebar/sidebar.reducer';
-import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
-import { ThemeState, themeReducer } from './shared/theme-support/theme.reducer';
-import { MenusState } from './shared/menu/menus-state.model';
-import { correlationIdReducer } from './correlation-id/correlation-id.reducer';
+  sidebarReducer,
+  SidebarState,
+} from './shared/sidebar/sidebar.reducer';
+import {
+  themeReducer,
+  ThemeState,
+} from './shared/theme-support/theme.reducer';
+import {
+  truncatableReducer,
+  TruncatablesState,
+} from './shared/truncatable/truncatable.reducer';
 
 export interface AppState {
-  router: fromRouter.RouterReducerState;
+  router: RouterReducerState;
   hostWindow: HostWindowState;
   forms: FormState;
   metadataRegistry: MetadataRegistryState;
   notifications: NotificationsState;
   sidebar: SidebarState;
-  sidebarFilter: SidebarFiltersState;
   searchFilter: SearchFiltersState;
   truncatable: TruncatablesState;
   cssVariables: CSSVariablesState;
@@ -72,16 +96,16 @@ export interface AppState {
   epeopleRegistry: EPeopleRegistryState;
   groupRegistry: GroupRegistryState;
   correlationId: string;
+  contextHelp: ContextHelpState;
 }
 
 export const appReducers: ActionReducerMap<AppState> = {
-  router: fromRouter.routerReducer,
+  router: routerReducer,
   hostWindow: hostWindowReducer,
   forms: formReducer,
   metadataRegistry: metadataRegistryReducer,
   notifications: notificationsReducer,
   sidebar: sidebarReducer,
-  sidebarFilter: sidebarFilterReducer,
   searchFilter: filterReducer,
   truncatable: truncatableReducer,
   cssVariables: cssVariablesReducer,
@@ -93,7 +117,8 @@ export const appReducers: ActionReducerMap<AppState> = {
   communityList: CommunityListReducer,
   epeopleRegistry: ePeopleRegistryReducer,
   groupRegistry: groupRegistryReducer,
-  correlationId: correlationIdReducer
+  correlationId: correlationIdReducer,
+  contextHelp: contextHelpReducer,
 };
 
 export const routerStateSelector = (state: AppState) => state.router;
@@ -111,6 +136,6 @@ export function keySelector<T>(key: string, selector): MemoizedSelector<AppState
 export const storeModuleConfig = {
   runtimeChecks: {
     strictStateImmutability: true,
-    strictActionImmutability: true
-  }
+    strictActionImmutability: true,
+  },
 };
diff --git a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
index c41351f380..a460a6c892 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.spec.ts
@@ -1,17 +1,26 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { BitstreamAuthorizationsComponent } from './bitstream-authorizations.component';
 import { Bitstream } from '../../core/shared/bitstream.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations.component';
 
 describe('BitstreamAuthorizationsComponent', () => {
   let comp: BitstreamAuthorizationsComponent<DSpaceObject>;
@@ -23,21 +32,21 @@ describe('BitstreamAuthorizationsComponent', () => {
       'dc.title': [
         {
           value: 'file name',
-          language: null
-        }
-      ]
+          language: null,
+        },
+      ],
     },
     _links: {
-      content: { href: 'file-selflink' }
-    }
+      content: { href: 'file-selflink' },
+    },
   });
 
   const bitstreamRD = createSuccessfulRemoteDataObject(bitstream);
 
   const routeStub = {
     data: observableOf({
-      bitstream: bitstreamRD
-    })
+      bitstream: bitstreamRD,
+    }),
   };
 
   beforeEach(waitForAsync(() => {
@@ -47,9 +56,9 @@ describe('BitstreamAuthorizationsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [BitstreamAuthorizationsComponent],
       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..c65a0ee9c2 100644
--- a/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
+++ b/src/app/bitstream-page/bitstream-authorizations/bitstream-authorizations.component.ts
@@ -1,8 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
@@ -27,7 +32,7 @@ export class BitstreamAuthorizationsComponent<TDomain extends DSpaceObject> impl
    * @param {ActivatedRoute} route
    */
   constructor(
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
   ) {
   }
 
diff --git a/src/app/shared/bitstream-download-page/bitstream-download-page.component.html b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
similarity index 64%
rename from src/app/shared/bitstream-download-page/bitstream-download-page.component.html
rename to src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
index eddc5e345a..1467ffb0cc 100644
--- a/src/app/shared/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: (bitstream$ | async)?.name} }}</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/shared/bitstream-download-page/bitstream-download-page.component.spec.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
similarity index 69%
rename from src/app/shared/bitstream-download-page/bitstream-download-page.component.spec.ts
rename to src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
index 4100653e0f..a1dcd894bc 100644
--- a/src/app/shared/bitstream-download-page/bitstream-download-page.component.spec.ts
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.spec.ts
@@ -1,16 +1,27 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AuthService } from '../../core/auth/auth.service';
-import { FileService } from '../../core/shared/file.service';
-import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { BitstreamDownloadPageComponent } from './bitstream-download-page.component';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { ActivatedRoute, Router } from '@angular/router';
-import { getForbiddenRoute } from '../../app-routing-paths';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
+import { PLATFORM_ID } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { getForbiddenRoute } from '../../app-routing-paths';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { FileService } from '../../core/shared/file.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page.component';
 
 describe('BitstreamDownloadPageComponent', () => {
   let component: BitstreamDownloadPageComponent;
@@ -24,40 +35,65 @@ describe('BitstreamDownloadPageComponent', () => {
   let router;
 
   let bitstream: Bitstream;
+  let serverResponseService: jasmine.SpyObj<ServerResponseService>;
+  let signpostingDataService: jasmine.SpyObj<SignpostingDataService>;
+
+  const mocklink = {
+    href: 'http://test.org',
+    rel: 'test',
+    type: 'test',
+  };
+
+  const mocklink2 = {
+    href: 'http://test2.org',
+    rel: 'test',
+    type: 'test',
+  };
 
   function init() {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
     authorizationService = jasmine.createSpyObj('authorizationSerivice', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     fileService = jasmine.createSpyObj('fileService', {
-      retrieveFileDownloadLink: observableOf('content-url-with-headers')
+      retrieveFileDownloadLink: observableOf('content-url-with-headers'),
     });
 
     hardRedirectService = jasmine.createSpyObj('fileService', {
-      redirect: {}
+      redirect: {},
     });
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstreamUuid',
       _links: {
-        content: {href: 'bitstream-content-link'},
-        self: {href: 'bitstream-self-link'},
-      }
+        content: { href: 'bitstream-content-link' },
+        self: { href: 'bitstream-self-link' },
+      },
     });
 
     activatedRoute = {
       data: observableOf({
         bitstream: createSuccessfulRemoteDataObject(
-          bitstream
-        )
-      })
+          bitstream,
+        ),
+      }),
+      params: observableOf({
+        id: 'testid',
+      }),
     };
 
     router = jasmine.createSpyObj('router', ['navigateByUrl']);
+
+    serverResponseService = jasmine.createSpyObj('ServerResponseService', {
+      setHeader: jasmine.createSpy('setHeader'),
+    });
+
+    signpostingDataService = jasmine.createSpyObj('SignpostingDataService', {
+      getLinks: observableOf([mocklink, mocklink2]),
+    });
   }
 
   function initTestbed() {
@@ -65,13 +101,16 @@ describe('BitstreamDownloadPageComponent', () => {
       imports: [CommonModule, TranslateModule.forRoot()],
       declarations: [BitstreamDownloadPageComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: activatedRoute},
-        {provide: Router, useValue: router},
-        {provide: AuthorizationDataService, useValue: authorizationService},
-        {provide: AuthService, useValue: authService},
-        {provide: FileService, useValue: fileService},
-        {provide: HardRedirectService, useValue: hardRedirectService},
-      ]
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: AuthService, useValue: authService },
+        { provide: FileService, useValue: fileService },
+        { provide: HardRedirectService, useValue: hardRedirectService },
+        { provide: ServerResponseService, useValue: serverResponseService },
+        { provide: SignpostingDataService, useValue: signpostingDataService },
+        { provide: PLATFORM_ID, useValue: 'server' },
+      ],
     })
       .compileComponents();
   }
@@ -107,6 +146,9 @@ describe('BitstreamDownloadPageComponent', () => {
       it('should redirect to the content link', () => {
         expect(hardRedirectService.redirect).toHaveBeenCalledWith('bitstream-content-link');
       });
+      it('should add the signposting links', () => {
+        expect(serverResponseService.setHeader).toHaveBeenCalled();
+      });
     });
     describe('when the user is authorized and logged in', () => {
       beforeEach(waitForAsync(() => {
@@ -134,7 +176,7 @@ describe('BitstreamDownloadPageComponent', () => {
         fixture.detectChanges();
       });
       it('should navigate to the forbidden route', () => {
-        expect(router.navigateByUrl).toHaveBeenCalledWith(getForbiddenRoute(), {skipLocationChange: true});
+        expect(router.navigateByUrl).toHaveBeenCalledWith(getForbiddenRoute(), { skipLocationChange: true });
       });
     });
     describe('when the user is not authorized and not logged in', () => {
diff --git a/src/app/shared/bitstream-download-page/bitstream-download-page.component.ts b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
similarity index 61%
rename from src/app/shared/bitstream-download-page/bitstream-download-page.component.ts
rename to src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
index 9dd8c7c723..d8d9074f66 100644
--- a/src/app/shared/bitstream-download-page/bitstream-download-page.component.ts
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.ts
@@ -1,23 +1,51 @@
-import { Component, OnInit } from '@angular/core';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../empty.util';
-import { getRemoteDataPayload} from '../../core/shared/operators';
-import { Bitstream } from '../../core/shared/bitstream.model';
+import {
+  isPlatformServer,
+  Location,
+} from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { getForbiddenRoute } from '../../app-routing-paths';
+import { AuthService } from '../../core/auth/auth.service';
+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 { AuthService } from '../../core/auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { FileService } from '../../core/shared/file.service';
-import { HardRedirectService } from '../../core/services/hard-redirect.service';
-import { getForbiddenRoute } from '../../app-routing-paths';
 import { RemoteData } from '../../core/data/remote-data';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { SignpostingLink } from '../../core/data/signposting-links.model';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
-import { Location } from '@angular/common';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { FileService } from '../../core/shared/file.service';
+import { getRemoteDataPayload } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 
 @Component({
   selector: 'ds-bitstream-download-page',
-  templateUrl: './bitstream-download-page.component.html'
+  templateUrl: './bitstream-download-page.component.html',
 })
 /**
  * Page component for downloading a bitstream
@@ -27,7 +55,6 @@ export class BitstreamDownloadPageComponent implements OnInit {
   bitstream$: Observable<Bitstream>;
   bitstreamRD$: Observable<RemoteData<Bitstream>>;
 
-
   constructor(
     private route: ActivatedRoute,
     protected router: Router,
@@ -36,8 +63,12 @@ export class BitstreamDownloadPageComponent implements OnInit {
     private fileService: FileService,
     private hardRedirectService: HardRedirectService,
     private location: Location,
+    public dsoNameService: DSONameService,
+    private signpostingDataService: SignpostingDataService,
+    private responseService: ServerResponseService,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
-
+    this.initPageLinks();
   }
 
   back(): void {
@@ -51,7 +82,7 @@ export class BitstreamDownloadPageComponent implements OnInit {
 
     this.bitstream$ = this.bitstreamRD$.pipe(
       redirectOn4xx(this.router, this.auth),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
     this.bitstream$.pipe(
@@ -73,18 +104,39 @@ export class BitstreamDownloadPageComponent implements OnInit {
         } else {
           return [[isAuthorized, isLoggedIn, bitstream, '']];
         }
-      })
+      }),
     ).subscribe(([isAuthorized, isLoggedIn, bitstream, fileLink]: [boolean, boolean, Bitstream, string]) => {
       if (isAuthorized && isLoggedIn && isNotEmpty(fileLink)) {
         this.hardRedirectService.redirect(fileLink);
       } else if (isAuthorized && !isLoggedIn) {
         this.hardRedirectService.redirect(bitstream._links.content.href);
       } else if (!isAuthorized && isLoggedIn) {
-        this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
+        this.router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
       } else if (!isAuthorized && !isLoggedIn) {
         this.auth.setRedirectUrl(this.router.url);
         this.router.navigateByUrl('login');
       }
     });
   }
+
+  /**
+   * Create page links if any are retrieved by signposting endpoint
+   *
+   * @private
+   */
+  private initPageLinks(): void {
+    if (isPlatformServer(this.platformId)) {
+      this.route.params.subscribe(params => {
+        this.signpostingDataService.getLinks(params.id).pipe(take(1)).subscribe((signpostingLinks: SignpostingLink[]) => {
+          let links = '';
+
+          signpostingLinks.forEach((link: SignpostingLink) => {
+            links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
+          });
+
+          this.responseService.setHeader('Link', links);
+        });
+      });
+    }
+  }
 }
diff --git a/src/app/bitstream-page/bitstream-page-routing.module.ts b/src/app/bitstream-page/bitstream-page-routing.module.ts
index 0bdda29ddf..fd39466f23 100644
--- a/src/app/bitstream-page/bitstream-page-routing.module.ts
+++ b/src/app/bitstream-page/bitstream-page-routing.module.ts
@@ -1,18 +1,19 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
+
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { BitstreamPageResolver } from './bitstream-page.resolver';
-import { BitstreamDownloadPageComponent } from '../shared/bitstream-download-page/bitstream-download-page.component';
-import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
-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 { BitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 import { BitstreamBreadcrumbsService } from '../core/breadcrumbs/bitstream-breadcrumbs.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../shared/resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyResolver } from '../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
+import { BitstreamPageResolver } from './bitstream-page.resolver';
+import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
+import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 
 const EDIT_BITSTREAM_PATH = ':id/edit';
 const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
@@ -28,7 +29,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: 'handle/:prefix/:suffix/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver
+          bitstream: LegacyBitstreamUrlResolver,
         },
       },
       {
@@ -36,7 +37,7 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':prefix/:suffix/:sequence_id/:filename',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: LegacyBitstreamUrlResolver
+          bitstream: LegacyBitstreamUrlResolver,
         },
       },
       {
@@ -44,17 +45,17 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
         path: ':id/download',
         component: BitstreamDownloadPageComponent,
         resolve: {
-          bitstream: BitstreamPageResolver
+          bitstream: BitstreamPageResolver,
         },
       },
       {
         path: EDIT_BITSTREAM_PATH,
-        component: EditBitstreamPageComponent,
+        component: ThemedEditBitstreamPageComponent,
         resolve: {
           bitstream: BitstreamPageResolver,
           breadcrumb: BitstreamBreadcrumbResolver,
         },
-        canActivate: [AuthenticatedGuard]
+        canActivate: [AuthenticatedGuard],
       },
       {
         path: EDIT_BITSTREAM_AUTHORIZATIONS_PATH,
@@ -63,19 +64,19 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
           {
             path: 'create',
             resolve: {
-              resourcePolicyTarget: ResourcePolicyTargetResolver
+              resourcePolicyTarget: ResourcePolicyTargetResolver,
             },
             component: ResourcePolicyCreateComponent,
-            data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true }
+            data: { title: 'resource-policies.create.page.title', showBreadcrumbs: true },
           },
           {
             path: 'edit',
             resolve: {
               breadcrumb: I18nBreadcrumbResolver,
-              resourcePolicy: ResourcePolicyResolver
+              resourcePolicy: ResourcePolicyResolver,
             },
             component: ResourcePolicyEditComponent,
-            data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true }
+            data: { breadcrumbKey: 'item.edit', title: 'resource-policies.edit.page.title', showBreadcrumbs: true },
           },
           {
             path: '',
@@ -84,17 +85,17 @@ const EDIT_BITSTREAM_AUTHORIZATIONS_PATH = ':id/authorizations';
               breadcrumb: BitstreamBreadcrumbResolver,
             },
             component: BitstreamAuthorizationsComponent,
-            data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true }
-          }
-        ]
-      }
-    ])
+            data: { title: 'bitstream.edit.authorizations.title', showBreadcrumbs: true },
+          },
+        ],
+      },
+    ]),
   ],
   providers: [
     BitstreamPageResolver,
     BitstreamBreadcrumbResolver,
-    BitstreamBreadcrumbsService
-  ]
+    BitstreamBreadcrumbsService,
+  ],
 })
 export class BitstreamPageRoutingModule {
 }
diff --git a/src/app/bitstream-page/bitstream-page.module.ts b/src/app/bitstream-page/bitstream-page.module.ts
index d168a06db2..b24ab976c2 100644
--- a/src/app/bitstream-page/bitstream-page.module.ts
+++ b/src/app/bitstream-page/bitstream-page.module.ts
@@ -1,11 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared/shared.module';
-import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
-import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
-import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { NgModule } from '@angular/core';
+
 import { FormModule } from '../shared/form/form.module';
 import { ResourcePoliciesModule } from '../shared/resource-policies/resource-policies.module';
+import { SharedModule } from '../shared/shared.module';
+import { BitstreamAuthorizationsComponent } from './bitstream-authorizations/bitstream-authorizations.component';
+import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
+import { BitstreamPageRoutingModule } from './bitstream-page-routing.module';
+import { EditBitstreamPageComponent } from './edit-bitstream-page/edit-bitstream-page.component';
+import { ThemedEditBitstreamPageComponent } from './edit-bitstream-page/themed-edit-bitstream-page.component';
 
 /**
  * This module handles all components that are necessary for Bitstream related pages
@@ -16,12 +19,14 @@ import { ResourcePoliciesModule } from '../shared/resource-policies/resource-pol
     SharedModule,
     BitstreamPageRoutingModule,
     FormModule,
-    ResourcePoliciesModule
+    ResourcePoliciesModule,
   ],
   declarations: [
     BitstreamAuthorizationsComponent,
-    EditBitstreamPageComponent
-  ]
+    EditBitstreamPageComponent,
+    ThemedEditBitstreamPageComponent,
+    BitstreamDownloadPageComponent,
+  ],
 })
 export class BitstreamPageModule {
 }
diff --git a/src/app/bitstream-page/bitstream-page.resolver.ts b/src/app/bitstream-page/bitstream-page.resolver.ts
index be92041dfc..7880247934 100644
--- a/src/app/bitstream-page/bitstream-page.resolver.ts
+++ b/src/app/bitstream-page/bitstream-page.resolver.ts
@@ -1,19 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Bitstream } from '../core/shared/bitstream.model';
+
 import { BitstreamDataService } from '../core/data/bitstream-data.service';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.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
  */
- export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
-  followLink('bundle', {}, followLink('item')),
-  followLink('format')
+export const BITSTREAM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Bitstream>[] = [
+  followLink('bundle', {}, followLink('primaryBitstream'), followLink('item')),
+  followLink('format'),
 ];
 
 /**
@@ -37,12 +45,12 @@ export class BitstreamPageResolver implements Resolve<RemoteData<Bitstream>> {
         getFirstCompletedRemoteData(),
       );
   }
-    /**
+  /**
      * 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
      * Requesting them as embeds will limit the number of requests
      */
-    get followLinks(): FollowLinkConfig<Bitstream>[] {
-      return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
-    }
+  get followLinks(): FollowLinkConfig<Bitstream>[] {
+    return BITSTREAM_PAGE_LINKS_TO_FOLLOW;
+  }
 }
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 6454198340..b306eb2721 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
@@ -2,13 +2,13 @@
   <div class="container" *ngVar="(bitstreamFormatsRD$ | async) as formatsRD">
     <div class="row" *ngIf="bitstreamRD?.hasSucceeded && formatsRD?.hasSucceeded">
       <div class="col-md-2">
-        <ds-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="bitstreamRD?.payload"></ds-themed-thumbnail>
       </div>
       <div class="col-md-10">
         <div class="container">
           <div class="row">
             <div class="col-12">
-              <h3>{{bitstreamRD?.payload?.name}} <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>
diff --git a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
index 80adde4ecc..e69de29bb2 100644
--- a/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
+++ b/src/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
@@ -1,12 +0,0 @@
-:host {
-  ::ng-deep {
-    .switch {
-      position: absolute;
-      top: calc(var(--bs-spacer) * 2.5);
-    }
-  }
-}
-:host ::ng-deep ds-dynamic-form-control-container > div > label {
-  margin-top: 1.75rem;
-}
-
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 44e48182fd..6f26d537bc 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
@@ -1,29 +1,53 @@
-import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
 import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
+import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
-import { NotificationType } from '../../shared/notifications/models/notification-type';
-import { INotification, Notification } from '../../shared/notifications/models/notification.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
-import { hasValue } from '../../shared/empty.util';
-import { FormControl, FormGroup } from '@angular/forms';
-import { FileSizePipe } from '../../shared/utils/file-size-pipe';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../../core/shared/item.model';
 import { MetadataValueFilter } from '../../core/shared/metadata.models';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
+import { hasValue } from '../../shared/empty.util';
+import {
+  INotification,
+  Notification,
+} from '../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../shared/notifications/models/notification-type';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -32,19 +56,27 @@ const successNotification: INotification = new Notification('id', NotificationTy
 let notificationsService: NotificationsService;
 let formService: DynamicFormService;
 let bitstreamService: BitstreamDataService;
+let primaryBitstreamService: PrimaryBitstreamService;
 let bitstreamFormatService: BitstreamFormatDataService;
 let dsoNameService: DSONameService;
 let bitstream: Bitstream;
+let bitstreamID: string;
 let selectedFormat: BitstreamFormat;
 let allFormats: BitstreamFormat[];
 let router: Router;
-
+let currentPrimary: string;
+let differentPrimary: string;
+let bundle;
 let comp: EditBitstreamPageComponent;
 let fixture: ComponentFixture<EditBitstreamPageComponent>;
 
 describe('EditBitstreamPageComponent', () => {
 
   beforeEach(() => {
+    bitstreamID = 'current-bitstream-id';
+    currentPrimary = bitstreamID;
+    differentPrimary = '12345-abcde-54321-edcba';
+
     allFormats = [
       Object.assign({
         id: '1',
@@ -53,8 +85,8 @@ describe('EditBitstreamPageComponent', () => {
         supportLevel: BitstreamFormatSupportLevel.Unknown,
         mimetype: 'application/octet-stream',
         _links: {
-          self: {href: 'format-selflink-1'}
-        }
+          self: { href: 'format-selflink-1' },
+        },
       }),
       Object.assign({
         id: '2',
@@ -63,8 +95,8 @@ describe('EditBitstreamPageComponent', () => {
         supportLevel: BitstreamFormatSupportLevel.Known,
         mimetype: 'image/png',
         _links: {
-          self: {href: 'format-selflink-2'}
-        }
+          self: { href: 'format-selflink-2' },
+        },
       }),
       Object.assign({
         id: '3',
@@ -73,9 +105,9 @@ describe('EditBitstreamPageComponent', () => {
         supportLevel: BitstreamFormatSupportLevel.Known,
         mimetype: 'image/gif',
         _links: {
-          self: {href: 'format-selflink-3'}
-        }
-      })
+          self: { href: 'format-selflink-3' },
+        },
+      }),
     ] as BitstreamFormat[];
     selectedFormat = allFormats[1];
 
@@ -84,91 +116,124 @@ describe('EditBitstreamPageComponent', () => {
         const controls = {};
         if (hasValue(fModel)) {
           fModel.forEach((controlModel) => {
-            controls[controlModel.id] = new FormControl((controlModel as any).value);
+            controls[controlModel.id] = new UntypedFormControl((controlModel as any).value);
           });
-          return new FormGroup(controls);
+          return new UntypedFormGroup(controls);
         }
         return undefined;
-      }
+      },
     });
 
     bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
     });
 
     notificationsService = jasmine.createSpyObj('notificationsService',
       {
         info: infoNotification,
         warning: warningNotification,
-        success: successNotification
-      }
+        success: successNotification,
+      },
     );
+
+    bundle = {
+      _links: {
+        primaryBitstream: {
+          href: 'bundle-selflink',
+        },
+      },
+      item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+        uuid: 'some-uuid',
+        firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+          return undefined;
+        },
+      })),
+    };
+
+    const result = createSuccessfulRemoteDataObject$(bundle);
+    primaryBitstreamService = jasmine.createSpyObj('PrimaryBitstreamService',
+      {
+        put: result,
+        create: result,
+        delete: result,
+      });
+
   });
 
   describe('EditBitstreamPageComponent no IIIF fields', () => {
 
     beforeEach(waitForAsync(() => {
-
+      bundle = {
+        _links: {
+          primaryBitstream: {
+            href: 'bundle-selflink',
+          },
+        },
+        item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+          uuid: 'some-uuid',
+          firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+            return undefined;
+          },
+        })),
+      };
       const bundleName = 'ORIGINAL';
 
       bitstream = Object.assign(new Bitstream(), {
+        uuid: bitstreamID,
+        id: bitstreamID,
         metadata: {
           'dc.description': [
             {
-              value: 'Bitstream description'
-            }
+              value: 'Bitstream description',
+            },
           ],
           'dc.title': [
             {
-              value: 'Bitstream title'
-            }
-          ]
+              value: 'Bitstream title',
+            },
+          ],
         },
         format: createSuccessfulRemoteDataObject$(selectedFormat),
         _links: {
-          self: 'bitstream-selflink'
+          self: 'bitstream-selflink',
         },
-        bundle: createSuccessfulRemoteDataObject$({
-          item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
-            uuid: 'some-uuid',
-            firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-              return undefined;
-            },
-          }))
-        })
+        bundle: createSuccessfulRemoteDataObject$(bundle),
       });
       bitstreamService = jasmine.createSpyObj('bitstreamService', {
         findById: createSuccessfulRemoteDataObject$(bitstream),
+        findByHref: createSuccessfulRemoteDataObject$(bitstream),
         update: createSuccessfulRemoteDataObject$(bitstream),
         updateFormat: createSuccessfulRemoteDataObject$(bitstream),
         commitUpdates: {},
-        patch: {}
+        patch: {},
       });
       bitstreamFormatService = jasmine.createSpyObj('bitstreamFormatService', {
-        findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats))
+        findAll: createSuccessfulRemoteDataObject$(createPaginatedList(allFormats)),
       });
       dsoNameService = jasmine.createSpyObj('dsoNameService', {
-        getName: bundleName
+        getName: bundleName,
       });
 
       TestBed.configureTestingModule({
         imports: [TranslateModule.forRoot(), RouterTestingModule],
         declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
         providers: [
-          {provide: NotificationsService, useValue: notificationsService},
-          {provide: DynamicFormService, useValue: formService},
-          {provide: ActivatedRoute,
+          { provide: NotificationsService, useValue: notificationsService },
+          { provide: DynamicFormService, useValue: formService },
+          {
+            provide: ActivatedRoute,
             useValue: {
-              data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
-              snapshot: {queryParams: {}}
-            }
+              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              snapshot: { queryParams: {} },
+            },
           },
-          {provide: BitstreamDataService, useValue: bitstreamService},
-          {provide: DSONameService, useValue: dsoNameService},
-          {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-          ChangeDetectorRef
+          { provide: BitstreamDataService, useValue: bitstreamService },
+          { provide: DSONameService, useValue: dsoNameService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
+          ChangeDetectorRef,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
     }));
@@ -203,6 +268,27 @@ describe('EditBitstreamPageComponent', () => {
       it('should put the \"New Format\" input on invisible', () => {
         expect(comp.formLayout.newFormat.grid.host).toContain('invisible');
       });
+      describe('when the bitstream is the primary bitstream on the bundle', () => {
+        beforeEach(() => {
+          (comp as any).primaryBitstreamUUID = currentPrimary;
+          comp.setForm();
+          rawForm = comp.formGroup.getRawValue();
+
+        });
+        it('should enable the primary bitstream toggle', () => {
+          expect(rawForm.fileNamePrimaryContainer.primaryBitstream).toEqual(true);
+        });
+      });
+      describe('when the bitstream is not the primary bitstream on the bundle', () => {
+        beforeEach(() => {
+          (comp as any).primaryBitstreamUUID = differentPrimary;
+          comp.setForm();
+          rawForm = comp.formGroup.getRawValue();
+        });
+        it('should disable the primary bitstream toggle', () => {
+          expect(rawForm.fileNamePrimaryContainer.primaryBitstream).toEqual(false);
+        });
+      });
     });
 
     describe('when an unknown format is selected', () => {
@@ -216,6 +302,83 @@ describe('EditBitstreamPageComponent', () => {
     });
 
     describe('onSubmit', () => {
+      describe('when the primaryBitstream changed', () => {
+        describe('to the current bitstream', () => {
+          beforeEach(() => {
+            const rawValue = Object.assign(comp.formGroup.getRawValue(), { fileNamePrimaryContainer: { primaryBitstream: true } });
+            spyOn(comp.formGroup, 'getRawValue').and.returnValue(rawValue);
+          });
+
+          describe('from a different primary bitstream', () => {
+            beforeEach(() => {
+              (comp as any).primaryBitstreamUUID = differentPrimary;
+              comp.onSubmit();
+            });
+
+            it('should call put with the correct bitstream on the PrimaryBitstreamService', () => {
+              expect(primaryBitstreamService.put).toHaveBeenCalledWith(jasmine.objectContaining({ uuid: currentPrimary }), bundle);
+            });
+          });
+
+          describe('from no primary bitstream', () => {
+            beforeEach(() => {
+              (comp as any).primaryBitstreamUUID = null;
+              comp.onSubmit();
+            });
+
+            it('should call create with the correct bitstream on the PrimaryBitstreamService', () => {
+              expect(primaryBitstreamService.create).toHaveBeenCalledWith(jasmine.objectContaining({ uuid: currentPrimary }), bundle);
+            });
+          });
+        });
+        describe('to no primary bitstream', () => {
+          beforeEach(() => {
+            const rawValue = Object.assign(comp.formGroup.getRawValue(), { fileNamePrimaryContainer: { primaryBitstream: false } });
+            spyOn(comp.formGroup, 'getRawValue').and.returnValue(rawValue);
+          });
+
+          describe('from the current bitstream', () => {
+            beforeEach(() => {
+              (comp as any).primaryBitstreamUUID = currentPrimary;
+              comp.onSubmit();
+            });
+
+            it('should call delete on the PrimaryBitstreamService', () => {
+              expect(primaryBitstreamService.delete).toHaveBeenCalledWith(jasmine.objectContaining(bundle));
+            });
+          });
+        });
+      });
+      describe('when the primaryBitstream did not change', () => {
+        describe('the current bitstream stayed the primary bitstream', () => {
+          beforeEach(() => {
+            const rawValue = Object.assign(comp.formGroup.getRawValue(), { fileNamePrimaryContainer: { primaryBitstream: true } });
+            spyOn(comp.formGroup, 'getRawValue').and.returnValue(rawValue);
+            (comp as any).primaryBitstreamUUID = currentPrimary;
+            comp.onSubmit();
+          });
+          it('should not call anything on the PrimaryBitstreamService', () => {
+            expect(primaryBitstreamService.put).not.toHaveBeenCalled();
+            expect(primaryBitstreamService.delete).not.toHaveBeenCalled();
+            expect(primaryBitstreamService.create).not.toHaveBeenCalled();
+          });
+        });
+
+        describe('the bitstream was not and did not become the primary bitstream', () => {
+          beforeEach(() => {
+            const rawValue = Object.assign(comp.formGroup.getRawValue(), { fileNamePrimaryContainer: { primaryBitstream: false } });
+            spyOn(comp.formGroup, 'getRawValue').and.returnValue(rawValue);
+            (comp as any).primaryBitstreamUUID = differentPrimary;
+            comp.onSubmit();
+          });
+          it('should not call anything on the PrimaryBitstreamService', () => {
+            expect(primaryBitstreamService.put).not.toHaveBeenCalled();
+            expect(primaryBitstreamService.delete).not.toHaveBeenCalled();
+            expect(primaryBitstreamService.create).not.toHaveBeenCalled();
+          });
+        });
+      });
+
       describe('when selected format hasn\'t changed', () => {
         beforeEach(() => {
           comp.onSubmit();
@@ -234,8 +397,8 @@ describe('EditBitstreamPageComponent', () => {
         beforeEach(() => {
           comp.formGroup.patchValue({
             formatContainer: {
-              selectedFormat: allFormats[2].id
-            }
+              selectedFormat: allFormats[2].id,
+            },
           });
           fixture.detectChanges();
           comp.onSubmit();
@@ -261,20 +424,13 @@ describe('EditBitstreamPageComponent', () => {
         expect(comp.navigateToItemEditBitstreams).toHaveBeenCalled();
       });
     });
-    describe('when navigateToItemEditBitstreams is called, and the component has an itemId', () => {
+    describe('when navigateToItemEditBitstreams is called', () => {
       it('should redirect to the item edit page on the bitstreams tab with the itemId from the component', () => {
         comp.itemId = 'some-uuid1';
         comp.navigateToItemEditBitstreams();
         expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid1'), 'bitstreams']);
       });
     });
-    describe('when navigateToItemEditBitstreams is called, and the component does not have an itemId', () => {
-      it('should redirect to the item edit page on the bitstreams tab with the itemId from the bundle links ', () => {
-        comp.itemId = undefined;
-        comp.navigateToItemEditBitstreams();
-        expect(router.navigate).toHaveBeenCalledWith([getEntityEditRoute(null, 'some-uuid'), 'bitstreams']);
-      });
-    });
   });
 
   describe('EditBitstreamPageComponent with IIIF fields', () => {
@@ -287,79 +443,86 @@ describe('EditBitstreamPageComponent', () => {
         metadata: {
           'dc.description': [
             {
-              value: 'Bitstream description'
-            }
+              value: 'Bitstream description',
+            },
           ],
           'dc.title': [
             {
-              value: 'Bitstream title'
-            }
+              value: 'Bitstream title',
+            },
           ],
           'iiif.label': [
             {
-              value: 'chapter one'
-            }
+              value: 'chapter one',
+            },
           ],
           'iiif.toc': [
             {
-              value: 'chapter one'
-            }
+              value: 'chapter one',
+            },
           ],
           'iiif.image.width': [
             {
-              value: '2400'
-            }
+              value: '2400',
+            },
           ],
           'iiif.image.height': [
             {
-              value: '2800'
-            }
+              value: '2800',
+            },
           ],
         },
         format: createSuccessfulRemoteDataObject$(allFormats[1]),
         _links: {
-          self: 'bitstream-selflink'
+          self: 'bitstream-selflink',
         },
         bundle: createSuccessfulRemoteDataObject$({
+          _links: {
+            primaryBitstream: {
+              href: 'bundle-selflink',
+            },
+          },
           item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
             uuid: 'some-uuid',
             firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
               return 'True';
-            }
-          }))
-        })
+            },
+          })),
+        }),
       });
       bitstreamService = jasmine.createSpyObj('bitstreamService', {
         findById: createSuccessfulRemoteDataObject$(bitstream),
+        findByHref: createSuccessfulRemoteDataObject$(bitstream),
         update: createSuccessfulRemoteDataObject$(bitstream),
         updateFormat: createSuccessfulRemoteDataObject$(bitstream),
         commitUpdates: {},
-        patch: {}
+        patch: {},
       });
 
       dsoNameService = jasmine.createSpyObj('dsoNameService', {
-        getName: bundleName
+        getName: bundleName,
       });
 
       TestBed.configureTestingModule({
         imports: [TranslateModule.forRoot(), RouterTestingModule],
         declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
         providers: [
-          {provide: NotificationsService, useValue: notificationsService},
-          {provide: DynamicFormService, useValue: formService},
+          { provide: NotificationsService, useValue: notificationsService },
+          { provide: DynamicFormService, useValue: formService },
           {
             provide: ActivatedRoute,
             useValue: {
-              data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
-              snapshot: {queryParams: {}}
-            }
+              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              snapshot: { queryParams: {} },
+            },
           },
-          {provide: BitstreamDataService, useValue: bitstreamService},
-          {provide: DSONameService, useValue: dsoNameService},
-          {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-          ChangeDetectorRef
+          { provide: BitstreamDataService, useValue: bitstreamService },
+          { provide: DSONameService, useValue: dsoNameService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
+          ChangeDetectorRef,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
@@ -371,7 +534,6 @@ describe('EditBitstreamPageComponent', () => {
       spyOn(router, 'navigate');
     });
 
-
     describe('on startup', () => {
       let rawForm;
 
@@ -396,113 +558,120 @@ describe('EditBitstreamPageComponent', () => {
     });
   });
 
-    describe('ignore OTHERCONTENT bundle', () => {
+  describe('ignore OTHERCONTENT bundle', () => {
 
-      const bundleName = 'OTHERCONTENT';
+    const bundleName = 'OTHERCONTENT';
 
-      beforeEach(waitForAsync(() => {
+    beforeEach(waitForAsync(() => {
 
-        bitstream = Object.assign(new Bitstream(), {
-          metadata: {
-            'dc.description': [
-              {
-                value: 'Bitstream description'
-              }
-            ],
-            'dc.title': [
-              {
-                value: 'Bitstream title'
-              }
-            ],
-            'iiif.label': [
-              {
-                value: 'chapter one'
-              }
-            ],
-            'iiif.toc': [
-              {
-                value: 'chapter one'
-              }
-            ],
-            'iiif.image.width': [
-              {
-                value: '2400'
-              }
-            ],
-            'iiif.image.height': [
-              {
-                value: '2800'
-              }
-            ],
-          },
-          format: createSuccessfulRemoteDataObject$(allFormats[2]),
-          _links: {
-            self: 'bitstream-selflink'
-          },
-          bundle: createSuccessfulRemoteDataObject$({
-            item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
-              uuid: 'some-uuid',
-              firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
-                return 'True';
-              }
-            }))
-          })
-        });
-        bitstreamService = jasmine.createSpyObj('bitstreamService', {
-          findById: createSuccessfulRemoteDataObject$(bitstream),
-          update: createSuccessfulRemoteDataObject$(bitstream),
-          updateFormat: createSuccessfulRemoteDataObject$(bitstream),
-          commitUpdates: {},
-          patch: {}
-        });
-
-        dsoNameService = jasmine.createSpyObj('dsoNameService', {
-          getName: bundleName
-        });
-
-        TestBed.configureTestingModule({
-          imports: [TranslateModule.forRoot(), RouterTestingModule],
-          declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
-          providers: [
-            {provide: NotificationsService, useValue: notificationsService},
-            {provide: DynamicFormService, useValue: formService},
-            {provide: ActivatedRoute,
-              useValue: {
-                data: observableOf({bitstream: createSuccessfulRemoteDataObject(bitstream)}),
-                snapshot: {queryParams: {}}
-              }
+      bitstream = Object.assign(new Bitstream(), {
+        metadata: {
+          'dc.description': [
+            {
+              value: 'Bitstream description',
             },
-            {provide: BitstreamDataService, useValue: bitstreamService},
-            {provide: DSONameService, useValue: dsoNameService},
-            {provide: BitstreamFormatDataService, useValue: bitstreamFormatService},
-            ChangeDetectorRef
           ],
-          schemas: [NO_ERRORS_SCHEMA]
-        }).compileComponents();
-      }));
+          'dc.title': [
+            {
+              value: 'Bitstream title',
+            },
+          ],
+          'iiif.label': [
+            {
+              value: 'chapter one',
+            },
+          ],
+          'iiif.toc': [
+            {
+              value: 'chapter one',
+            },
+          ],
+          'iiif.image.width': [
+            {
+              value: '2400',
+            },
+          ],
+          'iiif.image.height': [
+            {
+              value: '2800',
+            },
+          ],
+        },
+        format: createSuccessfulRemoteDataObject$(allFormats[2]),
+        _links: {
+          self: 'bitstream-selflink',
+        },
+        bundle: createSuccessfulRemoteDataObject$({
+          _links: {
+            primaryBitstream: {
+              href: 'bundle-selflink',
+            },
+          },
+          item: createSuccessfulRemoteDataObject$(Object.assign(new Item(), {
+            uuid: 'some-uuid',
+            firstMetadataValue(keyOrKeys: string | string[], valueFilter?: MetadataValueFilter): string {
+              return 'True';
+            },
+          })),
+        }),
+      });
+      bitstreamService = jasmine.createSpyObj('bitstreamService', {
+        findById: createSuccessfulRemoteDataObject$(bitstream),
+        findByHref: createSuccessfulRemoteDataObject$(bitstream),
+        update: createSuccessfulRemoteDataObject$(bitstream),
+        updateFormat: createSuccessfulRemoteDataObject$(bitstream),
+        commitUpdates: {},
+        patch: {},
+      });
+
+      dsoNameService = jasmine.createSpyObj('dsoNameService', {
+        getName: bundleName,
+      });
+
+      TestBed.configureTestingModule({
+        imports: [TranslateModule.forRoot(), RouterTestingModule],
+        declarations: [EditBitstreamPageComponent, FileSizePipe, VarDirective],
+        providers: [
+          { provide: NotificationsService, useValue: notificationsService },
+          { provide: DynamicFormService, useValue: formService },
+          { provide: ActivatedRoute,
+            useValue: {
+              data: observableOf({ bitstream: createSuccessfulRemoteDataObject(bitstream) }),
+              snapshot: { queryParams: {} },
+            },
+          },
+          { provide: BitstreamDataService, useValue: bitstreamService },
+          { provide: DSONameService, useValue: dsoNameService },
+          { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+          { provide: PrimaryBitstreamService, useValue: primaryBitstreamService },
+          ChangeDetectorRef,
+        ],
+        schemas: [NO_ERRORS_SCHEMA],
+      }).compileComponents();
+    }));
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(EditBitstreamPageComponent);
+      comp = fixture.componentInstance;
+      fixture.detectChanges();
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigate');
+    });
+
+    describe('EditBitstreamPageComponent with IIIF fields', () => {
+      let rawForm;
 
       beforeEach(() => {
-        fixture = TestBed.createComponent(EditBitstreamPageComponent);
-        comp = fixture.componentInstance;
-        fixture.detectChanges();
-        router = TestBed.inject(Router);
-        spyOn(router, 'navigate');
+        rawForm = comp.formGroup.getRawValue();
       });
 
-      describe('EditBitstreamPageComponent with IIIF fields', () => {
-        let rawForm;
-
-        beforeEach(() => {
-          rawForm = comp.formGroup.getRawValue();
-        });
-
-        it('should NOT set isIIIF to true', () => {
-          expect(comp.isIIIF).toBeFalse();
-        });
-        it('should put the \"IIIF Label\" input not to be shown', () => {
-          expect(rawForm.iiifLabelContainer).toBeFalsy();
-        });
+      it('should NOT set is IIIF to true', () => {
+        expect(comp.isIIIF).toBeFalse();
       });
+      it('should put the \"IIIF Label\" input not to be shown', () => {
+        expect(rawForm.iiifLabelContainer).toBeFalsy();
+      });
+    });
   });
 
 });
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 9a59df4b95..84d08c192a 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
@@ -3,61 +3,73 @@ import {
   ChangeDetectorRef,
   Component,
   OnDestroy,
-  OnInit
+  OnInit,
 } from '@angular/core';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, mergeMap, switchMap } from 'rxjs/operators';
+import { UntypedFormGroup } from '@angular/forms';
 import {
-  combineLatest,
-  combineLatest as observableCombineLatest,
-  Observable,
-  of as observableOf,
-  Subscription
-} from 'rxjs';
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayout,
   DynamicFormService,
   DynamicInputModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
-import { FormGroup } 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';
+import cloneDeep from 'lodash/cloneDeep';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { BitstreamFormatDataService } from '../../core/data/bitstream-format-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { PrimaryBitstreamService } from '../../core/data/primary-bitstream.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
+import { Bundle } from '../../core/shared/bundle.model';
+import { Item } from '../../core/shared/item.model';
+import { Metadata } from '../../core/shared/metadata.utils';
 import {
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
+  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';
-import { BitstreamFormatSupportLevel } from '../../core/shared/bitstream-format-support-level';
-import { hasValue, isNotEmpty, isEmpty } from '../../shared/empty.util';
-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, getItemEditRoute } from '../../item-page/item-page-routing-paths';
-import { Bundle } from '../../core/shared/bundle.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { Item } from '../../core/shared/item.model';
+import { getEntityEditRoute } from '../../item-page/item-page-routing-paths';
 import {
-  DsDynamicInputModel
-} from '../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { DynamicCustomSwitchModel } from '../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.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 { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-edit-bitstream-page',
   styleUrls: ['./edit-bitstream-page.component.scss'],
   templateUrl: './edit-bitstream-page.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 /**
  * Page component for editing a bitstream
@@ -76,6 +88,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   bitstreamFormatsRD$: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
 
+  /**
+   * The UUID of the primary bitstream for this bundle
+   */
+  primaryBitstreamUUID: string;
+
   /**
    * The bitstream to edit
    */
@@ -145,20 +162,20 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     name: 'fileName',
     required: true,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
-      required: 'You must provide a file name for the bitstream'
-    }
+      required: 'You must provide a file name for the bitstream',
+    },
   });
 
   /**
    * The Dynamic Switch Model for the file's name
    */
   primaryBitstreamModel = new DynamicCustomSwitchModel({
-      id: 'primaryBitstream',
-      name: 'primaryBitstream'
-    }
+    id: 'primaryBitstream',
+    name: 'primaryBitstream',
+  },
   );
 
   /**
@@ -168,7 +185,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'description',
     name: 'description',
-    rows: 10
+    rows: 10,
   });
 
   /**
@@ -176,7 +193,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   selectedFormatModel = new DynamicSelectModel({
     id: 'selectedFormat',
-    name: 'selectedFormat'
+    name: 'selectedFormat',
   });
 
   /**
@@ -184,7 +201,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   newFormatModel = new DynamicInputModel({
     id: 'newFormat',
-    name: 'newFormat'
+    name: 'newFormat',
   });
 
   /**
@@ -193,80 +210,80 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   iiifLabelModel = new DsDynamicInputModel({
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'iiifLabel',
-    name: 'iiifLabel'
+    name: 'iiifLabel',
   },
-    {
-        grid: {
-          host: 'col col-lg-6 d-inline-block'
-        }
-    });
+  {
+    grid: {
+      host: 'col col-lg-6 d-inline-block',
+    },
+  });
   iiifLabelContainer = new DynamicFormGroupModel({
     id: 'iiifLabelContainer',
-    group: [this.iiifLabelModel]
-  },{
+    group: [this.iiifLabelModel],
+  }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   iiifTocModel = new DsDynamicInputModel({
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'iiifToc',
     name: 'iiifToc',
-  },{
+  }, {
     grid: {
-      host: 'col col-lg-6 d-inline-block'
-    }
+      host: 'col col-lg-6 d-inline-block',
+    },
   });
   iiifTocContainer = new DynamicFormGroupModel({
     id: 'iiifTocContainer',
-    group: [this.iiifTocModel]
-  },{
+    group: [this.iiifTocModel],
+  }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   iiifWidthModel = new DsDynamicInputModel({
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'iiifWidth',
     name: 'iiifWidth',
-  },{
+  }, {
     grid: {
-      host: 'col col-lg-6 d-inline-block'
-    }
+      host: 'col col-lg-6 d-inline-block',
+    },
   });
   iiifWidthContainer = new DynamicFormGroupModel({
     id: 'iiifWidthContainer',
-    group: [this.iiifWidthModel]
-  },{
+    group: [this.iiifWidthModel],
+  }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   iiifHeightModel = new DsDynamicInputModel({
     hasSelectableMetadata: false, metadataFields: [], repeatable: false, submissionId: '',
     id: 'iiifHeight',
-    name: 'iiifHeight'
-  },{
+    name: 'iiifHeight',
+  }, {
     grid: {
-      host: 'col col-lg-6 d-inline-block'
-    }
+      host: 'col col-lg-6 d-inline-block',
+    },
   });
   iiifHeightContainer = new DynamicFormGroupModel({
     id: 'iiifHeightContainer',
-    group: [this.iiifHeightModel]
-  },{
+    group: [this.iiifHeightModel],
+  }, {
     grid: {
-      host: 'form-row'
-    }
+      host: 'form-row',
+    },
   });
 
   /**
    * All input models in a simple array for easier iterations
    */
-  inputModels = [this.fileNameModel, this.primaryBitstreamModel, this.descriptionModel, this.selectedFormatModel,
+  inputModels = [this.primaryBitstreamModel, this.fileNameModel, this.descriptionModel, this.selectedFormatModel,
     this.newFormatModel];
 
   /**
@@ -277,27 +294,27 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     new DynamicFormGroupModel({
       id: 'fileNamePrimaryContainer',
       group: [
+        this.primaryBitstreamModel,
         this.fileNameModel,
-        this.primaryBitstreamModel
-      ]
-    },{
-        grid: {
-          host: 'form-row'
-        }
-      }),
+      ],
+    }, {
+      grid: {
+        host: 'form-row',
+      },
+    }),
     new DynamicFormGroupModel({
       id: 'descriptionContainer',
       group: [
-        this.descriptionModel
-      ]
+        this.descriptionModel,
+      ],
     }),
     new DynamicFormGroupModel({
       id: 'formatContainer',
       group: [
         this.selectedFormatModel,
-        this.newFormatModel
-      ]
-    })
+        this.newFormatModel,
+      ],
+    }),
   ];
 
   /**
@@ -311,55 +328,58 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   formLayout: DynamicFormLayout = {
     fileName: {
       grid: {
-        host: 'col col-sm-8 d-inline-block'
-      }
+        host: 'col col-sm-8 d-inline-block',
+      },
     },
     primaryBitstream: {
       grid: {
-        host: 'col col-sm-4 d-inline-block switch'
-      }
+        container: 'col-12',
+      },
+      element: {
+        container: 'text-right',
+      },
     },
     description: {
       grid: {
-        host: 'col-12 d-inline-block'
-      }
+        host: 'col-12 d-inline-block',
+      },
     },
     embargo: {
       grid: {
-        host: 'col-12 d-inline-block'
-      }
+        host: 'col-12 d-inline-block',
+      },
     },
     selectedFormat: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     newFormat: {
       grid: {
-        host: this.newFormatBaseLayout + ' invisible'
-      }
+        host: this.newFormatBaseLayout + ' invisible',
+      },
     },
     fileNamePrimaryContainer: {
       grid: {
-        host: 'row position-relative'
-      }
+        host: 'row position-relative',
+      },
     },
     descriptionContainer: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     formatContainer: {
       grid: {
-        host: 'row'
-      }
-    }
+        host: 'row',
+      },
+    },
   };
 
   /**
    * The form group of this form
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * The ID of the item the bitstream originates from
@@ -380,24 +400,29 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    */
   isIIIF = false;
 
-
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
    */
   protected subs: Subscription[] = [];
 
+  /**
+   * The parent bundle containing the Bitstream
+   * @private
+   */
+  private bundle: Bundle;
 
   constructor(private route: ActivatedRoute,
               private router: Router,
               private changeDetectorRef: ChangeDetectorRef,
-              private location: Location,
               private formService: DynamicFormService,
               private translate: TranslateService,
               private bitstreamService: BitstreamDataService,
-              private dsoNameService: DSONameService,
+              public dsoNameService: DSONameService,
               private notificationsService: NotificationsService,
-              private bitstreamFormatService: BitstreamFormatDataService) {
+              private bitstreamFormatService: BitstreamFormatDataService,
+              private primaryBitstreamService: PrimaryBitstreamService,
+  ) {
   }
 
   /**
@@ -410,35 +435,59 @@ 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) => data.bitstream));
+    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()
+      getRemoteDataPayload(),
     );
 
     const allFormats$ = this.bitstreamFormatsRD$.pipe(
       getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
+    const bundle$ = bitstream$.pipe(
+      switchMap((bitstream: Bitstream) => bitstream.bundle),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
+    const primaryBitstream$ = bundle$.pipe(
+      hasValueOperator(),
+      switchMap((bundle: Bundle) => this.bitstreamService.findByHref(bundle._links.primaryBitstream.href)),
+      getFirstSucceededRemoteDataPayload(),
+    );
+
+    const item$ = bundle$.pipe(
+      switchMap((bundle: Bundle) => bundle.item),
+      getFirstSucceededRemoteDataPayload(),
+    );
     this.subs.push(
       observableCombineLatest(
         bitstream$,
-        allFormats$
-      ).subscribe(([bitstream, allFormats]) => {
-        this.bitstream = bitstream as Bitstream;
-        this.formats = allFormats.page;
-        this.setIiifStatus(this.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);
+        }),
     );
 
     this.subs.push(
       this.translate.onLangChange
         .subscribe(() => {
-        this.updateFieldTranslations();
-      })
+          this.updateFieldTranslations();
+        }),
     );
   }
 
@@ -460,39 +509,39 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.formGroup.patchValue({
       fileNamePrimaryContainer: {
         fileName: bitstream.name,
-        primaryBitstream: false
+        primaryBitstream: this.primaryBitstreamUUID === bitstream.uuid,
       },
       descriptionContainer: {
-        description: bitstream.firstMetadataValue('dc.description')
+        description: bitstream.firstMetadataValue('dc.description'),
       },
       formatContainer: {
-        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined
-      }
+        newFormat: hasValue(bitstream.firstMetadata('dc.format')) ? bitstream.firstMetadata('dc.format').value : undefined,
+      },
     });
     if (this.isIIIF) {
       this.formGroup.patchValue({
         iiifLabelContainer: {
-          iiifLabel: bitstream.firstMetadataValue(this.IIIF_LABEL_METADATA)
+          iiifLabel: bitstream.firstMetadataValue(this.IIIF_LABEL_METADATA),
         },
         iiifTocContainer: {
-          iiifToc: bitstream.firstMetadataValue(this.IIIF_TOC_METADATA)
+          iiifToc: bitstream.firstMetadataValue(this.IIIF_TOC_METADATA),
         },
         iiifWidthContainer: {
-          iiifWidth: bitstream.firstMetadataValue(this.IMAGE_WIDTH_METADATA)
+          iiifWidth: bitstream.firstMetadataValue(this.IMAGE_WIDTH_METADATA),
         },
         iiifHeightContainer: {
-          iiifHeight: bitstream.firstMetadataValue(this.IMAGE_HEIGHT_METADATA)
-        }
+          iiifHeight: bitstream.firstMetadataValue(this.IMAGE_HEIGHT_METADATA),
+        },
       });
     }
     this.bitstream.format.pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     ).subscribe((format: BitstreamFormat) => {
       this.originalFormat = format;
       this.formGroup.patchValue({
         formatContainer: {
-          selectedFormat: format.id
-        }
+          selectedFormat: format.id,
+        },
       });
       this.updateNewFormatLayout(format.id);
     });
@@ -505,7 +554,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     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
+        label: this.isUnknownFormat(format.id) ? this.translate.instant(this.KEY_PREFIX + 'selectedFormat.unknown') : format.shortDescription,
       }));
   }
 
@@ -537,7 +586,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     this.inputModels.forEach(
       (fieldModel: DynamicFormControlModel) => {
         this.updateFieldTranslation(fieldModel);
-      }
+      },
     );
   }
 
@@ -571,9 +620,56 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     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 isPrimary = updatedValues.fileNamePrimaryContainer.primaryBitstream;
+    const wasPrimary = this.primaryBitstreamUUID === this.bitstream.uuid;
 
     let bitstream$;
+    let bundle$: Observable<Bundle>;
+    let errorWhileSaving = false;
 
+    if (wasPrimary !== isPrimary) {
+      let bundleRd$: Observable<RemoteData<Bundle>>;
+      if (wasPrimary) {
+        bundleRd$ = this.primaryBitstreamService.delete(this.bundle);
+      } else if (hasValue(this.primaryBitstreamUUID)) {
+        bundleRd$ = this.primaryBitstreamService.put(this.bitstream, this.bundle);
+      } else {
+        bundleRd$ = this.primaryBitstreamService.create(this.bitstream, this.bundle);
+      }
+
+      const completedBundleRd$ = bundleRd$.pipe(getFirstCompletedRemoteData());
+
+      this.subs.push(completedBundleRd$.pipe(
+        filter((bundleRd: RemoteData<Bundle>) => bundleRd.hasFailed),
+      ).subscribe((bundleRd: RemoteData<Bundle>) => {
+        this.notificationsService.error(
+          this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.primaryBitstream.title'),
+          bundleRd.errorMessage,
+        );
+        errorWhileSaving = true;
+      }));
+
+      bundle$ = completedBundleRd$.pipe(
+        map((bundleRd: RemoteData<Bundle>) => {
+          if (bundleRd.hasSucceeded) {
+            return bundleRd.payload;
+          } else {
+            return this.bundle;
+          }
+        }),
+      );
+
+      this.subs.push(bundle$.pipe(
+        hasValueOperator(),
+        switchMap((bundle: Bundle) => this.bitstreamService.findByHref(bundle._links.primaryBitstream.href, false)),
+        getFirstSucceededRemoteDataPayload(),
+      ).subscribe((bitstream: Bitstream) => {
+        this.primaryBitstreamUUID = hasValue(bitstream) ? bitstream.uuid : null;
+      }));
+
+    } else {
+      bundle$ = observableOf(this.bundle);
+    }
     if (isNewFormat) {
       bitstream$ = this.bitstreamService.updateFormat(this.bitstream, selectedFormat).pipe(
         getFirstCompletedRemoteData(),
@@ -581,30 +677,33 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
           if (hasValue(formatResponse) && formatResponse.hasFailed) {
             this.notificationsService.error(
               this.translate.instant(this.NOTIFICATIONS_PREFIX + 'error.format.title'),
-              formatResponse.errorMessage
+              formatResponse.errorMessage,
             );
           } else {
             return formatResponse.payload;
           }
-        })
+        }),
       );
     } else {
       bitstream$ = observableOf(this.bitstream);
     }
 
-    bitstream$.pipe(
+    combineLatest([bundle$, bitstream$]).pipe(
+      tap(([bundle]) => this.bundle = bundle),
       switchMap(() => {
         return this.bitstreamService.update(updatedBitstream).pipe(
-          getFirstSucceededRemoteDataPayload()
+          getFirstSucceededRemoteDataPayload(),
         );
-      })
+      }),
     ).subscribe(() => {
       this.bitstreamService.commitUpdates();
       this.notificationsService.success(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.title'),
-        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.content')
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'saved.content'),
       );
-      this.navigateToItemEditBitstreams();
+      if (!errorWhileSaving) {
+        this.navigateToItemEditBitstreams();
+      }
     });
   }
 
@@ -615,10 +714,12 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
   formToBitstream(rawForm): Bitstream {
     const updatedBitstream = cloneDeep(this.bitstream);
     const newMetadata = updatedBitstream.metadata;
-    // TODO: Set bitstream to primary when supported
-    const primary = rawForm.fileNamePrimaryContainer.primaryBitstream;
     Metadata.setFirstValue(newMetadata, 'dc.title', rawForm.fileNamePrimaryContainer.fileName);
-    Metadata.setFirstValue(newMetadata, 'dc.description', rawForm.descriptionContainer.description);
+    if (isEmpty(rawForm.descriptionContainer.description)) {
+      delete newMetadata['dc.description'];
+    } else {
+      Metadata.setFirstValue(newMetadata, 'dc.description', rawForm.descriptionContainer.description);
+    }
     if (this.isIIIF) {
       // It's helpful to remove these metadata elements entirely when the form value is empty.
       // This avoids potential issues on the REST side and makes it possible to do things like
@@ -629,11 +730,11 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
       } else {
         Metadata.setFirstValue(newMetadata, this.IIIF_LABEL_METADATA, rawForm.iiifLabelContainer.iiifLabel);
       }
-     if (isEmpty(rawForm.iiifTocContainer.iiifToc)) {
-       delete newMetadata[this.IIIF_TOC_METADATA];
-     } else {
+      if (isEmpty(rawForm.iiifTocContainer.iiifToc)) {
+        delete newMetadata[this.IIIF_TOC_METADATA];
+      } else {
         Metadata.setFirstValue(newMetadata, this.IIIF_TOC_METADATA, rawForm.iiifTocContainer.iiifToc);
-     }
+      }
       if (isEmpty(rawForm.iiifWidthContainer.iiifWidth)) {
         delete newMetadata[this.IMAGE_WIDTH_METADATA];
       } else {
@@ -664,15 +765,7 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
    * otherwise retrieve the item ID based on the owning bundle's link
    */
   navigateToItemEditBitstreams() {
-    if (hasValue(this.itemId)) {
-      this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
-    } else {
-      this.bitstream.bundle.pipe(getFirstSucceededRemoteDataPayload(),
-          mergeMap((bundle: Bundle) => bundle.item.pipe(getFirstSucceededRemoteDataPayload())))
-          .subscribe((item) => {
-            this.router.navigate(([getItemEditRoute(item), 'bitstreams']));
-          });
-    }
+    this.router.navigate([getEntityEditRoute(this.entityType, this.itemId), 'bitstreams']);
   }
 
   /**
@@ -697,16 +790,16 @@ export class EditBitstreamPageComponent implements OnInit, OnDestroy {
     const isEnabled$ = this.bitstream.bundle.pipe(
       getFirstSucceededRemoteData(),
       map((bundle: RemoteData<Bundle>) => bundle.payload.item.pipe(
-          getFirstSucceededRemoteData(),
-          map((item: RemoteData<Item>) =>
-            (item.payload.firstMetadataValue('dspace.iiif.enabled') &&
-              item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null)
-      ))));
+        getFirstSucceededRemoteData(),
+        map((item: RemoteData<Item>) =>
+          (item.payload.firstMetadataValue('dspace.iiif.enabled') &&
+            item.payload.firstMetadataValue('dspace.iiif.enabled').match(regexIIIFItem) !== null),
+        ))));
 
     const iiifSub = combineLatest(
       isImage$,
       isIIIFBundle$,
-      isEnabled$
+      isEnabled$,
     ).subscribe(([isImage, isIIIFBundle, isEnabled]) => {
       if (isImage && isIIIFBundle && isEnabled) {
         this.isIIIF = true;
diff --git a/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts b/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts
new file mode 100644
index 0000000000..5c6af7e321
--- /dev/null
+++ b/src/app/bitstream-page/edit-bitstream-page/themed-edit-bitstream-page.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { EditBitstreamPageComponent } from './edit-bitstream-page.component';
+
+@Component({
+  selector: 'ds-themed-edit-bitstream-page',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedEditBitstreamPageComponent extends ThemedComponent<EditBitstreamPageComponent> {
+  protected getComponentName(): string {
+    return 'EditBitstreamPageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-bitstream-page.component');
+  }
+}
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
index 045582cb26..9fd2dc315a 100644
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
+++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.spec.ts
@@ -1,9 +1,10 @@
-import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
-import { of as observableOf, EMPTY } from 'rxjs';
+import { EMPTY } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
 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';
+import { LegacyBitstreamUrlResolver } from './legacy-bitstream-url.resolver';
 
 describe(`LegacyBitstreamUrlResolver`, () => {
   let resolver: LegacyBitstreamUrlResolver;
@@ -20,7 +21,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
 
     route = {
       params: {},
-      queryParams: {}
+      queryParams: {},
     };
     state = {};
     remoteDataMocks = {
@@ -30,7 +31,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
       Error: new RemoteData(0, 0, 0, RequestEntryState.Error, 'Internal server error', undefined, 500),
     };
     bitstreamDataService = {
-      findByItemHandle: () => undefined
+      findByItemHandle: () => undefined,
     } as any;
     resolver = new LegacyBitstreamUrlResolver(bitstreamDataService);
   });
@@ -44,8 +45,8 @@ describe(`LegacyBitstreamUrlResolver`, () => {
             prefix: '123456789',
             suffix: '1234',
             filename: 'some-file.pdf',
-            sequence_id: '5'
-          }
+            sequence_id: '5',
+          },
         });
       });
       it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
@@ -54,7 +55,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
             `${route.params.prefix}/${route.params.suffix}`,
             route.params.sequence_id,
-            route.params.filename
+            route.params.filename,
           );
         });
       });
@@ -71,8 +72,8 @@ describe(`LegacyBitstreamUrlResolver`, () => {
               filename: 'some-file.pdf',
             },
             queryParams: {
-              sequenceId: '5'
-            }
+              sequenceId: '5',
+            },
           });
         });
         it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
@@ -81,7 +82,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
             expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
               `${route.params.prefix}/${route.params.suffix}`,
               route.queryParams.sequenceId,
-              route.params.filename
+              route.params.filename,
             );
           });
         });
@@ -103,7 +104,7 @@ describe(`LegacyBitstreamUrlResolver`, () => {
             expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
               `${route.params.prefix}/${route.params.suffix}`,
               undefined,
-              route.params.filename
+              route.params.filename,
             );
           });
         });
diff --git a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
index 948bec2473..36e0cd5532 100644
--- a/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
+++ b/src/app/bitstream-page/legacy-bitstream-url.resolver.ts
@@ -1,17 +1,22 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { BitstreamDataService } from '../core/data/bitstream-data.service';
 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'
+  providedIn: 'root',
 })
 export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>> {
   constructor(protected bitstreamDataService: BitstreamDataService) {
@@ -28,21 +33,21 @@ export class LegacyBitstreamUrlResolver implements Resolve<RemoteData<Bitstream>
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot):
     Observable<RemoteData<Bitstream>> {
-      const prefix = route.params.prefix;
-      const suffix = route.params.suffix;
-      const filename = route.params.filename;
+    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;
-      }
+    let sequenceId = route.params.sequence_id;
+    if (hasNoValue(sequenceId)) {
+      sequenceId = route.queryParams.sequenceId;
+    }
 
-      return this.bitstreamDataService.findByItemHandle(
-        `${prefix}/${suffix}`,
-        sequenceId,
-        filename,
-      ).pipe(
-        getFirstCompletedRemoteData()
-      );
+    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 51524fde48..3bba89622f 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">{{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" >{{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 412dca87db..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);
 }
 
@@ -23,11 +22,14 @@ li.breadcrumb-item {
   }
 }
 
-li.breadcrumb-item > a {
-  color: var(--ds-breadcrumb-link-color) !important;
+li.breadcrumb-item {
+    a {
+        color: var(--ds-breadcrumb-link-color);
+    }
 }
+
 li.breadcrumb-item.active {
-  color: var(--ds-breadcrumb-link-active-color) !important;
+  color: var(--ds-breadcrumb-link-active-color);
 }
 
 .breadcrumb-item+ .breadcrumb-item::before {
diff --git a/src/app/breadcrumbs/breadcrumbs.component.spec.ts b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
index 69387e7534..ecaafc88bf 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.spec.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.spec.ts
@@ -1,15 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
+import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
+import { VarDirective } from '../shared/utils/var.directive';
+import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 import { BreadcrumbsComponent } from './breadcrumbs.component';
 import { BreadcrumbsService } from './breadcrumbs.service';
-import { Breadcrumb } from './breadcrumb/breadcrumb.model';
-import { VarDirective } from '../shared/utils/var.directive';
-import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
-import { RouterTestingModule } from '@angular/router/testing';
-import { of as observableOf } from 'rxjs';
-import { DebugElement } from '@angular/core';
 
 describe('BreadcrumbsComponent', () => {
   let component: BreadcrumbsComponent;
@@ -50,7 +57,7 @@ describe('BreadcrumbsComponent', () => {
           loader: {
             provide: TranslateLoader,
             useClass: TranslateLoaderMock,
-          }
+          },
         }),
       ],
       providers: [
diff --git a/src/app/breadcrumbs/breadcrumbs.component.ts b/src/app/breadcrumbs/breadcrumbs.component.ts
index 248fb446ed..1d0c61981c 100644
--- a/src/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 import { BreadcrumbsService } from './breadcrumbs.service';
-import { Observable } from 'rxjs';
 
 /**
  * Component representing the breadcrumbs of a page
@@ -9,7 +10,7 @@ import { Observable } from 'rxjs';
 @Component({
   selector: 'ds-breadcrumbs',
   templateUrl: './breadcrumbs.component.html',
-  styleUrls: ['./breadcrumbs.component.scss']
+  styleUrls: ['./breadcrumbs.component.scss'],
 })
 export class BreadcrumbsComponent {
 
diff --git a/src/app/breadcrumbs/breadcrumbs.service.spec.ts b/src/app/breadcrumbs/breadcrumbs.service.spec.ts
index 11b8bace39..89dd2c98b5 100644
--- a/src/app/breadcrumbs/breadcrumbs.service.spec.ts
+++ b/src/app/breadcrumbs/breadcrumbs.service.spec.ts
@@ -1,12 +1,20 @@
 import { TestBed } from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+  Subject,
+} from 'rxjs';
 
-import { BreadcrumbsService } from './breadcrumbs.service';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
-import { Observable, of as observableOf, Subject } from 'rxjs';
-import { BreadcrumbConfig } from './breadcrumb/breadcrumb-config.model';
 import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
 import { Breadcrumb } from './breadcrumb/breadcrumb.model';
-import { cold } from 'jasmine-marbles';
+import { BreadcrumbConfig } from './breadcrumb/breadcrumb-config.model';
+import { BreadcrumbsService } from './breadcrumbs.service';
 
 class TestBreadcrumbsService implements BreadcrumbsProviderService<string> {
   getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
@@ -80,8 +88,8 @@ describe('BreadcrumbsService', () => {
       const route1 = {
         snapshot: {
           data: { breadcrumb: breadcrumbConfigA },
-          routeConfig: { resolve: { breadcrumb: {} } }
-        }
+          routeConfig: { resolve: { breadcrumb: {} } },
+        },
       };
 
       const expectation1 = [
@@ -94,7 +102,7 @@ describe('BreadcrumbsService', () => {
       const route2 = {
         snapshot: {
           data: { breadcrumb: breadcrumbConfigA },
-          routeConfig: { resolve: { breadcrumb: {} } }
+          routeConfig: { resolve: { breadcrumb: {} } },
         },
         firstChild: {
           snapshot: {
@@ -104,10 +112,10 @@ describe('BreadcrumbsService', () => {
           firstChild: {
             snapshot: {
               data: { breadcrumb: breadcrumbConfigB },
-              routeConfig: { resolve: { breadcrumb: {} } }
-            }
-          }
-        }
+              routeConfig: { resolve: { breadcrumb: {} } },
+            },
+          },
+        },
       };
 
       const expectation2 = [
@@ -129,8 +137,8 @@ describe('BreadcrumbsService', () => {
               breadcrumb: breadcrumbConfigA,
               showBreadcrumbs: false, // explicitly hide breadcrumbs
             },
-            routeConfig: { resolve: { breadcrumb: {} } }
-          }
+            routeConfig: { resolve: { breadcrumb: {} } },
+          },
         };
 
         changeActivatedRoute(route1);
@@ -142,8 +150,8 @@ describe('BreadcrumbsService', () => {
               breadcrumb: breadcrumbConfigA,
               showBreadcrumbs: true, // explicitly show breadcrumbs
             },
-            routeConfig: { resolve: { breadcrumb: {} } }
-          }
+            routeConfig: { resolve: { breadcrumb: {} } },
+          },
         };
 
         changeActivatedRoute(route2);
@@ -158,8 +166,8 @@ describe('BreadcrumbsService', () => {
             data: {
               // no breadcrumbs set - always hide
             },
-            routeConfig: { resolve: { breadcrumb: {} } }
-          }
+            routeConfig: { resolve: { breadcrumb: {} } },
+          },
         };
 
         changeActivatedRoute(route1);
diff --git a/src/app/breadcrumbs/breadcrumbs.service.ts b/src/app/breadcrumbs/breadcrumbs.service.ts
index a7be030c12..73ec7da39b 100644
--- a/src/app/breadcrumbs/breadcrumbs.service.ts
+++ b/src/app/breadcrumbs/breadcrumbs.service.ts
@@ -1,12 +1,31 @@
 import { Injectable } from '@angular/core';
-import {combineLatest, Observable, of as observableOf, ReplaySubject} from 'rxjs';
-import {Breadcrumb} from './breadcrumb/breadcrumb.model';
-import {ActivatedRoute, NavigationEnd, Router} from '@angular/router';
-import {filter, map, switchMap, tap} from 'rxjs/operators';
-import {hasNoValue, hasValue, isUndefined} from '../shared/empty.util';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+  ReplaySubject,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isUndefined,
+} from '../shared/empty.util';
+import { Breadcrumb } from './breadcrumb/breadcrumb.model';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BreadcrumbsService {
 
diff --git a/src/app/breadcrumbs/themed-breadcrumbs.component.ts b/src/app/breadcrumbs/themed-breadcrumbs.component.ts
index 1869a440b9..7dca22bdf1 100644
--- a/src/app/breadcrumbs/themed-breadcrumbs.component.ts
+++ b/src/app/breadcrumbs/themed-breadcrumbs.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { BreadcrumbsComponent } from './breadcrumbs.component';
 
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
deleted file mode 100644
index c4a67349a5..0000000000
--- a/src/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
-import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions, getBrowseSearchOptions
-} from '../browse-by-metadata-page/browse-by-metadata-page.component';
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-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 { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { isValidDate } from '../../shared/date.util';
-import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
-
-@Component({
-  selector: 'ds-browse-by-date-page',
-  styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-/**
- * Component for browsing items by metadata definition of type 'date'
- * A metadata definition (a.k.a. browse id) is a short term used to describe one or multiple metadata fields.
- * An example would be 'dateissued' for 'dc.date.issued'
- */
-export class BrowseByDatePageComponent extends BrowseByMetadataPageComponent {
-
-  /**
-   * The default metadata keys to use for determining the lower limit of the StartsWith dropdown options
-   */
-  defaultMetadataKeys = ['dc.date.issued'];
-
-  public constructor(protected route: ActivatedRoute,
-                     protected browseService: BrowseService,
-                     protected dsoService: DSpaceObjectDataService,
-                     protected router: Router,
-                     protected paginationService: PaginationService,
-                     protected cdRef: ChangeDetectorRef,
-                     @Inject(APP_CONFIG) public appConfig: AppConfig) {
-    super(route, browseService, dsoService, paginationService, router, appConfig);
-  }
-
-  ngOnInit(): void {
-    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);
-    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]) => {
-        const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
-        this.browseId = params.id || this.defaultBrowseId;
-        this.startsWith = +params.startsWith || params.startsWith;
-        const searchOptions = browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails);
-        this.updatePageWithItems(searchOptions, this.value, undefined);
-        this.updateParent(params.scope);
-        this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
-      }));
-  }
-
-  /**
-   * Update the StartsWith options
-   * In this implementation, it creates a list of years starting from now, going all the way back to the earliest
-   * date found on an item within this scope. The further back in time, the bigger the change in years become to avoid
-   * extremely long lists with a one-year difference.
-   * To determine the change in years, the config found under GlobalConfig.BrowseBy is used for this.
-   * @param definition      The metadata definition to fetch the first item for
-   * @param metadataKeys    The metadata fields to fetch the earliest date from (expects a date field)
-   * @param scope           The scope under which to fetch the earliest item for
-   */
-  updateStartsWithOptions(definition: string, metadataKeys: string[], scope?: string) {
-    this.subs.push(
-      this.browseService.getFirstItemFor(definition, scope).subscribe((firstItemRD: RemoteData<Item>) => {
-        let lowerLimit = this.appConfig.browseBy.defaultLowerLimit;
-        if (hasValue(firstItemRD.payload)) {
-          const date = firstItemRD.payload.firstMetadataValue(metadataKeys);
-          if (isNotEmpty(date) && isValidDate(date)) {
-            const dateObj = new Date(date);
-            // TODO: it appears that getFullYear (based on local time) is sometimes unreliable. Switching to UTC.
-            lowerLimit = isNaN(dateObj.getUTCFullYear()) ? lowerLimit : dateObj.getUTCFullYear();
-          }
-        }
-        const options = [];
-        const currentYear = new Date().getUTCFullYear();
-        const oneYearBreak = Math.floor((currentYear - this.appConfig.browseBy.oneYearLimit) / 5) * 5;
-        const fiveYearBreak = Math.floor((currentYear - this.appConfig.browseBy.fiveYearLimit) / 10) * 10;
-        if (lowerLimit <= fiveYearBreak) {
-          lowerLimit -= 10;
-        } else if (lowerLimit <= oneYearBreak) {
-          lowerLimit -= 5;
-        } else {
-          lowerLimit -= 1;
-        }
-        let i = currentYear;
-        while (i > lowerLimit) {
-          options.push(i);
-          if (i <= fiveYearBreak) {
-            i -= 10;
-          } else if (i <= oneYearBreak) {
-            i -= 5;
-          } else {
-            i--;
-          }
-        }
-        if (isNotEmpty(options)) {
-          this.startsWithOptions = options;
-          this.cdRef.detectChanges();
-        }
-      })
-    );
-  }
-}
diff --git a/src/app/browse-by/browse-by-date-page/themed-browse-by-date-page.component.ts b/src/app/browse-by/browse-by-date-page/themed-browse-by-date-page.component.ts
deleted file mode 100644
index 8eeae0c5de..0000000000
--- a/src/app/browse-by/browse-by-date-page/themed-browse-by-date-page.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {Component} from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseByDatePageComponent } from './browse-by-date-page.component';
-import {BrowseByDataType, rendersBrowseBy} from '../browse-by-switcher/browse-by-decorator';
-
-/**
- * Themed wrapper for BrowseByDatePageComponent
- * */
-@Component({
-  selector: 'ds-themed-browse-by-metadata-page',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
-})
-
-@rendersBrowseBy(BrowseByDataType.Date)
-export class ThemedBrowseByDatePageComponent
-  extends ThemedComponent<BrowseByDatePageComponent> {
-  protected getComponentName(): string {
-    return 'BrowseByDatePageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-date-page/browse-by-date-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-date-page.component`);
-  }
-}
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/browse-by-date.component.spec.ts
similarity index 61%
rename from src/app/browse-by/browse-by-date-page/browse-by-date-page.component.spec.ts
rename to src/app/browse-by/browse-by-date/browse-by-date.component.spec.ts
index 5c2a6d820e..b6e87356f2 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/browse-by-date.component.spec.ts
@@ -1,31 +1,44 @@
-import { BrowseByDatePageComponent } from './browse-by-date-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
-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 { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { Community } from '../../core/shared/community.model';
-import { Item } from '../../core/shared/item.model';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-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 { BrowseService } from '../../core/browse/browse.service';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
+import { SortDirection } from '../../core/cache/models/sort-options.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { toRemoteData } from '../browse-by-metadata/browse-by-metadata.component.spec';
+import { BrowseByDateComponent } from './browse-by-date.component';
 
-describe('BrowseByDatePageComponent', () => {
-  let comp: BrowseByDatePageComponent;
-  let fixture: ComponentFixture<BrowseByDatePageComponent>;
+describe('BrowseByDateComponent', () => {
+  let comp: BrowseByDateComponent;
+  let fixture: ComponentFixture<BrowseByDateComponent>;
   let route: ActivatedRoute;
   let paginationService;
 
@@ -34,9 +47,9 @@ describe('BrowseByDatePageComponent', () => {
     metadata: [
       {
         key: 'dc.title',
-        value: 'test community'
-      }
-    ]
+        value: 'test community',
+      },
+    ],
   });
 
   const firstItem = Object.assign(new Item(), {
@@ -44,30 +57,40 @@ describe('BrowseByDatePageComponent', () => {
     metadata: {
       'dc.date.issued': [
         {
-          value: '1950-01-01'
-        }
-      ]
-    }
+          value: '1950-01-01',
+        },
+      ],
+    },
+  });
+  const lastItem = Object.assign(new Item(), {
+    id: 'last-item-id',
+    metadata: {
+      'dc.date.issued': [
+        {
+          value: '1960-01-01',
+        },
+      ],
+    },
   });
 
   const mockBrowseService = {
     getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData([]),
     getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData([firstItem]),
-    getFirstItemFor: () => createSuccessfulRemoteDataObject$(firstItem)
+    getFirstItemFor: (definition: string, scope?: string, sortDirection?: SortDirection) => null,
   };
 
   const mockDsoService = {
-    findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+    findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
   };
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
     queryParams: observableOf({}),
-    data: observableOf({ metadata: 'dateissued', metadataField: 'dc.date.issued' })
+    data: observableOf({ metadata: 'dateissued', metadataField: 'dc.date.issued' }),
   });
 
   const mockCdRef = Object.assign({
-    detectChanges: () => fixture.detectChanges()
+    detectChanges: () => fixture.detectChanges(),
   });
 
   paginationService = new PaginationServiceStub();
@@ -75,7 +98,7 @@ describe('BrowseByDatePageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BrowseByDatePageComponent, EnumKeysPipe, VarDirective],
+      declarations: [BrowseByDateComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
@@ -83,22 +106,31 @@ 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 },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByDatePageComponent);
+    fixture = TestBed.createComponent(BrowseByDateComponent);
+    const browseService = fixture.debugElement.injector.get(BrowseService);
+    spyOn(browseService, 'getFirstItemFor')
+      // ok to expect the default browse as first param since we just need the mock items obtained via sort direction.
+      .withArgs('author', undefined, SortDirection.ASC).and.returnValue(createSuccessfulRemoteDataObject$(firstItem))
+      .withArgs('author', undefined, SortDirection.DESC).and.returnValue(createSuccessfulRemoteDataObject$(lastItem));
     comp = fixture.componentInstance;
-    fixture.detectChanges();
     route = (comp as any).route;
+    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();
     });
   });
 
@@ -107,6 +139,7 @@ describe('BrowseByDatePageComponent', () => {
   });
 
   it('should create a list of startsWith options with the current year first', () => {
-    expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
+    //expect(comp.startsWithOptions[0]).toEqual(new Date().getUTCFullYear());
+    expect(comp.startsWithOptions[0]).toEqual(1960);
   });
 });
diff --git a/src/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
new file mode 100644
index 0000000000..7e772fb4c1
--- /dev/null
+++ b/src/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -0,0 +1,175 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BrowseService } from '../../core/browse/browse.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Item } from '../../core/shared/item.model';
+import { isValidDate } from '../../shared/date.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
+import {
+  BrowseByMetadataComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions,
+} from '../browse-by-metadata/browse-by-metadata.component';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+
+@Component({
+  selector: 'ds-browse-by-date',
+  styleUrls: ['../browse-by-metadata/browse-by-metadata.component.scss'],
+  templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
+})
+/**
+ * Component for browsing items by metadata definition of type 'date'
+ * A metadata definition (a.k.a. browse id) is a short term used to describe one or multiple metadata fields.
+ * An example would be 'dateissued' for 'dc.date.issued'
+ */
+@rendersBrowseBy(BrowseByDataType.Date)
+export class BrowseByDateComponent extends BrowseByMetadataComponent implements OnInit {
+
+  /**
+   * The default metadata keys to use for determining the lower limit of the StartsWith dropdown options
+   */
+  defaultMetadataKeys = ['dc.date.issued'];
+
+  public constructor(
+    protected route: ActivatedRoute,
+    protected browseService: BrowseService,
+    protected dsoService: DSpaceObjectDataService,
+    protected paginationService: PaginationService,
+    protected router: Router,
+    @Inject(APP_CONFIG) public appConfig: AppConfig,
+    public dsoNameService: DSONameService,
+    protected cdRef: ChangeDetectorRef,
+  ) {
+    super(route, browseService, dsoService, paginationService, router, appConfig, dsoNameService);
+  }
+
+  ngOnInit(): void {
+    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);
+    this.subs.push(
+      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.route.data,
+        this.currentPagination$, this.currentSort$]).pipe(
+        map(([routeParams, queryParams, scope, data, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams, data), scope, currentPage, currentSort];
+        }),
+      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+        const metadataKeys = params.browseDefinition ? params.browseDefinition.metadataKeys : this.defaultMetadataKeys;
+        this.browseId = params.id || this.defaultBrowseId;
+        this.startsWith = +params.startsWith || params.startsWith;
+        const searchOptions = browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails);
+        this.updatePageWithItems(searchOptions, this.value, undefined);
+        this.updateStartsWithOptions(this.browseId, metadataKeys, params.scope);
+      }));
+  }
+
+  /**
+   * Update the StartsWith options
+   * In this implementation, it creates a list of years starting from the most recent item or the current year, going
+   * all the way back to the earliest date found on an item within this scope. The further back in time, the bigger
+   * the change in years become to avoid extremely long lists with a one-year difference.
+   * To determine the change in years, the config found under GlobalConfig.BrowseBy is used for this.
+   * @param definition      The metadata definition to fetch the first item for
+   * @param metadataKeys    The metadata fields to fetch the earliest date from (expects a date field)
+   * @param scope           The scope under which to fetch the earliest item for
+   */
+  updateStartsWithOptions(definition: string, metadataKeys: string[], scope?: string) {
+    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(([firstItemRD, lastItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+        let lowerLimit: number = this.getLimit(firstItemRD, metadataKeys, this.appConfig.browseBy.defaultLowerLimit);
+        const 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) {
+          lowerLimit -= 5;
+        } else {
+          lowerLimit -= 1;
+        }
+        let i: number = upperLimit;
+        while (i > lowerLimit) {
+          options.push(i);
+          if (i <= fiveYearBreak) {
+            i -= 10;
+          } else if (i <= oneYearBreak) {
+            i -= 5;
+          } else {
+            i--;
+          }
+        }
+        if (isNotEmpty(options)) {
+          this.startsWithOptions = options;
+          this.cdRef.detectChanges();
+        }
+      }),
+    );
+  }
+
+  /**
+   * Returns the year from the item metadata field or the limit.
+   * @param itemRD the item remote data
+   * @param metadataKeys The metadata fields to fetch the earliest date from (expects a date field)
+   * @param limit the limit to use if the year can't be found in metadata
+   * @private
+   */
+  private getLimit(itemRD: RemoteData<Item>, metadataKeys: string[], limit: number): number {
+    if (hasValue(itemRD.payload)) {
+      const date = itemRD.payload.firstMetadataValue(metadataKeys);
+      if (isNotEmpty(date) && isValidDate(date)) {
+        const dateObj = new Date(date);
+        // TODO: it appears that getFullYear (based on local time) is sometimes unreliable. Switching to UTC.
+        return isNaN(dateObj.getUTCFullYear()) ? limit : dateObj.getUTCFullYear();
+      } else {
+        return new Date().getUTCFullYear();
+      }
+    }
+  }
+}
diff --git a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
index fc8b40267a..f5b57faa28 100644
--- a/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
+++ b/src/app/browse-by/browse-by-dso-breadcrumb.resolver.ts
@@ -1,15 +1,22 @@
 import { Injectable } from '@angular/core';
-import { Community } from '../core/shared/community.model';
-import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
-import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { Collection } from '../core/shared/collection.model';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
 import { map } from 'rxjs/operators';
-import { hasValue } from '../shared/empty.util';
+
 import { getDSORoute } from '../app-routing-paths';
+import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
+import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
+import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../core/shared/operators';
+import { hasValue } from '../shared/empty.util';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject on a browse by page
@@ -33,7 +40,7 @@ export class BrowseByDSOBreadcrumbResolver {
         getRemoteDataPayload(),
         map((object: Community | Collection) => {
           return { provider: this.breadcrumbService, key: object, url: getDSORoute(object) };
-        })
+        }),
       );
     }
     return undefined;
diff --git a/src/app/browse-by/browse-by-guard.spec.ts b/src/app/browse-by/browse-by-guard.spec.ts
index fc483d87e2..04a0b99651 100644
--- a/src/app/browse-by/browse-by-guard.spec.ts
+++ b/src/app/browse-by/browse-by-guard.spec.ts
@@ -1,17 +1,20 @@
 import { first } from 'rxjs/operators';
+
+import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { RouterStub } from '../shared/testing/router.stub';
 import { BrowseByGuard } from './browse-by-guard';
-import { of as observableOf } from 'rxjs';
-import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { BrowseDefinition } from '../core/shared/browse-definition.model';
-import { BrowseByDataType } from './browse-by-switcher/browse-by-decorator';
+import { BrowseByDataType } from './browse-by-switcher/browse-by-data-type';
 
 describe('BrowseByGuard', () => {
   describe('canActivate', () => {
     let guard: BrowseByGuard;
-    let dsoService: any;
     let translateService: any;
     let browseDefinitionService: any;
+    let router: any;
 
     const name = 'An interesting DSO';
     const title = 'Author';
@@ -19,22 +22,20 @@ describe('BrowseByGuard', () => {
     const id = 'author';
     const scope = '1234-65487-12354-1235';
     const value = 'Filter';
-    const browseDefinition = Object.assign(new BrowseDefinition(), { type: BrowseByDataType.Metadata, metadataKeys: ['dc.contributor'] });
+    const browseDefinition = Object.assign(new ValueListBrowseDefinition(), { type: BrowseByDataType.Metadata, metadataKeys: ['dc.contributor'] });
 
     beforeEach(() => {
-      dsoService = {
-        findById: (dsoId: string) => observableOf({ payload: { name: name }, hasSucceeded: true })
-      };
-
       translateService = {
-        instant: () => field
+        instant: () => field,
       };
 
       browseDefinitionService = {
-        findById: () => createSuccessfulRemoteDataObject$(browseDefinition)
+        findById: () => createSuccessfulRemoteDataObject$(browseDefinition),
       };
 
-      guard = new BrowseByGuard(dsoService, translateService, browseDefinitionService);
+      router = new RouterStub() as any;
+
+      guard = new BrowseByGuard(translateService, browseDefinitionService, router);
     });
 
     it('should return true, and sets up the data correctly, with a scope and value', () => {
@@ -43,13 +44,14 @@ describe('BrowseByGuard', () => {
           title: field,
           browseDefinition,
         },
+        parent: null,
         params: {
           id,
         },
         queryParams: {
           scope,
-          value
-        }
+          value,
+        },
       };
       guard.canActivate(scopedRoute as any, undefined)
         .pipe(first())
@@ -59,13 +61,14 @@ describe('BrowseByGuard', () => {
               title,
               id,
               browseDefinition,
-              collection: name,
+              scope,
               field,
-              value: '"' + value + '"'
+              value: '"' + value + '"',
             };
             expect(scopedRoute.data).toEqual(result);
+            expect(router.navigate).not.toHaveBeenCalled();
             expect(canActivate).toEqual(true);
-          }
+          },
         );
     });
 
@@ -79,8 +82,8 @@ describe('BrowseByGuard', () => {
           id,
         },
         queryParams: {
-          scope
-        }
+          scope,
+        },
       };
 
       guard.canActivate(scopedNoValueRoute as any, undefined)
@@ -91,28 +94,65 @@ describe('BrowseByGuard', () => {
               title,
               id,
               browseDefinition,
-              collection: name,
+              scope,
               field,
-              value: ''
+              value: '',
             };
             expect(scopedNoValueRoute.data).toEqual(result);
+            expect(router.navigate).not.toHaveBeenCalled();
             expect(canActivate).toEqual(true);
-          }
+          },
         );
     });
 
+    it('should return true, and sets up the data correctly using the community/collection page id, with a scope and without value', () => {
+      const scopedNoValueRoute = {
+        data: {
+          title: field,
+          browseDefinition,
+        },
+        parent: {
+          params: {
+            id: scope,
+          },
+        },
+        params: {
+          id,
+        },
+        queryParams: {
+        },
+      };
+
+      guard.canActivate(scopedNoValueRoute as any, undefined).pipe(
+        first(),
+      ).subscribe((canActivate) => {
+        const result = {
+          title,
+          id,
+          browseDefinition,
+          scope,
+          field,
+          value: '',
+        };
+        expect(scopedNoValueRoute.data).toEqual(result);
+        expect(router.navigate).not.toHaveBeenCalled();
+        expect(canActivate).toEqual(true);
+      });
+    });
+
     it('should return true, and sets up the data correctly, without a scope and with a value', () => {
       const route = {
         data: {
           title: field,
           browseDefinition,
         },
+        parent: null,
         params: {
           id,
         },
         queryParams: {
-          value
-        }
+          value,
+        },
       };
       guard.canActivate(route as any, undefined)
         .pipe(first())
@@ -122,14 +162,39 @@ describe('BrowseByGuard', () => {
               title,
               id,
               browseDefinition,
-              collection: '',
+              scope: undefined,
               field,
-              value: '"' + value + '"'
+              value: '"' + value + '"',
             };
             expect(route.data).toEqual(result);
+            expect(router.navigate).not.toHaveBeenCalled();
             expect(canActivate).toEqual(true);
-          }
+          },
         );
     });
+
+    it('should return false, and sets up the data correctly, without a scope and with a value', () => {
+      jasmine.getEnv().allowRespy(true);
+      spyOn(browseDefinitionService, 'findById').and.returnValue(createFailedRemoteDataObject$());
+      const scopedRoute = {
+        data: {
+          title: field,
+        },
+        parent: null,
+        params: {
+          id,
+        },
+        queryParams: {
+          scope,
+          value,
+        },
+      };
+      guard.canActivate(scopedRoute as any, undefined)
+        .pipe(first())
+        .subscribe((canActivate) => {
+          expect(router.navigate).toHaveBeenCalled();
+          expect(canActivate).toEqual(false);
+        });
+    });
   });
 });
diff --git a/src/app/browse-by/browse-by-guard.ts b/src/app/browse-by/browse-by-guard.ts
index e4582cb77a..744b5d5ea8 100644
--- a/src/app/browse-by/browse-by-guard.ts
+++ b/src/app/browse-by/browse-by-guard.ts
@@ -1,13 +1,30 @@
-import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { DSpaceObjectDataService } from '../core/data/dspace-object-data.service';
-import { hasNoValue, hasValue } from '../shared/empty.util';
-import { map, switchMap } from 'rxjs/operators';
-import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Data,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { PAGE_NOT_FOUND_PATH } from '../app-routing-paths';
 import { BrowseDefinitionDataService } from '../core/browse/browse-definition-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { BrowseDefinition } from '../core/shared/browse-definition.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../shared/empty.util';
 
 @Injectable()
 /**
@@ -15,50 +32,49 @@ import { BrowseDefinition } from '../core/shared/browse-definition.model';
  */
 export class BrowseByGuard implements CanActivate {
 
-  constructor(protected dsoService: DSpaceObjectDataService,
-              protected translate: TranslateService,
-              protected browseDefinitionService: BrowseDefinitionDataService) {
+  constructor(
+    protected translate: TranslateService,
+    protected browseDefinitionService: BrowseDefinitionDataService,
+    protected router: Router,
+  ) {
   }
 
-  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean> {
     const title = route.data.title;
     const id = route.params.id || route.queryParams.id || route.data.id;
-    let browseDefinition$: Observable<BrowseDefinition>;
+    let browseDefinition$: Observable<BrowseDefinition | undefined>;
     if (hasNoValue(route.data.browseDefinition) && hasValue(id)) {
-      browseDefinition$ = this.browseDefinitionService.findById(id).pipe(getFirstSucceededRemoteDataPayload());
+      browseDefinition$ = this.browseDefinitionService.findById(id).pipe(
+        getFirstCompletedRemoteData(),
+        map((browseDefinitionRD: RemoteData<BrowseDefinition>) => browseDefinitionRD.payload),
+      );
     } else {
       browseDefinition$ = observableOf(route.data.browseDefinition);
     }
-    const scope = route.queryParams.scope;
+    const scope = route.queryParams.scope ?? route.parent?.params.id;
     const value = route.queryParams.value;
-    const metadataTranslated = this.translate.instant('browse.metadata.' + id);
+    const metadataTranslated = this.translate.instant(`browse.metadata.${id}`);
     return browseDefinition$.pipe(
-      switchMap((browseDefinition) => {
-        if (hasValue(scope)) {
-          const dsoAndMetadata$ = this.dsoService.findById(scope).pipe(getFirstSucceededRemoteData());
-          return dsoAndMetadata$.pipe(
-            map((dsoRD) => {
-              const name = dsoRD.payload.name;
-              route.data = this.createData(title, id, browseDefinition, name, metadataTranslated, value, route);
-              return true;
-            })
-          );
-        } else {
-          route.data = this.createData(title, id, browseDefinition, '', metadataTranslated, value, route);
+      switchMap((browseDefinition: BrowseDefinition | undefined) => {
+        if (hasValue(browseDefinition)) {
+          route.data = this.createData(title, id, browseDefinition, metadataTranslated, value, route, scope);
           return observableOf(true);
+        } else {
+          void this.router.navigate([PAGE_NOT_FOUND_PATH]);
+          return observableOf(false);
         }
-      })
+      }),
     );
   }
 
-  private createData(title, id, browseDefinition, collection, field, value, route) {
+  private createData(title: string, id: string, browseDefinition: BrowseDefinition, field: string, value: string, route: ActivatedRouteSnapshot, scope: string): Data {
     return Object.assign({}, route.data, {
       title: title,
       id: id,
       browseDefinition: browseDefinition,
-      collection: collection,
       field: field,
-      value: hasValue(value) ? `"${value}"` : ''
+      value: hasValue(value) ? `"${value}"` : '',
+      scope: scope,
     });
   }
 }
diff --git a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
index 56dcd6317b..1687d2a2dd 100644
--- a/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
+++ b/src/app/browse-by/browse-by-i18n-breadcrumb.resolver.ts
@@ -1,8 +1,12 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
+
 import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 
 /**
  * This class resolves a BreadcrumbConfig object with an i18n key string for a route
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
deleted file mode 100644
index 227fa8aa78..0000000000
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<div class="container">
-    <ng-container *ngVar="(parent$ | async) as parent">
-    <ng-container *ngIf="parent?.payload as parentContext">
-    <header class="comcol-header border-bottom mb-4 pb-4">
-        <!-- Parent Name -->
-        <ds-comcol-page-header [name]="parentContext.name">
-        </ds-comcol-page-header>
-        <!-- Handle -->
-        <ds-themed-comcol-page-handle
-            [content]="parentContext.handle"
-            [title]="parentContext.type+'.page.handle'" >
-        </ds-themed-comcol-page-handle>
-        <!-- Introductory text -->
-        <ds-comcol-page-content [content]="parentContext.introductoryText" [hasInnerHtml]="true">
-        </ds-comcol-page-content>
-        <!-- News -->
-        <ds-comcol-page-content [content]="parentContext.sidebarText" [hasInnerHtml]="true" [title]="'community.page.news'">
-        </ds-comcol-page-content>
-      </header>
-      <!-- Browse-By Links -->
-      <ds-themed-comcol-page-browse-by [id]="parentContext.id" [contentType]="parentContext.type"></ds-themed-comcol-page-browse-by>
-      </ng-container></ng-container>
-
-    <section class="comcol-page-browse-section">
-    <div class="browse-by-metadata w-100">
-    <ds-browse-by *ngIf="startsWithOptions" class="col-xs-12 w-100"
-      title="{{'browse.title' | translate:
-      {
-        collection: (parent$ | async)?.payload?.name || '',
-        field: 'browse.metadata.' + browseId | translate,
-        startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
-        value: (value)? '&quot;' + value + '&quot;': ''
-      } }}"
-      parentname="{{(parent$ | async)?.payload?.name || ''}}"
-      [objects$]="(items$ !== undefined)? items$ : browseEntries$"
-      [paginationConfig]="(currentPagination$ |async)"
-      [sortConfig]="(currentSort$ |async)"
-      [type]="startsWithType"
-      [startsWithOptions]="startsWithOptions"
-      (prev)="goPrev()"
-      (next)="goNext()">
-    </ds-browse-by>
-    <ds-themed-loading *ngIf="!startsWithOptions" message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
-  </div>
-  </section>
-  <ng-container *ngVar="(parent$ | async) as parent">
-    <ng-container *ngIf="parent?.payload as parentContext">
-  <footer *ngIf="parentContext.copyrightText" class="border-top my-5 pt-4">
-    <div >
-
-      <!-- Copyright -->
-      <ds-comcol-page-content [content]="parentContext.copyrightText" [hasInnerHtml]="true">
-      </ds-comcol-page-content>
-    </div>
-  </footer>
-</ng-container>
-</ng-container>
-</div>
diff --git a/src/app/browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component.ts b/src/app/browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component.ts
deleted file mode 100644
index b0679258e9..0000000000
--- a/src/app/browse-by/browse-by-metadata-page/themed-browse-by-metadata-page.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {Component} from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseByMetadataPageComponent } from './browse-by-metadata-page.component';
-import {BrowseByDataType, rendersBrowseBy} from '../browse-by-switcher/browse-by-decorator';
-
-/**
- * Themed wrapper for BrowseByMetadataPageComponent
- **/
-@Component({
-  selector: 'ds-themed-browse-by-metadata-page',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
-})
-
-@rendersBrowseBy(BrowseByDataType.Metadata)
-export class ThemedBrowseByMetadataPageComponent
-  extends ThemedComponent<BrowseByMetadataPageComponent> {
-  protected getComponentName(): string {
-    return 'BrowseByMetadataPageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-metadata-page.component`);
-  }
-}
diff --git a/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
new file mode 100644
index 0000000000..69c3c31c46
--- /dev/null
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
@@ -0,0 +1,21 @@
+<section class="comcol-page-browse-section">
+  <div class="browse-by-metadata w-100">
+    <ds-themed-browse-by *ngIf="(loading$ | async) !== true" class="col-xs-12 w-100"
+                         title="{{'browse.title' | translate:{
+                           field: 'browse.metadata.' + browseId | translate,
+                           startsWith: (startsWith)? ('browse.startsWith' | translate: { startsWith: '&quot;' + startsWith + '&quot;' }) : '',
+                           value: (value)? '&quot;' + value + '&quot;': ''
+                         } }}"
+                         [displayTitle]="displayTitle"
+                         [objects$]="(items$ !== undefined)? items$ : browseEntries$"
+                         [paginationConfig]="(currentPagination$ |async)"
+                         [sortConfig]="(currentSort$ |async)"
+                         [type]="startsWithType"
+                         [startsWithOptions]="startsWithOptions"
+                         (prev)="goPrev()"
+                         (next)="goNext()">
+    </ds-themed-browse-by>
+    <ds-themed-loading *ngIf="loading$ | async"
+                       message="{{'loading.browse-by-page' | translate}}"></ds-themed-loading>
+  </div>
+</section>
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.scss
rename to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss
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/browse-by-metadata.component.spec.ts
similarity index 81%
rename from src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.spec.ts
rename to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.spec.ts
index 2984642b73..e15e41b161 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/browse-by-metadata.component.spec.ts
@@ -1,39 +1,54 @@
-import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions,
-  getBrowseSearchOptions
-} from './browse-by-metadata-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowseService } from '../../core/browse/browse.service';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-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 { RemoteData } from '../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { BrowseService } from '../../core/browse/browse.service';
 import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
 import { SortDirection } from '../../core/cache/models/sort-options.model';
-import { Item } from '../../core/shared/item.model';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { Community } from '../../core/shared/community.model';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { BrowseEntry } from '../../core/shared/browse-entry.model';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { APP_CONFIG } from '../../../config/app-config.interface';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  BrowseByMetadataComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions,
+} from './browse-by-metadata.component';
 
-describe('BrowseByMetadataPageComponent', () => {
-  let comp: BrowseByMetadataPageComponent;
-  let fixture: ComponentFixture<BrowseByMetadataPageComponent>;
+describe('BrowseByMetadataComponent', () => {
+  let comp: BrowseByMetadataComponent;
+  let fixture: ComponentFixture<BrowseByMetadataComponent>;
   let browseService: BrowseService;
   let route: ActivatedRoute;
   let paginationService;
@@ -43,16 +58,16 @@ describe('BrowseByMetadataPageComponent', () => {
     metadata: [
       {
         key: 'dc.title',
-        value: 'test community'
-      }
-    ]
+        value: 'test community',
+      },
+    ],
   });
 
   const environmentMock = {
     browseBy: {
       showThumbnails: true,
-      pageSize: 10
-    }
+      pageSize: 10,
+    },
   };
 
   const mockEntries = [
@@ -61,41 +76,41 @@ describe('BrowseByMetadataPageComponent', () => {
       authority: null,
       value: 'John Doe',
       language: 'en',
-      count: 1
+      count: 1,
     },
     {
       type: BrowseEntry.type,
       authority: null,
       value: 'James Doe',
       language: 'en',
-      count: 3
+      count: 3,
     },
     {
       type: BrowseEntry.type,
       authority: null,
       value: 'Fake subject',
       language: 'en',
-      count: 2
-    }
+      count: 2,
+    },
   ];
 
   const mockItems = [
     Object.assign(new Item(), {
-      id: 'fakeId'
-    })
+      id: 'fakeId',
+    }),
   ];
 
   const mockBrowseService = {
     getBrowseEntriesFor: (options: BrowseEntrySearchOptions) => toRemoteData(mockEntries),
-    getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems)
+    getBrowseItemsFor: (value: string, options: BrowseEntrySearchOptions) => toRemoteData(mockItems),
   };
 
   const mockDsoService = {
-    findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+    findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
   };
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({})
+    params: observableOf({}),
   });
 
   paginationService = new PaginationServiceStub();
@@ -103,21 +118,21 @@ describe('BrowseByMetadataPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BrowseByMetadataPageComponent, EnumKeysPipe, VarDirective],
+      declarations: [BrowseByMetadataComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environmentMock }
+        { provide: APP_CONFIG, useValue: environmentMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByMetadataPageComponent);
+    fixture = TestBed.createComponent(BrowseByMetadataComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
     browseService = (comp as any).browseService;
@@ -139,16 +154,21 @@ describe('BrowseByMetadataPageComponent', () => {
     beforeEach(() => {
       const paramsWithValue = {
         metadata: 'author',
-        value: 'John Doe'
+        value: 'John Doe',
       };
 
       route.params = observableOf(paramsWithValue);
       comp.ngOnInit();
+      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();
       });
     });
   });
@@ -158,7 +178,7 @@ describe('BrowseByMetadataPageComponent', () => {
 
     beforeEach(() => {
       const paramsScope = {
-        scope: 'fake-scope'
+        scope: 'fake-scope',
       };
       const paginationOptions = Object.assign(new PaginationComponentOptions(), {
         currentPage: 5,
@@ -169,7 +189,7 @@ describe('BrowseByMetadataPageComponent', () => {
         field: 'fake-field',
       };
 
-      result = browseParamsToOptions(paramsScope, paginationOptions, sortOptions, 'author', comp.fetchThumbnails);
+      result = browseParamsToOptions(paramsScope, 'fake-scope', paginationOptions, sortOptions, 'author', comp.fetchThumbnails);
     });
 
     it('should return BrowseEntrySearchOptions with the correct properties', () => {
@@ -189,7 +209,7 @@ describe('BrowseByMetadataPageComponent', () => {
 
     beforeEach(() => {
       const paramsScope = {
-        scope: 'fake-scope'
+        scope: 'fake-scope',
       };
       const paginationOptions = Object.assign(new PaginationComponentOptions(), {
         currentPage: 5,
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/browse-by-metadata.component.ts
similarity index 65%
rename from src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
rename to src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
index 4cfe332da1..8d5382f27b 100644
--- a/src/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ b/src/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -1,29 +1,59 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Inject, OnInit, OnDestroy } 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';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { BrowseService } from '../../core/browse/browse.service';
-import { BrowseEntry } from '../../core/shared/browse-entry.model';
-import { Item } from '../../core/shared/item.model';
-import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
-import { getFirstSucceededRemoteData } from '../../core/shared/operators';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-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 {
+  Component,
+  Inject,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BrowseService } from '../../core/browse/browse.service';
+import { BrowseEntrySearchOptions } from '../../core/browse/browse-entry-search-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { Context } from '../../core/shared/context.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstSucceededRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { StartsWithType } from '../../shared/starts-with/starts-with-decorator';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
 
 export const BBM_PAGINATION_ID = 'bbm';
 
 @Component({
-  selector: 'ds-browse-by-metadata-page',
-  styleUrls: ['./browse-by-metadata-page.component.scss'],
-  templateUrl: './browse-by-metadata-page.component.html'
+  selector: 'ds-browse-by-metadata',
+  styleUrls: ['./browse-by-metadata.component.scss'],
+  templateUrl: './browse-by-metadata.component.html',
 })
 /**
  * Component for browsing (items) by metadata definition.
@@ -31,7 +61,30 @@ export const BBM_PAGINATION_ID = 'bbm';
  * or multiple metadata fields.  An example would be 'author' for
  * 'dc.contributor.*'
  */
-export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
+@rendersBrowseBy(BrowseByDataType.Metadata)
+export class BrowseByMetadataComponent implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * The optional context
+   */
+  @Input() context: Context;
+
+  /**
+   * The {@link BrowseByDataType} of this Component
+   */
+  @Input() browseByType: BrowseByDataType;
+
+  /**
+   * The ID of the {@link Community} or {@link Collection} of the scope to display
+   */
+  @Input() scope: string;
+
+  /**
+   * Display the h1 title in the section
+   */
+  @Input() displayTitle = true;
+
+  scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
 
   /**
    * The list of browse-entries to display
@@ -43,11 +96,6 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   items$: Observable<RemoteData<PaginatedList<Item>>>;
 
-  /**
-   * The current Community or Collection we're browsing metadata/items in
-   */
-  parent$: Observable<RemoteData<DSpaceObject>>;
-
   /**
    * The pagination config used to display the values
    */
@@ -88,7 +136,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    * The list of StartsWith options
    * Should be defined after ngOnInit is called!
    */
-  startsWithOptions;
+  startsWithOptions: (string | number)[];
 
   /**
    * The value we're browsing items for
@@ -100,7 +148,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
   /**
    * The authority key (may be undefined) associated with {@link #value}.
    */
-   authority: string;
+  authority: string;
 
   /**
    * The current startsWith option (fetched and updated from query-params)
@@ -112,20 +160,26 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   fetchThumbnails: boolean;
 
+  /**
+   * Observable determining if the loading animation needs to be shown
+   */
+  loading$ = observableOf(true);
+
   public constructor(protected route: ActivatedRoute,
                      protected browseService: BrowseService,
                      protected dsoService: DSpaceObjectDataService,
                      protected paginationService: PaginationService,
                      protected router: Router,
-                     @Inject(APP_CONFIG) public appConfig: AppConfig) {
-
+                     @Inject(APP_CONFIG) public appConfig: AppConfig,
+                     public dsoNameService: DSONameService,
+  ) {
     this.fetchThumbnails = this.appConfig.browseBy.showThumbnails;
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
-        id: BBM_PAGINATION_ID,
-        currentPage: 1,
-        pageSize: this.appConfig.browseBy.pageSize,
-        });
-    }
+      id: BBM_PAGINATION_ID,
+      currentPage: 1,
+      pageSize: this.appConfig.browseBy.pageSize,
+    });
+  }
 
 
   ngOnInit(): void {
@@ -135,27 +189,42 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
     this.currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, sortConfig);
     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;
-          this.authority = params.authority;
-          this.value = +params.value || params.value || '';
-          this.startsWith = +params.startsWith || params.startsWith;
-          if (isNotEmpty(this.value)) {
-            this.updatePageWithItems(
-              browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), this.value, this.authority);
-          } else {
-            this.updatePage(browseParamsToOptions(params, currentPage, currentSort, this.browseId, false));
-          }
-          this.updateParent(params.scope);
-        }));
+      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
+        }),
+      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+        this.browseId = params.id || this.defaultBrowseId;
+        this.authority = params.authority;
+
+        if (typeof params.value === 'string'){
+          this.value = params.value.trim();
+        } else {
+          this.value = '';
+        }
+
+        if (params.startsWith === undefined || params.startsWith === '') {
+          this.startsWith = undefined;
+        }
+
+        if (typeof params.startsWith === 'string'){
+          this.startsWith = params.startsWith.trim();
+        }
+
+        if (isNotEmpty(this.value)) {
+          this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), this.value, this.authority);
+        } else {
+          this.updatePage(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, false));
+        }
+      }));
     this.updateStartsWithTextOptions();
 
   }
 
+  ngOnChanges(): void {
+    this.scope$.next(this.scope);
+  }
+
   /**
    * Update the StartsWith options with text values
    * It adds the value "0-9" as well as all letters from A to Z
@@ -174,6 +243,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;
   }
 
@@ -188,18 +260,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
    */
   updatePageWithItems(searchOptions: BrowseEntrySearchOptions, value: string, authority: string) {
     this.items$ = this.browseService.getBrowseItemsFor(value, authority, searchOptions);
-  }
-
-  /**
-   * Update the parent Community or Collection using their scope
-   * @param scope   The UUID of the Community or Collection to fetch
-   */
-  updateParent(scope: string) {
-    if (hasValue(scope)) {
-      this.parent$ = this.dsoService.findById(scope).pipe(
-        getFirstSucceededRemoteData()
-      );
-    }
+    this.loading$ = this.items$.pipe(
+      map((itemsRD: RemoteData<PaginatedList<Item>>) => itemsRD.isLoading),
+    );
   }
 
   /**
@@ -233,7 +296,7 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
   }
 
   ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
+    this.subs.filter((sub: Subscription) => hasValue(sub)).forEach((sub: Subscription) => sub.unsubscribe());
     this.paginationService.clearPagination(this.paginationConfig.id);
   }
 
@@ -249,9 +312,9 @@ export class BrowseByMetadataPageComponent implements OnInit, OnDestroy {
  * @returns BrowseEntrySearchOptions instance
  */
 export function getBrowseSearchOptions(defaultBrowseId: string,
-                                       paginationConfig: PaginationComponentOptions,
-                                       sortConfig: SortOptions,
-                                       fetchThumbnails?: boolean) {
+  paginationConfig: PaginationComponentOptions,
+  sortConfig: SortOptions,
+  fetchThumbnails?: boolean) {
   if (!hasValue(fetchThumbnails)) {
     fetchThumbnails = false;
   }
@@ -262,22 +325,24 @@ export function getBrowseSearchOptions(defaultBrowseId: string,
 /**
  * Function to transform query and url parameters into searchOptions used to fetch browse entries or items
  * @param params            URL and query parameters
+ * @param scope             The scope to show the results
  * @param paginationConfig  Pagination configuration
  * @param sortConfig        Sorting configuration
  * @param metadata          Optional metadata definition to fetch browse entries/items for
  * @param fetchThumbnail   Optional parameter for requesting thumbnail images
  */
 export function browseParamsToOptions(params: any,
-                                      paginationConfig: PaginationComponentOptions,
-                                      sortConfig: SortOptions,
-                                      metadata?: string,
-                                      fetchThumbnail?: boolean): BrowseEntrySearchOptions {
+  scope: string,
+  paginationConfig: PaginationComponentOptions,
+  sortConfig: SortOptions,
+  metadata?: string,
+  fetchThumbnail?: boolean): BrowseEntrySearchOptions {
   return new BrowseEntrySearchOptions(
     metadata,
     paginationConfig,
     sortConfig,
-    +params.startsWith || params.startsWith,
-    params.scope,
-    fetchThumbnail
+    params.startsWith,
+    scope,
+    fetchThumbnail,
   );
 }
diff --git a/src/app/browse-by/browse-by-page.module.ts b/src/app/browse-by/browse-by-page.module.ts
index fea6668b3c..7602e9fa76 100644
--- a/src/app/browse-by/browse-by-page.module.ts
+++ b/src/app/browse-by/browse-by-page.module.ts
@@ -1,20 +1,36 @@
 import { NgModule } from '@angular/core';
-import { BrowseByRoutingModule } from './browse-by-routing.module';
-import { BrowseByModule } from './browse-by.module';
-import { ItemDataService } from '../core/data/item-data.service';
+
 import { BrowseService } from '../core/browse/browse.service';
+import { ItemDataService } from '../core/data/item-data.service';
+import { SharedBrowseByModule } from '../shared/browse-by/shared-browse-by.module';
+import { SharedModule } from '../shared/shared.module';
+import { BrowseByModule } from './browse-by.module';
 import { BrowseByGuard } from './browse-by-guard';
+import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
+import { BrowseByRoutingModule } from './browse-by-routing.module';
+
+const DECLARATIONS = [
+  BrowseByPageComponent,
+];
 
 @NgModule({
   imports: [
+    SharedBrowseByModule,
     BrowseByRoutingModule,
-    BrowseByModule.withEntryComponents()
+    BrowseByModule,
+    SharedModule,
   ],
   providers: [
     ItemDataService,
     BrowseService,
-    BrowseByGuard
-  ]
+    BrowseByGuard,
+  ],
+  declarations: [
+    ...DECLARATIONS,
+  ],
+  exports: [
+    ...DECLARATIONS,
+  ],
 })
 export class BrowseByPageModule {
 
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.html b/src/app/browse-by/browse-by-page/browse-by-page.component.html
new file mode 100644
index 0000000000..6e9476e1e9
--- /dev/null
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.html
@@ -0,0 +1,4 @@
+<div class="container">
+  <ds-browse-by-switcher [browseByType]="browseByType$ | async">
+  </ds-browse-by-switcher>
+</div>
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.scss b/src/app/browse-by/browse-by-page/browse-by-page.component.scss
similarity index 100%
rename from src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.scss
rename to src/app/browse-by/browse-by-page/browse-by-page.component.scss
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
new file mode 100644
index 0000000000..688ce48bf8
--- /dev/null
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.spec.ts
@@ -0,0 +1,73 @@
+// eslint-disable-next-line max-classes-per-file
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+import { BrowseBySwitcherComponent } from '../browse-by-switcher/browse-by-switcher.component';
+import { BrowseByPageComponent } from './browse-by-page.component';
+
+@rendersBrowseBy('BrowseByPageComponent' as BrowseByDataType)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="BrowseByTestComponent"></span>',
+})
+class BrowseByTestComponent {
+}
+
+class TestBrowseByPageBrowseDefinition extends BrowseDefinition {
+  getRenderType(): BrowseByDataType {
+    return 'BrowseByPageComponent' as BrowseByDataType;
+  }
+}
+
+describe('BrowseByPageComponent', () => {
+  let component: BrowseByPageComponent;
+  let fixture: ComponentFixture<BrowseByPageComponent>;
+
+  let activatedRoute: ActivatedRouteStub;
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    activatedRoute = new ActivatedRouteStub();
+    themeService = getMockThemeService();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        BrowseByPageComponent,
+        BrowseBySwitcherComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        BrowseByTestComponent,
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(BrowseByPageComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create the correct browse section based on the route browseDefinition', () => {
+    activatedRoute.testData = {
+      browseDefinition: new TestBrowseByPageBrowseDefinition(),
+    };
+
+    fixture.detectChanges();
+
+    expect(component).toBeTruthy();
+    expect(fixture.debugElement.query(By.css('#BrowseByTestComponent'))).not.toBeNull();
+  });
+});
diff --git a/src/app/browse-by/browse-by-page/browse-by-page.component.ts b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
new file mode 100644
index 0000000000..7007b89174
--- /dev/null
+++ b/src/app/browse-by/browse-by-page/browse-by-page.component.ts
@@ -0,0 +1,35 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+
+@Component({
+  selector: 'ds-browse-by-page',
+  templateUrl: './browse-by-page.component.html',
+  styleUrls: ['./browse-by-page.component.scss'],
+})
+export class BrowseByPageComponent implements OnInit {
+
+  browseByType$: Observable<BrowseByDataType>;
+
+  constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  /**
+   * Fetch the correct browse-by component by using the relevant config from the route data
+   */
+  ngOnInit(): void {
+    this.browseByType$ = this.route.data.pipe(
+      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+    );
+  }
+
+}
diff --git a/src/app/browse-by/browse-by-routing.module.ts b/src/app/browse-by/browse-by-routing.module.ts
index 5788d3cc70..5f92268b89 100644
--- a/src/app/browse-by/browse-by-routing.module.ts
+++ b/src/app/browse-by/browse-by-routing.module.ts
@@ -1,31 +1,36 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
-import { BrowseByGuard } from './browse-by-guard';
+import { RouterModule } from '@angular/router';
+
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { BrowseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
+import { BrowseByGuard } from './browse-by-guard';
 import { BrowseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
-import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
+import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
       {
         path: '',
-        resolve: { breadcrumb: BrowseByDSOBreadcrumbResolver },
+        resolve: {
+          breadcrumb: BrowseByDSOBreadcrumbResolver,
+          menu: DSOEditMenuResolver,
+        },
         children: [
           {
             path: ':id',
-            component: ThemedBrowseBySwitcherComponent,
+            component: BrowseByPageComponent,
             canActivate: [BrowseByGuard],
             resolve: { breadcrumb: BrowseByI18nBreadcrumbResolver },
-            data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' }
-          }
-        ]
-      }])
+            data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' },
+          },
+        ],
+      }]),
   ],
   providers: [
     BrowseByI18nBreadcrumbResolver,
-    BrowseByDSOBreadcrumbResolver
-  ]
+    BrowseByDSOBreadcrumbResolver,
+  ],
 })
 export class BrowseByRoutingModule {
 
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-data-type.ts b/src/app/browse-by/browse-by-switcher/browse-by-data-type.ts
new file mode 100644
index 0000000000..5324018b34
--- /dev/null
+++ b/src/app/browse-by/browse-by-switcher/browse-by-data-type.ts
@@ -0,0 +1,6 @@
+export enum BrowseByDataType {
+  Title = 'title',
+  Metadata = 'text',
+  Date = 'date',
+  Hierarchy = 'hierarchy',
+}
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
index 19a6277151..64604cdc04 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.spec.ts
@@ -1,4 +1,5 @@
-import { BrowseByDataType, rendersBrowseBy } from './browse-by-decorator';
+import { BrowseByDataType } from './browse-by-data-type';
+import { rendersBrowseBy } from './browse-by-decorator';
 
 describe('BrowseByDecorator', () => {
   const titleDecorator = rendersBrowseBy(BrowseByDataType.Title);
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
index ceb4c6a6c6..8011f86713 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-decorator.ts
@@ -1,40 +1,40 @@
-import { hasNoValue } from '../../shared/empty.util';
-import { InjectionToken } from '@angular/core';
+import { Component } from '@angular/core';
+
+import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { hasNoValue } from '../../shared/empty.util';
 import {
   DEFAULT_THEME,
-  resolveTheme
+  resolveTheme,
 } from '../../shared/object-collection/shared/listable-object/listable-object.decorator';
-
-export enum BrowseByDataType {
-  Title = 'title',
-  Metadata = 'text',
-  Date = 'date'
-}
+import { BrowseByDataType } from './browse-by-data-type';
 
 export const DEFAULT_BROWSE_BY_TYPE = BrowseByDataType.Metadata;
+export const DEFAULT_BROWSE_BY_CONTEXT = Context.Any;
 
-export const BROWSE_BY_COMPONENT_FACTORY = new InjectionToken<(browseByType, theme) => GenericConstructor<any>>('getComponentByBrowseByType', {
-  providedIn: 'root',
-  factory: () => getComponentByBrowseByType
-});
-
-const map = new Map();
+const map: Map<BrowseByDataType, Map<Context, Map<string, GenericConstructor<Component>>>> = new Map();
 
 /**
  * Decorator used for rendering Browse-By pages by type
  * @param browseByType  The type of page
+ * @param context The optional context for the component
  * @param theme The optional theme for the component
  */
-export function rendersBrowseBy(browseByType: BrowseByDataType, theme = DEFAULT_THEME) {
+export function rendersBrowseBy(browseByType: BrowseByDataType, context = DEFAULT_BROWSE_BY_CONTEXT, theme = DEFAULT_THEME) {
   return function decorator(component: any) {
+    if (hasNoValue(browseByType)) {
+      return;
+    }
     if (hasNoValue(map.get(browseByType))) {
       map.set(browseByType, new Map());
     }
-    if (hasNoValue(map.get(browseByType).get(theme))) {
-      map.get(browseByType).set(theme, component);
+    if (hasNoValue(map.get(browseByType).get(context))) {
+      map.get(browseByType).set(context, new Map());
+    }
+    if (hasNoValue(map.get(browseByType).get(context).get(theme))) {
+      map.get(browseByType).get(context).set(theme, component);
     } else {
-      throw new Error(`There can't be more than one component to render Browse-By of type "${browseByType}" and theme "${theme}"`);
+      throw new Error(`There can't be more than one component to render Browse-By of type "${browseByType}", context "${context}" and theme "${theme}"`);
     }
   };
 }
@@ -42,12 +42,17 @@ export function rendersBrowseBy(browseByType: BrowseByDataType, theme = DEFAULT_
 /**
  * Get the component used for rendering a Browse-By page by type
  * @param browseByType  The type of page
+ * @param context The context to match
  * @param theme the theme to match
  */
-export function getComponentByBrowseByType(browseByType, theme) {
-  let themeMap = map.get(browseByType);
+export function getComponentByBrowseByType(browseByType: BrowseByDataType, context: Context, theme: string): GenericConstructor<Component> {
+  let contextMap: Map<Context, Map<string, GenericConstructor<Component>>> = map.get(browseByType);
+  if (hasNoValue(contextMap)) {
+    contextMap = map.get(DEFAULT_BROWSE_BY_TYPE);
+  }
+  let themeMap: Map<string, GenericConstructor<Component>> = contextMap.get(context);
   if (hasNoValue(themeMap)) {
-    themeMap = map.get(DEFAULT_BROWSE_BY_TYPE);
+    themeMap = contextMap.get(DEFAULT_BROWSE_BY_CONTEXT);
   }
   const comp = resolveTheme(themeMap, theme);
   if (hasNoValue(comp)) {
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
deleted file mode 100644
index afe79cf2b1..0000000000
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-container *ngComponentOutlet="browseByComponent | async"></ng-container>
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
index c2e1c9cb68..1c1898d95f 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.spec.ts
@@ -1,11 +1,31 @@
-import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { BROWSE_BY_COMPONENT_FACTORY, BrowseByDataType } from './browse-by-decorator';
-import { BrowseDefinition } from '../../core/shared/browse-definition.model';
-import { BehaviorSubject } from 'rxjs';
+import {
+  Component,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
+import { FlatBrowseDefinition } from '../../core/shared/flat-browse-definition.model';
+import { NonHierarchicalBrowseDefinition } from '../../core/shared/non-hierarchical-browse-definition';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { DynamicComponentLoaderDirective } from '../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
 import { ThemeService } from '../../shared/theme-support/theme.service';
+import { BrowseByDataType } from './browse-by-data-type';
+import { rendersBrowseBy } from './browse-by-decorator';
+import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
+
+@rendersBrowseBy('BrowseBySwitcherComponent' as BrowseByDataType)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="BrowseByTestComponent"></span>',
+})
+class BrowseByTestComponent {
+}
 
 describe('BrowseBySwitcherComponent', () => {
   let comp: BrowseBySwitcherComponent;
@@ -13,72 +33,71 @@ describe('BrowseBySwitcherComponent', () => {
 
   const types = [
     Object.assign(
-      new BrowseDefinition(), {
+      new FlatBrowseDefinition(), {
         id: 'title',
         dataType: BrowseByDataType.Title,
-      }
+      },
     ),
     Object.assign(
-      new BrowseDefinition(), {
+      new FlatBrowseDefinition(), {
         id: 'dateissued',
         dataType: BrowseByDataType.Date,
-        metadataKeys: ['dc.date.issued']
-      }
+        metadataKeys: ['dc.date.issued'],
+      },
     ),
     Object.assign(
-      new BrowseDefinition(), {
+      new ValueListBrowseDefinition(), {
         id: 'author',
         dataType: BrowseByDataType.Metadata,
-      }
+      },
     ),
     Object.assign(
-      new BrowseDefinition(), {
+      new ValueListBrowseDefinition(), {
         id: 'subject',
         dataType: BrowseByDataType.Metadata,
-      }
+      },
     ),
   ];
 
-  const data = new BehaviorSubject(createDataWithBrowseDefinition(new BrowseDefinition()));
-
-  const activatedRouteStub = {
-    data
-  };
-
   let themeService: ThemeService;
-  let themeName: string;
+  const themeName = 'dspace';
 
   beforeEach(waitForAsync(() => {
-    themeName = 'dspace';
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: themeName,
-    });
+    themeService = getMockThemeService(themeName);
 
-    TestBed.configureTestingModule({
-      declarations: [BrowseBySwitcherComponent],
-      providers: [
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: ThemeService, useValue: themeService },
-        { provide: BROWSE_BY_COMPONENT_FACTORY, useValue: jasmine.createSpy('getComponentByBrowseByType').and.returnValue(null) }
+    void TestBed.configureTestingModule({
+      declarations: [
+        BrowseBySwitcherComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        BrowseByTestComponent,
+        { provide: ThemeService, useValue: themeService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(BrowseBySwitcherComponent);
     comp = fixture.componentInstance;
+    spyOn(comp, 'getComponent').and.returnValue(BrowseByTestComponent);
+    spyOn(comp, 'connectInputsAndOutputs').and.callThrough();
   }));
 
-  types.forEach((type: BrowseDefinition) => {
+  types.forEach((type: NonHierarchicalBrowseDefinition) => {
     describe(`when switching to a browse-by page for "${type.id}"`, () => {
-      beforeEach(() => {
-        data.next(createDataWithBrowseDefinition(type));
+      beforeEach(async () => {
+        comp.browseByType = type.dataType;
+        comp.ngOnChanges({
+          browseByType: new SimpleChange(undefined, type.dataType, true),
+        });
         fixture.detectChanges();
+        await fixture.whenStable();
       });
 
-      it(`should call getComponentByBrowseByType with type "${type.dataType}"`, () => {
-        expect((comp as any).getComponentByBrowseByType).toHaveBeenCalledWith(type.dataType, themeName);
+      it(`should call getComponent with type "${type.dataType}"`, () => {
+        expect(comp.getComponent).toHaveBeenCalled();
+        expect(comp.connectInputsAndOutputs).toHaveBeenCalled();
       });
     });
   });
diff --git a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
index 0d3a35bebf..c7fcd4e9d3 100644
--- a/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ b/src/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
@@ -1,38 +1,42 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { BROWSE_BY_COMPONENT_FACTORY } from './browse-by-decorator';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { BrowseDefinition } from '../../core/shared/browse-definition.model';
-import { ThemeService } from '../../shared/theme-support/theme.service';
+import { AbstractComponentLoaderComponent } from '../../shared/abstract-component-loader/abstract-component-loader.component';
+import { BrowseByDataType } from './browse-by-data-type';
+import { getComponentByBrowseByType } from './browse-by-decorator';
 
 @Component({
   selector: 'ds-browse-by-switcher',
-  templateUrl: './browse-by-switcher.component.html'
+  templateUrl: '../../shared/abstract-component-loader/abstract-component-loader.component.html',
 })
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-export class BrowseBySwitcherComponent implements OnInit {
+export class BrowseBySwitcherComponent extends AbstractComponentLoaderComponent<Component> {
 
-  /**
-   * Resolved browse-by component
-   */
-  browseByComponent: Observable<any>;
+  @Input() context: Context;
 
-  public constructor(protected route: ActivatedRoute,
-                     protected themeService: ThemeService,
-                     @Inject(BROWSE_BY_COMPONENT_FACTORY) private getComponentByBrowseByType: (browseByType, theme) => GenericConstructor<any>) {
-  }
+  @Input() browseByType: BrowseByDataType;
 
-  /**
-   * Fetch the correct browse-by component by using the relevant config from the route data
-   */
-  ngOnInit(): void {
-    this.browseByComponent = this.route.data.pipe(
-      map((data: { browseDefinition: BrowseDefinition }) => this.getComponentByBrowseByType(data.browseDefinition.dataType, this.themeService.getThemeName()))
-    );
+  @Input() displayTitle: boolean;
+
+  @Input() scope: string;
+
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [
+    'context',
+    'browseByType',
+  ];
+
+  protected inputNames: (keyof this & string)[] = [
+    'context',
+    'browseByType',
+    'displayTitle',
+    'scope',
+  ];
+
+  public getComponent(): GenericConstructor<Component> {
+    return getComponentByBrowseByType(this.browseByType, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/browse-by/browse-by-switcher/dynamic-component-loader.directive.ts b/src/app/browse-by/browse-by-switcher/dynamic-component-loader.directive.ts
new file mode 100644
index 0000000000..b670b7bea4
--- /dev/null
+++ b/src/app/browse-by/browse-by-switcher/dynamic-component-loader.directive.ts
@@ -0,0 +1,19 @@
+import {
+  Directive,
+  ViewContainerRef,
+} from '@angular/core';
+
+/**
+ * Directive used as a hook to know where to inject the dynamic loaded component
+ */
+@Directive({
+  selector: '[dsDynamicComponentLoader]',
+})
+export class DynamicComponentLoaderDirective {
+
+  constructor(
+    public viewContainerRef: ViewContainerRef,
+  ) {
+  }
+
+}
diff --git a/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts b/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts
deleted file mode 100644
index 0187d4e3c5..0000000000
--- a/src/app/browse-by/browse-by-switcher/themed-browse-by-switcher.component.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Component } from '@angular/core';
-
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseBySwitcherComponent } from './browse-by-switcher.component';
-
-/**
- * Themed wrapper for BrowseBySwitcherComponent
- */
-@Component({
-  selector: 'ds-themed-browse-by-switcher',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html'
-})
-export class ThemedBrowseBySwitcherComponent extends ThemedComponent<BrowseBySwitcherComponent> {
-  protected getComponentName(): string {
-    return 'BrowseBySwitcherComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-switcher/browse-by-switcher.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-switcher.component`);
-  }
-
-
-}
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
new file mode 100644
index 0000000000..3dd9b6b25a
--- /dev/null
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
@@ -0,0 +1,21 @@
+<section>
+  <h1 *ngIf="displayTitle">
+    {{ ('browse.title') | translate:{
+    field: 'browse.metadata.' + vocabularyName | translate,
+    startsWith: '',
+    value: '',
+  } }}
+  </h1>
+  <div class="mb-3">
+    <ds-vocabulary-treeview [vocabularyOptions]=vocabularyOptions
+                            [multiSelect]="true"
+                            (select)="onSelect($event)"
+                            (deselect)="onDeselect($event)">
+    </ds-vocabulary-treeview>
+  </div>
+  <a class="btn btn-primary"
+     [routerLink]="['/search']"
+     [queryParams]="queryParams"
+     [queryParamsHandling]="'merge'">
+    {{ 'browse.taxonomy.button' | translate }}</a>
+</section>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.scss b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss
similarity index 100%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.scss
rename to src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts
new file mode 100644
index 0000000000..6841acb1dc
--- /dev/null
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.spec.ts
@@ -0,0 +1,126 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
+
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { createDataWithBrowseDefinition } from '../browse-by-switcher/browse-by-switcher.component.spec';
+import { BrowseByTaxonomyComponent } from './browse-by-taxonomy.component';
+
+describe('BrowseByTaxonomyComponent', () => {
+  let component: BrowseByTaxonomyComponent;
+  let fixture: ComponentFixture<BrowseByTaxonomyComponent>;
+  let themeService: ThemeService;
+  let detail1: VocabularyEntryDetail;
+  let detail2: VocabularyEntryDetail;
+
+  const data = new BehaviorSubject(createDataWithBrowseDefinition(new HierarchicalBrowseDefinition()));
+  const activatedRouteStub = {
+    data,
+  };
+
+  beforeEach(async () => {
+    themeService = jasmine.createSpyObj('themeService', {
+      getThemeName: 'dspace',
+    });
+
+    await TestBed.configureTestingModule({
+      imports: [ TranslateModule.forRoot() ],
+      declarations: [
+        BrowseByTaxonomyComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: ThemeService, useValue: themeService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BrowseByTaxonomyComponent);
+    component = fixture.componentInstance;
+    spyOn(component, 'updateQueryParams').and.callThrough();
+    fixture.detectChanges();
+    detail1 = new VocabularyEntryDetail();
+    detail2 = new VocabularyEntryDetail();
+    detail1.value = 'HUMANITIES and RELIGION';
+    detail2.value = 'TECHNOLOGY';
+    detail1.id = 'id-1';
+    detail2.id = 'id-2';
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should handle select event', () => {
+    component.onSelect(detail1);
+    expect(component.selectedItems.length).toBe(1);
+    expect(component.selectedItems).toContain(detail1);
+    expect(component.selectedItems.length).toBe(1);
+    expect(component.filterValues).toEqual(['HUMANITIES and RELIGION,equals'] );
+    expect(component.updateQueryParams).toHaveBeenCalled();
+  });
+
+  it('should handle select event with multiple selected items', () => {
+    component.onSelect(detail1);
+    component.onSelect(detail2);
+    expect(component.selectedItems.length).toBe(2);
+    expect(component.selectedItems).toContain(detail1, detail2);
+    expect(component.selectedItems.length).toBe(2);
+    expect(component.filterValues).toEqual(['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'] );
+    expect(component.updateQueryParams).toHaveBeenCalled();
+  });
+
+  it('should handle deselect event', () => {
+    component.onSelect(detail1);
+    component.onSelect(detail2);
+    expect(component.selectedItems.length).toBe(2);
+    expect(component.selectedItems.length).toBe(2);
+    component.onDeselect(detail1);
+    expect(component.selectedItems.length).toBe(1);
+    expect(component.selectedItems).toContain(detail2);
+    expect(component.selectedItems.length).toBe(1);
+    expect(component.filterValues).toEqual(['TECHNOLOGY,equals'] );
+    expect(component.updateQueryParams).toHaveBeenCalled();
+  });
+
+  describe('updateQueryParams', () => {
+    beforeEach(() => {
+      component.facetType = 'subject';
+      component.filterValues = ['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'];
+    });
+
+    it('should update the queryParams with the selected filterValues', () => {
+      component.updateQueryParams();
+
+      expect(component.queryParams).toEqual({
+        'f.subject': ['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'],
+      });
+    });
+
+    it('should include the scope if present', () => {
+      component.scope = '67f849f1-2499-4872-8c61-9e2b47d71068';
+
+      component.updateQueryParams();
+
+      expect(component.queryParams).toEqual({
+        'f.subject': ['HUMANITIES and RELIGION,equals', 'TECHNOLOGY,equals'],
+        'scope': '67f849f1-2499-4872-8c61-9e2b47d71068',
+      });
+    });
+  });
+
+  afterEach(() => {
+    fixture.destroy();
+    component = null;
+  });
+});
diff --git a/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
new file mode 100644
index 0000000000..92dc7a4a6e
--- /dev/null
+++ b/src/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -0,0 +1,169 @@
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseDefinition } from '../../core/shared/browse-definition.model';
+import { Context } from '../../core/shared/context.model';
+import { HierarchicalBrowseDefinition } from '../../core/shared/hierarchical-browse-definition.model';
+import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { hasValue } from '../../shared/empty.util';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+
+@Component({
+  selector: 'ds-browse-by-taxonomy',
+  templateUrl: './browse-by-taxonomy.component.html',
+  styleUrls: ['./browse-by-taxonomy.component.scss'],
+})
+/**
+ * Component for browsing items by metadata in a hierarchical controlled vocabulary
+ */
+@rendersBrowseBy(BrowseByDataType.Hierarchy)
+export class BrowseByTaxonomyComponent implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * The optional context
+   */
+  @Input() context: Context;
+
+  /**
+   * The {@link BrowseByDataType} of this Component
+   */
+  @Input() browseByType: BrowseByDataType;
+
+  /**
+   * The ID of the {@link Community} or {@link Collection} of the scope to display
+   */
+  @Input() scope: string;
+
+  /**
+   * Display the h1 title in the section
+   */
+  @Input() displayTitle = true;
+
+  scope$: BehaviorSubject<string> = new BehaviorSubject(undefined);
+
+  /**
+   * The {@link VocabularyOptions} object
+   */
+  vocabularyOptions: VocabularyOptions;
+
+  /**
+   * The selected vocabulary entries
+   */
+  selectedItems: VocabularyEntryDetail[] = [];
+
+  /**
+   * The query parameters, contain the selected entries
+   */
+  filterValues: string[];
+
+  /**
+   * The facet the use when filtering
+   */
+  facetType: string;
+
+  /**
+   * The used vocabulary
+   */
+  vocabularyName: string;
+
+  /**
+   * The parameters used in the URL
+   */
+  queryParams: Params;
+
+  /**
+   * Resolved browse-by definition
+   */
+  browseDefinition$: Observable<BrowseDefinition>;
+
+  /**
+   * Subscriptions to track
+   */
+  subs: Subscription[] = [];
+
+  public constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.browseDefinition$ = this.route.data.pipe(
+      map((data: { browseDefinition: BrowseDefinition }) => {
+        return data.browseDefinition;
+      }),
+    );
+    this.subs.push(this.browseDefinition$.subscribe((browseDefinition: HierarchicalBrowseDefinition) => {
+      this.facetType = browseDefinition.facetType;
+      this.vocabularyName = browseDefinition.vocabulary;
+      this.vocabularyOptions = { name: this.vocabularyName, closed: true };
+    }));
+    this.subs.push(this.scope$.subscribe(() => {
+      this.updateQueryParams();
+    }));
+  }
+
+  ngOnChanges(): void {
+    this.scope$.next(this.scope);
+  }
+
+  /**
+   * Adds detail to selectedItems, transforms it to be used as query parameter
+   * and adds that to filterValues.
+   *
+   * @param detail VocabularyEntryDetail to be added
+   */
+  onSelect(detail: VocabularyEntryDetail): void {
+    this.selectedItems.push(detail);
+    this.filterValues = this.selectedItems
+      .map((item: VocabularyEntryDetail) => `${item.value},equals`);
+    this.updateQueryParams();
+  }
+
+  /**
+   * Removes detail from selectedItems and filterValues.
+   *
+   * @param detail VocabularyEntryDetail to be removed
+   */
+  onDeselect(detail: VocabularyEntryDetail): void {
+    this.selectedItems = this.selectedItems.filter((entry: VocabularyEntryDetail) => {
+      return entry.id !== detail.id;
+    });
+    this.filterValues = this.filterValues.filter((value: string) => {
+      return value !== `${detail.value},equals`;
+    });
+    this.updateQueryParams();
+  }
+
+  /**
+   * Updates queryParams based on the current facetType and filterValues.
+   */
+  updateQueryParams(): void {
+    this.queryParams = {
+      ['f.' + this.facetType]: this.filterValues,
+    };
+    if (hasValue(this.scope)) {
+      this.queryParams.scope = this.scope;
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
+}
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
deleted file mode 100644
index 5320d7bb48..0000000000
--- a/src/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { Component, Inject } from '@angular/core';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasValue } from '../../shared/empty.util';
-import {
-  BrowseByMetadataPageComponent,
-  browseParamsToOptions, getBrowseSearchOptions
-} 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 { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
-
-@Component({
-  selector: 'ds-browse-by-title-page',
-  styleUrls: ['../browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  templateUrl: '../browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-/**
- * Component for browsing items by title (dc.title)
- */
-export class BrowseByTitlePageComponent extends BrowseByMetadataPageComponent {
-
-  public constructor(protected route: ActivatedRoute,
-                     protected browseService: BrowseService,
-                     protected dsoService: DSpaceObjectDataService,
-                     protected paginationService: PaginationService,
-                     protected router: Router,
-                     @Inject(APP_CONFIG) public appConfig: AppConfig) {
-    super(route, browseService, dsoService, paginationService, router, appConfig);
-  }
-
-  ngOnInit(): void {
-    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);
-    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.startsWith = +params.startsWith || params.startsWith;
-        this.browseId = params.id || this.defaultBrowseId;
-        this.updatePageWithItems(browseParamsToOptions(params, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
-        this.updateParent(params.scope);
-      }));
-    this.updateStartsWithTextOptions();
-  }
-
-  ngOnDestroy(): void {
-    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
-  }
-
-}
diff --git a/src/app/browse-by/browse-by-title-page/themed-browse-by-title-page.component.ts b/src/app/browse-by/browse-by-title-page/themed-browse-by-title-page.component.ts
deleted file mode 100644
index 4a1bcc0bc1..0000000000
--- a/src/app/browse-by/browse-by-title-page/themed-browse-by-title-page.component.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import {Component} from '@angular/core';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
-import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
-import {BrowseByDataType, rendersBrowseBy} from '../browse-by-switcher/browse-by-decorator';
-
-/**
- * Themed wrapper for BrowseByTitlePageComponent
- */
-@Component({
-  selector: 'ds-themed-browse-by-title-page',
-  styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
-})
-
-@rendersBrowseBy(BrowseByDataType.Title)
-export class ThemedBrowseByTitlePageComponent
-  extends ThemedComponent<BrowseByTitlePageComponent> {
-  protected getComponentName(): string {
-    return 'BrowseByTitlePageComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/browse-by/browse-by-title-page/browse-by-title-page.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./browse-by-title-page.component`);
-  }
-}
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/browse-by-title.component.spec.ts
similarity index 76%
rename from src/app/browse-by/browse-by-title-page/browse-by-title-page.component.spec.ts
rename to src/app/browse-by/browse-by-title/browse-by-title.component.spec.ts
index e32c0ac430..83d52db2ae 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/browse-by-title.component.spec.ts
@@ -1,32 +1,39 @@
-import { ComponentFixture, TestBed, 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';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { toRemoteData } from '../browse-by-metadata-page/browse-by-metadata-page.component.spec';
-import { BrowseByTitlePageComponent } from './browse-by-title-page.component';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { Community } from '../../core/shared/community.model';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { BrowseService } from '../../core/browse/browse.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { BrowseService } from '../../core/browse/browse.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { toRemoteData } from '../browse-by-metadata/browse-by-metadata.component.spec';
+import { BrowseByTitleComponent } from './browse-by-title.component';
 
-
-describe('BrowseByTitlePageComponent', () => {
-  let comp: BrowseByTitlePageComponent;
-  let fixture: ComponentFixture<BrowseByTitlePageComponent>;
+describe('BrowseByTitleComponent', () => {
+  let comp: BrowseByTitleComponent;
+  let fixture: ComponentFixture<BrowseByTitleComponent>;
   let itemDataService: ItemDataService;
   let route: ActivatedRoute;
 
@@ -35,9 +42,9 @@ describe('BrowseByTitlePageComponent', () => {
     metadata: [
       {
         key: 'dc.title',
-        value: 'test community'
-      }
-    ]
+        value: 'test community',
+      },
+    ],
   });
 
   const mockItems = [
@@ -46,24 +53,24 @@ describe('BrowseByTitlePageComponent', () => {
       metadata: [
         {
           key: 'dc.title',
-          value: 'Fake Title'
-        }
-      ]
-    })
+          value: 'Fake Title',
+        },
+      ],
+    }),
   ];
 
   const mockBrowseService = {
     getBrowseItemsFor: () => toRemoteData(mockItems),
-    getBrowseEntriesFor: () => toRemoteData([])
+    getBrowseEntriesFor: () => toRemoteData([]),
   };
 
   const mockDsoService = {
-    findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+    findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
   };
 
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     params: observableOf({}),
-    data: observableOf({ metadata: 'title' })
+    data: observableOf({ metadata: 'title' }),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -71,21 +78,21 @@ describe('BrowseByTitlePageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
-      declarations: [BrowseByTitlePageComponent, EnumKeysPipe, VarDirective],
+      declarations: [BrowseByTitleComponent, EnumKeysPipe, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
         { provide: BrowseService, useValue: mockBrowseService },
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: PaginationService, useValue: paginationService },
         { provide: Router, useValue: new RouterMock() },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(BrowseByTitlePageComponent);
+    fixture = TestBed.createComponent(BrowseByTitleComponent);
     comp = fixture.componentInstance;
     fixture.detectChanges();
     itemDataService = (comp as any).itemDataService;
diff --git a/src/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
new file mode 100644
index 0000000000..d7e5ca4494
--- /dev/null
+++ b/src/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -0,0 +1,52 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Params } from '@angular/router';
+import { combineLatest as observableCombineLatest } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import {
+  BrowseByMetadataComponent,
+  browseParamsToOptions,
+  getBrowseSearchOptions,
+} from '../browse-by-metadata/browse-by-metadata.component';
+import { BrowseByDataType } from '../browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../browse-by-switcher/browse-by-decorator';
+
+@Component({
+  selector: 'ds-browse-by-title',
+  styleUrls: ['../browse-by-metadata/browse-by-metadata.component.scss'],
+  templateUrl: '../browse-by-metadata/browse-by-metadata.component.html',
+})
+/**
+ * Component for browsing items by title (dc.title)
+ */
+@rendersBrowseBy(BrowseByDataType.Title)
+export class BrowseByTitleComponent extends BrowseByMetadataComponent implements OnInit {
+
+  ngOnInit(): void {
+    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);
+    this.subs.push(
+      observableCombineLatest([this.route.params, this.route.queryParams, this.scope$, this.currentPagination$, this.currentSort$]).pipe(
+        map(([routeParams, queryParams, scope, currentPage, currentSort]) => {
+          return [Object.assign({}, routeParams, queryParams), scope, currentPage, currentSort];
+        }),
+      ).subscribe(([params, scope, currentPage, currentSort]: [Params, string, PaginationComponentOptions, SortOptions]) => {
+        this.startsWith = +params.startsWith || params.startsWith;
+        this.browseId = params.id || this.defaultBrowseId;
+        this.updatePageWithItems(browseParamsToOptions(params, scope, currentPage, currentSort, this.browseId, this.fetchThumbnails), undefined, undefined);
+      }));
+    this.updateStartsWithTextOptions();
+  }
+
+}
diff --git a/src/app/browse-by/browse-by.module.ts b/src/app/browse-by/browse-by.module.ts
index 14e21f8b4c..4fcbc61ec5 100644
--- a/src/app/browse-by/browse-by.module.ts
+++ b/src/app/browse-by/browse-by.module.ts
@@ -1,42 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { BrowseByTitlePageComponent } from './browse-by-title-page/browse-by-title-page.component';
+import { NgModule } from '@angular/core';
+
+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';
-import { BrowseByMetadataPageComponent } from './browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseByDatePageComponent } from './browse-by-date-page/browse-by-date-page.component';
+import { BrowseByDateComponent } from './browse-by-date/browse-by-date.component';
+import { BrowseByMetadataComponent } from './browse-by-metadata/browse-by-metadata.component';
 import { BrowseBySwitcherComponent } from './browse-by-switcher/browse-by-switcher.component';
-import { ThemedBrowseBySwitcherComponent } from './browse-by-switcher/themed-browse-by-switcher.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
-import { ThemedBrowseByMetadataPageComponent } from './browse-by-metadata-page/themed-browse-by-metadata-page.component';
-import { ThemedBrowseByDatePageComponent } from './browse-by-date-page/themed-browse-by-date-page.component';
-import { ThemedBrowseByTitlePageComponent } from './browse-by-title-page/themed-browse-by-title-page.component';
+import { BrowseByTaxonomyComponent } from './browse-by-taxonomy/browse-by-taxonomy.component';
+import { BrowseByTitleComponent } from './browse-by-title/browse-by-title.component';
+
+const DECLARATIONS = [
+  BrowseBySwitcherComponent,
+];
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
-  BrowseByTitlePageComponent,
-  BrowseByMetadataPageComponent,
-  BrowseByDatePageComponent,
-
-  ThemedBrowseByMetadataPageComponent,
-  ThemedBrowseByDatePageComponent,
-  ThemedBrowseByTitlePageComponent,
-
+  BrowseByTitleComponent,
+  BrowseByMetadataComponent,
+  BrowseByDateComponent,
+  BrowseByTaxonomyComponent,
 ];
 
 @NgModule({
   imports: [
+    SharedBrowseByModule,
     CommonModule,
-    ComcolModule,
-    SharedModule
+    DsoPageModule,
+    FormModule,
+    SharedModule,
   ],
   declarations: [
-    BrowseBySwitcherComponent,
-    ThemedBrowseBySwitcherComponent,
-    ...ENTRY_COMPONENTS
+    ...DECLARATIONS,
+    ...ENTRY_COMPONENTS,
   ],
   exports: [
-    BrowseBySwitcherComponent
-  ]
+    ...DECLARATIONS,
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class BrowseByModule {
   /**
@@ -45,8 +47,8 @@ export class BrowseByModule {
    */
   static withEntryComponents() {
     return {
-      ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      ngModule: SharedBrowseByModule,
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
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 23698de84e..b0fe0cdf17 100644
--- a/src/app/collection-page/collection-form/collection-form.component.ts
+++ b/src/app/collection-page/collection-form/collection-form.component.ts
@@ -1,27 +1,41 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnChanges,
+  OnInit,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormOptionConfig,
   DynamicFormService,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  hasNoValue,
+  isNotNull,
+} from 'src/app/shared/empty.util';
 
-import { Collection } from '../../core/shared/collection.model';
-import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CommunityDataService } from '../../core/data/community-data.service';
 import { AuthService } from '../../core/auth/auth.service';
-import { RequestService } from '../../core/data/request.service';
 import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
 import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { Collection } from '../../core/shared/collection.model';
 import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
 import { MetadataValue } from '../../core/shared/metadata.models';
 import { getFirstSucceededRemoteListPayload } from '../../core/shared/operators';
-import { collectionFormEntityTypeSelectionConfig, collectionFormModels, } from './collection-form.models';
-import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  collectionFormEntityTypeSelectionConfig,
+  collectionFormModels,
+} from './collection-form.models';
 
 /**
  * Form used for creating and editing collections
@@ -29,9 +43,9 @@ import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type
 @Component({
   selector: 'ds-collection-form',
   styleUrls: ['../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html',
 })
-export class CollectionFormComponent extends ComColFormComponent<Collection> implements OnInit {
+export class CollectionFormComponent extends ComColFormComponent<Collection> implements OnInit, OnChanges {
   /**
    * @type {Collection} A new collection when a collection is being created, an existing Input collection when a collection is being edited
    */
@@ -61,41 +75,58 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> imp
                      protected dsoService: CommunityDataService,
                      protected requestService: RequestService,
                      protected objectCache: ObjectCacheService,
-                     protected entityTypeService: EntityTypeDataService) {
+                     protected entityTypeService: EntityTypeDataService,
+                     protected chd: ChangeDetectorRef) {
     super(formService, translate, notificationsService, authService, requestService, objectCache);
   }
 
-  ngOnInit() {
+  ngOnInit(): void {
+    if (hasNoValue(this.formModel) && isNotNull(this.dso)) {
+      this.initializeForm();
+    }
+  }
 
+  /**
+   * Detect changes to the dso and initialize the form,
+   * if the dso changes, exists and it is not the first change
+   */
+  ngOnChanges(changes: SimpleChanges) {
+    const dsoChange: SimpleChange = changes.dso;
+    if (this.dso && dsoChange && !dsoChange.isFirstChange()) {
+      this.initializeForm();
+    }
+  }
+
+  initializeForm() {
     let currentRelationshipValue: MetadataValue[];
     if (this.dso && this.dso.metadata) {
       currentRelationshipValue = this.dso.metadata['dspace.entity.type'];
     }
 
     const entities$: Observable<ItemType[]> = this.entityTypeService.findAll({ elementsPerPage: 100, currentPage: 1 }).pipe(
-      getFirstSucceededRemoteListPayload()
+      getFirstSucceededRemoteListPayload(),
     );
 
     // 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) => {
-          this.entityTypeSelection.add({
-            disabled: false,
-            label: type.label,
-            value: type.label
-          } as DynamicFormOptionConfig<string>);
-          if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
-            this.entityTypeSelection.select(index);
-            this.entityTypeSelection.disabled = true;
-          }
-        });
+      entityTypes = entityTypes.filter((type: ItemType) => type.label !== NONE_ENTITY_TYPE);
+      entityTypes.forEach((type: ItemType, index: number) => {
+        this.entityTypeSelection.add({
+          disabled: false,
+          label: type.label,
+          value: type.label,
+        } as DynamicFormOptionConfig<string>);
+        if (currentRelationshipValue && currentRelationshipValue.length > 0 && currentRelationshipValue[0].value === type.label) {
+          this.entityTypeSelection.select(index);
+          this.entityTypeSelection.disabled = true;
+        }
+      });
 
-        this.formModel = [...collectionFormModels, this.entityTypeSelection];
+      this.formModel = entityTypes.length === 0 ? collectionFormModels : [...collectionFormModels, this.entityTypeSelection];
 
-        super.ngOnInit();
+      super.ngOnInit();
+      this.chd.detectChanges();
     });
 
   }
diff --git a/src/app/collection-page/collection-form/collection-form.models.ts b/src/app/collection-page/collection-form/collection-form.models.ts
index 37e9d8a9a0..22998af674 100644
--- a/src/app/collection-page/collection-form/collection-form.models.ts
+++ b/src/app/collection-page/collection-form/collection-form.models.ts
@@ -1,10 +1,16 @@
-import { DynamicFormControlModel, DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicInputModel,
+  DynamicTextAreaModel,
+} from '@ng-dynamic-forms/core';
 import { DynamicSelectModelConfig } from '@ng-dynamic-forms/core/lib/model/select/dynamic-select.model';
 
+import { environment } from '../../../environments/environment';
+
 export const collectionFormEntityTypeSelectionConfig: DynamicSelectModelConfig<string> = {
   id: 'entityType',
   name: 'dspace.entity.type',
-  disabled: false
+  disabled: false,
 };
 
 /**
@@ -17,30 +23,35 @@ export const collectionFormModels: DynamicFormControlModel[] = [
     name: 'dc.title',
     required: true,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
-      required: 'Please enter a name for this title'
+      required: 'Please enter a name for this title',
     },
   }),
   new DynamicTextAreaModel({
     id: 'description',
     name: 'dc.description',
+    spellCheck: environment.form.spellCheck,
   }),
   new DynamicTextAreaModel({
     id: 'abstract',
     name: 'dc.description.abstract',
+    spellCheck: environment.form.spellCheck,
   }),
   new DynamicTextAreaModel({
     id: 'rights',
     name: 'dc.rights',
+    spellCheck: environment.form.spellCheck,
   }),
   new DynamicTextAreaModel({
     id: 'tableofcontents',
     name: 'dc.description.tableofcontents',
+    spellCheck: environment.form.spellCheck,
   }),
   new DynamicTextAreaModel({
     id: 'license',
     name: 'dc.rights.license',
-  })
+    spellCheck: environment.form.spellCheck,
+  }),
 ];
diff --git a/src/app/collection-page/collection-form/collection-form.module.ts b/src/app/collection-page/collection-form/collection-form.module.ts
index ddf18f0586..0d1f69c18e 100644
--- a/src/app/collection-page/collection-form/collection-form.module.ts
+++ b/src/app/collection-page/collection-form/collection-form.module.ts
@@ -1,22 +1,22 @@
 import { NgModule } from '@angular/core';
 
-import { CollectionFormComponent } from './collection-form.component';
-import { SharedModule } from '../../shared/shared.module';
 import { ComcolModule } from '../../shared/comcol/comcol.module';
 import { FormModule } from '../../shared/form/form.module';
+import { SharedModule } from '../../shared/shared.module';
+import { CollectionFormComponent } from './collection-form.component';
 
 @NgModule({
   imports: [
     ComcolModule,
     FormModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
     CollectionFormComponent,
   ],
   exports: [
-    CollectionFormComponent
-  ]
+    CollectionFormComponent,
+  ],
 })
 export class CollectionFormModule {
 
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 042beddc84..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,19 +23,19 @@
             </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">
               <div class="col-12 col-lg-6">
-                <ds-search-form id="search-form"
+                <ds-themed-search-form id="search-form"
                                 [query]="(searchOptions$ | async)?.query"
                                 [scope]="(searchOptions$ | async)?.scope"
                                 [currentUrl]="'./'"
                                 [inPlaceSearch]="true"
                                 [searchPlaceholder]="'collection.edit.item-mapper.search-form.placeholder' | translate"
                                 (submitSearch)="performedSearch = true">
-                </ds-search-form>
+                </ds-themed-search-form>
               </div>
             </div>
 
diff --git a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
index 8304b01daa..54b2c42168 100644
--- a/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
+++ b/src/app/collection-page/collection-item-mapper/collection-item-mapper.component.spec.ts
@@ -1,52 +1,66 @@
-import { CollectionItemMapperComponent } from './collection-item-mapper.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { CommonModule } from '@angular/common';
+import { EventEmitter } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { CommonModule } from '@angular/common';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { SearchFormComponent } from '../../shared/search-form/search-form.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { SearchServiceStub } from '../../shared/testing/search-service.stub';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { FormsModule } from '@angular/forms';
-import { Collection } from '../../core/shared/collection.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { ChangeDetectionStrategy, EventEmitter } from '@angular/core';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { By } from '@angular/platform-browser';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
-import { PaginationComponent } from '../../shared/pagination/pagination.component';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { RouteService } from '../../core/services/route.service';
+import { Collection } from '../../core/shared/collection.model';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+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';
+import { ErrorComponent } from '../../shared/error/error.component';
+import { HostWindowService } from '../../shared/host-window.service';
+import { LoadingComponent } from '../../shared/loading/loading.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ItemSelectComponent } from '../../shared/object-select/item-select/item-select.component';
 import { ObjectSelectService } from '../../shared/object-select/object-select.service';
-import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { of as observableOf } from 'rxjs';
-import { RouteService } from '../../core/services/route.service';
-import { ErrorComponent } from '../../shared/error/error.component';
-import { LoadingComponent } from '../../shared/loading/loading.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { PaginationComponent } from '../../shared/pagination/pagination.component';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchFormComponent } from '../../shared/search-form/search-form.component';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ObjectSelectServiceStub } from '../../shared/testing/object-select-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { SearchServiceStub } from '../../shared/testing/search-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { CollectionItemMapperComponent } from './collection-item-mapper.component';
 
 describe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
@@ -64,32 +78,32 @@ describe('CollectionItemMapperComponent', () => {
     name: 'test-collection',
     _links: {
       mappedItems: {
-        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems'
+        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems',
       },
       self: {
-        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4'
-      }
-    }
+        href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+      },
+    },
   });
   const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
   const mockSearchOptions = observableOf(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
     sort: new SortOptions('dc.title', SortDirection.ASC),
-    scope: mockCollection.id
+    scope: mockCollection.id,
   }));
   const url = 'http://test.url';
   const urlWithParam = url + '?param=value';
   const routerStub = Object.assign(new RouterStub(), {
     url: urlWithParam,
     navigateByUrl: {},
-    navigate: {}
+    navigate: {},
   });
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const itemDataServiceStub = {
@@ -99,31 +113,31 @@ describe('CollectionItemMapperComponent', () => {
   const activatedRouteStub = {
     parent: {
       data: observableOf({
-        dso: mockCollectionRD
-      })
+        dso: mockCollectionRD,
+      }),
     },
     snapshot: {
       queryParamMap: new Map([
         ['query', 'test'],
-      ])
-    }
+      ]),
+    },
   };
   const translateServiceStub = {
     get: () => observableOf('test-message of collection ' + mockCollection.name),
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
-    onDefaultLangChange: new EventEmitter()
+    onDefaultLangChange: new EventEmitter(),
   };
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearDiscoveryRequests: () => {}
+    clearDiscoveryRequests: () => {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   });
   const collectionDataServiceStub = {
     getMappedItems: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearMappedItemsRequests: () => {}
+    clearMappedItemsRequests: () => {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const routeServiceStub = {
@@ -135,20 +149,20 @@ describe('CollectionItemMapperComponent', () => {
     },
     getQueryParamsWithPrefix: () => {
       return observableOf('');
-    }
+    },
   };
   const fixedFilterServiceStub = {
     getQueryByFilterName: () => {
       return observableOf('');
-    }
+    },
   };
 
   const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -161,9 +175,9 @@ describe('CollectionItemMapperComponent', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   beforeEach(waitForAsync(() => {
@@ -186,15 +200,15 @@ describe('CollectionItemMapperComponent', () => {
         { provide: GroupDataService, useValue: groupDataService },
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
-      ]
+      ],
     }).overrideComponent(CollectionItemMapperComponent, {
       set: {
         providers: [
           {
             provide: SEARCH_CONFIG_SERVICE,
-            useClass: SearchConfigurationServiceStub
-          }
-        ] }
+            useClass: SearchConfigurationServiceStub,
+          },
+        ] },
     }).compileComponents();
   }));
 
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 7911be8e64..1949b345ac 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
@@ -1,35 +1,59 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { ChangeDetectionStrategy, Component, Inject, OnInit, ViewChild } from '@angular/core';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { map, startWith, switchMap, take } from 'rxjs/operators';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { NoContent } from '../../core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getRemoteDataPayload,
-  toDSpaceObjectListRD
+  toDSpaceObjectListRD,
 } from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { isNotEmpty } from '../../shared/empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 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';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../shared/animations/fade';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { followLink } from '../../shared/utils/follow-link-config.model';
-import { NoContent } from '../../core/shared/NoContent.model';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 @Component({
   selector: 'ds-collection-item-mapper',
@@ -38,14 +62,14 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
+    fadeInOut,
   ],
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 /**
  * Component used to map items to a collection
@@ -58,7 +82,7 @@ export class CollectionItemMapperComponent implements OnInit {
    * A view on the tabset element
    * Used to switch tabs programmatically
    */
-  @ViewChild('tabs', {static: false}) tabs;
+  @ViewChild('tabs', { static: false }) tabs;
 
   /**
    * The collection to map items to
@@ -115,13 +139,13 @@ export class CollectionItemMapperComponent implements OnInit {
   ngOnInit(): void {
     this.collectionRD$ = this.route.parent.data.pipe(
       map((data) => data.dso as RemoteData<Collection>),
-      getFirstSucceededRemoteData()
+      getFirstSucceededRemoteData(),
     );
 
     this.collectionName$ = this.collectionRD$.pipe(
       map((rd: RemoteData<Collection>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadItemLists();
@@ -136,7 +160,7 @@ export class CollectionItemMapperComponent implements OnInit {
     const collectionAndOptions$ = observableCombineLatest(
       this.collectionRD$,
       this.searchOptions$,
-      this.shouldUpdate$
+      this.shouldUpdate$,
     );
     this.collectionItemsRD$ = collectionAndOptions$.pipe(
       switchMap(([collectionRD, options, shouldUpdate]) => {
@@ -144,11 +168,11 @@ export class CollectionItemMapperComponent implements OnInit {
           this.shouldUpdate$.next(false);
         }
         return this.itemDataService.findListByHref(collectionRD.payload._links.mappedItems.href, Object.assign(options, {
-          sort: this.defaultSortOptions
+          sort: this.defaultSortOptions,
         }),!shouldUpdate, false, followLink('owningCollection')).pipe(
-          getAllSucceededRemoteData()
+          getAllSucceededRemoteData(),
         );
-      })
+      }),
     );
     this.mappedItemsRD$ = collectionAndOptions$.pipe(
       switchMap(([collectionRD, options, shouldUpdate]) => {
@@ -156,12 +180,12 @@ export class CollectionItemMapperComponent implements OnInit {
           query: this.buildQuery(collectionRD.payload.id, options.query),
           scope: undefined,
           dsoTypes: [DSpaceObjectType.ITEM],
-          sort: this.defaultSortOptions
-        }), 10000).pipe(
+          sort: this.defaultSortOptions,
+        }), 10000, undefined, undefined, followLink('owningCollection')).pipe(
           toDSpaceObjectListRD(),
-          startWith(undefined)
+          startWith(undefined),
         );
-      })
+      }),
     );
   }
 
@@ -176,18 +200,18 @@ export class CollectionItemMapperComponent implements OnInit {
       map((collectionRD: RemoteData<Collection>) => collectionRD.payload),
       switchMap((collection: Collection) =>
         observableCombineLatest(ids.map((id: string) => {
-            if (remove) {
-              return this.itemDataService.removeMappingFromCollection(id, collection.id).pipe(
-                getFirstCompletedRemoteData()
-              );
-            } else {
-              return this.itemDataService.mapToCollection(id, collection._links.self.href).pipe(
-                getFirstCompletedRemoteData()
-              );
-            }
+          if (remove) {
+            return this.itemDataService.removeMappingFromCollection(id, collection.id).pipe(
+              getFirstCompletedRemoteData(),
+            );
+          } else {
+            return this.itemDataService.mapToCollection(id, collection._links.self.href).pipe(
+              getFirstCompletedRemoteData(),
+            );
           }
-        ))
-      )
+        },
+        )),
+      ),
     );
 
     this.showNotifications(responses$, remove);
@@ -207,7 +231,7 @@ export class CollectionItemMapperComponent implements OnInit {
       if (successful.length > 0) {
         const successMessages = observableCombineLatest(
           this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.head`),
-          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.content`, { amount: successful.length })
+          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.success.content`, { amount: successful.length }),
         );
 
         successMessages.subscribe(([head, content]) => {
@@ -218,7 +242,7 @@ export class CollectionItemMapperComponent implements OnInit {
       if (unsuccessful.length > 0) {
         const unsuccessMessages = observableCombineLatest(
           this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.head`),
-          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.content`, { amount: unsuccessful.length })
+          this.translateService.get(`collection.edit.item-mapper.notifications.${messageInsertion}.error.content`, { amount: unsuccessful.length }),
         );
 
         unsuccessMessages.subscribe(([head, content]) => {
@@ -277,7 +301,7 @@ export class CollectionItemMapperComponent implements OnInit {
     this.collectionRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      take(1)
+      take(1),
     ).subscribe((collection: Collection) => {
       this.router.navigate(['/collections/', collection.id]);
     });
diff --git a/src/app/collection-page/collection-page-administrator.guard.ts b/src/app/collection-page/collection-page-administrator.guard.ts
index c7866515b2..caecd6ef43 100644
--- a/src/app/collection-page/collection-page-administrator.guard.ts
+++ b/src/app/collection-page/collection-page-administrator.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Collection } from '../core/shared/collection.model';
-import { CollectionPageResolver } from './collection-page.resolver';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../core/auth/auth.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { Observable, of as observableOf } from 'rxjs';
 import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { AuthService } from '../core/auth/auth.service';
+import { Collection } from '../core/shared/collection.model';
+import { CollectionPageResolver } from './collection-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Collection} pages requiring administrator rights
diff --git a/src/app/collection-page/collection-page-routing.module.ts b/src/app/collection-page/collection-page-routing.module.ts
index 678c745c01..75ce2fe9d2 100644
--- a/src/app/collection-page/collection-page-routing.module.ts
+++ b/src/app/collection-page/collection-page-routing.module.ts
@@ -1,26 +1,31 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { CollectionPageResolver } from './collection-page.resolver';
-import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
+import { BrowseByGuard } from '../browse-by/browse-by-guard';
+import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
-import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
-import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
 import { CollectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { LinkService } from '../core/cache/builders/link.service';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import {
-  ITEMTEMPLATE_PATH,
-  COLLECTION_EDIT_PATH,
-  COLLECTION_CREATE_PATH
-} from './collection-page-routing-paths';
-import { CollectionPageAdministratorGuard } from './collection-page-administrator.guard';
+import { LinkService } from '../core/cache/builders/link.service';
+import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 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 { CollectionPageResolver } from './collection-page.resolver';
+import { CollectionPageAdministratorGuard } from './collection-page-administrator.guard';
+import {
+  COLLECTION_CREATE_PATH,
+  COLLECTION_EDIT_PATH,
+  ITEMTEMPLATE_PATH,
+} from './collection-page-routing-paths';
+import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
+import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
+import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
+import { ItemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
+import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
+import { ThemedCollectionPageComponent } from './themed-collection-page.component';
 
 @NgModule({
   imports: [
@@ -28,13 +33,14 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
       {
         path: COLLECTION_CREATE_PATH,
         component: CreateCollectionPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard]
+        canActivate: [AuthenticatedGuard, CreateCollectionPageGuard],
       },
       {
         path: ':id',
         resolve: {
           dso: CollectionPageResolver,
-          breadcrumb: CollectionBreadcrumbResolver
+          breadcrumb: CollectionBreadcrumbResolver,
+          menu: DSOEditMenuResolver,
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -42,7 +48,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
             path: COLLECTION_EDIT_PATH,
             loadChildren: () => import('./edit-collection-page/edit-collection-page.module')
               .then((m) => m.EditCollectionPageModule),
-            canActivate: [CollectionPageAdministratorGuard]
+            canActivate: [CollectionPageAdministratorGuard],
           },
           {
             path: 'delete',
@@ -56,15 +62,31 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
             canActivate: [AuthenticatedGuard],
             resolve: {
               item: ItemTemplatePageResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' }
+            data: { title: 'collection.edit.template.title', breadcrumbKey: 'collection.edit.template' },
           },
           {
             path: '',
             component: ThemedCollectionPageComponent,
-            pathMatch: 'full',
-          }
+            children: [
+              {
+                path: '',
+                pathMatch: 'full',
+                component: ComcolSearchSectionComponent,
+              },
+              {
+                path: 'browse/:id',
+                pathMatch: 'full',
+                component: ComcolBrowseByComponent,
+                canActivate: [BrowseByGuard],
+                resolve: {
+                  breadcrumb: BrowseByI18nBreadcrumbResolver,
+                },
+                data: { breadcrumbKey: 'browse.metadata' },
+              },
+            ],
+          },
         ],
         data: {
           menu: {
@@ -72,6 +94,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
               id: 'statistics_collection_:id',
               active: true,
               visible: true,
+              index: 2,
               model: {
                 type: MenuItemType.LINK,
                 text: 'menu.section.statistics',
@@ -81,7 +104,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
           },
         },
       },
-    ])
+    ]),
   ],
   providers: [
     CollectionPageResolver,
@@ -90,8 +113,8 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
     DSOBreadcrumbsService,
     LinkService,
     CreateCollectionPageGuard,
-    CollectionPageAdministratorGuard
-  ]
+    CollectionPageAdministratorGuard,
+  ],
 })
 export class CollectionPageRoutingModule {
 
diff --git a/src/app/collection-page/collection-page.component.html b/src/app/collection-page/collection-page.component.html
index eebfdbd829..d5da37c12f 100644
--- a/src/app/collection-page/collection-page.component.html
+++ b/src/app/collection-page/collection-page.component.html
@@ -1,80 +1,61 @@
 <div class="container">
-    <div class="collection-page"
-         *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 -->
-                  <ds-comcol-page-header
-                          [name]="collection.name">
-                  </ds-comcol-page-header>
-                  <!-- Collection logo -->
-                  <ds-comcol-page-logo *ngIf="logoRD$"
-                                   [logo]="(logoRD$ | async)?.payload"
-                                   [alternateText]="'Collection Logo'">
-                  </ds-comcol-page-logo>
+  <div class="collection-page"
+       *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 -->
+            <ds-comcol-page-header
+                [name]="dsoNameService.getName(collection)">
+            </ds-comcol-page-header>
+            <!-- Collection logo -->
+            <ds-comcol-page-logo *ngIf="logoRD$"
+                                 [logo]="(logoRD$ | async)?.payload"
+                                 [alternateText]="'collection.logo' | translate">
+            </ds-comcol-page-logo>
 
-                  <!-- Handle -->
-                  <ds-themed-comcol-page-handle
-                          [content]="collection.handle"
-                          [title]="'collection.page.handle'" >
-                  </ds-themed-comcol-page-handle>
-                  <!-- Introductory text -->
-                  <ds-comcol-page-content
-                          [content]="collection.introductoryText"
-                          [hasInnerHtml]="true">
-                  </ds-comcol-page-content>
-                  <!-- News -->
-                  <ds-comcol-page-content
-                          [content]="collection.sidebarText"
-                          [hasInnerHtml]="true"
-                          [title]="'collection.page.news'">
-                  </ds-comcol-page-content>
-                </header>
-                <div class="pl-2 space-children-mr">
-                  <ds-dso-page-edit-button *ngIf="isCollectionAdmin$ | async"  [pageRoute]="collectionPageRoute$ | async" [dso]="collection" [tooltipMsg]="'collection.page.edit'"></ds-dso-page-edit-button>
-                </div>
-              </div>
-              <section class="comcol-page-browse-section">
-              <!-- Browse-By Links -->
-              <ds-themed-comcol-page-browse-by
-                      [id]="collection.id"
-                      [contentType]="collection.type">
-              </ds-themed-comcol-page-browse-by>
+            <!-- Handle -->
+            <ds-themed-comcol-page-handle
+                [content]="collection.handle"
+                [title]="'collection.page.handle'">
+            </ds-themed-comcol-page-handle>
+            <!-- Introductory text -->
+            <ds-comcol-page-content
+                [content]="collection.introductoryText"
+                [hasInnerHtml]="true">
+            </ds-comcol-page-content>
+            <!-- News -->
+            <ds-comcol-page-content
+                [content]="collection.sidebarText"
+                [hasInnerHtml]="true"
+                [title]="'collection.page.news'">
+            </ds-comcol-page-content>
+          </header>
+          <ds-dso-edit-menu></ds-dso-edit-menu>
+        </div>
+        <section class="comcol-page-browse-section">
+          <!-- Browse-By Links -->
+          <ds-themed-comcol-page-browse-by
+              [id]="collection.id"
+              [contentType]="collection.type">
+          </ds-themed-comcol-page-browse-by>
 
-            <ng-container *ngVar="(itemRD$ | async) as itemRD">
-                <div class="mt-4" *ngIf="itemRD?.hasSucceeded" @fadeIn>
-                    <h3 class="sr-only">{{'collection.page.browse.recent.head' | translate}}</h3>
-                    <ds-viewable-collection
-                            [config]="paginationConfig"
-                            [sortConfig]="sortConfig"
-                            [objects]="itemRD"
-                            [hideGear]="true">
-                    </ds-viewable-collection>
-                </div>
-                <ds-error *ngIf="itemRD?.hasFailed"
-                          message="{{'error.recent-submissions' | translate}}"></ds-error>
-                <ds-themed-loading *ngIf="!itemRD || itemRD.isLoading"
-                            message="{{'loading.recent-submissions' | translate}}"></ds-themed-loading>
-                <div *ngIf="!itemRD?.isLoading && itemRD?.payload?.page.length === 0" class="alert alert-info w-100" role="alert">
-                        {{'collection.page.browse.recent.empty' | translate}}
-                </div>
-            </ng-container>
-            </section>
-            <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
+          <router-outlet></router-outlet>
+        </section>
+        <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
           <!-- Copyright -->
           <ds-comcol-page-content
-                      [content]="collection.copyrightText"
-                      [hasInnerHtml]="true">
+              [content]="collection.copyrightText"
+              [hasInnerHtml]="true">
           </ds-comcol-page-content>
         </footer>
       </div>
     </div>
-        <ds-error *ngIf="collectionRD?.hasFailed"
-            message="{{'error.collection' | translate}}"></ds-error>
-        <ds-themed-loading *ngIf="collectionRD?.isLoading"
-            message="{{'loading.collection' | translate}}"></ds-themed-loading>
+    <ds-error *ngIf="collectionRD?.hasFailed"
+              message="{{'error.collection' | translate}}"></ds-error>
+    <ds-themed-loading *ngIf="collectionRD?.isLoading"
+                       message="{{'loading.collection' | translate}}"></ds-themed-loading>
   </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/collection-page/collection-page.component.ts b/src/app/collection-page/collection-page.component.ts
index f730f44658..86f99518ee 100644
--- a/src/app/collection-page/collection-page.component.ts
+++ b/src/app/collection-page/collection-page.component.ts
@@ -1,34 +1,40 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subject } from 'rxjs';
-import { filter, map, mergeMap, startWith, switchMap, take } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
-import { SearchService } from '../core/shared/search/search.service';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { CollectionDataService } from '../core/data/collection-data.service';
-import { PaginatedList } from '../core/data/paginated-list.model';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
-
-import { Collection } from '../core/shared/collection.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
-import { Item } from '../core/shared/item.model';
 import {
-  getAllSucceededRemoteDataPayload,
-  getFirstSucceededRemoteData,
-  toDSpaceObjectListRD
-} from '../core/shared/operators';
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { fadeIn, fadeInOut } from '../shared/animations/fade';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { AuthService } from '../core/auth/auth.service';
-import { PaginationService } from '../core/pagination/pagination.service';
+import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { SortOptions } from '../core/cache/models/sort-options.model';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { getCollectionPageRoute } from './collection-page-routing-paths';
+import { RemoteData } from '../core/data/remote-data';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
-import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { Collection } from '../core/shared/collection.model';
+import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../shared/animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { getCollectionPageRoute } from './collection-page-routing-paths';
 
 @Component({
   selector: 'ds-collection-page',
@@ -37,19 +43,14 @@ import { BROWSE_LINKS_TO_FOLLOW } from '../core/browse/browse.service';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class CollectionPageComponent implements OnInit {
   collectionRD$: Observable<RemoteData<Collection>>;
-  itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
   logoRD$: Observable<RemoteData<Bitstream>>;
   paginationConfig: PaginationComponentOptions;
   sortConfig: SortOptions;
-  private paginationChanges$: Subject<{
-    paginationConfig: PaginationComponentOptions,
-    sortConfig: SortOptions
-  }>;
 
   /**
    * Whether the current user is a Community admin
@@ -62,65 +63,30 @@ export class CollectionPageComponent implements OnInit {
   collectionPageRoute$: Observable<string>;
 
   constructor(
-    private collectionDataService: CollectionDataService,
-    private searchService: SearchService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private authService: AuthService,
-    private paginationService: PaginationService,
-    private authorizationDataService: AuthorizationDataService,
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected authService: AuthService,
+    protected authorizationDataService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
-    this.paginationConfig = new PaginationComponentOptions();
-    this.paginationConfig.id = 'cp';
-    this.paginationConfig.pageSize = 5;
-    this.paginationConfig.currentPage = 1;
-    this.sortConfig = new SortOptions('dc.date.accessioned', SortDirection.DESC);
-
   }
 
   ngOnInit(): void {
     this.collectionRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Collection>),
       redirectOn4xx(this.router, this.authService),
-      take(1)
+      take(1),
     );
     this.logoRD$ = this.collectionRD$.pipe(
       map((rd: RemoteData<Collection>) => rd.payload),
       filter((collection: Collection) => hasValue(collection)),
-      mergeMap((collection: Collection) => collection.logo)
+      mergeMap((collection: Collection) => collection.logo),
     );
     this.isCollectionAdmin$ = this.authorizationDataService.isAuthorized(FeatureID.IsCollectionAdmin);
 
-    this.paginationChanges$ = new BehaviorSubject({
-      paginationConfig: this.paginationConfig,
-      sortConfig: this.sortConfig
-    });
-
-    const currentPagination$ = this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig);
-    const currentSort$ = this.paginationService.getCurrentSort(this.paginationConfig.id, this.sortConfig);
-
-    this.itemRD$ = observableCombineLatest([currentPagination$, currentSort$]).pipe(
-      switchMap(([currentPagination, currentSort]) => this.collectionRD$.pipe(
-        getFirstSucceededRemoteData(),
-        map((rd) => rd.payload.id),
-        switchMap((id: string) => {
-          return this.searchService.search<Item>(
-            new PaginatedSearchOptions({
-              scope: id,
-              pagination: currentPagination,
-              sort: currentSort,
-              dsoTypes: [DSpaceObjectType.ITEM]
-            }), null, true, true, ...BROWSE_LINKS_TO_FOLLOW)
-            .pipe(toDSpaceObjectListRD()) as Observable<RemoteData<PaginatedList<Item>>>;
-        }),
-        startWith(undefined) // Make sure switching pages shows loading component
-      )
-      )
-    );
-
     this.collectionPageRoute$ = this.collectionRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((collection) => getCollectionPageRoute(collection.id))
+      map((collection) => getCollectionPageRoute(collection.id)),
     );
   }
 
@@ -128,9 +94,5 @@ export class CollectionPageComponent implements OnInit {
     return isNotEmpty(object);
   }
 
-  ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.paginationConfig.id);
-  }
-
 
 }
diff --git a/src/app/collection-page/collection-page.module.ts b/src/app/collection-page/collection-page.module.ts
index c35ebf9021..4651270ffe 100644
--- a/src/app/collection-page/collection-page.module.ts
+++ b/src/app/collection-page/collection-page.module.ts
@@ -1,21 +1,33 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 
+import { BrowseByPageModule } from '../browse-by/browse-by-page.module';
+import { SearchService } from '../core/shared/search/search.service';
+import { DsoSharedModule } from '../dso-shared/dso-shared.module';
+import { EditItemPageModule } from '../item-page/edit-item-page/edit-item-page.module';
+import { ComcolModule } from '../shared/comcol/comcol.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { SharedModule } from '../shared/shared.module';
-
+import { StatisticsModule } from '../statistics/statistics.module';
+import { CollectionFormModule } from './collection-form/collection-form.module';
+import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
 import { CollectionPageComponent } from './collection-page.component';
 import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page/edit-item-template-page.component';
 import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
-import { EditItemPageModule } from '../item-page/edit-item-page/edit-item-page.module';
-import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
-import { SearchService } from '../core/shared/search/search.service';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { CollectionFormModule } from './collection-form/collection-form.module';
 import { ThemedCollectionPageComponent } from './themed-collection-page.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
+
+const DECLARATIONS = [
+  CollectionPageComponent,
+  ThemedCollectionPageComponent,
+  CreateCollectionPageComponent,
+  DeleteCollectionPageComponent,
+  EditItemTemplatePageComponent,
+  ThemedEditItemTemplatePageComponent,
+  CollectionItemMapperComponent,
+];
 
 @NgModule({
   imports: [
@@ -25,20 +37,17 @@ import { ComcolModule } from '../shared/comcol/comcol.module';
     StatisticsModule.forRoot(),
     EditItemPageModule,
     CollectionFormModule,
-    ComcolModule
+    ComcolModule,
+    DsoSharedModule,
+    DsoPageModule,
+    BrowseByPageModule,
   ],
   declarations: [
-    CollectionPageComponent,
-    ThemedCollectionPageComponent,
-    CreateCollectionPageComponent,
-    DeleteCollectionPageComponent,
-    EditItemTemplatePageComponent,
-    ThemedEditItemTemplatePageComponent,
-    CollectionItemMapperComponent
+    ...DECLARATIONS,
   ],
   providers: [
     SearchService,
-  ]
+  ],
 })
 export class CollectionPageModule {
 
diff --git a/src/app/collection-page/collection-page.resolver.spec.ts b/src/app/collection-page/collection-page.resolver.spec.ts
index 4b1ea9834c..32d8952ff7 100644
--- a/src/app/collection-page/collection-page.resolver.spec.ts
+++ b/src/app/collection-page/collection-page.resolver.spec.ts
@@ -1,6 +1,7 @@
 import { first } from 'rxjs/operators';
-import { CollectionPageResolver } from './collection-page.resolver';
+
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { CollectionPageResolver } from './collection-page.resolver';
 
 describe('CollectionPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('CollectionPageResolver', () => {
 
     beforeEach(() => {
       collectionService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       };
       store = jasmine.createSpyObj('store', {
         dispatch: {},
@@ -26,7 +27,7 @@ describe('CollectionPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/collection-page/collection-page.resolver.ts b/src/app/collection-page/collection-page.resolver.ts
index 2f5b3ed37a..303e8c2c74 100644
--- a/src/app/collection-page/collection-page.resolver.ts
+++ b/src/app/collection-page/collection-page.resolver.ts
@@ -1,13 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Collection } from '../core/shared/collection.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
+
 import { CollectionDataService } from '../core/data/collection-data.service';
 import { RemoteData } from '../core/data/remote-data';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { Store } from '@ngrx/store';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { Collection } from '../core/shared/collection.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -15,7 +23,7 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
  */
 export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
   followLink('parentCommunity', {},
-    followLink('parentCommunity')
+    followLink('parentCommunity'),
   ),
   followLink('logo'),
 ];
@@ -27,7 +35,7 @@ export const COLLECTION_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Collection>[] = [
 export class CollectionPageResolver implements Resolve<RemoteData<Collection>> {
   constructor(
     private collectionService: CollectionDataService,
-    private store: Store<any>
+    private store: Store<any>,
   ) {
   }
 
@@ -43,9 +51,9 @@ export class CollectionPageResolver implements Resolve<RemoteData<Collection>> {
       route.params.id,
       true,
       false,
-      ...COLLECTION_PAGE_LINKS_TO_FOLLOW
+      ...COLLECTION_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
 
     collectionRD$.subscribe((collectionRD: RemoteData<Collection>) => {
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 5100f606c0..f3f9785692 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: (parentRD$| async)?.payload.name } }}</h2>
+            <h2 id="sub-header" class="border-bottom pb-2">{{'collection.create.sub-head' | translate:{ parent: dsoNameService.getName((parentRD$| async)?.payload) } }}</h2>
         </div>
     </div>
     <ds-collection-form (submitForm)="onSubmit($event)"
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
index 03c01c7f46..bef2301ce3 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.spec.ts
@@ -1,39 +1,47 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../core/services/route.service';
-import { SharedModule } from '../../shared/shared.module';
-import { CollectionDataService } from '../../core/data/collection-data.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../core/data/collection-data.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
-import { CreateCollectionPageComponent } from './create-collection-page.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SharedModule } from '../../shared/shared.module';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CreateCollectionPageComponent } from './create-collection-page.component';
 
 describe('CreateCollectionPageComponent', () => {
   let comp: CreateCollectionPageComponent;
   let fixture: ComponentFixture<CreateCollectionPageComponent>;
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       declarations: [CreateCollectionPageComponent],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: CollectionDataService, useValue: {} },
         {
           provide: CommunityDataService,
-          useValue: { findById: () => observableOf({ payload: { name: 'test' } }) }
+          useValue: { findById: () => observableOf({ payload: { name: 'test' } }) },
         },
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RequestService, useValue: {}}
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.component.ts b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
index a938b37ce1..cd65affb10 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.component.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.component.ts
@@ -1,13 +1,15 @@
 import { Component } from '@angular/core';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
-import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
-import { Collection } from '../../core/shared/collection.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
 import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { Collection } from '../../core/shared/collection.model';
+import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 /**
  * Component that represents the page where a user can create a new Collection
@@ -15,21 +17,22 @@ import { RequestService } from '../../core/data/request.service';
 @Component({
   selector: 'ds-create-collection',
   styleUrls: ['./create-collection-page.component.scss'],
-  templateUrl: './create-collection-page.component.html'
+  templateUrl: './create-collection-page.component.html',
 })
 export class CreateCollectionPageComponent extends CreateComColPageComponent<Collection> {
   protected frontendURL = '/collections/';
   protected type = Collection.type;
 
   public constructor(
+    public dsoNameService: DSONameService,
     protected communityDataService: CommunityDataService,
     protected collectionDataService: CollectionDataService,
     protected routeService: RouteService,
     protected router: Router,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) {
-    super(collectionDataService, communityDataService, routeService, router, notificationsService, translate, requestService);
+    super(collectionDataService, dsoNameService, communityDataService, routeService, router, notificationsService, translate, requestService);
   }
 }
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
index 91c2c47466..b476f38889 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts
@@ -1,8 +1,12 @@
-import { CreateCollectionPageGuard } from './create-collection-page.guard';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { Community } from '../../core/shared/community.model';
 import { first } from 'rxjs/operators';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+import { Community } from '../../core/shared/community.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { CreateCollectionPageGuard } from './create-collection-page.guard';
 
 describe('CreateCollectionPageGuard', () => {
   describe('canActivate', () => {
@@ -20,7 +24,7 @@ describe('CreateCollectionPageGuard', () => {
           } else if (id === 'error-id') {
             return createFailedRemoteDataObject$('not found', 404);
           }
-        }
+        },
       };
       router = new RouterMock();
 
@@ -32,7 +36,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(true)
+            expect(canActivate).toEqual(true),
         );
     });
 
@@ -41,7 +45,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
 
@@ -50,7 +54,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
 
@@ -59,7 +63,7 @@ describe('CreateCollectionPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
   });
diff --git a/src/app/collection-page/create-collection-page/create-collection-page.guard.ts b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts
index ca84231912..3e26f51b11 100644
--- a/src/app/collection-page/create-collection-page/create-collection-page.guard.ts
+++ b/src/app/collection-page/create-collection-page/create-collection-page.guard.ts
@@ -1,13 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
-import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-import { map, tap } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 
 /**
  * Prevent creation of a collection without a parent community provided
@@ -37,7 +51,7 @@ export class CreateCollectionPageGuard implements CanActivate {
           if (!isValid) {
             this.router.navigate(['/404']);
           }
-        })
-    );
+        }),
+      );
   }
 }
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 c33675a752..53c3b45cfa 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,8 +2,8 @@
     <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>
-                <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dso.name } }}</p>
+                <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)">
@@ -11,7 +11,7 @@
                     </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> {{'collection.delete.processing' | translate}}</span>
-                      <span *ngIf="!(processing$ | async)"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
+                      <span *ngIf="(processing$ | async) !== true"><i class="fas fa-trash"></i> {{'collection.delete.confirm' | translate}}</span>
                     </button>
                   </div>
                 </div>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
index 48ac9b7530..986faafedb 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.spec.ts
@@ -1,15 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { DeleteCollectionPageComponent } from './delete-collection-page.component';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { RequestService } from '../../core/data/request.service';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SharedModule } from '../../shared/shared.module';
+import { DeleteCollectionPageComponent } from './delete-collection-page.component';
 
 describe('DeleteCollectionPageComponent', () => {
   let comp: DeleteCollectionPageComponent;
@@ -20,12 +27,13 @@ describe('DeleteCollectionPageComponent', () => {
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       declarations: [DeleteCollectionPageComponent],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: CollectionDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } },
         { provide: NotificationsService, useValue: {} },
-        { provide: RequestService, useValue: {} }
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
index 1876936efb..87b21d3432 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.ts
@@ -1,10 +1,15 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../core/data/collection-data.service';
 import { Collection } from '../../core/shared/collection.model';
-import { TranslateService } from '@ngx-translate/core';
+import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 /**
  * Component that represents the page where a user can delete an existing Collection
@@ -12,18 +17,19 @@ import { TranslateService } from '@ngx-translate/core';
 @Component({
   selector: 'ds-delete-collection',
   styleUrls: ['./delete-collection-page.component.scss'],
-  templateUrl: './delete-collection-page.component.html'
+  templateUrl: './delete-collection-page.component.html',
 })
 export class DeleteCollectionPageComponent extends DeleteComColPageComponent<Collection> {
   protected frontendURL = '/collections/';
 
   public constructor(
     protected dsoDataService: CollectionDataService,
+    public dsoNameService: DSONameService,
     protected router: Router,
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
     protected translate: TranslateService,
   ) {
-    super(dsoDataService, router, route, notifications, translate);
+    super(dsoDataService, dsoNameService, router, route, notifications, translate);
   }
 }
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
new file mode 100644
index 0000000000..4e957cf867
--- /dev/null
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.html
@@ -0,0 +1,7 @@
+<ds-access-control-form-container
+  titleMessage="collection-access-control-title"
+  *ngIf="itemRD$ | async as itemRD"
+  [itemRD]="itemRD"
+  [showLimitToSpecificBitstreams]="false">
+</ds-access-control-form-container>
+
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.scss b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.scss
similarity index 100%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.scss
rename to src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.scss
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts
new file mode 100644
index 0000000000..de28e4a23c
--- /dev/null
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.spec.ts
@@ -0,0 +1,69 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { Community } from '../../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CollectionAccessControlComponent } from './collection-access-control.component';
+
+describe('CollectionAccessControlComponent', () => {
+  let component: CollectionAccessControlComponent;
+  let fixture: ComponentFixture<CollectionAccessControlComponent>;
+  const testCommunity = Object.assign(new Community(),
+    {
+      type: 'community',
+      metadata: {
+        'dc.title': [{ value: 'community' }],
+      },
+      uuid: 'communityUUID',
+      parentCommunity: observableOf(Object.assign(createSuccessfulRemoteDataObject(undefined), { statusCode: 204 })),
+
+      _links: {
+        parentCommunity: 'site',
+        self: '/' + 'communityUUID',
+      },
+    },
+  );
+
+  const routeStub = {
+    parent: {
+      parent: {
+        data: of({
+          dso: createSuccessfulRemoteDataObject(testCommunity),
+        }),
+      },
+    },
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ CollectionAccessControlComponent ],
+      providers: [{ provide: ActivatedRoute, useValue: routeStub }],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CollectionAccessControlComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    component.ngOnInit();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set itemRD$', (done) => {
+    component.itemRD$.subscribe(result => {
+      expect(result).toEqual(createSuccessfulRemoteDataObject(testCommunity));
+      done();
+    });
+  });
+});
diff --git a/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
new file mode 100644
index 0000000000..490a8d13ce
--- /dev/null
+++ b/src/app/collection-page/edit-collection-page/collection-access-control/collection-access-control.component.ts
@@ -0,0 +1,28 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-collection-access-control',
+  templateUrl: './collection-access-control.component.html',
+  styleUrls: ['./collection-access-control.component.scss'],
+})
+export class CollectionAccessControlComponent  implements OnInit {
+  itemRD$: Observable<RemoteData<Community>>;
+
+  constructor(private route: ActivatedRoute) {}
+
+  ngOnInit(): void {
+    this.itemRD$ = this.route.parent.parent.data.pipe(
+      map((data) => data.dso),
+    ).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Community>>;
+  }
+}
diff --git a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
index c8e529443a..95d8b0ba04 100644
--- a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.spec.ts
@@ -1,15 +1,21 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { CollectionAuthorizationsComponent } from './collection-authorizations.component';
 import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CollectionAuthorizationsComponent } from './collection-authorizations.component';
 
 describe('CollectionAuthorizationsComponent', () => {
   let comp: CollectionAuthorizationsComponent<DSpaceObject>;
@@ -19,8 +25,8 @@ describe('CollectionAuthorizationsComponent', () => {
     uuid: 'collection',
     id: 'collection',
     _links: {
-      self: { href: 'collection-selflink' }
-    }
+      self: { href: 'collection-selflink' },
+    },
   });
 
   const collectionRD = createSuccessfulRemoteDataObject(collection);
@@ -29,16 +35,16 @@ describe('CollectionAuthorizationsComponent', () => {
     parent: {
       parent: {
         data: observableOf({
-          dso: collectionRD
-        })
-      }
-    }
+          dso: collectionRD,
+        }),
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        CommonModule
+        CommonModule,
       ],
       declarations: [CollectionAuthorizationsComponent],
       providers: [
diff --git a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
index d1b59a0c90..ad8ccbd690 100644
--- a/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-authorizations/collection-authorizations.component.ts
@@ -1,8 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
 import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
@@ -27,7 +32,7 @@ export class CollectionAuthorizationsComponent<TDomain extends DSpaceObject> imp
    * @param {ActivatedRoute} route
    */
   constructor(
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
   ) {
   }
 
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-curate/collection-curate.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
index 2cf25734e1..1925478e3b 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { CollectionCurateComponent } from './collection-curate.component';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { Collection } from '../../../core/shared/collection.model';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CollectionCurateComponent } from './collection-curate.component';
 
 describe('CollectionCurateComponent', () => {
   let comp: CollectionCurateComponent;
@@ -17,30 +25,30 @@ describe('CollectionCurateComponent', () => {
   let dsoNameService;
 
   const collection = Object.assign(new Collection(), {
-    metadata: {'dc.title': ['Collection Name'], 'dc.identifier.uri': [ { value: '123456789/1'}]}
+    metadata: { 'dc.title': ['Collection Name'], 'dc.identifier.uri': [ { value: '123456789/1' }] },
   });
 
   beforeEach(waitForAsync(() => {
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(collection)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(collection),
+        }),
+      },
     };
 
     dsoNameService = jasmine.createSpyObj('dsoNameService', {
-      getName: 'Collection Name'
+      getName: 'Collection Name',
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [CollectionCurateComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: DSONameService, useValue: dsoNameService}
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: DSONameService, useValue: dsoNameService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -58,7 +66,7 @@ describe('CollectionCurateComponent', () => {
     });
     it('should contain the collection information provided in the route', () => {
       comp.dsoRD$.subscribe((value) => {
-        expect(value.payload.handle
+        expect(value.payload.handle,
         ).toEqual('123456789/1');
       });
       comp.collectionName$.subscribe((value) => {
diff --git a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
index e20f229cd6..ea2f0265fa 100644
--- a/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-curate/collection-curate.component.ts
@@ -1,9 +1,14 @@
 import { Component } from '@angular/core';
-import { filter, map, take } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Observable } from 'rxjs';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
 import { hasValue } from '../../../shared/empty.util';
 
@@ -34,7 +39,7 @@ export class CollectionCurateComponent {
       filter((rd: RemoteData<Collection>) => hasValue(rd)),
       map((rd: RemoteData<Collection>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
   }
 }
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-metadata/collection-metadata.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
index 79e7a465e1..3e87f05148 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.spec.ts
@@ -1,20 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../../shared/shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionMetadataComponent } from './collection-metadata.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
-import { Collection } from '../../../core/shared/collection.model';
 import { RequestService } from '../../../core/data/request.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
 import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
+import { CollectionMetadataComponent } from './collection-metadata.component';
 
 describe('CollectionMetadataComponent', () => {
   let comp: CollectionMetadataComponent;
@@ -24,16 +37,16 @@ describe('CollectionMetadataComponent', () => {
 
   const template = Object.assign(new Item(), {
     _links: {
-      self: { href: 'template-selflink' }
-    }
+      self: { href: 'template-selflink' },
+    },
   });
   const collection = Object.assign(new Collection(), {
     uuid: 'collection-id',
     id: 'collection-id',
     name: 'Fake Collection',
     _links: {
-      self: { href: 'collection-selflink' }
-    }
+      self: { href: 'collection-selflink' },
+    },
   });
   const collectionTemplateHref = 'rest/api/test/collections/template';
 
@@ -46,12 +59,17 @@ describe('CollectionMetadataComponent', () => {
 
   const notificationsService = jasmine.createSpyObj('notificationsService', {
     success: {},
-    error: {}
+    error: {},
   });
   const requestService = jasmine.createSpyObj('requestService', {
-    setStaleByHrefSubstring: {}
+    setStaleByHrefSubstring: {},
   });
 
+  const routerMock = {
+    events: observableOf(new NavigationEnd(1, 'url', 'url')),
+    navigate: jasmine.createSpy('navigate'),
+  };
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
@@ -62,16 +80,20 @@ describe('CollectionMetadataComponent', () => {
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: RequestService, useValue: requestService },
+        { provide: Router, useValue: routerMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(CollectionMetadataComponent);
     comp = fixture.componentInstance;
-    router = (comp as any).router;
     itemTemplateService = (comp as any).itemTemplateService;
+    spyOn(comp, 'ngOnInit');
+    spyOn(comp, 'initTemplateItem');
+
+    routerMock.events = observableOf(new NavigationEnd(1, 'url', 'url'));
     fixture.detectChanges();
   });
 
@@ -83,9 +105,8 @@ describe('CollectionMetadataComponent', () => {
 
   describe('addItemTemplate', () => {
     it('should navigate to the collection\'s itemtemplate page', () => {
-      spyOn(router, 'navigate');
       comp.addItemTemplate();
-      expect(router.navigate).toHaveBeenCalledWith([getCollectionItemTemplateRoute(collection.uuid)]);
+      expect(routerMock.navigate).toHaveBeenCalledWith([getCollectionItemTemplateRoute(collection.uuid)]);
     });
   });
 
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
index 8e534a0829..d71732840a 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.ts
@@ -1,20 +1,39 @@
-import { Component } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
-import { combineLatest as combineLatestObservable, Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Item } from '../../../core/shared/item.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { map, switchMap } from 'rxjs/operators';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+  Scroll,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as combineLatestObservable,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
-import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
 import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { getCollectionItemTemplateRoute } from '../../collection-page-routing-paths';
 
 /**
  * Component for editing a collection's metadata
@@ -23,7 +42,7 @@ import { hasValue } from '../../../shared/empty.util';
   selector: 'ds-collection-metadata',
   templateUrl: './collection-metadata.component.html',
 })
-export class CollectionMetadataComponent extends ComcolMetadataComponent<Collection> {
+export class CollectionMetadataComponent extends ComcolMetadataComponent<Collection> implements OnInit {
   protected frontendURL = '/collections/';
   protected type = Collection.type;
 
@@ -40,13 +59,27 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     protected requestService: RequestService,
+    protected chd: ChangeDetectorRef,
   ) {
     super(collectionDataService, router, route, notificationsService, translate);
   }
 
+  /**
+   * Cheking if the navigation is done and if so, initialize the collection's item template,
+   * to ensure that the item template is always up to date.
+   * Check when a NavigationEnd event (URL change) or a Scroll event followed by a NavigationEnd event (refresh event), occurs
+   */
   ngOnInit(): void {
-    super.ngOnInit();
-    this.initTemplateItem();
+    this.router.events.subscribe((event) => {
+      if (
+        event instanceof NavigationEnd ||
+        (event instanceof Scroll && event.routerEvent instanceof NavigationEnd)
+      ) {
+        super.ngOnInit();
+        this.initTemplateItem();
+        this.chd.detectChanges();
+      }
+    });
   }
 
   /**
@@ -55,7 +88,7 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
   initTemplateItem() {
     this.itemTemplateRD$ = this.dsoRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid))
+      switchMap((collection: Collection) => this.itemTemplateService.findByCollectionID(collection.uuid)),
     );
   }
 
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
index 5a8ca5b7ab..21a252b4cf 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.spec.ts
@@ -1,20 +1,32 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CollectionRolesComponent } from './collection-roles.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { SharedModule } from '../../../shared/shared.module';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RequestService } from '../../../core/data/request.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Collection } from '../../../core/shared/collection.model';
 import { ComcolModule } from '../../../shared/comcol/comcol.module';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CollectionRolesComponent } from './collection-roles.component';
 
 describe('CollectionRolesComponent', () => {
 
@@ -52,10 +64,10 @@ describe('CollectionRolesComponent', () => {
                   },
                 ],
               },
-            })
+            }),
           ),
-        })
-      }
+        }),
+      },
     };
 
     const requestService = {
@@ -72,18 +84,19 @@ describe('CollectionRolesComponent', () => {
         SharedModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [
         CollectionRolesComponent,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: route },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: RequestService, useValue: requestService },
         { provide: GroupDataService, useValue: groupDataService },
-        { provide: NotificationsService, useClass: NotificationsServiceStub }
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(CollectionRolesComponent);
diff --git a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
index a6c37cbc45..586a8fa8a6 100644
--- a/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-roles/collection-roles.component.ts
@@ -1,11 +1,22 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
 import { HALLink } from '../../../core/shared/hal-link.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * Component for managing a collection's roles
@@ -45,25 +56,31 @@ export class CollectionRolesComponent implements OnInit {
     );
 
     this.comcolRoles$ = this.collection$.pipe(
-      map((collection) => [
-        {
-          name: 'collection-admin',
-          href: collection._links.adminGroup.href,
-        },
-        {
-          name: 'submitters',
-          href: collection._links.submittersGroup.href,
-        },
-        {
-          name: 'item_read',
-          href: collection._links.itemReadGroup.href,
-        },
-        {
-          name: 'bitstream_read',
-          href: collection._links.bitstreamReadGroup.href,
-        },
-        ...collection._links.workflowGroups,
-      ]),
+      map((collection) => {
+        let workflowGroups: HALLink[] | HALLink = hasValue(collection._links.workflowGroups) ? collection._links.workflowGroups : [];
+        if (!Array.isArray(workflowGroups)) {
+          workflowGroups = [workflowGroups];
+        }
+        return [
+          {
+            name: 'collection-admin',
+            href: collection._links.adminGroup.href,
+          },
+          {
+            name: 'submitters',
+            href: collection._links.submittersGroup.href,
+          },
+          {
+            name: 'item_read',
+            href: collection._links.itemReadGroup.href,
+          },
+          {
+            name: 'bitstream_read',
+            href: collection._links.bitstreamReadGroup.href,
+          },
+          ...workflowGroups,
+        ];
+      }),
     );
   }
 }
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 75a9b22a12..7edaadb0a1 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>
@@ -11,14 +11,14 @@
         </div>
         <div>
             <span class="font-weight-bold">{{'collection.source.controls.harvest.last' | translate}}</span>
-            <span>{{contentSource?.message ? contentSource?.message : 'collection.source.controls.harvest.no-information'|translate }}</span>
+            <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
         </div>
         <div>
             <span class="font-weight-bold">{{'collection.source.controls.harvest.message' | translate}}</span>
-            <span>{{contentSource?.lastHarvested ? contentSource?.lastHarvested : 'collection.source.controls.harvest.no-information'|translate }}</span>
+            <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
         </div>
 
-        <button *ngIf="!(testConfigRunning$ |async)" class="btn btn-secondary"
+        <button *ngIf="(testConfigRunning$ |async) !== true" class="btn btn-secondary"
                 [disabled]="!(isEnabled)"
                 (click)="testConfiguration(contentSource)">
             <span>{{'collection.source.controls.test.submit' | translate}}</span>
@@ -28,7 +28,7 @@
             <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"
+        <button *ngIf="(importRunning$ |async) !== true" class="btn btn-primary"
                 [disabled]="!(isEnabled)"
                 (click)="importNow()">
             <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
@@ -38,7 +38,7 @@
             <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"
+        <button *ngIf="(reImportRunning$ |async) !== true" class="btn btn-primary"
                 [disabled]="!(isEnabled)"
                 (click)="resetAndReimport()">
             <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
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..db922cba65 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
@@ -1,27 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ContentSource } from '../../../../core/shared/content-source.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { CollectionDataService } from '../../../../core/data/collection-data.service';
-import { RequestService } from '../../../../core/data/request.service';
+import { HttpClient } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
 import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
 import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
-import { HttpClient } from '@angular/common/http';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { Process } from '../../../../process-page/processes/process.model';
-import { of as observableOf } from 'rxjs';
-import { CollectionSourceControlsComponent } from './collection-source-controls.component';
+import { RequestService } from '../../../../core/data/request.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { By } from '@angular/platform-browser';
-import { VarDirective } from '../../../../shared/utils/var.directive';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ContentSource } from '../../../../core/shared/content-source.model';
 import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
+import { Process } from '../../../../process-page/processes/process.model';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { CollectionSourceControlsComponent } from './collection-source-controls.component';
 
 describe('CollectionSourceControlsComponent', () => {
   let comp: CollectionSourceControlsComponent;
@@ -51,44 +56,44 @@ describe('CollectionSourceControlsComponent', () => {
         {
           id: 'dc',
           label: 'Simple Dublin Core',
-          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/'
+          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/',
         },
         {
           id: 'qdc',
           label: 'Qualified Dublin Core',
-          nameSpace: 'http://purl.org/dc/terms/'
+          nameSpace: 'http://purl.org/dc/terms/',
         },
         {
           id: 'dim',
           label: 'DSpace Intermediate Metadata',
-          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim'
-        }
+          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim',
+        },
       ],
       oaiSource: 'oai-harvest-source',
       oaiSetId: 'oai-set-id',
-      _links: {self: {href: 'contentsource-selflink'}}
+      _links: { self: { href: 'contentsource-selflink' } },
     });
     process = Object.assign(new Process(), {
       processId: 'process-id', processStatus: 'COMPLETED',
-      _links: {output: {href: 'output-href'}}
+      _links: { output: { href: 'output-href' } },
     });
 
-    bitstream = Object.assign(new Bitstream(), {_links: {content: {href: 'content-href'}}});
+    bitstream = Object.assign(new Bitstream(), { _links: { content: { href: 'content-href' } } });
 
     collection = Object.assign(new Collection(), {
       uuid: 'fake-collection-id',
-      _links: {self: {href: 'collection-selflink'}}
+      _links: { self: { href: 'collection-selflink' } },
     });
     notificationsService = new NotificationsServiceStub();
     collectionService = jasmine.createSpyObj('collectionService', {
       getContentSource: createSuccessfulRemoteDataObject$(contentSource),
-      findByHref: createSuccessfulRemoteDataObject$(collection)
+      findByHref: createSuccessfulRemoteDataObject$(collection),
     });
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
       invoke: createSuccessfulRemoteDataObject$(process),
     });
     processDataService = jasmine.createSpyObj('processDataService', {
-      findById: createSuccessfulRemoteDataObject$(process),
+      autoRefreshUntilCompletion: createSuccessfulRemoteDataObject$(process),
     });
     bitstreamService = jasmine.createSpyObj('bitstreamService', {
       findByHref: createSuccessfulRemoteDataObject$(bitstream),
@@ -102,15 +107,15 @@ describe('CollectionSourceControlsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule],
       declarations: [CollectionSourceControlsComponent, VarDirective],
       providers: [
-        {provide: ScriptDataService, useValue: scriptDataService},
-        {provide: ProcessDataService, useValue: processDataService},
-        {provide: RequestService, useValue: requestService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: CollectionDataService, useValue: collectionService},
-        {provide: HttpClient, useValue: httpClient},
-        {provide: BitstreamDataService, useValue: bitstreamService}
+        { provide: ScriptDataService, useValue: scriptDataService },
+        { provide: ProcessDataService, useValue: processDataService },
+        { provide: RequestService, useValue: requestService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: CollectionDataService, useValue: collectionService },
+        { provide: HttpClient, useValue: httpClient },
+        { provide: BitstreamDataService, useValue: bitstreamService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -132,12 +137,12 @@ describe('CollectionSourceControlsComponent', () => {
       scheduler.flush();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [
-        {name: '-g', value: null},
-        {name: '-a', value: contentSource.oaiSource},
-        {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)},
+        { name: '-g', value: null },
+        { name: '-a', value: contentSource.oaiSource },
+        { name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId) },
       ], []);
 
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(bitstreamService.findByHref).toHaveBeenCalledWith(process._links.output.href);
       expect(notificationsService.info).toHaveBeenCalledWith(jasmine.anything() as any, 'Script text');
     });
@@ -148,10 +153,10 @@ describe('CollectionSourceControlsComponent', () => {
       scheduler.flush();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [
-        {name: '-r', value: null},
-        {name: '-c', value: collection.uuid},
+        { name: '-r', value: null },
+        { name: '-c', value: collection.uuid },
       ], []);
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
     });
   });
@@ -161,10 +166,10 @@ describe('CollectionSourceControlsComponent', () => {
       scheduler.flush();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('harvest', [
-        {name: '-o', value: null},
-        {name: '-c', value: collection.uuid},
+        { name: '-o', value: null },
+        { name: '-c', value: collection.uuid },
       ], []);
-      expect(processDataService.findById).toHaveBeenCalledWith(process.processId, false);
+      expect(processDataService.autoRefreshUntilCompletion).toHaveBeenCalledWith(process.processId);
       expect(notificationsService.success).toHaveBeenCalled();
     });
   });
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
index 7113c25e9f..e6f1cef898 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.ts
@@ -1,26 +1,40 @@
-import { Component, Input, OnDestroy } from '@angular/core';
-import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
-import { ContentSource } from '../../../../core/shared/content-source.model';
-import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
+import { HttpClient } from '@angular/common/http';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { ProcessDataService } from '../../../../core/data/processes/process-data.service';
+import { ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ContentSource } from '../../../../core/shared/content-source.model';
+import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
 import {
-  getAllCompletedRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { filter, map, switchMap, tap } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../../../shared/empty.util';
-import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { RequestService } from '../../../../core/data/request.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { Collection } from '../../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../../core/data/collection-data.service';
 import { Process } from '../../../../process-page/processes/process.model';
-import { TranslateService } from '@ngx-translate/core';
-import { HttpClient } from '@angular/common/http';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { ContentSourceSetSerializer } from '../../../../core/shared/content-source-set-serializer';
+import { ProcessStatus } from '../../../../process-page/processes/process-status.model';
+import { hasValue } from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 
 /**
  * Component that contains the controls to run, reset and test the harvest
@@ -30,7 +44,7 @@ import { ContentSourceSetSerializer } from '../../../../core/shared/content-sour
   styleUrls: ['./collection-source-controls.component.scss'],
   templateUrl: './collection-source-controls.component.html',
 })
-export class CollectionSourceControlsComponent implements OnDestroy {
+export class CollectionSourceControlsComponent implements OnInit, OnDestroy {
 
   /**
    * Should the controls be enabled.
@@ -49,6 +63,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
 
   contentSource$: Observable<ContentSource>;
   private subs: Subscription[] = [];
+  private autoRefreshIDs: string[] = [];
 
   testConfigRunning$ = new BehaviorSubject(false);
   importRunning$ = new BehaviorSubject(false);
@@ -61,7 +76,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
               private collectionService: CollectionDataService,
               private translateService: TranslateService,
               private httpClient: HttpClient,
-              private bitstreamService: BitstreamDataService
+              private bitstreamService: BitstreamDataService,
   ) {
   }
 
@@ -70,7 +85,7 @@ export class CollectionSourceControlsComponent implements OnDestroy {
     this.contentSource$ = this.collectionService.findByHref(this.collection._links.self.href, false).pipe(
       getAllSucceededRemoteDataPayload(),
       switchMap((collection) => this.collectionService.getContentSource(collection.uuid, false)),
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -81,9 +96,9 @@ export class CollectionSourceControlsComponent implements OnDestroy {
   testConfiguration(contentSource) {
     this.testConfigRunning$.next(true);
     this.subs.push(this.scriptDataService.invoke('harvest', [
-      {name: '-g', value: null},
-      {name: '-a', value: contentSource.oaiSource},
-      {name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId)},
+      { name: '-g', value: null },
+      { name: '-a', value: contentSource.oaiSource },
+      { name: '-i', value: new ContentSourceSetSerializer().Serialize(contentSource.oaiSetId) },
     ], []).pipe(
       getFirstCompletedRemoteData(),
       tap((rd) => {
@@ -95,36 +110,28 @@ export class CollectionSourceControlsComponent implements OnDestroy {
       }),
       // filter out responses that aren't successful since the pinging of the process only needs to happen when the invocation was successful.
       filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-      switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-      getAllCompletedRemoteData(),
-      filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
+      switchMap((rd) => {
+        this.autoRefreshIDs.push(rd.payload.processId);
+        return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+      }),
       map((rd) => rd.payload),
-      hasValueOperator(),
     ).subscribe((process: Process) => {
-        if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-          process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-          // Ping the current process state every 5s
-          setTimeout(() => {
-            this.requestService.setStaleByHrefSubstring(process._links.self.href);
-          }, 5000);
-        }
-        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-          this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed'));
-          this.testConfigRunning$.next(false);
-        }
-        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-          this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => {
-            this.httpClient.get(bitstream._links.content.href, {responseType: 'text'}).subscribe((data: any) => {
-              const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1')
-                .replaceAll('The script has started', '')
-                .replaceAll('The script has completed', '');
-              this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output);
-            });
-          });
-          this.testConfigRunning$.next(false);
-        }
+      if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+        this.notificationsService.error(this.translateService.get('collection.source.controls.test.failed'));
+        this.testConfigRunning$.next(false);
       }
-    ));
+      if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+        this.bitstreamService.findByHref(process._links.output.href).pipe(getFirstSucceededRemoteDataPayload()).subscribe((bitstream) => {
+          this.httpClient.get(bitstream._links.content.href, { responseType: 'text' }).subscribe((data: any) => {
+            const output = data.replaceAll(new RegExp('.*\\@(.*)', 'g'), '$1')
+              .replaceAll('The script has started', '')
+              .replaceAll('The script has completed', '');
+            this.notificationsService.info(this.translateService.get('collection.source.controls.test.completed'), output);
+          });
+        });
+        this.testConfigRunning$.next(false);
+      }
+    }));
   }
 
   /**
@@ -133,8 +140,8 @@ export class CollectionSourceControlsComponent implements OnDestroy {
   importNow() {
     this.importRunning$.next(true);
     this.subs.push(this.scriptDataService.invoke('harvest', [
-      {name: '-r', value: null},
-      {name: '-c', value: this.collection.uuid},
+      { name: '-r', value: null },
+      { name: '-c', value: this.collection.uuid },
     ], [])
       .pipe(
         getFirstCompletedRemoteData(),
@@ -147,31 +154,22 @@ export class CollectionSourceControlsComponent implements OnDestroy {
           }
         }),
         filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-        switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-        getAllCompletedRemoteData(),
-        filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
+        switchMap((rd) => {
+          this.autoRefreshIDs.push(rd.payload.processId);
+          return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+        }),
         map((rd) => rd.payload),
-        hasValueOperator(),
       ).subscribe((process) => {
-          if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-            process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-            // Ping the current process state every 5s
-            setTimeout(() => {
-              this.requestService.setStaleByHrefSubstring(process._links.self.href);
-              this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            }, 5000);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-            this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed'));
-            this.importRunning$.next(false);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-            this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed'));
-            this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            this.importRunning$.next(false);
-          }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+          this.notificationsService.error(this.translateService.get('collection.source.controls.import.failed'));
+          this.importRunning$.next(false);
         }
-      ));
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+          this.notificationsService.success(this.translateService.get('collection.source.controls.import.completed'));
+          this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
+          this.importRunning$.next(false);
+        }
+      }));
   }
 
   /**
@@ -180,8 +178,8 @@ export class CollectionSourceControlsComponent implements OnDestroy {
   resetAndReimport() {
     this.reImportRunning$.next(true);
     this.subs.push(this.scriptDataService.invoke('harvest', [
-      {name: '-o', value: null},
-      {name: '-c', value: this.collection.uuid},
+      { name: '-o', value: null },
+      { name: '-c', value: this.collection.uuid },
     ], [])
       .pipe(
         getFirstCompletedRemoteData(),
@@ -194,31 +192,22 @@ export class CollectionSourceControlsComponent implements OnDestroy {
           }
         }),
         filter((rd) => rd.hasSucceeded && hasValue(rd.payload)),
-        switchMap((rd) => this.processDataService.findById(rd.payload.processId, false)),
-        getAllCompletedRemoteData(),
-        filter((rd) => !rd.isStale && (rd.hasSucceeded || rd.hasFailed)),
+        switchMap((rd) => {
+          this.autoRefreshIDs.push(rd.payload.processId);
+          return this.processDataService.autoRefreshUntilCompletion(rd.payload.processId);
+        }),
         map((rd) => rd.payload),
-        hasValueOperator(),
       ).subscribe((process) => {
-          if (process.processStatus.toString() !== ProcessStatus[ProcessStatus.COMPLETED].toString() &&
-            process.processStatus.toString() !== ProcessStatus[ProcessStatus.FAILED].toString()) {
-            // Ping the current process state every 5s
-            setTimeout(() => {
-              this.requestService.setStaleByHrefSubstring(process._links.self.href);
-              this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            }, 5000);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
-            this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed'));
-            this.reImportRunning$.next(false);
-          }
-          if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
-            this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed'));
-            this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
-            this.reImportRunning$.next(false);
-          }
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.FAILED].toString()) {
+          this.notificationsService.error(this.translateService.get('collection.source.controls.reset.failed'));
+          this.reImportRunning$.next(false);
         }
-      ));
+        if (process.processStatus.toString() === ProcessStatus[ProcessStatus.COMPLETED].toString()) {
+          this.notificationsService.success(this.translateService.get('collection.source.controls.reset.completed'));
+          this.requestService.setStaleByHrefSubstring(this.collection._links.self.href);
+          this.reImportRunning$.next(false);
+        }
+      }));
   }
 
   ngOnDestroy(): void {
@@ -227,5 +216,9 @@ export class CollectionSourceControlsComponent implements OnDestroy {
         sub.unsubscribe();
       }
     });
+
+    this.autoRefreshIDs.forEach((id) => {
+      this.processDataService.stopAutoRefreshing(id);
+    });
   }
 }
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..7b4ac97421 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,7 +1,7 @@
 <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"
+                [disabled]="(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>
@@ -12,13 +12,13 @@
             <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)"
+                [disabled]="(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,8 +44,8 @@
     <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"
+                        [disabled]="(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>
@@ -56,7 +56,7 @@
                     <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)"
+                        [disabled]="(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.spec.ts b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
index fbaac87ed6..fb00b3243b 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.spec.ts
@@ -1,25 +1,48 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CollectionSourceComponent } from './collection-source.component';
-import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
+import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
+import {
+  ContentSource,
+  ContentSourceHarvestType,
+} from '../../../core/shared/content-source.model';
+import { hasValue } from '../../../shared/empty.util';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
 import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { DynamicFormControlModel, DynamicFormService } from '@ng-dynamic-forms/core';
-import { hasValue } from '../../../shared/empty.util';
-import { FormControl, FormGroup } from '@angular/forms';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { RouterStub } from '../../../shared/testing/router.stub';
-import { By } from '@angular/platform-browser';
-import { Collection } from '../../../core/shared/collection.model';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
+import { CollectionSourceComponent } from './collection-source.component';
 
 const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
 const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
@@ -50,29 +73,29 @@ describe('CollectionSourceComponent', () => {
         {
           id: 'dc',
           label: 'Simple Dublin Core',
-          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/'
+          nameSpace: 'http://www.openarchives.org/OAI/2.0/oai_dc/',
         },
         {
           id: 'qdc',
           label: 'Qualified Dublin Core',
-          nameSpace: 'http://purl.org/dc/terms/'
+          nameSpace: 'http://purl.org/dc/terms/',
         },
         {
           id: 'dim',
           label: 'DSpace Intermediate Metadata',
-          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim'
-        }
+          nameSpace: 'http://www.dspace.org/xmlns/dspace/dim',
+        },
       ],
-      _links: { self: { href: 'contentsource-selflink' } }
+      _links: { self: { href: 'contentsource-selflink' } },
     });
     fieldUpdate = {
       field: contentSource,
-      changeType: undefined
+      changeType: undefined,
     };
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
-          [contentSource.uuid]: fieldUpdate
+          [contentSource.uuid]: fieldUpdate,
         }),
         saveAddFieldUpdate: {},
         discardFieldUpdates: {},
@@ -82,15 +105,15 @@ describe('CollectionSourceComponent', () => {
         getLastModified: observableOf(date),
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false),
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
     notificationsService = jasmine.createSpyObj('notificationsService',
       {
         info: infoNotification,
         warning: warningNotification,
-        success: successNotification
-      }
+        success: successNotification,
+      },
     );
     location = jasmine.createSpyObj('location', ['back']);
     formService = Object.assign({
@@ -98,23 +121,23 @@ describe('CollectionSourceComponent', () => {
         const controls = {};
         if (hasValue(fModel)) {
           fModel.forEach((controlModel) => {
-            controls[controlModel.id] = new FormControl((controlModel as any).value);
+            controls[controlModel.id] = new UntypedFormControl((controlModel as any).value);
           });
-          return new FormGroup(controls);
+          return new UntypedFormGroup(controls);
         }
         return undefined;
-      }
+      },
     });
     router = Object.assign(new RouterStub(), {
-      url: 'http://test-url.com/test-url'
+      url: 'http://test-url.com/test-url',
     });
     collection = Object.assign(new Collection(), {
-      uuid: 'fake-collection-id'
+      uuid: 'fake-collection-id',
     });
     collectionService = jasmine.createSpyObj('collectionService', {
       getContentSource: createSuccessfulRemoteDataObject$(contentSource),
       updateContentSource: observableOf(contentSource),
-      getHarvesterEndpoint: observableOf('harvester-endpoint')
+      getHarvesterEndpoint: observableOf('harvester-endpoint'),
     });
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring', 'setStaleByHrefSubstring']);
 
@@ -129,9 +152,9 @@ describe('CollectionSourceComponent', () => {
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
         { provide: Router, useValue: router },
         { provide: CollectionDataService, useValue: collectionService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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 6236c7a5dc..168ef543e8 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
@@ -1,5 +1,14 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import {
   DynamicFormControlModel,
   DynamicFormGroupModel,
@@ -9,29 +18,45 @@ import {
   DynamicOptionControlModel,
   DynamicRadioGroupModel,
   DynamicSelectModel,
-  DynamicTextAreaModel
 } from '@ng-dynamic-forms/core';
-import { Location } from '@angular/common';
 import { TranslateService } from '@ngx-translate/core';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { FormGroup } from '@angular/forms';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { ContentSource, ContentSourceHarvestType } from '../../../core/shared/content-source.model';
-import { Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Collection } from '../../../core/shared/collection.model';
-import { first, map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { cloneDeep } from 'lodash';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { getFirstSucceededRemoteData, getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { MetadataConfig } from '../../../core/shared/metadata-config.model';
-import { INotification } from '../../../shared/notifications/models/notification.model';
-import { RequestService } from '../../../core/data/request.service';
+import cloneDeep from 'lodash/cloneDeep';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  first,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../environments/environment';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
+import {
+  ContentSource,
+  ContentSourceHarvestType,
+} from '../../../core/shared/content-source.model';
+import { MetadataConfig } from '../../../core/shared/metadata-config.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+} from '../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { INotification } from '../../../shared/notifications/models/notification.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
 
 /**
  * Component for managing the content source of the collection
@@ -85,11 +110,11 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     name: 'oaiSource',
     required: true,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
-      required: 'You must provide a set id of the target collection.'
-    }
+      required: 'You must provide a set id of the target collection.',
+    },
   });
 
   /**
@@ -97,7 +122,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   oaiSetIdModel = new DynamicInputModel({
     id: 'oaiSetId',
-    name: 'oaiSetId'
+    name: 'oaiSetId',
   });
 
   /**
@@ -105,7 +130,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
    */
   metadataConfigIdModel = new DynamicSelectModel({
     id: 'metadataConfigId',
-    name: 'metadataConfigId'
+    name: 'metadataConfigId',
   });
 
   /**
@@ -116,15 +141,15 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     name: 'harvestType',
     options: [
       {
-        value: ContentSourceHarvestType.Metadata
+        value: ContentSourceHarvestType.Metadata,
       },
       {
-        value: ContentSourceHarvestType.MetadataAndRef
+        value: ContentSourceHarvestType.MetadataAndRef,
       },
       {
-        value: ContentSourceHarvestType.MetadataAndBitstreams
-      }
-    ]
+        value: ContentSourceHarvestType.MetadataAndBitstreams,
+      },
+    ],
   });
 
   /**
@@ -140,22 +165,22 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     new DynamicFormGroupModel({
       id: 'oaiSourceContainer',
       group: [
-        this.oaiSourceModel
-      ]
+        this.oaiSourceModel,
+      ],
     }),
     new DynamicFormGroupModel({
       id: 'oaiSetContainer',
       group: [
         this.oaiSetIdModel,
-        this.metadataConfigIdModel
-      ]
+        this.metadataConfigIdModel,
+      ],
     }),
     new DynamicFormGroupModel({
       id: 'harvestTypeContainer',
       group: [
-        this.harvestTypeModel
-      ]
-    })
+        this.harvestTypeModel,
+      ],
+    }),
   ];
 
   /**
@@ -164,46 +189,46 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
   formLayout: DynamicFormLayout = {
     oaiSource: {
       grid: {
-        host: 'col-12 d-inline-block'
-      }
+        host: 'col-12 d-inline-block',
+      },
     },
     oaiSetId: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     metadataConfigId: {
       grid: {
-        host: 'col col-sm-6 d-inline-block'
-      }
+        host: 'col col-sm-6 d-inline-block',
+      },
     },
     harvestType: {
       grid: {
         host: 'col-12',
-        option: 'btn-outline-secondary'
-      }
+        option: 'btn-outline-secondary',
+      },
     },
     oaiSetContainer: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     oaiSourceContainer: {
       grid: {
-        host: 'row'
-      }
+        host: 'row',
+      },
     },
     harvestTypeContainer: {
       grid: {
-        host: 'row'
-      }
-    }
+        host: 'row',
+      },
+    },
   };
 
   /**
    * The form group of this form
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * Subscription to update the current form
@@ -280,7 +305,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     const initialContentSource = cloneDeep(this.contentSource);
     this.objectUpdatesService.initialize(this.url, [initialContentSource], new Date());
     this.update$ = this.objectUpdatesService.getFieldUpdates(this.url, [initialContentSource]).pipe(
-      map((updates: FieldUpdates) => updates[initialContentSource.uuid])
+      map((updates: FieldUpdates) => updates[initialContentSource.uuid]),
     );
     this.updateSub = this.update$.subscribe((update: FieldUpdate) => {
       if (update) {
@@ -295,15 +320,15 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
         if (hasValue(field)) {
           this.formGroup.patchValue({
             oaiSourceContainer: {
-              oaiSource: field.oaiSource
+              oaiSource: field.oaiSource,
             },
             oaiSetContainer: {
               oaiSetId: field.oaiSetId,
-              metadataConfigId: configId
+              metadataConfigId: configId,
             },
             harvestTypeContainer: {
-              harvestType: field.harvestType
-            }
+              harvestType: field.harvestType,
+            },
           });
           this.contentSource = cloneDeep(field);
         }
@@ -321,8 +346,8 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     if (this.metadataConfigIdModel.options.length > 0) {
       this.formGroup.patchValue({
         oaiSetContainer: {
-          metadataConfigId: this.metadataConfigIdModel.options[0].value
-        }
+          metadataConfigId: this.metadataConfigIdModel.options[0].value,
+        },
       });
     }
   }
@@ -334,7 +359,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.inputModels.forEach(
       (fieldModel: DynamicFormControlModel) => {
         this.updateFieldTranslation(fieldModel);
-      }
+      },
     );
   }
 
@@ -379,7 +404,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
       getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.getHarvesterEndpoint(uuid)),
-      take(1)
+      take(1),
     ).subscribe((endpoint) => this.requestService.removeByHrefSubstring(endpoint));
     this.requestService.setStaleByHrefSubstring(this.contentSource._links.self.href);
     // Update harvester
@@ -387,7 +412,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
       getFirstSucceededRemoteData(),
       map((col) => col.payload.uuid),
       switchMap((uuid) => this.collectionService.updateContentSource(uuid, this.contentSource)),
-      take(1)
+      take(1),
     ).subscribe((result: ContentSource | INotification) => {
       if (hasValue((result as any).harvestType)) {
         this.clearNotifications();
@@ -434,7 +459,7 @@ export class CollectionSourceComponent extends AbstractTrackableComponent implem
     this.inputModels.forEach(
       (fieldModel: DynamicInputModel) => {
         this.updateContentSourceField(fieldModel, updateHarvestType);
-      }
+      },
     );
     this.saveFieldUpdate();
   }
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
index 00f05f50c0..f3d51f3f61 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.spec.ts
@@ -1,39 +1,44 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
-import { SharedModule } from '../../shared/shared.module';
-import { CollectionDataService } from '../../core/data/collection-data.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { CollectionDataService } from '../../core/data/collection-data.service';
+import { SharedModule } from '../../shared/shared.module';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
+
 describe('EditCollectionPageComponent', () => {
   let comp: EditCollectionPageComponent;
   let fixture: ComponentFixture<EditCollectionPageComponent>;
 
   const routeStub = {
     data: observableOf({
-      dso: { payload: {} }
+      dso: { payload: {} },
     }),
     routeConfig: {
       children: [
         {
           path: 'mockUrl',
           data: {
-            hideReturnButton: false
-          }
-        }
-      ]
+            hideReturnButton: false,
+          },
+        },
+      ],
     },
     snapshot: {
       firstChild: {
         routeConfig: {
-          path: 'mockUrl'
-        }
-      }
-    }
+          path: 'mockUrl',
+        },
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -44,7 +49,7 @@ describe('EditCollectionPageComponent', () => {
         { provide: CollectionDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: routeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
index 62fbb3ee3d..ca0a98be72 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.component.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { Collection } from '../../core/shared/collection.model';
+import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { getCollectionPageRoute } from '../collection-page-routing-paths';
 
 /**
@@ -9,14 +13,14 @@ import { getCollectionPageRoute } from '../collection-page-routing-paths';
  */
 @Component({
   selector: 'ds-edit-collection',
-  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html',
 })
 export class EditCollectionPageComponent extends EditComColPageComponent<Collection> {
   type = 'collection';
 
   public constructor(
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
   ) {
     super(router, route);
   }
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
index 45612be41a..e3791011b1 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.module.ts
@@ -1,18 +1,21 @@
-import { NgModule } from '@angular/core';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { FormModule } from '../../shared/form/form.module';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
 import { SharedModule } from '../../shared/shared.module';
-import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
+import { CollectionFormModule } from '../collection-form/collection-form.module';
+import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
+import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
+import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
-import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
-import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
-import { CollectionFormModule } from '../collection-form/collection-form.module';
 import { CollectionSourceControlsComponent } from './collection-source/collection-source-controls/collection-source-controls.component';
-import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
-import { FormModule } from '../../shared/form/form.module';
-import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
+import { EditCollectionPageRoutingModule } from './edit-collection-page.routing.module';
 
 /**
  * Module that contains all components related to the Edit Collection page administrator functionality
@@ -25,7 +28,8 @@ import { ComcolModule } from '../../shared/comcol/comcol.module';
     CollectionFormModule,
     ResourcePoliciesModule,
     FormModule,
-    ComcolModule
+    ComcolModule,
+    AccessControlFormModule,
   ],
   declarations: [
     EditCollectionPageComponent,
@@ -33,10 +37,10 @@ import { ComcolModule } from '../../shared/comcol/comcol.module';
     CollectionRolesComponent,
     CollectionCurateComponent,
     CollectionSourceComponent,
-
+    CollectionAccessControlComponent,
     CollectionSourceControlsComponent,
-    CollectionAuthorizationsComponent
-  ]
+    CollectionAuthorizationsComponent,
+  ],
 })
 export class EditCollectionPageModule {
 
diff --git a/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts b/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
index 92fc6efeff..3a5aae54ed 100644
--- a/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
+++ b/src/app/collection-page/edit-collection-page/edit-collection-page.routing.module.ts
@@ -1,18 +1,20 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { CollectionAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
 import { CollectionItemMapperComponent } from '../collection-item-mapper/collection-item-mapper.component';
-import { EditCollectionPageComponent } from './edit-collection-page.component';
+import { CollectionAccessControlComponent } from './collection-access-control/collection-access-control.component';
+import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
+import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
 import { CollectionMetadataComponent } from './collection-metadata/collection-metadata.component';
 import { CollectionRolesComponent } from './collection-roles/collection-roles.component';
 import { CollectionSourceComponent } from './collection-source/collection-source.component';
-import { CollectionCurateComponent } from './collection-curate/collection-curate.component';
-import { CollectionAuthorizationsComponent } from './collection-authorizations/collection-authorizations.component';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
-import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
-import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
-import { CollectionAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard';
+import { EditCollectionPageComponent } from './edit-collection-page.component';
 
 /**
  * Routing module that handles the routing for the Edit Collection page administrator functionality
@@ -23,7 +25,7 @@ import { CollectionAdministratorGuard } from '../../core/data/feature-authorizat
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { breadcrumbKey: 'collection.edit' },
         component: EditCollectionPageComponent,
@@ -32,7 +34,7 @@ import { CollectionAdministratorGuard } from '../../core/data/feature-authorizat
           {
             path: '',
             redirectTo: 'metadata',
-            pathMatch: 'full'
+            pathMatch: 'full',
           },
           {
             path: 'metadata',
@@ -40,25 +42,30 @@ import { CollectionAdministratorGuard } from '../../core/data/feature-authorizat
             data: {
               title: 'collection.edit.tabs.metadata.title',
               hideReturnButton: true,
-              showBreadcrumbs: true
-            }
+              showBreadcrumbs: true,
+            },
           },
           {
             path: 'roles',
             component: CollectionRolesComponent,
-            data: { title: 'collection.edit.tabs.roles.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.roles.title', showBreadcrumbs: true },
           },
           {
             path: 'source',
             component: CollectionSourceComponent,
-            data: { title: 'collection.edit.tabs.source.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.source.title', showBreadcrumbs: true },
           },
           {
             path: 'curate',
             component: CollectionCurateComponent,
-            data: { title: 'collection.edit.tabs.curate.title', showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.curate.title', showBreadcrumbs: true },
           },
-/*          {
+          {
+            path: 'access-control',
+            component: CollectionAccessControlComponent,
+            data: { title: 'collection.edit.tabs.access-control.title', showBreadcrumbs: true },
+          },
+          /*          {
             path: 'authorizations',
             component: CollectionAuthorizationsComponent,
             data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true }
@@ -70,39 +77,39 @@ import { CollectionAdministratorGuard } from '../../core/data/feature-authorizat
               {
                 path: 'create',
                 resolve: {
-                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                  resourcePolicyTarget: ResourcePolicyTargetResolver,
                 },
                 component: ResourcePolicyCreateComponent,
-                data: { title: 'resource-policies.create.page.title' }
+                data: { title: 'resource-policies.create.page.title' },
               },
               {
                 path: 'edit',
                 resolve: {
-                  resourcePolicy: ResourcePolicyResolver
+                  resourcePolicy: ResourcePolicyResolver,
                 },
                 component: ResourcePolicyEditComponent,
-                data: { title: 'resource-policies.edit.page.title' }
+                data: { title: 'resource-policies.edit.page.title' },
               },
               {
                 path: '',
                 component: CollectionAuthorizationsComponent,
-                data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true }
-              }
-            ]
+                data: { title: 'collection.edit.tabs.authorizations.title', showBreadcrumbs: true },
+              },
+            ],
           },
           {
             path: 'mapper',
             component: CollectionItemMapperComponent,
-            data: { title: 'collection.edit.tabs.item-mapper.title', hideReturnButton: true, showBreadcrumbs: true }
+            data: { title: 'collection.edit.tabs.item-mapper.title', hideReturnButton: true, showBreadcrumbs: true },
           },
-        ]
-      }
-    ])
+        ],
+      },
+    ]),
   ],
   providers: [
     ResourcePolicyResolver,
-    ResourcePolicyTargetResolver
-  ]
+    ResourcePolicyTargetResolver,
+  ],
 })
 export class EditCollectionPageRoutingModule {
 
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 0403a7ecad..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,8 +2,8 @@
   <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: collection?.name } }}</h2>
-        <ds-themed-item-metadata [updateService]="itemTemplateService" [item]="itemRD?.payload"></ds-themed-item-metadata>
+        <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>
       <ds-themed-loading *ngIf="itemRD?.isLoading" [message]="'collection.edit.template.loading' | translate"></ds-themed-loading>
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
index 72b776dd7d..068f799681 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.spec.ts
@@ -1,16 +1,24 @@
-import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared/shared.module';
-import { RouterTestingModule } from '@angular/router/testing';
 import { CommonModule } from '@angular/common';
-import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { Collection } from '../../core/shared/collection.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
 import { getCollectionEditRoute } from '../collection-page-routing-paths';
+import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
 
 describe('EditItemTemplatePageComponent', () => {
   let comp: EditItemTemplatePageComponent;
@@ -22,19 +30,19 @@ describe('EditItemTemplatePageComponent', () => {
     collection = Object.assign(new Collection(), {
       uuid: 'collection-id',
       id: 'collection-id',
-      name: 'Fake Collection'
+      name: 'Fake Collection',
     });
     itemTemplateService = jasmine.createSpyObj('itemTemplateService', {
-      findByCollectionID: createSuccessfulRemoteDataObject$({})
+      findByCollectionID: createSuccessfulRemoteDataObject$({}),
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       declarations: [EditItemTemplatePageComponent],
       providers: [
         { provide: ItemTemplateDataService, useValue: itemTemplateService },
-        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } }
+        { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: createSuccessfulRemoteDataObject(collection) }) } } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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 5d29eb7f73..9dfe14e72d 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
@@ -1,14 +1,23 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
-import { ActivatedRoute } from '@angular/router';
-import { first, map, switchMap } from 'rxjs/operators';
-import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
-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 { getCollectionEditRoute } from '../collection-page-routing-paths';
 
 @Component({
   selector: 'ds-edit-item-template-page',
@@ -35,8 +44,11 @@ export class EditItemTemplatePageComponent implements OnInit {
    */
   AlertTypeEnum = AlertType;
 
-  constructor(protected route: ActivatedRoute,
-              public itemTemplateService: ItemTemplateDataService) {
+  constructor(
+    protected route: ActivatedRoute,
+    public itemTemplateService: ItemTemplateDataService,
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   ngOnInit(): void {
diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
index 2712a194c0..ced1ca9323 100644
--- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
+++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.spec.ts
@@ -1,19 +1,23 @@
 import { first } from 'rxjs/operators';
 
-import { ItemTemplatePageResolver } from './item-template-page.resolver';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ItemTemplatePageResolver } from './item-template-page.resolver';
 
 describe('ItemTemplatePageResolver', () => {
   describe('resolve', () => {
     let resolver: ItemTemplatePageResolver;
     let itemTemplateService: any;
+    let dsoNameService: DSONameServiceMock;
     const uuid = '1234-65487-12354-1235';
 
     beforeEach(() => {
       itemTemplateService = {
-        findByCollectionID: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findByCollectionID: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       };
-      resolver = new ItemTemplatePageResolver(itemTemplateService);
+      dsoNameService = new DSONameServiceMock();
+      resolver = new ItemTemplatePageResolver(dsoNameService as DSONameService, itemTemplateService);
     });
 
     it('should resolve an item template with the correct id', (done) => {
@@ -23,7 +27,7 @@ describe('ItemTemplatePageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
index 719a04196f..08553d9e93 100644
--- a/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
+++ b/src/app/collection-page/edit-item-template-page/item-template-page.resolver.ts
@@ -1,18 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Item } from '../../core/shared/item.model';
-import { ItemTemplateDataService } from '../../core/data/item-template-data.service';
-import { Observable } from 'rxjs';
-import { followLink } from '../../shared/utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific collection's item template before the route is activated
  */
 @Injectable()
 export class ItemTemplatePageResolver implements Resolve<RemoteData<Item>> {
-  constructor(private itemTemplateService: ItemTemplateDataService) {
+  constructor(
+    public dsoNameService: DSONameService,
+    private itemTemplateService: ItemTemplateDataService,
+  ) {
   }
 
   /**
diff --git a/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts b/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
index b53f4e6c45..3cf4eafdc7 100644
--- a/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
+++ b/src/app/collection-page/edit-item-template-page/themed-edit-item-template-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { EditItemTemplatePageComponent } from './edit-item-template-page.component';
 
diff --git a/src/app/collection-page/themed-collection-page.component.ts b/src/app/collection-page/themed-collection-page.component.ts
index 2faf418423..ff4e246e7d 100644
--- a/src/app/collection-page/themed-collection-page.component.ts
+++ b/src/app/collection-page/themed-collection-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CollectionPageComponent } from './collection-page.component';
 
diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts
index e2a2bb748f..95acc9dd86 100644
--- a/src/app/community-list-page/community-list-datasource.ts
+++ b/src/app/community-list-page/community-list-datasource.ts
@@ -1,10 +1,18 @@
-import { hasValue } from '../shared/empty.util';
-import { CommunityListService} from './community-list-service';
-import { CollectionViewer, DataSource } from '@angular/cdk/collections';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import {
+  CollectionViewer,
+  DataSource,
+} from '@angular/cdk/collections';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { finalize } from 'rxjs/operators';
-import { FlatNode } from './flat-node.model';
+
 import { FindListOptions } from '../core/data/find-list-options.model';
+import { hasValue } from '../shared/empty.util';
+import { CommunityListService } from './community-list-service';
+import { FlatNode } from './flat-node.model';
 
 /**
  * DataSource object needed by a CDK Tree to render its nodes.
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-page.component.spec.ts b/src/app/community-list-page/community-list-page.component.spec.ts
index 080a0a9e18..60933a0677 100644
--- a/src/app/community-list-page/community-list-page.component.spec.ts
+++ b/src/app/community-list-page/community-list-page.component.spec.ts
@@ -1,9 +1,17 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { CommunityListPageComponent } from './community-list-page.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { CommunityListPageComponent } from './community-list-page.component';
 
 describe('CommunityListPageComponent', () => {
   let component: CommunityListPageComponent;
@@ -15,7 +23,7 @@ describe('CommunityListPageComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
+            useClass: TranslateLoaderMock,
           },
         }),
       ],
diff --git a/src/app/community-list-page/community-list-page.module.ts b/src/app/community-list-page/community-list-page.module.ts
index 18c28068be..330e3f0346 100644
--- a/src/app/community-list-page/community-list-page.module.ts
+++ b/src/app/community-list-page/community-list-page.module.ts
@@ -1,18 +1,20 @@
+import { CdkTreeModule } from '@angular/cdk/tree';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
+import { CommunityListComponent } from './community-list/community-list.component';
+import { ThemedCommunityListComponent } from './community-list/themed-community-list.component';
 import { CommunityListPageComponent } from './community-list-page.component';
 import { CommunityListPageRoutingModule } from './community-list-page.routing.module';
-import { CommunityListComponent } from './community-list/community-list.component';
 import { ThemedCommunityListPageComponent } from './themed-community-list-page.component';
-import { ThemedCommunityListComponent } from './community-list/themed-community-list.component';
 
 
 const DECLARATIONS = [
   CommunityListPageComponent,
   CommunityListComponent,
   ThemedCommunityListPageComponent,
-  ThemedCommunityListComponent
+  ThemedCommunityListComponent,
 ];
 /**
  * The page which houses a title and the community list, as described in community-list.component
@@ -21,13 +23,15 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    CommunityListPageRoutingModule
+    CommunityListPageRoutingModule,
+    CdkTreeModule,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
     ...DECLARATIONS,
+    CdkTreeModule,
   ],
 })
 export class CommunityListPageModule {
diff --git a/src/app/community-list-page/community-list-page.routing.module.ts b/src/app/community-list-page/community-list-page.routing.module.ts
index 1754b1b7cf..98d305c312 100644
--- a/src/app/community-list-page/community-list-page.routing.module.ts
+++ b/src/app/community-list-page/community-list-page.routing.module.ts
@@ -1,10 +1,10 @@
+import { CdkTreeModule } from '@angular/cdk/tree';
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { CdkTreeModule } from '@angular/cdk/tree';
 
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { CommunityListService } from './community-list-service';
 import { ThemedCommunityListPageComponent } from './themed-community-list-page.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 /**
  * RouterModule to help navigate to the page with the community list tree
@@ -17,14 +17,14 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         component: ThemedCommunityListPageComponent,
         pathMatch: 'full',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
-        data: { title: 'communityList.tabTitle', breadcrumbKey: 'communityList' }
-      }
+        data: { title: 'communityList.tabTitle', breadcrumbKey: 'communityList' },
+      },
     ]),
     CdkTreeModule,
   ],
-  providers: [CommunityListService]
+  providers: [CommunityListService],
 })
 export class CommunityListPageRoutingModule {
 }
diff --git a/src/app/community-list-page/community-list-service.spec.ts b/src/app/community-list-page/community-list-service.spec.ts
index 410dd9f804..28d3cfe1a9 100644
--- a/src/app/community-list-page/community-list-service.spec.ts
+++ b/src/app/community-list-page/community-list-service.spec.ts
@@ -1,23 +1,36 @@
-import { inject, TestBed } from '@angular/core/testing';
+import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { AppState } from '../app.reducer';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { buildPaginatedList } from '../core/data/paginated-list.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { StoreMock } from '../shared/testing/store.mock';
-import { CommunityListService, toFlatNode } from './community-list-service';
-import { CollectionDataService } from '../core/data/collection-data.service';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { Community } from '../core/shared/community.model';
-import { Collection } from '../core/shared/collection.model';
-import { PageInfo } from '../core/shared/page-info.model';
-import { FlatNode } from './flat-node.model';
-import { FindListOptions } from '../core/data/find-list-options.model';
 import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment.test';
 
+import { AppState } from '../app.reducer';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { CollectionDataService } from '../core/data/collection-data.service';
+import { CommunityDataService } from '../core/data/community-data.service';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
+import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
+import { PageInfo } from '../core/shared/page-info.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { StoreMock } from '../shared/testing/store.mock';
+import {
+  CommunityListService,
+  toFlatNode,
+} from './community-list-service';
+import { FlatNode } from './flat-node.model';
+
 describe('CommunityListService', () => {
   let store: StoreMock<AppState>;
   const standardElementsPerPage = 2;
@@ -38,34 +51,34 @@ describe('CommunityListService', () => {
       id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
       uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     }),
-      Object.assign(new Community(), {
-        id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-        uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-      })
+    Object.assign(new Community(), {
+      id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+      uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    }),
     ];
     mockCollectionsPage1 = [
       Object.assign(new Collection(), {
         id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
         uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
-        name: 'Collection 1'
+        name: 'Collection 1',
       }),
       Object.assign(new Collection(), {
         id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
         uuid: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
-        name: 'Collection 2'
-      })
+        name: 'Collection 2',
+      }),
     ];
     mockCollectionsPage2 = [
       Object.assign(new Collection(), {
         id: 'a5159760-f362-4659-9e81-e3253ad91ede',
         uuid: 'a5159760-f362-4659-9e81-e3253ad91ede',
-        name: 'Collection 3'
+        name: 'Collection 3',
       }),
       Object.assign(new Collection(), {
         id: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
         uuid: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
-        name: 'Collection 4'
-      })
+        name: 'Collection 4',
+      }),
     ];
     mockListOfTopCommunitiesPage1 = [
       Object.assign(new Community(), {
@@ -164,7 +177,7 @@ describe('CommunityListService', () => {
         } else {
           return createFailedRemoteDataObject$();
         }
-      }
+      },
     };
     collectionDataServiceStub = {
       findByParent(parentUUID: string, options: FindListOptions = {}) {
@@ -189,7 +202,7 @@ describe('CommunityListService', () => {
         } else {
           return createFailedRemoteDataObject$();
         }
-      }
+      },
     };
     TestBed.configureTestingModule({
       providers: [CommunityListService,
@@ -217,7 +230,7 @@ describe('CommunityListService', () => {
 
           service.loadCommunities({
             currentPage: 2,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, null)
             .pipe(take(1))
             .subscribe((value) => {
@@ -246,7 +259,7 @@ describe('CommunityListService', () => {
         beforeEach((done) => {
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, null)
             .pipe(take(1))
             .subscribe((value) => {
@@ -279,7 +292,7 @@ describe('CommunityListService', () => {
           });
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, expandedNodes)
             .pipe(take(1))
             .subscribe((value) => {
@@ -307,7 +320,7 @@ describe('CommunityListService', () => {
           const expandedNodes = [communityFlatNode];
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, expandedNodes)
             .pipe(take(1))
             .subscribe((value) => {
@@ -332,7 +345,7 @@ describe('CommunityListService', () => {
           const expandedNodes = [communityFlatNode];
           service.loadCommunities({
             currentPage: 1,
-            sort: new SortOptions('dc.title', SortDirection.ASC)
+            sort: new SortOptions('dc.title', SortDirection.ASC),
           }, expandedNodes)
             .pipe(take(1))
             .subscribe((value) => {
@@ -429,8 +442,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 2' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 2' }],
+          },
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
@@ -461,8 +474,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+          },
         });
         let flatNodeList;
         describe('should return list containing only flatnode corresponding to that community', () => {
@@ -495,8 +508,8 @@ describe('CommunityListService', () => {
             collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
             metadata: {
               'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-              'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-            }
+              'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+            },
           });
           let flatNodeList;
           beforeEach((done) => {
@@ -540,8 +553,8 @@ describe('CommunityListService', () => {
               collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
               metadata: {
                 'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-                'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-              }
+                'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+              },
             });
             const communityFlatNode = toFlatNode(communityWithCollections, observableOf(true), 0, true, null);
             communityFlatNode.currentCollectionPage = 2;
@@ -591,8 +604,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 1' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 1' }],
+          },
         });
         service.getIsExpandable(communityWithSubcoms).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
@@ -607,8 +620,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockCollectionsPage1)),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 2' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 2' }],
+          },
         });
         service.getIsExpandable(communityWithCollections).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(true);
@@ -625,8 +638,8 @@ describe('CommunityListService', () => {
           collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
           metadata: {
             'dc.description': [{ language: 'en_US', value: 'no subcoms, no coll' }],
-            'dc.title': [{ language: 'en_US', value: 'Community 3' }]
-          }
+            'dc.title': [{ language: 'en_US', value: 'Community 3' }],
+          },
         });
         service.getIsExpandable(communityWithNoSubcomsOrColls).pipe(take(1)).subscribe((result) => {
           expect(result).toEqual(false);
diff --git a/src/app/community-list-page/community-list-service.ts b/src/app/community-list-page/community-list-service.ts
index 99e9dbeb0d..705dcc7e5d 100644
--- a/src/app/community-list-page/community-list-service.ts
+++ b/src/app/community-list-page/community-list-service.ts
@@ -1,31 +1,57 @@
 /* eslint-disable max-classes-per-file */
-import { Inject, Injectable } from '@angular/core';
-import { createSelector, Store } from '@ngrx/store';
-
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { filter, map, switchMap } from 'rxjs/operators';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  createSelector,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
+import { v4 as uuidv4 } from 'uuid';
 
 import { AppState } from '../app.reducer';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { Community } from '../core/shared/community.model';
-import { Collection } from '../core/shared/collection.model';
-import { PageInfo } from '../core/shared/page-info.model';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { RemoteData } from '../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../core/data/paginated-list.model';
+import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths';
+import { getCommunityPageRoute } from '../community-page/community-page-routing-paths';
 import { CollectionDataService } from '../core/data/collection-data.service';
+import { CommunityDataService } from '../core/data/community-data.service';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+} from '../core/shared/operators';
+import { PageInfo } from '../core/shared/page-info.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { followLink } from '../shared/utils/follow-link-config.model';
 import { CommunityListSaveAction } from './community-list.actions';
 import { CommunityListState } from './community-list.reducer';
-import { getCommunityPageRoute } from '../community-page/community-page-routing-paths';
-import { getCollectionPageRoute } from '../collection-page/collection-page-routing-paths';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../core/shared/operators';
-import { followLink } from '../shared/utils/follow-link-config.model';
 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';
 
-// 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)),
@@ -45,7 +71,7 @@ export const toFlatNode = (
   isExpandable: Observable<boolean>,
   level: number,
   isExpanded: boolean,
-  parent?: FlatNode
+  parent?: FlatNode,
 ): FlatNode => ({
   isExpandable$: isExpandable,
   name: c.name,
@@ -64,7 +90,7 @@ export const toFlatNode = (
 export const showMoreFlatNode = (
   id: string,
   level: number,
-  parent: FlatNode
+  parent: FlatNode,
 ): FlatNode => ({
   isExpandable$: observableOf(false),
   name: 'Show More Flatnode',
@@ -94,13 +120,13 @@ export class CommunityListService {
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private communityDataService: CommunityDataService,
     private collectionDataService: CollectionDataService,
-    private store: Store<any>
+    private store: Store<any>,
   ) {
     this.pageSize = appConfig.communityList.pageSize;
   }
 
   private configOnePage: FindListOptions = Object.assign(new FindListOptions(), {
-    elementsPerPage: 1
+    elementsPerPage: 1,
   });
 
   saveCommunityListStateToStore(expandedNodes: FlatNode[], loadingNode: FlatNode): void {
@@ -137,7 +163,7 @@ export class CommunityListService {
           newPageInfo = Object.assign({}, coms[0].pageInfo, { currentPage });
         }
         return buildPaginatedList(newPageInfo, newPage);
-      })
+      }),
     );
     return topComs$.pipe(
       switchMap((topComs: PaginatedList<Community>) => this.transformListOfCommunities(topComs, 0, null, expandedNodes)),
@@ -150,15 +176,15 @@ export class CommunityListService {
    */
   private getTopCommunities(options: FindListOptions): Observable<PaginatedList<Community>> {
     return this.communityDataService.findTop({
-        currentPage: options.currentPage,
-        elementsPerPage: this.pageSize,
-        sort: {
-          field: options.sort.field,
-          direction: options.sort.direction
-        }
+      currentPage: options.currentPage,
+      elementsPerPage: this.pageSize,
+      sort: {
+        field: options.sort.field,
+        direction: options.sort.direction,
       },
-      followLink('subcommunities', { findListOptions: this.configOnePage }),
-      followLink('collections', { findListOptions: this.configOnePage }))
+    },
+    followLink('subcommunities', { findListOptions: this.configOnePage }),
+    followLink('collections', { findListOptions: this.configOnePage }))
       .pipe(
         getFirstSucceededRemoteData(),
         map((results) => results.payload),
@@ -173,9 +199,9 @@ export class CommunityListService {
    * @param expandedNodes                 List of expanded nodes; if a node is not expanded its subcommunities and collections need not be added to the list
    */
   public transformListOfCommunities(listOfPaginatedCommunities: PaginatedList<Community>,
-                                    level: number,
-                                    parent: FlatNode,
-                                    expandedNodes: FlatNode[]): Observable<FlatNode[]> {
+    level: number,
+    parent: FlatNode,
+    expandedNodes: FlatNode[]): Observable<FlatNode[]> {
     if (isNotEmpty(listOfPaginatedCommunities.page)) {
       let currentPage = listOfPaginatedCommunities.currentPage;
       if (isNotEmpty(parent)) {
@@ -186,7 +212,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 +225,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
@@ -222,11 +248,11 @@ export class CommunityListService {
       let subcoms = [];
       for (let i = 1; i <= currentCommunityPage; i++) {
         const nextSetOfSubcommunitiesPage = this.communityDataService.findByParent(community.uuid, {
-            elementsPerPage: this.pageSize,
-            currentPage: i
-          },
-          followLink('subcommunities', { findListOptions: this.configOnePage }),
-          followLink('collections', { findListOptions: this.configOnePage }))
+          elementsPerPage: this.pageSize,
+          currentPage: i,
+        },
+        followLink('subcommunities', { findListOptions: this.configOnePage }),
+        followLink('collections', { findListOptions: this.configOnePage }))
           .pipe(
             getFirstCompletedRemoteData(),
             switchMap((rd: RemoteData<PaginatedList<Community>>) => {
@@ -235,7 +261,7 @@ export class CommunityListService {
               } else {
                 return observableOf([]);
               }
-            })
+            }),
           );
 
         subcoms = [...subcoms, nextSetOfSubcommunitiesPage];
@@ -248,7 +274,7 @@ export class CommunityListService {
       for (let i = 1; i <= currentCollectionPage; i++) {
         const nextSetOfCollectionsPage = this.collectionDataService.findByParent(community.uuid, {
           elementsPerPage: this.pageSize,
-          currentPage: i
+          currentPage: i,
         })
           .pipe(
             getFirstCompletedRemoteData(),
@@ -257,7 +283,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,14 +301,12 @@ 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)
    */
   public getIsExpandable(community: Community): Observable<boolean> {
-    let hasSubcoms$: Observable<boolean>;
-    let hasColls$: Observable<boolean>;
-    hasSubcoms$ = this.communityDataService.findByParent(community.uuid, this.configOnePage)
+    const hasSubcoms$ = this.communityDataService.findByParent(community.uuid, this.configOnePage)
       .pipe(
         map((rd: RemoteData<PaginatedList<Community>>) => {
           if (hasValue(rd) && hasValue(rd.payload)) {
@@ -293,7 +317,7 @@ export class CommunityListService {
         }),
       );
 
-    hasColls$ = this.collectionDataService.findByParent(community.uuid, this.configOnePage)
+    const hasColls$ = this.collectionDataService.findByParent(community.uuid, this.configOnePage)
       .pipe(
         map((rd: RemoteData<PaginatedList<Collection>>) => {
           if (hasValue(rd) && hasValue(rd.payload)) {
@@ -304,12 +328,9 @@ export class CommunityListService {
         }),
       );
 
-    let hasChildren$: Observable<boolean>;
-    hasChildren$ = observableCombineLatest(hasSubcoms$, hasColls$).pipe(
-      map(([hasSubcoms, hasColls]: [boolean, boolean]) => hasSubcoms || hasColls)
+    return observableCombineLatest(hasSubcoms$, hasColls$).pipe(
+      map(([hasSubcoms, hasColls]: [boolean, boolean]) => hasSubcoms || hasColls),
     );
-
-    return hasChildren$;
   }
 
 }
diff --git a/src/app/community-list-page/community-list.actions.ts b/src/app/community-list-page/community-list.actions.ts
index 8e8d6d87cf..47c72af9f7 100644
--- a/src/app/community-list-page/community-list.actions.ts
+++ b/src/app/community-list-page/community-list.actions.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { type } from '../shared/ngrx/type';
 import { FlatNode } from './flat-node.model';
 
@@ -7,7 +8,7 @@ import { FlatNode } from './flat-node.model';
  */
 
 export const CommunityListActionTypes = {
-  SAVE: type('dspace/community-list-page/SAVE')
+  SAVE: type('dspace/community-list-page/SAVE'),
 };
 
 /**
diff --git a/src/app/community-list-page/community-list.reducer.spec.ts b/src/app/community-list-page/community-list.reducer.spec.ts
index 0d0f5c7580..abbd16d4cd 100644
--- a/src/app/community-list-page/community-list.reducer.spec.ts
+++ b/src/app/community-list-page/community-list.reducer.spec.ts
@@ -1,11 +1,12 @@
 import { of as observableOf } from 'rxjs';
+
 import { buildPaginatedList } from '../core/data/paginated-list.model';
 import { Community } from '../core/shared/community.model';
 import { PageInfo } from '../core/shared/page-info.model';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { toFlatNode } from './community-list-service';
 import { CommunityListSaveAction } from './community-list.actions';
 import { CommunityListReducer } from './community-list.reducer';
+import { toFlatNode } from './community-list-service';
 
 describe('communityListReducer', () => {
   const mockSubcommunities1Page1 = [Object.assign(new Community(), {
@@ -20,7 +21,7 @@ describe('communityListReducer', () => {
       subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
       collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
       name: 'community1',
-    }), observableOf(true), 0, false, null
+    }), observableOf(true), 0, false, null,
   );
 
   it ('should set init state of the expandedNodes and loadingNode', () => {
diff --git a/src/app/community-list-page/community-list.reducer.ts b/src/app/community-list-page/community-list.reducer.ts
index 99c8350cf4..7afcabf067 100644
--- a/src/app/community-list-page/community-list.reducer.ts
+++ b/src/app/community-list-page/community-list.reducer.ts
@@ -1,4 +1,8 @@
-import { CommunityListActions, CommunityListActionTypes, CommunityListSaveAction } from './community-list.actions';
+import {
+  CommunityListActions,
+  CommunityListActionTypes,
+  CommunityListSaveAction,
+} from './community-list.actions';
 import { FlatNode } from './flat-node.model';
 
 /**
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 821cb58473..ea34e02d56 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,17 +1,17 @@
 <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">
-        <a *ngIf="node!==loadingNode" [routerLink]="[]" (click)="getNextPage(node)"
+        <button *ngIf="(dataSource.loading$ | async) !== true" (click)="getNextPage(node)"
            class="btn btn-outline-primary btn-sm" role="button">
            <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
-        </a>
+        </button>
         <ds-themed-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-themed-loading"></ds-themed-loading>
       </div>
     </div>
@@ -24,27 +24,32 @@
   <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 ' + node.name"
-              [attr.aria-label]="'toggle ' + node.name"
+      <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'">
+              data-test="expand-button">
         <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>
-      <h5 class="align-middle pt-2">
-        <a [routerLink]="node.route" class="lead">
-          {{node.name}}
-        </a>
-      </h5>
+      <!--Don't render the button when non-expandable otherwise it's still accessible, instead render this placeholder-->
+      <span *ngIf="(hasChild(null, node) | async) !== true" aria-hidden="true" class="btn btn-default invisible">
+        <span class="fa fa-chevron-right"></span>
+      </span>
+      <div class="d-flex flex-row">
+        <span class="align-middle pt-2 lead">
+          <a [routerLink]="node.route" class="lead">{{ 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>
+        </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>
@@ -53,10 +58,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>
@@ -64,23 +68,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">
-          {{node.name}}
-        </a>
+        <a [routerLink]="node.route" class="lead">{{ 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 575edf14e8..434a14a85f 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
@@ -1,21 +1,43 @@
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
-import { CommunityListComponent } from './community-list.component';
-import { CommunityListService, showMoreFlatNode, toFlatNode } from '../community-list-service';
 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 { RouterTestingModule } from '@angular/router/testing';
-import { Community } from '../../core/shared/community.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { Collection } from '../../core/shared/collection.model';
-import { of as observableOf } from 'rxjs';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { RouterLinkWithHref } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { v4 as uuidv4 } from 'uuid';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  CommunityListService,
+  showMoreFlatNode,
+  toFlatNode,
+} from '../community-list-service';
 import { FlatNode } from '../flat-node.model';
+import { CommunityListComponent } from './community-list.component';
 
 describe('CommunityListComponent', () => {
   let component: CommunityListComponent;
@@ -26,11 +48,11 @@ describe('CommunityListComponent', () => {
     uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     name: 'subcommunity1',
   }),
-    Object.assign(new Community(), {
-      id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-      uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
-      name: 'subcommunity2',
-    })
+  Object.assign(new Community(), {
+    id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    uuid: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
+    name: 'subcommunity2',
+  }),
   ];
   const mockCollectionsPage1 = [
     Object.assign(new Collection(), {
@@ -42,7 +64,7 @@ describe('CommunityListComponent', () => {
       id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
       uuid: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
       name: 'collection2',
-    })
+    }),
   ];
   const mockCollectionsPage2 = [
     Object.assign(new Collection(), {
@@ -54,7 +76,7 @@ describe('CommunityListComponent', () => {
       id: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
       uuid: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
       name: 'collection4',
-    })
+    }),
   ];
 
   const mockTopCommunitiesWithChildrenArrays = [
@@ -85,7 +107,7 @@ describe('CommunityListComponent', () => {
         subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockSubcommunities1Page1)),
         collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         name: 'community1',
-      }), observableOf(true), 0, false, null
+      }), observableOf(true), 0, false, null,
     ),
     toFlatNode(
       Object.assign(new Community(), {
@@ -94,7 +116,7 @@ describe('CommunityListComponent', () => {
         subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
         name: 'community2',
-      }), observableOf(true), 0, false, null
+      }), observableOf(true), 0, false, null,
     ),
     toFlatNode(
       Object.assign(new Community(), {
@@ -103,7 +125,7 @@ describe('CommunityListComponent', () => {
         subcommunities: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         collections: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
         name: 'community3',
-      }), observableOf(false), 0, false, null
+      }), observableOf(false), 0, false, null,
     ),
   ];
   let communityListServiceStub;
@@ -137,7 +159,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));
           }
@@ -164,39 +186,40 @@ 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);
         }
-      }
+      },
     };
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
+            useClass: TranslateLoaderMock,
           },
         }),
         CdkTreeModule,
-        RouterTestingModule],
+        RouterTestingModule,
+        RouterLinkWithHref],
       declarations: [CommunityListComponent],
       providers: [CommunityListComponent,
-        { provide: CommunityListService, useValue: communityListServiceStub },],
+        { provide: CommunityListService, useValue: communityListServiceStub }],
       schemas: [CUSTOM_ELEMENTS_SCHEMA],
     })
       .compileComponents();
@@ -230,16 +253,22 @@ describe('CommunityListComponent', () => {
     expect(showMoreEl).toBeTruthy();
   });
 
+  it('should not render the show more button as an empty link', () => {
+    const debugElements = fixture.debugElement.queryAll(By.directive(RouterLinkWithHref));
+    expect(debugElements).toBeTruthy();
+  });
+
   describe('when show more of top communities is clicked', () => {
     beforeEach(fakeAsync(() => {
-      const showMoreLink = fixture.debugElement.query(By.css('.show-more-node a'));
+      const showMoreLink = fixture.debugElement.query(By.css('.show-more-node .btn-outline-primary'));
       showMoreLink.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
     }));
+
     it('tree contains maximum of currentPage (2) * (2) elementsPerPage of first top communities, or less if there are less communities (3)', () => {
       const expandableNodesFound = fixture.debugElement.queryAll(By.css('.expandable-node a'));
       const childlessNodesFound = fixture.debugElement.queryAll(By.css('.childless-node a'));
@@ -291,12 +320,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();
         }
@@ -306,17 +337,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 556387da25..369e51ea12 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
@@ -1,12 +1,21 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { take } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CommunityListService} from '../community-list-service';
-import { CommunityListDatasource } from '../community-list-datasource';
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { isEmpty } from '../../shared/empty.util';
-import { FlatNode } from '../flat-node.model';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { take } from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { isEmpty } from '../../shared/empty.util';
+import { CommunityListDatasource } from '../community-list-datasource';
+import { CommunityListService } from '../community-list-service';
+import { FlatNode } from '../flat-node.model';
 
 /**
  * A tree-structured list of nodes representing the communities, their subCommunities and collections.
@@ -18,6 +27,7 @@ import { FindListOptions } from '../../core/data/find-list-options.model';
 @Component({
   selector: 'ds-community-list',
   templateUrl: './community-list.component.html',
+  styleUrls: ['./community-list.component.scss'],
 })
 export class CommunityListComponent implements OnInit, OnDestroy {
 
@@ -25,14 +35,16 @@ export class CommunityListComponent implements OnInit, OnDestroy {
   public loadingNode: FlatNode;
 
   treeControl = new FlatTreeControl<FlatNode>(
-    (node: FlatNode) => node.level, (node: FlatNode) => true
+    (node: FlatNode) => node.level, (node: FlatNode) => true,
   );
-
   dataSource: CommunityListDatasource;
-
   paginationConfig: FindListOptions;
+  trackBy = (index, node: FlatNode) => node.id;
 
-  constructor(private communityListService: CommunityListService) {
+  constructor(
+    protected communityListService: CommunityListService,
+    public dsoNameService: DSONameService,
+  ) {
     this.paginationConfig = new FindListOptions();
     this.paginationConfig.elementsPerPage = 2;
     this.paginationConfig.currentPage = 1;
@@ -54,24 +66,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);
@@ -88,26 +110,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/community-list/themed-community-list.component.ts b/src/app/community-list-page/community-list/themed-community-list.component.ts
index 4a986e737c..9e494bdf47 100644
--- a/src/app/community-list-page/community-list/themed-community-list.component.ts
+++ b/src/app/community-list-page/community-list/themed-community-list.component.ts
@@ -1,6 +1,7 @@
+import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CommunityListComponent } from './community-list.component';
-import { Component } from '@angular/core';
 
 
 @Component({
diff --git a/src/app/community-list-page/flat-node.model.ts b/src/app/community-list-page/flat-node.model.ts
index 0aabbeb489..125ffc1e59 100644
--- a/src/app/community-list-page/flat-node.model.ts
+++ b/src/app/community-list-page/flat-node.model.ts
@@ -1,6 +1,7 @@
 import { Observable } from 'rxjs';
-import { Community } from '../core/shared/community.model';
+
 import { Collection } from '../core/shared/collection.model';
+import { Community } from '../core/shared/community.model';
 import { ShowMoreFlatNode } from './show-more-flat-node.model';
 
 /**
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-list-page/themed-community-list-page.component.ts b/src/app/community-list-page/themed-community-list-page.component.ts
index 20fa97bedd..2b5113bac9 100644
--- a/src/app/community-list-page/themed-community-list-page.component.ts
+++ b/src/app/community-list-page/themed-community-list-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CommunityListPageComponent } from './community-list-page.component';
 
diff --git a/src/app/community-page/community-form/community-form.component.ts b/src/app/community-page/community-form/community-form.component.ts
index a3730fd418..0ac871ebb9 100644
--- a/src/app/community-page/community-form/community-form.component.ts
+++ b/src/app/community-page/community-form/community-form.component.ts
@@ -1,18 +1,26 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnChanges,
+  SimpleChange,
+  SimpleChanges,
+} from '@angular/core';
 import {
   DynamicFormControlModel,
   DynamicFormService,
   DynamicInputModel,
-  DynamicTextAreaModel
+  DynamicTextAreaModel,
 } from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
+
+import { environment } from '../../../environments/environment';
+import { AuthService } from '../../core/auth/auth.service';
+import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
 import { Community } from '../../core/shared/community.model';
 import { ComColFormComponent } from '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component';
-import { TranslateService } from '@ngx-translate/core';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { RequestService } from '../../core/data/request.service';
-import { ObjectCacheService } from '../../core/cache/object-cache.service';
 
 /**
  * Form used for creating and editing communities
@@ -20,9 +28,9 @@ import { ObjectCacheService } from '../../core/cache/object-cache.service';
 @Component({
   selector: 'ds-community-form',
   styleUrls: ['../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.scss'],
-  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/comcol-form/comcol-form.component.html',
 })
-export class CommunityFormComponent extends ComColFormComponent<Community> {
+export class CommunityFormComponent extends ComColFormComponent<Community> implements OnChanges {
   /**
    * @type {Community} A new community when a community is being created, an existing Input community when a community is being edited
    */
@@ -43,27 +51,31 @@ export class CommunityFormComponent extends ComColFormComponent<Community> {
       name: 'dc.title',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'Please enter a name for this title'
+        required: 'Please enter a name for this title',
       },
     }),
     new DynamicTextAreaModel({
       id: 'description',
       name: 'dc.description',
+      spellCheck: environment.form.spellCheck,
     }),
     new DynamicTextAreaModel({
       id: 'abstract',
       name: 'dc.description.abstract',
+      spellCheck: environment.form.spellCheck,
     }),
     new DynamicTextAreaModel({
       id: 'rights',
       name: 'dc.rights',
+      spellCheck: environment.form.spellCheck,
     }),
     new DynamicTextAreaModel({
       id: 'tableofcontents',
       name: 'dc.description.tableofcontents',
+      spellCheck: environment.form.spellCheck,
     }),
   ];
 
@@ -76,4 +88,11 @@ export class CommunityFormComponent extends ComColFormComponent<Community> {
                      protected objectCache: ObjectCacheService) {
     super(formService, translate, notificationsService, authService, requestService, objectCache);
   }
+
+  ngOnChanges(changes: SimpleChanges) {
+    const dsoChange: SimpleChange = changes.dso;
+    if (this.dso && dsoChange && !dsoChange.isFirstChange()) {
+      super.ngOnInit();
+    }
+  }
 }
diff --git a/src/app/community-page/community-form/community-form.module.ts b/src/app/community-page/community-form/community-form.module.ts
index 925d218973..fb337a7c98 100644
--- a/src/app/community-page/community-form/community-form.module.ts
+++ b/src/app/community-page/community-form/community-form.module.ts
@@ -1,22 +1,22 @@
 import { NgModule } from '@angular/core';
 
-import { CommunityFormComponent } from './community-form.component';
-import { SharedModule } from '../../shared/shared.module';
 import { ComcolModule } from '../../shared/comcol/comcol.module';
 import { FormModule } from '../../shared/form/form.module';
+import { SharedModule } from '../../shared/shared.module';
+import { CommunityFormComponent } from './community-form.component';
 
 @NgModule({
   imports: [
     ComcolModule,
     FormModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
     CommunityFormComponent,
   ],
   exports: [
-    CommunityFormComponent
-  ]
+    CommunityFormComponent,
+  ],
 })
 export class CommunityFormModule {
 
diff --git a/src/app/community-page/community-page-administrator.guard.ts b/src/app/community-page/community-page-administrator.guard.ts
index fd7ce5f7bf..4a3816b225 100644
--- a/src/app/community-page/community-page-administrator.guard.ts
+++ b/src/app/community-page/community-page-administrator.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Community } from '../core/shared/community.model';
-import { CommunityPageResolver } from './community-page.resolver';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../core/auth/auth.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { Observable, of as observableOf } from 'rxjs';
 import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { AuthService } from '../core/auth/auth.service';
+import { Community } from '../core/shared/community.model';
+import { CommunityPageResolver } from './community-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Community} pages requiring administrator rights
diff --git a/src/app/community-page/community-page-routing.module.ts b/src/app/community-page/community-page-routing.module.ts
index 25326448a8..2d86223801 100644
--- a/src/app/community-page/community-page-routing.module.ts
+++ b/src/app/community-page/community-page-routing.module.ts
@@ -1,19 +1,29 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { CommunityPageResolver } from './community-page.resolver';
-import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
+import { BrowseByGuard } from '../browse-by/browse-by-guard';
+import { BrowseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard';
-import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
 import { CommunityBreadcrumbResolver } from '../core/breadcrumbs/community-breadcrumb.resolver';
 import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { LinkService } from '../core/cache/builders/link.service';
-import { COMMUNITY_EDIT_PATH, COMMUNITY_CREATE_PATH } from './community-page-routing-paths';
-import { CommunityPageAdministratorGuard } from './community-page-administrator.guard';
+import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolSearchSectionComponent } from '../shared/comcol/sections/comcol-search-section/comcol-search-section.component';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 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 { CommunityPageResolver } from './community-page.resolver';
+import { CommunityPageAdministratorGuard } from './community-page-administrator.guard';
+import {
+  COMMUNITY_CREATE_PATH,
+  COMMUNITY_EDIT_PATH,
+} from './community-page-routing-paths';
+import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
+import { CreateCommunityPageGuard } from './create-community-page/create-community-page.guard';
+import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
+import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
+import { ThemedCommunityPageComponent } from './themed-community-page.component';
 
 @NgModule({
   imports: [
@@ -21,13 +31,14 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
       {
         path: COMMUNITY_CREATE_PATH,
         component: CreateCommunityPageComponent,
-        canActivate: [AuthenticatedGuard, CreateCommunityPageGuard]
+        canActivate: [AuthenticatedGuard, CreateCommunityPageGuard],
       },
       {
         path: ':id',
         resolve: {
           dso: CommunityPageResolver,
-          breadcrumb: CommunityBreadcrumbResolver
+          breadcrumb: CommunityBreadcrumbResolver,
+          menu: DSOEditMenuResolver,
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -35,7 +46,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
             path: COMMUNITY_EDIT_PATH,
             loadChildren: () => import('./edit-community-page/edit-community-page.module')
               .then((m) => m.EditCommunityPageModule),
-            canActivate: [CommunityPageAdministratorGuard]
+            canActivate: [CommunityPageAdministratorGuard],
           },
           {
             path: 'delete',
@@ -46,8 +57,33 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
           {
             path: '',
             component: ThemedCommunityPageComponent,
-            pathMatch: 'full',
-          }
+            children: [
+              {
+                path: '',
+                pathMatch: 'full',
+                component: ComcolSearchSectionComponent,
+              },
+              {
+                path: 'subcoms-cols',
+                pathMatch: 'full',
+                component: SubComColSectionComponent,
+                resolve: {
+                  breadcrumb: I18nBreadcrumbResolver,
+                },
+                data: { breadcrumbKey: 'community.subcoms-cols' },
+              },
+              {
+                path: 'browse/:id',
+                pathMatch: 'full',
+                component: ComcolBrowseByComponent,
+                canActivate: [BrowseByGuard],
+                resolve: {
+                  breadcrumb: BrowseByI18nBreadcrumbResolver,
+                },
+                data: { breadcrumbKey: 'browse.metadata' },
+              },
+            ],
+          },
         ],
         data: {
           menu: {
@@ -55,6 +91,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
               id: 'statistics_community_:id',
               active: true,
               visible: true,
+              index: 2,
               model: {
                 type: MenuItemType.LINK,
                 text: 'menu.section.statistics',
@@ -64,7 +101,7 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
           },
         },
       },
-    ])
+    ]),
   ],
   providers: [
     CommunityPageResolver,
@@ -72,8 +109,8 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
     DSOBreadcrumbsService,
     LinkService,
     CreateCommunityPageGuard,
-    CommunityPageAdministratorGuard
-  ]
+    CommunityPageAdministratorGuard,
+  ],
 })
 export class CommunityPageRoutingModule {
 
diff --git a/src/app/community-page/community-page.component.html b/src/app/community-page/community-page.component.html
index 368fec08a5..b3e577af7d 100644
--- a/src/app/community-page/community-page.component.html
+++ b/src/app/community-page/community-page.component.html
@@ -5,9 +5,9 @@
       <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]="communityPayload.name"></ds-comcol-page-header>
+          <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'">
@@ -17,12 +17,10 @@
           </ds-comcol-page-content>
           <!-- News -->
           <ds-comcol-page-content [content]="communityPayload.sidebarText" [hasInnerHtml]="true"
-            [title]="'community.page.news'">
+                                  [title]="'community.page.news'">
           </ds-comcol-page-content>
         </header>
-        <div class="pl-2 space-children-mr">
-          <ds-dso-page-edit-button *ngIf="isCommunityAdmin$ | async" [pageRoute]="communityPageRoute$ | async" [dso]="communityPayload" [tooltipMsg]="'community.page.edit'"></ds-dso-page-edit-button>
-        </div>
+        <ds-dso-edit-menu></ds-dso-edit-menu>
       </div>
       <section class="comcol-page-browse-section">
 
@@ -30,10 +28,9 @@
         <ds-themed-comcol-page-browse-by [id]="communityPayload.id" [contentType]="communityPayload.type">
         </ds-themed-comcol-page-browse-by>
 
-        <ds-themed-community-page-sub-community-list [community]="communityPayload"></ds-themed-community-page-sub-community-list>
-        <ds-themed-community-page-sub-collection-list [community]="communityPayload"></ds-themed-community-page-sub-collection-list>
+        <router-outlet></router-outlet>
       </section>
-      <footer  *ngIf="communityPayload.copyrightText"  class="border-top my-5 pt-4">
+      <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
         <!-- Copyright -->
         <ds-comcol-page-content [content]="communityPayload.copyrightText" [hasInnerHtml]="true">
         </ds-comcol-page-content>
diff --git a/src/app/community-page/community-page.component.ts b/src/app/community-page/community-page.component.ts
index b1a0cfc946..916de6f67b 100644
--- a/src/app/community-page/community-page.component.ts
+++ b/src/app/community-page/community-page.component.ts
@@ -1,31 +1,38 @@
-import { mergeMap, filter, map } from 'rxjs/operators';
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { RemoteData } from '../core/data/remote-data';
-import { Bitstream } from '../core/shared/bitstream.model';
+import {
+  filter,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { Community } from '../core/shared/community.model';
-
-import { MetadataService } from '../core/metadata/metadata.service';
-
-import { fadeInOut } from '../shared/animations/fade';
-import { hasValue } from '../shared/empty.util';
-import { getAllSucceededRemoteDataPayload} from '../core/shared/operators';
 import { AuthService } from '../core/auth/auth.service';
+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 { getCommunityPageRoute } from './community-page-routing-paths';
+import { RemoteData } from '../core/data/remote-data';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { Community } from '../core/shared/community.model';
+import { getAllSucceededRemoteDataPayload } from '../core/shared/operators';
+import { fadeInOut } from '../shared/animations/fade';
+import { hasValue } from '../shared/empty.util';
+import { getCommunityPageRoute } from './community-page-routing-paths';
 
 @Component({
   selector: 'ds-community-page',
   styleUrls: ['./community-page.component.scss'],
   templateUrl: './community-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 /**
  * This component represents a detail page for a single community
@@ -52,12 +59,11 @@ export class CommunityPageComponent implements OnInit {
   communityPageRoute$: Observable<string>;
 
   constructor(
-    private communityDataService: CommunityDataService,
-    private metadata: MetadataService,
     private route: ActivatedRoute,
     private router: Router,
     private authService: AuthService,
-    private authorizationDataService: AuthorizationDataService
+    private authorizationDataService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
   ) {
 
   }
@@ -65,7 +71,7 @@ export class CommunityPageComponent implements OnInit {
   ngOnInit(): void {
     this.communityRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Community>),
-      redirectOn4xx(this.router, this.authService)
+      redirectOn4xx(this.router, this.authService),
     );
     this.logoRD$ = this.communityRD$.pipe(
       map((rd: RemoteData<Community>) => rd.payload),
@@ -73,7 +79,7 @@ export class CommunityPageComponent implements OnInit {
       mergeMap((community: Community) => community.logo));
     this.communityPageRoute$ = this.communityRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((community) => getCommunityPageRoute(community.id))
+      map((community) => getCommunityPageRoute(community.id)),
     );
     this.isCommunityAdmin$ = this.authorizationDataService.isAuthorized(FeatureID.IsCommunityAdmin);
   }
diff --git a/src/app/community-page/community-page.module.ts b/src/app/community-page/community-page.module.ts
index 7cf2c8db8a..07434c9673 100644
--- a/src/app/community-page/community-page.module.ts
+++ b/src/app/community-page/community-page.module.ts
@@ -1,33 +1,34 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 
+import { BrowseByPageModule } from '../browse-by/browse-by-page.module';
+import { ComcolModule } from '../shared/comcol/comcol.module';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
 import { SharedModule } from '../shared/shared.module';
-
-import { CommunityPageComponent } from './community-page.component';
-import { CommunityPageSubCollectionListComponent } from './sub-collection-list/community-page-sub-collection-list.component';
-import { CommunityPageRoutingModule } from './community-page-routing.module';
-import { CommunityPageSubCommunityListComponent } from './sub-community-list/community-page-sub-community-list.component';
-import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
-import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
 import { StatisticsModule } from '../statistics/statistics.module';
 import { CommunityFormModule } from './community-form/community-form.module';
+import { CommunityPageComponent } from './community-page.component';
+import { CommunityPageRoutingModule } from './community-page-routing.module';
+import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
+import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
+import { CommunityPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+import { ThemedCollectionPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component';
+import { SubComColSectionComponent } from './sections/sub-com-col-section/sub-com-col-section.component';
+import { CommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component';
 import { ThemedCommunityPageComponent } from './themed-community-page.component';
-import { ComcolModule } from '../shared/comcol/comcol.module';
-import {
-  ThemedCommunityPageSubCommunityListComponent
-} from './sub-community-list/themed-community-page-sub-community-list.component';
-import {
-  ThemedCollectionPageSubCollectionListComponent
-} from './sub-collection-list/themed-community-page-sub-collection-list.component';
 
-const DECLARATIONS = [CommunityPageComponent,
+const DECLARATIONS = [
+  CommunityPageComponent,
   ThemedCommunityPageComponent,
   ThemedCommunityPageSubCommunityListComponent,
   CommunityPageSubCollectionListComponent,
   ThemedCollectionPageSubCollectionListComponent,
   CommunityPageSubCommunityListComponent,
   CreateCommunityPageComponent,
-  DeleteCommunityPageComponent];
+  DeleteCommunityPageComponent,
+  SubComColSectionComponent,
+];
 
 @NgModule({
   imports: [
@@ -36,14 +37,16 @@ const DECLARATIONS = [CommunityPageComponent,
     CommunityPageRoutingModule,
     StatisticsModule.forRoot(),
     CommunityFormModule,
-    ComcolModule
+    ComcolModule,
+    DsoPageModule,
+    BrowseByPageModule,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
-    ...DECLARATIONS
-  ]
+    ...DECLARATIONS,
+  ],
 })
 
 export class CommunityPageModule {
diff --git a/src/app/community-page/community-page.resolver.spec.ts b/src/app/community-page/community-page.resolver.spec.ts
index f181dbfff6..70bb0075e3 100644
--- a/src/app/community-page/community-page.resolver.spec.ts
+++ b/src/app/community-page/community-page.resolver.spec.ts
@@ -1,6 +1,7 @@
 import { first } from 'rxjs/operators';
-import { CommunityPageResolver } from './community-page.resolver';
+
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { CommunityPageResolver } from './community-page.resolver';
 
 describe('CommunityPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('CommunityPageResolver', () => {
 
     beforeEach(() => {
       communityService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       };
       store = jasmine.createSpyObj('store', {
         dispatch: {},
@@ -26,7 +27,7 @@ describe('CommunityPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/community-page/community-page.resolver.ts b/src/app/community-page/community-page.resolver.ts
index 01de9294f3..bb90c4d457 100644
--- a/src/app/community-page/community-page.resolver.ts
+++ b/src/app/community-page/community-page.resolver.ts
@@ -1,13 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { Community } from '../core/shared/community.model';
-import { CommunityDataService } from '../core/data/community-data.service';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { ResolvedAction } from '../core/resolving/resolver.actions';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { CommunityDataService } from '../core/data/community-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { Community } from '../core/shared/community.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -17,7 +25,7 @@ export const COMMUNITY_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Community>[] = [
   followLink('logo'),
   followLink('subcommunities'),
   followLink('collections'),
-  followLink('parentCommunity')
+  followLink('parentCommunity'),
 ];
 
 /**
@@ -27,7 +35,7 @@ export const COMMUNITY_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Community>[] = [
 export class CommunityPageResolver implements Resolve<RemoteData<Community>> {
   constructor(
     private communityService: CommunityDataService,
-    private store: Store<any>
+    private store: Store<any>,
   ) {
   }
 
@@ -43,7 +51,7 @@ export class CommunityPageResolver implements Resolve<RemoteData<Community>> {
       route.params.id,
       true,
       false,
-      ...COMMUNITY_PAGE_LINKS_TO_FOLLOW
+      ...COMMUNITY_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
       getFirstCompletedRemoteData(),
     );
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 71a580b0aa..57039040c2 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
@@ -3,7 +3,7 @@
     <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: parent.name } }}</h2>
+        <h2 *ngIf="parent" id="sub-header" class="border-bottom pb-2">{{ 'community.create.sub-head' | translate:{ parent: dsoNameService.getName(parent) } }}</h2>
       </ng-container>
     </div>
   </div>
diff --git a/src/app/community-page/create-community-page/create-community-page.component.spec.ts b/src/app/community-page/create-community-page/create-community-page.component.spec.ts
index fbff82efd8..08da572a4d 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.spec.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.spec.ts
@@ -1,17 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouteService } from '../../core/services/route.service';
-import { SharedModule } from '../../shared/shared.module';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { CommunityDataService } from '../../core/data/community-data.service';
-import { CreateCommunityPageComponent } from './create-community-page.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SharedModule } from '../../shared/shared.module';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CreateCommunityPageComponent } from './create-community-page.component';
 
 describe('CreateCommunityPageComponent', () => {
   let comp: CreateCommunityPageComponent;
@@ -26,9 +31,9 @@ describe('CreateCommunityPageComponent', () => {
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RequestService, useValue: {} }
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/create-community-page/create-community-page.component.ts b/src/app/community-page/create-community-page/create-community-page.component.ts
index b332fad100..65ae0abc90 100644
--- a/src/app/community-page/create-community-page/create-community-page.component.ts
+++ b/src/app/community-page/create-community-page/create-community-page.component.ts
@@ -1,12 +1,14 @@
 import { Component } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { RouteService } from '../../core/services/route.service';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { Community } from '../../core/shared/community.model';
 import { CreateComColPageComponent } from '../../shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
 
 /**
  * Component that represents the page where a user can create a new Community
@@ -14,7 +16,7 @@ import { RequestService } from '../../core/data/request.service';
 @Component({
   selector: 'ds-create-community',
   styleUrls: ['./create-community-page.component.scss'],
-  templateUrl: './create-community-page.component.html'
+  templateUrl: './create-community-page.component.html',
 })
 export class CreateCommunityPageComponent extends CreateComColPageComponent<Community> {
   protected frontendURL = '/communities/';
@@ -22,12 +24,13 @@ export class CreateCommunityPageComponent extends CreateComColPageComponent<Comm
 
   public constructor(
     protected communityDataService: CommunityDataService,
+    public dsoNameService: DSONameService,
     protected routeService: RouteService,
     protected router: Router,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) {
-    super(communityDataService, communityDataService, routeService, router, notificationsService, translate, requestService);
+    super(communityDataService, dsoNameService, communityDataService, routeService, router, notificationsService, translate, requestService);
   }
 }
diff --git a/src/app/community-page/create-community-page/create-community-page.guard.spec.ts b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts
index 8c7b994a85..8f1f3fb18a 100644
--- a/src/app/community-page/create-community-page/create-community-page.guard.spec.ts
+++ b/src/app/community-page/create-community-page/create-community-page.guard.spec.ts
@@ -1,8 +1,12 @@
-import { CreateCommunityPageGuard } from './create-community-page.guard';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { Community } from '../../core/shared/community.model';
 import { first } from 'rxjs/operators';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
+import { Community } from '../../core/shared/community.model';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { CreateCommunityPageGuard } from './create-community-page.guard';
 
 describe('CreateCommunityPageGuard', () => {
   describe('canActivate', () => {
@@ -20,7 +24,7 @@ describe('CreateCommunityPageGuard', () => {
           } else if (id === 'error-id') {
             return createFailedRemoteDataObject$('not found', 404);
           }
-        }
+        },
       };
       router = new RouterMock();
 
@@ -32,7 +36,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(true)
+            expect(canActivate).toEqual(true),
         );
     });
 
@@ -41,7 +45,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(true)
+            expect(canActivate).toEqual(true),
         );
     });
 
@@ -50,7 +54,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
 
@@ -59,7 +63,7 @@ describe('CreateCommunityPageGuard', () => {
         .pipe(first())
         .subscribe(
           (canActivate) =>
-            expect(canActivate).toEqual(false)
+            expect(canActivate).toEqual(false),
         );
     });
   });
diff --git a/src/app/community-page/create-community-page/create-community-page.guard.ts b/src/app/community-page/create-community-page/create-community-page.guard.ts
index 835fbb6589..847273b367 100644
--- a/src/app/community-page/create-community-page/create-community-page.guard.ts
+++ b/src/app/community-page/create-community-page/create-community-page.guard.ts
@@ -1,13 +1,27 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
 
-import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-import { map, tap } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 
 /**
  * Prevent creation of a community with an invalid parent community provided
@@ -37,8 +51,8 @@ export class CreateCommunityPageGuard implements CanActivate {
           if (!isValid) {
             this.router.navigate(['/404']);
           }
-        }
-      )
-    );
+        },
+        ),
+      );
   }
 }
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 751d001c51..b241a7027c 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>
-                <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dso.name } }}</p>
+                <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}}
+                            <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>
+                            <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) !== true"><i class="fas fa-trash" aria-hidden="true"></i> {{'community.delete.confirm' | translate}}</span>
                         </button>
                     </div>
                 </div>
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
index da9c80dcfa..0892c4d66c 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.spec.ts
@@ -1,15 +1,22 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SharedModule } from '../../shared/shared.module';
 import { DeleteCommunityPageComponent } from './delete-community-page.component';
-import { RequestService } from '../../core/data/request.service';
 
 describe('DeleteCommunityPageComponent', () => {
   let comp: DeleteCommunityPageComponent;
@@ -20,12 +27,13 @@ describe('DeleteCommunityPageComponent', () => {
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       declarations: [DeleteCommunityPageComponent],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { data: observableOf({ dso: { payload: {} } }) } },
         { provide: NotificationsService, useValue: {} },
-        { provide: RequestService, useValue: {}}
+        { provide: RequestService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.ts b/src/app/community-page/delete-community-page/delete-community-page.component.ts
index 6e640c64be..c6888a893b 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.ts
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.ts
@@ -1,10 +1,15 @@
 import { Component } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { CommunityDataService } from '../../core/data/community-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
+import { Community } from '../../core/shared/community.model';
 import { DeleteComColPageComponent } from '../../shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 
 /**
  * Component that represents the page where a user can delete an existing Community
@@ -12,19 +17,20 @@ import { TranslateService } from '@ngx-translate/core';
 @Component({
   selector: 'ds-delete-community',
   styleUrls: ['./delete-community-page.component.scss'],
-  templateUrl: './delete-community-page.component.html'
+  templateUrl: './delete-community-page.component.html',
 })
 export class DeleteCommunityPageComponent extends DeleteComColPageComponent<Community> {
   protected frontendURL = '/communities/';
 
   public constructor(
     protected dsoDataService: CommunityDataService,
+    public dsoNameService: DSONameService,
     protected router: Router,
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
     protected translate: TranslateService,
   ) {
-    super(dsoDataService, router, route, notifications, translate);
+    super(dsoDataService, dsoNameService, router, route, notifications, translate);
   }
 
 }
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
new file mode 100644
index 0000000000..b4f2123b86
--- /dev/null
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.html
@@ -0,0 +1,6 @@
+<ds-access-control-form-container
+  titleMessage="community-access-control-title"
+  *ngIf="itemRD$ | async as itemRD"
+  [itemRD]="itemRD"
+  [showLimitToSpecificBitstreams]="false">
+</ds-access-control-form-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.html b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.html
rename to src/app/community-page/edit-community-page/community-access-control/community-access-control.component.scss
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts
new file mode 100644
index 0000000000..aa01183519
--- /dev/null
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.spec.ts
@@ -0,0 +1,71 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { Community } from '../../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CommunityAccessControlComponent } from './community-access-control.component';
+
+describe('CommunityAccessControlComponent', () => {
+  let component: CommunityAccessControlComponent;
+  let fixture: ComponentFixture<CommunityAccessControlComponent>;
+  const testCommunity = Object.assign(new Community(),
+    {
+      type: 'community',
+      metadata: {
+        'dc.title': [{ value: 'community' }],
+      },
+      uuid: 'communityUUID',
+      parentCommunity: observableOf(Object.assign(createSuccessfulRemoteDataObject(undefined), { statusCode: 204 })),
+
+      _links: {
+        parentCommunity: 'site',
+        self: '/' + 'communityUUID',
+      },
+    },
+  );
+
+  const routeStub = {
+    parent: {
+      parent: {
+        data: of({
+          dso: createSuccessfulRemoteDataObject(testCommunity),
+        }),
+      },
+    },
+  };
+
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ CommunityAccessControlComponent ],
+      providers: [{ provide: ActivatedRoute, useValue: routeStub }],
+    })
+      .compileComponents();
+  });
+
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityAccessControlComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    component.ngOnInit();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should set itemRD$', (done) => {
+    component.itemRD$.subscribe(result => {
+      expect(result).toEqual(createSuccessfulRemoteDataObject(testCommunity));
+      done();
+    });
+  });
+});
diff --git a/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
new file mode 100644
index 0000000000..e70af7062e
--- /dev/null
+++ b/src/app/community-page/edit-community-page/community-access-control/community-access-control.component.ts
@@ -0,0 +1,28 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-community-access-control',
+  templateUrl: './community-access-control.component.html',
+  styleUrls: ['./community-access-control.component.scss'],
+})
+export class CommunityAccessControlComponent implements OnInit {
+  itemRD$: Observable<RemoteData<Community>>;
+
+  constructor(private route: ActivatedRoute) {}
+
+  ngOnInit(): void {
+    this.itemRD$ = this.route.parent.parent.data.pipe(
+      map((data) => data.dso),
+    ).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Community>>;
+  }
+}
diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
index 719cf83a26..c02b390cb2 100644
--- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.spec.ts
@@ -1,15 +1,21 @@
 import { CommonModule } from '@angular/common';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
+import { Collection } from '../../../core/shared/collection.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 import { CommunityAuthorizationsComponent } from './community-authorizations.component';
-import { Collection } from '../../../core/shared/collection.model';
 
 describe('CommunityAuthorizationsComponent', () => {
   let comp: CommunityAuthorizationsComponent<DSpaceObject>;
@@ -19,8 +25,8 @@ describe('CommunityAuthorizationsComponent', () => {
     uuid: 'community',
     id: 'community',
     _links: {
-      self: { href: 'community-selflink' }
-    }
+      self: { href: 'community-selflink' },
+    },
   });
 
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -29,16 +35,16 @@ describe('CommunityAuthorizationsComponent', () => {
     parent: {
       parent: {
         data: observableOf({
-          dso: communityRD
-        })
-      }
-    }
+          dso: communityRD,
+        }),
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        CommonModule
+        CommonModule,
       ],
       declarations: [CommunityAuthorizationsComponent],
       providers: [
diff --git a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
index 7a9f224311..c31f798060 100644
--- a/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
+++ b/src/app/community-page/edit-community-page/community-authorizations/community-authorizations.component.ts
@@ -1,7 +1,14 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
@@ -25,7 +32,7 @@ export class CommunityAuthorizationsComponent<TDomain extends DSpaceObject> impl
    * @param {ActivatedRoute} route
    */
   constructor(
-    private route: ActivatedRoute
+    private route: ActivatedRoute,
   ) {
   }
 
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/edit-community-page/community-curate/community-curate.component.spec.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
index 1b1ee2c9f9..8928543a3a 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { CommunityCurateComponent } from './community-curate.component';
 import { Community } from '../../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { CommunityCurateComponent } from './community-curate.component';
 
 describe('CommunityCurateComponent', () => {
   let comp: CommunityCurateComponent;
@@ -17,30 +25,30 @@ describe('CommunityCurateComponent', () => {
   let dsoNameService;
 
   const community = Object.assign(new Community(), {
-    metadata: {'dc.title': ['Community Name'], 'dc.identifier.uri': [ { value: '123456789/1'}]}
+    metadata: { 'dc.title': ['Community Name'], 'dc.identifier.uri': [ { value: '123456789/1' }] },
   });
 
   beforeEach(waitForAsync(() => {
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(community)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(community),
+        }),
+      },
     };
 
     dsoNameService = jasmine.createSpyObj('dsoNameService', {
-      getName: 'Community Name'
+      getName: 'Community Name',
     });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [CommunityCurateComponent],
       providers: [
-        {provide: ActivatedRoute, useValue: routeStub},
-        {provide: DSONameService, useValue: dsoNameService}
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: DSONameService, useValue: dsoNameService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -58,7 +66,7 @@ describe('CommunityCurateComponent', () => {
     });
     it('should contain the community information provided in the route', () => {
       comp.dsoRD$.subscribe((value) => {
-        expect(value.payload.handle
+        expect(value.payload.handle,
         ).toEqual('123456789/1');
       });
       comp.communityName$.subscribe((value) => {
diff --git a/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
index 8ae04af8f1..aa28644ae7 100644
--- a/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
+++ b/src/app/community-page/edit-community-page/community-curate/community-curate.component.ts
@@ -1,10 +1,18 @@
-import { Component, OnInit } from '@angular/core';
-import { Community } from '../../../core/shared/community.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { filter, map, take } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
 import { hasValue } from '../../../shared/empty.util';
 
 /**
@@ -35,7 +43,7 @@ export class CommunityCurateComponent implements OnInit {
       filter((rd: RemoteData<Community>) => hasValue(rd)),
       map((rd: RemoteData<Community>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
   }
 
diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
index c597fac0bd..ec4a502a6e 100644
--- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.spec.ts
@@ -1,15 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../../shared/shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CommunityMetadataComponent } from './community-metadata.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { CommunityDataService } from '../../../core/data/community-data.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { SharedModule } from '../../../shared/shared.module';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CommunityMetadataComponent } from './community-metadata.component';
 
 describe('CommunityMetadataComponent', () => {
   let comp: CommunityMetadataComponent;
@@ -22,9 +27,9 @@ describe('CommunityMetadataComponent', () => {
       providers: [
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
index a2dbfa6eb6..9a6b93a0ce 100644
--- a/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
+++ b/src/app/community-page/edit-community-page/community-metadata/community-metadata.component.ts
@@ -1,11 +1,15 @@
 import { Component } from '@angular/core';
-import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Community } from '../../../core/shared/community.model';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
+import { CommunityDataService } from '../../../core/data/community-data.service';
+import { Community } from '../../../core/shared/community.model';
+import { ComcolMetadataComponent } from '../../../shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+
 /**
  * Component for editing a community's metadata
  */
@@ -22,7 +26,7 @@ export class CommunityMetadataComponent extends ComcolMetadataComponent<Communit
     protected router: Router,
     protected route: ActivatedRoute,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
   ) {
     super(communityDataService, router, route, notificationsService, translate);
   }
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
index 9dddb87f8d..895c61862a 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.spec.ts
@@ -1,20 +1,32 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { CommunityRolesComponent } from './community-roles.component';
-import { Community } from '../../../core/shared/community.model';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RequestService } from '../../../core/data/request.service';
 import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { SharedModule } from '../../../shared/shared.module';
-import { RouterTestingModule } from '@angular/router/testing';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Community } from '../../../core/shared/community.model';
 import { ComcolModule } from '../../../shared/comcol/comcol.module';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { CommunityRolesComponent } from './community-roles.component';
 
 describe('CommunityRolesComponent', () => {
 
@@ -37,10 +49,10 @@ describe('CommunityRolesComponent', () => {
                   href: 'adminGroup link',
                 },
               },
-            })
+            }),
           ),
-        })
-      }
+        }),
+      },
     };
 
     const requestService = {
@@ -57,18 +69,19 @@ describe('CommunityRolesComponent', () => {
         SharedModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [
         CommunityRolesComponent,
       ],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: ActivatedRoute, useValue: route },
         { provide: RequestService, useValue: requestService },
         { provide: GroupDataService, useValue: groupDataService },
-        { provide: NotificationsService, useClass: NotificationsServiceStub }
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     fixture = TestBed.createComponent(CommunityRolesComponent);
diff --git a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
index 9468aa7048..5f6c57defc 100644
--- a/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
+++ b/src/app/community-page/edit-community-page/community-roles/community-roles.component.ts
@@ -1,11 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
-import { Community } from '../../../core/shared/community.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
 import { HALLink } from '../../../core/shared/hal-link.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
 
 /**
  * Component for managing a community's roles
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
index 3a4c3351c3..824aef3ba4 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.spec.ts
@@ -1,13 +1,18 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SharedModule } from '../../shared/shared.module';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { EditCommunityPageComponent } from './edit-community-page.component';
+
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { SharedModule } from '../../shared/shared.module';
+import { EditCommunityPageComponent } from './edit-community-page.component';
 
 describe('EditCommunityPageComponent', () => {
   let comp: EditCommunityPageComponent;
@@ -15,25 +20,25 @@ describe('EditCommunityPageComponent', () => {
 
   const routeStub = {
     data: observableOf({
-      dso: { payload: {} }
+      dso: { payload: {} },
     }),
     routeConfig: {
       children: [
         {
           path: 'mockUrl',
           data: {
-            hideReturnButton: false
-          }
-        }
-      ]
+            hideReturnButton: false,
+          },
+        },
+      ],
     },
     snapshot: {
       firstChild: {
         routeConfig: {
-          path: 'mockUrl'
-        }
-      }
-    }
+          path: 'mockUrl',
+        },
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -44,7 +49,7 @@ describe('EditCommunityPageComponent', () => {
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: routeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/community-page/edit-community-page/edit-community-page.component.ts b/src/app/community-page/edit-community-page/edit-community-page.component.ts
index 54a6ee4944..5bd31e9ba0 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.component.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.component.ts
@@ -1,6 +1,10 @@
 import { Component } from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { Community } from '../../core/shared/community.model';
-import { ActivatedRoute, Router } from '@angular/router';
 import { EditComColPageComponent } from '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { getCommunityPageRoute } from '../community-page-routing-paths';
 
@@ -9,14 +13,14 @@ import { getCommunityPageRoute } from '../community-page-routing-paths';
  */
 @Component({
   selector: 'ds-edit-community',
-  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
+  templateUrl: '../../shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.html',
 })
 export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
   type = 'community';
 
   public constructor(
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
   ) {
     super(router, route);
   }
diff --git a/src/app/community-page/edit-community-page/edit-community-page.module.ts b/src/app/community-page/edit-community-page/edit-community-page.module.ts
index 2b0fc73f2a..13555e3800 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.module.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.module.ts
@@ -1,15 +1,18 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
 import { SharedModule } from '../../shared/shared.module';
-import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
-import { EditCommunityPageComponent } from './edit-community-page.component';
+import { CommunityFormModule } from '../community-form/community-form.module';
+import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component';
+import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
 import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
-import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
-import { CommunityFormModule } from '../community-form/community-form.module';
-import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
-import { ComcolModule } from '../../shared/comcol/comcol.module';
+import { EditCommunityPageComponent } from './edit-community-page.component';
+import { EditCommunityPageRoutingModule } from './edit-community-page.routing.module';
 
 /**
  * Module that contains all components related to the Edit Community page administrator functionality
@@ -21,15 +24,17 @@ import { ComcolModule } from '../../shared/comcol/comcol.module';
     EditCommunityPageRoutingModule,
     CommunityFormModule,
     ComcolModule,
-    ResourcePoliciesModule
+    ResourcePoliciesModule,
+    AccessControlFormModule,
   ],
   declarations: [
     EditCommunityPageComponent,
     CommunityCurateComponent,
     CommunityMetadataComponent,
     CommunityRolesComponent,
-    CommunityAuthorizationsComponent
-  ]
+    CommunityAuthorizationsComponent,
+    CommunityAccessControlComponent,
+  ],
 })
 export class EditCommunityPageModule {
 
diff --git a/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts b/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
index faebb1ef2e..4b0fa5d70b 100644
--- a/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
+++ b/src/app/community-page/edit-community-page/edit-community-page.routing.module.ts
@@ -1,16 +1,18 @@
-import { EditCommunityPageComponent } from './edit-community-page.component';
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { CommunityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard';
+import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { CommunityAccessControlComponent } from './community-access-control/community-access-control.component';
+import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
+import { CommunityCurateComponent } from './community-curate/community-curate.component';
 import { CommunityMetadataComponent } from './community-metadata/community-metadata.component';
 import { CommunityRolesComponent } from './community-roles/community-roles.component';
-import { CommunityCurateComponent } from './community-curate/community-curate.component';
-import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { CommunityAuthorizationsComponent } from './community-authorizations/community-authorizations.component';
-import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
-import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
-import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
-import { CommunityAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/community-administrator.guard';
+import { EditCommunityPageComponent } from './edit-community-page.component';
 
 /**
  * Routing module that handles the routing for the Edit Community page administrator functionality
@@ -21,7 +23,7 @@ import { CommunityAdministratorGuard } from '../../core/data/feature-authorizati
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { breadcrumbKey: 'community.edit' },
         component: EditCommunityPageComponent,
@@ -30,7 +32,7 @@ import { CommunityAdministratorGuard } from '../../core/data/feature-authorizati
           {
             path: '',
             redirectTo: 'metadata',
-            pathMatch: 'full'
+            pathMatch: 'full',
           },
           {
             path: 'metadata',
@@ -38,18 +40,23 @@ import { CommunityAdministratorGuard } from '../../core/data/feature-authorizati
             data: {
               title: 'community.edit.tabs.metadata.title',
               hideReturnButton: true,
-              showBreadcrumbs: true
-            }
+              showBreadcrumbs: true,
+            },
           },
           {
             path: 'roles',
             component: CommunityRolesComponent,
-            data: { title: 'community.edit.tabs.roles.title', showBreadcrumbs: true }
+            data: { title: 'community.edit.tabs.roles.title', showBreadcrumbs: true },
           },
           {
             path: 'curate',
             component: CommunityCurateComponent,
-            data: { title: 'community.edit.tabs.curate.title', showBreadcrumbs: true }
+            data: { title: 'community.edit.tabs.curate.title', showBreadcrumbs: true },
+          },
+          {
+            path: 'access-control',
+            component: CommunityAccessControlComponent,
+            data: { title: 'collection.edit.tabs.access-control.title', showBreadcrumbs: true },
           },
           /*{
             path: 'authorizations',
@@ -63,34 +70,34 @@ import { CommunityAdministratorGuard } from '../../core/data/feature-authorizati
               {
                 path: 'create',
                 resolve: {
-                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                  resourcePolicyTarget: ResourcePolicyTargetResolver,
                 },
                 component: ResourcePolicyCreateComponent,
-                data: { title: 'resource-policies.create.page.title' }
+                data: { title: 'resource-policies.create.page.title' },
               },
               {
                 path: 'edit',
                 resolve: {
-                  resourcePolicy: ResourcePolicyResolver
+                  resourcePolicy: ResourcePolicyResolver,
                 },
                 component: ResourcePolicyEditComponent,
-                data: { title: 'resource-policies.edit.page.title' }
+                data: { title: 'resource-policies.edit.page.title' },
               },
               {
                 path: '',
                 component: CommunityAuthorizationsComponent,
-                data: { title: 'community.edit.tabs.authorizations.title', showBreadcrumbs: true, hideReturnButton: true }
-              }
-            ]
-          }
-        ]
-      }
-    ])
+                data: { title: 'community.edit.tabs.authorizations.title', showBreadcrumbs: true, hideReturnButton: true },
+              },
+            ],
+          },
+        ],
+      },
+    ]),
   ],
   providers: [
     ResourcePolicyResolver,
-    ResourcePolicyTargetResolver
-  ]
+    ResourcePolicyTargetResolver,
+  ],
 })
 export class EditCommunityPageRoutingModule {
 
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
similarity index 90%
rename from src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
index 69f16ee3ac..b5fbf1a01d 100644
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(subCollectionsRDObs | async) as subCollectionsRD">
   <div *ngIf="subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0" @fadeIn>
-    <h2>{{'community.sub-collection-list.head' | translate}}</h2>
+    <h3>{{'community.sub-collection-list.head' | translate}}</h3>
     <ds-viewable-collection
       [config]="config"
       [sortConfig]="sortConfig"
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts
new file mode 100644
index 0000000000..2a6ec9510c
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.spec.ts
@@ -0,0 +1,208 @@
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../../core/services/link-head.service';
+import { Community } from '../../../../core/shared/community.model';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../../../shared/host-window.service';
+import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { ThemeService } from '../../../../shared/theme-support/theme.service';
+import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
+
+describe('CommunityPageSubCollectionListComponent', () => {
+  let comp: CommunityPageSubCollectionListComponent;
+  let fixture: ComponentFixture<CommunityPageSubCollectionListComponent>;
+  let collectionDataServiceStub: any;
+  let themeService;
+  let subCollList = [];
+
+  const collections = [Object.assign(new Community(), {
+    id: '123456789-1',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 1' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-2',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 2' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-3',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 3' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-4',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 4' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-5',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 5' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-6',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 6' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-7',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Collection 7' },
+      ],
+    },
+  }),
+  ];
+
+  const mockCommunity = Object.assign(new Community(), {
+    id: '123456789',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Test title' },
+      ],
+    },
+  });
+
+  collectionDataServiceStub = {
+    findByParent(parentUUID: string, options: FindListOptions = {}) {
+      let currentPage = options.currentPage;
+      let elementsPerPage = options.elementsPerPage;
+      if (currentPage === undefined) {
+        currentPage = 1;
+      }
+      elementsPerPage = 5;
+      const startPageIndex = (currentPage - 1) * elementsPerPage;
+      let endPageIndex = (currentPage * elementsPerPage);
+      if (endPageIndex > subCollList.length) {
+        endPageIndex = subCollList.length;
+      }
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
+
+    },
+  };
+
+  const paginationService = new PaginationServiceStub();
+
+  themeService = getMockThemeService();
+
+  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
+    addTag: '',
+  });
+
+  const groupDataService = jasmine.createSpyObj('groupsDataService', {
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    getGroupRegistryRouterLink: '',
+    getUUIDFromString: '',
+  });
+
+  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+      name: 'test',
+      values: [
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
+  });
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        NgbModule,
+        NoopAnimationsModule,
+      ],
+      declarations: [CommunityPageSubCollectionListComponent],
+      providers: [
+        { provide: CollectionDataService, useValue: collectionDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: SelectableListService, useValue: {} },
+        { provide: ThemeService, useValue: themeService },
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityPageSubCollectionListComponent);
+    comp = fixture.componentInstance;
+    comp.community = mockCommunity;
+  });
+
+
+  it('should display a list of collections', async () => {
+    subCollList = collections;
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    const collList: DebugElement[] = fixture.debugElement.queryAll(By.css('ul[data-test="objects"] li'));
+    expect(collList.length).toEqual(5);
+    expect(collList[0].nativeElement.textContent).toContain('Collection 1');
+    expect(collList[1].nativeElement.textContent).toContain('Collection 2');
+    expect(collList[2].nativeElement.textContent).toContain('Collection 3');
+    expect(collList[3].nativeElement.textContent).toContain('Collection 4');
+    expect(collList[4].nativeElement.textContent).toContain('Collection 5');
+  });
+
+  it('should not display the header when list of collections is empty', () => {
+    subCollList = [];
+    fixture.detectChanges();
+
+    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
+    expect(subComHead.length).toEqual(0);
+  });
+});
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
new file mode 100644
index 0000000000..f526f76641
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -0,0 +1,111 @@
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { fadeIn } from '../../../../shared/animations/fade';
+import { hasValue } from '../../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+
+@Component({
+  selector: 'ds-community-page-sub-collection-list',
+  styleUrls: ['./community-page-sub-collection-list.component.scss'],
+  templateUrl: './community-page-sub-collection-list.component.html',
+  animations:[fadeIn],
+})
+export class CommunityPageSubCollectionListComponent implements OnInit, OnDestroy {
+  @Input() community: Community;
+
+  /**
+   * Optional page size. Overrides communityList.pageSize configuration for this component.
+   * Value can be added in the themed version of the parent component.
+   */
+  @Input() pageSize: number;
+
+  /**
+   * The pagination configuration
+   */
+  config: PaginationComponentOptions;
+
+  /**
+   * The pagination id
+   */
+  pageId = 'cmcl';
+
+  /**
+   * The sorting configuration
+   */
+  sortConfig: SortOptions;
+
+  /**
+   * A list of remote data objects of communities' collections
+   */
+  subCollectionsRDObs: BehaviorSubject<RemoteData<PaginatedList<Collection>>> = new BehaviorSubject<RemoteData<PaginatedList<Collection>>>({} as any);
+
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected cds: CollectionDataService,
+    protected paginationService: PaginationService,
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.config = new PaginationComponentOptions();
+    this.config.id = this.pageId;
+    if (hasValue(this.pageSize)) {
+      this.config.pageSize = this.pageSize;
+    } else {
+      this.config.pageSize = this.route.snapshot.queryParams[this.pageId + '.rpp'] ?? this.config.pageSize;
+    }
+    this.config.currentPage = this.route.snapshot.queryParams[this.pageId + '.page'] ?? 1;
+    this.sortConfig = new SortOptions('dc.title', SortDirection[this.route.snapshot.queryParams[this.pageId + '.sd']] ?? SortDirection.ASC);
+    this.initPage();
+  }
+
+  /**
+   * Initialise the list of collections
+   */
+  initPage() {
+    const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
+    const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
+
+    this.subscriptions.push(observableCombineLatest([pagination$, sort$]).pipe(
+      switchMap(([currentPagination, currentSort]) => {
+        return this.cds.findByParent(this.community.id, {
+          currentPage: currentPagination.currentPage,
+          elementsPerPage: currentPagination.pageSize,
+          sort: { field: currentSort.field, direction: currentSort.direction },
+        });
+      }),
+    ).subscribe((results) => {
+      this.subCollectionsRDObs.next(results);
+    }));
+  }
+
+  ngOnDestroy(): void {
+    this.paginationService.clearPagination(this.config?.id);
+    this.subscriptions.map((subscription: Subscription) => subscription.unsubscribe());
+  }
+
+}
diff --git a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts
similarity index 64%
rename from src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts
index f1f49f204c..edc15260f6 100644
--- a/src/app/community-page/sub-collection-list/themed-community-page-sub-collection-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component.ts
@@ -1,12 +1,16 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Community } from '../../../../core/shared/community.model';
+import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
-import { Component, Input } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
 
 @Component({
   selector: 'ds-themed-community-page-sub-collection-list',
   styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedCollectionPageSubCollectionListComponent extends ThemedComponent<CommunityPageSubCollectionListComponent> {
   @Input() community: Community;
@@ -18,7 +22,7 @@ export class ThemedCollectionPageSubCollectionListComponent extends ThemedCompon
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/community-page/sub-collection-list/community-page-sub-collection-list.component`);
+    return import(`../../../../../themes/${themeName}/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
new file mode 100644
index 0000000000..515e08ffdf
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.html
@@ -0,0 +1,8 @@
+<ng-container *ngIf="(community$ | async) as community">
+  <ds-themed-community-page-sub-community-list
+      [community]="community">
+  </ds-themed-community-page-sub-community-list>
+  <ds-themed-community-page-sub-collection-list
+      [community]="community">
+  </ds-themed-community-page-sub-collection-list>
+</ng-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.scss b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.scss
rename to src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.scss
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.spec.ts
new file mode 100644
index 0000000000..e28ff98ee7
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.spec.ts
@@ -0,0 +1,37 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { SubComColSectionComponent } from './sub-com-col-section.component';
+
+describe('SubComColSectionComponent', () => {
+  let component: SubComColSectionComponent;
+  let fixture: ComponentFixture<SubComColSectionComponent>;
+
+  let activatedRoute: ActivatedRouteStub;
+
+  beforeEach(async () => {
+    activatedRoute = new ActivatedRouteStub();
+    activatedRoute.parent = new ActivatedRouteStub();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        SubComColSectionComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRoute },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SubComColSectionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
new file mode 100644
index 0000000000..eb6f827240
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-com-col-section.component.ts
@@ -0,0 +1,35 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
+
+@Component({
+  selector: 'ds-sub-com-col-section',
+  templateUrl: './sub-com-col-section.component.html',
+  styleUrls: ['./sub-com-col-section.component.scss'],
+})
+export class SubComColSectionComponent implements OnInit {
+
+  community$: Observable<Community>;
+
+  constructor(
+    private route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.community$ = this.route.parent.data.pipe(
+      map((data: Data) => (data.dso as RemoteData<Community>).payload),
+    );
+  }
+
+}
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
similarity index 90%
rename from src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
index be2788a9f4..0834d08ba5 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
@@ -1,6 +1,6 @@
 <ng-container *ngVar="(subCommunitiesRDObs | async) as subCommunitiesRD">
   <div *ngIf="subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0" @fadeIn>
-    <h2>{{'community.sub-community-list.head' | translate}}</h2>
+    <h3>{{'community.sub-community-list.head' | translate}}</h3>
     <ds-viewable-collection
       [config]="config"
       [sortConfig]="sortConfig"
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.scss
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss
diff --git a/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts
new file mode 100644
index 0000000000..3e99254056
--- /dev/null
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.spec.ts
@@ -0,0 +1,210 @@
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../../core/services/link-head.service';
+import { Community } from '../../../../core/shared/community.model';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../../../shared/host-window.service';
+import { getMockThemeService } from '../../../../shared/mocks/theme-service.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { ThemeService } from '../../../../shared/theme-support/theme.service';
+import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
+
+describe('CommunityPageSubCommunityListComponent', () => {
+  let comp: CommunityPageSubCommunityListComponent;
+  let fixture: ComponentFixture<CommunityPageSubCommunityListComponent>;
+  let communityDataServiceStub: any;
+  let themeService;
+  let subCommList = [];
+
+  const subcommunities = [Object.assign(new Community(), {
+    id: '123456789-1',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 1' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-2',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 2' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-3',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 3' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '12345678942',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 4' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-5',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 5' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-6',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 6' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-7',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'SubCommunity 7' },
+      ],
+    },
+  }),
+  ];
+
+  const mockCommunity = Object.assign(new Community(), {
+    id: '123456789',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'Test title' },
+      ],
+    },
+  });
+
+  communityDataServiceStub = {
+    findByParent(parentUUID: string, options: FindListOptions = {}) {
+      let currentPage = options.currentPage;
+      let elementsPerPage = options.elementsPerPage;
+      if (currentPage === undefined) {
+        currentPage = 1;
+      }
+      elementsPerPage = 5;
+
+      const startPageIndex = (currentPage - 1) * elementsPerPage;
+      let endPageIndex = (currentPage * elementsPerPage);
+      if (endPageIndex > subCommList.length) {
+        endPageIndex = subCommList.length;
+      }
+      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
+
+    },
+  };
+
+  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
+    addTag: '',
+  });
+
+  const groupDataService = jasmine.createSpyObj('groupsDataService', {
+    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    getGroupRegistryRouterLink: '',
+    getUUIDFromString: '',
+  });
+
+  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+      name: 'test',
+      values: [
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
+  });
+
+  const paginationService = new PaginationServiceStub();
+
+  themeService = getMockThemeService();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        NgbModule,
+        NoopAnimationsModule,
+      ],
+      declarations: [CommunityPageSubCommunityListComponent],
+      providers: [
+        { provide: CommunityDataService, useValue: communityDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: SelectableListService, useValue: {} },
+        { provide: ThemeService, useValue: themeService },
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityPageSubCommunityListComponent);
+    comp = fixture.componentInstance;
+    comp.community = mockCommunity;
+
+  });
+
+
+  it('should display a list of sub-communities', async () => {
+    subCommList = subcommunities;
+    fixture.detectChanges();
+    await fixture.whenStable();
+    fixture.detectChanges();
+
+    const subComList: DebugElement[] = fixture.debugElement.queryAll(By.css('ul[data-test="objects"] li'));
+    expect(subComList.length).toEqual(5);
+    expect(subComList[0].nativeElement.textContent).toContain('SubCommunity 1');
+    expect(subComList[1].nativeElement.textContent).toContain('SubCommunity 2');
+    expect(subComList[2].nativeElement.textContent).toContain('SubCommunity 3');
+    expect(subComList[3].nativeElement.textContent).toContain('SubCommunity 4');
+    expect(subComList[4].nativeElement.textContent).toContain('SubCommunity 5');
+  });
+
+  it('should not display the header when list of sub-communities is empty', () => {
+    subCommList = [];
+    fixture.detectChanges();
+
+    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
+    expect(subComHead.length).toEqual(0);
+  });
+});
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
similarity index 52%
rename from src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
index e9da10bfa1..181e6a3bd4 100644
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,24 +1,35 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-
-import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
-
-import { RemoteData } from '../../core/data/remote-data';
-import { Community } from '../../core/shared/community.model';
-import { fadeIn } from '../../shared/animations/fade';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { takeUntilCompletedRemoteData } from '../../core/shared/operators';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { hasValue } from '../../shared/empty.util';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Community } from '../../../../core/shared/community.model';
+import { fadeIn } from '../../../../shared/animations/fade';
+import { hasValue } from '../../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 
 @Component({
   selector: 'ds-community-page-sub-community-list',
   styleUrls: ['./community-page-sub-community-list.component.scss'],
   templateUrl: './community-page-sub-community-list.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 /**
  * Component to render the sub-communities of a Community
@@ -52,8 +63,12 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
    */
   subCommunitiesRDObs: BehaviorSubject<RemoteData<PaginatedList<Community>>> = new BehaviorSubject<RemoteData<PaginatedList<Community>>>({} as any);
 
-  constructor(private cds: CommunityDataService,
-              private paginationService: PaginationService
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    protected cds: CommunityDataService,
+    protected paginationService: PaginationService,
+    protected route: ActivatedRoute,
   ) {
   }
 
@@ -62,9 +77,11 @@ export class CommunityPageSubCommunityListComponent implements OnInit, OnDestroy
     this.config.id = this.pageId;
     if (hasValue(this.pageSize)) {
       this.config.pageSize = this.pageSize;
+    } else {
+      this.config.pageSize = this.route.snapshot.queryParams[this.pageId + '.rpp'] ?? this.config.pageSize;
     }
-    this.config.currentPage = 1;
-    this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
+    this.config.currentPage = this.route.snapshot.queryParams[this.pageId + '.page'] ?? 1;
+    this.sortConfig = new SortOptions('dc.title', SortDirection[this.route.snapshot.queryParams[this.pageId + '.sd']] ?? SortDirection.ASC);
     this.initPage();
   }
 
@@ -75,30 +92,22 @@ 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,
           elementsPerPage: currentPagination.pageSize,
-          sort: { field: currentSort.field, direction: currentSort.direction }
+          sort: { field: currentSort.field, direction: currentSort.direction },
         });
-      })
+      }),
     ).subscribe((results) => {
       this.subCommunitiesRDObs.next(results);
-    });
-
-
-    this.cds.findByParent(this.community.id, {
-      currentPage: this.config.currentPage,
-      elementsPerPage: this.config.pageSize,
-      sort: { field: this.sortConfig.field, direction: this.sortConfig.direction }
-    }).pipe(takeUntilCompletedRemoteData()).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/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts b/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts
similarity index 64%
rename from src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
rename to src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts
index 852c53186e..8de902138e 100644
--- a/src/app/community-page/sub-community-list/themed-community-page-sub-community-list.component.ts
+++ b/src/app/community-page/sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component.ts
@@ -1,12 +1,16 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Community } from '../../../../core/shared/community.model';
+import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
-import { Component, Input } from '@angular/core';
-import { Community } from '../../core/shared/community.model';
 
 @Component({
   selector: 'ds-themed-community-page-sub-community-list',
   styleUrls: [],
-  templateUrl: '../../shared/theme-support/themed.component.html',
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedCommunityPageSubCommunityListComponent extends ThemedComponent<CommunityPageSubCommunityListComponent> {
 
@@ -19,7 +23,7 @@ export class ThemedCommunityPageSubCommunityListComponent extends ThemedComponen
   }
 
   protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../themes/${themeName}/app/community-page/sub-community-list/community-page-sub-community-list.component`);
+    return import(`../../../../../themes/${themeName}/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component`);
   }
 
   protected importUnthemedComponent(): Promise<any> {
diff --git a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts b/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
deleted file mode 100644
index 6a9de52f1f..0000000000
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
+++ /dev/null
@@ -1,206 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { CommunityPageSubCollectionListComponent } from './community-page-sub-collection-list.component';
-import { Community } from '../../core/shared/community.model';
-import { SharedModule } from '../../shared/shared.module';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { of as observableOf } from 'rxjs';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../shared/theme-support/theme.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchServiceStub } from '../../shared/testing/search-service.stub';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
-
-describe('CommunityPageSubCollectionList Component', () => {
-  let comp: CommunityPageSubCollectionListComponent;
-  let fixture: ComponentFixture<CommunityPageSubCollectionListComponent>;
-  let collectionDataServiceStub: any;
-  let themeService;
-  let subCollList = [];
-
-  const collections = [Object.assign(new Community(), {
-    id: '123456789-1',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'Collection 1' }
-      ]
-    }
-  }),
-    Object.assign(new Community(), {
-      id: '123456789-2',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 2' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-3',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 3' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-4',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 4' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-5',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 5' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-6',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 6' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-7',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Collection 7' }
-        ]
-      }
-    })
-  ];
-
-  const mockCommunity = Object.assign(new Community(), {
-    id: '123456789',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'Test title' }
-      ]
-    }
-  });
-
-  collectionDataServiceStub = {
-    findByParent(parentUUID: string, options: FindListOptions = {}) {
-      let currentPage = options.currentPage;
-      let elementsPerPage = options.elementsPerPage;
-      if (currentPage === undefined) {
-        currentPage = 1;
-      }
-      elementsPerPage = 5;
-      const startPageIndex = (currentPage - 1) * elementsPerPage;
-      let endPageIndex = (currentPage * elementsPerPage);
-      if (endPageIndex > subCollList.length) {
-        endPageIndex = subCollList.length;
-      }
-      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
-
-    }
-  };
-
-  const paginationService = new PaginationServiceStub();
-
-  themeService = getMockThemeService();
-
-  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
-  });
-
-  const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    getGroupRegistryRouterLink: '',
-    getUUIDFromString: '',
-  });
-
-  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-      name: 'test',
-      values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
-  });
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        SharedModule,
-        RouterTestingModule.withRoutes([]),
-        NgbModule,
-        NoopAnimationsModule
-      ],
-      declarations: [CommunityPageSubCollectionListComponent],
-      providers: [
-        { provide: CollectionDataService, useValue: collectionDataServiceStub },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: PaginationService, useValue: paginationService },
-        { provide: SelectableListService, useValue: {} },
-        { provide: ThemeService, useValue: themeService },
-        { provide: GroupDataService, useValue: groupDataService },
-        { provide: LinkHeadService, useValue: linkHeadService },
-        { provide: ConfigurationDataService, useValue: configurationDataService },
-        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CommunityPageSubCollectionListComponent);
-    comp = fixture.componentInstance;
-    comp.community = mockCommunity;
-  });
-
-
-  it('should display a list of collections', () => {
-    waitForAsync(() => {
-      subCollList = collections;
-      fixture.detectChanges();
-
-      const collList = fixture.debugElement.queryAll(By.css('li'));
-      expect(collList.length).toEqual(5);
-      expect(collList[0].nativeElement.textContent).toContain('Collection 1');
-      expect(collList[1].nativeElement.textContent).toContain('Collection 2');
-      expect(collList[2].nativeElement.textContent).toContain('Collection 3');
-      expect(collList[3].nativeElement.textContent).toContain('Collection 4');
-      expect(collList[4].nativeElement.textContent).toContain('Collection 5');
-    });
-  });
-
-  it('should not display the header when list of collections is empty', () => {
-    subCollList = [];
-    fixture.detectChanges();
-
-    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
-    expect(subComHead.length).toEqual(0);
-  });
-});
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
deleted file mode 100644
index 181ee7cd6f..0000000000
--- a/src/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ /dev/null
@@ -1,92 +0,0 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-
-import { BehaviorSubject, combineLatest as observableCombineLatest } from 'rxjs';
-
-import { RemoteData } from '../../core/data/remote-data';
-import { Collection } from '../../core/shared/collection.model';
-import { Community } from '../../core/shared/community.model';
-import { fadeIn } from '../../shared/animations/fade';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { switchMap } from 'rxjs/operators';
-import { hasValue } from '../../shared/empty.util';
-
-@Component({
-  selector: 'ds-community-page-sub-collection-list',
-  styleUrls: ['./community-page-sub-collection-list.component.scss'],
-  templateUrl: './community-page-sub-collection-list.component.html',
-  animations:[fadeIn]
-})
-export class CommunityPageSubCollectionListComponent implements OnInit, OnDestroy {
-  @Input() community: Community;
-
-  /**
-   * Optional page size. Overrides communityList.pageSize configuration for this component.
-   * Value can be added in the themed version of the parent component.
-   */
-  @Input() pageSize: number;
-
-  /**
-   * The pagination configuration
-   */
-  config: PaginationComponentOptions;
-
-  /**
-   * The pagination id
-   */
-  pageId = 'cmcl';
-
-  /**
-   * The sorting configuration
-   */
-  sortConfig: SortOptions;
-
-  /**
-   * A list of remote data objects of communities' collections
-   */
-  subCollectionsRDObs: BehaviorSubject<RemoteData<PaginatedList<Collection>>> = new BehaviorSubject<RemoteData<PaginatedList<Collection>>>({} as any);
-
-  constructor(private cds: CollectionDataService,
-              private paginationService: PaginationService,
-
-  ) {}
-
-  ngOnInit(): void {
-    this.config = new PaginationComponentOptions();
-    this.config.id = this.pageId;
-    if (hasValue(this.pageSize)) {
-      this.config.pageSize = this.pageSize;
-    }
-    this.config.currentPage = 1;
-    this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
-    this.initPage();
-  }
-
-  /**
-   * Initialise the list of collections
-   */
-  initPage() {
-     const pagination$ = this.paginationService.getCurrentPagination(this.config.id, this.config);
-     const sort$ = this.paginationService.getCurrentSort(this.config.id, this.sortConfig);
-
-    observableCombineLatest([pagination$, sort$]).pipe(
-      switchMap(([currentPagination, currentSort]) => {
-        return this.cds.findByParent(this.community.id, {
-          currentPage: currentPagination.currentPage,
-          elementsPerPage: currentPagination.pageSize,
-          sort: {field: currentSort.field, direction: currentSort.direction}
-        });
-      })
-    ).subscribe((results) => {
-      this.subCollectionsRDObs.next(results);
-    });
-  }
-
-  ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.config.id);
-  }
-
-}
diff --git a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts b/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
deleted file mode 100644
index c75c5b6f6c..0000000000
--- a/src/app/community-page/sub-community-list/community-page-sub-community-list.component.spec.ts
+++ /dev/null
@@ -1,207 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { By } from '@angular/platform-browser';
-
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
-import { Community } from '../../core/shared/community.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { SharedModule } from '../../shared/shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { of as observableOf } from 'rxjs';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../shared/theme-support/theme.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-
-describe('CommunityPageSubCommunityListComponent Component', () => {
-  let comp: CommunityPageSubCommunityListComponent;
-  let fixture: ComponentFixture<CommunityPageSubCommunityListComponent>;
-  let communityDataServiceStub: any;
-  let themeService;
-  let subCommList = [];
-
-  const subcommunities = [Object.assign(new Community(), {
-    id: '123456789-1',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'SubCommunity 1' }
-      ]
-    }
-  }),
-    Object.assign(new Community(), {
-      id: '123456789-2',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 2' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-3',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 3' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '12345678942',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 4' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-5',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 5' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-6',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 6' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-7',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'SubCommunity 7' }
-        ]
-      }
-    })
-  ];
-
-  const mockCommunity = Object.assign(new Community(), {
-    id: '123456789',
-    metadata: {
-      'dc.title': [
-        { language: 'en_US', value: 'Test title' }
-      ]
-    }
-  });
-
-  communityDataServiceStub = {
-    findByParent(parentUUID: string, options: FindListOptions = {}) {
-      let currentPage = options.currentPage;
-      let elementsPerPage = options.elementsPerPage;
-      if (currentPage === undefined) {
-        currentPage = 1;
-      }
-      elementsPerPage = 5;
-
-      const startPageIndex = (currentPage - 1) * elementsPerPage;
-      let endPageIndex = (currentPage * elementsPerPage);
-      if (endPageIndex > subCommList.length) {
-        endPageIndex = subCommList.length;
-      }
-      return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
-
-    }
-  };
-
-  const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
-  });
-
-  const groupDataService = jasmine.createSpyObj('groupsDataService', {
-    findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    getGroupRegistryRouterLink: '',
-    getUUIDFromString: '',
-  });
-
-  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-      name: 'test',
-      values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
-  });
-
-  const paginationService = new PaginationServiceStub();
-
-  themeService = getMockThemeService();
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot(),
-        SharedModule,
-        RouterTestingModule.withRoutes([]),
-        NgbModule,
-        NoopAnimationsModule
-      ],
-      declarations: [CommunityPageSubCommunityListComponent],
-      providers: [
-        { provide: CommunityDataService, useValue: communityDataServiceStub },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
-        { provide: PaginationService, useValue: paginationService },
-        { provide: SelectableListService, useValue: {} },
-        { provide: ThemeService, useValue: themeService },
-        { provide: GroupDataService, useValue: groupDataService },
-        { provide: LinkHeadService, useValue: linkHeadService },
-        { provide: ConfigurationDataService, useValue: configurationDataService },
-        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-      ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(CommunityPageSubCommunityListComponent);
-    comp = fixture.componentInstance;
-    comp.community = mockCommunity;
-
-  });
-
-
-  it('should display a list of sub-communities', () => {
-    waitForAsync(() => {
-      subCommList = subcommunities;
-      fixture.detectChanges();
-
-      const subComList = fixture.debugElement.queryAll(By.css('li'));
-      expect(subComList.length).toEqual(5);
-      expect(subComList[0].nativeElement.textContent).toContain('SubCommunity 1');
-      expect(subComList[1].nativeElement.textContent).toContain('SubCommunity 2');
-      expect(subComList[2].nativeElement.textContent).toContain('SubCommunity 3');
-      expect(subComList[3].nativeElement.textContent).toContain('SubCommunity 4');
-      expect(subComList[4].nativeElement.textContent).toContain('SubCommunity 5');
-    });
-  });
-
-  it('should not display the header when list of sub-communities is empty', () => {
-    subCommList = [];
-    fixture.detectChanges();
-
-    const subComHead = fixture.debugElement.queryAll(By.css('h2'));
-    expect(subComHead.length).toEqual(0);
-  });
-});
diff --git a/src/app/community-page/themed-community-page.component.ts b/src/app/community-page/themed-community-page.component.ts
index eeb058fb04..8b200b768e 100644
--- a/src/app/community-page/themed-community-page.component.ts
+++ b/src/app/community-page/themed-community-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { CommunityPageComponent } from './community-page.component';
 
diff --git a/src/app/core/auth/auth-blocking.guard.spec.ts b/src/app/core/auth/auth-blocking.guard.spec.ts
index 3747edd532..8cc071ec8e 100644
--- a/src/app/core/auth/auth-blocking.guard.spec.ts
+++ b/src/app/core/auth/auth-blocking.guard.spec.ts
@@ -1,12 +1,23 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
 
-import { AppState, storeModuleConfig } from '../../app.reducer';
-import { AuthBlockingGuard } from './auth-blocking.guard';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
 import { authReducer } from './auth.reducer';
+import { AuthBlockingGuard } from './auth-blocking.guard';
 
 describe('AuthBlockingGuard', () => {
   let guard: AuthBlockingGuard;
@@ -21,9 +32,9 @@ describe('AuthBlockingGuard', () => {
         loaded: false,
         blocking: undefined,
         loading: false,
-        authMethods: []
-      }
-    }
+        authMethods: [],
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -33,8 +44,8 @@ describe('AuthBlockingGuard', () => {
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: AuthBlockingGuard, useValue: guard }
-      ]
+        { provide: AuthBlockingGuard, useValue: guard },
+      ],
     }).compileComponents();
   }));
 
@@ -58,9 +69,9 @@ describe('AuthBlockingGuard', () => {
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'auth': {
-              blocking: true
-            }
-          })
+              blocking: true,
+            },
+          }),
         });
         mockStore.setState(state);
       });
@@ -76,9 +87,9 @@ describe('AuthBlockingGuard', () => {
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'auth': {
-              blocking: false
-            }
-          })
+              blocking: false,
+            },
+          }),
         });
         mockStore.setState(state);
       });
diff --git a/src/app/core/auth/auth-blocking.guard.ts b/src/app/core/auth/auth-blocking.guard.ts
index 9054f66f8b..b6c575d789 100644
--- a/src/app/core/auth/auth-blocking.guard.ts
+++ b/src/app/core/auth/auth-blocking.guard.ts
@@ -1,8 +1,17 @@
 import { Injectable } from '@angular/core';
 import { CanActivate } from '@angular/router';
-import { select, Store } from '@ngrx/store';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { AppState } from '../../app.reducer';
 import { isAuthenticationBlocking } from './selectors';
 
@@ -12,7 +21,7 @@ import { isAuthenticationBlocking } from './selectors';
  * To ensure all rest requests get the correct auth header.
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class AuthBlockingGuard implements CanActivate {
 
diff --git a/src/app/core/auth/auth-request.service.spec.ts b/src/app/core/auth/auth-request.service.spec.ts
index 704922c5b5..55101dd3c5 100644
--- a/src/app/core/auth/auth-request.service.spec.ts
+++ b/src/app/core/auth/auth-request.service.spec.ts
@@ -1,16 +1,22 @@
-import { AuthRequestService } from './auth-request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { PostRequest } from '../data/request.models';
 import { TestScheduler } from 'rxjs/testing';
+
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { ShortLivedToken } from './models/short-lived-token.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { AuthRequestService } from './auth-request.service';
+import { ShortLivedToken } from './models/short-lived-token.model';
 import objectContaining = jasmine.objectContaining;
-import { AuthStatus } from './models/auth-status.model';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RestRequestMethod } from '../data/rest-request-method';
+import { AuthStatus } from './models/auth-status.model';
 
 describe(`AuthRequestService`, () => {
   let halService: HALEndpointService;
@@ -29,13 +35,13 @@ describe(`AuthRequestService`, () => {
     constructor(
       hes: HALEndpointService,
       rs: RequestService,
-      rdbs: RemoteDataBuildService
+      rdbs: RemoteDataBuildService,
     ) {
       super(hes, rs, rdbs);
     }
 
-    protected createShortLivedTokenRequest(href: string): PostRequest {
-      return new PostRequest(this.requestService.generateRequestId(), href);
+    protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
+      return observableOf(new PostRequest(this.requestService.generateRequestId(), href));
     }
   }
 
@@ -43,19 +49,19 @@ describe(`AuthRequestService`, () => {
     endpointURL = 'https://rest.api/auth';
     requestID = 'requestID';
     shortLivedToken = Object.assign(new ShortLivedToken(), {
-      value: 'some-token'
+      value: 'some-token',
     });
     shortLivedTokenRD = createSuccessfulRemoteDataObject(shortLivedToken);
 
     halService = jasmine.createSpyObj('halService', {
-      'getEndpoint': cold('a', { a: endpointURL })
+      'getEndpoint': cold('a', { a: endpointURL }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       'generateRequestId': requestID,
       'send': null,
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      'buildFromRequestUUID': cold('a', { a: shortLivedTokenRD })
+      'buildFromRequestUUID': cold('a', { a: shortLivedTokenRD }),
     });
 
     service = new TestAuthRequestService(halService, requestService, rdbService);
diff --git a/src/app/core/auth/auth-request.service.ts b/src/app/core/auth/auth-request.service.ts
index 5c0c3340c7..5d11b9f4cb 100644
--- a/src/app/core/auth/auth-request.service.ts
+++ b/src/app/core/auth/auth-request.service.ts
@@ -1,18 +1,29 @@
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap, tap, take } from 'rxjs/operators';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../shared/empty.util';
-import { GetRequest, PostRequest, } from '../data/request.models';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
+import {
+  GetRequest,
+  PostRequest,
+} from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { URLCombiner } from '../url-combiner/url-combiner';
 import { AuthStatus } from './models/auth-status.model';
 import { ShortLivedToken } from './models/short-lived-token.model';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { RestRequest } from '../data/rest-request.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 
 /**
  * Abstract service to send authentication requests
@@ -23,8 +34,8 @@ export abstract class AuthRequestService {
 
   constructor(protected halService: HALEndpointService,
               protected requestService: RequestService,
-              private rdbService: RemoteDataBuildService
-              ) {
+              private rdbService: RemoteDataBuildService,
+  ) {
   }
 
   /**
@@ -65,7 +76,7 @@ export abstract class AuthRequestService {
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method)),
       distinctUntilChanged(),
       map((endpointURL: string) => new PostRequest(requestId, endpointURL, body, options)),
-      take(1)
+      take(1),
     ).subscribe((request: PostRequest) => {
       this.requestService.send(request);
     });
@@ -90,7 +101,7 @@ export abstract class AuthRequestService {
       map((endpointURL) => this.getEndpointByMethod(endpointURL, method, ...linksToFollow)),
       distinctUntilChanged(),
       map((endpointURL: string) => new GetRequest(requestId, endpointURL, undefined, options)),
-      take(1)
+      take(1),
     ).subscribe((request: GetRequest) => {
       this.requestService.send(request);
     });
@@ -100,14 +111,12 @@ export abstract class AuthRequestService {
     );
   }
   /**
-   * Factory function to create the request object to send. This needs to be a POST client side and
-   * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
-   * only the server IP to send a GET to this endpoint.
+   * Factory function to create the request object to send.
    *
    * @param href The href to send the request to
    * @protected
    */
-  protected abstract createShortLivedTokenRequest(href: string): GetRequest | PostRequest;
+  protected abstract createShortLivedTokenRequest(href: string): Observable<PostRequest>;
 
   /**
    * Send a request to retrieve a short-lived token which provides download access of restricted files
@@ -117,7 +126,7 @@ export abstract class AuthRequestService {
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       map((href: string) => new URLCombiner(href, this.shortlivedtokensEndpoint).toString()),
-      map((endpointURL: string) => this.createShortLivedTokenRequest(endpointURL)),
+      switchMap((endpointURL: string) => this.createShortLivedTokenRequest(endpointURL)),
       tap((request: RestRequest) => this.requestService.send(request)),
       switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID<ShortLivedToken>(request.uuid)),
       getFirstCompletedRemoteData(),
@@ -127,7 +136,7 @@ export abstract class AuthRequestService {
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/auth/auth.actions.ts b/src/app/core/auth/auth.actions.ts
index 60440d371e..03b6bc1191 100644
--- a/src/app/core/auth/auth.actions.ts
+++ b/src/app/core/auth/auth.actions.ts
@@ -1,12 +1,13 @@
 /* eslint-disable max-classes-per-file */
 // import @ngrx
 import { Action } from '@ngrx/store';
+
 // import type function
 import { type } from '../../shared/ngrx/type';
-// import models
-import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthStatus } from './models/auth-status.model';
+// import models
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 export const AuthActionTypes = {
   AUTHENTICATE: type('dspace/auth/AUTHENTICATE'),
@@ -17,6 +18,7 @@ export const AuthActionTypes = {
   AUTHENTICATED_SUCCESS: type('dspace/auth/AUTHENTICATED_SUCCESS'),
   CHECK_AUTHENTICATION_TOKEN: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN'),
   CHECK_AUTHENTICATION_TOKEN_COOKIE: type('dspace/auth/CHECK_AUTHENTICATION_TOKEN_COOKIE'),
+  SET_AUTH_COOKIE_STATUS: type('dspace/auth/SET_AUTH_COOKIE_STATUS'),
   RETRIEVE_AUTH_METHODS: type('dspace/auth/RETRIEVE_AUTH_METHODS'),
   RETRIEVE_AUTH_METHODS_SUCCESS: type('dspace/auth/RETRIEVE_AUTH_METHODS_SUCCESS'),
   RETRIEVE_AUTH_METHODS_ERROR: type('dspace/auth/RETRIEVE_AUTH_METHODS_ERROR'),
@@ -37,7 +39,7 @@ export const AuthActionTypes = {
   RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'),
   REDIRECT_AFTER_LOGIN_SUCCESS: type('dspace/auth/REDIRECT_AFTER_LOGIN_SUCCESS'),
   SET_USER_AS_IDLE: type('dspace/auth/SET_USER_AS_IDLE'),
-  UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE')
+  UNSET_USER_AS_IDLE: type('dspace/auth/UNSET_USER_AS_IDLE'),
 };
 
 
@@ -150,6 +152,19 @@ export class CheckAuthenticationTokenCookieAction implements Action {
   public type: string = AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE;
 }
 
+/**
+ * Sets the authentication cookie status to flag an external authentication response.
+ */
+export class SetAuthCookieStatus implements Action {
+  public type: string = AuthActionTypes.SET_AUTH_COOKIE_STATUS;
+
+  payload = false;
+
+  constructor(exists: boolean) {
+    this.payload = exists;
+  }
+}
+
 /**
  * Sign out.
  * @class LogOutAction
@@ -412,6 +427,15 @@ export class UnsetUserAsIdleAction implements Action {
   public type: string = AuthActionTypes.UNSET_USER_AS_IDLE;
 }
 
+/**
+ * Authentication error actions that include Error payloads.
+ */
+export type AuthErrorActionsWithErrorPayload
+  = AuthenticatedErrorAction
+  | AuthenticationErrorAction
+  | LogOutErrorAction
+  | RetrieveAuthenticatedEpersonErrorAction;
+
 /**
  * Actions type.
  * @type {AuthActions}
@@ -419,12 +443,11 @@ export class UnsetUserAsIdleAction implements Action {
 export type AuthActions
   = AuthenticateAction
   | AuthenticatedAction
-  | AuthenticatedErrorAction
   | AuthenticatedSuccessAction
-  | AuthenticationErrorAction
   | AuthenticationSuccessAction
   | CheckAuthenticationTokenAction
   | CheckAuthenticationTokenCookieAction
+  | SetAuthCookieStatus
   | RedirectWhenAuthenticationIsRequiredAction
   | RedirectWhenTokenExpiredAction
   | AddAuthenticationMessageAction
@@ -437,10 +460,9 @@ export type AuthActions
   | RetrieveAuthMethodsErrorAction
   | RetrieveTokenAction
   | RetrieveAuthenticatedEpersonAction
-  | RetrieveAuthenticatedEpersonErrorAction
   | RetrieveAuthenticatedEpersonSuccessAction
   | SetRedirectUrlAction
   | RedirectAfterLoginSuccessAction
   | SetUserAsIdleAction
-  | UnsetUserAsIdleAction;
-
+  | UnsetUserAsIdleAction
+  | AuthErrorActionsWithErrorPayload;
diff --git a/src/app/core/auth/auth.effects.spec.ts b/src/app/core/auth/auth.effects.spec.ts
index f09db04d99..a423455594 100644
--- a/src/app/core/auth/auth.effects.spec.ts
+++ b/src/app/core/auth/auth.effects.spec.ts
@@ -1,12 +1,38 @@
-import { fakeAsync, TestBed, tick } from '@angular/core/testing';
-
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
-import { cold, hot } from 'jasmine-marbles';
-import { Observable, of as observableOf, throwError as observableThrow } from 'rxjs';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+  throwError as observableThrow,
+} from 'rxjs';
 
-import { AuthEffects } from './auth.effects';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
+import {
+  authMethodsMock,
+  AuthServiceStub,
+} from '../../shared/testing/auth-service.stub';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { StoreActionTypes } from '../../store.actions';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import {
   AuthActionTypes,
   AuthenticatedAction,
@@ -25,17 +51,16 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
-  RetrieveTokenAction
+  RetrieveTokenAction,
 } from './auth.actions';
-import { authMethodsMock, AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from './auth.service';
+import { AuthEffects } from './auth.effects';
 import { authReducer } from './auth.reducer';
+import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
-import { EPersonMock } from '../../shared/testing/eperson.mock';
-import { AppState, storeModuleConfig } from '../../app.reducer';
-import { StoreActionTypes } from '../../store.actions';
-import { isAuthenticated, isAuthenticatedLoaded } from './selectors';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import {
+  isAuthenticated,
+  isAuthenticatedLoaded,
+} from './selectors';
 
 describe('AuthEffects', () => {
   let authEffects: AuthEffects;
@@ -56,9 +81,9 @@ describe('AuthEffects', () => {
           authenticated: false,
           loaded: false,
           loading: false,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
   }
 
@@ -66,7 +91,7 @@ describe('AuthEffects', () => {
     init();
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig)
+        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
       ],
       providers: [
         AuthEffects,
@@ -88,8 +113,8 @@ describe('AuthEffects', () => {
         actions = hot('--a-', {
           a: {
             type: AuthActionTypes.AUTHENTICATE,
-            payload: { email: 'user', password: 'password' }
-          }
+            payload: { email: 'user', password: 'password' },
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationSuccessAction(token) });
@@ -105,8 +130,8 @@ describe('AuthEffects', () => {
         actions = hot('--a-', {
           a: {
             type: AuthActionTypes.AUTHENTICATE,
-            payload: { email: 'user', password: 'wrongpassword' }
-          }
+            payload: { email: 'user', password: 'wrongpassword' },
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationErrorAction(new Error('Message Error test')) });
@@ -161,9 +186,9 @@ describe('AuthEffects', () => {
           type: AuthActionTypes.AUTHENTICATED_SUCCESS, payload: {
             authenticated: true,
             authToken: token,
-            userHref: EPersonMock._links.self.href
-          }
-        }
+            userHref: EPersonMock._links.self.href,
+          },
+        },
       });
 
       const expected = cold('--b-', { b: new RetrieveAuthenticatedEpersonAction(EPersonMock._links.self.href) });
@@ -211,15 +236,18 @@ describe('AuthEffects', () => {
         spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
           observableOf(
             {
-              authenticated: true
-            })
+              authenticated: true,
+            }),
         );
+        spyOn((authEffects as any).authService, 'setExternalAuthStatus');
         actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
 
         const expected = cold('--b-', { b: new RetrieveTokenAction() });
 
         expect(authEffects.checkTokenCookie$).toBeObservable(expected);
         authEffects.checkTokenCookie$.subscribe(() => {
+          expect(authServiceStub.setExternalAuthStatus).toHaveBeenCalled();
+          expect(authServiceStub.isExternalAuthentication).toBeTrue();
           expect((authEffects as any).authorizationsService.invalidateAuthorizationsRequestCache).toHaveBeenCalled();
         });
       });
@@ -227,7 +255,7 @@ describe('AuthEffects', () => {
       it('should return a RETRIEVE_AUTH_METHODS action in response to a CHECK_AUTHENTICATION_TOKEN_COOKIE action when authenticated is false', () => {
         spyOn((authEffects as any).authService, 'checkAuthenticationCookie').and.returnValue(
           observableOf(
-            { authenticated: false })
+            { authenticated: false }),
         );
         actions = hot('--a-', { a: { type: AuthActionTypes.CHECK_AUTHENTICATION_TOKEN_COOKIE } });
 
@@ -257,8 +285,8 @@ describe('AuthEffects', () => {
         actions = hot('--a-', {
           a: {
             type: AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON,
-            payload: EPersonMock._links.self.href
-          }
+            payload: EPersonMock._links.self.href,
+          },
         });
 
         const expected = cold('--b-', { b: new RetrieveAuthenticatedEpersonSuccessAction(EPersonMock.id) });
@@ -311,8 +339,8 @@ describe('AuthEffects', () => {
       it('should return a AUTHENTICATE_SUCCESS action in response to a RETRIEVE_TOKEN action', () => {
         actions = hot('--a-', {
           a: {
-            type: AuthActionTypes.RETRIEVE_TOKEN
-          }
+            type: AuthActionTypes.RETRIEVE_TOKEN,
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationSuccessAction(token) });
@@ -327,8 +355,8 @@ describe('AuthEffects', () => {
 
         actions = hot('--a-', {
           a: {
-            type: AuthActionTypes.RETRIEVE_TOKEN
-          }
+            type: AuthActionTypes.RETRIEVE_TOKEN,
+          },
         });
 
         const expected = cold('--b-', { b: new AuthenticationErrorAction(new Error('Message Error test')) });
diff --git a/src/app/core/auth/auth.effects.ts b/src/app/core/auth/auth.effects.ts
index 22d1bf35e7..2919a40fa8 100644
--- a/src/app/core/auth/auth.effects.ts
+++ b/src/app/core/auth/auth.effects.ts
@@ -1,27 +1,47 @@
-import { Injectable, NgZone } from '@angular/core';
-
+import {
+  Injectable,
+  NgZone,
+  Type,
+} from '@angular/core';
+// import @ngrx
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  Action,
+  select,
+  Store,
+} from '@ngrx/store';
 import {
   asyncScheduler,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   queueScheduler,
-  timer
+  timer,
 } from 'rxjs';
-import { catchError, filter, map, observeOn, switchMap, take, tap } from 'rxjs/operators';
-// import @ngrx
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { Action, select, Store } from '@ngrx/store';
+import {
+  catchError,
+  filter,
+  map,
+  observeOn,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-// import services
-import { AuthService } from './auth.service';
-import { EPerson } from '../eperson/models/eperson.model';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo } from './models/auth-token-info.model';
+import { environment } from '../../../environments/environment';
 import { AppState } from '../../app.reducer';
-import { isAuthenticated, isAuthenticatedLoaded } from './selectors';
+import { hasValue } from '../../shared/empty.util';
+import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
 import { StoreActionTypes } from '../../store.actions';
-import { AuthMethod } from './models/auth.method';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { RequestActionTypes } from '../data/request.actions';
+import { EPerson } from '../eperson/models/eperson.model';
+import { EnterZoneScheduler } from '../utilities/enter-zone.scheduler';
+import { LeaveZoneScheduler } from '../utilities/leave-zone.scheduler';
 // import actions
 import {
   AuthActionTypes,
@@ -31,6 +51,7 @@ import {
   AuthenticatedSuccessAction,
   AuthenticationErrorAction,
   AuthenticationSuccessAction,
+  AuthErrorActionsWithErrorPayload,
   CheckAuthenticationTokenCookieAction,
   LogOutErrorAction,
   LogOutSuccessAction,
@@ -45,20 +66,32 @@ import {
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
   RetrieveTokenAction,
-  SetUserAsIdleAction
+  SetUserAsIdleAction,
 } from './auth.actions';
-import { hasValue } from '../../shared/empty.util';
-import { environment } from '../../../environments/environment';
-import { RequestActionTypes } from '../data/request.actions';
-import { NotificationsActionTypes } from '../../shared/notifications/notifications.actions';
-import { LeaveZoneScheduler } from '../utilities/leave-zone.scheduler';
-import { EnterZoneScheduler } from '../utilities/enter-zone.scheduler';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+// import services
+import { AuthService } from './auth.service';
+import { AuthMethod } from './models/auth.method';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
+import {
+  isAuthenticated,
+  isAuthenticatedLoaded,
+} from './selectors';
 
 // Action Types that do not break/prevent the user from an idle state
 const IDLE_TIMER_IGNORE_TYPES: string[]
   = [...Object.values(AuthActionTypes).filter((t: string) => t !== AuthActionTypes.UNSET_USER_AS_IDLE),
-  ...Object.values(RequestActionTypes), ...Object.values(NotificationsActionTypes)];
+    ...Object.values(RequestActionTypes), ...Object.values(NotificationsActionTypes)];
+
+export function errorToAuthAction$<T extends AuthErrorActionsWithErrorPayload>(actionType: Type<T>, error: unknown): Observable<T> {
+  if (error instanceof Error) {
+    return observableOf(new actionType(error));
+  }
+
+  // If we caught something that's not an Error: complain & drop type safety
+  console.warn('AuthEffects caught non-Error object:', error);
+  return observableOf(new actionType(error as any));
+}
 
 @Injectable()
 export class AuthEffects {
@@ -73,14 +106,14 @@ export class AuthEffects {
       return this.authService.authenticate(action.payload.email, action.payload.password).pipe(
         take(1),
         map((response: AuthStatus) => new AuthenticationSuccessAction(response.token)),
-        catchError((error) => observableOf(new AuthenticationErrorAction(error)))
+        catchError((error: unknown) => errorToAuthAction$(AuthenticationErrorAction, error)),
       );
-    })
+    }),
   ));
 
   public authenticateSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATE_SUCCESS),
-    map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload))
+    map((action: AuthenticationSuccessAction) => new AuthenticatedAction(action.payload)),
   ));
 
   public authenticated$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -88,8 +121,9 @@ export class AuthEffects {
     switchMap((action: AuthenticatedAction) => {
       return this.authService.authenticatedUser(action.payload).pipe(
         map((userHref: string) => new AuthenticatedSuccessAction((userHref !== null), action.payload, userHref)),
-        catchError((error) => observableOf(new AuthenticatedErrorAction(error))),);
-    })
+        catchError((error: unknown) => errorToAuthAction$(AuthenticatedErrorAction, error)),
+      );
+    }),
   ));
 
   public authenticatedSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -97,7 +131,7 @@ export class AuthEffects {
     tap((action: AuthenticatedSuccessAction) => this.authService.storeToken(action.payload.authToken)),
     switchMap((action: AuthenticatedSuccessAction) => this.authService.getRedirectUrl().pipe(
       take(1),
-      map((redirectUrl: string) => [action, redirectUrl])
+      map((redirectUrl: string) => [action, redirectUrl]),
     )),
     map(([action, redirectUrl]: [AuthenticatedSuccessAction, string]) => {
       if (hasValue(redirectUrl)) {
@@ -105,7 +139,7 @@ export class AuthEffects {
       } else {
         return new RetrieveAuthenticatedEpersonAction(action.payload.userHref);
       }
-    })
+    }),
   ));
 
   public redirectAfterLoginSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -113,13 +147,13 @@ export class AuthEffects {
     tap((action: RedirectAfterLoginSuccessAction) => {
       this.authService.clearRedirectUrl();
       this.authService.navigateToRedirectUrl(action.payload);
-    })
+    }),
   ), { dispatch: false });
 
   // It means "reacts to this action but don't send another"
   public authenticatedError$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATED_ERROR),
-    tap((action: LogOutSuccessAction) => this.authService.removeToken())
+    tap((action: LogOutSuccessAction) => this.authService.removeToken()),
   ), { dispatch: false });
 
   public retrieveAuthenticatedEperson$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -134,17 +168,18 @@ export class AuthEffects {
       }
       return user$.pipe(
         map((user: EPerson) => new RetrieveAuthenticatedEpersonSuccessAction(user.id)),
-        catchError((error) => observableOf(new RetrieveAuthenticatedEpersonErrorAction(error))));
-    })
+        catchError((error: unknown) => errorToAuthAction$(RetrieveAuthenticatedEpersonErrorAction, error)),
+      );
+    }),
   ));
 
   public checkToken$: Observable<Action> = createEffect(() => this.actions$.pipe(ofType(AuthActionTypes.CHECK_AUTHENTICATION_TOKEN),
     switchMap(() => {
       return this.authService.hasValidAuthenticationToken().pipe(
         map((token: AuthTokenInfo) => new AuthenticatedAction(token)),
-        catchError((error) => observableOf(new CheckAuthenticationTokenCookieAction()))
+        catchError((error: unknown) => observableOf(new CheckAuthenticationTokenCookieAction())),
       );
-    })
+    }),
   ));
 
   public checkTokenCookie$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -153,15 +188,16 @@ export class AuthEffects {
       return this.authService.checkAuthenticationCookie().pipe(
         map((response: AuthStatus) => {
           if (response.authenticated) {
+            this.authService.setExternalAuthStatus(true);
             this.authorizationsService.invalidateAuthorizationsRequestCache();
             return new RetrieveTokenAction();
           } else {
             return new RetrieveAuthMethodsAction(response);
           }
         }),
-        catchError((error) => observableOf(new AuthenticatedErrorAction(error)))
+        catchError((error: unknown) => errorToAuthAction$(AuthenticatedErrorAction, error)),
       );
-    })
+    }),
   ));
 
   public retrieveToken$: Observable<Action> = createEffect(() => this.actions$.pipe(
@@ -170,24 +206,24 @@ export class AuthEffects {
       return this.authService.refreshAuthenticationToken(null).pipe(
         take(1),
         map((token: AuthTokenInfo) => new AuthenticationSuccessAction(token)),
-        catchError((error) => observableOf(new AuthenticationErrorAction(error)))
+        catchError((error: unknown) => errorToAuthAction$(AuthenticationErrorAction, error)),
       );
-    })
+    }),
   ));
 
   public refreshToken$: Observable<Action> = createEffect(() => this.actions$.pipe(ofType(AuthActionTypes.REFRESH_TOKEN),
     switchMap((action: RefreshTokenAction) => {
       return this.authService.refreshAuthenticationToken(action.payload).pipe(
         map((token: AuthTokenInfo) => new RefreshTokenSuccessAction(token)),
-        catchError((error) => observableOf(new RefreshTokenErrorAction()))
+        catchError((error: unknown) => observableOf(new RefreshTokenErrorAction())),
       );
-    })
+    }),
   ));
 
   // It means "reacts to this action but don't send another"
   public refreshTokenSuccess$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.REFRESH_TOKEN_SUCCESS),
-    tap((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload))
+    tap((action: RefreshTokenSuccessAction) => this.authService.replaceToken(action.payload)),
   ), { dispatch: false });
 
   /**
@@ -203,7 +239,7 @@ export class AuthEffects {
         take(1),
         filter(([loaded, authenticated]) => loaded && !authenticated),
         tap(() => this.authService.removeToken()),
-        tap(() => this.authService.resetAuthenticationError())
+        tap(() => this.authService.resetAuthenticationError()),
       );
     })), { dispatch: false });
 
@@ -212,9 +248,9 @@ export class AuthEffects {
    * authorizations endpoint, to be sure to have consistent responses after a login with external idp
    *
    */
-   invalidateAuthorizationsRequestCache$ = createEffect(() => this.actions$
+  invalidateAuthorizationsRequestCache$ = createEffect(() => this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache())
+      tap(() => this.authorizationsService.invalidateAuthorizationsRequestCache()),
     ), { dispatch: false });
 
   public logOut$: Observable<Action> = createEffect(() => this.actions$
@@ -223,24 +259,24 @@ export class AuthEffects {
       switchMap(() => {
         this.authService.stopImpersonating();
         return this.authService.logout().pipe(
-          map((value) => new LogOutSuccessAction()),
-          catchError((error) => observableOf(new LogOutErrorAction(error)))
+          map(() => new LogOutSuccessAction()),
+          catchError((error: unknown) => errorToAuthAction$(LogOutErrorAction, error)),
         );
-      })
+      }),
     ));
 
   public logOutSuccess$: Observable<Action> = createEffect(() => this.actions$
     .pipe(ofType(AuthActionTypes.LOG_OUT_SUCCESS),
       tap(() => this.authService.removeToken()),
       tap(() => this.authService.clearRedirectUrl()),
-      tap(() => this.authService.refreshAfterLogout())
+      tap(() => this.authService.refreshAfterLogout()),
     ), { dispatch: false });
 
   public redirectToLoginTokenExpired$: Observable<Action> = createEffect(() => this.actions$
     .pipe(
       ofType(AuthActionTypes.REDIRECT_TOKEN_EXPIRED),
       tap(() => this.authService.removeToken()),
-      tap(() => this.authService.redirectToLoginWhenTokenExpired())
+      tap(() => this.authService.redirectToLoginWhenTokenExpired()),
     ), { dispatch: false });
 
   public retrieveMethods$: Observable<Action> = createEffect(() => this.actions$
@@ -250,9 +286,9 @@ export class AuthEffects {
         return this.authService.retrieveAuthMethodsFromAuthStatus(action.payload)
           .pipe(
             map((authMethodModels: AuthMethod[]) => new RetrieveAuthMethodsSuccessAction(authMethodModels)),
-            catchError((error) => observableOf(new RetrieveAuthMethodsErrorAction()))
+            catchError(() => observableOf(new RetrieveAuthMethodsErrorAction())),
           );
-      })
+      }),
     ));
 
   /**
@@ -267,7 +303,7 @@ export class AuthEffects {
     // in, and start a new timer
     switchMap(() =>
       // Start a timer outside of Angular's zone
-      timer(environment.auth.ui.timeUntilIdle, new LeaveZoneScheduler(this.zone, asyncScheduler))
+      timer(environment.auth.ui.timeUntilIdle, new LeaveZoneScheduler(this.zone, asyncScheduler)),
     ),
     // Re-enter the zone to dispatch the action
     observeOn(new EnterZoneScheduler(this.zone, queueScheduler)),
diff --git a/src/app/core/auth/auth.interceptor.spec.ts b/src/app/core/auth/auth.interceptor.spec.ts
index 04bbc4acaf..d824df472a 100644
--- a/src/app/core/auth/auth.interceptor.spec.ts
+++ b/src/app/core/auth/auth.interceptor.spec.ts
@@ -1,18 +1,20 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
-
 import { Store } from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 
-import { AuthInterceptor } from './auth.interceptor';
-import { AuthService } from './auth.service';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { RouterStub } from '../../shared/testing/router.stub';
 import { TruncatablesState } from '../../shared/truncatable/truncatable.reducer';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { AuthInterceptor } from './auth.interceptor';
+import { AuthService } from './auth.service';
 
 describe(`AuthInterceptor`, () => {
   let service: DspaceRestService;
@@ -20,10 +22,8 @@ describe(`AuthInterceptor`, () => {
 
   const authServiceStub = new AuthServiceStub();
   const store: Store<TruncatablesState> = jasmine.createSpyObj('store', {
-    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
-    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
 
   beforeEach(() => {
@@ -46,6 +46,10 @@ describe(`AuthInterceptor`, () => {
     httpMock = TestBed.inject(HttpTestingController);
   });
 
+  afterEach(() => {
+    httpMock.verify();
+  });
+
   describe('when has a valid token', () => {
 
     it('should not add an Authorization header when we’re sending a HTTP request to \'authn\' endpoint that is not the logout endpoint', () => {
@@ -95,14 +99,11 @@ describe(`AuthInterceptor`, () => {
     });
 
     it('should redirect to login', () => {
-
-      service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/submission/workspaceitems', 'password=password&user=user').subscribe((response) => {
-        expect(response).toBeTruthy();
-      });
-
       service.request(RestRequestMethod.POST, 'dspace-spring-rest/api/submission/workspaceitems', 'password=password&user=user');
 
       httpMock.expectNone('dspace-spring-rest/api/submission/workspaceitems');
+      // HttpTestingController.expectNone will throw an error when a requests is made
+      expect().nothing();
     });
   });
 
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index e55d0c0ff9..84d4c53210 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -1,7 +1,3 @@
-import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-
-import { catchError, map } from 'rxjs/operators';
-import { Injectable, Injector } from '@angular/core';
 import {
   HttpErrorResponse,
   HttpEvent,
@@ -10,19 +6,36 @@ import {
   HttpInterceptor,
   HttpRequest,
   HttpResponse,
-  HttpResponseBase
+  HttpResponseBase,
 } from '@angular/common/http';
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { Store } from '@ngrx/store';
+import {
+  Observable,
+  of as observableOf,
+  throwError as observableThrowError,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
 
 import { AppState } from '../../app.reducer';
-import { AuthService } from './auth.service';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo } from './models/auth-token-info.model';
-import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../shared/empty.util';
 import { RedirectWhenTokenExpiredAction } from './auth.actions';
-import { Store } from '@ngrx/store';
-import { Router } from '@angular/router';
+import { AuthService } from './auth.service';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 @Injectable()
 export class AuthInterceptor implements HttpInterceptor {
@@ -152,12 +165,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 +178,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;
@@ -196,7 +209,24 @@ export class AuthInterceptor implements HttpInterceptor {
       authStatus.token = new AuthTokenInfo(accessToken);
     } else {
       authStatus.authenticated = false;
-      authStatus.error = isNotEmpty(error) ? ((typeof error === 'string') ? JSON.parse(error) : error) : null;
+      if (isNotEmpty(error)) {
+        if (typeof error === 'string') {
+          try {
+            authStatus.error = JSON.parse(error);
+          } catch (e) {
+            console.error('Unknown auth error "', error, '" caused ', e);
+            authStatus.error = {
+              error: 'Unknown',
+              message: 'Unknown auth error',
+              status: 500,
+              timestamp: Date.now(),
+              path: '',
+            };
+          }
+        } else {
+          authStatus.error = error;
+        }
+      }
     }
     return authStatus;
   }
@@ -244,7 +274,7 @@ export class AuthInterceptor implements HttpInterceptor {
             // login successfully
             const newToken = response.headers.get('authorization');
             authRes = response.clone({
-              body: this.makeAuthStatusObject(true, newToken)
+              body: this.makeAuthStatusObject(true, newToken),
             });
 
             // clean eventually refresh Requests list
@@ -252,13 +282,13 @@ export class AuthInterceptor implements HttpInterceptor {
           } else if (this.isStatusResponse(response)) {
             authRes = response.clone({
               body: Object.assign(response.body, {
-                authMethods: this.parseAuthMethodsFromHeaders(response.headers)
-              })
+                authMethods: this.parseAuthMethodsFromHeaders(response.headers),
+              }),
             });
           } else {
             // logout successfully
             authRes = response.clone({
-              body: this.makeAuthStatusObject(false)
+              body: this.makeAuthStatusObject(false),
             });
           }
           return authRes;
@@ -266,7 +296,7 @@ export class AuthInterceptor implements HttpInterceptor {
           return response;
         }
       }),
-      catchError((error, caught) => {
+      catchError((error: unknown, caught) => {
         // Intercept an error response
         if (error instanceof HttpErrorResponse) {
 
@@ -281,7 +311,7 @@ export class AuthInterceptor implements HttpInterceptor {
               headers: error.headers,
               status: error.status,
               statusText: error.statusText,
-              url: error.url
+              url: error.url,
             });
             return observableOf(authResponse);
           } else if (this.isUnauthorized(error) && isNotNull(token) && authService.isTokenExpired()) {
diff --git a/src/app/core/auth/auth.reducer.spec.ts b/src/app/core/auth/auth.reducer.spec.ts
index 8ebc9f6cb0..7860744aa5 100644
--- a/src/app/core/auth/auth.reducer.spec.ts
+++ b/src/app/core/auth/auth.reducer.spec.ts
@@ -1,4 +1,4 @@
-import { authReducer, AuthState } from './auth.reducer';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
 import {
   AddAuthenticationMessageAction,
   AuthenticateAction,
@@ -23,15 +23,19 @@ import {
   RetrieveAuthMethodsAction,
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
+  SetAuthCookieStatus,
   SetRedirectUrlAction,
   SetUserAsIdleAction,
-  UnsetUserAsIdleAction
+  UnsetUserAsIdleAction,
 } from './auth.actions';
-import { AuthTokenInfo } from './models/auth-token-info.model';
-import { EPersonMock } from '../../shared/testing/eperson.mock';
-import { AuthStatus } from './models/auth-status.model';
+import {
+  authReducer,
+  AuthState,
+} from './auth.reducer';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 describe('authReducer', () => {
 
@@ -46,7 +50,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: true,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticateAction('user', 'password');
     const newState = authReducer(initialState, action);
@@ -57,7 +61,7 @@ describe('authReducer', () => {
       error: undefined,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
 
     expect(newState).toEqual(state);
@@ -71,7 +75,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticationSuccessAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
@@ -87,7 +91,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticationErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -99,7 +103,7 @@ describe('authReducer', () => {
       info: undefined,
       authToken: undefined,
       error: 'Test error message',
-      idle: false
+      idle: false,
     };
 
     expect(newState).toEqual(state);
@@ -113,7 +117,7 @@ describe('authReducer', () => {
       error: undefined,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticatedAction(mockTokenInfo);
     const newState = authReducer(initialState, action);
@@ -124,7 +128,7 @@ describe('authReducer', () => {
       error: undefined,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -137,7 +141,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticatedSuccessAction(true, mockTokenInfo, EPersonMock._links.self.href);
     const newState = authReducer(initialState, action);
@@ -149,7 +153,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -162,7 +166,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new AuthenticatedErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -174,7 +178,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -185,7 +189,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new CheckAuthenticationTokenAction();
     const newState = authReducer(initialState, action);
@@ -194,7 +198,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -205,7 +209,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
-      idle: false
+      idle: false,
     };
     const action = new CheckAuthenticationTokenCookieAction();
     const newState = authReducer(initialState, action);
@@ -214,7 +218,29 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: true,
-      idle: false
+      idle: false,
+    };
+    expect(newState).toEqual(state);
+  });
+
+  it('should set the authentication cookie status in response to a SET_AUTH_COOKIE_STATUS action', () => {
+    initialState = {
+      authenticated: true,
+      loaded: false,
+      blocking: false,
+      loading: true,
+      externalAuth: false,
+      idle: false,
+    };
+    const action = new SetAuthCookieStatus(true);
+    const newState = authReducer(initialState, action);
+    state = {
+      authenticated: true,
+      loaded: false,
+      blocking: false,
+      loading: true,
+      externalAuth: true,
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -229,7 +255,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     const action = new LogOutAction();
@@ -248,7 +274,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     const action = new LogOutSuccessAction();
@@ -263,7 +289,7 @@ describe('authReducer', () => {
       info: undefined,
       refreshing: false,
       userId: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -278,7 +304,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     const action = new LogOutErrorAction(mockError);
@@ -292,7 +318,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -306,7 +332,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new RetrieveAuthenticatedEpersonSuccessAction(EPersonMock.id);
     const newState = authReducer(initialState, action);
@@ -319,7 +345,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -332,7 +358,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       info: undefined,
-      idle: false
+      idle: false,
     };
     const action = new RetrieveAuthenticatedEpersonErrorAction(mockError);
     const newState = authReducer(initialState, action);
@@ -344,7 +370,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -359,7 +385,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     const newTokenInfo = new AuthTokenInfo('Refreshed token');
     const action = new RefreshTokenAction(newTokenInfo);
@@ -374,7 +400,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: true,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -390,7 +416,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: true,
-      idle: false
+      idle: false,
     };
     const newTokenInfo = new AuthTokenInfo('Refreshed token');
     const action = new RefreshTokenSuccessAction(newTokenInfo);
@@ -405,7 +431,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: false,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -421,7 +447,7 @@ describe('authReducer', () => {
       info: undefined,
       userId: EPersonMock.id,
       refreshing: true,
-      idle: false
+      idle: false,
     };
     const action = new RefreshTokenErrorAction();
     const newState = authReducer(initialState, action);
@@ -435,7 +461,7 @@ describe('authReducer', () => {
       info: undefined,
       refreshing: false,
       userId: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -450,7 +476,7 @@ describe('authReducer', () => {
       loading: false,
       info: undefined,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
 
     state = {
@@ -462,7 +488,7 @@ describe('authReducer', () => {
       error: undefined,
       info: 'Message',
       userId: undefined,
-      idle: false
+      idle: false,
     };
   });
 
@@ -484,7 +510,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new AddAuthenticationMessageAction('Message');
     const newState = authReducer(initialState, action);
@@ -494,7 +520,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       info: 'Message',
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -507,7 +533,7 @@ describe('authReducer', () => {
       loading: false,
       error: 'Error',
       info: 'Message',
-      idle: false
+      idle: false,
     };
     const action = new ResetAuthenticationMessagesAction();
     const newState = authReducer(initialState, action);
@@ -518,7 +544,7 @@ describe('authReducer', () => {
       loading: false,
       error: undefined,
       info: undefined,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -529,7 +555,7 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     const action = new SetRedirectUrlAction('redirect.url');
     const newState = authReducer(initialState, action);
@@ -539,7 +565,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       redirectUrl: 'redirect.url',
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -551,7 +577,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       authMethods: [],
-      idle: false
+      idle: false,
     };
     const action = new RetrieveAuthMethodsAction(new AuthStatus());
     const newState = authReducer(initialState, action);
@@ -561,7 +587,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: true,
       authMethods: [],
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -573,11 +599,11 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       authMethods: [],
-      idle: false
+      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);
@@ -587,7 +613,7 @@ describe('authReducer', () => {
       blocking: false,
       loading: false,
       authMethods: authMethods,
-      idle: false
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -599,7 +625,7 @@ describe('authReducer', () => {
       blocking: true,
       loading: true,
       authMethods: [],
-      idle: false
+      idle: false,
     };
 
     const action = new RetrieveAuthMethodsErrorAction();
@@ -609,8 +635,8 @@ describe('authReducer', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      authMethods: [new AuthMethod(AuthMethodType.Password)],
-      idle: false
+      authMethods: [new AuthMethod(AuthMethodType.Password, 0)],
+      idle: false,
     };
     expect(newState).toEqual(state);
   });
@@ -621,7 +647,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
 
     const action = new SetUserAsIdleAction();
@@ -631,7 +657,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: true
+      idle: true,
     };
     expect(newState).toEqual(state);
   });
@@ -642,7 +668,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: true
+      idle: true,
     };
 
     const action = new UnsetUserAsIdleAction();
@@ -652,7 +678,7 @@ describe('authReducer', () => {
       loaded: true,
       blocking: false,
       loading: false,
-      idle: false
+      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 acdb8ef812..8a399710ea 100644
--- a/src/app/core/auth/auth.reducer.ts
+++ b/src/app/core/auth/auth.reducer.ts
@@ -1,4 +1,5 @@
 // import actions
+import { StoreActionTypes } from '../../store.actions';
 import {
   AddAuthenticationMessageAction,
   AuthActions,
@@ -11,13 +12,13 @@ import {
   RefreshTokenSuccessAction,
   RetrieveAuthenticatedEpersonSuccessAction,
   RetrieveAuthMethodsSuccessAction,
-  SetRedirectUrlAction
+  SetAuthCookieStatus,
+  SetRedirectUrlAction,
 } from './auth.actions';
-// import models
-import { AuthTokenInfo } from './models/auth-token-info.model';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
-import { StoreActionTypes } from '../../store.actions';
+// import models
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 /**
  * The auth state.
@@ -59,6 +60,8 @@ export interface AuthState {
   // all authentication Methods enabled at the backend
   authMethods?: AuthMethod[];
 
+  externalAuth?: boolean,
+
   // true when the current user is idle
   idle: boolean;
 
@@ -73,7 +76,8 @@ const initialState: AuthState = {
   blocking: true,
   loading: false,
   authMethods: [],
-  idle: false
+  externalAuth: false,
+  idle: false,
 };
 
 /**
@@ -89,13 +93,13 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         error: undefined,
         loading: true,
-        info: undefined
+        info: undefined,
       });
 
     case AuthActionTypes.AUTHENTICATED:
       return Object.assign({}, state, {
         loading: true,
-        blocking: true
+        blocking: true,
       });
 
     case AuthActionTypes.CHECK_AUTHENTICATION_TOKEN:
@@ -104,6 +108,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: true,
       });
 
+    case AuthActionTypes.SET_AUTH_COOKIE_STATUS:
+      return Object.assign({}, state, {
+        externalAuth: (action as SetAuthCookieStatus).payload,
+      });
+
     case AuthActionTypes.AUTHENTICATED_ERROR:
     case AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON_ERROR:
       return Object.assign({}, state, {
@@ -112,13 +121,13 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         error: (action as AuthenticationErrorAction).payload.message,
         loaded: true,
         blocking: false,
-        loading: false
+        loading: false,
       });
 
     case AuthActionTypes.AUTHENTICATED_SUCCESS:
       return Object.assign({}, state, {
         authenticated: true,
-        authToken: (action as AuthenticatedSuccessAction).payload.authToken
+        authToken: (action as AuthenticatedSuccessAction).payload.authToken,
       });
 
     case AuthActionTypes.RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS:
@@ -128,7 +137,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: false,
         blocking: false,
         info: undefined,
-        userId: (action as RetrieveAuthenticatedEpersonSuccessAction).payload
+        userId: (action as RetrieveAuthenticatedEpersonSuccessAction).payload,
       });
 
     case AuthActionTypes.AUTHENTICATE_ERROR:
@@ -137,7 +146,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         authToken: undefined,
         error: (action as AuthenticationErrorAction).payload.message,
         blocking: false,
-        loading: false
+        loading: false,
       });
 
     case AuthActionTypes.AUTHENTICATE_SUCCESS:
@@ -147,7 +156,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
     case AuthActionTypes.LOG_OUT_ERROR:
       return Object.assign({}, state, {
         authenticated: true,
-        error: (action as LogOutErrorAction).payload.message
+        error: (action as LogOutErrorAction).payload.message,
       });
 
     case AuthActionTypes.REFRESH_TOKEN_ERROR:
@@ -160,7 +169,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: false,
         info: undefined,
         refreshing: false,
-        userId: undefined
+        userId: undefined,
       });
 
     case AuthActionTypes.LOG_OUT_SUCCESS:
@@ -173,7 +182,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         loading: true,
         info: undefined,
         refreshing: false,
-        userId: undefined
+        userId: undefined,
       });
 
     case AuthActionTypes.REDIRECT_AUTHENTICATION_REQUIRED:
@@ -185,7 +194,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         blocking: false,
         loading: false,
         info: (action as RedirectWhenTokenExpiredAction as RedirectWhenAuthenticationIsRequiredAction).payload,
-        userId: undefined
+        userId: undefined,
       });
 
     case AuthActionTypes.REFRESH_TOKEN:
@@ -197,7 +206,7 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         authToken: (action as RefreshTokenSuccessAction).payload,
         refreshing: false,
-        blocking: false
+        blocking: false,
       });
 
     case AuthActionTypes.ADD_MESSAGE:
@@ -221,14 +230,14 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
       return Object.assign({}, state, {
         loading: false,
         blocking: false,
-        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload
+        authMethods: (action as RetrieveAuthMethodsSuccessAction).payload,
       });
 
     case AuthActionTypes.RETRIEVE_AUTH_METHODS_ERROR:
       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..7e2f4f5fe1 100644
--- a/src/app/core/auth/auth.service.spec.ts
+++ b/src/app/core/auth/auth.service.spec.ts
@@ -1,46 +1,75 @@
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-import { Observable, of as observableOf } from 'rxjs';
-import { authReducer, AuthState } from './auth.reducer';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { AuthService, IMPERSONATING_COOKIE } from './auth.service';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { CookieService } from '../services/cookie.service';
-import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service.stub';
-import { AuthRequestService } from './auth-request.service';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo } from './models/auth-token-info.model';
-import { EPerson } from '../eperson/models/eperson.model';
-import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { TranslateService } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AppState } from '../../app.reducer';
-import { ClientCookieService } from '../services/client-cookie.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { AuthRequestServiceStub } from '../../shared/testing/auth-request-service.stub';
+import { authMethodsMock } from '../../shared/testing/auth-service.stub';
+import { EPersonMock } from '../../shared/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { RouteService } from '../services/route.service';
+import { RouterStub } from '../../shared/testing/router.stub';
+import {
+  SpecialGroupDataMock,
+  SpecialGroupDataMock$,
+} from '../../shared/testing/special-group.mock';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RemoteData } from '../data/remote-data';
 import { EPersonDataService } from '../eperson/eperson-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { authMethodsMock } from '../../shared/testing/auth-service.stub';
-import { AuthMethod } from './models/auth.method';
+import { EPerson } from '../eperson/models/eperson.model';
+import { ClientCookieService } from '../services/client-cookie.service';
+import { CookieService } from '../services/cookie.service';
 import { HardRedirectService } from '../services/hard-redirect.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SetUserAsIdleAction, UnsetUserAsIdleAction } from './auth.actions';
-import { SpecialGroupDataMock, SpecialGroupDataMock$ } from '../../shared/testing/special-group.mock';
-import { cold } from 'jasmine-marbles';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import {
+  SetUserAsIdleAction,
+  UnsetUserAsIdleAction,
+} from './auth.actions';
+import {
+  authReducer,
+  AuthState,
+} from './auth.reducer';
+import {
+  AuthService,
+  IMPERSONATING_COOKIE,
+} from './auth.service';
+import { AuthRequestService } from './auth-request.service';
+import { AuthMethod } from './models/auth.method';
+import { AuthStatus } from './models/auth-status.model';
+import { AuthTokenInfo } from './models/auth-token-info.model';
 
 describe('AuthService test', () => {
 
   const mockEpersonDataService: any = {
     findByHref(href: string): Observable<RemoteData<EPerson>> {
       return createSuccessfulRemoteDataObject$(EPersonMock);
-    }
+    },
   };
 
   let mockStore: Store<AuthState>;
@@ -62,13 +91,13 @@ describe('AuthService test', () => {
     uuid: 'test',
     authenticated: true,
     okay: true,
-    specialGroups: SpecialGroupDataMock$
+    specialGroups: SpecialGroupDataMock$,
   });
 
   function init() {
     mockStore = jasmine.createSpyObj('store', {
       dispatch: {},
-      pipe: observableOf(true)
+      pipe: observableOf(true),
     });
     window = new NativeWindowRef();
     routerStub = new RouterStub();
@@ -80,7 +109,7 @@ describe('AuthService test', () => {
       loading: false,
       authToken: token,
       user: EPersonMock,
-      idle: false
+      idle: false,
     };
     unAuthenticatedState = {
       authenticated: false,
@@ -88,7 +117,7 @@ describe('AuthService test', () => {
       loading: false,
       authToken: undefined,
       user: undefined,
-      idle: false
+      idle: false,
     };
     idleState = {
       authenticated: true,
@@ -96,12 +125,12 @@ describe('AuthService test', () => {
       loading: false,
       authToken: token,
       user: EPersonMock,
-      idle: true
+      idle: true,
     };
     authRequest = new AuthRequestServiceStub();
     routeStub = new ActivatedRouteStub();
     linkService = {
-      resolveLinks: {}
+      resolveLinks: {},
     };
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', ['redirect']);
     spyOn(linkService, 'resolveLinks').and.returnValue({ authenticated: true, eperson: observableOf({ payload: {} }) });
@@ -117,8 +146,8 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
+              strictActionImmutability: false,
+            },
           }),
         ],
         declarations: [],
@@ -135,7 +164,7 @@ describe('AuthService test', () => {
           { provide: NotificationsService, useValue: NotificationsServiceStub },
           { provide: TranslateService, useValue: getMockTranslateService() },
           CookieService,
-          AuthService
+          AuthService,
         ],
       });
       authService = TestBed.inject(AuthService);
@@ -238,9 +267,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -249,8 +278,8 @@ describe('AuthService test', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: RemoteDataBuildService, useValue: linkService },
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
@@ -313,9 +342,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -325,8 +354,8 @@ describe('AuthService test', () => {
           { provide: RemoteDataBuildService, useValue: linkService },
           ClientCookieService,
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
@@ -338,7 +367,7 @@ describe('AuthService test', () => {
         loaded: true,
         loading: false,
         authToken: expiredToken,
-        user: EPersonMock
+        user: EPersonMock,
       };
       store
         .subscribe((state) => {
@@ -528,7 +557,7 @@ describe('AuthService test', () => {
 
       it('should call navigateToRedirectUrl with no url', () => {
         const expectRes = cold('(a|)', {
-          a: SpecialGroupDataMock
+          a: SpecialGroupDataMock,
         });
         expect(authService.getSpecialGroupsFromAuthStatus()).toBeObservable(expectRes);
       });
@@ -543,9 +572,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -554,8 +583,8 @@ describe('AuthService test', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: RemoteDataBuildService, useValue: linkService },
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
@@ -583,9 +612,9 @@ describe('AuthService test', () => {
           StoreModule.forRoot({ authReducer }, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
-          })
+              strictActionImmutability: false,
+            },
+          }),
         ],
         providers: [
           { provide: AuthRequestService, useValue: authRequest },
@@ -594,8 +623,8 @@ describe('AuthService test', () => {
           { provide: RouteService, useValue: routeServiceStub },
           { provide: RemoteDataBuildService, useValue: linkService },
           CookieService,
-          AuthService
-        ]
+          AuthService,
+        ],
       }).compileComponents();
     }));
 
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 3034c00197..7da72b25b6 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -1,18 +1,34 @@
-import { Inject, Injectable, Optional } 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';
-import { select, Store } from '@ngrx/store';
+import {
+  Inject,
+  Injectable,
+  Optional,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  REQUEST,
+  RESPONSE,
+} from '@nguniversal/express-engine/tokens';
+import { TranslateService } from '@ngx-translate/core';
 import { CookieAttributes } from 'js-cookie';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { EPerson } from '../eperson/models/eperson.model';
-import { AuthRequestService } from './auth-request.service';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { AuthStatus } from './models/auth-status.model';
-import { AuthTokenInfo, TOKENITEM } from './models/auth-token-info.model';
+import { environment } from '../../../environments/environment';
+import { AppState } from '../../app.reducer';
 import {
   hasNoValue,
   hasValue,
@@ -20,42 +36,58 @@ import {
   isEmpty,
   isNotEmpty,
   isNotNull,
-  isNotUndefined
+  isNotUndefined,
 } from '../../shared/empty.util';
-import { CookieService } from '../services/cookie.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import {
-  getAuthenticatedUserId,
-  getAuthenticationToken,
-  getRedirectUrl,
-  isAuthenticated,
-  isAuthenticatedLoaded,
-  isIdle,
-  isTokenRefreshing
-} from './selectors';
-import { AppState } from '../../app.reducer';
+  buildPaginatedList,
+  PaginatedList,
+} from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { EPersonDataService } from '../eperson/eperson-data.service';
+import { EPerson } from '../eperson/models/eperson.model';
+import { Group } from '../eperson/models/group.model';
+import { CookieService } from '../services/cookie.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+} from '../shared/operators';
+import { PageInfo } from '../shared/page-info.model';
 import {
   CheckAuthenticationTokenAction,
   RefreshTokenAction,
   ResetAuthenticationMessagesAction,
+  SetAuthCookieStatus,
   SetRedirectUrlAction,
   SetUserAsIdleAction,
-  UnsetUserAsIdleAction
+  UnsetUserAsIdleAction,
 } from './auth.actions';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { RouteService } from '../services/route.service';
-import { EPersonDataService } from '../eperson/eperson-data.service';
-import { getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../shared/operators';
+import { AuthRequestService } from './auth-request.service';
 import { AuthMethod } from './models/auth.method';
-import { HardRedirectService } from '../services/hard-redirect.service';
-import { RemoteData } from '../data/remote-data';
-import { environment } from '../../../environments/environment';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { buildPaginatedList, PaginatedList } from '../data/paginated-list.model';
-import { Group } from '../eperson/models/group.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PageInfo } from '../shared/page-info.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
+import { AuthStatus } from './models/auth-status.model';
+import {
+  AuthTokenInfo,
+  TOKENITEM,
+} from './models/auth-token-info.model';
+import {
+  getAuthenticatedUserId,
+  getAuthenticationToken,
+  getExternalAuthCookieStatus,
+  getRedirectUrl,
+  isAuthenticated,
+  isAuthenticatedLoaded,
+  isIdle,
+  isTokenRefreshing,
+} from './selectors';
 
 export const LOGIN_ROUTE = '/login';
 export const LOGOUT_ROUTE = '/logout';
@@ -90,13 +122,13 @@ export class AuthService {
               protected store: Store<AppState>,
               protected hardRedirectService: HardRedirectService,
               private notificationService: NotificationsService,
-              private translateService: TranslateService
+              private translateService: TranslateService,
   ) {
     this.store.pipe(
       // when this service is constructed the store is not fully initialized yet
       filter((state: any) => state?.core?.auth !== undefined),
       select(isAuthenticated),
-      startWith(false)
+      startWith(false),
     ).subscribe((authenticated: boolean) => this._authenticated = authenticated);
   }
 
@@ -119,7 +151,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'));
         }
       }));
 
@@ -136,7 +168,7 @@ export class AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
+      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload)),
     );
   }
 
@@ -156,6 +188,24 @@ export class AuthService {
     return this.store.pipe(select(isAuthenticatedLoaded));
   }
 
+  /**
+   * Used to set the external authentication status when authenticating via an
+   * external authentication system (e.g. Shibboleth).
+   * @param external
+   */
+  public setExternalAuthStatus(external: boolean) {
+    this.store.dispatch(new SetAuthCookieStatus(external));
+  }
+
+  /**
+   * Returns true if an external authentication system (e.g. Shibboleth) is being used
+   * for authentication. Returns false otherwise.
+   */
+  public isExternalAuthentication(): Observable<boolean> {
+    return this.store.pipe(
+      select(getExternalAuthCookieStatus));
+  }
+
   /**
    * Returns the href link to authenticated user
    * @returns {string}
@@ -184,7 +234,7 @@ export class AuthService {
    */
   public retrieveAuthenticatedUserByHref(userHref: string): Observable<EPerson> {
     return this.epersonService.findByHref(userHref).pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -194,7 +244,7 @@ export class AuthService {
    */
   public retrieveAuthenticatedUserById(userId: string): Observable<EPerson> {
     return this.epersonService.findById(userId).pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -207,7 +257,7 @@ export class AuthService {
       select(getAuthenticatedUserId),
       hasValueOperator(),
       switchMap((id: string) => this.epersonService.findById(id)),
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -230,7 +280,7 @@ export class AuthService {
         } else {
           return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(),[]));
         }
-      })
+      }),
     );
   }
 
@@ -242,15 +292,14 @@ export class AuthService {
       select(getAuthenticationToken),
       take(1),
       map((authTokenInfo: AuthTokenInfo) => {
-        let token: AuthTokenInfo;
         // Retrieve authentication token info and check if is valid
-        token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM);
+        const token = isNotEmpty(authTokenInfo) ? authTokenInfo : this.storage.get(TOKENITEM);
         if (isNotEmpty(token) && token.hasOwnProperty('accessToken') && isNotEmpty(token.accessToken) && !this.isTokenExpired(token)) {
           return token;
         } else {
           throw false;
         }
-      })
+      }),
     );
   }
 
@@ -394,7 +443,7 @@ export class AuthService {
           const token = this.getToken();
           return token.expires - (60 * 5 * 1000) < Date.now();
         }
-      })
+      }),
     );
   }
 
@@ -419,7 +468,7 @@ export class AuthService {
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = {expires: expires};
+    const options: CookieAttributes = { expires: expires };
 
     // Save cookie with the token
     return this.storage.set(TOKENITEM, token, options);
@@ -498,7 +547,7 @@ export class AuthService {
         } else {
           return this.storage.get(REDIRECT_COOKIE);
         }
-      })
+      }),
     );
   }
 
@@ -511,7 +560,7 @@ export class AuthService {
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = {expires: expires};
+    const options: CookieAttributes = { expires: expires };
     this.storage.set(REDIRECT_COOKIE, url, options);
     this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
   }
@@ -591,7 +640,7 @@ export class AuthService {
    */
   getShortlivedToken(): Observable<string> {
     return this.isAuthenticated().pipe(
-      switchMap((authenticated) => authenticated ? this.authRequestService.getShortlivedToken() : observableOf(null))
+      switchMap((authenticated) => authenticated ? this.authRequestService.getShortlivedToken() : observableOf(null)),
     );
   }
 
diff --git a/src/app/core/auth/authenticated.guard.ts b/src/app/core/auth/authenticated.guard.ts
index 1ab1d2e0a5..4a989e0979 100644
--- a/src/app/core/auth/authenticated.guard.ts
+++ b/src/app/core/auth/authenticated.guard.ts
@@ -4,16 +4,28 @@ import {
   CanActivate,
   Router,
   RouterStateSnapshot,
-  UrlTree
+  UrlTree,
 } from '@angular/router';
-
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { map, find, switchMap } from 'rxjs/operators';
-import { select, Store } from '@ngrx/store';
+import {
+  find,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { isAuthenticated, isAuthenticationLoading } from './selectors';
-import { AuthService, LOGIN_ROUTE } from './auth.service';
 import { CoreState } from '../core-state.model';
+import {
+  AuthService,
+  LOGIN_ROUTE,
+} from './auth.service';
+import {
+  isAuthenticated,
+  isAuthenticationLoading,
+} from './selectors';
 
 /**
  * Prevent unauthorized activating and loading of routes
@@ -59,7 +71,7 @@ export class AuthenticatedGuard implements CanActivate {
           this.authService.removeToken();
           return this.router.createUrlTree([LOGIN_ROUTE]);
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/auth/browser-auth-request.service.spec.ts b/src/app/core/auth/browser-auth-request.service.spec.ts
index 18d27340af..9649255b23 100644
--- a/src/app/core/auth/browser-auth-request.service.spec.ts
+++ b/src/app/core/auth/browser-auth-request.service.spec.ts
@@ -1,5 +1,8 @@
-import { AuthRequestService } from './auth-request.service';
+import { Observable } from 'rxjs';
+
+import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { AuthRequestService } from './auth-request.service';
 import { BrowserAuthRequestService } from './browser-auth-request.service';
 
 describe(`BrowserAuthRequestService`, () => {
@@ -10,20 +13,26 @@ describe(`BrowserAuthRequestService`, () => {
   beforeEach(() => {
     href = 'https://rest.api/auth/shortlivedtokens';
     requestService = jasmine.createSpyObj('requestService', {
-      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2'
+      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2',
     });
     service = new BrowserAuthRequestService(null, requestService, null);
   });
 
   describe(`createShortLivedTokenRequest`, () => {
-    it(`should return a PostRequest`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.constructor.name).toBe('PostRequest');
+    it(`should return a PostRequest`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.constructor.name).toBe('PostRequest');
+        done();
+      });
     });
 
-    it(`should return a request with the given href`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.href).toBe(href) ;
+    it(`should return a request with the given href`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.href).toBe(href);
+        done();
+      });
     });
   });
 });
diff --git a/src/app/core/auth/browser-auth-request.service.ts b/src/app/core/auth/browser-auth-request.service.ts
index 85d5f54340..d708cd8982 100644
--- a/src/app/core/auth/browser-auth-request.service.ts
+++ b/src/app/core/auth/browser-auth-request.service.ts
@@ -1,9 +1,14 @@
 import { Injectable } from '@angular/core';
-import { AuthRequestService } from './auth-request.service';
-import { PostRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { AuthRequestService } from './auth-request.service';
 
 /**
  * Client side version of the service to send authentication requests
@@ -14,21 +19,19 @@ export class BrowserAuthRequestService extends AuthRequestService {
   constructor(
     halService: HALEndpointService,
     requestService: RequestService,
-    rdbService: RemoteDataBuildService
+    rdbService: RemoteDataBuildService,
   ) {
     super(halService, requestService, rdbService);
   }
 
   /**
-   * Factory function to create the request object to send. This needs to be a POST client side and
-   * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
-   * only the server IP to send a GET to this endpoint.
+   * Factory function to create the request object to send.
    *
    * @param href The href to send the request to
    * @protected
    */
-  protected createShortLivedTokenRequest(href: string): PostRequest {
-    return new PostRequest(this.requestService.generateRequestId(), href);
+  protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
+    return observableOf(new PostRequest(this.requestService.generateRequestId(), href));
   }
 
 }
diff --git a/src/app/core/auth/models/auth-status.model.ts b/src/app/core/auth/models/auth-status.model.ts
index d18b1ccf9a..1a6938887d 100644
--- a/src/app/core/auth/models/auth-status.model.ts
+++ b/src/app/core/auth/models/auth-status.model.ts
@@ -1,7 +1,17 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { EPERSON } from '../../eperson/models/eperson.resource-type';
@@ -10,12 +20,10 @@ import { GROUP } from '../../eperson/models/group.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { AuthMethod } from './auth.method';
 import { AuthError } from './auth-error.model';
 import { AUTH_STATUS } from './auth-status.resource-type';
 import { AuthTokenInfo } from './auth-token-info.model';
-import { AuthMethod } from './auth.method';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { PaginatedList } from '../../data/paginated-list.model';
 
 /**
  * Object that represents the authenticated status of a user
@@ -28,14 +36,14 @@ export class AuthStatus implements CacheableObject {
    * The unique identifier of this auth status
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The type for this AuthStatus
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The UUID of this auth status
@@ -43,25 +51,25 @@ export class AuthStatus implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('auth-status'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * True if REST API is up and running, should never return false
    */
   @autoserialize
-  okay: boolean;
+    okay: boolean;
 
   /**
    * If the auth status represents an authenticated state
    */
   @autoserialize
-  authenticated: boolean;
+    authenticated: boolean;
 
   /**
    * The {@link HALLink}s for this AuthStatus
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     eperson: HALLink;
     specialGroups: HALLink;
@@ -72,32 +80,32 @@ export class AuthStatus implements CacheableObject {
    * Will be undefined unless the eperson {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The SpecialGroup of this auth status
    * Will be undefined unless the SpecialGroup {@link HALLink} has been resolved.
    */
   @link(GROUP, true)
-  specialGroups?: Observable<RemoteData<PaginatedList<Group>>>;
+    specialGroups?: Observable<RemoteData<PaginatedList<Group>>>;
 
   /**
    * True if the token is valid, false if there was no token or the token wasn't valid
    */
   @autoserialize
-  token?: AuthTokenInfo;
+    token?: AuthTokenInfo;
 
   /**
    * Authentication error if there was one for this status
    */
   // TODO should be refactored to use the RemoteData error
   @autoserialize
-  error?: AuthError;
+    error?: AuthError;
 
   /**
    * All authentication methods enabled at the backend
    */
   @autoserialize
-  authMethods: AuthMethod[];
+    authMethods: AuthMethod[];
 
 }
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/models/short-lived-token.model.ts b/src/app/core/auth/models/short-lived-token.model.ts
index 3786bd8e6a..d91a26e990 100644
--- a/src/app/core/auth/models/short-lived-token.model.ts
+++ b/src/app/core/auth/models/short-lived-token.model.ts
@@ -1,10 +1,15 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
-import { ResourceType } from '../../shared/resource-type';
-import { SHORT_LIVED_TOKEN } from './short-lived-token.resource-type';
-import { HALLink } from '../../shared/hal-link.model';
 import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SHORT_LIVED_TOKEN } from './short-lived-token.resource-type';
 
 /**
  * A short-lived token that can be used to authenticate a rest request
@@ -17,19 +22,19 @@ export class ShortLivedToken implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The value for this ShortLivedToken
    */
   @autoserializeAs('token')
-  value: string;
+    value: string;
 
   /**
    * The {@link HALLink}s for this ShortLivedToken
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/auth/selectors.ts b/src/app/core/auth/selectors.ts
index 1d002b3908..6360377626 100644
--- a/src/app/core/auth/selectors.ts
+++ b/src/app/core/auth/selectors.ts
@@ -1,5 +1,7 @@
 import { createSelector } from '@ngrx/store';
 
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 /**
  * Every reducer module's default export is the reducer function itself. In
  * addition, each module should export a type or interface that describes
@@ -7,9 +9,6 @@ import { createSelector } from '@ngrx/store';
  * notation packages up all of the exports into a single object.
  */
 import { AuthState } from './auth.reducer';
-import { AppState } from '../../app.reducer';
-import { CoreState } from '../core-state.model';
-import { coreSelector } from '../core.selectors';
 
 /**
  * Returns the user state.
@@ -117,6 +116,8 @@ const _getRedirectUrl = (state: AuthState) => state.redirectUrl;
 
 const _getAuthenticationMethods = (state: AuthState) => state.authMethods;
 
+const _getExternalAuthCookieStatus = (state: AuthState) => state.externalAuth;
+
 /**
  * Returns true if the user is idle.
  * @function _isIdle
@@ -179,6 +180,16 @@ export const isAuthenticated = createSelector(getAuthState, _isAuthenticated);
  */
 export const isAuthenticatedLoaded = createSelector(getAuthState, _isAuthenticatedLoaded);
 
+/**
+ * Returns the authentication cookie status. Expect to be true when external authentication
+ * is used.
+ * @function getExternalAuthCookieStatus
+ * @param {AuthState} state
+ * @param {any} props
+ * @return {boolean}
+ */
+export const getExternalAuthCookieStatus = createSelector(getAuthState, _getExternalAuthCookieStatus);
+
 /**
  * Returns true if the authentication request is loading.
  * @function isAuthenticationLoading
diff --git a/src/app/core/auth/server-auth-request.service.spec.ts b/src/app/core/auth/server-auth-request.service.spec.ts
index 69053fbb3a..b119f6b3b7 100644
--- a/src/app/core/auth/server-auth-request.service.spec.ts
+++ b/src/app/core/auth/server-auth-request.service.spec.ts
@@ -1,34 +1,76 @@
-import { AuthRequestService } from './auth-request.service';
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+} from '../xsrf/xsrf.constants';
+import { AuthRequestService } from './auth-request.service';
 import { ServerAuthRequestService } from './server-auth-request.service';
 
 describe(`ServerAuthRequestService`, () => {
   let href: string;
   let requestService: RequestService;
   let service: AuthRequestService;
+  let httpClient: HttpClient;
+  let httpResponse: HttpResponse<any>;
+  let halService: HALEndpointService;
+  const mockToken = 'mock-token';
 
   beforeEach(() => {
     href = 'https://rest.api/auth/shortlivedtokens';
     requestService = jasmine.createSpyObj('requestService', {
-      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2'
+      'generateRequestId': '8bb0582d-5013-4337-af9c-763beb25aae2',
     });
-    service = new ServerAuthRequestService(null, requestService, null);
+    let headers = new HttpHeaders();
+    headers = headers.set(XSRF_RESPONSE_HEADER, mockToken);
+    httpResponse = {
+      body: { bar: false },
+      headers: headers,
+      statusText: '200',
+    } as HttpResponse<any>;
+    httpClient = jasmine.createSpyObj('httpClient', {
+      get: observableOf(httpResponse),
+    });
+    halService = jasmine.createSpyObj('halService', {
+      'getRootHref': '/api',
+    });
+    service = new ServerAuthRequestService(halService, requestService, null, httpClient);
   });
 
   describe(`createShortLivedTokenRequest`, () => {
-    it(`should return a GetRequest`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.constructor.name).toBe('GetRequest');
+    it(`should return a PostRequest`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.constructor.name).toBe('PostRequest');
+        done();
+      });
     });
 
-    it(`should return a request with the given href`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.href).toBe(href) ;
+    it(`should return a request with the given href`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.href).toBe(href);
+        done();
+      });
     });
 
-    it(`should have a responseMsToLive of 2 seconds`, () => {
-      const result = (service as any).createShortLivedTokenRequest(href);
-      expect(result.responseMsToLive).toBe(2 * 1000) ;
+    it(`should return a request with a xsrf header`, (done) => {
+      const obs = (service as any).createShortLivedTokenRequest(href) as Observable<PostRequest>;
+      obs.subscribe((result: PostRequest) => {
+        expect(result.options.headers.get(XSRF_REQUEST_HEADER)).toBe(mockToken);
+        done();
+      });
     });
   });
 });
diff --git a/src/app/core/auth/server-auth-request.service.ts b/src/app/core/auth/server-auth-request.service.ts
index 751389f71d..5f1828c71c 100644
--- a/src/app/core/auth/server-auth-request.service.ts
+++ b/src/app/core/auth/server-auth-request.service.ts
@@ -1,9 +1,22 @@
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { AuthRequestService } from './auth-request.service';
-import { GetRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  DSPACE_XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+} from '../xsrf/xsrf.constants';
+import { AuthRequestService } from './auth-request.service';
 
 /**
  * Server side version of the service to send authentication requests
@@ -14,23 +27,42 @@ export class ServerAuthRequestService extends AuthRequestService {
   constructor(
     halService: HALEndpointService,
     requestService: RequestService,
-    rdbService: RemoteDataBuildService
+    rdbService: RemoteDataBuildService,
+    protected httpClient: HttpClient,
   ) {
     super(halService, requestService, rdbService);
   }
 
   /**
-   * Factory function to create the request object to send. This needs to be a POST client side and
-   * a GET server side. Due to CSRF validation, the server isn't allowed to send a POST, so we allow
-   * only the server IP to send a GET to this endpoint.
+   * Factory function to create the request object to send.
    *
    * @param href The href to send the request to
    * @protected
    */
-  protected createShortLivedTokenRequest(href: string): GetRequest {
-    return Object.assign(new GetRequest(this.requestService.generateRequestId(), href), {
-      responseMsToLive: 2 * 1000 // A short lived token is only valid for 2 seconds.
-    });
+  protected createShortLivedTokenRequest(href: string): Observable<PostRequest> {
+    // First do a call to the root endpoint in order to get an XSRF token
+    return this.httpClient.get(this.halService.getRootHref(), { observe: 'response' }).pipe(
+      // retrieve the XSRF token from the response header
+      map((response: HttpResponse<any>) => response.headers.get(XSRF_RESPONSE_HEADER)),
+      // Use that token to create an HttpHeaders object
+      map((xsrfToken: string) => new HttpHeaders()
+        .set('Content-Type', 'application/json; charset=utf-8')
+      // set the token as the XSRF header
+        .set(XSRF_REQUEST_HEADER, xsrfToken)
+      // and as the DSPACE-XSRF-COOKIE
+        .set('Cookie', `${DSPACE_XSRF_COOKIE}=${xsrfToken}`)),
+      map((headers: HttpHeaders) =>
+        // Create a new PostRequest using those headers and the given href
+        new PostRequest(
+          this.requestService.generateRequestId(),
+          href,
+          {},
+          {
+            headers: headers,
+          },
+        ),
+      ),
+    );
   }
 
 }
diff --git a/src/app/core/auth/server-auth.service.ts b/src/app/core/auth/server-auth.service.ts
index fc8ab18bfb..f51215abad 100644
--- a/src/app/core/auth/server-auth.service.ts
+++ b/src/app/core/auth/server-auth.service.ts
@@ -1,15 +1,17 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
-
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RemoteData } from '../data/remote-data';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { AuthService } from './auth.service';
 import { AuthStatus } from './models/auth-status.model';
 import { AuthTokenInfo } from './models/auth-token-info.model';
-import { RemoteData } from '../data/remote-data';
 
 /**
  * The auth service.
@@ -57,7 +59,7 @@ export class ServerAuthService extends AuthService {
     options.headers = headers;
     options.withCredentials = true;
     return this.authRequestService.getRequest('status', options).pipe(
-      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload))
+      map((rd: RemoteData<AuthStatus>) => Object.assign(new AuthStatus(), rd.payload)),
     );
   }
 }
diff --git a/src/app/core/auth/token-response-parsing.service.spec.ts b/src/app/core/auth/token-response-parsing.service.spec.ts
index a440325560..f4244e98b2 100644
--- a/src/app/core/auth/token-response-parsing.service.spec.ts
+++ b/src/app/core/auth/token-response-parsing.service.spec.ts
@@ -1,6 +1,6 @@
-import { TokenResponseParsingService } from './token-response-parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { TokenResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { TokenResponseParsingService } from './token-response-parsing.service';
 
 describe('TokenResponseParsingService', () => {
   let service: TokenResponseParsingService;
@@ -13,10 +13,10 @@ describe('TokenResponseParsingService', () => {
     it('should return a TokenResponse containing the token', () => {
       const data = {
         payload: {
-          token: 'valid-token'
+          token: 'valid-token',
         },
         statusCode: 200,
-        statusText: 'OK'
+        statusText: 'OK',
       } as RawRestResponse;
       const expected = new TokenResponse(data.payload.token, true, 200, 'OK');
       expect(service.parse(undefined, data)).toEqual(expected);
@@ -26,7 +26,7 @@ describe('TokenResponseParsingService', () => {
       const data = {
         payload: {},
         statusCode: 200,
-        statusText: 'OK'
+        statusText: 'OK',
       } as RawRestResponse;
       const expected = new TokenResponse(null, false, 200, 'OK');
       expect(service.parse(undefined, data)).toEqual(expected);
@@ -36,7 +36,7 @@ describe('TokenResponseParsingService', () => {
       const data = {
         payload: {},
         statusCode: 400,
-        statusText: 'BAD REQUEST'
+        statusText: 'BAD REQUEST',
       } as RawRestResponse;
       const expected = new TokenResponse(null, false, 400, 'BAD REQUEST');
       expect(service.parse(undefined, data)).toEqual(expected);
diff --git a/src/app/core/auth/token-response-parsing.service.ts b/src/app/core/auth/token-response-parsing.service.ts
index 1ba7a16b14..3990d0f44e 100644
--- a/src/app/core/auth/token-response-parsing.service.ts
+++ b/src/app/core/auth/token-response-parsing.service.ts
@@ -1,9 +1,13 @@
-import { ResponseParsingService } from '../data/parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { RestResponse, TokenResponse } from '../cache/response.models';
-import { isNotEmpty } from '../../shared/empty.util';
 import { Injectable } from '@angular/core';
+
+import { isNotEmpty } from '../../shared/empty.util';
+import {
+  RestResponse,
+  TokenResponse,
+} from '../cache/response.models';
+import { ResponseParsingService } from '../data/parsing.service';
 import { RestRequest } from '../data/rest-request.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 
 @Injectable()
 /**
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
index b2ddade682..f003bd0f85 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumb.resolver.ts
@@ -1,17 +1,17 @@
 import { Injectable } from '@angular/core';
 
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Bitstream } from '../shared/bitstream.model';
-import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BitstreamDataService } from '../data/bitstream-data.service';
+import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamBreadcrumbsService } from './bitstream-breadcrumbs.service';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BitstreamBreadcrumbResolver extends DSOBreadcrumbResolver<Bitstream> {
   constructor(
diff --git a/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts b/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
index 333886ed3d..11a3a74350 100644
--- a/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/bitstream-breadcrumbs.service.ts
@@ -1,35 +1,46 @@
 import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
-import { DSONameService } from './dso-name.service';
-import { ChildHALResource } from '../shared/child-hal-resource.model';
-import { LinkService } from '../cache/builders/link.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { RemoteData } from '../data/remote-data';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { getDSORoute } from '../../app-routing-paths';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { LinkService } from '../cache/builders/link.service';
 import { BitstreamDataService } from '../data/bitstream-data.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { RemoteData } from '../data/remote-data';
 import { Bitstream } from '../shared/bitstream.model';
 import { Bundle } from '../shared/bundle.model';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
-import { BITSTREAM_PAGE_LINKS_TO_FOLLOW } from '../../bitstream-page/bitstream-page.resolver';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { DSONameService } from './dso-name.service';
 
 /**
  * Service to calculate DSpaceObject breadcrumbs for a single part of the route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
   constructor(
     protected bitstreamService: BitstreamDataService,
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
   ) {
     super(linkService, dsoNameService);
   }
@@ -53,7 +64,7 @@ export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
         return observableOf([]);
 
       }),
-      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb])
+      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb]),
     );
   }
 
@@ -74,12 +85,12 @@ export class BitstreamBreadcrumbsService extends DSOBreadcrumbsService {
               } else {
                 return observableOf(undefined);
               }
-            })
+            }),
           );
         } else {
           return observableOf(undefined);
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/breadcrumbs/breadcrumbsProviderService.ts b/src/app/core/breadcrumbs/breadcrumbsProviderService.ts
index 4f5dd0a583..83d9a2caaa 100644
--- a/src/app/core/breadcrumbs/breadcrumbsProviderService.ts
+++ b/src/app/core/breadcrumbs/breadcrumbsProviderService.ts
@@ -1,6 +1,7 @@
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
 import { Observable } from 'rxjs';
 
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+
 /**
  * Service to calculate breadcrumbs for a single part of the route
  */
diff --git a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
index 46c49add06..d337da22c7 100644
--- a/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/collection-breadcrumb.resolver.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
-import { Collection } from '../shared/collection.model';
-import { CollectionDataService } from '../data/collection-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+
 import { COLLECTION_PAGE_LINKS_TO_FOLLOW } from '../../collection-page/collection-page.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { CollectionDataService } from '../data/collection-data.service';
+import { Collection } from '../shared/collection.model';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Collection
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CollectionBreadcrumbResolver extends DSOBreadcrumbResolver<Collection> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: CollectionDataService) {
diff --git a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
index 309927771d..4cbffe9a6a 100644
--- a/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/community-breadcrumb.resolver.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+
+import { COMMUNITY_PAGE_LINKS_TO_FOLLOW } from '../../community-page/community-page.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 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 { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a Community
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CommunityBreadcrumbResolver extends DSOBreadcrumbResolver<Community> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: CommunityDataService) {
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
index e35e26e46f..59fda031b2 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.spec.ts
@@ -1,8 +1,9 @@
-import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
-import { Collection } from '../shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { getTestScheduler } from 'jasmine-marbles';
+
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { Collection } from '../shared/collection.model';
 import { CollectionBreadcrumbResolver } from './collection-breadcrumb.resolver';
+import { DSOBreadcrumbResolver } from './dso-breadcrumb.resolver';
 
 describe('DSOBreadcrumbResolver', () => {
   describe('resolve', () => {
@@ -21,7 +22,7 @@ describe('DSOBreadcrumbResolver', () => {
       testCollection = Object.assign(new Collection(), { uuid });
       dsoBreadcrumbService = {};
       collectionService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$(testCollection)
+        findById: (id: string) => createSuccessfulRemoteDataObject$(testCollection),
       };
       resolver = new CollectionBreadcrumbResolver(dsoBreadcrumbService, collectionService);
     });
diff --git a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
index 8be4e5e099..712f40a3c5 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumb.resolver.ts
@@ -1,15 +1,23 @@
-import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { map } from 'rxjs/operators';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { ChildHALResource } from '../shared/child-hal-resource.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { map } from 'rxjs/operators';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { hasValue } from '../../shared/empty.util';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for a DSpaceObject
@@ -43,7 +51,7 @@ export abstract class DSOBreadcrumbResolver<T extends ChildHALResource & DSpaceO
         } else {
           return undefined;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
index 6b89c576d6..3869defa70 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.spec.ts
@@ -1,17 +1,24 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
-import { getMockLinkService } from '../../shared/mocks/link-service.mock';
-import { LinkService } from '../cache/builders/link.service';
-import { Item } from '../shared/item.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../shared/community.model';
-import { Collection } from '../shared/collection.model';
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { getTestScheduler } from 'jasmine-marbles';
-import { DSONameService } from './dso-name.service';
+import { of as observableOf } from 'rxjs';
+
 import { getDSORoute } from '../../app-routing-paths';
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { getMockLinkService } from '../../shared/mocks/link-service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { LinkService } from '../cache/builders/link.service';
+import { Collection } from '../shared/collection.model';
+import { Community } from '../shared/community.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { Item } from '../shared/item.model';
+import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+import { DSONameService } from './dso-name.service';
 
 describe('DSOBreadcrumbsService', () => {
   let service: DSOBreadcrumbsService;
@@ -43,46 +50,46 @@ describe('DSOBreadcrumbsService', () => {
       {
         type: 'community',
         metadata: {
-          'dc.title': [{ value: 'community' }]
+          'dc.title': [{ value: 'community' }],
         },
         uuid: communityUUID,
         parentCommunity: observableOf(Object.assign(createSuccessfulRemoteDataObject(undefined), { statusCode: 204 })),
 
         _links: {
           parentCommunity: 'site',
-          self: communityPath + communityUUID
-        }
-      }
+          self: communityPath + communityUUID,
+        },
+      },
     );
 
     testCollection = Object.assign(new Collection(),
       {
         type: 'collection',
         metadata: {
-          'dc.title': [{ value: 'collection' }]
+          'dc.title': [{ value: 'collection' }],
         },
         uuid: collectionUUID,
         parentCommunity: createSuccessfulRemoteDataObject$(testCommunity),
         _links: {
           parentCommunity: communityPath + communityUUID,
-          self: communityPath + collectionUUID
-        }
-      }
+          self: communityPath + collectionUUID,
+        },
+      },
     );
 
     testItem = Object.assign(new Item(),
       {
         type: 'item',
         metadata: {
-          'dc.title': [{ value: 'item' }]
+          'dc.title': [{ value: 'item' }],
         },
         uuid: itemUUID,
         owningCollection: createSuccessfulRemoteDataObject$(testCollection),
         _links: {
           owningCollection: collectionPath + collectionUUID,
-          self: itemPath + itemUUID
-        }
-      }
+          self: itemPath + itemUUID,
+        },
+      },
     );
 
     dsoNameService = { getName: (dso) => getName(dso) };
@@ -93,8 +100,8 @@ describe('DSOBreadcrumbsService', () => {
     TestBed.configureTestingModule({
       providers: [
         { provide: LinkService, useValue: getMockLinkService() },
-        { provide: DSONameService, useValue: dsoNameService }
-      ]
+        { provide: DSONameService, useValue: dsoNameService },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
index a5884ca3c9..7d2e3697e1 100644
--- a/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/dso-breadcrumbs.service.ts
@@ -1,27 +1,35 @@
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  find,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { getDSORoute } from '../../app-routing-paths';
 import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { hasValue } from '../../shared/empty.util';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { LinkService } from '../cache/builders/link.service';
+import { RemoteData } from '../data/remote-data';
+import { ChildHALResource } from '../shared/child-hal-resource.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
 import { DSONameService } from './dso-name.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { ChildHALResource } from '../shared/child-hal-resource.model';
-import { LinkService } from '../cache/builders/link.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { find, map, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../data/remote-data';
-import { hasValue } from '../../shared/empty.util';
-import { Injectable } from '@angular/core';
-import { getDSORoute } from '../../app-routing-paths';
 
 /**
  * Service to calculate DSpaceObject breadcrumbs for a single part of the route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DSOBreadcrumbsService implements BreadcrumbsProviderService<ChildHALResource & DSpaceObject> {
   constructor(
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService
+    protected dsoNameService: DSONameService,
   ) {
 
   }
@@ -39,14 +47,14 @@ export class DSOBreadcrumbsService implements BreadcrumbsProviderService<ChildHA
     return this.linkService.resolveLink(key, followLink(propertyName))[propertyName].pipe(
       find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204),
       switchMap((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => {
-        if (hasValue(parentRD.payload)) {
+        if (hasValue(parentRD) && hasValue(parentRD.payload)) {
           const parent = parentRD.payload;
           return this.getBreadcrumbs(parent, getDSORoute(parent));
         }
         return observableOf([]);
 
       }),
-      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb])
+      map((breadcrumbs: Breadcrumb[]) => [...breadcrumbs, crumb]),
     );
   }
 }
diff --git a/src/app/core/breadcrumbs/dso-name.service.spec.ts b/src/app/core/breadcrumbs/dso-name.service.spec.ts
index 9f2f76599a..90b08dca14 100644
--- a/src/app/core/breadcrumbs/dso-name.service.spec.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.spec.ts
@@ -22,7 +22,7 @@ describe(`DSONameService`, () => {
       },
       getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
         return ['Person', Item, DSpaceObject];
-      }
+      },
     });
 
     mockOrgUnitName = 'Molecular Spectroscopy';
@@ -32,7 +32,7 @@ describe(`DSONameService`, () => {
       },
       getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
         return ['OrgUnit', Item, DSpaceObject];
-      }
+      },
     });
 
     mockDSOName = 'Lorem Ipsum';
@@ -42,7 +42,7 @@ describe(`DSONameService`, () => {
       },
       getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
         return [DSpaceObject];
-      }
+      },
     });
 
     service = new DSONameService({ instant: (a) => a } as any);
diff --git a/src/app/core/breadcrumbs/dso-name.service.ts b/src/app/core/breadcrumbs/dso-name.service.ts
index d56f4a00eb..988141209f 100644
--- a/src/app/core/breadcrumbs/dso-name.service.ts
+++ b/src/app/core/breadcrumbs/dso-name.service.ts
@@ -1,14 +1,19 @@
 import { Injectable } from '@angular/core';
-import { hasValue, isEmpty } from '../../shared/empty.util';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { TranslateService } from '@ngx-translate/core';
 
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { Metadata } from '../shared/metadata.utils';
+
 /**
  * Returns a name for a {@link DSpaceObject} based
  * on its render types.
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class DSONameService {
 
@@ -26,11 +31,22 @@ export class DSONameService {
    * With only two exceptions those solutions seem overkill for now.
    */
   private readonly factories = {
+    EPerson: (dso: DSpaceObject): string => {
+      const firstName = dso.firstMetadataValue('eperson.firstname');
+      const lastName = dso.firstMetadataValue('eperson.lastname');
+      if (isEmpty(firstName) && isEmpty(lastName)) {
+        return this.translateService.instant('dso.name.unnamed');
+      } else if (isEmpty(firstName) || isEmpty(lastName)) {
+        return firstName || lastName;
+      } else {
+        return `${firstName} ${lastName}`;
+      }
+    },
     Person: (dso: DSpaceObject): string => {
       const familyName = dso.firstMetadataValue('person.familyName');
       const givenName = dso.firstMetadataValue('person.givenName');
       if (isEmpty(familyName) && isEmpty(givenName)) {
-        return dso.firstMetadataValue('dc.title') || dso.name;
+        return dso.firstMetadataValue('dc.title') || this.translateService.instant('dso.name.unnamed');
       } else if (isEmpty(familyName) || isEmpty(givenName)) {
         return familyName || givenName;
       } else {
@@ -38,12 +54,12 @@ 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
       return dso.firstMetadataValue('dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
-    }
+    },
   };
 
   /**
@@ -51,20 +67,65 @@ export class DSONameService {
    *
    * @param dso  The {@link DSpaceObject} you want a name for
    */
-  getName(dso: DSpaceObject): string {
-    const types = dso.getRenderTypes();
-    const match = types
-      .filter((type) => typeof type === 'string')
-      .find((type: string) => Object.keys(this.factories).includes(type)) as string;
+  getName(dso: DSpaceObject | undefined): string {
+    if (dso) {
+      const types = dso.getRenderTypes();
+      const match = types
+        .filter((type) => typeof type === 'string')
+        .find((type: string) => Object.keys(this.factories).includes(type)) as string;
 
-    let name;
-    if (hasValue(match)) {
-      name = this.factories[match](dso);
+      let name;
+      if (hasValue(match)) {
+        name = this.factories[match](dso);
+      }
+      if (isEmpty(name)) {
+        name = this.factories.Default(dso);
+      }
+      return name;
+    } else {
+      return '';
     }
-    if (isEmpty(name)) {
-      name = this.factories.Default(dso);
+  }
+
+  /**
+   * Gets the Hit highlight
+   *
+   * @param object
+   * @param dso
+   *
+   * @returns {string} html embedded hit highlight.
+   */
+  getHitHighlights(object: any, dso: DSpaceObject): string {
+    const types = dso.getRenderTypes();
+    const entityType = types
+      .filter((type) => typeof type === 'string')
+      .find((type: string) => (['Person', 'OrgUnit']).includes(type)) as string;
+    if (entityType === 'Person') {
+      const familyName = this.firstMetadataValue(object, dso, 'person.familyName');
+      const givenName = this.firstMetadataValue(object, dso, 'person.givenName');
+      if (isEmpty(familyName) && isEmpty(givenName)) {
+        return this.firstMetadataValue(object, dso, 'dc.title') || dso.name;
+      } else if (isEmpty(familyName) || isEmpty(givenName)) {
+        return familyName || givenName;
+      }
+      return `${familyName}, ${givenName}`;
+    } else if (entityType === 'OrgUnit') {
+      return this.firstMetadataValue(object, dso, 'organization.legalName') || this.translateService.instant('dso.name.untitled');
     }
-    return name;
+    return this.firstMetadataValue(object, dso, 'dc.title') || dso.name || this.translateService.instant('dso.name.untitled');
+  }
+
+  /**
+   * Gets the first matching metadata string value from hitHighlights or dso metadata, preferring hitHighlights.
+   *
+   * @param object
+   * @param dso
+   * @param {string|string[]} keyOrKeys The metadata key(s) in scope. Wildcards are supported; see [[Metadata]].
+   *
+   * @returns {string} the first matching string value, or `undefined`.
+   */
+  firstMetadataValue(object: any, dso: DSpaceObject, keyOrKeys: string | string[]): string {
+    return Metadata.firstValue([object.hitHighlights, dso.metadata], keyOrKeys);
   }
 
 }
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
index 0d1870487a..05ef2969f7 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.spec.ts
@@ -1,5 +1,5 @@
-import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver';
 import { URLCombiner } from '../url-combiner/url-combiner';
+import { I18nBreadcrumbResolver } from './i18n-breadcrumb.resolver';
 
 describe('I18nBreadcrumbResolver', () => {
   describe('resolve', () => {
@@ -17,13 +17,13 @@ describe('I18nBreadcrumbResolver', () => {
       route = {
         data: { breadcrumbKey: i18nKey },
         routeConfig: {
-          path: segment
+          path: segment,
         },
         parent: {
           routeConfig: {
-            path: parentSegment
-          }
-        } as any
+            path: parentSegment,
+          },
+        } as any,
       };
       expectedPath = new URLCombiner(parentSegment, segment).toString();
       i18nBreadcrumbService = {};
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
index b3fadbbaa9..afcd461de8 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumb.resolver.ts
@@ -1,15 +1,20 @@
-import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
 import { hasNoValue } from '../../shared/empty.util';
 import { currentPathFromSnapshot } from '../../shared/utils/route.utils';
+import { I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
 
 /**
  * The class that resolves a BreadcrumbConfig object with an i18n key string for a route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class I18nBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>> {
   constructor(protected breadcrumbService: I18nBreadcrumbsService) {
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts
index ac2f244037..3fcd911a46 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.spec.ts
@@ -1,7 +1,14 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { getTestScheduler } from 'jasmine-marbles';
-import { BREADCRUMB_MESSAGE_POSTFIX, I18nBreadcrumbsService } from './i18n-breadcrumbs.service';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import {
+  BREADCRUMB_MESSAGE_POSTFIX,
+  I18nBreadcrumbsService,
+} from './i18n-breadcrumbs.service';
 
 describe('I18nBreadcrumbsService', () => {
   let service: I18nBreadcrumbsService;
diff --git a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
index 15563bdde8..5746f6faf2 100644
--- a/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
+++ b/src/app/core/breadcrumbs/i18n-breadcrumbs.service.ts
@@ -1,7 +1,11 @@
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
 import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
-import { Observable, of as observableOf } from 'rxjs';
-import { Injectable } from '@angular/core';
 
 /**
  * The postfix for i18n breadcrumbs
@@ -12,7 +16,7 @@ export const BREADCRUMB_MESSAGE_POSTFIX = '.breadcrumbs';
  * Service to calculate i18n breadcrumbs for a single part of the route
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class I18nBreadcrumbsService implements BreadcrumbsProviderService<string> {
 
diff --git a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
index 3005b6f09a..f609cbf3bc 100644
--- a/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
+++ b/src/app/core/breadcrumbs/item-breadcrumb.resolver.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
+
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item-page/item.resolver';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 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 { DSOBreadcrumbsService } from './dso-breadcrumbs.service';
 
 /**
  * The class that resolves the BreadcrumbConfig object for an Item
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ItemBreadcrumbResolver extends DSOBreadcrumbResolver<Item> {
   constructor(protected breadcrumbService: DSOBreadcrumbsService, protected dataService: ItemDataService) {
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..db89d02f75
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.spec.ts
@@ -0,0 +1,52 @@
+import { NavigationBreadcrumbResolver } from './navigation-breadcrumb.resolver';
+
+describe('NavigationBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: NavigationBreadcrumbResolver;
+    let NavigationBreadcrumbService: any;
+    let i18nKey: string;
+    let relatedI18nKey: string;
+    let route: any;
+    let expectedPath;
+    let state;
+    beforeEach(() => {
+      i18nKey = 'example.key';
+      relatedI18nKey = 'related.key';
+      route = {
+        data: {
+          breadcrumbKey: i18nKey,
+          relatedRoutes: [
+            {
+              path: '',
+              data: { breadcrumbKey: relatedI18nKey },
+            },
+          ],
+        },
+        routeConfig: {
+          path: 'example',
+        },
+        parent: {
+          routeConfig: {
+            path: '',
+          },
+          url: [{
+            path: 'base',
+          }],
+        } as any,
+      };
+
+      state = {
+        url: '/base/example',
+      };
+      expectedPath = '/base/example:/base';
+      NavigationBreadcrumbService = {};
+      resolver = new NavigationBreadcrumbResolver(NavigationBreadcrumbService);
+    });
+
+    it('should resolve the breadcrumb config', () => {
+      const resolvedConfig = resolver.resolve(route, state);
+      const expectedConfig = { provider: NavigationBreadcrumbService, key: `${i18nKey}:${relatedI18nKey}`, url: expectedPath };
+      expect(resolvedConfig).toEqual(expectedConfig);
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..594c1a694f
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumb.resolver.ts
@@ -0,0 +1,57 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service';
+
+/**
+ * The class that resolves a BreadcrumbConfig object with an i18n key string for a route and related parents
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class NavigationBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>> {
+
+  private parentRoutes: ActivatedRouteSnapshot[] = [];
+  constructor(protected breadcrumbService: NavigationBreadcrumbsService) {
+  }
+
+  /**
+   * Method to collect all parent routes snapshot from current route snapshot
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   */
+  private getParentRoutes(route: ActivatedRouteSnapshot): void {
+    if (route.parent) {
+      this.parentRoutes.push(route.parent);
+      this.getParentRoutes(route.parent);
+    }
+  }
+  /**
+   * Method for resolving an I18n breadcrumb configuration object
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
+    this.getParentRoutes(route);
+    const relatedRoutes = route.data.relatedRoutes;
+    const parentPaths = this.parentRoutes.map(parent => parent.routeConfig?.path);
+    const relatedParentRoutes = relatedRoutes.filter(relatedRoute => parentPaths.includes(relatedRoute.path));
+    const baseUrlSegmentPath = route.parent.url[route.parent.url.length - 1].path;
+    const baseUrl = state.url.substring(0, state.url.lastIndexOf(baseUrlSegmentPath) + baseUrlSegmentPath.length);
+
+
+    const combinedParentBreadcrumbKeys = relatedParentRoutes.reduce((previous, current) => {
+      return `${previous}:${current.data.breadcrumbKey}`;
+    }, route.data.breadcrumbKey);
+    const combinedUrls = relatedParentRoutes.reduce((previous, current) => {
+      return `${previous}:${baseUrl}${current.path}`;
+    }, state.url);
+
+    return { provider: this.breadcrumbService, key: combinedParentBreadcrumbKeys, url: combinedUrls };
+  }
+}
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumb.service.ts b/src/app/core/breadcrumbs/navigation-breadcrumb.service.ts
new file mode 100644
index 0000000000..2da8b06eab
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumb.service.ts
@@ -0,0 +1,34 @@
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
+
+/**
+ * The postfix for i18n breadcrumbs
+ */
+export const BREADCRUMB_MESSAGE_POSTFIX = '.breadcrumbs';
+
+/**
+ * Service to calculate i18n breadcrumbs for a single part of the route
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class NavigationBreadcrumbsService implements BreadcrumbsProviderService<string> {
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
+    const keys = key.split(':');
+    const urls = url.split(':');
+    const breadcrumbs = keys.map((currentKey, index) => new Breadcrumb(currentKey + BREADCRUMB_MESSAGE_POSTFIX, urls[index] ));
+    return observableOf(breadcrumbs.reverse());
+  }
+}
diff --git a/src/app/core/breadcrumbs/navigation-breadcrumbs.service.spec.ts b/src/app/core/breadcrumbs/navigation-breadcrumbs.service.spec.ts
new file mode 100644
index 0000000000..646b967fe5
--- /dev/null
+++ b/src/app/core/breadcrumbs/navigation-breadcrumbs.service.spec.ts
@@ -0,0 +1,47 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BREADCRUMB_MESSAGE_POSTFIX } from './i18n-breadcrumbs.service';
+import { NavigationBreadcrumbsService } from './navigation-breadcrumb.service';
+
+describe('NavigationBreadcrumbsService', () => {
+  let service: NavigationBreadcrumbsService;
+  let exampleString;
+  let exampleURL;
+  let childrenString;
+  let childrenUrl;
+  let parentString;
+  let parentUrl;
+
+  function init() {
+    exampleString = 'example.string:parent.string';
+    exampleURL = 'example.com:parent.com';
+    childrenString = 'example.string';
+    childrenUrl = 'example.com';
+    parentString = 'parent.string';
+    parentUrl = 'parent.com';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new NavigationBreadcrumbsService();
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return an array of breadcrumbs based on strings by adding the postfix', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleString, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [
+        new Breadcrumb(childrenString + BREADCRUMB_MESSAGE_POSTFIX, childrenUrl),
+        new Breadcrumb(parentString + BREADCRUMB_MESSAGE_POSTFIX, parentUrl),
+      ].reverse() });
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..7a0e9d43ed
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.spec.ts
@@ -0,0 +1,31 @@
+import { PublicationClaimBreadcrumbResolver } from './publication-claim-breadcrumb.resolver';
+
+describe('PublicationClaimBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: PublicationClaimBreadcrumbResolver;
+    let publicationClaimBreadcrumbService: any;
+    const fullPath = '/test/publication-claim/openaire:6bee076d-4f2a-4555-a475-04a267769b2a';
+    const expectedKey = '6bee076d-4f2a-4555-a475-04a267769b2a';
+    const expectedId = 'openaire:6bee076d-4f2a-4555-a475-04a267769b2a';
+    let route;
+
+    beforeEach(() => {
+      route = {
+        paramMap: {
+          get: function (param) {
+            return this[param];
+          },
+          targetId: expectedId,
+        },
+      };
+      publicationClaimBreadcrumbService = {};
+      resolver = new PublicationClaimBreadcrumbResolver(publicationClaimBreadcrumbService);
+    });
+
+    it('should resolve the breadcrumb config', () => {
+      const resolvedConfig = resolver.resolve(route as any, { url: fullPath } as any);
+      const expectedConfig = { provider: publicationClaimBreadcrumbService, key: expectedKey };
+      expect(resolvedConfig).toEqual(expectedConfig);
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..7bcff921e1
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.resolver.ts
@@ -0,0 +1,29 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PublicationClaimBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>>  {
+  constructor(protected breadcrumbService: PublicationClaimBreadcrumbService) {
+  }
+
+  /**
+   * Method that resolve Publication Claim item into a breadcrumb
+   * The parameter are retrieved by the url since part of the Publication Claim route config
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
+    const targetId = route.paramMap.get('targetId').split(':')[1];
+    return { provider: this.breadcrumbService, key: targetId };
+  }
+}
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.spec.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.spec.ts
new file mode 100644
index 0000000000..8424b5edda
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.spec.ts
@@ -0,0 +1,55 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of } from 'rxjs';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { PublicationClaimBreadcrumbService } from './publication-claim-breadcrumb.service';
+
+describe('PublicationClaimBreadcrumbService', () => {
+  let service: PublicationClaimBreadcrumbService;
+  let dsoNameService: any = {
+    getName: (str) => str,
+  };
+  let translateService: any = {
+    instant: (str) => str,
+  };
+
+  let dataService: any = {
+    findById: (str) => createSuccessfulRemoteDataObject$(str),
+  };
+
+  let authorizationService: any = {
+    isAuthorized: (str) => of(true),
+  };
+
+  let exampleKey;
+
+  const ADMIN_PUBLICATION_CLAIMS_PATH = 'admin/notifications/publication-claim';
+  const ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY = 'admin.notifications.publicationclaim.page.title';
+
+  function init() {
+    exampleKey = 'suggestion.suggestionFor.breadcrumb';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new PublicationClaimBreadcrumbService(dataService,dsoNameService,translateService, authorizationService);
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return a breadcrumb based on a string', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleKey);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY, ADMIN_PUBLICATION_CLAIMS_PATH),
+        new Breadcrumb(exampleKey, undefined)],
+      });
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.ts b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.ts
new file mode 100644
index 0000000000..43b7ed5761
--- /dev/null
+++ b/src/app/core/breadcrumbs/publication-claim-breadcrumb.service.ts
@@ -0,0 +1,48 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+import { ItemDataService } from '../data/item-data.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
+import { DSONameService } from './dso-name.service';
+
+/**
+ * Service to calculate Publication claims breadcrumbs
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class PublicationClaimBreadcrumbService implements BreadcrumbsProviderService<string> {
+  private ADMIN_PUBLICATION_CLAIMS_PATH = 'admin/notifications/publication-claim';
+  private ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY = 'admin.notifications.publicationclaim.page.title';
+
+  constructor(private dataService: ItemDataService,
+              private dsoNameService: DSONameService,
+              private tranlsateService: TranslateService,
+              protected authorizationService: AuthorizationDataService) {
+  }
+
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   */
+  getBreadcrumbs(key: string): Observable<Breadcrumb[]> {
+    return combineLatest([this.dataService.findById(key).pipe(getFirstCompletedRemoteData()),this.authorizationService.isAuthorized(FeatureID.AdministratorOf)]).pipe(
+      map(([item, isAdmin]) => {
+        const itemName = this.dsoNameService.getName(item.payload);
+        return isAdmin ? [new Breadcrumb(this.tranlsateService.instant(this.ADMIN_PUBLICATION_CLAIMS_BREADCRUMB_KEY), this.ADMIN_PUBLICATION_CLAIMS_PATH),
+          new Breadcrumb(this.tranlsateService.instant('suggestion.suggestionFor.breadcrumb', { name: itemName }), undefined)] :
+          [new Breadcrumb(this.tranlsateService.instant('suggestion.suggestionFor.breadcrumb', { name: itemName }), undefined)];
+      }),
+    );
+  }
+}
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts
new file mode 100644
index 0000000000..ea6045c85e
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.spec.ts
@@ -0,0 +1,31 @@
+import { QualityAssuranceBreadcrumbResolver } from './quality-assurance-breadcrumb.resolver';
+
+describe('QualityAssuranceBreadcrumbResolver', () => {
+  describe('resolve', () => {
+    let resolver: QualityAssuranceBreadcrumbResolver;
+    let qualityAssuranceBreadcrumbService: any;
+    let route: any;
+    const fullPath = '/test/quality-assurance/';
+    const expectedKey = 'testSourceId:testTopicId';
+
+    beforeEach(() => {
+      route = {
+        paramMap: {
+          get: function (param) {
+            return this[param];
+          },
+          sourceId: 'testSourceId',
+          topicId: 'testTopicId',
+        },
+      };
+      qualityAssuranceBreadcrumbService = {};
+      resolver = new QualityAssuranceBreadcrumbResolver(qualityAssuranceBreadcrumbService);
+    });
+
+    it('should resolve the breadcrumb config', () => {
+      const resolvedConfig = resolver.resolve(route as any, { url: fullPath + 'testSourceId' } as any);
+      const expectedConfig = { provider: qualityAssuranceBreadcrumbService, key: expectedKey, url: fullPath };
+      expect(resolvedConfig).toEqual(expectedConfig);
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts
new file mode 100644
index 0000000000..832cd5d08c
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.resolver.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+import { BreadcrumbConfig } from '../../breadcrumbs/breadcrumb/breadcrumb-config.model';
+import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class QualityAssuranceBreadcrumbResolver implements Resolve<BreadcrumbConfig<string>>  {
+  constructor(protected breadcrumbService: QualityAssuranceBreadcrumbService) {}
+
+  /**
+   * Method that resolve QA item into a breadcrumb
+   * The parameter are retrieved by the url since part of the QA route config
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns BreadcrumbConfig object
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): BreadcrumbConfig<string> {
+    const sourceId = route.paramMap.get('sourceId');
+    const topicId = route.paramMap.get('topicId');
+    let key = sourceId;
+
+    if (topicId) {
+      key += `:${topicId}`;
+    }
+    const fullPath = state.url;
+    const url = fullPath.substr(0, fullPath.indexOf(sourceId));
+
+    return { provider: this.breadcrumbService, key, url };
+  }
+}
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.spec.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.spec.ts
new file mode 100644
index 0000000000..f8d30754ca
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.spec.ts
@@ -0,0 +1,43 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { QualityAssuranceBreadcrumbService } from './quality-assurance-breadcrumb.service';
+
+describe('QualityAssuranceBreadcrumbService', () => {
+  let service: QualityAssuranceBreadcrumbService;
+  let translateService: any = {
+    instant: (str) => str,
+  };
+
+  let exampleString;
+  let exampleURL;
+  let exampleQaKey;
+
+  function init() {
+    exampleString = 'sourceId';
+    exampleURL = '/test/quality-assurance/';
+    exampleQaKey = 'admin.quality-assurance.breadcrumbs';
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+    TestBed.configureTestingModule({}).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new QualityAssuranceBreadcrumbService(translateService);
+  });
+
+  describe('getBreadcrumbs', () => {
+    it('should return a breadcrumb based on a string', () => {
+      const breadcrumbs = service.getBreadcrumbs(exampleString, exampleURL);
+      getTestScheduler().expectObservable(breadcrumbs).toBe('(a|)', { a: [new Breadcrumb(exampleQaKey, exampleURL),
+        new Breadcrumb(exampleString, exampleURL + exampleString)],
+      });
+    });
+  });
+});
diff --git a/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts
new file mode 100644
index 0000000000..580a5e5f8e
--- /dev/null
+++ b/src/app/core/breadcrumbs/quality-assurance-breadcrumb.service.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { Breadcrumb } from '../../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BreadcrumbsProviderService } from './breadcrumbsProviderService';
+
+/**
+ * Service to calculate QA breadcrumbs for a single part of the route
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class QualityAssuranceBreadcrumbService implements BreadcrumbsProviderService<string> {
+
+  private QUALITY_ASSURANCE_BREADCRUMB_KEY = 'admin.quality-assurance.breadcrumbs';
+  constructor(
+    private translationService: TranslateService,
+  ) {
+
+  }
+
+
+  /**
+   * Method to calculate the breadcrumbs
+   * @param key The key used to resolve the breadcrumb
+   * @param url The url to use as a link for this breadcrumb
+   */
+  getBreadcrumbs(key: string, url: string): Observable<Breadcrumb[]> {
+    const args = key.split(':');
+    const sourceId = args[0];
+    const topicId = args.length > 2 ? args[args.length - 1] : args[1];
+
+    if (topicId) {
+      return observableOf( [new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
+        new Breadcrumb(sourceId, `${url}${sourceId}`),
+        new Breadcrumb(topicId, undefined)]);
+    } else {
+      return observableOf([new Breadcrumb(this.translationService.instant(this.QUALITY_ASSURANCE_BREADCRUMB_KEY), url),
+        new Breadcrumb(sourceId, `${url}${sourceId}`)]);
+    }
+
+  }
+}
diff --git a/src/app/core/browse/browse-definition-data.service.spec.ts b/src/app/core/browse/browse-definition-data.service.spec.ts
index 9377dc715f..affa63a548 100644
--- a/src/app/core/browse/browse-definition-data.service.spec.ts
+++ b/src/app/core/browse/browse-definition-data.service.spec.ts
@@ -1,28 +1,68 @@
-import { BrowseDefinitionDataService } from './browse-definition-data.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
 import { EMPTY } from 'rxjs';
+
+import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { RequestService } from '../data/request.service';
+import { BrowseDefinitionDataService } from './browse-definition-data.service';
 
 describe(`BrowseDefinitionDataService`, () => {
+  let requestService: RequestService;
   let service: BrowseDefinitionDataService;
-  const findAllDataSpy = jasmine.createSpyObj('findAllData', {
-    findAll: EMPTY,
-  });
+  let findAllDataSpy;
+  let searchDataSpy;
+  const browsesEndpointURL = 'https://rest.api/browses';
+  const halService: any = new HALEndpointServiceStub(browsesEndpointURL);
+
   const options = new FindListOptions();
   const linksToFollow = [
     followLink('entries'),
-    followLink('items')
+    followLink('items'),
   ];
 
+  function initTestService() {
+    return new BrowseDefinitionDataService(
+      requestService,
+      getMockRemoteDataBuildService(),
+      getMockObjectCacheService(),
+      halService,
+    );
+  }
+
   beforeEach(() => {
-    service = new BrowseDefinitionDataService(null, null, null, null);
+    service = initTestService();
+    findAllDataSpy = jasmine.createSpyObj('findAllData', {
+      findAll: EMPTY,
+    });
+    searchDataSpy = jasmine.createSpyObj('searchData', {
+      searchBy: EMPTY,
+      getSearchByHref: EMPTY,
+    });
     (service as any).findAllData = findAllDataSpy;
+    (service as any).searchData = searchDataSpy;
   });
 
+  describe('findByFields', () => {
+    it(`should call searchByHref on searchData`, () => {
+      service.findByFields(['test'], true, false, ...linksToFollow);
+      expect(searchDataSpy.getSearchByHref).toHaveBeenCalled();
+    });
+  });
+  describe('searchBy', () => {
+    it(`should call searchBy on searchData`, () => {
+      service.searchBy('test', options, true, false, ...linksToFollow);
+      expect(searchDataSpy.searchBy).toHaveBeenCalledWith('test', options, true, false, ...linksToFollow);
+    });
+  });
   describe(`findAll`, () => {
     it(`should call findAll on findAllData`, () => {
       service.findAll(options, true, false, ...linksToFollow);
       expect(findAllDataSpy.findAll).toHaveBeenCalledWith(options, true, false, ...linksToFollow);
     });
   });
+
+
+
 });
diff --git a/src/app/core/browse/browse-definition-data.service.ts b/src/app/core/browse/browse-definition-data.service.ts
index 32c3b44e14..b823f42076 100644
--- a/src/app/core/browse/browse-definition-data.service.ts
+++ b/src/app/core/browse/browse-definition-data.service.ts
@@ -1,18 +1,74 @@
+// eslint-disable-next-line max-classes-per-file
 import { Injectable } from '@angular/core';
-import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
-import { BrowseDefinition } from '../shared/browse-definition.model';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { FindAllData, FindAllDataImpl } from '../data/base/find-all-data';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from '../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../data/base/find-all-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { BrowseDefinitionRestRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { BrowseDefinition } from '../shared/browse-definition.model';
+import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+
+/**
+ * Create a GET request for the given href, and send it.
+ * Use a GET request specific for BrowseDefinitions.
+ */
+export const createAndSendBrowseDefinitionGetRequest = (requestService: RequestService,
+  responseMsToLive: number,
+  href$: string | Observable<string>,
+  useCachedVersionIfAvailable: boolean = true): void => {
+  if (isNotEmpty(href$)) {
+    if (typeof href$ === 'string') {
+      href$ = observableOf(href$);
+    }
+
+    href$.pipe(
+      isNotEmptyOperator(),
+      take(1),
+    ).subscribe((href: string) => {
+      const requestId = requestService.generateRequestId();
+      const request = new BrowseDefinitionRestRequest(requestId, href);
+      if (hasValue(responseMsToLive)) {
+        request.responseMsToLive = responseMsToLive;
+      }
+      requestService.send(request, useCachedVersionIfAvailable);
+    });
+  }
+};
+
+/**
+ * Custom extension of {@link FindAllDataImpl} to be able to send BrowseDefinitionRestRequests
+ */
+class BrowseDefinitionFindAllDataImpl extends FindAllDataImpl<BrowseDefinition> {
+  createAndSendGetRequest(href$: string | Observable<string>, useCachedVersionIfAvailable: boolean = true) {
+    createAndSendBrowseDefinitionGetRequest(this.requestService, this.responseMsToLive, href$, useCachedVersionIfAvailable);
+  }
+}
 
 /**
  * Data service responsible for retrieving browse definitions from the REST server
@@ -21,8 +77,9 @@ import { dataService } from '../data/base/data-service.decorator';
   providedIn: 'root',
 })
 @dataService(BROWSE_DEFINITION)
-export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition> {
-  private findAllData: FindAllDataImpl<BrowseDefinition>;
+export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseDefinition> implements FindAllData<BrowseDefinition>, SearchData<BrowseDefinition> {
+  private findAllData: BrowseDefinitionFindAllDataImpl;
+  private searchData: SearchDataImpl<BrowseDefinition>;
 
   constructor(
     protected requestService: RequestService,
@@ -31,8 +88,8 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
     protected halService: HALEndpointService,
   ) {
     super('browses', requestService, rdbService, objectCache, halService);
-
-    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.findAllData = new BrowseDefinitionFindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -52,5 +109,74 @@ export class BrowseDefinitionDataService extends IdentifiableDataService<BrowseD
   findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @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
+   * @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<BrowseDefinition>[]): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Create the HREF for a specific object's search method with given options object
+   *
+   * @param searchMethod The search method for the object
+   * @param options The [[FindListOptions]] object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Get the browse URL by providing a list of metadata keys. The first matching browse index definition
+   * for any of the fields is returned. This is used in eg. item page field component, which can be configured
+   * with several fields for a component like 'Author', and needs to know if and how to link the values
+   * to configured browse indices.
+   *
+   * @param fields  an array of field strings, eg. ['dc.contributor.author', 'dc.creator']
+   * @param useCachedVersionIfAvailable Override the data service useCachedVersionIfAvailable parameter (default: true)
+   * @param reRequestOnStale Override the data service reRequestOnStale parameter (default: true)
+   * @param linksToFollow Override the data service linksToFollow parameter (default: empty array)
+   */
+  findByFields(
+    fields: string[],
+    useCachedVersionIfAvailable = true,
+    reRequestOnStale = true,
+    ...linksToFollow: FollowLinkConfig<BrowseDefinition>[]
+  ): Observable<RemoteData<BrowseDefinition>> {
+    const searchParams = [];
+    searchParams.push(new RequestParam('fields', fields));
+
+    const hrefObs = this.getSearchByHref(
+      'byFields',
+      { searchParams },
+      ...linksToFollow,
+    );
+
+    return this.findByHref(
+      hrefObs,
+      useCachedVersionIfAvailable,
+      reRequestOnStale,
+      ...linksToFollow,
+    );
+  }
+
+  createAndSendGetRequest(href$: string | Observable<string>, useCachedVersionIfAvailable: boolean = true) {
+    createAndSendBrowseDefinitionGetRequest(this.requestService, this.responseMsToLive, href$, useCachedVersionIfAvailable);
+  }
 }
 
diff --git a/src/app/core/browse/browse.service.spec.ts b/src/app/core/browse/browse.service.spec.ts
index 46ac8c44f4..f9999439e1 100644
--- a/src/app/core/browse/browse.service.spec.ts
+++ b/src/app/core/browse/browse.service.spec.ts
@@ -1,18 +1,31 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import {
+  createPaginatedList,
+  getFirstUsedArgumentOfSpyMethod,
+} from '../../shared/testing/utils.test';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestService } from '../data/request.service';
-import { BrowseDefinition } from '../shared/browse-definition.model';
-import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
-import { BrowseService } from './browse.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList, getFirstUsedArgumentOfSpyMethod } from '../../shared/testing/utils.test';
-import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { RequestEntry } from '../data/request-entry.model';
+import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../shared/hierarchical-browse-definition.model';
+import { ValueListBrowseDefinition } from '../shared/value-list-browse-definition.model';
+import { BrowseService } from './browse.service';
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 
 describe('BrowseService', () => {
   let scheduler: TestScheduler;
@@ -23,62 +36,78 @@ describe('BrowseService', () => {
   const browsesEndpointURL = 'https://rest.api/browses';
   const halService: any = new HALEndpointServiceStub(browsesEndpointURL);
   const browseDefinitions = [
-    Object.assign(new BrowseDefinition(), {
+    Object.assign(new FlatBrowseDefinition(), {
       id: 'date',
-      metadataBrowse: false,
+      browseType: 'flatBrowse',
       sortOptions: [
         {
           name: 'title',
-          metadata: 'dc.title'
+          metadata: 'dc.title',
         },
         {
           name: 'dateissued',
-          metadata: 'dc.date.issued'
+          metadata: 'dc.date.issued',
         },
         {
           name: 'dateaccessioned',
-          metadata: 'dc.date.accessioned'
-        }
+          metadata: 'dc.date.accessioned',
+        },
       ],
       defaultSortOrder: 'ASC',
       type: 'browse',
       metadataKeys: [
-        'dc.date.issued'
+        'dc.date.issued',
       ],
       _links: {
         self: { href: 'https://rest.api/discover/browses/dateissued' },
-        items: { href: 'https://rest.api/discover/browses/dateissued/items' }
-      }
+        items: { href: 'https://rest.api/discover/browses/dateissued/items' },
+      },
     }),
-    Object.assign(new BrowseDefinition(), {
+    Object.assign(new ValueListBrowseDefinition(), {
       id: 'author',
-      metadataBrowse: true,
+      browseType: 'valueList',
       sortOptions: [
         {
           name: 'title',
-          metadata: 'dc.title'
+          metadata: 'dc.title',
         },
         {
           name: 'dateissued',
-          metadata: 'dc.date.issued'
+          metadata: 'dc.date.issued',
         },
         {
           name: 'dateaccessioned',
-          metadata: 'dc.date.accessioned'
-        }
+          metadata: 'dc.date.accessioned',
+        },
       ],
       defaultSortOrder: 'ASC',
       type: 'browse',
       metadataKeys: [
         'dc.contributor.*',
-        'dc.creator'
+        'dc.creator',
       ],
       _links: {
         self: { href: 'https://rest.api/discover/browses/author' },
         entries: { href: 'https://rest.api/discover/browses/author/entries' },
-        items: { href: 'https://rest.api/discover/browses/author/items' }
-      }
-    })
+        items: { href: 'https://rest.api/discover/browses/author/items' },
+      },
+    }),
+    Object.assign(new HierarchicalBrowseDefinition(), {
+      id: 'srsc',
+      browseType: 'hierarchicalBrowse',
+      facetType: 'subject',
+      vocabulary: 'srsc',
+      type: 'browse',
+      metadata: [
+        'dc.subject',
+      ],
+      _links: {
+        vocabulary: { 'href': 'https://rest.api/submission/vocabularies/srsc/' },
+        items: { 'href': 'https://rest.api/discover/browses/srsc/items' },
+        entries: { 'href': 'https://rest.api/discover/browses/srsc/entries' },
+        self: { 'href': 'https://rest.api/discover/browses/srsc' },
+      },
+    }),
   ];
 
   let browseDefinitionDataService;
@@ -86,13 +115,13 @@ describe('BrowseService', () => {
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, payload: browseDefinitions } as any
+      response: { isSuccessful: successful, payload: browseDefinitions } as any,
     } as RequestEntry);
   };
 
   function initTestService() {
     browseDefinitionDataService = jasmine.createSpyObj('browseDefinitionDataService', {
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(browseDefinitions))
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(browseDefinitions)),
     });
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new BrowseService(
@@ -100,7 +129,7 @@ describe('BrowseService', () => {
       halService,
       browseDefinitionDataService,
       hrefOnlyDataService,
-      rdbService
+      rdbService,
     );
   }
 
@@ -140,13 +169,13 @@ describe('BrowseService', () => {
 
     describe('when getBrowseEntriesFor is called with a valid browse definition id', () => {
       it('should call hrefOnlyDataService.findListByHref with the expected href', () => {
-        const expected = browseDefinitions[1]._links.entries.href;
+        const expected = (browseDefinitions[1] as ValueListBrowseDefinition)._links.entries.href;
 
         scheduler.schedule(() => service.getBrowseEntriesFor(new BrowseEntrySearchOptions(browseDefinitions[1].id)).subscribe());
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expected
+          a: expected,
         }));
       });
 
@@ -160,7 +189,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expected
+          a: expected,
         }));
       });
 
@@ -175,7 +204,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expected
+          a: expected,
         }));
       });
     });
@@ -190,7 +219,7 @@ describe('BrowseService', () => {
         service = initTestService();
         spyOn(service, 'getBrowseDefinitions').and
           .returnValue(hot('--a-', {
-            a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions))
+            a: createSuccessfulRemoteDataObject(createPaginatedList(browseDefinitions)),
           }));
       });
 
@@ -272,7 +301,7 @@ describe('BrowseService', () => {
         scheduler.flush();
 
         expect(getFirstUsedArgumentOfSpyMethod(hrefOnlyDataService.findListByHref)).toBeObservable(cold('(a|)', {
-          a: expectedURL
+          a: expectedURL,
         }));
       });
 
diff --git a/src/app/core/browse/browse.service.ts b/src/app/core/browse/browse.service.ts
index 2fab189254..a724673d32 100644
--- a/src/app/core/browse/browse.service.ts
+++ b/src/app/core/browse/browse.service.ts
@@ -1,31 +1,45 @@
 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 {
+  distinctUntilChanged,
+  map,
+  startWith,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { SortDirection } from '../cache/models/sort-options.model';
+import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from '../shared/browse-definition.model';
 import { BrowseEntry } from '../shared/browse-entry.model';
+import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import {
   getBrowseDefinitionLinks,
   getFirstOccurrence,
-  getRemoteDataPayload,
   getFirstSucceededRemoteData,
-  getPaginatedListPayload
+  getPaginatedListPayload,
+  getRemoteDataPayload,
 } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 import { BrowseDefinitionDataService } from './browse-definition-data.service';
-import { HrefOnlyDataService } from '../data/href-only-data.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-
+import { BrowseEntrySearchOptions } from './browse-entry-search-options.model';
 
 export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
-  followLink('thumbnail')
+  followLink('thumbnail'),
 ];
 
 /**
@@ -35,7 +49,7 @@ export const BROWSE_LINKS_TO_FOLLOW: FollowLinkConfig<BrowseEntry | Item>[] = [
 export class BrowseService {
   protected linkPath = 'browses';
 
-  private static toSearchKeyArray(metadataKey: string): string[] {
+  public static toSearchKeyArray(metadataKey: string): string[] {
     const keyParts = metadataKey.split('.');
     const searchFor = [];
     searchFor.push('*');
@@ -100,10 +114,10 @@ export class BrowseService {
           href = new URLCombiner(href, `?${args.join('&')}`).toString();
         }
         return href;
-      })
+      }),
     );
     if (options.fetchThumbnail ) {
-      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, null, null, ...BROWSE_LINKS_TO_FOLLOW);
+      return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$, {}, undefined, undefined, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<BrowseEntry>(href$);
   }
@@ -151,7 +165,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, ...BROWSE_LINKS_TO_FOLLOW);
     }
     return this.hrefOnlyDataService.findListByHref<Item>(href$);
   }
@@ -160,8 +174,9 @@ export class BrowseService {
    * Get the first item for a metadata definition in an optional scope
    * @param definition
    * @param scope
+   * @param sortDirection optional sort parameter
    */
-  getFirstItemFor(definition: string, scope?: string): Observable<RemoteData<Item>> {
+  getFirstItemFor(definition: string, scope?: string, sortDirection?: SortDirection): Observable<RemoteData<Item>> {
     const href$ = this.getBrowseDefinitions().pipe(
       getBrowseDefinitionLinks(definition),
       hasValueOperator(),
@@ -177,16 +192,19 @@ export class BrowseService {
         }
         args.push('page=0');
         args.push('size=1');
+        if (sortDirection) {
+          args.push('sort=default,' + sortDirection);
+        }
         if (isNotEmpty(args)) {
           href = new URLCombiner(href, `?${args.join('&')}`).toString();
         }
         return href;
-      })
+      }),
     );
 
     return this.hrefOnlyDataService.findListByHref<Item>(href$).pipe(
       getFirstSucceededRemoteData(),
-      getFirstOccurrence()
+      getFirstOccurrence(),
     );
 
   }
@@ -235,9 +253,14 @@ export class BrowseService {
       getPaginatedListPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
         .find((def: BrowseDefinition) => {
-          const matchingKeys = def.metadataKeys.find((key: string) => searchKeyArray.indexOf(key) >= 0);
+          let matchingKeys = '';
+
+          if (Array.isArray((def as FlatBrowseDefinition).metadataKeys)) {
+            matchingKeys = (def as FlatBrowseDefinition).metadataKeys.find((key: string) => searchKeyArray.indexOf(key) >= 0);
+          }
+
           return isNotEmpty(matchingKeys);
-        })
+        }),
       ),
       map((def: BrowseDefinition) => {
         if (isEmpty(def) || isEmpty(def._links) || isEmpty(def._links[linkPath])) {
@@ -247,7 +270,7 @@ export class BrowseService {
         }
       }),
       startWith(undefined),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/cache/builders/build-decorators.spec.ts b/src/app/core/cache/builders/build-decorators.spec.ts
index 150a07f006..53f4cb2f7f 100644
--- a/src/app/core/cache/builders/build-decorators.spec.ts
+++ b/src/app/core/cache/builders/build-decorators.spec.ts
@@ -1,7 +1,12 @@
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
-import { getLinkDefinition, link } from './build-decorators';
+import {
+  dataService,
+  getDataServiceFor,
+  getLinkDefinition,
+  link,
+} from './build-decorators';
 
 class TestHALResource implements HALResource {
   _links: {
@@ -46,5 +51,17 @@ describe('build decorators', () => {
         expect(result).toBeUndefined();
       });
     });
+
+    describe(`set data service`, () => {
+      it(`should throw error`, () => {
+        expect(dataService(null)).toThrow();
+      });
+
+      it(`should set properly data service for type`, () => {
+        const target = new TestHALResource();
+        dataService(testType)(target);
+        expect(getDataServiceFor(testType)).toEqual(target);
+      });
+    });
   });
 });
diff --git a/src/app/core/cache/builders/build-decorators.ts b/src/app/core/cache/builders/build-decorators.ts
index 9e5ebaed85..be3ffc0f4d 100644
--- a/src/app/core/cache/builders/build-decorators.ts
+++ b/src/app/core/cache/builders/build-decorators.ts
@@ -1,25 +1,34 @@
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { InjectionToken } from '@angular/core';
 
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
+import { CacheableObject } from '../cacheable-object.model';
 import { getResourceTypeValueFor } from '../object-cache.reducer';
-import { InjectionToken } from '@angular/core';
 import { TypedObject } from '../typed-object.model';
 
+export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<any>>('getDataServiceFor', {
+  providedIn: 'root',
+  factory: () => getDataServiceFor,
+});
 export const LINK_DEFINITION_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>, linkName: keyof T['_links']) => LinkDefinition<T>>('getLinkDefinition', {
   providedIn: 'root',
   factory: () => getLinkDefinition,
 });
 export const LINK_DEFINITION_MAP_FACTORY = new InjectionToken<<T extends HALResource>(source: GenericConstructor<T>) => Map<keyof T['_links'], LinkDefinition<T>>>('getLinkDefinitions', {
   providedIn: 'root',
-  factory: () => getLinkDefinitions
+  factory: () => getLinkDefinitions,
 });
 
 const resolvedLinkKey = Symbol('resolvedLink');
 
 const resolvedLinkMap = new Map();
 const typeMap = new Map();
+const dataServiceMap = new Map();
 const linkMap = new Map();
 
 /**
@@ -38,6 +47,39 @@ export function getClassForType(type: string | ResourceType) {
   return typeMap.get(getResourceTypeValueFor(type));
 }
 
+/**
+ * A class decorator to indicate that this class is a dataservice
+ * for a given resource type.
+ *
+ * "dataservice" in this context means that it has findByHref and
+ * findAllByHref methods.
+ *
+ * @param resourceType the resource type the class is a dataservice for
+ */
+export function dataService(resourceType: ResourceType): any {
+  return (target: any) => {
+    if (hasNoValue(resourceType)) {
+      throw new Error(`Invalid @dataService annotation on ${target}, resourceType needs to be defined`);
+    }
+    const existingDataservice = dataServiceMap.get(resourceType.value);
+
+    if (hasValue(existingDataservice)) {
+      throw new Error(`Multiple dataservices for ${resourceType.value}: ${existingDataservice} and ${target}`);
+    }
+
+    dataServiceMap.set(resourceType.value, target);
+  };
+}
+
+/**
+ * Return the dataservice matching the given resource type
+ *
+ * @param resourceType the resource type you want the matching dataservice for
+ */
+export function getDataServiceFor<T extends CacheableObject>(resourceType: ResourceType) {
+  return dataServiceMap.get(resourceType.value);
+}
+
 /**
  * A class to represent the data that can be set by the @link decorator
  */
@@ -65,7 +107,7 @@ export const link = <T extends HALResource>(
   resourceType: ResourceType,
   isList = false,
   linkName?: keyof T['_links'],
-  ) => {
+) => {
   return (target: T, propertyName: string) => {
     let targetMap = linkMap.get(target.constructor);
 
@@ -81,7 +123,7 @@ export const link = <T extends HALResource>(
       resourceType,
       isList,
       linkName,
-      propertyName
+      propertyName,
     });
 
     linkMap.set(target.constructor, targetMap);
diff --git a/src/app/core/cache/builders/link.service.spec.ts b/src/app/core/cache/builders/link.service.spec.ts
index 0ddfe05870..0bb5e4f238 100644
--- a/src/app/core/cache/builders/link.service.spec.ts
+++ b/src/app/core/cache/builders/link.service.spec.ts
@@ -1,15 +1,22 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { isEmpty } from 'rxjs/operators';
+
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
+import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
+import { FindListOptions } from '../../data/find-list-options.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { HALResource } from '../../shared/hal-resource.model';
 import { ResourceType } from '../../shared/resource-type';
+import {
+  LINK_DEFINITION_FACTORY,
+  LINK_DEFINITION_MAP_FACTORY,
+} from './build-decorators';
 import { LinkService } from './link.service';
-import { LINK_DEFINITION_FACTORY, LINK_DEFINITION_MAP_FACTORY } from './build-decorators';
-import { isEmpty } from 'rxjs/operators';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
 
 const TEST_MODEL = new ResourceType('testmodel');
 let result: any;
@@ -54,15 +61,15 @@ describe('LinkService', () => {
       value: 'a test value',
       _links: {
         self: {
-          href: 'http://self.link'
+          href: 'http://self.link',
         },
         predecessor: {
-          href: 'http://predecessor.link'
+          href: 'http://predecessor.link',
         },
         successor: {
-          href: 'http://successor.link'
+          href: 'http://successor.link',
         },
-      }
+      },
     });
     testDataService = new TestDataService();
     spyOn(testDataService, 'findListByHref').and.callThrough();
@@ -70,7 +77,7 @@ describe('LinkService', () => {
     TestBed.configureTestingModule({
       providers: [LinkService, {
         provide: TestDataService,
-        useValue: testDataService
+        useValue: testDataService,
       }, {
         provide: DATA_SERVICE_FACTORY,
         useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService),
@@ -79,7 +86,7 @@ describe('LinkService', () => {
         useValue: jasmine.createSpy('getLinkDefinition').and.returnValue({
           resourceType: TEST_MODEL,
           linkName: 'predecessor',
-          propertyName: 'predecessor'
+          propertyName: 'predecessor',
         }),
       }, {
         provide: LINK_DEFINITION_MAP_FACTORY,
@@ -93,9 +100,9 @@ describe('LinkService', () => {
             resourceType: TEST_MODEL,
             linkName: 'successor',
             propertyName: 'successor',
-          }
+          },
         ]),
-      }]
+      }],
     });
     service = TestBed.inject(LinkService);
   });
@@ -115,7 +122,7 @@ describe('LinkService', () => {
           resourceType: TEST_MODEL,
           linkName: 'predecessor',
           propertyName: 'predecessor',
-          isList: true
+          isList: true,
         });
         service.resolveLink(testModel, followLink('predecessor', { findListOptions: { some: 'options ' } as any }, followLink('successor')));
       });
@@ -213,12 +220,12 @@ describe('LinkService', () => {
         value: 'a test value',
         _links: {
           self: {
-            href: 'http://self.link'
+            href: 'http://self.link',
           },
           predecessor: {
-            href: 'http://predecessor.link'
-          }
-        }
+            href: 'http://predecessor.link',
+          },
+        },
       });
     });
 
@@ -237,7 +244,7 @@ describe('LinkService', () => {
         ((service as any).getLinkDefinition as jasmine.Spy).and.returnValue({
           resourceType: TEST_MODEL,
           linkName: 'successor',
-          propertyName: 'successor'
+          propertyName: 'successor',
         });
         result = service.resolveLinks(testModel, followLink('successor'));
       });
diff --git a/src/app/core/cache/builders/link.service.ts b/src/app/core/cache/builders/link.service.ts
index b7af54abf7..78cd28085e 100644
--- a/src/app/core/cache/builders/link.service.ts
+++ b/src/app/core/cache/builders/link.service.ts
@@ -1,19 +1,31 @@
-import { Inject, Injectable, Injector } from '@angular/core';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
+import {
+  Inject,
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
+import { HALDataService } from '../../data/base/hal-data-service.interface';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
 import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALResource } from '../../shared/hal-resource.model';
-import { DATA_SERVICE_FACTORY } from '../../data/base/data-service.decorator';
+import { ResourceType } from '../../shared/resource-type';
 import {
   LINK_DEFINITION_FACTORY,
   LINK_DEFINITION_MAP_FACTORY,
   LinkDefinition,
 } from './build-decorators';
-import { RemoteData } from '../../data/remote-data';
-import { EMPTY, Observable } from 'rxjs';
-import { ResourceType } from '../../shared/resource-type';
-import { HALDataService } from '../../data/base/hal-data-service.interface';
-import { PaginatedList } from '../../data/paginated-list.model';
 
 /**
  * A Service to handle the resolving and removing
@@ -60,7 +72,7 @@ export class LinkService {
       const provider = this.getDataServiceFor(matchingLinkDef.resourceType);
 
       if (hasNoValue(provider)) {
-        throw new Error(`The @link() for ${linkToFollow.name} on ${model.constructor.name} models uses the resource type ${matchingLinkDef.resourceType.value.toUpperCase()}, but there is no service with an @dataService(${matchingLinkDef.resourceType.value.toUpperCase()}) annotation in order to retrieve it`);
+        throw new Error(`The @link() for ${String(linkToFollow.name)} on ${model.constructor.name} models uses the resource type ${matchingLinkDef.resourceType.value.toUpperCase()}, but there is no service with an @dataService(${matchingLinkDef.resourceType.value.toUpperCase()}) annotation in order to retrieve it`);
       }
 
       const service: HALDataService<any> = Injector.create({
@@ -79,12 +91,12 @@ export class LinkService {
             return service.findByHref(href, linkToFollow.useCachedVersionIfAvailable, linkToFollow.reRequestOnStale, ...linkToFollow.linksToFollow);
           }
         } catch (e) {
-          console.error(`Something went wrong when using @dataService(${matchingLinkDef.resourceType.value}) ${hasValue(service) ? '' : '(undefined) '}to resolve link ${linkToFollow.name} at ${href}`);
+          console.error(`Something went wrong when using @dataService(${matchingLinkDef.resourceType.value}) ${hasValue(service) ? '' : '(undefined) '}to resolve link ${String(linkToFollow.name)} at ${href}`);
           throw e;
         }
       }
     } else if (!linkToFollow.isOptional) {
-      throw new Error(`followLink('${linkToFollow.name}') was used as a required link for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${linkToFollow.name}`);
+      throw new Error(`followLink('${String(linkToFollow.name)}') was used as a required link for a ${model.constructor.name}, but there is no property on ${model.constructor.name} models with an @link() for ${String(linkToFollow.name)}`);
     }
 
     return EMPTY;
diff --git a/src/app/core/cache/builders/remote-data-build.service.spec.ts b/src/app/core/cache/builders/remote-data-build.service.spec.ts
index d9b856bb77..ec756ce85e 100644
--- a/src/app/core/cache/builders/remote-data-build.service.spec.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.spec.ts
@@ -1,26 +1,43 @@
-import { createFailedRemoteDataObject, createPendingRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { buildPaginatedList, PaginatedList } from '../../data/paginated-list.model';
-import { Item } from '../../shared/item.model';
-import { PageInfo } from '../../shared/page-info.model';
-import { RemoteDataBuildService } from './remote-data-build.service';
-import { ObjectCacheService } from '../object-cache.service';
-import { ITEM } from '../../shared/item.resource-type';
-import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
-import { LinkService } from './link.service';
-import { RequestService } from '../../data/request.service';
-import { UnCacheableObject } from '../../shared/uncacheable-object.model';
-import { RemoteData } from '../../data/remote-data';
-import { Observable, of as observableOf } from 'rxjs';
-import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { take } from 'rxjs/operators';
-import { HALLink } from '../../shared/hal-link.model';
-import { RequestEntryState } from '../../data/request-entry-state.model';
-import { RequestEntry } from '../../data/request-entry.model';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
 import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
 import { TestScheduler } from 'rxjs/testing';
-import { fakeAsync, tick } from '@angular/core/testing';
+
+import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
+import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import {
+  createFailedRemoteDataObject,
+  createPendingRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../../shared/remote-data.utils';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { RequestEntryState } from '../../data/request-entry-state.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { Item } from '../../shared/item.model';
+import { ITEM } from '../../shared/item.resource-type';
+import { PageInfo } from '../../shared/page-info.model';
+import { UnCacheableObject } from '../../shared/uncacheable-object.model';
+import { ObjectCacheService } from '../object-cache.service';
+import { LinkService } from './link.service';
+import { RemoteDataBuildService } from './remote-data-build.service';
 
 describe('RemoteDataBuildService', () => {
   let service: RemoteDataBuildService;
@@ -49,7 +66,7 @@ describe('RemoteDataBuildService', () => {
     linkService = getMockLinkService();
     requestService = getMockRequestService();
     unCacheableObject = {
-      foo: 'bar'
+      foo: 'bar',
     };
     pageInfo = new PageInfo();
     selfLink1 = 'https://rest.api/some/object';
@@ -64,31 +81,31 @@ describe('RemoteDataBuildService', () => {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'Item nr 1'
-            }
-          ]
+              value: 'Item nr 1',
+            },
+          ],
         },
         _links: {
           self: {
-            href: selfLink1
-          }
-        }
+            href: selfLink1,
+          },
+        },
       }),
       Object.assign(new Item(), {
         metadata: {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'Item nr 2'
-            }
-          ]
+              value: 'Item nr 2',
+            },
+          ],
         },
         _links: {
           self: {
-            href: selfLink2
-          }
-        }
-      })
+            href: selfLink2,
+          },
+        },
+      }),
     ];
     paginatedList = buildPaginatedList(pageInfo, array);
     normalizedPaginatedList = buildPaginatedList(pageInfo, array, true);
@@ -96,43 +113,43 @@ describe('RemoteDataBuildService', () => {
     paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
     entrySuccessCacheable = {
       request: {
-        uuid: '17820127-0ee5-4ed4-b6da-e654bdff8487'
+        uuid: '17820127-0ee5-4ed4-b6da-e654bdff8487',
       },
       state: RequestEntryState.Success,
       response: {
         statusCode: 200,
         payloadLink: {
-          href: selfLink1
-        }
-      }
+          href: selfLink1,
+        },
+      },
     } as RequestEntry;
     entrySuccessUnCacheable = {
       request: {
-        uuid: '0aa5ec06-d6a7-4e73-952e-1e0462bd1501'
+        uuid: '0aa5ec06-d6a7-4e73-952e-1e0462bd1501',
       },
       state: RequestEntryState.Success,
       response: {
         statusCode: 200,
         unCacheableObject,
-      }
+      },
     } as RequestEntry;
     entrySuccessNoContent = {
       request: {
-        uuid: '780a7295-6102-4a43-9775-80f2a4ff673c'
+        uuid: '780a7295-6102-4a43-9775-80f2a4ff673c',
       },
       state: RequestEntryState.Success,
       response: {
-        statusCode: 204
+        statusCode: 204,
       },
     } as RequestEntry;
     entryError = {
       request: {
-        uuid: '1609dcbc-8442-4877-966e-864f151cc40c'
+        uuid: '1609dcbc-8442-4877-966e-864f151cc40c',
       },
       state: RequestEntryState.Error,
       response: {
         statusCode: 500,
-      }
+      },
     } as RequestEntry;
     requestEntry$ = observableOf(entrySuccessCacheable);
     linksToFollow = [
@@ -427,8 +444,8 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         entry = {
           response: {
-            payloadLink: { href: 'payload-link' }
-          }
+            payloadLink: { href: 'payload-link' },
+          },
         };
       });
 
@@ -441,8 +458,8 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         entry = {
           response: {
-            payloadLink: undefined
-          }
+            payloadLink: undefined,
+          },
         };
       });
 
@@ -459,8 +476,8 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         entry = {
           response: {
-            unCacheableObject: Object.assign({})
-          }
+            unCacheableObject: Object.assign({}),
+          },
         };
       });
 
@@ -472,7 +489,7 @@ describe('RemoteDataBuildService', () => {
     describe('when the entry\'s response doesn\'t contain an uncacheable object', () => {
       beforeEach(() => {
         entry = {
-          response: {}
+          response: {},
         };
       });
 
@@ -487,7 +504,7 @@ describe('RemoteDataBuildService', () => {
       it(`should return a new instance of that type`, () => {
         const source: any = {
           type: ITEM,
-          uuid: 'some-uuid'
+          uuid: 'some-uuid',
         };
 
         const result = (service as any).plainObjectToInstance(source);
@@ -503,7 +520,7 @@ describe('RemoteDataBuildService', () => {
       it(`should return a new plain JS object`, () => {
         const source: any = {
           type: 'foobar',
-          uuid: 'some-uuid'
+          uuid: 'some-uuid',
         };
 
         const result = (service as any).plainObjectToInstance(source);
@@ -528,7 +545,7 @@ describe('RemoteDataBuildService', () => {
       beforeEach(() => {
         paginatedLinksToFollow = [
           followLink('page', {}, ...linksToFollow),
-          ...linksToFollow
+          ...linksToFollow,
         ];
       });
       describe(`and the given list doesn't have a page property already`, () => {
@@ -843,15 +860,15 @@ describe('RemoteDataBuildService', () => {
     it('should only emit after the callback is done', () => {
       testScheduler.run(({ cold: tsCold, expectObservable }) => {
         buildFromRequestUUIDSpy.and.returnValue(
-          tsCold('-p----s', RDs)
+          tsCold('-p----s', RDs),
         );
         callback.and.returnValue(
-          tsCold('      --t', BOOLEAN)
+          tsCold('      --t', BOOLEAN),
         );
 
         const done$ = service.buildFromRequestUUIDAndAwait('some-href', callback);
         expectObservable(done$).toBe(
-          '       -p------s', RDs       // resulting duration between pending & successful includes the callback
+          '       -p------s', RDs,       // resulting duration between pending & successful includes the callback
         );
       });
     });
diff --git a/src/app/core/cache/builders/remote-data-build.service.ts b/src/app/core/cache/builders/remote-data-build.service.ts
index 76529891d4..e5a6114872 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -5,27 +5,50 @@ import {
   Observable,
   of as observableOf,
 } from 'rxjs';
-import { map, switchMap, filter, distinctUntilKeyChanged, startWith } from 'rxjs/operators';
-import { hasValue, isEmpty, isNotEmpty, hasNoValue, isUndefined } from '../../../shared/empty.util';
+import {
+  distinctUntilKeyChanged,
+  filter,
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isUndefined,
+} from '../../../shared/empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
 import { PaginatedList } from '../../data/paginated-list.model';
+import { PAGINATED_LIST } from '../../data/paginated-list.resource-type';
 import { RemoteData } from '../../data/remote-data';
 import { RequestService } from '../../data/request.service';
-import { ObjectCacheService } from '../object-cache.service';
-import { LinkService } from './link.service';
-import { HALLink } from '../../shared/hal-link.model';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { getClassForType } from './build-decorators';
-import { HALResource } from '../../shared/hal-resource.model';
-import { PAGINATED_LIST } from '../../data/paginated-list.resource-type';
-import { getUrlWithoutEmbedParams } from '../../index/index.selectors';
-import { getResourceTypeValueFor } from '../object-cache.reducer';
-import { hasSucceeded, isStale, RequestEntryState } from '../../data/request-entry-state.model';
-import { getRequestFromRequestHref, getRequestFromRequestUUID } from '../../shared/request.operators';
 import { RequestEntry } from '../../data/request-entry.model';
+import {
+  hasSucceeded,
+  isStale,
+  RequestEntryState,
+} from '../../data/request-entry-state.model';
 import { ResponseState } from '../../data/response-state.model';
+import { getUrlWithoutEmbedParams } from '../../index/index.selectors';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { HALLink } from '../../shared/hal-link.model';
+import { HALResource } from '../../shared/hal-resource.model';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
+import {
+  getRequestFromRequestHref,
+  getRequestFromRequestUUID,
+} from '../../shared/request.operators';
+import { getResourceTypeValueFor } from '../object-cache.reducer';
+import { ObjectCacheService } from '../object-cache.service';
+import { getClassForType } from './build-decorators';
+import { LinkService } from './link.service';
 
 @Injectable()
 export class RemoteDataBuildService {
@@ -73,11 +96,11 @@ export class RemoteDataBuildService {
           if (getResourceTypeValueFor((obj as any).type) === PAGINATED_LIST.value) {
             return this.buildPaginatedList<T>(obj, ...linksToFollow);
           } else if (isNotEmpty(linksToFollow)) {
-            return [this.linkService.resolveLinks(obj, ...linksToFollow)];
+            return [this.linkService.resolveLinks(obj as any, ...linksToFollow)];
           }
         }
         return [obj];
-      })
+      }),
     );
   }
 
@@ -151,7 +174,7 @@ export class RemoteDataBuildService {
           paginatedList.page = page
             .map((obj: any) => this.plainObjectToInstance<T>(obj))
             .map((obj: any) =>
-              this.linkService.resolveLinks(obj, ...pageLink.linksToFollow)
+              this.linkService.resolveLinks(obj, ...pageLink.linksToFollow),
             );
           if (isNotEmpty(otherLinks)) {
             return this.linkService.resolveLinks(paginatedList, ...otherLinks);
@@ -161,9 +184,10 @@ export class RemoteDataBuildService {
       } else {
         // in case the elements of the paginated list were already filled in, because they're UnCacheableObjects
         paginatedList.page = paginatedList.page
+          .filter((obj: any) => obj != null)
           .map((obj: any) => this.plainObjectToInstance<T>(obj))
           .map((obj: any) =>
-            this.linkService.resolveLinks(obj, ...pageLink.linksToFollow)
+            this.linkService.resolveLinks(obj, ...pageLink.linksToFollow),
           );
         if (isNotEmpty(otherLinks)) {
           return observableOf(this.linkService.resolveLinks(paginatedList, ...otherLinks));
@@ -229,7 +253,7 @@ export class RemoteDataBuildService {
         } else {
           return [rd];
         }
-      })
+      }),
     );
   }
 
@@ -272,12 +296,13 @@ export class RemoteDataBuildService {
           return isStale(r2.state) ? r1 : r2;
         }
       }),
-      distinctUntilKeyChanged('lastUpdated')
     );
 
     const payload$ = this.buildPayload<T>(requestEntry$, href$, ...linksToFollow);
 
-    return this.toRemoteDataObservable<T>(requestEntry$, payload$);
+    return this.toRemoteDataObservable<T>(requestEntry$, payload$).pipe(
+      distinctUntilKeyChanged('lastUpdated'),
+    );
   }
 
   /**
@@ -293,12 +318,12 @@ export class RemoteDataBuildService {
   toRemoteDataObservable<T>(requestEntry$: Observable<RequestEntry>, payload$: Observable<T>) {
     return observableCombineLatest([
       requestEntry$,
-      payload$
+      payload$,
     ]).pipe(
       filter(([entry,payload]: [RequestEntry, T]) =>
         hasValue(entry) &&
         // filter out cases where the state is successful, but the payload isn't yet set
-        !(hasSucceeded(entry.state) && isUndefined(payload))
+        !(hasSucceeded(entry.state) && isUndefined(payload)),
       ),
       map(([entry, payload]: [RequestEntry, T]) => {
         let response = entry.response;
@@ -313,9 +338,9 @@ export class RemoteDataBuildService {
           entry.state,
           response.errorMessage,
           payload,
-          response.statusCode
+          response.statusCode,
         );
-      })
+      }),
     );
   }
 
@@ -406,7 +431,7 @@ export class RemoteDataBuildService {
           state,
           errorMessage,
           payload,
-          statusCode
+          statusCode,
         );
       }));
   }
diff --git a/src/app/core/cache/cacheable-object.model.ts b/src/app/core/cache/cacheable-object.model.ts
index b7d1609d58..86d041dab7 100644
--- a/src/app/core/cache/cacheable-object.model.ts
+++ b/src/app/core/cache/cacheable-object.model.ts
@@ -1,6 +1,6 @@
 /* tslint:disable:max-classes-per-file */
-import { HALResource } from '../shared/hal-resource.model';
 import { HALLink } from '../shared/hal-link.model';
+import { HALResource } from '../shared/hal-resource.model';
 import { TypedObject } from './typed-object.model';
 
 /**
diff --git a/src/app/core/cache/models/self-link.model.ts b/src/app/core/cache/models/self-link.model.ts
index a87acdd506..903a779495 100644
--- a/src/app/core/cache/models/self-link.model.ts
+++ b/src/app/core/cache/models/self-link.model.ts
@@ -3,9 +3,9 @@ import { autoserialize } from 'cerialize';
 export class SelfLink {
 
   @autoserialize
-  self: string;
+    self: string;
 
   @autoserialize
-  uuid: string;
+    uuid: string;
 
 }
diff --git a/src/app/core/cache/object-cache.actions.ts b/src/app/core/cache/object-cache.actions.ts
index c18a20ffd6..5f8f60e1f1 100644
--- a/src/app/core/cache/object-cache.actions.ts
+++ b/src/app/core/cache/object-cache.actions.ts
@@ -1,8 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
 
 import { type } from '../../shared/ngrx/type';
-import { Operation } from 'fast-json-patch';
 import { CacheableObject } from './cacheable-object.model';
 
 /**
@@ -15,7 +15,7 @@ export const ObjectCacheActionTypes = {
   ADD_PATCH: type('dspace/core/cache/object/ADD_PATCH'),
   APPLY_PATCH: type('dspace/core/cache/object/APPLY_PATCH'),
   ADD_DEPENDENTS: type('dspace/core/cache/object/ADD_DEPENDENTS'),
-  REMOVE_DEPENDENTS: type('dspace/core/cache/object/REMOVE_DEPENDENTS')
+  REMOVE_DEPENDENTS: type('dspace/core/cache/object/REMOVE_DEPENDENTS'),
 };
 
 /**
diff --git a/src/app/core/cache/object-cache.effects.spec.ts b/src/app/core/cache/object-cache.effects.spec.ts
index 3a50a5dbc7..66270be4c2 100644
--- a/src/app/core/cache/object-cache.effects.spec.ts
+++ b/src/app/core/cache/object-cache.effects.spec.ts
@@ -1,10 +1,14 @@
 import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
-import { ObjectCacheEffects } from './object-cache.effects';
-import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
 import { StoreActionTypes } from '../../store.actions';
+import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
+import { ObjectCacheEffects } from './object-cache.effects';
 
 describe('ObjectCacheEffects', () => {
   let cacheEffects: ObjectCacheEffects;
diff --git a/src/app/core/cache/object-cache.effects.ts b/src/app/core/cache/object-cache.effects.ts
index fa2bf6f690..0de59a152c 100644
--- a/src/app/core/cache/object-cache.effects.ts
+++ b/src/app/core/cache/object-cache.effects.ts
@@ -1,6 +1,10 @@
-import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { map } from 'rxjs/operators';
 
 import { StoreActionTypes } from '../../store.actions';
 import { ResetObjectCacheTimestampsAction } from './object-cache.actions';
@@ -16,9 +20,9 @@ export class ObjectCacheEffects {
    * This assumes that the server cached everything a negligible
    * time ago, and will likely need to be revisited later
    */
-   fixTimestampsOnRehydrate = createEffect(() => this.actions$
+  fixTimestampsOnRehydrate = createEffect(() => this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime()))
+      map(() => new ResetObjectCacheTimestampsAction(new Date().getTime())),
     ));
 
   constructor(private actions$: Actions) {
diff --git a/src/app/core/cache/object-cache.reducer.spec.ts b/src/app/core/cache/object-cache.reducer.spec.ts
index e346a00b61..7dda02a0f5 100644
--- a/src/app/core/cache/object-cache.reducer.spec.ts
+++ b/src/app/core/cache/object-cache.reducer.spec.ts
@@ -1,5 +1,7 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 import { Operation } from 'fast-json-patch';
+
 import { Item } from '../shared/item.model';
 import {
   AddDependentsObjectCacheAction,
@@ -10,7 +12,6 @@ import {
   RemoveFromObjectCacheAction,
   ResetObjectCacheTimestampsAction,
 } from './object-cache.actions';
-
 import { objectCacheReducer } from './object-cache.reducer';
 
 class NullAction extends RemoveFromObjectCacheAction {
@@ -53,7 +54,7 @@ describe('objectCacheReducer', () => {
         type: Item.type,
         self: selfLink2,
         foo: 'baz',
-        _links: { self: { href: selfLink2 } }
+        _links: { self: { href: selfLink2 } },
       },
       alternativeLinks: [altLink3, altLink4],
       timeCompleted: new Date().getTime(),
@@ -61,8 +62,8 @@ describe('objectCacheReducer', () => {
       requestUUIDs: [requestUUID2],
       dependentRequestUUIDs: [requestUUID1],
       patches: [],
-      isDirty: false
-    }
+      isDirty: false,
+    },
   };
   deepFreeze(testState);
 
@@ -125,6 +126,10 @@ describe('objectCacheReducer', () => {
     deepFreeze(state);
 
     objectCacheReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should remove the specified object from the cache in response to the REMOVE action', () => {
@@ -148,6 +153,10 @@ describe('objectCacheReducer', () => {
     const action = new RemoveFromObjectCacheAction(selfLink1);
     // testState has already been frozen above
     objectCacheReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set the timestamp of all objects in the cache in response to a RESET_TIMESTAMPS action', () => {
@@ -163,16 +172,24 @@ describe('objectCacheReducer', () => {
     const action = new ResetObjectCacheTimestampsAction(new Date().getTime());
     // testState has already been frozen above
     objectCacheReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the ADD_PATCH action without affecting the previous state', () => {
     const action = new AddPatchObjectCacheAction(selfLink1, [{
       op: 'replace',
       path: '/name',
-      value: 'random string'
+      value: 'random string',
     }]);
     // testState has already been frozen above
     objectCacheReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should when the ADD_PATCH action dispatched', () => {
diff --git a/src/app/core/cache/object-cache.reducer.ts b/src/app/core/cache/object-cache.reducer.ts
index dc3f50db68..631ecd2209 100644
--- a/src/app/core/cache/object-cache.reducer.ts
+++ b/src/app/core/cache/object-cache.reducer.ts
@@ -1,18 +1,26 @@
 /* eslint-disable max-classes-per-file */
+import {
+  applyPatch,
+  Operation,
+} from 'fast-json-patch';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { CacheEntry } from './cache-entry';
+import { CacheableObject } from './cacheable-object.model';
 import {
   AddDependentsObjectCacheAction,
   AddPatchObjectCacheAction,
   AddToObjectCacheAction,
   ApplyPatchObjectCacheAction,
   ObjectCacheAction,
-  ObjectCacheActionTypes, RemoveDependentsObjectCacheAction,
+  ObjectCacheActionTypes,
+  RemoveDependentsObjectCacheAction,
   RemoveFromObjectCacheAction,
   ResetObjectCacheTimestampsAction,
 } from './object-cache.actions';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { CacheEntry } from './cache-entry';
-import { applyPatch, Operation } from 'fast-json-patch';
-import { CacheableObject } from './cacheable-object.model';
 
 /**
  * An interface to represent a JsonPatch
@@ -177,8 +185,8 @@ function addToObjectCache(state: ObjectCacheState, action: AddToObjectCacheActio
       dependentRequestUUIDs: existing.dependentRequestUUIDs || [],
       isDirty: isNotEmpty(existing.patches),
       patches: existing.patches || [],
-      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks]
-    } as ObjectCacheEntry
+      alternativeLinks: [...(existing.alternativeLinks || []), ...newAltLinks],
+    } as ObjectCacheEntry,
   });
 }
 
@@ -217,7 +225,7 @@ function resetObjectCacheTimestamps(state: ObjectCacheState, action: ResetObject
   const newState = Object.create(null);
   Object.keys(state).forEach((key) => {
     newState[key] = Object.assign({}, state[key], {
-      timeCompleted: action.payload
+      timeCompleted: action.payload,
     });
   });
   return newState;
@@ -241,7 +249,7 @@ function addPatchObjectCache(state: ObjectCacheState, action: AddPatchObjectCach
     const patches = newState[uuid].patches;
     newState[uuid] = Object.assign({}, newState[uuid], {
       patches: [...patches, { operations } as Patch],
-      isDirty: true
+      isDirty: true,
     });
   }
   return newState;
@@ -286,8 +294,8 @@ function addDependentsObjectCacheState(state: ObjectCacheState, action: AddDepen
         ...new Set([
           ...newState[href]?.dependentRequestUUIDs || [],
           ...action.payload.dependentRequestUUIDs,
-        ])
-      ]
+        ]),
+      ],
     });
   }
 
@@ -308,7 +316,7 @@ function removeDependentsObjectCacheState(state: ObjectCacheState, action: Remov
 
   if (hasValue(newState[href])) {
     newState[href] = Object.assign({}, newState[href], {
-      dependentRequestUUIDs: []
+      dependentRequestUUIDs: [],
     });
   }
 
diff --git a/src/app/core/cache/object-cache.service.spec.ts b/src/app/core/cache/object-cache.service.spec.ts
index 6af797be29..3d27f7252c 100644
--- a/src/app/core/cache/object-cache.service.spec.ts
+++ b/src/app/core/cache/object-cache.service.spec.ts
@@ -1,33 +1,44 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { cold } from 'jasmine-marbles';
-import { Store, StoreModule } from '@ngrx/store';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
 import { Operation } from 'fast-json-patch';
-import { empty, of as observableOf } from 'rxjs';
+import { cold } from 'jasmine-marbles';
+import { TestColdObservable } from 'jasmine-marbles/src/test-observables';
+import {
+  empty,
+  of as observableOf,
+} from 'rxjs';
 import { first } from 'rxjs/operators';
+import { TestScheduler } from 'rxjs/testing';
 
-import { coreReducers} from '../core.reducers';
+import { storeModuleConfig } from '../../app.reducer';
+import { coreReducers } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { RestRequestMethod } from '../data/rest-request-method';
+import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import { IndexName } from '../index/index-name.model';
+import { HALLink } from '../shared/hal-link.model';
 import { Item } from '../shared/item.model';
 import {
   AddDependentsObjectCacheAction,
-  RemoveDependentsObjectCacheAction,
   AddPatchObjectCacheAction,
   AddToObjectCacheAction,
   ApplyPatchObjectCacheAction,
+  RemoveDependentsObjectCacheAction,
   RemoveFromObjectCacheAction,
 } from './object-cache.actions';
 import { Patch } from './object-cache.reducer';
 import { ObjectCacheService } from './object-cache.service';
 import { AddToSSBAction } from './server-sync-buffer.actions';
-import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
-import { HALLink } from '../shared/hal-link.model';
-import { storeModuleConfig } from '../../app.reducer';
-import { TestColdObservable } from 'jasmine-marbles/src/test-observables';
-import { IndexName } from '../index/index-name.model';
-import { CoreState } from '../core-state.model';
-import { TestScheduler } from 'rxjs/testing';
 
 describe('ObjectCacheService', () => {
   let service: ObjectCacheService;
@@ -69,8 +80,8 @@ describe('ObjectCacheService', () => {
       type: Item.type,
       _links: {
         self: { href: selfLink },
-        anotherLink: { href: anotherLink }
-      }
+        anotherLink: { href: anotherLink },
+      },
     };
     cacheEntry = {
       data: objectToCache,
@@ -96,8 +107,8 @@ describe('ObjectCacheService', () => {
         'cache/syncbuffer': {},
         'cache/object-updates': {},
         'data/request': {},
-        'index': {}
-      }
+        'index': {},
+      },
     };
   }
 
@@ -105,12 +116,12 @@ describe('ObjectCacheService', () => {
 
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot(coreReducers, storeModuleConfig)
+        StoreModule.forRoot(coreReducers, storeModuleConfig),
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: ObjectCacheService, useValue: service }
-      ]
+        { provide: ObjectCacheService, useValue: service },
+      ],
     }).compileComponents();
   }));
 
@@ -120,7 +131,7 @@ describe('ObjectCacheService', () => {
     mockStore = store as MockStore<CoreState>;
     mockStore.setState(initialState);
     linkServiceStub = {
-      removeResolvedLinks: (a) => a
+      removeResolvedLinks: (a) => a,
     };
     spyOn(linkServiceStub, 'removeResolvedLinks').and.callThrough();
     spyOn(store, 'dispatch');
@@ -209,7 +220,7 @@ describe('ObjectCacheService', () => {
   describe('getList', () => {
     it('should return an observable of the array of cached objects with the specified self link and type', () => {
       const item = Object.assign(new Item(), {
-        _links: { self: { href: selfLink } }
+        _links: { self: { href: selfLink } },
       });
       spyOn(service, 'getObjectByHref').and.returnValue(observableOf(item));
 
@@ -251,7 +262,7 @@ describe('ObjectCacheService', () => {
               'something',
               'something-else',
               'specific-request',
-            ]
+            ],
           })));
         });
 
@@ -266,7 +277,7 @@ describe('ObjectCacheService', () => {
             requestUUIDs: [
               'something',
               'something-else',
-            ]
+            ],
           })));
         });
 
@@ -292,9 +303,9 @@ describe('ObjectCacheService', () => {
       const state = Object.assign({}, initialState, {
         core: Object.assign({}, initialState.core, {
           'cache/object': {
-            [selfLink]: cacheEntry
-          }
-        })
+            [selfLink]: cacheEntry,
+          },
+        }),
       });
       mockStore.setState(state);
       const expected: TestColdObservable = cold('a', { a: cacheEntry });
@@ -310,14 +321,14 @@ describe('ObjectCacheService', () => {
       const state = Object.assign({}, initialState, {
         core: Object.assign({}, initialState.core, {
           'cache/object': {
-            [selfLink]: cacheEntry
+            [selfLink]: cacheEntry,
           },
           'index': {
             'object/alt-link-to-self-link': {
-              [anotherLink]: selfLink
-            }
-          }
-        })
+              [anotherLink]: selfLink,
+            },
+          },
+        }),
       });
       mockStore.setState(state);
       (service as any).getByAlternativeLink(anotherLink).subscribe();
@@ -335,8 +346,8 @@ describe('ObjectCacheService', () => {
     it('isDirty should return true when the patches list in the cache entry is not empty', () => {
       cacheEntry.patches = [
         {
-          operations: operations
-        } as Patch
+          operations: operations,
+        } as Patch,
       ];
       const result = (service as any).isDirty(cacheEntry);
       expect(result).toBe(true);
@@ -371,9 +382,9 @@ describe('ObjectCacheService', () => {
               [anotherLink]: selfLink,
               ['objectWithoutDependentsAlt']: 'objectWithoutDependents',
               ['objectWithDependentsAlt']: 'objectWithDependents',
-            }
-          }
-        })
+            },
+          },
+        }),
       });
       mockStore.setState(state);
     });
@@ -421,11 +432,11 @@ describe('ObjectCacheService', () => {
         testScheduler.run(({ cold: tsCold, flush }) => {
           const href$ = tsCold('--y-n-n', {
             y: selfLink,
-            n: 'NOPE'
+            n: 'NOPE',
           });
           const dependsOnHref$ = tsCold('-y-n-n', {
             y: 'objectWithoutDependents',
-            n: 'NOPE'
+            n: 'NOPE',
           });
 
           service.addDependency(href$, dependsOnHref$);
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index 9ca0216210..09ea6450bb 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -1,32 +1,68 @@
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { applyPatch, Operation } from 'fast-json-patch';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  applyPatch,
+  Operation,
+} from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { distinctUntilChanged, filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { CoreState } from '../core-state.model';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { selfLinkFromAlternativeLinkSelector, selfLinkFromUuidSelector } from '../index/index.selectors';
+import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
+import {
+  selfLinkFromAlternativeLinkSelector,
+  selfLinkFromUuidSelector,
+} from '../index/index.selectors';
+import { IndexName } from '../index/index-name.model';
 import { GenericConstructor } from '../shared/generic-constructor';
+import { HALLink } from '../shared/hal-link.model';
 import { getClassForType } from './builders/build-decorators';
 import { LinkService } from './builders/link.service';
-import { AddDependentsObjectCacheAction, AddPatchObjectCacheAction, AddToObjectCacheAction, ApplyPatchObjectCacheAction, RemoveDependentsObjectCacheAction, RemoveFromObjectCacheAction } from './object-cache.actions';
-
-import { ObjectCacheEntry, ObjectCacheState } from './object-cache.reducer';
-import { AddToSSBAction } from './server-sync-buffer.actions';
-import { RemoveFromIndexBySubstringAction } from '../index/index.actions';
-import { HALLink } from '../shared/hal-link.model';
 import { CacheableObject } from './cacheable-object.model';
-import { IndexName } from '../index/index-name.model';
+import {
+  AddDependentsObjectCacheAction,
+  AddPatchObjectCacheAction,
+  AddToObjectCacheAction,
+  ApplyPatchObjectCacheAction,
+  RemoveDependentsObjectCacheAction,
+  RemoveFromObjectCacheAction,
+} from './object-cache.actions';
+import {
+  ObjectCacheEntry,
+  ObjectCacheState,
+} from './object-cache.reducer';
+import { AddToSSBAction } from './server-sync-buffer.actions';
 
 /**
  * The base selector function to select the object cache in the store
  */
 const objectCacheSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state['cache/object']
+  (state: CoreState) => state['cache/object'],
 );
 
 /**
@@ -46,7 +82,7 @@ const entryFromSelfLinkSelector =
 export class ObjectCacheService {
   constructor(
     private store: Store<CoreState>,
-    private linkService: LinkService
+    private linkService: LinkService,
   ) {
   }
 
@@ -82,12 +118,12 @@ export class ObjectCacheService {
     const cacheEntry$ = this.getByHref(href);
     const altLinks$ = cacheEntry$.pipe(map((entry: ObjectCacheEntry) => entry.alternativeLinks), take(1));
     const childLinks$ = cacheEntry$.pipe(map((entry: ObjectCacheEntry) => {
-        return Object
-          .entries(entry.data._links)
-          .filter(([key, value]: [string, HALLink]) => key !== 'self')
-          .map(([key, value]: [string, HALLink]) => value.href);
-      }),
-      take(1)
+      return Object
+        .entries(entry.data._links)
+        .filter(([key, value]: [string, HALLink]) => key !== 'self')
+        .map(([key, value]: [string, HALLink]) => value.href);
+    }),
+    take(1),
     );
     this.removeLinksFromAlternativeLinkIndex(altLinks$);
     this.removeLinksFromAlternativeLinkIndex(childLinks$);
@@ -96,8 +132,8 @@ export class ObjectCacheService {
 
   private removeLinksFromAlternativeLinkIndex(links$: Observable<string[]>) {
     links$.subscribe((links: string[]) => links.forEach((link: string) => {
-        this.store.dispatch(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link));
-      }
+      this.store.dispatch(new RemoveFromIndexBySubstringAction(IndexName.ALTERNATIVE_OBJECT_LINK, link));
+    },
     ));
   }
 
@@ -113,8 +149,8 @@ export class ObjectCacheService {
     Observable<T> {
     return this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      mergeMap((selfLink: string) => this.getObjectByHref<T>(selfLink)
-      )
+      mergeMap((selfLink: string) => this.getObjectByHref<T>(selfLink),
+      ),
     );
   }
 
@@ -129,14 +165,14 @@ export class ObjectCacheService {
   getObjectByHref<T extends CacheableObject>(href: string): Observable<T> {
     return this.getByHref(href).pipe(
       map((entry: ObjectCacheEntry) => {
-          if (isNotEmpty(entry.patches)) {
-            const flatPatch: Operation[] = [].concat(...entry.patches.map((patch) => patch.operations));
-            const patchedData = applyPatch(entry.data, flatPatch, undefined, false).newDocument;
-            return Object.assign({}, entry, { data: patchedData });
-          } else {
-            return entry;
-          }
+        if (isNotEmpty(entry.patches)) {
+          const flatPatch: Operation[] = [].concat(...entry.patches.map((patch) => patch.operations));
+          const patchedData = applyPatch(entry.data, flatPatch, undefined, false).newDocument;
+          return Object.assign({}, entry, { data: patchedData });
+        } else {
+          return entry;
         }
+      },
       ),
       map((entry: ObjectCacheEntry) => {
         const type: GenericConstructor<T> = getClassForType((entry.data as any).type);
@@ -144,7 +180,7 @@ export class ObjectCacheService {
           throw new Error(`${type} is not a valid constructor for ${JSON.stringify(entry.data)}`);
         }
         return Object.assign(new type(), entry.data) as T;
-      })
+      }),
     );
   }
 
@@ -162,13 +198,13 @@ export class ObjectCacheService {
       this.getBySelfLink(href),
     ]).pipe(
       map((results: ObjectCacheEntry[]) => results.find((entry: ObjectCacheEntry) => hasValue(entry))),
-      filter((entry: ObjectCacheEntry) => hasValue(entry))
+      filter((entry: ObjectCacheEntry) => hasValue(entry)),
     );
   }
 
   private getBySelfLink(selfLink: string): Observable<ObjectCacheEntry> {
     return this.store.pipe(
-      select(entryFromSelfLinkSelector(selfLink))
+      select(entryFromSelfLinkSelector(selfLink)),
     );
   }
 
@@ -204,7 +240,7 @@ export class ObjectCacheService {
   getRequestUUIDByObjectUUID(uuid: string): Observable<string> {
     return this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      mergeMap((selfLink: string) => this.getRequestUUIDBySelfLink(selfLink))
+      mergeMap((selfLink: string) => this.getRequestUUIDBySelfLink(selfLink)),
     );
   }
 
@@ -232,7 +268,7 @@ export class ObjectCacheService {
       return observableOf([]);
     } else {
       return observableCombineLatest(
-        selfLinks.map((selfLink: string) => this.getObjectByHref<T>(selfLink))
+        selfLinks.map((selfLink: string) => this.getObjectByHref<T>(selfLink)),
       );
     }
   }
@@ -252,7 +288,7 @@ export class ObjectCacheService {
     /* NB: that this is only a solution because the select method is synchronous, see: https://github.com/ngrx/store/issues/296#issuecomment-269032571*/
     this.store.pipe(
       select(selfLinkFromUuidSelector(uuid)),
-      take(1)
+      take(1),
     ).subscribe((selfLink: string) => result = this.hasByHref(selfLink));
 
     return result;
@@ -290,9 +326,9 @@ export class ObjectCacheService {
   hasByHref$(href: string): Observable<boolean> {
     return observableCombineLatest(
       this.getBySelfLink(href),
-      this.getByAlternativeLink(href)
+      this.getByAlternativeLink(href),
     ).pipe(
-      map((entries: ObjectCacheEntry[]) => entries.some((entry) => hasValue(entry)))
+      map((entries: ObjectCacheEntry[]) => entries.some((entry) => hasValue(entry))),
     );
   }
 
@@ -358,7 +394,7 @@ export class ObjectCacheService {
     observableCombineLatest([
       href$,
       dependsOnHref$.pipe(
-        switchMap(dependsOnHref => this.resolveSelfLink(dependsOnHref))
+        switchMap(dependsOnHref => this.resolveSelfLink(dependsOnHref)),
       ),
     ]).pipe(
       switchMap(([href, dependsOnSelfLink]: [string, string]) => {
@@ -373,7 +409,7 @@ export class ObjectCacheService {
           this.getByHref(href).pipe(
             // only add the latest request to keep dependency index from growing indefinitely
             map((entry: ObjectCacheEntry) => entry?.requestUUIDs?.[0]),
-          )
+          ),
         ]);
       }),
       take(1),
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 197bf130fb..9a09a49bc8 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,10 +1,10 @@
 /* eslint-disable max-classes-per-file */
-import { PageInfo } from '../shared/page-info.model';
 import { ConfigObject } from '../config/models/config.model';
+import { RequestError } from '../data/request-error.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALLink } from '../shared/hal-link.model';
+import { PageInfo } from '../shared/page-info.model';
 import { UnCacheableObject } from '../shared/uncacheable-object.model';
-import { RequestError } from '../data/request-error.model';
 
 export class RestResponse {
   public toCache = true;
@@ -13,7 +13,7 @@ export class RestResponse {
   constructor(
     public isSuccessful: boolean,
     public statusCode: number,
-    public statusText: string
+    public statusText: string,
   ) {
   }
 }
@@ -29,7 +29,7 @@ export class DSOSuccessResponse extends RestResponse {
     public resourceSelfLinks: string[],
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -43,7 +43,7 @@ export class EndpointMapSuccessResponse extends RestResponse {
   constructor(
     public endpointMap: EndpointMap,
     public statusCode: number,
-    public statusText: string
+    public statusText: string,
   ) {
     super(true, statusCode, statusText);
   }
@@ -64,7 +64,7 @@ export class ConfigSuccessResponse extends RestResponse {
     public configDefinition: ConfigObject,
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -78,7 +78,7 @@ export class TokenResponse extends RestResponse {
     public token: string,
     public isSuccessful: boolean,
     public statusCode: number,
-    public statusText: string
+    public statusText: string,
   ) {
     super(isSuccessful, statusCode, statusText);
   }
@@ -89,7 +89,7 @@ export class PostPatchSuccessResponse extends RestResponse {
     public dataDefinition: any,
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -100,7 +100,7 @@ export class EpersonSuccessResponse extends RestResponse {
     public epersonDefinition: DSpaceObject[],
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -112,7 +112,7 @@ export class MessageResponse extends RestResponse {
   constructor(
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -124,7 +124,7 @@ export class TaskResponse extends RestResponse {
   constructor(
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
@@ -135,7 +135,7 @@ export class FilteredDiscoveryQueryResponse extends RestResponse {
     public filterQuery: string,
     public statusCode: number,
     public statusText: string,
-    public pageInfo?: PageInfo
+    public pageInfo?: PageInfo,
   ) {
     super(true, statusCode, statusText);
   }
diff --git a/src/app/core/cache/server-sync-buffer.effects.spec.ts b/src/app/core/cache/server-sync-buffer.effects.spec.ts
index 833c6b580f..889b3b7454 100644
--- a/src/app/core/cache/server-sync-buffer.effects.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.spec.ts
@@ -1,12 +1,22 @@
 import { TestBed } from '@angular/core/testing';
-
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { cold, hot } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { storeModuleConfig } from '../../app.reducer';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import { StoreMock } from '../../shared/testing/store.mock';
 import { RequestService } from '../data/request.service';
 import { RestRequestMethod } from '../data/rest-request-method';
@@ -16,11 +26,9 @@ import { ObjectCacheService } from './object-cache.service';
 import {
   CommitSSBAction,
   EmptySSBAction,
-  ServerSyncBufferActionTypes
+  ServerSyncBufferActionTypes,
 } from './server-sync-buffer.actions';
 import { ServerSyncBufferEffects } from './server-sync-buffer.effects';
-import { storeModuleConfig } from '../../app.reducer';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
 
 describe('ServerSyncBufferEffects', () => {
   let ssbEffects: ServerSyncBufferEffects;
@@ -32,9 +40,9 @@ describe('ServerSyncBufferEffects', () => {
         autoSync:
           {
             timePerMethod: {},
-            defaultTime: 0
-          }
-      }
+            defaultTime: 0,
+          },
+      },
   };
   const selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
   let store;
@@ -52,21 +60,21 @@ describe('ServerSyncBufferEffects', () => {
           provide: ObjectCacheService, useValue: {
             getObjectBySelfLink: (link) => {
               const object = Object.assign(new DSpaceObject(), {
-                _links: { self: { href: link } }
+                _links: { self: { href: link } },
               });
               return observableOf(object);
             },
             getByHref: (link) => {
               const object = Object.assign(new DSpaceObject(), {
                 _links: {
-                  self: { href: link }
-                }
+                  self: { href: link },
+                },
               });
               return observableOf(object);
-            }
-          }
+            },
+          },
         },
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
         // other providers
       ],
     });
@@ -88,12 +96,12 @@ describe('ServerSyncBufferEffects', () => {
         actions = hot('a', {
           a: {
             type: ServerSyncBufferActionTypes.ADD,
-            payload: { href: selfLink, method: RestRequestMethod.PUT }
-          }
+            payload: { href: selfLink, method: RestRequestMethod.PUT },
+          },
         });
 
         expectObservable(ssbEffects.setTimeoutForServerSync).toBe('b', {
-          b: new CommitSSBAction(RestRequestMethod.PUT)
+          b: new CommitSSBAction(RestRequestMethod.PUT),
         });
       });
     });
@@ -108,8 +116,8 @@ describe('ServerSyncBufferEffects', () => {
             (state as any).core['cache/syncbuffer'] = {
               buffer: [{
                 href: selfLink,
-                method: RestRequestMethod.PATCH
-              }]
+                method: RestRequestMethod.PATCH,
+              }],
             };
           });
       });
@@ -117,13 +125,13 @@ describe('ServerSyncBufferEffects', () => {
         actions = hot('a', {
           a: {
             type: ServerSyncBufferActionTypes.COMMIT,
-            payload: RestRequestMethod.PATCH
-          }
+            payload: RestRequestMethod.PATCH,
+          },
         });
 
         const expected = cold('(bc)', {
           b: new ApplyPatchObjectCacheAction(selfLink),
-          c: new EmptySSBAction(RestRequestMethod.PATCH)
+          c: new EmptySSBAction(RestRequestMethod.PATCH),
         });
 
         expect(ssbEffects.commitServerSyncBuffer).toBeObservable(expected);
@@ -136,7 +144,7 @@ describe('ServerSyncBufferEffects', () => {
           .subscribe((state) => {
             (state as any).core = Object({});
             (state as any).core['cache/syncbuffer'] = {
-              buffer: []
+              buffer: [],
             };
           });
       });
@@ -145,8 +153,8 @@ describe('ServerSyncBufferEffects', () => {
         actions = hot('a', {
           a: {
             type: ServerSyncBufferActionTypes.COMMIT,
-            payload: { method: RestRequestMethod.PATCH }
-          }
+            payload: { method: RestRequestMethod.PATCH },
+          },
         });
         const expected = cold('b', { b: new NoOpAction() });
 
diff --git a/src/app/core/cache/server-sync-buffer.effects.ts b/src/app/core/cache/server-sync-buffer.effects.ts
index 9571d4af5b..6f346d5bb3 100644
--- a/src/app/core/cache/server-sync-buffer.effects.ts
+++ b/src/app/core/cache/server-sync-buffer.effects.ts
@@ -1,27 +1,55 @@
-import { delay, exhaustMap, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  Action,
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  delay,
+  exhaustMap,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
+import { PatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { ApplyPatchObjectCacheAction } from './object-cache.actions';
+import { ObjectCacheEntry } from './object-cache.reducer';
+import { ObjectCacheService } from './object-cache.service';
 import {
   AddToSSBAction,
   CommitSSBAction,
   EmptySSBAction,
-  ServerSyncBufferActionTypes
+  ServerSyncBufferActionTypes,
 } from './server-sync-buffer.actions';
-import { Action, createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { ServerSyncBufferEntry, ServerSyncBufferState } from './server-sync-buffer.reducer';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { RequestService } from '../data/request.service';
-import { PatchRequest } from '../data/request.models';
-import { ObjectCacheService } from './object-cache.service';
-import { ApplyPatchObjectCacheAction } from './object-cache.actions';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { environment } from '../../../environments/environment';
-import { ObjectCacheEntry } from './object-cache.reducer';
-import { Operation } from 'fast-json-patch';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
-import { CoreState } from '../core-state.model';
+import {
+  ServerSyncBufferEntry,
+  ServerSyncBufferState,
+} from './server-sync-buffer.reducer';
 
 @Injectable()
 export class ServerSyncBufferEffects {
@@ -32,7 +60,7 @@ export class ServerSyncBufferEffects {
    * Then dispatch a CommitSSBAction
    * When the delay is running, no new AddToSSBActions are processed in this effect
    */
-   setTimeoutForServerSync = createEffect(() => this.actions$
+  setTimeoutForServerSync = createEffect(() => this.actions$
     .pipe(
       ofType(ServerSyncBufferActionTypes.ADD),
       exhaustMap((action: AddToSSBAction) => {
@@ -41,7 +69,7 @@ export class ServerSyncBufferEffects {
         return observableOf(new CommitSSBAction(action.payload.method)).pipe(
           delay(timeoutInSeconds * 1000),
         );
-      })
+      }),
     ));
 
   /**
@@ -50,7 +78,7 @@ export class ServerSyncBufferEffects {
    * When the list of actions is not empty, also dispatch an EmptySSBAction
    * When the list is empty dispatch a NO_ACTION placeholder action
    */
-   commitServerSyncBuffer = createEffect(() => this.actions$
+  commitServerSyncBuffer = createEffect(() => this.actions$
     .pipe(
       ofType(ServerSyncBufferActionTypes.COMMIT),
       switchMap((action: CommitSSBAction) => {
@@ -78,14 +106,14 @@ export class ServerSyncBufferEffects {
             /* Add extra action to array, to make sure the ServerSyncBuffer is emptied afterwards */
             if (isNotEmpty(actions) && isNotUndefined(actions[0])) {
               return observableCombineLatest(...actions).pipe(
-              switchMap((array) => [...array, new EmptySSBAction(action.payload)])
-            );
+                switchMap((array) => [...array, new EmptySSBAction(action.payload)]),
+              );
             } else {
               return observableOf(new NoOpAction());
             }
-          })
+          }),
         );
-      })
+      }),
     ));
 
   /**
@@ -96,7 +124,7 @@ export class ServerSyncBufferEffects {
    */
   private applyPatch(href: string): Observable<Action> {
     const patchObject = this.objectCache.getByHref(href).pipe(
-      take(1)
+      take(1),
     );
 
     return patchObject.pipe(
@@ -108,7 +136,7 @@ export class ServerSyncBufferEffects {
           }
         }
         return new ApplyPatchObjectCacheAction(href);
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/cache/server-sync-buffer.reducer.spec.ts b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
index ce159500c6..d986581ce2 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.spec.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.spec.ts
@@ -1,8 +1,13 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
-import { RemoveFromObjectCacheAction } from './object-cache.actions';
-import { serverSyncBufferReducer } from './server-sync-buffer.reducer';
+
 import { RestRequestMethod } from '../data/rest-request-method';
-import { AddToSSBAction, EmptySSBAction } from './server-sync-buffer.actions';
+import { RemoveFromObjectCacheAction } from './object-cache.actions';
+import {
+  AddToSSBAction,
+  EmptySSBAction,
+} from './server-sync-buffer.actions';
+import { serverSyncBufferReducer } from './server-sync-buffer.reducer';
 
 class NullAction extends RemoveFromObjectCacheAction {
   type = null;
@@ -26,8 +31,8 @@ describe('serverSyncBufferReducer', () => {
         {
           href: selfLink2,
           method: RestRequestMethod.GET,
-        }
-      ]
+        },
+      ],
   };
   const newSelfLink = 'https://localhost:8080/api/core/items/1ce6b5ae-97e1-4e5a-b4b0-f9029bad10c0';
 
@@ -51,12 +56,20 @@ describe('serverSyncBufferReducer', () => {
     const action = new AddToSSBAction(selfLink1, RestRequestMethod.POST);
     // testState has already been frozen above
     serverSyncBufferReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the EMPTY action without affecting the previous state', () => {
     const action = new EmptySSBAction();
     // testState has already been frozen above
     serverSyncBufferReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should empty the buffer if the EmptySSBAction is dispatched without a payload', () => {
@@ -78,7 +91,7 @@ describe('serverSyncBufferReducer', () => {
     // testState has already been frozen above
     const newState = serverSyncBufferReducer(testState, action);
     expect(newState.buffer).toContain({
-      href: newSelfLink, method: RestRequestMethod.PUT
+      href: newSelfLink, method: RestRequestMethod.PUT,
     })
     ;
   });
diff --git a/src/app/core/cache/server-sync-buffer.reducer.ts b/src/app/core/cache/server-sync-buffer.reducer.ts
index 3e8944aa73..f1ae894315 100644
--- a/src/app/core/cache/server-sync-buffer.reducer.ts
+++ b/src/app/core/cache/server-sync-buffer.reducer.ts
@@ -1,11 +1,14 @@
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
+import { RestRequestMethod } from '../data/rest-request-method';
 import {
   AddToSSBAction,
   EmptySSBAction,
   ServerSyncBufferAction,
-  ServerSyncBufferActionTypes
+  ServerSyncBufferActionTypes,
 } from './server-sync-buffer.actions';
-import { RestRequestMethod } from '../data/rest-request-method';
 
 /**
  * An entry in the ServerSyncBufferState
@@ -86,9 +89,9 @@ function addToServerSyncQueue(state: ServerSyncBufferState, action: AddToSSBActi
  *    the new state, with a new entry added to the buffer
  */
 function emptyServerSyncQueue(state: ServerSyncBufferState, action: EmptySSBAction): ServerSyncBufferState {
-    let newBuffer = [];
-    if (hasValue(action.payload)) {
-      newBuffer = state.buffer.filter((entry) => entry.method !== action.payload);
-    }
-    return Object.assign({}, state, { buffer: newBuffer });
+  let newBuffer = [];
+  if (hasValue(action.payload)) {
+    newBuffer = state.buffer.filter((entry) => entry.method !== action.payload);
+  }
+  return Object.assign({}, state, { buffer: newBuffer });
 }
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.html b/src/app/core/coar-notify/notify-info/notify-info.component.html
new file mode 100644
index 0000000000..3370f83d03
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.html
@@ -0,0 +1,18 @@
+<div class="container">
+    <head>
+        <title>{{ 'coar-notify-support.title' | translate }}</title>
+    </head>
+    <body>
+    <h1>{{ 'coar-notify-support.title' | translate }}</h1>
+    <p [innerHTML]="('coar-notify-support-title.content' | translate)"></p>
+
+    <h2>{{ 'coar-notify-support.ldn-inbox.title' | translate }}</h2>
+    <p [innerHTML]="('coar-notify-support.ldn-inbox.content' | translate).replace('{ldnInboxUrl}', generateCoarRestApiLinksHTML() | async)"></p>
+
+    <h2>{{ 'coar-notify-support.message-moderation.title' | translate }}</h2>
+    <p>
+      {{ 'coar-notify-support.message-moderation.content' | translate }}
+      <a routerLink="/info/feedback" >{{ 'coar-notify-support.message-moderation.feedback-form' | translate }}</a>
+    </p>
+    </body>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html b/src/app/core/coar-notify/notify-info/notify-info.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html
rename to src/app/core/coar-notify/notify-info/notify-info.component.scss
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts
new file mode 100644
index 0000000000..e91b065dfc
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.spec.ts
@@ -0,0 +1,40 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { NotifyInfoComponent } from './notify-info.component';
+import { NotifyInfoService } from './notify-info.service';
+
+describe('NotifyInfoComponent', () => {
+  let component: NotifyInfoComponent;
+  let fixture: ComponentFixture<NotifyInfoComponent>;
+  let notifyInfoServiceSpy: any;
+
+  beforeEach(async () => {
+    notifyInfoServiceSpy = jasmine.createSpyObj('NotifyInfoService', ['getCoarLdnLocalInboxUrls']);
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ NotifyInfoComponent ],
+      providers: [
+        { provide: NotifyInfoService, useValue: notifyInfoServiceSpy },
+      ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotifyInfoComponent);
+    component = fixture.componentInstance;
+    component.coarRestApiUrl = of([]);
+    spyOn(component, 'generateCoarRestApiLinksHTML').and.returnValue(of(''));
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/core/coar-notify/notify-info/notify-info.component.ts b/src/app/core/coar-notify/notify-info/notify-info.component.ts
new file mode 100644
index 0000000000..bfa268440b
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.component.ts
@@ -0,0 +1,47 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  map,
+  Observable,
+  of,
+} from 'rxjs';
+
+import { NotifyInfoService } from './notify-info.service';
+
+@Component({
+  selector: 'ds-notify-info',
+  templateUrl: './notify-info.component.html',
+  styleUrls: ['./notify-info.component.scss'],
+})
+/**
+ * Component for displaying COAR notification information.
+ */
+export class NotifyInfoComponent implements OnInit {
+  /**
+   * Observable containing the COAR REST INBOX API URLs.
+   */
+  coarRestApiUrl: Observable<string[]> = of([]);
+
+  constructor(private notifyInfoService: NotifyInfoService) {}
+
+  ngOnInit() {
+    this.coarRestApiUrl = this.notifyInfoService.getCoarLdnLocalInboxUrls();
+  }
+
+  /**
+   * Generates HTML code for COAR REST API links.
+   * @returns An Observable that emits the generated HTML code.
+   */
+  generateCoarRestApiLinksHTML() {
+    return this.coarRestApiUrl.pipe(
+      // transform the data into HTML
+      map((urls) => {
+        return urls.map(url => `
+          <code><a href="${url}" target="_blank"><span class="api-url">${url}</span></a></code>
+        `).join(',');
+      }),
+    );
+  }
+}
diff --git a/src/app/core/coar-notify/notify-info/notify-info.guard.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.guard.spec.ts
new file mode 100644
index 0000000000..7c8cc3f320
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.guard.spec.ts
@@ -0,0 +1,49 @@
+import { TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { of } from 'rxjs';
+
+import { NotifyInfoGuard } from './notify-info.guard';
+import { NotifyInfoService } from './notify-info.service';
+
+describe('NotifyInfoGuard', () => {
+  let guard: NotifyInfoGuard;
+  let notifyInfoServiceSpy: any;
+  let router: any;
+
+  beforeEach(() => {
+    notifyInfoServiceSpy = jasmine.createSpyObj('NotifyInfoService', ['isCoarConfigEnabled']);
+    router = jasmine.createSpyObj('Router', ['parseUrl']);
+    TestBed.configureTestingModule({
+      providers: [
+        NotifyInfoGuard,
+        { provide: NotifyInfoService, useValue: notifyInfoServiceSpy },
+        { provide: Router, useValue: router },
+      ],
+    });
+    guard = TestBed.inject(NotifyInfoGuard);
+  });
+
+  it('should be created', () => {
+    expect(guard).toBeTruthy();
+  });
+
+  it('should return true if COAR config is enabled', (done) => {
+    notifyInfoServiceSpy.isCoarConfigEnabled.and.returnValue(of(true));
+
+    guard.canActivate(null, null).subscribe((result) => {
+      expect(result).toBe(true);
+      done();
+    });
+  });
+
+  it('should call parseUrl method of Router if COAR config is not enabled', (done) => {
+    notifyInfoServiceSpy.isCoarConfigEnabled.and.returnValue(of(false));
+    router.parseUrl.and.returnValue(of('/404'));
+
+    guard.canActivate(null, null).subscribe(() => {
+      expect(router.parseUrl).toHaveBeenCalledWith('/404');
+      done();
+    });
+  });
+
+});
diff --git a/src/app/core/coar-notify/notify-info/notify-info.guard.ts b/src/app/core/coar-notify/notify-info/notify-info.guard.ts
new file mode 100644
index 0000000000..91f3bf6cde
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.guard.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { NotifyInfoService } from './notify-info.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class NotifyInfoGuard implements CanActivate {
+  constructor(
+        private notifyInfoService: NotifyInfoService,
+        private router: Router,
+  ) {}
+
+  canActivate(
+    route: ActivatedRouteSnapshot,
+    state: RouterStateSnapshot,
+  ): Observable<boolean | UrlTree> {
+    return this.notifyInfoService.isCoarConfigEnabled().pipe(
+      map(coarLdnEnabled => {
+        if (coarLdnEnabled) {
+          return true;
+        } else {
+          return this.router.parseUrl('/404');
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/core/coar-notify/notify-info/notify-info.service.spec.ts b/src/app/core/coar-notify/notify-info/notify-info.service.spec.ts
new file mode 100644
index 0000000000..d32ad729dd
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.service.spec.ts
@@ -0,0 +1,57 @@
+import { TestBed } from '@angular/core/testing';
+import { of } from 'rxjs';
+
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ConfigurationDataService } from '../../data/configuration-data.service';
+import { AuthorizationDataService } from '../../data/feature-authorization/authorization-data.service';
+import { NotifyInfoService } from './notify-info.service';
+
+describe('NotifyInfoService', () => {
+  let service: NotifyInfoService;
+  let configurationDataService: any;
+  let authorizationDataService: any;
+  beforeEach(() => {
+    authorizationDataService = {
+      isAuthorized: jasmine.createSpy('isAuthorized').and.returnValue(of(true)),
+    };
+    configurationDataService = {
+      findByPropertyName: jasmine.createSpy('findByPropertyName').and.returnValue(of({})),
+    };
+    TestBed.configureTestingModule({
+      providers: [
+        NotifyInfoService,
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: AuthorizationDataService, useValue: authorizationDataService },
+      ],
+    });
+    service = TestBed.inject(NotifyInfoService);
+    authorizationDataService = TestBed.inject(AuthorizationDataService);
+    configurationDataService = TestBed.inject(ConfigurationDataService);
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should retrieve and map coar configuration', (done: DoneFn) => {
+    (configurationDataService.findByPropertyName as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ values: ['true'] }));
+
+    service.isCoarConfigEnabled().subscribe((result) => {
+      expect(result).toBe(true);
+      done();
+    });
+  });
+
+  it('should retrieve and map LDN local inbox URLs', (done: DoneFn) => {
+    (configurationDataService.findByPropertyName as jasmine.Spy).and.returnValue(createSuccessfulRemoteDataObject$({ values: ['inbox1', 'inbox2'] }));
+
+    service.getCoarLdnLocalInboxUrls().subscribe((result) => {
+      expect(result).toEqual(['inbox1', 'inbox2']);
+      done();
+    });
+  });
+
+  it('should return the inbox relation link', () => {
+    expect(service.getInboxRelationLink()).toBe('http://www.w3.org/ns/ldp#inbox');
+  });
+});
diff --git a/src/app/core/coar-notify/notify-info/notify-info.service.ts b/src/app/core/coar-notify/notify-info/notify-info.service.ts
new file mode 100644
index 0000000000..a70a5d5cc0
--- /dev/null
+++ b/src/app/core/coar-notify/notify-info/notify-info.service.ts
@@ -0,0 +1,59 @@
+import { Injectable } from '@angular/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+
+import { ConfigurationDataService } from '../../data/configuration-data.service';
+import { AuthorizationDataService } from '../../data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../data/feature-authorization/feature-id';
+import { ConfigurationProperty } from '../../shared/configuration-property.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../shared/operators';
+
+/**
+ * Service to check COAR availability and LDN services information for the COAR Notify functionalities
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class NotifyInfoService {
+
+  /**
+     *  The relation link for the inbox
+     */
+  private _inboxRelationLink = 'http://www.w3.org/ns/ldp#inbox';
+
+  constructor(
+        private configService: ConfigurationDataService,
+        protected authorizationService: AuthorizationDataService,
+  ) {}
+
+  isCoarConfigEnabled(): Observable<boolean> {
+    return this.authorizationService.isAuthorized(FeatureID.CoarNotifyEnabled);
+  }
+
+  /**
+     * Get the url of the local inbox from the REST configuration
+     * @returns the url of the local inbox
+     */
+  getCoarLdnLocalInboxUrls(): Observable<string[]> {
+    return this.configService.findByPropertyName('ldn.notify.inbox').pipe(
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((response: ConfigurationProperty) => {
+        return response.values;
+      }),
+    );
+  }
+
+  /**
+     * Method to get the relation link for the inbox
+     * @returns the relation link for the inbox
+     */
+  getInboxRelationLink(): string {
+    return this._inboxRelationLink;
+  }
+}
diff --git a/src/app/core/config/bulk-access-config-data.service.ts b/src/app/core/config/bulk-access-config-data.service.ts
new file mode 100644
index 0000000000..edae249a8f
--- /dev/null
+++ b/src/app/core/config/bulk-access-config-data.service.ts
@@ -0,0 +1,27 @@
+import { Injectable } from '@angular/core';
+
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
+import { BULK_ACCESS_CONDITION_OPTIONS } from './models/config-type';
+
+/**
+ * Data Service responsible for retrieving Bulk Access Condition Options from the REST API
+ */
+@Injectable({ providedIn: 'root' })
+@dataService(BULK_ACCESS_CONDITION_OPTIONS)
+export class BulkAccessConfigDataService extends ConfigDataService {
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('bulkaccessconditionoptions', requestService, rdbService, objectCache, halService);
+  }
+
+}
diff --git a/src/app/core/config/config-data.service.spec.ts b/src/app/core/config/config-data.service.spec.ts
index 38340d1ad5..a9979f1bb5 100644
--- a/src/app/core/config/config-data.service.spec.ts
+++ b/src/app/core/config/config-data.service.spec.ts
@@ -1,15 +1,16 @@
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { ConfigDataService } from './config-data.service';
-import { RequestService } from '../data/request.service';
-import { GetRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { FindListOptions } from '../data/find-list-options.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { GetRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
 
 const LINK_NAME = 'test';
 const BROWSE = 'search/findByCollection';
diff --git a/src/app/core/config/config-data.service.ts b/src/app/core/config/config-data.service.ts
index 9ef2f11ad1..51ca655921 100644
--- a/src/app/core/config/config-data.service.ts
+++ b/src/app/core/config/config-data.service.ts
@@ -1,16 +1,17 @@
 import { Observable } from 'rxjs';
-import { ConfigObject } from './models/config.model';
-import { RemoteData } from '../data/remote-data';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
 import { map } from 'rxjs/operators';
-import { BaseDataService } from '../data/base/base-data.service';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { RemoteData } from '../data/remote-data';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { ConfigObject } from './models/config.model';
 
 /**
  * Abstract data service to retrieve configuration objects from the REST server.
  * Common logic for configuration objects should be implemented here.
  */
-export abstract class ConfigDataService extends BaseDataService<ConfigObject> {
+export abstract class ConfigDataService extends IdentifiableDataService<ConfigObject> {
   /**
    * Returns an observable of {@link RemoteData} of an object, based on an href, with a list of
    * {@link FollowLinkConfig}, to automatically resolve {@link HALLink}s of the object
@@ -37,4 +38,21 @@ export abstract class ConfigDataService extends BaseDataService<ConfigObject> {
       }),
     );
   }
+
+  /**
+   * Returns a config object by given name
+   *
+   * Throws an error if a configuration object cannot be retrieved.
+   *
+   * @param name                        The name of configuration to retrieve
+   * @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 findByName(name: string,  useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<ConfigObject>[]): Observable<RemoteData<ConfigObject>> {
+    return super.findById(name, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/config/models/bulk-access-condition-options.model.ts b/src/app/core/config/models/bulk-access-condition-options.model.ts
new file mode 100644
index 0000000000..c491343852
--- /dev/null
+++ b/src/app/core/config/models/bulk-access-condition-options.model.ts
@@ -0,0 +1,43 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ConfigObject } from './config.model';
+import { AccessesConditionOption } from './config-accesses-conditions-options.model';
+import { BULK_ACCESS_CONDITION_OPTIONS } from './config-type';
+
+/**
+ * Model class for a bulk access condition options
+ */
+@typedObject
+@inheritSerialization(ConfigObject)
+export class BulkAccessConditionOptions extends ConfigObject {
+  static type = BULK_ACCESS_CONDITION_OPTIONS;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserializeAs(String, 'name')
+    uuid: string;
+
+  @autoserialize
+    id: string;
+
+  @autoserialize
+    itemAccessConditionOptions: AccessesConditionOption[];
+
+  @autoserialize
+    bitstreamAccessConditionOptions: AccessesConditionOption[];
+
+  _links: { self: HALLink };
+}
diff --git a/src/app/core/config/models/config-accesses-conditions-options.model.ts b/src/app/core/config/models/config-accesses-conditions-options.model.ts
index 244b501908..64199be0eb 100644
--- a/src/app/core/config/models/config-accesses-conditions-options.model.ts
+++ b/src/app/core/config/models/config-accesses-conditions-options.model.ts
@@ -3,43 +3,43 @@
  */
 export class AccessesConditionOption {
 
-    /**
+  /**
      * The name for this Access Condition
      */
-    name: string;
+  name: string;
 
-    /**
+  /**
      * The groupName for this Access Condition
      */
-    groupName: string;
+  groupName: string;
 
-    /**
+  /**
      * A boolean representing if this Access Condition has a start date
      */
-    hasStartDate: boolean;
+  hasStartDate: boolean;
 
-    /**
+  /**
      * A boolean representing if this Access Condition has an end date
      */
-    hasEndDate: boolean;
+  hasEndDate: boolean;
 
-    /**
+  /**
      * Maximum value of the start date
      */
-    endDateLimit?: string;
+  endDateLimit?: string;
 
-    /**
+  /**
      * Maximum value of the end date
      */
-    startDateLimit?: string;
+  startDateLimit?: string;
 
-    /**
+  /**
      * Maximum value of the start date
      */
-    maxStartDate?: string;
+  maxStartDate?: string;
 
-    /**
+  /**
      * Maximum value of the end date
      */
-    maxEndDate?: string;
+  maxEndDate?: string;
 }
diff --git a/src/app/core/config/models/config-submission-access.model.ts b/src/app/core/config/models/config-submission-access.model.ts
index 7db96acf2b..4617dc4719 100644
--- a/src/app/core/config/models/config-submission-access.model.ts
+++ b/src/app/core/config/models/config-submission-access.model.ts
@@ -1,9 +1,14 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { AccessesConditionOption } from './config-accesses-conditions-options.model';
 import { SUBMISSION_ACCESSES_TYPE } from './config-type';
-import { HALLink } from '../../shared/hal-link.model';
 
 /**
  * Class for the configuration describing the item accesses condition
@@ -17,25 +22,25 @@ export class SubmissionAccessModel extends ConfigObject {
    * A list of available item access conditions
    */
   @autoserialize
-  accessConditionOptions: AccessesConditionOption[];
+    accessConditionOptions: AccessesConditionOption[];
 
   /**
    * Boolean that indicates whether the current item must be findable via search or browse.
    */
   @autoserialize
-  discoverable: boolean;
+    discoverable: boolean;
 
   /**
    * Boolean that indicates whether or not the user can change the discoverable flag.
    */
   @autoserialize
-  canChangeDiscoverable: boolean;
+    canChangeDiscoverable: boolean;
 
   /**
    * The links to all related resources returned by the rest api.
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink
   };
 
diff --git a/src/app/core/config/models/config-submission-accesses.model.ts b/src/app/core/config/models/config-submission-accesses.model.ts
index 3f8004928d..b3c097cc8a 100644
--- a/src/app/core/config/models/config-submission-accesses.model.ts
+++ b/src/app/core/config/models/config-submission-accesses.model.ts
@@ -1,7 +1,8 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { SUBMISSION_ACCESSES_TYPE } from './config-type';
 import { SubmissionAccessModel } from './config-submission-access.model';
+import { SUBMISSION_ACCESSES_TYPE } from './config-type';
 
 @typedObject
 @inheritSerialization(SubmissionAccessModel)
diff --git a/src/app/core/config/models/config-submission-definition.model.ts b/src/app/core/config/models/config-submission-definition.model.ts
index b07917e032..2d6b1ad604 100644
--- a/src/app/core/config/models/config-submission-definition.model.ts
+++ b/src/app/core/config/models/config-submission-definition.model.ts
@@ -1,9 +1,14 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { HALLink } from '../../shared/hal-link.model';
-import { SubmissionSectionModel } from './config-submission-section.model';
 import { ConfigObject } from './config.model';
+import { SubmissionSectionModel } from './config-submission-section.model';
 import { SUBMISSION_DEFINITION_TYPE } from './config-type';
 
 /**
@@ -18,20 +23,20 @@ export class SubmissionDefinitionModel extends ConfigObject {
    * A boolean representing if this submission definition is the default or not
    */
   @autoserialize
-  isDefault: boolean;
+    isDefault: boolean;
 
   /**
    * A list of SubmissionSectionModel that are present in this submission definition
    */
   // TODO refactor using remotedata
   @deserialize
-  sections: PaginatedList<SubmissionSectionModel>;
+    sections: PaginatedList<SubmissionSectionModel>;
 
   /**
    * The links to all related resources returned by the rest api.
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     collections: HALLink,
     sections: HALLink
diff --git a/src/app/core/config/models/config-submission-definitions.model.ts b/src/app/core/config/models/config-submission-definitions.model.ts
index 08f1ef17bb..790334da9b 100644
--- a/src/app/core/config/models/config-submission-definitions.model.ts
+++ b/src/app/core/config/models/config-submission-definitions.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionDefinitionModel } from './config-submission-definition.model';
 import { SUBMISSION_DEFINITIONS_TYPE } from './config-type';
diff --git a/src/app/core/config/models/config-submission-form.model.ts b/src/app/core/config/models/config-submission-form.model.ts
index 90f94882bd..f6011adc76 100644
--- a/src/app/core/config/models/config-submission-form.model.ts
+++ b/src/app/core/config/models/config-submission-form.model.ts
@@ -1,7 +1,11 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { ConfigObject } from './config.model';
-import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
 import { SUBMISSION_FORM_TYPE } from './config-type';
 
 /**
@@ -23,5 +27,5 @@ export class SubmissionFormModel extends ConfigObject {
    * An array of [FormRowModel] that are present in this form
    */
   @autoserialize
-  rows: FormRowModel[];
+    rows: FormRowModel[];
 }
diff --git a/src/app/core/config/models/config-submission-forms.model.ts b/src/app/core/config/models/config-submission-forms.model.ts
index 506905d88c..4cf71d85d9 100644
--- a/src/app/core/config/models/config-submission-forms.model.ts
+++ b/src/app/core/config/models/config-submission-forms.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionFormModel } from './config-submission-form.model';
 import { SUBMISSION_FORMS_TYPE } from './config-type';
diff --git a/src/app/core/config/models/config-submission-section.model.ts b/src/app/core/config/models/config-submission-section.model.ts
index bdc884dfa4..0d4ae9aa10 100644
--- a/src/app/core/config/models/config-submission-section.model.ts
+++ b/src/app/core/config/models/config-submission-section.model.ts
@@ -1,4 +1,9 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { SectionsType } from '../../../submission/sections/sections-type';
 import { typedObject } from '../../cache/builders/build-decorators';
 import { HALLink } from '../../shared/hal-link.model';
@@ -22,31 +27,31 @@ export class SubmissionSectionModel extends ConfigObject {
    * The header for this section
    */
   @autoserialize
-  header: string;
+    header: string;
 
   /**
    * A boolean representing if this submission section is the mandatory or not
    */
   @autoserialize
-  mandatory: boolean;
+    mandatory: boolean;
 
   /**
    * A string representing the kind of section object
    */
   @autoserialize
-  sectionType: SectionsType;
+    sectionType: SectionsType;
 
   /**
    * The [SubmissionSectionVisibility] object for this section
    */
   @autoserialize
-  visibility: SubmissionSectionVisibility;
+    visibility: SubmissionSectionVisibility;
 
   /**
    * The {@link HALLink}s for this SubmissionSectionModel
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     config: HALLink;
   };
diff --git a/src/app/core/config/models/config-submission-sections.model.ts b/src/app/core/config/models/config-submission-sections.model.ts
index 423ea99b1e..86894b6e44 100644
--- a/src/app/core/config/models/config-submission-sections.model.ts
+++ b/src/app/core/config/models/config-submission-sections.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { SubmissionSectionModel } from './config-submission-section.model';
 import { SUBMISSION_SECTIONS_TYPE } from './config-type';
diff --git a/src/app/core/config/models/config-submission-upload.model.ts b/src/app/core/config/models/config-submission-upload.model.ts
index f6897da2e3..edc4626f83 100644
--- a/src/app/core/config/models/config-submission-upload.model.ts
+++ b/src/app/core/config/models/config-submission-upload.model.ts
@@ -1,12 +1,23 @@
-import { autoserialize, inheritSerialization, deserialize } from 'cerialize';
-import { typedObject, link } from '../../cache/builders/build-decorators';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { RemoteData } from '../../data/remote-data';
+import { HALLink } from '../../shared/hal-link.model';
 import { ConfigObject } from './config.model';
 import { AccessConditionOption } from './config-access-condition-option.model';
 import { SubmissionFormsModel } from './config-submission-forms.model';
-import { SUBMISSION_UPLOAD_TYPE, SUBMISSION_FORMS_TYPE } from './config-type';
-import { HALLink } from '../../shared/hal-link.model';
-import { RemoteData } from '../../data/remote-data';
-import { Observable } from 'rxjs';
+import {
+  SUBMISSION_FORMS_TYPE,
+  SUBMISSION_UPLOAD_TYPE,
+} from './config-type';
 
 @typedObject
 @inheritSerialization(ConfigObject)
@@ -16,22 +27,22 @@ export class SubmissionUploadModel extends ConfigObject {
    * A list of available bitstream access conditions
    */
   @autoserialize
-  accessConditionOptions: AccessConditionOption[];
+    accessConditionOptions: AccessConditionOption[];
 
   /**
    * An object representing the configuration describing the bitstream metadata form
    */
   @link(SUBMISSION_FORMS_TYPE)
-  metadata?: Observable<RemoteData<SubmissionFormsModel>>;
+    metadata?: Observable<RemoteData<SubmissionFormsModel>>;
 
   @autoserialize
-  required: boolean;
+    required: boolean;
 
   @autoserialize
-  maxSize: number;
+    maxSize: number;
 
   @deserialize
-  _links: {
+    _links: {
     metadata: HALLink
     self: HALLink
   };
diff --git a/src/app/core/config/models/config-submission-uploads.model.ts b/src/app/core/config/models/config-submission-uploads.model.ts
index 8fb7dc66b9..235cdd31a1 100644
--- a/src/app/core/config/models/config-submission-uploads.model.ts
+++ b/src/app/core/config/models/config-submission-uploads.model.ts
@@ -1,7 +1,8 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { SUBMISSION_UPLOADS_TYPE } from './config-type';
 import { SubmissionUploadModel } from './config-submission-upload.model';
+import { SUBMISSION_UPLOADS_TYPE } from './config-type';
 
 @typedObject
 @inheritSerialization(SubmissionUploadModel)
diff --git a/src/app/core/config/models/config-type.ts b/src/app/core/config/models/config-type.ts
index 19864536f0..5733f5bfad 100644
--- a/src/app/core/config/models/config-type.ts
+++ b/src/app/core/config/models/config-type.ts
@@ -17,3 +17,5 @@ export const SUBMISSION_UPLOADS_TYPE = new ResourceType('submissionuploads');
 export const SUBMISSION_UPLOAD_TYPE = new ResourceType('submissionupload');
 
 export const SUBMISSION_ACCESSES_TYPE = new ResourceType('submissionaccessoption');
+
+export const BULK_ACCESS_CONDITION_OPTIONS = new ResourceType('bulkaccessconditionoption');
diff --git a/src/app/core/config/models/config.model.ts b/src/app/core/config/models/config.model.ts
index 170aa334ed..c1db44e891 100644
--- a/src/app/core/config/models/config.model.ts
+++ b/src/app/core/config/models/config.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 export abstract class ConfigObject implements CacheableObject {
 
@@ -23,13 +27,13 @@ export abstract class ConfigObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The links to all related resources returned by the rest api.
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     [name: string]: HALLink
   };
diff --git a/src/app/core/config/submission-accesses-config-data.service.ts b/src/app/core/config/submission-accesses-config-data.service.ts
index d2da0fce42..16986405fd 100644
--- a/src/app/core/config/submission-accesses-config-data.service.ts
+++ b/src/app/core/config/submission-accesses-config-data.service.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ConfigDataService } from './config-data.service';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ConfigDataService } from './config-data.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionAccessesModel } from './models/config-submission-accesses.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../data/base/data-service.decorator';
+import { SUBMISSION_ACCESSES_TYPE } from './models/config-type';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
diff --git a/src/app/core/config/submission-forms-config-data.service.ts b/src/app/core/config/submission-forms-config-data.service.ts
index f4c0690685..fb8e0e60da 100644
--- a/src/app/core/config/submission-forms-config-data.service.ts
+++ b/src/app/core/config/submission-forms-config-data.service.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ConfigDataService } from './config-data.service';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { ConfigObject } from './models/config.model';
-import { SUBMISSION_FORMS_TYPE } from './models/config-type';
-import { SubmissionFormsModel } from './models/config-submission-forms.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { dataService } from '../data/base/data-service.decorator';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigDataService } from './config-data.service';
+import { ConfigObject } from './models/config.model';
+import { SubmissionFormsModel } from './models/config-submission-forms.model';
+import { SUBMISSION_FORMS_TYPE } from './models/config-type';
 
 /**
  * Data service to retrieve submission form configuration objects from the REST server.
diff --git a/src/app/core/config/submission-uploads-config-data.service.ts b/src/app/core/config/submission-uploads-config-data.service.ts
index 8f838352a9..b98c8b4f91 100644
--- a/src/app/core/config/submission-uploads-config-data.service.ts
+++ b/src/app/core/config/submission-uploads-config-data.service.ts
@@ -1,16 +1,17 @@
 import { Injectable } from '@angular/core';
-import { ConfigDataService } from './config-data.service';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ConfigDataService } from './config-data.service';
 import { ConfigObject } from './models/config.model';
 import { SubmissionUploadsModel } from './models/config-submission-uploads.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { dataService } from '../data/base/data-service.decorator';
+import { SUBMISSION_UPLOADS_TYPE } from './models/config-type';
 
 /**
  * Provides methods to retrieve, from REST server, bitstream access conditions configurations applicable during the submission process.
diff --git a/src/app/core/core-state.model.ts b/src/app/core/core-state.model.ts
index b8211fdb55..2128901754 100644
--- a/src/app/core/core-state.model.ts
+++ b/src/app/core/core-state.model.ts
@@ -1,16 +1,14 @@
-import {
-    BitstreamFormatRegistryState
-} from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { BitstreamFormatRegistryState } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { AuthState } from './auth/auth.reducer';
 import { ObjectCacheState } from './cache/object-cache.reducer';
 import { ServerSyncBufferState } from './cache/server-sync-buffer.reducer';
 import { ObjectUpdatesState } from './data/object-updates/object-updates.reducer';
+import { RequestState } from './data/request-state.model';
 import { HistoryState } from './history/history.reducer';
 import { MetaIndexState } from './index/index.reducer';
-import { AuthState } from './auth/auth.reducer';
 import { JsonPatchOperationsState } from './json-patch/json-patch-operations.reducer';
 import { MetaTagState } from './metadata/meta-tag.reducer';
 import { RouteState } from './services/route.reducer';
-import { RequestState } from './data/request-state.model';
 
 /**
  * The core sub-state in the NgRx store
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index cd14a527e8..5af2fe580a 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -1,13 +1,13 @@
-import { ObjectCacheEffects } from './cache/object-cache.effects';
-import { UUIDIndexEffects } from './index/index.effects';
-import { RequestEffects } from './data/request.effects';
+import { MenuEffects } from '../shared/menu/menu.effects';
 import { AuthEffects } from './auth/auth.effects';
-import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.effects';
+import { ObjectCacheEffects } from './cache/object-cache.effects';
 import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
 import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
-import { RouteEffects } from './services/route.effects';
+import { RequestEffects } from './data/request.effects';
+import { UUIDIndexEffects } from './index/index.effects';
+import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.effects';
 import { RouterEffects } from './router/router.effects';
-import { MenuEffects } from '../shared/menu/menu.effects';
+import { RouteEffects } from './services/route.effects';
 
 export const coreEffects = [
   RequestEffects,
@@ -19,5 +19,5 @@ export const coreEffects = [
   ObjectUpdatesEffects,
   RouteEffects,
   RouterEffects,
-  MenuEffects
+  MenuEffects,
 ];
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 3ba0b39a0e..10433caa26 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -1,37 +1,58 @@
 import { CommonModule } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { ModuleWithProviders, NgModule, Optional, SkipSelf } from '@angular/core';
-
-import { DynamicFormLayoutService, DynamicFormService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  ModuleWithProviders,
+  NgModule,
+  Optional,
+  SkipSelf,
+} from '@angular/core';
 import { EffectsModule } from '@ngrx/effects';
+import {
+  Action,
+  StoreConfig,
+  StoreModule,
+} from '@ngrx/store';
 
-import { Action, StoreConfig, StoreModule } from '@ngrx/store';
+import { environment } from '../../environments/environment';
+import { LdnItemfiltersService } from '../admin/admin-ldn-services/ldn-services-data/ldn-itemfilters-data.service';
+import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { Itemfilter } from '../admin/admin-ldn-services/ldn-services-model/ldn-service-itemfilters';
+import { LdnService } from '../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { AdminNotifyMessage } from '../admin/admin-notify-dashboard/models/admin-notify-message.model';
+import { storeModuleConfig } from '../app.reducer';
+import { NotifyRequestsStatus } from '../item-page/simple/notify-requests-status/notify-requests-status.model';
 import { MyDSpaceGuard } from '../my-dspace-page/my-dspace.guard';
-
+import { Process } from '../process-page/processes/process.model';
+import { Script } from '../process-page/scripts/script.model';
+import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
 import { isNotEmpty } from '../shared/empty.util';
-import { FormBuilderService } from '../shared/form/builder/form-builder.service';
-import { FormService } from '../shared/form/form.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { EndpointMockingRestService } from '../shared/mocks/dspace-rest/endpoint-mocking-rest.service';
 import {
   MOCK_RESPONSE_MAP,
   mockResponseMap,
-  ResponseMapMock
+  ResponseMapMock,
 } from '../shared/mocks/dspace-rest/mocks/response-map.mock';
 import { NotificationsService } from '../shared/notifications/notifications.service';
+import { AccessStatusObject } from '../shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { IdentifierData } from '../shared/object-list/identifier-data/identifier-data.model';
 import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
 import { ObjectSelectService } from '../shared/object-select/object-select.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { CSSVariableService } from '../shared/sass-helper/sass-helper.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { UploaderService } from '../shared/uploader/uploader.service';
-import { SectionFormOperationsService } from '../submission/sections/form/section-form-operations.service';
+import { Subscription } from '../shared/subscriptions/models/subscription.model';
+import { CoarNotifyConfigDataService } from '../submission/sections/section-coar-notify/coar-notify-config-data.service';
+import { SubmissionCoarNotifyConfig } from '../submission/sections/section-coar-notify/submission-coar-notify.config';
 import { AuthenticatedGuard } from './auth/authenticated.guard';
 import { AuthStatus } from './auth/models/auth-status.model';
+import { ShortLivedToken } from './auth/models/short-lived-token.model';
+import { TokenResponseParsingService } from './auth/token-response-parsing.service';
 import { BrowseService } from './browse/browse.service';
 import { RemoteDataBuildService } from './cache/builders/remote-data-build.service';
 import { ObjectCacheService } from './cache/object-cache.service';
+import { BulkAccessConditionOptions } from './config/models/bulk-access-condition-options.model';
+import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
 import { SubmissionDefinitionsModel } from './config/models/config-submission-definitions.model';
 import { SubmissionFormsModel } from './config/models/config-submission-forms.model';
 import { SubmissionSectionModel } from './config/models/config-submission-section.model';
@@ -39,9 +60,14 @@ import { SubmissionUploadsModel } from './config/models/config-submission-upload
 import { SubmissionFormsConfigDataService } from './config/submission-forms-config-data.service';
 import { coreEffects } from './core.effects';
 import { coreReducers } from './core.reducers';
+import { CoreState } from './core-state.model';
+import { AccessStatusDataService } from './data/access-status-data.service';
+import { ArrayMoveChangeAnalyzer } from './data/array-move-change-analyzer.service';
+import { BitstreamDataService } from './data/bitstream-data.service';
 import { BitstreamFormatDataService } from './data/bitstream-format-data.service';
 import { CollectionDataService } from './data/collection-data.service';
 import { CommunityDataService } from './data/community-data.service';
+import { ConfigurationDataService } from './data/configuration-data.service';
 import { ContentSourceResponseParsingService } from './data/content-source-response-parsing.service';
 import { DebugResponseParsingService } from './data/debug-response-parsing.service';
 import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service';
@@ -53,133 +79,132 @@ import { EntityTypeDataService } from './data/entity-type-data.service';
 import { ExternalSourceDataService } from './data/external-source-data.service';
 import { FacetConfigResponseParsingService } from './data/facet-config-response-parsing.service';
 import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
+import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
+import { SiteAdministratorGuard } from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { SiteRegisterGuard } from './data/feature-authorization/feature-authorization-guard/site-register.guard';
+import { FeatureDataService } from './data/feature-authorization/feature-data.service';
 import { FilteredDiscoveryPageResponseParsingService } from './data/filtered-discovery-page-response-parsing.service';
 import { ItemDataService } from './data/item-data.service';
+import { ItemTemplateDataService } from './data/item-template-data.service';
 import { LookupRelationService } from './data/lookup-relation.service';
+import { MetadataFieldDataService } from './data/metadata-field-data.service';
+import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
+import { NotifyRequestsStatusDataService } from './data/notify-services-status-data.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
-import { RelationshipTypeDataService } from './data/relationship-type-data.service';
+import { ProcessDataService } from './data/processes/process-data.service';
+import { ScriptDataService } from './data/processes/script-data.service';
 import { RelationshipDataService } from './data/relationship-data.service';
-import { ResourcePolicyDataService } from './resource-policy/resource-policy-data.service';
+import { RelationshipTypeDataService } from './data/relationship-type-data.service';
+import { Root } from './data/root.model';
+import { RootDataService } from './data/root-data.service';
 import { SearchResponseParsingService } from './data/search-response-parsing.service';
 import { SiteDataService } from './data/site-data.service';
+import { VersionDataService } from './data/version-data.service';
+import { VersionHistoryDataService } from './data/version-history-data.service';
+import { WorkflowActionDataService } from './data/workflow-action-data.service';
 import { DspaceRestService } from './dspace-rest/dspace-rest.service';
+import { EndUserAgreementService } from './end-user-agreement/end-user-agreement.service';
+import { EndUserAgreementCookieGuard } from './end-user-agreement/end-user-agreement-cookie.guard';
+import { EndUserAgreementCurrentUserGuard } from './end-user-agreement/end-user-agreement-current-user.guard';
 import { EPersonDataService } from './eperson/eperson-data.service';
+import { GroupDataService } from './eperson/group-data.service';
 import { EPerson } from './eperson/models/eperson.model';
 import { Group } from './eperson/models/group.model';
+import { FeedbackDataService } from './feedback/feedback-data.service';
 import { JsonPatchOperationsBuilder } from './json-patch/builder/json-patch-operations-builder';
+import { MetadataService } from './metadata/metadata.service';
 import { MetadataField } from './metadata/metadata-field.model';
 import { MetadataSchema } from './metadata/metadata-schema.model';
-import { MetadataService } from './metadata/metadata.service';
+import { SuggestionSource } from './notifications/models/suggestion-source.model';
+import { SuggestionTarget } from './notifications/models/suggestion-target.model';
+import { QualityAssuranceEventObject } from './notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from './notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from './notifications/qa/models/quality-assurance-topic.model';
+import { OrcidHistory } from './orcid/model/orcid-history.model';
+import { OrcidQueue } from './orcid/model/orcid-queue.model';
+import { OrcidAuthService } from './orcid/orcid-auth.service';
+import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
+import { OrcidQueueDataService } from './orcid/orcid-queue-data.service';
+import { ResearcherProfile } from './profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from './profile/researcher-profile-data.service';
 import { RegistryService } from './registry/registry.service';
+import { ReloadGuard } from './reload/reload.guard';
+import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
+import { ResourcePolicyDataService } from './resource-policy/resource-policy-data.service';
 import { RoleService } from './roles/role.service';
-import { FeedbackDataService } from './feedback/feedback-data.service';
-
+import { LinkHeadService } from './services/link-head.service';
 import { ServerResponseService } from './services/server-response.service';
-import { NativeWindowFactory, NativeWindowService } from './services/window.service';
-import { BitstreamFormat } from './shared/bitstream-format.model';
+import {
+  NativeWindowFactory,
+  NativeWindowService,
+} from './services/window.service';
+import { Authorization } from './shared/authorization.model';
 import { Bitstream } from './shared/bitstream.model';
+import { BitstreamFormat } from './shared/bitstream-format.model';
 import { BrowseDefinition } from './shared/browse-definition.model';
 import { BrowseEntry } from './shared/browse-entry.model';
 import { Bundle } from './shared/bundle.model';
 import { Collection } from './shared/collection.model';
 import { Community } from './shared/community.model';
+import { ConfigurationProperty } from './shared/configuration-property.model';
 import { DSpaceObject } from './shared/dspace-object.model';
-import { ExternalSourceEntry } from './shared/external-source-entry.model';
 import { ExternalSource } from './shared/external-source.model';
+import { ExternalSourceEntry } from './shared/external-source-entry.model';
+import { Feature } from './shared/feature.model';
+import { FlatBrowseDefinition } from './shared/flat-browse-definition.model';
 import { HALEndpointService } from './shared/hal-endpoint.service';
-import { ItemType } from './shared/item-relationships/item-type.model';
-import { RelationshipType } from './shared/item-relationships/relationship-type.model';
-import { Relationship } from './shared/item-relationships/relationship.model';
+import { HierarchicalBrowseDefinition } from './shared/hierarchical-browse-definition.model';
 import { Item } from './shared/item.model';
+import { ItemType } from './shared/item-relationships/item-type.model';
+import { Relationship } from './shared/item-relationships/relationship.model';
+import { RelationshipType } from './shared/item-relationships/relationship-type.model';
+import { ItemRequest } from './shared/item-request.model';
 import { License } from './shared/license.model';
-import { ResourcePolicy } from './resource-policy/models/resource-policy.model';
+import { NonHierarchicalBrowseDefinition } from './shared/non-hierarchical-browse-definition';
+import { Registration } from './shared/registration.model';
+import { SearchService } from './shared/search/search.service';
 import { SearchConfigurationService } from './shared/search/search-configuration.service';
 import { SearchFilterService } from './shared/search/search-filter.service';
-import { SearchService } from './shared/search/search.service';
+import { SearchConfig } from './shared/search/search-filters/search-config.model';
+import { SequenceService } from './shared/sequence.service';
 import { Site } from './shared/site.model';
+import { TemplateItem } from './shared/template-item.model';
 import { UUIDService } from './shared/uuid.service';
+import { ValueListBrowseDefinition } from './shared/value-list-browse-definition.model';
+import { Version } from './shared/version.model';
+import { VersionHistory } from './shared/version-history.model';
+import { UsageReport } from './statistics/models/usage-report.model';
+import { CorrectionTypeDataService } from './submission/correctiontype-data.service';
+import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
+import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
 import { WorkflowItem } from './submission/models/workflowitem.model';
 import { WorkspaceItem } from './submission/models/workspaceitem.model';
+import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
+import { SubmissionCcLicenseUrlDataService } from './submission/submission-cc-license-url-data.service';
+import { SubmissionDuplicateDataService } from './submission/submission-duplicate-data.service';
 import { SubmissionJsonPatchOperationsService } from './submission/submission-json-patch-operations.service';
 import { SubmissionResponseParsingService } from './submission/submission-response-parsing.service';
 import { SubmissionRestService } from './submission/submission-rest.service';
+import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
+import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service';
+import { VocabularyService } from './submission/vocabularies/vocabulary.service';
+import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service';
 import { WorkflowItemDataService } from './submission/workflowitem-data.service';
 import { WorkspaceitemDataService } from './submission/workspaceitem-data.service';
+import { SupervisionOrderDataService } from './supervision-order/supervision-order-data.service';
 import { ClaimedTaskDataService } from './tasks/claimed-task-data.service';
+import { AdvancedWorkflowInfo } from './tasks/models/advanced-workflow-info.model';
 import { ClaimedTask } from './tasks/models/claimed-task-object.model';
 import { PoolTask } from './tasks/models/pool-task-object.model';
+import { RatingAdvancedWorkflowInfo } from './tasks/models/rating-advanced-workflow-info.model';
+import { SelectReviewerAdvancedWorkflowInfo } from './tasks/models/select-reviewer-advanced-workflow-info.model';
 import { TaskObject } from './tasks/models/task-object.model';
+import { WorkflowAction } from './tasks/models/workflow-action-object.model';
 import { PoolTaskDataService } from './tasks/pool-task-data.service';
 import { TaskResponseParsingService } from './tasks/task-response-parsing.service';
-import { ArrayMoveChangeAnalyzer } from './data/array-move-change-analyzer.service';
-import { BitstreamDataService } from './data/bitstream-data.service';
-import { environment } from '../../environments/environment';
-import { storeModuleConfig } from '../app.reducer';
-import { VersionDataService } from './data/version-data.service';
-import { VersionHistoryDataService } from './data/version-history-data.service';
-import { Version } from './shared/version.model';
-import { VersionHistory } from './shared/version-history.model';
-import { Script } from '../process-page/scripts/script.model';
-import { Process } from '../process-page/processes/process.model';
-import { ProcessDataService } from './data/processes/process-data.service';
-import { ScriptDataService } from './data/processes/script-data.service';
-import { WorkflowActionDataService } from './data/workflow-action-data.service';
-import { WorkflowAction } from './tasks/models/workflow-action-object.model';
-import { ItemTemplateDataService } from './data/item-template-data.service';
-import { TemplateItem } from './shared/template-item.model';
-import { Feature } from './shared/feature.model';
-import { Authorization } from './shared/authorization.model';
-import { FeatureDataService } from './data/feature-authorization/feature-data.service';
-import { AuthorizationDataService } from './data/feature-authorization/authorization-data.service';
-import {
-  SiteAdministratorGuard
-} from './data/feature-authorization/feature-authorization-guard/site-administrator.guard';
-import { Registration } from './shared/registration.model';
-import { MetadataSchemaDataService } from './data/metadata-schema-data.service';
-import { MetadataFieldDataService } from './data/metadata-field-data.service';
-import {
-  DsDynamicTypeBindRelationService
-} from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
-import { TokenResponseParsingService } from './auth/token-response-parsing.service';
-import { SubmissionCcLicenseDataService } from './submission/submission-cc-license-data.service';
-import { SubmissionCcLicence } from './submission/models/submission-cc-license.model';
-import { SubmissionCcLicenceUrl } from './submission/models/submission-cc-license-url.model';
-import { SubmissionCcLicenseUrlDataService } from './submission/submission-cc-license-url-data.service';
-import { VocabularyEntry } from './submission/vocabularies/models/vocabulary-entry.model';
-import { Vocabulary } from './submission/vocabularies/models/vocabulary.model';
-import { VocabularyEntryDetail } from './submission/vocabularies/models/vocabulary-entry-detail.model';
-import { VocabularyService } from './submission/vocabularies/vocabulary.service';
-import { VocabularyTreeviewService } from '../shared/vocabulary-treeview/vocabulary-treeview.service';
-import { ConfigurationDataService } from './data/configuration-data.service';
-import { ConfigurationProperty } from './shared/configuration-property.model';
-import { ReloadGuard } from './reload/reload.guard';
-import { EndUserAgreementCurrentUserGuard } from './end-user-agreement/end-user-agreement-current-user.guard';
-import { EndUserAgreementCookieGuard } from './end-user-agreement/end-user-agreement-cookie.guard';
-import { EndUserAgreementService } from './end-user-agreement/end-user-agreement.service';
-import { SiteRegisterGuard } from './data/feature-authorization/feature-authorization-guard/site-register.guard';
-import { ShortLivedToken } from './auth/models/short-lived-token.model';
-import { UsageReport } from './statistics/models/usage-report.model';
-import { RootDataService } from './data/root-data.service';
-import { Root } from './data/root.model';
-import { SearchConfig } from './shared/search/search-filters/search-config.model';
-import { SequenceService } from './shared/sequence.service';
-import { CoreState } from './core-state.model';
-import { GroupDataService } from './eperson/group-data.service';
-import { SubmissionAccessesModel } from './config/models/config-submission-accesses.model';
-import { AccessStatusObject } from '../shared/object-list/access-status-badge/access-status.model';
-import { AccessStatusDataService } from './data/access-status-data.service';
-import { LinkHeadService } from './services/link-head.service';
-import { ResearcherProfileDataService } from './profile/researcher-profile-data.service';
-import { ProfileClaimService } from '../profile-page/profile-claim/profile-claim.service';
-import { ResearcherProfile } from './profile/model/researcher-profile.model';
-import { OrcidQueueDataService } from './orcid/orcid-queue-data.service';
-import { OrcidHistoryDataService } from './orcid/orcid-history-data.service';
-import { OrcidQueue } from './orcid/model/orcid-queue.model';
-import { OrcidHistory } from './orcid/model/orcid-history.model';
-import { OrcidAuthService } from './orcid/orcid-auth.service';
-import { VocabularyDataService } from './submission/vocabularies/vocabulary.data.service';
-import { VocabularyEntryDetailsDataService } from './submission/vocabularies/vocabulary-entry-details.data.service';
 
 /**
  * When not in production, endpoint responses can be mocked for testing purposes
@@ -196,7 +221,7 @@ export const restServiceFactory = (mocks: ResponseMapMock, http: HttpClient) =>
 const IMPORTS = [
   CommonModule,
   StoreModule.forFeature('core', coreReducers, storeModuleConfig as StoreConfig<CoreState, Action>),
-  EffectsModule.forFeature(coreEffects)
+  EffectsModule.forFeature(coreEffects),
 ];
 
 const DECLARATIONS = [];
@@ -211,17 +236,12 @@ const PROVIDERS = [
   DSOResponseParsingService,
   { provide: MOCK_RESPONSE_MAP, useValue: mockResponseMap },
   { provide: DspaceRestService, useFactory: restServiceFactory, deps: [MOCK_RESPONSE_MAP, HttpClient] },
-  DynamicFormLayoutService,
-  DynamicFormService,
-  DynamicFormValidationService,
-  FormBuilderService,
-  SectionFormOperationsService,
-  FormService,
   EPersonDataService,
   LinkHeadService,
   HALEndpointService,
   HostWindowService,
   ItemDataService,
+  SubmissionDuplicateDataService,
   MetadataService,
   ObjectCacheService,
   PaginationComponentOptions,
@@ -245,19 +265,16 @@ const PROVIDERS = [
   SubmissionResponseParsingService,
   SubmissionJsonPatchOperationsService,
   JsonPatchOperationsBuilder,
-  UploaderService,
   UUIDService,
   NotificationsService,
   WorkspaceitemDataService,
   WorkflowItemDataService,
-  UploaderService,
   DSpaceObjectDataService,
   ConfigurationDataService,
   DSOChangeAnalyzer,
   DefaultChangeAnalyzer,
   ArrayMoveChangeAnalyzer,
   ObjectSelectService,
-  CSSVariableService,
   MenuService,
   ObjectUpdatesService,
   SearchService,
@@ -268,7 +285,6 @@ const PROVIDERS = [
   ClaimedTaskDataService,
   PoolTaskDataService,
   BitstreamDataService,
-  DsDynamicTypeBindRelationService,
   EntityTypeDataService,
   ContentSourceResponseParsingService,
   ItemTemplateDataService,
@@ -304,7 +320,6 @@ const PROVIDERS = [
   VocabularyService,
   VocabularyDataService,
   VocabularyEntryDetailsDataService,
-  VocabularyTreeviewService,
   SequenceService,
   GroupDataService,
   FeedbackDataService,
@@ -313,6 +328,12 @@ const PROVIDERS = [
   OrcidAuthService,
   OrcidQueueDataService,
   OrcidHistoryDataService,
+  SupervisionOrderDataService,
+  CorrectionTypeDataService,
+  LdnServicesService,
+  LdnItemfiltersService,
+  CoarNotifyConfigDataService,
+  NotifyRequestsStatusDataService,
 ];
 
 /**
@@ -346,6 +367,10 @@ export const models =
     AuthStatus,
     BrowseEntry,
     BrowseDefinition,
+    NonHierarchicalBrowseDefinition,
+    FlatBrowseDefinition,
+    ValueListBrowseDefinition,
+    HierarchicalBrowseDefinition,
     ClaimedTask,
     TaskObject,
     PoolTask,
@@ -359,6 +384,9 @@ export const models =
     Version,
     VersionHistory,
     WorkflowAction,
+    AdvancedWorkflowInfo,
+    RatingAdvancedWorkflowInfo,
+    SelectReviewerAdvancedWorkflowInfo,
     TemplateItem,
     Feature,
     Authorization,
@@ -370,29 +398,43 @@ export const models =
     ShortLivedToken,
     Registration,
     UsageReport,
+    QualityAssuranceTopicObject,
+    QualityAssuranceEventObject,
     Root,
     SearchConfig,
     SubmissionAccessesModel,
+    QualityAssuranceSourceObject,
     AccessStatusObject,
     ResearcherProfile,
     OrcidQueue,
     OrcidHistory,
-    AccessStatusObject
+    AccessStatusObject,
+    IdentifierData,
+    Subscription,
+    ItemRequest,
+    BulkAccessConditionOptions,
+    SuggestionTarget,
+    SuggestionSource,
+    LdnService,
+    Itemfilter,
+    SubmissionCoarNotifyConfig,
+    NotifyRequestsStatus,
+    AdminNotifyMessage,
   ];
 
 @NgModule({
   imports: [
-    ...IMPORTS
+    ...IMPORTS,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
-    ...EXPORTS
+    ...EXPORTS,
   ],
   providers: [
-    ...PROVIDERS
-  ]
+    ...PROVIDERS,
+  ],
 })
 
 export class CoreModule {
@@ -400,8 +442,8 @@ export class CoreModule {
     return {
       ngModule: CoreModule,
       providers: [
-        ...PROVIDERS
-      ]
+        ...PROVIDERS,
+      ],
     };
   }
 
diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts
index c0165c5384..fda1e05df0 100644
--- a/src/app/core/core.reducers.ts
+++ b/src/app/core/core.reducers.ts
@@ -1,19 +1,17 @@
-import { ActionReducerMap, } from '@ngrx/store';
+import { ActionReducerMap } from '@ngrx/store';
 
-import { objectCacheReducer } from './cache/object-cache.reducer';
-import { indexReducer } from './index/index.reducer';
-import { requestReducer } from './data/request.reducer';
+import { bitstreamFormatReducer } from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { authReducer } from './auth/auth.reducer';
-import { jsonPatchOperationsReducer } from './json-patch/json-patch-operations.reducer';
+import { objectCacheReducer } from './cache/object-cache.reducer';
 import { serverSyncBufferReducer } from './cache/server-sync-buffer.reducer';
-import { objectUpdatesReducer } from './data/object-updates/object-updates.reducer';
-import { routeReducer } from './services/route.reducer';
-import {
-  bitstreamFormatReducer
-} from '../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
-import { historyReducer } from './history/history.reducer';
-import { metaTagReducer } from './metadata/meta-tag.reducer';
 import { CoreState } from './core-state.model';
+import { objectUpdatesReducer } from './data/object-updates/object-updates.reducer';
+import { requestReducer } from './data/request.reducer';
+import { historyReducer } from './history/history.reducer';
+import { indexReducer } from './index/index.reducer';
+import { jsonPatchOperationsReducer } from './json-patch/json-patch-operations.reducer';
+import { metaTagReducer } from './metadata/meta-tag.reducer';
+import { routeReducer } from './services/route.reducer';
 
 export const coreReducers: ActionReducerMap<CoreState> = {
   'bitstreamFormats': bitstreamFormatReducer,
@@ -26,5 +24,5 @@ export const coreReducers: ActionReducerMap<CoreState> = {
   'auth': authReducer,
   'json/patch': jsonPatchOperationsReducer,
   'metaTag': metaTagReducer,
-  'route': routeReducer
+  'route': routeReducer,
 };
diff --git a/src/app/core/core.selectors.ts b/src/app/core/core.selectors.ts
index 77c7974de2..899afb9be9 100644
--- a/src/app/core/core.selectors.ts
+++ b/src/app/core/core.selectors.ts
@@ -1,4 +1,5 @@
 import { createFeatureSelector } from '@ngrx/store';
+
 import { CoreState } from './core-state.model';
 
 /**
diff --git a/src/app/core/data/access-status-data.service.spec.ts b/src/app/core/data/access-status-data.service.spec.ts
index 18b8cb5d65..1240585027 100644
--- a/src/app/core/data/access-status-data.service.spec.ts
+++ b/src/app/core/data/access-status-data.service.spec.ts
@@ -1,17 +1,21 @@
-import { RequestService } from './request.service';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import { Observable } from 'rxjs';
+
+import { hasNoValue } from '../../shared/empty.util';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { fakeAsync, tick } from '@angular/core/testing';
-import { GetRequest } from './request.models';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { hasNoValue } from '../../shared/empty.util';
-import { AccessStatusDataService } from './access-status-data.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { Item } from '../shared/item.model';
+import { AccessStatusDataService } from './access-status-data.service';
+import { RemoteData } from './remote-data';
+import { GetRequest } from './request.models';
+import { RequestService } from './request.service';
 
 const url = 'fake-url';
 
@@ -29,12 +33,12 @@ describe('AccessStatusDataService', () => {
     name: 'test-item',
     _links: {
       accessStatus: {
-        href: `https://rest.api/items/${itemId}/accessStatus`
+        href: `https://rest.api/items/${itemId}/accessStatus`,
       },
       self: {
-        href: `https://rest.api/items/${itemId}`
-      }
-    }
+        href: `https://rest.api/items/${itemId}`,
+      },
+    },
   });
 
   describe('when the requests are successful', () => {
@@ -69,10 +73,10 @@ describe('AccessStatusDataService', () => {
     }
     rdbService = jasmine.createSpyObj('rdbService', {
       buildFromRequestUUID: buildResponse$,
-      buildSingle: buildResponse$
+      buildSingle: buildResponse$,
     });
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
diff --git a/src/app/core/data/access-status-data.service.ts b/src/app/core/data/access-status-data.service.ts
index 2f641456fa..56db0e55e7 100644
--- a/src/app/core/data/access-status-data.service.ts
+++ b/src/app/core/data/access-status-data.service.ts
@@ -1,15 +1,16 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
-import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
 import { Item } from '../shared/item.model';
 import { BaseDataService } from './base/base-data.service';
 import { dataService } from './base/data-service.decorator';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * Data service responsible for retrieving the access status of Items
diff --git a/src/app/core/data/array-move-change-analyzer.service.spec.ts b/src/app/core/data/array-move-change-analyzer.service.spec.ts
index 5f5388d935..cf11decde4 100644
--- a/src/app/core/data/array-move-change-analyzer.service.spec.ts
+++ b/src/app/core/data/array-move-change-analyzer.service.spec.ts
@@ -1,7 +1,8 @@
-import { ArrayMoveChangeAnalyzer } from './array-move-change-analyzer.service';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
 import { Operation } from 'fast-json-patch';
 
+import { ArrayMoveChangeAnalyzer } from './array-move-change-analyzer.service';
+
 /**
  * Helper class for creating move tests
  * Define a "from" and "to" index to move objects within the array before comparing
@@ -28,7 +29,7 @@ describe('ArrayMoveChangeAnalyzer', () => {
         '4d7d0798-a8fa-45b8-b4fc-deb2819606c8',
         'e56eb99e-2f7c-4bee-9b3f-d3dcc83386b1',
         '0f608168-cdfc-46b0-92ce-889f7d3ac684',
-        '546f9f5c-15dc-4eec-86fe-648007ac9e1c'
+        '546f9f5c-15dc-4eec-86fe-648007ac9e1c',
       ];
     });
 
@@ -41,21 +42,28 @@ describe('ArrayMoveChangeAnalyzer', () => {
     ], new MoveTest(0, 3));
 
     testMove([
+      { op: 'move', from: '/2', path: '/3' },
       { op: 'move', from: '/0', path: '/3' },
-      { op: 'move', from: '/2', path: '/1' }
     ], new MoveTest(0, 3), new MoveTest(1, 2));
 
     testMove([
+      { op: 'move', from: '/3', path: '/4' },
       { op: 'move', from: '/0', path: '/1' },
-      { op: 'move', from: '/3', path: '/4' }
     ], new MoveTest(0, 1), new MoveTest(3, 4));
 
     testMove([], new MoveTest(0, 4), new MoveTest(4, 0));
 
     testMove([
+      { op: 'move', from: '/2', path: '/3' },
       { op: 'move', from: '/0', path: '/3' },
-      { op: 'move', from: '/2', path: '/1' }
     ], new MoveTest(0, 4), new MoveTest(1, 3), new MoveTest(2, 4));
+
+    testMove([
+      { op: 'move', from: '/3', path: '/4' },
+      { op: 'move', from: '/2', path: '/4' },
+      { op: 'move', from: '/1', path: '/3' },
+      { op: 'move', from: '/0', path: '/3' },
+    ], new MoveTest(4, 1), new MoveTest(4, 2), new MoveTest(0, 3));
   });
 
   describe('when some values are undefined (index 2 and 3)', () => {
@@ -65,7 +73,7 @@ describe('ArrayMoveChangeAnalyzer', () => {
         '4d7d0798-a8fa-45b8-b4fc-deb2819606c8',
         undefined,
         undefined,
-        '546f9f5c-15dc-4eec-86fe-648007ac9e1c'
+        '546f9f5c-15dc-4eec-86fe-648007ac9e1c',
       ];
     });
 
diff --git a/src/app/core/data/array-move-change-analyzer.service.ts b/src/app/core/data/array-move-change-analyzer.service.ts
index f6e07608f6..95d86f1032 100644
--- a/src/app/core/data/array-move-change-analyzer.service.ts
+++ b/src/app/core/data/array-move-change-analyzer.service.ts
@@ -1,6 +1,7 @@
-import { MoveOperation } from 'fast-json-patch';
-import { Injectable } from '@angular/core';
 import { moveItemInArray } from '@angular/cdk/drag-drop';
+import { Injectable } from '@angular/core';
+import { MoveOperation } from 'fast-json-patch';
+
 import { hasValue } from '../../shared/empty.util';
 
 /**
@@ -16,22 +17,31 @@ export class ArrayMoveChangeAnalyzer<T> {
    * @param array2  The custom array to compare with the original
    */
   diff(array1: T[], array2: T[]): MoveOperation[] {
-    const result = [];
-    const moved = [...array1];
-    array1.forEach((value: T, index: number) => {
-      if (hasValue(value)) {
-        const otherIndex = array2.indexOf(value);
-        const movedIndex = moved.indexOf(value);
-        if (index !== otherIndex && movedIndex !== otherIndex) {
-          moveItemInArray(moved, movedIndex, otherIndex);
-          result.push(Object.assign({
-            op: 'move',
-            from: '/' + movedIndex,
-            path: '/' + otherIndex
-          }) as MoveOperation);
-        }
+    return this.getMoves(array1, array2).map((move) => Object.assign({
+      op: 'move',
+      from: '/' + move[0],
+      path: '/' + move[1],
+    }) as MoveOperation);
+  }
+
+  /**
+   * Determine a set of moves required to transform array1 into array2
+   * The moves are returned as an array of pairs of numbers where the first number is the original index and the second
+   * is the new index
+   * It is assumed the operations are executed in the order they're returned (and not simultaneously)
+   * @param array1
+   * @param array2
+   */
+  private getMoves(array1: any[], array2: any[]): number[][] {
+    const moved = [...array2];
+
+    return array1.reduce((moves, item, index) => {
+      if (hasValue(item) && item !== moved[index]) {
+        const last = moved.lastIndexOf(item);
+        moveItemInArray(moved, last, index);
+        moves.unshift([index, last]);
       }
-    });
-    return result;
+      return moves;
+    }, []);
   }
 }
diff --git a/src/app/core/data/base-response-parsing.service.spec.ts b/src/app/core/data/base-response-parsing.service.spec.ts
index da9fa7a643..f6707d3582 100644
--- a/src/app/core/data/base-response-parsing.service.spec.ts
+++ b/src/app/core/data/base-response-parsing.service.spec.ts
@@ -1,9 +1,9 @@
 /* eslint-disable max-classes-per-file */
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { GetRequest} from './request.models';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { BaseResponseParsingService } from './base-response-parsing.service';
+import { GetRequest } from './request.models';
 import { RestRequest } from './rest-request.model';
 
 class TestService extends BaseResponseParsingService {
@@ -35,7 +35,7 @@ describe('BaseResponseParsingService', () => {
   beforeEach(() => {
     obj = undefined;
     objectCache = jasmine.createSpyObj('objectCache', {
-      add: {}
+      add: {},
     });
     service = new TestService(objectCache);
   });
@@ -58,8 +58,8 @@ describe('BaseResponseParsingService', () => {
       beforeEach(() => {
         obj = Object.assign(new DSpaceObject(), {
           _links: {
-            self: { href: 'obj-selflink' }
-          }
+            self: { href: 'obj-selflink' },
+          },
         });
       });
 
@@ -79,8 +79,8 @@ describe('BaseResponseParsingService', () => {
         data = {
           type: 'NotARealType',
           _links: {
-            self: { href: 'data-selflink' }
-          }
+            self: { href: 'data-selflink' },
+          },
         };
       });
 
diff --git a/src/app/core/data/base-response-parsing.service.ts b/src/app/core/data/base-response-parsing.service.ts
index 18e6623683..63b4961b31 100644
--- a/src/app/core/data/base-response-parsing.service.ts
+++ b/src/app/core/data/base-response-parsing.service.ts
@@ -1,14 +1,21 @@
 /* eslint-disable max-classes-per-file */
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
+import { environment } from '../../../environments/environment';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { getClassForType } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { Serializer } from '../serializer';
-import { PageInfo } from '../shared/page-info.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { GenericConstructor } from '../shared/generic-constructor';
-import { PaginatedList, buildPaginatedList } from './paginated-list.model';
-import { getClassForType } from '../cache/builders/build-decorators';
-import { environment } from '../../../environments/environment';
-import { CacheableObject } from '../cache/cacheable-object.model';
+import { PageInfo } from '../shared/page-info.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from './paginated-list.model';
 import { RestRequest } from './rest-request.model';
 
 
@@ -64,7 +71,7 @@ export abstract class BaseResponseParsingService {
                 } else if (isRestDataObject(data._embedded[property])) {
                   object[property] = this.retrieveObjectOrUrl(parsedObj);
                 } else if (Array.isArray(parsedObj)) {
-                    object[property] = parsedObj.map((obj) => this.retrieveObjectOrUrl(obj));
+                  object[property] = parsedObj.map((obj) => this.retrieveObjectOrUrl(obj));
                 }
               }
             });
@@ -96,14 +103,14 @@ export abstract class BaseResponseParsingService {
       list = this.flattenSingleKeyObject(list);
     }
     const page: ObjectDomain[] = this.processArray(list, request);
-    return buildPaginatedList<ObjectDomain>(pageInfo, page,);
+    return buildPaginatedList<ObjectDomain>(pageInfo, page);
   }
 
   protected processArray<ObjectDomain>(data: any, request: RestRequest): ObjectDomain[] {
     let array: ObjectDomain[] = [];
     data.forEach((datum) => {
-        array = [...array, this.process(datum, request)];
-      }
+      array = [...array, this.process(datum, request)];
+    },
     );
     return array;
   }
@@ -139,7 +146,7 @@ export abstract class BaseResponseParsingService {
       let dataJSON: string;
       if (hasValue(data._embedded)) {
         dataJSON = JSON.stringify(Object.assign({}, data, {
-          _embedded: '...'
+          _embedded: '...',
         }));
       } else {
         dataJSON = JSON.stringify(data);
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 17532f477a..3f44ad5e5a 100644
--- a/src/app/core/data/base/base-data.service.spec.ts
+++ b/src/app/core/data/base/base-data.service.spec.ts
@@ -5,22 +5,37 @@
  *
  * http://www.dspace.org/license/
  */
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf, combineLatest as observableCombineLatest } from 'rxjs';
-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';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  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 {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { HALLink } from '../../shared/hal-link.model';
+import { FindListOptions } from '../find-list-options.model';
 import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
-import { fakeAsync, tick } from '@angular/core/testing';
 import { BaseDataService } from './base-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 const endpoint = 'https://rest.api/core';
 
@@ -46,38 +61,22 @@ describe('BaseDataService', () => {
   let requestService;
   let halService;
   let rdbService;
-  let objectCache;
+  let objectCache: ObjectCacheServiceStub;
   let selfLink;
   let linksToFollow;
   let testScheduler;
-  let remoteDataMocks;
+  let remoteDataMocks: { [responseType: string]: RemoteData<any> };
+  let remoteDataPageMocks: { [responseType: string]: RemoteData<any> };
 
   function initTestService(): TestService {
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
     rdbService = getMockRemoteDataBuildService();
-    objectCache = {
-
-      addPatch: () => {
-        /* empty */
-      },
-      getObjectBySelfLink: () => {
-        /* empty */
-      },
-      getByHref: () => {
-        /* empty */
-      },
-      addDependency: () => {
-        /* empty */
-      },
-      removeDependents: () => {
-        /* empty */
-      },
-    } as any;
+    objectCache = new ObjectCacheServiceStub();
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
-      followLink('b')
+      followLink('b'),
     ];
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -88,23 +87,53 @@ describe('BaseDataService', () => {
 
     const timeStamp = new Date().getTime();
     const msToLive = 15 * 60 * 1000;
-    const payload = { foo: 'bar' };
+    const payload = {
+      foo: 'bar',
+      followLink1: {},
+      followLink2: {},
+      _links: {
+        self: Object.assign(new HALLink(), {
+          href: 'self-test-link',
+        }),
+        followLink1: Object.assign(new HALLink(), {
+          href: 'follow-link-1',
+        }),
+        followLink2: [
+          Object.assign(new HALLink(), {
+            href: 'follow-link-2-1',
+          }),
+          Object.assign(new HALLink(), {
+            href: 'follow-link-2-2',
+          }),
+        ],
+      },
+    };
     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),
     };
+    remoteDataPageMocks = {
+      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, createPaginatedList([payload]), statusCodeSuccess),
+      SuccessStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.SuccessStale, undefined, createPaginatedList([payload]), statusCodeSuccess),
+      Error: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.Error, errorMessage, undefined, statusCodeError),
+      ErrorStale: new RemoteData(timeStamp, msToLive, timeStamp, RequestEntryState.ErrorStale, errorMessage, undefined, statusCodeError),
+    };
 
     return new TestService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
     );
   }
@@ -303,19 +332,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);
@@ -354,19 +385,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, false, true, ...linksToFollow)).toBe(expected, values);
@@ -375,6 +408,27 @@ describe('BaseDataService', () => {
 
     });
 
+    it('should link all the followLinks of a cached object by calling addDependency', () => {
+      spyOn(objectCache, 'addDependency').and.callThrough();
+      testScheduler.run(({ cold, expectObservable, flush }) => {
+        spyOn(rdbService, 'buildSingle').and.returnValue(cold('a-b-c-d', {
+          a: remoteDataMocks.Success,
+          b: remoteDataMocks.RequestPending,
+          c: remoteDataMocks.ResponsePending,
+          d: remoteDataMocks.Success,
+        }));
+        const expected = '--b-c-d';
+        const values = {
+          b: remoteDataMocks.RequestPending,
+          c: remoteDataMocks.ResponsePending,
+          d: remoteDataMocks.Success,
+        };
+
+        expectObservable(service.findByHref(selfLink, false, false, ...linksToFollow)).toBe(expected, values);
+        flush();
+        expect(objectCache.addDependency).toHaveBeenCalledTimes(3);
+      });
+    });
   });
 
   describe(`findListByHref`, () => {
@@ -387,8 +441,8 @@ describe('BaseDataService', () => {
     it(`should call buildHrefFromFindOptions with href and linksToFollow`, () => {
       testScheduler.run(({ cold }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.Success }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect(service.buildHrefFromFindOptions).toHaveBeenCalledWith(selfLink, findListOptions, [], ...linksToFollow);
@@ -398,8 +452,8 @@ describe('BaseDataService', () => {
     it(`should call createAndSendGetRequest with the result from buildHrefFromFindOptions and useCachedVersionIfAvailable`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.Success }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect((service as any).createAndSendGetRequest).toHaveBeenCalledWith(jasmine.anything(), true);
@@ -414,8 +468,8 @@ describe('BaseDataService', () => {
     it(`should call rdbService.buildList with the result from buildHrefFromFindOptions and linksToFollow`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.Success }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect(rdbService.buildList).toHaveBeenCalledWith(jasmine.anything() as any, ...linksToFollow);
@@ -426,12 +480,12 @@ describe('BaseDataService', () => {
     it(`should call reRequestStaleRemoteData with reRequestOnStale and the exact same findListByHref call as a callback`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue('bingo!');
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
-        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.SuccessStale }));
+        spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: remoteDataPageMocks.SuccessStale }));
 
         service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow);
         expect((service as any).reRequestStaleRemoteData.calls.argsFor(0)[0]).toBeTrue();
-        spyOn(service, 'findListByHref').and.returnValue(cold('a', { a: remoteDataMocks.SuccessStale }));
+        spyOn(service, 'findListByHref').and.returnValue(cold('a', { a: remoteDataPageMocks.SuccessStale }));
         // prove that the spy we just added hasn't been called yet
         expect(service.findListByHref).not.toHaveBeenCalled();
         // call the callback passed to reRequestStaleRemoteData
@@ -446,7 +500,7 @@ describe('BaseDataService', () => {
     it(`should return a the output from reRequestStaleRemoteData`, () => {
       testScheduler.run(({ cold, expectObservable }) => {
         spyOn(service, 'buildHrefFromFindOptions').and.returnValue(selfLink);
-        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataMocks.Success }));
+        spyOn(rdbService, 'buildList').and.returnValue(cold('a', { a: remoteDataPageMocks.Success }));
         spyOn(service as any, 'reRequestStaleRemoteData').and.returnValue(() => cold('a', { a: 'bingo!' }));
         const expected = 'a';
         const values = {
@@ -466,19 +520,19 @@ describe('BaseDataService', () => {
       it(`should emit a cached completed RemoteData immediately, and keep emitting if it gets rerequested`, () => {
         testScheduler.run(({ cold, expectObservable }) => {
           spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d-e', {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           }));
           const expected = 'a-b-c-d-e';
           const values = {
-            a: remoteDataMocks.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
@@ -487,19 +541,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: remoteDataPageMocks.ResponsePendingStale,
+            b: remoteDataPageMocks.SuccessStale,
+            c: remoteDataPageMocks.ErrorStale,
+            d: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.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: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, true, true, ...linksToFollow)).toBe(expected, values);
@@ -518,18 +574,18 @@ describe('BaseDataService', () => {
       it(`should not emit a cached completed 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.Success,
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            a: remoteDataPageMocks.Success,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           }));
           const expected = '--b-c-d-e';
           const values = {
-            b: remoteDataMocks.RequestPending,
-            c: remoteDataMocks.ResponsePending,
-            d: remoteDataMocks.Success,
-            e: remoteDataMocks.SuccessStale,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+            e: remoteDataPageMocks.SuccessStale,
           };
 
           expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
@@ -538,25 +594,49 @@ 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: remoteDataPageMocks.ResponsePendingStale,
+            b: remoteDataPageMocks.SuccessStale,
+            c: remoteDataPageMocks.ErrorStale,
+            d: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.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: remoteDataPageMocks.RequestPending,
+            e: remoteDataPageMocks.ResponsePending,
+            f: remoteDataPageMocks.Success,
+            g: remoteDataPageMocks.SuccessStale,
           };
 
+
           expectObservable(service.findListByHref(selfLink, findListOptions, false, true, ...linksToFollow)).toBe(expected, values);
         });
       });
 
+      it('should link all the followLinks of the cached objects by calling addDependency', () => {
+        spyOn(objectCache, 'addDependency').and.callThrough();
+        testScheduler.run(({ cold, expectObservable, flush }) => {
+          spyOn(rdbService, 'buildList').and.returnValue(cold('a-b-c-d', {
+            a: remoteDataPageMocks.SuccessStale,
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+          }));
+          const expected = '--b-c-d';
+          const values = {
+            b: remoteDataPageMocks.RequestPending,
+            c: remoteDataPageMocks.ResponsePending,
+            d: remoteDataPageMocks.Success,
+          };
+
+          expectObservable(service.findListByHref(selfLink, findListOptions, false, false, ...linksToFollow)).toBe(expected, values);
+          flush();
+          expect(objectCache.addDependency).toHaveBeenCalledTimes(3);
+        });
+      });
     });
   });
 
@@ -566,8 +646,8 @@ describe('BaseDataService', () => {
     beforeEach(() => {
       getByHrefSpy = spyOn(objectCache, 'getByHref').and.returnValue(observableOf({
         requestUUIDs: ['request1', 'request2', 'request3'],
-        dependentRequestUUIDs: ['request4', 'request5']
-      }));
+        dependentRequestUUIDs: ['request4', 'request5'],
+      } as ObjectCacheEntry));
 
     });
 
@@ -641,6 +721,62 @@ describe('BaseDataService', () => {
     });
   });
 
+  describe('hasCachedResponse', () => {
+    it('should return false when the request will be dispatched', (done) => {
+      const result = service.hasCachedResponse('test-href');
+
+      result.subscribe((hasCachedResponse) => {
+        expect(hasCachedResponse).toBeFalse();
+        done();
+      });
+    });
+
+    it('should return true when the request will not be dispatched', (done) => {
+      (requestService.shouldDispatchRequest as jasmine.Spy).and.returnValue(false);
+      const result = service.hasCachedResponse('test-href');
+
+      result.subscribe((hasCachedResponse) => {
+        expect(hasCachedResponse).toBeTrue();
+        done();
+      });
+    });
+  });
+
+  describe('hasCachedErrorResponse', () => {
+    it('should return false when no response is cached', (done) => {
+      spyOn(service,'hasCachedResponse').and.returnValue(observableOf(false));
+      const result = service.hasCachedErrorResponse('test-href');
+
+      result.subscribe((hasCachedErrorResponse) => {
+        expect(hasCachedErrorResponse).toBeFalse();
+        done();
+      });
+    });
+    it('should return false when no error response is cached', (done) => {
+      spyOn(service,'hasCachedResponse').and.returnValue(observableOf(true));
+      spyOn(rdbService,'buildSingle').and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+      const result = service.hasCachedErrorResponse('test-href');
+
+      result.subscribe((hasCachedErrorResponse) => {
+        expect(hasCachedErrorResponse).toBeFalse();
+        done();
+      });
+    });
+
+    it('should return true when an error response is cached', (done) => {
+      spyOn(service,'hasCachedResponse').and.returnValue(observableOf(true));
+      spyOn(rdbService,'buildSingle').and.returnValue(createFailedRemoteDataObject$());
+
+      const result = service.hasCachedErrorResponse('test-href');
+
+      result.subscribe((hasCachedErrorResponse) => {
+        expect(hasCachedErrorResponse).toBeTrue();
+        done();
+      });
+    });
+  });
+
   describe('addDependency', () => {
     let addDependencySpy;
 
@@ -658,7 +794,7 @@ describe('BaseDataService', () => {
 
       (service as any).addDependency(
         createSuccessfulRemoteDataObject$({ _links: { self: { href: 'object-href' } } }),
-        observableOf('dependsOnHref')
+        observableOf('dependsOnHref'),
       );
       expect(addDependencySpy).toHaveBeenCalled();
     });
@@ -673,7 +809,7 @@ describe('BaseDataService', () => {
 
       (service as any).addDependency(
         createFailedRemoteDataObject$('something went wrong'),
-        observableOf('dependsOnHref')
+        observableOf('dependsOnHref'),
       );
       expect(addDependencySpy).toHaveBeenCalled();
     });
diff --git a/src/app/core/data/base/base-data.service.ts b/src/app/core/data/base/base-data.service.ts
index 85603580a4..d09ee21ee0 100644
--- a/src/app/core/data/base/base-data.service.ts
+++ b/src/app/core/data/base/base-data.service.ts
@@ -6,34 +6,53 @@
  * http://www.dspace.org/license/
  */
 
-import { AsyncSubject, from as observableFrom, Observable, of as observableOf } from 'rxjs';
-import { map, mergeMap, skipWhile, switchMap, take, tap, toArray } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import {
+  AsyncSubject,
+  from as observableFrom,
+  Observable,
+  of as observableOf,
+} 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';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { HALLink } from '../../shared/hal-link.model';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
 import { RemoteData } from '../remote-data';
 import { GetRequest } from '../request.models';
 import { RequestService } from '../request.service';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { FindListOptions } from '../find-list-options.model';
-import { PaginatedList } from '../paginated-list.model';
-import { ObjectCacheEntry } from '../../cache/object-cache.reducer';
-import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALDataService } from './hal-data-service.interface';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
 
 export const EMBED_SEPARATOR = '%2F';
 /**
  * Common functionality for data services.
  * Specific functionality that not all services would need
- * is implemented in "DataService feature" classes (e.g. {@link CreateData}
+ * is implemented in "UpdateDataServiceImpl feature" classes (e.g. {@link CreateData}
  *
- * All DataService (or DataService feature) classes must
+ * All UpdateDataServiceImpl (or UpdateDataServiceImpl feature) classes must
  *   - extend this class (or {@link IdentifiableDataService})
- *   - implement any DataService features it requires in order to forward calls to it
+ *   - implement any UpdateDataServiceImpl features it requires in order to forward calls to it
  *
  * ```
  * export class SomeDataService extends BaseDataService<Something> implements CreateData<Something>, SearchData<Something> {
@@ -235,7 +254,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
             if (hasValue(remoteData) && remoteData.isStale) {
               requestFn();
             }
-          })
+          }),
         );
       } else {
         return source;
@@ -268,15 +287,34 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
-    return this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
+    const response$: Observable<RemoteData<T>> = this.rdbService.buildSingle<T>(requestHref$, ...linksToFollow).pipe(
       // This skip ensures that if a stale object is present in the cache when you do a
       // 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.hasCompleted)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
+    return response$.pipe(
+      // Ensure all followLinks from the cached object are automatically invalidated when invalidating the cached object
+      tap((remoteDataObject: RemoteData<T>) => {
+        if (hasValue(remoteDataObject?.payload?._links)) {
+          for (const followLinkName of Object.keys(remoteDataObject.payload._links)) {
+            // only add the followLinks if they are embedded
+            if (hasValue(remoteDataObject.payload[followLinkName]) && followLinkName !== 'self') {
+              // followLink can be either an individual HALLink or a HALLink[]
+              const followLinksList: HALLink[] = [].concat(remoteDataObject.payload._links[followLinkName]);
+              for (const individualFollowLink of followLinksList) {
+                if (hasValue(individualFollowLink?.href)) {
+                  this.addDependency(response$, individualFollowLink.href);
+                }
+              }
+            }
+          }
+        }
+      }),
+    );
   }
 
   /**
@@ -302,15 +340,38 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
     this.createAndSendGetRequest(requestHref$, useCachedVersionIfAvailable);
 
-    return this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
+    const response$: Observable<RemoteData<PaginatedList<T>>> = this.rdbService.buildList<T>(requestHref$, ...linksToFollow).pipe(
       // This skip ensures that if a stale object is present in the cache when you do a
       // 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.hasCompleted)),
       this.reRequestStaleRemoteData(reRequestOnStale, () =>
         this.findListByHref(href$, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
+    return response$.pipe(
+      // Ensure all followLinks from the cached object are automatically invalidated when invalidating the cached object
+      tap((remoteDataObject: RemoteData<PaginatedList<T>>) => {
+        if (hasValue(remoteDataObject?.payload?.page)) {
+          for (const object of remoteDataObject.payload.page) {
+            if (hasValue(object?._links)) {
+              for (const followLinkName of Object.keys(object._links)) {
+                // only add the followLinks if they are embedded
+                if (hasValue(object[followLinkName]) && followLinkName !== 'self') {
+                  // followLink can be either an individual HALLink or a HALLink[]
+                  const followLinksList: HALLink[] = [].concat(object._links[followLinkName]);
+                  for (const individualFollowLink of followLinksList) {
+                    if (hasValue(individualFollowLink?.href)) {
+                      this.addDependency(response$, individualFollowLink.href);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }),
+    );
   }
 
   /**
@@ -329,7 +390,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
 
       href$.pipe(
         isNotEmptyOperator(),
-        take(1)
+        take(1),
       ).subscribe((href: string) => {
         const requestId = this.requestService.generateRequestId();
         const request = new GetRequest(requestId, href);
@@ -341,9 +402,51 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
     }
   }
 
+  /**
+   * Checks for the provided href whether a response is already cached
+   * @param href$                       The url for which to check whether there is a cached response.
+   *                                    Can be a string or an Observable<string>
+   */
+  hasCachedResponse(href$: string | Observable<string>): Observable<boolean> {
+    if (isNotEmpty(href$)) {
+      if (typeof href$ === 'string') {
+        href$ = observableOf(href$);
+      }
+      return href$.pipe(
+        isNotEmptyOperator(),
+        take(1),
+        map((href: string) => {
+          const requestId = this.requestService.generateRequestId();
+          const request = new GetRequest(requestId, href);
+          return !this.requestService.shouldDispatchRequest(request, true);
+        }),
+      );
+    }
+    throw new Error(`Can't check whether there is a cached response for an empty href$`);
+  }
+
+  /**
+   * Checks for the provided href whether an ERROR response is currently cached
+   * @param href$                       The url for which to check whether there is a cached ERROR response.
+   *                                    Can be a string or an Observable<string>
+   */
+  hasCachedErrorResponse(href$: string | Observable<string>): Observable<boolean> {
+    return this.hasCachedResponse(href$).pipe(
+      switchMap((hasCachedResponse) => {
+        if (hasCachedResponse) {
+          return this.rdbService.buildSingle(href$).pipe(
+            getFirstCompletedRemoteData(),
+            map((rd => rd.hasFailed)),
+          );
+        }
+        return observableOf(false);
+      }),
+    );
+  }
+
   /**
    * Return the links to traverse from the root of the api to the
-   * endpoint this DataService represents
+   * endpoint this UpdateDataServiceImpl represents
    *
    * e.g. if the api root links to 'foo', and the endpoint at 'foo'
    * links to 'bar' the linkPath for the BarDataService would be
@@ -378,7 +481,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
           }
         }),
       ),
-      dependsOnHref$
+      dependsOnHref$,
     );
   }
 
@@ -395,7 +498,7 @@ export class BaseDataService<T extends CacheableObject> implements HALDataServic
       switchMap((oce: ObjectCacheEntry) => {
         return observableFrom([
           ...oce.requestUUIDs,
-          ...oce.dependentRequestUUIDs
+          ...oce.dependentRequestUUIDs,
         ]).pipe(
           mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
           toArray(),
diff --git a/src/app/core/data/base/create-data.spec.ts b/src/app/core/data/base/create-data.spec.ts
index 0b2e0f3930..1248c5ffe4 100644
--- a/src/app/core/data/base/create-data.spec.ts
+++ b/src/app/core/data/base/create-data.spec.ts
@@ -5,23 +5,33 @@
  *
  * http://www.dspace.org/license/
  */
-import { RequestService } from '../request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { CreateData, CreateDataImpl } from './create-data';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-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';
 import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { RequestParam } from '../../cache/models/request-param.model';
 import { RestRequestMethod } from '../rest-request-method';
-import { DSpaceObject } from '../../shared/dspace-object.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './create-data';
 
 /**
  * Tests whether calls to `CreateData` methods are correctly patched through in a concrete data service that implements it
@@ -149,7 +159,7 @@ describe('CreateDataImpl', () => {
   describe('create', () => {
     it('should POST the object to the root endpoint with the given parameters and return the remote data', (done) => {
       const params = [
-        new RequestParam('abc', 123), new RequestParam('def', 456)
+        new RequestParam('abc', 123), new RequestParam('def', 456),
       ];
       buildFromRequestUUIDSpy.and.returnValue(observableOf(remoteDataMocks.Success));
 
diff --git a/src/app/core/data/base/create-data.ts b/src/app/core/data/base/create-data.ts
index 3ffcd9adf2..13216f8796 100644
--- a/src/app/core/data/base/create-data.ts
+++ b/src/app/core/data/base/create-data.ts
@@ -5,22 +5,31 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
-import { RequestParam } from '../../cache/models/request-param.model';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
-import { hasValue, isNotEmptyOperator } from '../../../shared/empty.util';
-import { distinctUntilChanged, map, take, takeWhile } from 'rxjs/operators';
-import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
-import { getClassForType } from '../../cache/builders/build-decorators';
-import { CreateRequest } from '../request.models';
+import {
+  distinctUntilChanged,
+  map,
+  take,
+  takeWhile,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmptyOperator,
+} from '../../../shared/empty.util';
 import { NotificationOptions } from '../../../shared/notifications/models/notification-options.model';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { getClassForType } from '../../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { RequestParam } from '../../cache/models/request-param.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../remote-data';
+import { CreateRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Interface for a data service that can create objects.
@@ -37,7 +46,7 @@ export interface CreateData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to create objects.
+ * A UpdateDataServiceImpl feature to create objects.
  *
  * Concrete data services can use this feature by implementing {@link CreateData}
  * and delegating its method to an inner instance of this class.
@@ -95,7 +104,7 @@ export class CreateDataImpl<T extends CacheableObject> extends BaseDataService<T
     // TODO a dataservice is not the best place to show a notification,
     // this should move up to the components that use this method
     result$.pipe(
-      takeWhile((rd: RemoteData<T>) => rd.isLoading, true)
+      takeWhile((rd: RemoteData<T>) => rd.isLoading, true),
     ).subscribe((rd: RemoteData<T>) => {
       if (rd.hasFailed) {
         this.notificationsService.error('Server Error:', rd.errorMessage, new NotificationOptions(-1));
diff --git a/src/app/core/data/base/data-service.decorator.spec.ts b/src/app/core/data/base/data-service.decorator.spec.ts
index ec4c1c8f6f..296371be69 100644
--- a/src/app/core/data/base/data-service.decorator.spec.ts
+++ b/src/app/core/data/base/data-service.decorator.spec.ts
@@ -6,10 +6,15 @@
  *
  * http://www.dspace.org/license/
  */
+import { v4 as uuidv4 } from 'uuid';
+
 import { ResourceType } from '../../shared/resource-type';
 import { BaseDataService } from './base-data.service';
+import {
+  dataService,
+  getDataServiceFor,
+} from './data-service.decorator';
 import { HALDataService } from './hal-data-service.interface';
-import { dataService, getDataServiceFor } from './data-service.decorator';
 
 class TestService extends BaseDataService<any> {
 }
@@ -28,7 +33,7 @@ let testType;
 
 describe('@dataService/getDataServiceFor', () => {
   beforeEach(() => {
-    testType = new ResourceType('testType-' + new Date().getTime());
+    testType = new ResourceType(`testType-${uuidv4()}`);
   });
 
   it('should register a resourcetype for a dataservice', () => {
diff --git a/src/app/core/data/base/data-service.decorator.ts b/src/app/core/data/base/data-service.decorator.ts
index fbde9bd94f..600fb5e3e3 100644
--- a/src/app/core/data/base/data-service.decorator.ts
+++ b/src/app/core/data/base/data-service.decorator.ts
@@ -6,10 +6,14 @@
  * http://www.dspace.org/license/
  */
 import { InjectionToken } from '@angular/core';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
 import { CacheableObject } from '../../cache/cacheable-object.model';
-import { ResourceType } from '../../shared/resource-type';
 import { GenericConstructor } from '../../shared/generic-constructor';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
+import { ResourceType } from '../../shared/resource-type';
 import { HALDataService } from './hal-data-service.interface';
 
 export const DATA_SERVICE_FACTORY = new InjectionToken<(resourceType: ResourceType) => GenericConstructor<HALDataService<any>>>('getDataServiceFor', {
diff --git a/src/app/core/data/base/delete-data.spec.ts b/src/app/core/data/base/delete-data.spec.ts
index a076473b0f..53d651402f 100644
--- a/src/app/core/data/base/delete-data.spec.ts
+++ b/src/app/core/data/base/delete-data.spec.ts
@@ -5,24 +5,35 @@
  *
  * http://www.dspace.org/license/
  */
-import { constructIdEndpointDefault } from './identifiable-data.service';
-import { RequestService } from '../request.service';
+import {
+  Observable,
+  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 { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { 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 { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
-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';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { TestScheduler } from 'rxjs/testing';
 import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
 import { RequestEntryState } from '../request-entry-state.model';
-import { DeleteData, DeleteDataImpl } from './delete-data';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { RestRequestMethod } from '../rest-request-method';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './delete-data';
+import { constructIdEndpointDefault } from './identifiable-data.service';
 
 /**
  * Tests whether calls to `DeleteData` methods are correctly patched through in a concrete data service that implements it
@@ -34,7 +45,7 @@ export function testDeleteDataImplementation(serviceFactory: () => DeleteData<an
     const ID = '2ce78f3a-791b-4d70-b5eb-753d587bbadd';
     const HREF = 'https://rest.api/core/items/' + ID;
     const COPY_VIRTUAL_METADATA = [
-      'a', 'b', 'c'
+      'a', 'b', 'c',
     ];
 
     beforeAll(() => {
@@ -105,13 +116,13 @@ describe('DeleteDataImpl', () => {
       },
       getByHref: () => {
         /* empty */
-      }
+      },
     } as any;
     notificationsService = {} as NotificationsService;
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
-      followLink('b')
+      followLink('b'),
     ];
 
     testScheduler = new TestScheduler((actual, expected) => {
diff --git a/src/app/core/data/base/delete-data.ts b/src/app/core/data/base/delete-data.ts
index 807d9d838e..e758ee40fa 100644
--- a/src/app/core/data/base/delete-data.ts
+++ b/src/app/core/data/base/delete-data.ts
@@ -5,19 +5,26 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
-import { NoContent } from '../../shared/NoContent.model';
 import { switchMap } from 'rxjs/operators';
-import { DeleteRequest } from '../request.models';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { ConstructIdEndpoint, IdentifiableDataService } from './identifiable-data.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { NoContent } from '../../shared/NoContent.model';
+import { RemoteData } from '../remote-data';
+import { DeleteRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import {
+  ConstructIdEndpoint,
+  IdentifiableDataService,
+} from './identifiable-data.service';
 
 export interface DeleteData<T extends CacheableObject> {
   /**
diff --git a/src/app/core/data/base/find-all-data.spec.ts b/src/app/core/data/base/find-all-data.spec.ts
index 6a73e032d0..f2c48feb76 100644
--- a/src/app/core/data/base/find-all-data.spec.ts
+++ b/src/app/core/data/base/find-all-data.spec.ts
@@ -5,24 +5,33 @@
  *
  * http://www.dspace.org/license/
  */
-import { FindAllData, FindAllDataImpl } from './find-all-data';
-import { FindListOptions } from '../find-list-options.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  Observable,
+  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 { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { TestScheduler } from 'rxjs/testing';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
-import { RequestParam } from '../../cache/models/request-param.model';
-
-import { RequestService } from '../request.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
 import { EMBED_SEPARATOR } from './base-data.service';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './find-all-data';
 
 /**
  * Tests whether calls to `FindAllData` methods are correctly patched through in a concrete data service that implements it
@@ -143,8 +152,8 @@ describe('FindAllDataImpl', () => {
       options = {};
 
       (service as any).getFindAllHref(options).subscribe((value) => {
-          expect(value).toBe(endpoint);
-        },
+        expect(value).toBe(endpoint);
+      },
       );
     });
 
diff --git a/src/app/core/data/base/find-all-data.ts b/src/app/core/data/base/find-all-data.ts
index 57884e537e..0d68689e61 100644
--- a/src/app/core/data/base/find-all-data.ts
+++ b/src/app/core/data/base/find-all-data.ts
@@ -7,18 +7,23 @@
  */
 
 import { Observable } from 'rxjs';
-import { FindListOptions } from '../find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
-import { PaginatedList } from '../paginated-list.model';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../../shared/empty.util';
-import { RequestService } from '../request.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Interface for a data service that list all of its objects.
@@ -42,7 +47,7 @@ export interface FindAllData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to list all objects.
+ * A UpdateDataServiceImpl feature to list all objects.
  *
  * Concrete data services can use this feature by implementing {@link FindAllData}
  * and delegating its method to an inner instance of this class.
@@ -87,10 +92,9 @@ export class FindAllDataImpl<T extends CacheableObject> extends BaseDataService<
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
   getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    let endpoint$: Observable<string>;
     const args = [];
 
-    endpoint$ = this.getBrowseEndpoint(options).pipe(
+    const endpoint$ = this.getBrowseEndpoint(options).pipe(
       filter((href: string) => isNotEmpty(href)),
       map((href: string) => isNotEmpty(linkPath) ? `${href}/${linkPath}` : href),
       distinctUntilChanged(),
diff --git a/src/app/core/data/base/hal-data-service.interface.ts b/src/app/core/data/base/hal-data-service.interface.ts
index 6959399760..1ffdffaa7c 100644
--- a/src/app/core/data/base/hal-data-service.interface.ts
+++ b/src/app/core/data/base/hal-data-service.interface.ts
@@ -6,11 +6,12 @@
  * http://www.dspace.org/license/
  */
 import { Observable } from 'rxjs';
+
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
+import { HALResource } from '../../shared/hal-resource.model';
 import { FindListOptions } from '../find-list-options.model';
 import { PaginatedList } from '../paginated-list.model';
-import { HALResource } from '../../shared/hal-resource.model';
+import { RemoteData } from '../remote-data';
 
 /**
  * An interface defining the minimum functionality needed for a data service to resolve HAL resources.
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..528d6c4945 100644
--- a/src/app/core/data/base/identifiable-data.service.spec.ts
+++ b/src/app/core/data/base/identifiable-data.service.spec.ts
@@ -5,21 +5,25 @@
  *
  * http://www.dspace.org/license/
  */
-import { FindListOptions } from '../find-list-options.model';
+import {
+  Observable,
+  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 { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
 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 { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { IdentifiableDataService } from './identifiable-data.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
 import { EMBED_SEPARATOR } from './base-data.service';
+import { IdentifiableDataService } from './identifiable-data.service';
 
 const endpoint = 'https://rest.api/core';
 
@@ -63,12 +67,12 @@ describe('IdentifiableDataService', () => {
       },
       getByHref: () => {
         /* empty */
-      }
+      },
     } as any;
     selfLink = 'https://rest.api/endpoint/1698f1d3-be98-4c51-9fd8-6bfedcbd59b7';
     linksToFollow = [
       followLink('a'),
-      followLink('b')
+      followLink('b'),
     ];
 
     testScheduler = new TestScheduler((actual, expected) => {
@@ -132,7 +136,7 @@ describe('IdentifiableDataService', () => {
         resourceIdMock,
         followLink('bundles', { shouldEmbed: false }),
         followLink('owningCollection', { shouldEmbed: false }),
-        followLink('templateItemOf')
+        followLink('templateItemOf'),
       );
       expect(result).toEqual(expected);
     });
diff --git a/src/app/core/data/base/identifiable-data.service.ts b/src/app/core/data/base/identifiable-data.service.ts
index 904f925765..da3167903e 100644
--- a/src/app/core/data/base/identifiable-data.service.ts
+++ b/src/app/core/data/base/identifiable-data.service.ts
@@ -5,16 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-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 { RemoteData } from '../remote-data';
-import { BaseDataService } from './base-data.service';
-import { RequestService } from '../request.service';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Shorthand type for the method to construct an ID endpoint.
diff --git a/src/app/core/data/base/patch-data.spec.ts b/src/app/core/data/base/patch-data.spec.ts
index a55b1229b8..03c15199a7 100644
--- a/src/app/core/data/base/patch-data.spec.ts
+++ b/src/app/core/data/base/patch-data.spec.ts
@@ -6,28 +6,38 @@
  * http://www.dspace.org/license/
  */
 /* eslint-disable max-classes-per-file */
-import { RequestService } from '../request.service';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import {
+  Observable,
+  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 { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { 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 { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
-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';
-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 { PatchData, PatchDataImpl } from './patch-data';
-import { ChangeAnalyzer } from '../change-analyzer';
-import { Item } from '../../shared/item.model';
-import { compare, Operation } from 'fast-json-patch';
-import { PatchRequest } from '../request.models';
 import { DSpaceObject } from '../../shared/dspace-object.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { constructIdEndpointDefault } from './identifiable-data.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { Item } from '../../shared/item.model';
+import { ChangeAnalyzer } from '../change-analyzer';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { PatchRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
 import { RestRequestMethod } from '../rest-request-method';
+import { constructIdEndpointDefault } from './identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './patch-data';
 
 /**
  * Tests whether calls to `PatchData` methods are correctly patched through in a concrete data service that implements it
@@ -182,15 +192,15 @@ describe('PatchDataImpl', () => {
       _links: {
         self: {
           href: 'dso-href',
-        }
-      }
+        },
+      },
     };
     const operations = [
       Object.assign({
         op: 'move',
         from: '/1',
-        path: '/5'
-      }) as Operation
+        path: '/5',
+      }) as Operation,
     ];
 
     it('should send a PatchRequest', () => {
@@ -224,12 +234,12 @@ describe('PatchDataImpl', () => {
 
       dso = Object.assign(new DSpaceObject(), {
         _links: { self: { href: selfLink } },
-        metadata: [{ key: 'dc.title', value: name1 }]
+        metadata: [{ key: 'dc.title', value: name1 }],
       });
 
       dso2 = Object.assign(new DSpaceObject(), {
         _links: { self: { href: selfLink } },
-        metadata: [{ key: 'dc.title', value: name2 }]
+        metadata: [{ key: 'dc.title', value: name2 }],
       });
 
       spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(dso));
diff --git a/src/app/core/data/base/patch-data.ts b/src/app/core/data/base/patch-data.ts
index e30c394a34..adcf98ef94 100644
--- a/src/app/core/data/base/patch-data.ts
+++ b/src/app/core/data/base/patch-data.ts
@@ -5,22 +5,36 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
 import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
-import { find, map, mergeMap } from 'rxjs/operators';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { PatchRequest } from '../request.models';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../shared/operators';
-import { ChangeAnalyzer } from '../change-analyzer';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { RestRequestMethod } from '../rest-request-method';
-import { ConstructIdEndpoint, IdentifiableDataService } from './identifiable-data.service';
+import {
+  find,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../shared/operators';
+import { ChangeAnalyzer } from '../change-analyzer';
+import { RemoteData } from '../remote-data';
+import { PatchRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { RestRequestMethod } from '../rest-request-method';
+import {
+  ConstructIdEndpoint,
+  IdentifiableDataService,
+} from './identifiable-data.service';
 
 /**
  * Interface for a data service that can patch and update objects.
@@ -54,7 +68,7 @@ export interface PatchData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to patch and update objects.
+ * A UpdateDataServiceImpl feature to patch and update objects.
  *
  * Concrete data services can use this feature by implementing {@link PatchData}
  * and delegating its method to an inner instance of this class.
diff --git a/src/app/core/data/base/put-data.spec.ts b/src/app/core/data/base/put-data.spec.ts
index 6287fe91b1..1430bb3106 100644
--- a/src/app/core/data/base/put-data.spec.ts
+++ b/src/app/core/data/base/put-data.spec.ts
@@ -6,20 +6,27 @@
  * http://www.dspace.org/license/
  */
 
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindListOptions } from '../find-list-options.model';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+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 { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { RemoteData } from '../remote-data';
-import { RequestEntryState } from '../request-entry-state.model';
-import { PutData, PutDataImpl } from './put-data';
-import { RestRequestMethod } from '../rest-request-method';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
+import { RestRequestMethod } from '../rest-request-method';
+import {
+  PutData,
+  PutDataImpl,
+} from './put-data';
 
 /**
  * Tests whether calls to `PutData` methods are correctly patched through in a concrete data service that implements it
@@ -127,7 +134,7 @@ describe('PutDataImpl', () => {
       metadata: {           // recognized properties will be serialized
         ['dc.title']: [
           { language: 'en', value: 'some object' },
-        ]
+        ],
       },
       data: [ 1, 2, 3, 4 ], // unrecognized properties won't be serialized
       _links: { self: { href: selfLink } },
@@ -144,7 +151,7 @@ describe('PutDataImpl', () => {
           method: RestRequestMethod.PUT,
           body: {  // _links are not serialized
             uuid: obj.uuid,
-            metadata: obj.metadata
+            metadata: obj.metadata,
           },
         }));
         done();
diff --git a/src/app/core/data/base/put-data.ts b/src/app/core/data/base/put-data.ts
index bd2a8d2929..e9d2b01eb8 100644
--- a/src/app/core/data/base/put-data.ts
+++ b/src/app/core/data/base/put-data.ts
@@ -5,18 +5,19 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../remote-data';
+
+import { hasValue } from '../../../shared/empty.util';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { DSpaceSerializer } from '../../dspace-rest/dspace.serializer';
 import { GenericConstructor } from '../../shared/generic-constructor';
-import { PutRequest } from '../request.models';
-import { hasValue } from '../../../shared/empty.util';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { RemoteData } from '../remote-data';
+import { PutRequest } from '../request.models';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Interface for a data service that can send PUT requests.
@@ -31,7 +32,7 @@ export interface PutData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to send PUT requests.
+ * A UpdateDataServiceImpl feature to send PUT requests.
  *
  * Concrete data services can use this feature by implementing {@link PutData}
  * and delegating its method to an inner instance of this class.
@@ -55,7 +56,7 @@ export class PutDataImpl<T extends CacheableObject> extends BaseDataService<T> i
    */
   put(object: T): Observable<RemoteData<T>> {
     const requestId = this.requestService.generateRequestId();
-    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<{}>).serialize(object);
+    const serializedObject = new DSpaceSerializer(object.constructor as GenericConstructor<unknown>).serialize(object);
     const request = new PutRequest(requestId, object._links.self.href, serializedObject);
 
     if (hasValue(this.responseMsToLive)) {
diff --git a/src/app/core/data/base/search-data.spec.ts b/src/app/core/data/base/search-data.spec.ts
index 31dddeddfc..af9f87bf2c 100644
--- a/src/app/core/data/base/search-data.spec.ts
+++ b/src/app/core/data/base/search-data.spec.ts
@@ -5,12 +5,17 @@
  *
  * http://www.dspace.org/license/
  */
-import { constructSearchEndpointDefault, SearchData, SearchDataImpl } from './search-data';
-import { FindListOptions } from '../find-list-options.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { of as observableOf } from 'rxjs';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+
 import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { FindListOptions } from '../find-list-options.model';
+import {
+  constructSearchEndpointDefault,
+  SearchData,
+  SearchDataImpl,
+} from './search-data';
 
 /**
  * Tests whether calls to `SearchData` methods are correctly patched through in a concrete data service that implements it
diff --git a/src/app/core/data/base/search-data.ts b/src/app/core/data/base/search-data.ts
index 536d6d6e25..f758affa28 100644
--- a/src/app/core/data/base/search-data.ts
+++ b/src/app/core/data/base/search-data.ts
@@ -5,19 +5,26 @@
  *
  * http://www.dspace.org/license/
  */
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { BaseDataService } from './base-data.service';
 import { Observable } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
-import { hasNoValue, isNotEmpty } from '../../../shared/empty.util';
-import { FindListOptions } from '../find-list-options.model';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
-import { PaginatedList } from '../paginated-list.model';
-import { RequestService } from '../request.service';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { BaseDataService } from './base-data.service';
 
 /**
  * Shorthand type for method to construct a search endpoint
@@ -51,7 +58,7 @@ export interface SearchData<T extends CacheableObject> {
 }
 
 /**
- * A DataService feature to search for objects.
+ * A UpdateDataServiceImpl feature to search for objects.
  *
  * Concrete data services can use this feature by implementing {@link SearchData}
  * and delegating its method to an inner instance of this class.
@@ -112,10 +119,9 @@ export class SearchDataImpl<T extends CacheableObject> extends BaseDataService<T
    * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
    */
   getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
-    let result$: Observable<string>;
     const args = [];
 
-    result$ = this.getSearchEndpoint(searchMethod);
+    const result$ = this.getSearchEndpoint(searchMethod);
 
     return result$.pipe(map((result: string) => this.buildHrefFromFindOptions(result, options, args, ...linksToFollow)));
   }
diff --git a/src/app/core/data/bitstream-data.service.spec.ts b/src/app/core/data/bitstream-data.service.spec.ts
index c67eaa2d68..95fe5f593f 100644
--- a/src/app/core/data/bitstream-data.service.spec.ts
+++ b/src/app/core/data/bitstream-data.service.spec.ts
@@ -1,20 +1,41 @@
-import { BitstreamDataService } from './bitstream-data.service';
+import { TestBed } from '@angular/core/testing';
+import { cold } from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { ItemMock } from 'src/app/shared/mocks/item.mock';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from 'src/app/shared/remote-data.utils';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { RequestService } from './request.service';
 import { Bitstream } from '../shared/bitstream.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { BitstreamFormatDataService } from './bitstream-format-data.service';
-import { of as observableOf } from 'rxjs';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BitstreamFormatSupportLevel } from '../shared/bitstream-format-support-level';
-import { PutRequest } from './request.models';
-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 { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
+import { Bundle } from '../shared/bundle.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { BitstreamDataService } from './bitstream-data.service';
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { BundleDataService } from './bundle-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { RemoteData } from './remote-data';
+import {
+  PatchRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import objectContaining = jasmine.objectContaining;
 
 describe('BitstreamDataService', () => {
   let service: BitstreamDataService;
@@ -23,34 +44,56 @@ describe('BitstreamDataService', () => {
   let halService: HALEndpointService;
   let bitstreamFormatService: BitstreamFormatDataService;
   let rdbService: RemoteDataBuildService;
+  let bundleDataService: BundleDataService;
   const bitstreamFormatHref = 'rest-api/bitstreamformats';
 
-  const bitstream = Object.assign(new Bitstream(), {
-    uuid: 'fake-bitstream',
+  const bitstream1 = Object.assign(new Bitstream(), {
+    id: 'fake-bitstream1',
+    uuid: 'fake-bitstream1',
     _links: {
-      self: { href: 'fake-bitstream-self' }
-    }
+      self: { href: 'fake-bitstream1-self' },
+    },
+  });
+  const bitstream2 = Object.assign(new Bitstream(), {
+    id: 'fake-bitstream2',
+    uuid: 'fake-bitstream2',
+    _links: {
+      self: { href: 'fake-bitstream2-self' },
+    },
   });
   const format = Object.assign(new BitstreamFormat(), {
     id: '2',
     shortDescription: 'PNG',
     description: 'Portable Network Graphics',
-    supportLevel: BitstreamFormatSupportLevel.Known
+    supportLevel: BitstreamFormatSupportLevel.Known,
   });
   const url = 'fake-bitstream-url';
 
   beforeEach(() => {
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     requestService = getMockRequestService();
     halService = Object.assign(new HALEndpointServiceStub(url));
     bitstreamFormatService = jasmine.createSpyObj('bistreamFormatService', {
-      getBrowseEndpoint: observableOf(bitstreamFormatHref)
+      getBrowseEndpoint: observableOf(bitstreamFormatHref),
     });
+
     rdbService = getMockRemoteDataBuildService();
 
-    service = new BitstreamDataService(requestService, rdbService, objectCache, halService, null, bitstreamFormatService, null, null);
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: ObjectCacheService, useValue: objectCache },
+        { provide: RequestService, useValue: requestService },
+        { provide: HALEndpointService, useValue: halService },
+        { provide: BitstreamFormatDataService, useValue: bitstreamFormatService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: DSOChangeAnalyzer, useValue: {} },
+        { provide: NotificationsService, useValue: {} },
+      ],
+    });
+    service = TestBed.inject(BitstreamDataService);
+    bundleDataService = TestBed.inject(BundleDataService);
   });
 
   describe('composition', () => {
@@ -62,11 +105,75 @@ describe('BitstreamDataService', () => {
 
   describe('when updating the bitstream\'s format', () => {
     beforeEach(() => {
-      service.updateFormat(bitstream, format);
+      service.updateFormat(bitstream1, format);
     });
 
     it('should send a put request', () => {
       expect(requestService.send).toHaveBeenCalledWith(jasmine.any(PutRequest));
     });
   });
+
+  describe('removeMultiple', () => {
+    function mockBuildFromRequestUUIDAndAwait(requestUUID$: string | Observable<string>, callback: (rd?: RemoteData<any>) => Observable<unknown>, ..._linksToFollow: FollowLinkConfig<any>[]): Observable<RemoteData<any>> {
+      callback();
+      return;
+    }
+
+    beforeEach(() => {
+      spyOn(service, 'invalidateByHref');
+      spyOn(rdbService, 'buildFromRequestUUIDAndAwait').and.callFake((requestUUID$: string | Observable<string>, callback: (rd?: RemoteData<any>) => Observable<unknown>, ...linksToFollow: FollowLinkConfig<any>[]) => mockBuildFromRequestUUIDAndAwait(requestUUID$, callback, ...linksToFollow));
+    });
+
+    it('should be able to 1 bitstream', () => {
+      service.removeMultiple([bitstream1]);
+
+      expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+        href: `${url}/bitstreams`,
+        body: [
+          { op: 'remove', path: '/bitstreams/fake-bitstream1' },
+        ],
+      } as PatchRequest));
+      expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream1-self');
+    });
+
+    describe('findPrimaryBitstreamByItemAndName', () => {
+      it('should return primary bitstream', () => {
+        const exprected$ = cold('(a|)', { a: bitstream1 } );
+        const bundle = Object.assign(new Bundle(), {
+          primaryBitstream: observableOf(createSuccessfulRemoteDataObject(bitstream1)),
+        });
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+
+      it('should return null if primary bitstream has not be succeeded ', () => {
+        const exprected$ = cold('(a|)', { a: null } );
+        const bundle = Object.assign(new Bundle(), {
+          primaryBitstream: observableOf(createFailedRemoteDataObject()),
+        });
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createSuccessfulRemoteDataObject(bundle)));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+
+      it('should return EMPTY if nothing where found', () => {
+        const exprected$ = cold('(|)', {} );
+        spyOn(bundleDataService, 'findByItemAndName').and.returnValue(observableOf(createFailedRemoteDataObject<Bundle>()));
+        expect(service.findPrimaryBitstreamByItemAndName(ItemMock, 'ORIGINAL')).toBeObservable(exprected$);
+      });
+    });
+
+    it('should be able to delete multiple bitstreams', () => {
+      service.removeMultiple([bitstream1, bitstream2]);
+
+      expect(requestService.send).toHaveBeenCalledWith(objectContaining({
+        href: `${url}/bitstreams`,
+        body: [
+          { op: 'remove', path: '/bitstreams/fake-bitstream1' },
+          { op: 'remove', path: '/bitstreams/fake-bitstream2' },
+        ],
+      } as PatchRequest));
+      expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream1-self');
+      expect(service.invalidateByHref).toHaveBeenCalledWith('fake-bitstream2-self');
+    });
+  });
 });
diff --git a/src/app/core/data/bitstream-data.service.ts b/src/app/core/data/bitstream-data.service.ts
index 6bdcefe187..bc89a54649 100644
--- a/src/app/core/data/bitstream-data.service.ts
+++ b/src/app/core/data/bitstream-data.service.ts
@@ -1,39 +1,71 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  Operation,
+  RemoveOperation,
+} from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  EMPTY,
+  Observable,
+} 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 { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Bitstream } from '../shared/bitstream.model';
 import { BITSTREAM } from '../shared/bitstream.resource-type';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { Bundle } from '../shared/bundle.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { BundleDataService } from './bundle-data.service';
-import { buildPaginatedList, PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import { PutRequest } from './request.models';
-import { RequestService } from './request.service';
-import { BitstreamFormatDataService } from './bitstream-format-data.service';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PageInfo } from '../shared/page-info.model';
-import { RequestParam } from '../cache/models/request-param.model';
-import { sendRequest } from '../shared/request.operators';
-import { FindListOptions } from './find-list-options.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RestRequestMethod } from './rest-request-method';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NoContent } from '../shared/NoContent.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { PageInfo } from '../shared/page-info.model';
+import { sendRequest } from '../shared/request.operators';
 import { dataService } from './base/data-service.decorator';
-import { Operation } from 'fast-json-patch';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { BundleDataService } from './bundle-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import {
+  PatchRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * A service to retrieve {@link Bitstream}s from the REST API
@@ -107,7 +139,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
         } else {
           return [bundleRD as any];
         }
-      })
+      }),
     );
   }
 
@@ -120,10 +152,10 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     const requestId = this.requestService.generateRequestId();
     const bitstreamHref$ = this.getBrowseEndpoint().pipe(
       map((href: string) => `${href}/${bitstream.id}`),
-      switchMap((href: string) => this.halService.getEndpoint('format', href))
+      switchMap((href: string) => this.halService.getEndpoint('format', href)),
     );
     const formatHref$ = this.bitstreamFormatService.getBrowseEndpoint().pipe(
-      map((href: string) => `${href}/${format.id}`)
+      map((href: string) => `${href}/${format.id}`),
     );
     observableCombineLatest([bitstreamHref$, formatHref$]).pipe(
       map(([bitstreamHref, formatHref]) => {
@@ -134,7 +166,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
         return new PutRequest(requestId, bitstreamHref, formatHref, options);
       }),
       sendRequest(this.requestService),
-      take(1)
+      take(1),
     ).subscribe(() => {
       this.requestService.removeByHrefSubstring(bitstream.self + '/format');
     });
@@ -177,7 +209,7 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
     const hrefObs = this.getSearchByHref(
       'byItemHandle',
       { searchParams },
-      ...linksToFollow
+      ...linksToFollow,
     );
 
     return this.findByHref(
@@ -201,6 +233,37 @@ 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
+   * @return {Observable<Bitstream | null>}
+   *    Return an observable that constains primary bitstream information or null
+   */
+  public findPrimaryBitstreamByItemAndName(item: Item, bundleName: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<Bitstream | null> {
+    return this.bundleService.findByItemAndName(item, bundleName, useCachedVersionIfAvailable, reRequestOnStale, 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
    *
@@ -277,4 +340,34 @@ export class BitstreamDataService extends IdentifiableDataService<Bitstream> imp
   deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.deleteByHref(href, copyVirtualMetadata);
   }
+
+  /**
+   * Delete multiple {@link Bitstream}s at once by sending a PATCH request to the backend
+   *
+   * @param bitstreams The bitstreams that should be removed
+   */
+  removeMultiple(bitstreams: Bitstream[]): Observable<RemoteData<NoContent>> {
+    const operations: RemoveOperation[] = bitstreams.map((bitstream: Bitstream) => {
+      return {
+        op: 'remove',
+        path: `/bitstreams/${bitstream.id}`,
+      };
+    });
+    const requestId: string = this.requestService.generateRequestId();
+
+    const hrefObs: Observable<string> = this.halService.getEndpoint(this.linkPath);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+    ).subscribe((href: string) => {
+      const request = new PatchRequest(requestId, href, operations);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => observableCombineLatest(bitstreams.map((bitstream: Bitstream) => this.invalidateByHref(bitstream._links.self.href))));
+  }
+
 }
diff --git a/src/app/core/data/bitstream-format-data.service.spec.ts b/src/app/core/data/bitstream-format-data.service.spec.ts
index 15efebe8c7..234326d453 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -1,21 +1,36 @@
-import { BitstreamFormatDataService } from './bitstream-format-data.service';
-import { RestResponse } from '../cache/response.models';
-import { Observable, of as observableOf } from 'rxjs';
-import { Action, Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { waitForAsync } from '@angular/core/testing';
-import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import {
+  Action,
+  Store,
+} from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import {
+  BitstreamFormatsRegistryDeselectAction,
+  BitstreamFormatsRegistryDeselectAllAction,
+  BitstreamFormatsRegistrySelectAction,
+} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { BitstreamFormatDataService } from './bitstream-format-data.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('BitstreamFormatDataService', () => {
   let service: BitstreamFormatDataService;
@@ -31,19 +46,19 @@ describe('BitstreamFormatDataService', () => {
   const store = {
     dispatch(action: Action) {
       // Do Nothing
-    }
+    },
   } as Store<CoreState>;
 
   const requestUUIDs = ['some', 'uuid'];
 
   const objectCache = jasmine.createSpyObj('objectCache', {
-    getByHref: observableOf({ requestUUIDs })
+    getByHref: observableOf({ requestUUIDs }),
   }) as ObjectCacheService;
 
   const halEndpointService = {
     getEndpoint(linkPath: string): Observable<string> {
       return cold('a', { a: bitstreamFormatsEndpoint });
-    }
+    },
   } as HALEndpointService;
 
   const notificationsService = {} as NotificationsService;
@@ -83,7 +98,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -104,7 +119,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -127,7 +142,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -149,7 +164,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -174,7 +189,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
     }));
@@ -198,12 +213,12 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       const halService = {
         getEndpoint(linkPath: string): Observable<string> {
           return observableOf(bitstreamFormatsEndpoint);
-        }
+        },
       } as HALEndpointService;
       service = initTestService(halService);
       service.clearBitStreamFormatRequests().subscribe();
@@ -222,7 +237,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
       spyOn(store, 'dispatch');
@@ -245,7 +260,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
       spyOn(store, 'dispatch');
@@ -268,7 +283,7 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: cold('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       service = initTestService(halEndpointService);
       spyOn(store, 'dispatch');
@@ -289,12 +304,12 @@ describe('BitstreamFormatDataService', () => {
         getByUUID: hot('a', { a: responseCacheEntry }),
         setStaleByUUID: observableOf(true),
         generateRequestId: 'request-id',
-        removeByHrefSubstring: {}
+        removeByHrefSubstring: {},
       });
       const halService = {
         getEndpoint(linkPath: string): Observable<string> {
           return observableOf(bitstreamFormatsEndpoint);
-        }
+        },
       } as HALEndpointService;
       service = initTestService(halService);
     }));
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index 0104389815..1006e4eae0 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -1,30 +1,52 @@
 import { Injectable } from '@angular/core';
-import { createSelector, select, Store } from '@ngrx/store';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, tap } from 'rxjs/operators';
-import { BitstreamFormatsRegistryDeselectAction, BitstreamFormatsRegistryDeselectAllAction, BitstreamFormatsRegistrySelectAction } from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
+import {
+  distinctUntilChanged,
+  map,
+  tap,
+} from 'rxjs/operators';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+
+import {
+  BitstreamFormatsRegistryDeselectAction,
+  BitstreamFormatsRegistryDeselectAllAction,
+  BitstreamFormatsRegistrySelectAction,
+} from '../../admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { BitstreamFormatRegistryState } from '../../admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
+import { Bitstream } from '../shared/bitstream.model';
 import { BitstreamFormat } from '../shared/bitstream-format.model';
 import { BITSTREAM_FORMAT } from '../shared/bitstream-format.resource-type';
-import { Bitstream } from '../shared/bitstream.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RemoteData } from './remote-data';
-import { PostRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
+import { NoContent } from '../shared/NoContent.model';
 import { sendRequest } from '../shared/request.operators';
-import { CoreState } from '../core-state.model';
+import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
 import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
-import { NoContent } from '../shared/NoContent.model';
-import { dataService } from './base/data-service.decorator';
+import { RemoteData } from './remote-data';
+import {
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 const bitstreamFormatsStateSelector = createSelector(
   coreSelector,
@@ -106,7 +128,7 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
       map((endpointURL: string) => {
         return new PostRequest(requestId, endpointURL, bitstreamFormat);
       }),
-      sendRequest(this.requestService)
+      sendRequest(this.requestService),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID(requestId);
@@ -117,7 +139,7 @@ export class BitstreamFormatDataService extends IdentifiableDataService<Bitstrea
    */
   public clearBitStreamFormatRequests(): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      tap((href: string) => this.requestService.removeByHrefSubstring(href))
+      tap((href: string) => this.requestService.removeByHrefSubstring(href)),
     );
   }
 
diff --git a/src/app/core/data/browse-response-parsing.service.spec.ts b/src/app/core/data/browse-response-parsing.service.spec.ts
new file mode 100644
index 0000000000..53d2ec20fc
--- /dev/null
+++ b/src/app/core/data/browse-response-parsing.service.spec.ts
@@ -0,0 +1,64 @@
+import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { FLAT_BROWSE_DEFINITION } from '../shared/flat-browse-definition.resource-type';
+import { HIERARCHICAL_BROWSE_DEFINITION } from '../shared/hierarchical-browse-definition.resource-type';
+import { VALUE_LIST_BROWSE_DEFINITION } from '../shared/value-list-browse-definition.resource-type';
+import { BrowseResponseParsingService } from './browse-response-parsing.service';
+
+class TestService extends BrowseResponseParsingService {
+  constructor(protected objectCache: ObjectCacheService) {
+    super(objectCache);
+  }
+
+  // Overwrite method to make it public for testing
+  public deserialize<ObjectDomain>(obj): any {
+    return super.deserialize(obj);
+  }
+}
+
+describe('BrowseResponseParsingService', () => {
+  let service: TestService;
+
+
+  beforeEach(() => {
+    service = new TestService(getMockObjectCacheService());
+  });
+
+  describe('', () => {
+    const mockFlatBrowse = {
+      id: 'title',
+      browseType: 'flatBrowse',
+      type: 'browse',
+    };
+
+    const mockValueList = {
+      id: 'author',
+      browseType: 'valueList',
+      type: 'browse',
+    };
+
+    const mockHierarchicalBrowse = {
+      id: 'srsc',
+      browseType: 'hierarchicalBrowse',
+      type: 'browse',
+    };
+
+    it('should deserialize flatBrowses correctly', () => {
+      let deserialized = service.deserialize(mockFlatBrowse);
+      expect(deserialized.type).toBe(FLAT_BROWSE_DEFINITION);
+      expect(deserialized.id).toBe(mockFlatBrowse.id);
+    });
+
+    it('should deserialize valueList browses correctly', () => {
+      let deserialized = service.deserialize(mockValueList);
+      expect(deserialized.type).toBe(VALUE_LIST_BROWSE_DEFINITION);
+      expect(deserialized.id).toBe(mockValueList.id);
+    });
+
+    it('should deserialize hierarchicalBrowses correctly', () => {
+      let deserialized = service.deserialize(mockHierarchicalBrowse);
+      expect(deserialized.type).toBe(HIERARCHICAL_BROWSE_DEFINITION);
+      expect(deserialized.id).toBe(mockHierarchicalBrowse.id);
+    });
+  });
+});
diff --git a/src/app/core/data/browse-response-parsing.service.ts b/src/app/core/data/browse-response-parsing.service.ts
new file mode 100644
index 0000000000..e01fa17f1f
--- /dev/null
+++ b/src/app/core/data/browse-response-parsing.service.ts
@@ -0,0 +1,47 @@
+import { Injectable } from '@angular/core';
+
+import { hasValue } from '../../shared/empty.util';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { Serializer } from '../serializer';
+import { BrowseDefinition } from '../shared/browse-definition.model';
+import { BROWSE_DEFINITION } from '../shared/browse-definition.resource-type';
+import { FlatBrowseDefinition } from '../shared/flat-browse-definition.model';
+import { FLAT_BROWSE_DEFINITION } from '../shared/flat-browse-definition.resource-type';
+import { HierarchicalBrowseDefinition } from '../shared/hierarchical-browse-definition.model';
+import { HIERARCHICAL_BROWSE_DEFINITION } from '../shared/hierarchical-browse-definition.resource-type';
+import { ValueListBrowseDefinition } from '../shared/value-list-browse-definition.model';
+import { VALUE_LIST_BROWSE_DEFINITION } from '../shared/value-list-browse-definition.resource-type';
+import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+
+/**
+ * A ResponseParsingService used to parse a REST API response to a BrowseDefinition object
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class BrowseResponseParsingService extends DspaceRestResponseParsingService {
+  constructor(
+    protected objectCache: ObjectCacheService,
+  ) {
+    super(objectCache);
+  }
+
+  protected deserialize<ObjectDomain>(obj): any {
+    const browseType: string = obj.browseType;
+    if (obj.type === BROWSE_DEFINITION.value && hasValue(browseType)) {
+      let serializer: Serializer<BrowseDefinition>;
+      if (browseType === HIERARCHICAL_BROWSE_DEFINITION.value) {
+        serializer = new this.serializerConstructor(HierarchicalBrowseDefinition);
+      } else if (browseType === FLAT_BROWSE_DEFINITION.value) {
+        serializer = new this.serializerConstructor(FlatBrowseDefinition);
+      } else if (browseType === VALUE_LIST_BROWSE_DEFINITION.value) {
+        serializer = new this.serializerConstructor(ValueListBrowseDefinition);
+      } else {
+        throw new Error('An error occurred while retrieving the browse definitions.');
+      }
+      return serializer.deserialize(obj);
+    } else {
+      throw new Error('An error occurred while retrieving the browse definitions.');
+    }
+  }
+}
diff --git a/src/app/core/data/bundle-data.service.spec.ts b/src/app/core/data/bundle-data.service.spec.ts
index e3ba438f9b..b2c8be06af 100644
--- a/src/app/core/data/bundle-data.service.spec.ts
+++ b/src/app/core/data/bundle-data.service.spec.ts
@@ -1,19 +1,23 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
-import { compare, Operation } from 'fast-json-patch';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Item } from '../shared/item.model';
-import { ChangeAnalyzer } from './change-analyzer';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { BundleDataService } from './bundle-data.service';
-import { HALLink } from '../shared/hal-link.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { Bundle } from '../shared/bundle.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { Bundle } from '../shared/bundle.model';
+import { HALLink } from '../shared/hal-link.model';
+import { Item } from '../shared/item.model';
 import { testPatchDataImplementation } from './base/patch-data.spec';
+import { BundleDataService } from './bundle-data.service';
+import { ChangeAnalyzer } from './change-analyzer';
 
 class DummyChangeAnalyzer implements ChangeAnalyzer<Item> {
   diff(object1: Item, object2: Item): Operation[] {
@@ -41,7 +45,7 @@ describe('BundleDataService', () => {
     bundleHALLink.href = bundleLink;
     item = new Item();
     item._links = {
-      bundles: bundleHALLink
+      bundles: bundleHALLink,
     };
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
@@ -56,7 +60,7 @@ describe('BundleDataService', () => {
       },
       getObjectBySelfLink: () => {
         /* empty */
-      }
+      },
     } as any;
     store = {} as Store<CoreState>;
     return new BundleDataService(
@@ -99,30 +103,30 @@ describe('BundleDataService', () => {
           metadata: {
             'dc.title': [
               {
-                value: 'ORIGINAL'
-              }
-            ]
-          }
+                value: 'ORIGINAL',
+              },
+            ],
+          },
         }),
         Object.assign(new Bundle(), {
           id: 'THUMBNAIL_BUNDLE',
           metadata: {
             'dc.title': [
               {
-                value: 'THUMBNAIL'
-              }
-            ]
-          }
+                value: 'THUMBNAIL',
+              },
+            ],
+          },
         }),
         Object.assign(new Bundle(), {
           id: 'EXTRA_BUNDLE',
           metadata: {
             'dc.title': [
               {
-                value: 'EXTRA'
-              }
-            ]
-          }
+                value: 'EXTRA',
+              },
+            ],
+          },
         }),
       ];
       spyOn(service, 'findAllByItem').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList(bundles)));
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 19f0e73706..84684c6603 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -1,28 +1,36 @@
 import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { FollowLinkConfig } 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 { Bundle } from '../shared/bundle.model';
 import { BUNDLE } from '../shared/bundle.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { Bitstream } from '../shared/bitstream.model';
 import { RequestEntryState } from './request-entry-state.model';
-import { FindListOptions } from './find-list-options.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { RestRequestMethod } from './rest-request-method';
-import { Operation } from 'fast-json-patch';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Bundle}s from the REST API
@@ -91,7 +99,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
               RequestEntryState.Success,
               null,
               matchingBundle,
-              200
+              200,
             );
           } else {
             return new RemoteData(
@@ -101,7 +109,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
               RequestEntryState.Error,
               `The bundle with name ${bundleName} was not found.`,
               null,
-              404
+              404,
             );
           }
         } else {
@@ -119,7 +127,7 @@ export class BundleDataService extends IdentifiableDataService<Bundle> implement
   getBitstreamsEndpoint(bundleId: string, searchOptions?: PaginatedSearchOptions): Observable<string> {
     return this.getBrowseEndpoint().pipe(
       switchMap((href: string) => this.halService.getEndpoint(this.bitstreamsEndpoint, `${href}/${bundleId}`)),
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href),
     );
   }
 
diff --git a/src/app/core/data/collection-data.service.spec.ts b/src/app/core/data/collection-data.service.spec.ts
index 65f8b3ab2c..431fe941bb 100644
--- a/src/app/core/data/collection-data.service.spec.ts
+++ b/src/app/core/data/collection-data.service.spec.ts
@@ -1,29 +1,45 @@
-import { CollectionDataService } from './collection-data.service';
-import { RequestService } from './request.service';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { hasNoValue } from '../../shared/empty.util';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { fakeAsync, tick } from '@angular/core/testing';
-import { ContentSourceRequest, UpdateContentSourceRequest } from './request.models';
-import { ContentSource } from '../shared/content-source.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { Collection } from '../shared/collection.model';
+import { ContentSource } from '../shared/content-source.model';
 import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from './paginated-list.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { hasNoValue } from '../../shared/empty.util';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { CollectionDataService } from './collection-data.service';
+import { buildPaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import {
+  ContentSourceRequest,
+  UpdateContentSourceRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 const url = 'fake-url';
 const collectionId = 'fake-collection-id';
@@ -35,7 +51,7 @@ describe('CollectionDataService', () => {
   let translate: TranslateService;
   let notificationsService: any;
   let rdbService: RemoteDataBuildService;
-  let objectCache: ObjectCacheService;
+  let objectCache: ObjectCacheServiceStub;
   let halService: any;
 
   const mockCollection1: Collection = Object.assign(new Collection(), {
@@ -43,9 +59,9 @@ describe('CollectionDataService', () => {
     name: 'test-collection-1',
     _links: {
       self: {
-        href: 'https://rest.api/collections/test-collection-1-1'
-      }
-    }
+        href: 'https://rest.api/collections/test-collection-1-1',
+      },
+    },
   });
 
   const mockCollection2: Collection = Object.assign(new Collection(), {
@@ -53,9 +69,9 @@ describe('CollectionDataService', () => {
     name: 'test-collection-2',
     _links: {
       self: {
-        href: 'https://rest.api/collections/test-collection-2-2'
-      }
-    }
+        href: 'https://rest.api/collections/test-collection-2-2',
+      },
+    },
   });
 
   const mockCollection3: Collection = Object.assign(new Collection(), {
@@ -63,9 +79,9 @@ describe('CollectionDataService', () => {
     name: 'test-collection-3',
     _links: {
       self: {
-        href: 'https://rest.api/collections/test-collection-3-3'
-      }
-    }
+        href: 'https://rest.api/collections/test-collection-3-3',
+      },
+    },
   });
 
   const queryString = 'test-string';
@@ -138,7 +154,7 @@ describe('CollectionDataService', () => {
       it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollection', () => {
         const result = service.getAuthorizedCollection(queryString);
         const expected = cold('a|', {
-          a: paginatedListRD
+          a: paginatedListRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -153,7 +169,7 @@ describe('CollectionDataService', () => {
       it('should return a RemoteData<PaginatedList<Colletion>> for the getAuthorizedCollectionByCommunity', () => {
         const result = service.getAuthorizedCollectionByCommunity(communityId, queryString);
         const expected = cold('a|', {
-          a: paginatedListRD
+          a: paginatedListRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -200,19 +216,17 @@ describe('CollectionDataService', () => {
     }
     rdbService = jasmine.createSpyObj('rdbService', {
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: buildResponse$,
-      buildSingle: buildResponse$
-    });
-    objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      buildSingle: buildResponse$,
     });
+    objectCache = new ObjectCacheServiceStub();
     halService = new HALEndpointServiceStub(url);
     notificationsService = new NotificationsServiceStub();
     translate = getMockTranslateService();
 
-    service = new CollectionDataService(requestService, rdbService, objectCache, halService, null, notificationsService, null, null, translate);
+    service = new CollectionDataService(requestService, rdbService, objectCache as ObjectCacheService, halService, null, notificationsService, null, null, translate);
   }
 
 });
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 405b35c1f9..a85d7c0798 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -2,38 +2,48 @@ import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { INotification } from '../../shared/notifications/models/notification.model';
+import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Collection } from '../shared/collection.model';
 import { COLLECTION } from '../shared/collection.resource-type';
+import { Community } from '../shared/community.model';
 import { ContentSource } from '../shared/content-source.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
+import { dataService } from './base/data-service.decorator';
+import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import {
   ContentSourceRequest,
-  UpdateContentSourceRequest
+  UpdateContentSourceRequest,
 } from './request.models';
 import { RequestService } from './request.service';
-import { BitstreamDataService } from './bitstream-data.service';
 import { RestRequest } from './rest-request.model';
-import { FindListOptions } from './find-list-options.model';
-import { Community } from '../shared/community.model';
-import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(COLLECTION)
@@ -73,7 +83,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
   getAuthorizedCollection(query: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findSubmitAuthorized';
     options = Object.assign({}, options, {
-      searchParams: [new RequestParam('query', query)]
+      searchParams: [new RequestParam('query', query)],
     });
 
     return this.searchBy(searchHref, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow).pipe(
@@ -102,8 +112,8 @@ export class CollectionDataService extends ComColDataService<Collection> {
     options = Object.assign({}, options, {
       searchParams: [
         new RequestParam('query', query),
-        new RequestParam('entityType', entityType)
-      ]
+        new RequestParam('entityType', entityType),
+      ],
     });
 
     return this.searchBy(searchHref, options, true, reRequestOnStale, ...linksToFollow).pipe(
@@ -121,13 +131,13 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, reRequestOnStale = true,): Observable<RemoteData<PaginatedList<Collection>>> {
+  getAuthorizedCollectionByCommunity(communityId: string, query: string, options: FindListOptions = {}, reRequestOnStale = true): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findSubmitAuthorizedByCommunity';
     options = Object.assign({}, options, {
       searchParams: [
         new RequestParam('uuid', communityId),
-        new RequestParam('query', query)
-      ]
+        new RequestParam('query', query),
+      ],
     });
 
     return this.searchBy(searchHref, options, reRequestOnStale).pipe(
@@ -154,11 +164,11 @@ export class CollectionDataService extends ComColDataService<Collection> {
     const searchHref = 'findSubmitAuthorizedByCommunityAndEntityType';
     const searchParams = [
       new RequestParam('uuid', communityId),
-      new RequestParam('entityType', entityType)
+      new RequestParam('entityType', entityType),
     ];
 
     options = Object.assign({}, options, {
-      searchParams: searchParams
+      searchParams: searchParams,
     });
 
     return this.searchBy(searchHref, options, true, reRequestOnStale, ...linksToFollow).pipe(
@@ -179,7 +189,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
     return this.searchBy(searchHref, options).pipe(
       filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending),
       take(1),
-      map((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.totalElements > 0)
+      map((collections: RemoteData<PaginatedList<Collection>>) => collections.payload.totalElements > 0),
     );
   }
 
@@ -189,7 +199,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
    */
   getHarvesterEndpoint(collectionId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((href: string) => this.halService.getEndpoint('harvester', `${href}/${collectionId}`))
+      switchMap((href: string) => this.halService.getEndpoint('harvester', `${href}/${collectionId}`)),
     );
   }
 
@@ -200,7 +210,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
   getContentSource(collectionId: string, useCachedVersionIfAvailable = true): Observable<RemoteData<ContentSource>> {
     const href$ = this.getHarvesterEndpoint(collectionId).pipe(
       isNotEmptyOperator(),
-      take(1)
+      take(1),
     );
 
     href$.subscribe((href: string) => {
@@ -227,7 +237,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
         headers = headers.append('Content-Type', 'application/json');
         options.headers = headers;
         return new UpdateContentSourceRequest(requestId, href, JSON.stringify(serializedContentSource), options);
-      })
+      }),
     );
 
     // Execute the post/put request
@@ -255,7 +265,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
           return (response as RemoteData<ContentSource>).payload;
         }
         return response as INotification;
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 0f9f0fa740..e1fe48c076 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -1,28 +1,37 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
 import { cold } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
+import { Bitstream } from '../shared/bitstream.model';
 import { Community } from '../shared/community.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RequestService } from './request.service';
-import { createFailedRemoteDataObject, createFailedRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { BitstreamDataService } from './bitstream-data.service';
-import { CoreState } from '../core-state.model';
 import { FindListOptions } from './find-list-options.model';
-import { Bitstream } from '../shared/bitstream.model';
-import { testCreateDataImplementation } from './base/create-data.spec';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
-import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { RequestService } from './request.service';
 
 const LINK_NAME = 'test';
 
@@ -45,7 +54,7 @@ class TestService extends ComColDataService<any> {
     protected http: HttpClient,
     protected bitstreamDataService: BitstreamDataService,
     protected comparator: DSOChangeAnalyzer<Community>,
-    protected linkPath: string
+    protected linkPath: string,
   ) {
     super('something', requestService, rdbService, objectCache, halService, comparator, notificationsService, bitstreamDataService);
   }
@@ -79,30 +88,30 @@ describe('ComColDataService', () => {
   const comparator = {} as any;
 
   const options = Object.assign(new FindListOptions(), {
-    scopeID: scopeID
+    scopeID: scopeID,
   });
   const scopedEndpoint = `${communityEndpoint}/${LINK_NAME}`;
 
   const mockHalService = {
-    getEndpoint: (linkPath) => observableOf(communitiesEndpoint)
+    getEndpoint: (linkPath) => observableOf(communitiesEndpoint),
   };
 
   function initRdbService(): RemoteDataBuildService {
     return jasmine.createSpyObj('rdbService', {
-      buildSingle : createFailedRemoteDataObject$('Error', 500)
+      buildSingle : createFailedRemoteDataObject$('Error', 500),
     });
   }
 
   function initBitstreamDataService(): BitstreamDataService {
     return jasmine.createSpyObj('bitstreamDataService', {
-      deleteByHref: createSuccessfulRemoteDataObject$({})
+      deleteByHref: createSuccessfulRemoteDataObject$({}),
     });
   }
 
   function initMockCommunityDataService(): CommunityDataService {
     return jasmine.createSpyObj('cds', {
       getEndpoint: cold('--a-', { a: communitiesEndpoint }),
-      getIDHref: communityEndpoint
+      getIDHref: communityEndpoint,
     });
   }
 
@@ -112,11 +121,11 @@ describe('ComColDataService', () => {
         d: {
           _links: {
             [LINK_NAME]: {
-              href: scopedEndpoint
-            }
-          }
-        }
-      })
+              href: scopedEndpoint,
+            },
+          },
+        },
+      }),
     });
   }
 
@@ -132,7 +141,7 @@ describe('ComColDataService', () => {
       http,
       bitstreamDataService,
       comparator,
-      LINK_NAME
+      LINK_NAME,
     );
   }
 
@@ -200,12 +209,12 @@ describe('ComColDataService', () => {
       communityWithParentHref = {
         _links: {
           parentCommunity: {
-            href: 'topLevel/parentCommunity'
-          }
-        }
+            href: 'topLevel/parentCommunity',
+          },
+        },
       } as Community;
       communityWithoutParentHref = {
-        _links: {}
+        _links: {},
       } as Community;
     });
 
@@ -238,9 +247,9 @@ describe('ComColDataService', () => {
           id: 'a20da287-e174-466a-9926-f66as300d399',
           metadata: [{
             key: 'dc.title',
-            value: 'parent community'
+            value: 'parent community',
           }],
-          _links: {}
+          _links: {},
         });
       });
       it('should refresh a specific cached community when the parent link can be resolved', () => {
@@ -262,9 +271,9 @@ describe('ComColDataService', () => {
       dso = {
         _links: {
           logo: {
-            href: 'logo-href'
-          }
-        }
+            href: 'logo-href',
+          },
+        },
       };
     });
 
@@ -291,8 +300,8 @@ describe('ComColDataService', () => {
           _links: {
             self: {
               href: 'logo-href',
-            }
-          }
+            },
+          },
         });
       });
 
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index abc9046cd0..de0d1a3157 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -1,34 +1,63 @@
-import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { Operation } from 'fast-json-patch';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { Community } from '../shared/community.model';
-import { HALLink } from '../shared/hal-link.model';
-import { PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
 import { Bitstream } from '../shared/bitstream.model';
 import { Collection } from '../shared/collection.model';
-import { BitstreamDataService } from './bitstream-data.service';
+import { Community } from '../shared/community.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { HALLink } from '../shared/hal-link.model';
 import { NoContent } from '../shared/NoContent.model';
-import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { FindListOptions } from './find-list-options.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { RestRequestMethod } from './rest-request-method';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { BitstreamDataService } from './bitstream-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { Operation } from 'fast-json-patch';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 export abstract class ComColDataService<T extends Community | Collection> extends IdentifiableDataService<T> implements CreateData<T>, FindAllData<T>, SearchData<T>, PatchData<T>, DeleteData<T> {
   private createData: CreateData<T>;
@@ -86,7 +115,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
         }),
         filter((halLink: HALLink) => isNotEmpty(halLink)),
         map((halLink: HALLink) => halLink.href),
-        distinctUntilChanged()
+        distinctUntilChanged(),
       );
     }
   }
@@ -97,7 +126,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
 
   public findByParent(parentUUID: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
     const href$ = this.getFindByParentHref(parentUUID).pipe(
-      map((href: string) => this.buildHrefFromFindOptions(href, options))
+      map((href: string) => this.buildHrefFromFindOptions(href, options)),
     );
     return this.findListByHref(href$, options, true, true, ...linksToFollow);
   }
@@ -110,7 +139,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
     return this.halService.getEndpoint(this.linkPath).pipe(
       // We can't use HalLinkService to discover the logo link itself, as objects without a logo
       // don't have the link, and this method is also used in the createLogo method.
-      map((href: string) => new URLCombiner(href, id, 'logo').toString())
+      map((href: string) => new URLCombiner(href, id, 'logo').toString()),
     );
   }
 
@@ -132,7 +161,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
           } else {
             return this.bitstreamDataService.deleteByHref(logoRd.payload._links.self.href);
           }
-        })
+        }),
       );
     } else {
       return createFailedRemoteDataObject$(`The given object doesn't have a logo`, 400);
@@ -148,7 +177,7 @@ export abstract class ComColDataService<T extends Community | Collection> extend
       this.findByHref(parentCommunityUrl).pipe(
         getFirstCompletedRemoteData(),
       ),
-      this.halService.getEndpoint('communities/search/top').pipe(take(1))
+      this.halService.getEndpoint('communities/search/top').pipe(take(1)),
     ]).subscribe(([rd, topHref]: [RemoteData<any>, string]) => {
       if (rd.hasSucceeded && isNotEmpty(rd.payload) && isNotEmpty(rd.payload.id)) {
         this.requestService.setStaleByHrefSubstring(rd.payload.id);
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index efb6d50e84..ad06e9ee91 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -1,23 +1,28 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { Community } from '../shared/community.model';
 import { COMMUNITY } from '../shared/community.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { dataService } from './base/data-service.decorator';
+import { BitstreamDataService } from './bitstream-data.service';
 import { ComColDataService } from './comcol-data.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { BitstreamDataService } from './bitstream-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { isNotEmpty } from '../../shared/empty.util';
-import { FindListOptions } from './find-list-options.model';
-import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(COMMUNITY)
@@ -44,14 +49,14 @@ export class CommunityDataService extends ComColDataService<Community> {
   findTop(options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Community>[]): Observable<RemoteData<PaginatedList<Community>>> {
     return this.getEndpoint().pipe(
       map(href => `${href}/search/top`),
-      switchMap(href => this.findListByHref(href, options, true, true, ...linksToFollow))
+      switchMap(href => this.findListByHref(href, options, true, true, ...linksToFollow)),
     );
   }
 
   protected getFindByParentHref(parentUUID: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       switchMap((communityEndpointHref: string) =>
-        this.halService.getEndpoint('subcommunities', `${communityEndpointHref}/${parentUUID}`))
+        this.halService.getEndpoint('subcommunities', `${communityEndpointHref}/${parentUUID}`)),
     );
   }
 
@@ -59,7 +64,7 @@ export class CommunityDataService extends ComColDataService<Community> {
     return this.getEndpoint().pipe(
       map((endpoint: string) => this.getIDHref(endpoint, options.scopeID)),
       filter((href: string) => isNotEmpty(href)),
-      take(1)
+      take(1),
     );
   }
 }
diff --git a/src/app/core/data/configuration-data.service.spec.ts b/src/app/core/data/configuration-data.service.spec.ts
index 7fe69c16e5..bccfe45da4 100644
--- a/src/app/core/data/configuration-data.service.spec.ts
+++ b/src/app/core/data/configuration-data.service.spec.ts
@@ -1,12 +1,16 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ConfigurationDataService } from './configuration-data.service';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { ConfigurationDataService } from './configuration-data.service';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
 
 describe('ConfigurationDataService', () => {
   let scheduler: TestScheduler;
@@ -18,7 +22,7 @@ describe('ConfigurationDataService', () => {
   const testObject = {
     uuid: 'test-property',
     name: 'test-property',
-    values: ['value-1', 'value-2']
+    values: ['value-1', 'value-2'],
   } as ConfigurationProperty;
   const configLink = 'https://rest.api/rest/api/config/properties';
   const requestURL = `https://rest.api/rest/api/config/properties/${testObject.name}`;
@@ -28,18 +32,18 @@ describe('ConfigurationDataService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: configLink })
+      getEndpoint: cold('a', { a: configLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
-      send: true
+      send: true,
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
         a: {
-          payload: testObject
-        }
-      })
+          payload: testObject,
+        },
+      }),
     });
     objectCache = {} as ObjectCacheService;
 
@@ -70,8 +74,8 @@ describe('ConfigurationDataService', () => {
       const result = service.findByPropertyName(testObject.name);
       const expected = cold('a', {
         a: {
-          payload: testObject
-        }
+          payload: testObject,
+        },
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/data/configuration-data.service.ts b/src/app/core/data/configuration-data.service.ts
index de044e25e3..8293173c14 100644
--- a/src/app/core/data/configuration-data.service.ts
+++ b/src/app/core/data/configuration-data.service.ts
@@ -1,15 +1,15 @@
-/* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { CONFIG_PROPERTY } from '../shared/config-property.resource-type';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { dataService } from './base/data-service.decorator';
 
 @Injectable()
 @dataService(CONFIG_PROPERTY)
diff --git a/src/app/core/data/content-source-response-parsing.service.ts b/src/app/core/data/content-source-response-parsing.service.ts
index 066ccf28c9..c4eaa8418d 100644
--- a/src/app/core/data/content-source-response-parsing.service.ts
+++ b/src/app/core/data/content-source-response-parsing.service.ts
@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
+
 import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ContentSource } from '../shared/content-source.model';
 import { MetadataConfig } from '../shared/metadata-config.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
diff --git a/src/app/core/data/debug-response-parsing.service.ts b/src/app/core/data/debug-response-parsing.service.ts
index 992a29e4b8..067afcee87 100644
--- a/src/app/core/data/debug-response-parsing.service.ts
+++ b/src/app/core/data/debug-response-parsing.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+
 import { RestResponse } from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ResponseParsingService } from './parsing.service';
diff --git a/src/app/core/data/default-change-analyzer.service.ts b/src/app/core/data/default-change-analyzer.service.ts
index 70c45bbc2d..94e1856543 100644
--- a/src/app/core/data/default-change-analyzer.service.ts
+++ b/src/app/core/data/default-change-analyzer.service.ts
@@ -1,10 +1,13 @@
 import { Injectable } from '@angular/core';
-import { compare } from 'fast-json-patch';
-import { Operation } from 'fast-json-patch';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+
 import { getClassForType } from '../cache/builders/build-decorators';
+import { TypedObject } from '../cache/typed-object.model';
 import { DSpaceNotNullSerializer } from '../dspace-rest/dspace-not-null.serializer';
 import { ChangeAnalyzer } from './change-analyzer';
-import { TypedObject } from '../cache/typed-object.model';
 
 /**
  * A class to determine what differs between two
diff --git a/src/app/core/data/dso-change-analyzer.service.ts b/src/app/core/data/dso-change-analyzer.service.ts
index b79e83a3f3..4f0ade27b1 100644
--- a/src/app/core/data/dso-change-analyzer.service.ts
+++ b/src/app/core/data/dso-change-analyzer.service.ts
@@ -1,9 +1,13 @@
-import { compare, Operation } from 'fast-json-patch';
-import { ChangeAnalyzer } from './change-analyzer';
 import { Injectable } from '@angular/core';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import cloneDeep from 'lodash/cloneDeep';
+
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { MetadataMap } from '../shared/metadata.models';
-import { cloneDeep } from 'lodash';
+import { ChangeAnalyzer } from './change-analyzer';
 
 /**
  * A class to determine what differs between two
diff --git a/src/app/core/data/dso-redirect.service.spec.ts b/src/app/core/data/dso-redirect.service.spec.ts
index ca064b5608..b6b72583ea 100644
--- a/src/app/core/data/dso-redirect.service.spec.ts
+++ b/src/app/core/data/dso-redirect.service.spec.ts
@@ -1,15 +1,25 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
+import { AppConfig } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment.test';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { 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 { HardRedirectService } from '../services/hard-redirect.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DsoRedirectService } from './dso-redirect.service';
-import { GetRequest, IdentifierType } from './request.models';
-import { RequestService } from './request.service';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { Item } from '../shared/item.model';
 import { EMBED_SEPARATOR } from './base/base-data.service';
+import { DsoRedirectService } from './dso-redirect.service';
+import {
+  GetRequest,
+  IdentifierType,
+} from './request.models';
+import { RequestService } from './request.service';
 
 describe('DsoRedirectService', () => {
   let scheduler: TestScheduler;
@@ -17,7 +27,7 @@ describe('DsoRedirectService', () => {
   let halService: HALEndpointService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
-  let router;
+  let redirectService: HardRedirectService;
   let remoteData;
   const dsoUUID = '9b4f22f4-164a-49db-8817-3316b6ee5746';
   const dsoHandle = '1234567789/22';
@@ -32,32 +42,35 @@ describe('DsoRedirectService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: pidLink })
+      getEndpoint: cold('a', { a: pidLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
-      send: true
+      send: true,
     });
-    router = {
-      navigate: jasmine.createSpy('navigate')
-    };
 
     remoteData = createSuccessfulRemoteDataObject(Object.assign(new Item(), {
       type: 'item',
-      uuid: '123456789'
+      uuid: '123456789',
     }));
 
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
-        a: remoteData
-      })
+        a: remoteData,
+      }),
     });
+
+    redirectService = jasmine.createSpyObj('redirectService', {
+      redirect: {},
+    });
+
     service = new DsoRedirectService(
+      environment as AppConfig,
       requestService,
       rdbService,
       objectCache,
       halService,
-      router,
+      redirectService,
     );
   });
 
@@ -104,7 +117,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith(['/items/' + remoteData.payload.uuid]);
+      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';
@@ -112,8 +125,8 @@ describe('DsoRedirectService', () => {
         'dspace.entity.type': [
           {
             language: 'en_US',
-            value: 'Publication'
-          }
+            value: 'Publication',
+          },
         ],
       };
       const redir = service.findByIdAndIDType(dsoHandle, IdentifierType.HANDLE);
@@ -121,7 +134,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith(['/entities/publication/' + remoteData.payload.uuid]);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/entities/publication/${remoteData.payload.uuid}`, 301);
     });
 
     it('should navigate to collections route', () => {
@@ -130,7 +143,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith(['/collections/' + remoteData.payload.uuid]);
+      expect(redirectService.redirect).toHaveBeenCalledWith(`${environment.ui.nameSpace}/collections/${remoteData.payload.uuid}`, 301);
     });
 
     it('should navigate to communities route', () => {
@@ -139,7 +152,7 @@ describe('DsoRedirectService', () => {
       redir.subscribe();
       scheduler.schedule(() => redir);
       scheduler.flush();
-      expect(router.navigate).toHaveBeenCalledWith(['/communities/' + remoteData.payload.uuid]);
+      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 81ce678e43..da8fe7082d 100644
--- a/src/app/core/data/dso-redirect.service.ts
+++ b/src/app/core/data/dso-redirect.service.ts
@@ -6,21 +6,29 @@
  * http://www.dspace.org/license/
  */
 /* eslint-disable max-classes-per-file */
-import { Injectable } from '@angular/core';
-import { Router } from '@angular/router';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { getDSORoute } from '../../app-routing-paths';
 import { hasValue } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { IdentifiableDataService } from './base/identifiable-data.service';
 import { RemoteData } from './remote-data';
 import { IdentifierType } from './request.models';
 import { RequestService } from './request.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { getDSORoute } from '../../app-routing-paths';
 
 const ID_ENDPOINT = 'pid';
 const UUID_ENDPOINT = 'dso';
@@ -42,7 +50,7 @@ class DsoByIdOrUUIDDataService extends IdentifiableDataService<DSpaceObject> {
       // interpolate id/uuid as query parameter
       (endpoint: string, resourceID: string): string => {
         return endpoint.replace(/{\?id}/, `?id=${resourceID}`)
-                       .replace(/{\?uuid}/, `?uuid=${resourceID}`);
+          .replace(/{\?uuid}/, `?uuid=${resourceID}`);
       },
     );
   }
@@ -70,17 +78,21 @@ export class DsoRedirectService {
   private dataService: DsoByIdOrUUIDDataService;
 
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
     protected halService: HALEndpointService,
-    private router: Router,
+    private hardRedirectService: HardRedirectService,
   ) {
     this.dataService = new DsoByIdOrUUIDDataService(requestService, rdbService, objectCache, halService);
   }
 
   /**
-   * Retrieve a DSpaceObject by
+   * Redirect to a DSpaceObject's path using the given identifier type and ID.
+   * This is used to redirect paths like "/handle/[prefix]/[suffix]" to the object's path (e.g. /items/[uuid]).
+   * See LookupGuard for more examples.
+   *
    * @param id              the identifier of the object to retrieve
    * @param identifierType  the type of the given identifier (defaults to UUID)
    */
@@ -92,13 +104,14 @@ export class DsoRedirectService {
         if (response.hasSucceeded) {
           const dso = response.payload;
           if (hasValue(dso.uuid)) {
-            let newRoute = getDSORoute(dso);
+            const newRoute = getDSORoute(dso);
             if (hasValue(newRoute)) {
-              this.router.navigate([newRoute]);
+              // Use a "301 Moved Permanently" redirect for SEO purposes
+              this.hardRedirectService.redirect(this.appConfig.ui.nameSpace.replace(/\/$/, '') + newRoute, 301);
             }
           }
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/data/dso-response-parsing.service.ts b/src/app/core/data/dso-response-parsing.service.ts
index fd5a22fae9..6c9028bf6b 100644
--- a/src/app/core/data/dso-response-parsing.service.ts
+++ b/src/app/core/data/dso-response-parsing.service.ts
@@ -1,15 +1,24 @@
 import { Injectable } from '@angular/core';
 
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  DSOSuccessResponse,
+  RestResponse,
+} from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { RestResponse, DSOSuccessResponse } from '../cache/response.models';
-
-import { ResponseParsingService } from './parsing.service';
-import { BaseResponseParsingService } from './base-response-parsing.service';
-import { hasNoValue, hasValue } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
+import { BaseResponseParsingService } from './base-response-parsing.service';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
 
+/**
+ * @deprecated use DspaceRestResponseParsingService for new code, this is only left to support a
+ * few legacy use cases, and should get removed eventually
+ */
 @Injectable()
 export class DSOResponseParsingService extends BaseResponseParsingService implements ResponseParsingService {
   protected toCache = true;
diff --git a/src/app/core/data/dspace-object-data.service.spec.ts b/src/app/core/data/dspace-object-data.service.spec.ts
index 0f167ea47e..1e4809ac4b 100644
--- a/src/app/core/data/dspace-object-data.service.spec.ts
+++ b/src/app/core/data/dspace-object-data.service.spec.ts
@@ -1,12 +1,16 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { DSpaceObjectDataService } from './dspace-object-data.service';
 import { GetRequest } from './request.models';
 import { RequestService } from './request.service';
-import { DSpaceObjectDataService } from './dspace-object-data.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 
 describe('DSpaceObjectDataService', () => {
   let scheduler: TestScheduler;
@@ -16,7 +20,7 @@ describe('DSpaceObjectDataService', () => {
   let rdbService: RemoteDataBuildService;
   let objectCache: ObjectCacheService;
   const testObject = {
-    uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746'
+    uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746',
   } as DSpaceObject;
   const dsoLink = 'https://rest.api/rest/api/dso/find{?uuid}';
   const requestURL = `https://rest.api/rest/api/dso/find?uuid=${testObject.uuid}`;
@@ -26,18 +30,18 @@ describe('DSpaceObjectDataService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: dsoLink })
+      getEndpoint: cold('a', { a: dsoLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
-      send: true
+      send: true,
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: cold('a', {
         a: {
-          payload: testObject
-        }
-      })
+          payload: testObject,
+        },
+      }),
     });
     objectCache = {} as ObjectCacheService;
 
@@ -68,8 +72,8 @@ describe('DSpaceObjectDataService', () => {
       const result = service.findById(testObject.uuid);
       const expected = cold('a', {
         a: {
-          payload: testObject
-        }
+          payload: testObject,
+        },
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index 2ad024133c..15e405a132 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@angular/core';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { DSPACE_OBJECT } from '../shared/dspace-object.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RequestService } from './request.service';
 
 @Injectable()
 @dataService(DSPACE_OBJECT)
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..0177a9813a 100644
--- a/src/app/core/data/dspace-rest-response-parsing.service.ts
+++ b/src/app/core/data/dspace-rest-response-parsing.service.ts
@@ -1,23 +1,34 @@
 /* eslint-disable max-classes-per-file */
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
-import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-import { Serializer } from '../serializer';
-import { PageInfo } from '../shared/page-info.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { PaginatedList, buildPaginatedList } from './paginated-list.model';
-import { getClassForType } from '../cache/builders/build-decorators';
-import { environment } from '../../../environments/environment';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { Injectable } from '@angular/core';
-import { ResponseParsingService } from './parsing.service';
-import { ParsedResponse } from '../cache/response.models';
-import { RestRequestMethod } from './rest-request-method';
-import { getUrlWithoutEmbedParams, getEmbedSizeParams } from '../index/index.selectors';
-import { URLCombiner } from '../url-combiner/url-combiner';
+
+import { environment } from '../../../environments/environment';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { getClassForType } from '../cache/builders/build-decorators';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { ParsedResponse } from '../cache/response.models';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  getEmbedSizeParams,
+  getUrlWithoutEmbedParams,
+} from '../index/index.selectors';
+import { Serializer } from '../serializer';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { PageInfo } from '../shared/page-info.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from './paginated-list.model';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
 
 
 /**
@@ -144,8 +155,8 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
         console.warn(`The response for '${request.href}' doesn't have a self link. This could mean there's an issue with the REST endpoint`);
         response.payload._links = Object.assign({}, response.payload._links, {
           self: {
-            href: urlWithoutEmbedParams
-          }
+            href: urlWithoutEmbedParams,
+          },
         });
 
       } else {
@@ -155,8 +166,8 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
           console.warn(`The response for '${urlWithoutEmbedParams}' has the self link '${response.payload._links.self.href}'. These don't match. This could mean there's an issue with the REST endpoint`);
           response.payload._links = Object.assign({}, response.payload._links, {
             self: {
-              href: urlWithoutEmbedParams
-            }
+              href: urlWithoutEmbedParams,
+            },
           });
         }
       }
@@ -184,8 +195,8 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
   protected processArray<ObjectDomain>(data: any, request: RestRequest): ObjectDomain[] {
     let array: ObjectDomain[] = [];
     data.forEach((datum) => {
-        array = [...array, this.process(datum, request)];
-      }
+      array = [...array, this.process(datum, request)];
+    },
     );
     return array;
   }
@@ -231,7 +242,7 @@ export class DspaceRestResponseParsingService implements ResponseParsingService
       let dataJSON: string;
       if (hasValue(data._embedded)) {
         dataJSON = JSON.stringify(Object.assign({}, data, {
-          _embedded: '...'
+          _embedded: '...',
         }));
       } else {
         dataJSON = JSON.stringify(data);
diff --git a/src/app/core/data/endpoint-map-response-parsing.service.ts b/src/app/core/data/endpoint-map-response-parsing.service.ts
index 728714876c..69e9ec2de6 100644
--- a/src/app/core/data/endpoint-map-response-parsing.service.ts
+++ b/src/app/core/data/endpoint-map-response-parsing.service.ts
@@ -1,17 +1,17 @@
 import { Injectable } from '@angular/core';
 
-import {
-  DspaceRestResponseParsingService,
-  isCacheableObject
-} from './dspace-rest-response-parsing.service';
+import { environment } from '../../../environments/environment';
 import { hasValue } from '../../shared/empty.util';
 import { getClassForType } from '../cache/builders/build-decorators';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { ParsedResponse } from '../cache/response.models';
-import { DSpaceObject } from '../shared/dspace-object.model';
-import { environment } from '../../../environments/environment';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import {
+  DspaceRestResponseParsingService,
+  isCacheableObject,
+} from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
 /**
@@ -56,7 +56,7 @@ export class EndpointMapResponseParsingService extends DspaceRestResponseParsing
     } catch (e) {
       console.warn(`Couldn't parse endpoint request at ${request.href}`);
       return new ParsedResponse(response.statusCode, undefined, {
-        _links: response.payload._links
+        _links: response.payload._links,
       });
     }
   }
@@ -101,7 +101,7 @@ export class EndpointMapResponseParsingService extends DspaceRestResponseParsing
       let dataJSON: string;
       if (hasValue(data._embedded)) {
         dataJSON = JSON.stringify(Object.assign({}, data, {
-          _embedded: '...'
+          _embedded: '...',
         }));
       } else {
         dataJSON = JSON.stringify(data);
diff --git a/src/app/core/data/entity-type-data.service.ts b/src/app/core/data/entity-type-data.service.ts
index 4020ff638d..22cf1a1706 100644
--- a/src/app/core/data/entity-type-data.service.ts
+++ b/src/app/core/data/entity-type-data.service.ts
@@ -1,21 +1,36 @@
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { RemoteData } from './remote-data';
-import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { PaginatedList } from './paginated-list.model';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { RelationshipTypeDataService } from './relationship-type-data.service';
-import { FindListOptions } from './find-list-options.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
 import { BaseDataService } from './base/base-data.service';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RelationshipTypeDataService } from './relationship-type-data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * Service handling all ItemType requests
@@ -48,7 +63,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
    */
   getRelationshipTypesEndpoint(entityTypeId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((href) => this.halService.getEndpoint('relationshiptypes', `${href}/${entityTypeId}`))
+      switchMap((href) => this.halService.getEndpoint('relationshiptypes', `${href}/${entityTypeId}`)),
     );
   }
 
@@ -84,7 +99,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
   hasMoreThanOneAuthorized(): Observable<boolean> {
     const findListOptions: FindListOptions = {
       elementsPerPage: 2,
-      currentPage: 1
+      currentPage: 1,
     };
     return this.getAllAuthorizedRelationshipType(findListOptions).pipe(
       map((result: RemoteData<PaginatedList<ItemType>>) => {
@@ -95,7 +110,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
           output = false;
         }
         return output;
-      })
+      }),
     );
   }
 
@@ -118,7 +133,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
   hasMoreThanOneAuthorizedImport(): Observable<boolean> {
     const findListOptions: FindListOptions = {
       elementsPerPage: 2,
-      currentPage: 1
+      currentPage: 1,
     };
     return this.getAllAuthorizedRelationshipTypeImport(findListOptions).pipe(
       map((result: RemoteData<PaginatedList<ItemType>>) => {
@@ -129,7 +144,7 @@ export class EntityTypeDataService extends BaseDataService<ItemType> implements
           output = false;
         }
         return output;
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/eperson-registration.service.spec.ts b/src/app/core/data/eperson-registration.service.spec.ts
index afd4927103..a60cef121a 100644
--- a/src/app/core/data/eperson-registration.service.spec.ts
+++ b/src/app/core/data/eperson-registration.service.spec.ts
@@ -1,16 +1,17 @@
-import { RequestService } from './request.service';
-import { EpersonRegistrationService } from './eperson-registration.service';
-import { RestResponse } from '../cache/response.models';
+import { HttpHeaders } from '@angular/common/http';
 import { cold } from 'jasmine-marbles';
-import { PostRequest } from './request.models';
-import { Registration } from '../shared/registration.model';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { RequestEntry } from './request-entry.model';
-import { HttpHeaders } from '@angular/common/http';
+
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RestResponse } from '../cache/response.models';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Registration } from '../shared/registration.model';
+import { EpersonRegistrationService } from './eperson-registration.service';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('EpersonRegistrationService', () => {
   let testScheduler;
@@ -44,7 +45,7 @@ describe('EpersonRegistrationService', () => {
       generateRequestId: 'request-id',
       send: {},
       getByUUID: cold('a',
-        { a: Object.assign(new RequestEntry(), { response: new RestResponse(true, 200, 'Success') }) })
+        { a: Object.assign(new RequestEntry(), { response: new RestResponse(true, 200, 'Success') }) }),
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: observableOf(rd),
@@ -53,7 +54,7 @@ describe('EpersonRegistrationService', () => {
     service = new EpersonRegistrationService(
       requestService,
       rdbService,
-      halService
+      halService,
     );
   });
 
@@ -111,9 +112,9 @@ describe('EpersonRegistrationService', () => {
           payload: Object.assign(new Registration(), {
             email: registrationWithUser.email,
             token: 'test-token',
-            user: registrationWithUser.user
-          })
-        })
+            user: registrationWithUser.user,
+          }),
+        }),
       }));
     });
 
@@ -128,10 +129,10 @@ describe('EpersonRegistrationService', () => {
           jasmine.objectContaining({
             uuid: 'request-id', method: 'GET',
             href: 'rest-url/registrations/search/findByToken?token=test-token',
-          }), true
+          }), true,
         );
         expectObservable(rdbService.buildSingle.calls.argsFor(0)[0]).toBe('(a|)', {
-          a: 'rest-url/registrations/search/findByToken?token=test-token'
+          a: 'rest-url/registrations/search/findByToken?token=test-token',
         });
       });
     });
diff --git a/src/app/core/data/eperson-registration.service.ts b/src/app/core/data/eperson-registration.service.ts
index bfbecdaecb..90a3fab83a 100644
--- a/src/app/core/data/eperson-registration.service.ts
+++ b/src/app/core/data/eperson-registration.service.ts
@@ -1,19 +1,33 @@
+import {
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { GetRequest, PostRequest } from './request.models';
 import { Observable } from 'rxjs';
-import { filter, find, map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { Registration } from '../shared/registration.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { ResponseParsingService } from './parsing.service';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { RegistrationResponseParsingService } from './registration-response-parsing.service';
-import { RemoteData } from './remote-data';
+import {
+  filter,
+  find,
+  map,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { HttpHeaders } from '@angular/common/http';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { Registration } from '../shared/registration.model';
+import { ResponseParsingService } from './parsing.service';
+import { RegistrationResponseParsingService } from './registration-response-parsing.service';
+import { RemoteData } from './remote-data';
+import {
+  GetRequest,
+  PostRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 @Injectable({
   providedIn: 'root',
@@ -55,7 +69,7 @@ export class EpersonRegistrationService {
    * @param email
    * @param captchaToken the value of x-recaptcha-token header
    */
-  registerEmail(email: string, captchaToken: string = null): Observable<RemoteData<Registration>> {
+  registerEmail(email: string, captchaToken: string = null, type?: string): Observable<RemoteData<Registration>> {
     const registration = new Registration();
     registration.email = email;
 
@@ -70,16 +84,21 @@ export class EpersonRegistrationService {
     }
     options.headers = headers;
 
+    if (hasValue(type)) {
+      options.params = type ?
+        new HttpParams({ fromString: 'accountRequestType=' + type }) : new HttpParams();
+    }
+
     href$.pipe(
       find((href: string) => hasValue(href)),
       map((href: string) => {
         const request = new PostRequest(requestId, href, registration, options);
         this.requestService.send(request);
-      })
+      }),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID<Registration>(requestId).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
@@ -99,7 +118,7 @@ export class EpersonRegistrationService {
       Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return RegistrationResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request, true);
     });
@@ -111,7 +130,7 @@ export class EpersonRegistrationService {
         } else {
           return rd;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/external-source-data.service.spec.ts b/src/app/core/data/external-source-data.service.spec.ts
index cdbdbaa006..5e643cc549 100644
--- a/src/app/core/data/external-source-data.service.spec.ts
+++ b/src/app/core/data/external-source-data.service.spec.ts
@@ -1,10 +1,12 @@
-import { ExternalSourceDataService } from './external-source-data.service';
+import { of as observableOf } from 'rxjs';
+import { take } from 'rxjs/operators';
+
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { of as observableOf } from 'rxjs';
-import { GetRequest } from './request.models';
 import { testSearchDataImplementation } from './base/search-data.spec';
+import { ExternalSourceDataService } from './external-source-data.service';
+import { GetRequest } from './request.models';
 
 describe('ExternalSourceService', () => {
   let service: ExternalSourceDataService;
@@ -21,10 +23,10 @@ describe('ExternalSourceService', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0001'
-          }
-        ]
-      }
+            value: 'https://orcid.org/0001-0001-0001-0001',
+          },
+        ],
+      },
     }),
     Object.assign(new ExternalSourceEntry(), {
       id: '0001-0001-0001-0002',
@@ -33,20 +35,20 @@ describe('ExternalSourceService', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0002'
-          }
-        ]
-      }
-    })
+            value: 'https://orcid.org/0001-0001-0001-0002',
+          },
+        ],
+      },
+    }),
   ];
 
   function init() {
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: 'request-uuid',
-      send: {}
+      send: {},
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries))
+      buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries)),
     });
     halService = jasmine.createSpyObj('halService', {
       getEndpoint: observableOf('external-sources-REST-endpoint'),
@@ -64,19 +66,36 @@ describe('ExternalSourceService', () => {
   });
 
   describe('getExternalSourceEntries', () => {
-    let result;
 
-    beforeEach(() => {
-      result = service.getExternalSourceEntries('test');
+    describe('when no error response is cached', () => {
+      let result;
+      beforeEach(() => {
+        spyOn(service, 'hasCachedErrorResponse').and.returnValue(observableOf(false));
+        result = service.getExternalSourceEntries('test');
+      });
+
+      it('should send a GetRequest', () => {
+        result.pipe(take(1)).subscribe();
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), true);
+      });
+
+      it('should return the entries', () => {
+        result.subscribe((resultRD) => {
+          expect(resultRD.payload.page).toBe(entries);
+        });
+      });
     });
 
-    it('should send a GetRequest', () => {
-      expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), true);
-    });
+    describe('when an error response is cached', () => {
+      let result;
+      beforeEach(() => {
+        spyOn(service, 'hasCachedErrorResponse').and.returnValue(observableOf(true));
+        result = service.getExternalSourceEntries('test');
+      });
 
-    it('should return the entries', () => {
-      result.subscribe((resultRD) => {
-        expect(resultRD.payload.page).toBe(entries);
+      it('should send a GetRequest', () => {
+        result.pipe(take(1)).subscribe();
+        expect(requestService.send).toHaveBeenCalledWith(jasmine.any(GetRequest), false);
       });
     });
   });
diff --git a/src/app/core/data/external-source-data.service.ts b/src/app/core/data/external-source-data.service.ts
index c0552aeaec..16eaeb9321 100644
--- a/src/app/core/data/external-source-data.service.ts
+++ b/src/app/core/data/external-source-data.service.ts
@@ -1,20 +1,32 @@
 import { Injectable } from '@angular/core';
-import { ExternalSource } from '../shared/external-source.model';
-import { RequestService } from './request.service';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, switchMap, take } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
-import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list.model';
+import { ExternalSource } from '../shared/external-source.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { FindListOptions } from './find-list-options.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { IdentifiableDataService } from './base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from './base/search-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * A service handling all external source requests
@@ -50,7 +62,7 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
   getEntriesEndpoint(externalSourceId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
       map((href) => this.getIDHref(href, externalSourceId)),
-      switchMap((href) => this.halService.getEndpoint('entries', href))
+      switchMap((href) => this.halService.getEndpoint('entries', href)),
     );
   }
 
@@ -74,7 +86,12 @@ export class ExternalSourceDataService extends IdentifiableDataService<ExternalS
     );
 
     // TODO create a dedicated ExternalSourceEntryDataService and move this entire method to it. Then the "as any"s won't be necessary
-    return this.findListByHref(href$, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow as any) as any;
+
+    return this.hasCachedErrorResponse(href$).pipe(
+      switchMap((hasCachedErrorResponse) => {
+        return this.findListByHref(href$, undefined, !hasCachedErrorResponse, reRequestOnStale, ...linksToFollow as any);
+      }),
+    ) as any;
   }
 
   /**
diff --git a/src/app/core/data/facet-config-response-parsing.service.ts b/src/app/core/data/facet-config-response-parsing.service.ts
index 3e4493c32b..b4086428ea 100644
--- a/src/app/core/data/facet-config-response-parsing.service.ts
+++ b/src/app/core/data/facet-config-response-parsing.service.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
+
+import { FacetConfigResponse } from '../../shared/search/models/facet-config-response.model';
 import { SearchFilterConfig } from '../../shared/search/models/search-filter-config.model';
 import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
-import { FacetConfigResponse } from '../../shared/search/models/facet-config-response.model';
 import { RestRequest } from './rest-request.model';
 
 @Injectable()
@@ -16,19 +17,19 @@ export class FacetConfigResponseParsingService extends DspaceRestResponseParsing
     const filters = serializer.deserializeArray(config);
 
     const _links = {
-      self: data.payload._links.self
+      self: data.payload._links.self,
     };
 
     // fill in the missing links section
     filters.forEach((filterConfig: SearchFilterConfig) => {
       _links[filterConfig.name] = {
-        href: filterConfig._links.self.href
+        href: filterConfig._links.self.href,
       };
     });
 
     const facetConfigResponse = Object.assign(new FacetConfigResponse(), {
       filters,
-      _links
+      _links,
     });
 
     this.addToObjectCache(facetConfigResponse, request, data);
diff --git a/src/app/core/data/facet-value-response-parsing.service.ts b/src/app/core/data/facet-value-response-parsing.service.ts
index 0911ed5073..871f2a4965 100644
--- a/src/app/core/data/facet-value-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-response-parsing.service.ts
@@ -1,9 +1,10 @@
 import { Injectable } from '@angular/core';
+
 import { FacetValue } from '../../shared/search/models/facet-value.model';
-import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { FacetValues } from '../../shared/search/models/facet-values.model';
+import { ParsedResponse } from '../cache/response.models';
+import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
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..4048efe4ff 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
@@ -1,18 +1,26 @@
-import { AuthorizationDataService } from './authorization-data.service';
-import { SiteDataService } from '../site-data.service';
-import { Site } from '../../shared/site.model';
-import { EPerson } from '../../eperson/models/eperson.model';
-import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { FeatureID } from './feature-id';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { hasValue } from '../../../shared/empty.util';
-import { RequestParam } from '../../cache/models/request-param.model';
-import { Authorization } from '../../shared/authorization.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { Feature } from '../../shared/feature.model';
-import { FindListOptions } from '../find-list-options.model';
-import { testSearchDataImplementation } from '../base/search-data.spec';
 import { getMockObjectCacheService } from '../../../shared/mocks/object-cache.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { Authorization } from '../../shared/authorization.model';
+import { Feature } from '../../shared/feature.model';
+import { Site } from '../../shared/site.model';
+import { testSearchDataImplementation } from '../base/search-data.spec';
+import { FindListOptions } from '../find-list-options.model';
+import { SiteDataService } from '../site-data.service';
+import { AuthorizationDataService } from './authorization-data.service';
+import { FeatureID } from './feature-id';
 
 describe('AuthorizationDataService', () => {
   let service: AuthorizationDataService;
@@ -23,19 +31,19 @@ describe('AuthorizationDataService', () => {
   let ePerson: EPerson;
 
   const requestService = jasmine.createSpyObj('requestService', {
-    setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring')
+    setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring'),
   });
 
   function init() {
     site = Object.assign(new Site(), {
       id: 'test-site',
       _links: {
-        self: { href: 'test-site-href' }
-      }
+        self: { href: 'test-site-href' },
+      },
     });
     ePerson = Object.assign(new EPerson(), {
       id: 'test-eperson',
-      uuid: 'test-eperson'
+      uuid: 'test-eperson',
     });
     siteService = jasmine.createSpyObj('siteService', {
       find: observableOf(site),
@@ -157,26 +165,26 @@ describe('AuthorizationDataService', () => {
     const validPayload = [
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: 'invalid-feature'
-        }))
+          id: 'invalid-feature',
+        })),
       }),
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: featureID
-        }))
-      })
+          id: featureID,
+        })),
+      }),
     ];
     const invalidPayload = [
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: 'invalid-feature'
-        }))
+          id: 'invalid-feature',
+        })),
       }),
       Object.assign(new Authorization(), {
         feature: createSuccessfulRemoteDataObject$(Object.assign(new Feature(), {
-          id: 'another-invalid-feature'
-        }))
-      })
+          id: 'another-invalid-feature',
+        })),
+      }),
     ];
     const emptyPayload = [];
 
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..cd8705d2fb 100644
--- a/src/app/core/data/feature-authorization/authorization-data.service.ts
+++ b/src/app/core/data/feature-authorization/authorization-data.service.ts
@@ -1,26 +1,44 @@
-import { Observable, of as observableOf } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { AUTHORIZATION } from '../../shared/authorization.resource-type';
-import { Authorization } from '../../shared/authorization.model';
-import { RequestService } from '../request.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { SiteDataService } from '../site-data.service';
-import { followLink, FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { RemoteData } from '../remote-data';
-import { PaginatedList } from '../paginated-list.model';
-import { catchError, map, switchMap } from 'rxjs/operators';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
 import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { Authorization } from '../../shared/authorization.model';
+import { AUTHORIZATION } from '../../shared/authorization.resource-type';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
+import { BaseDataService } from '../base/base-data.service';
+import { dataService } from '../base/data-service.decorator';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../base/search-data';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { SiteDataService } from '../site-data.service';
 import { AuthorizationSearchParams } from './authorization-search-params';
 import { oneAuthorizationMatchesFeature } from './authorization-utils';
 import { FeatureID } from './feature-id';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
-import { FindListOptions } from '../find-list-options.model';
-import { BaseDataService } from '../base/base-data.service';
-import { SearchData, SearchDataImpl } from '../base/search-data';
-import { dataService } from '../base/data-service.decorator';
 
 /**
  * A service to retrieve {@link Authorization}s from the REST API
@@ -74,8 +92,8 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
           return [];
         }
       }),
-      catchError(() => observableOf(false)),
-      oneAuthorizationMatchesFeature(featureId)
+      catchError(() => observableOf([])),
+      oneAuthorizationMatchesFeature(featureId),
     );
   }
 
@@ -100,7 +118,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
       switchMap((url) => {
         if (hasNoValue(url)) {
           return this.siteService.find().pipe(
-            map((site) => site.self)
+            map((site) => site.self),
           );
         } else {
           return observableOf(url);
@@ -112,7 +130,7 @@ export class AuthorizationDataService extends BaseDataService<Authorization> imp
       map((url: string) => new AuthorizationSearchParams(url, ePersonUuid, featureId)),
       switchMap((params: AuthorizationSearchParams) => {
         return this.searchBy(this.searchByObjectPath, this.createSearchOptions(params.objectUrl, options, params.ePersonUuid, params.featureId), useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-      })
+      }),
     );
 
     this.addDependency(out$, objectUrl$);
diff --git a/src/app/core/data/feature-authorization/authorization-utils.ts b/src/app/core/data/feature-authorization/authorization-utils.ts
index d1b65f6123..f763b1a38d 100644
--- a/src/app/core/data/feature-authorization/authorization-utils.ts
+++ b/src/app/core/data/feature-authorization/authorization-utils.ts
@@ -1,13 +1,25 @@
-import { map, switchMap } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { AuthorizationSearchParams } from './authorization-search-params';
-import { SiteDataService } from '../site-data.service';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../shared/empty.util';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { AuthService } from '../../auth/auth.service';
 import { Authorization } from '../../shared/authorization.model';
 import { Feature } from '../../shared/feature.model';
-import { FeatureID } from './feature-id';
 import { getFirstSucceededRemoteDataPayload } from '../../shared/operators';
+import { SiteDataService } from '../site-data.service';
+import { AuthorizationSearchParams } from './authorization-search-params';
+import { FeatureID } from './feature-id';
 
 /**
  * Operator accepting {@link AuthorizationSearchParams} and adding the current {@link Site}'s selflink to the parameter's
@@ -20,12 +32,12 @@ export const addSiteObjectUrlIfEmpty = (siteService: SiteDataService) =>
       switchMap((params: AuthorizationSearchParams) => {
         if (hasNoValue(params.objectUrl)) {
           return siteService.find().pipe(
-            map((site) => Object.assign({}, params, { objectUrl: site.self }))
+            map((site) => Object.assign({}, params, { objectUrl: site.self })),
           );
         } else {
           return observableOf(params);
         }
-      })
+      }),
     );
 
 /**
@@ -42,17 +54,17 @@ export const addAuthenticatedUserUuidIfEmpty = (authService: AuthService) =>
             switchMap((authenticated) => {
               if (authenticated) {
                 return authService.getAuthenticatedUserFromStore().pipe(
-                  map((ePerson) => Object.assign({}, params, { ePersonUuid: ePerson.uuid }))
+                  map((ePerson) => Object.assign({}, params, { ePersonUuid: ePerson.uuid })),
                 );
               } else {
                 return observableOf(params);
               }
-            })
+            }),
           );
         } else {
           return observableOf(params);
         }
-      })
+      }),
     );
 
 /**
@@ -68,16 +80,16 @@ 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()
-              ))
-          );
+                getFirstSucceededRemoteDataPayload(),
+              )),
+          ]);
         } else {
           return observableOf([]);
         }
       }),
-      map((features: Feature[]) => features.filter((feature: Feature) => feature.id === featureID).length > 0)
+      map((features: Feature[]) => features.filter((feature: Feature) => feature.id === featureID).length > 0),
     );
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts
index b41a322cb6..5af9f18b33 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/collection-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user
  * isn't a Collection administrator
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CollectionAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts
index 2ab77a00cc..2092fce110 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/community-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user
  * isn't a Community administrator
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CommunityAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts
index 6c1f330c69..234c2e1628 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.spec.ts
@@ -1,12 +1,21 @@
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../../remote-data';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard';
-import { FeatureID } from '../feature-id';
 import { AuthService } from '../../../auth/auth.service';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { RemoteData } from '../../remote-data';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { DsoPageSingleFeatureGuard } from './dso-page-single-feature.guard';
 
 /**
  * Test implementation of abstract class DsoPageSingleFeatureGuard
@@ -37,30 +46,30 @@ describe('DsoPageSingleFeatureGuard', () => {
 
   function init() {
     object = {
-      self: 'test-selflink'
+      self: 'test-selflink',
     } as DSpaceObject;
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     resolver = jasmine.createSpyObj('resolver', {
-      resolve: createSuccessfulRemoteDataObject$(object)
+      resolve: createSuccessfulRemoteDataObject$(object),
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     parentRoute = {
       params: {
-        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0'
-      }
+        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0',
+      },
     };
     route = {
       params: {
       },
-      parent: parentRoute
+      parent: parentRoute,
     };
     guard = new DsoPageSingleFeatureGuardImpl(resolver, authorizationService, router, authService, undefined);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts
index 3fc90f9069..1f75df846b 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard.ts
@@ -1,9 +1,13 @@
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { FeatureID } from '../feature-id';
-import { map } from 'rxjs/operators';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { FeatureID } from '../feature-id';
+import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';
 
 /**
  * Abstract Guard for preventing unauthorized access to {@link DSpaceObject} pages that require rights for a specific feature
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts
index 071b1b0731..61e236188d 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.spec.ts
@@ -1,11 +1,20 @@
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../../remote-data';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { FeatureID } from '../feature-id';
 import { AuthService } from '../../../auth/auth.service';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { RemoteData } from '../../remote-data';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
 import { DsoPageSomeFeatureGuard } from './dso-page-some-feature.guard';
 
 /**
@@ -37,30 +46,30 @@ describe('DsoPageSomeFeatureGuard', () => {
 
   function init() {
     object = {
-      self: 'test-selflink'
+      self: 'test-selflink',
     } as DSpaceObject;
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     resolver = jasmine.createSpyObj('resolver', {
-      resolve: createSuccessfulRemoteDataObject$(object)
+      resolve: createSuccessfulRemoteDataObject$(object),
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     parentRoute = {
       params: {
-        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0'
-      }
+        id: '3e1a5327-dabb-41ff-af93-e6cab9d032f0',
+      },
     };
     route = {
       params: {
       },
-      parent: parentRoute
+      parent: parentRoute,
     };
     guard = new DsoPageSomeFeatureGuardImpl(resolver, authorizationService, router, authService, []);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts
index 8683709345..eff2da2102 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard.ts
@@ -1,12 +1,21 @@
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../../shared/empty.util';
+import { AuthService } from '../../../auth/auth.service';
+import { DSpaceObject } from '../../../shared/dspace-object.model';
+import { getAllSucceededRemoteDataPayload } from '../../../shared/operators';
 import { RemoteData } from '../../remote-data';
 import { AuthorizationDataService } from '../authorization-data.service';
-import { Observable } from 'rxjs';
-import { getAllSucceededRemoteDataPayload } from '../../../shared/operators';
-import { map } from 'rxjs/operators';
-import { DSpaceObject } from '../../../shared/dspace-object.model';
-import { AuthService } from '../../../auth/auth.service';
-import { hasNoValue, hasValue } from '../../../../shared/empty.util';
 import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
 
 /**
@@ -28,7 +37,7 @@ export abstract class DsoPageSomeFeatureGuard<T extends DSpaceObject> extends So
     const routeWithObjectID = this.getRouteWithDSOId(route);
     return (this.resolver.resolve(routeWithObjectID, state) as Observable<RemoteData<T>>).pipe(
       getAllSucceededRemoteDataPayload(),
-      map((dso) => dso.self)
+      map((dso) => dso.self),
     );
   }
 
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts
index 5afd572326..5f32e26851 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/group-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have group
  * management rights
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class GroupAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts
index 635aa3530b..e789f8c473 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.spec.ts
@@ -1,9 +1,17 @@
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../../auth/auth.service';
 import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
-import { Observable, of as observableOf } from 'rxjs';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthService } from '../../../auth/auth.service';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Test implementation of abstract class SingleFeatureAuthorizationGuard
@@ -48,13 +56,13 @@ describe('SingleFeatureAuthorizationGuard', () => {
     ePersonUuid = 'fake-eperson-uuid';
 
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     guard = new SingleFeatureAuthorizationGuardImpl(authorizationService, router, authService, featureId, objectUrl, ePersonUuid);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts
index cb71d2f418..cd9f615aa7 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard.ts
@@ -1,7 +1,11 @@
-import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
-import { FeatureID } from '../feature-id';
+import {
+  ActivatedRouteSnapshot,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { map} from 'rxjs/operators';
+import { map } from 'rxjs/operators';
+
+import { FeatureID } from '../feature-id';
 import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
 
 /**
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
index cc6f50c161..9a7c9de5c4 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/site-administrator.guard.ts
@@ -1,17 +1,25 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { FeatureID } from '../feature-id';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have administrator
  * rights to the {@link Site}
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SiteAdministratorGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
index bdbb8250e2..bde2d1c14e 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/site-register.guard.ts
@@ -1,17 +1,25 @@
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 import { Injectable } from '@angular/core';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have registration
  * rights to the {@link Site}
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SiteRegisterGuard extends SingleFeatureAuthorizationGuard {
   constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts
index 90153d2d14..53d77cadad 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.spec.ts
@@ -1,8 +1,16 @@
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../../auth/auth.service';
 import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
-import { Observable, of as observableOf } from 'rxjs';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { AuthService } from '../../../auth/auth.service';
 import { SomeFeatureAuthorizationGuard } from './some-feature-authorization.guard';
 
 /**
@@ -52,13 +60,13 @@ describe('SomeFeatureAuthorizationGuard', () => {
     authorizationService = Object.assign({
       isAuthorized(featureId?: FeatureID): Observable<boolean> {
         return observableOf(authorizedFeatureIds.indexOf(featureId) > -1);
-      }
+      },
     });
     router = jasmine.createSpyObj('router', {
-      parseUrl: {}
+      parseUrl: {},
     });
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     guard = new SomeFeatureAuthorizationGuardImpl(authorizationService, router, authService, featureIds, objectUrl, ePersonUuid);
   }
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts
index b909640ea6..0849c5a96a 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/some-feature-authorization.guard.ts
@@ -1,10 +1,21 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { FeatureID } from '../feature-id';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+
 import { AuthService } from '../../../auth/auth.service';
 import { returnForbiddenUrlTreeOrLoginOnAllFalse } from '../../../shared/authorized.operators';
+import { AuthorizationDataService } from '../authorization-data.service';
+import { FeatureID } from '../feature-id';
 
 /**
  * Abstract Guard for preventing unauthorized activating and loading of routes when a user
@@ -24,9 +35,9 @@ export abstract class SomeFeatureAuthorizationGuard implements CanActivate {
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> {
     return observableCombineLatest(this.getFeatureIDs(route, state), this.getObjectUrl(route, state), this.getEPersonUuid(route, state)).pipe(
       switchMap(([featureIDs, objectUrl, ePersonUuid]) =>
-        observableCombineLatest(...featureIDs.map((featureID) => this.authorizationService.isAuthorized(featureID, objectUrl, ePersonUuid)))
+        observableCombineLatest(...featureIDs.map((featureID) => this.authorizationService.isAuthorized(featureID, objectUrl, ePersonUuid))),
       ),
-      returnForbiddenUrlTreeOrLoginOnAllFalse(this.router, this.authService, state.url)
+      returnForbiddenUrlTreeOrLoginOnAllFalse(this.router, this.authService, state.url),
     );
   }
 
diff --git a/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts b/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts
index 680495686e..b301d550a1 100644
--- a/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts
+++ b/src/app/core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard.ts
@@ -1,27 +1,35 @@
 import { Injectable } from '@angular/core';
-import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
-import { AuthorizationDataService } from '../authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../../auth/auth.service';
-import { Observable, of as observableOf } from 'rxjs';
+import { AuthorizationDataService } from '../authorization-data.service';
 import { FeatureID } from '../feature-id';
+import { SingleFeatureAuthorizationGuard } from './single-feature-authorization.guard';
 
 /**
  * Prevent unauthorized activating and loading of routes when the current authenticated user doesn't have group
  * management rights
  */
 @Injectable({
-    providedIn: 'root'
+  providedIn: 'root',
 })
 export class StatisticsAdministratorGuard extends SingleFeatureAuthorizationGuard {
-    constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
-        super(authorizationService, router, authService);
-    }
+  constructor(protected authorizationService: AuthorizationDataService, protected router: Router, protected authService: AuthService) {
+    super(authorizationService, router, authService);
+  }
 
-    /**
+  /**
      * Check group management rights
      */
-    getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
-        return observableOf(FeatureID.CanViewUsageStatistics);
-    }
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.CanViewUsageStatistics);
+  }
 }
diff --git a/src/app/core/data/feature-authorization/feature-data.service.ts b/src/app/core/data/feature-authorization/feature-data.service.ts
index eda8791153..184e8c0be9 100644
--- a/src/app/core/data/feature-authorization/feature-data.service.ts
+++ b/src/app/core/data/feature-authorization/feature-data.service.ts
@@ -1,12 +1,13 @@
 import { Injectable } from '@angular/core';
-import { FEATURE } from '../../shared/feature.resource-type';
-import { Feature } from '../../shared/feature.model';
-import { RequestService } from '../request.service';
+
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
+import { Feature } from '../../shared/feature.model';
+import { FEATURE } from '../../shared/feature.resource-type';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { BaseDataService } from '../base/base-data.service';
 import { dataService } from '../base/data-service.decorator';
+import { RequestService } from '../request.service';
 
 /**
  * A service to retrieve {@link Feature}s from the REST API
diff --git a/src/app/core/data/feature-authorization/feature-id.ts b/src/app/core/data/feature-authorization/feature-id.ts
index 3cb18bf515..3d5803b018 100644
--- a/src/app/core/data/feature-authorization/feature-id.ts
+++ b/src/app/core/data/feature-authorization/feature-id.ts
@@ -29,5 +29,12 @@ export enum FeatureID {
   CanViewUsageStatistics = 'canViewUsageStatistics',
   CanSendFeedback = 'canSendFeedback',
   CanClaimItem = 'canClaimItem',
-  CanSynchronizeWithORCID = 'canSynchronizeWithORCID'
+  CanSynchronizeWithORCID = 'canSynchronizeWithORCID',
+  CanSubmit = 'canSubmit',
+  CanEditItem = 'canEditItem',
+  CanRegisterDOI = 'canRegisterDOI',
+  CanSubscribe = 'canSubscribeDso',
+  CoarNotifyEnabled = 'coarNotifyEnabled',
+  CanSeeQA = 'canSeeQA',
+  EPersonForgotPassword = 'epersonForgotPassword'
 }
diff --git a/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts b/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
index ac0e96a2e6..6966e6a631 100644
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.spec.ts
@@ -1,10 +1,10 @@
-import { FilteredDiscoveryPageResponseParsingService } from './filtered-discovery-page-response-parsing.service';
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { FilteredDiscoveryQueryResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { GenericConstructor } from '../shared/generic-constructor';
+import { FilteredDiscoveryPageResponseParsingService } from './filtered-discovery-page-response-parsing.service';
 import { ResponseParsingService } from './parsing.service';
 import { GetRequest } from './request.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { FilteredDiscoveryQueryResponse } from '../cache/response.models';
 
 describe('FilteredDiscoveryPageResponseParsingService', () => {
   let service: FilteredDiscoveryPageResponseParsingService;
@@ -17,15 +17,15 @@ describe('FilteredDiscoveryPageResponseParsingService', () => {
     const request = Object.assign(new GetRequest('client/f5b4ccb8-fbb0-4548-b558-f234d9fdfad6', 'https://rest.api/path'), {
       getResponseParser(): GenericConstructor<ResponseParsingService> {
         return FilteredDiscoveryPageResponseParsingService;
-      }
+      },
     });
 
     const mockResponse = {
       payload: {
-        'discovery-query': 'query'
+        'discovery-query': 'query',
       },
       statusCode: 200,
-      statusText: 'OK'
+      statusText: 'OK',
     } as RawRestResponse;
 
     it('should return a FilteredDiscoveryQueryResponse containing the correct query', () => {
diff --git a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
index da7a21c488..fed0d70c58 100644
--- a/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
+++ b/src/app/core/data/filtered-discovery-page-response-parsing.service.ts
@@ -1,9 +1,13 @@
 import { Injectable } from '@angular/core';
-import { ResponseParsingService } from './parsing.service';
+
+import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  FilteredDiscoveryQueryResponse,
+  RestResponse,
+} from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FilteredDiscoveryQueryResponse, RestResponse } from '../cache/response.models';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
 
 /**
diff --git a/src/app/core/data/find-list-options.model.ts b/src/app/core/data/find-list-options.model.ts
index dc567d4b53..78fe26fcab 100644
--- a/src/app/core/data/find-list-options.model.ts
+++ b/src/app/core/data/find-list-options.model.ts
@@ -1,15 +1,15 @@
-import { SortOptions } from '../cache/models/sort-options.model';
 import { RequestParam } from '../cache/models/request-param.model';
+import { SortOptions } from '../cache/models/sort-options.model';
 
 /**
  * The options for a find list request
  */
 export class FindListOptions {
-    scopeID?: string;
-    elementsPerPage?: number;
-    currentPage?: number;
-    sort?: SortOptions;
-    searchParams?: RequestParam[];
-    startsWith?: string;
-    fetchThumbnail?: boolean;
+  scopeID?: string;
+  elementsPerPage?: number;
+  currentPage?: number;
+  sort?: SortOptions;
+  searchParams?: RequestParam[];
+  startsWith?: string;
+  fetchThumbnail?: boolean;
 }
diff --git a/src/app/core/data/href-only-data.service.spec.ts b/src/app/core/data/href-only-data.service.spec.ts
index bf7d2890ea..cba85d5de6 100644
--- a/src/app/core/data/href-only-data.service.spec.ts
+++ b/src/app/core/data/href-only-data.service.spec.ts
@@ -1,8 +1,11 @@
-import { HrefOnlyDataService } from './href-only-data.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FindListOptions } from './find-list-options.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { BaseDataService } from './base/base-data.service';
+import { FindListOptions } from './find-list-options.model';
+import { HrefOnlyDataService } from './href-only-data.service';
 
 describe(`HrefOnlyDataService`, () => {
   let service: HrefOnlyDataService;
@@ -23,60 +26,60 @@ describe(`HrefOnlyDataService`, () => {
     expect((service as any).dataService).toBeInstanceOf(BaseDataService);
   });
 
-    describe(`findByHref`, () => {
-      beforeEach(() => {
-        spy = spyOn((service as any).dataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
-      });
+  describe(`findByHref`, () => {
+    beforeEach(() => {
+      spy = spyOn((service as any).dataService, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
 
-      it(`should forward to findByHref on the internal DataService`, () => {
-        service.findByHref(href, false, false, ...followLinks);
-        expect(spy).toHaveBeenCalledWith(href, false, false, ...followLinks);
-      });
+    it(`should forward to findByHref on the internal DataService`, () => {
+      service.findByHref(href, false, false, ...followLinks);
+      expect(spy).toHaveBeenCalledWith(href, false, false, ...followLinks);
+    });
 
-      describe(`when useCachedVersionIfAvailable is omitted`, () => {
-        it(`should call findByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
-            service.findByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), true, jasmine.anything());
-        });
-      });
-
-      describe(`when reRequestOnStale is omitted`, () => {
-        it(`should call findByHref on the internal DataService with reRequestOnStale = true`, () => {
-            service.findByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true);
-        });
+    describe(`when useCachedVersionIfAvailable is omitted`, () => {
+      it(`should call findByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
+        service.findByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), true, jasmine.anything());
       });
     });
 
-    describe(`findListByHref`, () => {
-      beforeEach(() => {
-        spy = spyOn((service as any).dataService, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
-      });
-
-      it(`should delegate to findListByHref on the internal DataService`, () => {
-        service.findListByHref(href, findListOptions, false, false, ...followLinks);
-        expect(spy).toHaveBeenCalledWith(href, findListOptions, false, false, ...followLinks);
-      });
-
-      describe(`when findListOptions is omitted`, () => {
-        it(`should call findListByHref on the internal DataService with findListOptions = {}`, () => {
-            service.findListByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), {}, jasmine.anything(), jasmine.anything());
-        });
-      });
-
-      describe(`when useCachedVersionIfAvailable is omitted`, () => {
-        it(`should call findListByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
-            service.findListByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true, jasmine.anything());
-        });
-      });
-
-      describe(`when reRequestOnStale is omitted`, () => {
-        it(`should call findListByHref on the internal DataService with reRequestOnStale = true`, () => {
-            service.findListByHref(href);
-            expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), jasmine.anything(), true);
-        });
+    describe(`when reRequestOnStale is omitted`, () => {
+      it(`should call findByHref on the internal DataService with reRequestOnStale = true`, () => {
+        service.findByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true);
       });
     });
+  });
+
+  describe(`findListByHref`, () => {
+    beforeEach(() => {
+      spy = spyOn((service as any).dataService, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+    });
+
+    it(`should delegate to findListByHref on the internal DataService`, () => {
+      service.findListByHref(href, findListOptions, false, false, ...followLinks);
+      expect(spy).toHaveBeenCalledWith(href, findListOptions, false, false, ...followLinks);
+    });
+
+    describe(`when findListOptions is omitted`, () => {
+      it(`should call findListByHref on the internal DataService with findListOptions = {}`, () => {
+        service.findListByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), {}, jasmine.anything(), jasmine.anything());
+      });
+    });
+
+    describe(`when useCachedVersionIfAvailable is omitted`, () => {
+      it(`should call findListByHref on the internal DataService with useCachedVersionIfAvailable = true`, () => {
+        service.findListByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), true, jasmine.anything());
+      });
+    });
+
+    describe(`when reRequestOnStale is omitted`, () => {
+      it(`should call findListByHref on the internal DataService with reRequestOnStale = true`, () => {
+        service.findListByHref(href);
+        expect(spy).toHaveBeenCalledWith(jasmine.anything(), jasmine.anything(), jasmine.anything(), true);
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/href-only-data.service.ts b/src/app/core/data/href-only-data.service.ts
index 0a765de101..83fb431e9b 100644
--- a/src/app/core/data/href-only-data.service.ts
+++ b/src/app/core/data/href-only-data.service.ts
@@ -1,24 +1,25 @@
-import { RequestService } from './request.service';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Injectable } from '@angular/core';
-import { VOCABULARY_ENTRY } from '../submission/vocabularies/models/vocabularies.resource-type';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RemoteData } from './remote-data';
-import { Observable } from 'rxjs';
-import { PaginatedList } from './paginated-list.model';
 import { ITEM_TYPE } from '../shared/item-relationships/item-type.resource-type';
 import { LICENSE } from '../shared/license.resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { FindListOptions } from './find-list-options.model';
+import { VOCABULARY_ENTRY } from '../submission/vocabularies/models/vocabularies.resource-type';
 import { BaseDataService } from './base/base-data.service';
-import { HALDataService } from './base/hal-data-service.interface';
 import { dataService } from './base/data-service.decorator';
+import { HALDataService } from './base/hal-data-service.interface';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
- * A DataService with only findByHref methods. Its purpose is to be used for resources that don't
- * need to be retrieved by ID, or have any way to update them, but require a DataService in order
+ * A UpdateDataServiceImpl with only findByHref methods. Its purpose is to be used for resources that don't
+ * need to be retrieved by ID, or have any way to update them, but require a UpdateDataServiceImpl in order
  * for their links to be resolved by the LinkService.
  *
  * an @dataService annotation can be added for any number of these resource types
diff --git a/src/app/core/data/identifier-data.service.ts b/src/app/core/data/identifier-data.service.ts
new file mode 100644
index 0000000000..bf6172fd47
--- /dev/null
+++ b/src/app/core/data/identifier-data.service.ts
@@ -0,0 +1,93 @@
+import {
+  HttpClient,
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
+import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { sendRequest } from '../shared/request.operators';
+import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
+import { ConfigurationDataService } from './configuration-data.service';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { RemoteData } from './remote-data';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RestRequest } from './rest-request.model';
+
+/**
+ * The service handling all REST requests to get item identifiers like handles and DOIs
+ * from the /identifiers endpoint, as well as the backend configuration that controls whether a 'Register DOI'
+ * button appears for admins in the item status page
+ */
+@Injectable()
+@dataService(IDENTIFIERS)
+export class IdentifierDataService extends BaseDataService<IdentifierData> {
+
+  constructor(
+    protected comparator: DefaultChangeAnalyzer<IdentifierData>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected objectCache: ObjectCacheService,
+    protected rdbService: RemoteDataBuildService,
+    protected requestService: RequestService,
+    protected store: Store<CoreState>,
+    private configurationService: ConfigurationDataService,
+  ) {
+    super('identifiers', requestService, rdbService, objectCache, halService);
+  }
+
+  /**
+   * Returns {@link RemoteData} of {@link IdentifierData} representing identifiers for this item
+   * @param item  Item we are querying
+   */
+  getIdentifierDataFor(item: Item): Observable<RemoteData<IdentifierData>> {
+    return this.findByHref(item._links.identifiers.href, false, true);
+  }
+
+  /**
+   * Should we allow registration of new DOIs via the item status page?
+   */
+  public getIdentifierRegistrationConfiguration(): Observable<string[]> {
+    return this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
+      getFirstCompletedRemoteData(),
+      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : []),
+    );
+  }
+
+  public registerIdentifier(item: Item, type: string): Observable<RemoteData<any>> {
+    const requestId = this.requestService.generateRequestId();
+    return this.getEndpoint().pipe(
+      map((endpointURL: string) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'text/uri-list');
+        options.headers = headers;
+        let params = new HttpParams();
+        params = params.append('type', type);
+        options.params = params;
+        return new PostRequest(requestId, endpointURL, item._links.self.href, options);
+      }),
+      sendRequest(this.requestService),
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid) as Observable<RemoteData<any>>),
+    );
+  }
+}
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index 2c20ed0fb6..915c065a9e 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -1,25 +1,32 @@
 import { HttpClient } from '@angular/common/http';
 import { Store } from '@ngrx/store';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { BrowseService } from '../browse/browse.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { ExternalSourceEntry } from '../shared/external-source-entry.model';
-import { ItemDataService } from './item-data.service';
-import { DeleteRequest, PostRequest } from './request.models';
-import { RequestService } from './request.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
-import { FindListOptions } from './find-list-options.model';
-import { HALEndpointServiceStub } from 'src/app/shared/testing/hal-endpoint-service.stub';
+import { ExternalSourceEntry } from '../shared/external-source-entry.model';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { ItemDataService } from './item-data.service';
+import {
+  DeleteRequest,
+  PostRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('ItemDataService', () => {
   let scheduler: TestScheduler;
@@ -46,7 +53,7 @@ describe('ItemDataService', () => {
   const objectCache = {} as ObjectCacheService;
   const halEndpointService: any = new HALEndpointServiceStub(itemEndpoint);
   const bundleService = jasmine.createSpyObj('bundleService', {
-    findByHref: {}
+    findByHref: {},
   });
 
   const scopeID = '4af28e99-6a9c-4036-a199-e1b587046d39';
@@ -54,8 +61,8 @@ describe('ItemDataService', () => {
     scopeID: scopeID,
     sort: {
       field: '',
-      direction: undefined
-    }
+      direction: undefined,
+    },
   });
 
   const browsesEndpoint = 'https://rest.api/discover/browses';
@@ -73,7 +80,7 @@ describe('ItemDataService', () => {
       cold('--a-', { a: itemBrowseEndpoint }) :
       cold('--#-', undefined, browseError);
     return jasmine.createSpyObj('bs', {
-      getBrowseURLFor: obs
+      getBrowseURLFor: obs,
     });
   }
 
@@ -158,7 +165,7 @@ describe('ItemDataService', () => {
     const externalSourceEntry = Object.assign(new ExternalSourceEntry(), {
       display: 'John, Doe',
       value: 'John, Doe',
-      _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } }
+      _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } },
     });
 
     beforeEach(() => {
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 09268a0282..f071f6e1b8 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -8,44 +8,73 @@
 /* eslint-disable max-classes-per-file */
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, switchMap, take } from 'rxjs/operators';
-import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Bundle } from '../shared/bundle.model';
 import { Collection } from '../shared/collection.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
+import { GenericConstructor } from '../shared/generic-constructor';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
 import { ITEM } from '../shared/item.resource-type';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { PaginatedList } from './paginated-list.model';
-import { RemoteData } from './remote-data';
-import { DeleteRequest, GetRequest, PostRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { Bundle } from '../shared/bundle.model';
 import { MetadataMap } from '../shared/metadata.models';
-import { BundleDataService } from './bundle-data.service';
-import { Operation } from 'fast-json-patch';
 import { NoContent } from '../shared/NoContent.model';
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from './parsing.service';
-import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
 import { sendRequest } from '../shared/request.operators';
-import { RestRequest } from './rest-request.model';
-import { FindListOptions } from './find-list-options.model';
-import { ConstructIdEndpoint, IdentifiableDataService } from './base/identifiable-data.service';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { RestRequestMethod } from './rest-request-method';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { RequestParam } from '../cache/models/request-param.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
 import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  ConstructIdEndpoint,
+  IdentifiableDataService,
+} from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import { BundleDataService } from './bundle-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { ResponseParsingService } from './parsing.service';
+import { RemoteData } from './remote-data';
+import {
+  DeleteRequest,
+  GetRequest,
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
+import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
 
 /**
  * An abstract service for CRUD operations on Items
@@ -140,7 +169,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
         return new PostRequest(this.requestService.generateRequestId(), endpointURL, collectionHref, options);
       }),
       sendRequest(this.requestService),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid))
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)),
     );
   }
 
@@ -152,7 +181,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
   public setWithDrawn(item: Item, withdrawn: boolean): Observable<RemoteData<Item>> {
 
     const patchOperation = {
-      op: 'replace', path: '/withdrawn', value: withdrawn
+      op: 'replace', path: '/withdrawn', value: withdrawn,
     } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 
@@ -166,7 +195,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public setDiscoverable(item: Item, discoverable: boolean): Observable<RemoteData<Item>> {
     const patchOperation = {
-      op: 'replace', path: '/discoverable', value: discoverable
+      op: 'replace', path: '/discoverable', value: discoverable,
     } as Operation;
     this.requestService.removeByHrefSubstring('/discover');
 
@@ -180,7 +209,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getBundlesEndpoint(itemId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((url: string) => this.halService.getEndpoint('bundles', `${url}/${itemId}`))
+      switchMap((url: string) => this.halService.getEndpoint('bundles', `${url}/${itemId}`)),
     );
   }
 
@@ -191,10 +220,10 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getBundles(itemId: string, searchOptions?: PaginatedSearchOptions): Observable<RemoteData<PaginatedList<Bundle>>> {
     const hrefObs = this.getBundlesEndpoint(itemId).pipe(
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href),
     );
     hrefObs.pipe(
-      take(1)
+      take(1),
     ).subscribe((href) => {
       const request = new GetRequest(this.requestService.generateRequestId(), href);
       this.requestService.send(request);
@@ -215,11 +244,11 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
 
     const bundleJson = {
       name: bundleName,
-      metadata: metadata ? metadata : {}
+      metadata: metadata ? metadata : {},
     };
 
     hrefObs.pipe(
-      take(1)
+      take(1),
     ).subscribe((href) => {
       const options: HttpOptions = Object.create({});
       let headers = new HttpHeaders();
@@ -232,14 +261,24 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
     return this.rdbService.buildFromRequestUUID(requestId);
   }
 
+  /**
+   * Get the endpoint for an item's identifiers
+   * @param itemId
+   */
+  public getIdentifiersEndpoint(itemId: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      switchMap((url: string) => this.halService.getEndpoint('identifiers', `${url}/${itemId}`)),
+    );
+  }
+
   /**
    * Get the endpoint to move the item
    * @param itemId
    */
-  public getMoveItemEndpoint(itemId: string): Observable<string> {
+  public getMoveItemEndpoint(itemId: string, inheritPolicies: boolean): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       map((endpoint: string) => this.getIDHref(endpoint, itemId)),
-      map((endpoint: string) => `${endpoint}/owningCollection`),
+      map((endpoint: string) => `${endpoint}/owningCollection?inheritPolicies=${inheritPolicies}`),
     );
   }
 
@@ -248,14 +287,14 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    * @param itemId
    * @param collection
    */
-  public moveToCollection(itemId: string, collection: Collection): Observable<RemoteData<any>> {
+  public moveToCollection(itemId: string, collection: Collection, inheritPolicies: boolean): Observable<RemoteData<any>> {
     const options: HttpOptions = Object.create({});
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
     options.headers = headers;
 
     const requestId = this.requestService.generateRequestId();
-    const hrefObs = this.getMoveItemEndpoint(itemId);
+    const hrefObs = this.getMoveItemEndpoint(itemId, inheritPolicies);
 
     hrefObs.pipe(
       find((href: string) => hasValue(href)),
@@ -265,10 +304,10 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
           // TODO: for now, the move Item endpoint returns a malformed collection -- only look at the status code
           getResponseParser(): GenericConstructor<ResponseParsingService> {
             return StatusCodeOnlyResponseParsingService;
-          }
+          },
         });
         return request;
-      })
+      }),
     ).subscribe((request) => {
       this.requestService.send(request);
     });
@@ -295,7 +334,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
       map((href: string) => {
         const request = new PostRequest(requestId, href, externalSourceEntry._links.self.href, options);
         this.requestService.send(request);
-      })
+      }),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID(requestId);
@@ -307,7 +346,7 @@ export abstract class BaseItemDataService extends IdentifiableDataService<Item>
    */
   public getBitstreamsEndpoint(itemId: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath).pipe(
-      switchMap((url: string) => this.halService.getEndpoint('bitstreams', `${url}/${itemId}`))
+      switchMap((url: string) => this.halService.getEndpoint('bitstreams', `${url}/${itemId}`)),
     );
   }
 
diff --git a/src/app/core/data/item-request-data.service.spec.ts b/src/app/core/data/item-request-data.service.spec.ts
index a5d1872510..68577ae6e2 100644
--- a/src/app/core/data/item-request-data.service.spec.ts
+++ b/src/app/core/data/item-request-data.service.spec.ts
@@ -1,12 +1,13 @@
-import { ItemRequestDataService } from './item-request-data.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../shared/item-request.model';
-import { PostRequest } from './request.models';
+
 import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ItemRequest } from '../shared/item-request.model';
+import { ItemRequestDataService } from './item-request-data.service';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
 import { RestRequestMethod } from './rest-request-method';
 
 describe('ItemRequestDataService', () => {
diff --git a/src/app/core/data/item-request-data.service.ts b/src/app/core/data/item-request-data.service.ts
index ff6025f7ac..5c85ed1471 100644
--- a/src/app/core/data/item-request-data.service.ts
+++ b/src/app/core/data/item-request-data.service.ts
@@ -1,20 +1,32 @@
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map } from 'rxjs/operators';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { RemoteData } from './remote-data';
-import { PostRequest, PutRequest } from './request.models';
-import { RequestService } from './request.service';
-import { ItemRequest } from '../shared/item-request.model';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HttpHeaders } from '@angular/common/http';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+} from 'rxjs/operators';
+
 import { RequestCopyEmail } from '../../request-copy/email-request-copy/request-copy-email.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { ItemRequest } from '../shared/item-request.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { sendRequest } from '../shared/request.operators';
 import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RemoteData } from './remote-data';
+import {
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the itemrequests endpoint
@@ -60,11 +72,11 @@ export class ItemRequestDataService extends IdentifiableDataService<ItemRequest>
       map((href: string) => {
         const request = new PostRequest(requestId, href, itemRequest);
         this.requestService.send(request);
-      })
+      }),
     ).subscribe();
 
     return this.rdbService.buildFromRequestUUID<ItemRequest>(requestId).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
diff --git a/src/app/core/data/item-template-data.service.spec.ts b/src/app/core/data/item-template-data.service.spec.ts
index 16cf0dbd99..27db819861 100644
--- a/src/app/core/data/item-template-data.service.spec.ts
+++ b/src/app/core/data/item-template-data.service.spec.ts
@@ -1,22 +1,26 @@
-import { ItemTemplateDataService } from './item-template-data.service';
-import { RestResponse } from '../cache/response.models';
-import { RequestService } from './request.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { BrowseService } from '../browse/browse.service';
 import { cold } from 'jasmine-marbles';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { CollectionDataService } from './collection-data.service';
-import { RestRequestMethod } from './rest-request-method';
-import { Item } from '../shared/item.model';
-import { RestRequest } from './rest-request.model';
+import { BrowseService } from '../browse/browse.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RestResponse } from '../cache/response.models';
 import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testPatchDataImplementation } from './base/patch-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { CollectionDataService } from './collection-data.service';
+import { ItemTemplateDataService } from './item-template-data.service';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
 import createSpyObj = jasmine.createSpyObj;
 
 describe('ItemTemplateDataService', () => {
@@ -46,7 +50,7 @@ describe('ItemTemplateDataService', () => {
     },
     commit(method?: RestRequestMethod) {
       // Do nothing
-    }
+    },
   } as RequestService;
   const rdbService = {} as RemoteDataBuildService;
   const store = {} as Store<CoreState>;
@@ -62,18 +66,18 @@ describe('ItemTemplateDataService', () => {
   const halEndpointService = {
     getEndpoint(linkPath: string): Observable<string> {
       return cold('a', { a: itemEndpoint });
-    }
+    },
   } as HALEndpointService;
   const notificationsService = {} as NotificationsService;
   const comparator = {
     diff(first, second) {
       return [{}];
-    }
+    },
   } as any;
   const collectionService = {
     getIDHrefObs(id): Observable<string> {
       return observableOf(collectionEndpoint);
-    }
+    },
   } as CollectionDataService;
 
   function initTestService() {
diff --git a/src/app/core/data/item-template-data.service.ts b/src/app/core/data/item-template-data.service.ts
index 634c966dba..0ee362c71a 100644
--- a/src/app/core/data/item-template-data.service.ts
+++ b/src/app/core/data/item-template-data.service.ts
@@ -1,22 +1,23 @@
 /* eslint-disable max-classes-per-file */
 import { Injectable } from '@angular/core';
-import { BaseItemDataService } from './item-data.service';
-import { Item } from '../shared/item.model';
-import { RemoteData } from './remote-data';
 import { Observable } from 'rxjs';
-import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
-import { RequestService } from './request.service';
+import { switchMap } from 'rxjs/operators';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { BrowseService } from '../browse/browse.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { BrowseService } from '../browse/browse.service';
-import { CollectionDataService } from './collection-data.service';
-import { switchMap } from 'rxjs/operators';
-import { BundleDataService } from './bundle-data.service';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { Item } from '../shared/item.model';
 import { CreateDataImpl } from './base/create-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { BundleDataService } from './bundle-data.service';
+import { CollectionDataService } from './collection-data.service';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { BaseItemDataService } from './item-data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * Data service for interacting with Item templates via their Collection
diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts
index 58598b9870..93b4ed6696 100644
--- a/src/app/core/data/lookup-relation.service.spec.ts
+++ b/src/app/core/data/lookup-relation.service.spec.ts
@@ -1,18 +1,22 @@
-import { LookupRelationService } from './lookup-relation.service';
-import { ExternalSourceDataService } from './external-source-data.service';
-import { SearchService } from '../shared/search/search.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { buildPaginatedList } from './paginated-list.model';
-import { PageInfo } from '../shared/page-info.model';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
-import { SearchResult } from '../../shared/search/models/search-result.model';
-import { Item } from '../shared/item.model';
-import { skip, take } from 'rxjs/operators';
-import { ExternalSource } from '../shared/external-source.model';
-import { RequestService } from './request.service';
 import { of as observableOf } from 'rxjs';
+import {
+  skip,
+  take,
+} from 'rxjs/operators';
+
+import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchResult } from '../../shared/search/models/search-result.model';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ExternalSource } from '../shared/external-source.model';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { SearchService } from '../shared/search/search.service';
+import { ExternalSourceDataService } from './external-source-data.service';
+import { LookupRelationService } from './lookup-relation.service';
+import { buildPaginatedList } from './paginated-list.model';
+import { RequestService } from './request.service';
 
 describe('LookupRelationService', () => {
   let service: LookupRelationService;
@@ -24,20 +28,20 @@ describe('LookupRelationService', () => {
   const optionsWithQuery = new PaginatedSearchOptions({ query: 'test-query' });
   const relationship = Object.assign(new RelationshipOptions(), {
     filter: 'test-filter',
-    configuration: 'test-configuration'
+    configuration: 'test-configuration',
   });
   const localResults = [
     Object.assign(new SearchResult(), {
       indexableObject: Object.assign(new Item(), {
         uuid: 'test-item-uuid',
-        handle: 'test-item-handle'
-      })
-    })
+        handle: 'test-item-handle',
+      }),
+    }),
   ];
   const externalSource = Object.assign(new ExternalSource(), {
     id: 'orcidV2',
     name: 'orcidV2',
-    hierarchical: false
+    hierarchical: false,
   });
   const searchServiceEndpoint = 'http://test-rest.com/server/api/core/search';
 
@@ -47,12 +51,12 @@ describe('LookupRelationService', () => {
         elementsPerPage: 1,
         totalElements: totalExternal,
         totalPages: totalExternal,
-        currentPage: 1
-      }), [{}]))
+        currentPage: 1,
+      }), [{}])),
     });
     searchService = jasmine.createSpyObj('searchService', {
       search: createSuccessfulRemoteDataObject$(createPaginatedList(localResults)),
-      getEndpoint: observableOf(searchServiceEndpoint)
+      getEndpoint: observableOf(searchServiceEndpoint),
     });
     requestService = jasmine.createSpyObj('requestService', ['removeByHrefSubstring']);
     service = new LookupRelationService(externalSourceService, searchService, requestService);
@@ -77,7 +81,7 @@ describe('LookupRelationService', () => {
 
     it('should set the searchConfig to contain a fixedFilter and configuration', () => {
       expect(service.searchConfig).toEqual(Object.assign(new PaginatedSearchOptions({}), optionsWithQuery,
-        { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration }
+        { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration },
       ));
     });
   });
diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts
index 7a6bc2358b..31b9ed845c 100644
--- a/src/app/core/data/lookup-relation.service.ts
+++ b/src/app/core/data/lookup-relation.service.ts
@@ -1,19 +1,34 @@
-import { ExternalSourceDataService } from './external-source-data.service';
-import { SearchService } from '../shared/search/search.service';
-import { concat, distinctUntilChanged, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  ReplaySubject,
+} from 'rxjs';
+import {
+  concat,
+  distinctUntilChanged,
+  map,
+  multicast,
+  startWith,
+  take,
+  takeWhile,
+} from 'rxjs/operators';
+
+import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { Observable, ReplaySubject } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { PaginatedList } from './paginated-list.model';
 import { SearchResult } from '../../shared/search/models/search-result.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
-import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
-import { Item } from '../shared/item.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { Injectable } from '@angular/core';
 import { ExternalSource } from '../shared/external-source.model';
 import { ExternalSourceEntry } from '../shared/external-source-entry.model';
+import { Item } from '../shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { SearchService } from '../shared/search/search.service';
+import { ExternalSourceDataService } from './external-source-data.service';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
 
 /**
@@ -31,7 +46,7 @@ export class LookupRelationService {
    */
   private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'single-result-options',
-    pageSize: 1
+    pageSize: 1,
   });
 
   constructor(protected externalSourceService: ExternalSourceDataService,
@@ -47,7 +62,7 @@ export class LookupRelationService {
    */
   getLocalResults(relationship: RelationshipOptions, searchOptions: PaginatedSearchOptions, setSearchConfig = true): Observable<RemoteData<PaginatedList<SearchResult<Item>>>> {
     const newConfig = Object.assign(new PaginatedSearchOptions({}), searchOptions,
-      { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration }
+      { fixedFilter: relationship.filter, configuration: relationship.searchConfiguration },
     );
     if (setSearchConfig) {
       this.searchConfig = newConfig;
@@ -59,8 +74,8 @@ export class LookupRelationService {
         () => new ReplaySubject(1),
         (subject) => subject.pipe(
           takeWhile((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => rd.isLoading),
-          concat(subject.pipe(take(1)))
-        )
+          concat(subject.pipe(take(1))),
+        ),
       ) as any
       ,
     ) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
@@ -76,7 +91,7 @@ export class LookupRelationService {
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
       map((results: PaginatedList<SearchResult<Item>>) => results.totalElements),
-      startWith(0)
+      startWith(0),
     );
   }
 
@@ -91,7 +106,7 @@ export class LookupRelationService {
       getRemoteDataPayload(),
       map((results: PaginatedList<ExternalSourceEntry>) => results.totalElements),
       startWith(0),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/data/metadata-field-data.service.spec.ts b/src/app/core/data/metadata-field-data.service.spec.ts
index 1ce078f5d5..8d65038060 100644
--- a/src/app/core/data/metadata-field-data.service.spec.ts
+++ b/src/app/core/data/metadata-field-data.service.spec.ts
@@ -1,20 +1,21 @@
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../cache/response.models';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { MetadataFieldDataService } from './metadata-field-data.service';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from './find-list-options.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { RestResponse } from '../cache/response.models';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testCreateDataImplementation } from './base/create-data.spec';
-import { testSearchDataImplementation } from './base/search-data.spec';
-import { testPutDataImplementation } from './base/put-data.spec';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { MetadataFieldDataService } from './metadata-field-data.service';
+import { RequestService } from './request.service';
 
 describe('MetadataFieldDataService', () => {
   let metadataFieldService: MetadataFieldDataService;
@@ -31,8 +32,8 @@ describe('MetadataFieldDataService', () => {
       prefix: 'dc',
       namespace: 'namespace',
       _links: {
-        self: { href: 'selflink' }
-      }
+        self: { href: 'selflink' },
+      },
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
@@ -73,7 +74,7 @@ describe('MetadataFieldDataService', () => {
     it('should call searchBy with the correct arguments', () => {
       metadataFieldService.findBySchema(schema);
       const expectedOptions = Object.assign(new FindListOptions(), {
-        searchParams: [new RequestParam('schema', schema.prefix)]
+        searchParams: [new RequestParam('schema', schema.prefix)],
       });
       expect(metadataFieldService.searchBy).toHaveBeenCalledWith('bySchema', expectedOptions, true, true);
     });
diff --git a/src/app/core/data/metadata-field-data.service.ts b/src/app/core/data/metadata-field-data.service.ts
index d05e3533d3..c6a08fa82b 100644
--- a/src/app/core/data/metadata-field-data.service.ts
+++ b/src/app/core/data/metadata-field-data.service.ts
@@ -1,27 +1,40 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { METADATA_FIELD } from '../metadata/metadata-field.resource-type';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { take } from 'rxjs/operators';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from './find-list-options.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { PutData, PutDataImpl } from './base/put-data';
-import { CreateData, CreateDataImpl } from './base/create-data';
-import { NoContent } from '../shared/NoContent.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadatafields endpoint
diff --git a/src/app/core/data/metadata-schema-data.service.spec.ts b/src/app/core/data/metadata-schema-data.service.spec.ts
index 1bcf4e1104..02fbc016e7 100644
--- a/src/app/core/data/metadata-schema-data.service.spec.ts
+++ b/src/app/core/data/metadata-schema-data.service.spec.ts
@@ -1,16 +1,20 @@
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { MetadataSchemaDataService } from './metadata-schema-data.service';
 import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../cache/response.models';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { CreateRequest, PutRequest } from './request.models';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RestResponse } from '../cache/response.models';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { MetadataSchemaDataService } from './metadata-schema-data.service';
+import {
+  CreateRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
 
 describe('MetadataSchemaDataService', () => {
   let metadataSchemaService: MetadataSchemaDataService;
@@ -61,8 +65,8 @@ describe('MetadataSchemaDataService', () => {
         prefix: 'dc',
         namespace: 'namespace',
         _links: {
-          self: { href: 'selflink' }
-        }
+          self: { href: 'selflink' },
+        },
       });
     });
 
@@ -78,7 +82,7 @@ describe('MetadataSchemaDataService', () => {
     describe('called with an existing metadata schema', () => {
       beforeEach(() => {
         schema = Object.assign(schema, {
-          id: 'id-of-existing-schema'
+          id: 'id-of-existing-schema',
         });
       });
 
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index 6bd633b8c6..8054dcf657 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -1,25 +1,38 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { tap } from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { METADATA_SCHEMA } from '../metadata/metadata-schema.resource-type';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { Observable } from 'rxjs';
-import { hasValue } from '../../shared/empty.util';
-import { tap } from 'rxjs/operators';
-import { RemoteData } from './remote-data';
-import { PutData, PutDataImpl } from './base/put-data';
-import { CreateData, CreateDataImpl } from './base/create-data';
 import { NoContent } from '../shared/NoContent.model';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FindListOptions } from './find-list-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { PaginatedList } from './paginated-list.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { DeleteData, DeleteDataImpl } from './base/delete-data';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
 import { dataService } from './base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the metadataschemas endpoint
diff --git a/src/app/core/data/mydspace-response-parsing.service.ts b/src/app/core/data/mydspace-response-parsing.service.ts
index e46e319149..8e7532a58e 100644
--- a/src/app/core/data/mydspace-response-parsing.service.ts
+++ b/src/app/core/data/mydspace-response-parsing.service.ts
@@ -1,10 +1,14 @@
 import { Injectable } from '@angular/core';
+
+import { hasValue } from '../../shared/empty.util';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { ParsedResponse } from '../cache/response.models';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { hasValue } from '../../shared/empty.util';
-import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { MetadataMap, MetadataValue } from '../shared/metadata.models';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../shared/metadata.models';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
@@ -14,8 +18,8 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
     // fallback for unexpected empty response
     const emptyPayload = {
       _embedded: {
-        objects: []
-      }
+        objects: [],
+      },
     };
     const payload = data.payload._embedded.searchResult || emptyPayload;
     const hitHighlights: MetadataMap[] = payload._embedded.objects
@@ -26,7 +30,7 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
           for (const key of Object.keys(hhObject)) {
             const value: MetadataValue = Object.assign(new MetadataValue(), {
               value: hhObject[key].join('...'),
-              language: null
+              language: null,
             });
             mdMap[key] = [value];
           }
@@ -46,7 +50,7 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
       .map((object, index) => Object.assign({}, object, {
         indexableObject: dsoSelfLinks[index],
         hitHighlights: hitHighlights[index],
-        _embedded: this.filterEmbeddedObjects(object)
+        _embedded: this.filterEmbeddedObjects(object),
       }));
     payload.objects = objects;
     const deserialized: any = new DSpaceSerializer(SearchObjects).deserialize(payload);
@@ -65,8 +69,8 @@ export class MyDSpaceResponseParsingService extends DspaceRestResponseParsingSer
             .reduce((obj, key) => {
               obj[key] = object._embedded.indexableObject._embedded[key];
               return obj;
-            }, {})
-        })
+            }, {}),
+        }),
       });
     } else {
       return object;
diff --git a/src/app/core/data/notify-services-status-data.service.spec.ts b/src/app/core/data/notify-services-status-data.service.spec.ts
new file mode 100644
index 0000000000..e336843505
--- /dev/null
+++ b/src/app/core/data/notify-services-status-data.service.spec.ts
@@ -0,0 +1,88 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotifyRequestsStatus } from '../../item-page/simple/notify-requests-status/notify-requests-status.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotifyRequestsStatusDataService } from './notify-services-status-data.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { RequestEntryState } from './request-entry-state.model';
+
+describe('NotifyRequestsStatusDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: NotifyRequestsStatusDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/suggestiontargets`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new NotifyRequestsStatusDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+      buildFromHref: createSuccessfulRemoteDataObject$({ test: 'test' }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('getNotifyRequestsStatus', () => {
+    it('should get notify status', (done) => {
+      service.getNotifyRequestsStatus(requestUUID).subscribe((status) => {
+        expect(halService.getEndpoint).toHaveBeenCalled();
+        expect(requestService.generateRequestId).toHaveBeenCalled();
+        expect(status).toEqual(createSuccessfulRemoteDataObject({ test: 'test' } as unknown as NotifyRequestsStatus));
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/notify-services-status-data.service.ts b/src/app/core/data/notify-services-status-data.service.ts
new file mode 100644
index 0000000000..ad0c32fadd
--- /dev/null
+++ b/src/app/core/data/notify-services-status-data.service.ts
@@ -0,0 +1,49 @@
+import { Injectable } from '@angular/core';
+import {
+  map,
+  Observable,
+  take,
+} from 'rxjs';
+
+import { NotifyRequestsStatus } from '../../item-page/simple/notify-requests-status/notify-requests-status.model';
+import { NOTIFYREQUEST } from '../../item-page/simple/notify-requests-status/notify-requests-status.resource-type';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RemoteData } from './remote-data';
+import { GetRequest } from './request.models';
+import { RequestService } from './request.service';
+
+@Injectable()
+@dataService(NOTIFYREQUEST)
+export class NotifyRequestsStatusDataService extends IdentifiableDataService<NotifyRequestsStatus> {
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('notifyrequests', requestService, rdbService, objectCache, halService);
+  }
+
+  /**
+   * Retrieves the status of notify requests for a specific item.
+   * @param itemUuid The UUID of the item.
+   * @returns An Observable that emits the remote data containing the notify requests status.
+   */
+  getNotifyRequestsStatus(itemUuid: string): Observable<RemoteData<NotifyRequestsStatus>> {
+    const href$ = this.getEndpoint().pipe(
+      map((url: string) => url + '/' + itemUuid ),
+    );
+
+    href$.pipe(take(1)).subscribe((url: string) => {
+      const request = new GetRequest(this.requestService.generateRequestId(), url);
+      this.requestService.send(request, true);
+    });
+
+    return this.rdbService.buildFromHref(href$);
+  }
+}
diff --git a/src/app/core/data/object-updates/field-update.model.ts b/src/app/core/data/object-updates/field-update.model.ts
index 47b6782471..71ae3bb68f 100644
--- a/src/app/core/data/object-updates/field-update.model.ts
+++ b/src/app/core/data/object-updates/field-update.model.ts
@@ -1,5 +1,5 @@
-import { Identifiable } from './identifiable.model';
 import { FieldChangeType } from './field-change-type.model';
+import { Identifiable } from './identifiable.model';
 
 /**
  * The state of a single field update
diff --git a/src/app/core/data/object-updates/object-updates.actions.ts b/src/app/core/data/object-updates/object-updates.actions.ts
index 615dedbaf9..8a95a7827c 100644
--- a/src/app/core/data/object-updates/object-updates.actions.ts
+++ b/src/app/core/data/object-updates/object-updates.actions.ts
@@ -1,11 +1,12 @@
 /* eslint-disable max-classes-per-file */
-import { type } from '../../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
+
+import { type } from '../../../shared/ngrx/type';
 import { INotification } from '../../../shared/notifications/models/notification.model';
-import { PatchOperationService } from './patch-operation-service/patch-operation.service';
 import { GenericConstructor } from '../../shared/generic-constructor';
-import { Identifiable } from './identifiable.model';
 import { FieldChangeType } from './field-change-type.model';
+import { Identifiable } from './identifiable.model';
+import { PatchOperationService } from './patch-operation-service/patch-operation.service';
 
 /**
  * The list of ObjectUpdatesAction type definitions
@@ -20,7 +21,7 @@ export const ObjectUpdatesActionTypes = {
   REINSTATE: type('dspace/core/cache/object-updates/REINSTATE'),
   REMOVE: type('dspace/core/cache/object-updates/REMOVE'),
   REMOVE_ALL: type('dspace/core/cache/object-updates/REMOVE_ALL'),
-  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD')
+  REMOVE_FIELD: type('dspace/core/cache/object-updates/REMOVE_FIELD'),
 };
 
 
@@ -49,7 +50,7 @@ export class InitializeFieldsAction implements Action {
     url: string,
     fields: Identifiable[],
     lastModified: Date,
-    patchOperationService?: GenericConstructor<PatchOperationService>
+    patchOperationService?: GenericConstructor<PatchOperationService>,
   ) {
     this.payload = { url, fields, lastModified, patchOperationService };
   }
@@ -113,7 +114,7 @@ export class SelectVirtualMetadataAction implements Action {
     uuid: string,
     select: boolean,
   ) {
-    this.payload = { url, source, uuid, select: select};
+    this.payload = { url, source, uuid, select: select };
   }
 }
 
@@ -193,7 +194,7 @@ export class DiscardObjectUpdatesAction implements Action {
   constructor(
     url: string,
     notification: INotification,
-    discardAll = false
+    discardAll = false,
   ) {
     this.payload = { url, notification, discardAll };
   }
@@ -215,7 +216,7 @@ export class ReinstateObjectUpdatesAction implements Action {
    *    the unique url of the page for which the changes should be reinstated
    */
   constructor(
-    url: string
+    url: string,
   ) {
     this.payload = { url };
   }
@@ -237,7 +238,7 @@ export class RemoveObjectUpdatesAction implements Action {
    *    the unique url of the page for which the changes should be removed
    */
   constructor(
-    url: string
+    url: string,
   ) {
     this.payload = { url };
   }
@@ -269,7 +270,7 @@ export class RemoveFieldUpdateAction implements Action {
    */
   constructor(
     url: string,
-    uuid: string
+    uuid: string,
   ) {
     this.payload = { url, uuid };
   }
diff --git a/src/app/core/data/object-updates/object-updates.effects.spec.ts b/src/app/core/data/object-updates/object-updates.effects.spec.ts
index ffd20a7300..10f37d78cb 100644
--- a/src/app/core/data/object-updates/object-updates.effects.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.effects.spec.ts
@@ -1,24 +1,35 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Observable, Subject } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
+import { Action } from '@ngrx/store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  Subject,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { NoOpAction } from '../../../shared/ngrx/no-op.action';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ObjectUpdatesEffects } from './object-updates.effects';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import {
   DiscardObjectUpdatesAction,
   ObjectUpdatesAction,
   ReinstateObjectUpdatesAction,
   RemoveFieldUpdateAction,
-  RemoveObjectUpdatesAction
+  RemoveObjectUpdatesAction,
 } from './object-updates.actions';
-import {
-  INotification,
-  Notification
-} from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { filter } from 'rxjs/operators';
-import { hasValue } from '../../../shared/empty.util';
-import { NoOpAction } from '../../../shared/ngrx/no-op.action';
+import { ObjectUpdatesEffects } from './object-updates.effects';
 
 describe('ObjectUpdatesEffects', () => {
   let updatesEffects: ObjectUpdatesEffects;
@@ -31,13 +42,7 @@ describe('ObjectUpdatesEffects', () => {
       providers: [
         ObjectUpdatesEffects,
         provideMockActions(() => actions),
-        {
-          provide: NotificationsService,
-          useValue: {
-            remove: (notification) => { /* empty */
-            }
-          }
-        },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
     });
   }));
@@ -59,7 +64,6 @@ describe('ObjectUpdatesEffects', () => {
         action = new RemoveObjectUpdatesAction(testURL);
       });
       it('should emit the action from the actionMap\'s value which key matches the action\'s URL', () => {
-        action = new RemoveObjectUpdatesAction(testURL);
         actions = hot('--a-', { a: action });
         (updatesEffects as any).actionMap$[testURL].subscribe((act) => emittedAction = act);
         const expected = cold('--b-', { b: undefined });
@@ -81,14 +85,19 @@ describe('ObjectUpdatesEffects', () => {
           removeAction = new RemoveObjectUpdatesAction(testURL);
         });
         it('should return a RemoveObjectUpdatesAction', () => {
-          actions = hot('a|', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
-          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.pipe(
-            filter(((action) => hasValue(action))))
-            .subscribe((t) => {
-                expect(t).toEqual(removeAction);
-              }
-            )
-          ;
+          actions = hot('a', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
+
+          // Because we use Subject and not BehaviourSubject we need to subscribe to it beforehand because it does not
+          // keep track of the current state
+          let emittedAction: Action | undefined;
+          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((action: Action | NoOpAction) => {
+            emittedAction = action;
+          });
+
+          // This expect ensures that the mapLastActions$ was processed
+          expect(updatesEffects.mapLastActions$).toBeObservable(cold('a', { a: undefined }));
+
+          expect(emittedAction).toEqual(removeAction);
         });
       });
 
@@ -98,12 +107,24 @@ describe('ObjectUpdatesEffects', () => {
           infoNotification.options.timeOut = 10;
         });
         it('should return an action with type NO_ACTION', () => {
-          actions = hot('a', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
-          actions = hot('b', { b: new ReinstateObjectUpdatesAction(testURL) });
-          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((t) => {
-              expect(t).toEqual(new NoOpAction());
-            }
-          );
+          actions = hot('--(ab)', {
+            a: new DiscardObjectUpdatesAction(testURL, infoNotification),
+            b: new ReinstateObjectUpdatesAction(testURL),
+          });
+
+          // Because we use Subject and not BehaviourSubject we need to subscribe to it beforehand because it does not
+          // keep track of the current state
+          let emittedAction: Action | undefined;
+          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.pipe(
+            take(2),
+          ).subscribe((action: Action | NoOpAction) => {
+            emittedAction = action;
+          });
+
+          // This expect ensures that the mapLastActions$ was processed
+          expect(updatesEffects.mapLastActions$).toBeObservable(cold('--(ab)', { a: undefined, b: undefined }));
+
+          expect(emittedAction).toEqual(new RemoveObjectUpdatesAction(testURL));
         });
       });
 
@@ -113,12 +134,22 @@ describe('ObjectUpdatesEffects', () => {
           infoNotification.options.timeOut = 10;
         });
         it('should return a RemoveObjectUpdatesAction', () => {
-          actions = hot('a', { a: new DiscardObjectUpdatesAction(testURL, infoNotification) });
-          actions = hot('b', { b: new RemoveFieldUpdateAction(testURL, testUUID) });
+          actions = hot('--(ab)', {
+            a: new DiscardObjectUpdatesAction(testURL, infoNotification),
+            b: new RemoveFieldUpdateAction(testURL, testUUID),
+          });
 
-          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((t) =>
-            expect(t).toEqual(new RemoveObjectUpdatesAction(testURL))
-          );
+          // Because we use Subject and not BehaviourSubject we need to subscribe to it beforehand because it does not
+          // keep track of the current state
+          let emittedAction: Action | undefined;
+          updatesEffects.removeAfterDiscardOrReinstateOnUndo$.subscribe((action: Action | NoOpAction) => {
+            emittedAction = action;
+          });
+
+          // This expect ensures that the mapLastActions$ was processed
+          expect(updatesEffects.mapLastActions$).toBeObservable(cold('--(ab)', { a: undefined, b: undefined }));
+
+          expect(emittedAction).toEqual(new RemoveObjectUpdatesAction(testURL));
         });
       });
     });
diff --git a/src/app/core/data/object-updates/object-updates.effects.ts b/src/app/core/data/object-updates/object-updates.effects.ts
index 1dfdc95f23..5ef86dbbec 100644
--- a/src/app/core/data/object-updates/object-updates.effects.ts
+++ b/src/app/core/data/object-updates/object-updates.effects.ts
@@ -1,24 +1,43 @@
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Action } from '@ngrx/store';
+import {
+  of as observableOf,
+  race as observableRace,
+  Subject,
+} from 'rxjs';
+import {
+  delay,
+  filter,
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { NoOpAction } from '../../../shared/ngrx/no-op.action';
+import { INotification } from '../../../shared/notifications/models/notification.model';
+import {
+  NotificationsActions,
+  NotificationsActionTypes,
+  RemoveNotificationAction,
+} from '../../../shared/notifications/notifications.actions';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   DiscardObjectUpdatesAction,
   ObjectUpdatesAction,
   ObjectUpdatesActionTypes,
   RemoveAllObjectUpdatesAction,
-  RemoveObjectUpdatesAction
+  RemoveObjectUpdatesAction,
 } from './object-updates.actions';
-import { delay, filter, map, switchMap, take, tap } from 'rxjs/operators';
-import { of as observableOf, race as observableRace, Subject } from 'rxjs';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { INotification } from '../../../shared/notifications/models/notification.model';
-import {
-  NotificationsActions,
-  NotificationsActionTypes,
-  RemoveNotificationAction
-} from '../../../shared/notifications/notifications.actions';
-import { Action } from '@ngrx/store';
-import { NoOpAction } from '../../../shared/ngrx/no-op.action';
 
 /**
  * NGRX effects for ObjectUpdatesActions
@@ -52,7 +71,7 @@ export class ObjectUpdatesEffects {
   /**
    * Effect that makes sure all last fired ObjectUpdatesActions are stored in the map of this service, with the url as their key
    */
-   mapLastActions$ = createEffect(() => this.actions$
+  mapLastActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(...Object.values(ObjectUpdatesActionTypes)),
       map((action: ObjectUpdatesAction) => {
@@ -63,23 +82,23 @@ export class ObjectUpdatesEffects {
           }
           this.actionMap$[url].next(action);
         }
-      })
+      }),
     ), { dispatch: false });
 
   /**
    * Effect that makes sure all last fired NotificationActions are stored in the notification map of this service, with the id as their key
    */
-   mapLastNotificationActions$ = createEffect(() => this.actions$
+  mapLastNotificationActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(...Object.values(NotificationsActionTypes)),
       map((action: RemoveNotificationAction) => {
-          const id: string = action.payload.id || action.payload || this.allIdentifier;
-          if (hasNoValue(this.notificationActionMap$[id])) {
-            this.notificationActionMap$[id] = new Subject<NotificationsActions>();
-          }
-          this.notificationActionMap$[id].next(action);
+        const id: string = action.payload.id || action.payload || this.allIdentifier;
+        if (hasNoValue(this.notificationActionMap$[id])) {
+          this.notificationActionMap$[id] = new Subject<NotificationsActions>();
         }
-      )
+        this.notificationActionMap$[id].next(action);
+      },
+      ),
     ), { dispatch: false });
 
   /**
@@ -88,52 +107,52 @@ export class ObjectUpdatesEffects {
    * When a REINSTATE action is fired during the timeout, a NO_ACTION action will be returned
    * When any other ObjectUpdatesAction is fired during the timeout, a RemoteObjectUpdatesAction will be returned
    */
-   removeAfterDiscardOrReinstateOnUndo$ = createEffect(() => this.actions$
+  removeAfterDiscardOrReinstateOnUndo$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectUpdatesActionTypes.DISCARD),
       switchMap((action: DiscardObjectUpdatesAction) => {
-          const url: string = action.payload.url;
-          const notification: INotification = action.payload.notification;
-          const timeOut = notification.options.timeOut;
+        const url: string = action.payload.url;
+        const notification: INotification = action.payload.notification;
+        const timeOut = notification.options.timeOut;
 
-          let removeAction: Action = new RemoveObjectUpdatesAction(action.payload.url);
-          if (action.payload.discardAll) {
-            removeAction = new RemoveAllObjectUpdatesAction();
-          }
-
-          return observableRace(
-            // Either wait for the delay and perform a remove action
-            observableOf(removeAction).pipe(delay(timeOut)),
-            // Or wait for a a user action
-            this.actionMap$[url].pipe(
-              take(1),
-              tap(() => {
-                this.notificationsService.remove(notification);
-              }),
-              map((updateAction: ObjectUpdatesAction) => {
-                if (updateAction.type === ObjectUpdatesActionTypes.REINSTATE) {
-                  // If someone reinstated, do nothing, just let the reinstating happen
-                  return new NoOpAction();
-                }
-                // If someone performed another action, assume the user does not want to reinstate and remove all changes
-                return removeAction;
-              })
-            ),
-            this.notificationActionMap$[notification.id].pipe(
-              filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_NOTIFICATION),
-              map(() => {
-                return removeAction;
-              })
-            ),
-            this.notificationActionMap$[this.allIdentifier].pipe(
-              filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_ALL_NOTIFICATIONS),
-              map(() => {
-                return removeAction;
-              })
-            )
-          );
+        let removeAction: Action = new RemoveObjectUpdatesAction(action.payload.url);
+        if (action.payload.discardAll) {
+          removeAction = new RemoveAllObjectUpdatesAction();
         }
-      )
+
+        return observableRace(
+          // Either wait for the delay and perform a remove action
+          observableOf(removeAction).pipe(delay(timeOut)),
+          // Or wait for a a user action
+          this.actionMap$[url].pipe(
+            take(1),
+            tap(() => {
+              this.notificationsService.remove(notification);
+            }),
+            map((updateAction: ObjectUpdatesAction) => {
+              if (updateAction.type === ObjectUpdatesActionTypes.REINSTATE) {
+                // If someone reinstated, do nothing, just let the reinstating happen
+                return new NoOpAction();
+              }
+              // If someone performed another action, assume the user does not want to reinstate and remove all changes
+              return removeAction;
+            }),
+          ),
+          this.notificationActionMap$[notification.id].pipe(
+            filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_NOTIFICATION),
+            map(() => {
+              return removeAction;
+            }),
+          ),
+          this.notificationActionMap$[this.allIdentifier].pipe(
+            filter((notificationsAction: NotificationsActions) => notificationsAction.type === NotificationsActionTypes.REMOVE_ALL_NOTIFICATIONS),
+            map(() => {
+              return removeAction;
+            }),
+          ),
+        );
+      },
+      ),
     ));
 
   constructor(private actions$: Actions,
diff --git a/src/app/core/data/object-updates/object-updates.reducer.spec.ts b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
index a51a1431bb..1f2a15769b 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.spec.ts
@@ -1,4 +1,8 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { FieldChangeType } from './field-change-type.model';
 import {
   AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
@@ -9,11 +13,13 @@ import {
   RemoveObjectUpdatesAction,
   SelectVirtualMetadataAction,
   SetEditableFieldUpdateAction,
-  SetValidFieldUpdateAction
+  SetValidFieldUpdateAction,
 } from './object-updates.actions';
-import { OBJECT_UPDATES_TRASH_PATH, objectUpdatesReducer } from './object-updates.reducer';
-import { Relationship } from '../../shared/item-relationships/relationship.model';
-import { FieldChangeType } from './field-change-type.model';
+import {
+  OBJECT_UPDATES_TRASH_PATH,
+  objectUpdatesReducer,
+  ObjectUpdatesState,
+} from './object-updates.reducer';
 
 class NullAction extends RemoveFieldUpdateAction {
   type = null;
@@ -28,26 +34,26 @@ const identifiable1 = {
   uuid: '8222b07e-330d-417b-8d7f-3b82aeaf2320',
   key: 'dc.contributor.author',
   language: null,
-  value: 'Smith, John'
+  value: 'Smith, John',
 };
 
 const identifiable1update = {
   uuid: '8222b07e-330d-417b-8d7f-3b82aeaf2320',
   key: 'dc.contributor.author',
   language: null,
-  value: 'Smith, James'
+  value: 'Smith, James',
 };
 const identifiable2 = {
   uuid: '26cbb5ce-5786-4e57-a394-b9fcf8eaf241',
   key: 'dc.title',
   language: null,
-  value: 'New title'
+  value: 'New title',
 };
 const identifiable3 = {
   uuid: 'c5d2c2f7-d757-48bf-84cc-8c9229c8407e',
   key: 'dc.description.abstract',
   language: null,
-  value: 'Unchanged value'
+  value: 'Unchanged value',
 };
 const relationship: Relationship = Object.assign(new Relationship(), { uuid: 'test relationship uuid' });
 
@@ -55,65 +61,62 @@ const modDate = new Date(2010, 2, 11);
 const uuid = identifiable1.uuid;
 const url = 'test-object.url/edit';
 describe('objectUpdatesReducer', () => {
-  const testState = {
+  const testState: ObjectUpdatesState = {
     [url]: {
       fieldStates: {
         [identifiable1.uuid]: {
           editable: true,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
         [identifiable2.uuid]: {
           editable: false,
           isNew: true,
-          isValid: true
+          isValid: true,
         },
         [identifiable3.uuid]: {
           editable: false,
           isNew: false,
-          isValid: false
+          isValid: false,
         },
       },
       fieldUpdates: {
         [identifiable2.uuid]: {
           field: {
             uuid: identifiable2.uuid,
-            key: 'dc.titl',
-            language: null,
-            value: 'New title'
           },
-          changeType: FieldChangeType.ADD
-        }
+          changeType: FieldChangeType.ADD,
+        },
       },
       lastModified: modDate,
       virtualMetadataSources: {
-        [relationship.uuid]: { [identifiable1.uuid]: true }
+        [relationship.uuid]: { [identifiable1.uuid]: true },
       },
-    }
+    },
   };
 
-  const discardedTestState = {
+  const discardedTestState: ObjectUpdatesState = {
     [url]: {
       fieldStates: {
         [identifiable1.uuid]: {
           editable: true,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
         [identifiable2.uuid]: {
           editable: false,
           isNew: true,
-          isValid: true
+          isValid: true,
         },
         [identifiable3.uuid]: {
           editable: false,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
       },
       lastModified: modDate,
       virtualMetadataSources: {
-        [relationship.uuid]: { [identifiable1.uuid]: true }
+        [relationship.uuid]: { [identifiable1.uuid]: true },
       },
     },
     [url + OBJECT_UPDATES_TRASH_PATH]: {
@@ -121,35 +124,32 @@ describe('objectUpdatesReducer', () => {
         [identifiable1.uuid]: {
           editable: true,
           isNew: false,
-          isValid: true
+          isValid: true,
         },
         [identifiable2.uuid]: {
           editable: false,
           isNew: true,
-          isValid: true
+          isValid: true,
         },
         [identifiable3.uuid]: {
           editable: false,
           isNew: false,
-          isValid: false
+          isValid: false,
         },
       },
       fieldUpdates: {
         [identifiable2.uuid]: {
           field: {
             uuid: identifiable2.uuid,
-            key: 'dc.titl',
-            language: null,
-            value: 'New title'
           },
-          changeType: FieldChangeType.ADD
-        }
+          changeType: FieldChangeType.ADD,
+        },
       },
       lastModified: modDate,
       virtualMetadataSources: {
-        [relationship.uuid]: { [identifiable1.uuid]: true }
+        [relationship.uuid]: { [identifiable1.uuid]: true },
       },
-    }
+    },
   };
 
   deepFreeze(testState);
@@ -172,48 +172,80 @@ describe('objectUpdatesReducer', () => {
     const action = new InitializeFieldsAction(url, [identifiable1, identifiable2], modDate);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the SET_EDITABLE_FIELD action without affecting the previous state', () => {
     const action = new SetEditableFieldUpdateAction(url, uuid, false);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the ADD_FIELD action without affecting the previous state', () => {
     const action = new AddFieldUpdateAction(url, identifiable1update, FieldChangeType.UPDATE);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the DISCARD action without affecting the previous state', () => {
     const action = new DiscardObjectUpdatesAction(url, null);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the REINSTATE action without affecting the previous state', () => {
     const action = new ReinstateObjectUpdatesAction(url);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the REMOVE action without affecting the previous state', () => {
     const action = new RemoveFieldUpdateAction(url, uuid);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the REMOVE_FIELD action without affecting the previous state', () => {
     const action = new RemoveFieldUpdateAction(url, uuid);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should perform the SELECT_VIRTUAL_METADATA action without affecting the previous state', () => {
     const action = new SelectVirtualMetadataAction(url, relationship.uuid, identifiable1.uuid, true);
     // testState has already been frozen above
     objectUpdatesReducer(testState, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should initialize all fields when the INITIALIZE action is dispatched, based on the payload', () => {
@@ -225,19 +257,19 @@ describe('objectUpdatesReducer', () => {
           [identifiable1.uuid]: {
             editable: false,
             isNew: false,
-            isValid: true
+            isValid: true,
           },
           [identifiable3.uuid]: {
             editable: false,
             isNew: false,
-            isValid: true
+            isValid: true,
           },
         },
         fieldUpdates: {},
         virtualMetadataSources: {},
         lastModified: modDate,
-        patchOperationService: undefined
-      }
+        patchOperationService: undefined,
+      },
     };
     const newState = objectUpdatesReducer(testState, action);
     expect(newState).toEqual(expectedState);
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..e014889850 100644
--- a/src/app/core/data/object-updates/object-updates.reducer.ts
+++ b/src/app/core/data/object-updates/object-updates.reducer.ts
@@ -1,3 +1,14 @@
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { Item } from '../../shared/item.model';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../shared/item-relationships/relationship-type.model';
+import { FieldChangeType } from './field-change-type.model';
+import { FieldUpdates } from './field-updates.model';
+import { Identifiable } from './identifiable.model';
 import {
   AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
@@ -11,15 +22,7 @@ import {
   SetEditableFieldUpdateAction,
   SetValidFieldUpdateAction,
 } from './object-updates.actions';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { Relationship } from '../../shared/item-relationships/relationship.model';
 import { PatchOperationService } from './patch-operation-service/patch-operation.service';
-import { Item } from '../../shared/item.model';
-import { RelationshipType } from '../../shared/item-relationships/relationship-type.model';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { Identifiable } from './identifiable.model';
-import { FieldUpdates } from './field-updates.model';
-import { FieldChangeType } from './field-change-type.model';
 
 /**
  * Path where discarded objects are saved
@@ -77,7 +80,7 @@ export interface DeleteRelationship extends RelationshipIdentifiable {
  */
 export interface ObjectUpdatesEntry {
   fieldStates: FieldStates;
-  fieldUpdates: FieldUpdates;
+  fieldUpdates?: FieldUpdates;
   virtualMetadataSources: VirtualMetadataSources;
   lastModified: Date;
   patchOperationService?: GenericConstructor<PatchOperationService>;
@@ -164,7 +167,7 @@ function initializeFieldsUpdate(state: any, action: InitializeFieldsAction) {
     { fieldUpdates: {} },
     { virtualMetadataSources: {} },
     { lastModified: lastModifiedServer },
-    { patchOperationService }
+    { patchOperationService },
   );
   return Object.assign({}, state, { [url]: newPageState });
 }
@@ -178,7 +181,7 @@ function addFieldUpdate(state: any, action: AddFieldUpdateAction) {
   const url: string = action.payload.url;
   const field: Identifiable = action.payload.field;
   const changeType: FieldChangeType = action.payload.changeType;
-  const pageState: ObjectUpdatesEntry = state[url] || {fieldUpdates: {}};
+  const pageState: ObjectUpdatesEntry = state[url] || { fieldUpdates: {} };
 
   let states = pageState.fieldStates;
   if (changeType === FieldChangeType.ADD) {
@@ -231,7 +234,7 @@ function selectVirtualMetadata(state: any, action: SelectVirtualMetadataAction)
   const newPageState = Object.assign(
     {},
     pageState,
-    {virtualMetadataSources: virtualMetadataSources},
+    { virtualMetadataSources: virtualMetadataSources },
   );
 
   return Object.assign(
@@ -239,7 +242,7 @@ function selectVirtualMetadata(state: any, action: SelectVirtualMetadataAction)
     state,
     {
       [url]: newPageState,
-    }
+    },
   );
 }
 
@@ -279,7 +282,7 @@ function discardObjectUpdatesFor(url: string, state: any) {
 
   const discardedPageState = Object.assign({}, pageState, {
     fieldUpdates: {},
-    fieldStates: newFieldStates
+    fieldStates: newFieldStates,
   });
   return Object.assign({}, state, { [url]: discardedPageState }, { [url + OBJECT_UPDATES_TRASH_PATH]: pageState });
 }
@@ -357,7 +360,7 @@ function removeFieldUpdate(state: any, action: RemoveFieldUpdateAction) {
     }
     newPageState = Object.assign({}, state[url], {
       fieldUpdates: newUpdates,
-      fieldStates: newFieldStates
+      fieldStates: newFieldStates,
     });
   }
   return Object.assign({}, state, { [url]: newPageState });
diff --git a/src/app/core/data/object-updates/object-updates.service.spec.ts b/src/app/core/data/object-updates/object-updates.service.spec.ts
index 9cf856f03a..21486a581c 100644
--- a/src/app/core/data/object-updates/object-updates.service.spec.ts
+++ b/src/app/core/data/object-updates/object-updates.service.spec.ts
@@ -1,21 +1,22 @@
+import { Injector } from '@angular/core';
 import { Store } from '@ngrx/store';
-import { ObjectUpdatesService } from './object-updates.service';
+import { of as observableOf } from 'rxjs';
+
+import { Notification } from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { CoreState } from '../../core-state.model';
+import { Relationship } from '../../shared/item-relationships/relationship.model';
+import { FieldChangeType } from './field-change-type.model';
 import {
   DiscardObjectUpdatesAction,
   InitializeFieldsAction,
   ReinstateObjectUpdatesAction,
   RemoveFieldUpdateAction,
   SelectVirtualMetadataAction,
-  SetEditableFieldUpdateAction
+  SetEditableFieldUpdateAction,
 } from './object-updates.actions';
-import { of as observableOf } from 'rxjs';
-import { Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
 import { OBJECT_UPDATES_TRASH_PATH } from './object-updates.reducer';
-import { Relationship } from '../../shared/item-relationships/relationship.model';
-import { Injector } from '@angular/core';
-import { FieldChangeType } from './field-change-type.model';
-import { CoreState } from '../../core-state.model';
+import { ObjectUpdatesService } from './object-updates.service';
 
 describe('ObjectUpdatesService', () => {
   let service: ObjectUpdatesService;
@@ -31,7 +32,7 @@ describe('ObjectUpdatesService', () => {
 
   const fieldUpdates = {
     [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE },
-    [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD }
+    [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD },
   };
 
   const modDate = new Date(2010, 2, 11);
@@ -46,15 +47,15 @@ describe('ObjectUpdatesService', () => {
     };
 
     patchOperationService = jasmine.createSpyObj('patchOperationService', {
-      fieldUpdatesToPatchOperations: []
+      fieldUpdatesToPatchOperations: [],
     });
     const objectEntry = {
-      fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, patchOperationService
+      fieldStates, fieldUpdates, lastModified: modDate, virtualMetadataSources: {}, patchOperationService,
     };
     store = new Store<CoreState>(undefined, undefined, undefined);
     spyOn(store, 'dispatch');
     injector = jasmine.createSpyObj('injector', {
-      get: patchOperationService
+      get: patchOperationService,
     });
     service = new ObjectUpdatesService(store, injector);
 
@@ -80,7 +81,7 @@ describe('ObjectUpdatesService', () => {
       const expectedResult = {
         [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE },
         [identifiable2.uuid]: { field: identifiable2, changeType: undefined },
-        [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD }
+        [identifiable3.uuid]: { field: identifiable3, changeType: FieldChangeType.ADD },
       };
 
       result$.subscribe((result) => {
@@ -96,7 +97,7 @@ describe('ObjectUpdatesService', () => {
 
       const expectedResult = {
         [identifiable1.uuid]: { field: identifiable1Updated, changeType: FieldChangeType.UPDATE },
-        [identifiable2.uuid]: { field: identifiable2, changeType: undefined }
+        [identifiable2.uuid]: { field: identifiable2, changeType: undefined },
       };
 
       result$.subscribe((result) => {
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..b526e7e980 100644
--- a/src/app/core/data/object-updates/object-updates.service.ts
+++ b/src/app/core/data/object-updates/object-updates.service.ts
@@ -1,14 +1,36 @@
-import { Injectable, Injector } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { coreSelector } from '../../core.selectors';
 import {
-  FieldState,
-  OBJECT_UPDATES_TRASH_PATH,
-  ObjectUpdatesEntry,
-  ObjectUpdatesState,
-  VirtualMetadataSource
-} from './object-updates.reducer';
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { INotification } from '../../../shared/notifications/models/notification.model';
+import { coreSelector } from '../../core.selectors';
+import { CoreState } from '../../core-state.model';
+import { GenericConstructor } from '../../shared/generic-constructor';
+import { FieldChangeType } from './field-change-type.model';
+import { FieldUpdates } from './field-updates.model';
+import { Identifiable } from './identifiable.model';
 import {
   AddFieldUpdateAction,
   DiscardObjectUpdatesAction,
@@ -17,24 +39,16 @@ import {
   RemoveFieldUpdateAction,
   SelectVirtualMetadataAction,
   SetEditableFieldUpdateAction,
-  SetValidFieldUpdateAction
+  SetValidFieldUpdateAction,
 } from './object-updates.actions';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 import {
-  hasNoValue,
-  hasValue,
-  isEmpty,
-  isNotEmpty,
-  hasValueOperator
-} from '../../../shared/empty.util';
-import { INotification } from '../../../shared/notifications/models/notification.model';
-import { Operation } from 'fast-json-patch';
+  FieldState,
+  OBJECT_UPDATES_TRASH_PATH,
+  ObjectUpdatesEntry,
+  ObjectUpdatesState,
+  VirtualMetadataSource,
+} from './object-updates.reducer';
 import { PatchOperationService } from './patch-operation-service/patch-operation.service';
-import { GenericConstructor } from '../../shared/generic-constructor';
-import { Identifiable } from './identifiable.model';
-import { FieldUpdates } from './field-updates.model';
-import { FieldChangeType } from './field-change-type.model';
-import { CoreState } from '../../core-state.model';
 
 function objectUpdatesStateSelector(): MemoizedSelector<CoreState, ObjectUpdatesState> {
   return createSelector(coreSelector, (state: CoreState) => state['cache/object-updates']);
@@ -122,7 +136,7 @@ export class ObjectUpdatesService {
               fieldUpdates[uuid] = fieldUpdatesExclusive[uuid];
             });
             return fieldUpdates;
-          })
+          }),
         );
       }),
     );
@@ -139,16 +153,16 @@ export class ObjectUpdatesService {
     return objectUpdates.pipe(
       hasValueOperator(),
       map((objectEntry) => {
-      const fieldUpdates: FieldUpdates = {};
-      for (const object of initialFields) {
-        let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
-        if (isEmpty(fieldUpdate)) {
-          fieldUpdate = { field: object, changeType: undefined };
+        const fieldUpdates: FieldUpdates = {};
+        for (const object of initialFields) {
+          let fieldUpdate = objectEntry.fieldUpdates[object.uuid];
+          if (isEmpty(fieldUpdate)) {
+            fieldUpdate = { field: object, changeType: undefined };
+          }
+          fieldUpdates[object.uuid] = fieldUpdate;
         }
-        fieldUpdates[object.uuid] = fieldUpdate;
-      }
-      return fieldUpdates;
-    }));
+        return fieldUpdates;
+      }));
   }
 
   /**
@@ -161,7 +175,7 @@ export class ObjectUpdatesService {
     return fieldState$.pipe(
       filter((fieldState) => hasValue(fieldState)),
       map((fieldState) => fieldState.editable),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -175,7 +189,7 @@ export class ObjectUpdatesService {
     return fieldState$.pipe(
       filter((fieldState) => hasValue(fieldState)),
       map((fieldState) => fieldState.isValid),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -189,7 +203,7 @@ export class ObjectUpdatesService {
       map((entry: ObjectUpdatesEntry) => {
         return Object.values(entry.fieldStates).findIndex((state: FieldState) => !state.isValid) < 0;
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -234,7 +248,7 @@ export class ObjectUpdatesService {
       .pipe(
         select(virtualMetadataSourceSelector(url, relationship)),
         map((virtualMetadataSource) => virtualMetadataSource && virtualMetadataSource[item]),
-    );
+      );
   }
 
   /**
@@ -367,7 +381,7 @@ export class ObjectUpdatesService {
           patch = this.injector.get(entry.patchOperationService).fieldUpdatesToPatchOperations(entry.fieldUpdates);
         }
         return patch;
-      })
+      }),
     );
   }
 }
diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
index db46426b79..ddf38dd2bb 100644
--- a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.spec.ts
@@ -1,8 +1,9 @@
-import { MetadataPatchOperationService } from './metadata-patch-operation.service';
 import { Operation } from 'fast-json-patch';
+
 import { MetadatumViewModel } from '../../../shared/metadata.models';
-import { FieldUpdates } from '../field-updates.model';
 import { FieldChangeType } from '../field-change-type.model';
+import { FieldUpdates } from '../field-updates.model';
+import { MetadataPatchOperationService } from './metadata-patch-operation.service';
 
 describe('MetadataPatchOperationService', () => {
   let service: MetadataPatchOperationService;
@@ -23,13 +24,13 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -46,13 +47,13 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Added title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.ADD
-          }
+            changeType: FieldChangeType.ADD,
+          },
         });
         expected = [
-          { op: 'add', path: '/metadata/dc.title/-', value: [{ value: 'Added title', language: undefined }] }
+          { op: 'add', path: '/metadata/dc.title/-', value: [{ value: 'Added title', language: undefined }] },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -69,13 +70,13 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Changed title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.UPDATE
-          }
+            changeType: FieldChangeType.UPDATE,
+          },
         });
         expected = [
-          { op: 'replace', path: '/metadata/dc.title/0', value: { value: 'Changed title', language: undefined } }
+          { op: 'replace', path: '/metadata/dc.title/0', value: { value: 'Changed title', language: undefined } },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -92,31 +93,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third deleted title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/0' },
           { op: 'remove', path: '/metadata/dc.title/0' },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -133,31 +134,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third deleted title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/2' },
           { op: 'remove', path: '/metadata/dc.title/1' },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -174,31 +175,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third deleted title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/1' },
           { op: 'remove', path: '/metadata/dc.title/1' },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
@@ -215,31 +216,31 @@ describe('MetadataPatchOperationService', () => {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Second deleted title',
-              place: 1
+              place: 1,
             }),
-            changeType: FieldChangeType.REMOVE
+            changeType: FieldChangeType.REMOVE,
           },
           update2: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'Third changed title',
-              place: 2
+              place: 2,
             }),
-            changeType: FieldChangeType.UPDATE
+            changeType: FieldChangeType.UPDATE,
           },
           update3: {
             field: Object.assign(new MetadatumViewModel(), {
               key: 'dc.title',
               value: 'First deleted title',
-              place: 0
+              place: 0,
             }),
-            changeType: FieldChangeType.REMOVE
-          }
+            changeType: FieldChangeType.REMOVE,
+          },
         });
         expected = [
           { op: 'remove', path: '/metadata/dc.title/1' },
           { op: 'replace', path: '/metadata/dc.title/1', value: { value: 'Third changed title', language: undefined } },
-          { op: 'remove', path: '/metadata/dc.title/0' }
+          { op: 'remove', path: '/metadata/dc.title/0' },
         ] as any[];
         result = service.fieldUpdatesToPatchOperations(fieldUpdates);
       });
diff --git a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
index 33e9129a9d..b6dccb759b 100644
--- a/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/metadata-patch-operation.service.ts
@@ -1,21 +1,22 @@
-import { PatchOperationService } from './patch-operation.service';
-import { MetadatumViewModel } from '../../../shared/metadata.models';
-import { Operation } from 'fast-json-patch';
 import { Injectable } from '@angular/core';
-import { MetadataPatchOperation } from './operations/metadata/metadata-patch-operation.model';
+import { Operation } from 'fast-json-patch';
+
 import { hasValue } from '../../../../shared/empty.util';
+import { MetadatumViewModel } from '../../../shared/metadata.models';
+import { FieldChangeType } from '../field-change-type.model';
+import { FieldUpdates } from '../field-updates.model';
 import { MetadataPatchAddOperation } from './operations/metadata/metadata-patch-add-operation.model';
+import { MetadataPatchOperation } from './operations/metadata/metadata-patch-operation.model';
 import { MetadataPatchRemoveOperation } from './operations/metadata/metadata-patch-remove-operation.model';
 import { MetadataPatchReplaceOperation } from './operations/metadata/metadata-patch-replace-operation.model';
-import { FieldUpdates } from '../field-updates.model';
-import { FieldChangeType } from '../field-change-type.model';
+import { PatchOperationService } from './patch-operation.service';
 
 /**
  * Service transforming {@link FieldUpdates} into {@link Operation}s for metadata values
  * This expects the fields within every {@link FieldUpdate} to be {@link MetadatumViewModel}s
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class MetadataPatchOperationService implements PatchOperationService {
 
@@ -75,7 +76,7 @@ export class MetadataPatchOperationService implements PatchOperationService {
       const metadatum = update.field as MetadatumViewModel;
       const val = {
         value: metadatum.value,
-        language: metadatum.language
+        language: metadatum.language,
       };
 
       let operation: MetadataPatchOperation;
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
index 7f9b1d772f..9242290c6b 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch add Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
new file mode 100644
index 0000000000..d80ec16cd1
--- /dev/null
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model.ts
@@ -0,0 +1,34 @@
+import { Operation } from 'fast-json-patch';
+
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
+/**
+ * Wrapper object for a metadata patch move Operation
+ */
+export class MetadataPatchMoveOperation extends MetadataPatchOperation {
+  static operationType = 'move';
+
+  /**
+   * The original place of the metadata value to move
+   */
+  from: number;
+
+  /**
+   * The new place to move the metadata value to
+   */
+  to: number;
+
+  constructor(field: string, from: number, to: number) {
+    super(MetadataPatchMoveOperation.operationType, field);
+    this.from = from;
+    this.to = to;
+  }
+
+  /**
+   * Transform the MetadataPatchOperation into a fast-json-patch Operation by constructing its path and other properties
+   * using the information provided.
+   */
+  toOperation(): Operation {
+    return { op: this.op as any, from: `/metadata/${this.field}/${this.from}`, path: `/metadata/${this.field}/${this.to}` };
+  }
+}
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
index 61fbae1980..efaf61f381 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch remove Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
index e889bede0b..c2d9581293 100644
--- a/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model.ts
@@ -1,6 +1,7 @@
-import { MetadataPatchOperation } from './metadata-patch-operation.model';
 import { Operation } from 'fast-json-patch';
 
+import { MetadataPatchOperation } from './metadata-patch-operation.model';
+
 /**
  * Wrapper object for a metadata patch replace Operation
  */
diff --git a/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts b/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
index 171c1d2a54..7e9c1087ff 100644
--- a/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
+++ b/src/app/core/data/object-updates/patch-operation-service/patch-operation.service.ts
@@ -1,4 +1,5 @@
 import { Operation } from 'fast-json-patch';
+
 import { FieldUpdates } from '../field-updates.model';
 
 /**
diff --git a/src/app/core/data/paginated-list.model.ts b/src/app/core/data/paginated-list.model.ts
index 415bfe234e..e412af4986 100644
--- a/src/app/core/data/paginated-list.model.ts
+++ b/src/app/core/data/paginated-list.model.ts
@@ -1,13 +1,22 @@
-import { PageInfo } from '../shared/page-info.model';
-import { hasValue, isEmpty, hasNoValue, isUndefined } from '../../shared/empty.util';
-import { HALResource } from '../shared/hal-resource.model';
-import { HALLink } from '../shared/hal-link.model';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isUndefined,
+} from '../../shared/empty.util';
 import { typedObject } from '../cache/builders/build-decorators';
-import { PAGINATED_LIST } from './paginated-list.resource-type';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { HALLink } from '../shared/hal-link.model';
+import { HALResource } from '../shared/hal-resource.model';
+import { PageInfo } from '../shared/page-info.model';
 import { ResourceType } from '../shared/resource-type';
 import { excludeFromEquals } from '../utilities/equals.decorators';
-import { autoserialize, deserialize } from 'cerialize';
-import { CacheableObject } from '../cache/cacheable-object.model';
+import { PAGINATED_LIST } from './paginated-list.resource-type';
 
 /**
  * Factory function for a paginated list
@@ -45,7 +54,7 @@ export const buildPaginatedList = <T>(pageInfo: PageInfo, page: T[], normalized
   }
 
   result._links = Object.assign({}, _links, pageInfo._links, {
-    page: pageLinks
+    page: pageLinks,
   });
 
   if (!normalized || isUndefined(pageLinks)) {
@@ -64,13 +73,13 @@ export class PaginatedList<T> extends CacheableObject {
    * The type of the list
    */
   @excludeFromEquals
-  type = PAGINATED_LIST;
+    type = PAGINATED_LIST;
 
   /**
    * The type of objects in the list
    */
   @autoserialize
-  objectType?: ResourceType;
+    objectType?: ResourceType;
 
   /**
    * The list of objects that represents the current page
@@ -81,13 +90,13 @@ export class PaginatedList<T> extends CacheableObject {
    * the {@link PageInfo} object
    */
   @autoserialize
-  pageInfo?: PageInfo;
+    pageInfo?: PageInfo;
 
   /**
    * The {@link HALLink}s for this PaginatedList
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     page: HALLink[];
     first?: HALLink;
diff --git a/src/app/core/data/parsing.service.ts b/src/app/core/data/parsing.service.ts
index fbebe75b2b..9bf91121cc 100644
--- a/src/app/core/data/parsing.service.ts
+++ b/src/app/core/data/parsing.service.ts
@@ -1,5 +1,5 @@
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ParsedResponse } from '../cache/response.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { RestRequest } from './rest-request.model';
 
 export interface ResponseParsingService {
diff --git a/src/app/core/data/primary-bitstream.service.spec.ts b/src/app/core/data/primary-bitstream.service.spec.ts
new file mode 100644
index 0000000000..6a9c89f796
--- /dev/null
+++ b/src/app/core/data/primary-bitstream.service.spec.ts
@@ -0,0 +1,191 @@
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { BundleDataService } from './bundle-data.service';
+import { PrimaryBitstreamService } from './primary-bitstream.service';
+import {
+  CreateRequest,
+  DeleteRequest,
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+
+describe('PrimaryBitstreamService', () => {
+  let service: PrimaryBitstreamService;
+  let objectCache: ObjectCacheService;
+  let requestService: RequestService;
+  let halService: HALEndpointService;
+  let rdbService: RemoteDataBuildService;
+  let notificationService: NotificationsService;
+  let bundleDataService: BundleDataService;
+
+  const bitstream = Object.assign(new Bitstream(), {
+    uuid: 'fake-bitstream',
+    _links: {
+      self: { href: 'fake-bitstream-self' },
+    },
+  });
+
+  const bundle = Object.assign(new Bundle(), {
+    uuid: 'fake-bundle',
+    _links: {
+      self: { href: 'fake-bundle-self' },
+      primaryBitstream: { href: 'fake-primary-bitstream-self' },
+    },
+  });
+
+  const url = 'fake-bitstream-url';
+
+  beforeEach(() => {
+    objectCache = jasmine.createSpyObj('objectCache', {
+      remove: jasmine.createSpy('remove'),
+    });
+    requestService = getMockRequestService();
+    halService = Object.assign(new HALEndpointServiceStub(url));
+
+    rdbService = getMockRemoteDataBuildService();
+    notificationService = new NotificationsServiceStub() as any;
+    bundleDataService = jasmine.createSpyObj('bundleDataService', { 'findByHref': createSuccessfulRemoteDataObject$(bundle) });
+    service = new PrimaryBitstreamService(requestService, rdbService, objectCache, halService, notificationService, bundleDataService);
+  });
+
+  describe('getHttpOptions', () => {
+    it('should return a HttpOptions object with text/url-list Context-Type header', () => {
+      const result = (service as any).getHttpOptions();
+      expect(result.headers.get('Content-Type')).toEqual('text/uri-list');
+    });
+  });
+
+  describe('createAndSendRequest', () => {
+    const testId = '12345-12345';
+    const options = {};
+    const testResult = createSuccessfulRemoteDataObject(new Bundle());
+
+    beforeEach(() => {
+      spyOn(service as any, 'getHttpOptions').and.returnValue(options);
+      (requestService.generateRequestId as jasmine.Spy<any>).and.returnValue(testId);
+      spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(observableOf(testResult));
+    });
+
+    it('should return a Request object with the given constructor and the given parameters', () => {
+      const result = (service as any).createAndSendRequest(CreateRequest, url, bitstream.self);
+      const request = new CreateRequest(testId, url, bitstream.self, options);
+      getTestScheduler().expectObservable(result).toBe('(a|)', { a: testResult });
+
+      expect(requestService.send).toHaveBeenCalledWith(request);
+      expect(rdbService.buildFromRequestUUID).toHaveBeenCalledWith(testId);
+    });
+  });
+
+  describe('create', () => {
+    const testResult = createSuccessfulRemoteDataObject(new Bundle());
+    beforeEach(() => {
+      spyOn((service as any), 'createAndSendRequest').and.returnValue(observableOf(testResult));
+    });
+
+    it('should delegate the call to createAndSendRequest', () => {
+      const result = service.create(bitstream, bundle);
+      getTestScheduler().expectObservable(result).toBe('(a|)', { a: testResult });
+
+      expect((service as any).createAndSendRequest).toHaveBeenCalledWith(
+        PostRequest,
+        bundle._links.primaryBitstream.href,
+        bitstream.self,
+      );
+    });
+  });
+  describe('put', () => {
+    const testResult = createSuccessfulRemoteDataObject(new Bundle());
+    beforeEach(() => {
+      spyOn((service as any), 'createAndSendRequest').and.returnValue(observableOf(testResult));
+    });
+
+    it('should delegate the call to createAndSendRequest and return the requested bundle', () => {
+      const result = service.put(bitstream, bundle);
+      getTestScheduler().expectObservable(result).toBe('(a|)', { a: testResult });
+
+      expect((service as any).createAndSendRequest).toHaveBeenCalledWith(
+        PutRequest,
+        bundle._links.primaryBitstream.href,
+        bitstream.self,
+      );
+    });
+  });
+  describe('delete', () => {
+    const testBundle = Object.assign(new Bundle(), {
+      _links: {
+        self: {
+          href: 'test-href',
+        },
+        primaryBitstream: {
+          href: 'test-primaryBitstream-href',
+        },
+      },
+    });
+
+    describe('when the delete request succeeds', () => {
+      const testResult = createSuccessfulRemoteDataObject(new Bundle());
+      const bundleServiceResult = createSuccessfulRemoteDataObject(testBundle);
+
+      beforeEach(() => {
+        spyOn((service as any), 'createAndSendRequest').and.returnValue(observableOf(testResult));
+        (bundleDataService.findByHref as jasmine.Spy<any>).and.returnValue(observableOf(bundleServiceResult));
+      });
+
+      it('should delegate the call to createAndSendRequest', () => {
+        const result = service.delete(testBundle);
+        getTestScheduler().expectObservable(result).toBe('(a|)', { a: bundleServiceResult });
+
+        result.subscribe();
+
+        expect(bundleDataService.findByHref).toHaveBeenCalledWith(testBundle.self, false);
+
+        expect((service as any).createAndSendRequest).toHaveBeenCalledWith(
+          DeleteRequest,
+          testBundle._links.primaryBitstream.href,
+        );
+      });
+    });
+    describe('when the delete request fails', () => {
+      const testResult = createFailedRemoteDataObject();
+      const bundleServiceResult = createSuccessfulRemoteDataObject(testBundle);
+
+      beforeEach(() => {
+        spyOn((service as any), 'createAndSendRequest').and.returnValue(observableOf(testResult));
+        (bundleDataService.findByHref as jasmine.Spy<any>).and.returnValue(observableOf(bundleServiceResult));
+      });
+
+      it('should delegate the call to createAndSendRequest and request the bundle from the bundleDataService', () => {
+        const result = service.delete(testBundle);
+        result.subscribe();
+        expect((service as any).createAndSendRequest).toHaveBeenCalledWith(
+          DeleteRequest,
+          testBundle._links.primaryBitstream.href,
+        );
+        expect(bundleDataService.findByHref).toHaveBeenCalledWith(testBundle.self, true);
+
+      });
+
+      it('should delegate the call to createAndSendRequest and', () => {
+        const result = service.delete(bundle);
+        getTestScheduler().expectObservable(result).toBe('(a|)', { a: bundleServiceResult });
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/primary-bitstream.service.ts b/src/app/core/data/primary-bitstream.service.ts
new file mode 100644
index 0000000000..a5367e67ed
--- /dev/null
+++ b/src/app/core/data/primary-bitstream.service.ts
@@ -0,0 +1,127 @@
+import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  switchMap,
+} from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { getAllCompletedRemoteData } from '../shared/operators';
+import { BundleDataService } from './bundle-data.service';
+import { RemoteData } from './remote-data';
+import {
+  DeleteRequest,
+  PostRequest,
+  PutRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+
+@Injectable({
+  providedIn: 'root',
+})
+export class PrimaryBitstreamService {
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected bundleDataService: BundleDataService,
+  ) {
+  }
+
+  /**
+   * Returns the type of HttpOptions object needed from primary bitstream requests.
+   * i.e. with a Content-Type header set to `text/uri-list`
+   * @protected
+   */
+  protected getHttpOptions(): HttpOptions {
+    const options: HttpOptions = Object.create({});
+    let headers = new HttpHeaders();
+    headers = headers.append('Content-Type', 'text/uri-list');
+    options.headers = headers;
+    return options;
+  }
+
+  /**
+   * Send a request of the given type to the endpointURL with an optional primaryBitstreamSelfLink
+   * as payload, and return the resulting Observable<RemoteData>
+   *
+   * @param requestType               The type of request: PostRequest, PutRequest, or DeleteRequest
+   * @param endpointURL               The endpoint URL
+   * @param primaryBitstreamSelfLink
+   * @protected
+   */
+  protected createAndSendRequest(
+    requestType: GenericConstructor<PostRequest | PutRequest | DeleteRequest>,
+    endpointURL: string,
+    primaryBitstreamSelfLink?: string,
+  ): Observable<RemoteData<Bundle | NoContent>> {
+    const requestId = this.requestService.generateRequestId();
+    const request = new requestType(
+      requestId,
+      endpointURL,
+      primaryBitstreamSelfLink,
+      this.getHttpOptions(),
+    );
+
+    this.requestService.send(request);
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
+  /**
+   * Create a new primaryBitstream
+   *
+   * @param primaryBitstream  The object to create
+   * @param bundle            The bundle to create it on
+   */
+  create(primaryBitstream: Bitstream, bundle: Bundle): Observable<RemoteData<Bundle>> {
+    return this.createAndSendRequest(
+      PostRequest,
+      bundle._links.primaryBitstream.href,
+      primaryBitstream.self,
+    ) as Observable<RemoteData<Bundle>>;
+  }
+
+  /**
+   * Update an existing primaryBitstream
+   *
+   * @param primaryBitstream  The object to update
+   * @param bundle            The bundle to update it on
+   */
+  put(primaryBitstream: Bitstream, bundle: Bundle): Observable<RemoteData<Bundle>> {
+    return this.createAndSendRequest(
+      PutRequest,
+      bundle._links.primaryBitstream.href,
+      primaryBitstream.self,
+    ) as Observable<RemoteData<Bundle>>;
+  }
+
+  /**
+   * Delete an existing primaryBitstream
+   *
+   * @param bundle The bundle to delete it from
+   */
+  delete(bundle: Bundle): Observable<RemoteData<Bundle>> {
+    return this.createAndSendRequest(
+      DeleteRequest,
+      bundle._links.primaryBitstream.href,
+    ).pipe(
+      getAllCompletedRemoteData(),
+      switchMap((rd: RemoteData<NoContent>) => {
+        return this.bundleDataService.findByHref(bundle.self, rd.hasFailed);
+      }),
+    );
+  }
+
+}
diff --git a/src/app/core/data/processes/process-data.service.spec.ts b/src/app/core/data/processes/process-data.service.spec.ts
index 88e5bd5791..217567776c 100644
--- a/src/app/core/data/processes/process-data.service.spec.ts
+++ b/src/app/core/data/processes/process-data.service.spec.ts
@@ -6,14 +6,197 @@
  * http://www.dspace.org/license/
  */
 
-import { testFindAllDataImplementation } from '../base/find-all-data.spec';
-import { ProcessDataService } from './process-data.service';
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ReducerManager } from '@ngrx/store';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { Process } from '../../../process-page/processes/process.model';
+import { ProcessStatus } from '../../../process-page/processes/process-status.model';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { testDeleteDataImplementation } from '../base/delete-data.spec';
+import { testFindAllDataImplementation } from '../base/find-all-data.spec';
+import { testSearchDataImplementation } from '../base/search-data.spec';
+import { BitstreamFormatDataService } from '../bitstream-format-data.service';
+import { DSOChangeAnalyzer } from '../dso-change-analyzer.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+import { RequestEntryState } from '../request-entry-state.model';
+import {
+  ProcessDataService,
+  TIMER_FACTORY,
+} from './process-data.service';
 
 describe('ProcessDataService', () => {
+  let testScheduler;
+
+  const mockTimer = (fn: () => any, interval: number) => {
+    fn();
+    return 555;
+  };
+
   describe('composition', () => {
-    const initService = () => new ProcessDataService(null, null, null, null, null, null);
+    const initService = () => new ProcessDataService(null, null, null, null, null, null, null, null);
     testFindAllDataImplementation(initService);
     testDeleteDataImplementation(initService);
+    testSearchDataImplementation(initService);
+  });
+
+  let requestService = getMockRequestService();
+  let processDataService;
+  let remoteDataBuildService;
+
+  describe('autoRefreshUntilCompletion', () => {
+    beforeEach(waitForAsync(() => {
+      testScheduler = new TestScheduler((actual, expected) => {
+        expect(actual).toEqual(expected);
+      });
+      TestBed.configureTestingModule({
+        imports: [],
+        providers: [
+          ProcessDataService,
+          { provide: RequestService, useValue: null },
+          { provide: RemoteDataBuildService, useValue: null },
+          { provide: ObjectCacheService, useValue: null },
+          { provide: ReducerManager, useValue: null },
+          { provide: HALEndpointService, useValue: null },
+          { provide: DSOChangeAnalyzer, useValue: null },
+          { provide: BitstreamFormatDataService, useValue: null },
+          { provide: NotificationsService, useValue: null },
+          { provide: TIMER_FACTORY, useValue: mockTimer },
+        ],
+      });
+
+      processDataService = TestBed.inject(ProcessDataService);
+      spyOn(processDataService, 'invalidateByHref');
+    }));
+
+    it('should not do any polling when the process is already completed', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        let completedProcess = new Process();
+        completedProcess.processStatus = ProcessStatus.COMPLETED;
+
+        const completedProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, completedProcess);
+
+        spyOn(processDataService, 'findById').and.returnValue(
+          cold('c', {
+            'c': completedProcessRD,
+          }),
+        );
+
+        let process$ = processDataService.autoRefreshUntilCompletion('instantly');
+        expectObservable(process$).toBe('c', {
+          c: completedProcessRD,
+        });
+      });
+
+      expect(processDataService.findById).toHaveBeenCalledTimes(1);
+      expect(processDataService.invalidateByHref).not.toHaveBeenCalled();
+    });
+
+    it('should poll until a process completes', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const runningProcess = Object.assign(new Process(), {
+          _links: {
+            self: {
+              href: 'https://rest.api/processes/123',
+            },
+          },
+        });
+        runningProcess.processStatus = ProcessStatus.RUNNING;
+        const completedProcess = new Process();
+        completedProcess.processStatus = ProcessStatus.COMPLETED;
+        const runningProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, runningProcess);
+        const completedProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, completedProcess);
+
+        spyOn(processDataService, 'findById').and.returnValue(
+          cold('r 150ms c', {
+            'r': runningProcessRD,
+            'c': completedProcessRD,
+          }),
+        );
+
+        let process$ = processDataService.autoRefreshUntilCompletion('foo', 100);
+        expectObservable(process$).toBe('r 150ms c', {
+          'r': runningProcessRD,
+          'c': completedProcessRD,
+        });
+      });
+
+      expect(processDataService.findById).toHaveBeenCalledTimes(1);
+      expect(processDataService.invalidateByHref).toHaveBeenCalledTimes(1);
+    });
+  });
+
+  describe('autoRefreshingSearchBy', () => {
+    beforeEach(waitForAsync(() => {
+
+      TestBed.configureTestingModule({
+        imports: [],
+        providers: [
+          ProcessDataService,
+          { provide: RequestService, useValue: requestService },
+          { provide: RemoteDataBuildService, useValue: null },
+          { provide: ObjectCacheService, useValue: null },
+          { provide: ReducerManager, useValue: null },
+          { provide: HALEndpointService, useValue: null },
+          { provide: DSOChangeAnalyzer, useValue: null },
+          { provide: BitstreamFormatDataService, useValue: null },
+          { provide: NotificationsService, useValue: null },
+          { provide: TIMER_FACTORY, useValue: mockTimer },
+        ],
+      });
+
+      processDataService = TestBed.inject(ProcessDataService);
+    }));
+
+    it('should refresh after the specified interval', fakeAsync(() => {
+      const runningProcess = Object.assign(new Process(), {
+        _links: {
+          self: {
+            href: 'https://rest.api/processes/123',
+          },
+        },
+      });
+      runningProcess.processStatus = ProcessStatus.RUNNING;
+
+      const runningProcessPagination: PaginatedList<Process> = Object.assign(new PaginatedList(), {
+        page: [runningProcess],
+        _links: {
+          self: {
+            href: 'https://rest.api/processesList/456',
+          },
+        },
+      });
+
+      const runningProcessRD = new RemoteData(0, 0, 0, RequestEntryState.Success, null, runningProcessPagination);
+
+      spyOn(processDataService, 'searchBy').and.returnValue(
+        of(runningProcessRD),
+      );
+
+      expect(processDataService.searchBy).toHaveBeenCalledTimes(0);
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledTimes(0);
+
+      let sub = processDataService.autoRefreshingSearchBy('id', 'byProperty', new FindListOptions(), 200).subscribe();
+      expect(processDataService.searchBy).toHaveBeenCalledTimes(1);
+
+      tick(250);
+
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledTimes(1);
+
+      sub.unsubscribe();
+    }));
   });
 });
diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts
index 3bf34eb650..ae0dfc11fa 100644
--- a/src/app/core/data/processes/process-data.service.ts
+++ b/src/app/core/data/processes/process-data.service.ts
@@ -1,30 +1,70 @@
-import { Injectable } from '@angular/core';
-import { RequestService } from '../request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import {
+  Inject,
+  Injectable,
+  InjectionToken,
+  NgZone,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  switchMap,
+} from 'rxjs/operators';
+import { ProcessStatus } from 'src/app/process-page/processes/process-status.model';
+
 import { Process } from '../../../process-page/processes/process.model';
 import { PROCESS } from '../../../process-page/processes/process.resource-type';
-import { Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
-import { PaginatedList } from '../paginated-list.model';
-import { Bitstream } from '../../shared/bitstream.model';
-import { RemoteData } from '../remote-data';
-import { BitstreamDataService } from '../bitstream-data.service';
-import { IdentifiableDataService } from '../base/identifiable-data.service';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
-import { FindListOptions } from '../find-list-options.model';
-import { dataService } from '../base/data-service.decorator';
-import { DeleteData, DeleteDataImpl } from '../base/delete-data';
+import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } 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 { HALEndpointService } from '../../shared/hal-endpoint.service';
 import { NoContent } from '../../shared/NoContent.model';
+import { getAllCompletedRemoteData } from '../../shared/operators';
+import { dataService } from '../base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../base/find-all-data';
+import { IdentifiableDataService } from '../base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../base/search-data';
+import { BitstreamDataService } from '../bitstream-data.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
+import { RemoteData } from '../remote-data';
+import { RequestService } from '../request.service';
+
+/**
+ * Create an InjectionToken for the default JS setTimeout function, purely so we can mock it during
+ * testing. (fakeAsync isn't working for this case)
+ */
+export const TIMER_FACTORY = new InjectionToken<(callback: (...args: any[]) => void, ms?: number, ...args: any[]) => NodeJS.Timeout>('timer', {
+  providedIn: 'root',
+  factory: () => setTimeout,
+});
 
 @Injectable()
 @dataService(PROCESS)
-export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process>, DeleteData<Process> {
+export class ProcessDataService extends IdentifiableDataService<Process> implements FindAllData<Process>, DeleteData<Process>, SearchData<Process> {
+
   private findAllData: FindAllData<Process>;
   private deleteData: DeleteData<Process>;
+  private searchData: SearchData<Process>;
+  protected activelyBeingPolled: Map<string, NodeJS.Timeout> = new Map();
+  protected subs: Map<string, Subscription> = new Map();
 
   constructor(
     protected requestService: RequestService,
@@ -33,11 +73,30 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     protected halService: HALEndpointService,
     protected bitstreamDataService: BitstreamDataService,
     protected notificationsService: NotificationsService,
+    protected zone: NgZone,
+    @Inject(TIMER_FACTORY) protected timer: (callback: (...args: any[]) => void, ms?: number, ...args: any[]) => NodeJS.Timeout,
   ) {
     super('processes', requestService, rdbService, objectCache, halService);
 
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
     this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Return true if the given process has the given status
+   * @protected
+   */
+  protected static statusIs(process: Process, status: ProcessStatus): boolean {
+    return hasValue(process) && process.processStatus === status;
+  }
+
+  /**
+   * Return true if the given process has the status COMPLETED or FAILED
+   */
+  public static hasCompletedOrFailed(process: Process): boolean {
+    return ProcessDataService.statusIs(process, ProcessStatus.COMPLETED) ||
+      ProcessDataService.statusIs(process, ProcessStatus.FAILED);
   }
 
   /**
@@ -46,7 +105,7 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
    */
   getFilesEndpoint(processId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      switchMap((href) => this.halService.getEndpoint('files', `${href}/${processId}`))
+      switchMap((href) => this.halService.getEndpoint('files', `${href}/${processId}`)),
     );
   }
 
@@ -77,6 +136,71 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+   * @param searchMethod                The search method for the Process
+   * @param options                     The FindListOptions object
+   * @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 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 automatically be resolved.
+   * @return {Observable<RemoteData<PaginatedList<Process>>>}
+   *    Return an observable that emits a paginated list of processes
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * @param id                          The id for this auto-refreshing search. Used to stop
+   *                                    auto-refreshing afterwards, and ensure we're not
+   *                                    auto-refreshing the same thing multiple times.
+   * @param searchMethod                The search method for the Process
+   * @param options                     The FindListOptions object
+   * @param pollingIntervalInMs         The interval by which the search will be repeated
+   * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
+   *                                    {@link HALLink}s should automatically be resolved.
+   * @return {Observable<RemoteData<PaginatedList<Process>>>}
+   *    Return an observable that emits a paginated list of processes every interval
+   */
+  autoRefreshingSearchBy(id: string, searchMethod: string, options?: FindListOptions, pollingIntervalInMs: number = 5000, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<PaginatedList<Process>>> {
+
+    const result$ = this.searchBy(searchMethod, options, true, true, ...linksToFollow).pipe(
+      getAllCompletedRemoteData(),
+    );
+
+    const sub = result$.pipe(
+      filter(() =>
+        !this.activelyBeingPolled.has(id),
+      ),
+    ).subscribe((processListRd: RemoteData<PaginatedList<Process>>) => {
+      this.clearCurrentTimeout(id);
+      const nextTimeout = this.timer(() => {
+        this.activelyBeingPolled.delete(id);
+        this.requestService.setStaleByHrefSubstring(processListRd.payload._links.self.href);
+      }, pollingIntervalInMs);
+
+      this.activelyBeingPolled.set(id, nextTimeout);
+    });
+
+    this.subs.set(id, sub);
+
+    return result$;
+  }
+
+  /**
+   * Stop auto-refreshing the request with the given id
+   * @param id the id of the request to stop automatically refreshing
+   */
+  stopAutoRefreshing(id: string) {
+    this.clearCurrentTimeout(id);
+    if (hasValue(this.subs.get(id))) {
+      this.subs.get(id).unsubscribe();
+      this.subs.delete(id);
+    }
+  }
+
   /**
    * Delete an existing object on the server
    * @param   objectId The id of the object to be removed
@@ -101,4 +225,74 @@ export class ProcessDataService extends IdentifiableDataService<Process> impleme
   public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.deleteByHref(href, copyVirtualMetadata);
   }
+
+  /**
+   * Clear the timeout for the given id, if that timeout exists
+   * @protected
+   */
+  protected clearCurrentTimeout(id: string): void {
+    const timeout = this.activelyBeingPolled.get(id);
+    if (hasValue(timeout)) {
+      clearTimeout(timeout);
+    }
+    this.activelyBeingPolled.delete(id);
+  }
+
+  /**
+   * Poll the process with the given ID, using the given interval, until that process either
+   * completes successfully or fails
+   *
+   * Return an Observable<RemoteData> for the Process. Note that this will also emit while the
+   * process is still running. It will only emit again when the process (not the RemoteData!) changes
+   * status. That makes it more convenient to retrieve that process for a component: you can replace
+   * a findByID call with this method, rather than having to do a separate findById, and then call
+   * this method
+   *
+   * @param processId           The ID of the {@link Process} to poll
+   * @param pollingIntervalInMs The interval for how often the request needs to be polled
+   * @param linksToFollow       List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be
+   *                            automatically resolved
+   */
+  public autoRefreshUntilCompletion(processId: string, pollingIntervalInMs = 5000, ...linksToFollow: FollowLinkConfig<Process>[]): Observable<RemoteData<Process>> {
+    const process$: Observable<RemoteData<Process>> = this.findById(processId, true, true, ...linksToFollow)
+      .pipe(
+        getAllCompletedRemoteData(),
+      );
+
+    // Create a subscription that marks the data as stale if the process hasn't been completed and
+    // the polling interval time has been exceeded.
+    const sub = process$.pipe(
+      filter((processRD: RemoteData<Process>) =>
+        !ProcessDataService.hasCompletedOrFailed(processRD.payload) &&
+        !this.activelyBeingPolled.has(processId),
+      ),
+    ).subscribe((processRD: RemoteData<Process>) => {
+      this.clearCurrentTimeout(processId);
+      if (processRD.hasSucceeded) {
+        const nextTimeout = this.timer(() => {
+          this.activelyBeingPolled.delete(processId);
+          this.invalidateByHref(processRD.payload._links.self.href);
+        }, pollingIntervalInMs);
+
+        this.activelyBeingPolled.set(processId, nextTimeout);
+      }
+    });
+
+    this.subs.set(processId, sub);
+
+    // When the process completes create a one off subscription (the `find` completes the
+    // observable) that unsubscribes the previous one, removes the processId from the list of
+    // processes being polled and clears any running timeouts
+    process$.pipe(
+      find((processRD: RemoteData<Process>) => ProcessDataService.hasCompletedOrFailed(processRD.payload)),
+    ).subscribe(() => {
+      this.stopAutoRefreshing(processId);
+    });
+
+    return process$.pipe(
+      distinctUntilChanged((previous: RemoteData<Process>, current: RemoteData<Process>) =>
+        previous.payload?.processStatus === current.payload?.processStatus,
+      ),
+    );
+  }
 }
diff --git a/src/app/core/data/processes/script-data.service.ts b/src/app/core/data/processes/script-data.service.ts
index d9c92cb1d2..901a92e818 100644
--- a/src/app/core/data/processes/script-data.service.ts
+++ b/src/app/core/data/processes/script-data.service.ts
@@ -1,26 +1,33 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { Process } from '../../../process-page/processes/process.model';
+import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
+import { Script } from '../../../process-page/scripts/script.model';
+import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
+import { hasValue } from '../../../shared/empty.util';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
 import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { Script } from '../../../process-page/scripts/script.model';
-import { ProcessParameter } from '../../../process-page/processes/process-parameter.model';
-import { map, take } from 'rxjs/operators';
+import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { URLCombiner } from '../../url-combiner/url-combiner';
+import { dataService } from '../base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../base/find-all-data';
+import { IdentifiableDataService } from '../base/identifiable-data.service';
+import { FindListOptions } from '../find-list-options.model';
+import { PaginatedList } from '../paginated-list.model';
 import { RemoteData } from '../remote-data';
 import { MultipartPostRequest } from '../request.models';
 import { RequestService } from '../request.service';
-import { Observable } from 'rxjs';
-import { SCRIPT } from '../../../process-page/scripts/script.resource-type';
-import { Process } from '../../../process-page/processes/process.model';
-import { hasValue } from '../../../shared/empty.util';
-import { getFirstCompletedRemoteData } from '../../shared/operators';
 import { RestRequest } from '../rest-request.model';
-import { IdentifiableDataService } from '../base/identifiable-data.service';
-import { FindAllData, FindAllDataImpl } from '../base/find-all-data';
-import { FindListOptions } from '../find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../paginated-list.model';
-import { dataService } from '../base/data-service.decorator';
 
 export const METADATA_IMPORT_SCRIPT_NAME = 'metadata-import';
 export const METADATA_EXPORT_SCRIPT_NAME = 'metadata-export';
@@ -51,7 +58,7 @@ export class ScriptDataService extends IdentifiableDataService<Script> implement
       map((endpoint: string) => {
         const body = this.getInvocationFormData(parameters, files);
         return new MultipartPostRequest(requestId, endpoint, body);
-      })
+      }),
     ).subscribe((request: RestRequest) => this.requestService.send(request));
 
     return this.rdbService.buildFromRequestUUID<Process>(requestId);
diff --git a/src/app/core/data/registration-response-parsing.service.spec.ts b/src/app/core/data/registration-response-parsing.service.spec.ts
index 6cff89ff72..50bf650908 100644
--- a/src/app/core/data/registration-response-parsing.service.spec.ts
+++ b/src/app/core/data/registration-response-parsing.service.spec.ts
@@ -1,6 +1,6 @@
+import { ParsedResponse } from '../cache/response.models';
 import { Registration } from '../shared/registration.model';
 import { RegistrationResponseParsingService } from './registration-response-parsing.service';
-import { ParsedResponse } from '../cache/response.models';
 
 describe('RegistrationResponseParsingService', () => {
   describe('parse', () => {
@@ -10,7 +10,7 @@ describe('RegistrationResponseParsingService', () => {
     const data = {
       payload: { email: 'test@email.org', token: 'test-token' },
       statusCode: 200,
-      statusText: 'Success'
+      statusText: 'Success',
     };
 
     it('should parse a registration response', () => {
diff --git a/src/app/core/data/registration-response-parsing.service.ts b/src/app/core/data/registration-response-parsing.service.ts
index 067deea557..2984550447 100644
--- a/src/app/core/data/registration-response-parsing.service.ts
+++ b/src/app/core/data/registration-response-parsing.service.ts
@@ -1,10 +1,9 @@
 import { Injectable } from '@angular/core';
-import {
-  ParsedResponse
-} from '../cache/response.models';
+
+import { ParsedResponse } from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { ResponseParsingService } from './parsing.service';
 import { Registration } from '../shared/registration.model';
+import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './rest-request.model';
 
 @Injectable({
diff --git a/src/app/core/data/relationship-data.service.spec.ts b/src/app/core/data/relationship-data.service.spec.ts
index 39aa7cbd58..21365e52e1 100644
--- a/src/app/core/data/relationship-data.service.spec.ts
+++ b/src/app/core/data/relationship-data.service.spec.ts
@@ -1,22 +1,30 @@
 import { of as observableOf } from 'rxjs';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { Relationship } from '../shared/item-relationships/relationship.model';
-import { Item } from '../shared/item.model';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from './paginated-list.model';
-import { DeleteRequest } from './request.models';
-import { RelationshipDataService } from './relationship-data.service';
-import { RequestService } from './request.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+
 import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { RequestEntry } from './request-entry.model';
-import { FindListOptions } from './find-list-options.model';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { Item } from '../shared/item.model';
+import { Relationship } from '../shared/item-relationships/relationship.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../shared/metadata.models';
+import { MetadataRepresentationType } from '../shared/metadata-representation/metadata-representation.model';
+import { PageInfo } from '../shared/page-info.model';
 import { testSearchDataImplementation } from './base/search-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { buildPaginatedList } from './paginated-list.model';
+import { RelationshipDataService } from './relationship-data.service';
+import { DeleteRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
 
 describe('RelationshipDataService', () => {
   let service: RelationshipDataService;
@@ -30,7 +38,7 @@ describe('RelationshipDataService', () => {
     id: '1',
     uuid: '1',
     leftwardType: 'isAuthorOfPublication',
-    rightwardType: 'isPublicationOfAuthor'
+    rightwardType: 'isPublicationOfAuthor',
   });
 
   const ri1SelfLink = restEndpointURL + '/author1';
@@ -40,34 +48,34 @@ describe('RelationshipDataService', () => {
   const relationship1 = Object.assign(new Relationship(), {
     _links: {
       self: {
-        href: relationshipsEndpointURL + '/2'
+        href: relationshipsEndpointURL + '/2',
       },
       leftItem: {
-        href: ri1SelfLink
+        href: ri1SelfLink,
       },
       rightItem: {
-        href: itemSelfLink
-      }
+        href: itemSelfLink,
+      },
     },
     id: '2',
     uuid: '2',
-    relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+    relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
   });
   const relationship2 = Object.assign(new Relationship(), {
     _links: {
       self: {
-        href: relationshipsEndpointURL + '/3'
+        href: relationshipsEndpointURL + '/3',
       },
       leftItem: {
-        href: ri2SelfLink
+        href: ri2SelfLink,
       },
       rightItem: {
-        href: itemSelfLink
+        href: itemSelfLink,
       },
     },
     id: '3',
     uuid: '3',
-    relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+    relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
   });
 
   const relationships = [relationship1, relationship2];
@@ -77,23 +85,23 @@ describe('RelationshipDataService', () => {
     relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     _links: {
       relationships: { href: restEndpointURL + '/publication/relationships' },
-      self: { href: itemSelfLink }
-    }
+      self: { href: itemSelfLink },
+    },
   });
 
   const relatedItem1 = Object.assign(new Item(), {
     id: 'author1',
     uuid: 'author1',
     _links: {
-      self: { href: ri1SelfLink }
-    }
+      self: { href: ri1SelfLink },
+    },
   });
   const relatedItem2 = Object.assign(new Item(), {
     id: 'author2',
     uuid: 'author2',
     _links: {
-      self: { href: ri2SelfLink }
-    }
+      self: { href: ri2SelfLink },
+    },
   });
 
   relationship1.leftItem = createSuccessfulRemoteDataObject$(relatedItem1);
@@ -106,20 +114,13 @@ describe('RelationshipDataService', () => {
   const relationships$ = createSuccessfulRemoteDataObject$(createPaginatedList(relationships));
   const rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, {
     'href': buildList$,
-    'https://rest.api/core/publication/relationships': relationships$
+    'https://rest.api/core/publication/relationships': relationships$,
   });
-  const objectCache = Object.assign({
-    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    remove: () => {
-    },
-    hasBySelfLinkObservable: () => observableOf(false),
-    hasByHref$: () => observableOf(false)
-    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-  }) as ObjectCacheService;
+  const objectCache = new ObjectCacheServiceStub();
 
   const itemService = jasmine.createSpyObj('itemService', {
     findById: (uuid) => createSuccessfulRemoteDataObject(relatedItems.find((relatedItem) => relatedItem.id === uuid)),
-    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
+    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0]),
   });
 
   function initTestService() {
@@ -127,7 +128,7 @@ describe('RelationshipDataService', () => {
       requestService,
       rdbService,
       halService,
-      objectCache,
+      objectCache as ObjectCacheService,
       itemService,
       null,
       jasmine.createSpy('paginatedRelationsToItems').and.returnValue((v) => v),
@@ -136,7 +137,7 @@ describe('RelationshipDataService', () => {
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, payload: relationships } as any
+      response: { isSuccessful: successful, payload: relationships } as any,
     } as RequestEntry);
   };
 
@@ -191,7 +192,7 @@ describe('RelationshipDataService', () => {
         elementsPerPage: relationships.length,
         totalElements: relationships.length,
         currentPage: 1,
-        totalPages: 1
+        totalPages: 1,
       }), relationships);
       mockItem = { uuid: 'someid' } as Item;
       mockLabel = 'label';
@@ -206,7 +207,7 @@ describe('RelationshipDataService', () => {
       service.getRelatedItemsByLabel(
         mockItem,
         mockLabel,
-        mockOptions
+        mockOptions,
       ).subscribe((result) => {
         expect(service.getItemRelationshipsByLabel).toHaveBeenCalledWith(
           mockItem,
@@ -216,7 +217,7 @@ describe('RelationshipDataService', () => {
           true,
           followLink('leftItem',{}, followLink('thumbnail')),
           followLink('rightItem',{}, followLink('thumbnail')),
-          followLink('relationshipType')
+          followLink('relationshipType'),
         );
         done();
       });
@@ -226,11 +227,159 @@ describe('RelationshipDataService', () => {
       service.getRelatedItemsByLabel(
         mockItem,
         mockLabel,
-        mockOptions
+        mockOptions,
       ).subscribe((result) => {
         expect((service as any).paginatedRelationsToItems).toHaveBeenCalledWith(mockItem.uuid);
         done();
       });
     });
   });
+
+  describe('resolveMetadataRepresentation', () => {
+    const parentItem: Item = Object.assign(new Item(), {
+      id: 'parent-item',
+      metadata: {
+        'dc.contributor.author': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Author with authority',
+            authority: 'virtual::related-author',
+            place: 2,
+          }),
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Author without authority',
+            place: 1,
+          }),
+        ],
+        'dc.creator': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Creator with authority',
+            authority: 'virtual::related-creator',
+            place: 3,
+          }),
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Creator with authority - unauthorized',
+            authority: 'virtual::related-creator-unauthorized',
+            place: 4,
+          }),
+        ],
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Parent Item',
+          }),
+        ],
+      },
+    });
+    const relatedAuthor: Item = Object.assign(new Item(), {
+      id: 'related-author',
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Author',
+          }),
+        ],
+      },
+    });
+    const relatedCreator: Item = Object.assign(new Item(), {
+      id: 'related-creator',
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            language: null,
+            value: 'Related Creator',
+          }),
+        ],
+        'dspace.entity.type': 'Person',
+      },
+    });
+    const authorRelation: Relationship = Object.assign(new Relationship(), {
+      leftItem: createSuccessfulRemoteDataObject$(parentItem),
+      rightItem: createSuccessfulRemoteDataObject$(relatedAuthor),
+    });
+    const creatorRelation: Relationship = Object.assign(new Relationship(), {
+      leftItem: createSuccessfulRemoteDataObject$(parentItem),
+      rightItem: createSuccessfulRemoteDataObject$(relatedCreator),
+    });
+    const creatorRelationUnauthorized: Relationship = Object.assign(new Relationship(), {
+      leftItem: createSuccessfulRemoteDataObject$(parentItem),
+      rightItem: createFailedRemoteDataObject$('Unauthorized', 401),
+    });
+
+    let metadatum: MetadataValue;
+
+    beforeEach(() => {
+      service.findById = (id: string) => {
+        if (id === 'related-author') {
+          return createSuccessfulRemoteDataObject$(authorRelation);
+        }
+        if (id === 'related-creator') {
+          return createSuccessfulRemoteDataObject$(creatorRelation);
+        }
+        if (id === 'related-creator-unauthorized') {
+          return createSuccessfulRemoteDataObject$(creatorRelationUnauthorized);
+        }
+      };
+    });
+
+    describe('when the metadata isn\'t virtual', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.contributor.author'][1];
+      });
+
+      it('should return a plain text MetadatumRepresentation', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.PlainText);
+          done();
+        });
+      });
+    });
+
+    describe('when the metadata is a virtual author', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.contributor.author'][0];
+      });
+
+      it('should return a ItemMetadataRepresentation with the correct value', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.Item);
+          expect(result.getValue()).toEqual(metadatum.value);
+          expect((result as any).id).toEqual(relatedAuthor.id);
+          done();
+        });
+      });
+    });
+
+    describe('when the metadata is a virtual creator', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.creator'][0];
+      });
+
+      it('should return a ItemMetadataRepresentation with the correct value', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.Item);
+          expect(result.getValue()).toEqual(metadatum.value);
+          expect((result as any).id).toEqual(relatedCreator.id);
+          done();
+        });
+      });
+    });
+
+    describe('when the metadata refers to a relationship leading to an error response', () => {
+      beforeEach(() => {
+        metadatum = parentItem.metadata['dc.creator'][1];
+      });
+
+      it('should return an authority controlled MetadatumRepresentation', (done) => {
+        service.resolveMetadataRepresentation(metadatum, parentItem, 'Person').subscribe((result) => {
+          expect(result.representationType).toEqual(MetadataRepresentationType.AuthorityControlled);
+          done();
+        });
+      });
+    });
+  });
 });
diff --git a/src/app/core/data/relationship-data.service.ts b/src/app/core/data/relationship-data.service.ts
index 85adeff754..682c50e076 100644
--- a/src/app/core/data/relationship-data.service.ts
+++ b/src/app/core/data/relationship-data.service.ts
@@ -1,51 +1,98 @@
 import { HttpHeaders } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { MemoizedSelector, select, Store } from '@ngrx/store';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
 import {
-  compareArraysUsingIds, PAGINATED_RELATIONS_TO_ITEMS_OPERATOR,
-  relationsToItems
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  AppState,
+  keySelector,
+} from '../../app.reducer';
+import {
+  compareArraysUsingIds,
+  PAGINATED_RELATIONS_TO_ITEMS_OPERATOR,
+  relationsToItems,
 } from '../../item-page/simple/item-types/shared/item-relationships-utils';
-import { AppState, keySelector } from '../../app.reducer';
-import { hasValue, hasValueOperator, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import {
   RemoveNameVariantAction,
-  SetNameVariantAction
+  SetNameVariantAction,
 } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions';
 import { NameVariantListState } from '../../shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
+import { itemLinksToFollow } from '../../shared/utils/relation-query.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { DSpaceObject } from '../shared/dspace-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { Item } from '../shared/item.model';
 import { Relationship } from '../shared/item-relationships/relationship.model';
 import { RELATIONSHIP } from '../shared/item-relationships/relationship.resource-type';
-import { Item } from '../shared/item.model';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../shared/metadata.models';
+import { ItemMetadataRepresentation } from '../shared/metadata-representation/item/item-metadata-representation.model';
+import { MetadataRepresentation } from '../shared/metadata-representation/metadata-representation.model';
+import { MetadatumRepresentation } from '../shared/metadata-representation/metadatum/metadatum-representation.model';
+import { NoContent } from '../shared/NoContent.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../shared/operators';
+import { sendRequest } from '../shared/request.operators';
+import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
 import { ItemDataService } from './item-data.service';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
-import { DeleteRequest, PostRequest } from './request.models';
+import {
+  DeleteRequest,
+  PostRequest,
+} from './request.models';
 import { RequestService } from './request.service';
-import { NoContent } from '../shared/NoContent.model';
 import { RequestEntryState } from './request-entry-state.model';
-import { sendRequest } from '../shared/request.operators';
 import { RestRequest } from './rest-request.model';
-import { FindListOptions } from './find-list-options.model';
-import { SearchData, SearchDataImpl } from './base/search-data';
-import { PutData, PutDataImpl } from './base/put-data';
-import { IdentifiableDataService } from './base/identifiable-data.service';
-import { dataService } from './base/data-service.decorator';
-import { itemLinksToFollow } from '../../shared/utils/relation-query.utils';
 
 const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
 
@@ -67,7 +114,7 @@ const compareItemsByUUID = (itemCheck: Item) =>
   (source: Observable<RemoteData<Item>>): Observable<boolean> =>
     source.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((item: Item) => item.uuid === itemCheck.uuid)
+      map((item: Item) => item.uuid === itemCheck.uuid),
     );
 
 /**
@@ -116,7 +163,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       take(1),
       distinctUntilChanged(),
       map((endpointURL: string) =>
-        new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata)
+        new DeleteRequest(this.requestService.generateRequestId(), endpointURL + '?copyVirtualMetadata=' + copyVirtualMetadata),
       ),
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
@@ -163,10 +210,10 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       getRemoteDataPayload(),
       switchMap((rel: Relationship) => observableCombineLatest(
         rel.leftItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()),
-        rel.rightItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload())
-        )
+        rel.rightItem.pipe(getFirstSucceededRemoteData(), getRemoteDataPayload()),
       ),
-      take(1)
+      ),
+      take(1),
     ).subscribe(([item1, item2]) => {
       this.refreshRelationshipItemsInCache(item1);
       this.refreshRelationshipItemsInCache(item2);
@@ -182,7 +229,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     this.requestService.removeByHrefSubstring(item.uuid);
     observableCombineLatest([
       this.objectCache.hasByHref$(item._links.self.href),
-      this.requestService.hasByHref$(item.self)
+      this.requestService.hasByHref$(item.self),
     ]).pipe(
       filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
       take(1),
@@ -214,7 +261,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
   getRelationshipTypeLabelsByItem(item: Item): Observable<string[]> {
     return this.getItemRelationshipsArray(item, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType')).pipe(
       switchMap((relationships: Relationship[]) => observableCombineLatest(relationships.map((relationship: Relationship) => this.getRelationshipTypeLabelByRelationshipAndItem(relationship, item)))),
-      map((labels: string[]) => Array.from(new Set(labels)))
+      map((labels: string[]) => Array.from(new Set(labels))),
     );
   }
 
@@ -231,8 +278,8 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
           } else {
             return relationshipType.rightwardType;
           }
-        })
-        )
+        }),
+      ),
       ));
   }
 
@@ -245,9 +292,9 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       item,
       followLink('leftItem'),
       followLink('rightItem'),
-      followLink('relationshipType')
+      followLink('relationshipType'),
     ).pipe(
-      relationsToItems(item.uuid)
+      relationsToItems(item.uuid),
     );
   }
 
@@ -259,7 +306,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);
+    const linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(options.fetchThumbnail);
     linksToFollow.push(followLink('relationshipType'));
 
     return this.getItemRelationshipsByLabel(item, label, options, true, true, ...linksToFollow).pipe(this.paginatedRelationsToItems(item.uuid));
@@ -308,7 +355,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
           return observableCombineLatest([isLeftItem$, isRightItem$]).pipe(
             filter(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
             map(() => relationship),
-            startWith(undefined)
+            startWith(undefined),
           );
         }));
       }),
@@ -320,7 +367,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
     return itemRD$.pipe(
       getFirstSucceededRemoteData(),
       map((itemRD: RemoteData<Item>) => itemRD.payload),
-      map((item: Item) => uuids.includes(item.uuid))
+      map((item: Item) => uuids.includes(item.uuid)),
     );
   }
 
@@ -339,23 +386,23 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       false,
       followLink('relationshipType'),
       followLink('leftItem'),
-      followLink('rightItem')
+      followLink('rightItem'),
     ).pipe(
-        getFirstSucceededRemoteData(),
-        // the mergemap below will emit all elements of the list as separate events
-        mergeMap((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
-        mergeMap((relationship: Relationship) => {
-          return observableCombineLatest([
-            this.itemService.findByHref(relationship._links.leftItem.href).pipe(compareItemsByUUID(item2)),
-            this.itemService.findByHref(relationship._links.rightItem.href).pipe(compareItemsByUUID(item2))
-          ]).pipe(
-            map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
-            map((isMatch) => isMatch ? relationship : undefined)
-          );
-        }),
-        filter((relationship) => hasValue(relationship)),
-        take(1)
-      );
+      getFirstSucceededRemoteData(),
+      // the mergemap below will emit all elements of the list as separate events
+      mergeMap((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
+      mergeMap((relationship: Relationship) => {
+        return observableCombineLatest([
+          this.itemService.findByHref(relationship._links.leftItem.href).pipe(compareItemsByUUID(item2)),
+          this.itemService.findByHref(relationship._links.rightItem.href).pipe(compareItemsByUUID(item2)),
+        ]).pipe(
+          map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
+          map((isMatch) => isMatch ? relationship : undefined),
+        );
+      }),
+      filter((relationship) => hasValue(relationship)),
+      take(1),
+    );
   }
 
   /**
@@ -375,7 +422,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
    */
   public getNameVariant(listID: string, itemID: string): Observable<string> {
     return this.appStore.pipe(
-      select(relationshipStateSelector(listID, itemID))
+      select(relationshipStateSelector(listID, itemID)),
     );
   }
 
@@ -412,8 +459,8 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
             getRemoteDataPayload(),
             map((type) => {
               return { relation, type };
-            })
-          )
+            }),
+          ),
         ),
         switchMap((relationshipAndType: { relation: Relationship, type: RelationshipType }) => {
           const { relation, type } = relationshipAndType;
@@ -438,7 +485,7 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       filter((leftItem: Item) => hasValue(leftItem) && isNotEmpty(leftItem.uuid)),
-      map((leftItem) => leftItem.uuid === item.uuid)
+      map((leftItem) => leftItem.uuid === item.uuid),
     );
   }
 
@@ -489,45 +536,45 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
   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'
-          },
-        ];
+      {
+        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',
+      },
+    ];
 
     arrayOfItemIds.forEach( (itemId) => {
       searchParams.push(
         {
           fieldName: 'relatedItem',
           fieldValue: itemId,
-        }
+        },
       );
     });
 
     return this.searchBy(
       'byItemsAndType',
       {
-        searchParams: searchParams
+        searchParams: searchParams,
       },
     ) as Observable<RemoteData<PaginatedList<Relationship>>>;
 
@@ -550,4 +597,40 @@ export class RelationshipDataService extends IdentifiableDataService<Relationshi
   searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Relationship>[]): Observable<RemoteData<PaginatedList<Relationship>>> {
     return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Resolve a {@link MetadataValue} into a {@link MetadataRepresentation} of the correct type
+   * @param metadatum   {@link MetadataValue} to resolve
+   * @param parentItem  Parent dspace object the metadata value belongs to
+   * @param itemType    The type of item this metadata value represents (will only be used when no related item can be found, as a fallback)
+   */
+  resolveMetadataRepresentation(metadatum: MetadataValue, parentItem: DSpaceObject, itemType: string): Observable<MetadataRepresentation> {
+    if (metadatum.isVirtual) {
+      return this.findById(metadatum.virtualValue, true, false, followLink('leftItem'), followLink('rightItem')).pipe(
+        getFirstSucceededRemoteData(),
+        switchMap((relRD: RemoteData<Relationship>) =>
+          observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
+            filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
+            map(([leftItem, rightItem]) => {
+              if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
+                return null;
+              } else if (rightItem.hasSucceeded && leftItem.payload.id === parentItem.id) {
+                return rightItem.payload;
+              } else if (rightItem.payload.id === parentItem.id) {
+                return leftItem.payload;
+              }
+            }),
+            map((item: Item) => {
+              if (hasValue(item)) {
+                return Object.assign(new ItemMetadataRepresentation(metadatum), item);
+              } else {
+                return Object.assign(new MetadatumRepresentation(itemType), metadatum);
+              }
+            }),
+          ),
+        ));
+    } else {
+      return observableOf(Object.assign(new MetadatumRepresentation(itemType), metadatum));
+    }
+  }
 }
diff --git a/src/app/core/data/relationship-type-data.service.spec.ts b/src/app/core/data/relationship-type-data.service.spec.ts
index 6a788446d8..c82a2789ce 100644
--- a/src/app/core/data/relationship-type-data.service.spec.ts
+++ b/src/app/core/data/relationship-type-data.service.spec.ts
@@ -1,15 +1,20 @@
 import { of as observableOf } from 'rxjs';
+
+import { hasValueOperator } from '../../shared/empty.util';
 import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RelationshipTypeDataService } from './relationship-type-data.service';
 import { RequestService } from './request.service';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { hasValueOperator } from '../../shared/empty.util';
-import { ObjectCacheService } from '../cache/object-cache.service';
 
 describe('RelationshipTypeDataService', () => {
   let service: RelationshipTypeDataService;
@@ -28,7 +33,7 @@ describe('RelationshipTypeDataService', () => {
 
   let buildList;
   let rdbService;
-  let objectCache;
+  let objectCache: ObjectCacheServiceStub;
 
   function init() {
     restEndpointURL = 'https://rest.api/relationshiptypes';
@@ -46,7 +51,7 @@ describe('RelationshipTypeDataService', () => {
       leftwardType: 'isAuthorOfPublication',
       rightwardType: 'isPublicationOfAuthor',
       leftType: createSuccessfulRemoteDataObject$(publicationType),
-      rightType: createSuccessfulRemoteDataObject$(personType)
+      rightType: createSuccessfulRemoteDataObject$(personType),
     });
 
     relationshipType2 = Object.assign(new RelationshipType(), {
@@ -55,26 +60,19 @@ describe('RelationshipTypeDataService', () => {
       leftwardType: 'isOrgUnitOfPublication',
       rightwardType: 'isPublicationOfOrgUnit',
       leftType: createSuccessfulRemoteDataObject$(publicationType),
-      rightType: createSuccessfulRemoteDataObject$(orgUnitType)
+      rightType: createSuccessfulRemoteDataObject$(orgUnitType),
     });
 
     buildList = createSuccessfulRemoteDataObject(createPaginatedList([relationshipType1, relationshipType2]));
     rdbService = getMockRemoteDataBuildService(undefined, observableOf(buildList));
-    objectCache = Object.assign({
-      /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-      remove: () => {
-      },
-      hasBySelfLinkObservable: () => observableOf(false)
-      /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    }) as ObjectCacheService;
-
+    objectCache = new ObjectCacheServiceStub();
   }
 
   function initTestService() {
     return new RelationshipTypeDataService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
     );
   }
@@ -89,7 +87,7 @@ describe('RelationshipTypeDataService', () => {
 
     it('should return the type filtered by label and type strings', (done) => {
       service.getRelationshipTypeByLabelAndTypes(relationshipType1.leftwardType, publicationTypeString, personTypeString).pipe(
-        hasValueOperator()
+        hasValueOperator(),
       ).subscribe((e) => {
         expect(e.id).toEqual(relationshipType1.id);
         done();
diff --git a/src/app/core/data/relationship-type-data.service.ts b/src/app/core/data/relationship-type-data.service.ts
index 3020e52d47..556e81dced 100644
--- a/src/app/core/data/relationship-type-data.service.ts
+++ b/src/app/core/data/relationship-type-data.service.ts
@@ -1,22 +1,38 @@
 import { Injectable } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { map, mergeMap, switchMap, toArray } from 'rxjs/operators';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  toArray,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ItemType } from '../shared/item-relationships/item-type.model';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
 import { RELATIONSHIP_TYPE } from '../shared/item-relationships/relationship-type.resource-type';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
+import { FindAllDataImpl } from './base/find-all-data';
+import { SearchDataImpl } from './base/search-data';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { BaseDataService } from './base/base-data.service';
-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';
 
 /**
  * Check if one side of a RelationshipType is the ItemType with the given label
@@ -62,33 +78,33 @@ 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;
-                   }
-                 }),
-               );
+      .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;
+          }
+        }),
+      );
   }
 
   /**
@@ -103,7 +119,7 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
   private checkType(type: RelationshipType, leftItemType: string, rightItemType: string): Observable<RelationshipType> {
     return observableCombineLatest([
       type.leftType.pipe(getFirstCompletedRemoteData()),
-      type.rightType.pipe(getFirstCompletedRemoteData())
+      type.rightType.pipe(getFirstCompletedRemoteData()),
     ]).pipe(
       map(([leftTypeRD, rightTypeRD]: [RemoteData<ItemType>, RemoteData<ItemType>]) => {
         if (checkSide(leftTypeRD, leftItemType) && checkSide(rightTypeRD, rightItemType)
@@ -112,7 +128,7 @@ export class RelationshipTypeDataService extends BaseDataService<RelationshipTyp
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/data/remote-data.ts b/src/app/core/data/remote-data.ts
index 40c8d7f400..935d2a95d2 100644
--- a/src/app/core/data/remote-data.ts
+++ b/src/app/core/data/remote-data.ts
@@ -10,7 +10,7 @@ import {
   isStale,
   isSuccess,
   isSuccessStale,
-  RequestEntryState
+  RequestEntryState,
 } from './request-entry-state.model';
 
 /**
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..f78318149a
--- /dev/null
+++ b/src/app/core/data/request-entry-state.model.spec.ts
@@ -0,0 +1,186 @@
+import {
+  hasCompleted,
+  hasFailed,
+  hasSucceeded,
+  isError,
+  isErrorStale,
+  isLoading,
+  isRequestPending,
+  isResponsePending,
+  isResponsePendingStale,
+  isStale,
+  isSuccess,
+  isSuccessStale,
+  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-entry.model.ts b/src/app/core/data/request-entry.model.ts
index 1555c99ed4..fbedc3932a 100644
--- a/src/app/core/data/request-entry.model.ts
+++ b/src/app/core/data/request-entry.model.ts
@@ -1,13 +1,13 @@
-import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 import { RequestEntryState } from './request-entry-state.model';
 import { ResponseState } from './response-state.model';
+import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 
 /**
  * An entry for a request in the NgRx store
  */
 export class RequestEntry {
-    request: RestRequestWithResponseParser;
-    state: RequestEntryState;
-    response: ResponseState;
-    lastUpdated: number;
+  request: RestRequestWithResponseParser;
+  state: RequestEntryState;
+  response: ResponseState;
+  lastUpdated: number;
 }
diff --git a/src/app/core/data/request.actions.ts b/src/app/core/data/request.actions.ts
index 68bae51f25..183c090b75 100644
--- a/src/app/core/data/request.actions.ts
+++ b/src/app/core/data/request.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../../shared/ngrx/type';
 import { HALLink } from '../shared/hal-link.model';
 import { UnCacheableObject } from '../shared/uncacheable-object.model';
@@ -15,7 +16,7 @@ export const RequestActionTypes = {
   ERROR: type('dspace/core/data/request/ERROR'),
   STALE: type('dspace/core/data/request/STALE'),
   RESET_TIMESTAMPS: type('dspace/core/data/request/RESET_TIMESTAMPS'),
-  REMOVE: type('dspace/core/data/request/REMOVE')
+  REMOVE: type('dspace/core/data/request/REMOVE'),
 };
 
 export abstract class RequestUpdateAction implements Action {
@@ -32,7 +33,7 @@ export class RequestConfigureAction extends RequestUpdateAction {
   payload: RestRequest;
 
   constructor(
-    request: RestRequest
+    request: RestRequest,
   ) {
     super();
     this.payload = request;
@@ -88,7 +89,7 @@ export class RequestSuccessAction extends RequestUpdateAction {
       timeCompleted: new Date().getTime(),
       statusCode,
       link,
-      unCacheableObject
+      unCacheableObject,
     };
   }
 }
@@ -121,7 +122,7 @@ export class RequestErrorAction extends RequestUpdateAction {
       uuid,
       timeCompleted: new Date().getTime(),
       statusCode,
-      errorMessage
+      errorMessage,
     };
   }
 }
diff --git a/src/app/core/data/request.effects.ts b/src/app/core/data/request.effects.ts
index 889d909bfa..6501f43133 100644
--- a/src/app/core/data/request.effects.ts
+++ b/src/app/core/data/request.effects.ts
@@ -1,35 +1,50 @@
-import { Injectable, Injector } from '@angular/core';
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { catchError, filter, map, mergeMap, take } from 'rxjs/operators';
-
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { StoreActionTypes } from '../../store.actions';
 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 { ParsedResponse } from '../cache/response.models';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import {
   RequestActionTypes,
   RequestErrorAction,
   RequestExecuteAction,
   RequestSuccessAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
 } from './request.actions';
 import { RequestService } from './request.service';
-import { ParsedResponse } from '../cache/response.models';
+import { RequestEntry } from './request-entry.model';
 import { RequestError } from './request-error.model';
 import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
-import { RequestEntry } from './request-entry.model';
 
 @Injectable()
 export class RequestEffects {
 
-   execute = createEffect(() => this.actions$.pipe(
+  execute = createEffect(() => this.actions$.pipe(
     ofType(RequestActionTypes.EXECUTE),
     mergeMap((action: RequestExecuteAction) => {
       return this.requestService.getByUUID(action.payload).pipe(
-        take(1)
+        take(1),
       );
     }),
     filter((entry: RequestEntry) => hasValue(entry)),
@@ -43,17 +58,17 @@ export class RequestEffects {
       return this.restApi.request(request.method, request.href, body, request.options, request.isMultipart).pipe(
         map((data: RawRestResponse) => this.injector.get(request.getResponseParser()).parse(request, data)),
         map((response: ParsedResponse) => new RequestSuccessAction(request.uuid, response.statusCode, response.link, response.unCacheableObject)),
-        catchError((error: RequestError) => {
-          if (hasValue(error.statusCode)) {
+        catchError((error: unknown) => {
+          if (error instanceof RequestError) {
             // if it's an error returned by the server, complete the request
             return [new RequestErrorAction(request.uuid, error.statusCode, error.message)];
           } else {
             // if it's a client side error, throw it
             throw error;
           }
-        })
+        }),
       );
-    })
+    }),
   ));
 
   /**
@@ -64,16 +79,16 @@ export class RequestEffects {
    * This assumes that the server cached everything a negligible
    * time ago, and will likely need to be revisited later
    */
-   fixTimestampsOnRehydrate = createEffect(() => this.actions$
+  fixTimestampsOnRehydrate = createEffect(() => this.actions$
     .pipe(ofType(StoreActionTypes.REHYDRATE),
-      map(() => new ResetResponseTimestampsAction(new Date().getTime()))
+      map(() => new ResetResponseTimestampsAction(new Date().getTime())),
     ));
 
   constructor(
     private actions$: Actions,
     private restApi: DspaceRestService,
     private injector: Injector,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) { }
 
 }
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index 6ab3f180d3..c46d9b8242 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -1,17 +1,16 @@
 /* eslint-disable max-classes-per-file */
-import { GenericConstructor } from '../shared/generic-constructor';
-import { ResponseParsingService } from './parsing.service';
-import { EndpointMapResponseParsingService } from './endpoint-map-response-parsing.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import {
-  SubmissionResponseParsingService
-} from '../submission/submission-response-parsing.service';
-import { RestRequestMethod } from './rest-request-method';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { SubmissionResponseParsingService } from '../submission/submission-response-parsing.service';
 import { TaskResponseParsingService } from '../tasks/task-response-parsing.service';
+import { BrowseResponseParsingService } from './browse-response-parsing.service';
 import { ContentSourceResponseParsingService } from './content-source-response-parsing.service';
-import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
+import { EndpointMapResponseParsingService } from './endpoint-map-response-parsing.service';
 import { FindListOptions } from './find-list-options.model';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequestMethod } from './rest-request-method';
+import { RestRequestWithResponseParser } from './rest-request-with-response-parser.model';
 
 
 // uuid and handle requests have separate endpoints
@@ -31,7 +30,7 @@ export class GetRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.GET, body, options);
   }
@@ -42,7 +41,7 @@ export class PostRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.POST, body);
   }
@@ -57,7 +56,7 @@ export class MultipartPostRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   )  {
     super(uuid, href, RestRequestMethod.POST, body);
   }
@@ -68,7 +67,7 @@ export class PutRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.PUT, body);
   }
@@ -79,7 +78,7 @@ export class DeleteRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.DELETE, body);
   }
@@ -90,7 +89,7 @@ export class OptionsRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.OPTIONS, body);
   }
@@ -101,7 +100,7 @@ export class HeadRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.HEAD, body);
   }
@@ -112,12 +111,21 @@ export class PatchRequest extends DSpaceRestRequest {
     public uuid: string,
     public href: string,
     public body?: any,
-    public options?: HttpOptions
+    public options?: HttpOptions,
   ) {
     super(uuid, href, RestRequestMethod.PATCH, body);
   }
 }
 
+/**
+ * Class representing a BrowseDefinition HTTP Rest request object
+ */
+export class BrowseDefinitionRestRequest extends DSpaceRestRequest {
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return BrowseResponseParsingService;
+  }
+}
+
 export class FindListRequest extends GetRequest {
   constructor(
     uuid: string,
@@ -225,7 +233,7 @@ export class DeleteByIDRequest extends DeleteRequest {
   constructor(
     uuid: string,
     href: string,
-    public resourceID: string
+    public resourceID: string,
   ) {
     super(uuid, href);
   }
diff --git a/src/app/core/data/request.reducer.spec.ts b/src/app/core/data/request.reducer.spec.ts
index f6f557ad8f..40e17a49dd 100644
--- a/src/app/core/data/request.reducer.spec.ts
+++ b/src/app/core/data/request.reducer.spec.ts
@@ -1,4 +1,6 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
 import {
   RequestConfigureAction,
   RequestErrorAction,
@@ -6,10 +8,10 @@ import {
   RequestRemoveAction,
   RequestStaleAction,
   RequestSuccessAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
 } from './request.actions';
 import { GetRequest } from './request.models';
-import { requestReducer} from './request.reducer';
+import { requestReducer } from './request.reducer';
 import { RequestEntryState } from './request-entry-state.model';
 import { RequestState } from './request-state.model';
 
@@ -32,24 +34,31 @@ describe('requestReducer', () => {
       request: new GetRequest(id1, link1),
       state: RequestEntryState.RequestPending,
       response: undefined,
-      lastUpdated: undefined
-    }
+      lastUpdated: undefined,
+    },
   };
   const testSuccessState = {
     [id1]: {
       state: RequestEntryState.Success,
-      lastUpdated: 0
-    }
+      lastUpdated: 0,
+    },
   };
   const testErrorState = {
     [id1]: {
       state: RequestEntryState.Error,
-      lastUpdated: 0
-    }
+      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();
@@ -90,37 +99,102 @@ 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', () => {
     const update = Object.assign({}, testInitState[id1], {
       response: {
         timeCompleted: 10,
-        statusCode: 200
-      }
+        statusCode: 200,
+      },
     });
     const state = Object.assign({}, testInitState, { [id1]: update });
     const timeStamp = 1000;
@@ -144,28 +218,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..cccb47442f 100644
--- a/src/app/core/data/request.reducer.ts
+++ b/src/app/core/data/request.reducer.ts
@@ -1,4 +1,5 @@
 /* eslint-disable max-classes-per-file */
+import { isNull } from '../../shared/empty.util';
 import {
   RequestAction,
   RequestActionTypes,
@@ -8,10 +9,15 @@ import {
   RequestRemoveAction,
   RequestStaleAction,
   RequestSuccessAction,
-  ResetResponseTimestampsAction
+  ResetResponseTimestampsAction,
 } from './request.actions';
-import { isNull } from '../../shared/empty.util';
-import { hasSucceeded, isStale, RequestEntryState } from './request-entry-state.model';
+import {
+  hasSucceeded,
+  isRequestPending,
+  isResponsePending,
+  isStale,
+  RequestEntryState,
+} 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__`)
@@ -60,8 +66,8 @@ function configureRequest(storeState: RequestState, action: RequestConfigureActi
       request: action.payload,
       state: RequestEntryState.RequestPending,
       response: null,
-      lastUpdated: action.lastUpdated
-    }
+      lastUpdated: action.lastUpdated,
+    },
   });
 }
 
@@ -74,8 +80,8 @@ function executeRequest(storeState: RequestState, action: RequestExecuteAction):
     return Object.assign({}, storeState, {
       [action.payload]: Object.assign({}, storeState[action.payload], {
         state: RequestEntryState.ResponsePending,
-        lastUpdated: action.lastUpdated
-      })
+        lastUpdated: action.lastUpdated,
+      }),
     });
   }
 }
@@ -91,24 +97,27 @@ 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,
           statusCode: action.payload.statusCode,
           payloadLink: action.payload.link,
           unCacheableObject: action.payload.unCacheableObject,
-          errorMessage: null
+          errorMessage: null,
         },
-        lastUpdated: action.lastUpdated
-      })
+        lastUpdated: action.lastUpdated,
+      }),
     });
   }
 }
@@ -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,
@@ -139,8 +151,8 @@ function completeFailedRequest(storeState: RequestState, action: RequestErrorAct
           payloadLink: null,
           errorMessage: action.payload.errorMessage,
         },
-        lastUpdated: action.lastUpdated
-      })
+        lastUpdated: action.lastUpdated,
+      }),
     });
   }
 }
@@ -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,
+      }),
+    });
   }
 }
 
@@ -190,10 +207,10 @@ function resetResponseTimestamps(storeState: RequestState, action: ResetResponse
     newState[key] = Object.assign({}, storeState[key],
       {
         response: Object.assign({}, storeState[key].response, {
-          timeCompleted: action.payload
+          timeCompleted: action.payload,
         }),
-        lastUpdated: action.payload
-      }
+        lastUpdated: action.payload,
+      },
     );
   });
   return newState;
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index fe35d840d7..76e70e8a6d 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -1,14 +1,42 @@
-import { Store, StoreModule } from '@ngrx/store';
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { EMPTY, of as observableOf } from 'rxjs';
+import {
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import {
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { storeModuleConfig } from '../../app.reducer';
 import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
-import { defaultUUID, getMockUUIDService } from '../../shared/mocks/uuid.service.mock';
+import {
+  defaultUUID,
+  getMockUUIDService,
+} from '../../shared/mocks/uuid.service.mock';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { coreReducers} from '../core.reducers';
+import { coreReducers } from '../core.reducers';
+import { CoreState } from '../core-state.model';
 import { UUIDService } from '../shared/uuid.service';
-import { RequestConfigureAction, RequestExecuteAction, RequestStaleAction } from './request.actions';
+import {
+  RequestConfigureAction,
+  RequestExecuteAction,
+  RequestStaleAction,
+} from './request.actions';
 import {
   DeleteRequest,
   GetRequest,
@@ -16,16 +44,12 @@ import {
   OptionsRequest,
   PatchRequest,
   PostRequest,
-  PutRequest
+  PutRequest,
 } from './request.models';
 import { RequestService } from './request.service';
-import { fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { storeModuleConfig } from '../../app.reducer';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
+import { RequestEntry } from './request-entry.model';
 import { RequestEntryState } from './request-entry-state.model';
 import { RestRequest } from './rest-request.model';
-import { CoreState } from '../core-state.model';
-import { RequestEntry } from './request-entry.model';
 
 describe('RequestService', () => {
   let scheduler: TestScheduler;
@@ -53,19 +77,19 @@ describe('RequestService', () => {
       'cache/object-updates': {},
       'data/request': {},
       'index': {},
-    }
+    },
   };
 
   beforeEach(waitForAsync(() => {
 
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot(coreReducers, storeModuleConfig)
+        StoreModule.forRoot(coreReducers, storeModuleConfig),
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: RequestService, useValue: service }
-      ]
+        { provide: RequestService, useValue: service },
+      ],
     }).compileComponents();
   }));
 
@@ -84,7 +108,7 @@ describe('RequestService', () => {
       objectCache,
       uuidService,
       store,
-      undefined
+      undefined,
     );
     serviceAsAny = service as any;
   });
@@ -129,7 +153,7 @@ describe('RequestService', () => {
     describe('when the request has reached the store, before the server responds', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValue(observableOf({
-          state: RequestEntryState.ResponsePending
+          state: RequestEntryState.ResponsePending,
         } as RequestEntry));
       });
 
@@ -144,7 +168,7 @@ describe('RequestService', () => {
     describe('after the server responds', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValues(observableOf({
-          state: RequestEntryState.Success
+          state: RequestEntryState.Success,
         } as RequestEntry));
       });
 
@@ -166,22 +190,22 @@ describe('RequestService', () => {
         entry = {
           state: RequestEntryState.Success,
           response: {
-            timeCompleted: new Date().getTime()
+            timeCompleted: new Date().getTime(),
           },
-          request: new GetRequest('request-uuid', 'request-href')
+          request: new GetRequest('request-uuid', 'request-href'),
         };
 
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'data/request': {
-              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry
+              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry,
             },
             'index': {
               'get-request/configured-to-cache-uuid': {
-                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
-              }
-            }
-          })
+                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
+              },
+            },
+          }),
         });
         mockStore.setState(state);
       });
@@ -189,7 +213,7 @@ describe('RequestService', () => {
       it('should return an Observable of the RequestEntry', () => {
         const result = service.getByUUID(testUUID);
         const expected = cold('b', {
-          b: entry
+          b: entry,
         });
 
         expect(result).toBeObservable(expected);
@@ -220,24 +244,24 @@ describe('RequestService', () => {
         entry = {
           state: RequestEntryState.Success,
           response: {
-            timeCompleted: new Date().getTime()
+            timeCompleted: new Date().getTime(),
           },
-          request: new GetRequest('request-uuid', 'request-href')
+          request: new GetRequest('request-uuid', 'request-href'),
         };
         const state = Object.assign({}, initialState, {
           core: Object.assign({}, initialState.core, {
             'data/request': {
-              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry
+              '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': entry,
             },
             'index': {
               'get-request/configured-to-cache-uuid': {
-                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
+                '5f2a0d2a-effa-4d54-bd54-5663b960f9eb': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
               },
               'get-request/href-to-uuid': {
-                'https://rest.api/endpoint/selfLink': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb'
-              }
-            }
-          })
+                'https://rest.api/endpoint/selfLink': '5f2a0d2a-effa-4d54-bd54-5663b960f9eb',
+              },
+            },
+          }),
         });
         mockStore.setState(state);
       });
@@ -245,7 +269,7 @@ describe('RequestService', () => {
       it('should return an Observable of the RequestEntry', () => {
         const result = service.getByHref(testHref);
         const expected = cold('c', {
-          c: entry
+          c: entry,
         });
 
         expect(result).toBeObservable(expected);
@@ -263,7 +287,7 @@ describe('RequestService', () => {
       it('should return an Observable of undefined', () => {
         const result = service.getByHref(testHref);
         const expected = cold('c', {
-          c: undefined
+          c: undefined,
         });
 
         expect(result).toBeObservable(expected);
@@ -527,9 +551,9 @@ describe('RequestService', () => {
       entry = {
         state: RequestEntryState.Success,
         response: {
-          timeCompleted: new Date().getTime()
+          timeCompleted: new Date().getTime(),
         },
-        request: request
+        request: request,
       };
     });
 
@@ -591,7 +615,20 @@ describe('RequestService', () => {
       };
       const queryParams = service.uriEncodeBody(body);
       expect(queryParams).toEqual(
-        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123'
+        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123',
+      );
+    });
+
+    it('should properly encode the body with an array', () => {
+      const body = {
+        'property1': 'multiple\nlines\nto\nsend',
+        'property2': 'sp&ci@l characters',
+        'sp&ci@l-chars in prop': 'test123',
+        'arrayParam': ['arrayValue1', 'arrayValue2'],
+      };
+      const queryParams = service.uriEncodeBody(body);
+      expect(queryParams).toEqual(
+        'property1=multiple%0Alines%0Ato%0Asend&property2=sp%26ci%40l%20characters&sp%26ci%40l-chars%20in%20prop=test123&arrayParam=arrayValue1&arrayParam=arrayValue2',
       );
     });
   });
@@ -625,4 +662,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 2d5acb2cb3..9bd262b1ad 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -1,37 +1,68 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import cloneDeep from 'lodash/cloneDeep';
+import {
+  from as observableFrom,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  find,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+  toArray,
+} from 'rxjs/operators';
 
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { filter, map, take, tap } from 'rxjs/operators';
-import { cloneDeep } from 'lodash';
-import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} 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 { requestIndexSelector, getUrlWithoutEmbedParams } from '../index/index.selectors';
+import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
+import {
+  IndexState,
+  MetaIndexState,
+} from '../index/index.reducer';
+import {
+  getUrlWithoutEmbedParams,
+  requestIndexSelector,
+} from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
 import {
   RequestConfigureAction,
   RequestExecuteAction,
-  RequestStaleAction
+  RequestStaleAction,
 } from './request.actions';
-import { GetRequest} from './request.models';
-import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
-import { RestRequestMethod } from './rest-request-method';
-import { coreSelector } from '../core.selectors';
-import { isLoading, isStale } from './request-entry-state.model';
-import { RestRequest } from './rest-request.model';
-import { CoreState } from '../core-state.model';
-import { RequestState } from './request-state.model';
+import { GetRequest } from './request.models';
 import { RequestEntry } from './request-entry.model';
+import {
+  isLoading,
+  isStale,
+} from './request-entry-state.model';
+import { RequestState } from './request-state.model';
+import { RestRequest } from './rest-request.model';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * The base selector function to select the request state in the store
  */
 const requestCacheSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state['data/request']
+  (state: CoreState) => state['data/request'],
 );
 
 /**
@@ -42,7 +73,7 @@ const entryFromUUIDSelector = (uuid: string): MemoizedSelector<CoreState, Reques
   requestCacheSelector,
   (state: RequestState) => {
     return hasValue(state) ? state[uuid] : undefined;
-  }
+  },
 );
 
 /**
@@ -65,7 +96,7 @@ const entryFromHrefSelector = (href: string): MemoizedSelector<CoreState, Reques
     } else {
       return undefined;
     }
-  }
+  },
 );
 
 /**
@@ -77,7 +108,7 @@ const entryFromHrefSelector = (href: string): MemoizedSelector<CoreState, Reques
 const uuidsFromHrefSubstringSelector =
   (selector: MemoizedSelector<CoreState, IndexState>, href: string): MemoizedSelector<CoreState, string[]> => createSelector(
     selector,
-    (state: IndexState) => getUuidsFromHrefSubstring(state, href)
+    (state: IndexState) => getUuidsFromHrefSubstring(state, href),
   );
 
 /**
@@ -129,7 +160,7 @@ const isValid = (entry: RequestEntry): boolean => {
  * A service to interact with the request state in the store
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RequestService {
   private requestsOnTheirWayToTheStore: string[] = [];
@@ -164,7 +195,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;
   }
@@ -176,7 +207,7 @@ export class RequestService {
     return this.store.pipe(
       select(entryFromUUIDSelector(uuid)),
       this.fixRequestHeaders(),
-      this.checkStale()
+      this.checkStale(),
     );
   }
 
@@ -188,14 +219,14 @@ export class RequestService {
   private fixRequestHeaders() {
     return (source: Observable<RequestEntry>): Observable<RequestEntry> => {
       return source.pipe(map((entry: RequestEntry) => {
-          // Headers break after being retrieved from the store (because of lazy initialization)
-          // Combining them with a new object fixes this issue
-          if (hasValue(entry) && hasValue(entry.request) && hasValue(entry.request.options) && hasValue(entry.request.options.headers)) {
-            entry = cloneDeep(entry);
-            entry.request.options.headers = Object.assign(new HttpHeaders(), entry.request.options.headers);
-          }
-          return entry;
-        })
+        // Headers break after being retrieved from the store (because of lazy initialization)
+        // Combining them with a new object fixes this issue
+        if (hasValue(entry) && hasValue(entry.request) && hasValue(entry.request.options) && hasValue(entry.request.options.headers)) {
+          entry = cloneDeep(entry);
+          entry.request.options.headers = Object.assign(new HttpHeaders(), entry.request.options.headers);
+        }
+        return entry;
+      }),
       );
     };
   }
@@ -212,7 +243,7 @@ export class RequestService {
           if (hasValue(entry) && hasValue(entry.request) && !isStale(entry.state) && !isValid(entry)) {
             this.store.dispatch(new RequestStaleAction(entry.request.uuid));
           }
-        })
+        }),
       );
     };
   }
@@ -224,7 +255,7 @@ export class RequestService {
     return this.store.pipe(
       select(entryFromHrefSelector(href)),
       this.fixRequestHeaders(),
-      this.checkStale()
+      this.checkStale(),
     );
   }
 
@@ -255,8 +286,8 @@ export class RequestService {
   /**
    * Convert request Payload to a URL-encoded string
    *
-   * e.g.  uriEncodeBody({param: value, param1: value1})
-   * returns: param=value&param1=value1
+   * e.g.  uriEncodeBody({param: value, param1: value1, param2: [value3, value4]})
+   * returns: param=value&param1=value1&param2=value3&param2=value4
    *
    * @param body
    *    The request Payload to convert
@@ -267,11 +298,19 @@ export class RequestService {
     let queryParams = '';
     if (isNotEmpty(body) && typeof body === 'object') {
       Object.keys(body)
-        .forEach((param) => {
+        .forEach((param: string) => {
           const encodedParam = encodeURIComponent(param);
-          const encodedBody = encodeURIComponent(body[param]);
-          const paramValue = `${encodedParam}=${encodedBody}`;
-          queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue);
+          if (Array.isArray(body[param])) {
+            for (const element of body[param]) {
+              const encodedBody = encodeURIComponent(element);
+              const paramValue = `${encodedParam}=${encodedBody}`;
+              queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue);
+            }
+          } else {
+            const encodedBody = encodeURIComponent(body[param]);
+            const paramValue = `${encodedParam}=${encodedBody}`;
+            queryParams = isEmpty(queryParams) ? queryParams.concat(paramValue) : queryParams.concat('&', paramValue);
+          }
         });
     }
     return queryParams;
@@ -292,22 +331,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[]) => {
+      take(1),
+    );
+    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),
+          );
+        }
+      }),
     );
   }
 
@@ -326,6 +385,28 @@ export class RequestService {
     );
   }
 
+  /**
+   * 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),
+    );
+  }
+
   /**
    * Check if a GET request is in the cache or if it's still pending
    * @param {GetRequest} request The request to check
@@ -336,10 +417,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 {
@@ -383,7 +464,7 @@ export class RequestService {
     this.requestsOnTheirWayToTheStore = [...this.requestsOnTheirWayToTheStore, request.href];
     this.getByHref(request.href).pipe(
       filter((re: RequestEntry) => hasValue(re) && hasValue(re.request) && re.request.uuid === request.uuid),
-      take(1)
+      take(1),
     ).subscribe((re: RequestEntry) => {
       this.requestsOnTheirWayToTheStore = this.requestsOnTheirWayToTheStore.filter((pendingHref: string) => pendingHref !== request.href);
     });
@@ -430,7 +511,7 @@ export class RequestService {
    */
   hasByHref$(href: string, checkValidity = true): Observable<boolean> {
     return this.getByHref(href).pipe(
-      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry))
+      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry)),
     );
   }
 
@@ -467,7 +548,7 @@ export class RequestService {
    */
   hasByUUID$(uuid: string, checkValidity = true): Observable<boolean> {
     return this.getByUUID(uuid).pipe(
-      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry))
+      map((requestEntry: RequestEntry) => checkValidity ? isValid(requestEntry) : hasValue(requestEntry)),
     );
   }
 
diff --git a/src/app/core/data/response-state.model.ts b/src/app/core/data/response-state.model.ts
index 97203fcdd5..1f7863e9c8 100644
--- a/src/app/core/data/response-state.model.ts
+++ b/src/app/core/data/response-state.model.ts
@@ -5,9 +5,9 @@ import { UnCacheableObject } from '../shared/uncacheable-object.model';
  * The response substate in the NgRx store
  */
 export class ResponseState {
-    timeCompleted: number;
-    statusCode: number;
-    errorMessage?: string;
-    payloadLink?: HALLink;
-    unCacheableObject?: UnCacheableObject;
+  timeCompleted: number;
+  statusCode: number;
+  errorMessage?: string;
+  payloadLink?: HALLink;
+  unCacheableObject?: UnCacheableObject;
 }
diff --git a/src/app/core/data/rest-request-with-response-parser.model.ts b/src/app/core/data/rest-request-with-response-parser.model.ts
index 1c9677ebb1..d05bcb19cf 100644
--- a/src/app/core/data/rest-request-with-response-parser.model.ts
+++ b/src/app/core/data/rest-request-with-response-parser.model.ts
@@ -1,6 +1,6 @@
-import { RestRequest } from './rest-request.model';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './rest-request.model';
 
 /**
  * A RestRequest with a method to retrieve the ResponseParsingService needed for its response
diff --git a/src/app/core/data/rest-request.model.ts b/src/app/core/data/rest-request.model.ts
index 05b583639b..95e605711b 100644
--- a/src/app/core/data/rest-request.model.ts
+++ b/src/app/core/data/rest-request.model.ts
@@ -1,20 +1,20 @@
 import { environment } from '../../../environments/environment';
-import { RestRequestMethod } from './rest-request-method';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * A request to the DSpace REST API
  */
 export abstract class RestRequest {
-    public responseMsToLive = environment.cache.msToLive.default;
-    public isMultipart = false;
+  public responseMsToLive = environment.cache.msToLive.default;
+  public isMultipart = false;
 
-    constructor(
+  constructor(
         public uuid: string,
         public href: string,
         public method: RestRequestMethod = RestRequestMethod.GET,
         public body?: any,
         public options?: HttpOptions,
-    ) {
-    }
+  ) {
+  }
 }
diff --git a/src/app/core/data/root-data.service.spec.ts b/src/app/core/data/root-data.service.spec.ts
index b65449d007..d629883220 100644
--- a/src/app/core/data/root-data.service.spec.ts
+++ b/src/app/core/data/root-data.service.spec.ts
@@ -1,16 +1,19 @@
-import { RootDataService } from './root-data.service';
+import { cold } from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { Observable, of } 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';
+import { RootDataService } from './root-data.service';
 
 describe('RootDataService', () => {
   let service: RootDataService;
   let halService: HALEndpointService;
-  let restService;
+  let requestService;
   let rootEndpoint;
   let findByHrefSpy;
 
@@ -19,10 +22,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,32 +50,32 @@ 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|)', {
-        a: true
+        a: true,
       }));
     });
 
     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|)', {
-        a: false
+        a: false,
       }));
     });
 
   });
+
+  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..c6d634318c 100644
--- a/src/app/core/data/root-data.service.ts
+++ b/src/app/core/data/root-data.service.ts
@@ -1,18 +1,24 @@
-import { Root } from './root.model';
 import { Injectable } from '@angular/core';
-import { ROOT } from './root.resource-type';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { RemoteData } from './remote-data';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
+
 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 { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { BaseDataService } from './base/base-data.service';
 import { dataService } from './base/data-service.decorator';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { Root } from './root.model';
+import { ROOT } from './root.resource-type';
 
 /**
  * A service to retrieve the {@link Root} object from the REST API.
@@ -25,7 +31,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 +39,13 @@ export class RootDataService extends BaseDataService<Root> {
    * Check if root endpoint is available
    */
   checkServerAvailability(): Observable<boolean> {
-    return this.restService.get(this.halService.getRootHref()).pipe(
-      catchError((err ) => {
+    return this.findRoot().pipe(
+      catchError((err: unknown) => {
         console.error(err);
         return observableOf(false);
       }),
-      map((res: RawRestResponse) => res.statusCode === 200)
+      getFirstCompletedRemoteData(),
+      map((rootRd: RemoteData<Root>) => rootRd.statusCode === 200),
     );
   }
 
@@ -60,6 +66,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/root.model.ts b/src/app/core/data/root.model.ts
index a2d2518dde..46a276fa1f 100644
--- a/src/app/core/data/root.model.ts
+++ b/src/app/core/data/root.model.ts
@@ -1,10 +1,14 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
-import { ROOT } from './root.resource-type';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { autoserialize, deserialize } from 'cerialize';
-import { ResourceType } from '../shared/resource-type';
-import { HALLink } from '../shared/hal-link.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { HALLink } from '../shared/hal-link.model';
+import { ResourceType } from '../shared/resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { ROOT } from './root.resource-type';
 
 /**
  * The root rest api resource
@@ -18,37 +22,37 @@ export class Root implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The url for the dspace UI
    */
   @autoserialize
-  dspaceUI: string;
+    dspaceUI: string;
 
   /**
    * The repository Name
    */
   @autoserialize
-  dspaceName: string;
+    dspaceName: string;
 
   /**
    * The url for the rest api
    */
   @autoserialize
-  dspaceServer: string;
+    dspaceServer: string;
 
   /**
    * The current DSpace version
    */
   @autoserialize
-  dspaceVersion: string;
+    dspaceVersion: string;
 
   /**
    * The {@link HALLink}s for the root object
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     [k: string]: HALLink | HALLink[];
   };
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index 8ba9a747fe..1dac4ab183 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -1,10 +1,14 @@
 import { Injectable } from '@angular/core';
+
 import { hasValue } from '../../shared/empty.util';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { ParsedResponse } from '../cache/response.models';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { DSpaceSerializer } from '../dspace-rest/dspace.serializer';
-import { MetadataMap, MetadataValue } from '../shared/metadata.models';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../shared/metadata.models';
 import { DspaceRestResponseParsingService } from './dspace-rest-response-parsing.service';
 import { RestRequest } from './rest-request.model';
 
@@ -14,8 +18,8 @@ export class SearchResponseParsingService extends DspaceRestResponseParsingServi
     // fallback for unexpected empty response
     const emptyPayload = {
       _embedded : {
-        objects: []
-      }
+        objects: [],
+      },
     };
     const payload = data.payload._embedded.searchResult || emptyPayload;
     payload.appliedFilters = data.payload.appliedFilters;
diff --git a/src/app/core/data/signposting-data.service.spec.ts b/src/app/core/data/signposting-data.service.spec.ts
new file mode 100644
index 0000000000..2b10bba89b
--- /dev/null
+++ b/src/app/core/data/signposting-data.service.spec.ts
@@ -0,0 +1,100 @@
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { of } from 'rxjs';
+
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { SignpostingDataService } from './signposting-data.service';
+import { SignpostingLink } from './signposting-links.model';
+
+describe('SignpostingDataService', () => {
+  let service: SignpostingDataService;
+  let restServiceSpy: jasmine.SpyObj<DspaceRestService>;
+
+  const mocklink = {
+    href: 'http://test.org',
+    rel: 'test',
+    type: 'test',
+  };
+
+  const mocklink2 = {
+    href: 'http://test2.org',
+    rel: 'test',
+    type: 'test',
+  };
+
+  const mockResponse: any = {
+    statusCode: 200,
+    payload: [mocklink, mocklink2],
+  };
+
+  const mockErrResponse: any = {
+    statusCode: 500,
+  };
+
+  const environmentRest = {
+    rest: {
+      baseUrl: 'http://localhost:8080',
+    },
+  };
+
+  beforeEach(() => {
+    const restSpy = jasmine.createSpyObj('DspaceRestService', ['get', 'getWithHeaders']);
+
+    TestBed.configureTestingModule({
+      providers: [
+        SignpostingDataService,
+        { provide: APP_CONFIG, useValue: environmentRest },
+        { provide: DspaceRestService, useValue: restSpy },
+      ],
+    });
+
+    service = TestBed.inject(SignpostingDataService);
+    restServiceSpy = TestBed.inject(DspaceRestService) as jasmine.SpyObj<DspaceRestService>;
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('should return signposting links', fakeAsync(() => {
+    const uuid = '123';
+    const baseUrl = 'http://localhost:8080';
+
+    restServiceSpy.get.and.returnValue(of(mockResponse));
+
+    let result: SignpostingLink[];
+
+    const expectedResult: SignpostingLink[] = [mocklink, mocklink2];
+
+    service.getLinks(uuid).subscribe((links) => {
+      result = links;
+    });
+
+    tick();
+
+    expect(result).toEqual(expectedResult);
+    expect(restServiceSpy.get).toHaveBeenCalledWith(`${baseUrl}/signposting/links/${uuid}`);
+  }));
+
+  it('should handle error and return an empty array', fakeAsync(() => {
+    const uuid = '123';
+    const baseUrl = 'http://localhost:8080';
+
+    restServiceSpy.get.and.returnValue(of(mockErrResponse));
+
+    let result: any;
+
+    service.getLinks(uuid).subscribe((data) => {
+      result = data;
+    });
+
+    tick();
+
+    expect(result).toEqual([]);
+    expect(restServiceSpy.get).toHaveBeenCalledWith(`${baseUrl}/signposting/links/${uuid}`);
+  }));
+});
diff --git a/src/app/core/data/signposting-data.service.ts b/src/app/core/data/signposting-data.service.ts
new file mode 100644
index 0000000000..d78f75bd11
--- /dev/null
+++ b/src/app/core/data/signposting-data.service.ts
@@ -0,0 +1,49 @@
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import { SignpostingLink } from './signposting-links.model';
+
+/**
+ * Service responsible for handling requests related to the Signposting endpoint
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class SignpostingDataService {
+
+  constructor(@Inject(APP_CONFIG) protected appConfig: AppConfig, private restService: DspaceRestService) {
+  }
+
+  /**
+   * Retrieve the list of signposting links related to the given resource's id
+   *
+   * @param uuid
+   */
+  getLinks(uuid: string): Observable<SignpostingLink[]> {
+    const baseUrl = `${this.appConfig.rest.baseUrl}`;
+
+    return this.restService.get(`${baseUrl}/signposting/links/${uuid}`).pipe(
+      catchError((err: unknown) => {
+        return observableOf([]);
+      }),
+      map((res: RawRestResponse) => res.statusCode === 200 ? res.payload as SignpostingLink[] : []),
+    );
+  }
+
+}
diff --git a/src/app/core/data/signposting-links.model.ts b/src/app/core/data/signposting-links.model.ts
new file mode 100644
index 0000000000..11d2cafe00
--- /dev/null
+++ b/src/app/core/data/signposting-links.model.ts
@@ -0,0 +1,8 @@
+/**
+ * Represents the link object received by the signposting endpoint
+ */
+export interface SignpostingLink {
+    href?: string,
+    rel?: string,
+    type?: string
+}
diff --git a/src/app/core/data/site-data.service.spec.ts b/src/app/core/data/site-data.service.spec.ts
index 42bdfedb8a..253d1a6f15 100644
--- a/src/app/core/data/site-data.service.spec.ts
+++ b/src/app/core/data/site-data.service.spec.ts
@@ -1,15 +1,19 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { SiteDataService } from './site-data.service';
-import { RequestService } from './request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { Site } from '../shared/site.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
+
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { FindListOptions } from './find-list-options.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Site } from '../shared/site.model';
 import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { FindListOptions } from './find-list-options.model';
+import { RequestService } from './request.service';
+import { SiteDataService } from './site-data.service';
 
 describe('SiteDataService', () => {
   let scheduler: TestScheduler;
@@ -32,7 +36,7 @@ describe('SiteDataService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: siteLink })
+      getEndpoint: cold('a', { a: siteLink }),
     });
     requestService = jasmine.createSpyObj('requestService', {
       generateRequestId: requestUUID,
@@ -40,8 +44,8 @@ describe('SiteDataService', () => {
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildList: cold('a', {
-        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject]))
-      })
+        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject])),
+      }),
     });
 
     objectCache = {} as ObjectCacheService;
@@ -74,7 +78,7 @@ describe('SiteDataService', () => {
     it('should return the Site object', () => {
 
       spyOn(service, 'findAll').and.returnValue(cold('a', {
-        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject]))
+        a: createSuccessfulRemoteDataObject(createPaginatedList([testObject])),
       }));
 
       const expected = cold('(b|)', { b: testObject });
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
index c2c4ffa466..af91320e3c 100644
--- a/src/app/core/data/site-data.service.ts
+++ b/src/app/core/data/site-data.service.ts
@@ -1,20 +1,24 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { getFirstSucceededRemoteData } from '../shared/operators';
 import { Site } from '../shared/site.model';
 import { SITE } from '../shared/site.resource-type';
+import { BaseDataService } from './base/base-data.service';
+import { dataService } from './base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { FindListOptions } from './find-list-options.model';
 import { PaginatedList } from './paginated-list.model';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { BaseDataService } from './base/base-data.service';
-import { FindAllData, FindAllDataImpl } from './base/find-all-data';
-import { FollowLinkConfig } from 'src/app/shared/utils/follow-link-config.model';
-import { FindListOptions } from './find-list-options.model';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { dataService } from './base/data-service.decorator';
 
 /**
  * Service responsible for handling requests related to the Site object
diff --git a/src/app/core/data/status-code-only-response-parsing.service.spec.ts b/src/app/core/data/status-code-only-response-parsing.service.spec.ts
index cbf2a49c48..aef01777d3 100644
--- a/src/app/core/data/status-code-only-response-parsing.service.spec.ts
+++ b/src/app/core/data/status-code-only-response-parsing.service.spec.ts
@@ -16,7 +16,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       const result = service.parse(undefined, {
         payload,
         statusCode: 201,
-        statusText: '201'
+        statusText: '201',
       });
 
       expect(JSON.stringify(result).indexOf(payload)).toBe(-1);
@@ -31,7 +31,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a success RestResponse', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.isSuccessful).toBe(true);
@@ -40,7 +40,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status code', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusCode).toBe(statusCode);
@@ -49,7 +49,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status text', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusText).toBe(statusText);
@@ -65,7 +65,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return an error RestResponse', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.isSuccessful).toBe(false);
@@ -74,7 +74,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status code', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusCode).toBe(statusCode);
@@ -83,7 +83,7 @@ describe('StatusCodeOnlyResponseParsingService', () => {
       it('should return a RestResponse with the correct status text', () => {
         const result = service.parse(undefined, {
           statusCode,
-          statusText
+          statusText,
         });
 
         expect(result.statusText).toBe(statusText);
diff --git a/src/app/core/data/status-code-only-response-parsing.service.ts b/src/app/core/data/status-code-only-response-parsing.service.ts
index ad6a01429d..919891dedc 100644
--- a/src/app/core/data/status-code-only-response-parsing.service.ts
+++ b/src/app/core/data/status-code-only-response-parsing.service.ts
@@ -1,4 +1,5 @@
 import { Injectable } from '@angular/core';
+
 import { RestResponse } from '../cache/response.models';
 import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { ResponseParsingService } from './parsing.service';
@@ -9,7 +10,7 @@ import { RestRequest } from './rest-request.model';
  * text of the response, and ignore anything else that might be there
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class StatusCodeOnlyResponseParsingService implements ResponseParsingService {
 
diff --git a/src/app/core/data/system-wide-alert-data.service.spec.ts b/src/app/core/data/system-wide-alert-data.service.spec.ts
new file mode 100644
index 0000000000..6561b90785
--- /dev/null
+++ b/src/app/core/data/system-wide-alert-data.service.spec.ts
@@ -0,0 +1,13 @@
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { SystemWideAlertDataService } from './system-wide-alert-data.service';
+
+describe('SystemWideAlertDataService', () => {
+  describe('composition', () => {
+    const initService = () => new SystemWideAlertDataService(null, null, null, null, null);
+    testFindAllDataImplementation(initService);
+    testPutDataImplementation(initService);
+    testCreateDataImplementation(initService);
+  });
+});
diff --git a/src/app/core/data/system-wide-alert-data.service.ts b/src/app/core/data/system-wide-alert-data.service.ts
new file mode 100644
index 0000000000..8ea8358ad2
--- /dev/null
+++ b/src/app/core/data/system-wide-alert-data.service.ts
@@ -0,0 +1,117 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { SystemWideAlert } from '../../system-wide-alert/system-wide-alert.model';
+import { SYSTEMWIDEALERT } from '../../system-wide-alert/system-wide-alert.resource-type';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import { dataService } from './base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+
+/**
+ * Dataservice representing a system-wide alert
+ */
+@Injectable()
+@dataService(SYSTEMWIDEALERT)
+export class SystemWideAlertDataService extends IdentifiableDataService<SystemWideAlert> implements FindAllData<SystemWideAlert>, CreateData<SystemWideAlert>, PutData<SystemWideAlert>, SearchData<SystemWideAlert> {
+  private findAllData: FindAllDataImpl<SystemWideAlert>;
+  private createData: CreateDataImpl<SystemWideAlert>;
+  private putData: PutDataImpl<SystemWideAlert>;
+  private searchData: SearchData<SystemWideAlert>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('systemwidealerts', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SystemWideAlert>[]): Observable<RemoteData<PaginatedList<SystemWideAlert>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Create a new object on the server, and store the response in the object cache
+   *
+   * @param object    The object to create
+   * @param params    Array with additional params to combine with query string
+   */
+  create(object: SystemWideAlert, ...params: RequestParam[]): Observable<RemoteData<SystemWideAlert>> {
+    return this.createData.create(object, ...params);
+  }
+
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: SystemWideAlert): Observable<RemoteData<SystemWideAlert>> {
+    return this.putData.put(object);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SystemWideAlert>[]): Observable<RemoteData<PaginatedList<SystemWideAlert>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+}
diff --git a/src/app/core/data/update-data.service.spec.ts b/src/app/core/data/update-data.service.spec.ts
new file mode 100644
index 0000000000..73ea07b84d
--- /dev/null
+++ b/src/app/core/data/update-data.service.spec.ts
@@ -0,0 +1,152 @@
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { Version } from '../shared/version.model';
+import { VersionHistory } from '../shared/version-history.model';
+import { testCreateDataImplementation } from './base/create-data.spec';
+import { testDeleteDataImplementation } from './base/delete-data.spec';
+import { testFindAllDataImplementation } from './base/find-all-data.spec';
+import { testPatchDataImplementation } from './base/patch-data.spec';
+import { testPutDataImplementation } from './base/put-data.spec';
+import { testSearchDataImplementation } from './base/search-data.spec';
+import { HrefOnlyDataService } from './href-only-data.service';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { UpdateDataServiceImpl } from './update-data.service';
+
+describe('VersionDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: UpdateDataServiceImpl<any>;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let hrefOnlyDataService: HrefOnlyDataService;
+  let responseCacheEntry: RequestEntry;
+
+  const notificationsService = {} as NotificationsService;
+
+  const item = Object.assign(new Item(), {
+    id: '1234-1234',
+    uuid: '1234-1234',
+    bundles: observableOf({}),
+    metadata: {
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'This is just another title',
+        },
+      ],
+      'dc.type': [
+        {
+          language: null,
+          value: 'Article',
+        },
+      ],
+      'dc.contributor.author': [
+        {
+          language: 'en_US',
+          value: 'Smith, Donald',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '2015-06-26',
+        },
+      ],
+    },
+  });
+
+  const versionHistory = Object.assign(new VersionHistory(), {
+    id: '1',
+    draftVersion: true,
+  });
+
+  const mockVersion: Version = Object.assign(new Version(), {
+    item: createSuccessfulRemoteDataObject$(item),
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistory),
+    version: 1,
+  });
+  const mockVersionRD = createSuccessfulRemoteDataObject(mockVersion);
+
+  const endpointURL = `https://rest.api/rest/api/versioning/versions`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  objectCache = {} as ObjectCacheService;
+  const comparatorEntry = {} as any;
+  function initTestService() {
+    hrefOnlyDataService = getMockHrefOnlyDataService();
+    return new UpdateDataServiceImpl(
+      'testLinkPath',
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      comparatorEntry,
+      10 * 1000,
+    );
+  }
+
+  beforeEach(() => {
+
+    scheduler = getTestScheduler();
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: endpointURL }),
+    });
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: hot('(a|)', {
+        a: mockVersionRD,
+      }),
+    });
+
+    service = initTestService();
+
+    spyOn((service as any), 'findById').and.callThrough();
+  });
+
+  afterEach(() => {
+    service = null;
+  });
+
+  describe('composition', () => {
+    const initService = () => new UpdateDataServiceImpl(null, null, null, null, null, null, null, null);
+
+    testPatchDataImplementation(initService);
+    testSearchDataImplementation(initService);
+    testDeleteDataImplementation(initService);
+    testCreateDataImplementation(initService);
+    testFindAllDataImplementation(initService);
+    testPutDataImplementation(initService);
+  });
+
+});
diff --git a/src/app/core/data/update-data.service.ts b/src/app/core/data/update-data.service.ts
index 9f707a82da..6a8a0c63e8 100644
--- a/src/app/core/data/update-data.service.ts
+++ b/src/app/core/data/update-data.service.ts
@@ -1,13 +1,337 @@
-import { Observable } from 'rxjs';
-import { RemoteData } from './remote-data';
-import { RestRequestMethod } from './rest-request-method';
 import { Operation } from 'fast-json-patch';
+import {
+  AsyncSubject,
+  from as observableFrom,
+  Observable,
+} from 'rxjs';
+import {
+  find,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheEntry } from '../cache/object-cache.reducer';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import {
+  CreateData,
+  CreateDataImpl,
+} from './base/create-data';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from './base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from './base/find-all-data';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import {
+  PutData,
+  PutDataImpl,
+} from './base/put-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from './base/search-data';
+import { ChangeAnalyzer } from './change-analyzer';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import {
+  DeleteByIDRequest,
+  PostRequest,
+} from './request.models';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
- * Represents a data service to update a given object
+ * Interface to list the methods used by the injected service in components
  */
 export interface UpdateDataService<T> {
   patch(dso: T, operations: Operation[]): Observable<RemoteData<T>>;
   update(object: T): Observable<RemoteData<T>>;
-  commitUpdates(method?: RestRequestMethod);
+  commitUpdates(method?: RestRequestMethod): void;
+}
+
+
+/**
+ * Specific functionalities that not all services would need.
+ * Goal of the class is to update remote objects, handling custom methods that don't belong to BaseDataService
+ * The class implements also the following common interfaces
+ *
+ * findAllData: FindAllData<T>;
+ * searchData: SearchData<T>;
+ * createData: CreateData<T>;
+ * patchData: PatchData<T>;
+ * putData: PutData<T>;
+ * deleteData: DeleteData<T>;
+ *
+ * Custom methods are:
+ *
+ * deleteOnRelated - delete all related objects to the given one
+ * postOnRelated - post all the related objects to the given one
+ * invalidate - invalidate the DSpaceObject making all requests as stale
+ * invalidateByHref - invalidate the href making all requests as stale
+ */
+
+export class UpdateDataServiceImpl<T extends CacheableObject> extends IdentifiableDataService<T> implements FindAllData<T>, SearchData<T>, CreateData<T>, PatchData<T>, PutData<T>, DeleteData<T> {
+  private findAllData: FindAllDataImpl<T>;
+  private searchData: SearchDataImpl<T>;
+  private createData: CreateDataImpl<T>;
+  private patchData: PatchDataImpl<T>;
+  private putData: PutDataImpl<T>;
+  private deleteData: DeleteDataImpl<T>;
+
+
+  constructor(
+    protected linkPath: string,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected comparator: ChangeAnalyzer<T>,
+    protected responseMsToLive: number,
+  ) {
+    super(linkPath, requestService, rdbService, objectCache, halService, responseMsToLive);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService ,this.responseMsToLive);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator ,this.responseMsToLive, this.constructIdEndpoint);
+    this.putData = new PutDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService ,this.responseMsToLive, this.constructIdEndpoint);
+  }
+
+
+  /**
+   * Create the HREF with given options object
+   *
+   * @param options The [[FindListOptions]] object
+   * @param linkPath The link path for the object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public getFindAllHref(options: FindListOptions = {}, linkPath?: string, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
+    return this.findAllData.getFindAllHref(options, linkPath, ...linksToFollow);
+  }
+
+  /**
+   * Create the HREF for a specific object's search method with given options object
+   *
+   * @param searchMethod The search method for the object
+   * @param options The [[FindListOptions]] object
+   * @return {Observable<string>}
+   *    Return an observable that emits created HREF
+   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   */
+  public getSearchByHref(searchMethod: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<T>[]): Observable<string> {
+    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  searchBy(searchMethod: string, options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<PaginatedList<T>>> {
+    return  this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Send a patch request for a specified object
+   * @param {T} object The object to send a patch request for
+   * @param {Operation[]} operations The patch operations to be performed
+   */
+  patch(object: T, operations: Operation[]): Observable<RemoteData<T>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  createPatchFromCache(object: T): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  /**
+   * Send a PUT request for the specified object
+   *
+   * @param object The object to send a put request for.
+   */
+  put(object: T): Observable<RemoteData<T>> {
+    return this.putData.put(object);
+  }
+
+  /**
+   * 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
+   * @param {DSpaceObject} object The given object
+   */
+  update(object: T): Observable<RemoteData<T>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Create a new DSpaceObject on the server, and store the response
+   * in the object cache
+   *
+   * @param {CacheableObject} object
+   *    The object to create
+   * @param {RequestParam[]} params
+   *    Array with additional params to combine with query string
+   */
+  create(object: T, ...params: RequestParam[]): Observable<RemoteData<T>> {
+    return this.createData.create(object, ...params);
+  }
+  /**
+   * Perform a post on an endpoint related item with ID. Ex.: endpoint/<itemId>/related?item=<relatedItemId>
+   * @param itemId The item id
+   * @param relatedItemId The related item Id
+   * @param body The optional POST body
+   * @return the RestResponse as an Observable
+   */
+  public postOnRelated(itemId: string, relatedItemId: string, body?: any) {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getIDHrefObs(itemId);
+
+    hrefObs.pipe(
+      take(1),
+    ).subscribe((href: string) => {
+      const request = new PostRequest(requestId, href + '/related?item=' + relatedItemId, body);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUID<T>(requestId);
+  }
+
+  /**
+   * Perform a delete on an endpoint related item. Ex.: endpoint/<itemId>/related
+   * @param itemId The item id
+   * @return the RestResponse as an Observable
+   */
+  public deleteOnRelated(itemId: string): Observable<RemoteData<NoContent>> {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getIDHrefObs(itemId);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new DeleteByIDRequest(requestId, href + '/related', itemId);
+        if (hasValue(this.responseMsToLive)) {
+          request.responseMsToLive = this.responseMsToLive;
+        }
+        this.requestService.send(request);
+      }),
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
+  /*
+   * Invalidate an existing DSpaceObject by marking all requests it is included in as stale
+   * @param   objectId The id of the object to be invalidated
+   * @return  An Observable that will emit `true` once all requests are stale
+   */
+  invalidate(objectId: string): Observable<boolean> {
+    return this.getIDHrefObs(objectId).pipe(
+      switchMap((href: string) => this.invalidateByHref(href)),
+    );
+  }
+
+  /**
+   * Invalidate an existing DSpaceObject by marking all requests it is included in as stale
+   * @param   href The self link of the object to be invalidated
+   * @return  An Observable that will emit `true` once all requests are stale
+   */
+  invalidateByHref(href: string): Observable<boolean> {
+    const done$ = new AsyncSubject<boolean>();
+
+    this.objectCache.getByHref(href).pipe(
+      switchMap((oce: ObjectCacheEntry) => observableFrom(oce.requestUUIDs).pipe(
+        mergeMap((requestUUID: string) => this.requestService.setStaleByUUID(requestUUID)),
+        toArray(),
+      )),
+    ).subscribe(() => {
+      done$.next(true);
+      done$.complete();
+    });
+
+    return done$;
+  }
+
+  /**
+   * Delete an existing DSpace Object on the server
+   * @param   objectId The id of the object to be removed
+   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
+   *                            metadata should be saved as real metadata
+   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
+   *          errorMessage, timeCompleted, etc
+   */
+  delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  /**
+   * Delete an existing DSpace Object on the server
+   * @param   href The self link of the object to be removed
+   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
+   *                            metadata should be saved as real metadata
+   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
+   *          errorMessage, timeCompleted, etc
+   *          Only emits once all request related to the DSO has been invalidated.
+   */
+  deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+  /**
+   * Commit current object changes to the server
+   * @param method The RestRequestMethod for which de server sync buffer should be committed
+   */
+  commitUpdates(method?: RestRequestMethod) {
+    this.patchData.commitUpdates(method);
+  }
 }
diff --git a/src/app/core/data/version-data.service.spec.ts b/src/app/core/data/version-data.service.spec.ts
index dd3f9eec94..54af9b8895 100644
--- a/src/app/core/data/version-data.service.spec.ts
+++ b/src/app/core/data/version-data.service.spec.ts
@@ -1,21 +1,29 @@
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { 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 { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from './request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { HrefOnlyDataService } from './href-only-data.service';
-import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { RestResponse } from '../cache/response.models';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { VersionDataService } from './version-data.service';
 import { Version } from '../shared/version.model';
 import { VersionHistory } from '../shared/version-history.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { RequestEntry } from './request-entry.model';
 import { testPatchDataImplementation } from './base/patch-data.spec';
+import { HrefOnlyDataService } from './href-only-data.service';
+import { RequestService } from './request.service';
+import { RequestEntry } from './request-entry.model';
+import { VersionDataService } from './version-data.service';
 
 describe('VersionDataService test', () => {
   let scheduler: TestScheduler;
@@ -35,28 +43,28 @@ describe('VersionDataService test', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(item);
 
@@ -84,7 +92,7 @@ describe('VersionDataService test', () => {
       rdbService,
       objectCache,
       halService,
-      comparatorEntry
+      comparatorEntry,
     );
   }
 
@@ -99,7 +107,7 @@ describe('VersionDataService test', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: cold('a', { a: endpointURL }),
       });
       responseCacheEntry = new RequestEntry();
       responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -114,8 +122,8 @@ describe('VersionDataService test', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('(a|)', {
-          a: mockVersionRD
-        })
+          a: mockVersionRD,
+        }),
       });
 
       service = initTestService();
@@ -128,7 +136,7 @@ describe('VersionDataService test', () => {
     });
 
     describe('getHistoryFromVersion', () => {
-      it('should proxy the call to DataService.findByHref', () => {
+      it('should proxy the call to UpdateDataServiceImpl.findByHref', () => {
         scheduler.schedule(() => service.getHistoryFromVersion(mockVersion, true, true));
         scheduler.flush();
 
@@ -138,7 +146,7 @@ describe('VersionDataService test', () => {
       it('should return a VersionHistory', () => {
         const result = service.getHistoryFromVersion(mockVersion, true, true);
         const expected = cold('(a|)', {
-          a: versionHistory
+          a: versionHistory,
         });
         expect(result).toBeObservable(expected);
       });
@@ -156,7 +164,7 @@ describe('VersionDataService test', () => {
 
         const result = service.getHistoryIdFromVersion(mockVersion);
         const expected = cold('(a|)', {
-          a: versionHistory.id
+          a: versionHistory.id,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/data/version-data.service.ts b/src/app/core/data/version-data.service.ts
index 67c249fe0a..7bc8e47d1e 100644
--- a/src/app/core/data/version-data.service.ts
+++ b/src/app/core/data/version-data.service.ts
@@ -1,23 +1,33 @@
 import { Injectable } from '@angular/core';
-import { Version } from '../shared/version.model';
-import { RequestService } from './request.service';
+import { Operation } from 'fast-json-patch';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
+import { 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 { HALEndpointService } from '../shared/hal-endpoint.service';
-import { EMPTY, Observable } from 'rxjs';
+import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
+import { Version } from '../shared/version.model';
 import { VERSION } from '../shared/version.resource-type';
 import { VersionHistory } from '../shared/version-history.model';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { map, switchMap } from 'rxjs/operators';
-import { isNotEmpty } from '../../shared/empty.util';
-import { RemoteData } from './remote-data';
-import { PatchData, PatchDataImpl } from './base/patch-data';
-import { RestRequestMethod } from './rest-request-method';
-import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { IdentifiableDataService } from './base/identifiable-data.service';
 import { dataService } from './base/data-service.decorator';
-import { Operation } from 'fast-json-patch';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from './base/patch-data';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+import { RemoteData } from './remote-data';
+import { RequestService } from './request.service';
+import { RestRequestMethod } from './rest-request-method';
 
 /**
  * Service responsible for handling requests related to the Version object
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..a4e2a2c436 100644
--- a/src/app/core/data/version-history-data.service.spec.ts
+++ b/src/app/core/data/version-history-data.service.spec.ts
@@ -1,18 +1,22 @@
-import { RequestService } from './request.service';
+import {
+  fakeAsync,
+  waitForAsync,
+} from '@angular/core/testing';
+import { of } from 'rxjs';
+
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { VersionHistoryDataService } from './version-history-data.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { VersionDataService } from './version-data.service';
-import { fakeAsync, waitForAsync } from '@angular/core/testing';
-import { VersionHistory } from '../shared/version-history.model';
-import { Version } from '../shared/version.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { Item } from '../shared/item.model';
-import { of } from 'rxjs';
+import { Version } from '../shared/version.model';
+import { VersionHistory } from '../shared/version-history.model';
+import { RequestService } from './request.service';
+import { VersionDataService } from './version-data.service';
+import { VersionHistoryDataService } from './version-history-data.service';
 import SpyObj = jasmine.SpyObj;
 
 const url = 'fake-url';
@@ -74,8 +78,8 @@ describe('VersionHistoryDataService', () => {
     _links: {
       self: {
         href: '/items/' + item2Uuid,
-      }
-    }
+      },
+    },
   });
   const item2 = Object.assign(new Item(), {
     uuid: item2Uuid,
@@ -84,8 +88,8 @@ describe('VersionHistoryDataService', () => {
     _links: {
       self: {
         href: '/items/' + item2Uuid,
-      }
-    }
+      },
+    },
   });
   const items = [item1, item2];
   version1.item = createSuccessfulRemoteDataObject$(item1);
diff --git a/src/app/core/data/version-history-data.service.ts b/src/app/core/data/version-history-data.service.ts
index b331c4f2e4..e39e12ea29 100644
--- a/src/app/core/data/version-history-data.service.ts
+++ b/src/app/core/data/version-history-data.service.ts
@@ -1,30 +1,47 @@
-import { VersionHistory } from '../shared/version-history.model';
+import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { hasValueOperator } from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 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 { 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 { 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 { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { FindListOptions } from './find-list-options.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
+} from '../shared/operators';
 import { sendRequest } from '../shared/request.operators';
-import { RestRequest } from './rest-request.model';
-import { IdentifiableDataService } from './base/identifiable-data.service';
+import { Version } from '../shared/version.model';
+import { VersionHistory } from '../shared/version-history.model';
+import { VERSION_HISTORY } from '../shared/version-history.resource-type';
 import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { FindListOptions } from './find-list-options.model';
+import { PaginatedList } from './paginated-list.model';
+import { RemoteData } from './remote-data';
+import { PostRequest } from './request.models';
+import { RequestService } from './request.service';
+import { RestRequest } from './rest-request.model';
+import { VersionDataService } from './version-data.service';
 
 /**
  * Service responsible for handling requests related to the VersionHistory object
@@ -57,7 +74,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    */
   getVersionsEndpoint(versionHistoryId: string): Observable<string> {
     return this.getBrowseEndpoint().pipe(
-      switchMap((href: string) => this.halService.getEndpoint(this.versionsEndpoint, `${href}/${versionHistoryId}`))
+      switchMap((href: string) => this.halService.getEndpoint(this.versionsEndpoint, `${href}/${versionHistoryId}`)),
     );
   }
 
@@ -74,7 +91,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
    */
   getVersions(versionHistoryId: string, searchOptions?: PaginatedSearchOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Version>[]): Observable<RemoteData<PaginatedList<Version>>> {
     const hrefObs = this.getVersionsEndpoint(versionHistoryId).pipe(
-      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href)
+      map((href) => searchOptions ? searchOptions.toRestUrl(href) : href),
     );
 
     return this.versionDataService.findListByHref(hrefObs, undefined, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
@@ -97,7 +114,7 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
       map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, itemHref, requestOptions)),
       sendRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ) as Observable<RemoteData<Version>>;
   }
 
@@ -111,17 +128,17 @@ export class VersionHistoryDataService extends IdentifiableDataService<VersionHi
     const latestVersionOptions = Object.assign(new PaginationComponentOptions(), {
       id: 'item-newest-version-options',
       currentPage: 1,
-      pageSize: 1
+      pageSize: 1,
     });
 
-    const latestVersionSearch = new PaginatedSearchOptions({pagination: latestVersionOptions});
+    const latestVersionSearch = new PaginatedSearchOptions({ pagination: latestVersionOptions });
 
     return this.getVersions(versionHistory.id, latestVersionSearch, false, true, followLink('item')).pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
       hasValueOperator(),
       filter((versions) => versions.page.length > 0),
-      map((versions) => versions.page[0])
+      map((versions) => versions.page[0]),
     );
 
   }
@@ -148,7 +165,7 @@ 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))
+      switchMap((latestVersion) => of(version.version === latestVersion.version)),
     ) : of(null);
   }
 
diff --git a/src/app/core/data/workflow-action-data.service.ts b/src/app/core/data/workflow-action-data.service.ts
index b2c4f0bd7b..13f4f84b8d 100644
--- a/src/app/core/data/workflow-action-data.service.ts
+++ b/src/app/core/data/workflow-action-data.service.ts
@@ -1,19 +1,20 @@
-import { WorkflowAction } from '../tasks/models/workflow-action-object.model';
-import { RequestService } from './request.service';
+import { Injectable } from '@angular/core';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { Injectable } from '@angular/core';
+import { WorkflowAction } from '../tasks/models/workflow-action-object.model';
 import { WORKFLOW_ACTION } from '../tasks/models/workflow-action-object.resource-type';
-import { BaseDataService } from './base/base-data.service';
 import { dataService } from './base/data-service.decorator';
+import { IdentifiableDataService } from './base/identifiable-data.service';
+import { RequestService } from './request.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the workflowactions endpoint
  */
 @Injectable()
 @dataService(WORKFLOW_ACTION)
-export class WorkflowActionDataService extends BaseDataService<WorkflowAction> {
+export class WorkflowActionDataService extends IdentifiableDataService<WorkflowAction> {
   protected linkPath = 'workflowactions';
 
   constructor(
diff --git a/src/app/shared/uploader/uploader.service.ts b/src/app/core/drag.service.ts
similarity index 53%
rename from src/app/shared/uploader/uploader.service.ts
rename to src/app/core/drag.service.ts
index 548de34f9c..5320d8c6a7 100644
--- a/src/app/shared/uploader/uploader.service.ts
+++ b/src/app/core/drag.service.ts
@@ -1,7 +1,17 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
 import { Injectable } from '@angular/core';
 
-@Injectable()
-export class UploaderService {
+@Injectable({
+  providedIn: 'root',
+})
+export class DragService {
   private _overrideDragOverPage = false;
 
   public overrideDragOverPage() {
diff --git a/src/app/core/dspace-rest/dspace-not-null.serializer.ts b/src/app/core/dspace-rest/dspace-not-null.serializer.ts
index eabae3d983..81f8e2c2bd 100644
--- a/src/app/core/dspace-rest/dspace-not-null.serializer.ts
+++ b/src/app/core/dspace-rest/dspace-not-null.serializer.ts
@@ -1,4 +1,7 @@
-import { Deserialize, Serialize } from 'cerialize';
+import {
+  Deserialize,
+  Serialize,
+} from 'cerialize';
 
 import { Serializer } from '../serializer';
 import { GenericConstructor } from '../shared/generic-constructor';
diff --git a/src/app/core/dspace-rest/dspace-rest.service.spec.ts b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
index 2188522dc0..4dd856b48e 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.spec.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.spec.ts
@@ -1,25 +1,40 @@
-import { inject, TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+import {
+  HttpErrorResponse,
+  HttpHeaders,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
 
-import { DEFAULT_CONTENT_TYPE, DspaceRestService } from './dspace-rest.service';
-import { DSpaceObject } from '../shared/dspace-object.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { HttpHeaders } from '@angular/common/http';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import {
+  DEFAULT_CONTENT_TYPE,
+  DspaceRestService,
+} from './dspace-rest.service';
 
 describe('DspaceRestService', () => {
   let dspaceRestService: DspaceRestService;
   let httpMock: HttpTestingController;
   const url = 'http://www.dspace.org/';
-  const mockError: any = {
-    statusCode: 0,
+
+  const mockError = new HttpErrorResponse({
+    status: 0,
     statusText: 'Unknown Error',
-    message: 'Http failure response for http://www.dspace.org/: 0 '
-  };
+    error: {
+      message: 'Http failure response for http://www.dspace.org/: 0 ',
+    },
+  });
 
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [HttpClientTestingModule],
-      providers: [DspaceRestService]
+      providers: [DspaceRestService],
     });
 
     dspaceRestService = TestBed.inject(DspaceRestService);
@@ -35,7 +50,7 @@ describe('DspaceRestService', () => {
   describe('#get', () => {
     it('should return an Observable<RawRestResponse>', () => {
       const mockPayload = {
-        page: 1
+        page: 1,
       };
       const mockStatusCode = 200;
       const mockStatusText = 'GREAT';
@@ -52,24 +67,28 @@ describe('DspaceRestService', () => {
       req.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
     });
     it('should throw an error', () => {
-      dspaceRestService.get(url).subscribe(() => undefined, (err) => {
-        expect(err).toEqual(mockError);
+      dspaceRestService.get(url).subscribe(() => undefined, (err: unknown) => {
+        expect(err).toEqual(jasmine.objectContaining({
+          statusCode: 0,
+          statusText: 'Unknown Error',
+          message: 'Http failure response for http://www.dspace.org/: 0 ',
+        }));
       });
       const req = httpMock.expectOne(url);
       expect(req.request.method).toBe('GET');
-      req.error(mockError);
+      req.error({ error: mockError } as ErrorEvent);
     });
 
     it('should log an error', () => {
       spyOn(console, 'log');
 
-      dspaceRestService.get(url).subscribe(() => undefined, (err) => {
+      dspaceRestService.get(url).subscribe(() => undefined, (err: unknown) => {
         expect(console.log).toHaveBeenCalled();
       });
 
       const req = httpMock.expectOne(url);
       expect(req.request.method).toBe('GET');
-      req.error(mockError);
+      req.error({ error: mockError } as ErrorEvent);
     });
 
     it('when no content-type header is provided, it should use application/json', () => {
@@ -83,7 +102,7 @@ describe('DspaceRestService', () => {
   describe('#request', () => {
     it('should return an Observable<RawRestResponse>', () => {
       const mockPayload = {
-        page: 1
+        page: 1,
       };
       const mockStatusCode = 200;
       const mockStatusText = 'GREAT';
@@ -121,7 +140,7 @@ describe('DspaceRestService', () => {
     it('should return the correct data', () => {
       const name = 'testname';
       const dso: DSpaceObject = {
-        name: name
+        name: name,
       } as DSpaceObject;
       const formdata = dspaceRestService.buildFormData(dso);
       expect(formdata.get('name')).toBe(name);
diff --git a/src/app/core/dspace-rest/dspace-rest.service.ts b/src/app/core/dspace-rest/dspace-rest.service.ts
index ea4e8c2831..67d74e9570 100644
--- a/src/app/core/dspace-rest/dspace-rest.service.ts
+++ b/src/app/core/dspace-rest/dspace-rest.service.ts
@@ -1,12 +1,28 @@
-import { Observable, throwError as observableThrowError } from 'rxjs';
-import { catchError, map } from 'rxjs/operators';
+import {
+  HttpClient,
+  HttpErrorResponse,
+  HttpHeaders,
+  HttpParams,
+  HttpResponse,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http';
+import {
+  Observable,
+  throwError as observableThrowError,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
 
-import { RawRestResponse } from './raw-rest-response.model';
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RequestError } from '../data/request-error.model';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { hasNoValue, hasValue, isNotEmpty } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
+import { RawRestResponse } from './raw-rest-response.model';
 
 export const DEFAULT_CONTENT_TYPE = 'application/json; charset=utf-8';
 export interface HttpOptions {
@@ -40,22 +56,19 @@ export class DspaceRestService {
   get(absoluteURL: string): Observable<RawRestResponse> {
     const requestOptions = {
       observe: 'response' as any,
-      headers: new HttpHeaders({'Content-Type': DEFAULT_CONTENT_TYPE})
+      headers: new HttpHeaders({ 'Content-Type': DEFAULT_CONTENT_TYPE }),
     };
     return this.http.get(absoluteURL, requestOptions).pipe(
       map((res: HttpResponse<any>) => ({
         payload: res.body,
         statusCode: res.status,
-        statusText: res.statusText
+        statusText: res.statusText,
       })),
-      catchError((err) => {
+      catchError((err: unknown) => observableThrowError(() => {
         console.log('Error: ', err);
-        return observableThrowError({
-          statusCode: err.status,
-          statusText: err.statusText,
-          message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
-        });
-      }));
+        return this.handleHttpError(err);
+      })),
+    );
   }
 
   /**
@@ -109,19 +122,12 @@ export class DspaceRestService {
         payload: res.body,
         headers: res.headers,
         statusCode: res.status,
-        statusText: res.statusText
+        statusText: res.statusText,
       })),
-      catchError((err) => {
-        if (hasValue(err.status)) {
-          return observableThrowError({
-            statusCode: err.status,
-            statusText: err.statusText,
-            message: (hasValue(err.error) && isNotEmpty(err.error.message)) ? err.error.message : err.message
-          });
-        } else {
-          return observableThrowError(err);
-        }
-      }));
+      catchError((err: unknown) => observableThrowError(() => {
+        return this.handleHttpError(err);
+      })),
+    );
   }
 
   /**
@@ -145,4 +151,20 @@ export class DspaceRestService {
     return form;
   }
 
+  protected handleHttpError(err: unknown): RequestError | unknown {
+    if (err instanceof HttpErrorResponse) {
+      const error = new RequestError(
+        (isNotEmpty(err?.error?.message)) ? err.error.message : err.message,
+      );
+
+      error.statusCode = err.status;
+      error.statusText = err.statusText;
+
+      return error;
+    } else {
+      console.error('Cannot construct RequestError from', err);
+      return err;
+    }
+  }
+
 }
diff --git a/src/app/core/dspace-rest/dspace.serializer.spec.ts b/src/app/core/dspace-rest/dspace.serializer.spec.ts
index 331254c502..9a6635bc98 100644
--- a/src/app/core/dspace-rest/dspace.serializer.spec.ts
+++ b/src/app/core/dspace-rest/dspace.serializer.spec.ts
@@ -1,17 +1,21 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
 import { DSpaceSerializer } from './dspace.serializer';
 
 class TestModel implements HALResource {
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  name: string;
+    name: string;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     parents: HALLink;
   };
@@ -23,54 +27,54 @@ const testModels = [
     name: 'Model 1',
     _links: {
       self: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60'
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60',
       },
       parents: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents'
-      }
-    }
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents',
+      },
+    },
   },
   {
     id: '752a1250-949a-46ad-9bea-fbc45f0b656d',
     name: 'Model 2',
     _links: {
       self: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad'
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad',
       },
       parents: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents'
-      }
-    }
-  }
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents',
+      },
+    },
+  },
 ];
 
 const testResponses = [
   {
     _links: {
       self: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60'
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60',
       },
       parents: {
-        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents'
-      }
+        href: '/testmodels/9e32a2e2-6b91-4236-a361-995ccdc14c60/parents',
+      },
     },
     id: '9e32a2e2-6b91-4236-a361-995ccdc14c60',
     type: 'testModels',
-    name: 'A Test Model'
+    name: 'A Test Model',
   },
   {
     _links: {
       self: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad'
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad',
       },
       parents: {
-        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents'
-      }
+        href: '/testmodels/598ce822-c357-46f3-ab70-63724d02d6ad/parents',
+      },
     },
     id: '598ce822-c357-46f3-ab70-63724d02d6ad',
     type: 'testModels',
-    name: 'Another Test Model'
-  }
+    name: 'Another Test Model',
+  },
 ];
 
 describe('DSpaceSerializer', () => {
@@ -127,7 +131,7 @@ describe('DSpaceSerializer', () => {
     it('should throw an error when dealing with a document describing a single model', () => {
       const serializer = new DSpaceSerializer(TestModel);
       const doc = {
-        _embedded: testResponses[0]
+        _embedded: testResponses[0],
       };
 
       expect(() => {
diff --git a/src/app/core/dspace-rest/dspace.serializer.ts b/src/app/core/dspace-rest/dspace.serializer.ts
index f77818a8f5..ccf2d9a634 100644
--- a/src/app/core/dspace-rest/dspace.serializer.ts
+++ b/src/app/core/dspace-rest/dspace.serializer.ts
@@ -1,4 +1,7 @@
-import { Deserialize, Serialize } from 'cerialize';
+import {
+  Deserialize,
+  Serialize,
+} from 'cerialize';
 
 import { Serializer } from '../serializer';
 import { GenericConstructor } from '../shared/generic-constructor';
diff --git a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
index 076df8ebc9..7d67872004 100644
--- a/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
+++ b/src/app/core/end-user-agreement/abstract-end-user-agreement.guard.ts
@@ -1,7 +1,17 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { environment } from '../../../environments/environment';
+import { returnEndUserAgreementUrlTreeOnFalse } from '../shared/authorized.operators';
 
 /**
  * An abstract guard for redirecting users to the user agreement page if a certain condition is met
@@ -23,7 +33,7 @@ export abstract class AbstractEndUserAgreementGuard implements CanActivate {
       return observableOf(true);
     }
     return this.hasAccepted().pipe(
-      returnEndUserAgreementUrlTreeOnFalse(this.router, state.url)
+      returnEndUserAgreementUrlTreeOnFalse(this.router, state.url),
     );
   }
 
diff --git a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
index 805c765832..a801fb7a6f 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.spec.ts
@@ -1,5 +1,9 @@
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
+
 import { EndUserAgreementService } from './end-user-agreement.service';
-import { Router, UrlTree } from '@angular/router';
 import { EndUserAgreementCookieGuard } from './end-user-agreement-cookie.guard';
 
 describe('EndUserAgreementCookieGuard', () => {
@@ -10,12 +14,12 @@ describe('EndUserAgreementCookieGuard', () => {
 
   beforeEach(() => {
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
-      isCookieAccepted: true
+      isCookieAccepted: true,
     });
     router = jasmine.createSpyObj('router', {
       navigateByUrl: {},
       parseUrl: new UrlTree(),
-      createUrlTree: new UrlTree()
+      createUrlTree: new UrlTree(),
     });
 
     guard = new EndUserAgreementCookieGuard(endUserAgreementService, router);
diff --git a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
index 2219aa9e50..a6d3e0f0e8 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-cookie.guard.ts
@@ -1,8 +1,12 @@
 import { Injectable } from '@angular/core';
-import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
-import { Observable, of as observableOf } from 'rxjs';
-import { EndUserAgreementService } from './end-user-agreement.service';
 import { Router } from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
+import { EndUserAgreementService } from './end-user-agreement.service';
 
 /**
  * A guard redirecting users to the end agreement page when the user agreement cookie hasn't been accepted
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
index 21d7c3908d..88722bd799 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.spec.ts
@@ -1,8 +1,12 @@
-import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-user.guard';
-import { EndUserAgreementService } from './end-user-agreement.service';
-import { Router, UrlTree } from '@angular/router';
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
 import { of as observableOf } from 'rxjs';
+
 import { environment } from '../../../environments/environment.test';
+import { EndUserAgreementService } from './end-user-agreement.service';
+import { EndUserAgreementCurrentUserGuard } from './end-user-agreement-current-user.guard';
 
 describe('EndUserAgreementGuard', () => {
   let guard: EndUserAgreementCurrentUserGuard;
@@ -12,12 +16,12 @@ describe('EndUserAgreementGuard', () => {
 
   beforeEach(() => {
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
-      hasCurrentUserAcceptedAgreement: observableOf(true)
+      hasCurrentUserAcceptedAgreement: observableOf(true),
     });
     router = jasmine.createSpyObj('router', {
       navigateByUrl: {},
       parseUrl: new UrlTree(),
-      createUrlTree: new UrlTree()
+      createUrlTree: new UrlTree(),
     });
 
     guard = new EndUserAgreementCurrentUserGuard(endUserAgreementService, router);
diff --git a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
index a79e12cc32..f59b9dcab3 100644
--- a/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement-current-user.guard.ts
@@ -1,9 +1,13 @@
 import { Injectable } from '@angular/core';
-import { Observable, of as observableOf } from 'rxjs';
+import { Router } from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { environment } from '../../../environments/environment';
 import { AbstractEndUserAgreementGuard } from './abstract-end-user-agreement.guard';
 import { EndUserAgreementService } from './end-user-agreement.service';
-import { Router } from '@angular/router';
-import { environment } from '../../../environments/environment';
 
 /**
  * A guard redirecting logged in users to the end agreement page when they haven't accepted the latest user agreement
diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts b/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
index fadc43c6c8..0511fd8b72 100644
--- a/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement.service.spec.ts
@@ -1,12 +1,13 @@
+import { of as observableOf } from 'rxjs';
+
+import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { EPerson } from '../eperson/models/eperson.model';
 import {
   END_USER_AGREEMENT_COOKIE,
   END_USER_AGREEMENT_METADATA_FIELD,
-  EndUserAgreementService
+  EndUserAgreementService,
 } from './end-user-agreement.service';
-import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
-import { of as observableOf } from 'rxjs';
-import { EPerson } from '../eperson/models/eperson.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 
 describe('EndUserAgreementService', () => {
   let service: EndUserAgreementService;
@@ -23,21 +24,21 @@ describe('EndUserAgreementService', () => {
       metadata: {
         [END_USER_AGREEMENT_METADATA_FIELD]: [
           {
-            value: 'true'
-          }
-        ]
-      }
+            value: 'true',
+          },
+        ],
+      },
     });
     userWithoutMetadata = Object.assign(new EPerson());
 
     cookie = new CookieServiceMock();
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      getAuthenticatedUserFromStore: observableOf(userWithMetadata)
+      getAuthenticatedUserFromStore: observableOf(userWithMetadata),
     });
     ePersonService = jasmine.createSpyObj('ePersonService', {
       update: createSuccessfulRemoteDataObject$(userWithMetadata),
-      patch: createSuccessfulRemoteDataObject$({})
+      patch: createSuccessfulRemoteDataObject$({}),
     });
 
     service = new EndUserAgreementService(cookie, authService, ePersonService);
diff --git a/src/app/core/end-user-agreement/end-user-agreement.service.ts b/src/app/core/end-user-agreement/end-user-agreement.service.ts
index 3841abb5d4..8af701ed8f 100644
--- a/src/app/core/end-user-agreement/end-user-agreement.service.ts
+++ b/src/app/core/end-user-agreement/end-user-agreement.service.ts
@@ -1,10 +1,18 @@
 import { Injectable } from '@angular/core';
-import { AuthService } from '../auth/auth.service';
-import { CookieService } from '../services/cookie.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
+import { CookieService } from '../services/cookie.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 
 export const END_USER_AGREEMENT_COOKIE = 'hasAgreedEndUser';
@@ -44,12 +52,12 @@ export class EndUserAgreementService {
       switchMap((authenticated) => {
         if (authenticated) {
           return this.authService.getAuthenticatedUserFromStore().pipe(
-            map((user) => hasValue(user) && user.hasMetadata(END_USER_AGREEMENT_METADATA_FIELD) && user.firstMetadata(END_USER_AGREEMENT_METADATA_FIELD).value === 'true')
+            map((user) => hasValue(user) && user.hasMetadata(END_USER_AGREEMENT_METADATA_FIELD) && user.firstMetadata(END_USER_AGREEMENT_METADATA_FIELD).value === 'true'),
           );
         } else {
           return observableOf(acceptedWhenAnonymous);
         }
-      })
+      }),
     );
   }
 
@@ -76,14 +84,14 @@ export class EndUserAgreementService {
               return this.ePersonService.patch(user, [operation]);
             }),
             getFirstCompletedRemoteData(),
-            map((response) => response.hasSucceeded)
+            map((response) => response.hasSucceeded),
           );
         } else {
           this.setCookieAccepted(accepted);
           return observableOf(true);
         }
       }),
-      take(1)
+      take(1),
     );
   }
 
diff --git a/src/app/core/eperson/eperson-data.service.spec.ts b/src/app/core/eperson/eperson-data.service.spec.ts
index b4b939eebf..127f0a1d2c 100644
--- a/src/app/core/eperson/eperson-data.service.spec.ts
+++ b/src/app/core/eperson/eperson-data.service.spec.ts
@@ -1,39 +1,67 @@
-import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { compare, Operation } from 'fast-json-patch';
-import { getTestScheduler } from 'jasmine-marbles';
-import { Observable, of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Store } from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
 import {
   EPeopleRegistryCancelEPersonAction,
-  EPeopleRegistryEditEPersonAction
+  EPeopleRegistryEditEPersonAction,
 } from '../../access-control/epeople-registry/epeople-registry.actions';
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
+import { GroupMock } from '../../shared/testing/group-mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import {
+  createPaginatedList,
+  createRequestEntry$,
+} from '../../shared/testing/utils.test';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { PatchRequest, PostRequest } from '../data/request.models';
+import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  PatchRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Item } from '../shared/item.model';
-import { EPersonDataService } from './eperson-data.service';
+import {
+  editEPersonSelector,
+  EPersonDataService,
+} from './eperson-data.service';
 import { EPerson } from './models/eperson.model';
-import { EPersonMock, EPersonMock2 } 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';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/find-list-options.model';
 
 describe('EPersonDataService', () => {
   let service: EPersonDataService;
-  let store: Store<CoreState>;
+  let store: MockStore<CoreState>;
   let requestService: RequestService;
-  let scheduler: TestScheduler;
 
   let epeople;
 
@@ -43,50 +71,38 @@ describe('EPersonDataService', () => {
   let epeople$;
   let rdbService;
 
-  function initTestService() {
-    return new EPersonDataService(
-      requestService,
-      rdbService,
-      null,
-      halService,
-      new DummyChangeAnalyzer() as any,
-      null,
-      store,
-    );
-  }
+  const initialState = {
+    epeopleRegistry: {
+      editEPerson: null,
+    },
+  };
 
-  function init() {
+  beforeEach(waitForAsync(() => {
     restEndpointURL = 'https://rest.api/dspace-spring-rest/api/eperson';
     epersonsEndpoint = `${restEndpointURL}/epersons`;
     epeople = [EPersonMock, EPersonMock2];
     epeople$ = createSuccessfulRemoteDataObject$(createPaginatedList([epeople]));
     rdbService = getMockRemoteDataBuildServiceHrefMap(undefined, { 'https://rest.api/dspace-spring-rest/api/eperson/epersons': epeople$ });
     halService = new HALEndpointServiceStub(restEndpointURL);
+    requestService = getMockRequestService(createRequestEntry$(epeople));
 
     TestBed.configureTestingModule({
-      imports: [
-        CommonModule,
-        StoreModule.forRoot({}),
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }),
+      providers: [
+        EPersonDataService,
+        { provide: RequestService, useValue: requestService },
+        { provide: RemoteDataBuildService, useValue: rdbService },
+        { provide: HALEndpointService, useValue: halService },
+        provideMockStore({ initialState }),
+        { provide: ObjectCacheService, useValue: {} },
+        { provide: DSOChangeAnalyzer, useClass: DummyChangeAnalyzer },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ],
-      declarations: [],
-      providers: [],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
     });
-  }
 
-  beforeEach(() => {
-    init();
-    requestService = getMockRequestService(createRequestEntry$(epeople));
-    store = new Store<CoreState>(undefined, undefined, undefined);
-    service = initTestService();
-    spyOn(store, 'dispatch');
-  });
+    service = TestBed.inject(EPersonDataService);
+    store = TestBed.inject(Store) as MockStore<CoreState>;
+    spyOn(store, 'dispatch').and.callThrough();
+  }));
 
   describe('searchByScope', () => {
     beforeEach(() => {
@@ -96,7 +112,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', encodeURIComponent('')))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -104,7 +120,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', encodeURIComponent('')))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -112,7 +128,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', encodeURIComponent('test')))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -122,7 +138,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', encodeURIComponent('')))],
       });
       expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byEmail', options);
       expect(service.findByHref).toHaveBeenCalledWith(epersonsEndpoint, true, true);
@@ -133,13 +149,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', encodeURIComponent(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));
@@ -213,7 +253,7 @@ describe('EPersonDataService', () => {
             'eperson.firstname': [
               {
                 value: newFirstName,
-              }
+              },
             ],
             'eperson.lastname': [
               {
@@ -239,34 +279,29 @@ describe('EPersonDataService', () => {
   });
 
   describe('clearEPersonRequests', () => {
-    beforeEach(waitForAsync(() => {
-      scheduler = getTestScheduler();
-      halService = {
-        getEndpoint(linkPath: string): Observable<string> {
-          return observableOf(restEndpointURL + '/' + linkPath);
-        }
-      } as HALEndpointService;
-      initTestService();
-      service.clearEPersonRequests();
-    }));
-    it('should remove the eperson hrefs in the request service', () => {
-      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(epersonsEndpoint);
+    beforeEach(() => {
+      spyOn(halService, 'getEndpoint').and.callFake((linkPath: string) => {
+        return observableOf(`${restEndpointURL}/${linkPath}`);
+      });
     });
+    it('should remove the eperson hrefs in the request service', fakeAsync(() => {
+      service.clearEPersonRequests();
+      tick();
+
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(epersonsEndpoint);
+    }));
   });
 
   describe('getActiveEPerson', () => {
     it('should retrieve the ePerson currently getting edited, if any', () => {
-      service.editEPerson(EPersonMock);
+      // Update the state with the ePerson (the provideMockStore doesn't update itself when dispatch is called)
+      store.overrideSelector(editEPersonSelector, EPersonMock);
 
-      service.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-        expect(activeEPerson).toEqual(EPersonMock);
-      });
+      expect(service.getActiveEPerson()).toBeObservable(cold('a', { a: EPersonMock }));
     });
 
     it('should retrieve the ePerson currently getting edited, null if none being edited', () => {
-      service.getActiveEPerson().subscribe((activeEPerson: EPerson) => {
-        expect(activeEPerson).toEqual(null);
-      });
+      expect(service.getActiveEPerson()).toBeObservable(cold('a', { a: null }));
     });
   });
 
@@ -290,7 +325,7 @@ describe('EPersonDataService', () => {
       service.deleteEPerson(EPersonMock).subscribe();
     });
 
-    it('should call DataService.delete with the EPerson\'s UUID', () => {
+    it('should call UpdateDataServiceImpl.delete with the EPerson\'s UUID', () => {
       expect(service.delete).toHaveBeenCalledWith(EPersonMock.id);
     });
   });
diff --git a/src/app/core/eperson/eperson-data.service.ts b/src/app/core/eperson/eperson-data.service.ts
index d30030365c..ef728cccd3 100644
--- a/src/app/core/eperson/eperson-data.service.ts
+++ b/src/app/core/eperson/eperson-data.service.ts
@@ -1,42 +1,78 @@
 import { Injectable } from '@angular/core';
-import { createSelector, select, Store } from '@ngrx/store';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Operation } from 'fast-json-patch';
 import { Observable } from 'rxjs';
-import { find, map, take } from 'rxjs/operators';
+import {
+  find,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { getEPersonEditRoute } from '../../access-control/access-control-routing-paths';
 import {
   EPeopleRegistryCancelEPersonAction,
-  EPeopleRegistryEditEPersonAction
+  EPeopleRegistryEditEPersonAction,
 } from '../../access-control/epeople-registry/epeople-registry.actions';
 import { EPeopleRegistryState } from '../../access-control/epeople-registry/epeople-registry.reducers';
 import { AppState } from '../../app.reducer';
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
-import { buildPaginatedList, PaginatedList } from '../data/paginated-list.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { PatchRequest, PostRequest } from '../data/request.models';
+import {
+  PatchRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { NoContent } from '../shared/NoContent.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { PageInfo } from '../shared/page-info.model';
 import { EPerson } from './models/eperson.model';
 import { EPERSON } from './models/eperson.resource-type';
-import { NoContent } from '../shared/NoContent.model';
-import { PageInfo } from '../shared/page-info.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-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';
+
+// todo: optimize imports
 
 const ePeopleRegistryStateSelector = (state: AppState) => state.epeopleRegistry;
-const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
+export const editEPersonSelector = createSelector(ePeopleRegistryStateSelector, (ePeopleRegistryState: EPeopleRegistryState) => ePeopleRegistryState.editEPerson);
 
 /**
  * A service to retrieve {@link EPerson}s from the REST API & EPerson related CRUD actions
@@ -100,16 +136,16 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
                   elementsPerPage: options.elementsPerPage,
                   totalElements: page.length,
                   totalPages: page.length,
-                  currentPage: 1
+                  currentPage: 1,
                 }), page),
-                rd.statusCode
+                rd.statusCode,
               );
             } else {
               // If it hasn't succeeded, there can be no payload, so we can re-cast the existing
               // RemoteData object
               return rd as RemoteData<PaginatedList<EPerson>>;
             }
-          })
+          }),
         );
       default:
         return this.getEpeopleByMetadata(query.trim(), options, useCachedVersionIfAvailable);
@@ -176,6 +212,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
@@ -187,7 +251,7 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     oldVersion$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      take(1)
+      take(1),
     ).subscribe((oldEPerson: EPerson) => {
       const operations = this.generateOperations(oldEPerson, ePerson);
       const patchRequest = new PatchRequest(requestId, ePerson._links.self.href, operations);
@@ -207,17 +271,17 @@ export class EPersonDataService extends IdentifiableDataService<EPerson> impleme
     let operations = this.comparator.diff(oldEPerson, newEPerson).filter((operation: Operation) => operation.op === 'replace');
     if (hasValue(oldEPerson.email) && oldEPerson.email !== newEPerson.email) {
       operations = [...operations, {
-        op: 'replace', path: '/email', value: newEPerson.email
+        op: 'replace', path: '/email', value: newEPerson.email,
       }];
     }
     if (hasValue(oldEPerson.requireCertificate) && oldEPerson.requireCertificate !== newEPerson.requireCertificate) {
       operations = [...operations, {
-        op: 'replace', path: '/certificate', value: newEPerson.requireCertificate
+        op: 'replace', path: '/certificate', value: newEPerson.requireCertificate,
       }];
     }
     if (hasValue(oldEPerson.canLogIn) && oldEPerson.canLogIn !== newEPerson.canLogIn) {
       operations = [...operations, {
-        op: 'replace', path: '/canLogIn', value: newEPerson.canLogIn
+        op: 'replace', path: '/canLogIn', value: newEPerson.canLogIn,
       }];
     }
     return operations;
@@ -281,15 +345,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..28b8a9dc9a 100644
--- a/src/app/core/eperson/group-data.service.spec.ts
+++ b/src/app/core/eperson/group-data.service.spec.ts
@@ -2,33 +2,55 @@ import { CommonModule } from '@angular/common';
 import { HttpHeaders } from '@angular/common/http';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { compare, Operation } from 'fast-json-patch';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
+import { of as observableOf } from 'rxjs';
+
 import {
   GroupRegistryCancelGroupAction,
-  GroupRegistryEditGroupAction
+  GroupRegistryEditGroupAction,
 } from '../../access-control/group-registry/group-registry.actions';
-import { GroupMock, GroupMock2 } from '../../shared/testing/group-mock';
+import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
+import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../shared/testing/eperson.mock';
+import {
+  GroupMock,
+  GroupMock2,
+} from '../../shared/testing/group-mock';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
+import {
+  createPaginatedList,
+  createRequestEntry$,
+} from '../../shared/testing/utils.test';
 import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheEntry } from '../cache/object-cache.reducer';
+import { CoreState } from '../core-state.model';
 import { ChangeAnalyzer } from '../data/change-analyzer';
-import { DeleteRequest, PostRequest } from '../data/request.models';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  DeleteRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { Item } from '../shared/item.model';
 import { GroupDataService } from './group-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { getMockRemoteDataBuildServiceHrefMap } from '../../shared/mocks/remote-data-build.service.mock';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { TranslateLoaderMock } from '../../shared/testing/translate-loader.mock';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { EPersonMock, EPersonMock2 } from '../../shared/testing/eperson.mock';
-import { createPaginatedList, createRequestEntry$ } from '../../shared/testing/utils.test';
-import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { of as observableOf } from 'rxjs';
-import { ObjectCacheEntry } from '../cache/object-cache.reducer';
-import { getMockObjectCacheService } from '../../shared/mocks/object-cache.service.mock';
 
 describe('GroupDataService', () => {
   let service: GroupDataService;
@@ -43,11 +65,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({
@@ -57,13 +79,13 @@ describe('GroupDataService', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [],
       providers: [],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }
 
@@ -97,7 +119,7 @@ describe('GroupDataService', () => {
     it('search with empty query', () => {
       service.searchGroups('');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', ''))]
+        searchParams: [Object.assign(new RequestParam('query', ''))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
@@ -105,12 +127,36 @@ describe('GroupDataService', () => {
     it('search with query', () => {
       service.searchGroups('test');
       const options = Object.assign(new FindListOptions(), {
-        searchParams: [Object.assign(new RequestParam('query', 'test'))]
+        searchParams: [Object.assign(new RequestParam('query', 'test'))],
       });
       expect(service.searchBy).toHaveBeenCalledWith('byMetadata', options, true, true);
     });
   });
 
+  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..7758c76dae 100644
--- a/src/app/core/eperson/group-data.service.ts
+++ b/src/app/core/eperson/group-data.service.ts
@@ -1,45 +1,68 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Operation } from 'fast-json-patch';
+import {
+  Observable,
+  zip as observableZip,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
 
-import { createSelector, select, Store } from '@ngrx/store';
-import { Observable, zip as observableZip } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import { getGroupEditRoute } from '../../access-control/access-control-routing-paths';
 import {
   GroupRegistryCancelGroupAction,
-  GroupRegistryEditGroupAction
+  GroupRegistryEditGroupAction,
 } from '../../access-control/group-registry/group-registry.actions';
 import { GroupRegistryState } from '../../access-control/group-registry/group-registry.reducers';
 import { AppState } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
 import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { CreateRequest, DeleteRequest, PostRequest } from '../data/request.models';
-
+import {
+  CreateRequest,
+  DeleteRequest,
+  PostRequest,
+} from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { Collection } from '../shared/collection.model';
+import { Community } from '../shared/community.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { EPerson } from './models/eperson.model';
 import { Group } from './models/group.model';
 import { GROUP } from './models/group.resource-type';
-import { DSONameService } from '../breadcrumbs/dso-name.service';
-import { Community } from '../shared/community.model';
-import { Collection } from '../shared/collection.model';
-import { NoContent } from '../shared/NoContent.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PatchData, PatchDataImpl } from '../data/base/patch-data';
-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';
 
 const groupRegistryStateSelector = (state: AppState) => state.groupRegistry;
 const editGroupSelector = createSelector(groupRegistryStateSelector, (groupRegistryState: GroupRegistryState) => groupRegistryState.editGroup);
@@ -104,23 +127,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 +295,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);
   }
 
   /**
@@ -303,7 +334,7 @@ export class GroupDataService extends IdentifiableDataService<Group> implements
         'dc.description': [
           {
             value: `${this.nameService.getName(dso)} ${role} group`,
-          }
+          },
         ],
       },
     });
diff --git a/src/app/core/eperson/models/eperson-dto.model.ts b/src/app/core/eperson/models/eperson-dto.model.ts
index 0e79902196..f84e81dab2 100644
--- a/src/app/core/eperson/models/eperson-dto.model.ts
+++ b/src/app/core/eperson/models/eperson-dto.model.ts
@@ -5,17 +5,12 @@ import { EPerson } from './eperson.model';
  */
 export class EpersonDtoModel {
 
-    /**
+  /**
      * The EPerson linked to this object
      */
-    public eperson: EPerson;
-    /**
+  public eperson: EPerson;
+  /**
      * 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;
-
+  public ableToDelete: boolean;
 }
diff --git a/src/app/core/eperson/models/eperson.model.ts b/src/app/core/eperson/models/eperson.model.ts
index ff331f2001..ab84d9c113 100644
--- a/src/app/core/eperson/models/eperson.model.ts
+++ b/src/app/core/eperson/models/eperson.model.ts
@@ -1,10 +1,18 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
-
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { GenericConstructor } from '../../shared/generic-constructor';
 import { HALLink } from '../../shared/hal-link.model';
 import { EPERSON } from './eperson.resource-type';
 import { Group } from './group.model';
@@ -82,4 +90,8 @@ export class EPerson extends DSpaceObject {
   @link(GROUP, true)
   public groups?: Observable<RemoteData<PaginatedList<Group>>>;
 
+  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+    return [this.constructor.name, ...super.getRenderTypes()];
+  }
+
 }
diff --git a/src/app/core/eperson/models/group.model.ts b/src/app/core/eperson/models/group.model.ts
index f147cc53a6..bed55af0a2 100644
--- a/src/app/core/eperson/models/group.model.ts
+++ b/src/app/core/eperson/models/group.model.ts
@@ -1,16 +1,24 @@
-import { autoserialize, autoserializeAs, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
-
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { DSPACE_OBJECT } from '../../shared/dspace-object.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { EPerson } from './eperson.model';
 import { EPERSON } from './eperson.resource-type';
 import { GROUP } from './group.resource-type';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -40,7 +48,7 @@ export class Group extends DSpaceObject {
    * The {@link HALLink}s for this Group
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     subgroups: HALLink;
     epersons: HALLink;
diff --git a/src/app/core/feedback/feedback-data.service.spec.ts b/src/app/core/feedback/feedback-data.service.spec.ts
index 4b76d06cec..9b666e9776 100644
--- a/src/app/core/feedback/feedback-data.service.spec.ts
+++ b/src/app/core/feedback/feedback-data.service.spec.ts
@@ -1,14 +1,15 @@
-import { FeedbackDataService } from './feedback-data.service';
-import { HALLink } from '../shared/hal-link.model';
-import { Item } from '../shared/item.model';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { Store } from '@ngrx/store';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Store } from '@ngrx/store';
-import { Feedback } from './models/feedback.model';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
 import { testCreateDataImplementation } from '../data/base/create-data.spec';
+import { HALLink } from '../shared/hal-link.model';
+import { Item } from '../shared/item.model';
+import { FeedbackDataService } from './feedback-data.service';
+import { Feedback } from './models/feedback.model';
 
 describe('FeedbackDataService', () => {
   let service: FeedbackDataService;
@@ -25,7 +26,7 @@ describe('FeedbackDataService', () => {
   const feedbackPayload = Object.assign(new Feedback(), {
     email: 'test@email.com',
     message: 'message',
-    page: '/home'
+    page: '/home',
   });
 
 
@@ -35,7 +36,7 @@ describe('FeedbackDataService', () => {
     bundleHALLink.href = bundleLink;
     item = new Item();
     item._links = {
-      bundles: bundleHALLink
+      bundles: bundleHALLink,
     };
     requestService = getMockRequestService();
     halService = new HALEndpointServiceStub('url') as any;
@@ -48,7 +49,7 @@ describe('FeedbackDataService', () => {
       },
       getObjectBySelfLink: () => {
         /* empty */
-      }
+      },
     } as any;
     store = {} as Store<CoreState>;
     return new FeedbackDataService(
diff --git a/src/app/core/feedback/feedback-data.service.ts b/src/app/core/feedback/feedback-data.service.ts
index 3cc7df7653..a4207ba9fe 100644
--- a/src/app/core/feedback/feedback-data.service.ts
+++ b/src/app/core/feedback/feedback-data.service.ts
@@ -1,19 +1,26 @@
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Feedback } from './models/feedback.model';
-import { FEEDBACK } from './models/feedback.resource-type';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Observable } from 'rxjs';
+
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { RemoteData } from '../data/remote-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { dataService } from '../data/base/data-service.decorator';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { Feedback } from './models/feedback.model';
+import { FEEDBACK } from './models/feedback.resource-type';
 
 /**
  * Service for checking and managing the feedback
diff --git a/src/app/core/feedback/feedback.guard.ts b/src/app/core/feedback/feedback.guard.ts
index 63353a60ff..652bb5dfa3 100644
--- a/src/app/core/feedback/feedback.guard.ts
+++ b/src/app/core/feedback/feedback.guard.ts
@@ -1,8 +1,14 @@
-import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot, UrlTree } from '@angular/router';
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../data/feature-authorization/feature-id';
-import { Injectable } from '@angular/core';
 
 /**
  * An guard for redirecting users to the feedback page if user is authorized
diff --git a/src/app/core/feedback/models/feedback.model.ts b/src/app/core/feedback/models/feedback.model.ts
index fd98affba9..e6718cb265 100644
--- a/src/app/core/feedback/models/feedback.model.ts
+++ b/src/app/core/feedback/models/feedback.model.ts
@@ -1,6 +1,9 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
-import { typedObject } from '../../cache/builders/build-decorators';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
 
+import { typedObject } from '../../cache/builders/build-decorators';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { FEEDBACK } from './feedback.resource-type';
diff --git a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
index bd9e4f9076..5e2b0670d4 100644
--- a/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
+++ b/src/app/core/forward-client-ip/forward-client-ip.interceptor.spec.ts
@@ -1,10 +1,14 @@
-import { ForwardClientIpInterceptor } from './forward-client-ip.interceptor';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { ForwardClientIpInterceptor } from './forward-client-ip.interceptor';
+
 describe('ForwardClientIpInterceptor', () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
@@ -25,7 +29,7 @@ describe('ForwardClientIpInterceptor', () => {
           useClass: ForwardClientIpInterceptor,
           multi: true,
         },
-        { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } }
+        { provide: REQUEST, useValue: { get: () => undefined, connection: { remoteAddress: clientIp } } },
       ],
     });
 
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..67427d4ed1 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
@@ -1,9 +1,17 @@
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { Observable } from 'rxjs';
 
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 /**
  * Http Interceptor intercepting Http Requests, adding the client's IP to their X-Forwarded-For header
  */
diff --git a/src/app/core/google-recaptcha/google-recaptcha.module.ts b/src/app/core/google-recaptcha/google-recaptcha.module.ts
index 64620a48f4..6451ff3d6a 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.module.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.module.ts
@@ -1,22 +1,22 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { GoogleRecaptchaComponent } from '../../shared/google-recaptcha/google-recaptcha.component';
 
+import { GoogleRecaptchaComponent } from '../../shared/google-recaptcha/google-recaptcha.component';
 import { GoogleRecaptchaService } from './google-recaptcha.service';
 
 const PROVIDERS = [
-  GoogleRecaptchaService
+  GoogleRecaptchaService,
 ];
 
 const COMPONENTS = [
-  GoogleRecaptchaComponent
+  GoogleRecaptchaComponent,
 ];
 
 @NgModule({
   imports: [ CommonModule ],
   providers: [...PROVIDERS],
   declarations: [...COMPONENTS],
-  exports: [...COMPONENTS]
+  exports: [...COMPONENTS],
 })
 
 /**
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts b/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
index 545e3b9873..957cc649bf 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.spec.ts
@@ -1,7 +1,8 @@
-import { GoogleRecaptchaService } from './google-recaptcha.service';
 import { of as observableOf } from 'rxjs';
+
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { NativeWindowRef } from '../services/window.service';
+import { GoogleRecaptchaService } from './google-recaptcha.service';
 
 describe('GoogleRecaptchaService', () => {
   let service: GoogleRecaptchaService;
@@ -16,23 +17,23 @@ describe('GoogleRecaptchaService', () => {
   const document = { documentElement: { lang: 'en' } } as Document;
   scriptElementMock = {
     set innerHTML(newVal) { /* noop */ },
-    get innerHTML() { return innerHTMLTestValue; }
+    get innerHTML() { return innerHTMLTestValue; },
   };
 
   function init() {
     window = new NativeWindowRef();
     rendererFactory2 = jasmine.createSpyObj('rendererFactory2', {
       createRenderer: observableOf('googleRecaptchaToken'),
-      createElement: scriptElementMock
+      createElement: scriptElementMock,
     });
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: createSuccessfulRemoteDataObject$({ values: ['googleRecaptchaToken'] })
+      findByPropertyName: createSuccessfulRemoteDataObject$({ values: ['googleRecaptchaToken'] }),
     });
     cookieService = jasmine.createSpyObj('cookieService', {
       get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
       set: () => {
         /* empty */
-      }
+      },
     });
     service = new GoogleRecaptchaService(cookieService, document, window, rendererFactory2, configurationDataService);
   }
diff --git a/src/app/core/google-recaptcha/google-recaptcha.service.ts b/src/app/core/google-recaptcha/google-recaptcha.service.ts
index 72de1bb26c..eb369384fe 100644
--- a/src/app/core/google-recaptcha/google-recaptcha.service.ts
+++ b/src/app/core/google-recaptcha/google-recaptcha.service.ts
@@ -1,14 +1,32 @@
-import { Inject, Injectable, Renderer2, RendererFactory2 } from '@angular/core';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { isNotEmpty } from '../../shared/empty.util';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+  Renderer2,
+  RendererFactory2,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
 import { ConfigurationDataService } from '../data/configuration-data.service';
 import { RemoteData } from '../data/remote-data';
-import { map, switchMap, take } from 'rxjs/operators';
-import { BehaviorSubject, combineLatest, Observable, of } from 'rxjs';
 import { CookieService } from '../services/cookie.service';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 
 export const CAPTCHA_COOKIE = '_GRECAPTCHA';
 export const CAPTCHA_NAME = 'google-recaptcha';
@@ -64,7 +82,7 @@ export class GoogleRecaptchaService {
       getFirstCompletedRemoteData(),
       map((res: RemoteData<ConfigurationProperty>) => {
         return res.hasSucceeded && res.payload && isNotEmpty(res.payload.values) && res.payload.values[0].toLowerCase() === 'true';
-      })
+      }),
     );
     registrationVerification$.subscribe(registrationVerification => {
       if (registrationVerification) {
@@ -125,7 +143,7 @@ export class GoogleRecaptchaService {
    */
   public getRecaptchaToken(action) {
     return this.captchaKey().pipe(
-      switchMap((key) => grecaptcha.execute(key, {action: action}))
+      switchMap((key) => grecaptcha.execute(key, { action: action })),
     );
   }
 
diff --git a/src/app/core/history/history.actions.ts b/src/app/core/history/history.actions.ts
index f49e3984d1..ec67bef02d 100644
--- a/src/app/core/history/history.actions.ts
+++ b/src/app/core/history/history.actions.ts
@@ -5,7 +5,7 @@ import { type } from '../../shared/ngrx/type';
 
 export const HistoryActionTypes = {
   ADD_TO_HISTORY: type('dspace/history/ADD_TO_HISTORY'),
-  GET_HISTORY: type('dspace/history/GET_HISTORY')
+  GET_HISTORY: type('dspace/history/GET_HISTORY'),
 };
 
 
diff --git a/src/app/core/history/history.reducer.ts b/src/app/core/history/history.reducer.ts
index a073a15466..b39bde69bf 100644
--- a/src/app/core/history/history.reducer.ts
+++ b/src/app/core/history/history.reducer.ts
@@ -1,4 +1,8 @@
-import { AddUrlToHistoryAction, HistoryAction, HistoryActionTypes } from './history.actions';
+import {
+  AddUrlToHistoryAction,
+  HistoryAction,
+  HistoryActionTypes,
+} from './history.actions';
 
 /**
  * The auth state.
diff --git a/src/app/core/history/selectors.ts b/src/app/core/history/selectors.ts
index 925b56c795..13c22c5be4 100644
--- a/src/app/core/history/selectors.ts
+++ b/src/app/core/history/selectors.ts
@@ -1,8 +1,9 @@
 import { createSelector } from '@ngrx/store';
+
 import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
 
 export const historySelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.history
+  (state: CoreState) => state.history,
 );
diff --git a/src/app/core/index/index.actions.ts b/src/app/core/index/index.actions.ts
index d573174142..fc6bc3494d 100644
--- a/src/app/core/index/index.actions.ts
+++ b/src/app/core/index/index.actions.ts
@@ -10,7 +10,7 @@ import { IndexName } from './index-name.model';
 export const IndexActionTypes = {
   ADD: type('dspace/core/index/ADD'),
   REMOVE_BY_VALUE: type('dspace/core/index/REMOVE_BY_VALUE'),
-  REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING')
+  REMOVE_BY_SUBSTRING: type('dspace/core/index/REMOVE_BY_SUBSTRING'),
 };
 
 /**
diff --git a/src/app/core/index/index.effects.spec.ts b/src/app/core/index/index.effects.spec.ts
index c86860d01c..89b5916f45 100644
--- a/src/app/core/index/index.effects.spec.ts
+++ b/src/app/core/index/index.effects.spec.ts
@@ -1,13 +1,20 @@
-import { Observable } from 'rxjs';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { UUIDIndexEffects } from './index.effects';
-import { cold, hot } from 'jasmine-marbles';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import { AddToObjectCacheAction } from '../cache/object-cache.actions';
 import { Item } from '../shared/item.model';
 import { AddToIndexAction } from './index.actions';
-import { provideMockStore } from '@ngrx/store/testing';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
+import { UUIDIndexEffects } from './index.effects';
 import { IndexName } from './index-name.model';
 
 describe('ObjectUpdatesEffects', () => {
@@ -30,8 +37,8 @@ describe('ObjectUpdatesEffects', () => {
       uuid: '3601eaed-8fdb-487f-8b89-4d7647314143',
       _links: {
         self: { href: selfLink },
-        anotherLink: { href: otherLink }
-      }
+        anotherLink: { href: otherLink },
+      },
     };
     timeCompleted = new Date().getDate();
     msToLive = 90000;
@@ -41,10 +48,10 @@ describe('ObjectUpdatesEffects', () => {
       core: {
         index: {
           [IndexName.REQUEST]: {
-            [selfLink]: requestUUID
-          }
-        }
-      }
+            [selfLink]: requestUUID,
+          },
+        },
+      },
     };
   }
 
@@ -70,7 +77,7 @@ describe('ObjectUpdatesEffects', () => {
       const newAction = new AddToIndexAction(
         IndexName.ALTERNATIVE_OBJECT_LINK,
         alternativeLink,
-        objectToCache._links.self.href
+        objectToCache._links.self.href,
       );
       actions = hot('--a-', { a: action });
       const expected = cold('--b-', { b: newAction });
diff --git a/src/app/core/index/index.effects.ts b/src/app/core/index/index.effects.ts
index 18d639023f..2c3b9ad89b 100644
--- a/src/app/core/index/index.effects.ts
+++ b/src/app/core/index/index.effects.ts
@@ -1,30 +1,48 @@
-import { filter, map, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
+import { hasValue } from '../../shared/empty.util';
+import { NoOpAction } from '../../shared/ngrx/no-op.action';
 import {
   AddToObjectCacheAction,
   ObjectCacheActionTypes,
-  RemoveFromObjectCacheAction
+  RemoveFromObjectCacheAction,
 } from '../cache/object-cache.actions';
+import { CoreState } from '../core-state.model';
 import {
   RequestActionTypes,
   RequestConfigureAction,
-  RequestStaleAction
+  RequestStaleAction,
 } from '../data/request.actions';
-import { AddToIndexAction, RemoveFromIndexByValueAction } from './index.actions';
-import { hasValue } from '../../shared/empty.util';
 import { RestRequestMethod } from '../data/rest-request-method';
-import { getUrlWithoutEmbedParams, uuidFromHrefSelector } from './index.selectors';
-import { Store, select } from '@ngrx/store';
-import { NoOpAction } from '../../shared/ngrx/no-op.action';
+import {
+  AddToIndexAction,
+  RemoveFromIndexByValueAction,
+} from './index.actions';
+import {
+  getUrlWithoutEmbedParams,
+  uuidFromHrefSelector,
+} from './index.selectors';
 import { IndexName } from './index-name.model';
-import { CoreState } from '../core-state.model';
 
 @Injectable()
 export class UUIDIndexEffects {
 
-   addObject$ = createEffect(() => this.actions$
+  addObject$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.ADD),
       filter((action: AddToObjectCacheAction) => hasValue(action.payload.objectToCache.uuid)),
@@ -32,16 +50,16 @@ export class UUIDIndexEffects {
         return new AddToIndexAction(
           IndexName.OBJECT,
           action.payload.objectToCache.uuid,
-          action.payload.objectToCache._links.self.href
+          action.payload.objectToCache._links.self.href,
         );
-      })
+      }),
     ));
 
   /**
    * Adds an alternative link to an object to the ALTERNATIVE_OBJECT_LINK index
    * When the self link of the objectToCache is not the same as the alternativeLink
    */
-   addAlternativeObjectLink$ = createEffect(() => this.actions$
+  addAlternativeObjectLink$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.ADD),
       map((action: AddToObjectCacheAction) => {
@@ -51,37 +69,37 @@ export class UUIDIndexEffects {
           return new AddToIndexAction(
             IndexName.ALTERNATIVE_OBJECT_LINK,
             alternativeLink,
-            selfLink
+            selfLink,
           );
         } else {
           return new NoOpAction();
         }
-      })
+      }),
     ));
 
-   removeObject$ = createEffect(() => this.actions$
+  removeObject$ = createEffect(() => this.actions$
     .pipe(
       ofType(ObjectCacheActionTypes.REMOVE),
       map((action: RemoveFromObjectCacheAction) => {
         return new RemoveFromIndexByValueAction(
           IndexName.OBJECT,
-          action.payload
+          action.payload,
         );
-      })
+      }),
     ));
 
-   addRequest$ = createEffect(() => this.actions$
+  addRequest$ = createEffect(() => this.actions$
     .pipe(
       ofType(RequestActionTypes.CONFIGURE),
       filter((action: RequestConfigureAction) => action.payload.method === RestRequestMethod.GET),
       switchMap((action: RequestConfigureAction) => {
         const href = getUrlWithoutEmbedParams(action.payload.href);
         return this.store.pipe(
-            select(uuidFromHrefSelector(href)),
-            take(1),
-            map((uuid: string) => [action, uuid])
-          );
-        }
+          select(uuidFromHrefSelector(href)),
+          take(1),
+          map((uuid: string) => [action, uuid]),
+        );
+      },
       ),
       switchMap(([action, uuid]: [RequestConfigureAction, string]) => {
         let actions = [];
@@ -91,10 +109,10 @@ export class UUIDIndexEffects {
         actions = [...actions, new AddToIndexAction(
           IndexName.REQUEST,
           getUrlWithoutEmbedParams(action.payload.href),
-          action.payload.uuid
+          action.payload.uuid,
         )];
         return actions;
-      })
+      }),
     ));
 
   constructor(private actions$: Actions, private store: Store<CoreState>) {
diff --git a/src/app/core/index/index.reducer.spec.ts b/src/app/core/index/index.reducer.spec.ts
index 867e4dbad8..a5d46a05f6 100644
--- a/src/app/core/index/index.reducer.spec.ts
+++ b/src/app/core/index/index.reducer.spec.ts
@@ -1,11 +1,15 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
-import { indexReducer, MetaIndexState } from './index.reducer';
 import {
   AddToIndexAction,
   RemoveFromIndexBySubstringAction,
-  RemoveFromIndexByValueAction
+  RemoveFromIndexByValueAction,
 } from './index.actions';
+import {
+  indexReducer,
+  MetaIndexState,
+} from './index.reducer';
 import { IndexName } from './index-name.model';
 
 class NullAction extends AddToIndexAction {
@@ -24,12 +28,12 @@ describe('requestReducer', () => {
   const val2 = 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/1911e8a4-6939-490c-b58b-a5d70f8d91fb';
   const testState: MetaIndexState = {
     [IndexName.OBJECT]: {
-      [key1]: val1
+      [key1]: val1,
     }, [IndexName.ALTERNATIVE_OBJECT_LINK]: {
-      [key1]: val1
+      [key1]: val1,
     }, [IndexName.REQUEST]: {
-      [key1]: val1
-    }
+      [key1]: val1,
+    },
   };
   deepFreeze(testState);
 
diff --git a/src/app/core/index/index.reducer.ts b/src/app/core/index/index.reducer.ts
index 21819d67ba..c1f91caf2b 100644
--- a/src/app/core/index/index.reducer.ts
+++ b/src/app/core/index/index.reducer.ts
@@ -1,4 +1,10 @@
-import { AddToIndexAction, IndexAction, IndexActionTypes, RemoveFromIndexBySubstringAction, RemoveFromIndexByValueAction } from './index.actions';
+import {
+  AddToIndexAction,
+  IndexAction,
+  IndexActionTypes,
+  RemoveFromIndexBySubstringAction,
+  RemoveFromIndexByValueAction,
+} from './index.actions';
 import { IndexName } from './index-name.model';
 
 /**
@@ -62,10 +68,10 @@ export function indexReducer(state = initialState, action: IndexAction): MetaInd
 function addToIndex(state: MetaIndexState, action: AddToIndexAction): MetaIndexState {
   const subState = state[action.payload.name];
   const newSubState = Object.assign({}, subState, {
-    [action.payload.key]: action.payload.value
+    [action.payload.key]: action.payload.value,
   });
   const obs = Object.assign({}, state, {
-    [action.payload.name]: newSubState
+    [action.payload.name]: newSubState,
   });
   return obs;
 }
@@ -89,7 +95,7 @@ function removeFromIndexByValue(state: MetaIndexState, action: RemoveFromIndexBy
     }
   }
   return Object.assign({}, state, {
-    [action.payload.name]: newSubState
+    [action.payload.name]: newSubState,
   });
 }
 
@@ -112,6 +118,6 @@ function removeFromIndexBySubstring(state: MetaIndexState, action: RemoveFromInd
     }
   }
   return Object.assign({}, state, {
-    [action.payload.name]: newSubState
+    [action.payload.name]: newSubState,
   });
 }
diff --git a/src/app/core/index/index.selectors.spec.ts b/src/app/core/index/index.selectors.spec.ts
index 91119a283c..bea6290e5a 100644
--- a/src/app/core/index/index.selectors.spec.ts
+++ b/src/app/core/index/index.selectors.spec.ts
@@ -1,4 +1,7 @@
-import { getEmbedSizeParams, getUrlWithoutEmbedParams } from './index.selectors';
+import {
+  getEmbedSizeParams,
+  getUrlWithoutEmbedParams,
+} from './index.selectors';
 
 
 describe(`index selectors`, () => {
@@ -36,15 +39,15 @@ describe(`index selectors`, () => {
       const source = 'https://rest.api/core/communities/search/top?page=0&size=50&sort=dc.title,ASC&embed.size=subcommunities=5&embed=subcommunities';
       const result = getEmbedSizeParams(source);
       expect(result).toHaveSize(1);
-      expect(result[0]).toEqual({name: 'subcommunities', size: 5});
+      expect(result[0]).toEqual({ name: 'subcommunities', size: 5 });
     });
 
     it(`url with multiple embed size param => should return list with {name, size}`, () => {
       const source = 'https://rest.api/core/communities/search/top?page=0&size=50&sort=dc.title,ASC&embed.size=subcommunities=5&embed=subcommunities&embed.size=collections=1&embed=collections';
       const result = getEmbedSizeParams(source);
       expect(result).toHaveSize(2);
-      expect(result[0]).toEqual({name: 'subcommunities', size: 5});
-      expect(result[1]).toEqual({name: 'collections', size: 1});
+      expect(result[0]).toEqual({ name: 'subcommunities', size: 5 });
+      expect(result[1]).toEqual({ name: 'collections', size: 1 });
     });
 
     it(`url without params => should return empty list`, () => {
diff --git a/src/app/core/index/index.selectors.ts b/src/app/core/index/index.selectors.ts
index 697616c321..a9d42baa47 100644
--- a/src/app/core/index/index.selectors.ts
+++ b/src/app/core/index/index.selectors.ts
@@ -1,11 +1,20 @@
-import { createSelector, MemoizedSelector } from '@ngrx/store';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { coreSelector } from '../core.selectors';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { IndexState, MetaIndexState } from './index.reducer';
-import * as parse from 'url-parse';
-import { IndexName } from './index-name.model';
 import { CoreState } from '../core-state.model';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import {
+  IndexState,
+  MetaIndexState,
+} from './index.reducer';
+import { IndexName } from './index-name.model';
 
 /**
  * Return the given url without `embed` params.
@@ -21,17 +30,21 @@ import { CoreState } from '../core-state.model';
  */
 export const getUrlWithoutEmbedParams = (url: string): string => {
   if (isNotEmpty(url)) {
-    const parsed = parse(url);
-    if (isNotEmpty(parsed.query)) {
-      const parts = parsed.query.split(/[?|&]/)
-        .filter((part: string) => isNotEmpty(part))
-        .filter((part: string) => !(part.startsWith('embed=') || part.startsWith('embed.size=')));
-      let args = '';
-      if (isNotEmpty(parts)) {
-        args = `?${parts.join('&')}`;
+    try {
+      const parsed = new URL(url);
+      if (isNotEmpty(parsed.search)) {
+        const parts = parsed.search.split(/[?|&]/)
+          .filter((part: string) => isNotEmpty(part))
+          .filter((part: string) => !(part.startsWith('embed=') || part.startsWith('embed.size=')));
+        let args = '';
+        if (isNotEmpty(parts)) {
+          args = `?${parts.join('&')}`;
+        }
+        url = new URLCombiner(parsed.origin, parsed.pathname, args).toString();
+        return url;
       }
-      url = new URLCombiner(parsed.origin, parsed.pathname, args).toString();
-      return url;
+    } catch (e) {
+      // Ignore parsing errors. By default, we return the original string below.
     }
   }
 
@@ -44,15 +57,19 @@ export const getUrlWithoutEmbedParams = (url: string): string => {
  */
 export const getEmbedSizeParams = (url: string): { name: string, size: number }[] => {
   if (isNotEmpty(url)) {
-    const parsed = parse(url);
-    if (isNotEmpty(parsed.query)) {
-      return parsed.query.split(/[?|&]/)
-        .filter((part: string) => isNotEmpty(part))
-        .map((part: string) => part.match(/^embed.size=([^=]+)=(\d+)$/))
-        .filter((matches: RegExpMatchArray) => hasValue(matches) && hasValue(matches[1]) && hasValue(matches[2]))
-        .map((matches: RegExpMatchArray) => {
-          return { name: matches[1], size: Number(matches[2]) };
-        });
+    try {
+      const parsed = new URL(url);
+      if (isNotEmpty(parsed.search)) {
+        return parsed.search.split(/[?|&]/)
+          .filter((part: string) => isNotEmpty(part))
+          .map((part: string) => part.match(/^embed.size=([^=]+)=(\d+)$/))
+          .filter((matches: RegExpMatchArray) => hasValue(matches) && hasValue(matches[1]) && hasValue(matches[2]))
+          .map((matches: RegExpMatchArray) => {
+            return { name: matches[1], size: Number(matches[2]) };
+          });
+      }
+    } catch (e) {
+      // Ignore parsing errors. By default, we return an empty result below.
     }
   }
 
@@ -67,7 +84,7 @@ export const getEmbedSizeParams = (url: string): { name: string, size: number }[
  */
 export const metaIndexSelector: MemoizedSelector<CoreState, MetaIndexState> = createSelector(
   coreSelector,
-  (state: CoreState) => state.index
+  (state: CoreState) => state.index,
 );
 
 /**
@@ -79,7 +96,7 @@ export const metaIndexSelector: MemoizedSelector<CoreState, MetaIndexState> = cr
  */
 export const objectIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
-  (state: MetaIndexState) => state[IndexName.OBJECT]
+  (state: MetaIndexState) => state[IndexName.OBJECT],
 );
 
 /**
@@ -90,7 +107,7 @@ export const objectIndexSelector: MemoizedSelector<CoreState, IndexState> = crea
  */
 export const requestIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
-  (state: MetaIndexState) => state[IndexName.REQUEST]
+  (state: MetaIndexState) => state[IndexName.REQUEST],
 );
 
 /**
@@ -101,7 +118,7 @@ export const requestIndexSelector: MemoizedSelector<CoreState, IndexState> = cre
  */
 export const alternativeLinkIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
-  (state: MetaIndexState) => state[IndexName.ALTERNATIVE_OBJECT_LINK]
+  (state: MetaIndexState) => state[IndexName.ALTERNATIVE_OBJECT_LINK],
 );
 
 /**
@@ -115,7 +132,7 @@ export const alternativeLinkIndexSelector: MemoizedSelector<CoreState, IndexStat
 export const selfLinkFromUuidSelector =
   (uuid: string): MemoizedSelector<CoreState, string> => createSelector(
     objectIndexSelector,
-    (state: IndexState) => hasValue(state) ? state[uuid] : undefined
+    (state: IndexState) => hasValue(state) ? state[uuid] : undefined,
   );
 
 /**
@@ -129,7 +146,7 @@ export const selfLinkFromUuidSelector =
 export const uuidFromHrefSelector =
   (href: string): MemoizedSelector<CoreState, string> => createSelector(
     requestIndexSelector,
-    (state: IndexState) => hasValue(state) ? state[getUrlWithoutEmbedParams(href)] : undefined
+    (state: IndexState) => hasValue(state) ? state[getUrlWithoutEmbedParams(href)] : undefined,
   );
 
 /**
@@ -143,5 +160,5 @@ export const uuidFromHrefSelector =
 export const selfLinkFromAlternativeLinkSelector =
   (altLink: string): MemoizedSelector<CoreState, string> => createSelector(
     alternativeLinkIndexSelector,
-    (state: IndexState) => hasValue(state) ? state[altLink] : undefined
+    (state: IndexState) => hasValue(state) ? state[altLink] : undefined,
   );
diff --git a/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts b/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts
index d29bf993cc..73677a3384 100644
--- a/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts
+++ b/src/app/core/json-patch/builder/json-patch-operation-path-combiner.ts
@@ -52,6 +52,6 @@ export class JsonPatchOperationPathCombiner extends URLCombiner {
       path += '/' + fragment;
     }
 
-    return {rootElement: this._rootElement, subRootElement: this._subRootElement, path: path};
+    return { rootElement: this._rootElement, subRootElement: this._subRootElement, path: path };
   }
 }
diff --git a/src/app/core/json-patch/builder/json-patch-operations-builder.ts b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
index f5a584fd3d..b7db765b3b 100644
--- a/src/app/core/json-patch/builder/json-patch-operations-builder.ts
+++ b/src/app/core/json-patch/builder/json-patch-operations-builder.ts
@@ -1,18 +1,29 @@
+import { Injectable } from '@angular/core';
 import { Store } from '@ngrx/store';
+
 import {
+  dateToISOFormat,
+  dateToString,
+  isNgbDateStruct,
+} from '../../../shared/date.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { CoreState } from '../../core-state.model';
+import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary-entry.model';
+import {
+  FlushPatchOperationAction,
   NewPatchAddOperationAction,
   NewPatchMoveOperationAction,
   NewPatchRemoveOperationAction,
-  NewPatchReplaceOperationAction
+  NewPatchReplaceOperationAction,
 } from '../json-patch-operations.actions';
 import { JsonPatchOperationPathObject } from './json-patch-operation-path-combiner';
-import { Injectable } from '@angular/core';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { dateToISOFormat, dateToString, isNgbDateStruct } from '../../../shared/date.util';
-import { VocabularyEntry } from '../../submission/vocabularies/models/vocabulary-entry.model';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
-import { CoreState } from '../../core-state.model';
 
 /**
  * Provides methods to dispatch JsonPatch Operations Actions
@@ -80,8 +91,8 @@ export class JsonPatchOperationsBuilder {
         path.rootElement,
         path.subRootElement,
         prevPath,
-        path.path
-      )
+        path.path,
+      ),
     );
   }
 
@@ -99,6 +110,20 @@ export class JsonPatchOperationsBuilder {
         path.path));
   }
 
+  /**
+   * Dispatches a new FlushPatchOperationAction
+   *
+   * @param path
+   *    a JsonPatchOperationPathObject representing path
+   */
+  flushOperation(path: JsonPatchOperationPathObject) {
+    this.store.dispatch(
+      new FlushPatchOperationAction(
+        path.rootElement,
+        path.subRootElement,
+        path.path));
+  }
+
   protected prepareValue(value: any, plain: boolean, first: boolean) {
     let operationValue: any = null;
     if (hasValue(value)) {
diff --git a/src/app/core/json-patch/json-patch-operations.actions.ts b/src/app/core/json-patch/json-patch-operations.actions.ts
index 6fea7a58fb..81cce174ec 100644
--- a/src/app/core/json-patch/json-patch-operations.actions.ts
+++ b/src/app/core/json-patch/json-patch-operations.actions.ts
@@ -20,6 +20,7 @@ export const JsonPatchOperationsActionTypes = {
   COMMIT_JSON_PATCH_OPERATIONS: type('dspace/core/patch/COMMIT_JSON_PATCH_OPERATIONS'),
   ROLLBACK_JSON_PATCH_OPERATIONS: type('dspace/core/patch/ROLLBACK_JSON_PATCH_OPERATIONS'),
   FLUSH_JSON_PATCH_OPERATIONS: type('dspace/core/patch/FLUSH_JSON_PATCH_OPERATIONS'),
+  FLUSH_JSON_PATCH_OPERATION: type('dspace/core/patch/FLUSH_JSON_PATCH_OPERATION'),
   START_TRANSACTION_JSON_PATCH_OPERATIONS: type('dspace/core/patch/START_TRANSACTION_JSON_PATCH_OPERATIONS'),
   DELETE_PENDING_JSON_PATCH_OPERATIONS: type('dspace/core/patch/DELETE_PENDING_JSON_PATCH_OPERATIONS'),
 };
@@ -120,6 +121,32 @@ export class FlushPatchOperationsAction implements Action {
   }
 }
 
+
+/**
+ * An ngrx action to flush a single operation of the JSON Patch operations
+ */
+export class FlushPatchOperationAction implements Action {
+  type = JsonPatchOperationsActionTypes.FLUSH_JSON_PATCH_OPERATION;
+  payload: {
+    resourceType: string;
+    resourceId: string;
+    path: string
+  };
+
+  /**
+   * Create a new FlushPatchOperationsAction
+   *
+   * @param resourceType
+   *    the resource's type
+   * @param resourceId
+   *    the resource's ID
+   * @param path
+   *    the path of the operation
+   */
+  constructor(resourceType: string, resourceId: string, path: string) {
+    this.payload = { resourceType, resourceId, path };
+  }
+}
 /**
  * An ngrx action to Add new HTTP/PATCH ADD operations to state
  */
@@ -284,4 +311,5 @@ export type PatchOperationsActions
   | NewPatchReplaceOperationAction
   | RollbacktPatchOperationsAction
   | StartTransactionPatchOperationsAction
-  | DeletePendingJsonPatchOperationsAction;
+  | DeletePendingJsonPatchOperationsAction
+  | FlushPatchOperationAction;
diff --git a/src/app/core/json-patch/json-patch-operations.effects.spec.ts b/src/app/core/json-patch/json-patch-operations.effects.spec.ts
index 8ad238b21d..d43fb0edd1 100644
--- a/src/app/core/json-patch/json-patch-operations.effects.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.effects.spec.ts
@@ -1,15 +1,22 @@
 import { TestBed } from '@angular/core/testing';
-
-import { cold, hot } from 'jasmine-marbles';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Store } from '@ngrx/store';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
+import {
+  FlushPatchOperationsAction,
+  JsonPatchOperationsActionTypes,
+} from './json-patch-operations.actions';
 import { JsonPatchOperationsEffects } from './json-patch-operations.effects';
 import { JsonPatchOperationsState } from './json-patch-operations.reducer';
 
-import { FlushPatchOperationsAction, JsonPatchOperationsActionTypes } from './json-patch-operations.actions';
-
 describe('JsonPatchOperationsEffects test suite', () => {
   let jsonPatchOperationsEffects: JsonPatchOperationsEffects;
   let actions: Observable<any>;
@@ -17,7 +24,7 @@ describe('JsonPatchOperationsEffects test suite', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
   const testJsonPatchResourceType = 'testResourceType';
   const testJsonPatchResourceId = 'testResourceId';
@@ -40,12 +47,12 @@ describe('JsonPatchOperationsEffects test suite', () => {
       actions = hot('--a-', {
         a: {
           type: JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS,
-          payload: { resourceType: testJsonPatchResourceType, resourceId: testJsonPatchResourceId }
-        }
+          payload: { resourceType: testJsonPatchResourceType, resourceId: testJsonPatchResourceId },
+        },
       });
 
       const expected = cold('--b-', {
-        b: new FlushPatchOperationsAction(testJsonPatchResourceType, testJsonPatchResourceId)
+        b: new FlushPatchOperationsAction(testJsonPatchResourceType, testJsonPatchResourceId),
       });
 
       expect(jsonPatchOperationsEffects.commit$).toBeObservable(expected);
diff --git a/src/app/core/json-patch/json-patch-operations.effects.ts b/src/app/core/json-patch/json-patch-operations.effects.ts
index 3acfcba910..49bfabc0c5 100644
--- a/src/app/core/json-patch/json-patch-operations.effects.ts
+++ b/src/app/core/json-patch/json-patch-operations.effects.ts
@@ -1,11 +1,15 @@
 import { Injectable } from '@angular/core';
-
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
 import { map } from 'rxjs/operators';
-import { createEffect, Actions, ofType } from '@ngrx/effects';
 
 import {
-  CommitPatchOperationsAction, FlushPatchOperationsAction,
-  JsonPatchOperationsActionTypes
+  CommitPatchOperationsAction,
+  FlushPatchOperationsAction,
+  JsonPatchOperationsActionTypes,
 } from './json-patch-operations.actions';
 
 /**
@@ -17,7 +21,7 @@ export class JsonPatchOperationsEffects {
   /**
    * Dispatches a FlushPatchOperationsAction for every dispatched CommitPatchOperationsAction
    */
-   commit$ = createEffect(() => this.actions$.pipe(
+  commit$ = createEffect(() => this.actions$.pipe(
     ofType(JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS),
     map((action: CommitPatchOperationsAction) => {
       return new FlushPatchOperationsAction(action.payload.resourceType, action.payload.resourceId);
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 1f98cf0920..dba5794ffc 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
@@ -1,18 +1,20 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
 import {
-  CommitPatchOperationsAction, DeletePendingJsonPatchOperationsAction,
+  CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
   FlushPatchOperationsAction,
   NewPatchAddOperationAction,
   NewPatchRemoveOperationAction,
   RollbacktPatchOperationsAction,
-  StartTransactionPatchOperationsAction
+  StartTransactionPatchOperationsAction,
 } from './json-patch-operations.actions';
 import {
   JsonPatchOperationsEntry,
   jsonPatchOperationsReducer,
   JsonPatchOperationsResourceEntry,
-  JsonPatchOperationsState
+  JsonPatchOperationsState,
 } from './json-patch-operations.reducer';
 
 class NullAction extends NewPatchAddOperationAction {
@@ -36,7 +38,7 @@ describe('jsonPatchOperationsReducer test suite', () => {
   const patchOpBody = [{
     op: 'add',
     path: '/testResourceType/testResourceId/testField',
-    value: ['test']
+    value: ['test'],
   }];
   const timestampBeforeStart = 1545994811991;
   const timestampAfterStart = 1545994837492;
@@ -50,16 +52,16 @@ describe('jsonPatchOperationsReducer test suite', () => {
               operation: {
                 op: 'add',
                 path: '/testResourceType/testResourceId/testField',
-                value: ['test']
+                value: ['test'],
               },
-              timeCompleted: timestampBeforeStart
+              timeCompleted: timestampBeforeStart,
             },
-          ]
-        } as JsonPatchOperationsEntry
+          ],
+        } as JsonPatchOperationsEntry,
       },
       transactionStartTime: null,
-      commitPending: false
-    } as JsonPatchOperationsResourceEntry
+      commitPending: false,
+    } as JsonPatchOperationsResourceEntry,
   };
 
   let initState: JsonPatchOperationsState;
@@ -73,23 +75,23 @@ describe('jsonPatchOperationsReducer test suite', () => {
               operation: {
                 op: 'add',
                 path: '/testResourceType/testResourceId/testField',
-                value: ['test']
+                value: ['test'],
               },
-              timeCompleted: timestampBeforeStart
+              timeCompleted: timestampBeforeStart,
             },
             {
               operation: {
                 op: 'remove',
-                path: '/testResourceType/testResourceId/testField'
+                path: '/testResourceType/testResourceId/testField',
               },
-              timeCompleted: timestampBeforeStart
+              timeCompleted: timestampBeforeStart,
             },
-          ]
-        } as JsonPatchOperationsEntry
+          ],
+        } as JsonPatchOperationsEntry,
       },
       transactionStartTime: null,
-      commitPending: false
-    } as JsonPatchOperationsResourceEntry
+      commitPending: false,
+    } as JsonPatchOperationsResourceEntry,
   };
   deepFreeze(testState);
 
@@ -158,8 +160,8 @@ describe('jsonPatchOperationsReducer test suite', () => {
       initState = Object.assign({}, testState, {
         [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
           transactionStartTime: startTimestamp,
-          commitPending: true
-        })
+          commitPending: true,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
 
@@ -176,8 +178,8 @@ describe('jsonPatchOperationsReducer test suite', () => {
       initState = Object.assign({}, testState, {
         [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
           transactionStartTime: startTimestamp,
-          commitPending: true
-        })
+          commitPending: true,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
 
@@ -201,32 +203,32 @@ describe('jsonPatchOperationsReducer test suite', () => {
                   operation: {
                     op: 'add',
                     path: '/testResourceType/testResourceId/testField',
-                    value: ['test']
+                    value: ['test'],
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
                 {
                   operation: {
                     op: 'remove',
-                    path: '/testResourceType/testResourceId/testField'
+                    path: '/testResourceType/testResourceId/testField',
                   },
-                  timeCompleted: timestampAfterStart
+                  timeCompleted: timestampAfterStart,
                 },
-              ]
-            } as JsonPatchOperationsEntry
+              ],
+            } as JsonPatchOperationsEntry,
           },
           transactionStartTime: startTimestamp,
-          commitPending: false
-        })
+          commitPending: false,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
       const expectedBody: any = [
         {
           operation: {
             op: 'remove',
-            path: '/testResourceType/testResourceId/testField'
+            path: '/testResourceType/testResourceId/testField',
           },
-          timeCompleted: timestampAfterStart
+          timeCompleted: timestampAfterStart,
         },
       ];
       expect(newState[testJsonPatchResourceType].transactionStartTime).toBeNull();
@@ -244,18 +246,18 @@ describe('jsonPatchOperationsReducer test suite', () => {
                   operation: {
                     op: 'add',
                     path: '/testResourceType/testResourceId/testField',
-                    value: ['test']
+                    value: ['test'],
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
                 {
                   operation: {
                     op: 'remove',
-                    path: '/testResourceType/testResourceId/testField'
+                    path: '/testResourceType/testResourceId/testField',
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
-              ]
+              ],
             } as JsonPatchOperationsEntry,
             testResourceAnotherId: {
               body: [
@@ -263,23 +265,23 @@ describe('jsonPatchOperationsReducer test suite', () => {
                   operation: {
                     op: 'add',
                     path: '/testResourceType/testResourceAnotherId/testField',
-                    value: ['test']
+                    value: ['test'],
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
                 {
                   operation: {
                     op: 'remove',
-                    path: '/testResourceType/testResourceAnotherId/testField'
+                    path: '/testResourceType/testResourceAnotherId/testField',
                   },
-                  timeCompleted: timestampBeforeStart
+                  timeCompleted: timestampBeforeStart,
                 },
-              ]
-            } as JsonPatchOperationsEntry
+              ],
+            } as JsonPatchOperationsEntry,
           },
           transactionStartTime: startTimestamp,
-          commitPending: false
-        })
+          commitPending: false,
+        }),
       });
     });
 
@@ -293,16 +295,16 @@ describe('jsonPatchOperationsReducer test suite', () => {
           operation: {
             op: 'add',
             path: '/testResourceType/testResourceAnotherId/testField',
-            value: ['test']
+            value: ['test'],
           },
-          timeCompleted: timestampBeforeStart
+          timeCompleted: timestampBeforeStart,
         },
         {
           operation: {
             op: 'remove',
-            path: '/testResourceType/testResourceAnotherId/testField'
+            path: '/testResourceType/testResourceAnotherId/testField',
           },
-          timeCompleted: timestampBeforeStart
+          timeCompleted: timestampBeforeStart,
         },
       ];
       expect(newState[testJsonPatchResourceType].transactionStartTime).toBeNull();
@@ -329,8 +331,8 @@ describe('jsonPatchOperationsReducer test suite', () => {
       initState = Object.assign({}, testState, {
         [testJsonPatchResourceType]: Object.assign({}, testState[testJsonPatchResourceType], {
           transactionStartTime: startTimestamp,
-          commitPending: true
-        })
+          commitPending: true,
+        }),
       });
       const newState = jsonPatchOperationsReducer(initState, action);
 
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..53466d284d 100644
--- a/src/app/core/json-patch/json-patch-operations.reducer.ts
+++ b/src/app/core/json-patch/json-patch-operations.reducer.ts
@@ -1,20 +1,28 @@
-import { hasValue, isNotEmpty, isNotUndefined, isNull } from '../../shared/empty.util';
-
 import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+  isNull,
+} from '../../shared/empty.util';
+import {
+  JsonPatchOperationModel,
+  JsonPatchOperationType,
+} from './json-patch.model';
+import {
+  CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
+  FlushPatchOperationAction,
   FlushPatchOperationsAction,
-  PatchOperationsActions,
   JsonPatchOperationsActionTypes,
   NewPatchAddOperationAction,
   NewPatchCopyOperationAction,
   NewPatchMoveOperationAction,
   NewPatchRemoveOperationAction,
   NewPatchReplaceOperationAction,
-  CommitPatchOperationsAction,
-  StartTransactionPatchOperationsAction,
+  PatchOperationsActions,
   RollbacktPatchOperationsAction,
-  DeletePendingJsonPatchOperationsAction
+  StartTransactionPatchOperationsAction,
 } from './json-patch-operations.actions';
-import { JsonPatchOperationModel, JsonPatchOperationType } from './json-patch.model';
 
 /**
  * An interface to represent JSON-PATCH Operation objects to execute
@@ -71,7 +79,7 @@ export function jsonPatchOperationsReducer(state = initialState, action: PatchOp
     }
 
     case JsonPatchOperationsActionTypes.FLUSH_JSON_PATCH_OPERATIONS: {
-      return flushOperation(state, action as FlushPatchOperationsAction);
+      return flushOperations(state, action as FlushPatchOperationsAction);
     }
 
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_ADD_OPERATION: {
@@ -106,6 +114,10 @@ export function jsonPatchOperationsReducer(state = initialState, action: PatchOp
       return deletePendingOperations(state, action as DeletePendingJsonPatchOperationsAction);
     }
 
+    case JsonPatchOperationsActionTypes.FLUSH_JSON_PATCH_OPERATION: {
+      return flushOperation(state, action as FlushPatchOperationAction);
+    }
+
     default: {
       return state;
     }
@@ -128,8 +140,8 @@ function startTransactionPatchOperations(state: JsonPatchOperationsState, action
     return Object.assign({}, state, {
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
         transactionStartTime: action.payload.startTime,
-        commitPending: true
-      })
+        commitPending: true,
+      }),
     });
   } else {
     return state;
@@ -151,8 +163,8 @@ function commitOperations(state: JsonPatchOperationsState, action: CommitPatchOp
     && state[ action.payload.resourceType ].commitPending) {
     return Object.assign({}, state, {
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
-        commitPending: false
-      })
+        commitPending: false,
+      }),
     });
   } else {
     return state;
@@ -175,8 +187,8 @@ function rollbackOperations(state: JsonPatchOperationsState, action: RollbacktPa
     return Object.assign({}, state, {
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
         transactionStartTime: null,
-        commitPending: false
-      })
+        commitPending: false,
+      }),
     });
   } else {
     return state;
@@ -197,6 +209,39 @@ function deletePendingOperations(state: JsonPatchOperationsState, action: Delete
   return null;
 }
 
+/**
+ * Flush one operation from JsonPatchOperationsState.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an FlushPatchOperationsAction
+ * @return JsonPatchOperationsState
+ *    the new state.
+ */
+function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOperationAction): JsonPatchOperationsState {
+  const payload = action.payload;
+  if (state[payload.resourceType] && state[payload.resourceType].children) {
+    const body = state[payload.resourceType].children[payload.resourceId].body;
+    const operation = body.filter(operations => operations.operation.path === payload.path)[0];
+    const operationIndex = body.indexOf(operation);
+    const newBody = [...body];
+    newBody.splice(operationIndex, 1);
+
+    return Object.assign({}, state, {
+      [action.payload.resourceType]: Object.assign({}, {
+        children: {
+          [action.payload.resourceId]: {
+            body: newBody,
+          },
+        },
+      }),
+    });
+  } else {
+    return state;
+  }
+}
+
 /**
  * Add new JSON patch operation list.
  *
@@ -225,10 +270,10 @@ function newOperation(state: JsonPatchOperationsState, action): JsonPatchOperati
         children: Object.assign({}, state[ action.payload.resourceType ].children, {
           [action.payload.resourceId]: {
             body: newBody,
-          }
+          },
         }),
-        commitPending: isNotUndefined(state[ action.payload.resourceType ].commitPending) ? state[ action.payload.resourceType ].commitPending : false
-      })
+        commitPending: isNotUndefined(state[ action.payload.resourceType ].commitPending) ? state[ action.payload.resourceType ].commitPending : false,
+      }),
     });
   } else {
     return Object.assign({}, state, {
@@ -236,11 +281,11 @@ function newOperation(state: JsonPatchOperationsState, action): JsonPatchOperati
         children: {
           [action.payload.resourceId]: {
             body: newBody,
-          }
+          },
         },
         transactionStartTime: null,
-        commitPending: false
-      })
+        commitPending: false,
+      }),
     });
   }
 }
@@ -273,7 +318,7 @@ function hasValidBody(state: JsonPatchOperationsState, resourceType: any, resour
  * @return SubmissionObjectState
  *    the new state, with the section new validity status.
  */
-function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOperationsAction): JsonPatchOperationsState {
+function flushOperations(state: JsonPatchOperationsState, action: FlushPatchOperationsAction): JsonPatchOperationsState {
   if (hasValue(state[ action.payload.resourceType ])) {
     let newChildren;
     if (isNotUndefined(action.payload.resourceId)) {
@@ -283,8 +328,8 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
         newChildren = Object.assign({}, state[ action.payload.resourceType ].children, {
           [action.payload.resourceId]: {
             body: state[ action.payload.resourceType ].children[ action.payload.resourceId ].body
-              .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime)
-          }
+              .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime),
+          },
         });
       } else {
         newChildren = state[ action.payload.resourceType ].children;
@@ -297,8 +342,8 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
           newChildren = Object.assign({}, newChildren, {
             [resourceId]: {
               body: newChildren[ resourceId ].body
-                .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime)
-            }
+                .filter((entry) => entry.timeCompleted > state[ action.payload.resourceType ].transactionStartTime),
+            },
           });
         });
     }
@@ -306,7 +351,7 @@ function flushOperation(state: JsonPatchOperationsState, action: FlushPatchOpera
       [action.payload.resourceType]: Object.assign({}, state[ action.payload.resourceType ], {
         children: newChildren,
         transactionStartTime: null,
-      })
+      }),
     });
   } else {
     return state;
@@ -334,14 +379,14 @@ function addOperationToList(body: JsonPatchOperationObject[], actionType, target
       newBody.push(makeOperationEntry({
         op: JsonPatchOperationType.add,
         path: targetPath,
-        value: value
+        value: value,
       }));
       break;
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_REPLACE_OPERATION:
       newBody.push(makeOperationEntry({
         op: JsonPatchOperationType.replace,
         path: targetPath,
-        value: value
+        value: value,
       }));
       break;
     case JsonPatchOperationsActionTypes.NEW_JSON_PATCH_REMOVE_OPERATION:
@@ -351,7 +396,28 @@ 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, any>();
+  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, patch);
+    } else {
+      body.splice(i, 1);
+    }
+  }
+
+  return body;
 }
 
 function makeOperationEntry(operation) {
diff --git a/src/app/core/json-patch/json-patch-operations.service.spec.ts b/src/app/core/json-patch/json-patch-operations.service.spec.ts
index 10fc2f2ed8..e1c6e79d10 100644
--- a/src/app/core/json-patch/json-patch-operations.service.spec.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.spec.ts
@@ -1,29 +1,38 @@
-import { getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import { Store } from '@ngrx/store';
+import { deepClone } from 'fast-json-patch';
+import {
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { catchError } from 'rxjs/operators';
-import { Store } from '@ngrx/store';
+import { TestScheduler } from 'rxjs/testing';
 
+import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { RequestService } from '../data/request.service';
-import { SubmissionPatchRequest } from '../data/request.models';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRemoteDataBuildService } from '../../shared/mocks/remote-data-build.service.mock';
-import { JsonPatchOperationsService } from './json-patch-operations.service';
-import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
+import { CoreState } from '../core-state.model';
+import { SubmissionPatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { JsonPatchOperationsEntry, JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
+import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 import {
   CommitPatchOperationsAction,
   DeletePendingJsonPatchOperationsAction,
   RollbacktPatchOperationsAction,
-  StartTransactionPatchOperationsAction
+  StartTransactionPatchOperationsAction,
 } from './json-patch-operations.actions';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { deepClone } from 'fast-json-patch';
-import { CoreState } from '../core-state.model';
-import { RequestEntry } from '../data/request-entry.model';
+import {
+  JsonPatchOperationsEntry,
+  JsonPatchOperationsResourceEntry,
+} from './json-patch-operations.reducer';
+import { JsonPatchOperationsService } from './json-patch-operations.service';
 
 
 class TestService extends JsonPatchOperationsService<SubmitDataResponseDefinitionObject, SubmissionPatchRequest> {
@@ -60,17 +69,17 @@ describe('JsonPatchOperationsService test suite', () => {
                 operation: {
                   op: 'add',
                   path: '/testResourceType/testResourceId/testField',
-                  value: ['test']
+                  value: ['test'],
                 },
-                timeCompleted: timestamp
+                timeCompleted: timestamp,
               },
-            ]
-          } as JsonPatchOperationsEntry
+            ],
+          } as JsonPatchOperationsEntry,
         },
         transactionStartTime: null,
-        commitPending: false
-      } as JsonPatchOperationsResourceEntry
-    }
+        commitPending: false,
+      } as JsonPatchOperationsResourceEntry,
+    },
   };
   const resourceEndpointURL = 'https://rest.api/endpoint';
   const resourceEndpoint = 'resource';
@@ -82,12 +91,12 @@ describe('JsonPatchOperationsService test suite', () => {
   const patchOpBody = [{
     op: 'add',
     path: '/testResourceType/testResourceId/testField',
-    value: ['test']
+    value: ['test'],
   }];
 
   const getRequestEntry$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, timeCompleted: timestampResponse } as any
+      response: { isSuccessful: successful, timeCompleted: timestampResponse } as any,
     } as RequestEntry);
   };
 
@@ -96,7 +105,7 @@ describe('JsonPatchOperationsService test suite', () => {
       requestService,
       store,
       halService,
-      rdbService
+      rdbService,
     );
 
   }
@@ -105,19 +114,19 @@ describe('JsonPatchOperationsService test suite', () => {
     return jasmine.createSpyObj('store', {
       dispatch: {},
       select: observableOf(mockState['json/patch'][testJsonPatchResourceType]),
-      pipe: observableOf(true)
+      pipe: observableOf(true),
     });
   }
 
   function spyOnRdbServiceAndReturnSuccessfulRemoteData() {
     spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(
-      observableOf(Object.assign(createSuccessfulRemoteDataObject({ dataDefinition: 'test' }), { timeCompleted: new Date().getTime() + 10000 }))
+      observableOf(Object.assign(createSuccessfulRemoteDataObject({ dataDefinition: 'test' }), { timeCompleted: new Date().getTime() + 10000 })),
     );
   }
 
   function spyOnRdbServiceAndReturnFailedRemoteData() {
     spyOn(rdbService, 'buildFromRequestUUID').and.returnValue(
-      observableOf(Object.assign(createFailedRemoteDataObject('Error', 500), { timeCompleted: new Date().getTime() + 10000 }))
+      observableOf(Object.assign(createFailedRemoteDataObject('Error', 500), { timeCompleted: new Date().getTime() + 10000 })),
     );
   }
 
diff --git a/src/app/core/json-patch/json-patch-operations.service.ts b/src/app/core/json-patch/json-patch-operations.service.ts
index 1dfbd404cc..552a4354fd 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -1,23 +1,42 @@
-import { merge as observableMerge, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, partition, take, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import {
+  merge as observableMerge,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  partition,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined,
+} from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CoreState } from '../core-state.model';
+import { RemoteData } from '../data/remote-data';
 import { PatchRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { jsonPatchOperationsByResourceType } from './selectors';
-import { JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
-import {
-  CommitPatchOperationsAction, DeletePendingJsonPatchOperationsAction,
-  RollbacktPatchOperationsAction,
-  StartTransactionPatchOperationsAction
-} from './json-patch-operations.actions';
-import { JsonPatchOperationModel } from './json-patch.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RemoteData } from '../data/remote-data';
-import { CoreState } from '../core-state.model';
+import { JsonPatchOperationModel } from './json-patch.model';
+import {
+  CommitPatchOperationsAction,
+  DeletePendingJsonPatchOperationsAction,
+  RollbacktPatchOperationsAction,
+  StartTransactionPatchOperationsAction,
+} from './json-patch-operations.actions';
+import { JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
+import { jsonPatchOperationsByResourceType } from './selectors';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -99,9 +118,9 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
                 return rd.payload.dataDefinition;
               }
             }),
-            distinctUntilChanged()
-        );
-        }))
+            distinctUntilChanged(),
+          );
+        })),
     );
   }
 
diff --git a/src/app/core/json-patch/selectors.ts b/src/app/core/json-patch/selectors.ts
index 20eb853891..7f6aaa3d98 100644
--- a/src/app/core/json-patch/selectors.ts
+++ b/src/app/core/json-patch/selectors.ts
@@ -1,8 +1,15 @@
 import { MemoizedSelector } from '@ngrx/store';
+
+import {
+  keySelector,
+  subStateSelector,
+} from '../../submission/selectors';
 import { coreSelector } from '../core.selectors';
-import { JsonPatchOperationsEntry, JsonPatchOperationsResourceEntry } from './json-patch-operations.reducer';
-import { keySelector, subStateSelector } from '../../submission/selectors';
 import { CoreState } from '../core-state.model';
+import {
+  JsonPatchOperationsEntry,
+  JsonPatchOperationsResourceEntry,
+} from './json-patch-operations.reducer';
 
 /**
  * Return MemoizedSelector to select all jsonPatchOperations for a specified resource type, stored in the state
diff --git a/src/app/core/locale/locale.interceptor.spec.ts b/src/app/core/locale/locale.interceptor.spec.ts
index 9e298fefcc..4725820a6b 100644
--- a/src/app/core/locale/locale.interceptor.spec.ts
+++ b/src/app/core/locale/locale.interceptor.spec.ts
@@ -1,13 +1,16 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController, } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
-
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { LocaleService } from './locale.service';
-import { LocaleInterceptor } from './locale.interceptor';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { of } from 'rxjs';
 
+import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { LocaleInterceptor } from './locale.interceptor';
+import { LocaleService } from './locale.service';
+
 describe(`LocaleInterceptor`, () => {
   let service: DspaceRestService;
   let httpMock: HttpTestingController;
@@ -17,7 +20,7 @@ describe(`LocaleInterceptor`, () => {
 
   const mockLocaleService = jasmine.createSpyObj('LocaleService', {
     getCurrentLanguageCode: jasmine.createSpy('getCurrentLanguageCode'),
-    getLanguageCodeList: of(languageList)
+    getLanguageCodeList: of(languageList),
   });
 
   beforeEach(() => {
@@ -52,7 +55,7 @@ describe(`LocaleInterceptor`, () => {
 
       expect(httpRequest.request.headers.has('Accept-Language'));
       const lang = httpRequest.request.headers.get('Accept-Language');
-      expect(lang).toBeDefined();
+      expect(lang).not.toBeNull();
       expect(lang).toBe(languageList.toString());
     });
 
diff --git a/src/app/core/locale/locale.interceptor.ts b/src/app/core/locale/locale.interceptor.ts
index 035dad35c9..6dfa19485d 100644
--- a/src/app/core/locale/locale.interceptor.ts
+++ b/src/app/core/locale/locale.interceptor.ts
@@ -1,10 +1,17 @@
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
-
 import { Observable } from 'rxjs';
+import {
+  mergeMap,
+  scan,
+} from 'rxjs/operators';
 
 import { LocaleService } from './locale.service';
-import { mergeMap, scan } from 'rxjs/operators';
 
 @Injectable()
 export class LocaleInterceptor implements HttpInterceptor {
@@ -26,7 +33,7 @@ export class LocaleInterceptor implements HttpInterceptor {
           // Clone the request to add the new header.
           newReq = req.clone({
             headers: req.headers
-              .set('Accept-Language', languages.toString())
+              .set('Accept-Language', languages.toString()),
           });
           // Pass on the new request instead of the original request.
           return next.handle(newReq);
diff --git a/src/app/core/locale/locale.service.spec.ts b/src/app/core/locale/locale.service.spec.ts
index c7c59802fd..d7f681056c 100644
--- a/src/app/core/locale/locale.service.spec.ts
+++ b/src/app/core/locale/locale.service.spec.ts
@@ -1,15 +1,25 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-
-import { CookieService } from '../services/cookie.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { LANG_COOKIE, LANG_ORIGIN, LocaleService } from './locale.service';
-import { AuthService } from '../auth/auth.service';
-import { NativeWindowRef } from '../services/window.service';
-import { RouteService } from '../services/route.service';
 import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { RouteService } from '../services/route.service';
+import { NativeWindowRef } from '../services/window.service';
+import {
+  LANG_COOKIE,
+  LANG_ORIGIN,
+  LocaleService,
+} from './locale.service';
 
 describe('LocaleService test suite', () => {
   let service: LocaleService;
@@ -25,10 +35,10 @@ describe('LocaleService test suite', () => {
 
   authService = jasmine.createSpyObj('AuthService', {
     isAuthenticated: jasmine.createSpy('isAuthenticated'),
-    isAuthenticationLoaded: jasmine.createSpy('isAuthenticationLoaded')
+    isAuthenticationLoaded: jasmine.createSpy('isAuthenticationLoaded'),
   });
 
-  const langList = ['en', 'it', 'de'];
+  const langList = ['en', 'xx', 'de'];
 
   beforeEach(waitForAsync(() => {
     return TestBed.configureTestingModule({
@@ -36,8 +46,8 @@ describe('LocaleService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       providers: [
@@ -45,7 +55,7 @@ describe('LocaleService test suite', () => {
         { provide: AuthService, userValue: authService },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Document, useValue: document },
-      ]
+      ],
     });
   }));
 
@@ -62,25 +72,33 @@ describe('LocaleService test suite', () => {
   });
 
   describe('getCurrentLanguageCode', () => {
-    it('should return language saved on cookie', () => {
+    beforeEach(() => {
+      spyOn(translateService, 'getLangs').and.returnValue(langList);
+    });
+
+    it('should return the language saved on cookie if it\'s a valid & active language', () => {
       spyOnGet.and.returnValue('de');
       expect(service.getCurrentLanguageCode()).toBe('de');
     });
 
-    describe('', () => {
-      beforeEach(() => {
-        spyOn(translateService, 'getLangs').and.returnValue(langList);
-      });
+    it('should return the default language if the cookie language is disabled', () => {
+      spyOnGet.and.returnValue('disabled');
+      expect(service.getCurrentLanguageCode()).toBe('en');
+    });
 
-      it('should return language from browser setting', () => {
-        spyOn(translateService, 'getBrowserLang').and.returnValue('it');
-        expect(service.getCurrentLanguageCode()).toBe('it');
-      });
+    it('should return the default language if the cookie language does not exist', () => {
+      spyOnGet.and.returnValue('does-not-exist');
+      expect(service.getCurrentLanguageCode()).toBe('en');
+    });
 
-      it('should return default language from config', () => {
-        spyOn(translateService, 'getBrowserLang').and.returnValue('fr');
-        expect(service.getCurrentLanguageCode()).toBe('en');
-      });
+    it('should return language from browser setting', () => {
+      spyOn(translateService, 'getBrowserLang').and.returnValue('xx');
+      expect(service.getCurrentLanguageCode()).toBe('xx');
+    });
+
+    it('should return default language from config', () => {
+      spyOn(translateService, 'getBrowserLang').and.returnValue('fr');
+      expect(service.getCurrentLanguageCode()).toBe('en');
     });
   });
 
@@ -106,9 +124,9 @@ describe('LocaleService test suite', () => {
     });
 
     it('should set the given language', () => {
-      service.setCurrentLanguageCode('it');
-      expect(translateService.use).toHaveBeenCalledWith('it');
-      expect(service.saveLanguageCodeToCookie).toHaveBeenCalledWith('it');
+      service.setCurrentLanguageCode('xx');
+      expect(translateService.use).toHaveBeenCalledWith('xx');
+      expect(service.saveLanguageCodeToCookie).toHaveBeenCalledWith('xx');
     });
 
     it('should set the current language', () => {
@@ -127,7 +145,7 @@ describe('LocaleService test suite', () => {
 
   describe('', () => {
     it('should set quality to current language list', () => {
-      const langListWithQuality = ['en;q=1', 'it;q=0.9', 'de;q=0.8'];
+      const langListWithQuality = ['en;q=1', 'xx;q=0.9', 'de;q=0.8'];
       spyOn(service, 'setQuality').and.returnValue(langListWithQuality);
       service.setQuality(langList, LANG_ORIGIN.BROWSER, false);
       expect(service.setQuality).toHaveBeenCalledWith(langList, LANG_ORIGIN.BROWSER, false);
diff --git a/src/app/core/locale/locale.service.ts b/src/app/core/locale/locale.service.ts
index 68d2839d42..0c54ce8412 100644
--- a/src/app/core/locale/locale.service.ts
+++ b/src/app/core/locale/locale.service.ts
@@ -1,16 +1,33 @@
-import { Inject, Injectable } from '@angular/core';
-
-import { TranslateService } from '@ngx-translate/core';
-
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { CookieService } from '../services/cookie.service';
-import { environment } from '../../../environments/environment';
-import { AuthService } from '../auth/auth.service';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { RouteService } from '../services/route.service';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import { LangConfig } from '../../../config/lang-config.interface';
+import { environment } from '../../../environments/environment';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
 
 export const LANG_COOKIE = 'dsLanguage';
 
@@ -40,7 +57,7 @@ export class LocaleService {
     protected translate: TranslateService,
     protected authService: AuthService,
     protected routeService: RouteService,
-    @Inject(DOCUMENT) private document: any
+    @Inject(DOCUMENT) protected document: any,
   ) {
   }
 
@@ -52,8 +69,7 @@ export class LocaleService {
   getCurrentLanguageCode(): string {
     // Attempt to get the language from a cookie
     let lang = this.getLanguageCodeFromCookie();
-    if (isEmpty(lang)) {
-      // Cookie not found
+    if (isEmpty(lang) || environment.languages.find((langConfig: LangConfig) => langConfig.code === lang && langConfig.active) === undefined) {
       // Attempt to get the browser language from the user
       if (this.translate.getLangs().includes(this.translate.getBrowserLang())) {
         lang = this.translate.getBrowserLang();
@@ -72,7 +88,7 @@ export class LocaleService {
   getLanguageCodeList(): Observable<string[]> {
     const obs$ = combineLatest([
       this.authService.isAuthenticated(),
-      this.authService.isAuthenticationLoaded()
+      this.authService.isAuthenticationLoaded(),
     ]);
 
     return obs$.pipe(
@@ -80,7 +96,7 @@ export class LocaleService {
       mergeMap(([isAuthenticated, isLoaded]) => {
         // TODO to enabled again when https://github.com/DSpace/dspace-angular/issues/739 will be resolved
         const epersonLang$: Observable<string[]> = observableOf([]);
-/*        if (isAuthenticated && isLoaded) {
+        /*        if (isAuthenticated && isLoaded) {
           epersonLang$ = this.authService.getAuthenticatedUserFromStore().pipe(
             take(1),
             map((eperson) => {
@@ -112,13 +128,13 @@ export class LocaleService {
               languages.push(...this.setQuality(
                 Object.assign([], navigator.languages),
                 LANG_ORIGIN.BROWSER,
-                !isEmpty(this.translate.currentLang))
+                !isEmpty(this.translate.currentLang)),
               );
             }
             return languages;
-          })
+          }),
         );
-      })
+      }),
     );
   }
 
@@ -176,11 +192,11 @@ export class LocaleService {
         divisor = 1;
     }
     languages.forEach( (lang) => {
-        let value = lang + ';q=';
-        let quality = (v - idx++) / v;
-        quality = ((languages.length > 10) ? quality.toFixed(2) : quality) as number;
-        value += quality / divisor;
-        langWithPrior.push(value);
+      let value = lang + ';q=';
+      let quality = (v - idx++) / v;
+      quality = ((languages.length > 10) ? quality.toFixed(2) : quality) as number;
+      value += quality / divisor;
+      langWithPrior.push(value);
     });
     return langWithPrior;
   }
diff --git a/src/app/core/locale/server-locale.service.ts b/src/app/core/locale/server-locale.service.ts
index f438643e49..1c636a92e4 100644
--- a/src/app/core/locale/server-locale.service.ts
+++ b/src/app/core/locale/server-locale.service.ts
@@ -1,12 +1,53 @@
-import { LANG_ORIGIN, LocaleService } from './locale.service';
-import { Injectable } from '@angular/core';
-import { combineLatest, Observable, of as observableOf } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
+import { CookieService } from '../services/cookie.service';
+import { RouteService } from '../services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import {
+  LANG_ORIGIN,
+  LocaleService,
+} from './locale.service';
 
 @Injectable()
 export class ServerLocaleService extends LocaleService {
 
+  constructor(
+    @Inject(NativeWindowService) protected _window: NativeWindowRef,
+    @Inject(REQUEST) protected req: Request,
+    protected cookie: CookieService,
+    protected translate: TranslateService,
+    protected authService: AuthService,
+    protected routeService: RouteService,
+    @Inject(DOCUMENT) protected document: any,
+  ) {
+    super(_window, cookie, translate, authService, routeService, document);
+  }
+
   /**
    * Get the languages list of the user in Accept-Language format
    *
@@ -15,7 +56,7 @@ export class ServerLocaleService extends LocaleService {
   getLanguageCodeList(): Observable<string[]> {
     const obs$ = combineLatest([
       this.authService.isAuthenticated(),
-      this.authService.isAuthenticationLoaded()
+      this.authService.isAuthenticationLoaded(),
     ]);
 
     return obs$.pipe(
@@ -35,7 +76,7 @@ export class ServerLocaleService extends LocaleService {
                   !isEmpty(this.translate.currentLang)));
               }
               return languages;
-            })
+            }),
           );
         }
         return epersonLang$.pipe(
@@ -50,10 +91,14 @@ export class ServerLocaleService extends LocaleService {
             if (isNotEmpty(epersonLang)) {
               languages.push(...epersonLang);
             }
+            if (hasValue(this.req.headers['accept-language'])) {
+              languages.push(...this.req.headers['accept-language'].split(','),
+              );
+            }
             return languages;
-          })
+          }),
         );
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/log/log.interceptor.spec.ts b/src/app/core/log/log.interceptor.spec.ts
index cae9c32202..7a3c11fccc 100644
--- a/src/app/core/log/log.interceptor.spec.ts
+++ b/src/app/core/log/log.interceptor.spec.ts
@@ -1,18 +1,24 @@
-import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import { TestBed } from '@angular/core/testing';
 import { Router } from '@angular/router';
+import { StoreModule } from '@ngrx/store';
 
-import { LogInterceptor } from './log.interceptor';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { CookieService } from '../services/cookie.service';
+import {
+  appReducers,
+  storeModuleConfig,
+} from '../../app.reducer';
+import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { RouterStub } from '../../shared/testing/router.stub';
-import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { CookieService } from '../services/cookie.service';
 import { UUIDService } from '../shared/uuid.service';
-import { StoreModule } from '@ngrx/store';
-import { appReducers, storeModuleConfig } from '../../app.reducer';
+import { LogInterceptor } from './log.interceptor';
 
 
 describe('LogInterceptor', () => {
@@ -20,12 +26,12 @@ describe('LogInterceptor', () => {
   let httpMock: HttpTestingController;
   let cookieService: CookieService;
   let correlationIdService: CorrelationIdService;
-  const router = Object.assign(new RouterStub(),{url : '/statistics'});
+  const router = Object.assign(new RouterStub(),{ url : '/statistics' });
 
   // Mock payload/statuses are dummy content as we are not testing the results
   // of any below requests. We are only testing for X-XSRF-TOKEN header.
   const mockPayload = {
-    id: 1
+    id: 1,
   };
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
diff --git a/src/app/core/log/log.interceptor.ts b/src/app/core/log/log.interceptor.ts
index aff1a24963..bda408278f 100644
--- a/src/app/core/log/log.interceptor.ts
+++ b/src/app/core/log/log.interceptor.ts
@@ -1,10 +1,15 @@
+import {
+  HttpEvent,
+  HttpHandler,
+  HttpInterceptor,
+  HttpRequest,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
 import { Router } from '@angular/router';
-
 import { Observable } from 'rxjs';
-import { hasValue } from '../../shared/empty.util';
+
 import { CorrelationIdService } from '../../correlation-id/correlation-id.service';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Log Interceptor intercepting Http Requests & Responses to
diff --git a/src/app/core/metadata/meta-tag.actions.ts b/src/app/core/metadata/meta-tag.actions.ts
index 5a1ff8fd3d..74f5c9932a 100644
--- a/src/app/core/metadata/meta-tag.actions.ts
+++ b/src/app/core/metadata/meta-tag.actions.ts
@@ -1,10 +1,11 @@
 /* eslint-disable max-classes-per-file */
-import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../../shared/ngrx/type';
+
 export const MetaTagTypes = {
   ADD: type('dspace/meta-tag/ADD'),
-  CLEAR: type('dspace/meta-tag/CLEAR')
+  CLEAR: type('dspace/meta-tag/CLEAR'),
 };
 
 export class AddMetaTagAction implements Action {
diff --git a/src/app/core/metadata/meta-tag.reducer.spec.ts b/src/app/core/metadata/meta-tag.reducer.spec.ts
index 1fcd7d83e3..16880751ce 100644
--- a/src/app/core/metadata/meta-tag.reducer.spec.ts
+++ b/src/app/core/metadata/meta-tag.reducer.spec.ts
@@ -6,8 +6,11 @@
  * http://www.dspace.org/license/
  */
 
+import {
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
 import { metaTagReducer } from './meta-tag.reducer';
-import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
 
 const nullAction = { type: null };
 
diff --git a/src/app/core/metadata/meta-tag.reducer.ts b/src/app/core/metadata/meta-tag.reducer.ts
index 0af6fb0aab..5b541cabca 100644
--- a/src/app/core/metadata/meta-tag.reducer.ts
+++ b/src/app/core/metadata/meta-tag.reducer.ts
@@ -1,8 +1,8 @@
 import {
-  MetaTagAction,
-  MetaTagTypes,
   AddMetaTagAction,
   ClearMetaTagAction,
+  MetaTagAction,
+  MetaTagTypes,
 } from './meta-tag.actions';
 
 export interface MetaTagState {
@@ -10,7 +10,7 @@ export interface MetaTagState {
 }
 
 const initialstate: MetaTagState = {
-  tagsInUse: []
+  tagsInUse: [],
 };
 
 export const metaTagReducer = (state: MetaTagState = initialstate, action: MetaTagAction): MetaTagState => {
@@ -29,7 +29,7 @@ export const metaTagReducer = (state: MetaTagState = initialstate, action: MetaT
 
 const addMetaTag = (state: MetaTagState, action: AddMetaTagAction): MetaTagState => {
   return {
-    tagsInUse: [...state.tagsInUse, action.payload]
+    tagsInUse: [...state.tagsInUse, action.payload],
   };
 };
 
diff --git a/src/app/core/metadata/metadata-field.model.ts b/src/app/core/metadata/metadata-field.model.ts
index e9fd0fd1cf..1084b4009f 100644
--- a/src/app/core/metadata/metadata-field.model.ts
+++ b/src/app/core/metadata/metadata-field.model.ts
@@ -1,7 +1,16 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
 import { isNotEmpty } from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { RemoteData } from '../data/remote-data';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { HALLink } from '../shared/hal-link.model';
 import { HALResource } from '../shared/hal-resource.model';
@@ -9,8 +18,6 @@ import { ResourceType } from '../shared/resource-type';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { METADATA_FIELD } from './metadata-field.resource-type';
 import { MetadataSchema } from './metadata-schema.model';
-import { RemoteData } from '../data/remote-data';
-import { Observable } from 'rxjs';
 import { METADATA_SCHEMA } from './metadata-schema.resource-type';
 
 /**
@@ -25,37 +32,37 @@ export class MetadataField extends ListableObject implements HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this metadata field
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The element of this metadata field
    */
   @autoserialize
-  element: string;
+    element: string;
 
   /**
    * The qualifier of this metadata field
    */
   @autoserialize
-  qualifier: string;
+    qualifier: string;
 
   /**
    * The scope note of this metadata field
    */
   @autoserialize
-  scopeNote: string;
+    scopeNote: string;
 
   /**
    * The {@link HALLink}s for this MetadataField
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     schema: HALLink
   };
@@ -65,7 +72,7 @@ export class MetadataField extends ListableObject implements HALResource {
    * Will be undefined unless the schema {@link HALLink} has been resolved.
    */
   @link(METADATA_SCHEMA)
-  schema?: Observable<RemoteData<MetadataSchema>>;
+    schema?: Observable<RemoteData<MetadataSchema>>;
 
   /**
    * Method to print this metadata field as a string without the schema
diff --git a/src/app/core/metadata/metadata-schema.model.ts b/src/app/core/metadata/metadata-schema.model.ts
index 252113b3e4..85faf5d2ce 100644
--- a/src/app/core/metadata/metadata-schema.model.ts
+++ b/src/app/core/metadata/metadata-schema.model.ts
@@ -1,4 +1,8 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
 import { GenericConstructor } from '../shared/generic-constructor';
@@ -19,29 +23,29 @@ export class MetadataSchema extends ListableObject implements HALResource {
    * The unique identifier for this metadata schema
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * A unique prefix that defines this schema
    */
   @autoserialize
-  prefix: string;
+    prefix: string;
 
   /**
    * The namespace of this metadata schema
    */
   @autoserialize
-  namespace: string;
+    namespace: string;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 
diff --git a/src/app/core/metadata/metadata.service.spec.ts b/src/app/core/metadata/metadata.service.spec.ts
index 66d9b9921c..b48da35a8e 100644
--- a/src/app/core/metadata/metadata.service.spec.ts
+++ b/src/app/core/metadata/metadata.service.spec.ts
@@ -1,29 +1,51 @@
-import { fakeAsync, tick } from '@angular/core/testing';
-import { Meta, Title } from '@angular/platform-browser';
-import { NavigationEnd, Router } from '@angular/router';
-
-import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, of } from 'rxjs';
-
-import { RemoteData } from '../data/remote-data';
-import { Item } from '../shared/item.model';
-
-import { ItemMock, MockBitstream1, MockBitstream3 } from '../../shared/mocks/item.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { PaginatedList } from '../data/paginated-list.model';
-import { Bitstream } from '../shared/bitstream.model';
-import { MetadataValue } from '../shared/metadata.models';
-
-import { MetadataService } from './metadata.service';
-import { RootDataService } from '../data/root-data.service';
-import { Bundle } from '../shared/bundle.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { DSONameService } from '../breadcrumbs/dso-name.service';
-import { HardRedirectService } from '../services/hard-redirect.service';
+import {
+  fakeAsync,
+  tick,
+} from '@angular/core/testing';
+import {
+  Meta,
+  Title,
+} from '@angular/platform-browser';
+import {
+  NavigationEnd,
+  Router,
+} from '@angular/router';
 import { getMockStore } from '@ngrx/store/testing';
-import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { AppConfig } from '../../../config/app-config.interface';
+import {
+  ItemMock,
+  MockBitstream1,
+  MockBitstream2,
+  MockBitstream3,
+} from '../../shared/mocks/item.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { DSONameService } from '../breadcrumbs/dso-name.service';
 import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RootDataService } from '../data/root-data.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
+import { Bitstream } from '../shared/bitstream.model';
+import { Bundle } from '../shared/bundle.model';
+import { Item } from '../shared/item.model';
+import { MetadataValue } from '../shared/metadata.models';
+import {
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
+import { MetadataService } from './metadata.service';
 
 describe('MetadataService', () => {
   let metadataService: MetadataService;
@@ -44,48 +66,58 @@ describe('MetadataService', () => {
   let router: Router;
   let store;
 
-  const initialState = { 'core': { metaTag: { tagsInUse: ['title', 'description'] }}};
+  let appConfig: AppConfig;
+
+  const initialState = { 'core': { metaTag: { tagsInUse: ['title', 'description'] } } };
 
 
   beforeEach(() => {
     rootService = jasmine.createSpyObj({
-      findRoot: createSuccessfulRemoteDataObject$({ dspaceVersion: 'mock-dspace-version' })
+      findRoot: createSuccessfulRemoteDataObject$({ dspaceVersion: 'mock-dspace-version' }),
     });
     bitstreamDataService = jasmine.createSpyObj({
       findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([MockBitstream3])),
     });
     bundleDataService = jasmine.createSpyObj({
-      findByItemAndName: mockBundleRD$([MockBitstream3])
+      findByItemAndName: mockBundleRD$([MockBitstream3]),
     });
     translateService = getMockTranslateService();
     meta = jasmine.createSpyObj('meta', {
       addTag: {},
-      removeTag: {}
+      removeTag: {},
     });
     title = jasmine.createSpyObj({
-      setTitle: {}
+      setTitle: {},
     });
     dsoNameService = jasmine.createSpyObj({
-      getName: ItemMock.firstMetadataValue('dc.title')
+      getName: ItemMock.firstMetadataValue('dc.title'),
     });
     router = {
       url: '/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
       events: of(new NavigationEnd(1, '', '')),
       routerState: {
-        root: {}
-      }
+        root: {},
+      },
     } as any as Router;
     hardRedirectService = jasmine.createSpyObj( {
       getCurrentOrigin: 'https://request.org',
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     // @ts-ignore
     store = getMockStore({ initialState });
     spyOn(store, 'dispatch');
 
+    appConfig = {
+      item: {
+        bitstream: {
+          pageSize: 5,
+        },
+      },
+    } as any;
+
     metadataService = new MetadataService(
       router,
       translateService,
@@ -98,7 +130,8 @@ describe('MetadataService', () => {
       rootService,
       store,
       hardRedirectService,
-      authorizationService
+      appConfig,
+      authorizationService,
     );
   });
 
@@ -107,25 +140,25 @@ describe('MetadataService', () => {
       data: {
         value: {
           dso: createSuccessfulRemoteDataObject(ItemMock),
-        }
-      }
+        },
+      },
     });
     tick();
     expect(title.setTitle).toHaveBeenCalledWith('Test PowerPoint Document');
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_title',
-      content: 'Test PowerPoint Document'
+      content: 'Test PowerPoint Document',
     });
     expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_author', content: 'Doe, Jane' });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_publication_date',
-      content: '1650-06-26'
+      content: '1650-06-26',
     });
     expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_issn', content: '123456789' });
     expect(meta.addTag).toHaveBeenCalledWith({ name: 'citation_language', content: 'en' });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_keywords',
-      content: 'keyword1; keyword2; keyword3'
+      content: 'keyword1; keyword2; keyword3',
     });
   }));
 
@@ -134,17 +167,17 @@ describe('MetadataService', () => {
       data: {
         value: {
           dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Thesis'))),
-        }
-      }
+        },
+      },
     });
     tick();
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_dissertation_name',
-      content: 'Test PowerPoint Document'
+      content: 'Test PowerPoint Document',
     });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_pdf_url',
-      content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+      content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download',
     });
   }));
 
@@ -153,13 +186,13 @@ describe('MetadataService', () => {
       data: {
         value: {
           dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Technical Report'))),
-        }
-      }
+        },
+      },
     });
     tick();
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'citation_technical_report_institution',
-      content: 'Mock Publisher'
+      content: 'Mock Publisher',
     });
   }));
 
@@ -170,8 +203,8 @@ describe('MetadataService', () => {
         value: {
           dso: createSuccessfulRemoteDataObject(ItemMock),
           title: 'route.title.key',
-        }
-      }
+        },
+      },
     });
     tick();
     expect(title.setTitle).toHaveBeenCalledTimes(2);
@@ -185,19 +218,19 @@ describe('MetadataService', () => {
       data: {
         value: {
           title: 'Dummy Title',
-          description: 'This is a dummy item component for testing!'
-        }
-      }
+          description: 'This is a dummy item component for testing!',
+        },
+      },
     });
     tick();
     expect(title.setTitle).toHaveBeenCalledWith('DSpace :: Dummy Title');
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'title',
-      content: 'DSpace :: Dummy Title'
+      content: 'DSpace :: Dummy Title',
     });
     expect(meta.addTag).toHaveBeenCalledWith({
       name: 'description',
-      content: 'This is a dummy item component for testing!'
+      content: 'This is a dummy item component for testing!',
     });
   }));
 
@@ -214,7 +247,7 @@ describe('MetadataService', () => {
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'Generator',
-        content: 'mock-dspace-version'
+        content: 'mock-dspace-version',
       });
     }));
   });
@@ -225,13 +258,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockUri(ItemMock, 'https://ddg.gg')),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_abstract_html_url',
-        content: 'https://ddg.gg'
+        content: 'https://ddg.gg',
       });
     }));
 
@@ -240,13 +273,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockUri(ItemMock)),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_abstract_html_url',
-        content: 'https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'
+        content: 'https://request.org/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
       });
     }));
   });
@@ -257,13 +290,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Thesis'))),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_dissertation_institution',
-        content: 'Mock Publisher'
+        content: 'Mock Publisher',
       });
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_technical_report_institution' }));
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_publisher' }));
@@ -274,14 +307,14 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Technical Report'))),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_dissertation_institution' }));
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_technical_report_institution',
-        content: 'Mock Publisher'
+        content: 'Mock Publisher',
       });
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_publisher' }));
     }));
@@ -291,15 +324,15 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(mockPublisher(mockType(ItemMock, 'Some Other Type'))),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_dissertation_institution' }));
       expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_technical_report_institution' }));
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_publisher',
-        content: 'Mock Publisher'
+        content: 'Mock Publisher',
       });
     }));
   });
@@ -312,13 +345,13 @@ describe('MetadataService', () => {
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(ItemMock),
-          }
-        }
+          },
+        },
       });
       tick();
       expect(meta.addTag).toHaveBeenCalledWith({
         name: 'citation_pdf_url',
-        content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+        content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download',
       });
     }));
 
@@ -331,8 +364,8 @@ describe('MetadataService', () => {
           data: {
             value: {
               dso: createSuccessfulRemoteDataObject(ItemMock),
-            }
-          }
+            },
+          },
         });
         tick();
         expect(meta.addTag).not.toHaveBeenCalledWith(jasmine.objectContaining({ name: 'citation_pdf_url' }));
@@ -348,47 +381,84 @@ describe('MetadataService', () => {
           data: {
             value: {
               dso: createSuccessfulRemoteDataObject(ItemMock),
-            }
-          }
+            },
+          },
         });
         tick();
         expect(meta.addTag).toHaveBeenCalledWith({
           name: 'citation_pdf_url',
-          content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download'
+          content: 'https://request.org/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/download',
         });
       }));
 
-      it('should link to first Bitstream with allowed format', fakeAsync(() => {
-        const bitstreams = [MockBitstream3, MockBitstream3, MockBitstream1];
-        (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
-        (bitstreamDataService.findListByHref as jasmine.Spy).and.returnValues(
-          ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
-        );
+      describe(`when there's a bitstream with an allowed format on the first page`, () => {
+        let bitstreams;
 
-        (metadataService as any).processRouteChange({
-          data: {
-            value: {
-              dso: createSuccessfulRemoteDataObject(ItemMock),
-            }
-          }
+        beforeEach(() => {
+          bitstreams = [MockBitstream2, MockBitstream3, MockBitstream1];
+          (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
+          (bitstreamDataService.findListByHref as jasmine.Spy).and.returnValues(
+            ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
+          );
         });
-        tick();
-        expect(meta.addTag).toHaveBeenCalledWith({
-          name: 'citation_pdf_url',
-          content: 'https://request.org/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/download'
-        });
-      }));
+
+        it('should link to first Bitstream with allowed format', fakeAsync(() => {
+          (metadataService as any).processRouteChange({
+            data: {
+              value: {
+                dso: createSuccessfulRemoteDataObject(ItemMock),
+              },
+            },
+          });
+          tick();
+          expect(meta.addTag).toHaveBeenCalledWith({
+            name: 'citation_pdf_url',
+            content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download',
+          });
+        }));
+
+      });
+
     });
   });
 
+  describe(`when there's no bitstream with an allowed format on the first page`, () => {
+    let bitstreams;
+
+    beforeEach(() => {
+      bitstreams = [MockBitstream1, MockBitstream3, MockBitstream2];
+      (bundleDataService.findByItemAndName as jasmine.Spy).and.returnValue(mockBundleRD$(bitstreams));
+      (bitstreamDataService.findListByHref as jasmine.Spy).and.returnValues(
+        ...mockBitstreamPages$(bitstreams).map(bp => createSuccessfulRemoteDataObject$(bp)),
+      );
+    });
+
+    it(`shouldn't add a citation_pdf_url meta tag`, fakeAsync(() => {
+      (metadataService as any).processRouteChange({
+        data: {
+          value: {
+            dso: createSuccessfulRemoteDataObject(ItemMock),
+          },
+        },
+      });
+      tick();
+      expect(meta.addTag).not.toHaveBeenCalledWith({
+        name: 'citation_pdf_url',
+        content: 'https://request.org/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/download',
+      });
+    }));
+
+  });
+
+
   describe('tagstore', () => {
     beforeEach(fakeAsync(() => {
       (metadataService as any).processRouteChange({
         data: {
           value: {
             dso: createSuccessfulRemoteDataObject(ItemMock),
-          }
-        }
+          },
+        },
       });
       tick();
     }));
@@ -416,8 +486,8 @@ describe('MetadataService', () => {
     publishedMockItem.metadata['dc.publisher'] = [
       {
         language: 'en_US',
-        value: 'Mock Publisher'
-      }
+        value: 'Mock Publisher',
+      },
     ] as MetadataValue[];
     return publishedMockItem;
   };
@@ -434,7 +504,7 @@ describe('MetadataService', () => {
         name: 'ORIGINAL',
         bitstreams: createSuccessfulRemoteDataObject$(mockBitstreamPages$(bitstreams)[0]),
         primaryBitstream: createSuccessfulRemoteDataObject$(primary),
-      })
+      }),
     );
   };
 
@@ -444,8 +514,8 @@ describe('MetadataService', () => {
         totalElements: bitstreams.length,       // announce multiple elements/pages
       },
       _links: index < bitstreams.length - 1
-        ? { next: { href: 'not empty' }}        // fake link to the next bitstream page
-        : { next: { href: undefined }},         // last page has no link
+        ? { next: { href: 'not empty' } }        // fake link to the next bitstream page
+        : { next: { href: undefined } },         // last page has no link
     }));
   };
 });
diff --git a/src/app/core/metadata/metadata.service.ts b/src/app/core/metadata/metadata.service.ts
index 9d5ee80bba..7c99d917f0 100644
--- a/src/app/core/metadata/metadata.service.ts
+++ b/src/app/core/metadata/metadata.service.ts
@@ -1,49 +1,84 @@
-import { Injectable } from '@angular/core';
-
-import { Meta, MetaDefinition, Title } from '@angular/platform-browser';
-import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
-
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Meta,
+  MetaDefinition,
+  Title,
+} from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  concat as observableConcat,
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, combineLatest, EMPTY, Observable, of as observableOf } from 'rxjs';
-import { expand, filter, map, switchMap, take } from 'rxjs/operators';
-
-import { hasNoValue, hasValue } from '../../shared/empty.util';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { getBitstreamDownloadRoute } from '../../app-routing-paths';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { DSONameService } from '../breadcrumbs/dso-name.service';
+import { coreSelector } from '../core.selectors';
+import { CoreState } from '../core-state.model';
 import { BitstreamDataService } from '../data/bitstream-data.service';
 import { BitstreamFormatDataService } from '../data/bitstream-format-data.service';
-
+import { BundleDataService } from '../data/bundle-data.service';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { RootDataService } from '../data/root-data.service';
+import { HardRedirectService } from '../services/hard-redirect.service';
 import { Bitstream } from '../shared/bitstream.model';
+import { getDownloadableBitstream } from '../shared/bitstream.operators';
+import { BitstreamFormat } from '../shared/bitstream-format.model';
+import { Bundle } from '../shared/bundle.model';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { Item } from '../shared/item.model';
 import {
   getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
+  getFirstSucceededRemoteDataPayload,
 } from '../shared/operators';
-import { RootDataService } from '../data/root-data.service';
-import { getBitstreamDownloadRoute } from '../../app-routing-paths';
-import { BundleDataService } from '../data/bundle-data.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { Bundle } from '../shared/bundle.model';
-import { PaginatedList } from '../data/paginated-list.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { HardRedirectService } from '../services/hard-redirect.service';
+import {
+  AddMetaTagAction,
+  ClearMetaTagAction,
+} from './meta-tag.actions';
 import { MetaTagState } from './meta-tag.reducer';
-import { createSelector, select, Store } from '@ngrx/store';
-import { AddMetaTagAction, ClearMetaTagAction } from './meta-tag.actions';
-import { coreSelector } from '../core.selectors';
-import { CoreState } from '../core-state.model';
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
-import { getDownloadableBitstream } from '../shared/bitstream.operators';
 
 /**
  * The base selector function to select the metaTag section in the store
  */
 const metaTagSelector = createSelector(
   coreSelector,
-  (state: CoreState) => state.metaTag
+  (state: CoreState) => state.metaTag,
 );
 
 /**
@@ -87,7 +122,8 @@ export class MetadataService {
     private rootService: RootDataService,
     private store: Store<CoreState>,
     private hardRedirectService: HardRedirectService,
-    private authorizationService: AuthorizationDataService
+    @Inject(APP_CONFIG) private appConfig: AppConfig,
+    private authorizationService: AuthorizationDataService,
   ) {
   }
 
@@ -298,7 +334,13 @@ export class MetadataService {
         true,
         true,
         followLink('primaryBitstream'),
-        followLink('bitstreams', {}, followLink('format')),
+        followLink('bitstreams', {
+          findListOptions: {
+            // limit the number of bitstreams used to find the citation pdf url to the number
+            // shown by default on an item page
+            elementsPerPage: this.appConfig.item.bitstream.pageSize,
+          },
+        }, followLink('format')),
       ).pipe(
         getFirstSucceededRemoteDataPayload(),
         switchMap((bundle: Bundle) =>
@@ -314,8 +356,8 @@ export class MetadataService {
             }),
             getDownloadableBitstream(this.authorizationService),
             // return the bundle as well so we can use it again if there's no primary bitstream
-            map((bitstream: Bitstream) => [bundle, bitstream])
-          )
+            map((bitstream: Bitstream) => [bundle, bitstream]),
+          ),
         ),
         switchMap(([bundle, primaryBitstream]: [Bundle, Bitstream]) => {
           if (hasValue(primaryBitstream)) {
@@ -333,16 +375,16 @@ export class MetadataService {
                   // Otherwise check all bitstreams to see if one matches the format whitelist
                   return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
                 }
-              })
+              }),
             );
           }
         }),
-        take(1)
+        take(1),
       ).subscribe((link: string) => {
         // Use the found link to set the <meta> tag
         this.addMetaTag(
           'citation_pdf_url',
-          new URLCombiner(this.hardRedirectService.getCurrentOrigin(), link).toString()
+          new URLCombiner(this.hardRedirectService.getCurrentOrigin(), link).toString(),
         );
       });
     }
@@ -358,69 +400,50 @@ export class MetadataService {
           // Otherwise check all bitstreams to see if one matches the format whitelist
           return this.getFirstAllowedFormatBitstreamLink(bitstreamRd);
         }
-      })
+      }),
     );
   }
 
   /**
-   * For Items with more than one Bitstream (and no primary Bitstream), link to the first Bitstream with a MIME type
+   * For Items with more than one Bitstream (and no primary Bitstream), link to the first Bitstream
+   * with a MIME type.
+   *
+   * Note this will only check the current page (page size determined item.bitstream.pageSize in the
+   * config) of bitstreams for performance reasons.
+   * See https://github.com/DSpace/DSpace/issues/8648 for more info
+   *
    * included in {@linkcode CITATION_PDF_URL_MIMETYPES}
    * @param bitstreamRd
    * @private
    */
   private getFirstAllowedFormatBitstreamLink(bitstreamRd: RemoteData<PaginatedList<Bitstream>>): Observable<string> {
-    return observableOf(bitstreamRd.payload).pipe(
-      // Because there can be more than one page of bitstreams, this expand operator
-      // will retrieve them in turn. Due to the take(1) at the bottom, it will only
-      // retrieve pages until a match is found
-      expand((paginatedList: PaginatedList<Bitstream>) => {
-        if (hasNoValue(paginatedList.next)) {
-          // If there's no next page, stop.
-          return EMPTY;
-        } else {
-          // Otherwise retrieve the next page
-          return this.bitstreamDataService.findListByHref(
-            paginatedList.next,
-            undefined,
-            true,
-            true,
-            followLink('format')
-          ).pipe(
-            getFirstCompletedRemoteData(),
-            map((next: RemoteData<PaginatedList<Bitstream>>) => {
-              if (hasValue(next.payload)) {
-                return next.payload;
-              } else {
-                return EMPTY;
-              }
-            })
-          );
-        }
-      }),
-      // Return the array of bitstreams inside each paginated list
-      map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
-      // Emit the bitstreams in the list one at a time
-      switchMap((bitstreams: Bitstream[]) => bitstreams),
-      // Retrieve the format for each bitstream
-      switchMap((bitstream: Bitstream) => bitstream.format.pipe(
-        getFirstSucceededRemoteDataPayload(),
-        // Keep the original bitstream, because it, not the format, is what we'll need
-        // for the link at the end
-        map((format: BitstreamFormat) => [bitstream, format])
-      )),
-      // Check if bitstream downloadable
-      switchMap(([bitstream, format]: [Bitstream, BitstreamFormat]) => observableOf(bitstream).pipe(
-        getDownloadableBitstream(this.authorizationService),
-        map((bit: Bitstream) => [bit, format])
-      )),
-      // Filter out only pairs with whitelisted formats and non-null bitstreams, null from download check
-      filter(([bitstream, format]: [Bitstream, BitstreamFormat]) =>
-        hasValue(format) && hasValue(bitstream) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
-      // We only need 1
-      take(1),
-      // Emit the link of the match
-      map(([bitstream, ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream))
-    );
+    if (hasValue(bitstreamRd.payload) && isNotEmpty(bitstreamRd.payload.page)) {
+      // Retrieve the formats of all bitstreams in the page sequentially
+      return observableConcat(
+        ...bitstreamRd.payload.page.map((bitstream: Bitstream) => bitstream.format.pipe(
+          getFirstSucceededRemoteDataPayload(),
+          // Keep the original bitstream, because it, not the format, is what we'll need
+          // for the link at the end
+          map((format: BitstreamFormat) => [bitstream, format]),
+        )),
+      ).pipe(
+        // Verify that the bitstream is downloadable
+        mergeMap(([bitstream, format]: [Bitstream, BitstreamFormat]) => observableOf(bitstream).pipe(
+          getDownloadableBitstream(this.authorizationService),
+          map((bit: Bitstream) => [bit, format]),
+        )),
+        // Filter out only pairs with whitelisted formats and non-null bitstreams, null from download check
+        filter(([bitstream, format]: [Bitstream, BitstreamFormat]) =>
+          hasValue(format) && hasValue(bitstream) && this.CITATION_PDF_URL_MIMETYPES.includes(format.mimetype)),
+        // We only need 1
+        take(1),
+        // Emit the link of the match
+        // tap((v) => console.log('result', v)),
+        map(([bitstream ]: [Bitstream, BitstreamFormat]) => getBitstreamDownloadRoute(bitstream)),
+      );
+    } else {
+      return EMPTY;
+    }
   }
 
   /**
@@ -493,7 +516,7 @@ export class MetadataService {
   public clearMetaTags() {
     this.store.pipe(
       select(tagsInUseSelector),
-      take(1)
+      take(1),
     ).subscribe((tagsInUse: string[]) => {
       for (const name of tagsInUse) {
         this.meta.removeTag('name=\'' + name + '\'');
diff --git a/src/app/core/notifications/models/suggestion-objects.resource-type.ts b/src/app/core/notifications/models/suggestion-objects.resource-type.ts
new file mode 100644
index 0000000000..8f83d86376
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-objects.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for the Suggestion object
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUGGESTION = new ResourceType('suggestion');
diff --git a/src/app/core/notifications/models/suggestion-source-object.resource-type.ts b/src/app/core/notifications/models/suggestion-source-object.resource-type.ts
new file mode 100644
index 0000000000..e319ed5109
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-source-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for the Suggestion Source object
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUGGESTION_SOURCE = new ResourceType('suggestionsource');
diff --git a/src/app/core/notifications/models/suggestion-source.model.ts b/src/app/core/notifications/models/suggestion-source.model.ts
new file mode 100644
index 0000000000..f8e7c70cf5
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-source.model.ts
@@ -0,0 +1,50 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUGGESTION_SOURCE } from './suggestion-source-object.resource-type';
+
+/**
+ * The interface representing the Suggestion Source model
+ */
+@typedObject
+export class SuggestionSource implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = SUGGESTION_SOURCE;
+
+  /**
+   * The Suggestion Target id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The total number of suggestions provided by Suggestion Target for
+   */
+  @autoserialize
+    total: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    suggestiontargets: HALLink
+  };
+}
diff --git a/src/app/core/notifications/models/suggestion-target-object.resource-type.ts b/src/app/core/notifications/models/suggestion-target-object.resource-type.ts
new file mode 100644
index 0000000000..81b1b5c261
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-target-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for the Suggestion Target object
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUGGESTION_TARGET = new ResourceType('suggestiontarget');
diff --git a/src/app/core/notifications/models/suggestion-target.model.ts b/src/app/core/notifications/models/suggestion-target.model.ts
new file mode 100644
index 0000000000..1cbd78ae6b
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion-target.model.ts
@@ -0,0 +1,63 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUGGESTION_TARGET } from './suggestion-target-object.resource-type';
+
+/**
+ * The interface representing the Suggestion Target model
+ */
+@typedObject
+export class SuggestionTarget implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = SUGGESTION_TARGET;
+
+  /**
+   * The Suggestion Target id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The Suggestion Target name to display
+   */
+  @autoserialize
+    display: string;
+
+  /**
+   * The Suggestion Target source to display
+   */
+  @autoserialize
+    source: string;
+
+  /**
+   * The total number of suggestions provided by Suggestion Target for
+   */
+  @autoserialize
+    total: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    suggestions: HALLink,
+    target: HALLink
+  };
+}
diff --git a/src/app/core/notifications/models/suggestion.model.ts b/src/app/core/notifications/models/suggestion.model.ts
new file mode 100644
index 0000000000..a84fe9ffe2
--- /dev/null
+++ b/src/app/core/notifications/models/suggestion.model.ts
@@ -0,0 +1,95 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import {
+  MetadataMap,
+  MetadataMapSerializer,
+} from '../../shared/metadata.models';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUGGESTION } from './suggestion-objects.resource-type';
+
+/**
+ * The interface representing Suggestion Evidences such as scores (authorScore, datescore)
+ */
+export interface SuggestionEvidences {
+  [sectionId: string]: {
+    score: string;
+    notes: string
+  };
+}
+/**
+ * The interface representing the Suggestion Source model
+ */
+@typedObject
+export class Suggestion implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = SUGGESTION;
+
+  /**
+   * The Suggestion id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The Suggestion name to display
+   */
+  @autoserialize
+    display: string;
+
+  /**
+   * The Suggestion source to display
+   */
+  @autoserialize
+    source: string;
+
+  /**
+   * The Suggestion external source uri
+   */
+  @autoserialize
+    externalSourceUri: string;
+
+  /**
+   * The Total Score of the suggestion
+   */
+  @autoserialize
+    score: string;
+
+  /**
+   * The total number of suggestions provided by Suggestion Target for
+   */
+  @autoserialize
+    evidences: SuggestionEvidences;
+
+  /**
+   * All metadata of this suggestion object
+   */
+  @excludeFromEquals
+  @autoserializeAs(MetadataMapSerializer)
+    metadata: MetadataMap;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    target: HALLink
+  };
+}
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts
new file mode 100644
index 0000000000..847eea7c7e
--- /dev/null
+++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.spec.ts
@@ -0,0 +1,250 @@
+import { HttpClient } from '@angular/common/http';
+import { ReplaceOperation } from 'fast-json-patch';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  qualityAssuranceEventObjectMissingPid,
+  qualityAssuranceEventObjectMissingPid2,
+  qualityAssuranceEventObjectMissingProjectFound,
+} from '../../../../shared/mocks/notifications.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { RestResponse } from '../../../cache/response.models';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { buildPaginatedList } from '../../../data/paginated-list.model';
+import { RequestService } from '../../../data/request.service';
+import { RequestEntry } from '../../../data/request-entry.model';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { PageInfo } from '../../../shared/page-info.model';
+import { QualityAssuranceEventDataService } from './quality-assurance-event-data.service';
+
+describe('QualityAssuranceEventDataService', () => {
+  let scheduler: TestScheduler;
+  let service: QualityAssuranceEventDataService;
+  let serviceASAny: any;
+  let responseCacheEntry: RequestEntry;
+  let responseCacheEntryB: RequestEntry;
+  let responseCacheEntryC: RequestEntry;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: any;
+
+  const endpointURL = 'https://rest.api/rest/api/integration/qualityassurancetopics';
+  const requestUUID = '8b3c913a-5a4b-438b-9181-be1a5b4a1c8a';
+  const topic = 'ENRICH!MORE!PID';
+
+  const pageInfo = new PageInfo();
+  const array = [qualityAssuranceEventObjectMissingPid, qualityAssuranceEventObjectMissingPid2];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const qaEventObjectRD = createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingPid);
+  const qaEventObjectMissingProjectRD = createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingProjectFound);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  const status = 'ACCEPTED';
+  const operation: ReplaceOperation<string>[] = [
+    {
+      path: '/status',
+      op: 'replace',
+      value: status,
+    },
+  ];
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: jasmine.createSpy('getByHref'),
+      getByUUID: jasmine.createSpy('getByUUID'),
+    });
+
+    responseCacheEntryB = new RequestEntry();
+    responseCacheEntryB.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntryB.response = new RestResponse(true, 201, 'Created');
+
+    responseCacheEntryC = new RequestEntry();
+    responseCacheEntryC.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntryC.response = new RestResponse(true, 204, 'No Content');
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('(a)', {
+        a: qaEventObjectRD,
+      }),
+      buildList: cold('(a)', {
+        a: paginatedListRD,
+      }),
+      buildFromRequestUUID: jasmine.createSpy('buildFromRequestUUID'),
+      buildFromRequestUUIDAndAwait: jasmine.createSpy('buildFromRequestUUIDAndAwait'),
+    });
+
+    objectCache = new ObjectCacheServiceStub();
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a|', { a: endpointURL }),
+    });
+
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = {} as any;
+
+    service = new QualityAssuranceEventDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+      comparator,
+    );
+
+    serviceASAny = service;
+
+    spyOn(serviceASAny.searchData, 'searchBy').and.callThrough();
+    spyOn(serviceASAny, 'findById').and.callThrough();
+    spyOn(serviceASAny.patchData, 'patch').and.callThrough();
+    spyOn(serviceASAny, 'postOnRelated').and.callThrough();
+    spyOn(serviceASAny, 'deleteOnRelated').and.callThrough();
+  });
+
+  describe('getEventsByTopic', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectRD));
+    });
+
+    it('should proxy the call to searchData.searchBy', () => {
+      const options: FindListOptions = {
+        searchParams: [
+          {
+            fieldName: 'topic',
+            fieldValue: topic,
+          },
+        ],
+      };
+      service.getEventsByTopic(topic);
+      expect(serviceASAny.searchData.searchBy).toHaveBeenCalledWith('findByTopic', options, true, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<QualityAssuranceEventObject>> for the object with the given Topic', () => {
+      const result = service.getEventsByTopic(topic);
+      const expected = cold('(a)', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getEvent', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectRD));
+    });
+
+    it('should call findById', () => {
+      service.getEvent(qualityAssuranceEventObjectMissingPid.id).subscribe(
+        (res) => {
+          expect(serviceASAny.findById).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingPid.id, true, true);
+        },
+      );
+    });
+
+    it('should return a RemoteData for the object with the given URL', () => {
+      const result = service.getEvent(qualityAssuranceEventObjectMissingPid.id);
+      const expected = cold('(a)', {
+        a: qaEventObjectRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('patchEvent', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntry));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectRD));
+      serviceASAny.rdbService.buildFromRequestUUIDAndAwait.and.returnValue(observableOf(qaEventObjectRD));
+    });
+
+    it('should proxy the call to patchData.patch', () => {
+      service.patchEvent(status, qualityAssuranceEventObjectMissingPid).subscribe(
+        (res) => {
+          expect(serviceASAny.patchData.patch).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingPid, operation);
+        },
+      );
+    });
+
+    it('should return a RemoteData with HTTP 200', () => {
+      const result = service.patchEvent(status, qualityAssuranceEventObjectMissingPid);
+      const expected = cold('(a|)', {
+        a: createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingPid),
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('boundProject', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntryB));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntryB));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(qaEventObjectMissingProjectRD));
+    });
+
+    it('should call postOnRelated', () => {
+      service.boundProject(qualityAssuranceEventObjectMissingProjectFound.id, requestUUID).subscribe(
+        (res) => {
+          expect(serviceASAny.postOnRelated).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingProjectFound.id, requestUUID);
+        },
+      );
+    });
+
+    it('should return a RestResponse with HTTP 201', () => {
+      const result = service.boundProject(qualityAssuranceEventObjectMissingProjectFound.id, requestUUID);
+      const expected = cold('(a|)', {
+        a: createSuccessfulRemoteDataObject(qualityAssuranceEventObjectMissingProjectFound),
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('removeProject', () => {
+    beforeEach(() => {
+      serviceASAny.requestService.getByHref.and.returnValue(observableOf(responseCacheEntryC));
+      serviceASAny.requestService.getByUUID.and.returnValue(observableOf(responseCacheEntryC));
+      serviceASAny.rdbService.buildFromRequestUUID.and.returnValue(observableOf(createSuccessfulRemoteDataObject({})));
+    });
+
+    it('should call deleteOnRelated', () => {
+      service.removeProject(qualityAssuranceEventObjectMissingProjectFound.id).subscribe(
+        (res) => {
+          expect(serviceASAny.deleteOnRelated).toHaveBeenCalledWith(qualityAssuranceEventObjectMissingProjectFound.id);
+        },
+      );
+    });
+
+    it('should return a RestResponse with HTTP 204', () => {
+      const result = service.removeProject(qualityAssuranceEventObjectMissingProjectFound.id);
+      const expected = cold('(a|)', {
+        a: createSuccessfulRemoteDataObject({}),
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
new file mode 100644
index 0000000000..8c299b83ce
--- /dev/null
+++ b/src/app/core/notifications/qa/events/quality-assurance-event-data.service.ts
@@ -0,0 +1,271 @@
+import {
+  HttpHeaders,
+  HttpParams,
+} from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { ReplaceOperation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import {
+  find,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { QualityAssuranceEventData } from '../../../../notifications/qa/project-entry-import-modal/project-entry-import-modal.component';
+import { hasValue } from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../../../data/base/create-data';
+import { dataService } from '../../../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../../../data/base/delete-data';
+import { IdentifiableDataService } from '../../../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../../../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../../../data/default-change-analyzer.service';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import {
+  DeleteByIDRequest,
+  PostRequest,
+} from '../../../data/request.models';
+import { RequestService } from '../../../data/request.service';
+import { HttpOptions } from '../../../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { NoContent } from '../../../shared/NoContent.model';
+import { QualityAssuranceEventObject } from '../models/quality-assurance-event.model';
+import { QUALITY_ASSURANCE_EVENT_OBJECT } from '../models/quality-assurance-event-object.resource-type';
+
+/**
+ * The service handling all Quality Assurance topic REST requests.
+ */
+@Injectable()
+@dataService(QUALITY_ASSURANCE_EVENT_OBJECT)
+export class QualityAssuranceEventDataService extends IdentifiableDataService<QualityAssuranceEventObject> {
+
+  private createData: CreateData<QualityAssuranceEventObject>;
+  private searchData: SearchData<QualityAssuranceEventObject>;
+  private patchData: PatchData<QualityAssuranceEventObject>;
+  private deleteData: DeleteData<QualityAssuranceEventObject>;
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   * @param {DefaultChangeAnalyzer<QualityAssuranceEventObject>} comparator
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected comparator: DefaultChangeAnalyzer<QualityAssuranceEventObject>,
+  ) {
+    super('qualityassuranceevents', requestService, rdbService, objectCache, halService);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl<QualityAssuranceEventObject>(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Return the list of Quality Assurance events by topic.
+   *
+   * @param topic
+   *    The Quality Assurance topic
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<QualityAssuranceEventObject>>>
+   *    The list of Quality Assurance events.
+   */
+  public getEventsByTopic(topic: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<QualityAssuranceEventObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceEventObject>>> {
+    options.searchParams = [
+      {
+        fieldName: 'topic',
+        fieldValue: topic,
+      },
+    ];
+    return this.searchData.searchBy('findByTopic', options, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Service for retrieving Quality Assurance events by topic and target.
+   * @param options (Optional) The search options to use when retrieving the events.
+   * @param linksToFollow (Optional) The links to follow when retrieving the events.
+   * @returns An observable of the remote data containing the paginated list of Quality Assurance events.
+   */
+  public searchEventsByTopic(options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<QualityAssuranceEventObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceEventObject>>> {
+    return this.searchData.searchBy('findByTopic', options, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Clear findByTopic requests from cache
+   */
+  public clearFindByTopicRequests() {
+    this.requestService.setStaleByHrefSubstring('findByTopic');
+  }
+
+  /**
+   * Return a single Quality Assurance event.
+   *
+   * @param id
+   *    The Quality Assurance event id
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
+   * @return Observable<RemoteData<QualityAssuranceEventObject>>
+   *    The Quality Assurance event.
+   */
+  public getEvent(id: string, ...linksToFollow: FollowLinkConfig<QualityAssuranceEventObject>[]): Observable<RemoteData<QualityAssuranceEventObject>> {
+    return this.findById(id, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Save the new status of a Quality Assurance event.
+   *
+   * @param status
+   *    The new status
+   * @param dso QualityAssuranceEventObject
+   *    The event item
+   * @param reason
+   *    The optional reason (not used for now; for future implementation)
+   * @return Observable<RestResponse>
+   *    The REST response.
+   */
+  public patchEvent(status, dso, reason?: string): Observable<RemoteData<QualityAssuranceEventObject>> {
+    const operation: ReplaceOperation<string>[] = [
+      {
+        path: '/status',
+        op: 'replace',
+        value: status,
+      },
+    ];
+    return this.patchData.patch(dso, operation);
+  }
+
+  /**
+   * Bound a project to a Quality Assurance event publication.
+   *
+   * @param itemId
+   *    The Id of the Quality Assurance event
+   * @param projectId
+   *    The project Id to bound
+   * @return Observable<RestResponse>
+   *    The REST response.
+   */
+  public boundProject(itemId: string, projectId: string): Observable<RemoteData<QualityAssuranceEventObject>> {
+    return this.postOnRelated(itemId, projectId);
+  }
+
+  /**
+   * Remove a project from a Quality Assurance event publication.
+   *
+   * @param itemId
+   *    The Id of the Quality Assurance event
+   * @return Observable<RestResponse>
+   *    The REST response.
+   */
+  public removeProject(itemId: string): Observable<RemoteData<NoContent>> {
+    return this.deleteOnRelated(itemId);
+  }
+
+  /**
+   * Perform a delete operation on an endpoint related item. Ex.: endpoint/<itemId>/related
+   * @param objectId The item id
+   * @return the RestResponse as an Observable
+   */
+  private deleteOnRelated(objectId: string): Observable<RemoteData<NoContent>> {
+    const requestId = this.requestService.generateRequestId();
+
+    const hrefObs = this.getIDHrefObs(objectId);
+
+    hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+    ).subscribe((href: string) => {
+      const request = new DeleteByIDRequest(requestId, href + '/related', objectId);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUID<QualityAssuranceEventObject>(requestId);
+  }
+
+  /**
+   * Perform a post on an endpoint related item with ID. Ex.: endpoint/<itemId>/related?item=<relatedItemId>
+   * @param objectId The item id
+   * @param relatedItemId The related item Id
+   * @param body The optional POST body
+   * @return the RestResponse as an Observable
+   */
+  private postOnRelated(objectId: string, relatedItemId: string, body?: any) {
+    const requestId = this.requestService.generateRequestId();
+    const hrefObs = this.getIDHrefObs(objectId);
+
+    hrefObs.pipe(
+      take(1),
+    ).subscribe((href: string) => {
+      const request = new PostRequest(requestId, href + '/related?item=' + relatedItemId, body);
+      if (hasValue(this.responseMsToLive)) {
+        request.responseMsToLive = this.responseMsToLive;
+      }
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUID<QualityAssuranceEventObject>(requestId);
+  }
+
+  /**
+   * Perform a post on an endpoint related to correction type
+   * @param data the data to post
+   * @returns the RestResponse as an Observable
+   */
+  postData(target: string, correctionType: string, related: string, reason: string): Observable<RemoteData<QualityAssuranceEventObject>> {
+    const requestId = this.requestService.generateRequestId();
+    const href$ = this.getBrowseEndpoint();
+
+    return href$.pipe(
+      switchMap((href: string) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'application/json');
+        options.headers = headers;
+        let params = new HttpParams();
+        params = params.append('target', target)
+          .append('correctionType', correctionType);
+        options.params = params;
+        const request = new PostRequest(requestId, href, { 'reason': reason } , options);
+        if (hasValue(this.responseMsToLive)) {
+          request.responseMsToLive = this.responseMsToLive;
+        }
+        this.requestService.send(request);
+        return this.rdbService.buildFromRequestUUID<QualityAssuranceEventObject>(requestId);
+      }),
+    );
+  }
+
+  public deleteQAEvent(qaEvent: QualityAssuranceEventData): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(qaEvent.id);
+  }
+
+}
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
new file mode 100644
index 0000000000..84aff6ba2c
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-event-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for the Quality Assurance event
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const QUALITY_ASSURANCE_EVENT_OBJECT = new ResourceType('qualityassuranceevent');
diff --git a/src/app/core/notifications/qa/models/quality-assurance-event.model.ts b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
new file mode 100644
index 0000000000..9210d8f6f9
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-event.model.ts
@@ -0,0 +1,181 @@
+/* eslint-disable max-classes-per-file */
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { RemoteData } from '../../../data/remote-data';
+import { HALLink } from '../../../shared/hal-link.model';
+import { Item } from '../../../shared/item.model';
+import { ITEM } from '../../../shared/item.resource-type';
+import { ResourceType } from '../../../shared/resource-type';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { QUALITY_ASSURANCE_EVENT_OBJECT } from './quality-assurance-event-object.resource-type';
+
+/**
+ * The interface representing the Quality Assurance event message
+ */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface QualityAssuranceEventMessageObject {
+
+}
+
+/**
+ * The interface representing the Quality Assurance event message
+ */
+export interface SourceQualityAssuranceEventMessageObject {
+  /**
+   * The type of 'value'
+   */
+  type: string;
+
+  reason: string;
+
+  /**
+   * The value suggested by Notifications
+   */
+  value: string;
+
+  /**
+   * The abstract suggested by Notifications
+   */
+  abstract: string;
+
+  /**
+   * The project acronym suggested by Notifications
+   */
+  acronym: string;
+
+  /**
+   * The project code suggested by Notifications
+   */
+  code: string;
+
+  /**
+   * The project funder suggested by Notifications
+   */
+  funder: string;
+
+  /**
+   * The project program suggested by Notifications
+   */
+  fundingProgram?: string;
+
+  /**
+   * The project jurisdiction suggested by Notifications
+   */
+  jurisdiction: string;
+
+  /**
+   * The project title suggested by Notifications
+   */
+  title: string;
+
+  /**
+   * The Source ID.
+   */
+  sourceId: string;
+
+  /**
+   * The PID href.
+   */
+  pidHref: string;
+
+}
+
+/**
+ * The interface representing the Quality Assurance event model
+ */
+@typedObject
+export class QualityAssuranceEventObject implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = QUALITY_ASSURANCE_EVENT_OBJECT;
+
+  /**
+   * The Quality Assurance event uuid inside DSpace
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The universally unique identifier of this Quality Assurance event
+   */
+  @autoserializeAs(String, 'id')
+    uuid: string;
+
+  /**
+   * The Quality Assurance event original id (ex.: the source archive OAI-PMH identifier)
+   */
+  @autoserialize
+    originalId: string;
+
+  /**
+   * The title of the article to which the suggestion refers
+   */
+  @autoserialize
+    title: string;
+
+  /**
+   * Reliability of the suggestion (of the data inside 'message')
+   */
+  @autoserialize
+    trust: number;
+
+  /**
+   * The timestamp Quality Assurance event was saved in DSpace
+   */
+  @autoserialize
+    eventDate: string;
+
+  /**
+   * The Quality Assurance event status (ACCEPTED, REJECTED, DISCARDED, PENDING)
+   */
+  @autoserialize
+    status: string;
+
+  /**
+   * The suggestion data. Data may vary depending on the source
+   */
+  @autoserialize
+    message: SourceQualityAssuranceEventMessageObject;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+    target: HALLink,
+    related: HALLink
+  };
+
+  /**
+   * The related publication DSpace item
+   * Will be undefined unless the {@item HALLink} has been resolved.
+   */
+  @link(ITEM)
+    target?: Observable<RemoteData<Item>>;
+
+  /**
+   * The related project for this Event
+   * Will be undefined unless the {@related HALLink} has been resolved.
+   */
+  @link(ITEM)
+    related?: Observable<RemoteData<Item>>;
+}
diff --git a/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
new file mode 100644
index 0000000000..b4f64b24d1
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-source-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for the Quality Assurance source
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const QUALITY_ASSURANCE_SOURCE_OBJECT = new ResourceType('qualityassurancesource');
diff --git a/src/app/core/notifications/qa/models/quality-assurance-source.model.ts b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts
new file mode 100644
index 0000000000..cc5f874119
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-source.model.ts
@@ -0,0 +1,55 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { HALLink } from '../../../shared/hal-link.model';
+import { ResourceType } from '../../../shared/resource-type';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { QUALITY_ASSURANCE_SOURCE_OBJECT } from './quality-assurance-source-object.resource-type';
+
+/**
+ * The interface representing the Quality Assurance source model
+ */
+@typedObject
+export class QualityAssuranceSourceObject implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = QUALITY_ASSURANCE_SOURCE_OBJECT;
+
+  /**
+   * The Quality Assurance source id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The date of the last udate from Notifications
+   */
+  @autoserialize
+    lastEvent: string;
+
+  /**
+   * The total number of suggestions provided by Notifications for this source
+   */
+  @autoserialize
+    totalEvents: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
new file mode 100644
index 0000000000..e9fc57a307
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-topic-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../shared/resource-type';
+
+/**
+ * The resource type for the Quality Assurance topic
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const QUALITY_ASSURANCE_TOPIC_OBJECT = new ResourceType('qualityassurancetopic');
diff --git a/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
new file mode 100644
index 0000000000..ddc027d194
--- /dev/null
+++ b/src/app/core/notifications/qa/models/quality-assurance-topic.model.ts
@@ -0,0 +1,61 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { HALLink } from '../../../shared/hal-link.model';
+import { ResourceType } from '../../../shared/resource-type';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { QUALITY_ASSURANCE_TOPIC_OBJECT } from './quality-assurance-topic-object.resource-type';
+
+/**
+ * The interface representing the Quality Assurance topic model
+ */
+@typedObject
+export class QualityAssuranceTopicObject implements CacheableObject {
+  /**
+   * A string representing the kind of object, e.g. community, item, …
+   */
+  static type = QUALITY_ASSURANCE_TOPIC_OBJECT;
+
+  /**
+   * The Quality Assurance topic id
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The Quality Assurance topic name to display
+   */
+  @autoserialize
+    name: string;
+
+  /**
+   * The date of the last udate from Notifications
+   */
+  @autoserialize
+    lastEvent: string;
+
+  /**
+   * The total number of suggestions provided by Notifications for this topic
+   */
+  @autoserialize
+    totalEvents: number;
+
+  /**
+   * The type of this ConfigObject
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The links to all related resources returned by the rest api.
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts
new file mode 100644
index 0000000000..0fca119e8b
--- /dev/null
+++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.spec.ts
@@ -0,0 +1,128 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../../shared/mocks/notifications.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { RestResponse } from '../../../cache/response.models';
+import { buildPaginatedList } from '../../../data/paginated-list.model';
+import { RequestService } from '../../../data/request.service';
+import { RequestEntry } from '../../../data/request-entry.model';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { PageInfo } from '../../../shared/page-info.model';
+import { QualityAssuranceSourceDataService } from './quality-assurance-source-data.service';
+
+describe('QualityAssuranceSourceDataService', () => {
+  let scheduler: TestScheduler;
+  let service: QualityAssuranceSourceDataService;
+  let responseCacheEntry: RequestEntry;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: any;
+
+  const endpointURL = 'https://rest.api/rest/api/integration/qualityassurancesources';
+  const requestUUID = '8b3c913a-5a4b-438b-9181-be1a5b4a1c8a';
+
+  const pageInfo = new PageInfo();
+  const array = [qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const qaSourceObjectRD = createSuccessfulRemoteDataObject(qualityAssuranceSourceObjectMorePid);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('(a)', {
+        a: qaSourceObjectRD,
+      }),
+      buildList: cold('(a)', {
+        a: paginatedListRD,
+      }),
+    });
+
+    objectCache = new ObjectCacheServiceStub();
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a|', { a: endpointURL }),
+    });
+
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = {} as any;
+
+    service = new QualityAssuranceSourceDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+    );
+
+    spyOn((service as any).findAllData, 'findAll').and.callThrough();
+    spyOn((service as any), 'findById').and.callThrough();
+  });
+
+  describe('getSources', () => {
+    it('should call findAll', (done) => {
+      service.getSources().subscribe(
+        (res) => {
+          expect((service as any).findAllData.findAll).toHaveBeenCalledWith({}, true, true);
+        },
+      );
+      done();
+    });
+
+    it('should return a RemoteData<PaginatedList<QualityAssuranceSourceObject>> for the object with the given URL', () => {
+      const result = service.getSources();
+      const expected = cold('(a)', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getSource', () => {
+    it('should call findById', (done) => {
+      service.getSource(qualityAssuranceSourceObjectMorePid.id).subscribe(
+        (res) => {
+          expect((service as any).findById).toHaveBeenCalledWith(qualityAssuranceSourceObjectMorePid.id, true, true);
+        },
+      );
+      done();
+    });
+
+    it('should return a RemoteData<QualityAssuranceSourceObject> for the object with the given URL', () => {
+      const result = service.getSource(qualityAssuranceSourceObjectMorePid.id);
+      const expected = cold('(a)', {
+        a: qaSourceObjectRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts
new file mode 100644
index 0000000000..aad9ebc28b
--- /dev/null
+++ b/src/app/core/notifications/qa/source/quality-assurance-source-data.service.ts
@@ -0,0 +1,109 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { dataService } from '../../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../../data/base/search-data';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import { RequestService } from '../../../data/request.service';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { QualityAssuranceSourceObject } from '../models/quality-assurance-source.model';
+import { QUALITY_ASSURANCE_SOURCE_OBJECT } from '../models/quality-assurance-source-object.resource-type';
+
+/**
+ * The service handling all Quality Assurance source REST requests.
+ */
+@Injectable()
+@dataService(QUALITY_ASSURANCE_SOURCE_OBJECT)
+export class QualityAssuranceSourceDataService extends IdentifiableDataService<QualityAssuranceSourceObject> {
+
+  private findAllData: FindAllData<QualityAssuranceSourceObject>;
+  private searchAllData: SearchData<QualityAssuranceSourceObject>;
+
+  private searchByTargetMethod = 'byTarget';
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('qualityassurancesources', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchAllData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Return the list of Quality Assurance source.
+   *
+   * @param options                     Find list options object.
+   * @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.
+   *
+   * @return Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>>
+   *    The list of Quality Assurance source.
+   */
+  public getSources(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceSourceObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Clear FindAll source requests from cache
+   */
+  public clearFindAllSourceRequests() {
+    this.requestService.setStaleByHrefSubstring('qualityassurancesources');
+  }
+
+  /**
+   * Return a single Quality Assurance source.
+   *
+   * @param id                          The Quality Assurance source id
+   * @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.
+   *
+   * @return Observable<RemoteData<QualityAssuranceSourceObject>>    The Quality Assurance source.
+   */
+  public getSource(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceSourceObject>[]): Observable<RemoteData<QualityAssuranceSourceObject>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Retrieves a paginated list of QualityAssuranceSourceObject objects that are associated with a given target object.
+   * @param options The options for the search query.
+   * @param useCachedVersionIfAvailable Whether to use a cached version of the data if available.
+   * @param reRequestOnStale Whether to re-request the data if the cached version is stale.
+   * @param linksToFollow The links to follow to retrieve the data.
+   * @returns An observable that emits a RemoteData object containing the paginated list of QualityAssuranceSourceObject objects.
+   */
+  public getSourcesByTarget(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceSourceObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>> {
+    return this.searchAllData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
new file mode 100644
index 0000000000..ede1563c30
--- /dev/null
+++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.spec.ts
@@ -0,0 +1,135 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../../shared/mocks/notifications.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { RestResponse } from '../../../cache/response.models';
+import { buildPaginatedList } from '../../../data/paginated-list.model';
+import { RequestService } from '../../../data/request.service';
+import { RequestEntry } from '../../../data/request-entry.model';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { PageInfo } from '../../../shared/page-info.model';
+import { QualityAssuranceTopicDataService } from './quality-assurance-topic-data.service';
+
+describe('QualityAssuranceTopicDataService', () => {
+  let scheduler: TestScheduler;
+  let service: QualityAssuranceTopicDataService;
+  let responseCacheEntry: RequestEntry;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: any;
+
+  const endpointURL = 'https://rest.api/rest/api/integration/qualityassurancetopics';
+  const requestUUID = '8b3c913a-5a4b-438b-9181-be1a5b4a1c8a';
+
+  const pageInfo = new PageInfo();
+  const array = [qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const qaTopicObjectRD = createSuccessfulRemoteDataObject(qualityAssuranceTopicObjectMorePid);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: cold('(a)', {
+        a: qaTopicObjectRD,
+      }),
+      buildList: cold('(a)', {
+        a: paginatedListRD,
+      }),
+    });
+
+    objectCache = new ObjectCacheServiceStub();
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a|', { a: endpointURL }),
+    });
+
+    notificationsService = {} as NotificationsService;
+    http = {} as HttpClient;
+    comparator = {} as any;
+
+    service = new QualityAssuranceTopicDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+    );
+
+    spyOn((service as any).findAllData, 'findAll').and.callThrough();
+    spyOn((service as any), 'findById').and.callThrough();
+    spyOn((service as any).searchData, 'searchBy').and.callThrough();
+  });
+
+  describe('searchTopicsByTarget', () => {
+    it('should call searchData.searchBy with the correct parameters', () => {
+      const options = { elementsPerPage: 10 };
+      const useCachedVersionIfAvailable = true;
+      const reRequestOnStale = true;
+
+      service.searchTopicsByTarget(options, useCachedVersionIfAvailable, reRequestOnStale);
+
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith(
+        'byTarget',
+        options,
+        useCachedVersionIfAvailable,
+        reRequestOnStale,
+      );
+    });
+
+    it('should return a RemoteData<PaginatedList<QualityAssuranceTopicObject>> for the object with the given URL', () => {
+      const result = service.searchTopicsByTarget();
+      const expected = cold('(a)', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('getTopic', () => {
+    it('should call findByHref', (done) => {
+      service.getTopic(qualityAssuranceTopicObjectMorePid.id).subscribe(
+        (res) => {
+          expect((service as any).findById).toHaveBeenCalledWith(qualityAssuranceTopicObjectMorePid.id, true, true);
+        },
+      );
+      done();
+    });
+
+    it('should return a RemoteData<QualityAssuranceTopicObject> for the object with the given URL', () => {
+      const result = service.getTopic(qualityAssuranceTopicObjectMorePid.id);
+      const expected = cold('(a)', {
+        a: qaTopicObjectRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts
new file mode 100644
index 0000000000..7b0a8b4d14
--- /dev/null
+++ b/src/app/core/notifications/qa/topics/quality-assurance-topic-data.service.ts
@@ -0,0 +1,106 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../cache/object-cache.service';
+import { dataService } from '../../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../../data/base/search-data';
+import { FindListOptions } from '../../../data/find-list-options.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import { RequestService } from '../../../data/request.service';
+import { HALEndpointService } from '../../../shared/hal-endpoint.service';
+import { QualityAssuranceTopicObject } from '../models/quality-assurance-topic.model';
+import { QUALITY_ASSURANCE_TOPIC_OBJECT } from '../models/quality-assurance-topic-object.resource-type';
+
+/**
+ * The service handling all Quality Assurance topic REST requests.
+ */
+@Injectable()
+@dataService(QUALITY_ASSURANCE_TOPIC_OBJECT)
+export class QualityAssuranceTopicDataService extends IdentifiableDataService<QualityAssuranceTopicObject> {
+
+  private findAllData: FindAllData<QualityAssuranceTopicObject>;
+  private searchData: SearchData<QualityAssuranceTopicObject>;
+
+  private searchByTargetMethod = 'byTarget';
+  private searchBySourceMethod = 'bySource';
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('qualityassurancetopics', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Search for Quality Assurance topics.
+   * @param options The search options.
+   * @param useCachedVersionIfAvailable Whether to use cached version if available.
+   * @param reRequestOnStale Whether to re-request on stale.
+   * @param linksToFollow The links to follow.
+   * @returns An observable of remote data containing a paginated list of Quality Assurance topics.
+   */
+  public searchTopicsByTarget(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceTopicObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceTopicObject>>> {
+    return this.searchData.searchBy(this.searchByTargetMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Searches for quality assurance topics by source.
+   * @param options The search options.
+   * @param useCachedVersionIfAvailable Whether to use a cached version if available.
+   * @param reRequestOnStale Whether to re-request the data if it's stale.
+   * @param linksToFollow The links to follow.
+   * @returns An observable of the remote data containing the paginated list of quality assurance topics.
+   */
+  public searchTopicsBySource(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceTopicObject>[]): Observable<RemoteData<PaginatedList<QualityAssuranceTopicObject>>> {
+    return this.searchData.searchBy(this.searchBySourceMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Clear FindAll topics requests from cache
+   */
+  public clearFindAllTopicsRequests() {
+    this.requestService.setStaleByHrefSubstring('qualityassurancetopics');
+  }
+
+  /**
+   * Return a single Quality Assurance topic.
+   *
+   * @param id                          The Quality Assurance topic id
+   * @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.
+   *
+   * @return Observable<RemoteData<QualityAssuranceTopicObject>>
+   *    The Quality Assurance topic.
+   */
+  public getTopic(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<QualityAssuranceTopicObject>[]): Observable<RemoteData<QualityAssuranceTopicObject>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/notifications/source/suggestion-source-data.service.ts b/src/app/core/notifications/source/suggestion-source-data.service.ts
new file mode 100644
index 0000000000..e897a8b1fe
--- /dev/null
+++ b/src/app/core/notifications/source/suggestion-source-data.service.ts
@@ -0,0 +1,100 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { CoreState } from '../../core-state.model';
+import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionSource } from '../models/suggestion-source.model';
+import { SUGGESTION_SOURCE } from '../models/suggestion-source-object.resource-type';
+
+/**
+ * Service that retrieves Suggestion Source data
+ */
+@Injectable()
+@dataService(SUGGESTION_SOURCE)
+export class SuggestionSourceDataService extends IdentifiableDataService<SuggestionSource> {
+
+  protected linkPath = 'suggestionsources';
+
+  private findAllData: FindAllData<SuggestionSource>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SuggestionSource>) {
+    super('suggestionsources', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+  /**
+   * Return the list of Suggestion source.
+   *
+   * @param options                     Find list options object.
+   * @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.
+   *
+   * @return Observable<RemoteData<PaginatedList<QualityAssuranceSourceObject>>>
+   *    The list of Quality Assurance source.
+   */
+  public getSources(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionSource>[]): Observable<RemoteData<PaginatedList<SuggestionSource>>> {
+    return this.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Return a single Suggestoin source.
+   *
+   * @param id                          The Quality Assurance source id
+   * @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.
+   *
+   * @return Observable<RemoteData<QualityAssuranceSourceObject>>    The Quality Assurance source.
+   */
+  public getSource(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionSource>[]): Observable<RemoteData<SuggestionSource>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionSource>[]): Observable<RemoteData<PaginatedList<SuggestionSource>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+}
diff --git a/src/app/core/notifications/source/suggestions-source-data.service.spec.ts b/src/app/core/notifications/source/suggestions-source-data.service.spec.ts
new file mode 100644
index 0000000000..3026c2d8b4
--- /dev/null
+++ b/src/app/core/notifications/source/suggestions-source-data.service.spec.ts
@@ -0,0 +1,117 @@
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestResponse } from '../../cache/response.models';
+import { CoreState } from '../../core-state.model';
+import { FindAllData } from '../../data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { RequestEntryState } from '../../data/request-entry-state.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionSource } from '../models/suggestion-source.model';
+import { SuggestionSourceDataService } from './suggestion-source-data.service';
+
+describe('SuggestionSourceDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionSourceDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: DefaultChangeAnalyzer<SuggestionSource>;
+  let responseCacheEntry: RequestEntry;
+
+  const store = {} as Store<CoreState>;
+  const endpointURL = `https://rest.api/rest/api/suggestionsources`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new SuggestionSourceDataService(
+      requestService,
+      rdbService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    http = {} as HttpClient;
+    notificationsService = {} as NotificationsService;
+    comparator = {} as DefaultChangeAnalyzer<SuggestionSource>;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initFindAllService = () => new SuggestionSourceDataService(null, null, null, null, null, null, null, null) as unknown as FindAllData<any>;
+    testFindAllDataImplementation(initFindAllService);
+  });
+
+  describe('getSources', () => {
+    it('should send a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}`);
+      scheduler.schedule(() => service.getSources().subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+
+  describe('getSource', () => {
+    it('should send a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}/testId`);
+      scheduler.schedule(() => service.getSource('testId').subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+});
diff --git a/src/app/core/notifications/suggestion-data.service.spec.ts b/src/app/core/notifications/suggestion-data.service.spec.ts
new file mode 100644
index 0000000000..050f81914f
--- /dev/null
+++ b/src/app/core/notifications/suggestion-data.service.spec.ts
@@ -0,0 +1,180 @@
+import { HttpClient } from '@angular/common/http';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { RequestEntryState } from '../data/request-entry-state.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Suggestion } from './models/suggestion.model';
+import { SuggestionSource } from './models/suggestion-source.model';
+import { SuggestionTarget } from './models/suggestion-target.model';
+import { SuggestionSourceDataService } from './source/suggestion-source-data.service';
+import {
+  SuggestionDataServiceImpl,
+  SuggestionsDataService,
+} from './suggestions-data.service';
+import { SuggestionTargetDataService } from './target/suggestion-target-data.service';
+
+describe('SuggestionDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionsDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparatorSuggestion: DefaultChangeAnalyzer<Suggestion>;
+  let comparatorSuggestionSource: DefaultChangeAnalyzer<SuggestionSource>;
+  let comparatorSuggestionTarget: DefaultChangeAnalyzer<SuggestionTarget>;
+  let suggestionSourcesDataService: SuggestionSourceDataService;
+  let suggestionTargetsDataService: SuggestionTargetDataService;
+  let suggestionsDataService: SuggestionDataServiceImpl;
+  let responseCacheEntry: RequestEntry;
+
+
+  const testSource = 'test-source';
+  const testUserId = '1234-4321';
+  const endpointURL = `https://rest.api/rest/api/`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new SuggestionsDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparatorSuggestion,
+      comparatorSuggestionSource,
+      comparatorSuggestionTarget,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    http = {} as HttpClient;
+    notificationsService = {} as NotificationsService;
+    comparatorSuggestion = {} as DefaultChangeAnalyzer<Suggestion>;
+    comparatorSuggestionTarget = {} as DefaultChangeAnalyzer<SuggestionTarget>;
+    comparatorSuggestionSource = {} as DefaultChangeAnalyzer<SuggestionSource>;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+      setStaleByHrefSubstring: observableOf(true),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    suggestionSourcesDataService = jasmine.createSpyObj('suggestionSourcesDataService', {
+      getSources: observableOf(null),
+    });
+
+    suggestionTargetsDataService = jasmine.createSpyObj('suggestionTargetsDataService', {
+      getTargets: observableOf(null),
+      getTargetsByUser: observableOf(null),
+      findById: observableOf(null),
+    });
+
+    suggestionsDataService = jasmine.createSpyObj('suggestionsDataService', {
+      searchBy: observableOf(null),
+      delete: observableOf(null),
+    });
+
+
+    service = initTestService();
+    /* eslint-disable-next-line @typescript-eslint/dot-notation */
+    service['suggestionSourcesDataService'] = suggestionSourcesDataService;
+    /* eslint-disable-next-line @typescript-eslint/dot-notation */
+    service['suggestionTargetsDataService'] = suggestionTargetsDataService;
+    /* eslint-disable-next-line @typescript-eslint/dot-notation */
+    service['suggestionsDataService'] = suggestionsDataService;
+  });
+
+  describe('Suggestion targets service', () => {
+    it('should call suggestionSourcesDataService.getTargets', () => {
+      const options = {
+        searchParams: [new RequestParam('source', testSource)],
+      };
+      service.getTargets(testSource);
+      expect(suggestionTargetsDataService.getTargets).toHaveBeenCalledWith('findBySource', options);
+    });
+
+    it('should call suggestionSourcesDataService.getTargetsByUser', () => {
+      const options = {
+        searchParams: [new RequestParam('target', testUserId)],
+      };
+      service.getTargetsByUser(testUserId);
+      expect(suggestionTargetsDataService.getTargetsByUser).toHaveBeenCalledWith(testUserId, options);
+    });
+
+    it('should call suggestionSourcesDataService.getTargetById', () => {
+      service.getTargetById('1');
+      expect(suggestionTargetsDataService.findById).toHaveBeenCalledWith('1');
+    });
+  });
+
+
+  describe('Suggestion sources service', () => {
+    it('should call suggestionSourcesDataService.getSources', () => {
+      service.getSources();
+      expect(suggestionSourcesDataService.getSources).toHaveBeenCalled();
+    });
+  });
+
+  describe('Suggestion service', () => {
+    it('should call suggestionsDataService.searchBy', () => {
+      const options = {
+        searchParams: [new RequestParam('target', testUserId), new RequestParam('source', testSource)],
+      };
+      service.getSuggestionsByTargetAndSource(testUserId, testSource);
+      expect(suggestionsDataService.searchBy).toHaveBeenCalledWith('findByTargetAndSource', options, false, true);
+    });
+
+    it('should call suggestionsDataService.delete', () => {
+      service.deleteSuggestion('1');
+      expect(suggestionsDataService.delete).toHaveBeenCalledWith('1');
+    });
+  });
+
+  describe('Request service', () => {
+    it('should call requestService.setStaleByHrefSubstring', () => {
+      service.clearSuggestionRequests();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/core/notifications/suggestions-data.service.ts b/src/app/core/notifications/suggestions-data.service.ts
new file mode 100644
index 0000000000..372ea65e33
--- /dev/null
+++ b/src/app/core/notifications/suggestions-data.service.ts
@@ -0,0 +1,228 @@
+/* eslint-disable max-classes-per-file */
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { dataService } from '../cache/builders/build-decorators';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
+import { ChangeAnalyzer } from '../data/change-analyzer';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { UpdateDataServiceImpl } from '../data/update-data.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { Suggestion } from './models/suggestion.model';
+import { SUGGESTION } from './models/suggestion-objects.resource-type';
+import { SuggestionSource } from './models/suggestion-source.model';
+import { SuggestionTarget } from './models/suggestion-target.model';
+import { SuggestionSourceDataService } from './source/suggestion-source-data.service';
+import { SuggestionTargetDataService } from './target/suggestion-target-data.service';
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+ */
+export class SuggestionDataServiceImpl extends UpdateDataServiceImpl<Suggestion> {
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {Store<CoreState>} store
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   * @param {HttpClient} http
+   * @param {ChangeAnalyzer<Suggestion>} comparator
+   * @param responseMsToLive
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: ChangeAnalyzer<Suggestion>,
+    protected responseMsToLive: number,
+  ) {
+    super('suggestions', requestService, rdbService, objectCache, halService, notificationsService, comparator ,responseMsToLive);
+  }
+}
+
+/**
+ * The service handling all Suggestion Target REST requests.
+ */
+@Injectable()
+@dataService(SUGGESTION)
+export class SuggestionsDataService {
+  protected searchFindBySourceMethod = 'findBySource';
+  protected searchFindByTargetAndSourceMethod = 'findByTargetAndSource';
+
+  /**
+   * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+   */
+  private suggestionsDataService: SuggestionDataServiceImpl;
+
+  /**
+   * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+   */
+  private suggestionSourcesDataService: SuggestionSourceDataService;
+
+  /**
+   * A private UpdateDataServiceImpl implementation to delegate specific methods to.
+   */
+  private suggestionTargetsDataService: SuggestionTargetDataService;
+
+  private responseMsToLive = 10 * 1000;
+
+  /**
+   * Initialize service variables
+   * @param {RequestService} requestService
+   * @param {RemoteDataBuildService} rdbService
+   * @param {ObjectCacheService} objectCache
+   * @param {HALEndpointService} halService
+   * @param {NotificationsService} notificationsService
+   * @param {HttpClient} http
+   * @param {DefaultChangeAnalyzer<Suggestion>} comparatorSuggestions
+   * @param {DefaultChangeAnalyzer<SuggestionSource>} comparatorSources
+   * @param {DefaultChangeAnalyzer<SuggestionTarget>} comparatorTargets
+   */
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparatorSuggestions: DefaultChangeAnalyzer<Suggestion>,
+    protected comparatorSources: DefaultChangeAnalyzer<SuggestionSource>,
+    protected comparatorTargets: DefaultChangeAnalyzer<SuggestionTarget>,
+  ) {
+    this.suggestionsDataService = new SuggestionDataServiceImpl(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorSuggestions, this.responseMsToLive);
+    this.suggestionSourcesDataService = new SuggestionSourceDataService(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorSources);
+    this.suggestionTargetsDataService = new SuggestionTargetDataService(requestService, rdbService, null, objectCache, halService, notificationsService, http, comparatorTargets);
+  }
+
+  /**
+   * Return the list of Suggestion Sources
+   *
+   * @param options
+   *    Find list options object.
+   * @return Observable<RemoteData<PaginatedList<SuggestionSource>>>
+   *    The list of Suggestion Sources.
+   */
+  public getSources(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<SuggestionSource>>> {
+    return this.suggestionSourcesDataService.getSources(options);
+  }
+
+  /**
+   * Return the list of Suggestion Target for a given source
+   *
+   * @param source
+   *    The source for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargets(
+    source: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('source', source)];
+
+    return this.suggestionTargetsDataService.getTargets(this.searchFindBySourceMethod, options, ...linksToFollow);
+  }
+
+  /**
+   * Return the list of Suggestion Target for a given user
+   *
+   * @param userId
+   *    The user Id for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetsByUser(
+    userId: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('target', userId)];
+    return this.suggestionTargetsDataService.getTargetsByUser(userId, options, ...linksToFollow);
+  }
+
+  /**
+   * Return a Suggestion Target for a given id
+   *
+   * @param targetId
+   *    The target id to retrieve.
+   *
+   * @return Observable<RemoteData<SuggestionTarget>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetById(targetId: string): Observable<RemoteData<SuggestionTarget>> {
+    return this.suggestionTargetsDataService.findById(targetId);
+  }
+
+  /**
+   * Used to delete Suggestion
+   * @suggestionId
+   */
+  public deleteSuggestion(suggestionId: string): Observable<RemoteData<NoContent>> {
+    return this.suggestionsDataService.delete(suggestionId);
+  }
+
+  /**
+   * Return the list of Suggestion for a given target and source
+   *
+   * @param target
+   *    The target for which to find suggestions.
+   * @param source
+   *    The source for which to find suggestions.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<Suggestion>>>
+   *    The list of Suggestion.
+   */
+  public getSuggestionsByTargetAndSource(
+    target: string,
+    source: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<Suggestion>[]
+  ): Observable<RemoteData<PaginatedList<Suggestion>>> {
+    options.searchParams = [
+      new RequestParam('target', target),
+      new RequestParam('source', source),
+    ];
+
+    return this.suggestionsDataService.searchBy(this.searchFindByTargetAndSourceMethod, options, false, true, ...linksToFollow);
+  }
+
+  /**
+   * Clear findByTargetAndSource suggestions requests from cache
+   */
+  public clearSuggestionRequests() {
+    this.requestService.setStaleByHrefSubstring(this.searchFindByTargetAndSourceMethod);
+  }
+}
diff --git a/src/app/core/notifications/target/suggestion-target-data.service.ts b/src/app/core/notifications/target/suggestion-target-data.service.ts
new file mode 100644
index 0000000000..dddeb4fdf9
--- /dev/null
+++ b/src/app/core/notifications/target/suggestion-target-data.service.ts
@@ -0,0 +1,147 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { CoreState } from '../../core-state.model';
+import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionTarget } from '../models/suggestion-target.model';
+import { SUGGESTION_TARGET } from '../models/suggestion-target-object.resource-type';
+
+@Injectable()
+@dataService(SUGGESTION_TARGET)
+export class SuggestionTargetDataService extends IdentifiableDataService<SuggestionTarget> {
+
+  protected linkPath = 'suggestiontargets';
+  private findAllData: FindAllData<SuggestionTarget>;
+  private searchData: SearchData<SuggestionTarget>;
+  protected searchFindBySourceMethod = 'findBySource';
+  protected searchFindByTargetMethod = 'findByTarget';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<SuggestionTarget>) {
+    super('suggestiontargets', requestService, rdbService, objectCache, halService);
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+  /**
+   * Return the list of Suggestion Target for a given source
+   *
+   * @param source
+   *    The source for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargets(
+    source: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('source', source)];
+
+    return this.searchBy(this.searchFindBySourceMethod, options, true, true, ...linksToFollow);
+  }
+
+  /**
+   * Return the list of Suggestion Target for a given user
+   *
+   * @param userId
+   *    The user Id for which to find targets.
+   * @param options
+   *    Find list options object.
+   * @param linksToFollow
+   *    List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved.
+   * @return Observable<RemoteData<PaginatedList<SuggestionTarget>>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetsByUser(
+    userId: string,
+    options: FindListOptions = {},
+    ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]
+  ): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    options.searchParams = [new RequestParam('target', userId)];
+
+    return this.searchBy(this.searchFindByTargetMethod, options, true, true, ...linksToFollow);
+  }
+  /**
+   * Return a Suggestion Target for a given id
+   *
+   * @param targetId
+   *    The target id to retrieve.
+   *
+   * @return Observable<RemoteData<SuggestionTarget>>
+   *    The list of Suggestion Target.
+   */
+  public getTargetById(targetId: string): Observable<RemoteData<SuggestionTarget>> {
+    return this.findById(targetId);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @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
+   * @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<SuggestionTarget>[]): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+  /**
+   * Returns {@link RemoteData} of all object with a list of {@link FollowLinkConfig}, to indicate which embedded
+   * info should be added to the objects
+   *
+   * @param options                     Find list options object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>>}
+   *    Return an observable that emits object list
+   */
+  findAll(options: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SuggestionTarget>[]): Observable<RemoteData<PaginatedList<SuggestionTarget>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+}
diff --git a/src/app/core/notifications/target/suggestions-target-data.service.spec.ts b/src/app/core/notifications/target/suggestions-target-data.service.spec.ts
new file mode 100644
index 0000000000..7b4ed3e82a
--- /dev/null
+++ b/src/app/core/notifications/target/suggestions-target-data.service.spec.ts
@@ -0,0 +1,140 @@
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestResponse } from '../../cache/response.models';
+import { CoreState } from '../../core-state.model';
+import { FindAllData } from '../../data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { SearchData } from '../../data/base/search-data';
+import { testSearchDataImplementation } from '../../data/base/search-data.spec';
+import { DefaultChangeAnalyzer } from '../../data/default-change-analyzer.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { RequestEntryState } from '../../data/request-entry-state.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { SuggestionTarget } from '../models/suggestion-target.model';
+import { SuggestionTargetDataService } from './suggestion-target-data.service';
+
+describe('SuggestionTargetDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionTargetDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let http: HttpClient;
+  let comparator: DefaultChangeAnalyzer<SuggestionTarget>;
+  let responseCacheEntry: RequestEntry;
+
+  const store = {} as Store<CoreState>;
+  const endpointURL = `https://rest.api/rest/api/suggestiontargets`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new SuggestionTargetDataService(
+      requestService,
+      rdbService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    http = {} as HttpClient;
+    notificationsService = {} as NotificationsService;
+    comparator = {} as DefaultChangeAnalyzer<SuggestionTarget>;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initSearchService = () => new SuggestionTargetDataService(null, null, null, null, null, null, null, null) as unknown as SearchData<any>;
+    const initFindAllService = () => new SuggestionTargetDataService(null, null, null, null, null, null, null, null) as unknown as FindAllData<any>;
+    testSearchDataImplementation(initSearchService);
+    testFindAllDataImplementation(initFindAllService);
+  });
+
+  describe('getTargetById', () => {
+    it('should send a new GetRequest', () => {
+      const expected = new GetRequest(requestService.generateRequestId(), endpointURL + '/testId');
+      scheduler.schedule(() => service.getTargetById('testId').subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+
+  describe('getTargetsByUser', () => {
+    it('should send a new GetRequest', () => {
+      const options = {
+        searchParams: [new RequestParam('target', 'testId')],
+      };
+      const searchFindByTargetMethod = 'findByTarget';
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}/search/${searchFindByTargetMethod}?target=testId`);
+      scheduler.schedule(() => service.getTargetsByUser('testId', options).subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+
+  describe('getTargets', () => {
+    it('should send a new GetRequest', () => {
+      const options = {
+        searchParams: [new RequestParam('source', 'testId')],
+      };
+      const searchFindBySourceMethod = 'findBySource';
+      const expected = new GetRequest(requestService.generateRequestId(),  `${endpointURL}/search/${searchFindBySourceMethod}?source=testId`);
+      scheduler.schedule(() => service.getTargets('testId', options).subscribe());
+      scheduler.flush();
+
+      expect(requestService.send).toHaveBeenCalledWith(expected, true);
+    });
+  });
+});
diff --git a/src/app/core/orcid/model/orcid-history.model.ts b/src/app/core/orcid/model/orcid-history.model.ts
index ef8f30e0a3..62f5353ed2 100644
--- a/src/app/core/orcid/model/orcid-history.model.ts
+++ b/src/app/core/orcid/model/orcid-history.model.ts
@@ -1,10 +1,14 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ORCID_HISTORY } from './orcid-history.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Class the represents a Orcid History.
@@ -19,49 +23,49 @@ export class OrcidHistory extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this Orcid History record
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The name of the related entity
    */
   @autoserialize
-  entityName: string;
+    entityName: string;
 
   /**
    * The identifier of the profileItem of this Orcid History record.
    */
   @autoserialize
-  profileItemId: string;
+    profileItemId: string;
 
   /**
    * The identifier of the entity related to this Orcid History record.
    */
   @autoserialize
-  entityId: string;
+    entityId: string;
 
   /**
    * The type of the entity related to this Orcid History record.
    */
   @autoserialize
-  entityType: string;
+    entityType: string;
 
   /**
    * The response status coming from ORCID api.
    */
   @autoserialize
-  status: number;
+    status: number;
 
   /**
    * The putCode assigned by ORCID to the entity.
    */
   @autoserialize
-  putCode: string;
+    putCode: string;
 
   /**
    * The last send attempt timestamp.
@@ -82,7 +86,7 @@ export class OrcidHistory extends CacheableObject {
    * The {@link HALLink}s for this Orcid History record
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 
diff --git a/src/app/core/orcid/model/orcid-queue.model.ts b/src/app/core/orcid/model/orcid-queue.model.ts
index 2a1c3f1d82..fedb078cc5 100644
--- a/src/app/core/orcid/model/orcid-queue.model.ts
+++ b/src/app/core/orcid/model/orcid-queue.model.ts
@@ -1,10 +1,14 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { ORCID_QUEUE } from './orcid-queue.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Class the represents a Orcid Queue.
@@ -19,49 +23,49 @@ export class OrcidQueue extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this Orcid Queue record
    */
   @autoserialize
-  id: number;
+    id: number;
 
   /**
    * The record description.
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The identifier of the profileItem of this Orcid Queue record.
    */
   @autoserialize
-  profileItemId: string;
+    profileItemId: string;
 
   /**
    * The identifier of the entity related to this Orcid Queue record.
    */
   @autoserialize
-  entityId: string;
+    entityId: string;
 
   /**
    * The type of this Orcid Queue record.
    */
   @autoserialize
-  recordType: string;
+    recordType: string;
 
   /**
    * The operation related to this Orcid Queue record.
    */
   @autoserialize
-  operation: string;
+    operation: string;
 
   /**
    * The {@link HALLink}s for this Orcid Queue record
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 
diff --git a/src/app/core/orcid/orcid-auth.service.spec.ts b/src/app/core/orcid/orcid-auth.service.spec.ts
index ad703d135e..a3dc628029 100644
--- a/src/app/core/orcid/orcid-auth.service.spec.ts
+++ b/src/app/core/orcid/orcid-auth.service.spec.ts
@@ -1,17 +1,27 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  AddOperation,
+  RemoveOperation,
+} from 'fast-json-patch';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { ResearcherProfile } from '../profile/model/researcher-profile.model';
-import { Item } from '../shared/item.model';
-import { AddOperation, RemoveOperation } from 'fast-json-patch';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { ConfigurationDataService } from '../data/configuration-data.service';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+
 import { NativeWindowRefMock } from '../../shared/mocks/mock-native-window-ref';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ConfigurationDataService } from '../data/configuration-data.service';
+import { ResearcherProfile } from '../profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { Item } from '../shared/item.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { OrcidAuthService } from './orcid-auth.service';
-import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
 
 describe('OrcidAuthService', () => {
   let scheduler: TestScheduler;
@@ -32,12 +42,12 @@ describe('OrcidAuthService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
@@ -46,12 +56,12 @@ describe('OrcidAuthService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
@@ -59,105 +69,105 @@ describe('OrcidAuthService', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
-    }
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   const disconnectionAllowAdmin = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['only_admin']
+    values: ['only_admin'],
   } as ConfigurationProperty;
 
   const disconnectionAllowAdminOwner = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['admin_and_owner']
+    values: ['admin_and_owner'],
   } as ConfigurationProperty;
 
   const authorizeUrl = {
     uuid: 'orcid.authorize-url',
     name: 'orcid.authorize-url',
-    values: ['orcid.authorize-url']
+    values: ['orcid.authorize-url'],
   } as ConfigurationProperty;
   const appClientId = {
     uuid: 'orcid.application-client-id',
     name: 'orcid.application-client-id',
-    values: ['orcid.application-client-id']
+    values: ['orcid.application-client-id'],
   } as ConfigurationProperty;
   const orcidScope = {
     uuid: 'orcid.scope',
     name: 'orcid.scope',
-    values: ['/authenticate', '/read-limited']
+    values: ['/authenticate', '/read-limited'],
   } as ConfigurationProperty;
 
   beforeEach(() => {
@@ -169,7 +179,7 @@ describe('OrcidAuthService', () => {
       updateByOrcidOperations: jasmine.createSpy('updateByOrcidOperations'),
     });
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: jasmine.createSpy('findByPropertyName')
+      findByPropertyName: jasmine.createSpy('findByPropertyName'),
     });
     nativeWindowService = new NativeWindowRefMock();
 
@@ -200,7 +210,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdmin));
       const result = service.onlyAdminCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: true
+        a: true,
       });
       expect(result).toBeObservable(expected);
     });
@@ -209,7 +219,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
       const result = service.onlyAdminCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: false
+        a: false,
       });
       expect(result).toBeObservable(expected);
     });
@@ -220,7 +230,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createSuccessfulRemoteDataObject$(disconnectionAllowAdminOwner));
       const result = service.ownerCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: true
+        a: true,
       });
       expect(result).toBeObservable(expected);
     });
@@ -229,7 +239,7 @@ describe('OrcidAuthService', () => {
       spyOn((service as any), 'getOrcidDisconnectionAllowedUsersConfiguration').and.returnValue(createFailedRemoteDataObject$());
       const result = service.ownerCanDisconnectProfileFromOrcid();
       const expected = cold('(a|)', {
-        a: false
+        a: false,
       });
       expect(result).toBeObservable(expected);
     });
@@ -246,7 +256,7 @@ describe('OrcidAuthService', () => {
       const operations: AddOperation<string>[] = [{
         path: '/orcid',
         op: 'add',
-        value: 'test-code'
+        value: 'test-code',
       }];
 
       scheduler.schedule(() => service.linkOrcidByItem(mockItemUnlinkedToOrcid, 'test-code').subscribe());
@@ -266,7 +276,7 @@ describe('OrcidAuthService', () => {
     it('should call updateByOrcidOperations method properly', () => {
       const operations: RemoveOperation[] = [{
         path: '/orcid',
-        op: 'remove'
+        op: 'remove',
       }];
 
       scheduler.schedule(() => service.unlinkOrcidByItem(mockItemLinkedToOrcid).subscribe());
@@ -282,7 +292,7 @@ describe('OrcidAuthService', () => {
       (service as any).configurationService.findByPropertyName.and.returnValues(
         createSuccessfulRemoteDataObject$(authorizeUrl),
         createSuccessfulRemoteDataObject$(appClientId),
-        createSuccessfulRemoteDataObject$(orcidScope)
+        createSuccessfulRemoteDataObject$(orcidScope),
       );
     });
 
@@ -292,7 +302,7 @@ describe('OrcidAuthService', () => {
       const url = 'orcid.authorize-url?client_id=orcid.application-client-id&redirect_uri=' + redirectUri + '&response_type=code&scope=/authenticate /read-limited';
 
       const expected = cold('(a|)', {
-        a: url
+        a: url,
       });
       expect(result).toBeObservable(expected);
     });
@@ -304,7 +314,7 @@ describe('OrcidAuthService', () => {
         '/authenticate',
         '/read-limited',
         '/activities/update',
-        '/person/update'
+        '/person/update',
       ];
       const result = service.getOrcidAuthorizationScopesByItem(mockItemLinkedToOrcid);
       expect(result).toEqual(orcidScopes);
@@ -314,14 +324,14 @@ describe('OrcidAuthService', () => {
   describe('getOrcidAuthorizationScopes', () => {
     it('should return list of scopes by configuration', () => {
       (service as any).configurationService.findByPropertyName.and.returnValue(
-        createSuccessfulRemoteDataObject$(orcidScope)
+        createSuccessfulRemoteDataObject$(orcidScope),
       );
       const orcidScopes = [
         '/authenticate',
-        '/read-limited'
+        '/read-limited',
       ];
       const expected = cold('(a|)', {
-        a: orcidScopes
+        a: orcidScopes,
       });
       const result = service.getOrcidAuthorizationScopes();
       expect(result).toBeObservable(expected);
diff --git a/src/app/core/orcid/orcid-auth.service.ts b/src/app/core/orcid/orcid-auth.service.ts
index a930a8f614..4ac04eabb6 100644
--- a/src/app/core/orcid/orcid-auth.service.ts
+++ b/src/app/core/orcid/orcid-auth.service.ts
@@ -1,20 +1,37 @@
-import { Inject, Injectable } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  AddOperation,
+  RemoveOperation,
+} from 'fast-json-patch';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { AddOperation, RemoveOperation } from 'fast-json-patch';
-
-import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
-import { Item } from '../shared/item.model';
 import { isNotEmpty } from '../../shared/empty.util';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { RemoteData } from '../data/remote-data';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
 import { ConfigurationDataService } from '../data/configuration-data.service';
+import { RemoteData } from '../data/remote-data';
 import { ResearcherProfile } from '../profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../profile/researcher-profile-data.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { Item } from '../shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../shared/operators';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
 
 @Injectable()
 export class OrcidAuthService {
@@ -45,7 +62,7 @@ export class OrcidAuthService {
     return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
       map((propertyRD: RemoteData<ConfigurationProperty>) => {
         return propertyRD.hasSucceeded && propertyRD.payload.values.map((value) => value.toLowerCase()).includes('only_admin');
-      })
+      }),
     );
   }
 
@@ -58,7 +75,7 @@ export class OrcidAuthService {
     return this.getOrcidDisconnectionAllowedUsersConfiguration().pipe(
       map((propertyRD: RemoteData<ConfigurationProperty>) => {
         return propertyRD.hasSucceeded && propertyRD.payload.values.map( (value) => value.toLowerCase()).includes('admin_and_owner');
-      })
+      }),
     );
   }
 
@@ -72,7 +89,7 @@ export class OrcidAuthService {
     const operations: AddOperation<string>[] = [{
       path: '/orcid',
       op: 'add',
-      value: code
+      value: code,
     }];
 
     return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
@@ -89,7 +106,7 @@ export class OrcidAuthService {
   public unlinkOrcidByItem(person: Item): Observable<RemoteData<ResearcherProfile>> {
     const operations: RemoveOperation[] = [{
       path:'/orcid',
-      op:'remove'
+      op:'remove',
     }];
 
     return this.researcherProfileService.findById(person.firstMetadata('dspace.object.owner').authority).pipe(
@@ -107,7 +124,7 @@ export class OrcidAuthService {
     return combineLatest([
       this.configurationService.findByPropertyName('orcid.authorize-url').pipe(getFirstSucceededRemoteDataPayload()),
       this.configurationService.findByPropertyName('orcid.application-client-id').pipe(getFirstSucceededRemoteDataPayload()),
-      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())]
+      this.configurationService.findByPropertyName('orcid.scope').pipe(getFirstSucceededRemoteDataPayload())],
     ).pipe(
       map(([authorizeUrl, clientId, scopes]) => {
         const redirectUri = new URLCombiner(this._window.nativeWindow.origin, encodeURIComponent(this.router.url.split('?')[0]));
@@ -131,13 +148,13 @@ export class OrcidAuthService {
   public getOrcidAuthorizationScopes(): Observable<string[]> {
     return this.configurationService.findByPropertyName('orcid.scope').pipe(
       getFirstCompletedRemoteData(),
-      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : [])
+      map((propertyRD: RemoteData<ConfigurationProperty>) => propertyRD.hasSucceeded ? propertyRD.payload.values : []),
     );
   }
 
   private getOrcidDisconnectionAllowedUsersConfiguration(): Observable<RemoteData<ConfigurationProperty>> {
     return this.configurationService.findByPropertyName('orcid.disconnection.allowed-users').pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
diff --git a/src/app/core/orcid/orcid-history-data.service.ts b/src/app/core/orcid/orcid-history-data.service.ts
index f06a270a44..5e9a3ab1e9 100644
--- a/src/app/core/orcid/orcid-history-data.service.ts
+++ b/src/app/core/orcid/orcid-history-data.service.ts
@@ -1,21 +1,25 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { RemoteData } from '../data/remote-data';
 import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { sendRequest } from '../shared/request.operators';
 import { OrcidHistory } from './model/orcid-history.model';
 import { ORCID_HISTORY } from './model/orcid-history.resource-type';
 import { OrcidQueue } from './model/orcid-queue.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { RestRequest } from '../data/rest-request.model';
-import { sendRequest } from '../shared/request.operators';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with Orcid History endpoint.
@@ -44,7 +48,7 @@ export class OrcidHistoryDataService extends IdentifiableDataService<OrcidHistor
         return new PostRequest(requestId, endpointURL, orcidQueue._links.self.href, options);
       }),
       sendRequest(this.requestService),
-      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)  as Observable<RemoteData<OrcidHistory>>)
+      switchMap((request: RestRequest) => this.rdbService.buildFromRequestUUID(request.uuid)  as Observable<RemoteData<OrcidHistory>>),
     );
   }
 }
diff --git a/src/app/core/orcid/orcid-queue-data.service.ts b/src/app/core/orcid/orcid-queue-data.service.ts
index 77149c4bf8..d869110f97 100644
--- a/src/app/core/orcid/orcid-queue-data.service.ts
+++ b/src/app/core/orcid/orcid-queue-data.service.ts
@@ -1,21 +1,28 @@
-import { OrcidQueue } from './model/orcid-queue.model';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { Injectable } from '@angular/core';
-import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { RequestParam } from '../cache/models/request-param.model';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { NoContent } from '../shared/NoContent.model';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { OrcidQueue } from './model/orcid-queue.model';
+import { ORCID_QUEUE } from './model/orcid-queue.resource-type';
 
 /**
  * A service that provides methods to make REST requests with Orcid Queue endpoint.
@@ -50,12 +57,12 @@ export class OrcidQueueDataService extends IdentifiableDataService<OrcidQueue> {
    */
   searchByProfileItemId(itemId: string, paginationOptions: PaginationComponentOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<PaginatedList<OrcidQueue>>> {
     return this.searchData.searchBy('findByProfileItem', {
-        searchParams: [new RequestParam('profileItemId', itemId)],
-        elementsPerPage: paginationOptions.pageSize,
-        currentPage: paginationOptions.currentPage,
-      },
-      useCachedVersionIfAvailable,
-      reRequestOnStale,
+      searchParams: [new RequestParam('profileItemId', itemId)],
+      elementsPerPage: paginationOptions.pageSize,
+      currentPage: paginationOptions.currentPage,
+    },
+    useCachedVersionIfAvailable,
+    reRequestOnStale,
     );
   }
 
diff --git a/src/app/core/pagination/pagination-route-params.interface.ts b/src/app/core/pagination/pagination-route-params.interface.ts
new file mode 100644
index 0000000000..029b27f255
--- /dev/null
+++ b/src/app/core/pagination/pagination-route-params.interface.ts
@@ -0,0 +1,15 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { SortDirection } from '../cache/models/sort-options.model';
+
+export interface PaginationRouteParams {
+  page?: number
+  pageSize?: number
+  sortField?: string
+  sortDirection?: SortDirection
+}
diff --git a/src/app/core/pagination/pagination.service.spec.ts b/src/app/core/pagination/pagination.service.spec.ts
index da508d45cd..e9c75703b1 100644
--- a/src/app/core/pagination/pagination.service.spec.ts
+++ b/src/app/core/pagination/pagination.service.spec.ts
@@ -1,9 +1,13 @@
-import { PaginationService } from './pagination.service';
-import { RouterStub } from '../../shared/testing/router.stub';
 import { of as observableOf } from 'rxjs';
+
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
+import { RouterStub } from '../../shared/testing/router.stub';
+import {
+  SortDirection,
+  SortOptions,
+} from '../cache/models/sort-options.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { PaginationService } from './pagination.service';
 
 
 describe('PaginationService', () => {
@@ -33,7 +37,7 @@ describe('PaginationService', () => {
           value = 'score';
         }
         return observableOf(value);
-      }
+      },
     };
 
     service = new PaginationService(routeService, router);
@@ -44,7 +48,7 @@ describe('PaginationService', () => {
       service.getCurrentPagination('test-id', defaultPagination).subscribe((currentPagination) => {
         expect(currentPagination).toEqual(Object.assign(new PaginationComponentOptions(), {
           currentPage: 5,
-          pageSize: 10
+          pageSize: 10,
         }));
       });
     });
@@ -67,7 +71,7 @@ describe('PaginationService', () => {
             value = 10;
           }
           return observableOf(value);
-        }
+        },
       };
       service = new PaginationService(routeService, router);
 
@@ -83,7 +87,7 @@ describe('PaginationService', () => {
           {
             sort: new SortOptions('score', SortDirection.ASC ),
             currentPage: 5,
-            elementsPerPage: 10
+            elementsPerPage: 10,
           }));
       });
     });
@@ -93,13 +97,13 @@ describe('PaginationService', () => {
       spyOn(service, 'updateRoute');
       service.resetPage('test');
 
-      expect(service.updateRoute).toHaveBeenCalledWith('test', {page: 1});
+      expect(service.updateRoute).toHaveBeenCalledWith('test', { page: 1 });
     });
   });
 
   describe('updateRoute', () => {
     it('should update the route with the provided page params', () => {
-      service.updateRoute('test', {page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC});
+      service.updateRoute('test', { page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -107,10 +111,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `title`;
       navigateParams[`test.sd`] = `DESC`;
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should update the route with the provided page params while keeping the existing non provided ones', () => {
-      service.updateRoute('test', {page: 2});
+      service.updateRoute('test', { page: 2 });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -118,10 +122,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should pass on navigationExtras to router.navigate', () => {
-      service.updateRoute('test', {page: 2}, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      service.updateRoute('test', { page: 2 }, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -129,12 +133,12 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
     });
   });
   describe('updateRouteWithUrl', () => {
     it('should update the route with the provided page params and url', () => {
-      service.updateRouteWithUrl('test', ['someUrl'], {page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC});
+      service.updateRouteWithUrl('test', ['someUrl'], { page: 2, pageSize: 5, sortField: 'title', sortDirection: SortDirection.DESC });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -142,10 +146,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `title`;
       navigateParams[`test.sd`] = `DESC`;
 
-      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should update the route with the provided page params and url while keeping the existing non provided ones', () => {
-      service.updateRouteWithUrl('test',['someUrl'], {page: 2});
+      service.updateRouteWithUrl('test',['someUrl'], { page: 2 });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -153,10 +157,10 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], { queryParams: navigateParams, queryParamsHandling: 'merge' });
     });
     it('should pass on navigationExtras to router.navigate', () => {
-      service.updateRouteWithUrl('test',['someUrl'], {page: 2}, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      service.updateRouteWithUrl('test',['someUrl'], { page: 2 }, undefined, undefined, { queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
 
       const navigateParams = {};
       navigateParams[`test.page`] = `2`;
@@ -164,7 +168,7 @@ describe('PaginationService', () => {
       navigateParams[`test.sf`] = `score`;
       navigateParams[`test.sd`] = `ASC`;
 
-      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], {queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
+      expect(router.navigate).toHaveBeenCalledWith(['someUrl'], { queryParams: navigateParams, queryParamsHandling: 'preserve', replaceUrl: true, preserveFragment: true });
     });
   });
   describe('clearPagination', () => {
@@ -186,7 +190,7 @@ describe('PaginationService', () => {
 
       service.updateRoute('another-id', {});
 
-      expect(router.navigate).toHaveBeenCalledWith([], {queryParams: Object.assign({}, resetParams, navigateParams), queryParamsHandling: 'merge'});
+      expect(router.navigate).toHaveBeenCalledWith([], { queryParams: Object.assign({}, resetParams, navigateParams), queryParamsHandling: 'merge' });
     });
   });
   describe('getPageParam', () => {
diff --git a/src/app/core/pagination/pagination.service.ts b/src/app/core/pagination/pagination.service.ts
index ce4c3adc3c..0597daa363 100644
--- a/src/app/core/pagination/pagination.service.ts
+++ b/src/app/core/pagination/pagination.service.ts
@@ -1,14 +1,33 @@
 import { Injectable } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
-import { RouteService } from '../services/route.service';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { difference } from '../../shared/object.util';
-import { FindListOptions } from '../data/find-list-options.model';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { isNumeric } from '../../shared/numeric.util';
+import { difference } from '../../shared/object.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../cache/models/sort-options.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RouteService } from '../services/route.service';
+import { PaginationRouteParams } from './pagination-route-params.interface';
 
 @Injectable({
   providedIn: 'root',
@@ -33,7 +52,7 @@ export class PaginationService {
   private clearParams = {};
 
   constructor(protected routeService: RouteService,
-              protected router: Router
+              protected router: Router,
   ) {
   }
 
@@ -50,9 +69,9 @@ export class PaginationService {
       map(([page, size]) => {
         return Object.assign(new PaginationComponentOptions(), defaultPagination, {
           currentPage: this.convertToNumeric(page, defaultPagination.currentPage),
-          pageSize: this.getBestMatchPageSize(size, defaultPagination)
+          pageSize: this.getBestMatchPageSize(size, defaultPagination),
         });
-      })
+      }),
     );
   }
 
@@ -70,10 +89,10 @@ export class PaginationService {
     const sortDirection$ = this.routeService.getQueryParameterValue(`${paginationId}.sd`);
     const sortField$ = this.routeService.getQueryParameterValue(`${paginationId}.sf`);
     return observableCombineLatest([sortDirection$, sortField$]).pipe(map(([sortDirection, sortField]) => {
-        const field = sortField || defaultSort?.field;
-        const direction = SortDirection[sortDirection] || defaultSort?.direction;
-        return new SortOptions(field, direction);
-      })
+      const field = sortField || defaultSort?.field;
+      const direction = SortDirection[sortDirection] || defaultSort?.direction;
+      return new SortOptions(field, direction);
+    }),
     );
   }
 
@@ -97,7 +116,7 @@ export class PaginationService {
         return Object.assign(new FindListOptions(), defaultFindList, {
           sort: currentSortOptions,
           currentPage: currentPagination.currentPage,
-          elementsPerPage: currentPagination.pageSize
+          elementsPerPage: currentPagination.pageSize,
         });
       }));
   }
@@ -107,7 +126,7 @@ export class PaginationService {
    * @param paginationId - The pagination id for which to reset the page
    */
   resetPage(paginationId: string) {
-    this.updateRoute(paginationId, {page: 1});
+    this.updateRoute(paginationId, { page: 1 });
   }
 
 
@@ -121,13 +140,8 @@ export class PaginationService {
    */
   updateRoute(
     paginationId: string,
-    params: {
-      page?: number
-      pageSize?: number
-      sortField?: string
-      sortDirection?: SortDirection
-    },
-    extraParams?,
+    params: PaginationRouteParams,
+    extraParams?: Record<string, unknown>,
     retainScrollPosition?: boolean,
     navigationExtras?: NavigationExtras,
   ) {
@@ -147,13 +161,8 @@ export class PaginationService {
   updateRouteWithUrl(
     paginationId: string,
     url: string[],
-    params: {
-      page?: number
-      pageSize?: number
-      sortField?: string
-      sortDirection?: SortDirection
-    },
-    extraParams?,
+    params: PaginationRouteParams,
+    extraParams?: Record<string, unknown>,
     retainScrollPosition?: boolean,
     navigationExtras?: NavigationExtras,
   ) {
@@ -215,16 +224,11 @@ export class PaginationService {
           sortField: findListoptions.sort.field,
           sortDirection: findListoptions.sort.direction,
         };
-      })
+      }),
     );
   }
 
-  private getParametersWithIdName(paginationId: string, params: {
-    page?: number
-    pageSize?: number
-    sortField?: string
-    sortDirection?: SortDirection
-  }) {
+  private getParametersWithIdName(paginationId: string, params: PaginationRouteParams) {
     const paramsWithIdName = {};
     if (hasValue(params.page)) {
       paramsWithIdName[`${paginationId}.page`] = `${params.page}`;
diff --git a/src/app/core/profile/model/researcher-profile.model.ts b/src/app/core/profile/model/researcher-profile.model.ts
index 6c8b19db40..d26156123c 100644
--- a/src/app/core/profile/model/researcher-profile.model.ts
+++ b/src/app/core/profile/model/researcher-profile.model.ts
@@ -1,15 +1,22 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
 
-import { link, typedObject } from '../../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { RemoteData } from '../../data/remote-data';
 import { HALLink } from '../../shared/hal-link.model';
+import { Item } from '../../shared/item.model';
+import { ITEM } from '../../shared/item.resource-type';
 import { ResourceType } from '../../shared/resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { RESEARCHER_PROFILE } from './researcher-profile.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
-import { RemoteData } from '../../data/remote-data';
-import { ITEM } from '../../shared/item.resource-type';
-import { Item } from '../../shared/item.model';
 
 /**
  * Class the represents a Researcher Profile.
@@ -24,28 +31,28 @@ export class ResearcherProfile extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this Researcher Profile
    */
   @autoserialize
-  id: string;
+    id: string;
 
   @deserializeAs('id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The visibility of this Researcher Profile
    */
   @autoserialize
-  visible: boolean;
+    visible: boolean;
 
   /**
    * The {@link HALLink}s for this Researcher Profile
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     item: HALLink,
     eperson: HALLink
@@ -56,6 +63,6 @@ export class ResearcherProfile extends CacheableObject {
    * Will be undefined unless the item {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  item?: Observable<RemoteData<Item>>;
+    item?: Observable<RemoteData<Item>>;
 
 }
diff --git a/src/app/core/profile/researcher-profile-data.service.spec.ts b/src/app/core/profile/researcher-profile-data.service.spec.ts
index b93e33e2c5..ccaa7063dd 100644
--- a/src/app/core/profile/researcher-profile-data.service.spec.ts
+++ b/src/app/core/profile/researcher-profile-data.service.spec.ts
@@ -1,33 +1,43 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
+import { ReplaceOperation } from 'fast-json-patch';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { 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 { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from '../data/paginated-list.model';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { RestResponse } from '../cache/response.models';
-import { RequestEntry } from '../data/request-entry.model';
-import { ResearcherProfileDataService } from './researcher-profile-data.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
-import { ResearcherProfile } from './model/researcher-profile.model';
-import { Item } from '../shared/item.model';
-import { ReplaceOperation } from 'fast-json-patch';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PostRequest } from '../data/request.models';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { ConfigurationProperty } from '../shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
 import { testCreateDataImplementation } from '../data/base/create-data.spec';
-import { testSearchDataImplementation } from '../data/base/search-data.spec';
-import { testPatchDataImplementation } from '../data/base/patch-data.spec';
 import { testDeleteDataImplementation } from '../data/base/delete-data.spec';
+import { testPatchDataImplementation } from '../data/base/patch-data.spec';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { buildPaginatedList } from '../data/paginated-list.model';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { ConfigurationProperty } from '../shared/configuration-property.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { ResearcherProfile } from './model/researcher-profile.model';
+import { ResearcherProfileDataService } from './researcher-profile-data.service';
 
 describe('ResearcherProfileService', () => {
   let scheduler: TestScheduler;
@@ -46,9 +56,9 @@ describe('ResearcherProfileService', () => {
     id: itemId,
     _links: {
       self: {
-        href: `https://rest.api/rest/api/items/${itemId}`
+        href: `https://rest.api/rest/api/items/${itemId}`,
       },
-    }
+    },
   });
   const researcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
     id: researcherProfileId,
@@ -56,12 +66,12 @@ describe('ResearcherProfileService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const researcherProfilePatched: ResearcherProfile = Object.assign(new ResearcherProfile(), {
@@ -70,12 +80,12 @@ describe('ResearcherProfileService', () => {
     type: 'profile',
     _links: {
       item: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}/item`,
       },
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId}`,
       },
-    }
+    },
   });
 
   const researcherProfileId2 = 'agbf9946-f4ce-479e-8f11-b90cbe9f7241';
@@ -85,9 +95,9 @@ describe('ResearcherProfileService', () => {
     type: 'profile',
     _links: {
       self: {
-        href: `https://rest.api/rest/api/profiles/${researcherProfileId2}`
+        href: `https://rest.api/rest/api/profiles/${researcherProfileId2}`,
       },
-    }
+    },
   });
 
   const mockItemUnlinkedToOrcid: Item = Object.assign(new Item(), {
@@ -95,105 +105,105 @@ describe('ResearcherProfileService', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
-    }
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'researcher-profile-id',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   const disconnectionAllowAdmin = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['only_admin']
+    values: ['only_admin'],
   } as ConfigurationProperty;
 
   const disconnectionAllowAdminOwner = {
     uuid: 'orcid.disconnection.allowed-users',
     name: 'orcid.disconnection.allowed-users',
-    values: ['admin_and_owner']
+    values: ['admin_and_owner'],
   } as ConfigurationProperty;
 
   const authorizeUrl = {
     uuid: 'orcid.authorize-url',
     name: 'orcid.authorize-url',
-    values: ['orcid.authorize-url']
+    values: ['orcid.authorize-url'],
   } as ConfigurationProperty;
   const appClientId = {
     uuid: 'orcid.application-client-id',
     name: 'orcid.application-client-id',
-    values: ['orcid.application-client-id']
+    values: ['orcid.application-client-id'],
   } as ConfigurationProperty;
   const orcidScope = {
     uuid: 'orcid.scope',
     name: 'orcid.scope',
-    values: ['/authenticate', '/read-limited']
+    values: ['/authenticate', '/read-limited'],
   } as ConfigurationProperty;
 
   const endpointURL = `https://rest.api/rest/api/profiles`;
@@ -212,7 +222,7 @@ describe('ResearcherProfileService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: endpointURL })
+      getEndpoint: cold('a', { a: endpointURL }),
     });
 
     responseCacheEntry = new RequestEntry();
@@ -225,18 +235,18 @@ describe('ResearcherProfileService', () => {
       removeByHrefSubstring: {},
       getByHref: observableOf(responseCacheEntry),
       getByUUID: observableOf(responseCacheEntry),
-      setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring')
+      setStaleByHrefSubstring: jasmine.createSpy('setStaleByHrefSubstring'),
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: hot('a|', {
-        a: researcherProfileRD
+        a: researcherProfileRD,
       }),
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: hot('a|', {
-        a: researcherProfileRD
-      })
+        a: researcherProfileRD,
+      }),
     });
     objectCache = {} as ObjectCacheService;
     const notificationsService = {} as NotificationsService;
@@ -244,7 +254,7 @@ describe('ResearcherProfileService', () => {
     const comparator = {} as any;
     routerStub = new RouterMock();
     const itemService = jasmine.createSpyObj('ItemService', {
-      findByHref: jasmine.createSpy('findByHref')
+      findByHref: jasmine.createSpy('findByHref'),
     });
 
     service = new ResearcherProfileDataService(
@@ -287,7 +297,7 @@ describe('ResearcherProfileService', () => {
     it('should return the RemoteData<ResearcherProfile> created', () => {
       const result = service.create();
       const expected = cold('a|', {
-        a: researcherProfileRD
+        a: researcherProfileRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -319,7 +329,7 @@ describe('ResearcherProfileService', () => {
       it('should return a ResearcherProfile object with the given id', () => {
         const result = service.findRelatedItemId(researcherProfile);
         const expected = cold('(a|)', {
-          a: itemId
+          a: itemId,
         });
         expect(result).toBeObservable(expected);
       });
@@ -341,7 +351,7 @@ describe('ResearcherProfileService', () => {
       it('should not return a ResearcherProfile object with the given id', () => {
         const result = service.findRelatedItemId(researcherProfile);
         const expected = cold('(a|)', {
-          a: null
+          a: null,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/profile/researcher-profile-data.service.ts b/src/app/core/profile/researcher-profile-data.service.ts
index 8c62879c37..3f287ab967 100644
--- a/src/app/core/profile/researcher-profile-data.service.ts
+++ b/src/app/core/profile/researcher-profile-data.service.ts
@@ -1,38 +1,66 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  Operation,
+  ReplaceOperation,
+} from 'fast-json-patch';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  find,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { Operation, ReplaceOperation } from 'fast-json-patch';
-import { Observable } from 'rxjs';
-import { find, map } from 'rxjs/operators';
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../data/base/patch-data';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
 import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
 import { ItemDataService } from '../data/item-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { PostRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
 import { ResearcherProfile } from './model/researcher-profile.model';
 import { RESEARCHER_PROFILE } from './model/researcher-profile.resource-type';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PostRequest } from '../data/request.models';
-import { hasValue, isEmpty } from '../../shared/empty.util';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Item } from '../shared/item.model';
-import { createFailedRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { CreateData, CreateDataImpl } from '../data/base/create-data';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PatchData, PatchDataImpl } from '../data/base/patch-data';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { PaginatedList } from '../data/paginated-list.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with researcher profile endpoint.
@@ -86,7 +114,7 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     const relatedItem$ = researcherProfile.item ? researcherProfile.item : this.itemService.findByHref(researcherProfile._links.item.href, false);
     return relatedItem$.pipe(
       getFirstCompletedRemoteData(),
-      map((itemRD: RemoteData<Item>) => (itemRD.hasSucceeded && itemRD.payload) ? itemRD.payload.id : null)
+      map((itemRD: RemoteData<Item>) => (itemRD.hasSucceeded && itemRD.payload) ? itemRD.payload.id : null),
     );
   }
 
@@ -100,7 +128,7 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     const replaceOperation: ReplaceOperation<boolean> = {
       path: '/visible',
       op: 'replace',
-      value: visible
+      value: visible,
     };
 
     return this.patch(researcherProfile, [replaceOperation]);
@@ -130,6 +158,24 @@ export class ResearcherProfileDataService extends IdentifiableDataService<Resear
     return this.rdbService.buildFromRequestUUID(requestId, followLink('item'));
   }
 
+  /**
+   * Creates a researcher profile starting from an external source URI and returns the related item's ID
+   * Emits null if the researcher profile doesn't exist after sending out the request
+   * @param sourceUri
+   */
+  createFromExternalSourceAndReturnRelatedItemId(sourceUri: string): Observable<string> {
+    return this.createFromExternalSource(sourceUri).pipe(
+      getFirstCompletedRemoteData(),
+      mergeMap((rd: RemoteData<ResearcherProfile>) => {
+        if (rd.hasSucceeded) {
+          return this.findRelatedItemId(rd.payload);
+        } else {
+          return observableOf(null);
+        }
+      }),
+    );
+  }
+
 
   /**
    * Create a new object on the server, and store the response in the object cache
diff --git a/src/app/core/registry/registry.service.spec.ts b/src/app/core/registry/registry.service.spec.ts
index e9dfbe7e2c..4f4be0fb27 100644
--- a/src/app/core/registry/registry.service.spec.ts
+++ b/src/app/core/registry/registry.service.spec.ts
@@ -1,9 +1,16 @@
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 import { TestBed } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -14,22 +21,25 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
+import { storeModuleConfig } from '../../app.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { StoreMock } from '../../shared/testing/store.mock';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { StoreMock } from '../../shared/testing/store.mock';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FindListOptions } from '../data/find-list-options.model';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { RemoteData } from '../data/remote-data';
 import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { RegistryService } from './registry.service';
-import { storeModuleConfig } from '../../app.reducer';
-import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
-import { MetadataFieldDataService } from '../data/metadata-field-data.service';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { RemoteData } from '../data/remote-data';
 import { NoContent } from '../shared/NoContent.model';
-import { FindListOptions } from '../data/find-list-options.model';
+import { RegistryService } from './registry.service';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -48,28 +58,28 @@ describe('RegistryService', () => {
   function init() {
     options = Object.assign(new FindListOptions(), {
       currentPage: 1,
-      elementsPerPage: 20
+      elementsPerPage: 20,
     });
 
     mockSchemasList = [
       Object.assign(new MetadataSchema(), {
         id: 1,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/1' },
         },
         prefix: 'dc',
         namespace: 'http://dublincore.org/documents/dcmi-terms/',
-        type: MetadataSchema.type
+        type: MetadataSchema.type,
       }),
       Object.assign(new MetadataSchema(), {
         id: 2,
         _links: {
-          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' }
+          self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadataschemas/2' },
         },
         prefix: 'mock',
         namespace: 'http://dspace.org/mockschema',
-        type: MetadataSchema.type
-      })
+        type: MetadataSchema.type,
+      }),
     ];
 
     mockFieldsList = [
@@ -77,50 +87,50 @@ describe('RegistryService', () => {
         {
           id: 1,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/8' },
           },
           element: 'contributor',
           qualifier: 'advisor',
           scopeNote: null,
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
-          type: MetadataField.type
+          type: MetadataField.type,
         }),
       Object.assign(new MetadataField(),
         {
           id: 2,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/9' },
           },
           element: 'contributor',
           qualifier: 'author',
           scopeNote: null,
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
-          type: MetadataField.type
+          type: MetadataField.type,
         }),
       Object.assign(new MetadataField(),
         {
           id: 3,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/10' },
           },
           element: 'contributor',
           qualifier: 'editor',
           scopeNote: 'test scope note',
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
-          type: MetadataField.type
+          type: MetadataField.type,
         }),
       Object.assign(new MetadataField(),
         {
           id: 4,
           _links: {
-            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' }
+            self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/metadatafields/11' },
           },
           element: 'contributor',
           qualifier: 'illustrator',
           scopeNote: null,
           schema: createSuccessfulRemoteDataObject$(mockSchemasList[1]),
-          type: MetadataField.type
-        })
+          type: MetadataField.type,
+        }),
     ];
 
     metadataSchemaService = jasmine.createSpyObj('metadataSchemaService', {
@@ -128,7 +138,7 @@ describe('RegistryService', () => {
       findById: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
       createOrUpdateMetadataSchema: createSuccessfulRemoteDataObject$(mockSchemasList[0]),
       delete: createNoContentRemoteDataObject$(),
-      clearRequests: observableOf('href')
+      clearRequests: observableOf('href'),
     });
 
     metadataFieldService = jasmine.createSpyObj('metadataFieldService', {
@@ -137,7 +147,7 @@ describe('RegistryService', () => {
       create: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
       put: createSuccessfulRemoteDataObject$(mockFieldsList[0]),
       delete: createNoContentRemoteDataObject$(),
-      clearRequests: observableOf('href')
+      clearRequests: observableOf('href'),
     });
   }
 
@@ -146,15 +156,15 @@ describe('RegistryService', () => {
     TestBed.configureTestingModule({
       imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot()],
       declarations: [
-        DummyComponent
+        DummyComponent,
       ],
       providers: [
         { provide: Store, useClass: StoreMock },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: MetadataSchemaDataService, useValue: metadataSchemaService },
         { provide: MetadataFieldDataService, useValue: metadataFieldService },
-        RegistryService
-      ]
+        RegistryService,
+      ],
     });
     registryService = TestBed.inject(RegistryService);
     mockStore = TestBed.inject(Store);
diff --git a/src/app/core/registry/registry.service.ts b/src/app/core/registry/registry.service.ts
index 7a377405bd..dfa87d8d2a 100644
--- a/src/app/core/registry/registry.service.ts
+++ b/src/app/core/registry/registry.service.ts
@@ -1,12 +1,20 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/empty.util';
-import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
-import { createSelector, select, Store } from '@ngrx/store';
-import { AppState } from '../../app.reducer';
-import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
 import {
   MetadataRegistryCancelFieldAction,
   MetadataRegistryCancelSchemaAction,
@@ -17,19 +25,27 @@ import {
   MetadataRegistryEditFieldAction,
   MetadataRegistryEditSchemaAction,
   MetadataRegistrySelectFieldAction,
-  MetadataRegistrySelectSchemaAction
+  MetadataRegistrySelectSchemaAction,
 } from '../../admin/admin-registries/metadata-registry/metadata-registry.actions';
-import { map, mergeMap, tap } from 'rxjs/operators';
+import { MetadataRegistryState } from '../../admin/admin-registries/metadata-registry/metadata-registry.reducers';
+import { AppState } from '../../app.reducer';
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmptyOperator,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { MetadataSchema } from '../metadata/metadata-schema.model';
-import { MetadataField } from '../metadata/metadata-field.model';
-import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
-import { MetadataFieldDataService } from '../data/metadata-field-data.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RequestParam } from '../cache/models/request-param.model';
-import { NoContent } from '../shared/NoContent.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { MetadataFieldDataService } from '../data/metadata-field-data.service';
+import { MetadataSchemaDataService } from '../data/metadata-schema-data.service';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { MetadataField } from '../metadata/metadata-field.model';
+import { MetadataSchema } from '../metadata/metadata-schema.model';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstSucceededRemoteDataPayload } from '../shared/operators';
 
 const metadataRegistryStateSelector = (state: AppState) => state.metadataRegistry;
 const editMetadataSchemaSelector = createSelector(metadataRegistryStateSelector, (metadataState: MetadataRegistryState) => metadataState.editSchema);
@@ -78,14 +94,14 @@ export class RegistryService {
   public getMetadataSchemaByPrefix(prefix: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<MetadataSchema>[]): Observable<RemoteData<MetadataSchema>> {
     // Temporary options to get ALL metadataschemas until there's a rest api endpoint for fetching a specific schema
     const options: FindListOptions = Object.assign(new FindListOptions(), {
-      elementsPerPage: 10000
+      elementsPerPage: 10000,
     });
     return this.getMetadataSchemas(options).pipe(
       getFirstSucceededRemoteDataPayload(),
       map((schemas: PaginatedList<MetadataSchema>) => schemas.page),
       isNotEmptyOperator(),
       map((schemas: MetadataSchema[]) => schemas.filter((schema) => schema.prefix === prefix)[0]),
-      mergeMap((schema: MetadataSchema) => this.metadataSchemaService.findById(`${schema.id}`, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      mergeMap((schema: MetadataSchema) => this.metadataSchemaService.findById(`${schema.id}`, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
@@ -219,7 +235,7 @@ export class RegistryService {
       hasValueOperator(),
       tap(() => {
         this.showNotifications(true, isUpdate, false, { prefix: schema.prefix });
-      })
+      }),
     );
   }
 
@@ -253,7 +269,7 @@ export class RegistryService {
       hasValueOperator(),
       tap(() => {
         this.showNotifications(true, false, true, { field: field.toString() });
-      })
+      }),
     );
   }
 
@@ -271,7 +287,7 @@ export class RegistryService {
       hasValueOperator(),
       tap(() => {
         this.showNotifications(true, true, true, { field: field.toString() });
-      })
+      }),
     );
   }
 
@@ -296,7 +312,7 @@ export class RegistryService {
     const editedString = edited ? 'edited' : 'created';
     const messages = observableCombineLatest(
       this.translateService.get(success ? `${prefix}.${suffix}` : `${prefix}.${suffix}`),
-      this.translateService.get(`${prefix}${isField ? '.field' : ''}.${editedString}`, options)
+      this.translateService.get(`${prefix}${isField ? '.field' : ''}.${editedString}`, options),
     );
     messages.subscribe(([head, content]) => {
       if (success) {
diff --git a/src/app/core/reload/reload.guard.spec.ts b/src/app/core/reload/reload.guard.spec.ts
index 6146f51572..d7b92146af 100644
--- a/src/app/core/reload/reload.guard.spec.ts
+++ b/src/app/core/reload/reload.guard.spec.ts
@@ -1,4 +1,5 @@
 import { Router } from '@angular/router';
+
 import { AppConfig } from '../../../config/app-config.interface';
 import { DefaultAppConfig } from '../../../config/default-app-config';
 import { ReloadGuard } from './reload.guard';
@@ -24,8 +25,8 @@ describe('ReloadGuard', () => {
         redirectUrl = '/redirect/url?param=extra';
         route = {
           queryParams: {
-            redirect: redirectUrl
-          }
+            redirect: redirectUrl,
+          },
         };
       });
 
@@ -38,7 +39,7 @@ describe('ReloadGuard', () => {
     describe('when the route\'s query params doesn\'t contain a redirect url', () => {
       beforeEach(() => {
         route = {
-          queryParams: {}
+          queryParams: {},
         };
       });
 
diff --git a/src/app/core/reload/reload.guard.ts b/src/app/core/reload/reload.guard.ts
index 1e99a5687a..0608293e33 100644
--- a/src/app/core/reload/reload.guard.ts
+++ b/src/app/core/reload/reload.guard.ts
@@ -1,6 +1,19 @@
-import { Inject, Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { AppConfig, APP_CONFIG } from '../../../config/app-config.interface';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
 import { isNotEmpty } from '../../shared/empty.util';
 
 /**
diff --git a/src/app/core/resolving/resolver.actions.ts b/src/app/core/resolving/resolver.actions.ts
index db41d20b6e..66f075be7c 100644
--- a/src/app/core/resolving/resolver.actions.ts
+++ b/src/app/core/resolving/resolver.actions.ts
@@ -1,9 +1,10 @@
-import { type } from '../../shared/ngrx/type';
 import { Action } from '@ngrx/store';
+
+import { type } from '../../shared/ngrx/type';
 import { DSpaceObject } from '../shared/dspace-object.model';
 
 export const ResolverActionTypes = {
-  RESOLVED: type('dspace/resolver/RESOLVED')
+  RESOLVED: type('dspace/resolver/RESOLVED'),
 };
 
 /**
diff --git a/src/app/core/resource-policy/models/resource-policy.model.ts b/src/app/core/resource-policy/models/resource-policy.model.ts
index b0608dfbca..d4558cfe3a 100644
--- a/src/app/core/resource-policy/models/resource-policy.model.ts
+++ b/src/app/core/resource-policy/models/resource-policy.model.ts
@@ -1,19 +1,27 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
-import { link, typedObject } from '../../cache/builders/build-decorators';
-import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
-import { ActionType } from './action-type.model';
-import { HALLink } from '../../shared/hal-link.model';
-import { RESOURCE_POLICY } from './resource-policy.resource-type';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
-import { PolicyType } from './policy-type.model';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { GROUP } from '../../eperson/models/group.resource-type';
-import { Group } from '../../eperson/models/group.model';
-import { EPERSON } from '../../eperson/models/eperson.resource-type';
-import { EPerson } from '../../eperson/models/eperson.model';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { CacheableObject } from '../../cache/cacheable-object.model';
+import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { RemoteData } from '../../data/remote-data';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { EPERSON } from '../../eperson/models/eperson.resource-type';
+import { Group } from '../../eperson/models/group.model';
+import { GROUP } from '../../eperson/models/group.resource-type';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { ActionType } from './action-type.model';
+import { PolicyType } from './policy-type.model';
+import { RESOURCE_POLICY } from './resource-policy.resource-type';
 
 /**
  * Model class for a Resource Policy
@@ -26,50 +34,50 @@ export class ResourcePolicy implements CacheableObject {
    * The identifier for this Resource Policy
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name for this Resource Policy
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * The description for this Resource Policy
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The classification or this Resource Policy
    */
   @autoserialize
-  policyType: PolicyType;
+    policyType: PolicyType;
 
   /**
    * The action that is allowed by this Resource Policy
    */
   @autoserialize
-  action: ActionType;
+    action: ActionType;
 
   /**
    * The first day of validity of the policy (format YYYY-MM-DD)
    */
   @autoserialize
-  startDate: string;
+    startDate: string;
 
   /**
    * The last day of validity of the policy (format YYYY-MM-DD)
    */
   @autoserialize
-  endDate: string;
+    endDate: string;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The universally unique identifier for this Resource Policy
@@ -77,13 +85,13 @@ export class ResourcePolicy implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('resource-policy'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The {@link HALLink}s for this ResourcePolicy
    */
   @deserialize
-  _links: {
+    _links: {
     eperson: HALLink,
     group: HALLink,
     self: HALLink,
@@ -94,12 +102,12 @@ export class ResourcePolicy implements CacheableObject {
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The group linked by this resource policy
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(GROUP)
-  group?: Observable<RemoteData<Group>>;
+    group?: Observable<RemoteData<Group>>;
 }
diff --git a/src/app/core/resource-policy/resource-policy-data.service.spec.ts b/src/app/core/resource-policy/resource-policy-data.service.spec.ts
index 7cfcaabb5d..1af36c1254 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.spec.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.spec.ts
@@ -1,32 +1,37 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { ResourcePolicyDataService } from './resource-policy-data.service';
-import { PolicyType } from './models/policy-type.model';
-import { ActionType } from './models/action-type.model';
-import { RequestParam } from '../cache/models/request-param.model';
-import { PageInfo } from '../shared/page-info.model';
-import { buildPaginatedList } from '../data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { RequestEntry } from '../data/request-entry.model';
 import { FindListOptions } from '../data/find-list-options.model';
+import { buildPaginatedList } from '../data/paginated-list.model';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { RestRequestMethod } from '../data/rest-request-method';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
-import { RestRequestMethod } from '../data/rest-request-method';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { PageInfo } from '../shared/page-info.model';
+import { ActionType } from './models/action-type.model';
+import { PolicyType } from './models/policy-type.model';
+import { ResourcePolicyDataService } from './resource-policy-data.service';
 
 describe('ResourcePolicyService', () => {
   let scheduler: TestScheduler;
   let service: ResourcePolicyDataService;
   let requestService: RequestService;
   let rdbService: RemoteDataBuildService;
-  let objectCache: ObjectCacheService;
+  let objectCache: ObjectCacheServiceStub;
   let halService: HALEndpointService;
   let responseCacheEntry: RequestEntry;
   let ePersonService: EPersonDataService;
@@ -44,15 +49,15 @@ describe('ResourcePolicyService', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
-    }
+    },
   };
 
   const anotherResourcePolicy: any = {
@@ -67,15 +72,15 @@ describe('ResourcePolicyService', () => {
     uuid: 'resource-policy-2',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
-    }
+    },
   };
   const endpointURL = `https://rest.api/rest/api/resourcepolicies`;
   const requestURL = `https://rest.api/rest/api/resourcepolicies/${resourcePolicy.id}`;
@@ -97,7 +102,7 @@ describe('ResourcePolicyService', () => {
     scheduler = getTestScheduler();
 
     halService = jasmine.createSpyObj('halService', {
-      getEndpoint: cold('a', { a: endpointURL })
+      getEndpoint: cold('a', { a: endpointURL }),
     });
 
     responseCacheEntry = new RequestEntry();
@@ -114,39 +119,39 @@ describe('ResourcePolicyService', () => {
     });
     rdbService = jasmine.createSpyObj('rdbService', {
       buildSingle: hot('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       }),
       buildList: hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }),
       buildFromRequestUUID: hot('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       }),
       buildFromRequestUUIDAndAwait: hot('a|', {
-        a: resourcePolicyRD
-      })
+        a: resourcePolicyRD,
+      }),
     });
     ePersonService = jasmine.createSpyObj('ePersonService', {
       getBrowseEndpoint: hot('a', {
-        a: ePersonEndpoint
+        a: ePersonEndpoint,
       }),
       getIDHrefObs: cold('a', {
-        a: 'https://rest.api/rest/api/eperson/epersons/' + epersonUUID
+        a: 'https://rest.api/rest/api/eperson/epersons/' + epersonUUID,
       }),
     });
     groupService = jasmine.createSpyObj('groupService', {
       getIDHrefObs: cold('a', {
-        a: 'https://rest.api/rest/api/eperson/groups/' + groupUUID
+        a: 'https://rest.api/rest/api/eperson/groups/' + groupUUID,
       }),
     });
-    objectCache = {} as ObjectCacheService;
+    objectCache = new ObjectCacheServiceStub();
     const notificationsService = {} as NotificationsService;
     const comparator = {} as any;
 
     service = new ResourcePolicyDataService(
       requestService,
       rdbService,
-      objectCache,
+      objectCache as ObjectCacheService,
       halService,
       notificationsService,
       comparator,
@@ -190,7 +195,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
       const result = service.create(resourcePolicy, resourceUUID, epersonUUID);
       const expected = cold('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -218,7 +223,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<ResourcePolicy> for the object with the given id', () => {
       const result = service.findById(resourcePolicyId);
       const expected = cold('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -228,7 +233,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<ResourcePolicy> for the object with the given URL', () => {
       const result = service.findByHref(requestURL);
       const expected = cold('a|', {
-        a: resourcePolicyRD
+        a: resourcePolicyRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -259,7 +264,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
       const result = service.searchByEPerson(epersonUUID, resourceUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -291,7 +296,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
       const result = service.searchByGroup(groupUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
@@ -324,7 +329,7 @@ describe('ResourcePolicyService', () => {
     it('should return a RemoteData<PaginatedList<ResourcePolicy>) for the search', () => {
       const result = service.searchByResource(resourceUUID);
       const expected = cold('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       });
       expect(result).toBeObservable(expected);
     });
diff --git a/src/app/core/resource-policy/resource-policy-data.service.ts b/src/app/core/resource-policy/resource-policy-data.service.ts
index 9f799fe292..6ec6c22e88 100644
--- a/src/app/core/resource-policy/resource-policy-data.service.ts
+++ b/src/app/core/resource-policy/resource-policy-data.service.ts
@@ -1,38 +1,42 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { RequestService } from '../data/request.service';
-import { Collection } from '../shared/collection.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { ResourcePolicy } from './models/resource-policy.model';
-import { RemoteData } from '../data/remote-data';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RESOURCE_POLICY } from './models/resource-policy.resource-type';
-import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
-import { PaginatedList } from '../data/paginated-list.model';
-import { ActionType } from './models/action-type.model';
-import { RequestParam } from '../cache/models/request-param.model';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../shared/empty.util';
-import { first, map } from 'rxjs/operators';
-import { NoContent } from '../shared/NoContent.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CreateDataImpl } from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import { DeleteDataImpl } from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { PatchDataImpl } from '../data/base/patch-data';
+import { SearchDataImpl } from '../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
 import { FindListOptions } from '../data/find-list-options.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { PutRequest } from '../data/request.models';
-import { GenericConstructor } from '../shared/generic-constructor';
+import { PaginatedList } from '../data/paginated-list.model';
 import { ResponseParsingService } from '../data/parsing.service';
+import { RemoteData } from '../data/remote-data';
+import { PutRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
 import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { EPersonDataService } from '../eperson/eperson-data.service';
 import { GroupDataService } from '../eperson/group-data.service';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { CreateDataImpl } from '../data/base/create-data';
-import { SearchDataImpl } from '../data/base/search-data';
-import { PatchDataImpl } from '../data/base/patch-data';
-import { DeleteDataImpl } from '../data/base/delete-data';
-import { dataService } from '../data/base/data-service.decorator';
+import { Collection } from '../shared/collection.model';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { ActionType } from './models/action-type.model';
+import { ResourcePolicy } from './models/resource-policy.model';
+import { RESOURCE_POLICY } from './models/resource-policy.resource-type';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the resourcepolicies endpoint
@@ -212,7 +216,7 @@ export class ResourcePolicyDataService extends IdentifiableDataService<ResourceP
       Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return StatusCodeOnlyResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request);
     });
diff --git a/src/app/core/rest-property/forgot-password-check-guard.guard.ts b/src/app/core/rest-property/forgot-password-check-guard.guard.ts
new file mode 100644
index 0000000000..cc74e8039f
--- /dev/null
+++ b/src/app/core/rest-property/forgot-password-check-guard.guard.ts
@@ -0,0 +1,37 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { AuthService } from '../auth/auth.service';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
+import { SingleFeatureAuthorizationGuard } from '../data/feature-authorization/feature-authorization-guard/single-feature-authorization.guard';
+import { FeatureID } from '../data/feature-authorization/feature-id';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Guard that checks if the forgot-password feature is enabled
+ */
+export class ForgotPasswordCheckGuard extends SingleFeatureAuthorizationGuard {
+
+  constructor(
+    protected readonly authorizationService: AuthorizationDataService,
+    protected readonly router: Router,
+    protected readonly authService: AuthService,
+  ) {
+    super(authorizationService, router, authService);
+  }
+
+  getFeatureID(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return of(FeatureID.EPersonForgotPassword);
+  }
+
+}
diff --git a/src/app/core/roles/role.service.ts b/src/app/core/roles/role.service.ts
index 7a4b6e6ccf..2a135f8224 100644
--- a/src/app/core/roles/role.service.ts
+++ b/src/app/core/roles/role.service.ts
@@ -1,10 +1,12 @@
 import { Injectable } from '@angular/core';
-
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { distinctUntilChanged } from 'rxjs/operators';
 
-import { RoleType } from './role-types';
 import { CollectionDataService } from '../data/collection-data.service';
+import { RoleType } from './role-types';
 
 /**
  * A service that provides methods to identify user role.
@@ -25,7 +27,7 @@ export class RoleService {
    */
   isSubmitter(): Observable<boolean> {
     return this.collectionService.hasAuthorizedCollection().pipe(
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/router/router.actions.ts b/src/app/core/router/router.actions.ts
index e4823536c6..e251895f39 100644
--- a/src/app/core/router/router.actions.ts
+++ b/src/app/core/router/router.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../../shared/ngrx/type';
 
 /**
diff --git a/src/app/core/router/router.effects.ts b/src/app/core/router/router.effects.ts
index c2e3155eff..cee1698b53 100644
--- a/src/app/core/router/router.effects.ts
+++ b/src/app/core/router/router.effects.ts
@@ -1,9 +1,20 @@
-import { filter, map, pairwise } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import * as fromRouter from '@ngrx/router-store';
-import { RouterNavigationAction } from '@ngrx/router-store';
 import { Router } from '@angular/router';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  ROUTER_NAVIGATION,
+  RouterNavigationAction,
+} from '@ngrx/router-store';
+import {
+  filter,
+  map,
+  pairwise,
+} from 'rxjs/operators';
+
 import { RouteUpdateAction } from './router.actions';
 
 @Injectable()
@@ -12,9 +23,9 @@ export class RouterEffects {
    * Effect that fires a new RouteUpdateAction when then path of route is changed
    * @type {Observable<RouteUpdateAction>}
    */
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
-      ofType(fromRouter.ROUTER_NAVIGATION),
+      ofType(ROUTER_NAVIGATION),
       pairwise(),
       map((actions: RouterNavigationAction[]) =>
         actions.map((navigateAction) => {
@@ -22,7 +33,7 @@ export class RouterEffects {
           return urlTree.root.children.primary.segments.map((it) => it.path).join('/');
         })),
       filter((actions: string[]) => actions[0] !== actions[1]),
-      map(() => new RouteUpdateAction())
+      map(() => new RouteUpdateAction()),
     ));
 
   constructor(private actions$: Actions, private router: Router) {
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..ad2120aaaa 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,97 @@
-import { ServerCheckGuard } from './server-check.guard';
-import { Router } from '@angular/router';
+import {
+  NavigationEnd,
+  NavigationStart,
+  Router,
+  RouterEvent,
+  UrlTree,
+} from '@angular/router';
+import {
+  of,
+  ReplaySubject,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
-import { of } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
 import { RootDataService } from '../data/root-data.service';
+import { ServerCheckGuard } from './server-check.guard';
 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..ccad01d57e 100644
--- a/src/app/core/server-check/server-check.guard.ts
+++ b/src/app/core/server-check/server-check.guard.ts
@@ -1,14 +1,24 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivateChild, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  ActivatedRouteSnapshot,
+  CanActivateChild,
+  NavigationStart,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { take, tap } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { RootDataService } from '../data/root-data.service';
 import { getPageInternalServerErrorRoute } from '../../app-routing-paths';
+import { RootDataService } from '../data/root-data.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * A guard that checks if root api endpoint is reachable.
@@ -23,17 +33,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.spec.ts b/src/app/core/services/browser-hard-redirect.service.spec.ts
index 1d8666d259..859bfdc8aa 100644
--- a/src/app/core/services/browser-hard-redirect.service.spec.ts
+++ b/src/app/core/services/browser-hard-redirect.service.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed } from '@angular/core/testing';
+
 import { BrowserHardRedirectService } from './browser-hard-redirect.service';
 
 describe('BrowserHardRedirectService', () => {
@@ -15,7 +16,7 @@ describe('BrowserHardRedirectService', () => {
       origin,
       replace: (url: string) => {
         mockLocation.href = url;
-      }
+      },
     } as Location;
     spyOn(mockLocation, 'replace');
 
diff --git a/src/app/core/services/browser-hard-redirect.service.ts b/src/app/core/services/browser-hard-redirect.service.ts
index 4ef9548899..c386e82f2e 100644
--- a/src/app/core/services/browser-hard-redirect.service.ts
+++ b/src/app/core/services/browser-hard-redirect.service.ts
@@ -1,4 +1,9 @@
-import { Inject, Injectable, InjectionToken } from '@angular/core';
+import {
+  Inject,
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
+
 import { HardRedirectService } from './hard-redirect.service';
 
 export const LocationToken = new InjectionToken('Location');
@@ -10,7 +15,7 @@ export function locationProvider(): Location {
 /**
  * Service for performing hard redirects within the browser app module
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class BrowserHardRedirectService extends HardRedirectService {
 
   constructor(
@@ -38,8 +43,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/browser.referrer.service.spec.ts b/src/app/core/services/browser.referrer.service.spec.ts
new file mode 100644
index 0000000000..90ce43c995
--- /dev/null
+++ b/src/app/core/services/browser.referrer.service.spec.ts
@@ -0,0 +1,69 @@
+import { of as observableOf } from 'rxjs';
+
+import { BrowserReferrerService } from './browser.referrer.service';
+import { RouteService } from './route.service';
+
+describe(`BrowserReferrerService`, () => {
+  let service: BrowserReferrerService;
+  const documentReferrer = 'https://www.referrer.com';
+  const origin = 'https://www.dspace.org';
+  let routeService: RouteService;
+
+  beforeEach(() => {
+    routeService = {
+      getHistory: () => observableOf([]),
+    } as any;
+    service = new BrowserReferrerService(
+      { referrer: documentReferrer },
+      routeService,
+      { getCurrentOrigin: () => origin } as any,
+    );
+  });
+
+  describe(`getReferrer`, () => {
+    describe(`when the history is an empty`, () => {
+      beforeEach(() => {
+        spyOn(routeService, 'getHistory').and.returnValue(observableOf([]));
+      });
+
+      it(`should return document.referrer`, (done: DoneFn) => {
+        service.getReferrer().subscribe((emittedReferrer: string) => {
+          expect(emittedReferrer).toBe(documentReferrer);
+          done();
+        });
+      });
+    });
+
+    describe(`when the history only contains the current route`, () => {
+      beforeEach(() => {
+        spyOn(routeService, 'getHistory').and.returnValue(observableOf(['/current/route']));
+      });
+
+      it(`should return document.referrer`, (done: DoneFn) => {
+        service.getReferrer().subscribe((emittedReferrer: string) => {
+          expect(emittedReferrer).toBe(documentReferrer);
+          done();
+        });
+      });
+    });
+
+    describe(`when the history contains multiple routes`, () => {
+      const prevUrl = '/the/route/we/need';
+      beforeEach(() => {
+        spyOn(routeService, 'getHistory').and.returnValue(observableOf([
+          '/first/route',
+          '/second/route',
+          prevUrl,
+          '/current/route',
+        ]));
+      });
+
+      it(`should return the last route before the current one combined with the origin from HardRedirectService`, (done: DoneFn) => {
+        service.getReferrer().subscribe((emittedReferrer: string) => {
+          expect(emittedReferrer).toBe(origin + prevUrl);
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/core/services/browser.referrer.service.ts b/src/app/core/services/browser.referrer.service.ts
new file mode 100644
index 0000000000..fd2d3d5efd
--- /dev/null
+++ b/src/app/core/services/browser.referrer.service.ts
@@ -0,0 +1,58 @@
+import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { hasNoValue } from '../../shared/empty.util';
+import { URLCombiner } from '../url-combiner/url-combiner';
+import { HardRedirectService } from './hard-redirect.service';
+import { ReferrerService } from './referrer.service';
+import { RouteService } from './route.service';
+
+/**
+ * A service to determine the referrer
+ *
+ * The browser implementation will get the referrer from document.referrer, in the event that the
+ * previous page visited was not an angular URL. If it was, the route history in the store must be
+ * used, since document.referrer doesn't get updated on route changes
+ */
+@Injectable()
+export class BrowserReferrerService extends ReferrerService {
+
+  constructor(
+    @Inject(DOCUMENT) protected document: any,
+    protected routeService: RouteService,
+    protected hardRedirectService: HardRedirectService,
+  ) {
+    super();
+  }
+
+  /**
+   * Return the referrer
+   *
+   * Return the referrer URL based on the route history in the store. If there is no route history
+   * in the store yet, document.referrer will be used
+   */
+  public getReferrer(): Observable<string> {
+    return this.routeService.getHistory().pipe(
+      map((history: string[]) => {
+        const currentURL = history[history.length - 1];
+        // if the current URL isn't set yet, or the only URL in the history is the current one,
+        // return document.referrer (note that that may be empty too, e.g. if you've just opened a
+        // new browser tab)
+        if (hasNoValue(currentURL) || history.every((url: string) => url === currentURL)) {
+          return this.document.referrer;
+        } else {
+          // reverse the history
+          const reversedHistory = [...history].reverse();
+          // and find the first URL that differs from the current one
+          const prevUrl = reversedHistory.find((url: string) => url !== currentURL);
+          return new URLCombiner(this.hardRedirectService.getCurrentOrigin(), prevUrl).toString();
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/core/services/client-cookie.service.ts b/src/app/core/services/client-cookie.service.ts
index 9e0bfacba7..e187e3352b 100644
--- a/src/app/core/services/client-cookie.service.ts
+++ b/src/app/core/services/client-cookie.service.ts
@@ -1,6 +1,15 @@
 import { Injectable } from '@angular/core';
-import { CookieAttributes, getJSON, remove, set } from 'js-cookie';
-import { CookieService, ICookieService } from './cookie.service';
+import {
+  CookieAttributes,
+  getJSON,
+  remove,
+  set,
+} from 'js-cookie';
+
+import {
+  CookieService,
+  ICookieService,
+} from './cookie.service';
 
 @Injectable()
 export class ClientCookieService extends CookieService implements ICookieService {
diff --git a/src/app/core/services/cookie.service.spec.ts b/src/app/core/services/cookie.service.spec.ts
index 630fc9f755..b8f949b9f1 100644
--- a/src/app/core/services/cookie.service.spec.ts
+++ b/src/app/core/services/cookie.service.spec.ts
@@ -1,7 +1,14 @@
-import { CookieService, ICookieService } from './cookie.service';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
 
+import {
+  CookieService,
+  ICookieService,
+} from './cookie.service';
+
 describe(CookieService.name, () => {
   let service: ICookieService;
 
@@ -9,8 +16,8 @@ describe(CookieService.name, () => {
     TestBed.configureTestingModule({
       providers: [
         CookieService,
-        { provide: REQUEST, useValue: {} }
-      ]
+        { provide: REQUEST, useValue: {} },
+      ],
     });
   }));
 
diff --git a/src/app/core/services/cookie.service.ts b/src/app/core/services/cookie.service.ts
index 0098e3ace4..d26112418c 100644
--- a/src/app/core/services/cookie.service.ts
+++ b/src/app/core/services/cookie.service.ts
@@ -1,9 +1,13 @@
-import { Inject, Injectable } from '@angular/core';
-
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-
-import { Subject ,  Observable } from 'rxjs';
 import { CookieAttributes } from 'js-cookie';
+import {
+  Observable,
+  Subject,
+} from 'rxjs';
 
 export interface ICookieService {
   readonly cookies$: Observable<{ readonly [key: string]: any }>;
diff --git a/src/app/core/services/hard-redirect.service.ts b/src/app/core/services/hard-redirect.service.ts
index 3733059283..e6104cefb9 100644
--- a/src/app/core/services/hard-redirect.service.ts
+++ b/src/app/core/services/hard-redirect.service.ts
@@ -11,8 +11,10 @@ export abstract class HardRedirectService {
    *
    * @param url
    *    the page to redirect to
+   * @param statusCode
+   *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
-  abstract redirect(url: string);
+  abstract redirect(url: string, statusCode?: number);
 
   /**
    * Get the current route, with query params included
@@ -23,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/link-head.service.spec.ts b/src/app/core/services/link-head.service.spec.ts
index 017fe6af03..fd240db4d9 100644
--- a/src/app/core/services/link-head.service.spec.ts
+++ b/src/app/core/services/link-head.service.spec.ts
@@ -1,45 +1,52 @@
 import { DOCUMENT } from '@angular/common';
-import { Renderer2, RendererFactory2 } from '@angular/core';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Renderer2,
+  RendererFactory2,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { MockProvider } from 'ng-mocks';
+
 import { LinkHeadService } from './link-head.service';
 
 describe('LinkHeadService', () => {
 
-    let service: LinkHeadService;
+  let service: LinkHeadService;
 
-    const renderer2: Renderer2 = {
-        createRenderer: jasmine.createSpy('createRenderer'),
-        createElement: jasmine.createSpy('createElement'),
-        setAttribute: jasmine.createSpy('setAttribute'),
-        appendChild: jasmine.createSpy('appendChild')
-    } as unknown as Renderer2;
+  const renderer2: Renderer2 = {
+    createRenderer: jasmine.createSpy('createRenderer'),
+    createElement: jasmine.createSpy('createElement'),
+    setAttribute: jasmine.createSpy('setAttribute'),
+    appendChild: jasmine.createSpy('appendChild'),
+  } as unknown as Renderer2;
 
-    beforeEach(waitForAsync(() => {
-        return TestBed.configureTestingModule({
-          providers: [
-            MockProvider(RendererFactory2, {
-                createRenderer: () => renderer2
-            }),
-            { provide: Document, useExisting: DOCUMENT },
-          ]
-        });
-    }));
-
-    beforeEach(() => {
-        service = new LinkHeadService(TestBed.inject(RendererFactory2), TestBed.inject(DOCUMENT));
+  beforeEach(waitForAsync(() => {
+    return TestBed.configureTestingModule({
+      providers: [
+        MockProvider(RendererFactory2, {
+          createRenderer: () => renderer2,
+        }),
+        { provide: Document, useExisting: DOCUMENT },
+      ],
     });
+  }));
 
-    describe('link', () => {
-        it('should create a link tag', () => {
-            const link = service.addTag({
-                href: 'test',
-                type: 'application/atom+xml',
-                rel: 'alternate',
-                title: 'Sitewide Atom feed'
-              });
-            expect(link).not.toBeUndefined();
-        });
+  beforeEach(() => {
+    service = new LinkHeadService(TestBed.inject(RendererFactory2), TestBed.inject(DOCUMENT));
+  });
+
+  describe('link', () => {
+    it('should create a link tag', () => {
+      const link = service.addTag({
+        href: 'test',
+        type: 'application/atom+xml',
+        rel: 'alternate',
+        title: 'Sitewide Atom feed',
+      });
+      expect(link).not.toBeUndefined();
     });
+  });
 
 });
diff --git a/src/app/core/services/link-head.service.ts b/src/app/core/services/link-head.service.ts
index d608618ca4..35bed3bb07 100644
--- a/src/app/core/services/link-head.service.ts
+++ b/src/app/core/services/link-head.service.ts
@@ -1,5 +1,10 @@
-import { Injectable, RendererFactory2, ViewEncapsulation, Inject } from '@angular/core';
 import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+  RendererFactory2,
+  ViewEncapsulation,
+} from '@angular/core';
 
 /**
  * LinkHead Service injects <link> tag into the head element during runtime.
@@ -8,7 +13,7 @@ import { DOCUMENT } from '@angular/common';
 export class LinkHeadService {
   constructor(
     private rendererFactory: RendererFactory2,
-    @Inject(DOCUMENT) private document
+    @Inject(DOCUMENT) private document,
   ) {
 
   }
@@ -25,7 +30,7 @@ export class LinkHeadService {
         id: '-1',
         encapsulation: ViewEncapsulation.None,
         styles: [],
-        data: {}
+        data: {},
       });
 
       const link = renderer.createElement('link');
@@ -42,7 +47,7 @@ export class LinkHeadService {
       renderer.appendChild(head, link);
       return renderer;
     } catch (e) {
-      console.error('Error within linkService : ', e);
+      console.error('Error within linkService: ', e);
     }
   }
 
@@ -57,7 +62,7 @@ export class LinkHeadService {
           id: '-1',
           encapsulation: ViewEncapsulation.None,
           styles: [],
-          data: {}
+          data: {},
         });
         const head = this.document.head;
         if (head === null) {
@@ -68,7 +73,9 @@ export class LinkHeadService {
           renderer.removeChild(head, link);
         }
       } catch (e) {
-        console.log('Error while removing tag ' + e.message);
+        if (e instanceof Error) {
+          console.error('Error while removing tag: ' + e.message);
+        }
       }
     }
   }
diff --git a/src/app/core/services/referrer.service.ts b/src/app/core/services/referrer.service.ts
new file mode 100644
index 0000000000..79621fdbeb
--- /dev/null
+++ b/src/app/core/services/referrer.service.ts
@@ -0,0 +1,15 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+/**
+ * A service to determine the referrer, i.e. the previous URL that led the user to the current one
+ */
+@Injectable()
+export abstract class ReferrerService {
+
+  /**
+   * Return the referrer
+   */
+  abstract getReferrer(): Observable<string>;
+
+}
diff --git a/src/app/core/services/route.actions.ts b/src/app/core/services/route.actions.ts
index 87fe0a5c5f..3f64b9dba4 100644
--- a/src/app/core/services/route.actions.ts
+++ b/src/app/core/services/route.actions.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
-import { Action } from '@ngrx/store';
-import { type } from '../../shared/ngrx/type';
 import { Params } from '@angular/router';
+import { Action } from '@ngrx/store';
+
+import { type } from '../../shared/ngrx/type';
 
 /**
  * The list of HrefIndexAction type definitions
diff --git a/src/app/core/services/route.effects.ts b/src/app/core/services/route.effects.ts
index 2b19761d21..b31008f3c1 100644
--- a/src/app/core/services/route.effects.ts
+++ b/src/app/core/services/route.effects.ts
@@ -1,8 +1,19 @@
-import { map, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { ResetRouteStateAction, RouteActionTypes } from './route.actions';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  map,
+  tap,
+} from 'rxjs/operators';
+
 import { RouterActionTypes } from '../router/router.actions';
+import {
+  ResetRouteStateAction,
+  RouteActionTypes,
+} from './route.actions';
 import { RouteService } from './route.service';
 
 @Injectable()
@@ -11,17 +22,17 @@ export class RouteEffects {
    * Effect that resets the route state on reroute
    * @type {Observable<ResetRouteStateAction>}
    */
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(RouterActionTypes.ROUTE_UPDATE),
       map(() => new ResetRouteStateAction()),
     ));
 
-   afterResetChange$ = createEffect(() => this.actions$
+  afterResetChange$ = createEffect(() => this.actions$
     .pipe(
       ofType(RouteActionTypes.RESET),
       tap(() => this.service.setCurrentRouteInfo()),
-    ), {dispatch: false });
+    ), { dispatch: false });
 
   constructor(private actions$: Actions, private service: RouteService) {
   }
diff --git a/src/app/core/services/route.reducer.ts b/src/app/core/services/route.reducer.ts
index 4016dd9440..60bf7a4b19 100644
--- a/src/app/core/services/route.reducer.ts
+++ b/src/app/core/services/route.reducer.ts
@@ -1,4 +1,6 @@
 import { Params } from '@angular/router';
+
+import { isNotEmpty } from '../../shared/empty.util';
 import {
   AddParameterAction,
   AddQueryParameterAction,
@@ -7,9 +9,8 @@ import {
   SetParameterAction,
   SetParametersAction,
   SetQueryParameterAction,
-  SetQueryParametersAction
+  SetQueryParametersAction,
 } from './route.actions';
-import { isNotEmpty } from '../../shared/empty.util';
 
 /**
  * Interface to represent the parameter state of a current route in the store
@@ -24,7 +25,7 @@ export interface RouteState {
  */
 const initialState: RouteState = {
   queryParams: {},
-  params: {}
+  params: {},
 };
 
 /**
diff --git a/src/app/core/services/route.service.spec.ts b/src/app/core/services/route.service.spec.ts
index 18a916753a..7d2b3c1169 100644
--- a/src/app/core/services/route.service.spec.ts
+++ b/src/app/core/services/route.service.spec.ts
@@ -1,14 +1,25 @@
-import { ActivatedRoute, convertToParamMap, NavigationEnd, Params, Router } from '@angular/router';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  convertToParamMap,
+  NavigationEnd,
+  Params,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { getTestScheduler, hot } from 'jasmine-marbles';
-
-import { RouteService } from './route.service';
-import { RouterMock } from '../../shared/mocks/router.mock';
+import {
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
+import { RouterMock } from '../../shared/mocks/router.mock';
 import { AddUrlToHistoryAction } from '../history/history.actions';
+import { RouteService } from './route.service';
 
 describe('RouteService', () => {
   let scheduler: TestScheduler;
@@ -26,7 +37,7 @@ describe('RouteService', () => {
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   const router = new RouterMock();
@@ -43,12 +54,12 @@ describe('RouteService', () => {
           useValue: {
             queryParams: observableOf(paramObject),
             params: observableOf(paramObject),
-            queryParamMap: observableOf(convertToParamMap(paramObject))
+            queryParamMap: observableOf(convertToParamMap(paramObject)),
           },
         },
         { provide: Router, useValue: router },
         { provide: Store, useValue: store },
-      ]
+      ],
     });
   }));
 
@@ -129,7 +140,7 @@ describe('RouteService', () => {
 
       serviceAsAny.router.events = hot('a-b', {
         a: new NavigationEnd(0, 'url', 'url'),
-        b: new NavigationEnd(1, 'newurl', 'newurl')
+        b: new NavigationEnd(1, 'newurl', 'newurl'),
       });
 
       scheduler.schedule(() => service.saveRouting());
@@ -144,8 +155,8 @@ describe('RouteService', () => {
     it('should dispatch AddUrlToHistoryAction on NavigationEnd event', () => {
       serviceAsAny.store = observableOf({
         core: {
-          history: ['url', 'newurl']
-        }
+          history: ['url', 'newurl'],
+        },
       });
 
       service.getHistory().subscribe((history) => {
@@ -158,8 +169,8 @@ describe('RouteService', () => {
     it('should return an observable with the current url', () => {
       serviceAsAny.store = observableOf({
         core: {
-          history: ['url', 'newurl']
-        }
+          history: ['url', 'newurl'],
+        },
       });
 
       service.getCurrentUrl().subscribe((history) => {
@@ -172,8 +183,8 @@ describe('RouteService', () => {
     it('should return an observable with the previous url', () => {
       serviceAsAny.store = observableOf({
         core: {
-          history: ['url', 'newurl']
-        }
+          history: ['url', 'newurl'],
+        },
       });
 
       service.getPreviousUrl().subscribe((history) => {
diff --git a/src/app/core/services/route.service.ts b/src/app/core/services/route.service.ts
index b84bb40373..6564da0382 100644
--- a/src/app/core/services/route.service.ts
+++ b/src/app/core/services/route.service.ts
@@ -1,24 +1,48 @@
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { ActivatedRoute, NavigationEnd, Params, Router, RouterStateSnapshot, } from '@angular/router';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Params,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import isEqual from 'lodash/isEqual';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable } from 'rxjs';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { isEqual } from 'lodash';
-
-import { AddParameterAction, SetParameterAction, SetParametersAction, SetQueryParameterAction, SetQueryParametersAction } from './route.actions';
-import { coreSelector } from '../core.selectors';
 import { hasValue } from '../../shared/empty.util';
-import { historySelector } from '../history/selectors';
-import { AddUrlToHistoryAction } from '../history/history.actions';
+import { coreSelector } from '../core.selectors';
 import { CoreState } from '../core-state.model';
+import { AddUrlToHistoryAction } from '../history/history.actions';
+import { historySelector } from '../history/selectors';
+import {
+  AddParameterAction,
+  SetParameterAction,
+  SetParametersAction,
+  SetQueryParameterAction,
+  SetQueryParametersAction,
+} from './route.actions';
 
 /**
  * Selector to select all route parameters from the store
  */
 export const routeParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.params : undefined
+  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.params : undefined,
 );
 
 /**
@@ -26,7 +50,7 @@ export const routeParametersSelector = createSelector(
  */
 export const queryParametersSelector = createSelector(
   coreSelector,
-  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.queryParams : undefined
+  (state: CoreState) => hasValue(state) && hasValue(state.route) ? state.route.queryParams : undefined,
 );
 
 /**
@@ -60,7 +84,7 @@ export function parameterSelector(key: string, paramsSelector: (state: CoreState
  * Service to keep track of the current query parameters
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class RouteService {
   constructor(private route: ActivatedRoute, private router: Router, private store: Store<CoreState>) {
@@ -74,7 +98,7 @@ export class RouteService {
   getQueryParameterValues(paramName: string): Observable<string[]> {
     return this.getQueryParamMap().pipe(
       map((params) => [...params.getAll(paramName)]),
-      distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b))
+      distinctUntilChanged((a, b) => JSON.stringify(a) === JSON.stringify(b)),
     );
   }
 
@@ -85,7 +109,7 @@ export class RouteService {
   getQueryParameterValue(paramName: string): Observable<string> {
     return this.getQueryParamMap().pipe(
       map((params) => params.get(paramName)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -96,7 +120,7 @@ export class RouteService {
   hasQueryParam(paramName: string): Observable<boolean> {
     return this.getQueryParamMap().pipe(
       map((params) => params.has(paramName)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -108,7 +132,7 @@ export class RouteService {
   hasQueryParamWithValue(paramName: string, paramValue: string): Observable<boolean> {
     return this.getQueryParamMap().pipe(
       map((params) => params.getAll(paramName).indexOf(paramValue) > -1),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -177,7 +201,7 @@ export class RouteService {
    */
   public getCurrentUrl(): Observable<string> {
     return this.getHistory().pipe(
-      map((history: string[]) => history[history.length - 1] || '')
+      map((history: string[]) => history[history.length - 1] || ''),
     );
   }
 
@@ -186,7 +210,7 @@ export class RouteService {
    */
   public getPreviousUrl(): Observable<string> {
     return this.getHistory().pipe(
-      map((history: string[]) => history[history.length - 2] || '')
+      map((history: string[]) => history[history.length - 2] || ''),
     );
   }
 
@@ -222,7 +246,7 @@ export class RouteService {
         ([params, queryParams]: [Params, Params]) => {
           this.store.dispatch(new SetParametersAction(params));
           this.store.dispatch(new SetQueryParametersAction(queryParams));
-        }
+        },
       );
   }
 }
diff --git a/src/app/core/services/server-cookie.service.ts b/src/app/core/services/server-cookie.service.ts
index 6ae3525c74..e0f38d026c 100644
--- a/src/app/core/services/server-cookie.service.ts
+++ b/src/app/core/services/server-cookie.service.ts
@@ -1,6 +1,10 @@
 import { Injectable } from '@angular/core';
 import { CookieAttributes } from 'js-cookie';
-import { CookieService, ICookieService } from './cookie.service';
+
+import {
+  CookieService,
+  ICookieService,
+} from './cookie.service';
 
 @Injectable()
 export class ServerCookieService extends CookieService implements ICookieService {
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 4501547b92..27777ed7ba 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,5 @@
 import { TestBed } from '@angular/core/testing';
+
 import { ServerHardRedirectService } from './server-hard-redirect.service';
 
 describe('ServerHardRedirectService', () => {
@@ -22,20 +23,33 @@ describe('ServerHardRedirectService', () => {
     expect(service).toBeTruthy();
   });
 
-  describe('when performing a redirect', () => {
-
+  describe('when performing a default redirect', () => {
     const redirect = 'test redirect';
 
     beforeEach(() => {
       service.redirect(redirect);
     });
 
-    it('should update the response object', () => {
+    it('should perform a 302 redirect', () => {
       expect(mockResponse.redirect).toHaveBeenCalledWith(302, redirect);
       expect(mockResponse.end).toHaveBeenCalled();
     });
   });
 
+  describe('when performing a 301 redirect', () => {
+    const redirect = 'test 301 redirect';
+    const redirectStatusCode = 301;
+
+    beforeEach(() => {
+      service.redirect(redirect, redirectStatusCode);
+    });
+
+    it('should redirect with passed in status code', () => {
+      expect(mockResponse.redirect).toHaveBeenCalledWith(redirectStatusCode, redirect);
+      expect(mockResponse.end).toHaveBeenCalled();
+    });
+  });
+
   describe('when requesting the current route', () => {
 
     beforeEach(() => {
diff --git a/src/app/core/services/server-hard-redirect.service.ts b/src/app/core/services/server-hard-redirect.service.ts
index 94b9ed6198..f55eb13567 100644
--- a/src/app/core/services/server-hard-redirect.service.ts
+++ b/src/app/core/services/server-hard-redirect.service.ts
@@ -1,6 +1,16 @@
-import { Inject, Injectable } from '@angular/core';
-import { Request, Response } from 'express';
-import { REQUEST, RESPONSE } from '@nguniversal/express-engine/tokens';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  REQUEST,
+  RESPONSE,
+} from '@nguniversal/express-engine/tokens';
+import {
+  Request,
+  Response,
+} from 'express';
+
 import { HardRedirectService } from './hard-redirect.service';
 
 /**
@@ -17,10 +27,14 @@ export class ServerHardRedirectService extends HardRedirectService {
   }
 
   /**
-   * Perform a hard redirect to URL
+   * Perform a hard redirect to a given location.
+   *
    * @param url
+   *    the page to redirect to
+   * @param statusCode
+   *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
    */
-  redirect(url: string) {
+  redirect(url: string, statusCode?: number) {
 
     if (url === this.req.url) {
       return;
@@ -38,14 +52,15 @@ export class ServerHardRedirectService extends HardRedirectService {
         process.exit(1);
       }
     } else {
-      // attempt to use the already set status
-      let status = this.res.statusCode || 0;
+      // attempt to use passed in statusCode or the already set status (in request)
+      let status = statusCode || this.res.statusCode || 0;
       if (status < 300 || status >= 400) {
         // temporary redirect
         status = 302;
       }
 
       console.log(`Redirecting from ${this.req.url} to ${url} with ${status}`);
+
       this.res.redirect(status, url);
       this.res.end();
       // I haven't found a way to correctly stop Angular rendering.
@@ -64,8 +79,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/services/server-response.service.ts b/src/app/core/services/server-response.service.ts
index 02e00446bc..29b9d73e9c 100644
--- a/src/app/core/services/server-response.service.ts
+++ b/src/app/core/services/server-response.service.ts
@@ -1,7 +1,14 @@
+import {
+  Inject,
+  Injectable,
+  Optional,
+} from '@angular/core';
 import { RESPONSE } from '@nguniversal/express-engine/tokens';
-import { Inject, Injectable, Optional } from '@angular/core';
 import { Response } from 'express';
 
+/**
+ * Service responsible to provide method to manage the response object
+ */
 @Injectable()
 export class ServerResponseService {
   private response: Response;
@@ -10,6 +17,12 @@ export class ServerResponseService {
     this.response = response;
   }
 
+  /**
+   * Set a status code to response
+   *
+   * @param code
+   * @param message
+   */
   setStatus(code: number, message?: string): this {
     if (this.response) {
       this.response.statusCode = code;
@@ -20,19 +33,51 @@ export class ServerResponseService {
     return this;
   }
 
+  /**
+   * Set Unauthorized status
+   *
+   *  @param message
+   */
   setUnauthorized(message = 'Unauthorized'): this {
     return this.setStatus(401, message);
   }
 
+  /**
+   * Set Forbidden status
+   *
+   *  @param message
+   */
   setForbidden(message = 'Forbidden'): this {
     return this.setStatus(403, message);
   }
 
+  /**
+   * Set Not found status
+   *
+   *  @param message
+   */
   setNotFound(message = 'Not found'): this {
     return this.setStatus(404, message);
   }
 
+  /**
+   * Set Internal Server Error status
+   *
+   *  @param message
+   */
   setInternalServerError(message = 'Internal Server Error'): this {
     return this.setStatus(500, message);
   }
+
+  /**
+   * Set a response's header
+   *
+   * @param header
+   * @param content
+   */
+  setHeader(header: string, content: string) {
+    if (this.response) {
+      this.response.setHeader(header, content);
+    }
+  }
 }
diff --git a/src/app/core/services/server-xhr.service.ts b/src/app/core/services/server-xhr.service.ts
new file mode 100644
index 0000000000..e4c50c24ea
--- /dev/null
+++ b/src/app/core/services/server-xhr.service.ts
@@ -0,0 +1,64 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+import { XhrFactory } from '@angular/common';
+import { Injectable } from '@angular/core';
+import {
+  Agent as HttpAgent,
+  AgentOptions as HttpAgentOptions,
+} from 'http';
+import { Agent as HttpsAgent } from 'https';
+import {
+  prototype,
+  XMLHttpRequest,
+} from 'xhr2';
+
+/**
+ * Allow HTTP sessions to be kept alive.
+ * Without this configuration, Angular re-connects to REST multiple times per SSR cycle.
+ * https://nodejs.org/api/http.html#new-agentoptions
+ */
+const agentOptions: HttpAgentOptions = {
+  keepAlive: true,
+  keepAliveMsecs: 60 * 1000,
+};
+
+// Agents need to be reused between requests, otherwise keep-alive doesn't help.
+const httpAgent = new HttpAgent(agentOptions);
+const httpsAgent = new HttpsAgent(agentOptions);
+
+/**
+ * Contructs the XMLHttpRequest instances used for all HttpClient requests.
+ * Emulated by https://github.com/pwnall/node-xhr2 on the server.
+ * This class overrides the built-in Angular implementation to set additional configuration.
+ *
+ * Changes:
+ * - Turn off restriction for cookie headers to allow us to set cookies in requests to the backend.
+ *   This was added to be able to perform a working XSRF request from the node server, as it needs to set a cookie for the XSRF token.
+ * - Override NodeJS HTTP(S) agents to keep sessions alive between requests.
+ *   This improves SSR performance by reducing REST request overhead on the server.
+ *
+ * Note that this must be provided in ServerAppModule;
+ * it doesn't work when added as a Universal engine provider.
+ */
+@Injectable()
+export class ServerXhrService implements XhrFactory {
+  build(): XMLHttpRequest {
+    prototype._restrictedHeaders.cookie = false;
+    const xhr = new XMLHttpRequest();
+
+    // This call is specific to xhr2 and will probably break if we use another library.
+    // https://github.com/pwnall/node-xhr2#features
+    (xhr as any).nodejsSet({
+      httpAgent,
+      httpsAgent,
+    });
+
+    return xhr;
+  }
+}
diff --git a/src/app/core/services/server.referrer.service.spec.ts b/src/app/core/services/server.referrer.service.spec.ts
new file mode 100644
index 0000000000..f7c308e418
--- /dev/null
+++ b/src/app/core/services/server.referrer.service.spec.ts
@@ -0,0 +1,34 @@
+import { ServerReferrerService } from './server.referrer.service';
+
+describe(`ServerReferrerService`, () => {
+  let service: ServerReferrerService;
+  const referrer = 'https://www.referrer.com';
+
+  describe(`getReferrer`, () => {
+    describe(`when the referer header is set`, () => {
+      beforeEach(() => {
+        service = new ServerReferrerService({ headers: { referer: referrer } });
+      });
+
+      it(`should return the referer header`, (done: DoneFn) => {
+        service.getReferrer().subscribe((emittedReferrer: string) => {
+          expect(emittedReferrer).toBe(referrer);
+          done();
+        });
+      });
+    });
+
+    describe(`when the referer header is not set`, () => {
+      beforeEach(() => {
+        service = new ServerReferrerService({ headers: {} });
+      });
+
+      it(`should return an empty string`, (done: DoneFn) => {
+        service.getReferrer().subscribe((emittedReferrer: string) => {
+          expect(emittedReferrer).toBe('');
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/core/services/server.referrer.service.ts b/src/app/core/services/server.referrer.service.ts
new file mode 100644
index 0000000000..4851c5fed8
--- /dev/null
+++ b/src/app/core/services/server.referrer.service.ts
@@ -0,0 +1,38 @@
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import { REQUEST } from '@nguniversal/express-engine/tokens';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { ReferrerService } from './referrer.service';
+
+/**
+ * A service to determine the referrer
+ *
+ * The server implementation will get the referrer from the 'Referer' header of the request sent to
+ * the express server
+ */
+@Injectable()
+export class ServerReferrerService extends ReferrerService {
+
+  constructor(
+    @Inject(REQUEST) protected request: any,
+  ) {
+    super();
+  }
+
+  /**
+   * Return the referrer
+   *
+   * Return the 'Referer' header from the request, or an empty string if the header wasn't set
+   * (for consistency with the document.referrer property on the browser side)
+   */
+  public getReferrer(): Observable<string> {
+    const referrer = this.request.headers.referer || '';
+    return observableOf(referrer);
+  }
+}
diff --git a/src/app/core/shared/authorization.model.ts b/src/app/core/shared/authorization.model.ts
index f7bbf78889..0031b054f6 100644
--- a/src/app/core/shared/authorization.model.ts
+++ b/src/app/core/shared/authorization.model.ts
@@ -1,14 +1,22 @@
-import { link, typedObject } from '../cache/builders/build-decorators';
-import { AUTHORIZATION } from './authorization.resource-type';
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { HALLink } from './hal-link.model';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { RemoteData } from '../data/remote-data';
 import { EPerson } from '../eperson/models/eperson.model';
 import { EPERSON } from '../eperson/models/eperson.resource-type';
-import { FEATURE } from './feature.resource-type';
+import { AUTHORIZATION } from './authorization.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { Feature } from './feature.model';
+import { FEATURE } from './feature.resource-type';
+import { HALLink } from './hal-link.model';
 import { ITEM } from './item.resource-type';
 
 /**
@@ -23,10 +31,10 @@ export class Authorization extends DSpaceObject {
    * Unique identifier for this authorization
    */
   @autoserialize
-  id: string;
+    id: string;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     eperson: HALLink;
     feature: HALLink;
@@ -38,17 +46,17 @@ export class Authorization extends DSpaceObject {
    * Null if the authorization grants access to anonymous users
    */
   @link(EPERSON)
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The Feature enabled by this Authorization
    */
   @link(FEATURE)
-  feature?: Observable<RemoteData<Feature>>;
+    feature?: Observable<RemoteData<Feature>>;
 
   /**
    * The Object this authorization applies to
    */
   @link(ITEM)
-  object?: Observable<RemoteData<DSpaceObject>>;
+    object?: Observable<RemoteData<DSpaceObject>>;
 }
diff --git a/src/app/core/shared/authorized.operators.ts b/src/app/core/shared/authorized.operators.ts
index c36f0f41d2..6700011347 100644
--- a/src/app/core/shared/authorized.operators.ts
+++ b/src/app/core/shared/authorized.operators.ts
@@ -1,15 +1,29 @@
-import { Router, UrlTree } from '@angular/router';
-import { AuthService } from '../auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { filter, map, withLatestFrom } from 'rxjs/operators';
 import { InjectionToken } from '@angular/core';
-import { RemoteData } from '../data/remote-data';
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import {
+  getForbiddenRoute,
+  getPageNotFoundRoute,
+} from '../../app-routing-paths';
 import { getEndUserAgreementPath } from '../../info/info-routing-paths';
-import { getForbiddenRoute, getPageNotFoundRoute } from '../../app-routing-paths';
+import { AuthService } from '../auth/auth.service';
+import { RemoteData } from '../data/remote-data';
 
 export const REDIRECT_ON_4XX = new InjectionToken<<T>(router: Router, authService: AuthService) => (source: Observable<RemoteData<T>>) => Observable<RemoteData<T>>>('redirectOn4xx', {
   providedIn: 'root',
-  factory: () => redirectOn4xx
+  factory: () => redirectOn4xx,
 });
 /**
  * Operator that checks if a remote data object returned a 4xx error
@@ -41,7 +55,7 @@ export const redirectOn4xx = <T>(router: Router, authService: AuthService) =>
         }
         return true;
       }),
-      map(([rd,]: [RemoteData<T>, boolean]) => rd)
+      map(([rd]: [RemoteData<T>, boolean]) => rd),
     );
 /**
  * Operator that returns a UrlTree to a forbidden page or the login page when the boolean received is false
diff --git a/src/app/core/shared/bitstream-format.model.ts b/src/app/core/shared/bitstream-format.model.ts
index 9e8dc5e1fe..354edb4cbd 100644
--- a/src/app/core/shared/bitstream-format.model.ts
+++ b/src/app/core/shared/bitstream-format.model.ts
@@ -1,12 +1,17 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../cache/id-to-uuid-serializer';
 import { excludeFromEquals } from '../utilities/equals.decorators';
-import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
 import { BITSTREAM_FORMAT } from './bitstream-format.resource-type';
+import { BitstreamFormatSupportLevel } from './bitstream-format-support-level';
 import { HALLink } from './hal-link.model';
 import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
  * Model class for a Bitstream Format
@@ -20,43 +25,43 @@ export class BitstreamFormat implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * Short description of this Bitstream Format
    */
   @autoserialize
-  shortDescription: string;
+    shortDescription: string;
 
   /**
    * Description of this Bitstream Format
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * String representing the MIME type of this Bitstream Format
    */
   @autoserialize
-  mimetype: string;
+    mimetype: string;
 
   /**
    * The level of support the system offers for this Bitstream Format
    */
   @autoserialize
-  supportLevel: BitstreamFormatSupportLevel;
+    supportLevel: BitstreamFormatSupportLevel;
 
   /**
    * True if the Bitstream Format is used to store system information, rather than the content of items in the system
    */
   @autoserialize
-  internal: boolean;
+    internal: boolean;
 
   /**
    * String representing this Bitstream Format's file extension
    */
   @autoserialize
-  extensions: string[];
+    extensions: string[];
 
   /**
    * Universally unique identifier for this Bitstream Format
@@ -64,7 +69,7 @@ export class BitstreamFormat implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer('bitstream-format'), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * Identifier for this Bitstream Format
@@ -72,13 +77,13 @@ export class BitstreamFormat implements CacheableObject {
    * but might not be unique across different object types
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The {@link HALLink}s for this BitstreamFormat
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/shared/bitstream.model.ts b/src/app/core/shared/bitstream.model.ts
index c855325d2d..d1b821e8cd 100644
--- a/src/app/core/shared/bitstream.model.ts
+++ b/src/app/core/shared/bitstream.model.ts
@@ -1,15 +1,23 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { RemoteData } from '../data/remote-data';
+import { BITSTREAM } from './bitstream.resource-type';
 import { BitstreamFormat } from './bitstream-format.model';
 import { BITSTREAM_FORMAT } from './bitstream-format.resource-type';
-import { BITSTREAM } from './bitstream.resource-type';
+import { Bundle } from './bundle.model';
+import { BUNDLE } from './bundle.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import {BUNDLE} from './bundle.resource-type';
-import {Bundle} from './bundle.model';
-import { ChildHALResource } from './child-hal-resource.model';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -20,25 +28,25 @@ export class Bitstream extends DSpaceObject implements ChildHALResource {
    * The size of this bitstream in bytes
    */
   @autoserialize
-  sizeBytes: number;
+    sizeBytes: number;
 
   /**
    * The description of this Bitstream
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The name of the Bundle this Bitstream is part of
    */
   @autoserialize
-  bundleName: string;
+    bundleName: string;
 
   /**
    * The {@link HALLink}s for this Bitstream
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     bundle: HALLink;
     format: HALLink;
@@ -51,21 +59,21 @@ export class Bitstream extends DSpaceObject implements ChildHALResource {
    * Will be undefined unless the thumbnail {@link HALLink} has been resolved.
    */
   @link(BITSTREAM, false, 'thumbnail')
-  thumbnail?: Observable<RemoteData<Bitstream>>;
+    thumbnail?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The BitstreamFormat of this Bitstream
    * Will be undefined unless the format {@link HALLink} has been resolved.
    */
   @link(BITSTREAM_FORMAT, false, 'format')
-  format?: Observable<RemoteData<BitstreamFormat>>;
+    format?: Observable<RemoteData<BitstreamFormat>>;
 
   /**
    * The owning bundle for this Bitstream
    * Will be undefined unless the bundle{@link HALLink} has been resolved.
    */
   @link(BUNDLE)
-  bundle?: Observable<RemoteData<Bundle>>;
+    bundle?: Observable<RemoteData<Bundle>>;
 
   getParentLinkKey(): keyof this['_links'] {
     return 'format';
diff --git a/src/app/core/shared/bitstream.operators.ts b/src/app/core/shared/bitstream.operators.ts
index 73f38d8c00..c62def49b2 100644
--- a/src/app/core/shared/bitstream.operators.ts
+++ b/src/app/core/shared/bitstream.operators.ts
@@ -1,9 +1,16 @@
-import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
-import { Observable, of as observableOf } from 'rxjs';
-import { Bitstream } from './bitstream.model';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { AuthorizationDataService } from '../data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../data/feature-authorization/feature-id';
+import { Bitstream } from './bitstream.model';
 
 /**
  * Operator to check if the given bitstream is downloadable
@@ -20,5 +27,5 @@ export const getDownloadableBitstream = (authService: AuthorizationDataService)
         } else {
           return observableOf(null);
         }
-      })
+      }),
     );
diff --git a/src/app/core/shared/browse-definition.model.ts b/src/app/core/shared/browse-definition.model.ts
index 863f454422..8e50a57bb5 100644
--- a/src/app/core/shared/browse-definition.model.ts
+++ b/src/app/core/shared/browse-definition.model.ts
@@ -1,50 +1,18 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
-import { typedObject } from '../cache/builders/build-decorators';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { BROWSE_DEFINITION } from './browse-definition.resource-type';
-import { HALLink } from './hal-link.model';
-import { ResourceType } from './resource-type';
-import { SortOption } from './sort-option.model';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-decorator';
+import { autoserialize } from 'cerialize';
 
-@typedObject
-export class BrowseDefinition extends CacheableObject {
-  static type = BROWSE_DEFINITION;
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
+import { CacheableObject } from '../cache/cacheable-object.model';
+
+/**
+ * Base class for BrowseDefinition models
+ */
+export abstract class BrowseDefinition extends CacheableObject {
+
+  @autoserialize
+    id: string;
 
   /**
-   * The object type
+   * Get the render type of the BrowseDefinition model
    */
-  @excludeFromEquals
-  @autoserialize
-  type: ResourceType;
-
-  @autoserialize
-  id: string;
-
-  @autoserialize
-  metadataBrowse: boolean;
-
-  @autoserialize
-  sortOptions: SortOption[];
-
-  @autoserializeAs('order')
-  defaultSortOrder: string;
-
-  @autoserializeAs('metadata')
-  metadataKeys: string[];
-
-  @autoserialize
-  dataType: BrowseByDataType;
-
-  get self(): string {
-    return this._links.self.href;
-  }
-
-  @deserialize
-  _links: {
-    self: HALLink;
-    entries: HALLink;
-    items: HALLink;
-  };
+  abstract getRenderType(): BrowseByDataType;
 }
diff --git a/src/app/core/shared/browse-entry.model.ts b/src/app/core/shared/browse-entry.model.ts
index d4842e1294..03e3ab3f5b 100644
--- a/src/app/core/shared/browse-entry.model.ts
+++ b/src/app/core/shared/browse-entry.model.ts
@@ -1,12 +1,17 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
+import { TypedObject } from '../cache/typed-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { BROWSE_ENTRY } from './browse-entry.resource-type';
 import { GenericConstructor } from './generic-constructor';
 import { HALLink } from './hal-link.model';
 import { ResourceType } from './resource-type';
-import { TypedObject } from '../cache/typed-object.model';
 
 /**
  * Class object representing a browse entry
@@ -20,41 +25,41 @@ export class BrowseEntry extends ListableObject implements TypedObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The authority string of this browse entry
    */
   @autoserialize
-  authority: string;
+    authority: string;
 
   /**
    * The value of this browse entry
    */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * The language of the value of this browse entry
    */
   @autoserializeAs('valueLang')
-  language: string;
+    language: string;
 
   /**
    * Thumbnail link used when browsing items with showThumbs config enabled.
    */
   @autoserializeAs('thumbnail')
-  thumbnail: string;
+    thumbnail: string;
 
   /**
    * The count of this browse entry
    */
   @excludeFromEquals
   @autoserialize
-  count: number;
+    count: number;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     entries: HALLink;
     thumbnail: HALLink;
diff --git a/src/app/core/shared/bundle.model.ts b/src/app/core/shared/bundle.model.ts
index 36b7012e47..e5b92799d4 100644
--- a/src/app/core/shared/bundle.model.ts
+++ b/src/app/core/shared/bundle.model.ts
@@ -1,17 +1,22 @@
-import { deserialize, inheritSerialization } from 'cerialize';
-
+import {
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
 
-import { link, typedObject } from '../cache/builders/build-decorators';
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { Bitstream } from './bitstream.model';
+import { BITSTREAM } from './bitstream.resource-type';
 import { BUNDLE } from './bundle.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { BITSTREAM } from './bitstream.resource-type';
-import { Bitstream } from './bitstream.model';
-import { ITEM } from './item.resource-type';
 import { Item } from './item.model';
+import { ITEM } from './item.resource-type';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
@@ -22,7 +27,7 @@ export class Bundle extends DSpaceObject {
    * The {@link HALLink}s for this Bundle
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     primaryBitstream: HALLink;
     bitstreams: HALLink;
@@ -34,19 +39,19 @@ export class Bundle extends DSpaceObject {
    * Will be undefined unless the primaryBitstream {@link HALLink} has been resolved.
    */
   @link(BITSTREAM)
-  primaryBitstream?: Observable<RemoteData<Bitstream>>;
+    primaryBitstream?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The list of Bitstreams that are direct children of this Bundle
    * Will be undefined unless the bitstreams {@link HALLink} has been resolved.
    */
   @link(BITSTREAM, true)
-  bitstreams?: Observable<RemoteData<PaginatedList<Bitstream>>>;
+    bitstreams?: Observable<RemoteData<PaginatedList<Bitstream>>>;
 
-    /**
+  /**
      * The owning item for this Bundle
      * Will be undefined unless the Item{@link HALLink} has been resolved.
      */
   @link(ITEM)
-  item?: Observable<RemoteData<Item>>;
+    item?: Observable<RemoteData<Item>>;
 }
diff --git a/src/app/core/shared/collection.model.ts b/src/app/core/shared/collection.model.ts
index d1c49c8d4b..468b0ccc64 100644
--- a/src/app/core/shared/collection.model.ts
+++ b/src/app/core/shared/collection.model.ts
@@ -1,32 +1,45 @@
-import { deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
-import { Bitstream } from './bitstream.model';
-import { BITSTREAM } from './bitstream.resource-type';
-import { COLLECTION } from './collection.resource-type';
-import { DSpaceObject } from './dspace-object.model';
-import { HALLink } from './hal-link.model';
-import { License } from './license.model';
-import { LICENSE } from './license.resource-type';
 import { ResourcePolicy } from '../resource-policy/models/resource-policy.model';
 import { RESOURCE_POLICY } from '../resource-policy/models/resource-policy.resource-type';
-import { COMMUNITY } from './community.resource-type';
-import { Community } from './community.model';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { Bitstream } from './bitstream.model';
+import { BITSTREAM } from './bitstream.resource-type';
 import { ChildHALResource } from './child-hal-resource.model';
+import { COLLECTION } from './collection.resource-type';
+import { Community } from './community.model';
+import { COMMUNITY } from './community.resource-type';
+import { DSpaceObject } from './dspace-object.model';
+import { HALLink } from './hal-link.model';
 import { HandleObject } from './handle-object.model';
+import { License } from './license.model';
+import { LICENSE } from './license.resource-type';
 
 @typedObject
 @inheritSerialization(DSpaceObject)
 export class Collection extends DSpaceObject implements ChildHALResource, HandleObject {
   static type = COLLECTION;
 
+  @excludeFromEquals
+  @autoserialize
+    archivedItemsCount: number;
+
   /**
    * The {@link HALLink}s for this Collection
    */
   @deserialize
-  _links: {
+    _links: {
     license: HALLink;
     harvester: HALLink;
     mappedItems: HALLink;
@@ -47,28 +60,28 @@ export class Collection extends DSpaceObject implements ChildHALResource, Handle
    * Will be undefined unless the license {@link HALLink} has been resolved.
    */
   @link(LICENSE)
-  license?: Observable<RemoteData<License>>;
+    license?: Observable<RemoteData<License>>;
 
   /**
    * The logo for this Collection
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(BITSTREAM)
-  logo?: Observable<RemoteData<Bitstream>>;
+    logo?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The default access conditions for this Collection
    * Will be undefined unless the defaultAccessConditions {@link HALLink} has been resolved.
    */
   @link(RESOURCE_POLICY, true)
-  defaultAccessConditions?: Observable<RemoteData<PaginatedList<ResourcePolicy>>>;
+    defaultAccessConditions?: Observable<RemoteData<PaginatedList<ResourcePolicy>>>;
 
   /**
    * The Community that is a direct parent of this Collection
    * Will be undefined unless the parent community HALLink has been resolved.
    */
   @link(COMMUNITY, false)
-  parentCommunity?: Observable<RemoteData<Community>>;
+    parentCommunity?: Observable<RemoteData<Community>>;
 
   /**
    * A string representing the unique handle of this Collection
diff --git a/src/app/core/shared/community.model.ts b/src/app/core/shared/community.model.ts
index f16aad9645..764b15e2ed 100644
--- a/src/app/core/shared/community.model.ts
+++ b/src/app/core/shared/community.model.ts
@@ -1,16 +1,25 @@
-import { deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { Bitstream } from './bitstream.model';
 import { BITSTREAM } from './bitstream.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
 import { Collection } from './collection.model';
 import { COLLECTION } from './collection.resource-type';
 import { COMMUNITY } from './community.resource-type';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
-import { ChildHALResource } from './child-hal-resource.model';
 import { HandleObject } from './handle-object.model';
 
 @typedObject
@@ -18,11 +27,15 @@ import { HandleObject } from './handle-object.model';
 export class Community extends DSpaceObject implements ChildHALResource, HandleObject {
   static type = COMMUNITY;
 
+  @excludeFromEquals
+  @autoserialize
+    archivedItemsCount: number;
+
   /**
    * The {@link HALLink}s for this Community
    */
   @deserialize
-  _links: {
+    _links: {
     collections: HALLink;
     logo: HALLink;
     subcommunities: HALLink;
@@ -36,28 +49,28 @@ export class Community extends DSpaceObject implements ChildHALResource, HandleO
    * Will be undefined unless the logo {@link HALLink} has been resolved.
    */
   @link(BITSTREAM)
-  logo?: Observable<RemoteData<Bitstream>>;
+    logo?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The list of Collections that are direct children of this Community
    * Will be undefined unless the collections {@link HALLink} has been resolved.
    */
   @link(COLLECTION, true)
-  collections?: Observable<RemoteData<PaginatedList<Collection>>>;
+    collections?: Observable<RemoteData<PaginatedList<Collection>>>;
 
   /**
    * The list of Communities that are direct children of this Community
    * Will be undefined unless the subcommunities {@link HALLink} has been resolved.
    */
   @link(COMMUNITY, true)
-  subcommunities?: Observable<RemoteData<PaginatedList<Community>>>;
+    subcommunities?: Observable<RemoteData<PaginatedList<Community>>>;
 
   /**
    * The Community that is a direct parent of this Community
    * Will be undefined unless the parent community HALLink has been resolved.
    */
   @link(COMMUNITY, false)
-  parentCommunity?: Observable<RemoteData<Community>>;
+    parentCommunity?: Observable<RemoteData<Community>>;
 
   /**
    * A string representing the unique handle of this Community
diff --git a/src/app/core/shared/configuration-property.model.ts b/src/app/core/shared/configuration-property.model.ts
index 874e80f08d..2b6ab606c9 100644
--- a/src/app/core/shared/configuration-property.model.ts
+++ b/src/app/core/shared/configuration-property.model.ts
@@ -1,10 +1,15 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
+import { CONFIG_PROPERTY } from './config-property.resource-type';
 import { HALLink } from './hal-link.model';
 import { ResourceType } from './resource-type';
-import { CONFIG_PROPERTY } from './config-property.resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
  * Model class for a Configuration Property
@@ -18,31 +23,31 @@ export class ConfigurationProperty implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The uuid of the configuration property
    * The name is used as id for configuration properties
    */
   @autoserializeAs(String, 'name')
-  uuid: string;
+    uuid: string;
 
   /**
    * The name of the configuration property
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * The values of the configuration property
    */
   @autoserialize
-  values: string[];
+    values: string[];
 
   /**
    * The links of the configuration property
    */
   @deserialize
-  _links: { self: HALLink };
+    _links: { self: HALLink };
 
 }
diff --git a/src/app/core/shared/content-source.model.ts b/src/app/core/shared/content-source.model.ts
index 7e888f2332..ee535191d0 100644
--- a/src/app/core/shared/content-source.model.ts
+++ b/src/app/core/shared/content-source.model.ts
@@ -1,12 +1,18 @@
-import { autoserializeAs, deserialize, deserializeAs, serializeAs } from 'cerialize';
+import {
+  autoserializeAs,
+  deserialize,
+  deserializeAs,
+  serializeAs,
+} from 'cerialize';
+
+import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { CONTENT_SOURCE } from './content-source.resource-type';
+import { ContentSourceSetSerializer } from './content-source-set-serializer';
 import { HALLink } from './hal-link.model';
 import { MetadataConfig } from './metadata-config.model';
-import { typedObject } from '../cache/builders/build-decorators';
-import { CONTENT_SOURCE } from './content-source.resource-type';
-import { excludeFromEquals } from '../utilities/equals.decorators';
 import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { ContentSourceSetSerializer } from './content-source-set-serializer';
 
 /**
  * The type of content harvesting used
@@ -32,40 +38,40 @@ export class ContentSource extends CacheableObject {
    * and we need a custom responseparser for ContentSource responses
    */
   @excludeFromEquals
-  type: ResourceType = CONTENT_SOURCE;
+    type: ResourceType = CONTENT_SOURCE;
 
   /**
    * Unique identifier, this is necessary to store the ContentSource in FieldUpdates
    * Because the ContentSource coming from the REST API doesn't have a UUID, we're using the selflink
    */
   @deserializeAs('self')
-  uuid: string;
+    uuid: string;
 
   /**
    * OAI Provider / Source
    */
   @autoserializeAs('oai_source')
-  oaiSource: string;
+    oaiSource: string;
 
   /**
    * OAI Specific set ID
    */
   @deserializeAs(new ContentSourceSetSerializer(), 'oai_set_id')
   @serializeAs(new ContentSourceSetSerializer(), 'oai_set_id')
-  oaiSetId: string;
+    oaiSetId: string;
 
   /**
    * The ID of the metadata format used
    */
   @autoserializeAs('metadata_config_id')
-  metadataConfigId: string;
+    metadataConfigId: string;
 
   /**
    * Type of content being harvested
    * Defaults to 'NONE', meaning the collection doesn't harvest its content from an external source
    */
   @autoserializeAs('harvest_type')
-  harvestType = ContentSourceHarvestType.None;
+    harvestType = ContentSourceHarvestType.None;
 
   /**
    * The available metadata configurations
@@ -76,31 +82,31 @@ export class ContentSource extends CacheableObject {
    * The current harvest status
    */
   @autoserializeAs('harvest_status')
-  harvestStatus: string;
+    harvestStatus: string;
 
   /**
    * The last's harvest start time
    */
   @autoserializeAs('harvest_start_time')
-  harvestStartTime: string;
+    harvestStartTime: string;
 
   /**
    * When the collection was last harvested
    */
   @autoserializeAs('last_harvested')
-  lastHarvested: string;
+    lastHarvested: string;
 
   /**
    * The current harvest message
    */
   @autoserializeAs('harvest_message')
-  message: string;
+    message: string;
 
   /**
    * The {@link HALLink}s for this ContentSource
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink
   };
 }
diff --git a/src/app/core/shared/context.model.ts b/src/app/core/shared/context.model.ts
index 126896e3e1..dcebf5794c 100644
--- a/src/app/core/shared/context.model.ts
+++ b/src/app/core/shared/context.model.ts
@@ -3,16 +3,42 @@
  */
 
 export enum Context {
+  /** Default context */
   Any = 'undefined',
+
+  /** General item page context */
   ItemPage = 'itemPage',
+
+  /** General search page context */
   Search = 'search',
+
   Workflow = 'workflow',
   Workspace = 'workspace',
+  SupervisedItems = 'supervisedWorkspace',
+
+  /** Administrative menu context */
   AdminMenu = 'adminMenu',
+
   EntitySearchModalWithNameVariants = 'EntitySearchModalWithNameVariants',
   EntitySearchModal = 'EntitySearchModal',
+
+  /** Administrative search page context */
   AdminSearch = 'adminSearch',
   AdminWorkflowSearch = 'adminWorkflowSearch',
+
   SideBarSearchModal = 'sideBarSearchModal',
   SideBarSearchModalCurrent = 'sideBarSearchModalCurrent',
+
+  /** The MyDSpace* Context values below are used for badge display in MyDSpace. */
+  MyDSpaceArchived = 'mydspaceArchived',
+  MyDSpaceWorkspace = 'mydspaceWorkspace',
+  MyDSpaceWorkflow = 'mydspaceWorkflow',
+  MyDSpaceDeclined = 'mydspaceDeclined',
+  MyDSpaceApproved = 'mydspaceApproved',
+  MyDSpaceWaitingController = 'mydspaceWaitingController',
+  MyDSpaceValidation = 'mydspaceValidation',
+
+  Bitstream = 'bitstream',
+
+  CoarNotify = 'coarNotify',
 }
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 6f5d45544d..dc9b7f5fca 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -1,7 +1,18 @@
-import { autoserialize, autoserializeAs, deserialize, deserializeAs } from 'cerialize';
-import { hasNoValue, hasValue, isUndefined } from '../../shared/empty.util';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+
+import {
+  hasNoValue,
+  hasValue,
+  isUndefined,
+} from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { DSPACE_OBJECT } from './dspace-object.resource-type';
 import { GenericConstructor } from './generic-constructor';
@@ -11,11 +22,10 @@ import {
   MetadataMapSerializer,
   MetadataValue,
   MetadataValueFilter,
-  MetadatumViewModel
+  MetadatumViewModel,
 } from './metadata.models';
 import { Metadata } from './metadata.utils';
 import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
 
 /**
  * An abstract model class for a DSpaceObject.
@@ -36,20 +46,20 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserializeAs(String, 'uuid')
-  id: string;
+    id: string;
 
   /**
    * The universally unique ide ntifier of this DSpaceObject
    */
   @autoserializeAs(String)
-  uuid: string;
+    uuid: string;
 
   /**
    * A string representing the kind of DSpaceObject, e.g. community, item, …
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * A shorthand to get this DSpaceObject's self link
@@ -63,7 +73,7 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    */
   set self(v: string) {
     this._links.self = {
-      href: v
+      href: v,
     };
   }
 
@@ -90,10 +100,10 @@ export class DSpaceObject extends ListableObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserializeAs(MetadataMapSerializer)
-  metadata: MetadataMap;
+    metadata: MetadataMap;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 
diff --git a/src/app/core/shared/external-source-entry.model.ts b/src/app/core/shared/external-source-entry.model.ts
index 39a5df754e..d743a92310 100644
--- a/src/app/core/shared/external-source-entry.model.ts
+++ b/src/app/core/shared/external-source-entry.model.ts
@@ -1,11 +1,19 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { typedObject } from '../cache/builders/build-decorators';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { EXTERNAL_SOURCE_ENTRY } from './external-source-entry.resource-type';
 import { GenericConstructor } from './generic-constructor';
 import { HALLink } from './hal-link.model';
-import { MetadataMap, MetadataMapSerializer } from './metadata.models';
+import {
+  MetadataMap,
+  MetadataMapSerializer,
+} from './metadata.models';
 import { ResourceType } from './resource-type';
 
 /**
@@ -19,44 +27,44 @@ export class ExternalSourceEntry extends ListableObject {
    * Unique identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The object type
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The value to display
    */
   @autoserialize
-  display: string;
+    display: string;
 
   /**
    * The value to store the entry with
    */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * The ID of the external source this entry originates from
    */
   @autoserialize
-  externalSource: string;
+    externalSource: string;
 
   /**
    * Metadata of the entry
    */
   @autoserializeAs(MetadataMapSerializer)
-  metadata: MetadataMap;
+    metadata: MetadataMap;
 
   /**
    * The {@link HALLink}s for this ExternalSourceEntry
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 
diff --git a/src/app/core/shared/external-source.model.ts b/src/app/core/shared/external-source.model.ts
index 6a1a803122..70766e0494 100644
--- a/src/app/core/shared/external-source.model.ts
+++ b/src/app/core/shared/external-source.model.ts
@@ -1,15 +1,22 @@
-import { autoserialize, deserialize } from 'cerialize';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
 import { excludeFromEquals } from '../utilities/equals.decorators';
 import { EXTERNAL_SOURCE } from './external-source.resource-type';
 import { HALLink } from './hal-link.model';
-import { ResourceType } from './resource-type';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { Observable } from 'rxjs';
-import { ITEM_TYPE } from './item-relationships/item-type.resource-type';
 import { ItemType } from './item-relationships/item-type.model';
+import { ITEM_TYPE } from './item-relationships/item-type.resource-type';
+import { ResourceType } from './resource-type';
 
 /**
  * Model class for an external source
@@ -23,38 +30,38 @@ export class ExternalSource extends CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * Unique identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name of this external source
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * Is the source hierarchical?
    */
   @autoserialize
-  hierarchical: boolean;
+    hierarchical: boolean;
 
   /**
    * The list of entity types that are compatible with this external source
    * Will be undefined unless the entityTypes {@link HALLink} has been resolved.
    */
   @link(ITEM_TYPE, true)
-  entityTypes?: Observable<RemoteData<PaginatedList<ItemType>>>;
+    entityTypes?: Observable<RemoteData<PaginatedList<ItemType>>>;
 
   /**
    * The {@link HALLink}s for this ExternalSource
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     entries: HALLink;
     entityTypes: HALLink;
diff --git a/src/app/core/shared/feature.model.ts b/src/app/core/shared/feature.model.ts
index 2ba5d8d4e1..270eb2de9d 100644
--- a/src/app/core/shared/feature.model.ts
+++ b/src/app/core/shared/feature.model.ts
@@ -1,7 +1,12 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { FEATURE } from './feature.resource-type';
 import { DSpaceObject } from './dspace-object.model';
+import { FEATURE } from './feature.resource-type';
 import { HALLink } from './hal-link.model';
 
 /**
@@ -16,22 +21,22 @@ export class Feature extends DSpaceObject {
    * Unique identifier for this feature
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * A human readable description of the feature's purpose
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * A list of resource types this feature applies to
    */
   @autoserialize
-  resourcetypes: string[];
+    resourcetypes: string[];
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/shared/file.service.ts b/src/app/core/shared/file.service.ts
index f673629c8d..2a60dd4196 100644
--- a/src/app/core/shared/file.service.ts
+++ b/src/app/core/shared/file.service.ts
@@ -1,20 +1,30 @@
-import { Inject, Injectable } from '@angular/core';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-import { AuthService } from '../auth/auth.service';
-import { map, take } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../services/window.service';
-import { URLCombiner } from '../url-combiner/url-combiner';
-import { hasValue } from '../../shared/empty.util';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
+import { AuthService } from '../auth/auth.service';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../services/window.service';
+import { URLCombiner } from '../url-combiner/url-combiner';
 
 /**
  * Provides utility methods to save files on the client-side.
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class FileService {
   constructor(
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
-    private authService: AuthService
+    private authService: AuthService,
   ) { }
 
   /**
@@ -25,7 +35,7 @@ export class FileService {
    */
   retrieveFileDownloadLink(url: string): Observable<string> {
     return this.authService.getShortlivedToken().pipe(take(1), map((token) =>
-      hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url
+      hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url,
     ));
   }
   /**
diff --git a/src/app/core/shared/flat-browse-definition.model.ts b/src/app/core/shared/flat-browse-definition.model.ts
new file mode 100644
index 0000000000..d9d59d1114
--- /dev/null
+++ b/src/app/core/shared/flat-browse-definition.model.ts
@@ -0,0 +1,41 @@
+import {
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
+import { typedObject } from '../cache/builders/build-decorators';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { FLAT_BROWSE_DEFINITION } from './flat-browse-definition.resource-type';
+import { HALLink } from './hal-link.model';
+import { NonHierarchicalBrowseDefinition } from './non-hierarchical-browse-definition';
+import { ResourceType } from './resource-type';
+
+/**
+ * BrowseDefinition model for browses of type 'flatBrowse'
+ */
+@typedObject
+@inheritSerialization(NonHierarchicalBrowseDefinition)
+export class FlatBrowseDefinition extends NonHierarchicalBrowseDefinition {
+  static type = FLAT_BROWSE_DEFINITION;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+    type: ResourceType = FLAT_BROWSE_DEFINITION;
+
+  get self(): string {
+    return this._links.self.href;
+  }
+
+  @deserialize
+    _links: {
+    self: HALLink;
+    items: HALLink;
+  };
+
+  getRenderType(): BrowseByDataType {
+    return this.dataType;
+  }
+}
diff --git a/src/app/core/shared/flat-browse-definition.resource-type.ts b/src/app/core/shared/flat-browse-definition.resource-type.ts
new file mode 100644
index 0000000000..bfb01cd98c
--- /dev/null
+++ b/src/app/core/shared/flat-browse-definition.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for FlatBrowseDefinition
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const FLAT_BROWSE_DEFINITION = new ResourceType('flatBrowse');
diff --git a/src/app/core/shared/hal-endpoint.service.spec.ts b/src/app/core/shared/hal-endpoint.service.spec.ts
index 78a296496a..ec0379137b 100644
--- a/src/app/core/shared/hal-endpoint.service.spec.ts
+++ b/src/app/core/shared/hal-endpoint.service.spec.ts
@@ -1,36 +1,45 @@
-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';
-import { EndpointMapRequest } from '../data/request.models';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  combineLatest as observableCombineLatest,
+  of as observableOf,
+} from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
 import { environment } from '../../../environments/environment';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { getMockRequestService } from '../../shared/mocks/request.service.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
+import { EndpointMapRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntryState } from '../data/request-entry-state.model';
+import { HALEndpointService } from './hal-endpoint.service';
+
 
 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'
+      href: 'https://rest.api/test',
     },
     foo: {
-      href: 'https://rest.api/foo'
+      href: 'https://rest.api/foo',
     },
     bar: {
-      href: 'https://rest.api/bar'
+      href: 'https://rest.api/bar',
     },
     endpoint: {
-      href: 'https://rest.api/endpoint'
+      href: 'https://rest.api/endpoint',
     },
     link: {
-      href: 'https://rest.api/link'
+      href: 'https://rest.api/link',
     },
     another: {
-      href: 'https://rest.api/another'
+      href: 'https://rest.api/another',
     },
   };
   const start = 'http://start.com';
@@ -39,19 +48,19 @@ describe('HALEndpointService', () => {
   const endpointMaps = {
     [start]: {
       one: {
-        href: one
+        href: one,
       },
       two: {
-        href: 'empty'
+        href: 'empty',
       },
       endpoint: {
-        href: 'https://rest.api/endpoint'
+        href: 'https://rest.api/endpoint',
       },
       link: {
-        href: 'https://rest.api/link'
+        href: 'https://rest.api/link',
       },
       another: {
-        href: 'https://rest.api/another'
+        href: 'https://rest.api/another',
       },
     },
     [one]: {
@@ -63,26 +72,49 @@ describe('HALEndpointService', () => {
       },
       bar: {
         href: 'https://rest.api/bar',
-      }
-    }
+      },
+    },
   };
   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$({
-        _links: endpointMap
-      })
+        _links: endpointMap,
+      }),
     });
 
     envConfig = {
-      rest: { baseUrl: 'https://rest.api/' }
+      rest: { baseUrl: 'https://rest.api/' },
     } as any;
 
     service = new HALEndpointService(
       requestService,
-      rdbService
+      rdbService,
     );
   });
 
@@ -106,25 +138,33 @@ describe('HALEndpointService', () => {
 
     beforeEach(() => {
       envConfig = {
-        rest: { baseUrl: 'https://rest.api/' }
+        rest: { baseUrl: 'https://rest.api/' },
       } as any;
     });
 
     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);
+      });
     });
   });
 
@@ -177,35 +217,124 @@ describe('HALEndpointService', () => {
     beforeEach(() => {
       service = new HALEndpointService(
         requestService,
-        rdbService
+        rdbService,
       );
 
     });
 
     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..66a96f8dde 100644
--- a/src/app/core/shared/hal-endpoint.service.ts
+++ b/src/app/core/shared/hal-endpoint.service.ts
@@ -1,23 +1,36 @@
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map, startWith, switchMap, take } from 'rxjs/operators';
-import { RequestService } from '../data/request.service';
-import { EndpointMapRequest } from '../data/request.models';
-import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
 import { Injectable } from '@angular/core';
-import { EndpointMap } from '../cache/response.models';
-import { getFirstCompletedRemoteData } from './operators';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
+import { EndpointMap } from '../cache/response.models';
 import { RemoteData } from '../data/remote-data';
-import { UnCacheableObject } from './uncacheable-object.model';
+import { EndpointMapRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import { getFirstCompletedRemoteData } from './operators';
 
 @Injectable()
 export class HALEndpointService {
 
   constructor(
     private requestService: RequestService,
-    private rdbService: RemoteDataBuildService
-) {
+    private rdbService: RemoteDataBuildService,
+  ) {
   }
 
   public getRootHref(): string {
@@ -33,9 +46,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 {
@@ -70,7 +92,7 @@ export class HALEndpointService {
         } else {
           throw new Error(`${JSON.stringify(endpointMap)} doesn't contain the link ${nextName}`);
         }
-      })
+      }),
     ) as Observable<string>;
 
     if (halNames.length === 1) {
@@ -78,7 +100,7 @@ export class HALEndpointService {
     } else {
       return nextHref$.pipe(
         switchMap((nextHref) => this.getEndpointAt(nextHref, ...halNames.slice(1))),
-        take(1)
+        take(1),
       );
     }
   }
@@ -88,7 +110,7 @@ export class HALEndpointService {
       // TODO this only works when there's no / in linkPath
       map((endpointMap: EndpointMap) => isNotEmpty(endpointMap[linkPath])),
       startWith(undefined),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/shared/hal-resource.model.ts b/src/app/core/shared/hal-resource.model.ts
index 6e4fe1f502..5f9d107a54 100644
--- a/src/app/core/shared/hal-resource.model.ts
+++ b/src/app/core/shared/hal-resource.model.ts
@@ -1,6 +1,7 @@
-import { HALLink } from './hal-link.model';
 import { deserialize } from 'cerialize';
 
+import { HALLink } from './hal-link.model';
+
 /**
  * Represents HAL resources.
  *
@@ -12,7 +13,7 @@ export class HALResource {
    * The {@link HALLink}s for this {@link HALResource}
    */
   @deserialize
-  _links: {
+    _links: {
 
     /**
      * The {@link HALLink} that refers to this {@link HALResource}
diff --git a/src/app/core/shared/hierarchical-browse-definition.model.ts b/src/app/core/shared/hierarchical-browse-definition.model.ts
new file mode 100644
index 0000000000..97d50c3ca6
--- /dev/null
+++ b/src/app/core/shared/hierarchical-browse-definition.model.ts
@@ -0,0 +1,52 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
+import { typedObject } from '../cache/builders/build-decorators';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { BrowseDefinition } from './browse-definition.model';
+import { HALLink } from './hal-link.model';
+import { HIERARCHICAL_BROWSE_DEFINITION } from './hierarchical-browse-definition.resource-type';
+import { ResourceType } from './resource-type';
+
+/**
+ * BrowseDefinition model for browses of type 'hierarchicalBrowse'
+ */
+@typedObject
+@inheritSerialization(BrowseDefinition)
+export class HierarchicalBrowseDefinition extends BrowseDefinition {
+  static type = HIERARCHICAL_BROWSE_DEFINITION;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+    type: ResourceType = HIERARCHICAL_BROWSE_DEFINITION;
+
+  @autoserialize
+    facetType: string;
+
+  @autoserialize
+    vocabulary: string;
+
+  @autoserializeAs('metadata')
+    metadataKeys: string[];
+
+  get self(): string {
+    return this._links.self.href;
+  }
+
+  @deserialize
+    _links: {
+    self: HALLink;
+    vocabulary: HALLink;
+  };
+
+  getRenderType(): BrowseByDataType {
+    return BrowseByDataType.Hierarchy;
+  }
+}
diff --git a/src/app/core/shared/hierarchical-browse-definition.resource-type.ts b/src/app/core/shared/hierarchical-browse-definition.resource-type.ts
new file mode 100644
index 0000000000..df06d67c7a
--- /dev/null
+++ b/src/app/core/shared/hierarchical-browse-definition.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for HierarchicalBrowseDefinition
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const HIERARCHICAL_BROWSE_DEFINITION = new ResourceType('hierarchicalBrowse');
diff --git a/src/app/core/shared/item-relationships/item-type.model.ts b/src/app/core/shared/item-relationships/item-type.model.ts
index c51c3b9035..1d8ca6df98 100644
--- a/src/app/core/shared/item-relationships/item-type.model.ts
+++ b/src/app/core/shared/item-relationships/item-type.model.ts
@@ -1,11 +1,16 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { HALLink } from '../hal-link.model';
 import { ResourceType } from '../resource-type';
 import { ITEM_TYPE } from './item-type.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Describes a type of Item
@@ -19,16 +24,16 @@ export class ItemType implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this ItemType
    */
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The universally unique identifier of this ItemType
@@ -36,13 +41,13 @@ export class ItemType implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(ItemType.type.value), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The {@link HALLink}s for this ItemType
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 }
diff --git a/src/app/core/shared/item-relationships/relationship-type.model.ts b/src/app/core/shared/item-relationships/relationship-type.model.ts
index 73e3a7b47c..75d5d70af6 100644
--- a/src/app/core/shared/item-relationships/relationship-type.model.ts
+++ b/src/app/core/shared/item-relationships/relationship-type.model.ts
@@ -1,6 +1,15 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { RemoteData } from '../../data/remote-data';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
@@ -9,7 +18,6 @@ import { ResourceType } from '../resource-type';
 import { ItemType } from './item-type.model';
 import { ITEM_TYPE } from './item-type.resource-type';
 import { RELATIONSHIP_TYPE } from './relationship-type.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Describes a type of Relationship between multiple possible Items
@@ -23,19 +31,19 @@ export class RelationshipType implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The label that describes this RelationshipType
    */
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The identifier of this RelationshipType
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The universally unique identifier of this RelationshipType
@@ -43,49 +51,49 @@ export class RelationshipType implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(RelationshipType.type.value), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The label that describes the Relation to the left of this RelationshipType
    */
   @autoserialize
-  leftwardType: string;
+    leftwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the left of this RelationshipType
    */
   @autoserialize
-  leftMaxCardinality: number;
+    leftMaxCardinality: number;
 
   /**
    * The minimum amount of Relationships allowed to the left of this RelationshipType
    */
   @autoserialize
-  leftMinCardinality: number;
+    leftMinCardinality: number;
 
   /**
    * The label that describes the Relation to the right of this RelationshipType
    */
   @autoserialize
-  rightwardType: string;
+    rightwardType: string;
 
   /**
    * The maximum amount of Relationships allowed to the right of this RelationshipType
    */
   @autoserialize
-  rightMaxCardinality: number;
+    rightMaxCardinality: number;
 
   /**
    * The minimum amount of Relationships allowed to the right of this RelationshipType
    */
   @autoserialize
-  rightMinCardinality: number;
+    rightMinCardinality: number;
 
   /**
    * The {@link HALLink}s for this RelationshipType
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     leftType: HALLink;
     rightType: HALLink;
@@ -96,12 +104,12 @@ export class RelationshipType implements CacheableObject {
    * Will be undefined unless the leftType {@link HALLink} has been resolved.
    */
   @link(ITEM_TYPE)
-  leftType?: Observable<RemoteData<ItemType>>;
+    leftType?: Observable<RemoteData<ItemType>>;
 
   /**
    * The type of Item found on the right side of this RelationshipType
    * Will be undefined unless the rightType {@link HALLink} has been resolved.
    */
   @link(ITEM_TYPE)
-  rightType?: Observable<RemoteData<ItemType>>;
+    rightType?: Observable<RemoteData<ItemType>>;
 }
diff --git a/src/app/core/shared/item-relationships/relationship.model.ts b/src/app/core/shared/item-relationships/relationship.model.ts
index db12e1d862..4f6fe2796d 100644
--- a/src/app/core/shared/item-relationships/relationship.model.ts
+++ b/src/app/core/shared/item-relationships/relationship.model.ts
@@ -1,6 +1,15 @@
-import { autoserialize, deserialize, deserializeAs } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { RemoteData } from '../../data/remote-data';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
@@ -8,10 +17,9 @@ import { HALLink } from '../hal-link.model';
 import { Item } from '../item.model';
 import { ITEM } from '../item.resource-type';
 import { ResourceType } from '../resource-type';
+import { RELATIONSHIP } from './relationship.resource-type';
 import { RelationshipType } from './relationship-type.model';
 import { RELATIONSHIP_TYPE } from './relationship-type.resource-type';
-import { RELATIONSHIP } from './relationship.resource-type';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 /**
  * Describes a Relationship between two Items
@@ -25,7 +33,7 @@ export class Relationship implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The universally unique identifier of this Relationship
@@ -33,43 +41,43 @@ export class Relationship implements CacheableObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(Relationship.type.value), 'id')
-  uuid: string;
+    uuid: string;
 
   /**
    * The identifier of this Relationship
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The place of the Item to the left side of this Relationship
    */
   @autoserialize
-  leftPlace: number;
+    leftPlace: number;
 
   /**
    * The place of the Item to the right side of this Relationship
    */
   @autoserialize
-  rightPlace: number;
+    rightPlace: number;
 
   /**
    * The name variant of the Item to the left side of this Relationship
    */
   @autoserialize
-  leftwardValue: string;
+    leftwardValue: string;
 
   /**
    * The name variant of the Item to the right side of this Relationship
    */
   @autoserialize
-  rightwardValue: string;
+    rightwardValue: string;
 
   /**
    * The {@link HALLink}s for this Relationship
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     leftItem: HALLink;
     rightItem: HALLink;
@@ -81,20 +89,20 @@ export class Relationship implements CacheableObject {
    * Will be undefined unless the leftItem {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  leftItem?: Observable<RemoteData<Item>>;
+    leftItem?: Observable<RemoteData<Item>>;
 
   /**
    * The item on the right side of this relationship
    * Will be undefined unless the rightItem {@link HALLink} has been resolved.
    */
   @link(ITEM)
-  rightItem?: Observable<RemoteData<Item>>;
+    rightItem?: Observable<RemoteData<Item>>;
 
   /**
    * The RelationshipType for this Relationship
    * Will be undefined unless the relationshipType {@link HALLink} has been resolved.
    */
   @link(RELATIONSHIP_TYPE)
-  relationshipType?: Observable<RemoteData<RelationshipType>>;
+    relationshipType?: Observable<RemoteData<RelationshipType>>;
 
 }
diff --git a/src/app/core/shared/item-request.model.ts b/src/app/core/shared/item-request.model.ts
index 35dacc67c4..8b1ef94512 100644
--- a/src/app/core/shared/item-request.model.ts
+++ b/src/app/core/shared/item-request.model.ts
@@ -1,10 +1,14 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { ResourceType } from './resource-type';
-import { ITEM_REQUEST } from './item-request.resource-type';
-import { HALLink } from './hal-link.model';
 import { CacheableObject } from '../cache/cacheable-object.model';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { HALLink } from './hal-link.model';
+import { ITEM_REQUEST } from './item-request.resource-type';
+import { ResourceType } from './resource-type';
 
 /**
  * Model class for an ItemRequest
@@ -18,70 +22,70 @@ export class ItemRequest implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * opaque string which uniquely identifies this request
    */
   @autoserialize
-  token: string;
+    token: string;
 
   /**
    * true if the request is for all bitstreams of the item.
    */
   @autoserialize
-  allfiles: boolean;
+    allfiles: boolean;
   /**
    * email address of the person requesting the files.
    */
   @autoserialize
-  requestEmail: string;
+    requestEmail: string;
   /**
    * Human-readable name of the person requesting the files.
    */
   @autoserialize
-  requestName: string;
+    requestName: string;
   /**
    * arbitrary message provided by the person requesting the files.
    */
   @autoserialize
-  requestMessage: string;
+    requestMessage: string;
   /**
    * date that the request was recorded.
    */
   @autoserialize
-  requestDate: string;
+    requestDate: string;
   /**
    * true if the request has been granted.
    */
   @autoserialize
-  acceptRequest: boolean;
+    acceptRequest: boolean;
   /**
    * date that the request was granted or denied.
    */
   @autoserialize
-  decisionDate: string;
+    decisionDate: string;
   /**
    * date on which the request is considered expired.
    */
   @autoserialize
-  expires: string;
+    expires: string;
   /**
    * UUID of the requested Item.
    */
   @autoserialize
-  itemId: string;
+    itemId: string;
   /**
    * UUID of the requested bitstream.
    */
   @autoserialize
-  bitstreamId: string;
+    bitstreamId: string;
 
   /**
    * The {@link HALLink}s for this ItemRequest
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     item: HALLink;
     bitstream: HALLink;
diff --git a/src/app/core/shared/item.model.spec.ts b/src/app/core/shared/item.model.spec.ts
index 732ae5b19c..7eaa6f10be 100644
--- a/src/app/core/shared/item.model.spec.ts
+++ b/src/app/core/shared/item.model.spec.ts
@@ -1,6 +1,5 @@
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-
 import { Item } from './item.model';
 
 describe('Item', () => {
@@ -12,22 +11,21 @@ describe('Item', () => {
   const bitstream1Path = 'document.pdf';
   const bitstream2Path = 'otherfile.doc';
 
-  const nonExistingBundleName = 'c1e568f7-d14e-496b-bdd7-07026998cc00';
   let bitstreams;
   let remoteDataThumbnail;
   let remoteDataThumbnailList;
   let remoteDataFiles;
   let remoteDataBundles;
 
-  beforeEach(() => {
+  it('should be possible to create an Item without any errors', () => {
     const thumbnail = {
-      content: thumbnailPath
+      content: thumbnailPath,
     };
 
     bitstreams = [{
-      content: bitstream1Path
+      content: bitstream1Path,
     }, {
-      content: bitstream2Path
+      content: bitstream2Path,
     }];
 
     remoteDataThumbnail = createSuccessfulRemoteDataObject$(thumbnail);
@@ -40,16 +38,17 @@ describe('Item', () => {
         {
           name: thumbnailBundleName,
           primaryBitstream: remoteDataThumbnail,
-          bitstreams: remoteDataThumbnailList
+          bitstreams: remoteDataThumbnailList,
         },
 
         {
           name: originalBundleName,
-          bitstreams: remoteDataFiles
+          bitstreams: remoteDataFiles,
         }];
 
     remoteDataBundles = createSuccessfulRemoteDataObject$(createPaginatedList(bundles));
 
     item = Object.assign(new Item(), { bundles: remoteDataBundles });
+    expect().nothing();
   });
 });
diff --git a/src/app/core/shared/item.model.ts b/src/app/core/shared/item.model.ts
index 28f0d7fd36..33a9f3bb38 100644
--- a/src/app/core/shared/item.model.ts
+++ b/src/app/core/shared/item.model.ts
@@ -1,29 +1,40 @@
-import { autoserialize, autoserializeAs, deserialize, deserializeAs, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
+import { AccessStatusObject } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model';
+import { ACCESS_STATUS } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type';
+
 import { isEmpty } from '../../shared/empty.util';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import { IdentifierData } from '../../shared/object-list/identifier-data/identifier-data.model';
+import { IDENTIFIERS } from '../../shared/object-list/identifier-data/identifier-data.resource-type';
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { Bitstream } from './bitstream.model';
+import { BITSTREAM } from './bitstream.resource-type';
 import { Bundle } from './bundle.model';
 import { BUNDLE } from './bundle.resource-type';
+import { ChildHALResource } from './child-hal-resource.model';
 import { Collection } from './collection.model';
 import { COLLECTION } from './collection.resource-type';
-
 import { DSpaceObject } from './dspace-object.model';
 import { GenericConstructor } from './generic-constructor';
 import { HALLink } from './hal-link.model';
+import { HandleObject } from './handle-object.model';
+import { ITEM } from './item.resource-type';
 import { Relationship } from './item-relationships/relationship.model';
 import { RELATIONSHIP } from './item-relationships/relationship.resource-type';
-import { ITEM } from './item.resource-type';
-import { ChildHALResource } from './child-hal-resource.model';
 import { Version } from './version.model';
 import { VERSION } from './version.resource-type';
-import { BITSTREAM } from './bitstream.resource-type';
-import { Bitstream } from './bitstream.model';
-import { ACCESS_STATUS } from 'src/app/shared/object-list/access-status-badge/access-status.resource-type';
-import { AccessStatusObject } from 'src/app/shared/object-list/access-status-badge/access-status.model';
-import { HandleObject } from './handle-object.model';
 
 /**
  * Class representing a DSpace Item
@@ -37,37 +48,37 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
    * A string representing the unique handle of this Item
    */
   @autoserialize
-  handle: string;
+    handle: string;
 
   /**
    * The Date of the last modification of this Item
    */
   @deserializeAs(Date)
-  lastModified: Date;
+    lastModified: Date;
 
   /**
    * A boolean representing if this Item is currently archived or not
    */
   @autoserializeAs(Boolean, 'inArchive')
-  isArchived: boolean;
+    isArchived: boolean;
 
   /**
    * A boolean representing if this Item is currently discoverable or not
    */
   @autoserializeAs(Boolean, 'discoverable')
-  isDiscoverable: boolean;
+    isDiscoverable: boolean;
 
   /**
    * A boolean representing if this Item is currently withdrawn or not
    */
   @autoserializeAs(Boolean, 'withdrawn')
-  isWithdrawn: boolean;
+    isWithdrawn: boolean;
 
   /**
    * The {@link HALLink}s for this Item
    */
   @deserialize
-  _links: {
+    _links: {
     mappedCollections: HALLink;
     relationships: HALLink;
     bundles: HALLink;
@@ -76,6 +87,7 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
     version: HALLink;
     thumbnail: HALLink;
     accessStatus: HALLink;
+    identifiers: HALLink;
     self: HALLink;
   };
 
@@ -84,42 +96,49 @@ export class Item extends DSpaceObject implements ChildHALResource, HandleObject
    * Will be undefined unless the owningCollection {@link HALLink} has been resolved.
    */
   @link(COLLECTION)
-  owningCollection?: Observable<RemoteData<Collection>>;
+    owningCollection?: Observable<RemoteData<Collection>>;
 
   /**
    * The version this item represents in its history
    * Will be undefined unless the version {@link HALLink} has been resolved.
    */
   @link(VERSION)
-  version?: Observable<RemoteData<Version>>;
+    version?: Observable<RemoteData<Version>>;
 
   /**
    * The list of Bundles inside this Item
    * Will be undefined unless the bundles {@link HALLink} has been resolved.
    */
   @link(BUNDLE, true)
-  bundles?: Observable<RemoteData<PaginatedList<Bundle>>>;
+    bundles?: Observable<RemoteData<PaginatedList<Bundle>>>;
 
   /**
    * The list of Relationships this Item has with others
    * Will be undefined unless the relationships {@link HALLink} has been resolved.
    */
   @link(RELATIONSHIP, true)
-  relationships?: Observable<RemoteData<PaginatedList<Relationship>>>;
+    relationships?: Observable<RemoteData<PaginatedList<Relationship>>>;
 
   /**
    * The thumbnail for this Item
    * Will be undefined unless the thumbnail {@link HALLink} has been resolved.
    */
   @link(BITSTREAM, false, 'thumbnail')
-  thumbnail?: Observable<RemoteData<Bitstream>>;
+    thumbnail?: Observable<RemoteData<Bitstream>>;
 
   /**
    * The access status for this Item
    * Will be undefined unless the access status {@link HALLink} has been resolved.
    */
    @link(ACCESS_STATUS)
-   accessStatus?: Observable<RemoteData<AccessStatusObject>>;
+     accessStatus?: Observable<RemoteData<AccessStatusObject>>;
+
+  /**
+   * The identifier data for this Item
+   * Will be undefined unless the identifiers {@link HALLink} has been resolved.
+   */
+  @link(IDENTIFIERS, false, 'identifiers')
+    identifiers?: Observable<RemoteData<IdentifierData>>;
 
   /**
    * Method that returns as which type of object this object should be rendered
diff --git a/src/app/core/shared/license.model.ts b/src/app/core/shared/license.model.ts
index 2b2477c1f8..af85c31eea 100644
--- a/src/app/core/shared/license.model.ts
+++ b/src/app/core/shared/license.model.ts
@@ -1,4 +1,8 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
 import { DSpaceObject } from './dspace-object.model';
 import { LICENSE } from './license.resource-type';
@@ -12,11 +16,11 @@ export class License extends DSpaceObject {
    * Is the license custom?
    */
   @autoserialize
-  custom: boolean;
+    custom: boolean;
 
   /**
    * The text of the license
    */
   @autoserialize
-  text: string;
+    text: string;
 }
diff --git a/src/app/core/shared/media-viewer-item.model.ts b/src/app/core/shared/media-viewer-item.model.ts
index cd3a31bd0b..1cf4948408 100644
--- a/src/app/core/shared/media-viewer-item.model.ts
+++ b/src/app/core/shared/media-viewer-item.model.ts
@@ -14,6 +14,11 @@ export class MediaViewerItem {
    */
   format: string;
 
+  /**
+   * Incoming Bitsream format mime type
+   */
+  mimetype: string;
+
   /**
    * Incoming Bitsream thumbnail
    */
diff --git a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
index b46dab7180..a580d7b654 100644
--- a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
+++ b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.spec.ts
@@ -1,7 +1,7 @@
-import { MetadataRepresentationType } from '../metadata-representation.model';
-import { ItemMetadataRepresentation } from './item-metadata-representation.model';
 import { Item } from '../../item.model';
 import { MetadataValue } from '../../metadata.models';
+import { MetadataRepresentationType } from '../metadata-representation.model';
+import { ItemMetadataRepresentation } from './item-metadata-representation.model';
 
 describe('ItemMetadataRepresentation', () => {
   const valuePrefix = 'Test value for ';
@@ -11,14 +11,14 @@ describe('ItemMetadataRepresentation', () => {
   item.metadata = {
     'dc.title': [
       {
-        value: `${valuePrefix}dc.title`
-      }
+        value: `${valuePrefix}dc.title`,
+      },
     ] as MetadataValue[],
     'dc.contributor.author': [
       {
-        value: `${valuePrefix}dc.contributor.author`
-      }
-    ] as MetadataValue[]
+        value: `${valuePrefix}dc.contributor.author`,
+      },
+    ] as MetadataValue[],
   };
 
   for (const metadataField of Object.keys(item.metadata)) {
@@ -26,8 +26,8 @@ describe('ItemMetadataRepresentation', () => {
       beforeEach(() => {
         item.metadata['dspace.entity.type'] = [
           Object.assign(new MetadataValue(), {
-            value: itemType
-          })
+            value: itemType,
+          }),
         ];
         itemMetadataRepresentation = Object.assign(new ItemMetadataRepresentation(item.metadata[metadataField][0]), item);
       });
diff --git a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
index 8c50e0b597..9ccece13f2 100644
--- a/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/item/item-metadata-representation.model.ts
@@ -1,6 +1,9 @@
 import { Item } from '../../item.model';
-import { MetadataRepresentation, MetadataRepresentationType } from '../metadata-representation.model';
 import { MetadataValue } from '../../metadata.models';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../metadata-representation.model';
 
 /**
  * This class determines which fields to use when rendering an Item as a metadata value.
diff --git a/src/app/core/shared/metadata-representation/metadata-representation.model.ts b/src/app/core/shared/metadata-representation/metadata-representation.model.ts
index 06387966f7..379a3d1be8 100644
--- a/src/app/core/shared/metadata-representation/metadata-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/metadata-representation.model.ts
@@ -1,11 +1,14 @@
 /**
  * An Enum defining the representation type of metadata
  */
+import { BrowseDefinition } from '../browse-definition.model';
+
 export enum MetadataRepresentationType {
   None = 'none',
   Item = 'item',
   AuthorityControlled = 'authority_controlled',
-  PlainText = 'plain_text'
+  PlainText = 'plain_text',
+  BrowseLink = 'browse_link'
 }
 
 /**
@@ -24,8 +27,14 @@ export interface MetadataRepresentation {
    */
   representationType: MetadataRepresentationType;
 
+  /**
+   * The browse definition (optional)
+   */
+  browseDefinition?: BrowseDefinition;
+
   /**
    * Fetches the value to be displayed
    */
   getValue(): string;
+
 }
diff --git a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts
index ea48d345c5..b81753b1a0 100644
--- a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts
+++ b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.spec.ts
@@ -1,17 +1,17 @@
-import { MetadatumRepresentation } from './metadatum-representation.model';
-import { MetadataRepresentationType } from '../metadata-representation.model';
 import { MetadataValue } from '../../metadata.models';
+import { MetadataRepresentationType } from '../metadata-representation.model';
+import { MetadatumRepresentation } from './metadatum-representation.model';
 
 describe('MetadatumRepresentation', () => {
   const itemType = 'Person';
   const normalMetadatum = Object.assign(new MetadataValue(), {
     key: 'dc.contributor.author',
-    value: 'Test Author'
+    value: 'Test Author',
   });
   const authorityMetadatum = Object.assign(new MetadataValue(), {
     key: 'dc.contributor.author',
     value: 'Test Authority Author',
-    authority: '1234'
+    authority: '1234',
   });
 
   let metadatumRepresentation: MetadatumRepresentation;
diff --git a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
index 595147f3e6..9ca24edd57 100644
--- a/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
+++ b/src/app/core/shared/metadata-representation/metadatum/metadatum-representation.model.ts
@@ -1,6 +1,10 @@
-import { MetadataRepresentation, MetadataRepresentationType } from '../metadata-representation.model';
 import { hasValue } from '../../../../shared/empty.util';
+import { BrowseDefinition } from '../../browse-definition.model';
 import { MetadataValue } from '../../metadata.models';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../metadata-representation.model';
 
 /**
  * This class defines the way the metadatum it extends should be represented
@@ -12,9 +16,15 @@ export class MetadatumRepresentation extends MetadataValue implements MetadataRe
    */
   itemType: string;
 
-  constructor(itemType: string) {
+  /**
+   * The browse definition ID passed in with the metadatum, if any
+   */
+  browseDefinition?: BrowseDefinition;
+
+  constructor(itemType: string, browseDefinition?: BrowseDefinition) {
     super();
     this.itemType = itemType;
+    this.browseDefinition = browseDefinition;
   }
 
   /**
@@ -23,6 +33,8 @@ export class MetadatumRepresentation extends MetadataValue implements MetadataRe
   get representationType(): MetadataRepresentationType {
     if (hasValue(this.authority)) {
       return MetadataRepresentationType.AuthorityControlled;
+    } else if (hasValue(this.browseDefinition)) {
+      return MetadataRepresentationType.BrowseLink;
     } else {
       return MetadataRepresentationType.PlainText;
     }
diff --git a/src/app/core/shared/metadata.models.ts b/src/app/core/shared/metadata.models.ts
index e74e1f9927..4ba78e39f7 100644
--- a/src/app/core/shared/metadata.models.ts
+++ b/src/app/core/shared/metadata.models.ts
@@ -1,6 +1,11 @@
 /* eslint-disable max-classes-per-file */
+import {
+  autoserialize,
+  Deserialize,
+  Serialize,
+} from 'cerialize';
 import { v4 as uuidv4 } from 'uuid';
-import { autoserialize, Serialize, Deserialize } from 'cerialize';
+
 import { hasValue } from '../../shared/empty.util';
 
 export const VIRTUAL_METADATA_PREFIX = 'virtual::';
@@ -32,26 +37,26 @@ export class MetadataValue implements MetadataValueInterface {
 
   /** The language. */
   @autoserialize
-  language: string;
+    language: string;
 
   /** The string value. */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * The place of this MetadataValue within its list of metadata
    * This is used to render metadata in a specific custom order
    */
   @autoserialize
-  place: number;
+    place: number;
 
   /** The authority key used for authority-controlled metadata */
   @autoserialize
-  authority: string;
+    authority: string;
 
   /** The authority confidence value */
   @autoserialize
-  confidence: number;
+    confidence: number;
 
   /**
    * Returns true if this Metadatum's authority key starts with 'virtual::'
@@ -136,5 +141,5 @@ export const MetadataMapSerializer = {
       metadataMap[key] = Deserialize(json[key], MetadataValue);
     });
     return metadataMap;
-  }
+  },
 };
diff --git a/src/app/core/shared/metadata.utils.spec.ts b/src/app/core/shared/metadata.utils.spec.ts
index 812e65bcba..2ba96201b0 100644
--- a/src/app/core/shared/metadata.utils.spec.ts
+++ b/src/app/core/shared/metadata.utils.spec.ts
@@ -1,6 +1,12 @@
-import { isUndefined } from '../../shared/empty.util';
 import { v4 as uuidv4 } from 'uuid';
-import { MetadataMap, MetadataValue, MetadataValueFilter, MetadatumViewModel } from './metadata.models';
+
+import { isUndefined } from '../../shared/empty.util';
+import {
+  MetadataMap,
+  MetadataValue,
+  MetadataValueFilter,
+  MetadatumViewModel,
+} from './metadata.models';
 import { Metadata } from './metadata.utils';
 
 const mdValue = (value: string, language?: string, authority?: string): MetadataValue => {
@@ -10,7 +16,7 @@ const mdValue = (value: string, language?: string, authority?: string): Metadata
     language: isUndefined(language) ? null : language,
     place: 0,
     authority: isUndefined(authority) ? null : authority,
-    confidence: undefined
+    confidence: undefined,
   });
 };
 
@@ -28,7 +34,7 @@ const multiMap = {
   'dc.description': [dcDescription],
   'dc.description.abstract': [dcAbstract],
   'dc.title': [dcTitle1, dcTitle2],
-  'foo': [bar]
+  'foo': [bar],
 };
 
 const regexTestMap = {
@@ -41,7 +47,7 @@ const multiViewModelList = [
   { key: 'dc.description.abstract', ...dcAbstract, order: 0 },
   { key: 'dc.title', ...dcTitle1, order: 0 },
   { key: 'dc.title', ...dcTitle2, order: 1 },
-  { key: 'foo', ...bar, order: 0 }
+  { key: 'foo', ...bar, order: 0 },
 ];
 
 const testMethod = (fn, resultKind, mapOrMaps, keyOrKeys, expected, filter?) => {
@@ -231,7 +237,7 @@ describe('Metadata', () => {
 
     const metadataMap = {
       'dc.description': [mdValue('Test description')],
-      'dc.title': [mdValue('Test title 1'), mdValue('Test title 2')]
+      'dc.title': [mdValue('Test title 1'), mdValue('Test title 2')],
     };
 
     const testSetFirstValue = (map: MetadataMap, key: string, value: string) => {
diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 3fbeb205d2..1ad10356fb 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -1,11 +1,18 @@
-import { isEmpty, isNotEmpty, isNotUndefined, isUndefined } from '../../shared/empty.util';
+import groupBy from 'lodash/groupBy';
+import sortBy from 'lodash/sortBy';
+
+import {
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined,
+} from '../../shared/empty.util';
 import {
   MetadataMapInterface,
   MetadataValue,
   MetadataValueFilter,
-  MetadatumViewModel
+  MetadatumViewModel,
 } from './metadata.models';
-import { groupBy, sortBy } from 'lodash';
 
 /**
  * Utility class for working with DSpace object metadata.
@@ -32,7 +39,7 @@ export class Metadata {
    * @returns {MetadataValue[]} the matching values or an empty array.
    */
   public static all(mapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                    filter?: MetadataValueFilter): MetadataValue[] {
+    filter?: MetadataValueFilter): MetadataValue[] {
     const mdMaps: MetadataMapInterface[] = mapOrMaps instanceof Array ? mapOrMaps : [mapOrMaps];
     const matches: MetadataValue[] = [];
     for (const mdMap of mdMaps) {
@@ -63,7 +70,7 @@ export class Metadata {
    * @returns {string[]} the matching string values or an empty array.
    */
   public static allValues(mapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                          filter?: MetadataValueFilter): string[] {
+    filter?: MetadataValueFilter): string[] {
     return Metadata.all(mapOrMaps, keyOrKeys, filter).map((mdValue) => mdValue.value);
   }
 
@@ -76,7 +83,7 @@ export class Metadata {
    * @returns {MetadataValue} the first matching value, or `undefined`.
    */
   public static first(mdMapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                      filter?: MetadataValueFilter): MetadataValue {
+    filter?: MetadataValueFilter): MetadataValue {
     const mdMaps: MetadataMapInterface[] = mdMapOrMaps instanceof Array ? mdMapOrMaps : [mdMapOrMaps];
     for (const mdMap of mdMaps) {
       for (const key of Metadata.resolveKeys(mdMap, keyOrKeys)) {
@@ -97,7 +104,7 @@ export class Metadata {
    * @returns {string} the first matching string value, or `undefined`.
    */
   public static firstValue(mdMapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                           filter?: MetadataValueFilter): string {
+    filter?: MetadataValueFilter): string {
     const value = Metadata.first(mdMapOrMaps, keyOrKeys, filter);
     return isUndefined(value) ? undefined : value.value;
   }
@@ -111,7 +118,7 @@ export class Metadata {
    * @returns {boolean} whether a match is found.
    */
   public static has(mdMapOrMaps: MetadataMapInterface | MetadataMapInterface[], keyOrKeys: string | string[],
-                    filter?: MetadataValueFilter): boolean {
+    filter?: MetadataValueFilter): boolean {
     return isNotUndefined(Metadata.first(mdMapOrMaps, keyOrKeys, filter));
   }
 
@@ -187,7 +194,7 @@ export class Metadata {
               metadataValue,
               {
                 order: index,
-                key
+                key,
               }));
         metadatumList = [...metadatumList, ...fields];
       });
@@ -208,11 +215,11 @@ export class Metadata {
       .forEach((key: string) => {
         const orderedValues = sortBy(groupedList[key], ['order']);
         metadataMap[key] = orderedValues.map((value: MetadatumViewModel) => {
-            const val = Object.assign(new MetadataValue(), value);
-            delete (val as any).order;
-            delete (val as any).key;
-            return val;
-          }
+          const val = Object.assign(new MetadataValue(), value);
+          delete (val as any).order;
+          delete (val as any).key;
+          return val;
+        },
         );
       });
     return metadataMap;
diff --git a/src/app/core/shared/non-hierarchical-browse-definition.ts b/src/app/core/shared/non-hierarchical-browse-definition.ts
new file mode 100644
index 0000000000..769d70629d
--- /dev/null
+++ b/src/app/core/shared/non-hierarchical-browse-definition.ts
@@ -0,0 +1,29 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
+import { BrowseDefinition } from './browse-definition.model';
+import { SortOption } from './sort-option.model';
+
+/**
+ * Super class for NonHierarchicalBrowseDefinition models,
+ * e.g. FlatBrowseDefinition and ValueListBrowseDefinition
+ */
+@inheritSerialization(BrowseDefinition)
+export abstract class NonHierarchicalBrowseDefinition extends BrowseDefinition {
+
+  @autoserialize
+    sortOptions: SortOption[];
+
+  @autoserializeAs('order')
+    defaultSortOrder: string;
+
+  @autoserializeAs('metadata')
+    metadataKeys: string[];
+
+  @autoserialize
+    dataType: BrowseByDataType;
+}
diff --git a/src/app/core/shared/operators.spec.ts b/src/app/core/shared/operators.spec.ts
index 077c0a17d8..07ba82caba 100644
--- a/src/app/core/shared/operators.spec.ts
+++ b/src/app/core/shared/operators.spec.ts
@@ -1,21 +1,31 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
+
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
 import { GetRequest } from '../data/request.models';
 import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { redirectOn4xx } from './authorized.operators';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from './operators';
-import { of as observableOf } from 'rxjs';
 import {
-  createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject
-} from '../../shared/remote-data.utils';
-import { getRequestFromRequestHref, getRequestFromRequestUUID, getResponseFromEntry, sendRequest } from './request.operators';
-import { redirectOn4xx } from './authorized.operators';
-import { RequestEntry } from '../data/request-entry.model';
+  getRequestFromRequestHref,
+  getRequestFromRequestUUID,
+  getResponseFromEntry,
+  sendRequest,
+} from './request.operators';
 
 /* eslint-disable @typescript-eslint/no-shadow */
 
@@ -32,7 +42,7 @@ describe('Core Module - RxJS Operators', () => {
     d: { response: { isSuccessful: true, resourceSelfLinks: ['j', 'k', 'l', 'm', 'n'] } },
     e: { response: { isSuccessful: 1, resourceSelfLinks: [] } },
     f: { response: undefined },
-    g: undefined
+    g: undefined,
   };
 
   const testResponses = {
@@ -40,7 +50,7 @@ describe('Core Module - RxJS Operators', () => {
     b: testRCEs.b.response,
     c: testRCEs.c.response,
     d: testRCEs.d.response,
-    e: testRCEs.e.response
+    e: testRCEs.e.response,
   };
 
   beforeEach(() => {
@@ -147,7 +157,7 @@ describe('Core Module - RxJS Operators', () => {
         b: testRCEs.b.response,
         c: testRCEs.c.response,
         d: testRCEs.d.response,
-        e: testRCEs.e.response
+        e: testRCEs.e.response,
       });
 
       expect(result).toBeObservable(expected);
@@ -183,7 +193,7 @@ describe('Core Module - RxJS Operators', () => {
       router = jasmine.createSpyObj('router', ['navigateByUrl']);
       authService = jasmine.createSpyObj('authService', {
         isAuthenticated: observableOf(true),
-        setRedirectUrl: {}
+        setRedirectUrl: {},
       });
     });
 
@@ -296,7 +306,7 @@ describe('Core Module - RxJS Operators', () => {
         b: testRCEs.b.response,
         c: testRCEs.c.response,
         d: testRCEs.d.response,
-        e: testRCEs.e.response
+        e: testRCEs.e.response,
       });
 
       expect(result).toBeObservable(expected);
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index 32610c82fd..c98b60b649 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -1,6 +1,28 @@
-import { combineLatest as observableCombineLatest, Observable, interval } from 'rxjs';
-import { filter, find, map, switchMap, take, takeWhile, debounce, debounceTime } from 'rxjs/operators';
-import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../../shared/empty.util';
+import { InjectionToken } from '@angular/core';
+import {
+  combineLatest as observableCombineLatest,
+  interval,
+  MonoTypeOperatorFunction,
+  Observable,
+  SchedulerLike,
+} from 'rxjs';
+import {
+  debounce,
+  debounceTime,
+  filter,
+  find,
+  map,
+  switchMap,
+  take,
+  takeWhile,
+} from 'rxjs/operators';
+
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { SearchResult } from '../../shared/search/models/search-result.model';
 import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
@@ -8,8 +30,6 @@ import { MetadataField } from '../metadata/metadata-field.model';
 import { MetadataSchema } from '../metadata/metadata-schema.model';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
-import { InjectionToken } from '@angular/core';
-import { MonoTypeOperatorFunction, SchedulerLike } from 'rxjs/internal/types';
 
 /**
  * Use this method instead of the RxJs debounceTime if you're waiting for debouncing in tests;
@@ -23,7 +43,7 @@ export const debounceTimeWorkaround = <T>(dueTime: number, scheduler?: Scheduler
 
 export const DEBOUNCE_TIME_OPERATOR = new InjectionToken<<T>(dueTime: number) => (source: Observable<T>) => Observable<T>>('debounceTime', {
   providedIn: 'root',
-  factory: () => debounceTime
+  factory: () => debounceTime,
 });
 
 export const getRemoteDataPayload = <T>() =>
@@ -68,7 +88,7 @@ export const getFirstSucceededRemoteDataPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
       getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
 /**
@@ -85,7 +105,7 @@ export const getFirstSucceededRemoteDataWithNotEmptyPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
       getFirstSucceededRemoteWithNotEmptyData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
 /**
@@ -102,7 +122,7 @@ export const getAllSucceededRemoteDataPayload = <T>() =>
   (source: Observable<RemoteData<T>>): Observable<T> =>
     source.pipe(
       getAllSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
 
 /**
@@ -124,7 +144,7 @@ export const getFirstSucceededRemoteListPayload = <T>() =>
     source.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      getPaginatedListPayload()
+      getPaginatedListPayload(),
     );
 
 /**
@@ -146,7 +166,7 @@ export const getAllSucceededRemoteListPayload = <T>() =>
     source.pipe(
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
-      getPaginatedListPayload()
+      getPaginatedListPayload(),
     );
 
 export const getFinishedRemoteData = <T>() =>
@@ -165,7 +185,7 @@ export const toDSpaceObjectListRD = <T extends DSpaceObject>() =>
         const dsoPage: T[] = rd.payload.page.filter((result) => hasValue(result)).map((searchResult: SearchResult<T>) => searchResult.indexableObject);
         const payload = Object.assign(rd.payload, { page: dsoPage }) as PaginatedList<T>;
         return Object.assign(rd, { payload: payload });
-      })
+      }),
     );
 
 /**
@@ -179,7 +199,7 @@ export const getBrowseDefinitionLinks = (definitionID: string) =>
       getRemoteDataPayload(),
       getPaginatedListPayload(),
       map((browseDefinitions: BrowseDefinition[]) => browseDefinitions
-        .find((def: BrowseDefinition) => def.id === definitionID)
+        .find((def: BrowseDefinition) => def.id === definitionID),
       ),
       map((def: BrowseDefinition) => {
         if (isNotEmpty(def)) {
@@ -187,7 +207,7 @@ export const getBrowseDefinitionLinks = (definitionID: string) =>
         } else {
           throw new Error(`No metadata browse definition could be found for id '${definitionID}'`);
         }
-      })
+      }),
     );
 
 /**
@@ -196,7 +216,7 @@ export const getBrowseDefinitionLinks = (definitionID: string) =>
 export const getFirstOccurrence = () =>
   <T extends DSpaceObject>(source: Observable<RemoteData<PaginatedList<T>>>): Observable<RemoteData<T>> =>
     source.pipe(
-      map((rd) => Object.assign(rd, { payload: rd.payload.page.length > 0 ? rd.payload.page[0] : undefined }))
+      map((rd) => Object.assign(rd, { payload: rd.payload.page.length > 0 ? rd.payload.page[0] : undefined })),
     );
 
 /**
@@ -206,7 +226,7 @@ export const paginatedListToArray = () =>
   <T extends DSpaceObject>(source: Observable<RemoteData<PaginatedList<T>>>): Observable<T[]> =>
     source.pipe(
       hasValueOperator(),
-      map((objectRD: RemoteData<PaginatedList<T>>) => objectRD.payload.page.filter((object: T) => hasValue(object)))
+      map((objectRD: RemoteData<PaginatedList<T>>) => objectRD.payload.page.filter((object: T) => hasValue(object))),
     );
 
 /**
@@ -223,13 +243,13 @@ export const metadataFieldsToString = () =>
         const fieldSchemaArray = fields.map((field: MetadataField) => {
           return field.schema.pipe(
             getFirstSucceededRemoteDataPayload(),
-            map((schema: MetadataSchema) => ({ field, schema }))
+            map((schema: MetadataSchema) => ({ field, schema })),
           );
         });
-        return observableCombineLatest(fieldSchemaArray);
+        return isNotEmpty(fieldSchemaArray) ? observableCombineLatest(fieldSchemaArray) : [[]];
       }),
       map((fieldSchemaArray: { field: MetadataField, schema: MetadataSchema }[]): string[] => {
         return fieldSchemaArray.map((fieldSchema: { field: MetadataField, schema: MetadataSchema }) => fieldSchema.schema.prefix + '.' + fieldSchema.field.toString());
-      })
+      }),
     );
 
diff --git a/src/app/core/shared/page-info.model.ts b/src/app/core/shared/page-info.model.ts
index ccb0aae471..5594e58309 100644
--- a/src/app/core/shared/page-info.model.ts
+++ b/src/app/core/shared/page-info.model.ts
@@ -1,4 +1,9 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { hasValue } from '../../shared/empty.util';
 import { HALLink } from './hal-link.model';
 import { HALResource } from './hal-resource.model';
@@ -12,31 +17,31 @@ export class PageInfo implements HALResource {
    * The number of elements on a page
    */
   @autoserializeAs(Number, 'size')
-  elementsPerPage: number;
+    elementsPerPage: number;
 
   /**
    * The total number of elements in the entire set
    */
   @autoserialize
-  totalElements: number;
+    totalElements: number;
 
   /**
    * The total number of pages
    */
   @autoserialize
-  totalPages: number;
+    totalPages: number;
 
   /**
    * The number of the current page, zero-based
    */
   @autoserializeAs(Number, 'number')
-  currentPage: number;
+    currentPage: number;
 
   /**
    * The {@link HALLink}s for this PageInfo
    */
   @deserialize
-  _links: {
+    _links: {
     first: HALLink;
     prev: HALLink;
     next: HALLink;
@@ -50,7 +55,7 @@ export class PageInfo implements HALResource {
       totalElements: number,
       totalPages: number,
       currentPage: number
-    }
+    },
   ) {
     if (hasValue(options)) {
       this.elementsPerPage = options.elementsPerPage;
diff --git a/src/app/core/shared/registration.model.ts b/src/app/core/shared/registration.model.ts
index bc4488964f..e2efa6a02c 100644
--- a/src/app/core/shared/registration.model.ts
+++ b/src/app/core/shared/registration.model.ts
@@ -1,6 +1,6 @@
 import { typedObject } from '../cache/builders/build-decorators';
-import { ResourceType } from './resource-type';
 import { REGISTRATION } from './registration.resource-type';
+import { ResourceType } from './resource-type';
 import { UnCacheableObject } from './uncacheable-object.model';
 
 @typedObject
diff --git a/src/app/core/shared/request.operators.ts b/src/app/core/shared/request.operators.ts
index c529259f03..0cb8593f40 100644
--- a/src/app/core/shared/request.operators.ts
+++ b/src/app/core/shared/request.operators.ts
@@ -1,10 +1,19 @@
-import { RequestService } from '../data/request.service';
 import { Observable } from 'rxjs';
-import { filter, map, mergeMap, tap } from 'rxjs/operators';
-import { hasValue, hasValueOperator } from '../../shared/empty.util';
-import { RestRequest } from '../data/rest-request.model';
+import {
+  filter,
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../shared/empty.util';
+import { RequestService } from '../data/request.service';
 import { RequestEntry } from '../data/request-entry.model';
 import { ResponseState } from '../data/response-state.model';
+import { RestRequest } from '../data/rest-request.model';
 
 /**
  * This file contains custom RxJS operators that can be used in multiple places
@@ -14,19 +23,19 @@ export const getRequestFromRequestHref = (requestService: RequestService) =>
   (source: Observable<string>): Observable<RequestEntry> =>
     source.pipe(
       mergeMap((href: string) => requestService.getByHref(href)),
-      hasValueOperator()
+      hasValueOperator(),
     );
 export const getRequestFromRequestUUID = (requestService: RequestService) =>
   (source: Observable<string>): Observable<RequestEntry> =>
     source.pipe(
       mergeMap((uuid: string) => requestService.getByUUID(uuid)),
-      hasValueOperator()
+      hasValueOperator(),
     );
 export const getResponseFromEntry = () =>
   (source: Observable<RequestEntry>): Observable<ResponseState> =>
     source.pipe(
       filter((entry: RequestEntry) => hasValue(entry) && hasValue(entry.response)),
-      map((entry: RequestEntry) => entry.response)
+      map((entry: RequestEntry) => entry.response),
     );
 export const sendRequest = (requestService: RequestService) =>
   (source: Observable<RestRequest>): Observable<RestRequest> =>
diff --git a/src/app/core/shared/search/search-configuration.service.spec.ts b/src/app/core/shared/search/search-configuration.service.spec.ts
index d0fbd46d3a..7a47abbfd4 100644
--- a/src/app/core/shared/search/search-configuration.service.spec.ts
+++ b/src/app/core/shared/search/search-configuration.service.spec.ts
@@ -1,18 +1,26 @@
 /* eslint-disable no-empty, @typescript-eslint/no-empty-function */
-import { SearchConfigurationService } from './search-configuration.service';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { SearchFilter } from '../../../shared/search/models/search-filter.model';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { map } from 'rxjs/operators';
-import { RemoteData } from '../../data/remote-data';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { RequestEntry } from '../../data/request-entry.model';
 import { SearchObjects } from '../../../shared/search/models/search-objects.model';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestEntry } from '../../data/request-entry.model';
+import { SearchConfigurationService } from './search-configuration.service';
 
 describe('SearchConfigurationService', () => {
   let service: SearchConfigurationService;
@@ -20,25 +28,25 @@ describe('SearchConfigurationService', () => {
   const prefixFilter = {
     'f.author': ['another value'],
     'f.date.min': ['2013'],
-    'f.date.max': ['2018']
+    'f.date.max': ['2018'],
   };
   const defaults = new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), { id: 'page-id', currentPage: 1, pageSize: 20 }),
     sort: new SortOptions('score', SortDirection.DESC),
     configuration: 'default',
     query: '',
-    scope: ''
+    scope: '',
   });
 
   const backendFilters = [
     new SearchFilter('f.author', ['another value']),
-    new SearchFilter('f.date', ['[2013 TO 2018]'], 'equals')
+    new SearchFilter('f.date', ['[2013 TO 2018]'], 'equals'),
   ];
 
   const routeService = jasmine.createSpyObj('RouteService', {
     getQueryParameterValue: observableOf(value1),
     getQueryParamsWithPrefix: observableOf(prefixFilter),
-    getRouteParameterValue: observableOf('')
+    getRouteParameterValue: observableOf(''),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -49,7 +57,7 @@ describe('SearchConfigurationService', () => {
   const requestService: any = getMockRequestService();
   const halService: any = {
     getEndpoint: () => {
-    }
+    },
   };
 
   const rdb: any = {
@@ -57,7 +65,7 @@ describe('SearchConfigurationService', () => {
       return observableCombineLatest([requestEntryObs, payloadObs]).pipe(
         map(([req, pay]) => {
           return { req, pay };
-        })
+        }),
       );
     },
     aggregate: (input: Observable<RemoteData<any>>[]): Observable<RemoteData<any[]>> => {
@@ -65,9 +73,9 @@ describe('SearchConfigurationService', () => {
     },
     buildFromHref: (href: string): Observable<RemoteData<any>> => {
       return createSuccessfulRemoteDataObject$(Object.assign(new SearchObjects(), {
-        page: []
+        page: [],
       }));
-    }
+    },
   };
   beforeEach(() => {
     service = new SearchConfigurationService(routeService, paginationService as any, activatedRoute, linkService, halService, requestService, rdb);
diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
index eed93ae201..1e54fd4e6b 100644
--- a/src/app/core/shared/search/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -1,33 +1,64 @@
-import { Injectable, OnDestroy } from '@angular/core';
-import { ActivatedRoute, Params } from '@angular/router';
+import {
+  Injectable,
+  OnDestroy,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  merge as observableMerge,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest, merge as observableMerge, Observable, Subscription } from 'rxjs';
-import { filter, map, startWith, take } from 'rxjs/operators';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../../../shared/empty.util';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../../../shared/search/models/search-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { SearchFilter } from '../../../shared/search/models/search-filter.model';
-import { RemoteData } from '../../data/remote-data';
-import { DSpaceObjectType } from '../dspace-object-type.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
-import { RouteService } from '../../services/route.service';
-import { getAllSucceededRemoteDataPayload, getFirstSucceededRemoteData } from '../operators';
-import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { SearchConfig, SortConfig } from './search-filters/search-config.model';
-import { PaginationService } from '../../pagination/pagination.service';
-import { LinkService } from '../../cache/builders/link.service';
-import { HALEndpointService } from '../hal-endpoint.service';
-import { RequestService } from '../../data/request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { GetRequest } from '../../data/request.models';
-import { URLCombiner } from '../../url-combiner/url-combiner';
-import { GenericConstructor } from '../generic-constructor';
-import { ResponseParsingService } from '../../data/parsing.service';
-import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
-import { ViewMode } from '../view-mode.model';
 import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { FacetConfigResponse } from '../../../shared/search/models/facet-config-response.model';
+import { SearchOptions } from '../../../shared/search/models/search-options.model';
+import { LinkService } from '../../cache/builders/link.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
+import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
+import { ResponseParsingService } from '../../data/parsing.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+import { PaginationService } from '../../pagination/pagination.service';
+import { RouteService } from '../../services/route.service';
+import { URLCombiner } from '../../url-combiner/url-combiner';
+import { DSpaceObjectType } from '../dspace-object-type.model';
+import { GenericConstructor } from '../generic-constructor';
+import { HALEndpointService } from '../hal-endpoint.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteData,
+} from '../operators';
+import { ViewMode } from '../view-mode.model';
+import {
+  SearchConfig,
+  SortConfig,
+} from './search-filters/search-config.model';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
@@ -66,7 +97,7 @@ export class SearchConfigurationService implements OnDestroy {
   protected defaultPagination = Object.assign(new PaginationComponentOptions(), {
     id: this.paginationID,
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -105,7 +136,7 @@ export class SearchConfigurationService implements OnDestroy {
               protected linkService: LinkService,
               protected halService: HALEndpointService,
               protected requestService: RequestService,
-              protected rdb: RemoteDataBuildService,) {
+              protected rdb: RemoteDataBuildService) {
 
     this.initDefaults();
   }
@@ -118,7 +149,7 @@ export class SearchConfigurationService implements OnDestroy {
       const options = new PaginatedSearchOptions({
         pagination: this.defaultPagination,
         scope: this.defaultScope,
-        query: this.defaultQuery
+        query: this.defaultQuery,
       });
       this._defaults = createSuccessfulRemoteDataObject$(options, new Date().getTime());
     }
@@ -131,11 +162,11 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentConfiguration(defaultConfiguration: string) {
     return observableCombineLatest([
       this.routeService.getQueryParameterValue('configuration').pipe(startWith(undefined)),
-      this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined))
+      this.routeService.getRouteParameterValue('configuration').pipe(startWith(undefined)),
     ]).pipe(
       map(([queryConfig, routeConfig]) => {
         return queryConfig || routeConfig || defaultConfiguration;
-      })
+      }),
     );
   }
 
@@ -163,7 +194,7 @@ export class SearchConfigurationService implements OnDestroy {
   getCurrentDSOType(): Observable<DSpaceObjectType> {
     return this.routeService.getQueryParameterValue('dsoType').pipe(
       filter((type) => isNotEmpty(type) && hasValue(DSpaceObjectType[type.toUpperCase()])),
-      map((type) => DSpaceObjectType[type.toUpperCase()]),);
+      map((type) => DSpaceObjectType[type.toUpperCase()]));
   }
 
   /**
@@ -235,7 +266,7 @@ export class SearchConfigurationService implements OnDestroy {
    */
   getConfigurationSearchConfig(configuration: string, scope?: string): Observable<SearchConfig> {
     return this.getSearchConfigurationFor(scope, configuration).pipe(
-      getAllSucceededRemoteDataPayload()
+      getAllSucceededRemoteDataPayload(),
     );
   }
 
@@ -246,7 +277,7 @@ export class SearchConfigurationService implements OnDestroy {
   getConfigurationSortOptions(searchConfig: SearchConfig): SortOptions[] {
     return searchConfig.sortOptions.map((entry: SortConfig) => ({
       field: entry.name,
-      direction: entry.sortOrder.toLowerCase() === SortDirection.ASC.toLowerCase() ? SortDirection.ASC : SortDirection.DESC
+      direction: entry.sortOrder.toLowerCase() === SortDirection.ASC.toLowerCase() ? SortDirection.ASC : SortDirection.DESC,
     }));
   }
 
@@ -255,8 +286,8 @@ export class SearchConfigurationService implements OnDestroy {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
       const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, {
         pagination: Object.assign({}, currentValue.pagination, {
-          id: paginationId
-        })
+          id: paginationId,
+        }),
       });
       // unsubscribe from subscription related to old pagination id
       this.unsubscribeFromSearchOptions(this.paginationID);
@@ -275,7 +306,7 @@ export class SearchConfigurationService implements OnDestroy {
     this.subs
       .forEach((subs: Subscription[]) => subs
         .filter((sub) => hasValue(sub))
-        .forEach((sub) => sub.unsubscribe())
+        .forEach((sub) => sub.unsubscribe()),
       );
 
     this.subs = new Map<string, Subscription[]>(null);
@@ -299,7 +330,7 @@ export class SearchConfigurationService implements OnDestroy {
     this.unsubscribeFromSearchOptions(paginationID);
     const subs = [
       this.subscribeToSearchOptions(defaults),
-      this.subscribeToPaginatedSearchOptions(paginationID || defaults.pagination.id, defaults)
+      this.subscribeToPaginatedSearchOptions(paginationID || defaults.pagination.id, defaults),
     ];
     this.subs.set(this.paginationID, subs);
   }
@@ -317,7 +348,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getDSOTypePart(),
       this.getFiltersPart(),
       this.getFixedFilterPart(),
-      this.getViewModePart(defaults.view)
+      this.getViewModePart(defaults.view),
     ).subscribe((update) => {
       const currentValue: SearchOptions = this.searchOptions.getValue();
       const updatedValue: SearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
@@ -341,7 +372,7 @@ export class SearchConfigurationService implements OnDestroy {
       this.getDSOTypePart(),
       this.getFiltersPart(),
       this.getFixedFilterPart(),
-      this.getViewModePart(defaults.view)
+      this.getViewModePart(defaults.view),
     ).subscribe((update) => {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
       const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
@@ -493,7 +524,7 @@ export class SearchConfigurationService implements OnDestroy {
       request = Object.assign(request, {
         getResponseParser(): GenericConstructor<ResponseParsingService> {
           return FacetConfigResponseParsingService;
-        }
+        },
       });
       this.requestService.send(request, true);
     });
@@ -521,7 +552,7 @@ export class SearchConfigurationService implements OnDestroy {
         } else {
           return rd as any as RemoteData<SearchFilterConfig[]>;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/shared/search/search-filter.service.spec.ts b/src/app/core/shared/search/search-filter.service.spec.ts
index f18999bbe6..47e76754af 100644
--- a/src/app/core/shared/search/search-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-filter.service.spec.ts
@@ -1,5 +1,8 @@
-import { SearchFilterService } from './search-filter.service';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
+
+import { FilterType } from '../../../shared/search/models/filter-type.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -7,14 +10,15 @@ import {
   SearchFilterIncrementPageAction,
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
-  SearchFilterToggleAction
+  SearchFilterToggleAction,
 } from '../../../shared/search/search-filters/search-filter/search-filter.actions';
 import { SearchFiltersState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { FilterType } from '../../../shared/search/models/filter-type.model';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
+import { SearchFilterService } from './search-filter.service';
 
 describe('SearchFilterService', () => {
   let service: SearchFilterService;
@@ -24,7 +28,7 @@ describe('SearchFilterService', () => {
     filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
 
   const value1 = 'random value';
@@ -33,7 +37,7 @@ describe('SearchFilterService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
 
   const routeServiceStub: any = {
@@ -55,12 +59,12 @@ describe('SearchFilterService', () => {
       return observableOf({});
     },
     getRouteParameterValue: (param: string) => {
-    }
+    },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const activatedRoute: any = new ActivatedRouteStub();
   const searchServiceStub: any = {
-    uiSearchRoute: '/search'
+    uiSearchRoute: '/search',
   };
 
   beforeEach(() => {
diff --git a/src/app/core/shared/search/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
index 80ba200d38..427ee55fd5 100644
--- a/src/app/core/shared/search/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -1,11 +1,30 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { Injectable, InjectionToken } from '@angular/core';
 import {
-  SearchFiltersState,
-  SearchFilterState
-} from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
+import { Params } from '@angular/router';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -13,20 +32,24 @@ import {
   SearchFilterIncrementPageAction,
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
-  SearchFilterToggleAction
+  SearchFilterToggleAction,
 } from '../../../shared/search/search-filters/search-filter/search-filter.actions';
-import { hasValue, isNotEmpty, } from '../../../shared/empty.util';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import {
+  SearchFiltersState,
+  SearchFilterState,
+} from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../cache/models/sort-options.model';
 import { RouteService } from '../../services/route.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { Params } from '@angular/router';
 
 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
@@ -85,7 +108,7 @@ export class SearchFilterService {
     return observableCombineLatest(page$, size$).pipe(map(([page, size]) => {
       return Object.assign(new PaginationComponentOptions(), pagination, {
         currentPage: page || 1,
-        pageSize: size || pagination.pageSize
+        pageSize: size || pagination.pageSize,
       });
     }));
   }
@@ -100,10 +123,10 @@ export class SearchFilterService {
     const sortDirection$ = this.routeService.getQueryParameterValue('sortDirection');
     const sortField$ = this.routeService.getQueryParameterValue('sortField');
     return observableCombineLatest(sortDirection$, sortField$).pipe(map(([sortDirection, sortField]) => {
-        const field = sortField || defaultSort.field;
-        const direction = SortDirection[sortDirection] || defaultSort.direction;
-        return new SortOptions(field, direction);
-      }
+      const field = sortField || defaultSort.field;
+      const direction = SortDirection[sortDirection] || defaultSort.direction;
+      return new SortOptions(field, direction);
+    },
     ));
   }
 
@@ -135,12 +158,12 @@ export class SearchFilterService {
     );
     return observableCombineLatest(values$, prefixValues$).pipe(
       map(([values, prefixValues]) => {
-          if (isNotEmpty(values)) {
-            return values;
-          }
-          return prefixValues;
+        if (isNotEmpty(values)) {
+          return values;
         }
-      )
+        return prefixValues;
+      },
+      ),
     );
   }
 
@@ -159,7 +182,7 @@ export class SearchFilterService {
           return false;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/shared/search/search-filters/search-config.model.ts b/src/app/core/shared/search/search-filters/search-config.model.ts
index c971fe0430..ccc9827e59 100644
--- a/src/app/core/shared/search/search-filters/search-config.model.ts
+++ b/src/app/core/shared/search/search-filters/search-config.model.ts
@@ -1,10 +1,13 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 
-import { SEARCH_CONFIG } from './search-config.resource-type';
 import { typedObject } from '../../../cache/builders/build-decorators';
+import { CacheableObject } from '../../../cache/cacheable-object.model';
 import { HALLink } from '../../hal-link.model';
 import { ResourceType } from '../../resource-type';
-import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { SEARCH_CONFIG } from './search-config.resource-type';
 
 /**
  * The configuration for a search
@@ -17,31 +20,31 @@ export class SearchConfig implements CacheableObject {
    * The id of this search configuration.
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The configured filters.
    */
   @autoserialize
-  filters: FilterConfig[];
+    filters: FilterConfig[];
 
   /**
    * The configured sort options.
    */
   @autoserialize
-  sortOptions: SortConfig[];
+    sortOptions: SortConfig[];
 
   /**
    * The object type.
    */
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The {@link HALLink}s for this Item
    */
   @deserialize
-  _links: {
+    _links: {
     facets: HALLink;
     objects: HALLink;
     self: HALLink;
diff --git a/src/app/core/shared/search/search-filters/search-config.resource-type.ts b/src/app/core/shared/search/search-filters/search-config.resource-type.ts
index 967a654006..2047f52fdb 100644
--- a/src/app/core/shared/search/search-filters/search-config.resource-type.ts
+++ b/src/app/core/shared/search/search-filters/search-config.resource-type.ts
@@ -1,4 +1,4 @@
-import {ResourceType} from '../../resource-type';
+import { ResourceType } from '../../resource-type';
 
 /**
  * The resource type for SearchConfig
diff --git a/src/app/core/shared/search/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
index 9399065ddf..eac178fb1c 100644
--- a/src/app/core/shared/search/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -1,31 +1,41 @@
-import { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
 import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
-import { SearchService } from './search.service';
-import { Router, UrlTree } from '@angular/router';
-import { RequestService } from '../../data/request.service';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { HALEndpointService } from '../hal-endpoint.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { RemoteData } from '../../data/remote-data';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { CommunityDataService } from '../../data/community-data.service';
-import { ViewMode } from '../view-mode.model';
-import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
-import { map } from 'rxjs/operators';
-import { RouteService } from '../../services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { SearchObjects } from '../../../shared/search/models/search-objects.model';
-import { PaginationService } from '../../pagination/pagination.service';
-import { SearchConfigurationService } from './search-configuration.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { RequestEntry } from '../../data/request-entry.model';
+import { TestBed } from '@angular/core/testing';
+import {
+  Router,
+  UrlTree,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Angulartics2 } from 'angulartics2';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
+import { SearchObjects } from '../../../shared/search/models/search-objects.model';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { CommunityDataService } from '../../data/community-data.service';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { RequestEntry } from '../../data/request-entry.model';
+import { PaginationService } from '../../pagination/pagination.service';
+import { RouteService } from '../../services/route.service';
+import { HALEndpointService } from '../hal-endpoint.service';
+import { ViewMode } from '../view-mode.model';
+import { SearchService } from './search.service';
+import { SearchConfigurationService } from './search-configuration.service';
+import anything = jasmine.anything;
 
 @Component({ template: '' })
 class DummyComponent {
@@ -36,17 +46,17 @@ describe('SearchService', () => {
     let searchService: SearchService;
     const router = new RouterStub();
     const route = new ActivatedRouteStub();
-    const searchConfigService = {paginationID: 'page-id'};
+    const searchConfigService = { paginationID: 'page-id' };
     beforeEach(() => {
       TestBed.configureTestingModule({
         imports: [
           CommonModule,
           RouterTestingModule.withRoutes([
             { path: 'search', component: DummyComponent, pathMatch: 'full' },
-          ])
+          ]),
         ],
         declarations: [
-          DummyComponent
+          DummyComponent,
         ],
         providers: [
           { provide: Router, useValue: router },
@@ -59,7 +69,7 @@ describe('SearchService', () => {
           { provide: PaginationService, useValue: {} },
           { provide: SearchConfigurationService, useValue: searchConfigService },
           { provide: Angulartics2, useValue: {} },
-          SearchService
+          SearchService,
         ],
       });
       searchService = TestBed.inject(SearchService);
@@ -79,7 +89,7 @@ describe('SearchService', () => {
     const halService = {
       /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
       getEndpoint: () => {
-      }
+      },
       /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
 
     };
@@ -89,7 +99,7 @@ describe('SearchService', () => {
         return observableCombineLatest([requestEntryObs, payloadObs]).pipe(
           map(([req, pay]) => {
             return { req, pay };
-          })
+          }),
         );
       },
       aggregate: (input: Observable<RemoteData<any>>[]): Observable<RemoteData<any[]>> => {
@@ -97,13 +107,14 @@ describe('SearchService', () => {
       },
       buildFromHref: (href: string): Observable<RemoteData<any>> => {
         return createSuccessfulRemoteDataObject$(Object.assign(new SearchObjects(), {
-          page: []
+          page: [],
         }));
-      }
+      },
     };
 
     const paginationService = new PaginationServiceStub();
-    const searchConfigService = {paginationID: 'page-id'};
+    const searchConfigService = { paginationID: 'page-id' };
+    const requestService = getMockRequestService();
 
     beforeEach(() => {
       TestBed.configureTestingModule({
@@ -111,15 +122,15 @@ describe('SearchService', () => {
           CommonModule,
           RouterTestingModule.withRoutes([
             { path: 'search', component: DummyComponent, pathMatch: 'full' },
-          ])
+          ]),
         ],
         declarations: [
-          DummyComponent
+          DummyComponent,
         ],
         providers: [
           { provide: Router, useValue: router },
           { provide: RouteService, useValue: routeServiceStub },
-          { provide: RequestService, useValue: getMockRequestService() },
+          { provide: RequestService, useValue: requestService },
           { provide: RemoteDataBuildService, useValue: remoteDataBuildService },
           { provide: HALEndpointService, useValue: halService },
           { provide: CommunityDataService, useValue: {} },
@@ -127,7 +138,7 @@ describe('SearchService', () => {
           { provide: PaginationService, useValue: paginationService },
           { provide: SearchConfigurationService, useValue: searchConfigService },
           { provide: Angulartics2, useValue: {} },
-          SearchService
+          SearchService,
         ],
       });
       searchService = TestBed.inject(SearchService);
@@ -138,13 +149,13 @@ describe('SearchService', () => {
 
     it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => {
       searchService.setViewMode(ViewMode.ListElement);
-      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], {page: 1}, { view: ViewMode.ListElement }
+      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.ListElement },
       );
     });
 
     it('should call the navigate method on the Router with view mode grid parameter as a parameter when setViewMode is called', () => {
       searchService.setViewMode(ViewMode.GridElement);
-      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], {page: 1}, { view: ViewMode.GridElement }
+      expect(paginationService.updateRouteWithUrl).toHaveBeenCalledWith('page-id', ['/search'], { page: 1 }, { view: ViewMode.GridElement },
       );
     });
 
@@ -191,5 +202,23 @@ describe('SearchService', () => {
         expect((searchService as any).rdb.buildFromHref).toHaveBeenCalledWith(endPoint);
       });
     });
+
+    describe('when getFacetValuesFor is called with a filterQuery', () => {
+      it('should add the encoded filterQuery to the args list', () => {
+        jasmine.getEnv().allowRespy(true);
+        const spyRequest = spyOn((searchService as any), 'request').and.stub();
+        spyOn(requestService, 'send').and.returnValue(true);
+        const searchFilterConfig = new SearchFilterConfig();
+        searchFilterConfig._links = {
+          self: {
+            href: 'https://demo.dspace.org/',
+          },
+        };
+
+        searchService.getFacetValuesFor(searchFilterConfig, 1, undefined, 'filter&Query');
+
+        expect(spyRequest).toHaveBeenCalledWith(anything(), 'https://demo.dspace.org?page=0&size=5&prefix=filter%26Query');
+      });
+    });
   });
 });
diff --git a/src/app/core/shared/search/search.service.ts b/src/app/core/shared/search/search.service.ts
index c8ce4b0348..346000f05a 100644
--- a/src/app/core/shared/search/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -1,38 +1,55 @@
 /* eslint-disable max-classes-per-file */
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { Injectable, OnDestroy } from '@angular/core';
-import { map, switchMap, take } from 'rxjs/operators';
+import {
+  Injectable,
+  OnDestroy,
+} from '@angular/core';
+import { Angulartics2 } from 'angulartics2';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  hasValueOperator,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { FacetValues } from '../../../shared/search/models/facet-values.model';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
+import { SearchObjects } from '../../../shared/search/models/search-objects.model';
+import { SearchResult } from '../../../shared/search/models/search-result.model';
+import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
 import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { BaseDataService } from '../../data/base/base-data.service';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
+import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
 import { ResponseParsingService } from '../../data/parsing.service';
 import { RemoteData } from '../../data/remote-data';
 import { GetRequest } from '../../data/request.models';
 import { RequestService } from '../../data/request.service';
+import { RestRequest } from '../../data/rest-request.model';
+import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
+import { PaginationService } from '../../pagination/pagination.service';
+import { RouteService } from '../../services/route.service';
+import { URLCombiner } from '../../url-combiner/url-combiner';
 import { DSpaceObject } from '../dspace-object.model';
 import { GenericConstructor } from '../generic-constructor';
 import { HALEndpointService } from '../hal-endpoint.service';
-import { URLCombiner } from '../../url-combiner/url-combiner';
-import { hasValue, hasValueOperator, isNotEmpty } from '../../../shared/empty.util';
-import { SearchFilterConfig } from '../../../shared/search/models/search-filter-config.model';
-import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
-import { SearchObjects } from '../../../shared/search/models/search-objects.model';
-import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../operators';
 import { ViewMode } from '../view-mode.model';
-import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { getFirstCompletedRemoteData, getRemoteDataPayload } from '../operators';
-import { RouteService } from '../../services/route.service';
-import { SearchResult } from '../../../shared/search/models/search-result.model';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
-import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
-import { FacetValues } from '../../../shared/search/models/facet-values.model';
-import { PaginationService } from '../../pagination/pagination.service';
 import { SearchConfigurationService } from './search-configuration.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { RestRequest } from '../../data/rest-request.model';
-import { BaseDataService } from '../../data/base/base-data.service';
-import { Angulartics2 } from 'angulartics2';
 
 /**
  * A limited data service implementation for the 'discover' endpoint
@@ -123,7 +140,7 @@ export class SearchService implements OnDestroy {
         } else {
           return url;
         }
-      })
+      }),
     );
   }
 
@@ -150,7 +167,7 @@ export class SearchService implements OnDestroy {
         } else {
           return href;
         }
-      })
+      }),
     ).subscribe((url: string) => {
       const request = new this.request(this.requestService.generateRequestId(), url);
 
@@ -161,14 +178,14 @@ export class SearchService implements OnDestroy {
       Object.assign(request, {
         responseMsToLive: hasValue(responseMsToLive) ? responseMsToLive : request.responseMsToLive,
         getResponseParser: getResponseParserFn,
-        searchOptions: searchOptions
+        searchOptions: searchOptions,
       });
 
       this.requestService.send(request, useCachedVersionIfAvailable);
     });
 
     const sqr$ = href$.pipe(
-      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href))
+      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href)),
     );
 
     return this.directlyAttachIndexableObjects(sqr$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
@@ -183,7 +200,7 @@ export class SearchService implements OnDestroy {
     const href$ = this.getEndpoint(searchOptions);
 
     const sqr$ = href$.pipe(
-      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href))
+      switchMap((href: string) => this.rdb.buildFromHref<SearchObjects<T>>(href)),
     );
 
     return this.directlyAttachIndexableObjects(sqr$);
@@ -222,10 +239,10 @@ export class SearchService implements OnDestroy {
 
                 // Attach the payload directly to the indexableObject property on the result
                 return Object.assign(new resultConstructor(), result, {
-                  indexableObject
+                  indexableObject,
                 }) as SearchResult<T>;
               }),
-            )
+            ),
           );
 
           // Swap the original page in the remoteData with the new one, now that the results have the
@@ -234,7 +251,7 @@ export class SearchService implements OnDestroy {
             map((page: SearchResult<T>[]) => {
 
               const payload = Object.assign(new SearchObjects(), resultsRd.payload, {
-                page
+                page,
               }) as SearchObjects<T>;
 
               return new RemoteData(
@@ -246,13 +263,13 @@ export class SearchService implements OnDestroy {
                 payload,
                 resultsRd.statusCode,
               );
-            })
+            }),
           );
         }
         // If we don't have a payload, or the page is empty, simply pass on the unmodified
         // RemoteData object
         return [resultsRd];
-      })
+      }),
     );
   }
 
@@ -271,14 +288,14 @@ export class SearchService implements OnDestroy {
     let href;
     let args: string[] = [];
     if (hasValue(filterQuery)) {
-      args.push(`prefix=${filterQuery}`);
+      args.push(`prefix=${encodeURIComponent(filterQuery)}`);
     }
     if (hasValue(searchOptions)) {
       searchOptions = Object.assign(new PaginatedSearchOptions({}), searchOptions, {
         pagination: Object.assign({}, searchOptions.pagination, {
           currentPage: valuePage,
-          pageSize: filterConfig.pageSize
-        })
+          pageSize: filterConfig.pageSize,
+        }),
       });
       href = searchOptions.toRestUrl(filterConfig._links.self.href, args);
     } else {
@@ -290,7 +307,7 @@ export class SearchService implements OnDestroy {
     request = Object.assign(request, {
       getResponseParser(): GenericConstructor<ResponseParsingService> {
         return FacetValueResponseParsingService;
-      }
+      },
     });
     this.requestService.send(request, useCachedVersionIfAvailable);
 
@@ -334,8 +351,9 @@ export class SearchService implements OnDestroy {
    * Send search event to rest api using angularitics
    * @param config              Paginated search options used
    * @param searchQueryResponse The response objects of the performed search
+   * @param clickedObject       Optional UUID of an object a search was performed and clicked for
    */
-  trackSearch(config: PaginatedSearchOptions, searchQueryResponse: SearchObjects<DSpaceObject>) {
+  trackSearch(config: PaginatedSearchOptions, searchQueryResponse: SearchObjects<DSpaceObject>, clickedObject?: string) {
     const filters: { filter: string, operator: string, value: string, label: string; }[] = [];
     const appliedFilters = searchQueryResponse.appliedFilters || [];
     for (let i = 0, filtersLength = appliedFilters.length; i < filtersLength; i++) {
@@ -354,9 +372,10 @@ export class SearchService implements OnDestroy {
         },
         sort: {
           by: config.sort.field,
-          order: config.sort.direction
+          order: config.sort.direction,
         },
         filters: filters,
+        clickedObject,
       },
     });
   }
diff --git a/src/app/core/shared/site.model.ts b/src/app/core/shared/site.model.ts
index 483fd7402f..6c6c2ff621 100644
--- a/src/app/core/shared/site.model.ts
+++ b/src/app/core/shared/site.model.ts
@@ -1,4 +1,5 @@
 import { inheritSerialization } from 'cerialize';
+
 import { typedObject } from '../cache/builders/build-decorators';
 import { DSpaceObject } from './dspace-object.model';
 import { SITE } from './site.resource-type';
diff --git a/src/app/core/shared/sort-option.model.ts b/src/app/core/shared/sort-option.model.ts
index c735e87b9a..b179d159b6 100644
--- a/src/app/core/shared/sort-option.model.ts
+++ b/src/app/core/shared/sort-option.model.ts
@@ -2,8 +2,8 @@ import { autoserialize } from 'cerialize';
 
 export class SortOption {
   @autoserialize
-  name: string;
+    name: string;
 
   @autoserialize
-  metadata: string;
+    metadata: string;
 }
diff --git a/src/app/core/shared/template-item.model.ts b/src/app/core/shared/template-item.model.ts
index cb8a45cd68..4c33a2bd92 100644
--- a/src/app/core/shared/template-item.model.ts
+++ b/src/app/core/shared/template-item.model.ts
@@ -1,11 +1,15 @@
 import { inheritSerialization } from 'cerialize';
-import { Item } from './item.model';
 import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { RemoteData } from '../data/remote-data';
 import { Collection } from './collection.model';
-import { ITEM_TEMPLATE } from './template-item.resource-type';
-import { link, typedObject } from '../cache/builders/build-decorators';
 import { COLLECTION } from './collection.resource-type';
+import { Item } from './item.model';
+import { ITEM_TEMPLATE } from './template-item.resource-type';
 
 /**
  * Class representing a DSpace Template Item
@@ -19,6 +23,6 @@ export class TemplateItem extends Item {
    * The Collection that this item is a template for
    */
   @link(COLLECTION)
-  templateItemOf: Observable<RemoteData<Collection>>;
+    templateItemOf: Observable<RemoteData<Collection>>;
 
 }
diff --git a/src/app/core/shared/value-list-browse-definition.model.ts b/src/app/core/shared/value-list-browse-definition.model.ts
new file mode 100644
index 0000000000..80ad73e761
--- /dev/null
+++ b/src/app/core/shared/value-list-browse-definition.model.ts
@@ -0,0 +1,41 @@
+import {
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { BrowseByDataType } from '../../browse-by/browse-by-switcher/browse-by-data-type';
+import { typedObject } from '../cache/builders/build-decorators';
+import { excludeFromEquals } from '../utilities/equals.decorators';
+import { HALLink } from './hal-link.model';
+import { NonHierarchicalBrowseDefinition } from './non-hierarchical-browse-definition';
+import { ResourceType } from './resource-type';
+import { VALUE_LIST_BROWSE_DEFINITION } from './value-list-browse-definition.resource-type';
+
+/**
+ * BrowseDefinition model for browses of type 'valueList'
+ */
+@typedObject
+@inheritSerialization(NonHierarchicalBrowseDefinition)
+export class ValueListBrowseDefinition extends NonHierarchicalBrowseDefinition {
+  static type = VALUE_LIST_BROWSE_DEFINITION;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+    type: ResourceType = VALUE_LIST_BROWSE_DEFINITION;
+
+  get self(): string {
+    return this._links.self.href;
+  }
+
+  @deserialize
+    _links: {
+    self: HALLink;
+    entries: HALLink;
+  };
+
+  getRenderType(): BrowseByDataType {
+    return this.dataType;
+  }
+}
diff --git a/src/app/core/shared/value-list-browse-definition.resource-type.ts b/src/app/core/shared/value-list-browse-definition.resource-type.ts
new file mode 100644
index 0000000000..8904dc472f
--- /dev/null
+++ b/src/app/core/shared/value-list-browse-definition.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from './resource-type';
+
+/**
+ * The resource type for ValueListBrowseDefinition
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const VALUE_LIST_BROWSE_DEFINITION = new ResourceType('valueList');
diff --git a/src/app/core/shared/version-history.model.ts b/src/app/core/shared/version-history.model.ts
index 1e75b8f321..9792a20ff3 100644
--- a/src/app/core/shared/version-history.model.ts
+++ b/src/app/core/shared/version-history.model.ts
@@ -1,14 +1,22 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { excludeFromEquals } from '../utilities/equals.decorators';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
 import { PaginatedList } from '../data/paginated-list.model';
-import { Version } from './version.model';
-import { VERSION_HISTORY } from './version-history.resource-type';
-import { link, typedObject } from '../cache/builders/build-decorators';
+import { RemoteData } from '../data/remote-data';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { DSpaceObject } from './dspace-object.model';
 import { HALLink } from './hal-link.model';
+import { Version } from './version.model';
 import { VERSION } from './version.resource-type';
+import { VERSION_HISTORY } from './version-history.resource-type';
 
 /**
  * Class representing a DSpace Version History
@@ -19,7 +27,7 @@ export class VersionHistory extends DSpaceObject {
   static type = VERSION_HISTORY;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     versions: HALLink;
     draftVersion: HALLink;
@@ -29,30 +37,30 @@ export class VersionHistory extends DSpaceObject {
    * The identifier of this Version History
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The summary of this Version History
    */
   @autoserialize
-  summary: string;
+    summary: string;
 
   /**
    * The name of the submitter of this Version History
    */
   @autoserialize
-  submitterName: string;
+    submitterName: string;
 
   /**
    * Whether exist a workspace item
    */
   @autoserialize
-  draftVersion: boolean;
+    draftVersion: boolean;
 
   /**
    * The list of versions within this history
    */
   @excludeFromEquals
   @link(VERSION, true)
-  versions: Observable<RemoteData<PaginatedList<Version>>>;
+    versions: Observable<RemoteData<PaginatedList<Version>>>;
 }
diff --git a/src/app/core/shared/version.model.ts b/src/app/core/shared/version.model.ts
index 7207637a21..f66bc8938b 100644
--- a/src/app/core/shared/version.model.ts
+++ b/src/app/core/shared/version.model.ts
@@ -1,17 +1,25 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
-import { excludeFromEquals } from '../utilities/equals.decorators';
-import { Item } from './item.model';
-import { RemoteData } from '../data/remote-data';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { VersionHistory } from './version-history.model';
+
+import {
+  link,
+  typedObject,
+} from '../cache/builders/build-decorators';
+import { RemoteData } from '../data/remote-data';
 import { EPerson } from '../eperson/models/eperson.model';
-import { VERSION } from './version.resource-type';
-import { HALLink } from './hal-link.model';
-import { link, typedObject } from '../cache/builders/build-decorators';
-import { VERSION_HISTORY } from './version-history.resource-type';
-import { ITEM } from './item.resource-type';
 import { EPERSON } from '../eperson/models/eperson.resource-type';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { DSpaceObject } from './dspace-object.model';
+import { HALLink } from './hal-link.model';
+import { Item } from './item.model';
+import { ITEM } from './item.resource-type';
+import { VERSION } from './version.resource-type';
+import { VersionHistory } from './version-history.model';
+import { VERSION_HISTORY } from './version-history.resource-type';
 
 /**
  * Class representing a DSpace Version
@@ -22,7 +30,7 @@ export class Version extends DSpaceObject {
   static type = VERSION;
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     item: HALLink;
     versionhistory: HALLink;
@@ -33,50 +41,50 @@ export class Version extends DSpaceObject {
    * The identifier of this Version
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The version number of the version's history this version represents
    */
   @autoserialize
-  version: number;
+    version: number;
 
   /**
    * The summary for the changes made in this version
    */
   @autoserialize
-  summary: string;
+    summary: string;
 
   /**
    * The name of the submitter of this version
    */
   @autoserialize
-  submitterName: string;
+    submitterName: string;
 
   /**
    * The Date this version was created
    */
   @deserialize
-  created: Date;
+    created: Date;
 
   /**
    * The full version history this version is apart of
    */
   @excludeFromEquals
   @link(VERSION_HISTORY)
-  versionhistory: Observable<RemoteData<VersionHistory>>;
+    versionhistory: Observable<RemoteData<VersionHistory>>;
 
   /**
    * The item this version represents
    */
   @excludeFromEquals
   @link(ITEM)
-  item: Observable<RemoteData<Item>>;
+    item: Observable<RemoteData<Item>>;
 
   /**
    * The e-person who created this version
    */
   @excludeFromEquals
   @link(EPERSON)
-  eperson: Observable<RemoteData<EPerson>>;
+    eperson: Observable<RemoteData<EPerson>>;
 }
diff --git a/src/app/core/shared/view-mode.model.ts b/src/app/core/shared/view-mode.model.ts
index a27cb6954b..9c2f499b3d 100644
--- a/src/app/core/shared/view-mode.model.ts
+++ b/src/app/core/shared/view-mode.model.ts
@@ -7,4 +7,5 @@ export enum ViewMode {
   GridElement = 'grid',
   DetailedListElement = 'detailed',
   StandalonePage = 'standalone',
+  Table = 'table',
 }
diff --git a/src/app/core/statistics/models/usage-report.model.ts b/src/app/core/statistics/models/usage-report.model.ts
index da976a8b90..b8a415667d 100644
--- a/src/app/core/statistics/models/usage-report.model.ts
+++ b/src/app/core/statistics/models/usage-report.model.ts
@@ -1,11 +1,16 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
-import { HALResource } from '../../shared/hal-resource.model';
-import { USAGE_REPORT } from './usage-report.resource-type';
 import { HALLink } from '../../shared/hal-link.model';
-import { deserialize, autoserializeAs } from 'cerialize';
+import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { USAGE_REPORT } from './usage-report.resource-type';
 
 /**
  * A usage report.
@@ -21,19 +26,19 @@ export class UsageReport extends HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserializeAs('report-type')
-  reportType: string;
+    reportType: string;
 
   @autoserialize
-  points: Point[];
+    points: Point[];
 
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/core/statistics/usage-report-data.service.ts b/src/app/core/statistics/usage-report-data.service.ts
index fde8298488..0901275195 100644
--- a/src/app/core/statistics/usage-report-data.service.ts
+++ b/src/app/core/statistics/usage-report-data.service.ts
@@ -1,20 +1,27 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { USAGE_REPORT } from './models/usage-report.resource-type';
-import { UsageReport } from './models/usage-report.model';
-import { Observable } from 'rxjs';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../shared/operators';
-import { map } from 'rxjs/operators';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { FindListOptions } from '../data/find-list-options.model';
-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 { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { UsageReport } from './models/usage-report.model';
+import { USAGE_REPORT } from './models/usage-report.resource-type';
 
 /**
  * A service to retrieve {@link UsageReport}s from the REST API
diff --git a/src/app/core/submission/correctiontype-data.service.ts b/src/app/core/submission/correctiontype-data.service.ts
new file mode 100644
index 0000000000..684da34c01
--- /dev/null
+++ b/src/app/core/submission/correctiontype-data.service.ts
@@ -0,0 +1,95 @@
+import { Injectable } from '@angular/core';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { SearchDataImpl } from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getAllSucceededRemoteDataPayload,
+  getPaginatedListPayload,
+} from '../shared/operators';
+import { CorrectionType } from './models/correctiontype.model';
+
+/**
+ * A service that provides methods to make REST requests with correctiontypes endpoint.
+ */
+@Injectable()
+@dataService(CorrectionType.type)
+export class CorrectionTypeDataService extends IdentifiableDataService<CorrectionType> {
+  protected linkPath = 'correctiontypes';
+  protected searchByTopic = 'findByTopic';
+  protected searchFindByItem = 'findByItem';
+  private searchData: SearchDataImpl<CorrectionType>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('correctiontypes', requestService, rdbService, objectCache, halService);
+
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Get the correction type by id
+   * @param id the id of the correction type
+   * @param useCachedVersionIfAvailable use the cached version if available
+   * @param reRequestOnStale re-request on stale
+   * @returns {Observable<RemoteData<CorrectionType>>} the correction type
+   */
+  getCorrectionTypeById(id: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<RemoteData<CorrectionType>> {
+    return this.findById(id, useCachedVersionIfAvailable, reRequestOnStale);
+  }
+
+  /**
+   * Search for the correction types for the item
+   * @param itemUuid the uuid of the item
+   * @param useCachedVersionIfAvailable use the cached version if available
+   * @returns the list of correction types for the item
+   */
+  findByItem(itemUuid: string, useCachedVersionIfAvailable): Observable<RemoteData<PaginatedList<CorrectionType>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', itemUuid)];
+    return this.searchData.searchBy(this.searchFindByItem, options, useCachedVersionIfAvailable);
+  }
+
+  /**
+   * Find the correction type for the topic
+   * @param topic the topic of the correction type to search for
+   * @param useCachedVersionIfAvailable use the cached version if available
+   * @param reRequestOnStale re-request on stale
+   * @returns the correction type for the topic
+   */
+  findByTopic(topic: string, useCachedVersionIfAvailable = true, reRequestOnStale = true): Observable<CorrectionType> {
+    const options = new FindListOptions();
+    options.searchParams = [
+      {
+        fieldName: 'topic',
+        fieldValue: topic,
+      },
+    ];
+
+    return this.searchData.searchBy(this.searchByTopic, options, useCachedVersionIfAvailable, reRequestOnStale).pipe(
+      getAllSucceededRemoteDataPayload(),
+      getPaginatedListPayload(),
+      map((list: CorrectionType[]) => {
+        return list[0];
+      }),
+    );
+  }
+}
diff --git a/src/app/core/submission/models/correctiontype.model.ts b/src/app/core/submission/models/correctiontype.model.ts
new file mode 100644
index 0000000000..0b9dd75545
--- /dev/null
+++ b/src/app/core/submission/models/correctiontype.model.ts
@@ -0,0 +1,53 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { HALLink } from '../../shared/hal-link.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+
+@typedObject
+/**
+ * Represents a correction type. It extends the CacheableObject.
+ * The correction type represents a type of correction that can be applied to a submission.
+ */
+export class CorrectionType extends CacheableObject {
+  static type = new ResourceType('correctiontype');
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+  @autoserialize
+  /**
+   * The unique identifier for the correction type mode.
+   */
+    id: string;
+  @autoserialize
+  /**
+   * The topic of the correction type mode.
+   */
+    topic: string;
+  @autoserialize
+  /**
+   * The discovery configuration for the correction type mode.
+   */
+    discoveryConfiguration: string;
+  @autoserialize
+  /**
+   * The form used for creating a correction type.
+   */
+    creationForm: string;
+  @deserialize
+  /**
+   * Represents the links associated with the correction type mode.
+   */
+    _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/core/submission/models/submission-cc-license-url.model.ts b/src/app/core/submission/models/submission-cc-license-url.model.ts
index a7c933ecb1..85fa1d0896 100644
--- a/src/app/core/submission/models/submission-cc-license-url.model.ts
+++ b/src/app/core/submission/models/submission-cc-license-url.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
 import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { SUBMISSION_CC_LICENSE_URL } from './submission-cc-licence-link.resource-type';
 
 @typedObject
@@ -16,8 +20,8 @@ export class SubmissionCcLicenceUrl extends HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserialize
-  url: string;
+    url: string;
 }
diff --git a/src/app/core/submission/models/submission-cc-license.model.ts b/src/app/core/submission/models/submission-cc-license.model.ts
index 92c48fdbfe..c730aa44fc 100644
--- a/src/app/core/submission/models/submission-cc-license.model.ts
+++ b/src/app/core/submission/models/submission-cc-license.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../utilities/equals.decorators';
-import { ResourceType } from '../../shared/resource-type';
 import { HALResource } from '../../shared/hal-resource.model';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { SUBMISSION_CC_LICENSE } from './submission-cc-licence.resource-type';
 
 @typedObject
@@ -16,16 +20,16 @@ export class SubmissionCcLicence extends HALResource {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   @autoserialize
-  id: string;
+    id: string;
 
   @autoserialize
-  name: string;
+    name: string;
 
   @autoserialize
-  fields: Field[];
+    fields: Field[];
 }
 
 export interface Field {
diff --git a/src/app/core/submission/models/submission-object.model.ts b/src/app/core/submission/models/submission-object.model.ts
index 3d7c0a3678..882fafb467 100644
--- a/src/app/core/submission/models/submission-object.model.ts
+++ b/src/app/core/submission/models/submission-object.model.ts
@@ -1,8 +1,14 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link } from '../../cache/builders/build-decorators';
 
+import { link } from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { SubmissionDefinitionsModel } from '../../config/models/config-submission-definitions.model';
+import { PaginatedList } from '../../data/paginated-list.model';
 import { RemoteData } from '../../data/remote-data';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { EPERSON } from '../../eperson/models/eperson.resource-type';
@@ -11,9 +17,10 @@ import { COLLECTION } from '../../shared/collection.resource-type';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { ITEM } from '../../shared/item.resource-type';
+import { SupervisionOrder } from '../../supervision-order/models/supervision-order.model';
+import { SUPERVISION_ORDER } from '../../supervision-order/models/supervision-order.resource-type';
 import { excludeFromEquals } from '../../utilities/equals.decorators';
 import { WorkspaceitemSectionsObject } from './workspaceitem-sections.model';
-import { CacheableObject } from '../../cache/cacheable-object.model';
 
 export interface SubmissionObjectError {
   message: string;
@@ -28,43 +35,44 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable
 
   @excludeFromEquals
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The SubmissionObject last modified date
    */
   @autoserialize
-  lastModified: Date;
+    lastModified: Date;
 
   /**
    * The collection this submission applies to
    * Will be undefined unless the collection {@link HALLink} has been resolved.
    */
   @link(COLLECTION)
-  collection?: Observable<RemoteData<Collection>> | Collection;
+    collection?: Observable<RemoteData<Collection>> | Collection;
 
   /**
    * The SubmissionObject's last section's data
    */
   @autoserialize
-  sections: WorkspaceitemSectionsObject;
+    sections: WorkspaceitemSectionsObject;
 
   /**
    * The SubmissionObject's last section's errors
    */
   @autoserialize
-  errors: SubmissionObjectError[];
+    errors: SubmissionObjectError[];
 
   /**
    * The {@link HALLink}s for this SubmissionObject
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     collection: HALLink;
     item: HALLink;
     submissionDefinition: HALLink;
     submitter: HALLink;
+    supervisionOrders: HALLink;
   };
 
   get self(): string {
@@ -77,20 +85,28 @@ export abstract class SubmissionObject extends DSpaceObject implements Cacheable
    */
   @link(ITEM)
   /* This was changed from 'Observable<RemoteData<Item>> | Item' to 'any' to prevent issues in templates with async */
-  item?: any;
+    item?: any;
 
   /**
    * The configuration object that define this submission
    * Will be undefined unless the submissionDefinition {@link HALLink} has been resolved.
    */
   @link(SubmissionDefinitionsModel.type)
-  submissionDefinition?: Observable<RemoteData<SubmissionDefinitionsModel>> | SubmissionDefinitionsModel;
+    submissionDefinition?: Observable<RemoteData<SubmissionDefinitionsModel>> | SubmissionDefinitionsModel;
 
   /**
    * The submitter for this SubmissionObject
    * Will be undefined unless the submitter {@link HALLink} has been resolved.
    */
   @link(EPERSON)
-  submitter?: Observable<RemoteData<EPerson>> | EPerson;
+    submitter?: Observable<RemoteData<EPerson>> | EPerson;
+
+  /**
+   * The submission supervision order
+   * Will be undefined unless the workspace item {@link HALLink} has been resolved.
+   */
+  @link(SUPERVISION_ORDER)
+  /* This was changed from 'Observable<RemoteData<WorkspaceItem>> | WorkspaceItem' to 'any' to prevent issues in templates with async */
+    supervisionOrders?: Observable<RemoteData<PaginatedList<SupervisionOrder>>>;
 
 }
diff --git a/src/app/core/submission/models/workflowitem.model.ts b/src/app/core/submission/models/workflowitem.model.ts
index b8054a66d0..63fdda7c10 100644
--- a/src/app/core/submission/models/workflowitem.model.ts
+++ b/src/app/core/submission/models/workflowitem.model.ts
@@ -1,5 +1,12 @@
-import { deserializeAs, inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+import {
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
 import { WORKFLOWITEM } from '../../eperson/models/workflowitem.resource-type';
 import { SubmissionObject } from './submission-object.model';
@@ -19,5 +26,5 @@ export class WorkflowItem extends SubmissionObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(WorkflowItem.type.value), 'id')
-  uuid: string;
+    uuid: string;
 }
diff --git a/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts b/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts
new file mode 100644
index 0000000000..f9441fa790
--- /dev/null
+++ b/src/app/core/submission/models/workspaceitem-section-duplicates.model.ts
@@ -0,0 +1,8 @@
+/*
+ * Object model for the data returned by the REST API to present potential duplicates in a submission section
+ */
+import { Duplicate } from '../../../shared/object-list/duplicate-data/duplicate.model';
+
+export interface WorkspaceitemSectionDuplicatesObject {
+  potentialDuplicates?: Duplicate[]
+}
diff --git a/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
new file mode 100644
index 0000000000..f6bfb1ae04
--- /dev/null
+++ b/src/app/core/submission/models/workspaceitem-section-identifiers.model.ts
@@ -0,0 +1,9 @@
+/*
+ * Object model for the data returned by the REST API to present minted identifiers in a submission section
+ */
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+
+export interface WorkspaceitemSectionIdentifiersObject {
+  identifiers?: Identifier[]
+  displayTypes?: string[]
+}
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/models/workspaceitem-section-upload.model.ts b/src/app/core/submission/models/workspaceitem-section-upload.model.ts
index f98e0584eb..d992567df4 100644
--- a/src/app/core/submission/models/workspaceitem-section-upload.model.ts
+++ b/src/app/core/submission/models/workspaceitem-section-upload.model.ts
@@ -4,7 +4,10 @@ import { WorkspaceitemSectionUploadFileObject } from './workspaceitem-section-up
  * An interface to represent submission's upload section data.
  */
 export interface WorkspaceitemSectionUploadObject {
-
+  /**
+   * Primary bitstream flag
+   */
+  primary: string | null;
   /**
    * A list of [[WorkspaceitemSectionUploadFileObject]]
    */
diff --git a/src/app/core/submission/models/workspaceitem-sections.model.ts b/src/app/core/submission/models/workspaceitem-sections.model.ts
index 1112d740ed..46a0590977 100644
--- a/src/app/core/submission/models/workspaceitem-sections.model.ts
+++ b/src/app/core/submission/models/workspaceitem-sections.model.ts
@@ -1,9 +1,11 @@
 import { WorkspaceitemSectionAccessesObject } from './workspaceitem-section-accesses.model';
-import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
-import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
-import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 import { WorkspaceitemSectionCcLicenseObject } from './workspaceitem-section-cc-license.model';
+import { WorkspaceitemSectionDuplicatesObject } from './workspaceitem-section-duplicates.model';
+import { WorkspaceitemSectionFormObject } from './workspaceitem-section-form.model';
+import { WorkspaceitemSectionIdentifiersObject } from './workspaceitem-section-identifiers.model';
+import { WorkspaceitemSectionLicenseObject } from './workspaceitem-section-license.model';
 import { WorkspaceitemSectionSherpaPoliciesObject } from './workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionUploadObject } from './workspaceitem-section-upload.model';
 
 /**
  * An interface to represent submission's section object.
@@ -23,4 +25,8 @@ export type WorkspaceitemSectionDataType
   | WorkspaceitemSectionCcLicenseObject
   | WorkspaceitemSectionAccessesObject
   | WorkspaceitemSectionSherpaPoliciesObject
+  | WorkspaceitemSectionIdentifiersObject
+  | WorkspaceitemSectionDuplicatesObject
   | string;
+
+
diff --git a/src/app/core/submission/models/workspaceitem.model.ts b/src/app/core/submission/models/workspaceitem.model.ts
index 62f21cb2f3..d9aad957f2 100644
--- a/src/app/core/submission/models/workspaceitem.model.ts
+++ b/src/app/core/submission/models/workspaceitem.model.ts
@@ -1,8 +1,15 @@
-import { deserializeAs, inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+import {
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
-import { SubmissionObject } from './submission-object.model';
 import { WORKSPACEITEM } from '../../eperson/models/workspaceitem.resource-type';
+import { SubmissionObject } from './submission-object.model';
 
 /**
  * A model class for a WorkspaceItem.
@@ -19,5 +26,5 @@ export class WorkspaceItem extends SubmissionObject {
    * It is based on the ID, so it will be the same for each refresh.
    */
   @deserializeAs(new IDToUUIDSerializer(WorkspaceItem.type.value), 'id')
-  uuid: string;
+    uuid: string;
 }
diff --git a/src/app/core/submission/resolver/submission-object.resolver.ts b/src/app/core/submission/resolver/submission-object.resolver.ts
index 09561fbafa..8c4a08e68c 100644
--- a/src/app/core/submission/resolver/submission-object.resolver.ts
+++ b/src/app/core/submission/resolver/submission-object.resolver.ts
@@ -1,41 +1,46 @@
-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 {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
+
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
 import { RemoteData } from '../../data/remote-data';
 import { getFirstCompletedRemoteData } from '../../shared/operators';
-import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
  */
 @Injectable()
 export class SubmissionObjectResolver<T> implements Resolve<RemoteData<T>> {
-    constructor(
+  constructor(
       protected dataService: IdentifiableDataService<any>,
       protected store: Store<any>,
-    ) {
-    }
+  ) {
+  }
 
-    /**
+  /**
      * 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<RemoteData<T>> {
-        const itemRD$ = this.dataService.findById(route.params.id,
-            true,
-            false,
-            followLink('item'),
-        ).pipe(
-            getFirstCompletedRemoteData(),
-            switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
-            getFirstCompletedRemoteData()
-        );
-        return itemRD$;
-    }
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<T>> {
+    const itemRD$ = this.dataService.findById(route.params.id,
+      true,
+      false,
+      followLink('item'),
+    ).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((wfiRD: RemoteData<any>) => wfiRD.payload.item as Observable<RemoteData<T>>),
+      getFirstCompletedRemoteData(),
+    );
+    return itemRD$;
+  }
 }
diff --git a/src/app/core/submission/submission-cc-license-data.service.spec.ts b/src/app/core/submission/submission-cc-license-data.service.spec.ts
index b3650bac0a..4fda651e40 100644
--- a/src/app/core/submission/submission-cc-license-data.service.spec.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.spec.ts
@@ -5,8 +5,8 @@
  *
  * http://www.dspace.org/license/
  */
-import { SubmissionCcLicenseDataService } from './submission-cc-license-data.service';
 import { testFindAllDataImplementation } from '../data/base/find-all-data.spec';
+import { SubmissionCcLicenseDataService } from './submission-cc-license-data.service';
 
 describe('SubmissionCcLicenseDataService', () => {
 
diff --git a/src/app/core/submission/submission-cc-license-data.service.ts b/src/app/core/submission/submission-cc-license-data.service.ts
index e92de06a6b..83879a39ab 100644
--- a/src/app/core/submission/submission-cc-license-data.service.ts
+++ b/src/app/core/submission/submission-cc-license-data.service.ts
@@ -1,18 +1,22 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { BaseDataService } from '../data/base/base-data.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../data/base/find-all-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SUBMISSION_CC_LICENSE } from './models/submission-cc-licence.resource-type';
 import { SubmissionCcLicence } from './models/submission-cc-license.model';
-import { BaseDataService } from '../data/base/base-data.service';
-import {FindAllData, FindAllDataImpl} from '../data/base/find-all-data';
-import { FindListOptions } from '../data/find-list-options.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE)
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..cd440bd8a1 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
@@ -1,21 +1,35 @@
 import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { SubmissionCcLicenceUrl } from './models/submission-cc-license-url.model';
-import { SUBMISSION_CC_LICENSE_URL } from './models/submission-cc-licence-link.resource-type';
-import { Field, Option, SubmissionCcLicence } from './models/submission-cc-license.model';
-import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../shared/operators';
 import { BaseDataService } from '../data/base/base-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { FindListOptions } from '../data/find-list-options.model';
-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 {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../shared/operators';
+import { SUBMISSION_CC_LICENSE_URL } from './models/submission-cc-licence-link.resource-type';
+import {
+  Field,
+  Option,
+  SubmissionCcLicence,
+} from './models/submission-cc-license.model';
+import { SubmissionCcLicenceUrl } from './models/submission-cc-license-url.model';
 
 @Injectable()
 @dataService(SUBMISSION_CC_LICENSE_URL)
@@ -45,7 +59,7 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
         searchParams: [
           {
             fieldName: 'license',
-            fieldValue: ccLicense.id
+            fieldValue: ccLicense.id,
           },
           ...ccLicense.fields.map(
             (field) => {
@@ -54,8 +68,8 @@ export class SubmissionCcLicenseUrlDataService extends BaseDataService<Submissio
                 fieldValue: options.get(field).id,
               };
             }),
-        ]
-      }
+        ],
+      },
     ).pipe(
       switchMap((href) => this.findByHref(href)),
       getFirstSucceededRemoteData(),
diff --git a/src/app/core/submission/submission-duplicate-data.service.spec.ts b/src/app/core/submission/submission-duplicate-data.service.spec.ts
new file mode 100644
index 0000000000..88d02b74e7
--- /dev/null
+++ b/src/app/core/submission/submission-duplicate-data.service.spec.ts
@@ -0,0 +1,30 @@
+import { RequestParam } from '../cache/models/request-param.model';
+import { FindListOptions } from '../data/find-list-options.model';
+import { SubmissionDuplicateDataService } from './submission-duplicate-data.service';
+
+/**
+ * Basic tests for the submission-duplicate-data.service.ts service
+ */
+describe('SubmissionDuplicateDataService', () => {
+  const duplicateDataService = new SubmissionDuplicateDataService(null, null, null, null);
+
+  // Test the findDuplicates method to make sure that a call results in an expected
+  // call to searchBy, using the 'findByItem' search method
+  describe('findDuplicates', () => {
+    beforeEach(() => {
+      spyOn(duplicateDataService, 'searchBy');
+    });
+
+    it('should call searchBy with the correct arguments', () => {
+      // Set up expected search parameters and find options
+      const searchParams = [];
+      searchParams.push(new RequestParam('uuid', 'test'));
+      let findListOptions = new FindListOptions();
+      findListOptions.searchParams = searchParams;
+      // Perform test search using uuid 'test' using the findDuplicates method
+      const result = duplicateDataService.findDuplicates('test', new FindListOptions(), true, true);
+      // Expect searchBy('findByItem'...) to have been used as SearchData impl with the expected options (uuid=test)
+      expect(duplicateDataService.searchBy).toHaveBeenCalledWith('findByItem', findListOptions, true, true);
+    });
+  });
+});
diff --git a/src/app/core/submission/submission-duplicate-data.service.ts b/src/app/core/submission/submission-duplicate-data.service.ts
new file mode 100644
index 0000000000..50e6d83bd8
--- /dev/null
+++ b/src/app/core/submission/submission-duplicate-data.service.ts
@@ -0,0 +1,142 @@
+/* eslint-disable max-classes-per-file */
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { Duplicate } from '../../shared/object-list/duplicate-data/duplicate.model';
+import { DUPLICATE } from '../../shared/object-list/duplicate-data/duplicate.resource-type';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { BaseDataService } from '../data/base/base-data.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RemoteData } from '../data/remote-data';
+import { GetRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
+import { SearchResponseParsingService } from '../data/search-response-parsing.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+
+/**
+ * Service that handles search requests for potential duplicate items.
+ * This uses the /api/submission/duplicates endpoint to look for other archived or in-progress items (if user
+ * has READ permission) that match the item (for the given uuid).
+ * Matching is configured in the backend in dspace/config/modulesduplicate-detection.cfg
+ * The returned results are small preview 'stubs' of items, and displayed in either a submission section
+ * or the workflow pooled/claimed task page.
+ *
+ */
+@Injectable()
+@dataService(DUPLICATE)
+export class SubmissionDuplicateDataService extends BaseDataService<Duplicate> implements SearchData<Duplicate> {
+
+  /**
+   * The ResponseParsingService constructor name
+   */
+  private parser: GenericConstructor<ResponseParsingService> = SearchResponseParsingService;
+
+  /**
+   * The RestRequest constructor name
+   */
+  private request: GenericConstructor<RestRequest> = GetRequest;
+
+  /**
+   * SearchData interface to implement
+   * @private
+   */
+  private searchData: SearchData<Duplicate>;
+
+  /**
+   * Subscription to unsubscribe from
+   */
+  private sub;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+  ) {
+    super('duplicates', requestService, rdbService, objectCache, halService);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+  }
+
+  /**
+   * Implement the searchBy method to return paginated lists of Duplicate resources
+   *
+   * @param searchMethod the search method name
+   * @param options find list options
+   * @param useCachedVersionIfAvailable whether to use cached version if available
+   * @param reRequestOnStale whether to rerequest results on stale
+   * @param linksToFollow links to follow in results
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Duplicate>[]): Observable<RemoteData<PaginatedList<Duplicate>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Helper method to get the duplicates endpoint
+   * @protected
+   */
+  protected getEndpoint(): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Method to set service options
+   * @param {GenericConstructor<ResponseParsingService>} parser The ResponseParsingService constructor name
+   * @param {boolean} request The RestRequest constructor name
+   */
+  setServiceOptions(parser: GenericConstructor<ResponseParsingService>, request: GenericConstructor<RestRequest>) {
+    if (parser) {
+      this.parser = parser;
+    }
+    if (request) {
+      this.request = request;
+    }
+  }
+
+  /**
+   * Find duplicates for a given item UUID. Locates and returns results from the /api/submission/duplicates/search/findByItem
+   * SearchRestMethod, which is why this implements SearchData<Duplicate> and searchBy
+   *
+   * @param uuid the item UUID
+   * @param options any find list options e.g. paging
+   * @param useCachedVersionIfAvailable whether to use cached version if available
+   * @param reRequestOnStale whether to rerequest results on stale
+   * @param linksToFollow links to follow in results
+   */
+  public findDuplicates(uuid: string, options?: FindListOptions, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Duplicate>[]): Observable<RemoteData<PaginatedList<Duplicate>>> {
+    const searchParams = [new RequestParam('uuid', uuid)];
+    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 actual search/findByItem results
+    return this.searchBy('findByItem', findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+
+  }
+
+  /**
+   * Unsubscribe from the subscription
+   */
+  ngOnDestroy(): void {
+    if (this.sub !== undefined) {
+      this.sub.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/core/submission/submission-field-scope-type.ts b/src/app/core/submission/submission-field-scope-type.ts
new file mode 100644
index 0000000000..4a9292ec3d
--- /dev/null
+++ b/src/app/core/submission/submission-field-scope-type.ts
@@ -0,0 +1,4 @@
+export enum SubmissionFieldScopeType {
+  WorkspaceItem = 'SUBMISSION',
+  WorkflowItem = 'WORKFLOW',
+}
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..76e487400b 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
@@ -1,14 +1,13 @@
 import { Store } from '@ngrx/store';
-
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { SubmissionJsonPatchOperationsService } from './submission-json-patch-operations.service';
-import { RequestService } from '../data/request.service';
-import { SubmissionPatchRequest } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { SubmissionPatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { SubmissionJsonPatchOperationsService } from './submission-json-patch-operations.service';
 
 describe('SubmissionJsonPatchOperationsService', () => {
   let scheduler: TestScheduler;
@@ -23,7 +22,7 @@ describe('SubmissionJsonPatchOperationsService', () => {
       requestService,
       store,
       rdbService,
-      halEndpointService
+      halEndpointService,
     );
   }
 
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..5852e52cb2 100644
--- a/src/app/core/submission/submission-json-patch-operations.service.ts
+++ b/src/app/core/submission/submission-json-patch-operations.service.ts
@@ -1,14 +1,13 @@
 import { Injectable } from '@angular/core';
-
 import { Store } from '@ngrx/store';
 
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { JsonPatchOperationsService } from '../json-patch/json-patch-operations.service';
-import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
-import { SubmissionPatchRequest } from '../data/request.models';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core-state.model';
+import { SubmissionPatchRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { JsonPatchOperationsService } from '../json-patch/json-patch-operations.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 
 /**
  * A service that provides methods to make JSON Patch requests.
diff --git a/src/app/core/submission/submission-object-data.service.spec.ts b/src/app/core/submission/submission-object-data.service.spec.ts
index 47b4542561..168fb915d3 100644
--- a/src/app/core/submission/submission-object-data.service.spec.ts
+++ b/src/app/core/submission/submission-object-data.service.spec.ts
@@ -1,11 +1,11 @@
 import { SubmissionService } from '../../submission/submission.service';
 import { RemoteData } from '../data/remote-data';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SubmissionObject } from './models/submission-object.model';
 import { SubmissionObjectDataService } from './submission-object-data.service';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
 
 describe('SubmissionObjectDataService', () => {
   let service: SubmissionObjectDataService;
@@ -20,20 +20,20 @@ describe('SubmissionObjectDataService', () => {
 
   beforeEach(() => {
     workspaceitemDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
-      findById: wsiResult
+      findById: wsiResult,
     });
     workflowItemDataService = jasmine.createSpyObj('WorkflowItemDataService', {
-      findById: wfiResult
+      findById: wfiResult,
     });
     halService = jasmine.createSpyObj('HALEndpointService', {
-      getEndpoint: '/workspaceItem'
+      getEndpoint: '/workspaceItem',
     });
   });
 
   describe('findById', () => {
     it('should call SubmissionService.getSubmissionScope to determine the type of submission object', () => {
       submissionService = jasmine.createSpyObj('SubmissionService', {
-        getSubmissionScope: {}
+        getSubmissionScope: {},
       });
       service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       service.findById(submissionId);
@@ -43,7 +43,7 @@ describe('SubmissionObjectDataService', () => {
     describe('when the submission ID refers to a WorkspaceItem', () => {
       beforeEach(() => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
-          getSubmissionScope: SubmissionScopeType.WorkspaceItem
+          getSubmissionScope: SubmissionScopeType.WorkspaceItem,
         });
         service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
@@ -58,7 +58,7 @@ describe('SubmissionObjectDataService', () => {
     describe('when the submission ID refers to a WorkflowItem', () => {
       beforeEach(() => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
-          getSubmissionScope: SubmissionScopeType.WorkflowItem
+          getSubmissionScope: SubmissionScopeType.WorkflowItem,
         });
         service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
@@ -73,7 +73,7 @@ describe('SubmissionObjectDataService', () => {
     describe('when the type of submission object is unknown', () => {
       beforeEach(() => {
         submissionService = jasmine.createSpyObj('SubmissionService', {
-          getSubmissionScope: 'Something else'
+          getSubmissionScope: 'Something else',
         });
         service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService, halService);
       });
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
index 18816fbfd2..4cf45fa84b 100644
--- a/src/app/core/submission/submission-object-data.service.ts
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -1,31 +1,35 @@
 import { Injectable } from '@angular/core';
-import { of as observableOf, Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { SubmissionService } from '../../submission/submission.service';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 import { RemoteData } from '../data/remote-data';
+import { RequestEntryState } from '../data/request-entry-state.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { SubmissionObject } from './models/submission-object.model';
 import { SubmissionScopeType } from './submission-scope-type';
 import { WorkflowItemDataService } from './workflowitem-data.service';
 import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { map } from 'rxjs/operators';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { environment } from '../../../environments/environment';
-import { RequestEntryState } from '../data/request-entry-state.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
 
 /**
  * A service to retrieve submission objects (WorkspaceItem/WorkflowItem)
  * without knowing their type
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class SubmissionObjectDataService {
   constructor(
     private workspaceitemDataService: WorkspaceitemDataService,
     private workflowItemDataService: WorkflowItemDataService,
     private submissionService: SubmissionService,
-    private halService: HALEndpointService
+    private halService: HALEndpointService,
   ) {
   }
 
@@ -57,7 +61,7 @@ export class SubmissionObjectDataService {
         return this.workspaceitemDataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
       case SubmissionScopeType.WorkflowItem:
         return this.workflowItemDataService.findById(id, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-      default:
+      default: {
         const now = new Date().getTime();
         return observableOf(new RemoteData(
           now,
@@ -66,8 +70,9 @@ export class SubmissionObjectDataService {
           RequestEntryState.Error,
           'The request couldn\'t be sent. Unable to determine the type of submission object',
           undefined,
-          400
+          400,
         ));
+      }
     }
   }
 }
diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index ff84776235..a9d26c185e 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -1,19 +1,23 @@
 import { Injectable } from '@angular/core';
 import { deepClone } from 'fast-json-patch';
-import { DSOResponseParsingService } from '../data/dso-response-parsing.service';
 
-import { ResponseParsingService } from '../data/parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
+import {
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../shared/empty.util';
+import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { ParsedResponse } from '../cache/response.models';
-import { isEmpty, isNotEmpty, isNotNull } from '../../shared/empty.util';
 import { ConfigObject } from '../config/models/config.model';
 import { BaseResponseParsingService } from '../data/base-response-parsing.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { DSOResponseParsingService } from '../data/dso-response-parsing.service';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RestRequest } from '../data/rest-request.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 import { SubmissionObject } from './models/submission-object.model';
 import { WorkflowItem } from './models/workflowitem.model';
 import { WorkspaceItem } from './models/workspaceitem.model';
-import { RestRequest } from '../data/rest-request.model';
 
 /**
  * Export a function to check if object has same properties of FormFieldMetadataValueObject
@@ -49,7 +53,7 @@ export function normalizeSectionData(obj: any, objIndex?: number) {
         (obj.display || obj.value),
         obj.place || objIndex,
         obj.confidence,
-        obj.otherInformation
+        obj.otherInformation,
       );
     } else if (Array.isArray(obj)) {
       result = [];
@@ -88,7 +92,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
   protected shouldDirectlyAttachEmbeds = true;
 
   constructor(protected objectCache: ObjectCacheService,
-              protected dsoParser: DSOResponseParsingService
+              protected dsoParser: DSOResponseParsingService,
   ) {
     super();
   }
diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index 46e536ff7d..5512e683cd 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -1,19 +1,19 @@
-import { TestScheduler } from 'rxjs/testing';
 import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionRestService } from './submission-rest.service';
-import { RequestService } from '../data/request.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
 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 {
   SubmissionDeleteRequest,
   SubmissionPatchRequest,
   SubmissionPostRequest,
-  SubmissionRequest
+  SubmissionRequest,
 } from '../data/request.models';
-import { FormFieldMetadataValueObject } from '../../shared/form/builder/models/form-field-metadata-value.model';
+import { RequestService } from '../data/request.service';
+import { SubmissionRestService } from './submission-rest.service';
 
 describe('SubmissionRestService test suite', () => {
   let scheduler: TestScheduler;
@@ -33,7 +33,7 @@ describe('SubmissionRestService test suite', () => {
     return new SubmissionRestService(
       rdbService,
       requestService,
-      halService
+      halService,
     );
   }
 
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index cf4b741af2..84e68f451a 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -1,27 +1,35 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
 
-import { RequestService } from '../data/request.service';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RemoteData } from '../data/remote-data';
 import {
   DeleteRequest,
   PostRequest,
   SubmissionDeleteRequest,
   SubmissionPatchRequest,
   SubmissionPostRequest,
-  SubmissionRequest
+  SubmissionRequest,
 } from '../data/request.models';
-import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
+import { RequestService } from '../data/request.service';
+import { RestRequest } from '../data/rest-request.model';
 import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { getFirstCompletedRemoteData } from '../shared/operators';
+import { SubmitDataResponseDefinitionObject } from '../shared/submit-data-response-definition.model';
 import { URLCombiner } from '../url-combiner/url-combiner';
-import { RemoteData } from '../data/remote-data';
 import { SubmissionResponse } from './submission-response.model';
-import { RestRequest } from '../data/rest-request.model';
 
 /**
  * The service handling all submission REST requests
@@ -54,7 +62,7 @@ export class SubmissionRestService {
           return hasValue(response.payload) ? response.payload.dataDefinition : response.payload;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
diff --git a/src/app/core/submission/submission-scope-type.ts b/src/app/core/submission/submission-scope-type.ts
index 6ed32d3b4e..f319e5c473 100644
--- a/src/app/core/submission/submission-scope-type.ts
+++ b/src/app/core/submission/submission-scope-type.ts
@@ -1,4 +1,4 @@
 export enum SubmissionScopeType {
   WorkspaceItem = 'WORKSPACE',
-  WorkflowItem = 'WORKFLOW'
+  WorkflowItem = 'WORKFLOW',
 }
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
index 2e066bae95..3dcb0d374a 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-entry-detail.model.ts
@@ -1,8 +1,12 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 
+import { typedObject } from '../../../cache/builders/build-decorators';
 import { HALLink } from '../../../shared/hal-link.model';
 import { VOCABULARY_ENTRY_DETAIL } from './vocabularies.resource-type';
-import { typedObject } from '../../../cache/builders/build-decorators';
 import { VocabularyEntry } from './vocabulary-entry.model';
 
 /**
@@ -17,19 +21,19 @@ export class VocabularyEntryDetail extends VocabularyEntry {
    * The unique id of the entry
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * In an hierarchical vocabulary representing if entry is selectable as value
    */
   @autoserialize
-  selectable: boolean;
+    selectable: boolean;
 
   /**
    * The {@link HALLink}s for this ExternalSourceEntry
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     vocabulary: HALLink;
     parent: HALLink;
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
index d1e9adf8a9..323db57de1 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-entry.model.ts
@@ -1,14 +1,17 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 
-import { HALLink } from '../../../shared/hal-link.model';
-import { VOCABULARY_ENTRY } from './vocabularies.resource-type';
-import { typedObject } from '../../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { isNotEmpty } from '../../../../shared/empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../../../../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { OtherInformation } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
-import { isNotEmpty } from '../../../../shared/empty.util';
 import { ListableObject } from '../../../../shared/object-collection/shared/listable-object.model';
+import { typedObject } from '../../../cache/builders/build-decorators';
 import { GenericConstructor } from '../../../shared/generic-constructor';
+import { HALLink } from '../../../shared/hal-link.model';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import { VOCABULARY_ENTRY } from './vocabularies.resource-type';
 
 /**
  * Model class for a VocabularyEntry
@@ -21,25 +24,25 @@ export class VocabularyEntry extends ListableObject {
    * The identifier of this vocabulary entry
    */
   @autoserialize
-  authority: string;
+    authority: string;
 
   /**
    * The display value of this vocabulary entry
    */
   @autoserialize
-  display: string;
+    display: string;
 
   /**
    * The value of this vocabulary entry
    */
   @autoserialize
-  value: string;
+    value: string;
 
   /**
    * An object containing additional information related to this vocabulary entry
    */
   @autoserialize
-  otherInformation: OtherInformation;
+    otherInformation: OtherInformation;
 
   /**
    * A string representing the kind of vocabulary entry
@@ -52,7 +55,7 @@ export class VocabularyEntry extends ListableObject {
    * The {@link HALLink}s for this ExternalSourceEntry
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     vocabularyEntryDetail?: HALLink;
   };
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
index 7feacd591b..f9b061f0f7 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-find-options.model.ts
@@ -1,6 +1,6 @@
-import { SortOptions } from '../../../cache/models/sort-options.model';
-import { RequestParam } from '../../../cache/models/request-param.model';
 import { isNotEmpty } from '../../../../shared/empty.util';
+import { RequestParam } from '../../../cache/models/request-param.model';
+import { SortOptions } from '../../../cache/models/sort-options.model';
 import { FindListOptions } from '../../../data/find-list-options.model';
 
 /**
@@ -14,8 +14,8 @@ export class VocabularyFindOptions extends FindListOptions {
               public entryID?: string,
               public elementsPerPage?: number,
               public currentPage?: number,
-              public sort?: SortOptions
-              ) {
+              public sort?: SortOptions,
+  ) {
     super();
 
     const searchParams = [];
diff --git a/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts b/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
index fd103718e1..7f54b8599d 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary-options.model.ts
@@ -14,7 +14,7 @@ export class VocabularyOptions {
   closed: boolean;
 
   constructor(name: string,
-              closed: boolean = false) {
+    closed: boolean = false) {
     this.name = name;
     this.closed = closed;
   }
diff --git a/src/app/core/submission/vocabularies/models/vocabulary.model.ts b/src/app/core/submission/vocabularies/models/vocabulary.model.ts
index 9cfc779115..9026ce677a 100644
--- a/src/app/core/submission/vocabularies/models/vocabulary.model.ts
+++ b/src/app/core/submission/vocabularies/models/vocabulary.model.ts
@@ -1,14 +1,23 @@
-import { autoserialize, deserialize } from 'cerialize';
-
-import { HALLink } from '../../../shared/hal-link.model';
-import { VOCABULARY, VOCABULARY_ENTRY } from './vocabularies.resource-type';
-import { typedObject, link } from '../../../cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../data/remote-data';
-import { PaginatedList } from '../../../data/paginated-list.model';
-import { VocabularyEntry } from './vocabulary-entry.model';
+
+import {
+  link,
+  typedObject,
+} from '../../../cache/builders/build-decorators';
 import { CacheableObject } from '../../../cache/cacheable-object.model';
+import { PaginatedList } from '../../../data/paginated-list.model';
+import { RemoteData } from '../../../data/remote-data';
+import { HALLink } from '../../../shared/hal-link.model';
+import { excludeFromEquals } from '../../../utilities/equals.decorators';
+import {
+  VOCABULARY,
+  VOCABULARY_ENTRY,
+} from './vocabularies.resource-type';
+import { VocabularyEntry } from './vocabulary-entry.model';
 
 /**
  * Model class for a Vocabulary
@@ -20,32 +29,32 @@ export class Vocabulary implements CacheableObject {
    * The identifier of this Vocabulary
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name of this Vocabulary
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * True if it is possible to scroll all the entries in the vocabulary without providing a filter parameter
    */
   @autoserialize
-  scrollable: boolean;
+    scrollable: boolean;
 
   /**
    * True if the vocabulary exposes a tree structure where some entries are parent of others
    */
   @autoserialize
-  hierarchical: boolean;
+    hierarchical: boolean;
 
   /**
    * For hierarchical vocabularies express the preference to preload the tree at a specific
    * level of depth (0 only the top nodes are shown, 1 also their children are preloaded and so on)
    */
   @autoserialize
-  preloadLevel: any;
+    preloadLevel: any;
 
   /**
    * A string representing the kind of Vocabulary model
@@ -55,13 +64,13 @@ export class Vocabulary implements CacheableObject {
   public type: any;
 
   @link(VOCABULARY_ENTRY, true)
-  entries?: Observable<RemoteData<PaginatedList<VocabularyEntry>>>;
+    entries?: Observable<RemoteData<PaginatedList<VocabularyEntry>>>;
 
   /**
    * The {@link HALLink}s for this Vocabulary
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     entries: HALLink
   };
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
index bafd8bbdc7..04fa7240ba 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.spec.ts
@@ -7,8 +7,8 @@
  */
 
 import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
-import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 import { testSearchDataImplementation } from '../../data/base/search-data.spec';
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 describe('VocabularyEntryDetailsDataService', () => {
   function initTestService() {
diff --git a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
index 184b4c1e97..b94b353071 100644
--- a/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary-entry-details.data.service.ts
@@ -5,22 +5,29 @@
  *
  * http://www.dspace.org/license/
  */
-import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
-import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
-import { RequestService } from '../../data/request.service';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
 import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { FindAllData, FindAllDataImpl } from '../../data/base/find-all-data';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { PaginatedList } from '../../data/paginated-list.model';
-import { SearchData, SearchDataImpl } from '../../data/base/search-data';
-import { Injectable } from '@angular/core';
-import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
 import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../../data/base/search-data';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { VOCABULARY_ENTRY_DETAIL } from './models/vocabularies.resource-type';
+import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
 
 /**
  * Data service to retrieve vocabulary entry details from the REST server.
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
index 4b35871418..68c7c3ff80 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.spec.ts
@@ -5,10 +5,19 @@
  *
  * http://www.dspace.org/license/
  */
-import { VocabularyDataService } from './vocabulary.data.service';
+import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+
+import { RequestParam } from '../../cache/models/request-param.model';
 import { testFindAllDataImplementation } from '../../data/base/find-all-data.spec';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { VocabularyDataService } from './vocabulary.data.service';
 
 describe('VocabularyDataService', () => {
+  let service: VocabularyDataService;
+  service = initTestService();
+  let restEndpointURL = 'https://rest.api/server/api/submission/vocabularies';
+  let vocabularyByMetadataAndCollectionEndpoint = `${restEndpointURL}/search/byMetadataAndCollection?metadata=dc.contributor.author&collection=1234-1234`;
+
   function initTestService() {
     return new VocabularyDataService(null, null, null, null);
   }
@@ -17,4 +26,18 @@ describe('VocabularyDataService', () => {
     const initService = () => new VocabularyDataService(null, null, null, null);
     testFindAllDataImplementation(initService);
   });
+
+  describe('getVocabularyByMetadataAndCollection', () => {
+    it('search vocabulary by metadata and collection calls expected methods', () => {
+      spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(vocabularyByMetadataAndCollectionEndpoint);
+      spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(null));
+      service.getVocabularyByMetadataAndCollection('dc.contributor.author', '1234-1234');
+      const options = Object.assign(new FindListOptions(), {
+        searchParams: [Object.assign(new RequestParam('metadata', encodeURIComponent('dc.contributor.author'))),
+          Object.assign(new RequestParam('collection', encodeURIComponent('1234-1234')))],
+      });
+      expect((service as any).searchData.getSearchByHref).toHaveBeenCalledWith('byMetadataAndCollection', options);
+      expect(service.findByHref).toHaveBeenCalledWith(vocabularyByMetadataAndCollectionEndpoint, true, true);
+    });
+  });
 });
diff --git a/src/app/core/submission/vocabularies/vocabulary.data.service.ts b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
index a67b67ced7..2dd3b124b8 100644
--- a/src/app/core/submission/vocabularies/vocabulary.data.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.data.service.ts
@@ -5,21 +5,27 @@
  *
  * http://www.dspace.org/license/
  */
-import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
-import { RequestService } from '../../data/request.service';
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { Vocabulary } from './models/vocabulary.model';
-import { FindAllData, FindAllDataImpl } from '../../data/base/find-all-data';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../data/remote-data';
-import { PaginatedList } from '../../data/paginated-list.model';
 import { Injectable } from '@angular/core';
-import { VOCABULARY } from './models/vocabularies.resource-type';
+import { Observable } from 'rxjs';
+
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
 import { dataService } from '../../data/base/data-service.decorator';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../data/base/find-all-data';
+import { IdentifiableDataService } from '../../data/base/identifiable-data.service';
+import { SearchDataImpl } from '../../data/base/search-data';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { VOCABULARY } from './models/vocabularies.resource-type';
+import { Vocabulary } from './models/vocabulary.model';
 
 /**
  * Data service to retrieve vocabularies from the REST server.
@@ -27,7 +33,10 @@ import { dataService } from '../../data/base/data-service.decorator';
 @Injectable()
 @dataService(VOCABULARY)
 export class VocabularyDataService extends IdentifiableDataService<Vocabulary> implements FindAllData<Vocabulary> {
+  protected searchByMetadataAndCollectionPath = 'byMetadataAndCollection';
+
   private findAllData: FindAllData<Vocabulary>;
+  private searchData: SearchDataImpl<Vocabulary>;
 
   constructor(
     protected requestService: RequestService,
@@ -38,6 +47,7 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
     super('vocabularies', requestService, rdbService, objectCache, halService);
 
     this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
 
   /**
@@ -57,4 +67,23 @@ export class VocabularyDataService extends IdentifiableDataService<Vocabulary> i
   public findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<PaginatedList<Vocabulary>>> {
     return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
+
+  /**
+   * Return the controlled vocabulary configured for the specified metadata and collection if any (/submission/vocabularies/search/{@link searchByMetadataAndCollectionPath}?metadata=<>&collection=<>)
+   * @param metadataField               metadata field to search
+   * @param collectionUUID              collection UUID where is configured the vocabulary
+   * @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 getVocabularyByMetadataAndCollection(metadataField: string, collectionUUID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<Vocabulary>> {
+    const findListOptions = new FindListOptions();
+    findListOptions.searchParams = [new RequestParam('metadata', encodeURIComponent(metadataField)),
+      new RequestParam('collection', encodeURIComponent(collectionUUID))];
+    const href$ = this.searchData.getSearchByHref(this.searchByMetadataAndCollectionPath, findListOptions, ...linksToFollow);
+    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
index faa5823520..5e3fdeb034 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.spec.ts
@@ -1,29 +1,34 @@
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../../cache/object-cache.service';
-import { HALEndpointService } from '../../shared/hal-endpoint.service';
-import { RequestService } from '../../data/request.service';
-import { RequestParam } from '../../cache/models/request-param.model';
-import { PageInfo } from '../../shared/page-info.model';
-import { buildPaginatedList } from '../../data/paginated-list.model';
+import { getMockHrefOnlyDataService } from '../../../shared/mocks/href-only-data.service.mock';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import {
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
-import { RestResponse } from '../../cache/response.models';
-import { VocabularyService } from './vocabulary.service';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { VocabularyOptions } from './models/vocabulary-options.model';
-import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
-import { HrefOnlyDataService } from '../../data/href-only-data.service';
-import { getMockHrefOnlyDataService } from '../../../shared/mocks/href-only-data.service.mock';
+import { ObjectCacheServiceStub } from '../../../shared/testing/object-cache-service.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { ObjectCacheService } from '../../cache/object-cache.service';
+import { RestResponse } from '../../cache/response.models';
+import { HrefOnlyDataService } from '../../data/href-only-data.service';
+import { buildPaginatedList } from '../../data/paginated-list.model';
+import { RequestService } from '../../data/request.service';
 import { RequestEntry } from '../../data/request-entry.model';
+import { HALEndpointService } from '../../shared/hal-endpoint.service';
+import { PageInfo } from '../../shared/page-info.model';
+import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
+import { VocabularyOptions } from './models/vocabulary-options.model';
 import { VocabularyDataService } from './vocabulary.data.service';
+import { VocabularyService } from './vocabulary.service';
 import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 describe('VocabularyService', () => {
@@ -47,12 +52,12 @@ describe('VocabularyService', () => {
     entries: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types',
       },
       entries: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries',
       },
-    }
+    },
   };
 
   const hierarchicalVocabulary: any = {
@@ -66,33 +71,33 @@ describe('VocabularyService', () => {
     entries: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types',
       },
       entries: {
-        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries'
+        href: 'https://rest.api/rest/api/submission/vocabularies/types/entries',
       },
-    }
+    },
   };
 
   const vocabularyEntry: any = {
     display: 'testValue1',
     value: 'testValue1',
     otherInformation: {},
-    type: 'vocabularyEntry'
+    type: 'vocabularyEntry',
   };
 
   const vocabularyEntry2: any = {
     display: 'testValue2',
     value: 'testValue2',
     otherInformation: {},
-    type: 'vocabularyEntry'
+    type: 'vocabularyEntry',
   };
 
   const vocabularyEntry3: any = {
     display: 'testValue3',
     value: 'testValue3',
     otherInformation: {},
-    type: 'vocabularyEntry'
+    type: 'vocabularyEntry',
   };
 
   const vocabularyEntryParentDetail: any = {
@@ -102,20 +107,20 @@ describe('VocabularyService', () => {
     otherInformation: {
       id: 'authorityId2',
       hasChildren: 'true',
-      note: 'Familjeforskning'
+      note: 'Familjeforskning',
     },
     type: 'vocabularyEntryDetail',
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:VR131402'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:VR131402',
       },
       parent: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent',
       },
       children: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
-      }
-    }
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children',
+      },
+    },
   };
 
   const vocabularyEntryChildDetail: any = {
@@ -125,20 +130,20 @@ describe('VocabularyService', () => {
     otherInformation: {
       id: 'authoritytestChild1',
       hasChildren: 'true',
-      note: 'Familjeforskning'
+      note: 'Familjeforskning',
     },
     type: 'vocabularyEntryDetail',
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild1'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild1',
       },
       parent: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent',
       },
       children: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
-      }
-    }
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children',
+      },
+    },
   };
 
   const vocabularyEntryChild2Detail: any = {
@@ -148,20 +153,20 @@ describe('VocabularyService', () => {
     otherInformation: {
       id: 'authoritytestChild2',
       hasChildren: 'true',
-      note: 'Familjeforskning'
+      note: 'Familjeforskning',
     },
     type: 'vocabularyEntryDetail',
     _links: {
       self: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild2'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:authoritytestChild2',
       },
       parent: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent'
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:parent',
       },
       children: {
-        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children'
-      }
-    }
+        href: 'https://rest.api/rest/api/submission/vocabularyEntryDetails/srsc:children',
+      },
+    },
   };
 
   const endpointURL = `https://rest.api/rest/api/submission/vocabularies`;
@@ -182,7 +187,7 @@ describe('VocabularyService', () => {
   const entryByIDRequestURL = `https://rest.api/rest/api/submission/vocabularies/${vocabulary.id}/entries?entryID=${entryID}`;
   const vocabularyOptions: VocabularyOptions = {
     name: vocabularyId,
-    closed: false
+    closed: false,
   };
   const pageInfo = new PageInfo();
   const array = [vocabulary, hierarchicalVocabulary];
@@ -199,12 +204,13 @@ describe('VocabularyService', () => {
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
   const getRequestEntries$ = (successful: boolean) => {
     return observableOf({
-      response: { isSuccessful: successful, payload: arrayEntries } as any
+      response: { isSuccessful: successful, payload: arrayEntries } as any,
     } as RequestEntry);
   };
 
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
+    objectCache = new ObjectCacheServiceStub() as ObjectCacheService;
 
     return new VocabularyService(
       requestService,
@@ -241,7 +247,7 @@ describe('VocabularyService', () => {
         });
         rdbService = jasmine.createSpyObj('rdbService', {
           buildSingle: hot('a|', {
-            a: vocabularyRD
+            a: vocabularyRD,
           }),
           buildList: hot('a|', {
             a: paginatedListRD,
@@ -253,7 +259,9 @@ describe('VocabularyService', () => {
         spyOn((service as any).vocabularyDataService, 'findById').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findAll').and.callThrough();
         spyOn((service as any).vocabularyDataService, 'findByHref').and.callThrough();
+        spyOn((service as any).vocabularyDataService, 'getVocabularyByMetadataAndCollection').and.callThrough();
         spyOn((service as any).vocabularyDataService.findAllData, 'getFindAllHref').and.returnValue(observableOf(entriesRequestURL));
+        spyOn((service as any).vocabularyDataService.searchData, 'getSearchByHref').and.returnValue(observableOf(searchRequestURL));
       });
 
       afterEach(() => {
@@ -271,7 +279,7 @@ describe('VocabularyService', () => {
         it('should return a RemoteData<Vocabulary> for the object with the given id', () => {
           const result = service.findVocabularyById(vocabularyId);
           const expected = cold('a|', {
-            a: vocabularyRD
+            a: vocabularyRD,
           });
           expect(result).toBeObservable(expected);
         });
@@ -288,7 +296,7 @@ describe('VocabularyService', () => {
         it('should return a RemoteData<Vocabulary> for the object with the given URL', () => {
           const result = service.findVocabularyByHref(requestURL);
           const expected = cold('a|', {
-            a: vocabularyRD
+            a: vocabularyRD,
           });
           expect(result).toBeObservable(expected);
         });
@@ -305,7 +313,24 @@ describe('VocabularyService', () => {
         it('should return a RemoteData<PaginatedList<Vocabulary>>', () => {
           const result = service.findAllVocabularies();
           const expected = cold('a|', {
-            a: paginatedListRD
+            a: paginatedListRD,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getVocabularyByMetadataAndCollection', () => {
+        it('should proxy the call to vocabularyDataService.getVocabularyByMetadataAndCollection', () => {
+          scheduler.schedule(() => service.getVocabularyByMetadataAndCollection(metadata, collectionUUID));
+          scheduler.flush();
+
+          expect((service as any).vocabularyDataService.getVocabularyByMetadataAndCollection).toHaveBeenCalledWith(metadata, collectionUUID, true, true);
+        });
+
+        it('should return a RemoteData<Vocabulary> for the object with the given metadata and collection', () => {
+          const result = service.getVocabularyByMetadataAndCollection(metadata, collectionUUID);
+          const expected = cold('a|', {
+            a: vocabularyRD,
           });
           expect(result).toBeObservable(expected);
         });
@@ -334,7 +359,7 @@ describe('VocabularyService', () => {
               filter: null,
               exact: null,
               entryID: null,
-            })
+            }),
           }));
         });
       });
@@ -349,7 +374,7 @@ describe('VocabularyService', () => {
             findListOptions: jasmine.objectContaining({
               filter: 'test',
               exact: false,
-            })
+            }),
           }));
         });
       });
@@ -364,7 +389,7 @@ describe('VocabularyService', () => {
             findListOptions: jasmine.objectContaining({
               filter: 'test',
               exact: true,
-            })
+            }),
           }));
         });
       });
@@ -377,7 +402,7 @@ describe('VocabularyService', () => {
           expect(service.findVocabularyById).toHaveBeenCalledWith(vocabularyOptions.name, true, true, jasmine.objectContaining({
             findListOptions: jasmine.objectContaining({
               entryID,
-            })
+            }),
           }));
         });
       });
@@ -391,7 +416,7 @@ describe('VocabularyService', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: entryDetailEndpointURL })
+        getEndpoint: cold('a', { a: entryDetailEndpointURL }),
       });
 
       responseCacheEntry = new RequestEntry();
@@ -407,10 +432,10 @@ describe('VocabularyService', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         }),
         buildList: hot('a|', {
-          a: vocabularyEntryChildrenRD
+          a: vocabularyEntryChildrenRD,
         }),
       });
 
@@ -441,7 +466,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<VocabularyEntryDetail> for the object with the given URL', () => {
         const result = service.findEntryDetailByHref(entryDetailRequestURL);
         const expected = cold('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -458,7 +483,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<VocabularyEntryDetail> for the object with the given id', () => {
         const result = service.findEntryDetailById('testValue', hierarchicalVocabulary.id);
         const expected = cold('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -475,7 +500,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<VocabularyEntryDetail> for the object with the given URL', () => {
         const result = service.getEntryDetailParent('testValue', hierarchicalVocabulary.id);
         const expected = cold('a|', {
-          a: vocabularyEntryDetailParentRD
+          a: vocabularyEntryDetailParentRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -489,7 +514,7 @@ describe('VocabularyService', () => {
           null,
           null,
           pageInfo.elementsPerPage,
-          pageInfo.currentPage
+          pageInfo.currentPage,
         );
         scheduler.schedule(() => service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, pageInfo).subscribe());
         scheduler.flush();
@@ -500,7 +525,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the object with the given URL', () => {
         const result = service.getEntryDetailChildren('testValue', hierarchicalVocabulary.id, new PageInfo());
         const expected = cold('a|', {
-          a: vocabularyEntryChildrenRD
+          a: vocabularyEntryChildrenRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -514,7 +539,7 @@ describe('VocabularyService', () => {
           null,
           null,
           pageInfo.elementsPerPage,
-          pageInfo.currentPage
+          pageInfo.currentPage,
         );
         options.searchParams = [new RequestParam('vocabulary', 'srsc')];
         scheduler.schedule(() => service.searchTopEntries('srsc', pageInfo));
@@ -526,7 +551,7 @@ describe('VocabularyService', () => {
       it('should return a RemoteData<PaginatedList<ResourcePolicy>> for the search', () => {
         const result = service.searchTopEntries('srsc', pageInfo);
         const expected = cold('a|', {
-          a: vocabularyEntryChildrenRD
+          a: vocabularyEntryChildrenRD,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/submission/vocabularies/vocabulary.service.ts b/src/app/core/submission/vocabularies/vocabulary.service.ts
index f2c1747658..117f6d0417 100644
--- a/src/app/core/submission/vocabularies/vocabulary.service.ts
+++ b/src/app/core/submission/vocabularies/vocabulary.service.ts
@@ -1,25 +1,33 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, switchMap, mergeMap } from 'rxjs/operators';
-import { FollowLinkConfig, followLink } from '../../../shared/utils/follow-link-config.model';
-import { RequestService } from '../../data/request.service';
-import { RemoteData } from '../../data/remote-data';
-import { PaginatedList } from '../../data/paginated-list.model';
-import { Vocabulary } from './models/vocabulary.model';
-import { VocabularyEntry } from './models/vocabulary-entry.model';
+import {
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
 import { isNotEmpty } from '../../../shared/empty.util';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../../shared/utils/follow-link-config.model';
+import { RequestParam } from '../../cache/models/request-param.model';
+import { FindListOptions } from '../../data/find-list-options.model';
+import { PaginatedList } from '../../data/paginated-list.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestService } from '../../data/request.service';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteListPayload,
 } from '../../shared/operators';
-import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
-import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
-import { RequestParam } from '../../cache/models/request-param.model';
-import { VocabularyOptions } from './models/vocabulary-options.model';
 import { PageInfo } from '../../shared/page-info.model';
-import { FindListOptions } from '../../data/find-list-options.model';
-import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
+import { Vocabulary } from './models/vocabulary.model';
+import { VocabularyEntry } from './models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from './models/vocabulary-entry-detail.model';
+import { VocabularyFindOptions } from './models/vocabulary-find-options.model';
+import { VocabularyOptions } from './models/vocabulary-options.model';
 import { VocabularyDataService } from './vocabulary.data.service';
+import { VocabularyEntryDetailsDataService } from './vocabulary-entry-details.data.service';
 
 /**
  * A service responsible for fetching/sending data from/to the REST API on the vocabularies endpoint
@@ -87,6 +95,23 @@ export class VocabularyService {
     return this.vocabularyDataService.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
+  /**
+     * Return the controlled vocabulary configured for the specified metadata and collection if any
+     * @param metadataField               metadata field to search
+     * @param collectionUUID              collection UUID where is configured the vocabulary
+     * @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
+     * @return {Observable<RemoteData<Vocabulary>>}
+     *    Return an observable that emits vocabulary object
+     */
+  getVocabularyByMetadataAndCollection(metadataField: string, collectionUUID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Vocabulary>[]): Observable<RemoteData<Vocabulary>> {
+    return this.vocabularyDataService.getVocabularyByMetadataAndCollection(metadataField, collectionUUID, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
   /**
    * Return the {@link VocabularyEntry} list for a given {@link Vocabulary}
    *
@@ -103,7 +128,7 @@ export class VocabularyService {
       null,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
@@ -130,7 +155,7 @@ export class VocabularyService {
       exact,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
@@ -159,7 +184,7 @@ export class VocabularyService {
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 
@@ -179,7 +204,7 @@ export class VocabularyService {
       null,
       ID,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     // TODO remove false for the entries embed when https://github.com/DSpace/DSpace/issues/3096 is solved
@@ -193,7 +218,7 @@ export class VocabularyService {
         } else {
           return null;
         }
-      })
+      }),
     );
   }
 
@@ -223,13 +248,15 @@ export class VocabularyService {
    *                                    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 constructId                 Whether constructing the full vocabularyDetail ID
+   *                                    ({vocabularyName}:{detailName}) is still necessary
    * @param linksToFollow               List of {@link FollowLinkConfig} that indicate which
    *                                    {@link HALLink}s should be automatically resolved
    * @return {Observable<RemoteData<VocabularyEntryDetail>>}
    *    Return an observable that emits VocabularyEntryDetail object
    */
-  findEntryDetailById(id: string, name: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<VocabularyEntryDetail>[]): Observable<RemoteData<VocabularyEntryDetail>> {
-    const findId = `${name}:${id}`;
+  findEntryDetailById(id: string, name: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, constructId: boolean = true, ...linksToFollow: FollowLinkConfig<VocabularyEntryDetail>[]): Observable<RemoteData<VocabularyEntryDetail>> {
+    const findId: string = (constructId ? `${name}:${id}` : id);
     return this.vocabularyEntryDetailDataService.findById(findId, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
 
@@ -252,7 +279,7 @@ export class VocabularyService {
 
     return this.vocabularyEntryDetailDataService.getBrowseEndpoint().pipe(
       map((href: string) => `${href}/${linkPath}`),
-      mergeMap((href) => this.vocabularyEntryDetailDataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      mergeMap((href) => this.vocabularyEntryDetailDataService.findByHref(href, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
@@ -278,12 +305,12 @@ export class VocabularyService {
       null,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
 
     return this.vocabularyEntryDetailDataService.getBrowseEndpoint().pipe(
       map(href => `${href}/${name}:${value}/children`),
-      switchMap(href => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow))
+      switchMap(href => this.vocabularyEntryDetailDataService.findListByHref(href, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow)),
     );
   }
 
@@ -307,7 +334,7 @@ export class VocabularyService {
       null,
       null,
       pageInfo.elementsPerPage,
-      pageInfo.currentPage
+      pageInfo.currentPage,
     );
     options.searchParams = [new RequestParam('vocabulary', name)];
     return this.vocabularyEntryDetailDataService.searchBy(this.searchTopMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
diff --git a/src/app/core/submission/workflowitem-data.service.spec.ts b/src/app/core/submission/workflowitem-data.service.spec.ts
index 3f6ec54fda..a07ac238cd 100644
--- a/src/app/core/submission/workflowitem-data.service.spec.ts
+++ b/src/app/core/submission/workflowitem-data.service.spec.ts
@@ -1,24 +1,28 @@
 import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { PageInfo } from '../shared/page-info.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { HrefOnlyDataService } from '../data/href-only-data.service';
-import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
-import { Store } from '@ngrx/store';
 import { RestResponse } from '../cache/response.models';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { Item } from '../shared/item.model';
-import { WorkflowItemDataService } from './workflowitem-data.service';
-import { WorkflowItem } from './models/workflowitem.model';
 import { CoreState } from '../core-state.model';
+import { HrefOnlyDataService } from '../data/href-only-data.service';
+import { RequestService } from '../data/request.service';
 import { RequestEntry } from '../data/request-entry.model';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { WorkflowItem } from './models/workflowitem.model';
+import { WorkflowItemDataService } from './workflowitem-data.service';
 
 describe('WorkflowItemDataService test', () => {
   let scheduler: TestScheduler;
@@ -38,28 +42,28 @@ describe('WorkflowItemDataService test', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(item);
   const wsi = Object.assign(new WorkflowItem(), { item: observableOf(itemRD), id: '1234', uuid: '1234' });
@@ -96,7 +100,7 @@ describe('WorkflowItemDataService test', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: cold('a', { a: endpointURL }),
       });
       responseCacheEntry = new RequestEntry();
       responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -111,8 +115,8 @@ describe('WorkflowItemDataService test', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('a|', {
-          a: wsiRD
-        })
+          a: wsiRD,
+        }),
       });
 
       service = initTestService();
@@ -126,7 +130,7 @@ describe('WorkflowItemDataService test', () => {
     });
 
     describe('findByItem', () => {
-      it('should proxy the call to DataService.findByHref', () => {
+      it('should proxy the call to UpdateDataServiceImpl.findByHref', () => {
         scheduler.schedule(() => service.findByItem('1234-1234', true, true, pageInfo));
         scheduler.flush();
 
@@ -136,7 +140,7 @@ describe('WorkflowItemDataService test', () => {
       it('should return a RemoteData<WorkspaceItem> for the search', () => {
         const result = service.findByItem('1234-1234', true, true, pageInfo);
         const expected = cold('a|', {
-          a: wsiRD
+          a: wsiRD,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 47d18470d3..d1faf19ad1 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -1,26 +1,36 @@
 import { Injectable } from '@angular/core';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestService } from '../data/request.service';
-import { WorkflowItem } from './models/workflowitem.model';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { DeleteByIDRequest } from '../data/request.models';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
 import { Observable } from 'rxjs';
-import { find, map } from 'rxjs/operators';
+import {
+  find,
+  map,
+} from 'rxjs/operators';
+
 import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
 import { RemoteData } from '../data/remote-data';
+import { DeleteByIDRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NoContent } from '../shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../shared/operators';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { WorkflowItem } from './models/workflowitem.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';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * A service that provides methods to make REST requests with workflow items endpoint.
@@ -65,7 +75,7 @@ export class WorkflowItemDataService extends IdentifiableDataService<WorkflowIte
   sendBack(id: string): Observable<boolean> {
     return this.deleteWFI(id, false).pipe(
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+      map((response: RemoteData<NoContent>) => response.hasSucceeded),
     );
   }
 
diff --git a/src/app/core/submission/workspaceitem-data.service.spec.ts b/src/app/core/submission/workspaceitem-data.service.spec.ts
index e766a6a039..644cae85cb 100644
--- a/src/app/core/submission/workspaceitem-data.service.spec.ts
+++ b/src/app/core/submission/workspaceitem-data.service.spec.ts
@@ -1,26 +1,41 @@
-import { HttpClient } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { RequestService } from '../data/request.service';
-import { PageInfo } from '../shared/page-info.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { HrefOnlyDataService } from '../data/href-only-data.service';
 import { getMockHrefOnlyDataService } from '../../shared/mocks/href-only-data.service.mock';
-import { WorkspaceitemDataService } from './workspaceitem-data.service';
-import { Store } from '@ngrx/store';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
 import { RestResponse } from '../cache/response.models';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-import { Item } from '../shared/item.model';
-import { WorkspaceItem } from './models/workspaceitem.model';
-import { RequestEntry } from '../data/request-entry.model';
 import { CoreState } from '../core-state.model';
-import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { DeleteData } from '../data/base/delete-data';
 import { testDeleteDataImplementation } from '../data/base/delete-data.spec';
+import { SearchData } from '../data/base/search-data';
+import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { HrefOnlyDataService } from '../data/href-only-data.service';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { Item } from '../shared/item.model';
+import { PageInfo } from '../shared/page-info.model';
+import { WorkspaceItem } from './models/workspaceitem.model';
+import { WorkspaceitemDataService } from './workspaceitem-data.service';
 
 describe('WorkspaceitemDataService test', () => {
   let scheduler: TestScheduler;
@@ -40,43 +55,40 @@ describe('WorkspaceitemDataService test', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(item);
   const wsi = Object.assign(new WorkspaceItem(), { item: observableOf(itemRD), id: '1234', uuid: '1234' });
   const wsiRD = createSuccessfulRemoteDataObject(wsi);
 
   const endpointURL = `https://rest.api/rest/api/submission/workspaceitems`;
-  const searchRequestURL = `https://rest.api/rest/api/submission/workspaceitems/search/item?uuid=1234-1234`;
-  const searchRequestURL$ = observableOf(searchRequestURL);
 
   const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
 
   objectCache = {} as ObjectCacheService;
   const notificationsService = {} as NotificationsService;
   const http = {} as HttpClient;
-  const comparator = {} as any;
   const comparatorEntry = {} as any;
   const store = {} as Store<CoreState>;
   const pageInfo = new PageInfo();
@@ -84,18 +96,23 @@ describe('WorkspaceitemDataService test', () => {
   function initTestService() {
     hrefOnlyDataService = getMockHrefOnlyDataService();
     return new WorkspaceitemDataService(
+      comparatorEntry,
+      halService,
+      http,
+      notificationsService,
       requestService,
       rdbService,
       objectCache,
-      halService,
-      notificationsService,
+      store,
     );
   }
 
   describe('composition', () => {
-    const initService = () => new WorkspaceitemDataService(null, null, null, null, null);
-    testSearchDataImplementation(initService);
-    testDeleteDataImplementation(initService);
+    const initSearchService = () => new WorkspaceitemDataService(null, null, null, null, null, null, null, null) as unknown as SearchData<any>;
+    const initDeleteService = () => new WorkspaceitemDataService(null, null, null, null, null, null, null, null) as unknown as DeleteData<any>;
+
+    testSearchDataImplementation(initSearchService);
+    testDeleteDataImplementation(initDeleteService);
   });
 
   describe('', () => {
@@ -104,7 +121,7 @@ describe('WorkspaceitemDataService test', () => {
       scheduler = getTestScheduler();
 
       halService = jasmine.createSpyObj('halService', {
-        getEndpoint: cold('a', { a: endpointURL })
+        getEndpoint: observableOf(endpointURL),
       });
       responseCacheEntry = new RequestEntry();
       responseCacheEntry.request = { href: 'https://rest.api/' } as any;
@@ -119,14 +136,14 @@ describe('WorkspaceitemDataService test', () => {
       });
       rdbService = jasmine.createSpyObj('rdbService', {
         buildSingle: hot('a|', {
-          a: wsiRD
-        })
+          a: wsiRD,
+        }),
+        buildFromRequestUUID: createSuccessfulRemoteDataObject$({}),
       });
 
       service = initTestService();
 
       spyOn((service as any), 'findByHref').and.callThrough();
-      spyOn((service as any), 'getSearchByHref').and.returnValue(searchRequestURL$);
     });
 
     afterEach(() => {
@@ -134,22 +151,35 @@ describe('WorkspaceitemDataService test', () => {
     });
 
     describe('findByItem', () => {
-      it('should proxy the call to DataService.findByHref', () => {
+      it('should proxy the call to UpdateDataServiceImpl.findByHref', () => {
         scheduler.schedule(() => service.findByItem('1234-1234', true, true, pageInfo));
         scheduler.flush();
-
-        expect((service as any).findByHref).toHaveBeenCalledWith(searchRequestURL$, true, true);
+        const searchUrl = service.getIDHref('item', [new RequestParam('uuid', encodeURIComponent('1234-1234'))]);
+        expect((service as any).findByHref).toHaveBeenCalledWith(searchUrl, true, true);
       });
 
       it('should return a RemoteData<WorkspaceItem> for the search', () => {
         const result = service.findByItem('1234-1234', true, true, pageInfo);
         const expected = cold('a|', {
-          a: wsiRD
+          a: wsiRD,
         });
         expect(result).toBeObservable(expected);
       });
 
     });
-  });
 
+    describe('importExternalSourceEntry', () => {
+      it('should send a POST request containing the provided item request', (done) => {
+        const options: HttpOptions = Object.create({});
+        let headers = new HttpHeaders();
+        headers = headers.append('Content-Type', 'text/uri-list');
+        options.headers = headers;
+
+        service.importExternalSourceEntry('externalHref', 'testId').subscribe(() => {
+          expect(requestService.send).toHaveBeenCalledWith(new PostRequest(requestUUID, `${endpointURL}?owningCollection=testId`, 'externalHref', options));
+          done();
+        });
+      });
+    });
+  });
 });
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index f285fb6eca..3332ef0785 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -1,103 +1,67 @@
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { RequestService } from '../data/request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { WorkspaceItem } from './models/workspaceitem.model';
+import { Store } from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../data/remote-data';
+import {
+  find,
+  map,
+} from 'rxjs/operators';
+
+import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { RequestParam } from '../cache/models/request-param.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { IdentifiableDataService } from '../data/base/identifiable-data.service';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { PaginatedList } from '../data/paginated-list.model';
-import { DeleteData, DeleteDataImpl } from '../data/base/delete-data';
-import { NoContent } from '../shared/NoContent.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CoreState } from '../core-state.model';
 import { dataService } from '../data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { DSOChangeAnalyzer } from '../data/dso-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import { PostRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { WorkspaceItem } from './models/workspaceitem.model';
 
 /**
  * A service that provides methods to make REST requests with workspaceitems endpoint.
  */
 @Injectable()
 @dataService(WorkspaceItem.type)
-export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements SearchData<WorkspaceItem>, DeleteData<WorkspaceItem> {
+export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceItem> implements DeleteData<WorkspaceItem>, SearchData<WorkspaceItem>{
+  protected linkPath = 'workspaceitems';
   protected searchByItemLinkPath = 'item';
-
-  private searchData: SearchDataImpl<WorkspaceItem>;
-  private deleteData: DeleteDataImpl<WorkspaceItem>;
+  private deleteData: DeleteData<WorkspaceItem>;
+  private searchData: SearchData<WorkspaceItem>;
 
   constructor(
+    protected comparator: DSOChangeAnalyzer<WorkspaceItem>,
+    protected halService: HALEndpointService,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
     protected requestService: RequestService,
     protected rdbService: RemoteDataBuildService,
     protected objectCache: ObjectCacheService,
-    protected halService: HALEndpointService,
-    protected notificationsService: NotificationsService,
-  ) {
+    protected store: Store<CoreState>) {
     super('workspaceitems', 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);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
   }
-
-  /**
-   * Return the WorkspaceItem object found through the UUID of an item
-   *
-   * @param uuid           The uuid of the item
-   * @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} 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>> {
-    const findListOptions = new FindListOptions();
-    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
-    const href$ = this.getSearchByHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
-    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Create the HREF for a specific object's search method with given options object
-   *
-   * @param searchMethod The search method for the object
-   * @param options The [[FindListOptions]] object
-   * @return {Observable<string>}
-   *    Return an observable that emits created HREF
-   * @param linksToFollow   List of {@link FollowLinkConfig} that indicate which {@link HALLink}s should be automatically resolved
-   */
-  public getSearchByHref(searchMethod: string, options?: FindListOptions, ...linksToFollow): Observable<string> {
-    return this.searchData.getSearchByHref(searchMethod, options, ...linksToFollow);
-  }
-
-  /**
-   * Make a new FindListRequest with given search method
-   *
-   * @param searchMethod                The search method for the object
-   * @param options                     The [[FindListOptions]] object
-   * @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
-   * @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>>> {
-    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
-  }
-
-  /**
-   * Delete an existing object on the server
-   * @param   objectId The id of the object to be removed
-   * @param   copyVirtualMetadata (optional parameter) the identifiers of the relationship types for which the virtual
-   *                            metadata should be saved as real metadata
-   * @return  A RemoteData observable with an empty payload, but still representing the state of the request: statusCode,
-   *          errorMessage, timeCompleted, etc
-   */
   public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
     return this.deleteData.delete(objectId, copyVirtualMetadata);
   }
@@ -115,4 +79,64 @@ export class WorkspaceitemDataService extends IdentifiableDataService<WorkspaceI
     return this.deleteData.deleteByHref(href, copyVirtualMetadata);
   }
 
+  /**
+   * Return the WorkspaceItem object found through the UUID of an item
+   *
+   * @param uuid           The uuid of the item
+   * @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} 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>> {
+    const findListOptions = new FindListOptions();
+    findListOptions.searchParams = [new RequestParam('uuid', encodeURIComponent(uuid))];
+    const href$ = this.getIDHref(this.searchByItemLinkPath, findListOptions, ...linksToFollow);
+    return this.findByHref(href$, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Import an external source entry into a collection
+   * @param externalSourceEntryHref
+   * @param collectionId
+   */
+  public importExternalSourceEntry(externalSourceEntryHref: string, collectionId: string): Observable<RemoteData<WorkspaceItem>> {
+    const options: HttpOptions = Object.create({});
+    let headers = new HttpHeaders();
+    headers = headers.append('Content-Type', 'text/uri-list');
+    options.headers = headers;
+
+    const requestId = this.requestService.generateRequestId();
+    const href$ = this.halService.getEndpoint(this.linkPath).pipe(map((href) => `${href}?owningCollection=${collectionId}`));
+
+    href$.pipe(
+      find((href: string) => hasValue(href)),
+      map((href: string) => {
+        const request = new PostRequest(requestId, href, externalSourceEntryHref, options);
+        this.requestService.send(request);
+      }),
+    ).subscribe();
+
+    return this.rdbService.buildFromRequestUUID(requestId);
+  }
+
+  /**
+   * Make a new FindListRequest with given search method
+   *
+   * @param searchMethod                The search method for the object
+   * @param options                     The [[FindListOptions]] object
+   * @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
+   * @return {Observable<RemoteData<PaginatedList<T>>}
+   *    Return an observable that emits response from the server
+   */
+  searchBy(searchMethod: string, options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<PaginatedList<WorkspaceItem>>> {
+    return this.searchData.searchBy(searchMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
 }
diff --git a/src/app/core/supervision-order/models/action-type.model.ts b/src/app/core/supervision-order/models/action-type.model.ts
new file mode 100644
index 0000000000..0e55689069
--- /dev/null
+++ b/src/app/core/supervision-order/models/action-type.model.ts
@@ -0,0 +1,44 @@
+/**
+ * Enum representing the Action Type of a Resource Policy
+ */
+export enum ActionType {
+  /**
+   * Action of reading, viewing or downloading something
+   */
+  READ = 'READ',
+
+  /**
+   * Action of modifying something
+   */
+  WRITE = 'WRITE',
+
+  /**
+   * Action of deleting something
+   */
+  DELETE = 'DELETE',
+
+  /**
+   * Action of adding something to a container
+   */
+  ADD = 'ADD',
+
+  /**
+   * Action of removing something from a container
+   */
+  REMOVE = 'REMOVE',
+
+  /**
+   * None Type of Supervision Order
+   */
+  NONE = 'NONE',
+
+  /**
+   * Editor Type of Supervision Order
+   */
+  EDITOR = 'EDITOR',
+
+  /**
+   * Observer Type of Supervision Order
+   */
+  OBSERVER = 'OBSERVER',
+}
diff --git a/src/app/core/supervision-order/models/supervision-order.model.ts b/src/app/core/supervision-order/models/supervision-order.model.ts
new file mode 100644
index 0000000000..64087c8a21
--- /dev/null
+++ b/src/app/core/supervision-order/models/supervision-order.model.ts
@@ -0,0 +1,82 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
+import { IDToUUIDSerializer } from '../../cache/id-to-uuid-serializer';
+import { RemoteData } from '../../data/remote-data';
+import { Group } from '../../eperson/models/group.model';
+import { GROUP } from '../../eperson/models/group.resource-type';
+import { HALLink } from '../../shared/hal-link.model';
+import { Item } from '../../shared/item.model';
+import { ITEM } from '../../shared/item.resource-type';
+import { ResourceType } from '../../shared/resource-type';
+import { excludeFromEquals } from '../../utilities/equals.decorators';
+import { SUPERVISION_ORDER } from './supervision-order.resource-type';
+
+/**
+ * Model class for a Supervision Order
+ */
+@typedObject
+export class SupervisionOrder implements CacheableObject {
+  static type = SUPERVISION_ORDER;
+
+  /**
+   * The identifier for this Supervision Order
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    ordertype: string;
+
+  /**
+   * The universally unique identifier for this Supervision Order
+   * This UUID is generated client-side and isn't used by the backend.
+   * It is based on the ID, so it will be the same for each refresh.
+   */
+  @deserializeAs(new IDToUUIDSerializer('supervision-order'), 'id')
+    uuid: string;
+
+  /**
+   * The {@link HALLink}s for this SupervisionOrder
+   */
+  @deserialize
+    _links: {
+    item: HALLink,
+    group: HALLink,
+    self: HALLink,
+  };
+
+  /**
+   * The related supervision Item
+   * Will be undefined unless the item {@link HALLink} has been resolved.
+   */
+  @link(ITEM)
+    item?: Observable<RemoteData<Item>>;
+
+  /**
+   * The group linked by this supervision order
+   * Will be undefined unless the version {@link HALLink} has been resolved.
+   */
+  @link(GROUP)
+    group?: Observable<RemoteData<Group>>;
+}
diff --git a/src/app/core/supervision-order/models/supervision-order.resource-type.ts b/src/app/core/supervision-order/models/supervision-order.resource-type.ts
new file mode 100644
index 0000000000..994c93ab74
--- /dev/null
+++ b/src/app/core/supervision-order/models/supervision-order.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for SupervisionOrder
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SUPERVISION_ORDER = new ResourceType('supervisionorder');
diff --git a/src/app/core/supervision-order/supervision-order-data.service.spec.ts b/src/app/core/supervision-order/supervision-order-data.service.spec.ts
new file mode 100644
index 0000000000..945a3f44e8
--- /dev/null
+++ b/src/app/core/supervision-order/supervision-order-data.service.spec.ts
@@ -0,0 +1,282 @@
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ObjectCacheServiceStub } from '../../shared/testing/object-cache-service.stub';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { RestResponse } from '../cache/response.models';
+import { FindListOptions } from '../data/find-list-options.model';
+import { buildPaginatedList } from '../data/paginated-list.model';
+import { RequestService } from '../data/request.service';
+import { RequestEntry } from '../data/request-entry.model';
+import { GroupDataService } from '../eperson/group-data.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { PageInfo } from '../shared/page-info.model';
+import { ActionType } from './models/action-type.model';
+import { SupervisionOrderDataService } from './supervision-order-data.service';
+
+describe('SupervisionOrderService', () => {
+  let scheduler: TestScheduler;
+  let service: SupervisionOrderDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheServiceStub;
+  let halService: HALEndpointService;
+  let responseCacheEntry: RequestEntry;
+  let groupService: GroupDataService;
+
+  const supervisionOrder: any = {
+    id: '1',
+    name: null,
+    description: null,
+    action: ActionType.READ,
+    startDate: null,
+    endDate: null,
+    type: 'supervisionOrder',
+    uuid: 'supervision-order-1',
+    _links: {
+      group: {
+        href: 'https://rest.api/rest/api/group',
+      },
+      self: {
+        href: 'https://rest.api/rest/api/supervisionorder/1',
+      },
+    },
+  };
+
+  const anothersupervisionOrder: any = {
+    id: '2',
+    name: null,
+    description: null,
+    action: ActionType.WRITE,
+    startDate: null,
+    endDate: null,
+    type: 'supervisionOrder',
+    uuid: 'supervision-order-2',
+    _links: {
+      group: {
+        href: 'https://rest.api/rest/api/group',
+      },
+      self: {
+        href: 'https://rest.api/rest/api/supervisionorder/1',
+      },
+    },
+  };
+  const endpointURL = `https://rest.api/rest/api/supervisionorder`;
+  const requestURL = `https://rest.api/rest/api/supervisionorder/${supervisionOrder.id}`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+  const supervisionOrderId = '1';
+  const groupUUID = '8b39g7ya-5a4b-438b-9686-be1d5b4a1c5a';
+  const itemUUID = '8b39g7ya-5a4b-438b-851f-be1d5b4a1c5a';
+  const supervisionOrderType = 'NONE';
+
+  const pageInfo = new PageInfo();
+  const array = [supervisionOrder, anothersupervisionOrder];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const supervisionOrderRD = createSuccessfulRemoteDataObject(supervisionOrder);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+  const groupEndpoint = 'group_EP';
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', { a: endpointURL }),
+    });
+
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: observableOf(responseCacheEntry),
+      getByUUID: observableOf(responseCacheEntry),
+      setStaleByHrefSubstring: {},
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: hot('a|', {
+        a: supervisionOrderRD,
+      }),
+      buildList: hot('a|', {
+        a: paginatedListRD,
+      }),
+      buildFromRequestUUID: hot('a|', {
+        a: supervisionOrderRD,
+      }),
+      buildFromRequestUUIDAndAwait: hot('a|', {
+        a: supervisionOrderRD,
+      }),
+    });
+    groupService = jasmine.createSpyObj('groupService', {
+      getBrowseEndpoint: hot('a', {
+        a: groupEndpoint,
+      }),
+      getIDHrefObs: cold('a', {
+        a: 'https://rest.api/rest/api/group/groups/' + groupUUID,
+      }),
+    });
+    groupService = jasmine.createSpyObj('groupService', {
+      getIDHrefObs: cold('a', {
+        a: 'https://rest.api/rest/api/group/groups/' + groupUUID,
+      }),
+    });
+    objectCache = new ObjectCacheServiceStub();
+    const notificationsService = {} as NotificationsService;
+    const comparator = {} as any;
+
+    service = new SupervisionOrderDataService(
+      requestService,
+      rdbService,
+      objectCache as ObjectCacheService,
+      halService,
+      notificationsService,
+      comparator,
+      groupService,
+    );
+
+    spyOn(service, 'findById').and.callThrough();
+    spyOn(service, 'findByHref').and.callThrough();
+    spyOn(service, 'invalidateByHref').and.returnValue(observableOf(true));
+    spyOn((service as any).createData, 'create').and.callThrough();
+    spyOn((service as any).deleteData, 'delete').and.callThrough();
+    spyOn((service as any).patchData, 'update').and.callThrough();
+    spyOn((service as any).searchData, 'searchBy').and.callThrough();
+    spyOn((service as any).searchData, 'getSearchByHref').and.returnValue(observableOf(requestURL));
+  });
+
+  describe('create', () => {
+    it('should proxy the call to createData.create with group UUID', () => {
+      scheduler.schedule(() => service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType));
+      const params = [
+        new RequestParam('uuid', itemUUID),
+        new RequestParam('group', groupUUID),
+        new RequestParam('type', supervisionOrderType),
+      ];
+      scheduler.flush();
+
+      expect((service as any).createData.create).toHaveBeenCalledWith(supervisionOrder, ...params);
+    });
+
+    it('should proxy the call to createData.create with group UUID', () => {
+      scheduler.schedule(() => service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType));
+      const params = [
+        new RequestParam('uuid', itemUUID),
+        new RequestParam('group', groupUUID),
+        new RequestParam('type', supervisionOrderType),
+      ];
+      scheduler.flush();
+
+      expect((service as any).createData.create).toHaveBeenCalledWith(supervisionOrder, ...params);
+    });
+
+    it('should return a RemoteData<supervisionOrder> for the object with the given id', () => {
+      const result = service.create(supervisionOrder, itemUUID, groupUUID, supervisionOrderType);
+      const expected = cold('a|', {
+        a: supervisionOrderRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('delete', () => {
+    it('should proxy the call to deleteData.delete', () => {
+      scheduler.schedule(() => service.delete(supervisionOrderId));
+      scheduler.flush();
+
+      expect((service as any).deleteData.delete).toHaveBeenCalledWith(supervisionOrderId);
+    });
+  });
+
+  describe('update', () => {
+    it('should proxy the call to updateData.update', () => {
+      scheduler.schedule(() => service.update(supervisionOrder));
+      scheduler.flush();
+
+      expect((service as any).patchData.update).toHaveBeenCalledWith(supervisionOrder);
+    });
+  });
+
+  describe('findById', () => {
+    it('should return a RemoteData<supervisionOrder> for the object with the given id', () => {
+      const result = service.findById(supervisionOrderId);
+      const expected = cold('a|', {
+        a: supervisionOrderRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('findByHref', () => {
+    it('should return a RemoteData<supervisionOrder> for the object with the given URL', () => {
+      const result = service.findByHref(requestURL);
+      const expected = cold('a|', {
+        a: supervisionOrderRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('searchByGroup', () => {
+    it('should proxy the call to searchData.searchBy', () => {
+      const options = new FindListOptions();
+      options.searchParams = [new RequestParam('uuid', groupUUID)];
+      scheduler.schedule(() => service.searchByGroup(groupUUID));
+      scheduler.flush();
+
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true);
+    });
+
+    it('should proxy the call to searchData.searchBy with additional search param', () => {
+      const options = new FindListOptions();
+      options.searchParams = [
+        new RequestParam('uuid', groupUUID),
+        new RequestParam('item', itemUUID),
+      ];
+      scheduler.schedule(() => service.searchByGroup(groupUUID, itemUUID));
+      scheduler.flush();
+
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByGroupMethod, options, true, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<supervisionOrder>) for the search', () => {
+      const result = service.searchByGroup(groupUUID);
+      const expected = cold('a|', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+
+  });
+
+  describe('searchByItem', () => {
+    it('should proxy the call to searchData.searchBy', () => {
+      const options = new FindListOptions();
+      options.searchParams = [new RequestParam('uuid', itemUUID)];
+      scheduler.schedule(() => service.searchByItem(itemUUID));
+      scheduler.flush();
+
+      expect((service as any).searchData.searchBy).toHaveBeenCalledWith((service as any).searchByItemMethod, options, true, true);
+    });
+
+    it('should return a RemoteData<PaginatedList<supervisionOrder>) for the search', () => {
+      const result = service.searchByItem(itemUUID);
+      const expected = cold('a|', {
+        a: paginatedListRD,
+      });
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+});
diff --git a/src/app/core/supervision-order/supervision-order-data.service.ts b/src/app/core/supervision-order/supervision-order-data.service.ts
new file mode 100644
index 0000000000..dc0a7f117d
--- /dev/null
+++ b/src/app/core/supervision-order/supervision-order-data.service.ts
@@ -0,0 +1,185 @@
+import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { CreateDataImpl } from '../data/base/create-data';
+import { dataService } from '../data/base/data-service.decorator';
+import { DeleteDataImpl } from '../data/base/delete-data';
+import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import { PatchDataImpl } from '../data/base/patch-data';
+import { SearchDataImpl } from '../data/base/search-data';
+import { DefaultChangeAnalyzer } from '../data/default-change-analyzer.service';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { ResponseParsingService } from '../data/parsing.service';
+import { RemoteData } from '../data/remote-data';
+import { PutRequest } from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { StatusCodeOnlyResponseParsingService } from '../data/status-code-only-response-parsing.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { GroupDataService } from '../eperson/group-data.service';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NoContent } from '../shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../shared/operators';
+import { SupervisionOrder } from './models/supervision-order.model';
+import { SUPERVISION_ORDER } from './models/supervision-order.resource-type';
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the supervisionorders endpoint
+ */
+@Injectable()
+@dataService(SUPERVISION_ORDER)
+export class SupervisionOrderDataService extends IdentifiableDataService<SupervisionOrder> {
+  protected searchByGroupMethod = 'group';
+  protected searchByItemMethod = 'byItem';
+
+  private createData: CreateDataImpl<SupervisionOrder>;
+  private searchData: SearchDataImpl<SupervisionOrder>;
+  private patchData: PatchDataImpl<SupervisionOrder>;
+  private deleteData: DeleteDataImpl<SupervisionOrder>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected comparator: DefaultChangeAnalyzer<SupervisionOrder>,
+    protected groupService: GroupDataService,
+  ) {
+    super('supervisionorders', requestService, rdbService, objectCache, halService);
+
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+    this.searchData = new SearchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+  }
+
+  /**
+   * Create a new SupervisionOrder on the server, and store the response
+   * in the object cache
+   *
+   * @param {SupervisionOrder} supervisionOrder
+   *    The supervision order to create
+   * @param {string} itemUUID
+   *    The uuid of the item that will be grant of the permission.
+   * @param {string} groupUUID
+   *    The uuid of the group that will be grant of the permission.
+   * @param {string} type
+   *    The type of the supervision order that will be grant of the permission.
+   */
+  create(supervisionOrder: SupervisionOrder, itemUUID: string, groupUUID: string, type: string): Observable<RemoteData<SupervisionOrder>> {
+    const params = [];
+    params.push(new RequestParam('uuid', itemUUID));
+    params.push(new RequestParam('group', groupUUID));
+    params.push(new RequestParam('type', type));
+    return this.createData.create(supervisionOrder, ...params);
+  }
+
+  /**
+   * Delete an existing SupervisionOrder on the server
+   *
+   * @param supervisionOrderID The supervision order's id to be removed
+   * @return an observable that emits true when the deletion was successful, false when it failed
+   */
+  delete(supervisionOrderID: string): Observable<boolean> {
+    return this.deleteData.delete(supervisionOrderID).pipe(
+      getFirstCompletedRemoteData(),
+      map((response: RemoteData<NoContent>) => response.hasSucceeded),
+    );
+  }
+
+  /**
+   * 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
+   * @param {SupervisionOrder} object The given object
+   */
+  update(object: SupervisionOrder): Observable<RemoteData<SupervisionOrder>> {
+    return this.patchData.update(object);
+  }
+
+  /**
+   * Return the {@link SupervisionOrder} list for a {@link Group}
+   *
+   * @param UUID                        UUID of a given {@link Group}
+   * @param itemUUID                    Limit the returned policies to the specified DSO
+   * @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
+   */
+  searchByGroup(UUID: string, itemUUID?: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SupervisionOrder>[]): Observable<RemoteData<PaginatedList<SupervisionOrder>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', UUID)];
+    if (isNotEmpty(itemUUID)) {
+      options.searchParams.push(new RequestParam('item', itemUUID));
+    }
+    return this.searchData.searchBy(this.searchByGroupMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Return the {@link SupervisionOrder} list for a given DSO
+   *
+   * @param UUID              UUID of a given DSO
+   * @param action            Limit the returned policies to the specified {@link ActionType}
+   * @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
+   */
+  searchByItem(UUID: string, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<SupervisionOrder>[]): Observable<RemoteData<PaginatedList<SupervisionOrder>>> {
+    const options = new FindListOptions();
+    options.searchParams = [new RequestParam('uuid', UUID)];
+    return this.searchData.searchBy(this.searchByItemMethod, options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+  /**
+   * Update the target of the supervision order
+   * @param supervisionOrderId the ID of the supervision order
+   * @param supervisionOrderHref the link to the supervision order
+   * @param targetUUID the UUID of the target to which the permission is being granted
+   * @param targetType the type of the target (eperson or group) to which the permission is being granted
+   */
+  updateTarget(supervisionOrderId: string, supervisionOrderHref: string, targetUUID: string, targetType: string): Observable<RemoteData<any>> {
+    const targetService = this.groupService;
+    const targetEndpoint$ = targetService.getIDHrefObs(targetUUID);
+
+    const options: HttpOptions = Object.create({});
+    let headers = new HttpHeaders();
+    headers = headers.append('Content-Type', 'text/uri-list');
+    options.headers = headers;
+
+    const requestId = this.requestService.generateRequestId();
+
+    targetEndpoint$.pipe(
+      first(),
+    ).subscribe((targetEndpoint) => {
+      const resourceEndpoint = supervisionOrderHref + '/' + targetType;
+      const request = new PutRequest(requestId, resourceEndpoint, targetEndpoint, options);
+      Object.assign(request, {
+        getResponseParser(): GenericConstructor<ResponseParsingService> {
+          return StatusCodeOnlyResponseParsingService;
+        },
+      });
+      this.requestService.send(request);
+    });
+
+    return this.rdbService.buildFromRequestUUIDAndAwait(requestId, () => this.invalidateByHref(supervisionOrderHref));
+  }
+
+}
diff --git a/src/app/core/tasks/claimed-task-data.service.spec.ts b/src/app/core/tasks/claimed-task-data.service.spec.ts
index 8ff8b38fa8..a0df1e3202 100644
--- a/src/app/core/tasks/claimed-task-data.service.spec.ts
+++ b/src/app/core/tasks/claimed-task-data.service.spec.ts
@@ -1,17 +1,17 @@
 import { HttpHeaders } from '@angular/common/http';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { ClaimedTaskDataService } from './claimed-task-data.service';
-import { of as observableOf } from 'rxjs/internal/observable/of';
 import { RequestParam } from '../cache/models/request-param.model';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FindListOptions } from '../data/find-list-options.model';
 import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { FindListOptions } from '../data/find-list-options.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { ClaimedTaskDataService } from './claimed-task-data.service';
 
 describe('ClaimedTaskDataService', () => {
   let scheduler: TestScheduler;
@@ -28,7 +28,7 @@ describe('ClaimedTaskDataService', () => {
     },
     getObjectBySelfLink: () => {
       /* empty */
-    }
+    },
   } as any;
 
   function initTestService(): ClaimedTaskDataService {
@@ -58,7 +58,7 @@ describe('ClaimedTaskDataService', () => {
     it('should call postToEndpoint method', () => {
       const scopeId = '1234';
       const body = {
-        submit_approve: 'true'
+        submit_approve: 'true',
       };
 
       spyOn(service, 'postToEndpoint');
@@ -110,7 +110,7 @@ describe('ClaimedTaskDataService', () => {
 
       const findListOptions = new FindListOptions();
       findListOptions.searchParams = [
-        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c')
+        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c'),
       ];
 
       expect(service.searchTask).toHaveBeenCalledWith('findByItem', findListOptions);
diff --git a/src/app/core/tasks/claimed-task-data.service.ts b/src/app/core/tasks/claimed-task-data.service.ts
index 4e5c43c146..08dc553b10 100644
--- a/src/app/core/tasks/claimed-task-data.service.ts
+++ b/src/app/core/tasks/claimed-task-data.service.ts
@@ -1,20 +1,21 @@
 import { HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstSucceededRemoteData } from '../shared/operators';
 import { ClaimedTask } from './models/claimed-task-object.model';
 import { CLAIMED_TASK } from './models/claimed-task-object.resource-type';
 import { ProcessTaskResponse } from './models/process-task-response';
 import { TasksService } from './tasks.service';
-import { RemoteData } from '../data/remote-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { getFirstSucceededRemoteData } from '../shared/operators';
-import { FindListOptions } from '../data/find-list-options.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * The service handling all REST requests for ClaimedTask
@@ -94,7 +95,7 @@ export class ClaimedTaskDataService extends TasksService<ClaimedTask> {
   public findByItem(uuid: string): Observable<RemoteData<ClaimedTask>> {
     const options = new FindListOptions();
     options.searchParams = [
-      new RequestParam('uuid', uuid)
+      new RequestParam('uuid', uuid),
     ];
     return this.searchTask('findByItem', options).pipe(getFirstSucceededRemoteData());
   }
diff --git a/src/app/core/tasks/models/advanced-workflow-info.model.ts b/src/app/core/tasks/models/advanced-workflow-info.model.ts
new file mode 100644
index 0000000000..6e5feec357
--- /dev/null
+++ b/src/app/core/tasks/models/advanced-workflow-info.model.ts
@@ -0,0 +1,11 @@
+import { autoserialize } from 'cerialize';
+
+/**
+ * An abstract model class for a {@link AdvancedWorkflowInfo}
+ */
+export abstract class AdvancedWorkflowInfo {
+
+  @autoserialize
+    id: string;
+
+}
diff --git a/src/app/core/tasks/models/advanced-workflow-info.resource-type.ts b/src/app/core/tasks/models/advanced-workflow-info.resource-type.ts
new file mode 100644
index 0000000000..4e7793f875
--- /dev/null
+++ b/src/app/core/tasks/models/advanced-workflow-info.resource-type.ts
@@ -0,0 +1,17 @@
+import { ResourceType } from '../../shared/resource-type';
+
+/**
+ * The resource type for {@link RatingAdvancedWorkflowInfo}
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const RATING_ADVANCED_WORKFLOW_INFO = new ResourceType('ratingrevieweraction');
+
+/**
+ * The resource type for {@link SelectReviewerAdvancedWorkflowInfo}
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const SELECT_REVIEWER_ADVANCED_WORKFLOW_INFO = new ResourceType('selectrevieweraction');
diff --git a/src/app/core/tasks/models/claimed-task-object.model.ts b/src/app/core/tasks/models/claimed-task-object.model.ts
index 3ea78595f2..456c01cc79 100644
--- a/src/app/core/tasks/models/claimed-task-object.model.ts
+++ b/src/app/core/tasks/models/claimed-task-object.model.ts
@@ -1,5 +1,9 @@
 import { inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { CLAIMED_TASK } from './claimed-task-object.resource-type';
 import { TaskObject } from './task-object.model';
 
diff --git a/src/app/core/tasks/models/pool-task-object.model.ts b/src/app/core/tasks/models/pool-task-object.model.ts
index 501849e8ec..a3fb26a4c2 100644
--- a/src/app/core/tasks/models/pool-task-object.model.ts
+++ b/src/app/core/tasks/models/pool-task-object.model.ts
@@ -1,5 +1,9 @@
 import { inheritSerialization } from 'cerialize';
-import { inheritLinkAnnotations, typedObject } from '../../cache/builders/build-decorators';
+
+import {
+  inheritLinkAnnotations,
+  typedObject,
+} from '../../cache/builders/build-decorators';
 import { POOL_TASK } from './pool-task-object.resource-type';
 import { TaskObject } from './task-object.model';
 
diff --git a/src/app/core/tasks/models/process-task-response.ts b/src/app/core/tasks/models/process-task-response.ts
index 95260b665b..400657425d 100644
--- a/src/app/core/tasks/models/process-task-response.ts
+++ b/src/app/core/tasks/models/process-task-response.ts
@@ -5,7 +5,7 @@ export class ProcessTaskResponse {
   constructor(
     private isSuccessful: boolean,
     public statusCode?: number,
-    public errorMessage?: string
+    public errorMessage?: string,
   ) {
   }
 
diff --git a/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts b/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts
new file mode 100644
index 0000000000..892806f7d1
--- /dev/null
+++ b/src/app/core/tasks/models/rating-advanced-workflow-info.model.ts
@@ -0,0 +1,32 @@
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
+import { RATING_ADVANCED_WORKFLOW_INFO } from './advanced-workflow-info.resource-type';
+
+/**
+ * A model class for a {@link RatingAdvancedWorkflowInfo}
+ */
+@typedObject
+@inheritSerialization(AdvancedWorkflowInfo)
+export class RatingAdvancedWorkflowInfo extends AdvancedWorkflowInfo {
+
+  static type: ResourceType = RATING_ADVANCED_WORKFLOW_INFO;
+
+  /**
+   * Whether the description is required.
+   */
+  @autoserialize
+    descriptionRequired: boolean;
+
+  /**
+   * The maximum value.
+   */
+  @autoserialize
+    maxValue: number;
+
+}
diff --git a/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts b/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts
new file mode 100644
index 0000000000..d202593efb
--- /dev/null
+++ b/src/app/core/tasks/models/select-reviewer-advanced-workflow-info.model.ts
@@ -0,0 +1,23 @@
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../cache/builders/build-decorators';
+import { ResourceType } from '../../shared/resource-type';
+import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
+import { SELECT_REVIEWER_ADVANCED_WORKFLOW_INFO } from './advanced-workflow-info.resource-type';
+
+/**
+ * A model class for a {@link SelectReviewerAdvancedWorkflowInfo}
+ */
+@typedObject
+@inheritSerialization(AdvancedWorkflowInfo)
+export class SelectReviewerAdvancedWorkflowInfo extends AdvancedWorkflowInfo {
+
+  static type: ResourceType = SELECT_REVIEWER_ADVANCED_WORKFLOW_INFO;
+
+  @autoserialize
+    group: string;
+
+}
diff --git a/src/app/core/tasks/models/task-object.model.ts b/src/app/core/tasks/models/task-object.model.ts
index dc4aa8b5ae..cea886a1c6 100644
--- a/src/app/core/tasks/models/task-object.model.ts
+++ b/src/app/core/tasks/models/task-object.model.ts
@@ -1,19 +1,26 @@
-import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { link, typedObject } from '../../cache/builders/build-decorators';
 
+import {
+  link,
+  typedObject,
+} from '../../cache/builders/build-decorators';
+import { CacheableObject } from '../../cache/cacheable-object.model';
 import { RemoteData } from '../../data/remote-data';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { EPERSON } from '../../eperson/models/eperson.resource-type';
 import { Group } from '../../eperson/models/group.model';
 import { GROUP } from '../../eperson/models/group.resource-type';
+import { WORKFLOWITEM } from '../../eperson/models/workflowitem.resource-type';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { HALLink } from '../../shared/hal-link.model';
 import { TASK_OBJECT } from './task-object.resource-type';
-import { WORKFLOWITEM } from '../../eperson/models/workflowitem.resource-type';
-import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 import { WorkflowAction } from './workflow-action-object.model';
-import { CacheableObject } from '../../cache/cacheable-object.model';
+import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 
 /**
  * An abstract model class for a TaskObject.
@@ -27,19 +34,19 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    * The task identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The workflow step
    */
   @autoserialize
-  step: string;
+    step: string;
 
   /**
    * The {@link HALLink}s for this TaskObject
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     owner: HALLink;
     group: HALLink;
@@ -52,14 +59,14 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    * Will be undefined unless the eperson {@link HALLink} has been resolved.
    */
   @link(EPERSON, false, 'owner')
-  eperson?: Observable<RemoteData<EPerson>>;
+    eperson?: Observable<RemoteData<EPerson>>;
 
   /**
    * The Group for this task
    * Will be undefined unless the group {@link HALLink} has been resolved.
    */
   @link(GROUP)
-  group?: Observable<RemoteData<Group>>;
+    group?: Observable<RemoteData<Group>>;
 
   /**
    * The WorkflowItem for this task
@@ -67,13 +74,13 @@ export class TaskObject extends DSpaceObject implements CacheableObject {
    */
   @link(WORKFLOWITEM)
   /* This was changed from 'WorkflowItem | Observable<RemoteData<WorkflowItem>>' to 'any' to prevent issues in templates with async */
-  workflowitem?: any;
+    workflowitem?: any;
 
   /**
    * The task action type
    * Will be undefined unless the group {@link HALLink} has been resolved.
    */
   @link(WORKFLOW_ACTION, false, 'action')
-  action: Observable<RemoteData<WorkflowAction>>;
+    action: Observable<RemoteData<WorkflowAction>>;
 
 }
diff --git a/src/app/core/tasks/models/workflow-action-object.model.ts b/src/app/core/tasks/models/workflow-action-object.model.ts
index 720d817859..53ae4249c8 100644
--- a/src/app/core/tasks/models/workflow-action-object.model.ts
+++ b/src/app/core/tasks/models/workflow-action-object.model.ts
@@ -1,6 +1,11 @@
-import { inheritSerialization, autoserialize } from 'cerialize';
+import {
+  autoserialize,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../cache/builders/build-decorators';
 import { DSpaceObject } from '../../shared/dspace-object.model';
+import { AdvancedWorkflowInfo } from './advanced-workflow-info.model';
 import { WORKFLOW_ACTION } from './workflow-action-object.resource-type';
 
 /**
@@ -15,11 +20,30 @@ export class WorkflowAction extends DSpaceObject {
    * The workflow action's identifier
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The options available for this workflow action
    */
   @autoserialize
-  options: string[];
+    options: string[];
+
+  /**
+   * Whether this action has advanced options
+   */
+  @autoserialize
+    advanced: boolean;
+
+  /**
+   * The advanced options that the user can select at this action
+   */
+  @autoserialize
+    advancedOptions: string[];
+
+  /**
+   * The advanced info required by the advanced options
+   */
+  @autoserialize
+    advancedInfo: AdvancedWorkflowInfo[];
+
 }
diff --git a/src/app/core/tasks/pool-task-data.service.spec.ts b/src/app/core/tasks/pool-task-data.service.spec.ts
index c346e81150..266c3c6223 100644
--- a/src/app/core/tasks/pool-task-data.service.spec.ts
+++ b/src/app/core/tasks/pool-task-data.service.spec.ts
@@ -1,17 +1,17 @@
 import { HttpHeaders } from '@angular/common/http';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { PoolTaskDataService } from './pool-task-data.service';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { of as observableOf } from 'rxjs';
 import { RequestParam } from '../cache/models/request-param.model';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { FindListOptions } from '../data/find-list-options.model';
 import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { FindListOptions } from '../data/find-list-options.model';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { PoolTaskDataService } from './pool-task-data.service';
 
 describe('PoolTaskDataService', () => {
   let scheduler: TestScheduler;
@@ -27,7 +27,7 @@ describe('PoolTaskDataService', () => {
     },
     getObjectBySelfLink: () => {
       /* empty */
-    }
+    },
   } as any;
 
   function initTestService(): PoolTaskDataService {
@@ -63,7 +63,7 @@ describe('PoolTaskDataService', () => {
 
       const findListOptions = new FindListOptions();
       findListOptions.searchParams = [
-        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c')
+        new RequestParam('uuid', 'a0db0fde-1d12-4d43-bd0d-0f43df8d823c'),
       ];
 
       expect(service.searchTask).toHaveBeenCalledWith('findByItem', findListOptions);
diff --git a/src/app/core/tasks/pool-task-data.service.ts b/src/app/core/tasks/pool-task-data.service.ts
index ec44184934..224ca94675 100644
--- a/src/app/core/tasks/pool-task-data.service.ts
+++ b/src/app/core/tasks/pool-task-data.service.ts
@@ -1,18 +1,18 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
+
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { RequestParam } from '../cache/models/request-param.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
+import { dataService } from '../data/base/data-service.decorator';
+import { FindListOptions } from '../data/find-list-options.model';
+import { RemoteData } from '../data/remote-data';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { getFirstCompletedRemoteData } from '../shared/operators';
 import { PoolTask } from './models/pool-task-object.model';
 import { POOL_TASK } from './models/pool-task-object.resource-type';
 import { TasksService } from './tasks.service';
-import { RemoteData } from '../data/remote-data';
-import { RequestParam } from '../cache/models/request-param.model';
-import { getFirstCompletedRemoteData } from '../shared/operators';
-import { FindListOptions } from '../data/find-list-options.model';
-import { dataService } from '../data/base/data-service.decorator';
 
 /**
  * The service handling all REST requests for PoolTask
@@ -47,7 +47,7 @@ export class PoolTaskDataService extends TasksService<PoolTask> {
   public findByItem(uuid: string): Observable<RemoteData<PoolTask>> {
     const options = new FindListOptions();
     options.searchParams = [
-      new RequestParam('uuid', uuid)
+      new RequestParam('uuid', uuid),
     ];
     return this.searchTask('findByItem', options).pipe(getFirstCompletedRemoteData());
   }
diff --git a/src/app/core/tasks/task-response-parsing.service.ts b/src/app/core/tasks/task-response-parsing.service.ts
index e2e009386f..1d4ab641f4 100644
--- a/src/app/core/tasks/task-response-parsing.service.ts
+++ b/src/app/core/tasks/task-response-parsing.service.ts
@@ -1,12 +1,11 @@
 import { Injectable } from '@angular/core';
 
-import { ResponseParsingService } from '../data/parsing.service';
-import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
-
-import { BaseResponseParsingService } from '../data/base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { ParsedResponse } from '../cache/response.models';
+import { BaseResponseParsingService } from '../data/base-response-parsing.service';
+import { ResponseParsingService } from '../data/parsing.service';
 import { RestRequest } from '../data/rest-request.model';
+import { RawRestResponse } from '../dspace-rest/raw-rest-response.model';
 
 /**
  * Provides methods to parse response for a task request.
diff --git a/src/app/core/tasks/tasks.service.spec.ts b/src/app/core/tasks/tasks.service.spec.ts
index 249a5e01f2..8c1d33d953 100644
--- a/src/app/core/tasks/tasks.service.spec.ts
+++ b/src/app/core/tasks/tasks.service.spec.ts
@@ -1,26 +1,32 @@
 /* eslint-disable max-classes-per-file */
+import { HttpHeaders } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+import {
+  compare,
+  Operation,
+} from 'fast-json-patch';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { getMockRequestService } from '../../shared/mocks/request.service.mock';
-import { TasksService } from './tasks.service';
-import { RequestService } from '../data/request.service';
-import { TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { TaskObject } from './models/task-object.model';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../cache/object-cache.service';
-import { HttpHeaders } from '@angular/common/http';
-import { ChangeAnalyzer } from '../data/change-analyzer';
-import { compare, Operation } from 'fast-json-patch';
-import { of as observableOf } from 'rxjs';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
 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 { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core-state.model';
-import { FindListOptions } from '../data/find-list-options.model';
 import { testSearchDataImplementation } from '../data/base/search-data.spec';
+import { ChangeAnalyzer } from '../data/change-analyzer';
+import { FindListOptions } from '../data/find-list-options.model';
+import {
+  TaskDeleteRequest,
+  TaskPostRequest,
+} from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { TaskObject } from './models/task-object.model';
+import { TasksService } from './tasks.service';
 
 const LINK_NAME = 'test';
 
@@ -62,7 +68,7 @@ describe('TasksService', () => {
     },
     getObjectBySelfLink: () => {
       /* empty */
-    }
+    },
   } as any;
   const store = {} as Store<CoreState>;
 
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index aaad31af21..2920fe4ac8 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -1,23 +1,44 @@
 import { HttpHeaders } from '@angular/common/http';
-
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, tap } from 'rxjs/operators';
-import { DeleteRequest, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { HttpOptions } from '../dspace-rest/dspace-rest.service';
-import { ProcessTaskResponse } from './models/process-task-response';
-import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../shared/operators';
-import { RemoteData } from '../data/remote-data';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { CacheableObject } from '../cache/cacheable-object.model';
-import { FindListOptions } from '../data/find-list-options.model';
-import { SearchData, SearchDataImpl } from '../data/base/search-data';
-import { RequestService } from '../data/request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { CacheableObject } from '../cache/cacheable-object.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { PaginatedList } from '../data/paginated-list.model';
 import { IdentifiableDataService } from '../data/base/identifiable-data.service';
+import {
+  SearchData,
+  SearchDataImpl,
+} from '../data/base/search-data';
+import { FindListOptions } from '../data/find-list-options.model';
+import { PaginatedList } from '../data/paginated-list.model';
+import { RemoteData } from '../data/remote-data';
+import {
+  DeleteRequest,
+  PostRequest,
+  TaskDeleteRequest,
+  TaskPostRequest,
+} from '../data/request.models';
+import { RequestService } from '../data/request.service';
+import { HttpOptions } from '../dspace-rest/dspace-rest.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import {
+  getAllCompletedRemoteData,
+  getFirstCompletedRemoteData,
+} from '../shared/operators';
+import { ProcessTaskResponse } from './models/process-task-response';
 
 /**
  * An abstract class that provides methods to handle task requests.  todo: data in name
@@ -124,8 +145,8 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
       find((href: string) => hasValue(href)),
       mergeMap((href) => this.findByHref(href, false, true).pipe(
         getAllCompletedRemoteData(),
-        tap(() => this.requestService.setStaleByHrefSubstring(href)))
-      )
+        tap(() => this.requestService.setStaleByHrefSubstring(href))),
+      ),
     );
   }
 
@@ -146,7 +167,7 @@ export abstract class TasksService<T extends CacheableObject> extends Identifiab
         } else {
           return new ProcessTaskResponse(true, response.statusCode);
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/core/url-combiner/rest-url-combiner.ts b/src/app/core/url-combiner/rest-url-combiner.ts
index ef3a176a32..e3667dbe29 100644
--- a/src/app/core/url-combiner/rest-url-combiner.ts
+++ b/src/app/core/url-combiner/rest-url-combiner.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from './url-combiner';
 import { environment } from '../../../environments/environment';
+import { URLCombiner } from './url-combiner';
 
 /**
  * Combines a variable number of strings representing parts
diff --git a/src/app/core/url-combiner/ui-url-combiner.ts b/src/app/core/url-combiner/ui-url-combiner.ts
index 534c5620b5..2dae5217d7 100644
--- a/src/app/core/url-combiner/ui-url-combiner.ts
+++ b/src/app/core/url-combiner/ui-url-combiner.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from './url-combiner';
 import { environment } from '../../../environments/environment';
+import { URLCombiner } from './url-combiner';
 
 /**
  * Combines a variable number of strings representing parts
diff --git a/src/app/core/utilities/enter-zone.scheduler.ts b/src/app/core/utilities/enter-zone.scheduler.ts
index 96aee7d9a5..6c95eae263 100644
--- a/src/app/core/utilities/enter-zone.scheduler.ts
+++ b/src/app/core/utilities/enter-zone.scheduler.ts
@@ -1,5 +1,8 @@
-import { SchedulerLike, Subscription } from 'rxjs';
 import { NgZone } from '@angular/core';
+import {
+  SchedulerLike,
+  Subscription,
+} from 'rxjs';
 
 /**
  *  An RXJS scheduler that will re-enter the Angular zone to run what's scheduled
@@ -9,7 +12,7 @@ export class EnterZoneScheduler implements SchedulerLike {
 
   schedule(...args: any[]): Subscription {
     return this.zone.run(() =>
-      this.scheduler.schedule.apply(this.scheduler, args)
+      this.scheduler.schedule.apply(this.scheduler, args),
     );
   }
 
diff --git a/src/app/core/utilities/equals.decorators.ts b/src/app/core/utilities/equals.decorators.ts
index 159d8a70c1..78bfd01740 100644
--- a/src/app/core/utilities/equals.decorators.ts
+++ b/src/app/core/utilities/equals.decorators.ts
@@ -1,4 +1,8 @@
-import { hasNoValue, hasValue, isEmpty } from '../../shared/empty.util';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
 import { GenericConstructor } from '../shared/generic-constructor';
 
 const excludedFromEquals = new Map();
diff --git a/src/app/core/utilities/equatable.spec.ts b/src/app/core/utilities/equatable.spec.ts
index d45010980e..808c21b39f 100644
--- a/src/app/core/utilities/equatable.spec.ts
+++ b/src/app/core/utilities/equatable.spec.ts
@@ -1,6 +1,11 @@
 /* eslint-disable max-classes-per-file */
-import { EquatableObject, excludeFromEquals, fieldsForEquals } from './equals.decorators';
-import { cloneDeep } from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+
+import {
+  EquatableObject,
+  excludeFromEquals,
+  fieldsForEquals,
+} from './equals.decorators';
 
 class Dog extends EquatableObject<Dog> {
   public name: string;
@@ -16,12 +21,12 @@ class Dog extends EquatableObject<Dog> {
 
 class Owner extends EquatableObject<Owner> {
   @excludeFromEquals
-  favouriteFood: string;
+    favouriteFood: string;
 
   constructor(
     public name: string,
     public age: number,
-    favouriteFood: string
+    favouriteFood: string,
   ) {
     super();
     this.favouriteFood = favouriteFood;
diff --git a/src/app/core/utilities/leave-zone.scheduler.ts b/src/app/core/utilities/leave-zone.scheduler.ts
index 2587563661..47d1400b4e 100644
--- a/src/app/core/utilities/leave-zone.scheduler.ts
+++ b/src/app/core/utilities/leave-zone.scheduler.ts
@@ -1,5 +1,8 @@
-import { SchedulerLike, Subscription } from 'rxjs';
 import { NgZone } from '@angular/core';
+import {
+  SchedulerLike,
+  Subscription,
+} from 'rxjs';
 
 /**
  * An RXJS scheduler that will run what's scheduled outside of the Angular zone
@@ -9,7 +12,7 @@ export class LeaveZoneScheduler implements SchedulerLike {
 
   schedule(...args: any[]): Subscription {
     return this.zone.runOutsideAngular(() =>
-      this.scheduler.schedule.apply(this.scheduler, args)
+      this.scheduler.schedule.apply(this.scheduler, args),
     );
   }
 
diff --git a/src/app/core/xsrf/xsrf.constants.ts b/src/app/core/xsrf/xsrf.constants.ts
new file mode 100644
index 0000000000..64da5d674e
--- /dev/null
+++ b/src/app/core/xsrf/xsrf.constants.ts
@@ -0,0 +1,33 @@
+/**
+ * XSRF / CSRF related constants
+ */
+
+/**
+ * Name of CSRF/XSRF header we (client) may SEND in requests to backend.
+ * (This is a standard header name for XSRF/CSRF defined by Angular)
+ */
+export const XSRF_REQUEST_HEADER = 'X-XSRF-TOKEN';
+
+/**
+ * Name of CSRF/XSRF header we (client) may RECEIVE in responses from backend
+ * This header is defined by DSpace backend, see https://github.com/DSpace/RestContract/blob/main/csrf-tokens.md
+ */
+export const XSRF_RESPONSE_HEADER = 'DSPACE-XSRF-TOKEN';
+
+/**
+ * Name of client-side Cookie where we store the CSRF/XSRF token between requests.
+ * This cookie is only available to client, and should be updated whenever a new XSRF_RESPONSE_HEADER
+ * is found in a response from the backend.
+ */
+export const XSRF_COOKIE = 'XSRF-TOKEN';
+
+/**
+ * Name of server-side cookie the backend expects the XSRF token to be in.
+ * When the backend receives a modifying request, it will validate the CSRF/XSRF token by looking
+ * for a match between the XSRF_REQUEST_HEADER and this Cookie. For more details see
+ * https://github.com/DSpace/RestContract/blob/main/csrf-tokens.md
+ *
+ * NOTE: This Cookie is NOT readable to the client/UI. It is only readable to the backend and will
+ * be sent along automatically by the user's browser.
+ */
+export const DSPACE_XSRF_COOKIE = 'DSPACE-XSRF-COOKIE';
diff --git a/src/app/core/xsrf/xsrf.interceptor.spec.ts b/src/app/core/xsrf/xsrf.interceptor.spec.ts
index 742c4a4a45..1668407e04 100644
--- a/src/app/core/xsrf/xsrf.interceptor.spec.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.spec.ts
@@ -1,12 +1,21 @@
+import {
+  HTTP_INTERCEPTORS,
+  HttpHeaders,
+  HttpXsrfTokenExtractor,
+} from '@angular/common/http';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-import { HttpHeaders, HTTP_INTERCEPTORS, HttpXsrfTokenExtractor } from '@angular/common/http';
-import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
-import { RestRequestMethod } from '../data/rest-request-method';
-import { CookieService } from '../services/cookie.service';
+
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
-import { XsrfInterceptor } from './xsrf.interceptor';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
+import { RequestError } from '../data/request-error.model';
+import { RestRequestMethod } from '../data/rest-request-method';
+import { DspaceRestService } from '../dspace-rest/dspace-rest.service';
+import { CookieService } from '../services/cookie.service';
+import { XsrfInterceptor } from './xsrf.interceptor';
 
 describe(`XsrfInterceptor`, () => {
   let service: DspaceRestService;
@@ -19,7 +28,7 @@ describe(`XsrfInterceptor`, () => {
   // Mock payload/statuses are dummy content as we are not testing the results
   // of any below requests. We are only testing for X-XSRF-TOKEN header.
   const mockPayload = {
-    id: 1
+    id: 1,
   };
   const mockStatusCode = 200;
   const mockStatusText = 'SUCCESS';
@@ -35,7 +44,7 @@ describe(`XsrfInterceptor`, () => {
           multi: true,
         },
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock(testToken) },
-        { provide: CookieService, useValue: new CookieServiceMock() }
+        { provide: CookieService, useValue: new CookieServiceMock() },
       ],
     });
 
@@ -67,7 +76,7 @@ describe(`XsrfInterceptor`, () => {
     expect(httpRequest.request.headers.has('X-XSRF-TOKEN')).toBeTrue();
     expect(httpRequest.request.withCredentials).toBeTrue();
     const token = httpRequest.request.headers.get('X-XSRF-TOKEN');
-    expect(token).toBeDefined();
+    expect(token).not.toBeNull();
     expect(token).toBe(testToken.toString());
 
     httpRequest.flush(mockPayload, { status: mockStatusCode, statusText: mockStatusText });
@@ -116,11 +125,11 @@ describe(`XsrfInterceptor`, () => {
       // ensure mock XSRF token is in response
       expect(response.headers.has('DSPACE-XSRF-TOKEN')).toBeTrue();
       const token = response.headers.get('DSPACE-XSRF-TOKEN');
-      expect(token).toBeDefined();
+      expect(token).not.toBeNull();
       expect(token).toBe(mockNewXSRFToken.toString());
 
       // ensure our XSRF-TOKEN cookie exists & has the same value as the new DSPACE-XSRF-TOKEN header
-      expect(cookieService.get('XSRF-TOKEN')).toBeDefined();
+      expect(cookieService.get('XSRF-TOKEN')).not.toBeNull();
       expect(cookieService.get('XSRF-TOKEN')).toBe(mockNewXSRFToken.toString());
 
       done();
@@ -132,7 +141,7 @@ describe(`XsrfInterceptor`, () => {
     httpRequest.flush(mockPayload, {
       headers: new HttpHeaders().set('DSPACE-XSRF-TOKEN', mockNewXSRFToken),
       status: mockStatusCode,
-      statusText: mockStatusText
+      statusText: mockStatusText,
     });
   });
 
@@ -145,19 +154,20 @@ describe(`XsrfInterceptor`, () => {
     const mockErrorMessage = 'CSRF token mismatch';
 
     service.request(RestRequestMethod.GET, 'server/api/core/items').subscribe({
-      error: (error) => {
+      error: (error: unknown) => {
         expect(error).toBeTruthy();
+        expect(error instanceof RequestError).toBeTrue();
 
         // ensure mock error (added in below flush() call) is returned.
-        expect(error.statusCode).toBe(mockErrorCode);
-        expect(error.statusText).toBe(mockErrorText);
+        expect((error as RequestError).statusCode).toBe(mockErrorCode);
+        expect((error as RequestError).statusText).toBe(mockErrorText);
 
         // ensure our XSRF-TOKEN cookie exists & has the same value as the new DSPACE-XSRF-TOKEN header
-        expect(cookieService.get('XSRF-TOKEN')).toBeDefined();
+        expect(cookieService.get('XSRF-TOKEN')).not.toBeNull();
         expect(cookieService.get('XSRF-TOKEN')).toBe(mockNewXSRFToken.toString());
 
         done();
-      }
+      },
     });
 
     const httpRequest = httpMock.expectOne('server/api/core/items');
@@ -166,7 +176,7 @@ describe(`XsrfInterceptor`, () => {
     httpRequest.flush(mockErrorMessage, {
       headers: new HttpHeaders().set('DSPACE-XSRF-TOKEN', mockNewXSRFToken),
       status: mockErrorCode,
-      statusText: mockErrorText
+      statusText: mockErrorText,
     });
   });
 
diff --git a/src/app/core/xsrf/xsrf.interceptor.ts b/src/app/core/xsrf/xsrf.interceptor.ts
index d527924a28..91e780590b 100644
--- a/src/app/core/xsrf/xsrf.interceptor.ts
+++ b/src/app/core/xsrf/xsrf.interceptor.ts
@@ -1,4 +1,3 @@
-import { Injectable } from '@angular/core';
 import {
   HttpErrorResponse,
   HttpEvent,
@@ -6,19 +5,25 @@ import {
   HttpInterceptor,
   HttpRequest,
   HttpResponse,
-  HttpXsrfTokenExtractor
+  HttpXsrfTokenExtractor,
 } from '@angular/common/http';
-import { Observable, throwError } from 'rxjs';
-import { tap, catchError } from 'rxjs/operators';
-import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
-import { CookieService } from '../services/cookie.service';
+import { Injectable } from '@angular/core';
+import {
+  Observable,
+  throwError,
+} from 'rxjs';
+import {
+  catchError,
+  tap,
+} from 'rxjs/operators';
 
-// Name of XSRF header we may send in requests to backend (this is a standard name defined by Angular)
-export const XSRF_REQUEST_HEADER = 'X-XSRF-TOKEN';
-// Name of XSRF header we may receive in responses from backend
-export const XSRF_RESPONSE_HEADER = 'DSPACE-XSRF-TOKEN';
-// Name of cookie where we store the XSRF token
-export const XSRF_COOKIE = 'XSRF-TOKEN';
+import { CookieService } from '../services/cookie.service';
+import { RESTURLCombiner } from '../url-combiner/rest-url-combiner';
+import {
+  XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+} from './xsrf.constants';
 
 /**
  * Custom Http Interceptor intercepting Http Requests & Responses to
@@ -48,79 +53,79 @@ export const XSRF_COOKIE = 'XSRF-TOKEN';
 @Injectable()
 export class XsrfInterceptor implements HttpInterceptor {
 
-    constructor(private tokenExtractor: HttpXsrfTokenExtractor, private cookieService: CookieService) {
-    }
+  constructor(private tokenExtractor: HttpXsrfTokenExtractor, private cookieService: CookieService) {
+  }
 
-    /**
+  /**
      * Intercept http requests and add the XSRF/CSRF token to the X-Forwarded-For header
      * @param httpRequest
      * @param next
      */
-    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-        // Ensure EVERY request from Angular includes "withCredentials: true".
-        // This allows Angular to receive & send cookies via a CORS request (to
-        // the backend). ONLY requests with credentials will:
-        // 1. Ensure a user's browser sends the server-side XSRF cookie back to
-        //    the backend
-        // 2. Ensure a user's browser saves changes to the server-side XSRF
-        //    cookie (to ensure it is kept in sync with client side cookie)
-        req = req.clone({ withCredentials: true });
+  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    // Ensure EVERY request from Angular includes "withCredentials: true".
+    // This allows Angular to receive & send cookies via a CORS request (to
+    // the backend). ONLY requests with credentials will:
+    // 1. Ensure a user's browser sends the server-side XSRF cookie back to
+    //    the backend
+    // 2. Ensure a user's browser saves changes to the server-side XSRF
+    //    cookie (to ensure it is kept in sync with client side cookie)
+    req = req.clone({ withCredentials: true });
 
-        // Get request URL
-        const reqUrl = req.url.toLowerCase();
+    // Get request URL
+    const reqUrl = req.url.toLowerCase();
 
-        // Get root URL of configured REST API
-        const restUrl = new RESTURLCombiner('/').toString().toLowerCase();
+    // Get root URL of configured REST API
+    const restUrl = new RESTURLCombiner('/').toString().toLowerCase();
 
-        // Skip any non-mutating request. This is because our REST API does NOT
-        // require CSRF verification for read-only requests like GET or HEAD
-        // Also skip any request which is NOT to our trusted/configured REST API
-        if (req.method !== 'GET' && req.method !== 'HEAD' && reqUrl.startsWith(restUrl)) {
-            // parse token from XSRF-TOKEN (client-side) cookie
-            const token = this.tokenExtractor.getToken() as string;
+    // Skip any non-mutating request. This is because our REST API does NOT
+    // require CSRF verification for read-only requests like GET or HEAD
+    // Also skip any request which is NOT to our trusted/configured REST API
+    if (req.method !== 'GET' && req.method !== 'HEAD' && reqUrl.startsWith(restUrl)) {
+      // parse token from XSRF-TOKEN (client-side) cookie
+      const token = this.tokenExtractor.getToken() as string;
 
-            // send token in request's X-XSRF-TOKEN header (anti-CSRF security) to backend
-            if (token !== null && !req.headers.has(XSRF_REQUEST_HEADER)) {
-                req = req.clone({ headers: req.headers.set(XSRF_REQUEST_HEADER, token) });
-            }
-        }
-        // Pass to next interceptor, but intercept EVERY response event as well
-        return next.handle(req).pipe(
-            // Check event that came back...is it an HttpResponse from backend?
-            tap((response) => {
-                if (response instanceof HttpResponse) {
-                    // For every response that comes back, check for the custom
-                    // DSPACE-XSRF-TOKEN header sent from the backend.
-                    if (response.headers.has(XSRF_RESPONSE_HEADER)) {
-                        // value of header is a new XSRF token
-                        this.saveXsrfToken(response.headers.get(XSRF_RESPONSE_HEADER));
-                    }
-                }
-            }),
-            catchError((error) => {
-                if (error instanceof HttpErrorResponse) {
-                    // For every error that comes back, also check for the custom
-                    // DSPACE-XSRF-TOKEN header sent from the backend.
-                    if (error.headers.has(XSRF_RESPONSE_HEADER)) {
-                        // value of header is a new XSRF token
-                        this.saveXsrfToken(error.headers.get(XSRF_RESPONSE_HEADER));
-                    }
-                }
-                // Return error response as is.
-                return throwError(error);
-            })
-        ) as any;
+      // send token in request's X-XSRF-TOKEN header (anti-CSRF security) to backend
+      if (token !== null && !req.headers.has(XSRF_REQUEST_HEADER)) {
+        req = req.clone({ headers: req.headers.set(XSRF_REQUEST_HEADER, token) });
+      }
     }
+    // Pass to next interceptor, but intercept EVERY response event as well
+    return next.handle(req).pipe(
+      // Check event that came back...is it an HttpResponse from backend?
+      tap((response) => {
+        if (response instanceof HttpResponse) {
+          // For every response that comes back, check for the custom
+          // DSPACE-XSRF-TOKEN header sent from the backend.
+          if (response.headers.has(XSRF_RESPONSE_HEADER)) {
+            // value of header is a new XSRF token
+            this.saveXsrfToken(response.headers.get(XSRF_RESPONSE_HEADER));
+          }
+        }
+      }),
+      catchError((error: unknown) => {
+        if (error instanceof HttpErrorResponse) {
+          // For every error that comes back, also check for the custom
+          // DSPACE-XSRF-TOKEN header sent from the backend.
+          if (error.headers.has(XSRF_RESPONSE_HEADER)) {
+            // value of header is a new XSRF token
+            this.saveXsrfToken(error.headers.get(XSRF_RESPONSE_HEADER));
+          }
+        }
+        // Return error response as is.
+        return throwError(error);
+      }),
+    ) as any;
+  }
 
-    /**
+  /**
      * Save XSRF token found in response
      * @param token token found
      */
-    private saveXsrfToken(token: string) {
-        // Save token value as a *new* value of our client-side XSRF-TOKEN cookie.
-        // This is the cookie that is parsed by Angular's tokenExtractor(),
-        // which we will send back in the X-XSRF-TOKEN header per Angular best practices.
-        this.cookieService.remove(XSRF_COOKIE);
-        this.cookieService.set(XSRF_COOKIE, token);
-    }
+  private saveXsrfToken(token: string) {
+    // Save token value as a *new* value of our client-side XSRF-TOKEN cookie.
+    // This is the cookie that is parsed by Angular's tokenExtractor(),
+    // which we will send back in the X-XSRF-TOKEN header per Angular best practices.
+    this.cookieService.remove(XSRF_COOKIE);
+    this.cookieService.set(XSRF_COOKIE, token);
+  }
 }
diff --git a/src/app/correlation-id/correlation-id.actions.ts b/src/app/correlation-id/correlation-id.actions.ts
index d57d41a637..2f7edcabd9 100644
--- a/src/app/correlation-id/correlation-id.actions.ts
+++ b/src/app/correlation-id/correlation-id.actions.ts
@@ -1,8 +1,9 @@
-import { type } from '../shared/ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../shared/ngrx/type';
+
 export const CorrelationIDActionTypes = {
-  SET: type('dspace/core/correlationId/SET')
+  SET: type('dspace/core/correlationId/SET'),
 };
 
 /**
diff --git a/src/app/correlation-id/correlation-id.reducer.spec.ts b/src/app/correlation-id/correlation-id.reducer.spec.ts
index c784def1d9..876bd93114 100644
--- a/src/app/correlation-id/correlation-id.reducer.spec.ts
+++ b/src/app/correlation-id/correlation-id.reducer.spec.ts
@@ -1,5 +1,5 @@
-import { correlationIdReducer } from './correlation-id.reducer';
 import { SetCorrelationIdAction } from './correlation-id.actions';
+import { correlationIdReducer } from './correlation-id.reducer';
 
 describe('correlationIdReducer', () => {
   it('should set the correlatinId with SET action', () => {
diff --git a/src/app/correlation-id/correlation-id.reducer.ts b/src/app/correlation-id/correlation-id.reducer.ts
index d18c7bc83e..6555196848 100644
--- a/src/app/correlation-id/correlation-id.reducer.ts
+++ b/src/app/correlation-id/correlation-id.reducer.ts
@@ -1,4 +1,8 @@
-import { CorrelationIdAction, CorrelationIDActionTypes, SetCorrelationIdAction } from './correlation-id.actions';
+import {
+  CorrelationIdAction,
+  CorrelationIDActionTypes,
+  SetCorrelationIdAction,
+} from './correlation-id.actions';
 
 const initialState = null;
 
diff --git a/src/app/correlation-id/correlation-id.service.spec.ts b/src/app/correlation-id/correlation-id.service.spec.ts
index 64a4d1068a..5108ee1713 100644
--- a/src/app/correlation-id/correlation-id.service.spec.ts
+++ b/src/app/correlation-id/correlation-id.service.spec.ts
@@ -1,11 +1,19 @@
-import { CorrelationIdService } from './correlation-id.service';
-import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
-import { UUIDService } from '../core/shared/uuid.service';
-import { MockStore, provideMockStore } from '@ngrx/store/testing';
 import { TestBed } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { appReducers, AppState, storeModuleConfig } from '../app.reducer';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { MockStore } from '@ngrx/store/testing';
+
+import {
+  appReducers,
+  AppState,
+  storeModuleConfig,
+} from '../app.reducer';
+import { UUIDService } from '../core/shared/uuid.service';
+import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
 import { SetCorrelationIdAction } from './correlation-id.actions';
+import { CorrelationIdService } from './correlation-id.service';
 
 describe('CorrelationIdService', () => {
   let service: CorrelationIdService;
diff --git a/src/app/correlation-id/correlation-id.service.ts b/src/app/correlation-id/correlation-id.service.ts
index b14ea803fe..057708b954 100644
--- a/src/app/correlation-id/correlation-id.service.ts
+++ b/src/app/correlation-id/correlation-id.service.ts
@@ -1,18 +1,22 @@
+import { Injectable } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { take } from 'rxjs/operators';
+
+import { AppState } from '../app.reducer';
 import { CookieService } from '../core/services/cookie.service';
 import { UUIDService } from '../core/shared/uuid.service';
-import { Store, select } from '@ngrx/store';
-import { AppState } from '../app.reducer';
 import { isEmpty } from '../shared/empty.util';
-import { take } from 'rxjs/operators';
 import { SetCorrelationIdAction } from './correlation-id.actions';
-import { Injectable } from '@angular/core';
 import { correlationIdSelector } from './correlation-id.selector';
 
 /**
  * Service to manage the correlation id, an id used to give context to server side logs
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class CorrelationIdService {
 
@@ -53,7 +57,7 @@ export class CorrelationIdService {
 
     this.store.pipe(
       select(correlationIdSelector),
-      take(1)
+      take(1),
     ).subscribe((storeId: string) => {
       // we can do this because ngrx selects are synchronous
       correlationId = storeId;
diff --git a/src/app/curation-form/curation-form.component.spec.ts b/src/app/curation-form/curation-form.component.spec.ts
index dc70b925e8..18bb6961c2 100644
--- a/src/app/curation-form/curation-form.component.spec.ts
+++ b/src/app/curation-form/curation-form.component.spec.ts
@@ -1,21 +1,35 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { CurationFormComponent } from './curation-form.component';
-import { ScriptDataService } from '../core/data/processes/script-data.service';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
-import { Process } from '../process-page/processes/process.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
-import { RouterStub } from '../shared/testing/router.stub';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { Router } from '@angular/router';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+import { Process } from '../process-page/processes/process.model';
 import { HandleService } from '../shared/handle.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { CurationFormComponent } from './curation-form.component';
 
 describe('CurationFormComponent', () => {
   let comp: CurationFormComponent;
@@ -28,16 +42,16 @@ describe('CurationFormComponent', () => {
   let notificationsService;
   let router;
 
-  const process = Object.assign(new Process(), {processId: 'process-id'});
+  const process = Object.assign(new Process(), { processId: 'process-id' });
 
   beforeEach(waitForAsync(() => {
 
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
-      invoke: createSuccessfulRemoteDataObject$(process)
+      invoke: createSuccessfulRemoteDataObject$(process),
     });
 
     processDataService = jasmine.createSpyObj('processDataService', {
-      findByHref: createSuccessfulRemoteDataObject$(process)
+      findByHref: createSuccessfulRemoteDataObject$(process),
     });
 
     configurationDataService = jasmine.createSpyObj('configurationDataService', {
@@ -48,13 +62,13 @@ describe('CurationFormComponent', () => {
           '',
           'org.dspace.ctask.general.RequiredMetadata = requiredmetadata',
           'org.dspace.ctask.general.MetadataValueLinkChecker = checklinks',
-          'value-to-be-skipped'
-        ]
-      }))
+          'value-to-be-skipped',
+        ],
+      })),
     });
 
     handleService = {
-      normalizeHandle: (a) => a
+      normalizeHandle: (a: string) => observableOf(a),
     } as any;
 
     notificationsService = new NotificationsServiceStub();
@@ -68,10 +82,10 @@ describe('CurationFormComponent', () => {
         { provide: ProcessDataService, useValue: processDataService },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: HandleService, useValue: handleService },
-        { provide: Router, useValue: router},
+        { provide: Router, useValue: router },
         { provide: ConfigurationDataService, useValue: configurationDataService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -110,8 +124,8 @@ describe('CurationFormComponent', () => {
       comp.submit();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-        {name: '-t', value: 'profileformats'},
-        {name: '-i', value: 'test-handle'},
+        { name: '-t', value: 'profileformats' },
+        { name: '-i', value: 'test-handle' },
       ], []);
       expect(notificationsService.success).toHaveBeenCalled();
       expect(router.navigateByUrl).toHaveBeenCalledWith(getProcessDetailRoute('process-id'));
@@ -123,8 +137,8 @@ describe('CurationFormComponent', () => {
       comp.submit();
 
       expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-        {name: '-t', value: 'profileformats'},
-        {name: '-i', value: 'test-handle'},
+        { name: '-t', value: 'profileformats' },
+        { name: '-i', value: 'test-handle' },
       ], []);
       expect(notificationsService.error).toHaveBeenCalled();
       expect(processDataService.findByHref).not.toHaveBeenCalled();
@@ -137,8 +151,8 @@ describe('CurationFormComponent', () => {
     comp.submit();
 
     expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-      {name: '-t', value: 'profileformats'},
-      {name: '-i', value: 'form-handle'},
+      { name: '-t', value: 'profileformats' },
+      { name: '-i', value: 'form-handle' },
     ], []);
   });
   it('should use "all" when the handle provided by the form is empty and when no dsoHandle is provided', () => {
@@ -146,17 +160,18 @@ describe('CurationFormComponent', () => {
     comp.submit();
 
     expect(scriptDataService.invoke).toHaveBeenCalledWith('curate', [
-      {name: '-t', value: 'profileformats'},
-      {name: '-i', value: 'all'},
+      { name: '-t', value: 'profileformats' },
+      { name: '-i', value: 'all' },
     ], []);
   });
 
-  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 422c955037..74287b567c 100644
--- a/src/app/curation-form/curation-form.component.ts
+++ b/src/app/curation-form/curation-form.component.ts
@@ -1,65 +1,91 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { ScriptDataService } from '../core/data/processes/script-data.service';
-import { FormControl, FormGroup } from '@angular/forms';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { find, map } from 'rxjs/operators';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isEmpty, isNotEmpty, hasNoValue } from '../shared/empty.util';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
-import { Process } from '../process-page/processes/process.model';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ScriptDataService } from '../core/data/processes/script-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-import { Observable } from 'rxjs';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../core/shared/operators';
 import { getProcessDetailRoute } from '../process-page/process-page-routing.paths';
+import { Process } from '../process-page/processes/process.model';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../shared/empty.util';
 import { HandleService } from '../shared/handle.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
 
 export const CURATION_CFG = 'plugin.named.org.dspace.curate.CurationTask';
+
 /**
  * Component responsible for rendering the Curation Task form
  */
 @Component({
   selector: 'ds-curation-form',
-  templateUrl: './curation-form.component.html'
+  templateUrl: './curation-form.component.html',
 })
-export class CurationFormComponent implements OnInit {
+export class CurationFormComponent implements OnDestroy, OnInit {
 
   config: Observable<RemoteData<ConfigurationProperty>>;
   tasks: string[];
-  form: FormGroup;
+  form: UntypedFormGroup;
 
   @Input()
-  dsoHandle: string;
+    dsoHandle: string;
+
+  subs: Subscription[] = [];
 
   constructor(
     private scriptDataService: ScriptDataService,
     private configurationDataService: ConfigurationDataService,
-    private processDataService: ProcessDataService,
     private notificationsService: NotificationsService,
     private translateService: TranslateService,
     private handleService: HandleService,
-    private router: Router
+    private router: Router,
+    private cdr: ChangeDetectorRef,
   ) {
   }
 
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
+
   ngOnInit(): void {
-    this.form = new FormGroup({
-      task: new FormControl(''),
-      handle: new FormControl('')
+    this.form = new UntypedFormGroup({
+      task: new UntypedFormControl(''),
+      handle: new UntypedFormControl(''),
     });
 
     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();
+    }));
   }
 
   /**
@@ -75,33 +101,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-field-values/dso-edit-metadata-field-values.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
new file mode 100644
index 0000000000..aee9fb980c
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.html
@@ -0,0 +1,16 @@
+<div class="flex-grow-1 ds-drop-list h-100" [class.disabled]="(draggingMdField$ | async) && (draggingMdField$ | async) !== mdField" cdkDropList (cdkDropListDropped)="drop($event)" role="table">
+  <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
+  <ds-dso-edit-metadata-value *ngFor="let mdValue of form.fields[mdField]; let idx = index" role="presentation"
+                              [dso]="dso"
+                              [mdValue]="mdValue"
+                              [mdField]="mdField"
+                              [dsoType]="dsoType"
+                              [saving$]="saving$"
+                              [isOnlyValue]="form.fields[mdField].length === 1"
+                              (edit)="mdValue.editing = true"
+                              (confirm)="mdValue.confirmChanges($event); form.resetReinstatable(); valueSaved.emit()"
+                              (remove)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.change = DsoEditMetadataChangeTypeEnum.REMOVE; form.resetReinstatable(); valueSaved.emit()"
+                              (undo)="mdValue.change === DsoEditMetadataChangeTypeEnum.ADD ? form.remove(mdField, idx) : mdValue.discard(); valueSaved.emit()"
+                              (dragging)="$event ? draggingMdField$.next(mdField) : draggingMdField$.next(null)">
+  </ds-dso-edit-metadata-value>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
new file mode 100644
index 0000000000..6b52c4f4b3
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.scss
@@ -0,0 +1,7 @@
+.ds-drop-list {
+  background-color: var(--bs-gray-500);
+
+  &.disabled {
+    opacity: 0.3;
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
new file mode 100644
index 0000000000..9d9ec3d337
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.spec.ts
@@ -0,0 +1,142 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of,
+} from 'rxjs';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { DsoEditMetadataForm } from '../dso-edit-metadata-form';
+import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata-field-values.component';
+
+describe('DsoEditMetadataFieldValuesComponent', () => {
+  let component: DsoEditMetadataFieldValuesComponent;
+  let fixture: ComponentFixture<DsoEditMetadataFieldValuesComponent>;
+
+  let form: DsoEditMetadataForm;
+  let dso: DSpaceObject;
+  let mdField: string;
+  let draggingMdField$: BehaviorSubject<string>;
+
+  beforeEach(waitForAsync(() => {
+    dso = Object.assign(new DSpaceObject(), {
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            value: 'Test Title',
+            language: 'en',
+            place: 0,
+          }),
+        ],
+        'dc.subject': [
+          Object.assign(new MetadataValue(), {
+            value: 'Subject One',
+            language: 'en',
+            place: 0,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Two',
+            language: 'en',
+            place: 1,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Three',
+            language: 'en',
+            place: 2,
+          }),
+        ],
+      },
+    });
+    form = new DsoEditMetadataForm(dso.metadata);
+    mdField = 'dc.subject';
+    draggingMdField$ = new BehaviorSubject<string>(null);
+
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataFieldValuesComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataFieldValuesComponent);
+    component = fixture.componentInstance;
+    component.dso = dso;
+    component.form = form;
+    component.mdField = mdField;
+    component.saving$ = of(false);
+    component.draggingMdField$ = draggingMdField$;
+    fixture.detectChanges();
+  });
+
+  describe('when draggingMdField$ emits a value equal to mdField', () => {
+    beforeEach(() => {
+      draggingMdField$.next(mdField);
+      fixture.detectChanges();
+    });
+
+    it('should not disable the list', () => {
+      expect(fixture.debugElement.query(By.css('.ds-drop-list.disabled'))).toBeNull();
+    });
+  });
+
+  describe('when draggingMdField$ emits a value different to mdField', () => {
+    beforeEach(() => {
+      draggingMdField$.next(`${mdField}.fake`);
+      fixture.detectChanges();
+    });
+
+    it('should disable the list', () => {
+      expect(fixture.debugElement.query(By.css('.ds-drop-list.disabled'))).toBeTruthy();
+    });
+  });
+
+  describe('when draggingMdField$ emits null', () => {
+    beforeEach(() => {
+      draggingMdField$.next(null);
+      fixture.detectChanges();
+    });
+
+    it('should not disable the list', () => {
+      expect(fixture.debugElement.query(By.css('.ds-drop-list.disabled'))).toBeNull();
+    });
+  });
+
+  describe('dropping a value on a different index', () => {
+    beforeEach(() => {
+      component.drop(Object.assign({
+        previousIndex: 0,
+        currentIndex: 2,
+      }));
+    });
+
+    it('should physically move the relevant metadata value within the form', () => {
+      expect(form.fields[mdField][0].newValue.value).toEqual('Subject Two');
+      expect(form.fields[mdField][1].newValue.value).toEqual('Subject Three');
+      expect(form.fields[mdField][2].newValue.value).toEqual('Subject One');
+    });
+
+    it('should update the metadata values their new place to match the new physical order', () => {
+      expect(form.fields[mdField][0].newValue.place).toEqual(0);
+      expect(form.fields[mdField][1].newValue.place).toEqual(1);
+      expect(form.fields[mdField][2].newValue.place).toEqual(2);
+    });
+
+    it('should maintain the metadata values their original place in their original value so it can be used later to determine the patch operations', () => {
+      expect(form.fields[mdField][0].originalValue.place).toEqual(1);
+      expect(form.fields[mdField][1].originalValue.place).toEqual(2);
+      expect(form.fields[mdField][2].originalValue.place).toEqual(0);
+    });
+  });
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
new file mode 100644
index 0000000000..0d752486bc
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component.ts
@@ -0,0 +1,96 @@
+import {
+  CdkDragDrop,
+  moveItemInArray,
+} from '@angular/cdk/drag-drop';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataForm,
+  DsoEditMetadataValue,
+} from '../dso-edit-metadata-form';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-field-values',
+  styleUrls: ['./dso-edit-metadata-field-values.component.scss'],
+  templateUrl: './dso-edit-metadata-field-values.component.html',
+})
+/**
+ * Component displaying table rows for each value for a certain metadata field within a form
+ */
+export class DsoEditMetadataFieldValuesComponent {
+  /**
+   * The parent {@link DSpaceObject} to display a metadata form for
+   * Also used to determine metadata-representations in case of virtual metadata
+   */
+  @Input() dso: DSpaceObject;
+  /**
+   * A dynamic form object containing all information about the metadata and the changes made to them, see {@link DsoEditMetadataForm}
+   */
+  @Input() form: DsoEditMetadataForm;
+
+  /**
+   * Metadata field to display values for
+   */
+  @Input() mdField: string;
+
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+
+  /**
+   * Observable to check if the form is being saved or not
+   */
+  @Input() saving$: Observable<boolean>;
+
+  /**
+   * Tracks for which metadata-field a drag operation is taking place
+   * Null when no drag is currently happening for any field
+   */
+  @Input() draggingMdField$: BehaviorSubject<string>;
+
+  /**
+   * Emit when the value has been saved within the form
+   */
+  @Output() valueSaved: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * The DsoEditMetadataChangeType enumeration for access in the component's template
+   * @type {DsoEditMetadataChangeType}
+   */
+  public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+
+  /**
+   * Drop a value into a new position
+   * Update the form's value array for the current field to match the dropped position
+   * Update the values their place property to match the new order
+   * Send an update to the parent
+   * @param event
+   */
+  drop(event: CdkDragDrop<any>) {
+    const dragIndex = event.previousIndex;
+    const dropIndex = event.currentIndex;
+    // Move the value within its field
+    moveItemInArray(this.form.fields[this.mdField], dragIndex, dropIndex);
+    // Update all the values in this field their place property
+    this.form.fields[this.mdField].forEach((value: DsoEditMetadataValue, index: number) => {
+      value.newValue.place = index;
+      value.confirmChanges();
+    });
+    // Update the form statuses
+    this.form.resetReinstatable();
+    this.valueSaved.emit();
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
new file mode 100644
index 0000000000..01a6ba48ca
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.spec.ts
@@ -0,0 +1,278 @@
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataForm,
+} from './dso-edit-metadata-form';
+
+describe('DsoEditMetadataForm', () => {
+  let form: DsoEditMetadataForm;
+  let dso: DSpaceObject;
+
+  beforeEach(() => {
+    dso = Object.assign(new DSpaceObject(), {
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            value: 'Test Title',
+            language: 'en',
+            place: 0,
+          }),
+        ],
+        'dc.subject': [
+          Object.assign(new MetadataValue(), {
+            value: 'Subject One',
+            language: 'en',
+            place: 0,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Two',
+            language: 'en',
+            place: 1,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Three',
+            language: 'en',
+            place: 2,
+          }),
+        ],
+      },
+    });
+    form = new DsoEditMetadataForm(dso.metadata);
+  });
+
+
+  describe('adding a new value', () => {
+    beforeEach(() => {
+      form.add();
+    });
+
+    it('should add an empty value to \"newValue\" with no place yet and editing set to true', () => {
+      expect(form.newValue).toBeDefined();
+      expect(form.newValue.originalValue.place).toBeUndefined();
+      expect(form.newValue.newValue.place).toBeUndefined();
+      expect(form.newValue.editing).toBeTrue();
+    });
+
+    it('should not mark the form as changed yet', () => {
+      expect(form.hasChanges()).toEqual(false);
+    });
+
+    describe('and assigning a value and metadata field to it', () => {
+      let mdField: string;
+      let value: string;
+      let expectedPlace: number;
+
+      beforeEach(() => {
+        mdField = 'dc.subject';
+        value = 'Subject Four';
+        form.newValue.newValue.value = value;
+        form.setMetadataField(mdField);
+        expectedPlace = form.fields[mdField].length - 1;
+      });
+
+      it('should add the new value to the values of the relevant field', () => {
+        expect(form.fields[mdField][expectedPlace].newValue.value).toEqual(value);
+      });
+
+      it('should set its editing flag to false', () => {
+        expect(form.fields[mdField][expectedPlace].editing).toBeFalse();
+      });
+
+      it('should set both its original and new place to match its position in the value array', () => {
+        expect(form.fields[mdField][expectedPlace].newValue.place).toEqual(expectedPlace);
+        expect(form.fields[mdField][expectedPlace].originalValue.place).toEqual(expectedPlace);
+      });
+
+      it('should clear \"newValue\"', () => {
+        expect(form.newValue).toBeUndefined();
+      });
+
+      it('should mark the form as changed', () => {
+        expect(form.hasChanges()).toEqual(true);
+      });
+
+      describe('discard', () => {
+        beforeEach(() => {
+          form.discard();
+        });
+
+        it('should remove the new value', () => {
+          expect(form.fields[mdField][expectedPlace]).toBeUndefined();
+        });
+
+        it('should mark the form as unchanged again', () => {
+          expect(form.hasChanges()).toEqual(false);
+        });
+
+        describe('reinstate', () => {
+          beforeEach(() => {
+            form.reinstate();
+          });
+
+          it('should re-add the new value', () => {
+            expect(form.fields[mdField][expectedPlace].newValue.value).toEqual(value);
+          });
+
+          it('should mark the form as changed once again', () => {
+            expect(form.hasChanges()).toEqual(true);
+          });
+        });
+      });
+    });
+  });
+
+  describe('removing a value entirely (not just marking deleted)', () => {
+    it('should remove the value on the correct index', () => {
+      form.remove('dc.subject', 1);
+      expect(form.fields['dc.subject'].length).toEqual(2);
+      expect(form.fields['dc.subject'][0].newValue.value).toEqual('Subject One');
+      expect(form.fields['dc.subject'][1].newValue.value).toEqual('Subject Three');
+    });
+  });
+
+  describe('moving a value', () => {
+    beforeEach(() => {
+      form.fields['dc.subject'][0].newValue.place = form.fields['dc.subject'][1].originalValue.place;
+      form.fields['dc.subject'][1].newValue.place = form.fields['dc.subject'][0].originalValue.place;
+      form.fields['dc.subject'][0].confirmChanges();
+      form.fields['dc.subject'][1].confirmChanges();
+    });
+
+    it('should mark the value as changed', () => {
+      expect(form.fields['dc.subject'][0].hasChanges()).toEqual(true);
+      expect(form.fields['dc.subject'][1].hasChanges()).toEqual(true);
+    });
+
+    it('should mark the form as changed', () => {
+      expect(form.hasChanges()).toEqual(true);
+    });
+
+    describe('discard', () => {
+      beforeEach(() => {
+        form.discard();
+      });
+
+      it('should reset the moved values their places to their original values', () => {
+        expect(form.fields['dc.subject'][0].newValue.place).toEqual(form.fields['dc.subject'][0].originalValue.place);
+        expect(form.fields['dc.subject'][1].newValue.place).toEqual(form.fields['dc.subject'][1].originalValue.place);
+      });
+
+      it('should mark the form as unchanged again', () => {
+        expect(form.hasChanges()).toEqual(false);
+      });
+
+      describe('reinstate', () => {
+        beforeEach(() => {
+          form.reinstate();
+        });
+
+        it('should move the values to their new places again', () => {
+          expect(form.fields['dc.subject'][0].newValue.place).toEqual(form.fields['dc.subject'][1].originalValue.place);
+          expect(form.fields['dc.subject'][1].newValue.place).toEqual(form.fields['dc.subject'][0].originalValue.place);
+        });
+
+        it('should mark the form as changed once again', () => {
+          expect(form.hasChanges()).toEqual(true);
+        });
+      });
+    });
+  });
+
+  describe('marking a value deleted', () => {
+    beforeEach(() => {
+      form.fields['dc.title'][0].change = DsoEditMetadataChangeType.REMOVE;
+    });
+
+    it('should mark the value as changed', () => {
+      expect(form.fields['dc.title'][0].hasChanges()).toEqual(true);
+    });
+
+    it('should mark the form as changed', () => {
+      expect(form.hasChanges()).toEqual(true);
+    });
+
+    describe('discard', () => {
+      beforeEach(() => {
+        form.discard();
+      });
+
+      it('should remove the deleted mark from the value', () => {
+        expect(form.fields['dc.title'][0].change).toBeUndefined();
+      });
+
+      it('should mark the form as unchanged again', () => {
+        expect(form.hasChanges()).toEqual(false);
+      });
+
+      describe('reinstate', () => {
+        beforeEach(() => {
+          form.reinstate();
+        });
+
+        it('should re-mark the value as deleted', () => {
+          expect(form.fields['dc.title'][0].change).toEqual(DsoEditMetadataChangeType.REMOVE);
+        });
+
+        it('should mark the form as changed once again', () => {
+          expect(form.hasChanges()).toEqual(true);
+        });
+      });
+    });
+  });
+
+  describe('editing a value', () => {
+    const value = 'New title';
+
+    beforeEach(() => {
+      form.fields['dc.title'][0].editing = true;
+      form.fields['dc.title'][0].newValue.value = value;
+    });
+
+    it('should not mark the form as changed yet', () => {
+      expect(form.hasChanges()).toEqual(false);
+    });
+
+    describe('and confirming the changes', () => {
+      beforeEach(() => {
+        form.fields['dc.title'][0].confirmChanges(true);
+      });
+
+      it('should mark the value as changed', () => {
+        expect(form.fields['dc.title'][0].hasChanges()).toEqual(true);
+      });
+
+      it('should mark the form as changed', () => {
+        expect(form.hasChanges()).toEqual(true);
+      });
+
+      describe('discard', () => {
+        beforeEach(() => {
+          form.discard();
+        });
+
+        it('should reset the changed value to its original value', () => {
+          expect(form.fields['dc.title'][0].newValue.value).toEqual(form.fields['dc.title'][0].originalValue.value);
+        });
+
+        it('should mark the form as unchanged again', () => {
+          expect(form.hasChanges()).toEqual(false);
+        });
+
+        describe('reinstate', () => {
+          beforeEach(() => {
+            form.reinstate();
+          });
+
+          it('should put the changed value back in place', () => {
+            expect(form.fields['dc.title'][0].newValue.value).toEqual(value);
+          });
+
+          it('should mark the form as changed once again', () => {
+            expect(form.hasChanges()).toEqual(true);
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
new file mode 100644
index 0000000000..f45f43181b
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-form.ts
@@ -0,0 +1,471 @@
+/* eslint-disable max-classes-per-file */
+import {
+  MoveOperation,
+  Operation,
+} from 'fast-json-patch';
+
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { MetadataPatchAddOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-add-operation.model';
+import { MetadataPatchMoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-move-operation.model';
+import { MetadataPatchRemoveOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-remove-operation.model';
+import { MetadataPatchReplaceOperation } from '../../core/data/object-updates/patch-operation-service/operations/metadata/metadata-patch-replace-operation.model';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../core/shared/metadata.models';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
+
+/**
+ * Enumeration for the type of change occurring on a metadata value
+ */
+export enum DsoEditMetadataChangeType {
+  UPDATE = 1,
+  ADD = 2,
+  REMOVE = 3
+}
+
+/**
+ * Class holding information about a metadata value and its changes within an edit form
+ */
+export class DsoEditMetadataValue {
+  /**
+   * The original metadata value (should stay the same!) used to compare changes with
+   */
+  originalValue: MetadataValue;
+
+  /**
+   * The new value, dynamically changing
+   */
+  newValue: MetadataValue;
+
+  /**
+   * A value that can be used to undo any discarding that took place
+   */
+  reinstatableValue: MetadataValue;
+
+  /**
+   * Whether or not this value is currently being edited or not
+   */
+  editing = false;
+
+  /**
+   * The type of change that's taking place on this metadata value
+   * Empty if no changes are made
+   */
+  change: DsoEditMetadataChangeType;
+
+  /**
+   * A flag to keep track if the value has been reordered (place has changed)
+   */
+  reordered = false;
+
+  /**
+   * A type or change that can be used to undo any discarding that took place
+   */
+  reinstatableChange: DsoEditMetadataChangeType;
+
+  constructor(value: MetadataValue, added = false) {
+    this.originalValue = value;
+    this.newValue = Object.assign(new MetadataValue(), value);
+    if (added) {
+      this.change = DsoEditMetadataChangeType.ADD;
+      this.editing = true;
+    }
+  }
+
+  /**
+   * Save the current changes made to the metadata value
+   * This will set the type of change to UPDATE if the new metadata value's value and/or language are different from
+   * the original value
+   * It will also set the editing flag to false
+   */
+  confirmChanges(finishEditing = false) {
+    this.reordered = this.originalValue.place !== this.newValue.place;
+    if (hasNoValue(this.change) || this.change === DsoEditMetadataChangeType.UPDATE) {
+      if (this.originalValue.value !== this.newValue.value || this.originalValue.language !== this.newValue.language
+        || this.originalValue.authority !== this.newValue.authority || this.originalValue.confidence !== this.newValue.confidence) {
+        this.change = DsoEditMetadataChangeType.UPDATE;
+      } else {
+        this.change = undefined;
+      }
+    }
+    if (finishEditing) {
+      this.editing = false;
+    }
+  }
+
+  /**
+   * Returns if the current value contains changes or not
+   * If the metadata value contains changes, but they haven't been confirmed yet through confirmChanges(), this might
+   * return false (which is desired)
+   */
+  hasChanges(): boolean {
+    return hasValue(this.change) || this.reordered;
+  }
+
+  /**
+   * Discard the current changes and mark the value and change type re-instatable by storing them in their relevant
+   * properties
+   */
+  discardAndMarkReinstatable(): void {
+    if (this.change === DsoEditMetadataChangeType.UPDATE || this.reordered) {
+      this.reinstatableValue = this.newValue;
+    }
+    this.reinstatableChange = this.change;
+    this.discard(false);
+  }
+
+  /**
+   * Discard the current changes
+   * Call discardAndMarkReinstatable() instead, if the discard should be re-instatable
+   */
+  discard(keepPlace = true): void {
+    this.change = undefined;
+    const place = this.newValue.place;
+    this.newValue = Object.assign(new MetadataValue(), this.originalValue);
+    if (keepPlace) {
+      this.newValue.place = place;
+    }
+    this.confirmChanges(true);
+  }
+
+  /**
+   * Re-instate (undo) the last discard by replacing the value and change type with their reinstate properties (if present)
+   */
+  reinstate(): void {
+    if (hasValue(this.reinstatableValue)) {
+      this.newValue = this.reinstatableValue;
+      this.reinstatableValue = undefined;
+    }
+    if (hasValue(this.reinstatableChange)) {
+      this.change = this.reinstatableChange;
+      this.reinstatableChange = undefined;
+    }
+    this.confirmChanges();
+  }
+
+  /**
+   * Returns if either the value or change type have a re-instatable property
+   * This will be the case if a discard has taken place that undid changes to the value or type
+   */
+  isReinstatable(): boolean {
+    return hasValue(this.reinstatableValue) || hasValue(this.reinstatableChange);
+  }
+
+  /**
+   * Reset the state of the re-instatable properties
+   */
+  resetReinstatable() {
+    this.reinstatableValue = undefined;
+    this.reinstatableChange = undefined;
+  }
+}
+
+/**
+ * Class holding information about the metadata of a DSpaceObject and its changes within an edit form
+ */
+export class DsoEditMetadataForm {
+  /**
+   * List of original metadata field keys (before any changes took place)
+   */
+  originalFieldKeys: string[];
+
+  /**
+   * List of current metadata field keys (includes new fields for values added by the user)
+   */
+  fieldKeys: string[];
+
+  /**
+   * Current state of the form
+   * Key: Metadata field
+   * Value: List of {@link DsoEditMetadataValue}s for the metadata field
+   */
+  fields: {
+    [mdField: string]: DsoEditMetadataValue[],
+  };
+
+  /**
+   * A map of previously added metadata values before a discard of the form took place
+   * This can be used to re-instate the entire form to before the discard taking place
+   */
+  reinstatableNewValues: {
+    [mdField: string]: DsoEditMetadataValue[],
+  };
+
+  /**
+   * A (temporary) new metadata value added by the user, not belonging to a metadata field yet
+   * This value will be finalised and added to a field using setMetadataField()
+   */
+  newValue: DsoEditMetadataValue;
+
+  constructor(metadata: MetadataMap) {
+    this.originalFieldKeys = [];
+    this.fieldKeys = [];
+    this.fields = {};
+    this.reinstatableNewValues = {};
+    Object.entries(metadata).forEach(([mdField, values]: [string, MetadataValue[]]) => {
+      this.originalFieldKeys.push(mdField);
+      this.fieldKeys.push(mdField);
+      this.setValuesForFieldSorted(mdField, values.map((value: MetadataValue) => new DsoEditMetadataValue(value)));
+    });
+    this.sortFieldKeys();
+  }
+
+  /**
+   * Add a new temporary value for the user to edit
+   */
+  add(): void {
+    if (hasNoValue(this.newValue)) {
+      this.newValue = new DsoEditMetadataValue(new MetadataValue(), true);
+    }
+  }
+
+  /**
+   * Add the temporary value to a metadata field
+   * Clear the temporary value afterwards
+   * @param mdField
+   */
+  setMetadataField(mdField: string): void {
+    this.newValue.editing = false;
+    this.addValueToField(this.newValue, mdField);
+    // Set the place property to match the new value's position within its field
+    const place = this.fields[mdField].length - 1;
+    this.fields[mdField][place].originalValue.place = place;
+    this.fields[mdField][place].newValue.place = place;
+    this.newValue = undefined;
+  }
+
+  /**
+   * Add a value to a metadata field within the map
+   * @param value
+   * @param mdField
+   * @private
+   */
+  private addValueToField(value: DsoEditMetadataValue, mdField: string): void {
+    if (isEmpty(this.fields[mdField])) {
+      this.fieldKeys.push(mdField);
+      this.sortFieldKeys();
+      this.fields[mdField] = [];
+    }
+    this.fields[mdField].push(value);
+  }
+
+  /**
+   * Remove a value from a metadata field on a given index (this actually removes the value, not just marking it deleted)
+   * @param mdField
+   * @param index
+   */
+  remove(mdField: string, index: number): void {
+    if (isNotEmpty(this.fields[mdField])) {
+      this.fields[mdField].splice(index, 1);
+      if (this.fields[mdField].length === 0) {
+        this.fieldKeys.splice(this.fieldKeys.indexOf(mdField), 1);
+        delete this.fields[mdField];
+      }
+    }
+  }
+
+  /**
+   * Returns if at least one value within the form contains a change
+   */
+  hasChanges(): boolean {
+    return Object.values(this.fields).some((values: DsoEditMetadataValue[]) => values.some((value: DsoEditMetadataValue) => value.hasChanges()));
+  }
+
+  /**
+   * Check if a metadata field contains changes within its order (place property of values)
+   * @param mdField
+   */
+  hasOrderChanges(mdField: string): boolean {
+    return this.fields[mdField].some((value: DsoEditMetadataValue) => value.originalValue.place !== value.newValue.place);
+  }
+
+  /**
+   * Discard all changes within the form and store their current values within re-instatable properties so they can be
+   * undone afterwards
+   */
+  discard(): void {
+    this.resetReinstatable();
+    // Discard changes from each value from each field
+    Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      let removeFromIndex = -1;
+      values.forEach((value: DsoEditMetadataValue, index: number) => {
+        if (value.change === DsoEditMetadataChangeType.ADD) {
+          if (isEmpty(this.reinstatableNewValues[field])) {
+            this.reinstatableNewValues[field] = [];
+          }
+          this.reinstatableNewValues[field].push(value);
+          if (removeFromIndex === -1) {
+            removeFromIndex = index;
+          }
+        } else {
+          value.discardAndMarkReinstatable();
+        }
+      });
+      if (removeFromIndex > -1) {
+        this.fields[field].splice(removeFromIndex, this.fields[field].length - removeFromIndex);
+      }
+    });
+    // Delete new metadata fields
+    this.fieldKeys.forEach((field: string) => {
+      if (this.originalFieldKeys.indexOf(field) < 0) {
+        delete this.fields[field];
+      }
+    });
+    this.fieldKeys = [...this.originalFieldKeys];
+    this.sortFieldKeys();
+    // Reset the order of values within their fields to match their place property
+    this.fieldKeys.forEach((field: string) => {
+      this.setValuesForFieldSorted(field, this.fields[field]);
+    });
+  }
+
+  /**
+   * Reset the order of values within a metadata field to their original places
+   * Update the actual array to match the place properties
+   * @param mdField
+   */
+  resetOrder(mdField: string) {
+    this.fields[mdField].forEach((value: DsoEditMetadataValue) => {
+      value.newValue.place = value.originalValue.place;
+      value.confirmChanges();
+    });
+    this.setValuesForFieldSorted(mdField, this.fields[mdField]);
+  }
+
+  /**
+   * Sort fieldKeys alphabetically
+   * Should be called whenever a field is added to ensure the alphabetical order is kept
+   */
+  sortFieldKeys() {
+    this.fieldKeys.sort((a: string, b: string) => a.localeCompare(b));
+  }
+
+  /**
+   * Undo any previously discarded changes
+   */
+  reinstate(): void {
+    // Reinstate each value
+    Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => {
+      values.forEach((value: DsoEditMetadataValue) => {
+        value.reinstate();
+      });
+    });
+    // Re-add new values
+    Object.entries(this.reinstatableNewValues).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      values.forEach((value: DsoEditMetadataValue) => {
+        this.addValueToField(value, field);
+      });
+    });
+    // Reset the order of values within their fields to match their place property
+    this.fieldKeys.forEach((field: string) => {
+      this.setValuesForFieldSorted(field, this.fields[field]);
+    });
+    this.reinstatableNewValues = {};
+  }
+
+  /**
+   * Returns if at least one value contains a re-instatable property, meaning a discard can be reversed
+   */
+  isReinstatable(): boolean {
+    return isNotEmpty(this.reinstatableNewValues) ||
+      Object.values(this.fields)
+        .some((values: DsoEditMetadataValue[]) => values
+          .some((value: DsoEditMetadataValue) => value.isReinstatable()));
+  }
+
+  /**
+   * Reset the state of the re-instatable properties and values
+   */
+  resetReinstatable(): void {
+    this.reinstatableNewValues = {};
+    Object.values(this.fields).forEach((values: DsoEditMetadataValue[]) => {
+      values.forEach((value: DsoEditMetadataValue) => {
+        value.resetReinstatable();
+      });
+    });
+  }
+
+  /**
+   * Set the values of a metadata field and sort them by their newValue's place property
+   * @param mdField
+   * @param values
+   */
+  private setValuesForFieldSorted(mdField: string, values: DsoEditMetadataValue[]) {
+    this.fields[mdField] = values.sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place);
+  }
+
+  /**
+   * Get the json PATCH operations for the current changes within this form
+   * For each metadata field, it'll return operations in the following order: replace, remove (from last to first place), add and move
+   * This order is important, as each operation is executed in succession of the previous one
+   */
+  getOperations(moveAnalyser: ArrayMoveChangeAnalyzer<number>): Operation[] {
+    const operations: Operation[] = [];
+    Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      const replaceOperations: MetadataPatchReplaceOperation[] = [];
+      const removeOperations: MetadataPatchRemoveOperation[] = [];
+      const addOperations: MetadataPatchAddOperation[] = [];
+      [...values]
+        .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place)
+        .forEach((value: DsoEditMetadataValue) => {
+          if (hasValue(value.change)) {
+            if (value.change === DsoEditMetadataChangeType.UPDATE) {
+              // Only changes to value or language are considered "replace" operations. Changes to place are considered "move", which is processed below.
+              if (value.originalValue.value !== value.newValue.value || value.originalValue.language !== value.newValue.language
+                || value.originalValue.authority !== value.newValue.authority  || value.originalValue.confidence !== value.newValue.confidence) {
+                replaceOperations.push(new MetadataPatchReplaceOperation(field, value.originalValue.place, {
+                  value: value.newValue.value,
+                  language: value.newValue.language,
+                  authority: value.newValue.authority,
+                  confidence: value.newValue.confidence,
+                }));
+              }
+            } else if (value.change === DsoEditMetadataChangeType.REMOVE) {
+              removeOperations.push(new MetadataPatchRemoveOperation(field, value.originalValue.place));
+            } else if (value.change === DsoEditMetadataChangeType.ADD) {
+              addOperations.push(new MetadataPatchAddOperation(field, {
+                value: value.newValue.value,
+                language: value.newValue.language,
+                authority: value.newValue.authority,
+                confidence: value.newValue.confidence,
+              }));
+            } else {
+              console.warn('Illegal metadata change state detected for', value);
+            }
+          }
+        });
+
+      operations.push(...replaceOperations
+        .map((operation: MetadataPatchReplaceOperation) => operation.toOperation()));
+      operations.push(...removeOperations
+        // Sort remove operations backwards first, because they get executed in order. This avoids one removal affecting the next.
+        .sort((a: MetadataPatchRemoveOperation, b: MetadataPatchRemoveOperation) => b.place - a.place)
+        .map((operation: MetadataPatchRemoveOperation) => operation.toOperation()));
+      operations.push(...addOperations
+        .map((operation: MetadataPatchAddOperation) => operation.toOperation()));
+    });
+    // Calculate and add the move operations that need to happen in order to move value from their old place to their new within the field
+    // This uses an ArrayMoveChangeAnalyzer
+    Object.entries(this.fields).forEach(([field, values]: [string, DsoEditMetadataValue[]]) => {
+      // Exclude values marked for removal, because operations are executed in order (remove first, then move)
+      const valuesWithoutRemoved = values.filter((value: DsoEditMetadataValue) => value.change !== DsoEditMetadataChangeType.REMOVE);
+      const moveOperations = moveAnalyser
+        .diff(
+          [...valuesWithoutRemoved]
+            .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.originalValue.place - b.originalValue.place)
+            .map((value: DsoEditMetadataValue) => value.originalValue.place),
+          [...valuesWithoutRemoved]
+            .sort((a: DsoEditMetadataValue, b: DsoEditMetadataValue) => a.newValue.place - b.newValue.place)
+            .map((value: DsoEditMetadataValue) => value.originalValue.place))
+        .map((operation: MoveOperation) => new MetadataPatchMoveOperation(field, +operation.from.substr(1), +operation.path.substr(1)).toOperation());
+      operations.push(...moveOperations);
+    });
+    return operations;
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html
new file mode 100644
index 0000000000..ecaf2aa744
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.html
@@ -0,0 +1,10 @@
+<div class="d-flex flex-row ds-field-row ds-header-row">
+  <div class="lbl-cell">{{ dsoType + '.edit.metadata.headers.field' | translate }}</div>
+  <div class="flex-grow-1">
+    <div class="d-flex flex-row">
+      <div class="flex-grow-1 ds-flex-cell ds-value-cell"><b class="dont-break-out preserve-line-breaks">{{ dsoType + '.edit.metadata.headers.value' | translate }}</b></div>
+      <div class="ds-flex-cell ds-lang-cell"><b>{{ dsoType + '.edit.metadata.headers.language' | translate }}</b></div>
+      <div class="text-center ds-flex-cell ds-edit-cell"><b>{{ dsoType + '.edit.metadata.headers.edit' | translate }}</b></div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss
new file mode 100644
index 0000000000..d46751d4b0
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.scss
@@ -0,0 +1,12 @@
+.lbl-cell {
+  min-width: var(--ds-dso-edit-field-width);
+  max-width: var(--ds-dso-edit-field-width);
+  background-color: var(--bs-gray-100);
+  font-weight: bold;
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
+}
+
+.ds-header-row {
+  background-color: var(--bs-gray-100);
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
new file mode 100644
index 0000000000..2e67af08eb
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.spec.ts
@@ -0,0 +1,37 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata-headers.component';
+
+describe('DsoEditMetadataHeadersComponent', () => {
+  let component: DsoEditMetadataHeadersComponent;
+  let fixture: ComponentFixture<DsoEditMetadataHeadersComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataHeadersComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataHeadersComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should display three headers', () => {
+    expect(fixture.debugElement.queryAll(By.css('.ds-flex-cell')).length).toEqual(3);
+  });
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
new file mode 100644
index 0000000000..e256b76c90
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component.ts
@@ -0,0 +1,20 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-headers',
+  styleUrls: ['./dso-edit-metadata-headers.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
+  templateUrl: './dso-edit-metadata-headers.component.html',
+})
+/**
+ * Component displaying the header table row for DSO edit metadata page
+ */
+export class DsoEditMetadataHeadersComponent {
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+}
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
new file mode 100644
index 0000000000..29b93f3150
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss
@@ -0,0 +1,49 @@
+.ds-field-row {
+  border: 1px solid var(--bs-gray-400);
+}
+
+.ds-flex-cell {
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
+}
+
+.ds-lang-cell {
+  min-width: var(--ds-dso-edit-lang-width);
+  max-width: var(--ds-dso-edit-lang-width);
+}
+
+.ds-edit-cell {
+  min-width: var(--ds-dso-edit-actions-width);
+}
+
+.ds-value-row {
+  background-color: white;
+
+  &:active {
+    cursor: grabbing;
+  }
+
+  &.ds-warning {
+    background-color: var(--ds-warning-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-warning);
+    }
+  }
+
+  &.ds-danger {
+    background-color: var(--ds-danger-bg);
+
+    .ds-flex-cell {
+      border: 1px solid var(--bs-danger);
+    }
+  }
+
+  &.ds-success {
+    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-headers/dso-edit-metadata-value-headers.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html
new file mode 100644
index 0000000000..2c3fb54600
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.html
@@ -0,0 +1,5 @@
+<div role="row" class="visually-hidden">
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.value' | translate }}</div>
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.language' | translate }}</div>
+  <div role="columnheader">{{ dsoType + '.edit.metadata.headers.edit' | translate }}</div>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss
rename to src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.scss
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
new file mode 100644
index 0000000000..a15da89e42
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component.ts
@@ -0,0 +1,20 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-value-headers',
+  styleUrls: ['./dso-edit-metadata-value-headers.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
+  templateUrl: './dso-edit-metadata-value-headers.component.html',
+})
+/**
+ * Component displaying invisible headers for a list of metadata values using table roles for accessibility
+ */
+export class DsoEditMetadataValueHeadersComponent {
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+}
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
new file mode 100644
index 0000000000..c9afc6ca63
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -0,0 +1,105 @@
+<div class="d-flex flex-row ds-value-row" *ngVar="mdValue.newValue.isVirtual as isVirtual" role="row"
+     cdkDrag (cdkDragStarted)="dragging.emit(true)" (cdkDragEnded)="dragging.emit(false)"
+     [ngClass]="{ 'ds-warning': mdValue.reordered || mdValue.change === DsoEditMetadataChangeTypeEnum.UPDATE, 'ds-danger': mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE, 'ds-success': mdValue.change === DsoEditMetadataChangeTypeEnum.ADD, 'h-100': isOnlyValue }">
+  <div class="flex-grow-1 ds-flex-cell ds-value-cell d-flex flex-column" *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 && (isAuthorityControlled() | async) !== true" [(ngModel)]="mdValue.newValue.value"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.value') | translate"
+              [dsDebounce]="300" (onDebounce)="confirm.emit(false)"></textarea>
+    <ds-dynamic-scrollable-dropdown *ngIf="mdValue.editing && (isScrollableVocabulary() | async)"
+                                    [bindId]="mdField"
+                                    [group]="group"
+                                    [model]="getModel() | async"
+                                    (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-scrollable-dropdown>
+    <ds-dynamic-onebox *ngIf="mdValue.editing && ((isHierarchicalVocabulary() | async) || (isSuggesterVocabulary() | async))"
+                      [group]="group"
+                      [model]="getModel() | async"
+                      (change)="onChangeAuthorityField($event)">
+    </ds-dynamic-onebox>
+    <div *ngIf="!isVirtual && !mdValue.editing && mdValue.newValue.authority && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_UNSET && mdValue.newValue.confidence !== ConfidenceTypeEnum.CF_NOVALUE">
+      <span class="badge badge-light border" >
+        <i dsAuthorityConfidenceState
+           class="fas fa-fw p-0"
+           aria-hidden="true"
+           [authorityValue]="mdValue.newValue"
+           [iconMode]="true"
+        ></i>
+        {{ dsoType + '.edit.metadata.authority.label' | translate }} {{ mdValue.newValue.authority }}
+      </span>
+    </div>
+    <div class="mt-2" *ngIf=" mdValue.editing && (isAuthorityControlled() | async) && (isSuggesterVocabulary() | async)">
+      <div class="btn-group w-75">
+        <i dsAuthorityConfidenceState
+          class="fas fa-fw p-0 mr-1 mt-auto mb-auto"
+          aria-hidden="true"
+          [authorityValue]="mdValue.newValue.confidence"
+          [iconMode]="true"
+      ></i>
+        <input class="form-control form-outline" [(ngModel)]="mdValue.newValue.authority" [disabled]="!editingAuthority"
+              [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
+              (change)="onChangeAuthorityKey()" />
+        <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="!editingAuthority"
+                [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
+                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
+                (click)="onChangeEditingAuthorityStatus(true)">
+          <i class="fas fa-lock fa-fw"></i>
+        </button>
+        <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn" *ngIf="editingAuthority"
+                [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
+                ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
+                (click)="onChangeEditingAuthorityStatus(false)">
+          <i class="fas fa-lock-open fa-fw"></i>
+        </button>
+      </div>
+    </div>
+    <div class="d-flex" *ngIf="mdRepresentation">
+      <a class="mr-2" target="_blank" [routerLink]="mdRepresentationItemRoute$ | async">{{ mdRepresentationName$ | async }}</a>
+      <ds-themed-type-badge [object]="mdRepresentation"></ds-themed-type-badge>
+    </div>
+  </div>
+  <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" 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()">
+            <i class="fas fa-edit fa-fw"></i>
+          </button>
+          <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)">
+            <i class="fas fa-check fa-fw"></i>
+          </button>
+          <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()">
+            <i class="fas fa-trash-alt fa-fw"></i>
+          </button>
+          <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()">
+            <i class="fas fa-undo-alt fa-fw"></i>
+          </button>
+          <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}" [disabled]="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>
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
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
new file mode 100644
index 0000000000..e555191300
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss
@@ -0,0 +1,16 @@
+.ds-success {
+  background-color: var(--ds-success-bg);
+  border: 1px solid var(--bs-success);
+}
+
+.ds-drag-handle:not(.disabled) {
+  cursor: grab;
+}
+
+::ng-deep .edit-field>ngb-tooltip-window .tooltip-inner {
+  min-width: var(--ds-dso-edit-virtual-tooltip-min-width);
+}
+
+.cdk-drag-placeholder {
+  opacity: 0;
+}
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
new file mode 100644
index 0000000000..61f2460bc7
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.spec.ts
@@ -0,0 +1,523 @@
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import { MetadataField } from 'src/app/core/metadata/metadata-field.model';
+import { MetadataSchema } from 'src/app/core/metadata/metadata-schema.model';
+import { RegistryService } from 'src/app/core/registry/registry.service';
+import { ConfidenceType } from 'src/app/core/shared/confidence-type';
+import { Vocabulary } from 'src/app/core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyService } from 'src/app/core/submission/vocabularies/vocabulary.service';
+import { DynamicOneboxModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import { DynamicScrollableDropdownModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
+import { createPaginatedList } from 'src/app/shared/testing/utils.test';
+import { VocabularyServiceStub } from 'src/app/shared/testing/vocabulary-service.stub';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  MetadataValue,
+  VIRTUAL_METADATA_PREFIX,
+} from '../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataValue,
+} from '../dso-edit-metadata-form';
+import { DsoEditMetadataValueComponent } from './dso-edit-metadata-value.component';
+
+const EDIT_BTN = 'edit';
+const CONFIRM_BTN = 'confirm';
+const REMOVE_BTN = 'remove';
+const UNDO_BTN = 'undo';
+const DRAG_BTN = 'drag';
+
+describe('DsoEditMetadataValueComponent', () => {
+  let component: DsoEditMetadataValueComponent;
+  let fixture: ComponentFixture<DsoEditMetadataValueComponent>;
+
+  let relationshipService: RelationshipDataService;
+  let dsoNameService: DSONameService;
+  let vocabularyServiceStub: any;
+  let itemService: ItemDataService;
+  let registryService: RegistryService;
+  let notificationsService: NotificationsService;
+
+  let editMetadataValue: DsoEditMetadataValue;
+  let metadataValue: MetadataValue;
+  let dso: DSpaceObject;
+
+  const collection =  Object.assign(new Collection(), {
+    uuid: 'fake-uuid',
+  });
+
+  const item = Object.assign(new Item(), {
+    _links: {
+      self: { href: 'fake-item-url/item' },
+    },
+    id: 'item',
+    uuid: 'item',
+    owningCollection: createSuccessfulRemoteDataObject$(collection),
+  });
+
+  const mockVocabularyScrollable: Vocabulary = {
+    id: 'scrollable',
+    name: 'scrollable',
+    scrollable: true,
+    hierarchical: false,
+    preloadLevel: 0,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        href: 'self',
+      },
+      entries: {
+        href: 'entries',
+      },
+    },
+  };
+
+  const mockVocabularyHierarchical: Vocabulary = {
+    id: 'hierarchical',
+    name: 'hierarchical',
+    scrollable: false,
+    hierarchical: true,
+    preloadLevel: 2,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        href: 'self',
+      },
+      entries: {
+        href: 'entries',
+      },
+    },
+  };
+
+  const mockVocabularySuggester: Vocabulary = {
+    id: 'suggester',
+    name: 'suggester',
+    scrollable: false,
+    hierarchical: false,
+    preloadLevel: 0,
+    type: 'vocabulary',
+    _links: {
+      self: {
+        href: 'self',
+      },
+      entries: {
+        href: 'entries',
+      },
+    },
+  };
+
+  let metadataSchema: MetadataSchema;
+  let metadataFields: MetadataField[];
+
+  function initServices(): void {
+    metadataSchema = Object.assign(new MetadataSchema(), {
+      id: 0,
+      prefix: 'metadata',
+      namespace: 'http://example.com/',
+    });
+    metadataFields = [
+      Object.assign(new MetadataField(), {
+        id: 0,
+        element: 'regular',
+        qualifier: null,
+        schema: createSuccessfulRemoteDataObject$(metadataSchema),
+      }),
+    ];
+
+    relationshipService = jasmine.createSpyObj('relationshipService', {
+      resolveMetadataRepresentation: of(new ItemMetadataRepresentation(metadataValue)),
+    });
+    dsoNameService = jasmine.createSpyObj('dsoNameService', {
+      getName: 'Related Name',
+    });
+    itemService = jasmine.createSpyObj('itemService', {
+      findByHref: createSuccessfulRemoteDataObject$(item),
+    });
+    vocabularyServiceStub = new VocabularyServiceStub();
+    registryService = jasmine.createSpyObj('registryService', {
+      queryMetadataFields: createSuccessfulRemoteDataObject$(createPaginatedList(metadataFields)),
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
+  }
+
+  beforeEach(waitForAsync(() => {
+    metadataValue = Object.assign(new MetadataValue(), {
+      value: 'Regular Name',
+      language: 'en',
+      place: 0,
+      authority: undefined,
+    });
+    editMetadataValue = new DsoEditMetadataValue(metadataValue);
+    dso = Object.assign(new DSpaceObject(), {
+      _links: {
+        self: { href: 'fake-dso-url/dso' },
+      },
+    });
+
+    initServices();
+
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataValueComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: DSONameService, useValue: dsoNameService },
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
+        { provide: ItemDataService, useValue: itemService },
+        { provide: RegistryService, useValue: registryService },
+        { provide: NotificationsService, useValue: notificationsService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataValueComponent);
+    component = fixture.componentInstance;
+    component.mdValue = editMetadataValue;
+    component.dso = dso;
+    component.saving$ = of(false);
+    fixture.detectChanges();
+  });
+
+  it('should not show a badge', () => {
+    expect(fixture.debugElement.query(By.css('ds-themed-type-badge'))).toBeNull();
+  });
+
+  describe('when no changes have been made', () => {
+    assertButton(EDIT_BTN, true, false);
+    assertButton(CONFIRM_BTN, false);
+    assertButton(REMOVE_BTN, true, false);
+    assertButton(UNDO_BTN, true, true);
+    assertButton(DRAG_BTN, true, false);
+  });
+
+  describe('when this is the only metadata value within its field', () => {
+    beforeEach(() => {
+      component.isOnlyValue = true;
+      fixture.detectChanges();
+    });
+
+    assertButton(DRAG_BTN, true, true);
+  });
+
+  describe('when the value is marked for removal', () => {
+    beforeEach(() => {
+      editMetadataValue.change = DsoEditMetadataChangeType.REMOVE;
+      fixture.detectChanges();
+    });
+
+    assertButton(REMOVE_BTN, true, true);
+    assertButton(UNDO_BTN, true, false);
+  });
+
+  describe('when the value is being edited', () => {
+    beforeEach(() => {
+      editMetadataValue.editing = true;
+      fixture.detectChanges();
+    });
+
+    assertButton(EDIT_BTN, false);
+    assertButton(CONFIRM_BTN, true, false);
+    assertButton(UNDO_BTN, true, false);
+  });
+
+  describe('when the value is new', () => {
+    beforeEach(() => {
+      editMetadataValue.change = DsoEditMetadataChangeType.ADD;
+      fixture.detectChanges();
+    });
+
+    assertButton(REMOVE_BTN, true, false);
+    assertButton(UNDO_BTN, true, false);
+  });
+
+  describe('when the metadata value is virtual', () => {
+    beforeEach(() => {
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Virtual Name',
+        language: 'en',
+        place: 0,
+        authority: `${VIRTUAL_METADATA_PREFIX}authority-key`,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      component.mdValue = editMetadataValue;
+      component.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should show a badge', () => {
+      expect(fixture.debugElement.query(By.css('ds-themed-type-badge'))).toBeTruthy();
+    });
+
+    assertButton(EDIT_BTN, true, true);
+    assertButton(CONFIRM_BTN, false);
+    assertButton(REMOVE_BTN, true, true);
+    assertButton(UNDO_BTN, true, true);
+    assertButton(DRAG_BTN, true, false);
+  });
+
+  describe('when the metadata field not uses a vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(null, 204));
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Regular value',
+        language: 'en',
+        place: 0,
+        authority: null,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.regular';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render a textarea', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('textarea'))).toBeTruthy();
+    });
+  });
+
+  describe('when the metadata field uses a scrollable vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(mockVocabularyScrollable));
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Authority Controlled value',
+        language: 'en',
+        place: 0,
+        authority: null,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.scrollable';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render the DsDynamicScrollableDropdownComponent', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('ds-dynamic-scrollable-dropdown'))).toBeTruthy();
+    });
+
+    it('getModel should return a DynamicScrollableDropdownModel', () => {
+      const result = component.getModel();
+
+      expect(result instanceof Observable).toBe(true);
+
+      result.subscribe((model) => {
+        expect(model instanceof DynamicScrollableDropdownModel).toBe(true);
+        expect(model.vocabularyOptions.name).toBe(mockVocabularyScrollable.name);
+      });
+    });
+  });
+
+  describe('when the  metadata field uses a hierarchical vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(mockVocabularyHierarchical));
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Authority Controlled value',
+        language: 'en',
+        place: 0,
+        authority: null,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.hierarchical';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render the DsDynamicOneboxComponent', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('ds-dynamic-onebox'))).toBeTruthy();
+    });
+
+    it('getModel should return a DynamicOneboxModel', () => {
+      const result = component.getModel();
+
+      expect(result instanceof Observable).toBe(true);
+
+      result.subscribe((model) => {
+        expect(model instanceof DynamicOneboxModel).toBe(true);
+        expect(model.vocabularyOptions.name).toBe(mockVocabularyHierarchical.name);
+      });
+    });
+  });
+
+  describe('when the metadata field uses a suggester vocabulary and is editing', () => {
+    beforeEach(waitForAsync(() => {
+      spyOn(vocabularyServiceStub, 'getVocabularyByMetadataAndCollection').and.returnValue(createSuccessfulRemoteDataObject$(mockVocabularySuggester));
+      spyOn(component.confirm, 'emit');
+      metadataValue = Object.assign(new MetadataValue(), {
+        value: 'Authority Controlled value',
+        language: 'en',
+        place: 0,
+        authority: 'authority-key',
+        confidence: ConfidenceType.CF_UNCERTAIN,
+      });
+      editMetadataValue = new DsoEditMetadataValue(metadataValue);
+      editMetadataValue.editing = true;
+      component.mdValue = editMetadataValue;
+      component.mdField = 'metadata.suggester';
+      component.ngOnInit();
+      fixture.detectChanges();
+    }));
+
+    it('should render the DsDynamicOneboxComponent', () => {
+      expect(vocabularyServiceStub.getVocabularyByMetadataAndCollection).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('ds-dynamic-onebox'))).toBeTruthy();
+    });
+
+    it('getModel should return a DynamicOneboxModel', () => {
+      const result = component.getModel();
+
+      expect(result instanceof Observable).toBe(true);
+
+      result.subscribe((model) => {
+        expect(model instanceof DynamicOneboxModel).toBe(true);
+        expect(model.vocabularyOptions.name).toBe(mockVocabularySuggester.name);
+      });
+    });
+
+    describe('authority key edition', () => {
+
+      it('should update confidence to CF_NOVALUE when authority is cleared', () => {
+        component.mdValue.newValue.authority = '';
+
+        component.onChangeAuthorityKey();
+
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_NOVALUE);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+      it('should update confidence to CF_ACCEPTED when authority key is edited', () => {
+        component.mdValue.newValue.authority = 'newAuthority';
+        component.mdValue.originalValue.authority = 'oldAuthority';
+
+        component.onChangeAuthorityKey();
+
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_ACCEPTED);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+      it('should not update confidence when authority key remains the same', () => {
+        component.mdValue.newValue.authority = 'sameAuthority';
+        component.mdValue.originalValue.authority = 'sameAuthority';
+
+        component.onChangeAuthorityKey();
+
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_UNCERTAIN);
+        expect(component.confirm.emit).not.toHaveBeenCalled();
+      });
+
+      it('should call onChangeEditingAuthorityStatus with true when clicking the lock button', () => {
+        spyOn(component, 'onChangeEditingAuthorityStatus');
+        const lockButton = fixture.nativeElement.querySelector('#metadata-confirm-btn');
+
+        lockButton.click();
+
+        expect(component.onChangeEditingAuthorityStatus).toHaveBeenCalledWith(true);
+      });
+
+      it('should disable the input when editingAuthority is false', () => {
+        component.editingAuthority = false;
+
+        fixture.detectChanges();
+
+        const inputElement = fixture.nativeElement.querySelector('input');
+        expect(inputElement.disabled).toBe(true);
+      });
+
+      it('should enable the input when editingAuthority is true', () => {
+        component.editingAuthority = true;
+
+        fixture.detectChanges();
+
+        const inputElement = fixture.nativeElement.querySelector('input');
+        expect(inputElement.disabled).toBe(false);
+      });
+
+      it('should update mdValue.newValue properties when authority is present', () => {
+        const event = {
+          value: 'Some value',
+          authority: 'Some authority',
+        };
+
+        component.onChangeAuthorityField(event);
+
+        expect(component.mdValue.newValue.value).toBe(event.value);
+        expect(component.mdValue.newValue.authority).toBe(event.authority);
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_ACCEPTED);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+      it('should update mdValue.newValue properties when authority is not present', () => {
+        const event = {
+          value: 'Some value',
+          authority: null,
+        };
+
+        component.onChangeAuthorityField(event);
+
+        expect(component.mdValue.newValue.value).toBe(event.value);
+        expect(component.mdValue.newValue.authority).toBeNull();
+        expect(component.mdValue.newValue.confidence).toBe(ConfidenceType.CF_UNSET);
+        expect(component.confirm.emit).toHaveBeenCalledWith(false);
+      });
+
+    });
+
+  });
+
+  function assertButton(name: string, exists: boolean, disabled: boolean = false): void {
+    describe(`${name} button`, () => {
+      let btn: DebugElement;
+
+      beforeEach(() => {
+        btn = fixture.debugElement.query(By.css(`button[data-test="metadata-${name}-btn"]`));
+      });
+
+      if (exists) {
+        it('should exist', () => {
+          expect(btn).toBeTruthy();
+        });
+
+        it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
+          expect(btn.nativeElement.disabled).toBe(disabled);
+        });
+      } else {
+        it('should not exist', () => {
+          expect(btn).toBeNull();
+        });
+      }
+    });
+  }
+});
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
new file mode 100644
index 0000000000..76c10282d5
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.ts
@@ -0,0 +1,444 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+import { RegistryService } from 'src/app/core/registry/registry.service';
+import { VocabularyService } from 'src/app/core/submission/vocabularies/vocabulary.service';
+import { NotificationsService } from 'src/app/shared/notifications/notifications.service';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../../../core/shared/metadata-representation/metadata-representation.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getRemoteDataPayload,
+  metadataFieldsToString,
+} from '../../../core/shared/operators';
+import { Vocabulary } from '../../../core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { isNotEmpty } from '../../../shared/empty.util';
+import {
+  DsDynamicOneboxModelConfig,
+  DynamicOneboxModel,
+} from '../../../shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import {
+  DynamicScrollableDropdownModel,
+  DynamicScrollableDropdownModelConfig,
+} from '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  DsoEditMetadataChangeType,
+  DsoEditMetadataValue,
+} from '../dso-edit-metadata-form';
+
+@Component({
+  selector: 'ds-dso-edit-metadata-value',
+  styleUrls: ['./dso-edit-metadata-value.component.scss', '../dso-edit-metadata-shared/dso-edit-metadata-cells.scss'],
+  templateUrl: './dso-edit-metadata-value.component.html',
+})
+/**
+ * Component displaying a single editable row for a metadata value
+ */
+export class DsoEditMetadataValueComponent implements OnInit, OnChanges {
+  /**
+   * The parent {@link DSpaceObject} to display a metadata form for
+   * Also used to determine metadata-representations in case of virtual metadata
+   */
+  @Input() dso: DSpaceObject;
+
+  /**
+   * Editable metadata value to show
+   */
+  @Input() mdValue: DsoEditMetadataValue;
+
+  /**
+   * Type of DSO we're displaying values for
+   * Determines i18n messages
+   */
+  @Input() dsoType: string;
+
+  /**
+   * Observable to check if the form is being saved or not
+   * Will disable certain functionality while saving
+   */
+  @Input() saving$: Observable<boolean>;
+
+  /**
+   * Is this value the only one within its list?
+   * Will disable certain functionality like dragging (because dragging within a list of 1 is pointless)
+   */
+  @Input() isOnlyValue = false;
+
+  /**
+   * MetadataField to edit
+   */
+  @Input() mdField?: string;
+
+  /**
+   * Emits when the user clicked edit
+   */
+  @Output() edit: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * Emits when the user clicked confirm
+   */
+  @Output() confirm: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+  /**
+   * Emits when the user clicked remove
+   */
+  @Output() remove: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * Emits when the user clicked undo
+   */
+  @Output() undo: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * Emits true when the user starts dragging a value, false when the user stops dragging
+   */
+  @Output() dragging: EventEmitter<boolean> = new EventEmitter<boolean>();
+
+  /**
+   * The DsoEditMetadataChangeType enumeration for access in the component's template
+   * @type {DsoEditMetadataChangeType}
+   */
+  public DsoEditMetadataChangeTypeEnum = DsoEditMetadataChangeType;
+
+  /**
+   * The ConfidenceType enumeration for access in the component's template
+   * @type {ConfidenceType}
+   */
+  public ConfidenceTypeEnum = ConfidenceType;
+
+  /**
+   * The item this metadata value represents in case it's virtual (if any, otherwise null)
+   */
+  mdRepresentation$: Observable<ItemMetadataRepresentation | null>;
+
+  /**
+   * The route to the item represented by this virtual metadata value (otherwise null)
+   */
+  mdRepresentationItemRoute$: Observable<string | null>;
+
+  /**
+   * The name of the item represented by this virtual metadata value (otherwise null)
+   */
+  mdRepresentationName$: Observable<string | null>;
+
+  /**
+   * Whether or not the authority field is currently being edited
+   */
+  public editingAuthority = false;
+
+  /**
+   * Field group used by authority field
+   * @type {UntypedFormGroup}
+   */
+  group = new UntypedFormGroup({ authorityField : new UntypedFormControl() });
+
+  /**
+   * Observable property of the model to use for editinf authorities values
+   */
+  private model$: Observable<DynamicOneboxModel | DynamicScrollableDropdownModel>;
+
+  /**
+   * Observable with information about the authority vocabulary used
+   */
+  private vocabulary$: Observable<Vocabulary>;
+
+  /**
+   * Observables with information about the authority vocabulary type used
+   */
+  private isAuthorityControlled$: Observable<boolean>;
+  private isHierarchicalVocabulary$: Observable<boolean>;
+  private isScrollableVocabulary$: Observable<boolean>;
+  private isSuggesterVocabulary$: Observable<boolean>;
+
+  constructor(protected relationshipService: RelationshipDataService,
+              protected dsoNameService: DSONameService,
+              protected vocabularyService: VocabularyService,
+              protected itemService: ItemDataService,
+              protected cdr: ChangeDetectorRef,
+              protected registryService: RegistryService,
+              protected notificationsService: NotificationsService,
+              protected translate: TranslateService) {
+  }
+
+  ngOnInit(): void {
+    this.initVirtualProperties();
+    this.initAuthorityProperties();
+  }
+
+  /**
+   * Initialise potential properties of a virtual metadata value
+   */
+  initVirtualProperties(): void {
+    this.mdRepresentation$ = this.mdValue.newValue.isVirtual ?
+      this.relationshipService.resolveMetadataRepresentation(this.mdValue.newValue, this.dso, 'Item')
+        .pipe(
+          map((mdRepresentation: MetadataRepresentation) =>
+            mdRepresentation.representationType === MetadataRepresentationType.Item ? mdRepresentation as ItemMetadataRepresentation : null,
+          ),
+        ) : EMPTY;
+    this.mdRepresentationItemRoute$ = this.mdRepresentation$.pipe(
+      map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? getItemPageRoute(mdRepresentation) : null),
+    );
+    this.mdRepresentationName$ = this.mdRepresentation$.pipe(
+      map((mdRepresentation: ItemMetadataRepresentation) => mdRepresentation ? this.dsoNameService.getName(mdRepresentation) : null),
+    );
+  }
+
+  /**
+   * Initialise potential properties of a authority controlled metadata field
+   */
+  initAuthorityProperties(): void {
+
+    if (isNotEmpty(this.mdField)) {
+
+      const owningCollection$: Observable<Collection> = this.itemService.findByHref(this.dso._links.self.href, true, true, followLink('owningCollection'))
+        .pipe(
+          getFirstSucceededRemoteData(),
+          getRemoteDataPayload(),
+          switchMap((item: Item) => item.owningCollection),
+          getFirstSucceededRemoteData(),
+          getRemoteDataPayload(),
+        );
+
+      this.vocabulary$ = owningCollection$.pipe(
+        switchMap((c: Collection) => this.vocabularyService
+          .getVocabularyByMetadataAndCollection(this.mdField, c.uuid)
+          .pipe(
+            getFirstSucceededRemoteDataPayload(),
+          )),
+      );
+    } else {
+      this.vocabulary$ = observableOf(undefined);
+    }
+
+    this.isAuthorityControlled$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result)),
+    );
+
+    this.isHierarchicalVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result) && result.hierarchical),
+    );
+
+    this.isScrollableVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result) && result.scrollable),
+    );
+
+    this.isSuggesterVocabulary$ = this.vocabulary$.pipe(
+      map((result: Vocabulary) => isNotEmpty(result) && !result.hierarchical && !result.scrollable),
+    );
+
+    this.model$ = this.vocabulary$.pipe(
+      map((vocabulary: Vocabulary) => {
+        let formFieldValue;
+        if (isNotEmpty(this.mdValue.newValue.value)) {
+          formFieldValue = new FormFieldMetadataValueObject();
+          formFieldValue.value = this.mdValue.newValue.value;
+          formFieldValue.display = this.mdValue.newValue.value;
+          if (this.mdValue.newValue.authority) {
+            formFieldValue.authority = this.mdValue.newValue.authority;
+            formFieldValue.confidence = this.mdValue.newValue.confidence;
+          }
+        } else {
+          formFieldValue = this.mdValue.newValue.value;
+        }
+
+        const vocabularyOptions = vocabulary ? {
+          closed: false,
+          name: vocabulary.name,
+        } as VocabularyOptions : null;
+
+        if (!vocabulary.scrollable) {
+          const model: DsDynamicOneboxModelConfig = {
+            id: 'authorityField',
+            label: `${this.dsoType}.edit.metadata.edit.value`,
+            vocabularyOptions: vocabularyOptions,
+            metadataFields: [this.mdField],
+            value: formFieldValue,
+            repeatable: false,
+            submissionId: 'edit-metadata',
+            hasSelectableMetadata: false,
+          };
+          return new DynamicOneboxModel(model);
+        } else {
+          const model: DynamicScrollableDropdownModelConfig = {
+            id: 'authorityField',
+            label: `${this.dsoType}.edit.metadata.edit.value`,
+            placeholder: `${this.dsoType}.edit.metadata.edit.value`,
+            vocabularyOptions: vocabularyOptions,
+            metadataFields: [this.mdField],
+            value: formFieldValue,
+            repeatable: false,
+            submissionId: 'edit-metadata',
+            hasSelectableMetadata: false,
+            maxOptions: 10,
+          };
+          return new DynamicScrollableDropdownModel(model);
+        }
+      }));
+  }
+
+  /**
+   * Change callback for the component. Check if the mdField has changed to retrieve whether it is metadata
+   * that uses a controlled vocabulary and update the related properties
+   *
+   * @param {SimpleChanges} changes
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (isNotEmpty(changes.mdField) && !changes.mdField.firstChange) {
+      if (isNotEmpty(changes.mdField.currentValue) ) {
+        if (isNotEmpty(changes.mdField.previousValue) &&
+          changes.mdField.previousValue !== changes.mdField.currentValue) {
+          // Clear authority value in case it has been assigned with the previous metadataField used
+          this.mdValue.newValue.authority = null;
+          this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+        }
+
+        // Only ask if the current mdField have a period character to reduce request
+        if (changes.mdField.currentValue.includes('.')) {
+          this.validateMetadataField().subscribe((isValid: boolean) => {
+            if (isValid) {
+              this.initAuthorityProperties();
+              this.cdr.detectChanges();
+            }
+          });
+        }
+      }
+    }
+  }
+
+  /**
+   * Validate the metadata field to check if it exists on the server and return an observable boolean for success/error
+   */
+  validateMetadataField(): Observable<boolean> {
+    return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd) => {
+        if (rd.hasSucceeded) {
+          return observableOf(rd).pipe(
+            metadataFieldsToString(),
+            take(1),
+            map((fields: string[]) => fields.indexOf(this.mdField) > -1),
+          );
+        } else {
+          this.notificationsService.error(this.translate.instant(`${this.dsoType}.edit.metadata.metadatafield.error`), rd.errorMessage);
+          return [false];
+        }
+      }),
+    );
+  }
+
+  /**
+   * Checks if this field use a authority vocabulary
+   */
+  isAuthorityControlled(): Observable<boolean> {
+    return this.isAuthorityControlled$;
+  }
+
+  /**
+   * Checks if configured vocabulary is Hierarchical or not
+   */
+  isHierarchicalVocabulary(): Observable<boolean> {
+    return this.isHierarchicalVocabulary$;
+  }
+
+  /**
+   * Checks if configured vocabulary is Scrollable or not
+   */
+  isScrollableVocabulary(): Observable<boolean> {
+    return this.isScrollableVocabulary$;
+  }
+
+  /**
+   * Checks if configured vocabulary is Suggester or not
+   * (a vocabulary not Scrollable and not Hierarchical that uses an autocomplete field)
+   */
+  isSuggesterVocabulary(): Observable<boolean> {
+    return this.isSuggesterVocabulary$;
+  }
+
+  /**
+   * Process the change of authority field value updating the authority key and confidence as necessary
+   */
+  onChangeAuthorityField(event): void {
+    this.mdValue.newValue.value = event.value;
+    if (event.authority) {
+      this.mdValue.newValue.authority = event.authority;
+      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+    } else {
+      this.mdValue.newValue.authority = null;
+      this.mdValue.newValue.confidence = ConfidenceType.CF_UNSET;
+    }
+    this.confirm.emit(false);
+  }
+
+  /**
+   * Returns an observable with the {@link DynamicOneboxModel} or {@link DynamicScrollableDropdownModel} model used
+   * for the authority field
+   */
+  getModel(): Observable<DynamicOneboxModel | DynamicScrollableDropdownModel> {
+    return this.model$;
+  }
+
+  /**
+   * Change the status of the editingAuthority property
+   * @param status
+   */
+  onChangeEditingAuthorityStatus(status: boolean) {
+    this.editingAuthority = status;
+  }
+
+  /**
+   * Processes the change in authority value, updating the confidence as necessary.
+   * If the authority key is cleared, the confidence is set to {@link ConfidenceType.CF_NOVALUE}.
+   * If the authority key is edited and differs from the original, the confidence is set to {@link ConfidenceType.CF_ACCEPTED}.
+   */
+  onChangeAuthorityKey() {
+    if (this.mdValue.newValue.authority === '') {
+      this.mdValue.newValue.confidence = ConfidenceType.CF_NOVALUE;
+      this.confirm.emit(false);
+    } else if (this.mdValue.newValue.authority !== this.mdValue.originalValue.authority) {
+      this.mdValue.newValue.confidence = ConfidenceType.CF_ACCEPTED;
+      this.confirm.emit(false);
+    }
+  }
+
+}
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
new file mode 100644
index 0000000000..d6c72abdb9
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -0,0 +1,95 @@
+<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)"
+            [title]="dsoType + '.edit.metadata.add-button' | translate"
+            (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)"
+            [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
+            (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)"
+            [title]="dsoType + '.edit.metadata.save-button' | translate"
+            (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"
+            [title]="dsoType + '.edit.metadata.discard-button' | translate"
+            [disabled]="!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>
+
+  <div role="table" [attr.aria-label]="'item.edit.head' | translate">
+    <ds-dso-edit-metadata-headers [dsoType]="dsoType"></ds-dso-edit-metadata-headers>
+    <div class="d-flex flex-row ds-field-row" role="row" *ngIf="form.newValue">
+      <div class="lbl-cell ds-success" role="rowheader">
+        <ds-metadata-field-selector [dsoType]="dsoType"
+                                    [(mdField)]="newMdField"
+                                    [autofocus]="true">
+        </ds-metadata-field-selector>
+      </div>
+      <div class="flex-grow-1 ds-drop-list" role="cell">
+        <div role="table">
+          <ds-dso-edit-metadata-value-headers role="presentation" [dsoType]="dsoType"></ds-dso-edit-metadata-value-headers>
+          <ds-dso-edit-metadata-value [dso]="dso"
+                                      [mdValue]="form.newValue"
+                                      [dsoType]="dsoType"
+                                      [saving$]="savingOrLoadingFieldValidation$"
+                                      [isOnlyValue]="true"
+                                      [mdField]="newMdField"
+                                      (confirm)="confirmNewValue($event)"
+                                      (remove)="form.newValue = undefined"
+                                      (undo)="form.newValue = undefined">
+          </ds-dso-edit-metadata-value>
+        </div>
+      </div>
+    </div>
+    <div class="d-flex flex-row ds-field-row" role="row" *ngFor="let mdField of form.fieldKeys">
+      <div class="lbl-cell" role="rowheader">
+        <span class="dont-break-out preserve-line-breaks">{{ mdField }}</span>
+        <div class="btn btn-warning reset-order-button mt-2 w-100" *ngIf="form.hasOrderChanges(mdField)"
+             (click)="form.resetOrder(mdField); onValueSaved()">
+          {{ dsoType + '.edit.metadata.reset-order-button' | translate }}
+        </div>
+      </div>
+      <ds-dso-edit-metadata-field-values class="flex-grow-1" role="cell"
+                                         [dso]="dso"
+                                         [form]="form"
+                                         [dsoType]="dsoType"
+                                         [saving$]="saving$"
+                                         [draggingMdField$]="draggingMdField$"
+                                         [mdField]="mdField"
+                                         (valueSaved)="onValueSaved()">
+      </ds-dso-edit-metadata-field-values>
+    </div>
+  </div>
+
+  <div *ngIf="isEmpty && !form.newValue">
+    <ds-alert [content]="dsoType + '.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
+  </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)"
+              [title]="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)"
+              [title]="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"
+              [title]="dsoType + '.edit.metadata.discard-button' | translate"
+              [disabled]="!hasChanges || (saving$ | async)"
+              (click)="discard()">
+        <i class="fas fa-times" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.discard-button' | translate }}
+      </button>
+    </div>
+  </div>
+</div>
+<ds-loading *ngIf="!form"></ds-loading>
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
new file mode 100644
index 0000000000..3a181fd130
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
@@ -0,0 +1,21 @@
+.lbl-cell {
+  min-width: var(--ds-dso-edit-field-width);
+  max-width: var(--ds-dso-edit-field-width);
+  background-color: var(--bs-gray-100);
+  font-weight: bold;
+  padding: 1rem;
+  border: 1px solid var(--bs-gray-200);
+
+  &.ds-success {
+    background-color: var(--ds-success-bg);
+    border: 1px solid var(--bs-success);
+  }
+}
+
+.ds-field-row {
+  border: 1px solid var(--bs-gray-400);
+}
+
+.reset-order-button:hover {
+  cursor: pointer;
+}
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
new file mode 100644
index 0000000000..2064d198e1
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.spec.ts
@@ -0,0 +1,202 @@
+import {
+  DebugElement,
+  Injectable,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { ITEM } from '../../core/shared/item.resource-type';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
+
+const ADD_BTN = 'add';
+const REINSTATE_BTN = 'reinstate';
+const SAVE_BTN = 'save';
+const DISCARD_BTN = 'discard';
+
+@Injectable()
+class TestDataService {
+  patch(object: Item, operations: Operation[]): Observable<RemoteData<Item>> {
+    return createSuccessfulRemoteDataObject$(object);
+  }
+}
+
+describe('DsoEditMetadataComponent', () => {
+  let component: DsoEditMetadataComponent;
+  let fixture: ComponentFixture<DsoEditMetadataComponent>;
+
+  let notificationsService: NotificationsService;
+
+  let dso: DSpaceObject;
+
+  beforeEach(waitForAsync(() => {
+    dso = Object.assign(new Item(), {
+      type: ITEM,
+      metadata: {
+        'dc.title': [
+          Object.assign(new MetadataValue(), {
+            value: 'Test Title',
+            language: 'en',
+            place: 0,
+          }),
+        ],
+        'dc.subject': [
+          Object.assign(new MetadataValue(), {
+            value: 'Subject One',
+            language: 'en',
+            place: 0,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Two',
+            language: 'en',
+            place: 1,
+          }),
+          Object.assign(new MetadataValue(), {
+            value: 'Subject Three',
+            language: 'en',
+            place: 2,
+          }),
+        ],
+      },
+    });
+
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
+
+    TestBed.configureTestingModule({
+      declarations: [DsoEditMetadataComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        TestDataService,
+        { provide: DATA_SERVICE_FACTORY, useValue: jasmine.createSpy('getDataServiceFor').and.returnValue(TestDataService) },
+        { provide: NotificationsService, useValue: notificationsService },
+        ArrayMoveChangeAnalyzer,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMetadataComponent);
+    component = fixture.componentInstance;
+    component.dso = dso;
+    fixture.detectChanges();
+  });
+
+  describe('when no changes have been made', () => {
+    assertButton(ADD_BTN, true, false);
+    assertButton(REINSTATE_BTN, false);
+    assertButton(SAVE_BTN, true, true);
+    assertButton(DISCARD_BTN, true, true);
+  });
+
+  describe('when the form contains changes', () => {
+    beforeEach(() => {
+      component.form.fields['dc.title'][0].newValue.value = 'Updated Title Once';
+      component.form.fields['dc.title'][0].confirmChanges();
+      component.form.resetReinstatable();
+      component.onValueSaved();
+      fixture.detectChanges();
+    });
+
+    assertButton(SAVE_BTN, true, false);
+    assertButton(DISCARD_BTN, true, false);
+
+    describe('and they were discarded', () => {
+      beforeEach(() => {
+        component.discard();
+        fixture.detectChanges();
+      });
+
+      assertButton(REINSTATE_BTN, true, false);
+      assertButton(SAVE_BTN, true, true);
+      assertButton(DISCARD_BTN, false);
+
+      describe('and a new change is made', () => {
+        beforeEach(() => {
+          component.form.fields['dc.title'][0].newValue.value = 'Updated Title Twice';
+          component.form.fields['dc.title'][0].confirmChanges();
+          component.form.resetReinstatable();
+          component.onValueSaved();
+          fixture.detectChanges();
+        });
+
+        assertButton(REINSTATE_BTN, false);
+        assertButton(SAVE_BTN, true, false);
+        assertButton(DISCARD_BTN, true, false);
+      });
+    });
+  });
+
+  describe('when a new value is present', () => {
+    beforeEach(() => {
+      component.add();
+      fixture.detectChanges();
+    });
+
+    assertButton(ADD_BTN, true, true);
+
+    it('should display a row with a field selector and metadata value', () => {
+      expect(fixture.debugElement.query(By.css('ds-metadata-field-selector'))).toBeTruthy();
+      expect(fixture.debugElement.query(By.css('ds-dso-edit-metadata-value'))).toBeTruthy();
+    });
+
+    describe('and gets assigned to a metadata field', () => {
+      beforeEach(() => {
+        component.form.newValue.newValue.value = 'New Subject';
+        component.form.setMetadataField('dc.subject');
+        component.form.resetReinstatable();
+        component.onValueSaved();
+        fixture.detectChanges();
+      });
+
+      assertButton(ADD_BTN, true, false);
+
+      it('should not display the separate row with field selector and metadata value anymore', () => {
+        expect(fixture.debugElement.query(By.css('ds-metadata-field-selector'))).toBeNull();
+        expect(fixture.debugElement.query(By.css('ds-dso-edit-metadata-value'))).toBeNull();
+      });
+    });
+  });
+
+  function assertButton(name: string, exists: boolean, disabled: boolean = false): void {
+    describe(`${name} button`, () => {
+      let btn: DebugElement;
+
+      beforeEach(() => {
+        btn = fixture.debugElement.query(By.css(`#dso-${name}-btn`));
+      });
+
+      if (exists) {
+        it('should exist', () => {
+          expect(btn).toBeTruthy();
+        });
+
+        it(`should${disabled ? ' ' : ' not '}be disabled`, () => {
+          expect(btn.nativeElement.disabled).toBe(disabled);
+        });
+      } else {
+        it('should not exist', () => {
+          expect(btn).toBeNull();
+        });
+      }
+    });
+  }
+
+});
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
new file mode 100644
index 0000000000..e48f1d4ebe
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -0,0 +1,276 @@
+import {
+  Component,
+  Inject,
+  Injector,
+  Input,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { ArrayMoveChangeAnalyzer } from '../../core/data/array-move-change-analyzer.service';
+import { DATA_SERVICE_FACTORY } from '../../core/data/base/data-service.decorator';
+import { HALDataService } from '../../core/data/base/hal-data-service.interface';
+import { RemoteData } from '../../core/data/remote-data';
+import { UpdateDataService } from '../../core/data/update-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { AlertType } from '../../shared/alert/alert-type';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { DsoEditMetadataForm } from './dso-edit-metadata-form';
+import { MetadataFieldSelectorComponent } from './metadata-field-selector/metadata-field-selector.component';
+
+@Component({
+  selector: 'ds-dso-edit-metadata',
+  styleUrls: ['./dso-edit-metadata.component.scss'],
+  templateUrl: './dso-edit-metadata.component.html',
+})
+/**
+ * Component showing a table of all metadata on a DSpaceObject and options to modify them
+ */
+export class DsoEditMetadataComponent implements OnInit, OnDestroy {
+  /**
+   * DSpaceObject to edit metadata for
+   */
+  @Input() dso: DSpaceObject;
+
+  /**
+   * Reference to the component responsible for showing a metadata-field selector
+   * Used to validate its contents (existing metadata field) before adding a new metadata value
+   */
+  @ViewChild(MetadataFieldSelectorComponent) metadataFieldSelectorComponent: MetadataFieldSelectorComponent;
+
+  /**
+   * Resolved update data-service for the given DSpaceObject (depending on its type, e.g. ItemDataService for an Item)
+   * Used to send the PATCH request
+   */
+  @Input() updateDataService: UpdateDataService<DSpaceObject>;
+
+  /**
+   * Type of the DSpaceObject in String
+   * Used to resolve i18n messages
+   */
+  dsoType: string;
+
+  /**
+   * A dynamic form object containing all information about the metadata and the changes made to them, see {@link DsoEditMetadataForm}
+   */
+  form: DsoEditMetadataForm;
+
+  /**
+   * The metadata field entered by the user for a new metadata value
+   */
+  newMdField: string;
+
+  // Properties determined by the state of the dynamic form, updated by onValueSaved()
+  isReinstatable: boolean;
+  hasChanges: boolean;
+  isEmpty: boolean;
+
+  /**
+   * Whether or not the form is currently being submitted
+   */
+  saving$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * Tracks for which metadata-field a drag operation is taking place
+   * Null when no drag is currently happening for any field
+   * This is a BehaviorSubject that is passed down to child components, to give them the power to alter the state
+   */
+  draggingMdField$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+
+  /**
+   * Whether or not the metadata field is currently being validated
+   */
+  loadingFieldValidation$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * Combination of saving$ and loadingFieldValidation$
+   * Emits true when any of the two emit true
+   */
+  savingOrLoadingFieldValidation$: Observable<boolean>;
+
+  /**
+   * The AlertType enumeration for access in the component's template
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * Subscription for updating the current DSpaceObject
+   * Unsubscribed from in ngOnDestroy()
+   */
+  dsoUpdateSubscription: Subscription;
+
+  constructor(protected route: ActivatedRoute,
+              protected notificationsService: NotificationsService,
+              protected translateService: TranslateService,
+              protected parentInjector: Injector,
+              protected arrayMoveChangeAnalyser: ArrayMoveChangeAnalyzer<number>,
+              @Inject(DATA_SERVICE_FACTORY) protected getDataServiceFor: (resourceType: ResourceType) => GenericConstructor<HALDataService<any>>) {
+  }
+
+  /**
+   * Read the route (or parent route)'s data to retrieve the current DSpaceObject
+   * After it's retrieved, initialise the data-service and form
+   */
+  ngOnInit(): void {
+    if (hasNoValue(this.dso)) {
+      this.dsoUpdateSubscription = observableCombineLatest([this.route.data, this.route.parent.data]).pipe(
+        map(([data, parentData]: [Data, Data]) => Object.assign({}, data, parentData)),
+        map((data: any) => data.dso),
+      ).subscribe((rd: RemoteData<DSpaceObject>) => {
+        this.dso = rd.payload;
+        this.initDataService();
+        this.initForm();
+      });
+    } else {
+      this.initDataService();
+      this.initForm();
+    }
+    this.savingOrLoadingFieldValidation$ = observableCombineLatest([this.saving$, this.loadingFieldValidation$]).pipe(
+      map(([saving, loading]: [boolean, boolean]) => saving || loading),
+    );
+  }
+
+  /**
+   * Initialise (resolve) the data-service for the current DSpaceObject
+   */
+  initDataService(): void {
+    let type: ResourceType;
+    if (typeof this.dso.type === 'string') {
+      type = new ResourceType(this.dso.type);
+    } else {
+      type = this.dso.type;
+    }
+    if (hasNoValue(this.updateDataService)) {
+      const provider = this.getDataServiceFor(type);
+      this.updateDataService = Injector.create({
+        providers: [],
+        parent: this.parentInjector,
+      }).get(provider);
+    }
+    this.dsoType = type.value;
+  }
+
+  /**
+   * Initialise the dynamic form object by passing the DSpaceObject's metadata
+   * Call onValueSaved() to update the form's state properties
+   */
+  initForm(): void {
+    this.form = new DsoEditMetadataForm(this.dso.metadata);
+    this.onValueSaved();
+  }
+
+  /**
+   * Update the form's state properties
+   */
+  onValueSaved(): void {
+    this.hasChanges = this.form.hasChanges();
+    this.isReinstatable = this.form.isReinstatable();
+    this.isEmpty = Object.keys(this.form.fields).length === 0;
+  }
+
+  /**
+   * Submit the current changes to the form by retrieving json PATCH operations from the form and sending it to the
+   * DSpaceObject's data-service
+   * Display notificiations and reset the form afterwards if successful
+   */
+  submit(): void {
+    this.saving$.next(true);
+    this.updateDataService.patch(this.dso, this.form.getOperations(this.arrayMoveChangeAnalyser)).pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((rd: RemoteData<DSpaceObject>) => {
+      this.saving$.next(false);
+      if (rd.hasFailed) {
+        this.notificationsService.error(this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.error.title`), rd.errorMessage);
+      } else {
+        this.notificationsService.success(
+          this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.title`),
+          this.translateService.instant(`${this.dsoType}.edit.metadata.notifications.saved.content`),
+        );
+        this.dso = rd.payload;
+        this.initForm();
+      }
+    });
+  }
+
+  /**
+   * Confirm the newly added value
+   * @param saved Whether or not the value was manually saved (only then, add the value to its metadata field)
+   */
+  confirmNewValue(saved: boolean): void {
+    if (saved) {
+      this.setMetadataField();
+    }
+  }
+
+  /**
+   * Set the metadata field of the temporary added new metadata value
+   * This will move the new value to its respective parent metadata field
+   * Validate the metadata field first
+   */
+  setMetadataField(): void {
+    this.form.resetReinstatable();
+    this.loadingFieldValidation$.next(true);
+    this.metadataFieldSelectorComponent.validate().subscribe((valid: boolean) => {
+      this.loadingFieldValidation$.next(false);
+      if (valid) {
+        this.form.setMetadataField(this.newMdField);
+        this.onValueSaved();
+      }
+    });
+  }
+
+  /**
+   * Add a new temporary metadata value
+   */
+  add(): void {
+    this.newMdField = undefined;
+    this.form.add();
+  }
+
+  /**
+   * Discard all changes within the current form
+   */
+  discard(): void {
+    this.form.discard();
+    this.onValueSaved();
+  }
+
+  /**
+   * Restore any changes previously discarded from the form
+   */
+  reinstate(): void {
+    this.form.reinstate();
+    this.onValueSaved();
+  }
+
+  /**
+   * Unsubscribe from any open subscriptions
+   */
+  ngOnDestroy(): void {
+    if (hasValue(this.dsoUpdateSubscription)) {
+      this.dsoUpdateSubscription.unsubscribe();
+    }
+  }
+
+}
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
new file mode 100644
index 0000000000..3f5af76051
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -0,0 +1,20 @@
+<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();" />
+  <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)">
+        <button class="d-block dropdown-item" (click)="select(mdFieldOption)">
+          <span [innerHTML]="mdFieldOption"></span>
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.html
rename to src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.scss
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
new file mode 100644
index 0000000000..c05d31d4c5
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.spec.ts
@@ -0,0 +1,134 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
+import { RegistryService } from '../../../core/registry/registry.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataFieldSelectorComponent } from './metadata-field-selector.component';
+
+describe('MetadataFieldSelectorComponent', () => {
+  let component: MetadataFieldSelectorComponent;
+  let fixture: ComponentFixture<MetadataFieldSelectorComponent>;
+
+  let registryService: RegistryService;
+  let notificationsService: NotificationsService;
+
+  let metadataSchema: MetadataSchema;
+  let metadataFields: MetadataField[];
+
+  beforeEach(waitForAsync(() => {
+    metadataSchema = Object.assign(new MetadataSchema(), {
+      id: 0,
+      prefix: 'dc',
+      namespace: 'http://dublincore.org/documents/dcmi-terms/',
+    });
+    metadataFields = [
+      Object.assign(new MetadataField(), {
+        id: 0,
+        element: 'description',
+        qualifier: undefined,
+        schema: createSuccessfulRemoteDataObject$(metadataSchema),
+      }),
+      Object.assign(new MetadataField(), {
+        id: 1,
+        element: 'description',
+        qualifier: 'abstract',
+        schema: createSuccessfulRemoteDataObject$(metadataSchema),
+      }),
+    ];
+
+    registryService = jasmine.createSpyObj('registryService', {
+      queryMetadataFields: createSuccessfulRemoteDataObject$(createPaginatedList(metadataFields)),
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', ['error', 'success']);
+
+    TestBed.configureTestingModule({
+      declarations: [MetadataFieldSelectorComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: RegistryService, useValue: registryService },
+        { provide: NotificationsService, useValue: notificationsService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MetadataFieldSelectorComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('when a query is entered', () => {
+    const query = 'test query';
+
+    beforeEach(() => {
+      component.showInvalid = true;
+      component.query$.next(query);
+    });
+
+    it('should reset showInvalid', () => {
+      expect(component.showInvalid).toBeFalse();
+    });
+
+    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'));
+    });
+  });
+
+  describe('validate', () => {
+    it('should return an observable true and show no feedback if the current mdField exists in registry', (done) => {
+      component.mdField = 'dc.description.abstract';
+      component.validate().subscribe((result) => {
+        expect(result).toBeTrue();
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.invalid-feedback'))).toBeNull();
+        done();
+      });
+    });
+
+    it('should return an observable false and show invalid feedback if the current mdField is missing in registry', (done) => {
+      component.mdField = 'dc.fake.field';
+      component.validate().subscribe((result) => {
+        expect(result).toBeFalse();
+        fixture.detectChanges();
+        expect(fixture.debugElement.query(By.css('.invalid-feedback'))).toBeTruthy();
+        done();
+      });
+    });
+
+    describe('when querying the metadata fields returns an error response', () => {
+      beforeEach(() => {
+        (registryService.queryMetadataFields as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$('Failed'));
+      });
+
+      it('should return an observable false and show a notification', (done) => {
+        component.mdField = 'dc.description.abstract';
+        component.validate().subscribe((result) => {
+          expect(result).toBeFalse();
+          expect(notificationsService.error).toHaveBeenCalled();
+          done();
+        });
+      });
+    });
+  });
+});
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
new file mode 100644
index 0000000000..b7669333b0
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.ts
@@ -0,0 +1,203 @@
+import {
+  AfterViewInit,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormControl } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { RegistryService } from '../../../core/registry/registry.service';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  metadataFieldsToString,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+
+@Component({
+  selector: 'ds-metadata-field-selector',
+  styleUrls: ['./metadata-field-selector.component.scss'],
+  templateUrl: './metadata-field-selector.component.html',
+})
+/**
+ * Component displaying a searchable input for metadata-fields
+ */
+export class MetadataFieldSelectorComponent implements OnInit, OnDestroy, AfterViewInit {
+  /**
+   * Type of the DSpaceObject
+   * Used to resolve i18n messages
+   */
+  @Input() dsoType: string;
+
+  /**
+   * The currently entered metadata field
+   */
+  @Input() mdField: string;
+
+  /**
+   * If true, the input will be automatically focussed upon when the component is first loaded
+   */
+  @Input() autofocus = false;
+
+  /**
+   * Emit any changes made to the metadata field
+   * This will only emit after a debounce takes place to avoid constant emits when the user is typing
+   */
+  @Output() mdFieldChange = new EventEmitter<string>();
+
+  /**
+   * Reference to the metadata-field's input
+   */
+  @ViewChild('mdFieldInput', { static: true }) mdFieldInput: ElementRef;
+
+  /**
+   * 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[]>;
+
+  /**
+   * FormControl for the input
+   */
+  public input: UntypedFormControl = new UntypedFormControl();
+
+  /**
+   * The current query to update mdFieldOptions$ for
+   * This is controlled by a debounce, to avoid too many requests
+   */
+  query$: BehaviorSubject<string> = new BehaviorSubject<string>(null);
+
+  /**
+   * The amount of time to debounce the query for (in ms)
+   */
+  debounceTime = 300;
+
+  /**
+   * Whether or not the the user just selected a value
+   * This flag avoids the metadata field from updating twice, which would result in the dropdown opening again right after selecting a value
+   */
+  selectedValueLoading = false;
+
+  /**
+   * Whether or not to show the invalid feedback
+   * True when validate() is called and the mdField isn't present in the available metadata fields retrieved from the server
+   */
+  showInvalid = false;
+
+  /**
+   * Subscriptions to unsubscribe from on destroy
+   */
+  subs: Subscription[] = [];
+
+  constructor(protected registryService: RegistryService,
+              protected notificationsService: NotificationsService,
+              protected translate: TranslateService) {
+  }
+
+  /**
+   * Subscribe to any changes made to the input, with a debounce and fire a query, as well as emit the change from this component
+   * Update the mdFieldOptions$ depending on the query$ fired by querying the server
+   */
+  ngOnInit(): void {
+    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 [[]];
+        }
+      }),
+    );
+  }
+
+  /**
+   * Focus the input if autofocus is enabled
+   */
+  ngAfterViewInit(): void {
+    if (this.autofocus) {
+      this.mdFieldInput.nativeElement.focus();
+    }
+  }
+
+  /**
+   * Validate the metadata field to check if it exists on the server and return an observable boolean for success/error
+   * Upon subscribing to the returned observable, the showInvalid flag is updated accordingly to show the feedback under the input
+   */
+  validate(): Observable<boolean> {
+    return this.registryService.queryMetadataFields(this.mdField, null, true, false, followLink('schema')).pipe(
+      getFirstCompletedRemoteData(),
+      switchMap((rd) => {
+        if (rd.hasSucceeded) {
+          return of(rd).pipe(
+            metadataFieldsToString(),
+            take(1),
+            map((fields: string[]) => fields.indexOf(this.mdField) > -1),
+            tap((exists: boolean) => this.showInvalid = !exists),
+          );
+        } else {
+          this.notificationsService.error(this.translate.instant(`${this.dsoType}.edit.metadata.metadatafield.error`), rd.errorMessage);
+          return [false];
+        }
+      }),
+    );
+  }
+
+  /**
+   * Select a metadata field from the dropdown options
+   * @param mdFieldOption
+   */
+  select(mdFieldOption: string): void {
+    this.selectedValueLoading = true;
+    this.input.setValue(mdFieldOption);
+  }
+
+  /**
+   * Unsubscribe from any open subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs.filter((sub: Subscription) => hasValue(sub)).forEach((sub: Subscription) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
new file mode 100644
index 0000000000..614217047b
--- /dev/null
+++ b/src/app/dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component.ts
@@ -0,0 +1,37 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { UpdateDataService } from '../../core/data/update-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { DsoEditMetadataComponent } from './dso-edit-metadata.component';
+
+@Component({
+  selector: 'ds-themed-dso-edit-metadata',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html',
+})
+export class ThemedDsoEditMetadataComponent extends ThemedComponent<DsoEditMetadataComponent> {
+
+  @Input() dso: DSpaceObject;
+
+  @Input() updateDataService: UpdateDataService<DSpaceObject>;
+
+  protected inAndOutputNames: (keyof DsoEditMetadataComponent & keyof this)[] = ['dso', 'updateDataService'];
+
+  protected getComponentName(): string {
+    return 'DsoEditMetadataComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./dso-edit-metadata.component`);
+  }
+
+
+}
diff --git a/src/app/dso-shared/dso-shared.module.ts b/src/app/dso-shared/dso-shared.module.ts
new file mode 100644
index 0000000000..d097e27f6c
--- /dev/null
+++ b/src/app/dso-shared/dso-shared.module.ts
@@ -0,0 +1,39 @@
+import { NgModule } from '@angular/core';
+
+import { FormModule } from '../shared/form/form.module';
+import { SharedModule } from '../shared/shared.module';
+import { DsoEditMetadataComponent } from './dso-edit-metadata/dso-edit-metadata.component';
+import { DsoEditMetadataFieldValuesComponent } from './dso-edit-metadata/dso-edit-metadata-field-values/dso-edit-metadata-field-values.component';
+import { DsoEditMetadataHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-headers/dso-edit-metadata-headers.component';
+import { DsoEditMetadataValueComponent } from './dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component';
+import { DsoEditMetadataValueHeadersComponent } from './dso-edit-metadata/dso-edit-metadata-value-headers/dso-edit-metadata-value-headers.component';
+import { MetadataFieldSelectorComponent } from './dso-edit-metadata/metadata-field-selector/metadata-field-selector.component';
+import { ThemedDsoEditMetadataComponent } from './dso-edit-metadata/themed-dso-edit-metadata.component';
+
+@NgModule({
+  imports: [
+    SharedModule,
+    FormModule,
+  ],
+  declarations: [
+    DsoEditMetadataComponent,
+    ThemedDsoEditMetadataComponent,
+    MetadataFieldSelectorComponent,
+    DsoEditMetadataFieldValuesComponent,
+    DsoEditMetadataValueComponent,
+    DsoEditMetadataHeadersComponent,
+    DsoEditMetadataValueHeadersComponent,
+  ],
+  exports: [
+    DsoEditMetadataComponent,
+    ThemedDsoEditMetadataComponent,
+    MetadataFieldSelectorComponent,
+    DsoEditMetadataFieldValuesComponent,
+    DsoEditMetadataValueComponent,
+    DsoEditMetadataHeadersComponent,
+    DsoEditMetadataValueHeadersComponent,
+  ],
+})
+export class DsoSharedModule {
+
+}
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
index df9e8ea7fd..af19acfdb9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { of as observableOf } from 'rxjs';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalIssueGridElementComponent } from './journal-issue-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,22 +26,22 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'journal.title': [
       {
         language: 'en_US',
-        value: 'The journal title'
-      }
-    ]
-  }
+        value: 'The journal title',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueGridElementComponent', () => {
@@ -48,11 +57,12 @@ describe('JournalIssueGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [JournalIssueGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
index 3e57731613..29d2d1600e 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-issue/journal-issue-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('JournalIssue', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
index ac082e7f1b..9bdd1b915a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { JournalVolumeGridElementComponent } from './journal-volume-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { of as observableOf } from 'rxjs';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalVolumeGridElementComponent } from './journal-volume-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,22 +26,22 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'A description for the journal volume'
-      }
-    ]
-  }
+        value: 'A description for the journal volume',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeGridElementComponent', () => {
@@ -48,11 +57,12 @@ describe('JournalVolumeGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [JournalVolumeGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
index eb88c25a12..93b0fa3ab9 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal-volume/journal-volume-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('JournalVolume', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
index 93287313aa..492d10b86d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { JournalGridElementComponent } from './journal-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalGridElementComponent } from './journal-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,28 +26,28 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.editor': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'creativework.publisher': [
       {
         language: 'en_US',
-        value: 'A company'
-      }
+        value: 'A company',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'This is the description'
-      }
-    ]
-  }
+        value: 'This is the description',
+      },
+    ],
+  },
 });
 
 describe('JournalGridElementComponent', () => {
@@ -54,11 +63,12 @@ describe('JournalGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [JournalGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
index 1d7c1e5b73..a2977e7d22 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/journal/journal-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Journal', ViewMode.GridElement)
 @Component({
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 c6c29c2f1a..33ce615305 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
@@ -3,23 +3,23 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
+                <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+                </ds-themed-thumbnail>
             </div>
         </span>
     <div class="card-body">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
@@ -34,9 +34,9 @@
           <span [innerHTML]="firstMetadataValue('journal.title')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+      <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>
       </div>
     </div>
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.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
index 0d71c0652f..a268c4b97b 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { JournalIssueSearchResultGridElementComponent } from './journal-issue-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { JournalIssueSearchResultGridElementComponent } from './journal-issue-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,22 +14,22 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'journal.title': [
       {
         language: 'en_US',
-        value: 'The journal title'
-      }
-    ]
-  }
+        value: 'The journal title',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -40,10 +40,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueSearchResultGridElementComponent', getEntityGridElementTestComponent(JournalIssueSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'journal-title']));
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.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
index a2a6c91d2d..c2c608507f 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-journal-issue-search-result-grid-element',
   styleUrls: ['./journal-issue-search-result-grid-element.component.scss'],
   templateUrl: './journal-issue-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Issue
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 5849105f96..de80448e8d 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
@@ -3,23 +3,23 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
                 <div>
-                    <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                    </ds-thumbnail>
+                    <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+                    </ds-themed-thumbnail>
                 </div>
             </span>
     <div class="card-body">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
@@ -34,9 +34,9 @@
           <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+      <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>
       </div>
     </div>
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.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
index 55948428f1..ba8793237a 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { JournalVolumeSearchResultGridElementComponent } from './journal-volume-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { JournalVolumeSearchResultGridElementComponent } from './journal-volume-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,22 +14,22 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.datePublished': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'A description for the journal volume'
-      }
-    ]
-  }
+        value: 'A description for the journal volume',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -40,10 +40,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeSearchResultGridElementComponent', getEntityGridElementTestComponent(JournalVolumeSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'description']));
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.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
index 17c8575a0e..e1c2cfb56d 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-journal-volume-search-result-grid-element',
   styleUrls: ['./journal-volume-search-result-grid-element.component.scss'],
   templateUrl: './journal-volume-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal Volume
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 9a3ea95c07..b537fb60d9 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
@@ -3,23 +3,23 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
+                <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+                </ds-themed-thumbnail>
             </div>
         </span>
     <div class="card-body">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
@@ -38,9 +38,9 @@
           <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+      <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>
       </div>
     </div>
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
index 44e6be0b12..40d7987c14 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { JournalSearchResultGridElementComponent } from './journal-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { JournalSearchResultGridElementComponent } from './journal-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,28 +14,28 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativework.editor': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'creativework.publisher': [
       {
         language: 'en_US',
-        value: 'A company'
-      }
+        value: 'A company',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'This is the description'
-      }
-    ]
-  }
+        value: 'This is the description',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -46,10 +46,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('JournalSearchResultGridElementComponent', getEntityGridElementTestComponent(JournalSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['editor', 'publisher', 'description']));
diff --git a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
index 4fa554ff3b..061f017e47 100644
--- a/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
+
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-journal-search-result-grid-element',
   styleUrls: ['./journal-search-result-grid-element.component.scss'],
   templateUrl: './journal-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Journal
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
index 8c33ffdc1e..4e519784e9 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.spec.ts
@@ -1,11 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { JournalIssueListElementComponent } from './journal-issue-list-element.component';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalIssueListElementComponent } from './journal-issue-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -13,22 +22,22 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'publicationvolume.volumeNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'publicationissue.issueNumber': [
       {
         language: 'en_US',
-        value: '5678'
-      }
-    ]
-  }
+        value: '5678',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueListElementComponent', () => {
@@ -43,11 +52,12 @@ describe('JournalIssueListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalIssueListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts
index 454c140050..a3891acd96 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-issue/journal-issue-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('JournalIssue', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-issue-list-element',
   styleUrls: ['./journal-issue-list-element.component.scss'],
-  templateUrl: './journal-issue-list-element.component.html'
+  templateUrl: './journal-issue-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Journal Issue
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
index f4bf0d250b..6fa7f7aea4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.spec.ts
@@ -1,11 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { JournalVolumeListElementComponent } from './journal-volume-list-element.component';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalVolumeListElementComponent } from './journal-volume-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -13,22 +22,22 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'journal.title': [
       {
         language: 'en_US',
-        value: 'This is just another journal title'
-      }
+        value: 'This is just another journal title',
+      },
     ],
     'publicationvolume.volumeNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
-    ]
-  }
+        value: '1234',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeListElementComponent', () => {
@@ -43,11 +52,12 @@ describe('JournalVolumeListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalVolumeListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts
index 5a5bfde49e..2e091f4560 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal-volume/journal-volume-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
+
 import { Item } from '../../../../core/shared/item.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @listableObjectComponent('JournalVolume', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-volume-list-element',
   styleUrls: ['./journal-volume-list-element.component.scss'],
-  templateUrl: './journal-volume-list-element.component.html'
+  templateUrl: './journal-volume-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Journal Volume
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
index b82876e364..bd8bdef60d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.spec.ts
@@ -1,11 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { JournalListElementComponent } from './journal-list-element.component';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { JournalListElementComponent } from './journal-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -13,16 +22,16 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'creativeworkseries.issn': [
       {
         language: 'en_US',
-        value: '1234'
-      }
-    ]
-  }
+        value: '1234',
+      },
+    ],
+  },
 });
 
 describe('JournalListElementComponent', () => {
@@ -34,14 +43,15 @@ describe('JournalListElementComponent', () => {
   };
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       declarations: [JournalListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts
index fa83c3cff4..a5d1278360 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/journal/journal-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Journal', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-list-element',
   styleUrls: ['./journal-list-element.component.scss'],
-  templateUrl: './journal-list-element.component.html'
+  templateUrl: './journal-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Journal
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 36b7e98c51..545e8c67a6 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
@@ -1,24 +1,24 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer"
+    <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">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out">
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         rel="noopener noreferrer"
+      <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>
-      <span *ngIf="linkType == linkTypes.None"
+      <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/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
index 178ed86c40..c615550cd4 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { JournalIssueSearchResultListElementComponent } from './journal-issue-search-result-list-element.component';
 
 let journalIssueListElementComponent: JournalIssueSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalIssueSearchResultListElementComponent>;
@@ -23,23 +31,23 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'publicationvolume.volumeNumber': [
           {
             language: 'en_US',
-            value: '1234'
-          }
+            value: '1234',
+          },
         ],
         'publicationissue.issueNumber': [
           {
             language: 'en_US',
-            value: '5678'
-          }
-        ]
-      }
-    })
+            value: '5678',
+          },
+        ],
+      },
+    }),
   });
 
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
@@ -51,23 +59,23 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('JournalIssueSearchResultListElementComponent', () => {
@@ -77,12 +85,12 @@ describe('JournalIssueSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -163,14 +171,14 @@ describe('JournalIssueSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalIssueSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalIssueSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
index 88f93d9d85..351adffb4d 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component.ts
@@ -1,27 +1,18 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-issue-search-result-list-element',
   styleUrls: ['./journal-issue-search-result-list-element.component.scss'],
-  templateUrl: './journal-issue-search-result-list-element.component.html'
+  templateUrl: './journal-issue-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Issue
  */
 export class JournalIssueSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
-  /**
-   * Display thumbnails if required by configuration
-   */
-  showThumbnails: boolean;
-
-  ngOnInit(): void {
-    super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-  }
-
 }
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 46683d7cdc..2ccbbe1095 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
@@ -1,24 +1,24 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer"
+    <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">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out">
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         rel="noopener noreferrer"
+      <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>
-      <span *ngIf="linkType == linkTypes.None"
+      <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/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
index 71fa83a3b1..ce90672c6f 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { JournalVolumeSearchResultListElementComponent } from './journal-volume-search-result-list-element.component';
 
 let journalVolumeListElementComponent: JournalVolumeSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalVolumeSearchResultListElementComponent>;
@@ -23,23 +31,23 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'journal.title': [
           {
             language: 'en_US',
-            value: 'This is just another journal title'
-          }
+            value: 'This is just another journal title',
+          },
         ],
         'publicationvolume.volumeNumber': [
           {
             language: 'en_US',
-            value: '1234'
-          }
-        ]
-      }
-    })
+            value: '1234',
+          },
+        ],
+      },
+    }),
   });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   new ItemSearchResult(),
@@ -50,23 +58,23 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('JournalVolumeSearchResultListElementComponent', () => {
@@ -76,12 +84,12 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -161,14 +169,14 @@ describe('JournalVolumeSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalVolumeSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalVolumeSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
index ec98946937..88df3817b7 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component.ts
@@ -1,27 +1,18 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-volume-search-result-list-element',
   styleUrls: ['./journal-volume-search-result-list-element.component.scss'],
-  templateUrl: './journal-volume-search-result-list-element.component.html'
+  templateUrl: './journal-volume-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal Volume
  */
 export class JournalVolumeSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
-  /**
-   * Display thumbnails if required by configuration
-   */
-  showThumbnails: boolean;
-
-  ngOnInit(): void {
-    super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-  }
-
 }
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 bf09305c86..3074d53df6 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,22 +1,22 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+    <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">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </a>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out">
+      <span *ngIf="linkType === linkTypes.None" class="lead item-list-title dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
       </ds-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+      <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>
-      <span *ngIf="linkType == linkTypes.None"
+      <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/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
index 07970d7128..2c7a360e13 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { JournalSearchResultListElementComponent } from './journal-search-result-list-element.component';
 
 let journalListElementComponent: JournalSearchResultListElementComponent;
 let fixture: ComponentFixture<JournalSearchResultListElementComponent>;
@@ -23,17 +31,17 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'creativeworkseries.issn': [
           {
             language: 'en_US',
-            value: '1234'
-          }
-        ]
-      }
-    })
+            value: '1234',
+          },
+        ],
+      },
+    }),
   });
 
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
@@ -45,24 +53,24 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
-  }
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
+  },
 );
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('JournalSearchResultListElementComponent', () => {
@@ -72,12 +80,12 @@ describe('JournalSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -133,14 +141,14 @@ describe('JournalSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [JournalSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
index 199bd3a748..f753006dad 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component.ts
@@ -1,27 +1,18 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-journal-search-result-list-element',
   styleUrls: ['./journal-search-result-list-element.component.scss'],
-  templateUrl: './journal-search-result-list-element.component.html'
+  templateUrl: './journal-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Journal
  */
 export class JournalSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
-  /**
-   * Display thumbnails if required by configuration
-   */
-  showThumbnails: boolean;
-
-  ngOnInit(): void {
-    super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-  }
-
 }
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
index b9593e7612..5cf06fdead 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { JournalIssueSidebarSearchListElementComponent } from './journal-issue-sidebar-search-list-element.component';
@@ -10,33 +10,33 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'publicationvolume.volumeNumber': [
         {
-          value: '5'
-        }
+          value: '5',
+        },
       ],
       'publicationissue.issueNumber': [
         {
-          value: '7'
-        }
-      ]
-    }
-  })
+          value: '7',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('JournalIssueSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7')
+  createSidebarSearchListElementTests(JournalIssueSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '5 - 7'),
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
index 84764e9e60..2e05cd7d02 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component.ts
@@ -1,17 +1,18 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalIssueSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-journal-issue-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalIssue" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
index eca1775c7d..16f1394533 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { JournalVolumeSidebarSearchListElementComponent } from './journal-volume-sidebar-search-list-element.component';
@@ -10,36 +10,36 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'journal.title': [
         {
-          value: 'journal title'
-        }
+          value: 'journal title',
+        },
       ],
       'publicationvolume.volumeNumber': [
         {
-          value: '1'
+          value: '1',
         },
         {
-          value: '2'
-        }
-      ]
-    }
-  })
+          value: '2',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('JournalVolumeSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)')
+  createSidebarSearchListElementTests(JournalVolumeSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'journal title (1) (2)'),
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
index 7af5487f40..b20e0045bc 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component.ts
@@ -1,17 +1,18 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalVolumeSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-journal-volume-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "JournalVolume" within the context of
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
index a47dbf0e2e..a7c2af3806 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { JournalSidebarSearchListElementComponent } from './journal-sidebar-search-list-element.component';
@@ -10,31 +10,31 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'creativeworkseries.issn': [
         {
-          value: '1234'
+          value: '1234',
         },
         {
-          value: '5678'
-        }
-      ]
-    }
-  })
+          value: '5678',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('JournalSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678')
+  createSidebarSearchListElementTests(JournalSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '1234, 5678'),
 );
diff --git a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
index 4a26b293d9..02359078d5 100644
--- a/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/journal-entities/item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component.ts
@@ -1,17 +1,18 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('JournalSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-journal-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Journal" within the context of
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 bf73a62447..3648b53b51 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
@@ -1,17 +1,13 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalissue.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"></ds-themed-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['publicationvolume.volumeNumber']"
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
index 3575cae797..b810d2ddd4 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.scss
@@ -1 +1,2 @@
 @import '../../../../../styles/variables.scss';
+
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
index 9228ffb009..74a83c1c83 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.spec.ts
@@ -1,12 +1,12 @@
-import { Item } from '../../../../core/shared/item.model';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { JournalIssueComponent } from './journal-issue.component';
 import {
   createRelationshipsObservable,
-  getItemPageFieldsTest
+  getItemPageFieldsTest,
 } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { JournalIssueComponent } from './journal-issue.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -14,29 +14,29 @@ const mockItem: Item = Object.assign(new Item(), {
     'publicationissue.issueNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'creativework.datePublished': [
       {
         language: 'en_US',
-        value: '2018'
-      }
+        value: '2018',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
+        value: 'desc',
+      },
     ],
     'creativework.keywords': [
       {
         language: 'en_US',
-        value: 'keyword'
-      }
-    ]
+        value: 'keyword',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('JournalIssueComponent', getItemPageFieldsTest(mockItem, JournalIssueComponent));
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index f5e9dc9b2b..e2aec38148 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-journal-issue',
   styleUrls: ['./journal-issue.component.scss'],
-  templateUrl: './journal-issue.component.html'
+  templateUrl: './journal-issue.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Issue
  */
-export class JournalIssueComponent extends VersionedItemComponent {
+export class JournalIssueComponent extends ItemComponent {
 }
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 b370431a27..b906905b47 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
@@ -1,17 +1,13 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journalvolume.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"></ds-themed-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['publicationvolume.volumeNumber']"
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
index eb18109da8..6c2549a497 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.spec.ts
@@ -1,12 +1,12 @@
-import { Item } from '../../../../core/shared/item.model';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { JournalVolumeComponent } from './journal-volume.component';
 import {
   createRelationshipsObservable,
-  getItemPageFieldsTest
+  getItemPageFieldsTest,
 } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { JournalVolumeComponent } from './journal-volume.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -14,23 +14,23 @@ const mockItem: Item = Object.assign(new Item(), {
     'publicationvolume.volumeNumber': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'creativework.datePublished': [
       {
         language: 'en_US',
-        value: '2018'
-      }
+        value: '2018',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
-    ]
+        value: 'desc',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('JournalVolumeComponent', getItemPageFieldsTest(mockItem, JournalVolumeComponent));
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index cc09be7959..677f307d96 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-journal-volume',
   styleUrls: ['./journal-volume.component.scss'],
-  templateUrl: './journal-volume.component.html'
+  templateUrl: './journal-volume.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal Volume
  */
-export class JournalVolumeComponent extends VersionedItemComponent {
+export class JournalVolumeComponent extends ItemComponent {
 }
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 27ee373237..e8a6904242 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
@@ -1,17 +1,13 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'journal.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
+      <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"></ds-themed-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field class="item-page-fields" [item]="object"
       [fields]="['creativeworkseries.issn']"
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 4469a2ac29..659ced0fec 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
@@ -1,11 +1,24 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -16,24 +29,26 @@ import { ItemDataService } from '../../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
+import { GenericItemPageFieldComponent } from '../../../../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
+import { mockRouteService } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { JournalComponent } from './journal.component';
-import { RouteService } from '../../../../core/services/route.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -44,29 +59,29 @@ const mockItem: Item = Object.assign(new Item(), {
     'creativeworkseries.issn': [
       {
         language: 'en_US',
-        value: '1234'
-      }
+        value: '1234',
+      },
     ],
     'creativework.publisher': [
       {
         language: 'en_US',
-        value: 'a publisher'
-      }
+        value: 'a publisher',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
-    ]
-  }
+        value: 'desc',
+      },
+    ],
+  },
 });
 
 describe('JournalComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -74,8 +89,8 @@ describe('JournalComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
       ],
@@ -99,12 +114,13 @@ describe('JournalComponent', () => {
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
-        { provide: RouteService, useValue: {} }
+        { provide: RouteService, useValue: mockRouteService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(JournalComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index acfd31d8f6..079deaa298 100644
--- a/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-journal',
   styleUrls: ['./journal.component.scss'],
-  templateUrl: './journal.component.html'
+  templateUrl: './journal.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Journal
  */
-export class JournalComponent extends VersionedItemComponent {
+export class JournalComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/journal-entities/journal-entities.module.ts b/src/app/entity-groups/journal-entities/journal-entities.module.ts
index 3bf861e10d..a61a96c8f2 100644
--- a/src/app/entity-groups/journal-entities/journal-entities.module.ts
+++ b/src/app/entity-groups/journal-entities/journal-entities.module.ts
@@ -1,25 +1,28 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../shared/shared.module';
-import { JournalComponent } from './item-pages/journal/journal.component';
-import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component';
-import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component';
+import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
+import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
+import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
+import { JournalSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component';
+import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
+import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
 import { JournalListElementComponent } from './item-list-elements/journal/journal-list-element.component';
 import { JournalIssueListElementComponent } from './item-list-elements/journal-issue/journal-issue-list-element.component';
 import { JournalVolumeListElementComponent } from './item-list-elements/journal-volume/journal-volume-list-element.component';
-import { JournalIssueGridElementComponent } from './item-grid-elements/journal-issue/journal-issue-grid-element.component';
-import { JournalVolumeGridElementComponent } from './item-grid-elements/journal-volume/journal-volume-grid-element.component';
-import { JournalGridElementComponent } from './item-grid-elements/journal/journal-grid-element.component';
 import { JournalSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal/journal-search-result-list-element.component';
-import { JournalSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal/journal-search-result-grid-element.component';
 import { JournalIssueSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-issue/journal-issue-search-result-list-element.component';
 import { JournalVolumeSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/journal-volume/journal-volume-search-result-list-element.component';
-import { JournalIssueSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-issue/journal-issue-search-result-grid-element.component';
-import { JournalVolumeSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/journal-volume/journal-volume-search-result-grid-element.component';
-import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
-import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
 import { JournalSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal/journal-sidebar-search-list-element.component';
-import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { JournalIssueSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-issue/journal-issue-sidebar-search-list-element.component';
+import { JournalVolumeSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/journal-volume/journal-volume-sidebar-search-list-element.component';
+import { JournalComponent } from './item-pages/journal/journal.component';
+import { JournalIssueComponent } from './item-pages/journal-issue/journal-issue.component';
+import { JournalVolumeComponent } from './item-pages/journal-volume/journal-volume.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -47,11 +50,13 @@ const ENTRY_COMPONENTS = [
   imports: [
     CommonModule,
     ItemSharedModule,
-    SharedModule
+    SharedModule,
+    ResultsBackButtonModule,
+    DsoPageModule,
   ],
   declarations: [
-    ...ENTRY_COMPONENTS
-  ]
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class JournalEntitiesModule {
   /**
@@ -61,7 +66,7 @@ export class JournalEntitiesModule {
   static withEntryComponents() {
     return {
       ngModule: JournalEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
index e1ac7db928..27726048e2 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { OrgUnitGridElementComponent } from './org-unit-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { OrgUnitGridElementComponent } from './org-unit-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,28 +26,28 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'organization.foundingDate': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'organization.address.addressCountry': [
       {
         language: 'en_US',
-        value: 'Belgium'
-      }
+        value: 'Belgium',
+      },
     ],
     'organization.address.addressLocality': [
       {
         language: 'en_US',
-        value: 'Brussels'
-      }
-    ]
-  }
+        value: 'Brussels',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitGridElementComponent', () => {
@@ -54,11 +63,12 @@ describe('OrgUnitGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [OrgUnitGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts
index 05a7f6c8c5..1825f9be62 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/org-unit/org-unit-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('OrgUnit', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
index b4d563b0d5..772ada7412 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { PersonGridElementComponent } from './person-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { PersonGridElementComponent } from './person-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,22 +26,22 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'person.email': [
       {
         language: 'en_US',
-        value: 'Smith-Donald@gmail.com'
-      }
+        value: 'Smith-Donald@gmail.com',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Web Developer'
-      }
-    ]
-  }
+        value: 'Web Developer',
+      },
+    ],
+  },
 });
 
 describe('PersonGridElementComponent', () => {
@@ -48,11 +57,12 @@ describe('PersonGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [PersonGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
index 2e3ce5804e..885680cde2 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/person/person-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Person', ViewMode.GridElement)
 @Component({
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
index 5f4808bd2a..2af97e0fb0 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { Item } from '../../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { ProjectGridElementComponent } from './project-grid-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { ProjectGridElementComponent } from './project-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,16 +26,16 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'The project description'
-      }
-    ]
-  }
+        value: 'The project description',
+      },
+    ],
+  },
 });
 
 describe('ProjectGridElementComponent', () => {
@@ -42,11 +51,12 @@ describe('ProjectGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [ProjectGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
index 58547960cf..4bb09005bf 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/project/project-grid-element.component.ts
@@ -1,8 +1,9 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Project', ViewMode.GridElement)
 @Component({
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 2dbccd4346..c1d027d7e7 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
@@ -3,23 +3,23 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
+                <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+                </ds-themed-thumbnail>
             </div>
         </span>
     <div class="card-body">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
@@ -40,9 +40,9 @@
           </span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+      <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>
       </div>
     </div>
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.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
index d01bcc44d2..a73ba72cc6 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { OrgUnitSearchResultGridElementComponent } from './org-unit-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { OrgUnitSearchResultGridElementComponent } from './org-unit-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,28 +14,28 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'organization.foundingDate': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'organization.address.addressCountry': [
       {
         language: 'en_US',
-        value: 'Belgium'
-      }
+        value: 'Belgium',
+      },
     ],
     'organization.address.addressLocality': [
       {
         language: 'en_US',
-        value: 'Brussels'
-      }
-    ]
-  }
+        value: 'Brussels',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -46,10 +46,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitSearchResultGridElementComponent', getEntityGridElementTestComponent(OrgUnitSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['date', 'country', 'city']));
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.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
index 872b4b27e3..37576c5cf7 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-org-unit-search-result-grid-element',
   styleUrls: ['./org-unit-search-result-grid-element.component.scss'],
   templateUrl: './org-unit-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Organisation Unit
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 853a717965..976d2c55e5 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
@@ -3,23 +3,23 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
             <div>
-                <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-                </ds-thumbnail>
+                <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+                </ds-themed-thumbnail>
             </div>
         </span>
     <div class="card-body">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
@@ -33,9 +33,9 @@
           <span [innerHTML]="firstMetadataValue('person.jobTitle')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+      <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>
       </div>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
index b27aa8cff0..46f08feda1 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { PersonSearchResultGridElementComponent } from './person-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { PersonSearchResultGridElementComponent } from './person-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,22 +14,22 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'person.email': [
       {
         language: 'en_US',
-        value: 'Smith-Donald@gmail.com'
-      }
+        value: 'Smith-Donald@gmail.com',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Web Developer'
-      }
-    ]
-  }
+        value: 'Web Developer',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -40,10 +40,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('PersonSearchResultGridElementComponent', getEntityGridElementTestComponent(PersonSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['email', 'jobtitle']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
index 851d900755..5b1dd5a440 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-person-search-result-grid-element',
   styleUrls: ['./person-search-result-grid-element.component.scss'],
   templateUrl: './person-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Person
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 a54d136de2..1025b4c35d 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
@@ -3,23 +3,23 @@
     <div class="position-absolute ml-1">
       <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None"
-       [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
       <div>
-        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-        </ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+        </ds-themed-thumbnail>
       </div>
     </span>
     <div class="card-body">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
       <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
         <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
       </ds-truncatable-part>
@@ -28,9 +28,9 @@
           <span [innerHTML]="firstMetadataValue('dc.description')"></span>
         </ds-truncatable-part>
       </p>
-      <div *ngIf="linkType != linkTypes.None" class="text-center">
-        <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-           rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+      <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>
       </div>
     </div>
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
index 2cc64cf7b1..9745ff5554 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.spec.ts
@@ -1,10 +1,10 @@
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { ProjectSearchResultGridElementComponent } from './project-search-result-grid-element.component';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { getEntityGridElementTestComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { ProjectSearchResultGridElementComponent } from './project-search-result-grid-element.component';
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
@@ -14,16 +14,16 @@ mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'The project description'
-      }
-    ]
-  }
+        value: 'The project description',
+      },
+    ],
+  },
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -34,10 +34,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('ProjectSearchResultGridElementComponent', getEntityGridElementTestComponent(ProjectSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['description']));
diff --git a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
index 6dfbe93e3e..2ee7da3beb 100644
--- a/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { focusShadow } from '../../../../../shared/animations/focus';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultGridElementComponent } from '../../../../../shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.GridElement)
@@ -9,7 +10,7 @@ import { ItemSearchResultGridElementComponent } from '../../../../../shared/obje
   selector: 'ds-project-search-result-grid-element',
   styleUrls: ['./project-search-result-grid-element.component.scss'],
   templateUrl: './project-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Project
diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts
index 1cca1d3314..cbe8a9988a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.spec.ts
@@ -1,11 +1,20 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { OrgUnitListElementComponent } from './org-unit-list-element.component';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { OrgUnitListElementComponent } from './org-unit-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -13,16 +22,16 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'A description about the OrgUnit'
-      }
-    ]
-  }
+        value: 'A description about the OrgUnit',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitListElementComponent', () => {
@@ -37,11 +46,12 @@ describe('OrgUnitListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [OrgUnitListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts
index 32254595aa..16d7294cef 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/org-unit/org-unit-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('OrgUnit', ViewMode.ListElement)
 @Component({
   selector: 'ds-org-unit-list-element',
   styleUrls: ['./org-unit-list-element.component.scss'],
-  templateUrl: './org-unit-list-element.component.html'
+  templateUrl: './org-unit-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Organisation Unit
diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
index 8e86a129ce..9ab9748839 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.spec.ts
@@ -1,11 +1,20 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { PersonListElementComponent } from './person-list-element.component';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { PersonListElementComponent } from './person-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -13,16 +22,16 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Developer'
-      }
-    ]
-  }
+        value: 'Developer',
+      },
+    ],
+  },
 });
 
 describe('PersonListElementComponent', () => {
@@ -37,11 +46,12 @@ describe('PersonListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [PersonListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts
index f35ed90c58..9d283b4143 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/person/person-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Item } from '../../../../core/shared/item.model';
 
 @listableObjectComponent('Person', ViewMode.ListElement)
 @Component({
   selector: 'ds-person-list-element',
   styleUrls: ['./person-list-element.component.scss'],
-  templateUrl: './person-list-element.component.html'
+  templateUrl: './person-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Person
diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
index 0c08d7eaaa..a4884d0482 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.spec.ts
@@ -1,10 +1,19 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { ProjectListElementComponent } from './project-list-element.component';
 
 const mockItem: Item = Object.assign(new Item(), {
@@ -13,8 +22,8 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     // 'project.identifier.status': [
     //   {
@@ -22,7 +31,7 @@ const mockItem: Item = Object.assign(new Item(), {
     //     value: 'A status about the project'
     //   }
     // ]
-  }
+  },
 });
 
 describe('ProjectListElementComponent', () => {
@@ -37,11 +46,12 @@ describe('ProjectListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ProjectListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts
index 5f158158d8..1c6420c35c 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/project/project-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
+
 import { Item } from '../../../../core/shared/item.model';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @listableObjectComponent('Project', ViewMode.ListElement)
 @Component({
   selector: 'ds-project-list-element',
   styleUrls: ['./project-list-element.component.scss'],
-  templateUrl: './project-list-element.component.html'
+  templateUrl: './project-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Project
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 0bba83a209..60251c15b8 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
@@ -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'"
-           rel="noopener noreferrer"
+        <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">
             <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                           [defaultImage]="'assets/images/orgunit-placeholder.svg'"
@@ -9,7 +9,7 @@
                           [placeholder]="'thumbnail.orgunit.placeholder'">
             </ds-thumbnail>
         </a>
-        <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+        <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
             <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                           [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                           [alt]="'thumbnail.orgunit.alt'"
@@ -18,13 +18,13 @@
         </span>
     </div>
     <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-        <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+        <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
         <ds-truncatable [id]="dso.id">
-            <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-               rel="noopener noreferrer"
+            <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>
-            <span *ngIf="linkType == linkTypes.None"
+            <span *ngIf="linkType === linkTypes.None"
                   class="lead"
                   [innerHTML]="dsoTitle || ('orgunit.listelement.no-title' | translate)"></span>
             <span class="text-muted">
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.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
index 9609a9582a..3624701952 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.spec.ts
@@ -1,17 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { OrgUnitSearchResultListElementComponent } from './org-unit-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { OrgUnitSearchResultListElementComponent } from './org-unit-search-result-list-element.component';
 
 let orgUnitListElementComponent: OrgUnitSearchResultListElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListElementComponent>;
@@ -25,17 +36,17 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'dc.description': [
           {
             language: 'en_US',
-            value: 'A description about the OrgUnit'
-          }
-        ]
-      }
-    })
+            value: 'A description about the OrgUnit',
+          },
+        ],
+      },
+    }),
   });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   new ItemSearchResult(),
@@ -46,45 +57,45 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('OrgUnitSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [ OrgUnitSearchResultListElementComponent , TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [ NO_ERRORS_SCHEMA ]
+      schemas: [ NO_ERRORS_SCHEMA ],
     }).overrideComponent(OrgUnitSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -139,22 +150,22 @@ describe('OrgUnitSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [OrgUnitSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
index baa27cdf0c..4502704c29 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
@@ -7,21 +8,11 @@ import { ItemSearchResultListElementComponent } from '../../../../../shared/obje
 @Component({
   selector: 'ds-org-unit-search-result-list-element',
   styleUrls: ['./org-unit-search-result-list-element.component.scss'],
-  templateUrl: './org-unit-search-result-list-element.component.html'
+  templateUrl: './org-unit-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Organisation Unit
  */
 export class OrgUnitSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
-  /**
-   * Display thumbnail if required by configuration
-   */
-  showThumbnails: boolean;
-
-  ngOnInit(): void {
-    super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-  }
-
 }
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 4332b7a553..3d3749714f 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
@@ -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'"
-       rel="noopener noreferrer"
+    <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">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
@@ -9,7 +9,7 @@
                     [placeholder]="'thumbnail.person.placeholder'">
       </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
@@ -18,13 +18,13 @@
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9 col-md-10' : 'col-12'">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
+    <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
     <ds-truncatable [id]="dso.id">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         rel="noopener noreferrer"
+      <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>
-      <span *ngIf="linkType == linkTypes.None"
+      <span *ngIf="linkType === linkTypes.None"
             class="lead"
             [innerHTML]="dsoTitle || ('person.listelement.no-title' | translate)"></span>
       <span class="text-muted">
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
index 31018520f6..b454f52543 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.spec.ts
@@ -1,17 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { PersonSearchResultListElementComponent } from './person-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { PersonSearchResultListElementComponent } from './person-search-result-list-element.component';
 
 let personListElementComponent: PersonSearchResultListElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListElementComponent>;
@@ -25,17 +36,17 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         'person.jobTitle': [
           {
             language: 'en_US',
-            value: 'Developer'
-          }
-        ]
-      }
-    })
+            value: 'Developer',
+          },
+        ],
+      },
+    }),
   });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
   new ItemSearchResult(),
@@ -46,45 +57,45 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('PersonSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [PersonSearchResultListElementComponent, TruncatePipe],
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -139,22 +150,22 @@ describe('PersonSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        }
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      },
       )],
       declarations: [PersonSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
index 217d7baef9..221173fa83 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/person/person-search-result-list-element.component.ts
@@ -1,20 +1,23 @@
-import { Component, Inject } from '@angular/core';
 import {
-  listableObjectComponent
-} from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+  Component,
+  Inject,
+} from '@angular/core';
+
 import {
-  ItemSearchResultListElementComponent
-} from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-person-search-result-list-element',
   styleUrls: ['./person-search-result-list-element.component.scss'],
-  templateUrl: './person-search-result-list-element.component.html'
+  templateUrl: './person-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Person
@@ -23,8 +26,8 @@ export class PersonSearchResultListElementComponent extends ItemSearchResultList
 
   public constructor(
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
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 8883a9c80d..d4dfe0a792 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
@@ -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'"
-       rel="noopener noreferrer"
+    <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">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/project-placeholder.svg'"
@@ -9,7 +9,7 @@
                     [placeholder]="'thumbnail.project.placeholder'">
       </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/project-placeholder.svg'"
                     [alt]="'thumbnail.project.alt'"
@@ -19,12 +19,12 @@
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <ds-truncatable [id]="dso.id">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-         rel="noopener noreferrer"
+      <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]="[itemPageRoute]" class="lead item-list-title dont-break-out"
          [innerHTML]="dsoTitle"></a>
-      <span *ngIf="linkType == linkTypes.None"
+      <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/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
index 0cb3e63e87..b2a7c3ffe1 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.spec.ts
@@ -1,15 +1,23 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
-import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { ProjectSearchResultListElementComponent } from './project-search-result-list-element.component';
 
 let projectListElementComponent: ProjectSearchResultListElementComponent;
 let fixture: ComponentFixture<ProjectSearchResultListElementComponent>;
@@ -23,8 +31,8 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: 'This is just another title',
+          },
         ],
         // 'project.identifier.status': [
         //   {
@@ -32,8 +40,8 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(
         //     value: 'A status about the project'
         //   }
         // ]
-      }
-    })
+      },
+    }),
   });
 
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
@@ -45,23 +53,23 @@ const mockItemWithoutMetadata: ItemSearchResult = Object.assign(
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
-        ]
-      }
-    })
+            value: 'This is just another title',
+          },
+        ],
+      },
+    }),
   });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('ProjectSearchResultListElementComponent', () => {
@@ -71,12 +79,12 @@ describe('ProjectSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -132,15 +140,15 @@ describe('ProjectSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ProjectSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
 
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ProjectSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
index 88e95528ac..c78ff3984d 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/search-result-list-elements/project/project-search-result-list-element.component.ts
@@ -1,27 +1,18 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { ItemSearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement)
 @Component({
   selector: 'ds-project-search-result-list-element',
   styleUrls: ['./project-search-result-list-element.component.scss'],
-  templateUrl: './project-search-result-list-element.component.html'
+  templateUrl: './project-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Project
  */
 export class ProjectSearchResultListElementComponent extends ItemSearchResultListElementComponent {
 
-  /**
-   * Display thumbnail if required by configuration
-   */
-  showThumbnails: boolean;
-
-  ngOnInit(): void {
-    super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-  }
-
 }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
index ab8e1b8363..4d3f27f6ef 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { OrgUnitSidebarSearchListElementComponent } from './org-unit-sidebar-search-list-element.component';
@@ -10,33 +10,33 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dspace.entity.type': [
         {
-          value: 'OrgUnit'
-        }
+          value: 'OrgUnit',
+        },
       ],
       'organization.legalName': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.description': [
         {
-          value: 'description'
-        }
-      ]
-    }
-  })
+          value: 'description',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('OrgUnitSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+  createSidebarSearchListElementTests(OrgUnitSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
index 25ff6181b2..a09f685d43 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-org-unit-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "OrgUnit" within the context of
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
index f49ec452c9..6e614c5811 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { PersonSidebarSearchListElementComponent } from './person-sidebar-search-list-element.component';
@@ -11,38 +11,38 @@ const object = Object.assign(new ItemSearchResult(), {
       'dspace.entity.type': [
         {
           value: 'Person',
-        }
+        },
       ],
       'person.familyName': [
         {
-          value: 'family name'
-        }
+          value: 'family name',
+        },
       ],
       'person.givenName': [
         {
-          value: 'given name'
-        }
+          value: 'given name',
+        },
       ],
       'person.jobTitle': [
         {
-          value: 'job title'
-        }
-      ]
-    }
-  })
+          value: 'job title',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('PersonSidebarSearchListElementComponent',
   createSidebarSearchListElementTests(PersonSidebarSearchListElementComponent, object, parent, 'parent title', 'family name, given name', 'job title', [
-  ])
+  ]),
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
index bc9d3d4302..db481bf758 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component.ts
@@ -1,21 +1,22 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { isNotEmpty } from '../../../../../shared/empty.util';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { TranslateService } from '@ngx-translate/core';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { isNotEmpty } from '../../../../../shared/empty.util';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-person-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Person" within the context of
@@ -25,7 +26,7 @@ export class PersonSidebarSearchListElementComponent extends SidebarSearchListEl
   constructor(protected truncatableService: TruncatableService,
               protected linkService: LinkService,
               protected translateService: TranslateService,
-              protected dsoNameService: DSONameService
+              public dsoNameService: DSONameService,
   ) {
     super(truncatableService, linkService, dsoNameService);
   }
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
index ec0eb0e7bb..a7be69965f 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.spec.ts
@@ -1,5 +1,5 @@
-import { Item } from '../../../../../core/shared/item.model';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec';
 import { ProjectSidebarSearchListElementComponent } from './project-sidebar-search-list-element.component';
@@ -10,23 +10,23 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
-      ]
-    }
-  })
+          value: 'title',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('ProjectSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined)
+  createSidebarSearchListElementTests(ProjectSidebarSearchListElementComponent, object, parent, 'parent title', 'title', undefined),
 );
diff --git a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
index 6fbb9d26fc..52e46d928a 100644
--- a/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { Component } from '@angular/core';
-import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+
+import { Context } from '../../../../../core/shared/context.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component';
 
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent('ProjectSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-project-sidebar-search-list-element',
-  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html'
+  templateUrl: '../../../../../shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Project" within the context of
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 ac92e4ad6d..f28550a4e0 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
@@ -1,22 +1,18 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'orgunit.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="object?.thumbnail | async"
+      <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"
                     [defaultImage]="'assets/images/orgunit-placeholder.svg'"
                     [alt]="'thumbnail.orgunit.alt'"
                     [placeholder]="'thumbnail.orgunit.placeholder'"
       >
-      </ds-thumbnail>
+      </ds-themed-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['organization.foundingDate']"
@@ -36,6 +32,18 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-xs-12 col-md-7">
+    <ds-item-page-img-field
+      [fields]="['organization.identifier.ror']"
+      [img]="{
+        URI: './assets/images/ror-icon.svg',
+        alt: 'item.page.image.alt.ROR',
+        heightVar: '--ds-item-page-img-field-ror-inline-height'
+      }"
+      [item]="object"
+      [label]="'orgunit.page.ror'"
+      [urlRegex]="'(.*)ror.org'"
+    >
+    </ds-item-page-img-field>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
index 3377712f13..e40335a4db 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.spec.ts
@@ -1,12 +1,12 @@
-import { Item } from '../../../../core/shared/item.model';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
+import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { OrgUnitComponent } from './org-unit.component';
 import {
   createRelationshipsObservable,
-  getItemPageFieldsTest
+  getItemPageFieldsTest,
 } from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { OrgUnitComponent } from './org-unit.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -14,35 +14,35 @@ const mockItem: Item = Object.assign(new Item(), {
     'organization.foundingDate': [
       {
         language: 'en_US',
-        value: '2018'
-      }
+        value: '2018',
+      },
     ],
     'organization.address.addressLocality': [
       {
         language: 'en_US',
-        value: 'New York'
-      }
+        value: 'New York',
+      },
     ],
     'organization.adress.addressCountry': [
       {
         language: 'en_US',
-        value: 'USA'
-      }
+        value: 'USA',
+      },
     ],
     'dc.identifier': [
       {
         language: 'en_US',
-        value: '1'
-      }
+        value: '1',
+      },
     ],
     'dc.description': [
       {
         language: 'en_US',
-        value: 'desc'
-      }
-    ]
+        value: 'desc',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('OrgUnitComponent', getItemPageFieldsTest(mockItem, OrgUnitComponent));
diff --git a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
index cbf8497f35..89574ed332 100644
--- a/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-org-unit',
   styleUrls: ['./org-unit.component.scss'],
-  templateUrl: './org-unit.component.html'
+  templateUrl: './org-unit.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Organisation Unit
  */
-export class OrgUnitComponent extends VersionedItemComponent {
+export class OrgUnitComponent extends ItemComponent {
 }
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 a73236006b..ec99c845be 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
@@ -1,23 +1,17 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field class="mr-auto" [item]="object">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-orcid-button [pageRoute]="itemPageRoute" [dso]="object" class="mr-2"></ds-dso-page-orcid-button>
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'person.page.edit'"></ds-dso-page-edit-button>
-    <ds-person-page-claim-button [object]="object"></ds-person-page-claim-button>
-  </div>
+  <ds-themed-item-page-title-field class="mr-auto" [item]="object">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail [thumbnail]="object?.thumbnail | async"
+      <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
                     [placeholder]="'thumbnail.person.placeholder'">
-      </ds-thumbnail>
+      </ds-themed-thumbnail>
     </ds-metadata-field-wrapper>
     <ds-generic-item-page-field [item]="object"
       [fields]="['person.email']"
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
index efbc48a209..5ebd795032 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.spec.ts
@@ -1,10 +1,10 @@
-import {
-  createRelationshipsObservable,
-  getItemPageFieldsTest
-} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import {
+  createRelationshipsObservable,
+  getItemPageFieldsTest,
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { PersonComponent } from './person.component';
 
@@ -14,40 +14,40 @@ const mockItem: Item = Object.assign(new Item(), {
     'person.email': [
       {
         language: 'en_US',
-        value: 'fake@email.com'
-      }
+        value: 'fake@email.com',
+      },
     ],
     'person.birthDate': [
       {
         language: 'en_US',
-        value: '1993'
-      }
+        value: '1993',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Developer'
-      }
+        value: 'Developer',
+      },
     ],
     'person.familyName': [
       {
         language: 'en_US',
-        value: 'Doe'
-      }
+        value: 'Doe',
+      },
     ],
     'person.givenName': [
       {
         language: 'en_US',
-        value: 'John'
-      }
-    ]
+        value: 'John',
+      },
+    ],
   },
   relationships: createRelationshipsObservable(),
   _links: {
     self : {
-      href: 'item-href'
-    }
-  }
+      href: 'item-href',
+    },
+  },
 });
 
 const mockItemWithTitle: Item = Object.assign(new Item(), {
@@ -56,34 +56,34 @@ const mockItemWithTitle: Item = Object.assign(new Item(), {
     'person.email': [
       {
         language: 'en_US',
-        value: 'fake@email.com'
-      }
+        value: 'fake@email.com',
+      },
     ],
     'person.birthDate': [
       {
         language: 'en_US',
-        value: '1993'
-      }
+        value: '1993',
+      },
     ],
     'person.jobTitle': [
       {
         language: 'en_US',
-        value: 'Developer'
-      }
+        value: 'Developer',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Doe, John'
-      }
-    ]
+        value: 'Doe, John',
+      },
+    ],
   },
   relationships: createRelationshipsObservable(),
   _links: {
     self : {
-      href: 'item-href'
-    }
-  }
+      href: 'item-href',
+    },
+  },
 });
 
 describe('PersonComponent with family and given names', getItemPageFieldsTest(mockItem, PersonComponent));
diff --git a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
index ad2863034a..9a6d1e2ccf 100644
--- a/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('Person', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-person',
   styleUrls: ['./person.component.scss'],
-  templateUrl: './person.component.html'
+  templateUrl: './person.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Person
  */
-export class PersonComponent extends VersionedItemComponent {
+export class PersonComponent extends ItemComponent {
 }
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 3fb5e2d520..944766b6f7 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
@@ -1,33 +1,29 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'project.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
     <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-      <ds-thumbnail
+      <ds-themed-thumbnail
         [thumbnail]="object?.thumbnail | async"
         [defaultImage]="'assets/images/project-placeholder.svg'"
         [alt]="'thumbnail.project.alt'"
         [placeholder]="'thumbnail.project.placeholder'">
-      </ds-thumbnail>
+      </ds-themed-thumbnail>
     </ds-metadata-field-wrapper>
     <!--<ds-generic-item-page-field [item]="object"-->
       <!--[fields]="['project.identifier.status']"-->
       <!--[label]="'project.page.status'">-->
     <!--</ds-generic-item-page-field>-->
-    <ds-metadata-representation-list
+    <ds-themed-metadata-representation-list
       [parentItem]="object"
       [itemType]="'OrgUnit'"
       [metadataFields]="['project.contributor.other']"
       [label]="'project.page.contributor' | translate">
-    </ds-metadata-representation-list>
+    </ds-themed-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['project.identifier.funder']"
       [label]="'project.page.funder'">
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
index ed60d3dac4..3d8fccaa6f 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.spec.ts
@@ -1,10 +1,10 @@
-import {
-  createRelationshipsObservable,
-  getItemPageFieldsTest
-} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { Item } from '../../../../core/shared/item.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
+import {
+  createRelationshipsObservable,
+  getItemPageFieldsTest,
+} from '../../../../item-page/simple/item-types/shared/item.component.spec';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { ProjectComponent } from './project.component';
 
@@ -20,8 +20,8 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.identifier': [
       {
         language: 'en_US',
-        value: '1'
-      }
+        value: '1',
+      },
     ],
     // 'project.identifier.expectedcompletion': [
     //   {
@@ -32,17 +32,17 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.description': [
       {
         language: 'en_US',
-        value: 'keyword'
-      }
+        value: 'keyword',
+      },
     ],
     'dc.subject': [
       {
         language: 'en_US',
-        value: 'keyword'
-      }
-    ]
+        value: 'keyword',
+      },
+    ],
   },
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 describe('ProjectComponent', getItemPageFieldsTest(mockItem, ProjectComponent));
diff --git a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
index 066427fc0d..8efa5030eb 100644
--- a/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
+++ b/src/app/entity-groups/research-entities/item-pages/project/project.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemComponent } from '../../../../item-page/simple/item-types/shared/item.component';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../../../../item-page/simple/item-types/versioned-item/versioned-item.component';
 
 @listableObjectComponent('Project', ViewMode.StandalonePage)
 @Component({
   selector: 'ds-project',
   styleUrls: ['./project.component.scss'],
-  templateUrl: './project.component.html'
+  templateUrl: './project.component.html',
 })
 /**
  * The component for displaying metadata and relations of an item of the type Project
  */
-export class ProjectComponent extends VersionedItemComponent {
+export class ProjectComponent extends ItemComponent {
 }
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html
index 1771f3d2bc..ec4dbd4323 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.html
@@ -1,12 +1,12 @@
 <ng-template #descTemplate>
   <span class="text-muted">
       <span class="item-list-job-title">
-        <span [innerHTML]="metadataRepresentation.firstMetadataValue(['dc.description'])"></span>
+        <span [innerHTML]="mdRepresentation.firstMetadataValue(['dc.description'])"></span>
       </span>
   </span>
 </ng-template>
-<ds-truncatable [id]="metadataRepresentation.id">
+<ds-truncatable [id]="mdRepresentation.id">
   <a [routerLink]="[itemPageRoute]"
-     [innerHTML]="metadataRepresentation.getValue()"
-     [ngbTooltip]="metadataRepresentation.allMetadata(['dc.description']).length > 0 ? descTemplate : null"></a>
+     [innerHTML]="mdRepresentation.getValue()"
+     [ngbTooltip]="mdRepresentation.allMetadata(['dc.description']).length > 0 ? descTemplate : null"></a>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
index eff6fd0b31..7cff2f9930 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.spec.ts
@@ -1,13 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { OrgUnitItemMetadataListElementComponent } from './org-unit-item-metadata-list-element.component';
 
 const description = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
 const organisation = 'Anonymous';
@@ -22,19 +28,19 @@ describe('OrgUnitItemMetadataListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports:[
-        NgbModule
+        NgbModule,
       ],
       declarations: [OrgUnitItemMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(OrgUnitItemMetadataListElementComponent);
     comp = fixture.componentInstance;
-    comp.metadataRepresentation = mockItemMetadataRepresentation;
+    comp.mdRepresentation = mockItemMetadataRepresentation;
     fixture.detectChanges();
   });
 
diff --git a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
index 183bebe10c..763eb1b810 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/org-unit/org-unit-item-metadata-list-element.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
+
 import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('OrgUnit', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-org-unit-item-metadata-list-element',
-  templateUrl: './org-unit-item-metadata-list-element.component.html'
+  templateUrl: './org-unit-item-metadata-list-element.component.html',
 })
 /**
  * The component for displaying an item of the type OrgUnit as a metadata field
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 97632117f4..6f56056781 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
@@ -1,15 +1,15 @@
 <ng-template #descTemplate>
   <span class="text-muted">
-      <span *ngIf="metadataRepresentation.allMetadata(['person.jobTitle']).length > 0"
+      <span *ngIf="mdRepresentation.allMetadata(['person.jobTitle']).length > 0"
             class="item-list-job-title">
-              <span *ngFor="let value of metadataRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
+              <span *ngFor="let value of mdRepresentation.allMetadataValues(['person.jobTitle']); let last=last;">
                   <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
               </span>
       </span>
   </span>
 </ng-template>
-<ds-truncatable [id]="metadataRepresentation.id">
+<ds-truncatable [id]="mdRepresentation.id">
   <a [routerLink]="[itemPageRoute]"
-     [innerHTML]="metadataRepresentation.getValue()"
-     [ngbTooltip]="metadataRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
+     [innerHTML]="mdRepresentation.getValue()"
+     [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
 </ds-truncatable>
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts
index 895cf52223..41d3b6169c 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.spec.ts
@@ -1,13 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { PersonItemMetadataListElementComponent } from './person-item-metadata-list-element.component';
 
 const jobTitle = 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.';
 const firstName = 'Joe';
@@ -24,19 +30,19 @@ describe('PersonItemMetadataListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports:[
-        NgbModule
+        NgbModule,
       ],
       declarations: [PersonItemMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(PersonItemMetadataListElementComponent);
     comp = fixture.componentInstance;
-    comp.metadataRepresentation = mockItemMetadataRepresentation;
+    comp.mdRepresentation = mockItemMetadataRepresentation;
     fixture.detectChanges();
   });
 
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
index f3d0a28fda..d02c6debb4 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
+
 import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
 import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Person', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-person-item-metadata-list-element',
-  templateUrl: './person-item-metadata-list-element.component.html'
+  templateUrl: './person-item-metadata-list-element.component.html',
 })
 /**
  * The component for displaying an item of the type Person as a metadata field
diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.html
new file mode 100644
index 0000000000..acc9173bf7
--- /dev/null
+++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.html
@@ -0,0 +1,12 @@
+<ng-template #descTemplate>
+  <span class="text-muted">
+      <span class="item-list-project-title">
+        <span [innerHTML]="dsoNameService.getName(mdRepresentation)"></span>
+      </span>
+  </span>
+</ng-template>
+<ds-truncatable [id]="mdRepresentation.id">
+  <a [routerLink]="[itemPageRoute]"
+     [innerHTML]="dsoNameService.getName(mdRepresentation)"
+     [ngbTooltip]="dsoNameService.getName(mdRepresentation).length > 0 ? descTemplate : null"></a>
+</ds-truncatable>
\ No newline at end of file
diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts
new file mode 100644
index 0000000000..c4787647cb
--- /dev/null
+++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.spec.ts
@@ -0,0 +1,57 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { DSONameServiceMock } from '../../../../shared/mocks/dso-name.service.mock';
+import { ProjectItemMetadataListElementComponent } from './project-item-metadata-list-element.component';
+
+const projectTitle = 'Lorem ipsum dolor sit amet';
+const mockItem = Object.assign(new Item(), { metadata: { 'dc.title': [{ value: projectTitle }] } });
+const virtMD = Object.assign(new MetadataValue(), { value: projectTitle });
+
+const mockItemMetadataRepresentation = Object.assign(new ItemMetadataRepresentation(virtMD), mockItem);
+
+describe('ProjectItemMetadataListElementComponent', () => {
+  let comp: ProjectItemMetadataListElementComponent;
+  let fixture: ComponentFixture<ProjectItemMetadataListElementComponent>;
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports:[
+        NgbModule,
+      ],
+      declarations: [ProjectItemMetadataListElementComponent],
+      providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(ProjectItemMetadataListElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProjectItemMetadataListElementComponent);
+    comp = fixture.componentInstance;
+    comp.mdRepresentation = mockItemMetadataRepresentation;
+    fixture.detectChanges();
+  });
+
+  it('should show the project\'s name as a link', () => {
+    const linkText = fixture.debugElement.query(By.css('a')).nativeElement.textContent;
+    expect(linkText).toBe(projectTitle);
+  });
+
+});
diff --git a/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
new file mode 100644
index 0000000000..a3137f6d91
--- /dev/null
+++ b/src/app/entity-groups/research-entities/metadata-representations/project/project-item-metadata-list-element.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { metadataRepresentationComponent } from '../../../../shared/metadata-representation/metadata-representation.decorator';
+import { ItemMetadataRepresentationListElementComponent } from '../../../../shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+
+@metadataRepresentationComponent('Project', MetadataRepresentationType.Item)
+@Component({
+  selector: 'ds-project-item-metadata-list-element',
+  templateUrl: './project-item-metadata-list-element.component.html',
+})
+/**
+ * The component for displaying an item of the type Project as a metadata field
+ */
+export class ProjectItemMetadataListElementComponent extends ItemMetadataRepresentationListElementComponent {
+  /**
+   * Initialize instance variables
+   *
+   * @param dsoNameService
+   */
+  constructor(
+    public dsoNameService: DSONameService,
+  ) {
+    super();
+  }
+}
diff --git a/src/app/entity-groups/research-entities/research-entities.module.ts b/src/app/entity-groups/research-entities/research-entities.module.ts
index 721a22be08..ef2aed0c93 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -1,39 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { DsoPageModule } from '../../shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../shared/shared.module';
-import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component';
-import { PersonComponent } from './item-pages/person/person.component';
-import { ProjectComponent } from './item-pages/project/project.component';
+import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
+import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
+import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
+import { OrgUnitSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component';
+import { PersonSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component';
+import { ProjectSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component';
 import { OrgUnitListElementComponent } from './item-list-elements/org-unit/org-unit-list-element.component';
 import { PersonListElementComponent } from './item-list-elements/person/person-list-element.component';
 import { ProjectListElementComponent } from './item-list-elements/project/project-list-element.component';
-import { PersonGridElementComponent } from './item-grid-elements/person/person-grid-element.component';
-import { OrgUnitGridElementComponent } from './item-grid-elements/org-unit/org-unit-grid-element.component';
-import { ProjectGridElementComponent } from './item-grid-elements/project/project-grid-element.component';
 import { OrgUnitSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/org-unit/org-unit-search-result-list-element.component';
 import { PersonSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/person/person-search-result-list-element.component';
 import { ProjectSearchResultListElementComponent } from './item-list-elements/search-result-list-elements/project/project-search-result-list-element.component';
-import { PersonSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/person/person-search-result-grid-element.component';
-import { OrgUnitSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/org-unit/org-unit-search-result-grid-element.component';
-import { ProjectSearchResultGridElementComponent } from './item-grid-elements/search-result-grid-elements/project/project-search-result-grid-element.component';
-import { PersonItemMetadataListElementComponent } from './metadata-representations/person/person-item-metadata-list-element.component';
-import { OrgUnitItemMetadataListElementComponent } from './metadata-representations/org-unit/org-unit-item-metadata-list-element.component';
-import { PersonSearchResultListSubmissionElementComponent } from './submission/item-list-elements/person/person-search-result-list-submission-element.component';
-import { PersonInputSuggestionsComponent } from './submission/item-list-elements/person/person-suggestions/person-input-suggestions.component';
-import { NameVariantModalComponent } from './submission/name-variant-modal/name-variant-modal.component';
-import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component';
-import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
-import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
 import { OrgUnitSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/org-unit/org-unit-sidebar-search-list-element.component';
 import { PersonSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/person/person-sidebar-search-list-element.component';
 import { ProjectSidebarSearchListElementComponent } from './item-list-elements/sidebar-search-list-elements/project/project-sidebar-search-list-element.component';
-import { ItemSharedModule } from '../../item-page/item-shared.module';
+import { OrgUnitComponent } from './item-pages/org-unit/org-unit.component';
+import { PersonComponent } from './item-pages/person/person.component';
+import { ProjectComponent } from './item-pages/project/project.component';
+import { OrgUnitItemMetadataListElementComponent } from './metadata-representations/org-unit/org-unit-item-metadata-list-element.component';
+import { PersonItemMetadataListElementComponent } from './metadata-representations/person/person-item-metadata-list-element.component';
+import { ProjectItemMetadataListElementComponent } from './metadata-representations/project/project-item-metadata-list-element.component';
+import { ExternalSourceEntryListSubmissionElementComponent } from './submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component';
+import { OrgUnitSearchResultListSubmissionElementComponent } from './submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component';
+import { OrgUnitInputSuggestionsComponent } from './submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component';
+import { PersonSearchResultListSubmissionElementComponent } from './submission/item-list-elements/person/person-search-result-list-submission-element.component';
+import { PersonInputSuggestionsComponent } from './submission/item-list-elements/person/person-suggestions/person-input-suggestions.component';
+import { NameVariantModalComponent } from './submission/name-variant-modal/name-variant-modal.component';
 
 const ENTRY_COMPONENTS = [
 // put only entry components that use custom decorator
   OrgUnitComponent,
   PersonComponent,
+  ProjectItemMetadataListElementComponent,
   ProjectComponent,
   OrgUnitListElementComponent,
   OrgUnitItemMetadataListElementComponent,
@@ -61,7 +66,7 @@ const ENTRY_COMPONENTS = [
 const COMPONENTS = [
   NameVariantModalComponent,
   PersonInputSuggestionsComponent,
-  ...ENTRY_COMPONENTS
+  ...ENTRY_COMPONENTS,
 ];
 
 @NgModule({
@@ -69,11 +74,13 @@ const COMPONENTS = [
     CommonModule,
     ItemSharedModule,
     SharedModule,
-    NgbTooltipModule
+    NgbTooltipModule,
+    ResultsBackButtonModule,
+    DsoPageModule,
   ],
   declarations: [
     ...COMPONENTS,
-  ]
+  ],
 })
 export class ResearchEntitiesModule {
   /**
@@ -83,7 +90,7 @@ export class ResearchEntitiesModule {
   static withEntryComponents() {
     return {
       ngModule: ResearchEntitiesModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
index a5d56c1554..9eeb318c7e 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
@@ -1,8 +1,13 @@
-import { ExternalSourceEntryListSubmissionElementComponent } from './external-source-entry-list-submission-element.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
+import { ExternalSourceEntryListSubmissionElementComponent } from './external-source-entry-list-submission-element.component';
 
 describe('ExternalSourceEntryListSubmissionElementComponent', () => {
   let component: ExternalSourceEntryListSubmissionElementComponent;
@@ -16,17 +21,17 @@ describe('ExternalSourceEntryListSubmissionElementComponent', () => {
     metadata: {
       'dc.identifier.uri': [
         {
-          value: uri
-        }
-      ]
-    }
+          value: uri,
+        },
+      ],
+    },
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ExternalSourceEntryListSubmissionElementComponent],
       imports: [TranslateModule.forRoot()],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
index 7dee15ca05..3d82677a3f 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -1,18 +1,22 @@
-import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
-import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { Context } from '../../../../../core/shared/context.model';
-import { Component, OnInit } from '@angular/core';
-import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { ExternalSourceEntry } from '../../../../../core/shared/external-source-entry.model';
 import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
+import { AbstractListableElementComponent } from '../../../../../shared/object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-external-source-entry-list-submission-element',
   styleUrls: ['./external-source-entry-list-submission-element.component.scss'],
-  templateUrl: './external-source-entry-list-submission-element.component.html'
+  templateUrl: './external-source-entry-list-submission-element.component.html',
 })
 /**
  * The component for displaying a list element of an external source entry
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 6123dc3dc8..e264958738 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
@@ -1,6 +1,6 @@
 <div class="d-flex">
 <!--    <div class="person-thumbnail pr-2">-->
-<!--        <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>-->
+<!--        <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-themed-thumbnail>-->
 <!--    </div>-->
     <div class="flex-grow-1">
         <ds-org-unit-input-suggestions *ngIf="useNameVariants" [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
index 45f5c5f41c..ebf5a006bc 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
@@ -1,11 +1,25 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
@@ -20,6 +34,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 { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
 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';
@@ -27,10 +42,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { OrgUnitSearchResultListSubmissionElementComponent } from './org-unit-search-result-list-submission-element.component';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../../shared/mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../../config/app-config.interface';
-import { environment } from '../../../../../../environments/environment';
 
 let personListElementComponent: OrgUnitSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<OrgUnitSearchResultListSubmissionElementComponent>;
@@ -51,23 +62,23 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
+              value: 'This is just another title',
+            },
           ],
           'organization.address.addressLocality': [
             {
               language: 'en_US',
-              value: 'Europe'
-            }
+              value: 'Europe',
+            },
           ],
           'organization.address.addressCountry': [
             {
               language: 'en_US',
-              value: 'Belgium'
-            }
-          ]
-        }
-      })
+              value: 'Belgium',
+            },
+          ],
+        },
+      }),
     });
   mockItemWithoutMetadata = Object.assign(
     new ItemSearchResult(),
@@ -78,16 +89,16 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
-          ]
-        }
-      })
+              value: 'This is just another title',
+            },
+          ],
+        },
+      }),
     });
 
   nameVariant = 'Doe J.';
   mockRelationshipService = {
-    getNameVariant: () => observableOf(nameVariant)
+    getNameVariant: () => observableOf(nameVariant),
   };
 }
 
@@ -97,7 +108,7 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
     TestBed.configureTestingModule({
       declarations: [OrgUnitSearchResultListSubmissionElementComponent, TruncatePipe],
@@ -120,12 +131,12 @@ describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitSearchResultListSubmissionElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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 7a38a02cf4..7d8dff9e08 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
@@ -1,30 +1,38 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { take } from 'rxjs/operators';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModal)
 @listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-person-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'
+  templateUrl: './org-unit-search-result-list-submission-element.component.html',
 })
 
 /**
@@ -49,8 +57,8 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
               private itemDataService: ItemDataService,
               private bitstreamDataService: BitstreamDataService,
               private selectableListService: SelectableListService,
-              protected dsoNameService: DSONameService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              public dsoNameService: DSONameService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -61,15 +69,15 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
     this.useNameVariants = this.context === Context.EntitySearchModalWithNameVariants;
 
     if (this.useNameVariants) {
-      const defaultValue = this.dsoTitle;
+      const defaultValue = this.dso ? this.dsoNameService.getName(this.dso) : undefined;
       const alternatives = this.allMetadataValues(this.alternativeField);
       this.allSuggestions = [defaultValue, ...alternatives];
 
       this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
         .pipe(take(1))
         .subscribe((nameVariant: string) => {
-            this.selectedName = nameVariant || defaultValue;
-          }
+          this.selectedName = nameVariant || defaultValue;
+        },
         );
     }
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
@@ -100,15 +108,15 @@ export class OrgUnitSearchResultListSubmissionElementComponent extends SearchRes
             Object.assign({}, this.dso, {
               metadata: {
                 ...this.dso.metadata,
-                ...alternativeNames
+                ...alternativeNames,
               },
             });
           this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
         }).catch(() => {
         // user clicked cancel: use the name variant only for this relation, no further action required
-      }).finally(() => {
-        this.select(value);
-      });
+        }).finally(() => {
+          this.select(value);
+        });
     }
   }
 
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.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..d2a1639d40 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
@@ -1,7 +1,16 @@
-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 {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component';
 
 let component: OrgUnitInputSuggestionsComponent;
 let fixture: ComponentFixture<OrgUnitInputSuggestionsComponent>;
@@ -21,12 +30,13 @@ describe('OrgUnitInputSuggestionsComponent', () => {
       declarations: [OrgUnitInputSuggestionsComponent],
       imports: [
         FormsModule,
+        TranslateModule.forRoot(),
       ],
       providers: [
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrgUnitInputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
index a7fe2a99dd..9926350a40 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -1,5 +1,11 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+
 import { InputSuggestionsComponent } from '../../../../../../shared/input-suggestions/input-suggestions.component';
 
 @Component({
@@ -12,9 +18,9 @@ import { InputSuggestionsComponent } from '../../../../../../shared/input-sugges
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => OrgUnitInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
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 6872b3f609..66db99a6af 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
@@ -1,14 +1,14 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'"
-       rel="noopener noreferrer" class="dont-break-out">
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'"
+       [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
                     [placeholder]="'thumbnail.person.placeholder'">
       </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
       <ds-thumbnail [thumbnail]="dso?.thumbnail | async"
                     [defaultImage]="'assets/images/person-placeholder.svg'"
                     [alt]="'thumbnail.person.alt'"
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..25e382f60b 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
@@ -1,11 +1,23 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
@@ -27,7 +39,6 @@ import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-
 import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { PersonSearchResultListSubmissionElementComponent } from './person-search-result-list-submission-element.component';
-import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 
 let personListElementComponent: PersonSearchResultListSubmissionElementComponent;
 let fixture: ComponentFixture<PersonSearchResultListSubmissionElementComponent>;
@@ -40,14 +51,14 @@ let mockRelationshipService;
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 function init() {
@@ -60,17 +71,17 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
+              value: 'This is just another title',
+            },
           ],
           'person.jobTitle': [
             {
               language: 'en_US',
-              value: 'Developer'
-            }
-          ]
-        }
-      })
+              value: 'Developer',
+            },
+          ],
+        },
+      }),
     });
   mockItemWithoutMetadata = Object.assign(
     new ItemSearchResult(),
@@ -81,16 +92,16 @@ function init() {
           'dc.title': [
             {
               language: 'en_US',
-              value: 'This is just another title'
-            }
-          ]
-        }
-      })
+              value: 'This is just another title',
+            },
+          ],
+        },
+      }),
     });
 
   nameVariant = 'Doe J.';
   mockRelationshipService = {
-    getNameVariant: () => observableOf(nameVariant)
+    getNameVariant: () => observableOf(nameVariant),
   };
 }
 
@@ -98,7 +109,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     init();
@@ -112,7 +123,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: NgbModal, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
-        { provide: Store, useValue: {}},
+        { provide: Store, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
@@ -122,12 +133,12 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListSubmissionElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -178,7 +189,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
   const mockBitstreamDataService = {
     getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
       return createSuccessfulRemoteDataObject$(new Bitstream());
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     init();
@@ -192,7 +203,7 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: NgbModal, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: SelectableListService, useValue: {} },
-        { provide: Store, useValue: {}},
+        { provide: Store, useValue: {} },
         { provide: ObjectCacheService, useValue: {} },
         { provide: UUIDService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: {} },
@@ -202,12 +213,12 @@ describe('PersonSearchResultListElementSubmissionComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PersonSearchResultListSubmissionElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
index 7d761c42dd..3dcb135a33 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -1,29 +1,37 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
-import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
 import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { Context } from '../../../../../core/shared/context.model';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
-import { take } from 'rxjs/operators';
-import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
 import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
 
 @listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.EntitySearchModalWithNameVariants)
 @Component({
   selector: 'ds-person-search-result-list-submission-element',
   styleUrls: ['./person-search-result-list-submission-element.component.scss'],
-  templateUrl: './person-search-result-list-submission-element.component.html'
+  templateUrl: './person-search-result-list-submission-element.component.html',
 })
 
 /**
@@ -47,15 +55,15 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
               private itemDataService: ItemDataService,
               private bitstreamDataService: BitstreamDataService,
               private selectableListService: SelectableListService,
-              protected dsoNameService: DSONameService,
-              @Inject(APP_CONFIG) protected appConfig: AppConfig
+              public dsoNameService: DSONameService,
+              @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
 
   ngOnInit() {
     super.ngOnInit();
-    const defaultValue = this.dsoTitle;
+    const defaultValue = this.dso ? this.dsoNameService.getName(this.dso) : undefined;
     const alternatives = this.allMetadataValues(this.alternativeField);
     this.allSuggestions = [defaultValue, ...alternatives];
 
@@ -63,7 +71,7 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
       .pipe(take(1))
       .subscribe((nameVariant: string) => {
         this.selectedName = nameVariant || defaultValue;
-        }
+      },
       );
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
   }
@@ -84,25 +92,25 @@ export class PersonSearchResultListSubmissionElementComponent extends SearchResu
       this.openModal(value)
         .then(() => {
           // user clicked ok: store the name variant in the item
-            const newName: MetadataValue = new MetadataValue();
-            newName.value = value;
+          const newName: MetadataValue = new MetadataValue();
+          newName.value = value;
 
-            const existingNames: MetadataValue[] = this.dso.metadata[this.alternativeField] || [];
-            const alternativeNames = { [this.alternativeField]: [...existingNames, newName] };
-            const updatedItem =
+          const existingNames: MetadataValue[] = this.dso.metadata[this.alternativeField] || [];
+          const alternativeNames = { [this.alternativeField]: [...existingNames, newName] };
+          const updatedItem =
               Object.assign({}, this.dso, {
                 metadata: {
                   ...this.dso.metadata,
-                  ...alternativeNames
+                  ...alternativeNames,
                 },
               });
-            this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
-            this.itemDataService.commitUpdates();
-      }).catch(() => {
+          this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
+          this.itemDataService.commitUpdates();
+        }).catch(() => {
         // user clicked cancel: use the name variant only for this relation, no further action required
-      }).finally(() => {
-        this.select(value);
-      });
+        }).finally(() => {
+          this.select(value);
+        });
     }
   }
 
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.ts b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
index 5109a19963..df52d4d5a9 100644
--- a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -1,5 +1,11 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+
 import { InputSuggestionsComponent } from '../../../../../../shared/input-suggestions/input-suggestions.component';
 
 @Component({
@@ -12,9 +18,9 @@ import { InputSuggestionsComponent } from '../../../../../../shared/input-sugges
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => PersonInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
index 4a28c203fc..944034bad5 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
@@ -1,9 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  NgbActiveModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { NameVariantModalComponent } from './name-variant-modal.component';
-import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
 
 describe('NameVariantModalComponent', () => {
   let component: NameVariantModalComponent;
@@ -19,7 +26,7 @@ describe('NameVariantModalComponent', () => {
     TestBed.configureTestingModule({
       declarations: [NameVariantModalComponent],
       imports: [NgbModule, TranslateModule.forRoot()],
-      providers: [{ provide: NgbActiveModal, useValue: modal }]
+      providers: [{ provide: NgbActiveModal, useValue: modal }],
     })
       .compileComponents();
   }));
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
index eb6f7d01ac..12c7d3ea38 100644
--- a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 /**
@@ -8,7 +11,7 @@ import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 @Component({
   selector: 'ds-name-variant-modal',
   templateUrl: './name-variant-modal.component.html',
-  styleUrls: ['./name-variant-modal.component.scss']
+  styleUrls: ['./name-variant-modal.component.scss'],
 })
 /**
  * The component for the modal to add a name variant to an item
diff --git a/src/app/footer/footer.component.html b/src/app/footer/footer.component.html
index 88236d381e..b937b2ce60 100644
--- a/src/app/footer/footer.component.html
+++ b/src/app/footer/footer.component.html
@@ -62,25 +62,32 @@
         <a class="text-white"
            href="https://www.lyrasis.org/">{{ '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()">
+            {{ 'footer.link.cookies' | translate}}
+          </button>
         </li>
         <li *ngIf="showPrivacyPolicy">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/privacy">{{ 'footer.link.privacy-policy' | translate}}</a>
         </li>
         <li *ngIf="showEndUserAgreement">
-          <a class="text-white"
+          <a class="btn text-white"
              routerLink="info/end-user-agreement">{{ 'footer.link.end-user-agreement' | translate}}</a>
         </li>
-        <li>
-          <a class="text-white"
+        <li *ngIf="showSendFeedback$ | async">
+          <a class="btn text-white"
              routerLink="info/feedback">{{ 'footer.link.feedback' | translate}}</a>
         </li>
       </ul>
     </div>
+    <div class="notify-enabled text-white" [hidden]="!coarLdnEnabled">
+      <a class="coar-notify-support-route" routerLink="info/coar-notify-support">
+        <img class="n-coar" src="assets/images/n-coar.png" [attr.alt]="'menu.header.image.logo' | translate" />
+        COAR Notify
+      </a>
+    </div>
   </div>
   <!-- Copyright -->
 </footer>
diff --git a/src/app/footer/footer.component.scss b/src/app/footer/footer.component.scss
index 350295b870..5f86137b44 100644
--- a/src/app/footer/footer.component.scss
+++ b/src/app/footer/footer.component.scss
@@ -22,13 +22,40 @@
     }
 
     .bottom-footer {
+      .notify-enabled {
+        position: absolute;
+        bottom: 4px;
+        right: 0;
+
+        .coar-notify-support-route {
+          padding: 0 calc(var(--bs-spacer) / 2);
+          color: inherit;
+        }
+
+        .n-coar {
+          height: var(--ds-footer-n-coar-height);
+          margin-bottom: 8.5px;
+        }
+
+        margin-top: 20px;
+      }
       ul {
         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) {
@@ -45,3 +72,4 @@
 }
 
 
+
diff --git a/src/app/footer/footer.component.spec.ts b/src/app/footer/footer.component.spec.ts
index 15b289d5fb..7a88c66eab 100644
--- a/src/app/footer/footer.component.spec.ts
+++ b/src/app/footer/footer.component.spec.ts
@@ -1,51 +1,67 @@
 // ... test imports
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-
 import { CommonModule } from '@angular/common';
-
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { StoreModule } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { environment } from 'src/environments/environment';
 
+import { storeModuleConfig } from '../app.reducer';
+import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { AuthorizationDataServiceStub } from '../shared/testing/authorization-service.stub';
 // Load the implementations that should be tested
 import { FooterComponent } from './footer.component';
 
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
-import { storeModuleConfig } from '../app.reducer';
-
 let comp: FooterComponent;
+let compAny: any;
 let fixture: ComponentFixture<FooterComponent>;
 let de: DebugElement;
 let el: HTMLElement;
 
-describe('Footer component', () => {
+let notifyInfoService = {
+  isCoarConfigEnabled: () => of(true),
+};
 
-  // waitForAsync beforeEach
+describe('Footer component', () => {
   beforeEach(waitForAsync(() => {
     return TestBed.configureTestingModule({
       imports: [CommonModule, StoreModule.forRoot({}, storeModuleConfig), TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [FooterComponent], // declare the test component
       providers: [
-        FooterComponent
+        FooterComponent,
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
+        { provide: NotifyInfoService, useValue: notifyInfoService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }));
 
   // synchronous beforeEach
   beforeEach(() => {
     fixture = TestBed.createComponent(FooterComponent);
-
-    comp = fixture.componentInstance; // component test instance
-
+    comp = fixture.componentInstance;
+    compAny = comp as any;
     // query for the title <p> by CSS element selector
     de = fixture.debugElement.query(By.css('p'));
     el = de.nativeElement;
@@ -56,4 +72,56 @@ describe('Footer component', () => {
     expect(app).toBeTruthy();
   }));
 
+
+  it('should set showPrivacyPolicy to the value of environment.info.enablePrivacyStatement', () => {
+    expect(comp.showPrivacyPolicy).toBe(environment.info.enablePrivacyStatement);
+  });
+
+  it('should set showEndUserAgreement to the value of environment.info.enableEndUserAgreement', () => {
+    expect(comp.showEndUserAgreement).toBe(environment.info.enableEndUserAgreement);
+  });
+
+  describe('showCookieSettings', () => {
+    it('should call cookies.showSettings() if cookies is defined', () => {
+      const cookies = jasmine.createSpyObj('cookies', ['showSettings']);
+      compAny.cookies = cookies;
+      comp.showCookieSettings();
+      expect(cookies.showSettings).toHaveBeenCalled();
+    });
+
+    it('should not call cookies.showSettings() if cookies is undefined', () => {
+      compAny.cookies = undefined;
+      expect(() => comp.showCookieSettings()).not.toThrow();
+    });
+
+    it('should return false', () => {
+      expect(comp.showCookieSettings()).toBeFalse();
+    });
+  });
+
+  describe('when coarLdnEnabled is true', () => {
+    beforeEach(() => {
+      spyOn(notifyInfoService, 'isCoarConfigEnabled').and.returnValue(of(true));
+      fixture.detectChanges();
+    });
+
+    it('should set coarLdnEnabled based on notifyInfoService', () => {
+      expect(comp.coarLdnEnabled).toBeTruthy();
+      // Check if COAR Notify section is rendered
+      const notifySection = fixture.debugElement.query(By.css('.notify-enabled'));
+      expect(notifySection).toBeTruthy();
+    });
+
+    it('should redirect to info/coar-notify-support', () => {
+      // Check if the link to the COAR Notify support page is present
+      const routerLink = fixture.debugElement.query(By.css('a[routerLink="info/coar-notify-support"].coar-notify-support-route'));
+      expect(routerLink).toBeTruthy();
+    });
+
+    it('should have an img tag with the class "n-coar" when coarLdnEnabled is true', fakeAsync(() => {
+      // Check if the img tag with the class "n-coar" is present
+      const imgTag = fixture.debugElement.query(By.css('.notify-enabled img.n-coar'));
+      expect(imgTag).toBeTruthy();
+    }));
+  });
 });
diff --git a/src/app/footer/footer.component.ts b/src/app/footer/footer.component.ts
index c4195c8eb3..9012a2ccb2 100644
--- a/src/app/footer/footer.component.ts
+++ b/src/app/footer/footer.component.ts
@@ -1,12 +1,20 @@
-import { Component, Optional } from '@angular/core';
-import { hasValue } from '../shared/empty.util';
-import { KlaroService } from '../shared/cookies/klaro.service';
+import {
+  Component,
+  Optional,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { environment } from '../../environments/environment';
+import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { KlaroService } from '../shared/cookies/klaro.service';
+import { hasValue } from '../shared/empty.util';
 
 @Component({
   selector: 'ds-footer',
   styleUrls: ['footer.component.scss'],
-  templateUrl: 'footer.component.html'
+  templateUrl: 'footer.component.html',
 })
 export class FooterComponent {
   dateObj: number = Date.now();
@@ -17,8 +25,18 @@ export class FooterComponent {
   showTopFooter = false;
   showPrivacyPolicy = environment.info.enablePrivacyStatement;
   showEndUserAgreement = environment.info.enableEndUserAgreement;
+  showSendFeedback$: Observable<boolean>;
+  coarLdnEnabled: boolean;
 
-  constructor(@Optional() private cookies: KlaroService) {
+  constructor(
+    @Optional() private cookies: KlaroService,
+    private authorizationService: AuthorizationDataService,
+    private notifyInfoService: NotifyInfoService,
+  ) {
+    this.showSendFeedback$ = this.authorizationService.isAuthorized(FeatureID.CanSendFeedback);
+    this.notifyInfoService.isCoarConfigEnabled().subscribe(coarLdnEnabled => {
+      this.coarLdnEnabled = coarLdnEnabled;
+    });
   }
 
   showCookieSettings() {
diff --git a/src/app/footer/themed-footer.component.ts b/src/app/footer/themed-footer.component.ts
index c52a0af29f..11f3ae98f9 100644
--- a/src/app/footer/themed-footer.component.ts
+++ b/src/app/footer/themed-footer.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { FooterComponent } from './footer.component';
 
@@ -7,7 +8,7 @@ import { FooterComponent } from './footer.component';
  */
 @Component({
   selector: 'ds-themed-footer',
-  styleUrls: ['footer.component.scss'],
+  styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
 export class ThemedFooterComponent extends ThemedComponent<FooterComponent> {
@@ -20,6 +21,6 @@ export class ThemedFooterComponent extends ThemedComponent<FooterComponent> {
   }
 
   protected importUnthemedComponent(): Promise<any> {
-    return import(`./footer.component`);
+    return import('./footer.component');
   }
 }
diff --git a/src/app/forbidden/forbidden.component.ts b/src/app/forbidden/forbidden.component.ts
index b622a0f066..be8065384a 100644
--- a/src/app/forbidden/forbidden.component.ts
+++ b/src/app/forbidden/forbidden.component.ts
@@ -1,4 +1,8 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { AuthService } from '../core/auth/auth.service';
 import { ServerResponseService } from '../core/services/server-response.service';
 
@@ -8,7 +12,7 @@ import { ServerResponseService } from '../core/services/server-response.service'
 @Component({
   selector: 'ds-forbidden',
   templateUrl: './forbidden.component.html',
-  styleUrls: ['./forbidden.component.scss']
+  styleUrls: ['./forbidden.component.scss'],
 })
 export class ForbiddenComponent implements OnInit {
 
diff --git a/src/app/forbidden/themed-forbidden.component.ts b/src/app/forbidden/themed-forbidden.component.ts
index 830529c8fa..ae461ec462 100644
--- a/src/app/forbidden/themed-forbidden.component.ts
+++ b/src/app/forbidden/themed-forbidden.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ForbiddenComponent } from './forbidden.component';
 
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 263f142c2e..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
-    [MESSAGE_PREFIX]="'forgot-email.form'">
-</ds-register-email-form>
\ No newline at end of file
+<ds-themed-register-email-form
+    [MESSAGE_PREFIX]="'forgot-email.form'" [typeRequest]="typeRequest">
+</ds-themed-register-email-form>
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
index 6ce13c31d3..16aa899722 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.spec.ts
@@ -1,9 +1,14 @@
-import { ForgotEmailComponent } from './forgot-email.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ForgotEmailComponent } from './forgot-email.component';
 
 describe('ForgotEmailComponent', () => {
   let comp: ForgotEmailComponent;
@@ -13,7 +18,7 @@ describe('ForgotEmailComponent', () => {
     TestBed.configureTestingModule({
       imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [ForgotEmailComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
index af482bdb67..173ff762c0 100644
--- a/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
+++ b/src/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -1,13 +1,15 @@
 import { Component } from '@angular/core';
 
+import { TYPE_REQUEST_FORGOT } from '../../register-email-form/register-email-form.component';
+
 @Component({
   selector: 'ds-forgot-email',
   styleUrls: ['./forgot-email.component.scss'],
-  templateUrl: './forgot-email.component.html'
+  templateUrl: './forgot-email.component.html',
 })
 /**
  * Component responsible the forgot password email step
  */
 export class ForgotEmailComponent {
-
+  typeRequest = TYPE_REQUEST_FORGOT;
 }
diff --git a/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts b/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts
index da3848db1d..bc4e5c2192 100644
--- a/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts
+++ b/src/app/forgot-password/forgot-password-email/themed-forgot-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ForgotEmailComponent } from './forgot-email.component';
 
@@ -8,7 +9,7 @@ import { ForgotEmailComponent } from './forgot-email.component';
 @Component({
   selector: 'ds-themed-forgot-email',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedForgotEmailComponent extends ThemedComponent<ForgotEmailComponent> {
   protected getComponentName(): string {
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..189d0bee40 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>
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 68566efaec..c6c6bbe9f8 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
@@ -1,26 +1,38 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Store } from '@ngrx/store';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { Registration } from '../../core/shared/registration.model';
-import { ForgotPasswordFormComponent } from './forgot-password-form.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { CoreState } from '../../core/core-state.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { Registration } from '../../core/shared/registration.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { CoreState } from '../../core/core-state.model';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { BrowserOnlyPipe } from '../../shared/utils/browser-only.pipe';
+import { ForgotPasswordFormComponent } from './forgot-password-form.component';
 
 describe('ForgotPasswordFormComponent', () => {
   let comp: ForgotPasswordFormComponent;
@@ -35,17 +47,17 @@ describe('ForgotPasswordFormComponent', () => {
   const registration = Object.assign(new Registration(), {
     email: 'test@email.org',
     user: 'test-uuid',
-    token: 'test-token'
+    token: 'test-token',
   });
 
   beforeEach(waitForAsync(() => {
 
-    route = {data: observableOf({registration: createSuccessfulRemoteDataObject(registration)})};
+    route = { data: observableOf({ registration: createSuccessfulRemoteDataObject(registration) }) };
     router = new RouterStub();
     notificationsService = new NotificationsServiceStub();
 
     ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
-      patchPasswordWithToken: createSuccessfulRemoteDataObject$({})
+      patchPasswordWithToken: createSuccessfulRemoteDataObject$({}),
     });
 
     store = jasmine.createSpyObj('store', {
@@ -54,16 +66,19 @@ describe('ForgotPasswordFormComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
-      declarations: [ForgotPasswordFormComponent],
-      providers: [
-        {provide: Router, useValue: router},
-        {provide: ActivatedRoute, useValue: route},
-        {provide: Store, useValue: store},
-        {provide: EPersonDataService, useValue: ePersonDataService},
-        {provide: FormBuilder, useValue: new FormBuilder()},
-        {provide: NotificationsService, useValue: notificationsService},
+      declarations: [
+        BrowserOnlyPipe,
+        ForgotPasswordFormComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      providers: [
+        { provide: Router, useValue: router },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Store, useValue: store },
+        { provide: EPersonDataService, useValue: ePersonDataService },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: notificationsService },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -75,7 +90,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/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index e20683e6e3..52bb8074e6 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,22 +1,29 @@
 import { Component } from '@angular/core';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { Observable } from 'rxjs';
-import { Registration } from '../../core/shared/registration.model';
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthenticateAction } from '../../core/auth/auth.actions';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { RemoteData } from '../../core/data/remote-data';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload, } from '../../core/shared/operators';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AuthenticateAction } from '../../core/auth/auth.actions';
 import { CoreState } from '../../core/core-state.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { Registration } from '../../core/shared/registration.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-forgot-password-form',
   styleUrls: ['./forgot-password-form.component.scss'],
-  templateUrl: './forgot-password-form.component.html'
+  templateUrl: './forgot-password-form.component.html',
 })
 /**
  * Component for a user to enter a new password for a forgot token.
@@ -73,18 +80,18 @@ export class ForgotPasswordFormComponent {
   submit() {
     if (!this.isInValid) {
       this.ePersonDataService.patchPasswordWithToken(this.user, this.token, this.password).pipe(
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       ).subscribe((response: RemoteData<EPerson>) => {
         if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.title'),
-            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content')
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.success.content'),
           );
           this.store.dispatch(new AuthenticateAction(this.email, this.password));
           this.router.navigate(['/home']);
         } else {
           this.notificationsService.error(
-            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), response.errorMessage
+            this.translateService.instant(this.NOTIFICATIONS_PREFIX + '.error.title'), response.errorMessage,
           );
         }
       });
diff --git a/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts b/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts
index 3fb1b67e01..600efa2935 100644
--- a/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts
+++ b/src/app/forgot-password/forgot-password-form/themed-forgot-password-form.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ForgotPasswordFormComponent } from './forgot-password-form.component';
 
@@ -8,7 +9,7 @@ import { ForgotPasswordFormComponent } from './forgot-password-form.component';
 @Component({
   selector: 'ds-themed-forgot-password-form',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedForgotPasswordFormComponent extends ThemedComponent<ForgotPasswordFormComponent> {
   protected getComponentName(): string {
diff --git a/src/app/forgot-password/forgot-password-routing.module.ts b/src/app/forgot-password/forgot-password-routing.module.ts
index ee4e081d5f..0d7c493d1c 100644
--- a/src/app/forgot-password/forgot-password-routing.module.ts
+++ b/src/app/forgot-password/forgot-password-routing.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { ItemPageResolver } from '../item-page/item-page.resolver';
-import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
-import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
 import { RegistrationGuard } from '../register-page/registration.guard';
+import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
+import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
 
 @NgModule({
   imports: [
@@ -11,18 +12,18 @@ import { RegistrationGuard } from '../register-page/registration.guard';
       {
         path: '',
         component: ThemedForgotEmailComponent,
-        data: {title: 'forgot-password.title'},
+        data: { title: 'forgot-password.title' },
       },
       {
         path: ':token',
         component: ThemedForgotPasswordFormComponent,
         canActivate: [ RegistrationGuard ],
-      }
-    ])
+      },
+    ]),
   ],
   providers: [
     ItemPageResolver,
-  ]
+  ],
 })
 /**
  * This module defines the routing to the components related to the forgot password components.
diff --git a/src/app/forgot-password/forgot-password.module.ts b/src/app/forgot-password/forgot-password.module.ts
index 593149d2a5..23b446fad5 100644
--- a/src/app/forgot-password/forgot-password.module.ts
+++ b/src/app/forgot-password/forgot-password.module.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { ProfilePageModule } from '../profile-page/profile-page.module';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
 import { SharedModule } from '../shared/shared.module';
 import { ForgotEmailComponent } from './forgot-password-email/forgot-email.component';
-import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
-import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
-import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
-import { ProfilePageModule } from '../profile-page/profile-page.module';
-import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
 import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgot-email.component';
+import { ForgotPasswordFormComponent } from './forgot-password-form/forgot-password-form.component';
+import { ThemedForgotPasswordFormComponent } from './forgot-password-form/themed-forgot-password-form.component';
+import { ForgotPasswordRoutingModule } from './forgot-password-routing.module';
 
 @NgModule({
   imports: [
@@ -23,7 +24,7 @@ import { ThemedForgotEmailComponent } from './forgot-password-email/themed-forgo
     ForgotPasswordFormComponent,
     ThemedForgotPasswordFormComponent,
   ],
-  providers: []
+  providers: [],
 })
 
 /**
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..ba3060ff69 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) !== true}" 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 b297979fd0..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,7 +1,6 @@
-@media screen and (max-width: map-get($grid-breakpoints, md)) {
-    :host.open {
-        background-color: var(--bs-white);
-        top: 0;
-        position: sticky;
-    }
+:host {
+  position: relative;
+  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..0bca2cef4b 100644
--- a/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/header-navbar-wrapper.component.ts
@@ -1,8 +1,13 @@
-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 {
+  HostWindowService,
+  WidthCategory,
+} from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
 
@@ -14,26 +19,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-nav-wrapper/themed-header-navbar-wrapper.component.scss b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.scss
deleted file mode 100644
index db392096aa..0000000000
--- a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  z-index: var(--ds-nav-z-index);
-}
diff --git a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
index 7f9c181fe2..41c8a000e3 100644
--- a/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
+++ b/src/app/header-nav-wrapper/themed-header-navbar-wrapper.component.ts
@@ -1,13 +1,14 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { HeaderNavbarWrapperComponent } from './header-navbar-wrapper.component';
 
 /**
- * Themed wrapper for BreadcrumbsComponent
+ * Themed wrapper for {@link HeaderNavbarWrapperComponent}
  */
 @Component({
   selector: 'ds-themed-header-navbar-wrapper',
-  styleUrls: ['./themed-header-navbar-wrapper.component.scss'],
+  styleUrls: [],
   templateUrl: '../shared/theme-support/themed.component.html',
 })
 export class ThemedHeaderNavbarWrapperComponent extends ThemedComponent<HeaderNavbarWrapperComponent> {
@@ -20,6 +21,6 @@ export class ThemedHeaderNavbarWrapperComponent extends ThemedComponent<HeaderNa
   }
 
   protected importUnthemedComponent(): Promise<any> {
-    return import(`./header-navbar-wrapper.component`);
+    return import('./header-navbar-wrapper.component');
   }
 }
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
new file mode 100644
index 0000000000..1ec2050497
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.html
@@ -0,0 +1,10 @@
+<div *ngIf="buttonVisible$ | async">
+  <a href="javascript:void(0);"
+     role="button"
+     (click)="onClick()"
+     [attr.aria-label]="'nav.context-help-toggle' | translate"
+     [title]="'nav.context-help-toggle' | translate"
+  >
+    <i class="fas fa-lg fa-fw fa-question-circle ds-context-help-toggle"></i>
+  </a>
+</div>
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.scss b/src/app/header/context-help-toggle/context-help-toggle.component.scss
new file mode 100644
index 0000000000..f3e5e01880
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.scss
@@ -0,0 +1,8 @@
+.ds-context-help-toggle {
+  color: var(--ds-header-icon-color);
+  background-color: var(--ds-header-bg);
+
+  &:hover, &:focus {
+    color: var(--ds-header-icon-color-hover);
+  }
+}
diff --git a/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
new file mode 100644
index 0000000000..680c2e746b
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.spec.ts
@@ -0,0 +1,68 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ContextHelpService } from '../../shared/context-help.service';
+import { ContextHelpToggleComponent } from './context-help-toggle.component';
+
+describe('ContextHelpToggleComponent', () => {
+  let component: ContextHelpToggleComponent;
+  let fixture: ComponentFixture<ContextHelpToggleComponent>;
+  let contextHelpService;
+
+  beforeEach(async () => {
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'tooltipCount$', 'toggleIcons',
+    ]);
+    contextHelpService.tooltipCount$.and.returnValue(observableOf(0));
+    await TestBed.configureTestingModule({
+      declarations: [ ContextHelpToggleComponent ],
+      providers: [
+        { provide: ContextHelpService, useValue: contextHelpService },
+      ],
+      imports: [ TranslateModule.forRoot() ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ContextHelpToggleComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create', () => {
+    fixture.detectChanges();
+    expect(component).toBeTruthy();
+  });
+
+  describe('if there are no elements on the page with a tooltip', () => {
+    it('the toggle should not be visible', fakeAsync(() => {
+      fixture.detectChanges();
+      fixture.whenStable().then(() => {
+        expect(fixture.debugElement.query(By.css('div'))).toBeNull();
+      });
+    }));
+  });
+
+  describe('if there are elements on the page with a tooltip', () => {
+    beforeEach(() => {
+      contextHelpService.tooltipCount$.and.returnValue(observableOf(1));
+      fixture.detectChanges();
+    });
+
+    it('clicking the button should toggle context help icon visibility', fakeAsync(() => {
+      fixture.whenStable().then(() => {
+        fixture.debugElement.query(By.css('a')).nativeElement.click();
+        tick();
+        expect(contextHelpService.toggleIcons).toHaveBeenCalled();
+      });
+    }));
+  });
+
+});
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
new file mode 100644
index 0000000000..d4fb22713c
--- /dev/null
+++ b/src/app/header/context-help-toggle/context-help-toggle.component.ts
@@ -0,0 +1,48 @@
+import {
+  Component,
+  ElementRef,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { ContextHelpService } from '../../shared/context-help.service';
+
+/**
+ * Renders a "context help toggle" button that toggles the visibility of tooltip buttons on the page.
+ * If there are no tooltip buttons available on the current page, the toggle is unclickable.
+ */
+@Component({
+  selector: 'ds-context-help-toggle',
+  templateUrl: './context-help-toggle.component.html',
+  styleUrls: ['./context-help-toggle.component.scss'],
+})
+export class ContextHelpToggleComponent implements OnInit {
+  buttonVisible$: Observable<boolean>;
+
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    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() {
+    this.contextHelpService.toggleIcons();
+  }
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index e2ee33c760..e98959d162 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -7,14 +7,15 @@
 
       <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 922b2d02e1..e002e0c347 100644
--- a/src/app/header/header.component.scss
+++ b/src/app/header/header.component.scss
@@ -1,23 +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-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-}
+  .navbar-brand img {
+    max-height: var(--ds-header-logo-height);
+    max-width: 100%;
+  }
 
-.navbar ::ng-deep {
-  a {
+  .navbar-toggler {
+    border: none;
     color: var(--ds-header-icon-color);
 
-    &:hover, &focus {
+    &: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;
   }
 }
-
diff --git a/src/app/header/header.component.spec.ts b/src/app/header/header.component.spec.ts
index 9bc952cee3..4a0094e78c 100644
--- a/src/app/header/header.component.spec.ts
+++ b/src/app/header/header.component.spec.ts
@@ -1,15 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-
 import { of as observableOf } from 'rxjs';
 
-import { HeaderComponent } from './header.component';
-import { ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { HostWindowService } from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
+import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
 import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { HeaderComponent } from './header.component';
 
 let comp: HeaderComponent;
 let fixture: ComponentFixture<HeaderComponent>;
@@ -26,9 +31,10 @@ describe('HeaderComponent', () => {
         ReactiveFormsModule],
       declarations: [HeaderComponent],
       providers: [
-        { provide: MenuService, useValue: menuService }
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: MenuService, useValue: menuService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();  // compile template and css
   }));
@@ -40,7 +46,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..6395a4701a 100644
--- a/src/app/header/header.component.ts
+++ b/src/app/header/header.component.ts
@@ -1,5 +1,13 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../shared/host-window.service';
 import { MenuService } from '../shared/menu/menu.service';
 import { MenuID } from '../shared/menu/menu-id.model';
 
@@ -11,20 +19,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/header/themed-header.component.ts b/src/app/header/themed-header.component.ts
index 51c817b63d..eaab64526b 100644
--- a/src/app/header/themed-header.component.ts
+++ b/src/app/header/themed-header.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { HeaderComponent } from './header.component';
 
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/health-info-component.component.spec.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
index b4532415b8..0d575c72b2 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.spec.ts
@@ -1,15 +1,23 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { HealthInfoComponentComponent } from './health-info-component.component';
-import { HealthInfoComponentOne, HealthInfoComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
-import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  HealthInfoComponentOne,
+  HealthInfoComponentTwo,
+} from '../../../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { HealthInfoComponentComponent } from './health-info-component.component';
 
 describe('HealthInfoComponentComponent', () => {
   let component: HealthInfoComponentComponent;
@@ -24,14 +32,14 @@ describe('HealthInfoComponentComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [
         HealthInfoComponentComponent,
-        ObjNgFor
-      ]
+        ObjNgFor,
+      ],
     })
       .compileComponents();
   });
diff --git a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
index d2cb393f09..2aa5b165d4 100644
--- a/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
+++ b/src/app/health-page/health-info/health-info-component/health-info-component.component.ts
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { HealthInfoComponent } from '../../models/health-component.model';
 import { HealthComponentComponent } from '../../health-panel/health-component/health-component.component';
+import { HealthInfoComponent } from '../../models/health-component.model';
 
 /**
  * Shows a health info object
@@ -9,7 +12,7 @@ import { HealthComponentComponent } from '../../health-panel/health-component/he
 @Component({
   selector: 'ds-health-info-component',
   templateUrl: './health-info-component.component.html',
-  styleUrls: ['./health-info-component.component.scss']
+  styleUrls: ['./health-info-component.component.scss'],
 })
 export class HealthInfoComponentComponent extends HealthComponentComponent {
 
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-info/health-info.component.spec.ts b/src/app/health-page/health-info/health-info.component.spec.ts
index 5a9b8bf0aa..05c9153f52 100644
--- a/src/app/health-page/health-info/health-info.component.spec.ts
+++ b/src/app/health-page/health-info/health-info.component.spec.ts
@@ -1,13 +1,19 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { HealthInfoComponent } from './health-info.component';
-import { HealthInfoResponseObj } from '../../shared/mocks/health-endpoint.mocks';
-import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { HealthInfoResponseObj } from '../../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
+import { HealthInfoComponent } from './health-info.component';
 
 describe('HealthInfoComponent', () => {
   let component: HealthInfoComponent;
@@ -20,17 +26,17 @@ describe('HealthInfoComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [
         HealthInfoComponent,
-        ObjNgFor
+        ObjNgFor,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-info/health-info.component.ts b/src/app/health-page/health-info/health-info.component.ts
index 186d00299c..ddecf90600 100644
--- a/src/app/health-page/health-info/health-info.component.ts
+++ b/src/app/health-page/health-info/health-info.component.ts
@@ -1,5 +1,8 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { HealthInfoResponse } from '../models/health-component.model';
@@ -14,7 +17,7 @@ import { HealthInfoResponse } from '../models/health-component.model';
 @Component({
   selector: 'ds-health-info',
   templateUrl: './health-info.component.html',
-  styleUrls: ['./health-info.component.scss']
+  styleUrls: ['./health-info.component.scss'],
 })
 export class HealthInfoComponent implements OnInit  {
 
diff --git a/src/app/health-page/health-page.component.html b/src/app/health-page/health-page.component.html
index 8083389e1b..d8cba1d46d 100644
--- a/src/app/health-page/health-page.component.html
+++ b/src/app/health-page/health-page.component.html
@@ -1,8 +1,8 @@
 <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'">
+      <li [ngbNavItem]="'status'" role="presentation">
         <a ngbNavLink>{{'health-page.status-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="status">
@@ -10,7 +10,7 @@
           </div>
         </ng-template>
       </li>
-      <li [ngbNavItem]="'info'">
+      <li [ngbNavItem]="'info'" role="presentation">
         <a ngbNavLink>{{'health-page.info-tab' | translate}}</a>
         <ng-template ngbNavContent>
           <div id="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) === null || (healthInfoResponse | async) === null" [type]="AlertType.Error" [content]="'health-page.error.msg'"></ds-alert>
 </div>
 
 
diff --git a/src/app/health-page/health-page.component.spec.ts b/src/app/health-page/health-page.component.spec.ts
index f3847ab092..cd048ad298 100644
--- a/src/app/health-page/health-page.component.spec.ts
+++ b/src/app/health-page/health-page.component.spec.ts
@@ -1,16 +1,24 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of } from 'rxjs';
 import { NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { HealthPageComponent } from './health-page.component';
-import { HealthService } from './health.service';
-import { HealthInfoResponseObj, HealthResponseObj } from '../shared/mocks/health-endpoint.mocks';
 import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
+import {
+  HealthInfoResponseObj,
+  HealthResponseObj,
+} from '../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { HealthService } from './health.service';
+import { HealthPageComponent } from './health-page.component';
 
 describe('HealthPageComponent', () => {
   let component: HealthPageComponent;
@@ -24,13 +32,13 @@ describe('HealthPageComponent', () => {
   const healthRestResponse$ = of({
     payload: HealthResponseObj,
     statusCode: 200,
-    statusText: 'OK'
+    statusText: 'OK',
   } as RawRestResponse);
 
   const healthInfoRestResponse$ = of({
     payload: HealthInfoResponseObj,
     statusCode: 200,
-    statusText: 'OK'
+    statusText: 'OK',
   } as RawRestResponse);
 
   beforeEach(async () => {
@@ -41,16 +49,16 @@ describe('HealthPageComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ HealthPageComponent ],
       providers: [
-        { provide: HealthService, useValue: healthService }
-      ]
+        { provide: HealthService, useValue: healthService },
+      ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-page.component.ts b/src/app/health-page/health-page.component.ts
index aa7bd7cba4..9048479bc7 100644
--- a/src/app/health-page/health-page.component.ts
+++ b/src/app/health-page/health-page.component.ts
@@ -1,15 +1,21 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { BehaviorSubject } from 'rxjs';
 import { take } from 'rxjs/operators';
 
+import { AlertType } from '../shared/alert/alert-type';
 import { HealthService } from './health.service';
-import { HealthInfoResponse, HealthResponse } from './models/health-component.model';
+import {
+  HealthInfoResponse,
+  HealthResponse,
+} from './models/health-component.model';
 
 @Component({
   selector: 'ds-health-page',
   templateUrl: './health-page.component.html',
-  styleUrls: ['./health-page.component.scss']
+  styleUrls: ['./health-page.component.scss'],
 })
 export class HealthPageComponent implements OnInit {
 
@@ -33,6 +39,8 @@ export class HealthPageComponent implements OnInit {
    */
   healthInfoResponseInitialised: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
 
+  readonly AlertType = AlertType;
+
   constructor(private healthDataService: HealthService) {
   }
 
@@ -48,7 +56,7 @@ export class HealthPageComponent implements OnInit {
       error: () => {
         this.healthResponse.next(null);
         this.healthResponseInitialised.next(true);
-      }
+      },
     });
 
     this.healthDataService.getInfo().pipe(take(1)).subscribe({
@@ -59,7 +67,7 @@ export class HealthPageComponent implements OnInit {
       error: () => {
         this.healthInfoResponse.next(null);
         this.healthInfoResponseInitialised.next(true);
-      }
+      },
     });
 
   }
diff --git a/src/app/health-page/health-page.module.ts b/src/app/health-page/health-page.module.ts
index 02a6a91a5f..56933753e1 100644
--- a/src/app/health-page/health-page.module.ts
+++ b/src/app/health-page/health-page.module.ts
@@ -1,17 +1,16 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { HealthPageRoutingModule } from './health-page.routing.module';
-import { HealthPanelComponent } from './health-panel/health-panel.component';
-import { HealthStatusComponent } from './health-panel/health-status/health-status.component';
 import { SharedModule } from '../shared/shared.module';
-import { HealthPageComponent } from './health-page.component';
-import { HealthComponentComponent } from './health-panel/health-component/health-component.component';
 import { HealthInfoComponent } from './health-info/health-info.component';
 import { HealthInfoComponentComponent } from './health-info/health-info-component/health-info-component.component';
+import { HealthPageComponent } from './health-page.component';
+import { HealthPageRoutingModule } from './health-page.routing.module';
+import { HealthComponentComponent } from './health-panel/health-component/health-component.component';
+import { HealthPanelComponent } from './health-panel/health-panel.component';
+import { HealthStatusComponent } from './health-panel/health-status/health-status.component';
 
 
 @NgModule({
@@ -20,7 +19,7 @@ import { HealthInfoComponentComponent } from './health-info/health-info-componen
     HealthPageRoutingModule,
     NgbModule,
     SharedModule,
-    TranslateModule
+    TranslateModule,
   ],
   declarations: [
     HealthPageComponent,
@@ -29,7 +28,7 @@ import { HealthInfoComponentComponent } from './health-info/health-info-componen
     HealthComponentComponent,
     HealthInfoComponent,
     HealthInfoComponentComponent,
-  ]
+  ],
 })
 export class HealthPageModule {
 }
diff --git a/src/app/health-page/health-page.routing.module.ts b/src/app/health-page/health-page.routing.module.ts
index 82d541dc31..a845584107 100644
--- a/src/app/health-page/health-page.routing.module.ts
+++ b/src/app/health-page/health-page.routing.module.ts
@@ -1,11 +1,9 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
 
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { HealthPageComponent } from './health-page.component';
-import {
-  SiteAdministratorGuard
-} from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 
 @NgModule({
   imports: [
@@ -18,10 +16,10 @@ import {
           title: 'health-page.title',
         },
         canActivate: [SiteAdministratorGuard],
-        component: HealthPageComponent
-      }
-    ])
-  ]
+        component: HealthPageComponent,
+      },
+    ]),
+  ],
 })
 export class HealthPageRoutingModule {
 
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.spec.ts b/src/app/health-page/health-panel/health-component/health-component.component.spec.ts
index a8ec2b65e0..051eb12ffc 100644
--- a/src/app/health-page/health-panel/health-component/health-component.component.spec.ts
+++ b/src/app/health-page/health-panel/health-component/health-component.component.spec.ts
@@ -1,16 +1,24 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-
 import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { HealthComponentComponent } from './health-component.component';
-import { HealthComponentOne, HealthComponentTwo } from '../../../shared/mocks/health-endpoint.mocks';
-import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  HealthComponentOne,
+  HealthComponentTwo,
+} from '../../../shared/mocks/health-endpoint.mocks';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { HealthComponentComponent } from './health-component.component';
 
 describe('HealthComponentComponent', () => {
   let component: HealthComponentComponent;
@@ -25,17 +33,17 @@ describe('HealthComponentComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [
         HealthComponentComponent,
-        ObjNgFor
+        ObjNgFor,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
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..718f43ed35 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
@@ -1,9 +1,11 @@
-import { Component, Input } from '@angular/core';
-
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
+import { AlertType } from '../../../shared/alert/alert-type';
 import { HealthComponent } from '../../models/health-component.model';
-import { AlertType } from '../../../shared/alert/aletr-type';
 
 /**
  * A component to render a "health component" object.
@@ -15,7 +17,7 @@ import { AlertType } from '../../../shared/alert/aletr-type';
 @Component({
   selector: 'ds-health-component',
   templateUrl: './health-component.component.html',
-  styleUrls: ['./health-component.component.scss']
+  styleUrls: ['./health-component.component.scss'],
 })
 export class HealthComponentComponent {
 
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-panel.component.spec.ts b/src/app/health-page/health-panel/health-panel.component.spec.ts
index 1d9c856ddb..319ef1a61e 100644
--- a/src/app/health-page/health-panel/health-panel.component.spec.ts
+++ b/src/app/health-page/health-panel/health-panel.component.spec.ts
@@ -1,16 +1,24 @@
 import { CommonModule } from '@angular/common';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  NgbAccordionModule,
+  NgbNavModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { NgbAccordionModule, NgbNavModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { HealthPanelComponent } from './health-panel.component';
 import { HealthResponseObj } from '../../shared/mocks/health-endpoint.mocks';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { ObjNgFor } from '../../shared/utils/object-ngfor.pipe';
+import { HealthPanelComponent } from './health-panel.component';
 
 describe('HealthPanelComponent', () => {
   let component: HealthPanelComponent;
@@ -26,15 +34,15 @@ describe('HealthPanelComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [
         HealthPanelComponent,
-        ObjNgFor
+        ObjNgFor,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   });
 
diff --git a/src/app/health-page/health-panel/health-panel.component.ts b/src/app/health-page/health-panel/health-panel.component.ts
index 1c056daf20..c02f194247 100644
--- a/src/app/health-page/health-panel/health-panel.component.ts
+++ b/src/app/health-page/health-panel/health-panel.component.ts
@@ -1,5 +1,8 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { HealthResponse } from '../models/health-component.model';
@@ -10,7 +13,7 @@ import { HealthResponse } from '../models/health-component.model';
 @Component({
   selector: 'ds-health-panel',
   templateUrl: './health-panel.component.html',
-  styleUrls: ['./health-panel.component.scss']
+  styleUrls: ['./health-panel.component.scss'],
 })
 export class HealthPanelComponent implements OnInit {
 
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/health-page/health-panel/health-status/health-status.component.spec.ts b/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
index f0f61ebdbb..a2745a0d83 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { HealthStatusComponent } from './health-status.component';
-import { HealthStatus } from '../../models/health-component.model';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { HealthStatus } from '../../models/health-component.model';
+import { HealthStatusComponent } from './health-status.component';
 
 describe('HealthStatusComponent', () => {
   let component: HealthStatusComponent;
@@ -18,13 +24,13 @@ describe('HealthStatusComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
-      declarations: [ HealthStatusComponent ]
+      declarations: [ HealthStatusComponent ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
diff --git a/src/app/health-page/health-panel/health-status/health-status.component.ts b/src/app/health-page/health-panel/health-status/health-status.component.ts
index 172baeee71..0af2b91367 100644
--- a/src/app/health-page/health-panel/health-status/health-status.component.ts
+++ b/src/app/health-page/health-panel/health-status/health-status.component.ts
@@ -1,4 +1,8 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { HealthStatus } from '../../models/health-component.model';
 
 /**
@@ -7,7 +11,7 @@ import { HealthStatus } from '../../models/health-component.model';
 @Component({
   selector: 'ds-health-status',
   templateUrl: './health-status.component.html',
-  styleUrls: ['./health-status.component.scss']
+  styleUrls: ['./health-status.component.scss'],
 })
 export class HealthStatusComponent {
   /**
diff --git a/src/app/health-page/health.service.ts b/src/app/health-page/health.service.ts
index 7c238769a1..bbe8e3f562 100644
--- a/src/app/health-page/health.service.ts
+++ b/src/app/health-page/health.service.ts
@@ -1,32 +1,36 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { DspaceRestService } from '../core/dspace-rest/dspace-rest.service';
 import { RawRestResponse } from '../core/dspace-rest/raw-rest-response.model';
 import { HALEndpointService } from '../core/shared/hal-endpoint.service';
 
 @Injectable({
-    providedIn: 'root'
+  providedIn: 'root',
 })
 export class HealthService {
-    constructor(protected halService: HALEndpointService,
+  constructor(protected halService: HALEndpointService,
         protected restService: DspaceRestService) {
-        }
-    /**
+  }
+  /**
      * @returns health data
      */
-    getHealth(): Observable<RawRestResponse> {
-       return this.halService.getEndpoint('/actuator').pipe(
-           map((restURL: string) => restURL + '/health'),
-           switchMap((endpoint: string) => this.restService.get(endpoint)));
-    }
+  getHealth(): Observable<RawRestResponse> {
+    return this.halService.getEndpoint('/actuator').pipe(
+      map((restURL: string) => restURL + '/health'),
+      switchMap((endpoint: string) => this.restService.get(endpoint)));
+  }
 
-    /**
+  /**
      * @returns information of server
      */
-    getInfo(): Observable<RawRestResponse> {
-        return this.halService.getEndpoint('/actuator').pipe(
-            map((restURL: string) => restURL + '/info'),
-            switchMap((endpoint: string) => this.restService.get(endpoint)));
-    }
+  getInfo(): Observable<RawRestResponse> {
+    return this.halService.getEndpoint('/actuator').pipe(
+      map((restURL: string) => restURL + '/info'),
+      switchMap((endpoint: string) => this.restService.get(endpoint)));
+  }
 }
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..8d3f99b60d 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>
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-news/home-news.component.ts b/src/app/home-page/home-news/home-news.component.ts
index 62c8e94671..3d3b5fb503 100644
--- a/src/app/home-page/home-news/home-news.component.ts
+++ b/src/app/home-page/home-news/home-news.component.ts
@@ -1,9 +1,9 @@
-import { Component, } from '@angular/core';
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-home-news',
   styleUrls: ['./home-news.component.scss'],
-  templateUrl: './home-news.component.html'
+  templateUrl: './home-news.component.html',
 })
 
 /**
diff --git a/src/app/home-page/home-news/themed-home-news.component.ts b/src/app/home-page/home-news/themed-home-news.component.ts
index da7233f4a4..551553e0e6 100644
--- a/src/app/home-page/home-news/themed-home-news.component.ts
+++ b/src/app/home-page/home-news/themed-home-news.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { HomeNewsComponent } from './home-news.component';
 
diff --git a/src/app/home-page/home-page-routing.module.ts b/src/app/home-page/home-page-routing.module.ts
index 196a290552..4d284e651f 100644
--- a/src/app/home-page/home-page-routing.module.ts
+++ b/src/app/home-page/home-page-routing.module.ts
@@ -1,10 +1,10 @@
 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';
+import { HomePageResolver } from './home-page.resolver';
+import { ThemedHomePageComponent } from './themed-home-page.component';
 
 @NgModule({
   imports: [
@@ -30,14 +30,14 @@ import { MenuItemType } from '../shared/menu/menu-item-type.model';
           },
         },
         resolve: {
-          site: HomePageResolver
-        }
-      }
-    ])
+          site: HomePageResolver,
+        },
+      },
+    ]),
   ],
   providers: [
-    HomePageResolver
-  ]
+    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 1000dbe9a4..c1d4b8a98c 100644
--- a/src/app/home-page/home-page.component.html
+++ b/src/app/home-page/home-page.component.html
@@ -1,9 +1,19 @@
 <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-search-form [inPlaceSearch]="false" [searchPlaceholder]="'home.search-form.placeholder' | translate"></ds-search-form>
-  <ds-top-level-community-list></ds-top-level-community-list>
-  <ds-recent-item-list *ngIf="recentSubmissionspageSize>0"></ds-recent-item-list>
+<div [ngClass]="appConfig.homePage.showDiscoverFilters ? 'container-fluid' : 'container'">
+  <div class="row m-5">
+    <div class="col-sm-3" *ngIf="appConfig.homePage.showDiscoverFilters">
+      <ds-configuration-search-page [sideBarWidth]="12" [showViewModes]="false" [searchEnabled]="false"
+        [inPlaceSearch]="false" [showScopeSelector]="false"></ds-configuration-search-page>
+    </div>
+    <div [ngClass]="appConfig.homePage.showDiscoverFilters ? 'col-sm-9' : 'col-sm-12'">
+      <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>
+    </div>
+    </div>
 </div>
+<ds-suggestions-popup></ds-suggestions-popup>
diff --git a/src/app/home-page/home-page.component.ts b/src/app/home-page/home-page.component.ts
index c151cbbb16..f607b1a2a9 100644
--- a/src/app/home-page/home-page.component.ts
+++ b/src/app/home-page/home-page.component.ts
@@ -1,22 +1,73 @@
-import { Component, OnInit } from '@angular/core';
-import { map } from 'rxjs/operators';
+import { isPlatformServer } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Observable } from 'rxjs';
-import { Site } from '../core/shared/site.model';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
+
 import { environment } from '../../environments/environment';
+import { NotifyInfoService } from '../core/coar-notify/notify-info/notify-info.service';
+import {
+  LinkDefinition,
+  LinkHeadService,
+} from '../core/services/link-head.service';
+import { ServerResponseService } from '../core/services/server-response.service';
+import { Site } from '../core/shared/site.model';
+import { isNotEmpty } from '../shared/empty.util';
+
 @Component({
   selector: 'ds-home-page',
   styleUrls: ['./home-page.component.scss'],
-  templateUrl: './home-page.component.html'
+  templateUrl: './home-page.component.html',
 })
-export class HomePageComponent implements OnInit {
+export class HomePageComponent implements OnInit, OnDestroy {
 
   site$: Observable<Site>;
   recentSubmissionspageSize: number;
+  /**
+   * An array of LinkDefinition objects representing inbox links for the home page.
+   */
+  inboxLinks: LinkDefinition[] = [];
+
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private route: ActivatedRoute,
+    private responseService: ServerResponseService,
+    private notifyInfoService: NotifyInfoService,
+    protected linkHeadService: LinkHeadService,
+    @Inject(PLATFORM_ID) private platformId: string,
   ) {
     this.recentSubmissionspageSize = environment.homePage.recentSubmissions.pageSize;
+    // Get COAR REST API URLs from REST configuration
+    // only if COAR configuration is enabled
+    this.notifyInfoService.isCoarConfigEnabled().pipe(
+      switchMap((coarLdnEnabled: boolean) => {
+        if (coarLdnEnabled) {
+          return this.notifyInfoService.getCoarLdnLocalInboxUrls();
+        } else {
+          return of([]);
+        }
+      }),
+    ).subscribe((coarRestApiUrls: string[]) => {
+      if (coarRestApiUrls.length > 0) {
+        this.initPageLinks(coarRestApiUrls);
+      }
+    });
   }
 
   ngOnInit(): void {
@@ -24,4 +75,38 @@ export class HomePageComponent implements OnInit {
       map((data) => data.site as Site),
     );
   }
+
+  /**
+   * Initializes page links for COAR REST API URLs.
+   * @param coarRestApiUrls An array of COAR REST API URLs.
+   */
+  private initPageLinks(coarRestApiUrls: string[]): void {
+    const rel = this.notifyInfoService.getInboxRelationLink();
+    let links = '';
+    coarRestApiUrls.forEach((coarRestApiUrl: string) => {
+      // Add link to head
+      const tag: LinkDefinition = {
+        href: coarRestApiUrl,
+        rel: rel,
+      };
+      this.inboxLinks.push(tag);
+      this.linkHeadService.addTag(tag);
+
+      links = links + (isNotEmpty(links) ? ', ' : '') + `<${coarRestApiUrl}> ; rel="${rel}"`;
+    });
+
+    if (isPlatformServer(this.platformId)) {
+      // Add link to response header
+      this.responseService.setHeader('Link', links);
+    }
+  }
+
+  /**
+   * It removes the inbox links from the head of the html.
+   */
+  ngOnDestroy(): void {
+    this.inboxLinks.forEach((link: LinkDefinition) => {
+      this.linkHeadService.removeTag(`href='${link.href}'`);
+    });
+  }
 }
diff --git a/src/app/home-page/home-page.module.ts b/src/app/home-page/home-page.module.ts
index 3418437d3c..5d86c7d433 100644
--- a/src/app/home-page/home-page.module.ts
+++ b/src/app/home-page/home-page.module.ts
@@ -1,35 +1,41 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
-import { HomeNewsComponent } from './home-news/home-news.component';
-import { HomePageRoutingModule } from './home-page-routing.module';
 
-import { HomePageComponent } from './home-page.component';
-import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
-import { ThemedHomePageComponent } from './themed-home-page.component';
-import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { HomeNewsComponent } from './home-news/home-news.component';
+import { ThemedHomeNewsComponent } from './home-news/themed-home-news.component';
+import { HomePageComponent } from './home-page.component';
+import { HomePageRoutingModule } from './home-page-routing.module';
+import { RecentItemListComponent } from './recent-item-list/recent-item-list.component';
+import { ThemedHomePageComponent } from './themed-home-page.component';
+import { ThemedTopLevelCommunityListComponent } from './top-level-community-list/themed-top-level-community-list.component';
+import { TopLevelCommunityListComponent } from './top-level-community-list/top-level-community-list.component';
 
 const DECLARATIONS = [
   HomePageComponent,
   ThemedHomePageComponent,
   TopLevelCommunityListComponent,
+  ThemedTopLevelCommunityListComponent,
   ThemedHomeNewsComponent,
   HomeNewsComponent,
-  RecentItemListComponent
+  RecentItemListComponent,
 ];
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule.withEntryComponents(),
+    SearchModule,
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents(),
     HomePageRoutingModule,
-    StatisticsModule.forRoot()
+    StatisticsModule.forRoot(),
+    NotificationsModule,
   ],
   declarations: [
     ...DECLARATIONS,
diff --git a/src/app/home-page/home-page.resolver.ts b/src/app/home-page/home-page.resolver.ts
index 6b63a4e782..94607e4387 100644
--- a/src/app/home-page/home-page.resolver.ts
+++ b/src/app/home-page/home-page.resolver.ts
@@ -1,10 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { SiteDataService } from '../core/data/site-data.service';
-import { Site } from '../core/shared/site.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 
+import { SiteDataService } from '../core/data/site-data.service';
+import { Site } from '../core/shared/site.model';
+
 /**
  * The class that resolve the Site object for a route
  */
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 919b8646bb..82262be1b3 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,13 +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">Load
-                        more...</button>
+                <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4"> {{'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.spec.ts b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
index edcb4f84f8..c18202588e 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.spec.ts
@@ -1,19 +1,26 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { PLATFORM_ID } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { of as observableOf } from 'rxjs';
 import { SearchService } from 'src/app/core/shared/search/search.service';
 import { createSuccessfulRemoteDataObject } from 'src/app/shared/remote-data.utils';
 import { SearchServiceStub } from 'src/app/shared/testing/search-service.stub';
 import { createPaginatedList } from 'src/app/shared/testing/utils.test';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { RecentItemListComponent } from './recent-item-list.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
-import { PLATFORM_ID } from '@angular/core';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { RecentItemListComponent } from './recent-item-list.component';
 
 describe('RecentItemListComponent', () => {
   let component: RecentItemListComponent;
@@ -23,7 +30,7 @@ describe('RecentItemListComponent', () => {
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(emptyList),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearDiscoveryRequests: () => {}
+    clearDiscoveryRequests: () => {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   });
   paginationService = new PaginationServiceStub();
@@ -31,12 +38,12 @@ describe('RecentItemListComponent', () => {
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
     sort: new SortOptions('dc.date.accessioned', SortDirection.DESC),
   }));
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   beforeEach(async () => {
     await TestBed.configureTestingModule({
@@ -49,7 +56,7 @@ describe('RecentItemListComponent', () => {
         { provide: PLATFORM_ID, useValue: 'browser' },
       ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
   beforeEach(() => {
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 f0e5803b71..f958e45add 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
@@ -1,21 +1,42 @@
-import { ChangeDetectionStrategy, Component, ElementRef, Inject, OnInit, PLATFORM_ID } from '@angular/core';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { Item } from '../../core/shared/item.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { environment } from '../../../environments/environment';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { toDSpaceObjectListRD } from '../../core/shared/operators';
-import { Observable } from 'rxjs';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { APP_CONFIG, AppConfig } from '../../../config/app-config.interface';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  ElementRef,
+  Inject,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { Item } from '../../core/shared/item.model';
+import { toDSpaceObjectListRD } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../shared/animations/fade';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 import { setPlaceHolderAttributes } from '../../shared/utils/object-list-utils';
 
 @Component({
@@ -25,8 +46,8 @@ import { setPlaceHolderAttributes } from '../../shared/utils/object-list-utils';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class RecentItemListComponent implements OnInit {
   itemRD$: Observable<RemoteData<PaginatedList<Item>>>;
@@ -47,14 +68,14 @@ export class RecentItemListComponent implements OnInit {
     public searchConfigurationService: SearchConfigurationService,
     protected elementRef: ElementRef,
     @Inject(APP_CONFIG) private appConfig: AppConfig,
-    @Inject(PLATFORM_ID) private platformId: Object,
+    @Inject(PLATFORM_ID) private platformId: any,
   ) {
 
     this.paginationConfig = Object.assign(new PaginationComponentOptions(), {
       id: 'hp',
       pageSize: environment.homePage.recentSubmissions.pageSize,
       currentPage: 1,
-      maxSize: 1
+      maxSize: 1,
     });
     this.sortConfig = new SortOptions(environment.homePage.recentSubmissions.sortField, SortDirection.DESC);
   }
@@ -67,6 +88,7 @@ export class RecentItemListComponent implements OnInit {
     this.itemRD$ = this.searchService.search(
       new PaginatedSearchOptions({
         pagination: this.paginationConfig,
+        dsoTypes: [DSpaceObjectType.ITEM],
         sort: this.sortConfig,
       }),
       undefined,
@@ -74,7 +96,7 @@ export class RecentItemListComponent implements OnInit {
       undefined,
       ...linksToFollow,
     ).pipe(
-      toDSpaceObjectListRD()
+      toDSpaceObjectListRD(),
     ) as Observable<RemoteData<PaginatedList<Item>>>;
   }
 
@@ -86,7 +108,7 @@ export class RecentItemListComponent implements OnInit {
     this.paginationService.updateRouteWithUrl(this.searchConfigurationService.paginationID, ['search'], {
       sortField: environment.homePage.recentSubmissions.sortField,
       sortDirection: 'DESC' as SortDirection,
-      page: 1
+      page: 1,
     });
   }
 
diff --git a/src/app/home-page/themed-home-page.component.ts b/src/app/home-page/themed-home-page.component.ts
index e50f955cb1..c9869a960b 100644
--- a/src/app/home-page/themed-home-page.component.ts
+++ b/src/app/home-page/themed-home-page.component.ts
@@ -1,6 +1,7 @@
+import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { HomePageComponent } from './home-page.component';
-import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-themed-home-page',
@@ -8,8 +9,6 @@ import { Component } from '@angular/core';
   templateUrl: '../shared/theme-support/themed.component.html',
 })
 export class ThemedHomePageComponent extends ThemedComponent<HomePageComponent> {
-  protected inAndOutputNames: (keyof HomePageComponent & keyof this)[];
-
 
   protected getComponentName(): string {
     return 'HomePageComponent';
diff --git a/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts
new file mode 100644
index 0000000000..3175f4c902
--- /dev/null
+++ b/src/app/home-page/top-level-community-list/themed-top-level-community-list.component.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { TopLevelCommunityListComponent } from './top-level-community-list.component';
+
+@Component({
+  selector: 'ds-themed-top-level-community-list',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedTopLevelCommunityListComponent extends ThemedComponent<TopLevelCommunityListComponent> {
+  protected inAndOutputNames: (keyof TopLevelCommunityListComponent & keyof this)[];
+
+  protected getComponentName(): string {
+    return 'TopLevelCommunityListComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/home-page/top-level-community-list/top-level-community-list.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./top-level-community-list.component`);
+  }
+
+}
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 788db6ea4f..b8dd7f8f76 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
@@ -1,6 +1,8 @@
 <ng-container *ngVar="(communitiesRD$ | async) as communitiesRD">
   <div *ngIf="communitiesRD?.hasSucceeded ">
-  <h2>{{'home.top-level-communities.head' | translate}}</h2>
+    <h2>
+      {{'home.top-level-communities.head' | translate}}
+    </h2>
   <p class="lead">{{'home.top-level-communities.help' | translate}}</p>
   <ds-viewable-collection
     [config]="config"
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
index 5dbf1ff8a2..457100d98e 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -1,41 +1,41 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { TopLevelCommunityListComponent } from './top-level-community-list.component';
-import { Community } from '../../core/shared/community.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { SharedModule } from '../../shared/shared.module';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
-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 { PaginationService } from '../../core/pagination/pagination.service';
-import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
-import { ThemeService } from '../../shared/theme-support/theme.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
 import { APP_CONFIG } from 'src/config/app-config.interface';
 import { environment } from 'src/environments/environment.test';
 
-describe('TopLevelCommunityList Component', () => {
+import { CommunityDataService } from '../../core/data/community-data.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { Community } from '../../core/shared/community.model';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../shared/host-window.service';
+import { getMockThemeService } from '../../shared/mocks/theme-service.mock';
+import { SelectableListService } from '../../shared/object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ThemeService } from '../../shared/theme-support/theme.service';
+import { TopLevelCommunityListComponent } from './top-level-community-list.component';
+
+describe('TopLevelCommunityListComponent', () => {
   let comp: TopLevelCommunityListComponent;
   let fixture: ComponentFixture<TopLevelCommunityListComponent>;
   let communityDataServiceStub: any;
@@ -46,58 +46,58 @@ describe('TopLevelCommunityList Component', () => {
     id: '123456789-1',
     metadata: {
       'dc.title': [
-        { language: 'en_US', value: 'TopCommunity 1' }
-      ]
-    }
+        { language: 'en_US', value: 'TopCommunity 1' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-2',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 2' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-3',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 3' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '12345678942',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 4' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-5',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 5' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-6',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 6' },
+      ],
+    },
+  }),
+  Object.assign(new Community(), {
+    id: '123456789-7',
+    metadata: {
+      'dc.title': [
+        { language: 'en_US', value: 'TopCommunity 7' },
+      ],
+    },
   }),
-    Object.assign(new Community(), {
-      id: '123456789-2',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 2' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-3',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 3' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '12345678942',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 4' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-5',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 5' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-6',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 6' }
-        ]
-      }
-    }),
-    Object.assign(new Community(), {
-      id: '123456789-7',
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'TopCommunity 7' }
-        ]
-      }
-    })
   ];
 
   communityDataServiceStub = {
@@ -116,7 +116,7 @@ describe('TopLevelCommunityList Component', () => {
       }
       return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), topCommList.slice(startPageIndex, endPageIndex)));
 
-    }
+    },
   };
 
   paginationService = new PaginationServiceStub();
@@ -124,7 +124,7 @@ describe('TopLevelCommunityList Component', () => {
   themeService = getMockThemeService();
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -137,9 +137,9 @@ describe('TopLevelCommunityList Component', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   beforeEach(waitForAsync(() => {
@@ -149,7 +149,7 @@ describe('TopLevelCommunityList Component', () => {
         SharedModule,
         RouterTestingModule.withRoutes([]),
         NgbModule,
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [TopLevelCommunityListComponent],
       providers: [
@@ -164,7 +164,7 @@ describe('TopLevelCommunityList Component', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -176,17 +176,17 @@ describe('TopLevelCommunityList Component', () => {
   });
 
 
-  it('should display a list of top-communities', () => {
-    waitForAsync(() => {
-      const subComList = fixture.debugElement.queryAll(By.css('li'));
+  it('should display a list of top-communities', async () => {
+    await fixture.whenStable();
+    fixture.detectChanges();
+    const subComList = fixture.debugElement.queryAll(By.css('li'));
 
-      expect(subComList.length).toEqual(5);
-      expect(subComList[0].nativeElement.textContent).toContain('TopCommunity 1');
-      expect(subComList[1].nativeElement.textContent).toContain('TopCommunity 2');
-      expect(subComList[2].nativeElement.textContent).toContain('TopCommunity 3');
-      expect(subComList[3].nativeElement.textContent).toContain('TopCommunity 4');
-      expect(subComList[4].nativeElement.textContent).toContain('TopCommunity 5');
-    });
+    expect(subComList.length).toEqual(5);
+    expect(subComList[0].nativeElement.textContent).toContain('TopCommunity 1');
+    expect(subComList[1].nativeElement.textContent).toContain('TopCommunity 2');
+    expect(subComList[2].nativeElement.textContent).toContain('TopCommunity 3');
+    expect(subComList[3].nativeElement.textContent).toContain('TopCommunity 4');
+    expect(subComList[4].nativeElement.textContent).toContain('TopCommunity 5');
   });
 
 });
diff --git a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
index 7d58f57196..6c46ccc7a4 100644
--- a/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
+++ b/src/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -1,18 +1,33 @@
-import { ChangeDetectionStrategy, Component, OnInit, OnDestroy, Inject } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import { switchMap } from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
 import { Community } from '../../core/shared/community.model';
 import { fadeInOut } from '../../shared/animations/fade';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { hasValue } from '../../shared/empty.util';
-import { switchMap } from 'rxjs/operators';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 
 /**
  * this component renders the Top-Level Community list
@@ -22,7 +37,7 @@ import { AppConfig, APP_CONFIG } from 'src/config/app-config.interface';
   styleUrls: ['./top-level-community-list.component.scss'],
   templateUrl: './top-level-community-list.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 
 export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
@@ -54,7 +69,7 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
   constructor(
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private cds: CommunityDataService,
-    private paginationService: PaginationService
+    private paginationService: PaginationService,
   ) {
     this.config = new PaginationComponentOptions();
     this.config.id = this.pageId;
@@ -80,9 +95,9 @@ export class TopLevelCommunityListComponent implements OnInit, OnDestroy {
         return this.cds.findTop({
           currentPage: currentPagination.currentPage,
           elementsPerPage: currentPagination.pageSize,
-          sort: {field: currentSort.field, direction: currentSort.direction}
+          sort: { field: currentSort.field, direction: currentSort.direction },
         });
-      })
+      }),
     ).subscribe((results) => {
       this.communitiesRD$.next(results);
     });
diff --git a/src/app/import-external-page/import-external-page.component.html b/src/app/import-external-page/import-external-page.component.html
index 5edccd55cb..5b0c7e3ed6 100644
--- a/src/app/import-external-page/import-external-page.component.html
+++ b/src/app/import-external-page/import-external-page.component.html
@@ -1 +1 @@
-<ds-submission-import-external></ds-submission-import-external>
+<ds-themed-submission-import-external></ds-themed-submission-import-external>
diff --git a/src/app/import-external-page/import-external-page.component.spec.ts b/src/app/import-external-page/import-external-page.component.spec.ts
index 00bdd4be28..2c080cdc4e 100644
--- a/src/app/import-external-page/import-external-page.component.spec.ts
+++ b/src/app/import-external-page/import-external-page.component.spec.ts
@@ -1,8 +1,13 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ImportExternalPageComponent } from './import-external-page.component';
-import { ThemeService } from '../shared/theme-support/theme.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
 import { getMockThemeService } from '../shared/mocks/theme-service.mock';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { ImportExternalPageComponent } from './import-external-page.component';
 
 describe('ImportExternalPageComponent', () => {
   let component: ImportExternalPageComponent;
@@ -14,9 +19,9 @@ describe('ImportExternalPageComponent', () => {
       providers:[
         { provide: ThemeService, useValue: getMockThemeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/app/import-external-page/import-external-page.component.ts b/src/app/import-external-page/import-external-page.component.ts
index 00709dad16..0eb815387f 100644
--- a/src/app/import-external-page/import-external-page.component.ts
+++ b/src/app/import-external-page/import-external-page.component.ts
@@ -6,7 +6,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-import-external-page',
   templateUrl: './import-external-page.component.html',
-  styleUrls: ['./import-external-page.component.scss']
+  styleUrls: ['./import-external-page.component.scss'],
 })
 export class ImportExternalPageComponent {
 
diff --git a/src/app/import-external-page/import-external-page.module.ts b/src/app/import-external-page/import-external-page.module.ts
index 1a0fd9e360..2fb6d5e158 100644
--- a/src/app/import-external-page/import-external-page.module.ts
+++ b/src/app/import-external-page/import-external-page.module.ts
@@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '../shared/shared.module';
 import { CoreModule } from '../core/core.module';
-import { ImportExternalRoutingModule } from './import-external-routing.module';
-import { SubmissionModule } from '../submission/submission.module';
-import { ImportExternalPageComponent } from './import-external-page.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { SharedModule } from '../shared/shared.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { ImportExternalPageComponent } from './import-external-page.component';
+import { ImportExternalRoutingModule } from './import-external-routing.module';
 
 @NgModule({
   imports: [
@@ -17,11 +17,11 @@ import { ResearchEntitiesModule } from '../entity-groups/research-entities/resea
     ImportExternalRoutingModule,
     SubmissionModule,
     JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents()
+    ResearchEntitiesModule.withEntryComponents(),
   ],
   declarations: [
-    ImportExternalPageComponent
-  ]
+    ImportExternalPageComponent,
+  ],
 })
 
 /**
diff --git a/src/app/import-external-page/import-external-routing.module.ts b/src/app/import-external-page/import-external-routing.module.ts
index e5c6da5b21..3736e943af 100644
--- a/src/app/import-external-page/import-external-routing.module.ts
+++ b/src/app/import-external-page/import-external-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { ThemedSubmissionImportExternalComponent } from '../submission/import-external/themed-submission-import-external.component';
 
@@ -12,12 +13,12 @@ import { ThemedSubmissionImportExternalComponent } from '../submission/import-ex
         component: ThemedSubmissionImportExternalComponent,
         pathMatch: 'full',
         data: {
-          title: 'submission.import-external.page.title'
-        }
-      }
-    ])
+          title: 'submission.import-external.page.title',
+        },
+      },
+    ]),
   ],
-  providers: [ ]
+  providers: [ ],
 })
 export class ImportExternalRoutingModule {
 
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 1ee8712444..d5e6de85d4 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
@@ -1,37 +1,95 @@
-<h2>{{ 'info.end-user-agreement.head' | translate }}</h2>
-<p>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Nunc sed velit dignissim sodales ut eu. In ante metus dictum at tempor. Diam phasellus vestibulum lorem sed risus. Sed cras ornare arcu dui vivamus. Sit amet consectetur adipiscing elit pellentesque. Id velit ut tortor pretium viverra suspendisse potenti. Sed euismod nisi porta lorem mollis aliquam ut. Justo laoreet sit amet cursus sit amet dictum sit. Ullamcorper morbi tincidunt ornare massa eget egestas.
-</p>
-<p>
-  In iaculis nunc sed augue lacus. Curabitur vitae nunc sed velit dignissim sodales ut eu sem. Tellus id interdum velit laoreet id donec ultrices tincidunt arcu. Quis vel eros donec ac odio tempor. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Varius quam quisque id diam vel quam. Nisl tincidunt eget nullam non nisi est sit. Nunc aliquet bibendum enim facilisis. Aenean sed adipiscing diam donec adipiscing. Convallis tellus id interdum velit laoreet. Massa placerat duis ultricies lacus sed turpis tincidunt. Sed cras ornare arcu dui vivamus arcu. Egestas integer eget aliquet nibh praesent tristique. Sit amet purus gravida quis blandit turpis cursus in hac. Porta non pulvinar neque laoreet suspendisse. Quis risus sed vulputate odio ut. Dignissim enim sit amet venenatis urna cursus.
-</p>
-<p>
-  Interdum velit laoreet id donec ultrices tincidunt arcu non sodales. Massa sapien faucibus et molestie. Dictumst vestibulum rhoncus est pellentesque elit ullamcorper. Metus dictum at tempor commodo ullamcorper. Tincidunt lobortis feugiat vivamus at augue eget. Non diam phasellus vestibulum lorem sed risus ultricies. Neque aliquam vestibulum morbi blandit cursus risus at ultrices mi. Euismod lacinia at quis risus sed. Lorem mollis aliquam ut porttitor leo a diam. Ipsum dolor sit amet consectetur. Ante in nibh mauris cursus mattis molestie a iaculis at. Commodo ullamcorper a lacus vestibulum. Pellentesque elit eget gravida cum sociis. Sit amet commodo nulla facilisi nullam vehicula. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus aenean.
-</p>
-<p>
-  Ac turpis egestas maecenas pharetra convallis. Lacus sed viverra tellus in. Nullam eget felis eget nunc lobortis mattis aliquam faucibus purus. Id aliquet risus feugiat in ante metus dictum at. Quis enim lobortis scelerisque fermentum dui faucibus. Eu volutpat odio facilisis mauris sit amet massa vitae tortor. Tellus elementum sagittis vitae et leo. Cras sed felis eget velit aliquet sagittis. Proin fermentum leo vel orci porta non pulvinar neque laoreet. Dui sapien eget mi proin sed libero enim. Ultrices mi tempus imperdiet nulla malesuada. Mattis molestie a iaculis at. Turpis massa sed elementum tempus egestas.
-</p>
-<p>
-  Dui faucibus in ornare quam viverra orci sagittis eu volutpat. Cras adipiscing enim eu turpis. Ac felis donec et odio pellentesque. Iaculis nunc sed augue lacus viverra vitae congue eu consequat. Posuere lorem ipsum dolor sit amet consectetur adipiscing elit duis. Elit eget gravida cum sociis natoque penatibus. Id faucibus nisl tincidunt eget nullam non. Sagittis aliquam malesuada bibendum arcu vitae. Fermentum leo vel orci porta. Aliquam ultrices sagittis orci a scelerisque purus semper. Diam maecenas sed enim ut sem viverra aliquet eget sit. Et ultrices neque ornare aenean euismod. Eu mi bibendum neque egestas congue quisque egestas diam. Eget lorem dolor sed viverra. Ut lectus arcu bibendum at. Rutrum tellus pellentesque eu tincidunt tortor. Vitae congue eu consequat ac. Elit ullamcorper dignissim cras tincidunt. Sit amet volutpat consequat mauris nunc congue nisi.
-</p>
-<p>
-  Cursus in hac habitasse platea dictumst quisque sagittis purus. Placerat duis ultricies lacus sed turpis tincidunt. In egestas erat imperdiet sed euismod nisi porta lorem mollis. Non nisi est sit amet facilisis magna. In massa tempor nec feugiat nisl pretium fusce. Pulvinar neque laoreet suspendisse interdum consectetur. Ullamcorper morbi tincidunt ornare massa eget egestas purus viverra accumsan. Fringilla urna porttitor rhoncus dolor purus non enim. Mauris nunc congue nisi vitae suscipit. Commodo elit at imperdiet dui accumsan sit amet nulla. Tempor id eu nisl nunc mi ipsum faucibus. Porta non pulvinar neque laoreet suspendisse. Nec nam aliquam sem et tortor consequat.
-</p>
-<p>
-  Eget nunc lobortis mattis aliquam faucibus purus. Odio tempor orci dapibus ultrices. Sed nisi lacus sed viverra tellus. Elit ullamcorper dignissim cras tincidunt. Porttitor rhoncus dolor purus non enim praesent elementum facilisis. Viverra orci sagittis eu volutpat odio. Pharetra massa massa ultricies mi quis. Lectus vestibulum mattis ullamcorper velit sed ullamcorper. Pulvinar neque laoreet suspendisse interdum consectetur. Vitae auctor eu augue ut. Arcu dictum varius duis at consectetur lorem donec. Massa sed elementum tempus egestas sed sed. Risus viverra adipiscing at in tellus integer. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Pharetra massa massa ultricies mi. Elementum eu facilisis sed odio morbi quis commodo odio. Tincidunt lobortis feugiat vivamus at. Felis donec et odio pellentesque diam volutpat commodo sed. Risus feugiat in ante metus dictum at tempor commodo ullamcorper. Fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate.
-</p>
-<p>
-  Lectus proin nibh nisl condimentum id venenatis a condimentum. Id consectetur purus ut faucibus pulvinar elementum integer enim. Non pulvinar neque laoreet suspendisse interdum consectetur. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Suscipit tellus mauris a diam maecenas sed enim ut sem. Dolor purus non enim praesent elementum facilisis. Non enim praesent elementum facilisis leo vel. Ultricies leo integer malesuada nunc vel risus commodo viverra maecenas. Nulla porttitor massa id neque aliquam vestibulum. Erat velit scelerisque in dictum non consectetur. Amet cursus sit amet dictum. Nec tincidunt praesent semper feugiat nibh. Rutrum quisque non tellus orci ac auctor. Sagittis aliquam malesuada bibendum arcu vitae elementum. Massa tincidunt dui ut ornare lectus sit amet est. Aliquet porttitor lacus luctus accumsan tortor posuere ac. Quis hendrerit dolor magna eget est lorem ipsum dolor sit. Lectus mauris ultrices eros in.
-</p>
-<p>
-  Massa massa ultricies mi quis hendrerit dolor magna. Est ullamcorper eget nulla facilisi etiam dignissim diam. Vulputate sapien nec sagittis aliquam malesuada. Nisi porta lorem mollis aliquam ut porttitor leo a diam. Tempus quam pellentesque nec nam. Faucibus vitae aliquet nec ullamcorper sit amet risus nullam eget. Gravida arcu ac tortor dignissim convallis aenean et tortor. A scelerisque purus semper eget duis at tellus at. Viverra ipsum nunc aliquet bibendum enim. Semper feugiat nibh sed pulvinar proin gravida hendrerit. Et ultrices neque ornare aenean euismod. Consequat semper viverra nam libero justo laoreet. Nunc mattis enim ut tellus elementum sagittis. Consectetur lorem donec massa sapien faucibus et. Vel risus commodo viverra maecenas accumsan lacus vel facilisis. Diam sollicitudin tempor id eu nisl nunc. Dolor magna eget est lorem ipsum dolor. Adipiscing elit pellentesque habitant morbi tristique.
-</p>
-<p>
-  Nec sagittis aliquam malesuada bibendum arcu vitae elementum curabitur. Egestas fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate sapien. Porttitor leo a diam sollicitudin tempor. Pellentesque dignissim enim sit amet venenatis urna cursus eget nunc. Posuere sollicitudin aliquam ultrices sagittis orci a scelerisque. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus. Leo urna molestie at elementum. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Libero id faucibus nisl tincidunt eget nullam. Tellus elementum sagittis vitae et leo duis ut diam. Sodales ut etiam sit amet nisl purus in mollis. Ipsum faucibus vitae aliquet nec ullamcorper sit amet risus. Lacus laoreet non curabitur gravida arcu ac tortor dignissim convallis. Aliquam malesuada bibendum arcu vitae elementum. Leo vel orci porta non pulvinar neque laoreet. Ipsum suspendisse ultrices gravida dictum fusce.
-</p>
-<p>
-  Egestas erat imperdiet sed euismod nisi porta lorem. Venenatis a condimentum vitae sapien pellentesque habitant. Sit amet luctus venenatis lectus magna fringilla urna porttitor. Orci sagittis eu volutpat odio facilisis mauris sit amet massa. Ut enim blandit volutpat maecenas volutpat blandit aliquam. Libero volutpat sed cras ornare. Molestie ac feugiat sed lectus vestibulum mattis ullamcorper velit sed. Diam quis enim lobortis scelerisque fermentum dui. Pellentesque habitant morbi tristique senectus et netus. Auctor urna nunc id cursus metus aliquam eleifend. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi tristique. Sed risus ultricies tristique nulla aliquet enim tortor. Tincidunt arcu non sodales neque sodales ut. Sed lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt.
-</p>
-<p>
-  Pulvinar etiam non quam lacus suspendisse faucibus. Eu mi bibendum neque egestas congue. Egestas purus viverra accumsan in nisl nisi scelerisque eu. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Eu non diam phasellus vestibulum. Semper feugiat nibh sed pulvinar. Ante in nibh mauris cursus mattis molestie a. Maecenas accumsan lacus vel facilisis volutpat. Non quam lacus suspendisse faucibus. Quis commodo odio aenean sed adipiscing. Vel elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi. Sed cras ornare arcu dui vivamus arcu felis. Tortor vitae purus faucibus ornare suspendisse sed. Morbi tincidunt ornare massa eget egestas purus viverra. Nibh cras pulvinar mattis nunc. Luctus venenatis lectus magna fringilla urna porttitor. Enim blandit volutpat maecenas volutpat blandit aliquam etiam erat. Malesuada pellentesque elit eget gravida cum sociis natoque penatibus et. Felis eget nunc lobortis mattis aliquam faucibus purus in. Vivamus arcu felis bibendum ut.
-</p>
+<h1>{{ 'info.end-user-agreement.head' | translate }}</h1>
+<p><em>Last updated May 4, 2023</em></p>
+
+<h2>Agreement to terms</h2>
+<p>These Terms of Use constitute a legally binding agreement made between you, whether personally or on behalf of an entity ("you") and {{ 'repository.title' | translate }} ("Company", "we", "us", or "our"), concerning your access to and use of this website as well as any other media form, media channel, mobile website or mobile application related, linked, or otherwise connected thereto (collectively, the "Site"). You agree that by accessing the Site, you have read, understood, and agreed to be bound by all of these Terms of Use and any future amendments thereof.</p>
+<p>Supplemental terms and conditions or documents that may be posted on the Site from time to time are hereby expressly incorporated herein by reference. We reserve the right, in our sole discretion, to make changes or modifications to these Terms of Use at any time and for any reason. We will alert you about any changes by updating the "Last updated" date of these Terms of Use, and you waive any right to receive specific notice of each such change. Please ensure that you check the applicable Terms every time you use our Site so that you understand which Terms apply. You will be subject to, and will be deemed to have been made aware of and to have accepted, the changes in any revised Terms of Use by your continued use of the Site after the date such revised Terms of Use are posted.</p>
+<p>The information provided on the Site is not intended for distribution to or use by any person or entity in any jurisdiction or country where such distribution or use would be contrary to law or regulation or which would subject us to any registration requirement within such jurisdiction or country. Accordingly, those persons who choose to access the Site from other locations do so on their own initiative and are solely responsible for compliance with local laws, if and to the extent local laws are applicable.</p>
+
+<h2>Intellectual property rights</h2>
+<p>Unless otherwise indicated, the Site is our proprietary property and all source code, databases, functionality, software, website designs, audio, video, text, photographs, and graphics on the Site (collectively, the "Content") and the trademarks, service marks, and logos contained therein (the "Marks") are owned or controlled by us or licensed to us, and are protected by copyright and trademark laws and various other intellectual property rights and unfair competition laws of {{ 'info.end-user-agreement.hosting-country' | translate }}, international copyright laws, and international conventions. The Content and the Marks are provided on the Site "AS IS" for your information and personal use only. Except as expressly provided in these Terms of Use, no part of the Site and no Content<sup><a [routerLink]="'.'" fragment="comment-a" id="ref-a">[a]</a></sup> or Marks may be copied, reproduced, aggregated, republished, uploaded, posted, publicly displayed, encoded, translated, transmitted, distributed, sold, licensed, or otherwise exploited for any commercial purpose whatsoever, without our express prior written permission.</p>
+<p>Provided that you are eligible to use the Site, you are granted a limited license to access and use the Site and to download or print a copy of any portion of the Content to which you have properly gained access solely for your personal, non-commercial use. We reserve all rights not expressly granted to you in and to the Site, the Content and the Marks.</p>
+
+<h2>User representations</h2>
+<p>By using the Site, you represent and warrant that: (1) all registration information you submit will be true, accurate, current, and complete; (2) you will maintain the accuracy of such information and promptly update such registration information as necessary; (3) you have the legal capacity and you agree to comply with these Terms of Use; (4) you will not use the Site for any illegal or unauthorized purpose; and (5) your use of the Site will not violate any applicable law or regulation.</p>
+<p>If you provide any information that is untrue, inaccurate, not current, or incomplete, we have the right to suspend or terminate your account and refuse any and all current or future use of the Site (or any portion thereof).</p>
+
+<h2>User registration</h2>
+<p>You may be required to register with the Site. You agree to keep your password confidential and will be responsible for all use of your account and password. We reserve the right to remove, reclaim, or change a username you select if we determine, in our sole discretion, that such username is inappropriate, obscene, or otherwise objectionable.</p>
+
+<h2>Prohibited activities</h2>
+<p>You may not access or use the Site for any purpose other than that for which we make the Site available. The Site may not be used in connection with any commercial endeavors except those that are specifically endorsed or approved by us.</p>
+<p>As a user of the Site, you agree not to:</p>
+<ul>
+  <li>Systematically retrieve data or other content from the Site to create or compile, directly or indirectly, a collection, compilation, database, or directory without written permission from us.</li>
+  <li>Trick, defraud, or mislead us and other users, especially in any attempt to learn sensitive account information such as user passwords.</li>
+  <li>Circumvent, disable, or otherwise interfere with security-related features of the Site, including features that prevent or restrict the use or copying of any Content or enforce limitations on the use of the Site and/or the Content contained therein.</li>
+  <li>Disparage, tarnish, or otherwise harm, in our opinion, us and/or the Site.</li>
+  <li>Use any information obtained from the Site in order to harass, abuse, or harm another person.</li>
+  <li>Make improper use of our support services or submit false reports of abuse or misconduct.</li>
+  <li>Use the Site in a manner inconsistent with any applicable laws or regulations.</li>
+  <li>Engage in unauthorized framing of or linking to the Site.</li>
+  <li>Upload or transmit (or attempt to upload or to transmit) viruses, Trojan horses, or other material, including excessive use of capital letters and spamming (continuous posting of repetitive text), that interferes with any party's uninterrupted use and enjoyment of the Site or modifies, impairs, disrupts, alters, or interferes with the use, features, functions, operation, or maintenance of the Site.</li>
+  <li>Delete the copyright or other proprietary rights notice from any Content.</li>
+  <li>Attempt to impersonate another user or person or use the username and password of another user.</li>
+  <li>Upload or transmit (or attempt to upload or to transmit) any material that acts as a passive or active information collection or transmission mechanism, including without limitation, clear graphics interchange formats ("gifs"), 1x1 pixels, web bugs, cookies, or other similar devices (sometimes referred to as "spyware" or "passive collection mechanisms" or "pcms").</li>
+  <li>Interfere with, disrupt, or create an undue burden on the Site or the networks or services connected to the Site.</li>
+  <li>Harass, annoy, intimidate, or threaten any of our employees or agents engaged in providing any portion of the Site to you.</li>
+  <li>Attempt to bypass any measures of the Site designed to prevent or restrict access to the Site, or any portion of the Site.</li>
+  <li>Make any unauthorized use of the Site, including collecting usernames and/or email addresses of users by electronic or other means for the purpose of sending unsolicited email or other forms of electronic communication, or creating user accounts by automated means or under false pretenses.</li>
+  <li>Use the Site as part of any effort to compete with us or otherwise use the Site and/or the Content for any revenue-generating endeavor or commercial enterprise.</li>
+</ul>
+
+<h2>User generated contributions</h2>
+<p>The Site may provide you with the opportunity to create, submit, post, display, transmit, perform, publish, distribute, or broadcast content and materials to us or on the Site, including but not limited to text, writings, video, audio, photographs, graphics, comments, suggestions, or personal information or other material (collectively, "Contributions"). Contributions may be viewable by other users of the Site and through third-party websites. As such, any Contributions you transmit may be treated as non-confidential and non-proprietary. When you create or make available any Contributions, you thereby represent and warrant that:</p>
+<ul>
+  <li>The creation, distribution, transmission, public display, or performance, and the accessing, downloading, or copying of your Contributions do not and will not infringe the proprietary rights, including but not limited to the copyright, patent, trademark, trade secret, or moral rights of any third party.</li>
+  <li>You are the creator and owner of or have the necessary licenses, rights, consents, releases, and permissions to use and to authorize us, the Site, and other users of the Site to use your Contributions in any manner contemplated by the Site and these Terms of Use.</li>
+  <li>You have the written consent, release, and/or permission of each and every identifiable individual person in your Contributions to use the name or likeness of each and every such identifiable individual person to enable inclusion and use of your Contributions in any manner contemplated by the Site and these Terms of Use.</li>
+  <li>Your Contributions are not false, inaccurate, or misleading.</li>
+  <li>Your Contributions are not unsolicited or unauthorized advertising, promotional materials, pyramid schemes, chain letters, spam, mass mailings, or other forms of solicitation.</li>
+  <li>Your Contributions are not obscene, lewd, lascivious, filthy, violent, harassing, libelous, slanderous, or otherwise objectionable (as determined by us).</li>
+  <li>Your Contributions do not ridicule, mock, disparage, intimidate, or abuse anyone.</li>
+  <li>Your Contributions are not used to harass or threaten (in the legal sense of those terms) any other person, do not create and are not used to promote violence against a specific person or class of people.</li>
+  <li>Your Contributions do not violate any applicable law, regulation, or rule.</li>
+  <li>Your Contributions do not violate the privacy or publicity rights of any third party.</li>
+  <li>Your Contributions do not violate any applicable law concerning child pornography, or otherwise intended to protect the health or well-being of minors.</li>
+  <li>Your Contributions do not include any offensive comments that are connected to race, national origin, gender, sexual preference, colour, religion, creed or physical handicap.</li>
+  <li>Your Contributions do not otherwise violate, or link to material that violates, any provision of these Terms of Use, or any applicable law or regulation.</li>
+</ul>
+<p>Any use of the Site in violation of the foregoing violates these Terms of Use and may result in, among other things, termination or suspension of your rights to use the Site.</p>
+
+<h2>Site management</h2>
+<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>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>
+<p>These Terms of Use shall remain in full force and effect while you use the Site. WITHOUT LIMITING ANY OTHER PROVISION OF THESE TERMS OF USE, WE RESERVE THE RIGHT TO, IN OUR SOLE DISCRETION AND WITHOUT NOTICE OR LIABILITY, DENY ACCESS TO AND USE OF THE SITE (INCLUDING BLOCKING CERTAIN IP ADDRESSES), TO ANY PERSON FOR ANY REASON OR FOR NO REASON, INCLUDING WITHOUT LIMITATION FOR BREACH OF ANY REPRESENTATION, WARRANTY, OR COVENANT CONTAINED IN THESE TERMS OF USE OR OF ANY APPLICABLE LAW OR REGULATION. WE MAY TERMINATE YOUR USE OR PARTICIPATION IN THE SITE OR DELETE YOUR ACCOUNT AND ANY CONTENT OR INFORMATION THAT YOU POSTED AT ANY TIME, WITHOUT WARNING, IN OUR SOLE DISCRETION.</p>
+<p>If we terminate or suspend your account for any reason, you are prohibited from registering and creating a new account under your name, a fake or borrowed name, or the name of any third party, even if you may be acting on behalf of the third party. In addition to terminating or suspending your account, we reserve the right to take appropriate legal action, including without limitation pursuing civil, criminal, and injunctive redress.</p>
+
+<h2>Modifications and interruptions</h2>
+<p>We reserve the right to change, modify, or remove the contents of the Site at any time or for any reason at our sole discretion without notice. However, we have no obligation to update any information on our Site. We also reserve the right to modify or discontinue all or part of the Site without notice at any time. We will not be liable to you or any third party for any modification, change, suspension, or discontinuance of the Site.</p>
+<p>We cannot guarantee the Site will be available at all times. We may experience hardware, software, or other problems or need to perform maintenance related to the Site, resulting in interruptions, delays, or errors. We reserve the right to change, revise, update, suspend, discontinue, or otherwise modify the Site at any time or for any reason without notice to you. You agree that we have no liability whatsoever for any loss, damage, or inconvenience caused by your inability to access or use the Site during any downtime or discontinuance of the Site. Nothing in these Terms of Use will be construed to obligate us to maintain and support the Site or to supply any corrections, updates, or releases in connection therewith.</p>
+
+<h2>Corrections</h2>
+<p>There may be information on the Site that contains typographical errors, inaccuracies, or omissions. We reserve the right to correct any errors, inaccuracies, or omissions and to change or update the information on the Site at any time, without prior notice.</p>
+
+<h2>Disclaimer</h2>
+<p>THE SITE IS PROVIDED ON AN AS-IS AND AS-AVAILABLE BASIS. YOU AGREE THAT YOUR USE OF THE SITE AND OUR SERVICES WILL BE AT YOUR SOLE RISK. TO THE FULLEST EXTENT PERMITTED BY LAW, WE DISCLAIM ALL WARRANTIES, EXPRESS OR IMPLIED, IN CONNECTION WITH THE SITE AND YOUR USE THEREOF, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. WE MAKE NO WARRANTIES OR REPRESENTATIONS ABOUT THE ACCURACY OR COMPLETENESS OF THE SITE'S CONTENT OR THE CONTENT OF ANY WEBSITES LINKED TO THE SITE AND WE WILL ASSUME NO LIABILITY OR RESPONSIBILITY FOR ANY (1) ERRORS, MISTAKES, OR INACCURACIES OF CONTENT AND MATERIALS, (2) PERSONAL INJURY OR PROPERTY DAMAGE, OF ANY NATURE WHATSOEVER, RESULTING FROM YOUR ACCESS TO AND USE OF THE SITE, (3) ANY UNAUTHORIZED ACCESS TO OR USE OF OUR SECURE SERVERS AND/OR ANY AND ALL PERSONAL INFORMATION AND/OR FINANCIAL INFORMATION STORED THEREIN, (4) ANY INTERRUPTION OR CESSATION OF TRANSMISSION TO OR FROM THE SITE, (5) ANY BUGS, VIRUSES, TROJAN HORSES, OR THE LIKE WHICH MAY BE TRANSMITTED TO OR THROUGH THE SITE BY ANY THIRD PARTY, AND/OR (6) ANY ERRORS OR OMISSIONS IN ANY CONTENT AND MATERIALS OR FOR ANY LOSS OR DAMAGE OF ANY KIND INCURRED AS A RESULT OF THE USE OF ANY CONTENT POSTED, TRANSMITTED, OR OTHERWISE MADE AVAILABLE VIA THE SITE. WE DO NOT WARRANT, ENDORSE, GUARANTEE, OR ASSUME RESPONSIBILITY FOR ANY PRODUCT OR SERVICE ADVERTISED OR OFFERED BY A THIRD PARTY THROUGH THE SITE, ANY HYPERLINKED WEBSITE, OR ANY WEBSITE OR MOBILE APPLICATION FEATURED IN ANY BANNER OR OTHER ADVERTISING, AND WE WILL NOT BE A PARTY TO OR IN ANY WAY BE RESPONSIBLE FOR MONITORING ANY TRANSACTION BETWEEN YOU AND ANY THIRD-PARTY PROVIDERS OF PRODUCTS OR SERVICES. AS WITH THE PURCHASE OF A PRODUCT OR SERVICE THROUGH ANY MEDIUM OR IN ANY ENVIRONMENT, YOU SHOULD USE YOUR BEST JUDGMENT AND EXERCISE CAUTION WHERE APPROPRIATE.</p>
+
+<h2>Limitations of liability</h2>
+<p>IN NO EVENT WILL WE OR OUR DIRECTORS, EMPLOYEES, OR AGENTS BE LIABLE TO YOU OR ANY THIRD PARTY FOR ANY DIRECT, INDIRECT, CONSEQUENTIAL, EXEMPLARY, INCIDENTAL, SPECIAL, OR PUNITIVE DAMAGES, INCLUDING LOST PROFIT, LOST REVENUE, LOSS OF DATA, OR OTHER DAMAGES ARISING FROM YOUR USE OF THE SITE, EVEN IF WE HAVE BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.</p>
+
+<h2>Indemnification</h2>
+<p>You agree to defend, indemnify, and hold us harmless, including our subsidiaries, affiliates, and all of our respective officers, agents, partners, and employees, from and against any loss, damage, liability, claim, or demand, including reasonable attorneys' fees and expenses, made by any third party due to or arising out of: (1) your Contributions; (2) use of the Site; (3) breach of these Terms of Use; (4) any breach of your representations and warranties set forth in these Terms of Use; (5) your violation of the rights of a third party, including but not limited to intellectual property rights; or (6) any overt harmful act toward any other user of the Site with whom you connected via the Site. Notwithstanding the foregoing, we reserve the right, at your expense, to assume the exclusive defense and control of any matter for which you are required to indemnify us, and you agree to cooperate, at your expense, with our defense of such claims. We will use reasonable efforts to notify you of any such claim, action, or proceeding which is subject to this indemnification upon becoming aware of it.</p>
+
+<h2>User Data</h2>
+<p>We will maintain certain data that you transmit to the Site for the purpose of managing the performance of the Site, as well as data relating to your use of the Site. Although we perform regular routine backups of data, you are solely responsible for all data that you transmit or that relates to any activity you have undertaken using the Site. You agree that we shall have no liability to you for any loss or corruption of any such data, and you hereby waive any right of action against us arising from any such loss or corruption of such data.</p>
+
+<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
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
index 64a15bfc4e..a9d71dabb4 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { EndUserAgreementContentComponent } from './end-user-agreement-content.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { EndUserAgreementContentComponent } from './end-user-agreement-content.component';
 
 describe('EndUserAgreementContentComponent', () => {
   let component: EndUserAgreementContentComponent;
@@ -11,7 +16,7 @@ describe('EndUserAgreementContentComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [EndUserAgreementContentComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
index faa7d5a78f..faa131d722 100644
--- a/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement-content/end-user-agreement-content.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-end-user-agreement-content',
   templateUrl: './end-user-agreement-content.component.html',
-  styleUrls: ['./end-user-agreement-content.component.scss']
+  styleUrls: ['./end-user-agreement-content.component.scss'],
 })
 /**
  * Component displaying the contents of the End User Agreement
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..95161dffcb 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
@@ -1,16 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { EndUserAgreementComponent } from './end-user-agreement.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
 import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateModule } from '@ngx-translate/core';
-import { AuthService } from '../../core/auth/auth.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
-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 { EndUserAgreementComponent } from './end-user-agreement.component';
 
 describe('EndUserAgreementComponent', () => {
   let component: EndUserAgreementComponent;
@@ -30,18 +38,18 @@ describe('EndUserAgreementComponent', () => {
 
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
       hasCurrentUserOrCookieAcceptedAgreement: observableOf(false),
-      setUserAcceptedAgreement: observableOf(true)
+      setUserAcceptedAgreement: observableOf(true),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']);
     authService = jasmine.createSpyObj('authService', {
-      isAuthenticated: observableOf(true)
+      isAuthenticated: observableOf(true),
     });
     store = jasmine.createSpyObj('store', ['dispatch']);
     router = jasmine.createSpyObj('router', ['navigate', 'navigateByUrl']);
     route = Object.assign(new ActivatedRouteStub(), {
       queryParams: observableOf({
-        redirect: redirectUrl
-      })
+        redirect: redirectUrl,
+      }),
     }) as any;
   }
 
@@ -56,9 +64,9 @@ describe('EndUserAgreementComponent', () => {
         { provide: AuthService, useValue: authService },
         { provide: Store, useValue: store },
         { provide: Router, useValue: router },
-        { provide: ActivatedRoute, useValue: route }
+        { provide: ActivatedRoute, useValue: route },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/end-user-agreement/end-user-agreement.component.ts b/src/app/info/end-user-agreement/end-user-agreement.component.ts
index bcb5e0ce9d..d06a5d019c 100644
--- a/src/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -1,20 +1,31 @@
-import { Component, OnInit } from '@angular/core';
-import { AuthService } from '../../core/auth/auth.service';
-import { map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { AppState } from '../../app.reducer';
-import { LogOutAction } from '../../core/auth/auth.actions';
-import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AppState } from '../../app.reducer';
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
+import { EndUserAgreementService } from '../../core/end-user-agreement/end-user-agreement.service';
 import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-end-user-agreement',
   templateUrl: './end-user-agreement.component.html',
-  styleUrls: ['./end-user-agreement.component.scss']
+  styleUrls: ['./end-user-agreement.component.scss'],
 })
 /**
  * Component displaying the End User Agreement and an option to accept it
@@ -66,7 +77,7 @@ export class EndUserAgreementComponent implements OnInit {
           return observableOf(undefined);
         }
       }),
-      take(1)
+      take(1),
     ).subscribe((redirectUrl) => {
       if (isNotEmpty(redirectUrl)) {
         this.router.navigateByUrl(decodeURIComponent(redirectUrl));
diff --git a/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts b/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
index 74eb545b8a..6a17aa415e 100644
--- a/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
+++ b/src/app/info/end-user-agreement/themed-end-user-agreement.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { EndUserAgreementComponent } from './end-user-agreement.component';
 
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..a5de058854 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,43 @@
 <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">
+        <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">
-          <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>
+      <ng-container *ngIf="feedbackForm.controls.email.invalid && (feedbackForm.controls.email.dirty || feedbackForm.controls.email.touched)"
+        class="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>
-        <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
-          class="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>
+      <ng-container *ngIf="feedbackForm.controls.message.invalid && (feedbackForm.controls.message.dirty || feedbackForm.controls.message.touched)"
+        class="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 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 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>
-      </fieldset>
+      </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 d6bedc46cf..48f32d7277 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
@@ -1,23 +1,31 @@
-import { EPersonMock } from '../../../shared/testing/eperson.mock';
-import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FeedbackFormComponent } from './feedback-form.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { UntypedFormBuilder } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../../shared/testing/route-service.stub';
-import { FormBuilder } from '@angular/forms';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { AuthService } from '../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
-import { of } from 'rxjs';
-import { Feedback } from '../../../core/feedback/models/feedback.model';
 import { Router } from '@angular/router';
-import { RouterMock } from '../../../shared/mocks/router.mock';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
+import { Feedback } from '../../../core/feedback/models/feedback.model';
+import { RouteService } from '../../../core/services/route.service';
 import { NativeWindowService } from '../../../core/services/window.service';
 import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import { RouterMock } from '../../../shared/mocks/router.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import { EPersonMock } from '../../../shared/testing/eperson.mock';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { FeedbackFormComponent } from './feedback-form.component';
 
 
 describe('FeedbackFormComponent', () => {
@@ -26,12 +34,12 @@ describe('FeedbackFormComponent', () => {
   let de: DebugElement;
   const notificationService = new NotificationsServiceStub();
   const feedbackDataServiceStub = jasmine.createSpyObj('feedbackDataService', {
-    create: of(new Feedback())
+    create: of(new Feedback()),
   });
   const authService: AuthServiceStub = Object.assign(new AuthServiceStub(), {
     getAuthenticatedUserFromStore: () => {
       return of(EPersonMock);
-    }
+    },
   });
   const routerStub = new RouterMock();
 
@@ -41,14 +49,14 @@ describe('FeedbackFormComponent', () => {
       declarations: [FeedbackFormComponent],
       providers: [
         { provide: RouteService, useValue: routeServiceStub },
-        { provide: FormBuilder, useValue: new FormBuilder() },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
         { provide: NotificationsService, useValue: notificationService },
         { provide: FeedbackDataService, useValue: feedbackDataServiceStub },
         { provide: AuthService, useValue: authService },
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: Router, useValue: routerStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/feedback/feedback-form/feedback-form.component.ts b/src/app/info/feedback/feedback-form/feedback-form.component.ts
index 35cdd69cfc..c1631d1d42 100644
--- a/src/app/info/feedback/feedback-form/feedback-form.component.ts
+++ b/src/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -1,24 +1,35 @@
-import { RemoteData } from '../../../core/data/remote-data';
-import { NoContent } from '../../../core/shared/NoContent.model';
-import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
-import { Component, Inject, OnInit } from '@angular/core';
-import { RouteService } from '../../../core/services/route.service';
-import { FormBuilder, Validators } from '@angular/forms';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { AuthService } from '../../../core/auth/auth.service';
-import { EPerson } from '../../../core/eperson/models/eperson.model';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  Validators,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { getHomePageRoute } from '../../../app-routing-paths';
+import { TranslateService } from '@ngx-translate/core';
 import { take } from 'rxjs/operators';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
+
+import { getHomePageRoute } from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { FeedbackDataService } from '../../../core/feedback/feedback-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../core/services/window.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-feedback-form',
   templateUrl: './feedback-form.component.html',
-  styleUrls: ['./feedback-form.component.scss']
+  styleUrls: ['./feedback-form.component.scss'],
 })
 /**
  * Component displaying the contents of the Feedback Statement
@@ -37,7 +48,7 @@ export class FeedbackFormComponent implements OnInit {
   constructor(
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     public routeService: RouteService,
-    private fb: FormBuilder,
+    private fb: UntypedFormBuilder,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     private feedbackDataService: FeedbackDataService,
@@ -51,7 +62,7 @@ export class FeedbackFormComponent implements OnInit {
   ngOnInit() {
 
     this.authService.getAuthenticatedUserFromStore().pipe(take(1)).subscribe((user: EPerson) => {
-      if (!!user) {
+      if (user) {
         this.feedbackForm.patchValue({ email: user.email });
       }
     });
diff --git a/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts b/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
new file mode 100644
index 0000000000..9ecbc9d1ac
--- /dev/null
+++ b/src/app/info/feedback/feedback-form/themed-feedback-form.component.ts
@@ -0,0 +1,28 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { FeedbackFormComponent } from './feedback-form.component';
+
+/**
+ * Themed wrapper for {@link FeedbackFormComponent}
+ */
+@Component({
+  selector: 'ds-themed-feedback-form',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedFeedbackFormComponent extends ThemedComponent<FeedbackFormComponent> {
+
+  protected getComponentName(): string {
+    return 'FeedbackFormComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/info/feedback/feedback-form/feedback-form.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./feedback-form.component');
+  }
+
+}
diff --git a/src/app/info/feedback/feedback.component.html b/src/app/info/feedback/feedback.component.html
index 210bdcf1d7..ad42f0f90e 100644
--- a/src/app/info/feedback/feedback.component.html
+++ b/src/app/info/feedback/feedback.component.html
@@ -1,3 +1,3 @@
 <div class="container">
-  <ds-feedback-form></ds-feedback-form>
-</div>
\ No newline at end of file
+  <ds-themed-feedback-form></ds-themed-feedback-form>
+</div>
diff --git a/src/app/info/feedback/feedback.component.spec.ts b/src/app/info/feedback/feedback.component.spec.ts
index 810c3b703f..a16ed1f6bb 100644
--- a/src/app/info/feedback/feedback.component.spec.ts
+++ b/src/app/info/feedback/feedback.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FeedbackComponent } from './feedback.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { FeedbackComponent } from './feedback.component';
 
 describe('FeedbackComponent', () => {
   let component: FeedbackComponent;
@@ -11,7 +16,7 @@ describe('FeedbackComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [FeedbackComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/feedback/feedback.component.ts b/src/app/info/feedback/feedback.component.ts
index 3c0924b4de..bb4a6884c7 100644
--- a/src/app/info/feedback/feedback.component.ts
+++ b/src/app/info/feedback/feedback.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-feedback',
   templateUrl: './feedback.component.html',
-  styleUrls: ['./feedback.component.scss']
+  styleUrls: ['./feedback.component.scss'],
 })
 /**
  * Component displaying the Feedback Statement
diff --git a/src/app/info/feedback/themed-feedback.component.ts b/src/app/info/feedback/themed-feedback.component.ts
index 68581c32fd..afb3057a6a 100644
--- a/src/app/info/feedback/themed-feedback.component.ts
+++ b/src/app/info/feedback/themed-feedback.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { FeedbackComponent } from './feedback.component';
 
diff --git a/src/app/info/info-routing-paths.ts b/src/app/info/info-routing-paths.ts
index a18de2c611..a7fba45a6c 100644
--- a/src/app/info/info-routing-paths.ts
+++ b/src/app/info/info-routing-paths.ts
@@ -5,17 +5,17 @@ export const PRIVACY_PATH = 'privacy';
 export const FEEDBACK_PATH = 'feedback';
 
 export function getEndUserAgreementPath() {
-    return getSubPath(END_USER_AGREEMENT_PATH);
+  return getSubPath(END_USER_AGREEMENT_PATH);
 }
 
 export function getPrivacyPath() {
-    return getSubPath(PRIVACY_PATH);
+  return getSubPath(PRIVACY_PATH);
 }
 
 export function getFeedbackPath() {
-    return getSubPath(FEEDBACK_PATH);
+  return getSubPath(FEEDBACK_PATH);
 }
 
 function getSubPath(path: string) {
-    return `${getInfoModulePath()}/${path}`;
+  return `${getInfoModulePath()}/${path}`;
 }
diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts
index 4c497461e7..b43682d319 100644
--- a/src/app/info/info-routing.module.ts
+++ b/src/app/info/info-routing.module.ts
@@ -1,13 +1,20 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { PRIVACY_PATH, END_USER_AGREEMENT_PATH, FEEDBACK_PATH } from './info-routing-paths';
-import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
-import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
-import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
-import { FeedbackGuard } from '../core/feedback/feedback.guard';
-import { environment } from '../../environments/environment';
 
+import { environment } from '../../environments/environment';
+import { COAR_NOTIFY_SUPPORT } from '../app-routing-paths';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { NotifyInfoComponent } from '../core/coar-notify/notify-info/notify-info.component';
+import { NotifyInfoGuard } from '../core/coar-notify/notify-info/notify-info.guard';
+import { FeedbackGuard } from '../core/feedback/feedback.guard';
+import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
+import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
+import {
+  END_USER_AGREEMENT_PATH,
+  FEEDBACK_PATH,
+  PRIVACY_PATH,
+} from './info-routing-paths';
+import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 
 const imports = [
   RouterModule.forChild([
@@ -16,38 +23,47 @@ const imports = [
       component: ThemedFeedbackComponent,
       resolve: { breadcrumb: I18nBreadcrumbResolver },
       data: { title: 'info.feedback.title', breadcrumbKey: 'info.feedback' },
-      canActivate: [FeedbackGuard]
-    }
-  ])
+      canActivate: [FeedbackGuard],
+    },
+  ]),
+  RouterModule.forChild([
+    {
+      path: COAR_NOTIFY_SUPPORT,
+      component: NotifyInfoComponent,
+      resolve: { breadcrumb: I18nBreadcrumbResolver },
+      data: { title: 'info.coar-notify-support.title', breadcrumbKey: 'info.coar-notify' },
+      canActivate: [NotifyInfoGuard],
+    },
+  ]),
 ];
 
-  if (environment.info.enableEndUserAgreement) {
-    imports.push(
-      RouterModule.forChild([
-        {
-          path: END_USER_AGREEMENT_PATH,
-          component: ThemedEndUserAgreementComponent,
-          resolve: { breadcrumb: I18nBreadcrumbResolver },
-          data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' }
-        }
-      ]));
-  }
-  if (environment.info.enablePrivacyStatement) {
-    imports.push(
-      RouterModule.forChild([
-        {
-          path: PRIVACY_PATH,
-          component: ThemedPrivacyComponent,
-          resolve: { breadcrumb: I18nBreadcrumbResolver },
-          data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' }
-        }
-      ]));
-  }
+if (environment.info.enableEndUserAgreement) {
+  imports.push(
+    RouterModule.forChild([
+      {
+        path: END_USER_AGREEMENT_PATH,
+        component: ThemedEndUserAgreementComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' },
+      },
+    ]));
+}
+if (environment.info.enablePrivacyStatement) {
+  imports.push(
+    RouterModule.forChild([
+      {
+        path: PRIVACY_PATH,
+        component: ThemedPrivacyComponent,
+        resolve: { breadcrumb: I18nBreadcrumbResolver },
+        data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' },
+      },
+    ]));
+}
 
 @NgModule({
   imports: [
-    ...imports
-  ]
+    ...imports,
+  ],
 })
 /**
  * Module for navigating to components within the info module
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
index 61eee71f3a..fe7d76f6ed 100644
--- a/src/app/info/info.module.ts
+++ b/src/app/info/info.module.ts
@@ -1,18 +1,20 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { NotifyInfoComponent } from '../core/coar-notify/notify-info/notify-info.component';
+import { FeedbackGuard } from '../core/feedback/feedback.guard';
 import { SharedModule } from '../shared/shared.module';
 import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component';
-import { InfoRoutingModule } from './info-routing.module';
 import { EndUserAgreementContentComponent } from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component';
-import { PrivacyComponent } from './privacy/privacy.component';
-import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component';
 import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component';
-import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 import { FeedbackComponent } from './feedback/feedback.component';
 import { FeedbackFormComponent } from './feedback/feedback-form/feedback-form.component';
+import { ThemedFeedbackFormComponent } from './feedback/feedback-form/themed-feedback-form.component';
 import { ThemedFeedbackComponent } from './feedback/themed-feedback.component';
-import { FeedbackGuard } from '../core/feedback/feedback.guard';
-
+import { InfoRoutingModule } from './info-routing.module';
+import { PrivacyComponent } from './privacy/privacy.component';
+import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component';
+import { ThemedPrivacyComponent } from './privacy/themed-privacy.component';
 
 const DECLARATIONS = [
   EndUserAgreementComponent,
@@ -23,7 +25,9 @@ const DECLARATIONS = [
   ThemedPrivacyComponent,
   FeedbackComponent,
   FeedbackFormComponent,
-  ThemedFeedbackComponent
+  ThemedFeedbackFormComponent,
+  ThemedFeedbackComponent,
+  NotifyInfoComponent,
 ];
 
 @NgModule({
@@ -33,12 +37,12 @@ const DECLARATIONS = [
     InfoRoutingModule,
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
-  providers: [FeedbackGuard]
+  providers: [FeedbackGuard],
 })
 export class InfoModule {
 }
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 a5bbb3fe10..003e6b0d51 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.html
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.html
@@ -1,37 +1,91 @@
-<h2>{{ 'info.privacy.head' | translate }}</h2>
-<p>
-  Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Nunc sed velit dignissim sodales ut eu. In ante metus dictum at tempor. Diam phasellus vestibulum lorem sed risus. Sed cras ornare arcu dui vivamus. Sit amet consectetur adipiscing elit pellentesque. Id velit ut tortor pretium viverra suspendisse potenti. Sed euismod nisi porta lorem mollis aliquam ut. Justo laoreet sit amet cursus sit amet dictum sit. Ullamcorper morbi tincidunt ornare massa eget egestas.
-</p>
-<p>
-  In iaculis nunc sed augue lacus. Curabitur vitae nunc sed velit dignissim sodales ut eu sem. Tellus id interdum velit laoreet id donec ultrices tincidunt arcu. Quis vel eros donec ac odio tempor. Viverra accumsan in nisl nisi scelerisque eu ultrices vitae. Varius quam quisque id diam vel quam. Nisl tincidunt eget nullam non nisi est sit. Nunc aliquet bibendum enim facilisis. Aenean sed adipiscing diam donec adipiscing. Convallis tellus id interdum velit laoreet. Massa placerat duis ultricies lacus sed turpis tincidunt. Sed cras ornare arcu dui vivamus arcu. Egestas integer eget aliquet nibh praesent tristique. Sit amet purus gravida quis blandit turpis cursus in hac. Porta non pulvinar neque laoreet suspendisse. Quis risus sed vulputate odio ut. Dignissim enim sit amet venenatis urna cursus.
-</p>
-<p>
-  Interdum velit laoreet id donec ultrices tincidunt arcu non sodales. Massa sapien faucibus et molestie. Dictumst vestibulum rhoncus est pellentesque elit ullamcorper. Metus dictum at tempor commodo ullamcorper. Tincidunt lobortis feugiat vivamus at augue eget. Non diam phasellus vestibulum lorem sed risus ultricies. Neque aliquam vestibulum morbi blandit cursus risus at ultrices mi. Euismod lacinia at quis risus sed. Lorem mollis aliquam ut porttitor leo a diam. Ipsum dolor sit amet consectetur. Ante in nibh mauris cursus mattis molestie a iaculis at. Commodo ullamcorper a lacus vestibulum. Pellentesque elit eget gravida cum sociis. Sit amet commodo nulla facilisi nullam vehicula. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus aenean.
-</p>
-<p>
-  Ac turpis egestas maecenas pharetra convallis. Lacus sed viverra tellus in. Nullam eget felis eget nunc lobortis mattis aliquam faucibus purus. Id aliquet risus feugiat in ante metus dictum at. Quis enim lobortis scelerisque fermentum dui faucibus. Eu volutpat odio facilisis mauris sit amet massa vitae tortor. Tellus elementum sagittis vitae et leo. Cras sed felis eget velit aliquet sagittis. Proin fermentum leo vel orci porta non pulvinar neque laoreet. Dui sapien eget mi proin sed libero enim. Ultrices mi tempus imperdiet nulla malesuada. Mattis molestie a iaculis at. Turpis massa sed elementum tempus egestas.
-</p>
-<p>
-  Dui faucibus in ornare quam viverra orci sagittis eu volutpat. Cras adipiscing enim eu turpis. Ac felis donec et odio pellentesque. Iaculis nunc sed augue lacus viverra vitae congue eu consequat. Posuere lorem ipsum dolor sit amet consectetur adipiscing elit duis. Elit eget gravida cum sociis natoque penatibus. Id faucibus nisl tincidunt eget nullam non. Sagittis aliquam malesuada bibendum arcu vitae. Fermentum leo vel orci porta. Aliquam ultrices sagittis orci a scelerisque purus semper. Diam maecenas sed enim ut sem viverra aliquet eget sit. Et ultrices neque ornare aenean euismod. Eu mi bibendum neque egestas congue quisque egestas diam. Eget lorem dolor sed viverra. Ut lectus arcu bibendum at. Rutrum tellus pellentesque eu tincidunt tortor. Vitae congue eu consequat ac. Elit ullamcorper dignissim cras tincidunt. Sit amet volutpat consequat mauris nunc congue nisi.
-</p>
-<p>
-  Cursus in hac habitasse platea dictumst quisque sagittis purus. Placerat duis ultricies lacus sed turpis tincidunt. In egestas erat imperdiet sed euismod nisi porta lorem mollis. Non nisi est sit amet facilisis magna. In massa tempor nec feugiat nisl pretium fusce. Pulvinar neque laoreet suspendisse interdum consectetur. Ullamcorper morbi tincidunt ornare massa eget egestas purus viverra accumsan. Fringilla urna porttitor rhoncus dolor purus non enim. Mauris nunc congue nisi vitae suscipit. Commodo elit at imperdiet dui accumsan sit amet nulla. Tempor id eu nisl nunc mi ipsum faucibus. Porta non pulvinar neque laoreet suspendisse. Nec nam aliquam sem et tortor consequat.
-</p>
-<p>
-  Eget nunc lobortis mattis aliquam faucibus purus. Odio tempor orci dapibus ultrices. Sed nisi lacus sed viverra tellus. Elit ullamcorper dignissim cras tincidunt. Porttitor rhoncus dolor purus non enim praesent elementum facilisis. Viverra orci sagittis eu volutpat odio. Pharetra massa massa ultricies mi quis. Lectus vestibulum mattis ullamcorper velit sed ullamcorper. Pulvinar neque laoreet suspendisse interdum consectetur. Vitae auctor eu augue ut. Arcu dictum varius duis at consectetur lorem donec. Massa sed elementum tempus egestas sed sed. Risus viverra adipiscing at in tellus integer. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Pharetra massa massa ultricies mi. Elementum eu facilisis sed odio morbi quis commodo odio. Tincidunt lobortis feugiat vivamus at. Felis donec et odio pellentesque diam volutpat commodo sed. Risus feugiat in ante metus dictum at tempor commodo ullamcorper. Fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate.
-</p>
-<p>
-  Lectus proin nibh nisl condimentum id venenatis a condimentum. Id consectetur purus ut faucibus pulvinar elementum integer enim. Non pulvinar neque laoreet suspendisse interdum consectetur. Est pellentesque elit ullamcorper dignissim cras tincidunt lobortis feugiat vivamus. Suscipit tellus mauris a diam maecenas sed enim ut sem. Dolor purus non enim praesent elementum facilisis. Non enim praesent elementum facilisis leo vel. Ultricies leo integer malesuada nunc vel risus commodo viverra maecenas. Nulla porttitor massa id neque aliquam vestibulum. Erat velit scelerisque in dictum non consectetur. Amet cursus sit amet dictum. Nec tincidunt praesent semper feugiat nibh. Rutrum quisque non tellus orci ac auctor. Sagittis aliquam malesuada bibendum arcu vitae elementum. Massa tincidunt dui ut ornare lectus sit amet est. Aliquet porttitor lacus luctus accumsan tortor posuere ac. Quis hendrerit dolor magna eget est lorem ipsum dolor sit. Lectus mauris ultrices eros in.
-</p>
-<p>
-  Massa massa ultricies mi quis hendrerit dolor magna. Est ullamcorper eget nulla facilisi etiam dignissim diam. Vulputate sapien nec sagittis aliquam malesuada. Nisi porta lorem mollis aliquam ut porttitor leo a diam. Tempus quam pellentesque nec nam. Faucibus vitae aliquet nec ullamcorper sit amet risus nullam eget. Gravida arcu ac tortor dignissim convallis aenean et tortor. A scelerisque purus semper eget duis at tellus at. Viverra ipsum nunc aliquet bibendum enim. Semper feugiat nibh sed pulvinar proin gravida hendrerit. Et ultrices neque ornare aenean euismod. Consequat semper viverra nam libero justo laoreet. Nunc mattis enim ut tellus elementum sagittis. Consectetur lorem donec massa sapien faucibus et. Vel risus commodo viverra maecenas accumsan lacus vel facilisis. Diam sollicitudin tempor id eu nisl nunc. Dolor magna eget est lorem ipsum dolor. Adipiscing elit pellentesque habitant morbi tristique.
-</p>
-<p>
-  Nec sagittis aliquam malesuada bibendum arcu vitae elementum curabitur. Egestas fringilla phasellus faucibus scelerisque eleifend donec pretium vulputate sapien. Porttitor leo a diam sollicitudin tempor. Pellentesque dignissim enim sit amet venenatis urna cursus eget nunc. Posuere sollicitudin aliquam ultrices sagittis orci a scelerisque. Vehicula ipsum a arcu cursus vitae congue mauris rhoncus. Leo urna molestie at elementum. Duis tristique sollicitudin nibh sit amet commodo nulla facilisi. Libero id faucibus nisl tincidunt eget nullam. Tellus elementum sagittis vitae et leo duis ut diam. Sodales ut etiam sit amet nisl purus in mollis. Ipsum faucibus vitae aliquet nec ullamcorper sit amet risus. Lacus laoreet non curabitur gravida arcu ac tortor dignissim convallis. Aliquam malesuada bibendum arcu vitae elementum. Leo vel orci porta non pulvinar neque laoreet. Ipsum suspendisse ultrices gravida dictum fusce.
-</p>
-<p>
-  Egestas erat imperdiet sed euismod nisi porta lorem. Venenatis a condimentum vitae sapien pellentesque habitant. Sit amet luctus venenatis lectus magna fringilla urna porttitor. Orci sagittis eu volutpat odio facilisis mauris sit amet massa. Ut enim blandit volutpat maecenas volutpat blandit aliquam. Libero volutpat sed cras ornare. Molestie ac feugiat sed lectus vestibulum mattis ullamcorper velit sed. Diam quis enim lobortis scelerisque fermentum dui. Pellentesque habitant morbi tristique senectus et netus. Auctor urna nunc id cursus metus aliquam eleifend. Elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi tristique. Sed risus ultricies tristique nulla aliquet enim tortor. Tincidunt arcu non sodales neque sodales ut. Sed lectus vestibulum mattis ullamcorper velit sed ullamcorper morbi tincidunt.
-</p>
-<p>
-  Pulvinar etiam non quam lacus suspendisse faucibus. Eu mi bibendum neque egestas congue. Egestas purus viverra accumsan in nisl nisi scelerisque eu. Vulputate enim nulla aliquet porttitor lacus luctus accumsan. Eu non diam phasellus vestibulum. Semper feugiat nibh sed pulvinar. Ante in nibh mauris cursus mattis molestie a. Maecenas accumsan lacus vel facilisis volutpat. Non quam lacus suspendisse faucibus. Quis commodo odio aenean sed adipiscing. Vel elit scelerisque mauris pellentesque pulvinar pellentesque habitant morbi. Sed cras ornare arcu dui vivamus arcu felis. Tortor vitae purus faucibus ornare suspendisse sed. Morbi tincidunt ornare massa eget egestas purus viverra. Nibh cras pulvinar mattis nunc. Luctus venenatis lectus magna fringilla urna porttitor. Enim blandit volutpat maecenas volutpat blandit aliquam etiam erat. Malesuada pellentesque elit eget gravida cum sociis natoque penatibus et. Felis eget nunc lobortis mattis aliquam faucibus purus in. Vivamus arcu felis bibendum ut.
-</p>
+<h1>{{ 'info.privacy.head' | translate }}</h1>
+<p><em>Last updated May 4, 2023</em></p>
+
+<h2>Introduction</h2>
+<p>{{ 'repository.title' | translate }} ("Company" or "We") respects your privacy and is committed to protecting it through our compliance with this policy.</p>
+<p>This policy describes the types of information we may collect from you or that you may provide when you visit this website (our "Website") and our practices for collecting, using, maintaining, protecting, and disclosing that information.</p>
+<p>This policy applies to information we collect:</p>
+<ul>
+  <li>On this Website.</li>
+  <li>In email, text, and other electronic messages between you and this Website.</li>
+</ul>
+<p>It does not apply to information collected by:</p>
+<ul>
+  <li>us offline or through any other means, including on any other website operated by Company or any third party; or</li>
+  <li>any third party, including through any application or content (including advertising) that may link to or be accessible from or on the Website.</li>
+</ul>
+<p>Please read this policy carefully to understand our policies and practices regarding your information and how we will treat it. If you do not agree with our policies and practices, your choice is not to use our Website. By accessing or using this Website, you agree to this privacy policy. This policy may change from time to time. Your continued use of this Website after we make changes is deemed to be acceptance of those changes, so please check the policy periodically for updates.</p>
+
+<h2>Children under the age of 13</h2>
+<p>Our Website is not intended for children under 13 years of age. No one under age 13 may provide any personal information to or on the Website. We do not knowingly collect personal information from children under 13. If you are under 13, do not use or provide any information on this Website or provide any information about yourself to us, including your name, address, telephone number, email address, or any screen name or username you may use. If we learn we have collected or received personal information from a child under 13 without verification of parental consent, we will delete that information.</p>
+
+<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, 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>
+<ul>
+  <li>directly from you when you provide it to us.</li>
+  <li>automatically as you navigate through the site. Information collected automatically may include usage details, IP addresses, and information collected through cookies, web beacons, and other tracking technologies; and/or</li>
+  <li>from third parties, for example, our business partners.</li>
+</ul>
+
+<h2>Information you provide to us</h2>
+<p>The information we collect on or through our Website may include:</p>
+<ul>
+  <li>Information that you provide by filling in forms on our Website. We may also ask you for information when you report a problem with our Website.</li>
+  <li>Records and copies of your correspondence (including email addresses), if you contact us.</li>
+  <li>Your responses to surveys that we might ask you to complete for research purpose.</li>
+</ul>
+
+<h2>Information we collect through automatic data collection technologies</h2>
+<p>As you navigate through and interact with our Website, we may use automatic data collection technologies to collect certain information about your equipment, browsing actions, and patterns, including:</p>
+<ul>
+  <li>Details of your visits to our Website, including traffic data, location data, logs, and other communication data and the resources that you access and use on the Website.</li>
+  <li>Information about your computer and internet connection, including your IP address, operating system, and browser type.</li>
+</ul>
+<p>The information we collect automatically is statistical data and does not include personal information, but we may maintain it or associate it with personal information we collect in other ways or receive from third parties. It helps us to improve our Website and to deliver a better and more personalized service, including by enabling us to:</p>
+<ul>
+  <li>Estimate our audience size and usage patterns.</li>
+  <li>Store information about your preferences, allowing us to customize our Website according to your individual interests.</li>
+  <li>Speed up your searches.</li>
+  <li>Recognize you when you return to our Website.</li>
+</ul>
+<p>The technologies we use for this automatic data collection may include:</p>
+<ul>
+  <li>Cookies (or browser cookies). A cookie is a small file placed on the hard drive of your computer. You may refuse to accept browser cookies by activating the appropriate setting on your browser. However, if you select this setting you may be unable to access certain parts of our Website. Unless you have adjusted your browser setting so that it will refuse cookies, our system will issue cookies when you direct your browser to our Website.</li>
+</ul>
+
+<h2>How we use your information</h2>
+<p>We use information that we collect about you or that you provide to us, including any personal information:</p>
+<ul>
+  <li>To present our Website and its contents to you.</li>
+  <li>To provide you with information, products, or services that you request from us.</li>
+  <li>To fulfill any other purpose for which you provide it.</li>
+  <li>To carry out our obligations and enforce our rights arising from any contracts entered into between you and us, including for billing and collection.</li>
+  <li>To notify you about changes to our Website or any products or services we offer or provide through it.</li>
+  <li>In any other way we may describe when you provide the information.</li>
+  <li>For any other purpose with your consent.</li>
+</ul>
+
+<h2>Disclosure of your information</h2>
+<p>We may disclose aggregated information about our users, and information that does not identify any individual, without restriction.</p>
+<p>We may disclose personal information that we collect or you provide as described in this privacy policy:</p>
+<ul>
+  <li>To contractors, service providers, and other third parties we use to support our business and who are bound by contractual obligations to keep personal information confidential and use it only for the purposes for which we disclose it to them.</li>
+  <li>To a buyer or other successor in the event of a merger, divestiture, restructuring, reorganization, dissolution, or other sale or transfer of some or all of Company's assets, whether as a going concern or as part of bankruptcy, liquidation, or similar proceeding, in which personal information held by Company about our Website users is among the assets transferred.</li>
+  <li>To fulfill the purpose for which you provide it.</li>
+  <li>For any other purpose disclosed by us when you provide the information.</li>
+  <li>With your consent.</li>
+</ul>
+<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>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
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts b/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
index 682e30273a..d9266f317d 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { PrivacyContentComponent } from './privacy-content.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { PrivacyContentComponent } from './privacy-content.component';
 
 describe('PrivacyContentComponent', () => {
   let component: PrivacyContentComponent;
@@ -11,7 +16,7 @@ describe('PrivacyContentComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [PrivacyContentComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/privacy/privacy-content/privacy-content.component.ts b/src/app/info/privacy/privacy-content/privacy-content.component.ts
index 6a7b394cf4..4bc5661e31 100644
--- a/src/app/info/privacy/privacy-content/privacy-content.component.ts
+++ b/src/app/info/privacy/privacy-content/privacy-content.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-privacy-content',
   templateUrl: './privacy-content.component.html',
-  styleUrls: ['./privacy-content.component.scss']
+  styleUrls: ['./privacy-content.component.scss'],
 })
 /**
  * Component displaying the contents of the Privacy Statement
diff --git a/src/app/info/privacy/privacy.component.spec.ts b/src/app/info/privacy/privacy.component.spec.ts
index 6f93adec12..888021c15e 100644
--- a/src/app/info/privacy/privacy.component.spec.ts
+++ b/src/app/info/privacy/privacy.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { PrivacyComponent } from './privacy.component';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { PrivacyComponent } from './privacy.component';
 
 describe('PrivacyComponent', () => {
   let component: PrivacyComponent;
@@ -11,7 +16,7 @@ describe('PrivacyComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [PrivacyComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/info/privacy/privacy.component.ts b/src/app/info/privacy/privacy.component.ts
index dc9d3d69dc..99464d4cc9 100644
--- a/src/app/info/privacy/privacy.component.ts
+++ b/src/app/info/privacy/privacy.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-privacy',
   templateUrl: './privacy.component.html',
-  styleUrls: ['./privacy.component.scss']
+  styleUrls: ['./privacy.component.scss'],
 })
 /**
  * Component displaying the Privacy Statement
diff --git a/src/app/info/privacy/themed-privacy.component.ts b/src/app/info/privacy/themed-privacy.component.ts
index 7f2ee80ffc..682a035abe 100644
--- a/src/app/info/privacy/themed-privacy.component.ts
+++ b/src/app/info/privacy/themed-privacy.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { PrivacyComponent } from './privacy.component';
 
diff --git a/src/app/init.service.spec.ts b/src/app/init.service.spec.ts
index 592abdfd42..9cb27e0075 100644
--- a/src/app/init.service.spec.ts
+++ b/src/app/init.service.spec.ts
@@ -1,33 +1,49 @@
-import { InitService } from './init.service';
-import { APP_CONFIG } from 'src/config/app-config.interface';
-import { APP_INITIALIZER, Injectable } from '@angular/core';
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { MetadataService } from './core/metadata/metadata.service';
-import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
 import { CommonModule } from '@angular/common';
-import { Store, StoreModule } from '@ngrx/store';
-import { authReducer } from './core/auth/auth.reducer';
-import { storeModuleConfig } from './app.reducer';
-import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
-import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { AuthService } from './core/auth/auth.service';
-import { AuthServiceMock } from './shared/mocks/auth.service.mock';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from './shared/mocks/router.mock';
-import { MockActivatedRoute } from './shared/mocks/active-router.mock';
-import { MenuService } from './shared/menu/menu.service';
-import { LocaleService } from './core/locale/locale.service';
-import { environment } from '../environments/environment';
+import {
+  APP_INITIALIZER,
+  Injectable,
+} from '@angular/core';
+import {
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+
+import { environment } from '../environments/environment';
 import { AppComponent } from './app.component';
-import { RouteService } from './core/services/route.service';
 import { getMockLocaleService } from './app.component.spec';
-import { MenuServiceStub } from './shared/testing/menu-service.stub';
+import { storeModuleConfig } from './app.reducer';
+import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
+import { authReducer } from './core/auth/auth.reducer';
+import { AuthService } from './core/auth/auth.service';
+import { LocaleService } from './core/locale/locale.service';
+import { MetadataService } from './core/metadata/metadata.service';
+import { RouteService } from './core/services/route.service';
 import { CorrelationIdService } from './correlation-id/correlation-id.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { InitService } from './init.service';
+import { MenuService } from './shared/menu/menu.service';
+import { MockActivatedRoute } from './shared/mocks/active-router.mock';
+import { AngularticsProviderMock } from './shared/mocks/angulartics-provider.service.mock';
+import { AuthServiceMock } from './shared/mocks/auth.service.mock';
+import { RouterMock } from './shared/mocks/router.mock';
+import { getMockThemeService } from './shared/mocks/theme-service.mock';
 import { TranslateLoaderMock } from './shared/mocks/translate-loader.mock';
 import { ThemeService } from './shared/theme-support/theme.service';
-import { getMockThemeService } from './shared/mocks/theme-service.mock';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 import objectContaining = jasmine.objectContaining;
 import createSpyObj = jasmine.createSpyObj;
 import SpyObj = jasmine.SpyObj;
@@ -52,8 +68,8 @@ const initialState = {
     auth: {
       loading: false,
       blocking: true,
-    }
-  }
+    },
+  },
 };
 
 
@@ -75,7 +91,7 @@ describe('InitService', () => {
 
       expect(providers).toContain(objectContaining({
         provide: InitService,
-        useClass: ConcreteInitServiceMock
+        useClass: ConcreteInitServiceMock,
       }));
 
       expect(providers).toContain(objectContaining({
@@ -92,7 +108,7 @@ describe('InitService', () => {
     it('should call resolveAppConfig() in APP_CONFIG factory', () => {
       const factory = (
         ConcreteInitServiceMock.providers()
-                               .find((p: any) => p.provide === APP_CONFIG) as any
+          .find((p: any) => p.provide === APP_CONFIG) as any
       ).useFactory;
 
       // this factory is called _before_ InitService is instantiated
@@ -104,7 +120,7 @@ describe('InitService', () => {
     it('should defer to init() in APP_INITIALIZER factory', () => {
       const factory = (
         ConcreteInitServiceMock.providers()
-                               .find((p: any) => p.provide === APP_INITIALIZER) as any
+          .find((p: any) => p.provide === APP_INITIALIZER) as any
       ).useFactory;
 
       // we don't care about the dependencies here
@@ -124,6 +140,7 @@ describe('InitService', () => {
     let transferStateSpy;
     let metadataServiceSpy;
     let breadcrumbsServiceSpy;
+    let menuServiceSpy;
 
     const BLOCKING = {
       t: {  core: { auth: { blocking: true } } },
@@ -142,7 +159,7 @@ describe('InitService', () => {
         'transfer',
       ]);
       transferStateSpy = jasmine.createSpyObj('dspaceTransferStateSpy', [
-        'get', 'hasKey'
+        'get', 'hasKey',
       ]);
       breadcrumbsServiceSpy = jasmine.createSpyObj('breadcrumbsServiceSpy', [
         'listenForRouteChanges',
@@ -150,6 +167,9 @@ describe('InitService', () => {
       metadataServiceSpy = jasmine.createSpyObj('metadataService', [
         'listenForRouteChange',
       ]);
+      menuServiceSpy = jasmine.createSpyObj('menuServiceSpy', [
+        'listenForRouteChanges',
+      ]);
 
 
       TestBed.resetTestingModule();
@@ -160,8 +180,8 @@ describe('InitService', () => {
           TranslateModule.forRoot({
             loader: {
               provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
+              useClass: TranslateLoaderMock,
+            },
           }),
         ],
         providers: [
@@ -175,12 +195,12 @@ describe('InitService', () => {
           { provide: AuthService, useValue: new AuthServiceMock() },
           { provide: Router, useValue: new RouterMock() },
           { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
-          { provide: MenuService, useValue: new MenuServiceStub() },
+          { provide: MenuService, useValue: menuServiceSpy },
           { provide: ThemeService, useValue: getMockThemeService() },
           provideMockStore({ initialState }),
           AppComponent,
           RouteService,
-        ]
+        ],
       });
     }));
 
@@ -190,6 +210,7 @@ describe('InitService', () => {
         service.initRouteListeners();
         expect(metadataServiceSpy.listenForRouteChange).toHaveBeenCalledTimes(1);
         expect(breadcrumbsServiceSpy.listenForRouteChanges).toHaveBeenCalledTimes(1);
+        expect(breadcrumbsServiceSpy.listenForRouteChanges).toHaveBeenCalledTimes(1);
       }));
     });
 
diff --git a/src/app/init.service.ts b/src/app/init.service.ts
index a0cbb06b66..cc2928f456 100644
--- a/src/app/init.service.ts
+++ b/src/app/init.service.ts
@@ -5,24 +5,43 @@
  *
  * http://www.dspace.org/license/
  */
-import { select, Store } from '@ngrx/store';
-import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
-import { CorrelationIdService } from './correlation-id/correlation-id.service';
-import { APP_INITIALIZER, Inject, Provider, Type } from '@angular/core';
-import { makeStateKey, TransferState } from '@angular/platform-browser';
-import { APP_CONFIG, AppConfig } from '../config/app-config.interface';
+import {
+  APP_INITIALIZER,
+  Inject,
+  Provider,
+  Type,
+} from '@angular/core';
+import {
+  makeStateKey,
+  TransferState,
+} from '@angular/platform-browser';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import isEqual from 'lodash/isEqual';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  find,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../config/app-config.interface';
 import { environment } from '../environments/environment';
 import { AppState } from './app.reducer';
-import { isEqual } from 'lodash';
-import { TranslateService } from '@ngx-translate/core';
-import { LocaleService } from './core/locale/locale.service';
-import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
-import { MetadataService } from './core/metadata/metadata.service';
 import { BreadcrumbsService } from './breadcrumbs/breadcrumbs.service';
-import { ThemeService } from './shared/theme-support/theme.service';
+import { CheckAuthenticationTokenAction } from './core/auth/auth.actions';
 import { isAuthenticationBlocking } from './core/auth/selectors';
-import { distinctUntilChanged, find } from 'rxjs/operators';
-import { Observable } from 'rxjs';
+import { LocaleService } from './core/locale/locale.service';
+import { MetadataService } from './core/metadata/metadata.service';
+import { CorrelationIdService } from './correlation-id/correlation-id.service';
+import { MenuService } from './shared/menu/menu.service';
+import { ThemeService } from './shared/theme-support/theme.service';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 
 /**
  * Performs the initialization of the app.
@@ -51,6 +70,8 @@ export abstract class InitService {
     protected metadata: MetadataService,
     protected breadcrumbsService: BreadcrumbsService,
     protected themeService: ThemeService,
+    protected menuService: MenuService,
+
   ) {
   }
 
@@ -65,7 +86,7 @@ export abstract class InitService {
   public static providers(): Provider[] {
     if (!InitService.isPrototypeOf(this)) {
       throw new Error(
-        'Initalization providers should only be generated from concrete subclasses of InitService'
+        'Initalization providers should only be generated from concrete subclasses of InitService',
       );
     }
     return [
@@ -79,7 +100,7 @@ export abstract class InitService {
           this.resolveAppConfig(transferState);
           return environment;
         },
-        deps: [ TransferState ]
+        deps: [ TransferState ],
       },
       {
         provide: APP_INITIALIZER,
@@ -100,7 +121,7 @@ export abstract class InitService {
    * @protected
    */
   protected static resolveAppConfig(
-    transferState: TransferState
+    transferState: TransferState,
   ): void {
     // overriden in subclasses if applicable
   }
@@ -155,8 +176,8 @@ export abstract class InitService {
     // Load all the languages that are defined as active from the config file
     this.translate.addLangs(
       environment.languages
-                 .filter((LangConfig) => LangConfig.active === true)
-                 .map((a) => a.code)
+        .filter((LangConfig) => LangConfig.active === true)
+        .map((a) => a.code),
     );
 
     // Load the default language from the config file
@@ -184,6 +205,7 @@ export abstract class InitService {
     this.metadata.listenForRouteChange();
     this.breadcrumbsService.listenForRouteChanges();
     this.themeService.listenForRouteChanges();
+    this.menuService.listenForRouteChanges();
   }
 
   /**
@@ -194,7 +216,7 @@ export abstract class InitService {
     return this.store.pipe(
       select(isAuthenticationBlocking),
       distinctUntilChanged(),
-      find((b: boolean) => b === false)
+      find((b: boolean) => b === false),
     );
   }
 }
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.html b/src/app/item-page/alerts/item-alerts.component.html
similarity index 60%
rename from src/app/shared/item/item-alerts/item-alerts.component.html
rename to src/app/item-page/alerts/item-alerts.component.html
index cd71d23a91..f6304340f3 100644
--- a/src/app/shared/item/item-alerts/item-alerts.component.html
+++ b/src/app/item-page/alerts/item-alerts.component.html
@@ -6,7 +6,10 @@
         <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>
+                <div class="gap-2 d-flex">
+                  <a routerLink="/home" class="btn btn-primary btn-sm">{{"404.link.home-page" | translate}}</a>
+                  <a *ngIf="showReinstateButton$() | async" class="btn btn-primary btn-sm" (click)="openReinstateModal()">{{ 'item.alerts.reinstate-request' | translate}}</a>
+                </div>
             </div>
         </ds-alert>
     </div>
diff --git a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss b/src/app/item-page/alerts/item-alerts.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.scss
rename to src/app/item-page/alerts/item-alerts.component.scss
diff --git a/src/app/item-page/alerts/item-alerts.component.spec.ts b/src/app/item-page/alerts/item-alerts.component.spec.ts
new file mode 100644
index 0000000000..13a45f0626
--- /dev/null
+++ b/src/app/item-page/alerts/item-alerts.component.spec.ts
@@ -0,0 +1,166 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { Item } from '../../core/shared/item.model';
+import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
+import { CorrectionType } from '../../core/submission/models/correctiontype.model';
+import {
+  DsoWithdrawnReinstateModalService,
+  REQUEST_REINSTATE,
+} from '../../shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ItemAlertsComponent } from './item-alerts.component';
+
+describe('ItemAlertsComponent', () => {
+  let component: ItemAlertsComponent;
+  let fixture: ComponentFixture<ItemAlertsComponent>;
+  let item: Item;
+  let authorizationService;
+  let dsoWithdrawnReinstateModalService;
+  let correctionTypeDataService;
+  let testScheduler: TestScheduler;
+
+  const itemMock = Object.assign(new Item(), {
+    uuid: 'item-uuid',
+    id: 'item-uuid',
+  });
+
+  beforeEach(waitForAsync(() => {
+    authorizationService = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
+    dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', ['openCreateWithdrawnReinstateModal']);
+    correctionTypeDataService = jasmine.createSpyObj('correctionTypeDataService',  ['findByItem']);
+    TestBed.configureTestingModule({
+      declarations: [ItemAlertsComponent],
+      imports: [TranslateModule.forRoot()],
+      providers: [
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DsoWithdrawnReinstateModalService, useValue: dsoWithdrawnReinstateModalService },
+        { provide: CorrectionTypeDataService, useValue: correctionTypeDataService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAlertsComponent);
+
+    component = fixture.componentInstance;
+    component.item = itemMock;
+    fixture.detectChanges();
+  });
+
+  describe('when the item is discoverable', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isDiscoverable: true,
+      });
+      component.item = item;
+      fixture.detectChanges();
+    });
+
+    it('should not display the private alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.private-warning'));
+      expect(privateWarning).toBeNull();
+    });
+  });
+
+  describe('when the item is not discoverable', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isDiscoverable: false,
+      });
+      component.item = item;
+      fixture.detectChanges();
+    });
+
+    it('should display the private alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.private-warning'));
+      expect(privateWarning).not.toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isWithdrawn: true,
+      });
+      component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(createSuccessfulRemoteDataObject$([]));
+      fixture.detectChanges();
+    });
+
+    it('should display the withdrawn alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.withdrawn-warning'));
+      expect(privateWarning).not.toBeNull();
+    });
+  });
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+      item = Object.assign(new Item(), {
+        isWithdrawn: false,
+      });
+      component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(createSuccessfulRemoteDataObject$([]));
+      fixture.detectChanges();
+    });
+
+    it('should not display the withdrawn alert', () => {
+      const privateWarning = fixture.debugElement.query(By.css('.withdrawn-warning'));
+      expect(privateWarning).toBeNull();
+    });
+  });
+
+  describe('when the item is reinstated', () => {
+    const correctionType = Object.assign(new CorrectionType(), {
+      topic: REQUEST_REINSTATE,
+    });
+    const correctionRD = createSuccessfulRemoteDataObject(createPaginatedList([correctionType]));
+
+    beforeEach(() => {
+      item =  itemMock;
+      component.item = item;
+      (correctionTypeDataService.findByItem).and.returnValue(of(correctionRD));
+
+      testScheduler = new TestScheduler((actual, expected) => {
+        expect(actual).toEqual(expected);
+      });
+      fixture.detectChanges();
+    });
+
+    it('should return true when user is not an admin and there is at least one correction with topic REQUEST_REINSTATE', () => {
+      testScheduler.run(({ cold, expectObservable }) => {
+        const isAdminMarble = 'a';
+        const correctionMarble = 'b';
+        const expectedMarble = 'c';
+
+        const isAdminValues = { a: false };
+        const correctionValues = { b: correctionRD };
+        const expectedValues = { c: true };
+
+        const isAdmin$ = cold(isAdminMarble, isAdminValues);
+        const correction$ = cold(correctionMarble, correctionValues);
+
+        (authorizationService.isAuthorized).and.returnValue(isAdmin$);
+        (correctionTypeDataService.findByItem).and.returnValue(correction$);
+
+        expectObservable(component.showReinstateButton$()).toBe(expectedMarble, expectedValues);
+      });
+    });
+
+  });
+});
diff --git a/src/app/item-page/alerts/item-alerts.component.ts b/src/app/item-page/alerts/item-alerts.component.ts
new file mode 100644
index 0000000000..a0ccb7406f
--- /dev/null
+++ b/src/app/item-page/alerts/item-alerts.component.ts
@@ -0,0 +1,78 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  combineLatest,
+  map,
+  Observable,
+} from 'rxjs';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from 'src/app/core/shared/operators';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
+import { AlertType } from '../../shared/alert/alert-type';
+import {
+  DsoWithdrawnReinstateModalService,
+  REQUEST_REINSTATE,
+} from '../../shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
+
+@Component({
+  selector: 'ds-item-alerts',
+  templateUrl: './item-alerts.component.html',
+  styleUrls: ['./item-alerts.component.scss'],
+})
+/**
+ * Component displaying alerts for an item
+ */
+export class ItemAlertsComponent {
+  /**
+   * The Item to display alerts for
+   */
+  @Input() item: Item;
+
+  /**
+   * The AlertType enumeration
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  constructor(
+    private authService: AuthorizationDataService,
+    private dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
+    private correctionTypeDataService: CorrectionTypeDataService,
+  ) {
+  }
+
+  /**
+   * Determines whether to show the reinstate button.
+   * The button is shown if the user is not an admin and the item has a reinstate request.
+   * @returns An Observable that emits a boolean value indicating whether to show the reinstate button.
+   */
+  showReinstateButton$(): Observable<boolean>  {
+    const correction$ = this.correctionTypeDataService.findByItem(this.item.uuid, true).pipe(
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      getPaginatedListPayload(),
+    );
+    const isAdmin$ = this.authService.isAuthorized(FeatureID.AdministratorOf);
+    return combineLatest([isAdmin$, correction$]).pipe(
+      map(([isAdmin, correction]) => {
+        return !isAdmin && correction.some((correctionType) => correctionType.topic === REQUEST_REINSTATE);
+      },
+      ));
+  }
+
+  /**
+   * Opens the reinstate modal for the item.
+   */
+  openReinstateModal() {
+    this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(this.item, 'request-reinstate', this.item.isArchived);
+  }
+}
diff --git a/src/app/item-page/alerts/themed-item-alerts.component.ts b/src/app/item-page/alerts/themed-item-alerts.component.ts
new file mode 100644
index 0000000000..c8b4c5df90
--- /dev/null
+++ b/src/app/item-page/alerts/themed-item-alerts.component.ts
@@ -0,0 +1,34 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../core/shared/item.model';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { ItemAlertsComponent } from './item-alerts.component';
+
+/**
+ * Themed wrapper for {@link ItemAlertsComponent}
+ */
+@Component({
+  selector: 'ds-themed-item-alerts',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedItemAlertsComponent extends ThemedComponent<ItemAlertsComponent> {
+  protected inAndOutputNames: (keyof ItemAlertsComponent & keyof this)[] = ['item'];
+
+  @Input() item: Item;
+
+  protected getComponentName(): string {
+    return 'ItemAlertsComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/item-page/alerts/item-alerts.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./item-alerts.component');
+  }
+}
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
similarity index 94%
rename from src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html
rename to src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 1fae737fdb..3c08c2fb65 100644
--- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -1,12 +1,12 @@
 <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>
     </div>
     <div>
         <p>{{'bitstream-request-a-copy.intro' | translate}} <a [routerLink]="getItemPath()">{{itemName}}</a></p>
-        <p *ngIf="bitstream != undefined && allfiles.value === 'false'">{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
+        <p *ngIf="bitstream !== undefined && allfiles.value === 'false'">{{'bitstream-request-a-copy.intro.bitstream.one' | translate}} {{bitstreamName}}</p>
         <p *ngIf="allfiles.value === 'true'">{{'bitstream-request-a-copy.intro.bitstream.all' | translate}}</p>
     </div>
     <form [class]="'ng-invalid'" [formGroup]="requestCopyForm" (ngSubmit)="onSubmit()">
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
similarity index 74%
rename from src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts
rename to src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
index cc44ef8587..b9eef37f04 100644
--- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.spec.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.spec.ts
@@ -1,30 +1,43 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  CommonModule,
+  Location,
+} from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Item } from '../../../core/shared/item.model';
+import { ItemRequest } from '../../../core/shared/item-request.model';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../remote-data.utils';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
-import { CommonModule } from '@angular/common';
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { BitstreamRequestACopyPageComponent } from './bitstream-request-a-copy-page.component';
-import { By } from '@angular/platform-browser';
-import { RouterStub } from '../testing/router.stub';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { NotificationsService } from '../notifications/notifications.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../mocks/dso-name.service.mock';
-import { Item } from '../../core/shared/item.model';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Location } from '@angular/common';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 
 
 describe('BitstreamRequestACopyPageComponent', () => {
@@ -48,51 +61,51 @@ describe('BitstreamRequestACopyPageComponent', () => {
     eperson = Object.assign(new EPerson(), {
       email: 'test@mail.org',
       metadata: {
-        'eperson.firstname': [{value: 'Test'}],
-        'eperson.lastname': [{value: 'User'}],
-      }
+        'eperson.firstname': [{ value: 'Test' }],
+        'eperson.lastname': [{ value: 'User' }],
+      },
     });
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(false),
-      getAuthenticatedUserFromStore: observableOf(eperson)
+      getAuthenticatedUserFromStore: observableOf(eperson),
     });
     authorizationService = jasmine.createSpyObj('authorizationSerivice', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     itemRequestDataService = jasmine.createSpyObj('itemRequestDataService', {
-      requestACopy: createSuccessfulRemoteDataObject$({})
+      requestACopy: createSuccessfulRemoteDataObject$({}),
     });
 
     location = jasmine.createSpyObj('location', {
-      back: {}
+      back: {},
     });
 
     notificationsService = new NotificationsServiceStub();
 
-    item = Object.assign(new Item(), {uuid: 'item-uuid'});
+    item = Object.assign(new Item(), { uuid: 'item-uuid' });
 
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstreamUuid',
       _links: {
-        content: {href: 'bitstream-content-link'},
-        self: {href: 'bitstream-self-link'},
-      }
+        content: { href: 'bitstream-content-link' },
+        self: { href: 'bitstream-self-link' },
+      },
     });
 
     activatedRoute = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(
-          item
-        )
+          item,
+        ),
       }),
       queryParams: observableOf({
-        bitstream : bitstream.uuid
-      })
+        bitstream : bitstream.uuid,
+      }),
     };
 
     bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-      findById: createSuccessfulRemoteDataObject$(bitstream)
+      findById: createSuccessfulRemoteDataObject$(bitstream),
     });
 
     router = new RouterStub();
@@ -103,16 +116,16 @@ describe('BitstreamRequestACopyPageComponent', () => {
       imports: [CommonModule, TranslateModule.forRoot(), FormsModule, ReactiveFormsModule],
       declarations: [BitstreamRequestACopyPageComponent],
       providers: [
-        {provide: Location, useValue: location},
-        {provide: ActivatedRoute, useValue: activatedRoute},
-        {provide: Router, useValue: router},
-        {provide: AuthorizationDataService, useValue: authorizationService},
-        {provide: AuthService, useValue: authService},
-        {provide: ItemRequestDataService, useValue: itemRequestDataService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: DSONameService, useValue: new DSONameServiceMock()},
-        {provide: BitstreamDataService, useValue: bitstreamDataService},
-      ]
+        { provide: Location, useValue: location },
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: Router, useValue: router },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: AuthService, useValue: authService },
+        { provide: ItemRequestDataService, useValue: itemRequestDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: BitstreamDataService, useValue: bitstreamDataService },
+      ],
     })
       .compileComponents();
   }
@@ -176,11 +189,11 @@ describe('BitstreamRequestACopyPageComponent', () => {
         activatedRoute = {
           data: observableOf({
             dso: createSuccessfulRemoteDataObject(
-              item
-            )
+              item,
+            ),
           }),
           queryParams: observableOf({
-          })
+          }),
         };
         initTestbed();
       }));
@@ -243,7 +256,7 @@ describe('BitstreamRequestACopyPageComponent', () => {
             allfiles: 'false',
             requestEmail: 'user@name.org',
             requestName: 'User Name',
-            requestMessage: 'I would like to request a copy'
+            requestMessage: 'I would like to request a copy',
           });
 
         expect(itemRequestDataService.requestACopy).toHaveBeenCalledWith(itemRequest);
@@ -277,7 +290,7 @@ describe('BitstreamRequestACopyPageComponent', () => {
             allfiles: 'false',
             requestEmail: 'user@name.org',
             requestName: 'User Name',
-            requestMessage: 'I would like to request a copy'
+            requestMessage: 'I would like to request a copy',
           });
 
         expect(itemRequestDataService.requestACopy).toHaveBeenCalledWith(itemRequest);
diff --git a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
similarity index 66%
rename from src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
rename to src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
index 511079a701..dec28d4fd7 100644
--- a/src/app/shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.ts
@@ -1,29 +1,61 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { hasValue, isNotEmpty } from '../empty.util';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { getBitstreamDownloadRoute, getForbiddenRoute } from '../../app-routing-paths';
-import { TranslateService } from '@ngx-translate/core';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Item } from '../../core/shared/item.model';
-import { NotificationsService } from '../notifications/notifications.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { Location } from '@angular/common';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  getBitstreamDownloadRoute,
+  getForbiddenRoute,
+} from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { ItemRequestDataService } from '../../../core/data/item-request-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Item } from '../../../core/shared/item.model';
+import { ItemRequest } from '../../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-bitstream-request-a-copy-page',
-  templateUrl: './bitstream-request-a-copy-page.component.html'
+  templateUrl: './bitstream-request-a-copy-page.component.html',
 })
 /**
  * Page component for requesting a copy for a bitstream
@@ -34,7 +66,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
 
   canDownload$: Observable<boolean>;
   private subs: Subscription[] = [];
-  requestCopyForm: FormGroup;
+  requestCopyForm: UntypedFormGroup;
 
   item: Item;
   itemName: string;
@@ -49,7 +81,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
               protected router: Router,
               private authorizationService: AuthorizationDataService,
               private auth: AuthService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private itemRequestDataService: ItemRequestDataService,
               private notificationsService: NotificationsService,
               private dsoNameService: DSONameService,
@@ -59,21 +91,21 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
 
   ngOnInit(): void {
     this.requestCopyForm = this.formBuilder.group({
-      name: new FormControl('', {
+      name: new UntypedFormControl('', {
         validators: [Validators.required],
       }),
-      email: new FormControl('', {
+      email: new UntypedFormControl('', {
         validators: [Validators.required,
-        Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')]
+          Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')],
       }),
-      allfiles: new FormControl(''),
-      message: new FormControl(''),
+      allfiles: new UntypedFormControl(''),
+      message: new UntypedFormControl(''),
     });
 
 
     this.item$ = this.route.data.pipe(
       map((data) => data.dso),
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
 
     this.subs.push(this.item$.subscribe((item) => {
@@ -84,7 +116,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
     this.bitstream$ = this.route.queryParams.pipe(
       filter((params) => hasValue(params) && hasValue(params.bitstream)),
       switchMap((params) => this.bitstreamService.findById(params.bitstream)),
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
 
     this.subs.push(this.bitstream$.subscribe((bitstream) => {
@@ -93,7 +125,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
     }));
 
     this.canDownload$ = this.bitstream$.pipe(
-      switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined))
+      switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined)),
     );
     const canRequestCopy$ = this.bitstream$.pipe(
       switchMap((bitstream) => this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(bitstream) ? bitstream.self : undefined)),
@@ -101,7 +133,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
 
     this.subs.push(observableCombineLatest([this.canDownload$, canRequestCopy$]).subscribe(([canDownload, canRequestCopy]) => {
       if (!canDownload && !canRequestCopy) {
-        this.router.navigateByUrl(getForbiddenRoute(), {skipLocationChange: true});
+        this.router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
       }
     }));
     this.initValues();
@@ -128,13 +160,13 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
    */
   private initValues() {
     this.getCurrentUser().pipe(take(1)).subscribe((user) => {
-      this.requestCopyForm.patchValue({allfiles: 'true'});
+      this.requestCopyForm.patchValue({ allfiles: 'true' });
       if (hasValue(user)) {
-        this.requestCopyForm.patchValue({name: user.name, email: user.email});
+        this.requestCopyForm.patchValue({ name: user.name, email: user.email });
       }
     });
     this.bitstream$.pipe(take(1)).subscribe((bitstream) => {
-      this.requestCopyForm.patchValue({allfiles: 'false'});
+      this.requestCopyForm.patchValue({ allfiles: 'false' });
     });
   }
 
@@ -149,7 +181,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
         } else {
           return observableOf(undefined);
         }
-      })
+      }),
     );
 
   }
@@ -171,7 +203,7 @@ export class BitstreamRequestACopyPageComponent implements OnInit, OnDestroy {
     itemRequest.requestMessage = this.message.value;
 
     this.itemRequestDataService.requestACopy(itemRequest).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('bitstream-request-a-copy.submit.success'));
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 7a193451f7..530471135c 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -1,12 +1,12 @@
 <div class="container">
   <ng-container *ngIf="bundles">
     <div class="row">
-      <div class="col-12 mb-4">
-        <h2>{{'item.bitstreams.upload.title' | translate}}</h2>
+      <div class="col-12 mb-2">
+        <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>
-            <span>{{item.name}}</span>
+            <span>{{ dsoNameService.getName(item) }}</span>
           </div>
         </ng-container>
       </div>
@@ -24,7 +24,7 @@
                                   (click)="f.open()"
                                   ngDefaultControl>
         </ds-dso-input-suggestions>
-        <button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success" (click)="createBundle()">
+        <button *ngIf="!selectedBundleId && selectedBundleName?.length > 0" class="btn btn-success mr-2" (click)="createBundle()">
           <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
         </button>
         <ds-uploader  class="w-100" *ngIf="selectedBundleId"
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
index e85dca2a98..2304546d0f 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.spec.ts
@@ -1,29 +1,40 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { UploadBitstreamComponent } from './upload-bitstream.component';
-import { AuthService } from '../../../core/auth/auth.service';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { VarDirective } from '../../../shared/utils/var.directive';
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { BundleDataService } from '../../../core/data/bundle-data.service';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { RequestService } from '../../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+
 import { environment } from '../../../../environments/environment';
+import { AuthService } from '../../../core/auth/auth.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { AuthServiceStub } from '../../../shared/testing/auth-service.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { UploadBitstreamComponent } from './upload-bitstream.component';
 
 describe('UploadBitstreamComponent', () => {
   let comp: UploadBitstreamComponent;
@@ -38,13 +49,13 @@ describe('UploadBitstreamComponent', () => {
       'dc.title': [
         {
           value: customName,
-          language: null
-        }
-      ]
+          language: null,
+        },
+      ],
     },
     _links: {
-      self: { href: 'bundle-selflink' }
-    }
+      self: { href: 'bundle-selflink' },
+    },
   });
   const customCreatedName = 'customCreatedBundleName';
   const createdBundle = Object.assign(new Bundle(), {
@@ -55,13 +66,13 @@ describe('UploadBitstreamComponent', () => {
       'dc.title': [
         {
           value: customCreatedName,
-          language: null
-        }
-      ]
+          language: null,
+        },
+      ],
     },
     _links: {
-      self: { href: 'created-bundle-selflink' }
-    }
+      self: { href: 'created-bundle-selflink' },
+    },
   });
   const itemName = 'fake-name';
   const mockItem = Object.assign(new Item(), {
@@ -71,11 +82,11 @@ describe('UploadBitstreamComponent', () => {
       'dc.title': [
         {
           language: null,
-          value: itemName
-        }
-      ]
+          value: itemName,
+        },
+      ],
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
   });
   const standardBundleSuggestions = environment.bundle.standardBundles;
   let routeStub;
@@ -88,16 +99,16 @@ describe('UploadBitstreamComponent', () => {
   });
   const bundleService = jasmine.createSpyObj('bundleService', {
     getBitstreamsEndpoint: observableOf(restEndpoint),
-    findById: createSuccessfulRemoteDataObject$(bundle)
+    findById: createSuccessfulRemoteDataObject$(bundle),
   });
   const authToken = 'fake-auth-token';
   const authServiceStub = Object.assign(new AuthServiceStub(), {
-    buildAuthHeader: () => authToken
+    buildAuthHeader: () => authToken,
   });
   const notificationsServiceStub = new NotificationsServiceStub();
   const uploaderComponent = jasmine.createSpyObj('uploaderComponent', ['ngOnInit', 'ngAfterViewInit']);
   const requestService = jasmine.createSpyObj('requestService', {
-    removeByHrefSubstring: {}
+    removeByHrefSubstring: {},
   });
 
   describe('when a file is uploaded', () => {
@@ -121,7 +132,7 @@ describe('UploadBitstreamComponent', () => {
 
     describe('and it succeeds, calling onCompleteItem', () => {
       const createdBitstream = Object.assign(new Bitstream(), {
-        id: 'fake-bitstream'
+        id: 'fake-bitstream',
       });
 
       beforeEach(() => {
@@ -137,7 +148,7 @@ describe('UploadBitstreamComponent', () => {
   describe('when a bundle url parameter is present', () => {
     beforeEach(waitForAsync(() => {
       createUploadBitstreamTestingModule({
-        bundle: bundle.id
+        bundle: bundle.id,
       });
     }));
 
@@ -208,7 +219,7 @@ describe('UploadBitstreamComponent', () => {
   describe('when item has no bundles yet', () => {
     beforeEach(waitForAsync(() => {
       createUploadBitstreamTestingModule({
-        bundle: bundle.id
+        bundle: bundle.id,
       });
       jasmine.getEnv().allowRespy(true);
       mockItemDataService.getBundles.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])));
@@ -227,7 +238,7 @@ describe('UploadBitstreamComponent', () => {
   describe('when item has a custom bundle', () => {
     beforeEach(waitForAsync(() => {
       createUploadBitstreamTestingModule({
-        bundle: bundle.id
+        bundle: bundle.id,
       });
       jasmine.getEnv().allowRespy(true);
       mockItemDataService.getBundles.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [bundle])));
@@ -251,7 +262,7 @@ describe('UploadBitstreamComponent', () => {
       expect(standardBundleSuggestions.length).toBeGreaterThan(0);
       clonedBundle.name = standardBundleSuggestions[0];
       createUploadBitstreamTestingModule({
-        bundle: clonedBundle.id
+        bundle: clonedBundle.id,
       });
       jasmine.getEnv().allowRespy(true);
       mockItemDataService.getBundles.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [clonedBundle])));
@@ -275,15 +286,15 @@ describe('UploadBitstreamComponent', () => {
   function createUploadBitstreamTestingModule(queryParams) {
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
+        dso: createSuccessfulRemoteDataObject(mockItem),
       }),
       queryParams: observableOf(queryParams),
       snapshot: {
         queryParams: queryParams,
         params: {
-          id: mockItem.id
-        }
-      }
+          id: mockItem.id,
+        },
+      },
     };
 
     TestBed.configureTestingModule({
@@ -296,10 +307,10 @@ describe('UploadBitstreamComponent', () => {
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: AuthService, useValue: authServiceStub },
         { provide: BundleDataService, useValue: bundleService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }
 
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
index 1e5295a347..aa26ca8f88 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.ts
@@ -1,28 +1,53 @@
-import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { Observable, Subscription, of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Item } from '../../../core/shared/item.model';
-import { map, take, switchMap } from 'rxjs/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UploaderOptions } from '../../../shared/uploader/uploader-options.model';
-import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { BundleDataService } from '../../../core/data/bundle-data.service';
-import { getFirstSucceededRemoteDataPayload, getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { UploaderComponent } from '../../../shared/uploader/uploader.component';
-import { RequestService } from '../../../core/data/request.service';
-import { getBitstreamModuleRoute } from '../../../app-routing-paths';
-import { getEntityEditRoute } from '../../item-page-routing-paths';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../environments/environment';
+import { getBitstreamModuleRoute } from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { UploaderComponent } from '../../../shared/upload/uploader/uploader.component';
+import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
+import { getEntityEditRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-upload-bitstream',
-  templateUrl: './upload-bitstream.component.html'
+  templateUrl: './upload-bitstream.component.html',
 })
 /**
  * Page component for uploading a bitstream to an item
@@ -73,7 +98,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
     url: 'placeholder',
     authToken: null,
     disableMultipart: false,
-    itemAlias: null
+    itemAlias: null,
   });
 
   /**
@@ -94,7 +119,9 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
               protected authService: AuthService,
               protected notificationsService: NotificationsService,
               protected translate: TranslateService,
-              protected requestService: RequestService) {
+              protected requestService: RequestService,
+              public dsoNameService: DSONameService,
+  ) {
   }
 
   /**
@@ -125,15 +152,15 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
               if (check) {
                 this.bundles.push(Object.assign(new Bundle(), {
                   _name: defaultBundle,
-                  type: 'bundle'
+                  type: 'bundle',
                 }));
               }
             }
           } else {
             this.bundles = environment.bundle.standardBundles.map((defaultBundle: string) => Object.assign(new Bundle(), {
-                _name: defaultBundle,
-                type: 'bundle'
-              })
+              _name: defaultBundle,
+              type: 'bundle',
+            }),
             );
           }
           return observableOf(remoteData.payload.page);
@@ -142,7 +169,7 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
     this.selectedBundleId = this.route.snapshot.queryParams.bundle;
     if (isNotEmpty(this.selectedBundleId)) {
       this.subs.push(this.bundleService.findById(this.selectedBundleId).pipe(
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       ).subscribe((bundle: Bundle) => {
         this.selectedBundleName = bundle.name;
       }));
@@ -156,12 +183,12 @@ export class UploadBitstreamComponent implements OnInit, OnDestroy {
    */
   createBundle() {
     this.itemService.createBundle(this.itemId, this.selectedBundleName).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((bundle: Bundle) => {
       this.selectedBundleId = bundle.id;
       this.notificationsService.success(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'bundle.created.title'),
-        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'bundle.created.content')
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'bundle.created.content'),
       );
       this.setUploadUrl();
     });
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..5e409446a7 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
@@ -1,25 +1,44 @@
-import { Component, OnInit, OnDestroy, Input } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Item } from '../../../core/shared/item.model';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router, Data } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { first, map, switchMap, tap } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  first,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
 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 { ItemDataService } from '../../../core/data/item-data.service';
 import { FieldUpdate } from '../../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { getAllSucceededRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractTrackableComponent } from '../../../shared/trackable/abstract-trackable.component';
+import { ITEM_PAGE_LINKS_TO_FOLLOW } from '../../item.resolver';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-abstract-item-update',
-  template: ''
+  template: '',
 })
 /**
  * Abstract component for managing object updates of an item
@@ -52,7 +71,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
     public router: Router,
     public notificationsService: NotificationsService,
     public translateService: TranslateService,
-    public route: ActivatedRoute
+    public route: ActivatedRoute,
   ) {
     super(objectUpdatesService, notificationsService, translateService);
   }
@@ -74,7 +93,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
         switchMap((rd: RemoteData<Item>) => {
           return this.itemService.findByHref(rd.payload._links.self.href, true, true, ...ITEM_PAGE_LINKS_TO_FOLLOW);
         }),
-        getAllSucceededRemoteData()
+        getAllSucceededRemoteData(),
       ).subscribe((rd: RemoteData<Item>) => {
         this.setItem(rd.payload);
       });
@@ -176,7 +195,7 @@ export class AbstractItemUpdateComponent extends AbstractTrackableComponent impl
           this.notificationsService.warning(this.getNotificationTitle('outdated'), this.getNotificationContent('outdated'));
           this.initializeOriginalFields();
         }
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/edit-item-operators.spec.ts b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts
index e7bd5b98ce..777c09813d 100644
--- a/src/app/item-page/edit-item-page/edit-item-operators.spec.ts
+++ b/src/app/item-page/edit-item-page/edit-item-operators.spec.ts
@@ -1,12 +1,13 @@
-import {RemoteData} from '../../core/data/remote-data';
-import {hot} from 'jasmine-marbles';
-import {Item} from '../../core/shared/item.model';
-import {findSuccessfulAccordingTo} from './edit-item-operators';
+import { hot } from 'jasmine-marbles';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { isNotEmpty } from '../../shared/empty.util';
 import {
   createFailedRemoteDataObject,
-  createSuccessfulRemoteDataObject
+  createSuccessfulRemoteDataObject,
 } from '../../shared/remote-data.utils';
-import { isNotEmpty } from '../../shared/empty.util';
+import { findSuccessfulAccordingTo } from './edit-item-operators';
 
 describe('findSuccessfulAccordingTo', () => {
   let mockItem1;
@@ -18,7 +19,7 @@ describe('findSuccessfulAccordingTo', () => {
     mockItem1.isWithdrawn = true;
 
     mockItem2 = new Item();
-    mockItem1.isWithdrawn = false;
+    mockItem2.isWithdrawn = false;
 
     predicate = (rd: RemoteData<Item>) => isNotEmpty(rd.payload) ? rd.payload.isWithdrawn : false;
   });
@@ -34,7 +35,7 @@ describe('findSuccessfulAccordingTo', () => {
     const source = hot('abcde', testRD);
     const result = source.pipe(findSuccessfulAccordingTo(predicate));
 
-    result.subscribe((value) => expect(value).toEqual(testRD.d));
+    expect(result).toBeObservable(hot('---(d|)', { d: testRD.d }));
   });
 
 });
diff --git a/src/app/item-page/edit-item-page/edit-item-operators.ts b/src/app/item-page/edit-item-page/edit-item-operators.ts
index 26c593cac6..dea90d90f1 100644
--- a/src/app/item-page/edit-item-page/edit-item-operators.ts
+++ b/src/app/item-page/edit-item-page/edit-item-operators.ts
@@ -1,7 +1,8 @@
-import {RemoteData} from '../../core/data/remote-data';
-import {Observable} from 'rxjs';
-import {first} from 'rxjs/operators';
-import {getAllSucceededRemoteData} from '../../core/shared/operators';
+import { Observable } from 'rxjs';
+import { first } from 'rxjs/operators';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
 
 /**
  * Return first Observable of a RemoteData object that complies to the provided predicate
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 9458df2249..cac114ef28 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,18 +1,21 @@
 <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">
-                    <li *ngFor="let page of pages" class="nav-item">
+              <ul *ngIf="pages.length > 0" class="nav nav-tabs justify-content-start" role="tablist">
+                    <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">
-                            <button *ngIf="!(page.enabled | async)"
+                            <button *ngIf="(page.enabled | async) !== true"
                                  class="nav-link disabled">
                                 {{'item.edit.tabs.' + page.page + '.head' | translate}}
                             </button>
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
index 2521f7e67d..e6277385c6 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.spec.ts
@@ -1,14 +1,36 @@
 /* eslint-disable max-classes-per-file */
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot, UrlTree } from '@angular/router';
-import { EditItemPageComponent } from './edit-item-page.component';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+  UrlTree,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { EditItemPageComponent } from './edit-item-page.component';
 
 describe('ItemPageComponent', () => {
   let comp: EditItemPageComponent;
@@ -32,35 +54,35 @@ describe('ItemPageComponent', () => {
     snapshot: {
       firstChild: {
         routeConfig: {
-          path: accesiblePages[0]
-        }
+          path: accesiblePages[0],
+        },
       },
       routerState: {
-        snapshot: undefined
-      }
+        snapshot: undefined,
+      },
     },
     routeConfig: {
       children: [
         {
           path: accesiblePages[0],
-          canActivate: [AcceptAllGuard]
+          canActivate: [AcceptAllGuard],
         }, {
           path: inaccesiblePages[0],
-          canActivate: [AcceptNoneGuard]
+          canActivate: [AcceptNoneGuard],
         }, {
           path: inaccesiblePages[1],
-          canActivate: [AcceptAllGuard, AcceptNoneGuard]
+          canActivate: [AcceptAllGuard, AcceptNoneGuard],
         },
-      ]
+      ],
     },
-    data: observableOf({dso: createSuccessfulRemoteDataObject(new Item())})
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(new Item()) }),
   };
 
   const mockRouter = {
     routerState: {
-      snapshot: undefined
+      snapshot: undefined,
     },
-    events: observableOf(undefined)
+    events: observableOf(undefined),
   };
 
   beforeEach(waitForAsync(() => {
@@ -68,8 +90,8 @@ describe('ItemPageComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [EditItemPageComponent],
       providers: [
@@ -79,9 +101,9 @@ describe('ItemPageComponent', () => {
         AcceptNoneGuard,
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(EditItemPageComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.ts b/src/app/item-page/edit-item-page/edit-item-page.component.ts
index 652b85916e..673c7d2381 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.ts
@@ -1,13 +1,31 @@
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { ChangeDetectionStrategy, Component, Injector, OnInit } from '@angular/core';
-import { ActivatedRoute, CanActivate, Route, Router } from '@angular/router';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  CanActivate,
+  Route,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { Item } from '../../core/shared/item.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../shared/animations/fade';
 import { isNotEmpty } from '../../shared/empty.util';
 import { getItemPageRoute } from '../item-page-routing-paths';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
 
 @Component({
   selector: 'ds-edit-item-page',
@@ -15,8 +33,8 @@ import { GenericConstructor } from '../../core/shared/generic-constructor';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Page component for editing an item
@@ -50,11 +68,11 @@ export class EditItemPageComponent implements OnInit {
         let enabled = observableOf(true);
         if (isNotEmpty(child.canActivate)) {
           enabled = observableCombineLatest(child.canActivate.map((guardConstructor: GenericConstructor<CanActivate>) => {
-              const guard: CanActivate = this.injector.get<CanActivate>(guardConstructor);
-              return guard.canActivate(this.route.snapshot, this.router.routerState.snapshot);
-            })
+            const guard: CanActivate = this.injector.get<CanActivate>(guardConstructor);
+            return guard.canActivate(this.route.snapshot, this.router.routerState.snapshot);
+          }),
           ).pipe(
-            map((canActivateOutcomes: any[]) => canActivateOutcomes.every((e) => e === true))
+            map((canActivateOutcomes: any[]) => canActivateOutcomes.every((e) => e === true)),
           );
         }
         return { page: child.path, enabled: enabled };
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 3ed741bc1a..54080c3e4d 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
@@ -1,42 +1,50 @@
-import { NgModule } from '@angular/core';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import {
+  NgbModule,
+  NgbTooltipModule,
+} from '@ng-bootstrap/ng-bootstrap';
 
-import { NgbTooltipModule, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
+import { BundleDataService } from '../../core/data/bundle-data.service';
+import { IdentifierDataService } from '../../core/data/identifier-data.service';
+import { DsoSharedModule } from '../../dso-shared/dso-shared.module';
+import { SearchPageModule } from '../../search-page/search-page.module';
+import { AccessControlFormModule } from '../../shared/access-control-form-container/access-control-form.module';
+import { IdentifierDataComponent } from '../../shared/object-list/identifier-data/identifier-data.component';
+import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
+import { ResultsBackButtonModule } from '../../shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../shared/shared.module';
-import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
+import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
+import { ItemVersionsModule } from '../versions/item-versions.module';
+import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
 import { EditItemPageComponent } from './edit-item-page.component';
-import { ItemStatusComponent } from './item-status/item-status.component';
-import { ItemOperationComponent } from './item-operation/item-operation.component';
-import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
-import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
-import { AbstractSimpleItemActionComponent } from './simple-item-action/abstract-simple-item-action.component';
-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 { ItemMetadataComponent } from './item-metadata/item-metadata.component';
-import { ThemedItemMetadataComponent } from './item-metadata/themed-item-metadata.component';
-import { EditInPlaceFieldComponent } from './item-metadata/edit-in-place-field/edit-in-place-field.component';
+import { EditItemPageRoutingModule } from './edit-item-page.routing.module';
+import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
+import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.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 { ItemEditBitstreamBundleComponent } from './item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component';
+import { PaginatedDragAndDropBitstreamListComponent } from './item-bitstreams/item-edit-bitstream-bundle/paginated-drag-and-drop-bitstream-list/paginated-drag-and-drop-bitstream-list.component';
+import { ItemEditBitstreamDragHandleComponent } from './item-bitstreams/item-edit-bitstream-drag-handle/item-edit-bitstream-drag-handle.component';
 import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
-import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ItemDeleteComponent } from './item-delete/item-delete.component';
+import { ItemMoveComponent } from './item-move/item-move.component';
+import { ItemOperationComponent } from './item-operation/item-operation.component';
+import { ItemPrivateComponent } from './item-private/item-private.component';
+import { ItemPublicComponent } from './item-public/item-public.component';
+import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
+import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
 import { EditRelationshipComponent } from './item-relationships/edit-relationship/edit-relationship.component';
 import { EditRelationshipListComponent } from './item-relationships/edit-relationship-list/edit-relationship-list.component';
-import { AbstractItemUpdateComponent } from './abstract-item-update/abstract-item-update.component';
-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 { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+import { ItemStatusComponent } from './item-status/item-status.component';
+import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
 import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
-import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
-import { ObjectValuesPipe } from '../../shared/utils/object-values-pipe';
-import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-policies.module';
-
+import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
+import { AbstractSimpleItemActionComponent } from './simple-item-action/abstract-simple-item-action.component';
+import { VirtualMetadataComponent } from './virtual-metadata/virtual-metadata.component';
 
 /**
  * Module that contains all components related to the Edit Item page administrator functionality
@@ -50,7 +58,11 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
     SearchPageModule,
     DragDropModule,
     ResourcePoliciesModule,
-    NgbModule
+    NgbModule,
+    ItemVersionsModule,
+    DsoSharedModule,
+    ResultsBackButtonModule,
+    AccessControlFormModule,
   ],
   declarations: [
     EditItemPageComponent,
@@ -63,32 +75,33 @@ import { ResourcePoliciesModule } from '../../shared/resource-policies/resource-
     ItemPublicComponent,
     ItemDeleteComponent,
     ItemStatusComponent,
-    ItemMetadataComponent,
-    ThemedItemMetadataComponent,
+    ThemedItemStatusComponent,
     ItemRelationshipsComponent,
     ItemBitstreamsComponent,
     ItemVersionHistoryComponent,
-    EditInPlaceFieldComponent,
     ItemEditBitstreamComponent,
     ItemEditBitstreamBundleComponent,
     PaginatedDragAndDropBitstreamListComponent,
-    EditInPlaceFieldComponent,
     EditRelationshipComponent,
     EditRelationshipListComponent,
     ItemCollectionMapperComponent,
     ItemMoveComponent,
     ItemEditBitstreamDragHandleComponent,
     VirtualMetadataComponent,
-    ItemAuthorizationsComponent
+    ItemAuthorizationsComponent,
+    IdentifierDataComponent,
+    ItemRegisterDoiComponent,
+    ItemCurateComponent,
+    ItemAccessControlComponent,
   ],
   providers: [
     BundleDataService,
-    ObjectValuesPipe
+    IdentifierDataService,
+    ObjectValuesPipe,
   ],
   exports: [
-    EditInPlaceFieldComponent,
-    ThemedItemMetadataComponent,
-  ]
+    ItemOperationComponent,
+  ],
 })
 export class EditItemPageModule {
 
diff --git a/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
index ce76a614dd..6b0907dceb 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
+++ b/src/app/item-page/edit-item-page/edit-item-page.routing-paths.ts
@@ -5,3 +5,4 @@ export const ITEM_EDIT_PUBLIC_PATH = 'public';
 export const ITEM_EDIT_DELETE_PATH = 'delete';
 export const ITEM_EDIT_MOVE_PATH = 'move';
 export const ITEM_EDIT_AUTHORIZATIONS_PATH = 'authorizations';
+export const ITEM_EDIT_REGISTER_DOI_PATH = 'register-doi';
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 2535e42216..6257bbc2f1 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
@@ -1,43 +1,51 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { EditItemPageComponent } from './edit-item-page.component';
-import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
-import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
-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 { ItemStatusComponent } from './item-status/item-status.component';
-import { ItemMetadataComponent } from './item-metadata/item-metadata.component';
-import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
-import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
-import { ItemMoveComponent } from './item-move/item-move.component';
-import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+
 import { I18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
-import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
-import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
-import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import { ThemedDsoEditMetadataComponent } from '../../dso-shared/dso-edit-metadata/themed-dso-edit-metadata.component';
 import { ResourcePolicyCreateComponent } from '../../shared/resource-policies/create/resource-policy-create.component';
 import { ResourcePolicyEditComponent } from '../../shared/resource-policies/edit/resource-policy-edit.component';
-import { I18nBreadcrumbsService } from '../../core/breadcrumbs/i18n-breadcrumbs.service';
+import { ResourcePolicyResolver } from '../../shared/resource-policies/resolvers/resource-policy.resolver';
+import { ResourcePolicyTargetResolver } from '../../shared/resource-policies/resolvers/resource-policy-target.resolver';
+import { ItemPageAdministratorGuard } from '../item-page-administrator.guard';
+import { EditItemPageComponent } from './edit-item-page.component';
 import {
   ITEM_EDIT_AUTHORIZATIONS_PATH,
   ITEM_EDIT_DELETE_PATH,
   ITEM_EDIT_MOVE_PATH,
   ITEM_EDIT_PRIVATE_PATH,
   ITEM_EDIT_PUBLIC_PATH,
+  ITEM_EDIT_REGISTER_DOI_PATH,
   ITEM_EDIT_REINSTATE_PATH,
-  ITEM_EDIT_WITHDRAW_PATH
+  ITEM_EDIT_WITHDRAW_PATH,
 } from './edit-item-page.routing-paths';
-import { ItemPageReinstateGuard } from './item-page-reinstate.guard';
-import { ItemPageWithdrawGuard } from './item-page-withdraw.guard';
-import { ItemPageMetadataGuard } from './item-page-metadata.guard';
-import { ItemPageAdministratorGuard } from '../item-page-administrator.guard';
-import { ItemPageStatusGuard } from './item-page-status.guard';
+import { ItemAccessControlComponent } from './item-access-control/item-access-control.component';
+import { ItemAuthorizationsComponent } from './item-authorizations/item-authorizations.component';
+import { ItemBitstreamsComponent } from './item-bitstreams/item-bitstreams.component';
+import { ItemCollectionMapperComponent } from './item-collection-mapper/item-collection-mapper.component';
+import { ItemCurateComponent } from './item-curate/item-curate.component';
+import { ItemDeleteComponent } from './item-delete/item-delete.component';
+import { ItemMoveComponent } from './item-move/item-move.component';
+import { ItemPageAccessControlGuard } from './item-page-access-control.guard';
 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 { ItemPageMetadataGuard } from './item-page-metadata.guard';
+import { ItemPageRegisterDoiGuard } from './item-page-register-doi.guard';
+import { ItemPageReinstateGuard } from './item-page-reinstate.guard';
+import { ItemPageRelationshipsGuard } from './item-page-relationships.guard';
+import { ItemPageStatusGuard } from './item-page-status.guard';
+import { ItemPageVersionHistoryGuard } from './item-page-version-history.guard';
+import { ItemPageWithdrawGuard } from './item-page-withdraw.guard';
+import { ItemPrivateComponent } from './item-private/item-private.component';
+import { ItemPublicComponent } from './item-public/item-public.component';
+import { ItemRegisterDoiComponent } from './item-register-doi/item-register-doi.component';
+import { ItemReinstateComponent } from './item-reinstate/item-reinstate.component';
+import { ItemRelationshipsComponent } from './item-relationships/item-relationships.component';
+import { ThemedItemStatusComponent } from './item-status/themed-item-status.component';
+import { ItemVersionHistoryComponent } from './item-version-history/item-version-history.component';
+import { ItemWithdrawComponent } from './item-withdraw/item-withdraw.component';
 
 /**
  * Routing module that handles the routing for the Edit Item page administrator functionality
@@ -48,7 +56,7 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { breadcrumbKey: 'item.edit' },
         children: [
@@ -59,31 +67,37 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
               {
                 path: '',
                 redirectTo: 'status',
-                pathMatch: 'full'
+                pathMatch: 'full',
               },
               {
                 path: 'status',
-                component: ItemStatusComponent,
+                component: ThemedItemStatusComponent,
                 data: { title: 'item.edit.tabs.status.title', showBreadcrumbs: true },
-                canActivate: [ItemPageStatusGuard]
+                canActivate: [ItemPageStatusGuard],
               },
               {
                 path: 'bitstreams',
                 component: ItemBitstreamsComponent,
                 data: { title: 'item.edit.tabs.bitstreams.title', showBreadcrumbs: true },
-                canActivate: [ItemPageBitstreamsGuard]
+                canActivate: [ItemPageBitstreamsGuard],
               },
               {
                 path: 'metadata',
-                component: ItemMetadataComponent,
+                component: ThemedDsoEditMetadataComponent,
                 data: { title: 'item.edit.tabs.metadata.title', showBreadcrumbs: true },
-                canActivate: [ItemPageMetadataGuard]
+                canActivate: [ItemPageMetadataGuard],
+              },
+              {
+                path: 'curate',
+                component: ItemCurateComponent,
+                data: { title: 'item.edit.tabs.curate.title', showBreadcrumbs: true },
+                canActivate: [ItemPageCurateGuard],
               },
               {
                 path: 'relationships',
                 component: ItemRelationshipsComponent,
                 data: { title: 'item.edit.tabs.relationships.title', showBreadcrumbs: true },
-                canActivate: [ItemPageRelationshipsGuard]
+                canActivate: [ItemPageRelationshipsGuard],
               },
               /* TODO - uncomment & fix when view page exists
               {
@@ -101,15 +115,21 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
                 path: 'versionhistory',
                 component: ItemVersionHistoryComponent,
                 data: { title: 'item.edit.tabs.versionhistory.title', showBreadcrumbs: true },
-                canActivate: [ItemPageVersionHistoryGuard]
+                canActivate: [ItemPageVersionHistoryGuard],
+              },
+              {
+                path: 'access-control',
+                component: ItemAccessControlComponent,
+                data: { title: 'item.edit.tabs.access-control.title', showBreadcrumbs: true },
+                canActivate: [ItemPageAccessControlGuard],
               },
               {
                 path: 'mapper',
                 component: ItemCollectionMapperComponent,
                 data: { title: 'item.edit.tabs.item-mapper.title', showBreadcrumbs: true },
-                canActivate: [ItemPageCollectionMapperGuard]
-              }
-            ]
+                canActivate: [ItemPageCollectionMapperGuard],
+              },
+            ],
           },
           {
             path: 'mapper',
@@ -118,12 +138,12 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
           {
             path: ITEM_EDIT_WITHDRAW_PATH,
             component: ItemWithdrawComponent,
-            canActivate: [ItemPageWithdrawGuard]
+            canActivate: [ItemPageWithdrawGuard],
           },
           {
             path: ITEM_EDIT_REINSTATE_PATH,
             component: ItemReinstateComponent,
-            canActivate: [ItemPageReinstateGuard]
+            canActivate: [ItemPageReinstateGuard],
           },
           {
             path: ITEM_EDIT_PRIVATE_PATH,
@@ -142,35 +162,41 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
             component: ItemMoveComponent,
             data: { title: 'item.edit.move.title' },
           },
+          {
+            path: ITEM_EDIT_REGISTER_DOI_PATH,
+            component: ItemRegisterDoiComponent,
+            canActivate: [ItemPageRegisterDoiGuard],
+            data: { title: 'item.edit.register-doi.title' },
+          },
           {
             path: ITEM_EDIT_AUTHORIZATIONS_PATH,
             children: [
               {
                 path: 'create',
                 resolve: {
-                  resourcePolicyTarget: ResourcePolicyTargetResolver
+                  resourcePolicyTarget: ResourcePolicyTargetResolver,
                 },
                 component: ResourcePolicyCreateComponent,
-                data: { title: 'resource-policies.create.page.title' }
+                data: { title: 'resource-policies.create.page.title' },
               },
               {
                 path: 'edit',
                 resolve: {
-                  resourcePolicy: ResourcePolicyResolver
+                  resourcePolicy: ResourcePolicyResolver,
                 },
                 component: ResourcePolicyEditComponent,
-                data: { title: 'resource-policies.edit.page.title' }
+                data: { title: 'resource-policies.edit.page.title' },
               },
               {
                 path: '',
                 component: ItemAuthorizationsComponent,
-                data: { title: 'item.edit.authorizations.title' }
-              }
-            ]
-          }
-        ]
-      }
-    ])
+                data: { title: 'item.edit.authorizations.title' },
+              },
+            ],
+          },
+        ],
+      },
+    ]),
   ],
   providers: [
     I18nBreadcrumbResolver,
@@ -181,12 +207,15 @@ import { ItemPageCollectionMapperGuard } from './item-page-collection-mapper.gua
     ItemPageWithdrawGuard,
     ItemPageAdministratorGuard,
     ItemPageMetadataGuard,
+    ItemPageCurateGuard,
     ItemPageStatusGuard,
     ItemPageBitstreamsGuard,
     ItemPageRelationshipsGuard,
     ItemPageVersionHistoryGuard,
     ItemPageCollectionMapperGuard,
-  ]
+    ItemPageAccessControlGuard,
+    ItemPageRegisterDoiGuard,
+  ],
 })
 export class EditItemPageRoutingModule {
 
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
new file mode 100644
index 0000000000..782e24fa2d
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.html
@@ -0,0 +1,6 @@
+<ds-access-control-form-container
+  titleMessage="item-access-control-title"
+  *ngIf="itemRD$ | async as itemRD"
+  [itemRD]="itemRD"
+  [showLimitToSpecificBitstreams]="true">
+</ds-access-control-form-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.html b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.html
rename to src/app/item-page/edit-item-page/item-access-control/item-access-control.component.scss
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts
new file mode 100644
index 0000000000..58f03accbf
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.spec.ts
@@ -0,0 +1,28 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { ItemAccessControlComponent } from './item-access-control.component';
+
+xdescribe('ItemAccessControlComponent', () => {
+  let component: ItemAccessControlComponent;
+  let fixture: ComponentFixture<ItemAccessControlComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ItemAccessControlComponent ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAccessControlComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
new file mode 100644
index 0000000000..9d9e481b4b
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-access-control/item-access-control.component.ts
@@ -0,0 +1,30 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-item-access-control',
+  templateUrl: './item-access-control.component.html',
+  styleUrls: [ './item-access-control.component.scss' ],
+})
+export class ItemAccessControlComponent implements OnInit {
+
+  itemRD$: Observable<RemoteData<Item>>;
+
+  constructor(private route: ActivatedRoute) {}
+
+  ngOnInit(): void {
+    this.itemRD$ = this.route.parent.parent.data.pipe(
+      map((data) => data.dso),
+    ).pipe(getFirstSucceededRemoteData()) as Observable<RemoteData<Item>>;
+  }
+
+}
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
index 5437525185..7f121081f2 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.html
@@ -11,7 +11,7 @@
         <div class="card-header">
           <button type="button" class="btn btn-outline-primary" (click)="collapseArea(bundle.id)"
             [attr.aria-expanded]="false" [attr.aria-controls]="bundle.id">
-            {{ 'collection.edit.item.authorizations.show-bitstreams-button' | translate }} {{bundle.name}}
+            {{ 'collection.edit.item.authorizations.show-bitstreams-button' | translate }} {{ nameService.getName(bundle) }}
           </button>
         </div>
         <div class="card-body" [id]="bundle.id" [ngbCollapse]="bundleBitstreamsMap.get(bundle.id).isCollapsed">
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
index 2fe8a562c6..5fe45c735a 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.spec.ts
@@ -1,21 +1,33 @@
-import { Observable } from 'rxjs/internal/Observable';
-import { waitForAsync, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { of as observableOf, of } from 'rxjs';
+import { ActivatedRoute } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { ItemAuthorizationsComponent, BitstreamMapValue } from './item-authorizations.component';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../core/cache/builders/link.service';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { Bundle } from '../../../core/shared/bundle.model';
 import { Item } from '../../../core/shared/item.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
 import { getMockLinkService } from '../../../shared/mocks/link-service.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
-import { PaginatedList, buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../../shared/testing/utils.test';
+import { ItemAuthorizationsComponent } from './item-authorizations.component';
 
 describe('ItemAuthorizationsComponent test suite', () => {
   let comp: ItemAuthorizationsComponent;
@@ -27,35 +39,35 @@ describe('ItemAuthorizationsComponent test suite', () => {
 
   const bitstream1 = Object.assign(new Bitstream(), {
     id: 'bitstream1',
-    uuid: 'bitstream1'
+    uuid: 'bitstream1',
   });
   const bitstream2 = Object.assign(new Bitstream(), {
     id: 'bitstream2',
-    uuid: 'bitstream2'
+    uuid: 'bitstream2',
   });
   const bitstream3 = Object.assign(new Bitstream(), {
     id: 'bitstream3',
-    uuid: 'bitstream3'
+    uuid: 'bitstream3',
   });
   const bitstream4 = Object.assign(new Bitstream(), {
     id: 'bitstream4',
-    uuid: 'bitstream4'
+    uuid: 'bitstream4',
   });
   const bundle1 = Object.assign(new Bundle(), {
     id: 'bundle1',
     uuid: 'bundle1',
     _links: {
-      self: { href: 'bundle1-selflink' }
+      self: { href: 'bundle1-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
   });
   const bundle2 = Object.assign(new Bundle(), {
     id: 'bundle2',
     uuid: 'bundle2',
     _links: {
-      self: { href: 'bundle2-selflink' }
+      self: { href: 'bundle2-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4])),
   });
   const bundles = [bundle1, bundle2];
 
@@ -63,35 +75,35 @@ describe('ItemAuthorizationsComponent test suite', () => {
     uuid: 'item',
     id: 'item',
     _links: {
-      self: { href: 'item-selflink' }
+      self: { href: 'item-selflink' },
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2])),
   });
 
   const routeStub = {
     data: observableOf({
-      dso: createSuccessfulRemoteDataObject(item)
-    })
+      dso: createSuccessfulRemoteDataObject(item),
+    }),
   };
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         NoopAnimationsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ItemAuthorizationsComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
         { provide: ActivatedRoute, useValue: routeStub },
-        ItemAuthorizationsComponent
+        ItemAuthorizationsComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -142,18 +154,18 @@ describe('ItemAuthorizationsComponent test suite', () => {
       expect(compAsAny.bundleBitstreamsMap.has('bundle2')).toBeTruthy();
       let bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle1');
       expect(bitstreamList.bitstreams).toBeObservable(cold('(a|)', {
-        a : [bitstream1, bitstream2]
+        a : [bitstream1, bitstream2],
       }));
       bitstreamList = compAsAny.bundleBitstreamsMap.get('bundle2');
       expect(bitstreamList.bitstreams).toBeObservable(cold('(a|)', {
-        a: [bitstream3, bitstream4]
+        a: [bitstream3, bitstream4],
       }));
     });
 
     it('should get the item UUID', () => {
 
       expect(comp.getItemUUID()).toBeObservable(cold('(a|)', {
-        a: item.id
+        a: item.id,
       }));
 
     });
@@ -161,7 +173,7 @@ describe('ItemAuthorizationsComponent test suite', () => {
     it('should get the item\'s bundle', () => {
 
       expect(comp.getItemBundles()).toBeObservable(cold('a', {
-        a: bundles
+        a: bundles,
       }));
 
     });
@@ -171,7 +183,7 @@ describe('ItemAuthorizationsComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
index 8ed2f9a12e..ce68524a0a 100644
--- a/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
+++ b/src/app/item-page/edit-item-page/item-authorizations/item-authorizations.component.ts
@@ -1,22 +1,43 @@
-import { isEqual } from 'lodash';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import isEqual from 'lodash/isEqual';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  filter,
+  first,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { catchError, filter, first, map, mergeMap, take } from 'rxjs/operators';
-
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
 import {
   getFirstSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataWithNotEmptyPayload,
 } from '../../../core/shared/operators';
-import { Item } from '../../../core/shared/item.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { Bundle } from '../../../core/shared/bundle.model';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { Bitstream } from '../../../core/shared/bitstream.model';
 
 /**
  * Interface for a bundle's bitstream map entry
@@ -29,7 +50,7 @@ interface BundleBitstreamsMapEntry {
 @Component({
   selector: 'ds-item-authorizations',
   templateUrl: './item-authorizations.component.html',
-  styleUrls:['./item-authorizations.component.scss']
+  styleUrls:['./item-authorizations.component.scss'],
 })
 /**
  * Component that handles the item Authorizations
@@ -101,7 +122,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
   constructor(
     private linkService: LinkService,
     private route: ActivatedRoute,
-    private nameService: DSONameService
+    public nameService: DSONameService,
   ) {
   }
 
@@ -109,7 +130,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    * Initialize the component, setting up the bundle and bitstream within the item
    */
   ngOnInit(): void {
-   this.getBundlesPerItem();
+    this.getBundlesPerItem();
   }
 
   /**
@@ -118,7 +139,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
   getItemUUID(): Observable<string> {
     return this.item$.pipe(
       map((item: Item) => item.id),
-      first((UUID: string) => isNotEmpty(UUID))
+      first((UUID: string) => isNotEmpty(UUID)),
     );
   }
 
@@ -127,7 +148,7 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
  */
   getItemName(): Observable<string> {
     return this.item$.pipe(
-      map((item: Item) => this.nameService.getName(item))
+      map((item: Item) => this.nameService.getName(item)),
     );
   }
 
@@ -151,24 +172,24 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
       getFirstSucceededRemoteDataWithNotEmptyPayload(),
       map((item: Item) => this.linkService.resolveLink(
         item,
-        followLink('bundles', {findListOptions: {currentPage : page, elementsPerPage: this.bundlesPerPage}}, followLink('bitstreams'))
-      ))
+        followLink('bundles', { findListOptions: { currentPage : page, elementsPerPage: this.bundlesPerPage } }, followLink('bitstreams')),
+      )),
     ) as Observable<Item>;
 
     const bundles$: Observable<PaginatedList<Bundle>> =  this.item$.pipe(
       filter((item: Item) => isNotEmpty(item.bundles)),
       mergeMap((item: Item) => item.bundles),
       getFirstSucceededRemoteDataWithNotEmptyPayload(),
-      catchError((error) => {
+      catchError((error: unknown) => {
         console.error(error);
         return observableOf(buildPaginatedList(null, []));
-      })
+      }),
     );
 
     this.subs.push(
       bundles$.pipe(
         take(1),
-        map((list: PaginatedList<Bundle>) => list.page)
+        map((list: PaginatedList<Bundle>) => list.page),
       ).subscribe((bundles: Bundle[]) => {
         if (isEqual(bundles.length,0) || bundles.length < this.bundlesPerPage) {
           this.allBundlesLoaded = true;
@@ -182,21 +203,21 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
       bundles$.pipe(
         take(1),
         mergeMap((list: PaginatedList<Bundle>) => list.page),
-        map((bundle: Bundle) => ({ id: bundle.id, bitstreams: this.getBundleBitstreams(bundle) }))
+        map((bundle: Bundle) => ({ id: bundle.id, bitstreams: this.getBundleBitstreams(bundle) })),
       ).subscribe((entry: BundleBitstreamsMapEntry) => {
-        let bitstreamMapValues: BitstreamMapValue = {
+        const bitstreamMapValues: BitstreamMapValue = {
           isCollapsed: true,
           allBitstreamsLoaded: false,
-          bitstreams: null
+          bitstreams: null,
         };
         bitstreamMapValues.bitstreams = entry.bitstreams.pipe(
           map((b: PaginatedList<Bitstream>) => {
             bitstreamMapValues.allBitstreamsLoaded = b?.page.length < this.bitstreamSize;
             return [...b.page.slice(0, this.bitstreamSize)];
-          })
+          }),
         );
         this.bundleBitstreamsMap.set(entry.id, bitstreamMapValues);
-      })
+      }),
     );
   }
 
@@ -208,10 +229,10 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
   private getBundleBitstreams(bundle: Bundle): Observable<PaginatedList<Bitstream>> {
     return bundle.bitstreams.pipe(
       getFirstSucceededRemoteDataPayload(),
-      catchError((error) => {
+      catchError((error: unknown) => {
         console.error(error);
         return observableOf(buildPaginatedList(null, []));
-      })
+      }),
     );
   }
 
@@ -239,17 +260,17 @@ export class ItemAuthorizationsComponent implements OnInit, OnDestroy {
    */
   onBitstreamsLoad(bundle: Bundle) {
     return this.getBundleBitstreams(bundle).subscribe((res: PaginatedList<Bitstream>) => {
-      let nextBitstreams = res?.page.slice(this.bitstreamPageSize, this.bitstreamPageSize + this.bitstreamSize);
-      let bitstreamsToShow = this.bundleBitstreamsMap.get(bundle.id).bitstreams.pipe(
+      const nextBitstreams = res?.page.slice(this.bitstreamPageSize, this.bitstreamPageSize + this.bitstreamSize);
+      const bitstreamsToShow = this.bundleBitstreamsMap.get(bundle.id).bitstreams.pipe(
         map((existingBits: Bitstream[])=> {
           return [... existingBits, ...nextBitstreams];
-        })
+        }),
       );
       this.bitstreamPageSize = this.bitstreamPageSize + this.bitstreamSize;
-      let bitstreamMapValues: BitstreamMapValue = {
+      const bitstreamMapValues: BitstreamMapValue = {
         bitstreams: bitstreamsToShow ,
         isCollapsed: this.bundleBitstreamsMap.get(bundle.id).isCollapsed,
-        allBitstreamsLoaded: res?.page.length <= this.bitstreamPageSize
+        allBitstreamsLoaded: res?.page.length <= this.bitstreamPageSize,
       };
       this.bundleBitstreamsMap.set(bundle.id, bitstreamMapValues);
     });
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..48635a50f6 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,22 +1,26 @@
 <div class="item-bitstreams" *ngVar="(bundles$ | async) as bundles">
   <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"
+            [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" [disabled]="(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"
+            [disabled]="(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>
@@ -49,17 +53,20 @@
   <div class="button-row bottom">
     <div class="mt-4 float-right space-children-mr ml-gap">
       <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" [disabled]="(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"
+              [disabled]="(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>
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 67d047d776..be89fcd558 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
@@ -1,30 +1,48 @@
-import { Bitstream } from '../../../core/shared/bitstream.model';
-import { of as observableOf } from 'rxjs';
-import { Item } from '../../../core/shared/item.model';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemBitstreamsComponent } from './item-bitstreams.component';
-import { ItemDataService } from '../../../core/data/item-data.service';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { of as observableOf } from 'rxjs';
+
 import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../../core/data/bundle-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { BitstreamDataServiceStub } from '../../../shared/testing/bitstream-data-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 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';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ItemBitstreamsComponent } from './item-bitstreams.component';
 
 let comp: ItemBitstreamsComponent;
 let fixture: ComponentFixture<ItemBitstreamsComponent>;
@@ -34,34 +52,34 @@ const warningNotification: INotification = new Notification('id', NotificationTy
 const successNotification: INotification = new Notification('id', NotificationType.Success, 'success');
 const bitstream1 = Object.assign(new Bitstream(), {
   id: 'bitstream1',
-  uuid: 'bitstream1'
+  uuid: 'bitstream1',
 });
 const bitstream2 = Object.assign(new Bitstream(), {
   id: 'bitstream2',
-  uuid: 'bitstream2'
+  uuid: 'bitstream2',
 });
 const fieldUpdate1 = {
   field: bitstream1,
-  changeType: undefined
+  changeType: undefined,
 };
 const fieldUpdate2 = {
   field: bitstream2,
-  changeType: FieldChangeType.REMOVE
+  changeType: FieldChangeType.REMOVE,
 };
 const bundle = Object.assign(new Bundle(), {
   id: 'bundle1',
   uuid: 'bundle1',
   _links: {
-    self: { href: 'bundle1-selflink' }
+    self: { href: 'bundle1-selflink' },
   },
-  bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+  bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
 });
 const moveOperations = [
   {
     op: 'move',
     from: '/0',
-    path: '/1'
-  }
+    path: '/1',
+  },
 ];
 const date = new Date();
 const url = 'thisUrl';
@@ -71,7 +89,7 @@ let objectUpdatesService: ObjectUpdatesService;
 let router: any;
 let route: ActivatedRoute;
 let notificationsService: NotificationsService;
-let bitstreamService: BitstreamDataService;
+let bitstreamService: BitstreamDataServiceStub;
 let objectCache: ObjectCacheService;
 let requestService: RequestService;
 let searchConfig: SearchConfigurationService;
@@ -99,54 +117,52 @@ describe('ItemBitstreamsComponent', () => {
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false),
         isValidPage: observableOf(true),
-        getMoveOperations: observableOf(moveOperations)
-      }
+        getMoveOperations: observableOf(moveOperations),
+      },
     );
     router = Object.assign(new RouterStub(), {
-      url: url
+      url: url,
     });
     notificationsService = jasmine.createSpyObj('notificationsService',
       {
         info: infoNotification,
         warning: warningNotification,
-        success: successNotification
-      }
+        success: successNotification,
+      },
     );
-    bitstreamService = jasmine.createSpyObj('bitstreamService', {
-      delete: jasmine.createSpy('delete')
-    });
+    bitstreamService = new BitstreamDataServiceStub();
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: jasmine.createSpy('remove')
+      remove: jasmine.createSpy('remove'),
     });
     requestService = getMockRequestService();
     searchConfig = Object.assign({
-      paginatedSearchOptions: observableOf({})
+      paginatedSearchOptions: observableOf({}),
     });
 
     item = Object.assign(new Item(), {
       uuid: 'item',
       id: 'item',
       _links: {
-        self: { href: 'item-selflink' }
+        self: { href: 'item-selflink' },
       },
       bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
-      lastModified: date
+      lastModified: date,
     });
     itemService = Object.assign({
       getBitstreams: () => createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
       findByHref: () => createSuccessfulRemoteDataObject$(item),
       findById: () => createSuccessfulRemoteDataObject$(item),
-      getBundles: () => createSuccessfulRemoteDataObject$(createPaginatedList([bundle]))
+      getBundles: () => createSuccessfulRemoteDataObject$(createPaginatedList([bundle])),
     });
     route = Object.assign({
       parent: {
-        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }),
       },
       data: observableOf({}),
-      url: url
+      url: url,
     });
     bundleService = jasmine.createSpyObj('bundleService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK'))
+      patch: observableOf(new RestResponse(true, 200, 'OK')),
     });
 
     TestBed.configureTestingModule({
@@ -163,10 +179,10 @@ describe('ItemBitstreamsComponent', () => {
         { provide: RequestService, useValue: requestService },
         { provide: SearchConfigurationService, useValue: searchConfig },
         { provide: BundleDataService, useValue: bundleService },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -179,29 +195,16 @@ describe('ItemBitstreamsComponent', () => {
 
   describe('when submit is called', () => {
     beforeEach(() => {
+      spyOn(bitstreamService, 'removeMultiple').and.callThrough();
       comp.submit();
     });
 
-    it('should call delete on the bitstreamService for the marked field', () => {
-      expect(bitstreamService.delete).toHaveBeenCalledWith(bitstream2.id);
+    it('should call removeMultiple on the bitstreamService for the marked field', () => {
+      expect(bitstreamService.removeMultiple).toHaveBeenCalledWith([bitstream2]);
     });
 
-    it('should not call delete on the bitstreamService for the unmarked field', () => {
-      expect(bitstreamService.delete).not.toHaveBeenCalledWith(bitstream1.id);
-    });
-  });
-
-  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);
+    it('should not call removeMultiple on the bitstreamService for the unmarked field', () => {
+      expect(bitstreamService.removeMultiple).not.toHaveBeenCalledWith([bitstream1]);
     });
   });
 
@@ -210,10 +213,9 @@ describe('ItemBitstreamsComponent', () => {
       comp.dropBitstream(bundle, {
         fromIndex: 0,
         toIndex: 50,
-        // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
         finish: () => {
           done();
-        }
+        },
       });
     });
 
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 0c7dfb1e34..191ba89845 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,54 @@
-import { ChangeDetectorRef, Component, NgZone, OnDestroy } from '@angular/core';
-import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { filter, map, switchMap, take } from 'rxjs/operators';
-import { Observable, of as observableOf, Subscription, zip as observableZip } 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 {
+  ChangeDetectorRef,
+  Component,
+  NgZone,
+  OnDestroy,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 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 { 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 {
+  Observable,
+  Subscription,
+  zip as observableZip,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../../core/data/bundle-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 { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Bundle } from '../../../core/shared/bundle.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ResponsiveColumnSizes } from '../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
 
 @Component({
   selector: 'ds-item-bitstreams',
@@ -47,7 +71,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
   bundlesOptions = {
     id: 'bundles-pagination-options',
     currentPage: 1,
-    pageSize: 9999
+    pageSize: 9999,
   } as any;
 
   /**
@@ -61,7 +85,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     // Format column
     new ResponsiveColumnSizes(2, 2, 2, 2, 2),
     // Actions column
-    new ResponsiveColumnSizes(6, 5, 4, 3, 3)
+    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
   ]);
 
   /**
@@ -88,7 +112,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     public requestService: RequestService,
     public cdRef: ChangeDetectorRef,
     public bundleService: BundleDataService,
-    public zone: NgZone
+    public zone: NgZone,
   ) {
     super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
   }
@@ -97,10 +121,10 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * 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(
+    this.bundles$ = this.itemService.getBundles(this.item.id, new PaginatedSearchOptions({ pagination: this.bundlesOptions })).pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page)
+      map((bundlePage: PaginatedList<Bundle>) => bundlePage.page),
     );
   }
 
@@ -124,29 +148,25 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
     // 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))
+        ...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))
+        ...fieldUpdates.map((updates: FieldUpdates) => Object.values(updates).filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)),
       )),
-      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field))
+      map((fieldUpdates: FieldUpdate[]) => fieldUpdates.map((fieldUpdate: FieldUpdate) => fieldUpdate.field)),
     );
 
     // Send out delete requests for all deleted bitstreams
-    const removedResponses$ = removedBitstreams$.pipe(
+    const removedResponses$: Observable<RemoteData<NoContent>> = removedBitstreams$.pipe(
       take(1),
-      switchMap((removedBistreams: Bitstream[]) => {
-        if (isNotEmpty(removedBistreams)) {
-          return observableZip(...removedBistreams.map((bitstream: Bitstream) => this.bitstreamService.delete(bitstream.id)));
-        } else {
-          return observableOf(undefined);
-        }
-      })
+      switchMap((removedBitstreams: Bitstream[]) => {
+        return this.bitstreamService.removeMultiple(removedBitstreams);
+      }),
     );
 
     // Perform the setup actions from above in order and display notifications
-    removedResponses$.pipe(take(1)).subscribe((responses: RemoteData<NoContent>[]) => {
-      this.displayNotifications('item.edit.bitstreams.notifications.remove', responses);
+    removedResponses$.subscribe((responses: RemoteData<NoContent>) => {
+      this.displayNotifications('item.edit.bitstreams.notifications.remove', [responses]);
       this.submitting = false;
     });
   }
@@ -164,7 +184,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
         const moveOperation = {
           op: 'move',
           from: `/_links/bitstreams/${event.fromIndex}/href`,
-          path: `/_links/bitstreams/${event.toIndex}/href`
+          path: `/_links/bitstreams/${event.toIndex}/href`,
         } as Operation;
         this.bundleService.patch(bundle, [moveOperation]).pipe(take(1)).subscribe((response: RemoteData<Bundle>) => {
           this.zone.run(() => {
@@ -172,7 +192,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
             // 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)
+              take(1),
             ).subscribe(() => event.finish());
           });
         });
@@ -206,7 +226,7 @@ export class ItemBitstreamsComponent extends AbstractItemUpdateComponent impleme
    * Shows a notification to remind the user that they can undo this
    */
   discard() {
-    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), {timeOut: this.discardTimeOut});
+    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), { timeOut: this.discardTimeOut });
     this.objectUpdatesService.discardAllFieldUpdates(this.url, undoNotification);
   }
 
@@ -227,7 +247,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)))),
-      map((reinstatable: boolean[]) => reinstatable.includes(true))
+      map((reinstatable: boolean[]) => reinstatable.includes(true)),
     );
   }
 
@@ -237,7 +257,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)))),
-      map((hasChanges: boolean[]) => hasChanges.includes(true))
+      map((hasChanges: boolean[]) => hasChanges.includes(true)),
     );
   }
 
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 b732e6a950..42b9b9eb64 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
@@ -3,13 +3,14 @@
     <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: bundle.name } }}
+        {{'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}"
+                [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>
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..810a262b9b 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
@@ -1,11 +1,19 @@
-import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  NO_ERRORS_SCHEMA,
+  ViewContainerRef,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core';
-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 { 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 { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle.component';
 
 describe('ItemEditBitstreamBundleComponent', () => {
   let comp: ItemEditBitstreamBundleComponent;
@@ -16,19 +24,19 @@ describe('ItemEditBitstreamBundleComponent', () => {
     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)
+    new ResponsiveColumnSizes(6, 5, 4, 3, 3),
   ]);
 
   const item = Object.assign(new Item(), {
     id: 'item-1',
-    uuid: 'item-1'
+    uuid: 'item-1',
   });
   const bundle = Object.assign(new Bundle(), {
     id: 'bundle-1',
     uuid: 'bundle-1',
     _links: {
-      self: { href: 'bundle-1-selflink' }
-    }
+      self: { href: 'bundle-1-selflink' },
+    },
   });
 
   beforeEach(waitForAsync(() => {
@@ -36,8 +44,8 @@ describe('ItemEditBitstreamBundleComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ItemEditBitstreamBundleComponent],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
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 eb05d5e74f..52d8e8e0f7 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,4 +1,15 @@
-import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Bundle } from '../../../../core/shared/bundle.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
@@ -15,12 +26,12 @@ import { getItemPageRoute } from '../../../item-page-routing-paths';
  * 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 {
 
   /**
    * The view on the bundle information and bitstreams
    */
-  @ViewChild('bundleView', {static: true}) bundleView;
+  @ViewChild('bundleView', { static: true }) bundleView;
 
   /**
    * The bundle to display bitstreams for
@@ -55,7 +66,10 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
    */
   itemPageRoute: string;
 
-  constructor(private viewContainerRef: ViewContainerRef) {
+  constructor(
+    protected viewContainerRef: ViewContainerRef,
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   ngOnInit(): void {
@@ -63,4 +77,9 @@ export class ItemEditBitstreamBundleComponent implements OnInit {
     this.viewContainerRef.createEmbeddedView(this.bundleView);
     this.itemPageRoute = getItemPageRoute(this.item);
   }
+
+  ngOnDestroy(): void {
+    this.viewContainerRef.clear();
+  }
+
 }
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
index f54aa73597..e43c504858 100644
--- 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
@@ -5,7 +5,7 @@
                [paginationOptions]="options"
                [pageInfoState]="(objectsRD$ | async)?.payload"
                [collectionSize]="(objectsRD$ | async)?.payload?.totalElements">
-  <ng-container *ngIf="!(loading$ | async)">
+  <ng-container *ngIf="(loading$ | async) !== true">
     <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)">
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
index 133b13cb27..d817d3a96d 100644
--- 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
@@ -1,26 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Bundle } from '../../../../../core/shared/bundle.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 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 { BundleDataService } from '../../../../../core/data/bundle-data.service';
+import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
 import { RequestService } from '../../../../../core/data/request.service';
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../../../core/cache/models/sort-options.model';
+import { Bitstream } from '../../../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../../../core/shared/bitstream-format.model';
+import { Bundle } from '../../../../../core/shared/bundle.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/remote-data.utils';
+import { ResponsiveColumnSizes } from '../../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { PaginationServiceStub } from '../../../../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../../../../core/data/find-list-options.model';
+import { createPaginatedList } from '../../../../../shared/testing/utils.test';
+import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
+import { VarDirective } from '../../../../../shared/utils/var.directive';
+import { PaginatedDragAndDropBitstreamListComponent } from './paginated-drag-and-drop-bitstream-list.component';
 
 describe('PaginatedDragAndDropBitstreamListComponent', () => {
   let comp: PaginatedDragAndDropBitstreamListComponent;
@@ -35,41 +37,41 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
     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)
+    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' }
-    }
+      self: { href: 'bundle-1-selflink' },
+    },
   });
   const date = new Date();
   const format = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'PDF'
+    shortDescription: 'PDF',
   });
   const bitstream1 = Object.assign(new Bitstream(), {
     uuid: 'bitstreamUUID1',
     name: 'Fake Bitstream 1',
     bundleName: 'ORIGINAL',
     description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
+    format: createSuccessfulRemoteDataObject$(format),
   });
   const fieldUpdate1 = {
     field: bitstream1,
-    changeType: undefined
+    changeType: undefined,
   };
   const bitstream2 = Object.assign(new Bitstream(), {
     uuid: 'bitstreamUUID2',
     name: 'Fake Bitstream 2',
     bundleName: 'ORIGINAL',
     description: 'Description',
-    format: createSuccessfulRemoteDataObject$(format)
+    format: createSuccessfulRemoteDataObject$(format),
   });
   const fieldUpdate2 = {
     field: bitstream2,
-    changeType: undefined
+    changeType: undefined,
   };
 
   beforeEach(waitForAsync(() => {
@@ -100,19 +102,19 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
         isReinstatable: observableOf(false),
         isValidPage: observableOf(true),
         initializeWithCustomOrder: {},
-        addPageToCustomOrder: {}
-      }
+        addPageToCustomOrder: {},
+      },
     );
 
     bundleService = jasmine.createSpyObj('bundleService', {
       getBitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
-      getBitstreamsEndpoint: observableOf('')
+      getBitstreamsEndpoint: observableOf(''),
     });
 
     objectValuesPipe = new ObjectValuesPipe();
 
     requestService = jasmine.createSpyObj('requestService', {
-      hasByHref$: observableOf(true)
+      hasByHref$: observableOf(true),
     });
 
     paginationService = new PaginationServiceStub();
@@ -125,10 +127,10 @@ describe('PaginatedDragAndDropBitstreamListComponent', () => {
         { provide: BundleDataService, useValue: bundleService },
         { provide: ObjectValuesPipe, useValue: objectValuesPipe },
         { provide: RequestService, useValue: requestService },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
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
index 2c81a4e2cb..bdd64c5376 100644
--- 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
@@ -1,17 +1,23 @@
-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 {
+  Component,
+  ElementRef,
+  Input,
+  OnInit,
+} from '@angular/core';
 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 { BundleDataService } from '../../../../../core/data/bundle-data.service';
+import { ObjectUpdatesService } from '../../../../../core/data/object-updates/object-updates.service';
 import { RequestService } from '../../../../../core/data/request.service';
 import { PaginationService } from '../../../../../core/pagination/pagination.service';
+import { Bitstream } from '../../../../../core/shared/bitstream.model';
+import { Bundle } from '../../../../../core/shared/bundle.model';
 import { PaginationComponentOptions } from '../../../../../shared/pagination/pagination-component-options.model';
+import { AbstractPaginatedDragAndDropListComponent } from '../../../../../shared/pagination-drag-and-drop/abstract-paginated-drag-and-drop-list.component';
+import { ResponsiveTableSizes } from '../../../../../shared/responsive-table-sizes/responsive-table-sizes';
+import { PaginatedSearchOptions } from '../../../../../shared/search/models/paginated-search-options.model';
+import { followLink } from '../../../../../shared/utils/follow-link-config.model';
+import { ObjectValuesPipe } from '../../../../../shared/utils/object-values-pipe';
 
 @Component({
   selector: 'ds-paginated-drag-and-drop-bitstream-list',
@@ -54,16 +60,16 @@ export class PaginatedDragAndDropBitstreamListComponent extends AbstractPaginate
   initializeObjectsRD(): void {
     this.objectsRD$ = this.currentPage$.pipe(
       switchMap((page: PaginationComponentOptions) => {
-        const paginatedOptions = new PaginatedSearchOptions({pagination: Object.assign({}, page)});
+        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')
-          ))
+            followLink('format'),
+          )),
         );
-      })
+      }),
     );
   }
 
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
index e5cb9ba403..8e3524dffb 100644
--- 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
@@ -1,4 +1,10 @@
-import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-item-edit-bitstream-drag-handle',
@@ -10,11 +16,11 @@ import { Component, OnInit, ViewChild, ViewContainerRef } from '@angular/core';
  * 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 {
+export class ItemEditBitstreamDragHandleComponent implements OnInit, OnDestroy {
   /**
    * The view on the drag-handle
    */
-  @ViewChild('handleView', {static: true}) handleView;
+  @ViewChild('handleView', { static: true }) handleView;
 
   constructor(private viewContainerRef: ViewContainerRef) {
   }
@@ -23,4 +29,8 @@ export class ItemEditBitstreamDragHandleComponent implements OnInit {
     this.viewContainerRef.createEmbeddedView(this.handleView);
   }
 
+  ngOnDestroy(): void {
+    this.viewContainerRef.clear();
+  }
+
 }
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
index 0f0fad2199..7d52ab220f 100644
--- 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
@@ -25,22 +25,26 @@
   <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">
+        <a *ngIf="bitstreamDownloadUrl !== null" [routerLink]="bitstreamDownloadUrl"
+           [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/', bitstream.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()" (click)="remove()"
+                [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()" (click)="undo()"
+                [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>
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
index aafa5a4fe4..04cbd4e931 100644
--- 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
@@ -1,18 +1,24 @@
-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 {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { ResponsiveColumnSizes } from '../../../../shared/responsive-table-sizes/responsive-column-sizes';
+import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 import { BrowserOnlyMockPipe } from '../../../../shared/testing/browser-only-mock.pipe';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { ItemEditBitstreamComponent } from './item-edit-bitstream.component';
 
 let comp: ItemEditBitstreamComponent;
 let fixture: ComponentFixture<ItemEditBitstreamComponent>;
@@ -21,11 +27,11 @@ 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)
+  new ResponsiveColumnSizes(6, 5, 4, 3, 3),
 ]);
 
 const format = Object.assign(new BitstreamFormat(), {
-  shortDescription: 'PDF'
+  shortDescription: 'PDF',
 });
 const bitstream = Object.assign(new Bitstream(), {
   uuid: 'bitstreamUUID',
@@ -33,14 +39,14 @@ const bitstream = Object.assign(new Bitstream(), {
   bundleName: 'ORIGINAL',
   description: 'Description',
   _links: {
-    content: { href: 'content-link' }
+    content: { href: 'content-link' },
   },
 
-  format: createSuccessfulRemoteDataObject$(format)
+  format: createSuccessfulRemoteDataObject$(format),
 });
 const fieldUpdate = {
   field: bitstream,
-  changeType: undefined
+  changeType: undefined,
 };
 const date = new Date();
 const url = 'thisUrl';
@@ -67,22 +73,25 @@ describe('ItemEditBitstreamComponent', () => {
         getLastModified: observableOf(date),
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false),
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
 
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot()],
+      imports: [
+        RouterTestingModule.withRoutes([]),
+        TranslateModule.forRoot(),
+      ],
       declarations: [
         ItemEditBitstreamComponent,
         VarDirective,
         BrowserOnlyMockPipe,
       ],
       providers: [
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService }
+        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
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
index d7fcc0cb76..b4e86d010d 100644
--- 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
@@ -1,15 +1,28 @@
-import { Component, Input, OnChanges, OnInit, SimpleChanges, ViewChild, ViewContainerRef } from '@angular/core';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { cloneDeep } from 'lodash';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
+import cloneDeep from 'lodash/cloneDeep';
 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';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../../../core/shared/bitstream-format.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
+import { ResponsiveTableSizes } from '../../../../shared/responsive-table-sizes/responsive-table-sizes';
 
 @Component({
   selector: 'ds-item-edit-bitstream',
@@ -21,12 +34,12 @@ import { getBitstreamDownloadRoute } from '../../../../app-routing-paths';
  * 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 {
+export class ItemEditBitstreamComponent implements OnChanges, OnDestroy, OnInit {
 
   /**
    * The view on the bitstream
    */
-  @ViewChild('bitstreamView', {static: true}) bitstreamView;
+  @ViewChild('bitstreamView', { static: true }) bitstreamView;
 
   /**
    * The current field, value and state of the bitstream
@@ -72,6 +85,10 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
     this.viewContainerRef.createEmbeddedView(this.bitstreamView);
   }
 
+  ngOnDestroy(): void {
+    this.viewContainerRef.clear();
+  }
+
   /**
    * Update the current bitstream and its format on changes
    * @param changes
@@ -82,7 +99,7 @@ export class ItemEditBitstreamComponent implements OnChanges, OnInit {
     this.bitstreamDownloadUrl = getBitstreamDownloadRoute(this.bitstream);
     this.format$ = this.bitstream.format.pipe(
       getFirstSucceededRemoteData(),
-      getRemoteDataPayload()
+      getRemoteDataPayload(),
     );
   }
 
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 c779c4aafa..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
@@ -1,4 +1,4 @@
-<div class="container">
+<div class="container mt-2">
   <div class="row">
     <div class="col-12">
       <h2>{{'item.edit.item-mapper.head' | translate}}</h2>
@@ -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,18 +22,18 @@
             </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">
               <div class="col-12 col-lg-6">
-                <ds-search-form id="search-form"
+                <ds-themed-search-form id="search-form"
                                 [query]="(searchOptions$ | async)?.query"
                                 [currentUrl]="'./'"
                                 [inPlaceSearch]="true"
                                 [searchPlaceholder]="'item.edit.item-mapper.search-form.placeholder' | translate"
                                 (submitSearch)="performedSearch = true">
-                </ds-search-form>
+                </ds-themed-search-form>
               </div>
             </div>
 
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
index f9962643f8..36066802bd 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.spec.ts
@@ -1,46 +1,60 @@
 import { CommonModule } from '@angular/common';
 import { EventEmitter } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { ErrorComponent } from '../../../shared/error/error.component';
 import { HostWindowService } from '../../../shared/host-window.service';
 import { LoadingComponent } from '../../../shared/loading/loading.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CollectionSelectComponent } from '../../../shared/object-select/collection-select/collection-select.component';
 import { ObjectSelectService } from '../../../shared/object-select/object-select.service';
-import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { PaginationComponent } from '../../../shared/pagination/pagination.component';
-import { SearchFormComponent } from '../../../shared/search-form/search-form.component';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchFormComponent } from '../../../shared/search-form/search-form.component';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { ObjectSelectServiceStub } from '../../../shared/testing/object-select-service.stub';
 import { RouterStub } from '../../../shared/testing/router.stub';
 import { SearchServiceStub } from '../../../shared/testing/search-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { EnumKeysPipe } from '../../../shared/utils/enum-keys-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
 import { ItemCollectionMapperComponent } from './item-collection-mapper.component';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 
 describe('ItemCollectionMapperComponent', () => {
   let comp: ItemCollectionMapperComponent;
@@ -57,26 +71,26 @@ describe('ItemCollectionMapperComponent', () => {
   const mockItem: Item = Object.assign(new Item(), {
     id: '932c7d50-d85a-44cb-b9dc-b427b12877bd',
     uuid: '932c7d50-d85a-44cb-b9dc-b427b12877bd',
-    name: 'test-item'
+    name: 'test-item',
   });
   const mockItemRD: RemoteData<Item> = createSuccessfulRemoteDataObject(mockItem);
   const mockSearchOptions = observableOf(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       id: 'search-page-configuration',
       pageSize: 10,
-      currentPage: 1
+      currentPage: 1,
     }),
-    sort: new SortOptions('dc.title', SortDirection.ASC)
+    sort: new SortOptions('dc.title', SortDirection.ASC),
   }));
   const url = 'http://test.url';
   const urlWithParam = url + '?param=value';
   const routerStub = Object.assign(new RouterStub(), {
     url: urlWithParam,
     navigateByUrl: {},
-    navigate: {}
+    navigate: {},
   });
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   const mockCollectionsRD = createSuccessfulRemoteDataObject(createPaginatedList([]));
   const itemDataServiceStub = {
@@ -85,7 +99,7 @@ describe('ItemCollectionMapperComponent', () => {
     getMappedCollectionsEndpoint: () => observableOf('rest/api/mappedCollectionsEndpoint'),
     getMappedCollections: () => observableOf(mockCollectionsRD),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearMappedCollectionsRequests: () => {}
+    clearMappedCollectionsRequests: () => {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
   };
   const collectionDataServiceStub = {
@@ -94,25 +108,25 @@ describe('ItemCollectionMapperComponent', () => {
   const searchServiceStub = Object.assign(new SearchServiceStub(), {
     search: () => observableOf(mockCollectionsRD),
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
-    clearDiscoveryRequests: () => {}
+    clearDiscoveryRequests: () => {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   });
   const activatedRouteStub = {
     parent: {
       data: observableOf({
-        dso: mockItemRD
-      })
-    }
+        dso: mockItemRD,
+      }),
+    },
   };
   const translateServiceStub = {
     get: () => observableOf('test-message of item ' + mockItem.name),
     onLangChange: new EventEmitter(),
     onTranslationChange: new EventEmitter(),
-    onDefaultLangChange: new EventEmitter()
+    onDefaultLangChange: new EventEmitter(),
   };
 
   const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
 
   beforeEach(waitForAsync(() => {
@@ -130,8 +144,8 @@ describe('ItemCollectionMapperComponent', () => {
         { provide: TranslateService, useValue: translateServiceStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: CollectionDataService, useValue: collectionDataServiceStub },
-        { provide: AuthorizationDataService, useValue: authorizationDataService }
-      ]
+        { provide: AuthorizationDataService, useValue: authorizationDataService },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
index d94abfaa9f..7c9148c9cc 100644
--- a/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
+++ b/src/app/item-page/edit-item-page/item-collection-mapper/item-collection-mapper.component.ts
@@ -1,32 +1,56 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
-import { RemoteData } from '../../../core/data/remote-data';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { Item } from '../../../core/shared/item.model';
+import { NoContent } from '../../../core/shared/NoContent.model';
 import {
   getAllSucceededRemoteData,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
-  toDSpaceObjectListRD
+  toDSpaceObjectListRD,
 } from '../../../core/shared/operators';
-import { ActivatedRoute, Router } from '@angular/router';
-import { filter, map, startWith, switchMap, take } from 'rxjs/operators';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchService } from '../../../core/shared/search/search.service';
-import { NoContent } from '../../../core/shared/NoContent.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../shared/animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
 import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
@@ -36,8 +60,8 @@ import { getItemPageRoute } from '../../item-page-routing-paths';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component for mapping collections to an item
@@ -106,7 +130,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       filter((rd: RemoteData<Item>) => hasValue(rd)),
       map((rd: RemoteData<Item>) => {
         return this.dsoNameService.getName(rd.payload);
-      })
+      }),
     );
     this.searchOptions$ = this.searchConfigService.paginatedSearchOptions;
     this.loadCollectionLists();
@@ -127,9 +151,9 @@ export class ItemCollectionMapperComponent implements OnInit {
           this.itemDataService.getMappedCollectionsEndpoint(item.id),
           undefined,
           !shouldUpdate,
-          false
+          false,
         ).pipe(
-          getAllSucceededRemoteData()
+          getAllSucceededRemoteData(),
         );
       }),
     );
@@ -142,18 +166,18 @@ export class ItemCollectionMapperComponent implements OnInit {
     const itemCollectionsAndOptions$ = observableCombineLatest(
       this.itemCollectionsRD$,
       owningCollectionRD$,
-      this.searchOptions$
+      this.searchOptions$,
     );
     this.mappedCollectionsRD$ = itemCollectionsAndOptions$.pipe(
       switchMap(([itemCollectionsRD, owningCollectionRD, searchOptions]) => {
         return this.searchService.search(Object.assign(new PaginatedSearchOptions(searchOptions), {
           query: this.buildQuery([...itemCollectionsRD.payload.page, owningCollectionRD.payload], searchOptions.query),
-          dsoTypes: [DSpaceObjectType.COLLECTION]
+          dsoTypes: [DSpaceObjectType.COLLECTION],
         }), 10000).pipe(
           toDSpaceObjectListRD(),
-          startWith(undefined)
+          startWith(undefined),
         );
-      })
+      }),
     ) as Observable<RemoteData<PaginatedList<Collection>>>;
   }
 
@@ -166,13 +190,13 @@ export class ItemCollectionMapperComponent implements OnInit {
       this.itemRD$.pipe(
         getFirstSucceededRemoteData(),
         map((rd: RemoteData<Item>) => rd.payload),
-        map((item: Item) => item.id)
+        map((item: Item) => item.id),
       ),
       this.itemCollectionsRD$.pipe(
         getFirstSucceededRemoteData(),
         map((rd: RemoteData<PaginatedList<Collection>>) => rd.payload.page),
-        map((collections: Collection[]) => collections.map((collection: Collection) => collection.id))
-      )
+        map((collections: Collection[]) => collections.map((collection: Collection) => collection.id)),
+      ),
     ]);
 
     // Map the item to the collections found in ids, excluding the collections the item is already mapped to
@@ -180,9 +204,9 @@ export class ItemCollectionMapperComponent implements OnInit {
       switchMap(([itemId, excludingIds]) =>
         observableCombineLatest(
           this.filterIds(ids, excludingIds).map((id: string) =>
-            this.itemDataService.mapToCollection(itemId, id).pipe(getFirstCompletedRemoteData())
-        ))
-      )
+            this.itemDataService.mapToCollection(itemId, id).pipe(getFirstCompletedRemoteData()),
+          )),
+      ),
     );
 
     this.showNotifications(responses$, 'item.edit.item-mapper.notifications.add');
@@ -198,9 +222,9 @@ export class ItemCollectionMapperComponent implements OnInit {
       map((itemRD: RemoteData<Item>) => itemRD.payload.id),
       switchMap((itemId: string) => observableCombineLatest(
         ids.map((id: string) =>
-          this.itemDataService.removeMappingFromCollection(itemId, id).pipe(getFirstCompletedRemoteData())
-        ))
-      )
+          this.itemDataService.removeMappingFromCollection(itemId, id).pipe(getFirstCompletedRemoteData()),
+        )),
+      ),
     );
 
     this.showNotifications(responses$, 'item.edit.item-mapper.notifications.remove');
@@ -228,7 +252,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       if (successful.length > 0) {
         const successMessages = observableCombineLatest([
           this.translateService.get(`${messagePrefix}.success.head`),
-          this.translateService.get(`${messagePrefix}.success.content`, { amount: successful.length })
+          this.translateService.get(`${messagePrefix}.success.content`, { amount: successful.length }),
         ]);
 
         successMessages.subscribe(([head, content]) => {
@@ -239,7 +263,7 @@ export class ItemCollectionMapperComponent implements OnInit {
       if (unsuccessful.length > 0) {
         const unsuccessMessages = observableCombineLatest([
           this.translateService.get(`${messagePrefix}.error.head`),
-          this.translateService.get(`${messagePrefix}.error.content`, { amount: unsuccessful.length })
+          this.translateService.get(`${messagePrefix}.error.content`, { amount: unsuccessful.length }),
         ]);
 
         unsuccessMessages.subscribe(([head, content]) => {
@@ -311,7 +335,7 @@ export class ItemCollectionMapperComponent implements OnInit {
     this.itemRD$.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      take(1)
+      take(1),
     ).subscribe((item: Item) => {
       this.router.navigate([getItemPageRoute(item)]);
     });
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
new file mode 100644
index 0000000000..22b10b28b6
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.html
@@ -0,0 +1,7 @@
+<div class="container mt-3">
+    <h2>{{'item.edit.curate.title' |translate:{item: (itemName$ |async)} }}</h2>
+    <ds-curation-form
+      *ngIf="dsoRD$ | async as dsoRD"
+      [dsoHandle]="dsoRD?.payload.handle"
+    ></ds-curation-form>
+</div>
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts
new file mode 100644
index 0000000000..a1bc23ee0e
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.spec.ts
@@ -0,0 +1,83 @@
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { ItemCurateComponent } from './item-curate.component';
+
+describe('ItemCurateComponent', () => {
+  let comp: ItemCurateComponent;
+  let fixture: ComponentFixture<ItemCurateComponent>;
+  let debugEl: DebugElement;
+
+  let routeStub;
+  let dsoNameService;
+
+  const item = Object.assign(new Item(), {
+    handle: '123456789/1',
+    metadata: { 'dc.title': ['Item Name'] },
+  });
+
+  beforeEach(waitForAsync(() => {
+    routeStub = {
+      parent: {
+        data: observableOf({
+          dso: createSuccessfulRemoteDataObject(item),
+        }),
+      },
+    };
+
+    dsoNameService = jasmine.createSpyObj('dsoNameService', {
+      getName: 'Item Name',
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ItemCurateComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: DSONameService, useValue: dsoNameService },
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemCurateComponent);
+    comp = fixture.componentInstance;
+    debugEl = fixture.debugElement;
+
+    fixture.detectChanges();
+  });
+  describe('init', () => {
+    it('should initialise the comp', () => {
+      expect(comp).toBeDefined();
+      expect(debugEl.nativeElement.innerHTML).toContain('ds-curation-form');
+    });
+
+    it('should contain the item information provided in the route', (done) => {
+      comp.dsoRD$.subscribe((value) => {
+        expect(value.payload.handle).toEqual('123456789/1');
+        done();
+      });
+    });
+
+    it('should contain the item name', (done) => {
+      comp.itemName$.subscribe((value) => {
+        expect(value).toEqual('Item Name');
+        done();
+      });
+    });
+  });
+});
diff --git a/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
new file mode 100644
index 0000000000..b9a56b6c32
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-curate/item-curate.component.ts
@@ -0,0 +1,47 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { hasValue } from '../../../shared/empty.util';
+
+/**
+ * Component for managing a collection's curation tasks
+ */
+@Component({
+  selector: 'ds-item-curate',
+  templateUrl: './item-curate.component.html',
+})
+export class ItemCurateComponent implements OnInit {
+  dsoRD$: Observable<RemoteData<Item>>;
+  itemName$: Observable<string>;
+
+  constructor(
+    private route: ActivatedRoute,
+    private dsoNameService: DSONameService,
+  ) {}
+
+  ngOnInit(): void {
+    this.dsoRD$ = this.route.parent.data.pipe(
+      take(1),
+      map((data) => data.dso),
+    );
+
+    this.itemName$ = this.dsoRD$.pipe(
+      filter((rd: RemoteData<Item>) => hasValue(rd)),
+      map((rd: RemoteData<Item>) => {
+        return this.dsoNameService.getName(rd.payload);
+      }),
+    );
+  }
+}
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..5191e705d0 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,7 +2,7 @@
     <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>
 
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..84c2d15edc 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
@@ -1,31 +1,45 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf, EMPTY } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ItemDeleteComponent } from './item-delete.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
+
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { getItemEditRoute } from '../../item-page-routing-paths';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
-import { LinkService } from '../../../core/cache/builders/link.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 {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { getItemEditRoute } from '../../item-page-routing-paths';
+import { ItemDeleteComponent } from './item-delete.component';
 
 let comp: ItemDeleteComponent;
 let fixture: ComponentFixture<ItemDeleteComponent>;
@@ -58,9 +72,9 @@ describe('ItemDeleteComponent', () => {
       isWithdrawn: true,
       metadata: {
         'dspace.entity.type': [
-          { value: 'Person' }
-        ]
-      }
+          { value: 'Person' },
+        ],
+      },
     });
 
     itemType = Object.assign(new ItemType(), {
@@ -99,17 +113,17 @@ describe('ItemDeleteComponent', () => {
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      delete: createSuccessfulRemoteDataObject$({})
+      delete: createSuccessfulRemoteDataObject$({}),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     typesSelection = {
@@ -121,7 +135,7 @@ describe('ItemDeleteComponent', () => {
       {
         getEntityTypeByLabel: createSuccessfulRemoteDataObject$(itemType),
         getEntityTypeRelationships: createSuccessfulRemoteDataObject$(createPaginatedList(types)),
-      }
+      },
     );
 
     objectUpdatesServiceStub = {
@@ -134,13 +148,13 @@ describe('ItemDeleteComponent', () => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
         getItemRelationshipsArray: observableOf(relationships),
-      }
+      },
     );
 
     linkService = jasmine.createSpyObj('linkService',
       {
         resolveLinks: relationships[0],
-      }
+      },
     );
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -159,8 +173,8 @@ describe('ItemDeleteComponent', () => {
         { provide: RelationshipTypeDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -171,7 +185,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');
@@ -210,7 +224,7 @@ describe('ItemDeleteComponent', () => {
         (comp as any).entityTypeService = jasmine.createSpyObj('entityTypeService',
           {
             getEntityTypeByLabel: EMPTY,
-          }
+          },
         );
       });
 
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..21d71ab390 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,45 +1,64 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
-import { defaultIfEmpty, filter, map, switchMap, take } from 'rxjs/operators';
 import {
-  AbstractSimpleItemActionComponent
-} from '../simple-item-action/abstract-simple-item-action.component';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import {
-  combineLatest as observableCombineLatest,
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
   combineLatest,
+  combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   Subscription,
-  BehaviorSubject,
 } from 'rxjs';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { VirtualMetadata } from '../virtual-metadata/virtual-metadata.component';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import {
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData,
-  getFirstCompletedRemoteData
-} from '../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { Item } from '../../../core/shared/item.model';
-import { MetadataValue } from '../../../core/shared/metadata.models';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
+  defaultIfEmpty,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { TranslateService } from '@ngx-translate/core';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { getItemEditRoute } from '../../item-page-routing-paths';
-import { RemoteData } from '../../../core/data/remote-data';
-import { NoContent } from '../../../core/shared/NoContent.model';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { VirtualMetadata } from '../virtual-metadata/virtual-metadata.component';
 
 @Component({
   selector: 'ds-item-delete',
-  templateUrl: '../item-delete/item-delete.component.html'
+  templateUrl: '../item-delete/item-delete.component.html',
 })
 /**
  * Component responsible for rendering the item delete page
@@ -143,17 +162,17 @@ export class ItemDeleteComponent
                 } else {
                   return includedTypes;
                 }
-              }, [])
+              }, []),
             ),
           );
-        })
+        }),
       ).subscribe((types: RelationshipType[]) => this.types$.next(types)));
     }
 
     this.subs.push(this.types$.pipe(
       take(1),
     ).subscribe((types) =>
-      this.objectUpdatesService.initialize(this.url, types, this.item.lastModified)
+      this.objectUpdatesService.initialize(this.url, types, this.item.lastModified),
     ));
   }
 
@@ -194,7 +213,7 @@ export class ItemDeleteComponent
       switchMap((relationships) =>
         this.isLeftItem(relationships[0]).pipe(
           map((isLeftItem) => isLeftItem ? relationshipType.leftwardType : relationshipType.rightwardType),
-        )
+        ),
       ),
     );
   }
@@ -212,15 +231,15 @@ export class ItemDeleteComponent
           // filter on type
           switchMap((relationships) =>
             observableCombineLatest(
-              relationships.map((relationship) => this.getRelationshipType(relationship))
+              relationships.map((relationship) => this.getRelationshipType(relationship)),
             ).pipe(
               defaultIfEmpty([]),
               map((types) => relationships.filter(
-                (relationship, index) => relationshipType.id === types[index].id
+                (relationship, index) => relationshipType.id === types[index].id,
               )),
-            )
+            ),
           ),
-        )
+        ),
       );
     }
 
@@ -242,7 +261,7 @@ export class ItemDeleteComponent
     return relationship.relationshipType.pipe(
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
-      filter((relationshipType: RelationshipType) => hasValue(relationshipType) && isNotEmpty(relationshipType.uuid))
+      filter((relationshipType: RelationshipType) => hasValue(relationshipType) && isNotEmpty(relationshipType.uuid)),
     );
   }
 
@@ -289,9 +308,9 @@ export class ItemDeleteComponent
                     metadataValue: metadata,
                   };
                 }))
-              .reduce((previous, current) => previous.concat(current))
+              .reduce((previous, current) => previous.concat(current)),
           ),
-        )
+        ),
       );
     }
 
@@ -308,7 +327,7 @@ export class ItemDeleteComponent
       getFirstSucceededRemoteData(),
       getRemoteDataPayload(),
       filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
-      map((leftItem) => leftItem.uuid === this.item.uuid)
+      map((leftItem) => leftItem.uuid === this.item.uuid),
     );
   }
 
@@ -337,22 +356,22 @@ export class ItemDeleteComponent
     this.subs.push(this.types$.pipe(
       switchMap((types) =>
         combineLatest(
-          types.map((type) => this.isSelected(type))
+          types.map((type) => this.isSelected(type)),
         ).pipe(
           defaultIfEmpty([]),
           map((selection) => types.filter(
-            (type, index) => selection[index]
+            (type, index) => selection[index],
           )),
           map((selectedTypes) => selectedTypes.map((type) => type.id)),
-        )
+        ),
       ),
       switchMap((types) =>
-        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData())
-      )
+        this.itemDataService.delete(this.item.id, types).pipe(getFirstCompletedRemoteData()),
+      ),
     ).subscribe(
       (rd: RemoteData<NoContent>) => {
         this.notify(rd.hasSucceeded);
-      }
+      },
     ));
   }
 
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
deleted file mode 100644
index 46299c1b08..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.html
+++ /dev/null
@@ -1,71 +0,0 @@
-<td>
-    <div class="metadata-field">
-        <div *ngIf="!(editable | async)">
-            <span >{{metadata?.key?.split('.').join('.&#8203;')}}</span>
-        </div>
-        <div *ngIf="(editable | async)" class="field-container">
-            <ds-validation-suggestions [disable]="fieldUpdate.changeType != 1" [suggestions]="(metadataFieldSuggestions | async)"
-                                         [(ngModel)]="metadata.key"
-                                         [url]="this.url"
-                                         [metadata]="this.metadata"
-                                  (submitSuggestion)="update(suggestionControl)"
-                                  (clickSuggestion)="update(suggestionControl)"
-                                  (typeSuggestion)="update(suggestionControl)"
-                                  (dsClickOutside)="checkValidity(suggestionControl)"
-                                  (findSuggestions)="findMetadataFieldSuggestions($event)"
-                                  #suggestionControl="ngModel"
-                                  [valid]="(valid | async) !== false"
-                                  dsAutoFocus autoFocusSelector=".suggestion_input"
-                                  [ngModelOptions]="{standalone: true}"
-            ></ds-validation-suggestions>
-        </div>
-        <small class="text-danger"
-               *ngIf="(valid | async) === false">{{"item.edit.metadata.metadatafield.invalid" | translate}}</small>
-    </div>
-</td>
-<td class="w-100">
-    <div class="value-field">
-        <div *ngIf="!(editable | async)">
-            <span class="dont-break-out preserve-line-breaks">{{metadata?.value}}</span>
-        </div>
-        <div *ngIf="(editable | async)" class="field-container">
-            <textarea class="form-control" type="textarea" attr.aria-labelledby="fieldValue" [(ngModel)]="metadata.value" [dsDebounce]
-                      (onDebounce)="update()"></textarea>
-        </div>
-    </div>
-</td>
-<td class="text-center">
-    <div class="language-field">
-        <div *ngIf="!(editable | async)">
-            <span>{{metadata?.language}}</span>
-        </div>
-        <div *ngIf="(editable | async)" class="field-container">
-            <input class="form-control" type="text" attr.aria-labelledby="fieldLang" [(ngModel)]="metadata.language" [dsDebounce]
-                   (onDebounce)="update()"/>
-        </div>
-    </div>
-</td>
-<td class="text-center">
-    <div class="btn-group edit-field">
-        <button [disabled]="!(canSetEditable() | async)" *ngIf="!(editable | async)"
-                (click)="setEditable(true)" class="btn btn-outline-primary btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.edit' | translate}}">
-            <i class="fas fa-edit fa-fw"></i>
-        </button>
-        <button [disabled]="!(canSetUneditable() | async) || (valid | async) === false" *ngIf="(editable | async)"
-                (click)="setEditable(false)" class="btn btn-outline-success btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.unedit' | translate}}">
-            <i class="fas fa-check fa-fw"></i>
-        </button>
-        <button [disabled]="!(canRemove() | async)" (click)="remove()"
-                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() | async)" (click)="removeChangesFromField()"
-                class="btn btn-outline-warning btn-sm"
-                title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
-            <i class="fas fa-undo-alt fa-fw"></i>
-        </button>
-    </div>
-</td>
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
deleted file mode 100644
index a2a6786b36..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.scss
+++ /dev/null
@@ -1,13 +0,0 @@
-.btn[disabled] {
-    color: var(--bs-gray-600);
-    border-color: var(--bs-gray-600);
-    z-index: 0; // prevent border colors jumping on hover
-}
-
-.metadata-field {
-    width: var(--ds-edit-item-metadata-field-width);
-}
-
-.language-field {
-    width: var(--ds-edit-item-language-field-width);
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
deleted file mode 100644
index 121ab4580e..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.spec.ts
+++ /dev/null
@@ -1,505 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule } from '@angular/forms';
-import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
-import { getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
-import { MetadataFieldDataService } from '../../../../core/data/metadata-field-data.service';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { MetadataField } from '../../../../core/metadata/metadata-field.model';
-import { MetadataSchema } from '../../../../core/metadata/metadata-schema.model';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { EditInPlaceFieldComponent } from './edit-in-place-field.component';
-import { MockComponent, MockDirective } from 'ng-mocks';
-import { DebounceDirective } from '../../../../shared/utils/debounce.directive';
-import { ValidationSuggestionsComponent } from '../../../../shared/input-suggestions/validation-suggestions/validation-suggestions.component';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-
-let comp: EditInPlaceFieldComponent;
-let fixture: ComponentFixture<EditInPlaceFieldComponent>;
-let de: DebugElement;
-let el: HTMLElement;
-let metadataFieldService;
-let objectUpdatesService;
-let paginatedMetadataFields;
-const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' });
-const mdSchemaRD$ = createSuccessfulRemoteDataObject$(mdSchema);
-const mdField1 = Object.assign(new MetadataField(), {
-  schema: mdSchemaRD$,
-  element: 'contributor',
-  qualifier: 'author'
-});
-const mdField2 = Object.assign(new MetadataField(), {
-  schema: mdSchemaRD$,
-  element: 'title'
-});
-const mdField3 = Object.assign(new MetadataField(), {
-  schema: mdSchemaRD$,
-  element: 'description',
-  qualifier: 'abstract',
-});
-
-const metadatum = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.description.abstract',
-  value: 'Example abstract',
-  language: 'en'
-});
-
-const url = 'http://test-url.com/test-url';
-const fieldUpdate = {
-  field: metadatum,
-  changeType: undefined
-};
-let scheduler: TestScheduler;
-
-describe('EditInPlaceFieldComponent', () => {
-
-  beforeEach(waitForAsync(() => {
-    scheduler = getTestScheduler();
-
-    paginatedMetadataFields = buildPaginatedList(undefined, [mdField1, mdField2, mdField3]);
-
-    metadataFieldService = jasmine.createSpyObj({
-      queryMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields),
-    });
-    objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-      {
-        saveChangeFieldUpdate: {},
-        saveRemoveFieldUpdate: {},
-        setEditableFieldUpdate: {},
-        setValidFieldUpdate: {},
-        removeSingleFieldUpdate: {},
-        isEditable: observableOf(false), // should always return something --> its in ngOnInit
-        isValid: observableOf(true) // should always return something --> its in ngOnInit
-      }
-    );
-
-    TestBed.configureTestingModule({
-      imports: [FormsModule, TranslateModule.forRoot()],
-      declarations: [
-        EditInPlaceFieldComponent,
-        MockDirective(DebounceDirective),
-        MockComponent(ValidationSuggestionsComponent)
-      ],
-      providers: [
-        { provide: RegistryService, useValue: metadataFieldService },
-        { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: MetadataFieldDataService, useValue: {} }
-      ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(EditInPlaceFieldComponent);
-    comp = fixture.componentInstance; // EditInPlaceFieldComponent test instance
-    de = fixture.debugElement;
-    el = de.nativeElement;
-
-    comp.url = url;
-    comp.fieldUpdate = fieldUpdate;
-    comp.metadata = metadatum;
-  });
-
-  describe('update', () => {
-    beforeEach(() => {
-      comp.update();
-      fixture.detectChanges();
-    });
-
-    it('it should call saveChangeFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.saveChangeFieldUpdate).toHaveBeenCalledWith(url, metadatum);
-    });
-  });
-
-  describe('setEditable', () => {
-    const editable = false;
-    beforeEach(() => {
-      comp.setEditable(editable);
-      fixture.detectChanges();
-    });
-
-    it('it should call setEditableFieldUpdate on the objectUpdatesService with the correct url and uuid and false', () => {
-      expect(objectUpdatesService.setEditableFieldUpdate).toHaveBeenCalledWith(url, metadatum.uuid, editable);
-    });
-  });
-
-  describe('editable is true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should contain input fields or textareas', () => {
-      const inputField = de.queryAll(By.css('input'));
-      const textAreas = de.queryAll(By.css('textarea'));
-      expect(inputField.length + textAreas.length).toBeGreaterThan(0);
-    });
-  });
-
-  describe('editable is false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should contain no input fields or textareas', () => {
-      const inputField = de.queryAll(By.css('input'));
-      const textAreas = de.queryAll(By.css('textarea'));
-      expect(inputField.length + textAreas.length).toBe(0);
-    });
-  });
-
-  describe('isValid is true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isValid.and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should not contain an error message', () => {
-      const errorMessages = de.queryAll(By.css('small.text-danger'));
-      expect(errorMessages.length).toBe(0);
-
-    });
-  });
-
-  describe('isValid is false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isValid.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('there should be an error message', () => {
-      const errorMessages = de.queryAll(By.css('small.text-danger'));
-      expect(errorMessages.length).toBeGreaterThan(0);
-
-    });
-  });
-
-  describe('remove', () => {
-    beforeEach(() => {
-      comp.remove();
-      fixture.detectChanges();
-    });
-
-    it('it should call saveRemoveFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.saveRemoveFieldUpdate).toHaveBeenCalledWith(url, metadatum);
-    });
-  });
-
-  describe('removeChangesFromField', () => {
-    beforeEach(() => {
-      comp.removeChangesFromField();
-      fixture.detectChanges();
-    });
-
-    it('it should call removeChangesFromField on the objectUpdatesService with the correct url and uuid', () => {
-      expect(objectUpdatesService.removeSingleFieldUpdate).toHaveBeenCalledWith(url, metadatum.uuid);
-    });
-  });
-
-  describe('findMetadataFieldSuggestions', () => {
-    const query = 'query string';
-
-    const metadataFieldSuggestions: InputSuggestion[] =
-      [
-        {
-          displayValue: ('dc.' + mdField1.toString()).split('.').join('.&#8203;'),
-          value: ('dc.' + mdField1.toString())
-        },
-        {
-          displayValue: ('dc.' + mdField2.toString()).split('.').join('.&#8203;'),
-          value: ('dc.' + mdField2.toString())
-        },
-        {
-          displayValue: ('dc.' + mdField3.toString()).split('.').join('.&#8203;'),
-          value: ('dc.' + mdField3.toString())
-        }
-      ];
-
-    beforeEach(fakeAsync(() => {
-      comp.findMetadataFieldSuggestions(query);
-      tick();
-      fixture.detectChanges();
-    }));
-
-    it('it should call queryMetadataFields on the metadataFieldService with the correct query', () => {
-      expect(metadataFieldService.queryMetadataFields).toHaveBeenCalledWith(query, null, true, false, followLink('schema'));
-    });
-
-    it('it should set metadataFieldSuggestions to the right value', () => {
-      const expected = 'a';
-      scheduler.expectObservable(comp.metadataFieldSuggestions).toBe(expected, { a: metadataFieldSuggestions });
-    });
-  });
-
-  describe('canSetEditable', () => {
-    describe('when editable is currently true', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        fixture.detectChanges();
-      });
-
-      it('canSetEditable should return an observable emitting false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: false });
-      });
-    });
-
-    describe('when editable is currently false', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-        fixture.detectChanges();
-      });
-
-      describe('when the fieldUpdate\'s changeType is currently not REMOVE', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = FieldChangeType.ADD;
-          fixture.detectChanges();
-        });
-        it('canSetEditable should return an observable emitting true', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: true });
-        });
-      });
-
-      describe('when the fieldUpdate\'s changeType is currently REMOVE', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = FieldChangeType.REMOVE;
-          fixture.detectChanges();
-        });
-        it('canSetEditable should return an observable emitting false', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canSetEditable()).toBe(expected, { a: false });
-        });
-      });
-    });
-  });
-
-  describe('canSetUneditable', () => {
-    describe('when editable is currently true', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        fixture.detectChanges();
-      });
-
-      it('canSetUneditable should return an observable emitting true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canSetUneditable()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when editable is currently false', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-        fixture.detectChanges();
-      });
-
-      it('canSetUneditable should return an observable emitting false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canSetUneditable()).toBe(expected, { a: false });
-      });
-    });
-  });
-
-  describe('when canSetEditable emits true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-      spyOn(comp, 'canSetEditable').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with an edit icon', () => {
-      const editIcon = de.query(By.css('i.fa-edit')).parent.nativeElement.disabled;
-      expect(editIcon).toBe(false);
-    });
-  });
-
-  describe('when canSetEditable emits false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(false));
-      spyOn(comp, 'canSetEditable').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with an edit icon', () => {
-      const editIcon = de.query(By.css('i.fa-edit')).parent.nativeElement.disabled;
-      expect(editIcon).toBe(true);
-    });
-  });
-
-  describe('when canSetUneditable emits true', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-      spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with a check icon', () => {
-      const checkButtonAttrs = de.query(By.css('i.fa-check')).parent.nativeElement.disabled;
-      expect(checkButtonAttrs).toBe(false);
-    });
-  });
-
-  describe('when canSetUneditable emits false', () => {
-    beforeEach(() => {
-      objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-      spyOn(comp, 'canSetUneditable').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with a check icon', () => {
-      const checkButtonAttrs = de.query(By.css('i.fa-check')).parent.nativeElement.disabled;
-      expect(checkButtonAttrs).toBe(true);
-    });
-  });
-
-  describe('when canRemove emits true', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canRemove').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with a trash icon', () => {
-      const trashButtonAttrs = de.query(By.css('i.fa-trash-alt')).parent.nativeElement.disabled;
-      expect(trashButtonAttrs).toBe(false);
-    });
-  });
-
-  describe('when canRemove emits false', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canRemove').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with a trash icon', () => {
-      const trashButtonAttrs = de.query(By.css('i.fa-trash-alt')).parent.nativeElement.disabled;
-      expect(trashButtonAttrs).toBe(true);
-    });
-  });
-
-  describe('when canUndo emits true', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canUndo').and.returnValue(observableOf(true));
-      fixture.detectChanges();
-    });
-    it('the div should have an enabled button with an undo icon', () => {
-      const undoIcon = de.query(By.css('i.fa-undo-alt')).parent.nativeElement.disabled;
-      expect(undoIcon).toBe(false);
-    });
-  });
-
-  describe('when canUndo emits false', () => {
-    beforeEach(() => {
-      spyOn(comp, 'canUndo').and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-    it('the div should have a disabled button with an undo icon', () => {
-      const undoIcon = de.query(By.css('i.fa-undo-alt')).parent.nativeElement.disabled;
-      expect(undoIcon).toBe(true);
-    });
-  });
-
-  describe('canRemove', () => {
-    describe('when the fieldUpdate\'s changeType is currently not REMOVE or ADD', () => {
-      beforeEach(() => {
-        comp.fieldUpdate.changeType = FieldChangeType.UPDATE;
-        fixture.detectChanges();
-      });
-      it('canRemove should return an observable emitting true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canRemove()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when the fieldUpdate\'s changeType is currently ADD', () => {
-      beforeEach(() => {
-        comp.fieldUpdate.changeType = FieldChangeType.ADD;
-        fixture.detectChanges();
-      });
-      it('canRemove should return an observable emitting false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canRemove()).toBe(expected, { a: false });
-      });
-    });
-  });
-
-  describe('canUndo', () => {
-
-    describe('when editable is currently true', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = undefined;
-        fixture.detectChanges();
-      });
-      it('canUndo should return an observable emitting true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when editable is currently false', () => {
-      describe('when the fieldUpdate\'s changeType is currently ADD, UPDATE or REMOVE', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = FieldChangeType.ADD;
-          fixture.detectChanges();
-        });
-
-        it('canUndo should return an observable emitting true', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: true });
-        });
-      });
-
-      describe('when the fieldUpdate\'s changeType is currently undefined', () => {
-        beforeEach(() => {
-          comp.fieldUpdate.changeType = undefined;
-          fixture.detectChanges();
-        });
-
-        it('canUndo should return an observable emitting false', () => {
-          const expected = '(a|)';
-          scheduler.expectObservable(comp.canUndo()).toBe(expected, { a: false });
-        });
-      });
-    });
-
-  });
-
-  describe('canEditMetadataField', () => {
-    describe('when the fieldUpdate\'s changeType is currently ADD', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = FieldChangeType.ADD;
-        fixture.detectChanges();
-      });
-      it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
-          .componentInstance.disable;
-       expect(disabledMetadataField).toBe(false);
-      });
-    });
-    describe('when the fieldUpdate\'s changeType is currently REMOVE', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = FieldChangeType.REMOVE;
-        fixture.detectChanges();
-      });
-      it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
-          .componentInstance.disable;
-        expect(disabledMetadataField).toBe(true);
-      });
-    });
-    describe('when the fieldUpdate\'s changeType is currently UPDATE', () => {
-      beforeEach(() => {
-        objectUpdatesService.isEditable.and.returnValue(observableOf(true));
-        comp.fieldUpdate.changeType = FieldChangeType.UPDATE;
-        fixture.detectChanges();
-      });
-      it('can edit metadata field', () => {
-        const disabledMetadataField = fixture.debugElement.query(By.css('ds-validation-suggestions'))
-          .componentInstance.disable;
-        expect(disabledMetadataField).toBe(true);
-      });
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts b/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
deleted file mode 100644
index f1ebecb84f..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/edit-in-place-field/edit-in-place-field.component.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import { Component, Input, OnChanges, OnInit } from '@angular/core';
-import {
-  metadataFieldsToString,
-  getFirstSucceededRemoteData
-} from '../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { RegistryService } from '../../../../core/registry/registry.service';
-import { cloneDeep } from 'lodash';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { NgModel } from '@angular/forms';
-import { MetadatumViewModel } from '../../../../core/shared/metadata.models';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-
-@Component({
-  // eslint-disable-next-line @angular-eslint/component-selector
-  selector: '[ds-edit-in-place-field]',
-  styleUrls: ['./edit-in-place-field.component.scss'],
-  templateUrl: './edit-in-place-field.component.html',
-})
-/**
- * Component that displays a single metadatum of an item on the edit page
- */
-export class EditInPlaceFieldComponent implements OnInit, OnChanges {
-  /**
-   * The current field, value and state of the metadatum
-   */
-  @Input() fieldUpdate: FieldUpdate;
-
-  /**
-   * The current url of this page
-   */
-  @Input() url: string;
-
-  /**
-   * The metadatum of this field
-   */
-  @Input() metadata: MetadatumViewModel;
-
-  /**
-   * Emits whether or not this field is currently editable
-   */
-  editable: Observable<boolean>;
-
-  /**
-   * Emits whether or not this field is currently valid
-   */
-  valid: Observable<boolean>;
-
-  /**
-   * The current suggestions for the metadatafield when editing
-   */
-  metadataFieldSuggestions: BehaviorSubject<InputSuggestion[]> = new BehaviorSubject([]);
-
-  constructor(
-    private registryService: RegistryService,
-    private objectUpdatesService: ObjectUpdatesService,
-  ) {
-  }
-
-  /**
-   * Sets up an observable that keeps track of the current editable and valid state of this field
-   */
-  ngOnInit(): void {
-    this.editable = this.objectUpdatesService.isEditable(this.url, this.metadata.uuid);
-    this.valid = this.objectUpdatesService.isValid(this.url, this.metadata.uuid);
-  }
-
-  /**
-   * Sends a new change update for this field to the object updates service
-   */
-  update(ngModel?: NgModel) {
-    this.objectUpdatesService.saveChangeFieldUpdate(this.url, cloneDeep(this.metadata));
-    if (hasValue(ngModel)) {
-      this.checkValidity(ngModel);
-    }
-  }
-
-  /**
-   * Method to check the validity of a form control
-   * @param ngModel
-   */
-  public checkValidity(ngModel: NgModel) {
-    ngModel.control.setValue(ngModel.viewModel);
-    ngModel.control.updateValueAndValidity();
-    this.objectUpdatesService.setValidFieldUpdate(this.url, this.metadata.uuid, ngModel.control.valid);
-  }
-
-  /**
-   * Sends a new editable state for this field to the service to change it
-   * @param editable The new editable state for this field
-   */
-  setEditable(editable: boolean) {
-    this.objectUpdatesService.setEditableFieldUpdate(this.url, this.metadata.uuid, editable);
-  }
-
-  /**
-   * Sends a new remove update for this field to the object updates service
-   */
-  remove() {
-    this.objectUpdatesService.saveRemoveFieldUpdate(this.url, cloneDeep(this.metadata));
-  }
-
-  /**
-   * Notifies the object updates service that the updates for the current field can be removed
-   */
-  removeChangesFromField() {
-    this.objectUpdatesService.removeSingleFieldUpdate(this.url, this.metadata.uuid);
-  }
-
-  /**
-   * Sets the current metadatafield based on the fieldUpdate input field
-   */
-  ngOnChanges(): void {
-    this.metadata = cloneDeep(this.fieldUpdate.field) as MetadatumViewModel;
-  }
-
-  /**
-   * Requests all metadata fields that contain the query string in their key
-   * Then sets all found metadata fields as metadataFieldSuggestions
-   * Ignores fields from metadata schemas "relation" and "relationship"
-   * @param query The query to look for
-   */
-  findMetadataFieldSuggestions(query: string) {
-    if (isNotEmpty(query)) {
-      return this.registryService.queryMetadataFields(query, null, true, false, followLink('schema')).pipe(
-        getFirstSucceededRemoteData(),
-        metadataFieldsToString(),
-      ).subscribe((fieldNames: string[]) => {
-          this.setInputSuggestions(fieldNames);
-        });
-    } else {
-      this.metadataFieldSuggestions.next([]);
-    }
-  }
-
-  /**
-   * Set the list of input suggestion with the given Metadata fields, which all require a resolved MetadataSchema
-   * @param fields  list of Metadata fields, which all require a resolved MetadataSchema
-   */
-  setInputSuggestions(fields: string[]) {
-    this.metadataFieldSuggestions.next(
-      fields.map((fieldName: string) => {
-        return {
-          displayValue: fieldName.split('.').join('.&#8203;'),
-          value: fieldName
-        };
-      })
-    );
-  }
-
-  /**
-   * Check if a user should be allowed to edit this field
-   * @return an observable that emits true when the user should be able to edit this field and false when they should not
-   */
-  canSetEditable(): Observable<boolean> {
-    return this.editable.pipe(
-      map((editable: boolean) => {
-        if (editable) {
-          return false;
-        } else {
-          return this.fieldUpdate.changeType !== FieldChangeType.REMOVE;
-        }
-      })
-    );
-  }
-
-  /**
-   * Check if a user should be allowed to disabled editing this field
-   * @return an observable that emits true when the user should be able to disable editing this field and false when they should not
-   */
-  canSetUneditable(): Observable<boolean> {
-    return this.editable;
-  }
-
-  /**
-   * Check if a user should be allowed to remove this field
-   * @return an observable that emits true when the user should be able to remove this field and false when they should not
-   */
-  canRemove(): Observable<boolean> {
-    return observableOf(this.fieldUpdate.changeType !== FieldChangeType.REMOVE && this.fieldUpdate.changeType !== FieldChangeType.ADD);
-  }
-
-  /**
-   * Check if a user should be allowed to undo changes to this field
-   * @return an observable that emits true when the user should be able to undo changes to this field and false when they should not
-   */
-  canUndo(): Observable<boolean> {
-    return this.editable.pipe(
-      map((editable: boolean) => this.fieldUpdate.changeType >= 0 || editable)
-    );
-  }
-
-  protected isNotEmpty(value): boolean {
-    return isNotEmpty(value);
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
deleted file mode 100644
index 81dd39c238..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<div class="item-metadata">
-  <div class="button-row top d-flex mb-2 space-children-mr">
-    <button class="mr-auto btn btn-success"
-            (click)="add()"><i
-      class="fas fa-plus"></i>
-      <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.add-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) || !(isValid() | 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>
-    <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>
-  </div>
-  <table class="table table-responsive table-striped table-bordered"
-         *ngIf="((updates$ | async)| dsObjectValues).length > 0">
-    <thead>
-    <tr>
-      <th><span id="fieldName">{{'item.edit.metadata.headers.field' | translate}}</span></th>
-      <th><span id="fieldValue">{{'item.edit.metadata.headers.value' | translate}}</span></th>
-      <th class="text-center"><span id="fieldLang">{{'item.edit.metadata.headers.language' | translate}}</span></th>
-      <th class="text-center">{{'item.edit.metadata.headers.edit' | translate}}</th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr *ngFor="let updateValue of ((updates$ | async)| dsObjectValues); trackBy: trackUpdate"
-        ds-edit-in-place-field
-        [fieldUpdate]="updateValue || {}"
-        [url]="url"
-        [ngClass]="{
-                'table-warning': updateValue.changeType === 0,
-                'table-danger': updateValue.changeType === 2,
-                'table-success': updateValue.changeType === 1
-            }">
-
-    </tr>
-    </tbody>
-  </table>
-  <div *ngIf="((updates$ | async)| dsObjectValues).length == 0">
-    <ds-alert [content]="'item.edit.metadata.empty'" [type]="AlertTypeEnum.Info"></ds-alert>
-  </div>
-  <div class="button-row bottom">
-    <div class="mt-2 float-right space-children-mr ml-gap">
-      <button class="btn btn-warning" *ngIf="isReinstatable() | async"
-              (click)="reinstate()"><i
-        class="fas fa-undo-alt"></i> {{"item.edit.metadata.reinstate-button" | translate}}
-      </button>
-      <button class="btn btn-primary" [disabled]="!(hasChanges() | async)"
-              (click)="submit()"><i
-        class="fas fa-save"></i> {{"item.edit.metadata.save-button" | translate}}
-      </button>
-      <button class="btn btn-danger" *ngIf="!(isReinstatable() | async)"
-              [disabled]="!(hasChanges() | async)"
-              (click)="discard()"><i
-        class="fas fa-times"></i> {{"item.edit.metadata.discard-button" | translate}}
-      </button>
-    </div>
-  </div>
-</div>
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
deleted file mode 100644
index 96f785e1a1..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.button-row {
-    .btn {
-        margin-right: var(--ds-gap);
-
-        &:last-child {
-            margin-right: 0;
-        }
-
-        @media screen and (min-width: map-get($grid-breakpoints, sm)) {
-            min-width: var(--ds-edit-item-button-min-width);
-        }
-    }
-
-    &.top .btn {
-        margin-top: calc(var(--bs-spacer) / 2);
-        margin-bottom: calc(var(--bs-spacer) / 2);
-    }
-
-
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
deleted file mode 100644
index 44ed6c783f..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.spec.ts
+++ /dev/null
@@ -1,290 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
-import { getTestScheduler } from 'jasmine-marbles';
-import { ItemMetadataComponent } from './item-metadata.component';
-import { TestScheduler } from 'rxjs/testing';
-import { SharedModule } from '../../../shared/shared.module';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateModule } from '@ngx-translate/core';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { By } from '@angular/platform-browser';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { MetadatumViewModel } from '../../../core/shared/metadata.models';
-import { RegistryService } from '../../../core/registry/registry.service';
-import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
-import { MetadataField } from '../../../core/metadata/metadata-field.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { DSOSuccessResponse } from '../../../core/cache/response.models';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
-
-let comp: any;
-let fixture: ComponentFixture<ItemMetadataComponent>;
-let de: DebugElement;
-let el: HTMLElement;
-let objectUpdatesService;
-const infoNotification: INotification = new Notification('id', NotificationType.Info, 'info');
-const warningNotification: INotification = new Notification('id', NotificationType.Warning, 'warning');
-const successNotification: INotification = new Notification('id', NotificationType.Success, 'success');
-const date = new Date();
-const router = new RouterStub();
-let metadataFieldService;
-let paginatedMetadataFields;
-let routeStub;
-let objectCacheService;
-
-const mdSchema = Object.assign(new MetadataSchema(), { prefix: 'dc' });
-const mdField1 = Object.assign(new MetadataField(), {
-  schema: mdSchema,
-  element: 'contributor',
-  qualifier: 'author'
-});
-const mdField2 = Object.assign(new MetadataField(), { schema: mdSchema, element: 'title' });
-const mdField3 = Object.assign(new MetadataField(), {
-  schema: mdSchema,
-  element: 'description',
-  qualifier: 'abstract'
-});
-
-let itemService;
-const notificationsService = jasmine.createSpyObj('notificationsService',
-  {
-    info: infoNotification,
-    warning: warningNotification,
-    success: successNotification
-  }
-);
-const metadatum1 = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.description.abstract',
-  value: 'Example abstract',
-  language: 'en'
-});
-
-const metadatum2 = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.title',
-  value: 'Title test',
-  language: 'de'
-});
-
-const metadatum3 = Object.assign(new MetadatumViewModel(), {
-  key: 'dc.contributor.author',
-  value: 'Shakespeare, William',
-});
-
-const url = 'http://test-url.com/test-url';
-
-router.url = url;
-
-const fieldUpdate1 = {
-  field: metadatum1,
-  changeType: undefined
-};
-
-const fieldUpdate2 = {
-  field: metadatum2,
-  changeType: FieldChangeType.REMOVE
-};
-
-const fieldUpdate3 = {
-  field: metadatum3,
-  changeType: undefined
-};
-
-const operation1 = { op: 'remove', path: '/metadata/dc.title/1' };
-
-let scheduler: TestScheduler;
-let item;
-describe('ItemMetadataComponent', () => {
-  beforeEach(waitForAsync(() => {
-      item = Object.assign(new Item(), {
-          metadata: {
-            [metadatum1.key]: [metadatum1],
-            [metadatum2.key]: [metadatum2],
-            [metadatum3.key]: [metadatum3]
-          },
-          _links: {
-            self: {
-              href: 'https://rest.api/core/items/a36d8bd2-8e8c-4969-9b1f-a574c2064983'
-            }
-          }
-        },
-        {
-          lastModified: date
-        }
-      )
-      ;
-      itemService = jasmine.createSpyObj('itemService', {
-        update: createSuccessfulRemoteDataObject$(item),
-        commitUpdates: {},
-        patch: observableOf(new DSOSuccessResponse(['item-selflink'], 200, 'OK')),
-        findByHref: createSuccessfulRemoteDataObject$(item)
-      });
-      routeStub = {
-        data: observableOf({}),
-        parent: {
-          data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
-        }
-      };
-      paginatedMetadataFields = createPaginatedList([mdField1, mdField2, mdField3]);
-
-      metadataFieldService = jasmine.createSpyObj({
-        getAllMetadataFields: createSuccessfulRemoteDataObject$(paginatedMetadataFields)
-      });
-      scheduler = getTestScheduler();
-      objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
-        {
-          getFieldUpdates: observableOf({
-            [metadatum1.uuid]: fieldUpdate1,
-            [metadatum2.uuid]: fieldUpdate2,
-            [metadatum3.uuid]: fieldUpdate3
-          }),
-          saveAddFieldUpdate: {},
-          discardFieldUpdates: {},
-          reinstateFieldUpdates: observableOf(true),
-          initialize: {},
-          getUpdatedFields: observableOf([metadatum1, metadatum2, metadatum3]),
-          getLastModified: observableOf(date),
-          hasUpdates: observableOf(true),
-          isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-          isValidPage: observableOf(true),
-          createPatch: observableOf([
-            operation1
-          ])
-        }
-      );
-      objectCacheService = jasmine.createSpyObj('objectCacheService', ['addPatch']);
-
-      TestBed.configureTestingModule({
-        imports: [SharedModule, TranslateModule.forRoot()],
-        declarations: [ItemMetadataComponent],
-        providers: [
-          { provide: ItemDataService, useValue: itemService },
-          { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-          { provide: Router, useValue: router },
-          { provide: ActivatedRoute, useValue: routeStub },
-          { provide: NotificationsService, useValue: notificationsService },
-          { provide: RegistryService, useValue: metadataFieldService },
-          { provide: ObjectCacheService, useValue: objectCacheService },
-        ], schemas: [
-          NO_ERRORS_SCHEMA
-        ]
-      }).compileComponents();
-    })
-  );
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemMetadataComponent);
-    comp = fixture.componentInstance; // EditInPlaceFieldComponent test instance
-    de = fixture.debugElement;
-    el = de.nativeElement;
-    comp.url = url;
-    fixture.detectChanges();
-  });
-
-  describe('add', () => {
-    const md = new MetadatumViewModel();
-    beforeEach(() => {
-      comp.add(md);
-    });
-
-    it('it should call saveAddFieldUpdate on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.saveAddFieldUpdate).toHaveBeenCalledWith(url, md);
-    });
-  });
-
-  describe('discard', () => {
-    beforeEach(() => {
-      comp.discard();
-    });
-
-    it('it should call discardFieldUpdates on the objectUpdatesService with the correct url and notification', () => {
-      expect(objectUpdatesService.discardFieldUpdates).toHaveBeenCalledWith(url, infoNotification);
-    });
-  });
-
-  describe('reinstate', () => {
-    beforeEach(() => {
-      comp.reinstate();
-    });
-
-    it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url', () => {
-      expect(objectUpdatesService.reinstateFieldUpdates).toHaveBeenCalledWith(url);
-    });
-  });
-
-  describe('submit', () => {
-    beforeEach(() => {
-      comp.submit();
-    });
-
-    it('it should call reinstateFieldUpdates on the objectUpdatesService with the correct url and metadata', () => {
-      expect(objectUpdatesService.createPatch).toHaveBeenCalledWith(url);
-      expect(itemService.patch).toHaveBeenCalledWith(comp.item, [operation1]);
-      expect(objectUpdatesService.getFieldUpdates).toHaveBeenCalledWith(url, comp.item.metadataAsList);
-    });
-  });
-
-  describe('hasChanges', () => {
-    describe('when the objectUpdatesService\'s hasUpdated method returns true', () => {
-      beforeEach(() => {
-        objectUpdatesService.hasUpdates.and.returnValue(observableOf(true));
-      });
-
-      it('should return an observable that emits true', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.hasChanges()).toBe(expected, { a: true });
-      });
-    });
-
-    describe('when the objectUpdatesService\'s hasUpdated method returns false', () => {
-      beforeEach(() => {
-        objectUpdatesService.hasUpdates.and.returnValue(observableOf(false));
-      });
-
-      it('should return an observable that emits false', () => {
-        const expected = '(a|)';
-        scheduler.expectObservable(comp.hasChanges()).toBe(expected, { a: false });
-      });
-    });
-  });
-
-  describe('changeType is UPDATE', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.UPDATE;
-      fixture.detectChanges();
-    });
-    it('the div should have class table-warning', () => {
-      const element = de.queryAll(By.css('tr'))[1].nativeElement;
-      expect(element.classList).toContain('table-warning');
-    });
-  });
-
-  describe('changeType is ADD', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.ADD;
-      fixture.detectChanges();
-    });
-    it('the div should have class table-success', () => {
-      const element = de.queryAll(By.css('tr'))[1].nativeElement;
-      expect(element.classList).toContain('table-success');
-    });
-  });
-
-  describe('changeType is REMOVE', () => {
-    beforeEach(() => {
-      fieldUpdate1.changeType = FieldChangeType.REMOVE;
-      fixture.detectChanges();
-    });
-    it('the div should have class table-danger', () => {
-      const element = de.queryAll(By.css('tr'))[1].nativeElement;
-      expect(element.classList).toContain('table-danger');
-    });
-  });
-});
diff --git a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
deleted file mode 100644
index 5030ef3bb3..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-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 { cloneDeep } from 'lodash';
-import { first, switchMap } from 'rxjs/operators';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { MetadataValue, MetadatumViewModel } from '../../../core/shared/metadata.models';
-import { AbstractItemUpdateComponent } from '../abstract-item-update/abstract-item-update.component';
-import { UpdateDataService } from '../../../core/data/update-data.service';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { Operation } from 'fast-json-patch';
-import { MetadataPatchOperationService } from '../../../core/data/object-updates/patch-operation-service/metadata-patch-operation.service';
-
-@Component({
-  selector: 'ds-item-metadata',
-  styleUrls: ['./item-metadata.component.scss'],
-  templateUrl: './item-metadata.component.html',
-})
-/**
- * Component for displaying an item's metadata edit page
- */
-export class ItemMetadataComponent extends AbstractItemUpdateComponent {
-
-  /**
-   * The AlertType enumeration
-   * @type {AlertType}
-   */
-  public AlertTypeEnum = AlertType;
-
-  /**
-   * A custom update service to use for adding and committing patches
-   * This will default to the ItemDataService
-   */
-  @Input() updateService: UpdateDataService<Item>;
-
-  constructor(
-    public itemService: ItemDataService,
-    public objectUpdatesService: ObjectUpdatesService,
-    public router: Router,
-    public notificationsService: NotificationsService,
-    public translateService: TranslateService,
-    public route: ActivatedRoute,
-  ) {
-    super(itemService, objectUpdatesService, router, notificationsService, translateService, route);
-  }
-
-  /**
-   * Set up and initialize all fields
-   */
-  ngOnInit(): void {
-    super.ngOnInit();
-    if (hasNoValue(this.updateService)) {
-      this.updateService = this.itemService;
-    }
-  }
-
-  /**
-   * Initialize the values and updates of the current item's metadata fields
-   */
-  public initializeUpdates(): void {
-    this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList);
-    }
-
-  /**
-   * Initialize the prefix for notification messages
-   */
-  public initializeNotificationsPrefix(): void {
-    this.notificationsPrefix = 'item.edit.metadata.notifications.';
-  }
-
-  /**
-   * Sends a new add update for a field to the object updates service
-   * @param metadata The metadata to add, if no parameter is supplied, create a new Metadatum
-   */
-  add(metadata: MetadatumViewModel = new MetadatumViewModel()) {
-    this.objectUpdatesService.saveAddFieldUpdate(this.url, metadata);
-  }
-
-  /**
-   * Sends all initial values of this item to the object updates service
-   */
-  public initializeOriginalFields() {
-    this.objectUpdatesService.initialize(this.url, this.item.metadataAsList, this.item.lastModified, MetadataPatchOperationService);
-  }
-
-  /**
-   * Requests all current metadata for this item and requests the item service to update the item
-   * Makes sure the new version of the item is rendered on the page
-   */
-  public submit() {
-    this.isValid().pipe(first()).subscribe((isValid) => {
-      if (isValid) {
-        this.objectUpdatesService.createPatch(this.url).pipe(
-          first(),
-          switchMap((patch: Operation[]) => {
-            return this.updateService.patch(this.item, patch).pipe(
-              getFirstCompletedRemoteData()
-            );
-          })
-        ).subscribe(
-          (rd: RemoteData<Item>) => {
-            if (rd.hasFailed) {
-              this.notificationsService.error(this.getNotificationTitle('error'), rd.errorMessage);
-            } else {
-              this.item = rd.payload;
-              this.checkAndFixMetadataUUIDs();
-              this.initializeOriginalFields();
-              this.updates$ = this.objectUpdatesService.getFieldUpdates(this.url, this.item.metadataAsList);
-              this.notificationsService.success(this.getNotificationTitle('saved'), this.getNotificationContent('saved'));
-            }
-          }
-        );
-      } else {
-        this.notificationsService.error(this.getNotificationTitle('invalid'), this.getNotificationContent('invalid'));
-      }
-    });
-  }
-
-  /**
-   * Check for empty metadata UUIDs and fix them (empty UUIDs would break the object-update service)
-   */
-  checkAndFixMetadataUUIDs() {
-    const metadata = cloneDeep(this.item.metadata);
-    Object.keys(this.item.metadata).forEach((key: string) => {
-      metadata[key] = this.item.metadata[key].map((value) => hasValue(value.uuid) ? value : Object.assign(new MetadataValue(), value));
-    });
-    this.item.metadata = metadata;
-  }
-}
diff --git a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts b/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
deleted file mode 100644
index 53f0120015..0000000000
--- a/src/app/item-page/edit-item-page/item-metadata/themed-item-metadata.component.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { UpdateDataService } from '../../../core/data/update-data.service';
-import { ItemMetadataComponent } from './item-metadata.component';
-import { ThemedComponent } from '../../../shared/theme-support/themed.component';
-
-@Component({
-  selector: 'ds-themed-item-metadata',
-  styleUrls: [],
-  templateUrl: './../../../shared/theme-support/themed.component.html',
-})
-/**
- * Component for displaying an item's metadata edit page
- */
-export class ThemedItemMetadataComponent extends ThemedComponent<ItemMetadataComponent> {
-
-  @Input() item: Item;
-
-  @Input() updateService: UpdateDataService<Item>;
-
-  protected inAndOutputNames: (keyof ItemMetadataComponent & keyof this)[] = ['item', 'updateService'];
-
-  protected getComponentName(): string {
-    return 'ItemMetadataComponent';
-  }
-
-  protected importThemedComponent(themeName: string): Promise<any> {
-    return import(`../../../../themes/${themeName}/app/item-page/edit-item-page/item-metadata/item-metadata.component`);
-  }
-
-  protected importUnthemedComponent(): Promise<any> {
-    return import(`./item-metadata.component`);
-  }
-}
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 8cb8d1c1c4..d136f003f4 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">
@@ -20,9 +20,14 @@
             <div class="row">
                 <div class="col-12">
                     <p>
-                        <input type="checkbox" name="tc" [(ngModel)]="inheritPolicies" id="inheritPoliciesCheckbox">
-                        <label for="inheritPoliciesCheckbox">{{'item.edit.move.inheritpolicies.checkbox' |
-                                translate}}</label>
+                      <label for="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>
                     <p>
                         {{'item.edit.move.inheritpolicies.description' | translate}}
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
index d200891629..f1cf223b25 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.spec.ts
@@ -1,28 +1,35 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { RequestService } from '../../../core/data/request.service';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { ItemMoveComponent } from './item-move.component';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockRequestService } from '../../../shared/mocks/request.service.mock';
+import { ItemMoveComponent } from './item-move.component';
 
 describe('ItemMoveComponent', () => {
   let comp: ItemMoveComponent;
@@ -31,22 +38,22 @@ describe('ItemMoveComponent', () => {
   const mockItem = Object.assign(new Item(), {
     id: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
 
   const itemPageUrl = `fake-url/${mockItem.id}`;
   const routerStub = Object.assign(new RouterStub(), {
-    url: `${itemPageUrl}/edit`
+    url: `${itemPageUrl}/edit`,
   });
 
   const collection1 = Object.assign(new Collection(), {
     uuid: 'collection-uuid-1',
-    name: 'Test collection 1'
+    name: 'Test collection 1',
   });
 
   const collection2 = Object.assign(new Collection(), {
     uuid: 'collection-uuid-2',
-    name: 'Test collection 2'
+    name: 'Test collection 2',
   });
 
   let itemDataService;
@@ -67,9 +74,9 @@ describe('ItemMoveComponent', () => {
         id: 'item1',
         owningCollection: createSuccessfulRemoteDataObject$(Object.assign(new Collection(), {
           id: 'originalOwningCollection',
-        }))
-      }))
-    })
+        })),
+      })),
+    }),
   };
 
   const mockSearchService = {
@@ -77,13 +84,13 @@ describe('ItemMoveComponent', () => {
       return createSuccessfulRemoteDataObject$(createPaginatedList([
         {
           indexableObject: collection1,
-          hitHighlights: {}
+          hitHighlights: {},
         }, {
           indexableObject: collection2,
-          hitHighlights: {}
-        }
+          hitHighlights: {},
+        },
       ]));
-    }
+    },
   };
 
   const notificationsServiceStub = new NotificationsServiceStub();
@@ -102,8 +109,8 @@ describe('ItemMoveComponent', () => {
         { provide: SearchService, useValue: mockSearchService },
         { provide: RequestService, useValue: getMockRequestService() },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
     fixture = TestBed.createComponent(ItemMoveComponent);
     comp = fixture.componentInstance;
@@ -134,9 +141,10 @@ describe('ItemMoveComponent', () => {
         });
         comp.selectedCollectionName = 'selected-collection-id';
         comp.selectedCollection = collection1;
+        comp.inheritPolicies = false;
         comp.moveToCollection();
 
-        expect(itemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1);
+        expect(itemDataService.moveToCollection).toHaveBeenCalledWith('item-id', collection1, false);
       });
       it('should call notificationsService success message on success', () => {
         comp.moveToCollection();
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.ts b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
index b7ab761fe5..b5f382fd3f 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.ts
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.ts
@@ -1,25 +1,42 @@
-import { Component, OnInit } from '@angular/core';
-import { map, switchMap } from 'rxjs/operators';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Item } from '../../../core/shared/item.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import {
-  getAllSucceededRemoteDataPayload, getFirstCompletedRemoteData, getFirstSucceededRemoteData, getRemoteDataPayload,
-} from '../../../core/shared/operators';
-import { ItemDataService } from '../../../core/data/item-data.service';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Collection } from '../../../core/shared/collection.model';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
 import { RequestService } from '../../../core/data/request.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  getItemEditRoute,
+  getItemPageRoute,
+} from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-move',
-  templateUrl: './item-move.component.html'
+  templateUrl: './item-move.component.html',
 })
 /**
  * Component that handles the moving of an item to a different collection
@@ -57,19 +74,20 @@ export class ItemMoveComponent implements OnInit {
               private searchService: SearchService,
               private translateService: TranslateService,
               private requestService: RequestService,
+              protected dsoNameService: DSONameService,
   ) {}
 
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
-      map((data) => data.dso), getFirstSucceededRemoteData()
+      map((data) => data.dso), getFirstSucceededRemoteData(),
     ) as Observable<RemoteData<Item>>;
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((item) => getItemPageRoute(item))
+      map((item) => getItemPageRoute(item)),
     );
     this.itemRD$.subscribe((rd) => {
-        this.item = rd.payload;
-      }
+      this.item = rd.payload;
+    },
     );
     this.itemRD$.pipe(
       getFirstSucceededRemoteData(),
@@ -88,7 +106,7 @@ export class ItemMoveComponent implements OnInit {
    */
   selectDso(data: any): void {
     this.selectedCollection = data;
-    this.selectedCollectionName = data.name;
+    this.selectedCollectionName = this.dsoNameService.getName(data);
     this.canSubmit = true;
   }
 
@@ -104,7 +122,7 @@ export class ItemMoveComponent implements OnInit {
    */
   moveToCollection() {
     this.processing = true;
-    const move$ = this.itemDataService.moveToCollection(this.item.id, this.selectedCollection)
+    const move$ = this.itemDataService.moveToCollection(this.item.id, this.selectedCollection, this.inheritPolicies)
       .pipe(getFirstCompletedRemoteData());
 
     move$.subscribe((response: RemoteData<any>) => {
@@ -122,9 +140,9 @@ export class ItemMoveComponent implements OnInit {
           this.item.id,
           false,
           true,
-          followLink('owningCollection')
-      )),
-      getFirstCompletedRemoteData()
+          followLink('owningCollection'),
+        )),
+      getFirstCompletedRemoteData(),
     ).subscribe(() => {
       this.processing = false;
       this.router.navigate([getItemEditRoute(this.item)]);
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 ecbc19aea8..85c6a2cca1 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
@@ -5,12 +5,12 @@
 </div>
 <div class="col-9 float-left action-button">
   <span *ngIf="operation.authorized">
-    <button class="btn btn-outline-primary" [disabled]="operation.disabled" [routerLink]="operation.operationUrl">
+    <button class="btn btn-outline-primary" [disabled]="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">
+    <button class="btn btn-outline-primary" [disabled]="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..b8dd51282f 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
@@ -1,9 +1,13 @@
-import { ItemOperation } from './itemOperation.model';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemOperationComponent } from './item-operation.component';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemOperationComponent } from './item-operation.component';
+import { ItemOperation } from './itemOperation.model';
 
 describe('ItemOperationComponent', () => {
   let itemOperation: ItemOperation;
@@ -14,7 +18,7 @@ describe('ItemOperationComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
-      declarations: [ItemOperationComponent]
+      declarations: [ItemOperationComponent],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
index 76d056df95..1ad20d4d12 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.ts
@@ -1,9 +1,13 @@
-import {Component, Input} from '@angular/core';
-import {ItemOperation} from './itemOperation.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ItemOperation } from './itemOperation.model';
 
 @Component({
   selector: 'ds-item-operation',
-  templateUrl: './item-operation.component.html'
+  templateUrl: './item-operation.component.html',
 })
 /**
  * Operation that can be performed on an item
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..3c2cb4486f
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-access-control.guard.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+
+@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-bitstreams.guard.ts b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
index 764c6ac7c8..43eef68fdb 100644
--- a/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-bitstreams.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-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'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage bitstreams rights
diff --git a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
index 2380377aea..dcd947c9aa 100644
--- a/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-collection-mapper.guard.ts
@@ -1,15 +1,23 @@
 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 {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage mappings rights
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..a096caf937
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-curate.guard.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+
+@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-page-metadata.guard.ts b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts
index a6846bec4e..e0c49283f3 100644
--- a/src/app/item-page/edit-item-page/item-page-metadata.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-metadata.guard.ts
@@ -1,15 +1,23 @@
 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 {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring edit metadata rights
diff --git a/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
new file mode 100644
index 0000000000..7eac0b0499
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-page-register-doi.guard.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Guard for preventing unauthorized access to certain {@link Item} pages requiring DOI registration rights
+ */
+export class ItemPageRegisterDoiGuard extends DsoPageSingleFeatureGuard<Item> {
+  constructor(protected resolver: ItemPageResolver,
+              protected authorizationService: AuthorizationDataService,
+              protected router: Router,
+              protected authService: AuthService) {
+    super(resolver, authorizationService, router, authService);
+  }
+
+  /**
+   * Check DOI registration authorization rights
+   */
+  getFeatureID(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID> {
+    return observableOf(FeatureID.CanRegisterDOI);
+  }
+}
diff --git a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
index 88c9c20b12..a160301e44 100644
--- a/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-reinstate.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-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'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring reinstate rights
diff --git a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts
index 77da92ae02..c6cc86a198 100644
--- a/src/app/item-page/edit-item-page/item-page-relationships.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-relationships.guard.ts
@@ -1,15 +1,23 @@
 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 {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage relationships rights
diff --git a/src/app/item-page/edit-item-page/item-page-status.guard.ts b/src/app/item-page/edit-item-page/item-page-status.guard.ts
index 98f963a4be..e9d3640bda 100644
--- a/src/app/item-page/edit-item-page/item-page-status.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-status.guard.ts
@@ -1,15 +1,23 @@
 import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSomeFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
-import { AuthService } from '../../core/auth/auth.service';
-import { DsoPageSomeFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-some-feature.guard';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring any of the rights required for
@@ -27,6 +35,6 @@ export class ItemPageStatusGuard extends DsoPageSomeFeatureGuard<Item> {
    * Check authorization rights
    */
   getFeatureIDs(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<FeatureID[]> {
-    return observableOf([FeatureID.CanManageMappings, FeatureID.WithdrawItem, FeatureID.ReinstateItem, FeatureID.CanManagePolicies, FeatureID.CanMakePrivate, FeatureID.CanDelete, FeatureID.CanMove]);
+    return observableOf([FeatureID.CanManageMappings, FeatureID.WithdrawItem, FeatureID.ReinstateItem, FeatureID.CanManagePolicies, FeatureID.CanMakePrivate, FeatureID.CanDelete, FeatureID.CanMove, FeatureID.CanRegisterDOI]);
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts
index dccdd9e641..864cca9c5a 100644
--- a/src/app/item-page/edit-item-page/item-page-version-history.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-version-history.guard.ts
@@ -1,15 +1,23 @@
 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 {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring manage versions rights
diff --git a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
index de9b7d0147..8370cbed16 100644
--- a/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
+++ b/src/app/item-page/edit-item-page/item-page-withdraw.guard.ts
@@ -1,15 +1,23 @@
-import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
-import { Item } from '../../core/shared/item.model';
 import { Injectable } from '@angular/core';
-import { ItemPageResolver } from '../item-page.resolver';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
-import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Item } from '../../core/shared/item.model';
+import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring withdraw rights
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..cf3c4ed822 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
@@ -1,21 +1,32 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ItemPrivateComponent } from './item-private.component';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../../core/cache/response.models';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ItemPrivateComponent } from './item-private.component';
 
 let comp: ItemPrivateComponent;
 let fixture: ComponentFixture<ItemPrivateComponent>;
@@ -36,22 +47,22 @@ describe('ItemPrivateComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem)
+      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -65,8 +76,8 @@ describe('ItemPrivateComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -80,7 +91,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-private/item-private.component.ts b/src/app/item-page/edit-item-page/item-private/item-private.component.ts
index 937eaad1c4..8e4da073d2 100644
--- a/src/app/item-page/edit-item-page/item-private/item-private.component.ts
+++ b/src/app/item-page/edit-item-page/item-private/item-private.component.ts
@@ -1,18 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-private',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the make item private page
@@ -37,7 +39,7 @@ export class ItemPrivateComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setDiscoverable(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
       (rd: RemoteData<Item>) => {
         this.processRestResponse(rd);
-      }
+      },
     );
   }
 }
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..5ace76c30b 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
@@ -1,20 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { ItemPublicComponent } from './item-public.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemPublicComponent;
 let fixture: ComponentFixture<ItemPublicComponent>;
@@ -33,22 +44,22 @@ describe('ItemPublicComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem)
+      setDiscoverable: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -62,8 +73,8 @@ describe('ItemPublicComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -74,7 +85,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-public/item-public.component.ts b/src/app/item-page/edit-item-page/item-public/item-public.component.ts
index 97e7b765eb..b4373d8eff 100644
--- a/src/app/item-page/edit-item-page/item-public/item-public.component.ts
+++ b/src/app/item-page/edit-item-page/item-public/item-public.component.ts
@@ -1,17 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-public',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the make item public page
@@ -36,7 +39,7 @@ export class ItemPublicComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setDiscoverable(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
new file mode 100644
index 0000000000..97aa40c7b0
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -0,0 +1,24 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
+      <p>{{descriptionMessage | translate}}</p>
+      <div *ngFor="let identifier of (identifiers$ | async)" class="w-100 p">
+        <div *ngIf="(identifier.identifierType === 'doi')">
+          <p class="float-left">{{doiToUpdateMessage | translate}}: {{identifier.value}}
+            ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})
+          </p>
+        </div>
+      </div>
+      <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
+      <div class="space-children-mr">
+        <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+        </button>
+        <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
+          {{cancelMessage| translate}}
+        </button>
+      </div>
+    </div>
+  </div>
+
+</div>
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
new file mode 100644
index 0000000000..321d40d0d4
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.spec.ts
@@ -0,0 +1,117 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ItemRegisterDoiComponent } from './item-register-doi.component';
+
+let comp: ItemRegisterDoiComponent;
+let fixture: ComponentFixture<ItemRegisterDoiComponent>;
+
+let mockItem;
+let itemPageUrl;
+let routerStub;
+let mockItemDataService: ItemDataService;
+let mockIdentifierDataService: IdentifierDataService;
+let routeStub;
+let notificationsServiceStub;
+
+describe('ItemRegisterDoiComponent', () => {
+  beforeEach(waitForAsync(() => {
+
+    mockItem = Object.assign(new Item(), {
+      id: 'fake-id',
+      handle: 'fake/handle',
+      lastModified: '2018',
+      isWithdrawn: true,
+    });
+
+    itemPageUrl = `fake-url/${mockItem.id}`;
+    routerStub = Object.assign(new RouterStub(), {
+      url: `${itemPageUrl}/edit`,
+    });
+
+    mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', {
+      getIdentifierDataFor: createSuccessfulRemoteDataObject$({ 'identifiers': [] }),
+      getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true'),
+      registerIdentifier: createSuccessfulRemoteDataObject$({ 'identifiers': [] }),
+    });
+
+    mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
+      registerDOI: createSuccessfulRemoteDataObject$(mockItem),
+    });
+
+    routeStub = {
+      data: observableOf({
+        dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
+          id: 'fake-id',
+        })),
+      }),
+    };
+
+    notificationsServiceStub = new NotificationsServiceStub();
+
+    TestBed.configureTestingModule({
+      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
+      declarations: [ItemRegisterDoiComponent],
+      providers: [
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: Router, useValue: routerStub },
+        { provide: ItemDataService, useValue: mockItemDataService },
+        { provide: IdentifierDataService, useValue: mockIdentifierDataService },
+        { provide: NotificationsService, useValue: notificationsServiceStub },
+      ], schemas: [
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemRegisterDoiComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should render a page with messages based on the \'register-doi\' messageKey', () => {
+    const header = fixture.debugElement.query(By.css('h2')).nativeElement;
+    expect(header.innerHTML).toContain('item.edit.register-doi.header');
+    const description = fixture.debugElement.query(By.css('p')).nativeElement;
+    expect(description.innerHTML).toContain('item.edit.register-doi.description');
+    const confirmButton = fixture.debugElement.query(By.css('button.perform-action')).nativeElement;
+    expect(confirmButton.innerHTML).toContain('item.edit.register-doi.confirm');
+    const cancelButton = fixture.debugElement.query(By.css('button.cancel')).nativeElement;
+    expect(cancelButton.innerHTML).toContain('item.edit.register-doi.cancel');
+  });
+
+  describe('performAction', () => {
+    it('should call registerDOI function from the ItemDataService', () => {
+      spyOn(comp, 'processRestResponse');
+      comp.performAction();
+      expect(mockIdentifierDataService.registerIdentifier).toHaveBeenCalledWith(comp.item, 'doi');
+      expect(comp.processRestResponse).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
new file mode 100644
index 0000000000..f377aae97f
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi.component.ts
@@ -0,0 +1,101 @@
+import { Component } from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+import { getItemPageRoute } from '../../item-page-routing-paths';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+
+@Component({
+  selector: 'ds-item-register-doi',
+  templateUrl: './item-register-doi-component.html',
+})
+/**
+ * Component responsible for rendering the Item Register DOI page
+ */
+export class ItemRegisterDoiComponent extends AbstractSimpleItemActionComponent {
+
+  protected messageKey = 'register-doi';
+  doiToUpdateMessage = 'item.edit.' + this.messageKey + '.to-update';
+  identifiers$: Observable<Identifier[]>;
+  processing = false;
+
+  constructor(protected route: ActivatedRoute,
+              protected router: Router,
+              protected notificationsService: NotificationsService,
+              protected itemDataService: ItemDataService,
+              protected translateService: TranslateService,
+              protected identifierDataService: IdentifierDataService) {
+    super(route, router, notificationsService, itemDataService, translateService);
+  }
+
+  /**
+   * Initialise component
+   */
+  ngOnInit(): void {
+    this.itemRD$ = this.route.data.pipe(
+      map((data) => data.dso),
+      getFirstSucceededRemoteData(),
+    )as Observable<RemoteData<Item>>;
+
+    this.itemRD$.pipe(first()).subscribe((rd) => {
+      this.item = rd.payload;
+      this.itemPageRoute = getItemPageRoute(this.item);
+      this.identifiers$ = this.identifierDataService.getIdentifierDataFor(this.item).pipe(
+        map((identifierRD) => {
+          if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+            return identifierRD.payload.identifiers;
+          } else {
+            return null;
+          }
+        }),
+      );
+    },
+    );
+
+    this.confirmMessage = 'item.edit.' + this.messageKey + '.confirm';
+    this.cancelMessage = 'item.edit.' + this.messageKey + '.cancel';
+    this.headerMessage = 'item.edit.' + this.messageKey + '.header';
+    this.descriptionMessage = 'item.edit.' + this.messageKey + '.description';
+
+
+  }
+
+  /**
+   * Perform the register DOI action to the item
+   */
+  performAction() {
+    this.registerDoi();
+  }
+
+  /**
+   * Request that a pending, minted or null DOI be queued for registration
+   */
+  registerDoi() {
+    this.processing = true;
+    this.identifierDataService.registerIdentifier(this.item, 'doi').subscribe(
+      (response: RemoteData<Item>) => {
+        if (response.hasCompleted) {
+          this.processing = false;
+          this.processRestResponse(response);
+        }
+      },
+    );
+  }
+
+}
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..b7037e2e0b 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
@@ -1,20 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { ItemReinstateComponent } from './item-reinstate.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 let comp: ItemReinstateComponent;
 let fixture: ComponentFixture<ItemReinstateComponent>;
@@ -33,24 +44,24 @@ describe('ItemReinstateComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem)
+      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
-          id: 'fake-id'
-        }))
-      })
+          id: 'fake-id',
+        })),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -64,8 +75,8 @@ describe('ItemReinstateComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -76,7 +87,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-reinstate/item-reinstate.component.ts b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
index 951585d156..00fa7910aa 100644
--- a/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
+++ b/src/app/item-page/edit-item-page/item-reinstate/item-reinstate.component.ts
@@ -1,17 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-reinstate',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the Item Reinstate page
@@ -36,7 +39,7 @@ export class ItemReinstateComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setWithDrawn(this.item, false).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
-      }
+      },
     );
   }
 }
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..1786f417ed 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,12 +1,12 @@
-<h5>
+<h2 class="h4">
     {{getRelationshipMessageKey() | async | translate}}
     <button class="ml-2 btn btn-success" [disabled]="(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 *ngIf="updates && (loading$ | async) !== true">
         <ng-container *ngVar="updates | dsObjectValues as updateValues">
           <ds-pagination
             [paginationOptions]="paginationConfig"
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..871cba1d69 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
@@ -1,37 +1,45 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
-import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { Item } from '../../../../core/shared/item.model';
-import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
-import { SharedModule } from '../../../../shared/shared.module';
-import { EditRelationshipListComponent } from './edit-relationship-list.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
+import { GroupDataService } from '../../../../core/eperson/group-data.service';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { LinkHeadService } from '../../../../core/services/link-head.service';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+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 { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
 import { HostWindowService } from '../../../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { SelectableListService } from '../../../../shared/object-list/selectable-list/selectable-list.service';
 import { PaginationComponent } from '../../../../shared/pagination/pagination.component';
 import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
-import { LinkHeadService } from '../../../../core/services/link-head.service';
-import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { HostWindowServiceStub } from '../../../../shared/testing/host-window-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
 import { SearchConfigurationServiceStub } from '../../../../shared/testing/search-configuration-service.stub';
-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';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { EditRelationshipListComponent } from './edit-relationship-list.component';
 
 let comp: EditRelationshipListComponent;
 let fixture: ComponentFixture<EditRelationshipListComponent>;
@@ -103,11 +111,11 @@ describe('EditRelationshipListComponent', () => {
 
     author1 = Object.assign(new Item(), {
       id: 'author1',
-      uuid: 'author1'
+      uuid: 'author1',
     });
     author2 = Object.assign(new Item(), {
       id: 'author2',
-      uuid: 'author2'
+      uuid: 'author2',
     });
 
     relationships = [
@@ -126,16 +134,16 @@ describe('EditRelationshipListComponent', () => {
         relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
         leftItem: createSuccessfulRemoteDataObject$(item),
         rightItem: createSuccessfulRemoteDataObject$(author2),
-      })
+      }),
     ];
 
     item = Object.assign(new Item(), {
       _links: {
-        self: { href: 'fake-item-url/publication' }
+        self: { href: 'fake-item-url/publication' },
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     });
 
     fieldUpdate1 = {
@@ -144,7 +152,7 @@ describe('EditRelationshipListComponent', () => {
         relationship: relationships[0],
         type: relationshipType,
       },
-      changeType: undefined
+      changeType: undefined,
     };
     fieldUpdate2 = {
       field: {
@@ -152,16 +160,16 @@ describe('EditRelationshipListComponent', () => {
         relationship: relationships[1],
         type: relationshipType,
       },
-      changeType: FieldChangeType.REMOVE
+      changeType: FieldChangeType.REMOVE,
     };
 
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
-          [relationships[1].uuid]: fieldUpdate2
-        })
-      }
+          [relationships[1].uuid]: fieldUpdate2,
+        }),
+      },
     );
 
     relationshipService = jasmine.createSpyObj('relationshipService',
@@ -169,7 +177,7 @@ describe('EditRelationshipListComponent', () => {
         getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList([author1, author2])),
         getItemRelationshipsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
         isLeftItem: observableOf(true),
-      }
+      },
     );
 
     selectableListService = {};
@@ -184,7 +192,7 @@ describe('EditRelationshipListComponent', () => {
     hostWindowService = new HostWindowServiceStub(1200);
 
     const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-      addTag: ''
+      addTag: '',
     });
 
     const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -197,15 +205,15 @@ describe('EditRelationshipListComponent', () => {
       findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
         name: 'test',
         values: [
-          'org.dspace.ctask.general.ProfileFormats = test'
-        ]
-      }))
+          'org.dspace.ctask.general.ProfileFormats = test',
+        ],
+      })),
     });
 
     const environmentUseThumbs = {
       browseBy: {
-        showThumbnails: true
-      }
+        showThumbnails: true,
+      },
     };
 
     TestBed.configureTestingModule({
@@ -224,10 +232,10 @@ describe('EditRelationshipListComponent', () => {
         { provide: LinkHeadService, useValue: linkHeadService },
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
     resetComponent();
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..335332f183 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
@@ -1,21 +1,52 @@
-import { Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   from as observableFrom,
   Observable,
-  Subscription
+  Subscription,
 } from 'rxjs';
 import {
-  RelationshipIdentifiable
-} from '../../../../core/data/object-updates/object-updates.reducer';
+  defaultIfEmpty,
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+  toArray,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { LinkService } from '../../../../core/cache/builders/link.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 { RelationshipIdentifiable } from '../../../../core/data/object-updates/object-updates.reducer';
+import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../core/data/relationship-type-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Collection } from '../../../../core/shared/collection.model';
 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 { 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 {
@@ -24,22 +55,17 @@ import {
   getFirstSucceededRemoteDataPayload,
   getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { ItemType } from '../../../../core/shared/item-relationships/item-type.model';
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+} from '../../../../shared/empty.util';
 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 { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
 import { SearchResult } from '../../../../shared/search/models/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 { 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';
 
 @Component({
@@ -153,7 +179,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     protected modalService: NgbModal,
     protected paginationService: PaginationService,
     protected selectableListService: SelectableListService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
@@ -213,7 +239,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
   openLookup() {
 
     this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
-      size: 'lg'
+      size: 'lg',
     });
     const modalComp: DsDynamicLookupRelationModalComponent = this.modalRef.componentInstance;
     modalComp.repeatable = true;
@@ -227,7 +253,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     modalComp.isPending = false;
 
     this.item.owningCollection.pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((collection: Collection) => {
       modalComp.collection = collection;
     });
@@ -284,15 +310,15 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         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;
-        })
+            const update = {
+              uuid: this.relationshipType.id + '-' + searchResult.indexableObject.uuid,
+              nameVariant,
+              type: this.relationshipType,
+              relatedItem,
+            } as RelationshipIdentifiable;
+            this.objectUpdatesService.saveAddFieldUpdate(this.url, update);
+            return update;
+          }),
         ));
       });
 
@@ -309,9 +335,9 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
                 } as RelationshipIdentifiable;
                 this.objectUpdatesService.saveRemoveFieldUpdate(this.url,update);
                 return update;
-              })
+              }),
             );
-          })
+          }),
         ));
       });
 
@@ -347,7 +373,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             relationshipType: relatedEntityType.label,
             searchConfiguration: relatedEntityType.label.toLowerCase(),
             nameVariants: 'true',
-          }
+          },
         );
       });
 
@@ -361,21 +387,21 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         let apiCall;
         if (isLeft) {
           apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.leftwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
+            getFirstSucceededRemoteData(),
+            getRemoteDataPayload(),
+          );
         } else {
           apiCall = this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, this.relationshipType.rightwardType ,[relatedItem.id] ).pipe(
-                      getFirstSucceededRemoteData(),
-                      getRemoteDataPayload(),
-                    );
+            getFirstSucceededRemoteData(),
+            getRemoteDataPayload(),
+          );
         }
 
         return apiCall.pipe(
-          map( (res: PaginatedList<Relationship>) => res.page[0])
+          map( (res: PaginatedList<Relationship>) => res.page[0]),
         );
-      }
-    ));
+      },
+      ));
   }
 
 
@@ -389,21 +415,21 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
       take(1),
       map((updates) => Object.values(updates)
         .map((update) => update.field as RelationshipIdentifiable)
-        .filter((field) => field.relationship)
+        .filter((field) => field.relationship),
       ),
       mergeMap((identifiables) =>
         observableCombineLatest(
-          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship))
+          identifiables.map((identifiable) => this.getRelatedItem(identifiable.relationship)),
         ).pipe(
           defaultIfEmpty([]),
           map((relatedItems) => {
             return identifiables.filter( (identifiable, index) => {
-                return relatedItems[index].uuid === relatedItem.uuid;
+              return relatedItems[index].uuid === relatedItem.uuid;
             });
-          }
+          },
           ),
-        )
-      )
+        ),
+      ),
     );
   }
 
@@ -423,7 +449,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
           const listOfRelatedItems = this.item.allMetadataValues( 'relation.' + this.relationshipType.rightwardType );
           return !!listOfRelatedItems.find( (uuid) => uuid === relatedItem.uuid );
         }
-      })
+      }),
     );
   }
 
@@ -452,13 +478,13 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
 
     this.relatedEntityType$ = this.relationshipLeftAndRightType$.pipe(
       map((relatedTypes: ItemType[]) => relatedTypes.find((relatedType) => relatedType.uuid !== this.itemType.uuid)),
-      hasValueOperator()
+      hasValueOperator(),
     );
 
     this.relatedEntityType$.pipe(
-      take(1)
+      take(1),
     ).subscribe(
-      (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`
+      (relatedEntityType) => this.listId = `edit-relationship-${this.itemType.id}-${relatedEntityType.id}`,
     );
 
     this.currentItemIsLeftItem$ = this.relationshipLeftAndRightType$.pipe(
@@ -474,7 +500,7 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
         // 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;
-      })
+      }),
     );
 
 
@@ -487,13 +513,13 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
     // get the pagination params from the route
     const currentPagination$ = this.paginationService.getCurrentPagination(
       this.paginationConfig.id,
-      this.paginationConfig
+      this.paginationConfig,
     ).pipe(
-      tap(() => this.loading$.next(true))
+      tap(() => this.loading$.next(true)),
     );
 
     // this adds thumbnail images when required by configuration
-    let linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
+    const linksToFollow: FollowLinkConfig<Relationship>[] = itemLinksToFollow(this.fetchThumbnail);
 
     this.subs.push(
       observableCombineLatest([
@@ -507,21 +533,21 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
             currentItemIsLeftItem ? this.relationshipType.leftwardType : this.relationshipType.rightwardType,
             {
               elementsPerPage: currentPagination.pageSize,
-              currentPage: currentPagination.currentPage
+              currentPage: currentPagination.currentPage,
             },
             false,
             true,
-            ...linksToFollow
+            ...linksToFollow,
           )),
       ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
         this.relationshipsRd$.next(rd);
-      })
+      }),
     );
 
     // keep isLastPage$ up to date based on relationshipsRd$
     this.subs.push(this.relationshipsRd$.pipe(
       hasValueOperator(),
-      getAllSucceededRemoteData()
+      getAllSucceededRemoteData(),
     ).subscribe((rd: RemoteData<PaginatedList<Relationship>>) => {
       this.isLastPage$.next(hasNoValue(rd.payload._links.next));
     }));
@@ -537,8 +563,8 @@ 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])
-            )
+              map((isLeftItem: boolean) => [relationship, isLeftItem]),
+            ),
           ),
           map(([relationship, isLeftItem]: [Relationship, boolean]) => {
             // turn it into a RelationshipIdentifiable, an
@@ -554,8 +580,8 @@ export class EditRelationshipListComponent implements OnInit, OnDestroy {
           // wait until all relationships have been processed, and emit them all as a single array
           toArray(),
           // if the pipe above completes without emitting anything, emit an empty array instead
-          defaultIfEmpty([])
-      )),
+          defaultIfEmpty([]),
+        )),
       switchMap((nextFields: RelationshipIdentifiable[]) => {
         // Get a list that contains the unsaved changes for the page, as well as the page of
         // RelationshipIdentifiables, as a single list of FieldUpdates
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
index a3062abf7e..f129eea439 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.spec.ts
@@ -1,16 +1,21 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
-import { EditRelationshipComponent } from './edit-relationship.component';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import { EditRelationshipComponent } from './edit-relationship.component';
 
 let objectUpdatesService;
 const url = 'http://test-url.com/test-url';
@@ -37,18 +42,18 @@ describe('EditRelationshipComponent', () => {
       id: '1',
       uuid: '1',
       leftwardType: 'isAuthorOfPublication',
-      rightwardType: 'isPublicationOfAuthor'
+      rightwardType: 'isPublicationOfAuthor',
     });
 
     item = Object.assign(new Item(), {
       _links: {
         self: {
-          href: 'fake-item-url/publication'
-        }
+          href: 'fake-item-url/publication',
+        },
       },
       id: 'publication',
       uuid: 'publication',
-      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships))
+      relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
     });
 
     relatedItem = Object.assign(new Item(), {
@@ -58,7 +63,7 @@ describe('EditRelationshipComponent', () => {
     relationships = [
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/2' }
+          self: { href: url + '/2' },
         },
         id: '2',
         uuid: '2',
@@ -70,23 +75,23 @@ describe('EditRelationshipComponent', () => {
       }),
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/3' }
+          self: { href: url + '/3' },
         },
         id: '3',
         uuid: '3',
         leftId: 'author2',
         rightId: 'publication',
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
-      })
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+      }),
     ];
 
     author1 = Object.assign(new Item(), {
       id: 'author1',
-      uuid: 'author1'
+      uuid: 'author1',
     });
     author2 = Object.assign(new Item(), {
       id: 'author2',
-      uuid: 'author2'
+      uuid: 'author2',
     });
 
     fieldUpdate1 = {
@@ -94,14 +99,14 @@ describe('EditRelationshipComponent', () => {
         uuid: relationships[0].uuid,
         relationship: relationships[0],
       },
-      changeType: undefined
+      changeType: undefined,
     };
     fieldUpdate2 = {
       field: {
         uuid: relationships[1].uuid,
         relationship: relationships[1],
       },
-      changeType: FieldChangeType.REMOVE
+      changeType: FieldChangeType.REMOVE,
     };
 
     const itemSelection = {};
@@ -124,12 +129,12 @@ describe('EditRelationshipComponent', () => {
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
+            },
           },
         },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
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..92023d88a8 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
@@ -1,18 +1,41 @@
-import { Component, Input, OnChanges } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, of } from 'rxjs';
-import { filter, map, switchMap, take } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+  OnChanges,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+} 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 {
   DeleteRelationship,
-  RelationshipIdentifiable
+  RelationshipIdentifiable,
 } from '../../../../core/data/object-updates/object-updates.reducer';
 import { ObjectUpdatesService } from '../../../../core/data/object-updates/object-updates.service';
 import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../core/shared/operators';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { FieldUpdate } from '../../../../core/data/object-updates/field-update.model';
-import { FieldChangeType } from '../../../../core/data/object-updates/field-change-type.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../shared/empty.util';
 
 @Component({
   // eslint-disable-next-line @angular-eslint/component-selector
@@ -83,20 +106,20 @@ export class EditRelationshipComponent implements OnChanges {
       this.leftItem$ = this.relationship.leftItem.pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       );
       this.rightItem$ = this.relationship.rightItem.pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       );
       this.relatedItem$ = observableCombineLatest(
         this.leftItem$,
         this.rightItem$,
       ).pipe(
         map((items: Item[]) =>
-          items.find((item) => item.uuid !== this.editItem.uuid)
-        )
+          items.find((item) => item.uuid !== this.editItem.uuid),
+        ),
       );
     } else {
       this.relatedItem$ = of(this.update.relatedItem);
@@ -114,7 +137,7 @@ export class EditRelationshipComponent implements OnChanges {
     ).pipe(
       map((items: Item[]) =>
         items.map((item) => this.objectUpdatesService
-          .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid))
+          .isSelectedVirtualMetadata(this.url, this.relationship.id, item.uuid)),
       ),
       switchMap((selection$) => observableCombineLatest(selection$)),
       map((selection: boolean[]) => {
@@ -123,12 +146,12 @@ export class EditRelationshipComponent implements OnChanges {
           {
             keepLeftVirtualMetadata: selection[0] === true,
             keepRightVirtualMetadata: selection[1] === true,
-          }
+          },
         ) as DeleteRelationship;
       }),
       take(1),
     ).subscribe((deleteRelationship: DeleteRelationship) =>
-      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship)
+      this.objectUpdatesService.saveRemoveFieldUpdate(this.url, deleteRelationship),
     );
   }
 
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..3a0a33d1a0 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
@@ -2,8 +2,8 @@
   <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)"
+        <button class="btn btn-danger ml-auto" *ngIf="(isReinstatable() | async) !== true"
+                [disabled]="(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>
@@ -13,7 +13,7 @@
           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)"
+        <button class="btn btn-primary" [disabled]="(hasChanges() | async) !== true"
                 (click)="submit()"><i
           class="fas fa-save"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
@@ -36,8 +36,8 @@
       </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)"
+          <button class="btn btn-danger" *ngIf="(isReinstatable() | async) !== true"
+                  [disabled]="(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>
@@ -47,7 +47,7 @@
             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)"
+          <button class="btn btn-primary" [disabled]="(hasChanges() | async) !== true"
                   (click)="submit()"><i
             class="fas fa-save"></i>
             <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.save-button" | translate}}</span>
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..d6cf0cbd8c 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
@@ -1,34 +1,55 @@
-import { ChangeDetectorRef, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} 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 {
+  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';
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { RequestService } from '../../../core/data/request.service';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { RelationshipType } from '../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { Item } from '../../../core/shared/item.model';
-import { NotificationType } from '../../../shared/notifications/models/notification-type';
-import { INotification, Notification } from '../../../shared/notifications/models/notification.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { SharedModule } from '../../../shared/shared.module';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { ItemRelationshipsComponent } from './item-relationships.component';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { FieldChangeType } from '../../../core/data/object-updates/field-change-type.model';
 import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
-import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
-import { ThemeService } from '../../../shared/theme-support/theme.service';
+import { RequestService } from '../../../core/data/request.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 { getMockThemeService } from '../../../shared/mocks/theme-service.mock';
+import {
+  INotification,
+  Notification,
+} from '../../../shared/notifications/models/notification.model';
+import { NotificationType } from '../../../shared/notifications/models/notification-type';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
+import { relationshipTypes } from '../../../shared/testing/relationship-types.mock';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { ThemeService } from '../../../shared/theme-support/theme.service';
+import { ItemRelationshipsComponent } from './item-relationships.component';
 
 let comp: any;
 let fixture: ComponentFixture<ItemRelationshipsComponent>;
@@ -46,8 +67,8 @@ const notificationsService = jasmine.createSpyObj('notificationsService',
   {
     info: infoNotification,
     warning: warningNotification,
-    success: successNotification
-  }
+    success: successNotification,
+  },
 );
 const router = new RouterStub();
 let relationshipTypeService;
@@ -75,36 +96,36 @@ describe('ItemRelationshipsComponent', () => {
       id: '1',
       uuid: '1',
       leftwardType: 'isAuthorOfPublication',
-      rightwardType: 'isPublicationOfAuthor'
+      rightwardType: 'isPublicationOfAuthor',
     });
 
     relationships = [
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/2' }
+          self: { href: url + '/2' },
         },
         id: '2',
         uuid: '2',
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
       }),
       Object.assign(new Relationship(), {
         _links: {
-          self: { href: url + '/3' }
+          self: { href: url + '/3' },
         },
         id: '3',
         uuid: '3',
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
-      })
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
+      }),
     ];
 
     item = Object.assign(new Item(), {
       _links: {
-        self: { href: 'fake-item-url/publication' }
+        self: { href: 'fake-item-url/publication' },
       },
       id: 'publication',
       uuid: 'publication',
       relationships: createSuccessfulRemoteDataObject$(createPaginatedList(relationships)),
-      lastModified: date
+      lastModified: date,
     });
 
     entityType = Object.assign(new ItemType(), {
@@ -113,11 +134,11 @@ describe('ItemRelationshipsComponent', () => {
 
     author1 = Object.assign(new Item(), {
       id: 'author1',
-      uuid: 'author1'
+      uuid: 'author1',
     });
     author2 = Object.assign(new Item(), {
       id: 'author2',
-      uuid: 'author2'
+      uuid: 'author2',
     });
 
     relationships[0].leftItem = createSuccessfulRemoteDataObject$(author1);
@@ -127,36 +148,36 @@ describe('ItemRelationshipsComponent', () => {
 
     fieldUpdate1 = {
       field: relationships[0],
-      changeType: undefined
+      changeType: undefined,
     };
     fieldUpdate2 = {
       field: Object.assign(
         relationships[1],
-        {keepLeftVirtualMetadata: true, keepRightVirtualMetadata: false}
+        { keepLeftVirtualMetadata: true, keepRightVirtualMetadata: false },
       ),
-      changeType: FieldChangeType.REMOVE
+      changeType: FieldChangeType.REMOVE,
     };
 
     itemService = jasmine.createSpyObj('itemService', {
       findByHref: createSuccessfulRemoteDataObject$(item),
-      findById: createSuccessfulRemoteDataObject$(item)
+      findById: createSuccessfulRemoteDataObject$(item),
     });
     routeStub = {
       data: observableOf({}),
       parent: {
-        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) })
-      }
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }),
+      },
     };
 
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService',
       {
         getFieldUpdates: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
-          [relationships[1].uuid]: fieldUpdate2
+          [relationships[1].uuid]: fieldUpdate2,
         }),
         getFieldUpdatesExclusive: observableOf({
           [relationships[0].uuid]: fieldUpdate1,
-          [relationships[1].uuid]: fieldUpdate2
+          [relationships[1].uuid]: fieldUpdate2,
         }),
         saveAddFieldUpdate: {},
         discardFieldUpdates: {},
@@ -166,8 +187,8 @@ describe('ItemRelationshipsComponent', () => {
         getLastModified: observableOf(date),
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
 
     relationshipService = jasmine.createSpyObj('relationshipService',
@@ -179,33 +200,33 @@ describe('ItemRelationshipsComponent', () => {
         deleteRelationship: observableOf(new RestResponse(true, 200, 'OK')),
         getItemResolvedRelatedItemsAndRelationships: observableCombineLatest(observableOf([author1, author2]), observableOf([item, item]), observableOf(relationships)),
         getRelationshipsByRelatedItemIds: observableOf(relationships),
-        getRelationshipTypeLabelsByItem: observableOf([relationshipType.leftwardType])
-      }
+        getRelationshipTypeLabelsByItem: observableOf([relationshipType.leftwardType]),
+      },
     );
 
 
     relationshipTypeService = jasmine.createSpyObj('searchByEntityType',
       {
-        searchByEntityType: observableOf(relationshipTypes)
-      }
+        searchByEntityType: observableOf(relationshipTypes),
+      },
     );
 
     requestService = jasmine.createSpyObj('requestService',
       {
         removeByHrefSubstring: {},
-        hasByHref$: observableOf(false)
-      }
+        hasByHref$: observableOf(false),
+      },
     );
 
     objectCache = jasmine.createSpyObj('objectCache', {
-      remove: undefined
+      remove: undefined,
     });
 
     entityTypeService = jasmine.createSpyObj('entityTypeService',
       {
         getEntityTypeByLabel: createSuccessfulRemoteDataObject$(entityType),
         getEntityTypeRelationships: createSuccessfulRemoteDataObject$(createPaginatedList([relationshipType])),
-      }
+      },
     );
 
     scheduler = getTestScheduler();
@@ -224,10 +245,10 @@ describe('ItemRelationshipsComponent', () => {
         { provide: ObjectCacheService, useValue: objectCache },
         { provide: RequestService, useValue: requestService },
         { provide: RelationshipTypeDataService, useValue: relationshipTypeService },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
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..df5e78565d 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,35 +1,55 @@
-import { ChangeDetectorRef, Component } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ChangeDetectorRef,
+  Component,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  zip as observableZip,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+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 { map, startWith, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip, Observable } from 'rxjs';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../core/data/relationship-type-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.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 { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 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';
-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 { 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';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -78,9 +98,9 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     const label = this.item.firstMetadataValue('dspace.entity.type');
     if (label !== undefined) {
       this.relationshipTypes$ = this.relationshipTypeService.searchByEntityType(label, true, true, ...this.getRelationshipTypeFollowLinks())
-      .pipe(
-        map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page)
-      );
+        .pipe(
+          map((relationshipTypes: PaginatedList<RelationshipType>) => relationshipTypes.page),
+        );
 
       this.entityType$ = this.entityTypeService.getEntityTypeByLabel(label).pipe(
         getFirstSucceededRemoteData(),
@@ -109,7 +129,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
     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 })
+        Object.assign(new Relationship(), relationship, { uuid: relationship.id }),
       )),
       switchMap((relationships: Relationship[]) => {
         return this.objectUpdatesService.getFieldUpdatesExclusive(this.url, relationships) as Observable<FieldUpdates>;
@@ -117,7 +137,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
       map((fieldUpdates: FieldUpdates) =>
         Object.values(fieldUpdates)
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.REMOVE)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship)
+          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as DeleteRelationship),
       ),
     );
 
@@ -126,7 +146,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
         Object.values(fieldUpdates)
           .filter((fieldUpdate: FieldUpdate) => hasValue(fieldUpdate))
           .filter((fieldUpdate: FieldUpdate) => fieldUpdate.changeType === FieldChangeType.ADD)
-          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable)
+          .map((fieldUpdate: FieldUpdate) => fieldUpdate.field as RelationshipIdentifiable),
       ),
     );
 
@@ -148,25 +168,25 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
             this.displayNotifications(response);
             this.modalService.dismissAll();
           }
-        })
+        }),
       );
     });
   }
 
   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);
+      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);
+    },
     ));
   }
 
@@ -192,7 +212,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
           }
           return this.relationshipService.addRelationship(addRelationship.type.id, leftItem, rightItem, leftwardValue, rightwardValue);
         }),
-      )
+      ),
     ));
   }
 
@@ -228,7 +248,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent {
   getRelationshipTypeFollowLinks() {
     return [
       followLink('leftType'),
-      followLink('rightType')
+      followLink('rightType'),
     ];
   }
 
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 d4f61c99c1..faad0e679b 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
@@ -8,6 +8,17 @@
       {{statusData[statusKey]}}
     </div>
   </div>
+
+  <div *ngFor="let identifier of (identifiers$ | async)" class="w-100">
+    <div *ngIf="(identifier.identifierType==='doi')">
+      <div class="col-3 float-left status-label">
+        {{identifier.identifierType.toLocaleUpperCase()}}
+      </div>
+      <div class="col-9 float-left status-label">{{identifier.value}}
+        ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
+    </div>
+  </div>
+
   <div class="col-3 float-left status-label">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
@@ -16,6 +27,7 @@
   </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 0829480670..12e7b2603a 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
@@ -1,18 +1,33 @@
-import { ItemStatusComponent } from './item-status.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute } from '@angular/router';
-import { Item } from '../../../core/shared/item.model';
-import { By } from '@angular/platform-browser';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { Item } from '../../../core/shared/item.model';
+import { HostWindowService } from '../../../shared/host-window.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { ItemStatusComponent } from './item-status.component';
+
+let mockIdentifierDataService: IdentifierDataService;
+let mockConfigurationDataService: ConfigurationDataService;
 
 describe('ItemStatusComponent', () => {
   let comp: ItemStatusComponent;
@@ -24,23 +39,43 @@ describe('ItemStatusComponent', () => {
     handle: 'fake/handle',
     lastModified: '2018',
     _links: {
-      self: { href: 'test-item-selflink' }
-    }
+      self: { href: 'test-item-selflink' },
+    },
+  });
+
+  mockIdentifierDataService = jasmine.createSpyObj('mockIdentifierDataService', {
+    getIdentifierDataFor: createSuccessfulRemoteDataObject$({ 'identifiers': [] }),
+    getIdentifierRegistrationConfiguration: createSuccessfulRemoteDataObject$('true'),
+  });
+
+  mockConfigurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+      name: 'identifiers.item-status.register-doi',
+      values: [
+        'true',
+      ],
+    })),
   });
 
   const itemPageUrl = `/items/${mockItem.uuid}`;
 
   const routeStub = {
     parent: {
-      data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
-    }
+      data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) }),
+    },
   };
 
   let authorizationService: AuthorizationDataService;
+  let orcidAuthService: any;
 
   beforeEach(waitForAsync(() => {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
+    });
+
+    orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
+      onlyAdminCanDisconnectProfileFromOrcid: observableOf ( true ),
+      isLinkedToOrcid: true,
     });
 
     TestBed.configureTestingModule({
@@ -50,7 +85,10 @@ describe('ItemStatusComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: AuthorizationDataService, useValue: authorizationService },
-      ], schemas: [CUSTOM_ELEMENTS_SCHEMA]
+        { provide: IdentifierDataService, useValue: mockIdentifierDataService },
+        { 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 f01f5c1f7a..1bd39c5215 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
@@ -1,16 +1,50 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { ItemOperation } from '../item-operation/itemOperation.model';
-import { distinctUntilChanged, first, map, mergeMap, toArray } from 'rxjs/operators';
-import { BehaviorSubject, Observable, from as observableFrom } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  concatMap,
+  distinctUntilChanged,
+  first,
+  map,
+  mergeMap,
+  switchMap,
+  toArray,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstCompletedRemoteData,
+} from '../../../core/shared/operators';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../shared/animations/fade';
 import { hasValue } from '../../../shared/empty.util';
-import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { Identifier } from '../../../shared/object-list/identifier-data/identifier.model';
+import { IdentifierData } from '../../../shared/object-list/identifier-data/identifier-data.model';
+import {
+  getItemEditRoute,
+  getItemPageRoute,
+} from '../../item-page-routing-paths';
+import { ItemOperation } from '../item-operation/itemOperation.model';
 
 @Component({
   selector: 'ds-item-status',
@@ -18,8 +52,8 @@ import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators
   changeDetection: ChangeDetectionStrategy.Default,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component for displaying an item's status
@@ -47,9 +81,15 @@ export class ItemStatusComponent implements OnInit {
   operations$: BehaviorSubject<ItemOperation[]> = new BehaviorSubject<ItemOperation[]>([]);
 
   /**
-   * The keys of the actions (to loop over)
+   * Identifiers (handles, DOIs)
    */
-  actionsKeys;
+  identifiers$: Observable<Identifier[]>;
+
+  /**
+   * Configuration and state variables regarding DOIs
+   */
+
+  public subs: Subscription[] = [];
 
   /**
    * Route to the item's page
@@ -57,62 +97,164 @@ export class ItemStatusComponent implements OnInit {
   itemPageRoute$: Observable<string>;
 
   constructor(private route: ActivatedRoute,
-              private authorizationService: AuthorizationDataService) {
+              private authorizationService: AuthorizationDataService,
+              private identifierDataService: IdentifierDataService,
+              private configurationService: ConfigurationDataService,
+              private orcidAuthService: OrcidAuthService,
+  ) {
   }
 
+  /**
+   * Initialise component
+   */
   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);
-      /*
-        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 = [];
-      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));
+      map((data: RemoteData<Item>) => data.payload),
+    ).pipe(
+      switchMap((item: Item) => {
+        this.statusData = Object.assign({
+          id: item.id,
+          handle: item.handle,
+          lastModified: item.lastModified,
+        });
+        this.statusDataKeys = Object.keys(this.statusData);
 
-      this.operations$.next(operations);
+        // Observable for item identifiers (retrieved from embedded link)
+        this.identifiers$ = this.identifierDataService.getIdentifierDataFor(item).pipe(
+          map((identifierRD) => {
+            if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+              return identifierRD.payload.identifiers;
+            } else {
+              return null;
+            }
+          }),
+        );
+
+        // Observable for configuration determining whether the Register DOI feature is enabled
+        const registerConfigEnabled$: Observable<boolean> = this.configurationService.findByPropertyName('identifiers.item-status.register-doi').pipe(
+          getFirstCompletedRemoteData(),
+          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;
+            }
+          }),
+        );
+
+        /**
+         * 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 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) {
+              const 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);
+                }),
+              );
+            } 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;
+                }),
+              );
+            }
+            return [op];
+          }),
+          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));
 
-      observableFrom(operations).pipe(
-        mergeMap((operation) => {
-          if (hasValue(operation.featureID)) {
-            return this.authorizationService.isAuthorized(operation.featureID, item.self).pipe(
-              distinctUntilChanged(),
-              map((authorized) => new ItemOperation(operation.operationKey, operation.operationUrl, operation.featureID, !authorized, authorized))
-            );
-          } else {
-            return [operation];
-          }
-        }),
-        toArray()
-      ).subscribe((ops) => this.operations$.next(ops));
-    });
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((item) => getItemPageRoute(item))
+      map((item) => getItemPageRoute(item)),
     );
+
   }
 
   /**
@@ -127,4 +269,10 @@ export class ItemStatusComponent implements OnInit {
     return hasValue(operation) ? operation.operationKey : undefined;
   }
 
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
 }
diff --git a/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts b/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts
new file mode 100644
index 0000000000..331206053a
--- /dev/null
+++ b/src/app/item-page/edit-item-page/item-status/themed-item-status.component.ts
@@ -0,0 +1,24 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { ItemStatusComponent } from './item-status.component';
+
+@Component({
+  selector: 'ds-themed-item-status',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedItemStatusComponent extends ThemedComponent<ItemStatusComponent> {
+  protected getComponentName(): string {
+    return 'ItemStatusComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/item-page/edit-item-page/item-status/item-status.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./item-status.component');
+  }
+
+}
diff --git a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
index f4ed04c2c8..6c997784a8 100644
--- a/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
+++ b/src/app/item-page/edit-item-page/item-version-history/item-version-history.component.spec.ts
@@ -1,13 +1,18 @@
-import { ItemVersionHistoryComponent } from './item-version-history.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { ActivatedRoute } from '@angular/router';
 import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { ItemVersionHistoryComponent } from './item-version-history.component';
 
 describe('ItemVersionHistoryComponent', () => {
   let component: ItemVersionHistoryComponent;
@@ -21,9 +26,9 @@ describe('ItemVersionHistoryComponent', () => {
   const activatedRoute = {
     parent: {
       parent: {
-        data: observableOf({dso: createSuccessfulRemoteDataObject(item)})
-      }
-    }
+        data: observableOf({ dso: createSuccessfulRemoteDataObject(item) }),
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -31,9 +36,9 @@ describe('ItemVersionHistoryComponent', () => {
       declarations: [ItemVersionHistoryComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: ActivatedRoute, useValue: activatedRoute }
+        { provide: ActivatedRoute, useValue: activatedRoute },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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..869375dcf0 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
@@ -1,15 +1,16 @@
 import { Component } from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { RemoteData } from '../../../core/data/remote-data';
 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',
-  templateUrl: './item-version-history.component.html'
+  templateUrl: './item-version-history.component.html',
 })
 /**
  * Component for listing and managing an item's 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..52d565e610 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
@@ -1,20 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ItemWithdrawComponent } from './item-withdraw.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { ItemWithdrawComponent } from './item-withdraw.component';
 
 let comp: ItemWithdrawComponent;
 let fixture: ComponentFixture<ItemWithdrawComponent>;
@@ -33,28 +44,28 @@ describe('ItemWithdrawComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj('mockItemDataService', {
-      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem)
+      setWithDrawn: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
-        dso: createSuccessfulRemoteDataObject(mockItem)
-      })
+        dso: createSuccessfulRemoteDataObject(mockItem),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
 
     TestBed.configureTestingModule({
-      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule,],
+      imports: [CommonModule, FormsModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [ItemWithdrawComponent],
       providers: [
         { provide: ActivatedRoute, useValue: routeStub },
@@ -62,8 +73,8 @@ describe('ItemWithdrawComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -74,7 +85,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/item-withdraw/item-withdraw.component.ts b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
index cbd710ba1c..45aee5a1a2 100644
--- a/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
+++ b/src/app/item-page/edit-item-page/item-withdraw/item-withdraw.component.ts
@@ -1,18 +1,20 @@
 import { Component } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 
-import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
+import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AbstractSimpleItemActionComponent } from '../simple-item-action/abstract-simple-item-action.component';
 
 @Component({
   selector: 'ds-item-withdraw',
-  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html'
+  templateUrl: '../simple-item-action/abstract-simple-item-action.component.html',
 })
 /**
  * Component responsible for rendering the Item Withdraw page
@@ -37,7 +39,7 @@ export class ItemWithdrawComponent extends AbstractSimpleItemActionComponent {
     this.itemDataService.setWithDrawn(this.item, true).pipe(getFirstCompletedRemoteData()).subscribe(
       (response: RemoteData<Item>) => {
         this.processRestResponse(response);
-      }
+      },
     );
   }
 }
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
index ce6e01df3d..dbef279d8c 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.html
@@ -1,4 +1,4 @@
-<table id="metadata" class="table table-striped table-hover">
+<table id="metadata" class="table table-striped table-hover table-responsive">
   <thead>
   <tr>
     <th scope="col">{{'item.edit.modify.overview.field'| translate}}</th>
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
index 748231be1c..9c59a293ff 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.spec.ts
@@ -1,8 +1,13 @@
-import {Item} from '../../../core/shared/item.model';
-import {waitForAsync, ComponentFixture, TestBed} from '@angular/core/testing';
-import {ModifyItemOverviewComponent} from './modify-item-overview.component';
-import {By} from '@angular/platform-browser';
-import {TranslateModule} from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { Item } from '../../../core/shared/item.model';
+import { ModifyItemOverviewComponent } from './modify-item-overview.component';
 
 let comp: ModifyItemOverviewComponent;
 let fixture: ComponentFixture<ModifyItemOverviewComponent>;
@@ -13,12 +18,12 @@ const mockItem = Object.assign(new Item(), {
   lastModified: '2018',
   metadata: {
     'dc.title': [
-      { value: 'Mock item title', language: 'en' }
+      { value: 'Mock item title', language: 'en' },
     ],
     'dc.contributor.author': [
-      { value: 'Mayer, Ed', language: '' }
-    ]
-  }
+      { value: 'Mayer, Ed', language: '' },
+    ],
+  },
 });
 
 describe('ModifyItemOverviewComponent', () => {
diff --git a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
index 974bc8d37f..4dcea7188b 100644
--- a/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
+++ b/src/app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component.ts
@@ -1,10 +1,15 @@
-import {Component, Input, OnInit} from '@angular/core';
-import {Item} from '../../../core/shared/item.model';
-import {MetadataMap} from '../../../core/shared/metadata.models';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
+import { Item } from '../../../core/shared/item.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
 
 @Component({
   selector: 'ds-modify-item-overview',
-  templateUrl: './modify-item-overview.component.html'
+  templateUrl: './modify-item-overview.component.html',
 })
 /**
  * Component responsible for rendering a table containing the metadatavalues from the to be edited item
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..47d0c6d980 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
@@ -1,26 +1,37 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../core/shared/item.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
-import { AbstractSimpleItemActionComponent } from './abstract-simple-item-action.component';
-import { By } from '@angular/platform-browser';
-import { of as observableOf } from 'rxjs';
+import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
 import { getItemEditRoute } from '../../item-page-routing-paths';
+import { AbstractSimpleItemActionComponent } from './abstract-simple-item-action.component';
 
 /**
  * Test component that implements the AbstractSimpleItemActionComponent used to test the
@@ -28,7 +39,7 @@ import { getItemEditRoute } from '../../item-page-routing-paths';
  */
 @Component({
   selector: 'ds-simple-action',
-  templateUrl: './abstract-simple-item-action.component.html'
+  templateUrl: './abstract-simple-item-action.component.html',
 })
 export class MySimpleItemActionComponent extends AbstractSimpleItemActionComponent {
 
@@ -60,24 +71,24 @@ describe('AbstractSimpleItemActionComponent', () => {
       id: 'fake-id',
       handle: 'fake/handle',
       lastModified: '2018',
-      isWithdrawn: true
+      isWithdrawn: true,
     });
 
     itemPageUrl = `fake-url/${mockItem.id}`;
     routerStub = Object.assign(new RouterStub(), {
-      url: `${itemPageUrl}/edit`
+      url: `${itemPageUrl}/edit`,
     });
 
     mockItemDataService = jasmine.createSpyObj({
-      findById: createSuccessfulRemoteDataObject$(mockItem)
+      findById: createSuccessfulRemoteDataObject$(mockItem),
     });
 
     routeStub = {
       data: observableOf({
         dso: createSuccessfulRemoteDataObject(Object.assign(new Item(), {
-          id: 'fake-id'
-        }))
-      })
+          id: 'fake-id',
+        })),
+      }),
     };
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -91,8 +102,8 @@ describe('AbstractSimpleItemActionComponent', () => {
         { provide: ItemDataService, useValue: mockItemDataService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
       ], schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -111,7 +122,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/simple-item-action/abstract-simple-item-action.component.ts b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
index f4028354de..5c0b1de1b3 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.ts
@@ -1,15 +1,29 @@
-import { Component, OnInit, Predicate } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
+import {
+  Component,
+  OnInit,
+  Predicate,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Item } from '../../../core/shared/item.model';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Observable } from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { first, map } from 'rxjs/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  getItemEditRoute,
+  getItemPageRoute,
+} from '../../item-page-routing-paths';
 import { findSuccessfulAccordingTo } from '../edit-item-operators';
-import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-paths';
 
 /**
  * Component to render and handle simple item edit actions such as withdrawal and reinstatement.
@@ -17,7 +31,7 @@ import { getItemEditRoute, getItemPageRoute } from '../../item-page-routing-path
  */
 @Component({
   selector: 'ds-simple-action',
-  templateUrl: './abstract-simple-item-action.component.html'
+  templateUrl: './abstract-simple-item-action.component.html',
 })
 export class AbstractSimpleItemActionComponent implements OnInit {
 
@@ -47,13 +61,13 @@ export class AbstractSimpleItemActionComponent implements OnInit {
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso),
-      getFirstSucceededRemoteData()
+      getFirstSucceededRemoteData(),
     )as Observable<RemoteData<Item>>;
 
     this.itemRD$.pipe(first()).subscribe((rd) => {
-        this.item = rd.payload;
-        this.itemPageRoute = getItemPageRoute(this.item);
-      }
+      this.item = rd.payload;
+      this.itemPageRoute = getItemPageRoute(this.item);
+    },
     );
 
     this.confirmMessage = 'item.edit.' + this.messageKey + '.confirm';
@@ -75,7 +89,8 @@ export class AbstractSimpleItemActionComponent implements OnInit {
   processRestResponse(response: RemoteData<any>) {
     if (response.hasSucceeded) {
       this.itemDataService.findById(this.item.id).pipe(
-        findSuccessfulAccordingTo(this.predicate)).subscribe(() => {
+        findSuccessfulAccordingTo((itemRd: RemoteData<Item>) => this.predicate(itemRd)),
+      ).subscribe(() => {
         this.notificationsService.success(this.translateService.get('item.edit.' + this.messageKey + '.success'));
         this.router.navigate([getItemEditRoute(this.item)]);
       });
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..9e07db3be6 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
@@ -1,14 +1,21 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { VirtualMetadataComponent } from './virtual-metadata.component';
-import { Item } from '../../../core/shared/item.model';
-import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { Item } from '../../../core/shared/item.model';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { VirtualMetadataComponent } from './virtual-metadata.component';
 
 describe('VirtualMetadataComponent', () => {
 
@@ -48,10 +55,10 @@ describe('VirtualMetadataComponent', () => {
       declarations: [VirtualMetadataComponent, VarDirective],
       providers: [
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(VirtualMetadataComponent);
@@ -98,7 +105,7 @@ describe('VirtualMetadataComponent', () => {
         url,
         relationshipId,
         item.uuid,
-        true
+        true,
       );
     });
   });
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..48c01eae98 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,13 +1,24 @@
-import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import {Observable} 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 {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
 
 @Component({
   selector: 'ds-virtual-metadata',
-  templateUrl: './virtual-metadata.component.html'
+  templateUrl: './virtual-metadata.component.html',
 })
 /**
  * Component that lists both items of a relationship, along with their virtual metadata of the relationship.
@@ -84,7 +95,7 @@ export class VirtualMetadataComponent implements OnInit {
               metadataField: key,
               metadataValue: metadata,
             };
-          })
+          }),
       )
       .reduce((previous, current) => previous.concat(current), []);
   }
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 ac68ae1c31..7c08ce5c1c 100644
--- a/src/app/item-page/field-components/collections/collections.component.html
+++ b/src/app/item-page/field-components/collections/collections.component.html
@@ -1,7 +1,7 @@
 <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]">
-            <span>{{collection?.name}}</span><span *ngIf="!last" [innerHTML]="separator"></span>
+            <span>{{ dsoNameService.getName(collection) }}</span><span *ngIf="!last" [innerHTML]="separator"></span>
         </a>
     </div>
 
@@ -10,7 +10,7 @@
     </div>
 
     <a
-        *ngIf="!(isLoading$ | async) && (hasMore$ | async)"
+        *ngIf="(isLoading$ | async) !== true && (hasMore$ | async)"
         (click)="$event.preventDefault(); handleLoadMore()"
         class="load-more-btn btn btn-sm btn-outline-secondary"
         role="button"
diff --git a/src/app/item-page/field-components/collections/collections.component.spec.ts b/src/app/item-page/field-components/collections/collections.component.spec.ts
index c293109ba6..c7e13811cf 100644
--- a/src/app/item-page/field-components/collections/collections.component.spec.ts
+++ b/src/app/item-page/field-components/collections/collections.component.spec.ts
@@ -1,17 +1,33 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { CollectionsComponent } from './collections.component';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { PageInfo } from '../../../core/shared/page-info.model';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import { getMockRemoteDataBuildService } from '../../../shared/mocks/remote-data-build.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { CollectionsComponent } from './collections.component';
 
 const createMockCollection = (id: string) => Object.assign(new Collection(), {
   id: id,
@@ -46,13 +62,14 @@ describe('CollectionsComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ CollectionsComponent ],
       providers: [
-        { provide: RemoteDataBuildService, useValue: getMockRemoteDataBuildService()},
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: RemoteDataBuildService, useValue: getMockRemoteDataBuildService() },
         { provide: CollectionDataService, useValue: collectionDataService },
       ],
 
-      schemas: [ NO_ERRORS_SCHEMA ]
+      schemas: [ NO_ERRORS_SCHEMA ],
     }).overrideComponent(CollectionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/field-components/collections/collections.component.ts b/src/app/item-page/field-components/collections/collections.component.ts
index 6c7053b25d..2878b1c7d5 100644
--- a/src/app/item-page/field-components/collections/collections.component.ts
+++ b/src/app/item-page/field-components/collections/collections.component.ts
@@ -1,19 +1,36 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { BehaviorSubject, combineLatest, Observable } from 'rxjs';
-import {map, scan, startWith, switchMap, tap, withLatestFrom} from 'rxjs/operators';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  scan,
+  startWith,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
-import { hasValue } from '../../../shared/empty.util';
 import {
   getAllCompletedRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstSucceededRemoteDataPayload,
   getPaginatedListPayload,
 } from '../../../core/shared/operators';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component renders the parent collections section of the item
@@ -22,7 +39,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 @Component({
   selector: 'ds-item-page-collections',
-  templateUrl: './collections.component.html'
+  templateUrl: './collections.component.html',
 })
 export class CollectionsComponent implements OnInit {
 
@@ -65,8 +82,11 @@ export class CollectionsComponent implements OnInit {
    */
   collections$: Observable<Collection[]>;
 
-  constructor(private cds: CollectionDataService) {
-
+  constructor(
+    private cds: CollectionDataService,
+    public dsoNameService: DSONameService,
+    protected cdr: ChangeDetectorRef,
+  ) {
   }
 
   ngOnInit(): void {
@@ -114,6 +134,7 @@ export class CollectionsComponent implements OnInit {
         return [owningCollection, ...mappedCollections].filter(collection => hasValue(collection));
       }),
     );
+    this.cdr.detectChanges();
   }
 
   handleLoadMore() {
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..4cef0a1592 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]="hasInternalLink(mdValue.value) ? '_self' : '_blank'">
        {{ 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..81d3ae2d27 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
@@ -1,13 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MetadataUriValuesComponent } from './metadata-uri-values.component';
-import { isNotEmpty } from '../../../shared/empty.util';
-import { MetadataValue } from '../../../core/shared/metadata.models';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { isNotEmpty } from '../../../shared/empty.util';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { MetadataUriValuesComponent } from './metadata-uri-values.component';
 
 let comp: MetadataUriValuesComponent;
 let fixture: ComponentFixture<MetadataUriValuesComponent>;
@@ -15,12 +27,12 @@ let fixture: ComponentFixture<MetadataUriValuesComponent>;
 const mockMetadata = [
   {
     language: 'en_US',
-    value: 'http://fakelink.org'
+    value: 'http://fakelink.org',
   },
   {
     language: 'en_US',
-    value: 'http://another.fakelink.org'
-  }
+    value: 'http://another.fakelink.org',
+  },
 ] as MetadataValue[];
 const mockSeperator = '<br/>';
 const mockLabel = 'fake.message';
@@ -32,16 +44,16 @@ describe('MetadataUriValuesComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
       ],
       declarations: [MetadataUriValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataUriValuesComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..96608a693b 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
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { MetadataValuesComponent } from '../metadata-values/metadata-values.component';
 import { MetadataValue } from '../../../core/shared/metadata.models';
+import { MetadataValuesComponent } from '../metadata-values/metadata-values.component';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component as a link.
@@ -13,7 +16,7 @@ import { MetadataValue } from '../../../core/shared/metadata.models';
 @Component({
   selector: 'ds-metadata-uri-values',
   styleUrls: ['./metadata-uri-values.component.scss'],
-  templateUrl: './metadata-uri-values.component.html'
+  templateUrl: './metadata-uri-values.component.html',
 })
 export class MetadataUriValuesComponent extends MetadataValuesComponent {
 
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 824265c5c8..17eb4e42e3 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
@@ -1,18 +1,47 @@
 <ds-metadata-field-wrapper [label]="label | translate">
     <ng-container *ngFor="let mdValue of mdValues; let last=last;">
-      <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : simple); context: {value: mdValue.value, classes: 'dont-break-out preserve-line-breaks'}">
+      <!--
+      Choose a template. Priority: markdown, link, browse link.
+      -->
+      <ng-container *ngTemplateOutlet="(renderMarkdown ? markdown : (hasLink(mdValue) ? (hasValue(img) ? linkImg : link) : (hasBrowseDefinition() ? browselink : simple)));
+        context: {value: mdValue.value, img}">
       </ng-container>
       <span class="separator" *ngIf="!last" [innerHTML]="separator"></span>
     </ng-container>
 </ds-metadata-field-wrapper>
 
-<ng-template #markdown let-value="value" let-classes="classes">
-  <span class="{{classes}}" [innerHTML]="value | dsMarkdown | async">
+<!-- Render value as markdown -->
+<ng-template #markdown let-value="value">
+  <span class="dont-break-out" [innerHTML]="value | dsMarkdown | async">
   </span>
 </ng-template>
 
-<ng-template #simple let-value="value" let-classes="classes">
-  <span class="{{classes}}">
-    {{value}}
-  </span>
+<!-- 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">
+      {{value}}
+    </a>
+</ng-template>
+
+<!-- Render value as a link with icon -->
+<ng-template #linkImg let-img="img" let-value="value">
+  <a [href]="value" class="link-anchor dont-break-out ds-simple-metadata-link" target="_blank">
+    <img class="link-logo"
+      [alt]="img.alt | translate"
+      [style.height]="'var(' + img.heightVar + ', --ds-item-page-img-field-default-inline-height)'"
+      [src]="img.URI"/>
+    {{value}}
+  </a>
+</ng-template>
+
+<!-- Render simple value in a span  -->
+<ng-template #simple let-value="value">
+  <span class="dont-break-out preserve-line-breaks">{{value}}</span>
+</ng-template>
+
+<!-- Render value as a link to browse index -->
+<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>
 </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 9e599b1294..eb076d2c8c 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
@@ -1,12 +1,23 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { MetadataValuesComponent } from './metadata-values.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MetadataValue } from '../../../core/shared/metadata.models';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
 import { environment } from '../../../../environments/environment';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { MetadataValuesComponent } from './metadata-values.component';
 
 let comp: MetadataValuesComponent;
 let fixture: ComponentFixture<MetadataValuesComponent>;
@@ -14,15 +25,15 @@ let fixture: ComponentFixture<MetadataValuesComponent>;
 const mockMetadata = [
   {
     language: 'en_US',
-    value: '1234'
+    value: '1234',
   },
   {
     language: 'en_US',
-    value: 'a publisher'
+    value: 'a publisher',
   },
   {
     language: 'en_US',
-    value: 'desc'
+    value: 'desc',
   }] as MetadataValue[];
 const mockSeperator = '<br/>';
 const mockLabel = 'fake.message';
@@ -33,16 +44,16 @@ describe('MetadataValuesComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
+          useClass: TranslateLoaderMock,
         },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
       ],
       declarations: [MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataValuesComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -52,6 +63,7 @@ describe('MetadataValuesComponent', () => {
     comp.mdValues = mockMetadata;
     comp.separator = mockSeperator;
     comp.label = mockLabel;
+    comp.urlRegex = /^.*test.*$/;
     fixture.detectChanges();
   }));
 
@@ -67,4 +79,9 @@ describe('MetadataValuesComponent', () => {
     expect(separators.length).toBe(mockMetadata.length - 1);
   });
 
+  it('should correctly detect a pattern on string containing "test"', () => {
+    const mdValue = { value: 'This is a test value' } as MetadataValue;
+    expect(comp.hasLink(mdValue)).toBe(true);
+  });
+
 });
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 3f0c918796..e8834879ab 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
@@ -1,6 +1,21 @@
-import { Component, Inject, Input, OnChanges, SimpleChanges } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
+import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
 import { MetadataValue } from '../../../core/shared/metadata.models';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
+import { VALUE_LIST_BROWSE_DEFINITION } from '../../../core/shared/value-list-browse-definition.resource-type';
+import { hasValue } from '../../../shared/empty.util';
+import { ImageField } from '../../simple/field-components/specific-field/item-page-field.component';
 
 /**
  * This component renders the configured 'values' into the ds-metadata-field-wrapper component.
@@ -9,7 +24,7 @@ import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 @Component({
   selector: 'ds-metadata-values',
   styleUrls: ['./metadata-values.component.scss'],
-  templateUrl: './metadata-values.component.html'
+  templateUrl: './metadata-values.component.html',
 })
 export class MetadataValuesComponent implements OnChanges {
 
@@ -40,12 +55,69 @@ export class MetadataValuesComponent implements OnChanges {
    */
   @Input() enableMarkdown = false;
 
+  /**
+   * Whether any valid HTTP(S) URL should be rendered as a link
+   */
+  @Input() urlRegex?;
+
   /**
    * This variable will be true if both {@link environment.markdown.enabled} and {@link enableMarkdown} are true.
    */
   renderMarkdown;
 
+
+  @Input() browseDefinition?: BrowseDefinition;
+
+  /**
+   * Optional {@code ImageField} reference that represents an image to be displayed inline.
+   */
+  @Input() img?: ImageField;
+
+  hasValue = hasValue;
+
   ngOnChanges(changes: SimpleChanges): void {
     this.renderMarkdown = !!this.appConfig.markdown.enabled && this.enableMarkdown;
   }
+
+  /**
+   * Does this metadata value have a configured link to a browse definition?
+   */
+  hasBrowseDefinition(): boolean {
+    return hasValue(this.browseDefinition);
+  }
+
+  /**
+   * Does this metadata value have a valid URL that should be rendered as a link?
+   * @param value A MetadataValue being displayed
+   */
+  hasLink(value: MetadataValue): boolean {
+    if (hasValue(this.urlRegex)) {
+      const pattern = new RegExp(this.urlRegex);
+      return pattern.test(value.value);
+    }
+    return false;
+  }
+
+  /**
+   * Return a queryparams object for use in a link, with the key dependent on whether this browse
+   * definition is metadata browse, or item browse
+   * @param value the specific metadata value being linked
+   */
+  getQueryParams(value) {
+    const queryParams = { startsWith: value };
+    if (this.browseDefinition.getRenderType() === VALUE_LIST_BROWSE_DEFINITION.value) {
+      return { value: value };
+    }
+    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);
+  }
 }
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 33acd6650b..7774754079 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,7 +1,7 @@
 <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"
@@ -13,12 +13,12 @@
 
                 <div class="file-section row mb-3" *ngFor="let file of originals?.page;">
                     <div class="col-3">
-                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
+                        <ds-themed-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-themed-thumbnail>
                     </div>
                     <div class="col-7">
                         <dl class="row">
                             <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{file.name}}</dd>
+                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
 
                             <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
                             <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
@@ -27,15 +27,16 @@
                             <dt class="col-md-4">{{"item.page.filesection.format" | translate}}</dt>
                             <dd class="col-md-8">{{(file.format | async)?.payload?.description}}</dd>
 
-
+                          <ng-container *ngIf="file.hasMetadata('dc.description')">
                             <dt class="col-md-4">{{"item.page.filesection.description" | translate}}</dt>
                             <dd class="col-md-8">{{file.firstMetadataValue("dc.description")}}</dd>
+                          </ng-container>
                         </dl>
                     </div>
                     <div class="col-2">
-                        <ds-file-download-link [bitstream]="file" [item]="item">
+                        <ds-themed-file-download-link [bitstream]="file" [item]="item">
                             {{"item.page.filesection.download" | translate}}
-                        </ds-file-download-link>
+                        </ds-themed-file-download-link>
                     </div>
                 </div>
             </ds-pagination>
@@ -43,7 +44,7 @@
     </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"
@@ -55,12 +56,12 @@
 
                 <div class="file-section row" *ngFor="let file of licenses?.page;">
                     <div class="col-3">
-                        <ds-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-thumbnail>
+                        <ds-themed-thumbnail [thumbnail]="(file.thumbnail | async)?.payload"></ds-themed-thumbnail>
                     </div>
                     <div class="col-7">
                         <dl class="row">
                             <dt class="col-md-4">{{"item.page.filesection.name" | translate}}</dt>
-                            <dd class="col-md-8">{{file.name}}</dd>
+                            <dd class="col-md-8">{{ dsoNameService.getName(file) }}</dd>
 
                             <dt class="col-md-4">{{"item.page.filesection.size" | translate}}</dt>
                             <dd class="col-md-8">{{(file.sizeBytes) | dsFileSize }}</dd>
@@ -74,9 +75,9 @@
                         </dl>
                     </div>
                     <div class="col-2">
-                        <ds-file-download-link [bitstream]="file" [item]="item">
+                        <ds-themed-file-download-link [bitstream]="file" [item]="item">
                             {{"item.page.filesection.download" | translate}}
-                        </ds-file-download-link>
+                        </ds-themed-file-download-link>
                     </div>
                 </div>
             </ds-pagination>
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
index 396e6c3216..046f34531f 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.spec.ts
@@ -1,26 +1,33 @@
-import { FullFileSectionComponent } from './full-file-section.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { VarDirective } from '../../../../shared/utils/var.directive';
-import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
-import { MetadataFieldWrapperComponent } from '../../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { of as observableOf } from 'rxjs';
-import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment';
+
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
 import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { FullFileSectionComponent } from './full-file-section.component';
 
 describe('FullFileSectionComponent', () => {
   let comp: FullFileSectionComponent;
@@ -34,11 +41,11 @@ describe('FullFileSectionComponent', () => {
       bundleName: 'ORIGINAL',
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
         },
         content: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content'
-        }
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+        },
       },
       id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
       uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
@@ -47,14 +54,14 @@ describe('FullFileSectionComponent', () => {
         'dc.title': [
           {
             language: null,
-            value: 'test_word.docx'
-          }
-        ]
-      }
+            value: 'test_word.docx',
+          },
+        ],
+      },
     });
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream]))
+    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([mockBitstream, mockBitstream, mockBitstream])),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -65,17 +72,18 @@ describe('FullFileSectionComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), BrowserAnimationsModule],
       declarations: [FullFileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
       providers: [
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: APP_CONFIG, useValue: environment },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
index e21c1a32eb..bd3ff97278 100644
--- a/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
+++ b/src/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -1,19 +1,36 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import {
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
-import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { Item } from '../../../../core/shared/item.model';
-import { followLink } from '../../../../shared/utils/follow-link-config.model';
-import { FileSectionComponent } from '../../../simple/field-components/file-section/file-section.component';
-import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { switchMap, tap } from 'rxjs/operators';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isEmpty } from '../../../../shared/empty.util';
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { Item } from '../../../../core/shared/item.model';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../../shared/pagination/pagination-component-options.model';
+import { followLink } from '../../../../shared/utils/follow-link-config.model';
+import { FileSectionComponent } from '../../../simple/field-components/file-section/file-section.component';
 
 /**
  * This component renders the file section of the item
@@ -23,9 +40,9 @@ import { PaginationService } from '../../../../core/pagination/pagination.servic
 @Component({
   selector: 'ds-item-page-full-file-section',
   styleUrls: ['./full-file-section.component.scss'],
-  templateUrl: './full-file-section.component.html'
+  templateUrl: './full-file-section.component.html',
 })
-export class FullFileSectionComponent extends FileSectionComponent implements OnInit {
+export class FullFileSectionComponent extends FileSectionComponent implements OnDestroy, OnInit {
 
   @Input() item: Item;
 
@@ -34,26 +51,27 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
   originals$: Observable<RemoteData<PaginatedList<Bitstream>>>;
   licenses$: Observable<RemoteData<PaginatedList<Bitstream>>>;
 
-  pageSize = 5;
   originalOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'obo',
     currentPage: 1,
-    pageSize: this.pageSize
+    pageSize: this.appConfig.item.bitstream.pageSize,
   });
 
   licenseOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'lbo',
     currentPage: 1,
-    pageSize: this.pageSize
+    pageSize: this.appConfig.item.bitstream.pageSize,
   });
 
   constructor(
     bitstreamDataService: BitstreamDataService,
     protected notificationsService: NotificationsService,
     protected translateService: TranslateService,
-    protected paginationService: PaginationService
+    protected paginationService: PaginationService,
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
-    super(bitstreamDataService, notificationsService, translateService);
+    super(bitstreamDataService, notificationsService, translateService, dsoNameService, appConfig);
   }
 
   ngOnInit(): void {
@@ -65,36 +83,36 @@ export class FullFileSectionComponent extends FileSectionComponent implements On
       switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.findAllByItemAndBundleName(
         this.item,
         'ORIGINAL',
-        {elementsPerPage: options.pageSize, currentPage: options.currentPage},
+        { elementsPerPage: options.pageSize, currentPage: options.currentPage },
         true,
         true,
         followLink('format'),
         followLink('thumbnail'),
       )),
       tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
-          if (hasValue(rd.errorMessage)) {
-            this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
-          }
+        if (hasValue(rd.errorMessage)) {
+          this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
         }
-      )
+      },
+      ),
     );
 
     this.licenses$ = this.paginationService.getCurrentPagination(this.licenseOptions.id, this.licenseOptions).pipe(
       switchMap((options: PaginationComponentOptions) => this.bitstreamDataService.findAllByItemAndBundleName(
         this.item,
         'LICENSE',
-        {elementsPerPage: options.pageSize, currentPage: options.currentPage},
+        { elementsPerPage: options.pageSize, currentPage: options.currentPage },
         true,
         true,
         followLink('format'),
         followLink('thumbnail'),
       )),
       tap((rd: RemoteData<PaginatedList<Bitstream>>) => {
-          if (hasValue(rd.errorMessage)) {
-            this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
-          }
+        if (hasValue(rd.errorMessage)) {
+          this.notificationsService.error(this.translateService.get('file-section.error.header'), `${rd.statusCode} ${rd.errorMessage}`);
         }
-      )
+      },
+      ),
     );
 
   }
diff --git a/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts b/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts
new file mode 100644
index 0000000000..de03cd07c8
--- /dev/null
+++ b/src/app/item-page/full/field-components/file-section/themed-full-file-section.component.ts
@@ -0,0 +1,36 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
+import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
+import { FullFileSectionComponent } from './full-file-section.component';
+
+/**
+ * Themed wrapper for {@link FullFileSectionComponent}
+ */
+@Component({
+  selector: 'ds-themed-item-page-full-file-section',
+  styleUrls: [],
+  templateUrl: './../../../../shared/theme-support/themed.component.html',
+})
+export class ThemedFullFileSectionComponent extends ThemedComponent<FullFileSectionComponent> {
+
+  @Input() item: Item;
+
+  protected inAndOutputNames: (keyof FullFileSectionComponent & keyof this)[] = ['item'];
+
+  protected getComponentName(): string {
+    return 'FullFileSectionComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/item-page/full/field-components/file-section/full-file-section.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./full-file-section.component');
+  }
+
+}
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 ee4ead2835..1d83181395 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -1,16 +1,13 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
-      <ds-item-alerts [item]="item"></ds-item-alerts>
+      <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-item-page-title-field class="mr-auto" [item]="item"></ds-item-page-title-field>
-          <div class="pl-2 space-children-mr">
-            <ds-dso-page-edit-button [pageRoute]="itemPageRoute$ | async" [dso]="item"
-                                     [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
-          </div>
+          <ds-themed-item-page-title-field class="mr-auto" [item]="item"></ds-themed-item-page-title-field>
+          <ds-dso-edit-menu></ds-dso-edit-menu>
         </div>
         <div class="simple-view-link my-3" *ngIf="!fromSubmissionObject">
           <a class="btn btn-outline-primary" [routerLink]="[(itemPageRoute$ | async)]">
@@ -30,7 +27,7 @@
             </tbody>
           </table>
         </div>
-        <ds-item-page-full-file-section [item]="item"></ds-item-page-full-file-section>
+        <ds-themed-item-page-full-file-section [item]="item"></ds-themed-item-page-full-file-section>
         <ds-item-page-collections [item]="item"></ds-item-page-collections>
         <ds-item-versions class="mt-2" [item]="item"></ds-item-versions>
         <div class="button-row bottom" *ngIf="fromSubmissionObject">
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 66c6488b8e..516f2e94cd 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
@@ -1,25 +1,48 @@
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { TruncatePipe } from '../../shared/utils/truncate.pipe';
-import { FullItemPageComponent } from './full-item-page.component';
-import { MetadataService } from '../../core/metadata/metadata.service';
-import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Item } from '../../core/shared/item.model';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { MetadataService } from '../../core/metadata/metadata.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { TruncatePipe } from '../../shared/utils/truncate.pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
+import { FullItemPageComponent } from './full-item-page.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -27,23 +50,23 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'test item'
-      }
-    ]
-  }
+        value: 'test item',
+      },
+    ],
+  },
 });
 
 const mockWithdrawnItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable(),
-  isWithdrawn: true
+  isWithdrawn: true,
 });
 
 const metadataServiceStub = {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   processRemoteData: () => {
-  }
+  },
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
 
@@ -55,13 +78,27 @@ describe('FullItemPageComponent', () => {
   let routeStub: ActivatedRouteStub;
   let routeData;
   let authorizationDataService: AuthorizationDataService;
+  let serverResponseService: jasmine.SpyObj<ServerResponseService>;
+  let signpostingDataService: jasmine.SpyObj<SignpostingDataService>;
+  let linkHeadService: jasmine.SpyObj<LinkHeadService>;
+  let notifyInfoService: jasmine.SpyObj<NotifyInfoService>;
 
+  const mocklink = {
+    href: 'http://test.org',
+    rel: 'test',
+    type: 'test',
+  };
 
+  const mocklink2 = {
+    href: 'http://test2.org',
+    rel: 'test',
+    type: 'test',
+  };
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     routeData = {
@@ -69,19 +106,38 @@ describe('FullItemPageComponent', () => {
     };
 
     routeStub = Object.assign(new ActivatedRouteStub(), {
-      data: observableOf(routeData)
+      data: observableOf(routeData),
     });
 
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
       isAuthorized: observableOf(false),
     });
 
+    serverResponseService = jasmine.createSpyObj('ServerResponseService', {
+      setHeader: jasmine.createSpy('setHeader'),
+    });
+
+    signpostingDataService = jasmine.createSpyObj('SignpostingDataService', {
+      getLinks: observableOf([mocklink, mocklink2]),
+    });
+
+    linkHeadService = jasmine.createSpyObj('LinkHeadService', {
+      addTag: jasmine.createSpy('setHeader'),
+      removeTag: jasmine.createSpy('removeTag'),
+    });
+
+    notifyInfoService = jasmine.createSpyObj('NotifyInfoService', {
+      isCoarConfigEnabled: observableOf(true),
+      getCoarLdnLocalInboxUrls: observableOf(['http://test.org']),
+      getInboxRelationLink: observableOf('http://test.org'),
+    });
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), RouterTestingModule.withRoutes([]), BrowserAnimationsModule],
       declarations: [FullItemPageComponent, TruncatePipe, VarDirective],
       providers: [
@@ -90,11 +146,15 @@ describe('FullItemPageComponent', () => {
         { provide: MetadataService, useValue: metadataServiceStub },
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationDataService },
+        { provide: ServerResponseService, useValue: serverResponseService },
+        { provide: SignpostingDataService, useValue: signpostingDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: NotifyInfoService, useValue: notifyInfoService },
+        { provide: PLATFORM_ID, useValue: 'server' },
       ],
-
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(FullItemPageComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -104,9 +164,13 @@ describe('FullItemPageComponent', () => {
     fixture.detectChanges();
   }));
 
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
   it('should display the item\'s metadata', () => {
     const table = fixture.debugElement.query(By.css('table'));
-    for (const metadatum of mockItem.allMetadata([])) {
+    for (const metadatum of mockItem.allMetadata(Object.keys(mockItem.metadata))) {
       expect(table.nativeElement.innerHTML).toContain(metadatum.value);
     }
   });
@@ -118,7 +182,7 @@ describe('FullItemPageComponent', () => {
   });
 
   it('should not show simple view button when originated from workflow', fakeAsync(() => {
-    routeData.wfi = createSuccessfulRemoteDataObject$({ id: 'wfiId'});
+    routeData.wfi = createSuccessfulRemoteDataObject$({ id: 'wfiId' });
     comp.ngOnInit();
     fixture.detectChanges();
     fixture.whenStable().then(() => {
@@ -137,7 +201,12 @@ describe('FullItemPageComponent', () => {
 
     it('should display the item', () => {
       const objectLoader = fixture.debugElement.query(By.css('.full-item-info'));
-      expect(objectLoader.nativeElement).toBeDefined();
+      expect(objectLoader.nativeElement).not.toBeNull();
+    });
+
+    it('should add the signposting links', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalled();
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(3);
     });
   });
   describe('when the item is withdrawn and the user is not an admin', () => {
@@ -161,7 +230,12 @@ describe('FullItemPageComponent', () => {
 
     it('should display the item', () => {
       const objectLoader = fixture.debugElement.query(By.css('.full-item-info'));
-      expect(objectLoader.nativeElement).toBeDefined();
+      expect(objectLoader).not.toBeNull();
+    });
+
+    it('should add the signposting links', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalled();
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(3);
     });
   });
 
@@ -173,7 +247,12 @@ describe('FullItemPageComponent', () => {
 
     it('should display the item', () => {
       const objectLoader = fixture.debugElement.query(By.css('.full-item-info'));
-      expect(objectLoader.nativeElement).toBeDefined();
+      expect(objectLoader).not.toBeNull();
+    });
+
+    it('should add the signposting links', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalled();
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(3);
     });
   });
 });
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 118e436004..7a2520f072 100644
--- a/src/app/item-page/full/full-item-page.component.ts
+++ b/src/app/item-page/full/full-item-page.component.ts
@@ -1,22 +1,39 @@
-import { filter, map } from 'rxjs/operators';
-import { ChangeDetectionStrategy, Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Data, Router } from '@angular/router';
+import { Location } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Router,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable } from 'rxjs';
-
-import { ItemPageComponent } from '../simple/item-page.component';
-import { MetadataMap } from '../../core/shared/metadata.models';
+import { AuthService } from '../../core/auth/auth.service';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { ItemDataService } from '../../core/data/item-data.service';
-
 import { RemoteData } from '../../core/data/remote-data';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
 import { Item } from '../../core/shared/item.model';
-
+import { MetadataMap } from '../../core/shared/metadata.models';
 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 { ItemPageComponent } from '../simple/item-page.component';
 
 /**
  * This component renders a full item page.
@@ -28,7 +45,7 @@ import { AuthorizationDataService } from '../../core/data/feature-authorization/
   styleUrls: ['./full-item-page.component.scss'],
   templateUrl: './full-item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class FullItemPageComponent extends ItemPageComponent implements OnInit, OnDestroy {
 
@@ -43,13 +60,20 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
 
   subs = [];
 
-  constructor(protected route: ActivatedRoute,
-              router: Router,
-              items: ItemDataService,
-              authService: AuthService,
-              authorizationService: AuthorizationDataService,
-              private _location: Location) {
-    super(route, router, items, authService, authorizationService);
+  constructor(
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected items: ItemDataService,
+    protected authService: AuthService,
+    protected authorizationService: AuthorizationDataService,
+    protected _location: Location,
+    protected responseService: ServerResponseService,
+    protected signpostingDataService: SignpostingDataService,
+    protected linkHeadService: LinkHeadService,
+    protected notifyInfoService: NotifyInfoService,
+    @Inject(PLATFORM_ID) protected platformId: string,
+  ) {
+    super(route, router, items, authService, authorizationService, responseService, signpostingDataService, linkHeadService, notifyInfoService, platformId);
   }
 
   /*** AoT inheritance fix, will hopefully be resolved in the near future **/
@@ -58,11 +82,11 @@ export class FullItemPageComponent extends ItemPageComponent implements OnInit,
     this.metadata$ = this.itemRD$.pipe(
       map((rd: RemoteData<Item>) => rd.payload),
       filter((item: Item) => hasValue(item)),
-      map((item: Item) => item.metadata),);
+      map((item: Item) => item.metadata));
 
     this.subs.push(this.route.data.subscribe((data: Data) => {
-        this.fromSubmissionObject = hasValue(data.wfi) || hasValue(data.wsi);
-      })
+      this.fromSubmissionObject = hasValue(data.wfi) || hasValue(data.wsi);
+    }),
     );
   }
 
diff --git a/src/app/item-page/full/themed-full-item-page.component.ts b/src/app/item-page/full/themed-full-item-page.component.ts
index a3b19e6f93..4b8e08a495 100644
--- a/src/app/item-page/full/themed-full-item-page.component.ts
+++ b/src/app/item-page/full/themed-full-item-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { FullItemPageComponent } from './full-item-page.component';
 
diff --git a/src/app/item-page/item-page-administrator.guard.ts b/src/app/item-page/item-page-administrator.guard.ts
index 5d3464aa75..905516195d 100644
--- a/src/app/item-page/item-page-administrator.guard.ts
+++ b/src/app/item-page/item-page-administrator.guard.ts
@@ -1,15 +1,23 @@
 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 {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../core/auth/auth.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { DsoPageSingleFeatureGuard } from '../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { Item } from '../core/shared/item.model';
+import { ItemPageResolver } from './item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
diff --git a/src/app/item-page/item-page-routing-paths.ts b/src/app/item-page/item-page-routing-paths.ts
index 90a4a54b1e..cded1dd74e 100644
--- a/src/app/item-page/item-page-routing-paths.ts
+++ b/src/app/item-page/item-page-routing-paths.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { Item } from '../core/shared/item.model';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { isNotEmpty } from '../shared/empty.util';
 
 export const ITEM_MODULE_PATH = 'items';
diff --git a/src/app/item-page/item-page-routing.module.ts b/src/app/item-page/item-page-routing.module.ts
index add2c3d768..ed86ba4082 100644
--- a/src/app/item-page/item-page-routing.module.ts
+++ b/src/app/item-page/item-page-routing.module.ts
@@ -1,25 +1,29 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { ItemPageResolver } from './item-page.resolver';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
-import { VersionResolver } from './version-page/version.resolver';
-import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
-import { LinkService } from '../core/cache/builders/link.service';
-import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
-import { ITEM_EDIT_PATH, ORCID_PATH, UPLOAD_BITSTREAM_PATH } from './item-page-routing-paths';
-import { ItemPageAdministratorGuard } from './item-page-administrator.guard';
-import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
-import { ThemedItemPageComponent } from './simple/themed-item-page.component';
-import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
-import { MenuItemType } from '../shared/menu/menu-item-type.model';
-import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import {
-  BitstreamRequestACopyPageComponent
-} from '../shared/bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
+
 import { REQUEST_COPY_MODULE_PATH } from '../app-routing-paths';
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { DSOBreadcrumbsService } from '../core/breadcrumbs/dso-breadcrumbs.service';
+import { ItemBreadcrumbResolver } from '../core/breadcrumbs/item-breadcrumb.resolver';
+import { LinkService } from '../core/cache/builders/link.service';
+import { DSOEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
+import { LinkMenuItemModel } from '../shared/menu/menu-item/models/link.model';
+import { MenuItemType } from '../shared/menu/menu-item-type.model';
+import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
+import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
+import { ItemPageResolver } from './item-page.resolver';
+import { ItemPageAdministratorGuard } from './item-page-administrator.guard';
+import {
+  ITEM_EDIT_PATH,
+  ORCID_PATH,
+  UPLOAD_BITSTREAM_PATH,
+} from './item-page-routing-paths';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
 import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
+import { ThemedItemPageComponent } from './simple/themed-item-page.component';
+import { VersionResolver } from './version-page/version.resolver';
+import { VersionPageComponent } from './version-page/version-page/version-page.component';
 
 @NgModule({
   imports: [
@@ -28,7 +32,8 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
         path: ':id',
         resolve: {
           dso: ItemPageResolver,
-          breadcrumb: ItemBreadcrumbResolver
+          breadcrumb: ItemBreadcrumbResolver,
+          menu: DSOEditMenuResolver,
         },
         runGuardsAndResolvers: 'always',
         children: [
@@ -49,7 +54,7 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
           {
             path: UPLOAD_BITSTREAM_PATH,
             component: UploadBitstreamComponent,
-            canActivate: [AuthenticatedGuard]
+            canActivate: [AuthenticatedGuard],
           },
           {
             path: REQUEST_COPY_MODULE_PATH,
@@ -58,8 +63,8 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
           {
             path: ORCID_PATH,
             component: OrcidPageComponent,
-            canActivate: [AuthenticatedGuard, OrcidPageGuard]
-          }
+            canActivate: [AuthenticatedGuard, OrcidPageGuard],
+          },
         ],
         data: {
           menu: {
@@ -67,6 +72,7 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
               id: 'statistics_item_:id',
               active: true,
               visible: true,
+              index: 2,
               model: {
                 type: MenuItemType.LINK,
                 text: 'menu.section.statistics',
@@ -85,10 +91,10 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
             resolve: {
               dso: VersionResolver,
             },
-          }
+          },
         ],
-      }
-    ])
+      },
+    ]),
   ],
   providers: [
     ItemPageResolver,
@@ -97,8 +103,8 @@ import { OrcidPageGuard } from './orcid-page/orcid-page.guard';
     LinkService,
     ItemPageAdministratorGuard,
     VersionResolver,
-    OrcidPageGuard
-  ]
+    OrcidPageGuard,
+  ],
 
 })
 export class ItemPageRoutingModule {
diff --git a/src/app/item-page/item-page.module.ts b/src/app/item-page/item-page.module.ts
index c4e86a37fb..397cf76993 100644
--- a/src/app/item-page/item-page.module.ts
+++ b/src/app/item-page/item-page.module.ts
@@ -1,60 +1,66 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { NgxGalleryModule } from '@kolkov/ngx-gallery';
+import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
 
-import { SharedModule } from '../shared/shared.module';
-
-import { ItemPageComponent } from './simple/item-page.component';
-import { ItemPageRoutingModule } from './item-page-routing.module';
-import { MetadataUriValuesComponent } from './field-components/metadata-uri-values/metadata-uri-values.component';
-import {
-  ItemPageAuthorFieldComponent
-} from './simple/field-components/specific-field/author/item-page-author-field.component';
-import {
-  ItemPageDateFieldComponent
-} from './simple/field-components/specific-field/date/item-page-date-field.component';
-import {
-  ItemPageAbstractFieldComponent
-} from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
-import { ItemPageUriFieldComponent } from './simple/field-components/specific-field/uri/item-page-uri-field.component';
-import { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component';
-import { CollectionsComponent } from './field-components/collections/collections.component';
-import { FullItemPageComponent } from './full/full-item-page.component';
-import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component';
-import { PublicationComponent } from './simple/item-types/publication/publication.component';
-import { ItemComponent } from './simple/item-types/shared/item.component';
-import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
-import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
-import { StatisticsModule } from '../statistics/statistics.module';
-import {
-  AbstractIncrementalListComponent
-} from './simple/abstract-incremental-list/abstract-incremental-list.component';
-import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ThemedItemPageComponent } from './simple/themed-item-page.component';
+import { DsoPageModule } from '../shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../shared/results-back-button/results-back-button.module';
+import { SharedModule } from '../shared/shared.module';
+import { UploadModule } from '../shared/upload/upload.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { ItemAlertsComponent } from './alerts/item-alerts.component';
+import { ThemedItemAlertsComponent } from './alerts/themed-item-alerts.component';
+import { BitstreamRequestACopyPageComponent } from './bitstreams/request-a-copy/bitstream-request-a-copy-page.component';
+import { UploadBitstreamComponent } from './bitstreams/upload/upload-bitstream.component';
+import { EditItemPageModule } from './edit-item-page/edit-item-page.module';
+import { CollectionsComponent } from './field-components/collections/collections.component';
+import { MetadataUriValuesComponent } from './field-components/metadata-uri-values/metadata-uri-values.component';
+import { FullFileSectionComponent } from './full/field-components/file-section/full-file-section.component';
+import { ThemedFullFileSectionComponent } from './full/field-components/file-section/themed-full-file-section.component';
+import { FullItemPageComponent } from './full/full-item-page.component';
 import { ThemedFullItemPageComponent } from './full/themed-full-item-page.component';
+import { ItemPageRoutingModule } from './item-page-routing.module';
+import { ItemSharedModule } from './item-shared.module';
 import { MediaViewerComponent } from './media-viewer/media-viewer.component';
-import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component';
 import { MediaViewerImageComponent } from './media-viewer/media-viewer-image/media-viewer-image.component';
-import { NgxGalleryModule } from '@kolkov/ngx-gallery';
+import { ThemedMediaViewerImageComponent } from './media-viewer/media-viewer-image/themed-media-viewer-image.component';
+import { MediaViewerVideoComponent } from './media-viewer/media-viewer-video/media-viewer-video.component';
+import { ThemedMediaViewerVideoComponent } from './media-viewer/media-viewer-video/themed-media-viewer-video.component';
+import { ThemedMediaViewerComponent } from './media-viewer/themed-media-viewer.component';
 import { MiradorViewerComponent } from './mirador-viewer/mirador-viewer.component';
-import { VersionPageComponent } from './version-page/version-page/version-page.component';
-import { VersionedItemComponent } from './simple/item-types/versioned-item/versioned-item.component';
-import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
 import { OrcidAuthComponent } from './orcid-page/orcid-auth/orcid-auth.component';
 import { OrcidPageComponent } from './orcid-page/orcid-page.component';
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
 import { OrcidQueueComponent } from './orcid-page/orcid-queue/orcid-queue.component';
-
+import { OrcidSyncSettingsComponent } from './orcid-page/orcid-sync-settings/orcid-sync-settings.component';
+import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
+import { FileSectionComponent } from './simple/field-components/file-section/file-section.component';
+import { ThemedFileSectionComponent } from './simple/field-components/file-section/themed-file-section.component';
+import { ItemPageAbstractFieldComponent } from './simple/field-components/specific-field/abstract/item-page-abstract-field.component';
+import { ItemPageAuthorFieldComponent } from './simple/field-components/specific-field/author/item-page-author-field.component';
+import { ItemPageDateFieldComponent } from './simple/field-components/specific-field/date/item-page-date-field.component';
+import { ItemPageFieldComponent } from './simple/field-components/specific-field/item-page-field.component';
+import { ItemPageUriFieldComponent } from './simple/field-components/specific-field/uri/item-page-uri-field.component';
+import { ItemPageComponent } from './simple/item-page.component';
+import { PublicationComponent } from './simple/item-types/publication/publication.component';
+import { ItemComponent } from './simple/item-types/shared/item.component';
+import { UntypedItemComponent } from './simple/item-types/untyped-item/untyped-item.component';
+import { NotifyRequestsStatusComponent } from './simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component';
+import { RequestStatusAlertBoxComponent } from './simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component';
+import { QaEventNotificationComponent } from './simple/qa-event-notification/qa-event-notification.component';
+import { ThemedItemPageComponent } from './simple/themed-item-page.component';
+import { VersionPageComponent } from './version-page/version-page/version-page.component';
+import { ItemVersionsModule } from './versions/item-versions.module';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   PublicationComponent,
-  UntypedItemComponent
+  UntypedItemComponent,
 ];
 
 const DECLARATIONS = [
+  FileSectionComponent,
   ThemedFileSectionComponent,
   ItemPageComponent,
   ThemedItemPageComponent,
@@ -68,20 +74,30 @@ const DECLARATIONS = [
   ItemPageFieldComponent,
   CollectionsComponent,
   FullFileSectionComponent,
+  ThemedFullFileSectionComponent,
   PublicationComponent,
   UntypedItemComponent,
   ItemComponent,
   UploadBitstreamComponent,
   AbstractIncrementalListComponent,
   MediaViewerComponent,
+  ThemedMediaViewerComponent,
   MediaViewerVideoComponent,
+  ThemedMediaViewerVideoComponent,
   MediaViewerImageComponent,
+  ThemedMediaViewerImageComponent,
   MiradorViewerComponent,
   VersionPageComponent,
   OrcidPageComponent,
   OrcidAuthComponent,
   OrcidSyncSettingsComponent,
-  OrcidQueueComponent
+  OrcidQueueComponent,
+  ItemAlertsComponent,
+  ThemedItemAlertsComponent,
+  BitstreamRequestACopyPageComponent,
+  QaEventNotificationComponent,
+  NotifyRequestsStatusComponent,
+  RequestStatusAlertBoxComponent,
 ];
 
 @NgModule({
@@ -90,19 +106,24 @@ const DECLARATIONS = [
     SharedModule.withEntryComponents(),
     ItemPageRoutingModule,
     EditItemPageModule,
+    ItemVersionsModule,
+    ItemSharedModule,
     StatisticsModule.forRoot(),
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents(),
     NgxGalleryModule,
-    NgbAccordionModule
+    NgbAccordionModule,
+    ResultsBackButtonModule,
+    UploadModule,
+    DsoPageModule,
   ],
   declarations: [
     ...DECLARATIONS,
-    VersionedItemComponent
+
   ],
   exports: [
-    ...DECLARATIONS
-  ]
+    ...DECLARATIONS,
+  ],
 })
 export class ItemPageModule {
   /**
@@ -112,7 +133,7 @@ export class ItemPageModule {
   static withEntryComponents() {
     return {
       ngModule: ItemPageModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 
diff --git a/src/app/item-page/item-page.resolver.spec.ts b/src/app/item-page/item-page.resolver.spec.ts
index 533f97d0c0..76b7dae774 100644
--- a/src/app/item-page/item-page.resolver.spec.ts
+++ b/src/app/item-page/item-page.resolver.spec.ts
@@ -1,19 +1,20 @@
-import { ItemPageResolver } from './item-page.resolver';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { TestBed } from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { first } from 'rxjs/operators';
+
 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 { TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { ItemPageResolver } from './item-page.resolver';
 
 describe('ItemPageResolver', () => {
   beforeEach(() => {
     TestBed.configureTestingModule({
       imports: [RouterTestingModule.withRoutes([{
         path: 'entities/:entity-type/:id',
-        component: {} as any
-      }])]
+        component: {} as any,
+      }])],
     });
   });
 
@@ -33,10 +34,10 @@ describe('ItemPageResolver', () => {
           uuid: uuid,
           firstMetadataValue(_keyOrKeys: string | string[], _valueFilter?: MetadataValueFilter): string {
             return entityType;
-          }
+          },
         });
         itemService = {
-          findById: (_id: string) => createSuccessfulRemoteDataObject$(item)
+          findById: (_id: string) => createSuccessfulRemoteDataObject$(item),
         };
         store = jasmine.createSpyObj('store', {
           dispatch: {},
@@ -54,7 +55,7 @@ describe('ItemPageResolver', () => {
             () => {
               expect(router.navigateByUrl).toHaveBeenCalledWith(router.parseUrl(`/entities/${entityType}/${uuid}`).toString());
               done();
-            }
+            },
           );
       });
 
@@ -68,7 +69,7 @@ describe('ItemPageResolver', () => {
             () => {
               expect(router.navigateByUrl).not.toHaveBeenCalled();
               done();
-            }
+            },
           );
       });
     }
diff --git a/src/app/item-page/item-page.resolver.ts b/src/app/item-page/item-page.resolver.ts
index e9b287406e..cfdb9b74d1 100644
--- a/src/app/item-page/item-page.resolver.ts
+++ b/src/app/item-page/item-page.resolver.ts
@@ -1,14 +1,19 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { ItemDataService } from '../core/data/item-data.service';
-import { Item } from '../core/shared/item.model';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
+import { ItemDataService } from '../core/data/item-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { Item } from '../core/shared/item.model';
 import { hasValue } from '../shared/empty.util';
-import { getItemPageRoute } from './item-page-routing-paths';
 import { ItemResolver } from './item.resolver';
+import { getItemPageRoute } from './item-page-routing-paths';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated and will redirect to the
@@ -19,7 +24,7 @@ export class ItemPageResolver extends ItemResolver {
   constructor(
     protected itemService: ItemDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
   ) {
     super(itemService, store, router);
   }
@@ -50,7 +55,7 @@ export class ItemPageResolver extends ItemResolver {
           }
         }
         return rd;
-      })
+      }),
     );
   }
 }
diff --git a/src/app/item-page/item-shared.module.ts b/src/app/item-page/item-shared.module.ts
index b191b6c4b3..36fe6ac3bd 100644
--- a/src/app/item-page/item-shared.module.ts
+++ b/src/app/item-page/item-shared.module.ts
@@ -1,36 +1,65 @@
-import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component';
+import {
+  CommonModule,
+  NgOptimizedImage,
+} from '@angular/common';
 import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemWithdrawnReinstateModalComponent } from '../shared/correction-suggestion/withdrawn-reinstate-modal.component';
+import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { SearchModule } from '../shared/search/search.module';
 import { SharedModule } from '../shared/shared.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { DYNAMIC_FORM_CONTROL_MAP_FN } from '@ng-dynamic-forms/core';
-import { dsDynamicFormControlMapFn } from '../shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
+import { MetadataValuesComponent } from './field-components/metadata-values/metadata-values.component';
+import { GenericItemPageFieldComponent } from './simple/field-components/specific-field/generic/generic-item-page-field.component';
+import { ItemPageImgFieldComponent } from './simple/field-components/specific-field/img/item-page-img-field.component';
+import { MetadataRepresentationListComponent } from './simple/metadata-representation-list/metadata-representation-list.component';
+import { ThemedMetadataRepresentationListComponent } from './simple/metadata-representation-list/themed-metadata-representation-list.component';
+import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component';
 import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
+import { RelatedItemsComponent } from './simple/related-items/related-items-component';
+import { ItemVersionsDeleteModalComponent } from './versions/item-versions-delete-modal/item-versions-delete-modal.component';
+import { ItemVersionsSummaryModalComponent } from './versions/item-versions-summary-modal/item-versions-summary-modal.component';
+
+const ENTRY_COMPONENTS = [
+  ItemVersionsDeleteModalComponent,
+  ItemVersionsSummaryModalComponent,
+  ItemWithdrawnReinstateModalComponent,
+
+];
 
 const COMPONENTS = [
+  ...ENTRY_COMPONENTS,
   RelatedEntitiesSearchComponent,
-  TabbedRelatedEntitiesSearchComponent
+  TabbedRelatedEntitiesSearchComponent,
+  MetadataValuesComponent,
+  GenericItemPageFieldComponent,
+  MetadataRepresentationListComponent,
+  ThemedMetadataRepresentationListComponent,
+  RelatedItemsComponent,
+  ItemPageImgFieldComponent,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
     SearchModule,
     SharedModule,
-    TranslateModule
+    TranslateModule,
+    NgOptimizedImage,
   ],
   exports: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   providers: [
     {
       provide: DYNAMIC_FORM_CONTROL_MAP_FN,
-      useValue: dsDynamicFormControlMapFn
-    }
-  ]
+      useValue: dsDynamicFormControlMapFn,
+    },
+    ...ENTRY_COMPONENTS,
+  ],
 })
 export class ItemSharedModule { }
diff --git a/src/app/item-page/item.resolver.ts b/src/app/item-page/item.resolver.ts
index ca6a6c5958..009adbea69 100644
--- a/src/app/item-page/item.resolver.ts
+++ b/src/app/item-page/item.resolver.ts
@@ -1,13 +1,22 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../core/data/remote-data';
-import { ItemDataService } from '../core/data/item-data.service';
-import { Item } from '../core/shared/item.model';
-import { followLink, FollowLinkConfig } from '../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { ItemDataService } from '../core/data/item-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { ResolvedAction } from '../core/resolving/resolver.actions';
+import { Item } from '../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -16,11 +25,11 @@ import { ResolvedAction } from '../core/resolving/resolver.actions';
 export const ITEM_PAGE_LINKS_TO_FOLLOW: FollowLinkConfig<Item>[] = [
   followLink('owningCollection', {},
     followLink('parentCommunity', {},
-      followLink('parentCommunity'))
+      followLink('parentCommunity')),
   ),
   followLink('relationships'),
   followLink('version', {}, followLink('versionhistory')),
-  followLink('thumbnail')
+  followLink('thumbnail'),
 ];
 
 /**
@@ -31,7 +40,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
   constructor(
     protected itemService: ItemDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
   ) {
   }
 
@@ -46,7 +55,7 @@ export class ItemResolver implements Resolve<RemoteData<Item>> {
     const itemRD$ = this.itemService.findById(route.params.id,
       true,
       false,
-      ...ITEM_PAGE_LINKS_TO_FOLLOW
+      ...ITEM_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss
index 72ce4b04d9..cba963b6fa 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss
+++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss
@@ -1,6 +1,20 @@
-.ngx-gallery {
-  display: inline-block;
-  margin-bottom: 20px;
-  width: 340px !important;
-  height: 279px !important;
+:host ::ng-deep {
+  .ngx-gallery {
+    width: unset !important;
+    height: unset !important;
+  }
+
+  ngx-gallery-image {
+    max-width: 340px !important;
+
+    .ngx-gallery-image {
+      background-position: left;
+    }
+  }
+
+  ngx-gallery-image:after {
+    padding-top: 75%;
+    display: block;
+    content: '';
+  }
 }
diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
index 98d0ac08a6..c824a729cd 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.spec.ts
@@ -1,21 +1,24 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NgxGalleryOptions } from '@kolkov/ngx-gallery';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
-
 import { MediaViewerImageComponent } from './media-viewer-image.component';
 
-import { of as observableOf } from 'rxjs';
-import { AuthService } from '../../../core/auth/auth.service';
-
 describe('MediaViewerImageComponent', () => {
   let component: MediaViewerImageComponent;
   let fixture: ComponentFixture<MediaViewerImageComponent>;
 
   const authService = jasmine.createSpyObj('authService', {
-    isAuthenticated: observableOf(false)
+    isAuthenticated: observableOf(false),
   });
 
   const mockBitstream: Bitstream = Object.assign(new Bitstream(), {
@@ -52,7 +55,7 @@ describe('MediaViewerImageComponent', () => {
     [
       { bitstream: mockBitstream, format: 'image', thumbnail: null },
       { bitstream: mockBitstream, format: 'image', thumbnail: null },
-    ]
+    ],
   );
 
   beforeEach(waitForAsync(() => {
@@ -71,7 +74,7 @@ describe('MediaViewerImageComponent', () => {
     component = fixture.componentInstance;
     component.galleryOptions = [new NgxGalleryOptions({})];
     component.galleryImages = component.convertToGalleryImage(
-      mockMediaViewerItems
+      mockMediaViewerItems,
     );
   });
 
diff --git a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
index 0c32b5603d..7f611180d6 100644
--- a/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
@@ -1,9 +1,18 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { NgxGalleryImage, NgxGalleryOptions } from '@kolkov/ngx-gallery';
-import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
-import { NgxGalleryAnimation } from '@kolkov/ngx-gallery';
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnInit,
+} from '@angular/core';
+import {
+  NgxGalleryAnimation,
+  NgxGalleryImage,
+  NgxGalleryOptions,
+} from '@kolkov/ngx-gallery';
 import { Observable } from 'rxjs';
+
 import { AuthService } from '../../../core/auth/auth.service';
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
 
 /**
  * This componenet render an image gallery for the image viewer
@@ -13,28 +22,28 @@ import { AuthService } from '../../../core/auth/auth.service';
   templateUrl: './media-viewer-image.component.html',
   styleUrls: ['./media-viewer-image.component.scss'],
 })
-export class MediaViewerImageComponent implements OnInit {
+export class MediaViewerImageComponent implements OnChanges, OnInit {
   @Input() images: MediaViewerItem[];
   @Input() preview?: boolean;
   @Input() image?: string;
 
-  loggedin: boolean;
+  thumbnailPlaceholder = './assets/images/replacement_image.svg';
 
-  galleryOptions: NgxGalleryOptions[];
-  galleryImages: NgxGalleryImage[];
+  galleryOptions: NgxGalleryOptions[] = [];
+
+  galleryImages: NgxGalleryImage[] = [];
 
   /**
    * Whether or not the current user is authenticated
    */
   isAuthenticated$: Observable<boolean>;
 
-  constructor(private authService: AuthService) {}
+  constructor(
+    protected authService: AuthService,
+  ) {
+  }
 
-  /**
-   * Thi method sets up the gallery settings and data
-   */
-  ngOnInit(): void {
-    this.isAuthenticated$ = this.authService.isAuthenticated();
+  ngOnChanges(): void {
     this.galleryOptions = [
       {
         preview: this.preview !== undefined ? this.preview : true,
@@ -50,7 +59,6 @@ export class MediaViewerImageComponent implements OnInit {
         previewFullscreen: true,
       },
     ];
-
     if (this.image) {
       this.galleryImages = [
         {
@@ -64,25 +72,30 @@ export class MediaViewerImageComponent implements OnInit {
     }
   }
 
+  ngOnInit(): void {
+    this.isAuthenticated$ = this.authService.isAuthenticated();
+    this.ngOnChanges();
+  }
+
   /**
    * This method convert an array of MediaViewerItem into NgxGalleryImage array
    * @param medias input NgxGalleryImage array
    */
   convertToGalleryImage(medias: MediaViewerItem[]): NgxGalleryImage[] {
-    const mappadImages = [];
+    const mappedImages = [];
     for (const image of medias) {
       if (image.format === 'image') {
-        mappadImages.push({
+        mappedImages.push({
           small: image.thumbnail
             ? image.thumbnail
-            : './assets/images/replacement_image.svg',
+            : this.thumbnailPlaceholder,
           medium: image.thumbnail
             ? image.thumbnail
-            : './assets/images/replacement_image.svg',
+            : this.thumbnailPlaceholder,
           big: image.bitstream._links.content.href,
         });
       }
     }
-    return mappadImages;
+    return mappedImages;
   }
 }
diff --git a/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts b/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts
new file mode 100644
index 0000000000..2229b7c71e
--- /dev/null
+++ b/src/app/item-page/media-viewer/media-viewer-image/themed-media-viewer-image.component.ts
@@ -0,0 +1,42 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { MediaViewerImageComponent } from './media-viewer-image.component';
+
+/**
+ * Themed wrapper for {@link MediaViewerImageComponent}.
+ */
+@Component({
+  selector: 'ds-themed-media-viewer-image',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedMediaViewerImageComponent extends ThemedComponent<MediaViewerImageComponent> {
+
+  @Input() images: MediaViewerItem[];
+  @Input() preview?: boolean;
+  @Input() image?: string;
+
+  protected inAndOutputNames: (keyof MediaViewerImageComponent & keyof this)[] = [
+    'images',
+    'preview',
+    'image',
+  ];
+
+  protected getComponentName(): string {
+    return 'MediaViewerImageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./media-viewer-image.component');
+  }
+
+}
diff --git a/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
new file mode 100644
index 0000000000..43996d096d
--- /dev/null
+++ b/src/app/item-page/media-viewer/media-viewer-video/caption-info.ts
@@ -0,0 +1,11 @@
+/*
+  The class is designed to host information related to Video Captioning support
+  and used in HTML 5 video track
+  src: source vtt file
+  srclang: two letter language code
+  langLabel: language label
+ */
+export class CaptionInfo {
+  constructor(public src: string, public srclang: string, public langLabel: string ) {
+  }
+}
diff --git a/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
new file mode 100644
index 0000000000..0f0c65c985
--- /dev/null
+++ b/src/app/item-page/media-viewer/media-viewer-video/language-helper.ts
@@ -0,0 +1,190 @@
+export const languageHelper = {
+  ab: 'Abkhazian',
+  aa: 'Afar',
+  af: 'Afrikaans',
+  ak: 'Akan',
+  sq: 'Albanian',
+  am: 'Amharic',
+  ar: 'Arabic',
+  an: 'Aragonese',
+  hy: 'Armenian',
+  as: 'Assamese',
+  av: 'Avaric',
+  ae: 'Avestan',
+  ay: 'Aymara',
+  az: 'Azerbaijani',
+  bm: 'Bambara',
+  ba: 'Bashkir',
+  eu: 'Basque',
+  be: 'Belarusian',
+  bn: 'Bengali (Bangla)',
+  bh: 'Bihari',
+  bi: 'Bislama',
+  bs: 'Bosnian',
+  br: 'Breton',
+  bg: 'Bulgarian',
+  my: 'Burmese',
+  ca: 'Catalan',
+  ch: 'Chamorro',
+  ce: 'Chechen',
+  ny: 'Chichewa, Chewa, Nyanja',
+  zh: 'Chinese',
+  cv: 'Chuvash',
+  kw: 'Cornish',
+  co: 'Corsican',
+  cr: 'Cree',
+  hr: 'Croatian',
+  cs: 'Czech',
+  da: 'Danish',
+  dv: 'Divehi, Dhivehi, Maldivian',
+  nl: 'Dutch',
+  dz: 'Dzongkha',
+  en: 'English',
+  eo: 'Esperanto',
+  et: 'Estonian',
+  ee: 'Ewe',
+  fo: 'Faroese',
+  fj: 'Fijian',
+  fi: 'Finnish',
+  fr: 'French',
+  ff: 'Fula, Fulah, Pulaar, Pular',
+  gl: 'Galician',
+  gd: 'Gaelic (Scottish)',
+  gv: 'Gaelic (Manx)',
+  ka: 'Georgian',
+  de: 'German',
+  el: 'Greek',
+  gn: 'Guarani',
+  gu: 'Gujarati',
+  ht: 'Haitian Creole',
+  ha: 'Hausa',
+  he: 'Hebrew',
+  hz: 'Herero',
+  hi: 'Hindi',
+  ho: 'Hiri Motu',
+  hu: 'Hungarian',
+  is: 'Icelandic',
+  io: 'Ido',
+  ig: 'Igbo',
+  in: 'Indonesian',
+  ia: 'Interlingua',
+  ie: 'Interlingue',
+  iu: 'Inuktitut',
+  ik: 'Inupiak',
+  ga: 'Irish',
+  it: 'Italian',
+  ja: 'Japanese',
+  jv: 'Javanese',
+  kl: 'Kalaallisut, Greenlandic',
+  kn: 'Kannada',
+  kr: 'Kanuri',
+  ks: 'Kashmiri',
+  kk: 'Kazakh',
+  km: 'Khmer',
+  ki: 'Kikuyu',
+  rw: 'Kinyarwanda (Rwanda)',
+  rn: 'Kirundi',
+  ky: 'Kyrgyz',
+  kv: 'Komi',
+  kg: 'Kongo',
+  ko: 'Korean',
+  ku: 'Kurdish',
+  kj: 'Kwanyama',
+  lo: 'Lao',
+  la: 'Latin',
+  lv: 'Latvian (Lettish)',
+  li: 'Limburgish ( Limburger)',
+  ln: 'Lingala',
+  lt: 'Lithuanian',
+  lu: 'Luga-Katanga',
+  lg: 'Luganda, Ganda',
+  lb: 'Luxembourgish',
+  mk: 'Macedonian',
+  mg: 'Malagasy',
+  ms: 'Malay',
+  ml: 'Malayalam',
+  mt: 'Maltese',
+  mi: 'Maori',
+  mr: 'Marathi',
+  mh: 'Marshallese',
+  mo: 'Moldavian',
+  mn: 'Mongolian',
+  na: 'Nauru',
+  nv: 'Navajo',
+  ng: 'Ndonga',
+  nd: 'Northern Ndebele',
+  ne: 'Nepali',
+  no: 'Norwegian',
+  nb: 'Norwegian bokmål',
+  nn: 'Norwegian nynorsk',
+  oc: 'Occitan',
+  oj: 'Ojibwe',
+  cu: 'Old Church Slavonic, Old Bulgarian',
+  or: 'Oriya',
+  om: 'Oromo (Afaan Oromo)',
+  os: 'Ossetian',
+  pi: 'Pāli',
+  ps: 'Pashto, Pushto',
+  fa: 'Persian (Farsi)',
+  pl: 'Polish',
+  pt: 'Portuguese',
+  pa: 'Punjabi (Eastern)',
+  qu: 'Quechua',
+  rm: 'Romansh',
+  ro: 'Romanian',
+  ru: 'Russian',
+  se: 'Sami',
+  sm: 'Samoan',
+  sg: 'Sango',
+  sa: 'Sanskrit',
+  sr: 'Serbian',
+  sh: 'Serbo-Croatian',
+  st: 'Sesotho',
+  tn: 'Setswana',
+  sn: 'Shona',
+  ii: 'Sichuan Yi, Nuosu',
+  sd: 'Sindhi',
+  si: 'Sinhalese',
+  ss: 'Siswati (Swati)',
+  sk: 'Slovak',
+  sl: 'Slovenian',
+  so: 'Somali',
+  nr: 'Southern Ndebele',
+  es: 'Spanish',
+  su: 'Sundanese',
+  sw: 'Swahili (Kiswahili)',
+  sv: 'Swedish',
+  tl: 'Tagalog',
+  ty: 'Tahitian',
+  tg: 'Tajik',
+  ta: 'Tamil',
+  tt: 'Tatar',
+  te: 'Telugu',
+  th: 'Thai',
+  bo: 'Tibetan',
+  ti: 'Tigrinya',
+  to: 'Tonga',
+  ts: 'Tsonga',
+  tr: 'Turkish',
+  tk: 'Turkmen',
+  tw: 'Twi',
+  ug: 'Uyghur',
+  uk: 'Ukrainian',
+  ur: 'Urdu',
+  uz: 'Uzbek',
+  ve: 'Venda',
+  vi: 'Vietnamese',
+  vo: 'Volapük',
+  wa: 'Wallon',
+  cy: 'Welsh',
+  wo: 'Wolof',
+  fy: 'Western Frisian',
+  xh: 'Xhosa',
+  yi: 'Yiddish',
+  yo: 'Yoruba',
+  za: 'Zhuang, Chuang',
+  zu: 'Zulu',
+};
+
+
+
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 a4493e36fc..3217680815 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
@@ -1,15 +1,22 @@
 <video
-  #media
-  [src]="filteredMedias[currentIndex].bitstream._links.content.href"
+  crossorigin="anonymous"
+  [src]="medias[currentIndex].bitstream._links.content.href"
   id="singleVideo"
   [poster]="
-    filteredMedias[currentIndex].thumbnail ||
-    replacements[filteredMedias[currentIndex].format]
+    medias[currentIndex].thumbnail ||
+    replacements[medias[currentIndex].format]
   "
   preload="none"
   controls
-></video>
-<div class="buttons" *ngIf="filteredMedias?.length > 1">
+>
+  <ng-container *ngIf="getMediaCap(medias[currentIndex].bitstream.name, captions) as capInfos">
+    <ng-container *ngFor="let capInfo of capInfos">
+      <track [src]="capInfo.src" [label]="capInfo.langLabel" [srclang]="capInfo.srclang" />
+    </ng-container>
+  </ng-container>
+
+</video>
+<div class="buttons" *ngIf="medias?.length > 1">
   <button
     class="btn btn-primary previous"
     [disabled]="currentIndex === 0"
@@ -20,7 +27,7 @@
 
   <button
     class="btn btn-primary next"
-    [disabled]="currentIndex === filteredMedias.length - 1"
+    [disabled]="currentIndex === medias.length - 1"
     (click)="nextMedia()"
   >
     {{ "media-viewer.next" | translate }}
@@ -36,11 +43,11 @@
     <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
       <button
         ngbDropdownItem
-        *ngFor="let item of filteredMedias; index as indexOfelement"
+        *ngFor="let item of medias; index as indexOfelement"
         class="list-element"
         (click)="selectedMedia(indexOfelement)"
       >
-        {{ item.bitstream.name }}
+        {{ dsoNameService.getName(item.bitstream) }}
       </button>
     </div>
   </div>
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss
index 7702da7361..bb8b9d360e 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss
@@ -1,4 +1,10 @@
 video {
-  width: 340px;
-  height: 279px;
+  width: 100%;
+  height: auto;
+  max-width: 340px;
+}
+
+.buttons {
+  display: flex;
+  gap: .25rem;
 }
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
index 354ba57727..0a5cf1a96c 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.spec.ts
@@ -1,17 +1,25 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { Bitstream } from '../../../core/shared/bitstream.model';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { MetadataFieldWrapperComponent } from '../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { FileSizePipe } from '../../../shared/utils/file-size-pipe';
 import { VarDirective } from '../../../shared/utils/var.directive';
-import { MetadataFieldWrapperComponent } from '../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
-import { MockBitstreamFormat1 } from '../../../shared/mocks/item.mock';
 import { MediaViewerVideoComponent } from './media-viewer-video.component';
-import { By } from '@angular/platform-browser';
 
 describe('MediaViewerVideoComponent', () => {
   let component: MediaViewerVideoComponent;
@@ -72,18 +80,17 @@ describe('MediaViewerVideoComponent', () => {
     [
       { bitstream: mockBitstream, format: 'video', thumbnail: null },
       { bitstream: mockBitstream, format: 'video', thumbnail: null },
-    ]
+    ],
   );
   const mockMediaViewerItem: MediaViewerItem[] = Object.assign(
     new Array<MediaViewerItem>(),
-    [{ bitstream: mockBitstream, format: 'video', thumbnail: null }]
+    [{ bitstream: mockBitstream, format: 'video', thumbnail: null }],
   );
 
   beforeEach(() => {
     fixture = TestBed.createComponent(MediaViewerVideoComponent);
     component = fixture.componentInstance;
     component.medias = mockMediaViewerItem;
-    component.filteredMedias = mockMediaViewerItem;
     fixture.detectChanges();
   });
 
@@ -94,7 +101,6 @@ describe('MediaViewerVideoComponent', () => {
   describe('should show controller buttons when the having mode then one video', () => {
     beforeEach(() => {
       component.medias = mockMediaViewerItems;
-      component.filteredMedias = mockMediaViewerItems;
       fixture.detectChanges();
     });
 
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
index 4c578a51bb..6fdbfc85cf 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -1,20 +1,29 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Bitstream } from 'src/app/core/shared/bitstream.model';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { CaptionInfo } from './caption-info';
+import { languageHelper } from './language-helper';
 
 /**
- * This componenet renders a video viewer and playlist for the media viewer
+ * This component renders a video viewer and playlist for the media viewer
  */
 @Component({
   selector: 'ds-media-viewer-video',
   templateUrl: './media-viewer-video.component.html',
   styleUrls: ['./media-viewer-video.component.scss'],
 })
-export class MediaViewerVideoComponent implements OnInit {
+export class MediaViewerVideoComponent {
   @Input() medias: MediaViewerItem[];
 
-  filteredMedias: MediaViewerItem[];
+  @Input() captions: Bitstream[] = [];
+
+  isCollapsed = false;
 
-  isCollapsed: boolean;
   currentIndex = 0;
 
   replacements = {
@@ -22,17 +31,39 @@ export class MediaViewerVideoComponent implements OnInit {
     audio: './assets/images/replacement_audio.svg',
   };
 
-  replacementThumbnail: string;
-
-  ngOnInit() {
-    this.isCollapsed = false;
-    this.filteredMedias = this.medias.filter(
-      (media) => media.format === 'audio' || media.format === 'video'
-    );
+  constructor(
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   /**
-   * This method sets the reviced index into currentIndex
+   * This method check if there is caption file for the media
+   * The caption file name is the media name plus "-" following two letter
+   * language code and .vtt suffix
+   *
+   * html5 video only support WEBVTT format
+   *
+   * Two letter language code reference
+   * https://www.w3schools.com/tags/ref_language_codes.asp
+   */
+  getMediaCap(name: string, captions: Bitstream[]): CaptionInfo[] {
+    const capInfos: CaptionInfo[] = [];
+    const filteredCapMedias: Bitstream[] = captions
+      .filter((media: Bitstream) => media.name.substring(0, (media.name.length - 7)).toLowerCase() === name.toLowerCase());
+
+    for (const media of filteredCapMedias) {
+      const srclang: string = media.name.slice(-6, -4).toLowerCase();
+      capInfos.push(new CaptionInfo(
+        media._links.content.href,
+        srclang,
+        languageHelper[srclang],
+      ));
+    }
+    return capInfos;
+  }
+
+  /**
+   * This method sets the received index into currentIndex
    * @param index Selected index
    */
   selectedMedia(index: number) {
@@ -40,14 +71,14 @@ export class MediaViewerVideoComponent implements OnInit {
   }
 
   /**
-   * This method increade the number of the currentIndex
+   * This method increases the number of the currentIndex
    */
   nextMedia() {
     this.currentIndex++;
   }
 
   /**
-   * This method decrese the number of the currentIndex
+   * This method decreases the number of the currentIndex
    */
   prevMedia() {
     this.currentIndex--;
diff --git a/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts b/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts
new file mode 100644
index 0000000000..7dca0c99df
--- /dev/null
+++ b/src/app/item-page/media-viewer/media-viewer-video/themed-media-viewer-video.component.ts
@@ -0,0 +1,42 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { MediaViewerItem } from '../../../core/shared/media-viewer-item.model';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { MediaViewerVideoComponent } from './media-viewer-video.component';
+
+/**
+ * Themed wrapper for {@link MediaViewerVideoComponent}.
+ */
+@Component({
+  selector: 'ds-themed-media-viewer-video',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedMediaViewerVideoComponent extends ThemedComponent<MediaViewerVideoComponent> {
+
+  @Input() medias: MediaViewerItem[];
+
+  @Input() captions: Bitstream[];
+
+  protected inAndOutputNames: (keyof MediaViewerVideoComponent & keyof this)[] = [
+    'medias',
+    'captions',
+  ];
+
+  protected getComponentName(): string {
+    return 'MediaViewerVideoComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./media-viewer-video.component');
+  }
+
+}
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 4259af5250..c8a02e039c 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.html
+++ b/src/app/item-page/media-viewer/media-viewer.component.html
@@ -5,32 +5,23 @@
     [showMessage]="false"
   ></ds-themed-loading>
   <div class="media-viewer" *ngIf="!isLoading">
-    <ng-container *ngIf="mediaList.length > 0">
-      <ng-container *ngIf="videoOptions">
-        <ng-container
-          *ngIf="
-            mediaList[0]?.format === 'video' || mediaList[0]?.format === 'audio'
-          "
-        >
-          <ds-media-viewer-video [medias]="mediaList"></ds-media-viewer-video>
+    <ng-container *ngIf="mediaList.length > 0; else showThumbnail">
+      <ng-container *ngVar="mediaOptions.video && ['audio', 'video'].includes(mediaList[0]?.format) as showVideo">
+        <ng-container *ngVar="mediaOptions.image && mediaList[0]?.format === 'image' as showImage">
+          <ds-themed-media-viewer-video *ngIf="showVideo" [medias]="mediaList" [captions]="captions$ | async"></ds-themed-media-viewer-video>
+          <ds-themed-media-viewer-image *ngIf="showImage" [images]="mediaList"></ds-themed-media-viewer-image>
+          <ng-container *ngIf="showImage || showVideo; else showThumbnail"></ng-container>
         </ng-container>
       </ng-container>
-        <ng-container *ngIf="mediaList[0]?.format === 'image'">
-          <ds-media-viewer-image [images]="mediaList"></ds-media-viewer-image>
-        </ng-container>
-    </ng-container>
-    <ng-container
-      *ngIf="
-        ((mediaList[0]?.format !== 'image') &&
-          (!videoOptions || mediaList[0]?.format !== 'video') &&
-          (!videoOptions || mediaList[0]?.format !== 'audio')) ||
-        mediaList.length === 0
-      "
-    >
-      <ds-media-viewer-image
-        [image]="mediaList[0]?.thumbnail || thumbnailPlaceholder"
-        [preview]="false"
-      ></ds-media-viewer-image>
     </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>
+  </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 39a35ebe61..a91c5ab17b 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
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
+import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
+import { MetadataFieldWrapperComponent } from '../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../shared/mocks/item.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { of as observableOf } from 'rxjs';
-import { By } from '@angular/platform-browser';
-import { MediaViewerComponent } from './media-viewer.component';
-import { MockBitstreamFormat1 } from '../../shared/mocks/item.mock';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { MetadataFieldWrapperComponent } from '../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
 import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { MediaViewerComponent } from './media-viewer.component';
 
 describe('MediaViewerComponent', () => {
   let comp: MediaViewerComponent;
@@ -51,17 +59,17 @@ describe('MediaViewerComponent', () => {
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
     findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(
-      createPaginatedList([mockBitstream])
+      createPaginatedList([mockBitstream]),
     ),
   });
 
   const mockMediaViewerItem: MediaViewerItem = Object.assign(
     new MediaViewerItem(),
-    { bitstream: mockBitstream, format: 'image', thumbnail: null }
+    { bitstream: mockBitstream, format: 'image', thumbnail: null },
   );
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
@@ -94,7 +102,10 @@ describe('MediaViewerComponent', () => {
   describe('when the bitstreams are loading', () => {
     beforeEach(() => {
       comp.mediaList$.next([mockMediaViewerItem]);
-      comp.videoOptions = true;
+      comp.mediaOptions = {
+        image: true,
+        video: true,
+      };
       comp.isLoading = true;
       fixture.detectChanges();
     });
@@ -103,7 +114,7 @@ describe('MediaViewerComponent', () => {
       const mediaItem = comp.createMediaViewerItem(
         mockBitstream,
         MockBitstreamFormat1,
-        undefined
+        undefined,
       );
       expect(mediaItem).toBeTruthy();
       expect(mediaItem.thumbnail).toBe(null);
@@ -118,7 +129,10 @@ describe('MediaViewerComponent', () => {
   describe('when the bitstreams loading is failed', () => {
     beforeEach(() => {
       comp.mediaList$.next([]);
-      comp.videoOptions = true;
+      comp.mediaOptions = {
+        image: true,
+        video: true,
+      };
       comp.isLoading = false;
       fixture.detectChanges();
     });
@@ -127,7 +141,7 @@ describe('MediaViewerComponent', () => {
       const mediaItem = comp.createMediaViewerItem(
         mockBitstream,
         MockBitstreamFormat1,
-        undefined
+        undefined,
       );
       expect(mediaItem).toBeTruthy();
       expect(mediaItem.thumbnail).toBe(null);
@@ -135,7 +149,7 @@ describe('MediaViewerComponent', () => {
 
     it('should display a default, thumbnail', () => {
       const defaultThumbnail = fixture.debugElement.query(
-        By.css('ds-media-viewer-image')
+        By.css('ds-themed-media-viewer-image'),
       );
       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 3f9de8ed3e..9540775eb4 100644
--- a/src/app/item-page/media-viewer/media-viewer.component.ts
+++ b/src/app/item-page/media-viewer/media-viewer.component.ts
@@ -1,11 +1,27 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
+
+import { MediaViewerConfig } from '../../../config/media-viewer-config.interface';
+import { environment } from '../../../environments/environment';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { Bitstream } from '../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
 import { Item } from '../../core/shared/item.model';
 import { MediaViewerItem } from '../../core/shared/media-viewer-item.model';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
@@ -13,59 +29,80 @@ import { hasValue } from '../../shared/empty.util';
 import { followLink } from '../../shared/utils/follow-link-config.model';
 
 /**
- * This componenet renders the media viewers
+ * This component renders the media viewers
  */
-
 @Component({
   selector: 'ds-media-viewer',
   templateUrl: './media-viewer.component.html',
   styleUrls: ['./media-viewer.component.scss'],
 })
-export class MediaViewerComponent implements OnInit {
+export class MediaViewerComponent implements OnDestroy, OnInit {
   @Input() item: Item;
-  @Input() videoOptions: boolean;
 
-  mediaList$: BehaviorSubject<MediaViewerItem[]>;
+  @Input() mediaOptions: MediaViewerConfig = environment.mediaViewer;
 
-  isLoading: boolean;
+  mediaList$: BehaviorSubject<MediaViewerItem[]> = new BehaviorSubject([]);
+
+  captions$: BehaviorSubject<Bitstream[]> = new BehaviorSubject([]);
+
+  isLoading = true;
 
   thumbnailPlaceholder = './assets/images/replacement_document.svg';
 
-  constructor(protected bitstreamDataService: BitstreamDataService) {}
+  thumbnailsRD$: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  subs: Subscription[] = [];
+
+  constructor(
+    protected bitstreamDataService: BitstreamDataService,
+    protected changeDetectorRef: ChangeDetectorRef,
+  ) {
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((subscription: Subscription) => subscription.unsubscribe());
+  }
 
   /**
-   * This metod loads all the Bitstreams and Thumbnails and contert it to media item
+   * This method loads all the Bitstreams and Thumbnails and converts it to {@link MediaViewerItem}s
    */
   ngOnInit(): void {
-    this.mediaList$ = new BehaviorSubject([]);
-    this.isLoading = true;
-    this.loadRemoteData('ORIGINAL').subscribe((bitstreamsRD) => {
+    const types: string[] = [
+      ...(this.mediaOptions.image ? ['image'] : []),
+      ...(this.mediaOptions.video ? ['audio', 'video'] : []),
+    ];
+    this.thumbnailsRD$ = this.loadRemoteData('THUMBNAIL');
+    this.subs.push(this.loadRemoteData('ORIGINAL').subscribe((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
       if (bitstreamsRD.payload.page.length === 0) {
         this.isLoading = false;
         this.mediaList$.next([]);
       } else {
-        this.loadRemoteData('THUMBNAIL').subscribe((thumbnailsRD) => {
+        this.subs.push(this.thumbnailsRD$.subscribe((thumbnailsRD: RemoteData<PaginatedList<Bitstream>>) => {
           for (
             let index = 0;
             index < bitstreamsRD.payload.page.length;
             index++
           ) {
-            bitstreamsRD.payload.page[index].format
+            this.subs.push(bitstreamsRD.payload.page[index].format
               .pipe(getFirstSucceededRemoteDataPayload())
-              .subscribe((format) => {
-                const current = this.mediaList$.getValue();
+              .subscribe((format: BitstreamFormat) => {
                 const mediaItem = this.createMediaViewerItem(
                   bitstreamsRD.payload.page[index],
                   format,
-                  thumbnailsRD.payload && thumbnailsRD.payload.page[index]
+                  thumbnailsRD.payload && thumbnailsRD.payload.page[index],
                 );
-                this.mediaList$.next([...current, mediaItem]);
-              });
+                if (types.includes(mediaItem.format)) {
+                  this.mediaList$.next([...this.mediaList$.getValue(), mediaItem]);
+                } else if (format.mimetype === 'text/vtt') {
+                  this.captions$.next([...this.captions$.getValue(), bitstreamsRD.payload.page[index]]);
+                }
+              }));
           }
           this.isLoading = false;
-        });
+          this.changeDetectorRef.detectChanges();
+        }));
       }
-    });
+    }));
   }
 
   /**
@@ -73,7 +110,7 @@ export class MediaViewerComponent implements OnInit {
    * @param bundleName Bundle name
    */
   loadRemoteData(
-    bundleName: string
+    bundleName: string,
   ): Observable<RemoteData<PaginatedList<Bitstream>>> {
     return this.bitstreamDataService
       .findAllByItemAndBundleName(
@@ -82,32 +119,29 @@ export class MediaViewerComponent implements OnInit {
         {},
         true,
         true,
-        followLink('format')
+        followLink('format'),
       )
       .pipe(
         filter(
           (bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) =>
             hasValue(bitstreamsRD) &&
-            (hasValue(bitstreamsRD.errorMessage) || hasValue(bitstreamsRD.payload))
+            (hasValue(bitstreamsRD.errorMessage) || hasValue(bitstreamsRD.payload)),
         ),
-        take(1)
+        take(1),
       );
   }
 
   /**
-   * This method create MediaViewerItem from incoming bitstreams
-   * @param original original remote data bitstream
+   * This method creates a {@link MediaViewerItem} from incoming {@link Bitstream}s
+   * @param original original bitstream
    * @param format original bitstream format
-   * @param thumbnail trunbnail remote data bitstream
+   * @param thumbnail thumbnail bitstream
    */
-  createMediaViewerItem(
-    original: Bitstream,
-    format: BitstreamFormat,
-    thumbnail: Bitstream
-  ): MediaViewerItem {
+  createMediaViewerItem(original: Bitstream, format: BitstreamFormat, thumbnail: Bitstream): MediaViewerItem {
     const mediaItem = new MediaViewerItem();
     mediaItem.bitstream = original;
     mediaItem.format = format.mimetype.split('/')[0];
+    mediaItem.mimetype = format.mimetype;
     mediaItem.thumbnail = thumbnail ? thumbnail._links.content.href : null;
     return mediaItem;
   }
diff --git a/src/app/item-page/media-viewer/themed-media-viewer.component.ts b/src/app/item-page/media-viewer/themed-media-viewer.component.ts
new file mode 100644
index 0000000000..e8b9f8799c
--- /dev/null
+++ b/src/app/item-page/media-viewer/themed-media-viewer.component.ts
@@ -0,0 +1,41 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { MediaViewerConfig } from '../../../config/media-viewer-config.interface';
+import { Item } from '../../core/shared/item.model';
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { MediaViewerComponent } from './media-viewer.component';
+
+/**
+ * Themed wrapper for {@link MediaViewerComponent}.
+ */
+@Component({
+  selector: 'ds-themed-media-viewer',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedMediaViewerComponent extends ThemedComponent<MediaViewerComponent> {
+
+  @Input() item: Item;
+  @Input() mediaOptions: MediaViewerConfig;
+
+  protected inAndOutputNames: (keyof MediaViewerComponent & keyof this)[] = [
+    'item',
+    'mediaOptions',
+  ];
+
+  protected getComponentName(): string {
+    return 'MediaViewerComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/item-page/media-viewer/media-viewer.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./media-viewer.component');
+  }
+
+}
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts b/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts
index 40ad0fd5d0..bff2dd4ddd 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.spec.ts
@@ -1,25 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { MiradorViewerComponent } from './mirador-viewer.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MetadataMap } from '../../core/shared/metadata.models';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../core/data/bundle-data.service';
 import { Item } from '../../core/shared/item.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { HostWindowService } from '../../shared/host-window.service';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { of as observableOf } from 'rxjs';
+import { createRelationshipsObservable } from '../simple/item-types/shared/item.component.spec';
+import { MiradorViewerComponent } from './mirador-viewer.component';
 import { MiradorViewerService } from './mirador-viewer.service';
-import { HostWindowService } from '../../shared/host-window.service';
-import { BundleDataService } from '../../core/data/bundle-data.service';
 
 
 function getItem(metadata: MetadataMap) {
   return Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: metadata,
-    relationships: createRelationshipsObservable()
+    relationships: createRelationshipsObservable(),
   });
 }
 
@@ -41,22 +49,22 @@ describe('MiradorViewerComponent with search', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
         { provide: BitstreamDataService, useValue: {} },
         { provide: BundleDataService, useValue: {} },
-        { provide: HostWindowService, useValue: mockHostWindowService }
+        { provide: HostWindowService, useValue: mockHostWindowService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
-          { provide: MiradorViewerService, useValue: viewerService }
-        ]
-      }
+          { provide: MiradorViewerService, useValue: viewerService },
+        ],
+      },
     }).compileComponents();
   }));
   describe('searchable item', () => {
@@ -104,22 +112,22 @@ describe('MiradorViewerComponent with multiple images', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
         { provide: BitstreamDataService, useValue: {} },
         { provide: BundleDataService, useValue: {} },
-        { provide: HostWindowService, useValue: mockHostWindowService  }
+        { provide: HostWindowService, useValue: mockHostWindowService  },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
-          { provide: MiradorViewerService, useValue: viewerService }
-          ]
-      }
+          { provide: MiradorViewerService, useValue: viewerService },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -164,22 +172,22 @@ describe('MiradorViewerComponent with a single image', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
         { provide: BitstreamDataService, useValue: {} },
         { provide: BundleDataService, useValue: {} },
-        { provide: HostWindowService, useValue: mockHostWindowService }
+        { provide: HostWindowService, useValue: mockHostWindowService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
-          { provide: MiradorViewerService, useValue: viewerService }
-        ]
-      }
+          { provide: MiradorViewerService, useValue: viewerService },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -217,22 +225,22 @@ describe('MiradorViewerComponent in development mode', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [MiradorViewerComponent],
       providers: [
-        { provide: BitstreamDataService, useValue: {} }
+        { provide: BitstreamDataService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MiradorViewerComponent, {
       set: {
         providers: [
           { provide: MiradorViewerService, useValue: viewerService },
           { provide: BundleDataService, useValue: {} },
-          { provide: HostWindowService, useValue: mockHostWindowService  }
-        ]
-      }
+          { provide: HostWindowService, useValue: mockHostWindowService  },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -253,7 +261,7 @@ describe('MiradorViewerComponent in development mode', () => {
     it('should show message', (() => {
       const value = fixture.debugElement
         .nativeElement.querySelector('#viewer-message');
-      expect(value).toBeDefined();
+      expect(value).not.toBeNull();
     }));
 
   });
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..8011b589e7 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.component.ts
@@ -1,21 +1,41 @@
-import { ChangeDetectionStrategy, Component, Inject, Input, OnInit, PLATFORM_ID } from '@angular/core';
-import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
-import { Item } from '../../core/shared/item.model';
+import { isPlatformBrowser } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  Input,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  DomSanitizer,
+  SafeResourceUrl,
+} from '@angular/platform-browser';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../environments/environment';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { Observable, of } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-import { isPlatformBrowser } from '@angular/common';
-import { MiradorViewerService } from './mirador-viewer.service';
-import { HostWindowService, WidthCategory } from '../../shared/host-window.service';
 import { BundleDataService } from '../../core/data/bundle-data.service';
+import { Item } from '../../core/shared/item.model';
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../../shared/host-window.service';
+import { MiradorViewerService } from './mirador-viewer.service';
 
 @Component({
   selector: 'ds-mirador-viewer',
   styleUrls: ['./mirador-viewer.component.scss'],
   templateUrl: './mirador-viewer.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  providers: [ MiradorViewerService ]
+  providers: [ MiradorViewerService ],
 })
 export class MiradorViewerComponent implements OnInit {
 
@@ -70,7 +90,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;
@@ -104,10 +125,10 @@ export class MiradorViewerComponent implements OnInit {
       // menu by hiding it for smaller viewports. This will not be
       // responsive to resizing.
       this.hostWindowService.widthCategory
-          .pipe(take(1))
-          .subscribe((category: WidthCategory) => {
-            this.notMobile = !(category === WidthCategory.XS || category === WidthCategory.SM);
-          });
+        .pipe(take(1))
+        .subscribe((category: WidthCategory) => {
+          this.notMobile = !(category === WidthCategory.XS || category === WidthCategory.SM);
+        });
 
       // Set the multi property. The default mirador configuration adds a right
       // thumbnail navigation panel to the viewer when multi is 'true'.
@@ -119,7 +140,7 @@ export class MiradorViewerComponent implements OnInit {
         this.iframeViewerUrl = observable.pipe(
           map((val) => {
             return this.setURL();
-          })
+          }),
         );
       } else {
         // Set the multi property based on the image count in IIIF-eligible bundles.
@@ -133,7 +154,7 @@ export class MiradorViewerComponent implements OnInit {
               this.multi = true;
             }
             return this.setURL();
-          })
+          }),
         );
       }
     }
diff --git a/src/app/item-page/mirador-viewer/mirador-viewer.service.ts b/src/app/item-page/mirador-viewer/mirador-viewer.service.ts
index c7a0affd53..6e502a8143 100644
--- a/src/app/item-page/mirador-viewer/mirador-viewer.service.ts
+++ b/src/app/item-page/mirador-viewer/mirador-viewer.service.ts
@@ -1,18 +1,29 @@
-import { Injectable, isDevMode } from '@angular/core';
-import { Observable } from 'rxjs';
-import { Item } from '../../core/shared/item.model';
 import {
-    getFirstCompletedRemoteData,
-} from '../../core/shared/operators';
-import { filter, last, map, mergeMap, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
+  Injectable,
+  isDevMode,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  filter,
+  last,
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { BundleDataService } from '../../core/data/bundle-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
 import { Bundle } from '../../core/shared/bundle.model';
-import { BundleDataService } from '../../core/data/bundle-data.service';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 
 @Injectable()
 export class MiradorViewerService {
@@ -39,43 +50,43 @@ export class MiradorViewerService {
    */
   getImageCount(item: Item, bitstreamDataService: BitstreamDataService, bundleDataService: BundleDataService):
       Observable<number> {
-      let count = 0;
-      return bundleDataService.findAllByItem(item).pipe(
+    let count = 0;
+    return bundleDataService.findAllByItem(item).pipe(
+      getFirstCompletedRemoteData(),
+      map((bundlesRD: RemoteData<PaginatedList<Bundle>>) => {
+        return bundlesRD.payload;
+      }),
+      map((paginatedList: PaginatedList<Bundle>) => paginatedList.page),
+      switchMap((bundles: Bundle[]) => bundles),
+      filter((b: Bundle) => this.isIiifBundle(b.name)),
+      mergeMap((bundle: Bundle) => {
+        return bitstreamDataService.findAllByItemAndBundleName(item, bundle.name, {
+          currentPage: 1,
+          elementsPerPage: 5,
+        }, true, true, ...this.LINKS_TO_FOLLOW).pipe(
           getFirstCompletedRemoteData(),
-          map((bundlesRD: RemoteData<PaginatedList<Bundle>>) => {
-              return bundlesRD.payload;
+          map((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
+            return bitstreamsRD.payload;
           }),
-          map((paginatedList: PaginatedList<Bundle>) => paginatedList.page),
-          switchMap((bundles: Bundle[]) => bundles),
-          filter((b: Bundle) => this.isIiifBundle(b.name)),
-          mergeMap((bundle: Bundle) => {
-              return bitstreamDataService.findAllByItemAndBundleName(item, bundle.name, {
-                  currentPage: 1,
-                  elementsPerPage: 5
-              }, true, true, ...this.LINKS_TO_FOLLOW).pipe(
-                  getFirstCompletedRemoteData(),
-                  map((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
-                      return bitstreamsRD.payload;
-                  }),
-                  map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
-                  switchMap((bitstreams: Bitstream[]) => bitstreams),
-                  switchMap((bitstream: Bitstream) => bitstream.format.pipe(
-                          getFirstCompletedRemoteData(),
-                          map((formatRD: RemoteData<BitstreamFormat>) => {
-                              return formatRD.payload;
-                          }),
-                          map((format: BitstreamFormat) => {
-                              if (format.mimetype.includes('image')) {
-                                  count++;
-                              }
-                              return count;
-                          }),
-                      )
-                  )
-              );
-          }),
-          last()
-      );
+          map((paginatedList: PaginatedList<Bitstream>) => paginatedList.page),
+          switchMap((bitstreams: Bitstream[]) => bitstreams),
+          switchMap((bitstream: Bitstream) => bitstream.format.pipe(
+            getFirstCompletedRemoteData(),
+            map((formatRD: RemoteData<BitstreamFormat>) => {
+              return formatRD.payload;
+            }),
+            map((format: BitstreamFormat) => {
+              if (format.mimetype.includes('image')) {
+                count++;
+              }
+              return count;
+            }),
+          ),
+          ),
+        );
+      }),
+      last(),
+    );
   }
 
   isIiifBundle(bundleName: string): boolean {
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..b53c400385 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>
 
@@ -25,7 +25,7 @@
           <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
           <div class="card-body">
             <div class="container">
-              <ds-alert *ngIf="!(hasMissingOrcidAuthorizations() | async)" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+              <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async) !== true" [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
                 {{'person.page.orcid.no-missing-authorizations-message' | translate}}
               </ds-alert>
               <ds-alert *ngIf="(hasMissingOrcidAuthorizations() | async)" [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
@@ -41,7 +41,7 @@
         </div>
       </div>
     </div>
-    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && !(ownerCanDisconnectProfileFromOrcid() | async)"
+    <ds-alert *ngIf="(onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true"
               [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
       {{ 'person.page.orcid.remove-orcid-message' | translate}}
     </ds-alert>
@@ -49,7 +49,7 @@
       <div class="col">
         <button type="submit" class="btn btn-danger float-right" (click)="unlinkOrcid()"
                 [disabled]="(unlinkProcessing | async)">
-          <span *ngIf="!(unlinkProcessing | async)"><i
+          <span *ngIf="(unlinkProcessing | async) !== true"><i
             class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
           <span *ngIf="(unlinkProcessing | async)"><i
             class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
index e96e5996fb..e8cabfc390 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.spec.ts
@@ -1,25 +1,38 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { getTestScheduler } from 'jasmine-marbles';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
 import { of } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { Item } from '../../../core/shared/item.model';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { OrcidAuthComponent } from './orcid-auth.component';
-import { NativeWindowService } from '../../../core/services/window.service';
-import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import { NativeWindowService } from '../../../core/services/window.service';
+import { Item } from '../../../core/shared/item.model';
+import { NativeWindowMockFactory } from '../../../shared/mocks/mock-native-window-ref';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { OrcidAuthComponent } from './orcid-auth.component';
 
 describe('OrcidAuthComponent test suite', () => {
   let comp: OrcidAuthComponent;
@@ -33,7 +46,7 @@ describe('OrcidAuthComponent test suite', () => {
     '/authenticate',
     '/read-limited',
     '/activities/update',
-    '/person/update'
+    '/person/update',
   ];
 
   const partialOrcidScopes = [
@@ -45,70 +58,70 @@ describe('OrcidAuthComponent test suite', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
-      }]
-    }
+        'value': 'Person',
+      }],
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   beforeEach(waitForAsync(() => {
@@ -119,7 +132,7 @@ describe('OrcidAuthComponent test suite', () => {
       isLinkedToOrcid: jasmine.createSpy('isLinkedToOrcid'),
       onlyAdminCanDisconnectProfileFromOrcid: jasmine.createSpy('onlyAdminCanDisconnectProfileFromOrcid'),
       ownerCanDisconnectProfileFromOrcid: jasmine.createSpy('ownerCanDisconnectProfileFromOrcid'),
-      unlinkOrcidByItem: jasmine.createSpy('unlinkOrcidByItem')
+      unlinkOrcidByItem: jasmine.createSpy('unlinkOrcidByItem'),
     });
 
     void TestBed.configureTestingModule({
@@ -128,20 +141,20 @@ describe('OrcidAuthComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidAuthComponent],
       providers: [
         { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: OrcidAuthService, useValue: orcidAuthService }
+        { provide: OrcidAuthService, useValue: orcidAuthService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrcidAuthComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..00ddda541c 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,20 +1,35 @@
-import { Component, EventEmitter, Inject, Input, OnChanges, OnInit, Output, SimpleChanges } from '@angular/core';
-
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnChanges,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 import { 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';
+
 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 { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../core/services/window.service';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-orcid-auth',
   templateUrl: './orcid-auth.component.html',
-  styleUrls: ['./orcid-auth.component.scss']
+  styleUrls: ['./orcid-auth.component.scss'],
 })
 export class OrcidAuthComponent implements OnInit, OnChanges {
 
@@ -89,7 +104,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
    */
   hasOrcidAuthorizations(): Observable<boolean> {
     return this.profileAuthorizationScopes.asObservable().pipe(
-      map((scopes: string[]) => scopes.length > 0)
+      map((scopes: string[]) => scopes.length > 0),
     );
   }
 
@@ -105,7 +120,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
    */
   hasMissingOrcidAuthorizations(): Observable<boolean> {
     return this.missingAuthorizationScopes.asObservable().pipe(
-      map((scopes: string[]) => scopes.length > 0)
+      map((scopes: string[]) => scopes.length > 0),
     );
   }
 
@@ -170,7 +185,7 @@ export class OrcidAuthComponent implements OnInit, OnChanges {
   unlinkOrcid(): void {
     this.unlinkProcessing.next(true);
     this.orcidAuthService.unlinkOrcidByItem(this.item).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData: RemoteData<ResearcherProfile>) => {
       this.unlinkProcessing.next(false);
       if (remoteData.isSuccess) {
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..585feed4c9 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.html
+++ b/src/app/item-page/orcid-page/orcid-page.component.html
@@ -1,4 +1,14 @@
-<div *ngIf="!(processingConnection | async) && (item | async)" class="container">
+<ds-loading *ngIf="(processingConnection | async)" [message]="'person.page.orcid.link.processing' | translate"></ds-loading>
+<div class="container" *ngIf="(processingConnection | async) !== true && (connectionStatus | async) !== true" data-test="error-box">
+  <ds-alert [type]="'alert-danger'">{{'person.page.orcid.link.error.message' | translate}}</ds-alert>
+</div>
+<ng-container *ngIf="(processingConnection | async) !== true && (item | async) && (connectionStatus | async)" >
+  <ds-orcid-auth [item]="(item | async)" (unlink)="updateItem()" data-test="orcid-auth"></ds-orcid-auth>
+  <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) !== true && (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">
@@ -7,13 +17,3 @@
     </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>
-</div>
-<ng-container *ngIf="!(processingConnection | async) && (item | async) && (connectionStatus | async)" >
-  <ds-orcid-auth [item]="(item | async)" (unlink)="updateItem()" data-test="orcid-auth"></ds-orcid-auth>
-  <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>
diff --git a/src/app/item-page/orcid-page/orcid-page.component.spec.ts b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
index 1ed237943e..4d4964d913 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.spec.ts
@@ -1,28 +1,38 @@
-import { NO_ERRORS_SCHEMA, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TestScheduler } from 'rxjs/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
 import { AuthService } from '../../core/auth/auth.service';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { OrcidPageComponent } from './orcid-page.component';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
+import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { Item } from '../../core/shared/item.model';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
-import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
+import { OrcidPageComponent } from './orcid-page.component';
 
 describe('OrcidPageComponent test suite', () => {
   let comp: OrcidPageComponent;
@@ -40,12 +50,12 @@ describe('OrcidPageComponent test suite', () => {
     type: 'profile',
     _links: {
       item: {
-        href: 'https://rest.api/rest/api/profiles/test-id/item'
+        href: 'https://rest.api/rest/api/profiles/test-id/item',
       },
       self: {
-        href: 'https://rest.api/rest/api/profiles/test-id'
+        href: 'https://rest.api/rest/api/profiles/test-id',
       },
-    }
+    },
   });
   const mockItem: Item = Object.assign(new Item(), {
     id: 'test-id',
@@ -54,10 +64,10 @@ describe('OrcidPageComponent test suite', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'test item'
-        }
-      ]
-    }
+          value: 'test item',
+        },
+      ],
+    },
   });
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     id: 'test-id',
@@ -65,21 +75,21 @@ describe('OrcidPageComponent test suite', () => {
     metadata: {
       'dc.title': [
         {
-          value: 'test item'
-        }
+          value: 'test item',
+        },
       ],
       'dspace.orcid.authenticated': [
         {
-          value: 'true'
-        }
-      ]
-    }
+          value: 'true',
+        },
+      ],
+    },
   });
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: jasmine.createSpy('isAuthenticated'),
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
 
     routeData = {
@@ -94,7 +104,7 @@ describe('OrcidPageComponent test suite', () => {
     });
 
     itemDataService = jasmine.createSpyObj('ItemDataService', {
-      findById: jasmine.createSpy('findById')
+      findById: jasmine.createSpy('findById'),
     });
 
     void TestBed.configureTestingModule({
@@ -102,10 +112,10 @@ describe('OrcidPageComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidPageComponent],
       providers: [
@@ -116,7 +126,7 @@ describe('OrcidPageComponent test suite', () => {
         { provide: PLATFORM_ID, useValue: 'browser' },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -162,7 +172,7 @@ describe('OrcidPageComponent test suite', () => {
     beforeEach(waitForAsync(() => {
       spyOn(comp, 'updateItem').and.callThrough();
       routeStub.testParams = {
-        code: 'orcid-code'
+        code: 'orcid-code',
       };
     }));
 
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..baee8cdb48 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -1,20 +1,37 @@
-import { Component, Inject, OnInit, PLATFORM_ID } from '@angular/core';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ParamMap,
+  Router,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, combineLatest } from 'rxjs';
-import { map, take } from 'rxjs/operators';
-
-import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import { getItemPageRoute } from '../item-page-routing-paths';
 import { AuthService } from '../../core/auth/auth.service';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { ItemDataService } from '../../core/data/item-data.service';
-import { isNotEmpty } from '../../shared/empty.util';
+import { RemoteData } from '../../core/data/remote-data';
+import { OrcidAuthService } from '../../core/orcid/orcid-auth.service';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { getItemPageRoute } from '../item-page-routing-paths';
 
 /**
  * A component that represents the orcid settings page
@@ -22,7 +39,7 @@ import { ResearcherProfile } from '../../core/profile/model/researcher-profile.m
 @Component({
   selector: 'ds-orcid-page',
   templateUrl: './orcid-page.component.html',
-  styleUrls: ['./orcid-page.component.scss']
+  styleUrls: ['./orcid-page.component.scss'],
 })
 export class OrcidPageComponent implements OnInit {
 
@@ -52,7 +69,7 @@ export class OrcidPageComponent implements OnInit {
     private itemService: ItemDataService,
     private orcidAuthService: OrcidAuthService,
     private route: ActivatedRoute,
-    private router: Router
+    private router: Router,
   ) {
   }
 
@@ -69,7 +86,7 @@ export class OrcidPageComponent implements OnInit {
       const item$ = this.route.data.pipe(
         map((data) => data.dso as RemoteData<Item>),
         redirectOn4xx(this.router, this.authService),
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       );
 
       combineLatest([codeParam$, item$]).subscribe(([codeParam, item]) => {
@@ -111,7 +128,7 @@ export class OrcidPageComponent implements OnInit {
   updateItem(): void {
     this.clearRouteParams();
     this.itemService.findById(this.itemId, false).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((itemRD: RemoteData<Item>) => {
       if (itemRD.hasSucceeded) {
         this.item.next(itemRD.payload);
@@ -127,7 +144,7 @@ export class OrcidPageComponent implements OnInit {
    */
   private linkProfileToOrcid(person: Item, code: string) {
     this.orcidAuthService.linkOrcidByItem(person, code).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((profileRD: RemoteData<ResearcherProfile>) => {
       this.processingConnection.next(false);
       if (profileRD.hasSucceeded) {
diff --git a/src/app/item-page/orcid-page/orcid-page.guard.ts b/src/app/item-page/orcid-page/orcid-page.guard.ts
index 97c528e9ae..ee08ac918e 100644
--- a/src/app/item-page/orcid-page/orcid-page.guard.ts
+++ b/src/app/item-page/orcid-page/orcid-page.guard.ts
@@ -1,6 +1,14 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthService } from '../../core/auth/auth.service';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { DsoPageSingleFeatureGuard } from '../../core/data/feature-authorization/feature-authorization-guard/dso-page-single-feature.guard';
@@ -9,7 +17,7 @@ import { Item } from '../../core/shared/item.model';
 import { ItemPageResolver } from '../item-page.resolver';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Guard for preventing unauthorized access to certain {@link Item} pages requiring administrator rights
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index 9358bcf835..e9d9ec035b 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -3,11 +3,11 @@
   <div class="container">
     <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
 
-    <ds-alert *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements == 0"
+    <ds-alert *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements === 0"
               [type]="AlertTypeEnum.Info">
       {{ 'person.page.orcid.sync-queue.empty-message' | translate}}
     </ds-alert>
-    <ds-pagination *ngIf="!(processing$ | async) && (getList() | async)?.payload?.totalElements > 0"
+    <ds-pagination *ngIf="(processing$ | async) !== true && (getList() | async)?.payload?.totalElements > 0"
                    [paginationOptions]="paginationOptions"
                    [collectionSize]="(getList() | async)?.payload?.totalElements"
                    [retainScrollPosition]="false" [hideGear]="true" (paginationChange)="updateList()">
@@ -34,11 +34,13 @@
               <div class="btn-group edit-field">
                 <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
                         class="btn btn-outline-primary my-1 col-md" (click)="send(entry)">
-                  <i [ngClass]="getOperationClass(entry)"></i>
+                  <span [ngClass]="getOperationClass(entry)"></span>
+                  <span class="sr-only">{{ getOperationTooltip(entry) | translate }}</span>
                 </button>
                 <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
                         class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
-                  <i class="fas fa-unlink"></i>
+                  <span class="fas fa-unlink"></span>
+                  <span class="sr-only">{{ 'person.page.orcid.sync-queue.discard' | translate }}</span>
                 </button>
               </div>
             </td>
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
index d0f52531d4..336802af65 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.spec.ts
@@ -1,22 +1,33 @@
-import { OrcidQueueComponent } from './orcid-queue.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
-import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { By } from '@angular/platform-browser';
 import { Item } from '../../../core/shared/item.model';
-import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { OrcidQueueComponent } from './orcid-queue.component';
 
 describe('OrcidQueueComponent test suite', () => {
   let component: OrcidQueueComponent;
@@ -31,58 +42,58 @@ describe('OrcidQueueComponent test suite', () => {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   function orcidQueueElement(id: number) {
@@ -104,7 +115,7 @@ describe('OrcidQueueComponent test suite', () => {
 
   beforeEach(waitForAsync(() => {
     orcidAuthService = jasmine.createSpyObj('OrcidAuthService', {
-      getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl')
+      getOrcidAuthorizeUrl: jasmine.createSpy('getOrcidAuthorizeUrl'),
     });
 
     void TestBed.configureTestingModule({
@@ -112,10 +123,10 @@ describe('OrcidQueueComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidQueueComponent],
       providers: [
@@ -125,7 +136,7 @@ describe('OrcidQueueComponent test suite', () => {
         { provide: PaginationService, useValue: new PaginationServiceStub() },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     orcidQueueService = TestBed.inject(OrcidQueueDataService);
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..713d1bc22a 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
@@ -1,28 +1,43 @@
-import { Component, Input, OnDestroy, OnInit, SimpleChanges } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, switchMap, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
 
 import { PaginatedList } from '../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { OrcidHistory } from '../../../core/orcid/model/orcid-history.model';
 import { OrcidQueue } from '../../../core/orcid/model/orcid-queue.model';
+import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 import { OrcidHistoryDataService } from '../../../core/orcid/orcid-history-data.service';
 import { OrcidQueueDataService } from '../../../core/orcid/orcid-queue-data.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { AlertType } from '../../../shared/alert/alert-type';
 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 { Item } from '../../../core/shared/item.model';
-import { OrcidAuthService } from '../../../core/orcid/orcid-auth.service';
 
 @Component({
   selector: 'ds-orcid-queue',
   templateUrl: './orcid-queue.component.html',
-  styleUrls: ['./orcid-queue.component.scss']
+  styleUrls: ['./orcid-queue.component.scss'],
 })
 export class OrcidQueueComponent implements OnInit, OnDestroy {
 
@@ -36,7 +51,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
    */
   public paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'oqp',
-    pageSize: 5
+    pageSize: 5,
   });
 
   /**
@@ -90,12 +105,12 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
         distinctUntilChanged(),
         tap(() => this.processing$.next(true)),
         switchMap((config: PaginationComponentOptions) => this.orcidQueueService.searchByProfileItemId(this.item.id, config, false)),
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       ).subscribe((result: RemoteData<PaginatedList<OrcidQueue>>) => {
         this.processing$.next(false);
         this.list$.next(result);
         this.orcidQueueService.clearFindByProfileItemRequests();
-      })
+      }),
     );
   }
 
@@ -191,7 +206,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   discardEntry(orcidQueue: OrcidQueue) {
     this.processing$.next(true);
     this.subs.push(this.orcidQueueService.deleteById(orcidQueue.id).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData) => {
       this.processing$.next(false);
       if (remoteData.isSuccess) {
@@ -211,7 +226,7 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
   send(orcidQueue: OrcidQueue) {
     this.processing$.next(true);
     this.subs.push(this.orcidHistoryService.sendToORCID(orcidQueue).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData) => {
       this.processing$.next(false);
       if (remoteData.isSuccess) {
@@ -233,8 +248,8 @@ export class OrcidQueueComponent implements OnInit, OnDestroy {
     return this.orcidAuthService.getOrcidAuthorizeUrl(this.item).pipe(
       switchMap((authorizeUrl) => this.translateService.get(
         'person.page.orcid.sync-queue.send.unauthorized-error.content',
-        { orcid: authorizeUrl }
-      ))
+        { orcid: authorizeUrl },
+      )),
     );
   }
 
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 cd466ae4a4..51f262d849 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,24 +1,41 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
-import { getTestScheduler } from 'jasmine-marbles';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { Operation } from 'fast-json-patch';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { Item } from '../../../core/shared/item.model';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { OrcidSyncSettingsComponent } from './orcid-sync-settings.component';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 
 describe('OrcidSyncSettingsComponent test suite', () => {
   let comp: OrcidSyncSettingsComponent;
@@ -26,7 +43,7 @@ describe('OrcidSyncSettingsComponent test suite', () => {
   let scheduler: TestScheduler;
   let researcherProfileService: jasmine.SpyObj<ResearcherProfileDataService>;
   let notificationsService;
-  let formGroup: FormGroup;
+  let formGroup: UntypedFormGroup;
 
   const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
     id: 'test-id',
@@ -34,97 +51,97 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     type: 'profile',
     _links: {
       item: {
-        href: 'https://rest.api/rest/api/profiles/test-id/item'
+        href: 'https://rest.api/rest/api/profiles/test-id/item',
       },
       self: {
-        href: 'https://rest.api/rest/api/profiles/test-id'
+        href: 'https://rest.api/rest/api/profiles/test-id',
       },
-    }
+    },
   });
 
   const mockItemLinkedToOrcid: Item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: {
       'dc.title': [{
-        value: 'test person'
+        value: 'test person',
       }],
       'dspace.entity.type': [{
-        'value': 'Person'
+        'value': 'Person',
       }],
       'dspace.object.owner': [{
         'value': 'test person',
         'language': null,
         'authority': 'deced3e7-68e2-495d-bf98-7c44fc33b8ff',
         'confidence': 600,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.authenticated': [{
         'value': '2022-06-10T15:15:12.952872',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.scope': [{
         'value': '/authenticate',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': '/read-limited',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }, {
         'value': '/activities/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 2
+        'place': 2,
       }, {
         'value': '/person/update',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 3
+        'place': 3,
       }],
       'dspace.orcid.sync-mode': [{
         'value': 'MANUAL',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'dspace.orcid.sync-profile': [{
         'value': 'BIOGRAPHICAL',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }, {
         'value': 'IDENTIFIERS',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 1
+        'place': 1,
       }],
       'dspace.orcid.sync-publications': [{
         'value': 'ALL',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
+        'place': 0,
       }],
       'person.identifier.orcid': [{
         'value': 'orcid-id',
         'language': null,
         'authority': null,
         'confidence': -1,
-        'place': 0
-      }]
-    }
+        'place': 0,
+      }],
+    },
   });
 
   beforeEach(waitForAsync(() => {
@@ -141,19 +158,19 @@ describe('OrcidSyncSettingsComponent test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       declarations: [OrcidSyncSettingsComponent],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        { provide: ResearcherProfileDataService, useValue: researcherProfileService }
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(OrcidSyncSettingsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -186,12 +203,12 @@ describe('OrcidSyncSettingsComponent test suite', () => {
     beforeEach(() => {
       scheduler = getTestScheduler();
       notificationsService = (comp as any).notificationsService;
-      formGroup = new FormGroup({
-        syncMode: new FormControl('MANUAL'),
-        syncFundings: new FormControl('ALL'),
-        syncPublications: new FormControl('ALL'),
-        syncProfile_BIOGRAPHICAL: new FormControl(true),
-        syncProfile_IDENTIFIERS: new FormControl(true),
+      formGroup = new UntypedFormGroup({
+        syncMode: new UntypedFormControl('MANUAL'),
+        syncFundings: new UntypedFormControl('ALL'),
+        syncPublications: new UntypedFormControl('ALL'),
+        syncProfile_BIOGRAPHICAL: new UntypedFormControl(true),
+        syncProfile_IDENTIFIERS: new UntypedFormControl(true),
       });
       spyOn(comp.settingsUpdated, 'emit');
     });
@@ -203,20 +220,20 @@ describe('OrcidSyncSettingsComponent test suite', () => {
         {
           path: '/orcid/mode',
           op: 'replace',
-          value: 'MANUAL'
+          value: 'MANUAL',
         }, {
           path: '/orcid/publications',
           op: 'replace',
-          value: 'ALL'
+          value: 'ALL',
         }, {
           path: '/orcid/fundings',
           op: 'replace',
-          value: 'ALL'
+          value: 'ALL',
         }, {
           path: '/orcid/profile',
           op: 'replace',
-          value: 'BIOGRAPHICAL,IDENTIFIERS'
-        }
+          value: 'BIOGRAPHICAL,IDENTIFIERS',
+        },
       ];
 
       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 494075c0f0..a468710e5c 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,22 +1,27 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
+import {
+  Component,
+  EventEmitter,
+  Input,
+  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 { RemoteData } from '../../../core/data/remote-data';
+import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
 import { Item } from '../../../core/shared/item.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
 
 @Component({
   selector: 'ds-orcid-sync-setting',
   templateUrl: './orcid-sync-settings.component.html',
-  styleUrls: ['./orcid-sync-settings.component.scss']
+  styleUrls: ['./orcid-sync-settings.component.scss'],
 })
 export class OrcidSyncSettingsComponent implements OnInit {
 
@@ -82,12 +87,12 @@ export class OrcidSyncSettingsComponent implements OnInit {
     this.syncModes = [
       {
         label: this.messagePrefix + '.synchronization-mode.batch',
-        value: 'BATCH'
+        value: 'BATCH',
       },
       {
         label: this.messagePrefix + '.synchronization-mode.manual',
-        value: 'MANUAL'
-      }
+        value: 'MANUAL',
+      },
     ];
 
     this.syncPublicationOptions = ['DISABLED', 'ALL']
@@ -113,7 +118,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
         return {
           label: this.messagePrefix + '.sync-profile.' + value.toLowerCase(),
           value: value,
-          checked: syncProfilePreferences.includes(value)
+          checked: syncProfilePreferences.includes(value),
         };
       });
 
@@ -127,7 +132,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
    *
    * @param form The form group
    */
-  onSubmit(form: FormGroup): void {
+  onSubmit(form: UntypedFormGroup): void {
     const operations: Operation[] = [];
     this.fillOperationsFor(operations, '/orcid/mode', form.value.syncMode);
     this.fillOperationsFor(operations, '/orcid/publications', form.value.syncPublications);
@@ -189,7 +194,7 @@ export class OrcidSyncSettingsComponent implements OnInit {
     operations.push({
       path: path,
       op: 'replace',
-      value: currentValue
+      value: currentValue,
     });
   }
 
diff --git a/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
index e788e6e575..78919509fb 100644
--- a/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
+++ b/src/app/item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
@@ -1,6 +1,14 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Subscription } from 'rxjs';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 
 @Component({
   selector: 'ds-abstract-incremental-list',
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 9d61b0a0e0..e1748e8bcf 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -1,17 +1,20 @@
 <ng-container *ngVar="(bitstreams$ | async) as bitstreams">
   <ds-metadata-field-wrapper *ngIf="bitstreams?.length > 0" [label]="label | translate">
     <div class="file-section">
-      <ds-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
-        <span>{{file?.name}}</span>
-        <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+      <ds-themed-file-download-link *ngFor="let file of bitstreams; let last=last;" [bitstream]="file" [item]="item">
+        <span>
+          <span *ngIf="primaryBitsreamId === file.id" class="badge badge-primary">{{ 'item.page.bitstreams.primary' | translate }}</span> 
+          {{ dsoNameService.getName(file) }}
+        </span>
+        <span> ({{(file?.sizeBytes) | dsFileSize }})</span>
         <span *ngIf="!last" innerHTML="{{separator}}"></span>
-      </ds-file-download-link>
+      </ds-themed-file-download-link>
       <ds-themed-loading *ngIf="isLoading" message="{{'loading.default' | translate}}" [showMessage]="false"></ds-themed-loading>
       <div *ngIf="!isLastPage" class="mt-1" id="view-more">
-        <a class="bitstream-view-more btn btn-outline-secondary btn-sm" [routerLink]="[]" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</a>
+        <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
       </div>
-      <div *ngIf="isLastPage && currentPage != 1" class="mt-1" id="collapse">
-        <a class="bitstream-collapse btn btn-outline-secondary btn-sm" [routerLink]="[]" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</a>
+      <div *ngIf="isLastPage && currentPage !== 1" class="mt-1" id="collapse">
+        <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
       </div>
     </div>
   </ds-metadata-field-wrapper>
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 2d185aef9c..1db82d3fb7 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
@@ -1,29 +1,40 @@
-import { FileSectionComponent } from './file-section.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { VarDirective } from '../../../../shared/utils/var.directive';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
-import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment';
+
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { PageInfo } from '../../../../core/shared/page-info.model';
-import { MetadataFieldWrapperComponent } from '../../../field-components/metadata-field-wrapper/metadata-field-wrapper.component';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { MetadataFieldWrapperComponent } from '../../../../shared/metadata-field-wrapper/metadata-field-wrapper.component';
+import { MockBitstreamFormat1 } from '../../../../shared/mocks/item.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
 import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { FileSectionComponent } from './file-section.component';
 
 describe('FileSectionComponent', () => {
   let comp: FileSectionComponent;
   let fixture: ComponentFixture<FileSectionComponent>;
 
   const bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    findAllByItemAndBundleName: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    findPrimaryBitstreamByItemAndName: observableOf(null),
   });
 
   const mockBitstream: Bitstream = Object.assign(new Bitstream(),
@@ -34,11 +45,11 @@ describe('FileSectionComponent', () => {
       bundleName: 'ORIGINAL',
       _links: {
         self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
         },
         content: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content'
-        }
+          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713/content',
+        },
       },
       id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
       uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
@@ -47,10 +58,10 @@ describe('FileSectionComponent', () => {
         'dc.title': [
           {
             language: null,
-            value: 'test_word.docx'
-          }
-        ]
-      }
+            value: 'test_word.docx',
+          },
+        ],
+      },
     });
 
   beforeEach(waitForAsync(() => {
@@ -59,16 +70,17 @@ describe('FileSectionComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), BrowserAnimationsModule],
       declarations: [FileSectionComponent, VarDirective, FileSizePipe, MetadataFieldWrapperComponent],
       providers: [
         { provide: BitstreamDataService, useValue: bitstreamDataService },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: APP_CONFIG, useValue: environment },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -78,6 +90,20 @@ describe('FileSectionComponent', () => {
     fixture.detectChanges();
   }));
 
+  it('should set the id of primary bitstream', () => {
+    comp.primaryBitsreamId = undefined;
+    bitstreamDataService.findPrimaryBitstreamByItemAndName.and.returnValue(observableOf(mockBitstream));
+    comp.ngOnInit();
+    expect(comp.primaryBitsreamId).toBe(mockBitstream.id);
+  });
+
+  it('should not set the id of primary bitstream', () => {
+    comp.primaryBitsreamId = undefined;
+    bitstreamDataService.findPrimaryBitstreamByItemAndName.and.returnValue(observableOf(null));
+    comp.ngOnInit();
+    expect(comp.primaryBitsreamId).toBeUndefined();
+  });
+
   describe('when the bitstreams are loading', () => {
     beforeEach(() => {
       comp.bitstreams$.next([mockBitstream]);
@@ -109,7 +135,7 @@ describe('FileSectionComponent', () => {
     it('one bitstream should be on the page', () => {
       const viewMore = fixture.debugElement.query(By.css('.bitstream-view-more'));
       viewMore.triggerEventHandler('click', null);
-      const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-file-download-link'));
+      const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-themed-file-download-link'));
       expect(fileDownloadLink.length).toEqual(1);
     });
 
@@ -122,7 +148,7 @@ describe('FileSectionComponent', () => {
 
       });
       it('should contain another bitstream', () => {
-        const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-file-download-link'));
+        const fileDownloadLink = fixture.debugElement.queryAll(By.css('ds-themed-file-download-link'));
         expect(fileDownloadLink.length).toEqual(2);
       });
     });
@@ -143,7 +169,7 @@ describe('FileSectionComponent', () => {
 
     it('should contain a view less link', () => {
       const viewLess = fixture.debugElement.query(By.css('.bitstream-collapse'));
-      expect(viewLess).toBeDefined();
+      expect(viewLess).not.toBeNull();
     });
 
     it('clicking on the view less link should reset the pages and call getNextPage()', () => {
@@ -154,11 +180,11 @@ describe('FileSectionComponent', () => {
         currentPage: 1,
         _links: {
           self: { href: 'https://rest.api/core/bitstreams/' },
-          next: { href: 'https://rest.api/core/bitstreams?page=2' }
-        }
+          next: { href: 'https://rest.api/core/bitstreams?page=2' },
+        },
       });
       const PaginatedList = Object.assign(createPaginatedList([mockBitstream]), {
-        pageInfo: pageInfo
+        pageInfo: pageInfo,
       });
       bitstreamDataService.findAllByItemAndBundleName.and.returnValue(createSuccessfulRemoteDataObject$(PaginatedList));
       const viewLess = fixture.debugElement.query(By.css('.bitstream-collapse'));
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/app/item-page/simple/field-components/file-section/file-section.component.ts
index d28b579996..28b21c0e55 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.ts
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.ts
@@ -1,15 +1,25 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { BehaviorSubject } from 'rxjs';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Item } from '../../../../core/shared/item.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { hasValue } from '../../../../shared/empty.util';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { hasValue } from '../../../../shared/empty.util';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 
 /**
  * This component renders the file section of the item
@@ -17,7 +27,7 @@ import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
  */
 @Component({
   selector: 'ds-item-page-file-section',
-  templateUrl: './file-section.component.html'
+  templateUrl: './file-section.component.html',
 })
 export class FileSectionComponent implements OnInit {
 
@@ -35,19 +45,34 @@ export class FileSectionComponent implements OnInit {
 
   isLastPage: boolean;
 
-  pageSize = 5;
+  pageSize: number;
+
+  primaryBitsreamId: string;
 
   constructor(
     protected bitstreamDataService: BitstreamDataService,
     protected notificationsService: NotificationsService,
-    protected translateService: TranslateService
+    protected translateService: TranslateService,
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
+    this.pageSize = this.appConfig.item.bitstream.pageSize;
   }
 
   ngOnInit(): void {
+    this.getPrimaryBitstreamId();
     this.getNextPage();
   }
 
+  private getPrimaryBitstreamId() {
+    this.bitstreamDataService.findPrimaryBitstreamByItemAndName(this.item, 'ORIGINAL', true, true).subscribe((primaryBitstream: Bitstream | null) => {
+      if (!primaryBitstream) {
+        return;
+      }
+      this.primaryBitsreamId = primaryBitstream?.id;
+    });
+  }
+
   /**
    * This method will retrieve the next page of Bitstreams from the external BitstreamDataService call.
    * It'll retrieve the currentPage from the class variables and it'll add the next page of bitstreams with the
@@ -64,7 +89,7 @@ export class FileSectionComponent implements OnInit {
     }
     this.bitstreamDataService.findAllByItemAndBundleName(this.item, 'ORIGINAL', {
       currentPage: this.currentPage,
-      elementsPerPage: this.pageSize
+      elementsPerPage: this.pageSize,
     }).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe((bitstreamsRD: RemoteData<PaginatedList<Bitstream>>) => {
diff --git a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts
index ba5a9e87c0..afff29b4b7 100644
--- a/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts
+++ b/src/app/item-page/simple/field-components/file-section/themed-file-section.component.ts
@@ -1,11 +1,15 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../core/shared/item.model';
 import { ThemedComponent } from '../../../../shared/theme-support/themed.component';
 import { FileSectionComponent } from './file-section.component';
-import {Component, Input} from '@angular/core';
-import {Item} from '../../../../core/shared/item.model';
 
 @Component({
-    selector: 'ds-themed-item-page-file-section',
-    templateUrl: '../../../../shared/theme-support/themed.component.html',
+  selector: 'ds-themed-item-page-file-section',
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
 })
 export class ThemedFileSectionComponent extends ThemedComponent<FileSectionComponent> {
 
@@ -14,15 +18,15 @@ export class ThemedFileSectionComponent extends ThemedComponent<FileSectionCompo
     protected inAndOutputNames: (keyof FileSectionComponent & keyof this)[] = ['item'];
 
     protected getComponentName(): string {
-        return 'FileSectionComponent';
+      return 'FileSectionComponent';
     }
 
     protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/item-page/simple/field-components/file-section/file-section.component`);
+      return import(`../../../../../themes/${themeName}/app/item-page/simple/field-components/file-section/file-section.component`);
     }
 
     protected importUnthemedComponent(): Promise<any> {
-        return import(`./file-section.component`);
+      return import(`./file-section.component`);
     }
 
 }
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 53f0522f39..1366a43e85 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
@@ -1,12 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { SharedModule } from '../../../../../shared/shared.module';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
-import { By } from '@angular/platform-browser';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { SharedModule } from '../../../../../shared/shared.module';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { ItemPageAbstractFieldComponent } from './item-page-abstract-field.component';
 
 let comp: ItemPageAbstractFieldComponent;
 let fixture: ComponentFixture<ItemPageAbstractFieldComponent>;
@@ -18,18 +31,19 @@ describe('ItemPageAbstractFieldComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         SharedModule,
       ],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageAbstractFieldComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAbstractFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -41,6 +55,6 @@ describe('ItemPageAbstractFieldComponent', () => {
   }));
 
   it('should render a ds-metadata-values', () => {
-    expect(fixture.debugElement.query(By.css('ds-metadata-values'))).toBeDefined();
+    expect(fixture.debugElement.query(By.css('ds-metadata-values'))).not.toBeNull();
   });
 });
diff --git a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
index f29bef31a7..f2c2142591 100644
--- a/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/abstract/item-page-abstract-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
-    selector: 'ds-item-page-abstract-field',
-    templateUrl: '../item-page-field.component.html'
+  selector: 'ds-item-page-abstract-field',
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component is used for displaying the abstract (dc.description.abstract) of an item
@@ -28,7 +31,7 @@ export class ItemPageAbstractFieldComponent extends ItemPageFieldComponent {
      * In this component, we want to display values for metadata 'dc.description.abstract'
      */
     fields: string[] = [
-        'dc.description.abstract'
+      'dc.description.abstract',
     ];
 
     /**
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 7f8d6fb812..4c9f67f168 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
@@ -1,12 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
-import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageAuthorFieldComponent } from './item-page-author-field.component';
 
 let comp: ItemPageAuthorFieldComponent;
 let fixture: ComponentFixture<ItemPageAuthorFieldComponent>;
@@ -20,16 +33,17 @@ describe('ItemPageAuthorFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageAuthorFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageAuthorFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -37,7 +51,7 @@ describe('ItemPageAuthorFieldComponent', () => {
     beforeEach(waitForAsync(() => {
       fixture = TestBed.createComponent(ItemPageAuthorFieldComponent);
       comp = fixture.componentInstance;
-      comp.item = mockItemWithMetadataFieldAndValue(field, mockValue);
+      comp.item = mockItemWithMetadataFieldsAndValue([field], mockValue);
       fixture.detectChanges();
     }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
index 2da0dc154b..9d4230468c 100644
--- a/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/author/item-page-author-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
   selector: 'ds-item-page-author-field',
-  templateUrl: '../item-page-field.component.html'
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component is used for displaying the author (dc.contributor.author, dc.creator and
@@ -34,7 +37,7 @@ export class ItemPageAuthorFieldComponent extends ItemPageFieldComponent {
   fields: string[] = [
     'dc.contributor.author',
     'dc.creator',
-    'dc.contributor'
+    'dc.contributor',
   ];
 
   /**
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 ebd37e8b8a..950ee0ec0f 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
@@ -1,12 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
-import { ItemPageDateFieldComponent } from './item-page-date-field.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageDateFieldComponent } from './item-page-date-field.component';
 
 let comp: ItemPageDateFieldComponent;
 let fixture: ComponentFixture<ItemPageDateFieldComponent>;
@@ -20,23 +33,24 @@ describe('ItemPageDateFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageDateFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageDateFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemPageDateFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     fixture.detectChanges();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
index 5a7d56b7da..6744649912 100644
--- a/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/date/item-page-date-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
-    selector: 'ds-item-page-date-field',
-    templateUrl: '../item-page-field.component.html'
+  selector: 'ds-item-page-date-field',
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component is used for displaying the issue date (dc.date.issued) metadata of an item
@@ -28,7 +31,7 @@ export class ItemPageDateFieldComponent extends ItemPageFieldComponent {
      * In this component, we want to display values for metadata 'dc.date.issued'
      */
     fields: string[] = [
-        'dc.date.issued'
+      'dc.date.issued',
     ];
 
     /**
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 f055101f2a..1656283fd6 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
@@ -1,12 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
-import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { GenericItemPageFieldComponent } from './generic-item-page-field.component';
 
 let comp: GenericItemPageFieldComponent;
 let fixture: ComponentFixture<GenericItemPageFieldComponent>;
@@ -22,23 +35,24 @@ describe('GenericItemPageFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [GenericItemPageFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(GenericItemPageFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(GenericItemPageFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     comp.fields = mockFields;
     comp.label = mockLabel;
     fixture.detectChanges();
diff --git a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
index 3b8d261dcc..785269337f 100644
--- a/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/generic/generic-item-page-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
   selector: 'ds-generic-item-page-field',
-  templateUrl: '../item-page-field.component.html'
+  templateUrl: '../item-page-field.component.html',
 })
 /**
  * This component can be used to represent metadata on a simple item page.
@@ -35,4 +38,15 @@ export class GenericItemPageFieldComponent extends ItemPageFieldComponent {
    */
   @Input() label: string;
 
+  /**
+   * Whether the {@link MarkdownPipe} should be used to render this metadata.
+   */
+  @Input() enableMarkdown = false;
+
+  /**
+   * Whether any valid HTTP(S) URL should be rendered as a link
+   */
+  @Input() urlRegex?: string;
+
+
 }
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
new file mode 100644
index 0000000000..00c029f838
--- /dev/null
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.spec.ts
@@ -0,0 +1,94 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
+import { GenericItemPageFieldComponent } from '../generic/generic-item-page-field.component';
+import { ImageField } from '../item-page-field.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageImgFieldComponent } from './item-page-img-field.component';
+
+let component: ItemPageImgFieldComponent;
+let fixture: ComponentFixture<ItemPageImgFieldComponent>;
+
+const mockField = 'organization.identifier.ror';
+const mockValue = 'http://ror.org/awesome-identifier';
+const mockLabel = 'ROR label';
+const mockUrlRegex = '(.*)ror.org';
+const mockImg = {
+  URI: './assets/images/ror-icon.svg',
+  alt: 'item.page.image.alt.ROR',
+  heightVar: '--ds-item-page-img-field-ror-inline-height',
+} as ImageField;
+
+describe('ItemPageImgFieldComponent', () => {
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot({
+        loader: {
+          provide: TranslateLoader,
+          useClass: TranslateLoaderMock,
+        },
+      })],
+      providers: [
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
+      ],
+      declarations: [ItemPageImgFieldComponent, GenericItemPageFieldComponent, MetadataValuesComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .overrideComponent(GenericItemPageFieldComponent, {
+        set: { changeDetection: ChangeDetectionStrategy.Default },
+      })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(ItemPageImgFieldComponent);
+    component = fixture.componentInstance;
+    component.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
+    component.fields = [mockField];
+    component.label = mockLabel;
+    component.urlRegex = mockUrlRegex;
+    component.img = mockImg;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display display img tag', () => {
+    const image = fixture.debugElement.query(By.css('img.link-logo'));
+    expect(image).not.toBeNull();
+  });
+
+  it('should have right attributes', () => {
+    const image = fixture.debugElement.query(By.css('img.link-logo'));
+    expect(image.attributes.src).toEqual(mockImg.URI);
+    expect(image.attributes.alt).toEqual(mockImg.alt);
+
+    const imageEl = image.nativeElement;
+    expect(imageEl.style.height).toContain(mockImg.heightVar);
+  });
+
+  it('should have the right value', () => {
+    const imageAnchor = fixture.debugElement.query(By.css('a.link-anchor'));
+    const anchorEl = imageAnchor.nativeElement;
+    expect(anchorEl.innerHTML).toContain(mockValue);
+  });
+});
diff --git a/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
new file mode 100644
index 0000000000..891c5d70c8
--- /dev/null
+++ b/src/app/item-page/simple/field-components/specific-field/img/item-page-img-field.component.ts
@@ -0,0 +1,53 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../../core/shared/item.model';
+import {
+  ImageField,
+  ItemPageFieldComponent,
+} from '../item-page-field.component';
+
+@Component({
+  selector: 'ds-item-page-img-field',
+  templateUrl: '../item-page-field.component.html',
+})
+/**
+ * Component that renders an inline image for a given field.
+ * This component uses a given {@code ImageField} configuration to correctly render the img.
+ */
+export class ItemPageImgFieldComponent extends ItemPageFieldComponent {
+
+  /**
+   * The item to display metadata for
+   */
+  @Input() item: Item;
+
+  /**
+   * Separator string between multiple values of the metadata fields defined
+   * @type {string}
+   */
+  @Input() separator: string;
+
+  /**
+   * Fields (schema.element.qualifier) used to render their values.
+   */
+  @Input() fields: string[];
+
+  /**
+   * Label i18n key for the rendered metadata
+   */
+  @Input() label: string;
+
+  /**
+   * Image Configuration
+   */
+  @Input() img: ImageField;
+
+  /**
+   * Whether any valid HTTP(S) URL should be rendered as a link
+   */
+  @Input() urlRegex?: string;
+
+}
diff --git a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
index 8b017c77f5..f45d4657a4 100644
--- a/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
+++ b/src/app/item-page/simple/field-components/specific-field/item-page-field.component.html
@@ -4,5 +4,8 @@
     [separator]="separator"
     [label]="label"
     [enableMarkdown]="enableMarkdown"
+    [urlRegex]="urlRegex"
+    [browseDefinition]="browseDefinition|async"
+    [img]="img"
   ></ds-metadata-values>
 </div>
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 e41fd1b8a7..ad617d73b5 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
@@ -1,17 +1,35 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../../core/shared/item.model';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { ItemPageFieldComponent } from './item-page-field.component';
-import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
-import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { environment } from '../../../../../environments/environment';
-import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
-import { SharedModule } from '../../../../shared/shared.module';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { Item } from '../../../../core/shared/item.model';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../../../core/shared/metadata.models';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { SharedModule } from '../../../../shared/shared.module';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
+import { MarkdownPipe } from '../../../../shared/utils/markdown.pipe';
+import { MetadataValuesComponent } from '../../../field-components/metadata-values/metadata-values.component';
+import { ItemPageFieldComponent } from './item-page-field.component';
 
 let comp: ItemPageFieldComponent;
 let fixture: ComponentFixture<ItemPageFieldComponent>;
@@ -20,7 +38,9 @@ let markdownSpy;
 const mockValue = 'test value';
 const mockField = 'dc.test';
 const mockLabel = 'test label';
-const mockFields = [mockField];
+const mockAuthorField = 'dc.contributor.author';
+const mockDateIssuedField = 'dc.date.issued';
+const mockFields = [mockField, mockAuthorField, mockDateIssuedField];
 
 describe('ItemPageFieldComponent', () => {
 
@@ -28,48 +48,47 @@ describe('ItemPageFieldComponent', () => {
     markdown: {
       enabled: false,
       mathjax: false,
-    }
+    },
   });
 
-  const buildTestEnvironment = async () => {
-    await TestBed.configureTestingModule({
+  beforeEach(waitForAsync(() => {
+    void TestBed.configureTestingModule({
       imports: [
+        RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         SharedModule,
       ],
       providers: [
         { provide: APP_CONFIG, useValue: appConfig },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
     markdownSpy = spyOn(MarkdownPipe.prototype, 'transform');
     fixture = TestBed.createComponent(ItemPageFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue(mockFields, mockValue);
     comp.fields = mockFields;
     comp.label = mockLabel;
     fixture.detectChanges();
-  };
-
-  it('should display display the correct metadata value', waitForAsync(async () => {
-    await buildTestEnvironment();
-    expect(fixture.nativeElement.innerHTML).toContain(mockValue);
   }));
 
-  describe('when markdown is disabled in the environment config', () => {
+  it('should display display the correct metadata value', () => {
+    expect(fixture.nativeElement.innerHTML).toContain(mockValue);
+  });
 
-    beforeEach(waitForAsync(async () => {
+  describe('when markdown is disabled in the environment config', () => {
+    beforeEach( () => {
       appConfig.markdown.enabled = false;
-      await buildTestEnvironment();
-    }));
+    });
 
     describe('and markdown is disabled in this component', () => {
 
@@ -97,11 +116,9 @@ describe('ItemPageFieldComponent', () => {
   });
 
   describe('when markdown is enabled in the environment config', () => {
-
-    beforeEach(waitForAsync(async () => {
+    beforeEach(() => {
       appConfig.markdown.enabled = true;
-      await buildTestEnvironment();
-    }));
+    });
 
     describe('and markdown is disabled in this component', () => {
 
@@ -126,17 +143,54 @@ describe('ItemPageFieldComponent', () => {
         expect(markdownSpy).toHaveBeenCalled();
       });
     });
+
+  });
+
+  describe('test rendering of configured browse links', () => {
+    beforeEach(() => {
+      appConfig.markdown.enabled = false;
+      comp.enableMarkdown = true;
+      fixture.detectChanges();
+    });
+
+    it('should have a browse link', async () => {
+      expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockValue);
+    });
+  });
+
+  describe('test rendering of configured regex-based links', () => {
+    beforeEach(() => {
+      comp.urlRegex = '^test';
+      fixture.detectChanges();
+    });
+
+    it('should have a rendered (non-browse) link since the value matches ^test', () => {
+      expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link')).nativeElement.innerHTML).toContain(mockValue);
+    });
+  });
+
+  describe('test skipping of configured links that do NOT match regex', () => {
+    beforeEach(() => {
+      comp.urlRegex = '^nope';
+      fixture.detectChanges();
+    });
+
+    it('should NOT have a rendered (non-browse) link since the value matches ^test', () => {
+      expect(fixture.debugElement.query(By.css('a.ds-simple-metadata-link'))).toBeNull();
+    });
   });
 });
 
-export function mockItemWithMetadataFieldAndValue(field: string, value: string): Item {
+export function mockItemWithMetadataFieldsAndValue(fields: string[], value: string): Item {
   const item = Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-    metadata: new MetadataMap()
+    metadata: new MetadataMap(),
+  });
+  fields.forEach((field: string) => {
+    item.metadata[field] = [{
+      language: 'en_US',
+      value: value,
+    }] as MetadataValue[];
   });
-  item.metadata[field] = [{
-    language: 'en_US',
-    value: value
-  }] as MetadataValue[];
   return item;
 }
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 681c5e16bc..423eb8c018 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,5 +1,33 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
 import { Item } from '../../../../core/shared/item.model';
+import { getRemoteDataPayload } from '../../../../core/shared/operators';
+
+/**
+ * Interface that encapsulate Image configuration for this component.
+ */
+export interface ImageField {
+  /**
+   * URI that is used to retrieve the image.
+   */
+  URI: string;
+  /**
+   * i18n Key that represents the alt text to display
+   */
+  alt: string;
+  /**
+   * CSS variable that contains the height of the inline image.
+   */
+  heightVar: string;
+}
+
 
 /**
  * This component can be used to represent metadata on a simple item page.
@@ -8,10 +36,13 @@ import { Item } from '../../../../core/shared/item.model';
  */
 
 @Component({
-    templateUrl: './item-page-field.component.html'
+  templateUrl: './item-page-field.component.html',
 })
 export class ItemPageFieldComponent {
 
+  constructor(protected browseDefinitionDataService: BrowseDefinitionDataService) {
+  }
+
     /**
      * The item to display metadata for
      */
@@ -38,4 +69,24 @@ export class ItemPageFieldComponent {
      */
     separator = '<br/>';
 
+    /**
+     * Whether any valid HTTP(S) URL should be rendered as a link
+     */
+    urlRegex?: string;
+
+    /**
+     * Image Configuration
+     */
+    img: ImageField;
+
+    /**
+     * Return browse definition that matches any field used in this component if it is configured as a browse
+     * link in dspace.cfg (webui.browse.link.<n>)
+     */
+    get browseDefinition(): Observable<BrowseDefinition> {
+      return this.browseDefinitionDataService.findByFields(this.fields).pipe(
+        getRemoteDataPayload(),
+        map((def) => def),
+      );
+    }
 }
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/title/item-page-title-field.component.spec.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
index bc661e81c9..c271b1fa53 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.spec.ts
@@ -1,9 +1,20 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
 import { MetadataValuesComponent } from '../../../../field-components/metadata-values/metadata-values.component';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
 import { ItemPageTitleFieldComponent } from './item-page-title-field.component';
 
 let comp: ItemPageTitleFieldComponent;
@@ -18,20 +29,20 @@ describe('ItemPageTitleFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [ItemPageTitleFieldComponent, MetadataValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageTitleFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemPageTitleFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     fixture.detectChanges();
   }));
 
diff --git a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
index a8d9e8ad8e..f1f44d672a 100644
--- a/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { Item } from '../../../../../core/shared/item.model';
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-item-page-title-field',
-  templateUrl: './item-page-title-field.component.html'
+  templateUrl: './item-page-title-field.component.html',
 })
 /**
  * This component is used for displaying the title (defined by the {@link DSONameService}) of an item
diff --git a/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
new file mode 100644
index 0000000000..9ba9720f12
--- /dev/null
+++ b/src/app/item-page/simple/field-components/specific-field/title/themed-item-page-field.component.ts
@@ -0,0 +1,37 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { ThemedComponent } from '../../../../../shared/theme-support/themed.component';
+import { ItemPageTitleFieldComponent } from './item-page-title-field.component';
+
+/**
+ * Themed wrapper for {@link ItemPageTitleFieldComponent}
+ */
+@Component({
+  selector: 'ds-themed-item-page-title-field',
+  styleUrls: [],
+  templateUrl: '../../../../../shared/theme-support/themed.component.html',
+})
+export class ThemedItemPageTitleFieldComponent extends ThemedComponent<ItemPageTitleFieldComponent> {
+
+  protected inAndOutputNames: (keyof ItemPageTitleFieldComponent & keyof this)[] = [
+    'item',
+  ];
+
+  @Input() item: Item;
+
+  protected getComponentName(): string {
+    return 'ItemPageTitleFieldComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./item-page-title-field.component');
+  }
+}
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 7c766252a3..a87e0c76f1 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
@@ -1,12 +1,25 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
-import { mockItemWithMetadataFieldAndValue } from '../item-page-field.component.spec';
-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 {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { BrowseDefinitionDataService } from '../../../../../core/browse/browse-definition-data.service';
+import { BrowseDefinitionDataServiceStub } from '../../../../../shared/testing/browse-definition-data-service.stub';
+import { TranslateLoaderMock } from '../../../../../shared/testing/translate-loader.mock';
+import { MetadataUriValuesComponent } from '../../../../field-components/metadata-uri-values/metadata-uri-values.component';
+import { mockItemWithMetadataFieldsAndValue } from '../item-page-field.component.spec';
+import { ItemPageUriFieldComponent } from './item-page-uri-field.component';
 
 let comp: ItemPageUriFieldComponent;
 let fixture: ComponentFixture<ItemPageUriFieldComponent>;
@@ -21,23 +34,24 @@ describe('ItemPageUriFieldComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       providers: [
         { provide: APP_CONFIG, useValue: environment },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
       declarations: [ItemPageUriFieldComponent, MetadataUriValuesComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageUriFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemPageUriFieldComponent);
     comp = fixture.componentInstance;
-    comp.item = mockItemWithMetadataFieldAndValue(mockField, mockValue);
+    comp.item = mockItemWithMetadataFieldsAndValue([mockField], mockValue);
     comp.fields = [mockField];
     comp.label = mockLabel;
     fixture.detectChanges();
diff --git a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
index b70cbbd5e8..8c2d2cc2fa 100644
--- a/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.ts
@@ -1,11 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import { ItemPageFieldComponent } from '../item-page-field.component';
 
 @Component({
   selector: 'ds-item-page-uri-field',
-  templateUrl: './item-page-uri-field.component.html'
+  templateUrl: './item-page-uri-field.component.html',
 })
 /**
  * This component can be used to represent any uri on a simple item page.
diff --git a/src/app/item-page/simple/item-page.component.html b/src/app/item-page/simple/item-page.component.html
index 0fc423c195..dc8ed87a86 100644
--- a/src/app/item-page/simple/item-page.component.html
+++ b/src/app/item-page/simple/item-page.component.html
@@ -1,7 +1,9 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
-      <ds-item-alerts [item]="item"></ds-item-alerts>
+      <ds-themed-item-alerts [item]="item"></ds-themed-item-alerts>
+      <ds-qa-event-notification [item]="item"></ds-qa-event-notification>
+      <ds-notify-requests-status [itemUuid]="item.uuid"></ds-notify-requests-status>
       <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>
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 9b0e87939d..2e3ce5321b 100644
--- a/src/app/item-page/simple/item-page.component.spec.ts
+++ b/src/app/item-page/simple/item-page.component.spec.ts
@@ -1,72 +1,133 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ItemPageComponent } from './item-page.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { MetadataService } from '../../core/metadata/metadata.service';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { Item } from '../../core/shared/item.model';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { NotifyInfoService } from '../../core/coar-notify/notify-info/notify-info.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { SignpostingLink } from '../../core/data/signposting-links.model';
+import { MetadataService } from '../../core/metadata/metadata.service';
+import {
+  LinkDefinition,
+  LinkHeadService,
+} from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { Item } from '../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import {
   createFailedRemoteDataObject$,
   createPendingRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { AuthService } from '../../core/auth/auth.service';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { createPaginatedList } from '../../shared/testing/utils.test';
-import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ItemPageComponent } from './item-page.component';
+import { createRelationshipsObservable } from './item-types/shared/item.component.spec';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 
 const mockWithdrawnItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
   relationships: createRelationshipsObservable(),
-  isWithdrawn: true
+  isWithdrawn: true,
 });
 
+const mocklink = {
+  href: 'http://test.org',
+  rel: 'rel1',
+  type: 'type1',
+};
+
+const mocklink2 = {
+  href: 'http://test2.org',
+  rel: 'rel2',
+  type: undefined,
+};
+
+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>;
+  let linkHeadService: jasmine.SpyObj<LinkHeadService>;
+  let notifyInfoService: jasmine.SpyObj<NotifyInfoService>;
 
   const mockMetadataService = {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     processRemoteData: () => {
-    }
+    },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) })
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockItem) }),
   });
 
+  const getCoarLdnLocalInboxUrls = ['http://InboxUrls.org', 'http://InboxUrls2.org'];
+
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
       isAuthorized: observableOf(false),
     });
+    serverResponseService = jasmine.createSpyObj('ServerResponseService', {
+      setHeader: jasmine.createSpy('setHeader'),
+    });
+
+    signpostingDataService = jasmine.createSpyObj('SignpostingDataService', {
+      getLinks: observableOf([mocklink, mocklink2]),
+    });
+
+    linkHeadService = jasmine.createSpyObj('LinkHeadService', {
+      addTag: jasmine.createSpy('setHeader'),
+      removeTag: jasmine.createSpy('removeTag'),
+    });
+
+    notifyInfoService = jasmine.createSpyObj('NotifyInfoService', {
+      getInboxRelationLink: 'http://www.w3.org/ns/ldp#inbox',
+      isCoarConfigEnabled: observableOf(true),
+      getCoarLdnLocalInboxUrls: observableOf(getCoarLdnLocalInboxUrls),
+    });
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       }), BrowserAnimationsModule],
       declarations: [ItemPageComponent, VarDirective],
       providers: [
@@ -76,11 +137,16 @@ describe('ItemPageComponent', () => {
         { provide: Router, useValue: {} },
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationDataService },
+        { provide: ServerResponseService, useValue: serverResponseService },
+        { provide: SignpostingDataService, useValue: signpostingDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: NotifyInfoService, useValue: notifyInfoService },
+        { provide: PLATFORM_ID, useValue: 'server' },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemPageComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -126,6 +192,32 @@ describe('ItemPageComponent', () => {
       const objectLoader = fixture.debugElement.query(By.css('ds-listable-object-component-loader'));
       expect(objectLoader.nativeElement).toBeDefined();
     });
+
+    it('should add the signposting links', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalled();
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
+    });
+
+
+    it('should add link tags correctly', () => {
+
+      expect(comp.signpostingLinks).toEqual([mocklink, mocklink2]);
+
+      // Check if linkHeadService.addTag() was called with the correct arguments
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(mockSignpostingLinks.length + getCoarLdnLocalInboxUrls.length);
+      let expected: LinkDefinition = mockSignpostingLinks[0] as LinkDefinition;
+      expect(linkHeadService.addTag).toHaveBeenCalledWith(expected);
+      expected = {
+        href: 'http://test2.org',
+        rel: 'rel2',
+      };
+      expect(linkHeadService.addTag).toHaveBeenCalledWith(expected);
+    });
+
+    it('should set Link header on the server', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalledWith('Link', '<http://test.org> ; rel="rel1" ; type="type1" , <http://test2.org> ; rel="rel2" , <http://InboxUrls.org> ; rel="http://www.w3.org/ns/ldp#inbox", <http://InboxUrls2.org> ; rel="http://www.w3.org/ns/ldp#inbox"');
+    });
+
   });
   describe('when the item is withdrawn and the user is not an admin', () => {
     beforeEach(() => {
@@ -150,6 +242,11 @@ describe('ItemPageComponent', () => {
       const objectLoader = fixture.debugElement.query(By.css('ds-listable-object-component-loader'));
       expect(objectLoader.nativeElement).toBeDefined();
     });
+
+    it('should add the signposting links', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalled();
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
+    });
   });
 
   describe('when the item is not withdrawn and the user is not an admin', () => {
@@ -162,6 +259,11 @@ describe('ItemPageComponent', () => {
       const objectLoader = fixture.debugElement.query(By.css('ds-listable-object-component-loader'));
       expect(objectLoader.nativeElement).toBeDefined();
     });
+
+    it('should add the signposting links', () => {
+      expect(serverResponseService.setHeader).toHaveBeenCalled();
+      expect(linkHeadService.addTag).toHaveBeenCalledTimes(4);
+    });
   });
 
 });
diff --git a/src/app/item-page/simple/item-page.component.ts b/src/app/item-page/simple/item-page.component.ts
index 6e0db386db..dbd9742d39 100644
--- a/src/app/item-page/simple/item-page.component.ts
+++ b/src/app/item-page/simple/item-page.component.ts
@@ -1,20 +1,47 @@
-import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import { isPlatformServer } from '@angular/common';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+import { NotifyInfoService } from 'src/app/core/coar-notify/notify-info/notify-info.service';
 
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-
-import { ItemDataService } from '../../core/data/item-data.service';
-import { RemoteData } from '../../core/data/remote-data';
-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 { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { SignpostingDataService } from '../../core/data/signposting-data.service';
+import { SignpostingLink } from '../../core/data/signposting-links.model';
+import {
+  LinkDefinition,
+  LinkHeadService,
+} from '../../core/services/link-head.service';
+import { ServerResponseService } from '../../core/services/server-response.service';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeInOut } from '../../shared/animations/fade';
+import { isNotEmpty } from '../../shared/empty.util';
+import { getItemPageRoute } from '../item-page-routing-paths';
 
 /**
  * This component renders a simple item page.
@@ -26,9 +53,9 @@ import { FeatureID } from '../../core/data/feature-authorization/feature-id';
   styleUrls: ['./item-page.component.scss'],
   templateUrl: './item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
-export class ItemPageComponent implements OnInit {
+export class ItemPageComponent implements OnInit, OnDestroy {
 
   /**
    * The item's id
@@ -57,13 +84,31 @@ export class ItemPageComponent implements OnInit {
 
   itemUrl: string;
 
+  /**
+   * Contains a list of SignpostingLink related to the item
+   */
+  signpostingLinks: SignpostingLink[] = [];
+
+  /**
+   * An array of LinkDefinition objects representing inbox links for the item page.
+   */
+  inboxTags: LinkDefinition[] = [];
+
+  coarRestApiUrls: string[] = [];
+
   constructor(
     protected route: ActivatedRoute,
-    private router: Router,
-    private items: ItemDataService,
-    private authService: AuthService,
-    private authorizationService: AuthorizationDataService
+    protected router: Router,
+    protected items: ItemDataService,
+    protected authService: AuthService,
+    protected authorizationService: AuthorizationDataService,
+    protected responseService: ServerResponseService,
+    protected signpostingDataService: SignpostingDataService,
+    protected linkHeadService: LinkHeadService,
+    protected notifyInfoService: NotifyInfoService,
+    @Inject(PLATFORM_ID) protected platformId: string,
   ) {
+    this.initPageLinks();
   }
 
   /**
@@ -72,14 +117,100 @@ export class ItemPageComponent implements OnInit {
   ngOnInit(): void {
     this.itemRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Item>),
-      redirectOn4xx(this.router, this.authService)
+      redirectOn4xx(this.router, this.authService),
     );
     this.itemPageRoute$ = this.itemRD$.pipe(
       getAllSucceededRemoteDataPayload(),
-      map((item) => getItemPageRoute(item))
+      map((item) => getItemPageRoute(item)),
     );
 
     this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
 
   }
+
+  /**
+   * Create page links if any are retrieved by signposting endpoint
+   *
+   * @private
+   */
+  private initPageLinks(): void {
+    this.route.params.subscribe(params => {
+      combineLatest([this.signpostingDataService.getLinks(params.id).pipe(take(1)), this.getCoarLdnLocalInboxUrls()])
+        .subscribe(([signpostingLinks, coarRestApiUrls]) => {
+          let links = '';
+          this.signpostingLinks = signpostingLinks;
+
+          signpostingLinks.forEach((link: SignpostingLink) => {
+            links = links + (isNotEmpty(links) ? ', ' : '') + `<${link.href}> ; rel="${link.rel}"` + (isNotEmpty(link.type) ? ` ; type="${link.type}" ` : ' ');
+            let tag: LinkDefinition = {
+              href: link.href,
+              rel: link.rel,
+            };
+            if (isNotEmpty(link.type)) {
+              tag = Object.assign(tag, {
+                type: link.type,
+              });
+            }
+            this.linkHeadService.addTag(tag);
+          });
+
+          if (coarRestApiUrls.length > 0) {
+            const inboxLinks = this.initPageInboxLinks(coarRestApiUrls);
+            links = links + (isNotEmpty(links) ? ', ' : '') + inboxLinks;
+          }
+
+          if (isPlatformServer(this.platformId)) {
+            this.responseService.setHeader('Link', links);
+          }
+        });
+    });
+  }
+
+  /**
+   * Sets the COAR LDN local inbox URL if COAR configuration is enabled.
+   * If the COAR LDN local inbox URL is retrieved successfully, initializes the page inbox links.
+   */
+  private getCoarLdnLocalInboxUrls(): Observable<string[]> {
+    return this.notifyInfoService.isCoarConfigEnabled().pipe(
+      switchMap((coarLdnEnabled: boolean) => {
+        if (coarLdnEnabled) {
+          return this.notifyInfoService.getCoarLdnLocalInboxUrls();
+        } else {
+          return of([]);
+        }
+      }),
+    );
+  }
+
+  /**
+   * Initializes the page inbox links.
+   * @param coarRestApiUrls - An array of COAR REST API URLs.
+   */
+  private initPageInboxLinks(coarRestApiUrls: string[]): string {
+    const rel = this.notifyInfoService.getInboxRelationLink();
+    let links = '';
+
+    coarRestApiUrls.forEach((coarRestApiUrl: string) => {
+      // Add link to head
+      const tag: LinkDefinition = {
+        href: coarRestApiUrl,
+        rel: rel,
+      };
+      this.inboxTags.push(tag);
+      this.linkHeadService.addTag(tag);
+
+      links = links + (isNotEmpty(links) ? ', ' : '') + `<${coarRestApiUrl}> ; rel="${rel}"`;
+    });
+
+    return links;
+  }
+
+  ngOnDestroy(): void {
+    this.signpostingLinks.forEach((link: SignpostingLink) => {
+      this.linkHeadService.removeTag(`href='${link.href}'`);
+    });
+    this.inboxTags.forEach((link: LinkDefinition) => {
+      this.linkHeadService.removeTag(`href='${link.href}'`);
+    });
+  }
 }
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 392d5ddd0c..d09b560042 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
@@ -1,3 +1,4 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer  id="iiif-viewer"
@@ -8,33 +9,28 @@
   </div>
 </div>
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'publication.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ng-container *ngIf="!mediaViewer.image">
+    <ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-        <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"></ds-themed-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
-    <ng-container *ngIf="mediaViewer.image">
-      <ds-media-viewer [item]="object" [videoOptions]="mediaViewer.video"></ds-media-viewer>
-    </ng-container>
+    <div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
+      <ds-themed-media-viewer [item]="object"></ds-themed-media-viewer>
+    </div>
     <ds-themed-item-page-file-section [item]="object"></ds-themed-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
-    <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
+    <ds-themed-metadata-representation-list class="ds-item-page-mixed-author-field"
       [parentItem]="object"
       [itemType]="'Person'"
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
       [label]="'relationships.isAuthorOf' | translate">
-    </ds-metadata-representation-list>
+    </ds-themed-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
       [label]="'publication.page.journal-title'">
@@ -76,7 +72,7 @@
 
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.subject']"
-      [separator]="','"
+      [separator]="', '"
       [label]="'item.page.subject'">
     </ds-generic-item-page-field>
     <ds-generic-item-page-field [item]="object"
@@ -88,6 +84,22 @@
       [label]="'item.page.uri'">
     </ds-item-page-uri-field>
     <ds-item-page-collections [item]="object"></ds-item-page-collections>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['notify.relation.endorsedBy']"
+      [label]="'item.page.endorsement'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReviewedBy']"
+      [label]="'item.page.review'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isSupplementedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReferencedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
     <div>
       <a class="btn btn-outline-primary" role="button" [routerLink]="[itemPageRoute + '/full']">
         <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.scss b/src/app/item-page/simple/item-types/publication/publication.component.scss
index 3575cae797..b810d2ddd4 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.scss
+++ b/src/app/item-page/simple/item-types/publication/publication.component.scss
@@ -1 +1,2 @@
 @import '../../../../../styles/variables.scss';
+
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 1ccb33eb32..5d3640f833 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
@@ -1,10 +1,28 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -14,28 +32,31 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataMap  } from '../../../../core/shared/metadata.models';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import {
-  createRelationshipsObservable, getIIIFEnabled, getIIIFSearchEnabled, mockRouteService
+  createRelationshipsObservable,
+  getIIIFEnabled,
+  getIIIFSearchEnabled,
+  mockRouteService,
 } from '../shared/item.component.spec';
 import { PublicationComponent } from './publication.component';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { RouteService } from '../../../../core/services/route.service';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
 
 const noMetadata = new MetadataMap();
 
@@ -43,7 +64,7 @@ function getItem(metadata: MetadataMap) {
   return Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: metadata,
-    relationships: createRelationshipsObservable()
+    relationships: createRelationshipsObservable(),
   });
 }
 
@@ -55,15 +76,15 @@ describe('PublicationComponent', () => {
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
       ],
@@ -87,12 +108,13 @@ describe('PublicationComponent', () => {
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: SearchService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
+        { provide: RouteService, useValue: mockRouteService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PublicationComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     });
   }));
 
@@ -163,17 +185,17 @@ describe('PublicationComponent', () => {
 
   describe('with IIIF viewer and search', () => {
 
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/search?query=test%20query&fakeParam=true');
+      },
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/search?query=test%20query&fakeParam=true');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(PublicationComponent);
       comp = fixture.componentInstance;
@@ -193,18 +215,17 @@ describe('PublicationComponent', () => {
   });
 
   describe('with IIIF viewer and search but no previous search query', () => {
-
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/item');
+      },
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/item');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(PublicationComponent);
       comp = fixture.componentInstance;
diff --git a/src/app/item-page/simple/item-types/publication/publication.component.ts b/src/app/item-page/simple/item-types/publication/publication.component.ts
index ba5037a104..b4882ff2f6 100644
--- a/src/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,7 +1,11 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../versioned-item/versioned-item.component';
+import { ItemComponent } from '../shared/item.component';
 
 /**
  * Component that represents a publication Item page
@@ -14,6 +18,6 @@ import { VersionedItemComponent } from '../versioned-item/versioned-item.compone
   templateUrl: './publication.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class PublicationComponent extends VersionedItemComponent {
+export class PublicationComponent extends ItemComponent {
 
 }
diff --git a/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts b/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts
index fe1070400e..a39b345bf0 100644
--- a/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts
+++ b/src/app/item-page/simple/item-types/shared/item-iiif-utils.ts
@@ -1,8 +1,16 @@
-import { Item } from '../../../../core/shared/item.model';
+import {
+  DefaultUrlSerializer,
+  UrlTree,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { RouteService } from '../../../../core/services/route.service';
-import { DefaultUrlSerializer, UrlTree } from '@angular/router';
+import { Item } from '../../../../core/shared/item.model';
 
 export const isIiifEnabled = (item: Item) => {
   return !!item.firstMetadataValue('dspace.iiif.enabled');
@@ -31,6 +39,6 @@ export const getDSpaceQuery = (item: Item, routeService: RouteService): Observab
       const url: UrlTree = new DefaultUrlSerializer().parse(r);
       return url.queryParamMap.get('query');
     }),
-    take(1)
+    take(1),
   );
 };
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..112884303b 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,19 +1,26 @@
-import { combineLatest as observableCombineLatest, Observable, zip as observableZip } from 'rxjs';
-import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
+import { InjectionToken } from '@angular/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  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
-} from '../../../../core/shared/operators';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { hasValue } from '../../../../shared/empty.util';
-import { InjectionToken } from '@angular/core';
 
 export const PAGINATED_RELATIONS_TO_ITEMS_OPERATOR = new InjectionToken<(thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>) => Observable<RemoteData<PaginatedList<Item>>>>('paginatedRelationsToItems', {
   providedIn: 'root',
-  factory: () => paginatedRelationsToItems
+  factory: () => paginatedRelationsToItems,
 });
 
 /**
@@ -53,8 +60,8 @@ export const relationsToItems = (thisId: string) =>
     source.pipe(
       mergeMap((rels: Relationship[]) =>
         observableZip(
-          ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem))
-        )
+          ...rels.map((rel: Relationship) => observableCombineLatest(rel.leftItem, rel.rightItem)),
+        ),
       ),
       map((arr) =>
         arr
@@ -66,7 +73,7 @@ export const relationsToItems = (thisId: string) =>
               return leftItem.payload;
             }
           })
-          .filter((item: Item) => hasValue(item))
+          .filter((item: Item) => hasValue(item)),
       ),
       distinctUntilChanged(compareArraysUsingIds()),
     );
@@ -77,33 +84,51 @@ export const relationsToItems = (thisId: string) =>
  * @param {string} thisId       The item's id of which the relations belong to
  * @returns {(source: Observable<Relationship[]>) => Observable<Item[]>}
  */
-export const paginatedRelationsToItems = (thisId: string) =>
-  (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
-    source.pipe(
-      getFirstSucceededRemoteData(),
-      switchMap((relationshipsRD: RemoteData<PaginatedList<Relationship>>) => {
-        return observableCombineLatest(
-          relationshipsRD.payload.page.map((rel: Relationship) =>
-            observableCombineLatest([
-              rel.leftItem.pipe(getFirstSucceededRemoteDataPayload()),
-              rel.rightItem.pipe(getFirstSucceededRemoteDataPayload())]
-            )
-          )).pipe(
-          map((arr) =>
-            arr
-              .map(([leftItem, rightItem]) => {
-                if (leftItem.id === thisId) {
-                  return rightItem;
-                } else if (rightItem.id === thisId) {
-                  return leftItem;
+export const paginatedRelationsToItems = (thisId: string) => (source: Observable<RemoteData<PaginatedList<Relationship>>>): Observable<RemoteData<PaginatedList<Item>>> =>
+  source.pipe(
+    getFirstCompletedRemoteData(),
+    switchMap((relationshipsRD: RemoteData<PaginatedList<Relationship>>) => {
+      return observableCombineLatest(
+        relationshipsRD.payload.page.map((rel: Relationship) =>
+          observableCombineLatest([
+            rel.leftItem.pipe(
+              getFirstCompletedRemoteData(),
+              map((rd: RemoteData<Item>) => {
+                if (rd.hasSucceeded) {
+                  return rd.payload;
+                } else {
+                  return null;
                 }
-              })
-              .filter((item: Item) => hasValue(item))
+              }),
+            ),
+            rel.rightItem.pipe(
+              getFirstCompletedRemoteData(),
+              map((rd: RemoteData<Item>) => {
+                if (rd.hasSucceeded) {
+                  return rd.payload;
+                } else {
+                  return null;
+                }
+              }),
+            ),
+          ],
           ),
-          distinctUntilChanged(compareArraysUsingIds()),
-          map((relatedItems: Item[]) =>
-            Object.assign(relationshipsRD, { payload: Object.assign(relationshipsRD.payload, { page: relatedItems } )})
-          )
-        );
-      })
-    );
+        ),
+      ).pipe(
+        map((arr) =>
+          arr.map(([leftItem, rightItem]) => {
+            if (hasValue(leftItem) && leftItem.id === thisId) {
+              return rightItem;
+            } else if (hasValue(rightItem) && rightItem.id === thisId) {
+              return leftItem;
+            }
+          })
+            .filter((item: Item) => hasValue(item)),
+        ),
+        distinctUntilChanged(compareArraysUsingIds()),
+        map((relatedItems: Item[]) =>
+          Object.assign(relationshipsRD, { payload: Object.assign(relationshipsRD.payload, { page: relatedItems } ) }),
+        ),
+      );
+    }),
+  );
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 b14e56a58e..0ff54b6a9d 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
@@ -1,44 +1,67 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
+import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../../core/shared/item.model';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
+import { MetadataValue } from '../../../../core/shared/metadata.models';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
-import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils';
 import { ItemComponent } from './item.component';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { RouteService } from '../../../../core/services/route.service';
-import { MetadataValue } from '../../../../core/shared/metadata.models';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { ResearcherProfileDataService } from '../../../../core/profile/researcher-profile-data.service';
+import {
+  compareArraysUsing,
+  compareArraysUsingIds,
+} from './item-relationships-utils';
 
 export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
   return Object.assign(new MetadataValue(), {
@@ -46,7 +69,7 @@ export function getIIIFSearchEnabled(enabled: boolean): MetadataValue {
     'language': null,
     'authority': null,
     'confidence': -1,
-    'place': 0
+    'place': 0,
   });
 }
 
@@ -56,11 +79,15 @@ export function getIIIFEnabled(enabled: boolean): MetadataValue {
     'language': null,
     'authority': null,
     'confidence': -1,
-    'place': 0
+    'place': 0,
   });
 }
 
-export const mockRouteService = jasmine.createSpyObj('RouteService', ['getPreviousUrl']);
+export const mockRouteService = {
+  getPreviousUrl(): Observable<string> {
+    return observableOf('');
+  },
+};
 
 /**
  * Create a generic test for an item-page-fields component using a mockItem and the type of component
@@ -78,22 +105,22 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
       const mockBitstreamDataService = {
         getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
           return createSuccessfulRemoteDataObject$(new Bitstream());
-        }
+        },
       };
 
       const authorizationService = jasmine.createSpyObj('authorizationService', {
-        isAuthorized: observableOf(true)
+        isAuthorized: observableOf(true),
       });
 
       TestBed.configureTestingModule({
         imports: [
-            TranslateModule.forRoot({
-              loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock
-              }
-            }),
-            RouterTestingModule,
+          TranslateModule.forRoot({
+            loader: {
+              provide: TranslateLoader,
+              useClass: TranslateLoaderMock,
+            },
+          }),
+          RouterTestingModule,
         ],
         declarations: [component, GenericItemPageFieldComponent, TruncatePipe],
         providers: [
@@ -115,14 +142,15 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
           { provide: BitstreamDataService, useValue: mockBitstreamDataService },
           { provide: WorkspaceitemDataService, useValue: {} },
           { provide: SearchService, useValue: {} },
-          { provide: RouteService, useValue: {} },
+          { provide: RouteService, useValue: mockRouteService },
           { provide: AuthorizationDataService, useValue: authorizationService },
-          { provide: ResearcherProfileDataService, useValue: {} }
+          { provide: ResearcherProfileDataService, useValue: {} },
+          { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
         ],
 
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).overrideComponent(component, {
-        set: { changeDetection: ChangeDetectionStrategy.Default }
+        set: { changeDetection: ChangeDetectionStrategy.Default },
       }).compileComponents();
     }));
 
@@ -166,8 +194,8 @@ export function createRelationshipsObservable() {
     Object.assign(new Relationship(), {
       relationshipType: createSuccessfulRemoteDataObject$(new RelationshipType()),
       leftItem: createSuccessfulRemoteDataObject$(new Item()),
-      rightItem: createSuccessfulRemoteDataObject$(new Item())
-    })
+      rightItem: createSuccessfulRemoteDataObject$(new Item()),
+    }),
   ]));
 }
 
@@ -175,66 +203,66 @@ describe('ItemComponent', () => {
   const arr1 = [
     {
       id: 1,
-      name: 'test'
+      name: 'test',
     },
     {
       id: 2,
-      name: 'another test'
+      name: 'another test',
     },
     {
       id: 3,
-      name: 'one last test'
-    }
+      name: 'one last test',
+    },
   ];
   const arrWithWrongId = [
     {
       id: 1,
-      name: 'test'
+      name: 'test',
     },
     {
       id: 5,  // Wrong id on purpose
-      name: 'another test'
+      name: 'another test',
     },
     {
       id: 3,
-      name: 'one last test'
-    }
+      name: 'one last test',
+    },
   ];
   const arrWithWrongName = [
     {
       id: 1,
-      name: 'test'
+      name: 'test',
     },
     {
       id: 2,
-      name: 'wrong test'  // Wrong name on purpose
+      name: 'wrong test',  // Wrong name on purpose
     },
     {
       id: 3,
-      name: 'one last test'
-    }
+      name: 'one last test',
+    },
   ];
   const arrWithDifferentOrder = [arr1[0], arr1[2], arr1[1]];
   const arrWithOneMore = [...arr1, {
     id: 4,
-    name: 'fourth test'
+    name: 'fourth test',
   }];
   const arrWithAddedProperties = [
     {
       id: 1,
       name: 'test',
-      extra: 'extra property'
+      extra: 'extra property',
     },
     {
       id: 2,
       name: 'another test',
-      extra: 'extra property'
+      extra: 'extra property',
     },
     {
       id: 3,
       name: 'one last test',
-      extra: 'extra property'
-    }
+      extra: 'extra property',
+    },
   ];
   const arrOfPrimitiveTypes = [1, 2, 3, 4];
   const arrOfPrimitiveTypesWithOneWrong = [1, 5, 3, 4];
@@ -377,4 +405,111 @@ describe('ItemComponent', () => {
     });
   });
 
+  const mockItem: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+    metadata: {
+      'publicationissue.issueNumber': [
+        {
+          language: 'en_US',
+          value: '1234',
+        },
+      ],
+      'dc.description': [
+        {
+          language: 'en_US',
+          value: 'desc',
+        },
+      ],
+    },
+  });
+  describe('back to results', () => {
+    let comp: ItemComponent;
+    let fixture: ComponentFixture<any>;
+    let router: Router;
+
+    const searchUrl = '/search?query=test&spc.page=2';
+    const browseUrl = '/browse/title?scope=0cc&bbm.page=3';
+    const recentSubmissionsUrl = '/collections/be7b8430-77a5-4016-91c9-90863e50583a?cp.page=3';
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        imports: [
+          TranslateModule.forRoot({
+            loader: {
+              provide: TranslateLoader,
+              useClass: TranslateLoaderMock,
+            },
+          }),
+          RouterTestingModule,
+        ],
+        declarations: [ItemComponent, GenericItemPageFieldComponent, TruncatePipe ],
+        providers: [
+          { provide: ItemDataService, useValue: {} },
+          { provide: TruncatableService, useValue: {} },
+          { provide: RelationshipDataService, useValue: {} },
+          { provide: ObjectCacheService, useValue: {} },
+          { provide: UUIDService, useValue: {} },
+          { provide: Store, useValue: {} },
+          { provide: RemoteDataBuildService, useValue: {} },
+          { provide: CommunityDataService, useValue: {} },
+          { provide: HALEndpointService, useValue: {} },
+          { provide: HttpClient, useValue: {} },
+          { provide: DSOChangeAnalyzer, useValue: {} },
+          { provide: VersionHistoryDataService, useValue: {} },
+          { provide: VersionDataService, useValue: {} },
+          { provide: NotificationsService, useValue: {} },
+          { provide: DefaultChangeAnalyzer, useValue: {} },
+          { provide: BitstreamDataService, useValue: {} },
+          { provide: WorkspaceitemDataService, useValue: {} },
+          { provide: SearchService, useValue: {} },
+          { provide: RouteService, useValue: mockRouteService },
+          { provide: AuthorizationDataService, useValue: {} },
+          { provide: ResearcherProfileDataService, useValue: {} },
+        ],
+        schemas: [NO_ERRORS_SCHEMA],
+      }).overrideComponent(ItemComponent, {
+        set: { changeDetection: ChangeDetectionStrategy.Default },
+      });
+    }));
+
+    beforeEach(waitForAsync(() => {
+      router = TestBed.inject(Router);
+      spyOn(router, 'navigateByUrl');
+      TestBed.compileComponents();
+      fixture = TestBed.createComponent(ItemComponent);
+      comp = fixture.componentInstance;
+      comp.object = mockItem;
+      fixture.detectChanges();
+    }));
+
+    it('should hide back button', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf('/item'));
+      comp.ngOnInit();
+      comp.showBackButton$.subscribe((val) => {
+        expect(val).toBeFalse();
+      });
+    });
+    it('should show back button for search', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(searchUrl));
+      comp.ngOnInit();
+      comp.showBackButton$.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+    it('should show back button for browse', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(browseUrl));
+      comp.ngOnInit();
+      comp.showBackButton$.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+    it('should show back button for recent submissions', () => {
+      spyOn(mockRouteService, 'getPreviousUrl').and.returnValue(observableOf(recentSubmissionsUrl));
+      comp.ngOnInit();
+      comp.showBackButton$.subscribe((val) => {
+        expect(val).toBeTrue();
+      });
+    });
+  });
+
 });
diff --git a/src/app/item-page/simple/item-types/shared/item.component.ts b/src/app/item-page/simple/item-types/shared/item.component.ts
index 71b0b5b678..90b4c7b4c9 100644
--- a/src/app/item-page/simple/item-types/shared/item.component.ts
+++ b/src/app/item-page/simple/item-types/shared/item.component.ts
@@ -1,14 +1,28 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { environment } from '../../../../../environments/environment';
+import { RouteService } from '../../../../core/services/route.service';
 import { Item } from '../../../../core/shared/item.model';
 import { getItemPageRoute } from '../../../item-page-routing-paths';
-import { RouteService } from '../../../../core/services/route.service';
-import { Observable } from 'rxjs';
-import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-utils';
+import {
+  getDSpaceQuery,
+  isIiifEnabled,
+  isIiifSearchEnabled,
+} from './item-iiif-utils';
 
 @Component({
   selector: 'ds-item',
-  template: ''
+  template: '',
 })
 /**
  * A generic component for displaying metadata and relations of an item
@@ -16,6 +30,17 @@ import { getDSpaceQuery, isIiifEnabled, isIiifSearchEnabled } from './item-iiif-
 export class ItemComponent implements OnInit {
   @Input() object: Item;
 
+  /**
+   * This regex matches previous routes. The button is shown
+   * for matching paths and hidden in other cases.
+   */
+  previousRoute = /^(\/search|\/browse|\/collections|\/admin\/search|\/mydspace)/;
+
+  /**
+   * Used to show or hide the back to results button in the view.
+   */
+  showBackButton$: Observable<boolean>;
+
   /**
    * Route to the item page
    */
@@ -38,12 +63,32 @@ export class ItemComponent implements OnInit {
 
   mediaViewer;
 
-  constructor(protected routeService: RouteService) {
+  constructor(protected routeService: RouteService,
+              protected router: Router) {
     this.mediaViewer = environment.mediaViewer;
   }
 
+  /**
+   * The function used to return to list from the item.
+   */
+  back = () => {
+    this.routeService.getPreviousUrl().pipe(
+      take(1),
+    ).subscribe(
+      (url => {
+        this.router.navigateByUrl(url);
+      }),
+    );
+  };
+
   ngOnInit(): void {
+
     this.itemPageRoute = getItemPageRoute(this.object);
+    // hide/show the back button
+    this.showBackButton$ = this.routeService.getPreviousUrl().pipe(
+      map((url: string) => this.previousRoute.test(url)),
+      take(1),
+    );
     // check to see if iiif viewer is required.
     this.iiifEnabled = isIiifEnabled(this.object);
     this.iiifSearchEnabled = isIiifSearchEnabled(this.object);
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 89ac02eb16..35a00dc7b7 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
@@ -1,3 +1,4 @@
+<ds-themed-results-back-button *ngIf="showBackButton$ | async" [back]="back"></ds-themed-results-back-button>
 <div class="row" *ngIf="iiifEnabled">
   <div class="col-12">
     <ds-mirador-viewer id="iiif-viewer"
@@ -7,34 +8,30 @@
     </ds-mirador-viewer>
   </div>
 </div>
+
 <div class="d-flex flex-row">
-  <ds-item-page-title-field [item]="object" class="mr-auto">
-  </ds-item-page-title-field>
-  <div class="pl-2 space-children-mr">
-    <ds-dso-page-version-button (newVersionEvent)="onCreateNewVersion()" [dso]="object"
-                                [tooltipMsgCreate]="'item.page.version.create'"
-                                [tooltipMsgHasDraft]="'item.page.version.hasDraft'"></ds-dso-page-version-button>
-    <ds-dso-page-edit-button [pageRoute]="itemPageRoute" [dso]="object" [tooltipMsg]="'item.page.edit'"></ds-dso-page-edit-button>
-  </div>
+  <ds-themed-item-page-title-field [item]="object" class="mr-auto">
+  </ds-themed-item-page-title-field>
+  <ds-dso-edit-menu></ds-dso-edit-menu>
 </div>
 <div class="row">
   <div class="col-xs-12 col-md-4">
-    <ng-container *ngIf="!mediaViewer.image">
+    <ng-container *ngIf="!(mediaViewer.image || mediaViewer.video)">
       <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-        <ds-thumbnail [thumbnail]="object?.thumbnail | async"></ds-thumbnail>
+        <ds-themed-thumbnail [thumbnail]="object?.thumbnail | async"></ds-themed-thumbnail>
       </ds-metadata-field-wrapper>
     </ng-container>
-    <ng-container *ngIf="mediaViewer.image">
-      <ds-media-viewer [item]="object" [videoOptions]="mediaViewer.video"></ds-media-viewer>
-    </ng-container>
+    <div *ngIf="mediaViewer.image || mediaViewer.video" class="mb-2">
+      <ds-themed-media-viewer [item]="object"></ds-themed-media-viewer>
+    </div>
     <ds-themed-item-page-file-section [item]="object"></ds-themed-item-page-file-section>
     <ds-item-page-date-field [item]="object"></ds-item-page-date-field>
-    <ds-metadata-representation-list class="ds-item-page-mixed-author-field"
+    <ds-themed-metadata-representation-list class="ds-item-page-mixed-author-field"
       [parentItem]="object"
       [itemType]="'Person'"
       [metadataFields]="['dc.contributor.author', 'dc.creator']"
       [label]="'relationships.isAuthorOf' | translate">
-    </ds-metadata-representation-list>
+    </ds-themed-metadata-representation-list>
     <ds-generic-item-page-field [item]="object"
       [fields]="['journal.title']"
       [label]="'item.page.journal-title'">
@@ -61,7 +58,7 @@
 
     <ds-generic-item-page-field [item]="object"
       [fields]="['dc.subject']"
-      [separator]="','"
+      [separator]="', '"
       [label]="'item.page.subject'">
     </ds-generic-item-page-field>
     <ds-generic-item-page-field [item]="object"
@@ -73,6 +70,22 @@
       [label]="'item.page.uri'">
     </ds-item-page-uri-field>
     <ds-item-page-collections [item]="object"></ds-item-page-collections>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['notify.relation.endorsedBy']"
+      [label]="'item.page.endorsement'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReviewedBy']"
+      [label]="'item.page.review'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isSupplementedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
+    <ds-item-page-uri-field [item]="object"
+      [fields]="['datacite.relation.isReferencedBy']"
+      [label]="'item.page.dataset'">
+    </ds-item-page-uri-field>
     <div>
       <a class="btn btn-outline-primary" [routerLink]="[itemPageRoute + '/full']" role="button">
         <i class="fas fa-info-circle"></i> {{"item.page.link.full" | translate}}
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
index 3575cae797..b810d2ddd4 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.scss
@@ -1 +1,2 @@
 @import '../../../../../styles/variables.scss';
+
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 57f546fbec..667c2a58d0 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
@@ -1,10 +1,28 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { Observable, of } from 'rxjs';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { BrowseDefinitionDataService } from '../../../../core/browse/browse-definition-data.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
@@ -14,29 +32,32 @@ import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.ser
 import { ItemDataService } from '../../../../core/data/item-data.service';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { VersionDataService } from '../../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
 import { Item } from '../../../../core/shared/item.model';
 import { MetadataMap } from '../../../../core/shared/metadata.models';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { UUIDService } from '../../../../core/shared/uuid.service';
+import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { NotificationsService } from '../../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { BrowseDefinitionDataServiceStub } from '../../../../shared/testing/browse-definition-data-service.stub';
+import { createPaginatedList } from '../../../../shared/testing/utils.test';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
+import { ItemVersionsSharedService } from '../../../versions/item-versions-shared.service';
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import {
-  createRelationshipsObservable, getIIIFEnabled, getIIIFSearchEnabled, mockRouteService
+  createRelationshipsObservable,
+  getIIIFEnabled,
+  getIIIFSearchEnabled,
+  mockRouteService,
 } from '../shared/item.component.spec';
 import { UntypedItemComponent } from './untyped-item.component';
-import { RouteService } from '../../../../core/services/route.service';
-import { createPaginatedList } from '../../../../shared/testing/utils.test';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { RouterTestingModule } from '@angular/router/testing';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
 
 const noMetadata = new MetadataMap();
 
@@ -44,7 +65,7 @@ function getItem(metadata: MetadataMap) {
   return Object.assign(new Item(), {
     bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     metadata: metadata,
-    relationships: createRelationshipsObservable()
+    relationships: createRelationshipsObservable(),
   });
 }
 
@@ -56,15 +77,15 @@ describe('UntypedItemComponent', () => {
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
       ],
@@ -90,11 +111,12 @@ describe('UntypedItemComponent', () => {
         { provide: SearchService, useValue: {} },
         { provide: ItemDataService, useValue: {} },
         { provide: ItemVersionsSharedService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
+        { provide: RouteService, useValue: mockRouteService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(UntypedItemComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     });
   }));
 
@@ -169,20 +191,20 @@ describe('UntypedItemComponent', () => {
   });
 
   describe('with IIIF viewer and search', () => {
-
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/search?query=test%20query&fakeParam=true');
+      },
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/search?query=test%20query&fakeParam=true');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(UntypedItemComponent);
+      spyOn(localMockRouteService, 'getPreviousUrl').and.callThrough();
       comp = fixture.componentInstance;
       comp.object = getItem(iiifEnabledMap);
       fixture.detectChanges();
@@ -196,24 +218,24 @@ describe('UntypedItemComponent', () => {
     it('should retrieve the query term for previous route', (): void => {
       expect(comp.iiifQuery$.subscribe(result => expect(result).toEqual('test query')));
     });
-
   });
 
   describe('with IIIF viewer and search but no previous search query', () => {
 
+    const localMockRouteService = {
+      getPreviousUrl(): Observable<string> {
+        return of('/item');
+      },
+    };
     beforeEach(waitForAsync(() => {
-      const localMockRouteService = {
-        getPreviousUrl(): Observable<string> {
-          return of('/item');
-        }
-      };
       const iiifEnabledMap: MetadataMap = {
         'dspace.iiif.enabled': [getIIIFEnabled(true)],
         'iiif.search.enabled': [getIIIFSearchEnabled(true)],
       };
-      TestBed.overrideProvider(RouteService, {useValue: localMockRouteService});
+      TestBed.overrideProvider(RouteService, { useValue: localMockRouteService });
       TestBed.compileComponents();
       fixture = TestBed.createComponent(UntypedItemComponent);
+
       comp = fixture.componentInstance;
       comp.object = getItem(iiifEnabledMap);
       fixture.detectChanges();
diff --git a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 3ce33dc90a..96ef42510c 100644
--- a/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,8 +1,12 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
-import { VersionedItemComponent } from '../versioned-item/versioned-item.component';
+import { ItemComponent } from '../shared/item.component';
 
 /**
  * Component that represents a publication Item page
@@ -15,6 +19,6 @@ import { VersionedItemComponent } from '../versioned-item/versioned-item.compone
   templateUrl: './untyped-item.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
-export class UntypedItemComponent extends VersionedItemComponent {
+export class UntypedItemComponent extends ItemComponent {
 
 }
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
deleted file mode 100644
index 9aeea8b11e..0000000000
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.spec.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { VersionedItemComponent } from './versioned-item.component';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { NotificationsService } from '../../../../shared/notifications/notifications.service';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
-import { Item } from '../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { MetadataMap } from '../../../../core/shared/metadata.models';
-import { createRelationshipsObservable, mockRouteService } from '../shared/item.component.spec';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Component } from '@angular/core';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { Version } from '../../../../core/shared/version.model';
-import { RouteService } from '../../../../core/services/route.service';
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-
-const mockItem: Item = Object.assign(new Item(), {
-  bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
-  metadata: new MetadataMap(),
-  relationships: createRelationshipsObservable(),
-  _links: {
-    self: {
-      href: 'item-href'
-    },
-    version: {
-      href: 'version-href'
-    }
-  }
-});
-
-
-@Component({template: ''})
-class DummyComponent {
-}
-
-describe('VersionedItemComponent', () => {
-  let component: VersionedItemComponent;
-  let fixture: ComponentFixture<VersionedItemComponent>;
-
-  let versionService: VersionDataService;
-  let versionHistoryService: VersionHistoryDataService;
-
-  const versionServiceSpy = jasmine.createSpyObj('versionService', {
-    findByHref: createSuccessfulRemoteDataObject$<Version>(new Version()),
-  });
-
-  const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService', {
-    createVersion: createSuccessfulRemoteDataObject$<Version>(new Version()),
-  });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      declarations: [VersionedItemComponent, DummyComponent],
-      imports: [
-        RouterTestingModule,
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock,
-          }
-        }),
-      ],
-      providers: [
-        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
-        { provide: VersionDataService, useValue: versionServiceSpy },
-        { provide: NotificationsService, useValue: {} },
-        { provide: ItemVersionsSharedService, useValue: {} },
-        { provide: WorkspaceitemDataService, useValue: {} },
-        { provide: SearchService, useValue: {} },
-        { provide: ItemDataService, useValue: {} },
-        { provide: RouteService, useValue: mockRouteService }
-      ]
-    }).compileComponents();
-    versionService = TestBed.inject(VersionDataService);
-    versionHistoryService = TestBed.inject(VersionHistoryDataService);
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(VersionedItemComponent);
-    component = fixture.componentInstance;
-    component.object = mockItem;
-    fixture.detectChanges();
-  });
-
-  it('should create', () => {
-    expect(component).toBeTruthy();
-  });
-
-  describe('when onCreateNewVersion() is called', () => {
-    it('should call versionService.findByHref', () => {
-      component.onCreateNewVersion();
-      expect(versionService.findByHref).toHaveBeenCalledWith('version-href');
-    });
-  });
-
-});
diff --git a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts b/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
deleted file mode 100644
index 7f61cee10b..0000000000
--- a/src/app/item-page/simple/item-types/versioned-item/versioned-item.component.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-import { Component } from '@angular/core';
-import { ItemComponent } from '../shared/item.component';
-import { ItemVersionsSummaryModalComponent } from '../../../../shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Version } from '../../../../core/shared/version.model';
-import { switchMap, tap } from 'rxjs/operators';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { TranslateService } from '@ngx-translate/core';
-import { VersionDataService } from '../../../../core/data/version-data.service';
-import { ItemVersionsSharedService } from '../../../../shared/item/item-versions/item-versions-shared.service';
-import { Router } from '@angular/router';
-import { WorkspaceitemDataService } from '../../../../core/submission/workspaceitem-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { Item } from '../../../../core/shared/item.model';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { RouteService } from '../../../../core/services/route.service';
-
-@Component({
-  selector: 'ds-versioned-item',
-  templateUrl: './versioned-item.component.html',
-  styleUrls: ['./versioned-item.component.scss']
-})
-export class VersionedItemComponent extends ItemComponent {
-
-  constructor(
-    private modalService: NgbModal,
-    private versionHistoryService: VersionHistoryDataService,
-    private translateService: TranslateService,
-    private versionService: VersionDataService,
-    private itemVersionShared: ItemVersionsSharedService,
-    private router: Router,
-    private workspaceItemDataService: WorkspaceitemDataService,
-    private searchService: SearchService,
-    private itemService: ItemDataService,
-    protected routeService: RouteService
-  ) {
-    super(routeService);
-  }
-
-  /**
-   * Open a modal that allows to create a new version starting from the specified item, with optional summary
-   */
-  onCreateNewVersion(): void {
-
-    const item = this.object;
-    const versionHref = item._links.version.href;
-
-    // Open modal
-    const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent);
-
-    // Show current version in modal
-    this.versionService.findByHref(versionHref).pipe(getFirstCompletedRemoteData()).subscribe((res: RemoteData<Version>) => {
-      // if res.hasNoContent then the item is unversioned
-      activeModal.componentInstance.firstVersion = res.hasNoContent;
-      activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version);
-    });
-
-    // On createVersionEvent emitted create new version and notify
-    activeModal.componentInstance.createVersionEvent.pipe(
-      switchMap((summary: string) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
-      getFirstCompletedRemoteData(),
-      // close model (should be displaying loading/waiting indicator) when version creation failed/succeeded
-      tap(() => activeModal.close()),
-      // show success/failure notification
-      tap((res: RemoteData<Version>) => { this.itemVersionShared.notifyCreateNewVersion(res); }),
-      // get workspace item
-      getFirstSucceededRemoteDataPayload<Version>(),
-      switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)),
-      getFirstSucceededRemoteDataPayload<Item>(),
-      switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)),
-      getFirstSucceededRemoteDataPayload<WorkspaceItem>(),
-    ).subscribe((wsItem) => {
-      const wsiId = wsItem.id;
-      const route = 'workspaceitems/' + wsiId + '/edit';
-      this.router.navigateByUrl(route);
-    });
-
-  }
-}
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index 65660eaa34..efbe9206d1 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -7,12 +7,12 @@
       <ds-themed-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-themed-loading>
       <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
         <div *ngIf="(objects.length * incrementBy) < total" class="float-left">
-          <a [routerLink]="[]" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</a>
+          <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
         </div>
         <div *ngIf="objects.length > 1" class="float-right">
-          <a [routerLink]="[]" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: representations?.length } }}</a>
+          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: representations?.length } }}</button>
         </div>
       </div>
     </ng-container>
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
index fafb5314b3..749915beac 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.spec.ts
@@ -1,15 +1,27 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { Item } from '../../../core/shared/item.model';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
-import { createSuccessfulRemoteDataObject$, createFailedRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
 
+import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { BrowseDefinitionDataServiceStub } from '../../../shared/testing/browse-definition-data-service.stub';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
+
 const itemType = 'Person';
 const metadataFields = ['dc.contributor.author', 'dc.creator'];
 const parentItem: Item = Object.assign(new Item(), {
@@ -20,13 +32,13 @@ const parentItem: Item = Object.assign(new Item(), {
         language: null,
         value: 'Related Author with authority',
         authority: 'virtual::related-author',
-        place: 2
+        place: 2,
       },
       {
         language: null,
         value: 'Author without authority',
-        place: 1
-      }
+        place: 1,
+      },
     ],
     'dc.creator': [
       {
@@ -45,10 +57,10 @@ const parentItem: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'Parent Item'
-      }
-    ]
-  }
+        value: 'Parent Item',
+      },
+    ],
+  },
 });
 const relatedAuthor: Item = Object.assign(new Item(), {
   id: 'related-author',
@@ -56,10 +68,10 @@ const relatedAuthor: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'Related Author'
-      }
-    ]
-  }
+        value: 'Related Author',
+      },
+    ],
+  },
 });
 const relatedCreator: Item = Object.assign(new Item(), {
   id: 'related-creator',
@@ -67,54 +79,47 @@ const relatedCreator: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: null,
-        value: 'Related Creator'
-      }
+        value: 'Related Creator',
+      },
     ],
     'dspace.entity.type': 'Person',
-  }
+  },
 });
-const authorRelation: Relationship = Object.assign(new Relationship(), {
-  leftItem: createSuccessfulRemoteDataObject$(parentItem),
-  rightItem: createSuccessfulRemoteDataObject$(relatedAuthor)
-});
-const creatorRelation: Relationship = Object.assign(new Relationship(), {
-  leftItem: createSuccessfulRemoteDataObject$(parentItem),
-  rightItem: createSuccessfulRemoteDataObject$(relatedCreator),
-});
-const creatorRelationUnauthorized: Relationship = Object.assign(new Relationship(), {
-  leftItem: createSuccessfulRemoteDataObject$(parentItem),
-  rightItem: createFailedRemoteDataObject$('Unauthorized', 401),
-});
-let relationshipService;
 
 describe('MetadataRepresentationListComponent', () => {
   let comp: MetadataRepresentationListComponent;
   let fixture: ComponentFixture<MetadataRepresentationListComponent>;
 
-  relationshipService = {
-    findById: (id: string) => {
-      if (id === 'related-author') {
-        return createSuccessfulRemoteDataObject$(authorRelation);
-      }
-      if (id === 'related-creator') {
-        return createSuccessfulRemoteDataObject$(creatorRelation);
-      }
-      if (id === 'related-creator-unauthorized') {
-        return createSuccessfulRemoteDataObject$(creatorRelationUnauthorized);
-      }
-    },
-  };
+  let relationshipService;
 
   beforeEach(waitForAsync(() => {
+    relationshipService = {
+      resolveMetadataRepresentation: (metadatum: MetadataValue, parent: DSpaceObject, type: string) => {
+        if (metadatum.value === 'Related Author with authority') {
+          return observableOf(Object.assign(new ItemMetadataRepresentation(metadatum), relatedAuthor));
+        }
+        if (metadatum.value === 'Author without authority') {
+          return observableOf(Object.assign(new MetadatumRepresentation(type), metadatum));
+        }
+        if (metadatum.value === 'Related Creator with authority') {
+          return observableOf(Object.assign(new ItemMetadataRepresentation(metadatum), relatedCreator));
+        }
+        if (metadatum.value === 'Related Creator with authority - unauthorized') {
+          return observableOf(Object.assign(new MetadatumRepresentation(type), metadatum));
+        }
+      },
+    };
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [MetadataRepresentationListComponent, VarDirective],
       providers: [
-        { provide: RelationshipDataService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: BrowseDefinitionDataService, useValue: BrowseDefinitionDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MetadataRepresentationListComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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 5d2d0d0208..d5900918a2 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
@@ -1,26 +1,26 @@
-import { Component, Input } from '@angular/core';
-import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
 import {
-  combineLatest as observableCombineLatest,
+  Component,
+  Input,
+} from '@angular/core';
+import {
   Observable,
-  of as observableOf,
-  zip as observableZip
+  zip as observableZip,
 } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseService } from '../../../core/browse/browse.service';
+import { BrowseDefinitionDataService } from '../../../core/browse/browse-definition-data.service';
 import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { MetadataValue } from '../../../core/shared/metadata.models';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { filter, map, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { Item } from '../../../core/shared/item.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
 import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
-import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { getRemoteDataPayload } from '../../../core/shared/operators';
 import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
   selector: 'ds-metadata-representation-list',
-  templateUrl: './metadata-representation-list.component.html'
+  templateUrl: './metadata-representation-list.component.html',
 })
 /**
  * This component is used for displaying metadata
@@ -61,7 +61,10 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
    */
   total: number;
 
-  constructor(public relationshipService: RelationshipDataService) {
+  constructor(
+    public relationshipService: RelationshipDataService,
+    protected browseDefinitionDataService: BrowseDefinitionDataService,
+  ) {
     super();
   }
 
@@ -87,27 +90,19 @@ export class MetadataRepresentationListComponent extends AbstractIncrementalList
         .map((metadatum: any) => Object.assign(new MetadataValue(), metadatum))
         .map((metadatum: MetadataValue) => {
           if (metadatum.isVirtual) {
-            return this.relationshipService.findById(metadatum.virtualValue, true, false, followLink('leftItem'), followLink('rightItem')).pipe(
-              getFirstSucceededRemoteData(),
-              switchMap((relRD: RemoteData<Relationship>) =>
-                observableCombineLatest(relRD.payload.leftItem, relRD.payload.rightItem).pipe(
-                  filter(([leftItem, rightItem]) => leftItem.hasCompleted && rightItem.hasCompleted),
-                  map(([leftItem, rightItem]) => {
-                    if (!leftItem.hasSucceeded || !rightItem.hasSucceeded) {
-                      return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum));
-                    } else if (rightItem.hasSucceeded && leftItem.payload.id === this.parentItem.id) {
-                      return rightItem.payload;
-                    } else if (rightItem.payload.id === this.parentItem.id) {
-                      return leftItem.payload;
-                    }
-                  }),
-                  map((item: Item) => Object.assign(new ItemMetadataRepresentation(metadatum), item))
-                )
-              ));
+            return this.relationshipService.resolveMetadataRepresentation(metadatum, this.parentItem, this.itemType);
           } else {
-            return observableOf(Object.assign(new MetadatumRepresentation(this.itemType), metadatum));
+            // Check for a configured browse link and return a standard metadata representation
+            let searchKeyArray: string[] = [];
+            this.metadataFields.forEach((field: string) => {
+              searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(field));
+            });
+            return this.browseDefinitionDataService.findByFields(this.metadataFields).pipe(
+              getRemoteDataPayload(),
+              map((def) => Object.assign(new MetadatumRepresentation(this.itemType, def), metadatum)),
+            );
           }
-        })
+        }),
     );
   }
 }
diff --git a/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts b/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts
new file mode 100644
index 0000000000..5e875e1398
--- /dev/null
+++ b/src/app/item-page/simple/metadata-representation-list/themed-metadata-representation-list.component.ts
@@ -0,0 +1,39 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Item } from '../../../core/shared/item.model';
+import { ThemedComponent } from '../../../shared/theme-support/themed.component';
+import { MetadataRepresentationListComponent } from './metadata-representation-list.component';
+
+@Component({
+  selector: 'ds-themed-metadata-representation-list',
+  styleUrls: [],
+  templateUrl: '../../../shared/theme-support/themed.component.html',
+})
+export class ThemedMetadataRepresentationListComponent extends ThemedComponent<MetadataRepresentationListComponent> {
+  protected inAndOutputNames: (keyof MetadataRepresentationListComponent & keyof this)[] = ['parentItem', 'itemType', 'metadataFields', 'label', 'incrementBy'];
+
+  @Input() parentItem: Item;
+
+  @Input() itemType: string;
+
+  @Input() metadataFields: string[];
+
+  @Input() label: string;
+
+  @Input() incrementBy: number;
+
+  protected getComponentName(): string {
+    return 'MetadataRepresentationListComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/item-page/simple/metadata-representation-list/metadata-representation-list.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./metadata-representation-list.component`);
+  }
+}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
new file mode 100644
index 0000000000..c68255f2ed
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.html
@@ -0,0 +1,5 @@
+<ng-container *ngIf="(requestMap$ | async)?.size > 0">
+  <ng-container *ngFor="let entry of (requestMap$ | async) | keyvalue ">
+    <ds-request-status-alert-box [status]="entry.key" [data]="entry.value"></ds-request-status-alert-box>
+  </ng-container>
+</ng-container>
diff --git a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.scss b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.scss
similarity index 100%
rename from src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.scss
rename to src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.scss
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts
new file mode 100644
index 0000000000..5a92fe2782
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.spec.ts
@@ -0,0 +1,94 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { NotifyRequestsStatusDataService } from 'src/app/core/data/notify-services-status-data.service';
+
+import { createSuccessfulRemoteDataObject$ } from '../../../../shared/remote-data.utils';
+import { NotifyRequestsStatus } from '../notify-requests-status.model';
+import { RequestStatusEnum } from '../notify-status.enum';
+import { NotifyRequestsStatusComponent } from './notify-requests-status.component';
+
+describe('NotifyRequestsStatusComponent', () => {
+  let component: NotifyRequestsStatusComponent;
+  let fixture: ComponentFixture<NotifyRequestsStatusComponent>;
+  let notifyInfoServiceSpy;
+
+  const mock: NotifyRequestsStatus = Object.assign(new NotifyRequestsStatus(), {
+    notifyStatus: [],
+    itemuuid: 'testUuid',
+  });
+
+  beforeEach(() => {
+    notifyInfoServiceSpy = {
+      getNotifyRequestsStatus:() => createSuccessfulRemoteDataObject$(mock),
+    };
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [NotifyRequestsStatusComponent],
+      providers: [
+        { provide: NotifyRequestsStatusDataService, useValue: notifyInfoServiceSpy },
+      ],
+    });
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotifyRequestsStatusComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should fetch data from the service on initialization', fakeAsync(() => {
+    const mockData: NotifyRequestsStatus = Object.assign(new NotifyRequestsStatus(), {
+      notifyStatus: [],
+      itemuuid: 'testUuid',
+    });
+    component.itemUuid = mockData.itemuuid;
+    spyOn(notifyInfoServiceSpy, 'getNotifyRequestsStatus').and.callThrough();
+    component.ngOnInit();
+    fixture.detectChanges();
+    tick();
+
+    expect(notifyInfoServiceSpy.getNotifyRequestsStatus).toHaveBeenCalledWith('testUuid');
+    component.requestMap$.subscribe((map) => {
+      expect(map.size).toBe(0);
+    });
+  }));
+
+  it('should group data by status', () => {
+    const mockData: NotifyRequestsStatus = Object.assign(new NotifyRequestsStatus(), {
+      notifyStatus: [
+        {
+          serviceName: 'test1',
+          serviceUrl: 'test',
+          status: RequestStatusEnum.ACCEPTED,
+        },
+        {
+          serviceName: 'test2',
+          serviceUrl: 'test',
+          status: RequestStatusEnum.REJECTED,
+        },
+        {
+          serviceName: 'test3',
+          serviceUrl: 'test',
+          status: RequestStatusEnum.ACCEPTED,
+        },
+      ],
+      itemUuid: 'testUuid',
+    });
+    spyOn(notifyInfoServiceSpy, 'getNotifyRequestsStatus').and.returnValue(createSuccessfulRemoteDataObject$(mockData));
+    fixture.detectChanges();
+    (component as any).groupDataByStatus(mockData);
+    component.requestMap$.subscribe((map) => {
+      expect(map.size).toBe(2);
+      expect(map.get(RequestStatusEnum.ACCEPTED)?.length).toBe(2);
+      expect(map.get(RequestStatusEnum.REJECTED)?.length).toBe(1);
+    });
+  });
+});
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
new file mode 100644
index 0000000000..5df5b3b950
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status-component/notify-requests-status.component.ts
@@ -0,0 +1,84 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  filter,
+  map,
+  Observable,
+} from 'rxjs';
+
+import { NotifyRequestsStatusDataService } from '../../../../core/data/notify-services-status-data.service';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
+import { hasValue } from '../../../../shared/empty.util';
+import {
+  NotifyRequestsStatus,
+  NotifyStatuses,
+} from '../notify-requests-status.model';
+import { RequestStatusEnum } from '../notify-status.enum';
+
+@Component({
+  selector: 'ds-notify-requests-status',
+  templateUrl: './notify-requests-status.component.html',
+  styleUrls: ['./notify-requests-status.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+
+/**
+ * Component to show an alert box for each update in th Notify feature (e.g. COAR updates)
+ */
+
+export class NotifyRequestsStatusComponent implements OnInit {
+  /**
+   * The UUID of the item.
+   */
+  @Input() itemUuid: string;
+
+  /**
+   * Observable representing the request map.
+   * The map contains request status enums as keys and arrays of notify statuses as values.
+   */
+  requestMap$: Observable<Map<RequestStatusEnum, NotifyStatuses[]>>;
+
+  constructor(private notifyInfoService: NotifyRequestsStatusDataService) { }
+
+  ngOnInit(): void {
+    this.requestMap$ = this.notifyInfoService
+      .getNotifyRequestsStatus(this.itemUuid)
+      .pipe(
+        getFirstCompletedRemoteData(),
+        filter((data) => hasValue(data)),
+        getRemoteDataPayload(),
+        filter((data: NotifyRequestsStatus) => hasValue(data)),
+        map((data: NotifyRequestsStatus) => {
+          return this.groupDataByStatus(data);
+        }),
+      );
+  }
+
+  /**
+   * Groups the notify requests status data by status.
+   * @param notifyRequestsStatus The notify requests status data.
+   */
+  private groupDataByStatus(notifyRequestsStatus: NotifyRequestsStatus) {
+    const statusMap: Map<RequestStatusEnum, NotifyStatuses[]> = new Map();
+    notifyRequestsStatus.notifyStatus?.forEach(
+      (notifyStatus: NotifyStatuses) => {
+        const status = notifyStatus.status;
+
+        if (!statusMap.has(status)) {
+          statusMap.set(status, []);
+        }
+
+        statusMap.get(status)?.push(notifyStatus);
+      },
+    );
+
+    return statusMap;
+  }
+}
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts
new file mode 100644
index 0000000000..4685d609a5
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.model.ts
@@ -0,0 +1,77 @@
+// eslint-disable-next-line max-classes-per-file
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { NOTIFYREQUEST } from './notify-requests-status.resource-type';
+import { RequestStatusEnum } from './notify-status.enum';
+
+/**
+ * Represents the status of notify requests for an item.
+ */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class NotifyRequestsStatus implements CacheableObject {
+  static type = NOTIFYREQUEST;
+
+  /**
+   * The object type.
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The notify statuses.
+   */
+  @autoserialize
+    notifyStatus: NotifyStatuses[];
+
+  /**
+   * The UUID of the item.
+   */
+  @autoserialize
+    itemuuid: string;
+
+  /**
+   * The links associated with the notify requests status.
+   */
+  @deserialize
+    _links: {
+    self: HALLink;
+    [k: string]: HALLink | HALLink[];
+  };
+}
+
+/**
+ * Represents the status of a notification request.
+ */
+export class NotifyStatuses {
+  /**
+   * The name of the service.
+   */
+  serviceName: string;
+
+  /**
+   * The URL of the service.
+   */
+  serviceUrl: string;
+
+  /**
+   * The status of the notification request.
+   */
+  status: RequestStatusEnum;
+  /**
+   * Type of request.
+   */
+  offerType: string;
+}
+
+
diff --git a/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts b/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts
new file mode 100644
index 0000000000..a450b0462b
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-requests-status.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../core/shared/resource-type';
+
+/**
+ * The resource type for the root endpoint
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const NOTIFYREQUEST = new ResourceType('notifyrequests');
diff --git a/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts b/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts
new file mode 100644
index 0000000000..e44c614130
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/notify-status.enum.ts
@@ -0,0 +1,5 @@
+export enum RequestStatusEnum {
+  ACCEPTED = 'ACCEPTED',
+  REJECTED = 'REJECTED',
+  REQUESTED = 'REQUESTED',
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
new file mode 100644
index 0000000000..95c01e2501
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.html
@@ -0,0 +1,33 @@
+<ng-container *ngIf="data?.length > 0 && displayOptions">
+  <div
+    [ngClass]="{'align-items-center': data.length === 1}"
+    class="alert d-flex flex-row sections-gap {{
+      displayOptions.alertType
+    }}"
+  >
+    <img
+      class="source-logo"
+      src="assets/images/qa-coar-notify-logo.png"
+      alt="notify logo"
+    />
+    <ds-truncatable [id]="status">
+      <ds-truncatable-part [id]="status" [minLines]="1">
+        <div class="w-100 d-flex flex-column">
+          <ng-container *ngFor="let request of data">
+            <div
+              [innerHTML]="
+                displayOptions.text
+                 | translate
+                    : {
+                        serviceName: request.serviceName,
+                        serviceUrl: request.serviceUrl,
+                        offerType: request.offerType
+                      }
+              "
+            ></div>
+          </ng-container>
+        </div>
+      </ds-truncatable-part>
+    </ds-truncatable>
+  </div>
+</ng-container>
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.scss b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.scss
new file mode 100644
index 0000000000..f852bb8454
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.scss
@@ -0,0 +1,7 @@
+.source-logo {
+  max-height: var(--ds-header-logo-height);
+}
+
+.sections-gap {
+  gap: 1rem;
+}
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts
new file mode 100644
index 0000000000..d3ed0f59be
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.spec.ts
@@ -0,0 +1,58 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { RequestStatusEnum } from '../notify-status.enum';
+import { RequestStatusAlertBoxComponent } from './request-status-alert-box.component';
+
+describe('RequestStatusAlertBoxComponent', () => {
+  let component: RequestStatusAlertBoxComponent;
+  let componentAsAny: any;
+  let fixture: ComponentFixture<RequestStatusAlertBoxComponent>;
+
+  const mockData = [
+    {
+      serviceName: 'test',
+      serviceUrl: 'test',
+      status: RequestStatusEnum.ACCEPTED,
+      offerType: 'test',
+    },
+    {
+      serviceName: 'test1',
+      serviceUrl: 'test',
+      status: RequestStatusEnum.REJECTED,
+      offerType: 'test',
+    },
+  ];
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [RequestStatusAlertBoxComponent],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(RequestStatusAlertBoxComponent);
+    component = fixture.componentInstance;
+    component.data = mockData;
+    component.displayOptions = {
+      alertType: 'alert-danger',
+      text: 'request-status-alert-box.rejected',
+    };
+    componentAsAny = component;
+    fixture.detectChanges();
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display the alert box when data is available', fakeAsync(() => {
+    const alertBoxElement = fixture.nativeElement.querySelector('.alert');
+    expect(alertBoxElement).toBeTruthy();
+  }));
+});
diff --git a/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
new file mode 100644
index 0000000000..2a2dd03a86
--- /dev/null
+++ b/src/app/item-page/simple/notify-requests-status/request-status-alert-box/request-status-alert-box.component.ts
@@ -0,0 +1,83 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  type OnInit,
+} from '@angular/core';
+
+import { NotifyStatuses } from '../notify-requests-status.model';
+import { RequestStatusEnum } from '../notify-status.enum';
+
+@Component({
+  selector: 'ds-request-status-alert-box',
+  templateUrl: './request-status-alert-box.component.html',
+  styleUrls: ['./request-status-alert-box.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+/**
+ * Represents a component that displays the status of a request.
+ */
+export class RequestStatusAlertBoxComponent implements OnInit {
+  /**
+   * The status of the request.
+   */
+  @Input() status: RequestStatusEnum;
+
+  /**
+   * The input data for the request status alert box component.
+   * @type {NotifyStatuses[]}
+   */
+  @Input() data: NotifyStatuses[] = [];
+
+  /**
+   * The display options for the request status alert box.
+   */
+  displayOptions: NotifyRequestDisplayOptions;
+
+  ngOnInit(): void {
+    this.prepareDataToDisplay();
+  }
+
+  /**
+   * Prepares the data to be displayed based on the current status.
+   */
+  private prepareDataToDisplay() {
+    switch (this.status) {
+      case RequestStatusEnum.ACCEPTED:
+        this.displayOptions = {
+          alertType: 'alert-info',
+          text: 'request-status-alert-box.accepted',
+        };
+        break;
+
+      case RequestStatusEnum.REJECTED:
+        this.displayOptions = {
+          alertType: 'alert-danger',
+          text: 'request-status-alert-box.rejected',
+        };
+        break;
+
+      case RequestStatusEnum.REQUESTED:
+        this.displayOptions = {
+          alertType: 'alert-warning',
+          text: 'request-status-alert-box.requested',
+        };
+        break;
+    }
+  }
+}
+
+/**
+ * Represents the display options for a notification request.
+ */
+export interface NotifyRequestDisplayOptions {
+  /**
+   * The type of alert to display.
+   * Possible values are 'alert-danger', 'alert-warning', or 'alert-info'.
+   */
+  alertType: 'alert-danger' | 'alert-warning' | 'alert-info';
+  /**
+   * The text to display in the notification.
+   */
+  text: string;
+}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
new file mode 100644
index 0000000000..77370f462d
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -0,0 +1,22 @@
+<ng-container *ngIf="(sources$ | async) as sources">
+  <ng-container *ngFor="let source of sources">
+    <div class="alert alert-info d-flex flex-row" *ngIf="source.totalEvents > 0">
+      <div class="source-logo-container">
+        <img class="source-logo"
+             src="assets/images/qa-{{(source.id | dsSplit: ':')[0]}}-logo.png"
+             alt="{{source.id}} logo"
+             onerror="this.src='assets/images/dspace-logo.svg'">
+      </div>
+      <div class="w-100 d-flex justify-content-between">
+        <div class="pl-4 align-self-center">
+          {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
+        </div>
+        <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
+                [queryParams]="{ forward: true }"
+                class="btn btn-primary align-self-center">
+                {{'item.qa-event-notification-info.check.button' | translate}}
+        </button>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss
new file mode 100644
index 0000000000..2a62342b7c
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.scss
@@ -0,0 +1,13 @@
+.source-logo {
+  max-height: var(--ds-header-logo-height);
+}
+
+.source-logo-container {
+  width: var(--ds-qa-logo-width);
+  display: flex;
+  justify-content: center;
+}
+
+.sections-gap {
+  gap: 1rem;
+}
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts
new file mode 100644
index 0000000000..05ad804207
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.spec.ts
@@ -0,0 +1,77 @@
+import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import { SplitPipe } from 'src/app/shared/utils/split.pipe';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RequestService } from '../../../core/data/request.service';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { HALEndpointServiceStub } from '../../../shared/testing/hal-endpoint-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { QaEventNotificationComponent } from './qa-event-notification.component';
+
+describe('QaEventNotificationComponent', () => {
+  let component: QaEventNotificationComponent;
+  let fixture: ComponentFixture<QaEventNotificationComponent>;
+  let qualityAssuranceSourceDataServiceStub: any;
+
+  const obj = Object.assign(new QualityAssuranceSourceObject(), {
+    id: 'sourceName:target',
+    source: 'sourceName',
+    target: 'target',
+    totalEvents: 1,
+  });
+
+  const objPL = createSuccessfulRemoteDataObject$(createPaginatedList([obj]));
+  const item = Object.assign({ uuid: '1234' });
+  beforeEach(async () => {
+
+    qualityAssuranceSourceDataServiceStub = {
+      getSourcesByTarget: () => objPL,
+    };
+    await TestBed.configureTestingModule({
+      imports: [CommonModule, TranslateModule.forRoot()],
+      declarations: [QaEventNotificationComponent, SplitPipe],
+      providers: [
+        { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub },
+        { provide: RequestService, useValue: {} },
+        { provide: NotificationsService, useValue: {} },
+        { provide: HALEndpointService, useValue: new HALEndpointServiceStub('test') },
+        ObjectCacheService,
+        RemoteDataBuildService,
+        provideMockStore({}),
+      ],
+    })
+      .compileComponents();
+    fixture = TestBed.createComponent(QaEventNotificationComponent);
+    component = fixture.componentInstance;
+    component.item = item;
+    component.sources$ = of([obj]);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should display sources if present', () => {
+    const alertElements = fixture.debugElement.queryAll(By.css('.alert'));
+    expect(alertElements.length).toBe(1);
+  });
+
+  it('should return the quality assurance route when getQualityAssuranceRoute is called', () => {
+    const route = component.getQualityAssuranceRoute();
+    expect(route).toBe('/notifications/quality-assurance');
+  });
+});
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
new file mode 100644
index 0000000000..06f81d232e
--- /dev/null
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.ts
@@ -0,0 +1,86 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
+
+import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+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 { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-qa-event-notification',
+  templateUrl: './qa-event-notification.component.html',
+  styleUrls: ['./qa-event-notification.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  providers: [QualityAssuranceSourceDataService],
+})
+/**
+ * Component for displaying quality assurance event notifications for an item.
+ */
+export class QaEventNotificationComponent implements OnChanges {
+  /**
+   * The item to display quality assurance event notifications for.
+   */
+  @Input() item: Item;
+
+  /**
+   * An observable that emits an array of QualityAssuranceSourceObject.
+   */
+  sources$: Observable<QualityAssuranceSourceObject[]>;
+
+  constructor(
+    private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService,
+  ) {}
+
+  /**
+    * Detect changes to the item input and update the sources$ observable.
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (changes.item && changes.item.currentValue.uuid !== changes.item.previousValue?.uuid) {
+      this.sources$ = this.getQualityAssuranceSources$();
+    }
+  }
+  /**
+   * Returns an Observable of QualityAssuranceSourceObject[] for the current item.
+   * @returns An Observable of QualityAssuranceSourceObject[] for the current item.
+   * Note: sourceId is composed as: id: "sourceName:<target>"
+   */
+  getQualityAssuranceSources$(): Observable<QualityAssuranceSourceObject[]> {
+    const findListTopicOptions: FindListOptions = {
+      searchParams: [new RequestParam('target', this.item.uuid)],
+    };
+    return this.qualityAssuranceSourceDataService.getSourcesByTarget(findListTopicOptions, false)
+      .pipe(
+        getFirstCompletedRemoteData(),
+        map((data: RemoteData<PaginatedList<QualityAssuranceSourceObject>>) => {
+          if (data.hasSucceeded) {
+            return data.payload.page;
+          }
+          return [];
+        }),
+        catchError(() => []),
+      );
+  }
+
+  /**
+   * Returns the quality assurance route.
+   * @returns The quality assurance route.
+   */
+  getQualityAssuranceRoute(): string {
+    return getNotificatioQualityAssuranceRoute();
+  }
+}
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/related-entities-search/related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
index a9fd11b9ee..5e8c33ccee 100644
--- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
+++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.spec.ts
@@ -1,17 +1,22 @@
-import { RelatedEntitiesSearchComponent } from './related-entities-search.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { FormsModule } from '@angular/forms';
+
 import { Item } from '../../../../core/shared/item.model';
+import { RelatedEntitiesSearchComponent } from './related-entities-search.component';
 
 describe('RelatedEntitiesSearchComponent', () => {
   let comp: RelatedEntitiesSearchComponent;
   let fixture: ComponentFixture<RelatedEntitiesSearchComponent>;
 
   const mockItem = Object.assign(new Item(), {
-    id: 'id1'
+    id: 'id1',
   });
   const mockRelationType = 'publicationsOfAuthor';
   const mockConfiguration = 'publication';
@@ -21,7 +26,7 @@ describe('RelatedEntitiesSearchComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
       declarations: [RelatedEntitiesSearchComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
index a3f76c12d7..dd831190d4 100644
--- a/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/related-entities-search/related-entities-search.component.ts
@@ -1,11 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { Item } from '../../../../core/shared/item.model';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { getFilterByRelation } from '../../../../shared/utils/relation-query.utils';
 
 @Component({
   selector: 'ds-related-entities-search',
-  templateUrl: './related-entities-search.component.html'
+  templateUrl: './related-entities-search.component.html',
 })
 /**
  * A component to show related items as search results.
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..1b6cc273df 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,6 +1,6 @@
 <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">
+    <li *ngFor="let relationType of relationTypes" [ngbNavItem]="relationType.filter" rel="presentation">
       <a ngbNavLink>{{'item.page.relationships.' + relationType.label | translate}}</a>
       <ng-template ngbNavContent>
         <div class="mt-4">
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
index f7b9fb68e8..cb9e78999b 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
@@ -1,28 +1,36 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Item } from '../../../../core/shared/item.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TabbedRelatedEntitiesSearchComponent } from './tabbed-related-entities-search.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from '../../../../shared/mocks/router.mock';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { VarDirective } from '../../../../shared/utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
+import { Item } from '../../../../core/shared/item.model';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { TabbedRelatedEntitiesSearchComponent } from './tabbed-related-entities-search.component';
+
 describe('TabbedRelatedEntitiesSearchComponent', () => {
   let comp: TabbedRelatedEntitiesSearchComponent;
   let fixture: ComponentFixture<TabbedRelatedEntitiesSearchComponent>;
 
   const mockItem = Object.assign(new Item(), {
-    id: 'id1'
+    id: 'id1',
   });
   const mockRelationType = 'publications';
   const relationTypes = [
     {
       label: mockRelationType,
-      filter: mockRelationType
-    }
+      filter: mockRelationType,
+    },
   ];
 
   const router = new RouterMock();
@@ -35,12 +43,12 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
         {
           provide: ActivatedRoute,
           useValue: {
-            queryParams: observableOf({ tab: mockRelationType })
+            queryParams: observableOf({ tab: mockRelationType }),
           },
         },
-        { provide: Router, useValue: router }
+        { provide: Router, useValue: router },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -61,7 +69,7 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
   describe('onTabChange', () => {
     const event = {
       currentId: mockRelationType,
-      nextId: 'nextTab'
+      nextId: 'nextTab',
     };
 
     beforeEach(() => {
@@ -72,9 +80,9 @@ describe('TabbedRelatedEntitiesSearchComponent', () => {
       expect(router.navigate).toHaveBeenCalledWith([], {
         relativeTo: (comp as any).route,
         queryParams: {
-          tab: event.nextId
+          tab: event.nextId,
         },
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     });
   });
diff --git a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
index 116c8c2d79..14db03ec0a 100644
--- a/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
+++ b/src/app/item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
@@ -1,12 +1,20 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
+import { Item } from '../../../../core/shared/item.model';
+
 @Component({
   selector: 'ds-tabbed-related-entities-search',
-  templateUrl: './tabbed-related-entities-search.component.html'
+  templateUrl: './tabbed-related-entities-search.component.html',
 })
 /**
  * A component to show related items as search results, split into tabs by relationship-type
@@ -55,7 +63,7 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit {
    */
   ngOnInit(): void {
     this.activeTab$ = this.route.queryParams.pipe(
-      map((params) => params.tab)
+      map((params) => params.tab),
     );
   }
 
@@ -67,9 +75,9 @@ export class TabbedRelatedEntitiesSearchComponent implements OnInit {
     this.router.navigate([], {
       relativeTo: this.route,
       queryParams: {
-        tab: event.nextId
+        tab: event.nextId,
       },
-      queryParamsHandling: 'merge'
+      queryParamsHandling: 'merge',
     });
   }
 
diff --git a/src/app/item-page/simple/related-items/related-items-component.ts b/src/app/item-page/simple/related-items/related-items-component.ts
index 2746670abe..73bda5f6cd 100644
--- a/src/app/item-page/simple/related-items/related-items-component.ts
+++ b/src/app/item-page/simple/related-items/related-items-component.ts
@@ -1,20 +1,30 @@
-import { Component, ElementRef, Inject, Input, PLATFORM_ID } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
-import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
-import { setPlaceHolderAttributes } from '../../../shared/utils/object-list-utils';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  ElementRef,
+  Inject,
+  Input,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Item } from '../../../core/shared/item.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { setPlaceHolderAttributes } from '../../../shared/utils/object-list-utils';
+import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
   selector: 'ds-related-items',
   styleUrls: ['./related-items.component.scss'],
-  templateUrl: './related-items.component.html'
+  templateUrl: './related-items.component.html',
 })
 /**
  * This component is used for displaying relations between items
@@ -65,8 +75,8 @@ export class RelatedItemsComponent extends AbstractIncrementalListComponent<Obse
   constructor(public relationshipService: RelationshipDataService,
               protected elementRef: ElementRef,
               @Inject(APP_CONFIG) protected appConfig: AppConfig,
-              @Inject(PLATFORM_ID) private platformId: Object
-              ) {
+              @Inject(PLATFORM_ID) private platformId: any,
+  ) {
     super();
     this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
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 0d1e14941d..bee1f345fd 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">
-          <a [routerLink]="[]" (click)="increase()">{{'item.page.related-items.view-more' |
-            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</a>
+          <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>
         </div>
         <div *ngIf="objects.length > 1" class="float-right" id="view-less">
-          <a [routerLink]="[]" (click)="decrease()">{{'item.page.related-items.view-less' |
-            translate:{ amount: itemsRD?.payload?.page?.length } }}</a>
+          <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: itemsRD?.payload?.page?.length } }}</button>
         </div>
       </div>
     </ng-container>
diff --git a/src/app/item-page/simple/related-items/related-items.component.spec.ts b/src/app/item-page/simple/related-items/related-items.component.spec.ts
index 4307c1aaa2..7c3781366e 100644
--- a/src/app/item-page/simple/related-items/related-items.component.spec.ts
+++ b/src/app/item-page/simple/related-items/related-items.component.spec.ts
@@ -1,31 +1,39 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RelatedItemsComponent } from './related-items-component';
-import { Item } from '../../../core/shared/item.model';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { RelationshipDataService } from '../../../core/data/relationship-data.service';
 import { TranslateModule } from '@ngx-translate/core';
-import { VarDirective } from '../../../shared/utils/var.directive';
 import { of as observableOf } from 'rxjs';
-import { createPaginatedList } from '../../../shared/testing/utils.test';
+
 import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { RelationshipDataService } from '../../../core/data/relationship-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { createRelationshipsObservable } from '../item-types/shared/item.component.spec';
+import { RelatedItemsComponent } from './related-items-component';
 
 const parentItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 const mockItem1: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 const mockItem2: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   metadata: [],
-  relationships: createRelationshipsObservable()
+  relationships: createRelationshipsObservable(),
 });
 const mockItems = [mockItem1, mockItem2];
 const relationType = 'isItemOfItem';
@@ -33,14 +41,14 @@ let relationshipService: RelationshipDataService;
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('RelatedItemsComponent', () => {
@@ -51,7 +59,7 @@ describe('RelatedItemsComponent', () => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
         getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(mockItems)),
-      }
+      },
     );
 
     TestBed.configureTestingModule({
@@ -59,11 +67,11 @@ describe('RelatedItemsComponent', () => {
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
         { provide: RelationshipDataService, useValue: relationshipService },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(RelatedItemsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -97,7 +105,7 @@ describe('RelatedItemsComponent', () => {
       expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
         elementsPerPage: comp.incrementBy,
         currentPage: 2,
-        fetchThumbnail: true
+        fetchThumbnail: true,
       }));
     });
 
@@ -124,19 +132,19 @@ describe('RelatedItemsComponent', () => {
     relationshipService = jasmine.createSpyObj('relationshipService',
       {
         getRelatedItemsByLabel: createSuccessfulRemoteDataObject$(createPaginatedList(mockItems)),
-      }
+      },
     );
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [RelatedItemsComponent, VarDirective],
       providers: [
-        {provide: RelationshipDataService, useValue: relationshipService},
-        {provide: APP_CONFIG, useValue: enviromentNoThumbs}
+        { provide: RelationshipDataService, useValue: relationshipService },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(RelatedItemsComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -151,7 +159,7 @@ describe('RelatedItemsComponent', () => {
     expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, {
       elementsPerPage: comp.incrementBy,
       currentPage: 2,
-      fetchThumbnail: false
+      fetchThumbnail: false,
     }));
   });
 });
diff --git a/src/app/item-page/simple/themed-item-page.component.ts b/src/app/item-page/simple/themed-item-page.component.ts
index 5bb26fafc9..c51f7a1656 100644
--- a/src/app/item-page/simple/themed-item-page.component.ts
+++ b/src/app/item-page/simple/themed-item-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ItemPageComponent } from './item-page.component';
 
diff --git a/src/app/item-page/version-page/version-page/version-page.component.spec.ts b/src/app/item-page/version-page/version-page/version-page.component.spec.ts
index b1dd8bc161..b472187385 100644
--- a/src/app/item-page/version-page/version-page/version-page.component.spec.ts
+++ b/src/app/item-page/version-page/version-page/version-page.component.spec.ts
@@ -1,17 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VersionPageComponent } from './version-page.component';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { RouterTestingModule } from '@angular/router/testing';
 import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { VersionDataService } from '../../../core/data/version-data.service';
 import { Item } from '../../../core/shared/item.model';
+import { Version } from '../../../core/shared/version.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
 import { createRelationshipsObservable } from '../../simple/item-types/shared/item.component.spec';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { Version } from '../../../core/shared/version.model';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Component } from '@angular/core';
+import { VersionPageComponent } from './version-page.component';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
@@ -35,13 +43,13 @@ describe('VersionPageComponent', () => {
   let authService: AuthService;
 
   const mockRoute = Object.assign(new ActivatedRouteStub(), {
-    data: observableOf({dso: createSuccessfulRemoteDataObject(mockVersion)})
+    data: observableOf({ dso: createSuccessfulRemoteDataObject(mockVersion) }),
   });
 
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
     TestBed.configureTestingModule({
       declarations: [VersionPageComponent, DummyComponent],
diff --git a/src/app/item-page/version-page/version-page/version-page.component.ts b/src/app/item-page/version-page/version-page/version-page.component.ts
index 7f25034351..85156e1b55 100644
--- a/src/app/item-page/version-page/version-page/version-page.component.ts
+++ b/src/app/item-page/version-page/version-page/version-page.component.ts
@@ -1,21 +1,34 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../../core/auth/auth.service';
-import { map, switchMap } from 'rxjs/operators';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { Version } from '../../../core/shared/version.model';
-import { Item } from '../../../core/shared/item.model';
-import { getItemPageRoute } from '../../item-page-routing-paths';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { getPageNotFoundRoute } from '../../../app-routing-paths';
+import { AuthService } from '../../../core/auth/auth.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { VersionDataService } from '../../../core/data/version-data.service';
 import { redirectOn4xx } from '../../../core/shared/authorized.operators';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { Version } from '../../../core/shared/version.model';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-version-page',
   templateUrl: './version-page.component.html',
-  styleUrls: ['./version-page.component.scss']
+  styleUrls: ['./version-page.component.scss'],
 })
 export class VersionPageComponent implements OnInit {
 
diff --git a/src/app/item-page/version-page/version.resolver.ts b/src/app/item-page/version-page/version.resolver.ts
index 8341052468..6ab5bb12ba 100644
--- a/src/app/item-page/version-page/version.resolver.ts
+++ b/src/app/item-page/version-page/version.resolver.ts
@@ -1,13 +1,22 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { followLink, FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { ResolvedAction } from '../../core/resolving/resolver.actions';
-import { Version } from '../../core/shared/version.model';
+import { Observable } from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
 import { VersionDataService } from '../../core/data/version-data.service';
+import { ResolvedAction } from '../../core/resolving/resolver.actions';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { Version } from '../../core/shared/version.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from '../../shared/utils/follow-link-config.model';
 
 /**
  * The self links defined in this list are expected to be requested somewhere in the near future
@@ -25,7 +34,7 @@ export class VersionResolver implements Resolve<RemoteData<Version>> {
   constructor(
     protected versionService: VersionDataService,
     protected store: Store<any>,
-    protected router: Router
+    protected router: Router,
   ) {
   }
 
@@ -40,7 +49,7 @@ export class VersionResolver implements Resolve<RemoteData<Version>> {
     const versionRD$ = this.versionService.findById(route.params.id,
       true,
       false,
-      ...VERSION_PAGE_LINKS_TO_FOLLOW
+      ...VERSION_PAGE_LINKS_TO_FOLLOW,
     ).pipe(
       getFirstCompletedRemoteData(),
     );
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.html
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.html
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.scss
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
similarity index 92%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
index 8a0d4a58d9..2ec454ed35 100644
--- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
+++ b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.spec.ts
@@ -1,9 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal.component';
 
 describe('ItemVersionsDeleteModalComponent', () => {
   let component: ItemVersionsDeleteModalComponent;
@@ -15,7 +18,7 @@ describe('ItemVersionsDeleteModalComponent', () => {
       imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ],
       providers: [
         { provide: NgbActiveModal },
-      ]
+      ],
     }).compileComponents();
   });
 
diff --git a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
similarity index 72%
rename from src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
rename to src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
index 3aa1bbd49f..159011c173 100644
--- a/src/app/shared/item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.ts
@@ -1,22 +1,26 @@
-import { Component, EventEmitter, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 @Component({
   selector: 'ds-item-versions-delete-modal',
   templateUrl: './item-versions-delete-modal.component.html',
-  styleUrls: ['./item-versions-delete-modal.component.scss']
+  styleUrls: ['./item-versions-delete-modal.component.scss'],
 })
 export class ItemVersionsDeleteModalComponent {
   /**
    * An event fired when the cancel or confirm button is clicked, with respectively false or true
    */
   @Output()
-  response = new EventEmitter<boolean>();
+    response = new EventEmitter<boolean>();
 
   versionNumber: number;
 
   constructor(
-    protected activeModal: NgbActiveModal,) {
+    protected activeModal: NgbActiveModal) {
   }
 
   onModalClose() {
diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts b/src/app/item-page/versions/item-versions-shared.service.spec.ts
similarity index 72%
rename from src/app/shared/item/item-versions/item-versions-shared.service.spec.ts
rename to src/app/item-page/versions/item-versions-shared.service.spec.ts
index a9f9596548..15ead8f6b5 100644
--- a/src/app/shared/item/item-versions/item-versions-shared.service.spec.ts
+++ b/src/app/item-page/versions/item-versions-shared.service.spec.ts
@@ -1,16 +1,19 @@
 import { TestBed } from '@angular/core/testing';
-
-import { ItemVersionsSharedService } from './item-versions-shared.service';
 import { ActivatedRoute } from '@angular/router';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { AuthService } from '../../../core/auth/auth.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { Version } from '../../../core/shared/version.model';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { Version } from '../../core/shared/version.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
+import { ItemVersionsSharedService } from './item-versions-shared.service';
 
 describe('ItemVersionsSharedService', () => {
   let service: ItemVersionsSharedService;
@@ -29,7 +32,7 @@ describe('ItemVersionsSharedService', () => {
         { provide: VersionHistoryDataService, useValue: {} },
         { provide: AuthService, useValue: {} },
         { provide: NotificationsService, useValue: notificationsServiceSpy },
-        { provide: TranslateService, useValue: { get: () => undefined, } },
+        { provide: TranslateService, useValue: { get: () => undefined } },
         { provide: WorkspaceitemDataService, useValue: {} },
         { provide: WorkflowItemDataService, useValue: {} },
       ],
diff --git a/src/app/shared/item/item-versions/item-versions-shared.service.ts b/src/app/item-page/versions/item-versions-shared.service.ts
similarity index 75%
rename from src/app/shared/item/item-versions/item-versions-shared.service.ts
rename to src/app/item-page/versions/item-versions-shared.service.ts
index 996623509c..dd35434d62 100644
--- a/src/app/shared/item/item-versions/item-versions-shared.service.ts
+++ b/src/app/item-page/versions/item-versions-shared.service.ts
@@ -1,11 +1,12 @@
 import { Injectable } from '@angular/core';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Version } from '../../../core/shared/version.model';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { Version } from '../../core/shared/version.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ItemVersionsSharedService {
 
@@ -28,7 +29,7 @@ export class ItemVersionsSharedService {
   public notifyCreateNewVersion(newVersionRD: RemoteData<Version>): void {
     const newVersionNumber = newVersionRD?.payload?.version;
     newVersionRD.hasSucceeded ?
-      this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), {version: newVersionNumber})) :
+      this.notificationsService.success(null, this.translateService.get(ItemVersionsSharedService.msg('success'), { version: newVersionNumber })) :
       this.notificationsService.error(null, this.translateService.get(ItemVersionsSharedService.msg(newVersionRD?.statusCode === 422 ? 'inProgress' : 'failure')));
   }
 
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
similarity index 96%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
index 0aa22f80cf..c0e5e83b33 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.html
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="!(this.submitted$ | async); else waiting">
+<div *ngIf="(this.submitted$ | async) !== true; else waiting">
   <div class="modal-header">{{'item.version.create.modal.header' | translate}}
     <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
       <span aria-hidden="true">×</span>
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.scss
similarity index 100%
rename from src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.html
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.scss
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
similarity index 92%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
index 657e8c0e75..c74b8337a2 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.spec.ts
@@ -1,9 +1,12 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
+
+import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal.component';
 
 describe('ItemVersionsSummaryModalComponent', () => {
   let component: ItemVersionsSummaryModalComponent;
@@ -15,7 +18,7 @@ describe('ItemVersionsSummaryModalComponent', () => {
       imports: [ TranslateModule.forRoot(), RouterTestingModule.withRoutes([]) ],
       providers: [
         { provide: NgbActiveModal },
-      ]
+      ],
     }).compileComponents();
   });
 
diff --git a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
similarity index 82%
rename from src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
rename to src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
index 23ee62e628..341d94cbfc 100644
--- a/src/app/shared/item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
+++ b/src/app/item-page/versions/item-versions-summary-modal/item-versions-summary-modal.component.ts
@@ -1,12 +1,18 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BehaviorSubject } from 'rxjs';
-import { ModalBeforeDismiss } from '../../../interfaces/modal-before-dismiss.interface';
+
+import { ModalBeforeDismiss } from '../../../shared/interfaces/modal-before-dismiss.interface';
 
 @Component({
   selector: 'ds-item-versions-summary-modal',
   templateUrl: './item-versions-summary-modal.component.html',
-  styleUrls: ['./item-versions-summary-modal.component.scss']
+  styleUrls: ['./item-versions-summary-modal.component.scss'],
 })
 export class ItemVersionsSummaryModalComponent implements OnInit, ModalBeforeDismiss {
 
diff --git a/src/app/shared/item/item-versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
similarity index 95%
rename from src/app/shared/item/item-versions/item-versions.component.html
rename to src/app/item-page/versions/item-versions.component.html
index 176c1f0cde..b3c34aaf70 100644
--- a/src/app/shared/item/item-versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -1,7 +1,7 @@
 <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>
+      <h2 *ngIf="displayTitle" class="h4">{{"item.version.history.head" | translate}}</h2>
       <ds-alert [type]="AlertTypeEnum.Info" *ngIf="itemVersion">
         {{ "item.version.history.selected.alert" | translate : {version: itemVersion.version} }}
       </ds-alert>
@@ -75,7 +75,7 @@
                         <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)"
+                                (click)="deleteVersion(version, version.id===itemVersion.id)"
                                 title="{{'item.version.history.table.action.deleteVersion' | translate}}">
                           <i class="fas fa-trash fa-fw"></i>
                         </button>
@@ -98,8 +98,9 @@
                 <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()"/>
+                  <input [attr.aria-label]="'item.version.history.table.action.editSummary' | translate"
+                         [(ngModel)]="versionBeingEditedSummary" (keyup.enter)="onSummarySubmit()"
+                         class="form-control" type="text"/>
                 </ng-template>
               </div>
 
diff --git a/src/app/shared/item/item-versions/item-versions.component.scss b/src/app/item-page/versions/item-versions.component.scss
similarity index 100%
rename from src/app/shared/item/item-versions/item-versions.component.scss
rename to src/app/item-page/versions/item-versions.component.scss
diff --git a/src/app/shared/item/item-versions/item-versions.component.spec.ts b/src/app/item-page/versions/item-versions.component.spec.ts
similarity index 72%
rename from src/app/shared/item/item-versions/item-versions.component.spec.ts
rename to src/app/item-page/versions/item-versions.component.spec.ts
index d4dbc336ab..be003c049e 100644
--- a/src/app/shared/item/item-versions/item-versions.component.spec.ts
+++ b/src/app/item-page/versions/item-versions.component.spec.ts
@@ -1,34 +1,51 @@
-import { ItemVersionsComponent } from './item-versions.component';
-import {
-  ComponentFixture, TestBed, waitForAsync
-} from '@angular/core/testing';
-import { VarDirective } from '../../utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { Version } from '../../../core/shared/version.model';
-import { VersionHistory } from '../../../core/shared/version-history.model';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { createPaginatedList } from '../../testing/utils.test';
-import { EMPTY, of, of as observableOf } from 'rxjs';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../testing/pagination-service.stub';
-import { AuthService } from '../../../core/auth/auth.service';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { Router } from '@angular/router';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  EMPTY,
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Item } from '../../core/shared/item.model';
+import { Version } from '../../core/shared/version.model';
+import { VersionHistory } from '../../core/shared/version-history.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ItemSharedModule } from '../item-shared.module';
+import { ItemVersionsComponent } from './item-versions.component';
 
 describe('ItemVersionsComponent', () => {
   let component: ItemVersionsComponent;
@@ -80,9 +97,9 @@ describe('ItemVersionsComponent', () => {
     version: createSuccessfulRemoteDataObject$(version1),
     _links: {
       self: {
-        href: '/items/item-identifier-1'
-      }
-    }
+        href: '/items/item-identifier-1',
+      },
+    },
   });
   const item2 = Object.assign(new Item(), {
     id: 'item-identifier-2',
@@ -91,9 +108,9 @@ describe('ItemVersionsComponent', () => {
     version: createSuccessfulRemoteDataObject$(version2),
     _links: {
       self: {
-        href: '/items/item-identifier-2'
-      }
-    }
+        href: '/items/item-identifier-2',
+      },
+    },
   });
   const items = [item1, item2];
   version1.item = createSuccessfulRemoteDataObject$(item1);
@@ -106,10 +123,10 @@ describe('ItemVersionsComponent', () => {
   });
   const authenticationServiceSpy = jasmine.createSpyObj('authenticationService', {
     isAuthenticated: observableOf(true),
-    setRedirectUrl: {}
+    setRedirectUrl: {},
   });
   const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
   const workspaceItemDataServiceSpy = jasmine.createSpyObj('workspaceItemDataService', {
     findByItem: EMPTY,
@@ -137,22 +154,22 @@ describe('ItemVersionsComponent', () => {
 
     TestBed.configureTestingModule({
       declarations: [ItemVersionsComponent, VarDirective],
-      imports: [TranslateModule.forRoot(), CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule],
+      imports: [TranslateModule.forRoot(), CommonModule, FormsModule, ReactiveFormsModule, BrowserModule, ItemSharedModule],
       providers: [
-        {provide: PaginationService, useValue: new PaginationServiceStub()},
-        {provide: FormBuilder, useValue: new FormBuilder()},
-        {provide: NotificationsService, useValue: new NotificationsServiceStub()},
-        {provide: AuthService, useValue: authenticationServiceSpy},
-        {provide: AuthorizationDataService, useValue: authorizationServiceSpy},
-        {provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy},
-        {provide: ItemDataService, useValue: itemDataServiceSpy},
-        {provide: VersionDataService, useValue: versionServiceSpy},
-        {provide: WorkspaceitemDataService, useValue: workspaceItemDataServiceSpy},
-        {provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy},
-        {provide: ConfigurationDataService, useValue: configurationServiceSpy},
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: AuthService, useValue: authenticationServiceSpy },
+        { provide: AuthorizationDataService, useValue: authorizationServiceSpy },
+        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
+        { provide: ItemDataService, useValue: itemDataServiceSpy },
+        { provide: VersionDataService, useValue: versionServiceSpy },
+        { provide: WorkspaceitemDataService, useValue: workspaceItemDataServiceSpy },
+        { provide: WorkflowItemDataService, useValue: workflowItemDataServiceSpy },
+        { provide: ConfigurationDataService, useValue: configurationServiceSpy },
         { provide: Router, useValue: routerSpy },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     versionHistoryService = TestBed.inject(VersionHistoryDataService);
@@ -220,20 +237,21 @@ describe('ItemVersionsComponent', () => {
       authorizationServiceSpy.isAuthorized.and.callFake(canDelete);
     }));
     it('should not disable the delete button', () => {
-      const deleteButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-delete`));
-      deleteButtons.forEach((btn) => {
+      const deleteButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-delete'));
+      expect(deleteButtons.length).not.toBe(0);
+      deleteButtons.forEach((btn: DebugElement) => {
         expect(btn.nativeElement.disabled).toBe(false);
       });
     });
-    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);
-      });
-      const editButtons = fixture.debugElement.queryAll(By.css(`.version-row-element-create`));
-      editButtons.forEach((btn) => {
-        expect(btn.nativeElement.disabled).toBe(true);
-      });
+
+    it('should hide the create buttons', () => {
+      const createButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-create'));
+      expect(createButtons.length).toBe(0);
+    });
+
+    it('should hide the edit buttons', () => {
+      const editButtons: DebugElement[] = fixture.debugElement.queryAll(By.css('.version-row-element-edit'));
+      expect(editButtons.length).toBe(0);
     });
   });
 
diff --git a/src/app/shared/item/item-versions/item-versions.component.ts b/src/app/item-page/versions/item-versions.component.ts
similarity index 84%
rename from src/app/shared/item/item-versions/item-versions.component.ts
rename to src/app/item-page/versions/item-versions.component.ts
index b7b8182658..8710d3e6a6 100644
--- a/src/app/shared/item/item-versions/item-versions.component.ts
+++ b/src/app/item-page/versions/item-versions.component.ts
@@ -1,7 +1,13 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { Version } from '../../../core/shared/version.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   combineLatest,
@@ -9,56 +15,66 @@ import {
   of,
   Subscription,
 } from 'rxjs';
-import { VersionHistory } from '../../../core/shared/version-history.model';
+import {
+  map,
+  mergeMap,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { VersionDataService } from '../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../core/data/version-history-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Item } from '../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
   getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
-} from '../../../core/shared/operators';
-import { map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
-import { AlertType } from '../../alert/aletr-type';
-import { followLink } from '../../utils/follow-link-config.model';
-import { hasValue, hasValueOperator } from '../../empty.util';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { Version } from '../../core/shared/version.model';
+import { VersionHistory } from '../../core/shared/version-history.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { AlertType } from '../../shared/alert/alert-type';
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import {
   getItemEditVersionhistoryRoute,
   getItemPageRoute,
-  getItemVersionRoute
-} from '../../../item-page/item-page-routing-paths';
-import { FormBuilder } from '@angular/forms';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+  getItemVersionRoute,
+} from '../item-page-routing-paths';
 import { ItemVersionsDeleteModalComponent } from './item-versions-delete-modal/item-versions-delete-modal.component';
-import { VersionDataService } from '../../../core/data/version-data.service';
-import { ItemDataService } from '../../../core/data/item-data.service';
-import { Router } from '@angular/router';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { ItemVersionsSharedService } from './item-versions-shared.service';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { ItemVersionsSummaryModalComponent } from './item-versions-summary-modal/item-versions-summary-modal.component';
 
 @Component({
   selector: 'ds-item-versions',
   templateUrl: './item-versions.component.html',
-  styleUrls: ['./item-versions.component.scss']
+  styleUrls: ['./item-versions.component.scss'],
 })
 
 /**
  * Component listing all available versions of the history the provided item is a part of
  */
-export class ItemVersionsComponent implements OnInit {
+export class ItemVersionsComponent implements OnDestroy, OnInit {
 
   /**
    * The item to display a version history for
@@ -137,7 +153,7 @@ export class ItemVersionsComponent implements OnInit {
   options = Object.assign(new PaginationComponentOptions(), {
     id: 'ivo',
     currentPage: 1,
-    pageSize: this.pageSize
+    pageSize: this.pageSize,
   });
 
   /**
@@ -171,7 +187,7 @@ export class ItemVersionsComponent implements OnInit {
               private versionService: VersionDataService,
               private itemService: ItemDataService,
               private paginationService: PaginationService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private modalService: NgbModal,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
@@ -238,19 +254,19 @@ export class ItemVersionsComponent implements OnInit {
       getFirstSucceededRemoteData(),
       switchMap((findRes: RemoteData<Version>) => {
         const payload = findRes.payload;
-        const summary = {summary: this.versionBeingEditedSummary,};
+        const summary = { summary: this.versionBeingEditedSummary };
         const updatedVersion = Object.assign({}, payload, summary);
         return this.versionService.update(updatedVersion).pipe(getFirstCompletedRemoteData<Version>());
       }),
     ).subscribe((updatedVersionRD: RemoteData<Version>) => {
-        if (updatedVersionRD.hasSucceeded) {
-          this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': this.versionBeingEditedNumber}));
-          this.getAllVersions(this.versionHistory$);
-        } else {
-          this.notificationsService.warning(null, this.translateService.get(failureMessageKey, {'version': this.versionBeingEditedNumber}));
-        }
-        this.disableVersionEditing();
+      if (updatedVersionRD.hasSucceeded) {
+        this.notificationsService.success(null, this.translateService.get(successMessageKey, { 'version': this.versionBeingEditedNumber }));
+        this.getAllVersions(this.versionHistory$);
+      } else {
+        this.notificationsService.warning(null, this.translateService.get(failureMessageKey, { 'version': this.versionBeingEditedNumber }));
       }
+      this.disableVersionEditing();
+    },
     );
   }
 
@@ -290,12 +306,12 @@ export class ItemVersionsComponent implements OnInit {
           // Retrieve version history
           mergeMap((item: Item) => combineLatest([
             of(item),
-            this.versionHistoryService.getVersionHistoryFromVersion$(version)
+            this.versionHistoryService.getVersionHistoryFromVersion$(version),
           ])),
           // Delete item
           mergeMap(([item, versionHistory]: [Item, VersionHistory]) => combineLatest([
             this.deleteItemAndGetResult$(item),
-            of(versionHistory)
+            of(versionHistory),
           ])),
           // Retrieve new latest version
           mergeMap(([deleteItemResult, versionHistory]: [boolean, VersionHistory]) => combineLatest([
@@ -304,14 +320,14 @@ export class ItemVersionsComponent implements OnInit {
               tap(() => {
                 this.getAllVersions(of(versionHistory));
               }),
-            )
+            ),
           ])),
         ).subscribe(([deleteHasSucceeded, newLatestVersionItem]: [boolean, Item]) => {
           // Notify operation result and redirect to latest item
           if (deleteHasSucceeded) {
-            this.notificationsService.success(null, this.translateService.get(successMessageKey, {'version': versionNumber}));
+            this.notificationsService.success(null, this.translateService.get(successMessageKey, { 'version': versionNumber }));
           } else {
-            this.notificationsService.error(null, this.translateService.get(failureMessageKey, {'version': versionNumber}));
+            this.notificationsService.error(null, this.translateService.get(failureMessageKey, { 'version': versionNumber }));
           }
           if (redirectToLatest) {
             const path = getItemEditVersionhistoryRoute(newLatestVersionItem);
@@ -337,7 +353,7 @@ export class ItemVersionsComponent implements OnInit {
     activeModal.componentInstance.createVersionEvent.pipe(
       mergeMap((summary: string) => combineLatest([
         of(summary),
-        version.item.pipe(getFirstSucceededRemoteDataPayload())
+        version.item.pipe(getFirstSucceededRemoteDataPayload()),
       ])),
       mergeMap(([summary, item]: [string, Item]) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
       getFirstCompletedRemoteData(),
@@ -402,7 +418,7 @@ export class ItemVersionsComponent implements OnInit {
     return combineLatest([includeSubmitter$, isAdmin$]).pipe(
       map(([includeSubmitter, isAdmin]) => {
         return includeSubmitter && isAdmin;
-      })
+      }),
     );
 
   }
@@ -424,7 +440,7 @@ export class ItemVersionsComponent implements OnInit {
     combineLatest([versionHistory$, currentPagination]).pipe(
       switchMap(([versionHistory, options]: [VersionHistory, PaginationComponentOptions]) => {
         return this.versionHistoryService.getVersions(versionHistory.id,
-          new PaginatedSearchOptions({pagination: Object.assign({}, options, {currentPage: options.currentPage})}),
+          new PaginatedSearchOptions({ pagination: Object.assign({}, options, { currentPage: options.currentPage }) }),
           false, true, followLink('item'), followLink('eperson'));
       }),
       getFirstCompletedRemoteData(),
@@ -505,7 +521,7 @@ export class ItemVersionsComponent implements OnInit {
 
       this.createVersionTitle$ = this.hasDraftVersion$.pipe(
         take(1),
-        switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion'))
+        switchMap((res) => of(res ? 'item.version.history.table.action.hasDraft' : 'item.version.history.table.action.newVersion')),
       );
 
       this.getAllVersions(this.versionHistory$);
@@ -514,7 +530,7 @@ export class ItemVersionsComponent implements OnInit {
         getRemoteDataPayload(),
         hasValueOperator(),
         map((versions: PaginatedList<Version>) => versions.page.filter((version: Version) => version.eperson !== undefined).length > 0),
-        startWith(false)
+        startWith(false),
       );
       this.itemPageRoutes$ = this.versionsRD$.pipe(
         getAllSucceededRemoteDataPayload(),
@@ -523,7 +539,7 @@ export class ItemVersionsComponent implements OnInit {
           const itemPageRoutes = {};
           versions.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
           return itemPageRoutes;
-        })
+        }),
       );
     }
   }
diff --git a/src/app/item-page/versions/item-versions.module.ts b/src/app/item-page/versions/item-versions.module.ts
new file mode 100644
index 0000000000..4fee5cde39
--- /dev/null
+++ b/src/app/item-page/versions/item-versions.module.ts
@@ -0,0 +1,33 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../../shared/shared.module';
+import { ItemVersionsComponent } from './item-versions.component';
+import { ItemVersionsNoticeComponent } from './notice/item-versions-notice.component';
+
+const DECLARATIONS = [
+  ItemVersionsComponent,
+  ItemVersionsNoticeComponent,
+];
+
+@NgModule({
+  imports: [
+    SharedModule,
+  ],
+  declarations: [
+    ...DECLARATIONS,
+  ],
+  exports: [
+    ...DECLARATIONS,
+  ],
+})
+export class ItemVersionsModule {
+
+}
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.html b/src/app/item-page/versions/notice/item-versions-notice.component.html
similarity index 100%
rename from src/app/shared/item/item-versions/notice/item-versions-notice.component.html
rename to src/app/item-page/versions/notice/item-versions-notice.component.html
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
similarity index 82%
rename from src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
rename to src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
index 2849ba4909..db1756b8c8 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.spec.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.spec.ts
@@ -1,39 +1,44 @@
-import { ItemVersionsNoticeComponent } from './item-versions-notice.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VersionHistory } from '../../../../core/shared/version-history.model';
-import { Version } from '../../../../core/shared/version.model';
-import { Item } from '../../../../core/shared/item.model';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
-import { createPaginatedList } from '../../../testing/utils.test';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { take } from 'rxjs/operators';
 
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { Version } from '../../../core/shared/version.model';
+import { VersionHistory } from '../../../core/shared/version-history.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { ItemVersionsNoticeComponent } from './item-versions-notice.component';
+
 describe('ItemVersionsNoticeComponent', () => {
   let component: ItemVersionsNoticeComponent;
   let fixture: ComponentFixture<ItemVersionsNoticeComponent>;
   let versionHistoryService: VersionHistoryDataService;
 
   const versionHistory = Object.assign(new VersionHistory(), {
-    id: '1'
+    id: '1',
   });
   const firstVersion = Object.assign(new Version(), {
     id: '1',
     version: 1,
     created: new Date(2020, 1, 1),
     summary: 'first version',
-    versionhistory: createSuccessfulRemoteDataObject$(versionHistory)
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistory),
   });
   const latestVersion = Object.assign(new Version(), {
     id: '2',
     version: 2,
     summary: 'latest version',
     created: new Date(2020, 1, 2),
-    versionhistory: createSuccessfulRemoteDataObject$(versionHistory)
+    versionhistory: createSuccessfulRemoteDataObject$(versionHistory),
   });
   const versions = [latestVersion, firstVersion];
   versionHistory.versions = createSuccessfulRemoteDataObject$(createPaginatedList(versions));
@@ -41,19 +46,19 @@ describe('ItemVersionsNoticeComponent', () => {
     id: 'first_item_id',
     uuid: 'first_item_id',
     handle: '123456789/1',
-    version: createSuccessfulRemoteDataObject$(firstVersion)
+    version: createSuccessfulRemoteDataObject$(firstVersion),
   });
   const latestItem = Object.assign(new Item(), {
     id: 'latest_item_id',
     uuid: 'latest_item_id',
     handle: '123456789/2',
-    version: createSuccessfulRemoteDataObject$(latestVersion)
+    version: createSuccessfulRemoteDataObject$(latestVersion),
   });
   firstVersion.item = createSuccessfulRemoteDataObject$(firstItem);
   latestVersion.item = createSuccessfulRemoteDataObject$(latestItem);
 
   const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
-    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', ]
+    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$' ],
   );
 
   beforeEach(waitForAsync(() => {
@@ -62,9 +67,9 @@ describe('ItemVersionsNoticeComponent', () => {
       declarations: [ItemVersionsNoticeComponent],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy }
+        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
     versionHistoryService = TestBed.inject(VersionHistoryDataService);
diff --git a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts b/src/app/item-page/versions/notice/item-versions-notice.component.ts
similarity index 72%
rename from src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
rename to src/app/item-page/versions/notice/item-versions-notice.component.ts
index a292ea65c6..c4af76707d 100644
--- a/src/app/shared/item/item-versions/notice/item-versions-notice.component.ts
+++ b/src/app/item-page/versions/notice/item-versions-notice.component.ts
@@ -1,23 +1,35 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Item } from '../../../../core/shared/item.model';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { VersionHistory } from '../../../../core/shared/version-history.model';
-import { Version } from '../../../../core/shared/version.model';
-import { hasValue, hasValueOperator } from '../../../empty.util';
+import {
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Item } from '../../../core/shared/item.model';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
-  getRemoteDataPayload
-} from '../../../../core/shared/operators';
-import { map, startWith, switchMap } from 'rxjs/operators';
-import { VersionHistoryDataService } from '../../../../core/data/version-history-data.service';
-import { AlertType } from '../../../alert/aletr-type';
-import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { Version } from '../../../core/shared/version.model';
+import { VersionHistory } from '../../../core/shared/version-history.model';
+import { AlertType } from '../../../shared/alert/alert-type';
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../../shared/empty.util';
+import { getItemPageRoute } from '../../item-page-routing-paths';
 
 @Component({
   selector: 'ds-item-versions-notice',
-  templateUrl: './item-versions-notice.component.html'
+  templateUrl: './item-versions-notice.component.html',
 })
 /**
  * Component for displaying a warning notice when the item is not the latest version within its version history
@@ -73,12 +85,12 @@ export class ItemVersionsNoticeComponent implements OnInit {
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
         hasValueOperator(),
-        switchMap((version: Version) => version.versionhistory)
+        switchMap((version: Version) => version.versionhistory),
       );
 
       this.latestVersion$ = this.versionHistoryRD$.pipe(
         getFirstSucceededRemoteDataPayload(),
-        switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh))
+        switchMap((vh) => this.versionHistoryService.getLatestVersionFromHistory$(vh)),
       );
 
       this.showLatestVersionNotice$ = this.versionRD$.pipe(
diff --git a/src/app/login-page/login-page-routing.module.ts b/src/app/login-page/login-page-routing.module.ts
index 3a48852625..5a6a1c9b0b 100644
--- a/src/app/login-page/login-page-routing.module.ts
+++ b/src/app/login-page/login-page-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 import { ThemedLoginPageComponent } from './themed-login-page.component';
@@ -7,13 +8,13 @@ import { ThemedLoginPageComponent } from './themed-login-page.component';
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', pathMatch: 'full', component: ThemedLoginPageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'login', title: 'login.title' } }
-    ])
+      { path: '', pathMatch: 'full', component: ThemedLoginPageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'login', title: 'login.title' } },
+    ]),
   ],
   providers: [
     I18nBreadcrumbResolver,
-    I18nBreadcrumbsService
-  ]
+    I18nBreadcrumbsService,
+  ],
 })
 export class LoginPageRoutingModule {
 }
diff --git a/src/app/login-page/login-page.component.html b/src/app/login-page/login-page.component.html
index 2a95e0ce1c..c38444bec8 100644
--- a/src/app/login-page/login-page.component.html
+++ b/src/app/login-page/login-page.component.html
@@ -3,8 +3,8 @@
     <div>
       <img class="mb-4 login-logo" src="assets/images/dspace-logo.png" 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..326e4736c9 100644
--- a/src/app/login-page/login-page.component.spec.ts
+++ b/src/app/login-page/login-page.component.spec.ts
@@ -1,39 +1,42 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
-
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { LoginPageComponent } from './login-page.component';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
+import { LoginPageComponent } from './login-page.component';
 
 describe('LoginPageComponent', () => {
   let comp: LoginPageComponent;
   let fixture: ComponentFixture<LoginPageComponent>;
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({})
+    params: observableOf({}),
   });
 
   const store: Store<LoginPageComponent> = jasmine.createSpyObj('store', {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [LoginPageComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Store, useValue: store }
+        { provide: Store, useValue: store },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/login-page/login-page.component.ts b/src/app/login-page/login-page.component.ts
index f618f5329e..e149a5f8d6 100644
--- a/src/app/login-page/login-page.component.ts
+++ b/src/app/login-page/login-page.component.ts
@@ -1,20 +1,32 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-
-import { combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
 
 import { AppState } from '../app.reducer';
 import {
   AddAuthenticationMessageAction,
   AuthenticatedAction,
   AuthenticationSuccessAction,
-  ResetAuthenticationMessagesAction
+  ResetAuthenticationMessagesAction,
 } from '../core/auth/auth.actions';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
 import { isAuthenticated } from '../core/auth/selectors';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
 
 /**
  * This component represents the login page
@@ -22,7 +34,7 @@ import { isAuthenticated } from '../core/auth/selectors';
 @Component({
   selector: 'ds-login-page',
   styleUrls: ['./login-page.component.scss'],
-  templateUrl: './login-page.component.html'
+  templateUrl: './login-page.component.html',
 })
 export class LoginPageComponent implements OnDestroy, OnInit {
 
@@ -49,7 +61,7 @@ export class LoginPageComponent implements OnDestroy, OnInit {
     const authenticated = this.store.select(isAuthenticated);
     this.sub = observableCombineLatest(queryParamsObs, authenticated).pipe(
       filter(([params, auth]) => isNotEmpty(params.token) || isNotEmpty(params.expired)),
-      take(1)
+      take(1),
     ).subscribe(([params, auth]) => {
       const token = params.token;
       let authToken: AuthTokenInfo;
diff --git a/src/app/login-page/login-page.module.ts b/src/app/login-page/login-page.module.ts
index 4facc82df1..995acade87 100644
--- a/src/app/login-page/login-page.module.ts
+++ b/src/app/login-page/login-page.module.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { LoginPageComponent } from './login-page.component';
 import { LoginPageRoutingModule } from './login-page-routing.module';
@@ -13,8 +14,8 @@ import { ThemedLoginPageComponent } from './themed-login-page.component';
   ],
   declarations: [
     LoginPageComponent,
-    ThemedLoginPageComponent
-  ]
+    ThemedLoginPageComponent,
+  ],
 })
 export class LoginPageModule {
 
diff --git a/src/app/login-page/themed-login-page.component.ts b/src/app/login-page/themed-login-page.component.ts
index e314b4a3f7..5ff498018f 100644
--- a/src/app/login-page/themed-login-page.component.ts
+++ b/src/app/login-page/themed-login-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { LoginPageComponent } from './login-page.component';
 
@@ -8,7 +9,7 @@ import { LoginPageComponent } from './login-page.component';
 @Component({
   selector: 'ds-themed-login-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedLoginPageComponent extends ThemedComponent<LoginPageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/logout-page/logout-page-routing.module.ts b/src/app/logout-page/logout-page-routing.module.ts
index a5df0fe580..38c55410d2 100644
--- a/src/app/logout-page/logout-page-routing.module.ts
+++ b/src/app/logout-page/logout-page-routing.module.ts
@@ -1,5 +1,6 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
 import { ThemedLogoutPageComponent } from './themed-logout-page.component';
 
@@ -10,9 +11,9 @@ import { ThemedLogoutPageComponent } from './themed-logout-page.component';
         canActivate: [AuthenticatedGuard],
         path: '',
         component: ThemedLogoutPageComponent,
-        data: { title: 'logout.title' }
-      }
-    ])
-  ]
+        data: { title: 'logout.title' },
+      },
+    ]),
+  ],
 })
 export class LogoutPageRoutingModule { }
diff --git a/src/app/logout-page/logout-page.component.spec.ts b/src/app/logout-page/logout-page.component.spec.ts
index 327e64b756..054f0c5102 100644
--- a/src/app/logout-page/logout-page.component.spec.ts
+++ b/src/app/logout-page/logout-page.component.spec.ts
@@ -1,5 +1,9 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
 import { LogoutPageComponent } from './logout-page.component';
@@ -11,10 +15,10 @@ describe('LogoutPageComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [LogoutPageComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/logout-page/logout-page.component.ts b/src/app/logout-page/logout-page.component.ts
index 4fa4b9900a..dff5320c5c 100644
--- a/src/app/logout-page/logout-page.component.ts
+++ b/src/app/logout-page/logout-page.component.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-logout-page',
   styleUrls: ['./logout-page.component.scss'],
-  templateUrl: './logout-page.component.html'
+  templateUrl: './logout-page.component.html',
 })
 export class LogoutPageComponent {
 
diff --git a/src/app/logout-page/logout-page.module.ts b/src/app/logout-page/logout-page.module.ts
index 59a5459e7f..508f3f5909 100644
--- a/src/app/logout-page/logout-page.module.ts
+++ b/src/app/logout-page/logout-page.module.ts
@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { LogoutPageComponent } from './logout-page.component';
 import { LogoutPageRoutingModule } from './logout-page-routing.module';
@@ -13,8 +14,8 @@ import { ThemedLogoutPageComponent } from './themed-logout-page.component';
   ],
   declarations: [
     LogoutPageComponent,
-    ThemedLogoutPageComponent
-  ]
+    ThemedLogoutPageComponent,
+  ],
 })
 export class LogoutPageModule {
 
diff --git a/src/app/logout-page/themed-logout-page.component.ts b/src/app/logout-page/themed-logout-page.component.ts
index 8d4adfd243..535fa10d28 100644
--- a/src/app/logout-page/themed-logout-page.component.ts
+++ b/src/app/logout-page/themed-logout-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { LogoutPageComponent } from './logout-page.component';
 
@@ -8,7 +9,7 @@ import { LogoutPageComponent } from './logout-page.component';
 @Component({
   selector: 'ds-themed-logout-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedLogoutPageComponent extends ThemedComponent<LogoutPageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/lookup-by-id/lookup-by-id-routing.module.ts b/src/app/lookup-by-id/lookup-by-id-routing.module.ts
index 52a7c8a358..12d5874118 100644
--- a/src/app/lookup-by-id/lookup-by-id-routing.module.ts
+++ b/src/app/lookup-by-id/lookup-by-id-routing.module.ts
@@ -1,7 +1,11 @@
-import { LookupGuard } from './lookup-guard';
 import { NgModule } from '@angular/core';
-import { RouterModule, UrlSegment } from '@angular/router';
+import {
+  RouterModule,
+  UrlSegment,
+} from '@angular/router';
+
 import { isNotEmpty } from '../shared/empty.util';
+import { LookupGuard } from './lookup-guard';
 import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component';
 
 @NgModule({
@@ -10,12 +14,12 @@ import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnot
       {
         matcher: urlMatcher,
         canActivate: [LookupGuard],
-        component: ThemedObjectNotFoundComponent  }
-    ])
+        component: ThemedObjectNotFoundComponent  },
+    ]),
   ],
   providers: [
-    LookupGuard
-  ]
+    LookupGuard,
+  ],
 })
 
 export class LookupRoutingModule {
@@ -35,8 +39,8 @@ export function urlMatcher(url) {
       consumed: url,
       posParams: {
         idType: new UrlSegment(idType, {}),
-        id: new UrlSegment(id, {})
-      }
+        id: new UrlSegment(id, {}),
+      },
     };
   }
   return null;
diff --git a/src/app/lookup-by-id/lookup-by-id.module.ts b/src/app/lookup-by-id/lookup-by-id.module.ts
index 8a09d369e8..83177b9c57 100644
--- a/src/app/lookup-by-id/lookup-by-id.module.ts
+++ b/src/app/lookup-by-id/lookup-by-id.module.ts
@@ -1,9 +1,10 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { DsoRedirectService } from '../core/data/dso-redirect.service';
 import { SharedModule } from '../shared/shared.module';
 import { LookupRoutingModule } from './lookup-by-id-routing.module';
 import { ObjectNotFoundComponent } from './objectnotfound/objectnotfound.component';
-import { DsoRedirectService } from '../core/data/dso-redirect.service';
 import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnotfound.component';
 
 @NgModule({
@@ -14,11 +15,11 @@ import { ThemedObjectNotFoundComponent } from './objectnotfound/themed-objectnot
   ],
   declarations: [
     ObjectNotFoundComponent,
-    ThemedObjectNotFoundComponent
+    ThemedObjectNotFoundComponent,
   ],
   providers: [
     DsoRedirectService,
-  ]
+  ],
 })
 export class LookupIdModule {
 
diff --git a/src/app/lookup-by-id/lookup-guard.spec.ts b/src/app/lookup-by-id/lookup-guard.spec.ts
index 63bb68884e..1380f0c689 100644
--- a/src/app/lookup-by-id/lookup-guard.spec.ts
+++ b/src/app/lookup-by-id/lookup-guard.spec.ts
@@ -1,4 +1,5 @@
 import { of as observableOf } from 'rxjs';
+
 import { IdentifierType } from '../core/data/request.models';
 import { LookupGuard } from './lookup-guard';
 
@@ -9,7 +10,7 @@ describe('LookupGuard', () => {
   beforeEach(() => {
     dsoService = {
       findByIdAndIDType: jasmine.createSpy('findByIdAndIDType').and.returnValue(observableOf({ hasFailed: false,
-        hasSucceeded: true }))
+        hasSucceeded: true })),
     };
     guard = new LookupGuard(dsoService);
   });
@@ -18,8 +19,8 @@ describe('LookupGuard', () => {
     const scopedRoute = {
       params: {
         id: '1234',
-        idType: '123456789'
-      }
+        idType: '123456789',
+      },
     };
     guard.canActivate(scopedRoute as any, undefined);
     expect(dsoService.findByIdAndIDType).toHaveBeenCalledWith('hdl:123456789/1234', IdentifierType.HANDLE);
@@ -29,8 +30,8 @@ describe('LookupGuard', () => {
     const scopedRoute = {
       params: {
         id: '123456789%2F1234',
-        idType: 'handle'
-      }
+        idType: 'handle',
+      },
     };
     guard.canActivate(scopedRoute as any, undefined);
     expect(dsoService.findByIdAndIDType).toHaveBeenCalledWith('hdl:123456789%2F1234', IdentifierType.HANDLE);
@@ -40,8 +41,8 @@ describe('LookupGuard', () => {
     const scopedRoute = {
       params: {
         id: '34cfed7c-f597-49ef-9cbe-ea351f0023c2',
-        idType: 'uuid'
-      }
+        idType: 'uuid',
+      },
     };
     guard.canActivate(scopedRoute as any, undefined);
     expect(dsoService.findByIdAndIDType).toHaveBeenCalledWith('34cfed7c-f597-49ef-9cbe-ea351f0023c2', IdentifierType.UUID);
diff --git a/src/app/lookup-by-id/lookup-guard.ts b/src/app/lookup-by-id/lookup-guard.ts
index 299eb3cda9..ed69d47521 100644
--- a/src/app/lookup-by-id/lookup-guard.ts
+++ b/src/app/lookup-by-id/lookup-guard.ts
@@ -1,10 +1,15 @@
-import { ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { IdentifierType } from '../core/data/request.models';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { RemoteData } from '../core/data/remote-data';
+
 import { DsoRedirectService } from '../core/data/dso-redirect.service';
+import { RemoteData } from '../core/data/remote-data';
+import { IdentifierType } from '../core/data/request.models';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 
 interface LookupParams {
@@ -21,7 +26,7 @@ export class LookupGuard implements CanActivate {
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>  {
     const params = this.getLookupParams(route);
     return this.dsoService.findByIdAndIDType(params.id, params.type).pipe(
-      map((response: RemoteData<DSpaceObject>) => response.hasFailed)
+      map((response: RemoteData<DSpaceObject>) => response.hasFailed),
     );
   }
 
@@ -47,7 +52,7 @@ export class LookupGuard implements CanActivate {
     }
     return {
       type: type,
-      id: id
+      id: id,
     };
   }
 }
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 b293ead102..540e4c0863 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.spec.ts
@@ -1,11 +1,15 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { ObjectNotFoundComponent } from './objectnotfound.component';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { ObjectNotFoundComponent } from './objectnotfound.component';
 import { ServerResponseService } from 'src/app/core/services/server-response.service';
 
 describe('ObjectNotFoundComponent', () => {
@@ -16,26 +20,26 @@ describe('ObjectNotFoundComponent', () => {
   const handlePrefix = '123456789';
   const handleId = '22';
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({id: testUUID, idType: uuidType})
+    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})
+    params: observableOf({ id: handleId, idType: handlePrefix }),
   });
   describe('uuid request', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ], providers: [
-          {provide: ServerResponseService, useValue: serverResponseServiceStub},
-          {provide: ActivatedRoute, useValue: activatedRouteStub}
+          { provide: ServerResponseService, useValue: serverResponseServiceStub} ,
+          { provide: ActivatedRoute, useValue: activatedRouteStub }
         ],
         declarations: [ObjectNotFoundComponent],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
@@ -64,13 +68,13 @@ describe('ObjectNotFoundComponent', () => {
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ], providers: [
-          {provide: ServerResponseService, useValue: serverResponseServiceStub},
-          {provide: ActivatedRoute, useValue: activatedRouteStubHandle}
+          { provide: ServerResponseService, useValue: serverResponseServiceStub },
+          { provide: ActivatedRoute, useValue: activatedRouteStubHandle }
         ],
         declarations: [ObjectNotFoundComponent],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
@@ -90,4 +94,5 @@ describe('ObjectNotFoundComponent', () => {
       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 cad78f8555..45259eae95 100644
--- a/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
@@ -1,5 +1,9 @@
 
-import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { ServerResponseService } from 'src/app/core/services/server-response.service';
 
@@ -10,7 +14,7 @@ import { ServerResponseService } from 'src/app/core/services/server-response.ser
   selector: 'ds-objnotfound',
   styleUrls: ['./objectnotfound.component.scss'],
   templateUrl: './objectnotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class ObjectNotFoundComponent implements OnInit {
 
diff --git a/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
index e2338d5f07..f9910df12c 100644
--- a/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
+++ b/src/app/lookup-by-id/objectnotfound/themed-objectnotfound.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ObjectNotFoundComponent } from './objectnotfound.component';
 
diff --git a/src/app/menu.resolver.spec.ts b/src/app/menu.resolver.spec.ts
index 4fd44efe66..cfe35ef2ca 100644
--- a/src/app/menu.resolver.spec.ts
+++ b/src/app/menu.resolver.spec.ts
@@ -1,28 +1,33 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { MenuResolver } from './menu.resolver';
-import { of as observableOf } from 'rxjs';
-import { FeatureID } from './core/data/feature-authorization/feature-id';
-import { TranslateModule } from '@ngx-translate/core';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { MenuService } from './shared/menu/menu.service';
-import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
-import { ScriptDataService } from './core/data/processes/script-data.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { MenuServiceStub } from './shared/testing/menu-service.stub';
-import { MenuID } from './shared/menu/menu-id.model';
-import { BrowseService } from './core/browse/browse.service';
+import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import createSpy = jasmine.createSpy;
+import { of as observableOf } from 'rxjs';
+
+import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
+import { BrowseService } from './core/browse/browse.service';
+import { ConfigurationDataService } from './core/data/configuration-data.service';
+import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from './core/data/feature-authorization/feature-id';
+import { ScriptDataService } from './core/data/processes/script-data.service';
+import { MenuResolver } from './menu.resolver';
+import { MenuService } from './shared/menu/menu.service';
+import { MenuID } from './shared/menu/menu-id.model';
 import { createSuccessfulRemoteDataObject$ } from './shared/remote-data.utils';
+import { ConfigurationDataServiceStub } from './shared/testing/configuration-data.service.stub';
+import { MenuServiceStub } from './shared/testing/menu-service.stub';
 import { createPaginatedList } from './shared/testing/utils.test';
+import createSpy = jasmine.createSpy;
 
 const BOOLEAN = { t: true, f: false };
 const MENU_STATE = {
-  id: 'some menu'
+  id: 'some menu',
 };
 const BROWSE_DEFINITIONS = [
   { id: 'definition1' },
@@ -37,21 +42,26 @@ describe('MenuResolver', () => {
   let browseService;
   let authorizationService;
   let scriptService;
+  let configurationDataService;
 
   beforeEach(waitForAsync(() => {
     menuService = new MenuServiceStub();
     spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE));
+    spyOn(menuService, 'addSection');
 
     browseService = jasmine.createSpyObj('browseService', {
-      getBrowseDefinitions: createSuccessfulRemoteDataObject$(createPaginatedList(BROWSE_DEFINITIONS))
+      getBrowseDefinitions: createSuccessfulRemoteDataObject$(createPaginatedList(BROWSE_DEFINITIONS)),
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     scriptService = jasmine.createSpyObj('scriptService', {
-      scriptWithNameExistsAndCanExecute: observableOf(true)
+      scriptWithNameExistsAndCanExecute: observableOf(true),
     });
 
+    configurationDataService = new ConfigurationDataServiceStub();
+    spyOn(configurationDataService, 'findByPropertyName').and.returnValue(observableOf(true));
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
       declarations: [AdminSidebarComponent],
@@ -60,18 +70,17 @@ describe('MenuResolver', () => {
         { provide: BrowseService, useValue: browseService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         { provide: ScriptDataService, useValue: scriptService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
         {
           provide: NgbModal, useValue: {
             open: () => {/*comment*/
-            }
-          }
-        }
+            },
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     });
     resolver = TestBed.inject(MenuResolver);
-
-    spyOn(menuService, 'addSection');
   }));
 
   it('should be created', () => {
@@ -142,29 +151,7 @@ describe('MenuResolver', () => {
   });
 
   describe('createAdminMenu$', () => {
-    it('should retrieve the menu by ID return an Observable that emits true as soon as it is created', () => {
-      (menuService as any).getMenu.and.returnValue(cold('--u--m', {
-        u: undefined,
-        m: MENU_STATE,
-      }));
-
-      expect(resolver.createAdminMenu$()).toBeObservable(cold('-----(t|)', BOOLEAN));
-      expect(menuService.getMenu).toHaveBeenCalledOnceWith(MenuID.ADMIN);
-    });
-
-    describe('for regular user', () => {
-      beforeEach(() => {
-        authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake(() => {
-          return observableOf(false);
-        });
-      });
-
-      beforeEach((done) => {
-        resolver.createAdminMenu$().subscribe((_) => {
-          done();
-        });
-      });
-
+    const dontShowAdminSections = () => {
       it('should not show site admin section', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'admin_search', visible: false,
@@ -183,19 +170,6 @@ describe('MenuResolver', () => {
         }));
       });
 
-      it('should not show edit_community', () => {
-        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
-          id: 'edit_community', visible: false,
-        }));
-
-      });
-
-      it('should not show edit_collection', () => {
-        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
-          id: 'edit_collection', visible: false,
-        }));
-      });
-
       it('should not show access control section', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'access_control', visible: false,
@@ -222,6 +196,122 @@ describe('MenuResolver', () => {
           id: 'export', visible: true,
         }));
       });
+    };
+
+    const dontShowNewSection = () => {
+      it('should not show the "New" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_community', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_collection', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_item', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new', visible: false,
+        }));
+      });
+    };
+
+    const dontShowEditSection = () => {
+      it('should not show the "Edit" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_community', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_collection', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_item', visible: false,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit', visible: false,
+        }));
+      });
+    };
+
+    it('should retrieve the menu by ID return an Observable that emits true as soon as it is created', () => {
+      (menuService as any).getMenu.and.returnValue(cold('--u--m', {
+        u: undefined,
+        m: MENU_STATE,
+      }));
+
+      expect(resolver.createAdminMenu$()).toBeObservable(cold('-----(t|)', BOOLEAN));
+      expect(menuService.getMenu).toHaveBeenCalledOnceWith(MenuID.ADMIN);
+    });
+
+    describe('for regular user', () => {
+      beforeEach(() => {
+        authorizationService.isAuthorized = createSpy('isAuthorized').and.callFake((featureID) => {
+          return observableOf(false);
+        });
+      });
+
+      beforeEach((done) => {
+        resolver.createAdminMenu$().subscribe((_) => {
+          done();
+        });
+      });
+
+      dontShowAdminSections();
+      dontShowNewSection();
+      dontShowEditSection();
+    });
+
+    describe('regular user who can submit', () => {
+      beforeEach(() => {
+        authorizationService.isAuthorized = createSpy('isAuthorized')
+          .and.callFake((featureID: FeatureID) => {
+            return observableOf(featureID === FeatureID.CanSubmit);
+          });
+      });
+
+      beforeEach((done) => {
+        resolver.createAdminMenu$().subscribe((_) => {
+          done();
+        });
+      });
+
+      it('should show "New Item" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_item', visible: true,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new', visible: true,
+        }));
+      });
+
+      dontShowAdminSections();
+      dontShowEditSection();
+    });
+
+    describe('regular user who can edit items', () => {
+      beforeEach(() => {
+        authorizationService.isAuthorized = createSpy('isAuthorized')
+          .and.callFake((featureID: FeatureID) => {
+            return observableOf(featureID === FeatureID.CanEditItem);
+          });
+      });
+
+      beforeEach((done) => {
+        resolver.createAdminMenu$().subscribe((_) => {
+          done();
+        });
+      });
+
+      it('should show "Edit Item" section', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit_item', visible: true,
+        }));
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'edit', visible: true,
+        }));
+      });
+
+      dontShowAdminSections();
+      dontShowNewSection();
     });
 
     describe('for site admin', () => {
@@ -237,6 +327,12 @@ describe('MenuResolver', () => {
         });
       });
 
+      it('should show new_process', () => {
+        expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
+          id: 'new_process', visible: true,
+        }));
+      });
+
       it('should contain site admin section', () => {
         expect(menuService.addSection).toHaveBeenCalledWith(MenuID.ADMIN, jasmine.objectContaining({
           id: 'admin_search', visible: true,
diff --git a/src/app/menu.resolver.ts b/src/app/menu.resolver.ts
index 8630150c58..ea20e29498 100644
--- a/src/app/menu.resolver.ts
+++ b/src/app/menu.resolver.ts
@@ -1,58 +1,59 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { combineLatest as observableCombineLatest, combineLatest, Observable } 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';
-import { LinkMenuItemModel } from './shared/menu/menu-item/models/link.model';
-import { getFirstCompletedRemoteData } from './core/shared/operators';
-import { PaginatedList } from './core/data/paginated-list.model';
-import { BrowseDefinition } from './core/shared/browse-definition.model';
-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 { hasValue } from './shared/empty.util';
-import { FeatureID } from './core/data/feature-authorization/feature-id';
 import {
-  ThemedCreateCommunityParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
-import { OnClickMenuItemModel } from './shared/menu/menu-item/models/onclick.model';
-import {
-  ThemedCreateCollectionParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
-import {
-  ThemedCreateItemParentSelectorComponent
-} from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
-import {
-  ThemedEditCommunitySelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
-import {
-  ThemedEditCollectionSelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
-import {
-  ThemedEditItemSelectorComponent
-} from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
-import {
-  ExportMetadataSelectorComponent
-} from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
-import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  combineLatest,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  find,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { PUBLICATION_CLAIMS_PATH } from './admin/admin-notifications/admin-notifications-routing-paths';
+import { BrowseService } from './core/browse/browse.service';
+import { ConfigurationDataService } from './core/data/configuration-data.service';
+import { AuthorizationDataService } from './core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from './core/data/feature-authorization/feature-id';
+import { PaginatedList } from './core/data/paginated-list.model';
 import {
   METADATA_EXPORT_SCRIPT_NAME,
   METADATA_IMPORT_SCRIPT_NAME,
-  ScriptDataService
+  ScriptDataService,
 } from './core/data/processes/script-data.service';
-import {
-  ExportBatchSelectorComponent
-} from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { RemoteData } from './core/data/remote-data';
+import { BrowseDefinition } from './core/shared/browse-definition.model';
+import { ConfigurationProperty } from './core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from './core/shared/operators';
+import { ThemedCreateCollectionParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
+import { ThemedCreateCommunityParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
+import { ThemedCreateItemParentSelectorComponent } from './shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
+import { ThemedEditCollectionSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
+import { ThemedEditCommunitySelectorComponent } from './shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
+import { ThemedEditItemSelectorComponent } from './shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
+import { ExportBatchSelectorComponent } from './shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { ExportMetadataSelectorComponent } from './shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
+import { hasValue } from './shared/empty.util';
+import { MenuService } from './shared/menu/menu.service';
+import { MenuID } from './shared/menu/menu-id.model';
+import { LinkMenuItemModel } from './shared/menu/menu-item/models/link.model';
+import { OnClickMenuItemModel } from './shared/menu/menu-item/models/onclick.model';
+import { TextMenuItemModel } from './shared/menu/menu-item/models/text.model';
+import { MenuItemType } from './shared/menu/menu-item-type.model';
+import { MenuState } from './shared/menu/menu-state.model';
 
 /**
  * Creates all of the app's menus
  */
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class MenuResolver implements Resolve<boolean> {
   constructor(
@@ -61,6 +62,7 @@ export class MenuResolver implements Resolve<boolean> {
     protected authorizationService: AuthorizationDataService,
     protected modalService: NgbModal,
     protected scriptDataService: ScriptDataService,
+    protected configurationDataService: ConfigurationDataService,
   ) {
   }
 
@@ -102,9 +104,9 @@ export class MenuResolver implements Resolve<boolean> {
         model: {
           type: MenuItemType.LINK,
           text: `menu.section.browse_global_communities_and_collections`,
-          link: `/community-list`
-        } as LinkMenuItemModel
-      }
+          link: `/community-list`,
+        } as LinkMenuItemModel,
+      },
     ];
     // Read the different Browse-By types from config and add them to the browse menu
     this.browseService.getBrowseDefinitions()
@@ -120,8 +122,8 @@ export class MenuResolver implements Resolve<boolean> {
               model: {
                 type: MenuItemType.LINK,
                 text: `menu.section.browse_global_by_${browseDef.id}`,
-                link: `/browse/${browseDef.id}`
-              } as LinkMenuItemModel
+                link: `/browse/${browseDef.id}`,
+              } as LinkMenuItemModel,
             });
           });
           menuList.push(
@@ -133,13 +135,13 @@ export class MenuResolver implements Resolve<boolean> {
               index: 1,
               model: {
                 type: MenuItemType.TEXT,
-                text: 'menu.section.browse_global'
+                text: 'menu.section.browse_global',
               } as TextMenuItemModel,
-            }
+            },
           );
         }
         menuList.forEach((menuSection) => this.menuService.addSection(MenuID.PUBLIC, Object.assign(menuSection, {
-          shouldPersistOnRouteChange: true
+          shouldPersistOnRouteChange: true,
         })));
       });
 
@@ -155,6 +157,7 @@ export class MenuResolver implements Resolve<boolean> {
     this.createExportMenuSections();
     this.createImportMenuSections();
     this.createAccessControlMenuSections();
+    this.createReportMenuSections();
 
     return this.waitForMenu$(MenuID.ADMIN);
   }
@@ -167,21 +170,13 @@ export class MenuResolver implements Resolve<boolean> {
     combineLatest([
       this.authorizationService.isAuthorized(FeatureID.IsCollectionAdmin),
       this.authorizationService.isAuthorized(FeatureID.IsCommunityAdmin),
-      this.authorizationService.isAuthorized(FeatureID.AdministratorOf)
-    ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin]) => {
-      const menuList = [
-        /* News */
-        {
-          id: 'new',
-          active: false,
-          visible: true,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.new'
-          } as TextMenuItemModel,
-          icon: 'plus',
-          index: 0
-        },
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+      this.authorizationService.isAuthorized(FeatureID.CanSubmit),
+      this.authorizationService.isAuthorized(FeatureID.CanEditItem),
+      this.authorizationService.isAuthorized(FeatureID.CanSeeQA),
+      this.authorizationService.isAuthorized(FeatureID.CoarNotifyEnabled),
+    ]).subscribe(([isCollectionAdmin, isCommunityAdmin, isSiteAdmin, canSubmit, canEditItem, canSeeQa, isCoarNotifyEnabled]) => {
+      const newSubMenuList = [
         {
           id: 'new_community',
           parentID: 'new',
@@ -192,7 +187,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.new_community',
             function: () => {
               this.modalService.open(ThemedCreateCommunityParentSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -205,58 +200,48 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.new_collection',
             function: () => {
               this.modalService.open(ThemedCreateCollectionParentSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
           id: 'new_item',
           parentID: 'new',
           active: false,
-          visible: true,
+          visible: canSubmit,
           model: {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.new_item',
             function: () => {
               this.modalService.open(ThemedCreateItemParentSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
           id: 'new_process',
           parentID: 'new',
           active: false,
-          visible: isCollectionAdmin,
+          visible: isSiteAdmin,
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.new_process',
-            link: '/processes/new'
+            link: '/processes/new',
           } as LinkMenuItemModel,
-        },
-        // TODO: enable this menu item once the feature has been implemented
-        // {
-        //   id: 'new_item_version',
-        //   parentID: 'new',
-        //   active: false,
-        //   visible: true,
-        //   model: {
-        //     type: MenuItemType.LINK,
-        //     text: 'menu.section.new_item_version',
-        //     link: ''
-        //   } as LinkMenuItemModel,
-        // },
-
-        /* Edit */
+        },/*  ldn_services */
         {
-          id: 'edit',
+          id: 'ldn_services_new',
+          parentID: 'new',
           active: false,
-          visible: true,
+          visible: isSiteAdmin && isCoarNotifyEnabled,
           model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.edit'
-          } as TextMenuItemModel,
-          icon: 'pencil-alt',
-          index: 1
+            type: MenuItemType.LINK,
+            text: 'menu.section.services_new',
+            link: '/admin/ldn/services/new',
+          } as LinkMenuItemModel,
+          icon: '',
         },
+      ];
+      const editSubMenuList = [
+        /* Edit */
         {
           id: 'edit_community',
           parentID: 'edit',
@@ -267,7 +252,7 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.edit_community',
             function: () => {
               this.modalService.open(ThemedEditCommunitySelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
@@ -280,22 +265,63 @@ export class MenuResolver implements Resolve<boolean> {
             text: 'menu.section.edit_collection',
             function: () => {
               this.modalService.open(ThemedEditCollectionSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
         {
           id: 'edit_item',
           parentID: 'edit',
           active: false,
-          visible: true,
+          visible: canEditItem,
           model: {
             type: MenuItemType.ONCLICK,
             text: 'menu.section.edit_item',
             function: () => {
               this.modalService.open(ThemedEditItemSelectorComponent);
-            }
+            },
           } as OnClickMenuItemModel,
         },
+      ];
+      const newSubMenu = {
+        id: 'new',
+        active: false,
+        visible: newSubMenuList.some(subMenu => subMenu.visible),
+        model: {
+          type: MenuItemType.TEXT,
+          text: 'menu.section.new',
+        } as TextMenuItemModel,
+        icon: 'plus',
+        index: 0,
+      };
+      const editSubMenu = {
+        id: 'edit',
+        active: false,
+        visible: editSubMenuList.some(subMenu => subMenu.visible),
+        model: {
+          type: MenuItemType.TEXT,
+          text: 'menu.section.edit',
+        } as TextMenuItemModel,
+        icon: 'pencil-alt',
+        index: 1,
+      };
+
+      const menuList = [
+        ...newSubMenuList,
+        newSubMenu,
+        ...editSubMenuList,
+        editSubMenu,
+        // TODO: enable this menu item once the feature has been implemented
+        // {
+        //   id: 'new_item_version',
+        //   parentID: 'new',
+        //   active: false,
+        //   visible: true,
+        //   model: {
+        //     type: MenuItemType.LINK,
+        //     text: 'menu.section.new_item_version',
+        //     link: ''
+        //   } as LinkMenuItemModel,
+        // },
 
         /* Statistics */
         // TODO: enable this menu item once the feature has been implemented
@@ -335,10 +361,45 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.processes',
-            link: '/processes'
+            link: '/processes',
           } as LinkMenuItemModel,
           icon: 'terminal',
-          index: 10
+          index: 10,
+        },
+        /* COAR Notify section */
+        {
+          id: 'coar_notify',
+          active: false,
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.coar_notify',
+          } as TextMenuItemModel,
+          icon: 'inbox',
+          index: 13,
+        },
+        {
+          id: 'notify_dashboard',
+          active: false,
+          parentID: 'coar_notify',
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.notify_dashboard',
+            link: '/admin/notify-dashboard',
+          } as LinkMenuItemModel,
+        },
+        /* LDN Services */
+        {
+          id: 'ldn_services',
+          active: false,
+          parentID: 'coar_notify',
+          visible: isSiteAdmin && isCoarNotifyEnabled,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.services',
+            link: '/admin/ldn/services',
+          } as LinkMenuItemModel,
         },
         {
           id: 'health',
@@ -347,14 +408,49 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.health',
-            link: '/health'
+            link: '/health',
           } as LinkMenuItemModel,
           icon: 'heartbeat',
-          index: 11
+          index: 11,
         },
+        /* Notifications */
+        {
+          id: 'notifications',
+          active: false,
+          visible: canSeeQa || isSiteAdmin,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.notifications',
+          } as TextMenuItemModel,
+          icon: 'bell',
+          index: 4,
+        },
+        {
+          id: 'notifications_quality-assurance',
+          parentID: 'notifications',
+          active: false,
+          visible: canSeeQa,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.quality-assurance',
+            link: '/notifications/quality-assurance',
+          } as LinkMenuItemModel,
+        },
+        {
+          id: 'notifications_publication-claim',
+          parentID: 'notifications',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.notifications_publication-claim',
+            link: '/admin/notifications/' + PUBLICATION_CLAIMS_PATH,
+          } as LinkMenuItemModel,
+        },
+        /*  Admin Search */
       ];
       menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       })));
     });
   }
@@ -409,10 +505,10 @@ export class MenuResolver implements Resolve<boolean> {
 
     observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME)
+      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_EXPORT_SCRIPT_NAME),
     ]).pipe(
       filter(([authorized, metadataExportScriptExists]: boolean[]) => authorized && metadataExportScriptExists),
-      take(1)
+      take(1),
     ).subscribe(() => {
       // Hides the export menu for unauthorised people
       // If in the future more sub-menus are added,
@@ -423,11 +519,11 @@ export class MenuResolver implements Resolve<boolean> {
         visible: true,
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.export'
+          text: 'menu.section.export',
         } as TextMenuItemModel,
         icon: 'file-export',
         index: 3,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'export_metadata',
@@ -439,9 +535,9 @@ export class MenuResolver implements Resolve<boolean> {
           text: 'menu.section.export_metadata',
           function: () => {
             this.modalService.open(ExportMetadataSelectorComponent);
-          }
+          },
         } as OnClickMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'export_batch',
@@ -453,9 +549,9 @@ export class MenuResolver implements Resolve<boolean> {
           text: 'menu.section.export_batch',
           function: () => {
             this.modalService.open(ExportBatchSelectorComponent);
-          }
+          },
         } as OnClickMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
     });
   }
@@ -470,10 +566,10 @@ export class MenuResolver implements Resolve<boolean> {
 
     observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME)
+      this.scriptDataService.scriptWithNameExistsAndCanExecute(METADATA_IMPORT_SCRIPT_NAME),
     ]).pipe(
       filter(([authorized, metadataImportScriptExists]: boolean[]) => authorized && metadataImportScriptExists),
-      take(1)
+      take(1),
     ).subscribe(() => {
       // Hides the import menu for unauthorised people
       // If in the future more sub-menus are added,
@@ -484,7 +580,7 @@ export class MenuResolver implements Resolve<boolean> {
         visible: true,
         model: {
           type: MenuItemType.TEXT,
-          text: 'menu.section.import'
+          text: 'menu.section.import',
         } as TextMenuItemModel,
         icon: 'file-import',
         index: 2,
@@ -498,9 +594,9 @@ export class MenuResolver implements Resolve<boolean> {
         model: {
           type: MenuItemType.LINK,
           text: 'menu.section.import_metadata',
-          link: '/admin/metadata-import'
+          link: '/admin/metadata-import',
         } as LinkMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
       this.menuService.addSection(MenuID.ADMIN, {
         id: 'import_batch',
@@ -510,9 +606,9 @@ export class MenuResolver implements Resolve<boolean> {
         model: {
           type: MenuItemType.LINK,
           text: 'menu.section.import_batch',
-          link: '/admin/batch-import'
+          link: '/admin/batch-import',
         } as LinkMenuItemModel,
-        shouldPersistOnRouteChange: true
+        shouldPersistOnRouteChange: true,
       });
     });
   }
@@ -521,89 +617,101 @@ export class MenuResolver implements Resolve<boolean> {
    * Create menu sections dependent on whether or not the current user is a site administrator
    */
   createSiteAdministratorMenuSections() {
-    this.authorizationService.isAuthorized(FeatureID.AdministratorOf).subscribe((authorized) => {
-      const menuList = [
-        /*  Admin Search */
-        {
-          id: 'admin_search',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.admin_search',
-            link: '/admin/search'
-          } as LinkMenuItemModel,
-          icon: 'search',
-          index: 5
-        },
-        /*  Registries */
-        {
-          id: 'registries',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.TEXT,
-            text: 'menu.section.registries'
-          } as TextMenuItemModel,
-          icon: 'list',
-          index: 6
-        },
-        {
-          id: 'registries_metadata',
-          parentID: 'registries',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.registries_metadata',
-            link: 'admin/registries/metadata'
-          } as LinkMenuItemModel,
-        },
-        {
-          id: 'registries_format',
-          parentID: 'registries',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.registries_format',
-            link: 'admin/registries/bitstream-formats'
-          } as LinkMenuItemModel,
-        },
+    this.authorizationService.isAuthorized(FeatureID.AdministratorOf)
+      .subscribe((authorized) => {
+        const menuList = [
+          {
+            id: 'admin_search',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.admin_search',
+              link: '/admin/search',
+            } as LinkMenuItemModel,
+            icon: 'search',
+            index: 5,
+          },
+          /*  Registries */
+          {
+            id: 'registries',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.TEXT,
+              text: 'menu.section.registries',
+            } as TextMenuItemModel,
+            icon: 'list',
+            index: 6,
+          },
+          {
+            id: 'registries_metadata',
+            parentID: 'registries',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.registries_metadata',
+              link: 'admin/registries/metadata',
+            } as LinkMenuItemModel,
+          },
+          {
+            id: 'registries_format',
+            parentID: 'registries',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.registries_format',
+              link: 'admin/registries/bitstream-formats',
+            } as LinkMenuItemModel,
+          },
 
-        /* Curation tasks */
-        {
-          id: 'curation_tasks',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.curation_task',
-            link: 'admin/curation-tasks'
-          } as LinkMenuItemModel,
-          icon: 'filter',
-          index: 7
-        },
+          /* Curation tasks */
+          {
+            id: 'curation_tasks',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.curation_task',
+              link: 'admin/curation-tasks',
+            } as LinkMenuItemModel,
+            icon: 'filter',
+            index: 7,
+          },
 
-        /* Workflow */
-        {
-          id: 'workflow',
-          active: false,
-          visible: authorized,
-          model: {
-            type: MenuItemType.LINK,
-            text: 'menu.section.workflow',
-            link: '/admin/workflow'
-          } as LinkMenuItemModel,
-          icon: 'user-check',
-          index: 11
-        },
-      ];
+          /* Workflow */
+          {
+            id: 'workflow',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.workflow',
+              link: '/admin/workflow',
+            } as LinkMenuItemModel,
+            icon: 'user-check',
+            index: 11,
+          },
+          {
+            id: 'system_wide_alert',
+            active: false,
+            visible: authorized,
+            model: {
+              type: MenuItemType.LINK,
+              text: 'menu.section.system-wide-alert',
+              link: '/admin/system-wide-alert',
+            } as LinkMenuItemModel,
+            icon: 'exclamation-circle',
+            index: 12,
+          },
+        ];
 
-      menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
-        shouldPersistOnRouteChange: true
-      })));
-    });
+        menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
+          shouldPersistOnRouteChange: true,
+        })));
+      });
   }
 
   /**
@@ -612,7 +720,7 @@ export class MenuResolver implements Resolve<boolean> {
   createAccessControlMenuSections() {
     observableCombineLatest([
       this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
-      this.authorizationService.isAuthorized(FeatureID.CanManageGroups)
+      this.authorizationService.isAuthorized(FeatureID.CanManageGroups),
     ]).subscribe(([isSiteAdmin, canManageGroups]) => {
       const menuList = [
         /* Access Control */
@@ -624,7 +732,7 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_people',
-            link: '/access-control/epeople'
+            link: '/access-control/epeople',
           } as LinkMenuItemModel,
         },
         {
@@ -635,7 +743,18 @@ export class MenuResolver implements Resolve<boolean> {
           model: {
             type: MenuItemType.LINK,
             text: 'menu.section.access_control_groups',
-            link: '/access-control/groups'
+            link: '/access-control/groups',
+          } as LinkMenuItemModel,
+        },
+        {
+          id: 'access_control_bulk',
+          parentID: 'access_control',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.access_control_bulk',
+            link: '/access-control/bulk-access',
           } as LinkMenuItemModel,
         },
         // TODO: enable this menu item once the feature has been implemented
@@ -656,10 +775,66 @@ export class MenuResolver implements Resolve<boolean> {
           visible: canManageGroups || isSiteAdmin,
           model: {
             type: MenuItemType.TEXT,
-            text: 'menu.section.access_control'
+            text: 'menu.section.access_control',
           } as TextMenuItemModel,
           icon: 'key',
-          index: 4
+          index: 4,
+        },
+      ];
+
+      menuList.forEach((menuSection) => this.menuService.addSection(MenuID.ADMIN, Object.assign(menuSection, {
+        shouldPersistOnRouteChange: true,
+      })));
+    });
+  }
+
+  /**
+   * Create menu sections dependent on whether or not the current user is a site administrator
+   */
+  createReportMenuSections() {
+    observableCombineLatest([
+      this.configurationDataService.findByPropertyName('contentreport.enable').pipe(
+        map((res: RemoteData<ConfigurationProperty>) => res.hasSucceeded && res.payload && res.payload.values[0] === 'true'),
+      ),
+      this.authorizationService.isAuthorized(FeatureID.AdministratorOf),
+    ]).subscribe(([isSiteAdmin]) => {
+      const menuList = [
+        {
+          id: 'reports',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.TEXT,
+            text: 'menu.section.reports',
+          } as TextMenuItemModel,
+          icon: 'file-alt',
+          index: 5,
+        },
+        /* Collections Report */
+        {
+          id: 'reports_collections',
+          parentID: 'reports',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.reports.collections',
+            link: '/admin/reports/collections',
+          } as LinkMenuItemModel,
+          icon: 'user-check',
+        },
+        /* Queries Report */
+        {
+          id: 'reports_queries',
+          parentID: 'reports',
+          active: false,
+          visible: isSiteAdmin,
+          model: {
+            type: MenuItemType.LINK,
+            text: 'menu.section.reports.queries',
+            link: '/admin/reports/queries',
+          } as LinkMenuItemModel,
+          icon: 'user-check',
         },
       ];
 
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.html b/src/app/my-dspace-page/collection-selector/collection-selector.component.html
index a87118fc4e..6e2a1925c5 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.html
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.html
@@ -5,7 +5,7 @@
     </button>
   </div>
   <div class="modal-body">
-    <ds-collection-dropdown (selectionChange)="selectObject($event)">
-    </ds-collection-dropdown>
+    <ds-themed-collection-dropdown (selectionChange)="selectObject($event)">
+    </ds-themed-collection-dropdown>
   </div>
 </div>
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
index ce54d326fc..ae0284da17 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.spec.ts
@@ -1,28 +1,44 @@
 /* eslint-disable max-classes-per-file */
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, ElementRef, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  ElementRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-
+import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { getTestScheduler, hot } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { Observable } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { TestScheduler } from 'rxjs/testing';
 
-import { CollectionSelectorComponent } from './collection-selector.component';
-import { CollectionDropdownComponent } from '../../shared/collection-dropdown/collection-dropdown.component';
-import { Collection } from '../../core/shared/collection.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { Community } from '../../core/shared/community.model';
-import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
 import { CollectionDataService } from '../../core/data/collection-data.service';
-import { MockElementRef } from '../../shared/testing/element-ref.mock';
 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 { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { CollectionDropdownComponent } from '../../shared/collection-dropdown/collection-dropdown.component';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { MockElementRef } from '../../shared/testing/element-ref.mock';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FollowLinkConfig } from '../../shared/utils/follow-link-config.model';
+import { CollectionSelectorComponent } from './collection-selector.component';
 
 
 describe('CollectionSelectorComponent', () => {
@@ -34,7 +50,7 @@ describe('CollectionSelectorComponent', () => {
   const community: Community = Object.assign(new Community(), {
     id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-    name: 'Community 1'
+    name: 'Community 1',
   });
 
   const collections: Collection[] = [
@@ -45,9 +61,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 1'
+          value: 'Community 1-Collection 1',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
@@ -56,9 +72,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 2'
+          value: 'Community 1-Collection 2',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
@@ -67,9 +83,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 3'
+          value: 'Community 1-Collection 3',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
@@ -78,9 +94,9 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 4'
+          value: 'Community 1-Collection 4',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
     }),
     Object.assign(new Collection(), {
       id: 'a5159760-f362-4659-9e81-e3253ad91ede',
@@ -89,18 +105,18 @@ describe('CollectionSelectorComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 5'
+          value: 'Community 1-Collection 5',
         }],
-      parentCommunity: createSuccessfulRemoteDataObject$(community)
-    })
+      parentCommunity: createSuccessfulRemoteDataObject$(community),
+    }),
   ];
 
   const collectionDataServiceMock = {
     getAuthorizedCollection(query: string, options: FindListOptions = {}, ...linksToFollow: FollowLinkConfig<Collection>[]): Observable<RemoteData<PaginatedList<Collection>>> {
       return hot( 'a|', {
-        a: createSuccessfulRemoteDataObject(createPaginatedList(collections))
+        a: createSuccessfulRemoteDataObject(createPaginatedList(collections)),
       });
-    }
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -109,29 +125,32 @@ describe('CollectionSelectorComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ CollectionSelectorComponent, CollectionDropdownComponent ],
       providers: [
-        {provide: CollectionDataService, useValue: collectionDataServiceMock},
-        {provide: ElementRef, useClass: MockElementRef},
-        {provide: NgbActiveModal, useValue: modal},
-        {provide: ActivatedRoute, useValue: {}},
-        ChangeDetectorRef
+        { provide: CollectionDataService, useValue: collectionDataServiceMock },
+        { provide: ElementRef, useClass: MockElementRef },
+        { provide: NgbActiveModal, useValue: modal },
+        { provide: ActivatedRoute, useValue: {} },
+        ChangeDetectorRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
     scheduler = getTestScheduler();
-    fixture = TestBed.createComponent(CollectionSelectorComponent);
+    fixture = TestBed.overrideComponent(CollectionSelectorComponent, {
+      set: {
+        template: '<ds-collection-dropdown (selectionChange)="selectObject($event)"></ds-collection-dropdown>',
+      },
+    }).createComponent(CollectionSelectorComponent);
     component = fixture.componentInstance;
     fixture.detectChanges();
-
   });
 
   it('should create', () => {
diff --git a/src/app/my-dspace-page/collection-selector/collection-selector.component.ts b/src/app/my-dspace-page/collection-selector/collection-selector.component.ts
index 855dc9c36d..fd39cea117 100644
--- a/src/app/my-dspace-page/collection-selector/collection-selector.component.ts
+++ b/src/app/my-dspace-page/collection-selector/collection-selector.component.ts
@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { CollectionListEntry } from '../../shared/collection-dropdown/collection-dropdown.component';
@@ -11,7 +10,7 @@ import { CollectionListEntry } from '../../shared/collection-dropdown/collection
 @Component({
   selector: 'ds-collection-selector',
   templateUrl: './collection-selector.component.html',
-  styleUrls: ['./collection-selector.component.scss']
+  styleUrls: ['./collection-selector.component.scss'],
 })
 export class CollectionSelectorComponent {
 
diff --git a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts
index baf2f0b920..c8484d97a0 100644
--- a/src/app/my-dspace-page/my-dspace-configuration-value-type.ts
+++ b/src/app/my-dspace-page/my-dspace-configuration-value-type.ts
@@ -1,4 +1,5 @@
 export enum MyDSpaceConfigurationValueType {
   Workspace = 'workspace',
+  SupervisedItems = 'supervisedWorkspace',
   Workflow = 'workflow'
 }
diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
index b87c77c5e9..e7bc422665 100644
--- a/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-configuration.service.spec.ts
@@ -1,22 +1,24 @@
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
-import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { Context } from '../core/shared/context.model';
+import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock';
+import { RoleServiceMock } from '../shared/mocks/role-service.mock';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
+import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
 import { SearchFilter } from '../shared/search/models/search-filter.model';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
-import { RoleServiceMock } from '../shared/mocks/role-service.mock';
-import { cold, hot } from 'jasmine-marbles';
-import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
-import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
-import { Context } from '../core/shared/context.model';
-import { LinkService } from '../core/cache/builders/link.service';
-import { HALEndpointService } from '../core/shared/hal-endpoint.service';
-import { RequestService } from '../core/data/request.service';
-import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service';
 import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub';
-import { getMockRemoteDataBuildService } from '../shared/mocks/remote-data-build.service.mock';
+import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
+import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
+import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 
 describe('MyDSpaceConfigurationService', () => {
   let service: MyDSpaceConfigurationService;
@@ -24,25 +26,25 @@ describe('MyDSpaceConfigurationService', () => {
   const prefixFilter = {
     'f.namedresourcetype': ['another value'],
     'f.dateSubmitted.min': ['2013'],
-    'f.dateSubmitted.max': ['2018']
+    'f.dateSubmitted.max': ['2018'],
   };
   const defaults = new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 }),
     sort: new SortOptions('score', SortDirection.DESC),
     query: '',
-    scope: ''
+    scope: '',
   });
 
   const backendFilters = [
     new SearchFilter('f.namedresourcetype', ['another value']),
-    new SearchFilter('f.dateSubmitted', ['[2013 TO 2018]'], 'equals')
+    new SearchFilter('f.dateSubmitted', ['[2013 TO 2018]'], 'equals'),
   ];
 
   const spy = jasmine.createSpyObj('RouteService', {
     getQueryParameterValue: observableOf(value1),
     getQueryParamsWithPrefix: observableOf(prefixFilter),
     getRouteParameterValue: observableOf(''),
-    getRouteDataValue: observableOf({})
+    getRouteDataValue: observableOf({}),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -188,8 +190,8 @@ describe('MyDSpaceConfigurationService', () => {
 
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
-          MyDSpaceConfigurationValueType.Workspace
-        ]
+          MyDSpaceConfigurationValueType.Workspace,
+        ],
       }));
     });
 
@@ -202,8 +204,9 @@ describe('MyDSpaceConfigurationService', () => {
 
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.SupervisedItems,
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
     });
 
@@ -216,8 +219,9 @@ describe('MyDSpaceConfigurationService', () => {
 
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.SupervisedItems,
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
     });
 
@@ -231,8 +235,9 @@ describe('MyDSpaceConfigurationService', () => {
       expect(list$).toBeObservable(cold('(b|)', {
         b: [
           MyDSpaceConfigurationValueType.Workspace,
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.SupervisedItems,
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
     });
   });
@@ -243,8 +248,8 @@ describe('MyDSpaceConfigurationService', () => {
       spyOn(service, 'getAvailableConfigurationTypes').and.returnValue(hot('a', {
         a: [
           MyDSpaceConfigurationValueType.Workspace,
-          MyDSpaceConfigurationValueType.Workflow
-        ]
+          MyDSpaceConfigurationValueType.Workflow,
+        ],
       }));
 
       const list$ = service.getAvailableConfigurationOptions();
@@ -254,14 +259,14 @@ describe('MyDSpaceConfigurationService', () => {
           {
             value: MyDSpaceConfigurationValueType.Workspace,
             label: `mydspace.show.${MyDSpaceConfigurationValueType.Workspace}`,
-            context: Context.Workspace
+            context: Context.Workspace,
           },
           {
             value: MyDSpaceConfigurationValueType.Workflow,
             label: `mydspace.show.${MyDSpaceConfigurationValueType.Workflow}`,
-            context: Context.Workflow
-          }
-        ]
+            context: Context.Workflow,
+          },
+        ],
       }));
     });
   });
diff --git a/src/app/my-dspace-page/my-dspace-configuration.service.ts b/src/app/my-dspace-page/my-dspace-configuration.service.ts
index dec8658910..bbc9ba1c33 100644
--- a/src/app/my-dspace-page/my-dspace-configuration.service.ts
+++ b/src/app/my-dspace-page/my-dspace-configuration.service.ts
@@ -1,26 +1,35 @@
 import { Injectable } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
-
-import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
+import { LinkService } from '../core/cache/builders/link.service';
+import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { RequestService } from '../core/data/request.service';
+import { PaginationService } from '../core/pagination/pagination.service';
 import { RoleService } from '../core/roles/role.service';
-import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { RouteService } from '../core/services/route.service';
+import { Context } from '../core/shared/context.model';
+import { HALEndpointService } from '../core/shared/hal-endpoint.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { RouteService } from '../core/services/route.service';
-import { PaginationService } from '../core/pagination/pagination.service';
-import { LinkService } from '../core/cache/builders/link.service';
-import { HALEndpointService } from '../core/shared/hal-endpoint.service';
-import { RequestService } from '../core/data/request.service';
-import { RemoteDataBuildService } from '../core/cache/builders/remote-data-build.service';
-import { Context } from '../core/shared/context.model';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 
 export const MyDSpaceConfigurationToContextMap = new Map([
   [MyDSpaceConfigurationValueType.Workspace, Context.Workspace],
-  [MyDSpaceConfigurationValueType.Workflow, Context.Workflow]
+  [MyDSpaceConfigurationValueType.SupervisedItems, Context.SupervisedItems],
+  [MyDSpaceConfigurationValueType.Workflow, Context.Workflow],
 ]);
 
 
@@ -35,7 +44,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
   protected defaultPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'mydspace-page',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   /**
@@ -109,6 +118,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
           availableConf.push(MyDSpaceConfigurationValueType.Workspace);
         }
         if (isController || isAdmin) {
+          availableConf.push(MyDSpaceConfigurationValueType.SupervisedItems);
           availableConf.push(MyDSpaceConfigurationValueType.Workflow);
         }
         return availableConf;
@@ -133,7 +143,7 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
           configurationOptions.push({ value, label, context });
         });
         return configurationOptions;
-      })
+      }),
     );
   }
 
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..0157110035 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)"
+  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
+    <button class="btn btn-lg btn-outline-primary mt-1 ml-2"
+            [attr.aria-label]="'mydspace.new-submission-external' | translate" [disabled]="(initialized$ | async) !== true"
             (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" [disabled]="(initialized$ | async) !== true"
+            [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-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
index 86d99fb841..ec7608f8d7 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.spec.ts
@@ -1,19 +1,32 @@
-import { Component, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
+import {
+  Component,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
-import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
+
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { RouterStub } from '../../../shared/testing/router.stub';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../../shared/testing/utils.test';
+import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-external-dropdown.component';
 
 export function getMockEntityTypeService(): EntityTypeDataService {
   const pageInfo = { elementsPerPage: 20, totalElements: 4, totalPages: 1, currentPage: 0 } as PageInfo;
@@ -22,26 +35,26 @@ export function getMockEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type2: ItemType = {
     id: '2',
     label: 'Journal',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type3: ItemType = {
     id: '2',
     label: 'DataPackage',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1, type2, type3]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipTypeImport: rd$,
-    hasMoreThanOneAuthorizedImport: observableOf(true)
+    hasMoreThanOneAuthorizedImport: observableOf(true),
   });
 }
 
@@ -52,12 +65,12 @@ export function getMockEmptyEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipTypeImport: rd$,
-    hasMoreThanOneAuthorizedImport: observableOf(false)
+    hasMoreThanOneAuthorizedImport: observableOf(false),
   });
 }
 
@@ -72,7 +85,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
 
   describe('With only one Entity', () => {
@@ -85,14 +98,14 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
         declarations: [
           MyDSpaceNewExternalDropdownComponent,
           TestComponent,
-          BrowserOnlyMockPipe
+          BrowserOnlyMockPipe,
         ],
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
-          MyDSpaceNewExternalDropdownComponent
+          MyDSpaceNewExternalDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -142,9 +155,9 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: Router, useValue: new RouterStub() },
-          MyDSpaceNewExternalDropdownComponent
+          MyDSpaceNewExternalDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -183,7 +196,7 @@ describe('MyDSpaceNewExternalDropdownComponent test', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
index 53beb746a1..2c2a77da48 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.ts
@@ -1,15 +1,26 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
+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 { ItemType } from '../../../core/shared/item-relationships/item-type.model';
 import { hasValue } from '../../../shared/empty.util';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
 
 /**
  * This component represents the 'Import metadata from external source' dropdown menu
@@ -17,7 +28,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 @Component({
   selector: 'ds-my-dspace-new-external-dropdown',
   styleUrls: ['./my-dspace-new-external-dropdown.component.scss'],
-  templateUrl: './my-dspace-new-external-dropdown.component.html'
+  templateUrl: './my-dspace-new-external-dropdown.component.html',
 })
 export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
 
@@ -67,24 +78,24 @@ export class MyDSpaceNewExternalDropdownComponent implements OnInit, OnDestroy {
         if (!response) {
           const findListOptions: FindListOptions = {
             elementsPerPage: 1,
-            currentPage: 1
+            currentPage: 1,
           };
           return this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findListOptions).pipe(
             map((entities: RemoteData<PaginatedList<ItemType>>) => {
               this.initialized$ = observableOf(true);
               return entities.payload.page[0];
             }),
-            take(1)
+            take(1),
           );
         } else {
           this.initialized$ = observableOf(true);
           return observableOf(null);
         }
       }),
-      take(1)
+      take(1),
     );
     this.subs.push(
-      this.singleEntity$.subscribe((result) => this.singleEntity = result )
+      this.singleEntity$.subscribe((result) => this.singleEntity = result ),
     );
   }
 
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..730b1db1c7 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">
+  <div class="add" *ngIf="(moreThanOne$ | async) !== true">
+    <button class="btn btn-lg btn-primary mt-1 ml-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+            [disabled]="(initialized$ | async) !== true" (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"  [disabled]="(initialized$ | async) !== true"
+            [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/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
index 1ad8e6c0c3..bd150c12b6 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec.ts
@@ -1,18 +1,31 @@
-import { Component, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  Component,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { createPaginatedList, createTestComponent } from '../../../shared/testing/utils.test';
-import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
+
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
 import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 import { ResourceType } from '../../../core/shared/resource-type';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { PageInfo } from '../../../core/shared/page-info.model';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../../shared/testing/utils.test';
+import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission-dropdown.component';
 
 export function getMockEntityTypeService(): EntityTypeDataService {
   const type1: ItemType = {
@@ -20,26 +33,26 @@ export function getMockEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type2: ItemType = {
     id: '2',
     label: 'Journal',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const type3: ItemType = {
     id: '2',
     label: 'DataPackage',
     uuid: '2',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1, type2, type3]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipType: rd$,
-    hasMoreThanOneAuthorized: observableOf(true)
+    hasMoreThanOneAuthorized: observableOf(true),
   });
 }
 
@@ -50,12 +63,12 @@ export function getMockEmptyEntityTypeService(): EntityTypeDataService {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
   const rd$ = createSuccessfulRemoteDataObject$(createPaginatedList([type1]));
   return jasmine.createSpyObj('entityTypeService', {
     getAllAuthorizedRelationshipType: rd$,
-    hasMoreThanOneAuthorized: observableOf(false)
+    hasMoreThanOneAuthorized: observableOf(false),
   });
 }
 
@@ -70,13 +83,13 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
     label: 'Publication',
     uuid: '1',
     type: new ResourceType('entitytype'),
-    _links: undefined
+    _links: undefined,
   };
 
   const modalStub = {
     open: () => null,
     close: () => null,
-    dismiss: () => null
+    dismiss: () => null,
   };
 
   describe('With only one Entity', () => {
@@ -94,9 +107,9 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEmptyEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
-          MyDSpaceNewSubmissionDropdownComponent
+          MyDSpaceNewSubmissionDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -146,9 +159,9 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
         providers: [
           { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
           { provide: NgbModal, useValue: modalStub },
-          MyDSpaceNewSubmissionDropdownComponent
+          MyDSpaceNewSubmissionDropdownComponent,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
 
       const html = `<ds-my-dspace-new-submission (uploadEnd)="reload($event)"></ds-my-dspace-new-submission>`;
@@ -188,7 +201,7 @@ describe('MyDSpaceNewSubmissionDropdownComponent test', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   reload = (event) => {
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
index 133086c08b..4283ab89af 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.ts
@@ -1,16 +1,27 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { map, mergeMap, take } from 'rxjs/operators';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
 import { EntityTypeDataService } from '../../../core/data/entity-type-data.service';
-import { ItemType } from '../../../core/shared/item-relationships/item-type.model';
-import { hasValue } from '../../../shared/empty.util';
-import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
 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 { ItemType } from '../../../core/shared/item-relationships/item-type.model';
+import { CreateItemParentSelectorComponent } from '../../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component represents the new submission dropdown
@@ -18,7 +29,7 @@ import { FindListOptions } from '../../../core/data/find-list-options.model';
 @Component({
   selector: 'ds-my-dspace-new-submission-dropdown',
   styleUrls: ['./my-dspace-new-submission-dropdown.component.scss'],
-  templateUrl: './my-dspace-new-submission-dropdown.component.html'
+  templateUrl: './my-dspace-new-submission-dropdown.component.html',
 })
 export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy {
 
@@ -68,24 +79,24 @@ export class MyDSpaceNewSubmissionDropdownComponent implements OnInit, OnDestroy
         if (!response) {
           const findListOptions: FindListOptions = {
             elementsPerPage: 1,
-            currentPage: 1
+            currentPage: 1,
           };
           return this.entityTypeService.getAllAuthorizedRelationshipType(findListOptions).pipe(
             map((entities: RemoteData<PaginatedList<ItemType>>) => {
               this.initialized$ = observableOf(true);
               return entities.payload.page[0];
             }),
-            take(1)
+            take(1),
           );
         } else {
           this.initialized$ = observableOf(true);
           return observableOf(null);
         }
       }),
-      take(1)
+      take(1),
     );
     this.subs.push(
-      this.singleEntity$.subscribe((result) => this.singleEntity = result )
+      this.singleEntity$.subscribe((result) => this.singleEntity = result ),
     );
   }
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
index fb43c253eb..436a290bfe 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.spec.ts
@@ -1,38 +1,52 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createTestComponent } from '../../shared/testing/utils.test';
-import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
-import { UploaderService } from '../../shared/uploader/uploader.service';
-import { HostWindowService } from '../../shared/host-window.service';
-import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { UploaderComponent } from '../../shared/uploader/uploader.component';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { DragService } from '../../core/drag.service';
 import { CookieService } from '../../core/services/cookie.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { HostWindowService } from '../../shared/host-window.service';
 import { CookieServiceMock } from '../../shared/mocks/cookie.service.mock';
 import { HttpXsrfTokenExtractorMock } from '../../shared/mocks/http-xsrf-token-extractor.mock';
+import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { createTestComponent } from '../../shared/testing/utils.test';
+import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
+import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission.component';
 import { getMockEntityTypeService } from './my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.spec';
-import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
 
 describe('MyDSpaceNewSubmissionComponent test', () => {
 
   const uploader: any = jasmine.createSpyObj('uploader', {
     clearQueue: jasmine.createSpy('clearQueue').and.stub(),
     onBuildItemForm: jasmine.createSpy('onBuildItemForm').and.stub(),
-    uploadAll: jasmine.createSpy('uploadAll').and.stub()
+    uploadAll: jasmine.createSpy('uploadAll').and.stub(),
   });
 
   beforeEach(waitForAsync(() => {
@@ -41,15 +55,15 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         NgbModule,
-        RouterTestingModule
+        RouterTestingModule,
       ],
       declarations: [
         MyDSpaceNewSubmissionComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -59,13 +73,13 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
         NgbModal,
         ChangeDetectorRef,
         MyDSpaceNewSubmissionComponent,
-        UploaderService,
+        DragService,
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') },
         { provide: CookieService, useValue: new CookieServiceMock() },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
         { provide: EntityTypeDataService, useValue: getMockEntityTypeService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -118,7 +132,7 @@ describe('MyDSpaceNewSubmissionComponent test', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
index b2ba6fe2af..953e3c6707 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission.component.ts
@@ -1,21 +1,28 @@
-import { ChangeDetectorRef, Component, EventEmitter, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
 import { Subscription } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 import { AuthService } from '../../core/auth/auth.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { hasValue } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SearchResult } from '../../shared/search/models/search-result.model';
+import { UploaderComponent } from '../../shared/upload/uploader/uploader.component';
+import { UploaderError } from '../../shared/upload/uploader/uploader-error.model';
+import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
 import { CollectionSelectorComponent } from '../collection-selector/collection-selector.component';
-import { UploaderComponent } from '../../shared/uploader/uploader.component';
-import { UploaderError } from '../../shared/uploader/uploader-error.model';
-import { Router } from '@angular/router';
 
 /**
  * This component represents the whole mydspace page header
@@ -23,7 +30,7 @@ import { Router } from '@angular/router';
 @Component({
   selector: 'ds-my-dspace-new-submission',
   styleUrls: ['./my-dspace-new-submission.component.scss'],
-  templateUrl: './my-dspace-new-submission.component.html'
+  templateUrl: './my-dspace-new-submission.component.html',
 })
 export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
   /**
@@ -72,10 +79,10 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
   ngOnInit() {
     this.uploadFilesOptions.autoUpload = false;
     this.sub = this.halService.getEndpoint('workspaceitems').pipe(first()).subscribe((url) => {
-        this.uploadFilesOptions.url = url;
-        this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
-        this.changeDetectorRef.detectChanges();
-      }
+      this.uploadFilesOptions.url = url;
+      this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+      this.changeDetectorRef.detectChanges();
+    },
     );
   }
 
@@ -92,7 +99,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
         // To avoid confusion and ambiguity, redirect the user on the publication page.
         this.router.navigateByUrl(link);
       } else if (workspaceitems.length > 1) {
-        this.notificationsService.success(null, this.translate.get('mydspace.upload.upload-multiple-successful', {qty: workspaceitems.length}));
+        this.notificationsService.success(null, this.translate.get('mydspace.upload.upload-multiple-successful', { qty: workspaceitems.length }));
       }
 
     } else {
diff --git a/src/app/my-dspace-page/my-dspace-page-routing.module.ts b/src/app/my-dspace-page/my-dspace-page-routing.module.ts
index 6894194344..3c970c7c2a 100644
--- a/src/app/my-dspace-page/my-dspace-page-routing.module.ts
+++ b/src/app/my-dspace-page/my-dspace-page-routing.module.ts
@@ -1,8 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { MyDSpaceGuard } from './my-dspace.guard';
 import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 
 @NgModule({
   imports: [
@@ -11,15 +12,15 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         path: '',
         component: ThemedMyDSpacePageComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: { title: 'mydspace.title', breadcrumbKey: 'mydspace' },
         canActivate: [
-          MyDSpaceGuard
-        ]
-      }
-    ])
-  ]
+          MyDSpaceGuard,
+        ],
+      },
+    ]),
+  ],
 })
 /**
  * This module defines the default component to load when navigating to the mydspace page path.
diff --git a/src/app/my-dspace-page/my-dspace-page.component.html b/src/app/my-dspace-page/my-dspace-page.component.html
index ea5784170f..cfae8e07a8 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.html
+++ b/src/app/my-dspace-page/my-dspace-page.component.html
@@ -1,4 +1,6 @@
 <div class="container">
+  <ds-suggestions-notification></ds-suggestions-notification>
+  <ds-my-dspace-qa-events-notifications></ds-my-dspace-qa-events-notifications>
   <ds-my-dspace-new-submission *dsShowOnlyForRole="[roleTypeEnum.Submitter]"></ds-my-dspace-new-submission>
 </div>
 
diff --git a/src/app/my-dspace-page/my-dspace-page.component.spec.ts b/src/app/my-dspace-page/my-dspace-page.component.spec.ts
index 34bf20d462..d6bcdc3654 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.spec.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.spec.ts
@@ -1,18 +1,26 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { ComponentFixture, fakeAsync, flush, TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-
-import { of as observableOf } from 'rxjs';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE } from './my-dspace-page.component';
+import { Context } from '../core/shared/context.model';
 import { SearchService } from '../core/shared/search/search.service';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
 import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
-import { Context } from '../core/shared/context.model';
+import {
+  MyDSpacePageComponent,
+  SEARCH_CONFIG_SERVICE,
+} from './my-dspace-page.component';
 import SpyObj = jasmine.SpyObj;
 
 describe('MyDSpacePageComponent', () => {
@@ -20,24 +28,24 @@ describe('MyDSpacePageComponent', () => {
   let fixture: ComponentFixture<MyDSpacePageComponent>;
 
   const searchServiceStub: SpyObj<SearchService> = jasmine.createSpyObj('SearchService', {
-    setServiceOptions: jasmine.createSpy('setServiceOptions')
+    setServiceOptions: jasmine.createSpy('setServiceOptions'),
   });
 
   const myDSpaceConfigurationServiceStub: SpyObj<MyDSpaceConfigurationService> = jasmine.createSpyObj('MyDSpaceConfigurationService', {
-    getAvailableConfigurationOptions: jasmine.createSpy('getAvailableConfigurationOptions')
+    getAvailableConfigurationOptions: jasmine.createSpy('getAvailableConfigurationOptions'),
   });
 
   const configurationList = [
     {
       value: MyDSpaceConfigurationValueType.Workspace,
       label: `mydspace.show.${MyDSpaceConfigurationValueType.Workspace}`,
-      context: Context.Workspace
+      context: Context.Workspace,
     },
     {
       value: MyDSpaceConfigurationValueType.Workflow,
       label: `mydspace.show.${MyDSpaceConfigurationValueType.Workflow}`,
-      context: Context.Workflow
-    }
+      context: Context.Workflow,
+    },
   ];
 
   beforeEach(waitForAsync(() => {
@@ -48,16 +56,16 @@ describe('MyDSpacePageComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: MyDSpaceConfigurationService, useValue: myDSpaceConfigurationServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MyDSpacePageComponent, {
       set: {
         providers: [
           {
             provide: SEARCH_CONFIG_SERVICE,
-            useValue: myDSpaceConfigurationServiceStub
-          }
-        ]
-      }
+            useValue: myDSpaceConfigurationServiceStub,
+          },
+        ],
+      },
     }).compileComponents();
   }));
 
@@ -77,7 +85,7 @@ describe('MyDSpacePageComponent', () => {
   it('should init properly context and configuration', fakeAsync(() => {
 
     expect(comp.configurationList$).toBeObservable(cold('(a|)', {
-      a: configurationList
+      a: configurationList,
     }));
 
     flush();
diff --git a/src/app/my-dspace-page/my-dspace-page.component.ts b/src/app/my-dspace-page/my-dspace-page.component.ts
index c5176ef29e..4c12104812 100644
--- a/src/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,16 +1,22 @@
-import { ChangeDetectionStrategy, Component, Inject, InjectionToken, OnInit } from '@angular/core';
-
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+  InjectionToken,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { SearchService } from '../core/shared/search/search.service';
+
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
-import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
-import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { ViewMode } from '../core/shared/view-mode.model';
 import { MyDSpaceRequest } from '../core/data/request.models';
-import { Context } from '../core/shared/context.model';
 import { RoleType } from '../core/roles/role-types';
+import { Context } from '../core/shared/context.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { ViewMode } from '../core/shared/view-mode.model';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
 
 export const MYDSPACE_ROUTE = '/mydspace';
 export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> = new InjectionToken<SearchConfigurationService>('searchConfigurationService');
@@ -26,9 +32,9 @@ export const SEARCH_CONFIG_SERVICE: InjectionToken<SearchConfigurationService> =
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: MyDSpaceConfigurationService
-    }
-  ]
+      useClass: MyDSpaceConfigurationService,
+    },
+  ],
 })
 export class MyDSpacePageComponent implements OnInit {
 
diff --git a/src/app/my-dspace-page/my-dspace-page.module.ts b/src/app/my-dspace-page/my-dspace-page.module.ts
index 2ccddd87f7..2e7afce9ce 100644
--- a/src/app/my-dspace-page/my-dspace-page.module.ts
+++ b/src/app/my-dspace-page/my-dspace-page.module.ts
@@ -1,19 +1,21 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SearchModule } from '../shared/search/search.module';
 import { SharedModule } from '../shared/shared.module';
-
-import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
-import { MyDSpacePageComponent } from './my-dspace-page.component';
-import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
+import { UploadModule } from '../shared/upload/upload.module';
+import { CollectionSelectorComponent } from './collection-selector/collection-selector.component';
 import { MyDSpaceGuard } from './my-dspace.guard';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { CollectionSelectorComponent } from './collection-selector/collection-selector.component';
-import { MyDspaceSearchModule } from './my-dspace-search.module';
-import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
 import { MyDSpaceNewExternalDropdownComponent } from './my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component';
+import { MyDSpaceNewSubmissionComponent } from './my-dspace-new-submission/my-dspace-new-submission.component';
+import { MyDSpaceNewSubmissionDropdownComponent } from './my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component';
+import { MyDSpacePageComponent } from './my-dspace-page.component';
+import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
+import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component';
+import { MyDspaceSearchModule } from './my-dspace-search.module';
 import { ThemedMyDSpacePageComponent } from './themed-my-dspace-page.component';
-import { SearchModule } from '../shared/search/search.module';
 
 const DECLARATIONS = [
   MyDSpacePageComponent,
@@ -21,7 +23,8 @@ const DECLARATIONS = [
   MyDSpaceNewSubmissionComponent,
   CollectionSelectorComponent,
   MyDSpaceNewSubmissionDropdownComponent,
-  MyDSpaceNewExternalDropdownComponent
+  MyDSpaceNewExternalDropdownComponent,
+  MyDspaceQaEventsNotificationsComponent,
 ];
 
 @NgModule({
@@ -30,12 +33,14 @@ const DECLARATIONS = [
     SharedModule,
     SearchModule,
     MyDspacePageRoutingModule,
-    MyDspaceSearchModule.withEntryComponents()
+    MyDspaceSearchModule.withEntryComponents(),
+    UploadModule,
+    NotificationsModule,
   ],
   declarations: DECLARATIONS,
   providers: [
     MyDSpaceGuard,
-    MyDSpaceConfigurationService
+    MyDSpaceConfigurationService,
   ],
   exports: DECLARATIONS,
 })
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
new file mode 100644
index 0000000000..e44d2c6e48
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -0,0 +1,29 @@
+<ng-container *ngIf="(sources$ | async)?.length > 0">
+  <ng-container *ngFor="let source of sources$ | async">
+    <div
+      class="alert alert-info d-flex flex-row"
+      *ngIf="source.totalEvents > 0"
+    >
+    <div class="source-logo-container">
+      <img
+        class="source-logo"
+        src="assets/images/qa-{{ source.id }}-logo.png"
+        onerror="this.src='assets/images/dspace-logo.svg'"
+        alt="{{ source.id }} logo"
+      />
+    </div>
+      <div class="w-100 d-flex justify-content-between">
+        <div class="pl-4 align-self-center">
+          {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
+        </div>
+        <button
+          [routerLink]="[getQualityAssuranceRoute(), source.id]"
+          [queryParams]="{ forward: true }"
+          class="btn btn-primary align-self-center"
+        >
+          {{ "mydspace.qa-event-notification-info.check.button" | translate }}
+        </button>
+      </div>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss
new file mode 100644
index 0000000000..2a62342b7c
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.scss
@@ -0,0 +1,13 @@
+.source-logo {
+  max-height: var(--ds-header-logo-height);
+}
+
+.source-logo-container {
+  width: var(--ds-qa-logo-width);
+  display: flex;
+  justify-content: center;
+}
+
+.sections-gap {
+  gap: 1rem;
+}
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts
new file mode 100644
index 0000000000..8f059718a4
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model';
+import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+import { createPaginatedList } from 'src/app/shared/testing/utils.test';
+
+import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { MyDspaceQaEventsNotificationsComponent } from './my-dspace-qa-events-notifications.component';
+
+describe('MyDspaceQaEventsNotificationsComponent', () => {
+  let component: MyDspaceQaEventsNotificationsComponent;
+  let fixture: ComponentFixture<MyDspaceQaEventsNotificationsComponent>;
+
+  let qualityAssuranceSourceDataServiceStub: any;
+  const obj = createSuccessfulRemoteDataObject$(createPaginatedList([new QualityAssuranceSourceObject()]));
+
+  beforeEach(async () => {
+    qualityAssuranceSourceDataServiceStub = {
+      getSources: () => obj,
+    };
+    await TestBed.configureTestingModule({
+      declarations: [ MyDspaceQaEventsNotificationsComponent ],
+      providers: [
+        { provide: QualityAssuranceSourceDataService, useValue: qualityAssuranceSourceDataServiceStub },
+      ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(MyDspaceQaEventsNotificationsComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
new file mode 100644
index 0000000000..625265c683
--- /dev/null
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.ts
@@ -0,0 +1,66 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  of,
+  tap,
+} from 'rxjs';
+import { QualityAssuranceSourceObject } from 'src/app/core/notifications/qa/models/quality-assurance-source.model';
+
+import { getNotificatioQualityAssuranceRoute } from '../../admin/admin-routing-paths';
+import { QualityAssuranceSourceDataService } from '../../core/notifications/qa/source/quality-assurance-source-data.service';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+
+@Component({
+  selector: 'ds-my-dspace-qa-events-notifications',
+  templateUrl: './my-dspace-qa-events-notifications.component.html',
+  styleUrls: ['./my-dspace-qa-events-notifications.component.scss'],
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class MyDspaceQaEventsNotificationsComponent  implements OnInit {
+
+  /**
+   * An Observable that emits an array of QualityAssuranceSourceObject.
+   */
+  sources$: Observable<QualityAssuranceSourceObject[]> = of([]);
+
+  constructor(private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService) { }
+
+  ngOnInit(): void {
+    this.getSources();
+  }
+
+  /**
+   * Retrieves the sources for Quality Assurance.
+   * @returns An Observable of the sources for Quality Assurance.
+   * @throws An error if the retrieval of Quality Assurance sources fails.
+   */
+  getSources() {
+    this.sources$ = this.qualityAssuranceSourceDataService.getSources()
+      .pipe(
+        getFirstCompletedRemoteData(),
+        tap((rd) => {
+          if (rd.hasFailed) {
+            throw new Error('Can\'t retrieve Quality Assurance sources');
+          }
+        }),
+        getRemoteDataPayload(),
+        getPaginatedListPayload(),
+      );
+  }
+
+  /**
+   * Retrieves the quality assurance route.
+   * @returns The quality assurance route.
+   */
+  getQualityAssuranceRoute(): string {
+    return getNotificatioQualityAssuranceRoute();
+  }
+}
diff --git a/src/app/my-dspace-page/my-dspace-search.module.ts b/src/app/my-dspace-page/my-dspace-search.module.ts
index a0fa76fafa..066f144237 100644
--- a/src/app/my-dspace-page/my-dspace-search.module.ts
+++ b/src/app/my-dspace-page/my-dspace-search.module.ts
@@ -1,37 +1,55 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 
-import { SharedModule } from '../shared/shared.module';
-
-import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
-import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
-import { ClaimedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component';
-import { PoolSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
-import { ItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
-import { WorkspaceItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component';
-import { WorkflowItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
+import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
+import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { MyDSpaceActionsModule } from '../shared/mydspace-actions/mydspace-actions.module';
+import { ItemCollectionComponent } from '../shared/object-collection/shared/mydspace-item-collection/item-collection.component';
+import { ItemSubmitterComponent } from '../shared/object-collection/shared/mydspace-item-submitter/item-submitter.component';
 import { ClaimedTaskSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component';
-import { ItemSearchResultListElementSubmissionComponent } from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
-import { WorkflowItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
+import { ItemDetailPreviewComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
+import { ItemDetailPreviewFieldComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
+import { ItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component';
 import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component';
+import { WorkflowItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component';
+import { WorkspaceItemSearchResultDetailElementComponent } from '../shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component';
 import { ClaimedApprovedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component';
 import { ClaimedDeclinedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component';
-import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
+import { ClaimedDeclinedTaskSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component';
+import { ClaimedSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component';
+import { ItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
+import { ThemedItemListPreviewComponent } from '../shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
+import { ItemSearchResultListElementSubmissionComponent } from '../shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component';
+import { PoolSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component';
+import { WorkflowItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component';
+import { WorkspaceItemSearchResultListElementComponent } from '../shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component';
+import { SharedModule } from '../shared/shared.module';
+import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
 
 const ENTRY_COMPONENTS = [
-  // put only entry components that use custom decorator
   WorkspaceItemSearchResultListElementComponent,
   WorkflowItemSearchResultListElementComponent,
   ClaimedSearchResultListElementComponent,
   ClaimedApprovedSearchResultListElementComponent,
   ClaimedDeclinedSearchResultListElementComponent,
+  ClaimedDeclinedTaskSearchResultListElementComponent,
   PoolSearchResultListElementComponent,
   ItemSearchResultDetailElementComponent,
   WorkspaceItemSearchResultDetailElementComponent,
   WorkflowItemSearchResultDetailElementComponent,
   ClaimedTaskSearchResultDetailElementComponent,
   PoolSearchResultDetailElementComponent,
-  ItemSearchResultListElementSubmissionComponent
+  ItemSearchResultListElementSubmissionComponent,
+];
+
+const DECLARATIONS = [
+  ...ENTRY_COMPONENTS,
+  ItemSubmitterComponent,
+  ItemCollectionComponent,
+  ItemDetailPreviewComponent,
+  ItemDetailPreviewFieldComponent,
+  ItemListPreviewComponent,
+  ThemedItemListPreviewComponent,
 ];
 
 @NgModule({
@@ -39,11 +57,13 @@ const ENTRY_COMPONENTS = [
     CommonModule,
     SharedModule,
     MyDspacePageRoutingModule,
-    ResearchEntitiesModule.withEntryComponents()
+    MyDSpaceActionsModule,
+    ResearchEntitiesModule.withEntryComponents(),
+    JournalEntitiesModule.withEntryComponents(),
   ],
   declarations: [
-    ...ENTRY_COMPONENTS
-  ]
+    ...DECLARATIONS,
+  ],
 })
 
 /**
@@ -57,7 +77,7 @@ export class MyDspaceSearchModule {
   static withEntryComponents() {
     return {
       ngModule: MyDspaceSearchModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/my-dspace-page/my-dspace.guard.ts b/src/app/my-dspace-page/my-dspace.guard.ts
index 9cb9aff485..efc4244a86 100644
--- a/src/app/my-dspace-page/my-dspace.guard.ts
+++ b/src/app/my-dspace-page/my-dspace.guard.ts
@@ -1,12 +1,21 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, NavigationExtras, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  NavigationExtras,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
 import { isEmpty } from '../shared/empty.util';
-import { MYDSPACE_ROUTE } from './my-dspace-page.component';
-import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
+import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
+import { MYDSPACE_ROUTE } from './my-dspace-page.component';
 
 /**
  * Prevent unauthorized activating and loading of mydspace configuration
@@ -45,7 +54,7 @@ export class MyDSpaceGuard implements CanActivate {
     if (isEmpty(configuration) || !configurationList.includes(configuration as MyDSpaceConfigurationValueType)) {
       // If configuration param is empty or is not included in available configurations redirect to a default configuration value
       const navigationExtras: NavigationExtras = {
-        queryParams: {configuration: configurationDefault}
+        queryParams: { configuration: configurationDefault },
       };
 
       this.router.navigate([MYDSPACE_ROUTE], navigationExtras);
diff --git a/src/app/my-dspace-page/themed-my-dspace-page.component.ts b/src/app/my-dspace-page/themed-my-dspace-page.component.ts
index 2c74da052e..4a756abab7 100644
--- a/src/app/my-dspace-page/themed-my-dspace-page.component.ts
+++ b/src/app/my-dspace-page/themed-my-dspace-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { MyDSpacePageComponent } from './my-dspace-page.component';
 
@@ -8,10 +9,9 @@ import { MyDSpacePageComponent } from './my-dspace-page.component';
 @Component({
   selector: 'ds-themed-my-dspace-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedMyDSpacePageComponent extends ThemedComponent<MyDSpacePageComponent> {
-  protected inAndOutputNames: (keyof MyDSpacePageComponent & keyof this)[];
 
   protected getComponentName(): string {
     return 'MyDSpacePageComponent';
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 d8a517dc55..00752e7c04 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,21 +1,36 @@
-<div class="nav-item dropdown expandable-navbar-section"
-    *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"
-       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, isActive)"
+    (mouseleave)="onMouseLeave($event, isActive)"
+    data-test="navbar-section-wrapper"
+    *ngVar="(active | async) as isActive">
+    <a href="javascript:void(0);" routerLinkActive="active"
+       role="menuitem"
+       (keyup.enter)="toggleSection($event)"
+       (keyup.space)="toggleSection($event)"
+       (click)="toggleSection($event)"
+       (keydown.space)="$event.preventDefault()"
+       aria-haspopup="menu"
+       data-test="navbar-section-toggler"
+       [attr.aria-expanded]="isActive"
+       [attr.aria-controls]="expandableNavbarSectionId(section.id)"
+       class="d-flex flex-row flex-nowrap align-items-center gapx-1 ds-menu-toggler-wrapper"
+       [class.disabled]="section.model?.disabled"
+       id="browseDropdown">
+      <span class="flex-fill">
         <ng-container
-                *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+          *ngComponentOutlet="(sectionMap$ | async).get(section.id).component; injector: (sectionMap$ | async).get(section.id).injector;"></ng-container>
+<!--        <span class="sr-only">{{'nav.expandable-navbar-section-suffix' | translate}}</span>-->
+      </span>
+      <i class="fas fa-caret-down fa-xs toggle-menu-icon" aria-hidden="true"></i>
     </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)">
+    <div @slide *ngIf="isActive" (click)="deactivateSection($event)"
+        [id]="expandableNavbarSectionId(section.id)"
+        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 *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>
-        </ng-container>
-    </ul>
+        </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 8059a4b027..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,25 +1,24 @@
-.dropdown-menu {
+:host {
+  .ds-menu-item-wrapper {
+    position: relative; // align dropdown menu with respect to this element
+  }
+
+  .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..ee7732e4f1 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,19 @@
-import { ComponentFixture, TestBed, waitForAsync } 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 {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
+
 import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
 import { VarDirective } from '../../shared/utils/var.directive';
+import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
 
 describe('ExpandableNavbarSectionComponent', () => {
   let component: ExpandableNavbarSectionComponent;
@@ -24,12 +28,12 @@ describe('ExpandableNavbarSectionComponent', () => {
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
-          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }
-        ]
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+        ],
       }).overrideComponent(ExpandableNavbarSectionComponent, {
         set: {
-          entryComponents: [TestComponent]
-        }
+          entryComponents: [TestComponent],
+        },
       })
         .compileComponents();
     }));
@@ -47,120 +51,138 @@ describe('ExpandableNavbarSectionComponent', () => {
       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)', () => {
       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.space) action used in our component HTML
         sidebarToggler.nativeElement.dispatchEvent(new KeyboardEvent('keyup', { key: ' ' }));
       });
 
-      it('should call activateSection on the menuService', () => {
-        expect(menuService.activateSection).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 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();
-      });
-    });
-
-    describe('when a click occurs on the section header', () => {
-      beforeEach(() => {
-        spyOn(menuService, 'toggleActiveSection');
-        const sidebarToggler = fixture.debugElement.query(By.css('div.nav-item.dropdown > a'));
-        sidebarToggler.triggerEventHandler('click', {
-          preventDefault: () => {/**/
-          }
-        });
-      });
-
-      it('should not call toggleActiveSection on the menuService', () => {
-        expect(menuService.toggleActiveSection).not.toHaveBeenCalled();
+      it('should call toggleSection on the menuService', () => {
+        expect(component.toggleSection).toHaveBeenCalled();
+        expect(menuService.toggleActiveSection).toHaveBeenCalled();
       });
     });
   });
@@ -173,12 +195,12 @@ describe('ExpandableNavbarSectionComponent', () => {
         providers: [
           { provide: 'sectionDataProvider', useValue: {} },
           { provide: MenuService, useValue: menuService },
-          { provide: HostWindowService, useValue: new HostWindowServiceStub(300) }
-        ]
+          { provide: HostWindowService, useValue: new HostWindowServiceStub(300) },
+        ],
       }).overrideComponent(ExpandableNavbarSectionComponent, {
         set: {
-          entryComponents: [TestComponent]
-        }
+          entryComponents: [TestComponent],
+        },
       })
         .compileComponents();
     }));
@@ -195,10 +217,10 @@ 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,10 +232,10 @@ 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,10 +247,10 @@ 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 +265,7 @@ describe('ExpandableNavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 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..29bd205dd0 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,18 @@
-import { Component, Inject, Injector, OnInit } 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 {
+  Component,
+  HostListener,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
+
+import { slide } from '../../shared/animations/slide';
 import { HostWindowService } from '../../shared/host-window.service';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
+import { MenuService } from '../../shared/menu/menu.service';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { NavbarSectionComponent } from '../navbar-section/navbar-section.component';
 
 /**
  * Represents an expandable section in the navbar
@@ -14,21 +21,50 @@ import { MenuID } from '../../shared/menu/menu-id.model';
   selector: 'ds-expandable-navbar-section',
   templateUrl: './expandable-navbar-section.component.html',
   styleUrls: ['./expandable-navbar-section.component.scss'],
-  animations: [slide]
+  animations: [slide],
 })
-@rendersSectionForMenu(MenuID.PUBLIC, true)
 export class ExpandableNavbarSectionComponent extends NavbarSectionComponent implements OnInit {
   /**
    * This section resides in the Public Navbar
    */
   menuID = MenuID.PUBLIC;
 
+  /**
+   * True if mouse has entered the menu section toggler
+   */
+  mouseEntered = 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>;
+
+  @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') menuSection,
               protected menuService: MenuService,
               protected injector: Injector,
-              private windowService: HostWindowService
+              private windowService: HostWindowService,
   ) {
     super(menuSection, menuService, injector);
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit() {
@@ -36,48 +72,42 @@ export class ExpandableNavbarSectionComponent extends NavbarSectionComponent imp
   }
 
   /**
-   * 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
+   * When the mouse enters the section toggler activate the menu section
+   * @param $event
+   * @param isActive
    */
-  activateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
-      first()
+  onMouseEnter($event: Event, isActive: boolean) {
+    this.isMobile$.pipe(
+      first(),
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.activateSection(event);
+      if (!isMobile && !isActive && !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
+   * @param isActive
    */
-  deactivateSection(event): void {
-    this.windowService.isXsOrSm().pipe(
-      first()
+  onMouseLeave($event: Event, isActive: boolean) {
+    this.isMobile$.pipe(
+      first(),
     ).subscribe((isMobile) => {
-      if (!isMobile) {
-        super.deactivateSection(event);
+      if (!isMobile && isActive && 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
+   * @param sectionId
    */
-  toggleSection(event): void {
-    event.preventDefault();
-    this.windowService.isXsOrSm().pipe(
-      first()
-    ).subscribe((isMobile) => {
-      if (isMobile) {
-        super.toggleSection(event);
-      }
-    });
+  expandableNavbarSectionId(sectionId: string) {
+    return `expandable-navbar-section-${sectionId}-dropdown`;
   }
 }
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..e342e9641c 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
@@ -1,15 +1,15 @@
 import { Component } from '@angular/core';
+
+import { MenuID } from '../../shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section.component';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
-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 d77b57515e..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">
+<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>
\ No newline at end of file
+</div>
diff --git a/src/app/navbar/navbar-section/navbar-section.component.spec.ts b/src/app/navbar/navbar-section/navbar-section.component.spec.ts
index 122bf48636..52c734965a 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.spec.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.spec.ts
@@ -1,13 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { NavbarSectionComponent } from './navbar-section.component';
-import { HostWindowService } from '../../shared/host-window.service';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+
+import { HostWindowService } from '../../shared/host-window.service';
 import { MenuService } from '../../shared/menu/menu.service';
 import { HostWindowServiceStub } from '../../shared/testing/host-window-service.stub';
-import { Component } from '@angular/core';
 import { MenuServiceStub } from '../../shared/testing/menu-service.stub';
-import { of as observableOf } from 'rxjs';
+import { NavbarSectionComponent } from './navbar-section.component';
 
 describe('NavbarSectionComponent', () => {
   let component: NavbarSectionComponent;
@@ -21,12 +25,12 @@ describe('NavbarSectionComponent', () => {
       providers: [
         { provide: 'sectionDataProvider', useValue: {} },
         { provide: MenuService, useValue: menuService },
-        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) }
-      ]
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
+      ],
     }).overrideComponent(NavbarSectionComponent, {
       set: {
-        entryComponents: [TestComponent]
-      }
+        entryComponents: [TestComponent],
+      },
     })
       .compileComponents();
   }));
@@ -48,7 +52,7 @@ describe('NavbarSectionComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 }
diff --git a/src/app/navbar/navbar-section/navbar-section.component.ts b/src/app/navbar/navbar-section/navbar-section.component.ts
index 9f75a96f6e..e47f36d68f 100644
--- a/src/app/navbar/navbar-section/navbar-section.component.ts
+++ b/src/app/navbar/navbar-section/navbar-section.component.ts
@@ -1,17 +1,22 @@
-import { Component, Inject, Injector, OnInit } from '@angular/core';
-import { MenuSectionComponent } from '../../shared/menu/menu-section/menu-section.component';
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
+
 import { MenuService } from '../../shared/menu/menu.service';
-import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
 import { MenuID } from '../../shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../shared/menu/menu-section.decorator';
+import { MenuSectionComponent } from '../../shared/menu/menu-section/menu-section.component';
 
 /**
  * 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']
+  styleUrls: ['./navbar-section.component.scss'],
 })
 @rendersSectionForMenu(MenuID.PUBLIC, false)
 export class NavbarSectionComponent extends MenuSectionComponent implements OnInit {
@@ -22,7 +27,7 @@ export class NavbarSectionComponent extends MenuSectionComponent implements OnIn
 
   constructor(@Inject('sectionDataProvider') menuSection,
               protected menuService: MenuService,
-              protected injector: Injector
+              protected injector: Injector,
   ) {
     super(menuSection, menuService, injector);
   }
diff --git a/src/app/navbar/navbar.component.html b/src/app/navbar/navbar.component.html
index b41f2ea706..63938617f5 100644
--- a/src/app/navbar/navbar.component.html
+++ b/src/app/navbar/navbar.component.html
@@ -1,15 +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="container">
-        <div class="reset-padding-md w-100">
-            <div id="collapsingNav">
-                <ul class="navbar-nav navbar-navigation mr-auto shadow-none">
-                    <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) !== true}"
+     [@slideMobileNav]="(windowService.isXsOrSm() | async) !== true ? '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) !== true">
+    <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 3a9a302b06..b74408f0f5 100644
--- a/src/app/navbar/navbar.component.scss
+++ b/src/app/navbar/navbar.component.scss
@@ -1,44 +1,64 @@
-nav.navbar {
-    border-bottom: 1px var(--bs-gray-400) 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: 100vw;
-        background-color: var(--bs-white);
-        position: absolute;
-        overflow: hidden;
-        height: 0;
-        &.open {
-            height: 100vh; //doesn't matter because wrapper is sticky
-        }
+      width: 100%;
+      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) {
-        > .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.spec.ts b/src/app/navbar/navbar.component.spec.ts
index 9a9d2210be..d24643944b 100644
--- a/src/app/navbar/navbar.component.spec.ts
+++ b/src/app/navbar/navbar.component.spec.ts
@@ -1,33 +1,58 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { of as observableOf } from 'rxjs';
-
-import { NavbarComponent } from './navbar.component';
+import {
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { ReactiveFormsModule } from '@angular/forms';
-import { HostWindowService } from '../shared/host-window.service';
-import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { MenuService } from '../shared/menu/menu.service';
-import { MenuServiceStub } from '../shared/testing/menu-service.stub';
 import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  AppState,
+  storeModuleConfig,
+} from '../app.reducer';
+import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-data-type';
+import { authReducer } from '../core/auth/auth.reducer';
+import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
 import { BrowseService } from '../core/browse/browse.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { buildPaginatedList } from '../core/data/paginated-list.model';
-import { BrowseDefinition } from '../core/shared/browse-definition.model';
-import { BrowseByDataType } from '../browse-by/browse-by-switcher/browse-by-decorator';
-import { Item } from '../core/shared/item.model';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { ThemeService } from '../shared/theme-support/theme.service';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
+import { FlatBrowseDefinition } from '../core/shared/flat-browse-definition.model';
+import { HierarchicalBrowseDefinition } from '../core/shared/hierarchical-browse-definition.model';
+import { Item } from '../core/shared/item.model';
+import { ValueListBrowseDefinition } from '../core/shared/value-list-browse-definition.model';
+import { HostWindowService } from '../shared/host-window.service';
+import { MenuService } from '../shared/menu/menu.service';
 import { getMockThemeService } from '../shared/mocks/theme-service.mock';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { EPersonMock } from '../shared/testing/eperson.mock';
+import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
+import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { ThemeService } from '../shared/theme-support/theme.service';
+import { NavbarComponent } from './navbar.component';
 
 let comp: NavbarComponent;
 let fixture: ComponentFixture<NavbarComponent>;
+let store: Store<AppState>;
+let initialState: any;
 
 const authorizationService = jasmine.createSpyObj('authorizationService', {
-  isAuthorized: observableOf(true)
+  isAuthorized: observableOf(true),
 });
 
 const mockItem = Object.assign(new Item(), {
@@ -37,16 +62,16 @@ const mockItem = Object.assign(new Item(), {
   lastModified: '2018',
   _links: {
     self: {
-      href: 'https://localhost:8000/items/fake-id'
-    }
-  }
+      href: 'https://localhost:8000/items/fake-id',
+    },
+  },
 });
 
 const routeStub = {
   data: observableOf({
-    dso: createSuccessfulRemoteDataObject(mockItem)
+    dso: createSuccessfulRemoteDataObject(mockItem),
   }),
-  children: []
+  children: [],
 };
 
 
@@ -58,35 +83,54 @@ describe('NavbarComponent', () => {
   beforeEach(waitForAsync(() => {
     browseDefinitions = [
       Object.assign(
-        new BrowseDefinition(), {
+        new FlatBrowseDefinition(), {
           id: 'title',
           dataType: BrowseByDataType.Title,
-        }
+        },
       ),
       Object.assign(
-        new BrowseDefinition(), {
+        new FlatBrowseDefinition(), {
           id: 'dateissued',
           dataType: BrowseByDataType.Date,
-          metadataKeys: ['dc.date.issued']
-        }
+          metadataKeys: ['dc.date.issued'],
+        },
       ),
       Object.assign(
-        new BrowseDefinition(), {
+        new ValueListBrowseDefinition(), {
           id: 'author',
           dataType: BrowseByDataType.Metadata,
-        }
+        },
       ),
       Object.assign(
-        new BrowseDefinition(), {
+        new ValueListBrowseDefinition(), {
           id: 'subject',
           dataType: BrowseByDataType.Metadata,
-        }
+        },
+      ),
+      Object.assign(
+        new HierarchicalBrowseDefinition(), {
+          id: 'srsc',
+        },
       ),
     ];
+    initialState = {
+      core: {
+        auth: {
+          authenticated: true,
+          loaded: true,
+          blocking: false,
+          loading: false,
+          authToken: new AuthTokenInfo('test_token'),
+          userId: EPersonMock.id,
+          authMethods: [],
+        },
+      },
+    };
 
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
+        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
         NoopAnimationsModule,
         ReactiveFormsModule,
         RouterTestingModule],
@@ -99,15 +143,16 @@ describe('NavbarComponent', () => {
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: BrowseService, useValue: { getBrowseDefinitions: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, browseDefinitions)) } },
         { provide: AuthorizationDataService, useValue: authorizationService },
+        provideMockStore({ initialState }),
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();  // compile template and css
   }));
 
   // synchronous beforeEach
   beforeEach(() => {
-
+    store = TestBed.inject(Store);
     fixture = TestBed.createComponent(NavbarComponent);
 
     comp = fixture.componentInstance;
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 62b9e7d770..a883756da3 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -1,11 +1,26 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import { AppState } from '../app.reducer';
+import { isAuthenticated } from '../core/auth/selectors';
+import { BrowseService } from '../core/browse/browse.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { slideMobileNav } from '../shared/animations/slide';
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../shared/host-window.service';
 import { MenuComponent } from '../shared/menu/menu.component';
 import { MenuService } from '../shared/menu/menu.service';
-import { HostWindowService } 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';
 import { MenuID } from '../shared/menu/menu-id.model';
 import { ThemeService } from '../shared/theme-support/theme.service';
 
@@ -16,14 +31,23 @@ import { ThemeService } from '../shared/theme-support/theme.service';
   selector: 'ds-navbar',
   styleUrls: ['./navbar.component.scss'],
   templateUrl: './navbar.component.html',
-  animations: [slideMobileNav]
+  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.
+   * @type {Observable<string>}
+   */
+  public isAuthenticated$: Observable<boolean>;
+
+  public isMobile$: Observable<boolean>;
 
   constructor(protected menuService: MenuService,
     protected injector: Injector,
@@ -31,12 +55,15 @@ export class NavbarComponent extends MenuComponent {
               public browseService: BrowseService,
               public authorizationService: AuthorizationDataService,
               public route: ActivatedRoute,
-              protected themeService: ThemeService
+              protected themeService: ThemeService,
+              private store: Store<AppState>,
   ) {
     super(menuService, injector, authorizationService, route, themeService);
   }
 
   ngOnInit(): void {
     super.ngOnInit();
+    this.isMobile$ = this.windowService.isUpTo(this.maxMobileWidth);
+    this.isAuthenticated$ = this.store.pipe(select(isAuthenticated));
   }
 }
diff --git a/src/app/navbar/navbar.effects.spec.ts b/src/app/navbar/navbar.effects.spec.ts
index bcb105d5b2..d01eef5051 100644
--- a/src/app/navbar/navbar.effects.spec.ts
+++ b/src/app/navbar/navbar.effects.spec.ts
@@ -1,14 +1,18 @@
 import { TestBed } from '@angular/core/testing';
-import { NavbarEffects } from './navbar.effects';
-import { HostWindowResizeAction } from '../shared/host-window.actions';
-import { Observable } from 'rxjs';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
-import * as fromRouter from '@ngrx/router-store';
+import { ROUTER_NAVIGATION } from '@ngrx/router-store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import { HostWindowResizeAction } from '../shared/host-window.actions';
 import { CollapseMenuAction } from '../shared/menu/menu.actions';
 import { MenuService } from '../shared/menu/menu.service';
-import { MenuServiceStub } from '../shared/testing/menu-service.stub';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { NavbarEffects } from './navbar.effects';
 
 describe('NavbarEffects', () => {
   let navbarEffects: NavbarEffects;
@@ -43,7 +47,7 @@ describe('NavbarEffects', () => {
   describe('routeChange$', () => {
 
     it('should return a COLLAPSE action in response to an UPDATE_LOCATION action', () => {
-      actions = hot('--a-', { a: { type: fromRouter.ROUTER_NAVIGATION } });
+      actions = hot('--a-', { a: { type: ROUTER_NAVIGATION } });
 
       const expected = cold('--b-', { b: new CollapseMenuAction(MenuID.PUBLIC) });
 
diff --git a/src/app/navbar/navbar.effects.ts b/src/app/navbar/navbar.effects.ts
index 43992a1c61..a40c2c99d6 100644
--- a/src/app/navbar/navbar.effects.ts
+++ b/src/app/navbar/navbar.effects.ts
@@ -1,18 +1,26 @@
-import { first, map, switchMap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import * as fromRouter from '@ngrx/router-store';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { ROUTER_NAVIGATION } from '@ngrx/router-store';
+import {
+  first,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
 import { HostWindowActionTypes } from '../shared/host-window.actions';
 import {
   CollapseMenuAction,
   ExpandMenuPreviewAction,
-  MenuActionTypes
+  MenuActionTypes,
 } from '../shared/menu/menu.actions';
 import { MenuService } from '../shared/menu/menu.service';
-import { NoOpAction } from '../shared/ngrx/no-op.action';
-import { MenuState } from '../shared/menu/menu-state.model';
 import { MenuID } from '../shared/menu/menu-id.model';
+import { MenuState } from '../shared/menu/menu-state.model';
+import { NoOpAction } from '../shared/ngrx/no-op.action';
 
 @Injectable()
 export class NavbarEffects {
@@ -21,26 +29,26 @@ export class NavbarEffects {
    * Effect that collapses the public menu on window resize
    * @type {Observable<CollapseMenuAction>}
    */
-   resize$ = createEffect(() => this.actions$
+  resize$ = createEffect(() => this.actions$
     .pipe(
       ofType(HostWindowActionTypes.RESIZE),
-      map(() => new CollapseMenuAction(this.menuID))
+      map(() => new CollapseMenuAction(this.menuID)),
     ));
 
   /**
    * Effect that collapses the public menu on reroute
    * @type {Observable<CollapseMenuAction>}
    */
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
-      ofType(fromRouter.ROUTER_NAVIGATION),
-      map(() => new CollapseMenuAction(this.menuID))
+      ofType(ROUTER_NAVIGATION),
+      map(() => new CollapseMenuAction(this.menuID)),
     ));
   /**
    * Effect that collapses the public menu when the admin sidebar opens
    * @type {Observable<CollapseMenuAction>}
    */
-   openAdminSidebar$ = createEffect(() => this.actions$
+  openAdminSidebar$ = createEffect(() => this.actions$
     .pipe(
       ofType(MenuActionTypes.EXPAND_MENU_PREVIEW),
       switchMap((action: ExpandMenuPreviewAction) => {
@@ -54,7 +62,7 @@ export class NavbarEffects {
             }
             return new NoOpAction();
           }));
-      })
+      }),
     ));
   constructor(private actions$: Actions, private menuService: MenuService) {
 
diff --git a/src/app/navbar/navbar.module.ts b/src/app/navbar/navbar.module.ts
index af2bf036bd..ddc1bb693f 100644
--- a/src/app/navbar/navbar.module.ts
+++ b/src/app/navbar/navbar.module.ts
@@ -1,26 +1,26 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-
+import { FormsModule } from '@angular/forms';
 import { EffectsModule } from '@ngrx/effects';
 
 import { CoreModule } from '../core/core.module';
-import { NavbarEffects } from './navbar.effects';
-import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
+import { MenuModule } from '../shared/menu/menu.module';
+import { SharedModule } from '../shared/shared.module';
 import { ExpandableNavbarSectionComponent } from './expandable-navbar-section/expandable-navbar-section.component';
 import { ThemedExpandableNavbarSectionComponent } from './expandable-navbar-section/themed-expandable-navbar-section.component';
 import { NavbarComponent } from './navbar.component';
-import { MenuModule } from '../shared/menu/menu.module';
-import { SharedModule } from '../shared/shared.module';
-import { FormsModule } from '@angular/forms';
+import { NavbarEffects } from './navbar.effects';
+import { NavbarSectionComponent } from './navbar-section/navbar-section.component';
 import { ThemedNavbarComponent } from './themed-navbar.component';
 
 const effects = [
-  NavbarEffects
+  NavbarEffects,
 ];
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
   NavbarSectionComponent,
+  ExpandableNavbarSectionComponent,
   ThemedExpandableNavbarSectionComponent,
 ];
 
@@ -31,21 +31,19 @@ const ENTRY_COMPONENTS = [
     MenuModule,
     FormsModule,
     EffectsModule.forFeature(effects),
-    CoreModule.forRoot()
+    CoreModule.forRoot(),
   ],
   declarations: [
+    ...ENTRY_COMPONENTS,
     NavbarComponent,
     ThemedNavbarComponent,
-    NavbarSectionComponent,
-    ExpandableNavbarSectionComponent,
-    ThemedExpandableNavbarSectionComponent,
   ],
   providers: [],
   exports: [
     ThemedNavbarComponent,
     NavbarSectionComponent,
-    ThemedExpandableNavbarSectionComponent
-  ]
+    ThemedExpandableNavbarSectionComponent,
+  ],
 })
 
 /**
@@ -59,7 +57,7 @@ export class NavbarModule {
   static withEntryComponents() {
     return {
       ngModule: NavbarModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({provide: component}))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 
diff --git a/src/app/navbar/themed-navbar.component.ts b/src/app/navbar/themed-navbar.component.ts
index 43efdc181e..5a33fe517e 100644
--- a/src/app/navbar/themed-navbar.component.ts
+++ b/src/app/navbar/themed-navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { NavbarComponent } from './navbar.component';
 
diff --git a/src/app/notifications/notifications-effects.ts b/src/app/notifications/notifications-effects.ts
new file mode 100644
index 0000000000..d06c9dae53
--- /dev/null
+++ b/src/app/notifications/notifications-effects.ts
@@ -0,0 +1,9 @@
+import { QualityAssuranceSourceEffects } from './qa/source/quality-assurance-source.effects';
+import { QualityAssuranceTopicsEffects } from './qa/topics/quality-assurance-topics.effects';
+import { SuggestionTargetsEffects } from './suggestion-targets/suggestion-targets.effects';
+
+export const notificationsEffects = [
+  QualityAssuranceTopicsEffects,
+  QualityAssuranceSourceEffects,
+  SuggestionTargetsEffects,
+];
diff --git a/src/app/notifications/notifications-state.service.spec.ts b/src/app/notifications/notifications-state.service.spec.ts
new file mode 100644
index 0000000000..5db3b98c23
--- /dev/null
+++ b/src/app/notifications/notifications-state.service.spec.ts
@@ -0,0 +1,545 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { cold } from 'jasmine-marbles';
+
+import {
+  qualityAssuranceSourceObjectMissingPid,
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+  qualityAssuranceTopicObjectMissingPid,
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../shared/mocks/notifications.mock';
+import { suggestionNotificationsReducers } from './notifications.reducer';
+import { NotificationsStateService } from './notifications-state.service';
+import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
+import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
+
+describe('NotificationsStateService', () => {
+  let service: NotificationsStateService;
+  let serviceAsAny: any;
+  let store: any;
+  let initialState: any;
+
+  describe('Topis State', () => {
+    function init(mode: string) {
+      if (mode === 'empty') {
+        initialState = {
+          suggestionNotifications: {
+            qaTopic: {
+              topics: [],
+              processing: false,
+              loaded: false,
+              totalPages: 0,
+              currentPage: 0,
+              totalElements: 0,
+              totalLoadedPages: 0,
+            },
+          },
+        };
+      } else {
+        initialState = {
+          suggestionNotifications: {
+            qaTopic: {
+              topics: [
+                qualityAssuranceTopicObjectMorePid,
+                qualityAssuranceTopicObjectMoreAbstract,
+                qualityAssuranceTopicObjectMissingPid,
+              ],
+              processing: false,
+              loaded: true,
+              totalPages: 1,
+              currentPage: 1,
+              totalElements: 3,
+              totalLoadedPages: 1,
+            },
+          },
+        };
+      }
+    }
+
+    describe('Testing methods with empty topic objects', () => {
+      beforeEach(async () => {
+        init('empty');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceTopics', () => {
+        it('Should return an empty array', () => {
+          const result = service.getQualityAssuranceTopics();
+          const expected = cold('(a)', {
+            a: [],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotalPages', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceTopicsTotalPages();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsCurrentPage', () => {
+        it('Should return minus one (0)', () => {
+          const result = service.getQualityAssuranceTopicsCurrentPage();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotals', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceTopicsTotals();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoading', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceTopicsLoading();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoaded', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsLoaded();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing methods with topic objects', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceTopics', () => {
+        it('Should return an array of topics', () => {
+          const result = service.getQualityAssuranceTopics();
+          const expected = cold('(a)', {
+            a: [
+              qualityAssuranceTopicObjectMorePid,
+              qualityAssuranceTopicObjectMoreAbstract,
+              qualityAssuranceTopicObjectMissingPid,
+            ],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotalPages', () => {
+        it('Should return one (1)', () => {
+          const result = service.getQualityAssuranceTopicsTotalPages();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsCurrentPage', () => {
+        it('Should return minus zero (1)', () => {
+          const result = service.getQualityAssuranceTopicsCurrentPage();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceTopicsTotals', () => {
+        it('Should return three (3)', () => {
+          const result = service.getQualityAssuranceTopicsTotals();
+          const expected = cold('(a)', {
+            a: 3,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoading', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsLoading();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsLoaded', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceTopicsLoaded();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceTopicsProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceTopicsProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing the topic dispatch methods', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('dispatchRetrieveQualityAssuranceTopics', () => {
+        it('Should call store.dispatch', () => {
+          const elementsPerPage = 3;
+          const currentPage = 1;
+          const action = new RetrieveAllTopicsAction(elementsPerPage, currentPage, 'source', 'target');
+          service.dispatchRetrieveQualityAssuranceTopics(elementsPerPage, currentPage, 'source', 'target');
+          expect(serviceAsAny.store.dispatch).toHaveBeenCalledWith(action);
+        });
+      });
+    });
+  });
+
+  describe('Source State', () => {
+    function init(mode: string) {
+      if (mode === 'empty') {
+        initialState = {
+          suggestionNotifications: {
+            qaSource: {
+              source: [],
+              processing: false,
+              loaded: false,
+              totalPages: 0,
+              currentPage: 0,
+              totalElements: 0,
+              totalLoadedPages: 0,
+            },
+          },
+        };
+      } else {
+        initialState = {
+          suggestionNotifications: {
+            qaSource: {
+              source: [
+                qualityAssuranceSourceObjectMorePid,
+                qualityAssuranceSourceObjectMoreAbstract,
+                qualityAssuranceSourceObjectMissingPid,
+              ],
+              processing: false,
+              loaded: true,
+              totalPages: 1,
+              currentPage: 1,
+              totalElements: 3,
+              totalLoadedPages: 1,
+            },
+          },
+        };
+      }
+    }
+
+    describe('Testing methods with empty source objects', () => {
+      beforeEach(async () => {
+        init('empty');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceSource', () => {
+        it('Should return an empty array', () => {
+          const result = service.getQualityAssuranceSource();
+          const expected = cold('(a)', {
+            a: [],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotalPages', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceSourceTotalPages();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourcesCurrentPage', () => {
+        it('Should return minus one (0)', () => {
+          const result = service.getQualityAssuranceSourceCurrentPage();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotals', () => {
+        it('Should return zero (0)', () => {
+          const result = service.getQualityAssuranceSourceTotals();
+          const expected = cold('(a)', {
+            a: 0,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoading', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceSourceLoading();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoaded', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceLoaded();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing methods with Source objects', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('getQualityAssuranceSource', () => {
+        it('Should return an array of Source', () => {
+          const result = service.getQualityAssuranceSource();
+          const expected = cold('(a)', {
+            a: [
+              qualityAssuranceSourceObjectMorePid,
+              qualityAssuranceSourceObjectMoreAbstract,
+              qualityAssuranceSourceObjectMissingPid,
+            ],
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotalPages', () => {
+        it('Should return one (1)', () => {
+          const result = service.getQualityAssuranceSourceTotalPages();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceCurrentPage', () => {
+        it('Should return minus zero (1)', () => {
+          const result = service.getQualityAssuranceSourceCurrentPage();
+          const expected = cold('(a)', {
+            a: 1,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('getQualityAssuranceSourceTotals', () => {
+        it('Should return three (3)', () => {
+          const result = service.getQualityAssuranceSourceTotals();
+          const expected = cold('(a)', {
+            a: 3,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoading', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceLoading();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceLoaded', () => {
+        it('Should return TRUE', () => {
+          const result = service.isQualityAssuranceSourceLoaded();
+          const expected = cold('(a)', {
+            a: true,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+
+      describe('isQualityAssuranceSourceProcessing', () => {
+        it('Should return FALSE', () => {
+          const result = service.isQualityAssuranceSourceProcessing();
+          const expected = cold('(a)', {
+            a: false,
+          });
+          expect(result).toBeObservable(expected);
+        });
+      });
+    });
+
+    describe('Testing the Source dispatch methods', () => {
+      beforeEach(async () => {
+        init('full');
+        TestBed.configureTestingModule({
+          imports: [
+            StoreModule.forRoot({ suggestionNotifications: suggestionNotificationsReducers } as any),
+          ],
+          providers: [
+            provideMockStore({ initialState }),
+            { provide: NotificationsStateService, useValue: service },
+          ],
+        }).compileComponents();
+      });
+
+      beforeEach(() => {
+        store = TestBed.get(Store);
+        service = new NotificationsStateService(store);
+        serviceAsAny = service;
+        spyOn(store, 'dispatch');
+      });
+
+      describe('dispatchRetrieveQualityAssuranceSource', () => {
+        it('Should call store.dispatch', () => {
+          const elementsPerPage = 3;
+          const currentPage = 1;
+          const action = new RetrieveAllSourceAction(elementsPerPage, currentPage);
+          service.dispatchRetrieveQualityAssuranceSource(elementsPerPage, currentPage);
+          expect(serviceAsAny.store.dispatch).toHaveBeenCalledWith(action);
+        });
+      });
+    });
+  });
+
+
+});
diff --git a/src/app/notifications/notifications-state.service.ts b/src/app/notifications/notifications-state.service.ts
new file mode 100644
index 0000000000..aab06519dd
--- /dev/null
+++ b/src/app/notifications/notifications-state.service.ts
@@ -0,0 +1,216 @@
+import { Injectable } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
+import { SuggestionNotificationsState } from './notifications.reducer';
+import { RetrieveAllSourceAction } from './qa/source/quality-assurance-source.actions';
+import { RetrieveAllTopicsAction } from './qa/topics/quality-assurance-topics.actions';
+import {
+  getQualityAssuranceSourceCurrentPageSelector,
+  getQualityAssuranceSourceTotalPagesSelector,
+  getQualityAssuranceSourceTotalsSelector,
+  getQualityAssuranceTopicsCurrentPageSelector,
+  getQualityAssuranceTopicsTotalPagesSelector,
+  getQualityAssuranceTopicsTotalsSelector,
+  isQualityAssuranceSourceLoadedSelector,
+  isQualityAssuranceSourceProcessingSelector,
+  isQualityAssuranceTopicsLoadedSelector,
+  isQualityAssuranceTopicsProcessingSelector,
+  qualityAssuranceSourceObjectSelector,
+  qualityAssuranceTopicsObjectSelector,
+} from './selectors';
+
+/**
+ * The service handling the Notifications State.
+ */
+@Injectable()
+export class NotificationsStateService {
+
+  /**
+   * Initialize the service variables.
+   * @param {Store<SuggestionNotificationsState>} store
+   */
+  constructor(private store: Store<SuggestionNotificationsState>) { }
+
+  // Quality Assurance topics
+  // --------------------------------------------------------------------------
+
+  /**
+   * Returns the list of Quality Assurance topics from the state.
+   *
+   * @return Observable<QualityAssuranceTopicObject>
+   *    The list of Quality Assurance topics.
+   */
+  public getQualityAssuranceTopics(): Observable<QualityAssuranceTopicObject[]> {
+    return this.store.pipe(select(qualityAssuranceTopicsObjectSelector()));
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the topics are loading, 'false' otherwise.
+   */
+  public isQualityAssuranceTopicsLoading(): Observable<boolean> {
+    return this.store.pipe(
+      select(isQualityAssuranceTopicsLoadedSelector),
+      map((loaded: boolean) => !loaded),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance topics (whether or not they were loaded).
+   *
+   * @return Observable<boolean>
+   *    'true' if the topics are loaded, 'false' otherwise.
+   */
+  public isQualityAssuranceTopicsLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceTopicsLoadedSelector));
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the topics (ex.: a REST call), 'false' otherwise.
+   */
+  public isQualityAssuranceTopicsProcessing(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceTopicsProcessingSelector));
+  }
+
+  /**
+   * Returns, from the state, the total available pages of the Quality Assurance topics.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance topics pages.
+   */
+  public getQualityAssuranceTopicsTotalPages(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceTopicsTotalPagesSelector));
+  }
+
+  /**
+   * Returns the current page of the Quality Assurance topics, from the state.
+   *
+   * @return Observable<number>
+   *    The number of the current Quality Assurance topics page.
+   */
+  public getQualityAssuranceTopicsCurrentPage(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceTopicsCurrentPageSelector));
+  }
+
+  /**
+   * Returns the total number of the Quality Assurance topics.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance topics.
+   */
+  public getQualityAssuranceTopicsTotals(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceTopicsTotalsSelector));
+  }
+
+  /**
+   * Dispatch a request to change the Quality Assurance topics state, retrieving the topics from the server.
+   *
+   * @param elementsPerPage
+   *    The number of the topics per page.
+   * @param currentPage
+   *    The number of the current page.
+   */
+  public dispatchRetrieveQualityAssuranceTopics(elementsPerPage: number, currentPage: number, sourceId: string, targteId?: string): void {
+    this.store.dispatch(new RetrieveAllTopicsAction(elementsPerPage, currentPage, sourceId, targteId));
+  }
+
+  // Quality Assurance source
+  // --------------------------------------------------------------------------
+
+  /**
+   * Returns the list of Quality Assurance source from the state.
+   *
+   * @return Observable<QualityAssuranceSourceObject>
+   *    The list of Quality Assurance source.
+   */
+  public getQualityAssuranceSource(): Observable<QualityAssuranceSourceObject[]> {
+    return this.store.pipe(select(qualityAssuranceSourceObjectSelector()));
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the source are loading, 'false' otherwise.
+   */
+  public isQualityAssuranceSourceLoading(): Observable<boolean> {
+    return this.store.pipe(
+      select(isQualityAssuranceSourceLoadedSelector),
+      map((loaded: boolean) => !loaded),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance source (whether or not they were loaded).
+   *
+   * @return Observable<boolean>
+   *    'true' if the source are loaded, 'false' otherwise.
+   */
+  public isQualityAssuranceSourceLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceSourceLoadedSelector));
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the source (ex.: a REST call), 'false' otherwise.
+   */
+  public isQualityAssuranceSourceProcessing(): Observable<boolean> {
+    return this.store.pipe(select(isQualityAssuranceSourceProcessingSelector));
+  }
+
+  /**
+   * Returns, from the state, the total available pages of the Quality Assurance source.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance source pages.
+   */
+  public getQualityAssuranceSourceTotalPages(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceSourceTotalPagesSelector));
+  }
+
+  /**
+   * Returns the current page of the Quality Assurance source, from the state.
+   *
+   * @return Observable<number>
+   *    The number of the current Quality Assurance source page.
+   */
+  public getQualityAssuranceSourceCurrentPage(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceSourceCurrentPageSelector));
+  }
+
+  /**
+   * Returns the total number of the Quality Assurance source.
+   *
+   * @return Observable<number>
+   *    The number of the Quality Assurance source.
+   */
+  public getQualityAssuranceSourceTotals(): Observable<number> {
+    return this.store.pipe(select(getQualityAssuranceSourceTotalsSelector));
+  }
+
+  /**
+   * Dispatch a request to change the Quality Assurance source state, retrieving the source from the server.
+   *
+   * @param elementsPerPage
+   *    The number of the source per page.
+   * @param currentPage
+   *    The number of the current page.
+   */
+  public dispatchRetrieveQualityAssuranceSource(elementsPerPage: number, currentPage: number): void {
+    this.store.dispatch(new RetrieveAllSourceAction(elementsPerPage, currentPage));
+  }
+}
diff --git a/src/app/notifications/notifications.module.ts b/src/app/notifications/notifications.module.ts
new file mode 100644
index 0000000000..70b3eed590
--- /dev/null
+++ b/src/app/notifications/notifications.module.ts
@@ -0,0 +1,111 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { EffectsModule } from '@ngrx/effects';
+import {
+  Action,
+  StoreConfig,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { storeModuleConfig } from '../app.reducer';
+import { CoreModule } from '../core/core.module';
+import { QualityAssuranceEventDataService } from '../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceSourceDataService } from '../core/notifications/qa/source/quality-assurance-source-data.service';
+import { QualityAssuranceTopicDataService } from '../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { SuggestionSourceDataService } from '../core/notifications/source/suggestion-source-data.service';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import {
+  suggestionNotificationsReducers,
+  SuggestionNotificationsState,
+} from './notifications.reducer';
+import { notificationsEffects } from './notifications-effects';
+import { NotificationsStateService } from './notifications-state.service';
+import { EPersonDataComponent } from './qa/events/ePerson-data/ePerson-data.component';
+import { QualityAssuranceEventsComponent } from './qa/events/quality-assurance-events.component';
+import { ProjectEntryImportModalComponent } from './qa/project-entry-import-modal/project-entry-import-modal.component';
+import { QualityAssuranceSourceComponent } from './qa/source/quality-assurance-source.component';
+import { QualityAssuranceSourceService } from './qa/source/quality-assurance-source.service';
+import { QualityAssuranceTopicsComponent } from './qa/topics/quality-assurance-topics.component';
+import { QualityAssuranceTopicsService } from './qa/topics/quality-assurance-topics.service';
+import { SuggestionActionsComponent } from './suggestion-actions/suggestion-actions.component';
+import { SuggestionEvidencesComponent } from './suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
+import { SuggestionListElementComponent } from './suggestion-list-element/suggestion-list-element.component';
+import { PublicationClaimComponent } from './suggestion-targets/publication-claim/publication-claim.component';
+import { SuggestionTargetsStateService } from './suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from './suggestions.service';
+import { SuggestionsNotificationComponent } from './suggestions-notification/suggestions-notification.component';
+import { SuggestionsPopupComponent } from './suggestions-popup/suggestions-popup.component';
+
+const MODULES = [
+  CommonModule,
+  SharedModule,
+  SearchModule,
+  CoreModule.forRoot(),
+  StoreModule.forFeature('suggestionNotifications', suggestionNotificationsReducers, storeModuleConfig as StoreConfig<SuggestionNotificationsState, Action>),
+  EffectsModule.forFeature(notificationsEffects),
+  TranslateModule,
+];
+
+const COMPONENTS = [
+  QualityAssuranceTopicsComponent,
+  QualityAssuranceEventsComponent,
+  QualityAssuranceSourceComponent,
+  EPersonDataComponent,
+  PublicationClaimComponent,
+  SuggestionActionsComponent,
+  SuggestionListElementComponent,
+  SuggestionEvidencesComponent,
+  SuggestionsPopupComponent,
+  SuggestionsNotificationComponent,
+];
+
+const DIRECTIVES = [ ];
+
+const ENTRY_COMPONENTS = [
+  ProjectEntryImportModalComponent,
+];
+
+const PROVIDERS = [
+  NotificationsStateService,
+  QualityAssuranceTopicsService,
+  QualityAssuranceSourceService,
+  QualityAssuranceTopicDataService,
+  QualityAssuranceSourceDataService,
+  QualityAssuranceEventDataService,
+  SuggestionsService,
+  SuggestionSourceDataService,
+  SuggestionTargetDataService,
+  SuggestionTargetsStateService,
+  SuggestionsDataService,
+];
+
+@NgModule({
+  imports: [
+    ...MODULES,
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...DIRECTIVES,
+    ...ENTRY_COMPONENTS,
+  ],
+  providers: [
+    ...PROVIDERS,
+  ],
+  entryComponents: [
+    ...ENTRY_COMPONENTS,
+  ],
+  exports: [
+    ...COMPONENTS,
+    ...DIRECTIVES,
+  ],
+})
+
+/**
+ * This module handles all components that are necessary for the OpenAIRE components
+ */
+export class NotificationsModule {
+}
diff --git a/src/app/notifications/notifications.reducer.ts b/src/app/notifications/notifications.reducer.ts
new file mode 100644
index 0000000000..14ca6c0347
--- /dev/null
+++ b/src/app/notifications/notifications.reducer.ts
@@ -0,0 +1,34 @@
+import {
+  ActionReducerMap,
+  createFeatureSelector,
+} from '@ngrx/store';
+
+import {
+  qualityAssuranceSourceReducer,
+  QualityAssuranceSourceState,
+} from './qa/source/quality-assurance-source.reducer';
+import {
+  qualityAssuranceTopicsReducer,
+  QualityAssuranceTopicState,
+} from './qa/topics/quality-assurance-topics.reducer';
+import {
+  SuggestionTargetsReducer,
+  SuggestionTargetState,
+} from './suggestion-targets/suggestion-targets.reducer';
+
+/**
+ * The OpenAIRE State
+ */
+export interface SuggestionNotificationsState {
+  'qaTopic': QualityAssuranceTopicState;
+  'qaSource': QualityAssuranceSourceState;
+  'suggestionTarget': SuggestionTargetState;
+}
+
+export const suggestionNotificationsReducers: ActionReducerMap<SuggestionNotificationsState> = {
+  qaTopic: qualityAssuranceTopicsReducer,
+  qaSource: qualityAssuranceSourceReducer,
+  suggestionTarget: SuggestionTargetsReducer,
+};
+
+export const suggestionNotificationsSelector = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
new file mode 100644
index 0000000000..058457fd40
--- /dev/null
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.html
@@ -0,0 +1,10 @@
+<ng-container *ngIf="ePersonId">
+  <ng-container *ngIf="getEPersonData$() | async as ePersonData">
+    <ng-container *ngFor="let property of properties">
+      <span *ngIf="ePersonData[property]">
+        {{ ePersonData[property] }}
+      </span>
+      <br>
+    </ng-container>
+  </ng-container>
+</ng-container>
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.scss
similarity index 100%
rename from src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.html
rename to src/app/notifications/qa/events/ePerson-data/ePerson-data.component.scss
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts
new file mode 100644
index 0000000000..6407dc6df6
--- /dev/null
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.spec.ts
@@ -0,0 +1,62 @@
+/* tslint:disable:no-unused-variable */
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { EPerson } from 'src/app/core/eperson/models/eperson.model';
+import { createSuccessfulRemoteDataObject$ } from 'src/app/shared/remote-data.utils';
+
+import { EPersonDataService } from './../../../../core/eperson/eperson-data.service';
+import { EPersonDataComponent } from './ePerson-data.component';
+
+describe('EPersonDataComponent', () => {
+  let component: EPersonDataComponent;
+  let fixture: ComponentFixture<EPersonDataComponent>;
+  let ePersonDataService = jasmine.createSpyObj('EPersonDataService', ['findById']);
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      declarations: [ EPersonDataComponent ],
+      providers: [ {
+        provide: EPersonDataService,
+        useValue: ePersonDataService,
+      } ],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(EPersonDataComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should retrieve EPerson data when ePersonId is provided', () => {
+    const ePersonId = '123';
+    const ePersonData = Object.assign(new EPerson(), {
+      id: ePersonId,
+      email: 'john.doe@domain.com',
+      metadata: [
+        {
+          key: 'eperson.firstname',
+          value: 'John',
+        },
+        {
+          key: 'eperson.lastname',
+          value: 'Doe',
+        },
+      ],
+    });
+    const ePersonDataRD$ = createSuccessfulRemoteDataObject$(ePersonData);
+    ePersonDataService.findById.and.returnValue(ePersonDataRD$);
+    component.ePersonId = ePersonId;
+    component.getEPersonData$();
+    fixture.detectChanges();
+    expect(ePersonDataService.findById).toHaveBeenCalledWith(ePersonId, true);
+  });
+});
diff --git a/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
new file mode 100644
index 0000000000..e058e70b42
--- /dev/null
+++ b/src/app/notifications/qa/events/ePerson-data/ePerson-data.component.ts
@@ -0,0 +1,52 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../../core/shared/operators';
+
+@Component({
+  selector: 'ds-eperson-data',
+  templateUrl: './ePerson-data.component.html',
+  styleUrls: ['./ePerson-data.component.scss'],
+})
+/**
+ * Represents the component for displaying ePerson data.
+ */
+export class EPersonDataComponent {
+
+  /**
+   * The ID of the ePerson.
+   */
+  @Input() ePersonId: string;
+
+  /**
+   * The properties of the ePerson to display.
+   */
+  @Input() properties: string[];
+
+  /**
+   * Creates an instance of the EPersonDataComponent.
+   * @param ePersonDataService The service for retrieving ePerson data.
+   */
+  constructor(private ePersonDataService: EPersonDataService) { }
+
+  /**
+   * Retrieves the EPerson data based on the provided ePersonId.
+   * @returns An Observable that emits the EPerson data.
+   */
+  getEPersonData$(): Observable<EPerson> {
+    if (this.ePersonId) {
+      return this.ePersonDataService.findById(this.ePersonId, true).pipe(
+        getFirstCompletedRemoteData(),
+        getRemoteDataPayload(),
+      );
+    }
+  }
+}
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
new file mode 100644
index 0000000000..fa2ec3b008
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -0,0 +1,287 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">
+        <div class="d-flex justify-content-between">
+          {{'notifications.events.title'| translate}}
+        </div>
+      </h2>
+      <ds-alert *ngIf="!targetId"  [type]="'alert-info'">
+        <span [innerHTML]="'quality-assurance.events.description' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+      </ds-alert>
+      <ds-alert *ngIf="targetId" [type]="'alert-info'">
+        <span [innerHTML]="'quality-assurance.events.description-with-topic-and-target' | translate : {topic: selectedTopicName, source: sourceId}"></span>
+        <a [routerLink]="itemPageUrl" target="_blank">{{(getTargetItemTitle() | async)}}</a>
+      </ds-alert>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-12">
+      <h4 class="border-bottom pb-2">
+        {{'quality-assurance.events.topic' | translate}} {{this.showTopic}}
+      </h4>
+
+      <ds-loading class="container" *ngIf="(isEventPageLoading | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+
+      <ds-pagination *ngIf="(isEventPageLoading | async) !== true"
+                      [paginationOptions]="paginationConfig"
+                      [collectionSize]="(totalElements$ | async)"
+                      [sortOptions]="paginationSortConfig"
+                      (paginationChange)="getQualityAssuranceEvents()">
+
+        <ng-container>
+          <div *ngIf="(eventsUpdated$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+            {{'quality-assurance.noEvents' | translate}}
+          </div>
+          <div *ngIf="(eventsUpdated$ | async)?.length !== 0" class="table-responsive mt-2">
+            <table id="events" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col" class="trust-col">{{'quality-assurance.event.table.trust' | translate}}</th>
+                <th scope="col" class="title-col">{{'quality-assurance.event.table.publication' | translate}}</th>
+                <th *ngIf="hasDetailColumn() && showTopic.indexOf('/PROJECT') !== -1" scope="col" class="content-col">
+                  {{'quality-assurance.event.table.project-details' | translate}}
+                </th>
+                <ng-container *ngIf="hasDetailColumn() && (showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1)">
+                  <th scope="col" class="content-col">
+                    {{'quality-assurance.event.table.reasons' | translate}}
+                  </th>
+                  <th scope="col" class="content-col">
+                    {{'quality-assurance.event.table.person-who-requested' | translate}}
+                  </th>
+                </ng-container>
+                <th scope="col" class="button-col">{{'quality-assurance.event.table.actions' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+                <tr *ngFor="let eventElement of (eventsUpdated$ | async); let i = index">
+                  <td>{{eventElement?.event?.trust}}
+                  </td>
+                  <td><a *ngIf="eventElement?.target"
+                         target="_blank"
+                         rel="noopener noreferrer"
+                         [routerLink]="['/items', eventElement?.target?.id]">{{eventElement.title}}</a>
+                    <span *ngIf="!eventElement?.target">{{eventElement.title}}</span>
+                    <div *ngIf="eventElement?.event?.message?.serviceId">
+                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.serviceUrl' | translate}}</span>
+                      <span [title]="eventElement.event.message.serviceId">
+                        <a [href]="eventElement.event.message.serviceId" target="_blank">{{eventElement.event.message.serviceId}}</a>
+                      </span>
+                    </div>
+                    <div *ngIf="eventElement?.event?.message?.href" class="d-flex align-items-center">
+                      <span class="small pr-1">{{'quality-assurance.event.table.event.message.link' | translate}}</span>
+                      <span [title]="eventElement.event.message.href" class="text-truncate d-inline-block w-75">
+                        <a [href]="eventElement.event.message.href" target="_blank">{{eventElement.event.message.href}}</a>
+                      </span>
+                    </div>
+                  </td>
+                  <td *ngIf="showTopic.indexOf('/PID') !== -1">
+                    <p><span class="small">{{'quality-assurance.event.table.pidtype' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.type}}</span></p>
+                    <p><span class="small">{{'quality-assurance.event.table.pidvalue' | translate}}</span><br>
+                      <a *ngIf="hasPIDHref(eventElement.event.message); else noPID" href="{{getPIDHref(eventElement.event.message)}}" rel="noopener noreferrer" target="_blank">
+                        {{eventElement.event.message.value}}
+                      </a>
+                      <ng-template #noPID><span class="badge badge-info">{{eventElement.event.message.value}}</span></ng-template>
+                    </p>
+                  </td>
+                  <td *ngIf="showTopic.indexOf('/SUBJECT') !== -1">
+                    <p><span class="small">{{'quality-assurance.event.table.subjectValue' | translate}}
+                       </span><br><span class="badge badge-info">{{eventElement.event.message.value}}</span></p>
+                  </td>
+                  <td *ngIf="showTopic.indexOf('/ABSTRACT') !== -1">
+                    <p class="abstract-container" [class.show]="showMore">
+                      <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
+                      <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
+                    </p>
+                    <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
+                      <i *ngIf="!showMore" class="fas fa-angle-down"></i>
+                      <i *ngIf="showMore" class="fas fa-angle-up"></i>
+                      {{ (showMore ? 'quality-assurance.event.table.less': 'quality-assurance.event.table.more') | translate }}
+                    </button>
+                  </td>
+                  <ng-container *ngIf="showTopic.indexOf('/REINSTATE') !== -1 || showTopic.indexOf('/WITHDRAWN') !== -1">
+                    <td>
+                      <p>
+                        <span *ngIf="eventElement.event.message">
+                          <span>{{eventElement.event.message.reason}}</span><br>
+                        </span>
+                      </p>
+                    </td>
+                    <td>
+                      <p>
+                        <span *ngIf="eventElement.event.originalId">
+                          <ds-eperson-data [ePersonId]="eventElement.event.originalId" [properties]="['email']"></ds-eperson-data>
+                        </span>
+                      </p>
+                    </td>
+                  </ng-container>
+
+                  <td *ngIf="showTopic.indexOf('/PROJECT') !== -1">
+                    <p>
+                      {{'quality-assurance.event.table.suggestedProject' | translate}}
+                    </p>
+                    <p>
+                      <span class="small">{{'quality-assurance.event.table.project' | translate}}</span><br>
+                      <a href="{{sourceUrlForProjectSearch}}{{ eventElement.event.message.sourceId}}" rel="noopener noreferrer" target="_blank">{{eventElement.event.message.title}}</a>
+                    </p>
+                    <p>
+                      <span *ngIf="eventElement.event.message.acronym"><span class="small">{{'quality-assurance.event.table.acronym' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.acronym}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.code"><span class="small">{{'quality-assurance.event.table.code' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.code}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.funder"><span class="small">{{'quality-assurance.event.table.funder' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.funder}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.fundingProgram"><span class="small">{{'quality-assurance.event.table.fundingProgram' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.fundingProgram}}</span><br></span>
+                      <span *ngIf="eventElement.event.message.jurisdiction"><span class="small">{{'quality-assurance.event.table.jurisdiction' | translate}}</span>&nbsp;<span class="badge badge-info">{{eventElement.event.message.jurisdiction}}</span></span>
+                    </p>
+                    <hr>
+                    <div>
+                      {{(eventElement.hasProject ? 'quality-assurance.event.project.found' : 'quality-assurance.event.project.notFound') | translate}}
+                      <a target="_blank" rel="noopener noreferrer" *ngIf="eventElement.hasProject" title="{{eventElement.projectTitle}}" [routerLink]="['/items', eventElement.projectId]">{{eventElement.handle}} </a>
+                      <div class="btn-group">
+                        <button *ngIf="!eventElement.hasProject"
+                                class="btn btn-outline-primary btn-sm"
+                                [disabled]="eventElement.isRunning"
+                                (click)="openModalLookup(eventElement); $event.stopPropagation();"
+                                [attr.aria-label]="'quality-assurance.event.modal.project.select' | translate"
+                        >
+                          <i class="fas fa-search"></i>
+                        </button>
+                        <button *ngIf="eventElement.hasProject"
+                                class="btn btn-outline-danger btn-sm"
+                                [disabled]="eventElement.isRunning"
+                                (click)="removeProject(eventElement)"
+                                [attr.aria-label]="'quality-assurance.event.modal.project.remove' | translate"
+                        >
+                          <i class="fas fa-trash-alt"></i>
+                        </button>
+                      </div>
+                    </div>
+                  </td>
+                  <td>
+                    <div *ngIf="(isAdmin$ | async)" class="btn-group button-width">
+                      <button *ngIf="showTopic.indexOf('/PROJECT') !== -1"
+                              class="btn btn-outline-success btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="modalChoice('ACCEPTED', eventElement, acceptModal)"
+                              [attr.aria-label]="'quality-assurance.event.action.import' | translate"
+                      >
+                        <i class="fas fa-check"></i>
+                      </button>
+                      <button *ngIf="showTopic.indexOf('/PROJECT') === -1"
+                              class="btn btn-outline-success btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="executeAction('ACCEPTED', eventElement)"
+                              [attr.aria-label]="'quality-assurance.event.action.accept' | translate"
+                      >
+                        <i class="fas fa-check"></i>
+                      </button>
+                      <button class="btn btn-outline-dark btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="openModal('DISCARDED', eventElement, ignoreModal)"
+                              [attr.aria-label]="'quality-assurance.event.action.ignore' | translate"
+                      >
+                        <i class="fas fa-ban"></i>
+                      </button>
+                      <button class="btn btn-outline-danger btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              (click)="openModal('REJECTED', eventElement, rejectModal)"
+                              [attr.aria-label]="'quality-assurance.event.action.reject' | translate"
+                      >
+                        <i class="fas fa-trash-alt"></i>
+                      </button>
+                    </div>
+                    <div *ngIf="(isAdmin$ | async) !== true" class="btn-group button-width">
+                      <button class="btn btn-outline-danger btn-sm button-width"
+                              ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
+                              container="body"
+                              [disabled]="eventElement.isRunning"
+                              [attr.aria-label]="'quality-assurance.event.action.undo' | translate"
+                              (click)="openModal('UNDO', eventElement, undoModal)">
+                        <i class="fas fa-trash-alt"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </ng-container>
+      </ds-pagination>
+    </div>
+  </div>
+</div>
+
+<ng-template #acceptModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="acceptModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.accept.description' | translate}}</p>
+
+    <button class="btn btn-outline-success float-right" (click)="modal.close('do')">
+      <i class="fas fa-check"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.import' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #ignoreModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="ignoreModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.ignore' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #rejectModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="rejectModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.reject.description' | translate}}</p>
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.reject' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
+
+<ng-template #undoModal let-modal>
+  <div class="modal-header">
+    <h4 class="modal-title" id="undoModal">{{'quality-assurance.event.sure' | translate}}</h4>
+  </div>
+  <div class="modal-body">
+    <p>{{'quality-assurance.event.undo.description' | translate}}</p>
+    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+      <i class="fas fa-trash-alt"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.undo' | translate}}</span>
+    </button>
+    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+      <i class="fas fa-close"></i>
+      <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
+    </button>
+  </div>
+</ng-template>
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.scss b/src/app/notifications/qa/events/quality-assurance-events.component.scss
new file mode 100644
index 0000000000..29c16328c3
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.scss
@@ -0,0 +1,28 @@
+.button-col, .trust-col {
+  width: 15%;
+}
+
+.title-col {
+  width: 30%;
+}
+.content-col {
+  width: 40%;
+}
+
+.button-width {
+  width: 100%;
+}
+
+.abstract-container {
+  height: 76px;
+  overflow: hidden;
+}
+
+.text-ellipsis {
+  text-overflow: ellipsis;
+}
+
+.show {
+  overflow: visible;
+  height: auto;
+}
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
new file mode 100644
index 0000000000..0346982760
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.spec.ts
@@ -0,0 +1,358 @@
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from 'src/app/core/data/item-data.service';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  getMockQualityAssuranceEventRestService,
+  ItemMockPid8,
+  ItemMockPid9,
+  ItemMockPid10,
+  NotificationsMockDspaceObject,
+  qualityAssuranceEventObjectMissingProjectFound,
+  qualityAssuranceEventObjectMissingProjectNotFound,
+} from '../../../shared/mocks/notifications.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { QualityAssuranceEventData } from '../project-entry-import-modal/project-entry-import-modal.component';
+import { QualityAssuranceEventsComponent } from './quality-assurance-events.component';
+
+describe('QualityAssuranceEventsComponent test suite', () => {
+  let fixture: ComponentFixture<QualityAssuranceEventsComponent>;
+  let comp: QualityAssuranceEventsComponent;
+  let compAsAny: any;
+  let scheduler: TestScheduler;
+
+  const modalStub = {
+    open: () => ( { result: new Promise((res, rej) => 'do') } ),
+    close: () => null,
+    dismiss: () => null,
+  };
+  const qualityAssuranceEventRestServiceStub: any = getMockQualityAssuranceEventRestService();
+  const activatedRouteParams = {
+    qualityAssuranceEventsParams: {
+      currentPage: 0,
+      pageSize: 10,
+    },
+  };
+  const activatedRouteParamsMap = {
+    id: 'ENRICH!MISSING!PROJECT',
+  };
+
+  const events: QualityAssuranceEventObject[] = [
+    qualityAssuranceEventObjectMissingProjectFound,
+    qualityAssuranceEventObjectMissingProjectNotFound,
+  ];
+  const paginationService = new PaginationServiceStub();
+
+  function getQualityAssuranceEventData1(): QualityAssuranceEventData {
+    return {
+      event: qualityAssuranceEventObjectMissingProjectFound,
+      id: qualityAssuranceEventObjectMissingProjectFound.id,
+      title: qualityAssuranceEventObjectMissingProjectFound.title,
+      hasProject: true,
+      projectTitle: qualityAssuranceEventObjectMissingProjectFound.message.title,
+      projectId: ItemMockPid10.id,
+      handle: ItemMockPid10.handle,
+      reason: null,
+      isRunning: false,
+      target: ItemMockPid8,
+    };
+  }
+
+  function getQualityAssuranceEventData2(): QualityAssuranceEventData {
+    return {
+      event: qualityAssuranceEventObjectMissingProjectNotFound,
+      id: qualityAssuranceEventObjectMissingProjectNotFound.id,
+      title: qualityAssuranceEventObjectMissingProjectNotFound.title,
+      hasProject: false,
+      projectTitle: null,
+      projectId: null,
+      handle: null,
+      reason: null,
+      isRunning: false,
+      target: ItemMockPid9,
+    };
+  }
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        QualityAssuranceEventsComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub(activatedRouteParamsMap, activatedRouteParams) },
+        { provide: QualityAssuranceEventDataService, useValue: qualityAssuranceEventRestServiceStub },
+        { provide: NgbModal, useValue: modalStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: getMockTranslateService() },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ItemDataService, useValue: {} },
+        { provide: AuthorizationDataService, useValue: {} },
+        QualityAssuranceEventsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+    scheduler = getTestScheduler();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-quality-assurance-event></ds-quality-assurance-event>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create QualityAssuranceEventsComponent', inject([QualityAssuranceEventsComponent], (app: QualityAssuranceEventsComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(QualityAssuranceEventsComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    describe('fetchEvents', () => {
+      it('should fetch events', () => {
+        const result = compAsAny.fetchEvents(events);
+        const expected = cold('(a|)', {
+          a: [
+            getQualityAssuranceEventData1(),
+            getQualityAssuranceEventData2(),
+          ],
+        });
+        expect(result).toBeObservable(expected);
+      });
+    });
+
+    describe('modalChoice', () => {
+      beforeEach(() => {
+        spyOn(comp, 'executeAction');
+        spyOn(comp, 'openModal');
+      });
+
+      it('should call executeAction if a project is present', () => {
+        const action = 'ACCEPTED';
+        comp.modalChoice(action, getQualityAssuranceEventData1(), modalStub);
+        expect(comp.executeAction).toHaveBeenCalledWith(action, getQualityAssuranceEventData1());
+      });
+
+      it('should call openModal if a project is not present', () => {
+        const action = 'ACCEPTED';
+        comp.modalChoice(action, getQualityAssuranceEventData2(), modalStub);
+        expect(comp.openModal).toHaveBeenCalledWith(action, getQualityAssuranceEventData2(), modalStub);
+      });
+    });
+
+    describe('openModal', () => {
+      it('should call modalService.open', () => {
+        const action = 'ACCEPTED';
+        comp.selectedReason = null;
+        spyOn(compAsAny.modalService, 'open').and.returnValue({ result: new Promise((res, rej) => 'do' ) });
+        spyOn(comp, 'executeAction');
+
+        comp.openModal(action, getQualityAssuranceEventData1(), modalStub);
+        expect(compAsAny.modalService.open).toHaveBeenCalled();
+      });
+    });
+
+    describe('openModalLookup', () => {
+      it('should call modalService.open', () => {
+        spyOn(comp, 'boundProject');
+        spyOn(compAsAny.modalService, 'open').and.returnValue(
+          {
+            componentInstance: {
+              externalSourceEntry: null,
+              label: null,
+              importedObject: observableOf({
+                indexableObject: NotificationsMockDspaceObject,
+              }),
+            },
+          },
+        );
+        scheduler.schedule(() => {
+          comp.openModalLookup(getQualityAssuranceEventData1());
+        });
+        scheduler.flush();
+
+        expect(compAsAny.modalService.open).toHaveBeenCalled();
+        expect(compAsAny.boundProject).toHaveBeenCalled();
+      });
+    });
+
+    describe('executeAction', () => {
+      it('should call getQualityAssuranceEvents on 200 response from REST', () => {
+        const action = 'ACCEPTED';
+        spyOn(compAsAny, 'getQualityAssuranceEvents').and.returnValue(observableOf([
+          getQualityAssuranceEventData1(),
+          getQualityAssuranceEventData2(),
+        ]));
+        qualityAssuranceEventRestServiceStub.patchEvent.and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+        scheduler.schedule(() => {
+          comp.executeAction(action, getQualityAssuranceEventData1());
+        });
+        scheduler.flush();
+
+        expect(compAsAny.getQualityAssuranceEvents).toHaveBeenCalled();
+      });
+    });
+
+    describe('boundProject', () => {
+      it('should populate the project data inside "eventData"', () => {
+        const eventData = getQualityAssuranceEventData2();
+        const projectId = 'UUID-23943-34u43-38344';
+        const projectName = 'Test Project';
+        const projectHandle = '1000/1000';
+        qualityAssuranceEventRestServiceStub.boundProject.and.returnValue(createSuccessfulRemoteDataObject$({}));
+
+        scheduler.schedule(() => {
+          comp.boundProject(eventData, projectId, projectName, projectHandle);
+        });
+        scheduler.flush();
+
+        expect(eventData.hasProject).toEqual(true);
+        expect(eventData.projectId).toEqual(projectId);
+        expect(eventData.projectTitle).toEqual(projectName);
+        expect(eventData.handle).toEqual(projectHandle);
+      });
+    });
+
+    describe('removeProject', () => {
+      it('should remove the project data inside "eventData"', () => {
+        const eventData = getQualityAssuranceEventData1();
+        qualityAssuranceEventRestServiceStub.removeProject.and.returnValue(createNoContentRemoteDataObject$());
+
+        scheduler.schedule(() => {
+          comp.removeProject(eventData);
+        });
+        scheduler.flush();
+
+        expect(eventData.hasProject).toEqual(false);
+        expect(eventData.projectId).toBeNull();
+        expect(eventData.projectTitle).toBeNull();
+        expect(eventData.handle).toBeNull();
+      });
+    });
+
+    describe('getQualityAssuranceEvents', () => {
+      it('should call the "qualityAssuranceEventRestService.getEventsByTopic" to take data and "fetchEvents" to populate eventData', () => {
+        comp.paginationConfig = new PaginationComponentOptions();
+        comp.paginationConfig.currentPage = 1;
+        comp.paginationConfig.pageSize = 20;
+        comp.paginationSortConfig = new SortOptions('trust', SortDirection.DESC);
+        comp.topic = activatedRouteParamsMap.id;
+        const options: FindListOptions = Object.assign(new FindListOptions(), {
+          currentPage: comp.paginationConfig.currentPage,
+          elementsPerPage: comp.paginationConfig.pageSize,
+        });
+
+        const pageInfo = new PageInfo({
+          elementsPerPage: comp.paginationConfig.pageSize,
+          totalElements: 2,
+          totalPages: 1,
+          currentPage: comp.paginationConfig.currentPage,
+        });
+        const array =  [
+          qualityAssuranceEventObjectMissingProjectFound,
+          qualityAssuranceEventObjectMissingProjectNotFound,
+        ];
+        const paginatedList = buildPaginatedList(pageInfo, array);
+        const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+        qualityAssuranceEventRestServiceStub.getEventsByTopic.and.returnValue(observableOf(paginatedListRD));
+        spyOn(compAsAny, 'fetchEvents').and.returnValue(observableOf([
+          getQualityAssuranceEventData1(),
+          getQualityAssuranceEventData2(),
+        ]));
+
+        scheduler.schedule(() => {
+          compAsAny.getQualityAssuranceEvents().subscribe();
+        });
+        scheduler.flush();
+
+        expect(compAsAny.qualityAssuranceEventRestService.getEventsByTopic).toHaveBeenCalledWith(
+          activatedRouteParamsMap.id,
+          options,
+          followLink('target'),followLink('related'),
+        );
+        expect(compAsAny.fetchEvents).toHaveBeenCalled();
+      });
+    });
+
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.ts b/src/app/notifications/qa/events/quality-assurance-events.component.ts
new file mode 100644
index 0000000000..cd6bf28f34
--- /dev/null
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.ts
@@ -0,0 +1,539 @@
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  from,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  last,
+  map,
+  mergeMap,
+  scan,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
+import {
+  QualityAssuranceEventObject,
+  SourceQualityAssuranceEventMessageObject,
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
+import { Metadata } from '../../../core/shared/metadata.utils';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { hasValue } from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ItemSearchResult } from '../../../shared/object-collection/shared/item-search-result.model';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import {
+  ProjectEntryImportModalComponent,
+  QualityAssuranceEventData,
+} from '../project-entry-import-modal/project-entry-import-modal.component';
+
+/**
+ * Component to display the Quality Assurance event list.
+ */
+@Component({
+  selector: 'ds-quality-assurance-events',
+  templateUrl: './quality-assurance-events.component.html',
+  styleUrls: ['./quality-assurance-events.component.scss'],
+})
+export class QualityAssuranceEventsComponent implements OnInit, OnDestroy {
+  /**
+   * The pagination system configuration for HTML listing.
+   * @type {PaginationComponentOptions}
+   */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'bep',
+    currentPage: 1,
+    pageSize: 10,
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+  /**
+   * The Quality Assurance event list sort options.
+   * @type {SortOptions}
+   */
+  public paginationSortConfig: SortOptions = new SortOptions('trust', SortDirection.DESC);
+  /**
+   * Array to save the presence of a project inside an Quality Assurance event.
+   * @type {QualityAssuranceEventData[]>}
+   */
+  public eventsUpdated$: BehaviorSubject<QualityAssuranceEventData[]> = new BehaviorSubject([]);
+  /**
+   * The total number of Quality Assurance events.
+   * @type {Observable<number>}
+   */
+  public totalElements$: BehaviorSubject<number> = new BehaviorSubject<number>(null);
+  /**
+   * The topic of the Quality Assurance events; suitable for displaying.
+   * @type {string}
+   */
+  public showTopic: string;
+  /**
+   * The topic of the Quality Assurance events; suitable for HTTP calls.
+   * @type {string}
+   */
+  public topic: string;
+  /**
+   * The sourceId of the Quality Assurance events.
+   * @type {string}
+   */
+  sourceId: string;
+  /**
+   * The rejected/ignore reason.
+   * @type {string}
+   */
+  public selectedReason: string;
+  /**
+   * Contains the information about the loading status of the page.
+   * @type {Observable<boolean>}
+   */
+  public isEventPageLoading: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The modal reference.
+   * @type {any}
+   */
+  public modalRef: any;
+  /**
+   * Used to store the status of the 'Show more' button of the abstracts.
+   * @type {boolean}
+   */
+  public showMore = false;
+  /**
+   * The quality assurance source base url for project search
+   */
+  public sourceUrlForProjectSearch: string;
+  /**
+   * The FindListOptions object
+   */
+  protected defaultConfig: FindListOptions = Object.assign(new FindListOptions(), { sort: this.paginationSortConfig });
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The target item id, retrieved from the topic-id composition.
+   */
+  public targetId: string;
+
+  /**
+   * The URL of the item page/target.
+   */
+  public itemPageUrl: string;
+
+  /**
+   * Plain topic name (without the source id)
+   */
+  public selectedTopicName: string;
+
+
+  /**
+   * Observable that emits a boolean value indicating whether the user is an admin.
+   */
+  isAdmin$: Observable<boolean>;
+
+  /**
+   * Initialize the component variables.
+   * @param {ActivatedRoute} activatedRoute
+   * @param {NgbModal} modalService
+   * @param {NotificationsService} notificationsService
+   * @param {QualityAssuranceEventDataService} qualityAssuranceEventRestService
+   * @param {PaginationService} paginationService
+   * @param {TranslateService} translateService
+   * @param authorizationService
+   * @param itemService
+   */
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private modalService: NgbModal,
+    private notificationsService: NotificationsService,
+    private qualityAssuranceEventRestService: QualityAssuranceEventDataService,
+    private paginationService: PaginationService,
+    private translateService: TranslateService,
+    private authorizationService: AuthorizationDataService,
+    private itemService: ItemDataService,
+  ) {
+  }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.isEventPageLoading.next(true);
+    this.isAdmin$ = this.authorizationService.isAuthorized(FeatureID.AdministratorOf);
+    this.activatedRoute.paramMap.pipe(
+      tap((params) => {
+        this.sourceUrlForProjectSearch = environment.qualityAssuranceConfig.sourceUrlMapForProjectSearch[params.get('sourceId')];
+        this.sourceId = params.get('sourceId');
+      }),
+      map((params) => params.get('topicId')),
+      take(1),
+      switchMap((id: string) => {
+        const regEx = /!/g;
+        this.showTopic = id.replace(regEx, '/');
+        this.topic = id;
+        const splitList = this.showTopic?.split(':');
+        this.targetId = splitList.length > 2 ? splitList.pop() : null;
+        this.selectedTopicName = splitList[1];
+        this.sourceId = splitList[0];
+        return this.getQualityAssuranceEvents();
+      }),
+    ).subscribe(
+      {
+        next: (events: QualityAssuranceEventData[]) => {
+          this.eventsUpdated$.next(events);
+          this.isEventPageLoading.next(false);
+        },
+        error: (error: unknown) => {
+          this.isEventPageLoading.next(false);
+        },
+      },
+    );
+  }
+
+  /**
+   * Check if table have a detail column
+   */
+  public hasDetailColumn(): boolean {
+    return (this.showTopic.indexOf('/PROJECT') !== -1 ||
+      this.showTopic.indexOf('/PID') !== -1 ||
+      this.showTopic.indexOf('/SUBJECT') !== -1 ||
+      this.showTopic.indexOf('/WITHDRAWN') !== -1 ||
+      this.showTopic.indexOf('/REINSTATE') !== -1 ||
+      this.showTopic.indexOf('/ABSTRACT') !== -1
+    );
+  }
+
+  /**
+   * Open a modal or run the executeAction directly based on the presence of the project.
+   *
+   * @param {string} action
+   *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   * @param {any} content
+   *    Reference to the modal
+   */
+  public modalChoice(action: string, eventData: QualityAssuranceEventData, content: any): void {
+    if (eventData.hasProject) {
+      this.executeAction(action, eventData);
+    } else {
+      this.openModal(action, eventData, content);
+    }
+  }
+
+  /**
+   * Open the selected modal and performs the action if needed.
+   *
+   * @param {string} action
+   *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   * @param {any} content
+   *    Reference to the modal
+   */
+  public openModal(action: string, eventData: QualityAssuranceEventData, content: any): void {
+    this.modalService.open(content, { ariaLabelledBy: 'modal-basic-title' }).result.then(
+      (result) => {
+        if (result === 'do') {
+          eventData.reason = this.selectedReason;
+          this.executeAction(action, eventData);
+        }
+        this.selectedReason = null;
+      },
+      (_reason) => {
+        this.selectedReason = null;
+      },
+    );
+  }
+
+  /**
+   * Open a modal where the user can select the project.
+   *
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event item data
+   */
+  public openModalLookup(eventData: QualityAssuranceEventData): void {
+    this.modalRef = this.modalService.open(ProjectEntryImportModalComponent, {
+      size: 'lg',
+    });
+    const modalComp = this.modalRef.componentInstance;
+    modalComp.externalSourceEntry = eventData;
+    modalComp.label = 'project';
+    this.subs.push(
+      modalComp.importedObject.pipe(take(1))
+        .subscribe((object: ItemSearchResult) => {
+          const projectTitle = Metadata.first(object.indexableObject.metadata, 'dc.title');
+          this.boundProject(
+            eventData,
+            object.indexableObject.id,
+            projectTitle.value,
+            object.indexableObject.handle,
+          );
+        }),
+    );
+  }
+
+  /**
+   * Performs the choosen action calling the REST service.
+   *
+   * @param {string} action
+   *    the action (can be: ACCEPTED, REJECTED, DISCARDED, PENDING)
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   */
+  public executeAction(action: string, eventData: QualityAssuranceEventData): void {
+    eventData.isRunning = true;
+    let operation;
+    if (action === 'UNDO') {
+      operation = this.delete(eventData);
+    } else {
+      operation = this.qualityAssuranceEventRestService.patchEvent(action, eventData.event, eventData.reason);
+    }
+    this.subs.push(
+      operation.pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((rd: RemoteData<QualityAssuranceEventObject>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(
+              this.translateService.instant('quality-assurance.event.action.saved'),
+            );
+            return this.getQualityAssuranceEvents();
+          } else {
+            this.notificationsService.error(
+              this.translateService.instant('quality-assurance.event.action.error'),
+            );
+            return of(this.eventsUpdated$.value);
+          }
+        }),
+      ).subscribe((events: QualityAssuranceEventData[]) => {
+        this.eventsUpdated$.next(events);
+        eventData.isRunning = false;
+      }),
+    );
+  }
+
+  /**
+   * Bound a project to the publication described in the Quality Assurance event calling the REST service.
+   *
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event item data
+   * @param {string} projectId
+   *    the project Id to bound
+   * @param {string} projectTitle
+   *    the project title
+   * @param {string} projectHandle
+   *    the project handle
+   */
+  public boundProject(eventData: QualityAssuranceEventData, projectId: string, projectTitle: string, projectHandle: string): void {
+    eventData.isRunning = true;
+    this.subs.push(
+      this.qualityAssuranceEventRestService.boundProject(eventData.id, projectId).pipe(getFirstCompletedRemoteData())
+        .subscribe((rd: RemoteData<QualityAssuranceEventObject>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(
+              this.translateService.instant('quality-assurance.event.project.bounded'),
+            );
+            eventData.hasProject = true;
+            eventData.projectTitle = projectTitle;
+            eventData.handle = projectHandle;
+            eventData.projectId = projectId;
+          } else {
+            this.notificationsService.error(
+              this.translateService.instant('quality-assurance.event.project.error'),
+            );
+          }
+          eventData.isRunning = false;
+        }),
+    );
+  }
+
+  /**
+   * Remove the bounded project from the publication described in the Quality Assurance event calling the REST service.
+   *
+   * @param {QualityAssuranceEventData} eventData
+   *    the Quality Assurance event data
+   */
+  public removeProject(eventData: QualityAssuranceEventData): void {
+    eventData.isRunning = true;
+    this.subs.push(
+      this.qualityAssuranceEventRestService.removeProject(eventData.id).pipe(getFirstCompletedRemoteData())
+        .subscribe((rd: RemoteData<QualityAssuranceEventObject>) => {
+          if (rd.hasSucceeded) {
+            this.notificationsService.success(
+              this.translateService.instant('quality-assurance.event.project.removed'),
+            );
+            eventData.hasProject = false;
+            eventData.projectTitle = null;
+            eventData.handle = null;
+            eventData.projectId = null;
+          } else {
+            this.notificationsService.error(
+              this.translateService.instant('quality-assurance.event.project.error'),
+            );
+          }
+          eventData.isRunning = false;
+        }),
+    );
+  }
+
+  /**
+   * Check if the event has a valid href.
+   * @param event
+   */
+  public hasPIDHref(event: SourceQualityAssuranceEventMessageObject): boolean {
+    return this.getPIDHref(event) !== null;
+  }
+
+  /**
+   * Get the event pid href.
+   * @param event
+   */
+  public getPIDHref(event: SourceQualityAssuranceEventMessageObject): string {
+    return event.pidHref;
+  }
+
+  /**
+   * Dispatch the Quality Assurance events retrival.
+   */
+  public getQualityAssuranceEvents(): Observable<QualityAssuranceEventData[]> {
+    return this.paginationService.getFindListOptions(this.paginationConfig.id, this.defaultConfig).pipe(
+      distinctUntilChanged(),
+      switchMap((options: FindListOptions) => this.qualityAssuranceEventRestService.getEventsByTopic(
+        this.topic,
+        options,
+        followLink('target'), followLink('related'),
+      )),
+      getFirstCompletedRemoteData(),
+      switchMap((rd: RemoteData<PaginatedList<QualityAssuranceEventObject>>) => {
+        if (rd.hasSucceeded) {
+          this.totalElements$.next(rd.payload.totalElements);
+          if (rd.payload?.page?.length > 0) {
+            return this.fetchEvents(rd.payload.page);
+          } else {
+            return of([]);
+          }
+        } else {
+          throw new Error('Can\'t retrieve Quality Assurance events from the Broker events REST service');
+        }
+      }),
+      take(1),
+      tap(() => {
+        this.qualityAssuranceEventRestService.clearFindByTopicRequests();
+      }),
+    );
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Fetch Quality Assurance events in order to build proper QualityAssuranceEventData object.
+   *
+   * @param {QualityAssuranceEventObject[]} events
+   *    the Quality Assurance event item
+   * @return array of QualityAssuranceEventData
+   */
+  protected fetchEvents(events: QualityAssuranceEventObject[]): Observable<QualityAssuranceEventData[]> {
+    return from(events).pipe(
+      mergeMap((event: QualityAssuranceEventObject) => {
+        const related$ = event.related.pipe(
+          getFirstCompletedRemoteData(),
+        );
+        const target$ = event.target.pipe(
+          getFirstCompletedRemoteData(),
+        );
+        return combineLatest([related$, target$]).pipe(
+          map(([relatedItemRD, targetItemRD]: [RemoteData<Item>, RemoteData<Item>]) => {
+            const data: QualityAssuranceEventData = {
+              event: event,
+              id: event.id,
+              title: event.title,
+              hasProject: false,
+              projectTitle: null,
+              projectId: null,
+              handle: null,
+              reason: null,
+              isRunning: false,
+              target: (targetItemRD?.hasSucceeded) ? targetItemRD.payload : null,
+            };
+            if (relatedItemRD?.hasSucceeded && relatedItemRD?.payload?.id) {
+              data.hasProject = true;
+              data.projectTitle = event.message.title;
+              data.projectId = relatedItemRD?.payload?.id;
+              data.handle = relatedItemRD?.payload?.handle;
+            }
+            return data;
+          }),
+        );
+      }),
+      scan((acc: any, value: any) => [...acc, value], []),
+      last(),
+    );
+  }
+
+  /**
+   * Deletes a quality assurance event.
+   * @param qaEvent The quality assurance event to delete.
+   * @returns An Observable of RemoteData containing NoContent.
+   */
+  delete(qaEvent: QualityAssuranceEventData): Observable<RemoteData<NoContent>> {
+    return this.qualityAssuranceEventRestService.deleteQAEvent(qaEvent);
+  }
+
+  /**
+   * Returns an Observable that emits the title of the target item.
+   * The target item is retrieved by its ID using the itemService.
+   * The title is extracted from the first metadata value of the item.
+   * The item page URL is also set in the component.
+   * @returns An Observable that emits the title of the target item.
+   */
+  public getTargetItemTitle(): Observable<string> {
+    return this.itemService.findById(this.targetId).pipe(
+      take(1),
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((item: Item) => this.itemPageUrl = getItemPageRoute(item)),
+      map((item: Item) => item.firstMetadataValue('dc.title')),
+    );
+  }
+}
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
new file mode 100644
index 0000000000..1004082a93
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -0,0 +1,71 @@
+<div class="modal-header">
+  <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
+  <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
+          (click)="close()">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <small>{{ (labelPrefix + label + '.publication' | translate) }}</small>
+  <div class="mb-3">
+    <div class="text-truncate">
+      <a target="_blank" [routerLink]="'/items/{{(externalSourceEntry.event.target|async)?.payload?.id}}'">
+        {{externalSourceEntry.title}}
+      </a>
+    </div>
+  </div>
+  <div *ngIf="externalSourceEntry.projectTitle">
+    <small>{{ (labelPrefix + label + '.bountToLocal' |translate) }}</small>
+    <div class="mb-3">
+      <div class="text-truncate">
+        <a target="_blank" [routerLink]="'/items/{{externalSourceEntry.projectId}}'">
+          {{externalSourceEntry.projectTitle}}
+        </a>
+      </div>
+    </div>
+  </div>
+
+  <h4>{{ (labelPrefix + label + '.select' | translate) }}</h4>
+
+  <div id="project-entities" class="mb-3">
+
+    <div id="project-search" class="input-group mb-3">
+      <input type="text" class="form-control" (keyup.enter)="search(projectTitle)" [(ngModel)]="projectTitle" placeholder="{{labelPrefix + label + '.placeholder' |translate}}" aria-label="" aria-describedby="">
+      <div class="input-group-append">
+        <button type="button" class="btn btn-outline-secondary" [disabled]="projectTitle === ''" (click)="projectTitle = ''">{{(labelPrefix + label + '.clear'|translate)}}</button>
+        <button type="button" class="btn btn-primary" [disabled]="projectTitle === ''" (click)="search(projectTitle)">{{(labelPrefix + label + '.search'|translate)}}</button>
+      </div>
+    </div>
+
+    <ds-loading *ngIf="(isLoading$ | async)" message="{{'loading.search-results' | translate}}"></ds-loading>
+    <ds-themed-search-results *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length > 0 && (isLoading$ | async) !== true"
+                              [searchResults]="(localEntitiesRD$ | async)"
+                              [sortConfig]="this.searchOptions?.sort"
+                              [searchConfig]="this.searchOptions"
+                              [selectable]="true"
+                              [disableHeader]="true"
+                              [hidePaginationDetail]="false"
+                              [selectionConfig]="{ repeatable: false, listId: entityListId }"
+                              [showCsvExport]="false"
+                              [linkType]="linkTypes.ExternalLink"
+                              [context]="context"
+                              (deselectObject)="deselectEntity()"
+                              (selectObject)="selectEntity($event)">
+    </ds-themed-search-results>
+
+    <div *ngIf="(localEntitiesRD$ | async)?.payload?.page?.length < 1 && (isLoading$ | async) !== true">
+      <ds-alert [type]="'alert-info'">
+        <p class="lead mb-0">{{(labelPrefix + label + '.notFound' | translate)}}</p>
+      </ds-alert>
+    </div>
+
+  </div>
+</div>
+<div class="modal-footer">
+  <div>
+    <button type="button" class="btn btn-outline-secondary" (click)="close()">{{ (labelPrefix + label + '.cancel' | translate) }}</button>
+  </div>
+  <div>
+    <button type="button" class="btn btn-primary" [disabled]="selectedImportType === importType.None" (click)="bound()">{{ (labelPrefix + label + '.bound' | translate) }}</button>
+  </div>
+</div>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
new file mode 100644
index 0000000000..7db9839e38
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.scss
@@ -0,0 +1,3 @@
+.modal-footer {
+  justify-content: space-between;
+}
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
new file mode 100644
index 0000000000..cddac117b5
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.spec.ts
@@ -0,0 +1,222 @@
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { Item } from '../../../core/shared/item.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import {
+  ItemMockPid10,
+  NotificationsMockDspaceObject,
+  qualityAssuranceEventObjectMissingProjectFound,
+} from '../../../shared/mocks/notifications.mock';
+import { getMockSearchService } from '../../../shared/mocks/search-service.mock';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import {
+  ImportType,
+  ProjectEntryImportModalComponent,
+} from './project-entry-import-modal.component';
+
+const eventData = {
+  event: qualityAssuranceEventObjectMissingProjectFound,
+  id: qualityAssuranceEventObjectMissingProjectFound.id,
+  title: qualityAssuranceEventObjectMissingProjectFound.title,
+  hasProject: true,
+  projectTitle: qualityAssuranceEventObjectMissingProjectFound.message.title,
+  projectId: ItemMockPid10.id,
+  handle: ItemMockPid10.handle,
+  reason: null,
+  isRunning: false,
+};
+
+const searchString = 'Test project to search';
+const pagination = Object.assign(
+  new PaginationComponentOptions(), {
+    id: 'notifications-project-bound',
+    pageSize: 3,
+  },
+);
+const searchOptions = Object.assign(new PaginatedSearchOptions(
+  {
+    configuration: 'funding',
+    query: searchString,
+    pagination: pagination,
+  },
+));
+const pageInfo = new PageInfo({
+  elementsPerPage: 3,
+  totalElements: 1,
+  totalPages: 1,
+  currentPage: 1,
+});
+const array = [
+  NotificationsMockDspaceObject,
+];
+const paginatedList = buildPaginatedList(pageInfo, array);
+const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+
+describe('ProjectEntryImportModalComponent test suite', () => {
+  let fixture: ComponentFixture<ProjectEntryImportModalComponent>;
+  let comp: ProjectEntryImportModalComponent;
+  let compAsAny: any;
+
+  const modalStub = jasmine.createSpyObj('modal', ['close', 'dismiss']);
+  const uuid = '123e4567-e89b-12d3-a456-426614174003';
+  const searchServiceStub: any = getMockSearchService();
+
+
+  beforeEach(async (() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        ProjectEntryImportModalComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub },
+        { provide: SearchService, useValue: searchServiceStub },
+        { provide: SelectableListService, useValue: jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']) },
+        ProjectEntryImportModalComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      searchServiceStub.search.and.returnValue(observableOf(paginatedListRD));
+      const html = `
+        <ds-project-entry-import-modal [externalSourceEntry]="eventData"></ds-project-entry-import-modal>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create ProjectEntryImportModalComponent', inject([ProjectEntryImportModalComponent], (app: ProjectEntryImportModalComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(ProjectEntryImportModalComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+
+    });
+
+    describe('close', () => {
+      it('should close the modal', () => {
+        comp.close();
+        expect(modalStub.close).toHaveBeenCalled();
+      });
+    });
+
+    describe('search', () => {
+      it('should call SearchService.search', () => {
+
+        (searchServiceStub as any).search.and.returnValue(observableOf(paginatedListRD));
+        comp.pagination = pagination;
+
+        comp.search(searchString);
+        expect(comp.searchService.search).toHaveBeenCalledWith(searchOptions);
+      });
+    });
+
+    describe('bound', () => {
+      it('should call close, deselectAllLists and importedObject.emit', () => {
+        spyOn(comp, 'deselectAllLists');
+        spyOn(comp, 'close');
+        spyOn(comp.importedObject, 'emit');
+        comp.selectedEntity = NotificationsMockDspaceObject;
+        comp.bound();
+
+        expect(comp.importedObject.emit).toHaveBeenCalled();
+        expect(comp.deselectAllLists).toHaveBeenCalled();
+        expect(comp.close).toHaveBeenCalled();
+      });
+    });
+
+    describe('selectEntity', () => {
+      const entity = Object.assign(new Item(), { uuid: uuid });
+      beforeEach(() => {
+        comp.selectEntity(entity);
+      });
+
+      it('should set selected entity', () => {
+        expect(comp.selectedEntity).toBe(entity);
+      });
+
+      it('should set the import type to local entity', () => {
+        expect(comp.selectedImportType).toEqual(ImportType.LocalEntity);
+      });
+    });
+
+    describe('deselectEntity', () => {
+      const entity = Object.assign(new Item(), { uuid: uuid });
+      beforeEach(() => {
+        comp.selectedImportType = ImportType.LocalEntity;
+        comp.selectedEntity = entity;
+        comp.deselectEntity();
+      });
+
+      it('should remove the selected entity', () => {
+        expect(comp.selectedEntity).toBeUndefined();
+      });
+
+      it('should set the import type to none', () => {
+        expect(comp.selectedImportType).toEqual(ImportType.None);
+      });
+    });
+
+    describe('deselectAllLists', () => {
+      it('should call SelectableListService.deselectAll', () => {
+        comp.deselectAllLists();
+        expect(compAsAny.selectService.deselectAll).toHaveBeenCalledWith(comp.entityListId);
+        expect(compAsAny.selectService.deselectAll).toHaveBeenCalledWith(comp.authorityListId);
+      });
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+  eventData = eventData;
+}
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
new file mode 100644
index 0000000000..5349a3c995
--- /dev/null
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.ts
@@ -0,0 +1,291 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import {
+  QualityAssuranceEventObject,
+  SourceQualityAssuranceEventMessageObject,
+} from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { CollectionElementLinkType } from '../../../shared/object-collection/collection-element-link.type';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../shared/object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/models/paginated-search-options.model';
+import { SearchResult } from '../../../shared/search/models/search-result.model';
+
+/**
+ * The possible types of import for the external entry
+ */
+export enum ImportType {
+  None = 'None',
+  LocalEntity = 'LocalEntity',
+  LocalAuthority = 'LocalAuthority',
+  NewEntity = 'NewEntity',
+  NewAuthority = 'NewAuthority'
+}
+
+/**
+ * The data type passed from the parent page
+ */
+export interface QualityAssuranceEventData {
+  /**
+   * The Quality Assurance event
+   */
+  event: QualityAssuranceEventObject;
+  /**
+   * The Quality Assurance event Id (uuid)
+   */
+  id: string;
+  /**
+   * The publication title
+   */
+  title: string;
+  /**
+   * Contains the boolean that indicates if a project is present
+   */
+  hasProject: boolean;
+  /**
+   * The project title, if present
+   */
+  projectTitle: string;
+  /**
+   * The project id (uuid), if present
+   */
+  projectId: string;
+  /**
+   * The project handle, if present
+   */
+  handle: string;
+  /**
+   * The reject/discard reason
+   */
+  reason: string;
+  /**
+   * Contains the boolean that indicates if there is a running operation (REST call)
+   */
+  isRunning: boolean;
+  /**
+   * The related publication DSpace item
+   */
+  target?: Item;
+}
+
+@Component({
+  selector: 'ds-project-entry-import-modal',
+  styleUrls: ['./project-entry-import-modal.component.scss'],
+  templateUrl: './project-entry-import-modal.component.html',
+})
+/**
+ * Component to display a modal window for linking a project to an Quality Assurance event
+ * Shows information about the selected project and a selectable list.
+ */
+export class ProjectEntryImportModalComponent implements OnInit {
+  /**
+   * The external source entry
+   */
+  @Input() externalSourceEntry: QualityAssuranceEventData;
+  /**
+   * The number of results per page
+   */
+  pageSize = 3;
+  /**
+   * The prefix for every i18n key within this modal
+   */
+  labelPrefix = 'quality-assurance.event.modal.';
+  /**
+   * The search configuration to retrieve project
+   */
+  configuration = 'funding';
+  /**
+   * The label to use for all messages (added to the end of relevant i18n keys)
+   */
+  label: string;
+  /**
+   * The project title from the parent object
+   */
+  projectTitle: string;
+  /**
+   * The search results
+   */
+  localEntitiesRD$: Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>;
+  /**
+   * Information about the data loading status
+   */
+  isLoading$ = observableOf(true);
+  /**
+   * Search options to use for fetching projects
+   */
+  searchOptions: PaginatedSearchOptions;
+  /**
+   * The context we're currently in (submission)
+   */
+  context = Context.EntitySearchModalWithNameVariants;
+  /**
+   * List ID for selecting local entities
+   */
+  entityListId = 'notifications-project-bound';
+  /**
+   * List ID for selecting local authorities
+   */
+  authorityListId = 'notifications-project-bound-authority';
+  /**
+   * ImportType enum
+   */
+  importType = ImportType;
+  /**
+   * The type of link to render in listable elements
+   */
+  linkTypes = CollectionElementLinkType;
+  /**
+   * The type of import the user currently has selected
+   */
+  selectedImportType = ImportType.None;
+  /**
+   * The selected local entity
+   */
+  selectedEntity: ListableObject;
+  /**
+   * An project has been selected, send it to the parent component
+   */
+  importedObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  /**
+   * Pagination options
+   */
+  pagination: PaginationComponentOptions;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {NgbActiveModal} modal
+   * @param {SearchService} searchService
+   * @param {SelectableListService} selectService
+   */
+  constructor(public modal: NgbActiveModal,
+              public searchService: SearchService,
+              private selectService: SelectableListService) { }
+
+  /**
+   * Component intitialization.
+   */
+  public ngOnInit(): void {
+    this.pagination = Object.assign(new PaginationComponentOptions(), { id: 'notifications-project-bound', pageSize: this.pageSize });
+    this.projectTitle = (this.externalSourceEntry.projectTitle !== null) ? this.externalSourceEntry.projectTitle
+      : (this.externalSourceEntry.event.message as SourceQualityAssuranceEventMessageObject).title;
+    this.searchOptions = Object.assign(new PaginatedSearchOptions(
+      {
+        configuration: this.configuration,
+        query: this.projectTitle,
+        pagination: this.pagination,
+      },
+    ));
+    this.localEntitiesRD$ = this.searchService.search(this.searchOptions);
+    this.subs.push(
+      this.localEntitiesRD$.subscribe(
+        () => this.isLoading$ = observableOf(false),
+      ),
+    );
+  }
+
+  /**
+   * Close the modal.
+   */
+  public close(): void {
+    this.deselectAllLists();
+    this.modal.close();
+  }
+
+  /**
+   * Perform a project search by title.
+   */
+  public search(searchTitle): void {
+    if (isNotEmpty(searchTitle)) {
+      const filterRegEx = /[:]/g;
+      this.isLoading$ = observableOf(true);
+      this.searchOptions = Object.assign(new PaginatedSearchOptions(
+        {
+          configuration: this.configuration,
+          query: (searchTitle) ? searchTitle.replace(filterRegEx, '') : searchTitle,
+          pagination: this.pagination,
+        },
+      ));
+      this.localEntitiesRD$ = this.searchService.search(this.searchOptions);
+      this.subs.push(
+        this.localEntitiesRD$.subscribe(
+          () => this.isLoading$ = observableOf(false),
+        ),
+      );
+    }
+  }
+
+  /**
+   * Perform the bound of the project.
+   */
+  public bound(): void {
+    if (this.selectedEntity !== undefined) {
+      this.importedObject.emit(this.selectedEntity);
+    }
+    this.selectedImportType = ImportType.None;
+    this.deselectAllLists();
+    this.close();
+  }
+
+  /**
+   * Deselected a local entity
+   */
+  public deselectEntity(): void {
+    this.selectedEntity = undefined;
+    if (this.selectedImportType === ImportType.LocalEntity) {
+      this.selectedImportType = ImportType.None;
+    }
+  }
+
+  /**
+   * Selected a local entity
+   * @param entity
+   */
+  public selectEntity(entity): void {
+    this.selectedEntity = entity;
+    this.selectedImportType = ImportType.LocalEntity;
+  }
+
+  /**
+   * Deselect every element from both entity and authority lists
+   */
+  public deselectAllLists(): void {
+    this.selectService.deselectAll(this.entityListId);
+    this.selectService.deselectAll(this.authorityListId);
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.deselectAllLists();
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.actions.ts b/src/app/notifications/qa/source/quality-assurance-source.actions.ts
new file mode 100644
index 0000000000..0493b035ab
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.actions.ts
@@ -0,0 +1,99 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { type } from '../../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const QualityAssuranceSourceActionTypes = {
+  ADD_SOURCE: type('dspace/integration/notifications/qa/ADD_SOURCE'),
+  RETRIEVE_ALL_SOURCE: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE'),
+  RETRIEVE_ALL_SOURCE_ERROR: type('dspace/integration/notifications/qa/RETRIEVE_ALL_SOURCE_ERROR'),
+};
+
+/**
+ * An ngrx action to retrieve all the Quality Assurance source.
+ */
+export class RetrieveAllSourceAction implements Action {
+  type = QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE;
+  payload: {
+    elementsPerPage: number;
+    currentPage: number;
+  };
+
+  /**
+   * Create a new RetrieveAllSourceAction.
+   *
+   * @param elementsPerPage
+   *    the number of source per page
+   * @param currentPage
+   *    The page number to retrieve
+   */
+  constructor(elementsPerPage: number, currentPage: number) {
+    this.payload = {
+      elementsPerPage,
+      currentPage,
+    };
+  }
+}
+
+/**
+ * An ngrx action for retrieving 'all Quality Assurance source' error.
+ */
+export class RetrieveAllSourceErrorAction implements Action {
+  type = QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE_ERROR;
+}
+
+/**
+ * An ngrx action to load the Quality Assurance source objects.
+ * Called by the ??? effect.
+ */
+export class AddSourceAction implements Action {
+  type = QualityAssuranceSourceActionTypes.ADD_SOURCE;
+  payload: {
+    source: QualityAssuranceSourceObject[];
+    totalPages: number;
+    currentPage: number;
+    totalElements: number;
+  };
+
+  /**
+   * Create a new AddSourceAction.
+   *
+   * @param source
+   *    the list of source
+   * @param totalPages
+   *    the total available pages of source
+   * @param currentPage
+   *    the current page
+   * @param totalElements
+   *    the total available Quality Assurance source
+   */
+  constructor(source: QualityAssuranceSourceObject[], totalPages: number, currentPage: number, totalElements: number) {
+    this.payload = {
+      source,
+      totalPages,
+      currentPage,
+      totalElements,
+    };
+  }
+
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types.
+ */
+export type QualityAssuranceSourceActions
+  = RetrieveAllSourceAction
+  |RetrieveAllSourceErrorAction
+  |AddSourceAction;
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.html b/src/app/notifications/qa/source/quality-assurance-source.component.html
new file mode 100644
index 0000000000..bf461873a1
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.html
@@ -0,0 +1,58 @@
+<div class="container">
+    <div class="row">
+      <div class="col-12">
+        <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+        <ds-alert [type]="'alert-info'" [content]="'quality-assurance.source.description'"></ds-alert>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col-12">
+        <h4 class="border-bottom pb-2">{{'quality-assurance.source'| translate}}</h4>
+
+        <ds-loading class="container" *ngIf="(isSourceLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+        <ds-pagination *ngIf="(isSourceLoading() | async) !== true"
+                       [paginationOptions]="paginationConfig"
+                       [collectionSize]="(totalElements$ | async)"
+                       [hideGear]="false"
+                       [hideSortOptions]="true"
+                       (paginationChange)="getQualityAssuranceSource()">
+
+          <ds-loading class="container" *ngIf="(isSourceProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
+          <ng-container *ngIf="(isSourceProcessing() | async) !== true">
+            <div *ngIf="(sources$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+              {{'quality-assurance.noSource' | translate}}
+            </div>
+            <div *ngIf="(sources$ | async)?.length !== 0" class="table-responsive mt-2">
+              <table id="epeople" class="table table-striped table-hover table-bordered">
+                <thead>
+                <tr>
+                  <th scope="col">{{'quality-assurance.table.source' | translate}}</th>
+                  <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                  <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+                </tr>
+                </thead>
+                <tbody>
+                  <tr *ngFor="let sourceElement of (sources$ | async); let i = index">
+                    <td>{{sourceElement.id}}</td>
+                    <td>{{sourceElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                    <td>
+                      <div class="btn-group edit-field">
+                        <button
+                                class="btn btn-outline-primary btn-sm"
+                                title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
+                                [routerLink]="[sourceElement.id]">
+                          <span class="badge badge-info">{{sourceElement.totalEvents}}</span>
+                          <i class="fas fa-info fa-fw"></i>
+                        </button>
+                      </div>
+                    </td>
+                  </tr>
+                </tbody>
+              </table>
+            </div>
+          </ng-container>
+        </ds-pagination>
+      </div>
+    </div>
+  </div>
+
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss b/src/app/notifications/qa/source/quality-assurance-source.component.scss
similarity index 100%
rename from src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.scss
rename to src/app/notifications/qa/source/quality-assurance-source.component.scss
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
new file mode 100644
index 0000000000..c0da6edc3b
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.spec.ts
@@ -0,0 +1,161 @@
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import {
+  getMockNotificationsStateService,
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { NotificationsStateService } from '../../notifications-state.service';
+import { QualityAssuranceSourceComponent } from './quality-assurance-source.component';
+
+describe('QualityAssuranceSourceComponent test suite', () => {
+  let fixture: ComponentFixture<QualityAssuranceSourceComponent>;
+  let comp: QualityAssuranceSourceComponent;
+  let compAsAny: any;
+  const mockNotificationsStateService = getMockNotificationsStateService();
+  const activatedRouteParams = {
+    qualityAssuranceSourceParams: {
+      currentPage: 0,
+      pageSize: 5,
+    },
+  };
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        QualityAssuranceSourceComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), params: observableOf({}) } },
+        { provide: PaginationService, useValue: paginationService },
+        QualityAssuranceSourceComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then(() => {
+      mockNotificationsStateService.getQualityAssuranceSource.and.returnValue(observableOf([
+        qualityAssuranceSourceObjectMorePid,
+        qualityAssuranceSourceObjectMoreAbstract,
+      ]));
+      mockNotificationsStateService.getQualityAssuranceSourceTotalPages.and.returnValue(observableOf(1));
+      mockNotificationsStateService.getQualityAssuranceSourceCurrentPage.and.returnValue(observableOf(0));
+      mockNotificationsStateService.getQualityAssuranceSourceTotals.and.returnValue(observableOf(2));
+      mockNotificationsStateService.isQualityAssuranceSourceLoaded.and.returnValue(observableOf(true));
+      mockNotificationsStateService.isQualityAssuranceSourceLoading.and.returnValue(observableOf(false));
+      mockNotificationsStateService.isQualityAssuranceSourceProcessing.and.returnValue(observableOf(false));
+    });
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-quality-assurance-source></ds-quality-assurance-source>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create QualityAssuranceSourceComponent', inject([QualityAssuranceSourceComponent], (app: QualityAssuranceSourceComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests running with two Source', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(QualityAssuranceSourceComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it(('Should init component properly'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      expect(comp.sources$).toBeObservable(cold('(a|)', {
+        a: [
+          qualityAssuranceSourceObjectMorePid,
+          qualityAssuranceSourceObjectMoreAbstract,
+        ],
+      }));
+      expect(comp.totalElements$).toBeObservable(cold('(a|)', {
+        a: 2,
+      }));
+    });
+
+    it(('Should set data properly after the view init'), () => {
+      spyOn(compAsAny, 'getQualityAssuranceSource');
+
+      comp.ngAfterViewInit();
+      fixture.detectChanges();
+
+      expect(compAsAny.getQualityAssuranceSource).toHaveBeenCalled();
+    });
+
+    it(('isSourceLoading should return FALSE'), () => {
+      expect(comp.isSourceLoading()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('isSourceProcessing should return FALSE'), () => {
+      expect(comp.isSourceProcessing()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('getQualityAssuranceSource should call the service to dispatch a STATE change'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceSource(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage).and.callThrough();
+      expect(compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceSource).toHaveBeenCalledWith(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage);
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.component.ts b/src/app/notifications/qa/source/quality-assurance-source.component.ts
new file mode 100644
index 0000000000..8818a3f9e4
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.component.ts
@@ -0,0 +1,152 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  take,
+} from 'rxjs/operators';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { QualityAssuranceSourcePageParams } from '../../../quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { NotificationsStateService } from '../../notifications-state.service';
+
+/**
+ * Component to display the Quality Assurance source list.
+ */
+@Component({
+  selector: 'ds-quality-assurance-source',
+  templateUrl: './quality-assurance-source.component.html',
+  styleUrls: ['./quality-assurance-source.component.scss'],
+})
+export class QualityAssuranceSourceComponent implements OnInit {
+
+  /**
+  * The pagination system configuration for HTML listing.
+  * @type {PaginationComponentOptions}
+  */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'btp',
+    pageSize: 10,
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+  /**
+   * The Quality Assurance source list sort options.
+   * @type {SortOptions}
+   */
+  public paginationSortConfig: SortOptions;
+  /**
+   * The Quality Assurance source list.
+   */
+  public sources$: Observable<QualityAssuranceSourceObject[]>;
+  /**
+   * The total number of Quality Assurance sources.
+   */
+  public totalElements$: Observable<number>;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {PaginationService} paginationService
+   * @param {NotificationsStateService} notificationsStateService
+   */
+  constructor(
+    private paginationService: PaginationService,
+    private notificationsStateService: NotificationsStateService,
+  ) { }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.sources$ = this.notificationsStateService.getQualityAssuranceSource();
+    this.totalElements$ = this.notificationsStateService.getQualityAssuranceSourceTotals();
+  }
+
+  /**
+   * First Quality Assurance source loading after view initialization.
+   */
+  ngAfterViewInit(): void {
+    this.subs.push(
+      this.notificationsStateService.isQualityAssuranceSourceLoaded().pipe(
+        take(1),
+      ).subscribe(() => {
+        this.getQualityAssuranceSource();
+      }),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the source are loading, 'false' otherwise.
+   */
+  public isSourceLoading(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceSourceLoading();
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance source (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the source (ex.: a REST call), 'false' otherwise.
+   */
+  public isSourceProcessing(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceSourceProcessing();
+  }
+
+  /**
+   * Dispatch the Quality Assurance source retrival.
+   */
+  public getQualityAssuranceSource(): void {
+    this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      distinctUntilChanged(),
+    ).subscribe((options: PaginationComponentOptions) => {
+      this.notificationsStateService.dispatchRetrieveQualityAssuranceSource(
+        options.pageSize,
+        options.currentPage,
+      );
+    });
+  }
+
+  /**
+   * Update pagination Config from route params
+   *
+   * @param eventsRouteParams
+   */
+  protected updatePaginationFromRouteParams(eventsRouteParams: QualityAssuranceSourcePageParams) {
+    if (eventsRouteParams.currentPage) {
+      this.paginationConfig.currentPage = eventsRouteParams.currentPage;
+    }
+    if (eventsRouteParams.pageSize) {
+      if (this.paginationConfig.pageSizeOptions.includes(eventsRouteParams.pageSize)) {
+        this.paginationConfig.pageSize = eventsRouteParams.pageSize;
+      } else {
+        this.paginationConfig.pageSize = this.paginationConfig.pageSizeOptions[0];
+      }
+    }
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.effects.ts b/src/app/notifications/qa/source/quality-assurance-source.effects.ts
new file mode 100644
index 0000000000..d866d43365
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.effects.ts
@@ -0,0 +1,100 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  AddSourceAction,
+  QualityAssuranceSourceActionTypes,
+  RetrieveAllSourceAction,
+  RetrieveAllSourceErrorAction,
+} from './quality-assurance-source.actions';
+import { QualityAssuranceSourceService } from './quality-assurance-source.service';
+
+/**
+ * Provides effect methods for the Quality Assurance source actions.
+ */
+@Injectable()
+export class QualityAssuranceSourceEffects {
+
+  /**
+   * Retrieve all Quality Assurance source managing pagination and errors.
+   */
+  retrieveAllSource$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE),
+    withLatestFrom(this.store$),
+    switchMap(([action, currentState]: [RetrieveAllSourceAction, any]) => {
+      return this.qualityAssuranceSourceService.getSources(
+        action.payload.elementsPerPage,
+        action.payload.currentPage,
+      ).pipe(
+        map((sources: PaginatedList<QualityAssuranceSourceObject>) =>
+          new AddSourceAction(sources.page, sources.totalPages, sources.currentPage, sources.totalElements),
+        ),
+        catchError((error: unknown) => {
+          if (error instanceof Error) {
+            console.error(error.message);
+          } else {
+            console.error('Unexpected object thrown', error);
+          }
+          return observableOf(new RetrieveAllSourceErrorAction());
+        }),
+      );
+    }),
+  ));
+
+  /**
+   * Show a notification on error.
+   */
+  retrieveAllSourceErrorAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE_ERROR),
+    tap(() => {
+      this.notificationsService.error(null, this.translate.get('quality-assurance.source.error.service.retrieve'));
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Clear find all source requests from cache.
+   */
+  addSourceAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceSourceActionTypes.ADD_SOURCE),
+    tap(() => {
+      this.qualityAssuranceSourceDataService.clearFindAllSourceRequests();
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Initialize the effect class variables.
+   * @param {Actions} actions$
+   * @param {Store<any>} store$
+   * @param {TranslateService} translate
+   * @param {NotificationsService} notificationsService
+   * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
+   * @param {QualityAssuranceSourceDataService} qualityAssuranceSourceDataService
+   */
+  constructor(
+    private actions$: Actions,
+    private store$: Store<any>,
+    private translate: TranslateService,
+    private notificationsService: NotificationsService,
+    private qualityAssuranceSourceService: QualityAssuranceSourceService,
+    private qualityAssuranceSourceDataService: QualityAssuranceSourceDataService,
+  ) {
+  }
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
new file mode 100644
index 0000000000..89db166926
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.reducer.spec.ts
@@ -0,0 +1,71 @@
+import {
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import {
+  AddSourceAction,
+  RetrieveAllSourceAction,
+  RetrieveAllSourceErrorAction,
+} from './quality-assurance-source.actions';
+import {
+  qualityAssuranceSourceReducer,
+  QualityAssuranceSourceState,
+} from './quality-assurance-source.reducer';
+
+describe('qualityAssuranceSourceReducer test suite', () => {
+  let qualityAssuranceSourceInitialState: QualityAssuranceSourceState;
+  const elementPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(() => {
+    qualityAssuranceSourceInitialState = {
+      source: [],
+      processing: false,
+      loaded: false,
+      totalPages: 0,
+      currentPage: 0,
+      totalElements: 0,
+    };
+  });
+
+  it('Action RETRIEVE_ALL_SOURCE should set the State property "processing" to TRUE', () => {
+    const expectedState = qualityAssuranceSourceInitialState;
+    expectedState.processing = true;
+
+    const action = new RetrieveAllSourceAction(elementPerPage, currentPage);
+    const newState = qualityAssuranceSourceReducer(qualityAssuranceSourceInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action RETRIEVE_ALL_SOURCE_ERROR should change the State to initial State but processing, loaded, and currentPage', () => {
+    const expectedState = qualityAssuranceSourceInitialState;
+    expectedState.processing = false;
+    expectedState.loaded = true;
+    expectedState.currentPage = 0;
+
+    const action = new RetrieveAllSourceErrorAction();
+    const newState = qualityAssuranceSourceReducer(qualityAssuranceSourceInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action ADD_SOURCE should populate the State with Quality Assurance source', () => {
+    const expectedState = {
+      source: [ qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract ],
+      processing: false,
+      loaded: true,
+      totalPages: 1,
+      currentPage: 0,
+      totalElements: 2,
+    };
+
+    const action = new AddSourceAction(
+      [ qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract ],
+      1, 0, 2,
+    );
+    const newState = qualityAssuranceSourceReducer(qualityAssuranceSourceInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+});
diff --git a/src/app/notifications/qa/source/quality-assurance-source.reducer.ts b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
new file mode 100644
index 0000000000..2c81462c8d
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.reducer.ts
@@ -0,0 +1,75 @@
+import { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import {
+  QualityAssuranceSourceActions,
+  QualityAssuranceSourceActionTypes,
+} from './quality-assurance-source.actions';
+
+/**
+ * The interface representing the Quality Assurance source state.
+ */
+export interface QualityAssuranceSourceState {
+  source: QualityAssuranceSourceObject[];
+  processing: boolean;
+  loaded: boolean;
+  totalPages: number;
+  currentPage: number;
+  totalElements: number;
+}
+
+/**
+ * Used for the Quality Assurance source state initialization.
+ */
+const qualityAssuranceSourceInitialState: QualityAssuranceSourceState = {
+  source: [],
+  processing: false,
+  loaded: false,
+  totalPages: 0,
+  currentPage: 0,
+  totalElements: 0,
+};
+
+/**
+ * The Quality Assurance Source Reducer
+ *
+ * @param state
+ *    the current state initialized with qualityAssuranceSourceInitialState
+ * @param action
+ *    the action to perform on the state
+ * @return QualityAssuranceSourceState
+ *    the new state
+ */
+export function qualityAssuranceSourceReducer(state = qualityAssuranceSourceInitialState, action: QualityAssuranceSourceActions): QualityAssuranceSourceState {
+  switch (action.type) {
+    case QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE: {
+      return Object.assign({}, state, {
+        source: [],
+        processing: true,
+      });
+    }
+
+    case QualityAssuranceSourceActionTypes.ADD_SOURCE: {
+      return Object.assign({}, state, {
+        source: action.payload.source,
+        processing: false,
+        loaded: true,
+        totalPages: action.payload.totalPages,
+        currentPage: state.currentPage,
+        totalElements: action.payload.totalElements,
+      });
+    }
+
+    case QualityAssuranceSourceActionTypes.RETRIEVE_ALL_SOURCE_ERROR: {
+      return Object.assign({}, state, {
+        processing: false,
+        loaded: true,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
new file mode 100644
index 0000000000..12e0ab9a29
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.service.spec.ts
@@ -0,0 +1,71 @@
+import { TestBed } from '@angular/core/testing';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  getMockQualityAssuranceSourceRestService,
+  qualityAssuranceSourceObjectMoreAbstract,
+  qualityAssuranceSourceObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { QualityAssuranceSourceService } from './quality-assurance-source.service';
+
+describe('QualityAssuranceSourceService', () => {
+  let service: QualityAssuranceSourceService;
+  let restService: QualityAssuranceSourceDataService;
+  let serviceAsAny: any;
+  let restServiceAsAny: any;
+
+  const pageInfo = new PageInfo();
+  const array = [ qualityAssuranceSourceObjectMorePid, qualityAssuranceSourceObjectMoreAbstract ];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+  const elementsPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: QualityAssuranceSourceDataService, useClass: getMockQualityAssuranceSourceRestService },
+        { provide: QualityAssuranceSourceService, useValue: service },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    restService = TestBed.inject(QualityAssuranceSourceDataService);
+    restServiceAsAny = restService;
+    restServiceAsAny.getSources.and.returnValue(observableOf(paginatedListRD));
+    service = new QualityAssuranceSourceService(restService);
+    serviceAsAny = service;
+  });
+
+  describe('getSources', () => {
+    it('Should proxy the call to qualityAssuranceSourceRestService.getSources', () => {
+      const sortOptions = new SortOptions('name', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: elementsPerPage,
+        currentPage: currentPage,
+        sort: sortOptions,
+      };
+      const result = service.getSources(elementsPerPage, currentPage);
+      expect((service as any).qualityAssuranceSourceRestService.getSources).toHaveBeenCalledWith(findListOptions);
+    });
+
+    it('Should return a paginated list of Quality Assurance Source', () => {
+      const expected = cold('(a|)', {
+        a: paginatedList,
+      });
+      const result = service.getSources(elementsPerPage, currentPage);
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/notifications/qa/source/quality-assurance-source.service.ts b/src/app/notifications/qa/source/quality-assurance-source.service.ts
new file mode 100644
index 0000000000..790ca67695
--- /dev/null
+++ b/src/app/notifications/qa/source/quality-assurance-source.service.ts
@@ -0,0 +1,61 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+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 { QualityAssuranceSourceObject } from '../../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceDataService } from '../../../core/notifications/qa/source/quality-assurance-source-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+
+/**
+ * The service handling all Quality Assurance source requests to the REST service.
+ */
+@Injectable()
+export class QualityAssuranceSourceService {
+
+  /**
+   * Initialize the service variables.
+   * @param {QualityAssuranceSourceDataService} qualityAssuranceSourceRestService
+   */
+  constructor(
+    private qualityAssuranceSourceRestService: QualityAssuranceSourceDataService,
+  ) {
+  }
+
+  /**
+   * Return the list of Quality Assurance source managing pagination and errors.
+   *
+   * @param elementsPerPage
+   *    The number of the source per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @return Observable<PaginatedList<QualityAssuranceSourceObject>>
+   *    The list of Quality Assurance source.
+   */
+  public getSources(elementsPerPage, currentPage): Observable<PaginatedList<QualityAssuranceSourceObject>> {
+    const sortOptions = new SortOptions('name', SortDirection.ASC);
+
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+    };
+
+    return this.qualityAssuranceSourceRestService.getSources(findListOptions).pipe(
+      getFirstCompletedRemoteData(),
+      map((rd: RemoteData<PaginatedList<QualityAssuranceSourceObject>>) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          throw new Error('Can\'t retrieve Quality Assurance source from the Broker source REST service');
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
new file mode 100644
index 0000000000..670fd7b52a
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.actions.ts
@@ -0,0 +1,103 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { type } from '../../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const QualityAssuranceTopicActionTypes = {
+  ADD_TOPICS: type('dspace/integration/notifications/qa/topic/ADD_TOPICS'),
+  RETRIEVE_ALL_TOPICS: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS'),
+  RETRIEVE_ALL_TOPICS_ERROR: type('dspace/integration/notifications/qa/topic/RETRIEVE_ALL_TOPICS_ERROR'),
+};
+
+/**
+ * An ngrx action to retrieve all the Quality Assurance topics.
+ */
+export class RetrieveAllTopicsAction implements Action {
+  type = QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS;
+  payload: {
+    elementsPerPage: number;
+    currentPage: number;
+    source: string;
+    target?: string;
+  };
+
+  /**
+   * Create a new RetrieveAllTopicsAction.
+   *
+   * @param elementsPerPage
+   *    the number of topics per page
+   * @param currentPage
+   *    The page number to retrieve
+   */
+  constructor(elementsPerPage: number, currentPage: number, source: string, target?: string) {
+    this.payload = {
+      elementsPerPage,
+      currentPage,
+      source,
+      target,
+    };
+  }
+}
+
+/**
+ * An ngrx action for retrieving 'all Quality Assurance topics' error.
+ */
+export class RetrieveAllTopicsErrorAction implements Action {
+  type = QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR;
+}
+
+/**
+ * An ngrx action to load the Quality Assurance topic objects.
+ * Called by the ??? effect.
+ */
+export class AddTopicsAction implements Action {
+  type = QualityAssuranceTopicActionTypes.ADD_TOPICS;
+  payload: {
+    topics: QualityAssuranceTopicObject[];
+    totalPages: number;
+    currentPage: number;
+    totalElements: number;
+  };
+
+  /**
+   * Create a new AddTopicsAction.
+   *
+   * @param topics
+   *    the list of topics
+   * @param totalPages
+   *    the total available pages of topics
+   * @param currentPage
+   *    the current page
+   * @param totalElements
+   *    the total available Quality Assurance topics
+   */
+  constructor(topics: QualityAssuranceTopicObject[], totalPages: number, currentPage: number, totalElements: number) {
+    this.payload = {
+      topics,
+      totalPages,
+      currentPage,
+      totalElements,
+    };
+  }
+
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types.
+ */
+export type QualityAssuranceTopicsActions
+  = AddTopicsAction
+  |RetrieveAllTopicsAction
+  |RetrieveAllTopicsErrorAction;
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
new file mode 100644
index 0000000000..6825bdd080
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -0,0 +1,61 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h2 class="border-bottom pb-2">{{'quality-assurance.title'| translate}}</h2>
+      <ds-alert *ngIf="!targetId" [type]="'alert-info'">{{'quality-assurance.topics.description'| translate:{source: sourceId} }}</ds-alert>
+      <ds-alert *ngIf="targetId" [type]="'alert-info'">
+        {{'quality-assurance.topics.description-with-target'| translate:{source: sourceId} }}
+        <a [routerLink]="itemPageUrl">{{(getTargetItemTitle() | async)}}</a>
+      </ds-alert>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-12">
+      <h4 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h4>
+
+      <ds-loading class="container" *ngIf="(isTopicsLoading() | async)" message="{{'quality-assurance.loading' | translate}}"></ds-loading>
+      <ds-pagination *ngIf="(isTopicsLoading() | async) !== true"
+                     [paginationOptions]="paginationConfig"
+                     [collectionSize]="(totalElements$ | async)"
+                     [hideGear]="false"
+                     [hideSortOptions]="true"
+                     (paginationChange)="getQualityAssuranceTopics(sourceId, targetId)">
+
+        <ds-loading class="container" *ngIf="(isTopicsProcessing() | async)" message="'quality-assurance.loading' | translate"></ds-loading>
+        <ng-container *ngIf="(isTopicsProcessing() | async) !== true">
+          <div *ngIf="(topics$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+            {{'quality-assurance.noTopics' | translate}}
+          </div>
+          <div *ngIf="(topics$ | async)?.length !== 0" class="table-responsive mt-2">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+              <tr>
+                <th scope="col">{{'quality-assurance.table.topic' | translate}}</th>
+                <th scope="col">{{'quality-assurance.table.last-event' | translate}}</th>
+                <th scope="col">{{'quality-assurance.table.actions' | translate}}</th>
+              </tr>
+              </thead>
+              <tbody>
+                <tr *ngFor="let topicElement of (topics$ | async); let i = index">
+                  <td>{{topicElement.name}}</td>
+                  <td>{{topicElement.lastEvent | date: 'dd/MM/yyyy hh:mm' }}</td>
+                  <td>
+                    <div class="btn-group edit-field">
+                      <button
+                              class="btn btn-outline-primary btn-sm"
+                              title="{{'quality-assurance.topics-list.button.detail' | translate : { param: topicElement.name } }}"
+                              [routerLink]="[getQualityAssuranceRoute(), sourceId, topicElement.id]">
+                        <span class="badge badge-info">{{topicElement.totalEvents}}</span>
+                        <i class="fas fa-info fa-fw"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </ng-container>
+      </ds-pagination>
+    </div>
+  </div>
+</div>
diff --git a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.scss
similarity index 100%
rename from src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.html
rename to src/app/notifications/qa/topics/quality-assurance-topics.component.scss
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
new file mode 100644
index 0000000000..2791e69dd4
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.spec.ts
@@ -0,0 +1,169 @@
+/* eslint-disable no-empty, @typescript-eslint/no-empty-function */
+import { CommonModule } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { ItemDataService } from 'src/app/core/data/item-data.service';
+
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import {
+  getMockNotificationsStateService,
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { NotificationsStateService } from '../../notifications-state.service';
+import { QualityAssuranceTopicsComponent } from './quality-assurance-topics.component';
+
+describe('QualityAssuranceTopicsComponent test suite', () => {
+  let fixture: ComponentFixture<QualityAssuranceTopicsComponent>;
+  let comp: QualityAssuranceTopicsComponent;
+  let compAsAny: any;
+  const mockNotificationsStateService = getMockNotificationsStateService();
+  const activatedRouteParams = {
+    qualityAssuranceTopicsParams: {
+      currentPage: 0,
+      pageSize: 5,
+    },
+  };
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        QualityAssuranceTopicsComponent,
+        TestComponent,
+      ],
+      providers: [
+        { provide: NotificationsStateService, useValue: mockNotificationsStateService },
+        { provide: ActivatedRoute, useValue: { data: observableOf(activatedRouteParams), snapshot: {
+          params: {
+            sourceId: 'openaire',
+            targetId: null,
+          },
+        } } },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ItemDataService, useValue: {} },
+        QualityAssuranceTopicsComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then(() => {
+      mockNotificationsStateService.getQualityAssuranceTopics.and.returnValue(observableOf([
+        qualityAssuranceTopicObjectMorePid,
+        qualityAssuranceTopicObjectMoreAbstract,
+      ]));
+      mockNotificationsStateService.getQualityAssuranceTopicsTotalPages.and.returnValue(observableOf(1));
+      mockNotificationsStateService.getQualityAssuranceTopicsCurrentPage.and.returnValue(observableOf(0));
+      mockNotificationsStateService.getQualityAssuranceTopicsTotals.and.returnValue(observableOf(2));
+      mockNotificationsStateService.isQualityAssuranceTopicsLoaded.and.returnValue(observableOf(true));
+      mockNotificationsStateService.isQualityAssuranceTopicsLoading.and.returnValue(observableOf(false));
+      mockNotificationsStateService.isQualityAssuranceTopicsProcessing.and.returnValue(observableOf(false));
+    });
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      const html = `
+        <ds-quality-assurance-topic></ds-quality-assurance-topic>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create QualityAssuranceTopicsComponent', inject([QualityAssuranceTopicsComponent], (app: QualityAssuranceTopicsComponent) => {
+      expect(app).toBeDefined();
+    }));
+  });
+
+  describe('Main tests running with two topics', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(QualityAssuranceTopicsComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    it(('Should init component properly'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      expect(comp.topics$).toBeObservable(cold('(a|)', {
+        a: [
+          qualityAssuranceTopicObjectMorePid,
+          qualityAssuranceTopicObjectMoreAbstract,
+        ],
+      }));
+      expect(comp.totalElements$).toBeObservable(cold('(a|)', {
+        a: 2,
+      }));
+    });
+
+    it(('Should set data properly after the view init'), () => {
+      spyOn(compAsAny, 'getQualityAssuranceTopics');
+
+      comp.ngAfterViewInit();
+      fixture.detectChanges();
+
+      expect(compAsAny.getQualityAssuranceTopics).toHaveBeenCalled();
+    });
+
+    it(('isTopicsLoading should return FALSE'), () => {
+      expect(comp.isTopicsLoading()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('isTopicsProcessing should return FALSE'), () => {
+      expect(comp.isTopicsProcessing()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+
+    it(('getQualityAssuranceTopics should call the service to dispatch a STATE change'), () => {
+      comp.ngOnInit();
+      fixture.detectChanges();
+
+      compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceTopics(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage).and.callThrough();
+      expect(compAsAny.notificationsStateService.dispatchRetrieveQualityAssuranceTopics).toHaveBeenCalledWith(comp.paginationConfig.pageSize, comp.paginationConfig.currentPage);
+    });
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.ts b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
new file mode 100644
index 0000000000..4778daa962
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.ts
@@ -0,0 +1,236 @@
+import {
+  AfterViewInit,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { getNotificatioQualityAssuranceRoute } from '../../../admin/admin-routing-paths';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { QualityAssuranceTopicsPageParams } from '../../../quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { NotificationsStateService } from '../../notifications-state.service';
+
+/**
+ * Component to display the Quality Assurance topic list.
+ */
+@Component({
+  selector: 'ds-quality-assurance-topic',
+  templateUrl: './quality-assurance-topics.component.html',
+  styleUrls: ['./quality-assurance-topics.component.scss'],
+})
+export class QualityAssuranceTopicsComponent implements OnInit, OnDestroy, AfterViewInit {
+  /**
+   * The pagination system configuration for HTML listing.
+   * @type {PaginationComponentOptions}
+   */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'btp',
+    pageSize: 10,
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+  /**
+   * The Quality Assurance topic list sort options.
+   * @type {SortOptions}
+   */
+  public paginationSortConfig: SortOptions;
+  /**
+   * The Quality Assurance topic list.
+   */
+  public topics$: Observable<QualityAssuranceTopicObject[]>;
+  /**
+   * The total number of Quality Assurance topics.
+   */
+  public totalElements$: Observable<number>;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * This property represents a sourceId which is used to retrive a topic
+   * @type {string}
+   */
+  public sourceId: string;
+
+  /**
+   * This property represents a targetId (item-id) which is used to retrive a topic
+   * @type {string}
+   */
+  public targetId: string;
+
+  /**
+   * The URL of the item page.
+   */
+  public itemPageUrl: string;
+
+  /**
+   * Initialize the component variables.
+   * @param {PaginationService} paginationService
+   * @param {ActivatedRoute} activatedRoute
+   * @param itemService
+   * @param {NotificationsStateService} notificationsStateService
+   * @param router
+   */
+  constructor(
+    private paginationService: PaginationService,
+    private activatedRoute: ActivatedRoute,
+    private itemService: ItemDataService,
+    private notificationsStateService: NotificationsStateService,
+    private router: Router,
+  ) {
+    this.sourceId = this.activatedRoute.snapshot.params.sourceId;
+    this.targetId = this.activatedRoute.snapshot.params.targetId;
+  }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.topics$ = this.notificationsStateService.getQualityAssuranceTopics().pipe(
+      tap((topics: QualityAssuranceTopicObject[]) => {
+        const forward = this.activatedRoute.snapshot.queryParams?.forward === 'true';
+        if (topics.length === 1 && forward) {
+          // If there is only one topic, navigate to the first topic automatically
+          this.router.navigate([this.getQualityAssuranceRoute(), this.sourceId, topics[0].id]);
+        }
+      }),
+    );
+    this.totalElements$ = this.notificationsStateService.getQualityAssuranceTopicsTotals();
+  }
+
+  /**
+   * First Quality Assurance topics loading after view initialization.
+   */
+  ngAfterViewInit(): void {
+    this.subs.push(
+      this.notificationsStateService.isQualityAssuranceTopicsLoaded().pipe(
+        take(1),
+      ).subscribe(() => {
+        this.getQualityAssuranceTopics(this.sourceId, this.targetId);
+      }),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the topics are loading, 'false' otherwise.
+   */
+  public isTopicsLoading(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceTopicsLoading();
+  }
+
+  /**
+   * Returns the information about the processing status of the Quality Assurance topics (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the topics (ex.: a REST call), 'false' otherwise.
+   */
+  public isTopicsProcessing(): Observable<boolean> {
+    return this.notificationsStateService.isQualityAssuranceTopicsProcessing();
+  }
+
+  /**
+   * Dispatch the Quality Assurance topics retrival.
+   */
+  public getQualityAssuranceTopics(source: string, target?: string): void {
+    this.subs.push(this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      distinctUntilChanged(),
+    ).subscribe((options: PaginationComponentOptions) => {
+      this.notificationsStateService.dispatchRetrieveQualityAssuranceTopics(
+        options.pageSize,
+        options.currentPage,
+        source,
+        target,
+      );
+    }));
+  }
+
+  /**
+   * Update pagination Config from route params
+   *
+   * @param eventsRouteParams
+   */
+  protected updatePaginationFromRouteParams(eventsRouteParams: QualityAssuranceTopicsPageParams) {
+    if (eventsRouteParams.currentPage) {
+      this.paginationConfig.currentPage = eventsRouteParams.currentPage;
+    }
+    if (eventsRouteParams.pageSize) {
+      if (this.paginationConfig.pageSizeOptions.includes(eventsRouteParams.pageSize)) {
+        this.paginationConfig.pageSize = eventsRouteParams.pageSize;
+      } else {
+        this.paginationConfig.pageSize = this.paginationConfig.pageSizeOptions[0];
+      }
+    }
+  }
+
+  /**
+   * Returns an Observable that emits the title of the target item.
+   * The target item is retrieved by its ID using the itemService.
+   * The title is extracted from the first metadata value of the item.
+   * The item page URL is also set in the component.
+   * @returns An Observable that emits the title of the target item.
+   */
+  getTargetItemTitle(): Observable<string> {
+    return this.itemService.findById(this.targetId).pipe(
+      take(1),
+      getFirstCompletedRemoteData(),
+      getRemoteDataPayload(),
+      tap((item: Item) => this.itemPageUrl = getItemPageRoute(item)),
+      map((item: Item) => item.firstMetadataValue('dc.title')),
+    );
+  }
+
+  /**
+   * Returns the page route for the given item.
+   * @param item The item to get the page route for.
+   * @returns The page route for the given item.
+   */
+  getItemPageRoute(item: Item): string {
+    return getItemPageRoute(item);
+  }
+
+  /**
+   * Returns the quality assurance route.
+   * @returns The quality assurance route.
+   */
+  getQualityAssuranceRoute(): string {
+    return getNotificatioQualityAssuranceRoute();
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
new file mode 100644
index 0000000000..0009df0ef5
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.effects.ts
@@ -0,0 +1,101 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  AddTopicsAction,
+  QualityAssuranceTopicActionTypes,
+  RetrieveAllTopicsAction,
+  RetrieveAllTopicsErrorAction,
+} from './quality-assurance-topics.actions';
+import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
+
+/**
+ * Provides effect methods for the Quality Assurance topics actions.
+ */
+@Injectable()
+export class QualityAssuranceTopicsEffects {
+
+  /**
+   * Retrieve all Quality Assurance topics managing pagination and errors.
+   */
+  retrieveAllTopics$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS),
+    withLatestFrom(this.store$),
+    switchMap(([action, currentState]: [RetrieveAllTopicsAction, any]) => {
+      return this.qualityAssuranceTopicService.getTopics(
+        action.payload.elementsPerPage,
+        action.payload.currentPage,
+        action.payload.source,
+        action.payload.target,
+      ).pipe(
+        map((topics: PaginatedList<QualityAssuranceTopicObject>) =>
+          new AddTopicsAction(topics.page, topics.totalPages, topics.currentPage, topics.totalElements),
+        ),
+        catchError((error: unknown) => {
+          if (error instanceof Error) {
+            console.error(error.message);
+          } else {
+            console.error('Unexpected object thrown', error);
+          }
+          return observableOf(new RetrieveAllTopicsErrorAction());
+        }),
+      );
+    }),
+  ));
+
+  /**
+   * Show a notification on error.
+   */
+  retrieveAllTopicsErrorAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR),
+    tap(() => {
+      this.notificationsService.error(null, this.translate.get('quality-assurance.topic.error.service.retrieve'));
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Clear find all topics requests from cache.
+   */
+  addTopicsAction$ = createEffect(() => this.actions$.pipe(
+    ofType(QualityAssuranceTopicActionTypes.ADD_TOPICS),
+    tap(() => {
+      this.qualityAssuranceTopicDataService.clearFindAllTopicsRequests();
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Initialize the effect class variables.
+   * @param {Actions} actions$
+   * @param {Store<any>} store$
+   * @param {TranslateService} translate
+   * @param {NotificationsService} notificationsService
+   * @param {QualityAssuranceTopicsService} qualityAssuranceTopicService
+   * @param {QualityAssuranceTopicDataService} qualityAssuranceTopicDataService
+   */
+  constructor(
+    private actions$: Actions,
+    private store$: Store<any>,
+    private translate: TranslateService,
+    private notificationsService: NotificationsService,
+    private qualityAssuranceTopicService: QualityAssuranceTopicsService,
+    private qualityAssuranceTopicDataService: QualityAssuranceTopicDataService,
+  ) { }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
new file mode 100644
index 0000000000..06da2969fa
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.spec.ts
@@ -0,0 +1,71 @@
+import {
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import {
+  AddTopicsAction,
+  RetrieveAllTopicsAction,
+  RetrieveAllTopicsErrorAction,
+} from './quality-assurance-topics.actions';
+import {
+  qualityAssuranceTopicsReducer,
+  QualityAssuranceTopicState,
+} from './quality-assurance-topics.reducer';
+
+describe('qualityAssuranceTopicsReducer test suite', () => {
+  let qualityAssuranceTopicInitialState: QualityAssuranceTopicState;
+  const elementPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(() => {
+    qualityAssuranceTopicInitialState = {
+      topics: [],
+      processing: false,
+      loaded: false,
+      totalPages: 0,
+      currentPage: 0,
+      totalElements: 0,
+    };
+  });
+
+  it('Action RETRIEVE_ALL_TOPICS should set the State property "processing" to TRUE', () => {
+    const expectedState = qualityAssuranceTopicInitialState;
+    expectedState.processing = true;
+
+    const action = new RetrieveAllTopicsAction(elementPerPage, currentPage, 'ENRICH!MORE!ABSTRACT');
+    const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action RETRIEVE_ALL_TOPICS_ERROR should change the State to initial State but processing, loaded, and currentPage', () => {
+    const expectedState = qualityAssuranceTopicInitialState;
+    expectedState.processing = false;
+    expectedState.loaded = true;
+    expectedState.currentPage = 0;
+
+    const action = new RetrieveAllTopicsErrorAction();
+    const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+
+  it('Action ADD_TOPICS should populate the State with Quality Assurance topics', () => {
+    const expectedState = {
+      topics: [ qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract ],
+      processing: false,
+      loaded: true,
+      totalPages: 1,
+      currentPage: 0,
+      totalElements: 2,
+    };
+
+    const action = new AddTopicsAction(
+      [ qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract ],
+      1, 0, 2,
+    );
+    const newState = qualityAssuranceTopicsReducer(qualityAssuranceTopicInitialState, action);
+
+    expect(newState).toEqual(expectedState);
+  });
+});
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
new file mode 100644
index 0000000000..f1a644a53b
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.reducer.ts
@@ -0,0 +1,75 @@
+import { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import {
+  QualityAssuranceTopicActionTypes,
+  QualityAssuranceTopicsActions,
+} from './quality-assurance-topics.actions';
+
+/**
+ * The interface representing the Quality Assurance topic state.
+ */
+export interface QualityAssuranceTopicState {
+  topics: QualityAssuranceTopicObject[];
+  processing: boolean;
+  loaded: boolean;
+  totalPages: number;
+  currentPage: number;
+  totalElements: number;
+}
+
+/**
+ * Used for the Quality Assurance topic state initialization.
+ */
+const qualityAssuranceTopicInitialState: QualityAssuranceTopicState = {
+  topics: [],
+  processing: false,
+  loaded: false,
+  totalPages: 0,
+  currentPage: 0,
+  totalElements: 0,
+};
+
+/**
+ * The Quality Assurance Topic Reducer
+ *
+ * @param state
+ *    the current state initialized with qualityAssuranceTopicInitialState
+ * @param action
+ *    the action to perform on the state
+ * @return QualityAssuranceTopicState
+ *    the new state
+ */
+export function qualityAssuranceTopicsReducer(state = qualityAssuranceTopicInitialState, action: QualityAssuranceTopicsActions): QualityAssuranceTopicState {
+  switch (action.type) {
+    case QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS: {
+      return Object.assign({}, state, {
+        topics: [],
+        processing: true,
+      });
+    }
+
+    case QualityAssuranceTopicActionTypes.ADD_TOPICS: {
+      return Object.assign({}, state, {
+        topics: action.payload.topics,
+        processing: false,
+        loaded: true,
+        totalPages: action.payload.totalPages,
+        currentPage: state.currentPage,
+        totalElements: action.payload.totalElements,
+      });
+    }
+
+    case QualityAssuranceTopicActionTypes.RETRIEVE_ALL_TOPICS_ERROR: {
+      return Object.assign({}, state, {
+        processing: false,
+        loaded: true,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
new file mode 100644
index 0000000000..a1ae542352
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.spec.ts
@@ -0,0 +1,74 @@
+import { TestBed } from '@angular/core/testing';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import {
+  getMockQualityAssuranceTopicRestService,
+  qualityAssuranceTopicObjectMoreAbstract,
+  qualityAssuranceTopicObjectMorePid,
+} from '../../../shared/mocks/notifications.mock';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
+import { QualityAssuranceTopicsService } from './quality-assurance-topics.service';
+
+describe('QualityAssuranceTopicsService', () => {
+  let service: QualityAssuranceTopicsService;
+  let restService: QualityAssuranceTopicDataService;
+  let serviceAsAny: any;
+  let restServiceAsAny: any;
+
+  const pageInfo = new PageInfo();
+  const array = [ qualityAssuranceTopicObjectMorePid, qualityAssuranceTopicObjectMoreAbstract ];
+  const paginatedList = buildPaginatedList(pageInfo, array);
+  const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+  const elementsPerPage = 3;
+  const currentPage = 0;
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: QualityAssuranceTopicDataService, useClass: getMockQualityAssuranceTopicRestService },
+        { provide: QualityAssuranceTopicsService, useValue: service },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    restService = TestBed.inject(QualityAssuranceTopicDataService);
+    restServiceAsAny = restService;
+    restServiceAsAny.searchTopicsBySource.and.returnValue(observableOf(paginatedListRD));
+    restServiceAsAny.searchTopicsByTarget.and.returnValue(observableOf(paginatedListRD));
+    service = new QualityAssuranceTopicsService(restService);
+    serviceAsAny = service;
+  });
+
+  describe('getTopics', () => {
+    it('should proxy the call to qualityAssuranceTopicRestService.searchTopicsBySource', () => {
+      const sortOptions = new SortOptions('name', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: elementsPerPage,
+        currentPage: currentPage,
+        sort: sortOptions,
+        searchParams: [new RequestParam('source', 'openaire')],
+      };
+      service.getTopics(elementsPerPage, currentPage, 'openaire');
+      expect((service as any).qualityAssuranceTopicRestService.searchTopicsBySource).toHaveBeenCalledWith(findListOptions);
+    });
+
+    it('should return a paginated list of Quality Assurance topics', () => {
+      const expected = cold('(a|)', {
+        a: paginatedList,
+      });
+      const result = service.getTopics(elementsPerPage, currentPage, 'openaire');
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.service.ts b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
new file mode 100644
index 0000000000..3c737990e0
--- /dev/null
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.service.ts
@@ -0,0 +1,72 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+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 { QualityAssuranceTopicObject } from '../../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicDataService } from '../../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+
+/**
+ * The service handling all Quality Assurance topic requests to the REST service.
+ */
+@Injectable()
+export class QualityAssuranceTopicsService {
+
+  /**
+   * Initialize the service variables.
+   * @param {QualityAssuranceTopicDataService} qualityAssuranceTopicRestService
+   */
+  constructor(
+    private qualityAssuranceTopicRestService: QualityAssuranceTopicDataService,
+  ) { }
+
+
+  /**
+   * Return the list of Quality Assurance topics managing pagination and errors.
+   *
+   * @param elementsPerPage
+   *    The number of the topics per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @return Observable<PaginatedList<QualityAssuranceTopicObject>>
+   *    The list of Quality Assurance topics.
+   */
+  public getTopics(elementsPerPage, currentPage, source: string, target?: string): Observable<PaginatedList<QualityAssuranceTopicObject>> {
+    const sortOptions = new SortOptions('name', SortDirection.ASC);
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+      searchParams: [new RequestParam('source', source)],
+    };
+
+    let request$: Observable<RemoteData<PaginatedList<QualityAssuranceTopicObject>>>;
+
+    if (hasValue(target)) {
+      findListOptions.searchParams.push(new RequestParam('target', target));
+      request$ = this.qualityAssuranceTopicRestService.searchTopicsByTarget(findListOptions);
+    } else {
+      request$ = this.qualityAssuranceTopicRestService.searchTopicsBySource(findListOptions);
+    }
+
+    return request$.pipe(
+      getFirstCompletedRemoteData(),
+      map((rd: RemoteData<PaginatedList<QualityAssuranceTopicObject>>) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          throw new Error('Can\'t retrieve Quality Assurance topics from the Broker topics REST service');
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/notifications/selectors.ts b/src/app/notifications/selectors.ts
new file mode 100644
index 0000000000..10090d21dc
--- /dev/null
+++ b/src/app/notifications/selectors.ts
@@ -0,0 +1,155 @@
+import {
+  createFeatureSelector,
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import { QualityAssuranceSourceObject } from '../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from '../core/notifications/qa/models/quality-assurance-topic.model';
+import { subStateSelector } from '../shared/selector.util';
+import {
+  suggestionNotificationsSelector,
+  SuggestionNotificationsState,
+} from './notifications.reducer';
+import { QualityAssuranceSourceState } from './qa/source/quality-assurance-source.reducer';
+import { QualityAssuranceTopicState } from './qa/topics/quality-assurance-topics.reducer';
+
+/**
+ * Returns the Notifications state.
+ * @function _getNotificationsState
+ * @param {AppState} state Top level state.
+ * @return {SuggestionNotificationsState}
+ */
+const _getNotificationsState = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
+
+// Quality Assurance topics
+// ----------------------------------------------------------------------------
+
+/**
+ * Returns the Quality Assurance topics State.
+ * @function qualityAssuranceTopicsStateSelector
+ * @return {QualityAssuranceTopicState}
+ */
+export function qualityAssuranceTopicsStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicState> {
+  return subStateSelector<SuggestionNotificationsState,QualityAssuranceTopicState>(suggestionNotificationsSelector, 'qaTopic');
+}
+
+/**
+ * Returns the Quality Assurance topics list.
+ * @function qualityAssuranceTopicsObjectSelector
+ * @return {QualityAssuranceTopicObject[]}
+ */
+export function qualityAssuranceTopicsObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]> {
+  return subStateSelector<SuggestionNotificationsState, QualityAssuranceTopicObject[]>(qualityAssuranceTopicsStateSelector(), 'topics');
+}
+
+/**
+ * Returns true if the Quality Assurance topics are loaded.
+ * @function isQualityAssuranceTopicsLoadedSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceTopicsLoadedSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.loaded,
+);
+
+/**
+ * Returns true if the deduplication sets are processing.
+ * @function isDeduplicationSetsProcessingSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceTopicsProcessingSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.processing,
+);
+
+/**
+ * Returns the total available pages of Quality Assurance topics.
+ * @function getQualityAssuranceTopicsTotalPagesSelector
+ * @return {number}
+ */
+export const getQualityAssuranceTopicsTotalPagesSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.totalPages,
+);
+
+/**
+ * Returns the current page of Quality Assurance topics.
+ * @function getQualityAssuranceTopicsCurrentPageSelector
+ * @return {number}
+ */
+export const getQualityAssuranceTopicsCurrentPageSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.currentPage,
+);
+
+/**
+ * Returns the total number of Quality Assurance topics.
+ * @function getQualityAssuranceTopicsTotalsSelector
+ * @return {number}
+ */
+export const getQualityAssuranceTopicsTotalsSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaTopic.totalElements,
+);
+
+// Quality Assurance source
+// ----------------------------------------------------------------------------
+
+/**
+ * Returns the Quality Assurance source State.
+ * @function qualityAssuranceSourceStateSelector
+ * @return {QualityAssuranceSourceState}
+ */
+export function qualityAssuranceSourceStateSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceState> {
+  return subStateSelector<SuggestionNotificationsState,QualityAssuranceSourceState>(suggestionNotificationsSelector, 'qaSource');
+}
+
+/**
+ * Returns the Quality Assurance source list.
+ * @function qualityAssuranceSourceObjectSelector
+ * @return {QualityAssuranceSourceObject[]}
+ */
+export function qualityAssuranceSourceObjectSelector(): MemoizedSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]> {
+  return subStateSelector<SuggestionNotificationsState, QualityAssuranceSourceObject[]>(qualityAssuranceSourceStateSelector(), 'source');
+}
+
+/**
+ * Returns true if the Quality Assurance source are loaded.
+ * @function isQualityAssuranceSourceLoadedSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceSourceLoadedSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.loaded,
+);
+
+/**
+ * Returns true if the deduplication sets are processing.
+ * @function isDeduplicationSetsProcessingSelector
+ * @return {boolean}
+ */
+export const isQualityAssuranceSourceProcessingSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.processing,
+);
+
+/**
+ * Returns the total available pages of Quality Assurance source.
+ * @function getQualityAssuranceSourceTotalPagesSelector
+ * @return {number}
+ */
+export const getQualityAssuranceSourceTotalPagesSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.totalPages,
+);
+
+/**
+ * Returns the current page of Quality Assurance source.
+ * @function getQualityAssuranceSourceCurrentPageSelector
+ * @return {number}
+ */
+export const getQualityAssuranceSourceCurrentPageSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.currentPage,
+);
+
+/**
+ * Returns the total number of Quality Assurance source.
+ * @function getQualityAssuranceSourceTotalsSelector
+ * @return {number}
+ */
+export const getQualityAssuranceSourceTotalsSelector = createSelector(_getNotificationsState,
+  (state: SuggestionNotificationsState) => state.qaSource.totalElements,
+);
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.html b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
new file mode 100644
index 0000000000..2a46191dee
--- /dev/null
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.html
@@ -0,0 +1,29 @@
+<div class="d-inline">
+  <div ngbDropdown class="d-inline">
+    <button *ngIf="isCollectionFixed; else chooseCollection" class="btn btn-success" type="button" (click)="approveAndImportCollectionFixed()">
+      <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+    </button>
+    <ng-template #chooseCollection>
+      <button class="btn btn-success" id="dropdownSubmission" ngbDropdownToggle
+              type="button">
+        <i class="fa fa-check" aria-hidden="true"></i> {{ approveAndImportLabel() | translate}}
+        <span class="caret"></span>
+      </button>
+
+      <div ngbDropdownMenu
+           class="dropdown-menu"
+           id="entityControlsDropdownMenu"
+           aria-labelledby="dropdownSubmission">
+        <ds-entity-dropdown (selectionChange)="openDialog($event)"></ds-entity-dropdown>
+      </div>
+    </ng-template>
+
+  </div>
+  <button (click)="ignoreSuggestion()" class="btn btn-danger ml-2"><i class="fa fa-ban"></i>
+    {{ ignoreSuggestionLabel() | translate}}</button>
+  <button *ngIf="!isBulk" (click)="toggleSeeEvidences()" [disabled]="!hasEvidence" class="btn btn-info ml-2">
+    <i class="fa fa-eye"></i>
+    <ng-container *ngIf="!seeEvidence"> {{ 'suggestion.seeEvidence' | translate}}</ng-container>
+    <ng-container *ngIf="seeEvidence"> {{ 'suggestion.hideEvidence' | translate}}</ng-container>
+  </button>
+</div>
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.scss b/src/app/notifications/suggestion-actions/suggestion-actions.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/app/notifications/suggestion-actions/suggestion-actions.component.ts b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
new file mode 100644
index 0000000000..d25d21510c
--- /dev/null
+++ b/src/app/notifications/suggestion-actions/suggestion-actions.component.ts
@@ -0,0 +1,101 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { take } from 'rxjs/operators';
+
+import { Suggestion } from '../../core/notifications/models/suggestion.model';
+import { Collection } from '../../core/shared/collection.model';
+import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { SuggestionApproveAndImport } from '../suggestion-list-element/suggestion-list-element.component';
+
+/**
+ * Show and trigger the actions to submit for a suggestion
+ */
+@Component({
+  selector: 'ds-suggestion-actions',
+  styleUrls: [ './suggestion-actions.component.scss' ],
+  templateUrl: './suggestion-actions.component.html',
+})
+export class SuggestionActionsComponent {
+
+  @Input() object: Suggestion;
+
+  @Input() isBulk = false;
+
+  @Input() hasEvidence = false;
+
+  @Input() seeEvidence = false;
+
+  @Input() isCollectionFixed = false;
+
+  /**
+   * The component is used to Delete suggestion
+   */
+  @Output() ignoreSuggestionClicked = new EventEmitter<string>();
+
+  /**
+   * The component is used to approve & import
+   */
+  @Output() approveAndImport = new EventEmitter<SuggestionApproveAndImport>();
+
+  /**
+   * The component is used to approve & import
+   */
+  @Output() seeEvidences = new EventEmitter<boolean>();
+
+  constructor(private modalService: NgbModal) { }
+
+  /**
+   * Method called on clicking the button "approve & import", It opens a dialog for
+   * select a collection and it emits an approveAndImport event.
+   */
+  openDialog(entity: ItemType) {
+
+    const modalRef = this.modalService.open(CreateItemParentSelectorComponent);
+    modalRef.componentInstance.emitOnly = true;
+    modalRef.componentInstance.entityType = entity.label;
+
+    modalRef.componentInstance.select.pipe(take(1))
+      .subscribe((collection: Collection) => {
+        this.approveAndImport.emit({
+          suggestion: this.isBulk ? undefined : this.object,
+          collectionId: collection.id,
+        });
+      });
+  }
+
+  approveAndImportCollectionFixed() {
+    this.approveAndImport.emit({
+      suggestion: this.isBulk ? undefined : this.object,
+      collectionId: null,
+    });
+  }
+
+
+  /**
+   * Delete the suggestion
+   */
+  ignoreSuggestion() {
+    this.ignoreSuggestionClicked.emit(this.isBulk ? undefined : this.object.id);
+  }
+
+  /**
+   * Toggle See Evidence
+   */
+  toggleSeeEvidences() {
+    this.seeEvidences.emit(!this.seeEvidence);
+  }
+
+  ignoreSuggestionLabel(): string {
+    return this.isBulk ? 'suggestion.ignoreSuggestion.bulk' : 'suggestion.ignoreSuggestion' ;
+  }
+
+  approveAndImportLabel(): string {
+    return this.isBulk ? 'suggestion.approveAndImport.bulk' : 'suggestion.approveAndImport';
+  }
+}
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
new file mode 100644
index 0000000000..e23c244eb4
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.html
@@ -0,0 +1,20 @@
+<div>
+  <div class="table-responsive" *ngIf="evidences">
+    <table class="table">
+      <thead>
+        <tr>
+          <th>{{'suggestion.evidence.score' | translate}}</th>
+          <th>{{'suggestion.evidence.type' | translate}}</th>
+          <th>{{'suggestion.evidence.notes' | translate}}</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr *ngFor="let evidence of evidences | dsObjectKeys">
+          <td>{{evidences[evidence].score}}</td>
+          <td>{{evidence | translate}}</td>
+          <td>{{evidences[evidence].notes}}</td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+</div>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.scss b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
new file mode 100644
index 0000000000..31f6405a2c
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component.ts
@@ -0,0 +1,22 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { SuggestionEvidences } from '../../../core/notifications/models/suggestion.model';
+import { fadeIn } from '../../../shared/animations/fade';
+
+/**
+ * Show suggestion evidences such as score (authorScore, dateScore)
+ */
+@Component({
+  selector: 'ds-suggestion-evidences',
+  styleUrls: [ './suggestion-evidences.component.scss' ],
+  templateUrl: './suggestion-evidences.component.html',
+  animations: [fadeIn],
+})
+export class SuggestionEvidencesComponent {
+
+  @Input() evidences: SuggestionEvidences;
+
+}
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
new file mode 100644
index 0000000000..ef27876f2c
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.html
@@ -0,0 +1,45 @@
+<div class="container">
+  <div class="row">
+    <!-- Bulk Selection Panel -->
+    <div class="col-1 text-center align-self-center">
+      <div class="">
+        <input type="checkbox" class="form-check-input"
+               [checked]="isSelected" (change)="changeSelected($event)"
+               [attr.aria-label]="object.display"/>
+      </div>
+    </div>
+    <!-- Total Score Panel -->
+    <div class="col-2 text-center align-self-center">
+      <div class="">
+        <div><strong> {{'suggestion.totalScore' | translate}}</strong> </div>
+        <span class="suggestion-score">{{ object.score }}</span>
+      </div>
+    </div>
+    <!-- Suggestion Panel -->
+    <div class="col">
+        <!-- Object Preview -->
+        <ds-item-search-result-list-element
+          [showLabel]="false"
+          [showThumbnails]="false"
+          [object]="listableObject"
+          [linkType]="0"
+        ></ds-item-search-result-list-element>
+        <!-- Actions -->
+      <ds-suggestion-actions class="parent mt-2" [hasEvidence]="hasEvidences()"
+                             [seeEvidence]="seeEvidence"
+                             [object]="object"
+                             [isCollectionFixed]="isCollectionFixed"
+                             (approveAndImport)="onApproveAndImport($event)"
+                             (seeEvidences)="onSeeEvidences($event)"
+                             (ignoreSuggestionClicked)="onIgnoreSuggestion($event)"
+      ></ds-suggestion-actions>
+    </div>
+  </div>
+  <!-- Evidences Panel -->
+  <div *ngIf="seeEvidence" class="mt-2 row">
+    <div class="col offset-3">
+      <ds-suggestion-evidences [evidences]="object.evidences"></ds-suggestion-evidences>
+    </div>
+  </div>
+</div>
+<hr>
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss
new file mode 100644
index 0000000000..1c52209518
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.scss
@@ -0,0 +1,16 @@
+.issue-date {
+  color: #c8c8c8;
+}
+
+.parent {
+  display: flex;
+  gap:10px;
+}
+
+.import {
+  flex: initial;
+}
+
+.suggestion-score {
+  font-size: 1.5rem;
+}
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
new file mode 100644
index 0000000000..b2b053e254
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.spec.ts
@@ -0,0 +1,85 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+import { Item } from '../../core/shared/item.model';
+import { mockSuggestionPublicationOne } from '../../shared/mocks/publication-claim.mock';
+import { SuggestionListElementComponent } from './suggestion-list-element.component';
+
+describe('SuggestionListElementComponent', () => {
+  let component: SuggestionListElementComponent;
+  let fixture: ComponentFixture<SuggestionListElementComponent>;
+  let scheduler: TestScheduler;
+
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [SuggestionListElementComponent],
+      providers: [
+        NgbModal,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SuggestionListElementComponent);
+    component = fixture.componentInstance;
+    scheduler = getTestScheduler();
+
+    component.object = mockSuggestionPublicationOne;
+  });
+
+  describe('SuggestionListElementComponent test', () => {
+
+    it('should create', () => {
+      scheduler.schedule(() => fixture.detectChanges());
+      scheduler.flush();
+      const expectedIndexableObject = Object.assign(new Item(), {
+        id: mockSuggestionPublicationOne.id,
+        metadata: mockSuggestionPublicationOne.metadata,
+      });
+      expect(component).toBeTruthy();
+      expect(component.listableObject.hitHighlights).toEqual({});
+      expect(component.listableObject.indexableObject).toEqual(expectedIndexableObject);
+    });
+
+    it('should check if has evidence', () => {
+      expect(component.hasEvidences()).toBeTruthy();
+    });
+
+    it('should set seeEvidences', () => {
+      component.onSeeEvidences(true);
+      expect(component.seeEvidence).toBeTruthy();
+    });
+
+    it('should emit selection', () => {
+      spyOn(component.selected, 'next');
+      component.changeSelected({ target: { checked: true } });
+      expect(component.selected.next).toHaveBeenCalledWith(true);
+    });
+
+    it('should emit for deletion', () => {
+      spyOn(component.ignoreSuggestionClicked, 'emit');
+      component.onIgnoreSuggestion('1234');
+      expect(component.ignoreSuggestionClicked.emit).toHaveBeenCalledWith('1234');
+    });
+
+    it('should emit for approve and import', () => {
+      const event = { collectionId:'1234', suggestion: mockSuggestionPublicationOne };
+      spyOn(component.approveAndImport, 'emit');
+      component.onApproveAndImport(event);
+      expect(component.approveAndImport.emit).toHaveBeenCalledWith(event);
+    });
+  });
+});
diff --git a/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
new file mode 100644
index 0000000000..22e212525a
--- /dev/null
+++ b/src/app/notifications/suggestion-list-element/suggestion-list-element.component.ts
@@ -0,0 +1,109 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Suggestion } from 'src/app/core/notifications/models/suggestion.model';
+
+import { Item } from '../../core/shared/item.model';
+import { fadeIn } from '../../shared/animations/fade';
+import { isNotEmpty } from '../../shared/empty.util';
+
+/**
+ * A simple interface to unite a specific suggestion and the id of the chosen collection
+ */
+export interface SuggestionApproveAndImport {
+  suggestion: Suggestion;
+  collectionId: string;
+}
+
+/**
+ * Show all the suggestions by researcher
+ */
+@Component({
+  selector: 'ds-suggestion-list-item',
+  styleUrls: ['./suggestion-list-element.component.scss'],
+  templateUrl: './suggestion-list-element.component.html',
+  animations: [fadeIn],
+})
+export class SuggestionListElementComponent implements OnInit {
+
+  @Input() object: Suggestion;
+
+  @Input() isSelected = false;
+
+  @Input() isCollectionFixed = false;
+
+  public listableObject: any;
+
+  public seeEvidence = false;
+
+  /**
+   * The component is used to Delete suggestion
+   */
+  @Output() ignoreSuggestionClicked = new EventEmitter();
+
+  /**
+   * The component is used to approve & import
+   */
+  @Output() approveAndImport = new EventEmitter();
+
+  /**
+   * New value whether the element is selected
+   */
+  @Output() selected = new EventEmitter<boolean>();
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {NgbModal} modalService
+   */
+  constructor(private modalService: NgbModal) { }
+
+  ngOnInit() {
+    this.listableObject = {
+      indexableObject: Object.assign(new Item(), { id: this.object.id, metadata: this.object.metadata }),
+      hitHighlights: {},
+    };
+  }
+
+  /**
+   * Approve and import the suggestion
+   */
+  onApproveAndImport(event: SuggestionApproveAndImport) {
+    this.approveAndImport.emit(event);
+  }
+
+  /**
+   * Delete the suggestion
+   */
+  onIgnoreSuggestion(suggestionId: string) {
+    this.ignoreSuggestionClicked.emit(suggestionId);
+  }
+
+  /**
+   * Change is selected value.
+   */
+  changeSelected(event) {
+    this.isSelected = event.target.checked;
+    this.selected.next(this.isSelected);
+  }
+
+  /**
+   * See the Evidence
+   */
+  hasEvidences() {
+    return isNotEmpty(this.object.evidences);
+  }
+
+  /**
+   * Set the see evidence variable.
+   */
+  onSeeEvidences(seeEvidence: boolean) {
+    this.seeEvidence = seeEvidence;
+  }
+
+}
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
new file mode 100644
index 0000000000..2b2a668916
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.html
@@ -0,0 +1,51 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      <h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1>
+
+      <ds-loading class="container" *ngIf="(isTargetsLoading() | async)" message="{{'suggestion.loading' | translate}}"></ds-loading>
+      <ds-pagination *ngIf="(isTargetsLoading() | async) !== true"
+                     [paginationOptions]="paginationConfig"
+                     [collectionSize]="(totalElements$ | async)"
+                     [hideGear]="false"
+                     [retainScrollPosition]="false"
+                     (paginationChange)="getSuggestionTargets()">
+
+        <ds-loading class="container" *ngIf="(isTargetsProcessing() | async)" message="'suggestion.loading' | translate"></ds-loading>
+        <ng-container *ngIf="(isTargetsProcessing() | async) !== true">
+          <div *ngIf="(targets$ | async)?.length === 0" class="alert alert-info w-100 mb-2 mt-2" role="alert">
+            {{'suggestion.noTargets' | translate}}
+          </div>
+          <div *ngIf="(targets$|async)?.length !== 0" class="table-responsive mt-2">
+            <table id="epeople" class="table table-striped table-hover table-bordered">
+              <thead>
+                <tr class="text-center">
+                  <th scope="col">{{'suggestion.table.name' | translate}}</th>
+                  <th scope="col">{{'suggestion.table.actions' | translate}}</th>
+                </tr>
+              </thead>
+              <tbody>
+                <tr *ngFor="let targetElement of (targets$ | async); let i = index" class="text-center">
+                  <td>
+                    <a target="_blank" [routerLink]="['/entities/person/', getTargetUuid(targetElement)]">{{targetElement.display}}</a>
+                  </td>
+                  <td>
+                    <div class="btn-group edit-field">
+                      <button (click)="redirectToSuggestions(targetElement.id)"
+                              class="btn btn-outline-primary btn-sm"
+                              title="{{('suggestion.button.review.title' | translate: { total: targetElement.total.toString() }) +
+                                targetElement.display}}">
+                        <span>{{'suggestion.button.review' | translate: { total: targetElement.total.toString() } }} </span>
+                        <i class="fas fa-lightbulb"></i>
+                      </button>
+                    </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </ng-container>
+      </ds-pagination>
+    </div>
+  </div>
+</div>
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.scss b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
new file mode 100644
index 0000000000..9290f808bb
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/publication-claim/publication-claim.component.ts
@@ -0,0 +1,152 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  take,
+} from 'rxjs/operators';
+
+import { SuggestionTarget } from '../../../core/notifications/models/suggestion-target.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { getSuggestionPageRoute } from '../../../suggestions-page/suggestions-page-routing-paths';
+import { SuggestionsService } from '../../suggestions.service';
+import { SuggestionTargetsStateService } from '../suggestion-targets.state.service';
+
+/**
+ * Component to display the Suggestion Target list.
+ */
+@Component({
+  selector: 'ds-publication-claim',
+  templateUrl: './publication-claim.component.html',
+  styleUrls: ['./publication-claim.component.scss'],
+})
+export class PublicationClaimComponent implements OnInit {
+
+  /**
+   * The source for which to list targets
+   */
+  @Input() source: string;
+
+  /**
+   * The pagination system configuration for HTML listing.
+   * @type {PaginationComponentOptions}
+   */
+  public paginationConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'stp',
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+
+  /**
+   * The Suggestion Target list.
+   */
+  public targets$: Observable<SuggestionTarget[]>;
+  /**
+   * The total number of Suggestion Targets.
+   */
+  public totalElements$: Observable<number>;
+  /**
+   * Array to track all the component subscriptions. Useful to unsubscribe them with 'onDestroy'.
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize the component variables.
+   * @param {PaginationService} paginationService
+   * @param {SuggestionTargetsStateService} suggestionTargetsStateService
+   * @param {SuggestionsService} suggestionService
+   * @param {Router} router
+   */
+  constructor(
+    private paginationService: PaginationService,
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private suggestionService: SuggestionsService,
+    private router: Router,
+  ) {
+  }
+
+  /**
+   * Component initialization.
+   */
+  ngOnInit(): void {
+    this.targets$ = this.suggestionTargetsStateService.getSuggestionTargets();
+    this.totalElements$ = this.suggestionTargetsStateService.getSuggestionTargetsTotals();
+
+    this.subs.push(
+      this.suggestionTargetsStateService.isSuggestionTargetsLoaded().pipe(
+        take(1),
+      ).subscribe(() => {
+        this.getSuggestionTargets();
+      }),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the targets are loading, 'false' otherwise.
+   */
+  public isTargetsLoading(): Observable<boolean> {
+    return this.suggestionTargetsStateService.isSuggestionTargetsLoading();
+  }
+
+  /**
+   * Returns the information about the processing status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the targets (ex.: a REST call), 'false' otherwise.
+   */
+  public isTargetsProcessing(): Observable<boolean> {
+    return this.suggestionTargetsStateService.isSuggestionTargetsProcessing();
+  }
+
+  /**
+   * Redirect to suggestion page.
+   *
+   * @param {string} id
+   *    the id of suggestion target
+   */
+  public redirectToSuggestions(id: string) {
+    this.router.navigate([getSuggestionPageRoute(id)]);
+  }
+
+  /**
+   * Unsubscribe from all subscriptions.
+   */
+  ngOnDestroy(): void {
+    this.suggestionTargetsStateService.dispatchClearSuggestionTargetsAction();
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Dispatch the Suggestion Targets retrival.
+   */
+  public getSuggestionTargets(): void {
+    this.paginationService.getCurrentPagination(this.paginationConfig.id, this.paginationConfig).pipe(
+      distinctUntilChanged(),
+      take(1),
+    ).subscribe((options: PaginationComponentOptions) => {
+      this.suggestionTargetsStateService.dispatchRetrieveSuggestionTargets(
+        this.source,
+        options.pageSize,
+        options.currentPage,
+      );
+    });
+  }
+
+  public getTargetUuid(target: SuggestionTarget) {
+    return this.suggestionService.getTargetUuid(target);
+  }
+}
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts b/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts
new file mode 100644
index 0000000000..abbf08d812
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.actions.ts
@@ -0,0 +1,165 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { type } from '../../shared/ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const SuggestionTargetActionTypes = {
+  ADD_TARGETS: type('dspace/integration/openaire/suggestions/target/ADD_TARGETS'),
+  CLEAR_TARGETS: type('dspace/integration/openaire/suggestions/target/CLEAR_TARGETS'),
+  RETRIEVE_TARGETS_BY_SOURCE: type('dspace/integration/openaire/suggestions/target/RETRIEVE_TARGETS_BY_SOURCE'),
+  RETRIEVE_TARGETS_BY_SOURCE_ERROR: type('dspace/integration/openaire/suggestions/target/RETRIEVE_TARGETS_BY_SOURCE_ERROR'),
+  ADD_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/ADD_USER_SUGGESTIONS'),
+  REFRESH_USER_SUGGESTIONS: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS'),
+  REFRESH_USER_SUGGESTIONS_ERROR: type('dspace/integration/openaire/suggestions/target/REFRESH_USER_SUGGESTIONS_ERROR'),
+  MARK_USER_SUGGESTIONS_AS_VISITED: type('dspace/integration/openaire/suggestions/target/MARK_USER_SUGGESTIONS_AS_VISITED'),
+};
+
+/* tslint:disable:max-classes-per-file */
+
+/**
+ * An ngrx action to retrieve all the Suggestion Targets.
+ */
+export class RetrieveTargetsBySourceAction implements Action {
+  type = SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE;
+  payload: {
+    source: string;
+    elementsPerPage: number;
+    currentPage: number;
+  };
+
+  /**
+   * Create a new RetrieveTargetsBySourceAction.
+   *
+   * @param source
+   *    the source for which to retrieve suggestion targets
+   * @param elementsPerPage
+   *    the number of targets per page
+   * @param currentPage
+   *    The page number to retrieve
+   */
+  constructor(source: string, elementsPerPage: number, currentPage: number) {
+    this.payload = {
+      source,
+      elementsPerPage,
+      currentPage,
+    };
+  }
+}
+
+/**
+ * An ngrx action for retrieving 'all Suggestion Targets' error.
+ */
+export class RetrieveAllTargetsErrorAction implements Action {
+  type = SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE_ERROR;
+}
+
+/**
+ * An ngrx action to load the Suggestion Target  objects.
+ */
+export class AddTargetAction implements Action {
+  type = SuggestionTargetActionTypes.ADD_TARGETS;
+  payload: {
+    targets: SuggestionTarget[];
+    totalPages: number;
+    currentPage: number;
+    totalElements: number;
+  };
+
+  /**
+   * Create a new AddTargetAction.
+   *
+   * @param targets
+   *    the list of targets
+   * @param totalPages
+   *    the total available pages of targets
+   * @param currentPage
+   *    the current page
+   * @param totalElements
+   *    the total available Suggestion Targets
+   */
+  constructor(targets: SuggestionTarget[], totalPages: number, currentPage: number, totalElements: number) {
+    this.payload = {
+      targets,
+      totalPages,
+      currentPage,
+      totalElements,
+    };
+  }
+
+}
+
+/**
+ * An ngrx action to load the user Suggestion Target object.
+ * Called by the ??? effect.
+ */
+export class AddUserSuggestionsAction implements Action {
+  type = SuggestionTargetActionTypes.ADD_USER_SUGGESTIONS;
+  payload: {
+    suggestionTargets: SuggestionTarget[];
+  };
+
+  /**
+   * Create a new AddUserSuggestionsAction.
+   *
+   * @param suggestionTargets
+   *    the user suggestions target
+   */
+  constructor(suggestionTargets: SuggestionTarget[]) {
+    this.payload = { suggestionTargets };
+  }
+
+}
+
+/**
+ * An ngrx action to reload the user Suggestion Target object.
+ * Called by the ??? effect.
+ */
+export class RefreshUserSuggestionsAction implements Action {
+  type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS;
+}
+
+/**
+ * NgRx action to signify an error while handling {@link RefreshUserSuggestionsAction}
+ */
+export class RefreshUserSuggestionsErrorAction implements Action {
+  type = SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS_ERROR;
+}
+
+/**
+ * An ngrx action to Mark User Suggestions As Visited.
+ * Called by the ??? effect.
+ */
+export class MarkUserSuggestionsAsVisitedAction implements Action {
+  type = SuggestionTargetActionTypes.MARK_USER_SUGGESTIONS_AS_VISITED;
+}
+
+/**
+ * An ngrx action to clear targets state.
+ */
+export class ClearSuggestionTargetsAction implements Action {
+  type = SuggestionTargetActionTypes.CLEAR_TARGETS;
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types.
+ */
+export type SuggestionTargetsActions
+  = AddTargetAction
+  | AddUserSuggestionsAction
+  | ClearSuggestionTargetsAction
+  | MarkUserSuggestionsAsVisitedAction
+  | RetrieveTargetsBySourceAction
+  | RetrieveAllTargetsErrorAction
+  | RefreshUserSuggestionsAction;
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
new file mode 100644
index 0000000000..e648190228
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.effects.ts
@@ -0,0 +1,116 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import { of } from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SuggestionsService } from '../suggestions.service';
+import {
+  AddTargetAction,
+  AddUserSuggestionsAction,
+  RefreshUserSuggestionsErrorAction,
+  RetrieveAllTargetsErrorAction,
+  RetrieveTargetsBySourceAction,
+  SuggestionTargetActionTypes,
+} from './suggestion-targets.actions';
+
+/**
+ * Provides effect methods for the Suggestion Targets actions.
+ */
+@Injectable()
+export class SuggestionTargetsEffects {
+
+  /**
+   * Retrieve all Suggestion Targets managing pagination and errors.
+   */
+  retrieveTargetsBySource$ = createEffect(() => this.actions$.pipe(
+    ofType(SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE),
+    switchMap((action: RetrieveTargetsBySourceAction) => {
+      return this.suggestionsService.getTargets(
+        action.payload.source,
+        action.payload.elementsPerPage,
+        action.payload.currentPage,
+      ).pipe(
+        map((targets: PaginatedList<SuggestionTarget>) =>
+          new AddTargetAction(targets.page, targets.totalPages, targets.currentPage, targets.totalElements),
+        ),
+        catchError((error: unknown) => {
+          if (error instanceof Error) {
+            console.error(error.message);
+          }
+          return of(new RetrieveAllTargetsErrorAction());
+        }),
+      );
+    }),
+  ));
+
+  /**
+   * Show a notification on error.
+   */
+  retrieveAllTargetsErrorAction$ = createEffect(() => this.actions$.pipe(
+    ofType(SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE_ERROR),
+    tap(() => {
+      this.notificationsService.error(null, this.translate.get('suggestion.target.error.service.retrieve'));
+    }),
+  ), { dispatch: false });
+
+  /**
+   * Fetch the current user suggestion
+   */
+  refreshUserSuggestionsAction$ = createEffect(() => this.actions$.pipe(
+    ofType(SuggestionTargetActionTypes.REFRESH_USER_SUGGESTIONS),
+    switchMap(() => {
+      return this.store$.select((state: any) => state.core.auth.userId)
+        .pipe(
+          switchMap((userId: string) => {
+            return this.suggestionsService.retrieveCurrentUserSuggestions(userId)
+              .pipe(
+                map((suggestionTargets: SuggestionTarget[]) => new AddUserSuggestionsAction(suggestionTargets)),
+                catchError((error: unknown) => {
+                  if (error instanceof Error) {
+                    console.error(error.message);
+                  }
+                  return of(new RefreshUserSuggestionsErrorAction());
+                }),
+              );
+          }),
+          catchError((error: unknown) => {
+            if (error instanceof Error) {
+              console.error(error.message);
+            }
+            return of(new RefreshUserSuggestionsErrorAction());
+          }),
+        );
+    })),
+  );
+
+  /**
+   * Initialize the effect class variables.
+   * @param {Actions} actions$
+   * @param {Store<any>} store$
+   * @param {TranslateService} translate
+   * @param {NotificationsService} notificationsService
+   * @param {SuggestionsService} suggestionsService
+   */
+  constructor(
+    private actions$: Actions,
+    private store$: Store<any>,
+    private translate: TranslateService,
+    private notificationsService: NotificationsService,
+    private suggestionsService: SuggestionsService,
+  ) {
+  }
+}
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts b/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts
new file mode 100644
index 0000000000..0fcf4c5fe2
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.reducer.ts
@@ -0,0 +1,103 @@
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import {
+  SuggestionTargetActionTypes,
+  SuggestionTargetsActions,
+} from './suggestion-targets.actions';
+
+/**
+ * The interface representing the OpenAIRE suggestion targets state.
+ */
+export interface SuggestionTargetState {
+  targets: SuggestionTarget[];
+  processing: boolean;
+  loaded: boolean;
+  totalPages: number;
+  currentPage: number;
+  totalElements: number;
+  currentUserTargets: SuggestionTarget[];
+  currentUserTargetsVisited: boolean;
+}
+
+/**
+ * Used for the OpenAIRE Suggestion Target state initialization.
+ */
+const SuggestionTargetInitialState: SuggestionTargetState = {
+  targets: [],
+  processing: false,
+  loaded: false,
+  totalPages: 0,
+  currentPage: 0,
+  totalElements: 0,
+  currentUserTargets: null,
+  currentUserTargetsVisited: false,
+};
+
+/**
+ * The OpenAIRE Broker Topic Reducer
+ *
+ * @param state
+ *    the current state initialized with SuggestionTargetInitialState
+ * @param action
+ *    the action to perform on the state
+ * @return SuggestionTargetState
+ *    the new state
+ */
+export function SuggestionTargetsReducer(state = SuggestionTargetInitialState, action: SuggestionTargetsActions): SuggestionTargetState {
+  switch (action.type) {
+    case SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE: {
+      return Object.assign({}, state, {
+        targets: [],
+        processing: true,
+      });
+    }
+
+    case SuggestionTargetActionTypes.ADD_TARGETS: {
+      return Object.assign({}, state, {
+        targets: state.targets.concat(action.payload.targets),
+        processing: false,
+        loaded: true,
+        totalPages: action.payload.totalPages,
+        currentPage: state.currentPage,
+        totalElements: action.payload.totalElements,
+      });
+    }
+
+    case SuggestionTargetActionTypes.RETRIEVE_TARGETS_BY_SOURCE_ERROR: {
+      return Object.assign({}, state, {
+        targets: [],
+        processing: false,
+        loaded: true,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    case SuggestionTargetActionTypes.ADD_USER_SUGGESTIONS: {
+      return Object.assign({}, state, {
+        currentUserTargets: action.payload.suggestionTargets,
+      });
+    }
+
+    case SuggestionTargetActionTypes.MARK_USER_SUGGESTIONS_AS_VISITED: {
+      return Object.assign({}, state, {
+        currentUserTargetsVisited: true,
+      });
+    }
+
+    case SuggestionTargetActionTypes.CLEAR_TARGETS: {
+      return Object.assign({}, state, {
+        targets: [],
+        processing: false,
+        loaded: false,
+        totalPages: 0,
+        currentPage: 0,
+        totalElements: 0,
+      });
+    }
+
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts b/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts
new file mode 100644
index 0000000000..b6ea910dce
--- /dev/null
+++ b/src/app/notifications/suggestion-targets/suggestion-targets.state.service.ts
@@ -0,0 +1,166 @@
+import { Injectable } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { SuggestionNotificationsState } from '../../notifications/notifications.reducer';
+import {
+  getCurrentUserSuggestionTargetsSelector,
+  getCurrentUserSuggestionTargetsVisitedSelector,
+  getSuggestionTargetCurrentPageSelector,
+  getSuggestionTargetTotalsSelector,
+  isReciterSuggestionTargetProcessingSelector,
+  isSuggestionTargetLoadedSelector,
+  suggestionTargetObjectSelector,
+} from '../../suggestion-notifications/selectors';
+import {
+  ClearSuggestionTargetsAction,
+  MarkUserSuggestionsAsVisitedAction,
+  RefreshUserSuggestionsAction,
+  RetrieveTargetsBySourceAction,
+} from './suggestion-targets.actions';
+
+/**
+ * The service handling the Suggestion targets State.
+ */
+@Injectable()
+export class SuggestionTargetsStateService {
+
+  /**
+   * Initialize the service variables.
+   * @param {Store<SuggestionNotificationsState>} store
+   */
+  constructor(private store: Store<SuggestionNotificationsState>) { }
+
+  /**
+   * Returns the list of Suggestion Targets from the state.
+   *
+   * @return Observable<SuggestionTarget>
+   *    The list of Suggestion Targets.
+   */
+  public getSuggestionTargets(): Observable<SuggestionTarget[]> {
+    return this.store.pipe(select(suggestionTargetObjectSelector()));
+  }
+
+  /**
+   * Returns the information about the loading status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if the targets are loading, 'false' otherwise.
+   */
+  public isSuggestionTargetsLoading(): Observable<boolean> {
+    return this.store.pipe(
+      select(isSuggestionTargetLoadedSelector),
+      map((loaded: boolean) => !loaded),
+    );
+  }
+
+  /**
+   * Returns the information about the loading status of the Suggestion Targets (whether or not they were loaded).
+   *
+   * @return Observable<boolean>
+   *    'true' if the targets are loaded, 'false' otherwise.
+   */
+  public isSuggestionTargetsLoaded(): Observable<boolean> {
+    return this.store.pipe(select(isSuggestionTargetLoadedSelector));
+  }
+
+  /**
+   * Returns the information about the processing status of the Suggestion Targets (if it's running or not).
+   *
+   * @return Observable<boolean>
+   *    'true' if there are operations running on the targets (ex.: a REST call), 'false' otherwise.
+   */
+  public isSuggestionTargetsProcessing(): Observable<boolean> {
+    return this.store.pipe(select(isReciterSuggestionTargetProcessingSelector));
+  }
+
+  /**
+   * Returns, from the state, the total available pages of the Suggestion Targets.
+   *
+   * @return Observable<number>
+   *    The number of the Suggestion Targets pages.
+   */
+  public getSuggestionTargetsTotalPages(): Observable<number> {
+    return this.store.pipe(select(getSuggestionTargetTotalsSelector));
+  }
+
+  /**
+   * Returns the current page of the Suggestion Targets, from the state.
+   *
+   * @return Observable<number>
+   *    The number of the current Suggestion Targets page.
+   */
+  public getSuggestionTargetsCurrentPage(): Observable<number> {
+    return this.store.pipe(select(getSuggestionTargetCurrentPageSelector));
+  }
+
+  /**
+   * Returns the total number of the Suggestion Targets.
+   *
+   * @return Observable<number>
+   *    The number of the Suggestion Targets.
+   */
+  public getSuggestionTargetsTotals(): Observable<number> {
+    return this.store.pipe(select(getSuggestionTargetTotalsSelector));
+  }
+
+  /**
+   * Dispatch a request to change the Suggestion Targets state, retrieving the targets from the server.
+   *
+   * @param source
+   *    the source for which to retrieve suggestion targets
+   * @param elementsPerPage
+   *    The number of the targets per page.
+   * @param currentPage
+   *    The number of the current page.
+   */
+  public dispatchRetrieveSuggestionTargets(source: string, elementsPerPage: number, currentPage: number): void {
+    this.store.dispatch(new RetrieveTargetsBySourceAction(source, elementsPerPage, currentPage));
+  }
+
+  /**
+   * Returns, from the state, the suggestion targets for the current user.
+   *
+   * @return Observable<OpenaireReciterSuggestionTarget>
+   *    The Suggestion Targets object.
+   */
+  public getCurrentUserSuggestionTargets(): Observable<SuggestionTarget[]> {
+    return this.store.pipe(select(getCurrentUserSuggestionTargetsSelector));
+  }
+
+  /**
+   * Returns, from the state, whether or not the user has consulted their suggestion targets.
+   *
+   * @return Observable<boolean>
+   *    True if user already visited, false otherwise.
+   */
+  public hasUserVisitedSuggestions(): Observable<boolean> {
+    return this.store.pipe(select(getCurrentUserSuggestionTargetsVisitedSelector));
+  }
+
+  /**
+   * Dispatch a new MarkUserSuggestionsAsVisitedAction
+   */
+  public dispatchMarkUserSuggestionsAsVisitedAction(): void {
+    this.store.dispatch(new MarkUserSuggestionsAsVisitedAction());
+  }
+
+  /**
+   * Dispatch an action to clear the Reciter Suggestion Targets state.
+   */
+  public dispatchClearSuggestionTargetsAction(): void {
+    this.store.dispatch(new ClearSuggestionTargetsAction());
+  }
+
+  /**
+   * Dispatch an action to refresh the user suggestions.
+   */
+  public dispatchRefreshUserSuggestionsAction(): void {
+    this.store.dispatch(new RefreshUserSuggestionsAction());
+  }
+}
diff --git a/src/app/notifications/suggestion.service.spec.ts b/src/app/notifications/suggestion.service.spec.ts
new file mode 100644
index 0000000000..aee00c8bf4
--- /dev/null
+++ b/src/app/notifications/suggestion.service.spec.ts
@@ -0,0 +1,177 @@
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+import { FindListOptions } from '../core/data/find-list-options.model';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
+import { ResourceType } from '../core/shared/resource-type';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { mockSuggestionPublicationOne } from '../shared/mocks/publication-claim.mock';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { SuggestionsService } from './suggestions.service';
+
+describe('SuggestionsService test', () => {
+  let scheduler: TestScheduler;
+  let service: SuggestionsService;
+  let researcherProfileService: ResearcherProfileDataService;
+  let suggestionsDataService: SuggestionsDataService;
+  let suggestionTargetDataService: SuggestionTargetDataService;
+  let translateService: any = {
+    instant: (str) => str,
+  };
+  const suggestionTarget = {
+    id: '1234:4321',
+    display: 'display',
+    source: 'source',
+    total: 8,
+    type: new ResourceType('suggestiontarget'),
+  };
+
+  const mockResercherProfile = {
+    id: '1234',
+    uuid: '1234',
+    visible: true,
+  };
+
+  function initTestService() {
+    return new SuggestionsService(
+      researcherProfileService,
+      suggestionsDataService,
+      suggestionTargetDataService,
+      translateService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+      findById: createSuccessfulRemoteDataObject$(mockResercherProfile as ResearcherProfile),
+      findRelatedItemId: observableOf('1234'),
+    });
+
+    suggestionTargetDataService = jasmine.createSpyObj('suggestionTargetsDataService', {
+      getTargets: observableOf(null),
+      findById: observableOf(null),
+    });
+
+    suggestionsDataService = jasmine.createSpyObj('suggestionsDataService', {
+      searchBy: observableOf(null),
+      delete: observableOf(null),
+      deleteSuggestion: createSuccessfulRemoteDataObject$({}),
+      getSuggestionsByTargetAndSource : observableOf(null),
+      clearSuggestionRequests : null,
+      getTargetsByUser: observableOf(null),
+    });
+
+    service = initTestService();
+
+  });
+
+  describe('Suggestion service', () => {
+    it('should create', () => {
+      expect(service).toBeDefined();
+    });
+
+    it('should get targets', () => {
+      const sortOptions = new SortOptions('display', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: 10,
+        currentPage: 1,
+        sort: sortOptions,
+      };
+      service.getTargets('source', 10, 1);
+      expect(suggestionTargetDataService.getTargets).toHaveBeenCalledWith('source', findListOptions);
+    });
+
+    it('should get suggestions', () => {
+      const sortOptions = new SortOptions('display', SortDirection.ASC);
+      const findListOptions: FindListOptions = {
+        elementsPerPage: 10,
+        currentPage: 1,
+        sort: sortOptions,
+      };
+      service.getSuggestions('source:target', 10, 1, sortOptions);
+      expect(suggestionsDataService.getSuggestionsByTargetAndSource).toHaveBeenCalledWith('target', 'source', findListOptions);
+    });
+
+    it('should clear suggestions', () => {
+      service.clearSuggestionRequests();
+      expect(suggestionsDataService.clearSuggestionRequests).toHaveBeenCalled();
+    });
+
+    it('should delete reviewed suggestion', () => {
+      service.deleteReviewedSuggestion('1234');
+      expect(suggestionsDataService.deleteSuggestion).toHaveBeenCalledWith('1234');
+    });
+
+    it('should retrieve current user suggestions', () => {
+      service.retrieveCurrentUserSuggestions('1234');
+      expect(researcherProfileService.findById).toHaveBeenCalledWith('1234', true);
+    });
+
+    it('should approve and import suggestion', () => {
+      spyOn(service, 'resolveCollectionId');
+      const workspaceitemService = { importExternalSourceEntry: (x,y) => observableOf(null) };
+      service.approveAndImport(workspaceitemService as unknown as WorkspaceitemDataService, mockSuggestionPublicationOne, '1234');
+      expect(service.resolveCollectionId).toHaveBeenCalled();
+    });
+
+    it('should approve and import suggestions', () => {
+      spyOn(service, 'approveAndImport');
+      const workspaceitemService = { importExternalSourceEntry: (x,y) => observableOf(null) };
+      service.approveAndImportMultiple(workspaceitemService as unknown as WorkspaceitemDataService, [mockSuggestionPublicationOne], '1234');
+      expect(service.approveAndImport).toHaveBeenCalledWith(workspaceitemService as unknown as WorkspaceitemDataService, mockSuggestionPublicationOne, '1234');
+    });
+
+    it('should delete suggestion', () => {
+      spyOn(service, 'deleteReviewedSuggestion').and.returnValue(createSuccessfulRemoteDataObject$({}));
+      service.ignoreSuggestion('1234');
+      expect(service.deleteReviewedSuggestion).toHaveBeenCalledWith('1234');
+    });
+
+    it('should delete suggestions', () => {
+      spyOn(service, 'ignoreSuggestion');
+      service.ignoreSuggestionMultiple([mockSuggestionPublicationOne]);
+      expect(service.ignoreSuggestion).toHaveBeenCalledWith(mockSuggestionPublicationOne.id);
+    });
+
+    it('should get target Uuid', () => {
+      expect(service.getTargetUuid(suggestionTarget as SuggestionTarget)).toBe('4321');
+      expect(service.getTargetUuid({ id: '' } as SuggestionTarget)).toBe(null);
+    });
+
+    it('should get suggestion interpolation', () => {
+      const result = service.getNotificationSuggestionInterpolation(suggestionTarget as SuggestionTarget);
+      expect(result.count).toEqual(suggestionTarget.total);
+      expect(result.source).toEqual('suggestion.source.' + suggestionTarget.source);
+      expect(result.type).toEqual('suggestion.type.' + suggestionTarget.source);
+      expect(result.suggestionId).toEqual(suggestionTarget.id);
+      expect(result.displayName).toEqual(suggestionTarget.display);
+    });
+
+    it('should translate suggestion type', () => {
+      expect(service.translateSuggestionType('source')).toEqual('suggestion.type.source');
+    });
+
+    it('should translate suggestion source', () => {
+      expect(service.translateSuggestionSource('source')).toEqual('suggestion.source.source');
+    });
+
+    it('should resolve collection id', () => {
+      expect(service.resolveCollectionId(mockSuggestionPublicationOne, '1234')).toEqual('1234');
+    });
+
+    it('should check if collection is fixed', () => {
+      expect(service.isCollectionFixed([mockSuggestionPublicationOne])).toBeFalse();
+    });
+  });
+});
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.html b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
new file mode 100644
index 0000000000..838bdb95ad
--- /dev/null
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.html
@@ -0,0 +1,9 @@
+<ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
+  <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
+    <div class="alert alert-success d-block" *ngIf="suggestion.total > 0">
+      <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+      {{ 'notification.suggestion.please' | translate }}
+      <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+    </div>
+  </ng-container>
+</ng-container>
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.scss b/src/app/notifications/suggestions-notification/suggestions-notification.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/notifications/suggestions-notification/suggestions-notification.component.ts b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
new file mode 100644
index 0000000000..a3b22e982c
--- /dev/null
+++ b/src/app/notifications/suggestions-notification/suggestions-notification.component.ts
@@ -0,0 +1,44 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../suggestions.service';
+
+/**
+ * Show suggestions notification, used on myDSpace and Profile pages
+ */
+@Component({
+  selector: 'ds-suggestions-notification',
+  templateUrl: './suggestions-notification.component.html',
+  styleUrls: ['./suggestions-notification.component.scss'],
+})
+export class SuggestionsNotificationComponent implements OnInit {
+
+  /**
+   * The user suggestion targets.
+   */
+  suggestionsRD$: Observable<SuggestionTarget[]>;
+
+  constructor(
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private suggestionsService: SuggestionsService,
+  ) { }
+
+  ngOnInit() {
+    this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+    this.suggestionsRD$ = this.suggestionTargetsStateService.getCurrentUserSuggestionTargets();
+  }
+
+  /**
+   * Interpolated params to build the notification suggestions notification.
+   * @param suggestionTarget
+   */
+  public getNotificationSuggestionInterpolation(suggestionTarget: SuggestionTarget): any {
+    return this.suggestionsService.getNotificationSuggestionInterpolation(suggestionTarget);
+  }
+
+}
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.html b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
new file mode 100644
index 0000000000..474dfa329e
--- /dev/null
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.html
@@ -0,0 +1,27 @@
+<div class="notifications-wrapper position-fixed top right" *ngIf="suggestionsRD$ | async">
+  <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
+    <button (click)="removePopup()"
+            type="button" class="close pt-0 pr-1 pl-0 pb-0" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+
+    <div class="d-flex flex-row">
+      <div class="d-flex flex-column justify-content-center align-items-center">
+        <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
+      </div>
+      <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
+        <ng-container *ngIf="(suggestionsRD$ | async) as suggestions">
+          <ng-container *ngFor="let suggestion of suggestions" class="alert alert-info">
+            <div *ngIf="suggestion.total > 0">
+              <div [innerHTML]="'notification.suggestion' | translate: getNotificationSuggestionInterpolation(suggestion)"></div>
+              {{ 'notification.suggestion.please' | translate }}
+              <a [routerLink]="getNotificationSuggestionInterpolation(suggestion).url"> {{ 'notification.suggestion.review' | translate}} </a>
+            </div>
+          </ng-container>
+        </ng-container>
+      </div>
+    </div>
+  </div>
+</div>
+
+
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.scss b/src/app/notifications/suggestions-popup/suggestions-popup.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
new file mode 100644
index 0000000000..12c3280837
--- /dev/null
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.spec.ts
@@ -0,0 +1,81 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { mockSuggestionTargetsObjectOne } from '../../shared/mocks/publication-claim-targets.mock';
+import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../suggestions.service';
+import { SuggestionsPopupComponent } from './suggestions-popup.component';
+
+describe('SuggestionsPopupComponent', () => {
+  let component: SuggestionsPopupComponent;
+  let fixture: ComponentFixture<SuggestionsPopupComponent>;
+
+  const suggestionStateService = jasmine.createSpyObj('SuggestionTargetsStateService', {
+    hasUserVisitedSuggestions: jasmine.createSpy('hasUserVisitedSuggestions'),
+    getCurrentUserSuggestionTargets: jasmine.createSpy('getCurrentUserSuggestionTargets'),
+    dispatchMarkUserSuggestionsAsVisitedAction: jasmine.createSpy('dispatchMarkUserSuggestionsAsVisitedAction'),
+    dispatchRefreshUserSuggestionsAction: jasmine.createSpy('dispatchRefreshUserSuggestionsAction'),
+  });
+
+  const mockNotificationInterpolation = { count: 12, source: 'source', suggestionId: 'id', displayName: 'displayName' };
+  const suggestionService = jasmine.createSpyObj('SuggestionService', {
+    getNotificationSuggestionInterpolation:
+      jasmine.createSpy('getNotificationSuggestionInterpolation').and.returnValue(mockNotificationInterpolation),
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ SuggestionsPopupComponent ],
+      providers: [
+        { provide: SuggestionTargetsStateService, useValue: suggestionStateService },
+        { provide: SuggestionsService, useValue: suggestionService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+
+    })
+      .compileComponents();
+  }));
+
+  describe('should create', () => {
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SuggestionsPopupComponent);
+      component = fixture.componentInstance;
+      spyOn(component, 'initializePopup').and.returnValue(null);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+      expect(component.initializePopup).toHaveBeenCalled();
+    });
+
+  });
+
+  describe('when there are publication suggestions', () => {
+
+    beforeEach(() => {
+      suggestionStateService.hasUserVisitedSuggestions.and.returnValue(observableOf(false));
+      suggestionStateService.getCurrentUserSuggestionTargets.and.returnValue(observableOf([mockSuggestionTargetsObjectOne]));
+      suggestionStateService.dispatchMarkUserSuggestionsAsVisitedAction.and.returnValue(observableOf(null));
+      suggestionStateService.dispatchRefreshUserSuggestionsAction.and.returnValue(observableOf(null));
+
+      fixture = TestBed.createComponent(SuggestionsPopupComponent);
+      component = fixture.componentInstance;
+      fixture.detectChanges();
+    });
+
+    it('should show a notification when new publication suggestions are available', () => {
+      expect(suggestionStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+      expect(suggestionStateService.dispatchMarkUserSuggestionsAsVisitedAction).toHaveBeenCalled();
+    });
+
+  });
+});
diff --git a/src/app/notifications/suggestions-popup/suggestions-popup.component.ts b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
new file mode 100644
index 0000000000..f3ccc70cbd
--- /dev/null
+++ b/src/app/notifications/suggestions-popup/suggestions-popup.component.ts
@@ -0,0 +1,93 @@
+import { trigger } from '@angular/animations';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  of,
+  Subject,
+} from 'rxjs';
+import {
+  take,
+  takeUntil,
+} from 'rxjs/operators';
+
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { fromTopEnter } from '../../shared/animations/fromTop';
+import { isNotEmpty } from '../../shared/empty.util';
+import { SuggestionTargetsStateService } from '../suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../suggestions.service';
+
+/**
+ * Show suggestions on a popover window, used on the homepage
+ */
+@Component({
+  selector: 'ds-suggestions-popup',
+  templateUrl: './suggestions-popup.component.html',
+  styleUrls: ['./suggestions-popup.component.scss'],
+  animations: [
+    trigger('enterLeave', [
+      fromTopEnter,
+    ]),
+  ],
+})
+export class SuggestionsPopupComponent implements OnInit, OnDestroy {
+
+  labelPrefix = 'notification.';
+
+  subscription;
+
+  suggestionsRD$: Observable<SuggestionTarget[]>;
+
+
+  constructor(
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private suggestionsService: SuggestionsService,
+  ) { }
+
+  ngOnInit() {
+    this.initializePopup();
+  }
+
+  public initializePopup() {
+    const notifier = new Subject();
+    this.subscription = combineLatest([
+      this.suggestionTargetsStateService.getCurrentUserSuggestionTargets().pipe(take(2)),
+      this.suggestionTargetsStateService.hasUserVisitedSuggestions(),
+    ]).pipe(takeUntil(notifier)).subscribe(([suggestions, visited]) => {
+      this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+      if (isNotEmpty(suggestions)) {
+        if (!visited) {
+          this.suggestionsRD$ = of(suggestions);
+          this.suggestionTargetsStateService.dispatchMarkUserSuggestionsAsVisitedAction();
+          notifier.next(null);
+          notifier.complete();
+        }
+      }
+    });
+  }
+
+  ngOnDestroy() {
+    if (this.subscription) {
+      this.subscription.unsubscribe();
+    }
+  }
+
+  /**
+   * Interpolated params to build the notification suggestions notification.
+   * @param suggestionTarget
+   */
+  public getNotificationSuggestionInterpolation(suggestionTarget: SuggestionTarget): any {
+    return this.suggestionsService.getNotificationSuggestionInterpolation(suggestionTarget);
+  }
+
+  /**
+   * Hide popup from view
+   */
+  public removePopup() {
+    this.suggestionsRD$ = null;
+  }
+}
diff --git a/src/app/notifications/suggestions.service.ts b/src/app/notifications/suggestions.service.ts
new file mode 100644
index 0000000000..bcd3ac1342
--- /dev/null
+++ b/src/app/notifications/suggestions.service.ts
@@ -0,0 +1,317 @@
+import { Injectable } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  forkJoin,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import { SuggestionConfig } from '../../config/suggestion-config.interfaces';
+import { environment } from '../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+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 { Suggestion } from '../core/notifications/models/suggestion.model';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { ResearcherProfile } from '../core/profile/model/researcher-profile.model';
+import { ResearcherProfileDataService } from '../core/profile/researcher-profile-data.service';
+import { NoContent } from '../core/shared/NoContent.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFinishedRemoteData,
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteListPayload,
+} from '../core/shared/operators';
+import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { getSuggestionPageRoute } from '../suggestions-page/suggestions-page-routing-paths';
+
+/**
+ * useful for multiple approvals and ignores operation
+ * */
+export interface SuggestionBulkResult {
+  success: number;
+  fails: number;
+}
+
+/**
+ * The service handling all Suggestion Target  requests to the REST service.
+ */
+@Injectable()
+export class SuggestionsService {
+
+  /**
+   * Initialize the service variables.
+   * @param {ResearcherProfileDataService} researcherProfileService
+   * @param {SuggestionTargetDataService} suggestionTargetDataService
+   * @param {SuggestionsDataService} suggestionsDataService
+   * @param translateService
+   */
+  constructor(
+    private researcherProfileService: ResearcherProfileDataService,
+    private suggestionsDataService: SuggestionsDataService,
+    private suggestionTargetDataService: SuggestionTargetDataService,
+    private translateService: TranslateService,
+  ) {
+  }
+
+  /**
+   * Return the list of Suggestion Target managing pagination and errors.
+   *
+   * @param source
+   *    The source for which to retrieve targets
+   * @param elementsPerPage
+   *    The number of the target per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @return Observable<PaginatedList<OpenaireReciterSuggestionTarget>>
+   *    The list of Suggestion Targets.
+   */
+  public getTargets(source, elementsPerPage, currentPage): Observable<PaginatedList<SuggestionTarget>> {
+    const sortOptions = new SortOptions('display', SortDirection.ASC);
+
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+    };
+
+    return this.suggestionTargetDataService.getTargets(source, findListOptions).pipe(
+      getFinishedRemoteData(),
+      take(1),
+      map((rd: RemoteData<PaginatedList<SuggestionTarget>>) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          throw new Error('Can\'t retrieve Suggestion Target from the Search Target REST service');
+        }
+      }),
+    );
+  }
+
+  /**
+   * Return the list of review suggestions Target managing pagination and errors.
+   *
+   * @param targetId
+   *    The target id for which to find suggestions.
+   * @param elementsPerPage
+   *    The number of the target per page
+   * @param currentPage
+   *    The page number to retrieve
+   * @param sortOptions
+   *    The sort options
+   * @return Observable<RemoteData<PaginatedList<Suggestion>>>
+   *    The list of Suggestion.
+   */
+  public getSuggestions(targetId: string, elementsPerPage, currentPage, sortOptions: SortOptions): Observable<PaginatedList<Suggestion>> {
+    const [source, target] = targetId.split(':');
+
+    const findListOptions: FindListOptions = {
+      elementsPerPage: elementsPerPage,
+      currentPage: currentPage,
+      sort: sortOptions,
+    };
+
+    return this.suggestionsDataService.getSuggestionsByTargetAndSource(target, source, findListOptions).pipe(
+      getAllSucceededRemoteDataPayload(),
+    );
+  }
+
+  /**
+   * Clear suggestions requests from cache
+   */
+  public clearSuggestionRequests() {
+    this.suggestionsDataService.clearSuggestionRequests();
+  }
+
+  /**
+   * Used to delete Suggestion
+   * @suggestionId
+   */
+  public deleteReviewedSuggestion(suggestionId: string): Observable<RemoteData<NoContent>> {
+    return this.suggestionsDataService.deleteSuggestion(suggestionId).pipe(
+      map((response: RemoteData<NoContent>) => {
+        if (response.isSuccess) {
+          return response;
+        } else {
+          throw new Error('Can\'t delete Suggestion from the Search Target REST service');
+        }
+      }),
+      take(1),
+    );
+  }
+
+  /**
+   * Retrieve suggestion targets for the given user
+   *
+   * @param userUuid
+   *   The EPerson id for which to retrieve suggestion targets
+   */
+  public retrieveCurrentUserSuggestions(userUuid: string): Observable<SuggestionTarget[]> {
+    return this.researcherProfileService.findById(userUuid, true).pipe(
+      getFirstCompletedRemoteData(),
+      mergeMap((profile: RemoteData<ResearcherProfile> ) => {
+        if (isNotEmpty(profile) && profile.hasSucceeded && isNotEmpty(profile.payload)) {
+          return this.researcherProfileService.findRelatedItemId(profile.payload).pipe(
+            mergeMap((itemId: string) => {
+              return this.suggestionsDataService.getTargetsByUser(itemId).pipe(
+                getFirstSucceededRemoteListPayload(),
+              );
+            }),
+          );
+        } else {
+          return of([]);
+        }
+      }),
+      catchError(() => of([])),
+    );
+  }
+
+  /**
+   * Perform the approve and import operation over a single suggestion
+   * @param suggestion target suggestion
+   * @param collectionId the collectionId
+   * @param workspaceitemService injected dependency
+   * @private
+   */
+  public approveAndImport(workspaceitemService: WorkspaceitemDataService,
+    suggestion: Suggestion,
+    collectionId: string): Observable<WorkspaceItem> {
+
+    const resolvedCollectionId = this.resolveCollectionId(suggestion, collectionId);
+    return workspaceitemService.importExternalSourceEntry(suggestion.externalSourceUri, resolvedCollectionId)
+      .pipe(
+        getFirstSucceededRemoteDataPayload(),
+        catchError(() => of(null)),
+      );
+  }
+
+  /**
+   * Perform the delete operation over a single suggestion.
+   * @param suggestionId
+   */
+  public ignoreSuggestion(suggestionId): Observable<RemoteData<NoContent>> {
+    return this.deleteReviewedSuggestion(suggestionId).pipe(
+      catchError(() => of(null)),
+    );
+  }
+
+  /**
+   * Perform a bulk approve and import operation.
+   * @param workspaceitemService injected dependency
+   * @param suggestions the array containing the suggestions
+   * @param collectionId the collectionId
+   */
+  public approveAndImportMultiple(workspaceitemService: WorkspaceitemDataService,
+    suggestions: Suggestion[],
+    collectionId: string): Observable<SuggestionBulkResult> {
+
+    return forkJoin(suggestions.map((suggestion: Suggestion) =>
+      this.approveAndImport(workspaceitemService, suggestion, collectionId)))
+      .pipe(map((results: WorkspaceItem[]) => {
+        return {
+          success: results.filter((result) => result != null).length,
+          fails: results.filter((result) => result == null).length,
+        };
+      }), take(1));
+  }
+
+  /**
+   * Perform a bulk ignoreSuggestion operation.
+   * @param suggestions the array containing the suggestions
+   */
+  public ignoreSuggestionMultiple(suggestions: Suggestion[]): Observable<SuggestionBulkResult> {
+    return forkJoin(suggestions.map((suggestion: Suggestion) => this.ignoreSuggestion(suggestion.id)))
+      .pipe(map((results: RemoteData<NoContent>[]) => {
+        return {
+          success: results.filter((result) => result != null).length,
+          fails: results.filter((result) => result == null).length,
+        };
+      }), take(1));
+  }
+
+  /**
+   * Get the researcher uuid (for navigation purpose) from a target instance.
+   * TODO Find a better way
+   * @param target
+   * @return the researchUuid
+   */
+  public getTargetUuid(target: SuggestionTarget): string {
+    const tokens = target.id.split(':');
+    return tokens.length === 2 ? tokens[1] : null;
+  }
+
+  /**
+   * Interpolated params to build the notification suggestions notification.
+   * @param suggestionTarget
+   */
+  public getNotificationSuggestionInterpolation(suggestionTarget: SuggestionTarget): any {
+    return {
+      count: suggestionTarget.total,
+      source: this.translateService.instant(this.translateSuggestionSource(suggestionTarget.source)),
+      type:  this.translateService.instant(this.translateSuggestionType(suggestionTarget.source)),
+      suggestionId: suggestionTarget.id,
+      displayName: suggestionTarget.display,
+      url: getSuggestionPageRoute(suggestionTarget.id),
+    };
+  }
+
+  public translateSuggestionType(source: string): string {
+    return 'suggestion.type.' + source;
+  }
+
+  public translateSuggestionSource(source: string): string {
+    return 'suggestion.source.' + source;
+  }
+
+  /**
+   * If the provided collectionId ha no value, tries to resolve it by suggestion source.
+   * @param suggestion
+   * @param collectionId
+   */
+  public resolveCollectionId(suggestion: Suggestion, collectionId): string {
+    if (hasValue(collectionId)) {
+      return collectionId;
+    }
+    return environment.suggestion
+      .find((suggestionConf: SuggestionConfig) => suggestionConf.source === suggestion.source)
+      .collectionId;
+  }
+
+  /**
+   * Return true if all the suggestion are configured with the same fixed collection
+   * in the configuration.
+   * @param suggestions
+   */
+  public isCollectionFixed(suggestions: Suggestion[]): boolean {
+    return this.getFixedCollectionIds(suggestions).length === 1;
+  }
+
+  private getFixedCollectionIds(suggestions: Suggestion[]): string[] {
+    const collectionIds = {};
+    suggestions.forEach((suggestion: Suggestion) => {
+      const conf = environment.suggestion.find((suggestionConf: SuggestionConfig) => suggestionConf.source === suggestion.source);
+      if (hasValue(conf)) {
+        collectionIds[conf.collectionId] = true;
+      }
+    });
+    return Object.keys(collectionIds);
+  }
+}
diff --git a/src/app/page-error/page-error.component.spec.ts b/src/app/page-error/page-error.component.spec.ts
index 0f876f3196..7361935af3 100644
--- a/src/app/page-error/page-error.component.spec.ts
+++ b/src/app/page-error/page-error.component.spec.ts
@@ -1,11 +1,19 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { PageErrorComponent } from './page-error.component';
-import { ActivatedRoute } from '@angular/router';
-import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
 import { TranslateLoaderMock } from '../shared/testing/translate-loader.mock';
+import { PageErrorComponent } from './page-error.component';
 
 describe('PageErrorComponent', () => {
   let component: PageErrorComponent;
@@ -13,8 +21,8 @@ describe('PageErrorComponent', () => {
   const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
     queryParams: observableOf({
       status: 401,
-      code: 'orcid.generic-error'
-    })
+      code: 'orcid.generic-error',
+    }),
   });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -23,13 +31,13 @@ describe('PageErrorComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-      ]
+      ],
     }).compileComponents();
 
     fixture = TestBed.createComponent(PageErrorComponent);
diff --git a/src/app/page-error/page-error.component.ts b/src/app/page-error/page-error.component.ts
index dea1b68407..06d566f59c 100644
--- a/src/app/page-error/page-error.component.ts
+++ b/src/app/page-error/page-error.component.ts
@@ -1,4 +1,7 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 
 /**
@@ -8,7 +11,7 @@ import { ActivatedRoute } from '@angular/router';
   selector: 'ds-page-error',
   styleUrls: ['./page-error.component.scss'],
   templateUrl: './page-error.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PageErrorComponent {
   status: number;
diff --git a/src/app/page-error/themed-page-error.component.ts b/src/app/page-error/themed-page-error.component.ts
index 3bfc6bf1a1..517ca45206 100644
--- a/src/app/page-error/themed-page-error.component.ts
+++ b/src/app/page-error/themed-page-error.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageErrorComponent } from './page-error.component';
 
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.html b/src/app/page-internal-server-error/page-internal-server-error.component.html
index 8629873dae..87a3bef235 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.html
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.html
@@ -1,6 +1,8 @@
 <div class="page-internal-server-error container">
   <h1>500</h1>
-  <h2><small>{{"500.page-internal-server-error" | translate}}</small></h2>
+  <h2><small>
+    {{"500.page-internal-server-error" | translate}}
+  </small></h2>
   <br/>
   <p>{{"500.help" | translate}}</p>
   <br/>
diff --git a/src/app/page-internal-server-error/page-internal-server-error.component.ts b/src/app/page-internal-server-error/page-internal-server-error.component.ts
index 7ecb0a7609..bba313d6d2 100644
--- a/src/app/page-internal-server-error/page-internal-server-error.component.ts
+++ b/src/app/page-internal-server-error/page-internal-server-error.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ServerResponseService } from '../core/services/server-response.service';
 
 /**
@@ -8,7 +12,7 @@ import { ServerResponseService } from '../core/services/server-response.service'
   selector: 'ds-page-internal-server-error',
   styleUrls: ['./page-internal-server-error.component.scss'],
   templateUrl: './page-internal-server-error.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PageInternalServerErrorComponent {
 
diff --git a/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts b/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
index a5f9101b69..157047688e 100644
--- a/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
+++ b/src/app/page-internal-server-error/themed-page-internal-server-error.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageInternalServerErrorComponent } from './page-internal-server-error.component';
 
diff --git a/src/app/pagenotfound/pagenotfound.component.ts b/src/app/pagenotfound/pagenotfound.component.ts
index b11de58269..dcbfed48b4 100644
--- a/src/app/pagenotfound/pagenotfound.component.ts
+++ b/src/app/pagenotfound/pagenotfound.component.ts
@@ -1,6 +1,11 @@
-import { ServerResponseService } from '../core/services/server-response.service';
-import { Component, ChangeDetectionStrategy, OnInit } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { AuthService } from '../core/auth/auth.service';
+import { ServerResponseService } from '../core/services/server-response.service';
 
 /**
  * This component representing the `PageNotFound` DSpace page.
@@ -9,7 +14,7 @@ import { AuthService } from '../core/auth/auth.service';
   selector: 'ds-pagenotfound',
   styleUrls: ['./pagenotfound.component.scss'],
   templateUrl: './pagenotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class PageNotFoundComponent implements OnInit {
 
diff --git a/src/app/pagenotfound/themed-pagenotfound.component.ts b/src/app/pagenotfound/themed-pagenotfound.component.ts
index 3d284b1d6d..ba3372411a 100644
--- a/src/app/pagenotfound/themed-pagenotfound.component.ts
+++ b/src/app/pagenotfound/themed-pagenotfound.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { PageNotFoundComponent } from './pagenotfound.component';
 
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..31d18bc065 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
@@ -1,10 +1,15 @@
-import { ProcessDetailFieldComponent } from './process-detail-field.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VarDirective } from '../../../shared/utils/var.directive';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { By } from '@angular/platform-browser';
+
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { ProcessDetailFieldComponent } from './process-detail-field.component';
 
 describe('ProcessDetailFieldComponent', () => {
   let component: ProcessDetailFieldComponent;
@@ -20,7 +25,7 @@ describe('ProcessDetailFieldComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -32,7 +37,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-field/process-detail-field.component.ts b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
index f8015b6788..7cb38653f4 100644
--- a/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
+++ b/src/app/process-page/detail/process-detail-field/process-detail-field.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-process-detail-field',
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index ae3418eafa..521aec12c2 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -1,10 +1,15 @@
-<div class="container" *ngVar="(processRD$ | async)?.payload as process">
-    <div class="d-flex">
-        <h2 class="flex-grow-1">{{'process.detail.title' | translate:{
-            id: process?.processId,
-            name: process?.scriptName
-        } }}</h2>
+<div class="container" *ngIf="(processRD$ | async)?.payload as process">
+    <div class="row">
+      <div class="col-10">
+        <h1 class="flex-grow-1">
+          {{ 'process.detail.title' | translate:{ id: process?.processId, name: process?.scriptName } }}
+        </h1>
+      </div>
+      <div *ngIf="isRefreshing$ | async" class="col-2 refresh-counter">
+        {{ 'process.detail.refreshing' | translate }} <i class="fas fa-sync-alt fa-spin"></i>
+      </div>
     </div>
+
     <ds-process-detail-field id="process-name" [title]="'process.detail.script'">
         <div>{{ process?.scriptName }}</div>
     </ds-process-detail-field>
@@ -17,10 +22,12 @@
     <div *ngVar="(filesRD$ | async)?.payload?.page as files">
         <ds-process-detail-field *ngIf="files && files?.length > 0" id="process-files"
                                  [title]="'process.detail.output-files'">
-            <ds-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
-                <span>{{getFileName(file)}}</span>
-                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
-            </ds-file-download-link>
+          <div class="d-flex flex-column">
+            <ds-themed-file-download-link *ngFor="let file of files; let last=last;" [bitstream]="file">
+              <span>{{getFileName(file)}}</span>
+              <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+            </ds-themed-file-download-link>
+          </div>
         </ds-process-detail-field>
     </div>
 
@@ -40,16 +47,16 @@
     </ds-process-detail-field>
 
     <ds-process-detail-field *ngIf="isProcessFinished(process)" id="process-output" [title]="'process.detail.output'">
-        <button *ngIf="!showOutputLogs && process?._links?.output?.href != undefined" id="showOutputButton"
+        <button *ngIf="!showOutputLogs && process?._links?.output?.href !== undefined" id="showOutputButton"
                 class="btn btn-primary" (click)="showProcessOutputLogs()">
             {{ 'process.detail.logs.button' | translate }}
         </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">
+        <p id="no-output-logs-message" *ngIf="((retrievingOutputLogs$ | async) !== true && showOutputLogs)
+      && (outputLogs$ | async | dsHasNoValue) || (outputLogs$ | async)?.length === 0 || !process._links.output">
             {{ 'process.detail.logs.none' | translate }}
         </p>
     </ds-process-detail-field>
@@ -70,7 +77,7 @@
 
 <ng-template #deleteModal >
 
-    <div *ngVar="(processRD$ | async)?.payload as process">
+    <div *ngIf="(processRD$ | async)?.payload as process">
 
         <div class="modal-header">
             <div>
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 e4ab7d1082..aac8538074 100644
--- a/src/app/process-page/detail/process-detail.component.spec.ts
+++ b/src/app/process-page/detail/process-detail.component.spec.ts
@@ -1,41 +1,48 @@
 import { HttpClient } from '@angular/common/http';
-import { AuthService } from '../../core/auth/auth.service';
-import { BitstreamDataService } from '../../core/data/bitstream-data.service';
-import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
-import { ProcessDetailComponent } from './process-detail.component';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import {
-  waitForAsync,
   ComponentFixture,
   discardPeriodicTasks,
   fakeAsync,
   flush,
   flushMicrotasks,
   TestBed,
-  tick
+  tick,
+  waitForAsync,
 } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
-import { Process } from '../processes/process.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { of as observableOf } from 'rxjs';
 import { By } from '@angular/platform-browser';
-import { FileSizePipe } from '../../shared/utils/file-size-pipe';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../core/data/bitstream-data.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { AuthServiceMock } from '../../shared/mocks/auth.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { FileSizePipe } from '../../shared/utils/file-size-pipe';
+import { HasNoValuePipe } from '../../shared/utils/has-no-value.pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { getProcessListRoute } from '../process-page-routing.paths';
+import { Process } from '../processes/process.model';
+import { ProcessDetailComponent } from './process-detail.component';
+import { ProcessDetailFieldComponent } from './process-detail-field/process-detail-field.component';
 
 describe('ProcessDetailComponent', () => {
   let component: ProcessDetailComponent;
@@ -45,43 +52,18 @@ describe('ProcessDetailComponent', () => {
   let nameService: DSONameService;
   let bitstreamDataService: BitstreamDataService;
   let httpClient: HttpClient;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
+  let modalService;
+  let notificationsService: NotificationsServiceStub;
 
   let process: Process;
   let fileName: string;
   let files: Bitstream[];
 
-  let processOutput;
-
-  let modalService;
-  let notificationsService;
-
-  let router;
+  let processOutput: string;
 
   function init() {
-    processOutput = 'Process Started';
-    process = Object.assign(new Process(), {
-      processId: 1,
-      scriptName: 'script-name',
-      processStatus: 'COMPLETED',
-      parameters: [
-        {
-          name: '-f',
-          value: 'file.xml'
-        },
-        {
-          name: '-i',
-          value: 'identifier'
-        }
-      ],
-      _links: {
-        self: {
-          href: 'https://rest.api/processes/1'
-        },
-        output: {
-          href: 'https://rest.api/processes/1/output'
-        }
-      }
-    });
     fileName = 'fake-file-name';
     files = [
       Object.assign(new Bitstream(), {
@@ -90,56 +72,92 @@ describe('ProcessDetailComponent', () => {
           'dc.title': [
             {
               value: fileName,
-              language: null
-            }
-          ]
+              language: null,
+            },
+          ],
         },
         _links: {
-          content: { href: 'file-selflink' }
-        }
-      })
+          content: { href: 'file-selflink' },
+        },
+      }),
     ];
+    processOutput = 'Process Started';
+    process = Object.assign(new Process(), {
+      processId: 1,
+      scriptName: 'script-name',
+      processStatus: 'COMPLETED',
+      parameters: [
+        {
+          name: '-f',
+          value: 'file.xml',
+        },
+        {
+          name: '-i',
+          value: 'identifier',
+        },
+      ],
+      files: createSuccessfulRemoteDataObject$(Object.assign(new PaginatedList(), {
+        page: files,
+      })),
+      _links: {
+        self: {
+          href: 'https://rest.api/processes/1',
+        },
+        output: {
+          href: 'https://rest.api/processes/1/output',
+        },
+      },
+    });
     const logBitstream = Object.assign(new Bitstream(), {
       id: 'output.log',
       _links: {
-        content: { href: 'log-selflink' }
-      }
+        content: { href: 'log-selflink' },
+      },
     });
     processService = jasmine.createSpyObj('processService', {
       getFiles: createSuccessfulRemoteDataObject$(createPaginatedList(files)),
-      delete: createSuccessfulRemoteDataObject$(null)
+      delete: createSuccessfulRemoteDataObject$(null),
+      findById: createSuccessfulRemoteDataObject$(process),
+      autoRefreshUntilCompletion: createSuccessfulRemoteDataObject$(process),
     });
     bitstreamDataService = jasmine.createSpyObj('bitstreamDataService', {
-      findByHref: createSuccessfulRemoteDataObject$(logBitstream)
+      findByHref: createSuccessfulRemoteDataObject$(logBitstream),
     });
     nameService = jasmine.createSpyObj('nameService', {
-      getName: fileName
+      getName: fileName,
     });
     httpClient = jasmine.createSpyObj('httpClient', {
-      get: observableOf(processOutput)
+      get: observableOf(processOutput),
     });
 
     modalService = jasmine.createSpyObj('modalService', {
-      open: {}
+      open: {},
     });
 
     notificationsService = new NotificationsServiceStub();
 
-    router = jasmine.createSpyObj('router', {
-      navigateByUrl:{}
+    router = new RouterStub();
+
+    route = new ActivatedRouteStub({
+      id: process.processId,
+    }, {
+      process: createSuccessfulRemoteDataObject$(process),
     });
   }
 
   beforeEach(waitForAsync(() => {
     init();
-    TestBed.configureTestingModule({
-      declarations: [ProcessDetailComponent, ProcessDetailFieldComponent, VarDirective, FileSizePipe],
-      imports: [TranslateModule.forRoot()],
+    void TestBed.configureTestingModule({
+      declarations: [
+        ProcessDetailComponent,
+        ProcessDetailFieldComponent,
+        VarDirective,
+        FileSizePipe,
+        HasNoValuePipe,
+      ],
+      imports: [TranslateModule.forRoot(), RouterTestingModule],
       providers: [
-        {
-          provide: ActivatedRoute,
-          useValue: { data: observableOf({ process: createSuccessfulRemoteDataObject(process) }) }
-        },
+        { provide: ActivatedRoute, useValue: route },
         { provide: ProcessDataService, useValue: processService },
         { provide: BitstreamDataService, useValue: bitstreamDataService },
         { provide: DSONameService, useValue: nameService },
@@ -149,7 +167,7 @@ describe('ProcessDetailComponent', () => {
         { provide: NotificationsService, useValue: notificationsService },
         { provide: Router, useValue: router },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -194,7 +212,7 @@ describe('ProcessDetailComponent', () => {
       const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton'));
       showOutputButton.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
     }));
@@ -219,7 +237,7 @@ describe('ProcessDetailComponent', () => {
       const showOutputButton = fixture.debugElement.query(By.css('#showOutputButton'));
       showOutputButton.triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -244,6 +262,8 @@ describe('ProcessDetailComponent', () => {
   describe('deleteProcess', () => {
     it('should delete the process and navigate back to the overview page on success', () => {
       spyOn(component, 'closeModal');
+      spyOn(router, 'navigateByUrl').and.callThrough();
+
       component.deleteProcess(process);
 
       expect(processService.delete).toHaveBeenCalledWith(process.processId);
@@ -254,6 +274,7 @@ describe('ProcessDetailComponent', () => {
     it('should delete the process and not navigate on error', () => {
       (processService.delete as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
       spyOn(component, 'closeModal');
+      spyOn(router, 'navigateByUrl').and.callThrough();
 
       component.deleteProcess(process);
 
@@ -263,5 +284,4 @@ describe('ProcessDetailComponent', () => {
       expect(router.navigateByUrl).not.toHaveBeenCalled();
     });
   });
-
 });
diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts
index 9d92dece61..ab7d527aab 100644
--- a/src/app/process-page/detail/process-detail.component.ts
+++ b/src/app/process-page/detail/process-detail.component.ts
@@ -1,31 +1,60 @@
+import { isPlatformBrowser } from '@angular/common';
 import { HttpClient } from '@angular/common/http';
-import { Component, NgZone, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { finalize, map, switchMap, take, tap } from 'rxjs/operators';
+import {
+  Component,
+  Inject,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  finalize,
+  find,
+  map,
+  startWith,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../core/data/bitstream-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { redirectOn4xx } from '../../core/shared/authorized.operators';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import {
+  getAllSucceededRemoteDataPayload,
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getFirstSucceededRemoteDataPayload
+  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';
-import { redirectOn4xx } from '../../core/shared/authorized.operators';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { getProcessListRoute } from '../process-page-routing.paths';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+import { PROCESS_PAGE_FOLLOW_LINKS } from '../process-page.resolver';
+import { getProcessListRoute } from '../process-page-routing.paths';
+import { Process } from '../processes/process.model';
+import { ProcessStatus } from '../processes/process-status.model';
 
 @Component({
   selector: 'ds-process-detail',
@@ -34,7 +63,7 @@ import { TranslateService } from '@ngx-translate/core';
 /**
  * A component displaying detailed information about a DSpace Process
  */
-export class ProcessDetailComponent implements OnInit {
+export class ProcessDetailComponent implements OnInit, OnDestroy {
 
   /**
    * The AlertType enumeration
@@ -65,56 +94,82 @@ export class ProcessDetailComponent implements OnInit {
   /**
    * Boolean on whether or not to show the output logs
    */
-  showOutputLogs;
+  showOutputLogs = false;
   /**
    * When it's retrieving the output logs from backend, to show loading component
    */
-  retrievingOutputLogs$: BehaviorSubject<boolean>;
+  retrievingOutputLogs$ = new BehaviorSubject<boolean>(false);
 
   /**
    * Date format to use for start and end time of processes
    */
   dateFormat = 'yyyy-MM-dd HH:mm:ss ZZZZ';
 
+  isRefreshing$: Observable<boolean>;
+
+  isDeleting: boolean;
+
+  protected autoRefreshingID: string;
+
   /**
    * Reference to NgbModal
    */
   protected modalRef: NgbModalRef;
 
-  constructor(protected route: ActivatedRoute,
-              protected router: Router,
-              protected processService: ProcessDataService,
-              protected bitstreamDataService: BitstreamDataService,
-              protected nameService: DSONameService,
-              private zone: NgZone,
-              protected authService: AuthService,
-              protected http: HttpClient,
-              protected modalService: NgbModal,
-              protected notificationsService: NotificationsService,
-              protected translateService: TranslateService
-  ) {
-  }
+  constructor(
+    @Inject(PLATFORM_ID) protected platformId: object,
+    protected route: ActivatedRoute,
+    protected router: Router,
+    protected processService: ProcessDataService,
+    protected bitstreamDataService: BitstreamDataService,
+    protected nameService: DSONameService,
+    private zone: NgZone,
+    protected authService: AuthService,
+    protected http: HttpClient,
+    protected modalService: NgbModal,
+    protected notificationsService: NotificationsService,
+    protected translateService: TranslateService,
+  ) {}
 
   /**
    * Initialize component properties
    * Display a 404 if the process doesn't exist
    */
   ngOnInit(): void {
-    this.showOutputLogs = false;
-    this.retrievingOutputLogs$ = new BehaviorSubject<boolean>(false);
     this.processRD$ = this.route.data.pipe(
-      map((data) => {
-        return data.process as RemoteData<Process>;
+      switchMap((data) => {
+        if (isPlatformBrowser(this.platformId)) {
+          this.autoRefreshingID = this.route.snapshot.params.id;
+          return this.processService.autoRefreshUntilCompletion(this.autoRefreshingID, 5000, ...PROCESS_PAGE_FOLLOW_LINKS);
+        } else {
+          return [data.process as RemoteData<Process>];
+        }
       }),
-      redirectOn4xx(this.router, this.authService)
+      filter(() => !this.isDeleting),
+      redirectOn4xx(this.router, this.authService),
+    );
+
+    this.isRefreshing$ = this.processRD$.pipe(
+      find((processRD: RemoteData<Process>) => ProcessDataService.hasCompletedOrFailed(processRD.payload)),
+      map(() => false),
+      startWith(true),
     );
 
     this.filesRD$ = this.processRD$.pipe(
-      getFirstSucceededRemoteDataPayload(),
-      switchMap((process: Process) => this.processService.getFiles(process.processId))
+      getAllSucceededRemoteDataPayload(),
+      switchMap((process: Process) => process.files),
     );
   }
 
+  /**
+   * Make sure the autoRefreshUntilCompletion is cleaned up properly
+   */
+  ngOnDestroy() {
+    if (hasValue(this.autoRefreshingID)) {
+      this.processService.stopAutoRefreshing(this.autoRefreshingID);
+    }
+  }
+
   /**
    * Get the name of a bitstream
    * @param bitstream
@@ -128,14 +183,13 @@ export class ProcessDetailComponent implements OnInit {
    * Sets the outputLogs when retrieved and sets the showOutputLogs boolean to show them and hide the button.
    */
   showProcessOutputLogs() {
-    console.log('showProcessOutputLogs');
     this.retrievingOutputLogs$.next(true);
     this.zone.runOutsideAngular(() => {
       const processOutputRD$: Observable<RemoteData<Bitstream>> = this.processRD$.pipe(
         getFirstSucceededRemoteDataPayload(),
         switchMap((process: Process) => {
           return this.bitstreamDataService.findByHref(process._links.output.href, false);
-        })
+        }),
       );
       this.outputLogFileUrl$ = processOutputRD$.pipe(
         getFirstSucceededRemoteData(),
@@ -151,17 +205,17 @@ export class ProcessDetailComponent implements OnInit {
             map((token: string) => {
               return hasValue(token) ? new URLCombiner(url, `?authentication-token=${token}`).toString() : url;
             }));
-        })
+        }),
       );
     });
-     this.outputLogFileUrl$.pipe(take(1),
+    this.outputLogFileUrl$.pipe(take(1),
       switchMap((url: string) => {
         return this.getTextFile(url);
       }),
-      finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false)))
+      finalize(() => this.zone.run(() => this.retrievingOutputLogs$.next(false))),
     ).subscribe((logs: string) => {
-       this.outputLogs$.next(logs);
-     });
+      this.outputLogs$.next(logs);
+    });
   }
 
   getTextFile(filename: string): Observable<string> {
@@ -191,15 +245,17 @@ export class ProcessDetailComponent implements OnInit {
    * @param process
    */
   deleteProcess(process: Process) {
+    this.isDeleting = true;
     this.processService.delete(process.processId).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('process.detail.delete.success'));
         this.closeModal();
-        this.router.navigateByUrl(getProcessListRoute());
+        void this.router.navigateByUrl(getProcessListRoute());
       } else {
         this.notificationsService.error(this.translateService.get('process.detail.delete.error'));
+        this.isDeleting = false;
       }
     });
   }
@@ -211,11 +267,11 @@ export class ProcessDetailComponent implements OnInit {
   openDeleteModal(content) {
     this.modalRef = this.modalService.open(content);
   }
+
   /**
    * Close the modal.
    */
   closeModal() {
     this.modalRef.close();
   }
-
 }
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-form.component.spec.ts b/src/app/process-page/form/process-form.component.spec.ts
index 10bc8294d3..ec1b794324 100644
--- a/src/app/process-page/form/process-form.component.spec.ts
+++ b/src/app/process-page/form/process-form.component.spec.ts
@@ -1,19 +1,26 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ProcessFormComponent } from './process-form.component';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ScriptParameter } from '../scripts/script-parameter.model';
-import { Script } from '../scripts/script.model';
-import { ProcessParameter } from '../processes/process-parameter.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { RequestService } from '../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { ProcessFormComponent } from './process-form.component';
 
 describe('ProcessFormComponent', () => {
   let component: ProcessFormComponent;
@@ -38,10 +45,10 @@ describe('ProcessFormComponent', () => {
         invoke: observableOf({
           response:
             {
-              isSuccessful: true
-            }
-        })
-      }
+              isSuccessful: true,
+            },
+        }),
+      },
     );
     router = {
       navigateByUrl: () => undefined,
@@ -56,8 +63,8 @@ describe('ProcessFormComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ProcessFormComponent],
       providers: [
@@ -66,7 +73,7 @@ describe('ProcessFormComponent', () => {
         { provide: RequestService, useValue: jasmine.createSpyObj('requestService', ['removeBySubstring', 'removeByHrefSubstring']) },
         { provide: Router, useValue: jasmine.createSpyObj('router', ['navigateByUrl']) },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-form.component.ts b/src/app/process-page/form/process-form.component.ts
index 70eb3160a8..eea83f9e93 100644
--- a/src/app/process-page/form/process-form.component.ts
+++ b/src/app/process-page/form/process-form.component.ts
@@ -1,18 +1,28 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Script } from '../scripts/script.model';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { isEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { getProcessListRoute } from '../process-page-routing.paths';
 import { Process } from '../processes/process.model';
 import { ProcessParameter } from '../processes/process-parameter.model';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { Script } from '../scripts/script.model';
 import { ScriptParameter } from '../scripts/script-parameter.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { Router } from '@angular/router';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { getProcessListRoute } from '../process-page-routing.paths';
-import { isEmpty } from '../../shared/empty.util';
 
 /**
  * Component to create a new script
@@ -57,7 +67,6 @@ export class ProcessFormComponent implements OnInit {
     private scriptService: ScriptDataService,
     private notificationsService: NotificationsService,
     private translationService: TranslateService,
-    private requestService: RequestService,
     private router: Router) {
   }
 
@@ -78,11 +87,11 @@ export class ProcessFormComponent implements OnInit {
     }
 
     const stringParameters: ProcessParameter[] = this.parameters.map((parameter: ProcessParameter) => {
-        return {
-          name: parameter.name,
-          value: this.checkValue(parameter)
-        };
-      }
+      return {
+        name: parameter.name,
+        value: this.checkValue(parameter),
+      };
+    },
     );
     this.scriptService.invoke(this.selectedScript.id, stringParameters, this.files)
       .pipe(getFirstCompletedRemoteData())
@@ -91,7 +100,7 @@ export class ProcessFormComponent implements OnInit {
           const title = this.translationService.get('process.new.notification.success.title');
           const content = this.translationService.get('process.new.notification.success.content');
           this.notificationsService.success(title, content);
-          this.sendBack();
+          this.sendBack(rd.payload);
         } else {
           const title = this.translationService.get('process.new.notification.error.title');
           const content = this.translationService.get('process.new.notification.error.content');
@@ -143,11 +152,17 @@ export class ProcessFormComponent implements OnInit {
     return this.missingParameters.length > 0;
   }
 
-  private sendBack() {
-    this.requestService.removeByHrefSubstring('/processes');
-    /* should subscribe on the previous method to know the action is finished and then navigate,
-    will fix this when the removeByHrefSubstring changes are merged */
-    this.router.navigateByUrl(getProcessListRoute());
+  /**
+   * Redirect the user to the processes overview page with the new process' ID,
+   * so it can be highlighted in the overview table.
+   * @param newProcess The newly created process
+   * @private
+   */
+  private sendBack(newProcess: Process) {
+    const extras: NavigationExtras = {
+      queryParams: { new_process_id: newProcess.processId },
+    };
+    void this.router.navigate([getProcessListRoute()], extras);
   }
 }
 
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..64f1b55456 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,11 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ParameterSelectComponent } from './parameter-select.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { ScriptParameter } from '../../../scripts/script-parameter.model';
 import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
-import { By } from '@angular/platform-browser';
+import { ParameterSelectComponent } from './parameter-select.component';
 
 describe('ParameterSelectComponent', () => {
   let component: ParameterSelectComponent;
@@ -18,24 +23,27 @@ describe('ParameterSelectComponent', () => {
         new ScriptParameter(),
         {
           name: '-a',
-          type: ScriptParameterType.BOOLEAN
-        }
+          type: ScriptParameterType.BOOLEAN,
+        },
       ),
       Object.assign(
         new ScriptParameter(),
         {
           name: '-f',
-          type: ScriptParameterType.FILE
-        }
+          type: ScriptParameterType.FILE,
+        },
       ),
     ];
   }
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       declarations: [ParameterSelectComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
index e016d3442f..95a8109d51 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.ts
@@ -1,7 +1,17 @@
-import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Optional,
+  Output,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { ProcessParameter } from '../../../processes/process-parameter.model';
 import { ScriptParameter } from '../../../scripts/script-parameter.model';
-import { ControlContainer, NgForm } from '@angular/forms';
 import { controlContainerFactory } from '../../process-form.component';
 
 /**
@@ -14,8 +24,8 @@ import { controlContainerFactory } from '../../process-form.component';
   viewProviders: [{
     provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]]
-  }]
+    deps: [[new Optional(), NgForm]],
+  }],
 })
 export class ParameterSelectComponent {
   @Input() index: number;
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..2155784358 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,4 +1,9 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 
 import { BooleanValueInputComponent } from './boolean-value-input.component';
 
@@ -8,7 +13,10 @@ describe('BooleanValueInputComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [BooleanValueInputComponent]
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [BooleanValueInputComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
index 3f0a82b07a..93aca5cb99 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component.ts
@@ -1,7 +1,15 @@
-import { Component, OnInit, Optional } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  OnInit,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the value of a boolean parameter
@@ -12,7 +20,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./boolean-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class BooleanValueInputComponent extends ValueInputComponent<boolean> implements OnInit {
   ngOnInit() {
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/date-value-input/date-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
index 2264a0f331..33b90d554b 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.spec.ts
@@ -1,10 +1,19 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
-import { DateValueInputComponent } from './date-value-input.component';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { DateValueInputComponent } from './date-value-input.component';
 
 describe('DateValueInputComponent', () => {
   let component: DateValueInputComponent;
@@ -17,10 +26,10 @@ describe('DateValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
-      declarations: [DateValueInputComponent]
+      declarations: [DateValueInputComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
index ce1414e8ad..1dcedb6e79 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/date-value-input/date-value-input.component.ts
@@ -1,7 +1,15 @@
-import { Component, Input, Optional } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  Input,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the user inputted value of a date parameter
@@ -12,7 +20,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./date-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class DateValueInputComponent extends ValueInputComponent<string> {
   /**
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/file-value-input/file-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
index 07aad6ce4e..5271a34d8d 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.spec.ts
@@ -1,13 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { FileValueInputComponent } from './file-value-input.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
 import { FileValueAccessorDirective } from '../../../../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../../../../shared/utils/require-file.validator';
-import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { FileValueInputComponent } from './file-value-input.component';
 
 describe('FileValueInputComponent', () => {
   let component: FileValueInputComponent;
@@ -20,11 +27,11 @@ describe('FileValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [FileValueInputComponent, FileValueAccessorDirective, FileValidator],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
 
     })
       .compileComponents();
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
index 796a5de58e..451860f10f 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.ts
@@ -1,7 +1,14 @@
-import { Component, Optional } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the user inputted value of a file parameter
@@ -12,7 +19,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./file-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class FileValueInputComponent extends ValueInputComponent<File> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
index a28e7798c1..cde98f835e 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.spec.ts
@@ -1,19 +1,26 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ParameterValueInputComponent } from './parameter-value-input.component';
-import { ScriptParameter } from '../../../scripts/script-parameter.model';
-import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
-import { By } from '@angular/platform-browser';
-import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
-import { StringValueInputComponent } from './string-value-input/string-value-input.component';
-import { FileValueInputComponent } from './file-value-input/file-value-input.component';
-import { DateValueInputComponent } from './date-value-input/date-value-input.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
 import { FileValueAccessorDirective } from '../../../../shared/utils/file-value-accessor.directive';
 import { FileValidator } from '../../../../shared/utils/require-file.validator';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { ScriptParameter } from '../../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import { BooleanValueInputComponent } from './boolean-value-input/boolean-value-input.component';
+import { DateValueInputComponent } from './date-value-input/date-value-input.component';
+import { FileValueInputComponent } from './file-value-input/file-value-input.component';
+import { ParameterValueInputComponent } from './parameter-value-input.component';
+import { StringValueInputComponent } from './string-value-input/string-value-input.component';
 
 describe('ParameterValueInputComponent', () => {
   let component: ParameterValueInputComponent;
@@ -40,8 +47,8 @@ describe('ParameterValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [
         ParameterValueInputComponent,
@@ -50,9 +57,9 @@ describe('ParameterValueInputComponent', () => {
         FileValueInputComponent,
         DateValueInputComponent,
         FileValueAccessorDirective,
-        FileValidator
+        FileValidator,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
index ec29ee5e1e..5d6c59962e 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/parameter-value-input.component.ts
@@ -1,7 +1,17 @@
-import { Component, EventEmitter, Input, Optional, Output } from '@angular/core';
-import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Optional,
+  Output,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { ScriptParameter } from '../../../scripts/script-parameter.model';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptParameterType } from '../../../scripts/script-parameter-type.model';
 import { controlContainerFactory } from '../../process-form.component';
 
 /**
@@ -13,7 +23,7 @@ import { controlContainerFactory } from '../../process-form.component';
   styleUrls: ['./parameter-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class ParameterValueInputComponent {
   @Input() index: number;
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/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
index 6b7de9460d..224623a5ee 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.spec.ts
@@ -1,10 +1,19 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
-import { StringValueInputComponent } from './string-value-input.component';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../../../shared/mocks/translate-loader.mock';
+import { StringValueInputComponent } from './string-value-input.component';
 
 describe('StringValueInputComponent', () => {
   let component: StringValueInputComponent;
@@ -17,12 +26,12 @@ describe('StringValueInputComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [StringValueInputComponent],
       providers: [
-      ]
+      ],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
index 0424faec21..362eaf07cc 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/string-value-input/string-value-input.component.ts
@@ -1,7 +1,15 @@
-import { Component, Optional, Input } from '@angular/core';
-import { ValueInputComponent } from '../value-input.component';
-import { ControlContainer, NgForm } from '@angular/forms';
+import {
+  Component,
+  Input,
+  Optional,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { controlContainerFactory } from '../../../process-form.component';
+import { ValueInputComponent } from '../value-input.component';
 
 /**
  * Represents the user inputted value of a string parameter
@@ -12,7 +20,7 @@ import { controlContainerFactory } from '../../../process-form.component';
   styleUrls: ['./string-value-input.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class StringValueInputComponent extends ValueInputComponent<string> {
   /**
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
index 7b3342651d..d224c4f0cd 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/value-input.component.ts
@@ -1,11 +1,16 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 
 /**
  * Abstract class that represents value input components
  */
 @Component({
   selector: 'ds-value-input',
-  template: ''
+  template: '',
 })
 export abstract class ValueInputComponent<T> {
   @Input() index: number;
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.html b/src/app/process-page/form/process-parameters/process-parameters.component.html
index d7bbce6779..a937524e88 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.html
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.html
@@ -1,11 +1,11 @@
-<div class="form-group" *ngIf="script">
-    <label>{{'process.new.select-parameters' | translate}}</label>
-    <ds-parameter-select
-            *ngFor="let value of parameterValues; let i = index; let last = last"
-            [parameters]="script.parameters"
-            [parameterValue]="value"
-            [removable]="!last"
-            [index]="i"
-            (removeParameter)="removeParameter(i)"
-            (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
+<div class="form-group" *ngIf="script?.parameters?.length" data-testID="parameters-select-container">
+  <label>{{'process.new.select-parameters' | translate}}</label>
+  <ds-parameter-select
+    *ngFor="let value of parameterValues; let i = index; let last = last"
+    [parameters]="script.parameters"
+    [parameterValue]="value"
+    [removable]="!last"
+    [index]="i"
+    (removeParameter)="removeParameter(i)"
+    (changeParameter)="updateParameter($event, i)"></ds-parameter-select>
 </div>
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
index 91bc61e02f..4231892588 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.spec.ts
@@ -1,27 +1,34 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ProcessParametersComponent } from './process-parameters.component';
-import { ProcessParameter } from '../../processes/process-parameter.model';
-import { By } from '@angular/platform-browser';
-import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ProcessParameter } from '../../processes/process-parameter.model';
 import { Script } from '../../scripts/script.model';
 import { ScriptParameter } from '../../scripts/script-parameter.model';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { ParameterSelectComponent } from './parameter-select/parameter-select.component';
+import { ProcessParametersComponent } from './process-parameters.component';
 
 describe('ProcessParametersComponent', () => {
   let component: ProcessParametersComponent;
   let fixture: ComponentFixture<ProcessParametersComponent>;
-  let parameterValues;
-  let script;
+  let mockParameterValues: ProcessParameter[];
+  let mockScript: Script;
 
-  function init() {
+  function initParametersAndScriptMockValues() {
     const param1 = new ScriptParameter();
     const param2 = new ScriptParameter();
-    script = Object.assign(new Script(), { parameters: [param1, param2] });
-    parameterValues = [
+    mockScript = Object.assign(new Script(), { parameters: [param1, param2] });
+    mockParameterValues = [
       Object.assign(new ProcessParameter(), { name: '-a', value: 'bla' }),
       Object.assign(new ProcessParameter(), { name: '-b', value: '123' }),
       Object.assign(new ProcessParameter(), { name: '-c', value: 'value' }),
@@ -29,18 +36,17 @@ describe('ProcessParametersComponent', () => {
   }
 
   beforeEach(waitForAsync(() => {
-    init();
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ProcessParametersComponent, ParameterSelectComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -48,17 +54,34 @@ describe('ProcessParametersComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(ProcessParametersComponent);
     component = fixture.componentInstance;
-    component.script = script;
-    component.parameterValues = parameterValues;
-    fixture.detectChanges();
   });
 
   it('should create', () => {
     expect(component).toBeTruthy();
   });
 
-  it('should render a ParameterSelectComponent for each parameter value of the component', () => {
-    const selectComponents = fixture.debugElement.queryAll(By.directive(ParameterSelectComponent));
-    expect(selectComponents.length).toBe(parameterValues.length);
+  describe('when parameter values and script are initialized', () => {
+
+    beforeEach(() => {
+      initParametersAndScriptMockValues();
+      component.parameterValues = mockParameterValues;
+      component.script = mockScript;
+
+      fixture.detectChanges();
+    });
+
+    it(`should render a ${ParameterSelectComponent.name} for each parameter value`, () => {
+      const selectComponents = fixture.debugElement.queryAll(By.directive(ParameterSelectComponent));
+      expect(selectComponents.length).toBe(mockParameterValues.length);
+    });
+
+    it('should not render a selector box if the parameter array is empty',() => {
+      fixture.componentInstance.script.parameters = [];
+
+      fixture.detectChanges();
+
+      const formGroupComponent = fixture.debugElement.query(By.css('[data-testID=parameters-select-container]'));
+      expect(formGroupComponent).toBeFalsy();
+    });
   });
 });
diff --git a/src/app/process-page/form/process-parameters/process-parameters.component.ts b/src/app/process-page/form/process-parameters/process-parameters.component.ts
index 85b59f7644..b5ed225480 100644
--- a/src/app/process-page/form/process-parameters/process-parameters.component.ts
+++ b/src/app/process-page/form/process-parameters/process-parameters.component.ts
@@ -1,8 +1,20 @@
-import { Component, EventEmitter, Input, OnChanges, Optional, Output, SimpleChanges } from '@angular/core';
-import { Script } from '../../scripts/script.model';
-import { ProcessParameter } from '../../processes/process-parameter.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Optional,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+
 import { hasValue } from '../../../shared/empty.util';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { ProcessParameter } from '../../processes/process-parameter.model';
+import { Script } from '../../scripts/script.model';
 import { ScriptParameter } from '../../scripts/script-parameter.model';
 import { controlContainerFactory } from '../process-form.component';
 
@@ -16,8 +28,8 @@ import { controlContainerFactory } from '../process-form.component';
   viewProviders: [{
     provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]]
-  }]
+    deps: [[new Optional(), NgForm]],
+  }],
 })
 export class ProcessParametersComponent implements OnChanges {
   /**
@@ -99,7 +111,7 @@ export class ProcessParametersComponent implements OnChanges {
       this.parameterValues = this.script.parameters
         .filter((param) => param.mandatory)
         .map(
-          (parameter: ScriptParameter) => Object.assign(new ProcessParameter(), { name: parameter.name })
+          (parameter: ScriptParameter) => Object.assign(new ProcessParameter(), { name: parameter.name }),
         );
     }
     this.addParameter();
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/script-help/script-help.component.spec.ts b/src/app/process-page/form/script-help/script-help.component.spec.ts
index abfe8f9da1..20c868d9dc 100644
--- a/src/app/process-page/form/script-help/script-help.component.spec.ts
+++ b/src/app/process-page/form/script-help/script-help.component.spec.ts
@@ -1,14 +1,21 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ScriptHelpComponent } from './script-help.component';
-import { ScriptParameter } from '../../scripts/script-parameter.model';
-import { Script } from '../../scripts/script.model';
-import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
-import { By } from '@angular/platform-browser';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { Script } from '../../scripts/script.model';
+import { ScriptParameter } from '../../scripts/script-parameter.model';
+import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
+import { ScriptHelpComponent } from './script-help.component';
 
 describe('ScriptHelpComponent', () => {
   let component: ScriptHelpComponent;
@@ -18,11 +25,11 @@ describe('ScriptHelpComponent', () => {
   function init() {
     const param1 = Object.assign(
       new ScriptParameter(),
-      {name: '-d', description: 'Lorem ipsum dolor sit amet,', type: ScriptParameterType.DATE}
+      { name: '-d', description: 'Lorem ipsum dolor sit amet,', type: ScriptParameterType.DATE },
     );
     const param2 = Object.assign(
       new ScriptParameter(),
-      {name: '-f', description: 'consetetur sadipscing elitr', type: ScriptParameterType.BOOLEAN}
+      { name: '-f', description: 'consetetur sadipscing elitr', type: ScriptParameterType.BOOLEAN },
     );
     script = Object.assign(new Script(), { parameters: [param1, param2] });
   }
@@ -34,13 +41,13 @@ describe('ScriptHelpComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ ScriptHelpComponent ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
diff --git a/src/app/process-page/form/script-help/script-help.component.ts b/src/app/process-page/form/script-help/script-help.component.ts
index 7e230a4a42..779c5b781a 100644
--- a/src/app/process-page/form/script-help/script-help.component.ts
+++ b/src/app/process-page/form/script-help/script-help.component.ts
@@ -1,4 +1,8 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { Script } from '../../scripts/script.model';
 import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
 
@@ -8,7 +12,7 @@ import { ScriptParameterType } from '../../scripts/script-parameter-type.model';
 @Component({
   selector: 'ds-script-help',
   templateUrl: './script-help.component.html',
-  styleUrls: ['./script-help.component.scss']
+  styleUrls: ['./script-help.component.scss'],
 })
 export class ScriptHelpComponent {
   /**
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..819909b3ed 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
@@ -1,18 +1,30 @@
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { ScriptsSelectComponent } from './scripts-select.component';
-import { Script } from '../../scripts/script.model';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { RouterStub } from '../../../shared/testing/router.stub';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { Script } from '../../scripts/script.model';
+import { ScriptsSelectComponent } from './scripts-select.component';
 
 describe('ScriptsSelectComponent', () => {
   let component: ScriptsSelectComponent;
@@ -26,8 +38,8 @@ describe('ScriptsSelectComponent', () => {
     script2 = new Script();
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        findAll: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [script1, script2]))
-      }
+        findAll: createSuccessfulRemoteDataObject$(buildPaginatedList(undefined, [script1, script2])),
+      },
     );
   }
 
@@ -39,8 +51,8 @@ describe('ScriptsSelectComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [ScriptsSelectComponent],
       providers: [
@@ -48,7 +60,7 @@ describe('ScriptsSelectComponent', () => {
         { provide: Router, useClass: RouterStub },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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..c657f7e16c 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,13 +1,44 @@
-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 {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Optional,
+  Output,
+} from '@angular/core';
+import {
+  ControlContainer,
+  NgForm,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { hasNoValue, hasValue } from '../../../shared/empty.util';
-import { ControlContainer, NgForm } from '@angular/forms';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../shared/empty.util';
+import { Script } from '../../scripts/script.model';
 import { controlContainerFactory } from '../process-form.component';
 
 const SCRIPT_QUERY_PARAMETER = 'script';
@@ -21,7 +52,7 @@ const SCRIPT_QUERY_PARAMETER = 'script';
   styleUrls: ['./scripts-select.component.scss'],
   viewProviders: [ { provide: ControlContainer,
     useFactory: controlContainerFactory,
-    deps: [[new Optional(), NgForm]] } ]
+    deps: [[new Optional(), NgForm]] } ],
 })
 export class ScriptsSelectComponent implements OnInit, OnDestroy {
   /**
@@ -51,7 +82,7 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
       .pipe(
         getFirstSucceededRemoteData(),
         getRemoteDataPayload(),
-        map((paginatedList: PaginatedList<Script>) => paginatedList.page)
+        map((paginatedList: PaginatedList<Script>) => paginatedList.page),
       );
 
     this.routeSub = this.route.queryParams
@@ -64,10 +95,10 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
             .pipe(
               take(1),
               map((scripts) =>
-                scripts.find((script) => script.id === id)
-              )
-            )
-        )
+                scripts.find((script) => script.id === id),
+              ),
+            ),
+        ),
       ).subscribe((script: Script) => {
         this._selectedScript = script;
         this.select.emit(script);
@@ -89,13 +120,13 @@ export class ScriptsSelectComponent implements OnInit, OnDestroy {
     this.router.navigate([],
       {
         queryParams: { [SCRIPT_QUERY_PARAMETER]: value },
-      }
+      },
     );
   }
 
   @Input()
   set script(value: Script) {
-     this._selectedScript = value;
+    this._selectedScript = value;
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/process-page/new/new-process.component.html b/src/app/process-page/new/new-process.component.html
index f61764ffd2..6e86952638 100644
--- a/src/app/process-page/new/new-process.component.html
+++ b/src/app/process-page/new/new-process.component.html
@@ -1,6 +1,6 @@
-<ng-container *ngIf="fromExisting$ && (fromExisting$ | async)">
+<ng-container *ngIf="fromExisting$ | async | dsHasValue; else newProcess">
     <ds-process-form *ngVar="fromExisting$ | async as process" headerKey="process.new.header" [selectedScript]="script$ | async" [parameters]="process.parameters"></ds-process-form>
 </ng-container>
-<ng-container *ngIf="!fromExisting$ || !(fromExisting$ | async)">
+<ng-template #newProcess>
     <ds-process-form headerKey="process.new.header"></ds-process-form>
-</ng-container>
+</ng-template>
diff --git a/src/app/process-page/new/new-process.component.spec.ts b/src/app/process-page/new/new-process.component.spec.ts
index 48f0f097a9..e6b46efae0 100644
--- a/src/app/process-page/new/new-process.component.spec.ts
+++ b/src/app/process-page/new/new-process.component.spec.ts
@@ -1,22 +1,30 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { FormsModule } from '@angular/forms';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NewProcessComponent } from './new-process.component';
-import { ScriptDataService } from '../../core/data/processes/script-data.service';
-import { ScriptParameter } from '../scripts/script-parameter.model';
-import { Script } from '../scripts/script.model';
-import { ProcessParameter } from '../processes/process-parameter.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { of as observableOf } from 'rxjs';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { RequestService } from '../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { ActivatedRoute } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { LinkService } from '../../core/cache/builders/link.service';
-import { VarDirective } from '../../shared/utils/var.directive';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RequestService } from '../../core/data/request.service';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { HasValuePipe } from '../../shared/utils/has-value.pipe';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProcessParameter } from '../processes/process-parameter.model';
+import { Script } from '../scripts/script.model';
+import { ScriptParameter } from '../scripts/script-parameter.model';
+import { NewProcessComponent } from './new-process.component';
 
 describe('NewProcessComponent', () => {
   let component: NewProcessComponent;
@@ -40,10 +48,10 @@ describe('NewProcessComponent', () => {
         invoke: observableOf({
           response:
             {
-              isSuccessful: true
-            }
-        })
-      }
+              isSuccessful: true,
+            },
+        }),
+      },
     );
   }
 
@@ -55,10 +63,14 @@ describe('NewProcessComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
-      declarations: [NewProcessComponent, VarDirective],
+      declarations: [
+        NewProcessComponent,
+        VarDirective,
+        HasValuePipe,
+      ],
       providers: [
         { provide: ScriptDataService, useValue: scriptService },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
@@ -67,7 +79,7 @@ describe('NewProcessComponent', () => {
         { provide: LinkService, useValue: {} },
         { provide: ProcessDataService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/process-page/new/new-process.component.ts b/src/app/process-page/new/new-process.component.ts
index f97ce1bc6b..035600eedb 100644
--- a/src/app/process-page/new/new-process.component.ts
+++ b/src/app/process-page/new/new-process.component.ts
@@ -1,12 +1,19 @@
-import { Component, OnInit } from '@angular/core';
-import { Process } from '../processes/process.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { LinkService } from '../../core/cache/builders/link.service';
 import { ProcessDataService } from '../../core/data/processes/process-data.service';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { LinkService } from '../../core/cache/builders/link.service';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { Process } from '../processes/process.model';
 import { Script } from '../scripts/script.model';
 
 /**
@@ -40,7 +47,7 @@ export class NewProcessComponent implements OnInit {
       this.script$ = this.fromExisting$.pipe(
         map((process: Process) => this.linkService.resolveLink<Process>(process, followLink('script'))),
         switchMap((process: Process) => process.script),
-        getFirstSucceededRemoteDataPayload()
+        getFirstSucceededRemoteDataPayload(),
       );
     }
   }
diff --git a/src/app/process-page/overview/process-bulk-delete.service.spec.ts b/src/app/process-page/overview/process-bulk-delete.service.spec.ts
index 5139048dd1..80d780e66b 100644
--- a/src/app/process-page/overview/process-bulk-delete.service.spec.ts
+++ b/src/app/process-page/overview/process-bulk-delete.service.spec.ts
@@ -1,8 +1,12 @@
-import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 import { waitForAsync } from '@angular/core/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+
 import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
 
 describe('ProcessBulkDeleteService', () => {
 
@@ -13,7 +17,7 @@ describe('ProcessBulkDeleteService', () => {
 
   beforeEach(waitForAsync(() => {
     processDataService = jasmine.createSpyObj('processDataService', {
-      delete: createSuccessfulRemoteDataObject$(null)
+      delete: createSuccessfulRemoteDataObject$(null),
     });
     notificationsService = new NotificationsServiceStub();
     mockTranslateService = getMockTranslateService();
@@ -120,7 +124,7 @@ describe('ProcessBulkDeleteService', () => {
 
       expect(processDataService.delete).toHaveBeenCalledWith('error-id-3');
       expect(notificationsService.error).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-3'});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', { processId: 'error-id-3' });
 
 
       expect(processDataService.delete).toHaveBeenCalledWith('test-id-4');
@@ -128,18 +132,18 @@ describe('ProcessBulkDeleteService', () => {
 
       expect(processDataService.delete).toHaveBeenCalledWith('error-id-5');
       expect(notificationsService.error).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-5'});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', { processId: 'error-id-5' });
 
 
       expect(processDataService.delete).toHaveBeenCalledWith('error-id-6');
       expect(notificationsService.error).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', {processId: 'error-id-6'});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.error.body', { processId: 'error-id-6' });
 
 
       expect(processDataService.delete).toHaveBeenCalledWith('test-id-7');
 
       expect(notificationsService.success).toHaveBeenCalled();
-      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.success', {count: 4});
+      expect(mockTranslateService.get).toHaveBeenCalledWith('process.bulk.delete.success', { count: 4 });
 
       expect(service.processesToDelete).toEqual(['error-id-3', 'error-id-5', 'error-id-6']);
 
diff --git a/src/app/process-page/overview/process-bulk-delete.service.ts b/src/app/process-page/overview/process-bulk-delete.service.ts
index c0943fb615..790bec080f 100644
--- a/src/app/process-page/overview/process-bulk-delete.service.ts
+++ b/src/app/process-page/overview/process-bulk-delete.service.ts
@@ -1,16 +1,25 @@
-import { Process } from '../processes/process.model';
 import { Injectable } from '@angular/core';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { isNotEmpty } from '../../shared/empty.util';
-import { BehaviorSubject, count, from } from 'rxjs';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { concatMap, filter, tap } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  count,
+  from,
+} from 'rxjs';
+import {
+  concatMap,
+  filter,
+  tap,
+} from 'rxjs/operators';
+
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { Process } from '../processes/process.model';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * Service to facilitate removing processes in bulk.
@@ -31,7 +40,7 @@ export class ProcessBulkDeleteService {
   constructor(
     protected processDataService: ProcessDataService,
     protected notificationsService: NotificationsService,
-    protected translateService: TranslateService
+    protected translateService: TranslateService,
   ) {
   }
 
@@ -101,17 +110,17 @@ export class ProcessBulkDeleteService {
           getFirstCompletedRemoteData(),
           tap((rd: RemoteData<Process>) => {
             if (rd.hasFailed) {
-              this.notificationsService.error(this.translateService.get('process.bulk.delete.error.head'), this.translateService.get('process.bulk.delete.error.body', {processId: processId}));
+              this.notificationsService.error(this.translateService.get('process.bulk.delete.error.head'), this.translateService.get('process.bulk.delete.error.body', { processId: processId }));
             } else {
               this.toggleDelete(processId);
             }
-          })
+          }),
         );
       }),
       filter((rd: RemoteData<Process>) => rd.hasSucceeded),
       count(),
     ).subscribe((value) => {
-      this.notificationsService.success(this.translateService.get('process.bulk.delete.success', {count: value}));
+      this.notificationsService.success(this.translateService.get('process.bulk.delete.success', { count: value }));
       this.isProcessingBehaviorSubject.next(false);
     });
   }
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 5bf5fee79f..cc4b39572b 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -1,59 +1,47 @@
 <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">
+    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+
+    <div class="sections">
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.RUNNING"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeStarted"/>
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.SCHEDULED"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeCreated"/>
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.COMPLETED"
+                [sortField]="ProcessSortField.endTime"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+        <ds-process-overview-table
+                [processStatus]="ProcessStatus.FAILED"
+                [sortField]="ProcessSortField.endTime"
+                [useAutoRefreshingSearchBy]="true"
+                [getInfoValueMethod]="processOverviewService.timeCompleted"/>
+    </div>
+
+    <ng-container *ngTemplateOutlet="buttons"></ng-container>
+</div>
+
+<ng-template #buttons>
+    <div class="d-flex justify-content-end mb-2">
         <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-primary mr-2"
                 (click)="processBulkDeleteService.clearAllProcesses()"><i
-                class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
+            class="fas fa-undo pr-2"></i>{{'process.overview.delete.clear' | translate }}
         </button>
         <button *ngIf="processBulkDeleteService.hasSelected()" class="btn btn-danger mr-2"
                 (click)="openDeleteModal(deleteModal)"><i
-                class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
+            class="fas fa-trash pr-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
         </button>
         <button class="btn btn-success" routerLink="/processes/new"><i
-                class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
-
+            class="fas fa-plus pr-2"></i>{{'process.overview.new' | translate}}</button>
     </div>
-    <ds-pagination *ngIf="(processesRD$ | async)?.payload?.totalElements > 0"
-                   [paginationOptions]="pageConfig"
-                   [pageInfoState]="(processesRD$ | async)?.payload"
-                   [collectionSize]="(processesRD$ | async)?.payload?.totalElements"
-                   [hideGear]="true"
-                   [hidePagerWhenSinglePage]="true">
-        <div class="table-responsive">
-            <table class="table table-striped table-hover">
-                <thead>
-                <tr>
-                    <th scope="col">{{'process.overview.table.id' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.name' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.user' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.start' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.finish' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.status' | translate}}</th>
-                    <th scope="col">{{'process.overview.table.actions' | translate}}</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr *ngFor="let process of (processesRD$ | async)?.payload?.page"
-                    [class.table-danger]="processBulkDeleteService.isToBeDeleted(process.processId)">
-                    <td><a [routerLink]="['/processes/', process.processId]">{{process.processId}}</a></td>
-                    <td><a [routerLink]="['/processes/', process.processId]">{{process.scriptName}}</a></td>
-                    <td *ngVar="(getEpersonName(process.userId) | async) as ePersonName">{{ePersonName}}</td>
-                    <td>{{process.startTime | date:dateFormat:'UTC'}}</td>
-                    <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>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </div>
-    </ds-pagination>
-</div>
+</ng-template>
 
 <ng-template #deleteModal>
 
@@ -70,7 +58,7 @@
         </div>
 
         <div class="modal-body">
-            <div *ngIf="!(processBulkDeleteService.isProcessing$() |async)">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
+            <div *ngIf="(processBulkDeleteService.isProcessing$() | async) !== true">{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
             <div *ngIf="processBulkDeleteService.isProcessing$() |async" class="alert alert-info">
                 <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
                 <span> {{ 'process.overview.delete.processing' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</span>
@@ -88,4 +76,3 @@
 
 
 </ng-template>
-
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..ffc6bd23af 100644
--- a/src/app/process-page/overview/process-overview.component.spec.ts
+++ b/src/app/process-page/overview/process-overview.component.spec.ts
@@ -1,88 +1,37 @@
-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 { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ProcessDataService } from '../../core/data/processes/process-data.service';
-import { Process } from '../processes/process.model';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  NO_ERRORS_SCHEMA,
+  TemplateRef,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ProcessStatus } from '../processes/process-status.model';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { createPaginatedList } from '../../shared/testing/utils.test';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../shared/testing/pagination-service.stub';
-import { DatePipe } from '@angular/common';
-import { BehaviorSubject } from 'rxjs';
-import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
+
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import { ProcessOverviewComponent } from './process-overview.component';
+import { ProcessOverviewService } from './process-overview.service';
 
 describe('ProcessOverviewComponent', () => {
   let component: ProcessOverviewComponent;
   let fixture: ComponentFixture<ProcessOverviewComponent>;
 
   let processService: ProcessDataService;
-  let ePersonService: EPersonDataService;
-  let paginationService;
-
-  let processes: Process[];
-  let ePerson: EPerson;
 
   let processBulkDeleteService;
   let modalService;
 
-  const pipe = new DatePipe('en-US');
-
   function init() {
-    processes = [
-      Object.assign(new Process(), {
-        processId: 1,
-        scriptName: 'script-name',
-        startTime: '2020-03-19 00:30:00',
-        endTime: '2020-03-19 23:30:00',
-        processStatus: ProcessStatus.COMPLETED
-      }),
-      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
-      }),
-      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
-      })
-    ];
-    ePerson = Object.assign(new EPerson(), {
-      metadata: {
-        'eperson.firstname': [
-          {
-            value: 'John',
-            language: null
-          }
-        ],
-        'eperson.lastname': [
-          {
-            value: 'Doe',
-            language: null
-          }
-        ]
-      }
+    processService = jasmine.createSpyObj('processOverviewService', {
+      timeStarted: '2024-02-05 16:43:32',
     });
-    processService = jasmine.createSpyObj('processService', {
-      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(processes))
-    });
-    ePersonService = jasmine.createSpyObj('ePersonService', {
-      findById: createSuccessfulRemoteDataObject$(ePerson)
-    });
-
-    paginationService = new PaginationServiceStub();
 
     processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', {
       clearAllProcesses: {},
@@ -91,20 +40,16 @@ describe('ProcessOverviewComponent', () => {
       hasSelected: true,
       isToBeDeleted: true,
       toggleDelete: {},
-      getAmountOfSelectedProcesses: 5
+      getAmountOfSelectedProcesses: 5,
 
     });
 
     (processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => {
-      if (id === 2) {
-        return true;
-      } else {
-        return false;
-      }
+      return id === 2;
     });
 
     modalService = jasmine.createSpyObj('modalService', {
-      open: {}
+      open: {},
     });
   }
 
@@ -114,13 +59,11 @@ describe('ProcessOverviewComponent', () => {
       declarations: [ProcessOverviewComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        { provide: ProcessDataService, useValue: processService },
-        { provide: EPersonDataService, useValue: ePersonService },
-        { provide: PaginationService, useValue: paginationService },
+        { provide: ProcessOverviewService, useValue: processService },
         { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService },
         { provide: NgbModal, useValue: modalService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -130,73 +73,6 @@ describe('ProcessOverviewComponent', () => {
     fixture.detectChanges();
   });
 
-  describe('table structure', () => {
-    let rowElements;
-
-    beforeEach(() => {
-      rowElements = fixture.debugElement.queryAll(By.css('tbody tr'));
-    });
-
-    it(`should contain 3 rows`, () => {
-      expect(rowElements.length).toEqual(3);
-    });
-
-    it('should display the process IDs in the first column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(1)')).nativeElement;
-        expect(el.textContent).toContain(processes[index].processId);
-      });
-    });
-
-    it('should display the script names in the second column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(2)')).nativeElement;
-        expect(el.textContent).toContain(processes[index].scriptName);
-      });
-    });
-
-    it('should display the eperson\'s name in the third column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(3)')).nativeElement;
-        expect(el.textContent).toContain(ePerson.name);
-      });
-    });
-
-    it('should display the start time in the fourth column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement;
-        expect(el.textContent).toContain(pipe.transform(processes[index].startTime, component.dateFormat, 'UTC'));
-      });
-    });
-
-    it('should display the end time in the fifth column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(5)')).nativeElement;
-        expect(el.textContent).toContain(pipe.transform(processes[index].endTime, component.dateFormat, 'UTC'));
-      });
-    });
-
-    it('should display the status in the sixth column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(6)')).nativeElement;
-        expect(el.textContent).toContain(processes[index].processStatus);
-      });
-    });
-    it('should display a delete button in the seventh column', () => {
-      rowElements.forEach((rowElement, index) => {
-        const el = rowElement.query(By.css('td:nth-child(7)'));
-        expect(el.nativeElement.innerHTML).toContain('fas fa-trash');
-
-        el.query(By.css('button')).triggerEventHandler('click', null);
-        expect(processBulkDeleteService.toggleDelete).toHaveBeenCalledWith(processes[index].processId);
-      });
-    });
-    it('should indicate a row that has been selected for deletion', () => {
-      const deleteRow = fixture.debugElement.query(By.css('.table-danger'));
-      expect(deleteRow.nativeElement.innerHTML).toContain('/processes/' + processes[1].processId);
-    });
-  });
-
   describe('overview buttons', () => {
     it('should show a button to clear selected processes when there are selected processes', () => {
       const clearButton = fixture.debugElement.query(By.css('.btn-primary'));
@@ -232,7 +108,7 @@ describe('ProcessOverviewComponent', () => {
 
   describe('openDeleteModal', () => {
     it('should open the modal', () => {
-      component.openDeleteModal({});
+      component.openDeleteModal({} as TemplateRef<any>);
       expect(modalService.open).toHaveBeenCalledWith({});
     });
   });
@@ -240,13 +116,11 @@ describe('ProcessOverviewComponent', () => {
   describe('deleteSelected', () => {
     it('should call the deleteSelectedProcesses method on the processBulkDeleteService and close the modal when processing is done', () => {
       spyOn(component, 'closeModal');
-      spyOn(component, 'setProcesses');
 
       component.deleteSelected();
 
       expect(processBulkDeleteService.deleteSelectedProcesses).toHaveBeenCalled();
       expect(component.closeModal).toHaveBeenCalled();
-      expect(component.setProcesses).toHaveBeenCalled();
     });
   });
 });
diff --git a/src/app/process-page/overview/process-overview.component.ts b/src/app/process-page/overview/process-overview.component.ts
index 1ca29693cb..3681ddf0a1 100644
--- a/src/app/process-page/overview/process-overview.component.ts
+++ b/src/app/process-page/overview/process-overview.component.ts
@@ -1,19 +1,19 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-import { Observable, Subscription } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-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 { EPerson } from '../../core/eperson/models/eperson.model';
-import { map, 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 {
+  Component,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { Subscription } from 'rxjs';
+
 import { hasValue } from '../../shared/empty.util';
+import { ProcessStatus } from '../processes/process-status.model';
+import { ProcessBulkDeleteService } from './process-bulk-delete.service';
+import {
+  ProcessOverviewService,
+  ProcessSortField,
+} from './process-overview.service';
 
 @Component({
   selector: 'ds-process-overview',
@@ -24,71 +24,25 @@ import { hasValue } from '../../shared/empty.util';
  */
 export class ProcessOverviewComponent implements OnInit, OnDestroy {
 
-  /**
-   * List of all processes
-   */
-  processesRD$: Observable<RemoteData<PaginatedList<Process>>>;
+  // Enums are redeclared here so they can be used in the template
+  protected readonly ProcessStatus = ProcessStatus;
+  protected readonly ProcessSortField = ProcessSortField;
 
-  /**
-   * The current pagination configuration for the page used by the FindAll method
-   */
-  config: FindListOptions = Object.assign(new FindListOptions(), {
-    elementsPerPage: 20
-  });
-
-  /**
-   * The current pagination configuration for the page
-   */
-  pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
-    id: 'po',
-    pageSize: 20
-  });
-
-  /**
-   * Date format to use for start and end time of processes
-   */
-  dateFormat = 'yyyy-MM-dd HH:mm:ss';
-
-  processesToDelete: string[] = [];
   private modalRef: any;
 
   isProcessingSub: Subscription;
 
-  constructor(protected processService: ProcessDataService,
-              protected paginationService: PaginationService,
-              protected ePersonService: EPersonDataService,
+  constructor(protected processOverviewService: ProcessOverviewService,
               protected modalService: NgbModal,
               public processBulkDeleteService: ProcessBulkDeleteService,
   ) {
   }
 
   ngOnInit(): void {
-    this.setProcesses();
     this.processBulkDeleteService.clearAllProcesses();
   }
 
-  /**
-   * Send a request to fetch all processes for the current page
-   */
-  setProcesses() {
-    this.processesRD$ = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
-      switchMap((config) => this.processService.findAll(config, true, false))
-    );
-  }
-
-  /**
-   * Get the name of an EPerson by ID
-   * @param id  ID of the EPerson
-   */
-  getEpersonName(id: string): Observable<string> {
-    return this.ePersonService.findById(id).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      map((eperson: EPerson) => eperson.name)
-    );
-  }
-
   ngOnDestroy(): void {
-    this.paginationService.clearPagination(this.pageConfig.id);
     if (hasValue(this.isProcessingSub)) {
       this.isProcessingSub.unsubscribe();
     }
@@ -98,7 +52,7 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
    * Open a given modal.
    * @param content   - the modal content.
    */
-  openDeleteModal(content) {
+  openDeleteModal(content: TemplateRef<any>) {
     this.modalRef = this.modalService.open(content);
   }
 
@@ -122,10 +76,9 @@ export class ProcessOverviewComponent implements OnInit, OnDestroy {
     }
     this.isProcessingSub = this.processBulkDeleteService.isProcessing$()
       .subscribe((isProcessing) => {
-      if (!isProcessing) {
-        this.closeModal();
-        this.setProcesses();
-      }
-    });
+        if (!isProcessing) {
+          this.closeModal();
+        }
+      });
   }
 }
diff --git a/src/app/process-page/overview/process-overview.service.ts b/src/app/process-page/overview/process-overview.service.ts
new file mode 100644
index 0000000000..fc573d5160
--- /dev/null
+++ b/src/app/process-page/overview/process-overview.service.ts
@@ -0,0 +1,101 @@
+import { DatePipe } from '@angular/common';
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { RequestParam } from '../../core/cache/models/request-param.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { ProcessDataService } from '../../core/data/processes/process-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { hasValue } from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
+import { Process } from '../processes/process.model';
+import { ProcessStatus } from '../processes/process-status.model';
+
+/**
+ * The sortable fields for processes
+ * See [the endpoint documentation]{@link https://github.com/DSpace/RestContract/blob/main/processes-endpoint.md#search-processes-by-property}
+ * for details.
+ */
+export enum ProcessSortField {
+  creationTime = 'creationTime',
+  startTime = 'startTime',
+  endTime = 'endTime',
+}
+
+/**
+ * Service to manage the processes displayed in the
+ * {@Link ProcessOverviewComponent} and the {@Link ProcessOverviewTableComponent}
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class ProcessOverviewService {
+
+  constructor(protected processDataService: ProcessDataService) {
+  }
+
+  /**
+   * Date format to use for start and end time of processes
+   */
+  dateFormat = 'yyyy-MM-dd HH:mm:ss';
+
+  datePipe = new DatePipe('en-US');
+
+
+  timeCreated = (process: Process) => this.datePipe.transform(process.creationTime, this.dateFormat, 'UTC');
+  timeCompleted = (process: Process) => this.datePipe.transform(process.endTime, this.dateFormat, 'UTC');
+  timeStarted = (process: Process) => this.datePipe.transform(process.startTime, this.dateFormat, 'UTC');
+
+  /**
+   * Retrieve processes by their status
+   * @param processStatus              The status for which to retrieve processes
+   * @param findListOptions            The FindListOptions object
+   * @param autoRefreshingIntervalInMs Optional: The interval by which to automatically refresh the retrieved processes.
+   * Leave empty or set to null to only retrieve the processes once.
+   */
+  getProcessesByProcessStatus(processStatus: ProcessStatus, findListOptions?: FindListOptions, autoRefreshingIntervalInMs: number = null): Observable<RemoteData<PaginatedList<Process>>> {
+    const requestParam = new RequestParam('processStatus', processStatus);
+    const options: FindListOptions = Object.assign(new FindListOptions(), {
+      searchParams: [requestParam],
+      elementsPerPage: 5,
+    }, findListOptions);
+
+    if (hasValue(autoRefreshingIntervalInMs) && autoRefreshingIntervalInMs > 0) {
+      this.processDataService.stopAutoRefreshing(processStatus);
+      return this.processDataService.autoRefreshingSearchBy(processStatus, 'byProperty', options, autoRefreshingIntervalInMs);
+    } else {
+      return this.processDataService.searchBy('byProperty', options);
+    }
+  }
+
+  /**
+   * Stop auto-refreshing the process with the given status
+   * @param processStatus the processStatus of the request to stop automatically refreshing
+   */
+  stopAutoRefreshing(processStatus: ProcessStatus) {
+    this.processDataService.stopAutoRefreshing(processStatus);
+  }
+
+  /**
+   * Map the provided paginationOptions to FindListOptions
+   * @param paginationOptions the PaginationComponentOptions to map
+   * @param sortField the field on which the processes are sorted
+   */
+  getFindListOptions(paginationOptions: PaginationComponentOptions, sortField: ProcessSortField): FindListOptions {
+    const sortOptions = new SortOptions(sortField, SortDirection.DESC);
+    return Object.assign(
+      new FindListOptions(),
+      {
+        currentPage: paginationOptions.currentPage,
+        elementsPerPage: paginationOptions.pageSize,
+        sort: sortOptions,
+      },
+    );
+  }
+
+}
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
new file mode 100644
index 0000000000..92a7c73f58
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -0,0 +1,66 @@
+<div class="mb-4">
+  <div class="d-flex" (click)="collapse.toggle()" [attr.aria-expanded]="!collapse.collapsed" role="button">
+    <h2 class="flex-grow-1">
+      {{'process.overview.table.' + processStatus.toLowerCase() + '.title' | translate}}
+      <span class="badge badge-pill badge-primary badge-nb-processes"
+            *ngIf="(processesRD$ | async) as processesRD">
+        {{processesRD?.payload?.totalElements}}
+      </span>
+      <span class="ml-2 toggle-icon">
+        <i class="fas" [ngClass]="collapse.collapsed ? 'fa-angle-right' : 'fa-angle-down'"></i>
+      </span>
+    </h2>
+  </div>
+
+  <div ngbCollapse #collapse="ngbCollapse" [ngbCollapse]="isCollapsed">
+
+    <ng-container *ngVar="(processesRD$ | async) as processesRD">
+      <ds-themed-loading *ngIf="!processesRD || processesRD.isLoading"/>
+
+      <ds-pagination *ngIf="processesRD?.payload?.totalElements > 0"
+                     [paginationOptions]="(paginationOptions$ | async)"
+                     [collectionSize]="processesRD?.payload?.totalElements"
+                     [retainScrollPosition]="true"
+                     [hideGear]="true">
+
+        <div class="table-responsive mt-1">
+          <table class="table table-striped table-hover">
+            <thead>
+            <tr>
+              <th scope="col" class="id-header">{{'process.overview.table.id' | translate}}</th>
+              <th scope="col" class="name-header">{{'process.overview.table.name' | translate}}</th>
+              <th scope="col" class="user-header">{{'process.overview.table.user' | translate}}</th>
+              <th scope="col" class="info-header">{{'process.overview.table.' + processStatus.toLowerCase() + '.info' | translate}}</th>
+              <th scope="col" class="actions-header">{{'process.overview.table.actions' | translate}}</th>
+            </tr>
+            </thead>
+
+            <tbody>
+            <tr *ngFor="let tableEntry of processesRD?.payload?.page"
+                [class]="getRowClass(tableEntry.process)">
+              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.processId}}</a></td>
+              <td><a [routerLink]="['/processes/', tableEntry.process.processId]">{{tableEntry.process.scriptName}}</a></td>
+              <td>{{tableEntry.user}}</td>
+              <td>{{tableEntry.info}}</td>
+              <td>
+                <button [attr.aria-label]="'process.overview.delete-process' | translate"
+                        aria-hidden="true"
+                        (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
+                        class="btn btn-outline-danger">
+                  <i class="fas fa-trash"></i>
+                </button>
+              </td>
+            </tr>
+            </tbody>
+          </table>
+        </div>
+
+      </ds-pagination>
+
+      <div *ngIf="processesRD?.payload?.totalElements === 0">
+        <p>{{'process.overview.table.empty' | translate}}</p>
+      </div>
+    </ng-container>
+
+  </div>
+</div>
diff --git a/src/app/process-page/overview/table/process-overview-table.component.scss b/src/app/process-page/overview/table/process-overview-table.component.scss
new file mode 100644
index 0000000000..a9567be4c7
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.scss
@@ -0,0 +1,28 @@
+.toggle-icon {
+  font-size: calc(var(--bs-small-font-size) * 0.6);
+}
+
+.badge-nb-processes {
+  font-size: var(--ds-process-overview-table-nb-processes-badge-size);
+  vertical-align: middle;
+}
+
+.id-header {
+  width: var(--ds-process-overview-table-id-column-width);
+}
+
+.name-header {
+  width: var(--ds-process-overview-table-name-column-width);
+}
+
+.user-header {
+  width: var(--ds-process-overview-table-user-column-width);
+}
+
+.info-header {
+  width: var(--ds-process-overview-table-info-column-width);
+}
+
+.actions-header {
+  width: var(--ds-process-overview-table-actions-column-width);
+}
diff --git a/src/app/process-page/overview/table/process-overview-table.component.spec.ts b/src/app/process-page/overview/table/process-overview-table.component.spec.ts
new file mode 100644
index 0000000000..1cbb246082
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.spec.ts
@@ -0,0 +1,212 @@
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NgbCollapse,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { ProcessDataService } from '../../../core/data/processes/process-data.service';
+import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { RouteService } from '../../../core/services/route.service';
+import { AuthServiceMock } from '../../../shared/mocks/auth.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { Process } from '../../processes/process.model';
+import { ProcessStatus } from '../../processes/process-status.model';
+import { ProcessBulkDeleteService } from '../process-bulk-delete.service';
+import { ProcessOverviewService } from '../process-overview.service';
+import { ProcessOverviewTableComponent } from './process-overview-table.component';
+
+describe('ProcessOverviewTableComponent', () => {
+  let component: ProcessOverviewTableComponent;
+  let fixture: ComponentFixture<ProcessOverviewTableComponent>;
+
+  let processOverviewService: ProcessOverviewService;
+  let processService: ProcessDataService;
+  let ePersonService: EPersonDataService;
+  let paginationService; // : PaginationService; Not typed as the stub does not fully implement PaginationService
+  let processBulkDeleteService: ProcessBulkDeleteService;
+  let modalService: NgbModal;
+  let authService; // : AuthService; Not typed as the mock does not fully implement AuthService
+  let routeService: RouteService;
+
+  let processes: Process[];
+  let ePerson: EPerson;
+
+  function init() {
+    processes = [
+      Object.assign(new Process(), {
+        processId: 1,
+        scriptName: 'script-a',
+        startTime: '2020-03-19 00:30:00',
+        endTime: '2020-03-19 23:30:00',
+        processStatus: ProcessStatus.COMPLETED,
+      }),
+      Object.assign(new Process(), {
+        processId: 2,
+        scriptName: 'script-b',
+        startTime: '2020-03-20 00:30:00',
+        endTime: '2020-03-20 23:30:00',
+        processStatus: ProcessStatus.FAILED,
+      }),
+      Object.assign(new Process(), {
+        processId: 3,
+        scriptName: 'script-c',
+        startTime: '2020-03-21 00:30:00',
+        endTime: '2020-03-21 23:30:00',
+        processStatus: ProcessStatus.RUNNING,
+      }),
+    ];
+    ePerson = Object.assign(new EPerson(), {
+      metadata: {
+        'eperson.firstname': [
+          {
+            value: 'John',
+            language: null,
+          },
+        ],
+        'eperson.lastname': [
+          {
+            value: 'Doe',
+            language: null,
+          },
+        ],
+      },
+    });
+    processOverviewService = jasmine.createSpyObj('processOverviewService', {
+      getFindListOptions: {
+        currentPage: 1,
+        elementsPerPage: 5,
+        sort: 'creationTime',
+      },
+      getProcessesByProcessStatus: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
+    });
+    processService = jasmine.createSpyObj('processService', {
+      searchBy: createSuccessfulRemoteDataObject$(createPaginatedList(processes)).pipe(take(1)),
+    });
+    ePersonService = jasmine.createSpyObj('ePersonService', {
+      findById: createSuccessfulRemoteDataObject$(ePerson),
+    });
+
+    paginationService = new PaginationServiceStub();
+
+    processBulkDeleteService = jasmine.createSpyObj('processBulkDeleteService', {
+      clearAllProcesses: {},
+      deleteSelectedProcesses: {},
+      isProcessing$: new BehaviorSubject(false),
+      hasSelected: true,
+      isToBeDeleted: true,
+      toggleDelete: {},
+      getAmountOfSelectedProcesses: 5,
+
+    });
+
+    (processBulkDeleteService.isToBeDeleted as jasmine.Spy).and.callFake((id) => {
+      return id === 2;
+    });
+
+    modalService = jasmine.createSpyObj('modalService', {
+      open: {},
+    });
+
+    authService = new AuthServiceMock();
+    routeService = routeServiceStub;
+  }
+
+  beforeEach(waitForAsync(() => {
+    init();
+
+    void TestBed.configureTestingModule({
+      declarations: [ProcessOverviewTableComponent, VarDirective, NgbCollapse],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: ProcessOverviewService, useValue: processOverviewService },
+        { provide: ProcessDataService, useValue: processService },
+        { provide: EPersonDataService, useValue: ePersonService },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ProcessBulkDeleteService, useValue: processBulkDeleteService },
+        { provide: NgbModal, useValue: modalService },
+        { provide: AuthService, useValue: authService },
+        { provide: RouteService, useValue: routeService },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ProcessOverviewTableComponent);
+    component = fixture.componentInstance;
+    component.getInfoValueMethod = (_process: Process) => 'process info';
+    component.processStatus = ProcessStatus.COMPLETED;
+    fixture.detectChanges();
+  });
+
+  describe('table structure', () => {
+    let rowElements;
+
+    beforeEach(() => {
+      rowElements = fixture.debugElement.queryAll(By.css('tbody tr'));
+    });
+
+    it('should contain 3 rows', () => {
+      expect(rowElements.length).toEqual(3);
+    });
+
+    it('should display the process\' ID in the first column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(1)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].processId);
+      });
+    });
+
+    it('should display the scripts name in the second column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(2)')).nativeElement;
+        expect(el.textContent).toContain(processes[index].scriptName);
+      });
+    });
+
+    it('should display the eperson\'s name in the third column', () => {
+      rowElements.forEach((rowElement, _index) => {
+        const el = rowElement.query(By.css('td:nth-child(3)')).nativeElement;
+        expect(el.textContent).toContain(ePerson.name);
+      });
+    });
+
+    it('should display the requested info in the fourth column', () => {
+      rowElements.forEach((rowElement, _index) => {
+        const el = rowElement.query(By.css('td:nth-child(4)')).nativeElement;
+        expect(el.textContent).toContain('process info');
+      });
+    });
+
+    it('should display a delete button in the fifth column', () => {
+      rowElements.forEach((rowElement, index) => {
+        const el = rowElement.query(By.css('td:nth-child(5)'));
+        expect(el.nativeElement.innerHTML).toContain('fas fa-trash');
+
+        el.query(By.css('button')).triggerEventHandler('click', null);
+        expect(processBulkDeleteService.toggleDelete).toHaveBeenCalledWith(processes[index].processId);
+      });
+    });
+
+    it('should indicate a row that has been selected for deletion', () => {
+      const deleteRow = fixture.debugElement.query(By.css('.table-danger'));
+      expect(deleteRow.nativeElement.innerHTML).toContain('/processes/' + processes[1].processId);
+    });
+
+  });
+});
diff --git a/src/app/process-page/overview/table/process-overview-table.component.ts b/src/app/process-page/overview/table/process-overview-table.component.ts
new file mode 100644
index 0000000000..102ff7226d
--- /dev/null
+++ b/src/app/process-page/overview/table/process-overview-table.component.ts
@@ -0,0 +1,270 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  BehaviorSubject,
+  from as observableFrom,
+  mergeMap,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+import { PaginationService } from 'src/app/core/pagination/pagination.service';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+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 { EPersonDataService } from '../../../core/eperson/eperson-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { RouteService } from '../../../core/services/route.service';
+import { redirectOn4xx } from '../../../core/shared/authorized.operators';
+import {
+  getAllCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { hasValue } from '../../../shared/empty.util';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { Process } from '../../processes/process.model';
+import { ProcessStatus } from '../../processes/process-status.model';
+import { ProcessBulkDeleteService } from '../process-bulk-delete.service';
+import {
+  ProcessOverviewService,
+  ProcessSortField,
+} from '../process-overview.service';
+
+const NEW_PROCESS_PARAM = 'new_process_id';
+
+/**
+ * An interface to store a process and extra information related to the process
+ * that is displayed in the overview table.
+ */
+export interface ProcessOverviewTableEntry {
+  process: Process,
+  user: string,
+  info: string,
+}
+
+@Component({
+  selector: 'ds-process-overview-table',
+  styleUrls: ['./process-overview-table.component.scss'],
+  templateUrl: './process-overview-table.component.html',
+})
+export class ProcessOverviewTableComponent implements OnInit, OnDestroy {
+
+  /**
+   * The status of the processes this sections should show
+   */
+  @Input() processStatus: ProcessStatus;
+
+  /**
+   * The field on which the processes in this table are sorted
+   * {@link ProcessSortField.creationTime} by default as every single process has a creation time,
+   * but not every process has a start or end time
+   */
+  @Input() sortField: ProcessSortField = ProcessSortField.creationTime;
+
+  /**
+   * Whether to use auto refresh for the processes shown in this table.
+   */
+  @Input() useAutoRefreshingSearchBy = false;
+
+  /**
+   * The interval by which to refresh if autoRefreshing is enabled
+   */
+  @Input() autoRefreshInterval = 5000;
+
+  /**
+   * The function used to retrieve the value that will be shown in the 'info' column of the table.
+   * {@Link ProcessOverviewService} contains some predefined functions.
+   */
+  @Input() getInfoValueMethod: (process: Process) => string;
+
+  /**
+   * List of processes and their info to be shown in this table
+   */
+  processesRD$: BehaviorSubject<RemoteData<PaginatedList<ProcessOverviewTableEntry>>>;
+
+  /**
+   * The pagination ID for this overview section
+   */
+  paginationId: string;
+
+  /**
+   * The current pagination options for the overview section
+   */
+  paginationOptions$: Observable<PaginationComponentOptions>;
+
+  /**
+   * Whether the table is collapsed
+   */
+  isCollapsed = false;
+
+  /**
+   * The id of the process to highlight
+   */
+  newProcessId: string;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
+  constructor(protected processOverviewService: ProcessOverviewService,
+              protected processBulkDeleteService: ProcessBulkDeleteService,
+              protected ePersonDataService: EPersonDataService,
+              protected dsoNameService: DSONameService,
+              protected paginationService: PaginationService,
+              protected routeService: RouteService,
+              protected router: Router,
+              protected auth: AuthService,
+              @Inject(PLATFORM_ID) protected platformId: object,
+  ) {
+  }
+
+  ngOnInit() {
+    // Only auto refresh on browsers
+    if (!isPlatformBrowser(this.platformId)) {
+      this.useAutoRefreshingSearchBy = false;
+    }
+
+    this.routeService.getQueryParameterValue(NEW_PROCESS_PARAM).pipe(take(1)).subscribe((id) => {
+      this.newProcessId = id;
+    });
+
+    // Creates an ID from the first 2 characters of the process status.
+    // Should two process status values ever start with the same substring,
+    // increase the number of characters until the ids are distinct.
+    this.paginationId = this.processStatus.toLowerCase().substring(0,2);
+
+    const defaultPaginationOptions = Object.assign(new PaginationComponentOptions(), {
+      id: this.paginationId,
+      pageSize: 5,
+    });
+
+    // Get the current pagination from the route
+    this.paginationOptions$ = this.paginationService.getCurrentPagination(this.paginationId, defaultPaginationOptions);
+
+    this.processesRD$ = new BehaviorSubject(undefined);
+
+    // Once we have the pagination, retrieve the processes matching the process type and the pagination
+    //
+    // Reasoning why this monstrosity is the way it is:
+    // To avoid having to recalculate the names of the submitters every time the page reloads, these have to be
+    // retrieved beforehand and stored with the process. This is where the ProcessOverviewTableEntry interface comes in.
+    // By storing the process together with the submitters name and the additional information to be shown in the table,
+    // the template can be as dumb as possible. As the retrieval of the name also is done through an observable, this
+    // complicates the construction of the data a bit though.
+    // The reason why we store these as RemoteData<PaginatedList<ProcessOverviewTableEntry>> and not simply as
+    // ProcessOverviewTableEntry[] is as follows:
+    // When storing the PaginatedList<Process> and ProcessOverviewTableEntry[] separately, there is a small delay
+    // between the update of the paginatedList and the entryArray. This results in the processOverviewPage showing
+    // no processes for a split second every time the processes are updated which in turn causes the different
+    // sections of the page to jump around. By combining these and causing the page to update only once this is avoided.
+    this.subs.push(this.paginationOptions$
+      .pipe(
+        // Map the paginationOptions to findListOptions
+        map((paginationOptions: PaginationComponentOptions) =>
+          this.processOverviewService.getFindListOptions(paginationOptions, this.sortField)),
+        // Use the findListOptions to retrieve the relevant processes every interval
+        switchMap((findListOptions: FindListOptions) =>
+          this.processOverviewService.getProcessesByProcessStatus(
+            this.processStatus, findListOptions, this.useAutoRefreshingSearchBy ? this.autoRefreshInterval : null),
+        ),
+        // Redirect the user when he is logged out
+        redirectOn4xx(this.router, this.auth),
+        getAllCompletedRemoteData(),
+        // Map RemoteData<PaginatedList<Process>> to RemoteData<PaginatedList<ProcessOverviewTableEntry>>
+        switchMap((processesRD: RemoteData<PaginatedList<Process>>) => {
+          // Create observable emitting all processes one by one
+          return  observableFrom(processesRD.payload.page).pipe(
+            // Map every Process to ProcessOverviewTableEntry
+            mergeMap((process: Process) => {
+              return this.getEPersonName(process.userId).pipe(
+                map((name) => {
+                  return {
+                    process: process,
+                    user: name,
+                    info: this.getInfoValueMethod(process),
+                  };
+                }),
+              );
+            }),
+            // Collect processOverviewTableEntries into array
+            toArray(),
+            // Create RemoteData<PaginatedList<ProcessOverviewTableEntry>>
+            map((entries: ProcessOverviewTableEntry[]) => {
+              const entriesPL: PaginatedList<ProcessOverviewTableEntry> =
+                Object.assign(new PaginatedList(), processesRD.payload, { page: entries });
+              const entriesRD: RemoteData<PaginatedList<ProcessOverviewTableEntry>> =
+                Object.assign({}, processesRD, { payload: entriesPL });
+              return entriesRD;
+            }),
+          );
+        }),
+
+      ).subscribe((next: RemoteData<PaginatedList<ProcessOverviewTableEntry>>) => {
+        this.processesRD$.next(next);
+      }));
+
+    // Collapse this section when the number of processes is zero the first time processes are retrieved
+    this.subs.push(this.processesRD$.pipe(
+      filter((processListRd: RemoteData<PaginatedList<ProcessOverviewTableEntry>>) => hasValue(processListRd)),
+      take(1),
+    ).subscribe(
+      (processesRD: RemoteData<PaginatedList<ProcessOverviewTableEntry>>) => {
+        if (!(processesRD.payload.totalElements > 0)) {
+          this.isCollapsed = true;
+        }
+      },
+    ));
+
+  }
+
+  /**
+   * Get the name of an EPerson by ID
+   * @param id  ID of the EPerson
+   */
+  getEPersonName(id: string): Observable<string> {
+    return this.ePersonDataService.findById(id).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((eperson: EPerson) => this.dsoNameService.getName(eperson)),
+    );
+  }
+
+  /**
+   * Get the css class for a row depending on the state of the process
+   * @param process
+   */
+  getRowClass(process: Process): string {
+    if (this.processBulkDeleteService.isToBeDeleted(process.processId)) {
+      return 'table-danger';
+    } else if (this.newProcessId === process.processId) {
+      return 'table-info';
+    } else {
+      return '';
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+    this.processOverviewService.stopAutoRefreshing(this.processStatus);
+  }
+
+}
diff --git a/src/app/process-page/process-breadcrumb.resolver.spec.ts b/src/app/process-page/process-breadcrumb.resolver.spec.ts
index 6ed04c50ce..e4bdcba537 100644
--- a/src/app/process-page/process-breadcrumb.resolver.spec.ts
+++ b/src/app/process-page/process-breadcrumb.resolver.spec.ts
@@ -1,7 +1,7 @@
-import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
-import { Process } from './processes/process.model';
 import { ProcessDataService } from '../core/data/processes/process-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { Process } from './processes/process.model';
 
 describe('ProcessBreadcrumbResolver', () => {
   describe('resolve', () => {
@@ -17,14 +17,14 @@ describe('ProcessBreadcrumbResolver', () => {
       path = 'rest.com/path/to/breadcrumb/12345';
       processBreadcrumbService = {};
       processDataService = {
-        findById: () => createSuccessfulRemoteDataObject$(process)
+        findById: () => createSuccessfulRemoteDataObject$(process),
       } as any;
       resolver = new ProcessBreadcrumbResolver(processBreadcrumbService, processDataService);
     });
 
     it('should resolve the breadcrumb config', (done) => {
-      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: process }, params: { id: id} } as any, {url: path} as any);
-      const expectedConfig = { provider: processBreadcrumbService, key: process, url: path};
+      const resolvedConfig = resolver.resolve({ data: { breadcrumbKey: process }, params: { id: id } } as any, { url: path } as any);
+      const expectedConfig = { provider: processBreadcrumbService, key: process, url: path };
       resolvedConfig.subscribe((config) => {
         expect(config).toEqual(expectedConfig);
         done();
diff --git a/src/app/process-page/process-breadcrumb.resolver.ts b/src/app/process-page/process-breadcrumb.resolver.ts
index 23e3dca0a8..dc91dd15e4 100644
--- a/src/app/process-page/process-breadcrumb.resolver.ts
+++ b/src/app/process-page/process-breadcrumb.resolver.ts
@@ -1,13 +1,19 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Process } from './processes/process.model';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { ProcessDataService } from '../core/data/processes/process-data.service';
+
 import { BreadcrumbConfig } from '../breadcrumbs/breadcrumb/breadcrumb-config.model';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../core/shared/operators';
+import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { followLink } from '../shared/utils/follow-link-config.model';
 import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+import { Process } from './processes/process.model';
 
 /**
  * This class represents a resolver that requests a specific process before the route is activated
@@ -28,13 +34,12 @@ export class ProcessBreadcrumbResolver implements Resolve<BreadcrumbConfig<Proce
     const id = route.params.id;
 
     return this.processService.findById(route.params.id, true, false, followLink('script')).pipe(
-      getFirstSucceededRemoteData(),
-      getRemoteDataPayload(),
-      map((object: Process) => {
+      getFirstCompletedRemoteData(),
+      map((object: RemoteData<Process>) => {
         const fullPath = state.url;
         const url = fullPath.substr(0, fullPath.indexOf(id)) + id;
-        return { provider: this.breadcrumbService, key: object, url: url };
-      })
+        return { provider: this.breadcrumbService, key: object.payload, url: url };
+      }),
     );
   }
 }
diff --git a/src/app/process-page/process-breadcrumbs.service.spec.ts b/src/app/process-page/process-breadcrumbs.service.spec.ts
index 52b1434c1e..ad5f846796 100644
--- a/src/app/process-page/process-breadcrumbs.service.spec.ts
+++ b/src/app/process-page/process-breadcrumbs.service.spec.ts
@@ -1,7 +1,11 @@
-import { waitForAsync, TestBed } from '@angular/core/testing';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { getTestScheduler } from 'jasmine-marbles';
-import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+
 import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
 import { Process } from './processes/process.model';
 
 describe('ProcessBreadcrumbsService', () => {
@@ -14,7 +18,7 @@ describe('ProcessBreadcrumbsService', () => {
   function init() {
     exampleId = '12345';
     exampleScriptName = 'Example Script';
-    exampleProcess = Object.assign(new Process(), {processId: exampleId, scriptName: exampleScriptName});
+    exampleProcess = Object.assign(new Process(), { processId: exampleId, scriptName: exampleScriptName });
     exampleURL = 'example.com';
   }
 
diff --git a/src/app/process-page/process-breadcrumbs.service.ts b/src/app/process-page/process-breadcrumbs.service.ts
index 26b0787a53..42b01ea5a8 100644
--- a/src/app/process-page/process-breadcrumbs.service.ts
+++ b/src/app/process-page/process-breadcrumbs.service.ts
@@ -1,7 +1,12 @@
-import { Observable, of as observableOf } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { Breadcrumb } from '../breadcrumbs/breadcrumb/breadcrumb.model';
+import { BreadcrumbsProviderService } from '../core/breadcrumbs/breadcrumbsProviderService';
+import { hasValue } from '../shared/empty.util';
 import { Process } from './processes/process.model';
 
 /**
@@ -16,6 +21,10 @@ export class ProcessBreadcrumbsService implements BreadcrumbsProviderService<Pro
    * @param url The url to use as a link for this breadcrumb
    */
   getBreadcrumbs(key: Process, url: string): Observable<Breadcrumb[]> {
-    return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+    if (hasValue(key)) {
+      return observableOf([new Breadcrumb(key.processId + ' - ' + key.scriptName, url)]);
+    } else {
+      return observableOf([]);
+    }
   }
 }
diff --git a/src/app/process-page/process-page-routing.module.ts b/src/app/process-page/process-page-routing.module.ts
index 881ca0e853..f0bbe6de08 100644
--- a/src/app/process-page/process-page-routing.module.ts
+++ b/src/app/process-page/process-page-routing.module.ts
@@ -1,12 +1,13 @@
-import { RouterModule } from '@angular/router';
 import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ProcessDetailComponent } from './detail/process-detail.component';
 import { NewProcessComponent } from './new/new-process.component';
 import { ProcessOverviewComponent } from './overview/process-overview.component';
-import { ProcessPageResolver } from './process-page.resolver';
-import { ProcessDetailComponent } from './detail/process-detail.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { ProcessPageResolver } from './process-page.resolver';
 
 @NgModule({
   imports: [
@@ -26,24 +27,24 @@ import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
             path: 'new',
             component: NewProcessComponent,
             resolve: { breadcrumb: I18nBreadcrumbResolver },
-            data: { title: 'process.new.title', breadcrumbKey: 'process.new' }
+            data: { title: 'process.new.title', breadcrumbKey: 'process.new' },
           },
           {
             path: ':id',
             component: ProcessDetailComponent,
             resolve: {
               process: ProcessPageResolver,
-              breadcrumb: ProcessBreadcrumbResolver
-            }
-          }
-        ]
+              breadcrumb: ProcessBreadcrumbResolver,
+            },
+          },
+        ],
       },
 
-    ])
+    ]),
   ],
   providers: [
-    ProcessPageResolver
-  ]
+    ProcessPageResolver,
+  ],
 })
 export class ProcessPageRoutingModule {
 
diff --git a/src/app/process-page/process-page-routing.paths.ts b/src/app/process-page/process-page-routing.paths.ts
index d8a95d8177..781bf9a51c 100644
--- a/src/app/process-page/process-page-routing.paths.ts
+++ b/src/app/process-page/process-page-routing.paths.ts
@@ -3,7 +3,7 @@ import { URLCombiner } from '../core/url-combiner/url-combiner';
 export const PROCESS_MODULE_PATH = 'processes';
 
 export const getProcessListRoute = () =>
-    `/${PROCESS_MODULE_PATH}`;
+  `/${PROCESS_MODULE_PATH}`;
 
 export const getProcessDetailRoute = (processId: string) =>
-    new URLCombiner(getProcessListRoute(), processId).toString();
+  new URLCombiner(getProcessListRoute(), processId).toString();
diff --git a/src/app/process-page/process-page-shared.module.ts b/src/app/process-page/process-page-shared.module.ts
new file mode 100644
index 0000000000..5ae4d7ea12
--- /dev/null
+++ b/src/app/process-page/process-page-shared.module.ts
@@ -0,0 +1,55 @@
+import { DatePipe } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { SharedModule } from '../shared/shared.module';
+import { ProcessDetailComponent } from './detail/process-detail.component';
+import { ProcessDetailFieldComponent } from './detail/process-detail-field/process-detail-field.component';
+import { ProcessFormComponent } from './form/process-form.component';
+import { ParameterSelectComponent } from './form/process-parameters/parameter-select/parameter-select.component';
+import { BooleanValueInputComponent } from './form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component';
+import { DateValueInputComponent } from './form/process-parameters/parameter-value-input/date-value-input/date-value-input.component';
+import { FileValueInputComponent } from './form/process-parameters/parameter-value-input/file-value-input/file-value-input.component';
+import { ParameterValueInputComponent } from './form/process-parameters/parameter-value-input/parameter-value-input.component';
+import { StringValueInputComponent } from './form/process-parameters/parameter-value-input/string-value-input/string-value-input.component';
+import { ProcessParametersComponent } from './form/process-parameters/process-parameters.component';
+import { ScriptHelpComponent } from './form/script-help/script-help.component';
+import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
+import { NewProcessComponent } from './new/new-process.component';
+import { ProcessOverviewComponent } from './overview/process-overview.component';
+import { ProcessOverviewTableComponent } from './overview/table/process-overview-table.component';
+import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
+import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
+
+@NgModule({
+  imports: [
+    SharedModule,
+    NgbCollapseModule,
+  ],
+  declarations: [
+    NewProcessComponent,
+    ScriptsSelectComponent,
+    ScriptHelpComponent,
+    ParameterSelectComponent,
+    ProcessParametersComponent,
+    StringValueInputComponent,
+    ParameterValueInputComponent,
+    FileValueInputComponent,
+    BooleanValueInputComponent,
+    DateValueInputComponent,
+    ProcessOverviewComponent,
+    ProcessOverviewTableComponent,
+    ProcessDetailComponent,
+    ProcessDetailFieldComponent,
+    ProcessFormComponent,
+  ],
+  providers: [
+    ProcessBreadcrumbResolver,
+    ProcessBreadcrumbsService,
+    DatePipe,
+  ],
+})
+
+export class ProcessPageSharedModule {
+
+}
diff --git a/src/app/process-page/process-page.module.ts b/src/app/process-page/process-page.module.ts
index ebe03e4537..871efafc3e 100644
--- a/src/app/process-page/process-page.module.ts
+++ b/src/app/process-page/process-page.module.ts
@@ -1,48 +1,19 @@
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
 import { ProcessPageRoutingModule } from './process-page-routing.module';
-import { NewProcessComponent } from './new/new-process.component';
-import { ScriptsSelectComponent } from './form/scripts-select/scripts-select.component';
-import { ScriptHelpComponent } from './form/script-help/script-help.component';
-import { ParameterSelectComponent } from './form/process-parameters/parameter-select/parameter-select.component';
-import { ProcessParametersComponent } from './form/process-parameters/process-parameters.component';
-import { StringValueInputComponent } from './form/process-parameters/parameter-value-input/string-value-input/string-value-input.component';
-import { ParameterValueInputComponent } from './form/process-parameters/parameter-value-input/parameter-value-input.component';
-import { FileValueInputComponent } from './form/process-parameters/parameter-value-input/file-value-input/file-value-input.component';
-import { BooleanValueInputComponent } from './form/process-parameters/parameter-value-input/boolean-value-input/boolean-value-input.component';
-import { DateValueInputComponent } from './form/process-parameters/parameter-value-input/date-value-input/date-value-input.component';
-import { ProcessOverviewComponent } from './overview/process-overview.component';
-import { ProcessDetailComponent } from './detail/process-detail.component';
-import { ProcessDetailFieldComponent } from './detail/process-detail-field/process-detail-field.component';
-import { ProcessBreadcrumbsService } from './process-breadcrumbs.service';
-import { ProcessBreadcrumbResolver } from './process-breadcrumb.resolver';
-import { ProcessFormComponent } from './form/process-form.component';
+import { ProcessPageSharedModule } from './process-page-shared.module';
 
 @NgModule({
   imports: [
     ProcessPageRoutingModule,
     SharedModule,
+    ProcessPageSharedModule,
   ],
   declarations: [
-    NewProcessComponent,
-    ScriptsSelectComponent,
-    ScriptHelpComponent,
-    ParameterSelectComponent,
-    ProcessParametersComponent,
-    StringValueInputComponent,
-    ParameterValueInputComponent,
-    FileValueInputComponent,
-    BooleanValueInputComponent,
-    DateValueInputComponent,
-    ProcessOverviewComponent,
-    ProcessDetailComponent,
-    ProcessDetailFieldComponent,
-    ProcessFormComponent
   ],
   providers: [
-    ProcessBreadcrumbResolver,
-    ProcessBreadcrumbsService
-  ]
+  ],
 })
 
 export class ProcessPageModule {
diff --git a/src/app/process-page/process-page.resolver.ts b/src/app/process-page/process-page.resolver.ts
index ba872302b3..4b2bb9870f 100644
--- a/src/app/process-page/process-page.resolver.ts
+++ b/src/app/process-page/process-page.resolver.ts
@@ -1,11 +1,20 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { RemoteData } from '../core/data/remote-data';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Process } from './processes/process.model';
-import { followLink } from '../shared/utils/follow-link-config.model';
+
 import { ProcessDataService } from '../core/data/processes/process-data.service';
+import { RemoteData } from '../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { Process } from './processes/process.model';
+
+export const PROCESS_PAGE_FOLLOW_LINKS = [
+  followLink('files'),
+];
 
 /**
  * This class represents a resolver that requests a specific process before the route is activated
@@ -23,7 +32,7 @@ export class ProcessPageResolver implements Resolve<RemoteData<Process>> {
    * or an error if something went wrong
    */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<Process>> {
-    return this.processService.findById(route.params.id, false, true, followLink('script')).pipe(
+    return this.processService.findById(route.params.id, false, true, ...PROCESS_PAGE_FOLLOW_LINKS).pipe(
       getFirstCompletedRemoteData(),
     );
   }
diff --git a/src/app/process-page/processes/filetypes.model.ts b/src/app/process-page/processes/filetypes.model.ts
new file mode 100644
index 0000000000..8ce8bff2c5
--- /dev/null
+++ b/src/app/process-page/processes/filetypes.model.ts
@@ -0,0 +1,35 @@
+import { autoserialize } from 'cerialize';
+
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { FILETYPES } from './filetypes.resource-type';
+
+/**
+ * Object representing the file types of the {@link Bitstream}s of a {@link Process}
+ */
+@typedObject
+export class Filetypes {
+
+  static type = FILETYPES;
+
+  /**
+   * The id of this {@link Filetypes}
+   */
+  @autoserialize
+    id: string;
+
+  /**
+   * The values of this {@link Filetypes}
+   */
+  @autoserialize
+    values: string[];
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+}
diff --git a/src/app/process-page/processes/filetypes.resource-type.ts b/src/app/process-page/processes/filetypes.resource-type.ts
new file mode 100644
index 0000000000..29f9636208
--- /dev/null
+++ b/src/app/process-page/processes/filetypes.resource-type.ts
@@ -0,0 +1,8 @@
+/**
+ * The resource type for {@link Filetypes}
+ *
+ * Needs to be in a separate file to prevent circular dependencies in webpack.
+ */
+import { ResourceType } from '../../core/shared/resource-type';
+
+export const FILETYPES = new ResourceType('filetypes');
diff --git a/src/app/process-page/processes/process-status.model.ts b/src/app/process-page/processes/process-status.model.ts
index b43340bffb..1ff42789d8 100644
--- a/src/app/process-page/processes/process-status.model.ts
+++ b/src/app/process-page/processes/process-status.model.ts
@@ -2,8 +2,8 @@
  * List of process statuses
  */
 export enum ProcessStatus {
-  SCHEDULED,
-  RUNNING,
-  COMPLETED,
-  FAILED
+  SCHEDULED = 'SCHEDULED',
+  RUNNING = 'RUNNING',
+  COMPLETED = 'COMPLETED',
+  FAILED = 'FAILED'
 }
diff --git a/src/app/process-page/processes/process.model.ts b/src/app/process-page/processes/process.model.ts
index d5f6e77d32..7d28b24d36 100644
--- a/src/app/process-page/processes/process.model.ts
+++ b/src/app/process-page/processes/process.model.ts
@@ -1,18 +1,30 @@
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type';
-import { ProcessStatus } from './process-status.model';
-import { ProcessParameter } from './process-parameter.model';
-import { HALLink } from '../../core/shared/hal-link.model';
-import { autoserialize, deserialize } from 'cerialize';
-import { PROCESS } from './process.resource-type';
-import { excludeFromEquals } from '../../core/utilities/equals.decorators';
-import { ResourceType } from '../../core/shared/resource-type';
-import { link, typedObject } from '../../core/cache/builders/build-decorators';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { SCRIPT } from '../scripts/script.resource-type';
-import { Script } from '../scripts/script.model';
+
+import {
+  link,
+  typedObject,
+} from '../../core/cache/builders/build-decorators';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { BITSTREAM } from '../../core/shared/bitstream.resource-type';
+import { HALLink } from '../../core/shared/hal-link.model';
+import { PROCESS_OUTPUT_TYPE } from '../../core/shared/process-output.resource-type';
+import { ResourceType } from '../../core/shared/resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
+import { Script } from '../scripts/script.model';
+import { SCRIPT } from '../scripts/script.resource-type';
+import { Filetypes } from './filetypes.model';
+import { FILETYPES } from './filetypes.resource-type';
+import { PROCESS } from './process.resource-type';
+import { ProcessParameter } from './process-parameter.model';
+import { ProcessStatus } from './process-status.model';
 
 /**
  * Object representing a process
@@ -26,59 +38,66 @@ export class Process implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier for this process
    */
-  @autoserialize
-  processId: string;
+  @autoserializeAs(String)
+    processId: string;
 
   /**
    * The UUID for the user that started the process
    */
   @autoserialize
-  userId: string;
+    userId: string;
+
+  /**
+   * The creation time for this process
+   */
+  @autoserialize
+    creationTime: string;
 
   /**
    * The start time for this process
    */
   @autoserialize
-  startTime: string;
+    startTime: string;
 
   /**
    * The end time for this process
    */
   @autoserialize
-  endTime: string;
+    endTime: string;
 
   /**
    * The name of the script run by this process
    */
   @autoserialize
-  scriptName: string;
+    scriptName: string;
 
   /**
    * The status of this process
    */
   @autoserialize
-  processStatus: ProcessStatus;
+    processStatus: ProcessStatus;
 
   /**
    * The parameters for this process
    */
   @autoserialize
-  parameters: ProcessParameter[];
+    parameters: ProcessParameter[];
 
   /**
    * The {@link HALLink}s for this Process
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
     script: HALLink,
     output: HALLink,
-    files: HALLink
+    files: HALLink,
+    filetypes: HALLink,
   };
 
   /**
@@ -86,12 +105,27 @@ export class Process implements CacheableObject {
    * Will be undefined unless the script {@link HALLink} has been resolved.
    */
   @link(SCRIPT)
-  script?: Observable<RemoteData<Script>>;
+    script?: Observable<RemoteData<Script>>;
 
   /**
    * The output logs created by this Process
    * Will be undefined unless the output {@link HALLink} has been resolved.
    */
   @link(PROCESS_OUTPUT_TYPE)
-  output?: Observable<RemoteData<Bitstream>>;
+    output?: Observable<RemoteData<Bitstream>>;
+
+  /**
+   * The files created by this Process
+   * Will be undefined unless the output {@link HALLink} has been resolved.
+   */
+  @link(BITSTREAM, true)
+    files?: Observable<RemoteData<PaginatedList<Bitstream>>>;
+
+  /**
+   * The filetypes present in this Process
+   * Will be undefined unless the output {@link HALLink} has been resolved.
+   */
+  @link(FILETYPES)
+    filetypes?: Observable<RemoteData<Filetypes>>;
+
 }
diff --git a/src/app/process-page/scripts/script.model.ts b/src/app/process-page/scripts/script.model.ts
index afb1d41524..7907695b10 100644
--- a/src/app/process-page/scripts/script.model.ts
+++ b/src/app/process-page/scripts/script.model.ts
@@ -1,11 +1,15 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../core/cache/cacheable-object.model';
 import { HALLink } from '../../core/shared/hal-link.model';
-import { autoserialize, deserialize } from 'cerialize';
+import { ResourceType } from '../../core/shared/resource-type';
+import { excludeFromEquals } from '../../core/utilities/equals.decorators';
 import { SCRIPT } from './script.resource-type';
 import { ScriptParameter } from './script-parameter.model';
-import { typedObject } from '../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../core/utilities/equals.decorators';
-import { ResourceType } from '../../core/shared/resource-type';
-import { CacheableObject } from '../../core/cache/cacheable-object.model';
 
 /**
  * Object representing a script
@@ -19,37 +23,37 @@ export class Script implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The identifier of this script
    */
   @autoserialize
-  id: string;
+    id: string;
 
   /**
    * The name of this script
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * A short description of this script
    */
   @autoserialize
-  description: string;
+    description: string;
 
   /**
    * The available parameters for this script
    */
   @autoserialize
-  parameters: ScriptParameter[];
+    parameters: ScriptParameter[];
 
   /**
    * The {@link HALLink}s for this Script
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink,
   };
 }
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 eec9f437f1..a5bbb38d02 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
@@ -12,7 +12,7 @@
     <div class="scrollable-menu list-group container">
       <div *ngFor="let listEntry of (listEntries$ | async)?.payload.page" class="row">
         <button class="list-group-item list-group-item-action border-0 list-entry"
-                title="{{ listEntry.indexableObject.name }}"
+                title="{{ dsoNameService.getName(listEntry.indexableObject) }}"
                 (click)="selectItem(listEntry.indexableObject)" #listEntryElement>
           <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
                                                [linkType]=linkTypes.None></ds-listable-object-component-loader>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
index 2843322818..66fa15c56e 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.spec.ts
@@ -1,20 +1,26 @@
-import { ActivatedRoute, Router } from '@angular/router';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { ProfileClaimItemModalComponent } from './profile-claim-item-modal.component';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
 import { Item } from '../../core/shared/item.model';
-import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
-import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
 import { RouterStub } from '../../shared/testing/router.stub';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { ProfileClaimItemModalComponent } from './profile-claim-item-modal.component';
 
 describe('ProfileClaimItemModalComponent', () => {
   let component: ProfileClaimItemModalComponent;
@@ -25,65 +31,65 @@ describe('ProfileClaimItemModalComponent', () => {
     metadata: {
       'person.email': [
         {
-          value: 'fake@email.com'
-        }
+          value: 'fake@email.com',
+        },
       ],
       'person.familyName': [
         {
-          value: 'Doe'
-        }
+          value: 'Doe',
+        },
       ],
       'person.givenName': [
         {
-          value: 'John'
-        }
-      ]
+          value: 'John',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item2: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake2@email.com'
-        }
+          value: 'fake2@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item3: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake3@email.com'
-        }
+          value: 'fake3@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
 
   const searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
@@ -91,16 +97,16 @@ describe('ProfileClaimItemModalComponent', () => {
   const searchResult3 = Object.assign(new ItemSearchResult(), { indexableObject: item3 });
 
   const searchResult = Object.assign(new SearchObjects(), {
-    page: [searchResult1, searchResult2, searchResult3]
+    page: [searchResult1, searchResult2, searchResult3],
   });
   const emptySearchResult = Object.assign(new SearchObjects(), {
-    page: []
+    page: [],
   });
   const searchResultRD = createSuccessfulRemoteDataObject(searchResult);
   const emptySearchResultRD = createSuccessfulRemoteDataObject(emptySearchResult);
 
   const profileClaimService = jasmine.createSpyObj('profileClaimService', {
-    searchForSuggestions: jasmine.createSpy('searchForSuggestions')
+    searchForSuggestions: jasmine.createSpy('searchForSuggestions'),
   });
 
   beforeEach(waitForAsync(() => {
@@ -111,9 +117,9 @@ describe('ProfileClaimItemModalComponent', () => {
         { provide: NgbActiveModal, useValue: {} },
         { provide: ActivatedRoute, useValue: {} },
         { provide: Router, useValue: new RouterStub() },
-        { provide: ProfileClaimService, useValue: profileClaimService }
+        { provide: ProfileClaimService, useValue: profileClaimService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
index 6838704560..becf73c3f8 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.ts
@@ -1,27 +1,36 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { BehaviorSubject } from 'rxjs';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../core/data/remote-data';
-import { Item } from '../../core/shared/item.model';
-import {
-  DSOSelectorModalWrapperComponent
-} from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { DSOSelectorModalWrapperComponent } from '../../shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
 
 /**
  * Component representing a modal that show a list of suggested profile item to claim
  */
 @Component({
   selector: 'ds-profile-claim-item-modal',
-  templateUrl: './profile-claim-item-modal.component.html'
+  templateUrl: './profile-claim-item-modal.component.html',
 })
 export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperComponent implements OnInit {
 
@@ -56,7 +65,9 @@ export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperCompo
   @Output() create: EventEmitter<any> = new EventEmitter<any>();
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router,
-              private profileClaimService: ProfileClaimService) {
+              private profileClaimService: ProfileClaimService,
+              public dsoNameService: DSONameService,
+  ) {
     super(activeModal, route);
   }
 
@@ -67,7 +78,7 @@ export class ProfileClaimItemModalComponent extends DSOSelectorModalWrapperCompo
     this.profileClaimService.searchForSuggestions(this.dso as EPerson).pipe(
       getFirstCompletedRemoteData(),
     ).subscribe(
-      (result: RemoteData<SearchObjects<DSpaceObject>>) => this.listEntries$.next(result)
+      (result: RemoteData<SearchObjects<DSpaceObject>>) => this.listEntries$.next(result),
     );
   }
 
diff --git a/src/app/profile-page/profile-claim/profile-claim.service.spec.ts b/src/app/profile-page/profile-claim/profile-claim.service.spec.ts
index e2a9ff1461..e84521a85d 100644
--- a/src/app/profile-page/profile-claim/profile-claim.service.spec.ts
+++ b/src/app/profile-page/profile-claim/profile-claim.service.spec.ts
@@ -1,15 +1,20 @@
-import { cold, getTestScheduler } from 'jasmine-marbles';
-
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { ProfileClaimService } from './profile-claim.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
 import { SearchService } from '../../core/shared/search/search.service';
 import { ItemSearchResult } from '../../shared/object-collection/shared/item-search-result.model';
+import {
+  createNoContentRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../shared/remote-data.utils';
 import { SearchObjects } from '../../shared/search/models/search-objects.model';
-import { Item } from '../../core/shared/item.model';
-import { createNoContentRemoteDataObject, createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import { ProfileClaimService } from './profile-claim.service';
 
 describe('ProfileClaimService', () => {
   let scheduler: TestScheduler;
@@ -22,81 +27,81 @@ describe('ProfileClaimService', () => {
     metadata: {
       'eperson.firstname': [
         {
-          value: 'John'
-        }
+          value: 'John',
+        },
       ],
       'eperson.lastname': [
         {
-          value: 'Doe'
+          value: 'Doe',
         },
       ],
     },
-    email: 'fake@email.com'
+    email: 'fake@email.com',
   });
   const item1: Item = Object.assign(new Item(), {
     uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e',
     metadata: {
       'person.email': [
         {
-          value: 'fake@email.com'
-        }
+          value: 'fake@email.com',
+        },
       ],
       'person.familyName': [
         {
-          value: 'Doe'
-        }
+          value: 'Doe',
+        },
       ],
       'person.givenName': [
         {
-          value: 'John'
-        }
-      ]
+          value: 'John',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item2: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake2@email.com'
-        }
+          value: 'fake2@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
   const item3: Item = Object.assign(new Item(), {
     uuid: 'c8279647-1acc-41ae-b036-951d5f65649b',
     metadata: {
       'person.email': [
         {
-          value: 'fake3@email.com'
-        }
+          value: 'fake3@email.com',
+        },
       ],
       'dc.title': [
         {
-          value: 'John, Doe'
-        }
-      ]
+          value: 'John, Doe',
+        },
+      ],
     },
     _links: {
       self: {
-        href: 'item-href'
-      }
-    }
+        href: 'item-href',
+      },
+    },
   });
 
   const searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
@@ -104,10 +109,10 @@ describe('ProfileClaimService', () => {
   const searchResult3 = Object.assign(new ItemSearchResult(), { indexableObject: item3 });
 
   const searchResult = Object.assign(new SearchObjects(), {
-    page: [searchResult1, searchResult2, searchResult3]
+    page: [searchResult1, searchResult2, searchResult3],
   });
   const emptySearchResult = Object.assign(new SearchObjects(), {
-    page: []
+    page: [],
   });
   const searchResultRD = createSuccessfulRemoteDataObject(searchResult);
   const emptySearchResultRD = createSuccessfulRemoteDataObject(emptySearchResult);
@@ -116,7 +121,7 @@ describe('ProfileClaimService', () => {
     scheduler = getTestScheduler();
 
     searchService = jasmine.createSpyObj('SearchService', {
-      search: jasmine.createSpy('search')
+      search: jasmine.createSpy('search'),
     });
 
     service = new ProfileClaimService(searchService);
@@ -133,7 +138,7 @@ describe('ProfileClaimService', () => {
       it('should return true', () => {
         const result = service.hasProfilesToSuggest(eperson);
         const expected = cold('(a|)', {
-          a: true
+          a: true,
         });
         expect(result).toBeObservable(expected);
       });
@@ -148,7 +153,7 @@ describe('ProfileClaimService', () => {
       it('should return false', () => {
         const result = service.hasProfilesToSuggest(eperson);
         const expected = cold('(a|)', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
@@ -159,7 +164,7 @@ describe('ProfileClaimService', () => {
       it('should return false', () => {
         const result = service.hasProfilesToSuggest(null);
         const expected = cold('(a|)', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
@@ -178,7 +183,7 @@ describe('ProfileClaimService', () => {
       it('should return the proper search object', () => {
         const result = service.searchForSuggestions(eperson);
         const expected = cold('(a|)', {
-          a: searchResultRD
+          a: searchResultRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -193,7 +198,7 @@ describe('ProfileClaimService', () => {
       it('should return null', () => {
         const result = service.searchForSuggestions(eperson);
         const expected = cold('(a|)', {
-          a: emptySearchResultRD
+          a: emptySearchResultRD,
         });
         expect(result).toBeObservable(expected);
       });
@@ -204,7 +209,7 @@ describe('ProfileClaimService', () => {
       it('should return null', () => {
         const result = service.searchForSuggestions(null);
         const expected = cold('(a|)', {
-          a: createNoContentRemoteDataObject()
+          a: createNoContentRemoteDataObject(),
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/profile-page/profile-claim/profile-claim.service.ts b/src/app/profile-page/profile-claim/profile-claim.service.ts
index ea907ef629..f6d2ad35f1 100644
--- a/src/app/profile-page/profile-claim/profile-claim.service.ts
+++ b/src/app/profile-page/profile-claim/profile-claim.service.ts
@@ -1,17 +1,22 @@
 import { Injectable } from '@angular/core';
-
-import { Observable, of } from 'rxjs';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { RemoteData } from '../../core/data/remote-data';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchService } from '../../core/shared/search/search.service';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { SearchObjects } from '../../shared/search/models/search-objects.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { createNoContentRemoteDataObject } from '../../shared/remote-data.utils';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { SearchObjects } from '../../shared/search/models/search-objects.model';
 
 /**
  * Service that handle profiles claim.
@@ -32,7 +37,7 @@ export class ProfileClaimService {
       getFirstCompletedRemoteData(),
       map((rd: RemoteData<SearchObjects<DSpaceObject>>) => {
         return isNotEmpty(rd) && rd.hasSucceeded && rd.payload?.page?.length > 0;
-      })
+      }),
     );
   }
 
@@ -60,7 +65,7 @@ export class ProfileClaimService {
     }
     return this.searchService.search(new PaginatedSearchOptions({
       configuration: 'eperson_claims',
-      query: query
+      query: query,
     }), null, false, true);
   }
 
diff --git a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts
index 9c0942d4ff..69f827ec07 100644
--- a/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-metadata-form/profile-page-metadata-form.component.spec.ts
@@ -1,15 +1,26 @@
-import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form.component';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import cloneDeep from 'lodash/cloneDeep';
+
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { cloneDeep } from 'lodash';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form.component';
 
 describe('ProfilePageMetadataFormComponent', () => {
   let component: ProfilePageMetadataFormComponent;
@@ -28,35 +39,35 @@ describe('ProfilePageMetadataFormComponent', () => {
         'eperson.firstname': [
           {
             value: 'John',
-            language: null
-          }
+            language: null,
+          },
         ],
         'eperson.lastname': [
           {
             value: 'Doe',
-            language: null
-          }
+            language: null,
+          },
         ],
         'eperson.language': [
           {
             value: 'de',
-            language: null
-          }
-        ]
-      }
+            language: null,
+          },
+        ],
+      },
     });
 
     epersonService = jasmine.createSpyObj('epersonService', {
-      update: createSuccessfulRemoteDataObject$(user)
+      update: createSuccessfulRemoteDataObject$(user),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
       error: {},
-      warning: {}
+      warning: {},
     });
     translate = {
       instant: () => 'translated',
-      onLangChange: new EventEmitter()
+      onLangChange: new EventEmitter(),
     };
 
   }
@@ -70,9 +81,9 @@ describe('ProfilePageMetadataFormComponent', () => {
         { provide: EPersonDataService, useValue: epersonService },
         { provide: TranslateService, useValue: translate },
         { provide: NotificationsService, useValue: notificationsService },
-        FormBuilderService
+        FormBuilderService,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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 44ec406e80..eb6d40bcfc 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
@@ -1,25 +1,36 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlModel,
   DynamicFormValueControlModel,
   DynamicInputModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
-import { FormGroup } from '@angular/forms';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { TranslateService } from '@ngx-translate/core';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
+import cloneDeep from 'lodash/cloneDeep';
+
 import { LangConfig } from '../../../config/lang-config.interface';
+import { environment } from '../../../environments/environment';
 import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { cloneDeep } from 'lodash';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../core/shared/operators';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
 import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { environment } from '../../../environments/environment';
 
 @Component({
   selector: 'ds-profile-page-metadata-form',
-  templateUrl: './profile-page-metadata-form.component.html'
+  templateUrl: './profile-page-metadata-form.component.html',
 })
 /**
  * Component for a user to edit their metadata
@@ -43,44 +54,48 @@ export class ProfilePageMetadataFormComponent implements OnInit {
     new DynamicInputModel({
       id: 'email',
       name: 'email',
-      readOnly: true
+      readOnly: true,
+      disabled: true,
     }),
     new DynamicInputModel({
       id: 'firstname',
       name: 'eperson.firstname',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'This field is required'
+        required: 'This field is required',
       },
+      autoComplete: 'given-name',
     }),
     new DynamicInputModel({
       id: 'lastname',
       name: 'eperson.lastname',
       required: true,
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'This field is required'
+        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',
-      name: 'eperson.language'
-    })
+      name: 'eperson.language',
+    }),
   ];
 
   /**
    * The form group of this form
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * Prefix for the form's label messages of this component
@@ -135,7 +150,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
           (fieldModel as DynamicSelectModel<string>).options =
             this.activeLangs.map((langConfig) => Object.assign({ value: langConfig.code, label: langConfig.label }));
         }
-      }
+      },
     );
     this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
   }
@@ -153,7 +168,7 @@ export class ProfilePageMetadataFormComponent implements OnInit {
             fieldModel.errorMessages[key] = this.translate.instant(this.ERROR_PREFIX + fieldModel.id + '.' + key);
           });
         }
-      }
+      },
     );
   }
 
@@ -187,22 +202,22 @@ export class ProfilePageMetadataFormComponent implements OnInit {
       } else if (hasValue(fieldModel.value)) {
         newMetadata[fieldModel.name] = [{
           value: fieldModel.value,
-          language: null
+          language: null,
         } as any];
         changed = true;
       }
     });
 
     if (changed) {
-      this.epersonService.update(Object.assign(cloneDeep(this.user), {metadata: newMetadata})).pipe(
+      this.epersonService.update(Object.assign(cloneDeep(this.user), { metadata: newMetadata })).pipe(
         getFirstSucceededRemoteData(),
-        getRemoteDataPayload()
+        getRemoteDataPayload(),
       ).subscribe((user) => {
         this.user = user;
         this.setFormValues();
         this.notificationsService.success(
           this.translate.instant(this.NOTIFICATION_PREFIX + 'success.title'),
-          this.translate.instant(this.NOTIFICATION_PREFIX + 'success.content')
+          this.translate.instant(this.NOTIFICATION_PREFIX + 'success.content'),
         );
       });
     }
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..8d48da08d9 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
@@ -18,7 +18,7 @@
     <span *ngIf="(isProcessingCreate() | async)">
         <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
     </span>
-    <span *ngIf="!(isProcessingCreate() | async)">
+    <span *ngIf="(isProcessingCreate() | async) !== true">
         <i class="fas fa-plus"></i> &nbsp;{{'researcher.profile.create.new' | translate}}
     </span>
   </button>
@@ -30,7 +30,7 @@
         <span *ngIf="(isProcessingDelete() | async)">
             <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
-        <span *ngIf="!(isProcessingDelete() | async)">
+        <span *ngIf="(isProcessingDelete() | async) !== true">
             <i class="fas fa-trash-alt"></i> &nbsp;{{'researcher.profile.delete' | translate}}
         </span>
     </button>
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
index 9bb0d0a6e2..acef932917 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.spec.ts
@@ -1,23 +1,29 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-
-import { of as observableOf } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { AuthService } from '../../core/auth/auth.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
 import { followLink } from '../../shared/utils/follow-link-config.model';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form.component';
 
 describe('ProfilePageResearcherFormComponent', () => {
 
@@ -39,17 +45,17 @@ describe('ProfilePageResearcherFormComponent', () => {
   function init() {
 
     user = Object.assign(new EPerson(), {
-      id: 'beef9946-f4ce-479e-8f11-b90cbe9f7241'
+      id: 'beef9946-f4ce-479e-8f11-b90cbe9f7241',
     });
 
     profile = Object.assign(new ResearcherProfile(), {
       id: 'beef9946-f4ce-479e-8f11-b90cbe9f7241',
       visible: false,
-      type: 'profile'
+      type: 'profile',
     });
 
     authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: observableOf(user)
+      getAuthenticatedUserFromStore: observableOf(user),
     });
 
     researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
@@ -57,7 +63,7 @@ describe('ProfilePageResearcherFormComponent', () => {
       create: observableOf(profile),
       setVisibility: jasmine.createSpy('setVisibility'),
       delete: observableOf(true),
-      findRelatedItemId: observableOf('a42557ca-cbb8-4442-af9c-3bb5cad2d075')
+      findRelatedItemId: observableOf('a42557ca-cbb8-4442-af9c-3bb5cad2d075'),
     });
 
     notificationsServiceStub = new NotificationsServiceStub();
@@ -78,9 +84,9 @@ describe('ProfilePageResearcherFormComponent', () => {
         { provide: ResearcherProfileDataService, useValue: researcherProfileService },
         { provide: NotificationsService, useValue: notificationsServiceStub },
         { provide: ProfileClaimService, useValue: profileClaimService },
-        { provide: AuthService, useValue: authService }
+        { provide: AuthService, useValue: authService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
index d63360fbf4..35945ddb3a 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.ts
@@ -1,24 +1,39 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/profile-claim-item-modal.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { AuthService } from '../../core/auth/auth.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { ResearcherProfile } from '../../core/profile/model/researcher-profile.model';
 import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
-import { ProfileClaimService } from '../profile-claim/profile-claim.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { isNotEmpty } from '../../shared/empty.util';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
 import { NoContent } from '../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { ConfirmationModalComponent } from '../../shared/confirmation-modal/confirmation-modal.component';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { followLink } from '../../shared/utils/follow-link-config.model';
+import { ProfileClaimService } from '../profile-claim/profile-claim.service';
+import { ProfileClaimItemModalComponent } from '../profile-claim-item-modal/profile-claim-item-modal.component';
 
 @Component({
   selector: 'ds-profile-page-researcher-form',
@@ -147,7 +162,7 @@ export class ProfilePageResearcherFormComponent implements OnInit {
    */
   toggleProfileVisibility(researcherProfile: ResearcherProfile): void {
     this.researcherProfileService.setVisibility(researcherProfile, !researcherProfile.visible).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<ResearcherProfile>) => {
       if (rd.hasSucceeded) {
         this.researcherProfile$.next(rd.payload);
@@ -181,7 +196,7 @@ export class ProfilePageResearcherFormComponent implements OnInit {
   createProfileFromScratch() {
     this.processingCreate$.next(true);
     this.researcherProfileService.create().pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((remoteData) => {
       this.processingCreate$.next(false);
       if (remoteData.isSuccess) {
diff --git a/src/app/profile-page/profile-page-routing.module.ts b/src/app/profile-page/profile-page-routing.module.ts
index 695a78837f..44795a16e3 100644
--- a/src/app/profile-page/profile-page-routing.module.ts
+++ b/src/app/profile-page/profile-page-routing.module.ts
@@ -1,14 +1,15 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
+
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ThemedProfilePageComponent } from './themed-profile-page.component';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', pathMatch: 'full', component: ThemedProfilePageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'profile', title: 'profile.title' } }
-    ])
-  ]
+      { path: '', pathMatch: 'full', component: ThemedProfilePageComponent, resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { breadcrumbKey: 'profile', title: 'profile.title' } },
+    ]),
+  ],
 })
 export class ProfilePageRoutingModule {
 
diff --git a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
index 866b962986..ae80b5351b 100644
--- a/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
+++ b/src/app/profile-page/profile-page-security-form/profile-page-security-form.component.spec.ts
@@ -1,14 +1,21 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
-import { ProfilePageSecurityFormComponent } from './profile-page-security-form.component';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { RestResponse } from '../../core/cache/response.models';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { FormBuilderService } from '../../shared/form/builder/form-builder.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { ProfilePageSecurityFormComponent } from './profile-page-security-form.component';
 
 describe('ProfilePageSecurityFormComponent', () => {
   let component: ProfilePageSecurityFormComponent;
@@ -19,12 +26,12 @@ describe('ProfilePageSecurityFormComponent', () => {
 
   function init() {
     epersonService = jasmine.createSpyObj('epersonService', {
-      patch: observableOf(new RestResponse(true, 200, 'OK'))
+      patch: observableOf(new RestResponse(true, 200, 'OK')),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
       error: {},
-      warning: {}
+      warning: {},
     });
   }
 
@@ -34,11 +41,11 @@ describe('ProfilePageSecurityFormComponent', () => {
       declarations: [ProfilePageSecurityFormComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
-        {provide: EPersonDataService, useValue: epersonService},
-        {provide: NotificationsService, useValue: notificationsService},
-        FormBuilderService
+        { provide: EPersonDataService, useValue: epersonService },
+        { provide: NotificationsService, useValue: notificationsService },
+        FormBuilderService,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -51,14 +58,14 @@ describe('ProfilePageSecurityFormComponent', () => {
   describe('On value change', () => {
     describe('when the password has changed', () => {
       beforeEach(() => {
-        component.formGroup.patchValue({password: 'password'});
-        component.formGroup.patchValue({passwordrepeat: 'password'});
+        component.formGroup.patchValue({ password: 'password' });
+        component.formGroup.patchValue({ passwordrepeat: 'password' });
       });
 
       it('should emit the value and validity on password change with invalid validity', fakeAsync(() => {
         spyOn(component.passwordValue, 'emit');
         spyOn(component.isInvalid, 'emit');
-        component.formGroup.patchValue({password: 'new-password'});
+        component.formGroup.patchValue({ password: 'new-password' });
 
         tick(300);
 
@@ -68,7 +75,7 @@ describe('ProfilePageSecurityFormComponent', () => {
 
       it('should emit the value on password change', fakeAsync(() => {
         spyOn(component.passwordValue, 'emit');
-        component.formGroup.patchValue({password: 'new-password'});
+        component.formGroup.patchValue({ password: 'new-password' });
 
         tick(300);
 
@@ -80,8 +87,8 @@ describe('ProfilePageSecurityFormComponent', () => {
         spyOn(component.currentPasswordValue, 'emit');
         component.FORM_PREFIX = 'profile.security.form.';
         component.ngOnInit();
-        component.formGroup.patchValue({password: 'new-password'});
-        component.formGroup.patchValue({'current-password': 'current-password'});
+        component.formGroup.patchValue({ password: 'new-password' });
+        component.formGroup.patchValue({ 'current-password': 'current-password' });
         tick(300);
 
         expect(component.passwordValue.emit).toHaveBeenCalledWith('new-password');
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 29bcffe4e4..dc6ecab63b 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
@@ -1,17 +1,31 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
-import { FormGroup } from '@angular/forms';
-import { hasValue, isEmpty } from '../../shared/empty.util';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { map } from 'rxjs/operators';
 import { Subscription } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { debounceTimeWorkaround as debounceTime } from '../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 @Component({
   selector: 'ds-profile-page-security-form',
-  templateUrl: './profile-page-security-form.component.html'
+  templateUrl: './profile-page-security-form.component.html',
 })
 /**
  * Component for a user to edit their security information
@@ -39,31 +53,33 @@ 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',
+    }),
   ];
 
   /**
    * The form group of this form
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * Indicates whether the "checkPasswordEmpty" needs to be added or not
    */
   @Input()
-  passwordCanBeEmpty = true;
+    passwordCanBeEmpty = true;
 
   /**
    * Prefix for the form's label messages of this component
    */
   @Input()
-  FORM_PREFIX: string;
+    FORM_PREFIX: string;
 
   private subs: Subscription[] = [];
 
@@ -79,7 +95,8 @@ export class ProfilePageSecurityFormComponent implements OnInit {
         id: 'current-password',
         name: 'current-password',
         inputType: 'password',
-        required: true
+        required: true,
+        autoComplete: 'current-password',
       }));
     }
     if (this.passwordCanBeEmpty) {
@@ -98,8 +115,8 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     this.subs.push(
       this.formGroup.statusChanges.pipe(
         debounceTime(300),
-        map((status: string) => status !== 'VALID')
-      ).subscribe((status) => this.isInvalid.emit(status))
+        map((status: string) => status !== 'VALID'),
+      ).subscribe((status) => this.isInvalid.emit(status)),
     );
 
     this.subs.push(this.formGroup.valueChanges.pipe(
@@ -119,7 +136,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
     this.formModel.forEach(
       (fieldModel: DynamicInputModel) => {
         fieldModel.label = this.translate.instant(this.FORM_PREFIX + 'label.' + fieldModel.id);
-      }
+      },
     );
   }
 
@@ -127,7 +144,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
    * Check if both password fields are filled in and equal
    * @param group The FormGroup to validate
    */
-  checkPasswordsEqual(group: FormGroup) {
+  checkPasswordsEqual(group: UntypedFormGroup) {
     const pass = group.get('password').value;
     const repeatPass = group.get('passwordrepeat').value;
 
@@ -138,7 +155,7 @@ export class ProfilePageSecurityFormComponent implements OnInit {
    * Checks if the password is empty
    * @param group The FormGroup to validate
    */
-  checkPasswordEmpty(group: FormGroup) {
+  checkPasswordEmpty(group: UntypedFormGroup) {
     const pass = group.get('password').value;
     return isEmpty(pass) ? { emptyPassword: true } : null;
   }
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index b6f53b08bf..b5703c47a3 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -1,13 +1,14 @@
 <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>
       <div class="card mb-4">
         <div class="card-header">{{'profile.card.researcher' | translate}}</div>
         <div class="card-body">
           <div class="mb-4">
             <ds-profile-page-researcher-form [user]="user" ></ds-profile-page-researcher-form>
           </div>
+          <ds-suggestions-notification></ds-suggestions-notification>
         </div>
       </div>
     </ng-container>
@@ -34,18 +35,20 @@
 
     <ng-container *ngVar="(groupsRD$ | async)?.payload?.page as groups">
       <div *ngIf="groups?.length > 0">
-        <h3 class="mt-4">{{'profile.groups.head' | translate}}</h3>
+        <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">{{group.name}}</li>
+          <li *ngFor="let group of groups" class="list-group-item">{{ dsoNameService.getName(group) }}</li>
         </ul>
       </div>
     </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">{{specialGroup.name}}</li>
+          <li *ngFor="let specialGroup of specialGroups" class="list-group-item">
+            {{ dsoNameService.getName(specialGroup) }}
+          </li>
         </ul>
      </div>
     </ng-container>
diff --git a/src/app/profile-page/profile-page.component.spec.ts b/src/app/profile-page/profile-page.component.spec.ts
index 709ed56790..4d7d91f830 100644
--- a/src/app/profile-page/profile-page.component.spec.ts
+++ b/src/app/profile-page/profile-page.component.spec.ts
@@ -1,28 +1,45 @@
-import { ProfilePageComponent } from './profile-page.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EPerson } from '../core/eperson/models/eperson.model';
-import { StoreModule } from '@ngrx/store';
-import { storeModuleConfig } from '../app.reducer';
-import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
-import { EPersonDataService } from '../core/eperson/eperson-data.service';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { authReducer } from '../core/auth/auth.reducer';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
-import { createPaginatedList } from '../shared/testing/utils.test';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { AuthService } from '../core/auth/auth.service';
-import { RestResponse } from '../core/cache/response.models';
-import { provideMockStore } from '@ngrx/store/testing';
-import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { EmptySpecialGroupDataMock$, SpecialGroupDataMock$ } from '../shared/testing/special-group.mock';
+import { RouterTestingModule } from '@angular/router/testing';
+import { StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { storeModuleConfig } from '../app.reducer';
+import { authReducer } from '../core/auth/auth.reducer';
+import { AuthService } from '../core/auth/auth.service';
+import { AuthTokenInfo } from '../core/auth/models/auth-token-info.model';
+import { RestResponse } from '../core/cache/response.models';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { EPersonDataService } from '../core/eperson/eperson-data.service';
+import { EPerson } from '../core/eperson/models/eperson.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import {
+  EmptySpecialGroupDataMock$,
+  SpecialGroupDataMock$,
+} from '../shared/testing/special-group.mock';
+import { createPaginatedList } from '../shared/testing/utils.test';
+import { VarDirective } from '../shared/utils/var.directive';
+import { ProfilePageComponent } from './profile-page.component';
 
 describe('ProfilePageComponent', () => {
   let component: ProfilePageComponent;
@@ -40,19 +57,19 @@ describe('ProfilePageComponent', () => {
   const validConfiguration = Object.assign(new ConfigurationProperty(), {
     name: 'researcher-profile.entity-type',
     values: [
-      'Person'
-    ]
+      'Person',
+    ],
   });
   const emptyConfiguration = Object.assign(new ConfigurationProperty(), {
     name: 'researcher-profile.entity-type',
-    values: []
+    values: [],
   });
 
   function init() {
     user = Object.assign(new EPerson(), {
       id: 'userId',
       groups: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-      _links: { self: { href: 'test.com/uuid/1234567654321' } }
+      _links: { self: { href: 'test.com/uuid/1234567654321' } },
     });
     initialState = {
       core: {
@@ -63,26 +80,26 @@ describe('ProfilePageComponent', () => {
           loading: false,
           authToken: new AuthTokenInfo('test_token'),
           userId: user.id,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
     authorizationService = jasmine.createSpyObj('authorizationService', { isAuthorized: canChangePassword });
     authService = jasmine.createSpyObj('authService', {
       getAuthenticatedUserFromStore: observableOf(user),
-      getSpecialGroupsFromAuthStatus: SpecialGroupDataMock$
+      getSpecialGroupsFromAuthStatus: SpecialGroupDataMock$,
     });
     epersonService = jasmine.createSpyObj('epersonService', {
       findById: createSuccessfulRemoteDataObject$(user),
-      patch: observableOf(Object.assign(new RestResponse(true, 200, 'Success')))
+      patch: observableOf(Object.assign(new RestResponse(true, 200, 'Success'))),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', {
       success: {},
       error: {},
-      warning: {}
+      warning: {},
     });
     configurationService = jasmine.createSpyObj('configurationDataService', {
-      findByPropertyName: jasmine.createSpy('findByPropertyName')
+      findByPropertyName: jasmine.createSpy('findByPropertyName'),
     });
   }
 
@@ -93,7 +110,7 @@ describe('ProfilePageComponent', () => {
       imports: [
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
         TranslateModule.forRoot(),
-        RouterTestingModule.withRoutes([])
+        RouterTestingModule.withRoutes([]),
       ],
       providers: [
         { provide: EPersonDataService, useValue: epersonService },
@@ -103,7 +120,7 @@ describe('ProfilePageComponent', () => {
         { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -123,7 +140,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns false and the security form returns true', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: false
+            updateProfile: false,
           });
           spyOn(component, 'updateSecurity').and.returnValue(true);
           component.updateProfile();
@@ -137,7 +154,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns true and the security form returns false', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: true
+            updateProfile: true,
           });
           component.updateProfile();
         });
@@ -150,7 +167,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns true and the security form returns true', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: true
+            updateProfile: true,
           });
           component.updateProfile();
         });
@@ -163,7 +180,7 @@ describe('ProfilePageComponent', () => {
       describe('when the metadata form returns false and the security form returns false', () => {
         beforeEach(() => {
           component.metadataForm = jasmine.createSpyObj('metadataForm', {
-            updateProfile: false
+            updateProfile: false,
           });
           component.updateProfile();
         });
@@ -219,7 +236,7 @@ describe('ProfilePageComponent', () => {
           component.setCurrentPasswordValue('current-password');
 
           operations = [
-            { 'op': 'add', 'path': '/password', 'value': { 'new_password': 'testest', 'current_password': 'current-password' } }
+            { 'op': 'add', 'path': '/password', 'value': { 'new_password': 'testest', 'current_password': 'current-password' } },
           ];
           result = component.updateSecurity();
         });
@@ -243,7 +260,7 @@ describe('ProfilePageComponent', () => {
           component.setInvalid(false);
           component.setCurrentPasswordValue('current-password');
           operations = [
-            { 'op': 'add', 'path': '/password', 'value': {'new_password': 'testest', 'current_password': 'current-password'  }}
+            { 'op': 'add', 'path': '/password', 'value': { 'new_password': 'testest', 'current_password': 'current-password'  } },
           ];
           result = component.updateSecurity();
           epersonService.patch(user, operations).subscribe((response) => {
@@ -288,27 +305,27 @@ describe('ProfilePageComponent', () => {
       });
     });
 
-  describe('check for specialGroups', () => {
-    it('should contains specialGroups list', () => {
-      const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
-      expect(specialGroupsEle).toBeTruthy();
-    });
+    describe('check for specialGroups', () => {
+      it('should contains specialGroups list', () => {
+        const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
+        expect(specialGroupsEle).toBeTruthy();
+      });
 
-    it('should not contains specialGroups list', () => {
-      component.specialGroupsRD$ = null;
-      fixture.detectChanges();
-      const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
-      expect(specialGroupsEle).toBeFalsy();
-    });
+      it('should not contains specialGroups list', () => {
+        component.specialGroupsRD$ = null;
+        fixture.detectChanges();
+        const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
+        expect(specialGroupsEle).toBeFalsy();
+      });
 
-    it('should not contains specialGroups list', () => {
-      component.specialGroupsRD$ = EmptySpecialGroupDataMock$;
-      fixture.detectChanges();
-      const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
-      expect(specialGroupsEle).toBeFalsy();
+      it('should not contains specialGroups list', () => {
+        component.specialGroupsRD$ = EmptySpecialGroupDataMock$;
+        fixture.detectChanges();
+        const specialGroupsEle = fixture.debugElement.query(By.css('[data-test="specialGroups"]'));
+        expect(specialGroupsEle).toBeFalsy();
+      });
     });
   });
-  });
 
   describe('isResearcherProfileEnabled', () => {
 
@@ -322,7 +339,7 @@ describe('ProfilePageComponent', () => {
       it('should return true', () => {
         const result = component.isResearcherProfileEnabled();
         const expected = cold('a', {
-          a: true
+          a: true,
         });
         expect(result).toBeObservable(expected);
       });
@@ -338,7 +355,7 @@ describe('ProfilePageComponent', () => {
       it('should return false', () => {
         const result = component.isResearcherProfileEnabled();
         const expected = cold('a', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
@@ -354,7 +371,7 @@ describe('ProfilePageComponent', () => {
       it('should return false', () => {
         const result = component.isResearcherProfileEnabled();
         const expected = cold('a', {
-          a: false
+          a: false,
         });
         expect(result).toBeObservable(expected);
       });
diff --git a/src/app/profile-page/profile-page.component.ts b/src/app/profile-page/profile-page.component.ts
index 109b2663f4..29697b21bc 100644
--- a/src/app/profile-page/profile-page.component.ts
+++ b/src/app/profile-page/profile-page.component.ts
@@ -1,28 +1,48 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { EPerson } from '../core/eperson/models/eperson.model';
-import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
-import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  Component,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { Group } from '../core/eperson/models/group.model';
-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 { hasValue, isNotEmpty } from '../shared/empty.util';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { AuthService } from '../core/auth/auth.service';
 import { Operation } from 'fast-json-patch';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import { DSONameService } from '../core/breadcrumbs/dso-name.service';
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../core/data/feature-authorization/feature-id';
-import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { PaginatedList } from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { EPersonDataService } from '../core/eperson/eperson-data.service';
+import { EPerson } from '../core/eperson/models/eperson.model';
+import { Group } from '../core/eperson/models/group.model';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { followLink } from '../shared/utils/follow-link-config.model';
+import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
 
 @Component({
   selector: 'ds-profile-page',
   styleUrls: ['./profile-page.component.scss'],
-  templateUrl: './profile-page.component.html'
+  templateUrl: './profile-page.component.html',
 })
 /**
  * Component for a user to edit their profile information
@@ -85,7 +105,9 @@ export class ProfilePageComponent implements OnInit {
               private translate: TranslateService,
               private epersonService: EPersonDataService,
               private authorizationService: AuthorizationDataService,
-              private configurationService: ConfigurationDataService) {
+              private configurationService: ConfigurationDataService,
+              public dsoNameService: DSONameService,
+  ) {
   }
 
   ngOnInit(): void {
@@ -94,14 +116,14 @@ export class ProfilePageComponent implements OnInit {
       switchMap((user: EPerson) => this.epersonService.findById(user.id, true, true, followLink('groups'))),
       getAllSucceededRemoteData(),
       getRemoteDataPayload(),
-      tap((user: EPerson) => this.currentUser = user)
+      tap((user: EPerson) => this.currentUser = user),
     );
     this.groupsRD$ = this.user$.pipe(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();
 
     this.configurationService.findByPropertyName('researcher-profile.entity-type').pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((configRD: RemoteData<ConfigurationProperty>) => {
       this.isResearcherProfileEnabled$.next(configRD.hasSucceeded && configRD.payload.values.length > 0);
     });
@@ -117,7 +139,7 @@ export class ProfilePageComponent implements OnInit {
     if (!metadataChanged && !securityChanged) {
       this.notificationsService.warning(
         this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.title'),
-        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.content')
+        this.translate.instant(this.NOTIFICATIONS_PREFIX + 'warning.no-changes.content'),
       );
     }
   }
@@ -147,18 +169,18 @@ export class ProfilePageComponent implements OnInit {
     }
     if (!this.invalidSecurity && passEntered) {
       const operations = [
-        { 'op': 'add', 'path': '/password', 'value': { 'new_password': this.password, 'current_password': this.currentPassword } }
+        { 'op': 'add', 'path': '/password', 'value': { 'new_password': this.password, 'current_password': this.currentPassword } },
       ] as Operation[];
       this.epersonService.patch(this.currentUser, operations).pipe(getFirstCompletedRemoteData()).subscribe((response: RemoteData<EPerson>) => {
         if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.title'),
-            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content')
+            this.translate.instant(this.PASSWORD_NOTIFICATIONS_PREFIX + 'success.content'),
           );
         } 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),
           );
         }
       });
@@ -196,4 +218,18 @@ export class ProfilePageComponent implements OnInit {
     return this.isResearcherProfileEnabled$.asObservable();
   }
 
+  /**
+   * 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.
+   */
+  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/profile-page/profile-page.module.ts b/src/app/profile-page/profile-page.module.ts
index 0e2902de33..8420b5baa2 100644
--- a/src/app/profile-page/profile-page.module.ts
+++ b/src/app/profile-page/profile-page.module.ts
@@ -1,18 +1,17 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
+import { NotificationsModule } from '../notifications/notifications.module';
+import { FormModule } from '../shared/form/form.module';
 import { SharedModule } from '../shared/shared.module';
-import { ProfilePageRoutingModule } from './profile-page-routing.module';
+import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profile-claim-item-modal.component';
 import { ProfilePageComponent } from './profile-page.component';
 import { ProfilePageMetadataFormComponent } from './profile-page-metadata-form/profile-page-metadata-form.component';
+import { ProfilePageResearcherFormComponent } from './profile-page-researcher-form/profile-page-researcher-form.component';
+import { ProfilePageRoutingModule } from './profile-page-routing.module';
 import { ProfilePageSecurityFormComponent } from './profile-page-security-form/profile-page-security-form.component';
-import {
-  ProfilePageResearcherFormComponent
-} from './profile-page-researcher-form/profile-page-researcher-form.component';
 import { ThemedProfilePageComponent } from './themed-profile-page.component';
-import { FormModule } from '../shared/form/form.module';
-import { UiSwitchModule } from 'ngx-ui-switch';
-import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profile-claim-item-modal.component';
-
 
 @NgModule({
   imports: [
@@ -20,14 +19,15 @@ import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profi
     CommonModule,
     SharedModule,
     FormModule,
-    UiSwitchModule
+    UiSwitchModule,
+    NotificationsModule,
   ],
   exports: [
     ProfilePageComponent,
     ThemedProfilePageComponent,
     ProfilePageMetadataFormComponent,
     ProfilePageSecurityFormComponent,
-    ProfilePageResearcherFormComponent
+    ProfilePageResearcherFormComponent,
   ],
   declarations: [
     ProfilePageComponent,
@@ -35,8 +35,8 @@ import { ProfileClaimItemModalComponent } from './profile-claim-item-modal/profi
     ProfileClaimItemModalComponent,
     ProfilePageMetadataFormComponent,
     ProfilePageSecurityFormComponent,
-    ProfilePageResearcherFormComponent
-  ]
+    ProfilePageResearcherFormComponent,
+  ],
 })
 export class ProfilePageModule {
 
diff --git a/src/app/profile-page/themed-profile-page.component.ts b/src/app/profile-page/themed-profile-page.component.ts
index 2348d416cf..c7d60726c8 100644
--- a/src/app/profile-page/themed-profile-page.component.ts
+++ b/src/app/profile-page/themed-profile-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ProfilePageComponent } from './profile-page.component';
 
@@ -8,7 +9,7 @@ import { ProfilePageComponent } from './profile-page.component';
 @Component({
   selector: 'ds-themed-profile-page',
   styleUrls: [],
-  templateUrl: './../shared/theme-support/themed.component.html'
+  templateUrl: './../shared/theme-support/themed.component.html',
 })
 export class ThemedProfilePageComponent extends ThemedComponent<ProfilePageComponent> {
   protected getComponentName(): string {
diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routing-paths.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routing-paths.ts
new file mode 100644
index 0000000000..c517ddafd4
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routing-paths.ts
@@ -0,0 +1,7 @@
+
+export const QUALITY_ASSURANCE_EDIT_PATH = 'quality-assurance';
+export const NOTIFICATIONS_RECITER_SUGGESTION_PATH = 'suggestion-targets';
+
+export function getQualityAssuranceEditRoute() {
+  return `/${QUALITY_ASSURANCE_EDIT_PATH}`;
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages-routing.module.ts b/src/app/quality-assurance-notifications-pages/notifications-pages-routing.module.ts
new file mode 100644
index 0000000000..71847a83f5
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-pages-routing.module.ts
@@ -0,0 +1,122 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { QualityAssuranceBreadcrumbResolver } from '../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
+import { QualityAssuranceBreadcrumbService } from '../core/breadcrumbs/quality-assurance-breadcrumb.service';
+import {
+  NOTIFICATIONS_RECITER_SUGGESTION_PATH,
+  QUALITY_ASSURANCE_EDIT_PATH,
+} from './notifications-pages-routing-paths';
+import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+import { AdminNotificationsPublicationClaimPageResolver } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
+import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page/quality-assurance-events-page.component';
+import { QualityAssuranceEventsPageResolver } from './quality-assurance-events-page/quality-assurance-events-page.resolver';
+import { SourceDataResolver } from './quality-assurance-source-page-component/quality-assurance-source-data.resolver';
+import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceSourcePageResolver } from './quality-assurance-source-page-component/quality-assurance-source-page-resolver.service';
+import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page/quality-assurance-topics-page.component';
+import { QualityAssuranceTopicsPageResolver } from './quality-assurance-topics-page/quality-assurance-topics-page-resolver.service';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${NOTIFICATIONS_RECITER_SUGGESTION_PATH}`,
+        component: NotificationsSuggestionTargetsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          reciterSuggestionTargetParams: AdminNotificationsPublicationClaimPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.recitersuggestion.page.title',
+          breadcrumbKey: 'admin.notifications.recitersuggestion',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
+        component: QualityAssuranceTopicsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceTopicsParams: QualityAssuranceTopicsPageResolver,
+        },
+        data: {
+          title: 'admin.quality-assurance.page.title',
+          breadcrumbKey: 'admin.quality-assurance',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
+        component: QualityAssuranceSourcePageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: I18nBreadcrumbResolver,
+          openaireQualityAssuranceSourceParams: QualityAssuranceSourcePageResolver,
+          sourceData: SourceDataResolver,
+        },
+        data: {
+          title: 'admin.notifications.source.breadcrumbs',
+          breadcrumbKey: 'admin.notifications.source',
+          showBreadcrumbsFluid: false,
+        },
+      },
+      {
+        canActivate: [ AuthenticatedGuard ],
+        path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
+        component: QualityAssuranceEventsPageComponent,
+        pathMatch: 'full',
+        resolve: {
+          breadcrumb: QualityAssuranceBreadcrumbResolver,
+          openaireQualityAssuranceEventsParams: QualityAssuranceEventsPageResolver,
+        },
+        data: {
+          title: 'admin.notifications.event.page.title',
+          breadcrumbKey: 'admin.notifications.event',
+          showBreadcrumbsFluid: false,
+        },
+      },
+    ]),
+  ],
+  providers: [
+    I18nBreadcrumbResolver,
+    I18nBreadcrumbsService,
+    AdminNotificationsPublicationClaimPageResolver,
+    SourceDataResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceTopicsPageResolver,
+    QualityAssuranceEventsPageResolver,
+    QualityAssuranceSourcePageResolver,
+    QualityAssuranceBreadcrumbResolver,
+    QualityAssuranceBreadcrumbService,
+  ],
+})
+/**
+ * Routing module for the Notifications section of the admin sidebar
+ */
+export class NotificationsPageRoutingModule {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts b/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts
new file mode 100644
index 0000000000..baf4f8357f
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-pages.module.ts
@@ -0,0 +1,34 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { CoreModule } from '../core/core.module';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SharedModule } from '../shared/shared.module';
+import { NotificationsPageRoutingModule } from './notifications-pages-routing.module';
+import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page/notifications-suggestion-targets-page.component';
+import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page/quality-assurance-events-page.component';
+import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page-component/quality-assurance-source-page.component';
+import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page/quality-assurance-topics-page.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CoreModule.forRoot(),
+    NotificationsPageRoutingModule,
+    NotificationsModule,
+  ],
+  declarations: [
+    NotificationsSuggestionTargetsPageComponent,
+    QualityAssuranceTopicsPageComponent,
+    QualityAssuranceEventsPageComponent,
+    QualityAssuranceSourcePageComponent,
+  ],
+  entryComponents: [],
+})
+/**
+ * This module handles all components related to the notifications pages
+ */
+export class NotificationsPageModule {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts
new file mode 100644
index 0000000000..13bcffbd5c
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service.ts
@@ -0,0 +1,39 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+
+export interface AdminNotificationsPublicationClaimPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+
+export class AdminNotificationsPublicationClaimPageResolver implements Resolve<AdminNotificationsPublicationClaimPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminNotificationsSuggestionTargetsPageParams Emits the route parameters
+   */
+
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): AdminNotificationsPublicationClaimPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.html b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.html
new file mode 100644
index 0000000000..11db25fa7b
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.html
@@ -0,0 +1 @@
+<ds-publication-claim [source]="'oaire'"></ds-publication-claim>
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.scss b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts
new file mode 100644
index 0000000000..c782ca8216
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.spec.ts
@@ -0,0 +1,43 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminNotificationsPublicationClaimPageComponent } from '../../admin/admin-notifications/admin-notifications-publication-claim-page/admin-notifications-publication-claim-page.component';
+import { NotificationsSuggestionTargetsPageComponent } from './notifications-suggestion-targets-page.component';
+
+describe('NotificationsSuggestionTargetsPageComponent', () => {
+  let component: NotificationsSuggestionTargetsPageComponent;
+  let fixture: ComponentFixture<NotificationsSuggestionTargetsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        NotificationsSuggestionTargetsPageComponent,
+      ],
+      providers: [
+        AdminNotificationsPublicationClaimPageComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotificationsSuggestionTargetsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts
new file mode 100644
index 0000000000..fcf583657b
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'ds-notifications-reciter-page',
+  templateUrl: './notifications-suggestion-targets-page.component.html',
+  styleUrls: ['./notifications-suggestion-targets-page.component.scss'],
+})
+export class NotificationsSuggestionTargetsPageComponent {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.html b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.html
new file mode 100644
index 0000000000..315209d342
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.html
@@ -0,0 +1 @@
+<ds-quality-assurance-events></ds-quality-assurance-events>
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
new file mode 100644
index 0000000000..7915c8d7e6
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.spec.ts
@@ -0,0 +1,31 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { QualityAssuranceEventsPageComponent } from './quality-assurance-events-page.component';
+
+describe('QualityAssuranceEventsPageComponent', () => {
+  let component: QualityAssuranceEventsPageComponent;
+  let fixture: ComponentFixture<QualityAssuranceEventsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ QualityAssuranceEventsPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(QualityAssuranceEventsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create AdminQualityAssuranceEventsPageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts
new file mode 100644
index 0000000000..9959f1190d
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component for the page that show the QA events related to a specific topic.
+ */
+@Component({
+  selector: 'ds-quality-assurance-events-page',
+  templateUrl: './quality-assurance-events-page.component.html',
+})
+export class QualityAssuranceEventsPageComponent {
+
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts
new file mode 100644
index 0000000000..6feaa4ac1d
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-events-page/quality-assurance-events-page.resolver.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface AssuranceEventsPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class QualityAssuranceEventsPageResolver implements Resolve<AssuranceEventsPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminQualityAssuranceEventsPageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): AssuranceEventsPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts
new file mode 100644
index 0000000000..5228a77b62
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-data.resolver.ts
@@ -0,0 +1,54 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceSourceService } from '../../notifications/qa/source/quality-assurance-source.service';
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class SourceDataResolver implements Resolve<Observable<QualityAssuranceSourceObject[]>> {
+  private  pageSize = environment.qualityAssuranceConfig.pageSize;
+  /**
+   * Initialize the effect class variables.
+   * @param {QualityAssuranceSourceService} qualityAssuranceSourceService
+   */
+  constructor(
+    private qualityAssuranceSourceService: QualityAssuranceSourceService,
+    private router: Router,
+  ) { }
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<QualityAssuranceSourceObject[]>
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<QualityAssuranceSourceObject[]> {
+    return this.qualityAssuranceSourceService.getSources(this.pageSize, 0).pipe(
+      map((sources: PaginatedList<QualityAssuranceSourceObject>) => {
+        if (sources.page.length === 1) {
+          this.router.navigate([this.getResolvedUrl(route) + '/' + sources.page[0].id]);
+        }
+        return sources.page;
+      }));
+  }
+
+  /**
+   *
+   * @param route url path
+   * @returns url path
+   */
+  getResolvedUrl(route: ActivatedRouteSnapshot): string {
+    return route.pathFromRoot.map(v => v.url.map(segment => segment.toString()).join('/')).join('/');
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts
new file mode 100644
index 0000000000..55278f86d5
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page-resolver.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface QualityAssuranceSourcePageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class QualityAssuranceSourcePageResolver implements Resolve<QualityAssuranceSourcePageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminQualityAssuranceSourcePageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): QualityAssuranceSourcePageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.html b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.html
new file mode 100644
index 0000000000..709103cf3d
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.html
@@ -0,0 +1 @@
+<ds-quality-assurance-source></ds-quality-assurance-source>
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.spec.ts
new file mode 100644
index 0000000000..3a89aaa385
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.spec.ts
@@ -0,0 +1,30 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { QualityAssuranceSourcePageComponent } from './quality-assurance-source-page.component';
+
+describe('QualityAssuranceSourcePageComponent', () => {
+  let component: QualityAssuranceSourcePageComponent;
+  let fixture: ComponentFixture<QualityAssuranceSourcePageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ QualityAssuranceSourcePageComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(QualityAssuranceSourcePageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create QualityAssuranceSourcePageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.ts
new file mode 100644
index 0000000000..f066364708
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-source-page-component/quality-assurance-source-page.component.ts
@@ -0,0 +1,10 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component for the page that show the QA sources.
+ */
+@Component({
+  selector: 'ds-quality-assurance-source-page-component',
+  templateUrl: './quality-assurance-source-page.component.html',
+})
+export class QualityAssuranceSourcePageComponent {}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts
new file mode 100644
index 0000000000..b8f2cda536
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page-resolver.service.ts
@@ -0,0 +1,36 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+
+/**
+ * Interface for the route parameters.
+ */
+export interface QualityAssuranceTopicsPageParams {
+  pageId?: string;
+  pageSize?: number;
+  currentPage?: number;
+}
+
+/**
+ * This class represents a resolver that retrieve the route data before the route is activated.
+ */
+@Injectable()
+export class QualityAssuranceTopicsPageResolver implements Resolve<QualityAssuranceTopicsPageParams> {
+
+  /**
+   * Method for resolving the parameters in the current route.
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns AdminQualityAssuranceTopicsPageParams Emits the route parameters
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): QualityAssuranceTopicsPageParams {
+    return {
+      pageId: route.queryParams.pageId,
+      pageSize: parseInt(route.queryParams.pageSize, 10),
+      currentPage: parseInt(route.queryParams.page, 10),
+    };
+  }
+}
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.html b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.html
new file mode 100644
index 0000000000..fc905ad724
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.html
@@ -0,0 +1 @@
+<ds-quality-assurance-topic></ds-quality-assurance-topic>
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
new file mode 100644
index 0000000000..c95f8cc8ec
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.spec.ts
@@ -0,0 +1,31 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { QualityAssuranceTopicsPageComponent } from './quality-assurance-topics-page.component';
+
+describe('QualityAssuranceTopicsPageComponent', () => {
+  let component: QualityAssuranceTopicsPageComponent;
+  let fixture: ComponentFixture<QualityAssuranceTopicsPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ QualityAssuranceTopicsPageComponent ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(QualityAssuranceTopicsPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create QualityAssuranceTopicsPageComponent', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.ts b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.ts
new file mode 100644
index 0000000000..5db1d3de02
--- /dev/null
+++ b/src/app/quality-assurance-notifications-pages/quality-assurance-topics-page/quality-assurance-topics-page.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+/**
+ * Component for the page that show the QA topics related to a specific source.
+ */
+@Component({
+  selector: 'ds-notification-qa-page',
+  templateUrl: './quality-assurance-topics-page.component.html',
+})
+export class QualityAssuranceTopicsPageComponent {
+
+}
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 cc0ce4c782..235932bdd2 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -1,7 +1,11 @@
 <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">
+      {{ MESSAGE_PREFIX + '.info.maildomain' | translate}} {{ validMailDomains.join(', ')}}
+    </p>
+
     <form [class]="'ng-invalid'" [formGroup]="form">
 
         <div class="form-group">
@@ -16,8 +20,11 @@
                     <span *ngIf="email.errors && email.errors.required">
                         {{ MESSAGE_PREFIX + '.email.error.required' | translate }}
                     </span>
-                    <span *ngIf="email.errors && email.errors.pattern">
-                        {{ MESSAGE_PREFIX + '.email.error.pattern' | translate }}
+                    <span *ngIf="email.errors && ((email.errors.pattern && this.typeRequest === TYPE_REQUEST_REGISTER) || email.errors.email)">
+                        {{ 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(', ') } }}
+                        </ng-container>
                     </span>
                     </div>
                 </div>
@@ -40,7 +47,7 @@
                            (showNotification)="showNotification($event)"></ds-google-recaptcha>
     </div>
 
-    <ng-container *ngIf="!((googleRecaptchaService.captchaVersion() | async) === 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'); else v2Invisible">
+    <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()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
@@ -53,5 +60,4 @@
     </ng-template>
     </form>
 
-
 </div>
diff --git a/src/app/register-email-form/register-email-form.component.spec.ts b/src/app/register-email-form/register-email-form.component.spec.ts
index bac922c73b..5a5b692c10 100644
--- a/src/app/register-email-form/register-email-form.component.spec.ts
+++ b/src/app/register-email-form/register-email-form.component.spec.ts
@@ -1,25 +1,43 @@
-import { waitForAsync, ComponentFixture, TestBed, tick, fakeAsync } from '@angular/core/testing';
-import { of as observableOf, of } from 'rxjs';
-import { RestResponse } from '../core/cache/response.models';
 import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { By } from '@angular/platform-browser';
-import { RouterStub } from '../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
-import { RegisterEmailFormComponent } from './register-email-form.component';
-import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
+
+import { RestResponse } from '../core/cache/response.models';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { GoogleRecaptchaService } from '../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../core/services/cookie.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { CookieServiceMock } from '../shared/mocks/cookie.service.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import {
+  RegisterEmailFormComponent,
+  TYPE_REQUEST_FORGOT,
+  TYPE_REQUEST_REGISTER,
+} from './register-email-form.component';
 
-describe('RegisterEmailComponent', () => {
+describe('RegisterEmailFormComponent', () => {
 
   let comp: RegisterEmailFormComponent;
   let fixture: ComponentFixture<RegisterEmailFormComponent>;
@@ -29,7 +47,7 @@ describe('RegisterEmailComponent', () => {
   let notificationsService;
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: jasmine.createSpy('findByPropertyName')
+    findByPropertyName: jasmine.createSpy('findByPropertyName'),
   });
 
   const captchaVersion$ = of('v3');
@@ -50,22 +68,24 @@ describe('RegisterEmailComponent', () => {
     notificationsService = new NotificationsServiceStub();
 
     epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
-      registerEmail: createSuccessfulRemoteDataObject$({})
+      registerEmail: createSuccessfulRemoteDataObject$({}),
     });
 
+    jasmine.getEnv().allowRespy(true);
+
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [RegisterEmailFormComponent],
       providers: [
-        {provide: Router, useValue: router},
-        {provide: EpersonRegistrationService, useValue: epersonRegistrationService},
-        {provide: ConfigurationDataService, useValue: configurationDataService},
-        {provide: FormBuilder, useValue: new FormBuilder()},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: CookieService, useValue: new CookieServiceMock()},
-        {provide: GoogleRecaptchaService, useValue: googleRecaptchaService},
+        { provide: Router, useValue: router },
+        { provide: EpersonRegistrationService, useValue: epersonRegistrationService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: CookieService, useValue: new CookieServiceMock() },
+        { provide: GoogleRecaptchaService, useValue: googleRecaptchaService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -88,30 +108,70 @@ describe('RegisterEmailComponent', () => {
       expect(comp.form.invalid).toBeTrue();
     });
     it('should be invalid when no valid email is present', () => {
-      comp.form.patchValue({email: 'invalid'});
+      comp.form.patchValue({ email: 'invalid' });
       expect(comp.form.invalid).toBeTrue();
     });
     it('should be valid when a valid email is present', () => {
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
+      expect(comp.form.invalid).toBeFalse();
+    });
+    it('should accept email with other domain names on TYPE_REQUEST_FORGOT form', () => {
+      spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'authentication-password.domain.valid',
+        values: ['marvel.com'],
+      })));
+      comp.typeRequest = TYPE_REQUEST_FORGOT;
+
+      comp.ngOnInit();
+
+      comp.form.patchValue({ email: 'valid@email.org' });
+      expect(comp.form.invalid).toBeFalse();
+    });
+    it('should be valid when uppercase letters are used', () => {
+      comp.form.patchValue({ email: 'VALID@email.org' });
+      expect(comp.form.invalid).toBeFalse();
+    });
+    it('should not accept email with other domain names', () => {
+      spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'authentication-password.domain.valid',
+        values: ['marvel.com'],
+      })));
+      comp.typeRequest = TYPE_REQUEST_REGISTER;
+
+      comp.ngOnInit();
+
+      comp.form.patchValue({ email: 'valid@email.org' });
+      expect(comp.form.invalid).toBeTrue();
+    });
+    it('should accept email with the given domain name', () => {
+      spyOn(configurationDataService, 'findByPropertyName').and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'authentication-password.domain.valid',
+        values: ['marvel.com'],
+      })));
+      comp.typeRequest = TYPE_REQUEST_REGISTER;
+
+      comp.ngOnInit();
+
+      comp.form.patchValue({ email: 'thor.odinson@marvel.com' });
       expect(comp.form.invalid).toBeFalse();
     });
   });
   describe('register', () => {
     it('should send a registration to the service and on success display a message and return to home', () => {
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
 
       comp.register();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null, null);
       expect(notificationsService.success).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalledWith(['/home']);
     });
     it('should send a registration to the service and on error display a message', () => {
       (epersonRegistrationService.registerEmail as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 400, 'Bad Request')));
 
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
 
       comp.register();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', null, null);
       expect(notificationsService.error).toHaveBeenCalled();
       expect(router.navigate).not.toHaveBeenCalled();
     });
@@ -126,21 +186,21 @@ describe('RegisterEmailComponent', () => {
     }));
 
     it('should send a registration to the service and on success display a message and return to home', fakeAsync(() => {
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
       comp.register();
       tick();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken', null);
       expect(notificationsService.success).toHaveBeenCalled();
       expect(router.navigate).toHaveBeenCalledWith(['/home']);
     }));
     it('should send a registration to the service and on error display a message', fakeAsync(() => {
       (epersonRegistrationService.registerEmail as jasmine.Spy).and.returnValue(observableOf(new RestResponse(false, 400, 'Bad Request')));
 
-      comp.form.patchValue({email: 'valid@email.org'});
+      comp.form.patchValue({ email: 'valid@email.org' });
 
       comp.register();
       tick();
-      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken');
+      expect(epersonRegistrationService.registerEmail).toHaveBeenCalledWith('valid@email.org', 'googleRecaptchaToken', null);
       expect(notificationsService.error).toHaveBeenCalled();
       expect(router.navigate).not.toHaveBeenCalled();
     }));
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 ced87b9e75..a16a37dc8b 100644
--- a/src/app/register-email-form/register-email-form.component.ts
+++ b/src/app/register-email-form/register-email-form.component.ts
@@ -1,41 +1,81 @@
-import { ChangeDetectorRef, Component, Input, OnInit, Optional } from '@angular/core';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+  Optional,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  ValidatorFn,
+  Validators,
+} from '@angular/forms';
 import { Router } from '@angular/router';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { Registration } from '../core/shared/registration.model';
-import { RemoteData } from '../core/data/remote-data';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  of,
+  Subscription,
+  switchMap,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  take,
+} from 'rxjs/operators';
+
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
-import { ConfigurationProperty } from '../core/shared/configuration-property.model';
-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 { KlaroService } from '../shared/cookies/klaro.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { RemoteData } from '../core/data/remote-data';
+import {
+  CAPTCHA_NAME,
+  GoogleRecaptchaService,
+} from '../core/google-recaptcha/google-recaptcha.service';
 import { CookieService } from '../core/services/cookie.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+} from '../core/shared/operators';
+import { Registration } from '../core/shared/registration.model';
+import { AlertType } from '../shared/alert/alert-type';
+import { KlaroService } from '../shared/cookies/klaro.service';
+import { isNotEmpty } from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+
+export const TYPE_REQUEST_FORGOT = 'forgot';
+export const TYPE_REQUEST_REGISTER = 'register';
 
 @Component({
   selector: 'ds-register-email-form',
-  templateUrl: './register-email-form.component.html'
+  templateUrl: './register-email-form.component.html',
 })
 /**
  * Component responsible to render an email registration form.
  */
-export class RegisterEmailFormComponent implements OnInit {
+export class RegisterEmailFormComponent implements OnDestroy, OnInit {
 
   /**
    * The form containing the mail address
    */
-  form: FormGroup;
+  form: UntypedFormGroup;
 
   /**
    * The message prefix
    */
   @Input()
-  MESSAGE_PREFIX: string;
+    MESSAGE_PREFIX: string;
+
+  /**
+   * Type of register request to be done, register new email or forgot password (same endpoint)
+   */
+  @Input()
+    typeRequest: string = null;
 
   public AlertTypeEnum = AlertType;
 
@@ -51,6 +91,11 @@ export class RegisterEmailFormComponent implements OnInit {
 
   disableUntilChecked = true;
 
+  validMailDomains: string[];
+  TYPE_REQUEST_REGISTER = TYPE_REQUEST_REGISTER;
+
+  subscriptions: Subscription[] = [];
+
   captchaVersion(): Observable<string> {
     return this.googleRecaptchaService.captchaVersion();
   }
@@ -64,7 +109,7 @@ export class RegisterEmailFormComponent implements OnInit {
     private notificationService: NotificationsService,
     private translateService: TranslateService,
     private router: Router,
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private configService: ConfigurationDataService,
     public googleRecaptchaService: GoogleRecaptchaService,
     public cookieService: CookieService,
@@ -72,29 +117,54 @@ export class RegisterEmailFormComponent implements OnInit {
     private changeDetectorRef: ChangeDetectorRef,
     private notificationsService: NotificationsService,
   ) {
+  }
 
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((sub: Subscription) => sub.unsubscribe());
   }
 
   ngOnInit(): void {
+    const validators: ValidatorFn[] = [
+      Validators.required,
+      Validators.email,
+      // Regex pattern borrowed from HTML5 specs for a valid email address:
+      // https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
+      Validators.pattern('^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$'),
+    ];
     this.form = this.formBuilder.group({
-      email: new FormControl('', {
-        validators: [Validators.required,
-          Validators.pattern('^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$')
-        ],
-      })
+      email: new UntypedFormControl('', {
+        validators: validators,
+      }),
     });
-    this.configService.findByPropertyName('registration.verification.enabled').pipe(
+    this.validMailDomains = [];
+    if (this.typeRequest === TYPE_REQUEST_REGISTER) {
+      this.subscriptions.push(this.configService.findByPropertyName('authentication-password.domain.valid')
+        .pipe(getAllSucceededRemoteDataPayload())
+        .subscribe((remoteData: ConfigurationProperty) => {
+          this.validMailDomains = remoteData.values;
+          for (const remoteValue of remoteData.values) {
+            if (this.validMailDomains.length !== 0) {
+              this.form.get('email').setValidators([
+                ...validators,
+                Validators.pattern(this.validMailDomains.map((domain: string) => '(^.*' + domain.replace(new RegExp('\\.', 'g'), '\\.') + '$)').join('|')),
+              ]);
+              this.form.updateValueAndValidity();
+            }
+          }
+          this.changeDetectorRef.detectChanges();
+        }));
+    }
+    this.subscriptions.push(this.configService.findByPropertyName('registration.verification.enabled').pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true')
+      map((res: ConfigurationProperty) => res?.values[0].toLowerCase() === 'true'),
     ).subscribe((res: boolean) => {
       this.registrationVerification = res;
-    });
+    }));
 
-    this.disableUntilCheckedFcn().subscribe((res) => {
+    this.subscriptions.push(this.disableUntilCheckedFcn().subscribe((res) => {
       this.disableUntilChecked = res;
       this.changeDetectorRef.detectChanges();
-    });
-
+    }));
   }
 
   /**
@@ -110,7 +180,7 @@ export class RegisterEmailFormComponent implements OnInit {
   register(tokenV2?) {
     if (!this.form.invalid) {
       if (this.registrationVerification) {
-        combineLatest([this.captchaVersion(), this.captchaMode()]).pipe(
+        this.subscriptions.push(combineLatest([this.captchaVersion(), this.captchaMode()]).pipe(
           switchMap(([captchaVersion, captchaMode])  => {
             if (captchaVersion === 'v3') {
               return this.googleRecaptchaService.getRecaptchaToken('register_email');
@@ -125,14 +195,14 @@ export class RegisterEmailFormComponent implements OnInit {
           }),
           take(1),
         ).subscribe((token) => {
-            if (isNotEmpty(token)) {
-              this.registration(token);
-            } else {
-              console.error('reCaptcha error');
-              this.showNotification('error');
-            }
+          if (isNotEmpty(token)) {
+            this.registration(token);
+          } else {
+            console.error('reCaptcha error');
+            this.showNotification('error');
           }
-        );
+        },
+        ));
       } else {
         this.registration();
       }
@@ -143,19 +213,21 @@ export class RegisterEmailFormComponent implements OnInit {
    * Registration of an email address
    */
   registration(captchaToken = null) {
-    let registerEmail$ = captchaToken ?
-      this.epersonRegistrationService.registerEmail(this.email.value, captchaToken) :
-      this.epersonRegistrationService.registerEmail(this.email.value);
-    registerEmail$.subscribe((response: RemoteData<Registration>) => {
+    const registerEmail$ = captchaToken ?
+      this.epersonRegistrationService.registerEmail(this.email.value, captchaToken, this.typeRequest) :
+      this.epersonRegistrationService.registerEmail(this.email.value, null, this.typeRequest);
+    this.subscriptions.push(registerEmail$.subscribe((response: RemoteData<Registration>) => {
       if (response.hasSucceeded) {
         this.notificationService.success(this.translateService.get(`${this.MESSAGE_PREFIX}.success.head`),
-          this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, {email: this.email.value}));
+          this.translateService.get(`${this.MESSAGE_PREFIX}.success.content`, { email: this.email.value }));
         this.router.navigate(['/home']);
+      } else if (response.statusCode === 422) {
+        this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`), this.translateService.get(`${this.MESSAGE_PREFIX}.error.maildomain`, { domains: this.validMailDomains.join(', ') }));
       } else {
         this.notificationService.error(this.translateService.get(`${this.MESSAGE_PREFIX}.error.head`),
-          this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, {email: this.email.value}));
+          this.translateService.get(`${this.MESSAGE_PREFIX}.error.content`, { email: this.email.value }));
       }
-    });
+    }));
   }
 
   /**
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..db15606cd7 100644
--- a/src/app/register-email-form/register-email-form.module.ts
+++ b/src/app/register-email-form/register-email-form.module.ts
@@ -1,20 +1,27 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 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: [
     CommonModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
-    RegisterEmailFormComponent,
+    ...DECLARATIONS,
   ],
   providers: [],
   exports: [
-    RegisterEmailFormComponent,
-  ]
+    ...DECLARATIONS,
+  ],
 })
 
 /**
diff --git a/src/app/register-email-form/registration.resolver.spec.ts b/src/app/register-email-form/registration.resolver.spec.ts
index 86b200018d..e286a548de 100644
--- a/src/app/register-email-form/registration.resolver.spec.ts
+++ b/src/app/register-email-form/registration.resolver.spec.ts
@@ -1,25 +1,26 @@
-import { RegistrationResolver } from './registration.resolver';
+import { first } from 'rxjs/operators';
+
 import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { Registration } from '../core/shared/registration.model';
-import { first } from 'rxjs/operators';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { RegistrationResolver } from './registration.resolver';
 
 describe('RegistrationResolver', () => {
   let resolver: RegistrationResolver;
   let epersonRegistrationService: EpersonRegistrationService;
 
   const token = 'test-token';
-  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: token, user:'user-uuid'});
+  const registration = Object.assign(new Registration(), { email: 'test@email.org', token: token, user:'user-uuid' });
 
   beforeEach(() => {
     epersonRegistrationService = jasmine.createSpyObj('epersonRegistrationService', {
-      searchByToken: createSuccessfulRemoteDataObject$(registration)
+      searchByToken: createSuccessfulRemoteDataObject$(registration),
     });
     resolver = new RegistrationResolver(epersonRegistrationService);
   });
   describe('resolve', () => {
     it('should resolve a registration based on the token', (done) => {
-      resolver.resolve({params: {token: token}} as any, undefined)
+      resolver.resolve({ params: { token: token } } as any, undefined)
         .pipe(first())
         .subscribe(
           (resolved) => {
@@ -27,7 +28,7 @@ describe('RegistrationResolver', () => {
             expect(resolved.payload.email).toEqual('test@email.org');
             expect(resolved.payload.user).toEqual('user-uuid');
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/register-email-form/registration.resolver.ts b/src/app/register-email-form/registration.resolver.ts
index 498d029492..ac374e3845 100644
--- a/src/app/register-email-form/registration.resolver.ts
+++ b/src/app/register-email-form/registration.resolver.ts
@@ -1,10 +1,15 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { Registration } from '../core/shared/registration.model';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { RemoteData } from '../core/data/remote-data';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { Registration } from '../core/shared/registration.model';
 
 @Injectable()
 /**
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..d24ff25b21
--- /dev/null
+++ b/src/app/register-email-form/themed-registry-email-form.component.ts
@@ -0,0 +1,40 @@
+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/confirmed.validator.spec.ts b/src/app/register-page/create-profile/confirmed.validator.spec.ts
index 1be6aaf58f..c7d412f394 100644
--- a/src/app/register-page/create-profile/confirmed.validator.spec.ts
+++ b/src/app/register-page/create-profile/confirmed.validator.spec.ts
@@ -1,5 +1,12 @@
-import { FormBuilder, FormControl } from '@angular/forms';
-import { fakeAsync, waitForAsync } from '@angular/core/testing';
+import {
+  fakeAsync,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+} from '@angular/forms';
+
 import { ConfirmedValidator } from './confirmed.validator';
 
 describe('ConfirmedValidator', () => {
@@ -7,11 +14,11 @@ describe('ConfirmedValidator', () => {
 
   beforeEach(waitForAsync(() => {
 
-    passwordForm = (new FormBuilder()).group({
-      password: new FormControl('', {}),
-      confirmPassword: new FormControl('', {})
+    passwordForm = (new UntypedFormBuilder()).group({
+      password: new UntypedFormControl('', {}),
+      confirmPassword: new UntypedFormControl('', {}),
     }, {
-      validator: ConfirmedValidator('password', 'confirmPassword')
+      validator: ConfirmedValidator('password', 'confirmPassword'),
     });
   }));
 
diff --git a/src/app/register-page/create-profile/confirmed.validator.ts b/src/app/register-page/create-profile/confirmed.validator.ts
index 30f4f01701..730e1d00b6 100644
--- a/src/app/register-page/create-profile/confirmed.validator.ts
+++ b/src/app/register-page/create-profile/confirmed.validator.ts
@@ -1,17 +1,17 @@
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
 
 /**
  * Validator used to confirm that the password and confirmed password value are the same
  */
 export function ConfirmedValidator(controlName: string, matchingControlName: string) {
-  return (formGroup: FormGroup) => {
+  return (formGroup: UntypedFormGroup) => {
     const control = formGroup.controls[controlName];
     const matchingControl = formGroup.controls[matchingControlName];
     if (matchingControl.errors && !matchingControl.errors.confirmedValidator) {
       return;
     }
     if (control.value !== matchingControl.value) {
-      matchingControl.setErrors({confirmedValidator: true});
+      matchingControl.setErrors({ confirmedValidator: true });
     } else {
       matchingControl.setErrors(null);
     }
diff --git a/src/app/register-page/create-profile/create-profile.component.spec.ts b/src/app/register-page/create-profile/create-profile.component.spec.ts
index 026785e59b..85178318d6 100644
--- a/src/app/register-page/create-profile/create-profile.component.spec.ts
+++ b/src/app/register-page/create-profile/create-profile.component.spec.ts
@@ -1,31 +1,42 @@
-import { CreateProfileComponent } from './create-profile.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Registration } from '../../core/shared/registration.model';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { Store } from '@ngrx/store';
-import { FormBuilder, ReactiveFormsModule } from '@angular/forms';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AuthenticateAction } from '../../core/auth/auth.actions';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { CoreState } from '../../core/core-state.model';
 import {
   END_USER_AGREEMENT_METADATA_FIELD,
-  EndUserAgreementService
+  EndUserAgreementService,
 } from '../../core/end-user-agreement/end-user-agreement.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Registration } from '../../core/shared/registration.model';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { CoreState } from '../../core/core-state.model';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { CreateProfileComponent } from './create-profile.component';
 
 describe('CreateProfileComponent', () => {
   let comp: CreateProfileComponent;
@@ -38,7 +49,7 @@ describe('CreateProfileComponent', () => {
   let store: Store<CoreState>;
   let endUserAgreementService: EndUserAgreementService;
 
-  const registration = Object.assign(new Registration(), {email: 'test@email.org', token: 'test-token'});
+  const registration = Object.assign(new Registration(), { email: 'test@email.org', token: 'test-token' });
 
   let values;
   let eperson: EPerson;
@@ -50,72 +61,72 @@ describe('CreateProfileComponent', () => {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'First'
-          }
-        ],
-          'eperson.lastname': [
-          {
-            value: 'Last'
+            value: 'First',
           },
         ],
-          'eperson.phone': [
+        'eperson.lastname': [
           {
-            value: 'Phone'
-          }
+            value: 'Last',
+          },
         ],
-          'eperson.language': [
+        'eperson.phone': [
           {
-            value: 'en'
-          }
-        ]
+            value: 'Phone',
+          },
+        ],
+        'eperson.language': [
+          {
+            value: 'en',
+          },
+        ],
       },
       email: 'test@email.org',
-        password: 'password',
+      password: 'password',
       canLogIn: true,
-      requireCertificate: false
+      requireCertificate: false,
     };
     eperson = Object.assign(new EPerson(), values);
     valuesWithAgreement = {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'First'
-          }
+            value: 'First',
+          },
         ],
         'eperson.lastname': [
           {
-            value: 'Last'
+            value: 'Last',
           },
         ],
         'eperson.phone': [
           {
-            value: 'Phone'
-          }
+            value: 'Phone',
+          },
         ],
         'eperson.language': [
           {
-            value: 'en'
-          }
+            value: 'en',
+          },
         ],
         [END_USER_AGREEMENT_METADATA_FIELD]: [
           {
-            value: 'true'
-          }
-        ]
+            value: 'true',
+          },
+        ],
       },
       email: 'test@email.org',
       password: 'password',
       canLogIn: true,
-      requireCertificate: false
+      requireCertificate: false,
     };
     epersonWithAgreement = Object.assign(new EPerson(), valuesWithAgreement);
 
-    route = {data: observableOf({registration: createSuccessfulRemoteDataObject(registration)})};
+    route = { data: observableOf({ registration: createSuccessfulRemoteDataObject(registration) }) };
     router = new RouterStub();
     notificationsService = new NotificationsServiceStub();
 
     ePersonDataService = jasmine.createSpyObj('ePersonDataService', {
-      createEPersonForToken: createSuccessfulRemoteDataObject$({})
+      createEPersonForToken: createSuccessfulRemoteDataObject$({}),
     });
 
     store = jasmine.createSpyObj('store', {
@@ -124,22 +135,22 @@ describe('CreateProfileComponent', () => {
 
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
       isCookieAccepted: false,
-      removeCookieAccepted: {}
+      removeCookieAccepted: {},
     });
 
     TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [CreateProfileComponent],
       providers: [
-        {provide: Router, useValue: router},
-        {provide: ActivatedRoute, useValue: route},
-        {provide: Store, useValue: store},
-        {provide: EPersonDataService, useValue: ePersonDataService},
-        {provide: FormBuilder, useValue: new FormBuilder()},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: EndUserAgreementService, useValue: endUserAgreementService},
+        { provide: Router, useValue: router },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Store, useValue: store },
+        { provide: EPersonDataService, useValue: ePersonDataService },
+        { provide: UntypedFormBuilder, useValue: new UntypedFormBuilder() },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: EndUserAgreementService, useValue: endUserAgreementService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/register-page/create-profile/create-profile.component.ts b/src/app/register-page/create-profile/create-profile.component.ts
index 0e8e0e8742..de144464f3 100644
--- a/src/app/register-page/create-profile/create-profile.component.ts
+++ b/src/app/register-page/create-profile/create-profile.component.ts
@@ -1,25 +1,40 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map } from 'rxjs/operators';
-import { Registration } from '../../core/shared/registration.model';
-import { Observable } from 'rxjs';
-import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms';
-import { TranslateService } from '@ngx-translate/core';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { LangConfig } from '../../../config/lang-config.interface';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Store } from '@ngrx/store';
-import { AuthenticateAction } from '../../core/auth/auth.actions';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { LangConfig } from '../../../config/lang-config.interface';
 import { environment } from '../../../environments/environment';
-import { isEmpty } from '../../shared/empty.util';
+import { AuthenticateAction } from '../../core/auth/auth.actions';
+import { CoreState } from '../../core/core-state.model';
 import { RemoteData } from '../../core/data/remote-data';
 import {
   END_USER_AGREEMENT_METADATA_FIELD,
-  EndUserAgreementService
+  EndUserAgreementService,
 } from '../../core/end-user-agreement/end-user-agreement.service';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { CoreState } from '../../core/core-state.model';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { Registration } from '../../core/shared/registration.model';
+import { isEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 
 /**
  * Component that renders the create profile page to be used by a user registering through a token
@@ -27,7 +42,7 @@ import { CoreState } from '../../core/core-state.model';
 @Component({
   selector: 'ds-create-profile',
   styleUrls: ['./create-profile.component.scss'],
-  templateUrl: './create-profile.component.html'
+  templateUrl: './create-profile.component.html',
 })
 export class CreateProfileComponent implements OnInit {
   registration$: Observable<Registration>;
@@ -38,7 +53,7 @@ export class CreateProfileComponent implements OnInit {
   isInValidPassword = true;
   password: string;
 
-  userInfoForm: FormGroup;
+  userInfoForm: UntypedFormGroup;
   activeLangs: LangConfig[];
 
   /**
@@ -52,9 +67,9 @@ export class CreateProfileComponent implements OnInit {
     private store: Store<CoreState>,
     private router: Router,
     private route: ActivatedRoute,
-    private formBuilder: FormBuilder,
+    private formBuilder: UntypedFormBuilder,
     private notificationsService: NotificationsService,
-    private endUserAgreementService: EndUserAgreementService
+    private endUserAgreementService: EndUserAgreementService,
   ) {
 
   }
@@ -71,14 +86,14 @@ export class CreateProfileComponent implements OnInit {
     this.activeLangs = environment.languages.filter((MyLangConfig) => MyLangConfig.active === true);
 
     this.userInfoForm = this.formBuilder.group({
-      firstName: new FormControl('', {
+      firstName: new UntypedFormControl('', {
         validators: [Validators.required],
       }),
-      lastName: new FormControl('', {
+      lastName: new UntypedFormControl('', {
         validators: [Validators.required],
       }),
-      contactPhone: new FormControl(''),
-      language: new FormControl(''),
+      contactPhone: new UntypedFormControl(''),
+      language: new UntypedFormControl(''),
     });
 
   }
@@ -126,37 +141,37 @@ export class CreateProfileComponent implements OnInit {
         metadata: {
           'eperson.firstname': [
             {
-              value: this.firstName.value
-            }
+              value: this.firstName.value,
+            },
           ],
           'eperson.lastname': [
             {
-              value: this.lastName.value
+              value: this.lastName.value,
             },
           ],
           'eperson.phone': [
             {
-              value: this.contactPhone.value
-            }
+              value: this.contactPhone.value,
+            },
           ],
           'eperson.language': [
             {
-              value: this.language.value
-            }
-          ]
+              value: this.language.value,
+            },
+          ],
         },
         email: this.email,
         password: this.password,
         canLogIn: true,
-        requireCertificate: false
+        requireCertificate: false,
       };
 
       // If the End User Agreement cookie is accepted, add end-user agreement metadata to the user
       if (this.endUserAgreementService.isCookieAccepted()) {
         values.metadata[END_USER_AGREEMENT_METADATA_FIELD] = [
           {
-            value: String(true)
-          }
+            value: String(true),
+          },
         ];
         this.endUserAgreementService.removeCookieAccepted();
       }
diff --git a/src/app/register-page/create-profile/themed-create-profile.component.ts b/src/app/register-page/create-profile/themed-create-profile.component.ts
index cc968bfbe2..6d895368cc 100644
--- a/src/app/register-page/create-profile/themed-create-profile.component.ts
+++ b/src/app/register-page/create-profile/themed-create-profile.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { CreateProfileComponent } from './create-profile.component';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { CreateProfileComponent } from './create-profile.component';
 
 /**
  * Themed wrapper for CreateProfileComponent
@@ -8,7 +9,7 @@ import { ThemedComponent } from '../../shared/theme-support/themed.component';
 @Component({
   selector: 'ds-themed-create-profile',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedCreateProfileComponent extends ThemedComponent<CreateProfileComponent> {
   protected getComponentName(): string {
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 a60dc4c31e..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
-        [MESSAGE_PREFIX]="'register-page.registration'">
-</ds-register-email-form>
+<ds-themed-register-email-form
+        [MESSAGE_PREFIX]="'register-page.registration'" [typeRequest]="typeRequest">
+</ds-themed-register-email-form>
diff --git a/src/app/register-page/register-email/register-email.component.spec.ts b/src/app/register-page/register-email/register-email.component.spec.ts
index 17ef8101ae..d9aa440ccb 100644
--- a/src/app/register-page/register-email/register-email.component.spec.ts
+++ b/src/app/register-page/register-email/register-email.component.spec.ts
@@ -1,8 +1,13 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { ReactiveFormsModule } from '@angular/forms';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { RegisterEmailComponent } from './register-email.component';
 
 describe('RegisterEmailComponent', () => {
@@ -14,7 +19,7 @@ describe('RegisterEmailComponent', () => {
     TestBed.configureTestingModule({
       imports: [CommonModule, TranslateModule.forRoot(), ReactiveFormsModule],
       declarations: [RegisterEmailComponent],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/register-page/register-email/register-email.component.ts b/src/app/register-page/register-email/register-email.component.ts
index 7b7b0f631b..8ecfcca61b 100644
--- a/src/app/register-page/register-email/register-email.component.ts
+++ b/src/app/register-page/register-email/register-email.component.ts
@@ -1,13 +1,15 @@
 import { Component } from '@angular/core';
 
+import { TYPE_REQUEST_REGISTER } from '../../register-email-form/register-email-form.component';
+
 @Component({
   selector: 'ds-register-email',
   styleUrls: ['./register-email.component.scss'],
-  templateUrl: './register-email.component.html'
+  templateUrl: './register-email.component.html',
 })
 /**
  * Component responsible the email registration step when registering as a new user
  */
 export class RegisterEmailComponent {
-
+  typeRequest = TYPE_REQUEST_REGISTER;
 }
diff --git a/src/app/register-page/register-email/themed-register-email.component.ts b/src/app/register-page/register-email/themed-register-email.component.ts
index 6da6899d99..deaed25193 100644
--- a/src/app/register-page/register-email/themed-register-email.component.ts
+++ b/src/app/register-page/register-email/themed-register-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { RegisterEmailComponent } from './register-email.component';
 
diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts
index 31a7681851..64200a45f4 100644
--- a/src/app/register-page/register-page-routing.module.ts
+++ b/src/app/register-page/register-page-routing.module.ts
@@ -1,9 +1,10 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
-import { ItemPageResolver } from '../item-page/item-page.resolver';
+
 import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard';
+import { ItemPageResolver } from '../item-page/item-page.resolver';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
+import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
 import { RegistrationGuard } from './registration.guard';
 
 @NgModule({
@@ -12,7 +13,7 @@ import { RegistrationGuard } from './registration.guard';
       {
         path: '',
         component: ThemedRegisterEmailComponent,
-        data: {title: 'register-email.title'},
+        data: { title: 'register-email.title' },
       },
       {
         path: ':token',
@@ -21,12 +22,12 @@ import { RegistrationGuard } from './registration.guard';
           RegistrationGuard,
           EndUserAgreementCookieGuard,
         ],
-      }
-    ])
+      },
+    ]),
   ],
   providers: [
-    ItemPageResolver
-  ]
+    ItemPageResolver,
+  ],
 })
 /**
  * Module related to the navigation to components used to register a new user
diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts
index 6afb8154ea..4708987dc9 100644
--- a/src/app/register-page/register-page.module.ts
+++ b/src/app/register-page/register-page.module.ts
@@ -1,13 +1,14 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SharedModule } from '../shared/shared.module';
-import { RegisterPageRoutingModule } from './register-page-routing.module';
-import { RegisterEmailComponent } from './register-email/register-email.component';
-import { CreateProfileComponent } from './create-profile/create-profile.component';
-import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { NgModule } from '@angular/core';
+
 import { ProfilePageModule } from '../profile-page/profile-page.module';
+import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module';
+import { SharedModule } from '../shared/shared.module';
+import { CreateProfileComponent } from './create-profile/create-profile.component';
 import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component';
+import { RegisterEmailComponent } from './register-email/register-email.component';
 import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component';
+import { RegisterPageRoutingModule } from './register-page-routing.module';
 
 @NgModule({
   imports: [
@@ -21,9 +22,9 @@ import { ThemedRegisterEmailComponent } from './register-email/themed-register-e
     RegisterEmailComponent,
     ThemedRegisterEmailComponent,
     CreateProfileComponent,
-    ThemedCreateProfileComponent
+    ThemedCreateProfileComponent,
   ],
-  providers: []
+  providers: [],
 })
 
 /**
diff --git a/src/app/register-page/registration.guard.spec.ts b/src/app/register-page/registration.guard.spec.ts
index 89eaff7a02..7ac67895b6 100644
--- a/src/app/register-page/registration.guard.spec.ts
+++ b/src/app/register-page/registration.guard.spec.ts
@@ -1,15 +1,19 @@
-import { RegistrationGuard } from './registration.guard';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { of as observableOf } from 'rxjs';
+
 import { AuthService } from '../core/auth/auth.service';
-import { Location } from '@angular/common';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
+import { RemoteData } from '../core/data/remote-data';
+import { Registration } from '../core/shared/registration.model';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
 } from '../shared/remote-data.utils';
-import { Registration } from '../core/shared/registration.model';
-import { of as observableOf } from 'rxjs/internal/observable/of';
-import { RemoteData } from '../core/data/remote-data';
+import { RegistrationGuard } from './registration.guard';
 
 describe('RegistrationGuard', () => {
   let guard: RegistrationGuard;
diff --git a/src/app/register-page/registration.guard.ts b/src/app/register-page/registration.guard.ts
index a0f07d2fbe..5eac132434 100644
--- a/src/app/register-page/registration.guard.ts
+++ b/src/app/register-page/registration.guard.ts
@@ -1,14 +1,20 @@
-import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/internal/Observable';
-import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
-import { AuthService } from '../core/auth/auth.service';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getFirstCompletedRemoteData } from '../core/shared/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import { EpersonRegistrationService } from '../core/data/eperson-registration.service';
 import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 /**
  * A guard responsible for redirecting to 4xx pages upon retrieving a Registration object
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
index c9e909ccf1..e513212f94 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.html
@@ -3,7 +3,7 @@
   <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
     <p>{{'deny-request-copy.intro' | translate}}</p>
 
-    <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-email-request-copy>
+    <ds-themed-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="deny($event)"></ds-themed-email-request-copy>
   </div>
   <ds-themed-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-themed-loading>
 </div>
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts
index c88bfd3b5e..0c1b4c64c2 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.spec.ts
@@ -1,25 +1,37 @@
-import { DenyRequestCopyComponent } from './deny-request-copy.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../core/auth/auth.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { ItemRequestDataService } from '../../core/data/item-request-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { Item } from '../../core/shared/item.model';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
+import { DenyRequestCopyComponent } from './deny-request-copy.component';
 
 describe('DenyRequestCopyComponent', () => {
   let component: DenyRequestCopyComponent;
@@ -30,7 +42,6 @@ describe('DenyRequestCopyComponent', () => {
   let authService: AuthService;
   let translateService: TranslateService;
   let itemDataService: ItemDataService;
-  let nameService: DSONameService;
   let itemRequestService: ItemRequestDataService;
   let notificationsService: NotificationsService;
 
@@ -43,20 +54,20 @@ describe('DenyRequestCopyComponent', () => {
   beforeEach(waitForAsync(() => {
     itemRequest = Object.assign(new ItemRequest(), {
       token: 'item-request-token',
-      requestName: 'requester name'
+      requestName: 'requester name',
     });
     user = Object.assign(new EPerson(), {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'first'
-          }
+            value: 'first',
+          },
         ],
         'eperson.lastname': [
           {
-            value: 'last'
-          }
-        ]
+            value: 'last',
+          },
+        ],
       },
       email: 'user-email',
     });
@@ -67,15 +78,15 @@ describe('DenyRequestCopyComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: itemUrl
-          }
+            value: itemUrl,
+          },
         ],
         'dc.title': [
           {
-            value: itemName
-          }
-        ]
-      }
+            value: itemName,
+          },
+        ],
+      },
     });
 
     router = jasmine.createSpyObj('router', {
@@ -93,15 +104,12 @@ describe('DenyRequestCopyComponent', () => {
     itemDataService = jasmine.createSpyObj('itemDataService', {
       findById: createSuccessfulRemoteDataObject$(item),
     });
-    nameService = jasmine.createSpyObj('nameService', {
-      getName: itemName,
-    });
     itemRequestService = jasmine.createSpyObj('itemRequestService', {
       deny: createSuccessfulRemoteDataObject$(itemRequest),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']);
 
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       declarations: [DenyRequestCopyComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
@@ -109,11 +117,11 @@ describe('DenyRequestCopyComponent', () => {
         { provide: ActivatedRoute, useValue: route },
         { provide: AuthService, useValue: authService },
         { provide: ItemDataService, useValue: itemDataService },
-        { provide: DSONameService, useValue: nameService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: ItemRequestDataService, useValue: itemRequestService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
index 06c7e2a2f9..4c9b53b4e2 100644
--- a/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
+++ b/src/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -1,29 +1,42 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Observable } from 'rxjs';
 import {
-  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { AuthService } from '../../core/auth/auth.service';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { Item } from '../../core/shared/item.model';
-import { isNotEmpty } from '../../shared/empty.util';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { isNotEmpty } from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
 
 @Component({
   selector: 'ds-deny-request-copy',
   styleUrls: ['./deny-request-copy.component.scss'],
-  templateUrl: './deny-request-copy.component.html'
+  templateUrl: './deny-request-copy.component.html',
 })
 /**
  * Component for denying an item request
@@ -63,10 +76,10 @@ export class DenyRequestCopyComponent implements OnInit {
       redirectOn4xx(this.router, this.authService),
     );
 
-    const msgParams$ = observableCombineLatest(
+    const msgParams$ = observableCombineLatest([
       this.itemRequestRD$.pipe(getFirstSucceededRemoteDataPayload()),
       this.authService.getAuthenticatedUserFromStore(),
-    ).pipe(
+    ]).pipe(
       switchMap(([itemRequest, user]: [ItemRequest, EPerson]) => {
         return this.itemDataService.findById(itemRequest.itemId).pipe(
           getFirstSucceededRemoteDataPayload(),
@@ -76,7 +89,7 @@ export class DenyRequestCopyComponent implements OnInit {
               recipientName: itemRequest.requestName,
               itemUrl: isNotEmpty(uri) ? uri : item.handle,
               itemName: this.nameService.getName(item),
-              authorName: user.name,
+              authorName: this.nameService.getName(user),
               authorEmail: user.email,
             });
           }),
@@ -98,7 +111,7 @@ export class DenyRequestCopyComponent implements OnInit {
     this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((itemRequest: ItemRequest) => this.itemRequestService.deny(itemRequest.token, email)),
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('deny-request-copy.success'));
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
new file mode 100644
index 0000000000..460d99ab76
--- /dev/null
+++ b/src/app/request-copy/deny-request-copy/themed-deny-request-copy.component.ts
@@ -0,0 +1,26 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { DenyRequestCopyComponent } from './deny-request-copy.component';
+
+/**
+ * Themed wrapper for deny-request-copy.component
+ */
+@Component({
+  selector: 'ds-themed-deny-request-copy',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html',
+})
+export class ThemedDenyRequestCopyComponent extends ThemedComponent<DenyRequestCopyComponent> {
+  protected getComponentName(): string {
+    return 'DenyRequestCopyComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/request-copy/deny-request-copy/deny-request-copy.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./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 d7633b0334..286e87554b 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
@@ -8,15 +8,12 @@
   </div>
   <div class="form-group">
     <label for="message">{{ 'grant-deny-request-copy.email.message' | translate }}</label>
-    <textarea class="form-control" id="message" rows="8" [ngClass]="{'is-invalid': !message || message.length === 0}" [(ngModel)]="message" name="message"></textarea>
-    <div *ngIf="!message || message.length === 0" class="invalid-feedback">
-      {{ 'grant-deny-request-copy.email.message.empty' | translate }}
-    </div>
+    <textarea class="form-control" id="message" rows="8" [(ngModel)]="message" name="message"></textarea>
   </div>
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
-            [disabled]="!message || message.length === 0 || !subject || subject.length === 0"
+            [disabled]="!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/email-request-copy/email-request-copy.component.spec.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts
index 3857c0d91b..1c944a9b71 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.spec.ts
@@ -1,10 +1,15 @@
-import { EmailRequestCopyComponent } from './email-request-copy.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { VarDirective } from '../../shared/utils/var.directive';
+import { EmailRequestCopyComponent } from './email-request-copy.component';
 import { RequestCopyEmail } from './request-copy-email.model';
 
 describe('EmailRequestCopyComponent', () => {
@@ -22,7 +27,7 @@ describe('EmailRequestCopyComponent', () => {
       providers: [
         { provide: Location, useValue: location },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
index ab2c8b4526..9e13215346 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.ts
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -1,11 +1,17 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { RequestCopyEmail } from './request-copy-email.model';
 import { Location } from '@angular/common';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { RequestCopyEmail } from './request-copy-email.model';
 
 @Component({
   selector: 'ds-email-request-copy',
   styleUrls: ['./email-request-copy.component.scss'],
-  templateUrl: './email-request-copy.component.html'
+  templateUrl: './email-request-copy.component.html',
 })
 /**
  * A form component for an email to send back to the user requesting an item
diff --git a/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts b/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts
new file mode 100644
index 0000000000..3d74abbde7
--- /dev/null
+++ b/src/app/request-copy/email-request-copy/themed-email-request-copy.component.ts
@@ -0,0 +1,49 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EmailRequestCopyComponent } from './email-request-copy.component';
+import { RequestCopyEmail } from './request-copy-email.model';
+
+/**
+ * Themed wrapper for email-request-copy.component
+ */
+@Component({
+  selector: 'ds-themed-email-request-copy',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html',
+})
+export class ThemedEmailRequestCopyComponent extends ThemedComponent<EmailRequestCopyComponent> {
+  /**
+   * Event emitter for sending the email
+   */
+  @Output() send: EventEmitter<RequestCopyEmail> = new EventEmitter<RequestCopyEmail>();
+
+  /**
+   * The subject of the email
+   */
+  @Input() subject: string;
+
+  /**
+   * The contents of the email
+   */
+  @Input() message: string;
+
+  protected inAndOutputNames: (keyof EmailRequestCopyComponent & keyof this)[] = ['send', 'subject', 'message'];
+
+  protected getComponentName(): string {
+    return 'EmailRequestCopyComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/request-copy/email-request-copy/email-request-copy.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./email-request-copy.component');
+  }
+}
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts
index 5c37a86f24..b066a47cb5 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.spec.ts
@@ -1,23 +1,34 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../core/auth/auth.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
 import {
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { Item } from '../../core/shared/item.model';
+import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  getRequestCopyDenyRoute,
+  getRequestCopyGrantRoute,
+} from '../request-copy-routing-paths';
 import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy.component';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
-import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths';
-import { By } from '@angular/platform-browser';
 
 describe('GrantDenyRequestCopyComponent', () => {
   let component: GrantDenyRequestCopyComponent;
@@ -37,7 +48,7 @@ describe('GrantDenyRequestCopyComponent', () => {
   beforeEach(waitForAsync(() => {
     itemRequest = Object.assign(new ItemRequest(), {
       token: 'item-request-token',
-      requestName: 'requester name'
+      requestName: 'requester name',
     });
     itemName = 'item-name';
     item = Object.assign(new Item(), {
@@ -45,15 +56,15 @@ describe('GrantDenyRequestCopyComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: itemUrl
-          }
+            value: itemUrl,
+          },
         ],
         'dc.title': [
           {
-            value: itemName
-          }
-        ]
-      }
+            value: itemName,
+          },
+        ],
+      },
     });
     itemUrl = getItemPageRoute(item);
 
@@ -81,7 +92,7 @@ describe('GrantDenyRequestCopyComponent', () => {
         { provide: ItemDataService, useValue: itemDataService },
         { provide: DSONameService, useValue: nameService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -130,7 +141,7 @@ describe('GrantDenyRequestCopyComponent', () => {
 
     it('should be displayed when decisionDate is defined', () => {
       component.itemRequestRD$ = createSuccessfulRemoteDataObject$(Object.assign(new ItemRequest(), itemRequest, {
-        decisionDate: 'defined-date'
+        decisionDate: 'defined-date',
       }));
       fixture.detectChanges();
 
diff --git a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
index b130c23abe..c88c3c73ab 100644
--- a/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
+++ b/src/app/request-copy/grant-deny-request-copy/grant-deny-request-copy.component.ts
@@ -1,25 +1,38 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import {
-  getFirstCompletedRemoteData,
-  getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
-import { getRequestCopyDenyRoute, getRequestCopyGrantRoute } from '../request-copy-routing-paths';
-import { Item } from '../../core/shared/item.model';
-import { ItemDataService } from '../../core/data/item-data.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { getItemPageRoute } from '../../item-page/item-page-routing-paths';
+import {
+  getRequestCopyDenyRoute,
+  getRequestCopyGrantRoute,
+} from '../request-copy-routing-paths';
 
 @Component({
   selector: 'ds-grant-deny-request-copy',
   styleUrls: ['./grant-deny-request-copy.component.scss'],
-  templateUrl: './grant-deny-request-copy.component.html'
+  templateUrl: './grant-deny-request-copy.component.html',
 })
 /**
  * Component for an author to decide to grant or deny an item request
@@ -86,11 +99,11 @@ export class GrantDenyRequestCopyComponent implements OnInit {
 
     this.denyRoute$ = this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((itemRequest: ItemRequest) => getRequestCopyDenyRoute(itemRequest.token))
+      map((itemRequest: ItemRequest) => getRequestCopyDenyRoute(itemRequest.token)),
     );
     this.grantRoute$ = this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((itemRequest: ItemRequest) => getRequestCopyGrantRoute(itemRequest.token))
+      map((itemRequest: ItemRequest) => getRequestCopyGrantRoute(itemRequest.token)),
     );
   }
 
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
index 5cb4dbac36..179206566e 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.html
@@ -3,7 +3,7 @@
   <div *ngIf="itemRequestRD && itemRequestRD.hasSucceeded">
     <p>{{'grant-request-copy.intro' | translate}}</p>
 
-    <ds-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="grant($event)">
+    <ds-themed-email-request-copy [subject]="subject$ | async" [message]="message$ | async" (send)="grant($event)">
       <p>{{ 'grant-deny-request-copy.email.permissions.info' | translate }}</p>
       <form class="mb-3">
         <div class="form-check">
@@ -11,7 +11,7 @@
           <label class="form-check-label" for="permissions">{{ 'grant-deny-request-copy.email.permissions.label' | translate }}</label>
         </div>
       </form>
-    </ds-email-request-copy>
+    </ds-themed-email-request-copy>
   </div>
   <ds-themed-loading *ngIf="!itemRequestRD || itemRequestRD?.isLoading"></ds-themed-loading>
 </div>
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts
index b6ccb8557e..3d6dbc7bee 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.spec.ts
@@ -1,23 +1,35 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { AuthService } from '../../core/auth/auth.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { ItemRequestDataService } from '../../core/data/item-request-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import { DSONameServiceMock } from '../../shared/mocks/dso-name.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ItemRequest } from '../../core/shared/item-request.model';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { Item } from '../../core/shared/item.model';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
 import { GrantRequestCopyComponent } from './grant-request-copy.component';
 
@@ -30,7 +42,6 @@ describe('GrantRequestCopyComponent', () => {
   let authService: AuthService;
   let translateService: TranslateService;
   let itemDataService: ItemDataService;
-  let nameService: DSONameService;
   let itemRequestService: ItemRequestDataService;
   let notificationsService: NotificationsService;
 
@@ -43,20 +54,20 @@ describe('GrantRequestCopyComponent', () => {
   beforeEach(waitForAsync(() => {
     itemRequest = Object.assign(new ItemRequest(), {
       token: 'item-request-token',
-      requestName: 'requester name'
+      requestName: 'requester name',
     });
     user = Object.assign(new EPerson(), {
       metadata: {
         'eperson.firstname': [
           {
-            value: 'first'
-          }
+            value: 'first',
+          },
         ],
         'eperson.lastname': [
           {
-            value: 'last'
-          }
-        ]
+            value: 'last',
+          },
+        ],
       },
       email: 'user-email',
     });
@@ -67,15 +78,15 @@ describe('GrantRequestCopyComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: itemUrl
-          }
+            value: itemUrl,
+          },
         ],
         'dc.title': [
           {
-            value: itemName
-          }
-        ]
-      }
+            value: itemName,
+          },
+        ],
+      },
     });
 
     router = jasmine.createSpyObj('router', {
@@ -93,15 +104,12 @@ describe('GrantRequestCopyComponent', () => {
     itemDataService = jasmine.createSpyObj('itemDataService', {
       findById: createSuccessfulRemoteDataObject$(item),
     });
-    nameService = jasmine.createSpyObj('nameService', {
-      getName: itemName,
-    });
     itemRequestService = jasmine.createSpyObj('itemRequestService', {
       grant: createSuccessfulRemoteDataObject$(itemRequest),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', ['success', 'error']);
 
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       declarations: [GrantRequestCopyComponent, VarDirective],
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       providers: [
@@ -109,11 +117,11 @@ describe('GrantRequestCopyComponent', () => {
         { provide: ActivatedRoute, useValue: route },
         { provide: AuthService, useValue: authService },
         { provide: ItemDataService, useValue: itemDataService },
-        { provide: DSONameService, useValue: nameService },
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: ItemRequestDataService, useValue: itemRequestService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -126,19 +134,6 @@ describe('GrantRequestCopyComponent', () => {
     spyOn(translateService, 'get').and.returnValue(observableOf('translated-message'));
   });
 
-  it('message$ should be parameterized correctly', (done) => {
-    component.message$.subscribe(() => {
-      expect(translateService.get).toHaveBeenCalledWith(jasmine.anything(), Object.assign({
-        recipientName: itemRequest.requestName,
-        itemUrl: itemUrl,
-        itemName: itemName,
-        authorName: user.name,
-        authorEmail: user.email,
-      }));
-      done();
-    });
-  });
-
   describe('grant', () => {
     let email: RequestCopyEmail;
 
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index ee2e5f08cc..5536a70384 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,29 +1,34 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 import {
-  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
-import { TranslateService } from '@ngx-translate/core';
-import { combineLatest as observableCombineLatest } from 'rxjs';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { Item } from '../../core/shared/item.model';
-import { isNotEmpty } from '../../shared/empty.util';
 import { ItemRequestDataService } from '../../core/data/item-request-data.service';
-import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { ItemRequest } from '../../core/shared/item-request.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { RequestCopyEmail } from '../email-request-copy/request-copy-email.model';
 
 @Component({
   selector: 'ds-grant-request-copy',
   styleUrls: ['./grant-request-copy.component.scss'],
-  templateUrl: './grant-request-copy.component.html'
+  templateUrl: './grant-request-copy.component.html',
 })
 /**
  * Component for granting an item request
@@ -54,8 +59,6 @@ export class GrantRequestCopyComponent implements OnInit {
     private route: ActivatedRoute,
     private authService: AuthService,
     private translateService: TranslateService,
-    private itemDataService: ItemDataService,
-    private nameService: DSONameService,
     private itemRequestService: ItemRequestDataService,
     private notificationsService: NotificationsService,
   ) {
@@ -69,31 +72,7 @@ export class GrantRequestCopyComponent implements OnInit {
       redirectOn4xx(this.router, this.authService),
     );
 
-    const msgParams$ = observableCombineLatest(
-      this.itemRequestRD$.pipe(getFirstSucceededRemoteDataPayload()),
-      this.authService.getAuthenticatedUserFromStore(),
-    ).pipe(
-      switchMap(([itemRequest, user]: [ItemRequest, EPerson]) => {
-        return this.itemDataService.findById(itemRequest.itemId).pipe(
-          getFirstSucceededRemoteDataPayload(),
-          map((item: Item) => {
-            const uri = item.firstMetadataValue('dc.identifier.uri');
-            return Object.assign({
-              recipientName: itemRequest.requestName,
-              itemUrl: isNotEmpty(uri) ? uri : item.handle,
-              itemName: this.nameService.getName(item),
-              authorName: user.name,
-              authorEmail: user.email,
-            });
-          }),
-        );
-      }),
-    );
-
     this.subject$ = this.translateService.get('grant-request-copy.email.subject');
-    this.message$ = msgParams$.pipe(
-      switchMap((params) => this.translateService.get('grant-request-copy.email.message', params)),
-    );
   }
 
   /**
@@ -104,7 +83,7 @@ export class GrantRequestCopyComponent implements OnInit {
     this.itemRequestRD$.pipe(
       getFirstSucceededRemoteDataPayload(),
       switchMap((itemRequest: ItemRequest) => this.itemRequestService.grant(itemRequest.token, email, this.suggestOpenAccess)),
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('grant-request-copy.success'));
diff --git a/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts
new file mode 100644
index 0000000000..274df47a0a
--- /dev/null
+++ b/src/app/request-copy/grant-request-copy/themed-grant-request-copy.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { GrantRequestCopyComponent } from './grant-request-copy.component';
+
+/**
+ * Themed wrapper for grant-request-copy.component
+ */
+@Component({
+  selector: 'ds-themed-grant-request-copy',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html',
+})
+
+export class ThemedGrantRequestCopyComponent extends ThemedComponent<GrantRequestCopyComponent> {
+  protected getComponentName(): string {
+    return 'GrantRequestCopyComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/request-copy/grant-request-copy/grant-request-copy.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./grant-request-copy.component');
+  }
+}
diff --git a/src/app/request-copy/request-copy-routing-paths.ts b/src/app/request-copy/request-copy-routing-paths.ts
index 1d0204a1b8..2518e34fc2 100644
--- a/src/app/request-copy/request-copy-routing-paths.ts
+++ b/src/app/request-copy/request-copy-routing-paths.ts
@@ -1,5 +1,5 @@
-import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getRequestCopyModulePath } from '../app-routing-paths';
+import { URLCombiner } from '../core/url-combiner/url-combiner';
 
 export function getRequestCopyRoute(token: string) {
   return new URLCombiner(getRequestCopyModulePath(), token).toString();
diff --git a/src/app/request-copy/request-copy-routing.module.ts b/src/app/request-copy/request-copy-routing.module.ts
index e7a205d0aa..1c8c8ce1dd 100644
--- a/src/app/request-copy/request-copy-routing.module.ts
+++ b/src/app/request-copy/request-copy-routing.module.ts
@@ -1,10 +1,14 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { RequestCopyResolver } from './request-copy.resolver';
+
+import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
 import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
-import { REQUEST_COPY_DENY_PATH, REQUEST_COPY_GRANT_PATH } from './request-copy-routing-paths';
-import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
-import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
+import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
+import { RequestCopyResolver } from './request-copy.resolver';
+import {
+  REQUEST_COPY_DENY_PATH,
+  REQUEST_COPY_GRANT_PATH,
+} from './request-copy-routing-paths';
 
 @NgModule({
   imports: [
@@ -12,7 +16,7 @@ import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-co
       {
         path: ':token',
         resolve: {
-          request: RequestCopyResolver
+          request: RequestCopyResolver,
         },
         children: [
           {
@@ -21,20 +25,20 @@ import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-co
           },
           {
             path: REQUEST_COPY_DENY_PATH,
-            component: DenyRequestCopyComponent,
+            component: ThemedDenyRequestCopyComponent,
           },
           {
             path: REQUEST_COPY_GRANT_PATH,
-            component: GrantRequestCopyComponent,
+            component: ThemedGrantRequestCopyComponent,
           },
-        ]
-      }
-    ])
+        ],
+      },
+    ]),
   ],
   providers: [
     RequestCopyResolver,
-    GrantDenyRequestCopyComponent
-  ]
+    GrantDenyRequestCopyComponent,
+  ],
 })
 export class RequestCopyRoutingModule {
 }
diff --git a/src/app/request-copy/request-copy.module.ts b/src/app/request-copy/request-copy.module.ts
index d55d5ad83f..71bb19d6b7 100644
--- a/src/app/request-copy/request-copy.module.ts
+++ b/src/app/request-copy/request-copy.module.ts
@@ -1,25 +1,35 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
-import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
-import { RequestCopyRoutingModule } from './request-copy-routing.module';
 import { DenyRequestCopyComponent } from './deny-request-copy/deny-request-copy.component';
+import { ThemedDenyRequestCopyComponent } from './deny-request-copy/themed-deny-request-copy.component';
 import { EmailRequestCopyComponent } from './email-request-copy/email-request-copy.component';
+import { ThemedEmailRequestCopyComponent } from './email-request-copy/themed-email-request-copy.component';
+import { GrantDenyRequestCopyComponent } from './grant-deny-request-copy/grant-deny-request-copy.component';
 import { GrantRequestCopyComponent } from './grant-request-copy/grant-request-copy.component';
+import { ThemedGrantRequestCopyComponent } from './grant-request-copy/themed-grant-request-copy.component';
+import { RequestCopyRoutingModule } from './request-copy-routing.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
-    RequestCopyRoutingModule
+    RequestCopyRoutingModule,
   ],
   declarations: [
     GrantDenyRequestCopyComponent,
     DenyRequestCopyComponent,
+    ThemedDenyRequestCopyComponent,
     EmailRequestCopyComponent,
+    ThemedEmailRequestCopyComponent,
     GrantRequestCopyComponent,
+    ThemedGrantRequestCopyComponent,
   ],
-  providers: []
+  exports: [
+    ThemedEmailRequestCopyComponent,
+  ],
+  providers: [],
 })
 
 /**
diff --git a/src/app/request-copy/request-copy.resolver.ts b/src/app/request-copy/request-copy.resolver.ts
index e5c98b0138..e7f1c1bc53 100644
--- a/src/app/request-copy/request-copy.resolver.ts
+++ b/src/app/request-copy/request-copy.resolver.ts
@@ -1,9 +1,14 @@
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+
+import { ItemRequestDataService } from '../core/data/item-request-data.service';
 import { RemoteData } from '../core/data/remote-data';
 import { ItemRequest } from '../core/shared/item-request.model';
-import { Observable } from 'rxjs';
-import { ItemRequestDataService } from '../core/data/item-request-data.service';
-import { Injectable } from '@angular/core';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 
 /**
diff --git a/src/app/root.module.ts b/src/app/root.module.ts
index 8577f0d728..6cfa4e2775 100644
--- a/src/app/root.module.ts
+++ b/src/app/root.module.ts
@@ -1,52 +1,42 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 
-import {
-  AdminSidebarSectionComponent
-} from './admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
 import { AdminSidebarComponent } from './admin/admin-sidebar/admin-sidebar.component';
+import { AdminSidebarSectionComponent } from './admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
+import { ExpandableAdminSidebarSectionComponent } from './admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
 import { ThemedAdminSidebarComponent } from './admin/admin-sidebar/themed-admin-sidebar.component';
-import {
-  ExpandableAdminSidebarSectionComponent
-} from './admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
-import { FooterComponent } from './footer/footer.component';
-import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
-import { HeaderComponent } from './header/header.component';
-import { NavbarModule } from './navbar/navbar.module';
-import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
-import { NotificationComponent } from './shared/notifications/notification/notification.component';
-import {
-  NotificationsBoardComponent
-} from './shared/notifications/notifications-board/notifications-board.component';
-import { SharedModule } from './shared/shared.module';
 import { BreadcrumbsComponent } from './breadcrumbs/breadcrumbs.component';
+import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
+import { FooterComponent } from './footer/footer.component';
+import { ThemedFooterComponent } from './footer/themed-footer.component';
 import { ForbiddenComponent } from './forbidden/forbidden.component';
+import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
+import { ContextHelpToggleComponent } from './header/context-help-toggle/context-help-toggle.component';
+import { HeaderComponent } from './header/header.component';
+import { ThemedHeaderComponent } from './header/themed-header.component';
+import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.component';
+import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
+import { NavbarModule } from './navbar/navbar.module';
+import { PageErrorComponent } from './page-error/page-error.component';
+import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
+import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
+import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
+import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
+import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
 import { RootComponent } from './root/root.component';
 import { ThemedRootComponent } from './root/themed-root.component';
-import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
-import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
-import { ThemedHeaderComponent } from './header/themed-header.component';
-import { ThemedFooterComponent } from './footer/themed-footer.component';
-import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
-import {
-  ThemedHeaderNavbarWrapperComponent
-} from './header-nav-wrapper/themed-header-navbar-wrapper.component';
 import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
-import {
-  ThemedPageInternalServerErrorComponent
-} from './page-internal-server-error/themed-page-internal-server-error.component';
-import {
-  PageInternalServerErrorComponent
-} from './page-internal-server-error/page-internal-server-error.component';
-import { ThemedPageErrorComponent } from './page-error/themed-page-error.component';
-import { PageErrorComponent } from './page-error/page-error.component';
+import { NotificationComponent } from './shared/notifications/notification/notification.component';
+import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
+import { SharedModule } from './shared/shared.module';
+import { SystemWideAlertModule } from './system-wide-alert/system-wide-alert.module';
 
 const IMPORTS = [
   CommonModule,
   SharedModule.withEntryComponents(),
   NavbarModule,
+  SystemWideAlertModule,
   NgbModule,
 ];
 
@@ -78,7 +68,8 @@ const DECLARATIONS = [
   ThemedPageInternalServerErrorComponent,
   PageInternalServerErrorComponent,
   ThemedPageErrorComponent,
-  PageErrorComponent
+  PageErrorComponent,
+  ContextHelpToggleComponent,
 ];
 
 const EXPORTS = [
@@ -86,10 +77,10 @@ const EXPORTS = [
 
 @NgModule({
   imports: [
-    ...IMPORTS
+    ...IMPORTS,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   declarations: [
     ...DECLARATIONS,
@@ -97,7 +88,7 @@ const EXPORTS = [
   exports: [
     ...EXPORTS,
     ...DECLARATIONS,
-  ]
+  ],
 })
 export class RootModule {
 
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 9ef70540e9..533efea9d1 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,12 +1,17 @@
-<div class="outer-wrapper" [class.d-none]="shouldShowFullscreenLoader">
-  <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
-  <div class="inner-wrapper" [@slideSidebarPadding]="{
-     value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
-     params: {collapsedSidebarWidth: (collapsedSidebarWidth | async), totalSidebarWidth: (totalSidebarWidth | async)}
+<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: ((isSidebarVisible$ | async) !== true ? 'hidden' : (slideSidebarOver$ | async) ? 'unpinned' : 'pinned'),
+     params: { collapsedWidth: (collapsedSidebarWidth$ | async), expandedWidth: (expandedSidebarWidth$ | async) }
     }">
+  <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>
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.spec.ts b/src/app/root/root.component.spec.ts
index 504bc34e34..e81eec3090 100644
--- a/src/app/root/root.component.spec.ts
+++ b/src/app/root/root.component.spec.ts
@@ -1,32 +1,45 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { RootComponent } from './root.component';
 import { CommonModule } from '@angular/common';
-import { StoreModule } from '@ngrx/store';
-import { authReducer } from '../core/auth/auth.reducer';
-import { storeModuleConfig } from '../app.reducer';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
-import { NativeWindowRef, NativeWindowService } from '../core/services/window.service';
-import { MetadataService } from '../core/metadata/metadata.service';
-import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
-import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
-import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
-import { AuthService } from '../core/auth/auth.service';
-import { AuthServiceMock } from '../shared/mocks/auth.service.mock';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterMock } from '../shared/mocks/router.mock';
-import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
-import { MenuService } from '../shared/menu/menu.service';
-import { CSSVariableService } from '../shared/sass-helper/sass-helper.service';
-import { CSSVariableServiceStub } from '../shared/testing/css-variable-service.stub';
-import { HostWindowService } from '../shared/host-window.service';
-import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
-import { LocaleService } from '../core/locale/locale.service';
-import { provideMockStore } from '@ngrx/store/testing';
-import { RouteService } from '../core/services/route.service';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { storeModuleConfig } from '../app.reducer';
+import { authReducer } from '../core/auth/auth.reducer';
+import { AuthService } from '../core/auth/auth.service';
+import { LocaleService } from '../core/locale/locale.service';
+import { MetadataService } from '../core/metadata/metadata.service';
+import { RouteService } from '../core/services/route.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../core/services/window.service';
+import { HostWindowService } from '../shared/host-window.service';
+import { MenuService } from '../shared/menu/menu.service';
+import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { AngularticsProviderMock } from '../shared/mocks/angulartics-provider.service.mock';
+import { AuthServiceMock } from '../shared/mocks/auth.service.mock';
+import { MetadataServiceMock } from '../shared/mocks/metadata-service.mock';
+import { RouterMock } from '../shared/mocks/router.mock';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
+import { CSSVariableServiceStub } from '../shared/testing/css-variable-service.stub';
+import { HostWindowServiceStub } from '../shared/testing/host-window-service.stub';
+import { MenuServiceStub } from '../shared/testing/menu-service.stub';
+import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
+import { RootComponent } from './root.component';
 
 describe('RootComponent', () => {
   let component: RootComponent;
@@ -41,8 +54,8 @@ describe('RootComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [RootComponent], // declare the test component
@@ -59,9 +72,9 @@ describe('RootComponent', () => {
         { provide: LocaleService, useValue: {} },
         provideMockStore({ core: { auth: { loading: false } } } as any),
         RootComponent,
-        RouteService
+        RouteService,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   });
 
diff --git a/src/app/root/root.component.ts b/src/app/root/root.component.ts
index 472ba440c9..6cfa095dbf 100644
--- a/src/app/root/root.component.ts
+++ b/src/app/root/root.component.ts
@@ -1,24 +1,30 @@
-import { map, startWith } from 'rxjs/operators';
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  combineLatest as combineLatestObservable,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  first,
+  map,
+  skipWhile,
+  startWith,
+} from 'rxjs/operators';
+import { INotificationBoardOptions } from 'src/config/notifications-config.interfaces';
 
-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/sass-helper.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 { slideSidebarPadding } from '../shared/animations/slide';
+import { HostWindowService } from '../shared/host-window.service';
+import { MenuService } from '../shared/menu/menu.service';
+import { MenuID } from '../shared/menu/menu-id.model';
+import { CSSVariableService } from '../shared/sass-helper/css-variable.service';
 
 @Component({
   selector: 'ds-root',
@@ -27,13 +33,13 @@ import { getPageInternalServerErrorRoute } from '../app-routing-paths';
   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
@@ -46,28 +52,28 @@ 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,
-    private windowService: HostWindowService
+    private windowService: HostWindowService,
   ) {
     this.notificationOptions = environment.notifications;
   }
 
   ngOnInit() {
-    this.sidebarVisible = this.menuService.isMenuVisible(MenuID.ADMIN);
+    this.isSidebarVisible$ = this.menuService.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
 
-    this.collapsedSidebarWidth = this.cssService.getVariable('collapsedSidebarWidth');
-    this.totalSidebarWidth = this.cssService.getVariable('totalSidebarWidth');
+    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),
@@ -77,4 +83,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/root/themed-root.component.ts b/src/app/root/themed-root.component.ts
index 5dfa1edf31..894d0dfee2 100644
--- a/src/app/root/themed-root.component.ts
+++ b/src/app/root/themed-root.component.ts
@@ -1,6 +1,10 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { RootComponent } from './root.component';
-import { Component, Input } from '@angular/core';
 
 @Component({
   selector: 'ds-themed-root',
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index e1de59ce51..e9b5f285fb 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -1,12 +1,15 @@
-<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">
-      <a class="submit-icon" [routerLink]="" (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">
         <em class="fas fa-search fa-lg fa-fw"></em>
-      </a>
+      </button>
     </form>
   </div>
 </div>
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
index c1ccd289b2..a276482b53 100644
--- a/src/app/search-navbar/search-navbar.component.scss
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -1,19 +1,23 @@
 input[type="text"] {
   margin-top: calc(-0.5 * var(--bs-font-size-base));
-
-  &:focus {
-    background-color: rgba(255, 255, 255, 0.5) !important;
-  }
+  background-color: #fff !important;
+  border-color: var(--ds-header-icon-color);
 
   &.collapsed {
     opacity: 0;
   }
 }
 
-a.submit-icon {
+.submit-icon {
   cursor: pointer;
   position: sticky;
   top: 0;
+  border: 0 !important;
+
+  color: var(--ds-header-icon-color);
+  &:hover, &:focus {
+    color: var(--ds-header-icon-color-hover);
+  }
 }
 
 @media screen and (max-width: map-get($grid-breakpoints, md)) {
@@ -22,8 +26,5 @@ a.submit-icon {
     width: 40vw !important;
   }
 
-  a.submit-icon {
-    color: var(--bs-link-color);
-  }
 }
 
diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts
index b67f5f0eb4..2a0a59ac16 100644
--- a/src/app/search-navbar/search-navbar.component.spec.ts
+++ b/src/app/search-navbar/search-navbar.component.spec.ts
@@ -1,38 +1,44 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NavigationExtras, Router } from '@angular/router';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 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';
+import { SearchNavbarComponent } from './search-navbar.component';
 
 describe('SearchNavbarComponent', () => {
   let component: SearchNavbarComponent;
   let fixture: ComponentFixture<SearchNavbarComponent>;
   let mockSearchService: any;
   let router: Router;
-  let routerStub;
-  let paginationService;
 
   beforeEach(waitForAsync(() => {
     mockSearchService = {
       getSearchLink() {
         return '/search';
-      }
+      },
     };
 
-    routerStub = {
-      navigate: (commands) => commands
-    };
-
-    paginationService = new PaginationServiceStub();
-
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
@@ -42,16 +48,16 @@ describe('SearchNavbarComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [
         SearchNavbarComponent,
         BrowserOnlyMockPipe,
       ],
       providers: [
-        { provide: SearchService, useValue: mockSearchService }
-      ]
+        { provide: SearchService, useValue: mockSearchService },
+      ],
     })
       .compileComponents();
   }));
@@ -72,10 +78,10 @@ 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: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -88,16 +94,16 @@ 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: () => {/**/
-            }
+            },
           });
           tick();
           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 +115,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 ccdaa27861..b1ddc52f97 100644
--- a/src/app/search-navbar/search-navbar.component.ts
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -1,6 +1,11 @@
-import { Component, ElementRef, ViewChild } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
+import {
+  Component,
+  ElementRef,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
 import { Router } from '@angular/router';
+
 import { SearchService } from '../core/shared/search/search.service';
 import { expandSearchInput } from '../shared/animations/slide';
 
@@ -11,7 +16,7 @@ import { expandSearchInput } from '../shared/animations/slide';
   selector: 'ds-search-navbar',
   templateUrl: './search-navbar.component.html',
   styleUrls: ['./search-navbar.component.scss'],
-  animations: [expandSearchInput]
+  animations: [expandSearchInput],
 })
 export class SearchNavbarComponent {
 
@@ -24,7 +29,7 @@ export class SearchNavbarComponent {
   // Search input field
   @ViewChild('searchInput') searchField: ElementRef;
 
-  constructor(private formBuilder: FormBuilder, private router: Router, private searchService: SearchService) {
+  constructor(private formBuilder: UntypedFormBuilder, private router: Router, private searchService: SearchService) {
     this.searchForm = this.formBuilder.group(({
       query: '',
     }));
@@ -67,7 +72,6 @@ export class SearchNavbarComponent {
 
     this.router.navigate(linkToNavigateTo, {
       queryParams: queryParams,
-      queryParamsHandling: 'merge'
     });
   }
 }
diff --git a/src/app/search-navbar/themed-search-navbar.component.ts b/src/app/search-navbar/themed-search-navbar.component.ts
index a90e782194..f4a8f1d270 100644
--- a/src/app/search-navbar/themed-search-navbar.component.ts
+++ b/src/app/search-navbar/themed-search-navbar.component.ts
@@ -1,6 +1,7 @@
+import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { SearchNavbarComponent } from './search-navbar.component';
-import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-themed-search-navbar',
diff --git a/src/app/search-page/configuration-search-page.component.spec.ts b/src/app/search-page/configuration-search-page.component.spec.ts
index 4468aad9c4..2467e5ada4 100644
--- a/src/app/search-page/configuration-search-page.component.spec.ts
+++ b/src/app/search-page/configuration-search-page.component.spec.ts
@@ -1,10 +1,18 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  ViewChild,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+
+import { RouteService } from '../core/services/route.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 import { configureSearchComponentTestingModule } from '../shared/search/search.component.spec';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
-import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { Component, ViewChild } from '@angular/core';
-import { Router } from '@angular/router';
-import { RouteService } from '../core/services/route.service';
 import createSpy = jasmine.createSpy;
 
 const CONFIGURATION = 'test-configuration';
diff --git a/src/app/search-page/configuration-search-page.component.ts b/src/app/search-page/configuration-search-page.component.ts
index 768149de6a..e919bcb396 100644
--- a/src/app/search-page/configuration-search-page.component.ts
+++ b/src/app/search-page/configuration-search-page.component.ts
@@ -1,13 +1,22 @@
-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 { 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 {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+} from '@angular/core';
+import { Router } from '@angular/router';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../config/app-config.interface';
 import { RouteService } from '../core/services/route.service';
 import { SearchService } from '../core/shared/search/search.service';
-import { 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 { pushInOut } from '../shared/animations/push';
+import { HostWindowService } from '../shared/host-window.service';
+import { SearchComponent } from '../shared/search/search.component';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
 
 /**
  * This component renders a search page using a configuration as input.
@@ -21,9 +30,9 @@ import { Router } from '@angular/router';
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 export class ConfigurationSearchPageComponent extends SearchComponent {
@@ -32,7 +41,9 @@ 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,
+  ) {
+    super(service, sidebarService, windowService, searchConfigService, routeService, router, appConfig);
   }
 }
diff --git a/src/app/search-page/configuration-search-page.guard.ts b/src/app/search-page/configuration-search-page.guard.ts
index c52a0a6d8e..28d68618b0 100644
--- a/src/app/search-page/configuration-search-page.guard.ts
+++ b/src/app/search-page/configuration-search-page.guard.ts
@@ -1,5 +1,9 @@
 import { Injectable } from '@angular/core';
-import { CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
 @Injectable()
diff --git a/src/app/search-page/search-page-routing.module.ts b/src/app/search-page/search-page-routing.module.ts
index 9e39ad1bc9..42be35903c 100644
--- a/src/app/search-page/search-page-routing.module.ts
+++ b/src/app/search-page/search-page-routing.module.ts
@@ -1,30 +1,30 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
 import { SearchPageModule } from './search-page.module';
-import { ThemedSearchPageComponent } from './themed-search-page.component';
 import { ThemedConfigurationSearchPageComponent } from './themed-configuration-search-page.component';
+import { ThemedSearchPageComponent } from './themed-search-page.component';
 
 @NgModule({
   imports: [
     SearchPageModule,
     RouterModule.forChild([{
-        path: '',
-        resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' },
-        children: [
-          { path: '', component: ThemedSearchPageComponent },
-          { path: ':configuration', component: ThemedConfigurationSearchPageComponent, canActivate: [ConfigurationSearchPageGuard] }
-        ]
-      }]
-    )
+      path: '',
+      resolve: { breadcrumb: I18nBreadcrumbResolver }, data: { title: 'search.title', breadcrumbKey: 'search' },
+      children: [
+        { path: '', component: ThemedSearchPageComponent },
+        { path: ':configuration', component: ThemedConfigurationSearchPageComponent, canActivate: [ConfigurationSearchPageGuard] },
+      ],
+    }],
+    ),
   ],
   providers: [
     I18nBreadcrumbResolver,
-    I18nBreadcrumbsService
-  ]
+    I18nBreadcrumbsService,
+  ],
 })
 export class SearchPageRoutingModule {
 }
diff --git a/src/app/search-page/search-page.component.html b/src/app/search-page/search-page.component.html
index 73a952332f..36ba53a885 100644
--- a/src/app/search-page/search-page.component.html
+++ b/src/app/search-page/search-page.component.html
@@ -1 +1 @@
-<ds-themed-search [trackStatistics]="true"></ds-themed-search>
+<ds-themed-search [showCsvExport]="true" [trackStatistics]="true"></ds-themed-search>
diff --git a/src/app/search-page/search-page.component.ts b/src/app/search-page/search-page.component.ts
index 38647b779b..15c697ffc9 100644
--- a/src/app/search-page/search-page.component.ts
+++ b/src/app/search-page/search-page.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-page',
@@ -8,9 +9,9 @@ import { SearchConfigurationService } from '../core/shared/search/search-configu
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 /**
  * This component represents the whole search page
diff --git a/src/app/search-page/search-page.module.ts b/src/app/search-page/search-page.module.ts
index 758eca15c0..5b23184b43 100644
--- a/src/app/search-page/search-page.module.ts
+++ b/src/app/search-page/search-page.module.ts
@@ -1,24 +1,22 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
 import { CoreModule } from '../core/core.module';
-import { SharedModule } from '../shared/shared.module';
-import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
-import { SearchTrackerComponent } from './search-tracker.component';
-import { StatisticsModule } from '../statistics/statistics.module';
-import { SearchPageComponent } from './search-page.component';
-import { SidebarFilterService } from '../shared/sidebar/filter/sidebar-filter.service';
-import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ThemedSearchPageComponent } from './themed-search-page.component';
 import { SearchModule } from '../shared/search/search.module';
+import { SharedModule } from '../shared/shared.module';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
+import { SearchPageComponent } from './search-page.component';
+import { ThemedSearchPageComponent } from './themed-search-page.component';
 
 const components = [
   SearchPageComponent,
-  SearchTrackerComponent,
-  ThemedSearchPageComponent
+  ThemedSearchPageComponent,
 ];
 
 @NgModule({
@@ -29,17 +27,16 @@ const components = [
     CoreModule.forRoot(),
     StatisticsModule.forRoot(),
     JournalEntitiesModule.withEntryComponents(),
-    ResearchEntitiesModule.withEntryComponents()
+    ResearchEntitiesModule.withEntryComponents(),
   ],
   declarations: components,
   providers: [
     SidebarService,
-    SidebarFilterService,
     SearchFilterService,
     ConfigurationSearchPageGuard,
-    SearchConfigurationService
+    SearchConfigurationService,
   ],
-  exports: components
+  exports: components,
 })
 
 /**
diff --git a/src/app/search-page/search-tracker.component.html b/src/app/search-page/search-tracker.component.html
deleted file mode 100644
index c0c0ffe181..0000000000
--- a/src/app/search-page/search-tracker.component.html
+++ /dev/null
@@ -1 +0,0 @@
-&nbsp;
diff --git a/src/app/search-page/search-tracker.component.scss b/src/app/search-page/search-tracker.component.scss
deleted file mode 100644
index c76cafbe44..0000000000
--- a/src/app/search-page/search-tracker.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-  display: none
-}
diff --git a/src/app/search-page/search-tracker.component.ts b/src/app/search-page/search-tracker.component.ts
deleted file mode 100644
index f766e6f669..0000000000
--- a/src/app/search-page/search-tracker.component.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { Angulartics2 } from 'angulartics2';
-import { map, switchMap } from 'rxjs/operators';
-import { SearchComponent } from '../shared/search/search.component';
-import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { HostWindowService } from '../shared/host-window.service';
-import { SEARCH_CONFIG_SERVICE } from '../my-dspace-page/my-dspace-page.component';
-import { RouteService } from '../core/services/route.service';
-import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
-import { SearchService } from '../core/shared/search/search.service';
-import { PaginatedSearchOptions } from '../shared/search/models/paginated-search-options.model';
-import { SearchObjects } from '../shared/search/models/search-objects.model';
-import { Router } from '@angular/router';
-import { RemoteData } from '../core/data/remote-data';
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { getFirstSucceededRemoteData } from '../core/shared/operators';
-
-/**
- * This component triggers a page view statistic
- */
-@Component({
-  selector: 'ds-search-tracker',
-  styleUrls: ['./search-tracker.component.scss'],
-  templateUrl: './search-tracker.component.html',
-  providers: [
-    {
-      provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
-})
-export class SearchTrackerComponent extends SearchComponent implements OnInit {
-
-  constructor(
-    protected service: SearchService,
-    protected sidebarService: SidebarService,
-    protected windowService: HostWindowService,
-    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-    protected routeService: RouteService,
-    public angulartics2: Angulartics2,
-    protected router: Router
-  ) {
-    super(service, sidebarService, windowService, searchConfigService, routeService, router);
-  }
-
-  ngOnInit(): void {
-    // super.ngOnInit();
-    this.getSearchOptions().pipe(
-      switchMap((options: PaginatedSearchOptions) =>
-        this.service.searchEntries(options).pipe(
-          getFirstSucceededRemoteData(),
-          map((rd: RemoteData<SearchObjects<DSpaceObject>>) => ({
-            config: options,
-            searchQueryResponse: rd.payload
-          }))
-        )),
-    ).subscribe(({ config, searchQueryResponse }) => {
-        const filters: { filter: string, operator: string, value: string, label: string; }[] = [];
-        const appliedFilters = searchQueryResponse.appliedFilters || [];
-        for (let i = 0, filtersLength = appliedFilters.length; i < filtersLength; i++) {
-          const appliedFilter = appliedFilters[i];
-          filters.push(appliedFilter);
-        }
-        this.angulartics2.eventTrack.next({
-          action: 'search',
-          properties: {
-            searchOptions: config,
-            page: {
-              size: config.pagination.size, // same as searchQueryResponse.page.elementsPerPage
-              totalElements: searchQueryResponse.pageInfo.totalElements,
-              totalPages: searchQueryResponse.pageInfo.totalPages,
-              number: config.pagination.currentPage, // same as searchQueryResponse.page.currentPage
-            },
-            sort: {
-              by: config.sort.field,
-              order: config.sort.direction
-            },
-            filters: filters,
-          },
-        });
-      });
-  }
-}
diff --git a/src/app/search-page/themed-configuration-search-page.component.ts b/src/app/search-page/themed-configuration-search-page.component.ts
index e4d6e93402..b5d917f707 100644
--- a/src/app/search-page/themed-configuration-search-page.component.ts
+++ b/src/app/search-page/themed-configuration-search-page.component.ts
@@ -1,8 +1,12 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { Context } from '../core/shared/context.model';
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
-import { Observable } from 'rxjs';
-import { Context } from '../core/shared/context.model';
 
 /**
  * Themed wrapper for ConfigurationSearchPageComponent
@@ -28,31 +32,30 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent<Conf
   /**
    * True when the search component should show results on the current page
    */
-  @Input() inPlaceSearch = true;
+  @Input() inPlaceSearch: boolean;
 
   /**
    * Whether or not the search bar should be visible
    */
-  @Input()
-  searchEnabled = true;
+  @Input() searchEnabled: boolean;
 
   /**
    * The width of the sidebar (bootstrap columns)
    */
   @Input()
-  sideBarWidth = 3;
+    sideBarWidth: number;
 
   /**
    * The currently applied configuration (determines title of search)
    */
   @Input()
-  configuration$: Observable<string>;
+    configuration$: Observable<string>;
 
   /**
    * The current context
    */
   @Input()
-  context: Context;
+    context: Context;
 
   protected inAndOutputNames: (keyof ConfigurationSearchPageComponent & keyof this)[] =
     ['context', 'configuration', 'fixedFilterQuery', 'inPlaceSearch', 'searchEnabled', 'sideBarWidth'];
@@ -66,7 +69,7 @@ export class ThemedConfigurationSearchPageComponent extends ThemedComponent<Conf
   }
 
   protected importUnthemedComponent(): Promise<any> {
-    return import(`./configuration-search-page.component`);
+    return import('./configuration-search-page.component');
   }
 
 }
diff --git a/src/app/search-page/themed-search-page.component.ts b/src/app/search-page/themed-search-page.component.ts
index 12acd6174c..295e1d7916 100644
--- a/src/app/search-page/themed-search-page.component.ts
+++ b/src/app/search-page/themed-search-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../shared/theme-support/themed.component';
 import { SearchPageComponent } from './search-page.component';
 
diff --git a/src/app/shared/abstract-component-loader/abstract-component-loader.component.html b/src/app/shared/abstract-component-loader/abstract-component-loader.component.html
new file mode 100644
index 0000000000..2035dbadd0
--- /dev/null
+++ b/src/app/shared/abstract-component-loader/abstract-component-loader.component.html
@@ -0,0 +1 @@
+<ng-template dsDynamicComponentLoader></ng-template>
diff --git a/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts b/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts
new file mode 100644
index 0000000000..5b52ed7b48
--- /dev/null
+++ b/src/app/shared/abstract-component-loader/abstract-component-loader.component.ts
@@ -0,0 +1,156 @@
+import {
+  Component,
+  ComponentRef,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild,
+  ViewContainerRef,
+} from '@angular/core';
+import { Subscription } from 'rxjs';
+
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { ThemeService } from '../theme-support/theme.service';
+import { DynamicComponentLoaderDirective } from './dynamic-component-loader.directive';
+
+/**
+ * To create a new loader component you will need to:
+ * <ul>
+ *   <li>Create a new LoaderComponent component extending this component</li>
+ *   <li>Point the templateUrl to this component's templateUrl</li>
+ *   <li>Add all the @Input()/@Output() names that the dynamically generated components should inherit from the loader to the inputNames/outputNames lists</li>
+ *   <li>Create a decorator file containing the new decorator function, a map containing all the collected {@link Component}s and a function to retrieve the {@link Component}</li>
+ *   <li>Call the function to retrieve the correct {@link Component} in getComponent()</li>
+ *   <li>Add all the @Input()s you had to used in getComponent() in the inputNamesDependentForComponent array</li>
+ * </ul>
+ */
+@Component({
+  selector: 'ds-abstract-component-loader',
+  templateUrl: './abstract-component-loader.component.html',
+})
+export abstract class AbstractComponentLoaderComponent<T> implements OnInit, OnChanges, OnDestroy {
+
+  /**
+   * Directive to determine where the dynamic child component is located
+   */
+  @ViewChild(DynamicComponentLoaderDirective, { static: true }) componentDirective: DynamicComponentLoaderDirective;
+
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<T>;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The @Input() that are used to find the matching component using {@link getComponent}. When the value of
+   * one of these @Input() change this loader needs to retrieve the best matching component again using the
+   * {@link getComponent} method.
+   */
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [];
+
+  /**
+   * The list of the @Input() names that should be passed down to the dynamically created components.
+   */
+  protected inputNames: (keyof this & string)[] = [];
+
+  /**
+   * The list of the @Output() names that should be passed down to the dynamically created components.
+   */
+  protected outputNames: (keyof this & string)[] = [];
+
+  constructor(
+    protected themeService: ThemeService,
+  ) {
+  }
+
+  /**
+   * Set up the dynamic child component
+   */
+  ngOnInit(): void {
+    this.instantiateComponent();
+  }
+
+  /**
+   * Whenever the inputs change, update the inputs of the dynamic component
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasValue(this.compRef)) {
+      if (this.inputNamesDependentForComponent.some((name: keyof this & string) => hasValue(changes[name]) && changes[name].previousValue !== changes[name].currentValue)) {
+        // Recreate the component when the @Input()s used by getComponent() aren't up-to-date anymore
+        this.destroyComponentInstance();
+        this.instantiateComponent();
+      } else {
+        this.connectInputsAndOutputs();
+      }
+    }
+  }
+
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription: Subscription) => hasValue(subscription))
+      .forEach((subscription: Subscription) => subscription.unsubscribe());
+    this.destroyComponentInstance();
+  }
+
+  /**
+   * Creates the component and connects the @Input() & @Output() from the ThemedComponent to its child Component.
+   */
+  public instantiateComponent(): void {
+    const component: GenericConstructor<T> = this.getComponent();
+
+    const viewContainerRef: ViewContainerRef = this.componentDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined,
+      },
+    );
+
+    this.connectInputsAndOutputs();
+  }
+
+  /**
+   * Destroys the themed component and calls it's `ngOnDestroy`
+   */
+  public destroyComponentInstance(): void {
+    if (hasValue(this.compRef)) {
+      this.compRef.destroy();
+      this.compRef = null;
+    }
+  }
+
+  /**
+   * Fetch the component depending on the item's entity type, metadata representation type and context
+   */
+  public abstract getComponent(): GenericConstructor<T>;
+
+  /**
+   * Connect the inputs and outputs of this component to the dynamic component,
+   * to ensure they're in sync, the ngOnChanges method will automatically be called by setInput
+   */
+  public connectInputsAndOutputs(): void {
+    if (isNotEmpty(this.inputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.inputNames.filter((name: string) => this[name] !== undefined).filter((name: string) => this[name] !== this.compRef.instance[name]).forEach((name: string) => {
+        // Using setInput will automatically trigger the ngOnChanges
+        this.compRef.setInput(name, this[name]);
+      });
+    }
+    if (isNotEmpty(this.outputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.outputNames.filter((name: string) => this[name] !== undefined).filter((name: string) => this[name] !== this.compRef.instance[name]).forEach((name: string) => {
+        this.compRef.instance[name] = this[name];
+      });
+    }
+  }
+
+}
diff --git a/src/app/shared/abstract-component-loader/dynamic-component-loader.directive.ts b/src/app/shared/abstract-component-loader/dynamic-component-loader.directive.ts
new file mode 100644
index 0000000000..b670b7bea4
--- /dev/null
+++ b/src/app/shared/abstract-component-loader/dynamic-component-loader.directive.ts
@@ -0,0 +1,19 @@
+import {
+  Directive,
+  ViewContainerRef,
+} from '@angular/core';
+
+/**
+ * Directive used as a hook to know where to inject the dynamic loaded component
+ */
+@Directive({
+  selector: '[dsDynamicComponentLoader]',
+})
+export class DynamicComponentLoaderDirective {
+
+  constructor(
+    public viewContainerRef: ViewContainerRef,
+  ) {
+  }
+
+}
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
new file mode 100644
index 0000000000..2ec3b51219
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.html
@@ -0,0 +1,112 @@
+<form #ngForm="ngForm">
+  <div *ngIf="showWarning" class="alert alert-warning">
+    {{'access-control-no-access-conditions-warning-message' | translate}}
+  </div>
+
+  <ng-container *ngFor="let control of form.accessControls; trackBy: trackById">
+    <div ngModelGroup="access-control-item-{{control.id}}" class="access-control-item mt-3">
+
+      <div class="d-flex flex-column">
+        <div>
+          <label for="accesscontroloption-{{control.id}}">
+            {{'access-control-option-label' | translate}}
+          </label>
+          <select
+            id="accesscontroloption-{{control.id}}"
+            [disabled]="ngForm.disabled"
+            [(ngModel)]="control.itemName"
+            (ngModelChange)="accessControlChanged(control, $event)"
+            name="itemName-{{control.id}}"
+            class="form-control">
+            <option value=""></option>
+            <option *ngFor="let option of dropdownOptions" [value]="option.name">
+              {{ option.name }}
+            </option>
+          </select>
+          <small class="form-text text-muted">
+            {{'access-control-option-note' | translate}}
+          </small>
+        </div>
+
+        <div *ngIf="control.hasStartDate" class="mt-3">
+          <label for="accesscontrolstartdate-{{control.id}}">
+            {{'access-control-option-start-date' | translate}}
+          </label>
+          <div class="input-group">
+            <input
+              id="accesscontrolstartdate-{{control.id}}"
+              class="form-control"
+              placeholder="yyyy-mm-dd"
+              [(ngModel)]="control.startDate"
+              name="startDate-{{control.id}}"
+              [maxDate]="control.maxStartDate | toDate"
+              ngbDatepicker
+              placement="top-start top-end bottom-start bottom-end"
+              #d="ngbDatepicker"
+            />
+            <div class="input-group-append">
+              <button
+                class="btn btn-outline-secondary fas fa-calendar"
+                [disabled]="ngForm.disabled"
+                (click)="d.toggle()" type="button">
+              </button>
+            </div>
+          </div>
+          <small class="form-text text-muted">
+            {{'access-control-option-start-date-note' | translate}}
+          </small>
+        </div>
+
+        <div *ngIf="control.hasEndDate" class="mt-3">
+          <label for="accesscontrolenddate-{{control.id}}">
+            {{'access-control-option-end-date' | translate}}
+          </label>
+          <div class="input-group">
+            <input
+              id="accesscontrolenddate-{{control.id}}"
+              class="form-control"
+              placeholder="yyyy-mm-dd"
+              [(ngModel)]="control.endDate"
+              name="endDate-{{control.id}}"
+              [maxDate]="control.maxEndDate | toDate"
+              ngbDatepicker
+              placement="top-start top-end bottom-start bottom-end"
+              #d1="ngbDatepicker"
+            />
+            <div class="input-group-append">
+              <button
+                type="button" class="btn btn-outline-secondary fas fa-calendar"
+                [disabled]="ngForm.disabled"
+                (click)="d1.toggle()">
+              </button>
+            </div>
+          </div>
+          <small class="form-text text-muted">
+            {{'access-control-option-end-date-note' | translate}}
+          </small>
+        </div>
+      </div>
+
+      <div>
+        <span aria-hidden="true" class="mb-2 d-inline-block">&nbsp;</span>
+        <div class="input-group">
+
+          <button type="button" class="btn btn-outline-danger"
+                  [attr.aria-label]="'access-control-remove' | translate"
+                  [disabled]="ngForm.disabled || form.accessControls.length === 1"
+                  (click)="removeAccessControlItem(control.id)">
+            <i class="fas fa-trash"></i>
+          </button>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+
+  <button type="button" id="add-btn-{{type}}" class="btn btn-outline-primary mt-3"
+          [disabled]="ngForm.disabled"
+          (click)="addAccessControlItem()">
+    <i class="fas fa-plus"></i>
+    {{'access-control-add-more' | translate}}
+  </button>
+
+</form>
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.scss b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.scss
new file mode 100644
index 0000000000..43cc0789b2
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.scss
@@ -0,0 +1,7 @@
+.access-control-item {
+  display: grid;
+  grid-template-columns: 1fr 50px;
+  grid-gap: 10px;
+  padding-bottom: 15px;
+  border-bottom: 2px dotted grey;
+}
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
new file mode 100644
index 0000000000..827f749f3d
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.spec.ts
@@ -0,0 +1,119 @@
+import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SharedBrowseByModule } from '../../browse-by/shared-browse-by.module';
+import { AccessControlArrayFormComponent } from './access-control-array-form.component';
+import { ToDatePipe } from './to-date.pipe';
+
+describe('AccessControlArrayFormComponent', () => {
+  let component: AccessControlArrayFormComponent;
+  let fixture: ComponentFixture<AccessControlArrayFormComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ CommonModule, FormsModule, SharedBrowseByModule, TranslateModule.forRoot(), NgbDatepickerModule ],
+      declarations: [ AccessControlArrayFormComponent, ToDatePipe  ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AccessControlArrayFormComponent);
+    component = fixture.componentInstance;
+    component.dropdownOptions = [{ name: 'Option1' }, { name: 'Option2' }] as any;
+    component.type = 'item';
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have only one empty control access item in the form',  () => {
+    const accessControlItems = fixture.debugElement.queryAll(By.css('.access-control-item'));
+    expect(accessControlItems.length).toEqual(1);
+  });
+
+  it('should add access control item', () => {
+    component.addAccessControlItem();
+    expect(component.form.accessControls.length).toEqual(2);
+  });
+
+  it('should remove access control item', () => {
+    expect(component.form.accessControls.length).toEqual(1);
+
+    component.addAccessControlItem();
+    expect(component.form.accessControls.length).toEqual(2);
+
+    const id = component.form.accessControls[0].id;
+    component.removeAccessControlItem(id);
+    expect(component.form.accessControls.length).toEqual(1);
+  });
+
+  it('should reset form value', () => {
+    const item = { itemName: 'item1', startDate: '2022-01-01', endDate: '2022-02-01' };
+    component.addAccessControlItem(item.itemName);
+
+    // set value to item1
+    component.accessControlChanged(
+      component.form.accessControls[1],
+      'item1',
+    );
+
+    component.reset();
+    expect(component.form.accessControls[1]?.itemName).toEqual(undefined);
+  });
+
+
+  it('should display a select dropdown with options', () => {
+    component.enable();
+    fixture.detectChanges();
+
+    const id = component.form.accessControls[0].id;
+
+    const selectElement: DebugElement = fixture.debugElement.query(By.css(`select#accesscontroloption-${id}`));
+    expect(selectElement).toBeTruthy();
+
+    const options = selectElement.nativeElement.querySelectorAll('option');
+    expect(options.length).toEqual(3); // 2 options + default empty option
+
+    expect(options[0].value).toEqual('');
+    expect(options[1].value).toEqual('Option1');
+    expect(options[2].value).toEqual('Option2');
+  });
+
+  it('should add new access control items when clicking "Add more" button', () => {
+    component.enable();
+    fixture.detectChanges();
+
+    const addButton: DebugElement = fixture.debugElement.query(By.css(`button#add-btn-${component.type}`));
+    addButton.nativeElement.click();
+    fixture.detectChanges();
+
+    const accessControlItems = fixture.debugElement.queryAll(By.css('.access-control-item'));
+    expect(accessControlItems.length).toEqual(2);
+  });
+
+  it('should remove access control items when clicking remove button', () => {
+    component.enable();
+
+    component.addAccessControlItem('test');
+
+    fixture.detectChanges();
+
+    const removeButton: DebugElement[] = fixture.debugElement.queryAll(By.css('button.btn-outline-danger'));
+    removeButton[1].nativeElement.click();
+    fixture.detectChanges();
+
+    const accessControlItems = fixture.debugElement.queryAll(By.css('.access-control-item'));
+    expect(accessControlItems.length).toEqual(1);
+  });
+});
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
new file mode 100644
index 0000000000..a8248fdb7d
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-array-form/access-control-array-form.component.ts
@@ -0,0 +1,156 @@
+import {
+  Component,
+  Input,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { NgForm } from '@angular/forms';
+
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
+import { dateToISOFormat } from '../../date.util';
+
+@Component({
+  selector: 'ds-access-control-array-form',
+  templateUrl: './access-control-array-form.component.html',
+  styleUrls: ['./access-control-array-form.component.scss'],
+  exportAs: 'accessControlArrayForm',
+})
+export class AccessControlArrayFormComponent implements OnInit {
+  @Input() dropdownOptions: AccessesConditionOption[] = [];
+  @Input() mode!: 'add' | 'replace';
+  @Input() type!: 'item' | 'bitstream';
+
+  @ViewChild('ngForm', { static: true }) ngForm!: NgForm;
+
+  form: { accessControls: AccessControlItem[] } = {
+    accessControls: [emptyAccessControlItem()], // Start with one empty access control item
+  };
+
+  formDisabled = true;
+
+  ngOnInit(): void {
+    this.disable(); // Disable the form by default
+  }
+
+  get allControlsAreEmpty() {
+    return this.form.accessControls
+      .every(x => x.itemName === null || x.itemName === '');
+  }
+
+  get showWarning() {
+    return this.mode === 'replace' && this.allControlsAreEmpty && !this.formDisabled;
+  }
+
+  /**
+   * Add a new access control item to the form.
+   * Start and end date are disabled by default.
+   * @param itemName The name of the item to add
+   */
+  addAccessControlItem(itemName: string = null) {
+    this.form.accessControls = [
+      ...this.form.accessControls,
+      { ...emptyAccessControlItem(), itemName },
+    ];
+  }
+
+  /**
+   * Remove an access control item from the form.
+   * @param ngModelGroup
+   * @param index
+   */
+  removeAccessControlItem(id: number) {
+    this.form.accessControls = this.form.accessControls.filter(item => item.id !== id);
+  }
+
+  /**
+   * Get the value of the form.
+   * This will be used to read the form value from the parent component.
+   * @return The form value
+   */
+  getValue() {
+    return this.form.accessControls
+      .filter(x => x.itemName !== null && x.itemName !== '')
+      .map(x => ({
+        name: x.itemName,
+        startDate: (x.startDate ? dateToISOFormat(x.startDate) : null),
+        endDate: (x.endDate ? dateToISOFormat(x.endDate) : null),
+      }));
+  }
+
+  /**
+   * Set the value of the form from the parent component.
+   */
+  reset() {
+    this.form.accessControls = [];
+
+    // Add an empty access control item by default
+    this.addAccessControlItem();
+
+    this.disable();
+  }
+
+  /**
+   * Disable the form.
+   * This will be used to disable the form from the parent component.
+   */
+  disable = () => {
+    this.ngForm.form.disable();
+    this.formDisabled = true;
+  };
+
+  /**
+   * Enable the form.
+   * This will be used to enable the form from the parent component.
+   */
+  enable = () => {
+    this.ngForm.form.enable();
+    this.formDisabled = false;
+  };
+
+  accessControlChanged(control: AccessControlItem, selectedItem: string) {
+    const item = this.dropdownOptions
+      .find((x) => x.name === selectedItem);
+
+    control.startDate = null;
+    control.endDate = null;
+
+    control.hasStartDate = item?.hasStartDate || false;
+    control.hasEndDate = item?.hasEndDate || false;
+
+    control.maxStartDate = item?.maxStartDate || null;
+    control.maxEndDate = item?.maxEndDate || null;
+  }
+
+  trackById(index: number, item: AccessControlItem) {
+    return item.id;
+  }
+
+}
+
+
+export interface AccessControlItem {
+  id: number; // will be used only locally
+
+  itemName: string | null;
+
+  hasStartDate?: boolean;
+  startDate: string | null;
+  maxStartDate?: string | null;
+
+  hasEndDate?: boolean;
+  endDate: string | null;
+  maxEndDate?: string | null;
+}
+
+const emptyAccessControlItem = (): AccessControlItem => ({
+  id: randomID(),
+  itemName: null,
+  startDate: null,
+  hasStartDate: false,
+  maxStartDate: null,
+  endDate: null,
+  hasEndDate: false,
+  maxEndDate: null,
+});
+
+const randomID = () => Math.floor(Math.random() * 1000000);
diff --git a/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts b/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts
new file mode 100644
index 0000000000..7c2817c96a
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-array-form/to-date.pipe.ts
@@ -0,0 +1,26 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap/datepicker/ngb-date-struct';
+
+@Pipe({
+  // eslint-disable-next-line @angular-eslint/pipe-prefix
+  name: 'toDate',
+  pure: false,
+})
+export class ToDatePipe implements PipeTransform {
+  transform(dateValue: string | null): NgbDateStruct | null {
+    if (!dateValue) {
+      return null;
+    }
+
+    const date = new Date(dateValue);
+    return {
+      year: date.getFullYear(),
+      month: date.getMonth() + 1,
+      day: date.getDate(),
+    } as NgbDateStruct;
+  }
+
+}
diff --git a/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts b/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts
new file mode 100644
index 0000000000..15f4a72e46
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-form-container-intial-state.ts
@@ -0,0 +1,27 @@
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+
+export const createAccessControlInitialFormState = (): AccessControlFormState => ({
+  item: {
+    toggleStatus: false,
+    accessMode: 'replace',
+  },
+  bitstream: {
+    toggleStatus: false,
+    accessMode: 'replace',
+    changesLimit: 'all', // 'all' | 'selected'
+    selectedBitstreams: [] as ListableObject[],
+  },
+});
+
+export interface AccessControlFormState {
+  item: {
+    toggleStatus: boolean,
+    accessMode: 'add' | 'replace',
+  },
+  bitstream: {
+    toggleStatus: boolean,
+    accessMode: 'add' | 'replace',
+    changesLimit: string,
+    selectedBitstreams: ListableObject[],
+  }
+}
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
new file mode 100644
index 0000000000..ce0f5845c6
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.html
@@ -0,0 +1,171 @@
+<div class="container">
+  <div class="card border-0">
+    <div class="card-body">
+      <ds-alert
+        *ngIf="titleMessage"
+        [type]="AlertType.Info"
+        [content]="titleMessage"
+        class="d-block pb-3">
+      </ds-alert>
+
+      <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">
+              <h2 class="h3 mb-0 mr-4">
+                {{ 'access-control-item-header-toggle' | translate }}
+              </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>
+
+            <fieldset class="row mt-3">
+              <legend class="h4 col-12 col-md-3">
+                {{ 'access-control-mode' | translate }}
+              </legend>
+              <div class="col-12 col-md-8">
+                <div class="form-check">
+                  <input class="form-check-input" type="radio"
+                         name="itemMode" id="itemReplace" value="replace"
+                         [disabled]="!state.item.toggleStatus"
+                         [(ngModel)]="state.item.accessMode">
+                  <label class="form-check-label" for="itemReplace">
+                    {{'access-control-replace-all' | translate}}
+                  </label>
+                </div>
+                <div class="form-check">
+                  <input class="form-check-input" type="radio"
+                         name="itemMode" id="itemAdd" value="add"
+                         [disabled]="!state.item.toggleStatus"
+                         [(ngModel)]="state.item.accessMode">
+                  <label class="form-check-label" for="itemAdd">
+                    {{'access-control-add-to-existing' | translate}}
+                  </label>
+                </div>
+              </div>
+            </fieldset>
+          </div>
+
+          <div>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
+
+            <ds-access-control-array-form
+              #itemAccessCmp
+              [type]="'item'"
+              [mode]="state.item.accessMode"
+              [dropdownOptions]="(dropdownData$ | async)?.itemAccessConditionOptions || []">
+            </ds-access-control-array-form>
+          </div>
+
+        </div>
+
+        <div class="col-12 col-md-6 d-flex flex-column justify-content-between">
+
+          <div>
+            <div class="d-flex align-items-center">
+              <h2 class="h3 mb-0 mr-4">
+                {{'access-control-bitstream-header-toggle' | translate}}
+              </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">
+            <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"
+                       [disabled]="!state.bitstream.toggleStatus"
+                       [(ngModel)]="state.bitstream.changesLimit">
+                <label class="form-check-label" for="processAll">
+                  {{'access-control-process-all-bitstreams' | translate}}
+                </label>
+              </div>
+              <div class="form-check">
+                <input class="form-check-input mt-2" type="radio"
+                       name="changesLimit" id="processSelected" value="selected"
+                       [disabled]="!state.bitstream.toggleStatus"
+                       [(ngModel)]="state.bitstream.changesLimit">
+                <label class="form-check-label" for="processSelected">
+                  {{ state.bitstream.selectedBitstreams.length }}
+                  {{'access-control-bitstreams-selected' | translate}}
+
+                  <button
+                    *ngIf="itemRD"
+                    [attr.aria-label]="'access-control-bitstreams-select' | translate"
+                    [disabled]="!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>
+                  </button>
+
+                </label>
+              </div>
+            </fieldset>
+            </div>
+          </div>
+
+          <fieldset class="row mt-3">
+            <legend class="h4 col-12 col-md-3">
+              {{'access-control-mode' | translate}}
+            </legend>
+            <div class="col-12 col-md-8">
+              <div class="form-check">
+                <input class="form-check-input" type="radio"
+                       name="bitstreamMode" id="bitstreamReplace" value="replace"
+                       [disabled]="!state.bitstream.toggleStatus"
+                       [(ngModel)]="state.bitstream.accessMode">
+                <label class="form-check-label" for="bitstreamReplace">
+                  {{'access-control-replace-all' | translate}}
+                </label>
+              </div>
+              <div class="form-check">
+                <input class="form-check-input" type="radio"
+                       name="bitstreamMode" id="bitstreamAdd" value="add"
+                       [disabled]="!state.bitstream.toggleStatus"
+                       [(ngModel)]="state.bitstream.accessMode">
+                <label class="form-check-label" for="bitstreamAdd">
+                  {{'access-control-add-to-existing' | translate}}
+                </label>
+              </div>
+            </div>
+          </fieldset>
+
+          <div>
+            <h3 class="h4 mt-3">{{'access-control-access-conditions' | translate}}</h3>
+
+            <ds-access-control-array-form
+              #bitstreamAccessCmp
+              [type]="'bitstream'"
+              [mode]="state.bitstream.accessMode"
+              [dropdownOptions]="(dropdownData$ | async)?.bitstreamAccessConditionOptions || []">
+            </ds-access-control-array-form>
+          </div>
+        </div>
+      </div>
+
+      <hr *ngIf="showSubmit">
+
+      <div *ngIf="showSubmit" class="d-flex justify-content-end">
+        <button class="btn btn-outline-primary mr-3" (click)="reset()" type="button">
+          {{ 'access-control-cancel' | translate }}
+        </button>
+        <button class="btn btn-primary"
+                [disabled]="!state.item.toggleStatus && !state.bitstream.toggleStatus"
+                (click)="submit()" type="submit">
+          {{ 'access-control-execute' | translate }}
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.scss b/src/app/shared/access-control-form-container/access-control-form-container.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
new file mode 100644
index 0000000000..cde4d8ecde
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.spec.ts
@@ -0,0 +1,156 @@
+import { CommonModule } from '@angular/common';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import {
+  NgbDatepickerModule,
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
+import { of } from 'rxjs';
+
+import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
+import { Item } from '../../core/shared/item.model';
+import { SharedBrowseByModule } from '../browse-by/shared-browse-by.module';
+import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import { AccessControlFormModule } from './access-control-form.module';
+import { AccessControlFormContainerComponent } from './access-control-form-container.component';
+import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
+import { BulkAccessControlService } from './bulk-access-control.service';
+import { ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
+
+
+describe('AccessControlFormContainerComponent', () => {
+  let component: AccessControlFormContainerComponent<any>;
+  let fixture: ComponentFixture<AccessControlFormContainerComponent<any>>;
+
+
+  // Mock NgbModal
+  @Component({ selector: 'ds-ngb-modal', template: '' })
+  class MockNgbModalComponent {
+  }
+
+  // Mock dependencies
+  const mockBulkAccessControlService = {
+    createPayloadFile: jasmine.createSpy('createPayloadFile').and.returnValue({ file: 'mocked-file' }),
+    executeScript: jasmine.createSpy('executeScript').and.returnValue(of('success')),
+  };
+
+  const mockBulkAccessConfigDataService = {
+    findByName: jasmine.createSpy('findByName').and.returnValue(of({ payload: { options: [] } })),
+  };
+
+  const mockSelectableListService = {
+    getSelectableList: jasmine.createSpy('getSelectableList').and.returnValue(of({ selection: [] })),
+    deselectAll: jasmine.createSpy('deselectAll'),
+  };
+
+  const mockNgbModal = {
+    open: jasmine.createSpy('open').and.returnValue(
+      { componentInstance: {}, closed: of({}) } as NgbModalRef,
+    ),
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AccessControlFormContainerComponent, MockNgbModalComponent],
+      imports: [
+        CommonModule,
+        FormsModule,
+        SharedBrowseByModule,
+        AccessControlFormModule,
+        TranslateModule.forRoot(),
+        NgbDatepickerModule,
+        UiSwitchModule,
+      ],
+      providers: [
+        { provide: BulkAccessControlService, useValue: mockBulkAccessControlService },
+        { provide: BulkAccessConfigDataService, useValue: mockBulkAccessConfigDataService },
+        { provide: SelectableListService, useValue: mockSelectableListService },
+        { provide: NgbModal, useValue: mockNgbModal },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AccessControlFormContainerComponent);
+    component = fixture.componentInstance;
+    component.state = createAccessControlInitialFormState();
+    fixture.detectChanges();
+  });
+
+  it('should create the component', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should reset the form', fakeAsync(() => {
+    fixture.detectChanges();
+    const resetSpy = spyOn(component.bitstreamAccessCmp, 'reset');
+    spyOn(component.itemAccessCmp, 'reset');
+
+    component.reset();
+
+    expect(resetSpy).toHaveBeenCalled();
+    expect(component.itemAccessCmp.reset).toHaveBeenCalled();
+    expect(component.state).toEqual(createAccessControlInitialFormState());
+  }));
+
+  it('should submit the form', () => {
+    const bitstreamAccess = 'bitstreamAccess';
+    const itemAccess = 'itemAccess';
+    component.bitstreamAccessCmp.getValue = jasmine.createSpy('getValue').and.returnValue(bitstreamAccess);
+    component.itemAccessCmp.getValue = jasmine.createSpy('getValue').and.returnValue(itemAccess);
+    component.itemRD = { payload: { uuid: 'item-uuid' } } as any;
+
+    component.submit();
+
+    expect(mockBulkAccessControlService.createPayloadFile).toHaveBeenCalledWith({
+      bitstreamAccess,
+      itemAccess,
+      state: createAccessControlInitialFormState(),
+    });
+    expect(mockBulkAccessControlService.executeScript).toHaveBeenCalledWith(['item-uuid'], 'mocked-file');
+  });
+
+  it('should handle the status change for bitstream access', () => {
+    component.bitstreamAccessCmp.enable = jasmine.createSpy('enable');
+    component.bitstreamAccessCmp.disable = jasmine.createSpy('disable');
+
+    component.handleStatusChange('bitstream', true);
+    expect(component.bitstreamAccessCmp.enable).toHaveBeenCalled();
+
+    component.handleStatusChange('bitstream', false);
+    expect(component.bitstreamAccessCmp.disable).toHaveBeenCalled();
+  });
+
+  it('should handle the status change for item access', () => {
+    component.itemAccessCmp.enable = jasmine.createSpy('enable');
+    component.itemAccessCmp.disable = jasmine.createSpy('disable');
+
+    component.handleStatusChange('item', true);
+    expect(component.itemAccessCmp.enable).toHaveBeenCalled();
+
+    component.handleStatusChange('item', false);
+    expect(component.itemAccessCmp.disable).toHaveBeenCalled();
+  });
+
+  it('should open the select bitstreams modal', () => {
+    const modalService = TestBed.inject(NgbModal);
+
+    component.openSelectBitstreamsModal(new Item());
+    expect(modalService.open).toHaveBeenCalled();
+  });
+
+  it('should unsubscribe and deselect all on component destroy', () => {
+    component.ngOnDestroy();
+    expect(component.selectableListService.deselectAll).toHaveBeenCalledWith(
+      ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID,
+    );
+  });
+});
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
new file mode 100644
index 0000000000..04c5179212
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-form-container.component.ts
@@ -0,0 +1,172 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  ViewChild,
+} from '@angular/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  concatMap,
+  Observable,
+  shareReplay,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { BulkAccessConfigDataService } from '../../core/config/bulk-access-config-data.service';
+import { BulkAccessConditionOptions } from '../../core/config/models/bulk-access-condition-options.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { AlertType } from '../alert/alert-type';
+import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
+import { createAccessControlInitialFormState } from './access-control-form-container-intial-state';
+import { BulkAccessControlService } from './bulk-access-control.service';
+import {
+  ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID,
+  ItemAccessControlSelectBitstreamsModalComponent,
+} from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
+
+@Component({
+  selector: 'ds-access-control-form-container',
+  templateUrl: './access-control-form-container.component.html',
+  styleUrls: [ './access-control-form-container.component.scss' ],
+  exportAs: 'dsAccessControlForm',
+})
+export class AccessControlFormContainerComponent<T extends DSpaceObject> implements OnDestroy {
+
+  /**
+   * Will be used to determine if we need to show the limit changes to specific bitstreams radio buttons
+   */
+  @Input() showLimitToSpecificBitstreams = false;
+
+  /**
+   * The title message of the access control form (translate key)
+   */
+  @Input() titleMessage = '';
+
+  /**
+   * The item to which the access control form applies
+   */
+  @Input() itemRD: RemoteData<T>;
+
+  /**
+   * Whether to show the submit and cancel button
+   * We want to hide these buttons when the form is
+   * used in an accordion, and we want to show buttons somewhere else
+   */
+  @Input() showSubmit = true;
+
+  @ViewChild('bitstreamAccessCmp', { static: true }) bitstreamAccessCmp: AccessControlArrayFormComponent;
+  @ViewChild('itemAccessCmp', { static: true }) itemAccessCmp: AccessControlArrayFormComponent;
+
+  readonly AlertType = AlertType;
+
+  constructor(
+    private bulkAccessConfigService: BulkAccessConfigDataService,
+    private bulkAccessControlService: BulkAccessControlService,
+    public selectableListService: SelectableListService,
+    protected modalService: NgbModal,
+    private cdr: ChangeDetectorRef,
+  ) {}
+
+  state = createAccessControlInitialFormState();
+
+  dropdownData$: Observable<BulkAccessConditionOptions> = this.bulkAccessConfigService.findByName('default').pipe(
+    getFirstCompletedRemoteData(),
+    map((configRD: RemoteData<BulkAccessConditionOptions>) => configRD.hasSucceeded ? configRD.payload : null),
+    shareReplay({ refCount: false, bufferSize: 1 }),
+  );
+
+  /**
+   * Will be used from a parent component to read the value of the form
+   */
+  getFormValue() {
+    console.log({
+      bitstream: this.bitstreamAccessCmp.getValue(),
+      item: this.itemAccessCmp.getValue(),
+      state: this.state,
+    });
+    return {
+      bitstream: this.bitstreamAccessCmp.getValue(),
+      item: this.itemAccessCmp.getValue(),
+      state: this.state,
+    };
+  }
+
+  /**
+   * Reset the form to its initial state
+   * This will also reset the state of the child components (bitstream and item access)
+   */
+  reset() {
+    this.bitstreamAccessCmp.reset();
+    this.itemAccessCmp.reset();
+    this.state = createAccessControlInitialFormState();
+  }
+
+  /**
+   * Submit the form
+   * This will create a payload file and execute the script
+   */
+  submit() {
+    const bitstreamAccess = this.bitstreamAccessCmp.getValue();
+    const itemAccess = this.itemAccessCmp.getValue();
+
+    const { file } = this.bulkAccessControlService.createPayloadFile({
+      bitstreamAccess,
+      itemAccess,
+      state: this.state,
+    });
+
+    this.bulkAccessControlService.executeScript(
+      [ this.itemRD.payload.uuid ],
+      file,
+    ).pipe(take(1)).subscribe((res) => {
+      console.log('success', res);
+    });
+  }
+
+  /**
+   * Handle the status change of the access control form (item or bitstream)
+   * This will enable/disable the access control form for the item or bitstream
+   * @param type The type of the access control form (item or bitstream)
+   * @param active boolean indicating whether the access control form should be enabled or disabled
+   */
+  handleStatusChange(type: 'item' | 'bitstream', active: boolean) {
+    if (type === 'bitstream') {
+      active ? this.bitstreamAccessCmp.enable() : this.bitstreamAccessCmp.disable();
+    } else if (type === 'item') {
+      active ? this.itemAccessCmp.enable() : this.itemAccessCmp.disable();
+    }
+  }
+
+  /**
+   * Open the modal to select bitstreams for which to change the access control
+   * This will open the modal and pass the currently selected bitstreams
+   * @param item The item for which to change the access control
+   */
+  openSelectBitstreamsModal(item: Item) {
+    const ref = this.modalService.open(ItemAccessControlSelectBitstreamsModalComponent);
+    ref.componentInstance.selectedBitstreams = this.state.bitstream.selectedBitstreams;
+    ref.componentInstance.item = item;
+
+    ref.closed.pipe(
+      concatMap(() => this.selectableListService.getSelectableList(ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID)),
+      take(1),
+    ).subscribe((list) => {
+      this.state.bitstream.selectedBitstreams = list?.selection || [];
+      this.cdr.detectChanges();
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.selectableListService.deselectAll(ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID);
+  }
+
+}
+
diff --git a/src/app/shared/access-control-form-container/access-control-form.module.ts b/src/app/shared/access-control-form-container/access-control-form.module.ts
new file mode 100644
index 0000000000..075d85d4d1
--- /dev/null
+++ b/src/app/shared/access-control-form-container/access-control-form.module.ts
@@ -0,0 +1,29 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
+import { SharedModule } from '../shared.module';
+import { AccessControlArrayFormComponent } from './access-control-array-form/access-control-array-form.component';
+import { ToDatePipe } from './access-control-array-form/to-date.pipe';
+import { AccessControlFormContainerComponent } from './access-control-form-container.component';
+import { ItemAccessControlSelectBitstreamsModalComponent } from './item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    TranslateModule,
+    UiSwitchModule,
+    NgbDatepickerModule,
+  ],
+  declarations: [
+    AccessControlFormContainerComponent,
+    AccessControlArrayFormComponent,
+    ItemAccessControlSelectBitstreamsModalComponent,
+    ToDatePipe,
+  ],
+  exports: [ AccessControlFormContainerComponent, AccessControlArrayFormComponent ],
+})
+export class AccessControlFormModule {}
diff --git a/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts b/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts
new file mode 100644
index 0000000000..9539e63e39
--- /dev/null
+++ b/src/app/shared/access-control-form-container/bulk-access-control.service.spec.ts
@@ -0,0 +1,94 @@
+import { TestBed } from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { Process } from '../../process-page/processes/process.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { NotificationsService } from '../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { BulkAccessControlService } from './bulk-access-control.service';
+
+describe('BulkAccessControlService', () => {
+  let service: BulkAccessControlService;
+  let scriptServiceSpy: jasmine.SpyObj<ScriptDataService>;
+
+  const mockPayload: any = {
+    'bitstream': [],
+    'item': [
+      {
+        'name': 'embargo',
+        'startDate': {
+          'year': 2026,
+          'month': 5,
+          'day': 31,
+        },
+        'endDate': null,
+      },
+    ],
+    'state': {
+      'item': {
+        'toggleStatus': true,
+        'accessMode': 'replace',
+      },
+      'bitstream': {
+        'toggleStatus': false,
+        'accessMode': '',
+        'changesLimit': '',
+        'selectedBitstreams': [],
+      },
+    },
+  };
+
+  beforeEach(() => {
+    const spy = jasmine.createSpyObj('ScriptDataService', ['invoke']);
+    TestBed.configureTestingModule({
+      imports: [
+        RouterTestingModule,
+        TranslateModule.forRoot(),
+      ],
+      providers: [
+        BulkAccessControlService,
+        { provide: ScriptDataService, useValue: spy },
+        { provide: NotificationsService, useValue: NotificationsServiceStub },
+      ],
+    });
+    service = TestBed.inject(BulkAccessControlService);
+    scriptServiceSpy = TestBed.inject(ScriptDataService) as jasmine.SpyObj<ScriptDataService>;
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('createPayloadFile', () => {
+    it('should create a file and return the URL and file object', () => {
+      const payload = mockPayload;
+      const result = service.createPayloadFile(payload);
+
+      expect(result.url).toBeTruthy();
+      expect(result.file).toBeTruthy();
+    });
+  });
+
+  describe('executeScript', () => {
+    it('should invoke the script service with the correct parameters', () => {
+      const uuids = ['123', '456'];
+      const file = new File(['test'], 'data.json', { type: 'application/json' });
+      const expectedParams: ProcessParameter[] = [
+        { name: '-f', value: 'data.json' },
+        { name: '-u', value: '123' },
+        { name: '-u', value: '456' },
+      ];
+
+      // @ts-ignore
+      scriptServiceSpy.invoke.and.returnValue(createSuccessfulRemoteDataObject$(new Process()));
+
+      const result = service.executeScript(uuids, file);
+
+      expect(scriptServiceSpy.invoke).toHaveBeenCalledWith('bulk-access-control', expectedParams, [file]);
+      expect(result).toBeTruthy();
+    });
+  });
+});
diff --git a/src/app/shared/access-control-form-container/bulk-access-control.service.ts b/src/app/shared/access-control-form-container/bulk-access-control.service.ts
new file mode 100644
index 0000000000..f3c284e358
--- /dev/null
+++ b/src/app/shared/access-control-form-container/bulk-access-control.service.ts
@@ -0,0 +1,145 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { ScriptDataService } from '../../core/data/processes/script-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { getProcessDetailRoute } from '../../process-page/process-page-routing.paths';
+import { Process } from '../../process-page/processes/process.model';
+import { ProcessParameter } from '../../process-page/processes/process-parameter.model';
+import { isNotEmpty } from '../empty.util';
+import { NotificationsService } from '../notifications/notifications.service';
+import { AccessControlFormState } from './access-control-form-container-intial-state';
+
+export interface BulkAccessPayload {
+  state: AccessControlFormState;
+  bitstreamAccess: any;
+  itemAccess: any;
+}
+
+/**
+ * This service is used to create a payload file and execute the bulk access control script
+ */
+@Injectable({ providedIn: 'root' })
+export class BulkAccessControlService {
+  constructor(
+    private notificationsService: NotificationsService,
+    private router: Router,
+    private scriptService: ScriptDataService,
+    private translationService: TranslateService,
+  ) {}
+
+  /**
+   * Create a payload file from the given payload and return the file and the url to the file
+   * The created file will be used as input for the bulk access control script
+   * @param payload The payload to create the file from
+   */
+  createPayloadFile(payload: BulkAccessPayload) {
+    const content = convertToBulkAccessControlFileModel(payload);
+
+    const blob = new Blob([JSON.stringify(content, null, 2)], {
+      type: 'application/json',
+    });
+
+    const file = new File([blob], 'data.json', {
+      type: 'application/json',
+    });
+
+    const url = URL.createObjectURL(file);
+
+    return { url, file };
+  }
+
+  /**
+   * Execute the bulk access control script with the given uuids and file
+   * @param uuids
+   * @param file
+   */
+  executeScript(uuids: string[], file: File): Observable<boolean> {
+    console.log('execute', { uuids, file });
+
+    const params: ProcessParameter[] = [
+      { name: '-f', value: file.name },
+    ];
+    uuids.forEach((uuid) => {
+      params.push({ name: '-u', value: uuid });
+    });
+
+    return this.scriptService.invoke('bulk-access-control', params, [file]).pipe(
+      getFirstCompletedRemoteData(),
+      map((rd: RemoteData<Process>) => {
+        if (rd.hasSucceeded) {
+          const title = this.translationService.get('process.new.notification.success.title');
+          const content = this.translationService.get('process.new.notification.success.content');
+          this.notificationsService.success(title, content);
+          if (isNotEmpty(rd.payload)) {
+            this.router.navigateByUrl(getProcessDetailRoute(rd.payload.processId));
+          }
+          return true;
+        } else {
+          const title = this.translationService.get('process.new.notification.error.title');
+          const content = this.translationService.get('process.new.notification.error.content');
+          this.notificationsService.error(title, content);
+          return false;
+        }
+      }),
+    );
+  }
+}
+
+/**
+ * Convert the given payload to a BulkAccessControlFileModel
+ * @param payload
+ */
+export const convertToBulkAccessControlFileModel = (payload: { state: AccessControlFormState, bitstreamAccess: AccessCondition[], itemAccess: AccessCondition[] }): BulkAccessControlFileModel => {
+  const finalPayload: BulkAccessControlFileModel = {};
+
+  const itemEnabled = payload.state.item.toggleStatus;
+  const bitstreamEnabled = payload.state.bitstream.toggleStatus;
+
+  if (itemEnabled) {
+    finalPayload.item = {
+      mode: payload.state.item.accessMode,
+      accessConditions: payload.itemAccess,
+    };
+  }
+
+  if (bitstreamEnabled) {
+    const constraints = { uuid: [] };
+
+    if (bitstreamEnabled && payload.state.bitstream.changesLimit === 'selected') {
+      // @ts-ignore
+      constraints.uuid = payload.state.bitstream.selectedBitstreams.map((x) => x.id);
+    }
+
+    finalPayload.bitstream = {
+      constraints,
+      mode: payload.state.bitstream.accessMode,
+      accessConditions: payload.bitstreamAccess,
+    };
+  }
+
+  return finalPayload;
+};
+
+
+export interface BulkAccessControlFileModel {
+  item?: {
+    mode: string;
+    accessConditions: AccessCondition[];
+  },
+  bitstream?: {
+    constraints: { uuid: string[] };
+    mode: string;
+    accessConditions: AccessCondition[];
+  }
+}
+
+interface AccessCondition {
+  name: string;
+  startDate?: string;
+  endDate?: string;
+}
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
new file mode 100644
index 0000000000..8cf0ecea38
--- /dev/null
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.html
@@ -0,0 +1,35 @@
+<div class="modal-header">
+  <h4 class="modal-title">
+    {{'access-control-select-bitstreams-modal.title' | translate}}
+  </h4>
+  <button type="button" class="close" aria-label="Close"
+          (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <ng-container *ngIf="data$ | async as data">
+    <ds-viewable-collection
+      *ngIf="data.payload.page.length > 0"
+      [config]="paginationConfig"
+      [context]="context"
+      [objects]="data"
+      [selectable]="true"
+      [selectionConfig]="{ repeatable: true, listId: LIST_ID }"
+      [showPaginator]="true"
+      (pageChange)="loadForPage($event)">
+    </ds-viewable-collection>
+
+    <div *ngIf="data && data.payload.page.length === 0"
+      class="alert alert-info w-100" role="alert">
+      {{'access-control-select-bitstreams-modal.no-items' | translate}}
+    </div>
+
+  </ng-container>
+</div>
+<div class="modal-footer">
+  <button type="button" class="btn btn-outline-dark"
+          (click)="activeModal.close('Close click')">
+    {{'access-control-select-bitstreams-modal.close' | translate}}
+  </button>
+</div>
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.scss b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
new file mode 100644
index 0000000000..d79375f18c
--- /dev/null
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.spec.ts
@@ -0,0 +1,28 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { ItemAccessControlSelectBitstreamsModalComponent } from './item-access-control-select-bitstreams-modal.component';
+
+xdescribe('ItemAccessControlSelectBitstreamsModalComponent', () => {
+  let component: ItemAccessControlSelectBitstreamsModalComponent;
+  let fixture: ComponentFixture<ItemAccessControlSelectBitstreamsModalComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ItemAccessControlSelectBitstreamsModalComponent ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ItemAccessControlSelectBitstreamsModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
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
new file mode 100644
index 0000000000..d63232aeff
--- /dev/null
+++ b/src/app/shared/access-control-form-container/item-access-control-select-bitstreams-modal/item-access-control-select-bitstreams-modal.component.ts
@@ -0,0 +1,67 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { BehaviorSubject } 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';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Item } from '../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { hasValue } from '../../empty.util';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+
+export const ITEM_ACCESS_CONTROL_SELECT_BITSTREAMS_LIST_ID = 'item-access-control-select-bitstreams';
+
+@Component({
+  selector: 'ds-item-access-control-select-bitstreams-modal',
+  templateUrl: './item-access-control-select-bitstreams-modal.component.html',
+  styleUrls: [ './item-access-control-select-bitstreams-modal.component.scss' ],
+})
+export class ItemAccessControlSelectBitstreamsModalComponent implements OnInit {
+
+  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;
+
+  context: Context = Context.Bitstream;
+
+  constructor(
+    private bitstreamService: BitstreamDataService,
+    protected paginationService: PaginationService,
+    protected translateService: TranslateService,
+    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;
+    }
+  }
+
+  loadForPage(page: number) {
+    this.bitstreamService.findAllByItemAndBundleName(this.item, 'ORIGINAL', { currentPage: page }, false)
+      .pipe(
+        getFirstCompletedRemoteData(),
+      )
+      .subscribe(this.data$);
+  }
+
+}
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..0ab860ed30 100644
--- a/src/app/shared/alert/alert.component.spec.ts
+++ b/src/app/shared/alert/alert.component.spec.ts
@@ -1,14 +1,25 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { TranslateModule } from '@ngx-translate/core';
 
-import { AlertComponent } from './alert.component';
 import { createTestComponent } from '../testing/utils.test';
-import { AlertType } from './aletr-type';
+import { AlertComponent } from './alert.component';
+import { AlertType } from './alert-type';
 
 describe('AlertComponent test suite', () => {
 
@@ -22,17 +33,17 @@ describe('AlertComponent test suite', () => {
         BrowserModule,
         CommonModule,
         NoopAnimationsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         AlertComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         ChangeDetectorRef,
-        AlertComponent
+        AlertComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -104,7 +115,7 @@ describe('AlertComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/alert/alert.component.ts b/src/app/shared/alert/alert.component.ts
index 93535d2057..90bef5cec3 100644
--- a/src/app/shared/alert/alert.component.ts
+++ b/src/app/shared/alert/alert.component.ts
@@ -1,8 +1,18 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
 import { trigger } from '@angular/animations';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
 
-import { AlertType } from './aletr-type';
-import { fadeOutLeave, fadeOutState } from '../animations/fade';
+import {
+  fadeOutLeave,
+  fadeOutState,
+} from '../animations/fade';
+import { AlertType } from './alert-type';
 
 /**
  * This component allow to create div that uses the Bootstrap's Alerts component.
@@ -13,10 +23,10 @@ import { fadeOutLeave, fadeOutState } from '../animations/fade';
   animations: [
     trigger('enterLeave', [
       fadeOutLeave, fadeOutState,
-    ])
+    ]),
   ],
   templateUrl: './alert.component.html',
-  styleUrls: ['./alert.component.scss']
+  styleUrls: ['./alert.component.scss'],
 })
 export class AlertComponent {
 
diff --git a/src/app/shared/animations/bgColor.ts b/src/app/shared/animations/bgColor.ts
index 91fd3116b1..f117656836 100644
--- a/src/app/shared/animations/bgColor.ts
+++ b/src/app/shared/animations/bgColor.ts
@@ -1,11 +1,12 @@
 import {
   animate,
   animateChild,
-  group, query,
+  group,
+  query,
   state,
   style,
   transition,
-  trigger
+  trigger,
 } from '@angular/animations';
 
 const startStyle = style({ backgroundColor: '{{ startColor }}' });
@@ -21,6 +22,6 @@ export const bgColor = trigger('bgColor',
           query('@*', animateChild()),
           animate('200ms'),
 
-        ]
-      ))
+        ],
+      )),
   ]);
diff --git a/src/app/shared/animations/fade.ts b/src/app/shared/animations/fade.ts
index 187a482746..1c61fd4624 100644
--- a/src/app/shared/animations/fade.ts
+++ b/src/app/shared/animations/fade.ts
@@ -1,34 +1,40 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fadeInState = state('fadeIn', style({opacity: 1}));
+export const fadeInState = state('fadeIn', style({ opacity: 1 }));
 export const fadeInEnter =  transition('* => fadeIn', [
   style({ opacity: 0 }),
-  animate(300, style({ opacity: 1 }))
+  animate(300, style({ opacity: 1 })),
 ]);
 const fadeEnter =  transition(':enter', [
   style({ opacity: 0 }),
-  animate(300, style({ opacity: 1 }))
+  animate(300, style({ opacity: 1 })),
 ]);
 
-export const fadeOutState = state('fadeOut', style({opacity: 0}));
+export const fadeOutState = state('fadeOut', style({ opacity: 0 }));
 export const fadeOutLeave = transition('fadeIn => fadeOut', [
   style({ opacity: 1 }),
-  animate(400, style({ opacity: 0 }))
+  animate(400, style({ opacity: 0 })),
 ]);
 const fadeLeave =  transition(':leave', [
   style({ opacity: 0 }),
-  animate(300, style({ opacity: 1 }))
+  animate(300, style({ opacity: 1 })),
 ]);
 
 export const fadeIn = trigger('fadeIn', [
-  fadeEnter
+  fadeEnter,
 ]);
 
 export const fadeOut = trigger('fadeOut', [
-  fadeLeave
+  fadeLeave,
 ]);
 
 export const fadeInOut = trigger('fadeInOut', [
   fadeEnter,
-  fadeLeave
+  fadeLeave,
 ]);
diff --git a/src/app/shared/animations/focus.ts b/src/app/shared/animations/focus.ts
index ec9c5020ce..f0f3a1f95d 100644
--- a/src/app/shared/animations/focus.ts
+++ b/src/app/shared/animations/focus.ts
@@ -1,4 +1,10 @@
-import { animate, state, transition, trigger, style } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const focusShadow = trigger('focusShadow', [
 
@@ -6,7 +12,7 @@ export const focusShadow = trigger('focusShadow', [
 
   state('blur', style({ boxShadow: 'none' })),
 
-  transition('focus <=> blur', [animate('250ms')])
+  transition('focus <=> blur', [animate('250ms')]),
 ]);
 
 export const focusBackground = trigger('focusBackground', [
@@ -15,5 +21,5 @@ export const focusBackground = trigger('focusBackground', [
 
   state('blur', style({ backgroundColor: 'transparent' })),
 
-  transition('focus <=> blur', [animate('250ms')])
+  transition('focus <=> blur', [animate('250ms')]),
 ]);
diff --git a/src/app/shared/animations/fromBottom.ts b/src/app/shared/animations/fromBottom.ts
index e2c6f44728..ca6c68299a 100644
--- a/src/app/shared/animations/fromBottom.ts
+++ b/src/app/shared/animations/fromBottom.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromBottomInState = state('fromBottomIn', style({opacity: 1, transform: 'translateY(0)'}));
+export const fromBottomInState = state('fromBottomIn', style({ opacity: 1, transform: 'translateY(0)' }));
 export const fromBottomEnter = transition('* => fromBottomIn', [
-  style({opacity: 0, transform: 'translateY(5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateY(5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromBottomOutState = state('fromBottomOut', style({opacity: 0, transform: 'translateY(-5%)'}));
+export const fromBottomOutState = state('fromBottomOut', style({ opacity: 0, transform: 'translateY(-5%)' }));
 export const fromBottomLeave = transition('fromBottomIn => fromBottomOut', [
-  style({opacity: 1, transform: 'translateY(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateY(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromBottomIn = trigger('fromBottomIn', [
-  fromBottomEnter
+  fromBottomEnter,
 ]);
 
 export const fromBottomOut = trigger('fromBottomOut', [
-  fromBottomLeave
+  fromBottomLeave,
 ]);
 
 export const fromBottomInOut = trigger('fromBottomInOut', [
   fromBottomEnter,
-  fromBottomLeave
+  fromBottomLeave,
 ]);
diff --git a/src/app/shared/animations/fromLeft.ts b/src/app/shared/animations/fromLeft.ts
index 07fe5bcde5..7524c66437 100644
--- a/src/app/shared/animations/fromLeft.ts
+++ b/src/app/shared/animations/fromLeft.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromLeftInState = state('fromLeftIn', style({opacity: 1, transform: 'translateX(0)'}));
+export const fromLeftInState = state('fromLeftIn', style({ opacity: 1, transform: 'translateX(0)' }));
 export const fromLeftEnter = transition('* => fromLeftIn', [
-  style({opacity: 0, transform: 'translateX(-5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateX(-5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromLeftOutState = state('fromLeftOut', style({opacity: 0, transform: 'translateX(5%)'}));
+export const fromLeftOutState = state('fromLeftOut', style({ opacity: 0, transform: 'translateX(5%)' }));
 export const fromLeftLeave = transition('fromLeftIn => fromLeftOut', [
-  style({opacity: 1, transform: 'translateX(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateX(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromLeftIn = trigger('fromLeftIn', [
-  fromLeftEnter
+  fromLeftEnter,
 ]);
 
 export const fromLeftOut = trigger('fromLeftOut', [
-  fromLeftLeave
+  fromLeftLeave,
 ]);
 
 export const fromLeftInOut = trigger('fromLeftInOut', [
   fromLeftEnter,
-  fromLeftLeave
+  fromLeftLeave,
 ]);
diff --git a/src/app/shared/animations/fromRight.ts b/src/app/shared/animations/fromRight.ts
index 10b36d12ec..d9a20cb76f 100644
--- a/src/app/shared/animations/fromRight.ts
+++ b/src/app/shared/animations/fromRight.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromRightInState = state('fromRightIn', style({opacity: 1, transform: 'translateX(0)'}));
+export const fromRightInState = state('fromRightIn', style({ opacity: 1, transform: 'translateX(0)' }));
 export const fromRightEnter = transition('* => fromRightIn', [
-  style({opacity: 0, transform: 'translateX(5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateX(5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromRightOutState = state('fromRightOut', style({opacity: 0, transform: 'translateX(-5%)'}));
+export const fromRightOutState = state('fromRightOut', style({ opacity: 0, transform: 'translateX(-5%)' }));
 export const fromRightLeave = transition('fromRightIn => fromRightOut', [
-  style({opacity: 1, transform: 'translateX(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateX(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromRightIn = trigger('fromRightIn', [
-  fromRightEnter
+  fromRightEnter,
 ]);
 
 export const fromRightOut = trigger('fromRightOut', [
-  fromRightLeave
+  fromRightLeave,
 ]);
 
 export const fromRightInOut = trigger('fromRightInOut', [
   fromRightEnter,
-  fromRightLeave
+  fromRightLeave,
 ]);
diff --git a/src/app/shared/animations/fromTop.ts b/src/app/shared/animations/fromTop.ts
index a33beed163..3a5aa983b4 100644
--- a/src/app/shared/animations/fromTop.ts
+++ b/src/app/shared/animations/fromTop.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const fromTopInState = state('fromTopIn', style({opacity: 1, transform: 'translateY(0)'}));
+export const fromTopInState = state('fromTopIn', style({ opacity: 1, transform: 'translateY(0)' }));
 export const fromTopEnter = transition('* => fromTopIn', [
-  style({opacity: 0, transform: 'translateY(-5%)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'translateY(-5%)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const fromTopOutState = state('fromTopOut', style({opacity: 0, transform: 'translateY(5%)'}));
+export const fromTopOutState = state('fromTopOut', style({ opacity: 0, transform: 'translateY(5%)' }));
 export const fromTopLeave = transition('fromTopIn => fromTopOut', [
-  style({opacity: 1, transform: 'translateY(0)'}),
-  animate('300ms ease-in-out')
+  style({ opacity: 1, transform: 'translateY(0)' }),
+  animate('300ms ease-in-out'),
 ]);
 
 export const fromTopIn = trigger('fromTopIn', [
-  fromTopEnter
+  fromTopEnter,
 ]);
 
 export const fromTopOut = trigger('fromTopOut', [
-  fromTopLeave
+  fromTopLeave,
 ]);
 
 export const fromTopInOut = trigger('fromTopInOut', [
   fromTopEnter,
-  fromTopLeave
+  fromTopLeave,
 ]);
diff --git a/src/app/shared/animations/overlay.ts b/src/app/shared/animations/overlay.ts
index 15d6bf79de..42d8097336 100644
--- a/src/app/shared/animations/overlay.ts
+++ b/src/app/shared/animations/overlay.ts
@@ -1,4 +1,10 @@
-import { animate, state, transition, trigger, style } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const overlay = trigger('overlay', [
 
@@ -6,5 +12,5 @@ export const overlay = trigger('overlay', [
 
   state('hide', style({ opacity: 0 })),
 
-  transition('show <=> hide', animate(250))
+  transition('show <=> hide', animate(250)),
 ]);
diff --git a/src/app/shared/animations/push.ts b/src/app/shared/animations/push.ts
index 124e3289e7..6af617fe79 100644
--- a/src/app/shared/animations/push.ts
+++ b/src/app/shared/animations/push.ts
@@ -1,4 +1,10 @@
-import { animate, state, transition, trigger, style } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const pushInOut = trigger('pushInOut', [
 
diff --git a/src/app/shared/animations/rotate.ts b/src/app/shared/animations/rotate.ts
index d6337d4b3d..1952e57201 100644
--- a/src/app/shared/animations/rotate.ts
+++ b/src/app/shared/animations/rotate.ts
@@ -1,28 +1,34 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const rotateInState = state('rotateIn', style({ opacity: 1, transform: 'rotate(0deg)' }));
 export const rotateEnter = transition('* => rotateIn', [
   style({ opacity: 0, transform: 'rotate(5deg)' }),
-  animate('400ms ease-in-out')
+  animate('400ms ease-in-out'),
 ]);
 
 export const rotateOutState = state('rotateOut', style({ opacity: 0, transform: 'rotate(5deg)' }));
 export const rotateLeave = transition('rotateIn => rotateOut', [
   style({ opacity: 1, transform: 'rotate(0deg)' }),
-  animate('400ms ease-in-out')
+  animate('400ms ease-in-out'),
 ]);
 
 export const rotateIn = trigger('rotateIn', [
-  rotateEnter
+  rotateEnter,
 ]);
 
 export const rotateOut = trigger('rotateOut', [
-  rotateLeave
+  rotateLeave,
 ]);
 
 export const rotateInOut = trigger('rotateInOut', [
   rotateEnter,
-  rotateLeave
+  rotateLeave,
 ]);
 
 const expandedStyle = { transform: 'rotate(90deg)' };
@@ -33,7 +39,7 @@ export const rotate = trigger('rotate',
     state('expanded', style(expandedStyle)),
     state('collapsed', style(collapsedStyle)),
     transition('expanded <=> collapsed', [
-      animate('200ms')
-    ])
+      animate('200ms'),
+    ]),
 
   ]);
diff --git a/src/app/shared/animations/scale.ts b/src/app/shared/animations/scale.ts
index ca749ceeef..0b317dd8ba 100644
--- a/src/app/shared/animations/scale.ts
+++ b/src/app/shared/animations/scale.ts
@@ -1,26 +1,32 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
-export const scaleInState = state('scaleIn', style({opacity: 1, transform: 'scale(1)'}));
+export const scaleInState = state('scaleIn', style({ opacity: 1, transform: 'scale(1)' }));
 export const scaleEnter =  transition('* => scaleIn', [
-  style({opacity: 0, transform: 'scale(0)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 0, transform: 'scale(0)' }),
+  animate('400ms ease-in-out'),
 ]);
 
-export const scaleOutState = state('scaleOut', style({opacity: 0, transform: 'scale(0)'}));
+export const scaleOutState = state('scaleOut', style({ opacity: 0, transform: 'scale(0)' }));
 export const scaleLeave = transition('scaleIn => scaleOut', [
-  style({opacity: 1, transform: 'scale(1)'}),
-  animate('400ms ease-in-out')
+  style({ opacity: 1, transform: 'scale(1)' }),
+  animate('400ms ease-in-out'),
 ]);
 
 export const scaleIn = trigger('scaleIn', [
-  scaleEnter
+  scaleEnter,
 ]);
 
 export const scaleOut = trigger('scaleOut', [
-  scaleLeave
+  scaleLeave,
 ]);
 
 export const scaleInOut = trigger('scaleInOut', [
   scaleEnter,
-  scaleLeave
+  scaleLeave,
 ]);
diff --git a/src/app/shared/animations/shrink.ts b/src/app/shared/animations/shrink.ts
index 28f1d2a567..6469a7efda 100644
--- a/src/app/shared/animations/shrink.ts
+++ b/src/app/shared/animations/shrink.ts
@@ -1,13 +1,19 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
 
 export const shrinkInOut = trigger('shrinkInOut', [
-  state('in', style({height: '100%', opacity: 1})),
+  state('in', style({ height: '100%', opacity: 1 })),
   transition('* => void', [
-    style({height: '!', opacity: 1}),
-    animate(200, style({height: 0, opacity: 0}))
+    style({ height: '!', opacity: 1 }),
+    animate(200, style({ height: 0, opacity: 0 })),
   ]),
   transition('void => *', [
-    style({height: 0, opacity: 0}),
-    animate(200, style({height: '*', opacity: 1}))
-  ])
+    style({ height: 0, opacity: 0 }),
+    animate(200, style({ height: '*', opacity: 1 })),
+  ]),
 ]);
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index b396333fb4..92e5084d81 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -1,4 +1,11 @@
-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: '*' })),
@@ -7,75 +14,65 @@ export const slide = trigger('slide', [
   state('*', style({ height: '*' })),
   transition(':enter', [animate('200ms')]),
   transition(':leave', [animate('200ms')]),
-  transition('expanded <=> collapsed', animate(250))
+  transition('expanded <=> collapsed', animate(250)),
 ]);
 
 export const slideMobileNav = trigger('slideMobileNav', [
 
-  state('expanded', style({ height: '100vh' })),
+  state('expanded', style({ height: '*', minHeight: '*' })),
 
-  state('collapsed', style({ height: 0 })),
+  state('collapsed', style({ height: 0, minHeight: 0 })),
 
-  transition('expanded <=> collapsed', animate('300ms'))
+  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',
-    opacity: '0'
+    width: '0',
+    opacity: '0',
   })),
   state('expanded', style({
     width: '250px',
-    opacity: '1'
+    opacity: '1',
   })),
   transition('* => collapsed', group([
     animate('300ms ease-in-out', style({
-      width: '30px'
+      width: '30px',
     })),
     animate('300ms ease-in', style({
-      opacity: '0'
-    }))
+      opacity: '0',
+    })),
   ])),
   transition('* => expanded', group([
     animate('300ms ease-out', style({
-      opacity: '1'
+      opacity: '1',
     })),
     animate('300ms ease-in-out', style({
-      width: '250px'
-    }))
-  ]))
+      width: '250px',
+    })),
+  ])),
 ]);
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 c2b414b6f3..98749da7b5 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,52 @@
-<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) !== true; else mobileButtons" data-test="auth-nav">
+  <div *ngIf="(isAuthenticated | async) !== true && (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" (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly" ngbDropdownToggle>
-        {{ 'nav.login' | translate }}
-      </a>
-      <div class="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
-           [attr.aria-label]="'nav.login' |translate">
-        <ds-log-in
-          [isStandalonePage]="false"></ds-log-in>
+    <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"
+         aria-haspopup="menu"
+         aria-controls="loginDropdownMenu"
+         [attr.aria-expanded]="loginDrop.isOpen()"
+         ngbDropdownToggle>{{ 'nav.login' | translate }}</a>
+      <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu
+           role="menu"
+           [attr.aria-label]="'nav.login' | translate">
+        <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"
+         [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) !== true" routerLink="/login" routerLinkActive="active" class="loginLink px-0.5" role="button">
       {{ '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.logout' |translate" (click)="$event.preventDefault()" [title]="'nav.logout' | translate" class="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.logout' |translate">
-        <ds-user-menu></ds-user-menu>
-      </div>
-    </div>
-  </li>
-  <li *ngIf="(isAuthenticated | async) && (isXsOrSm$ | async)" class="nav-item">
-    <a id="logoutLink" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="px-1">
-      <i class="fas fa-user-circle fa-lg fa-fw"></i>
+    <a *ngIf="(isAuthenticated | async)" role="button" [attr.aria-label]="'nav.logout' |translate" [title]="'nav.logout' | translate" routerLink="/logout" routerLinkActive="active" class="logoutLink px-1">
+      <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 ac51af27bf..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,
@@ -12,10 +12,19 @@
   background-color: transparent !important;
 }
 
-.dropdown-toggle {
-  color: var(--ds-header-icon-color) !important;
+.loginLink, .dropdownLogin, .logoutLink, .dropdownLogout {
+  color: var(--ds-header-icon-color);
 
-  &:hover, &focus {
+  &:hover, &:focus {
     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 a9484aa902..f14979ecba 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
@@ -1,21 +1,35 @@
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Store, StoreModule } from '@ngrx/store';
-
-import { authReducer, AuthState } from '../../core/auth/auth.reducer';
-import { EPersonMock } from '../testing/eperson.mock';
-import { TranslateModule } from '@ngx-translate/core';
-import { AppState } from '../../app.reducer';
-import { AuthNavMenuComponent } from './auth-nav-menu.component';
-import { HostWindowServiceStub } from '../testing/host-window-service.stub';
-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 { NgbDropdownModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
+
+import { AppState } from '../../app.reducer';
+import {
+  authReducer,
+  AuthState,
+} from '../../core/auth/auth.reducer';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
+import { HostWindowService } from '../host-window.service';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { EPersonMock } from '../testing/eperson.mock';
+import { HostWindowServiceStub } from '../testing/host-window-service.stub';
+import { AuthNavMenuComponent } from './auth-nav-menu.component';
 
 describe('AuthNavMenuComponent', () => {
 
@@ -30,13 +44,13 @@ describe('AuthNavMenuComponent', () => {
   let authService: AuthService;
 
   let routerState = {
-    url: '/home'
+    url: '/home',
   };
 
   function serviceInit() {
     authService = jasmine.createSpyObj('authService', {
       getAuthenticatedUserFromStore: of(EPersonMock),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
   }
 
@@ -46,7 +60,7 @@ describe('AuthNavMenuComponent', () => {
       loaded: false,
       blocking: false,
       loading: false,
-      idle: false
+      idle: false,
     };
     authState = {
       authenticated: true,
@@ -55,7 +69,7 @@ describe('AuthNavMenuComponent', () => {
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
   }
 
@@ -72,22 +86,23 @@ describe('AuthNavMenuComponent', () => {
           StoreModule.forRoot(authReducer, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
+              strictActionImmutability: false,
+            },
           }),
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
+          NgbDropdownModule,
         ],
         declarations: [
           AuthNavMenuComponent,
-          BrowserOnlyMockPipe
+          BrowserOnlyMockPipe,
         ],
         providers: [
           { provide: HostWindowService, useValue: window },
-          { provide: AuthService, useValue: authService }
+          { provide: AuthService, useValue: authService },
         ],
         schemas: [
-          CUSTOM_ELEMENTS_SCHEMA
-        ]
+          CUSTOM_ELEMENTS_SCHEMA,
+        ],
       })
         .compileComponents();
 
@@ -99,7 +114,7 @@ describe('AuthNavMenuComponent', () => {
     describe('when route is /login and user is not authenticated', () => {
       beforeEach(inject([Store], (store: Store<AppState>) => {
         routerState = {
-          url: '/login'
+          url: '/login',
         };
         store
           .subscribe((state) => {
@@ -117,10 +132,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(() => {
@@ -137,7 +152,7 @@ describe('AuthNavMenuComponent', () => {
     describe('when route is /logout and user is authenticated', () => {
       beforeEach(inject([Store], (store: Store<AppState>) => {
         routerState = {
-          url: '/logout'
+          url: '/logout',
         };
         store
           .subscribe((state) => {
@@ -155,10 +170,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));
       }));
 
@@ -179,7 +194,7 @@ describe('AuthNavMenuComponent', () => {
 
         beforeEach(inject([Store], (store: Store<AppState>) => {
           routerState = {
-            url: '/home'
+            url: '/home',
           };
           store
             .subscribe((state) => {
@@ -197,10 +212,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 +225,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();
         });
       });
@@ -218,7 +233,7 @@ describe('AuthNavMenuComponent', () => {
       describe('when user is authenticated', () => {
         beforeEach(inject([Store], (store: Store<AppState>) => {
           routerState = {
-            url: '/home'
+            url: '/home',
           };
           store
             .subscribe((state) => {
@@ -236,10 +251,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 +263,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();
         });
       });
@@ -267,21 +282,21 @@ describe('AuthNavMenuComponent', () => {
           StoreModule.forRoot(authReducer, {
             runtimeChecks: {
               strictStateImmutability: false,
-              strictActionImmutability: false
-            }
+              strictActionImmutability: false,
+            },
           }),
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [
-          AuthNavMenuComponent
+          AuthNavMenuComponent,
         ],
         providers: [
           { provide: HostWindowService, useValue: window },
-          { provide: AuthService, useValue: authService }
+          { provide: AuthService, useValue: authService },
         ],
         schemas: [
-          CUSTOM_ELEMENTS_SCHEMA
-        ]
+          CUSTOM_ELEMENTS_SCHEMA,
+        ],
       })
         .compileComponents();
 
@@ -309,11 +324,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 +334,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 +357,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 +367,7 @@ describe('AuthNavMenuComponent', () => {
       });
 
       it('should render logout link', inject([Store], (store: Store<AppState>) => {
-        const logoutDropdownMenu = deNavMenuItem.query(By.css('a[id=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..878ffa9e03 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
@@ -1,23 +1,48 @@
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-
-import { filter, map } from 'rxjs/operators';
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { RouterReducerState } from '@ngrx/router-store';
-import { select, Store } from '@ngrx/store';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { fadeInOut, fadeOut } from '../animations/fade';
-import { HostWindowService } from '../host-window.service';
-import { AppState, routerStateSelector } from '../../app.reducer';
-import { isNotUndefined } from '../empty.util';
-import { isAuthenticated, isAuthenticationLoading } from '../../core/auth/selectors';
+import {
+  AppState,
+  routerStateSelector,
+} from '../../app.reducer';
+import {
+  AuthService,
+  LOGIN_ROUTE,
+  LOGOUT_ROUTE,
+} from '../../core/auth/auth.service';
+import {
+  isAuthenticated,
+  isAuthenticationLoading,
+} from '../../core/auth/selectors';
 import { EPerson } from '../../core/eperson/models/eperson.model';
-import { AuthService, LOGIN_ROUTE, LOGOUT_ROUTE } from '../../core/auth/auth.service';
+import {
+  fadeInOut,
+  fadeOut,
+} from '../animations/fade';
+import { isNotUndefined } from '../empty.util';
+import { HostWindowService } from '../host-window.service';
 
 @Component({
   selector: 'ds-auth-nav-menu',
   templateUrl: './auth-nav-menu.component.html',
   styleUrls: ['./auth-nav-menu.component.scss'],
-  animations: [fadeInOut, fadeOut]
+  animations: [fadeInOut, fadeOut],
 })
 export class AuthNavMenuComponent implements OnInit {
   /**
@@ -32,7 +57,7 @@ export class AuthNavMenuComponent implements OnInit {
    */
   public loading: Observable<boolean>;
 
-  public isXsOrSm$: Observable<boolean>;
+  public isMobile$: Observable<boolean>;
 
   public showAuth = observableOf(false);
 
@@ -42,9 +67,9 @@ export class AuthNavMenuComponent implements OnInit {
 
   constructor(private store: Store<AppState>,
               private windowService: HostWindowService,
-              private authService: AuthService
+              private authService: AuthService,
   ) {
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
+    this.isMobile$ = this.windowService.isMobile();
   }
 
   ngOnInit(): void {
@@ -60,8 +85,8 @@ export class AuthNavMenuComponent implements OnInit {
       select(routerStateSelector),
       filter((router: RouterReducerState) => isNotUndefined(router) && isNotUndefined(router.state)),
       map((router: RouterReducerState) => (!router.state.url.startsWith(LOGIN_ROUTE)
-        && !router.state.url.startsWith(LOGOUT_ROUTE))
-      )
+        && !router.state.url.startsWith(LOGOUT_ROUTE)),
+      ),
     );
   }
 }
diff --git a/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts b/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
index 14ea45d236..c0a1f465ae 100644
--- a/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/themed-auth-nav-menu.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../theme-support/themed.component';
 import { AuthNavMenuComponent } from './auth-nav-menu.component';
 
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..02953d3f5b
--- /dev/null
+++ b/src/app/shared/auth-nav-menu/user-menu/themed-user-menu.component.ts
@@ -0,0 +1,37 @@
+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 736d39d318..a6d4188f92 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,10 +1,32 @@
 <ds-themed-loading *ngIf="(loading$ | async)"></ds-themed-loading>
-<div *ngIf="!(loading$ | async)">
-  <span class="dropdown-item-text">{{(user$ | async)?.name}} ({{(user$ | async)?.email}})</span>
-  <a class="dropdown-item" [routerLink]="[profileRoute]" routerLinkActive="active">{{'nav.profile' | translate}}</a>
-  <a class="dropdown-item" [routerLink]="[mydspaceRoute]" routerLinkActive="active">{{'nav.mydspace' | translate}}</a>
-  <div class="dropdown-divider"></div>
-  <ds-log-out></ds-log-out>
-</div>
+<ul *ngIf="(loading$ | async) !== true" 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>
+  </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 983fe68274..20f8657211 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
@@ -1,20 +1,36 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { Store, StoreModule } from '@ngrx/store';
-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 { EPersonMock } from '../../testing/eperson.mock';
-import { AppState } from '../../../app.reducer';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { cold } from 'jasmine-marbles';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AuthService } from '../../../core/auth/auth.service';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
 import { of } from 'rxjs';
 
+import { AppState } from '../../../app.reducer';
+import {
+  authReducer,
+  AuthState,
+} from '../../../core/auth/auth.reducer';
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { UserMenuComponent } from './user-menu.component';
+
 describe('UserMenuComponent', () => {
 
   let component: UserMenuComponent;
@@ -26,7 +42,7 @@ describe('UserMenuComponent', () => {
 
   function serviceInit() {
     authService = jasmine.createSpyObj('authService', {
-      getAuthenticatedUserFromStore: of(EPersonMock)
+      getAuthenticatedUserFromStore: of(EPersonMock),
     });
   }
 
@@ -38,7 +54,7 @@ describe('UserMenuComponent', () => {
       loading: false,
       authToken: new AuthTokenInfo('test_token'),
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
     authStateLoading = {
       authenticated: true,
@@ -47,7 +63,7 @@ describe('UserMenuComponent', () => {
       loading: true,
       authToken: null,
       userId: EPersonMock.id,
-      idle: false
+      idle: false,
     };
   }
 
@@ -58,25 +74,25 @@ describe('UserMenuComponent', () => {
         StoreModule.forRoot(authReducer, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         }),
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
-        { provide: AuthService, useValue: authService }
+        { provide: AuthService, useValue: authService },
       ],
       declarations: [
-        UserMenuComponent
+        UserMenuComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
 
   }));
@@ -112,11 +128,11 @@ describe('UserMenuComponent', () => {
       expect(component).toBeDefined();
 
       expect(component.loading$).toBeObservable(cold('b', {
-        b: true
+        b: true,
       }));
 
       expect(component.user$).toBeObservable(cold('(c|)', {
-        c: EPersonMock
+        c: EPersonMock,
       }));
 
       expect(deUserMenu).toBeNull();
@@ -140,7 +156,7 @@ describe('UserMenuComponent', () => {
 
       fixture.detectChanges();
 
-      deUserMenu = fixture.debugElement.query(By.css('div'));
+      deUserMenu = fixture.debugElement.query(By.css('ul#user-menu-dropdown'));
     }));
 
     afterEach(() => {
@@ -151,21 +167,35 @@ describe('UserMenuComponent', () => {
       expect(component).toBeDefined();
 
       expect(component.loading$).toBeObservable(cold('b', {
-        b: false
+        b: false,
       }));
 
       expect(component.user$).toBeObservable(cold('(c|)', {
-        c: EPersonMock
+        c: EPersonMock,
       }));
 
       expect(deUserMenu).toBeDefined();
     });
 
     it('should display user name and email', () => {
-      const user = 'User Test (test@test.com)';
-      const span = deUserMenu.query(By.css('.dropdown-item-text'));
+      const username = 'User Test';
+      const email = 'test@test.com';
+      const span = deUserMenu.query(By.css('.username-email-wrapper'));
       expect(span).toBeDefined();
-      expect(span.nativeElement.innerHTML).toBe(user);
+      expect(span.nativeElement.innerHTML).toContain(username);
+      expect(span.nativeElement.innerHTML).toContain(email);
+    });
+
+    it('should create logout component', () => {
+      const components = fixture.debugElement.query(By.css('[data-test="log-out-component"]'));
+      expect(components).toBeTruthy();
+    });
+
+    it('should not create logout component', () => {
+      component.inExpandableNavbar = true;
+      fixture.detectChanges();
+      const components = fixture.debugElement.query(By.css('[data-test="log-out-component"]'));
+      expect(components).toBeFalsy();
     });
 
   });
diff --git a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
index aa78be9749..28edd2b5b9 100644
--- a/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
+++ b/src/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -1,14 +1,24 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
 
-import { EPerson } from '../../../core/eperson/models/eperson.model';
 import { AppState } from '../../../app.reducer';
-import { isAuthenticationLoading } from '../../../core/auth/selectors';
-import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component';
+import {
+  getProfileModuleRoute,
+  getSubscriptionsModuleRoute,
+} from '../../../app-routing-paths';
 import { AuthService } from '../../../core/auth/auth.service';
-import { getProfileModuleRoute } from '../../../app-routing-paths';
+import { isAuthenticationLoading } from '../../../core/auth/selectors';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { MYDSPACE_ROUTE } from '../../../my-dspace-page/my-dspace-page.component';
 
 /**
  * This component represents the user nav menu.
@@ -16,10 +26,15 @@ import { getProfileModuleRoute } from '../../../app-routing-paths';
 @Component({
   selector: 'ds-user-menu',
   templateUrl: './user-menu.component.html',
-  styleUrls: ['./user-menu.component.scss']
+  styleUrls: ['./user-menu.component.scss'],
 })
 export class UserMenuComponent implements OnInit {
 
+  /**
+   * The input flag to show user details in navbar expandable menu
+   */
+  @Input() inExpandableNavbar = false;
+
   /**
    * True if the authentication is loading.
    * @type {Observable<boolean>}
@@ -43,8 +58,16 @@ export class UserMenuComponent implements OnInit {
    */
   public profileRoute = getProfileModuleRoute();
 
-  constructor(private store: Store<AppState>,
-              private authService: AuthService) {
+  /**
+   * The profile page route
+   */
+  public subscriptionsRoute = getSubscriptionsModuleRoute();
+
+  constructor(
+    protected store: Store<AppState>,
+    protected authService: AuthService,
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   /**
diff --git a/src/app/shared/browse-by/browse-by.component.html b/src/app/shared/browse-by/browse-by.component.html
index 7d9153b9f8..7d7e726659 100644
--- a/src/app/shared/browse-by/browse-by.component.html
+++ b/src/app/shared/browse-by/browse-by.component.html
@@ -1,9 +1,10 @@
 <ng-container *ngVar="(objects$ | async) as objects">
-  <h3 [ngClass]="{'sr-only': parentname }">{{title | translate}}</h3>
-  <ng-container *ngComponentOutlet="getStartsWithComponent(); injector: objectInjector;"></ng-container>
+  <h1 *ngIf="displayTitle">{{title | translate}}</h1>
+  <ds-starts-with-loader [paginationId]="paginationConfig?.id" [startsWithOptions]="startsWithOptions" [type]="type">
+  </ds-starts-with-loader>
   <div *ngIf="objects?.hasSucceeded && !objects?.isLoading && objects?.payload?.page.length > 0" @fadeIn>
       <div *ngIf="shouldDisplayResetButton$ |async" class="mb-2 reset">
-          <button class="btn btn-secondary" (click)="back()"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</button>
+        <ds-themed-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-themed-results-back-button>
       </div>
     <ds-viewable-collection
       [config]="paginationConfig"
@@ -18,7 +19,7 @@
   <ds-error *ngIf="objects?.hasFailed" message="{{'error.browse-by' | translate}}"></ds-error>
   <div *ngIf="!objects?.isLoading && objects?.payload?.page.length === 0">
     <div *ngIf="shouldDisplayResetButton$ |async" class="d-inline-block mb-4 reset">
-      <button class="btn btn-secondary" (click)="back()"><i class="fas fa-arrow-left"></i> {{'browse.back.all-results' | translate}}</button>
+      <ds-themed-results-back-button [back]="back" [buttonLabel]="buttonLabel"></ds-themed-results-back-button>
     </div>
     <div class="alert alert-info w-100" role="alert">
       {{'browse.empty' | translate}}
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 43a3910216..d171eb7d01 100644
--- a/src/app/shared/browse-by/browse-by.component.spec.ts
+++ b/src/app/shared/browse-by/browse-by.component.spec.ts
@@ -1,54 +1,67 @@
-import { BrowseByComponent } from './browse-by.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
 import { CommonModule } from '@angular/common';
-import { Item } from '../../core/shared/item.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { RouterTestingModule } from '@angular/router/testing';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
+import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { GroupDataService } from '../../core/eperson/group-data.service';
 import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import {
-  ListableObjectComponentLoaderComponent
-} from '../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { RouteService } from '../../core/services/route.service';
+import { BrowseEntry } from '../../core/shared/browse-entry.model';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { ITEM } from '../../core/shared/item.resource-type';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import {
-  BrowseEntryListElementComponent
-} from '../object-list/browse-entry-list-element/browse-entry-list-element.component';
+import { HostWindowService } from '../host-window.service';
+import { getMockThemeService } from '../mocks/theme-service.mock';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import {
   DEFAULT_CONTEXT,
   listableObjectComponent,
 } from '../object-collection/shared/listable-object/listable-object.decorator';
-import { BrowseEntry } from '../../core/shared/browse-entry.model';
-import { ITEM } from '../../core/shared/item.resource-type';
-import { ThemeService } from '../theme-support/theme.service';
+import { ListableObjectComponentLoaderComponent } from '../object-collection/shared/listable-object/listable-object-component-loader.component';
+import { BrowseEntryListElementComponent } from '../object-list/browse-entry-list-element/browse-entry-list-element.component';
 import { SelectableListService } from '../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { SharedModule } from '../shared.module';
 import { HostWindowServiceStub } from '../testing/host-window-service.stub';
-import { HostWindowService } from '../host-window.service';
-import { RouteService } from '../../core/services/route.service';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { routeServiceStub } from '../testing/route-service.stub';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { createPaginatedList } from '../testing/utils.test';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { getMockThemeService } from '../mocks/theme-service.mock';
+import { createPaginatedList } from '../testing/utils.test';
+import { ThemeService } from '../theme-support/theme.service';
+import { BrowseByComponent } from './browse-by.component';
 
-@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'custom')
+@listableObjectComponent(BrowseEntry, ViewMode.ListElement, DEFAULT_CONTEXT, 'dspace')
 @Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
   selector: 'ds-browse-entry-list-element',
-  template: ''
+  template: '',
 })
 class MockThemedBrowseEntryListElementComponent {
 }
@@ -57,28 +70,6 @@ describe('BrowseByComponent', () => {
   let comp: BrowseByComponent;
   let fixture: ComponentFixture<BrowseByComponent>;
 
-  const mockItems = [
-    Object.assign(new Item(), {
-      id: 'fakeId-1',
-      metadata: [
-        {
-          key: 'dc.title',
-          value: 'First Fake Title'
-        }
-      ]
-    }),
-    Object.assign(new Item(), {
-      id: 'fakeId-2',
-      metadata: [
-        {
-          key: 'dc.title',
-          value: 'Second Fake Title'
-        }
-      ]
-    })
-  ];
-  const mockItemsRD$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), mockItems));
-
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
     findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
     getGroupRegistryRouterLink: '',
@@ -86,44 +77,47 @@ describe('BrowseByComponent', () => {
   });
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   const paginationConfig = Object.assign(new PaginationComponentOptions(), {
     id: 'test-pagination',
     currentPage: 1,
     pageSizeOptions: [5, 10, 15, 20],
-    pageSize: 15
+    pageSize: 15,
   });
   const paginationService = new PaginationServiceStub(paginationConfig);
 
   let themeService;
 
   beforeEach(waitForAsync(() => {
-    themeService = getMockThemeService('dspace');
-    TestBed.configureTestingModule({
+    themeService = getMockThemeService('base');
+    void TestBed.configureTestingModule({
       imports: [
+        BrowseByRoutingModule,
+        AccessControlRoutingModule,
         CommonModule,
+        SharedModule,
         NgbModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule,
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
-      declarations: [],
+      declarations: [BrowseByComponent],
       providers: [
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: ConfigurationDataService, useValue: configurationDataService },
@@ -132,11 +126,11 @@ describe('BrowseByComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         { provide: MockThemedBrowseEntryListElementComponent },
         { provide: ThemeService, useValue: themeService },
-        { provide: RouteService, useValue: routeServiceStub},
+        { provide: RouteService, useValue: routeServiceStub },
         { provide: SelectableListService, useValue: {} },
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
     fixture = TestBed.createComponent(BrowseByComponent);
     comp = fixture.componentInstance;
@@ -147,19 +141,21 @@ describe('BrowseByComponent', () => {
   it('should display a loading message when objects is empty', () => {
     (comp as any).objects = undefined;
     fixture.detectChanges();
-    expect(fixture.debugElement.query(By.css('ds-themed-loading'))).toBeDefined();
+    expect(fixture.debugElement.query(By.css('ds-themed-loading'))).not.toBeNull();
   });
 
   it('should display results when objects is not empty', () => {
-    (comp as any).objects = observableOf({
-      payload: {
-        page: {
-          length: 1
-        }
-      }
-    });
+    comp.objects$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [
+      Object.assign(new BrowseEntry(), {
+        type: ITEM,
+        authority: 'authority key 1',
+        value: 'browse entry 1',
+        language: null,
+        count: 1,
+      }),
+    ]));
     fixture.detectChanges();
-    expect(fixture.debugElement.query(By.css('ds-viewable-collection'))).toBeDefined();
+    expect(fixture.debugElement.query(By.css('ds-viewable-collection'))).not.toBeNull();
   });
 
   describe('when showPaginator is true and browseEntries are provided', () => {
@@ -191,39 +187,39 @@ describe('BrowseByComponent', () => {
     });
 
     describe('when theme is base', () => {
-      beforeEach(() => {
+      beforeEach(async () => {
         themeService.getThemeName.and.returnValue('base');
         themeService.getThemeName$.and.returnValue(observableOf('base'));
         fixture.detectChanges();
+        await fixture.whenStable();
+        fixture.detectChanges();
       });
 
       it('should use the base component to render browse entries', () => {
-        waitForAsync(() => {
-          const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
-          expect(componentLoaders.length).toEqual(browseEntries.length);
-          componentLoaders.forEach((componentLoader) => {
-            const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
-            expect(browseEntry.componentInstance).toBeInstanceOf(BrowseEntryListElementComponent);
-          });
+        const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
+        expect(componentLoaders.length).toEqual(browseEntries.length);
+        componentLoaders.forEach((componentLoader) => {
+          const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
+          expect(browseEntry.componentInstance).toBeInstanceOf(BrowseEntryListElementComponent);
         });
       });
     });
 
-    describe('when theme is custom', () => {
-      beforeEach(() => {
-        themeService.getThemeName.and.returnValue('custom');
-        themeService.getThemeName$.and.returnValue(observableOf('custom'));
+    describe('when theme is dspace', () => {
+      beforeEach(async () => {
+        themeService.getThemeName.and.returnValue('dspace');
+        themeService.getThemeName$.and.returnValue(observableOf('dspace'));
+        fixture.detectChanges();
+        await fixture.whenStable();
         fixture.detectChanges();
       });
 
       it('should use the themed component to render browse entries', () => {
-        waitForAsync(() => {
-          const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
-          expect(componentLoaders.length).toEqual(browseEntries.length);
-          componentLoaders.forEach((componentLoader) => {
-            const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
-            expect(browseEntry.componentInstance).toBeInstanceOf(MockThemedBrowseEntryListElementComponent);
-          });
+        const componentLoaders = fixture.debugElement.queryAll(By.directive(ListableObjectComponentLoaderComponent));
+        expect(componentLoaders.length).toEqual(browseEntries.length);
+        componentLoaders.forEach((componentLoader) => {
+          const browseEntry = componentLoader.query(By.css('ds-browse-entry-list-element'));
+          expect(browseEntry.componentInstance).toBeInstanceOf(MockThemedBrowseEntryListElementComponent);
         });
       });
     });
@@ -231,26 +227,24 @@ describe('BrowseByComponent', () => {
 
   describe('reset filters button', () => {
     it('should not be present when no startsWith or value is present ', () => {
-      const button = fixture.debugElement.query(By.css('reset'));
+      const button = fixture.debugElement.query(By.css('.reset'));
       expect(button).toBeNull();
     });
     it('should be present when a startsWith or value is present ', () => {
+      comp.objects$ = createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [
+        Object.assign(new BrowseEntry(), {
+          type: ITEM,
+          authority: 'authority key 1',
+          value: 'browse entry 1',
+          language: null,
+          count: 1,
+        }),
+      ]));
       comp.shouldDisplayResetButton$ = observableOf(true);
       fixture.detectChanges();
 
-      const button = fixture.debugElement.query(By.css('reset'));
-      expect(button).toBeDefined();
-    });
-  });
-  describe('back', () => {
-    it('should navigate back to the main browse page', () => {
-      const id = 'test-pagination';
-      comp.back();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith(id, {page: 1}, {
-        value: null,
-        startsWith: null,
-        [id + '.return']: null
-      });
+      const button = fixture.debugElement.query(By.css('.reset'));
+      expect(button).not.toBeNull();
     });
   });
 
diff --git a/src/app/shared/browse-by/browse-by.component.ts b/src/app/shared/browse-by/browse-by.component.ts
index 79edf39096..e24e410dec 100644
--- a/src/app/shared/browse-by/browse-by.component.ts
+++ b/src/app/shared/browse-by/browse-by.component.ts
@@ -1,17 +1,39 @@
-import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } 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';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { fadeIn, fadeInOut } from '../animations/fade';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-import { getStartsWithComponent, StartsWithType } from '../starts-with/starts-with-decorator';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { RouteService } from '../../core/services/route.service';
+import {
+  Component,
+  EventEmitter,
+  Injector,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { RouteService } from '../../core/services/route.service';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../animations/fade';
 import { hasValue } from '../empty.util';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { StartsWithType } from '../starts-with/starts-with-decorator';
 
 @Component({
   selector: 'ds-browse-by',
@@ -19,13 +41,13 @@ import { hasValue } from '../empty.util';
   templateUrl: './browse-by.component.html',
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component to display a browse-by page for any ListableObject
  */
-export class BrowseByComponent implements OnInit, OnDestroy {
+export class BrowseByComponent implements OnInit, OnChanges, OnDestroy {
 
   /**
    * ViewMode that should be passed to {@link ListableObjectComponentLoaderComponent}.
@@ -38,9 +60,10 @@ export class BrowseByComponent implements OnInit, OnDestroy {
   @Input() title: string;
 
   /**
-   * The parent name
+   * Whether the title should be displayed
    */
-  @Input() parentname: string;
+  @Input() displayTitle = true;
+
   /**
    * The list of objects to display
    */
@@ -65,7 +88,7 @@ export class BrowseByComponent implements OnInit, OnDestroy {
   /**
    * The list of options to render for the StartsWith component
    */
-  @Input() startsWithOptions = [];
+  @Input() startsWithOptions: (string | number)[] = [];
 
   /**
    * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
@@ -97,16 +120,6 @@ export class BrowseByComponent implements OnInit, OnDestroy {
    */
   @Output() sortDirectionChange = new EventEmitter<SortDirection>();
 
-  /**
-   * An object injector used to inject the startsWithOptions to the switchable StartsWith component
-   */
-  objectInjector: Injector;
-
-  /**
-   * Declare SortDirection enumeration to use it in the template
-   */
-  public sortDirections = SortDirection;
-
   /**
    * Observable that tracks if the back button should be displayed based on the path parameters
    */
@@ -124,11 +137,25 @@ export class BrowseByComponent implements OnInit, OnDestroy {
 
   public constructor(private injector: Injector,
                      protected paginationService: PaginationService,
+                     protected translateService: TranslateService,
                      private routeService: RouteService,
   ) {
 
   }
 
+  /**
+   * The label used by the back button.
+   */
+  buttonLabel = this.translateService.get('browse.back.all-results');
+
+  /**
+   * The function used for back navigation in metadata browse.
+   */
+  back = () => {
+    const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
+    this.paginationService.updateRoute(this.paginationConfig.id, { page: page }, { [this.paginationConfig.id + '.return']: null, value: null, startsWith: null });
+  };
+
   /**
    * Go to the previous page
    */
@@ -143,53 +170,20 @@ export class BrowseByComponent implements OnInit, OnDestroy {
     this.next.emit(true);
   }
 
-  /**
-   * Change the page size
-   * @param size
-   */
-  doPageSizeChange(size) {
-    this.paginationService.updateRoute(this.paginationConfig.id,{pageSize: size});
-  }
-
-  /**
-   * Change the sort direction
-   * @param direction
-   */
-  doSortDirectionChange(direction) {
-    this.paginationService.updateRoute(this.paginationConfig.id,{sortDirection: direction});
-  }
-
-  /**
-   * Get the switchable StartsWith component dependant on the type
-   */
-  getStartsWithComponent() {
-    return getStartsWithComponent(this.type);
-  }
-
   ngOnInit(): void {
-    this.objectInjector = Injector.create({
-      providers: [
-        { provide: 'startsWithOptions', useFactory: () => (this.startsWithOptions), deps:[] },
-        { provide: 'paginationId', useFactory: () => (this.paginationConfig?.id), deps:[] }
-      ],
-      parent: this.injector
-    });
-
     const startsWith$ = this.routeService.getQueryParameterValue('startsWith');
     const value$ = this.routeService.getQueryParameterValue('value');
 
     this.shouldDisplayResetButton$ = observableCombineLatest([startsWith$, value$]).pipe(
-      map(([startsWith, value]) => hasValue(startsWith) || hasValue(value))
+      map(([startsWith, value]) => hasValue(startsWith) || hasValue(value)),
     );
-    this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
   }
 
-  /**
-   * Navigate back to the previous browse by page
-   */
-  back() {
-    const page = +this.previousPage$.value > 1 ? +this.previousPage$.value : 1;
-    this.paginationService.updateRoute(this.paginationConfig.id, {page: page}, {[this.paginationConfig.id + '.return']: null, value: null, startsWith: null});
+  ngOnChanges(): void {
+    if (this.sub) {
+      this.sub.unsubscribe();
+    }
+    this.sub = this.routeService.getQueryParameterValue(this.paginationConfig.id + '.return').subscribe(this.previousPage$);
   }
 
   ngOnDestroy(): void {
diff --git a/src/app/shared/browse-by/shared-browse-by.module.ts b/src/app/shared/browse-by/shared-browse-by.module.ts
new file mode 100644
index 0000000000..d41733dbfd
--- /dev/null
+++ b/src/app/shared/browse-by/shared-browse-by.module.ts
@@ -0,0 +1,32 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { AccessControlRoutingModule } from '../../access-control/access-control-routing.module';
+import { BrowseByRoutingModule } from '../../browse-by/browse-by-routing.module';
+import { ResultsBackButtonModule } from '../results-back-button/results-back-button.module';
+import { SharedModule } from '../shared.module';
+import { BrowseByComponent } from './browse-by.component';
+import { ThemedBrowseByComponent } from './themed-browse-by.component';
+
+const DECLARATIONS = [
+  BrowseByComponent,
+  ThemedBrowseByComponent,
+];
+
+@NgModule({
+  declarations: [
+    ...DECLARATIONS,
+  ],
+  imports: [
+    ResultsBackButtonModule,
+    BrowseByRoutingModule,
+    AccessControlRoutingModule,
+    CommonModule,
+    SharedModule,
+  ],
+  exports: [
+    ...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..95809ad9b0
--- /dev/null
+++ b/src/app/shared/browse-by/themed-browse-by.component.ts
@@ -0,0 +1,85 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { StartsWithType } from '../starts-with/starts-with-decorator';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { BrowseByComponent } from './browse-by.component';
+
+/**
+ * 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() displayTitle: boolean;
+
+  @Input() objects$: Observable<RemoteData<PaginatedList<ListableObject>>>;
+
+  @Input() paginationConfig: PaginationComponentOptions;
+
+  @Input() sortConfig: SortOptions;
+
+  @Input() type: StartsWithType;
+
+  @Input() startsWithOptions: (string | 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',
+    'displayTitle',
+    '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/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index db6c1fb41d..c4e5acfb4b 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>
-<div class="scrollable-menu"
-     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,25 +18,27 @@
      [scrollWindow]="false"
      (scrolled)="onScrollDown()">
 
-  <button class="dropdown-item disabled" *ngIf="searchListCollection?.length == 0 && !(isLoading | async)">
+  <li class="dropdown-item disabled" role="menuitem" *ngIf="searchListCollection?.length === 0 && (isLoading | async) !== true">
     {{'submission.sections.general.no-collection' | translate}}
-  </button>
+  </li>
   <ng-container *ngIf="searchListCollection?.length > 0">
-    <button *ngFor="let listItem of searchListCollection"
+    <li *ngFor="let listItem of searchListCollection"
             class="dropdown-item collection-item"
+            role="menuitem"
             title="{{ listItem.collection.name }}"
             (click)="onSelect(listItem)">
-      <ul class="list-unstyled mb-0">
-        <li class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
+      <div class="list-unstyled mb-0">
+        <div class="list-item text-truncate text-secondary" *ngFor="let item of listItem.communities">
           {{ item.name}} <i class="fa fa-level-down" aria-hidden="true"></i>
-        </li>
-        <li class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</li>
-      </ul>
-    </button>
+        </div>
+        <div class="list-item text-truncate text-primary font-weight-bold">{{ listItem.collection.name}}</div>
+      </div>
+    </li>
   </ng-container>
-  <button class="dropdown-item disabled" *ngIf="(isLoading | async)">
-    <ds-themed-loading message="{{'loading.default' | translate}}">
-    </ds-themed-loading>
-  </button>
-
-</div>
+  <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/collection-dropdown/collection-dropdown.component.spec.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
index 2dc1ee433c..5edd550665 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.spec.ts
@@ -1,25 +1,35 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, ElementRef, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  ElementRef,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { CollectionDropdownComponent } from './collection-dropdown.component';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { Collection } from '../../core/shared/collection.model';
 import { CollectionDataService } from '../../core/data/collection-data.service';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { Collection } from '../../core/shared/collection.model';
 import { Community } from '../../core/shared/community.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { MockElementRef } from '../testing/element-ref.mock';
+import { CollectionDropdownComponent } from './collection-dropdown.component';
 
 const community: Community = Object.assign(new Community(), {
   id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
   uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-  name: 'Community 1'
+  name: 'Community 1',
 });
 
 const collections: Collection[] = [
@@ -30,9 +40,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 1'
+        value: 'Community 1-Collection 1',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
@@ -41,9 +51,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 2'
+        value: 'Community 1-Collection 2',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
@@ -52,9 +62,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 3'
+        value: 'Community 1-Collection 3',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
@@ -63,9 +73,9 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 4'
+        value: 'Community 1-Collection 4',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
   }),
   Object.assign(new Collection(), {
     id: 'a5159760-f362-4659-9e81-e3253ad91ede',
@@ -74,24 +84,24 @@ const collections: Collection[] = [
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 5'
+        value: 'Community 1-Collection 5',
       }],
-    parentCommunity: createSuccessfulRemoteDataObject$(community)
-  })
+    parentCommunity: createSuccessfulRemoteDataObject$(community),
+  }),
 ];
 
 const listElementMock = {
   communities: [
     {
       id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-      name: 'Community 1'
-    }
+      name: 'Community 1',
+    },
   ],
   collection: {
     id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
     uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
-    name: 'Collection 3'
-  }
+    name: 'Collection 3',
+  },
 };
 
 describe('CollectionDropdownComponent', () => {
@@ -102,7 +112,7 @@ describe('CollectionDropdownComponent', () => {
 
   const collectionDataServiceMock: any = jasmine.createSpyObj('CollectionDataService', {
     getAuthorizedCollection: jasmine.createSpy('getAuthorizedCollection'),
-    getAuthorizedCollectionByEntityType: jasmine.createSpy('getAuthorizedCollectionByEntityType')
+    getAuthorizedCollectionByEntityType: jasmine.createSpy('getAuthorizedCollectionByEntityType'),
   });
 
   const paginatedCollection = buildPaginatedList(new PageInfo(), collections);
@@ -117,17 +127,17 @@ describe('CollectionDropdownComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [CollectionDropdownComponent],
       providers: [
         { provide: CollectionDataService, useValue: collectionDataServiceMock },
         { provide: ElementRef, useClass: MockElementRef },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -241,7 +251,7 @@ describe('CollectionDropdownComponent', () => {
 
     const expectedTheOnlySelectable = {
       communities: [ { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Community 1', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88' } ],
-      collection: { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Collection 1' }
+      collection: { id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88', name: 'Collection 1' },
     };
 
     expect(component.theOnlySelectable.emit).toHaveBeenCalledWith(expectedTheOnlySelectable);
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
index 10a673c7f2..415560cc3b 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.ts
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -7,24 +7,40 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  Output
+  Output,
 } from '@angular/core';
-import { FormControl } from '@angular/forms';
-
-import { BehaviorSubject, from as observableFrom, Observable, of as observableOf, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, map, mergeMap, reduce, startWith, switchMap, take } from 'rxjs/operators';
-
-import { hasValue } from '../empty.util';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { Community } from '../../core/shared/community.model';
-import { CollectionDataService } from '../../core/data/collection-data.service';
-import { Collection } from '../../core/shared/collection.model';
-import { followLink } from '../utils/follow-link-config.model';
+import { UntypedFormControl } from '@angular/forms';
 import {
-  getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload
-} from '../../core/shared/operators';
+  BehaviorSubject,
+  from as observableFrom,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  mergeMap,
+  reduce,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../core/data/collection-data.service';
 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 { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../core/shared/operators';
+import { hasValue } from '../empty.util';
+import { followLink } from '../utils/follow-link-config.model';
 
 /**
  * An interface to represent a collection entry
@@ -46,7 +62,7 @@ export interface CollectionListEntry {
 @Component({
   selector: 'ds-collection-dropdown',
   templateUrl: './collection-dropdown.component.html',
-  styleUrls: ['./collection-dropdown.component.scss']
+  styleUrls: ['./collection-dropdown.component.scss'],
 })
 export class CollectionDropdownComponent implements OnInit, OnDestroy {
 
@@ -54,7 +70,7 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
    * The search form control
    * @type {FormControl}
    */
-  public searchField: FormControl = new FormControl();
+  public searchField: UntypedFormControl = new UntypedFormControl();
 
   /**
    * The collection list obtained from a search
@@ -124,7 +140,8 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
     private collectionDataService: CollectionDataService,
-    private el: ElementRef
+    private el: ElementRef,
+    public dsoNameService: DSONameService,
   ) { }
 
   /**
@@ -149,18 +166,18 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
   ngOnInit() {
     this.isLoading.next(false);
     this.subs.push(this.searchField.valueChanges.pipe(
-        debounceTime(500),
-        distinctUntilChanged(),
-        startWith('')
-      ).subscribe(
-        (next) => {
-          if (hasValue(next) && next !== this.currentQuery) {
-            this.resetPagination();
-            this.currentQuery = next;
-            this.populateCollectionList(this.currentQuery, this.currentPage);
-          }
+      debounceTime(500),
+      distinctUntilChanged(),
+      startWith(''),
+    ).subscribe(
+      (next) => {
+        if (hasValue(next) && next !== this.currentQuery) {
+          this.resetPagination();
+          this.currentQuery = next;
+          this.populateCollectionList(this.currentQuery, this.currentPage);
         }
-      ));
+      },
+    ));
     // Workaround for prevent the scroll of main page when this component is placed in a dialog
     setTimeout(() => this.el.nativeElement.querySelector('input').focus(), 0);
   }
@@ -205,52 +222,52 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
     // Set the pagination info
     const findOptions: FindListOptions = {
       elementsPerPage: 10,
-      currentPage: page
+      currentPage: page,
     };
     let searchListService$: Observable<RemoteData<PaginatedList<Collection>>>;
     if (this.entityType) {
       searchListService$ = this.collectionDataService
-      .getAuthorizedCollectionByEntityType(
-        query,
-        this.entityType,
-        findOptions,
-        true,
-        followLink('parentCommunity'));
+        .getAuthorizedCollectionByEntityType(
+          query,
+          this.entityType,
+          findOptions,
+          true,
+          followLink('parentCommunity'));
     } else {
       searchListService$ = this.collectionDataService
-      .getAuthorizedCollection(query, findOptions, true, true, followLink('parentCommunity'));
+        .getAuthorizedCollection(query, findOptions, true, true, followLink('parentCommunity'));
     }
     this.searchListCollection$ = searchListService$.pipe(
-        getFirstCompletedRemoteData(),
-        switchMap((collectionsRD: RemoteData<PaginatedList<Collection>>) => {
-          this.searchComplete.emit();
-          if (collectionsRD.hasSucceeded && collectionsRD.payload.totalElements > 0) {
-            if (this.searchListCollection.length >= collectionsRD.payload.totalElements) {
-              this.hasNextPage = false;
-            }
-            this.emitSelectionEvents(collectionsRD);
-            return observableFrom(collectionsRD.payload.page).pipe(
-              mergeMap((collection: Collection) => collection.parentCommunity.pipe(
-                getFirstSucceededRemoteDataPayload(),
-                map((community: Community) => ({
-                    communities: [{ id: community.id, name: community.name }],
-                    collection: { id: collection.id, uuid: collection.id, name: collection.name }
-                  })
-                ))),
-              reduce((acc: any, value: any) => [...acc, value], []),
-            );
-          } else {
+      getFirstCompletedRemoteData(),
+      switchMap((collectionsRD: RemoteData<PaginatedList<Collection>>) => {
+        this.searchComplete.emit();
+        if (collectionsRD.hasSucceeded && collectionsRD.payload.totalElements > 0) {
+          if (this.searchListCollection.length >= collectionsRD.payload.totalElements) {
             this.hasNextPage = false;
-            return observableOf([]);
           }
-        })
-        );
+          this.emitSelectionEvents(collectionsRD);
+          return observableFrom(collectionsRD.payload.page).pipe(
+            mergeMap((collection: Collection) => collection.parentCommunity.pipe(
+              getFirstSucceededRemoteDataPayload(),
+              map((community: Community) => ({
+                communities: [{ id: community.id, name: this.dsoNameService.getName(community) }],
+                collection: { id: collection.id, uuid: collection.id, name: this.dsoNameService.getName(collection) },
+              }),
+              ))),
+            reduce((acc: any, value: any) => [...acc, value], []),
+          );
+        } else {
+          this.hasNextPage = false;
+          return observableOf([]);
+        }
+      }),
+    );
     this.subs.push(
       this.searchListCollection$.subscribe((list: CollectionListEntry[]) => {
         this.searchListCollection.push(...list);
         this.hideShowLoader(false);
         this.changeDetectorRef.detectChanges();
-      })
+      }),
     );
   }
 
@@ -298,11 +315,11 @@ export class CollectionDropdownComponent implements OnInit, OnDestroy {
       const collection = collections.payload.page[0];
       collections.payload.page[0].parentCommunity.pipe(
         getFirstSucceededRemoteDataPayload(),
-        take(1)
+        take(1),
       ).subscribe((community: Community) => {
         this.theOnlySelectable.emit({
-          communities: [{ id: community.id, name: community.name, uuid: community.id }],
-          collection: { id: collection.id, uuid: collection.id, name: collection.name }
+          communities: [{ id: community.id, name: this.dsoNameService.getName(community), uuid: community.id }],
+          collection: { id: collection.id, uuid: collection.id, name: this.dsoNameService.getName(collection) },
         });
       });
     }
diff --git a/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts b/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts
new file mode 100644
index 0000000000..6ecb6aeff8
--- /dev/null
+++ b/src/app/shared/collection-dropdown/themed-collection-dropdown.component.ts
@@ -0,0 +1,42 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { ThemedComponent } from '../theme-support/themed.component';
+import {
+  CollectionDropdownComponent,
+  CollectionListEntry,
+} from './collection-dropdown.component';
+
+@Component({
+  selector: 'ds-themed-collection-dropdown',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedCollectionDropdownComponent extends ThemedComponent<CollectionDropdownComponent> {
+
+  @Input() entityType: string;
+
+  @Output() searchComplete: EventEmitter<any> = new EventEmitter();
+
+  @Output() theOnlySelectable: EventEmitter<CollectionListEntry> = new EventEmitter();
+
+  @Output() selectionChange = new EventEmitter();
+
+  protected inAndOutputNames: (keyof CollectionDropdownComponent & keyof this)[] = ['entityType', 'searchComplete', 'theOnlySelectable', 'selectionChange'];
+
+  protected getComponentName(): string {
+    return 'CollectionDropdownComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/collection-dropdown/collection-dropdown.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./collection-dropdown.component`);
+  }
+}
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/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts
index 054c161da6..07daad2849 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -1,12 +1,25 @@
 import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormControl, FormGroup } from '@angular/forms';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import { of as observableOf } from 'rxjs';
+
 import { AuthService } from '../../../../core/auth/auth.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { RequestService } from '../../../../core/data/request.service';
@@ -15,11 +28,13 @@ import { Community } from '../../../../core/shared/community.model';
 import { hasValue } from '../../../empty.util';
 import { AuthServiceMock } from '../../../mocks/auth.service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { VarDirective } from '../../../utils/var.directive';
 import { ComColFormComponent } from './comcol-form.component';
-import { Operation } from 'fast-json-patch';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<any>;
@@ -30,12 +45,12 @@ describe('ComColFormComponent', () => {
       const controls = {};
       if (hasValue(fModel)) {
         fModel.forEach((controlModel) => {
-          controls[controlModel.id] = new FormControl((controlModel as any).value);
+          controls[controlModel.id] = new UntypedFormControl((controlModel as any).value);
         });
-        return new FormGroup(controls);
+        return new UntypedFormGroup(controls);
       }
       return undefined;
-    }
+    },
   };
   const dcTitle = 'dc.title';
   const dcAbstract = 'dc.description.abstract';
@@ -46,22 +61,22 @@ describe('ComColFormComponent', () => {
     new DynamicInputModel({
       id: 'title',
       name: dcTitle,
-      value: newTitleMD[dcTitle][0].value
+      value: newTitleMD[dcTitle][0].value,
     }),
     new DynamicInputModel({
       id: 'abstract',
       name: dcAbstract,
-      value: abstractMD[dcAbstract][0].value
-    })
+      value: abstractMD[dcAbstract][0].value,
+    }),
   ];
 
   const logo = {
-    id: 'logo'
+    id: 'logo',
   };
   const logoEndpoint = 'rest/api/logo/endpoint';
   const dsoService = Object.assign({
     getLogoEndpoint: () => observableOf(logoEndpoint),
-    deleteLogo: () => createSuccessfulRemoteDataObject$({})
+    deleteLogo: () => createSuccessfulRemoteDataObject$({}),
   });
   const notificationsService = new NotificationsServiceStub();
 
@@ -70,10 +85,10 @@ describe('ComColFormComponent', () => {
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
   const requestServiceStub = jasmine.createSpyObj('requestService', {
-    removeByHrefSubstring: {}
+    removeByHrefSubstring: {},
   });
   const objectCacheStub = jasmine.createSpyObj('objectCache', {
-    remove: {}
+    remove: {},
   });
 
   beforeEach(waitForAsync(() => {
@@ -86,16 +101,16 @@ describe('ComColFormComponent', () => {
         { provide: NotificationsService, useValue: notificationsService },
         { provide: AuthService, useValue: new AuthServiceMock() },
         { provide: RequestService, useValue: requestServiceStub },
-        { provide: ObjectCacheService, useValue: objectCacheStub }
+        { provide: ObjectCacheService, useValue: objectCacheStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   describe('when the dso doesn\'t contain an ID (newly created)', () => {
     beforeEach(() => {
       initComponent(Object.assign(new Community(), {
-        _links: { self: { href: 'community-self' } }
+        _links: { self: { href: 'community-self' } },
       }));
     });
 
@@ -135,23 +150,23 @@ describe('ComColFormComponent', () => {
         expect(comp.submitForm.emit).toHaveBeenCalledWith(
           {
             dso: Object.assign({}, comp.dso, {
-                metadata: {
-                  'dc.title': [{
-                    value: 'New Community Title',
-                    language: null,
-                  }],
-                  'dc.description.abstract': [{
-                    value: 'Community description',
-                    language: null,
-                  }],
-                },
-                type: Community.type,
-              }
+              metadata: {
+                'dc.title': [{
+                  value: 'New Community Title',
+                  language: null,
+                }],
+                'dc.description.abstract': [{
+                  value: 'Community description',
+                  language: null,
+                }],
+              },
+              type: Community.type,
+            },
             ),
             uploader: undefined,
             deleteLogo: false,
             operations: operations,
-          }
+          },
         );
       });
     });
@@ -193,7 +208,7 @@ describe('ComColFormComponent', () => {
         initComponent(Object.assign(new Community(), {
           id: 'community-id',
           logo: createSuccessfulRemoteDataObject$(undefined),
-          _links: { self: { href: 'community-self' } }
+          _links: { self: { href: 'community-self' } },
         }));
       });
 
@@ -214,7 +229,7 @@ describe('ComColFormComponent', () => {
           _links: {
             self: { href: 'community-self' },
             logo: { href: 'community-logo' },
-          }
+          },
         }));
       });
 
diff --git a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
index 29be240753..ff51445ec2 100644
--- a/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,9 +1,27 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
+import { Operation } from 'fast-json-patch';
 import { FileUploader } from 'ng2-file-upload';
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+
 import { AuthService } from '../../../../core/auth/auth.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
@@ -13,15 +31,20 @@ import { RestRequestMethod } from '../../../../core/data/rest-request-method';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
-import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
-import { ResourceType } from '../../../../core/shared/resource-type';
-import { hasValue, isNotEmpty } from '../../../empty.util';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { UploaderOptions } from '../../../uploader/uploader-options.model';
-import { UploaderComponent } from '../../../uploader/uploader.component';
-import { Operation } from 'fast-json-patch';
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../../../core/shared/metadata.models';
 import { NoContent } from '../../../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { UploaderComponent } from '../../../upload/uploader/uploader.component';
+import { UploaderOptions } from '../../../upload/uploader/uploader-options.model';
 
 /**
  * A form for creating and editing Communities or Collections
@@ -29,7 +52,7 @@ import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 @Component({
   selector: 'ds-comcol-form',
   styleUrls: ['./comcol-form.component.scss'],
-  templateUrl: './comcol-form.component.html'
+  templateUrl: './comcol-form.component.html',
 })
 export class ComColFormComponent<T extends Collection | Community> implements OnInit, OnDestroy {
 
@@ -66,14 +89,14 @@ export class ComColFormComponent<T extends Collection | Community> implements On
   /**
    * The form group of this form
    */
-  formGroup: FormGroup;
+  formGroup: UntypedFormGroup;
 
   /**
    * The uploader configuration options
    * @type {UploaderOptions}
    */
   uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
-    autoUpload: false
+    autoUpload: false,
   });
 
   /**
@@ -127,39 +150,41 @@ export class ComColFormComponent<T extends Collection | Community> implements On
   }
 
   ngOnInit(): void {
-    this.formModel.forEach(
-      (fieldModel: DynamicInputModel) => {
-        fieldModel.value = this.dso.firstMetadataValue(fieldModel.name);
-      }
-    );
-    this.formGroup = this.formService.createFormGroup(this.formModel);
-
-    this.updateFieldTranslations();
-    this.translate.onLangChange
-      .subscribe(() => {
-        this.updateFieldTranslations();
-      });
-
-    if (hasValue(this.dso.id)) {
-      this.subs.push(
-        observableCombineLatest([
-          this.dsoService.getLogoEndpoint(this.dso.id),
-          this.dso.logo
-        ]).subscribe(([href, logoRD]: [string, RemoteData<Bitstream>]) => {
-          this.uploadFilesOptions.url = href;
-          this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
-          // If the object already contains a logo, send out a PUT request instead of POST for setting a new logo
-          if (hasValue(logoRD.payload)) {
-            this.uploadFilesOptions.method = RestRequestMethod.PUT;
-          }
-          this.initializedUploaderOptions.next(true);
-        })
+    if (hasValue(this.formModel)) {
+      this.formModel.forEach(
+        (fieldModel: DynamicInputModel) => {
+          fieldModel.value = this.dso.firstMetadataValue(fieldModel.name);
+        },
       );
-    } else {
-      // Set a placeholder URL to not break the uploader component. This will be replaced once the object is created.
-      this.uploadFilesOptions.url = 'placeholder';
-      this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
-      this.initializedUploaderOptions.next(true);
+      this.formGroup = this.formService.createFormGroup(this.formModel);
+
+      this.updateFieldTranslations();
+      this.translate.onLangChange
+        .subscribe(() => {
+          this.updateFieldTranslations();
+        });
+
+      if (hasValue(this.dso.id)) {
+        this.subs.push(
+          observableCombineLatest([
+            this.dsoService.getLogoEndpoint(this.dso.id),
+            this.dso.logo,
+          ]).subscribe(([href, logoRD]: [string, RemoteData<Bitstream>]) => {
+            this.uploadFilesOptions.url = href;
+            this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+            // If the object already contains a logo, send out a PUT request instead of POST for setting a new logo
+            if (hasValue(logoRD.payload)) {
+              this.uploadFilesOptions.method = RestRequestMethod.PUT;
+            }
+            this.initializedUploaderOptions.next(true);
+          }),
+        );
+      } else {
+        // Set a placeholder URL to not break the uploader component. This will be replaced once the object is created.
+        this.uploadFilesOptions.url = 'placeholder';
+        this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+        this.initializedUploaderOptions.next(true);
+      }
     }
   }
 
@@ -169,17 +194,17 @@ export class ComColFormComponent<T extends Collection | Community> implements On
   onSubmit() {
     if (this.markLogoForDeletion && hasValue(this.dso.id) && hasValue(this.dso._links.logo)) {
       this.dsoService.deleteLogo(this.dso).pipe(
-        getFirstCompletedRemoteData()
+        getFirstCompletedRemoteData(),
       ).subscribe((response: RemoteData<NoContent>) => {
         if (response.hasSucceeded) {
           this.notificationsService.success(
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.title'),
-            this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.content')
+            this.translate.get(this.type.value + '.edit.logo.notifications.delete.success.content'),
           );
         } else {
           this.notificationsService.error(
             this.translate.get(this.type.value + '.edit.logo.notifications.delete.error.title'),
-            response.errorMessage
+            response.errorMessage,
           );
         }
         this.dso.logo = undefined;
@@ -192,7 +217,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
     this.formModel.forEach((fieldModel: DynamicInputModel) => {
       const value: MetadataValue = {
         value: fieldModel.value as string,
-        language: null
+        language: null,
       } as any;
       if (formMetadata.hasOwnProperty(fieldModel.name)) {
         formMetadata[fieldModel.name].push(value);
@@ -204,9 +229,9 @@ export class ComColFormComponent<T extends Collection | Community> implements On
     const updatedDSO = Object.assign({}, this.dso, {
       metadata: {
         ...this.dso.metadata,
-        ...formMetadata
+        ...formMetadata,
       },
-      type: Community.type
+      type: Community.type,
     });
 
     const operations: Operation[] = [];
@@ -244,7 +269,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
             fieldModel.errorMessages[key] = this.translate.instant(this.type.value + this.ERROR_KEY_PREFIX + fieldModel.id + '.' + key);
           });
         }
-      }
+      },
     );
   }
 
diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
index f4c05344fa..072eec4b79 100644
--- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
@@ -1,21 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityDataService } from '../../../../core/data/community-data.service';
-import { RouteService } from '../../../../core/services/route.service';
-import { Router } from '@angular/router';
-import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../../../../core/shared/community.model';
-import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { CreateComColPageComponent } from './create-comcol-page.component';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
-import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { RequestService } from '../../../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
+import { Community } from '../../../../core/shared/community.model';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { SharedModule } from '../../../shared.module';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { CreateComColPageComponent } from './create-comcol-page.component';
 
 describe('CreateComColPageComponent', () => {
   let comp: CreateComColPageComponent<any>;
@@ -41,9 +49,9 @@ describe('CreateComColPageComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
+        value: 'test community',
       }],
-      _links: {}
+      _links: {},
     });
 
     parentCommunity = Object.assign(new Community(), {
@@ -51,18 +59,18 @@ describe('CreateComColPageComponent', () => {
       id: 'a20da287-e174-466a-9926-f66as300d399',
       metadata: [{
         key: 'dc.title',
-        value: 'parent community'
+        value: 'parent community',
       }],
-      _links: {}
+      _links: {},
     });
 
     newCommunity = Object.assign(new Community(), {
       uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48',
       metadata: [{
         key: 'dc.title',
-        value: 'new community'
+        value: 'new community',
       }],
-      _links: {}
+      _links: {},
     });
 
     communityDataServiceStub = {
@@ -70,22 +78,22 @@ describe('CreateComColPageComponent', () => {
         uuid: uuid,
         metadata: [{
           key: 'dc.title',
-          value: community.name
-        }]
+          value: community.name,
+        }],
       })),
       create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
       getLogoEndpoint: () => observableOf(logoEndpoint),
       findByHref: () => null,
       refreshCache: () => {
         return;
-      }
+      },
     };
 
     routeServiceStub = {
-      getQueryParameterValue: (param) => observableOf(community.uuid)
+      getQueryParameterValue: (param) => observableOf(community.uuid),
     };
     routerStub = {
-      navigate: (commands) => commands
+      navigate: (commands) => commands,
     };
 
     requestServiceStub = jasmine.createSpyObj('RequestService', {
@@ -104,9 +112,9 @@ describe('CreateComColPageComponent', () => {
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: routerStub },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
-        { provide: RequestService, useValue: requestServiceStub }
+        { provide: RequestService, useValue: requestServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -131,20 +139,20 @@ describe('CreateComColPageComponent', () => {
           dso: Object.assign(new Community(), {
             metadata: [{
               key: 'dc.title',
-              value: 'test'
-            }]
+              value: 'test',
+            }],
           }),
           _links: {},
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-          }
+          },
         };
       });
 
@@ -174,22 +182,22 @@ describe('CreateComColPageComponent', () => {
           dso: Object.assign(new Community(), {
             metadata: [{
               key: 'dc.title',
-              value: 'test'
-            }]
+              value: 'test',
+            }],
           }),
           _links: {},
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [
-              {}
+              {},
             ],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
+          },
         };
       });
 
diff --git a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
index 2db9fcc20c..de90df6084 100644
--- a/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
+++ b/src/app/shared/comcol/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -1,27 +1,39 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { mergeMap, take } from 'rxjs/operators';
+import {
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RequestParam } from '../../../../core/cache/models/request-param.model';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { RouteService } from '../../../../core/services/route.service';
-import { Community } from '../../../../core/shared/community.model';
-import { getFirstSucceededRemoteDataPayload, } from '../../../../core/shared/operators';
-import { ResourceType } from '../../../../core/shared/resource-type';
-import { hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { RequestParam } from '../../../../core/cache/models/request-param.model';
 import { RequestService } from '../../../../core/data/request.service';
+import { RouteService } from '../../../../core/services/route.service';
 import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
 
 /**
  * Component representing the create page for communities and collections
  */
 @Component({
   selector: 'ds-create-comcol',
-  template: ''
+  template: '',
 })
 export class CreateComColPageComponent<TDomain extends Collection | Community> implements OnInit {
   /**
@@ -51,12 +63,13 @@ export class CreateComColPageComponent<TDomain extends Collection | Community> i
 
   public constructor(
     protected dsoDataService: ComColDataService<TDomain>,
+    public dsoNameService: DSONameService,
     protected parentDataService: CommunityDataService,
     protected routeService: RouteService,
     protected router: Router,
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
-    protected requestService: RequestService
+    protected requestService: RequestService,
   ) {
 
   }
@@ -81,10 +94,10 @@ export class CreateComColPageComponent<TDomain extends Collection | Community> i
     this.parentUUID$.pipe(
       take(1),
       mergeMap((uuid: string) => {
-      const params = uuid ? [new RequestParam('parent', uuid)] : [];
-      return this.dsoDataService.create(dso, ...params)
-        .pipe(getFirstSucceededRemoteDataPayload()
-        );
+        const params = uuid ? [new RequestParam('parent', uuid)] : [];
+        return this.dsoDataService.create(dso, ...params)
+          .pipe(getFirstSucceededRemoteDataPayload(),
+          );
       }))
       .subscribe((dsoRD: TDomain) => {
         if (isNotUndefined(dsoRD)) {
diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
index bc73e4134b..05fea7eb9f 100644
--- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.spec.ts
@@ -1,20 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityDataService } from '../../../../core/data/community-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../../../../core/shared/community.model';
-import { SharedModule } from '../../../shared.module';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DeleteComColPageComponent } from './delete-comcol-page.component';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { RequestService } from '../../../../core/data/request.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { createFailedRemoteDataObject$, createNoContentRemoteDataObject$ } from '../../../remote-data.utils';
+import { CommunityDataService } from '../../../../core/data/community-data.service';
+import { Community } from '../../../../core/shared/community.model';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createNoContentRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { SharedModule } from '../../../shared.module';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { DeleteComColPageComponent } from './delete-comcol-page.component';
 
 describe('DeleteComColPageComponent', () => {
   let comp: DeleteComColPageComponent<any>;
@@ -42,16 +55,16 @@ describe('DeleteComColPageComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
-      }]
+        value: 'test community',
+      }],
     });
 
     newCommunity = Object.assign(new Community(), {
       uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48',
       metadata: [{
         key: 'dc.title',
-        value: 'new community'
-      }]
+        value: 'new community',
+      }],
     });
 
     parentCommunity = Object.assign(new Community(), {
@@ -59,8 +72,8 @@ describe('DeleteComColPageComponent', () => {
       id: 'a20da287-e174-466a-9926-f66as300d399',
       metadata: [{
         key: 'dc.title',
-        value: 'parent community'
-      }]
+        value: 'parent community',
+      }],
     });
 
     dsoDataService = jasmine.createSpyObj(
@@ -71,15 +84,15 @@ describe('DeleteComColPageComponent', () => {
       });
 
     routerStub = {
-      navigate: (commands) => commands
+      navigate: (commands) => commands,
     };
 
     routeStub = {
-      data: observableOf(community)
+      data: observableOf(community),
     };
 
     translateServiceStub = jasmine.createSpyObj('TranslateService', {
-      instant: jasmine.createSpy('instant')
+      instant: jasmine.createSpy('instant'),
     });
 
   }
@@ -95,7 +108,7 @@ describe('DeleteComColPageComponent', () => {
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: TranslateService, useValue: translateServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -118,10 +131,10 @@ describe('DeleteComColPageComponent', () => {
           uuid: validUUID,
           metadata: [{
             key: 'dc.title',
-            value: 'test'
-          }]
+            value: 'test',
+          }],
         }),
-        _links: {}
+        _links: {},
       };
 
       data2 = {
@@ -129,20 +142,20 @@ describe('DeleteComColPageComponent', () => {
           uuid: invalidUUID,
           metadata: [{
             key: 'dc.title',
-            value: 'test'
-          }]
+            value: 'test',
+          }],
         }),
         _links: {},
         uploader: {
           options: {
-            url: ''
+            url: '',
           },
           queue: [],
           /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
           uploadAll: () => {
-          }
+          },
           /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-        }
+        },
       };
     });
 
@@ -179,8 +192,8 @@ describe('DeleteComColPageComponent', () => {
         uuid: validUUID,
         metadata: [{
           key: 'dc.title',
-          value: 'test'
-        }]
+          value: 'test',
+        }],
       });
     });
 
diff --git a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
index 94f46088aa..b855b2ea5d 100644
--- a/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
+++ b/src/app/shared/comcol/comcol-forms/delete-comcol-page/delete-comcol-page.component.ts
@@ -1,22 +1,36 @@
-import { Component, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { first, map } from 'rxjs/operators';
-import { NotificationsService } from '../../../notifications/notifications.service';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { NoContent } from '../../../../core/shared/NoContent.model';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  first,
+  map,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { ComColDataService } from '../../../../core/data/comcol-data.service';
-import { Community } from '../../../../core/shared/community.model';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { NoContent } from '../../../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../notifications/notifications.service';
 
 /**
  * Component representing the delete page for communities and collections
  */
 @Component({
   selector: 'ds-delete-comcol',
-  template: ''
+  template: '',
 })
 export class DeleteComColPageComponent<TDomain extends Community | Collection> implements OnInit {
   /**
@@ -36,6 +50,7 @@ export class DeleteComColPageComponent<TDomain extends Community | Collection> i
 
   public constructor(
     protected dsoDataService: ComColDataService<TDomain>,
+    public dsoNameService: DSONameService,
     protected router: Router,
     protected route: ActivatedRoute,
     protected notifications: NotificationsService,
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
index ef69e82c8c..5c2a34d407 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
@@ -1,20 +1,28 @@
 import { CommonModule } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { ComColDataService } from '../../../../../core/data/comcol-data.service';
 import { Community } from '../../../../../core/shared/community.model';
 import { NotificationsService } from '../../../../notifications/notifications.service';
-import { SharedModule } from '../../../../shared.module';
-import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../../remote-data.utils';
+import { SharedModule } from '../../../../shared.module';
+import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
 import { ComcolMetadataComponent } from './comcol-metadata.component';
 
 describe('ComColMetadataComponent', () => {
@@ -36,34 +44,34 @@ describe('ComColMetadataComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
-      }]
+        value: 'test community',
+      }],
     });
 
     newCommunity = Object.assign(new Community(), {
       uuid: '1ff59938-a69a-4e62-b9a4-718569c55d48',
       metadata: [{
         key: 'dc.title',
-        value: 'new community'
-      }]
+        value: 'new community',
+      }],
     });
 
     communityDataServiceStub = {
       update: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
       patch: () => null,
-      getLogoEndpoint: () => observableOf(logoEndpoint)
+      getLogoEndpoint: () => observableOf(logoEndpoint),
     };
 
     routerStub = {
-      navigate: (commands) => commands
+      navigate: (commands) => commands,
     };
 
     routeStub = {
       parent: {
         data: observableOf({
-          dso: createSuccessfulRemoteDataObject(community)
-        })
-      }
+          dso: createSuccessfulRemoteDataObject(community),
+        }),
+      },
     };
 
   }
@@ -76,9 +84,9 @@ describe('ComColMetadataComponent', () => {
         { provide: ComColDataService, useValue: communityDataServiceStub },
         { provide: Router, useValue: routerStub },
         { provide: ActivatedRoute, useValue: routeStub },
-        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -110,12 +118,12 @@ describe('ComColMetadataComponent', () => {
           dso: new Community(),
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
           },
           deleteLogo: false,
@@ -156,21 +164,21 @@ describe('ComColMetadataComponent', () => {
           dso: Object.assign(new Community(), {
             metadata: [{
               key: 'dc.title',
-              value: 'test'
-            }]
+              value: 'test',
+            }],
           }),
           uploader: {
             options: {
-              url: ''
+              url: '',
             },
             queue: [
-              {}
+              {},
             ],
             /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
             uploadAll: () => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
+          },
         };
       });
 
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
index 5bd51ea650..6d024d2499 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
@@ -1,21 +1,37 @@
-import { Component, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { ActivatedRoute, Router } from '@angular/router';
-import { first, map, take } from 'rxjs/operators';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
-import { hasValue, isEmpty } from '../../../../empty.util';
-import { ResourceType } from '../../../../../core/shared/resource-type';
-import { ComColDataService } from '../../../../../core/data/comcol-data.service';
-import { NotificationsService } from '../../../../notifications/notifications.service';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { Community } from '../../../../../core/shared/community.model';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { ComColDataService } from '../../../../../core/data/comcol-data.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
 import { Collection } from '../../../../../core/shared/collection.model';
+import { Community } from '../../../../../core/shared/community.model';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+} from '../../../../../core/shared/operators';
+import { ResourceType } from '../../../../../core/shared/resource-type';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../empty.util';
+import { NotificationsService } from '../../../../notifications/notifications.service';
 
 @Component({
   selector: 'ds-comcol-metadata',
-  template: ''
+  template: '',
 })
 export class ComcolMetadataComponent<TDomain extends Community | Collection> implements OnInit {
   /**
@@ -37,12 +53,12 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
     protected router: Router,
     protected route: ActivatedRoute,
     protected notificationsService: NotificationsService,
-    protected translate: TranslateService
+    protected translate: TranslateService,
   ) {
   }
 
   ngOnInit(): void {
-    this.dsoRD$ = this.route.parent.data.pipe(first(), map((data) => data.dso));
+    this.dsoRD$ = this.route.parent.data.pipe(map((data) => data.dso));
   }
 
   /**
@@ -63,19 +79,18 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
     }
 
     if (!isEmpty(event.operations)) {
-      this.dsoDataService.patch(event.dso, event.operations).pipe(getFirstCompletedRemoteData())
-        .subscribe(async (response: RemoteData<DSpaceObject>) => {
-          if (response.hasSucceeded) {
-            if (!newLogo && !deleteLogo) {
-              await this.router.navigate([this.frontendURL + event.dso.uuid]);
-            }
-            this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
-          } else if (response.statusCode === 403) {
-            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
-          } else {
-            this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
-          }
-        });
+      this.dsoDataService.patch(event.dso, event.operations).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((response: RemoteData<DSpaceObject>) => {
+        if (response.hasSucceeded) {
+          this.router.navigate([this.frontendURL + event.dso.uuid]);  // todo: ok not to await this?
+          this.notificationsService.success(null, this.translate.get(`${this.type.value}.edit.notifications.success`));
+        } else if (response.statusCode === 403) {
+          this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.unauthorized`));
+        } else {
+          this.notificationsService.error(null, this.translate.get(`${this.type.value}.edit.notifications.error`));
+        }
+      });
     }
   }
 
@@ -85,9 +100,9 @@ export class ComcolMetadataComponent<TDomain extends Community | Collection> imp
   navigateToHomePage() {
     this.dsoRD$.pipe(
       getFirstSucceededRemoteData(),
-      take(1)
+      take(1),
     ).subscribe((dsoRD: RemoteData<TDomain>) => {
       this.router.navigate([this.frontendURL + dsoRD.payload.id]);
-      });
+    });
   }
 }
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 1b21521d95..2b82ef4d5f 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>
@@ -13,16 +13,16 @@
 
     <div class="d-flex flex-md-row justify-content-between flex-column">
       <div class="w-100 d-flex align-items-center">
-        <ds-themed-loading *ngIf="!(groupRD$ | async)"></ds-themed-loading>
+        <ds-themed-loading *ngIf="groupRD$ | async | dsHasNoValue"></ds-themed-loading>
         <div *ngIf="hasNoGroup$ | async">
           {{'comcol-role.edit.no-group' | translate}}
-        </div>
+        </div>V
         <div *ngIf="hasAnonymousGroup$ | async">
           {{'comcol-role.edit.' + (comcolRole$ | async)?.name + '.anonymous-group' | translate}}
         </div>
         <a *ngIf="hasCustomGroup$ | async"
            routerLink="{{editGroupLink$ | async}}">
-          {{group.name}}
+          {{ dsoNameService.getName(group) }}
         </a>
       </div>
 
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
index 59fc95b67f..b47ded070c 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.spec.ts
@@ -1,17 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ComcolRoleComponent } from './comcol-role.component';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { RequestService } from '../../../../../core/data/request.service';
-import { of as observableOf } from 'rxjs';
-import { RouterTestingModule } from '@angular/router/testing';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ComcolModule } from '../../../comcol.module';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { RequestService } from '../../../../../core/data/request.service';
+import { GroupDataService } from '../../../../../core/eperson/group-data.service';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 import { NotificationsService } from '../../../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../../remote-data.utils';
 import { NotificationsServiceStub } from '../../../../testing/notifications-service.stub';
+import { ComcolModule } from '../../../comcol.module';
+import { ComcolRoleComponent } from './comcol-role.component';
 
 describe('ComcolRoleComponent', () => {
 
@@ -29,7 +42,7 @@ describe('ComcolRoleComponent', () => {
   const groupService = {
     findByHref: jasmine.createSpy('findByHref'),
     createComcolGroup: jasmine.createSpy('createComcolGroup').and.returnValue(observableOf({})),
-    deleteComcolGroup: jasmine.createSpy('deleteComcolGroup').and.returnValue(observableOf({}))
+    deleteComcolGroup: jasmine.createSpy('deleteComcolGroup').and.returnValue(observableOf({})),
   };
 
   beforeEach(waitForAsync(() => {
@@ -38,15 +51,16 @@ describe('ComcolRoleComponent', () => {
         ComcolModule,
         RouterTestingModule.withRoutes([]),
         TranslateModule.forRoot(),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: GroupDataService, useValue: groupService },
         { provide: RequestService, useValue: requestService },
-        { provide: NotificationsService, useClass: NotificationsServiceStub }
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents().then(() => {
       groupService.findByHref.and.callFake((link) => {
         if (link === 'test role link') {
@@ -125,7 +139,7 @@ describe('ComcolRoleComponent', () => {
 
     beforeEach(() => {
       group = {
-        name: 'Anonymous'
+        name: 'Anonymous',
       };
       statusCode = 200;
       comp.comcolRole = comcolRole;
@@ -159,7 +173,7 @@ describe('ComcolRoleComponent', () => {
 
     beforeEach(() => {
       group = {
-        name: 'custom group name'
+        name: 'custom group name',
       };
       statusCode = 200;
       comp.comcolRole = comcolRole;
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
index 3091dd0cf0..5a304ae9ec 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.ts
@@ -1,19 +1,38 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Group } from '../../../../../core/eperson/models/group.model';
-import { Community } from '../../../../../core/shared/community.model';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { GroupDataService } from '../../../../../core/eperson/group-data.service';
-import { Collection } from '../../../../../core/shared/collection.model';
-import { filter, map, switchMap } from 'rxjs/operators';
-import { getAllCompletedRemoteData, getFirstCompletedRemoteData } from '../../../../../core/shared/operators';
-import { RequestService } from '../../../../../core/data/request.service';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { HALLink } from '../../../../../core/shared/hal-link.model';
-import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths';
-import { hasNoValue, hasValue } from '../../../../empty.util';
-import { NoContent } from '../../../../../core/shared/NoContent.model';
-import { NotificationsService } from '../../../../notifications/notifications.service';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { getGroupEditRoute } from '../../../../../access-control/access-control-routing-paths';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestService } from '../../../../../core/data/request.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 { HALLink } from '../../../../../core/shared/hal-link.model';
+import { NoContent } from '../../../../../core/shared/NoContent.model';
+import {
+  getAllCompletedRemoteData,
+  getFirstCompletedRemoteData,
+} from '../../../../../core/shared/operators';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../../empty.util';
+import { NotificationsService } from '../../../../notifications/notifications.service';
 
 /**
  * Component for managing a community or collection role.
@@ -21,7 +40,7 @@ import { TranslateService } from '@ngx-translate/core';
 @Component({
   selector: 'ds-comcol-role',
   styleUrls: ['./comcol-role.component.scss'],
-  templateUrl: './comcol-role.component.html'
+  templateUrl: './comcol-role.component.html',
 })
 export class ComcolRoleComponent implements OnInit {
 
@@ -29,7 +48,7 @@ export class ComcolRoleComponent implements OnInit {
    * The community or collection to manage.
    */
   @Input()
-  dso: Community | Collection;
+    dso: Community | Collection;
 
   /**
    * The role to manage
@@ -76,6 +95,7 @@ export class ComcolRoleComponent implements OnInit {
     protected groupService: GroupDataService,
     protected notificationsService: NotificationsService,
     protected translateService: TranslateService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
@@ -103,7 +123,7 @@ export class ComcolRoleComponent implements OnInit {
    */
   create() {
     this.groupService.createComcolGroup(this.dso, this.comcolRole.name, this.groupLink).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Group>) => {
 
       if (rd.hasSucceeded) {
@@ -112,9 +132,9 @@ export class ComcolRoleComponent implements OnInit {
       } else {
         this.notificationsService.error(
           this.roleName$.pipe(
-            switchMap(role => this.translateService.get('comcol-role.edit.create.error.title', { role }))
+            switchMap(role => this.translateService.get('comcol-role.edit.create.error.title', { role })),
           ),
-          `${rd.statusCode} ${rd.errorMessage}`
+          `${rd.statusCode} ${rd.errorMessage}`,
         );
       }
     });
@@ -125,7 +145,7 @@ export class ComcolRoleComponent implements OnInit {
    */
   delete() {
     this.groupService.deleteComcolGroup(this.groupLink).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<NoContent>) => {
       if (rd.hasSucceeded) {
         this.groupService.clearGroupsRequests();
@@ -133,9 +153,9 @@ export class ComcolRoleComponent implements OnInit {
       } else {
         this.notificationsService.error(
           this.roleName$.pipe(
-            switchMap(role => this.translateService.get('comcol-role.edit.delete.error.title', { role }))
+            switchMap(role => this.translateService.get('comcol-role.edit.delete.error.title', { role })),
           ),
-          rd.errorMessage
+          rd.errorMessage,
         );
       }
     });
@@ -155,7 +175,7 @@ export class ComcolRoleComponent implements OnInit {
         } else {
           return undefined;
         }
-      })
+      }),
     );
 
     this.editGroupLink$ = this.group$.pipe(
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..a8ca674c26 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,11 +2,12 @@
   <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">
@@ -14,7 +15,8 @@
           <li *ngFor="let page of pages" class="nav-item">
             <a class="nav-link"
                [ngClass]="{'active' : page === currentPage}"
-               [routerLink]="['./' + page]">
+               [routerLink]="['./' + page]"
+               [attr.data-test]="page">
               {{ type + '.edit.tabs.' + page + '.head' | translate}}
             </a>
           </li>
@@ -25,7 +27,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-forms/edit-comcol-page/edit-comcol-page.component.spec.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
index d3d936c9f7..965b9cae65 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
@@ -1,13 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { Community } from '../../../../core/shared/community.model';
-import { SharedModule } from '../../../shared.module';
-import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SharedModule } from '../../../shared.module';
 import { EditComColPageComponent } from './edit-comcol-page.component';
 
 describe('EditComColPageComponent', () => {
@@ -24,37 +32,37 @@ describe('EditComColPageComponent', () => {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
       metadata: [{
         key: 'dc.title',
-        value: 'test community'
-      }]
+        value: 'test community',
+      }],
     });
 
     routerStub = {
       navigate: (commands) => commands,
       events: observableOf({}),
-      url: 'mockUrl'
+      url: 'mockUrl',
     };
 
     routeStub = {
       data: observableOf({
-        dso: community
+        dso: community,
       }),
       routeConfig: {
         children: [
           {
             path: 'mockUrl',
             data: {
-              hideReturnButton: false
-            }
-          }
-        ]
+              hideReturnButton: false,
+            },
+          },
+        ],
       },
       snapshot: {
         firstChild: {
           routeConfig: {
-            path: 'mockUrl'
-          }
-        }
-      }
+            path: 'mockUrl',
+          },
+        },
+      },
     };
 
   }
@@ -67,7 +75,7 @@ describe('EditComColPageComponent', () => {
         { provide: Router, useValue: routerStub },
         { provide: ActivatedRoute, useValue: routeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
index 48eb9aec96..269330e6a4 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
@@ -1,19 +1,24 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { first, map } from 'rxjs/operators';
+import { map } from 'rxjs/operators';
 
-import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotEmpty } from '../../../empty.util';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { isNotEmpty } from '../../../empty.util';
 
 /**
  * Component representing the edit page for communities and collections
  */
 @Component({
   selector: 'ds-edit-comcol',
-  template: ''
+  template: '',
 })
 export class EditComColPageComponent<TDomain extends DSpaceObject> implements OnInit {
   /**
@@ -43,7 +48,7 @@ export class EditComColPageComponent<TDomain extends DSpaceObject> implements On
 
   public constructor(
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
   ) {
     this.router.events.subscribe(() => this.initPageParamsByRoute());
   }
@@ -53,7 +58,7 @@ export class EditComColPageComponent<TDomain extends DSpaceObject> implements On
     this.pages = this.route.routeConfig.children
       .map((child: any) => child.path)
       .filter((path: string) => isNotEmpty(path)); // ignore reroutes
-    this.dsoRD$ = this.route.data.pipe(first(), map((data) => data.dso));
+    this.dsoRD$ = this.route.data.pipe(map((data) => data.dso));
   }
 
   /**
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..b0d72f4a72 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
@@ -1,13 +1,17 @@
-<h2 class="comcol-browse-label h5">{{'browse.comcol.head' | translate}}</h2>
-<nav class="comcol-browse mb-4" aria-label="Browse Community or Collection">
+<h2 class="comcol-browse-label">{{'browse.comcol.head' | translate}}</h2>
+<nav *ngIf="(allOptions$ | async) as allOptions" 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]="(currentOption$ | async)?.id === option.id"
          class="list-group-item"
+         role="tab"
          [routerLink]="option.routerLink"
          [queryParams]="option.params"
-         routerLinkActive="active">{{ option.label | translate }}</a>
+         [class.active]="(currentOption$ | async)?.id === option.id">
+        {{ option.label | translate }}
+      </a>
     </div>
   </div>
 
@@ -15,10 +19,12 @@
     <select name="browse-type"
             class="form-control"
             aria-label="Browse Community or Collection"
-            (ngModelChange)="onSelectChange($event)" [ngModel]="currentOptionId$ | async">
+            (change)="onSelectChange($event)">
       <option *ngFor="let option of allOptions"
-              [ngValue]="option.id"
-              [attr.selected]="(currentOptionId$ | async) === option.id ? 'selected' : null">{{ option.label | translate }}</option>
+              [value]="option.id"
+              [attr.selected]="(currentOption$ | async)?.id === option.id ? 'selected' : null">
+        {{ option.label | translate }}
+      </option>
     </select>
   </div>
 </nav>
diff --git a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
index 0527d283f0..920ca07f99 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,14 +1,32 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { ActivatedRoute, Params, Router } from '@angular/router';
-import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  EventType,
+  Router,
+  Scroll,
+} from '@angular/router';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { getCollectionPageRoute } from '../../../collection-page/collection-page-routing-paths';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import { getCommunityPageRoute } from '../../../community-page/community-page-routing-paths';
 import { BrowseService } from '../../../core/browse/browse.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { BrowseDefinition } from '../../../core/shared/browse-definition.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
 
 export interface ComColPageNavOption {
   id: string;
@@ -24,64 +42,94 @@ export interface ComColPageNavOption {
 @Component({
   selector: 'ds-comcol-page-browse-by',
   styleUrls: ['./comcol-page-browse-by.component.scss'],
-  templateUrl: './comcol-page-browse-by.component.html'
+  templateUrl: './comcol-page-browse-by.component.html',
 })
-export class ComcolPageBrowseByComponent implements OnInit {
+export class ComcolPageBrowseByComponent implements OnDestroy, OnInit {
   /**
    * The ID of the Community or Collection
    */
   @Input() id: string;
   @Input() contentType: string;
 
-  allOptions: ComColPageNavOption[];
+  allOptions$: Observable<ComColPageNavOption[]>;
 
-  currentOptionId$: Observable<string>;
+  currentOption$: BehaviorSubject<ComColPageNavOption> = new BehaviorSubject(undefined);
+
+  subs: Subscription[] = [];
 
   constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    private browseService: BrowseService
+    public router: Router,
+    private browseService: BrowseService,
   ) {
   }
 
   ngOnInit(): void {
-    this.browseService.getBrowseDefinitions()
-      .pipe(getFirstCompletedRemoteData<PaginatedList<BrowseDefinition>>())
-      .subscribe((browseDefListRD: RemoteData<PaginatedList<BrowseDefinition>>) => {
+    this.allOptions$ = this.browseService.getBrowseDefinitions().pipe(
+      getFirstCompletedRemoteData(),
+      map((browseDefListRD: RemoteData<PaginatedList<BrowseDefinition>>) => {
+        const allOptions: ComColPageNavOption[] = [];
         if (browseDefListRD.hasSucceeded) {
-          this.allOptions = browseDefListRD.payload.page
-            .map((config: BrowseDefinition) => ({
-              id: config.id,
-              label: `browse.comcol.by.${config.id}`,
-              routerLink: `/browse/${config.id}`,
-              params: { scope: this.id }
-            }));
-
+          let comColRoute: string;
           if (this.contentType === 'collection') {
-            this.allOptions = [{
-              id: this.id,
-              label: 'collection.page.browse.recent.head',
-              routerLink: getCollectionPageRoute(this.id)
-            }, ...this.allOptions];
+            comColRoute = getCollectionPageRoute(this.id);
+            allOptions.push({
+              id: 'search',
+              label: 'collection.page.browse.search.head',
+              routerLink: comColRoute,
+            });
           } else if (this.contentType === 'community') {
-            this.allOptions = [{
-              id: this.id,
+            comColRoute = getCommunityPageRoute(this.id);
+            allOptions.push({
+              id: 'search',
+              label: 'collection.page.browse.search.head',
+              routerLink: comColRoute,
+            });
+            allOptions.push({
+              id: 'comcols',
               label: 'community.all-lists.head',
-              routerLink: getCommunityPageRoute(this.id)
-            }, ...this.allOptions];
+              routerLink: `${comColRoute}/subcoms-cols`,
+            });
+          }
+
+          allOptions.push(...browseDefListRD.payload.page.map((config: BrowseDefinition) => ({
+            id: `browse_${config.id}`,
+            label: `browse.comcol.by.${config.id}`,
+            routerLink: `${comColRoute}/browse/${config.id}`,
+          })));
+        }
+        return allOptions;
+      }),
+    );
+
+    this.subs.push(combineLatest([
+      this.allOptions$,
+      this.router.events,
+    ]).subscribe(([navOptions, scrollEvent]: [ComColPageNavOption[], Scroll]) => {
+      if (scrollEvent.type === EventType.Scroll) {
+        for (const option of navOptions) {
+          if (option.routerLink === scrollEvent.routerEvent.urlAfterRedirects.split('?')[0]) {
+            this.currentOption$.next(option);
           }
         }
-      });
-
-    this.currentOptionId$ = this.route.params.pipe(
-      map((params: Params) => params.id)
-    );
+      }
+    }));
   }
 
-  onSelectChange(newId: string) {
-    const selectedOption = this.allOptions
-      .find((option: ComColPageNavOption) => option.id === newId);
+  ngOnDestroy(): void {
+    this.subs.forEach((sub: Subscription) => sub.unsubscribe());
+  }
 
-    this.router.navigate([selectedOption.routerLink], { queryParams: selectedOption.params });
+  onSelectChange(event: any): void {
+    this.allOptions$.pipe(
+      take(1),
+    ).subscribe((allOptions: ComColPageNavOption[]) => {
+      for (const option of allOptions) {
+        if (option.id === event.target.value) {
+          this.currentOption$.next(option[0]);
+          void this.router.navigate([option.routerLink], { queryParams: option.params });
+          break;
+        }
+      }
+    });
   }
 }
diff --git a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
index 08a13eddf8..f0ed56db71 100644
--- a/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
+++ b/src/app/shared/comcol/comcol-page-browse-by/themed-comcol-page-browse-by.component.ts
@@ -1,6 +1,10 @@
-import { Component, Input } from '@angular/core';
-import { ComcolPageBrowseByComponent } from './comcol-page-browse-by.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { ThemedComponent } from '../../theme-support/themed.component';
+import { ComcolPageBrowseByComponent } from './comcol-page-browse-by.component';
 
 /**
  * Themed wrapper for ComcolPageBrowseByComponent
diff --git a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
index 841b45dd39..015a82f285 100644
--- a/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
+++ b/src/app/shared/comcol/comcol-page-content/comcol-page-content.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 /**
  * This component renders any content inside of this component.
@@ -9,7 +12,7 @@ import { Component, Input } from '@angular/core';
 @Component({
   selector: 'ds-comcol-page-content',
   styleUrls: ['./comcol-page-content.component.scss'],
-  templateUrl: './comcol-page-content.component.html'
+  templateUrl: './comcol-page-content.component.html',
 })
 export class ComcolPageContentComponent {
 
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..01a71ab142 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()">{{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-handle/comcol-page-handle.component.spec.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts
index a06bf4a1e5..19a2da4514 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.spec.ts
@@ -1,6 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { ComcolPageHandleComponent } from './comcol-page-handle.component';
 
 const handle = 'http://localhost:4000/handle/123456789/2';
@@ -12,7 +17,7 @@ describe('ComcolPageHandleComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ComcolPageHandleComponent]
+      declarations: [ComcolPageHandleComponent],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
index 2ce49ebea2..95d7a29641 100644
--- a/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,4 +1,8 @@
-import { Component, Injectable, Input } from '@angular/core';
+import {
+  Component,
+  Injectable,
+  Input,
+} from '@angular/core';
 
 /**
  * This component builds a URL from the value of "handle"
@@ -7,7 +11,7 @@ import { Component, Injectable, Input } from '@angular/core';
 @Component({
   selector: 'ds-comcol-page-handle',
   styleUrls: ['./comcol-page-handle.component.scss'],
-  templateUrl: './comcol-page-handle.component.html'
+  templateUrl: './comcol-page-handle.component.html',
 })
 
 @Injectable()
diff --git a/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts b/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts
index e7a7caf7be..fbb32649f3 100644
--- a/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts
+++ b/src/app/shared/comcol/comcol-page-handle/themed-comcol-page-handle.component.ts
@@ -1,4 +1,8 @@
-import {Component, Input} from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
 import { ThemedComponent } from '../../theme-support/themed.component';
 import { ComcolPageHandleComponent } from './comcol-page-handle.component';
 
@@ -14,10 +18,10 @@ import { ComcolPageHandleComponent } from './comcol-page-handle.component';
 
 export class ThemedComcolPageHandleComponent extends ThemedComponent<ComcolPageHandleComponent> {
 
-// Optional title
+  // Optional title
   @Input() title: string;
 
-// The value of "handle"
+  // The value of "handle"
   @Input() content: string;
 
   inAndOutputNames: (keyof ComcolPageHandleComponent & keyof this)[] = ['title', 'content'];
diff --git a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
index cbf984a349..7188141598 100644
--- a/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
+++ b/src/app/shared/comcol/comcol-page-header/comcol-page-header.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-comcol-page-header',
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/comcol/comcol-page-logo/comcol-page-logo.component.ts b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
index a9761bfd5f..b871c45ee3 100644
--- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
+++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Bitstream } from '../../../core/shared/bitstream.model';
 
diff --git a/src/app/shared/comcol/comcol.module.ts b/src/app/shared/comcol/comcol.module.ts
index 094387929a..36bfb5b43f 100644
--- a/src/app/shared/comcol/comcol.module.ts
+++ b/src/app/shared/comcol/comcol.module.ts
@@ -1,20 +1,25 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
-import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component';
-import { ThemedComcolPageHandleComponent} from './comcol-page-handle/themed-comcol-page-handle.component';
+import { NgModule } from '@angular/core';
 
-import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
-import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
+import { BrowseByModule } from '../../browse-by/browse-by.module';
+import { FormModule } from '../form/form.module';
+import { SearchModule } from '../search/search.module';
+import { SharedModule } from '../shared.module';
+import { UploadModule } from '../upload/upload.module';
 import { ComColFormComponent } from './comcol-forms/comcol-form/comcol-form.component';
 import { CreateComColPageComponent } from './comcol-forms/create-comcol-page/create-comcol-page.component';
-import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { DeleteComColPageComponent } from './comcol-forms/delete-comcol-page/delete-comcol-page.component';
+import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
+import { EditComColPageComponent } from './comcol-forms/edit-comcol-page/edit-comcol-page.component';
 import { ComcolPageBrowseByComponent } from './comcol-page-browse-by/comcol-page-browse-by.component';
 import { ThemedComcolPageBrowseByComponent } from './comcol-page-browse-by/themed-comcol-page-browse-by.component';
-import { ComcolRoleComponent } from './comcol-forms/edit-comcol-page/comcol-role/comcol-role.component';
-import { SharedModule } from '../shared.module';
-import { FormModule } from '../form/form.module';
+import { ComcolPageContentComponent } from './comcol-page-content/comcol-page-content.component';
+import { ComcolPageHandleComponent } from './comcol-page-handle/comcol-page-handle.component';
+import { ThemedComcolPageHandleComponent } from './comcol-page-handle/themed-comcol-page-handle.component';
+import { ComcolPageHeaderComponent } from './comcol-page-header/comcol-page-header.component';
+import { ComcolPageLogoComponent } from './comcol-page-logo/comcol-page-logo.component';
+import { ComcolBrowseByComponent } from './sections/comcol-browse-by/comcol-browse-by.component';
+import { ComcolSearchSectionComponent } from './sections/comcol-search-section/comcol-search-section.component';
 
 const COMPONENTS = [
   ComcolPageContentComponent,
@@ -28,22 +33,26 @@ const COMPONENTS = [
   ComcolPageBrowseByComponent,
   ThemedComcolPageBrowseByComponent,
   ComcolRoleComponent,
-
-  ThemedComcolPageHandleComponent
-
+  ThemedComcolPageHandleComponent,
+  ComcolBrowseByComponent,
+  ComcolSearchSectionComponent,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
     FormModule,
-    SharedModule
+    SharedModule,
+    UploadModule,
+    BrowseByModule,
+    SearchModule,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+    UploadModule,
+  ],
 })
 export class ComcolModule { }
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.html b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.html
new file mode 100644
index 0000000000..bfe6840d72
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.html
@@ -0,0 +1,4 @@
+<ds-browse-by-switcher [browseByType]="browseByType$ | async"
+                       [displayTitle]="false"
+                       [scope]="scope$ | async">
+</ds-browse-by-switcher>
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.scss b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
new file mode 100644
index 0000000000..e5b8c2dbbb
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.spec.ts
@@ -0,0 +1,73 @@
+// eslint-disable-next-line max-classes-per-file
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { ActivatedRoute } from '@angular/router';
+
+import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../browse-by/browse-by-switcher/browse-by-decorator';
+import { BrowseBySwitcherComponent } from '../../../../browse-by/browse-by-switcher/browse-by-switcher.component';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { ComcolBrowseByComponent } from './comcol-browse-by.component';
+
+@rendersBrowseBy('ComcolBrowseByComponent' as BrowseByDataType)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="ComcolBrowseByComponent"></span>',
+})
+class BrowseByTestComponent {
+}
+
+class TestBrowseByPageBrowseDefinition extends BrowseDefinition {
+  getRenderType(): BrowseByDataType {
+    return 'ComcolBrowseByComponent' as BrowseByDataType;
+  }
+}
+
+describe('ComcolBrowseByComponent', () => {
+  let component: ComcolBrowseByComponent;
+  let fixture: ComponentFixture<ComcolBrowseByComponent>;
+
+  let activatedRoute: ActivatedRouteStub;
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    activatedRoute = new ActivatedRouteStub();
+    themeService = getMockThemeService();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        ComcolBrowseByComponent,
+        BrowseBySwitcherComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        BrowseByTestComponent,
+        { provide: ActivatedRoute, useValue: activatedRoute },
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ComcolBrowseByComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should create the correct browse section based on the route browseDefinition', () => {
+    activatedRoute.testData = {
+      browseDefinition: new TestBrowseByPageBrowseDefinition(),
+    };
+
+    fixture.detectChanges();
+
+    expect(component).toBeTruthy();
+    expect(fixture.debugElement.query(By.css('#ComcolBrowseByComponent'))).not.toBeNull();
+  });
+});
diff --git a/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
new file mode 100644
index 0000000000..0712632318
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-browse-by/comcol-browse-by.component.ts
@@ -0,0 +1,43 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { BrowseByDataType } from '../../../../browse-by/browse-by-switcher/browse-by-data-type';
+import { BrowseDefinition } from '../../../../core/shared/browse-definition.model';
+
+@Component({
+  selector: 'ds-comcol-browse-by',
+  templateUrl: './comcol-browse-by.component.html',
+  styleUrls: ['./comcol-browse-by.component.scss'],
+})
+export class ComcolBrowseByComponent implements OnInit {
+
+  browseByType$: Observable<BrowseByDataType>;
+
+  scope$: Observable<string>;
+
+  constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  /**
+   * Fetch the correct browse-by component by using the relevant config from the route data
+   */
+  ngOnInit(): void {
+    this.browseByType$ = this.route.data.pipe(
+      map((data: { browseDefinition: BrowseDefinition }) => data.browseDefinition.getRenderType()),
+    );
+    this.scope$ = this.route.data.pipe(
+      map((data: Data) => data.scope),
+    );
+  }
+
+}
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html
new file mode 100644
index 0000000000..7c97dabf43
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.html
@@ -0,0 +1,7 @@
+<ds-themed-search
+  [configuration]="(comcol$ | async)?.type"
+  [showSidebar]="showSidebar$ | async"
+  [showScopeSelector]="false"
+  [hideScopeInUrl]="true"
+  [scope]="(comcol$ | async)?.id">
+</ds-themed-search>
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.scss b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts
new file mode 100644
index 0000000000..9a64cbc59d
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment.test';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ComcolSearchSectionComponent } from './comcol-search-section.component';
+
+describe('ComcolSearchSectionComponent', () => {
+  let component: ComcolSearchSectionComponent;
+  let fixture: ComponentFixture<ComcolSearchSectionComponent>;
+
+  let route: ActivatedRouteStub;
+
+  beforeEach(async () => {
+    route = new ActivatedRouteStub();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        ComcolSearchSectionComponent,
+      ],
+      providers: [
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: ActivatedRoute, useValue: route },
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ComcolSearchSectionComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts
new file mode 100644
index 0000000000..7e68610045
--- /dev/null
+++ b/src/app/shared/comcol/sections/comcol-search-section/comcol-search-section.component.ts
@@ -0,0 +1,59 @@
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { Community } from '../../../../core/shared/community.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../../empty.util';
+
+/**
+ * The search tab on community & collection pages
+ */
+@Component({
+  selector: 'ds-comcol-search-section',
+  templateUrl: './comcol-search-section.component.html',
+  styleUrls: ['./comcol-search-section.component.scss'],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class ComcolSearchSectionComponent implements OnInit {
+
+  comcol$: Observable<Community | Collection>;
+
+  showSidebar$: Observable<boolean>;
+
+  constructor(
+    @Inject(APP_CONFIG) public appConfig: AppConfig,
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.comcol$ = this.route.data.pipe(
+      map((data: Data) => (data.dso as RemoteData<Community | Collection>).payload),
+    );
+    this.showSidebar$ = this.comcol$.pipe(
+      map((comcol: Community | Collection) => hasValue(comcol) && this.appConfig[comcol.type as any].searchSection.showSidebar),
+    );
+  }
+
+}
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.html b/src/app/shared/confirmation-modal/confirmation-modal.component.html
index 82c70b662b..ff82f5bc83 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.html
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.html
@@ -1,18 +1,18 @@
 <div>
-  <div class="modal-header">{{ headerLabel | translate:{dsoName: dso?.name} }}
+  <div class="modal-header">{{ headerLabel | translate:{ dsoName: name } }}
     <button type="button" class="close" (click)="close()" aria-label="Close">
       <span aria-hidden="true">×</span>
     </button>
   </div>
   <div class="modal-body">
-    <p>{{ infoLabel | translate:{dsoName: dso?.name} }}</p>
+    <p>{{ infoLabel | translate:{ dsoName: name } }}</p>
   </div>
   <div class="modal-footer">
     <button type="button" class="cancel btn btn-outline-secondary" (click)="cancelPressed()" aria-label="Cancel">
-      <i class="fas fa-times"></i> {{ cancelLabel | translate:{dsoName: dso?.name} }}
+      <i class="fas fa-times"></i> {{ cancelLabel | translate:{ dsoName: name } }}
     </button>
     <button type="button" class="confirm btn btn-{{brandColor}}" (click)="confirmPressed()" aria-label="Confirm" ngbAutofocus>
-      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{dsoName: dso?.name} }}
+      <i *ngIf="confirmIcon" class="{{confirmIcon}}"></i> {{ confirmLabel | translate:{ dsoName: name } }}
     </button>
   </div>
 </div>
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
index d899dd8ef8..a9b70632a5 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.spec.ts
@@ -1,8 +1,18 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+
 import { ConfirmationModalComponent } from './confirmation-modal.component';
 
 describe('ConfirmationModalComponent', () => {
@@ -17,9 +27,9 @@ describe('ConfirmationModalComponent', () => {
       imports: [TranslateModule.forRoot()],
       declarations: [ConfirmationModalComponent],
       providers: [
-        { provide: NgbActiveModal, useValue: modalStub }
+        { provide: NgbActiveModal, useValue: modalStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -75,7 +85,7 @@ describe('ConfirmationModalComponent', () => {
       spyOn(component, 'close');
       debugElement.query(By.css('button.close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -91,7 +101,7 @@ describe('ConfirmationModalComponent', () => {
       spyOn(component.response, 'emit');
       debugElement.query(By.css('button.cancel')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -110,7 +120,7 @@ describe('ConfirmationModalComponent', () => {
       spyOn(component.response, 'emit');
       debugElement.query(By.css('button.confirm')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
diff --git a/src/app/shared/confirmation-modal/confirmation-modal.component.ts b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
index 4fa4858600..53db9ce402 100644
--- a/src/app/shared/confirmation-modal/confirmation-modal.component.ts
+++ b/src/app/shared/confirmation-modal/confirmation-modal.component.ts
@@ -1,6 +1,10 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
 
 @Component({
   selector: 'ds-confirmation-modal',
@@ -17,15 +21,17 @@ export class ConfirmationModalComponent {
    */
   @Input() brandColor = 'primary';
 
-  @Input() dso: DSpaceObject;
+  @Input() name: string;
 
   /**
    * An event fired when the cancel or confirm button is clicked, with respectively false or true
    */
   @Output()
-  response = new EventEmitter<boolean>();
+    response = new EventEmitter<boolean>();
 
-  constructor(protected activeModal: NgbActiveModal) {
+  constructor(
+    protected activeModal: NgbActiveModal,
+  ) {
   }
 
   /**
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.html b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
new file mode 100644
index 0000000000..083b8163ff
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.html
@@ -0,0 +1,25 @@
+<ng-template #help>
+    <div class="preserve-line-breaks ds-context-help-content">
+        <ng-container *ngFor="let elem of (parsedContent$ | async)">
+            <ng-container *ngIf="elem.href">
+                <a href="{{elem.href}}" target="_blank" rel="noopener noreferrer">{{elem.text}}</a>
+            </ng-container>
+            <ng-container *ngIf="elem.href === undefined">
+                {{ elem }}
+            </ng-container>
+        </ng-container>
+    </div>
+</ng-template>
+<i *ngIf="shouldShowIcon$ | async"
+   [ngClass]="{'ds-context-help-icon fas fa-question-circle shadow-sm': true,
+              'ds-context-help-icon-right': iconPlacement !== 'left',
+              'ds-context-help-icon-left': iconPlacement === 'left'}"
+   [ngbTooltip]="help"
+   [placement]="tooltipPlacement"
+   autoClose="outside"
+   triggers="manual"
+   container="body"
+   #tooltip="ngbTooltip"
+   (click)="onClick()">
+</i>
+<ng-container *ngTemplateOutlet="templateRef"></ng-container>
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
new file mode 100644
index 0000000000..71be81ec97
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.scss
@@ -0,0 +1,31 @@
+:host {
+    position: relative;
+}
+
+.ds-context-help-icon {
+    position: absolute;
+    top: 0;
+    cursor: pointer;
+    color: var(--bs-info);
+    background-color: var(--bs-white);
+    font-size: 16px; // not relative, because we don't want the icon to resize based on the container
+    line-height: 1;
+    border-radius: 50%;
+}
+
+.ds-context-help-icon-left {
+    left: var(--ds-context-x-offset);
+}
+
+.ds-context-help-icon-right {
+    right: calc(-1 * var(--ds-context-help-icon-size));
+}
+
+::ng-deep .tooltip-inner {
+    width: var(--ds-context-help-tooltip-width);
+    max-width: var(--ds-context-help-tooltip-width);
+    a {
+      color: var(--ds-context-help-tooltip-link-color);
+      text-decoration: underline;
+    }
+}
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
new file mode 100644
index 0000000000..7e481ed574
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.spec.ts
@@ -0,0 +1,231 @@
+import {
+  Component,
+  DebugElement,
+  Input,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { ContextHelp } from '../context-help.model';
+import { ContextHelpService } from '../context-help.service';
+import { ContextHelpWrapperComponent } from './context-help-wrapper.component';
+import { PlacementDir } from './placement-dir.model';
+
+@Component({
+  template: `
+    <ng-template #div>template</ng-template>
+    <ds-context-help-wrapper
+      #chwrapper
+      [templateRef]="div"
+      [content]="content"
+      [id]="id"
+      [tooltipPlacement]="tooltipPlacement"
+      [iconPlacement]="iconPlacement"
+      [dontParseLinks]="dontParseLinks"
+    >
+    </ds-context-help-wrapper>
+  `,
+})
+class TemplateComponent {
+  @Input() content: string;
+  @Input() id: string;
+  @Input() tooltipPlacement?: PlacementArray;
+  @Input() iconPlacement?: PlacementDir;
+  @Input() dontParseLinks?: boolean;
+}
+
+const messages = {
+  lorem: 'lorem ipsum dolor sit amet',
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org/) is a link, and [so is this](https://google.com/)',
+};
+const exampleContextHelp: ContextHelp = {
+  id: 'test-tooltip',
+  isTooltipVisible: false,
+};
+
+describe('ContextHelpWrapperComponent', () => {
+  let templateComponent: TemplateComponent;
+  let wrapperComponent: ContextHelpWrapperComponent;
+  let fixture: ComponentFixture<TemplateComponent>;
+  let el: DebugElement;
+  let translateService: any;
+  let contextHelpService: any;
+  let getContextHelp$: BehaviorSubject<ContextHelp>;
+  let shouldShowIcons$: BehaviorSubject<boolean>;
+
+  function makeWrappedElement(): HTMLElement {
+    const wrapped: HTMLElement = document.createElement('div');
+    wrapped.innerHTML = 'example element';
+    return wrapped;
+  }
+
+  beforeEach(waitForAsync( () => {
+    translateService = jasmine.createSpyObj('translateService', ['get']);
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'shouldShowIcons$',
+      'getContextHelp$',
+      'add',
+      'remove',
+      'toggleIcons',
+      'toggleTooltip',
+      'showTooltip',
+      'hideTooltip',
+    ]);
+
+    TestBed.configureTestingModule({
+      imports: [ NgbTooltipModule ],
+      providers: [
+        { provide: TranslateService, useValue: translateService },
+        { provide: ContextHelpService, useValue: contextHelpService },
+      ],
+      declarations: [ TemplateComponent, ContextHelpWrapperComponent ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    // Initializing services.
+    getContextHelp$ = new BehaviorSubject<ContextHelp>(exampleContextHelp);
+    shouldShowIcons$ = new BehaviorSubject<boolean>(false);
+    contextHelpService.getContextHelp$.and.returnValue(getContextHelp$);
+    contextHelpService.shouldShowIcons$.and.returnValue(shouldShowIcons$);
+    translateService.get.and.callFake((content) => observableOf(messages[content]));
+
+    getContextHelp$.next(exampleContextHelp);
+    shouldShowIcons$.next(false);
+
+    // Initializing components.
+    fixture = TestBed.createComponent(TemplateComponent);
+    el = fixture.debugElement;
+    templateComponent = fixture.componentInstance;
+    templateComponent.content = 'lorem';
+    templateComponent.id = 'test-tooltip';
+    templateComponent.tooltipPlacement = ['bottom'];
+    templateComponent.iconPlacement = 'left';
+    wrapperComponent = el.query(By.css('ds-context-help-wrapper')).componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(templateComponent).toBeDefined();
+    expect(wrapperComponent).toBeDefined();
+  });
+
+  it('should not show the context help icon while icon visibility is not turned on', (done) => {
+    fixture.whenStable().then(() => {
+      const wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
+      expect(wrapper.children.length).toBe(0);
+      done();
+    });
+  });
+
+  describe('when icon visibility is turned on', () => {
+    beforeEach(() => {
+      shouldShowIcons$.next(true);
+      fixture.detectChanges();
+      spyOn(wrapperComponent.tooltip, 'open').and.callThrough();
+      spyOn(wrapperComponent.tooltip, 'close').and.callThrough();
+    });
+
+    it('should show the context help button', (done) => {
+      fixture.whenStable().then(() => {
+        const wrapper = el.query(By.css('ds-context-help-wrapper')).nativeElement;
+        expect(wrapper.children.length).toBe(1);
+        const [i] = wrapper.children;
+        expect(i.tagName).toBe('I');
+        done();
+      });
+    });
+
+    describe('after the icon is clicked', () => {
+      let i;
+      beforeEach(() => {
+        i = el.query(By.css('.ds-context-help-icon')).nativeElement;
+        i.click();
+        fixture.detectChanges();
+      });
+
+      it('should display the tooltip', () => {
+        expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
+        getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: true });
+        fixture.detectChanges();
+        expect(wrapperComponent.tooltip.open).toHaveBeenCalled();
+        expect(wrapperComponent.tooltip.close).toHaveBeenCalledTimes(0);
+        expect(fixture.debugElement.query(By.css('.ds-context-help-content')).nativeElement.textContent)
+          .toMatch(/\s*lorem ipsum dolor sit amet\s*/);
+      });
+
+      it('should correctly display links', () => {
+        templateComponent.content = 'linkTest';
+        getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: true });
+        fixture.detectChanges();
+        const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
+          .nativeElement
+          .childNodes;
+        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType !== Node.COMMENT_NODE);
+        expect(relevantNodes.length).toBe(4);
+
+        const [text1, link1, text2, link2] = relevantNodes;
+
+        expect(text1.nodeType).toBe(Node.TEXT_NODE);
+        expect(text1.nodeValue).toMatch(/\s* This is text, \s*/);
+
+        expect(link1.nodeName).toBe('A');
+        expect((link1 as any).href).toBe('https://dspace.lyrasis.org/');
+        expect(link1.textContent).toBe('this');
+
+        expect(text2.nodeType).toBe(Node.TEXT_NODE);
+        expect(text2.nodeValue).toMatch(/\s* is a link, and \s*/);
+
+        expect(link2.nodeName).toBe('A');
+        expect((link2 as any).href).toBe('https://google.com/');
+        expect(link2.textContent).toBe('so is this');
+      });
+
+      it('should not display links if specified not to', () => {
+        templateComponent.dontParseLinks = true;
+        templateComponent.content = 'linkTest';
+        getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: true });
+        fixture.detectChanges();
+
+
+        const nodeList: NodeList = fixture.debugElement.query(By.css('.ds-context-help-content'))
+          .nativeElement
+          .childNodes;
+        const relevantNodes = Array.from(nodeList).filter(node => node.nodeType !== Node.COMMENT_NODE);
+        expect(relevantNodes.length).toBe(1);
+
+        const [text] = relevantNodes;
+
+        expect(text.nodeType).toBe(Node.TEXT_NODE);
+        expect(text.nodeValue).toMatch(
+          /\s* This is text, \[this\]\(https:\/\/dspace.lyrasis.org\/\) is a link, and \[so is this\]\(https:\/\/google.com\/\) \s*/);
+      });
+
+      describe('after the icon is clicked again', () => {
+        beforeEach(() => {
+          i.click();
+          fixture.detectChanges();
+          spyOn(wrapperComponent.tooltip, 'isOpen').and.returnValue(true);
+        });
+
+        it('should close the tooltip', () => {
+          expect(contextHelpService.toggleTooltip).toHaveBeenCalledWith('test-tooltip');
+          getContextHelp$.next({ ...exampleContextHelp, isTooltipVisible: false });
+          fixture.detectChanges();
+          expect(wrapperComponent.tooltip.close).toHaveBeenCalled();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
new file mode 100644
index 0000000000..a8f6925b45
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/context-help-wrapper.component.ts
@@ -0,0 +1,181 @@
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+  TemplateRef,
+  ViewChild,
+} from '@angular/core';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  mergeMap,
+} from 'rxjs/operators';
+
+import { ContextHelp } from '../context-help.model';
+import { ContextHelpService } from '../context-help.service';
+import { hasValueOperator } from '../empty.util';
+import { PlacementDir } from './placement-dir.model';
+
+type ParsedContent = (string | {href: string, text: string})[];
+
+/**
+ * This component renders an info icon next to the wrapped element which
+ * produces a tooltip when clicked.
+ */
+@Component({
+  selector: 'ds-context-help-wrapper',
+  templateUrl: './context-help-wrapper.component.html',
+  styleUrls: ['./context-help-wrapper.component.scss'],
+})
+export class ContextHelpWrapperComponent implements OnInit, OnDestroy {
+  /**
+   * Template reference for the wrapped element.
+   */
+  @Input() templateRef: TemplateRef<any>;
+
+  /**
+   * Identifier for the context help tooltip.
+   */
+  @Input() id: string;
+
+  /**
+   * Indicate where the tooltip should show up, relative to the info icon.
+   */
+  @Input() tooltipPlacement?: PlacementArray = [];
+
+  /**
+   * Indicate whether the info icon should appear to the left or to
+   * the right of the wrapped element.
+   */
+  @Input() iconPlacement?: PlacementDir = 'left';
+
+  /**
+   * If true, don't process text to render links.
+   */
+  @Input() set dontParseLinks(dont: boolean) {
+    this.dontParseLinks$.next(dont);
+  }
+  private dontParseLinks$: BehaviorSubject<boolean> = new BehaviorSubject(false);
+
+  shouldShowIcon$: Observable<boolean>;
+
+  tooltip: NgbTooltip;
+
+  @Input() set content(translateKey: string) {
+    this.content$.next(translateKey);
+  }
+  private content$: BehaviorSubject<string | undefined> = new BehaviorSubject(undefined);
+
+  parsedContent$: Observable<ParsedContent>;
+
+  private subs: Subscription[] = [];
+
+  constructor(
+    private translateService: TranslateService,
+    private contextHelpService: ContextHelpService,
+  ) { }
+
+  ngOnInit() {
+    this.parsedContent$ = combineLatest([
+      this.content$.pipe(distinctUntilChanged(), mergeMap(translateKey => this.translateService.get(translateKey))),
+      this.dontParseLinks$.pipe(distinctUntilChanged()),
+    ]).pipe(
+      map(([text, dontParseLinks]) =>
+        dontParseLinks ? [text] : this.parseLinks(text)),
+    );
+    this.shouldShowIcon$ = this.contextHelpService.shouldShowIcons$();
+  }
+
+  @ViewChild('tooltip', { static: false }) set setTooltip(tooltip: NgbTooltip) {
+    this.tooltip = tooltip;
+    this.clearSubs();
+    if (this.tooltip !== undefined) {
+      this.subs = [
+        this.contextHelpService.getContextHelp$(this.id)
+          .pipe(hasValueOperator())
+          .subscribe((ch: ContextHelp) => {
+
+            if (ch.isTooltipVisible && !this.tooltip.isOpen()) {
+              this.tooltip.open();
+            } else if (!ch.isTooltipVisible && this.tooltip.isOpen()) {
+              this.tooltip.close();
+            }
+          }),
+
+        this.tooltip.shown.subscribe(() => {
+          this.contextHelpService.showTooltip(this.id);
+        }),
+
+        this.tooltip.hidden.subscribe(() => {
+          this.contextHelpService.hideTooltip(this.id);
+        }),
+      ];
+    }
+  }
+
+  ngOnDestroy() {
+    this.clearSubs();
+  }
+
+  onClick() {
+    this.contextHelpService.toggleTooltip(this.id);
+  }
+
+  /**
+   * Parses Markdown-style links, splitting up a given text
+   * into link-free pieces of text and objects of the form
+   * {href: string, text: string} (which represent links).
+   * This function makes no effort to check whether the href is a
+   * correct URL. Currently, this function does not support escape
+   * characters: its behavior when given a string containing square
+   * brackets that do not deliminate a link is undefined.
+   * Regular parentheses outside of links do work, however.
+   *
+   * For example:
+   * parseLinks("This is text, [this](https://google.com) is a link, and [so is this](https://youtube.com)")
+   * =
+   * [ "This is text, ",
+   *   {href: "https://google.com", text: "this"},
+   *   " is a link, and ",
+   *   {href: "https://youtube.com", text: "so is this"}
+   * ]
+   */
+  private parseLinks(text: string): ParsedContent {
+    // Implementation note: due to `matchAll` method on strings not being available for all versions,
+    // separate "split" and "parse" steps are needed.
+
+    // We use splitRegexp (the outer `match` call) to split the text
+    // into link-free pieces of text (matched by /[^\[]+/) and pieces
+    // of text of the form "[some link text](some.link.here)" (matched
+    // by /\[([^\]]*)\]\(([^\)]*)\)/)
+    const splitRegexp = /[^\[]+|\[([^\]]*)\]\(([^\)]*)\)/g;
+
+    // Once the array is split up in link-representing strings and
+    // non-link-representing strings, we use parseRegexp (the inner
+    // `match` call) to transform the link-representing strings into
+    // {href: string, text: string} objects.
+    const parseRegexp = /^\[([^\]]*)\]\(([^\)]*)\)$/;
+
+    return text.match(splitRegexp).map((substring: string) => {
+      const match = substring.match(parseRegexp);
+      return match === null
+        ? substring
+        : ({ href: match[2], text: match[1] });
+    });
+  }
+
+  private clearSubs() {
+    this.subs.forEach(sub => sub.unsubscribe());
+    this.subs = [];
+  }
+}
diff --git a/src/app/shared/context-help-wrapper/placement-dir.model.ts b/src/app/shared/context-help-wrapper/placement-dir.model.ts
new file mode 100644
index 0000000000..a02c3e3ec9
--- /dev/null
+++ b/src/app/shared/context-help-wrapper/placement-dir.model.ts
@@ -0,0 +1 @@
+export type PlacementDir = 'left' | 'right';
diff --git a/src/app/shared/context-help.actions.ts b/src/app/shared/context-help.actions.ts
new file mode 100644
index 0000000000..de4d8afecc
--- /dev/null
+++ b/src/app/shared/context-help.actions.ts
@@ -0,0 +1,84 @@
+/* eslint-disable max-classes-per-file */
+
+import { Action } from '@ngrx/store';
+
+import { ContextHelp } from './context-help.model';
+import { type } from './ngrx/type';
+
+export const ContextHelpActionTypes = {
+  'CONTEXT_HELP_TOGGLE_ICONS': type('dspace/context-help/CONTEXT_HELP_TOGGLE_ICONS'),
+  'CONTEXT_HELP_ADD': type('dspace/context-help/CONTEXT_HELP_ADD'),
+  'CONTEXT_HELP_REMOVE': type('dspace/context-help/CONTEXT_HELP_REMOVE'),
+  'CONTEXT_HELP_TOGGLE_TOOLTIP': type('dspace/context-help/CONTEXT_HELP_TOGGLE_TOOLTIP'),
+  'CONTEXT_HELP_SHOW_TOOLTIP': type('dspace/context-help/CONTEXT_HELP_SHOW_TOOLTIP'),
+  'CONTEXT_HELP_HIDE_TOOLTIP' : type('dspace/context-help/CONTEXT_HELP_HIDE_TOOLTIP'),
+};
+
+/**
+ * Toggles the visibility of all context help icons.
+ */
+export class ContextHelpToggleIconsAction implements Action {
+  type = ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS;
+}
+
+/**
+ * Registers a new context help icon to the store.
+ */
+export class ContextHelpAddAction implements Action {
+  type = ContextHelpActionTypes.CONTEXT_HELP_ADD;
+  model: ContextHelp;
+
+  constructor (model: ContextHelp) {
+    this.model = model;
+  }
+}
+
+/**
+ * Removes a context help icon from the store.
+ */
+export class ContextHelpRemoveAction implements Action {
+  type = ContextHelpActionTypes.CONTEXT_HELP_REMOVE;
+  id: string;
+
+  constructor(id: string) {
+    this.id = id;
+  }
+}
+
+export abstract class ContextHelpTooltipAction implements Action {
+  type;
+  id: string;
+
+  constructor(id: string) {
+    this.id = id;
+  }
+}
+
+/**
+ * Toggles the tooltip of a single context help icon.
+ */
+export class ContextHelpToggleTooltipAction extends ContextHelpTooltipAction {
+  type = ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP;
+}
+
+/**
+ * Shows the tooltip of a single context help icon.
+ */
+export class ContextHelpShowTooltipAction extends ContextHelpTooltipAction {
+  type = ContextHelpActionTypes.CONTEXT_HELP_SHOW_TOOLTIP;
+}
+
+/**
+ * Hides the tooltip of a single context help icon.
+ */
+export class ContextHelpHideTooltipAction extends ContextHelpTooltipAction {
+  type = ContextHelpActionTypes.CONTEXT_HELP_HIDE_TOOLTIP;
+}
+
+export type ContextHelpAction
+  = ContextHelpToggleIconsAction
+  | ContextHelpAddAction
+  | ContextHelpRemoveAction
+  | ContextHelpToggleTooltipAction
+  | ContextHelpShowTooltipAction
+  | ContextHelpHideTooltipAction;
diff --git a/src/app/shared/context-help.directive.spec.ts b/src/app/shared/context-help.directive.spec.ts
new file mode 100644
index 0000000000..a0ed860522
--- /dev/null
+++ b/src/app/shared/context-help.directive.spec.ts
@@ -0,0 +1,107 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NgbTooltipModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  ContextHelpDirective,
+  ContextHelpDirectiveInput,
+} from './context-help.directive';
+import { ContextHelp } from './context-help.model';
+import { ContextHelpService } from './context-help.service';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
+
+@Component({
+  template: `<div *dsContextHelp="contextHelpParams()">some text</div>`,
+})
+class TestComponent {
+  @Input() content = '';
+  @Input() id = '';
+  contextHelpParams(): ContextHelpDirectiveInput {
+    return {
+      content: this.content,
+      id: this.id,
+      iconPlacement: 'left',
+      tooltipPlacement: ['bottom'],
+    };
+  }
+}
+
+const messages = {
+  lorem: 'lorem ipsum dolor sit amet',
+  linkTest: 'This is text, [this](https://dspace.lyrasis.org) is a link, and [so is this](https://google.com)',
+};
+const exampleContextHelp: ContextHelp = {
+  id: 'test-tooltip',
+  isTooltipVisible: false,
+};
+describe('ContextHelpDirective', () => {
+  let component: TestComponent;
+  let fixture: ComponentFixture<TestComponent>;
+  let translateService: any;
+  let contextHelpService: any;
+  let getContextHelp$: BehaviorSubject<ContextHelp>;
+  let shouldShowIcons$: BehaviorSubject<boolean>;
+
+  beforeEach(waitForAsync(() => {
+    translateService = jasmine.createSpyObj('translateService', ['get']);
+    contextHelpService = jasmine.createSpyObj('contextHelpService', [
+      'shouldShowIcons$',
+      'getContextHelp$',
+      'add',
+      'remove',
+      'toggleIcons',
+      'toggleTooltip',
+      'showTooltip',
+      'hideTooltip',
+    ]);
+
+    TestBed.configureTestingModule({
+      imports: [NgbTooltipModule],
+      providers: [
+        { provide: TranslateService, useValue: translateService },
+        { provide: ContextHelpService, useValue: contextHelpService },
+      ],
+      declarations: [TestComponent, ContextHelpWrapperComponent, ContextHelpDirective],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    // Set up service behavior.
+    getContextHelp$ = new BehaviorSubject<ContextHelp>(exampleContextHelp);
+    shouldShowIcons$ = new BehaviorSubject<boolean>(false);
+    contextHelpService.getContextHelp$.and.returnValue(getContextHelp$);
+    contextHelpService.shouldShowIcons$.and.returnValue(shouldShowIcons$);
+    translateService.get.and.callFake((content) => observableOf(messages[content]));
+
+    // Set up fixture and component.
+    fixture = TestBed.createComponent(TestComponent);
+    component = fixture.componentInstance;
+    component.id = 'test-tooltip';
+    component.content = 'lorem';
+
+    fixture.detectChanges();
+  });
+
+  it('should generate the context help wrapper component', (done) => {
+    fixture.whenStable().then(() => {
+      expect(fixture.nativeElement.children.length).toBe(1);
+      const [wrapper] = fixture.nativeElement.children;
+      expect(component).toBeDefined();
+      expect(wrapper.tagName).toBe('DS-CONTEXT-HELP-WRAPPER');
+      expect(contextHelpService.add).toHaveBeenCalledWith(exampleContextHelp);
+      done();
+    });
+  });
+});
diff --git a/src/app/shared/context-help.directive.ts b/src/app/shared/context-help.directive.ts
new file mode 100644
index 0000000000..b5a5739348
--- /dev/null
+++ b/src/app/shared/context-help.directive.ts
@@ -0,0 +1,78 @@
+import {
+  ComponentRef,
+  Directive,
+  Input,
+  OnChanges,
+  OnDestroy,
+  TemplateRef,
+  ViewContainerRef,
+} from '@angular/core';
+import { PlacementArray } from '@ng-bootstrap/ng-bootstrap/util/positioning';
+
+import { ContextHelpService } from './context-help.service';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
+import { PlacementDir } from './context-help-wrapper/placement-dir.model';
+import { hasValue } from './empty.util';
+
+export interface ContextHelpDirectiveInput {
+  content: string;
+  id: string;
+  tooltipPlacement?: PlacementArray;
+  iconPlacement?: PlacementDir;
+}
+
+/**
+ * Directive to add a clickable tooltip icon to an element.
+ * The tooltip icon's position is configurable ('left' or 'right')
+ * and so is the position of the tooltip itself (PlacementArray).
+ */
+@Directive({
+  selector: '[dsContextHelp]',
+})
+export class ContextHelpDirective implements OnChanges, OnDestroy {
+  /**
+   * Expects an object with the following fields:
+   * - content: a string referring to an entry in the i18n files
+   * - tooltipPlacement: a PlacementArray describing where the tooltip should expand, relative to the tooltip icon
+   * - iconPlacement: a string 'left' or 'right', describing where the tooltip icon should be placed, relative to the element
+   */
+  @Input() dsContextHelp: ContextHelpDirectiveInput;
+  mostRecentId: string | undefined = undefined;
+
+  protected wrapper: ComponentRef<ContextHelpWrapperComponent>;
+
+  constructor(
+    private templateRef: TemplateRef<any>,
+    private viewContainerRef: ViewContainerRef,
+    private contextHelpService: ContextHelpService,
+  ) {}
+
+  ngOnChanges() {
+    this.clearMostRecentId();
+    this.mostRecentId = this.dsContextHelp.id;
+    this.contextHelpService.add({ id: this.dsContextHelp.id, isTooltipVisible: false });
+
+    if (this.wrapper === undefined) {
+      this.wrapper = this.viewContainerRef.createComponent(ContextHelpWrapperComponent);
+    }
+    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 {
+    if (this.mostRecentId !== undefined) {
+      this.contextHelpService.remove(this.mostRecentId);
+    }
+  }
+}
diff --git a/src/app/shared/context-help.model.ts b/src/app/shared/context-help.model.ts
new file mode 100644
index 0000000000..ea6fd036cf
--- /dev/null
+++ b/src/app/shared/context-help.model.ts
@@ -0,0 +1,4 @@
+export class ContextHelp {
+  id: string;
+  isTooltipVisible = false;
+}
diff --git a/src/app/shared/context-help.reducer.ts b/src/app/shared/context-help.reducer.ts
new file mode 100644
index 0000000000..ef0686d2a6
--- /dev/null
+++ b/src/app/shared/context-help.reducer.ts
@@ -0,0 +1,51 @@
+import {
+  ContextHelpAction,
+  ContextHelpActionTypes,
+} from './context-help.actions';
+import { ContextHelp } from './context-help.model';
+
+export interface ContextHelpModels {
+  [id: string]: ContextHelp;
+}
+
+export interface ContextHelpState {
+  allIconsVisible: boolean;
+  models: ContextHelpModels;
+}
+
+const initialState: ContextHelpState = { allIconsVisible: false, models: {} };
+
+export function contextHelpReducer(state: ContextHelpState = initialState, action: ContextHelpAction): ContextHelpState {
+  switch (action.type) {
+    case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_ICONS: {
+      return { ...state, allIconsVisible: !state.allIconsVisible };
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_ADD: {
+      const newModels = { ...state.models, [action.model.id]: action.model };
+      return { ...state, models: newModels };
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_REMOVE: {
+      const { [action.id]: _, ...remainingModels } = state.models;
+      return { ...state, models: remainingModels };
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_TOGGLE_TOOLTIP: {
+      return modifyTooltipVisibility(state, action.id, v => !v);
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_SHOW_TOOLTIP: {
+      return modifyTooltipVisibility(state, action.id, _ => true);
+    }
+    case ContextHelpActionTypes.CONTEXT_HELP_HIDE_TOOLTIP: {
+      return modifyTooltipVisibility(state, action.id, _ => false);
+    }
+    default: {
+      return state;
+    }
+  }
+}
+
+function modifyTooltipVisibility(state: ContextHelpState, id: string, modify: (vis: boolean) => boolean): ContextHelpState {
+  const { [id]: matchingModel, ...otherModels } = state.models;
+  const modifiedModel = { ...matchingModel, isTooltipVisible: modify(matchingModel.isTooltipVisible) };
+  const newModels = { ...otherModels, [id]: modifiedModel };
+  return { ...state, models: newModels };
+}
diff --git a/src/app/shared/context-help.service.spec.ts b/src/app/shared/context-help.service.spec.ts
new file mode 100644
index 0000000000..55bd9c9c38
--- /dev/null
+++ b/src/app/shared/context-help.service.spec.ts
@@ -0,0 +1,84 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TestScheduler } from 'rxjs/testing';
+
+import {
+  appReducers,
+  storeModuleConfig,
+} from '../app.reducer';
+import { ContextHelpService } from './context-help.service';
+
+describe('ContextHelpService', () => {
+  let service: ContextHelpService;
+  let store;
+  let testScheduler;
+  const booleans = { f: false, t: true };
+  const mkContextHelp = (id: string) => ({ 0: { id, isTooltipVisible: false }, 1: { id, isTooltipVisible: true } });
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot(appReducers, storeModuleConfig),
+      ],
+    });
+  });
+
+  beforeEach(() => {
+    store = TestBed.inject(Store);
+    service = new ContextHelpService(store);
+    testScheduler = new TestScheduler((actual, expected) => expect(actual).toEqual(expected));
+  });
+
+  it('should be created', () => {
+    expect(service).toBeTruthy();
+  });
+
+  it('toggleIcons calls should be observable in shouldShowIcons$', () => {
+    testScheduler.run(({ cold, expectObservable }) => {
+      const toggles = cold('-xxxxx');
+      toggles.subscribe((_) => service.toggleIcons());
+      expectObservable(service.shouldShowIcons$()).toBe('ftftft', booleans);
+    });
+  });
+
+  it('add and remove calls should be observable in getContextHelp$', () => {
+    testScheduler.run(({ cold, expectObservable }) => {
+      const modifications = cold('-abAcCB', {
+        a: () => service.add({ id: 'a', isTooltipVisible: false }),
+        b: () => service.add({ id: 'b', isTooltipVisible: false }),
+        c: () => service.add({ id: 'c', isTooltipVisible: false }),
+        A: () => service.remove('a'), B: () => service.remove('b'), C: () => service.remove('c'),
+      });
+      modifications.subscribe(mod => mod());
+      const match = (id) => ({ 0: undefined, 1: { id, isTooltipVisible: false } });
+      expectObservable(service.getContextHelp$('a')).toBe('01-0---', match('a'));
+      expectObservable(service.getContextHelp$('b')).toBe('0-1---0', match('b'));
+      expectObservable(service.getContextHelp$('c')).toBe('0---10-', match('c'));
+    });
+  });
+
+  it('toggleTooltip calls should be observable in getContextHelp$', () => {
+    service.add({ id: 'a', isTooltipVisible: false });
+    service.add({ id: 'b', isTooltipVisible: false });
+    testScheduler.run(({ cold, expectObservable }) => {
+      const toggles = cold('-aaababbabba');
+      toggles.subscribe(id => service.toggleTooltip(id));
+      expectObservable(service.getContextHelp$('a')).toBe('0101-0--1--0', mkContextHelp('a'));
+      expectObservable(service.getContextHelp$('b')).toBe('0---1-01-01-', mkContextHelp('b'));
+    });
+  });
+
+  it('hideTooltip and showTooltip calls should be observable in getContextHelp$', () => {
+    service.add({ id: 'a', isTooltipVisible: false });
+    testScheduler.run(({ cold, expectObservable }) => {
+      const hideShowCalls = cold('-shssshhs', {
+        s: () => service.showTooltip('a'), h: () => service.hideTooltip('a'),
+      });
+      hideShowCalls.subscribe(fn => fn());
+      expectObservable(service.getContextHelp$('a')).toBe('010111001', mkContextHelp('a'));
+    });
+  });
+});
diff --git a/src/app/shared/context-help.service.ts b/src/app/shared/context-help.service.ts
new file mode 100644
index 0000000000..c07c5ae8d7
--- /dev/null
+++ b/src/app/shared/context-help.service.ts
@@ -0,0 +1,123 @@
+import { Injectable } from '@angular/core';
+import {
+  createFeatureSelector,
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  ContextHelpAddAction,
+  ContextHelpHideTooltipAction,
+  ContextHelpRemoveAction,
+  ContextHelpShowTooltipAction,
+  ContextHelpToggleIconsAction,
+  ContextHelpToggleTooltipAction,
+} from './context-help.actions';
+import { ContextHelp } from './context-help.model';
+import {
+  ContextHelpModels,
+  ContextHelpState,
+} from './context-help.reducer';
+
+const contextHelpStateSelector =
+  createFeatureSelector<ContextHelpState>('contextHelp');
+const allIconsVisibleSelector = createSelector(
+  contextHelpStateSelector,
+  (state: ContextHelpState): boolean => state.allIconsVisible,
+);
+const contextHelpSelector =
+  (id: string): MemoizedSelector<ContextHelpState, ContextHelp> => createSelector(
+    contextHelpStateSelector,
+    (state: ContextHelpState) => state.models[id],
+  );
+const allContextHelpSelector = createSelector(
+  contextHelpStateSelector,
+  ((state: ContextHelpState) => state.models),
+);
+
+@Injectable({
+  providedIn: 'root',
+})
+export class ContextHelpService {
+  constructor(private store: Store<ContextHelpState>) { }
+
+  /**
+   * Observable keeping track of whether context help icons should be visible globally.
+   */
+  shouldShowIcons$(): Observable<boolean> {
+    return this.store.pipe(select(allIconsVisibleSelector));
+  }
+
+  /**
+   * Observable that tracks the state for a specific context help icon.
+   *
+   * @param id: id of the context help icon.
+   */
+  getContextHelp$(id: string): Observable<ContextHelp> {
+    return this.store.pipe(select(contextHelpSelector(id)));
+  }
+
+  /**
+   * Observable that yields true iff there are currently no context help entries in the store.
+   */
+  tooltipCount$(): Observable<number> {
+    return this.store.pipe(select(allContextHelpSelector))
+      .pipe(map((models: ContextHelpModels) => Object.keys(models).length));
+  }
+
+  /**
+   * Toggles the visibility of all context help icons.
+   */
+  toggleIcons() {
+    this.store.dispatch(new ContextHelpToggleIconsAction());
+  }
+
+  /**
+   * Registers a new context help icon to the store.
+   *
+   * @param contextHelp: the initial state of the new help icon.
+   */
+  add(contextHelp: ContextHelp) {
+    this.store.dispatch(new ContextHelpAddAction(contextHelp));
+  }
+
+  /**
+   * Removes a context help icon from the store.
+   *
+   * @id: the id of the help icon to be removed.
+   */
+  remove(id: string) {
+    this.store.dispatch(new ContextHelpRemoveAction(id));
+  }
+
+  /**
+   * Toggles the tooltip of a single context help icon.
+   *
+   * @id: the id of the help icon for which the visibility will be toggled.
+   */
+  toggleTooltip(id: string) {
+    this.store.dispatch(new ContextHelpToggleTooltipAction(id));
+  }
+
+  /**
+   * Shows the tooltip of a single context help icon.
+   *
+   * @id: the id of the help icon that will be made visible.
+   */
+  showTooltip(id: string) {
+    this.store.dispatch(new ContextHelpShowTooltipAction(id));
+  }
+
+  /**
+   * Hides the tooltip of a single context help icon.
+   *
+   * @id: the id of the help icon that will be made invisible.
+   */
+  hideTooltip(id: string) {
+    this.store.dispatch(new ContextHelpHideTooltipAction(id));
+  }
+}
diff --git a/src/app/shared/cookies/browser-klaro.service.spec.ts b/src/app/shared/cookies/browser-klaro.service.spec.ts
index 9db9caf364..953734d38c 100644
--- a/src/app/shared/cookies/browser-klaro.service.spec.ts
+++ b/src/app/shared/cookies/browser-klaro.service.spec.ts
@@ -1,22 +1,30 @@
 import { TestBed } from '@angular/core/testing';
-import { BrowserKlaroService, COOKIE_MDFIELD } from './browser-klaro.service';
-import { getMockTranslateService } from '../mocks/translate.service.mock';
-import { of as observableOf } from 'rxjs';
-import { RestResponse } from '../../core/cache/response.models';
-import { EPerson } from '../../core/eperson/models/eperson.model';
 import { TranslateService } from '@ngx-translate/core';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { AuthService } from '../../core/auth/auth.service';
-import { CookieService } from '../../core/services/cookie.service';
 import { getTestScheduler } from 'jasmine-marbles';
-import { MetadataValue } from '../../core/shared/metadata.models';
-import { clone, cloneDeep } from 'lodash';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
-import { ANONYMOUS_STORAGE_NAME_KLARO } from './klaro-configuration';
+import clone from 'lodash/clone';
+import cloneDeep from 'lodash/cloneDeep';
+import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
+import { AuthService } from '../../core/auth/auth.service';
+import { RestResponse } from '../../core/cache/response.models';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { CookieService } from '../../core/services/cookie.service';
+import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { MetadataValue } from '../../core/shared/metadata.models';
+import { getMockTranslateService } from '../mocks/translate.service.mock';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import {
+  BrowserKlaroService,
+  COOKIE_MDFIELD,
+} from './browser-klaro.service';
+import { ANONYMOUS_STORAGE_NAME_KLARO } from './klaro-configuration';
+
 describe('BrowserKlaroService', () => {
   const trackingIdProp = 'google.analytics.key';
   const trackingIdTestValue = 'mock-tracking-id';
@@ -47,17 +55,17 @@ describe('BrowserKlaroService', () => {
 
   beforeEach(() => {
     user = Object.assign(new EPerson(), {
-      uuid: 'test-user'
+      uuid: 'test-user',
     });
 
     translateService = getMockTranslateService();
     ePersonService = jasmine.createSpyObj('ePersonService', {
       createPatchFromCache: observableOf([]),
-      patch: observableOf(new RestResponse(true, 200, 'Ok'))
+      patch: observableOf(new RestResponse(true, 200, 'Ok')),
     });
     authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      getAuthenticatedUserFromStore: observableOf(user)
+      getAuthenticatedUserFromStore: observableOf(user),
     });
     configurationDataService = createConfigSuccessSpy(recaptchaValue);
     findByPropertyName = configurationDataService.findByPropertyName;
@@ -65,7 +73,7 @@ describe('BrowserKlaroService', () => {
       get: '{%22token_item%22:true%2C%22impersonation%22:true%2C%22redirect%22:true%2C%22language%22:true%2C%22klaro%22:true%2C%22has_agreed_end_user%22:true%2C%22google-analytics%22:true}',
       set: () => {
         /* empty */
-      }
+      },
     });
 
     TestBed.configureTestingModule({
@@ -73,7 +81,7 @@ describe('BrowserKlaroService', () => {
         BrowserKlaroService,
         {
           provide: TranslateService,
-          useValue: translateService
+          useValue: translateService,
         },
         {
           provide: EPersonDataService,
@@ -81,17 +89,17 @@ describe('BrowserKlaroService', () => {
         },
         {
           provide: AuthService,
-          useValue: authService
+          useValue: authService,
         },
         {
           provide: CookieService,
-          useValue: cookieService
+          useValue: cookieService,
         },
         {
           provide: ConfigurationDataService,
-          useValue: configurationDataService
-        }
-      ]
+          useValue: configurationDataService,
+        },
+      ],
     });
     service = TestBed.inject(BrowserKlaroService);
     appName = 'testName';
@@ -100,19 +108,19 @@ describe('BrowserKlaroService', () => {
 
     mockConfig = {
       translations: {
-        en: {
+        zz: {
           purposes: {},
           test: {
-            testeritis: testKey
-          }
-        }
+            testeritis: testKey,
+          },
+        },
       },
       services: [{
         name: appName,
-        purposes: [purpose]
+        purposes: [purpose],
       }, {
         name: googleAnalytics,
-        purposes: [purpose]
+        purposes: [purpose],
       }],
 
     };
@@ -158,8 +166,8 @@ describe('BrowserKlaroService', () => {
 
   it('addAppMessages', () => {
     service.addAppMessages();
-    expect(mockConfig.translations.en[appName]).toBeDefined();
-    expect(mockConfig.translations.en.purposes[purpose]).toBeDefined();
+    expect(mockConfig.translations.zz[appName]).toBeDefined();
+    expect(mockConfig.translations.zz.purposes[purpose]).toBeDefined();
   });
 
   it('translateConfiguration', () => {
@@ -326,7 +334,7 @@ describe('BrowserKlaroService', () => {
           ...new ConfigurationProperty(),
           name: trackingIdProp,
           values: [googleAnalytics],
-        })
+        }),
       );
       service.initialize();
       expect(service.klaroConfig.services).toContain(jasmine.objectContaining({ name: googleAnalytics }));
@@ -341,8 +349,8 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: googleAnalytics,
               values: [],
-              }
-            )
+            },
+            ),
           )
           .withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
           .and
@@ -351,7 +359,7 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: trackingIdTestValue,
               values: ['false'],
-            })
+            }),
           );
 
       service.initialize();
@@ -361,7 +369,7 @@ describe('BrowserKlaroService', () => {
       configurationDataService.findByPropertyName =
         jasmine.createSpy()
           .withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue(
-            createFailedRemoteDataObject$('Error while loading GA')
+            createFailedRemoteDataObject$('Error while loading GA'),
           )
           .withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
           .and
@@ -370,7 +378,7 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: trackingIdTestValue,
               values: ['false'],
-            })
+            }),
           );
       service.initialize();
       expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
@@ -379,7 +387,7 @@ describe('BrowserKlaroService', () => {
       configurationDataService.findByPropertyName =
         jasmine.createSpy()
           .withArgs(GOOGLE_ANALYTICS_KEY).and.returnValue(
-            createSuccessfulRemoteDataObject$(null)
+            createSuccessfulRemoteDataObject$(null),
           )
           .withArgs(REGISTRATION_VERIFICATION_ENABLED_KEY)
           .and
@@ -388,7 +396,7 @@ describe('BrowserKlaroService', () => {
               ... new ConfigurationProperty(),
               name: trackingIdTestValue,
               values: ['false'],
-            })
+            }),
           );
       service.initialize();
       expect(service.klaroConfig.services).not.toContain(jasmine.objectContaining({ name: googleAnalytics }));
diff --git a/src/app/shared/cookies/browser-klaro.service.ts b/src/app/shared/cookies/browser-klaro.service.ts
index c6819012d9..f673a41736 100644
--- a/src/app/shared/cookies/browser-klaro.service.ts
+++ b/src/app/shared/cookies/browser-klaro.service.ts
@@ -1,21 +1,41 @@
-import { Injectable } from '@angular/core';
-import * as Klaro from 'klaro';
-import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  Inject,
+  Injectable,
+  InjectionToken,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { environment } from '../../../environments/environment';
-import { map, switchMap, take } from 'rxjs/operators';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { KlaroService } from './klaro.service';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { CookieService } from '../../core/services/cookie.service';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { cloneDeep, debounce } from 'lodash';
-import { ANONYMOUS_STORAGE_NAME_KLARO, klaroConfiguration } from './klaro-configuration';
 import { Operation } from 'fast-json-patch';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import cloneDeep from 'lodash/cloneDeep';
+import debounce from 'lodash/debounce';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { environment } from '../../../environments/environment';
+import { AuthService } from '../../core/auth/auth.service';
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import { CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
+import { CookieService } from '../../core/services/cookie.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
+import { KlaroService } from './klaro.service';
+import {
+  ANONYMOUS_STORAGE_NAME_KLARO,
+  klaroConfiguration,
+} from './klaro-configuration';
 
 /**
  * Metadata field to store a user's cookie consent preferences in
@@ -42,6 +62,17 @@ const cookiePurposeMessagePrefix = 'cookies.consent.purpose.';
  */
 const updateDebounce = 300;
 
+/**
+ * By using this injection token instead of importing directly we can keep Klaro out of the main bundle
+ */
+const LAZY_KLARO = new InjectionToken<Promise<any>>(
+  'Lazily loaded Klaro',
+  {
+    providedIn: 'root',
+    factory: async () => (await import('klaro/dist/klaro-no-translations')),
+  },
+);
+
 /**
  * Browser implementation for the KlaroService, representing a service for handling Klaro consent preferences and UI
  */
@@ -64,7 +95,9 @@ export class BrowserKlaroService extends KlaroService {
     private authService: AuthService,
     private ePersonService: EPersonDataService,
     private configService: ConfigurationDataService,
-    private cookieService: CookieService) {
+    private cookieService: CookieService,
+    @Inject(LAZY_KLARO) private lazyKlaro: Promise<any>,
+  ) {
     super();
   }
 
@@ -78,7 +111,7 @@ export class BrowserKlaroService extends KlaroService {
   initialize() {
     if (!environment.info.enablePrivacyStatement) {
       delete this.klaroConfig.privacyPolicy;
-      this.klaroConfig.translations.en.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
+      this.klaroConfig.translations.zz.consentNotice.description = 'cookies.consent.content-notice.description.no-privacy';
     }
 
     const hideGoogleAnalytics$ = this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY).pipe(
@@ -89,22 +122,21 @@ export class BrowserKlaroService extends KlaroService {
     const hideRegistrationVerification$ = this.configService.findByPropertyName(this.REGISTRATION_VERIFICATION_ENABLED_KEY).pipe(
       getFirstCompletedRemoteData(),
       map((remoteData) =>
-        !remoteData.hasSucceeded || !remoteData.payload || isEmpty(remoteData.payload.values) || remoteData.payload.values[0].toLowerCase() !== 'true'
+        !remoteData.hasSucceeded || !remoteData.payload || isEmpty(remoteData.payload.values) || remoteData.payload.values[0].toLowerCase() !== 'true',
       ),
     );
 
     const servicesToHide$: Observable<string[]> = observableCombineLatest([hideGoogleAnalytics$, hideRegistrationVerification$]).pipe(
       map(([hideGoogleAnalytics, hideRegistrationVerification]) => {
-        let servicesToHideArray: string[] = [];
+        const servicesToHideArray: string[] = [];
         if (hideGoogleAnalytics) {
           servicesToHideArray.push(this.GOOGLE_ANALYTICS_SERVICE_NAME);
         }
         if (hideRegistrationVerification) {
           servicesToHideArray.push(CAPTCHA_NAME);
         }
-        console.log(servicesToHideArray);
         return servicesToHideArray;
-      })
+      }),
     );
 
     this.translateService.setDefaultLang(environment.defaultLanguage);
@@ -134,8 +166,7 @@ export class BrowserKlaroService extends KlaroService {
         this.translateConfiguration();
 
         this.klaroConfig.services = this.filterConfigServices(servicesToHide);
-
-        Klaro.setup(this.klaroConfig);
+        this.lazyKlaro.then(({ setup }) => setup(this.klaroConfig));
       });
   }
 
@@ -152,7 +183,7 @@ export class BrowserKlaroService extends KlaroService {
           storageName = this.getStorageName(user.uuid);
         }
         return this.cookieService.get(storageName);
-      })
+      }),
     );
   }
 
@@ -187,7 +218,7 @@ export class BrowserKlaroService extends KlaroService {
           }
           return observableOf(undefined);
         }),
-        take(1)
+        take(1),
       );
   }
 
@@ -219,7 +250,7 @@ export class BrowserKlaroService extends KlaroService {
    * Show the cookie consent form
    */
   showSettings() {
-    Klaro.show(this.klaroConfig);
+    this.lazyKlaro.then(({ show }) => show(this.klaroConfig));
   }
 
   /**
@@ -227,12 +258,12 @@ export class BrowserKlaroService extends KlaroService {
    */
   addAppMessages() {
     this.klaroConfig.services.forEach((app) => {
-      this.klaroConfig.translations.en[app.name] = {
+      this.klaroConfig.translations.zz[app.name] = {
         title: this.getTitleTranslation(app.name),
-        description: this.getDescriptionTranslation(app.name)
+        description: this.getDescriptionTranslation(app.name),
       };
       app.purposes.forEach((purpose) => {
-        this.klaroConfig.translations.en.purposes[purpose] = this.getPurposeTranslation(purpose);
+        this.klaroConfig.translations.zz.purposes[purpose] = this.getPurposeTranslation(purpose);
       });
     });
   }
@@ -246,7 +277,7 @@ export class BrowserKlaroService extends KlaroService {
      */
     this.translateService.setDefaultLang(environment.defaultLanguage);
 
-    this.translate(this.klaroConfig.translations.en);
+    this.translate(this.klaroConfig.translations.zz);
   }
 
   /**
@@ -287,12 +318,12 @@ export class BrowserKlaroService extends KlaroService {
       .pipe(
         take(1),
         switchMap((operations: Operation[]) => {
-            if (isNotEmpty(operations)) {
-              return this.ePersonService.patch(user, operations);
-            }
-            return observableOf(undefined);
+          if (isNotEmpty(operations)) {
+            return this.ePersonService.patch(user, operations);
           }
-        )
+          return observableOf(undefined);
+        },
+        ),
       ).subscribe();
   }
 
diff --git a/src/app/shared/cookies/klaro-configuration.ts b/src/app/shared/cookies/klaro-configuration.ts
index 8a9855bd89..da3125b7eb 100644
--- a/src/app/shared/cookies/klaro-configuration.ts
+++ b/src/app/shared/cookies/klaro-configuration.ts
@@ -1,7 +1,13 @@
+import {
+  IMPERSONATING_COOKIE,
+  REDIRECT_COOKIE,
+} from '../../core/auth/auth.service';
 import { TOKENITEM } from '../../core/auth/models/auth-token-info.model';
-import { IMPERSONATING_COOKIE, REDIRECT_COOKIE } from '../../core/auth/auth.service';
+import {
+  CAPTCHA_COOKIE,
+  CAPTCHA_NAME,
+} from '../../core/google-recaptcha/google-recaptcha.service';
 import { LANG_COOKIE } from '../../core/locale/locale.service';
-import { CAPTCHA_COOKIE, CAPTCHA_NAME } from '../../core/google-recaptcha/google-recaptcha.service';
 
 /**
  * Cookie for has_agreed_end_user
@@ -22,7 +28,7 @@ export const GOOGLE_ANALYTICS_KLARO_KEY = 'google-analytics';
 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
@@ -54,38 +60,58 @@ export const klaroConfiguration: any = {
   https://github.com/KIProtect/klaro/tree/master/src/translations
   */
   translations: {
-    en: {
+    /*
+      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
+      translateConfiguration() in browser-klaro.service.ts. All the below i18n keys are specified
+      in your /src/assets/i18n/*.json5 translation pack.
+    */
+    zz: {
       acceptAll: 'cookies.consent.accept-all',
       acceptSelected: 'cookies.consent.accept-selected',
-      app: {
+      close: 'cookies.consent.close',
+      consentModal: {
+        title: 'cookies.consent.content-modal.title',
+        description: 'cookies.consent.content-modal.description',
+      },
+      consentNotice: {
+        changeDescription: 'cookies.consent.update',
+        title: 'cookies.consent.content-notice.title',
+        description: 'cookies.consent.content-notice.description',
+        learnMore: 'cookies.consent.content-notice.learnMore',
+      },
+      decline: 'cookies.consent.decline',
+      ok: 'cookies.consent.ok',
+      poweredBy: 'Powered by Klaro!',
+      privacyPolicy: {
+        name: 'cookies.consent.content-modal.privacy-policy.name',
+        text: 'cookies.consent.content-modal.privacy-policy.text',
+      },
+      purposeItem: {
+        service: 'cookies.consent.content-modal.service',
+        services: 'cookies.consent.content-modal.services',
+      },
+      purposes: {
+      },
+      save: 'cookies.consent.save',
+      service: {
+        disableAll: {
+          description: 'cookies.consent.app.disable-all.description',
+          title: 'cookies.consent.app.disable-all.title',
+        },
         optOut: {
           description: 'cookies.consent.app.opt-out.description',
-          title: 'cookies.consent.app.opt-out.title'
+          title: 'cookies.consent.app.opt-out.title',
         },
         purpose: 'cookies.consent.app.purpose',
         purposes: 'cookies.consent.app.purposes',
         required: {
+          title: 'cookies.consent.app.required.title',
           description: 'cookies.consent.app.required.description',
-          title: 'cookies.consent.app.required.title'
-        }
-      },
-      close: 'cookies.consent.close',
-      decline: 'cookies.consent.decline',
-      changeDescription: 'cookies.consent.update',
-      consentNotice: {
-        description: 'cookies.consent.content-notice.description',
-        learnMore: 'cookies.consent.content-notice.learnMore'
-      },
-      consentModal: {
-        description: 'cookies.consent.content-modal.description',
-        privacyPolicy: {
-          name: 'cookies.consent.content-modal.privacy-policy.name',
-          text: 'cookies.consent.content-modal.privacy-policy.text'
         },
-        title: 'cookies.consent.content-modal.title'
       },
-      purposes: {}
-    }
+    },
   },
   services: [
     {
@@ -95,16 +121,16 @@ export const klaroConfiguration: any = {
       cookies: [
         TOKENITEM,
         IMPERSONATING_COOKIE,
-        REDIRECT_COOKIE
-      ]
+        REDIRECT_COOKIE,
+      ],
     },
     {
       name: 'preferences',
       purposes: ['functional'],
       required: true,
       cookies: [
-        LANG_COOKIE
-      ]
+        LANG_COOKIE,
+      ],
     },
     {
       name: 'acknowledgement',
@@ -112,8 +138,8 @@ export const klaroConfiguration: any = {
       required: true,
       cookies: [
         [/^klaro-.+$/],
-        HAS_AGREED_END_USER
-      ]
+        HAS_AGREED_END_USER,
+      ],
     },
     {
       name: GOOGLE_ANALYTICS_KLARO_KEY,
@@ -164,11 +190,11 @@ export const klaroConfiguration: any = {
       required: false,
       cookies: [
         [/^klaro-.+$/],
-        CAPTCHA_COOKIE
+        CAPTCHA_COOKIE,
       ],
       onAccept: `window.refreshCaptchaScript?.call()`,
       onDecline: `window.refreshCaptchaScript?.call()`,
       onlyOnce: true,
-    }
+    },
   ],
 };
diff --git a/src/app/shared/cookies/klaro.service.ts b/src/app/shared/cookies/klaro.service.ts
index d54fed8b30..9e28d6ead7 100644
--- a/src/app/shared/cookies/klaro.service.ts
+++ b/src/app/shared/cookies/klaro.service.ts
@@ -1,5 +1,4 @@
 import { Injectable } from '@angular/core';
-
 import { Observable } from 'rxjs';
 
 /**
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
new file mode 100644
index 0000000000..b1056cdf18
--- /dev/null
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
@@ -0,0 +1,55 @@
+<div *ngIf="(this.submitted$ | async) !== true; else waiting">
+  <div *ngIf="this.canWithdraw; else reinstateHeader" class="modal-header">
+    {{ 'item.qa.withdrawn.modal.header' | translate }}
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <div class="form-group">
+      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
+                                              : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
+      <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
+                                              : ('qa-reinstate.create.modal.form.summary2.label' | translate) }}</label>
+      <textarea class="form-control" id="reason"
+                rows="6"
+                [(ngModel)]="reason"
+                placeholder="{{ this.canWithdraw ? ('qa-withdrown.modal.form.summary.placeholder' | translate)
+                                                 : ('qa-reinstate.modal.form.summary.placeholder' | translate) }}"
+                name="message"></textarea>
+    </div>
+  </div>
+  <div class="modal-footer space-children-mr">
+    <button class="btn btn-outline-secondary btn-sm ml-0"
+            type="button"
+            (click)="onModalClose()"
+            title="{{'item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip' | translate}}">
+      <i class="fas fa-times fa-fw"></i> {{'item.qa.withdrawn-reinstate.create.modal.button.cancel' | translate}}
+    </button>
+    <button class="btn btn-success btn-sm ml-0"
+            type="submit"
+            (click)="onModalSubmit()"
+            title="{{'item.qa.withdrawn-reinstate.modal.button.confirm.tooltip' | translate}}">
+      <i class="fas fa-check fa-fw"></i> {{ this.canWithdraw ? ('qa-withdrown.create.modal.button.confirm' | translate)
+                                                             : ('qa-reinstate.create.modal.button.confirm' | translate) }}
+    </button>
+  </div>
+</div>
+
+<ng-template #waiting>
+  <div class="modal-header">{{'item.qa.withdrawn.modal.submitted.header' | translate}}</div>
+  <div class="modal-body">
+    <div class="d-flex justify-content-center">
+      <ds-loading [showMessage]="false"></ds-loading>
+    </div>
+  </div>
+</ng-template>
+
+<ng-template #reinstateHeader>
+  <div *ngIf="!this.canWithdraw" class="modal-header">
+    {{'item.qa.reinstate.modal.header' | translate}}
+    <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+</ng-template>
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.scss b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
new file mode 100644
index 0000000000..6fb0963511
--- /dev/null
+++ b/src/app/shared/correction-suggestion/withdrawn-reinstate-modal.component.ts
@@ -0,0 +1,79 @@
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { BehaviorSubject } from 'rxjs';
+
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ModalBeforeDismiss } from '../interfaces/modal-before-dismiss.interface';
+
+@Component({
+  selector: 'ds-item-withdrawn-reinstate-modal',
+  templateUrl: './item-withdrawn-reinstate-modal.component.html',
+  styleUrls: ['./item-withdrawn-reinstate-modal.component.scss'],
+})
+/**
+ * Represents a modal component for withdrawing or reinstating an item.
+ * Implements the ModalBeforeDismiss interface.
+ */
+export class ItemWithdrawnReinstateModalComponent implements ModalBeforeDismiss {
+
+  /**
+   * The reason for withdrawing or reinstating a suggestion.
+   */
+  reason: string;
+  /**
+   * Indicates whether the item can be withdrawn.
+   */
+  canWithdraw: boolean;
+  /**
+   * BehaviorSubject that represents the submitted state.
+   * Emits a boolean value indicating whether the form has been submitted or not.
+   */
+  submitted$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+  /**
+   * Event emitter for creating a QA event.
+   * @event createQAEvent
+   */
+  @Output() createQAEvent: EventEmitter<string> = new EventEmitter<string>();
+
+  constructor(
+    protected activeModal: NgbActiveModal,
+    protected authorizationService: AuthorizationDataService,
+  ) {}
+
+  /**
+   * Closes the modal.
+   */
+  onModalClose() {
+    this.activeModal.close();
+  }
+
+  /**
+   * Determines whether the modal can be dismissed.
+   * @returns {boolean} True if the modal can be dismissed, false otherwise.
+   */
+  beforeDismiss(): boolean {
+    // prevent the modal from being dismissed after version creation is initiated
+    return !this.submitted$.getValue();
+  }
+
+  /**
+   * Handles the submission of the modal form.
+   * Emits the reason for withdrawal or reinstatement through the createQAEvent output.
+   */
+  onModalSubmit() {
+    this.submitted$.next(true);
+    this.createQAEvent.emit(this.reason);
+  }
+
+  /**
+   * Sets the withdrawal state of the component.
+   * @param state The new withdrawal state.
+   */
+  public setWithdraw(state: boolean) {
+    this.canWithdraw = state;
+  }
+}
diff --git a/src/app/shared/date.util.spec.ts b/src/app/shared/date.util.spec.ts
new file mode 100644
index 0000000000..6f41fbf17c
--- /dev/null
+++ b/src/app/shared/date.util.spec.ts
@@ -0,0 +1,113 @@
+import {
+  dateToISOFormat,
+  dateToNgbDateStruct,
+  dateToString,
+  isValidDate,
+  yearFromString,
+} from './date.util';
+
+describe('Date Utils', () => {
+
+  describe('dateToISOFormat', () => {
+    it('should convert Date to YYYY-MM-DDThh:mm:ssZ string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToISOFormat(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03T00:00:00Z');
+    });
+    it('should convert Date string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      expect(dateToISOFormat('2022-06-03')).toEqual('2022-06-03T00:00:00Z');
+    });
+    it('should convert Month string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      expect(dateToISOFormat('2022-06')).toEqual('2022-06-01T00:00:00Z');
+    });
+    it('should convert Year string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      expect(dateToISOFormat('2022')).toEqual('2022-01-01T00:00:00Z');
+    });
+    it('should convert ISO Date string to YYYY-MM-DDThh:mm:ssZ string', () => {
+      // NOTE: Time is always zeroed out as proven by this test.
+      expect(dateToISOFormat('2022-06-03T03:24:04Z')).toEqual('2022-06-03T00:00:00Z');
+    });
+    it('should convert NgbDateStruct to YYYY-MM-DDThh:mm:ssZ string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      const date = new Date(Date.UTC(2022, 5, 3));
+      expect(dateToISOFormat(dateToNgbDateStruct(date))).toEqual('2022-06-03T00:00:00Z');
+    });
+  });
+
+  describe('dateToString', () => {
+    it('should convert Date to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToString(new Date(Date.UTC(2022, 5, 3)))).toEqual('2022-06-03');
+    });
+    it('should convert Date with time to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToString(new Date(Date.UTC(2022, 5, 3, 3, 24, 0)))).toEqual('2022-06-03');
+    });
+    it('should convert Month only to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      expect(dateToString(new Date(Date.UTC(2022, 5)))).toEqual('2022-06-01');
+    });
+    it('should convert ISO Date to YYYY-MM-DD string', () => {
+      expect(dateToString(new Date('2022-06-03T03:24:00Z'))).toEqual('2022-06-03');
+    });
+    it('should convert NgbDateStruct to YYYY-MM-DD string', () => {
+      // NOTE: month is zero indexed which is why it increases by one
+      const date = new Date(Date.UTC(2022, 5, 3));
+      expect(dateToString(dateToNgbDateStruct(date))).toEqual('2022-06-03');
+    });
+  });
+
+
+  describe('isValidDate', () => {
+    it('should return false for null', () => {
+      expect(isValidDate(null)).toBe(false);
+    });
+    it('should return false for empty string', () => {
+      expect(isValidDate('')).toBe(false);
+    });
+    it('should return false for text', () => {
+      expect(isValidDate('test')).toBe(false);
+    });
+    it('should return true for YYYY', () => {
+      expect(isValidDate('2022')).toBe(true);
+    });
+    it('should return true for YYYY-MM', () => {
+      expect(isValidDate('2022-12')).toBe(true);
+    });
+    it('should return true for YYYY-MM-DD', () => {
+      expect(isValidDate('2022-06-03')).toBe(true);
+    });
+    it('should return true for YYYY-MM-DDTHH:MM:SS', () => {
+      expect(isValidDate('2022-06-03T10:20:30')).toBe(true);
+    });
+    it('should return true for YYYY-MM-DDTHH:MM:SSZ', () => {
+      expect(isValidDate('2022-06-03T10:20:30Z')).toBe(true);
+    });
+    it('should return false for a month that does not exist', () => {
+      expect(isValidDate('2022-13')).toBe(false);
+    });
+    it('should return false for a day that does not exist', () => {
+      expect(isValidDate('2022-02-60')).toBe(false);
+    });
+    it('should return false for a time that does not exist', () => {
+      expect(isValidDate('2022-02-60T10:60:20')).toBe(false);
+    });
+  });
+
+  describe('yearFromString', () => {
+    it('should return year from YYYY string', () => {
+      expect(yearFromString('2022')).toEqual(2022);
+    });
+    it('should return year from YYYY-MM string', () => {
+      expect(yearFromString('1970-06')).toEqual(1970);
+    });
+    it('should return year from YYYY-MM-DD string', () => {
+      expect(yearFromString('1914-10-23')).toEqual(1914);
+    });
+    it('should return year from YYYY-MM-DDTHH:MM:SSZ string', () => {
+      expect(yearFromString('1914-10-23T10:20:30Z')).toEqual(1914);
+    });
+    it('should return null if invalid date', () => {
+      expect(yearFromString('test')).toBeNull();
+    });
+  });
+});
diff --git a/src/app/shared/date.util.ts b/src/app/shared/date.util.ts
index 5f7ccb2438..7450687ada 100644
--- a/src/app/shared/date.util.ts
+++ b/src/app/shared/date.util.ts
@@ -1,9 +1,9 @@
 import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { isValid } from 'date-fns';
+import { formatInTimeZone }  from 'date-fns-tz';
+import isObject from 'lodash/isObject';
 
-import { isObject } from 'lodash';
-import * as moment from 'moment';
-
-import { isNull, isUndefined } from './empty.util';
+import { hasNoValue } from './empty.util';
 
 /**
  * Returns true if the passed value is a NgbDateStruct.
@@ -31,21 +31,7 @@ export function dateToISOFormat(date: Date | NgbDateStruct | string): string {
   const dateObj: Date = (date instanceof Date) ? date :
     ((typeof date === 'string') ? ngbDateStructToDate(stringToNgbDateStruct(date)) : ngbDateStructToDate(date));
 
-  let year = dateObj.getUTCFullYear().toString();
-  let month = (dateObj.getUTCMonth() + 1).toString();
-  let day = dateObj.getUTCDate().toString();
-  let hour = dateObj.getHours().toString();
-  let min = dateObj.getMinutes().toString();
-  let sec = dateObj.getSeconds().toString();
-
-  year = (year.length === 1) ? '0' + year : year;
-  month = (month.length === 1) ? '0' + month : month;
-  day = (day.length === 1) ? '0' + day : day;
-  hour = (hour.length === 1) ? '0' + hour : hour;
-  min = (min.length === 1) ? '0' + min : min;
-  sec = (sec.length === 1) ? '0' + sec : sec;
-  const dateStr = `${year}${month}${day}${hour}${min}${sec}`;
-  return moment.utc(dateStr, 'YYYYMMDDhhmmss').format();
+  return formatInTimeZone(dateObj, 'UTC', "yyyy-MM-dd'T'HH:mm:ss'Z'");
 }
 
 /**
@@ -81,14 +67,14 @@ export function stringToNgbDateStruct(date: string): NgbDateStruct {
  *    the NgbDateStruct object
  */
 export function dateToNgbDateStruct(date?: Date): NgbDateStruct {
-  if (isNull(date) || isUndefined(date)) {
+  if (hasNoValue(date)) {
     date = new Date();
   }
 
   return {
     year: date.getUTCFullYear(),
     month: date.getUTCMonth() + 1,
-    day: date.getUTCDate()
+    day: date.getUTCDate(),
   };
 }
 
@@ -102,16 +88,7 @@ export function dateToNgbDateStruct(date?: Date): NgbDateStruct {
  */
 export function dateToString(date: Date | NgbDateStruct): string {
   const dateObj: Date = (date instanceof Date) ? date : ngbDateStructToDate(date);
-
-  let year = dateObj.getUTCFullYear().toString();
-  let month = (dateObj.getUTCMonth() + 1).toString();
-  let day = dateObj.getUTCDate().toString();
-
-  year = (year.length === 1) ? '0' + year : year;
-  month = (month.length === 1) ? '0' + month : month;
-  day = (day.length === 1) ? '0' + day : day;
-  const dateStr = `${year}-${month}-${day}`;
-  return moment.utc(dateStr, 'YYYYMMDD').format('YYYY-MM-DD');
+  return formatInTimeZone(dateObj, 'UTC', 'yyyy-MM-dd');
 }
 
 /**
@@ -119,5 +96,15 @@ export function dateToString(date: Date | NgbDateStruct): string {
  * @param date the string to be checked
  */
 export function isValidDate(date: string) {
-  return moment(date).isValid();
+  return (hasNoValue(date)) ? false : isValid(new Date(date));
 }
+
+/**
+ * Parse given date string to a year number based on expected formats
+ * @param date the string to be parsed
+ * @param formats possible formats the string may align with. MUST be valid date-fns formats
+ */
+export function yearFromString(date: string) {
+  return isValidDate(date) ? new Date(date).getUTCFullYear() : null;
+}
+
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index 5a15155d4f..c12ea61347 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -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/ds-select/ds-select.component.spec.ts b/src/app/shared/ds-select/ds-select.component.spec.ts
index fadc854873..22158ca10c 100644
--- a/src/app/shared/ds-select/ds-select.component.spec.ts
+++ b/src/app/shared/ds-select/ds-select.component.spec.ts
@@ -1,7 +1,12 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DsSelectComponent } from './ds-select.component';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { DsSelectComponent } from './ds-select.component';
+
 describe('DsSelectComponent', () => {
   let component: DsSelectComponent;
   let fixture: ComponentFixture<DsSelectComponent>;
diff --git a/src/app/shared/ds-select/ds-select.component.ts b/src/app/shared/ds-select/ds-select.component.ts
index 26d1560c01..3c487af037 100644
--- a/src/app/shared/ds-select/ds-select.component.ts
+++ b/src/app/shared/ds-select/ds-select.component.ts
@@ -1,4 +1,9 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 
 /**
  * Component which represent a DSpace dropdown selector.
@@ -6,7 +11,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
 @Component({
   selector: 'ds-select',
   templateUrl: './ds-select.component.html',
-  styleUrls: ['./ds-select.component.scss']
+  styleUrls: ['./ds-select.component.scss'],
 })
 export class DsSelectComponent {
 
@@ -14,23 +19,23 @@ export class DsSelectComponent {
    * An optional label for the dropdown selector.
    */
   @Input()
-  label: string;
+    label: string;
 
   /**
    * Whether the dropdown selector is disabled.
    */
   @Input()
-  disabled: boolean;
+    disabled: boolean;
 
   /**
    * Emits an event when the dropdown selector is opened or closed.
    */
   @Output()
-  toggled = new EventEmitter();
+    toggled = new EventEmitter();
 
   /**
    * Emits an event when the dropdown selector or closed.
    */
   @Output()
-  close = new EventEmitter();
+    close = new EventEmitter();
 }
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
new file mode 100644
index 0000000000..318a41ce25
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.spec.ts
@@ -0,0 +1,432 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import flatten from 'lodash/flatten';
+import {
+  combineLatest,
+  map,
+  of as observableOf,
+} from 'rxjs';
+import { CorrectionTypeDataService } from 'src/app/core/submission/correctiontype-data.service';
+
+import { AdminSidebarComponent } from '../../admin/admin-sidebar/admin-sidebar.component';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { MenuService } from '../menu/menu.service';
+import { MenuID } from '../menu/menu-id.model';
+import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
+import { MenuItemType } from '../menu/menu-item-type.model';
+import { NotificationsService } from '../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { MenuServiceStub } from '../testing/menu-service.stub';
+import { createPaginatedList } from '../testing/utils.test';
+import { DSOEditMenuResolver } from './dso-edit-menu.resolver';
+import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
+import { DsoWithdrawnReinstateModalService } from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
+
+describe('DSOEditMenuResolver', () => {
+
+  const MENU_STATE = {
+    id: 'some menu',
+  };
+
+  let resolver: DSOEditMenuResolver;
+
+  let dSpaceObjectDataService;
+  let menuService;
+  let authorizationService;
+  let dsoVersioningModalService;
+  let researcherProfileService;
+  let notificationsService;
+  let translate;
+  let dsoWithdrawnReinstateModalService;
+  let correctionsDataService;
+
+  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 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',
+    active: false,
+    visible: true,
+    model: null,
+  },
+  {
+    id: 'dummy-2',
+    active: false,
+    visible: true,
+    model: null,
+  }];
+
+  const dummySections2 = [{
+    id: 'dummy-3',
+    active: false,
+    visible: true,
+    model: null,
+  },
+  {
+    id: 'dummy-4',
+    active: false,
+    visible: true,
+    model: null,
+  },
+  {
+    id: 'dummy-5',
+    active: false,
+    visible: true,
+    model: null,
+  }];
+
+  beforeEach(waitForAsync(() => {
+    // test with Items unless specified otherwise
+    testObject = testItem;
+    route = dsoRoute(testItem);
+
+    menuService = new MenuServiceStub();
+    spyOn(menuService, 'getMenu').and.returnValue(observableOf(MENU_STATE));
+
+    dSpaceObjectDataService = jasmine.createSpyObj('dSpaceObjectDataService', {
+      findById: createSuccessfulRemoteDataObject$(testObject),
+    });
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true),
+    });
+    dsoVersioningModalService = jasmine.createSpyObj('dsoVersioningModalService', {
+      isNewVersionButtonDisabled: observableOf(false),
+      getVersioningTooltipMessage: observableOf('message'),
+      openCreateVersionModal: {},
+    });
+    researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
+      createFromExternalSourceAndReturnRelatedItemId: observableOf('mock-id'),
+    });
+    translate = jasmine.createSpyObj('translate', {
+      get: observableOf('translated-message'),
+    });
+    notificationsService = jasmine.createSpyObj('notificationsService', {
+      success: {},
+      error: {},
+    });
+
+    dsoWithdrawnReinstateModalService = jasmine.createSpyObj('dsoWithdrawnReinstateModalService', {
+      openCreateWithdrawnReinstateModal: {},
+    });
+
+    correctionsDataService = jasmine.createSpyObj('correctionsDataService', {
+      findByItem: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule, RouterTestingModule],
+      declarations: [AdminSidebarComponent],
+      providers: [
+        { provide: DSpaceObjectDataService, useValue: dSpaceObjectDataService },
+        { provide: MenuService, useValue: menuService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: DsoVersioningModalService, useValue: dsoVersioningModalService },
+        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
+        { provide: TranslateService, useValue: translate },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: DsoWithdrawnReinstateModalService, useValue: dsoWithdrawnReinstateModalService },
+        { provide: CorrectionTypeDataService, useValue: correctionsDataService },
+        {
+          provide: NgbModal, useValue: {
+            open: () => {/*comment*/
+            },
+          },
+        },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+    resolver = TestBed.inject(DSOEditMenuResolver);
+
+    spyOn(menuService, 'addSection');
+  }));
+
+  it('should be created', () => {
+    expect(resolver).toBeTruthy();
+  });
+
+  describe('resolve', () => {
+    it('should create all menus when a dso is found based on the route id param', (done) => {
+      spyOn(resolver, 'getDsoMenus').and.returnValue(
+        [observableOf(dummySections1), observableOf(dummySections2)],
+      );
+      resolver.resolve(route as any, null).subscribe(resolved => {
+        expect(resolved).toEqual(
+          {
+            ...route.data.menu,
+            [MenuID.DSO_EDIT]: [
+              ...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-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)],
+      );
+      const routeWithScope = {
+        data: {
+          menu: {
+            'statistics': [{
+              id: 'statistics-dummy-1',
+              active: false,
+              visible: true,
+              model: null,
+            }],
+          },
+        },
+        params: {},
+        queryParams: { scope: 'test-scope-uuid' },
+      };
+
+      resolver.resolve(routeWithScope as any, null).subscribe(resolved => {
+        expect(resolved).toEqual(
+          {
+            ...route.data.menu,
+            [MenuID.DSO_EDIT]: [
+              ...dummySections1.map((menu) => Object.assign(menu, { id: menu.id + '-test-scope-uuid' })),
+              ...dummySections2.map((menu) => Object.assign(menu, { id: menu.id + '-test-scope-uuid' })),
+            ],
+          },
+        );
+        expect(dSpaceObjectDataService.findById).toHaveBeenCalledWith('test-scope-uuid', true, false);
+        expect(resolver.getDsoMenus).toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should return the statistics menu when no dso is found', (done) => {
+      (dSpaceObjectDataService.findById as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+
+      resolver.resolve(route as any, null).subscribe(resolved => {
+        expect(resolved).toEqual(
+          {
+            ...route.data.menu,
+          },
+        );
+        done();
+      });
+    });
+  });
+
+  describe('getDsoMenus', () => {
+    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();
+        });
+      });
+    });
+
+    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: DoneFn) => {
+        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: DoneFn) => {
+        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: DoneFn) => {
+        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
new file mode 100644
index 0000000000..a40cabf6b0
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu.resolver.ts
@@ -0,0 +1,325 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { getDSORoute } from '../../app-routing-paths';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { ResearcherProfileDataService } from '../../core/profile/researcher-profile-data.service';
+import { Collection } from '../../core/shared/collection.model';
+import { Community } from '../../core/shared/community.model';
+import { Item } from '../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { CorrectionTypeDataService } from '../../core/submission/correctiontype-data.service';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { MenuService } from '../menu/menu.service';
+import { MenuID } from '../menu/menu-id.model';
+import { LinkMenuItemModel } from '../menu/menu-item/models/link.model';
+import { OnClickMenuItemModel } from '../menu/menu-item/models/onclick.model';
+import { MenuItemType } from '../menu/menu-item-type.model';
+import { MenuSection } from '../menu/menu-section.model';
+import { NotificationsService } from '../notifications/notifications.service';
+import { SubscriptionModalComponent } from '../subscriptions/subscription-modal/subscription-modal.component';
+import { DsoVersioningModalService } from './dso-versioning-modal-service/dso-versioning-modal.service';
+import {
+  DsoWithdrawnReinstateModalService,
+  REQUEST_REINSTATE,
+  REQUEST_WITHDRAWN,
+} from './dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service';
+
+/**
+ * Creates the menus for the dspace object pages
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class DSOEditMenuResolver implements Resolve<{ [key: string]: MenuSection[] }> {
+
+  constructor(
+    protected dSpaceObjectDataService: DSpaceObjectDataService,
+    protected menuService: MenuService,
+    protected authorizationService: AuthorizationDataService,
+    protected modalService: NgbModal,
+    protected dsoVersioningModalService: DsoVersioningModalService,
+    protected researcherProfileService: ResearcherProfileDataService,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected dsoWithdrawnReinstateModalService: DsoWithdrawnReinstateModalService,
+    private correctionTypeDataService: CorrectionTypeDataService,
+  ) {
+  }
+
+  /**
+   * Initialise all dspace object related menus
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<{ [key: string]: MenuSection[] }> {
+    let id = route.params.id;
+    if (hasNoValue(id) && hasValue(route.queryParams.scope)) {
+      id = route.queryParams.scope;
+    }
+    if (hasNoValue(id)) {
+      // If there's no ID, we're not on a DSO homepage, so pass on any pre-existing menu route data
+      return observableOf({ ...route.data?.menu });
+    } else {
+      return this.dSpaceObjectDataService.findById(id, true, false).pipe(
+        getFirstCompletedRemoteData(),
+        switchMap((dsoRD) => {
+          if (dsoRD.hasSucceeded) {
+            const dso = dsoRD.payload;
+            return combineLatest(this.getDsoMenus(dso, route, state)).pipe(
+              // Menu sections are retrieved as an array of arrays and flattened into a single array
+              map((combinedMenus) => [].concat.apply([], combinedMenus)),
+              map((menus) => this.addDsoUuidToMenuIDs(menus, dso)),
+              map((menus) => {
+                return {
+                  ...route.data?.menu,
+                  [MenuID.DSO_EDIT]: menus,
+                };
+              }),
+            );
+          } else {
+            return observableOf({ ...route.data?.menu });
+          }
+        }),
+      );
+    }
+  }
+
+  /**
+   * Return all the menus for a dso based on the route and state
+   */
+  getDsoMenus(dso, route, state): Observable<MenuSection[]>[] {
+    return [
+      this.getItemMenu(dso),
+      this.getComColMenu(dso),
+      this.getCommonMenu(dso, state),
+    ];
+  }
+
+  /**
+   * Get the common menus between all dspace objects
+   */
+  protected getCommonMenu(dso, state): Observable<MenuSection[]> {
+    return combineLatest([
+      this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, dso.self),
+    ]).pipe(
+      map(([canEditItem]) => {
+        return [
+          {
+            id: 'edit-dso',
+            active: false,
+            visible: canEditItem,
+            model: {
+              type: MenuItemType.LINK,
+              text: this.getDsoType(dso) + '.page.edit',
+              link: new URLCombiner(getDSORoute(dso), 'edit', 'metadata').toString(),
+            } as LinkMenuItemModel,
+            icon: 'pencil-alt',
+            index: 2,
+          },
+        ];
+      }),
+    );
+  }
+
+  /**
+   * Get item specific menus
+   */
+  protected getItemMenu(dso): Observable<MenuSection[]> {
+    if (dso instanceof Item) {
+      return combineLatest([
+        this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, dso.self),
+        this.dsoVersioningModalService.isNewVersionButtonDisabled(dso),
+        this.dsoVersioningModalService.getVersioningTooltipMessage(dso, 'item.page.version.hasDraft', 'item.page.version.create'),
+        this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, dso.self),
+        this.authorizationService.isAuthorized(FeatureID.CanClaimItem, dso.self),
+        this.correctionTypeDataService.findByItem(dso.uuid, false).pipe(
+          getFirstCompletedRemoteData(),
+          getRemoteDataPayload()),
+      ]).pipe(
+        map(([canCreateVersion, disableVersioning, versionTooltip, canSynchronizeWithOrcid, canClaimItem, correction]) => {
+          const isPerson = this.getDsoType(dso) === 'person';
+          return [
+            {
+              id: 'orcid-dso',
+              active: false,
+              visible: isPerson && canSynchronizeWithOrcid,
+              model: {
+                type: MenuItemType.LINK,
+                text: 'item.page.orcid.tooltip',
+                link: new URLCombiner(getDSORoute(dso), 'orcid').toString(),
+              } as LinkMenuItemModel,
+              icon: 'orcid fab fa-lg',
+              index: 0,
+            },
+            {
+              id: 'version-dso',
+              active: false,
+              visible: canCreateVersion,
+              model: {
+                type: MenuItemType.ONCLICK,
+                text: versionTooltip,
+                disabled: disableVersioning,
+                function: () => {
+                  this.dsoVersioningModalService.openCreateVersionModal(dso);
+                },
+              } as OnClickMenuItemModel,
+              icon: 'code-branch',
+              index: 1,
+            },
+            {
+              id: 'claim-dso',
+              active: false,
+              visible: isPerson && canClaimItem,
+              model: {
+                type: MenuItemType.ONCLICK,
+                text: 'item.page.claim.button',
+                function: () => {
+                  this.claimResearcher(dso);
+                },
+              } as OnClickMenuItemModel,
+              icon: 'hand-paper',
+              index: 3,
+            },
+            {
+              id: 'withdrawn-item',
+              active: false,
+              visible: dso.isArchived && correction?.page.some((c) => c.topic === REQUEST_WITHDRAWN),
+              model: {
+                type: MenuItemType.ONCLICK,
+                text:'item.page.withdrawn',
+                function: () => {
+                  this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-withdrawn', dso.isArchived);
+                },
+              } as OnClickMenuItemModel,
+              icon: 'eye-slash',
+              index: 4,
+            },
+            {
+              id: 'reinstate-item',
+              active: false,
+              visible: dso.isWithdrawn && correction?.page.some((c) => c.topic === REQUEST_REINSTATE),
+              model: {
+                type: MenuItemType.ONCLICK,
+                text:'item.page.reinstate',
+                function: () => {
+                  this.dsoWithdrawnReinstateModalService.openCreateWithdrawnReinstateModal(dso, 'request-reinstate', dso.isArchived);
+                },
+              } as OnClickMenuItemModel,
+              icon: 'eye',
+              index: 5,
+            },
+          ];
+        }),
+      );
+    } else {
+      return observableOf([]);
+    }
+  }
+
+  /**
+   * 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
+   */
+  protected claimResearcher(dso) {
+    this.researcherProfileService.createFromExternalSourceAndReturnRelatedItemId(dso.self)
+      .subscribe((id: string) => {
+        if (isNotEmpty(id)) {
+          this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'),
+            this.translate.get('researcherprofile.success.claim.body'));
+          this.authorizationService.invalidateAuthorizationsRequestCache();
+          this.menuService.hideMenuSection(MenuID.DSO_EDIT, 'claim-dso-' + dso.uuid);
+        } else {
+          this.notificationsService.error(
+            this.translate.get('researcherprofile.error.claim.title'),
+            this.translate.get('researcherprofile.error.claim.body'));
+        }
+      });
+  }
+
+  /**
+   * Retrieve the dso or entity type for an object to be used in generic messages
+   */
+  protected getDsoType(dso) {
+    const renderType = dso.getRenderTypes()[0];
+    if (typeof renderType === 'string' || renderType instanceof String) {
+      return renderType.toLowerCase();
+    } else {
+      return dso.type.toString().toLowerCase();
+    }
+  }
+
+  /**
+   * Add the dso uuid to all provided menu ids and parent ids
+   */
+  protected addDsoUuidToMenuIDs(menus, dso) {
+    return menus.map((menu) => {
+      Object.assign(menu, {
+        id: menu.id + '-' + dso.uuid,
+      });
+      if (hasValue(menu.parentID)) {
+        Object.assign(menu, {
+          parentID: menu.parentID + '-' + dso.uuid,
+        });
+      }
+      return menu;
+    });
+  }
+
+}
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
new file mode 100644
index 0000000000..cb725e7d70
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -0,0 +1,23 @@
+<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">
+            <i class="fas fa-{{section.icon}} fa-fw"></i>
+        </button>
+        <ul ngbDropdownMenu class="dso-edit-menu-dropdown">
+            <li class="nav-item nav-link d-flex flex-row" *ngFor="let subSection of (subSections$ | async)">
+                <div *ngIf="renderIcons$ | async" class="mr-2">
+                    <i *ngIf="subSection.icon; else spacer" class="fas fa-{{subSection.icon}} fa-fw"></i>
+                    <ng-template #spacer><i class="fas fa-fw"></i></ng-template>
+                </div>
+                <ng-container
+                        *ngComponentOutlet="(sectionMap$ | async).get(subSection.id).component; injector: (sectionMap$ | async).get(subSection.id).injector;">
+                </ng-container>
+            </li>
+        </ul>
+    </div>
+</div>
+
+
+
+
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss
new file mode 100644
index 0000000000..b37f1be746
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.scss
@@ -0,0 +1,30 @@
+.btn-dark {
+    background-color: var(--ds-admin-sidebar-bg);
+}
+
+.dso-button-menu {
+    .dropdown-toggle::after {
+        display: none;
+    }
+}
+
+ul.dropdown-menu {
+    background-color: var(--ds-admin-sidebar-bg);
+    color: white;
+
+    ::ng-deep a {
+        color: white;
+
+        &.disabled {
+            color: var(--bs-btn-link-disabled-color);
+        }
+    }
+
+    .disabled {
+        color: var(--bs-btn-link-disabled-color);
+    }
+}
+
+.dso-edit-menu-dropdown {
+  max-width: calc(min(600px, 75vw));
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
new file mode 100644
index 0000000000..4ad4642804
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.spec.ts
@@ -0,0 +1,80 @@
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
+
+import { MenuService } from '../../../menu/menu.service';
+import { CSSVariableService } from '../../../sass-helper/css-variable.service';
+import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub';
+import { MenuServiceStub } from '../../../testing/menu-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { DsoEditMenuExpandableSectionComponent } from './dso-edit-menu-expandable-section.component';
+
+describe('DsoEditMenuExpandableSectionComponent', () => {
+  let component: DsoEditMenuExpandableSectionComponent;
+  let fixture: ComponentFixture<DsoEditMenuExpandableSectionComponent>;
+  const menuService = new MenuServiceStub();
+  const iconString = 'test';
+
+  const dummySection = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.TEXT,
+      disabled: false,
+      text: 'text',
+    },
+    icon: iconString,
+  };
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [DsoEditMenuExpandableSectionComponent, TestComponent],
+      providers: [
+        { provide: 'sectionDataProvider', useValue: dummySection },
+        { provide: MenuService, useValue: menuService },
+        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+      ],
+    }).overrideComponent(DsoEditMenuExpandableSectionComponent, {
+      set: {
+        entryComponents: [TestComponent],
+      },
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+    fixture = TestBed.createComponent(DsoEditMenuExpandableSectionComponent);
+    component = fixture.componentInstance;
+    spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should show a button with the icon', () => {
+    const button = fixture.debugElement.query(By.css('.btn-dark'));
+    expect(button.nativeElement.innerHTML).toContain('fa-' + iconString);
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+}
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
new file mode 100644
index 0000000000..2f92049453
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.ts
@@ -0,0 +1,53 @@
+import {
+  Component,
+  Inject,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { MenuID } from 'src/app/shared/menu/menu-id.model';
+import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
+import { MenuSection } from 'src/app/shared/menu/menu-section.model';
+import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
+
+import { hasValue } from '../../../empty.util';
+import { MenuService } from '../../../menu/menu.service';
+
+/**
+ * Represents an expandable section in the dso edit menus
+ */
+@Component({
+  selector: 'ds-dso-edit-menu-expandable-section',
+  templateUrl: './dso-edit-menu-expandable-section.component.html',
+  styleUrls: ['./dso-edit-menu-expandable-section.component.scss'],
+})
+@rendersSectionForMenu(MenuID.DSO_EDIT, true)
+export class DsoEditMenuExpandableSectionComponent extends MenuSectionComponent {
+
+  menuID: MenuID = MenuID.DSO_EDIT;
+  itemModel;
+
+  renderIcons$: Observable<boolean>;
+
+  constructor(
+    @Inject('sectionDataProvider') menuSection: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+    protected router: Router,
+  ) {
+    super(menuSection, menuService, injector);
+    this.itemModel = menuSection.model;
+  }
+
+  ngOnInit(): void {
+    this.menuService.activateSection(this.menuID, this.section.id);
+    super.ngOnInit();
+
+    this.renderIcons$ = this.subSections$.pipe(
+      map((sections: MenuSection[]) => {
+        return sections.some(section => hasValue(section.icon));
+      }),
+    );
+  }
+}
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
new file mode 100644
index 0000000000..bbc388a601
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -0,0 +1,21 @@
+<div *ngIf="!canActivate" class="dso-button-menu mb-1"
+     [ngbTooltip]="itemModel.text | translate">
+    <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>
+    <button *ngIf="section.model.disabled" class="btn btn-dark btn-sm" [disabled]="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"
+     [ngbTooltip]="itemModel.text | translate">
+    <button class="btn btn-dark btn-sm" [disabled]="section.model.disabled"
+            (click)="activate($event)">
+        <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.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss
new file mode 100644
index 0000000000..cf0e81c553
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.scss
@@ -0,0 +1,3 @@
+.btn-dark {
+    background-color: var(--ds-admin-sidebar-bg);
+}
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
new file mode 100644
index 0000000000..fbb90c5660
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.spec.ts
@@ -0,0 +1,175 @@
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import { MenuItemType } from 'src/app/shared/menu/menu-item-type.model';
+
+import { MenuService } from '../../../menu/menu.service';
+import { OnClickMenuItemModel } from '../../../menu/menu-item/models/onclick.model';
+import { CSSVariableService } from '../../../sass-helper/css-variable.service';
+import { CSSVariableServiceStub } from '../../../testing/css-variable-service.stub';
+import { MenuServiceStub } from '../../../testing/menu-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { DsoEditMenuSectionComponent } from './dso-edit-menu-section.component';
+
+function initAsync(dummySectionText: { visible: boolean; icon: string; active: boolean; model: { disabled: boolean; text: string; type: MenuItemType }; id: string }, menuService: MenuServiceStub) {
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [DsoEditMenuSectionComponent, TestComponent],
+      providers: [
+        { provide: 'sectionDataProvider', useValue: dummySectionText },
+        { provide: MenuService, useValue: menuService },
+        { provide: CSSVariableService, useClass: CSSVariableServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+      ],
+    }).overrideComponent(DsoEditMenuSectionComponent, {
+      set: {
+        entryComponents: [TestComponent],
+      },
+    })
+      .compileComponents();
+  }));
+}
+
+describe('DsoEditMenuSectionComponent', () => {
+  let component: DsoEditMenuSectionComponent;
+  let fixture: ComponentFixture<DsoEditMenuSectionComponent>;
+  const menuService = new MenuServiceStub();
+  const iconString = 'test';
+
+  const dummySectionText = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.TEXT,
+      disabled: false,
+      text: 'text',
+    },
+    icon: iconString,
+  };
+  const dummySectionLink = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.LINK,
+      disabled: false,
+      text: 'text',
+      link: 'link',
+    },
+    icon: iconString,
+  };
+
+  const dummySectionClick = {
+    id: 'dummy',
+    active: false,
+    visible: true,
+    model: {
+      type: MenuItemType.ONCLICK,
+      disabled: false,
+      text: 'text',
+      function: () => 'test',
+    },
+    icon: iconString,
+  };
+
+  describe('text model', () => {
+    initAsync(dummySectionText, menuService);
+    beforeEach(() => {
+      spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+      fixture = TestBed.createComponent(DsoEditMenuSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should show a button with the icon', () => {
+      const button = fixture.debugElement.query(By.css('.btn-dark'));
+      expect(button.nativeElement.innerHTML).toContain('fa-' + iconString);
+    });
+    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 a'));
+        expect(textButton.nativeElement.innerHTML).toContain('fa-' + iconString);
+      });
+    });
+  });
+  describe('on click model', () => {
+    initAsync(dummySectionClick, menuService);
+    beforeEach(() => {
+      spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+      fixture = TestBed.createComponent(DsoEditMenuSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    describe('when the section model in an on click menu', () => {
+      it('should call the activate method when clicking the button', () => {
+        spyOn(component, 'activate');
+
+        const button = fixture.debugElement.query(By.css('.btn-dark'));
+        button.triggerEventHandler('click', null);
+
+        expect(component.activate).toHaveBeenCalled();
+      });
+    });
+    describe('activate', () => {
+      const mockEvent = jasmine.createSpyObj('event', {
+        preventDefault: jasmine.createSpy('preventDefault'),
+        stopPropagation: jasmine.createSpy('stopPropagation'),
+      });
+      it('should call the item model function when not disabled', () => {
+        spyOn(component.section.model as OnClickMenuItemModel, 'function');
+        component.activate(mockEvent);
+
+        expect((component.section.model as OnClickMenuItemModel).function).toHaveBeenCalled();
+      });
+      it('should call not the item model function when disabled', () => {
+        spyOn(component.section.model as OnClickMenuItemModel, 'function');
+        component.itemModel.disabled = true;
+        component.activate(mockEvent);
+
+        expect((component.section.model as OnClickMenuItemModel).function).not.toHaveBeenCalled();
+        component.itemModel.disabled = false;
+      });
+    });
+
+  });
+
+  describe('when the section model in a non disabled link', () => {
+    initAsync(dummySectionLink, menuService);
+    beforeEach(() => {
+      spyOn(menuService, 'getSubSectionsByParentID').and.returnValue(observableOf([]));
+      fixture = TestBed.createComponent(DsoEditMenuSectionComponent);
+      component = fixture.componentInstance;
+      spyOn(component as any, 'getMenuItemComponent').and.returnValue(TestComponent);
+      fixture.detectChanges();
+    });
+
+    it('should show the link element', () => {
+      expect(fixture.debugElement.query(By.css('a'))).not.toBeNull();
+    });
+
+  });
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+}
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
new file mode 100644
index 0000000000..c1e0095066
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.ts
@@ -0,0 +1,56 @@
+import {
+  Component,
+  Inject,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import { rendersSectionForMenu } from 'src/app/shared/menu/menu-section.decorator';
+import { MenuSectionComponent } from 'src/app/shared/menu/menu-section/menu-section.component';
+
+import { isNotEmpty } from '../../../empty.util';
+import { MenuService } from '../../../menu/menu.service';
+import { MenuID } from '../../../menu/menu-id.model';
+import { MenuSection } from '../../../menu/menu-section.model';
+
+/**
+ * Represents a non-expandable section in the dso edit menus
+ */
+@Component({
+  selector: 'ds-dso-edit-menu-section',
+  templateUrl: './dso-edit-menu-section.component.html',
+  styleUrls: ['./dso-edit-menu-section.component.scss'],
+})
+@rendersSectionForMenu(MenuID.DSO_EDIT, false)
+export class DsoEditMenuSectionComponent extends MenuSectionComponent implements OnInit {
+
+  menuID: MenuID = MenuID.DSO_EDIT;
+  itemModel;
+  hasLink: boolean;
+  canActivate: boolean;
+
+  constructor(
+    @Inject('sectionDataProvider') menuSection: MenuSection,
+    protected menuService: MenuService,
+    protected injector: Injector,
+  ) {
+    super(menuSection, menuService, injector);
+    this.itemModel = menuSection.model;
+  }
+
+  ngOnInit(): void {
+    this.hasLink = isNotEmpty(this.itemModel?.link);
+    this.canActivate = isNotEmpty(this.itemModel?.function);
+    super.ngOnInit();
+  }
+
+  /**
+   * Activate the section's model funtion
+   */
+  public activate(event: any) {
+    event.preventDefault();
+    if (!this.itemModel.disabled) {
+      this.itemModel.function();
+    }
+    event.stopPropagation();
+  }
+}
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
new file mode 100644
index 0000000000..000da1678e
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.html
@@ -0,0 +1,6 @@
+<div class="dso-edit-menu d-flex">
+    <div *ngFor="let section of (sections | async)" class="ml-1">
+        <ng-container
+                *ngComponentOutlet="(sectionMap$ | async).get(section.id)?.component; injector: (sectionMap$ | async).get(section.id)?.injector;"></ng-container>
+    </div>
+</div>
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
new file mode 100644
index 0000000000..3b8adc35ef
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.spec.ts
@@ -0,0 +1,82 @@
+import {
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { MenuService } from '../../menu/menu.service';
+import { MenuItemModel } from '../../menu/menu-item/models/menu-item.model';
+import { getMockThemeService } from '../../mocks/theme-service.mock';
+import { AuthServiceStub } from '../../testing/auth-service.stub';
+import { MenuServiceStub } from '../../testing/menu-service.stub';
+import { ThemeService } from '../../theme-support/theme.service';
+import { DsoPageModule } from '../dso-page.module';
+import { DsoEditMenuComponent } from './dso-edit-menu.component';
+
+describe('DsoEditMenuComponent', () => {
+  let comp: DsoEditMenuComponent;
+  let fixture: ComponentFixture<DsoEditMenuComponent>;
+  const menuService = new MenuServiceStub();
+  let authorizationService: AuthorizationDataService;
+
+  const routeStub = {
+    children: [],
+  };
+
+  const section = {
+    id: 'edit-dso',
+    active: false,
+    visible: true,
+    model: {
+      type: null,
+      disabled: false,
+    } as MenuItemModel,
+    icon: 'pencil-alt',
+    index: 1,
+  };
+
+
+  beforeEach(waitForAsync(() => {
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true),
+    });
+    spyOn(menuService, 'getMenuTopSections').and.returnValue(observableOf([section]));
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule, DsoPageModule],
+      declarations: [DsoEditMenuComponent],
+      providers: [
+        Injector,
+        { provide: MenuService, useValue: menuService },
+        { provide: AuthService, useClass: AuthServiceStub },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        { provide: ThemeService, useValue: getMockThemeService() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsoEditMenuComponent);
+    comp = fixture.componentInstance;
+    comp.sections = observableOf([]);
+    fixture.detectChanges();
+  });
+
+  describe('onInit', () => {
+    it('should create', () => {
+      expect(comp).toBeTruthy();
+    });
+  });
+});
+
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
new file mode 100644
index 0000000000..457940f426
--- /dev/null
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu.component.ts
@@ -0,0 +1,38 @@
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
+
+import { MenuComponent } from '../../menu/menu.component';
+import { MenuService } from '../../menu/menu.service';
+import { MenuID } from '../../menu/menu-id.model';
+import { ThemeService } from '../../theme-support/theme.service';
+
+/**
+ * Component representing the edit menu and other menus on the dspace object pages
+ */
+@Component({
+  selector: 'ds-dso-edit-menu',
+  styleUrls: ['./dso-edit-menu.component.scss'],
+  templateUrl: './dso-edit-menu.component.html',
+})
+export class DsoEditMenuComponent extends MenuComponent {
+  /**
+   * The menu ID of this component is DSO_EDIT
+   * @type {MenuID.DSO_EDIT}
+   */
+  menuID = MenuID.DSO_EDIT;
+
+
+  constructor(protected menuService: MenuService,
+              protected injector: Injector,
+              public authorizationService: AuthorizationDataService,
+              public route: ActivatedRoute,
+              protected themeService: ThemeService,
+  ) {
+    super(menuService, injector, authorizationService, route, themeService);
+  }
+
+}
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html
deleted file mode 100644
index d680c140d8..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<a *ngIf="isAuthorized$ | async"
-   [routerLink]="[pageRoute, 'edit', 'metadata']"
-   class="edit-button btn btn-dark btn-sm"
-   [ngbTooltip]="tooltipMsg | translate"
-   role="button" [title]="tooltipMsg |translate" [attr.aria-label]="tooltipMsg |translate">
-  <i class="fas fa-pencil-alt fa-fw"></i>
-</a>
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts
deleted file mode 100644
index 5949a98f71..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DsoPageEditButtonComponent } from './dso-page-edit-button.component';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Item } from '../../../core/shared/item.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
-describe('DsoPageEditButtonComponent', () => {
-  let component: DsoPageEditButtonComponent;
-  let fixture: ComponentFixture<DsoPageEditButtonComponent>;
-
-  let authorizationService: AuthorizationDataService;
-  let dso: DSpaceObject;
-
-  beforeEach(waitForAsync(() => {
-    dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' }
-      }
-    });
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
-    });
-    TestBed.configureTestingModule({
-      declarations: [DsoPageEditButtonComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageEditButtonComponent);
-    component = fixture.componentInstance;
-    component.dso = dso;
-    component.pageRoute = 'test';
-    fixture.detectChanges();
-  });
-
-  it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanEditMetadata, dso.self);
-  });
-
-  describe('when the user is authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).not.toBeNull();
-    });
-  });
-
-  describe('when the user is not authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should not render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts b/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts
deleted file mode 100644
index 1879581d23..0000000000
--- a/src/app/shared/dso-page/dso-page-edit-button/dso-page-edit-button.component.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Observable } from 'rxjs';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-
-@Component({
-  selector: 'ds-dso-page-edit-button',
-  templateUrl: './dso-page-edit-button.component.html',
-  styleUrls: ['./dso-page-edit-button.component.scss']
-})
-/**
- * Display a button linking to the edit page of a DSpaceObject
- */
-export class DsoPageEditButtonComponent implements OnInit {
-  /**
-   * The DSpaceObject to display a button to the edit page for
-   */
-  @Input() dso: DSpaceObject;
-
-  /**
-   * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
-   */
-  @Input() pageRoute: string;
-
-  /**
-   * A message for the tooltip on the button
-   * Supports i18n keys
-   */
-  @Input() tooltipMsg: string;
-
-  /**
-   * Whether or not the current user is authorized to edit the DSpaceObject
-   */
-  isAuthorized$: Observable<boolean>;
-
-  constructor(protected authorizationService: AuthorizationDataService) { }
-
-  ngOnInit() {
-    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanEditMetadata, this.dso.self);
-  }
-
-}
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
deleted file mode 100644
index 305900ae33..0000000000
--- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<a *ngIf="isAuthorized | async"
-   [ngbTooltip]="'item.page.orcid.tooltip' | translate"
-   [routerLink]="[pageRoute, 'orcid']"
-   class="btn btn-dark btn-sm"
-   role="button" ><i class="fab fa-orcid fa-lg"></i>
-</a>
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts
deleted file mode 100644
index c70ec4b808..0000000000
--- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.spec.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { Item } from '../../../core/shared/item.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DsoPageOrcidButtonComponent } from './dso-page-orcid-button.component';
-
-describe('DsoPageOrcidButtonComponent', () => {
-  let component: DsoPageOrcidButtonComponent;
-  let fixture: ComponentFixture<DsoPageOrcidButtonComponent>;
-
-  let authorizationService: AuthorizationDataService;
-  let dso: DSpaceObject;
-
-  beforeEach(waitForAsync(() => {
-    dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' }
-      }
-    });
-    authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
-    });
-    TestBed.configureTestingModule({
-      declarations: [DsoPageOrcidButtonComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationService }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageOrcidButtonComponent);
-    component = fixture.componentInstance;
-    component.dso = dso;
-    component.pageRoute = 'test';
-    fixture.detectChanges();
-  });
-
-  it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanSynchronizeWithORCID, dso.self);
-  });
-
-  describe('when the user is authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(true));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).not.toBeNull();
-    });
-  });
-
-  describe('when the user is not authorized', () => {
-    beforeEach(() => {
-      (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(observableOf(false));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should not render a link', () => {
-      const link = fixture.debugElement.query(By.css('a'));
-      expect(link).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts b/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
deleted file mode 100644
index c345d8cbdc..0000000000
--- a/src/app/shared/dso-page/dso-page-orcid-button/dso-page-orcid-button.component.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { BehaviorSubject } from 'rxjs';
-import { take } from 'rxjs/operators';
-
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
-@Component({
-  selector: 'ds-dso-page-orcid-button',
-  templateUrl: './dso-page-orcid-button.component.html',
-  styleUrls: ['./dso-page-orcid-button.component.scss']
-})
-export class DsoPageOrcidButtonComponent implements OnInit {
- /**
-  * The DSpaceObject to display a button to the edit page for
-  */
- @Input() dso: DSpaceObject;
-
- /**
-  * The prefix of the route to the edit page (before the object's UUID, e.g. "items")
-  */
- @Input() pageRoute: string;
-
- /**
-  * Whether or not the current user is authorized to edit the DSpaceObject
-  */
- isAuthorized: BehaviorSubject<boolean> = new BehaviorSubject(false);
-
- constructor(protected authorizationService: AuthorizationDataService) { }
-
- ngOnInit() {
-   this.authorizationService.isAuthorized(FeatureID.CanSynchronizeWithORCID, this.dso.self).pipe(take(1)).subscribe((isAuthorized: boolean) => {
-    this.isAuthorized.next(isAuthorized);
-  });
- }
-
-}
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html
deleted file mode 100644
index 0e2e35dcb7..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<button *ngIf="isAuthorized$ | async"
-        class="edit-button btn btn-dark btn-sm"
-        (click)="createNewVersion()"
-        [disabled]="disableNewVersionButton$ | async"
-        [ngbTooltip]="tooltipMsg$ | async | translate"
-        role="button" [title]="tooltipMsg$ | async |translate" [attr.aria-label]="tooltipMsg$ | async | translate">
-  <i class="fas fa-code-branch fa-fw"></i>
-</button>
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss
deleted file mode 100644
index e8b7d689a3..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.btn-dark {
-  background-color: var(--ds-admin-sidebar-bg);
-}
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
deleted file mode 100644
index 9839507d57..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.spec.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DsoPageVersionButtonComponent } from './dso-page-version-button.component';
-import { Item } from '../../../core/shared/item.model';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Observable, of, of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { By } from '@angular/platform-browser';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-
-describe('DsoPageVersionButtonComponent', () => {
-  let component: DsoPageVersionButtonComponent;
-  let fixture: ComponentFixture<DsoPageVersionButtonComponent>;
-
-  let authorizationService: AuthorizationDataService;
-  let versionHistoryService: VersionHistoryDataService;
-
-  let dso: Item;
-  let tooltipMsg: Observable<string>;
-
-  const authorizationServiceSpy = jasmine.createSpyObj('authorizationService', ['isAuthorized']);
-
-  const versionHistoryServiceSpy = jasmine.createSpyObj('versionHistoryService',
-    ['getVersions', 'getLatestVersionFromHistory$', 'isLatest$', 'hasDraftVersion$']
-  );
-
-  beforeEach(waitForAsync(() => {
-    dso = Object.assign(new Item(), {
-      id: 'test-item',
-      _links: {
-        self: { href: 'test-item-selflink' },
-        version: { href: 'test-item-version-selflink' },
-      },
-    });
-    tooltipMsg = of('tooltip-msg');
-
-    TestBed.configureTestingModule({
-      declarations: [DsoPageVersionButtonComponent],
-      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationServiceSpy },
-        { provide: VersionHistoryDataService, useValue: versionHistoryServiceSpy },
-      ]
-    }).compileComponents();
-
-    authorizationService = TestBed.inject(AuthorizationDataService);
-    versionHistoryService = TestBed.inject(VersionHistoryDataService);
-
-    versionHistoryServiceSpy.hasDraftVersion$.and.returnValue(observableOf(true));
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(DsoPageVersionButtonComponent);
-    component = fixture.componentInstance;
-    component.dso = dso;
-    component.tooltipMsg$ = tooltipMsg;
-    fixture.detectChanges();
-  });
-
-  it('should check the authorization of the current user', () => {
-    expect(authorizationService.isAuthorized).toHaveBeenCalledWith(FeatureID.CanCreateVersion, dso.self);
-  });
-
-  it('should check if the item has a draft version', () => {
-    expect(versionHistoryServiceSpy.hasDraftVersion$).toHaveBeenCalledWith(dso._links.version.href);
-  });
-
-  describe('when the user is authorized', () => {
-    beforeEach(() => {
-      authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(true));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a button', () => {
-      const button = fixture.debugElement.query(By.css('button'));
-      expect(button).not.toBeNull();
-    });
-  });
-
-  describe('when the user is not authorized', () => {
-    beforeEach(() => {
-      authorizationServiceSpy.isAuthorized.and.returnValue(observableOf(false));
-      component.ngOnInit();
-      fixture.detectChanges();
-    });
-
-    it('should render a button', () => {
-      const button = fixture.debugElement.query(By.css('button'));
-      expect(button).toBeNull();
-    });
-  });
-
-});
diff --git a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts b/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts
deleted file mode 100644
index cf07953c75..0000000000
--- a/src/app/shared/dso-page/dso-page-version-button/dso-page-version-button.component.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { Observable, of } from 'rxjs';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
-import { Item } from '../../../core/shared/item.model';
-import { map, startWith, switchMap } from 'rxjs/operators';
-
-@Component({
-  selector: 'ds-dso-page-version-button',
-  templateUrl: './dso-page-version-button.component.html',
-  styleUrls: ['./dso-page-version-button.component.scss']
-})
-/**
- * Display a button linking to the edit page of a DSpaceObject
- */
-export class DsoPageVersionButtonComponent implements OnInit {
-  /**
-   * The item for which display a button to create a new version
-   */
-  @Input() dso: Item;
-
-  /**
-   * A message for the tooltip on the button
-   * Supports i18n keys
-   */
-  @Input() tooltipMsgCreate: string;
-
-  /**
-   * A message for the tooltip on the button (when is disabled)
-   * Supports i18n keys
-   */
-  @Input() tooltipMsgHasDraft: string;
-
-  /**
-   * Emits an event that triggers the creation of the new version
-   */
-  @Output() newVersionEvent = new EventEmitter();
-
-  /**
-   * Whether or not the current user is authorized to create a new version of the DSpaceObject
-   */
-  isAuthorized$: Observable<boolean>;
-
-  disableNewVersionButton$: Observable<boolean>;
-
-  tooltipMsg$: Observable<string>;
-
-  constructor(
-    protected authorizationService: AuthorizationDataService,
-    protected versionHistoryService: VersionHistoryDataService,
-  ) {
-  }
-
-  /**
-   * Creates a new version for the current item
-   */
-  createNewVersion() {
-    this.newVersionEvent.emit();
-  }
-
-  ngOnInit() {
-    this.isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanCreateVersion, this.dso.self);
-
-    this.disableNewVersionButton$ = this.versionHistoryService.hasDraftVersion$(this.dso._links.version.href).pipe(
-      // 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),
-    );
-
-    this.tooltipMsg$ = this.disableNewVersionButton$.pipe(
-      switchMap((hasDraftVersion) => of(hasDraftVersion ? this.tooltipMsgHasDraft : this.tooltipMsgCreate)),
-    );
-  }
-
-}
diff --git a/src/app/shared/dso-page/dso-page.module.ts b/src/app/shared/dso-page/dso-page.module.ts
new file mode 100644
index 0000000000..48a735156a
--- /dev/null
+++ b/src/app/shared/dso-page/dso-page.module.ts
@@ -0,0 +1,56 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import {
+  NgbDropdownModule,
+  NgbTooltipModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { DsoEditMenuExpandableSectionComponent } from '../dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component';
+import { DsoEditMenuComponent } from '../dso-page/dso-edit-menu/dso-edit-menu.component';
+import { DsoEditMenuSectionComponent } from '../dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component';
+
+const COMPONENTS = [
+  DsoEditMenuComponent,
+  DsoEditMenuSectionComponent,
+  DsoEditMenuExpandableSectionComponent,
+];
+
+const ENTRY_COMPONENTS = [
+];
+
+const MODULES = [
+  TranslateModule,
+  RouterModule,
+  CommonModule,
+  NgbTooltipModule,
+  NgbDropdownModule,
+];
+const PROVIDERS = [
+
+];
+
+@NgModule({
+  imports: [
+    ...MODULES,
+  ],
+  declarations: [
+    ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
+  ],
+  providers: [
+    ...PROVIDERS,
+    ...ENTRY_COMPONENTS,
+  ],
+  exports: [
+    ...COMPONENTS,
+  ],
+})
+
+/**
+ * This module handles all components, providers and modules that are needed for the menu
+ */
+export class DsoPageModule {
+
+}
diff --git a/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
new file mode 100644
index 0000000000..8f011580cf
--- /dev/null
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.spec.ts
@@ -0,0 +1,96 @@
+import { waitForAsync } from '@angular/core/testing';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { Item } from '../../../core/shared/item.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { Version } from '../../../core/shared/version.model';
+import { createRelationshipsObservable } from '../../../item-page/simple/item-types/shared/item.component.spec';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { DsoVersioningModalService } from './dso-versioning-modal.service';
+
+describe('DsoVersioningModalService', () => {
+  let service: DsoVersioningModalService;
+  let modalService;
+  let versionService;
+  let versionHistoryService;
+  let itemVersionShared;
+  let router;
+  let workspaceItemDataService;
+  let itemService;
+
+  const mockItem: Item = Object.assign(new Item(), {
+    bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+    metadata: new MetadataMap(),
+    relationships: createRelationshipsObservable(),
+    _links: {
+      self: {
+        href: 'item-href',
+      },
+      version: {
+        href: 'version-href',
+      },
+    },
+  });
+
+  beforeEach(waitForAsync(() => {
+    modalService = jasmine.createSpyObj('modalService', {
+      open: { componentInstance: { firstVersion: {}, versionNumber: {}, createVersionEvent: EMPTY } },
+    });
+    versionService = jasmine.createSpyObj('versionService', {
+      findByHref: createSuccessfulRemoteDataObject$<Version>(new Version()),
+    });
+    versionHistoryService = jasmine.createSpyObj('versionHistoryService', {
+      createVersion: createSuccessfulRemoteDataObject$<Version>(new Version()),
+      hasDraftVersion$: observableOf(false),
+    });
+    itemVersionShared = jasmine.createSpyObj('itemVersionShared', ['notifyCreateNewVersion']);
+    router = jasmine.createSpyObj('router', ['navigateByUrl']);
+    workspaceItemDataService = jasmine.createSpyObj('workspaceItemDataService', ['findByItem']);
+    itemService = jasmine.createSpyObj('itemService', ['findByHref']);
+
+    service = new DsoVersioningModalService(
+      modalService,
+      versionService,
+      versionHistoryService,
+      itemVersionShared,
+      router,
+      workspaceItemDataService,
+      itemService,
+    );
+  }));
+  describe('when onCreateNewVersion() is called', () => {
+    it('should call versionService.findByHref', () => {
+      service.openCreateVersionModal(mockItem);
+      expect(versionService.findByHref).toHaveBeenCalledWith('version-href');
+    });
+  });
+
+  describe('isNewVersionButtonDisabled', () => {
+    it('should call versionHistoryService.hasDraftVersion$', () => {
+      service.isNewVersionButtonDisabled(mockItem);
+      expect(versionHistoryService.hasDraftVersion$).toHaveBeenCalledWith(mockItem._links.version.href);
+    });
+  });
+
+  describe('getVersioningTooltipMessage', () => {
+    it('should return the create message when isNewVersionButtonDisabled returns false', (done) => {
+      spyOn(service, 'isNewVersionButtonDisabled').and.returnValue(observableOf(false));
+      service.getVersioningTooltipMessage(mockItem, 'draft-message', 'create-message').subscribe((message) => {
+        expect(message).toEqual('create-message');
+        done();
+      });
+    });
+    it('should return the draft message when isNewVersionButtonDisabled returns true', (done) => {
+      spyOn(service, 'isNewVersionButtonDisabled').and.returnValue(observableOf(true));
+      service.getVersioningTooltipMessage(mockItem, 'draft-message', 'create-message').subscribe((message) => {
+        expect(message).toEqual('draft-message');
+        done();
+      });
+    });
+  });
+});
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
new file mode 100644
index 0000000000..14161485eb
--- /dev/null
+++ b/src/app/shared/dso-page/dso-versioning-modal-service/dso-versioning-modal.service.ts
@@ -0,0 +1,111 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { VersionDataService } from '../../../core/data/version-data.service';
+import { VersionHistoryDataService } from '../../../core/data/version-history-data.service';
+import { Item } from '../../../core/shared/item.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { Version } from '../../../core/shared/version.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+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';
+
+/**
+ * Service to take care of all the functionality related to the version creation modal
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class DsoVersioningModalService {
+
+
+  constructor(
+    protected modalService: NgbModal,
+    protected versionService: VersionDataService,
+    protected versionHistoryService: VersionHistoryDataService,
+    protected itemVersionShared: ItemVersionsSharedService,
+    protected router: Router,
+    protected workspaceItemDataService: WorkspaceitemDataService,
+    protected itemService: ItemDataService,
+  ) {
+  }
+
+  /**
+   * Open the create version modal for the provided dso
+   */
+  openCreateVersionModal(dso): void {
+
+    const item = dso;
+    const versionHref = item._links.version.href;
+
+    // Open modal
+    const activeModal = this.modalService.open(ItemVersionsSummaryModalComponent);
+
+    // Show current version in modal
+    this.versionService.findByHref(versionHref).pipe(getFirstCompletedRemoteData()).subscribe((res: RemoteData<Version>) => {
+      // if res.hasNoContent then the item is unversioned
+      activeModal.componentInstance.firstVersion = res.hasNoContent;
+      activeModal.componentInstance.versionNumber = (res.hasNoContent ? undefined : res.payload.version);
+    });
+
+    // On createVersionEvent emitted create new version and notify
+    activeModal.componentInstance.createVersionEvent.pipe(
+      switchMap((summary: string) => this.versionHistoryService.createVersion(item._links.self.href, summary)),
+      getFirstCompletedRemoteData(),
+      // close model (should be displaying loading/waiting indicator) when version creation failed/succeeded
+      tap(() => activeModal.close()),
+      // show success/failure notification
+      tap((res: RemoteData<Version>) => {
+        this.itemVersionShared.notifyCreateNewVersion(res);
+      }),
+      // get workspace item
+      getFirstSucceededRemoteDataPayload<Version>(),
+      switchMap((newVersion: Version) => this.itemService.findByHref(newVersion._links.item.href)),
+      getFirstSucceededRemoteDataPayload<Item>(),
+      switchMap((newVersionItem: Item) => this.workspaceItemDataService.findByItem(newVersionItem.uuid, true, false)),
+      getFirstSucceededRemoteDataPayload<WorkspaceItem>(),
+    ).subscribe((wsItem) => {
+      const wsiId = wsItem.id;
+      const route = 'workspaceitems/' + wsiId + '/edit';
+      this.router.navigateByUrl(route);
+    });
+  }
+
+  /**
+   * Checks if the new version button should be disabled for the provided dso
+   */
+  isNewVersionButtonDisabled(dso): Observable<boolean> {
+    return this.versionHistoryService.hasDraftVersion$(dso._links.version.href).pipe(
+      // 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),
+    );
+  }
+
+  /**
+   * Checks and returns the tooltip that needs to be used for the create version button tooltip
+   */
+  getVersioningTooltipMessage(dso, tooltipMsgHasDraft, tooltipMsgCreate): Observable<string> {
+    return this.isNewVersionButtonDisabled(dso).pipe(
+      switchMap((hasDraftVersion) => of(hasDraftVersion ? tooltipMsgHasDraft : tooltipMsgCreate)),
+    );
+  }
+}
diff --git a/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
new file mode 100644
index 0000000000..c52b435af4
--- /dev/null
+++ b/src/app/shared/dso-page/dso-withdrawn-reinstate-service/dso-withdrawn-reinstate-modal.service.ts
@@ -0,0 +1,99 @@
+import { Injectable } from '@angular/core';
+import { Router } from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { take } from 'rxjs/operators';
+import { Item } from 'src/app/core/shared/item.model';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { ItemDataService } from '../../../core/data/item-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { QualityAssuranceEventDataService } from '../../../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceEventObject } from '../../../core/notifications/qa/models/quality-assurance-event.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ItemWithdrawnReinstateModalComponent } from '../../correction-suggestion/withdrawn-reinstate-modal.component';
+import { NotificationsService } from '../../notifications/notifications.service';
+
+export const REQUEST_WITHDRAWN = 'REQUEST/WITHDRAWN';
+export const REQUEST_REINSTATE = 'REQUEST/REINSTATE';
+
+@Injectable({
+  providedIn: 'root',
+})
+/**
+ * Service for managing the withdrawn/reinstate modal for a DSO.
+ */
+export class DsoWithdrawnReinstateModalService {
+
+  constructor(
+    protected router: Router,
+    protected modalService: NgbModal,
+    protected itemService: ItemDataService,
+    private notificationsService: NotificationsService,
+    protected authorizationService: AuthorizationDataService,
+    private translateService: TranslateService,
+    protected qaEventDataService: QualityAssuranceEventDataService,
+  ) {}
+
+  /**
+   * Open the create withdrawn modal for the provided dso
+   */
+  openCreateWithdrawnReinstateModal(dso: Item, correctionType: 'request-reinstate' | 'request-withdrawn', state: boolean): void {
+    const target = dso.id;
+    // Open modal
+    const activeModal = this.modalService.open(ItemWithdrawnReinstateModalComponent);
+    (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).setWithdraw(state);
+    (activeModal.componentInstance as ItemWithdrawnReinstateModalComponent).createQAEvent
+      .pipe(
+        take(1),
+      ).subscribe(
+        (reasone) => {
+          this.sendQARequest(target, correctionType, reasone);
+          activeModal.close();
+        },
+      );
+  }
+
+  /**
+   * Sends a quality assurance request.
+   *
+   * @param target - The target - the item's UUID.
+   * @param correctionType - The type of correction.
+   * @param reason - The reason for the request.
+   * Reloads the current page in order to update the withdrawn/reinstate button.
+   * and desplay a notification box.
+   */
+  sendQARequest(target: string, correctionType: 'request-reinstate' | 'request-withdrawn', reason: string): void {
+    this.qaEventDataService.postData(target, correctionType, '', reason)
+      .pipe (
+        getFirstCompletedRemoteData(),
+      )
+      .subscribe((res: RemoteData<QualityAssuranceEventObject>) => {
+        if (res.hasSucceeded) {
+          const message = (correctionType === 'request-withdrawn')
+            ? 'correction-type.manage-relation.action.notification.withdrawn'
+            : 'correction-type.manage-relation.action.notification.reinstate';
+
+          this.notificationsService.success(this.translateService.get(message));
+          this.authorizationService.invalidateAuthorizationsRequestCache();
+          this.reloadPage(true);
+        } else {
+          this.notificationsService.error(this.translateService.get('correction-type.manage-relation.action.notification.error'));
+        }
+      });
+  }
+
+  /**
+   * Reloads the current page or navigates to a specified URL.
+   * @param self - A boolean indicating whether to reload the current page (true) or navigate to a specified URL (false).
+   * @param urlToNavigateTo - The URL to navigate to if `self` is false.
+   * skipLocationChange:true means dont update the url to / when navigating
+   */
+  reloadPage(self: boolean, urlToNavigateTo?: string) {
+    const url = self ? this.router.url : urlToNavigateTo;
+    this.router.navigateByUrl('/', { skipLocationChange: true }).then(() => {
+      this.router.navigate([`/${url}`]);
+    });
+  }
+}
+
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
deleted file mode 100644
index c4bba286bf..0000000000
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<button *ngIf="(isClaimable() | async)"
-        [ngbTooltip]="'item.page.claim.tooltip' | translate"
-        class="edit-button btn btn-dark btn-sm"
-        data-test="item-claim"
-        (click)="claim()">
-  {{'item.page.claim.button' | translate }}
-</button>
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
deleted file mode 100644
index 5d589187b9..0000000000
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { PersonPageClaimButtonComponent } from './person-page-claim-button.component';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
-import { RouteService } from '../../../core/services/route.service';
-import { routeServiceStub } from '../../testing/route-service.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-
-describe('PersonPageClaimButtonComponent', () => {
-  let scheduler: TestScheduler;
-  let component: PersonPageClaimButtonComponent;
-  let fixture: ComponentFixture<PersonPageClaimButtonComponent>;
-
-  const mockItem: Item = Object.assign(new Item(), {
-    metadata: {
-      'person.email': [
-        {
-          language: 'en_US',
-          value: 'fake@email.com'
-        }
-      ],
-      'person.birthDate': [
-        {
-          language: 'en_US',
-          value: '1993'
-        }
-      ],
-      'person.jobTitle': [
-        {
-          language: 'en_US',
-          value: 'Developer'
-        }
-      ],
-      'person.familyName': [
-        {
-          language: 'en_US',
-          value: 'Doe'
-        }
-      ],
-      'person.givenName': [
-        {
-          language: 'en_US',
-          value: 'John'
-        }
-      ]
-    },
-    _links: {
-      self: {
-        href: 'item-href'
-      }
-    }
-  });
-
-  const mockResearcherProfile: ResearcherProfile = Object.assign(new ResearcherProfile(), {
-    id: 'test-id',
-    visible: true,
-    type: 'profile',
-    _links: {
-      item: {
-        href: 'https://rest.api/rest/api/profiles/test-id/item'
-      },
-      self: {
-        href: 'https://rest.api/rest/api/profiles/test-id'
-      },
-    }
-  });
-
-  const notificationsService = new NotificationsServiceStub();
-
-  const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: jasmine.createSpy('isAuthorized')
-  });
-
-  const researcherProfileService = jasmine.createSpyObj('researcherProfileService', {
-    createFromExternalSource: jasmine.createSpy('createFromExternalSource'),
-    findRelatedItemId: jasmine.createSpy('findRelatedItemId'),
-  });
-
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
-      ],
-      declarations: [PersonPageClaimButtonComponent],
-      providers: [
-        { provide: AuthorizationDataService, useValue: authorizationDataService },
-        { provide: NotificationsService, useValue: notificationsService },
-        { provide: ResearcherProfileDataService, useValue: researcherProfileService },
-        { provide: RouteService, useValue: routeServiceStub },
-      ]
-    })
-      .compileComponents();
-  });
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(PersonPageClaimButtonComponent);
-    component = fixture.componentInstance;
-    component.object = mockItem;
-  });
-
-  describe('when item can be claimed', () => {
-    beforeEach(() => {
-      authorizationDataService.isAuthorized.and.returnValue(observableOf(true));
-      researcherProfileService.createFromExternalSource.calls.reset();
-      researcherProfileService.findRelatedItemId.calls.reset();
-      fixture.detectChanges();
-    });
-
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
-    it('should create claim button', () => {
-      const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]'));
-      expect(btn).toBeTruthy();
-    });
-
-    describe('claim', () => {
-      describe('when successfully', () => {
-        beforeEach(() => {
-          scheduler = getTestScheduler();
-          researcherProfileService.createFromExternalSource.and.returnValue(createSuccessfulRemoteDataObject$(mockResearcherProfile));
-          researcherProfileService.findRelatedItemId.and.returnValue(observableOf('test-id'));
-        });
-
-        it('should display success notification', () => {
-          scheduler.schedule(() => component.claim());
-          scheduler.flush();
-
-          expect(researcherProfileService.findRelatedItemId).toHaveBeenCalled();
-          expect(notificationsService.success).toHaveBeenCalled();
-        });
-      });
-
-      describe('when not successfully', () => {
-        beforeEach(() => {
-          scheduler = getTestScheduler();
-          researcherProfileService.createFromExternalSource.and.returnValue(createFailedRemoteDataObject$());
-        });
-
-        it('should display success notification', () => {
-          scheduler.schedule(() => component.claim());
-          scheduler.flush();
-
-          expect(researcherProfileService.findRelatedItemId).not.toHaveBeenCalled();
-          expect(notificationsService.error).toHaveBeenCalled();
-        });
-      });
-    });
-
-  });
-
-  describe('when item cannot be claimed', () => {
-    beforeEach(() => {
-      authorizationDataService.isAuthorized.and.returnValue(observableOf(false));
-      fixture.detectChanges();
-    });
-
-    it('should create', () => {
-      expect(component).toBeTruthy();
-    });
-
-    it('should create claim button', () => {
-      const btn = fixture.debugElement.query(By.css('[data-test="item-claim"]'));
-      expect(btn).toBeFalsy();
-    });
-
-  });
-});
diff --git a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts b/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
deleted file mode 100644
index f0071d0a41..0000000000
--- a/src/app/shared/dso-page/person-page-claim-button/person-page-claim-button.component.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { mergeMap, take } from 'rxjs/operators';
-import { TranslateService } from '@ngx-translate/core';
-
-import { RouteService } from '../../../core/services/route.service';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { ResearcherProfileDataService } from '../../../core/profile/researcher-profile-data.service';
-import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { RemoteData } from '../../../core/data/remote-data';
-import { ResearcherProfile } from '../../../core/profile/model/researcher-profile.model';
-import { isNotEmpty } from '../../empty.util';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-
-@Component({
-  selector: 'ds-person-page-claim-button',
-  templateUrl: './person-page-claim-button.component.html',
-  styleUrls: ['./person-page-claim-button.component.scss']
-})
-export class PersonPageClaimButtonComponent implements OnInit {
-
-  /**
-   * The target person item to claim
-   */
-  @Input() object: DSpaceObject;
-
-  /**
-   * A boolean representing if item can be claimed or not
-   */
-  claimable$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
-
-  constructor(protected routeService: RouteService,
-              protected authorizationService: AuthorizationDataService,
-              protected notificationsService: NotificationsService,
-              protected translate: TranslateService,
-              protected researcherProfileService: ResearcherProfileDataService) {
-  }
-
-  ngOnInit(): void {
-    this.authorizationService.isAuthorized(FeatureID.CanClaimItem, this.object._links.self.href, null, false).pipe(
-      take(1)
-    ).subscribe((isAuthorized: boolean) => {
-      this.claimable$.next(isAuthorized);
-    });
-
-  }
-
-  /**
-   * Create a new researcher profile claiming the current item.
-   */
-  claim() {
-    this.researcherProfileService.createFromExternalSource(this.object._links.self.href).pipe(
-      getFirstCompletedRemoteData(),
-      mergeMap((rd: RemoteData<ResearcherProfile>) => {
-        if (rd.hasSucceeded) {
-          return this.researcherProfileService.findRelatedItemId(rd.payload);
-        } else {
-          return observableOf(null);
-        }
-      }))
-      .subscribe((id: string) => {
-        if (isNotEmpty(id)) {
-          this.notificationsService.success(this.translate.get('researcherprofile.success.claim.title'),
-            this.translate.get('researcherprofile.success.claim.body'));
-          this.claimable$.next(false);
-        } else {
-          this.notificationsService.error(
-            this.translate.get('researcherprofile.error.claim.title'),
-            this.translate.get('researcherprofile.error.claim.body'));
-        }
-      });
-  }
-
-  /**
-   * Returns true if the item is claimable, false otherwise.
-   */
-  isClaimable(): Observable<boolean> {
-    return this.claimable$;
-  }
-
-}
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
index b46df8ff36..223d56f8ab 100644
--- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.spec.ts
@@ -1,16 +1,21 @@
-import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { CollectionDataService } from '../../../../core/data/collection-data.service';
-import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
-import { createPaginatedList } from '../../../testing/utils.test';
 import { Collection } from '../../../../core/shared/collection.model';
 import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { NotificationsService } from '../../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
+import { VarDirective } from '../../../utils/var.directive';
+import { AuthorizedCollectionSelectorComponent } from './authorized-collection-selector.component';
 
 describe('AuthorizedCollectionSelectorComponent', () => {
   let component: AuthorizedCollectionSelectorComponent;
@@ -23,11 +28,11 @@ describe('AuthorizedCollectionSelectorComponent', () => {
 
   beforeEach(waitForAsync(() => {
     collection = Object.assign(new Collection(), {
-      id: 'authorized-collection'
+      id: 'authorized-collection',
     });
     collectionService = jasmine.createSpyObj('collectionService', {
       getAuthorizedCollection: createSuccessfulRemoteDataObject$(createPaginatedList([collection])),
-      getAuthorizedCollectionByEntityType: createSuccessfulRemoteDataObject$(createPaginatedList([collection]))
+      getAuthorizedCollectionByEntityType: createSuccessfulRemoteDataObject$(createPaginatedList([collection])),
     });
     notificationsService = jasmine.createSpyObj('notificationsService', ['error']);
     TestBed.configureTestingModule({
@@ -38,7 +43,7 @@ describe('AuthorizedCollectionSelectorComponent', () => {
         { provide: CollectionDataService, useValue: collectionService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -52,10 +57,10 @@ describe('AuthorizedCollectionSelectorComponent', () => {
   describe('search', () => {
     describe('when has no entity type', () => {
       it('should call getAuthorizedCollection and return the authorized collection in a SearchResult', (done) => {
-      component.search('', 1).subscribe((resultRD) => {
+        component.search('', 1).subscribe((resultRD) => {
           expect(collectionService.getAuthorizedCollection).toHaveBeenCalled();
-        expect(resultRD.payload.page.length).toEqual(1);
-        expect(resultRD.payload.page[0].indexableObject).toEqual(collection);
+          expect(resultRD.payload.page.length).toEqual(1);
+          expect(resultRD.payload.page[0].indexableObject).toEqual(collection);
           done();
         });
       });
diff --git a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
index ab48d058ca..973febf97d 100644
--- a/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component.ts
@@ -1,27 +1,34 @@
-import { Component, Input } from '@angular/core';
-import { DSOSelectorComponent } from '../dso-selector.component';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { map } from 'rxjs/operators';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { SearchResult } from '../../../search/models/search-result.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { buildPaginatedList, PaginatedList } from '../../../../core/data/paginated-list.model';
-import { followLink } from '../../../utils/follow-link-config.model';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../../core/data/collection-data.service';
+import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { hasValue } from '../../../empty.util';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { Collection } from '../../../../core/shared/collection.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { SearchResult } from '../../../search/models/search-result.model';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { DSOSelectorComponent } from '../dso-selector.component';
 
 @Component({
   selector: 'ds-authorized-collection-selector',
   styleUrls: ['../dso-selector.component.scss'],
-  templateUrl: '../dso-selector.component.html'
+  templateUrl: '../dso-selector.component.html',
 })
 /**
  * Component rendering a list of collections to select from
@@ -53,12 +60,13 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
    * Perform a search for authorized collections with 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): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+  search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
     let searchListService$: Observable<RemoteData<PaginatedList<Collection>>> = null;
     const findOptions: FindListOptions = {
       currentPage: page,
-      elementsPerPage: this.defaultPagination.pageSize
+      elementsPerPage: this.defaultPagination.pageSize,
     };
 
     if (this.entityType) {
@@ -69,13 +77,13 @@ export class AuthorizedCollectionSelectorComponent extends DSOSelectorComponent
           findOptions);
     } else {
       searchListService$ = this.collectionDataService
-        .getAuthorizedCollection(query, findOptions, true, false, followLink('parentCommunity'));
+        .getAuthorizedCollection(query, findOptions, useCache, false, followLink('parentCommunity'));
     }
     return searchListService$.pipe(
       getFirstCompletedRemoteData(),
       map((rd) => Object.assign(new RemoteData(null, null, null, null), rd, {
         payload: hasValue(rd.payload) ? buildPaginatedList(rd.payload.pageInfo, rd.payload.page.map((col) => Object.assign(new CollectionSearchResult(), { indexableObject: col }))) : null,
-      }))
+      })),
     );
   }
 }
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 8abb8ad558..97a5a554a0 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,6 +2,7 @@
     <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>
@@ -16,17 +17,17 @@
     (scrolled)="onScrollDown()">
     <ng-container *ngIf="listEntries$ | async">
       <button class="list-group-item list-group-item-action border-0 disabled"
-              *ngIf="(listEntries$ | async).length == 0">
+              *ngIf="(listEntries$ | async).length === 0">
         {{'dso-selector.no-results' | translate: { type: typesString } }}
       </button>
       <button *ngFor="let listEntry of (listEntries$ | async)"
               class="list-group-item list-group-item-action border-0 list-entry"
-              [ngClass]="{'bg-primary': listEntry.indexableObject.id === currentDSOId}"
+              [ngClass]="{'bg-primary': listEntry['id'] === currentDSOId}"
               title="{{ getName(listEntry) }}"
               dsHoverClass="ds-hover"
-              (click)="onSelect.emit(listEntry.indexableObject)" #listEntryElement>
+              (click)="onClick(listEntry)" #listEntryElement>
         <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
-                                             [linkType]=linkTypes.None [context]="getContext(listEntry.indexableObject.id)"></ds-listable-object-component-loader>
+                                             [linkType]=linkTypes.None [context]="getContext(listEntry['id'])"></ds-listable-object-component-loader>
       </button>
     </ng-container>
     <button *ngIf="loading"
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
index 7c28859388..c41a9beca2 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.spec.ts
@@ -1,16 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { DSOSelectorComponent } from './dso-selector.component';
-import { SearchService } from '../../../core/shared/search/search.service';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../core/shared/item.model';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { hasValue } from '../../empty.util';
-import { createPaginatedList } from '../../testing/utils.test';
 import { NotificationsService } from '../../notifications/notifications.service';
+import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
+import { createPaginatedList } from '../../testing/utils.test';
+import { DSOSelectorComponent } from './dso-selector.component';
 
 describe('DSOSelectorComponent', () => {
   let component: DSOSelectorComponent;
@@ -34,7 +49,7 @@ describe('DSOSelectorComponent', () => {
   ];
 
   const searchService = {
-    search: (options: PaginatedSearchOptions) => {
+    search: (options: PaginatedSearchOptions, responseMsToLive?: number, useCachedVersionIfAvailable = true) => {
       if (hasValue(options.query) && options.query.startsWith('search.resourceid')) {
         return createSuccessfulRemoteDataObject$(createPaginatedList([searchResult]));
       } else if (options.pagination.currentPage === 1) {
@@ -42,7 +57,7 @@ describe('DSOSelectorComponent', () => {
       } else {
         return createSuccessfulRemoteDataObject$(createPaginatedList(nextPageResults));
       }
-    }
+    },
   };
 
   function createSearchResult(name: string): ItemSearchResult {
@@ -52,11 +67,11 @@ describe('DSOSelectorComponent', () => {
         metadata: {
           'dc.title': [
             {
-              value: `test result - ${name}`
-            }
-          ]
-        }
-      })
+              value: `test result - ${name}`,
+            },
+          ],
+        },
+      }),
     });
   }
 
@@ -72,7 +87,7 @@ describe('DSOSelectorComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: NotificationsService, useValue: notificationsService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -120,6 +135,43 @@ describe('DSOSelectorComponent', () => {
     });
   });
 
+  describe('search', () => {
+    beforeEach(() => {
+      spyOn(searchService, 'search').and.callThrough();
+    });
+
+    it('should specify how to sort if no query is given', () => {
+      component.sort = new SortOptions('dc.title', SortDirection.ASC);
+      component.search(undefined, 0);
+
+      expect(searchService.search).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          query: undefined,
+          sort: jasmine.objectContaining({
+            field: 'dc.title',
+            direction: SortDirection.ASC,
+          }),
+        }),
+        null,
+        true,
+      );
+    });
+
+    it('should not specify how to sort if a query is given', () => {
+      component.sort = new SortOptions('dc.title', SortDirection.ASC);
+      component.search('testQuery', 0);
+
+      expect(searchService.search).toHaveBeenCalledWith(
+        jasmine.objectContaining({
+          query: 'testQuery',
+          sort: null,
+        }),
+        null,
+        true,
+      );
+    });
+  });
+
   describe('when search returns an error', () => {
     beforeEach(() => {
       spyOn(searchService, 'search').and.returnValue(createFailedRemoteDataObject$());
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 0c799369ef..58ce2ed3aa 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
@@ -7,39 +7,60 @@ import {
   OnInit,
   Output,
   QueryList,
-  ViewChildren
+  ViewChildren,
 } from '@angular/core';
-import { FormControl } from '@angular/forms';
-
+import { UntypedFormControl } from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { debounceTime, map, startWith, switchMap, tap } from 'rxjs/operators';
+import {
+  debounceTime,
+  map,
+  startWith,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
 
-import { SearchService } from '../../../core/shared/search/search.service';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
-import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { Context } from '../../../core/shared/context.model';
-import { getFirstCompletedRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { hasNoValue, hasValue, isEmpty, isNotEmpty } from '../../empty.util';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { SearchResult } from '../../search/models/search-result.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
+import { NotificationType } from '../../notifications/models/notification-type';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { ListableNotificationObject } from '../../object-list/listable-notification-object/listable-notification-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from '../../object-list/listable-notification-object/listable-notification-object.resource-type';
+import { PaginatedSearchOptions } from '../../search/models/paginated-search-options.model';
+import { SearchResult } from '../../search/models/search-result.model';
 
 @Component({
   selector: 'ds-dso-selector',
   styleUrls: ['./dso-selector.component.scss'],
-  templateUrl: './dso-selector.component.html'
+  templateUrl: './dso-selector.component.html',
 })
 
 /**
@@ -61,6 +82,16 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   @Input() types: DSpaceObjectType[];
 
+  /**
+   * The sorting options
+   */
+  @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;
 
@@ -72,7 +103,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * Input form control to query the list
    */
-  public input: FormControl = new FormControl();
+  public input: UntypedFormControl = new UntypedFormControl();
 
   /**
    * Default pagination for this feature
@@ -82,7 +113,7 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
   /**
    * List with search results of DSpace objects for the current query
    */
-  listEntries$: BehaviorSubject<SearchResult<DSpaceObject>[]> = new BehaviorSubject(null);
+  listEntries$: BehaviorSubject<ListableObject[]> = new BehaviorSubject(null);
 
   /**
    * The current page to load
@@ -116,11 +147,6 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    */
   linkTypes = CollectionElementLinkType;
 
-  /**
-   * Track whether the element has the mouse over it
-   */
-  isMouseOver = false;
-
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
@@ -156,9 +182,9 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
       this.input.valueChanges.pipe(
         debounceTime(this.debounceTime),
         startWith(''),
-        tap(() => this.currentPage$.next(1))
+        tap(() => this.currentPage$.next(1)),
       ),
-      this.currentPage$
+      this.currentPage$,
     ).pipe(
       switchMap(([currentDSOResult, query, page]: [PaginatedList<SearchResult<DSpaceObject>>, string, number]) => {
         this.loading = true;
@@ -173,33 +199,37 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
               // If no query is entered, filter out the current DSO from the results, as it'll be displayed at the start of the list already
               rd.payload.page = [
                 ...((isEmpty(query) && page === 1) ? currentDSOResult.page : []),
-                ...rd.payload.page.filter((result) => isNotEmpty(query) || result.indexableObject.id !== this.currentDSOId)
+                ...rd.payload.page.filter((result) => isNotEmpty(query) || result.indexableObject.id !== this.currentDSOId),
               ];
             } else if (rd.hasFailed) {
               this.notifcationsService.error(this.translate.instant('dso-selector.error.title', { type: this.typesString }), rd.errorMessage);
             }
             return rd;
-          })
+          }),
         );
-      })
-    ).subscribe((rd) => {
-      this.loading = false;
-      if (rd.hasSucceeded) {
-        const currentEntries = this.listEntries$.getValue();
-        if (hasNoValue(currentEntries)) {
-          this.listEntries$.next(rd.payload.page);
-        } else {
-          this.listEntries$.next([...currentEntries, ...rd.payload.page]);
-        }
-        // Check if there are more pages available after the current one
-        this.hasNextPage = rd.payload.totalElements > this.listEntries$.getValue().length;
-      } else {
-        this.listEntries$.next(null);
-        this.hasNextPage = false;
-      }
+      }),
+    ).subscribe((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => {
+      this.updateList(rd);
     }));
   }
 
+  updateList(rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) {
+    this.loading = false;
+    const currentEntries = this.listEntries$.getValue();
+    if (rd.hasSucceeded) {
+      if (hasNoValue(currentEntries)) {
+        this.listEntries$.next(rd.payload.page);
+      } else {
+        this.listEntries$.next([...currentEntries, ...rd.payload.page]);
+      }
+      // Check if there are more pages available after the current one
+      this.hasNextPage = rd.payload.totalElements > this.listEntries$.getValue().length;
+    } else {
+      this.listEntries$.next([...(hasNoValue(currentEntries) ? [] : this.listEntries$.getValue()), new ListableNotificationObject(NotificationType.Error, 'dso-selector.results-could-not-be-retrieved', LISTABLE_NOTIFICATION_OBJECT.value)]);
+      this.hasNextPage = false;
+    }
+  }
+
   /**
    * Get a query to send for retrieving the current DSO
    */
@@ -211,18 +241,24 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
    * 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): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+  search(query: string, page: number, useCache: boolean = true): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+    // default sort is only used when there is not query
+    const efectiveSort = query ? null : this.sort;
     return this.searchService.search(
       new PaginatedSearchOptions({
         query: query,
         dsoTypes: this.types,
         pagination: Object.assign({}, this.defaultPagination, {
-          currentPage: page
-        })
-      })
+          currentPage: page,
+        }),
+        sort: efectiveSort,
+      }),
+      null,
+      useCache,
     ).pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     );
   }
 
@@ -262,7 +298,28 @@ export class DSOSelectorComponent implements OnInit, OnDestroy {
     this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
-  getName(searchResult: SearchResult<DSpaceObject>): string {
-    return this.dsoNameService.getName(searchResult.indexableObject);
+  /**
+   * Handles the user clicks on the {@link ListableObject}s. When the {@link listableObject} is a
+   * {@link ListableObject} it will retry the error when the user clicks it. Otherwise it will emit the {@link onSelect}.
+   *
+   * @param listableObject The {@link ListableObject} to evaluate
+   */
+  onClick(listableObject: ListableObject): void {
+    if (hasValue((listableObject as SearchResult<DSpaceObject>).indexableObject)) {
+      this.onSelect.emit((listableObject as SearchResult<DSpaceObject>).indexableObject);
+    } else {
+      this.listEntries$.value.pop();
+      this.hasNextPage = true;
+      this.search(this.input.value ? this.input.value : '', this.currentPage$.value, false).pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => {
+        this.updateList(rd);
+      });
+    }
+  }
+
+  getName(listableObject: ListableObject): string {
+    return hasValue((listableObject as SearchResult<DSpaceObject>).indexableObject) ?
+      this.dsoNameService.getName((listableObject as SearchResult<DSpaceObject>).indexableObject) : null;
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
index a12f2587be..01ee6b966b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../../core/shared/community.model';
-import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 
 describe('CreateCollectionParentSelectorComponent', () => {
   let component: CreateCollectionParentSelectorComponent;
@@ -20,8 +31,8 @@ describe('CreateCollectionParentSelectorComponent', () => {
     'dc.title': [
       Object.assign(new MetadataValue(), {
         value: 'Community title',
-        language: undefined
-      })]
+        language: undefined,
+      })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -43,14 +54,14 @@ describe('CreateCollectionParentSelectorComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 8b38b62378..ca8761b677 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,14 +1,29 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
 import {
-    getCollectionCreateRoute,
-    COLLECTION_PARENT_PARAMETER
-} from '../../../../collection-page/collection-page-routing-paths';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
+import { environment } from '../../../../../environments/environment';
+import {
+  COLLECTION_PARENT_PARAMETER,
+  getCollectionCreateRoute,
+} from '../../../../collection-page/collection-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 /**
  * Component to wrap a list of existing communities inside a modal
  * Used to choose a community from to create a new collection in
@@ -23,6 +38,7 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
   header = 'dso-selector.create.collection.sub-level';
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
@@ -35,7 +51,7 @@ export class CreateCollectionParentSelectorComponent extends DSOSelectorModalWra
     const navigationExtras: NavigationExtras = {
       queryParams: {
         [COLLECTION_PARENT_PARAMETER]: dso.uuid,
-      }
+      },
     };
     this.router.navigate([getCollectionCreateRoute()], navigationExtras);
   }
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
index d90cd0ac0d..ced155cdda 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component.ts
@@ -1,28 +1,29 @@
-import {Component} from '@angular/core';
-import {CreateCollectionParentSelectorComponent} from './create-collection-parent-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { CreateCollectionParentSelectorComponent } from './create-collection-parent-selector.component';
 
 /**
  * Themed wrapper for CreateCollectionParentSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-create-collection-parent-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-create-collection-parent-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedCreateCollectionParentSelectorComponent
-    extends ThemedComponent<CreateCollectionParentSelectorComponent> {
+  extends ThemedComponent<CreateCollectionParentSelectorComponent> {
 
-    protected getComponentName(): string {
-        return 'CreateCollectionParentSelectorComponent';
-    }
+  protected getComponentName(): string {
+    return 'CreateCollectionParentSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./create-collection-parent-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./create-collection-parent-selector.component');
+  }
 
 }
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 84fdd34c01..8ae146b42c 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
@@ -6,14 +6,14 @@
     </div>
     <div class="modal-body">
         <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">or</span>
+                <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
             </div>
-        </h3>
+        </div>
 
-        <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <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..fbf888ba60 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
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+
 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 { RouterStub } from '../../../testing/router.stub';
+import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 
 describe('CreateCommunityParentSelectorComponent', () => {
   let component: CreateCommunityParentSelectorComponent;
@@ -19,8 +30,8 @@ describe('CreateCommunityParentSelectorComponent', () => {
   community.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Community title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -42,14 +53,14 @@ describe('CreateCommunityParentSelectorComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
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 a7f583df50..900c88f708 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
@@ -1,17 +1,30 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { hasValue } from '../../../empty.util';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { environment } from '../../../../../environments/environment';
+import {
+  COMMUNITY_PARENT_PARAMETER,
+  getCommunityCreateRoute,
+} from '../../../../community-page/community-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { hasValue } from '../../../empty.util';
 import {
   DSOSelectorModalWrapperComponent,
-  SelectorActionType
+  SelectorActionType,
 } from '../dso-selector-modal-wrapper.component';
-import {
-    getCommunityCreateRoute,
-    COMMUNITY_PARENT_PARAMETER
-} from '../../../../community-page/community-page-routing-paths';
 
 /**
  * Component to wrap a button - for top communities -
@@ -29,6 +42,7 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
   objectType = DSpaceObjectType.COMMUNITY;
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.CREATE;
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
@@ -43,7 +57,7 @@ export class CreateCommunityParentSelectorComponent extends DSOSelectorModalWrap
       navigationExtras = {
         queryParams: {
           [COMMUNITY_PARENT_PARAMETER]: dso.uuid,
-        }
+        },
       };
     }
     this.router.navigate([getCommunityCreateRoute()], navigationExtras);
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
index 24bff97254..bbf9db5247 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {CreateCommunityParentSelectorComponent} from './create-community-parent-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { CreateCommunityParentSelectorComponent } from './create-community-parent-selector.component';
 
 /**
  * Themed wrapper for CreateCommunityParentSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-create-community-parent-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-create-community-parent-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedCreateCommunityParentSelectorComponent
-    extends ThemedComponent<CreateCommunityParentSelectorComponent> {
-    protected getComponentName(): string {
-        return 'CreateCommunityParentSelectorComponent';
-    }
+  extends ThemedComponent<CreateCommunityParentSelectorComponent> {
+  protected getComponentName(): string {
+    return 'CreateCommunityParentSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./create-community-parent-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./create-community-parent-selector.component');
+  }
 
 }
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/create-item-parent-selector/create-item-parent-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
index 90bd07c52b..174fd402f4 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Collection } from '../../../../core/shared/collection.model';
-import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component';
 
 describe('CreateItemParentSelectorComponent', () => {
   let component: CreateItemParentSelectorComponent;
@@ -19,8 +30,8 @@ describe('CreateItemParentSelectorComponent', () => {
   collection.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Collection title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const collectionRD = createSuccessfulRemoteDataObject(collection);
@@ -41,14 +52,14 @@ describe('CreateItemParentSelectorComponent', () => {
                   dso: collectionRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index b109be0af2..1b7bcb308b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,9 +1,26 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
+
+import { environment } from '../../../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing collections inside a modal
@@ -14,13 +31,14 @@ import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-sel
   selector: 'ds-create-item-parent-selector',
   // styleUrls: ['./create-item-parent-selector.component.scss'],
   // templateUrl: '../dso-selector-modal-wrapper.component.html',
-  templateUrl: './create-item-parent-selector.component.html'
+  templateUrl: './create-item-parent-selector.component.html',
 })
 export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.CREATE;
   header = 'dso-selector.create.item.sub-level';
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   /**
    * If present this value is used to filter collection list by entity type
@@ -38,7 +56,7 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo
     const navigationExtras: NavigationExtras = {
       queryParams: {
         ['collection']: dso.uuid,
-      }
+      },
     };
     if (this.entityType) {
       navigationExtras.queryParams.entityType = this.entityType;
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
index 49209ea63b..271c13b097 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component.ts
@@ -1,31 +1,35 @@
-import {Component, Input} from '@angular/core';
-import {CreateItemParentSelectorComponent} from './create-item-parent-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { CreateItemParentSelectorComponent } from './create-item-parent-selector.component';
 
 /**
  * Themed wrapper for CreateItemParentSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-create-item-parent-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-create-item-parent-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedCreateItemParentSelectorComponent
-    extends ThemedComponent<CreateItemParentSelectorComponent> {
+  extends ThemedComponent<CreateItemParentSelectorComponent> {
     @Input() entityType: string;
 
     protected inAndOutputNames: (keyof CreateItemParentSelectorComponent & keyof this)[] = ['entityType'];
 
     protected getComponentName(): string {
-        return 'CreateItemParentSelectorComponent';
+      return 'CreateItemParentSelectorComponent';
     }
 
     protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component`);
+      return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component`);
     }
 
     protected importUnthemedComponent(): Promise<any> {
-        return import('./create-item-parent-selector.component');
+      return import('./create-item-parent-selector.component');
     }
 
 }
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 85d8797e66..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>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <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/dso-selector-modal-wrapper.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
index e2dbaaa0ff..63143e5299 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.spec.ts
@@ -1,17 +1,34 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+  OnInit,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+} from '@angular/router';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { Component, DebugElement, NO_ERRORS_SCHEMA, OnInit } from '@angular/core';
+import { MockComponent } from 'ng-mocks';
+
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { Item } from '../../../core/shared/item.model';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from './dso-selector-modal-wrapper.component';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute } from '@angular/router';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { By } from '@angular/platform-browser';
-import { DSOSelectorComponent } from '../dso-selector/dso-selector.component';
-import { MockComponent } from 'ng-mocks';
 import { MetadataValue } from '../../../core/shared/metadata.models';
+import { hasValue } from '../../empty.util';
 import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { DSOSelectorComponent } from '../dso-selector/dso-selector.component';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from './dso-selector-modal-wrapper.component';
 
 describe('DSOSelectorModalWrapperComponent', () => {
   let component: DSOSelectorModalWrapperComponent;
@@ -23,8 +40,8 @@ describe('DSOSelectorModalWrapperComponent', () => {
   item.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Item title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
 
   const itemRD = createSuccessfulRemoteDataObject(item);
@@ -45,11 +62,11 @@ describe('DSOSelectorModalWrapperComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
-          }
+            },
+          },
         },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -83,6 +100,20 @@ describe('DSOSelectorModalWrapperComponent', () => {
     });
   });
 
+  describe('selectObject with emit only', () => {
+    beforeEach(() => {
+      spyOn(component, 'navigate');
+      spyOn(component, 'close');
+      spyOn(component.select, 'emit');
+      component.emitOnly = true;
+      component.selectObject(item);
+    });
+    it('should call the close and navigate method on the component with the given DSO', () => {
+      expect(component.close).toHaveBeenCalled();
+      expect(component.select.emit).toHaveBeenCalledWith(item);
+    });
+  });
+
   describe('close', () => {
     beforeEach(() => {
       component.close();
@@ -113,11 +144,24 @@ describe('DSOSelectorModalWrapperComponent', () => {
       expect(component.close).toHaveBeenCalled();
     });
   });
+
+  describe('should find route data', () => {
+    beforeEach(() => {
+      spyOn(component, 'findRouteData');
+      component.ngOnInit();
+    });
+    it('should call the findRouteData method on the component', () => {
+      expect(component.findRouteData).toHaveBeenCalled();
+    });
+    it('should return undefined', () => {
+      expect(component.findRouteData((route) => hasValue(route.data), {} as unknown as ActivatedRouteSnapshot)).toEqual(undefined);
+    });
+  });
 });
 
 @Component({
   selector: 'ds-test-cmp',
-  templateUrl: './dso-selector-modal-wrapper.component.html'
+  templateUrl: './dso-selector-modal-wrapper.component.html',
 })
 class TestComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
index 113ca518fd..51e520df18 100644
--- a/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/dso-selector-modal-wrapper.component.ts
@@ -1,10 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { ActivatedRoute, ActivatedRouteSnapshot } from '@angular/router';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ActivatedRouteSnapshot,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { hasValue, isNotEmpty } from '../../empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
 
 export enum SelectorActionType {
   CREATE = 'create',
@@ -20,7 +34,7 @@ export enum SelectorActionType {
  */
 @Component({
   selector: 'ds-dso-selector-modal',
-  template: ''
+  template: '',
 })
 export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   /**
@@ -28,6 +42,11 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   @Input() dsoRD: RemoteData<DSpaceObject>;
 
+  /**
+   * Representing if component should emit value of selected entries or navigate
+   */
+  @Input() emitOnly = false;
+
   /**
    * Optional header to display above the selection list
    * Supports i18n keys
@@ -49,6 +68,16 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   action: SelectorActionType;
 
+  /**
+   * Event emitted when a DSO entry is selected if emitOnly is set to true
+   */
+  @Output() select: EventEmitter<DSpaceObject> = new EventEmitter<DSpaceObject>();
+
+  /**
+   * Default DSO ordering
+   */
+  defaultSort: SortOptions;
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
   }
 
@@ -58,7 +87,7 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
   ngOnInit(): void {
     const matchingRoute = this.findRouteData(
       (route: ActivatedRouteSnapshot) => hasValue(route.data.dso),
-      this.route.root.snapshot
+      this.route.root.snapshot,
     );
     if (hasValue(matchingRoute)) {
       this.dsoRD = matchingRoute.data.dso;
@@ -87,7 +116,11 @@ export abstract class DSOSelectorModalWrapperComponent implements OnInit {
    */
   selectObject(dso: DSpaceObject) {
     this.close();
-    this.navigate(dso);
+    if (this.emitOnly) {
+      this.select.emit(dso);
+    } else {
+      this.navigate(dso);
+    }
   }
 
   /**
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
index 142f5dcc11..5748e92937 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Collection } from '../../../../core/shared/collection.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
 
 describe('EditCollectionSelectorComponent', () => {
   let component: EditCollectionSelectorComponent;
@@ -19,8 +30,8 @@ describe('EditCollectionSelectorComponent', () => {
   collection.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Collection title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const collectionRD = createSuccessfulRemoteDataObject(collection);
@@ -42,14 +53,14 @@ describe('EditCollectionSelectorComponent', () => {
                   dso: collectionRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index cfc2ea282d..9df342a17a 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,13 +1,25 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { environment } from '../../../../../environments/environment';
+import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import {
   DSOSelectorModalWrapperComponent,
-  SelectorActionType
+  SelectorActionType,
 } from '../dso-selector-modal-wrapper.component';
-import { getCollectionEditRoute } from '../../../../collection-page/collection-page-routing-paths';
 
 /**
  * Component to wrap a list of existing collections inside a modal
@@ -22,6 +34,7 @@ export class EditCollectionSelectorComponent extends DSOSelectorModalWrapperComp
   objectType = DSpaceObjectType.COLLECTION;
   selectorTypes = [DSpaceObjectType.COLLECTION];
   action = SelectorActionType.EDIT;
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
index 999f466e75..f337cf4e8e 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {EditCollectionSelectorComponent} from './edit-collection-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EditCollectionSelectorComponent } from './edit-collection-selector.component';
 
 /**
  * Themed wrapper for EditCollectionSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-edit-collection-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-edit-collection-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedEditCollectionSelectorComponent
-    extends ThemedComponent<EditCollectionSelectorComponent> {
-    protected getComponentName(): string {
-        return 'EditCollectionSelectorComponent';
-    }
+  extends ThemedComponent<EditCollectionSelectorComponent> {
+  protected getComponentName(): string {
+    return 'EditCollectionSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./edit-collection-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-collection-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
index 355ff61e08..75b64d8aef 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouterStub } from '../../../testing/router.stub';
-import { EditCommunitySelectorComponent } from './edit-community-selector.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../../core/shared/community.model';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { EditCommunitySelectorComponent } from './edit-community-selector.component';
 
 describe('EditCommunitySelectorComponent', () => {
   let component: EditCommunitySelectorComponent;
@@ -19,8 +30,8 @@ describe('EditCommunitySelectorComponent', () => {
   community.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Community title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -42,14 +53,14 @@ describe('EditCommunitySelectorComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index d73a7b48c5..b33f5bae9c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,13 +1,25 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { environment } from '../../../../../environments/environment';
+import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../../core/cache/models/sort-options.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import {
   DSOSelectorModalWrapperComponent,
-  SelectorActionType
+  SelectorActionType,
 } from '../dso-selector-modal-wrapper.component';
-import { getCommunityEditRoute } from '../../../../community-page/community-page-routing-paths';
 
 /**
  * Component to wrap a list of existing communities inside a modal
@@ -23,6 +35,7 @@ export class EditCommunitySelectorComponent extends DSOSelectorModalWrapperCompo
   objectType = DSpaceObjectType.COMMUNITY;
   selectorTypes = [DSpaceObjectType.COMMUNITY];
   action = SelectorActionType.EDIT;
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
 
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute, private router: Router) {
     super(activeModal, route);
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
index e067803444..86b501ffda 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {EditCommunitySelectorComponent} from './edit-community-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EditCommunitySelectorComponent } from './edit-community-selector.component';
 
 /**
  * Themed wrapper for EditCommunitySelectorComponent
  */
 @Component({
-    selector: 'ds-themed-edit-community-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-edit-community-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedEditCommunitySelectorComponent
-    extends ThemedComponent<EditCommunitySelectorComponent> {
-    protected getComponentName(): string {
-        return 'EditCommunitySelectorComponent';
-    }
+  extends ThemedComponent<EditCommunitySelectorComponent> {
+  protected getComponentName(): string {
+    return 'EditCommunitySelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./edit-community-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-community-selector.component');
+  }
 
 }
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
new file mode 100644
index 0000000000..999a96e730
--- /dev/null
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.html
@@ -0,0 +1,11 @@
+<div>
+  <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+    <button type="button" class="close" (click)="close()" aria-label="Close">
+      <span aria-hidden="true">×</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <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/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
index a2891fc66f..de0844781b 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { EditItemSelectorComponent } from './edit-item-selector.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Item } from '../../../../core/shared/item.model';
-import { RouterStub } from '../../../testing/router.stub';
 import { MetadataValue } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { RouterStub } from '../../../testing/router.stub';
+import { EditItemSelectorComponent } from './edit-item-selector.component';
 
 describe('EditItemSelectorComponent', () => {
   let component: EditItemSelectorComponent;
@@ -37,14 +48,14 @@ describe('EditItemSelectorComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index 4822849e4c..08a18dee7f 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,11 +1,21 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths';
+
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { Item } from '../../../../core/shared/item.model';
+import { getItemEditRoute } from '../../../../item-page/item-page-routing-paths';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing items inside a modal
@@ -14,7 +24,7 @@ import { Item } from '../../../../core/shared/item.model';
 
 @Component({
   selector: 'ds-edit-item-selector',
-  templateUrl: '../dso-selector-modal-wrapper.component.html',
+  templateUrl: 'edit-item-selector.component.html',
 })
 export class EditItemSelectorComponent extends DSOSelectorModalWrapperComponent implements OnInit {
   objectType = DSpaceObjectType.ITEM;
diff --git a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
index 6d3b5691c1..52f7809905 100644
--- a/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component.ts
@@ -1,27 +1,28 @@
-import {Component} from '@angular/core';
-import {EditItemSelectorComponent} from './edit-item-selector.component';
-import {ThemedComponent} from 'src/app/shared/theme-support/themed.component';
+import { Component } from '@angular/core';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { EditItemSelectorComponent } from './edit-item-selector.component';
 
 /**
  * Themed wrapper for EditItemSelectorComponent
  */
 @Component({
-    selector: 'ds-themed-edit-item-selector',
-    styleUrls: [],
-    templateUrl: '../../../theme-support/themed.component.html'
+  selector: 'ds-themed-edit-item-selector',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedEditItemSelectorComponent
-    extends ThemedComponent<EditItemSelectorComponent> {
-    protected getComponentName(): string {
-        return 'EditItemSelectorComponent';
-    }
+  extends ThemedComponent<EditItemSelectorComponent> {
+  protected getComponentName(): string {
+    return 'EditItemSelectorComponent';
+  }
 
-    protected importThemedComponent(themeName: string): Promise<any> {
-        return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component`);
-    }
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component`);
+  }
 
-    protected importUnthemedComponent(): Promise<any> {
-        return import('./edit-item-selector.component');
-    }
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./edit-item-selector.component');
+  }
 
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts
index 18ec6007ea..c81eaef4ed 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.spec.ts
@@ -1,39 +1,61 @@
-import { of as observableOf } from 'rxjs';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NgModule,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { BATCH_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import {
+  BATCH_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../remote-data.utils';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { ExportBatchSelectorComponent } from './export-batch-selector.component';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 
 // No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents
 @NgModule({
-    imports: [NgbModalModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock
-            }
-        }),
-    ],
-    exports: [],
-    declarations: [ConfirmationModalComponent],
-    providers: []
+  imports: [NgbModalModule,
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useClass: TranslateLoaderMock,
+      },
+    }),
+  ],
+  exports: [],
+  declarations: [ConfirmationModalComponent],
+  providers: [],
 })
 class ModelTestModule {
 }
@@ -53,7 +75,7 @@ describe('ExportBatchSelectorComponent', () => {
     id: 'fake-id',
     uuid: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
 
   const mockCollection: Collection = Object.assign(new Collection(), {
@@ -64,10 +86,10 @@ describe('ExportBatchSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-collection-1'
-        }
-      ]
-    }
+          value: 'fake/test-collection-1',
+        },
+      ],
+    },
   });
   const itemRD = createSuccessfulRemoteDataObject(mockItem);
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
@@ -75,15 +97,15 @@ describe('ExportBatchSelectorComponent', () => {
   beforeEach(waitForAsync(() => {
     notificationService = new NotificationsServiceStub();
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' }),
+      },
     );
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule],
@@ -102,14 +124,14 @@ describe('ExportBatchSelectorComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -178,9 +200,9 @@ describe('ExportBatchSelectorComponent', () => {
     it('should invoke the Batch-export script with option --id uuid without option', () => {
       const parameterValues: ProcessParameter[] = [
         Object.assign(new ProcessParameter(), { name: '--id', value: mockCollection.uuid }),
-        Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' })
+        Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' }),
       ];
-        expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_EXPORT_SCRIPT_NAME, parameterValues, []);
+      expect(scriptService.invoke).toHaveBeenCalledWith(BATCH_EXPORT_SCRIPT_NAME, parameterValues, []);
     });
     it('success notification is shown', () => {
       expect(scriptRequestSucceeded).toBeTrue();
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
index 0645e09029..645f8d95f6 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component.ts
@@ -1,25 +1,48 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { BATCH_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+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 {
+  BATCH_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
+import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../../empty.util';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Process } from '../../../../process-page/processes/process.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing dso's inside a modal
@@ -38,6 +61,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
               protected notificationsService: NotificationsService, protected translationService: TranslateService,
               protected scriptDataService: ScriptDataService,
               protected authorizationDataService: AuthorizationDataService,
+              protected dsoNameService: DSONameService,
               private modalService: NgbModal) {
     super(activeModal, route);
   }
@@ -49,7 +73,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
   navigate(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Collection) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.export-batch.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.export-batch.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-batch.cancel';
@@ -61,7 +85,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
           return startScriptSucceeded$.pipe(
             switchMap((r: boolean) => {
               return observableOf(r);
-            })
+            }),
           );
         } else {
           const modalRefExport = this.modalService.open(ExportBatchSelectorComponent);
@@ -83,7 +107,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
   private startScriptNotifyAndRedirect(dso: DSpaceObject): Observable<boolean> {
     const parameterValues: ProcessParameter[] = [
       Object.assign(new ProcessParameter(), { name: '--id', value: dso.uuid }),
-      Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' })
+      Object.assign(new ProcessParameter(), { name: '--type', value: 'COLLECTION' }),
     ];
     return this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
       switchMap(() => {
@@ -105,7 +129,7 @@ export class ExportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
           this.notificationsService.error(title, content);
           return false;
         }
-      })
+      }),
     );
   }
 }
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
index df3e4f095c..596fe19e4d 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.spec.ts
@@ -1,11 +1,34 @@
-import { of as observableOf } from 'rxjs';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NgModule,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NgModule, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModal, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import {
+  METADATA_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
 import { Item } from '../../../../core/shared/item.model';
@@ -13,28 +36,27 @@ import { ProcessParameter } from '../../../../process-page/processes/process-par
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../remote-data.utils';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
 import { ExportMetadataSelectorComponent } from './export-metadata-selector.component';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 
 // No way to add entryComponents yet to testbed; alternative implemented; source: https://stackoverflow.com/questions/41689468/how-to-shallow-test-a-component-with-an-entrycomponents
 @NgModule({
-    imports: [NgbModalModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderMock
-            }
-        }),
-    ],
-    exports: [],
-    declarations: [ConfirmationModalComponent],
-    providers: []
+  imports: [NgbModalModule,
+    TranslateModule.forRoot({
+      loader: {
+        provide: TranslateLoader,
+        useClass: TranslateLoaderMock,
+      },
+    }),
+  ],
+  exports: [],
+  declarations: [ConfirmationModalComponent],
+  providers: [],
 })
 class ModelTestModule {
 }
@@ -54,7 +76,7 @@ describe('ExportMetadataSelectorComponent', () => {
     id: 'fake-id',
     uuid: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
 
   const mockCollection: Collection = Object.assign(new Collection(), {
@@ -65,10 +87,10 @@ describe('ExportMetadataSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-collection-1'
-        }
-      ]
-    }
+          value: 'fake/test-collection-1',
+        },
+      ],
+    },
   });
 
   const mockCommunity = Object.assign(new Community(), {
@@ -78,10 +100,10 @@ describe('ExportMetadataSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-community-1'
-        }
-      ]
-    }
+          value: 'fake/test-community-1',
+        },
+      ],
+    },
   });
 
   const itemRD = createSuccessfulRemoteDataObject(mockItem);
@@ -90,15 +112,15 @@ describe('ExportMetadataSelectorComponent', () => {
   beforeEach(waitForAsync(() => {
     notificationService = new NotificationsServiceStub();
     router = jasmine.createSpyObj('router', {
-      navigateByUrl: jasmine.createSpy('navigateByUrl')
+      navigateByUrl: jasmine.createSpy('navigateByUrl'),
     });
     scriptService = jasmine.createSpyObj('scriptService',
       {
-        invoke: createSuccessfulRemoteDataObject$({ processId: '45' })
-      }
+        invoke: createSuccessfulRemoteDataObject$({ processId: '45' }),
+      },
     );
     authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), ModelTestModule],
@@ -117,14 +139,14 @@ describe('ExportMetadataSelectorComponent', () => {
                   dso: itemRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
index d4b4314a99..3d8708072c 100644
--- a/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component.ts
@@ -1,26 +1,49 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
-import { METADATA_EXPORT_SCRIPT_NAME, ScriptDataService } from '../../../../core/data/processes/script-data.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+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 {
+  METADATA_EXPORT_SCRIPT_NAME,
+  ScriptDataService,
+} from '../../../../core/data/processes/script-data.service';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
+import { Process } from '../../../../process-page/processes/process.model';
 import { ProcessParameter } from '../../../../process-page/processes/process-parameter.model';
 import { ConfirmationModalComponent } from '../../../confirmation-modal/confirmation-modal.component';
 import { isNotEmpty } from '../../../empty.util';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Process } from '../../../../process-page/processes/process.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { getProcessDetailRoute } from '../../../../process-page/process-page-routing.paths';
-import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
-import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing dso's inside a modal
@@ -39,6 +62,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
               protected notificationsService: NotificationsService, protected translationService: TranslateService,
               protected scriptDataService: ScriptDataService,
               protected authorizationDataService: AuthorizationDataService,
+              protected dsoNameService: DSONameService,
               private modalService: NgbModal) {
     super(activeModal, route);
   }
@@ -50,7 +74,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
   navigate(dso: DSpaceObject): Observable<boolean> {
     if (dso instanceof Collection || dso instanceof Community) {
       const modalRef = this.modalService.open(ConfirmationModalComponent);
-      modalRef.componentInstance.dso = dso;
+      modalRef.componentInstance.name = this.dsoNameService.getName(dso);
       modalRef.componentInstance.headerLabel = 'confirmation-modal.export-metadata.header';
       modalRef.componentInstance.infoLabel = 'confirmation-modal.export-metadata.info';
       modalRef.componentInstance.cancelLabel = 'confirmation-modal.export-metadata.cancel';
@@ -62,7 +86,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
           return startScriptSucceeded$.pipe(
             switchMap((r: boolean) => {
               return observableOf(r);
-            })
+            }),
           );
         } else {
           const modalRefExport = this.modalService.open(ExportMetadataSelectorComponent);
@@ -88,7 +112,7 @@ export class ExportMetadataSelectorComponent extends DSOSelectorModalWrapperComp
     return this.authorizationDataService.isAuthorized(FeatureID.AdministratorOf).pipe(
       switchMap((isAdmin) => {
         if (isAdmin) {
-          parameterValues.push(Object.assign(new ProcessParameter(), {name: '-a'}));
+          parameterValues.push(Object.assign(new ProcessParameter(), { name: '-a' }));
         }
         return this.scriptDataService.invoke(METADATA_EXPORT_SCRIPT_NAME, parameterValues, []);
       }),
diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts
index 6ed3bf28be..f2d755d277 100644
--- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.spec.ts
@@ -1,8 +1,13 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Collection } from '../../../../core/shared/collection.model';
 import { Item } from '../../../../core/shared/item.model';
 import { ImportBatchSelectorComponent } from './import-batch-selector.component';
@@ -14,7 +19,7 @@ describe('ImportBatchSelectorComponent', () => {
     id: 'fake-id',
     uuid: 'fake-id',
     handle: 'fake/handle',
-    lastModified: '2018'
+    lastModified: '2018',
   });
   const mockCollection: Collection = Object.assign(new Collection(), {
     id: 'test-collection-1-1',
@@ -24,10 +29,10 @@ describe('ImportBatchSelectorComponent', () => {
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'fake/test-collection-1'
-        }
-      ]
-    }
+          value: 'fake/test-collection-1',
+        },
+      ],
+    },
   });
   const modalStub = jasmine.createSpyObj('modalStub', ['close']);
   beforeEach(waitForAsync(() => {
@@ -37,7 +42,7 @@ describe('ImportBatchSelectorComponent', () => {
       providers: [
         { provide: NgbActiveModal, useValue: modalStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
index 4696e42e2d..a1f59161df 100644
--- a/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
+++ b/src/app/shared/dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component.ts
@@ -1,11 +1,23 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
-import { Collection } from '../../../../core/shared/collection.model';
-import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../dso-selector-modal-wrapper.component';
-import { Observable, of } from 'rxjs';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a list of existing dso's inside a modal
@@ -23,7 +35,7 @@ export class ImportBatchSelectorComponent extends DSOSelectorModalWrapperCompone
    * An event fired when the modal is closed
    */
   @Output()
-  response = new EventEmitter<DSpaceObject>();
+    response = new EventEmitter<DSpaceObject>();
 
   constructor(protected activeModal: NgbActiveModal,
               protected route: ActivatedRoute) {
diff --git a/src/app/shared/empty.util.spec.ts b/src/app/shared/empty.util.spec.ts
index 94122990ae..0ec050baee 100644
--- a/src/app/shared/empty.util.spec.ts
+++ b/src/app/shared/empty.util.spec.ts
@@ -1,4 +1,8 @@
-import { cold, hot } from 'jasmine-marbles';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+
 import {
   ensureArrayHasValue,
   hasNoValue,
@@ -9,8 +13,9 @@ import {
   isNotEmptyOperator,
   isNotNull,
   isNotUndefined,
-  isNull, isObjectEmpty,
-  isUndefined
+  isNull,
+  isObjectEmpty,
+  isUndefined,
 } from './empty.util';
 
 describe('Empty Utils', () => {
@@ -292,7 +297,7 @@ describe('Empty Utils', () => {
         c: true,
         d: undefined,
         e: 1,
-        f: {}
+        f: {},
       };
 
       const source$ = hot('abcdef', testData);
@@ -433,7 +438,7 @@ describe('Empty Utils', () => {
         e: 1,
         f: {},
         g: '',
-        h: ' '
+        h: ' ',
       };
 
       const source$ = hot('abcdefgh', testData);
@@ -492,7 +497,7 @@ describe('Empty Utils', () => {
         f: [],
         g: () => true,
         h: {},
-        i: ''
+        i: '',
       };
 
       const expectedData = Object.assign({}, sourceData, {
@@ -501,7 +506,7 @@ describe('Empty Utils', () => {
         e: [],
         g: [],
         h: [],
-        i: []
+        i: [],
       });
 
       const source$ = hot('abcdefghi', sourceData);
diff --git a/src/app/shared/empty.util.ts b/src/app/shared/empty.util.ts
index 355314550a..f1b9fd54c7 100644
--- a/src/app/shared/empty.util.ts
+++ b/src/app/shared/empty.util.ts
@@ -1,5 +1,8 @@
 import { Observable } from 'rxjs';
-import { filter, map } from 'rxjs/operators';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
 /**
  * Returns true if the passed value is null.
@@ -196,9 +199,9 @@ export function isObjectEmpty(obj?: any): boolean {
   }
 
   for (const key in obj) {
-      if (obj.hasOwnProperty(key) && isNotEmpty(obj[key])) {
-        return false;
-      }
+    if (obj.hasOwnProperty(key) && isNotEmpty(obj[key])) {
+      return false;
+    }
   }
   return true;
 }
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index a4d539625f..374c589e3e 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) !== true">
+    <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..8f4aa57723 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.spec.ts
@@ -1,13 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { EntityDropdownComponent } from './entity-dropdown.component';
-import { getTestScheduler } from 'jasmine-marbles';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { ItemType } from '../../core/shared/item-relationships/item-type.model';
-import { ChangeDetectorRef, NO_ERRORS_SCHEMA, Pipe, PipeTransform } from '@angular/core';
-import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  ChangeDetectorRef,
+  NO_ERRORS_SCHEMA,
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+import { ItemType } from '../../core/shared/item-relationships/item-type.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
+import { EntityDropdownComponent } from './entity-dropdown.component';
 
 // eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
@@ -21,36 +31,36 @@ const entities: ItemType[] = [
   Object.assign(new ItemType(), {
     id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
     label: 'Entity_1',
-    uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88'
+    uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
   }),
   Object.assign(new ItemType(), {
     id: '59ee713b-ee53-4220-8c3f-9860dc84fe33',
     label: 'Entity_2',
-    uuid: 'UUID-59ee713b-ee53-4220-8c3f-9860dc84fe33'
+    uuid: 'UUID-59ee713b-ee53-4220-8c3f-9860dc84fe33',
   }),
   Object.assign(new ItemType(), {
     id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
     label: 'Entity_3',
-    uuid: 'UUID-7127-415f-8919-55be34a6e9ed'
+    uuid: 'UUID-7127-415f-8919-55be34a6e9ed',
   }),
   Object.assign(new ItemType(), {
     id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
     label: 'Entity_4',
-    uuid: 'UUID-59da2ff0-9bf4-45bf-88be-e35abd33f304'
+    uuid: 'UUID-59da2ff0-9bf4-45bf-88be-e35abd33f304',
   }),
   Object.assign(new ItemType(), {
     id: 'a5159760-f362-4659-9e81-e3253ad91ede',
     label: 'Entity_5',
-    uuid: 'UUID-a5159760-f362-4659-9e81-e3253ad91ede'
+    uuid: 'UUID-a5159760-f362-4659-9e81-e3253ad91ede',
   }),
 ];
 
 const listElementMock: ItemType = Object.assign(
   new ItemType(), {
-  id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
-  label: 'Entity_1',
-  uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88'
-}
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    label: 'Entity_1',
+    uuid: 'UUID-ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+  },
 );
 
 describe('EntityDropdownComponent', () => {
@@ -61,7 +71,7 @@ describe('EntityDropdownComponent', () => {
 
   const entityTypeServiceMock: any = jasmine.createSpyObj('EntityTypeService', {
     getAllAuthorizedRelationshipType: jasmine.createSpy('getAllAuthorizedRelationshipType'),
-    getAllAuthorizedRelationshipTypeImport: jasmine.createSpy('getAllAuthorizedRelationshipTypeImport')
+    getAllAuthorizedRelationshipTypeImport: jasmine.createSpy('getAllAuthorizedRelationshipTypeImport'),
   });
 
 
@@ -76,9 +86,9 @@ describe('EntityDropdownComponent', () => {
       declarations: [EntityDropdownComponent, MockTranslatePipe],
       providers: [
         { provide: EntityTypeDataService, useValue: entityTypeServiceMock },
-        ChangeDetectorRef
+        ChangeDetectorRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -123,7 +133,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/entity-dropdown/entity-dropdown.component.ts b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
index e009463dcd..f3fcf835f5 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.ts
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.ts
@@ -7,22 +7,31 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  Output
+  Output,
 } from '@angular/core';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { hasValue } from '../empty.util';
-import { reduce, startWith, switchMap } from 'rxjs/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedList } from '../../core/data/paginated-list.model';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  reduce,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
 import { EntityTypeDataService } from '../../core/data/entity-type-data.service';
+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 { ItemType } from '../../core/shared/item-relationships/item-type.model';
 import { getFirstSucceededRemoteWithNotEmptyData } from '../../core/shared/operators';
-import { FindListOptions } from '../../core/data/find-list-options.model';
+import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-entity-dropdown',
   templateUrl: './entity-dropdown.component.html',
-  styleUrls: ['./entity-dropdown.component.scss']
+  styleUrls: ['./entity-dropdown.component.scss'],
 })
 export class EntityDropdownComponent implements OnInit, OnDestroy {
   /**
@@ -89,7 +98,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
   constructor(
     private changeDetectorRef: ChangeDetectorRef,
     private entityTypeService: EntityTypeDataService,
-    private el: ElementRef
+    private el: ElementRef,
   ) { }
 
   /**
@@ -154,7 +163,7 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
     // Set the pagination info
     const findOptions: FindListOptions = {
       elementsPerPage: 10,
-      currentPage: page
+      currentPage: page,
     };
     let searchListEntity$;
     if (this.isSubmission) {
@@ -163,21 +172,21 @@ export class EntityDropdownComponent implements OnInit, OnDestroy {
       searchListEntity$ = this.entityTypeService.getAllAuthorizedRelationshipTypeImport(findOptions);
     }
     this.searchListEntity$ = searchListEntity$.pipe(
-        getFirstSucceededRemoteWithNotEmptyData(),
-        switchMap((entityType: RemoteData<PaginatedList<ItemType>>) => {
-          if ( (this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements ) {
-            this.hasNextPage = false;
-          }
-          return entityType.payload.page;
-        }),
-        reduce((acc: any, value: any) => [...acc, value], []),
-        startWith([])
+      getFirstSucceededRemoteWithNotEmptyData(),
+      switchMap((entityType: RemoteData<PaginatedList<ItemType>>) => {
+        if ( (this.searchListEntity.length + findOptions.elementsPerPage) >= entityType.payload.totalElements ) {
+          this.hasNextPage = false;
+        }
+        return entityType.payload.page;
+      }),
+      reduce((acc: any, value: any) => [...acc, value], []),
+      startWith([]),
     );
     this.subs.push(
       this.searchListEntity$.subscribe(
         (next) => { this.searchListEntity.push(...next); }, undefined,
-        () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); }
-      )
+        () => { this.hideShowLoader(false); this.changeDetectorRef.detectChanges(); },
+      ),
     );
   }
 
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html b/src/app/shared/eperson-group-list/eperson-group-list.component.html
similarity index 100%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.html
rename to src/app/shared/eperson-group-list/eperson-group-list.component.html
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.scss b/src/app/shared/eperson-group-list/eperson-group-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
similarity index 80%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts
rename to src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
index 91d9200c2d..cbf72950f7 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.spec.ts
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.spec.ts
@@ -1,28 +1,38 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { of as observableOf } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { uniqueId } from 'lodash';
+import uniqueId from 'lodash/uniqueId';
+import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { createTestComponent } from '../../../testing/utils.test';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { EpersonGroupListComponent, SearchEvent } from './eperson-group-list.component';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { GroupMock } from '../../../testing/group-mock';
-import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
-import { buildPaginatedList } from '../../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../../core/shared/page-info.model';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../testing/pagination-service.stub';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { RequestService } from '../../core/data/request.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { EPersonMock } from '../testing/eperson.mock';
+import { GroupMock } from '../testing/group-mock';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { createTestComponent } from '../testing/utils.test';
+import {
+  EpersonGroupListComponent,
+  SearchEvent,
+} from './eperson-group-list.component';
 
 describe('EpersonGroupListComponent test suite', () => {
   let comp: EpersonGroupListComponent;
@@ -44,8 +54,8 @@ describe('EpersonGroupListComponent test suite', () => {
       searchByScope: jasmine.createSpy('searchByScope'),
     },
     {
-      linkPath: 'epersons'
-    }
+      linkPath: 'epersons',
+    },
   );
 
   const mockGroupService = jasmine.createSpyObj('groupService',
@@ -55,8 +65,8 @@ describe('EpersonGroupListComponent test suite', () => {
       searchGroups: jasmine.createSpy('searchGroups'),
     },
     {
-      linkPath: 'groups'
-    }
+      linkPath: 'groups',
+    },
   );
 
   const epersonPaginatedList = buildPaginatedList(new PageInfo(), [EPersonMock, EPersonMock]);
@@ -71,11 +81,11 @@ describe('EpersonGroupListComponent test suite', () => {
     TestBed.configureTestingModule({
       imports: [
         NoopAnimationsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         EpersonGroupListComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: EPersonDataService, useValue: mockEpersonService },
@@ -84,11 +94,11 @@ describe('EpersonGroupListComponent test suite', () => {
         { provide: PaginationService, useValue: paginationService },
         EpersonGroupListComponent,
         ChangeDetectorRef,
-        Injector
+        Injector,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -158,7 +168,7 @@ describe('EpersonGroupListComponent test suite', () => {
 
       expect(compAsAny.list$.value).toEqual(epersonPaginatedListRD);
       expect(comp.getList()).toBeObservable(cold('a', {
-        a: epersonPaginatedListRD
+        a: epersonPaginatedListRD,
       }));
     });
 
@@ -174,7 +184,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next(EPersonMock.id);
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
     });
 
@@ -182,7 +192,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next('');
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
     });
   });
@@ -228,7 +238,7 @@ describe('EpersonGroupListComponent test suite', () => {
 
       expect(compAsAny.list$.value).toEqual(groupPaginatedListRD);
       expect(comp.getList()).toBeObservable(cold('a', {
-        a: groupPaginatedListRD
+        a: groupPaginatedListRD,
       }));
     });
 
@@ -244,7 +254,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next(EPersonMock.id);
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
     });
 
@@ -252,7 +262,7 @@ describe('EpersonGroupListComponent test suite', () => {
       compAsAny.entrySelectedId.next('');
 
       expect(comp.isSelected(EPersonMock)).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
     });
 
@@ -260,7 +270,7 @@ describe('EpersonGroupListComponent test suite', () => {
       const options: PaginationComponentOptions = comp.paginationOptions;
       const event: SearchEvent = {
         scope: 'metadata',
-        query: 'test'
+        query: 'test',
       };
       spyOn(comp, 'updateList');
       comp.onSearch(event);
@@ -273,7 +283,7 @@ describe('EpersonGroupListComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
similarity index 66%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
rename to src/app/shared/eperson-group-list/eperson-group-list.component.ts
index b120c3e016..879a1ad687 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-group-list.component.ts
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.ts
@@ -1,25 +1,39 @@
-import { Component, EventEmitter, Injector, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import {
+  Component,
+  EventEmitter,
+  Injector,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import uniqueId from 'lodash/uniqueId';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { uniqueId } from 'lodash';
 
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
-import { hasValue, isNotEmpty } from '../../../empty.util';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { EPERSON } from '../../../../core/eperson/models/eperson.resource-type';
-import { GROUP } from '../../../../core/eperson/models/group.resource-type';
-import { ResourceType } from '../../../../core/shared/resource-type';
-import { EPersonDataService } from '../../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../../core/eperson/group-data.service';
-import { fadeInOut } from '../../../animations/fade';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { PaginationService } from '../../../../core/pagination/pagination.service';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
-import { getDataServiceFor } from '../../../../core/data/base/data-service.decorator';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { getDataServiceFor } from '../../core/data/base/data-service.decorator';
+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 { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { EPERSON } from '../../core/eperson/models/eperson.resource-type';
+import { GROUP } from '../../core/eperson/models/group.resource-type';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { ResourceType } from '../../core/shared/resource-type';
+import { fadeInOut } from '../animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 export interface SearchEvent {
   scope: string;
@@ -31,8 +45,8 @@ export interface SearchEvent {
   styleUrls: ['./eperson-group-list.component.scss'],
   templateUrl: './eperson-group-list.component.html',
   animations: [
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component that shows a list of eperson or group
@@ -96,7 +110,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
   private pageConfigSub: Subscription;
 
   /**
-   * Initialize instance variables and inject the properly DataService
+   * Initialize instance variables and inject the properly UpdateDataServiceImpl
    *
    * @param {DSONameService} dsoNameService
    * @param {Injector} parentInjector
@@ -113,7 +127,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
     const provider = getDataServiceFor(resourceType);
     this.dataService = Injector.create({
       providers: [],
-      parent: this.parentInjector
+      parent: this.parentInjector,
     }).get(provider);
     this.paginationOptions.id = uniqueId('egl');
     this.paginationOptions.pageSize = 5;
@@ -150,7 +164,7 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
    */
   isSelected(entry: DSpaceObject): Observable<boolean> {
     return this.entrySelectedId.asObservable().pipe(
-      map((selectedId) => isNotEmpty(selectedId) && selectedId === entry.id)
+      map((selectedId) => isNotEmpty(selectedId) && selectedId === entry.id),
     );
   }
 
@@ -174,22 +188,22 @@ export class EpersonGroupListComponent implements OnInit, OnDestroy {
     }
     this.pageConfigSub = this.paginationService.getCurrentPagination(this.paginationOptions.id, this.paginationOptions)
       .subscribe((paginationOptions) => {
-    const options: FindListOptions = Object.assign({}, new FindListOptions(), {
+        const options: FindListOptions = Object.assign({}, new FindListOptions(), {
           elementsPerPage: paginationOptions.pageSize,
-          currentPage: paginationOptions.currentPage
-    });
+          currentPage: paginationOptions.currentPage,
+        });
 
-    const search$: Observable<RemoteData<PaginatedList<DSpaceObject>>> = this.isListOfEPerson ?
-      (this.dataService as EPersonDataService).searchByScope(scope, query, options) :
-      (this.dataService as GroupDataService).searchGroups(query, options);
+        const search$: Observable<RemoteData<PaginatedList<DSpaceObject>>> = this.isListOfEPerson ?
+          (this.dataService as EPersonDataService).searchByScope(scope, query, options) :
+          (this.dataService as GroupDataService).searchGroups(query, options);
 
-    this.subs.push(search$.pipe(getFirstCompletedRemoteData())
-      .subscribe((list: RemoteData<PaginatedList<DSpaceObject>>) => {
-        if (hasValue(this.list$)) {
-          this.list$.next(list);
-        }
-      })
-    );
+        this.subs.push(search$.pipe(getFirstCompletedRemoteData())
+          .subscribe((list: RemoteData<PaginatedList<DSpaceObject>>) => {
+            if (hasValue(this.list$)) {
+              this.list$.next(list);
+            }
+          }),
+        );
       });
   }
 
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
similarity index 100%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.html
rename to src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.html
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
similarity index 78%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
rename to src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
index 311d911b26..d4710fdd8d 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
+++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.spec.ts
@@ -1,38 +1,49 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { createTestComponent } from '../../../../testing/utils.test';
-import { EpersonSearchBoxComponent } from './eperson-search-box.component';
+import { createTestComponent } from '../../testing/utils.test';
 import { SearchEvent } from '../eperson-group-list.component';
+import { EpersonSearchBoxComponent } from './eperson-search-box.component';
 
 describe('EpersonSearchBoxComponent test suite', () => {
   let comp: EpersonSearchBoxComponent;
   let compAsAny: any;
   let fixture: ComponentFixture<EpersonSearchBoxComponent>;
   let de;
-  let formBuilder: FormBuilder;
+  let formBuilder: UntypedFormBuilder;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         EpersonSearchBoxComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
-        FormBuilder,
-        EpersonSearchBoxComponent
+        UntypedFormBuilder,
+        EpersonSearchBoxComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -64,7 +75,7 @@ describe('EpersonSearchBoxComponent test suite', () => {
     beforeEach(() => {
       // initTestScheduler();
       fixture = TestBed.createComponent(EpersonSearchBoxComponent);
-      formBuilder = TestBed.inject(FormBuilder);
+      formBuilder = TestBed.inject(UntypedFormBuilder);
       comp = fixture.componentInstance;
       compAsAny = fixture.componentInstance;
     });
@@ -89,12 +100,12 @@ describe('EpersonSearchBoxComponent test suite', () => {
     it('should emit new search event', () => {
       const data = {
         scope: 'metadata',
-        query: 'test'
+        query: 'test',
       };
 
       const event: SearchEvent = {
         scope: 'metadata',
-        query: 'test'
+        query: 'test',
       };
       spyOn(comp.search, 'emit');
 
@@ -108,7 +119,7 @@ describe('EpersonSearchBoxComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
similarity index 80%
rename from src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
rename to src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
index 11c3dcd102..2873248c10 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
+++ b/src/app/shared/eperson-group-list/eperson-search-box/eperson-search-box.component.ts
@@ -1,10 +1,13 @@
-import { Component, EventEmitter, Output } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
 import { Subscription } from 'rxjs';
 
+import { isNotNull } from '../../empty.util';
 import { SearchEvent } from '../eperson-group-list.component';
-import { isNotNull } from '../../../../empty.util';
 
 /**
  * A component used to show a search box for epersons.
@@ -33,7 +36,7 @@ export class EpersonSearchBoxComponent {
    */
   @Output() search: EventEmitter<SearchEvent> = new EventEmitter<SearchEvent>();
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.searchForm = this.formBuilder.group(({
       scope: 'metadata',
       query: '',
@@ -57,7 +60,7 @@ export class EpersonSearchBoxComponent {
   submit(data: any) {
     const event: SearchEvent = {
       scope: isNotNull(data) ? data.scope : 'metadata',
-      query: isNotNull(data) ? data.query : ''
+      query: isNotNull(data) ? data.query : '',
     };
 
     this.search.emit(event);
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
similarity index 100%
rename from src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.html
rename to src/app/shared/eperson-group-list/group-search-box/group-search-box.component.html
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
similarity index 77%
rename from src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts
rename to src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
index dc39e30d3b..3b64315190 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.spec.ts
+++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.spec.ts
@@ -1,38 +1,49 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { FormBuilder, FormsModule, ReactiveFormsModule } from '@angular/forms';
-
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+} from '@angular/forms';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { createTestComponent } from '../../../../testing/utils.test';
-import { GroupSearchBoxComponent } from './group-search-box.component';
+import { createTestComponent } from '../../testing/utils.test';
 import { SearchEvent } from '../eperson-group-list.component';
+import { GroupSearchBoxComponent } from './group-search-box.component';
 
 describe('GroupSearchBoxComponent test suite', () => {
   let comp: GroupSearchBoxComponent;
   let compAsAny: any;
   let fixture: ComponentFixture<GroupSearchBoxComponent>;
   let de;
-  let formBuilder: FormBuilder;
+  let formBuilder: UntypedFormBuilder;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         GroupSearchBoxComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
-        FormBuilder,
-        GroupSearchBoxComponent
+        UntypedFormBuilder,
+        GroupSearchBoxComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -64,7 +75,7 @@ describe('GroupSearchBoxComponent test suite', () => {
     beforeEach(() => {
       // initTestScheduler();
       fixture = TestBed.createComponent(GroupSearchBoxComponent);
-      formBuilder = TestBed.inject(FormBuilder);
+      formBuilder = TestBed.inject(UntypedFormBuilder);
       comp = fixture.componentInstance;
       compAsAny = fixture.componentInstance;
     });
@@ -88,12 +99,12 @@ describe('GroupSearchBoxComponent test suite', () => {
 
     it('should emit new search event', () => {
       const data = {
-        query: 'test'
+        query: 'test',
       };
 
       const event: SearchEvent = {
         scope: '',
-        query: 'test'
+        query: 'test',
       };
       spyOn(comp.search, 'emit');
 
@@ -107,7 +118,7 @@ describe('GroupSearchBoxComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
similarity index 79%
rename from src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts
rename to src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
index baef19f14a..5735a63017 100644
--- a/src/app/shared/resource-policies/form/eperson-group-list/group-search-box/group-search-box.component.ts
+++ b/src/app/shared/eperson-group-list/group-search-box/group-search-box.component.ts
@@ -1,10 +1,13 @@
-import { Component, EventEmitter, Output } from '@angular/core';
-import { FormBuilder } from '@angular/forms';
-
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
 import { Subscription } from 'rxjs';
 
+import { isNotNull } from '../../empty.util';
 import { SearchEvent } from '../eperson-group-list.component';
-import { isNotNull } from '../../../../empty.util';
 
 /**
  * A component used to show a search box for groups.
@@ -33,7 +36,7 @@ export class GroupSearchBoxComponent {
    */
   @Output() search: EventEmitter<SearchEvent> = new EventEmitter<SearchEvent>();
 
-  constructor(private formBuilder: FormBuilder) {
+  constructor(private formBuilder: UntypedFormBuilder) {
     this.searchForm = this.formBuilder.group(({
       query: '',
     }));
@@ -55,7 +58,7 @@ export class GroupSearchBoxComponent {
   submit(data: any) {
     const event: SearchEvent = {
       scope: '',
-      query: isNotNull(data) ? data.query : ''
+      query: isNotNull(data) ? data.query : '',
     };
     this.search.emit(event);
   }
diff --git a/src/app/shared/error/error.component.spec.ts b/src/app/shared/error/error.component.spec.ts
index f8483ac7aa..0d4610426a 100644
--- a/src/app/shared/error/error.component.spec.ts
+++ b/src/app/shared/error/error.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-
 import { ErrorComponent } from './error.component';
 
 describe('ErrorComponent (inline template)', () => {
@@ -21,12 +27,12 @@ describe('ErrorComponent (inline template)', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ErrorComponent], // declare the test component
-      providers: [TranslateService]
+      providers: [TranslateService],
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/error/error.component.ts b/src/app/shared/error/error.component.ts
index 9a6b0660bb..2c45c875f0 100644
--- a/src/app/shared/error/error.component.ts
+++ b/src/app/shared/error/error.component.ts
@@ -1,14 +1,16 @@
-import { Component, Input } from '@angular/core';
-
+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',
   styleUrls: ['./error.component.scss'],
-  templateUrl: './error.component.html'
+  templateUrl: './error.component.html',
 })
 export class ErrorComponent {
 
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 ba81ee3d20..d649c0ad4e 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,5 @@
 <a [routerLink]="(bitstreamPath$| async)?.routerLink" class="dont-break-out" [queryParams]="(bitstreamPath$| async)?.queryParams" [target]="isBlank ? '_blank': '_self'" [ngClass]="cssClasses">
-  <span *ngIf="!(canDownload$ |async)"><i class="fas fa-lock"></i></span>
+  <span role="img" *ngIf="(canDownload$ |async) !== true" [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..e70563b3fd 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
@@ -1,15 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FileDownloadLinkComponent } from './file-download-link.component';
-import { Bitstream } from '../../core/shared/bitstream.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+
 import { getBitstreamModuleRoute } from '../../app-routing-paths';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
-import { cold, getTestScheduler } from 'jasmine-marbles';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { Bitstream } from '../../core/shared/bitstream.model';
 import { Item } from '../../core/shared/item.model';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import { getItemModuleRoute } from '../../item-page/item-page-routing-paths';
 import { RouterLinkDirectiveStub } from '../testing/router-link-directive.stub';
+import { FileDownloadLinkComponent } from './file-download-link.component';
 
 describe('FileDownloadLinkComponent', () => {
   let component: FileDownloadLinkComponent;
@@ -23,28 +32,31 @@ describe('FileDownloadLinkComponent', () => {
 
   function init() {
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: cold('-a', {a: true})
+      isAuthorized: cold('-a', { a: true }),
     });
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstreamUuid',
       _links: {
-        self: {href: 'obj-selflink'}
-      }
+        self: { href: 'obj-selflink' },
+      },
     });
     item = Object.assign(new Item(), {
       uuid: 'itemUuid',
       _links: {
-        self: {href: 'obj-selflink'}
-      }
+        self: { href: 'obj-selflink' },
+      },
     });
   }
 
   function initTestbed() {
     TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
       declarations: [FileDownloadLinkComponent, RouterLinkDirectiveStub],
       providers: [
-        {provide: AuthorizationDataService, useValue: authorizationService},
-      ]
+        { provide: AuthorizationDataService, useValue: authorizationService },
+      ],
     })
       .compileComponents();
   }
@@ -66,8 +78,8 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
         });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} }}));
-          expect(component.canDownload$).toBeObservable(cold('--a', {a: true}));
+          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
+          expect(component.canDownload$).toBeObservable(cold('--a', { a: true }));
 
         });
         it('should init the component', () => {
@@ -85,9 +97,9 @@ describe('FileDownloadLinkComponent', () => {
           init();
           (authorizationService.isAuthorized as jasmine.Spy).and.callFake((featureId, object) => {
             if (featureId === FeatureID.CanDownload) {
-              return cold('-a', {a: false});
+              return cold('-a', { a: false });
             }
-            return cold('-a', {a: true});
+            return cold('-a', { a: true });
           });
           initTestbed();
         }));
@@ -99,8 +111,8 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
         });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } }}));
-          expect(component.canDownload$).toBeObservable(cold('--a', {a: false}));
+          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } } }));
+          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
 
         });
         it('should init the component', () => {
@@ -116,7 +128,7 @@ describe('FileDownloadLinkComponent', () => {
         beforeEach(waitForAsync(() => {
           scheduler = getTestScheduler();
           init();
-          (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(cold('-a', {a: false}));
+          (authorizationService.isAuthorized as jasmine.Spy).and.returnValue(cold('-a', { a: false }));
           initTestbed();
         }));
         beforeEach(() => {
@@ -127,8 +139,8 @@ describe('FileDownloadLinkComponent', () => {
           fixture.detectChanges();
         });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', {a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} }}));
-          expect(component.canDownload$).toBeObservable(cold('--a', {a: false}));
+          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
+          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
 
         });
         it('should init the component', () => {
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..9ea79c8d3c 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,17 +1,32 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Bitstream } from '../../core/shared/bitstream.model';
-import { getBitstreamDownloadRoute, getBitstreamRequestACopyRoute } from '../../app-routing-paths';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import {
+  getBitstreamDownloadRoute,
+  getBitstreamRequestACopyRoute,
+} from '../../app-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 '../empty.util';
-import { map } from 'rxjs/operators';
-import { of as observableOf, combineLatest as observableCombineLatest, Observable } from 'rxjs';
+import { Bitstream } from '../../core/shared/bitstream.model';
 import { Item } from '../../core/shared/item.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
 
 @Component({
   selector: 'ds-file-download-link',
   templateUrl: './file-download-link.component.html',
-  styleUrls: ['./file-download-link.component.scss']
+  styleUrls: ['./file-download-link.component.scss'],
 })
 /**
  * Component displaying a download link
@@ -56,7 +71,7 @@ export class FileDownloadLinkComponent implements OnInit {
       this.canDownload$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
       const canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
       this.bitstreamPath$ = observableCombineLatest([this.canDownload$, canRequestACopy$]).pipe(
-        map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy))
+        map(([canDownload, canRequestACopy]) => this.getBitstreamPath(canDownload, canRequestACopy)),
       );
     } else {
       this.bitstreamPath$ = observableOf(this.getBitstreamDownloadPath());
@@ -74,7 +89,7 @@ export class FileDownloadLinkComponent implements OnInit {
   getBitstreamDownloadPath() {
     return {
       routerLink: getBitstreamDownloadRoute(this.bitstream),
-      queryParams: {}
+      queryParams: {},
     };
   }
 }
diff --git a/src/app/shared/file-download-link/themed-file-download-link.component.ts b/src/app/shared/file-download-link/themed-file-download-link.component.ts
new file mode 100644
index 0000000000..b2746151d7
--- /dev/null
+++ b/src/app/shared/file-download-link/themed-file-download-link.component.ts
@@ -0,0 +1,42 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { Item } from '../../core/shared/item.model';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { FileDownloadLinkComponent } from './file-download-link.component';
+
+@Component({
+  selector: 'ds-themed-file-download-link',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedFileDownloadLinkComponent extends ThemedComponent<FileDownloadLinkComponent> {
+
+  @Input() bitstream: Bitstream;
+
+  @Input() item: Item;
+
+  @Input() cssClasses: string;
+
+  @Input() isBlank: boolean;
+
+  @Input() enableRequestACopy: boolean;
+
+  protected inAndOutputNames: (keyof FileDownloadLinkComponent & keyof this)[] = ['bitstream', 'item', 'cssClasses', 'isBlank', 'enableRequestACopy'];
+
+  protected getComponentName(): string {
+    return 'FileDownloadLinkComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/file-download-link/file-download-link.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./file-download-link.component');
+  }
+
+}
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 2381ada66d..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
@@ -16,7 +16,7 @@
         <ng-container #componentViewContainer></ng-container>
       </div>
 
-      <small *ngIf="hasHint && ((!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
+      <small *ngIf="hasHint && (formBuilderService.hasArrayGroupValue(model) || (!model.repeatable && (isRelationship === false || value?.value === null)) || (model.repeatable === true && context?.index === context?.context?.groups?.length - 1)) && (!showErrorMessages || errorMessages.length === 0)"
              class="text-muted ds-hint" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
       <!-- In case of repeatable fields show empty space for all elements except the first -->
       <div *ngIf="context?.index !== null
@@ -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 e0e519aaa9..9aa7cf57d5 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
@@ -1,11 +1,24 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement, NgZone, SimpleChange } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+  NgZone,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
 import {
   DynamicCheckboxGroupModel,
   DynamicCheckboxModel,
@@ -25,7 +38,9 @@ import {
   DynamicSliderModel,
   DynamicSwitchModel,
   DynamicTextAreaModel,
-  DynamicTimePickerModel, MATCH_VISIBLE, OR_OPERATOR
+  DynamicTimePickerModel,
+  MATCH_VISIBLE,
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
 import {
   DynamicNGBootstrapCalendarComponent,
@@ -35,56 +50,58 @@ import {
   DynamicNGBootstrapRadioGroupComponent,
   DynamicNGBootstrapSelectComponent,
   DynamicNGBootstrapTextAreaComponent,
-  DynamicNGBootstrapTimePickerComponent
+  DynamicNGBootstrapTimePickerComponent,
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-
-import {
-  DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn
-} from './ds-dynamic-form-control-container.component';
-import { SharedModule } from '../../../shared.module';
-import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model';
-import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
-import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
-import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
-import { DynamicLookupModel } from './models/lookup/dynamic-lookup.model';
-import { DynamicScrollableDropdownModel } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { DynamicTagModel } from './models/tag/dynamic-tag.model';
-import { DynamicOneboxModel } from './models/onebox/dynamic-onebox.model';
-import { DynamicQualdropModel } from './models/ds-dynamic-qualdrop.model';
-import { DynamicLookupNameModel } from './models/lookup/dynamic-lookup-name.model';
-import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
-import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
-import { DsDynamicListComponent } from './models/list/dynamic-list.component';
-import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
-import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
-import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
-import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
-import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { ItemDataService } from '../../../../core/data/item-data.service';
 import { Store } from '@ngrx/store';
-import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { of as observableOf } from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { environment } from '../../../../../environments/environment';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { FormService } from '../../form.service';
+import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
+import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { SubmissionService } from '../../../../submission/submission.service';
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { SharedModule } from '../../../shared.module';
+import { FormService } from '../../form.service';
 import { FormBuilderService } from '../form-builder.service';
-import { NgxMaskModule } from 'ngx-mask';
+import {
+  DsDynamicFormControlContainerComponent,
+  dsDynamicFormControlMapFn,
+} from './ds-dynamic-form-control-container.component';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
+import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
+import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
+import { DynamicDsDatePickerModel } from './models/date-picker/date-picker.model';
+import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DynamicQualdropModel } from './models/ds-dynamic-qualdrop.model';
+import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
+import { DsDynamicListComponent } from './models/list/dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
+import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
+import { DynamicLookupModel } from './models/lookup/dynamic-lookup.model';
+import { DynamicLookupNameModel } from './models/lookup/dynamic-lookup-name.model';
+import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
+import { DynamicOneboxModel } from './models/onebox/dynamic-onebox.model';
+import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
+import { DynamicRelationGroupModel } from './models/relation-group/dynamic-relation-group.model';
+import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DynamicScrollableDropdownModel } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
+import { DynamicTagModel } from './models/tag/dynamic-tag.model';
 
 function getMockDsDynamicTypeBindRelationService(): DsDynamicTypeBindRelationService {
   return jasmine.createSpyObj('DsDynamicTypeBindRelationService', {
     getRelatedFormModel: jasmine.createSpy('getRelatedFormModel'),
     matchesCondition: jasmine.createSpy('matchesCondition'),
-    subscribeRelations: jasmine.createSpy('subscribeRelations')
+    subscribeRelations: jasmine.createSpy('subscribeRelations'),
   });
 }
 
@@ -92,7 +109,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   const vocabularyOptions: VocabularyOptions = {
     name: 'type_programme',
-    closed: false
+    closed: false,
   };
   const formModel = [
     new DynamicCheckboxModel({ id: 'checkbox' }),
@@ -109,7 +126,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     new DynamicSelectModel({
       id: 'select',
       options: [{ value: 'One' }, { value: 'Two' }],
-      value: 'One'
+      value: 'One',
     }),
     new DynamicSliderModel({ id: 'slider' }),
     new DynamicSwitchModel({ id: 'switch' }),
@@ -124,8 +141,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       typeBindRelations: [{
         match: MATCH_VISIBLE,
         operator: OR_OPERATOR,
-        when: [{id: 'dc.type', value: 'Book'}]
-      }]
+        when: [{ id: 'dc.type', value: 'Book' }],
+      }],
     }),
     new DynamicScrollableDropdownModel({
       id: 'scrollableDropdown',
@@ -133,24 +150,26 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
     new DynamicTagModel({
       id: 'tag',
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
     new DynamicListCheckboxGroupModel({
       id: 'checkboxList',
       vocabularyOptions: vocabularyOptions,
-      repeatable: true
+      repeatable: true,
+      required: false,
     }),
     new DynamicListRadioGroupModel({
       id: 'radioList',
       vocabularyOptions: vocabularyOptions,
-      repeatable: false
+      repeatable: false,
+      required: false,
     }),
     new DynamicRelationGroupModel({
       submissionId: '1234',
@@ -163,27 +182,27 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       submissionScope: '',
       repeatable: false,
       metadataFields: [],
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
-    new DynamicDsDatePickerModel({ id: 'datepicker' }),
+    new DynamicDsDatePickerModel({ id: 'datepicker', repeatable: false }),
     new DynamicLookupModel({
       id: 'lookup',
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
     new DynamicLookupNameModel({
       id: 'lookupName',
       metadataFields: [],
       repeatable: false,
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     }),
-    new DynamicQualdropModel({ id: 'combobox', readOnly: false, required: false })
+    new DynamicQualdropModel({ id: 'combobox', readOnly: false, required: false }),
   ];
   const testModel = formModel[8];
-  let formGroup: FormGroup;
+  let formGroup: UntypedFormGroup;
   let fixture: ComponentFixture<DsDynamicFormControlContainerComponent>;
   let component: DsDynamicFormControlContainerComponent;
   let debugElement: DebugElement;
@@ -196,8 +215,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     TestBed.overrideModule(BrowserDynamicTestingModule, {
 
       set: {
-        entryComponents: [DynamicNGBootstrapInputComponent]
-      }
+        entryComponents: [DynamicNGBootstrapInputComponent],
+      },
     });
 
     TestBed.configureTestingModule({
@@ -227,12 +246,13 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         {
           provide: SubmissionObjectDataService,
           useValue: {
-            findById: () => observableOf(createSuccessfulRemoteDataObject(testWSI))
-          }
+            findById: () => observableOf(createSuccessfulRemoteDataObject(testWSI)),
+          },
         },
-        { provide: NgZone, useValue: new NgZone({}) }
+        { provide: NgZone, useValue: new NgZone({}) },
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents().then(() => {
 
       fixture = TestBed.createComponent(DsDynamicFormControlContainerComponent);
@@ -256,7 +276,7 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     component.ngOnChanges({
 
       group: new SimpleChange(null, component.group, true),
-      model: new SimpleChange(null, component.model, true)
+      model: new SimpleChange(null, component.model, true),
     });
 
     fixture.detectChanges();
@@ -265,8 +285,8 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
 
   it('should initialize correctly', () => {
     expect(component.context).toBeNull();
-    expect(component.control instanceof FormControl).toBe(true);
-    expect(component.group instanceof FormGroup).toBe(true);
+    expect(component.control instanceof UntypedFormControl).toBe(true);
+    expect(component.group instanceof UntypedFormGroup).toBe(true);
     expect(component.model instanceof DynamicFormControlModel).toBe(true);
     expect(component.hasErrorMessaging).toBe(false);
 
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 812735e69c..8ac7ea02c3 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
@@ -5,6 +5,7 @@ import {
   ComponentFactoryResolver,
   ContentChildren,
   EventEmitter,
+  Inject,
   Input,
   NgZone,
   OnChanges,
@@ -15,10 +16,16 @@ import {
   SimpleChanges,
   Type,
   ViewChild,
-  ViewContainerRef
+  ViewContainerRef,
 } from '@angular/core';
-import { FormArray, FormGroup } from '@angular/forms';
-
+import {
+  UntypedFormArray,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
@@ -53,71 +60,93 @@ import {
   DynamicNGBootstrapRadioGroupComponent,
   DynamicNGBootstrapSelectComponent,
   DynamicNGBootstrapTextAreaComponent,
-  DynamicNGBootstrapTimePickerComponent
+  DynamicNGBootstrapTimePickerComponent,
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { ReorderableRelationship } from './existing-metadata-list-element/existing-metadata-list-element.component';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  find,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { DYNAMIC_FORM_CONTROL_TYPE_ONEBOX } from './models/onebox/dynamic-onebox.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP } from './models/lookup/dynamic-lookup.model';
-import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
-import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
-import { hasNoValue, hasValue, isNotEmpty, isNotUndefined } from '../../../empty.util';
-import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME } from './models/lookup/dynamic-lookup-name.model';
-import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
-import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
-import { DsDynamicListComponent } from './models/list/dynamic-list.component';
-import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
-import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
-import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
-import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
-import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
-import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
-import { find, map, startWith, switchMap, take } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
-import { SearchResult } from '../../../search/models/search-result.model';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { AppState } from '../../../../app.reducer';
+import { ItemDataService } from '../../../../core/data/item-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RelationshipDataService } from '../../../../core/data/relationship-data.service';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
-import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
-import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+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,
+  VIRTUAL_METADATA_PREFIX,
+} from '../../../../core/shared/metadata.models';
 import {
   getAllSucceededRemoteData,
   getFirstSucceededRemoteData,
   getFirstSucceededRemoteDataPayload,
   getPaginatedListPayload,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../../../core/shared/operators';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { Item } from '../../../../core/shared/item.model';
-import { ItemDataService } from '../../../../core/data/item-data.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../../app.reducer';
-import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { SubmissionObject } from '../../../../core/submission/models/submission-object.model';
-import { PaginatedList } from '../../../../core/data/paginated-list.model';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { Collection } from '../../../../core/shared/collection.model';
-import { MetadataValue, VIRTUAL_METADATA_PREFIX } from '../../../../core/shared/metadata.models';
-import { FormService } from '../../form.service';
-import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer';
-import { SubmissionService } from '../../../../submission/submission.service';
-import { followLink } from '../../../utils/follow-link-config.model';
+import { SubmissionObjectDataService } from '../../../../core/submission/submission-object-data.service';
 import { paginatedRelationsToItems } from '../../../../item-page/simple/item-types/shared/item-relationships-utils';
-import { RelationshipOptions } from '../models/relationship-options.model';
+import { SubmissionService } from '../../../../submission/submission.service';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../../empty.util';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { SelectableListState } from '../../../object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { SearchResult } from '../../../search/models/search-result.model';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { itemLinksToFollow } from '../../../utils/relation-query.utils';
+import { FormService } from '../../form.service';
 import { FormBuilderService } from '../form-builder.service';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { RelationshipOptions } from '../models/relationship-options.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
+import { ReorderableRelationship } from './existing-metadata-list-element/existing-metadata-list-element.component';
+import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-array.component';
+import { CustomSwitchComponent } from './models/custom-switch/custom-switch.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH } from './models/custom-switch/custom-switch.model';
+import { DsDatePickerComponent } from './models/date-picker/date-picker.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/date-picker.model';
+import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicDisabledComponent } from './models/disabled/dynamic-disabled.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_DISABLED } from './models/disabled/dynamic-disabled.model';
+import { DsDynamicFormGroupComponent } from './models/form-group/dynamic-form-group.component';
+import { DsDynamicListComponent } from './models/list/dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './models/list/dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './models/list/dynamic-list-radio-group.model';
+import { DsDynamicLookupComponent } from './models/lookup/dynamic-lookup.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP } from './models/lookup/dynamic-lookup.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME } from './models/lookup/dynamic-lookup-name.model';
+import { DsDynamicOneboxComponent } from './models/onebox/dynamic-onebox.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_ONEBOX } from './models/onebox/dynamic-onebox.model';
+import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
+import { DsDynamicScrollableDropdownComponent } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DsDynamicTagComponent } from './models/tag/dynamic-tag.component';
+import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './models/tag/dynamic-tag.model';
+import { DsDynamicLookupRelationModalComponent } from './relation-lookup-modal/dynamic-lookup-relation-modal.component';
 
 export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<DynamicFormControl> | null {
   switch (model.type) {
@@ -131,9 +160,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
       return (model instanceof DynamicListCheckboxGroupModel) ? DsDynamicListComponent : DynamicNGBootstrapCheckboxGroupComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER:
-      const datepickerModel = model as DynamicDatePickerModel;
-
-      return datepickerModel.inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent;
+      return (model as DynamicDatePickerModel).inline ? DynamicNGBootstrapCalendarComponent : DsDatePickerInlineComponent;
 
     case DYNAMIC_FORM_CONTROL_TYPE_GROUP:
       return DsDynamicFormGroupComponent;
@@ -189,7 +216,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
   selector: 'ds-dynamic-form-control-container',
   styleUrls: ['./ds-dynamic-form-control-container.component.scss'],
   templateUrl: './ds-dynamic-form-control-container.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
@@ -197,12 +224,12 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
   @Input() hasMetadataModel: any;
   @Input() formId: string;
-  @Input() formGroup: FormGroup;
+  @Input() formGroup: UntypedFormGroup;
   @Input() formModel: DynamicFormControlModel[];
   @Input() asBootstrapFormGroup = false;
   @Input() bindId = true;
   @Input() context: any | null = null;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() hostClass: string[];
   @Input() hasErrorMessaging = false;
   @Input() layout = null as DynamicFormLayout;
@@ -231,6 +258,11 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
 
   private showErrorMessagesPreviousStage: boolean;
 
+  /**
+   * Determines whether to request embedded thumbnail.
+   */
+  fetchThumbnail: boolean;
+
   get componentType(): Type<DynamicFormControl> | null {
     return dsDynamicFormControlMapFn(this.model);
   }
@@ -252,10 +284,12 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     private submissionObjectService: SubmissionObjectDataService,
     private ref: ChangeDetectorRef,
     private formService: FormService,
-    private formBuilderService: FormBuilderService,
-    private submissionService: SubmissionService
+    public formBuilderService: FormBuilderService,
+    private submissionService: SubmissionService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(ref, componentFactoryResolver, layoutService, validationService, dynamicFormComponentService, relationService);
+    this.fetchThumbnail = this.appConfig.browseBy.showThumbnails;
   }
 
   /**
@@ -283,12 +317,11 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
               true,
               followLink('leftItem'),
               followLink('rightItem'),
-              followLink('relationshipType')
+              followLink('relationshipType'),
             );
-
             relationshipsRD$.pipe(
               getFirstSucceededRemoteDataPayload(),
-              getPaginatedListPayload()
+              getPaginatedListPayload(),
             ).subscribe((relationships: Relationship[]) => {
               // set initial namevariants for pre-existing relationships
               relationships.forEach((relationship: Relationship) => {
@@ -305,7 +338,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
               getFirstSucceededRemoteData(),
               map((items: RemoteData<PaginatedList<Item>>) => items.payload.page.map((i) => Object.assign(new ItemSearchResult(), { indexableObject: i }))),
             );
-          })
+          }),
         ).subscribe((relatedItems: SearchResult<Item>[]) => this.selectableListService.select(this.listId, relatedItems));
         this.subs.push(subscription);
       }
@@ -317,10 +350,12 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
       }
 
       if (hasValue(this.value) && this.value.isVirtual) {
-        const relationship$ = this.relationshipService.findById(this.value.virtualValue, true, true, followLink('leftItem'), followLink('rightItem'), followLink('relationshipType'))
-          .pipe(
-            getAllSucceededRemoteData(),
-            getRemoteDataPayload());
+        const relationship$ = this.relationshipService.findById(this.value.virtualValue,
+          true,
+          true,
+          ... itemLinksToFollow(this.fetchThumbnail)).pipe(
+          getAllSucceededRemoteData(),
+          getRemoteDataPayload());
         this.relationshipValue$ = observableCombineLatest([this.item$.pipe(take(1)), relationship$]).pipe(
           switchMap(([item, relationship]: [Item, Relationship]) =>
             relationship.leftItem.pipe(
@@ -329,9 +364,9 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
               map((leftItem: Item) => {
                 return new ReorderableRelationship(relationship, leftItem.uuid !== item.uuid, this.store, this.model.submissionId);
               }),
-            )
+            ),
           ),
-          startWith(undefined)
+          startWith(undefined),
         );
       }
     }
@@ -415,7 +450,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
    */
   openLookup() {
     this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
-      size: 'lg'
+      size: 'lg',
     });
 
     if (hasValue(this.model.value)) {
@@ -424,7 +459,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         context: this.context,
         control: this.control,
         model: this.model,
-        type: DynamicFormControlEventType.Focus
+        type: DynamicFormControlEventType.Focus,
       } as DynamicFormControlEvent);
 
       this.change.emit({
@@ -432,7 +467,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
         context: this.context,
         control: this.control,
         model: this.model,
-        type: DynamicFormControlEventType.Change
+        type: DynamicFormControlEventType.Change,
       } as DynamicFormControlEvent);
     }
 
@@ -465,7 +500,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   onRemove(): void {
     const arrayContext: DynamicFormArrayModel = (this.context as DynamicFormArrayGroupModel).context;
     const path = this.formBuilderService.getPath(arrayContext);
-    const formArrayControl = this.group.root.get(path) as FormArray;
+    const formArrayControl = this.group.root.get(path) as UntypedFormArray;
     this.formBuilderService.removeFormArrayGroup(this.context.index, formArrayControl, arrayContext);
     if (this.model.parent.context.groups.length === 0) {
       this.formBuilderService.addFormArrayGroup(formArrayControl, arrayContext);
@@ -492,7 +527,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     const submissionObject$ = this.submissionObjectService
       .findById(this.model.submissionId, true, true, followLink('item'), followLink('collection')).pipe(
         getAllSucceededRemoteData(),
-        getRemoteDataPayload()
+        getRemoteDataPayload(),
       );
 
     this.item$ = submissionObject$.pipe(switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
index 537a1f0f52..8ce98b4eb1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.ts
@@ -6,28 +6,29 @@ import {
   Input,
   Output,
   QueryList,
-  ViewChildren
+  ViewChildren,
 } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormComponent,
+  DynamicFormComponentService,
   DynamicFormControlContainerComponent,
   DynamicFormControlEvent,
   DynamicFormControlModel,
   DynamicFormLayout,
-  DynamicFormComponentService,
   DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+
 import { DsDynamicFormControlContainerComponent } from './ds-dynamic-form-control-container.component';
 
 @Component({
   selector: 'ds-dynamic-form',
-  templateUrl: './ds-dynamic-form.component.html'
+  templateUrl: './ds-dynamic-form.component.html',
 })
 export class DsDynamicFormComponent extends DynamicFormComponent {
 
   @Input() formId: string;
-  @Input() formGroup: FormGroup;
+  @Input() formGroup: UntypedFormGroup;
   @Input() formModel: DynamicFormControlModel[];
   @Input() formLayout: DynamicFormLayout;
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
index f8bc7ea886..a54e379cac 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service.spec.ts
@@ -1,23 +1,31 @@
-import {inject, TestBed} from '@angular/core/testing';
-
+import { Injector } from '@angular/core';
 import {
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormControl,
+} from '@angular/forms';
+import {
+  DISABLED_MATCHER_PROVIDER,
   DynamicFormControlRelation,
   DynamicFormRelationService,
+  HIDDEN_MATCHER,
+  HIDDEN_MATCHER_PROVIDER,
   MATCH_VISIBLE,
   OR_OPERATOR,
-  HIDDEN_MATCHER,
-  HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER, DISABLED_MATCHER_PROVIDER,
+  REQUIRED_MATCHER_PROVIDER,
 } from '@ng-dynamic-forms/core';
 
+import { getMockFormBuilderService } from '../../../mocks/form-builder-service.mock';
 import {
-  mockInputWithTypeBindModel, MockRelationModel, mockDcTypeInputModel
+  mockInputWithTypeBindModel,
+  MockRelationModel,
 } from '../../../mocks/form-models.mock';
-import {DsDynamicTypeBindRelationService} from './ds-dynamic-type-bind-relation.service';
-import {FormFieldMetadataValueObject} from '../models/form-field-metadata-value.model';
-import {FormControl, ReactiveFormsModule} from '@angular/forms';
-import {FormBuilderService} from '../form-builder.service';
-import {getMockFormBuilderService} from '../../../mocks/form-builder-service.mock';
-import {Injector} from '@angular/core';
+import { FormBuilderService } from '../form-builder.service';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { DsDynamicTypeBindRelationService } from './ds-dynamic-type-bind-relation.service';
 
 describe('DSDynamicTypeBindRelationService test suite', () => {
   let service: DsDynamicTypeBindRelationService;
@@ -31,30 +39,30 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: DsDynamicTypeBindRelationService, useClass: DsDynamicTypeBindRelationService },
         { provide: DynamicFormRelationService },
-        DISABLED_MATCHER_PROVIDER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER
-      ]
+        DISABLED_MATCHER_PROVIDER, HIDDEN_MATCHER_PROVIDER, REQUIRED_MATCHER_PROVIDER,
+      ],
     }).compileComponents().then();
   });
 
   beforeEach(inject([DsDynamicTypeBindRelationService, DynamicFormRelationService],
     (relationService: DsDynamicTypeBindRelationService,
-     formRelationService: DynamicFormRelationService,
+      formRelationService: DynamicFormRelationService,
     ) => {
-    service = relationService;
-    dynamicFormRelationService = formRelationService;
-  }));
+      service = relationService;
+      dynamicFormRelationService = formRelationService;
+    }));
 
   describe('Test getTypeBindValue method', () => {
     it('Should get type bind "boundType" from the given metadata object value', () => {
-        const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
-          'boundType', null, null, 'Bound Type'
-        );
-        const bindType = service.getTypeBindValue(mockMetadataValueObject);
-        expect(bindType).toBe('boundType');
+      const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
+        'boundType', null, null, 'Bound Type',
+      );
+      const bindType = service.getTypeBindValue(mockMetadataValueObject);
+      expect(bindType).toBe('boundType');
     });
     it('Should get type authority key "bound-auth-key" from the given metadata object value', () => {
       const mockMetadataValueObject: FormFieldMetadataValueObject = new FormFieldMetadataValueObject(
-        'boundType', null, 'bound-auth-key', 'Bound Type'
+        'boundType', null, 'bound-auth-key', 'Bound Type',
       );
       const bindType = service.getTypeBindValue(mockMetadataValueObject);
       expect(bindType).toBe('bound-auth-key');
@@ -87,7 +95,7 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
     it('Should receive one subscription to dc.type type binding"', () => {
       const testModel = mockInputWithTypeBindModel;
       testModel.typeBindRelations = getTypeBindRelations(['boundType']);
-      const dcTypeControl = new FormControl();
+      const dcTypeControl = new UntypedFormControl();
       dcTypeControl.setValue('boundType');
       let subscriptions = service.subscribeRelations(testModel, dcTypeControl);
       expect(subscriptions).toHaveSize(1);
@@ -96,7 +104,7 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
     it('Expect hasMatch to be true (ie. this should be hidden)', () => {
       const testModel = mockInputWithTypeBindModel;
       testModel.typeBindRelations = getTypeBindRelations(['boundType']);
-      const dcTypeControl = new FormControl();
+      const dcTypeControl = new UntypedFormControl();
       dcTypeControl.setValue('boundType');
       testModel.typeBindRelations[0].when[0].value = 'anotherType';
       const relation = dynamicFormRelationService.findRelationByMatcher((testModel as any).typeBindRelations, HIDDEN_MATCHER);
@@ -111,7 +119,7 @@ describe('DSDynamicTypeBindRelationService test suite', () => {
     it('Expect hasMatch to be false (ie. this should NOT be hidden)', () => {
       const testModel = mockInputWithTypeBindModel;
       testModel.typeBindRelations = getTypeBindRelations(['boundType']);
-      const dcTypeControl = new FormControl();
+      const dcTypeControl = new UntypedFormControl();
       dcTypeControl.setValue('boundType');
       testModel.typeBindRelations[0].when[0].value = 'boundType';
       const relation = dynamicFormRelationService.findRelationByMatcher((testModel as any).typeBindRelations, HIDDEN_MATCHER);
@@ -132,12 +140,12 @@ function getTypeBindRelations(configuredTypeBindValues: string[]): DynamicFormCo
   configuredTypeBindValues.forEach((value) => {
     bindValues.push({
       id: 'dc.type',
-      value: value
+      value: value,
     });
   });
   return [{
     match: MATCH_VISIBLE,
     operator: OR_OPERATOR,
-    when: bindValues
+    when: bindValues,
   }];
 }
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 5dd4a6627d..baf673db6c 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
@@ -1,9 +1,10 @@
-import { Inject, Injectable, Injector, Optional } from '@angular/core';
-import { FormControl } from '@angular/forms';
-
-import { Subscription } from 'rxjs';
-import { startWith } from 'rxjs/operators';
-
+import {
+  Inject,
+  Injectable,
+  Injector,
+  Optional,
+} from '@angular/core';
+import { UntypedFormControl } from '@angular/forms';
 import {
   AND_OPERATOR,
   DYNAMIC_MATCHERS,
@@ -11,11 +12,17 @@ import {
   DynamicFormControlMatcher,
   DynamicFormControlModel,
   DynamicFormControlRelation,
-  DynamicFormRelationService, MATCH_VISIBLE,
-  OR_OPERATOR
+  DynamicFormRelationService,
+  MATCH_VISIBLE,
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
+import { Subscription } from 'rxjs';
+import { startWith } from 'rxjs/operators';
 
-import {hasNoValue, hasValue} from '../../../empty.util';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
 import { FormBuilderService } from '../form-builder.service';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-constants';
@@ -172,7 +179,7 @@ export class DsDynamicTypeBindRelationService {
    * @param model
    * @param control
    */
-  subscribeRelations(model: DynamicFormControlModel, control: FormControl): Subscription[] {
+  subscribeRelations(model: DynamicFormControlModel, control: UntypedFormControl): Subscription[] {
 
     const relatedModels = this.getRelatedFormModel(model);
     const subscriptions: Subscription[] = [];
@@ -183,8 +190,9 @@ 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(
-          startWith(initValue)
+        const updateSubject = (relatedModel.type === 'CHECKBOX_GROUP' ? relatedModel.valueUpdates : relatedModel.valueChanges);
+        const valueChanges = updateSubject.pipe(
+          startWith(initValue),
         );
 
         // Build up the subscriptions to watch for changes;
@@ -217,13 +225,13 @@ export class DsDynamicTypeBindRelationService {
     configuredTypeBindValues.forEach((value) => {
       bindValues.push({
         id: 'dc.type',
-        value: value
+        value: value,
       });
     });
     return [{
       match: MATCH_VISIBLE,
       operator: OR_OPERATOR,
-      when: bindValues
+      when: bindValues,
     }];
   }
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
index 62d34a8625..001e0bc339 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex">
     <span class="mr-auto text-contents">
-        <ng-container *ngIf="!(metadataRepresentation$ | async)">
+        <ng-container *ngIf="(metadataRepresentation$ | async) === undefined">
             <ds-themed-loading [showMessage]="false"></ds-themed-loading>
         </ng-container>
         <ng-container *ngIf="(metadataRepresentation$ | async)">
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
index 1146e55750..8b13789179 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
@@ -1,3 +1 @@
-span.text-contents{
-    padding: var(--bs-btn-padding-y) 0;
-}
+
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
index b5af2a8843..e0efc6d0ea 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
@@ -1,23 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import {
-  ExistingMetadataListElementComponent,
-  ReorderableRelationship
-} from './existing-metadata-list-element.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../../testing/translate-loader.mock';
 import { SubmissionService } from '../../../../../submission/submission.service';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { SubmissionServiceStub } from '../../../../testing/submission-service.stub';
+import { TranslateLoaderMock } from '../../../../testing/translate-loader.mock';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import {
+  ExistingMetadataListElementComponent,
+  ReorderableRelationship,
+} from './existing-metadata-list-element.component';
 
 describe('ExistingMetadataListElementComponent', () => {
   let component: ExistingMetadataListElementComponent;
@@ -52,14 +59,14 @@ describe('ExistingMetadataListElementComponent', () => {
       relationshipType: 'isPublicationOfAuthor',
       filter: 'test.filter',
       searchConfiguration: 'personConfiguration',
-      nameVariants: true
+      nameVariants: true,
     });
     relatedItem = Object.assign(new Item(), { uuid: uuid2 });
     leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
     rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
     relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
     relationshipService = {
-      updatePlace: () => observableOf({})
+      updatePlace: () => observableOf({}),
     } as any;
 
     relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
@@ -76,9 +83,9 @@ describe('ExistingMetadataListElementComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ExistingMetadataListElementComponent],
       providers: [
@@ -86,7 +93,7 @@ describe('ExistingMetadataListElementComponent', () => {
         { provide: Store, useValue: store },
         { provide: SubmissionService, useValue: submissionServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
index 3160bccb41..38e5f6454f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -1,26 +1,47 @@
 /* eslint-disable max-classes-per-file */
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
-import { FormControl } from '@angular/forms';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormControl } from '@angular/forms';
 import { DynamicFormArrayGroupModel } from '@ng-dynamic-forms/core';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter, take } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  take,
+} from 'rxjs/operators';
+
 import { AppState } from '../../../../../app.reducer';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.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 { ItemMetadataRepresentation } from '../../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { MetadataRepresentation } from '../../../../../core/shared/metadata-representation/metadata-representation.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../empty.util';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer';
+import { SubmissionService } from '../../../../../submission/submission.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 import { DynamicConcatModel } from '../models/ds-dynamic-concat.model';
 import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { SubmissionService } from '../../../../../submission/submission.service';
-import { SubmissionObjectEntry } from '../../../../../submission/objects/submission-objects.reducer';
 
 /**
  * Abstract class that defines objects that can be reordered
@@ -64,10 +85,10 @@ export class ReorderableFormFieldMetadataValue extends Reorderable {
   constructor(
     public metadataValue: FormFieldMetadataValueObject,
     public model: DynamicConcatModel,
-    public control: FormControl,
+    public control: UntypedFormControl,
     public group: DynamicFormArrayGroupModel,
     oldIndex?: number,
-    newIndex?: number
+    newIndex?: number,
   ) {
     super(oldIndex, newIndex);
     this.metadataValue = metadataValue;
@@ -136,7 +157,7 @@ export class ReorderableRelationship extends Reorderable {
 @Component({
   selector: 'ds-existing-metadata-list-element',
   templateUrl: './existing-metadata-list-element.component.html',
-  styleUrls: ['./existing-metadata-list-element.component.scss']
+  styleUrls: ['./existing-metadata-list-element.component.scss'],
 })
 export class ExistingMetadataListElementComponent implements OnInit, OnChanges, OnDestroy   {
   @Input() listId: string;
@@ -156,7 +177,7 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
   constructor(
     private selectableListService: SelectableListService,
     private store: Store<AppState>,
-    private submissionService: SubmissionService
+    private submissionService: SubmissionService,
   ) {
   }
 
@@ -174,7 +195,7 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
       this.subs.push(item$.pipe(
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       ).subscribe((item: Item) => {
         this.relatedItem = item;
         const relationMD: MetadataValue = this.submissionItem.firstMetadata(this.relationshipOptions.metadataField, { value: this.relatedItem.uuid });
@@ -183,7 +204,7 @@ export class ExistingMetadataListElementComponent implements OnInit, OnChanges,
 
           const nextValue = Object.assign(
             new ItemMetadataRepresentation(metadataRepresentationMD),
-            this.relatedItem
+            this.relatedItem,
           );
           this.metadataRepresentation$.next(nextValue);
         }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
index ff91b18e1c..5a5bd2ff2a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.html
@@ -1,12 +1,12 @@
 <div class="d-flex">
-    <span class="mr-auto text-contents">
-        <ng-container *ngIf="!(relatedItem$ | async)">
+    <div class="flex-grow-1 mr-auto">
+        <ng-container *ngIf="(relatedItem$ | async) === undefined">
             <ds-themed-loading [showMessage]="false"></ds-themed-loading>
         </ng-container>
         <ng-container *ngIf="(relatedItem$ | async)">
             <ds-listable-object-component-loader [showLabel]="false" [viewMode]="viewType" [object]="(relatedItem$ | async)"></ds-listable-object-component-loader>
         </ng-container>
-    </span>
+    </div>
     <button type="button" class="btn btn-secondary"
             (click)="removeSelection()">
         <i class="fas fa-trash" aria-hidden="true"></i>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
index d733f503bb..5dc0a5894e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.spec.ts
@@ -1,19 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { ExistingRelationListElementComponent } from './existing-relation-list-element.component';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
+
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { of as observableOf } from 'rxjs';
-import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { SubmissionService } from '../../../../../submission/submission.service';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { SubmissionServiceStub } from '../../../../testing/submission-service.stub';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import { ExistingRelationListElementComponent } from './existing-relation-list-element.component';
 
 describe('ExistingRelationListElementComponent', () => {
   let component: ExistingRelationListElementComponent;
@@ -47,14 +51,14 @@ describe('ExistingRelationListElementComponent', () => {
       relationshipType: 'isPublicationOfAuthor',
       filter: 'test.filter',
       searchConfiguration: 'personConfiguration',
-      nameVariants: true
+      nameVariants: true,
     });
     relatedItem = Object.assign(new Item(), { uuid: uuid2 });
     leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
     rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
     relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
     relationshipService = {
-      updatePlace: () => observableOf({})
+      updatePlace: () => observableOf({}),
     } as any;
 
     relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
@@ -71,7 +75,7 @@ describe('ExistingRelationListElementComponent', () => {
         { provide: Store, useValue: store },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
index c3a8b157a6..53a83bb318 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component.ts
@@ -1,19 +1,38 @@
 /* eslint-disable max-classes-per-file */
-import { Component, EventEmitter, Input, OnChanges, OnDestroy, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Store } from '@ngrx/store';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { filter } from 'rxjs/operators';
+
 import { AppState } from '../../../../../app.reducer';
 import { Item } from '../../../../../core/shared/item.model';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
-import { hasValue, isNotEmpty } from '../../../../empty.util';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { SubmissionService } from '../../../../../submission/submission.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
 import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
 import { RelationshipOptions } from '../../models/relationship-options.model';
-import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { ReorderableRelationship } from '../existing-metadata-list-element/existing-metadata-list-element.component';
-import { SubmissionService } from '../../../../../submission/submission.service';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
 
 /**
  * Abstract class that defines objects that can be reordered
@@ -53,7 +72,7 @@ export abstract class Reorderable {
 @Component({
   selector: 'ds-existing-relation-list-element',
   templateUrl: './existing-relation-list-element.component.html',
-  styleUrls: ['./existing-relation-list-element.component.scss']
+  styleUrls: ['./existing-relation-list-element.component.scss'],
 })
 export class ExistingRelationListElementComponent implements OnInit, OnChanges, OnDestroy {
   @Input() listId: string;
@@ -74,7 +93,7 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
   constructor(
     private selectableListService: SelectableListService,
     private submissionService: SubmissionService,
-    private store: Store<AppState>
+    private store: Store<AppState>,
   ) {
   }
 
@@ -92,7 +111,7 @@ export class ExistingRelationListElementComponent implements OnInit, OnChanges,
       this.subs.push(item$.pipe(
         getAllSucceededRemoteData(),
         getRemoteDataPayload(),
-        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid))
+        filter((item: Item) => hasValue(item) && isNotEmpty(item.uuid)),
       ).subscribe((item: Item) => {
         this.relatedItem$.next(item);
       }));
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 d518d59da2..dd19e6158d 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
@@ -12,12 +12,11 @@
              [formGroupName]="idx"
              [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
              cdkDrag
-             cdkDragHandle
              [cdkDragDisabled]="dragDisabled"
              [cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
              [class.grey-background]="model.isInlineGroupArray">
           <!-- Item content -->
-          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0">
+          <div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0" cdkDragHandle>
             <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>
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 01bba74cc8..40cbc38a48 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
@@ -1,6 +1,12 @@
 import { CdkDragDrop } from '@angular/cdk/drag-drop';
-import { Component, EventEmitter, Input, Output, QueryList } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormArrayComponent,
   DynamicFormControlCustomEvent,
@@ -10,8 +16,9 @@ import {
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
-  DynamicTemplateDirective
+  DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
+
 import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
 import { hasValue } from '../../../../../empty.util';
 import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
@@ -19,14 +26,14 @@ import { DynamicRowArrayModel } from '../ds-dynamic-row-array-model';
 @Component({
   selector: 'ds-dynamic-form-array',
   templateUrl: './dynamic-form-array.component.html',
-  styleUrls: ['./dynamic-form-array.component.scss']
+  styleUrls: ['./dynamic-form-array.component.scss'],
 })
 export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
 
   @Input() bindId = true;
   @Input() formModel: DynamicFormControlModel[];
   @Input() formLayout: DynamicFormLayout;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() layout: DynamicFormControlLayout;
   @Input() model: DynamicRowArrayModel;// DynamicRow?
   @Input() templates: QueryList<DynamicTemplateDirective> | undefined;
@@ -62,14 +69,14 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
         index,
         arrayModel: this.model,
         model: this.model.groups[index].group[0],
-        control: (this.control as any).controls[index]
+        control: (this.control as any).controls[index],
       }, 'move');
     }
   }
 
   update(event: any, index: number) {
     const $event = Object.assign({}, event, {
-      context: { index: index - 1}
+      context: { index: index - 1 },
     });
 
     this.onChange($event);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index ed117a5021..5beb8d52da 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,4 +1,4 @@
-<div [formGroup]="group" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
+<div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control custom-switch" [class.disabled]="model.disabled">
   <input type="checkbox" class="form-check-input custom-control-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
@@ -14,7 +14,7 @@
          (change)="onChange($event)"
          (focus)="onFocus($event)"/>
   <label class="form-check-label custom-control-label" [for]="bindId && model.id">
-    <span [innerHTML]="model.label"
+    <span [innerHTML]="model.label | translate"
           [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></span>
   </label>
 </div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
index e69de29bb2..206ad17492 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
@@ -0,0 +1,16 @@
+div.custom-switch {
+  &.custom-control-right {
+    margin-left: 0;
+    margin-right: 0;
+
+    &::after {
+      right: -1.5rem;
+      left: auto;
+    }
+
+    &::before {
+      right: -2.35rem;
+      left: auto;
+    }
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
index 9f85ccc013..106569af00 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.spec.ts
@@ -1,17 +1,30 @@
-import { DynamicFormsCoreModule, DynamicFormService } from '@ng-dynamic-forms/core';
-import { FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { DynamicCustomSwitchModel } from './custom-switch.model';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  DynamicFormsCoreModule,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { CustomSwitchComponent } from './custom-switch.component';
+import { DynamicCustomSwitchModel } from './custom-switch.model';
 
 describe('CustomSwitchComponent', () => {
 
   const testModel = new DynamicCustomSwitchModel({ id: 'switch' });
   const formModel = [testModel];
-  let formGroup: FormGroup;
+  let formGroup: UntypedFormGroup;
   let fixture: ComponentFixture<CustomSwitchComponent>;
   let component: CustomSwitchComponent;
   let debugElement: DebugElement;
@@ -20,11 +33,12 @@ describe('CustomSwitchComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
+        TranslateModule.forRoot(),
         ReactiveFormsModule,
         NoopAnimationsModule,
-        DynamicFormsCoreModule.forRoot()
+        DynamicFormsCoreModule.forRoot(),
       ],
-      declarations: [CustomSwitchComponent]
+      declarations: [CustomSwitchComponent],
 
     }).compileComponents().then(() => {
       fixture = TestBed.createComponent(CustomSwitchComponent);
@@ -47,7 +61,7 @@ describe('CustomSwitchComponent', () => {
 
   it('should initialize correctly', () => {
     expect(component.bindId).toBe(true);
-    expect(component.group instanceof FormGroup).toBe(true);
+    expect(component.group instanceof UntypedFormGroup).toBe(true);
     expect(component.model instanceof DynamicCustomSwitchModel).toBe(true);
 
     expect(component.blur).toBeDefined();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts
index 5b3f1e89e4..bf166e92b8 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.ts
@@ -1,8 +1,15 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 import { DynamicNGBootstrapCheckboxComponent } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
 import { DynamicCustomSwitchModel } from './custom-switch.model';
 
@@ -24,7 +31,7 @@ export class CustomSwitchComponent extends DynamicNGBootstrapCheckboxComponent {
   /**
    * The formgroup containing this component
    */
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
 
   /**
    * The model used for displaying the switch
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts
index 97cf71c4a0..4a7e7a22be 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model.ts
@@ -2,7 +2,7 @@ import {
   DynamicCheckboxModel,
   DynamicCheckboxModelConfig,
   DynamicFormControlLayout,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_CUSTOM_SWITCH = 'CUSTOM_SWITCH';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
index 0756e48a8d..9bd7bfe4ae 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.spec.ts
@@ -1,17 +1,31 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { DebugElement } from '@angular/core';
-import { FormControl, FormGroup, ReactiveFormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { NgbDatepickerModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicDatePickerModel, DynamicFormsCoreModule, DynamicFormService } from '@ng-dynamic-forms/core';
+import {
+  DynamicDatePickerModel,
+  DynamicFormsCoreModule,
+  DynamicFormService,
+} from '@ng-dynamic-forms/core';
+
 import { DsDatePickerInlineComponent } from './dynamic-date-picker-inline.component';
 
 describe('DsDatePickerInlineComponent test suite', () => {
 
   const testModel = new DynamicDatePickerModel({ id: 'datepicker' });
   const formModel = [testModel];
-  let formGroup: FormGroup;
+  let formGroup: UntypedFormGroup;
   let fixture: ComponentFixture<DsDatePickerInlineComponent>;
   let component: DsDatePickerInlineComponent;
   let debugElement: DebugElement;
@@ -25,9 +39,9 @@ describe('DsDatePickerInlineComponent test suite', () => {
         ReactiveFormsModule,
         NoopAnimationsModule,
         NgbDatepickerModule,
-        DynamicFormsCoreModule.forRoot()
+        DynamicFormsCoreModule.forRoot(),
       ],
-      declarations: [DsDatePickerInlineComponent]
+      declarations: [DsDatePickerInlineComponent],
 
     }).compileComponents().then(() => {
 
@@ -53,8 +67,8 @@ describe('DsDatePickerInlineComponent test suite', () => {
   it('should initialize correctly', () => {
 
     expect(component.bindId).toBe(true);
-    expect(component.control instanceof FormControl).toBe(true);
-    expect(component.group instanceof FormGroup).toBe(true);
+    expect(component.control instanceof UntypedFormControl).toBe(true);
+    expect(component.group instanceof UntypedFormGroup).toBe(true);
     expect(component.model instanceof DynamicDatePickerModel).toBe(true);
 
     expect(component.blur).toBeDefined();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
index f23b6c1e7b..a6f0c45a7c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.ts
@@ -1,22 +1,31 @@
-import { Component, EventEmitter, Input, Output, ViewChild } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import { NgbDatepicker, NgbDatepickerConfig } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  NgbDatepicker,
+  NgbDatepickerConfig,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicDatePickerModel,
   DynamicFormControlComponent,
   DynamicFormControlLayout,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
 
 @Component({
   selector: 'ds-dynamic-date-picker-inline',
-  templateUrl: './dynamic-date-picker-inline.component.html'
+  templateUrl: './dynamic-date-picker-inline.component.html',
 })
 export class DsDatePickerInlineComponent extends DynamicFormControlComponent {
 
   @Input() bindId = true;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() layout: DynamicFormControlLayout;
   @Input() model: DynamicDatePickerModel;
 
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..3bf02c4abd 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"
@@ -21,7 +21,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="2"
+      tabindex="0"
       [id]="model.id + '_month'"
       [min]="minMonth"
       [max]="maxMonth"
@@ -37,7 +37,7 @@
     ></ds-number-picker>
 
     <ds-number-picker
-      tabindex="3"
+      tabindex="0"
       [id]="model.id + '_day'"
       [min]="minDay"
       [max]="maxDay"
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 4989dab93a..0fcdb518cf 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,22 +1,39 @@
 // 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 { FormControl, FormGroup } 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 {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 
-import { DsDatePickerComponent } from './date-picker.component';
-import { DynamicDsDatePickerModel } from './date-picker.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { DsDatePickerComponent } from './date-picker.component';
+import { DynamicDsDatePickerModel } from './date-picker.model';
 
-
-export const DATE_TEST_GROUP = new FormGroup({
-  date: new FormControl()
+export const DATE_TEST_GROUP = new UntypedFormGroup({
+  date: new UntypedFormControl(),
 });
 
 export const DATE_TEST_MODEL_CONFIG = {
@@ -28,7 +45,8 @@ export const DATE_TEST_MODEL_CONFIG = {
   placeholder: 'Date',
   readOnly: false,
   required: true,
-  toggleIcon: 'fas fa-calendar'
+  repeatable: false,
+  toggleIcon: 'fas fa-calendar',
 };
 
 describe('DsDatePickerComponent test suite', () => {
@@ -39,12 +57,17 @@ 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,
       ],
       declarations: [
         DsDatePickerComponent,
@@ -54,9 +77,10 @@ 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]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -108,7 +132,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should set year and enable month field when year field is entered', () => {
         const event = {
           field: 'year',
-          value: '1983'
+          value: '1983',
         };
         dateComp.onChange(event);
 
@@ -120,7 +144,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should set month and enable day field when month field is entered', () => {
         const event = {
           field: 'month',
-          value: '11'
+          value: '11',
         };
 
         dateComp.year = '1983';
@@ -138,7 +162,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should set day when day field is entered', () => {
         const event = {
           field: 'day',
-          value: '18'
+          value: '18',
         };
 
         dateComp.year = '1983';
@@ -195,7 +219,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should disable month and day fields when year field is canceled', () => {
         const event = {
           field: 'year',
-          value: null
+          value: null,
         };
         dateComp.onChange(event);
 
@@ -209,7 +233,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should disable day field when month field is canceled', () => {
         const event = {
           field: 'month',
-          value: null
+          value: null,
         };
         dateComp.onChange(event);
 
@@ -223,7 +247,7 @@ describe('DsDatePickerComponent test suite', () => {
       it('should not disable day field when day field is canceled', () => {
         const event = {
           field: 'day',
-          value: null
+          value: null,
         };
         dateComp.onChange(event);
 
@@ -233,6 +257,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);
+      }));
+
     });
   });
 
@@ -241,7 +361,7 @@ describe('DsDatePickerComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
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 78f9935829..cb8cc0eaf9 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,12 +1,26 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-import { DynamicDsDatePickerModel } from './date-picker.model';
-import { hasValue } from '../../../../../empty.util';
+import { DOCUMENT } from '@angular/common';
+import {
+  Component,
+  EventEmitter,
+  HostListener,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+  Renderer2,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlComponent,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import isEqual from 'lodash/isEqual';
+
+import { hasValue } from '../../../../../empty.util';
+import { DynamicDsDatePickerModel } from './date-picker.model';
+
+export type DatePickerFieldType = '_year' | '_month' | '_day';
 
 export const DS_DATE_PICKER_SEPARATOR = '-';
 
@@ -18,7 +32,7 @@ export const DS_DATE_PICKER_SEPARATOR = '-';
 
 export class DsDatePickerComponent extends DynamicFormControlComponent implements OnInit {
   @Input() bindId = true;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: DynamicDsDatePickerModel;
   @Input() legend: string;
 
@@ -50,8 +64,12 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
   disabledMonth = true;
   disabledDay = true;
 
+  private readonly fields: DatePickerFieldType[] = ['_year', '_month', '_day'];
+
   constructor(protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
+              private renderer: Renderer2,
+              @Inject(DOCUMENT) private _document: Document,
   ) {
     super(layoutService, validationService);
   }
@@ -80,8 +98,7 @@ export class DsDatePickerComponent extends DynamicFormControlComponent implement
       }
     }
 
-    this.maxYear = this.initialYear + 100;
-
+    this.maxYear = now.getUTCFullYear() + 100;
   }
 
   onBlur(event) {
@@ -166,6 +183,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;
+    }
+    const 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);
+    const 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..1d828318cb 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
@@ -4,17 +4,25 @@ import {
   DynamicFormControlLayout,
   DynamicFormControlModel,
   DynamicFormControlRelation,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import {BehaviorSubject, Subject} from 'rxjs';
-import {isEmpty, isNotUndefined} from '../../../../../empty.util';
-import {MetadataValue} from '../../../../../../core/shared/metadata.models';
+import {
+  BehaviorSubject,
+  Subject,
+} from 'rxjs';
+
+import { MetadataValue } from '../../../../../../core/shared/metadata.models';
+import {
+  isEmpty,
+  isNotUndefined,
+} from '../../../../../empty.util';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
 
 export interface DynamicDsDateControlModelConfig extends DynamicDatePickerModelConfig {
   legend?: string;
   typeBindRelations?: DynamicFormControlRelation[];
+  repeatable: boolean;
 }
 
 /**
@@ -37,7 +45,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/disabled/dynamic-disabled.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
index 8cfa5c818a..b1ce551255 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -1,17 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { FormControl, FormGroup, FormsModule } from '@angular/forms';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
 
-import { DsDynamicDisabledComponent } from './dynamic-disabled.component';
-import { DynamicDisabledModel } from './dynamic-disabled.model';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { DsDynamicDisabledComponent } from './dynamic-disabled.component';
+import { DynamicDisabledModel } from './dynamic-disabled.model';
 
 describe('DsDynamicDisabledComponent', () => {
   let comp: DsDynamicDisabledComponent;
@@ -29,10 +42,10 @@ describe('DsDynamicDisabledComponent', () => {
       submissionId: '1234',
       id: 'disabledInput',
       name: 'disabledInput',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     });
-    group = new FormGroup({
-      disabledInput: new FormControl(),
+    group = new UntypedFormGroup({
+      disabledInput: new UntypedFormControl(),
     });
   }
 
@@ -45,7 +58,7 @@ describe('DsDynamicDisabledComponent', () => {
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
index 974858b1cc..dbedcb59cd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -1,7 +1,15 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import { DynamicFormControlComponent, DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  DynamicFormControlComponent,
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 
 import { DynamicDisabledModel } from './dynamic-disabled.model';
 
@@ -10,7 +18,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
  */
 @Component({
   selector: 'ds-dynamic-disabled',
-  templateUrl: './dynamic-disabled.component.html'
+  templateUrl: './dynamic-disabled.component.html',
 })
 /**
  * Component for displaying a form input with a disabled property
@@ -18,7 +26,7 @@ import { DynamicDisabledModel } from './dynamic-disabled.model';
 export class DsDynamicDisabledComponent extends DynamicFormControlComponent {
 
   @Input() formId: string;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: DynamicDisabledModel;
   modelValuesString = '';
 
@@ -27,7 +35,7 @@ export class DsDynamicDisabledComponent extends DynamicFormControlComponent {
   @Output() focus: EventEmitter<any> = new EventEmitter<any>();
 
   constructor(protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
index 381810dc62..5902a7cc3d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
@@ -1,5 +1,12 @@
-import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DISABLED = 'EMPTY';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
index 1c568dbd32..fc59c58574 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-concat.model.ts
@@ -1,12 +1,20 @@
-import { DynamicFormControlLayout, DynamicFormGroupModel, DynamicFormGroupModelConfig, serializable } from '@ng-dynamic-forms/core';
-
+import {
+  DynamicFormControlLayout,
+  DynamicFormControlRelation,
+  DynamicFormGroupModel,
+  DynamicFormGroupModelConfig,
+  serializable,
+} from '@ng-dynamic-forms/core';
 import { Subject } from 'rxjs';
 
-import { hasNoValue, isNotEmpty } from '../../../../empty.util';
-import { DsDynamicInputModel } from './ds-dynamic-input.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { DsDynamicInputModel } from './ds-dynamic-input.model';
 
 export const CONCAT_GROUP_SUFFIX = '_CONCAT_GROUP';
 export const CONCAT_FIRST_INPUT_SUFFIX = '_CONCAT_FIRST_INPUT';
@@ -16,6 +24,7 @@ export interface DynamicConcatModelConfig extends DynamicFormGroupModelConfig {
   separator: string;
   value?: any;
   hint?: string;
+  typeBindRelations?: DynamicFormControlRelation[];
   relationship?: RelationshipOptions;
   repeatable: boolean;
   required: boolean;
@@ -29,6 +38,8 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
 
   @serializable() separator: string;
   @serializable() hasLanguages = false;
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
+  @serializable() typeBindHidden = false;
   @serializable() relationship?: RelationshipOptions;
   @serializable() repeatable?: boolean;
   @serializable() required?: boolean;
@@ -37,6 +48,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
   @serializable() submissionId: string;
   @serializable() hasSelectableMetadata: boolean;
   @serializable() metadataValue: MetadataValue;
+  @serializable() readOnly?: boolean;
 
   isCustomGroup = true;
   valueUpdates: Subject<string>;
@@ -55,6 +67,8 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     this.metadataValue = config.metadataValue;
     this.valueUpdates = new Subject<string>();
     this.valueUpdates.subscribe((value: string) => this.value = value);
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
+    this.readOnly = config.disabled;
   }
 
   get value() {
@@ -74,7 +88,6 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
   }
 
   set value(value: string | FormFieldMetadataValueObject) {
-    let values;
     let tempValue: string;
 
     if (typeof value === 'string') {
@@ -85,15 +98,19 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     if (hasNoValue(tempValue)) {
       tempValue = '';
     }
-    values = [...tempValue.split(this.separator), null].map((v) =>
+
+    // todo: this used to be valid, but results in a type error now -- REMEMBER TO INVESTIGATE!
+    const values = [...tempValue.split(this.separator), null].map((v) =>
       Object.assign(new FormFieldMetadataValueObject(), value, { display: v, value: v }));
 
     if (values[0].value) {
+      // @ts-ignore
       (this.get(0) as DsDynamicInputModel).value = values[0];
     } else {
       (this.get(0) as DsDynamicInputModel).value = undefined;
     }
     if (values[1].value) {
+      // @ts-ignore
       (this.get(1) as DsDynamicInputModel).value = values[1];
     } else {
       (this.get(1) as DsDynamicInputModel).value = undefined;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
index edbd5710d2..e239099bc4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
@@ -3,13 +3,13 @@ import {
   DynamicFormControlRelation,
   DynamicInputModel,
   DynamicInputModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import {Subject} from 'rxjs';
+import { Subject } from 'rxjs';
 
-import { LanguageCode } from '../../models/form-field-language-value.model';
 import { VocabularyOptions } from '../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import {hasValue} from '../../../../empty.util';
+import { hasValue } from '../../../../empty.util';
+import { LanguageCode } from '../../models/form-field-language-value.model';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
 import { RelationshipOptions } from '../../models/relationship-options.model';
 
@@ -55,6 +55,7 @@ export class DsDynamicInputModel extends DynamicInputModel {
     this.metadataFields = config.metadataFields;
     this.hint = config.hint;
     this.readOnly = config.readOnly;
+    this.disabled = config.readOnly;
     this.value = config.value;
     this.relationship = config.relationship;
     this.submissionId = config.submissionId;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
index c7fc3f2f2b..71b82f17b4 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model.ts
@@ -2,12 +2,12 @@ import {
   DynamicFormControlLayout,
   DynamicFormGroupModel,
   DynamicFormGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel } from './ds-dynamic-input.model';
 import { Subject } from 'rxjs';
 
 import { LanguageCode } from '../../models/form-field-language-value.model';
+import { DsDynamicInputModel } from './ds-dynamic-input.model';
 
 export const QUALDROP_GROUP_SUFFIX = '_QUALDROP_GROUP';
 export const QUALDROP_METADATA_SUFFIX = '_QUALDROP_METADATA';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
index 52364df45e..9549a3e82d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model.ts
@@ -3,10 +3,11 @@ import {
   DynamicFormArrayModelConfig,
   DynamicFormControlLayout,
   DynamicFormControlRelation,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
-import { RelationshipOptions } from '../../models/relationship-options.model';
+
 import { hasValue } from '../../../../empty.util';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts
index 00d385edef..532acf720a 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model.ts
@@ -1,5 +1,13 @@
-import { DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from './ds-dynamic-input.model';
+import {
+  DYNAMIC_FORM_CONTROL_TYPE_TEXTAREA,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from './ds-dynamic-input.model';
 
 export interface DsDynamicTextAreaModelConfig extends DsDynamicInputModelConfig {
   cols?: number;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
index 4c24443633..c846f053ef 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/dynamic-vocabulary.component.ts
@@ -1,31 +1,38 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlComponent,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
 
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { isNotEmpty } from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { DsDynamicInputModel } from './ds-dynamic-input.model';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
 
 /**
  * An abstract class to be extended by form components that handle vocabulary
  */
 @Component({
   selector: 'ds-dynamic-vocabulary',
-  template: ''
+  template: '',
 })
 export abstract class DsDynamicVocabularyComponent extends DynamicFormControlComponent {
 
-  @Input() abstract group: FormGroup;
+  @Input() abstract group: UntypedFormGroup;
   @Input() abstract model: DsDynamicInputModel;
 
   @Output() abstract blur: EventEmitter<any>;
@@ -36,7 +43,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
 
   protected constructor(protected vocabularyService: VocabularyService,
                         protected layoutService: DynamicFormLayoutService,
-                        protected validationService: DynamicFormValidationService
+                        protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
@@ -50,10 +57,11 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
 
   /**
    * Retrieves the init form value from model
+   * @param preserveConfidence if the original model confidence value should be used after retrieving the vocabulary's entry
    */
-  getInitValueFromModel(): Observable<FormFieldMetadataValueObject> {
+  getInitValueFromModel(preserveConfidence = false): Observable<FormFieldMetadataValueObject> {
     let initValue$: Observable<FormFieldMetadataValueObject>;
-    if (isNotEmpty(this.model.value) && (this.model.value instanceof FormFieldMetadataValueObject)) {
+    if (isNotEmpty(this.model.value) && (this.model.value instanceof FormFieldMetadataValueObject) && !this.model.value.hasAuthorityToGenerate()) {
       let initEntry$: Observable<VocabularyEntry>;
       if (this.model.value.hasAuthority()) {
         initEntry$ = this.vocabularyService.getVocabularyEntryByID(this.model.value.authority, this.model.vocabularyOptions);
@@ -63,15 +71,20 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
       initValue$ = initEntry$.pipe(map((initEntry: VocabularyEntry) => {
         if (isNotEmpty(initEntry)) {
           // Integrate FormFieldMetadataValueObject with retrieved information
-          return new FormFieldMetadataValueObject(
+          const formField = new FormFieldMetadataValueObject(
             initEntry.value,
             null,
             initEntry.authority,
             initEntry.display,
             (this.model.value as any).place,
             null,
-            initEntry.otherInformation || null
+            initEntry.otherInformation || null,
           );
+          // Preserve the original confidence
+          if (preserveConfidence) {
+            formField.confidence = (this.model.value as any).confidence;
+          }
+          return formField;
         } else {
           return this.model.value as any;
         }
@@ -85,8 +98,8 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
           this.model.value.display,
           0,
           null,
-          this.model.value.otherInformation || null
-        )
+          this.model.value.otherInformation || null,
+        ),
       );
     } else {
       initValue$ = observableOf(new FormFieldMetadataValueObject(this.model.value));
@@ -131,7 +144,7 @@ export abstract class DsDynamicVocabularyComponent extends DynamicFormControlCom
       elementsPerPage: elementsPerPage,
       currentPage: currentPage,
       totalElements: totalElements,
-      totalPages: totalPages
+      totalPages: totalPages,
     });
   }
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
index 9d8d73eab5..45b6daa588 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component.ts
@@ -1,5 +1,12 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, QueryList } from '@angular/core';
-import { FormGroup } from '@angular/forms';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  QueryList,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlComponent,
   DynamicFormControlCustomEvent,
@@ -10,19 +17,19 @@ import {
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
-  DynamicTemplateDirective
+  DynamicTemplateDirective,
 } from '@ng-dynamic-forms/core';
 
 @Component({
   selector: 'ds-dynamic-form-group',
   templateUrl: './dynamic-form-group.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 export class DsDynamicFormGroupComponent extends DynamicFormControlComponent {
 
   @Input() formModel: DynamicFormControlModel[];
   @Input() formLayout: DynamicFormLayout;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() layout: DynamicFormControlLayout;
   @Input() model: DynamicFormGroupModel;
   @Input() templates: QueryList<DynamicTemplateDirective> | DynamicTemplateDirective[] | undefined;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
index d4ddd0c3c8..9fa2ead2a6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model.ts
@@ -1,10 +1,11 @@
-import { Subject } from 'rxjs';
 import {
   DynamicCheckboxGroupModel,
   DynamicFormControlLayout,
+  DynamicFormControlRelation,
   DynamicFormGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
+import { Subject } from 'rxjs';
 
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
@@ -14,7 +15,10 @@ export interface DynamicListCheckboxGroupModelConfig extends DynamicFormGroupMod
   vocabularyOptions: VocabularyOptions;
   groupLength?: number;
   repeatable: boolean;
-  value?: any;
+  value?: VocabularyEntry[];
+  typeBindRelations?: DynamicFormControlRelation[];
+  required: boolean;
+  hint?: string;
 }
 
 export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel {
@@ -23,6 +27,9 @@ export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel {
   @serializable() repeatable: boolean;
   @serializable() groupLength: number;
   @serializable() _value: VocabularyEntry[];
+  @serializable() typeBindRelations: DynamicFormControlRelation[];
+  @serializable() required: boolean;
+  @serializable() hint: string;
   isListGroup = true;
   valueUpdates: Subject<any>;
 
@@ -33,10 +40,13 @@ export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel {
     this.groupLength = config.groupLength || 5;
     this._value = [];
     this.repeatable = config.repeatable;
+    this.required = config.required;
+    this.hint = config.hint;
 
     this.valueUpdates = new Subject<any>();
     this.valueUpdates.subscribe((value: VocabularyEntry | VocabularyEntry[]) => this.value = value);
     this.valueUpdates.next(config.value);
+    this.typeBindRelations = config.typeBindRelations ? config.typeBindRelations : [];
   }
 
   get hasAuthority(): boolean {
@@ -52,9 +62,8 @@ export class DynamicListCheckboxGroupModel extends DynamicCheckboxGroupModel {
       if (Array.isArray(value)) {
         this._value = value;
       } else {
-        // _value is non extendible so assign it a new array
-        const newValue = (this.value as VocabularyEntry[]).concat([value]);
-        this._value = newValue;
+        // _value is non-extendable so assign it a new array
+        this._value = (this.value as VocabularyEntry[]).concat([value]);
       }
     }
   }
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 6f51eed2ac..d6ab989cd5 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
@@ -2,8 +2,10 @@ import {
   DynamicFormControlLayout,
   DynamicRadioGroupModel,
   DynamicRadioGroupModelConfig,
-  serializable
+  serializable,
 } from '@ng-dynamic-forms/core';
+
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { hasValue } from '../../../../../empty.util';
 
@@ -11,7 +13,9 @@ export interface DynamicListModelConfig extends DynamicRadioGroupModelConfig<any
   vocabularyOptions: VocabularyOptions;
   groupLength?: number;
   repeatable: boolean;
-  value?: any;
+  value?: VocabularyEntry[];
+  required: boolean;
+  hint?: string;
 }
 
 export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
@@ -19,6 +23,8 @@ export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
   @serializable() vocabularyOptions: VocabularyOptions;
   @serializable() repeatable: boolean;
   @serializable() groupLength: number;
+  @serializable() required: boolean;
+  @serializable() hint: string;
   isListGroup = true;
 
   constructor(config: DynamicListModelConfig, layout?: DynamicFormControlLayout) {
@@ -27,6 +33,8 @@ export class DynamicListRadioGroupModel extends DynamicRadioGroupModel<any> {
     this.vocabularyOptions = config.vocabularyOptions;
     this.groupLength = config.groupLength || 5;
     this.repeatable = config.repeatable;
+    this.required = config.required;
+    this.hint = config.hint;
     this.value = config.value;
   }
 
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 7e5cad353b..728c59aa46 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
@@ -17,7 +17,6 @@
                  [id]="item.id"
                  [formControlName]="item.id"
                  [name]="model.name"
-                 [required]="model.required"
                  [value]="item.value"
                  (blur)="onBlur($event)"
                  (change)="onChange($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
index b4a02457dc..6ed94d239c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/list/dynamic-list.component.spec.ts
@@ -1,42 +1,54 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import {
   DynamicFormControlLayout,
   DynamicFormLayoutService,
   DynamicFormsCoreModule,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 
-import { DsDynamicListComponent } from './dynamic-list.component';
-import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
 import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { FormBuilderService } from '../../../form-builder.service';
+import { DsDynamicListComponent } from './dynamic-list.component';
+import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
 
 export const LAYOUT_TEST = {
   element: {
-    group: ''
-  }
+    group: '',
+  },
 } as DynamicFormControlLayout;
 
 export const LIST_CHECKBOX_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     name: 'type_programme',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   id: 'listCheckbox',
@@ -45,13 +57,13 @@ export const LIST_CHECKBOX_TEST_MODEL_CONFIG = {
   placeholder: 'Programme',
   readOnly: false,
   required: false,
-  repeatable: true
+  repeatable: true,
 };
 
 export const LIST_RADIO_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     name: 'type_programme',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   id: 'listRadio',
@@ -60,7 +72,7 @@ export const LIST_RADIO_TEST_MODEL_CONFIG = {
   placeholder: 'Programme',
   readOnly: false,
   required: false,
-  repeatable: false
+  repeatable: false,
 };
 
 describe('DsDynamicListComponent test suite', () => {
@@ -83,7 +95,7 @@ describe('DsDynamicListComponent test suite', () => {
         DynamicFormsNGBootstrapUIModule,
         FormsModule,
         ReactiveFormsModule,
-        NgbModule
+        NgbModule,
       ],
       declarations: [
         DsDynamicListComponent,
@@ -96,9 +108,9 @@ describe('DsDynamicListComponent test suite', () => {
         FormBuilderService,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -136,9 +148,9 @@ describe('DsDynamicListComponent test suite', () => {
 
         listFixture = TestBed.createComponent(DsDynamicListComponent);
         listComp = listFixture.componentInstance; // FormComponent test instance
-        listComp.group = new FormGroup({
-          listCheckbox: new FormGroup({}),
-          listRadio: new FormGroup({})
+        listComp.group = new UntypedFormGroup({
+          listCheckbox: new UntypedFormGroup({}),
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
         listFixture.detectChanges();
@@ -184,9 +196,9 @@ describe('DsDynamicListComponent test suite', () => {
 
         listFixture = TestBed.createComponent(DsDynamicListComponent);
         listComp = listFixture.componentInstance; // FormComponent test instance
-        listComp.group = new FormGroup({
-          listCheckbox: new FormGroup({}),
-          listRadio: new FormGroup({})
+        listComp.group = new UntypedFormGroup({
+          listCheckbox: new UntypedFormGroup({}),
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
         modelValue = [Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 })];
@@ -224,9 +236,9 @@ describe('DsDynamicListComponent test suite', () => {
 
         listFixture = TestBed.createComponent(DsDynamicListComponent);
         listComp = listFixture.componentInstance; // FormComponent test instance
-        listComp.group = new FormGroup({
-          listCheckbox: new FormGroup({}),
-          listRadio: new FormGroup({})
+        listComp.group = new UntypedFormGroup({
+          listCheckbox: new UntypedFormGroup({}),
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListRadioGroupModel(LIST_RADIO_TEST_MODEL_CONFIG, LAYOUT_TEST);
         listFixture.detectChanges();
@@ -260,9 +272,9 @@ describe('DsDynamicListComponent test suite', () => {
 
         listFixture = TestBed.createComponent(DsDynamicListComponent);
         listComp = listFixture.componentInstance; // FormComponent test instance
-        listComp.group = new FormGroup({
-          listCheckbox: new FormGroup({}),
-          listRadio: new FormGroup({})
+        listComp.group = new UntypedFormGroup({
+          listCheckbox: new UntypedFormGroup({}),
+          listRadio: new UntypedFormGroup({}),
         });
         listComp.model = new DynamicListRadioGroupModel(LIST_RADIO_TEST_MODEL_CONFIG, LAYOUT_TEST);
         modelValue = Object.assign(new VocabularyEntry(), { authority: 1, display: 'one', value: 1 });
@@ -287,13 +299,13 @@ describe('DsDynamicListComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
-  group: FormGroup = new FormGroup({
-    listCheckbox: new FormGroup({}),
-    listRadio: new FormGroup({})
+  group: UntypedFormGroup = new UntypedFormGroup({
+    listCheckbox: new UntypedFormGroup({}),
+    listRadio: new UntypedFormGroup({}),
   });
 
   model = new DynamicListCheckboxGroupModel(LIST_CHECKBOX_TEST_MODEL_CONFIG, LAYOUT_TEST);
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 bebef5860e..7e4594c3e7 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,23 +1,37 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  AbstractControl,
+  UntypedFormGroup,
+  ValidationErrors,
+  ValidatorFn,
+} from '@angular/forms';
 import {
   DynamicCheckboxModel,
   DynamicFormControlComponent,
   DynamicFormLayoutService,
-  DynamicFormValidationService
+  DynamicFormValidationService,
 } from '@ng-dynamic-forms/core';
-import { findKey } from 'lodash';
+import findKey from 'lodash/findKey';
 
-import { hasValue, isNotEmpty } from '../../../../../empty.util';
-import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../../empty.util';
+import { FormBuilderService } from '../../../form-builder.service';
+import { DynamicListCheckboxGroupModel } from './dynamic-list-checkbox-group.model';
+import { DynamicListRadioGroupModel } from './dynamic-list-radio-group.model';
 
 export interface ListItem {
   id: string;
@@ -32,11 +46,11 @@ export interface ListItem {
 @Component({
   selector: 'ds-dynamic-list',
   styleUrls: ['./dynamic-list.component.scss'],
-  templateUrl: './dynamic-list.component.html'
+  templateUrl: './dynamic-list.component.html',
 })
 export class DsDynamicListComponent extends DynamicFormControlComponent implements OnInit {
 
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: any;
 
   @Output() blur: EventEmitter<any> = new EventEmitter<any>();
@@ -50,7 +64,7 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
               private cdr: ChangeDetectorRef,
               private formBuilderService: FormBuilderService,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
@@ -109,36 +123,39 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
    */
   protected setOptionsFromVocabulary() {
     if (this.model.vocabularyOptions.name && this.model.vocabularyOptions.name.length > 0) {
-      const listGroup = this.group.controls[this.model.id] as FormGroup;
+      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
+        elementsPerPage: 9999, currentPage: 1,
       } as PageInfo);
       this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, pageInfo).pipe(
-        getFirstSucceededRemoteDataPayload()
+        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, key) => {
+        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,
+            id: `${this.model.id}_${value}`,
             label: option.display,
             value: checked,
-            index: key
+            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
+              value: option,
             });
           }
           tempList.push(item);
@@ -156,4 +173,13 @@ export class DsDynamicListComponent extends DynamicFormControlComponent implemen
     }
   }
 
+  /**
+   * Checks if at least one {@link VocabularyEntry} has been selected.
+   */
+  hasAtLeastOneVocabularyEntry(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      return control && control.value && Object.values(control.value).find((checked: boolean) => checked === true) ? null : this.model.errorMessages;
+    };
+  }
+
 }
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts
index 64590ec9e0..a9fc6fc429 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model.ts
@@ -1,5 +1,12 @@
-import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DynamicLookupModel, DynamicLookupModelConfig } from './dynamic-lookup.model';
+import {
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DynamicLookupModel,
+  DynamicLookupModelConfig,
+} from './dynamic-lookup.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME = 'LOOKUP_NAME';
 
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..89e7af9aa6 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
@@ -88,7 +88,6 @@
        aria-expanded="false"
        [attr.aria-labelledby]="'label_' + model.id">
     <div class="scrollable-menu"
-         aria-labelledby="scrollableDropdownMenuButton"
          infiniteScroll
          [infiniteScrollDistance]="2"
          [infiniteScrollThrottle]="50"
@@ -96,7 +95,7 @@
          [scrollWindow]="false">
 
       <button class="dropdown-item disabled"
-              *ngIf="optionsList && optionsList.length == 0"
+              *ngIf="optionsList && optionsList.length === 0"
               (click)="$event.stopPropagation(); clearFields(); sdRef.close();">{{'form.no-results' | translate}}
       </button>
       <button class="dropdown-item lookup-item"
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 dd97bb74ab..f506655f84 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
@@ -1,36 +1,58 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { of as observableOf } from 'rxjs';
 
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DsDynamicLookupComponent } from './dynamic-lookup.component';
-import { DynamicLookupModel, DynamicLookupModelConfig } from './dynamic-lookup.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import { AuthorityConfidenceStateDirective } from '../../../../../authority-confidence/authority-confidence-state.directive';
-import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
+import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicLookupComponent } from './dynamic-lookup.component';
+import {
+  DynamicLookupModel,
+  DynamicLookupModelConfig,
+} from './dynamic-lookup.model';
+import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
 
 let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   vocabularyOptions: {
     name: 'RPAuthority',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
@@ -46,13 +68,13 @@ let LOOKUP_TEST_MODEL_CONFIG: DynamicLookupModelConfig = {
   value: undefined,
   metadataFields: [],
   submissionId: '1234',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 let LOOKUP_NAME_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     name: 'RPAuthority',
-    closed: false
+    closed: false,
   } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
@@ -68,12 +90,12 @@ let LOOKUP_NAME_TEST_MODEL_CONFIG = {
   value: undefined,
   metadataFields: [],
   submissionId: '1234',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
-let LOOKUP_TEST_GROUP = new FormGroup({
-  lookup: new FormControl(),
-  lookupName: new FormControl()
+let LOOKUP_TEST_GROUP = new UntypedFormGroup({
+  lookup: new UntypedFormControl(),
+  lookupName: new UntypedFormControl(),
 });
 
 describe('Dynamic Lookup component', () => {
@@ -81,7 +103,7 @@ describe('Dynamic Lookup component', () => {
     LOOKUP_TEST_MODEL_CONFIG = {
       vocabularyOptions: {
         name: 'RPAuthority',
-        closed: false
+        closed: false,
       } as VocabularyOptions,
       disabled: false,
       errorMessages: { required: 'Required field.' },
@@ -97,13 +119,13 @@ describe('Dynamic Lookup component', () => {
       value: undefined,
       metadataFields: [],
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     };
 
     LOOKUP_NAME_TEST_MODEL_CONFIG = {
       vocabularyOptions: {
         name: 'RPAuthority',
-        closed: false
+        closed: false,
       } as VocabularyOptions,
       disabled: false,
       errorMessages: { required: 'Required field.' },
@@ -119,12 +141,12 @@ describe('Dynamic Lookup component', () => {
       value: undefined,
       metadataFields: [],
       submissionId: '1234',
-      hasSelectableMetadata: false
+      hasSelectableMetadata: false,
     };
 
-    LOOKUP_TEST_GROUP = new FormGroup({
-      lookup: new FormControl(),
-      lookupName: new FormControl()
+    LOOKUP_TEST_GROUP = new UntypedFormGroup({
+      lookup: new UntypedFormControl(),
+      lookupName: new UntypedFormControl(),
     });
 
   }
@@ -147,22 +169,22 @@ describe('Dynamic Lookup component', () => {
         InfiniteScrollModule,
         ReactiveFormsModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         DsDynamicLookupComponent,
         TestComponent,
         AuthorityConfidenceStateDirective,
-        ObjNgFor
+        ObjNgFor,
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
         DsDynamicLookupComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
   }));
 
@@ -261,7 +283,7 @@ describe('Dynamic Lookup component', () => {
           const selectedValue = Object.assign(new VocabularyEntry(), {
             authority: 1,
             display: 'one',
-            value: 1
+            value: 1,
           });
           spyOn(lookupComp.change, 'emit');
           lookupComp.firstInputValue = 'test';
@@ -309,7 +331,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: null,
             value: 'test',
-            display: 'testDisplay'
+            display: 'testDisplay',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
           (lookupComp.model as any).value = new FormFieldMetadataValueObject('test', null, null, 'testDisplay');
@@ -350,7 +372,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: 'test001',
             value: 'test',
-            display: 'testDisplay'
+            display: 'testDisplay',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
           lookupComp.model.value = new FormFieldMetadataValueObject('test', null, 'test001', 'testDisplay');
@@ -435,12 +457,12 @@ describe('Dynamic Lookup component', () => {
             Object.assign(new VocabularyEntry(), {
               authority: 1,
               display: 'Name, Lastname',
-              value: 1
+              value: 1,
             }),
             Object.assign(new VocabularyEntry(), {
               authority: 2,
               display: 'NameTwo, LastnameTwo',
-              value: 2
+              value: 2,
             }),
           ];
           let de = lookupFixture.debugElement.queryAll(By.css('button'));
@@ -448,7 +470,7 @@ describe('Dynamic Lookup component', () => {
           const selectedValue = Object.assign(new VocabularyEntry(), {
             authority: 1,
             display: 'Name, Lastname',
-            value: 1
+            value: 1,
           });
           spyOn(lookupComp.change, 'emit');
           vocabularyServiceStub.setNewPayload(payload);
@@ -479,7 +501,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: null,
             value: 'Name, Lastname',
-            display: 'Name, Lastname'
+            display: 'Name, Lastname',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
           (lookupComp.model as any).value = new FormFieldMetadataValueObject('Name, Lastname', null, null, 'Name, Lastname');
@@ -522,7 +544,7 @@ describe('Dynamic Lookup component', () => {
           const entry = observableOf(Object.assign(new VocabularyEntry(), {
             authority: 'test001',
             value: 'Name, Lastname',
-            display: 'Name, Lastname'
+            display: 'Name, Lastname',
           }));
           spyOn((lookupComp as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
           lookupComp.model.value = new FormFieldMetadataValueObject('Name, Lastname', null, 'test001', 'Name, Lastname');
@@ -560,11 +582,11 @@ describe('Dynamic Lookup component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
-  group: FormGroup = LOOKUP_TEST_GROUP;
+  group: UntypedFormGroup = LOOKUP_TEST_GROUP;
 
   inputLookupModelConfig = LOOKUP_TEST_MODEL_CONFIG;
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
index 3993704895..fafda83ebd 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component.ts
@@ -1,24 +1,44 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import { of as observableOf, Subscription } from 'rxjs';
-import { catchError, distinctUntilChanged } from 'rxjs/operators';
-import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { hasValue, isEmpty, isNotEmpty } from '../../../../../empty.util';
-import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
-import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
 import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  distinctUntilChanged,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
   PaginatedList,
-  buildPaginatedList
 } from '../../../../../../core/data/paginated-list.model';
+import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../../../empty.util';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicLookupNameModel } from './dynamic-lookup-name.model';
 
 /**
  * Component representing a lookup or lookup-name input field
@@ -26,11 +46,11 @@ import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 @Component({
   selector: 'ds-dynamic-lookup',
   styleUrls: ['./dynamic-lookup.component.scss'],
-  templateUrl: './dynamic-lookup.component.html'
+  templateUrl: './dynamic-lookup.component.html',
 })
 export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent implements OnDestroy, OnInit {
 
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: any;
 
   @Output() blur: EventEmitter<any> = new EventEmitter<any>();
@@ -49,7 +69,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
   constructor(protected vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -159,7 +179,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
         this.pageInfo.elementsPerPage,
         this.pageInfo.currentPage + 1,
         this.pageInfo.totalElements,
-        this.pageInfo.totalPages
+        this.pageInfo.totalPages,
       );
       this.search();
     }
@@ -199,7 +219,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
     if (isNotEmpty(this.getCurrentValue())) {
       const newValue = Object.assign(new VocabularyEntry(), this.model.value, {
         display: this.getCurrentValue(),
-        value: this.getCurrentValue()
+        value: this.getCurrentValue(),
       });
       this.updateModel(newValue);
     } else {
@@ -221,14 +241,14 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
       this.getCurrentValue(),
       false,
       this.model.vocabularyOptions,
-      this.pageInfo
+      this.pageInfo,
     ).pipe(
       getFirstSucceededRemoteDataPayload(),
       catchError(() =>
         observableOf(buildPaginatedList(
           new PageInfo(),
-          []
-        ))
+          [],
+        )),
       ),
       distinctUntilChanged())
       .subscribe((list: PaginatedList<VocabularyEntry>) => {
@@ -237,7 +257,7 @@ export class DsDynamicLookupComponent extends DsDynamicVocabularyComponent imple
           list.pageInfo.elementsPerPage,
           list.pageInfo.currentPage,
           list.pageInfo.totalElements,
-          list.pageInfo.totalPages
+          list.pageInfo.totalPages,
         );
         this.loading = false;
         this.cdr.detectChanges();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts
index 20b1eccefe..bc8d2e9630 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.model.ts
@@ -1,5 +1,13 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_LOOKUP = 'LOOKUP';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
index e6b0cf508f..5463b06827 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.html
@@ -20,9 +20,9 @@
   </ul>
 </ng-template>
 
-<div *ngIf="!(isHierarchicalVocabulary() | async)" class="position-relative right-addon">
-  <i *ngIf="searching" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
-  <i *ngIf="!searching"
+<div *ngIf="(isHierarchicalVocabulary() | async) !== true" class="position-relative right-addon">
+  <i *ngIf="searching || loadingInitialValue" class="fas fa-circle-notch fa-spin fa-2x fa-fw text-primary position-absolute mt-1 p-0" aria-hidden="true"></i>
+  <i *ngIf="!searching && !loadingInitialValue"
      dsAuthorityConfidenceState
      class="far fa-circle fa-2x fa-fw position-absolute mt-1 p-0"
      aria-hidden="true"
@@ -32,6 +32,7 @@
          class="form-control"
          [attr.aria-labelledby]="'label_' + model.id"
          [attr.autoComplete]="model.autoComplete"
+         [attr.aria-label]="model.label | translate"
          [class.is-invalid]="showErrorMessages"
          [id]="model.id"
          [inputFormatter]="formatter"
@@ -39,6 +40,7 @@
          [ngbTypeahead]="search"
          [placeholder]="model.placeholder"
          [readonly]="model.readOnly"
+         [disabled]="model.readOnly"
          [resultTemplate]="rt"
          [type]="model.inputType"
          [(ngModel)]="currentValue"
@@ -57,12 +59,14 @@
   <input class="form-control"
          [attr.aria-labelledby]="'label_' + model.id"
          [attr.autoComplete]="model.autoComplete"
+         [attr.aria-label]="model.label | translate"
          [class.is-invalid]="showErrorMessages"
          [class.tree-input]="!model.readOnly"
          [id]="id"
          [name]="model.name"
          [placeholder]="model.placeholder"
          [readonly]="true"
+         [disabled]="model.readOnly"
          [type]="model.inputType"
          [value]="currentValue?.display"
          (focus)="onFocus($event)"
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
index 1102ae2e74..4185c3b4c9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.spec.ts
@@ -1,35 +1,56 @@
 /* eslint-disable max-classes-per-file */
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { CdkTreeModule } from '@angular/cdk/tree';
-
-import { TestScheduler } from 'rxjs/testing';
-import { getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DsDynamicOneboxComponent } from './dynamic-onebox.component';
-import { DynamicOneboxModel } from './dynamic-onebox.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { AuthorityConfidenceStateDirective } from '../../../../../authority-confidence/authority-confidence-state.directive';
-import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
-import { VocabularyTreeviewComponent } from '../../../../../vocabulary-treeview/vocabulary-treeview.component';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
+import { AuthorityConfidenceStateDirective } from '../../../../directives/authority-confidence-state.directive';
+import { VocabularyTreeviewComponent } from '../../../../vocabulary-treeview/vocabulary-treeview.component';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicOneboxComponent } from './dynamic-onebox.component';
+import { DynamicOneboxModel } from './dynamic-onebox.model';
 
 export let ONEBOX_TEST_GROUP;
 
@@ -41,20 +62,20 @@ export class MockNgbModalRef {
   componentInstance = {
     vocabularyOptions: undefined,
     preloadLevel: undefined,
-    selectedItem: undefined
+    selectedItem: undefined,
   };
   result: Promise<any> = new Promise((resolve, reject) => resolve(true));
 }
 
 function init() {
-  ONEBOX_TEST_GROUP = new FormGroup({
-    onebox: new FormControl(),
+  ONEBOX_TEST_GROUP = new UntypedFormGroup({
+    onebox: new UntypedFormControl(),
   });
 
   ONEBOX_TEST_MODEL_CONFIG = {
     vocabularyOptions: {
       closed: false,
-      name: 'vocabulary'
+      name: 'vocabulary',
     } as VocabularyOptions,
     disabled: false,
     id: 'onebox',
@@ -65,7 +86,7 @@ function init() {
     readOnly: false,
     required: false,
     repeatable: false,
-    value: undefined
+    value: undefined,
   };
 }
 
@@ -89,12 +110,12 @@ describe('DsDynamicOneboxComponent test suite', () => {
     type: 'vocabulary',
     _links: {
       self: {
-        url: 'self'
+        url: 'self',
       },
       entries: {
-        url: 'entries'
-      }
-    }
+        url: 'entries',
+      },
+    },
   };
 
   const hierarchicalVocabulary = {
@@ -106,12 +127,12 @@ describe('DsDynamicOneboxComponent test suite', () => {
     type: 'vocabulary',
     _links: {
       self: {
-        url: 'self'
+        url: 'self',
       },
       entries: {
-        url: 'entries'
-      }
-    }
+        url: 'entries',
+      },
+    },
   };
 
   // waitForAsync beforeEach
@@ -123,7 +144,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         open: jasmine.createSpy('open'),
         close: jasmine.createSpy('close'),
         dismiss: jasmine.createSpy('dismiss'),
-      }
+      },
     );
     init();
     TestBed.configureTestingModule({
@@ -134,14 +155,14 @@ describe('DsDynamicOneboxComponent test suite', () => {
         NgbModule,
         ReactiveFormsModule,
         TranslateModule.forRoot(),
-        CdkTreeModule
+        CdkTreeModule,
       ],
       declarations: [
         DsDynamicOneboxComponent,
         TestComponent,
         AuthorityConfidenceStateDirective,
         ObjNgFor,
-        VocabularyTreeviewComponent
+        VocabularyTreeviewComponent,
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
@@ -149,9 +170,9 @@ describe('DsDynamicOneboxComponent test suite', () => {
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
         { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
-        { provide: NgbModal, useValue: modal }
+        { provide: NgbModal, useValue: modal },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
 
   });
@@ -262,7 +283,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
         spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
-        oneboxComponent.onBlur(new Event('blur',));
+        oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
@@ -275,7 +296,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
         spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
-        oneboxComponent.onBlur(new Event('blur',));
+        oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
@@ -288,7 +309,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         spyOn(oneboxComponent.blur, 'emit');
         spyOn(oneboxComponent.change, 'emit');
         spyOn(oneboxComponent.instance, 'isPopupOpen').and.returnValue(false);
-        oneboxComponent.onBlur(new Event('blur',));
+        oneboxComponent.onBlur(new Event('blur'));
         expect(oneboxComponent.change.emit).not.toHaveBeenCalled();
         expect(oneboxComponent.blur.emit).toHaveBeenCalled();
       });
@@ -310,7 +331,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         const entry = observableOf(Object.assign(new VocabularyEntry(), {
           authority: null,
           value: 'test',
-          display: 'testDisplay'
+          display: 'testDisplay',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
@@ -347,7 +368,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         const entry = observableOf(Object.assign(new VocabularyEntry(), {
           authority: 'test001',
           value: 'test001',
-          display: 'test'
+          display: 'test',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
@@ -419,7 +440,7 @@ describe('DsDynamicOneboxComponent test suite', () => {
         const entry = observableOf(Object.assign(new VocabularyEntry(), {
           authority: null,
           value: 'test',
-          display: 'testDisplay'
+          display: 'testDisplay',
         }));
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByValue').and.returnValue(entry);
         spyOn((oneboxComponent as any).vocabularyService, 'getVocabularyEntryByID').and.returnValue(entry);
@@ -453,11 +474,11 @@ describe('DsDynamicOneboxComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
-  group: FormGroup = ONEBOX_TEST_GROUP;
+  group: UntypedFormGroup = ONEBOX_TEST_GROUP;
 
   model = new DynamicOneboxModel(ONEBOX_TEST_MODEL_CONFIG);
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
index 9d2799177c..3712dc25a3 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component.ts
@@ -1,7 +1,29 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  NgbModal,
+  NgbModalRef,
+  NgbTypeahead,
+  NgbTypeaheadSelectItemEvent,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  Observable,
+  of as observableOf,
+  Subject,
+  Subscription,
+} from 'rxjs';
 import {
   catchError,
   debounceTime,
@@ -11,27 +33,30 @@ import {
   merge,
   switchMap,
   take,
-  tap
+  tap,
 } from 'rxjs/operators';
-import { Observable, of as observableOf, Subject, Subscription } from 'rxjs';
-import { NgbModal, NgbModalRef, NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
 
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DynamicOneboxModel } from './dynamic-onebox.model';
-import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.util';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../../../core/data/paginated-list.model';
 import { ConfidenceType } from '../../../../../../core/shared/confidence-type';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
-import {
-  PaginatedList,
-  buildPaginatedList
-} 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 { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 import { Vocabulary } from '../../../../../../core/submission/vocabularies/models/vocabulary.model';
-import { VocabularyTreeviewComponent } from '../../../../../vocabulary-treeview/vocabulary-treeview.component';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../../../../empty.util';
+import { VocabularyTreeviewModalComponent } from '../../../../vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicOneboxModel } from './dynamic-onebox.model';
 
 /**
  * Component representing a onebox input field.
@@ -40,11 +65,11 @@ import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabul
 @Component({
   selector: 'ds-dynamic-onebox',
   styleUrls: ['./dynamic-onebox.component.scss'],
-  templateUrl: './dynamic-onebox.component.html'
+  templateUrl: './dynamic-onebox.component.html',
 })
 export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent implements OnInit {
 
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: DynamicOneboxModel;
 
   @Output() blur: EventEmitter<any> = new EventEmitter<any>();
@@ -55,6 +80,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
 
   pageInfo: PageInfo = new PageInfo();
   searching = false;
+  loadingInitialValue = false;
   searchFailed = false;
   hideSearchingWhenUnsubscribed$ = new Observable(() => () => this.changeSearchingStatus(false));
   click$ = new Subject<string>();
@@ -70,7 +96,7 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
               protected cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
               protected modalService: NgbModal,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -107,14 +133,14 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
               this.searchFailed = true;
               return observableOf(buildPaginatedList(
                 new PageInfo(),
-                []
+                [],
               ));
             }));
         }
       }),
       map((list: PaginatedList<VocabularyEntry>) => list.page),
       tap(() => this.changeSearchingStatus(false)),
-      merge(this.hideSearchingWhenUnsubscribed$)
+      merge(this.hideSearchingWhenUnsubscribed$),
     );
   };
 
@@ -128,11 +154,11 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
 
     this.vocabulary$ = this.vocabularyService.findVocabularyById(this.model.vocabularyOptions.name).pipe(
       getFirstSucceededRemoteDataPayload(),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
 
     this.isHierarchicalVocabulary$ = this.vocabulary$.pipe(
-      map((result: Vocabulary) => result.hierarchical)
+      map((result: Vocabulary) => result.hierarchical),
     );
 
     this.subs.push(this.group.get(this.model.id).valueChanges.pipe(
@@ -151,6 +177,15 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
     this.cdr.detectChanges();
   }
 
+  /**
+   * Changes the loadingInitialValue status
+   * @param status
+   */
+  changeLoadingInitialValueStatus(status: boolean) {
+    this.loadingInitialValue = status;
+    this.cdr.detectChanges();
+  }
+
   /**
    * Checks if configured vocabulary is Hierarchical or not
    */
@@ -185,8 +220,13 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
       // prevent on blur propagation if typeahed suggestions are showed
       event.preventDefault();
       event.stopImmediatePropagation();
-      // set focus on input again, this is to avoid to lose changes when no suggestion is selected
-      (event.target as HTMLInputElement).focus();
+      // update the value with the searched text if the user hasn't selected any suggestion
+      if (!this.model.vocabularyOptions.closed && isNotEmpty(this.inputValue)) {
+        if (isNotNull(this.inputValue) && this.model.value !== this.inputValue) {
+          this.dispatchUpdate(this.inputValue);
+        }
+        this.inputValue = null;
+      }
     }
   }
 
@@ -216,16 +256,19 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
    * @param event The click event fired
    */
   openTree(event) {
+    if (this.model.readOnly) {
+      return;
+    }
     event.preventDefault();
     event.stopImmediatePropagation();
     this.subs.push(this.vocabulary$.pipe(
       map((vocabulary: Vocabulary) => vocabulary.preloadLevel),
-      take(1)
+      take(1),
     ).subscribe((preloadLevel) => {
-      const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewComponent, { size: 'lg', windowClass: 'treeview' });
+      const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewModalComponent, { size: 'lg', windowClass: 'treeview' });
       modalRef.componentInstance.vocabularyOptions = this.model.vocabularyOptions;
       modalRef.componentInstance.preloadLevel = preloadLevel;
-      modalRef.componentInstance.selectedItem = this.currentValue ? this.currentValue : '';
+      modalRef.componentInstance.selectedItems = this.currentValue ? [this.currentValue.value] : [];
       modalRef.result.then((result: VocabularyEntryDetail) => {
         if (result) {
           this.currentValue = result;
@@ -254,8 +297,10 @@ export class DsDynamicOneboxComponent extends DsDynamicVocabularyComponent imple
   setCurrentValue(value: any, init = false): void {
     let result: string;
     if (init) {
-      this.getInitValueFromModel()
+      this.changeLoadingInitialValueStatus(true);
+      this.getInitValueFromModel(true)
         .subscribe((formValue: FormFieldMetadataValueObject) => {
+          this.changeLoadingInitialValueStatus(false);
           this.currentValue = formValue;
           this.cdr.detectChanges();
         });
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
index 4b973e3058..bce1dc5f19 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.model.ts
@@ -1,5 +1,13 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_ONEBOX = 'ONEBOX';
 
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..e661c458b6 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
@@ -1,4 +1,4 @@
-<a *ngIf="!(formCollapsed | async)"
+<a *ngIf="(formCollapsed | async) !== true"
    class="close position-relative"
    ngbTooltip="{{'form.group-collapse-help' | translate}}"
    placement="left">
@@ -16,7 +16,7 @@
 </a>
 
 <div class="pt-2" [ngClass]="{'border-top': !showErrorMessages, 'border border-danger': showErrorMessages}">
-  <div *ngIf="!(formCollapsed | async)" class="pl-2 row"  @shrinkInOut>
+  <div *ngIf="(formCollapsed | async) !== true" class="pl-2 row"  @shrinkInOut>
     <ds-form #formRef="formComponent"
              class="col-sm-12 col-md-8 col-lg-9 col-xl-10 pl-0"
              [formId]="formId"
@@ -28,7 +28,7 @@
              (dfFocus)="onFocus($event)"></ds-form>
 
 
-    <div *ngIf="!(formCollapsed | async)" class="col p-0 m-0 d-flex justify-content-center align-items-center">
+    <div *ngIf="(formCollapsed | async) !== true" class="col p-0 m-0 d-flex justify-content-center align-items-center">
 
         <button type="button"
                 class="btn btn-link"
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 83baeaaeaa..9a4eb78015 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
@@ -1,30 +1,52 @@
 // 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 { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-
-import { Store, StoreModule } from '@ngrx/store';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 
-import { DsDynamicRelationGroupComponent } from './dynamic-relation-group.components';
-import { DynamicRelationGroupModel, DynamicRelationGroupModelConfig } from './dynamic-relation-group.model';
+import { storeModuleConfig } from '../../../../../../app.reducer';
+import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
 import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
-import { FormFieldModel } from '../../../models/form-field.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { FormService } from '../../../../form.service';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { StoreMock } from '../../../../../testing/store.mock';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { Chips } from '../../../../chips/models/chips.model';
 import { FormComponent } from '../../../../form.component';
-import { Chips } from '../../../../../chips/models/chips.model';
+import { FormService } from '../../../../form.service';
+import { FormBuilderService } from '../../../form-builder.service';
+import { FormFieldModel } from '../../../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { DsDynamicInputModel } from '../ds-dynamic-input.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { StoreMock } from '../../../../../testing/store.mock';
-import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
-import { storeModuleConfig } from '../../../../../../app.reducer';
+import { DsDynamicRelationGroupComponent } from './dynamic-relation-group.components';
+import {
+  DynamicRelationGroupModel,
+  DynamicRelationGroupModelConfig,
+} from './dynamic-relation-group.model';
 
 export let FORM_GROUP_TEST_MODEL_CONFIG;
 
@@ -48,9 +70,9 @@ function init() {
         selectableMetadata: [{
           controlledVocabulary: 'RPAuthority',
           closed: false,
-          metadata: 'dc.contributor.author'
+          metadata: 'dc.contributor.author',
         }],
-      } as FormFieldModel]
+      } as FormFieldModel],
     } as FormRowModel, {
       fields: [{
         hints: 'Enter the affiliation of the author.',
@@ -62,9 +84,9 @@ function init() {
         selectableMetadata: [{
           controlledVocabulary: 'OUAuthority',
           closed: false,
-          metadata: 'local.contributor.affiliation'
-        }]
-      } as FormFieldModel]
+          metadata: 'local.contributor.affiliation',
+        }],
+      } as FormFieldModel],
     } as FormRowModel],
     submissionId,
     id: 'dc_contributor_author',
@@ -80,11 +102,11 @@ function init() {
     validators: { required: null },
     repeatable: false,
     metadataFields: [],
-    hasSelectableMetadata: false
+    hasSelectableMetadata: false,
   } as DynamicRelationGroupModelConfig;
 
-  FORM_GROUP_TEST_GROUP = new FormGroup({
-    dc_contributor_author: new FormControl(),
+  FORM_GROUP_TEST_GROUP = new UntypedFormGroup({
+    dc_contributor_author: new UntypedFormControl(),
   });
 
 }
@@ -96,9 +118,9 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
   let groupFixture: ComponentFixture<DsDynamicRelationGroupComponent>;
   let modelValue: any;
   let html;
-  let control1: FormControl;
+  let control1: UntypedFormControl;
   let model1: DsDynamicInputModel;
-  let control2: FormControl;
+  let control2: UntypedFormControl;
   let model2: DsDynamicInputModel;
 
   // waitForAsync beforeEach
@@ -113,7 +135,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         ReactiveFormsModule,
         NgbModule,
         StoreModule.forRoot({}, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
@@ -129,9 +151,9 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
         FormComponent,
         FormService,
         { provide: VocabularyService, useValue: new VocabularyServiceStub() },
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -170,9 +192,9 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
       groupComp.group = FORM_GROUP_TEST_GROUP;
       groupComp.model = new DynamicRelationGroupModel(FORM_GROUP_TEST_MODEL_CONFIG);
       groupFixture.detectChanges();
-      control1 = service.getFormControlById('dc_contributor_author', (groupComp as any).formRef.formGroup, groupComp.formModel) as FormControl;
+      control1 = service.getFormControlById('dc_contributor_author', (groupComp as any).formRef.formGroup, groupComp.formModel) as UntypedFormControl;
       model1 = service.findById('dc_contributor_author', groupComp.formModel) as DsDynamicInputModel;
-      control2 = service.getFormControlById('local_contributor_affiliation', (groupComp as any).formRef.formGroup, groupComp.formModel) as FormControl;
+      control2 = service.getFormControlById('local_contributor_affiliation', (groupComp as any).formRef.formGroup, groupComp.formModel) as UntypedFormControl;
       model2 = service.findById('local_contributor_affiliation', groupComp.formModel) as DsDynamicInputModel;
 
       // spyOn(store, 'dispatch');
@@ -201,7 +223,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
       (model2 as any).value = new FormFieldMetadataValueObject('test affiliation');
       modelValue = [{
         'dc.contributor.author': new FormFieldMetadataValueObject('test author'),
-        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation')
+        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation'),
       }];
       groupFixture.detectChanges();
 
@@ -245,7 +267,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
       groupComp.model = new DynamicRelationGroupModel(FORM_GROUP_TEST_MODEL_CONFIG);
       modelValue = [{
         'dc.contributor.author': new FormFieldMetadataValueObject('test author'),
-        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation')
+        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation'),
       }];
       groupComp.model.value = modelValue;
       groupFixture.detectChanges();
@@ -272,7 +294,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
       groupComp.onChipSelected(0);
       groupFixture.detectChanges();
 
-      control1 = service.getFormControlById('dc_contributor_author', (groupComp as any).formRef.formGroup, groupComp.formModel) as FormControl;
+      control1 = service.getFormControlById('dc_contributor_author', (groupComp as any).formRef.formGroup, groupComp.formModel) as UntypedFormControl;
       model1 = service.findById('dc_contributor_author', groupComp.formModel) as DsDynamicInputModel;
 
       control1.setValue('test author modify');
@@ -280,7 +302,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
 
       modelValue = [{
         'dc.contributor.author': new FormFieldMetadataValueObject('test author modify'),
-        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation')
+        'local.contributor.affiliation': new FormFieldMetadataValueObject('test affiliation'),
       }];
       groupFixture.detectChanges();
 
@@ -315,7 +337,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
index cd10b9a4a3..afe0defa7d 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components.ts
@@ -1,34 +1,58 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import { combineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
-import { filter, map, mergeMap, scan } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
 import {
   DynamicFormControlComponent,
   DynamicFormControlModel,
   DynamicFormGroupModel,
   DynamicFormLayoutService,
   DynamicFormValidationService,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { isEqual, isObject } from 'lodash';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  scan,
+} from 'rxjs/operators';
 
-import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
-import { FormBuilderService } from '../../../form-builder.service';
-import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
-import { FormService } from '../../../../form.service';
-import { FormComponent } from '../../../../form.component';
-import { Chips } from '../../../../../chips/models/chips.model';
-import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../../../empty.util';
-import { shrinkInOut } from '../../../../../animations/shrink';
-import { ChipsItem } from '../../../../../chips/models/chips-item.model';
-import { hasOnlyEmptyProperties } from '../../../../../object.util';
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
 import { environment } from '../../../../../../../environments/environment';
-import { PLACEHOLDER_PARENT_METADATA } from '../../ds-dynamic-form-constants';
+import { SubmissionFormsModel } from '../../../../../../core/config/models/config-submission-forms.model';
 import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { shrinkInOut } from '../../../../../animations/shrink';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../../../../empty.util';
+import { hasOnlyEmptyProperties } from '../../../../../object.util';
+import { Chips } from '../../../../chips/models/chips.model';
+import { ChipsItem } from '../../../../chips/models/chips-item.model';
+import { FormComponent } from '../../../../form.component';
+import { FormService } from '../../../../form.service';
+import { FormBuilderService } from '../../../form-builder.service';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { PLACEHOLDER_PARENT_METADATA } from '../../ds-dynamic-form-constants';
+import { DynamicRelationGroupModel } from './dynamic-relation-group.model';
 
 /**
  * Component representing a group input field
@@ -37,12 +61,12 @@ import { VocabularyEntryDetail } from '../../../../../../core/submission/vocabul
   selector: 'ds-dynamic-relation-group',
   styleUrls: ['./dynamic-relation-group.component.scss'],
   templateUrl: './dynamic-relation-group.component.html',
-  animations: [shrinkInOut]
+  animations: [shrinkInOut],
 })
 export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent implements OnDestroy, OnInit {
 
   @Input() formId: string;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: DynamicRelationGroupModel;
 
   @Output() blur: EventEmitter<any> = new EventEmitter<any>();
@@ -64,7 +88,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
               private formService: FormService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(layoutService, validationService);
   }
@@ -236,15 +260,15 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
                 const model = this.formBuilderService.findById(fieldId, this.formModel);
                 return$ = this.vocabularyService.findEntryDetailById(
                   valueObj[fieldName].authority,
-                  (model as any).vocabularyOptions.name
+                  (model as any).vocabularyOptions.name,
                 ).pipe(
                   getFirstSucceededRemoteDataPayload(),
                   map((entryDetail: VocabularyEntryDetail) => Object.assign(
                     new FormFieldMetadataValueObject(),
                     valueObj[fieldName],
                     {
-                      otherInformation: entryDetail.otherInformation
-                    })
+                      otherInformation: entryDetail.otherInformation,
+                    }),
                   ));
               } else {
                 return$ = observableOf(valueObj[fieldName]);
@@ -259,11 +283,11 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
         mergeMap((valueListObj: Observable<any>, index: number) => {
           return valueListObj.pipe(
             map((valueObj: any) => ({
-                index: index, value: valueObj.reduce(
-                (acc: any, value: any) => Object.assign({}, acc, value)
-                )
-              })
-            )
+              index: index, value: valueObj.reduce(
+                (acc: any, value: any) => Object.assign({}, acc, value),
+              ),
+            }),
+            ),
           );
         }),
         scan((acc: any[], valueObj: any) => {
@@ -274,7 +298,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
           }
           return acc;
         }, []),
-        filter((modelValues: any[]) => (this.model.value as any[]).length === modelValues.length)
+        filter((modelValues: any[]) => (this.model.value as any[]).length === modelValues.length),
       ).subscribe((modelValue) => {
         this.model.value = modelValue;
         this.initChips(modelValue);
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
index 8b5ba1f796..d88c29d148 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model.ts
@@ -1,8 +1,18 @@
-import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
-import { isEmpty, isNull } from '../../../../../empty.util';
+import {
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
 import { FormRowModel } from '../../../../../../core/config/models/config-submission-form.model';
+import {
+  isEmpty,
+  isNull,
+} from '../../../../../empty.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../../ds-dynamic-form-constants';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 /**
  * Dynamic Group Model configuration interface
@@ -41,7 +51,7 @@ export class DynamicRelationGroupModel extends DsDynamicInputModel {
     this.value = value;
   }
 
-/*  get value() {
+  /*  get value() {
     return (isEmpty(this.value)) ? null : this.value
   }*/
 
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 8a4d502287..544b41ac52 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,12 +2,15 @@
   <div class="position-relative right-addon"
        role="combobox"
        [attr.aria-label]="model.label"
-       [attr.aria-owns]="'combobox_' + id + '_listbox'">
-    <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
-       aria-hidden="true"></i>
+       [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"
@@ -15,18 +18,17 @@
            [id]="id"
            [name]="model.name"
            [readonly]="true"
+           [disabled]="model.readOnly"
            [type]="model.inputType"
            [value]="(currentValue | async)"
            (blur)="onBlur($event)"
            (click)="$event.stopPropagation(); openDropdown(sdRef);"
            (focus)="onFocus($event)"
-           (keypress)="$event.preventDefault()">
+           (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"
@@ -38,11 +40,12 @@
          (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()"
+      <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; let i = index"
+              [class.active]="i === selectedIndex"
+              (keydown.enter)="onSelect(listEntry); sdRef.close()" (mousedown)="onSelect(listEntry); sdRef.close()"
               title="{{ listEntry.display }}" role="option"
-              [attr.id]="listEntry.display == (currentValue|async) ? ('combobox_' + id + '_selected') : null">
+              [attr.id]="listEntry.display === (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.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss
index 9050edf021..bd0b160622 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss
@@ -32,3 +32,7 @@
 .scrollable-dropdown-input[readonly]{
   background-color: #fff;
 }
+
+.toggle-icon {
+  padding: 0.7rem 0.7rem 0 0.7rem;
+}
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 e8e971e488..1f3b7aa624 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
@@ -1,34 +1,57 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  mockDynamicFormLayoutService,
+  mockDynamicFormValidationService,
+} from '../../../../../testing/dynamic-form-mock-services';
+import {
+  createTestComponent,
+  hasClass,
+} from '../../../../../testing/utils.test';
 import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
 import { DsDynamicScrollableDropdownComponent } from './dynamic-scrollable-dropdown.component';
 import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent, hasClass } from '../../../../../testing/utils.test';
-import {
-  mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
-} from '../../../../../testing/dynamic-form-mock-services';
 
-export const SD_TEST_GROUP = new FormGroup({
-  dropdown: new FormControl(),
+export const SD_TEST_GROUP = new UntypedFormGroup({
+  dropdown: new UntypedFormControl(),
 });
 
 export const SD_TEST_MODEL_CONFIG = {
   vocabularyOptions: {
     closed: false,
-    name: 'common_iso_languages'
+    name: 'common_iso_languages',
   } as VocabularyOptions,
   disabled: false,
   errorMessages: { required: 'Required field.' },
@@ -43,7 +66,7 @@ export const SD_TEST_MODEL_CONFIG = {
   value: undefined,
   metadataFields: [],
   submissionId: '1234',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 describe('Dynamic Dynamic Scrollable Dropdown component', () => {
@@ -68,7 +91,7 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         InfiniteScrollModule,
         ReactiveFormsModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         DsDynamicScrollableDropdownComponent,
@@ -79,9 +102,9 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
         DsDynamicScrollableDropdownComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -159,14 +182,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.dispatchEvent(mousedownEvent);
         scrollableDropdownFixture.detectChanges();
 
         expect((scrollableDropdownComp.model as any).value).toEqual(selectedValue);
@@ -215,11 +239,11 @@ describe('Dynamic Dynamic Scrollable Dropdown component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
-  group: FormGroup = SD_TEST_GROUP;
+  group: UntypedFormGroup = SD_TEST_GROUP;
 
   model = new DynamicScrollableDropdownModel(SD_TEST_MODEL_CONFIG);
 
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 5e35df5ef7..e90ffb0b81 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,23 +1,42 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import { Observable, of as observableOf } from 'rxjs';
-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 { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import {
+  ChangeDetectorRef,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  distinctUntilChanged,
+  map,
+  tap,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
   PaginatedList,
-  buildPaginatedList
 } from '../../../../../../core/data/paginated-list.model';
-import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import { isEmpty } from '../../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicScrollableDropdownModel } from './dynamic-scrollable-dropdown.model';
 
 /**
  * Component representing a dropdown input field
@@ -25,11 +44,13 @@ import { FormFieldMetadataValueObject } from '../../../models/form-field-metadat
 @Component({
   selector: 'ds-dynamic-scrollable-dropdown',
   styleUrls: ['./dynamic-scrollable-dropdown.component.scss'],
-  templateUrl: './dynamic-scrollable-dropdown.component.html'
+  templateUrl: './dynamic-scrollable-dropdown.component.html',
 })
 export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyComponent implements OnInit {
+  @ViewChild('dropdownMenu', { read: ElementRef }) dropdownMenu: ElementRef;
+
   @Input() bindId = true;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: DynamicScrollableDropdownModel;
 
   @Output() blur: EventEmitter<any> = new EventEmitter<any>();
@@ -40,11 +61,14 @@ 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'];
 
   constructor(protected vocabularyService: VocabularyService,
               protected cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -54,34 +78,36 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
    */
   ngOnInit() {
     this.updatePageInfo(this.model.maxOptions, 1);
-    this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
-      getFirstSucceededRemoteDataPayload(),
-      catchError(() => observableOf(buildPaginatedList(
-        new PageInfo(),
-        []
-        ))
-      ))
-      .subscribe((list: PaginatedList<VocabularyEntry>) => {
-        this.optionsList = list.page;
-        if (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.loadOptions(true);
     this.group.get(this.model.id).valueChanges.pipe(distinctUntilChanged())
       .subscribe((value) => {
         this.setCurrentValue(value);
       });
   }
 
+  loadOptions(fromInit: boolean) {
+    this.loading = true;
+    this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
+      getFirstSucceededRemoteDataPayload(),
+      catchError(() => observableOf(buildPaginatedList(new PageInfo(), []))),
+      tap(() => this.loading = false),
+    ).subscribe((list: PaginatedList<VocabularyEntry>) => {
+      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.selectedIndex = 0;
+      this.cdr.detectChanges();
+    });
+  }
+
   /**
    * Converts an item from the result list to a `string` to display in the `<input>` field.
    */
@@ -94,10 +120,88 @@ 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
+   * @param sdRef The reference of the NgbDropdown.
+   */
+  selectOnKeyDown(event: KeyboardEvent, sdRef: NgbDropdown) {
+    const keyName = event.key;
+
+    if (keyName === 'Enter') {
+      event.preventDefault();
+      event.stopPropagation();
+      if (sdRef.isOpen()) {
+        this.onSelect(this.optionsList[this.selectedIndex]);
+        sdRef.close();
+      } else {
+        sdRef.open();
+      }
+    } else if (keyName === 'ArrowDown' || keyName === 'ArrowUp') {
+      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
    */
@@ -108,14 +212,14 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
         this.pageInfo.elementsPerPage,
         this.pageInfo.currentPage + 1,
         this.pageInfo.totalElements,
-        this.pageInfo.totalPages
+        this.pageInfo.totalPages,
       );
-      this.vocabularyService.getVocabularyEntries(this.model.vocabularyOptions, this.pageInfo).pipe(
+      this.vocabularyService.getVocabularyEntriesByValue(this.inputText, false, this.model.vocabularyOptions, this.pageInfo).pipe(
         getFirstSucceededRemoteDataPayload(),
         catchError(() => observableOf(buildPaginatedList(
           new PageInfo(),
-          []
-          ))
+          [],
+        )),
         ),
         tap(() => this.loading = false))
         .subscribe((list: PaginatedList<VocabularyEntry>) => {
@@ -124,7 +228,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
             list.pageInfo.elementsPerPage,
             list.pageInfo.currentPage,
             list.pageInfo.totalElements,
-            list.pageInfo.totalPages
+            list.pageInfo.totalPages,
           );
           this.cdr.detectChanges();
         });
@@ -151,7 +255,7 @@ export class DsDynamicScrollableDropdownComponent extends DsDynamicVocabularyCom
 
     if (init) {
       result = this.getInitValueFromModel().pipe(
-        map((formValue: FormFieldMetadataValueObject) => formValue.display)
+        map((formValue: FormFieldMetadataValueObject) => formValue.display),
       );
     } else {
       if (isEmpty(value)) {
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..870cd12cf6 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,6 +1,14 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN = 'SCROLLABLE_DROPDOWN';
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
index 7b2c416699..c64bc38604 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component.spec.ts
@@ -1,33 +1,55 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, fakeAsync, flush, inject, TestBed, waitForAsync, } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  NgbModule,
+  NgbTypeaheadSelectItemEvent,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { of as observableOf } from 'rxjs';
 
-import { DynamicFormLayoutService, DynamicFormsCoreModule, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
-import { NgbModule, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
-
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { VocabularyOptions } from '../../../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
-import { DsDynamicTagComponent } from './dynamic-tag.component';
-import { DynamicTagModel } from './dynamic-tag.model';
-import { Chips } from '../../../../../chips/models/chips.model';
-import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { createTestComponent } from '../../../../../testing/utils.test';
 import {
   mockDynamicFormLayoutService,
-  mockDynamicFormValidationService
+  mockDynamicFormValidationService,
 } from '../../../../../testing/dynamic-form-mock-services';
+import { createTestComponent } from '../../../../../testing/utils.test';
+import { VocabularyServiceStub } from '../../../../../testing/vocabulary-service.stub';
+import { Chips } from '../../../../chips/models/chips.model';
+import { FormFieldMetadataValueObject } from '../../../models/form-field-metadata-value.model';
+import { DsDynamicTagComponent } from './dynamic-tag.component';
+import { DynamicTagModel } from './dynamic-tag.model';
 
 function createKeyUpEvent(key: number) {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
   const event = {
     keyCode: key, preventDefault: () => {
     }, stopPropagation: () => {
-    }
+    },
   };
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   spyOn(event, 'preventDefault');
@@ -39,14 +61,14 @@ let TAG_TEST_GROUP;
 let TAG_TEST_MODEL_CONFIG;
 
 function init() {
-  TAG_TEST_GROUP = new FormGroup({
-    tag: new FormControl(),
+  TAG_TEST_GROUP = new UntypedFormGroup({
+    tag: new UntypedFormControl(),
   });
 
   TAG_TEST_MODEL_CONFIG = {
     vocabularyOptions: {
       closed: false,
-      name: 'common_iso_languages'
+      name: 'common_iso_languages',
     } as VocabularyOptions,
     disabled: false,
     id: 'tag',
@@ -56,7 +78,7 @@ function init() {
     placeholder: 'Keywords',
     readOnly: false,
     required: false,
-    repeatable: false
+    repeatable: false,
   };
 }
 
@@ -91,9 +113,9 @@ describe('DsDynamicTagComponent test suite', () => {
         DsDynamicTagComponent,
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: DynamicFormLayoutService, useValue: mockDynamicFormLayoutService },
-        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService }
+        { provide: DynamicFormValidationService, useValue: mockDynamicFormValidationService },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -152,17 +174,17 @@ describe('DsDynamicTagComponent test suite', () => {
 
       it('should select a results entry properly', fakeAsync(() => {
         modelValue = [
-          Object.assign(new VocabularyEntry(), { authority: 1, display: 'Name, Lastname', value: 1 })
+          Object.assign(new VocabularyEntry(), { authority: 1, display: 'Name, Lastname', value: 1 }),
         ];
         const event: NgbTypeaheadSelectItemEvent = {
           item: Object.assign(new VocabularyEntry(), {
             authority: 1,
             display: 'Name, Lastname',
-            value: 1
+            value: 1,
           }),
           preventDefault: () => {
             return;
-          }
+          },
         };
         spyOn(tagComp.change, 'emit');
 
@@ -287,11 +309,11 @@ describe('DsDynamicTagComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
-  group: FormGroup = TAG_TEST_GROUP;
+  group: UntypedFormGroup = TAG_TEST_GROUP;
 
   model = new DynamicTagModel(TAG_TEST_MODEL_CONFIG);
 
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 ef5e84e501..742818e81a 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
@@ -1,25 +1,52 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core';
-import { FormGroup } from '@angular/forms';
-
-import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { catchError, debounceTime, distinctUntilChanged, map, merge, switchMap, tap } from 'rxjs/operators';
-import { NgbTypeahead, NgbTypeaheadSelectItemEvent } from '@ng-bootstrap/ng-bootstrap';
-import { isEqual } from 'lodash';
-
-import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
-import { DynamicTagModel } from './dynamic-tag.model';
-import { Chips } from '../../../../../chips/models/chips.model';
-import { hasValue, isNotEmpty } from '../../../../../empty.util';
-import { environment } from '../../../../../../../environments/environment';
-import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormGroup } from '@angular/forms';
+import {
+  NgbTypeahead,
+  NgbTypeaheadSelectItemEvent,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DynamicFormLayoutService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import isEqual from 'lodash/isEqual';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  debounceTime,
+  distinctUntilChanged,
+  map,
+  merge,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../../../../environments/environment';
+import {
+  buildPaginatedList,
   PaginatedList,
-  buildPaginatedList
 } from '../../../../../../core/data/paginated-list.model';
-import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../../../../core/shared/operators';
 import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyService } from '../../../../../../core/submission/vocabularies/vocabulary.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../../empty.util';
+import { Chips } from '../../../../chips/models/chips.model';
 import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
+import { DynamicTagModel } from './dynamic-tag.model';
 
 /**
  * Component representing a tag input field
@@ -27,12 +54,12 @@ import { DsDynamicVocabularyComponent } from '../dynamic-vocabulary.component';
 @Component({
   selector: 'ds-dynamic-tag',
   styleUrls: ['./dynamic-tag.component.scss'],
-  templateUrl: './dynamic-tag.component.html'
+  templateUrl: './dynamic-tag.component.html',
 })
 export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implements OnInit {
 
   @Input() bindId = true;
-  @Input() group: FormGroup;
+  @Input() group: UntypedFormGroup;
   @Input() model: DynamicTagModel;
 
   @Output() blur: EventEmitter<any> = new EventEmitter<any>();
@@ -53,7 +80,7 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
   constructor(protected vocabularyService: VocabularyService,
               private cdr: ChangeDetectorRef,
               protected layoutService: DynamicFormLayoutService,
-              protected validationService: DynamicFormValidationService
+              protected validationService: DynamicFormValidationService,
   ) {
     super(vocabularyService, layoutService, validationService);
   }
@@ -83,12 +110,24 @@ export class DsDynamicTagComponent extends DsDynamicVocabularyComponent implemen
               this.searchFailed = true;
               return observableOf(buildPaginatedList(
                 new PageInfo(),
-                []
+                [],
               ));
             }));
         }
       }),
       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)) {
+            const vocEntry = new VocabularyEntry();
+            vocEntry.display = this.currentValue;
+            vocEntry.value = this.currentValue;
+            list.push(vocEntry);
+          }
+        }
+        return list;
+      }),
       tap(() => this.changeSearchingStatus(false)),
       merge(this.hideSearchingWhenUnsubscribed));
 
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts
index 86dc1ff73a..2c7e2c5670 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/tag/dynamic-tag.model.ts
@@ -1,5 +1,13 @@
-import { AUTOCOMPLETE_OFF, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+import {
+  AUTOCOMPLETE_OFF,
+  DynamicFormControlLayout,
+  serializable,
+} from '@ng-dynamic-forms/core';
+
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-input.model';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_TAG = 'TAG';
 
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 c82c1bd928..f98b55cd4c 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
@@ -9,10 +9,10 @@
     <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-dynamic-lookup-relation-search-tab
+                    <ds-themed-dynamic-lookup-relation-search-tab
                             [selection$]="selection$"
                             [listId]="listId"
                             [relationship]="relationshipOptions"
@@ -28,13 +28,13 @@
                             (deselectObject)="deselect($event)"
                             (resultFound)="setTotalInternals($event.pageInfo.totalElements)"
                             class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-search-tab>
+                    </ds-themed-dynamic-lookup-relation-search-tab>
                 </ng-template>
             </li>
-            <li ngbNavItem *ngFor="let source of (externalSourcesRD$ | async); let idx = index">
+            <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-dynamic-lookup-relation-external-source-tab
+                    <ds-themed-dynamic-lookup-relation-external-source-tab
                             [label]="label"
                             [listId]="listId"
                             [repeatable]="repeatable"
@@ -42,13 +42,14 @@
                             [collection]="collection"
                             [relationship]="relationshipOptions"
                             [context]="context"
+                            [query]="query"
                             [externalSource]="source"
                             (importedObject)="imported($event)"
                             class="d-block pt-3">
-                    </ds-dynamic-lookup-relation-external-source-tab>
+                    </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
@@ -76,13 +77,13 @@
     </div>
     <ng-container *ngIf="isEditRelationship">
       <button class="btn btn-danger discard"
-              [disabled]="(toAdd.length == 0 && toRemove.length == 0) || isPending"
+              [disabled]="(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"
+            [disabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
               (click)="submitEv()">
               <span *ngIf="isPending" class="spinner-border spinner-border-sm" role="status"
                               aria-hidden="true"></span>
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..376116bfe9 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
@@ -1,29 +1,47 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  DebugElement,
+  NgZone,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DebugElement, NgZone, NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf, Subscription } from 'rxjs';
-import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
-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 {
+  NgbActiveModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
-import { Item } from '../../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { AddRelationshipAction, RemoveRelationshipAction } from './relationship.actions';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../../../../search/models/paginated-search-options.model';
-import { ExternalSource } from '../../../../../core/shared/external-source.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { createPaginatedList } from '../../../../testing/utils.test';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
 import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
 import { Collection } from '../../../../../core/shared/collection.model';
-import { By } from '@angular/platform-browser';
+import { ExternalSource } from '../../../../../core/shared/external-source.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../search/models/paginated-search-options.model';
+import { createPaginatedList } from '../../../../testing/utils.test';
+import { RelationshipOptions } from '../../models/relationship-options.model';
+import { DsDynamicLookupRelationModalComponent } from './dynamic-lookup-relation-modal.component';
+import {
+  AddRelationshipAction,
+  RemoveRelationshipAction,
+} from './relationship.actions';
 
 describe('DsDynamicLookupRelationModalComponent', () => {
   let component: DsDynamicLookupRelationModalComponent;
@@ -51,13 +69,13 @@ describe('DsDynamicLookupRelationModalComponent', () => {
     Object.assign(new ExternalSource(), {
       id: 'orcidV2',
       name: 'orcidV2',
-      hierarchical: false
+      hierarchical: false,
     }),
     Object.assign(new ExternalSource(), {
       id: 'sherpaPublisher',
       name: 'sherpaPublisher',
-      hierarchical: false
-    })
+      hierarchical: false,
+    }),
   ];
   const totalLocal = 10;
   const totalExternal = 8;
@@ -81,21 +99,21 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       relationshipType: 'isAuthorOfPublication',
       nameVariants: true,
       searchConfiguration: 'personConfig',
-      externalSources: ['orcidV2', 'sherpaPublisher']
+      externalSources: ['orcidV2', 'sherpaPublisher'],
     });
     nameVariant = 'Doe, J.';
     metadataField = 'dc.contributor.author';
     pSearchOptions = new PaginatedSearchOptions({});
     externalSourceService = jasmine.createSpyObj('externalSourceService', {
       findAll: createSuccessfulRemoteDataObject$(createPaginatedList(externalSources)),
-      findById: createSuccessfulRemoteDataObject$(externalSources[0])
+      findById: createSuccessfulRemoteDataObject$(externalSources[0]),
     });
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
       getTotalLocalResults: observableOf(totalLocal),
-      getTotalExternalResults: observableOf(totalExternal)
+      getTotalExternalResults: observableOf(totalExternal),
     });
     rdbService = jasmine.createSpyObj('rdbService', {
-      aggregate: createSuccessfulRemoteDataObject$(externalSources)
+      aggregate: createSuccessfulRemoteDataObject$(externalSources),
     });
     submissionId = '1234';
   }
@@ -108,16 +126,16 @@ describe('DsDynamicLookupRelationModalComponent', () => {
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
-          }
+            paginatedSearchOptions: observableOf(pSearchOptions),
+          },
         },
         { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: LookupRelationService, useValue: lookupRelationService },
         {
-          provide: SelectableListService, useValue: selectableListService
+          provide: SelectableListService, useValue: selectableListService,
         },
         {
-          provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) }
+          provide: RelationshipDataService, useValue: { getNameVariant: () => observableOf(nameVariant) },
         },
         { provide: RelationshipTypeDataService, useValue: {} },
         { provide: RemoteDataBuildService, useValue: rdbService },
@@ -125,13 +143,13 @@ describe('DsDynamicLookupRelationModalComponent', () => {
           provide: Store, useValue: {
             // eslint-disable-next-line no-empty, @typescript-eslint/no-empty-function
             dispatch: () => {
-            }
-          }
+            },
+          },
         },
         { provide: NgZone, useValue: new NgZone({}) },
-        NgbActiveModal
+        NgbActiveModal,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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..d3a4c347d4 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
@@ -1,34 +1,61 @@
-import { Component, EventEmitter, NgZone, OnDestroy, OnInit, Output } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable, Subscription, BehaviorSubject } from 'rxjs';
+import {
+  Component,
+  EventEmitter,
+  NgZone,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Router } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { hasValue, isNotEmpty } from '../../../../empty.util';
-import { map, skip, switchMap, take } from 'rxjs/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer';
-import { ListableObject } from '../../../../object-collection/shared/listable-object.model';
-import { RelationshipOptions } from '../../models/relationship-options.model';
-import { SearchResult } from '../../../../search/models/search-result.model';
+import { Store } from '@ngrx/store';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  skip,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AppState } from '../../../../../app.reducer';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../../../core/cache/models/request-param.model';
+import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
+import { FindListOptions } from '../../../../../core/data/find-list-options.model';
+import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { ExternalSource } from '../../../../../core/shared/external-source.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  getAllSucceededRemoteDataPayload,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../../../core/shared/operators';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
+import { ListableObject } from '../../../../object-collection/shared/listable-object.model';
+import { SelectableListState } from '../../../../object-list/selectable-list/selectable-list.reducer';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { SearchResult } from '../../../../search/models/search-result.model';
+import { followLink } from '../../../../utils/follow-link-config.model';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 import {
   AddRelationshipAction,
   RemoveRelationshipAction,
   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';
-import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
-import { ExternalSource } from '../../../../../core/shared/external-source.model';
-import { ExternalSourceDataService } from '../../../../../core/data/external-source-data.service';
-import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { getAllSucceededRemoteDataPayload } from '../../../../../core/shared/operators';
-import { followLink } from '../../../../utils/follow-link-config.model';
-import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-modal',
@@ -37,9 +64,9 @@ import { RelationshipType } from '../../../../../core/shared/item-relationships/
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
@@ -170,9 +197,10 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   }
 
   ngOnInit(): void {
-    if (!!this.currentItemIsLeftItem$) {
+    if (this.currentItemIsLeftItem$) {
       this.currentItemIsLeftItem$.subscribe((isLeft) => {
         this.isLeft = isLeft;
+        this.label = this.relationshipType.leftwardType;
       });
     }
 
@@ -180,7 +208,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
       .getSelectableList(this.listId)
       .pipe(map((listState: SelectableListState) => hasValue(listState) && hasValue(listState.selection) ? listState.selection : []));
     this.selection$.pipe(take(1)).subscribe((selection) =>
-      selection.map((s: SearchResult<Item>) => this.addNameVariantSubscription(s))
+      selection.map((s: SearchResult<Item>) => this.addNameVariantSubscription(s)),
     );
     if (this.relationshipOptions.nameVariants === 'true') {
       this.context = Context.EntitySearchModalWithNameVariants;
@@ -195,12 +223,25 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
             source,
             true,
             true,
-            followLink('entityTypes')
+            followLink('entityTypes'),
           );
-        })
+        }),
       ).pipe(
-        getAllSucceededRemoteDataPayload()
+        getAllSucceededRemoteDataPayload(),
       );
+    } else {
+      const findListOptions = Object.assign({}, new FindListOptions(), {
+        elementsPerPage: 5,
+        currentPage: 1,
+        searchParams: [
+          new RequestParam('entityType', this.relationshipOptions.relationshipType),
+        ],
+      });
+      this.externalSourcesRD$ = this.externalSourceService.searchBy('findByEntityType', findListOptions,
+        true, true, followLink('entityTypes'))
+        .pipe(getFirstSucceededRemoteDataPayload(), map((r: PaginatedList<ExternalSource>) => {
+          return r.page;
+        }));
     }
 
     this.setTotals();
@@ -220,25 +261,25 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
     this.zone.runOutsideAngular(
       () => {
         const obs: Observable<any[]> = observableCombineLatest([...selectableObjects.map((sri: SearchResult<Item>) => {
-            this.addNameVariantSubscription(sri);
-            return this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid)
-              .pipe(
-                take(1),
-                map((nameVariant: string) => {
-                  return {
-                    item: sri.indexableObject,
-                    nameVariant
-                  };
-                })
-              );
-          })
+          this.addNameVariantSubscription(sri);
+          return this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid)
+            .pipe(
+              take(1),
+              map((nameVariant: string) => {
+                return {
+                  item: sri.indexableObject,
+                  nameVariant,
+                };
+              }),
+            );
+        }),
         ]);
         obs
           .subscribe((arr: any[]) => {
             return arr.forEach((object: any) => {
               const addRelationshipAction = new AddRelationshipAction(this.item, object.item, this.relationshipOptions.relationshipType, this.submissionId, object.nameVariant);
               this.store.dispatch(addRelationshipAction);
-              }
+            },
             );
           });
       });
@@ -264,7 +305,7 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
       () => selectableObjects.forEach((object) => {
         this.subMap[object.indexableObject.uuid].unsubscribe();
         this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType, this.submissionId));
-      })
+      }),
     );
   }
 
@@ -283,12 +324,12 @@ export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy
   setTotals() {
     const externalSourcesAndOptions$ = observableCombineLatest([
       this.externalSourcesRD$,
-      this.searchConfigService.paginatedSearchOptions
+      this.searchConfigService.paginatedSearchOptions,
     ]);
 
     this.totalExternal$ = externalSourcesAndOptions$.pipe(
       switchMap(([sources, options]) =>
-        observableCombineLatest([...sources.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))]))
+        observableCombineLatest([...sources.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))])),
     );
   }
 
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.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
index dac0e03444..29d28c92c9 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -4,10 +4,10 @@
     <ds-page-size-selector></ds-page-size-selector>
   </div>
   <div class="col-8">
-    <ds-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query"
+    <ds-themed-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query"
                     [inPlaceSearch]="true"
                     [searchPlaceholder]="'submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder' | translate">
-    </ds-search-form>
+    </ds-themed-search-form>
     <div>
       <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + externalSource.id | translate}}</h3>
       <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
@@ -23,9 +23,9 @@
         </ds-viewable-collection>
         <ds-themed-loading *ngIf="!entriesRD || entriesRD?.isLoading"
                     message="{{'loading.search-results' | translate}}"></ds-themed-loading>
-        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode != 400)"
+        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.errorMessage || entriesRD?.statusCode !== 400)"
                     message="{{'error.search-results' | translate}}"></ds-error>
-        <div *ngIf="entriesRD?.payload?.page?.length == 0 || entriesRD?.statusCode == 400" id="empty-external-entry-list">
+        <div *ngIf="entriesRD?.payload?.page?.length === 0 || entriesRD?.statusCode === 400" id="empty-external-entry-list">
           {{ 'search.results.empty' | translate }}
         </div>
       </ng-container>
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.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
index 3c9b575027..b1ba312c6e 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.spec.ts
@@ -1,32 +1,43 @@
-import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../../../../utils/var.directive';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
+
+import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Collection } from '../../../../../../core/shared/collection.model';
+import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { of as observableOf } from 'rxjs';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
 import {
   createFailedRemoteDataObject$,
   createPendingRemoteDataObject$,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../../../../remote-data.utils';
-import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
-import { ExternalSource } from '../../../../../../core/shared/external-source.model';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { By } from '@angular/platform-browser';
-import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { Item } from '../../../../../../core/shared/item.model';
-import { Collection } from '../../../../../../core/shared/collection.model';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component';
-import { createPaginatedList } from '../../../../../testing/utils.test';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
+import { createPaginatedList } from '../../../../../testing/utils.test';
+import { VarDirective } from '../../../../../utils/var.directive';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
+import { ThemedExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
 
 describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   let component: DsDynamicLookupRelationExternalSourceTabComponent;
@@ -41,7 +52,7 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
     id: 'orcidV2',
     name: 'orcidV2',
     hierarchical: false,
-    entityTypes: createSuccessfulRemoteDataObject$(createPaginatedList([itemType]))
+    entityTypes: createSuccessfulRemoteDataObject$(createPaginatedList([itemType])),
   } as ExternalSource;
   const externalEntries = [
     Object.assign({
@@ -51,10 +62,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0001'
-          }
-        ]
-      }
+            value: 'https://orcid.org/0001-0001-0001-0001',
+          },
+        ],
+      },
     }),
     Object.assign({
       id: '0001-0001-0001-0002',
@@ -63,10 +74,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0002'
-          }
-        ]
-      }
+            value: 'https://orcid.org/0001-0001-0001-0002',
+          },
+        ],
+      },
     }),
     Object.assign({
       id: '0001-0001-0001-0003',
@@ -75,11 +86,11 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       metadata: {
         'dc.identifier.uri': [
           {
-            value: 'https://orcid.org/0001-0001-0001-0003'
-          }
-        ]
-      }
-    })
+            value: 'https://orcid.org/0001-0001-0001-0003',
+          },
+        ],
+      },
+    }),
   ] as ExternalSourceEntry[];
   const item = Object.assign(new Item(), { id: 'submission-item' });
   const collection = Object.assign(new Collection(), { id: 'submission-collection' });
@@ -88,10 +99,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
 
   function init() {
     pSearchOptions = new PaginatedSearchOptions({
-      query: 'test'
+      query: 'test',
     });
     externalSourceService = jasmine.createSpyObj('externalSourceService', {
-      getExternalSourceEntries: createSuccessfulRemoteDataObject$(createPaginatedList(externalEntries))
+      getExternalSourceEntries: createSuccessfulRemoteDataObject$(createPaginatedList(externalEntries)),
     });
     selectableListService = jasmine.createSpyObj('selectableListService', ['selectSingle']);
   }
@@ -104,14 +115,14 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
-          }
+            paginatedSearchOptions: observableOf(pSearchOptions),
+          },
         },
         { provide: ExternalSourceDataService, useValue: externalSourceService },
         { provide: SelectableListService, useValue: selectableListService },
-        { provide: PaginationService, useValue: new PaginationServiceStub() }
+        { provide: PaginationService, useValue: new PaginationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -187,12 +198,13 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
 
   describe('import', () => {
     beforeEach(() => {
-      spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ importedObject: new EventEmitter<any>() }) }));
+      spyOn(modalService, 'open').and.returnValue(Object.assign({ componentInstance: Object.assign({ importedObject: new EventEmitter<any>(), compRef$: EMPTY }) }));
+      component.modalRef = modalService.open(ThemedExternalSourceEntryImportModalComponent, { size: 'lg', container: 'ds-dynamic-lookup-relation-modal' });
       component.import(externalEntries[0]);
     });
 
     it('should open a new ExternalSourceEntryImportModalComponent', () => {
-      expect(modalService.open).toHaveBeenCalledWith(ExternalSourceEntryImportModalComponent, jasmine.any(Object));
+      expect(modalService.open).toHaveBeenCalledWith(ThemedExternalSourceEntryImportModalComponent, jasmine.any(Object));
     });
   });
 });
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 e5ea98e537..398c4a8b94 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
@@ -1,29 +1,55 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import {
+  Component,
+  ComponentRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+  switchMap,
+} from 'rxjs/operators';
+
 import { ExternalSourceDataService } from '../../../../../../core/data/external-source-data.service';
-import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
-import { ExternalSource } from '../../../../../../core/shared/external-source.model';
-import { map, startWith, switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { Context } from '../../../../../../core/shared/context.model';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { fadeIn, fadeInOut } from '../../../../../animations/fade';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component';
-import { hasValue } from '../../../../../empty.util';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { Item } from '../../../../../../core/shared/item.model';
-import { Collection } from '../../../../../../core/shared/collection.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { Observable, Subscription } from 'rxjs';
+import { Collection } from '../../../../../../core/shared/collection.model';
+import { Context } from '../../../../../../core/shared/context.model';
+import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
+import { Item } from '../../../../../../core/shared/item.model';
 import { ItemType } from '../../../../../../core/shared/item-relationships/item-type.model';
 import { getFirstCompletedRemoteData } from '../../../../../../core/shared/operators';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../animations/fade';
+import {
+  hasValue,
+  hasValueOperator,
+} from '../../../../../empty.util';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { ThemedExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-external-source-tab',
@@ -32,13 +58,13 @@ import { getFirstCompletedRemoteData } from '../../../../../../core/shared/opera
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
+      useClass: SearchConfigurationService,
+    },
   ],
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * Component rendering the tab content of an external source during submission lookup
@@ -74,6 +100,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)
@@ -85,7 +117,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    */
   initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'spc',
-    pageSize: 5
+    pageSize: 5,
   });
 
   /**
@@ -114,21 +146,22 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
   modalRef: NgbModalRef;
 
   /**
-   * Subscription to the modal's importedObject event-emitter
+   * Array to track all subscriptions and unsubscribe them onDestroy
    */
-  importObjectSub: Subscription;
+  protected subs: Subscription[] = [];
 
   /**
    * The entity types compatible with the given external source
    */
   relatedEntityType: ItemType;
 
-  constructor(private router: Router,
-              public searchConfigService: SearchConfigurationService,
-              private externalSourceService: ExternalSourceDataService,
-              private modalService: NgbModal,
-              private selectableListService: SelectableListService,
-              private paginationService: PaginationService
+  constructor(
+    protected router: Router,
+    public searchConfigService: SearchConfigurationService,
+    protected externalSourceService: ExternalSourceDataService,
+    protected modalService: NgbModal,
+    protected selectableListService: SelectableListService,
+    protected paginationService: PaginationService,
   ) {
   }
 
@@ -140,19 +173,23 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
       getFirstCompletedRemoteData(),
       map((entityTypesRD: RemoteData<PaginatedList<ItemType>>) => {
         return (entityTypesRD.hasSucceeded && entityTypesRD.payload.totalElements > 0) ? entityTypesRD.payload.page[0] : null;
-      })
+      }),
     ).subscribe((entityType: ItemType) => {
       this.relatedEntityType = entityType;
     });
 
     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 = {
-      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label,
     };
   }
 
@@ -161,30 +198,40 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
    * @param entry The entry to import
    */
   import(entry) {
-    this.modalRef = this.modalService.open(ExternalSourceEntryImportModalComponent, {
+    this.modalRef = this.modalService.open(ThemedExternalSourceEntryImportModalComponent, {
       size: 'lg',
-      container: 'ds-dynamic-lookup-relation-modal'
+      container: 'ds-dynamic-lookup-relation-modal',
     });
-    const modalComp = this.modalRef.componentInstance;
-    modalComp.externalSourceEntry = entry;
-    modalComp.item = this.item;
-    modalComp.collection = this.collection;
-    modalComp.relationship = this.relationship;
-    modalComp.label = this.label;
-    modalComp.relatedEntityType = this.relatedEntityType;
-    this.importObjectSub = modalComp.importedObject.subscribe((object) => {
+
+    const modalComp$ = this.modalRef.componentInstance.compRef$.pipe(
+      hasValueOperator(),
+      map((compRef: ComponentRef<ExternalSourceEntryImportModalComponent>) => compRef.instance),
+    );
+
+    this.subs.push(modalComp$.subscribe((modalComp: ExternalSourceEntryImportModalComponent) => {
+      modalComp.externalSourceEntry = entry;
+      modalComp.item = this.item;
+      // modalComp.collection = this.collection;
+      modalComp.relationship = this.relationship;
+      modalComp.label = this.label;
+      modalComp.relatedEntityType = this.relatedEntityType;
+    }));
+
+    this.subs.push(modalComp$.pipe(
+      switchMap((modalComp: ExternalSourceEntryImportModalComponent) => modalComp.importedObject),
+    ).subscribe((object) => {
       this.selectableListService.selectSingle(this.listId, object);
       this.importedObject.emit(object);
-    });
+    }));
   }
 
   /**
    * Unsubscribe from open subscriptions
    */
   ngOnDestroy(): void {
-    if (hasValue(this.importObjectSub)) {
-      this.importObjectSub.unsubscribe();
-    }
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
   }
 
   /**
@@ -193,7 +240,7 @@ export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit
   resetRoute() {
     this.paginationService.updateRoute(this.searchConfigService.paginationID, {
       page: 1,
-      pageSize: 5
+      pageSize: 5,
     });
   }
 }
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.spec.ts 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.spec.ts
index c8711b6b47..f2bf9996cf 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.spec.ts
+++ 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.spec.ts
@@ -1,20 +1,31 @@
-import { ExternalSourceEntryImportModalComponent, ImportType } from './external-source-entry-import-modal.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { NgbActiveModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  NgbActiveModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ItemDataService } from '../../../../../../../core/data/item-data.service';
 import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service';
+import { Collection } from '../../../../../../../core/shared/collection.model';
 import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model';
 import { Item } from '../../../../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
-import { Collection } from '../../../../../../../core/shared/collection.model';
-import { RelationshipOptions } from '../../../../models/relationship-options.model';
-import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
-import { ItemDataService } from '../../../../../../../core/data/item-data.service';
 import { NotificationsService } from '../../../../../../notifications/notifications.service';
+import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../../../../remote-data.utils';
 import { createPaginatedList } from '../../../../../../testing/utils.test';
+import { RelationshipOptions } from '../../../../models/relationship-options.model';
+import {
+  ExternalSourceEntryImportModalComponent,
+  ImportType,
+} from './external-source-entry-import-modal.component';
 
 describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   let component: ExternalSourceEntryImportModalComponent;
@@ -33,10 +44,10 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
     metadata: {
       'dc.identifier.uri': [
         {
-          value: uri
-        }
-      ]
-    }
+          value: uri,
+        },
+      ],
+    },
   });
 
   const label = 'Author';
@@ -54,12 +65,12 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
   function init() {
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
       getLocalResults: createSuccessfulRemoteDataObject$(createPaginatedList([searchResult1, searchResult2, searchResult3])),
-      removeLocalResultsCache: {}
+      removeLocalResultsCache: {},
     });
     selectService = jasmine.createSpyObj('selectService', ['deselectAll']);
     notificationsService = jasmine.createSpyObj('notificationsService', ['success']);
     itemService = jasmine.createSpyObj('itemService', {
-      importExternalSourceEntry: createSuccessfulRemoteDataObject$(importedItem)
+      importExternalSourceEntry: createSuccessfulRemoteDataObject$(importedItem),
     });
     modalStub = jasmine.createSpyObj('modal', ['close']);
   }
@@ -74,9 +85,9 @@ describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
         { provide: SelectableListService, useValue: selectService },
         { provide: NotificationsService, useValue: notificationsService },
         { provide: ItemDataService, useValue: itemService },
-        { provide: NgbActiveModal, useValue: modalStub }
+        { provide: NgbActiveModal, useValue: modalStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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.ts 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.ts
index bf1f2f7e70..fcdf591014 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.ts
+++ 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.ts
@@ -1,30 +1,45 @@
-import { Component, EventEmitter, OnInit } from '@angular/core';
-import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+} from '@angular/core';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ItemDataService } from '../../../../../../../core/data/item-data.service';
+import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service';
+import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../../core/data/remote-data';
+import { Context } from '../../../../../../../core/shared/context.model';
 import { ExternalSourceEntry } from '../../../../../../../core/shared/external-source-entry.model';
+import { Item } from '../../../../../../../core/shared/item.model';
+import { ItemType } from '../../../../../../../core/shared/item-relationships/item-type.model';
 import { MetadataValue } from '../../../../../../../core/shared/metadata.models';
 import { Metadata } from '../../../../../../../core/shared/metadata.utils';
-import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../../../core/data/paginated-list.model';
-import { SearchResult } from '../../../../../../search/models/search-result.model';
-import { Item } from '../../../../../../../core/shared/item.model';
-import { RelationshipOptions } from '../../../../models/relationship-options.model';
-import { LookupRelationService } from '../../../../../../../core/data/lookup-relation.service';
-import { PaginatedSearchOptions } from '../../../../../../search/models/paginated-search-options.model';
-import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
-import { Context } from '../../../../../../../core/shared/context.model';
-import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
-import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model';
-import { ItemDataService } from '../../../../../../../core/data/item-data.service';
-import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../../core/shared/operators';
-import { switchMap, take } from 'rxjs/operators';
-import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
-import { NotificationsService } from '../../../../../../notifications/notifications.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 { SubmissionImportExternalCollectionComponent } from '../../../../../../../submission/import-external/import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../../../../collection-dropdown/collection-dropdown.component';
+import { NotificationsService } from '../../../../../../notifications/notifications.service';
+import { CollectionElementLinkType } from '../../../../../../object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../../../../object-collection/shared/item-search-result.model';
+import { ListableObject } from '../../../../../../object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../../../../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../../../pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../../../../../../search/models/paginated-search-options.model';
+import { SearchResult } from '../../../../../../search/models/search-result.model';
+import { RelationshipOptions } from '../../../../models/relationship-options.model';
 
 /**
  * The possible types of import for the external entry
@@ -40,7 +55,7 @@ export enum ImportType {
 @Component({
   selector: 'ds-external-source-entry-import-modal',
   styleUrls: ['./external-source-entry-import-modal.component.scss'],
-  templateUrl: './external-source-entry-import-modal.component.html'
+  templateUrl: './external-source-entry-import-modal.component.html',
 })
 /**
  * Component to display a modal window for importing an external source entry
@@ -223,13 +238,13 @@ export class ExternalSourceEntryImportModalComponent implements OnInit {
         return this.itemService.importExternalSourceEntry(this.externalSourceEntry, collectionListEntry.collection.id).pipe(
           getFirstSucceededRemoteData(),
           getRemoteDataPayload(),
-          take(1)
+          take(1),
         );
-      })
+      }),
     ).subscribe((item: Item) => {
       this.lookupRelationService.removeLocalResultsCache();
       const searchResult = Object.assign(new ItemSearchResult(), {
-        indexableObject: item
+        indexableObject: item,
       });
       this.notificationsService.success(this.translateService.get(this.labelPrefix + this.label + '.added.new-entity'));
       this.modalRef.close();
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts
new file mode 100644
index 0000000000..97e8877829
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component.ts
@@ -0,0 +1,23 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../../../../../theme-support/themed.component';
+import { ExternalSourceEntryImportModalComponent } from './external-source-entry-import-modal.component';
+
+@Component({
+  selector: 'ds-themed-external-source-entry-import-modal',
+  styleUrls: [],
+  templateUrl: '../../../../../../../shared/theme-support/themed.component.html',
+})
+export class ThemedExternalSourceEntryImportModalComponent extends ThemedComponent<ExternalSourceEntryImportModalComponent> {
+  protected getComponentName(): string {
+    return 'ExternalSourceEntryImportModalComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../../../themes/${themeName}/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`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./external-source-entry-import-modal.component`);
+  }
+}
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
new file mode 100644
index 0000000000..c2d83f11c6
--- /dev/null
+++ 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
@@ -0,0 +1,57 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { Collection } from '../../../../../../core/shared/collection.model';
+import { Context } from '../../../../../../core/shared/context.model';
+import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { ThemedComponent } from '../../../../../theme-support/themed.component';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
+
+@Component({
+  selector: 'ds-themed-dynamic-lookup-relation-external-source-tab',
+  styleUrls: [],
+  templateUrl: '../../../../../theme-support/themed.component.html',
+})
+export class ThemedDynamicLookupRelationExternalSourceTabComponent extends ThemedComponent<DsDynamicLookupRelationExternalSourceTabComponent> {
+  protected inAndOutputNames: (keyof DsDynamicLookupRelationExternalSourceTabComponent & keyof this)[] = ['label', 'listId',
+    'item', 'collection', 'relationship', 'context', 'query', 'repeatable', 'importedObject', 'externalSource'];
+
+  @Input() label: string;
+
+  @Input() listId: string;
+
+  @Input() item: Item;
+
+  @Input() collection: Collection;
+
+  @Input() relationship: RelationshipOptions;
+
+  @Input() context: Context;
+
+  @Input() query: string;
+
+  @Input() repeatable: boolean;
+
+  @Output() importedObject: EventEmitter<ListableObject> = new EventEmitter();
+
+  @Input() externalSource: ExternalSource;
+
+  protected getComponentName(): string {
+    return 'DsDynamicLookupRelationExternalSourceTabComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../../themes/${themeName}/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./dynamic-lookup-relation-external-source-tab.component`);
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
index e1cc49778e..59fd9feb77 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
@@ -2,9 +2,10 @@
 /**
  * The list of NameVariantAction type definitions
  */
-import { type } from '../../../../ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../../../../ngrx/type';
+
 export const NameVariantActionTypes = {
   SET_NAME_VARIANT: type('dspace/name-variant/SET_NAME_VARIANT'),
   REMOVE_NAME_VARIANT: type('dspace/name-variant/REMOVE_NAME_VARIANT'),
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
index cb4128ec46..41a63c73d1 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
@@ -1,5 +1,9 @@
-import { RemoveNameVariantAction, SetNameVariantAction } from './name-variant.actions';
 import { Action } from '@ngrx/store';
+
+import {
+  RemoveNameVariantAction,
+  SetNameVariantAction,
+} from './name-variant.actions';
 import { nameVariantReducer } from './name-variant.reducer';
 
 class NullAction implements Action {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
index 9f93cf2dd1..a80bd4dc6c 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
@@ -2,8 +2,12 @@
  * Represents the state of all lists containing name variants in the store
  */
 
-import { NameVariantAction, NameVariantActionTypes, SetNameVariantAction } from './name-variant.actions';
 import { hasValue } from '../../../../empty.util';
+import {
+  NameVariantAction,
+  NameVariantActionTypes,
+  SetNameVariantAction,
+} from './name-variant.actions';
 
 export interface NameVariantListsState {
   [listID: string]: NameVariantListState;
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
index fb2271224b..7d21fcb1f6 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
@@ -2,10 +2,11 @@
 /**
  * The list of RelationshipAction type definitions
  */
-import { type } from '../../../../ngrx/type';
 import { Action } from '@ngrx/store';
+
 import { Item } from '../../../../../core/shared/item.model';
 import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { type } from '../../../../ngrx/type';
 
 export const RelationshipActionTypes = {
   ADD_RELATIONSHIP: type('dspace/relationship/ADD_RELATIONSHIP'),
@@ -42,7 +43,7 @@ export class AddRelationshipAction implements Action {
     item2: Item,
     relationshipType: string,
     submissionId: string,
-    nameVariant?: string
+    nameVariant?: string,
   ) {
     this.payload = { item1, item2, relationshipType, submissionId, nameVariant };
   }
@@ -73,7 +74,7 @@ export class UpdateRelationshipNameVariantAction implements Action {
     item2: Item,
     relationshipType: string,
     submissionId: string,
-    nameVariant?: string
+    nameVariant?: string,
   ) {
     this.payload = { item1, item2, relationshipType, submissionId, nameVariant };
   }
@@ -126,7 +127,7 @@ export class RemoveRelationshipAction implements Action {
     item1: Item,
     item2: Item,
     relationshipType: string,
-    submissionId: string
+    submissionId: string,
   ) {
     this.payload = { item1, item2, relationshipType, submissionId };
   }
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..66684058cd 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
@@ -1,29 +1,44 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
 import { Store } from '@ngrx/store';
-import { RelationshipEffects } from './relationship.effects';
-import { AddRelationshipAction, RelationshipActionTypes, RemoveRelationshipAction } from './relationship.actions';
-import { Item } from '../../../../../core/shared/item.model';
-import { MetadataValue } from '../../../../../core/shared/metadata.models';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
-import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
-import { ItemType } from '../../../../../core/shared/item-relationships/item-type.model';
-import { RestResponse } from '../../../../../core/cache/response.models';
-import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
-import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
-import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
-import { RequestService } from '../../../../../core/data/request.service';
-import { NotificationsService } from '../../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { cold, hot } from 'jasmine-marbles';
-import { DEBOUNCE_TIME_OPERATOR } from '../../../../../core/shared/operators';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { last } from 'rxjs/operators';
 
+import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../../../core/cache/response.models';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { RequestService } from '../../../../../core/data/request.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 { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { DEBOUNCE_TIME_OPERATOR } from '../../../../../core/shared/operators';
+import { WorkspaceItem } from '../../../../../core/submission/models/workspaceitem.model';
+import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
+import { NotificationsService } from '../../../../notifications/notifications.service';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import {
+  AddRelationshipAction,
+  RelationshipActionTypes,
+  RemoveRelationshipAction,
+} from './relationship.actions';
+import { RelationshipEffects } from './relationship.effects';
+
 describe('RelationshipEffects', () => {
   let relationEffects: RelationshipEffects;
   let actions: Observable<any>;
@@ -65,19 +80,19 @@ describe('RelationshipEffects', () => {
 
     leftItem = Object.assign(new Item(), {
       uuid: testUUID1,
-      metadata: { 'dspace.entity.type': [leftTypeMD] }
+      metadata: { 'dspace.entity.type': [leftTypeMD] },
     });
 
     rightItem = Object.assign(new Item(), {
       uuid: testUUID2,
-      metadata: { 'dspace.entity.type': [rightTypeMD] }
+      metadata: { 'dspace.entity.type': [rightTypeMD] },
     });
 
     relationshipType = Object.assign(new RelationshipType(), {
       leftwardType: 'isAuthorOfPublication',
       rightwardType: 'isPublicationOfAuthor',
       leftType: createSuccessfulRemoteDataObject$(leftType),
-      rightType: createSuccessfulRemoteDataObject$(rightType)
+      rightType: createSuccessfulRemoteDataObject$(rightType),
     });
 
     relationship = Object.assign(new Relationship(),
@@ -86,27 +101,27 @@ describe('RelationshipEffects', () => {
         id: relationshipID,
         leftItem: createSuccessfulRemoteDataObject$(leftItem),
         rightItem: createSuccessfulRemoteDataObject$(rightItem),
-        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType),
       });
 
     mockRelationshipService = {
       getRelationshipByItemsAndLabel:
         () => observableOf(relationship),
       deleteRelationship: () => observableOf(new RestResponse(true, 200, 'OK')),
-      addRelationship: () => observableOf(new RestResponse(true, 200, 'OK'))
+      addRelationship: () => observableOf(new RestResponse(true, 200, 'OK')),
 
     };
     mockRelationshipTypeService = {
       getRelationshipTypeByLabelAndTypes:
-        () => observableOf(relationshipType)
+        () => observableOf(relationshipType),
     };
     notificationsService = jasmine.createSpyObj('notificationsService', ['error']);
     translateService = jasmine.createSpyObj('translateService', {
-      instant: 'translated-message'
+      instant: 'translated-message',
     });
     selectableListService = jasmine.createSpyObj('selectableListService', {
       findSelectedByCondition: observableOf({}),
-      deselectSingle: {}
+      deselectSingle: {},
     });
   }
 
@@ -120,9 +135,9 @@ describe('RelationshipEffects', () => {
         { provide: RelationshipDataService, useValue: mockRelationshipService },
         {
           provide: SubmissionObjectDataService, useValue: {
-            findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem())
+            findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem()),
           },
-          getHrefByID: () => observableOf('')
+          getHrefByID: () => observableOf(''),
         },
         { provide: Store, useValue: jasmine.createSpyObj('store', ['dispatch']) },
         { provide: ObjectCacheService, useValue: {} },
@@ -256,7 +271,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, '1234');
           });
         });
 
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..51b3b70136 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,38 +1,60 @@
-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 { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
 import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { Store } from '@ngrx/store';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
+import { ServerSyncBufferActionTypes } from '../../../../../core/cache/server-sync-buffer.actions';
+import { RelationshipDataService } from '../../../../../core/data/relationship-data.service';
+import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestService } from '../../../../../core/data/request.service';
+import { JsonPatchOperationsActionTypes } from '../../../../../core/json-patch/json-patch-operations.actions';
+import { Item } from '../../../../../core/shared/item.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  DEBOUNCE_TIME_OPERATOR,
+  getFirstSucceededRemoteData,
   getRemoteDataPayload,
-  getFirstSucceededRemoteData, DEBOUNCE_TIME_OPERATOR
 } from '../../../../../core/shared/operators';
+import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
+import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
+import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
+import { SubmissionState } from '../../../../../submission/submission.reducers';
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+} from '../../../../empty.util';
+import { NotificationsService } from '../../../../notifications/notifications.service';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { followLink } from '../../../../utils/follow-link-config.model';
 import {
   AddRelationshipAction,
   RelationshipAction,
   RelationshipActionTypes,
   UpdateRelationshipAction,
-  UpdateRelationshipNameVariantAction
+  UpdateRelationshipNameVariantAction,
 } from './relationship.actions';
-import { Item } from '../../../../../core/shared/item.model';
-import { hasNoValue, hasValue, hasValueOperator } from '../../../../empty.util';
-import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
-import { RelationshipTypeDataService } from '../../../../../core/data/relationship-type-data.service';
-import { SubmissionObjectDataService } from '../../../../../core/submission/submission-object-data.service';
-import { SaveSubmissionSectionFormSuccessAction } from '../../../../../submission/objects/submission-objects.actions';
-import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
-import { SubmissionState } from '../../../../../submission/submission.reducers';
-import { Store } from '@ngrx/store';
-import { ObjectCacheService } from '../../../../../core/cache/object-cache.service';
-import { RequestService } from '../../../../../core/data/request.service';
-import { ServerSyncBufferActionTypes } from '../../../../../core/cache/server-sync-buffer.actions';
-import { JsonPatchOperationsActionTypes } from '../../../../../core/json-patch/json-patch-operations.actions';
-import { followLink } from '../../../../utils/follow-link-config.model';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { NotificationsService } from '../../../../notifications/notifications.service';
-import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
-import { TranslateService } from '@ngx-translate/core';
 
 const DEBOUNCE_TIME = 500;
 
@@ -61,42 +83,42 @@ export class RelationshipEffects {
   /**
    * Effect that makes sure all last fired RelationshipActions' types are stored in the map of this service, with the object uuid as their key
    */
-   mapLastActions$ = createEffect(() => this.actions$
+  mapLastActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(RelationshipActionTypes.ADD_RELATIONSHIP, RelationshipActionTypes.REMOVE_RELATIONSHIP),
       map((action: RelationshipAction) => {
-          const { item1, item2, submissionId, relationshipType } = action.payload;
-          const identifier: string = this.createIdentifier(item1, item2, relationshipType);
-          if (hasNoValue(this.debounceMap[identifier])) {
-            this.initialActionMap[identifier] = action.type;
-            this.debounceMap[identifier] = new BehaviorSubject<string>(action.type);
-            this.debounceMap[identifier].pipe(
-              this.debounceTime(DEBOUNCE_TIME),
-              take(1)
-            ).subscribe(
-              (type) => {
-                if (this.initialActionMap[identifier] === type) {
-                  if (type === RelationshipActionTypes.ADD_RELATIONSHIP) {
-                    let nameVariant = (action as AddRelationshipAction).payload.nameVariant;
-                    if (hasValue(this.nameVariantUpdates[identifier])) {
-                      nameVariant = this.nameVariantUpdates[identifier];
-                      delete this.nameVariantUpdates[identifier];
-                    }
-                    this.addRelationship(item1, item2, relationshipType, submissionId, nameVariant);
-                  } else {
-                    this.removeRelationship(item1, item2, relationshipType, submissionId);
+        const { item1, item2, submissionId, relationshipType } = action.payload;
+        const identifier: string = this.createIdentifier(item1, item2, relationshipType);
+        if (hasNoValue(this.debounceMap[identifier])) {
+          this.initialActionMap[identifier] = action.type;
+          this.debounceMap[identifier] = new BehaviorSubject<string>(action.type);
+          this.debounceMap[identifier].pipe(
+            this.debounceTime(DEBOUNCE_TIME),
+            take(1),
+          ).subscribe(
+            (type) => {
+              if (this.initialActionMap[identifier] === type) {
+                if (type === RelationshipActionTypes.ADD_RELATIONSHIP) {
+                  let nameVariant = (action as AddRelationshipAction).payload.nameVariant;
+                  if (hasValue(this.nameVariantUpdates[identifier])) {
+                    nameVariant = this.nameVariantUpdates[identifier];
+                    delete this.nameVariantUpdates[identifier];
                   }
+                  this.addRelationship(item1, item2, relationshipType, submissionId, nameVariant);
+                } else {
+                  this.removeRelationship(item1, item2, relationshipType, submissionId);
                 }
-                delete this.debounceMap[identifier];
-                delete this.initialActionMap[identifier];
-
               }
-            );
-          } else {
-            this.debounceMap[identifier].next(action.type);
-          }
+              delete this.debounceMap[identifier];
+              delete this.initialActionMap[identifier];
+
+            },
+          );
+        } else {
+          this.debounceMap[identifier].next(action.type);
         }
-      )
+      },
+      ),
     ), { dispatch: false });
 
   /**
@@ -104,49 +126,49 @@ export class RelationshipEffects {
    * If the relationship is currently being added or removed, it will add the name variant to an update map so it will be sent with the next add request instead
    * Otherwise the update is done immediately
    */
-   updateNameVariantsActions$ = createEffect(() => this.actions$
+  updateNameVariantsActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(RelationshipActionTypes.UPDATE_NAME_VARIANT),
       map((action: UpdateRelationshipNameVariantAction) => {
-          const { item1, item2, relationshipType, submissionId, nameVariant } = action.payload;
-          const identifier: string = this.createIdentifier(item1, item2, relationshipType);
-          const inProgress = hasValue(this.debounceMap[identifier]);
-          if (inProgress) {
-            this.nameVariantUpdates[identifier] = nameVariant;
-          } else {
-            this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant).pipe(
-              filter((relationshipRD: RemoteData<Relationship>) => hasValue(relationshipRD.payload)),
-              take(1)
-            ).subscribe((c) => {
-              this.updateAfterPatchSubmissionId = submissionId;
-              this.relationshipService.refreshRelationshipItemsInCache(item1);
-              this.relationshipService.refreshRelationshipItemsInCache(item2);
-            });
-          }
+        const { item1, item2, relationshipType, submissionId, nameVariant } = action.payload;
+        const identifier: string = this.createIdentifier(item1, item2, relationshipType);
+        const inProgress = hasValue(this.debounceMap[identifier]);
+        if (inProgress) {
+          this.nameVariantUpdates[identifier] = nameVariant;
+        } else {
+          this.relationshipService.updateNameVariant(item1, item2, relationshipType, nameVariant).pipe(
+            filter((relationshipRD: RemoteData<Relationship>) => hasValue(relationshipRD.payload)),
+            take(1),
+          ).subscribe((c) => {
+            this.updateAfterPatchSubmissionId = submissionId;
+            this.relationshipService.refreshRelationshipItemsInCache(item1);
+            this.relationshipService.refreshRelationshipItemsInCache(item2);
+          });
         }
-      )
+      },
+      ),
     ), { dispatch: false });
 
   /**
    * Save the latest submission ID, to make sure it's updated when the patch is finished
    */
-   updateRelationshipActions$ = createEffect(() => this.actions$
+  updateRelationshipActions$ = createEffect(() => this.actions$
     .pipe(
       ofType(RelationshipActionTypes.UPDATE_RELATIONSHIP),
       map((action: UpdateRelationshipAction) => {
         this.updateAfterPatchSubmissionId = action.payload.submissionId;
-      })
+      }),
     ), { dispatch: false });
 
   /**
    * Save the submission object with ID updateAfterPatchSubmissionId
    */
-   saveSubmissionSection = createEffect(() => this.actions$
+  saveSubmissionSection = createEffect(() => this.actions$
     .pipe(
       ofType(ServerSyncBufferActionTypes.EMPTY, JsonPatchOperationsActionTypes.COMMIT_JSON_PATCH_OPERATIONS),
       filter(() => hasValue(this.updateAfterPatchSubmissionId)),
       switchMap(() => this.refreshWorkspaceItemInCache(this.updateAfterPatchSubmissionId)),
-      map((submissionObject) => new SaveSubmissionSectionFormSuccessAction(this.updateAfterPatchSubmissionId, [submissionObject], false))
+      map((submissionObject) => new SaveSubmissionSectionFormSuccessAction(this.updateAfterPatchSubmissionId, [submissionObject], false)),
     ));
 
   constructor(private actions$: Actions,
@@ -191,7 +213,7 @@ export class RelationshipEffects {
             const listId = `list-${submissionId}-${relationshipType}`;
             this.selectableListService.findSelectedByCondition(listId, (object: any) => hasValue(object.indexableObject) && object.indexableObject.uuid === item2.uuid).pipe(
               take(1),
-              hasValueOperator()
+              hasValueOperator(),
             ).subscribe((selected) => {
               this.selectableListService.deselectSingle(listId, selected);
             });
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 376900609e..12bc93ab0e 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
@@ -9,6 +9,7 @@
            [selectionConfig]="{ repeatable: repeatable, listId: listId }"
            [showScopeSelector]="false"
            [showViewModes]="false"
+           [query]="query"
            (resultFound)="onResultFound($event)"
            (deselectObject)="deselectObject.emit($event)"
            (selectObject)="selectObject.emit($event)">
@@ -21,7 +22,7 @@
                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)"
+          <input *ngIf="!allSelected && (someSelected$ | async) !== true"
                  type="checkbox"
                  [indeterminate]="false"
                  (change)="selectAll()">
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..a9fb9235e1 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
@@ -1,26 +1,31 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Item } from '../../../../../../core/shared/item.model';
+import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
+import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { relatedRelationships } from '../../../../../testing/related-relationships.mock';
 import { VarDirective } from '../../../../../utils/var.directive';
 import { RelationshipOptions } from '../../../models/relationship-options.model';
-import { of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
-import { buildPaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../../core/shared/item.model';
-import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
-import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
-import { relatedRelationships } from '../../../../../testing/related-relationships.mock';
-import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
-import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
 
 
 describe('DsDynamicLookupRelationSearchTabComponent', () => {
@@ -44,19 +49,19 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
   let selectableListService;
   let lookupRelationService;
   const relationshipService = jasmine.createSpyObj('searchByItemsAndType',{
-    searchByItemsAndType: observableOf(relatedRelationships)
+    searchByItemsAndType: observableOf(relatedRelationships),
   });
 
   const relationshipType = {
-      'type': 'relationshiptype',
-      'id': 1,
-      'uuid': 'relationshiptype-1',
-      'leftwardType': 'isAuthorOfPublication',
-      'leftMaxCardinality': null,
-      'leftMinCardinality': 0,
-      'rightwardType': 'isPublicationOfAuthor',
-      'rightMaxCardinality': null,
-      'rightMinCardinality': 0,
+    'type': 'relationshiptype',
+    'id': 1,
+    'uuid': 'relationshiptype-1',
+    'leftwardType': 'isAuthorOfPublication',
+    'leftMaxCardinality': null,
+    'leftMinCardinality': 0,
+    'rightwardType': 'isPublicationOfAuthor',
+    'rightMaxCardinality': null,
+    'rightMinCardinality': 0,
   };
 
   function init() {
@@ -64,7 +69,7 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
       filter: 'filter',
       relationshipType: 'isAuthorOfPublication',
       nameVariants: true,
-      searchConfiguration: 'personConfig'
+      searchConfiguration: 'personConfig',
     });
     pSearchOptions = new PaginatedSearchOptions({});
     item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
@@ -80,11 +85,11 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
 
     results = buildPaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
     searchResult = Object.assign(new SearchObjects(), {
-      page: [searchResult1, searchResult2, searchResult3]
+      page: [searchResult1, searchResult2, searchResult3],
     });
     selectableListService = jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']);
     lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
-      getLocalResults: createSuccessfulRemoteDataObject$(results)
+      getLocalResults: createSuccessfulRemoteDataObject$(results),
     });
     lookupRelationService.searchConfig = {};
   }
@@ -97,19 +102,19 @@ describe('DsDynamicLookupRelationSearchTabComponent', () => {
       providers: [
         { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
         {
-          provide: SelectableListService, useValue: selectableListService
+          provide: SelectableListService, useValue: selectableListService,
         },
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
-          }
+            paginatedSearchOptions: observableOf(pSearchOptions),
+          },
         },
         { provide: LookupRelationService, useValue: lookupRelationService },
         { provide: PaginationService, useValue: new PaginationServiceStub() },
-        { provide: RelationshipDataService, useValue: relationshipService }
+        { provide: RelationshipDataService, useValue: relationshipService },
 
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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 cd4a8f7690..08cf2a155b 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
@@ -1,28 +1,47 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { Item } from '../../../../../../core/shared/item.model';
-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 { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../../../../core/shared/operators';
-import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
-import { Context } from '../../../../../../core/shared/context.model';
-import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
-import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mapTo,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { Relationship } from '../../../../../../core/shared/item-relationships/relationship.model';
-import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+import { PaginatedList } from '../../../../../../core/data/paginated-list.model';
+import { RelationshipDataService } from '../../../../../../core/data/relationship-data.service';
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Context } from '../../../../../../core/shared/context.model';
 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 { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../../../../core/shared/operators';
+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';
+import { hasValue } from '../../../../../empty.util';
+import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { SearchResult } from '../../../../../search/models/search-result.model';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
 
 
 @Component({
@@ -32,9 +51,9 @@ import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model'
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
@@ -133,7 +152,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
    */
   initialPagination = {
     page: 1,
-    pageSize: 5
+    pageSize: 5,
   };
 
   /**
@@ -147,12 +166,12 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
   @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter<SearchObjects<DSpaceObject>>();
 
   constructor(
-    private searchService: SearchService,
-    private selectableListService: SelectableListService,
+    protected searchService: SearchService,
+    protected selectableListService: SelectableListService,
     public searchConfigService: SearchConfigurationService,
     public lookupRelationService: LookupRelationService,
-    private relationshipService: RelationshipDataService,
-    private paginationService: PaginationService
+    protected relationshipService: RelationshipDataService,
+    protected paginationService: PaginationService,
   ) {
   }
 
@@ -207,7 +226,7 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
     this.selectAllLoading = true;
     const fullPagination = Object.assign(new PaginationComponentOptions(), {
       currentPage: 1,
-      pageSize: 9999
+      pageSize: 9999,
     });
     const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
     const results$ = this.searchService.search<Item>(fullSearchConfig);
@@ -221,10 +240,10 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
           const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
           this.selectObject.emit(...filteredResults);
         }),
-        mapTo(results)
-      ))
+        mapTo(results),
+      )),
     ).subscribe((results) => {
-        this.selectableListService.select(this.listId, results);
+      this.selectableListService.select(this.listId, results);
     });
   }
 
@@ -239,30 +258,30 @@ export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDest
       relationType = this.relationshipType.leftwardType;
     }
     this.relationshipService.searchByItemsAndType( this.relationshipType.id, this.item.uuid, relationType ,idOfItems ).pipe(
-        getFirstSucceededRemoteData(),
-        getRemoteDataPayload(),
-      ).subscribe( (res: PaginatedList<Relationship>) => {
+      getFirstSucceededRemoteData(),
+      getRemoteDataPayload(),
+    ).subscribe( (res: PaginatedList<Relationship>) => {
 
-        let selectableObject = res.page.map( (relationship: any) => {
+      let selectableObject = res.page.map( (relationship: any) => {
 
-          let arrUrl = [];
-          if ( this.isLeft ) {
-            arrUrl = relationship._links.rightItem.href.split('/');
-          } else {
-            arrUrl = relationship._links.leftItem.href.split('/');
-          }
-          const uuid = arrUrl[ arrUrl.length - 1 ];
-
-          return this.getRelatedItem(uuid, resultListOfItems);
-        });
-
-        selectableObject = selectableObject.filter( (selObject) => {
-          return !this.getIfInRemove(selObject.indexableObject.uuid);
-        });
-
-        if ( selectableObject.length > 0 ) {
-          this.selectableListService.select(this.listId, selectableObject);
+        let arrUrl = [];
+        if ( this.isLeft ) {
+          arrUrl = relationship._links.rightItem.href.split('/');
+        } else {
+          arrUrl = relationship._links.leftItem.href.split('/');
         }
+        const uuid = arrUrl[ arrUrl.length - 1 ];
+
+        return this.getRelatedItem(uuid, resultListOfItems);
+      });
+
+      selectableObject = selectableObject.filter( (selObject) => {
+        return !this.getIfInRemove(selObject.indexableObject.uuid);
+      });
+
+      if ( selectableObject.length > 0 ) {
+        this.selectableListService.select(this.listId, selectableObject);
+      }
     });
   }
 
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
new file mode 100644
index 0000000000..1c9375ce23
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component.ts
@@ -0,0 +1,69 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { Context } from '../../../../../../core/shared/context.model';
+import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { RelationshipType } from '../../../../../../core/shared/item-relationships/relationship-type.model';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { SearchObjects } from '../../../../../search/models/search-objects.model';
+import { SearchResult } from '../../../../../search/models/search-result.model';
+import { ThemedComponent } from '../../../../../theme-support/themed.component';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { DsDynamicLookupRelationSearchTabComponent } from './dynamic-lookup-relation-search-tab.component';
+
+@Component({
+  selector: 'ds-themed-dynamic-lookup-relation-search-tab',
+  styleUrls: [],
+  templateUrl: '../../../../../theme-support/themed.component.html',
+})
+export class ThemedDynamicLookupRelationSearchTabComponent extends ThemedComponent<DsDynamicLookupRelationSearchTabComponent> {
+  protected inAndOutputNames: (keyof DsDynamicLookupRelationSearchTabComponent & keyof this)[] = ['relationship', 'listId',
+    'query', 'repeatable', 'selection$', 'context', 'relationshipType', 'item', 'isLeft', 'toRemove', 'isEditRelationship',
+    'deselectObject', 'selectObject', 'resultFound'];
+
+  @Input() relationship: RelationshipOptions;
+
+  @Input() listId: string;
+
+  @Input() query: string;
+
+  @Input() repeatable: boolean;
+
+  @Input() selection$: Observable<ListableObject[]>;
+
+  @Input() context: Context;
+
+  @Input() relationshipType: RelationshipType;
+
+  @Input() item: Item;
+
+  @Input() isLeft: boolean;
+
+  @Input() toRemove: SearchResult<Item>[];
+
+  @Input() isEditRelationship: boolean;
+
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
+
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
+
+  @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
+
+  protected getComponentName(): string {
+    return 'DsDynamicLookupRelationSearchTabComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../../themes/${themeName}/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./dynamic-lookup-relation-search-tab.component`);
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
index 472a719b27..9dad2fb77f 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
@@ -1,22 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../../../../utils/var.directive';
-import { Observable, of as observableOf } from 'rxjs';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../../core/shared/item.model';
-import { DsDynamicLookupRelationSelectionTabComponent } from './dynamic-lookup-relation-selection-tab.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Item } from '../../../../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { VarDirective } from '../../../../../utils/var.directive';
+import { DsDynamicLookupRelationSelectionTabComponent } from './dynamic-lookup-relation-selection-tab.component';
 
 describe('DsDynamicLookupRelationSelectionTabComponent', () => {
   let component: DsDynamicLookupRelationSelectionTabComponent;
@@ -51,17 +62,17 @@ describe('DsDynamicLookupRelationSelectionTabComponent', () => {
       providers: [
         {
           provide: SearchConfigurationService, useValue: {
-            paginatedSearchOptions: observableOf(pSearchOptions)
+            paginatedSearchOptions: observableOf(pSearchOptions),
           },
         },
         {
-          provide: Router, useValue: router
+          provide: Router, useValue: router,
         },
         {
-          provide: PaginationService, useValue: new PaginationServiceStub()
-        }
+          provide: PaginationService, useValue: new PaginationServiceStub(),
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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..e4454c4ea9 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
@@ -1,18 +1,31 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { Observable } from 'rxjs';
-import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
-import { RemoteData } from '../../../../../../core/data/remote-data';
-import { map, switchMap, take } from 'rxjs/operators';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { buildPaginatedList, PaginatedList } from '../../../../../../core/data/paginated-list.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
-import { PageInfo } from '../../../../../../core/shared/page-info.model';
-import { Context } from '../../../../../../core/shared/context.model';
-import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
+import { Observable } from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../../core/data/remote-data';
 import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { Context } from '../../../../../../core/shared/context.model';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../my-dspace-page/my-dspace-page.component';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject } from '../../../../../remote-data.utils';
+import { PaginatedSearchOptions } from '../../../../../search/models/paginated-search-options.model';
 
 @Component({
   selector: 'ds-dynamic-lookup-relation-selection-tab',
@@ -21,9 +34,9 @@ import { PaginationService } from '../../../../../../core/pagination/pagination.
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
@@ -75,7 +88,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
    */
   initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'spc',
-    pageSize: 5
+    pageSize: 5,
   });
 
   /**
@@ -85,7 +98,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
 
   constructor(private router: Router,
               private searchConfigService: SearchConfigurationService,
-              private paginationService: PaginationService
+              private paginationService: PaginationService,
   ) {
   }
 
@@ -109,12 +122,12 @@ export class DsDynamicLookupRelationSelectionTabComponent {
                   elementsPerPage: pagination.pageSize,
                   totalElements: selected.length,
                   currentPage: pagination.currentPage,
-                  totalPages: Math.ceil(selected.length / pagination.pageSize)
+                  totalPages: Math.ceil(selected.length / pagination.pageSize),
                 });
               return createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, selection));
-            })
+            }),
           );
-        })
+        }),
       );
     this.currentPagination$ = this.paginationService.getCurrentPagination(this.searchConfigService.paginationID, this.initialPagination);
   }
@@ -125,7 +138,7 @@ export class DsDynamicLookupRelationSelectionTabComponent {
   resetRoute() {
     this.paginationService.updateRoute(this.searchConfigService.paginationID, {
       page: 1,
-      pageSize: 5
+      pageSize: 5,
     });
   }
 }
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 b68963e5ad..6cf3f709ab 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -1,11 +1,14 @@
-import { inject, TestBed } from '@angular/core/testing';
 import {
-  FormArray,
-  FormControl,
-  FormGroup,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import {
   NG_ASYNC_VALIDATORS,
   NG_VALIDATORS,
-  ReactiveFormsModule
+  ReactiveFormsModule,
+  UntypedFormArray,
+  UntypedFormControl,
+  UntypedFormGroup,
 } from '@angular/forms';
 import {
   DynamicCheckboxGroupModel,
@@ -28,29 +31,30 @@ import {
   DynamicTextAreaModel,
   DynamicTimePickerModel,
 } from '@ng-dynamic-forms/core';
-import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
-import { DynamicListCheckboxGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-checkbox-group.model';
-import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicScrollableDropdownModel } from './ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { DynamicLookupModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
-import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model';
-import { DynamicOneboxModel } from './ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
-import { DynamicListRadioGroupModel } from './ds-dynamic-form-ui/models/list/dynamic-list-radio-group.model';
-import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
-import { FormFieldModel } from './models/form-field.model';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { FormBuilderService } from './form-builder.service';
-import { DynamicRowGroupModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
-import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.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 {ConfigurationDataService} from '../../../core/data/configuration-data.service';
-import {createSuccessfulRemoteDataObject$} from '../../remote-data.utils';
-import {ConfigurationProperty} from '../../../core/shared/configuration-property.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { DynamicDsDatePickerModel } from './ds-dynamic-form-ui/models/date-picker/date-picker.model';
+import { DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
+import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
+import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRowGroupModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
+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 { DynamicLookupModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
+import { DynamicLookupNameModel } from './ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
+import { DynamicOneboxModel } from './ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DynamicScrollableDropdownModel } from './ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
+import { DynamicTagModel } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
+import { FormBuilderService } from './form-builder.service';
+import { FormFieldModel } from './models/form-field.model';
+import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
 
 describe('FormBuilderService test suite', () => {
 
@@ -88,13 +92,13 @@ 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 },
+      ],
     });
 
     const vocabularyOptions: VocabularyOptions = {
       name: 'type_programme',
-      closed: false
+      closed: false,
     };
 
     testModel = [
@@ -105,22 +109,22 @@ describe('FormBuilderService test suite', () => {
           options: [
             {
               label: 'Option 1',
-              value: 'option-1'
+              value: 'option-1',
             },
             {
               label: 'Option 2',
-              value: 'option-2'
-            }
+              value: 'option-2',
+            },
           ],
-          value: 'option-3'
-        }
+          value: 'option-3',
+        },
       ),
 
       new DynamicInputModel(
         {
           id: 'testInput',
           mask: '(000) 000-0000',
-        }
+        },
       ),
 
       new DynamicCheckboxGroupModel(
@@ -130,17 +134,17 @@ describe('FormBuilderService test suite', () => {
             new DynamicCheckboxModel(
               {
                 id: 'testCheckboxGroup1',
-                value: true
-              }
+                value: true,
+              },
             ),
             new DynamicCheckboxModel(
               {
                 id: 'testCheckboxGroup2',
-                value: true
-              }
-            )
-          ]
-        }
+                value: true,
+              },
+            ),
+          ],
+        },
       ),
 
       new DynamicRadioGroupModel<string>(
@@ -149,15 +153,15 @@ describe('FormBuilderService test suite', () => {
           options: [
             {
               label: 'Option 1',
-              value: 'option-1'
+              value: 'option-1',
             },
             {
               label: 'Option 2',
-              value: 'option-2'
-            }
+              value: 'option-2',
+            },
           ],
-          value: 'option-3'
-        }
+          value: 'option-3',
+        },
       ),
 
       new DynamicTextAreaModel({ id: 'testTextArea' }),
@@ -173,12 +177,12 @@ describe('FormBuilderService test suite', () => {
               new DynamicInputModel({ id: 'testFormArrayGroupInput' }),
               new DynamicFormArrayModel({
                 id: 'testNestedFormArray', groupFactory: () => [
-                  new DynamicInputModel({ id: 'testNestedFormArrayGroupInput' })
-                ]
-              })
+                  new DynamicInputModel({ id: 'testNestedFormArrayGroupInput' }),
+                ],
+              }),
             ];
-          }
-        }
+          },
+        },
       ),
 
       new DynamicFormGroupModel(
@@ -186,9 +190,9 @@ describe('FormBuilderService test suite', () => {
           id: 'testFormGroup',
           group: [
             new DynamicInputModel({ id: 'nestedTestInput' }),
-            new DynamicTextAreaModel({ id: 'nestedTestTextArea' })
-          ]
-        }
+            new DynamicTextAreaModel({ id: 'nestedTestTextArea' }),
+          ],
+        },
       ),
 
       new DynamicSliderModel({ id: 'testSlider' }),
@@ -221,7 +225,7 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: false
+        hasSelectableMetadata: false,
       }),
 
       new DynamicTagModel({
@@ -229,16 +233,22 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: false
+        hasSelectableMetadata: false,
       }),
 
       new DynamicListCheckboxGroupModel({
         id: 'testCheckboxList',
         vocabularyOptions: vocabularyOptions,
-        repeatable: true
+        repeatable: true,
+        required: false,
       }),
 
-      new DynamicListRadioGroupModel({ id: 'testRadioList', vocabularyOptions: vocabularyOptions, repeatable: false }),
+      new DynamicListRadioGroupModel({
+        id: 'testRadioList',
+        vocabularyOptions: vocabularyOptions,
+        repeatable: false,
+        required: false,
+      }),
 
       new DynamicRelationGroupModel({
         submissionId,
@@ -256,9 +266,9 @@ describe('FormBuilderService test suite', () => {
             selectableMetadata: [{
               controlledVocabulary: 'RPAuthority',
               closed: false,
-              metadata: 'dc.contributor.author'
-            }]
-          } as FormFieldModel]
+              metadata: 'dc.contributor.author',
+            }],
+          } as FormFieldModel],
         } as FormRowModel, {
           fields: [{
             hints: 'Enter the affiliation of the author.',
@@ -270,9 +280,9 @@ describe('FormBuilderService test suite', () => {
             selectableMetadata: [{
               controlledVocabulary: 'OUAuthority',
               closed: false,
-              metadata: 'local.contributor.affiliation'
-            }]
-          } as FormFieldModel]
+              metadata: 'local.contributor.affiliation',
+            }],
+          } as FormFieldModel],
         } as FormRowModel],
         mandatoryField: '',
         name: 'testRelationGroup',
@@ -281,17 +291,17 @@ describe('FormBuilderService test suite', () => {
         submissionScope: '',
         repeatable: false,
         metadataFields: [],
-        hasSelectableMetadata: true
+        hasSelectableMetadata: true,
       }),
 
-      new DynamicDsDatePickerModel({ id: 'testDate' }),
+      new DynamicDsDatePickerModel({ id: 'testDate', repeatable: false }),
 
       new DynamicLookupModel({
         id: 'testLookup',
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: true
+        hasSelectableMetadata: true,
       }),
 
       new DynamicLookupNameModel({
@@ -299,7 +309,7 @@ describe('FormBuilderService test suite', () => {
         repeatable: false,
         metadataFields: [],
         submissionId: '1234',
-        hasSelectableMetadata: true
+        hasSelectableMetadata: true,
       }),
 
       new DynamicQualdropModel({ id: 'testCombobox', readOnly: false, required: false }),
@@ -314,7 +324,7 @@ describe('FormBuilderService test suite', () => {
           isDraggable: true,
           groupFactory: () => {
             return [
-              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })
+              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
             ];
           },
           required: false,
@@ -322,7 +332,7 @@ describe('FormBuilderService test suite', () => {
           metadataFields: ['dc.contributor.author'],
           hasSelectableMetadata: true,
           showButtons: true,
-          typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'Book' }]}]
+          typeBindRelations: [{ match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'Book' }] }],
         },
       ),
 
@@ -331,8 +341,8 @@ describe('FormBuilderService test suite', () => {
         group: [
           new DynamicInputModel({ id: 'testConcatGroup_CONCAT_FIRST_INPUT' }),
           new DynamicInputModel({ id: 'testConcatGroup_CONCAT_SECOND_INPUT' }),
-        ]
-      } as any)
+        ],
+      } as any),
     ];
 
     testFormConfiguration = {
@@ -350,10 +360,10 @@ describe('FormBuilderService test suite', () => {
                 {
                   metadata: 'journal',
                   controlledVocabulary: 'JOURNALAuthority',
-                  closed: false
-                }
+                  closed: false,
+                },
               ],
-              languageCodes: []
+              languageCodes: [],
             } as FormFieldModel,
             {
               input: { type: 'onebox' },
@@ -363,10 +373,10 @@ describe('FormBuilderService test suite', () => {
               hints: ' Enter issue number.',
               selectableMetadata: [
                 {
-                  metadata: 'issue'
-                }
+                  metadata: 'issue',
+                },
               ],
-              languageCodes: []
+              languageCodes: [],
             } as FormFieldModel,
             {
               input: { type: 'name' },
@@ -376,12 +386,12 @@ describe('FormBuilderService test suite', () => {
               hints: 'Enter full name.',
               selectableMetadata: [
                 {
-                  metadata: 'name'
-                }
+                  metadata: 'name',
+                },
               ],
-              languageCodes: []
-            } as FormFieldModel
-          ]
+              languageCodes: [],
+            } as FormFieldModel,
+          ],
         } as FormRowModel,
         {
           fields: [
@@ -401,8 +411,8 @@ describe('FormBuilderService test suite', () => {
                 { metadata: 'dc.identifier.isbn', label: 'ISBN' },
                 { metadata: 'dc.identifier.doi', label: 'DOI' },
                 { metadata: 'dc.identifier.pmid', label: 'PubMed ID' },
-                { metadata: 'dc.identifier.arxiv', label: 'arXiv' }
-              ]
+                { metadata: 'dc.identifier.arxiv', label: 'arXiv' },
+              ],
             }, {
               input: { type: 'onebox' },
               label: 'Publisher',
@@ -411,12 +421,12 @@ describe('FormBuilderService test suite', () => {
               hints: 'Enter the name of the publisher of the previously issued instance of this item.',
               selectableMetadata: [
                 {
-                  metadata: 'publisher'
-                }
+                  metadata: 'publisher',
+                },
               ],
-              languageCodes: []
-            }
-          ]
+              languageCodes: [],
+            },
+          ],
         } as FormRowModel,
         {
           fields: [
@@ -430,23 +440,23 @@ describe('FormBuilderService test suite', () => {
                 {
                   metadata: 'conference',
                   controlledVocabulary: 'EVENTAuthority',
-                  closed: false
-                }
+                  closed: false,
+                },
               ],
-              languageCodes: []
-            }
-          ]
-        } as FormRowModel
+              languageCodes: [],
+            },
+          ],
+        } as FormRowModel,
       ],
       self: {
-        href: 'testFormConfiguration.url'
+        href: 'testFormConfiguration.url',
       },
       type: 'submissionform',
       _links: {
         self: {
-          href: 'testFormConfiguration.url'
-        }
-      }
+          href: 'testFormConfiguration.url',
+        },
+      },
     } as any;
   });
 
@@ -513,14 +523,14 @@ describe('FormBuilderService test suite', () => {
     ((formModel[0] as DynamicRowGroupModel).get(1) as DsDynamicInputModel).value = 'test';
 
     value = {
-      issue: [new FormFieldMetadataValueObject('test')]
+      issue: [new FormFieldMetadataValueObject('test')],
     };
     expect(service.getValueFromModel(formModel)).toEqual(value);
 
     ((formModel[2] as DynamicRowGroupModel).get(0) as DynamicOneboxModel).value = 'test one';
     value = {
       issue: [new FormFieldMetadataValueObject('test')],
-      conference: [new FormFieldMetadataValueObject('test one')]
+      conference: [new FormFieldMetadataValueObject('test one')],
     };
     expect(service.getValueFromModel(formModel)).toEqual(value);
   });
@@ -677,21 +687,21 @@ describe('FormBuilderService test suite', () => {
 
     const formGroup = service.createFormGroup(testModel);
 
-    expect(formGroup instanceof FormGroup).toBe(true);
+    expect(formGroup instanceof UntypedFormGroup).toBe(true);
 
-    expect(formGroup.get('testCheckbox') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testCheckboxGroup') instanceof FormGroup).toBe(true);
-    expect(formGroup.get('testDatepicker') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testFormArray') instanceof FormArray).toBe(true);
-    expect(formGroup.get('testInput') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testRadioGroup') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testSelect') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testTextArea') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testFileUpload') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testEditor') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testTimePicker') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testRating') instanceof FormControl).toBe(true);
-    expect(formGroup.get('testColorPicker') instanceof FormControl).toBe(true);
+    expect(formGroup.get('testCheckbox') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testCheckboxGroup') instanceof UntypedFormGroup).toBe(true);
+    expect(formGroup.get('testDatepicker') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testFormArray') instanceof UntypedFormArray).toBe(true);
+    expect(formGroup.get('testInput') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testRadioGroup') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testSelect') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testTextArea') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testFileUpload') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testEditor') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testTimePicker') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testRating') instanceof UntypedFormControl).toBe(true);
+    expect(formGroup.get('testColorPicker') instanceof UntypedFormControl).toBe(true);
   });
 
   it('should throw when unknown DynamicFormControlModel id is specified in JSON', () => {
@@ -714,7 +724,7 @@ describe('FormBuilderService test suite', () => {
   it('should add a form control to an existing form group', () => {
 
     const formGroup = service.createFormGroup(testModel);
-    const nestedFormGroup = formGroup.controls.testFormGroup as FormGroup;
+    const nestedFormGroup = formGroup.controls.testFormGroup as UntypedFormGroup;
     const nestedFormGroupModel = testModel[7] as DynamicFormGroupModel;
     const newModel1 = new DynamicInputModel({ id: 'newInput1' });
     const newModel2 = new DynamicInputModel({ id: 'newInput2' });
@@ -725,14 +735,14 @@ describe('FormBuilderService test suite', () => {
     expect(formGroup.controls[newModel1.id]).toBeTruthy();
     expect(testModel[testModel.length - 1] === newModel1).toBe(true);
 
-    expect((formGroup.controls.testFormGroup as FormGroup).controls[newModel2.id]).toBeTruthy();
+    expect((formGroup.controls.testFormGroup as UntypedFormGroup).controls[newModel2.id]).toBeTruthy();
     expect(nestedFormGroupModel.get(nestedFormGroupModel.group.length - 1) === newModel2).toBe(true);
   });
 
   it('should insert a form control to an existing form group', () => {
 
     const formGroup = service.createFormGroup(testModel);
-    const nestedFormGroup = formGroup.controls.testFormGroup as FormGroup;
+    const nestedFormGroup = formGroup.controls.testFormGroup as UntypedFormGroup;
     const nestedFormGroupModel = testModel[7] as DynamicFormGroupModel;
     const newModel1 = new DynamicInputModel({ id: 'newInput1' });
     const newModel2 = new DynamicInputModel({ id: 'newInput2' });
@@ -744,7 +754,7 @@ describe('FormBuilderService test suite', () => {
     expect(testModel[4] === newModel1).toBe(true);
     expect(service.getPath(testModel[4])).toEqual(['newInput1']);
 
-    expect((formGroup.controls.testFormGroup as FormGroup).controls[newModel2.id]).toBeTruthy();
+    expect((formGroup.controls.testFormGroup as UntypedFormGroup).controls[newModel2.id]).toBeTruthy();
     expect(nestedFormGroupModel.get(0) === newModel2).toBe(true);
     expect(service.getPath(nestedFormGroupModel.get(0))).toEqual(['testFormGroup', 'newInput2']);
   });
@@ -763,14 +773,14 @@ describe('FormBuilderService test suite', () => {
 
     service.moveFormGroupControl(0, 1, nestedFormGroupModel);
 
-    expect((formGroup.controls.testFormGroup as FormGroup).controls[model2.id]).toBeTruthy();
+    expect((formGroup.controls.testFormGroup as UntypedFormGroup).controls[model2.id]).toBeTruthy();
     expect(nestedFormGroupModel.get(1) === model2).toBe(true);
   });
 
   it('should remove a form control from an existing form group', () => {
 
     const formGroup = service.createFormGroup(testModel);
-    const nestedFormGroup = formGroup.controls.testFormGroup as FormGroup;
+    const nestedFormGroup = formGroup.controls.testFormGroup as UntypedFormGroup;
     const nestedFormGroupModel = testModel[7] as DynamicFormGroupModel;
     const length = testModel.length;
     const size = nestedFormGroupModel.size();
@@ -804,7 +814,7 @@ describe('FormBuilderService test suite', () => {
 
     formArray = service.createFormArray(model);
 
-    expect(formArray instanceof FormArray).toBe(true);
+    expect(formArray instanceof UntypedFormArray).toBe(true);
     expect(formArray.length).toBe(model.initialCount);
   });
 
@@ -835,8 +845,8 @@ describe('FormBuilderService test suite', () => {
     const index = 3;
     const step = 1;
 
-    (formArray.at(index) as FormGroup).controls.testFormArrayGroupInput.setValue('next test value 1');
-    (formArray.at(index + step) as FormGroup).controls.testFormArrayGroupInput.setValue('next test value 2');
+    (formArray.at(index) as UntypedFormGroup).controls.testFormArrayGroupInput.setValue('next test value 1');
+    (formArray.at(index + step) as UntypedFormGroup).controls.testFormArrayGroupInput.setValue('next test value 2');
 
     (model.get(index).get(0) as DynamicFormValueControlModel<any>).value = 'next test value 1';
     (model.get(index + step).get(0) as DynamicFormValueControlModel<any>).value = 'next test value 2';
@@ -845,8 +855,8 @@ describe('FormBuilderService test suite', () => {
 
     expect(formArray.length).toBe(model.initialCount);
 
-    expect((formArray.at(index) as FormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 2');
-    expect((formArray.at(index + step) as FormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 1');
+    expect((formArray.at(index) as UntypedFormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 2');
+    expect((formArray.at(index + step) as UntypedFormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 1');
 
     expect((model.get(index).get(0) as DynamicFormValueControlModel<any>).value).toEqual('next test value 2');
     expect((model.get(index + step).get(0) as DynamicFormValueControlModel<any>).value).toEqual('next test value 1');
@@ -859,8 +869,8 @@ describe('FormBuilderService test suite', () => {
     const index = 3;
     const step = -1;
 
-    (formArray.at(index) as FormGroup).controls.testFormArrayGroupInput.setValue('next test value 1');
-    (formArray.at(index + step) as FormGroup).controls.testFormArrayGroupInput.setValue('next test value 2');
+    (formArray.at(index) as UntypedFormGroup).controls.testFormArrayGroupInput.setValue('next test value 1');
+    (formArray.at(index + step) as UntypedFormGroup).controls.testFormArrayGroupInput.setValue('next test value 2');
 
     (model.get(index).get(0) as DynamicFormValueControlModel<any>).value = 'next test value 1';
     (model.get(index + step).get(0) as DynamicFormValueControlModel<any>).value = 'next test value 2';
@@ -869,8 +879,8 @@ describe('FormBuilderService test suite', () => {
 
     expect(formArray.length).toBe(model.initialCount);
 
-    expect((formArray.at(index) as FormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 2');
-    expect((formArray.at(index + step) as FormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 1');
+    expect((formArray.at(index) as UntypedFormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 2');
+    expect((formArray.at(index + step) as UntypedFormGroup).controls.testFormArrayGroupInput.value).toEqual('next test value 1');
 
     expect((model.get(index).get(0) as DynamicFormValueControlModel<any>).value).toEqual('next test value 2');
     expect((model.get(index + step).get(0) as DynamicFormValueControlModel<any>).value).toEqual('next test value 1');
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index a281942bc7..374f4029e8 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -1,6 +1,12 @@
-import {Injectable, Optional} from '@angular/core';
-import { AbstractControl, FormControl, FormGroup } from '@angular/forms';
-
+import {
+  Injectable,
+  Optional,
+} from '@angular/core';
+import {
+  AbstractControl,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX_GROUP,
@@ -18,8 +24,18 @@ import {
   DynamicPathable,
   parseReviver,
 } from '@ng-dynamic-forms/core';
-import { isObject, isString, mergeWith } from 'lodash';
+import isObject from 'lodash/isObject';
+import isString from 'lodash/isString';
+import mergeWith from 'lodash/mergeWith';
 
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  dateToString,
+  isNgbDateStruct,
+} from '../../date.util';
 import {
   hasNoValue,
   hasValue,
@@ -27,22 +43,20 @@ import {
   isNotEmpty,
   isNotNull,
   isNotUndefined,
-  isNull
+  isNull,
 } from '../../empty.util';
-import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
-import { RowParser } from './parsers/row-parser';
-import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
-import { dateToString, isNgbDateStruct } from '../../date.util';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './ds-dynamic-form-ui/ds-dynamic-form-constants';
-import { CONCAT_GROUP_SUFFIX, DynamicConcatModel } from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { VIRTUAL_METADATA_PREFIX } from '../../../core/shared/metadata.models';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import {
+  CONCAT_GROUP_SUFFIX,
+  DynamicConcatModel,
+} from './ds-dynamic-form-ui/models/ds-dynamic-concat.model';
+import { DsDynamicInputModel } from './ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
+import { DynamicRowArrayModel } from './ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRelationGroupModel } from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './ds-dynamic-form-ui/models/tag/dynamic-tag.model';
+import { FormFieldMetadataValueObject } from './models/form-field-metadata-value.model';
+import { RowParser } from './parsers/row-parser';
 
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
@@ -57,7 +71,7 @@ export class FormBuilderService extends DynamicFormService {
   /**
    * This map contains the active forms control groups
    */
-  private formGroups: Map<string, FormGroup>;
+  private formGroups: Map<string, UntypedFormGroup>;
 
   /**
    * This is the field to use for type binding
@@ -81,13 +95,13 @@ export class FormBuilderService extends DynamicFormService {
 
   }
 
-  createDynamicFormControlEvent(control: FormControl, group: FormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
+  createDynamicFormControlEvent(control: UntypedFormControl, group: UntypedFormGroup, model: DynamicFormControlModel, type: string): DynamicFormControlEvent {
     const $event = {
       value: (model as any).value,
-      autoSave: false
+      autoSave: false,
     };
     const context: DynamicFormArrayGroupModel = (model?.parent instanceof DynamicFormArrayGroupModel) ? model?.parent : null;
-    return {$event, context, control: control, group: group, model: model, type};
+    return { $event, context, control: control, group: group, model: model, type };
   }
 
   getTypeBindModel() {
@@ -194,6 +208,7 @@ export class FormBuilderService extends DynamicFormService {
           return new FormFieldMetadataValueObject((controlValue as any).value, controlLanguage, authority, (controlValue as any).display, place, (controlValue as any).confidence);
         }
       }
+      return controlValue;
     };
 
     const iterateControlModels = (findGroupModel: DynamicFormControlModel[], controlModelIndex: number = 0): void => {
@@ -278,10 +293,10 @@ export class FormBuilderService extends DynamicFormService {
   }
 
   modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {},
-                         submissionScope?: string, readOnly = false, typeBindModel = null,
-                         isInnerForm = false): DynamicFormControlModel[] | never {
-     let rows: DynamicFormControlModel[] = [];
-     const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
+    submissionScope?: string, readOnly = false, typeBindModel = null,
+    isInnerForm = false): DynamicFormControlModel[] | never {
+    let rows: DynamicFormControlModel[] = [];
+    const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
     if (rawData.rows && !isEmpty(rawData.rows)) {
       rawData.rows.forEach((currentRow) => {
         const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope,
@@ -367,12 +382,12 @@ export class FormBuilderService extends DynamicFormService {
     return model.type === DYNAMIC_FORM_CONTROL_TYPE_INPUT;
   }
 
-  getFormControlById(id: string, formGroup: FormGroup, groupModel: DynamicFormControlModel[], index = 0): AbstractControl {
+  getFormControlById(id: string, formGroup: UntypedFormGroup, groupModel: DynamicFormControlModel[], index = 0): AbstractControl {
     const fieldModel = this.findById(id, groupModel, index);
     return isNotEmpty(fieldModel) ? formGroup.get(this.getPath(fieldModel)) : null;
   }
 
-  getFormControlByModel(formGroup: FormGroup, fieldModel: DynamicFormControlModel): AbstractControl {
+  getFormControlByModel(formGroup: UntypedFormGroup, fieldModel: DynamicFormControlModel): AbstractControl {
     return isNotEmpty(fieldModel) ? formGroup.get(this.getPath(fieldModel)) : null;
   }
 
@@ -410,7 +425,7 @@ export class FormBuilderService extends DynamicFormService {
    * @param id id of model
    * @param formGroup FormGroup
    */
-  addFormGroups(id: string, formGroup: FormGroup): void {
+  addFormGroups(id: string, formGroup: UntypedFormGroup): void {
     this.formGroups.set(id, formGroup);
   }
 
diff --git a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
index b58844a537..b36e793f44 100644
--- a/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
+++ b/src/app/shared/form/builder/models/form-field-metadata-value.model.ts
@@ -1,6 +1,14 @@
-import { hasValue, isEmpty, isNotEmpty, isNotNull } from '../../../empty.util';
 import { ConfidenceType } from '../../../../core/shared/confidence-type';
-import { MetadataValueInterface, VIRTUAL_METADATA_PREFIX } from '../../../../core/shared/metadata.models';
+import {
+  MetadataValueInterface,
+  VIRTUAL_METADATA_PREFIX,
+} from '../../../../core/shared/metadata.models';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+} from '../../../empty.util';
 import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export interface OtherInformation {
@@ -11,6 +19,10 @@ export interface OtherInformation {
  * A class representing a specific input-form field's value
  */
 export class FormFieldMetadataValueObject implements MetadataValueInterface {
+
+  static readonly AUTHORITY_SPLIT: string = '::';
+  static readonly AUTHORITY_GENERATE: string = 'will be generated' + FormFieldMetadataValueObject.AUTHORITY_SPLIT;
+
   metadata?: string;
   value: any;
   display: string;
@@ -22,13 +34,13 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
   otherInformation: OtherInformation;
 
   constructor(value: any = null,
-              language: any = null,
-              authority: string = null,
-              display: string = null,
-              place: number = 0,
-              confidence: number = null,
-              otherInformation: any = null,
-              metadata: string = null) {
+    language: any = null,
+    authority: string = null,
+    display: string = null,
+    place: number = 0,
+    confidence: number = null,
+    otherInformation: any = null,
+    metadata: string = null) {
     this.value = isNotNull(value) ? ((typeof value === 'string') ? value.trim() : value) : null;
     this.language = language;
     this.authority = authority;
@@ -58,6 +70,13 @@ export class FormFieldMetadataValueObject implements MetadataValueInterface {
     return isNotEmpty(this.authority);
   }
 
+  /**
+   * Returns true if this object has an authority value that needs to be generated
+   */
+  hasAuthorityToGenerate(): boolean {
+    return isNotEmpty(this.authority) && this.authority.startsWith(FormFieldMetadataValueObject.AUTHORITY_GENERATE);
+  }
+
   /**
    * Returns true if this this object has a value
    */
diff --git a/src/app/shared/form/builder/models/form-field-previous-value-object.ts b/src/app/shared/form/builder/models/form-field-previous-value-object.ts
index ca4a47c089..2aa40f97ae 100644
--- a/src/app/shared/form/builder/models/form-field-previous-value-object.ts
+++ b/src/app/shared/form/builder/models/form-field-previous-value-object.ts
@@ -1,4 +1,4 @@
-import { isEqual } from 'lodash';
+import isEqual from 'lodash/isEqual';
 
 export class FormFieldPreviousValueObject {
 
diff --git a/src/app/shared/form/builder/models/form-field.model.ts b/src/app/shared/form/builder/models/form-field.model.ts
index be3150bae3..f81c955fab 100644
--- a/src/app/shared/form/builder/models/form-field.model.ts
+++ b/src/app/shared/form/builder/models/form-field.model.ts
@@ -1,8 +1,9 @@
 import { autoserialize } from 'cerialize';
 
+import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
 import { LanguageCode } from './form-field-language-value.model';
 import { RelationshipOptions } from './relationship-options.model';
-import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 
 /**
  * Representing SelectableMetadata properties
@@ -38,43 +39,43 @@ export class FormFieldModel {
    * The hints for this metadata field to display on form
    */
   @autoserialize
-  hints: string;
+    hints: string;
 
   /**
    * The label for this metadata field to display on form
    */
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The languages available for this metadata field to display on form
    */
   @autoserialize
-  languageCodes: LanguageCode[];
+    languageCodes: LanguageCode[];
 
   /**
    * The error message for this metadata field to display on form in case of field is required
    */
   @autoserialize
-  mandatoryMessage: string;
+    mandatoryMessage: string;
 
   /**
    * Representing if this metadata field is mandatory or not
    */
   @autoserialize
-  mandatory: string;
+    mandatory: string;
 
   /**
    * Representing if this metadata field is repeatable or not
    */
   @autoserialize
-  repeatable: boolean;
+    repeatable: boolean;
 
   /**
    * Containing additional properties for this metadata field
    */
   @autoserialize
-  input: {
+    input: {
     /**
      * Representing the type for this metadata field
      */
@@ -90,38 +91,41 @@ export class FormFieldModel {
    * Representing additional vocabulary configuration for this metadata field
    */
   @autoserialize
-  selectableMetadata: SelectableMetadata[];
+    selectableMetadata: SelectableMetadata[];
 
   /**
    * Representing additional relationship configuration for this metadata field
    */
   @autoserialize
-  selectableRelationship: RelationshipOptions;
+    selectableRelationship: RelationshipOptions;
 
   @autoserialize
-  rows: FormRowModel[];
+    rows: FormRowModel[];
 
   /**
    * Representing the scope for this metadata field
    */
   @autoserialize
-  scope: string;
+    scope: string;
 
   /**
    * Containing additional css classes for this metadata field to use on form
    */
   @autoserialize
-  style: string;
+    style: string;
 
   /**
    * Containing types to bind for this field
    */
   @autoserialize
-  typeBind: string[];
+    typeBind: string[];
 
   /**
    * Containing the value for this metadata field
    */
   @autoserialize
-  value: any;
+    value: any;
+
+  @autoserialize
+    visibility: SectionVisibility;
 }
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 a2076484f4..3b29d0eb48 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -1,24 +1,31 @@
-import {Inject} from '@angular/core';
-import { FormFieldModel } from '../models/form-field.model';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DynamicFormControlLayout, } from '@ng-dynamic-forms/core';
+import { Inject } from '@angular/core';
+
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import {
   CONCAT_FIRST_INPUT_SUFFIX,
   CONCAT_GROUP_SUFFIX,
   CONCAT_SECOND_INPUT_SUFFIX,
   DynamicConcatModel,
-  DynamicConcatModelConfig
+  DynamicConcatModelConfig,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../empty.util';
-import { ParserOptions } from './parser-options';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
   CONFIG_DATA,
   FieldParser,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
-  SUBMISSION_ID
+  SUBMISSION_ID,
 } from './field-parser';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { ParserOptions } from './parser-options';
 
 export class ConcatFieldParser extends FieldParser {
 
@@ -38,15 +45,12 @@ export class ConcatFieldParser extends FieldParser {
   }
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
-
-    let clsGroup: DynamicFormControlLayout;
-    let clsInput: DynamicFormControlLayout;
     const id: string = this.configData.selectableMetadata[0].metadata;
 
-    clsInput = {
+    const clsInput = {
       grid: {
-        host: 'col-sm-6'
-      }
+        host: 'col-sm-6',
+      },
     };
 
     const groupId = id.replace(/\./g, '_') + CONCAT_GROUP_SUFFIX;
@@ -60,14 +64,14 @@ export class ConcatFieldParser extends FieldParser {
       false,
       true,
       true,
-      false
+      false,
     );
     const input2ModelConfig: DsDynamicInputModelConfig = this.initModel(
       id + CONCAT_SECOND_INPUT_SUFFIX,
       false,
       true,
       true,
-      false
+      false,
     );
 
     input1ModelConfig.hideErrorMessages = true;
@@ -83,6 +87,8 @@ export class ConcatFieldParser extends FieldParser {
       input1ModelConfig.required = true;
     }
 
+    concatGroup.disabled = input1ModelConfig.readOnly;
+
     if (isNotEmpty(this.firstPlaceholder)) {
       input1ModelConfig.placeholder = this.firstPlaceholder;
     }
@@ -103,10 +109,10 @@ export class ConcatFieldParser extends FieldParser {
     concatGroup.group.push(model1);
     concatGroup.group.push(model2);
 
-    clsGroup = {
+    const clsGroup = {
       element: {
         control: 'form-row',
-      }
+      },
     };
     const concatModel = new DynamicConcatModel(concatGroup, clsGroup);
     concatModel.name = this.getFieldId();
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..d1912a7cad 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
@@ -1,7 +1,7 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { DateFieldParser } from './date-field-parser';
 import { DynamicDsDatePickerModel } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { DateFieldParser } from './date-field-parser';
 import { ParserOptions } from './parser-options';
 
 describe('DateFieldParser test suite', () => {
@@ -13,13 +13,13 @@ describe('DateFieldParser test suite', () => {
     readOnly: false,
     submissionScope: null,
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'date'
+        type: 'date',
       },
       label: 'Date of Issue.',
       mandatory: 'true',
@@ -29,9 +29,9 @@ describe('DateFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'date',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/date-field-parser.ts b/src/app/shared/form/builder/parsers/date-field-parser.ts
index c67c2c7695..ea9f193e33 100644
--- a/src/app/shared/form/builder/parsers/date-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/date-field-parser.ts
@@ -1,11 +1,11 @@
-import { FieldParser } from './field-parser';
-import {
-  DynamicDsDatePickerModel,
-  DynamicDsDateControlModelConfig
-} from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { isNotEmpty } from '../../../empty.util';
 import { DS_DATE_PICKER_SEPARATOR } from '../ds-dynamic-form-ui/models/date-picker/date-picker.component';
+import {
+  DynamicDsDateControlModelConfig,
+  DynamicDsDatePickerModel,
+} from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class DateFieldParser extends FieldParser {
 
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..fd6908ed3b 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
@@ -1,7 +1,7 @@
-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 { FormFieldModel } from '../models/form-field.model';
+import { DisabledFieldParser } from './disabled-field-parser';
+import { ParserOptions } from './parser-options';
 
 describe('DisabledFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -12,13 +12,13 @@ describe('DisabledFieldParser test suite', () => {
     readOnly: false,
     submissionScope: null,
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: ''
+        type: '',
       },
       label: 'Description',
       mandatory: 'false',
@@ -26,10 +26,10 @@ describe('DisabledFieldParser test suite', () => {
       hints: 'Enter a description.',
       selectableMetadata: [
         {
-          metadata: 'description'
-        }
+          metadata: 'description',
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
index df53f26c3a..e9b97ba7d9 100644
--- a/src/app/shared/form/builder/parsers/disabled-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
@@ -1,6 +1,9 @@
-import { FieldParser } from './field-parser';
+import {
+  DsDynamicDisabledModelConfig,
+  DynamicDisabledModel,
+} from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DsDynamicDisabledModelConfig, DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+import { FieldParser } from './field-parser';
 
 /**
  * Field parser for disabled fields
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..0ab376d1aa 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
@@ -1,6 +1,6 @@
+import { DynamicScrollableDropdownModel } from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 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';
 
 describe('DropdownFieldParser test suite', () => {
@@ -12,13 +12,13 @@ describe('DropdownFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'dropdown'
+        type: 'dropdown',
       },
       label: 'Type',
       mandatory: 'false',
@@ -28,10 +28,10 @@ describe('DropdownFieldParser test suite', () => {
         {
           metadata: 'type',
           controlledVocabulary: 'common_types_dataset',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
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..1fc28d1274 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -1,19 +1,20 @@
-import {Inject} from '@angular/core';
+import { Inject } from '@angular/core';
+import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
+
+import { isNotEmpty } from '../../../empty.util';
+import {
+  DynamicScrollableDropdownModel,
+  DynamicScrollableDropdownModelConfig,
+} from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
 import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import {
   CONFIG_DATA,
   FieldParser,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
-  SUBMISSION_ID
+  SUBMISSION_ID,
 } from './field-parser';
-import { DynamicFormControlLayout, } from '@ng-dynamic-forms/core';
-import {
-  DynamicScrollableDropdownModel,
-  DynamicScrollableDropdownModelConfig
-} from '../ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
-import { isNotEmpty } from '../../../empty.util';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
 
 export class DropdownFieldParser extends FieldParser {
@@ -38,11 +39,11 @@ export class DropdownFieldParser extends FieldParser {
       }
       layout = {
         element: {
-          control: 'col'
+          control: 'col',
         },
         grid: {
-          host: 'col'
-        }
+          host: 'col',
+        },
       };
       const dropdownModel = new DynamicScrollableDropdownModel(dropdownModelConfig, layout);
       return dropdownModel;
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index bd6820d4b3..c77b244d6a 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,27 +1,51 @@
-import {Inject, InjectionToken} from '@angular/core';
+import {
+  Inject,
+  InjectionToken,
+} from '@angular/core';
+import {
+  DynamicFormControlLayout,
+  DynamicFormControlRelation,
+  MATCH_VISIBLE,
+  OR_OPERATOR,
+} from '@ng-dynamic-forms/core';
+import uniqueId from 'lodash/uniqueId';
 
-import { uniqueId } from 'lodash';
-import {DynamicFormControlLayout, DynamicFormControlRelation, MATCH_VISIBLE, OR_OPERATOR} from '@ng-dynamic-forms/core';
-
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
-import { FormFieldModel } from '../models/form-field.model';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
+import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { isNgbDateStruct } from '../../../date.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+} from '../../../empty.util';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
   DynamicRowArrayModel,
-  DynamicRowArrayModelConfig
+  DynamicRowArrayModelConfig,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { RelationshipOptions } from '../models/relationship-options.model';
+import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
+import { VisibilityType } from './../../../../submission/sections/visibility-type';
 import { setLayout } from './parser.utils';
 import { ParserOptions } from './parser-options';
-import { RelationshipOptions } from '../models/relationship-options.model';
-import { VocabularyOptions } from '../../../../core/submission/vocabularies/models/vocabulary-options.model';
 import { ParserType } from './parser-type';
-import { isNgbDateStruct } from '../../../date.util';
 
 export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
 export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
 export const INIT_FORM_VALUES: InjectionToken<any> = new InjectionToken<any>('initFormValues');
 export const PARSER_OPTIONS: InjectionToken<ParserOptions> = new InjectionToken<ParserOptions>('parserOptions');
+/**
+ * This pattern checks that a regex field uses the common ECMAScript format: `/{pattern}/{flags}`, in which the flags
+ * are part of the regex, or a simpler one with only pattern `/{pattern}/` or `{pattern}`.
+ * The regex itself is encapsulated inside a `RegExp` object, that will validate the pattern syntax.
+ */
+export const REGEX_FIELD_VALIDATOR = new RegExp('(\\/?)(.+)\\1([gimsuy]*)', 'i');
 
 export abstract class FieldParser {
 
@@ -36,7 +60,7 @@ 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,
   ) {
   }
 
@@ -96,13 +120,13 @@ export abstract class FieldParser {
             setLayout(model, 'grid', 'control', 'col');
           }
           return [model];
-        }
+        },
       } as DynamicRowArrayModelConfig;
 
       const layout: DynamicFormControlLayout = {
         grid: {
-          group: 'form-row'
-        }
+          group: 'form-row',
+        },
       };
 
       return new DynamicRowArrayModel(config, layout);
@@ -121,7 +145,7 @@ export abstract class FieldParser {
     if (isNotEmpty(this.configData.selectableMetadata) && isNotEmpty(this.configData.selectableMetadata[0].controlledVocabulary)) {
       controlModel.vocabularyOptions = new VocabularyOptions(
         this.configData.selectableMetadata[0].controlledVocabulary,
-        this.configData.selectableMetadata[0].closed
+        this.configData.selectableMetadata[0].closed,
       );
     }
   }
@@ -269,8 +293,8 @@ export abstract class FieldParser {
     controlModel.id = (this.fieldId).replace(/\./g, '_');
 
     // Set read only option
-    controlModel.readOnly = this.parserOptions.readOnly;
-    controlModel.disabled = this.parserOptions.readOnly;
+    controlModel.readOnly = this.parserOptions.readOnly || this.isFieldReadOnly(this.configData.visibility, this.configData.scope, this.parserOptions.submissionScope);
+    controlModel.disabled = controlModel.readOnly;
     if (hasValue(this.configData.selectableRelationship)) {
       controlModel.relationship = Object.assign(new RelationshipOptions(), this.configData.selectableRelationship);
     }
@@ -308,6 +332,28 @@ export abstract class FieldParser {
     return controlModel;
   }
 
+  /**
+   * Checks if a field is read-only with the given scope.
+   * The field is readonly when submissionScope is WORKSPACE and the main visibility is READONLY
+   * or when submissionScope is WORKFLOW and the other visibility is READONLY
+   * @param visibility
+   * @param submissionScope
+   */
+  private isFieldReadOnly(visibility: SectionVisibility, fieldScope: string, submissionScope: string) {
+    return isNotEmpty(submissionScope)
+      && isNotEmpty(fieldScope)
+      && isNotEmpty(visibility)
+      && ((
+        submissionScope === SubmissionScopeType.WorkspaceItem
+          && visibility.main === VisibilityType.READONLY
+      )
+        ||
+          (visibility.other === VisibilityType.READONLY
+          && submissionScope === SubmissionScopeType.WorkflowItem
+          )
+      );
+  }
+
   /**
    * Get the type bind values from the REST data for a specific field
    * The return value is any[] in the method signature but in reality it's
@@ -315,6 +361,7 @@ export abstract class FieldParser {
    * fields in type bind, made up of a 'match' outcome (make this field visible), an 'operator'
    * (OR) and a 'when' condition (the bindValues array).
    * @param configuredTypeBindValues  array of types from the submission definition (CONFIG_DATA)
+   * @param typeField
    * @private
    * @return DynamicFormControlRelation[] array with one relation in it, for type bind matching to show a field
    */
@@ -323,7 +370,7 @@ export abstract class FieldParser {
     configuredTypeBindValues.forEach((value) => {
       bindValues.push({
         id: typeField,
-        value: value
+        value: value,
       });
     });
     // match: MATCH_VISIBLE means that if true, the field / component will be visible
@@ -335,7 +382,7 @@ export abstract class FieldParser {
     return [{
       match: MATCH_VISIBLE,
       operator: OR_OPERATOR,
-      when: bindValues
+      when: bindValues,
     }];
   }
 
@@ -343,8 +390,21 @@ export abstract class FieldParser {
     return hasValue(this.configData.input.regex);
   }
 
+  /**
+   * Adds pattern validation to `controlModel`, it uses the encapsulated `configData` to test the regex,
+   * contained in the input config, against the common `ECMAScript` standard validator {@link REGEX_FIELD_VALIDATOR},
+   * and creates an equivalent `RegExp` object that will be used during form-validation against the user-input.
+   * @param controlModel
+   * @protected
+   */
   protected addPatternValidator(controlModel) {
-    const regex = new RegExp(this.configData.input.regex);
+    const validatorMatcher = this.configData.input.regex.match(REGEX_FIELD_VALIDATOR);
+    let regex;
+    if (validatorMatcher != null && validatorMatcher.length > 3) {
+      regex = new RegExp(validatorMatcher[2], validatorMatcher[3]);
+    } else {
+      regex = new RegExp(this.configData.input.regex);
+    }
     controlModel.validators = Object.assign({}, controlModel.validators, { pattern: regex });
     controlModel.errorMessages = Object.assign(
       {},
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..f0a446c0ce 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
@@ -1,8 +1,8 @@
+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 { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 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';
 
 describe('ListFieldParser test suite', () => {
@@ -14,13 +14,13 @@ describe('ListFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'list'
+        type: 'list',
       },
       label: 'Type',
       mandatory: 'false',
@@ -30,10 +30,10 @@ describe('ListFieldParser test suite', () => {
         {
           metadata: 'type',
           controlledVocabulary: 'type_programme',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/list-field-parser.ts b/src/app/shared/form/builder/parsers/list-field-parser.ts
index 48211b0aff..f786e888ce 100644
--- a/src/app/shared/form/builder/parsers/list-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/list-field-parser.ts
@@ -1,8 +1,8 @@
-import { FieldParser } from './field-parser';
 import { isNotEmpty } from '../../../empty.util';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 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 { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class ListFieldParser extends FieldParser {
 
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..6d57e68643 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
@@ -1,7 +1,7 @@
+import { DynamicLookupModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { LookupFieldParser } from './lookup-field-parser';
-import { DynamicLookupModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { ParserOptions } from './parser-options';
 
 describe('LookupFieldParser test suite', () => {
@@ -13,13 +13,13 @@ describe('LookupFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'lookup'
+        type: 'lookup',
       },
       label: 'Journal',
       mandatory: 'false',
@@ -29,10 +29,10 @@ describe('LookupFieldParser test suite', () => {
         {
           metadata: 'journal',
           controlledVocabulary: 'JOURNALAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/lookup-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-field-parser.ts
index 2c35d2ceb8..de7ba04e76 100644
--- a/src/app/shared/form/builder/parsers/lookup-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/lookup-field-parser.ts
@@ -1,6 +1,9 @@
-import { FieldParser } from './field-parser';
-import { DynamicLookupModel, DynamicLookupModelConfig } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
+import {
+  DynamicLookupModel,
+  DynamicLookupModelConfig,
+} from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class LookupFieldParser extends FieldParser {
 
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..c6e8df8985 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
@@ -1,7 +1,7 @@
+import { DynamicLookupNameModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 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';
 
 describe('LookupNameFieldParser test suite', () => {
@@ -13,13 +13,13 @@ describe('LookupNameFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'lookup-name'
+        type: 'lookup-name',
       },
       label: 'Author',
       mandatory: 'false',
@@ -29,10 +29,10 @@ describe('LookupNameFieldParser test suite', () => {
         {
           metadata: 'author',
           controlledVocabulary: 'RPAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts b/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
index c791e07e74..0701d7cb7d 100644
--- a/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/lookup-name-field-parser.ts
@@ -1,9 +1,9 @@
-import { FieldParser } from './field-parser';
 import {
   DynamicLookupNameModel,
-  DynamicLookupNameModelConfig
+  DynamicLookupNameModelConfig,
 } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class LookupNameFieldParser extends FieldParser {
 
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..7184e67e96 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
@@ -1,7 +1,7 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { NameFieldParser } from './name-field-parser';
 import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { NameFieldParser } from './name-field-parser';
 import { ParserOptions } from './parser-options';
 
 describe('NameFieldParser test suite', () => {
@@ -15,13 +15,13 @@ describe('NameFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field1 = {
       input: {
-        type: 'name'
+        type: 'name',
       },
       label: 'Name',
       mandatory: 'false',
@@ -30,9 +30,9 @@ describe('NameFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'name',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
     field2 = {
@@ -51,8 +51,8 @@ describe('NameFieldParser test suite', () => {
         { metadata: 'dc.identifier.isbn', label: 'ISBN' },
         { metadata: 'dc.identifier.doi', label: 'DOI' },
         { metadata: 'dc.identifier.pmid', label: 'PubMed ID' },
-        { metadata: 'dc.identifier.arxiv', label: 'arXiv' }
-      ]
+        { metadata: 'dc.identifier.arxiv', label: 'arXiv' },
+      ],
     } as FormFieldModel;
 
     field3 = {
@@ -64,9 +64,9 @@ describe('NameFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'title',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
   });
 
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..1c0fbd6d01 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.ts
@@ -1,7 +1,13 @@
 import { Inject } from '@angular/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';
+import {
+  CONFIG_DATA,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID,
+} from './field-parser';
 import { ParserOptions } from './parser-options';
 
 export class NameFieldParser extends ConcatFieldParser {
@@ -10,7 +16,7 @@ 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,
   ) {
     super(submissionId, configData, initFormValues, parserOptions, ',', '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 e7e68a6461..467431d963 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
@@ -1,8 +1,9 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { OneboxFieldParser } from './onebox-field-parser';
+import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DynamicQualdropModel } from '../ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { DynamicOneboxModel } from '../ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
-import { DsDynamicInputModel } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { FormFieldModel } from '../models/form-field.model';
+import { FieldParser } from './field-parser';
+import { OneboxFieldParser } from './onebox-field-parser';
 import { ParserOptions } from './parser-options';
 
 describe('OneboxFieldParser test suite', () => {
@@ -16,7 +17,7 @@ describe('OneboxFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
@@ -30,10 +31,10 @@ describe('OneboxFieldParser test suite', () => {
         {
           metadata: 'title',
           controlledVocabulary: 'EVENTAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
     field2 = {
@@ -52,8 +53,8 @@ describe('OneboxFieldParser test suite', () => {
         { metadata: 'dc.identifier.isbn', label: 'ISBN' },
         { metadata: 'dc.identifier.doi', label: 'DOI' },
         { metadata: 'dc.identifier.pmid', label: 'PubMed ID' },
-        { metadata: 'dc.identifier.arxiv', label: 'arXiv' }
-      ]
+        { metadata: 'dc.identifier.arxiv', label: 'arXiv' },
+      ],
     } as FormFieldModel;
 
     field3 = {
@@ -65,9 +66,9 @@ describe('OneboxFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'title',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
   });
 
@@ -101,4 +102,51 @@ describe('OneboxFieldParser test suite', () => {
     expect(fieldModel instanceof DynamicOneboxModel).toBe(true);
   });
 
+  describe('should handle a DynamicOneboxModel with regex', () => {
+    let regexField: FormFieldModel;
+    let parser: FieldParser;
+    let fieldModel: any;
+
+    beforeEach(() => {
+      regexField = {
+        input: { type: 'onebox', regex: '/[a-z]+/mi' },
+        label: 'Title',
+        mandatory: 'false',
+        repeatable: false,
+        hints: 'Enter the name of the events, if any.',
+        selectableMetadata: [
+          {
+            metadata: 'title',
+            controlledVocabulary: 'EVENTAuthority',
+            closed: false,
+          },
+        ],
+        languageCodes: [],
+      } as FormFieldModel;
+
+      parser = new OneboxFieldParser(submissionId, regexField, initFormValues, parserOptions);
+      fieldModel = parser.parse();
+    });
+
+    it('should have initialized pattern validator', () => {
+      expect(fieldModel instanceof DynamicOneboxModel).toBe(true);
+      expect(fieldModel.validators).not.toBeNull();
+      expect(fieldModel.validators.pattern).not.toBeNull();
+    });
+
+    it('should mark valid not case sensitive basic characters regex in multiline', () => {
+      let pattern = fieldModel.validators.pattern as RegExp;
+      expect(pattern.test('HELLO')).toBe(true);
+      expect(pattern.test('hello')).toBe(true);
+      expect(pattern.test('hello\nhello\nhello')).toBe(true);
+      expect(pattern.test('HeLlO')).toBe(true);
+    });
+
+    it('should be invalid for non-basic alphabet characters', () => {
+      let pattern = fieldModel.validators.pattern as RegExp;
+      expect(pattern.test('12345')).toBe(false);
+      expect(pattern.test('àèìòùáéíóú')).toBe(false);
+    });
+  });
+
 });
diff --git a/src/app/shared/form/builder/parsers/onebox-field-parser.ts b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
index 3dafa4eebd..2b994146c7 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -1,20 +1,26 @@
-import { DynamicSelectModel, DynamicSelectModelConfig } from '@ng-dynamic-forms/core';
+import {
+  DynamicSelectModel,
+  DynamicSelectModelConfig,
+} from '@ng-dynamic-forms/core';
 
-import { FieldParser } from './field-parser';
+import { isNotEmpty } from '../../../empty.util';
+import {
+  DsDynamicInputModel,
+  DsDynamicInputModelConfig,
+} from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
   DsDynamicQualdropModelConfig,
   DynamicQualdropModel,
   QUALDROP_GROUP_SUFFIX,
   QUALDROP_METADATA_SUFFIX,
-  QUALDROP_VALUE_SUFFIX
+  QUALDROP_VALUE_SUFFIX,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { isNotEmpty } from '../../../empty.util';
-import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import {
   DsDynamicOneboxModelConfig,
-  DynamicOneboxModel
+  DynamicOneboxModel,
 } from '../ds-dynamic-form-ui/models/onebox/dynamic-onebox.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class OneboxFieldParser extends FieldParser {
 
@@ -24,8 +30,8 @@ export class OneboxFieldParser extends FieldParser {
       const clsGroup = {
         element: {
           control: 'form-row',
-          hint: 'ds-form-qualdrop-hint'
-        }
+          hint: 'ds-form-qualdrop-hint',
+        },
       };
 
       const clsSelect = {
@@ -33,8 +39,8 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-addon custom-select',
         },
         grid: {
-          host: 'col-sm-4 pr-0'
-        }
+          host: 'col-sm-4 pr-0',
+        },
       };
 
       const clsInput = {
@@ -42,8 +48,8 @@ export class OneboxFieldParser extends FieldParser {
           control: 'ds-form-input-value',
         },
         grid: {
-          host: 'col-sm-8 pl-0'
-        }
+          host: 'col-sm-8 pl-0',
+        },
       };
 
       const newId = this.configData.selectableMetadata[0].metadata
@@ -59,19 +65,20 @@ export class OneboxFieldParser extends FieldParser {
       this.setLabel(inputSelectGroup, label);
       inputSelectGroup.required = isNotEmpty(this.configData.mandatory);
 
+      const inputModelConfig: DsDynamicInputModelConfig = this.initModel(newId + QUALDROP_VALUE_SUFFIX, label, false, false);
+      inputModelConfig.hint = null;
+      this.setValues(inputModelConfig, fieldValue);
+
       const selectModelConfig: DynamicSelectModelConfig<any> = this.initModel(newId + QUALDROP_METADATA_SUFFIX, label, false, false);
       selectModelConfig.hint = null;
       this.setOptions(selectModelConfig);
       if (isNotEmpty(fieldValue)) {
         selectModelConfig.value = fieldValue.metadata;
       }
-      inputSelectGroup.group.push(new DynamicSelectModel(selectModelConfig, clsSelect));
-
-      const inputModelConfig: DsDynamicInputModelConfig = this.initModel(newId + QUALDROP_VALUE_SUFFIX, label, false, false);
-      inputModelConfig.hint = null;
-      this.setValues(inputModelConfig, fieldValue);
+      selectModelConfig.disabled = inputModelConfig.readOnly;
       inputSelectGroup.readOnly = selectModelConfig.disabled && inputModelConfig.readOnly;
 
+      inputSelectGroup.group.push(new DynamicSelectModel(selectModelConfig, clsSelect));
       inputSelectGroup.group.push(new DsDynamicInputModel(inputModelConfig, clsInput));
 
       return new DynamicQualdropModel(inputSelectGroup, clsGroup);
diff --git a/src/app/shared/form/builder/parsers/parser-factory.ts b/src/app/shared/form/builder/parsers/parser-factory.ts
index 26a9cb0f28..439baf4d4b 100644
--- a/src/app/shared/form/builder/parsers/parser-factory.ts
+++ b/src/app/shared/form/builder/parsers/parser-factory.ts
@@ -1,24 +1,25 @@
 import { StaticProvider } from '@angular/core';
-import { ParserType } from './parser-type';
+
+import { DateFieldParser } from './date-field-parser';
+import { DisabledFieldParser } from './disabled-field-parser';
+import { DropdownFieldParser } from './dropdown-field-parser';
 import {
   CONFIG_DATA,
   FieldParser,
   INIT_FORM_VALUES,
   PARSER_OPTIONS,
-  SUBMISSION_ID
+  SUBMISSION_ID,
 } from './field-parser';
-import { DateFieldParser } from './date-field-parser';
-import { DropdownFieldParser } from './dropdown-field-parser';
-import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { ListFieldParser } from './list-field-parser';
 import { LookupFieldParser } from './lookup-field-parser';
 import { LookupNameFieldParser } from './lookup-name-field-parser';
-import { OneboxFieldParser } from './onebox-field-parser';
 import { NameFieldParser } from './name-field-parser';
+import { OneboxFieldParser } from './onebox-field-parser';
+import { ParserType } from './parser-type';
+import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { SeriesFieldParser } from './series-field-parser';
 import { TagFieldParser } from './tag-field-parser';
 import { TextareaFieldParser } from './textarea-field-parser';
-import { DisabledFieldParser } from './disabled-field-parser';
 
 const fieldParserDeps = [
   SUBMISSION_ID,
@@ -37,84 +38,84 @@ export class ParserFactory {
         return {
           provide: FieldParser,
           useClass: DateFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Dropdown: {
         return {
           provide: FieldParser,
           useClass: DropdownFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.RelationGroup: {
         return {
           provide: FieldParser,
           useClass: RelationGroupFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.List: {
         return {
           provide: FieldParser,
           useClass: ListFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Lookup: {
         return {
           provide: FieldParser,
           useClass: LookupFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.LookupName: {
         return {
           provide: FieldParser,
           useClass: LookupNameFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Onebox: {
         return {
           provide: FieldParser,
           useClass: OneboxFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Name: {
         return {
           provide: FieldParser,
           useClass: NameFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Series: {
         return {
           provide: FieldParser,
           useClass: SeriesFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Tag: {
         return {
           provide: FieldParser,
           useClass: TagFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case ParserType.Textarea: {
         return {
           provide: FieldParser,
           useClass: TextareaFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       case undefined: {
         return {
           provide: FieldParser,
           useClass: DisabledFieldParser,
-          deps: [...fieldParserDeps]
+          deps: [...fieldParserDeps],
         };
       }
       default: {
diff --git a/src/app/shared/form/builder/parsers/parser.utils.ts b/src/app/shared/form/builder/parsers/parser.utils.ts
index 734ec4b83a..e8b23b257d 100644
--- a/src/app/shared/form/builder/parsers/parser.utils.ts
+++ b/src/app/shared/form/builder/parsers/parser.utils.ts
@@ -1,5 +1,12 @@
-import { isNull, isUndefined } from '../../../empty.util';
-import { DynamicFormControlLayout, DynamicFormControlLayoutConfig } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlLayout,
+  DynamicFormControlLayoutConfig,
+} from '@ng-dynamic-forms/core';
+
+import {
+  isNull,
+  isUndefined,
+} from '../../../empty.util';
 
 export function setLayout(model: any, controlLayout: string, controlLayoutConfig: string, style: string) {
   if (isNull(model.layout)) {
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..ef4f0f709a 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
@@ -1,8 +1,8 @@
-import { FormFieldModel } from '../models/form-field.model';
-import { RelationGroupFieldParser } from './relation-group-field-parser';
 import { DynamicRelationGroupModel } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { RelationGroupFieldParser } from './relation-group-field-parser';
 
 describe('RelationGroupFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,20 +13,20 @@ describe('RelationGroupFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: 'WORKSPACE',
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'group'
+        type: 'group',
       },
       rows: [
         {
           fields: [
             {
               input: {
-                type: 'onebox'
+                type: 'onebox',
               },
               label: 'Author',
               mandatory: 'false',
@@ -34,14 +34,14 @@ describe('RelationGroupFieldParser test suite', () => {
               hints: 'Enter the name of the author.',
               selectableMetadata: [
                 {
-                  metadata: 'author'
-                }
+                  metadata: 'author',
+                },
               ],
-              languageCodes: []
+              languageCodes: [],
             },
             {
               input: {
-                type: 'onebox'
+                type: 'onebox',
               },
               label: 'Affiliation',
               mandatory: false,
@@ -49,13 +49,13 @@ describe('RelationGroupFieldParser test suite', () => {
               hints: 'Enter the affiliation of the author.',
               selectableMetadata: [
                 {
-                  metadata: 'affiliation'
-                }
+                  metadata: 'affiliation',
+                },
               ],
-              languageCodes: []
-            }
-          ]
-        }
+              languageCodes: [],
+            },
+          ],
+        },
       ],
       label: 'Authors',
       mandatory: 'true',
@@ -64,10 +64,10 @@ describe('RelationGroupFieldParser test suite', () => {
       hints: 'Enter the names of the authors of this item.',
       selectableMetadata: [
         {
-          metadata: 'author'
-        }
+          metadata: 'author',
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
@@ -97,14 +97,14 @@ describe('RelationGroupFieldParser test suite', () => {
   it('should set group init value properly', () => {
     initFormValues = {
       author: [new FormFieldMetadataValueObject('test author')],
-      affiliation: [new FormFieldMetadataValueObject('test affiliation')]
+      affiliation: [new FormFieldMetadataValueObject('test affiliation')],
     };
     const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
     const expectedValue = [{
       author: new FormFieldMetadataValueObject('test author'),
-      affiliation: new FormFieldMetadataValueObject('test affiliation')
+      affiliation: new FormFieldMetadataValueObject('test affiliation'),
     }];
 
     expect(fieldModel.value).toEqual(expectedValue);
diff --git a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
index 41c276fee8..112bfdaf24 100644
--- a/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/relation-group-field-parser.ts
@@ -1,14 +1,13 @@
-import { FieldParser } from './field-parser';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { FormFieldModel } from '../models/form-field.model';
-
+import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 import { isNotEmpty } from '../../../empty.util';
+import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 import {
   DynamicRelationGroupModel,
-  DynamicRelationGroupModelConfig
+  DynamicRelationGroupModelConfig,
 } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
-import { PLACEHOLDER_PARENT_METADATA } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class RelationGroupFieldParser extends FieldParser {
 
@@ -52,8 +51,8 @@ export class RelationGroupFieldParser extends FieldParser {
     }
     const cls = {
       element: {
-        container: 'mb-3'
-      }
+        container: 'mb-3',
+      },
     };
 
     const model = new DynamicRelationGroupModel(modelConfiguration, cls);
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..9fde7cc839 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -1,8 +1,8 @@
+import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
+import { DynamicRowArrayModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { FormFieldModel } from '../models/form-field.model';
 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';
 
 describe('RowParser test suite', () => {
 
@@ -37,10 +37,10 @@ describe('RowParser test suite', () => {
             {
               metadata: 'journal',
               controlledVocabulary: 'JOURNALAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'onebox' },
@@ -50,10 +50,10 @@ describe('RowParser test suite', () => {
           hints: ' Enter issue number.',
           selectableMetadata: [
             {
-              metadata: 'issue'
-            }
+              metadata: 'issue',
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'name' },
@@ -63,19 +63,19 @@ describe('RowParser test suite', () => {
           hints: 'Enter full name.',
           selectableMetadata: [
             {
-              metadata: 'name'
-            }
+              metadata: 'name',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
     row2 = {
       fields: [
         {
           input: {
             type: 'onebox',
-            regex: '^[a-zA-Z0-9]+$'
+            regex: '^[a-zA-Z0-9]+$',
           },
           label: 'Title',
           mandatory: 'false',
@@ -85,12 +85,12 @@ describe('RowParser test suite', () => {
             {
               metadata: 'title',
               controlledVocabulary: 'EVENTAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row3 = {
@@ -105,10 +105,10 @@ describe('RowParser test suite', () => {
             {
               metadata: 'title',
               controlledVocabulary: 'EVENTAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'onebox' },
@@ -121,19 +121,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'otherTitle',
               controlledVocabulary: 'EVENTAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row4 = {
       fields: [
         {
           input: {
-            type: 'dropdown'
+            type: 'dropdown',
           },
           label: 'Type',
           mandatory: 'false',
@@ -143,10 +143,10 @@ describe('RowParser test suite', () => {
             {
               metadata: 'type',
               controlledVocabulary: 'common_types_dataset',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
+          languageCodes: [],
         } as FormFieldModel,
         {
           input: { type: 'series' },
@@ -157,18 +157,18 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'series',
-            }
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row5 = {
       fields: [
         {
           input: {
-            type: 'lookup-name'
+            type: 'lookup-name',
           },
           label: 'Author',
           mandatory: 'false',
@@ -178,19 +178,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'author',
               controlledVocabulary: 'RPAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row6 = {
       fields: [
         {
           input: {
-            type: 'list'
+            type: 'list',
           },
           label: 'Type',
           mandatory: 'false',
@@ -200,19 +200,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'type',
               controlledVocabulary: 'type_programme',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row7 = {
       fields: [
         {
           input: {
-            type: 'date'
+            type: 'date',
           },
           label: 'Date of Issue.',
           mandatory: 'true',
@@ -222,18 +222,18 @@ describe('RowParser test suite', () => {
           selectableMetadata: [
             {
               metadata: 'date',
-            }
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row8 = {
       fields: [
         {
           input: {
-            type: 'tag'
+            type: 'tag',
           },
           label: 'Keywords',
           mandatory: 'false',
@@ -243,19 +243,19 @@ describe('RowParser test suite', () => {
             {
               metadata: 'subject',
               controlledVocabulary: 'JOURNALAuthority',
-              closed: false
-            }
+              closed: false,
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row9 = {
       fields: [
         {
           input: {
-            type: 'textarea'
+            type: 'textarea',
           },
           label: 'Description',
           mandatory: 'false',
@@ -263,26 +263,26 @@ describe('RowParser test suite', () => {
           hints: 'Enter a description.',
           selectableMetadata: [
             {
-              metadata: 'description'
-            }
+              metadata: 'description',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
 
     row10 = {
       fields: [
         {
           input: {
-            type: 'group'
+            type: 'group',
           },
           rows: [
             {
               fields: [
                 {
                   input: {
-                    type: 'onebox'
+                    type: 'onebox',
                   },
                   label: 'Author',
                   mandatory: 'false',
@@ -290,14 +290,14 @@ describe('RowParser test suite', () => {
                   hints: 'Enter the name of the author.',
                   selectableMetadata: [
                     {
-                      metadata: 'author'
-                    }
+                      metadata: 'author',
+                    },
                   ],
-                  languageCodes: []
+                  languageCodes: [],
                 },
                 {
                   input: {
-                    type: 'onebox'
+                    type: 'onebox',
                   },
                   label: 'Affiliation',
                   mandatory: false,
@@ -305,13 +305,13 @@ describe('RowParser test suite', () => {
                   hints: 'Enter the affiliation of the author.',
                   selectableMetadata: [
                     {
-                      metadata: 'affiliation'
-                    }
+                      metadata: 'affiliation',
+                    },
                   ],
-                  languageCodes: []
-                }
-              ]
-            }
+                  languageCodes: [],
+                },
+              ],
+            },
           ],
           label: 'Authors',
           mandatory: 'true',
@@ -320,12 +320,12 @@ describe('RowParser test suite', () => {
           hints: 'Enter the names of the authors of this item.',
           selectableMetadata: [
             {
-              metadata: 'author'
-            }
+              metadata: 'author',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel;
   });
 
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index 764f52ffdf..97c9cb8257 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -1,22 +1,39 @@
-import { Injectable, Injector } from '@angular/core';
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
+  DynamicFormGroupModelConfig,
+} from '@ng-dynamic-forms/core';
+import uniqueId from 'lodash/uniqueId';
 
-import { DYNAMIC_FORM_CONTROL_TYPE_ARRAY, DynamicFormGroupModelConfig } from '@ng-dynamic-forms/core';
-import { uniqueId } from 'lodash';
-
-import { isEmpty } from '../../../empty.util';
+import { SubmissionScopeType } from '../../../../core/submission/submission-scope-type';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../../empty.util';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { FormFieldModel } from '../models/form-field.model';
-import { CONFIG_DATA, FieldParser, INIT_FORM_VALUES, PARSER_OPTIONS, SUBMISSION_ID } from './field-parser';
+import { SubmissionFieldScopeType } from './../../../../core/submission/submission-field-scope-type';
+import { SectionVisibility } from './../../../../submission/objects/section-visibility.model';
+import {
+  CONFIG_DATA,
+  FieldParser,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID,
+} from './field-parser';
+import { setLayout } from './parser.utils';
 import { ParserFactory } from './parser-factory';
 import { ParserOptions } from './parser-options';
 import { ParserType } from './parser-type';
-import { setLayout } from './parser.utils';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/ds-dynamic-form-constants';
 
 export const ROW_ID_PREFIX = 'df-row-group-config-';
 
 @Injectable({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 
 /**
@@ -27,12 +44,12 @@ export class RowParser {
   }
 
   public parse(submissionId: string,
-               rowData,
-               scopeUUID,
-               initFormValues: any,
-               submissionScope,
-               readOnly: boolean,
-               typeField: string): DynamicRowGroupModel {
+    rowData,
+    scopeUUID,
+    initFormValues: any,
+    submissionScope,
+    readOnly: boolean,
+    typeField: string): DynamicRowGroupModel {
     let fieldModel: any = null;
     let parsedResult = null;
     const config: DynamicFormGroupModelConfig = {
@@ -49,7 +66,7 @@ export class RowParser {
       readOnly: readOnly,
       submissionScope: submissionScope,
       collectionUUID: scopeUUID,
-      typeField: typeField
+      typeField: typeField,
     };
 
     // Iterate over row's fields
@@ -64,14 +81,14 @@ export class RowParser {
             { provide: SUBMISSION_ID, useValue: submissionId },
             { provide: CONFIG_DATA, useValue: fieldData },
             { provide: INIT_FORM_VALUES, useValue: initFormValues },
-            { provide: PARSER_OPTIONS, useValue: parserOptions }
+            { provide: PARSER_OPTIONS, useValue: parserOptions },
           ],
-          parent: this.parentInjector
+          parent: this.parentInjector,
         });
 
         fieldModel = fieldInjector.get(FieldParser).parse();
       } else {
-        throw new Error(`unknown form control model type "${fieldData.input.type}" defined for Input field with label "${fieldData.label}".`,);
+        throw new Error(`unknown form control model type "${fieldData.input.type}" defined for Input field with label "${fieldData.label}".`);
       }
 
       if (fieldModel) {
@@ -106,7 +123,7 @@ export class RowParser {
       const clsGroup = {
         element: {
           control: 'form-row',
-        }
+        },
       };
       const groupModel = new DynamicRowGroupModel(config, clsGroup);
       if (Array.isArray(parsedResult)) {
@@ -118,15 +135,37 @@ export class RowParser {
     return parsedResult;
   }
 
-  checksFieldScope(fieldScope, submissionScope) {
-    return (isEmpty(fieldScope) || isEmpty(submissionScope) || fieldScope === submissionScope);
+  checksFieldScope(fieldScope, submissionScope, visibility: SectionVisibility) {
+    return (isEmpty(fieldScope) || !this.isHidden(visibility, fieldScope, submissionScope));
+  }
+
+  /**
+   * Check if the field is hidden or not.
+   * It is hidden when we do have the scope,
+   * but we do not have the visibility,
+   * also the field scope should be different from the submissionScope.
+   * @param visibility The visibility of the field
+   * @param scope the scope of the field
+   * @param submissionScope the scope of the submission
+   * @returns If the field is hidden or not
+   */
+  private isHidden(visibility: SectionVisibility, scope: string, submissionScope: string): boolean {
+    return isNotEmpty(scope)
+      && (
+        isEmpty(visibility)
+        && (
+          submissionScope === SubmissionScopeType.WorkspaceItem && scope !== SubmissionFieldScopeType.WorkspaceItem
+          ||
+          submissionScope === SubmissionScopeType.WorkflowItem && scope !== SubmissionFieldScopeType.WorkflowItem
+        )
+      );
   }
 
   filterScopedFields(fields: FormFieldModel[], submissionScope): FormFieldModel[] {
     const filteredFields: FormFieldModel[] = [];
     fields.forEach((field: FormFieldModel) => {
       // Whether field scope doesn't match the submission scope, skip it
-      if (this.checksFieldScope(field.scope, submissionScope)) {
+      if (this.checksFieldScope(field.scope, submissionScope, field.visibility)) {
         filteredFields.push(field);
       }
     });
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..d4b37e5d7f 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
@@ -1,8 +1,8 @@
-import { FormFieldModel } from '../models/form-field.model';
 import { DynamicConcatModel } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
-import { SeriesFieldParser } from './series-field-parser';
+import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
 import { ParserOptions } from './parser-options';
+import { SeriesFieldParser } from './series-field-parser';
 
 describe('SeriesFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,7 +13,7 @@ describe('SeriesFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
@@ -26,9 +26,9 @@ describe('SeriesFieldParser test suite', () => {
       selectableMetadata: [
         {
           metadata: 'series',
-        }
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
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..ce85d07d29 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.ts
@@ -1,7 +1,13 @@
 import { Inject } from '@angular/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';
+import {
+  CONFIG_DATA,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID,
+} from './field-parser';
 import { ParserOptions } from './parser-options';
 
 export class SeriesFieldParser extends ConcatFieldParser {
@@ -10,7 +16,7 @@ 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,
   ) {
     super(submissionId, configData, initFormValues, parserOptions, ';');
   }
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..571d06d983 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
@@ -1,8 +1,8 @@
+import { DynamicTagModel } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { TagFieldParser } from './tag-field-parser';
-import { DynamicTagModel } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { ParserOptions } from './parser-options';
+import { TagFieldParser } from './tag-field-parser';
 
 describe('TagFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,13 +13,13 @@ describe('TagFieldParser test suite', () => {
     readOnly: false,
     submissionScope: 'testScopeUUID',
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'tag'
+        type: 'tag',
       },
       label: 'Keywords',
       mandatory: 'false',
@@ -29,10 +29,10 @@ describe('TagFieldParser test suite', () => {
         {
           metadata: 'subject',
           controlledVocabulary: 'JOURNALAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/tag-field-parser.ts b/src/app/shared/form/builder/parsers/tag-field-parser.ts
index dcc2c5575f..5c3f2e60bc 100644
--- a/src/app/shared/form/builder/parsers/tag-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/tag-field-parser.ts
@@ -1,6 +1,9 @@
-import { FieldParser } from './field-parser';
+import {
+  DynamicTagModel,
+  DynamicTagModelConfig,
+} from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DynamicTagModel, DynamicTagModelConfig } from '../ds-dynamic-form-ui/models/tag/dynamic-tag.model';
+import { FieldParser } from './field-parser';
 
 export class TagFieldParser extends FieldParser {
 
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..95fef2103c 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
@@ -1,8 +1,8 @@
+import { DsDynamicTextAreaModel } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { TextareaFieldParser } from './textarea-field-parser';
-import { DsDynamicTextAreaModel } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
 import { ParserOptions } from './parser-options';
+import { TextareaFieldParser } from './textarea-field-parser';
 
 describe('TextareaFieldParser test suite', () => {
   let field: FormFieldModel;
@@ -13,13 +13,13 @@ describe('TextareaFieldParser test suite', () => {
     readOnly: false,
     submissionScope: null,
     collectionUUID: null,
-    typeField: 'dc_type'
+    typeField: 'dc_type',
   };
 
   beforeEach(() => {
     field = {
       input: {
-        type: 'textarea'
+        type: 'textarea',
       },
       label: 'Description',
       mandatory: 'false',
@@ -27,10 +27,10 @@ describe('TextareaFieldParser test suite', () => {
       hints: 'Enter a description.',
       selectableMetadata: [
         {
-          metadata: 'description'
-        }
+          metadata: 'description',
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel;
 
   });
diff --git a/src/app/shared/form/builder/parsers/textarea-field-parser.ts b/src/app/shared/form/builder/parsers/textarea-field-parser.ts
index 740e94721f..c253899b3d 100644
--- a/src/app/shared/form/builder/parsers/textarea-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/textarea-field-parser.ts
@@ -1,25 +1,24 @@
-import { FieldParser } from './field-parser';
-import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
-import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { environment } from '../../../../../environments/environment';
 import {
   DsDynamicTextAreaModel,
-  DsDynamicTextAreaModelConfig
+  DsDynamicTextAreaModelConfig,
 } from '../ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { FieldParser } from './field-parser';
 
 export class TextareaFieldParser extends FieldParser {
 
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
     const textAreaModelConfig: DsDynamicTextAreaModelConfig = this.initModel(null, label);
 
-    let layout: DynamicFormControlLayout;
-
-    layout = {
+    const layout = {
       element: {
-        label: 'col-form-label'
-      }
+        label: 'col-form-label',
+      },
     };
 
     textAreaModelConfig.rows = 10;
+    textAreaModelConfig.spellCheck = environment.form.spellCheck;
     this.setValues(textAreaModelConfig, fieldValue);
     const textAreaModel = new DsDynamicTextAreaModel(textAreaModelConfig, layout);
 
diff --git a/src/app/shared/chips/chips.component.html b/src/app/shared/form/chips/chips.component.html
similarity index 89%
rename from src/app/shared/chips/chips.component.html
rename to src/app/shared/form/chips/chips.component.html
index 2233c1bd16..24fdbbc8cf 100644
--- a/src/app/shared/chips/chips.component.html
+++ b/src/app/shared/form/chips/chips.component.html
@@ -1,5 +1,5 @@
 <div [className]="'float-left w-100 ' + wrapperClass">
-  <ul class="nav nav-pills d-flex flex-column flex-sm-row" [sortablejs]="chips.getChips()" [sortablejsOptions]="options">
+  <div role="list" class="nav nav-pills d-flex flex-column flex-sm-row" [sortablejs]="chips.getChips()" [sortablejsOptions]="options">
     <ng-container *ngFor="let c of chips.getChips(); let i = index">
       <ng-template #tipContent>
         <p class="text-left p-0 m-0" *ngFor="let tip of tipText">
@@ -7,7 +7,7 @@
         </p>
       </ng-template>
 
-      <li class="nav-item mr-2 mb-1"
+      <div role="listitem" class="nav-item mr-2 mb-1"
           #t="ngbTooltip"
           triggers="manual"
           [ngbTooltip]="tipContent"
@@ -17,7 +17,7 @@
           (mouseout)="t.close()">
         <a class="flex-sm-fill text-sm-center nav-link active bg-info"
            href="javascript:void(0);"
-           [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged == i}"
+           [ngClass]="{'chip-selected disabled': (editable && c.editMode) || dragged === i}"
            (click)="chipsSelected($event, i);">
           <span>
             <i *ngIf="showIcons && !c.isNestedItem()" dsAuthorityConfidenceState [authorityValue]="c.item" class="far fa-circle" aria-hidden="true"></i>
@@ -40,10 +40,10 @@
             <p class="chip-label text-truncate d-table-cell">{{c.display}}</p><i class="fas fa-times ml-2" (click)="removeChips($event, i)" [title]="'chips.remove' | translate"></i>
           </span>
         </a>
-      </li>
+      </div>
     </ng-container>
     <div [class.chips-sort-ignore]="(isDragging | async)" class="flex-grow-1">
       <ng-content ></ng-content>
     </div>
-  </ul>
+  </div>
 </div>
diff --git a/src/app/shared/chips/chips.component.scss b/src/app/shared/form/chips/chips.component.scss
similarity index 100%
rename from src/app/shared/chips/chips.component.scss
rename to src/app/shared/form/chips/chips.component.scss
diff --git a/src/app/shared/chips/chips.component.spec.ts b/src/app/shared/form/chips/chips.component.spec.ts
similarity index 81%
rename from src/app/shared/chips/chips.component.spec.ts
rename to src/app/shared/form/chips/chips.component.spec.ts
index 6f9b948002..ea6aa80882 100644
--- a/src/app/shared/chips/chips.component.spec.ts
+++ b/src/app/shared/form/chips/chips.component.spec.ts
@@ -1,19 +1,29 @@
 // Load the implementations that should be tested
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync, } from '@angular/core/testing';
-
-import { Chips } from './models/chips.model';
-import { UploaderService } from '../uploader/uploader.service';
-import { ChipsComponent } from './chips.component';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
-import { createTestComponent } from '../testing/utils.test';
-import { AuthorityConfidenceStateDirective } from '../authority-confidence/authority-confidence-state.directive';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { ConfidenceType } from '../../core/shared/confidence-type';
 import { SortablejsModule } from 'ngx-sortablejs';
-import { environment } from '../../../environments/environment';
+
+import { environment } from '../../../../environments/environment';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { createTestComponent } from '../../testing/utils.test';
+import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
+import { AuthorityConfidenceStateDirective } from '../directives/authority-confidence-state.directive';
+import { ChipsComponent } from './chips.component';
+import { Chips } from './models/chips.model';
 
 describe('ChipsComponent test suite', () => {
 
@@ -31,19 +41,18 @@ describe('ChipsComponent test suite', () => {
       imports: [
         NgbModule,
         SortablejsModule.forRoot({ animation: 150 }),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ChipsComponent,
         TestComponent,
-        AuthorityConfidenceStateDirective
+        AuthorityConfidenceStateDirective,
       ], // declare the test component
       providers: [
         ChangeDetectorRef,
         ChipsComponent,
-        UploaderService
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -124,7 +133,7 @@ describe('ChipsComponent test suite', () => {
     }));
 
     it('should save chips item index when drag and drop start', fakeAsync(() => {
-      const de = chipsFixture.debugElement.query(By.css('li.nav-item'));
+      const de = chipsFixture.debugElement.query(By.css('div.nav-item'));
 
       de.triggerEventHandler('dragstart', null);
 
@@ -133,7 +142,7 @@ describe('ChipsComponent test suite', () => {
 
     it('should update chips item order when drag and drop end', fakeAsync(() => {
       spyOn(chipsComp.chips, 'updateOrder');
-      const de = chipsFixture.debugElement.query(By.css('li.nav-item'));
+      const de = chipsFixture.debugElement.query(By.css('div.nav-item'));
 
       de.triggerEventHandler('dragend', null);
 
@@ -147,7 +156,7 @@ describe('ChipsComponent test suite', () => {
       const item = {
         mainField: new FormFieldMetadataValueObject('main test', null, 'test001', 'main test', 0, ConfidenceType.CF_ACCEPTED),
         relatedField: new FormFieldMetadataValueObject('related test', null, 'test002', 'related test', 0, ConfidenceType.CF_ACCEPTED),
-        otherRelatedField: new FormFieldMetadataValueObject('other related test')
+        otherRelatedField: new FormFieldMetadataValueObject('other related test'),
       };
 
       chips = new Chips([item], 'display', 'mainField', environment.submission.icons.metadata);
@@ -160,7 +169,7 @@ describe('ChipsComponent test suite', () => {
     });
 
     it('should show icon for every field that has a configured icon', () => {
-      const de = chipsFixture.debugElement.query(By.css('li.nav-item'));
+      const de = chipsFixture.debugElement.query(By.css('div.nav-item'));
       const icons = de.queryAll(By.css('i.fas'));
 
       expect(icons.length).toBe(4);
@@ -168,7 +177,7 @@ describe('ChipsComponent test suite', () => {
     });
 
     it('should show tooltip on mouse over an icon', () => {
-      const de = chipsFixture.debugElement.query(By.css('li.nav-item'));
+      const de = chipsFixture.debugElement.query(By.css('div.nav-item'));
       const icons = de.queryAll(By.css('i.fas'));
 
       icons[0].triggerEventHandler('mouseover', null);
@@ -181,7 +190,7 @@ describe('ChipsComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/chips/chips.component.ts b/src/app/shared/form/chips/chips.component.ts
similarity index 89%
rename from src/app/shared/chips/chips.component.ts
rename to src/app/shared/form/chips/chips.component.ts
index 17a6b034ee..00addb06c7 100644
--- a/src/app/shared/chips/chips.component.ts
+++ b/src/app/shared/form/chips/chips.component.ts
@@ -1,14 +1,21 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, } from '@angular/core';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
 import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
-import { isObject } from 'lodash';
+import { TranslateService } from '@ngx-translate/core';
+import isObject from 'lodash/isObject';
+import { BehaviorSubject } from 'rxjs';
+import { Options } from 'sortablejs';
 
+import { DragService } from '../../../core/drag.service';
 import { Chips } from './models/chips.model';
 import { ChipsItem } from './models/chips-item.model';
-import { UploaderService } from '../uploader/uploader.service';
-import { TranslateService } from '@ngx-translate/core';
-import { Options } from 'sortablejs';
-import { BehaviorSubject } from 'rxjs';
 
 @Component({
   selector: 'ds-chips',
@@ -33,7 +40,7 @@ export class ChipsComponent implements OnChanges {
 
   constructor(
     private cdr: ChangeDetectorRef,
-    private uploaderService: UploaderService,
+    private dragService: DragService,
     private translate: TranslateService) {
 
     this.options = {
@@ -41,7 +48,7 @@ export class ChipsComponent implements OnChanges {
       chosenClass: 'm-0',
       dragClass: 'm-0',
       filter: '.chips-sort-ignore',
-      ghostClass: 'm-0'
+      ghostClass: 'm-0',
     };
   }
 
@@ -76,12 +83,12 @@ export class ChipsComponent implements OnChanges {
 
   onDragStart(index) {
     this.isDragging.next(true);
-    this.uploaderService.overrideDragOverPage();
+    this.dragService.overrideDragOverPage();
     this.dragged = index;
   }
 
   onDragEnd(event) {
-    this.uploaderService.allowDragOverPage();
+    this.dragService.allowDragOverPage();
     this.dragged = -1;
     this.chips.updateOrder();
     this.isDragging.next(false);
@@ -102,7 +109,7 @@ export class ChipsComponent implements OnChanges {
                   .subscribe((label) => {
                     textToDisplay.push(label + ': ' + chipsItem.item[field].otherInformation[otherField]);
                   });
-            });
+              });
           }
         } else {
           textToDisplay.push(chipsItem.item[field]);
diff --git a/src/app/shared/chips/models/chips-item.model.spec.ts b/src/app/shared/form/chips/models/chips-item.model.spec.ts
similarity index 88%
rename from src/app/shared/chips/models/chips-item.model.spec.ts
rename to src/app/shared/form/chips/models/chips-item.model.spec.ts
index c85ff83c31..fd02032b25 100644
--- a/src/app/shared/chips/models/chips-item.model.spec.ts
+++ b/src/app/shared/form/chips/models/chips-item.model.spec.ts
@@ -1,5 +1,8 @@
-import { ChipsItem, ChipsItemIcon } from './chips-item.model';
-import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
+import {
+  ChipsItem,
+  ChipsItemIcon,
+} from './chips-item.model';
 
 describe('ChipsItem model test suite', () => {
   let item: ChipsItem;
@@ -58,7 +61,7 @@ describe('ChipsItem model test suite', () => {
     item = new ChipsItem(
       {
         label: 'A',
-        value: 'a'
+        value: 'a',
       },
       'label');
 
@@ -69,7 +72,7 @@ describe('ChipsItem model test suite', () => {
     item = new ChipsItem(
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'other'
+        otherProperty: 'other',
       },
       'value', 'toDisplay');
 
diff --git a/src/app/shared/chips/models/chips-item.model.ts b/src/app/shared/form/chips/models/chips-item.model.ts
similarity index 81%
rename from src/app/shared/chips/models/chips-item.model.ts
rename to src/app/shared/form/chips/models/chips-item.model.ts
index 5d0ff20e2f..a2c6033ff8 100644
--- a/src/app/shared/chips/models/chips-item.model.ts
+++ b/src/app/shared/form/chips/models/chips-item.model.ts
@@ -1,8 +1,13 @@
-import { isObject, uniqueId } from 'lodash';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
-import { ConfidenceType } from '../../../core/shared/confidence-type';
-import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import isObject from 'lodash/isObject';
+import uniqueId from 'lodash/uniqueId';
+
+import { ConfidenceType } from '../../../../core/shared/confidence-type';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { PLACEHOLDER_PARENT_METADATA } from '../../builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
 
 export interface ChipsItemIcon {
   metadata: string;
@@ -22,10 +27,10 @@ export class ChipsItem {
   private objToDisplay: string;
 
   constructor(item: any,
-              fieldToDisplay: string = 'display',
-              objToDisplay?: string,
-              icons?: ChipsItemIcon[],
-              editMode?: boolean) {
+    fieldToDisplay: string = 'display',
+    objToDisplay?: string,
+    icons?: ChipsItemIcon[],
+    editMode?: boolean) {
 
     this.id = uniqueId();
     this._item = item;
@@ -52,7 +57,7 @@ export class ChipsItem {
   }
 
   hasIcons(): boolean {
-     return isNotEmpty(this.icons);
+    return isNotEmpty(this.icons);
   }
 
   hasVisibleIcons(): boolean {
diff --git a/src/app/shared/chips/models/chips.model.spec.ts b/src/app/shared/form/chips/models/chips.model.spec.ts
similarity index 89%
rename from src/app/shared/chips/models/chips.model.spec.ts
rename to src/app/shared/form/chips/models/chips.model.spec.ts
index a6cf5faf81..eee87fef74 100644
--- a/src/app/shared/chips/models/chips.model.spec.ts
+++ b/src/app/shared/form/chips/models/chips.model.spec.ts
@@ -1,6 +1,6 @@
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
 import { Chips } from './chips.model';
 import { ChipsItem } from './chips-item.model';
-import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
 
 describe('Chips model test suite', () => {
   let items: any[];
@@ -53,15 +53,15 @@ describe('Chips model test suite', () => {
     items = [
       {
         label: 'A',
-        value: 'a'
+        value: 'a',
       },
       {
         label: 'B',
-        value: 'b'
+        value: 'b',
       },
       {
         label: 'C',
-        value: 'c'
+        value: 'c',
       },
     ];
     chips = new Chips(items, 'label');
@@ -73,15 +73,15 @@ describe('Chips model test suite', () => {
     items = [
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
     ];
     chips = new Chips(items, 'value', 'toDisplay');
@@ -94,21 +94,21 @@ describe('Chips model test suite', () => {
     items = [
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
       {
         toDisplay: new FormFieldMetadataValueObject('a', null, 'a'),
-        otherProperty: 'a'
+        otherProperty: 'a',
       },
     ];
     const iconsConfig = [{
       name: 'toDisplay',
       visibleWhenAuthorityEmpty: false,
-      style: 'fa-user'
+      style: 'fa-user',
     }];
     chips = new Chips(items, 'value', 'toDisplay', iconsConfig);
 
diff --git a/src/app/shared/chips/models/chips.model.ts b/src/app/shared/form/chips/models/chips.model.ts
similarity index 76%
rename from src/app/shared/chips/models/chips.model.ts
rename to src/app/shared/form/chips/models/chips.model.ts
index c15badb976..5b2d3c5da8 100644
--- a/src/app/shared/chips/models/chips.model.ts
+++ b/src/app/shared/form/chips/models/chips.model.ts
@@ -1,11 +1,17 @@
-import { findIndex, isEqual, isObject } from 'lodash';
+import findIndex from 'lodash/findIndex';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
 import { BehaviorSubject } from 'rxjs';
-import { ChipsItem, ChipsItemIcon } from './chips-item.model';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { MetadataIconConfig } from '../../../../config/submission-config.interface';
-import { FormFieldMetadataValueObject } from '../../form/builder/models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { PLACEHOLDER_PARENT_METADATA } from '../../form/builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+
+import { MetadataIconConfig } from '../../../../../config/submission-config.interface';
+import { VocabularyEntry } from '../../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { PLACEHOLDER_PARENT_METADATA } from '../../builder/ds-dynamic-form-ui/ds-dynamic-form-constants';
+import { FormFieldMetadataValueObject } from '../../builder/models/form-field-metadata-value.model';
+import { ChipsItem } from './chips-item.model';
 
 export class Chips {
   chipsItems: BehaviorSubject<ChipsItem[]>;
@@ -16,9 +22,9 @@ export class Chips {
   private _items: ChipsItem[];
 
   constructor(items: any[] = [],
-              displayField: string = 'display',
-              displayObj?: string,
-              iconsConfig?: MetadataIconConfig[]) {
+    displayField: string = 'display',
+    displayObj?: string,
+    iconsConfig?: MetadataIconConfig[]) {
 
     this.displayField = displayField;
     this.displayObj = displayObj;
@@ -32,7 +38,7 @@ export class Chips {
     const icons = this.getChipsIcons(item);
     const chipsItem = new ChipsItem(item, this.displayField, this.displayObj, icons);
 
-    const duplicatedIndex = findIndex(this._items, {display: chipsItem.display.trim()});
+    const duplicatedIndex = findIndex(this._items, { display: chipsItem.display.trim() });
     if (duplicatedIndex === -1 || !isEqual(item, this.getChipByIndex(duplicatedIndex).item)) {
       this._items.push(chipsItem);
       this.chipsItems.next(this._items);
@@ -40,7 +46,7 @@ export class Chips {
   }
 
   public getChipById(id): ChipsItem {
-    const index = findIndex(this._items, {id: id});
+    const index = findIndex(this._items, { id: id });
     return this.getChipByIndex(index);
   }
 
@@ -81,7 +87,7 @@ export class Chips {
   }
 
   public remove(chipsItem: ChipsItem): void {
-    const index = findIndex(this._items, {id: chipsItem.id});
+    const index = findIndex(this._items, { id: chipsItem.id });
     this._items.splice(index, 1);
     this.chipsItems.next(this._items);
   }
@@ -106,7 +112,7 @@ export class Chips {
       return icons;
     }
 
-    const defaultConfigIndex: number = findIndex(this.iconsConfig, {name: 'default'});
+    const defaultConfigIndex: number = findIndex(this.iconsConfig, { name: 'default' });
     const defaultConfig: MetadataIconConfig = (defaultConfigIndex !== -1) ? this.iconsConfig[defaultConfigIndex] : undefined;
     let config: MetadataIconConfig;
     let configIndex: number;
@@ -116,20 +122,18 @@ export class Chips {
       .forEach((metadata) => {
 
         value = item[metadata];
-        configIndex = findIndex(this.iconsConfig, {name: metadata});
+        configIndex = findIndex(this.iconsConfig, { name: metadata });
 
         config = (configIndex !== -1) ? this.iconsConfig[configIndex] : defaultConfig;
 
         if (hasValue(value) && isNotEmpty(config) && !this.hasPlaceholder(value)) {
-
-          let icon: ChipsItemIcon;
           const visibleWhenAuthorityEmpty = this.displayObj !== metadata;
 
           // Set icon
-          icon = {
+          const icon = {
             metadata,
             visibleWhenAuthorityEmpty,
-            style: config.style
+            style: config.style,
           };
 
           icons.push(icon);
diff --git a/src/app/shared/authority-confidence/authority-confidence-state.directive.ts b/src/app/shared/form/directives/authority-confidence-state.directive.ts
similarity index 55%
rename from src/app/shared/authority-confidence/authority-confidence-state.directive.ts
rename to src/app/shared/form/directives/authority-confidence-state.directive.ts
index 8999a643e8..38eda18a61 100644
--- a/src/app/shared/authority-confidence/authority-confidence-state.directive.ts
+++ b/src/app/shared/form/directives/authority-confidence-state.directive.ts
@@ -1,3 +1,11 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+
 import {
   AfterViewInit,
   Directive,
@@ -8,37 +16,47 @@ import {
   OnChanges,
   Output,
   Renderer2,
-  SimpleChanges
+  SimpleChanges,
 } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import findIndex from 'lodash/findIndex';
 
-import { findIndex } from 'lodash';
-
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
-import { ConfidenceType } from '../../core/shared/confidence-type';
-import { isNotEmpty, isNull } from '../empty.util';
-import { ConfidenceIconConfig } from '../../../config/submission-config.interface';
-import { environment } from '../../../environments/environment';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { ConfidenceIconConfig } from '../../../../config/submission-config.interface';
+import { environment } from '../../../../environments/environment';
+import { ConfidenceType } from '../../../core/shared/confidence-type';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import {
+  isNotEmpty,
+  isNull,
+} from '../../empty.util';
+import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
 
 /**
  * Directive to add to the element a bootstrap utility class based on metadata confidence value
  */
 @Directive({
-  selector: '[dsAuthorityConfidenceState]'
+  selector: '[dsAuthorityConfidenceState]',
 })
 export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewInit {
 
   /**
    * The metadata value
    */
-  @Input() authorityValue: VocabularyEntry | FormFieldMetadataValueObject | string;
+  @Input() authorityValue: VocabularyEntry | FormFieldMetadataValueObject | MetadataValue | string;
 
   /**
    * A boolean representing if to show html icon if authority value is empty
    */
   @Input() visibleWhenAuthorityEmpty = true;
 
+  /**
+   * A boolean to configure the display of icons instead of default style configuration
+   * When true, the class configured in {@link ConfidenceIconConfig.icon} will be used, by default {@link ConfidenceIconConfig.style} is used
+   */
+  @Input() iconMode = false;
+
   /**
    * The css class applied before directive changes
    */
@@ -71,7 +89,8 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
    */
   constructor(
     private elem: ElementRef,
-    private renderer: Renderer2
+    private renderer: Renderer2,
+    private translate: TranslateService,
   ) {
   }
 
@@ -85,12 +104,19 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
       this.previousClass = this.getClassByConfidence(this.getConfidenceByValue(changes.authorityValue.previousValue));
     }
     this.newClass = this.getClassByConfidence(this.getConfidenceByValue(changes.authorityValue.currentValue));
+    const confidenceName = this.getNameByConfidence(this.getConfidenceByValue(changes.authorityValue.currentValue));
 
     if (isNull(this.previousClass)) {
       this.renderer.addClass(this.elem.nativeElement, this.newClass);
+      if (this.iconMode) {
+        this.renderer.setAttribute(this.elem.nativeElement, 'title', this.translate.instant(`confidence.indicator.help-text.${confidenceName}`));
+      }
     } else if (this.previousClass !== this.newClass) {
       this.renderer.removeClass(this.elem.nativeElement, this.previousClass);
       this.renderer.addClass(this.elem.nativeElement, this.newClass);
+      if (this.iconMode) {
+        this.renderer.setAttribute(this.elem.nativeElement, 'title', this.translate.instant(`confidence.indicator.help-text.${confidenceName}`));
+      }
     }
   }
 
@@ -123,6 +149,14 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
       confidence = value.confidence;
     }
 
+    if (isNotEmpty(value) && value instanceof MetadataValue) {
+      confidence = value.confidence;
+    }
+
+    if (isNotEmpty(value) && Object.values(ConfidenceType).includes(value)) {
+      confidence = value;
+    }
+
     return confidence;
   }
 
@@ -138,12 +172,32 @@ export class AuthorityConfidenceStateDirective implements OnChanges, AfterViewIn
 
     const confidenceIcons: ConfidenceIconConfig[] = environment.submission.icons.authority.confidence;
 
-    const confidenceIndex: number = findIndex(confidenceIcons, {value: confidence});
+    const confidenceIndex: number = findIndex(confidenceIcons, { value: confidence });
 
-    const defaultconfidenceIndex: number = findIndex(confidenceIcons, {value: 'default' as  any});
-    const defaultClass: string = (defaultconfidenceIndex !== -1) ? confidenceIcons[defaultconfidenceIndex].style : '';
+    const defaultconfidenceIndex: number = findIndex(confidenceIcons, { value: 'default' as  any });
 
-    return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].style : defaultClass;
+    if (this.iconMode) {
+      const defaultClass: string = (defaultconfidenceIndex !== -1) ? confidenceIcons[defaultconfidenceIndex].icon : '';
+      return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].icon : defaultClass;
+    } else {
+      const defaultClass: string = (defaultconfidenceIndex !== -1) ? confidenceIcons[defaultconfidenceIndex].style : '';
+      return (confidenceIndex !== -1) ? confidenceIcons[confidenceIndex].style : defaultClass;
+    }
+  }
+
+  /**
+   * Return the confidence value name
+   *
+   * @param confidence
+   * @returns
+   */
+  private getNameByConfidence(confidence: any): string {
+    const confidenceText = ConfidenceType[confidence];
+    if (isNotEmpty(confidenceText)) {
+      return confidenceText.replace('CF_', '').toLowerCase();
+    } else {
+      return 'unknown';
+    }
   }
 
 }
diff --git a/src/app/shared/form/form.actions.ts b/src/app/shared/form/form.actions.ts
index 30885de278..170fa25c11 100644
--- a/src/app/shared/form/form.actions.ts
+++ b/src/app/shared/form/form.actions.ts
@@ -41,7 +41,7 @@ export class FormInitAction implements Action {
    *    the Form validation status
    */
   constructor(formId: string, formData: any, valid: boolean) {
-    this.payload = {formId, formData, valid};
+    this.payload = { formId, formData, valid };
   }
 }
 
@@ -61,7 +61,7 @@ export class FormChangeAction implements Action {
    *    the FormGroup Object
    */
   constructor(formId: string, formData: any) {
-    this.payload = {formId, formData};
+    this.payload = { formId, formData };
   }
 }
 
@@ -81,7 +81,7 @@ export class FormAddTouchedAction implements Action {
    *    the array containing new touched fields
    */
   constructor(formId: string, touched: string[]) {
-    this.payload = {formId, touched};
+    this.payload = { formId, touched };
   }
 }
 
@@ -98,7 +98,7 @@ export class FormRemoveAction implements Action {
    *    the Form's ID
    */
   constructor(formId: string) {
-    this.payload = {formId};
+    this.payload = { formId };
   }
 }
 
@@ -118,7 +118,7 @@ export class FormStatusChangeAction implements Action {
    *    the Form validation status
    */
   constructor(formId: string, valid: boolean) {
-    this.payload = {formId, valid};
+    this.payload = { formId, valid };
   }
 }
 
@@ -132,7 +132,7 @@ export class FormAddError implements Action {
   };
 
   constructor(formId: string, fieldId: string, fieldIndex: number, errorMessage: string) {
-    this.payload = {formId, fieldId, fieldIndex, errorMessage};
+    this.payload = { formId, fieldId, fieldIndex, errorMessage };
   }
 }
 
@@ -144,8 +144,8 @@ export class FormRemoveErrorAction implements Action {
     fieldIndex: number,
   };
 
-  constructor(formId: string, fieldId: string, fieldIndex: number,) {
-    this.payload = {formId, fieldId, fieldIndex};
+  constructor(formId: string, fieldId: string, fieldIndex: number) {
+    this.payload = { formId, fieldId, fieldIndex };
   }
 }
 
@@ -156,7 +156,7 @@ export class FormClearErrorsAction implements Action {
   };
 
   constructor(formId: string) {
-    this.payload = {formId};
+    this.payload = { formId };
   }
 }
 
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 0410cfb5dd..9f3f6d3365 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -13,22 +13,20 @@
       (ngbEvent)="onCustomEvent($event)">
       <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
         <!--Array with repeatable items-->
-        <div *ngIf="(!context.notRepeatable) && !isVirtual(context, index)"
+        <div *ngIf="(!context.notRepeatable) && !isVirtual(context, index) && group.context.groups.length !== 1 && !isItemReadOnly(context, index)"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
             <button type="button" class="btn btn-secondary" role="button"
                     title="{{'form.remove' | translate}}"
                     attr.aria-label="{{'form.remove' | translate}}"
-                    (click)="removeItem($event, context, index)"
-                    [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
+                    (click)="removeItem($event, context, index)">
               <span><i class="fas fa-trash" aria-hidden="true"></i></span>
             </button>
         </div>
-        <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1)" class="clearfix pl-4 w-100">
+        <div *ngIf="(!context.notRepeatable) && index === (group.context.groups.length - 1) && !isItemReadOnly(context, index)" class="clearfix pl-4 w-100">
           <div class="btn-group" role="group">
             <button type="button" role="button" class="ds-form-add-more btn btn-link"
                     title="{{'form.add' | translate}}"
                     attr.aria-label="{{'form.add' | translate}}"
-                    [disabled]="isItemReadOnly(context, index)"
                     (click)="insertItem($event, group.context, group.context.groups.length)">
               <span><i class="fas fa-plus"></i> {{'form.add' | translate}}</span>
             </button>
@@ -60,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}}
+                    [disabled]="(isValid() | async) !== true">
+              <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..edbe1ab610 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -1,29 +1,47 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormArrayModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
   DynamicFormValidationService,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
-import { Store, StoreModule } from '@ngrx/store';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-
-import { FormComponent } from './form.component';
-import { FormService } from './form.service';
-import { FormBuilderService } from './builder/form-builder.service';
-import { FormState } from './form.reducer';
-import { FormChangeAction, FormStatusChangeAction } from './form.actions';
-import { StoreMock } from '../testing/store.mock';
-import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
-import { createTestComponent } from '../testing/utils.test';
 import { BehaviorSubject } from 'rxjs';
+
 import { storeModuleConfig } from '../../app.reducer';
+import { StoreMock } from '../testing/store.mock';
+import { createTestComponent } from '../testing/utils.test';
+import { FormBuilderService } from './builder/form-builder.service';
+import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
+import {
+  FormChangeAction,
+  FormStatusChangeAction,
+} from './form.actions';
+import { FormComponent } from './form.component';
+import { FormState } from './form.reducer';
+import { FormService } from './form.service';
 
 let TEST_FORM_MODEL;
 
@@ -42,12 +60,12 @@ function init() {
         label: 'Title',
         placeholder: 'Title',
         validators: {
-          required: null
+          required: null,
         },
         errorMessages: {
-          required: 'You must enter a main title for this item.'
-        }
-      }
+          required: 'You must enter a main title for this item.',
+        },
+      },
     ),
 
     new DynamicInputModel(
@@ -55,7 +73,7 @@ function init() {
         id: 'dc_title_alternative',
         label: 'Other Titles',
         placeholder: 'Other Titles',
-      }
+      },
     ),
 
     new DynamicInputModel(
@@ -63,7 +81,7 @@ function init() {
         id: 'dc_publisher',
         label: 'Publisher',
         placeholder: 'Publisher',
-      }
+      },
     ),
 
     new DynamicInputModel(
@@ -71,7 +89,7 @@ function init() {
         id: 'dc_identifier_citation',
         label: 'Citation',
         placeholder: 'Citation',
-      }
+      },
     ),
 
     new DynamicInputModel(
@@ -79,7 +97,7 @@ function init() {
         id: 'dc_identifier_issn',
         label: 'Identifiers',
         placeholder: 'Identifiers',
-      }
+      },
     ),
   ];
 
@@ -94,19 +112,19 @@ function init() {
           new DynamicInputModel({
             id: 'bootstrapArrayGroupInput',
             placeholder: 'example array group input',
-            readOnly: false
-          })
+            readOnly: false,
+          }),
         ];
-      }
-    })
+      },
+    }),
   ];
   config = {
     form: {
       validatorMap: {
         required: 'required',
-        regex: 'pattern'
-      }
-    }
+        regex: 'pattern',
+      },
+    },
   } as any;
 
   formState = {
@@ -116,12 +134,12 @@ function init() {
         dc_title_alternative: null,
         dc_publisher: null,
         dc_identifier_citation: null,
-        dc_identifier_issn: null
+        dc_identifier_issn: null,
       },
       valid: false,
       errors: [],
-      touched: {}
-    }
+      touched: {},
+    },
   };
 
 }
@@ -144,7 +162,7 @@ describe('FormComponent test suite', () => {
         ReactiveFormsModule,
         NgbModule,
         StoreModule.forRoot({}, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
@@ -156,9 +174,9 @@ describe('FormComponent test suite', () => {
         FormBuilderService,
         FormComponent,
         FormService,
-        { provide: Store, useClass: StoreMock }
+        { provide: Store, useClass: StoreMock },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -222,7 +240,7 @@ describe('FormComponent test suite', () => {
       const errors = [{
         fieldId: 'dc_title',
         fieldIndex: 0,
-        message: 'error.validation.required'
+        message: 'error.validation.required',
       }];
       formState.testForm.errors = errors;
       form.next(formState.testForm);
@@ -235,7 +253,7 @@ describe('FormComponent test suite', () => {
     it('should remove form errors when errors are empty in the state', () => {
       (formComp as any).formErrors = [{
         fieldId: 'dc_title',
-        message: 'error.validation.required'
+        message: 'error.validation.required',
       }];
       const errors = [];
 
@@ -254,7 +272,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'change'
+        type: 'change',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.change, 'emit');
@@ -272,7 +290,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'change'
+        type: 'change',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.change, 'emit');
@@ -289,7 +307,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'change'
+        type: 'change',
       } as DynamicFormControlEvent;
 
       formComp.emitChange = false;
@@ -307,7 +325,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'blur'
+        type: 'blur',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.blur, 'emit');
@@ -324,7 +342,7 @@ describe('FormComponent test suite', () => {
         control: formComp.formGroup.get('dc_title'),
         group: formComp.formGroup,
         model: formComp.formModel[0],
-        type: 'focus'
+        type: 'focus',
       } as DynamicFormControlEvent;
 
       spyOn(formComp.focus, 'emit');
@@ -439,7 +457,7 @@ describe('FormComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/form/form.component.ts b/src/app/shared/form/form.component.ts
index 7c16be7542..c449cee89d 100644
--- a/src/app/shared/form/form.component.ts
+++ b/src/app/shared/form/form.component.ts
@@ -1,8 +1,19 @@
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
-
-import { Observable, Subscription } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  AbstractControl,
+  UntypedFormArray,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormArrayModel,
   DynamicFormControlEvent,
@@ -10,14 +21,30 @@ import {
   DynamicFormGroupModel,
   DynamicFormLayout,
 } from '@ng-dynamic-forms/core';
-import { NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { findIndex } from 'lodash';
+import findIndex from 'lodash/findIndex';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
 
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNull,
+} from '../empty.util';
 import { FormBuilderService } from './builder/form-builder.service';
-import { hasValue, isNotEmpty, isNotNull, isNull } from '../empty.util';
-import { FormService } from './form.service';
-import { FormEntry, FormError } from './form.reducer';
 import { FormFieldMetadataValueObject } from './builder/models/form-field-metadata-value.model';
+import {
+  FormEntry,
+  FormError,
+} from './form.reducer';
+import { FormService } from './form.service';
 
 /**
  * The default form component.
@@ -26,7 +53,7 @@ import { FormFieldMetadataValueObject } from './builder/models/form-field-metada
   exportAs: 'formComponent',
   selector: 'ds-form',
   styleUrls: ['form.component.scss'],
-  templateUrl: 'form.component.html'
+  templateUrl: 'form.component.html',
 })
 export class FormComponent implements OnDestroy, OnInit {
 
@@ -68,7 +95,7 @@ export class FormComponent implements OnDestroy, OnInit {
    */
   @Input() formModel: DynamicFormControlModel[];
   @Input() parentFormModel: DynamicFormGroupModel | DynamicFormGroupModel[];
-  @Input() formGroup: FormGroup;
+  @Input() formGroup: UntypedFormGroup;
   @Input() formLayout = null as DynamicFormLayout;
 
   /* eslint-disable @angular-eslint/no-output-rename */
@@ -122,9 +149,9 @@ export class FormComponent implements OnDestroy, OnInit {
       }));
   }*/
 
-  private getFormGroup(): FormGroup {
-    if (!!this.parentFormModel) {
-      return this.formGroup.parent as FormGroup;
+  private getFormGroup(): UntypedFormGroup {
+    if (this.parentFormModel) {
+      return this.formGroup.parent as UntypedFormGroup;
     }
 
     return this.formGroup;
@@ -177,14 +204,14 @@ export class FormComponent implements OnDestroy, OnInit {
           errors
             .filter((error: FormError) => findIndex(this.formErrors, {
               fieldId: error.fieldId,
-              fieldIndex: error.fieldIndex
+              fieldIndex: error.fieldIndex,
             }) === -1)
             .forEach((error: FormError) => {
               const { fieldId } = error;
               const { fieldIndex } = error;
               let field: AbstractControl;
-              if (!!this.parentFormModel) {
-                field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as FormGroup, formModel, fieldIndex);
+              if (this.parentFormModel) {
+                field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as UntypedFormGroup, formModel, fieldIndex);
               } else {
                 field = this.formBuilderService.getFormControlById(fieldId, formGroup, formModel, fieldIndex);
               }
@@ -200,14 +227,14 @@ export class FormComponent implements OnDestroy, OnInit {
           this.formErrors
             .filter((error: FormError) => findIndex(errors, {
               fieldId: error.fieldId,
-              fieldIndex: error.fieldIndex
+              fieldIndex: error.fieldIndex,
             }) === -1)
             .forEach((error: FormError) => {
               const { fieldId } = error;
               const { fieldIndex } = error;
               let field: AbstractControl;
-              if (!!this.parentFormModel) {
-                field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as FormGroup, formModel, fieldIndex);
+              if (this.parentFormModel) {
+                field = this.formBuilderService.getFormControlById(fieldId, formGroup.parent as UntypedFormGroup, formModel, fieldIndex);
               } else {
                 field = this.formBuilderService.getFormControlById(fieldId, formGroup, formModel, fieldIndex);
               }
@@ -219,7 +246,7 @@ export class FormComponent implements OnDestroy, OnInit {
             });
           this.formErrors = errors;
           this.changeDetectorRef.detectChanges();
-        })
+        }),
     );
   }
 
@@ -254,7 +281,7 @@ export class FormComponent implements OnDestroy, OnInit {
 
   onBlur(event: DynamicFormControlEvent): void {
     this.blur.emit(event);
-    const control: FormControl = event.control;
+    const control: UntypedFormControl = event.control;
     const fieldIndex: number = (event.context && event.context.index) ? event.context.index : 0;
     if (control.valid) {
       this.formService.removeError(this.formId, event.model.name, fieldIndex);
@@ -280,7 +307,7 @@ export class FormComponent implements OnDestroy, OnInit {
       this.change.emit(event);
     }
 
-    const control: FormControl = event.control;
+    const control: UntypedFormControl = event.control;
     const fieldIndex: number = (event.context && event.context.index) ? event.context.index : 0;
     if (control.valid) {
       this.formService.removeError(this.formId, event.model.id, fieldIndex);
@@ -314,7 +341,7 @@ export class FormComponent implements OnDestroy, OnInit {
   }
 
   removeItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
-    const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as FormArray;
+    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)) {
       // In case of qualdrop value remove event must be dispatched before removing the control from array
@@ -329,7 +356,7 @@ export class FormComponent implements OnDestroy, OnInit {
   }
 
   insertItem($event, arrayContext: DynamicFormArrayModel, index: number): void {
-    const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as FormArray;
+    const formArrayControl = this.formGroup.get(this.formBuilderService.getPath(arrayContext)) as UntypedFormArray;
     this.formBuilderService.insertFormArrayGroup(index, formArrayControl, arrayContext);
     this.addArrayItem.emit(this.getEvent($event, arrayContext, index, 'add'));
     this.formService.changeForm(this.formId, this.formModel);
@@ -344,17 +371,17 @@ export class FormComponent implements OnDestroy, OnInit {
   protected getEvent($event: any, arrayContext: DynamicFormArrayModel, index: number, type: string): DynamicFormControlEvent {
     const context = arrayContext.groups[index];
     const itemGroupModel = context.context;
-    let group = this.formGroup.get(itemGroupModel.id) as FormGroup;
+    let group = this.formGroup.get(itemGroupModel.id) as UntypedFormGroup;
     if (isNull(group)) {
       for (const key of Object.keys(this.formGroup.controls)) {
-        group = this.formGroup.controls[key].get(itemGroupModel.id) as FormGroup;
+        group = this.formGroup.controls[key].get(itemGroupModel.id) as UntypedFormGroup;
         if (isNotNull(group)) {
           break;
         }
       }
     }
     const model = context.group[0] as DynamicFormControlModel;
-    const control = group.controls[index] as FormControl;
+    const control = group.controls[index] as UntypedFormControl;
     return { $event, context, control, group, model, type };
   }
 }
diff --git a/src/app/shared/form/form.module.ts b/src/app/shared/form/form.module.ts
index 62ab5bd647..5e3c26be92 100644
--- a/src/app/shared/form/form.module.ts
+++ b/src/app/shared/form/form.module.ts
@@ -1,35 +1,60 @@
-import { NgModule } from '@angular/core';
+import { CdkTreeModule } from '@angular/cdk/tree';
 import { CommonModule } from '@angular/common';
-import { FormComponent } from './form.component';
+import { NgModule } from '@angular/core';
+import {
+  NgbDatepickerModule,
+  NgbTimepickerModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  DYNAMIC_FORM_CONTROL_MAP_FN,
+  DynamicFormLayoutService,
+  DynamicFormsCoreModule,
+  DynamicFormService,
+  DynamicFormValidationService,
+} from '@ng-dynamic-forms/core';
+import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { NgxMaskModule } from 'ngx-mask';
+import { SortablejsModule } from 'ngx-sortablejs';
+
+import { SearchModule } from '../search/search.module';
+import { SharedModule } from '../shared.module';
 import { DsDynamicFormComponent } from './builder/ds-dynamic-form-ui/ds-dynamic-form.component';
 import {
   DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn
+  dsDynamicFormControlMapFn,
 } from './builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
-import { DsDynamicListComponent } from './builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
-import { DsDynamicLookupComponent } from './builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
-import { DsDynamicDisabledComponent } from './builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
-import { DsDynamicLookupRelationModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
-import { DsDynamicScrollableDropdownComponent } from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import { DsDynamicTagComponent } from './builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
-import { DsDynamicOneboxComponent } from './builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
-import { DsDynamicRelationGroupComponent } from './builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
-import { DsDatePickerComponent } from './builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
-import { DsDynamicFormGroupComponent } from './builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
-import { DsDynamicFormArrayComponent } from './builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
-import { DsDatePickerInlineComponent } from './builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
-import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
-import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
-import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
-import { SharedModule } from '../shared.module';
-import { TranslateModule } from '@ngx-translate/core';
-import { SearchModule } from '../search/search.module';
-import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
+import { DsDynamicTypeBindRelationService } from './builder/ds-dynamic-form-ui/ds-dynamic-type-bind-relation.service';
 import { ExistingMetadataListElementComponent } from './builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 import { ExistingRelationListElementComponent } from './builder/ds-dynamic-form-ui/existing-relation-list-element/existing-relation-list-element.component';
-import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { DsDynamicFormArrayComponent } from './builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component';
 import { CustomSwitchComponent } from './builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component';
-import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
+import { DsDatePickerComponent } from './builder/ds-dynamic-form-ui/models/date-picker/date-picker.component';
+import { DsDatePickerInlineComponent } from './builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component';
+import { DsDynamicDisabledComponent } from './builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
+import { DsDynamicFormGroupComponent } from './builder/ds-dynamic-form-ui/models/form-group/dynamic-form-group.component';
+import { DsDynamicListComponent } from './builder/ds-dynamic-form-ui/models/list/dynamic-list.component';
+import { DsDynamicLookupComponent } from './builder/ds-dynamic-form-ui/models/lookup/dynamic-lookup.component';
+import { DsDynamicOneboxComponent } from './builder/ds-dynamic-form-ui/models/onebox/dynamic-onebox.component';
+import { DsDynamicRelationGroupComponent } from './builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.components';
+import { DsDynamicScrollableDropdownComponent } from './builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
+import { DsDynamicTagComponent } from './builder/ds-dynamic-form-ui/models/tag/dynamic-tag.component';
+import { DsDynamicLookupRelationModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { ExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/external-source-entry-import-modal.component';
+import { ThemedExternalSourceEntryImportModalComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/external-source-entry-import-modal/themed-external-source-entry-import-modal.component';
+import { ThemedDynamicLookupRelationExternalSourceTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/themed-dynamic-lookup-relation-external-source-tab.component';
+import { DsDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+import { ThemedDynamicLookupRelationSearchTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/themed-dynamic-lookup-relation-search-tab.component';
+import { DsDynamicLookupRelationSelectionTabComponent } from './builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
+import { FormBuilderService } from './builder/form-builder.service';
+import { ChipsComponent } from './chips/chips.component';
+import { AuthorityConfidenceStateDirective } from './directives/authority-confidence-state.directive';
+import { FormComponent } from './form.component';
+import { FormService } from './form.service';
+import { NumberPickerComponent } from './number-picker/number-picker.component';
+import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component';
+import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal/vocabulary-treeview-modal.component';
 
 const COMPONENTS = [
   CustomSwitchComponent,
@@ -38,8 +63,10 @@ const COMPONENTS = [
   DsDynamicListComponent,
   DsDynamicLookupComponent,
   DsDynamicLookupRelationSearchTabComponent,
+  ThemedDynamicLookupRelationSearchTabComponent,
   DsDynamicLookupRelationSelectionTabComponent,
   DsDynamicLookupRelationExternalSourceTabComponent,
+  ThemedDynamicLookupRelationExternalSourceTabComponent,
   DsDynamicDisabledComponent,
   DsDynamicLookupRelationModalComponent,
   DsDynamicScrollableDropdownComponent,
@@ -53,12 +80,22 @@ const COMPONENTS = [
   ExistingMetadataListElementComponent,
   ExistingRelationListElementComponent,
   ExternalSourceEntryImportModalComponent,
-  FormComponent
+  FormComponent,
+  ChipsComponent,
+  NumberPickerComponent,
+  VocabularyTreeviewComponent,
+  VocabularyTreeviewModalComponent,
+  ThemedExternalSourceEntryImportModalComponent,
+];
+
+const DIRECTIVES = [
+  AuthorityConfidenceStateDirective,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
+    ...DIRECTIVES,
   ],
   imports: [
     CommonModule,
@@ -66,17 +103,29 @@ const COMPONENTS = [
     DynamicFormsNGBootstrapUIModule,
     SearchModule,
     SharedModule,
-    TranslateModule
+    TranslateModule,
+    SortablejsModule,
+    NgxMaskModule.forRoot(),
+    NgbDatepickerModule,
+    NgbTimepickerModule,
+    CdkTreeModule,
   ],
   exports: [
-    ...COMPONENTS
+    ...COMPONENTS,
+    ...DIRECTIVES,
   ],
   providers: [
     {
       provide: DYNAMIC_FORM_CONTROL_MAP_FN,
-      useValue: dsDynamicFormControlMapFn
-    }
-  ]
+      useValue: dsDynamicFormControlMapFn,
+    },
+    DynamicFormLayoutService,
+    DynamicFormService,
+    DynamicFormValidationService,
+    FormBuilderService,
+    DsDynamicTypeBindRelationService,
+    FormService,
+  ],
 })
 export class FormModule {
 }
diff --git a/src/app/shared/form/form.reducer.spec.ts b/src/app/shared/form/form.reducer.spec.ts
index dc85b3e0c3..d79d3404db 100644
--- a/src/app/shared/form/form.reducer.spec.ts
+++ b/src/app/shared/form/form.reducer.spec.ts
@@ -1,4 +1,3 @@
-import { formReducer } from './form.reducer';
 import {
   FormAddError,
   FormAddTouchedAction,
@@ -7,8 +6,9 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormStatusChangeAction,
 } from './form.actions';
+import { formReducer } from './form.reducer';
 
 describe('formReducer', () => {
 
@@ -19,19 +19,19 @@ describe('formReducer', () => {
           author: null,
           title: null,
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
     const formData = {
       author: null,
       title: null,
       date: null,
-      description: null
+      description: null,
     };
     const valid = false;
     const action = new FormInitAction(formId, formData, valid);
@@ -47,19 +47,19 @@ describe('formReducer', () => {
           author: null,
           title: null,
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
     const formData = {
       author: null,
       title: 'title',
       date: null,
-      description: null
+      description: null,
     };
     const state = {
       testForm: {
@@ -67,12 +67,12 @@ describe('formReducer', () => {
           author: null,
           title: 'title',
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const valid = false;
@@ -89,12 +89,12 @@ describe('formReducer', () => {
           author: null,
           title: null,
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const state = {
       testForm: {
@@ -102,19 +102,19 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
     const formData = {
       author: null,
       title: ['test'],
       date: null,
-      description: null
+      description: null,
     };
 
     const action = new FormChangeAction(formId, formData);
@@ -130,12 +130,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const state = {
       testForm: {
@@ -143,12 +143,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const formId = 'testForm';
 
@@ -165,20 +165,20 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const expectedErrors = [
       {
         fieldId: 'title',
         fieldIndex: 0,
-        message: 'Not valid'
-      }
+        message: 'Not valid',
+      },
     ];
 
     const formId = 'testForm';
@@ -199,31 +199,31 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [
           {
             fieldId: 'author',
             fieldIndex: 0,
-            message: 'error.validation.required'
+            message: 'error.validation.required',
           },
           {
             fieldId: 'title',
             fieldIndex: 0,
-            message: 'error.validation.required'
-          }
+            message: 'error.validation.required',
+          },
         ],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const expectedErrors = [
       {
         fieldId: 'title',
         fieldIndex: 0,
-        message: 'error.validation.required'
-      }
+        message: 'error.validation.required',
+      },
     ];
 
     const formId = 'testForm';
@@ -243,12 +243,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const formId = 'testForm';
@@ -266,18 +266,18 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: true,
         errors: [
           {
             fieldId: 'author',
             fieldIndex: 0,
-            message: 'error.validation.required'
-          }
+            message: 'error.validation.required',
+          },
         ],
-        touched: {}
-      }
+        touched: {},
+      },
     };
 
     const formId = 'testForm';
@@ -295,12 +295,12 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
-        touched: {}
-      }
+        touched: {},
+      },
     };
     const state = {
       testForm: {
@@ -308,14 +308,14 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
         touched: {
-          title: true
-        }
-      }
+          title: true,
+        },
+      },
     };
     const formId = 'testForm';
     const touched = ['title'];
@@ -333,14 +333,14 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
         touched: {
-          title: true
-        }
-      }
+          title: true,
+        },
+      },
     };
     const state = {
       testForm: {
@@ -348,15 +348,15 @@ describe('formReducer', () => {
           author: null,
           title: ['test'],
           date: null,
-          description: null
+          description: null,
         },
         valid: false,
         errors: [],
         touched: {
           title: true,
-          author: true
-        }
-      }
+          author: true,
+        },
+      },
     };
     const formId = 'testForm';
     const touched = ['author'];
diff --git a/src/app/shared/form/form.reducer.ts b/src/app/shared/form/form.reducer.ts
index 22094b2e5d..cacb4fd9fe 100644
--- a/src/app/shared/form/form.reducer.ts
+++ b/src/app/shared/form/form.reducer.ts
@@ -1,3 +1,7 @@
+import isEqual from 'lodash/isEqual';
+import uniqWith from 'lodash/uniqWith';
+
+import { hasValue } from '../empty.util';
 import {
   FormAction,
   FormActionTypes,
@@ -8,10 +12,8 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormStatusChangeAction,
 } from './form.actions';
-import { hasValue } from '../empty.util';
-import { isEqual, uniqWith } from 'lodash';
 
 export interface FormError {
   message: string;
@@ -83,19 +85,19 @@ function addFormErrors(state: FormState, action: FormAddError) {
     const error: FormError = {
       fieldId: action.payload.fieldId,
       fieldIndex: action.payload.fieldIndex,
-      message: action.payload.errorMessage
+      message: action.payload.errorMessage,
     };
     const metadata = action.payload.fieldId.replace(/\_/g, '.');
     const touched = Object.assign({}, state[formId].touched, {
-      [metadata]: true
+      [metadata]: true,
     });
     return Object.assign({}, state, {
       [formId]: {
         data: state[formId].data,
         valid: state[formId].valid,
         errors: state[formId].errors ? uniqWith(state[formId].errors.concat(error), isEqual) : [].concat(error),
-        touched
-      }
+        touched,
+      },
     });
   } else {
     return state;
@@ -109,7 +111,7 @@ function removeFormError(state: FormState, action: FormRemoveErrorAction) {
   if (hasValue(state[formId])) {
     const errors = state[formId].errors.filter((error) => error.fieldId !== fieldId || error.fieldIndex !== fieldIndex);
     const newState = Object.assign({}, state);
-    newState[formId] = Object.assign({}, state[formId], {errors});
+    newState[formId] = Object.assign({}, state[formId], { errors });
     return newState;
   } else {
     return state;
@@ -121,7 +123,7 @@ function clearsFormErrors(state: FormState, action: FormClearErrorsAction) {
   if (hasValue(state[formId])) {
     const errors = [];
     const newState = Object.assign({}, state);
-    newState[formId] = Object.assign({}, state[formId], {errors});
+    newState[formId] = Object.assign({}, state[formId], { errors });
     return newState;
   } else {
     return state;
@@ -147,7 +149,7 @@ function initForm(state: FormState, action: FormInitAction): FormState {
   };
   if (!hasValue(state[action.payload.formId])) {
     return Object.assign({}, state, {
-      [action.payload.formId]: formState
+      [action.payload.formId]: formState,
     });
   } else {
     const newState = Object.assign({}, state);
@@ -170,9 +172,9 @@ function changeDataForm(state: FormState, action: FormChangeAction): FormState {
   if (hasValue(state[action.payload.formId])) {
     const newState = Object.assign({}, state);
     newState[action.payload.formId] = Object.assign({}, newState[action.payload.formId], {
-        data: action.payload.formData,
-        valid: state[action.payload.formId].valid
-      }
+      data: action.payload.formData,
+      valid: state[action.payload.formId].valid,
+    },
     );
     return newState;
   } else {
@@ -195,15 +197,15 @@ function changeStatusForm(state: FormState, action: FormStatusChangeAction): For
     return Object.assign({}, state, {
       [action.payload.formId]: {
         data: state[action.payload.formId].data,
-        valid: action.payload.valid
-      }
+        valid: action.payload.valid,
+      },
     });
   } else {
     const newState = Object.assign({}, state);
     newState[action.payload.formId] = Object.assign({}, newState[action.payload.formId], {
-        data: state[action.payload.formId].data,
-        valid: action.payload.valid
-      }
+      data: state[action.payload.formId].data,
+      valid: action.payload.valid,
+    },
     );
     return newState;
   }
@@ -241,7 +243,7 @@ function changeTouchedState(state: FormState, action: FormAddTouchedAction): For
     const newForm = Object.assign({}, newState[action.payload.formId]);
     newState[action.payload.formId] = newForm;
 
-    newForm.touched = { ... newForm.touched};
+    newForm.touched = { ... newForm.touched };
     action.payload.touched.forEach((field) => newForm.touched[field] = true);
 
     return newState;
diff --git a/src/app/shared/form/form.service.spec.ts b/src/app/shared/form/form.service.spec.ts
index e565c8f219..a5c09c5854 100644
--- a/src/app/shared/form/form.service.spec.ts
+++ b/src/app/shared/form/form.service.spec.ts
@@ -1,39 +1,54 @@
-import { Store, StoreModule } from '@ngrx/store';
-import { inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { AbstractControl, FormControl, FormGroup, Validators } from '@angular/forms';
+import {
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  AbstractControl,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+  DynamicInputModel,
+} from '@ng-dynamic-forms/core';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 
-import { DynamicFormControlModel, DynamicFormGroupModel, DynamicInputModel } from '@ng-dynamic-forms/core';
-
-import { FormService } from './form.service';
-import { FormBuilderService } from './builder/form-builder.service';
 import { AppState } from '../../app.reducer';
-import { formReducer } from './form.reducer';
 import { getMockFormBuilderService } from '../mocks/form-builder-service.mock';
+import { FormBuilderService } from './builder/form-builder.service';
+import { formReducer } from './form.reducer';
+import { FormService } from './form.service';
 
 describe('FormService test suite', () => {
   const config = {
     form: {
       validatorMap: {
         required: 'required',
-        regex: 'pattern'
-      }
-    }
+        regex: 'pattern',
+      },
+    },
   } as any;
   const formId = 'testForm';
   let service: FormService;
   let builderService: FormBuilderService;
-  let formGroup: FormGroup;
+  let formGroup: UntypedFormGroup;
 
   const formModel: DynamicFormControlModel[] = [
     new DynamicInputModel({ id: 'author', value: 'test' }),
     new DynamicInputModel({
       id: 'title',
       validators: {
-        required: null
+        required: null,
       },
       errorMessages: {
-        required: 'Title is required'
-      }
+        required: 'Title is required',
+      },
     }),
     new DynamicInputModel({ id: 'date' }),
     new DynamicInputModel({ id: 'description' }),
@@ -45,21 +60,21 @@ describe('FormService test suite', () => {
 
           id: 'zipCode',
           label: 'Zip Code',
-          placeholder: 'ZIP'
+          placeholder: 'ZIP',
         }),
         new DynamicInputModel({
 
           id: 'state',
           label: 'State',
-          placeholder: 'State'
+          placeholder: 'State',
         }),
         new DynamicInputModel({
 
           id: 'city',
           label: 'City',
-          placeholder: 'City'
-        })
-      ]
+          placeholder: 'City',
+        }),
+      ],
     }),
   ];
 
@@ -73,16 +88,16 @@ describe('FormService test suite', () => {
     addressLocation: {
       zipCode: null,
       state: null,
-      city: null
-    }
+      city: null,
+    },
   };
   const formState = {
     testForm: {
       data: formData,
       valid: false,
       errors: [],
-      touched: {}
-    }
+      touched: {},
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -91,34 +106,34 @@ describe('FormService test suite', () => {
         StoreModule.forRoot({ formReducer }, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
-        })
-      ]
+            strictActionImmutability: false,
+          },
+        }),
+      ],
     }).compileComponents();
   }));
 
   beforeEach(inject([Store], (store: Store<AppState>) => {
-      builderService = getMockFormBuilderService();
-      store
-        .subscribe((state) => {
-          state.forms = formState;
-        });
-      const author: AbstractControl = new FormControl('test');
-      const title: AbstractControl = new FormControl(undefined, Validators.required);
-      const date: AbstractControl = new FormControl(undefined);
-      const description: AbstractControl = new FormControl(undefined);
-
-      const addressLocation: FormGroup = new FormGroup({
-        zipCode: new FormControl(undefined),
-        state: new FormControl(undefined),
-        city: new FormControl(undefined),
+    builderService = getMockFormBuilderService();
+    store
+      .subscribe((state) => {
+        state.forms = formState;
       });
+    const author: AbstractControl = new UntypedFormControl('test');
+    const title: AbstractControl = new UntypedFormControl(undefined, Validators.required);
+    const date: AbstractControl = new UntypedFormControl(undefined);
+    const description: AbstractControl = new UntypedFormControl(undefined);
 
-      formGroup = new FormGroup({ author, title, date, description, addressLocation });
-      controls = { author, title, date, description , addressLocation };
-      service = new FormService(builderService, store);
-    })
+    const addressLocation: UntypedFormGroup = new UntypedFormGroup({
+      zipCode: new UntypedFormControl(undefined),
+      state: new UntypedFormControl(undefined),
+      city: new UntypedFormControl(undefined),
+    });
+
+    formGroup = new UntypedFormGroup({ author, title, date, description, addressLocation });
+    controls = { author, title, date, description , addressLocation };
+    service = new FormService(builderService, store);
+  }),
   )
   ;
 
diff --git a/src/app/shared/form/form.service.ts b/src/app/shared/form/form.service.ts
index c4d6003abd..35da58f5f6 100644
--- a/src/app/shared/form/form.service.ts
+++ b/src/app/shared/form/form.service.ts
@@ -1,15 +1,34 @@
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { AbstractControl, FormArray, FormControl, FormGroup } from '@angular/forms';
+import {
+  AbstractControl,
+  UntypedFormArray,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  DynamicFormControlEvent,
+  DynamicFormControlModel,
+  DynamicFormGroupModel,
+} from '@ng-dynamic-forms/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import uniqueId from 'lodash/uniqueId';
 import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
 
+import { environment } from '../../../environments/environment';
 import { AppState } from '../../app.reducer';
-import { formObjectFromIdSelector } from './selectors';
+import {
+  isEmpty,
+  isNotUndefined,
+} from '../empty.util';
 import { FormBuilderService } from './builder/form-builder.service';
-import { DynamicFormControlEvent, DynamicFormControlModel, DynamicFormGroupModel } from '@ng-dynamic-forms/core';
-import { isEmpty, isNotUndefined } from '../empty.util';
-import { uniqueId } from 'lodash';
 import {
   FormAddError,
   FormAddTouchedAction,
@@ -17,10 +36,14 @@ import {
   FormInitAction,
   FormRemoveAction,
   FormRemoveErrorAction,
-  FormStatusChangeAction
+  FormStatusChangeAction,
 } from './form.actions';
-import { FormEntry, FormError, FormTouchedState } from './form.reducer';
-import { environment } from '../../../environments/environment';
+import {
+  FormEntry,
+  FormError,
+  FormTouchedState,
+} from './form.reducer';
+import { formObjectFromIdSelector } from './selectors';
 
 @Injectable()
 export class FormService {
@@ -38,7 +61,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.valid),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -50,7 +73,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.data),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -62,7 +85,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.touched),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -74,7 +97,7 @@ export class FormService {
       select(formObjectFromIdSelector(formId)),
       filter((state) => isNotUndefined(state)),
       map((state) => state.errors),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -85,7 +108,7 @@ export class FormService {
     return this.store.pipe(
       select(formObjectFromIdSelector(formId)),
       distinctUntilChanged(),
-      map((state) => isNotUndefined(state))
+      map((state) => isNotUndefined(state)),
     );
   }
 
@@ -96,13 +119,13 @@ export class FormService {
   /**
    * Method to validate form's fields
    */
-  public validateAllFormFields(formGroup: FormGroup | FormArray) {
+  public validateAllFormFields(formGroup: UntypedFormGroup | UntypedFormArray) {
     Object.keys(formGroup.controls).forEach((field) => {
       const control = formGroup.get(field);
-      if (control instanceof FormControl) {
+      if (control instanceof UntypedFormControl) {
         control.markAsTouched({ onlySelf: true });
         control.markAsDirty({ onlySelf: true });
-      } else if (control instanceof FormGroup || control instanceof FormArray) {
+      } else if (control instanceof UntypedFormGroup || control instanceof UntypedFormArray) {
         this.validateAllFormFields(control);
       }
     });
@@ -112,14 +135,14 @@ export class FormService {
    * Check if form group has an invalid form control
    * @param formGroup The form group to check
    */
-  public hasValidationErrors(formGroup: FormGroup | FormArray): boolean {
+  public hasValidationErrors(formGroup: UntypedFormGroup | UntypedFormArray): boolean {
     let hasErrors = false;
     const fields: string[] = Object.keys(formGroup.controls);
     for (const field of fields) {
       const control = formGroup.get(field);
-      if (control instanceof FormControl) {
+      if (control instanceof UntypedFormControl) {
         hasErrors = !control.valid && control.touched;
-      } else if (control instanceof FormGroup || control instanceof FormArray) {
+      } else if (control instanceof UntypedFormGroup || control instanceof UntypedFormArray) {
         hasErrors = this.hasValidationErrors(control);
       }
       if (hasErrors) {
@@ -162,7 +185,7 @@ export class FormService {
     }
 
     // if the field in question is a concat group, pass down the error to its fields
-    if (field instanceof FormGroup && model instanceof DynamicFormGroupModel && this.formBuilderService.isConcatGroup(model)) {
+    if (field instanceof UntypedFormGroup && model instanceof DynamicFormGroupModel && this.formBuilderService.isConcatGroup(model)) {
       model.group.forEach((subModel) => {
         const subField = field.controls[subModel.id];
 
@@ -183,7 +206,7 @@ export class FormService {
     }
 
     // if the field in question is a concat group, clear the error from its fields
-    if (field instanceof FormGroup && model instanceof DynamicFormGroupModel && this.formBuilderService.isConcatGroup(model)) {
+    if (field instanceof UntypedFormGroup && model instanceof DynamicFormGroupModel && this.formBuilderService.isConcatGroup(model)) {
       model.group.forEach((subModel) => {
         const subField = field.controls[subModel.id];
 
@@ -194,7 +217,7 @@ export class FormService {
     field.markAsUntouched();
   }
 
-  public resetForm(formGroup: FormGroup, groupModel: DynamicFormControlModel[], formId: string) {
+  public resetForm(formGroup: UntypedFormGroup, groupModel: DynamicFormControlModel[], formId: string) {
     this.formBuilderService.clearAllModelsValue(groupModel);
     formGroup.reset();
     this.store.dispatch(new FormChangeAction(formId, formGroup.value));
diff --git a/src/app/shared/number-picker/number-picker.component.html b/src/app/shared/form/number-picker/number-picker.component.html
similarity index 81%
rename from src/app/shared/number-picker/number-picker.component.html
rename to src/app/shared/form/number-picker/number-picker.component.html
index 9b2ef98925..12e29fa70e 100644
--- a/src/app/shared/number-picker/number-picker.component.html
+++ b/src/app/shared/form/number-picker/number-picker.component.html
@@ -6,7 +6,7 @@
       [disabled]="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,6 +24,7 @@
       [disabled]="disabled"
       [ngClass]="{'is-invalid': invalid}"
       title="{{placeholder}}"
+      [attr.aria-label]="placeholder"
     >
     <button
       class="btn btn-link-focus"
@@ -32,6 +33,6 @@
       [disabled]="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/number-picker/number-picker.component.scss b/src/app/shared/form/number-picker/number-picker.component.scss
similarity index 100%
rename from src/app/shared/number-picker/number-picker.component.scss
rename to src/app/shared/form/number-picker/number-picker.component.scss
diff --git a/src/app/shared/number-picker/number-picker.component.spec.ts b/src/app/shared/form/number-picker/number-picker.component.spec.ts
similarity index 88%
rename from src/app/shared/number-picker/number-picker.component.spec.ts
rename to src/app/shared/form/number-picker/number-picker.component.spec.ts
index 0cc073644e..4257a0371f 100644
--- a/src/app/shared/number-picker/number-picker.component.spec.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.spec.ts
@@ -1,13 +1,25 @@
 // 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 { UploaderService } from '../uploader/uploader.service';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { createTestComponent } from '../../testing/utils.test';
 import { NumberPickerComponent } from './number-picker.component';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { createTestComponent } from '../testing/utils.test';
 
 describe('NumberPickerComponent test suite', () => {
 
@@ -24,7 +36,8 @@ describe('NumberPickerComponent test suite', () => {
       imports: [
         FormsModule,
         ReactiveFormsModule,
-        NgbModule
+        NgbModule,
+        TranslateModule.forRoot(),
       ],
       declarations: [
         NumberPickerComponent,
@@ -33,9 +46,8 @@ describe('NumberPickerComponent test suite', () => {
       providers: [
         ChangeDetectorRef,
         NumberPickerComponent,
-        UploaderService
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -44,7 +56,6 @@ describe('NumberPickerComponent test suite', () => {
   beforeEach(() => {
     html = `
       <ds-number-picker
-        tabindex="1"
         [disabled]="disabled"
         [min]="min"
         [max]="max"
@@ -149,7 +160,7 @@ describe('NumberPickerComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/number-picker/number-picker.component.ts b/src/app/shared/form/number-picker/number-picker.component.ts
similarity index 81%
rename from src/app/shared/number-picker/number-picker.component.ts
rename to src/app/shared/form/number-picker/number-picker.component.ts
index 465e905713..353e8c820a 100644
--- a/src/app/shared/number-picker/number-picker.component.ts
+++ b/src/app/shared/form/number-picker/number-picker.component.ts
@@ -1,13 +1,27 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnInit, Output, SimpleChanges, } from '@angular/core';
-import { ControlValueAccessor, FormBuilder, NG_VALUE_ACCESSOR } from '@angular/forms';
-import { isEmpty } from '../empty.util';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+  UntypedFormBuilder,
+} from '@angular/forms';
+import { TranslateService } from '@ngx-translate/core';
+
+import { isEmpty } from '../../empty.util';
 
 @Component({
   selector: 'ds-number-picker',
   styleUrls: ['./number-picker.component.scss'],
   templateUrl: './number-picker.component.html',
   providers: [
-    {provide: NG_VALUE_ACCESSOR, useExisting: NumberPickerComponent, multi: true}
+    { provide: NG_VALUE_ACCESSOR, useExisting: NumberPickerComponent, multi: true },
   ],
 })
 
@@ -31,7 +45,9 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
   startValue: number;
 
-  constructor(private fb: FormBuilder, private cd: ChangeDetectorRef) {
+  constructor(private fb: UntypedFormBuilder,
+              private cd: ChangeDetectorRef,
+              private translate: TranslateService) {
   }
 
   ngOnInit() {
@@ -54,7 +70,7 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
 
     } else if (changes.value && changes.value.currentValue === null) {
       // When the user delete the inserted value
-        this.value = null;
+      this.value = null;
     } else if (changes.invalid) {
       this.invalid = changes.invalid.currentValue;
     }
@@ -103,13 +119,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;
     }
@@ -139,6 +154,6 @@ export class NumberPickerComponent implements OnInit, ControlValueAccessor {
   }
 
   emitChange() {
-    this.change.emit({field: this.name, value: this.value});
+    this.change.emit({ field: this.name, value: this.value });
   }
 }
diff --git a/src/app/shared/form/selectors.ts b/src/app/shared/form/selectors.ts
index aeefb5f984..95fdb19178 100644
--- a/src/app/shared/form/selectors.ts
+++ b/src/app/shared/form/selectors.ts
@@ -1,7 +1,13 @@
-import { createSelector, MemoizedSelector } from '@ngrx/store';
+import {
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
 
 import { AppState } from '../../app.reducer';
-import { FormEntry, FormState } from './form.reducer';
+import {
+  FormEntry,
+  FormState,
+} from './form.reducer';
 
 export const formStateSelector = (state: AppState) => state.forms;
 
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
new file mode 100644
index 0000000000..71eb8e1476
--- /dev/null
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.html
@@ -0,0 +1,16 @@
+<div class="modal-header">
+  <h4 class="modal-title">{{'vocabulary-treeview.header' | translate}}</h4>
+  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
+    <span aria-hidden="true">&times;</span>
+  </button>
+</div>
+<div class="modal-body">
+  <div class="p-3">
+    <ds-vocabulary-treeview [vocabularyOptions]="vocabularyOptions"
+                            [preloadLevel]="preloadLevel"
+                            [selectedItems]="selectedItems"
+                            [multiSelect]="multiSelect"
+                            (select)="onSelect($event)">
+    </ds-vocabulary-treeview>
+  </div>
+</div>
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.scss b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
new file mode 100644
index 0000000000..53b265a2b6
--- /dev/null
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.spec.ts
@@ -0,0 +1,36 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { VocabularyTreeviewModalComponent } from './vocabulary-treeview-modal.component';
+
+describe('VocabularyTreeviewModalComponent', () => {
+  let component: VocabularyTreeviewModalComponent;
+  let fixture: ComponentFixture<VocabularyTreeviewModalComponent>;
+
+  const modalStub = jasmine.createSpyObj('modalStub', ['close']);
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [ TranslateModule.forRoot() ],
+      declarations: [ VocabularyTreeviewModalComponent ],
+      providers: [
+        { provide: NgbActiveModal, useValue: modalStub },
+      ],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(VocabularyTreeviewModalComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts
new file mode 100644
index 0000000000..2bfc84542a
--- /dev/null
+++ b/src/app/shared/form/vocabulary-treeview-modal/vocabulary-treeview-modal.component.ts
@@ -0,0 +1,64 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+
+@Component({
+  selector: 'ds-vocabulary-treeview-modal',
+  templateUrl: './vocabulary-treeview-modal.component.html',
+  styleUrls: ['./vocabulary-treeview-modal.component.scss'],
+})
+/**
+ * Component that contains a modal to display a VocabularyTreeviewComponent
+ */
+export class VocabularyTreeviewModalComponent {
+
+  /**
+   * The {@link VocabularyOptions} object
+   */
+  @Input() vocabularyOptions: VocabularyOptions;
+
+  /**
+   * Representing how many tree level load at initialization
+   */
+  @Input() preloadLevel = 2;
+
+  /**
+   * The vocabulary entries already selected, if any
+   */
+  @Input() selectedItems: string[] = [];
+
+  /**
+   * Whether to allow selecting multiple values with checkboxes
+   */
+  @Input() multiSelect = false;
+
+  /**
+   * An event fired when a vocabulary entry is selected.
+   * Event's payload equals to {@link VocabularyEntryDetail} selected.
+   */
+  @Output() select: EventEmitter<VocabularyEntryDetail> = new EventEmitter<VocabularyEntryDetail>(null);
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {NgbActiveModal} activeModal
+   */
+  constructor(
+    public activeModal: NgbActiveModal,
+  ) { }
+
+  /**
+   * Method called on entry select
+   */
+  onSelect(item: VocabularyEntryDetail) {
+    this.select.emit(item);
+    this.activeModal.close(item);
+  }
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
similarity index 90%
rename from src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
index 23ac6fcf8f..5c6279aa0d 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flat-data-source.ts
@@ -1,8 +1,15 @@
-import { CollectionViewer, DataSource } from '@angular/cdk/collections';
+import {
+  CollectionViewer,
+  DataSource,
+} from '@angular/cdk/collections';
 import { FlatTreeControl } from '@angular/cdk/tree';
-
-import { BehaviorSubject, merge, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  merge,
+  Observable,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
 
 /**
@@ -36,7 +43,7 @@ export class VocabularyTreeFlatDataSource<T, F> extends DataSource<F> {
     const changes = [
       collectionViewer.viewChange,
       this._treeControl.expansionModel.changed,
-      this._flattenedData
+      this._flattenedData,
     ];
     return merge<any>(...changes).pipe(map((): F[] => {
       this._expandedData.next(
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-tree-flattener.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts
similarity index 96%
rename from src/app/shared/vocabulary-treeview/vocabulary-tree-flattener.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts
index 419f48d222..734e2cf460 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-tree-flattener.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-tree-flattener.ts
@@ -1,5 +1,4 @@
 import { TreeControl } from '@angular/cdk/tree';
-
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
 
@@ -46,7 +45,7 @@ export class VocabularyTreeFlattener<T, F> {
                 Observable<T[]> | T[] | undefined | null) {}
 
   _flattenNode(node: T, level: number,
-               resultNodes: F[], parentMap: boolean[]): F[] {
+    resultNodes: F[], parentMap: boolean[]): F[] {
     const flatNode = this.transformFunction(node, level);
     resultNodes.push(flatNode);
 
@@ -66,7 +65,7 @@ export class VocabularyTreeFlattener<T, F> {
   }
 
   _flattenChildren(children: T[], level: number,
-                   resultNodes: F[], parentMap: boolean[]): void {
+    resultNodes: F[], parentMap: boolean[]): void {
     children.forEach((child, index) => {
       const childParentMap: boolean[] = parentMap.slice();
       childParentMap.push(index !== children.length - 1);
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview-node.model.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts
similarity index 77%
rename from src/app/shared/vocabulary-treeview/vocabulary-treeview-node.model.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts
index 63039e6c75..c4dc5fb1fd 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview-node.model.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview-node.model.ts
@@ -1,7 +1,8 @@
 /* eslint-disable max-classes-per-file */
 import { BehaviorSubject } from 'rxjs';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { PageInfo } from '../../core/shared/page-info.model';
+
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
 export const LOAD_MORE = 'LOAD_MORE';
 export const LOAD_MORE_ROOT = 'LOAD_MORE_ROOT';
@@ -21,7 +22,8 @@ export class TreeviewNode {
               public pageInfo: PageInfo = new PageInfo(),
               public loadMoreParentItem: VocabularyEntryDetail | null = null,
               public isSearchNode = false,
-              public isInInitValueHierarchy = false) {
+              public isInInitValueHierarchy = false,
+              public isSelected = false) {
   }
 
   updatePageInfo(pageInfo: PageInfo) {
@@ -38,7 +40,8 @@ export class TreeviewFlatNode {
               public pageInfo: PageInfo = new PageInfo(),
               public loadMoreParentItem: VocabularyEntryDetail | null = null,
               public isSearchNode = false,
-              public isInInitValueHierarchy = false) {
+              public isInInitValueHierarchy = false,
+              public isSelected = false) {
   }
 }
 
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
new file mode 100644
index 0000000000..2baafc9d1d
--- /dev/null
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -0,0 +1,101 @@
+<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()"
+             [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()">
+          {{'vocabulary-treeview.search.form.search' | translate}}
+        </button>
+        <button class="btn btn-outline-secondary" type="button" (click)="reset()">
+          {{'vocabulary-treeview.search.form.reset' | translate}}
+        </button>
+        <button class="btn btn-outline-primary" type="button" (click)="add()" [disabled]="this.vocabularyOptions.closed">
+          {{'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>
+  <h2 *ngIf="(loading | async) !== true && dataSource.data.length === 0" class="h4 text-center text-muted mt-4" >
+    <span>{{'vocabulary-treeview.search.no-result' | translate}}</span>
+  </h2>
+  <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
+    <!-- Leaf node -->
+    <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
+      <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"
+                 [openDelay]="500"
+                 container="body"
+          >
+            <input class="mr-2" type="checkbox"
+                   [disabled]="!node.item?.selectable"
+                   [(ngModel)]="node.isSelected"
+                   [checked]="node.isSelected"
+                   (change)="onSelect(node.item)"
+            >
+            <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"
+                  [ngbTooltip]="node.item?.otherInformation?.note"
+                  [openDelay]="500"
+                  container="body"
+                  (click)="onSelect(node.item)">
+          <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 px-2 mr-1" cdkTreeNodeToggle
+                [attr.aria-label]="'toggle ' + node.name"
+                (click)="loadChildren(node)">
+          <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"
+                [class.text-success]="node.isSelected"
+                [ngbTooltip]="node.item?.otherInformation?.note"
+                [openDelay]="500"
+                container="body">
+            <input class="mr-2" type="checkbox"
+                   [disabled]="!node.item?.selectable"
+                   [(ngModel)]="node.isSelected"
+                   [checked]="node.isSelected"
+                   (change)="onSelect(node.item)"
+            >
+            <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"
+                  [ngbTooltip]="node.item?.otherInformation?.note"
+                  [openDelay]="500"
+                  container="body"
+                  (click)="onSelect(node.item)">
+            <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)">
+        {{'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)">
+        {{'vocabulary-treeview.load-more' | translate}}...
+      </button>
+    </cdk-tree-node>
+  </cdk-tree>
+</div>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
new file mode 100644
index 0000000000..3d32acac5b
--- /dev/null
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.scss
@@ -0,0 +1,7 @@
+::ng-deep .tooltip-inner {
+  text-align:left;
+}
+
+label {
+  cursor: pointer;
+}
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
similarity index 66%
rename from src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
index 1bdf4b9df7..52cfd9bd3f 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.spec.ts
@@ -1,25 +1,38 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
 import { CdkTreeModule } from '@angular/cdk/tree';
-
-import { of as observableOf } from 'rxjs';
-import { StoreModule } from '@ngrx/store';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { createTestComponent } from '../testing/utils.test';
+import { storeModuleConfig } from '../../../app.reducer';
+import { authReducer } from '../../../core/auth/auth.reducer';
+import { AuthTokenInfo } from '../../../core/auth/models/auth-token-info.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
+import { createTestComponent } from '../../testing/utils.test';
+import { FormFieldMetadataValueObject } from '../builder/models/form-field-metadata-value.model';
 import { VocabularyTreeviewComponent } from './vocabulary-treeview.component';
 import { VocabularyTreeviewService } from './vocabulary-treeview.service';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { TreeviewFlatNode } from './vocabulary-treeview-node.model';
-import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
-import { authReducer } from '../../core/auth/auth.reducer';
-import { storeModuleConfig } from '../../app.reducer';
+import {
+  TreeviewFlatNode,
+  TreeviewNode,
+} from './vocabulary-treeview-node.model';
 
 describe('VocabularyTreeviewComponent test suite', () => {
 
@@ -27,6 +40,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
   let compAsAny: any;
   let fixture: ComponentFixture<VocabularyTreeviewComponent>;
   let initialState;
+  let de;
 
   const item = new VocabularyEntryDetail();
   item.id = 'node1';
@@ -47,6 +61,14 @@ describe('VocabularyTreeviewComponent test suite', () => {
     restoreNodes: jasmine.createSpy('restoreNodes'),
     cleanTree: jasmine.createSpy('cleanTree'),
   });
+  const vocabularyServiceStub = jasmine.createSpyObj('VocabularyService', {
+    getVocabularyEntriesByValue: jasmine.createSpy('getVocabularyEntriesByValue'),
+    getEntryDetailParent: jasmine.createSpy('getEntryDetailParent'),
+    findEntryDetailById: jasmine.createSpy('findEntryDetailById'),
+    searchTopEntries: jasmine.createSpy('searchTopEntries'),
+    getEntryDetailChildren: jasmine.createSpy('getEntryDetailChildren'),
+    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests'),
+  });
 
   initialState = {
     core: {
@@ -57,9 +79,9 @@ describe('VocabularyTreeviewComponent test suite', () => {
         loading: false,
         authToken: new AuthTokenInfo('test_token'),
         userId: 'testid',
-        authMethods: []
-      }
-    }
+        authMethods: [],
+      },
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -67,20 +89,21 @@ describe('VocabularyTreeviewComponent test suite', () => {
       imports: [
         CdkTreeModule,
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         VocabularyTreeviewComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: VocabularyTreeviewService, useValue: vocabularyTreeviewServiceStub },
+        { provide: VocabularyService, useValue: vocabularyServiceStub },
         { provide: NgbActiveModal, useValue: modalStub },
         provideMockStore({ initialState }),
         ChangeDetectorRef,
-        VocabularyTreeviewComponent
+        VocabularyTreeviewComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then(() => {
       vocabularyTreeviewServiceStub.getData.and.returnValue(observableOf([]));
       vocabularyTreeviewServiceStub.isLoading.and.returnValue(observableOf(false));
@@ -117,13 +140,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       comp = fixture.componentInstance;
       compAsAny = comp;
       comp.vocabularyOptions = vocabularyOptions;
-      comp.selectedItem = null;
-    });
-
-    afterEach(() => {
-      fixture.destroy();
-      comp = null;
-      compAsAny = null;
+      comp.selectedItems = [];
     });
 
     it('should should init component properly', () => {
@@ -136,44 +153,44 @@ describe('VocabularyTreeviewComponent test suite', () => {
       const currentValue = new FormFieldMetadataValueObject();
       currentValue.value = 'testValue';
       currentValue.otherInformation = {
-        id: 'entryID'
+        id: 'entryID',
       };
-      comp.selectedItem = currentValue;
+      comp.selectedItems = [currentValue.value];
       fixture.detectChanges();
       expect(comp.dataSource.data).toEqual([]);
-      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID');
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), ['testValue'], null);
     });
 
     it('should should init component properly with init value as VocabularyEntry', () => {
       const currentValue = new VocabularyEntry();
       currentValue.value = 'testValue';
       currentValue.otherInformation = {
-        id: 'entryID'
+        id: 'entryID',
       };
-      comp.selectedItem = currentValue;
+      comp.selectedItems = [currentValue.value];
       fixture.detectChanges();
       expect(comp.dataSource.data).toEqual([]);
-      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), 'entryID');
+      expect(vocabularyTreeviewServiceStub.initialize).toHaveBeenCalledWith(comp.vocabularyOptions, new PageInfo(), ['testValue'], null);
     });
 
     it('should call loadMore function', () => {
       comp.loadMore(item);
       fixture.detectChanges();
-      expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(item);
+      expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(item, []);
     });
 
     it('should call loadMoreRoot function', () => {
       const node = new TreeviewFlatNode(item);
       comp.loadMoreRoot(node);
       fixture.detectChanges();
-      expect(vocabularyTreeviewServiceStub.loadMoreRoot).toHaveBeenCalledWith(node);
+      expect(vocabularyTreeviewServiceStub.loadMoreRoot).toHaveBeenCalledWith(node, []);
     });
 
     it('should call loadChildren function', () => {
       const node = new TreeviewFlatNode(item);
       comp.loadChildren(node);
       fixture.detectChanges();
-      expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(node.item, true);
+      expect(vocabularyTreeviewServiceStub.loadMore).toHaveBeenCalledWith(node.item, [], true);
     });
 
     it('should emit select event', () => {
@@ -188,7 +205,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       comp.nodeMap.set('test', new TreeviewFlatNode(item));
       comp.search();
       fixture.detectChanges();
-      expect(vocabularyTreeviewServiceStub.searchByQuery).toHaveBeenCalledWith('test search');
+      expect(vocabularyTreeviewServiceStub.searchByQuery).toHaveBeenCalledWith('test search', []);
       expect(comp.storedNodeMap).toEqual(nodeMap);
       expect(comp.nodeMap).toEqual(emptyNodeMap);
     });
@@ -199,7 +216,7 @@ describe('VocabularyTreeviewComponent test suite', () => {
       comp.storedNodeMap.set('test', new TreeviewFlatNode(item2));
       comp.search();
       fixture.detectChanges();
-      expect(vocabularyTreeviewServiceStub.searchByQuery).toHaveBeenCalledWith('test search');
+      expect(vocabularyTreeviewServiceStub.searchByQuery).toHaveBeenCalledWith('test search', []);
       expect(comp.storedNodeMap).toEqual(storedNodeMap);
       expect(comp.nodeMap).toEqual(emptyNodeMap);
     });
@@ -229,12 +246,56 @@ describe('VocabularyTreeviewComponent test suite', () => {
       expect(vocabularyTreeviewServiceStub.cleanTree).toHaveBeenCalled();
     });
   });
+
+  describe('', () => {
+    beforeEach(() => {
+      vocabularyTreeviewServiceStub.getData.and.returnValue(observableOf([
+        {
+          'item': {
+            'id': 'srsc:SCB11',
+            'display': 'HUMANITIES and RELIGION',
+          },
+        } as TreeviewNode,
+        {
+          'item': {
+            'id': 'srsc:SCB12',
+            'display': 'LAW/JURISPRUDENCE',
+          },
+        } as TreeviewNode,
+        {
+          'item': {
+            'id': 'srsc:SCB13',
+            'display': 'SOCIAL SCIENCES',
+          },
+        } as TreeviewNode,
+      ]));
+      fixture = TestBed.createComponent(VocabularyTreeviewComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      comp.vocabularyOptions = vocabularyOptions;
+      comp.selectedItems = [];
+      de = fixture.debugElement;
+    });
+
+    it('should not display checkboxes by default', async () => {
+      fixture.detectChanges();
+      expect(de.query(By.css('input[type=checkbox]'))).toBeNull();
+      expect(de.queryAll(By.css('cdk-tree-node')).length).toEqual(3);
+    });
+
+    it('should display checkboxes if multiSelect is true', async () => {
+      comp.multiSelect = true;
+      fixture.detectChanges();
+      expect(de.queryAll(By.css('input[type=checkbox]')).length).toEqual(3);
+      expect(de.queryAll(By.css('cdk-tree-node')).length).toEqual(3);
+    });
+  });
 });
 
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
similarity index 67%
rename from src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
index 9850947f60..c2364ac87a 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.ts
@@ -1,33 +1,53 @@
 import { FlatTreeControl } from '@angular/cdk/tree';
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, find, startWith } from 'rxjs/operators';
-import { Observable, Subscription } from 'rxjs';
-import { select, Store } from '@ngrx/store';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
 
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { isAuthenticated } from '../../core/auth/selectors';
-import { VocabularyTreeviewService } from './vocabulary-treeview.service';
-import { LOAD_MORE, LOAD_MORE_ROOT, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
+import { CoreState } from '../../../core/core-state.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
+import { AlertType } from '../../alert/alert-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
 import { VocabularyTreeFlatDataSource } from './vocabulary-tree-flat-data-source';
-import { CoreState } from '../../core/core-state.model';
+import { VocabularyTreeFlattener } from './vocabulary-tree-flattener';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import {
+  LOAD_MORE,
+  LOAD_MORE_ROOT,
+  TreeviewFlatNode,
+  TreeviewNode,
+} from './vocabulary-treeview-node.model';
 
 /**
- * Component that show a hierarchical vocabulary in a tree view
+ * Component that shows a hierarchical vocabulary in a tree view
  */
 @Component({
   selector: 'ds-vocabulary-treeview',
   templateUrl: './vocabulary-treeview.component.html',
-  styleUrls: ['./vocabulary-treeview.component.scss']
+  styleUrls: ['./vocabulary-treeview.component.scss'],
 })
-export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
+export class VocabularyTreeviewComponent implements OnDestroy, OnInit, OnChanges {
 
   /**
    * The {@link VocabularyOptions} object
@@ -40,14 +60,14 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
   @Input() preloadLevel = 2;
 
   /**
-   * The vocabulary entry already selected, if any
+   * The vocabulary entries already selected, if any
    */
-  @Input() selectedItem: any = null;
+  @Input() selectedItems: string[] = [];
 
   /**
-   * Contain a descriptive message for this vocabulary retrieved from i18n files
+   * Whether to allow selecting multiple values with checkboxes
    */
-  description: Observable<string>;
+  @Input() multiSelect = false;
 
   /**
    * A map containing the current node showed by the tree
@@ -90,6 +110,12 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   @Output() select: EventEmitter<VocabularyEntryDetail> = new EventEmitter<VocabularyEntryDetail>(null);
 
+  /**
+   * An event fired when a vocabulary entry is deselected.
+   * Event's payload equals to {@link VocabularyEntryDetail} deselected.
+   */
+  @Output() deselect: EventEmitter<VocabularyEntryDetail> = new EventEmitter<VocabularyEntryDetail>(null);
+
   /**
    * A boolean representing if user is authenticated
    */
@@ -100,19 +126,21 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    */
   private subs: Subscription[] = [];
 
+  readonly AlertType = AlertType;
+
   /**
    * Initialize instance variables
    *
-   * @param {NgbActiveModal} activeModal
    * @param {VocabularyTreeviewService} vocabularyTreeviewService
+   * @param {vocabularyService} vocabularyService
    * @param {Store<CoreState>} store
    * @param {TranslateService} translate
    */
   constructor(
-    public activeModal: NgbActiveModal,
     private vocabularyTreeviewService: VocabularyTreeviewService,
+    private vocabularyService: VocabularyService,
     private store: Store<CoreState>,
-    private translate: TranslateService
+    private translate: TranslateService,
   ) {
     this.treeFlattener = new VocabularyTreeFlattener(this.transformer, this.getLevel,
       this.isExpandable, this.getChildren);
@@ -148,7 +176,8 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
       node.pageInfo,
       node.loadMoreParentItem,
       node.isSearchNode,
-      node.isInInitValueHierarchy
+      node.isInInitValueHierarchy,
+      node.isSelected,
     );
     this.nodeMap.set(node.item.id, newNode);
 
@@ -200,26 +229,12 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
     this.subs.push(
       this.vocabularyTreeviewService.getData().subscribe((data) => {
         this.dataSource.data = data;
-      })
+      }),
     );
 
-    const descriptionLabel = 'vocabulary-treeview.tree.description.' + this.vocabularyOptions.name;
-    this.description = this.translate.get(descriptionLabel).pipe(
-      filter((msg) => msg !== descriptionLabel),
-      startWith('')
-    );
-
-    // set isAuthenticated
-    this.isAuthenticated = this.store.pipe(select(isAuthenticated));
-
     this.loading = this.vocabularyTreeviewService.isLoading();
 
-    this.isAuthenticated.pipe(
-      find((isAuth) => isAuth)
-    ).subscribe(() => {
-      const entryId: string = (this.selectedItem) ? this.getEntryId(this.selectedItem) : null;
-      this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), entryId);
-    });
+    this.vocabularyTreeviewService.initialize(this.vocabularyOptions, new PageInfo(), this.selectedItems, null);
   }
 
   /**
@@ -227,7 +242,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    * @param item The VocabularyEntryDetail for which to load more nodes
    */
   loadMore(item: VocabularyEntryDetail) {
-    this.vocabularyTreeviewService.loadMore(item);
+    this.vocabularyTreeviewService.loadMore(item, this.selectedItems);
   }
 
   /**
@@ -235,7 +250,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    * @param node The TreeviewFlatNode for which to load more nodes
    */
   loadMoreRoot(node: TreeviewFlatNode) {
-    this.vocabularyTreeviewService.loadMoreRoot(node);
+    this.vocabularyTreeviewService.loadMoreRoot(node, this.selectedItems);
   }
 
   /**
@@ -243,16 +258,20 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    * @param node The TreeviewFlatNode for which to load children nodes
    */
   loadChildren(node: TreeviewFlatNode) {
-    this.vocabularyTreeviewService.loadMore(node.item, true);
+    this.vocabularyTreeviewService.loadMore(node.item, this.selectedItems, true);
   }
 
   /**
-   * Method called on entry select
-   * Emit a new select Event
+   * Method called on entry select/deselect
    */
   onSelect(item: VocabularyEntryDetail) {
-    this.select.emit(item);
-    this.activeModal.close(item);
+    if (!this.selectedItems.includes(item.id)) {
+      this.selectedItems.push(item.id);
+      this.select.emit(item);
+    } else {
+      this.selectedItems = this.selectedItems.filter((detail: string) => { return detail !== item.id; });
+      this.deselect.emit(item);
+    }
   }
 
   /**
@@ -264,7 +283,7 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
         this.storedNodeMap = this.nodeMap;
       }
       this.nodeMap = new Map<string, TreeviewFlatNode>();
-      this.vocabularyTreeviewService.searchByQuery(this.searchText);
+      this.vocabularyTreeviewService.searchByQuery(this.searchText, this.selectedItems);
     }
   }
 
@@ -279,15 +298,33 @@ export class VocabularyTreeviewComponent implements OnDestroy, OnInit {
    * Reset tree resulting from a previous search
    */
   reset() {
+    this.searchText = '';
+    for (const item of this.selectedItems) {
+      this.subs.push(this.vocabularyService.findEntryDetailById(item, this.vocabularyOptions.name, true, true, false).pipe(
+        getFirstSucceededRemoteDataPayload(),
+      ).subscribe((detail: VocabularyEntryDetail) => {
+        this.deselect.emit(detail);
+      }));
+      this.nodeMap.get(item).isSelected = false;
+    }
+    this.selectedItems = [];
+
     if (isNotEmpty(this.storedNodeMap)) {
       this.nodeMap = this.storedNodeMap;
       this.storedNodeMap = new Map<string, TreeviewFlatNode>();
       this.vocabularyTreeviewService.restoreNodes();
     }
-
-    this.searchText = '';
   }
 
+  add() {
+    const userVocabularyEntry = {
+      value: this.searchText,
+      display: this.searchText,
+    } as VocabularyEntryDetail;
+    this.select.emit(userVocabularyEntry);
+  }
+
+
   /**
    * Unsubscribe from all subscriptions
    */
@@ -304,4 +341,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/vocabulary-treeview/vocabulary-treeview.service.spec.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts
similarity index 82%
rename from src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts
index c1c64c80bd..fea65250a0 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.spec.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.spec.ts
@@ -1,21 +1,40 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
-
-import { VocabularyTreeviewService } from './vocabulary-treeview.service';
-import { VocabularyService } from '../../core/submission/vocabularies/vocabulary.service';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import { LOAD_MORE_NODE, LOAD_MORE_ROOT_NODE, TreeviewFlatNode, TreeviewNode } from './vocabulary-treeview-node.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { expand, map, switchMap } from 'rxjs/operators';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { from as observableFrom } from 'rxjs';
+import {
+  expand,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+import { TestScheduler } from 'rxjs/testing';
+
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { VocabularyTreeviewService } from './vocabulary-treeview.service';
+import {
+  LOAD_MORE_NODE,
+  LOAD_MORE_ROOT_NODE,
+  TreeviewFlatNode,
+  TreeviewNode,
+} from './vocabulary-treeview-node.model';
 
 describe('VocabularyTreeviewService test suite', () => {
 
@@ -62,7 +81,7 @@ describe('VocabularyTreeviewService test suite', () => {
     findEntryDetailById: jasmine.createSpy('findEntryDetailById'),
     searchTopEntries: jasmine.createSpy('searchTopEntries'),
     getEntryDetailChildren: jasmine.createSpy('getEntryDetailChildren'),
-    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests')
+    clearSearchTopRequests: jasmine.createSpy('clearSearchTopRequests'),
   });
 
   function init() {
@@ -71,7 +90,7 @@ describe('VocabularyTreeviewService test suite', () => {
       elementsPerPage: 1,
       totalElements: 3,
       totalPages: 1,
-      currentPage: 1
+      currentPage: 1,
     });
     loadMoreNode = new TreeviewNode(LOAD_MORE_NODE, false, new PageInfo(), item);
     loadMoreRootNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, new PageInfo(), null);
@@ -129,13 +148,13 @@ describe('VocabularyTreeviewService test suite', () => {
     treeNodeList = [
       itemNode,
       itemNode2,
-      itemNode3
+      itemNode3,
     ];
     treeNodeListWithChildren = [
       itemNode,
       itemNode2,
       itemNode3,
-      childNode
+      childNode,
     ];
     treeNodeListWithLoadMoreRoot = treeNodeList;
     treeNodeListWithLoadMore = treeNodeListWithChildren;
@@ -145,7 +164,7 @@ describe('VocabularyTreeviewService test suite', () => {
     nodeMap = new Map<string, TreeviewNode>([
       [item.id, itemNode],
       [item2.id, itemNode2],
-      [item3.id, itemNode3]
+      [item3.id, itemNode3],
     ]);
 
     nodeMapWithChildren = new Map<string, TreeviewNode>([
@@ -167,15 +186,15 @@ describe('VocabularyTreeviewService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: VocabularyService, useValue: vocabularyServiceStub },
         VocabularyTreeviewService,
-        TranslateService
-      ]
+        TranslateService,
+      ],
     }).compileComponents();
   }));
 
@@ -189,10 +208,10 @@ describe('VocabularyTreeviewService test suite', () => {
   describe('initialize', () => {
     it('should set vocabularyName and call retrieveTopNodes method', () => {
       serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('-a', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3])),
       }));
 
-      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo));
+      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, []));
       scheduler.flush();
 
       expect(serviceAsAny.vocabularyName).toEqual(vocabularyOptions.name);
@@ -202,19 +221,19 @@ describe('VocabularyTreeviewService test suite', () => {
 
     it('should set initValueHierarchy', () => {
       serviceAsAny.vocabularyService.searchTopEntries.and.returnValue(hot('-c', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3]))
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [item, item2, item3])),
       }));
       serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(
         hot('-a', {
-          a: createSuccessfulRemoteDataObject(child2)
-        })
+          a: createSuccessfulRemoteDataObject(child2),
+        }),
       );
       serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValue(
         hot('-b', {
-          b: createSuccessfulRemoteDataObject(item)
-        })
+          b: createSuccessfulRemoteDataObject(item),
+        }),
       );
-      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, 'root2'));
+      scheduler.schedule(() => service.initialize(vocabularyOptions, pageInfo, [], 'root2'));
       scheduler.flush();
 
       expect(serviceAsAny.vocabularyName).toEqual(vocabularyOptions.name);
@@ -233,11 +252,11 @@ describe('VocabularyTreeviewService test suite', () => {
   describe('loadMoreRoot', () => {
     it('should call retrieveTopNodes properly', () => {
       spyOn(serviceAsAny, 'retrieveTopNodes');
-      service.initialize(vocabularyOptions, new PageInfo());
+      service.initialize(vocabularyOptions, new PageInfo(), []);
       serviceAsAny.dataChange.next(treeNodeListWithLoadMoreRoot);
-      service.loadMoreRoot(loadMoreRootFlatNode);
+      service.loadMoreRoot(loadMoreRootFlatNode, []);
 
-      expect(serviceAsAny.retrieveTopNodes).toHaveBeenCalledWith(loadMoreRootFlatNode.pageInfo, treeNodeList);
+      expect(serviceAsAny.retrieveTopNodes).toHaveBeenCalledWith(loadMoreRootFlatNode.pageInfo, treeNodeList, []);
     });
   });
 
@@ -253,17 +272,17 @@ describe('VocabularyTreeviewService test suite', () => {
         elementsPerPage: 1,
         totalElements: 2,
         totalPages: 2,
-        currentPage: 2
+        currentPage: 2,
       });
       spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
-        a: buildPaginatedList(pageInfo, [child2])
+        a: buildPaginatedList(pageInfo, [child2]),
       }));
 
       serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
       serviceAsAny.nodeMap = nodeMapWithChildren;
       treeNodeListWithChildren.push(new TreeviewNode(child2, false, new PageInfo(), item));
 
-      scheduler.schedule(() => service.loadMore(item));
+      scheduler.schedule(() => service.loadMore(item, []));
       scheduler.flush();
 
       expect(serviceAsAny.dataChange.value).toEqual(treeNodeListWithChildren);
@@ -274,10 +293,10 @@ describe('VocabularyTreeviewService test suite', () => {
         elementsPerPage: 1,
         totalElements: 2,
         totalPages: 2,
-        currentPage: 1
+        currentPage: 1,
       });
       spyOn(serviceAsAny, 'getChildrenNodesByParent').and.returnValue(hot('a', {
-        a: buildPaginatedList(pageInfo, [child2])
+        a: buildPaginatedList(pageInfo, [child2]),
       }));
 
       serviceAsAny.dataChange.next(treeNodeListWithLoadMore);
@@ -285,7 +304,7 @@ describe('VocabularyTreeviewService test suite', () => {
       treeNodeListWithChildren.push(childNode2);
       treeNodeListWithChildren.push(loadMoreNode);
 
-      scheduler.schedule(() => service.loadMore(item));
+      scheduler.schedule(() => service.loadMore(item, []));
       scheduler.flush();
 
       expect(serviceAsAny.dataChange.value).toEqual(treeNodeListWithChildren);
@@ -299,27 +318,27 @@ describe('VocabularyTreeviewService test suite', () => {
         elementsPerPage: 1,
         totalElements: 1,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       });
       serviceAsAny.vocabularyService.getVocabularyEntriesByValue.and.returnValue(hot('-a', {
-        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [childEntry3]))
+        a: createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, [childEntry3])),
       }));
 
       serviceAsAny.vocabularyService.findEntryDetailById.and.returnValue(hot('-a', {
-        a: createSuccessfulRemoteDataObject(child3)
+        a: createSuccessfulRemoteDataObject(child3),
       }));
 
       serviceAsAny.vocabularyService.getEntryDetailParent.and.returnValues(
         hot('-a', {
-          a: createSuccessfulRemoteDataObject(child)
+          a: createSuccessfulRemoteDataObject(child),
         }),
         hot('-b', {
-          b: createSuccessfulRemoteDataObject(item)
-        })
+          b: createSuccessfulRemoteDataObject(item),
+        }),
       );
       vocabularyOptions.query = 'root1-child1-child1';
 
-      scheduler.schedule(() => service.searchByQuery(vocabularyOptions));
+      scheduler.schedule(() => service.searchByQuery(vocabularyOptions, []));
       scheduler.flush();
 
       // We can't check the tree by comparing root TreeviewNodes directly in this particular test;
@@ -328,7 +347,7 @@ describe('VocabularyTreeviewService test suite', () => {
       const levels$ = serviceAsAny.dataChange.pipe(
         expand((nodes: TreeviewNode[]) => {         // recursively apply:
           return observableFrom(nodes).pipe(        //   for each node in the array...
-            switchMap(node => node.childrenChange)  //   ...map it to the array its child nodes.
+            switchMap(node => node.childrenChange),  //   ...map it to the array its child nodes.
           );                                        // because we only have one child per node in this case,
         }),                                         // this results in an array of nodes for each level of the tree.
         map((nodes: TreeviewNode[]) => nodes.map(node => node.item)), // finally, replace nodes with their vocab entries
@@ -339,7 +358,7 @@ describe('VocabularyTreeviewService test suite', () => {
         a: [item],
         b: [child],
         c: [child3],
-        d: []           // ensure that grandchild has no children & the recursion stopped there
+        d: [],           // ensure that grandchild has no children & the recursion stopped there
       }));
     });
   });
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.ts b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts
similarity index 74%
rename from src/app/shared/vocabulary-treeview/vocabulary-treeview.service.ts
rename to src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts
index ad2525bb7f..0cf951bfaf 100644
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.service.ts
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.service.ts
@@ -1,31 +1,44 @@
 import { Injectable } from '@angular/core';
+import findIndex from 'lodash/findIndex';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  merge,
+  mergeMap,
+  scan,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { map, merge, mergeMap, scan } from 'rxjs/operators';
-import { findIndex } from 'lodash';
-
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  getFirstSucceededRemoteDataPayload,
+  getFirstSucceededRemoteListPayload,
+} from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyOptions } from '../../../core/submission/vocabularies/models/vocabulary-options.model';
+import { VocabularyService } from '../../../core/submission/vocabularies/vocabulary.service';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
 import {
   LOAD_MORE_NODE,
   LOAD_MORE_ROOT_NODE,
   TreeviewFlatNode,
-  TreeviewNode
+  TreeviewNode,
 } from './vocabulary-treeview-node.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { VocabularyService } from '../../core/submission/vocabularies/vocabulary.service';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { isEmpty, isNotEmpty } from '../empty.util';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import {
-  getFirstSucceededRemoteDataPayload,
-  getFirstSucceededRemoteListPayload
-} from '../../core/shared/operators';
-import { PaginatedList } from '../../core/data/paginated-list.model';
-import { VocabularyEntryDetail } from '../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 
 /**
  * A service that provides methods to deal with vocabulary tree
  */
-@Injectable()
+@Injectable({
+  providedIn: 'root',
+})
 export class VocabularyTreeviewService {
 
   /**
@@ -101,21 +114,22 @@ export class VocabularyTreeviewService {
    *
    * @param options The {@link VocabularyOptions} object
    * @param pageInfo The {@link PageInfo} object
+   * @param selectedItems The currently selected items
    * @param initValueId The entry id of the node to mark as selected, if any
    */
-  initialize(options: VocabularyOptions, pageInfo: PageInfo, initValueId?: string): void {
+  initialize(options: VocabularyOptions, pageInfo: PageInfo, selectedItems: string[], initValueId?: string): void {
     this.loading.next(true);
     this.vocabularyOptions = options;
     this.vocabularyName = options.name;
     this.pageInfo = pageInfo;
     if (isNotEmpty(initValueId)) {
-      this.getNodeHierarchyById(initValueId)
+      this.getNodeHierarchyById(initValueId, selectedItems)
         .subscribe((hierarchy: string[]) => {
           this.initValueHierarchy = hierarchy;
-          this.retrieveTopNodes(pageInfo, []);
-      });
+          this.retrieveTopNodes(pageInfo, [], selectedItems);
+        });
     } else {
-      this.retrieveTopNodes(pageInfo, []);
+      this.retrieveTopNodes(pageInfo, [], selectedItems);
     }
   }
 
@@ -129,19 +143,21 @@ export class VocabularyTreeviewService {
   /**
    * Expand the root node whose children are not loaded
    * @param node The root node
+   * @param selectedItems The currently selected items
    */
-  loadMoreRoot(node: TreeviewFlatNode) {
+  loadMoreRoot(node: TreeviewFlatNode, selectedItems: string[]) {
     const nodes = this.dataChange.value;
     nodes.pop();
-    this.retrieveTopNodes(node.pageInfo, nodes);
+    this.retrieveTopNodes(node.pageInfo, nodes, selectedItems);
   }
 
   /**
    * Expand a node whose children are not loaded
    * @param item
+   * @param selectedItems
    * @param onlyFirstTime
    */
-  loadMore(item: VocabularyEntryDetail, onlyFirstTime = false) {
+  loadMore(item: VocabularyEntryDetail, selectedItems: string[], onlyFirstTime = false) {
     if (!this.nodeMap.has(item.otherInformation.id)) {
       return;
     }
@@ -154,13 +170,13 @@ export class VocabularyTreeviewService {
         return;
       }
 
-      const newNodes: TreeviewNode[] = list.page.map((entry) => this._generateNode(entry));
+      const newNodes: TreeviewNode[] = list.page.map((entry) => this._generateNode(entry, selectedItems));
       children.push(...newNodes);
 
       if ((list.pageInfo.currentPage + 1) <= list.pageInfo.totalPages) {
         // Update page info
         const newPageInfo: PageInfo = Object.assign(new PageInfo(), list.pageInfo, {
-          currentPage: list.pageInfo.currentPage + 1
+          currentPage: list.pageInfo.currentPage + 1,
         });
         parent.updatePageInfo(newPageInfo);
 
@@ -183,7 +199,7 @@ export class VocabularyTreeviewService {
   /**
    * Perform a search operation by query
    */
-  searchByQuery(query: string) {
+  searchByQuery(query: string, selectedItems: string[]) {
     this.loading.next(true);
     if (isEmpty(this.storedNodes)) {
       this.storedNodes = this.dataChange.value;
@@ -197,10 +213,10 @@ export class VocabularyTreeviewService {
       mergeMap((result: VocabularyEntry[]) => (result.length > 0) ? result : observableOf(null)),
       mergeMap((entry: VocabularyEntry) =>
         this.vocabularyService.findEntryDetailById(entry.otherInformation.id, this.vocabularyName).pipe(
-          getFirstSucceededRemoteDataPayload()
-        )
+          getFirstSucceededRemoteDataPayload(),
+        ),
       ),
-      mergeMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry)),
+      mergeMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry, selectedItems)),
       scan((acc: TreeviewNode[], value: TreeviewNode) => {
         if (isEmpty(value) || findIndex(acc, (node) => node.item.otherInformation.id === value.item.otherInformation.id) !== -1) {
           return acc;
@@ -208,7 +224,7 @@ export class VocabularyTreeviewService {
           return [...acc, value];
         }
       }, []),
-      merge(this.hideSearchingWhenUnsubscribed$)
+      merge(this.hideSearchingWhenUnsubscribed$),
     ).subscribe((nodes: TreeviewNode[]) => {
       this.dataChange.next(nodes);
       this.loading.next(false);
@@ -231,11 +247,12 @@ export class VocabularyTreeviewService {
    * Generate a {@link TreeviewNode} object from vocabulary entry
    *
    * @param entry The vocabulary entry detail
+   * @param selectedItems An array containing the currently selected items
    * @param isSearchNode A Boolean representing if given entry is the result of a search
    * @param toStore A Boolean representing if the node created is to store or not
    * @return TreeviewNode
    */
-  private _generateNode(entry: VocabularyEntryDetail, isSearchNode = false, toStore = true): TreeviewNode {
+  private _generateNode(entry: VocabularyEntryDetail, selectedItems: string[], isSearchNode = false, toStore = true): TreeviewNode {
     const entryId = entry.otherInformation.id;
     if (this.nodeMap.has(entryId)) {
       return this.nodeMap.get(entryId)!;
@@ -243,13 +260,15 @@ export class VocabularyTreeviewService {
     const hasChildren = entry.hasOtherInformation() && (entry.otherInformation as any)!.hasChildren === 'true';
     const pageInfo: PageInfo = this.pageInfo;
     const isInInitValueHierarchy = this.initValueHierarchy.includes(entryId);
+    const isSelected: boolean = selectedItems.some(() => selectedItems.includes(entry.id));
     const result = new TreeviewNode(
       entry,
       hasChildren,
       pageInfo,
       null,
       isSearchNode,
-      isInInitValueHierarchy);
+      isInInitValueHierarchy,
+      isSelected);
 
     if (toStore) {
       this.nodeMap.set(entryId, result);
@@ -260,12 +279,13 @@ export class VocabularyTreeviewService {
   /**
    * Return the node Hierarchy by a given node's id
    * @param id The node id
+   * @param selectedItems The currently selected items
    * @return Observable<string[]>
    */
-  private getNodeHierarchyById(id: string): Observable<string[]> {
+  private getNodeHierarchyById(id: string, selectedItems: string[]): Observable<string[]> {
     return this.getById(id).pipe(
-      mergeMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry, [], false)),
-      map((node: TreeviewNode) => this.getNodeHierarchyIds(node))
+      mergeMap((entry: VocabularyEntryDetail) => this.getNodeHierarchy(entry, selectedItems,[], false)),
+      map((node: TreeviewNode) => this.getNodeHierarchyIds(node, selectedItems)),
     );
   }
 
@@ -277,7 +297,7 @@ export class VocabularyTreeviewService {
    */
   private getChildrenNodesByParent(parentId: string, pageInfo: PageInfo): Observable<PaginatedList<VocabularyEntryDetail>> {
     return this.vocabularyService.getEntryDetailChildren(parentId, this.vocabularyName, pageInfo).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
   }
 
@@ -287,7 +307,7 @@ export class VocabularyTreeviewService {
    */
   private getParentNode(entryId: string): Observable<VocabularyEntryDetail> {
     return this.vocabularyService.getEntryDetailParent(entryId, this.vocabularyName).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
   }
 
@@ -298,7 +318,7 @@ export class VocabularyTreeviewService {
    */
   private getById(entryId: string): Observable<VocabularyEntryDetail> {
     return this.vocabularyService.findEntryDetailById(entryId, this.vocabularyName).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     );
   }
 
@@ -306,19 +326,20 @@ export class VocabularyTreeviewService {
    * Retrieve the top level vocabulary entries
    * @param pageInfo The {@link PageInfo} object
    * @param nodes The top level nodes already loaded, if any
+   * @param selectedItems The currently selected items
    */
-  private retrieveTopNodes(pageInfo: PageInfo, nodes: TreeviewNode[]): void {
+  private retrieveTopNodes(pageInfo: PageInfo, nodes: TreeviewNode[], selectedItems: string[]): void {
     this.vocabularyService.searchTopEntries(this.vocabularyName, pageInfo).pipe(
-      getFirstSucceededRemoteDataPayload()
+      getFirstSucceededRemoteDataPayload(),
     ).subscribe((list: PaginatedList<VocabularyEntryDetail>) => {
       this.vocabularyService.clearSearchTopRequests();
-      const newNodes: TreeviewNode[] = list.page.map((entry: VocabularyEntryDetail) => this._generateNode(entry));
+      const newNodes: TreeviewNode[] = list.page.map((entry: VocabularyEntryDetail) => this._generateNode(entry, selectedItems));
       nodes.push(...newNodes);
 
       if ((list.pageInfo.currentPage + 1) <= list.pageInfo.totalPages) {
         // Need a new load more node
         const newPageInfo: PageInfo = Object.assign(new PageInfo(), list.pageInfo, {
-          currentPage: list.pageInfo.currentPage + 1
+          currentPage: list.pageInfo.currentPage + 1,
         });
         const loadMoreNode = new TreeviewNode(LOAD_MORE_ROOT_NODE, false, newPageInfo);
         loadMoreNode.updatePageInfo(newPageInfo);
@@ -334,15 +355,16 @@ export class VocabularyTreeviewService {
    * Build and return the tree node hierarchy by a given vocabulary entry
    *
    * @param item The vocabulary entry
+   * @param selectedItems The currently selected items
    * @param children The vocabulary entry
    * @param toStore A Boolean representing if the node created is to store or not
    * @return Observable<string[]>
    */
-  private getNodeHierarchy(item: VocabularyEntryDetail, children?: TreeviewNode[], toStore = true): Observable<TreeviewNode> {
+  private getNodeHierarchy(item: VocabularyEntryDetail, selectedItems: string[], children?: TreeviewNode[], toStore = true): Observable<TreeviewNode> {
     if (isEmpty(item)) {
       return observableOf(null);
     }
-    const node = this._generateNode(item, toStore, toStore);
+    const node = this._generateNode(item, selectedItems, toStore, toStore);
 
     if (isNotEmpty(children)) {
       const newChildren = children
@@ -357,7 +379,7 @@ export class VocabularyTreeviewService {
 
     if (node.item.hasOtherInformation() && isNotEmpty(node.item.otherInformation.parent)) {
       return this.getParentNode(node.item.otherInformation.id).pipe(
-        mergeMap((parentItem: VocabularyEntryDetail) => this.getNodeHierarchy(parentItem, [node], toStore))
+        mergeMap((parentItem: VocabularyEntryDetail) => this.getNodeHierarchy(parentItem, selectedItems, [node], toStore)),
       );
     } else {
       return observableOf(node);
@@ -368,15 +390,16 @@ export class VocabularyTreeviewService {
    * Build and return the node Hierarchy ids by a given node
    *
    * @param node The given node
+   * @param selectedItems The currently selected items
    * @param hierarchyIds The ids already present in the Hierarchy's array
    * @return string[]
    */
-  private getNodeHierarchyIds(node: TreeviewNode, hierarchyIds: string[] = []): string[] {
+  private getNodeHierarchyIds(node: TreeviewNode, selectedItems: string[], hierarchyIds: string[] = []): string[] {
     if (!hierarchyIds.includes(node.item.otherInformation.id)) {
       hierarchyIds.push(node.item.otherInformation.id);
     }
     if (isNotEmpty(node.children)) {
-      return this.getNodeHierarchyIds(node.children[0], hierarchyIds);
+      return this.getNodeHierarchyIds(node.children[0], selectedItems, hierarchyIds);
     } else {
       return hierarchyIds;
     }
diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts
index 67f66c9757..870e636023 100644
--- a/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts
+++ b/src/app/shared/google-recaptcha/google-recaptcha.component.spec.ts
@@ -1,8 +1,11 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NativeWindowService } from '../../core/services/window.service';
 
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { NativeWindowService } from '../../core/services/window.service';
 import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { GoogleRecaptchaComponent } from './google-recaptcha.component';
@@ -15,7 +18,7 @@ describe('GoogleRecaptchaComponent', () => {
 
 
   const configurationDataService = jasmine.createSpyObj('configurationDataService', {
-    findByPropertyName: jasmine.createSpy('findByPropertyName')
+    findByPropertyName: jasmine.createSpy('findByPropertyName'),
   });
 
   const confResponse$ = createSuccessfulRemoteDataObject$({ values: ['valid-google-recaptcha-key'] });
@@ -24,11 +27,11 @@ describe('GoogleRecaptchaComponent', () => {
     await TestBed.configureTestingModule({
       declarations: [ GoogleRecaptchaComponent ],
       providers: [
-      { provide: ConfigurationDataService, useValue: configurationDataService },
-      { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-    ]
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
+      ],
     })
-    .compileComponents();
+      .compileComponents();
   });
 
 
diff --git a/src/app/shared/google-recaptcha/google-recaptcha.component.ts b/src/app/shared/google-recaptcha/google-recaptcha.component.ts
index 16c49ba45b..4ea408d596 100644
--- a/src/app/shared/google-recaptcha/google-recaptcha.component.ts
+++ b/src/app/shared/google-recaptcha/google-recaptcha.component.ts
@@ -1,9 +1,19 @@
-import { Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from 'src/app/core/services/window.service';
 
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { Observable } from 'rxjs';
-import { NativeWindowRef, NativeWindowService } from 'src/app/core/services/window.service';
 import { isNotEmpty } from '../empty.util';
 
 @Component({
diff --git a/src/app/shared/handle.service.spec.ts b/src/app/shared/handle.service.spec.ts
index b326eb0416..4550bf9753 100644
--- a/src/app/shared/handle.service.spec.ts
+++ b/src/app/shared/handle.service.spec.ts
@@ -1,47 +1,92 @@
-import { HandleService } from './handle.service';
+import { TestBed } from '@angular/core/testing';
+
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import {
+  CANONICAL_PREFIX_KEY,
+  HandleService,
+} from './handle.service';
+import { createSuccessfulRemoteDataObject$ } from './remote-data.utils';
+import { ConfigurationDataServiceStub } from './testing/configuration-data.service.stub';
 
 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..0c4912c031 100644
--- a/src/app/shared/handle.service.ts
+++ b/src/app/shared/handle.service.ts
@@ -1,41 +1,86 @@
 import { Injectable } from '@angular/core';
-import { isNotEmpty, isEmpty } from './empty.util';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-const PREFIX_REGEX = /handle\/([^\/]+\/[^\/]+)$/;
+import { ConfigurationDataService } from '../core/data/configuration-data.service';
+import { RemoteData } from '../core/data/remote-data';
+import { ConfigurationProperty } from '../core/shared/configuration-property.model';
+import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import {
+  hasNoValue,
+  isEmpty,
+} from './empty.util';
+
+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({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 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.actions.ts b/src/app/shared/host-window.actions.ts
index 3616b05004..0e909dfd36 100644
--- a/src/app/shared/host-window.actions.ts
+++ b/src/app/shared/host-window.actions.ts
@@ -3,7 +3,7 @@ import { Action } from '@ngrx/store';
 import { type } from './ngrx/type';
 
 export const HostWindowActionTypes = {
-  RESIZE: type('dspace/host-window/RESIZE')
+  RESIZE: type('dspace/host-window/RESIZE'),
 };
 
 export class HostWindowResizeAction implements Action {
diff --git a/src/app/shared/host-window.reducer.spec.ts b/src/app/shared/host-window.reducer.spec.ts
index f0e7aa7245..7e1fe3761b 100644
--- a/src/app/shared/host-window.reducer.spec.ts
+++ b/src/app/shared/host-window.reducer.spec.ts
@@ -1,6 +1,8 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
-import { hostWindowReducer } from './search/host-window.reducer';
+
 import { HostWindowResizeAction } from './host-window.actions';
+import { hostWindowReducer } from './search/host-window.reducer';
 
 class NullAction extends HostWindowResizeAction {
   type = null;
@@ -43,6 +45,10 @@ describe('hostWindowReducer', () => {
 
     const action = new HostWindowResizeAction(1024, 768);
     hostWindowReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
 });
diff --git a/src/app/shared/host-window.service.spec.ts b/src/app/shared/host-window.service.spec.ts
index bbb9b3eece..345eb8f36d 100644
--- a/src/app/shared/host-window.service.spec.ts
+++ b/src/app/shared/host-window.service.spec.ts
@@ -1,9 +1,15 @@
 import { Store } from '@ngrx/store';
-import { cold, hot } from 'jasmine-marbles';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { AppState } from '../app.reducer';
 
-import { HostWindowService, WidthCategory } from './host-window.service';
+import { AppState } from '../app.reducer';
+import {
+  HostWindowService,
+  WidthCategory,
+} from './host-window.service';
 import { CSSVariableServiceStub } from './testing/css-variable-service.stub';
 
 describe('HostWindowService', () => {
@@ -224,7 +230,7 @@ describe('HostWindowService', () => {
     it('should return SM if SM_MIN <= width < MD_MIN', () => {
       spyOn(service as any, 'getWidthObs').and
         .returnValue(hot('a-', {
-          a: GridBreakpoint.SM_MIN + Math.floor((GridBreakpoint.MD_MIN - GridBreakpoint.SM_MIN) / 2)
+          a: GridBreakpoint.SM_MIN + Math.floor((GridBreakpoint.MD_MIN - GridBreakpoint.SM_MIN) / 2),
         }));
 
       const result = service.widthCategory;
@@ -236,7 +242,7 @@ describe('HostWindowService', () => {
     it('should return MD if MD_MIN <= width < LG_MIN', () => {
       spyOn(service as any, 'getWidthObs').and
         .returnValue(hot('a-', {
-          a: GridBreakpoint.MD_MIN + Math.floor((GridBreakpoint.LG_MIN - GridBreakpoint.MD_MIN) / 2)
+          a: GridBreakpoint.MD_MIN + Math.floor((GridBreakpoint.LG_MIN - GridBreakpoint.MD_MIN) / 2),
         }));
 
       const result = service.widthCategory;
@@ -248,7 +254,7 @@ describe('HostWindowService', () => {
     it('should return LG if LG_MIN <= width < XL_MIN', () => {
       spyOn(service as any, 'getWidthObs').and
         .returnValue(hot('a-', {
-          a: GridBreakpoint.LG_MIN + Math.floor((GridBreakpoint.XL_MIN - GridBreakpoint.LG_MIN) / 2)
+          a: GridBreakpoint.LG_MIN + Math.floor((GridBreakpoint.XL_MIN - GridBreakpoint.LG_MIN) / 2),
         }));
 
       const result = service.widthCategory;
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 443dd40b14..f029ca1d6a 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -1,22 +1,34 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-
-import { filter, distinctUntilChanged, map } from 'rxjs/operators';
-import { HostWindowState } from './search/host-window.reducer';
 import { Injectable } from '@angular/core';
-import { createSelector, select, Store } from '@ngrx/store';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { hasValue } from './empty.util';
 import { AppState } from '../app.reducer';
-import { CSSVariableService } from './sass-helper/sass-helper.service';
+import { hasValue } from './empty.util';
+import { CSSVariableService } from './sass-helper/css-variable.service';
+import { HostWindowState } from './search/host-window.reducer';
 
 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);
 
@@ -26,22 +38,22 @@ export class HostWindowService {
 
   constructor(
     private store: Store<AppState>,
-    private variableService: CSSVariableService
+    private variableService: CSSVariableService,
   ) {
     /* See _exposed_variables.scss */
     variableService.getAllVariables()
       .subscribe((variables) => {
-      this.breakPoints.XL_MIN = parseInt(variables.xlMin, 10);
-      this.breakPoints.LG_MIN = parseInt(variables.lgMin, 10);
-      this.breakPoints.MD_MIN = parseInt(variables.mdMin, 10);
-      this.breakPoints.SM_MIN = parseInt(variables.smMin, 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> {
     return this.store.pipe(
       select(widthSelector),
-      filter((width) => hasValue(width))
+      filter((width) => hasValue(width)),
     );
   }
 
@@ -60,52 +72,87 @@ export class HostWindowService {
           return WidthCategory.XL;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isXs(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.XS),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isSm(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.SM),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isMd(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.MD),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isLg(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.LG),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
   isXl(): Observable<boolean> {
     return this.widthCategory.pipe(
       map((widthCat: WidthCategory) => widthCat === WidthCategory.XL),
-      distinctUntilChanged()
+      distinctUntilChanged(),
+    );
+  }
+
+  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(),
-      this.isSm()
+      this.isSm(),
     ).pipe(
       map(([isXs, isSm]) => isXs || isSm),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 }
diff --git a/src/app/shared/hover-class.directive.spec.ts b/src/app/shared/hover-class.directive.spec.ts
index 9c222dfe3a..80c2b9d1b1 100644
--- a/src/app/shared/hover-class.directive.spec.ts
+++ b/src/app/shared/hover-class.directive.spec.ts
@@ -1,10 +1,17 @@
-import { Component, DebugElement } from '@angular/core';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { HoverClassDirective } from './hover-class.directive';
+import {
+  Component,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 
+import { HoverClassDirective } from './hover-class.directive';
+
 @Component({
-  template: `<div dsHoverClass="ds-hover"></div>`
+  template: `<div dsHoverClass="ds-hover"></div>`,
 })
 class TestComponent {
 }
@@ -16,7 +23,7 @@ describe('HoverClassDirective', () => {
 
   beforeEach(() => {
     fixture = TestBed.configureTestingModule({
-      declarations: [TestComponent, HoverClassDirective]
+      declarations: [TestComponent, HoverClassDirective],
     }).createComponent(TestComponent);
 
     fixture.detectChanges();
diff --git a/src/app/shared/hover-class.directive.ts b/src/app/shared/hover-class.directive.ts
index 4c41486858..d0caa5a530 100644
--- a/src/app/shared/hover-class.directive.ts
+++ b/src/app/shared/hover-class.directive.ts
@@ -1,7 +1,12 @@
-import { Directive, ElementRef, HostListener, Input } from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  HostListener,
+  Input,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsHoverClass]'
+  selector: '[dsHoverClass]',
 })
 /**
  * A directive adding a class to an element when hovered over
diff --git a/src/app/shared/idle-modal/idle-modal.component.spec.ts b/src/app/shared/idle-modal/idle-modal.component.spec.ts
index 7ea0b96d5b..18cfafe5f4 100644
--- a/src/app/shared/idle-modal/idle-modal.component.spec.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.spec.ts
@@ -1,12 +1,22 @@
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
-import { IdleModalComponent } from './idle-modal.component';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
+import { IdleModalComponent } from './idle-modal.component';
 
 describe('IdleModalComponent', () => {
   let component: IdleModalComponent;
@@ -27,9 +37,9 @@ describe('IdleModalComponent', () => {
       providers: [
         { provide: NgbActiveModal, useValue: modalStub },
         { provide: AuthService, useValue: authServiceStub },
-        { provide: Store, useValue: storeStub }
+        { provide: Store, useValue: storeStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -93,7 +103,7 @@ describe('IdleModalComponent', () => {
       spyOn(component, 'extendSessionPressed');
       debugElement.query(By.css('button.confirm')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -108,7 +118,7 @@ describe('IdleModalComponent', () => {
       spyOn(component, 'logOutPressed');
       debugElement.query(By.css('button.cancel')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
@@ -123,7 +133,7 @@ describe('IdleModalComponent', () => {
       spyOn(component, 'closePressed');
       debugElement.query(By.css('.close')).triggerEventHandler('click', {
         preventDefault: () => {/**/
-        }
+        },
       });
       tick();
       fixture.detectChanges();
diff --git a/src/app/shared/idle-modal/idle-modal.component.ts b/src/app/shared/idle-modal/idle-modal.component.ts
index 4873137ff1..23456b1468 100644
--- a/src/app/shared/idle-modal/idle-modal.component.ts
+++ b/src/app/shared/idle-modal/idle-modal.component.ts
@@ -1,11 +1,17 @@
-import { Component, EventEmitter, OnInit, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { environment } from '../../../environments/environment';
-import { AuthService } from '../../core/auth/auth.service';
-import { hasValue } from '../empty.util';
 import { Store } from '@ngrx/store';
+
+import { environment } from '../../../environments/environment';
 import { AppState } from '../../app.reducer';
 import { LogOutAction } from '../../core/auth/auth.actions';
+import { AuthService } from '../../core/auth/auth.service';
+import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-idle-modal',
@@ -28,7 +34,7 @@ export class IdleModalComponent implements OnInit {
    * An event fired when the modal is closed
    */
   @Output()
-  response = new EventEmitter<boolean>();
+    response = new EventEmitter<boolean>();
 
   constructor(private activeModal: NgbActiveModal,
               private authService: AuthService,
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..b78479327a 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.spec.ts
@@ -1,19 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { ImpersonateNavbarComponent } from './impersonate-navbar.component';
-import { VarDirective } from '../utils/var.directive';
-import { AuthService } from '../../core/auth/auth.service';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
 import { authReducer } from '../../core/auth/auth.reducer';
+import { AuthService } from '../../core/auth/auth.service';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
 import { EPersonMock } from '../testing/eperson.mock';
-import { AppState, storeModuleConfig } from '../../app.reducer';
+import { VarDirective } from '../utils/var.directive';
+import { ImpersonateNavbarComponent } from './impersonate-navbar.component';
 
 describe('ImpersonateNavbarComponent', () => {
   let component: ImpersonateNavbarComponent;
@@ -25,7 +35,7 @@ describe('ImpersonateNavbarComponent', () => {
   beforeEach(waitForAsync(() => {
     authService = jasmine.createSpyObj('authService', {
       isImpersonating: false,
-      stopImpersonatingAndRefresh: {}
+      stopImpersonatingAndRefresh: {},
     });
     initialState = {
       core: {
@@ -36,9 +46,9 @@ describe('ImpersonateNavbarComponent', () => {
           loading: false,
           authToken: new AuthTokenInfo('test_token'),
           userId: EPersonMock.id,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
 
     TestBed.configureTestingModule({
@@ -52,7 +62,7 @@ describe('ImpersonateNavbarComponent', () => {
         { provide: AuthService, useValue: authService },
         provideMockStore({ initialState }),
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -65,7 +75,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..e8560d5efa 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.ts
@@ -1,36 +1,56 @@
-import { Component, OnInit } from '@angular/core';
-import { select, Store } from '@ngrx/store';
+import {
+  Component,
+  ElementRef,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { AppState } from '../../app.reducer';
 import { AuthService } from '../../core/auth/auth.service';
-import { Observable } from 'rxjs';
 import { isAuthenticated } from '../../core/auth/selectors';
 
 @Component({
   selector: 'ds-impersonate-navbar',
-  templateUrl: 'impersonate-navbar.component.html'
+  templateUrl: 'impersonate-navbar.component.html',
 })
 /**
  * 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/dso-input-suggestions/dso-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts
index 4c979a1d4c..93ee64e036 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.spec.ts
@@ -1,13 +1,21 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { DsoInputSuggestionsComponent } from './dso-input-suggestions.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DsoInputSuggestionsComponent } from './dso-input-suggestions.component';
 
 describe('DsoInputSuggestionsComponent', () => {
 
@@ -18,17 +26,17 @@ describe('DsoInputSuggestionsComponent', () => {
 
   const dso1 = {
     uuid: 'test-uuid-1',
-    name: 'test-name-1'
+    name: 'test-name-1',
   } as DSpaceObject;
 
   const dso2 = {
     uuid: 'test-uuid-2',
-    name: 'test-name-2'
+    name: 'test-name-2',
   } as DSpaceObject;
 
   const dso3 = {
     uuid: 'test-uuid-3',
-    name: 'test-name-3'
+    name: 'test-name-3',
   } as DSpaceObject;
 
   const suggestions = [dso1, dso2, dso3];
@@ -38,9 +46,9 @@ describe('DsoInputSuggestionsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [DsoInputSuggestionsComponent],
       providers: [],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(DsoInputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
index e7ca432476..788db8930c 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.ts
@@ -1,10 +1,16 @@
-import { Component, forwardRef, Input } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
-import { InputSuggestionsComponent } from '../input-suggestions.component';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { hasValue } from '../../empty.util';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { InputSuggestionsComponent } from '../input-suggestions.component';
 
 @Component({
   selector: 'ds-dso-input-suggestions',
@@ -16,9 +22,9 @@ import { hasValue } from '../../empty.util';
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => DsoInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
@@ -42,16 +48,22 @@ export class DsoInputSuggestionsComponent extends InputSuggestionsComponent {
 
   currentObject: DSpaceObject;
 
+  constructor(
+    protected dsoNameService: DSONameService,
+  ) {
+    super();
+  }
+
   onSubmit(data: DSpaceObject) {
     if (hasValue(data)) {
-      this.value = data.name;
+      this.value = this.dsoNameService.getName(data);
       this.currentObject = data;
       this.submitSuggestion.emit(data);
     }
   }
 
   onClickSuggestion(data: DSpaceObject) {
-    this.value = data.name;
+    this.value = this.dsoNameService.getName(data);
     this.currentObject = data;
     this.clickSuggestion.emit(data);
     this.close();
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/filter-suggestions/filter-input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
index 6a0324d2ac..ebc508c90c 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.spec.ts
@@ -1,11 +1,19 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { FilterInputSuggestionsComponent } from './filter-input-suggestions.component';
 
 describe('FilterInputSuggestionsComponent', () => {
@@ -16,7 +24,7 @@ describe('FilterInputSuggestionsComponent', () => {
   let el: HTMLElement;
   const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
     displayValue: 'suggestion dos',
-    value: 'suggestion dos'
+    value: 'suggestion dos',
   }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
   beforeEach(waitForAsync(() => {
@@ -24,9 +32,9 @@ describe('FilterInputSuggestionsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [FilterInputSuggestionsComponent],
       providers: [],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(FilterInputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -54,4 +62,31 @@ describe('FilterInputSuggestionsComponent', () => {
       expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex]);
     });
   });
+
+  describe('component methods', () => {
+    const testData = {
+      value: 'test-field',
+    } as unknown as any;
+
+    beforeEach(() => {
+      spyOn(comp.submitSuggestion, 'emit');
+      spyOn(comp.clickSuggestion, 'emit');
+      spyOn(comp, 'close');
+    });
+
+    it('should properly submit', () => {
+      comp.onSubmit(testData);
+      expect(comp.submitSuggestion.emit).toHaveBeenCalledWith(testData);
+      expect(comp.value).toBe(testData);
+    });
+
+    it('should update value on suggestion clicked', () => {
+      comp.onClickSuggestion(testData);
+      expect(comp.clickSuggestion.emit).toHaveBeenCalledWith(testData);
+      expect(comp.value).toBe(testData.value);
+      expect(comp.blockReopen).toBeTruthy();
+      expect(comp.close).toHaveBeenCalled();
+    });
+  });
+
 });
diff --git a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
index ee47dc80c9..09ed9de602 100644
--- a/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/filter-suggestions/filter-input-suggestions.component.ts
@@ -1,5 +1,10 @@
-import { Component, forwardRef, Input } from '@angular/core';
+import {
+  Component,
+  forwardRef,
+  Input,
+} from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
+
 import { InputSuggestionsComponent } from '../input-suggestions.component';
 import { InputSuggestion } from '../input-suggestions.model';
 
@@ -13,9 +18,9 @@ import { InputSuggestion } from '../input-suggestions.model';
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => FilterInputSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
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/input-suggestions.component.spec.ts b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
index 9793844e89..d21ee75037 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
@@ -1,12 +1,20 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
-import { InputSuggestionsComponent } from './input-suggestions.component';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { InputSuggestionsComponent } from './input-suggestions.component';
 
 describe('InputSuggestionsComponent', () => {
 
@@ -19,16 +27,16 @@ describe('InputSuggestionsComponent', () => {
   beforeEach(waitForAsync(() => {
     suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
       displayValue: 'suggestion dos',
-      value: 'suggestion dos'
+      value: 'suggestion dos',
     }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [InputSuggestionsComponent],
       providers: [],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(InputSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/input-suggestions.component.ts b/src/app/shared/input-suggestions/input-suggestions.component.ts
index 7e05dbcc8c..686670d464 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.ts
@@ -8,11 +8,15 @@ import {
   QueryList,
   SimpleChanges,
   ViewChild,
-  ViewChildren
+  ViewChildren,
 } from '@angular/core';
-import { BehaviorSubject } from 'rxjs';
-import { hasValue, isNotEmpty } from '../empty.util';
 import { ControlValueAccessor } from '@angular/forms';
+import { BehaviorSubject } from 'rxjs';
+
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
 
 @Component({
   selector: 'ds-input-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/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
index dad2edc30e..a610368016 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.spec.ts
@@ -1,11 +1,22 @@
-import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { MetadataFieldDataService } from '../../../core/data/metadata-field-data.service';
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { ValidationSuggestionsComponent } from './validation-suggestions.component';
@@ -18,7 +29,7 @@ describe('ValidationSuggestionsComponent', () => {
   let el: HTMLElement;
   const suggestions = [{ displayValue: 'suggestion uno', value: 'suggestion uno' }, {
     displayValue: 'suggestion dos',
-    value: 'suggestion dos'
+    value: 'suggestion dos',
   }, { displayValue: 'suggestion tres', value: 'suggestion tres' }];
 
   beforeEach(waitForAsync(() => {
@@ -30,9 +41,9 @@ describe('ValidationSuggestionsComponent', () => {
         { provide: MetadataFieldDataService, useValue: {} },
         { provide: ObjectUpdatesService, useValue: {} },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ValidationSuggestionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
index d845df0555..a867b59179 100644
--- a/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
+++ b/src/app/shared/input-suggestions/validation-suggestions/validation-suggestions.component.ts
@@ -1,5 +1,16 @@
-import { Component, forwardRef, Input, OnInit } from '@angular/core';
-import { FormControl, FormGroup, NG_VALUE_ACCESSOR, Validators } from '@angular/forms';
+import {
+  Component,
+  forwardRef,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  NG_VALUE_ACCESSOR,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+
 import { ObjectUpdatesService } from '../../../core/data/object-updates/object-updates.service';
 import { MetadatumViewModel } from '../../../core/shared/metadata.models';
 import { MetadataFieldValidator } from '../../utils/metadatafield-validator.directive';
@@ -16,9 +27,9 @@ import { InputSuggestion } from '../input-suggestions.model';
       // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
       // eslint-disable-next-line @angular-eslint/no-forward-ref
       useExisting: forwardRef(() => ValidationSuggestionsComponent),
-      multi: true
-    }
-  ]
+      multi: true,
+    },
+  ],
 })
 
 /**
@@ -26,7 +37,7 @@ import { InputSuggestion } from '../input-suggestions.model';
  */
 export class ValidationSuggestionsComponent extends InputSuggestionsComponent implements OnInit {
 
-  form: FormGroup;
+  form: UntypedFormGroup;
 
   /**
    * The current url of this page
@@ -52,11 +63,11 @@ export class ValidationSuggestionsComponent extends InputSuggestionsComponent im
   }
 
   ngOnInit() {
-    this.form = new FormGroup({
-      metadataNameField: new FormControl(this._value, {
+    this.form = new UntypedFormGroup({
+      metadataNameField: new UntypedFormControl(this._value, {
         asyncValidators: [this.metadataFieldValidator.validate.bind(this.metadataFieldValidator)],
-        validators: [Validators.required]
-      })
+        validators: [Validators.required],
+      }),
     });
   }
 
diff --git a/src/app/shared/interfaces/modal-before-dismiss.interface.ts b/src/app/shared/interfaces/modal-before-dismiss.interface.ts
index fca28e1cff..f884432fb8 100644
--- a/src/app/shared/interfaces/modal-before-dismiss.interface.ts
+++ b/src/app/shared/interfaces/modal-before-dismiss.interface.ts
@@ -1,4 +1,3 @@
-import { NgbModalConfig, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 
 /**
  * If a component implementing this interface is used to create a modal (i.e. it is passed to {@link NgbModal#open}),
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.spec.ts b/src/app/shared/item/item-alerts/item-alerts.component.spec.ts
deleted file mode 100644
index fed81199fd..0000000000
--- a/src/app/shared/item/item-alerts/item-alerts.component.spec.ts
+++ /dev/null
@@ -1,87 +0,0 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ItemAlertsComponent } from './item-alerts.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { By } from '@angular/platform-browser';
-
-describe('ItemAlertsComponent', () => {
-  let component: ItemAlertsComponent;
-  let fixture: ComponentFixture<ItemAlertsComponent>;
-  let item: Item;
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      declarations: [ItemAlertsComponent],
-      imports: [TranslateModule.forRoot()],
-      schemas: [NO_ERRORS_SCHEMA]
-    })
-      .compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ItemAlertsComponent);
-    component = fixture.componentInstance;
-    fixture.detectChanges();
-  });
-
-  describe('when the item is discoverable', () => {
-    beforeEach(() => {
-      item = Object.assign(new Item(), {
-        isDiscoverable: true
-      });
-      component.item = item;
-      fixture.detectChanges();
-    });
-
-    it('should not display the private alert', () => {
-      const privateWarning = fixture.debugElement.query(By.css('.private-warning'));
-      expect(privateWarning).toBeNull();
-    });
-  });
-
-  describe('when the item is not discoverable', () => {
-    beforeEach(() => {
-      item = Object.assign(new Item(), {
-        isDiscoverable: false
-      });
-      component.item = item;
-      fixture.detectChanges();
-    });
-
-    it('should display the private alert', () => {
-      const privateWarning = fixture.debugElement.query(By.css('.private-warning'));
-      expect(privateWarning).not.toBeNull();
-    });
-  });
-
-  describe('when the item is withdrawn', () => {
-    beforeEach(() => {
-      item = Object.assign(new Item(), {
-        isWithdrawn: true
-      });
-      component.item = item;
-      fixture.detectChanges();
-    });
-
-    it('should display the withdrawn alert', () => {
-      const privateWarning = fixture.debugElement.query(By.css('.withdrawn-warning'));
-      expect(privateWarning).not.toBeNull();
-    });
-  });
-
-  describe('when the item is not withdrawn', () => {
-    beforeEach(() => {
-      item = Object.assign(new Item(), {
-        isWithdrawn: false
-      });
-      component.item = item;
-      fixture.detectChanges();
-    });
-
-    it('should not display the withdrawn alert', () => {
-      const privateWarning = fixture.debugElement.query(By.css('.withdrawn-warning'));
-      expect(privateWarning).toBeNull();
-    });
-  });
-});
diff --git a/src/app/shared/item/item-alerts/item-alerts.component.ts b/src/app/shared/item/item-alerts/item-alerts.component.ts
deleted file mode 100644
index 4c2d60d24c..0000000000
--- a/src/app/shared/item/item-alerts/item-alerts.component.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { Item } from '../../../core/shared/item.model';
-import { AlertType } from '../../alert/aletr-type';
-
-@Component({
-  selector: 'ds-item-alerts',
-  templateUrl: './item-alerts.component.html',
-  styleUrls: ['./item-alerts.component.scss']
-})
-/**
- * Component displaying alerts for an item
- */
-export class ItemAlertsComponent {
-  /**
-   * The Item to display alerts for
-   */
-  @Input() item: Item;
-
-  /**
-   * The AlertType enumeration
-   * @type {AlertType}
-   */
-  public AlertTypeEnum = AlertType;
-}
diff --git a/src/app/shared/key-value-pair.model.ts b/src/app/shared/key-value-pair.model.ts
new file mode 100644
index 0000000000..6fb63070ad
--- /dev/null
+++ b/src/app/shared/key-value-pair.model.ts
@@ -0,0 +1,4 @@
+export interface KeyValuePair<K, V> {
+  key: K;
+  value: V;
+}
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index d9a5efaa81..9be622099b 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,13 +1,16 @@
 <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
      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 efa7a55c44..ea099435a8 100644
--- a/src/app/shared/lang-switch/lang-switch.component.scss
+++ b/src/app/shared/lang-switch/lang-switch.component.scss
@@ -2,12 +2,14 @@
   display:none;
 }
 
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  .dropdown-toggle {
-    color: var(--ds-header-icon-color) !important;
+.dropdown-toggle {
+  color: var(--ds-header-icon-color);
 
-    &:hover, &focus {
-      color: var(--ds-header-icon-color-hover);
-    }
+  &:hover, &:focus {
+    color: var(--ds-header-icon-color-hover);
   }
 }
+
+.dropdown-item {
+  cursor: pointer;
+}
diff --git a/src/app/shared/lang-switch/lang-switch.component.spec.ts b/src/app/shared/lang-switch/lang-switch.component.spec.ts
index 7757622f4c..d0147146da 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -1,14 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  HttpClientTestingModule,
+  HttpTestingController,
+} from '@angular/common/http/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 
-import { Observable, of } from 'rxjs';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-
-import { LangSwitchComponent } from './lang-switch.component';
 import { LangConfig } from '../../../config/lang-config.interface';
 import { LocaleService } from '../../core/locale/locale.service';
+import { LangSwitchComponent } from './lang-switch.component';
 
 // This test is completely independent from any message catalogs or keys in the codebase
 // The translation module is instantiated with these bogus messages that we aren't using anyway.
@@ -23,8 +39,8 @@ class CustomLoader implements TranslateLoader {
       'footer': {
         'copyright': 'copyright © 2002-{{ year }}',
         'link.dspace': 'DSpace software',
-        'link.lyrasis': 'LYRASIS'
-      }
+        'link.lyrasis': 'LYRASIS',
+      },
     });
   }
 }
@@ -39,7 +55,7 @@ describe('LangSwitchComponent', () => {
   function getMockLocaleService(): LocaleService {
     return jasmine.createSpyObj('LocaleService', {
       setCurrentLanguageCode: jasmine.createSpy('setCurrentLanguageCode'),
-      refreshAfterChangeLanguage: jasmine.createSpy('refreshAfterChangeLanguage')
+      refreshAfterChangeLanguage: jasmine.createSpy('refreshAfterChangeLanguage'),
     });
   }
 
@@ -63,21 +79,21 @@ describe('LangSwitchComponent', () => {
           code: 'de',
           label: 'Deutsch',
           active: true,
-        }]
+        }],
       };
 
       TestBed.configureTestingModule({
         imports: [HttpClientTestingModule, TranslateModule.forRoot(
           {
-            loader: { provide: TranslateLoader, useClass: CustomLoader }
-          }
+            loader: { provide: TranslateLoader, useClass: CustomLoader },
+          },
         )],
         declarations: [LangSwitchComponent],
         schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
           { provide: LocaleService, useValue: getMockLocaleService() },
-        ]
+        ],
       }).compileComponents()
         .then(() => {
           translate = TestBed.inject(TranslateService);
@@ -109,7 +125,7 @@ describe('LangSwitchComponent', () => {
     }));
 
     it('should define the main A HREF in the UI', (() => {
-      expect(langSwitchElement.querySelector('a')).toBeDefined();
+      expect(langSwitchElement.querySelector('a')).not.toBeNull();
     }));
 
     describe('when selecting a language', () => {
@@ -148,22 +164,22 @@ describe('LangSwitchComponent', () => {
         }, {
           code: 'de',
           label: 'Deutsch',
-          active: false
-        }]
+          active: false,
+        }],
       };
 
       TestBed.configureTestingModule({
         imports: [HttpClientTestingModule, TranslateModule.forRoot(
           {
-            loader: { provide: TranslateLoader, useClass: CustomLoader }
-          }
+            loader: { provide: TranslateLoader, useClass: CustomLoader },
+          },
         )],
         declarations: [LangSwitchComponent],
         schemas: [NO_ERRORS_SCHEMA],
         providers: [
           TranslateService,
-          { provide: LocaleService, useValue: getMockLocaleService() }
-        ]
+          { provide: LocaleService, useValue: getMockLocaleService() },
+        ],
       }).compileComponents();
       translate = TestBed.inject(TranslateService);
       translate.addLangs(mockConfig.languages.filter((MyLangConfig) => MyLangConfig.active === true).map((a) => a.code));
diff --git a/src/app/shared/lang-switch/lang-switch.component.ts b/src/app/shared/lang-switch/lang-switch.component.ts
index 41d707a056..e070af99bf 100644
--- a/src/app/shared/lang-switch/lang-switch.component.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.ts
@@ -1,5 +1,8 @@
-import { Component, OnInit } from '@angular/core';
-
+import {
+  Component,
+  ElementRef,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 
 import { LangConfig } from '../../../config/lang-config.interface';
@@ -25,14 +28,18 @@ export class LangSwitchComponent implements OnInit {
   moreThanOneLanguage: boolean;
 
   constructor(
+    public el: ElementRef,
     public translate: TranslateService,
-    private localeService: LocaleService
+    private localeService: LocaleService,
   ) {
   }
 
   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..e2ecf4c24d
--- /dev/null
+++ b/src/app/shared/lang-switch/themed-lang-switch.component.ts
@@ -0,0 +1,28 @@
+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/loading/loading.component.spec.ts b/src/app/shared/loading/loading.component.spec.ts
index d564d43dc0..6afa60d93a 100644
--- a/src/app/shared/loading/loading.component.spec.ts
+++ b/src/app/shared/loading/loading.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-
 import { LoadingComponent } from './loading.component';
 
 describe('LoadingComponent (inline template)', () => {
@@ -21,12 +27,12 @@ describe('LoadingComponent (inline template)', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [LoadingComponent], // declare the test component
-      providers: [TranslateService]
+      providers: [TranslateService],
     }).compileComponents();  // compile template and css
   }));
 
diff --git a/src/app/shared/loading/loading.component.ts b/src/app/shared/loading/loading.component.ts
index e64d89620b..4ad335983b 100644
--- a/src/app/shared/loading/loading.component.ts
+++ b/src/app/shared/loading/loading.component.ts
@@ -1,14 +1,18 @@
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-
 import { Subscription } from 'rxjs';
+
 import { hasValue } from '../empty.util';
 
 @Component({
   selector: 'ds-loading',
   styleUrls: ['./loading.component.scss'],
-  templateUrl: './loading.component.html'
+  templateUrl: './loading.component.html',
 })
 export class LoadingComponent implements OnDestroy, OnInit {
 
diff --git a/src/app/shared/loading/themed-loading.component.ts b/src/app/shared/loading/themed-loading.component.ts
index ffdf9d3cbe..75ea39660d 100644
--- a/src/app/shared/loading/themed-loading.component.ts
+++ b/src/app/shared/loading/themed-loading.component.ts
@@ -1,7 +1,12 @@
-import { Component, Input, ComponentFactoryResolver, ChangeDetectorRef } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+} from '@angular/core';
+
+import { ThemeService } from '../theme-support/theme.service';
 import { ThemedComponent } from '../theme-support/themed.component';
 import { LoadingComponent } from './loading.component';
-import { ThemeService } from '../theme-support/theme.service';
 
 /**
  * Themed wrapper for LoadingComponent
@@ -14,17 +19,16 @@ import { ThemeService } from '../theme-support/theme.service';
 export class ThemedLoadingComponent extends ThemedComponent<LoadingComponent> {
 
   @Input() message: string;
-  @Input() showMessage = true;
-  @Input() spinner = false;
+  @Input() showMessage: boolean;
+  @Input() spinner: boolean;
 
   protected inAndOutputNames: (keyof LoadingComponent & keyof this)[] = ['message', 'showMessage', 'spinner'];
 
   constructor(
-    protected resolver: ComponentFactoryResolver,
     protected cdr: ChangeDetectorRef,
-    protected themeService: ThemeService
+    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..63da7d926a 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
@@ -1,32 +1,46 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { RouterTestingModule } from '@angular/router/testing';
 import { StoreModule } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { LogInContainerComponent } from './log-in-container.component';
 import { authReducer } from '../../../core/auth/auth.reducer';
-import { SharedModule } from '../../shared.module';
 import { AuthService } from '../../../core/auth/auth.service';
 import { AuthMethod } from '../../../core/auth/models/auth.method';
-import { AuthServiceStub } from '../../testing/auth-service.stub';
-import { createTestComponent } from '../../testing/utils.test';
+import { AuthMethodType } from '../../../core/auth/models/auth.method-type';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { HardRedirectService } from '../../../core/services/hard-redirect.service';
+import { SharedModule } from '../../shared.module';
+import { AuthServiceStub } from '../../testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../testing/authorization-service.stub';
+import { createTestComponent } from '../../testing/utils.test';
+import { LogInContainerComponent } from './log-in-container.component';
 
 describe('LogInContainerComponent', () => {
 
   let component: LogInContainerComponent;
   let fixture: ComponentFixture<LogInContainerComponent>;
 
-  const authMethod = new AuthMethod('password');
+  const authMethod = new AuthMethod(AuthMethodType.Password, 0);
 
   let hardRedirectService: HardRedirectService;
 
   beforeEach(waitForAsync(() => {
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       redirect: {},
-      getCurrentRoute: {}
+      getCurrentRoute: {},
     });
     // refine the test module by declaring the test component
     TestBed.configureTestingModule({
@@ -35,19 +49,21 @@ describe('LogInContainerComponent', () => {
         ReactiveFormsModule,
         StoreModule.forRoot(authReducer),
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
+        RouterTestingModule,
       ],
       declarations: [
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
+        { provide: AuthorizationDataService, useClass: AuthorizationDataServiceStub },
         { provide: HardRedirectService, useValue: hardRedirectService },
-        LogInContainerComponent
+        LogInContainerComponent,
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
@@ -108,11 +124,11 @@ describe('LogInContainerComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 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..5b1b2a001d 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,7 +1,13 @@
-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';
+import { rendersAuthMethodType } from '../methods/log-in.methods-decorator';
 
 /**
  * This component represents a component container for log-in methods available.
@@ -9,7 +15,7 @@ import { AuthMethod } from '../../../core/auth/models/auth.method';
 @Component({
   selector: 'ds-log-in-container',
   templateUrl: './log-in-container.component.html',
-  styleUrls: ['./log-in-container.component.scss']
+  styleUrls: ['./log-in-container.component.scss'],
 })
 export class LogInContainerComponent implements OnInit {
 
@@ -27,12 +33,9 @@ export class LogInContainerComponent implements OnInit {
    */
   public objectInjector: Injector;
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {Injector} injector
-   */
-  constructor(private injector: Injector) {
+  constructor(
+    protected injector: Injector,
+  ) {
   }
 
   /**
@@ -44,15 +47,15 @@ export class LogInContainerComponent implements OnInit {
         { provide: 'authMethodProvider', useFactory: () => (this.authMethod), deps: [] },
         { provide: 'isStandalonePage', useFactory: () => (this.isStandalonePage), deps: [] },
       ],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
   /**
    * 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 6e4685a07b..d80513d5d0 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 login-container">
-  <ng-container *ngFor="let authMethod of (authMethods | async); let i = index">
-    <div *ngIf="i === 1" class="text-center mt-2">
-      <span class="align-middle">{{"login.form.or-divider" | translate}}</span>
-    </div>
+<div *ngIf="(loading | async) !== true && (isAuthenticated | async) !== true" class="px-4 py-3 mx-auto login-container">
+  <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.scss b/src/app/shared/log-in/log-in.component.scss
index caaeef3dc7..2d836b0f18 100644
--- a/src/app/shared/log-in/log-in.component.scss
+++ b/src/app/shared/log-in/log-in.component.scss
@@ -1,3 +1,8 @@
 .login-container {
   max-width: 350px;
 }
+
+a {
+  white-space: normal;
+  padding: .25rem .75rem;
+}
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..1d0bd3460d 100644
--- a/src/app/shared/log-in/log-in.component.spec.ts
+++ b/src/app/shared/log-in/log-in.component.spec.ts
@@ -1,27 +1,42 @@
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { StoreModule } from '@ngrx/store';
-
-import { LogInComponent } from './log-in.component';
-import { authReducer } from '../../core/auth/auth.reducer';
-import { TranslateModule } from '@ngx-translate/core';
-
-import { AuthService } from '../../core/auth/auth.service';
-import { authMethodsMock, AuthServiceStub } from '../testing/auth-service.stub';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { SharedModule } from '../shared.module';
-import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
-import { ActivatedRouteStub } from '../testing/active-router.stub';
 import { ActivatedRoute } from '@angular/router';
-import { NativeWindowService } from '../../core/services/window.service';
-import { provideMockStore } from '@ngrx/store/testing';
-import { createTestComponent } from '../testing/utils.test';
 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 { StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
 
+import { authReducer } from '../../core/auth/auth.reducer';
+import { AuthService } from '../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { HardRedirectService } from '../../core/services/hard-redirect.service';
+import { NativeWindowService } from '../../core/services/window.service';
+import { NativeWindowMockFactory } from '../mocks/mock-native-window-ref';
+import { getMockThemeService } from '../mocks/theme-service.mock';
+import { SharedModule } from '../shared.module';
+import { ActivatedRouteStub } from '../testing/active-router.stub';
+import {
+  authMethodsMock,
+  AuthServiceStub,
+} from '../testing/auth-service.stub';
+import { createTestComponent } from '../testing/utils.test';
+import { ThemeService } from '../theme-support/theme.service';
+import { LogInComponent } from './log-in.component';
+
 describe('LogInComponent', () => {
 
   let component: LogInComponent;
@@ -32,9 +47,9 @@ describe('LogInComponent', () => {
         authenticated: false,
         loaded: false,
         loading: false,
-        authMethods: authMethodsMock
-      }
-    }
+        authMethods: authMethodsMock,
+      },
+    },
   };
   let hardRedirectService: HardRedirectService;
 
@@ -43,29 +58,29 @@ describe('LogInComponent', () => {
   beforeEach(waitForAsync(() => {
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       redirect: {},
-      getCurrentRoute: {}
+      getCurrentRoute: {},
     });
     authorizationService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: of(true)
+      isAuthorized: of(true),
     });
 
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
         StoreModule.forRoot(authReducer, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         }),
         RouterTestingModule,
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -75,11 +90,12 @@ describe('LogInComponent', () => {
         { provide: HardRedirectService, useValue: hardRedirectService },
         { provide: AuthorizationDataService, useValue: authorizationService },
         provideMockStore({ initialState }),
-        LogInComponent
+        { provide: ThemeService, useValue: getMockThemeService() },
+        LogInComponent,
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
@@ -91,7 +107,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;
@@ -133,7 +149,7 @@ describe('LogInComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/log-in/log-in.component.ts b/src/app/shared/log-in/log-in.component.ts
index 120f3ac4fa..d5cacd0b37 100644
--- a/src/app/shared/log-in/log-in.component.ts
+++ b/src/app/shared/log-in/log-in.component.ts
@@ -1,28 +1,35 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  map,
+  Observable,
+} from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { AuthMethod } from '../../core/auth/models/auth.method';
 import {
   getAuthenticationError,
   getAuthenticationMethods,
   isAuthenticated,
-  isAuthenticationLoading
+  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 { hasValue } from '../empty.util';
+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 {
 
@@ -50,20 +57,18 @@ 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.authMethods = this.store.pipe(
       select(getAuthenticationMethods),
+      map((methods: AuthMethod[]) => methods
+        .filter((authMethod: AuthMethod) => rendersAuthMethodType(authMethod.authMethodType) !== undefined)
+        .sort((method1: AuthMethod, method2: AuthMethod) => method1.position - method2.position),
+      ),
     );
 
     // set loading
@@ -78,15 +83,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
new file mode 100644
index 0000000000..378bb6ed67
--- /dev/null
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
@@ -0,0 +1,3 @@
+<button class="btn btn-lg btn-primary btn-block text-white" (click)="redirectToExternalProvider()">
+  <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.scss b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.spec.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
similarity index 69%
rename from src/app/shared/log-in/methods/orcid/log-in-orcid.component.spec.ts
rename to src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
index 001f0a4959..7daf88bef5 100644
--- a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.spec.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.spec.ts
@@ -1,48 +1,48 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { StoreModule } from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { Store, 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 { storeModuleConfig } from '../../../../app.reducer';
 import { authReducer } from '../../../../core/auth/auth.reducer';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service.stub';
-import { storeModuleConfig } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInOrcidComponent } from './log-in-orcid.component';
-import { NativeWindowService } from '../../../../core/services/window.service';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
-import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { NativeWindowService } from '../../../../core/services/window.service';
+import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { LogInExternalProviderComponent } from './log-in-external-provider.component';
 
+describe('LogInExternalProviderComponent', () => {
 
-describe('LogInOrcidComponent', () => {
-
-  let component: LogInOrcidComponent;
-  let fixture: ComponentFixture<LogInOrcidComponent>;
-  let page: Page;
-  let user: EPerson;
+  let component: LogInExternalProviderComponent;
+  let fixture: ComponentFixture<LogInExternalProviderComponent>;
   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';
 
     hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
       getCurrentRoute: {},
-      redirect: {}
+      redirect: {},
     });
 
     initialState = {
@@ -52,25 +52,25 @@ describe('LogInOrcidComponent', () => {
           loaded: false,
           blocking: false,
           loading: false,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
   });
 
   beforeEach(waitForAsync(() => {
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
-        LogInOrcidComponent
+        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() },
@@ -79,8 +79,8 @@ describe('LogInOrcidComponent', () => {
         provideMockStore({ initialState }),
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
@@ -88,14 +88,13 @@ describe('LogInOrcidComponent', () => {
 
   beforeEach(() => {
     // create component and test fixture
-    fixture = TestBed.createComponent(LogInOrcidComponent);
+    fixture = TestBed.createComponent(LogInExternalProviderComponent);
 
     // get test component from the fixture
     component = fixture.componentInstance;
     componentAsAny = component;
 
     // create page
-    page = new Page(component, fixture);
     setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
 
   });
@@ -109,7 +108,7 @@ describe('LogInOrcidComponent', () => {
     expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
     expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
 
-    component.redirectToOrcid();
+    component.redirectToExternalProvider();
 
     expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
 
@@ -124,32 +123,10 @@ describe('LogInOrcidComponent', () => {
     expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
     expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
 
-    component.redirectToOrcid();
+    component.redirectToExternalProvider();
 
     expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
 
   });
 
 });
-
-/**
- * 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: LogInOrcidComponent, private fixture: ComponentFixture<LogInOrcidComponent>) {
-    // 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-external-provider.component.ts b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
similarity index 67%
rename from src/app/shared/log-in/methods/log-in-external-provider.component.ts
rename to src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
index 037fc40e90..bab69875f9 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider.component.ts
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.ts
@@ -1,25 +1,44 @@
-import { Component, Inject, OnInit, } from '@angular/core';
-
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
 import { take } from 'rxjs/operators';
-import { select, Store } from '@ngrx/store';
 
-import { AuthMethod } from '../../../core/auth/models/auth.method';
-
-import { isAuthenticated, isAuthenticationLoading } from '../../../core/auth/selectors';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
-import { isEmpty, isNotNull } from '../../empty.util';
-import { AuthService } from '../../../core/auth/auth.service';
-import { HardRedirectService } from '../../../core/services/hard-redirect.service';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { CoreState } from '../../../core/core-state.model';
+import { AuthService } from '../../../../core/auth/auth.service';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import {
+  isAuthenticated,
+  isAuthenticationLoading,
+} from '../../../../core/auth/selectors';
+import { CoreState } from '../../../../core/core-state.model';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../../core/services/window.service';
+import { URLCombiner } from '../../../../core/url-combiner/url-combiner';
+import {
+  isEmpty,
+  isNotNull,
+} from '../../../empty.util';
+import { renderAuthMethodFor } from '../log-in.methods-decorator';
 
 @Component({
   selector: 'ds-log-in-external-provider',
-  template: ''
-
+  templateUrl: './log-in-external-provider.component.html',
+  styleUrls: ['./log-in-external-provider.component.scss'],
 })
-export abstract class LogInExternalProviderComponent implements OnInit {
+@renderAuthMethodFor(AuthMethodType.Oidc)
+@renderAuthMethodFor(AuthMethodType.Shibboleth)
+@renderAuthMethodFor(AuthMethodType.Orcid)
+export class LogInExternalProviderComponent implements OnInit {
 
   /**
    * The authentication method data.
@@ -60,7 +79,7 @@ export abstract class LogInExternalProviderComponent implements OnInit {
     @Inject(NativeWindowService) protected _window: NativeWindowRef,
     private authService: AuthService,
     private hardRedirectService: HardRedirectService,
-    private store: Store<CoreState>
+    private store: Store<CoreState>,
   ) {
     this.authMethod = injectedAuthMethodModel;
   }
@@ -107,4 +126,7 @@ export abstract class LogInExternalProviderComponent implements OnInit {
 
   }
 
+  getButtonLabel() {
+    return `login.form.${this.authMethod.authMethodType}`;
+  }
 }
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..f0b25da98a 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,11 @@
+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 +16,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/oidc/log-in-oidc.component.html b/src/app/shared/log-in/methods/oidc/log-in-oidc.component.html
deleted file mode 100644
index 7e78834305..0000000000
--- a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToOidc()">
-  <i class="fas fa-sign-in-alt"></i> {{"login.form.oidc" | translate}}
-</button>
\ No newline at end of file
diff --git a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts b/src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts
deleted file mode 100644
index 078a58dd5a..0000000000
--- a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.spec.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-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 { 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';
-import { storeModuleConfig } from '../../../../app.reducer';
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInOidcComponent } from './log-in-oidc.component';
-import { NativeWindowService } from '../../../../core/services/window.service';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
-import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
-
-
-describe('LogInOidcComponent', () => {
-
-  let component: LogInOidcComponent;
-  let fixture: ComponentFixture<LogInOidcComponent>;
-  let page: Page;
-  let user: EPerson;
-  let componentAsAny: any;
-  let setHrefSpy;
-  let oidcBaseUrl;
-  let location;
-  let initialState: any;
-  let hardRedirectService: HardRedirectService;
-
-  beforeEach(() => {
-    user = EPersonMock;
-    oidcBaseUrl = 'dspace-rest.test/oidc?redirectUrl=';
-    location = oidcBaseUrl + 'http://dspace-angular.test/home';
-
-    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
-      getCurrentRoute: {},
-      redirect: {}
-    });
-
-    initialState = {
-      core: {
-        auth: {
-          authenticated: false,
-          loaded: false,
-          blocking: false,
-          loading: false,
-          authMethods: []
-        }
-      }
-    };
-  });
-
-  beforeEach(waitForAsync(() => {
-    // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
-      ],
-      declarations: [
-        LogInOidcComponent
-      ],
-      providers: [
-        { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Oidc, location) },
-        { provide: 'isStandalonePage', useValue: true },
-        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-        { provide: Router, useValue: new RouterStub() },
-        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        { provide: HardRedirectService, useValue: hardRedirectService },
-        provideMockStore({ initialState }),
-      ],
-      schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    })
-      .compileComponents();
-
-  }));
-
-  beforeEach(() => {
-    // create component and test fixture
-    fixture = TestBed.createComponent(LogInOidcComponent);
-
-    // get test component from the fixture
-    component = fixture.componentInstance;
-    componentAsAny = component;
-
-    // create page
-    page = new Page(component, fixture);
-    setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
-
-  });
-
-  it('should set the properly a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/collections/12345';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToOidc();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-  it('should not set a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/home';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToOidc();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-});
-
-/**
- * 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: LogInOidcComponent, private fixture: ComponentFixture<LogInOidcComponent>) {
-    // 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/oidc/log-in-oidc.component.ts b/src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts
deleted file mode 100644
index 882996b207..0000000000
--- a/src/app/shared/log-in/methods/oidc/log-in-oidc.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, } from '@angular/core';
-
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from '../log-in-external-provider.component';
-
-@Component({
-  selector: 'ds-log-in-oidc',
-  templateUrl: './log-in-oidc.component.html',
-})
-@renderAuthMethodFor(AuthMethodType.Oidc)
-export class LogInOidcComponent extends LogInExternalProviderComponent {
-
-  /**
-   * Redirect to orcid authentication url
-   */
-  redirectToOidc() {
-    this.redirectToExternalProvider();
-  }
-
-}
diff --git a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.html b/src/app/shared/log-in/methods/orcid/log-in-orcid.component.html
deleted file mode 100644
index 6f5453fd60..0000000000
--- a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToOrcid()">
-  <i class="fas fa-sign-in-alt"></i> {{"login.form.orcid" | translate}}
-</button>
\ No newline at end of file
diff --git a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts b/src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts
deleted file mode 100644
index e0b1da3db5..0000000000
--- a/src/app/shared/log-in/methods/orcid/log-in-orcid.component.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Component, } from '@angular/core';
-
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from '../log-in-external-provider.component';
-
-@Component({
-  selector: 'ds-log-in-orcid',
-  templateUrl: './log-in-orcid.component.html',
-})
-@renderAuthMethodFor(AuthMethodType.Orcid)
-export class LogInOrcidComponent extends LogInExternalProviderComponent {
-
-  /**
-   * Redirect to orcid authentication url
-   */
-  redirectToOrcid() {
-    this.redirectToExternalProvider();
-  }
-
-}
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..567a05f544 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"
@@ -28,3 +26,12 @@
   <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>
 </form>
+
+<ng-container *ngIf="canShowDivider$ | async">
+  <div class="mt-2">
+    <a class="dropdown-item" *ngIf="canRegister$ | async" [routerLink]="[getRegisterRoute()]"
+       [attr.data-test]="'register' | dsBrowserOnly" role="menuitem">{{"login.form.new-user" | translate}}</a>
+    <a class="dropdown-item" *ngIf="canForgot$ | async" [routerLink]="[getForgotRoute()]"
+       [attr.data-test]="'forgot' | dsBrowserOnly" role="menuitem">{{"login.form.forgot-password" | translate}}</a>
+  </div>
+</ng-container>
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 5238482770..dbd3067909 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
@@ -1,38 +1,45 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
-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 { storeModuleConfig } from '../../../../app.reducer';
 import { authReducer } from '../../../../core/auth/auth.reducer';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { AuthServiceStub } from '../../../testing/auth-service.stub';
-import { storeModuleConfig } from '../../../../app.reducer';
 import { AuthMethod } from '../../../../core/auth/models/auth.method';
 import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
 import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { AuthServiceStub } from '../../../testing/auth-service.stub';
+import { AuthorizationDataServiceStub } from '../../../testing/authorization-service.stub';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
+import { LogInPasswordComponent } from './log-in-password.component';
 
 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: {}
+      getCurrentRoute: {},
     });
 
     initialState = {
@@ -42,20 +49,20 @@ describe('LogInPasswordComponent', () => {
           loaded: false,
           blocking: false,
           loading: false,
-          authMethods: []
-        }
-      }
+          authMethods: [],
+        },
+      },
     };
   });
 
   beforeEach(waitForAsync(() => {
     // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
+    void TestBed.configureTestingModule({
       imports: [
         FormsModule,
         ReactiveFormsModule,
         StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         LogInPasswordComponent,
@@ -63,20 +70,21 @@ 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 }),
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
   }));
 
-  beforeEach(() => {
+  beforeEach(async () => {
     // create component and test fixture
     fixture = TestBed.createComponent(LogInPasswordComponent);
 
@@ -87,15 +95,13 @@ 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', () => {
     fixture.detectChanges();
-    expect(component.form instanceof FormGroup).toBe(true);
+    expect(component.form instanceof UntypedFormGroup).toBe(true);
   });
 
   it('should authenticate', () => {
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 e4a92ded29..9c53ac7b4f 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
@@ -1,20 +1,49 @@
-import { map } from 'rxjs/operators';
-import { Component, Inject, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest,
+  Observable,
+  shareReplay,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
 
-import { select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { AuthenticateAction, ResetAuthenticationMessagesAction } from '../../../../core/auth/auth.actions';
-
-import { getAuthenticationError, getAuthenticationInfo, } from '../../../../core/auth/selectors';
-import { isNotEmpty } from '../../../empty.util';
-import { fadeOut } from '../../../animations/fade';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import {
+  getForgotPasswordRoute,
+  getRegisterRoute,
+} from '../../../../app-routing-paths';
+import {
+  AuthenticateAction,
+  ResetAuthenticationMessagesAction,
+} from '../../../../core/auth/auth.actions';
 import { AuthService } from '../../../../core/auth/auth.service';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { AuthMethod } from '../../../../core/auth/models/auth.method';
+import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
+import {
+  getAuthenticationError,
+  getAuthenticationInfo,
+} from '../../../../core/auth/selectors';
 import { CoreState } from '../../../../core/core-state.model';
+import { AuthorizationDataService } from '../../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../../core/data/feature-authorization/feature-id';
+import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
+import { fadeOut } from '../../../animations/fade';
+import { isNotEmpty } from '../../../empty.util';
+import { renderAuthMethodFor } from '../log-in.methods-decorator';
 
 /**
  * /users/sign-in
@@ -24,7 +53,7 @@ import { CoreState } from '../../../../core/core-state.model';
   selector: 'ds-log-in-password',
   templateUrl: './log-in-password.component.html',
   styleUrls: ['./log-in-password.component.scss'],
-  animations: [fadeOut]
+  animations: [fadeOut],
 })
 @renderAuthMethodFor(AuthMethodType.Password)
 export class LogInPasswordComponent implements OnInit {
@@ -61,26 +90,34 @@ export class LogInPasswordComponent implements OnInit {
 
   /**
    * The authentication form.
-   * @type {FormGroup}
+   * @type {UntypedFormGroup}
    */
-  public form: FormGroup;
+  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>;
+
+  /**
+   * Whether or not the current user (or anonymous) is authorized to register an account
+   */
+  canForgot$: Observable<boolean>;
+
+  /**
+   * Shows the divider only if contains at least one link to show
+   */
+  canShowDivider$: Observable<boolean>;
+
+
   constructor(
     @Inject('authMethodProvider') public injectedAuthMethodModel: AuthMethod,
     @Inject('isStandalonePage') public isStandalonePage: boolean,
     private authService: AuthService,
     private hardRedirectService: HardRedirectService,
-    private formBuilder: FormBuilder,
-    private store: Store<CoreState>
+    private formBuilder: UntypedFormBuilder,
+    protected store: Store<CoreState>,
+    protected authorizationService: AuthorizationDataService,
   ) {
     this.authMethod = injectedAuthMethodModel;
   }
@@ -94,16 +131,16 @@ export class LogInPasswordComponent implements OnInit {
     // set formGroup
     this.form = this.formBuilder.group({
       email: ['', Validators.required],
-      password: ['', Validators.required]
+      password: ['', Validators.required],
     });
 
     // set error
     this.error = this.store.pipe(select(
       getAuthenticationError),
-      map((error) => {
-        this.hasError = (isNotEmpty(error));
-        return error;
-      })
+    map((error) => {
+      this.hasError = (isNotEmpty(error));
+      return error;
+    }),
     );
 
     // set error
@@ -112,9 +149,29 @@ export class LogInPasswordComponent implements OnInit {
       map((message) => {
         this.hasMessage = (isNotEmpty(message));
         return message;
-      })
+      }),
     );
 
+    this.canRegister$ = this.authorizationService.isAuthorized(FeatureID.EPersonRegistration).pipe(
+      shareReplay({ refCount: false, bufferSize: 1 }),
+    );
+    this.canForgot$ = this.authorizationService.isAuthorized(FeatureID.EPersonForgotPassword).pipe(
+      shareReplay({ refCount: false, bufferSize: 1 }),
+    );
+    this.canShowDivider$ =
+        combineLatest([this.canRegister$, this.canForgot$])
+          .pipe(
+            map(([canRegister, canForgot]) => canRegister || canForgot),
+            filter(Boolean),
+          );
+  }
+
+  getRegisterRoute() {
+    return getRegisterRoute();
+  }
+
+  getForgotRoute() {
+    return getForgotPasswordRoute();
   }
 
   /**
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html
deleted file mode 100644
index 3a3b935cfa..0000000000
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<button class="btn btn-lg btn-primary btn-block mt-2 text-white" (click)="redirectToShibboleth()">
-  <i class="fas fa-sign-in-alt"></i> {{"login.form.shibboleth" | translate}}
-</button>
diff --git a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
deleted file mode 100644
index 075d33d98e..0000000000
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.spec.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-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 { 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';
-import { storeModuleConfig } from '../../../../app.reducer';
-import { AuthMethod } from '../../../../core/auth/models/auth.method';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInShibbolethComponent } from './log-in-shibboleth.component';
-import { NativeWindowService } from '../../../../core/services/window.service';
-import { RouterStub } from '../../../testing/router.stub';
-import { ActivatedRouteStub } from '../../../testing/active-router.stub';
-import { NativeWindowMockFactory } from '../../../mocks/mock-native-window-ref';
-import { HardRedirectService } from '../../../../core/services/hard-redirect.service';
-
-
-describe('LogInShibbolethComponent', () => {
-
-  let component: LogInShibbolethComponent;
-  let fixture: ComponentFixture<LogInShibbolethComponent>;
-  let page: Page;
-  let user: EPerson;
-  let componentAsAny: any;
-  let setHrefSpy;
-  let shibbolethBaseUrl;
-  let location;
-  let initialState: any;
-  let hardRedirectService: HardRedirectService;
-
-  beforeEach(() => {
-    user = EPersonMock;
-    shibbolethBaseUrl = 'dspace-rest.test/shibboleth?redirectUrl=';
-    location = shibbolethBaseUrl + 'http://dspace-angular.test/home';
-
-    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
-      getCurrentRoute: {},
-      redirect: {}
-    });
-
-    initialState = {
-      core: {
-        auth: {
-          authenticated: false,
-          loaded: false,
-          blocking: false,
-          loading: false,
-          authMethods: []
-        }
-      }
-    };
-  });
-
-  beforeEach(waitForAsync(() => {
-    // refine the test module by declaring the test component
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({ auth: authReducer }, storeModuleConfig),
-        TranslateModule.forRoot()
-      ],
-      declarations: [
-        LogInShibbolethComponent
-      ],
-      providers: [
-        { provide: AuthService, useClass: AuthServiceStub },
-        { provide: 'authMethodProvider', useValue: new AuthMethod(AuthMethodType.Shibboleth, location) },
-        { provide: 'isStandalonePage', useValue: true },
-        { provide: NativeWindowService, useFactory: NativeWindowMockFactory },
-        { provide: Router, useValue: new RouterStub() },
-        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        { provide: HardRedirectService, useValue: hardRedirectService },
-        provideMockStore({ initialState }),
-      ],
-      schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
-    })
-      .compileComponents();
-
-  }));
-
-  beforeEach(() => {
-    // create component and test fixture
-    fixture = TestBed.createComponent(LogInShibbolethComponent);
-
-    // get test component from the fixture
-    component = fixture.componentInstance;
-    componentAsAny = component;
-
-    // create page
-    page = new Page(component, fixture);
-    setHrefSpy = spyOnProperty(componentAsAny._window.nativeWindow.location, 'href', 'set').and.callThrough();
-
-  });
-
-  it('should set the properly a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/collections/12345';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToShibboleth();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-  it('should not set a new redirectUrl', () => {
-    const currentUrl = 'http://dspace-angular.test/home';
-    componentAsAny._window.nativeWindow.location.href = currentUrl;
-
-    fixture.detectChanges();
-
-    expect(componentAsAny.injectedAuthMethodModel.location).toBe(location);
-    expect(componentAsAny._window.nativeWindow.location.href).toBe(currentUrl);
-
-    component.redirectToShibboleth();
-
-    expect(setHrefSpy).toHaveBeenCalledWith(currentUrl);
-
-  });
-
-});
-
-/**
- * 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: LogInShibbolethComponent, private fixture: ComponentFixture<LogInShibbolethComponent>) {
-    // 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/shibboleth/log-in-shibboleth.component.ts b/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
deleted file mode 100644
index dcfb3ccfc3..0000000000
--- a/src/app/shared/log-in/methods/shibboleth/log-in-shibboleth.component.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Component, } from '@angular/core';
-
-import { renderAuthMethodFor } from '../log-in.methods-decorator';
-import { AuthMethodType } from '../../../../core/auth/models/auth.method-type';
-import { LogInExternalProviderComponent } from '../log-in-external-provider.component';
-
-@Component({
-  selector: 'ds-log-in-shibboleth',
-  templateUrl: './log-in-shibboleth.component.html',
-  styleUrls: ['./log-in-shibboleth.component.scss'],
-
-})
-@renderAuthMethodFor(AuthMethodType.Shibboleth)
-export class LogInShibbolethComponent extends LogInExternalProviderComponent {
-
-  /**
-   * Redirect to shibboleth authentication url
-   */
-  redirectToShibboleth() {
-    this.redirectToExternalProvider();
-  }
-
-}
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..39f81d16cb
--- /dev/null
+++ b/src/app/shared/log-in/themed-log-in.component.ts
@@ -0,0 +1,37 @@
+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/log-out/log-out.component.spec.ts b/src/app/shared/log-out/log-out.component.spec.ts
index 028738a019..260a920558 100644
--- a/src/app/shared/log-out/log-out.component.spec.ts
+++ b/src/app/shared/log-out/log-out.component.spec.ts
@@ -1,18 +1,28 @@
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { Store, StoreModule } from '@ngrx/store';
-
-import { authReducer } from '../../core/auth/auth.reducer';
-import { EPersonMock } from '../testing/eperson.mock';
-import { EPerson } from '../../core/eperson/models/eperson.model';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { Router } from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { AppState } from '../../app.reducer';
-import { LogOutComponent } from './log-out.component';
-import { RouterStub } from '../testing/router.stub';
+import { authReducer } from '../../core/auth/auth.reducer';
+import { EPerson } from '../../core/eperson/models/eperson.model';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { EPersonMock } from '../testing/eperson.mock';
+import { RouterStub } from '../testing/router.stub';
+import { LogOutComponent } from './log-out.component';
 
 describe('LogOutComponent', () => {
 
@@ -41,10 +51,10 @@ describe('LogOutComponent', () => {
         StoreModule.forRoot(authReducer, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         }),
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         LogOutComponent,
@@ -54,8 +64,8 @@ describe('LogOutComponent', () => {
         { provide: Router, useValue: routerStub },
       ],
       schemas: [
-        CUSTOM_ELEMENTS_SCHEMA
-      ]
+        CUSTOM_ELEMENTS_SCHEMA,
+      ],
     })
       .compileComponents();
 
diff --git a/src/app/shared/log-out/log-out.component.ts b/src/app/shared/log-out/log-out.component.ts
index 6fa71caa32..24cc38f3ce 100644
--- a/src/app/shared/log-out/log-out.component.ts
+++ b/src/app/shared/log-out/log-out.component.ts
@@ -1,19 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
+import {
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { select, Store } from '@ngrx/store';
 
-import { LogOutAction } from '../../core/auth/auth.actions';
-import { getLogOutError, } from '../../core/auth/selectors';
 import { AppState } from '../../app.reducer';
+import { LogOutAction } from '../../core/auth/auth.actions';
+import { getLogOutError } from '../../core/auth/selectors';
 import { fadeOut } from '../animations/fade';
 
 @Component({
   selector: 'ds-log-out',
   templateUrl: './log-out.component.html',
   styleUrls: ['./log-out.component.scss'],
-  animations: [fadeOut]
+  animations: [fadeOut],
 })
 export class LogOutComponent implements OnInit {
   /**
diff --git a/src/app/shared/menu/initial-menus-state.ts b/src/app/shared/menu/initial-menus-state.ts
index d684afc3e7..3794458dd4 100644
--- a/src/app/shared/menu/initial-menus-state.ts
+++ b/src/app/shared/menu/initial-menus-state.ts
@@ -1,5 +1,5 @@
-import { MenusState } from './menus-state.model';
 import { MenuID } from './menu-id.model';
+import { MenusState } from './menus-state.model';
 
 /**
  * The initial state of the menus
@@ -12,7 +12,7 @@ export const initialMenusState: MenusState = {
       previewCollapsed: true,
       visible: false,
       sections: {},
-      sectionToSubsectionIndex: {}
+      sectionToSubsectionIndex: {},
     },
   [MenuID.PUBLIC]:
     {
@@ -21,6 +21,15 @@ export const initialMenusState: MenusState = {
       previewCollapsed: true,
       visible: true,
       sections: {},
-      sectionToSubsectionIndex: {}
-    }
+      sectionToSubsectionIndex: {},
+    },
+  [MenuID.DSO_EDIT]:
+    {
+      id: MenuID.DSO_EDIT,
+      collapsed: true,
+      previewCollapsed: true,
+      visible: false,
+      sections: {},
+      sectionToSubsectionIndex: {},
+    },
 };
diff --git a/src/app/shared/menu/menu-id.model.ts b/src/app/shared/menu/menu-id.model.ts
index 50ce924a1b..4e7d31f467 100644
--- a/src/app/shared/menu/menu-id.model.ts
+++ b/src/app/shared/menu/menu-id.model.ts
@@ -3,5 +3,6 @@
  */
 export enum MenuID {
   ADMIN = 'admin-sidebar',
-  PUBLIC = 'public'
+  PUBLIC = 'public',
+  DSO_EDIT = 'dso-edit'
 }
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.spec.ts b/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts
index 4c55758b3d..22039ed0d6 100644
--- a/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/external-link-menu-item.component.spec.ts
@@ -1,7 +1,15 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { ExternalLinkMenuItemComponent } from './external-link-menu-item.component';
 
 describe('ExternalLinkMenuItemComponent', () => {
@@ -24,7 +32,7 @@ describe('ExternalLinkMenuItemComponent', () => {
       providers: [
         { provide: 'itemModelProvider', useValue: { text: text, href: link } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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..124bf4595e 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
@@ -1,15 +1,21 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { rendersMenuItemForType } from '../menu-item.decorator';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+
 import { isNotEmpty } from '../../empty.util';
-import { ExternalLinkMenuItemModel } from './models/external-link.model';
+import { rendersMenuItemForType } from '../menu-item.decorator';
 import { MenuItemType } from '../menu-item-type.model';
+import { ExternalLinkMenuItemModel } from './models/external-link.model';
 
 /**
  * Component that renders a menu section of type EXTERNAL
  */
 @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 {
@@ -18,7 +24,7 @@ export class ExternalLinkMenuItemComponent implements OnInit {
   hasLink: boolean;
 
   constructor(
-    @Inject('itemModelProvider') item: ExternalLinkMenuItemModel
+    @Inject('itemModelProvider') item: ExternalLinkMenuItemModel,
   ) {
     this.item = item;
   }
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 b3d0059217..58a3cec10c 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,8 +1,7 @@
-
-<a class="nav-item nav-link"
-   [ngClass]="{ 'disabled': !hasLink }"
-   [attr.aria-disabled]="!hasLink"
-   [title]="item.text | translate"
+<a class="ds-menu-item" role="menuitem"
+   [ngClass]="{ 'disabled': !hasLink || item.disabled }"
+   [attr.aria-disabled]="!hasLink || item.disabled"
+   [attr.data-test]="'link-menu-item.'+item.text"
    [routerLink]="getRouterLink()"
    [queryParams]="item.queryParams"
    (click)="$event.stopPropagation()"
diff --git a/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts
index 96444a5447..e92b725101 100644
--- a/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/link-menu-item.component.spec.ts
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { LinkMenuItemComponent } from './link-menu-item.component';
-import { RouterLinkDirectiveStub } from '../../testing/router-link-directive.stub';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
 import { RouterStub } from '../../testing/router.stub';
-import { Router } from '@angular/router';
+import { RouterLinkDirectiveStub } from '../../testing/router-link-directive.stub';
+import { LinkMenuItemComponent } from './link-menu-item.component';
 
 describe('LinkMenuItemComponent', () => {
   let component: LinkMenuItemComponent;
@@ -19,7 +27,7 @@ describe('LinkMenuItemComponent', () => {
   function init() {
     text = 'HELLO';
     link = '/world/hello';
-    queryParams = {params: true};
+    queryParams = { params: true };
   }
 
   beforeEach(waitForAsync(() => {
@@ -31,7 +39,7 @@ describe('LinkMenuItemComponent', () => {
         { provide: 'itemModelProvider', useValue: { text: text, link: link, queryParams: queryParams } },
         { provide: Router, useValue: RouterStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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 c9a60f0c28..6d3424cb77 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
@@ -1,16 +1,22 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
-import { LinkMenuItemModel } from './models/link.model';
-import { rendersMenuItemForType } from '../menu-item.decorator';
-import { isNotEmpty } from '../../empty.util';
-import { MenuItemType } from '../menu-item-type.model';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 
+import { isNotEmpty } from '../../empty.util';
+import { rendersMenuItemForType } from '../menu-item.decorator';
+import { MenuItemType } from '../menu-item-type.model';
+import { LinkMenuItemModel } from './models/link.model';
+
 /**
  * Component that renders a menu section of type LINK
  */
 @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 {
@@ -36,7 +42,7 @@ export class LinkMenuItemComponent implements OnInit {
 
   navigate(event: any) {
     event.preventDefault();
-    if (this.getRouterLink()) {
+    if (!this.item.disabled && this.getRouterLink()) {
       this.router.navigate([this.getRouterLink()]);
     }
     event.stopPropagation();
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/models/altmetric.model.ts b/src/app/shared/menu/menu-item/models/altmetric.model.ts
index 9dabb43a92..cf007f92b6 100644
--- a/src/app/shared/menu/menu-item/models/altmetric.model.ts
+++ b/src/app/shared/menu/menu-item/models/altmetric.model.ts
@@ -1,10 +1,11 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an Altmetric Menu Section
  */
 export class AltmetricMenuItemModel implements MenuItemModel {
   type = MenuItemType.ALTMETRIC;
+  disabled: boolean;
   url: string;
 }
diff --git a/src/app/shared/menu/menu-item/models/external-link.model.ts b/src/app/shared/menu/menu-item/models/external-link.model.ts
index c5168a449e..8cd9854113 100644
--- a/src/app/shared/menu/menu-item/models/external-link.model.ts
+++ b/src/app/shared/menu/menu-item/models/external-link.model.ts
@@ -1,11 +1,12 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing a Link Menu Section for an external link
  */
 export class ExternalLinkMenuItemModel implements MenuItemModel {
   type = MenuItemType.EXTERNAL;
+  disabled: boolean;
   text: string;
   href: string;
 }
diff --git a/src/app/shared/menu/menu-item/models/link.model.ts b/src/app/shared/menu/menu-item/models/link.model.ts
index 3fe8b8ccb0..b80a259717 100644
--- a/src/app/shared/menu/menu-item/models/link.model.ts
+++ b/src/app/shared/menu/menu-item/models/link.model.ts
@@ -1,12 +1,14 @@
-import { MenuItemModel } from './menu-item.model';
-import { MenuItemType } from '../../menu-item-type.model';
 import { Params } from '@angular/router';
 
+import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
+
 /**
  * Model representing an Link Menu Section
  */
 export class LinkMenuItemModel implements MenuItemModel {
   type = MenuItemType.LINK;
+  disabled: boolean;
   text: string;
   link: string;
   queryParams?: Params | null;
diff --git a/src/app/shared/menu/menu-item/models/menu-item.model.ts b/src/app/shared/menu/menu-item/models/menu-item.model.ts
index b60b55719e..ddca3d222d 100644
--- a/src/app/shared/menu/menu-item/models/menu-item.model.ts
+++ b/src/app/shared/menu/menu-item/models/menu-item.model.ts
@@ -5,4 +5,5 @@ import { MenuItemType } from '../../menu-item-type.model';
  */
 export interface MenuItemModel {
   type: MenuItemType;
+  disabled: boolean;
 }
diff --git a/src/app/shared/menu/menu-item/models/onclick.model.ts b/src/app/shared/menu/menu-item/models/onclick.model.ts
index 2501163bfc..3ec19dfe19 100644
--- a/src/app/shared/menu/menu-item/models/onclick.model.ts
+++ b/src/app/shared/menu/menu-item/models/onclick.model.ts
@@ -1,11 +1,12 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an OnClick Menu Section
  */
 export class OnClickMenuItemModel implements MenuItemModel {
   type = MenuItemType.ONCLICK;
+  disabled: boolean;
   text: string;
-  function: () => {};
+  function: () => void;
 }
diff --git a/src/app/shared/menu/menu-item/models/search.model.ts b/src/app/shared/menu/menu-item/models/search.model.ts
index eac281da51..c9d3c9fe4e 100644
--- a/src/app/shared/menu/menu-item/models/search.model.ts
+++ b/src/app/shared/menu/menu-item/models/search.model.ts
@@ -1,11 +1,12 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an Search Bar Menu Section
  */
 export class SearchMenuItemModel implements MenuItemModel {
   type = MenuItemType.SEARCH;
+  disabled: boolean;
   placeholder: string;
   action: string;
 }
diff --git a/src/app/shared/menu/menu-item/models/text.model.ts b/src/app/shared/menu/menu-item/models/text.model.ts
index 70dc7c1203..04eea7e53b 100644
--- a/src/app/shared/menu/menu-item/models/text.model.ts
+++ b/src/app/shared/menu/menu-item/models/text.model.ts
@@ -1,10 +1,11 @@
-import { MenuItemModel } from './menu-item.model';
 import { MenuItemType } from '../../menu-item-type.model';
+import { MenuItemModel } from './menu-item.model';
 
 /**
  * Model representing an Text Menu Section
  */
 export class TextMenuItemModel implements MenuItemModel {
   type = MenuItemType.TEXT;
+  disabled: boolean;
   text: string;
 }
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 fd0192ad5f..4e68b6c5bc 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,8 +1,10 @@
-<a href="javascript:void(0);"
-   class="nav-item nav-link"
-   role="button"
+<a *ngIf="!item.disabled"
+   class="ds-menu-item" role="menuitem"
+   routerLinkActive="active"
+   href="javascript:void(0);"
    [title]="item.text | translate"
    (click)="activate($event)"
    (keyup.space)="activate($event)"
    (keyup.enter)="activate($event)"
 >{{item.text | translate}}</a>
+<span *ngIf="item.disabled" 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..3f9514adc8 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
@@ -1,9 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { OnClickMenuItemComponent } from './onclick-menu-item.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { OnClickMenuItemModel } from './models/onclick.model';
+import { OnClickMenuItemComponent } from './onclick-menu-item.component';
 
 describe('OnClickMenuItemComponent', () => {
   let component: OnClickMenuItemComponent;
@@ -22,7 +30,7 @@ describe('OnClickMenuItemComponent', () => {
       providers: [
         { provide: 'itemModelProvider', useValue: item },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -45,7 +53,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 8df65a35c1..a067f2e5cb 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
@@ -1,26 +1,33 @@
-import { Component, Inject } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
 import { rendersMenuItemForType } from '../menu-item.decorator';
-import { OnClickMenuItemModel } from './models/onclick.model';
 import { MenuItemType } from '../menu-item-type.model';
+import { OnClickMenuItemModel } from './models/onclick.model';
 
 /**
  * Component that renders a menu section of type ONCLICK
  */
 @Component({
   selector: 'ds-onclick-menu-item',
-  styleUrls: ['./onclick-menu-item.component.scss'],
-  templateUrl: './onclick-menu-item.component.html'
+  styleUrls: ['./menu-item.component.scss', './onclick-menu-item.component.scss'],
+  templateUrl: './onclick-menu-item.component.html',
 })
 @rendersMenuItemForType(MenuItemType.ONCLICK)
 export class OnClickMenuItemComponent {
   item: OnClickMenuItemModel;
+
   constructor(@Inject('itemModelProvider') item: OnClickMenuItemModel) {
     this.item = item;
   }
 
   public activate(event: any) {
-    event.preventDefault();
-    this.item.function();
-    event.stopPropagation();
+    if (!this.item.disabled) {
+      event.preventDefault();
+      this.item.function();
+      event.stopPropagation();
+    }
   }
 }
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 7ba353e5e7..ba3cf99a49 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>{{item.text | translate}}</span>
\ No newline at end of file
+<span class="ds-menu-item" [class.disabled]="item.disabled">{{item.text | translate}}</span>
diff --git a/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts b/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts
index a0c159af23..81c565c539 100644
--- a/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts
+++ b/src/app/shared/menu/menu-item/text-menu-item.component.spec.ts
@@ -1,8 +1,16 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TextMenuItemComponent } from './text-menu-item.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { TextMenuItemComponent } from './text-menu-item.component';
 
 describe('TextMenuItemComponent', () => {
   let component: TextMenuItemComponent;
@@ -16,7 +24,7 @@ describe('TextMenuItemComponent', () => {
       providers: [
         { provide: 'itemModelProvider', useValue: { text: text } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
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 af690d198c..9bbb1ec8c3 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
@@ -1,13 +1,18 @@
-import { Component, Inject, Input } from '@angular/core';
-import { TextMenuItemModel } from './models/text.model';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+
 import { rendersMenuItemForType } from '../menu-item.decorator';
 import { MenuItemType } from '../menu-item-type.model';
+import { TextMenuItemModel } from './models/text.model';
 
 /**
  * Component that renders a menu section of type TEXT
  */
 @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.decorator.ts b/src/app/shared/menu/menu-section.decorator.ts
index 515ee2ff5c..f052a7e981 100644
--- a/src/app/shared/menu/menu-section.decorator.ts
+++ b/src/app/shared/menu/menu-section.decorator.ts
@@ -1,6 +1,6 @@
+import { hasValue } from '../empty.util';
 import { DEFAULT_THEME } from '../object-collection/shared/listable-object/listable-object.decorator';
 import { MenuID } from './menu-id.model';
-import { hasValue } from '../empty.util';
 
 const menuComponentMap = new Map();
 
@@ -19,7 +19,7 @@ export function rendersSectionForMenu(menuID: MenuID, expandable: boolean, theme
       menuComponentMap.set(menuID, new Map());
     }
     if (!menuComponentMap.get(menuID).get(expandable)) {
-        menuComponentMap.get(menuID).set(expandable, new Map());
+      menuComponentMap.get(menuID).set(expandable, new Map());
     }
     menuComponentMap.get(menuID).get(expandable).set(theme, menuSectionWrapperComponent);
   };
diff --git a/src/app/shared/menu/menu-section/menu-section.component.spec.ts b/src/app/shared/menu/menu-section/menu-section.component.spec.ts
index f40f45f9b4..4e1ee897bf 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.spec.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.spec.ts
@@ -1,13 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  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 { MenuSectionComponent } from './menu-section.component';
-import { MenuService } from '../menu.service';
-import { MenuServiceStub } from '../../testing/menu-service.stub';
 import { of as observableOf } from 'rxjs';
+
+import { MenuServiceStub } from '../../testing/menu-service.stub';
+import { MenuService } from '../menu.service';
 import { LinkMenuItemComponent } from '../menu-item/link-menu-item.component';
 import { MenuSection } from '../menu-section.model';
+import { MenuSectionComponent } from './menu-section.component';
 
 describe('MenuSectionComponent', () => {
   let comp: MenuSectionComponent;
@@ -19,7 +28,7 @@ describe('MenuSectionComponent', () => {
     dummySection = {
       id: 'section',
       visible: true,
-      active: false
+      active: false,
     } as any;
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule],
@@ -29,9 +38,9 @@ describe('MenuSectionComponent', () => {
         { provide: MenuService, useClass: MenuServiceStub },
         { provide: MenuSection, useValue: dummySection },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MenuSectionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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 bef90b21c3..1624e83aa8 100644
--- a/src/app/shared/menu/menu-section/menu-section.component.ts
+++ b/src/app/shared/menu/menu-section/menu-section.component.ts
@@ -1,21 +1,37 @@
-import { Component, Injector, OnDestroy, OnInit } from '@angular/core';
-import { MenuService } from '../menu.service';
-import { getComponentForMenuItemType } from '../menu-item.decorator';
-import { hasNoValue, hasValue } from '../../empty.util';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { MenuItemModel } from '../menu-item/models/menu-item.model';
-import { distinctUntilChanged, switchMap } from 'rxjs/operators';
+import {
+  Component,
+  Injector,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  switchMap,
+} from 'rxjs/operators';
+
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { MenuSection } from '../menu-section.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../empty.util';
+import { MenuService } from '../menu.service';
 import { MenuID } from '../menu-id.model';
+import { getComponentForMenuItemType } from '../menu-item.decorator';
+import { MenuItemModel } from '../menu-item/models/menu-item.model';
 import { MenuItemType } from '../menu-item-type.model';
+import { MenuSection } from '../menu-section.model';
 
 /**
  * A basic implementation of a menu section's component
  */
 @Component({
   selector: 'ds-menu-section',
-  template: ''
+  template: '',
 })
 export class MenuSectionComponent implements OnInit, OnDestroy {
 
@@ -65,7 +81,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    */
   toggleSection(event: Event) {
     event.preventDefault();
-    this.menuService.toggleActiveSection(this.menuID, this.section.id);
+    if (!this.section.model?.disabled) {
+      this.menuService.toggleActiveSection(this.menuID, this.section.id);
+    }
   }
 
   /**
@@ -74,7 +92,9 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
    */
   activateSection(event: Event) {
     event.preventDefault();
-    this.menuService.activateSection(this.menuID, this.section.id);
+    if (!this.section.model?.disabled) {
+      this.menuService.activateSection(this.menuID, this.section.id);
+    }
   }
 
   /**
@@ -93,21 +113,21 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
     this.updateSectionMap(
       this.section.id,
       this.getItemModelInjector(this.section.model),
-      this.getMenuItemComponent(this.section.model)
+      this.getMenuItemComponent(this.section.model),
     );
     this.subSections$ = this.menuService.getSubSectionsByParentID(this.menuID, this.section.id);
     this.subs.push(
       this.subSections$.pipe(
         // if you return an array from a switchMap it will emit each element as a separate event.
         // So this switchMap is equivalent to a subscribe with a forEach inside
-        switchMap((sections: MenuSection[]) => sections)
+        switchMap((sections: MenuSection[]) => sections),
       ).subscribe((section: MenuSection) => {
         this.updateSectionMap(
           section.id,
           this.getItemModelInjector(section.model),
-          this.getMenuItemComponent(section.model)
+          this.getMenuItemComponent(section.model),
         );
-      })
+      }),
     );
   }
 
@@ -144,7 +164,7 @@ export class MenuSectionComponent implements OnInit, OnDestroy {
     }
     return Injector.create({
       providers: [{ provide: 'itemModelProvider', useFactory: () => (itemModel), deps: [] }],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/shared/menu/menu-state.model.ts b/src/app/shared/menu/menu-state.model.ts
index 0bedac2129..398f2732fe 100644
--- a/src/app/shared/menu/menu-state.model.ts
+++ b/src/app/shared/menu/menu-state.model.ts
@@ -1,6 +1,6 @@
+import { MenuID } from './menu-id.model';
 import { MenuSectionIndex } from './menu-section-Index.model';
 import { MenuSections } from './menu-sections.model';
-import { MenuID } from './menu-id.model';
 
 /**
  * Represents the state of a single menu in the store
diff --git a/src/app/shared/menu/menu.actions.ts b/src/app/shared/menu/menu.actions.ts
index f02fd73292..f3c9aa73dc 100644
--- a/src/app/shared/menu/menu.actions.ts
+++ b/src/app/shared/menu/menu.actions.ts
@@ -1,8 +1,9 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
-import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
+import { MenuSection } from './menu-section.model';
 
 /**
  * For each action type in an action group, make a simple
@@ -18,6 +19,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 +117,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 +233,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..d7613e8c38 100644
--- a/src/app/shared/menu/menu.component.spec.ts
+++ b/src/app/shared/menu/menu.component.spec.ts
@@ -1,28 +1,77 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+// eslint-disable-next-line max-classes-per-file
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+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 { 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 { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
-import { Item } from '../../core/shared/item.model';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
+import { authReducer } from '../../core/auth/auth.reducer';
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
+import { Item } from '../../core/shared/item.model';
+import { getMockThemeService } from '../mocks/theme-service.mock';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
 import { ThemeService } from '../theme-support/theme.service';
-import { getMockThemeService } from '../mocks/theme-service.mock';
+import { MenuComponent } from './menu.component';
+import { MenuService } from './menu.service';
+import { MenuID } from './menu-id.model';
+import { LinkMenuItemModel } from './menu-item/models/link.model';
+import { MenuItemType } from './menu-item-type.model';
+import { rendersSectionForMenu } from './menu-section.decorator';
+import { MenuSection } from './menu-section.model';
+
+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' } };
 
@@ -35,38 +84,72 @@ describe('MenuComponent', () => {
     lastModified: '2018',
     _links: {
       self: {
-        href: 'https://localhost:8000/items/fake-id'
-      }
-    }
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
   });
 
 
   const routeStub = {
     data: observableOf({
-      dso: createSuccessfulRemoteDataObject(mockItem)
+      dso: createSuccessfulRemoteDataObject(mockItem),
     }),
-    children: []
+    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)
+      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]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(MenuComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -74,13 +157,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..d1b844acc5 100644
--- a/src/app/shared/menu/menu.component.ts
+++ b/src/app/shared/menu/menu.component.ts
@@ -1,25 +1,44 @@
-import { ChangeDetectionStrategy, Component, Injector, OnDestroy, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { MenuService } from './menu.service';
-import { distinctUntilChanged, map, mergeMap, switchMap } from 'rxjs/operators';
-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 {
+  ChangeDetectionStrategy,
+  Component,
+  Injector,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  mergeMap,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthorizationDataService } from '../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  hasValue,
+  isNotEmptyOperator,
+} from '../empty.util';
 import { ThemeService } from '../theme-support/theme.service';
+import { MenuService } from './menu.service';
+import { MenuID } from './menu-id.model';
+import { getComponentForMenu } from './menu-section.decorator';
+import { MenuSection } from './menu-section.model';
+import { MenuSectionComponent } from './menu-section/menu-section.component';
 
 /**
  * A basic implementation of a MenuComponent
  */
 @Component({
   selector: 'ds-menu',
-  template: ''
+  template: '',
 })
 export class MenuComponent implements OnInit, OnDestroy {
   /**
@@ -74,7 +93,7 @@ export class MenuComponent implements OnInit, OnDestroy {
   private activatedRouteLastChild: ActivatedRoute;
 
   constructor(protected menuService: MenuService, protected injector: Injector, public authorizationService: AuthorizationDataService,
-              public route: ActivatedRoute, protected themeService: ThemeService
+              public route: ActivatedRoute, protected themeService: ThemeService,
   ) {
   }
 
@@ -86,7 +105,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(
@@ -101,17 +120,17 @@ export class MenuComponent implements OnInit, OnDestroy {
         }),
         isNotEmptyOperator(),
         switchMap((section: MenuSection) => this.getSectionComponent(section).pipe(
-          map((component: GenericConstructor<MenuSectionComponent>) => ({ section, component }))
+          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, {
           injector: this.getSectionDataInjector(section),
-          component
+          component,
         });
         this.sectionMap$.next(nextMap);
-      })
+      }),
     );
   }
 
@@ -140,7 +159,7 @@ export class MenuComponent implements OnInit, OnDestroy {
               return section;
             }
           }));
-      })
+      }),
     );
   }
 
@@ -219,7 +238,7 @@ export class MenuComponent implements OnInit, OnDestroy {
     return this.menuService.hasSubSections(this.menuID, section.id).pipe(
       map((expandable: boolean) => {
         return getComponentForMenu(this.menuID, expandable, this.themeService.getThemeName());
-      }
+      },
       ),
     );
   }
@@ -232,7 +251,7 @@ export class MenuComponent implements OnInit, OnDestroy {
   private getSectionDataInjector(section: MenuSection) {
     return Injector.create({
       providers: [{ provide: 'sectionDataProvider', useFactory: () => (section), deps: [] }],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/shared/menu/menu.effects.spec.ts b/src/app/shared/menu/menu.effects.spec.ts
index 72319e06b8..f3b6d9ddde 100644
--- a/src/app/shared/menu/menu.effects.spec.ts
+++ b/src/app/shared/menu/menu.effects.spec.ts
@@ -1,144 +1,51 @@
-import { LinkMenuItemModel } from './menu-item/models/link.model';
-import { TestBed } from '@angular/core/testing';
-import { MenuService } from './menu.service';
-import { ActivatedRoute } from '@angular/router';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
-import { ROUTER_NAVIGATED } from '@ngrx/router-store';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { Observable } from 'rxjs';
+
+import {
+  StoreAction,
+  StoreActionTypes,
+} from '../../store.actions';
+import { ReinitMenuAction } from './menu.actions';
 import { MenuEffects } from './menu.effects';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
-import { MenuItemType } from './menu-item-type.model';
 
 describe('MenuEffects', () => {
   let menuEffects: MenuEffects;
-  let routeDataMenuSection: MenuSection;
-  let routeDataMenuSectionResolved: MenuSection;
-  let routeDataMenuChildSection: MenuSection;
-  let toBeRemovedMenuSection: MenuSection;
-  let alreadyPresentMenuSection: MenuSection;
-  let route;
-  let menuService;
   let actions: Observable<any>;
-
-  function init() {
-    routeDataMenuSection = {
-      id: 'mockSection_:idparam',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.mockSection',
-        link: 'path/:linkparam'
-      } as LinkMenuItemModel
-    };
-    routeDataMenuSectionResolved = {
-      id: 'mockSection_id_param_resolved',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.mockSection',
-        link: 'path/link_param_resolved'
-      } as LinkMenuItemModel
-    };
-    routeDataMenuChildSection = {
-      id: 'mockChildSection',
-      parentID: 'mockSection',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.mockChildSection',
-        link: ''
-      } as LinkMenuItemModel
-    };
-    toBeRemovedMenuSection = {
-      id: 'toBeRemovedSection',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.toBeRemovedSection',
-        link: ''
-      } as LinkMenuItemModel
-    };
-    alreadyPresentMenuSection = {
-      id: 'alreadyPresentSection',
-      active: false,
-      visible: true,
-      model: {
-        type: MenuItemType.LINK,
-        text: 'menu.section.alreadyPresentSection',
-        link: ''
-      } as LinkMenuItemModel
-    };
-    route = {
-      root: {
-        snapshot: {
-          data: {
-            menu: {
-              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection]
-            }
-          },
-          params: {
-            idparam: 'id_param_resolved',
-            linkparam: 'link_param_resolved',
-          }
-        },
-        firstChild: {
-          snapshot: {
-            data: {
-              menu: {
-                [MenuID.PUBLIC]: routeDataMenuChildSection
-              }
-            }
-          }
-        }
-      }
-    };
-
-    menuService = jasmine.createSpyObj('menuService', {
-      getNonPersistentMenuSections: observableOf([toBeRemovedMenuSection, alreadyPresentMenuSection]),
-      addSection: {},
-      removeSection: {}
-    });
-  }
-
-  beforeEach(() => {
-    init();
+  beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       providers: [
         MenuEffects,
-        { provide: MenuService, useValue: menuService },
-        { provide: ActivatedRoute, useValue: route },
-        provideMockActions(() => actions)
-      ]
+        provideMockActions(() => actions),
+      ],
     });
+  }));
 
+  beforeEach(() => {
     menuEffects = TestBed.inject(MenuEffects);
   });
 
-  describe('buildRouteMenuSections$', () => {
-    it('should add and remove menu sections depending on the current route', () => {
-      actions = hot('--a-', {
-        a: {
-          type: ROUTER_NAVIGATED
-        }
+  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 });
 
-      const expected = cold('--b-', {
-        b: {
-          type: ROUTER_NAVIGATED
-        }
+        expect(menuEffects.reinitDSOMenus).toBeObservable(expected);
       });
-
-      expect(menuEffects.buildRouteMenuSections$).toBeObservable(expected);
-      expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
-      expect(menuService.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuChildSection);
-      expect(menuService.addSection).not.toHaveBeenCalledWith(MenuID.PUBLIC, alreadyPresentMenuSection);
-      expect(menuService.removeSection).toHaveBeenCalledWith(MenuID.PUBLIC, toBeRemovedMenuSection.id);
     });
   });
+
+
 });
diff --git a/src/app/shared/menu/menu.effects.ts b/src/app/shared/menu/menu.effects.ts
index d566545352..e3216ef0e8 100644
--- a/src/app/shared/menu/menu.effects.ts
+++ b/src/app/shared/menu/menu.effects.ts
@@ -1,122 +1,27 @@
-import { ActivatedRoute } from '@angular/router';
-import { hasNoValue, hasValue } from '../empty.util';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
-import { MenuService } from './menu.service';
-import { Observable } from 'rxjs';
-import { Action } from '@ngrx/store';
-import { ROUTER_NAVIGATED } from '@ngrx/router-store';
 import { Injectable } from '@angular/core';
-import { map, take, tap } from 'rxjs/operators';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { map } from 'rxjs/operators';
+
+import { StoreActionTypes } from '../../store.actions';
+import { ReinitMenuAction } from './menu.actions';
 
-/**
- * Effects modifying the state of menus
- */
 @Injectable()
 export class MenuEffects {
 
   /**
-   * On route change, build menu sections for every menu type depending on the current route data
+   * When the store is rehydrated in the browser, re-initialise the menus to ensure
+   * the menus with functions are loaded correctly.
    */
-  public buildRouteMenuSections$: Observable<Action> = createEffect(() => this.actions$
-    .pipe(
-      ofType(ROUTER_NAVIGATED),
-      tap(() => {
-        Object.values(MenuID).forEach((menuID) => {
-          this.buildRouteMenuSections(menuID);
-        });
-      })
-    ), { dispatch: false });
+  reinitDSOMenus = createEffect(() => this.actions$
+    .pipe(ofType(StoreActionTypes.REHYDRATE),
+      map(() => new ReinitMenuAction()),
+    ));
 
-  constructor(private actions$: Actions,
-    private menuService: MenuService,
-    private route: ActivatedRoute) {
-  }
-
-  /**
-   * Build menu sections depending on the current route
-   * - Adds sections found in the current route data that aren't active yet
-   * - Removes sections that are active, but not present in the current route data
-   * @param menuID  The menu to add/remove sections to/from
-   */
-  buildRouteMenuSections(menuID: MenuID) {
-    this.menuService.getNonPersistentMenuSections(menuID).pipe(
-      map((sections) => sections.map((section) => section.id)),
-      take(1)
-    ).subscribe((shouldNotPersistIDs: string[]) => {
-      const resolvedSections = this.resolveRouteMenuSections(this.route.root, menuID);
-      resolvedSections.forEach((section) => {
-        const index = shouldNotPersistIDs.indexOf(section.id);
-        if (index > -1) {
-          shouldNotPersistIDs.splice(index, 1);
-        } else {
-          this.menuService.addSection(menuID, section);
-        }
-      });
-      shouldNotPersistIDs.forEach((id) => {
-        this.menuService.removeSection(menuID, id);
-      });
-    });
-  }
-
-  /**
-   * Resolve menu sections defined in the current route data (including parent routes)
-   * @param route   The route to resolve data for
-   * @param menuID  The menu to resolve data for
-   */
-  resolveRouteMenuSections(route: ActivatedRoute, menuID: MenuID): MenuSection[] {
-    const data = route.snapshot.data;
-    const params = route.snapshot.params;
-    const last: boolean = hasNoValue(route.firstChild);
-
-    if (hasValue(data) && hasValue(data.menu) && hasValue(data.menu[menuID])) {
-      let menuSections: MenuSection[] | MenuSection = data.menu[menuID];
-      menuSections = this.resolveSubstitutions(menuSections, params);
-
-      if (!Array.isArray(menuSections)) {
-        menuSections = [menuSections];
-      }
-
-      if (!last) {
-        return [...menuSections, ...this.resolveRouteMenuSections(route.firstChild, menuID)];
-      } else {
-        return [...menuSections];
-      }
-    }
-
-    return !last ? this.resolveRouteMenuSections(route.firstChild, menuID) : [];
-  }
-
-  private resolveSubstitutions(object, params) {
-
-    let resolved;
-    if (typeof object === 'string') {
-      resolved = object;
-      let match: RegExpMatchArray;
-      do {
-        match = resolved.match(/:(\w+)/);
-        if (match) {
-          const substitute = params[match[1]];
-          if (hasValue(substitute)) {
-            resolved = resolved.replace(match[0], `${substitute}`);
-          }
-        }
-      } while (match);
-    } else if (Array.isArray(object)) {
-      resolved = [];
-      object.forEach((entry, index) => {
-        resolved[index] = this.resolveSubstitutions(object[index], params);
-      });
-    } else if (typeof object === 'object') {
-      resolved = {};
-      Object.keys(object).forEach((key) => {
-        resolved[key] = this.resolveSubstitutions(object[key], params);
-      });
-    } else {
-      resolved = object;
-    }
-    return resolved;
+  constructor(private actions$: Actions) {
   }
 
 }
diff --git a/src/app/shared/menu/menu.module.ts b/src/app/shared/menu/menu.module.ts
index 1d186a9b7d..e650788f88 100644
--- a/src/app/shared/menu/menu.module.ts
+++ b/src/app/shared/menu/menu.module.ts
@@ -1,19 +1,23 @@
-import { MenuSectionComponent } from './menu-section/menu-section.component';
-import { MenuComponent } from './menu.component';
-import { NgModule } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
-import { RouterModule } from '@angular/router';
-import { LinkMenuItemComponent } from './menu-item/link-menu-item.component';
-import { TextMenuItemComponent } from './menu-item/text-menu-item.component';
-import { OnClickMenuItemComponent } from './menu-item/onclick-menu-item.component';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { MenuComponent } from './menu.component';
 import { ExternalLinkMenuItemComponent } from './menu-item/external-link-menu-item.component';
+import { LinkMenuItemComponent } from './menu-item/link-menu-item.component';
+import { OnClickMenuItemComponent } from './menu-item/onclick-menu-item.component';
+import { TextMenuItemComponent } from './menu-item/text-menu-item.component';
+import { MenuSectionComponent } from './menu-section/menu-section.component';
 
 const COMPONENTS = [
   MenuSectionComponent,
   MenuComponent,
-  LinkMenuItemComponent,
+];
+
+const ENTRY_COMPONENTS = [
   TextMenuItemComponent,
+  LinkMenuItemComponent,
   OnClickMenuItemComponent,
   ExternalLinkMenuItemComponent,
 ];
@@ -21,7 +25,7 @@ const COMPONENTS = [
 const MODULES = [
   TranslateModule,
   RouterModule,
-  CommonModule
+  CommonModule,
 ];
 const PROVIDERS = [
 
@@ -29,17 +33,19 @@ const PROVIDERS = [
 
 @NgModule({
   imports: [
-    ...MODULES
+    ...MODULES,
   ],
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
+    ...ENTRY_COMPONENTS,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 
 /**
diff --git a/src/app/shared/menu/menu.reducer.spec.ts b/src/app/shared/menu/menu.reducer.spec.ts
index 7ae05536af..da837f2062 100644
--- a/src/app/shared/menu/menu.reducer.spec.ts
+++ b/src/app/shared/menu/menu.reducer.spec.ts
@@ -1,4 +1,7 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
+import { initialMenusState } from './initial-menus-state';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -9,16 +12,16 @@ import {
   ExpandMenuPreviewAction,
   HideMenuAction,
   HideMenuSectionAction,
+  ReinitMenuAction,
   RemoveMenuSectionAction,
   ShowMenuAction,
   ShowMenuSectionAction,
   ToggleActiveMenuSectionAction,
-  ToggleMenuAction
+  ToggleMenuAction,
 } from './menu.actions';
 import { menusReducer } from './menu.reducer';
-import { initialMenusState} from './initial-menus-state';
-import { MenuSectionIndex } from './menu-section-Index.model';
 import { MenuID } from './menu-id.model';
+import { MenuSectionIndex } from './menu-section-Index.model';
 
 let visibleSection1;
 let dummyState;
@@ -56,10 +59,10 @@ describe('menusReducer', () => {
             visible: true,
             model: {
               type: 0,
-              text: 'menu.section.new'
+              text: 'menu.section.new',
             },
             icon: 'plus-circle',
-            index: 0
+            index: 0,
           },
           new_item: {
             id: 'new_item',
@@ -69,8 +72,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.new_item',
-              link: '/items/submission'
-            }
+              link: '/items/submission',
+            },
           },
           new_community: {
             id: 'new_community',
@@ -80,8 +83,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.new_community',
-              link: '/communities/submission'
-            }
+              link: '/communities/submission',
+            },
           },
           access_control: {
             id: 'access_control',
@@ -89,10 +92,10 @@ describe('menusReducer', () => {
             visible: true,
             model: {
               type: 0,
-              text: 'menu.section.access_control'
+              text: 'menu.section.access_control',
             },
             icon: 'key',
-            index: 4
+            index: 4,
           },
           access_control_people: {
             id: 'access_control_people',
@@ -102,8 +105,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.access_control_people',
-              link: '#'
-            }
+              link: '#',
+            },
           },
           access_control_groups: {
             id: 'access_control_groups',
@@ -113,8 +116,8 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.access_control_groups',
-              link: '#'
-            }
+              link: '#',
+            },
           },
           new_collection: {
             id: 'new_collection',
@@ -124,9 +127,9 @@ describe('menusReducer', () => {
             model: {
               type: 1,
               text: 'menu.section.new_collection',
-              link: '/collections/submission'
-            }
-          }
+              link: '/collections/submission',
+            },
+          },
         },
         sectionToSubsectionIndex: {
           access_control: [
@@ -136,10 +139,10 @@ describe('menusReducer', () => {
           new: [
             'new_collection',
             'new_item',
-            'new_community'
-          ]
-        }
-      }
+            'new_community',
+          ],
+        },
+      },
     };
   });
 
@@ -179,6 +182,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set collapsed to false for the correct menu in response to the EXPAND_MENU action', () => {
@@ -200,6 +204,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set collapsed to false for the correct menu in response to the TOGGLE_MENU action when collapsed is true', () => {
@@ -230,6 +235,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set previewCollapsed to true for the correct menu in response to the COLLAPSE_MENU_PREVIEW action', () => {
@@ -251,6 +257,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set previewCollapsed to false for the correct menu in response to the EXPAND_MENU_PREVIEW action', () => {
@@ -272,6 +279,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set visible to true for the correct menu in response to the SHOW_MENU action', () => {
@@ -293,6 +301,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set previewCollapsed to false for the correct menu in response to the HIDE_MENU action', () => {
@@ -314,6 +323,18 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
+  });
+
+  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', () => {
@@ -346,6 +367,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should remove a section for the correct menu in response to the REMOVE_SECTION action', () => {
@@ -382,6 +404,10 @@ describe('menusReducer', () => {
 
     const action = new ActivateMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set active to false for the correct menu section in response to the DEACTIVATE_SECTION action', () => {
@@ -400,6 +426,10 @@ describe('menusReducer', () => {
 
     const action = new DeactivateMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set active to false for the correct menu in response to the TOGGLE_ACTIVE_SECTION action when active is true', () => {
@@ -429,6 +459,7 @@ describe('menusReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set visible to true for the correct menu section in response to the SHOW_SECTION action', () => {
@@ -447,6 +478,10 @@ describe('menusReducer', () => {
 
     const action = new ShowMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set visible to false for the correct menu section in response to the HIDE_SECTION action', () => {
@@ -465,5 +500,9 @@ describe('menusReducer', () => {
 
     const action = new HideMenuSectionAction(menuID, topSectionID);
     menusReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 });
diff --git a/src/app/shared/menu/menu.reducer.ts b/src/app/shared/menu/menu.reducer.ts
index c7ea017cc2..e0a6dc7d8b 100644
--- a/src/app/shared/menu/menu.reducer.ts
+++ b/src/app/shared/menu/menu.reducer.ts
@@ -1,3 +1,5 @@
+import { hasValue } from '../empty.util';
+import { initialMenusState } from './initial-menus-state';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -8,16 +10,14 @@ import {
   MenuSectionAction,
   RemoveMenuSectionAction,
   ShowMenuSectionAction,
-  ToggleActiveMenuSectionAction
+  ToggleActiveMenuSectionAction,
 } from './menu.actions';
-import { initialMenusState} from './initial-menus-state';
-import { hasValue } from '../empty.util';
-import { MenusState } from './menus-state.model';
-import { MenuState } from './menu-state.model';
+import { MenuID } from './menu-id.model';
+import { MenuSection } from './menu-section.model';
 import { MenuSectionIndex } from './menu-section-Index.model';
 import { MenuSections } from './menu-sections.model';
-import { MenuSection } from './menu-section.model';
-import { MenuID } from './menu-id.model';
+import { MenuState } from './menu-state.model';
+import { MenusState } from './menus-state.model';
 
 /**
  * Reducer that handles MenuActions to update the MenusState
@@ -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);
     }
@@ -120,7 +123,7 @@ function reorderSections(state: MenusState, action: MenuSectionAction) {
   });
   const newMenuState = Object.assign({}, menuState, {
     sections: newSectionState,
-    sectionToSubsectionIndex: newSectionIndexState
+    sectionToSubsectionIndex: newSectionIndexState,
   });
   return Object.assign({}, state, { [action.menuID]: newMenuState });
 }
@@ -136,7 +139,7 @@ function removeSection(state: MenusState, action: RemoveMenuSectionAction) {
   const id = action.id;
   const newState = removeFromIndex(state, menuState.sections[action.id], action.menuID);
   const newMenuState = Object.assign({}, newState[action.menuID], {
-    sections: Object.assign({}, newState[action.menuID].sections)
+    sections: Object.assign({}, newState[action.menuID].sections),
   });
   delete newMenuState.sections[id];
   return Object.assign({}, newState, { [action.menuID]: newMenuState });
@@ -230,13 +233,13 @@ 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
+    [section.id]: section,
   });
   const newMenuState = Object.assign({}, menuState, {
-    sections: newSections
+    sections: newSections,
   });
   return Object.assign({}, state, { [action.menuID]: newMenuState });
 }
diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index 7a6b304ec1..c5c8ee2a4f 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -1,11 +1,17 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NavigationEnd } from '@angular/router';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
 import { provideMockStore } from '@ngrx/store/testing';
 import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { MenuService } from './menu.service';
+import { storeModuleConfig } from '../../app.reducer';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -18,12 +24,14 @@ import {
   RemoveMenuSectionAction,
   ShowMenuAction,
   ToggleActiveMenuSectionAction,
-  ToggleMenuAction
+  ToggleMenuAction,
 } from './menu.actions';
 import { menusReducer } from './menu.reducer';
-import { storeModuleConfig } from '../../app.reducer';
-import { MenuSection } from './menu-section.model';
+import { MenuService } from './menu.service';
 import { MenuID } from './menu-id.model';
+import { LinkMenuItemModel } from './menu-item/models/link.model';
+import { MenuItemType } from './menu-item-type.model';
+import { MenuSection } from './menu-section.model';
 
 describe('MenuService', () => {
   let service: MenuService;
@@ -35,37 +43,46 @@ describe('MenuService', () => {
   let subSection4;
   let topSections;
   let initialState;
+  let routeDataMenuSection: MenuSection;
+  let routeDataMenuSectionResolved: MenuSection;
+  let routeDataMenuChildSection: MenuSection;
+  let routeDataMenuOverwrittenChildSection: MenuSection;
+  let toBeRemovedMenuSection: MenuSection;
+  let alreadyPresentMenuSection: MenuSection;
+  let route;
+  let router;
+
 
   function init() {
 
     visibleSection1 = {
       id: 'section',
       visible: true,
-      active: false
+      active: false,
     };
     visibleSection2 = {
       id: 'section_2',
-      visible: true
+      visible: true,
     };
     hiddenSection3 = {
       id: 'section_3',
-      visible: false
+      visible: false,
     };
     subSection4 = {
       id: 'section_4',
       visible: true,
-      parentID: 'section'
+      parentID: 'section',
     };
     subSection4 = {
       id: 'section_4',
       visible: true,
-      parentID: 'section'
+      parentID: 'section',
     };
     topSections = {
       section: visibleSection1,
       section_2: visibleSection2,
       section_3: hiddenSection3,
-      section_4: subSection4
+      section_4: subSection4,
     };
 
     fakeMenu = {
@@ -75,34 +92,134 @@ describe('MenuService', () => {
       sections: topSections,
       previewCollapsed: true,
       sectionToSubsectionIndex: {
-        'section': ['section_4']
-      }
+        'section': ['section_4'],
+      },
     } as any;
 
     initialState = {
       menus: {
-        'admin-sidebar': fakeMenu
-      }
+        'admin-sidebar': fakeMenu,
+      },
     };
 
+    routeDataMenuSection = {
+      id: 'mockSection_:idparam',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockSection',
+        link: 'path/:linkparam',
+      } as LinkMenuItemModel,
+    };
+    routeDataMenuSectionResolved = {
+      id: 'mockSection_id_param_resolved',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockSection',
+        link: 'path/link_param_resolved',
+      } as LinkMenuItemModel,
+    };
+    routeDataMenuChildSection = {
+      id: 'mockChildSection',
+      parentID: 'mockSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.mockChildSection',
+        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,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.toBeRemovedSection',
+        link: '',
+      } as LinkMenuItemModel,
+    };
+    alreadyPresentMenuSection = {
+      id: 'alreadyPresentSection',
+      active: false,
+      visible: true,
+      model: {
+        type: MenuItemType.LINK,
+        text: 'menu.section.alreadyPresentSection',
+        link: '',
+      } as LinkMenuItemModel,
+    };
+    route = {
+      root: {
+        snapshot: {
+          data: {
+            menu: {
+              [MenuID.PUBLIC]: [routeDataMenuSection, alreadyPresentMenuSection],
+            },
+          },
+          params: {
+            idparam: 'id_param_resolved',
+            linkparam: 'link_param_resolved',
+          },
+        },
+        firstChild: {
+          snapshot: {
+            data: {
+              menu: {
+                [MenuID.PUBLIC]: routeDataMenuChildSection,
+              },
+            },
+          },
+          firstChild: {
+            snapshot: {
+              data: {
+                menu: {
+                  [MenuID.PUBLIC]: routeDataMenuOverwrittenChildSection,
+                },
+              },
+            },
+          },
+
+        },
+      },
+    };
+
+    router = {
+      events: observableOf(new NavigationEnd(1, 'test-url', 'test-url')),
+    };
   }
 
   beforeEach(waitForAsync(() => {
     init();
     TestBed.configureTestingModule({
       imports: [
-        StoreModule.forRoot({ menus: menusReducer }, storeModuleConfig)
+        StoreModule.forRoot({ menus: menusReducer }, storeModuleConfig),
       ],
       providers: [
         provideMockStore({ initialState }),
-        { provide: MenuService, useValue: service }
-      ]
+        { provide: MenuService, useValue: service },
+      ],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     store = TestBed.inject(Store);
-    service = new MenuService(store);
+    service = new MenuService(store, route, router);
     spyOn(store, 'dispatch');
   });
 
@@ -111,7 +228,7 @@ describe('MenuService', () => {
 
       const result = service.getMenu(MenuID.ADMIN);
       const expected = cold('b', {
-        b: fakeMenu
+        b: fakeMenu,
       });
 
       expect(result).toBeObservable(expected);
@@ -124,7 +241,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuTopSections(MenuID.ADMIN);
       const expected = cold('b', {
-        b: [visibleSection1, visibleSection2]
+        b: [visibleSection1, visibleSection2],
       });
 
       expect(result).toBeObservable(expected);
@@ -134,7 +251,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuTopSections(MenuID.ADMIN, false);
       const expected = cold('b', {
-        b: [visibleSection1, visibleSection2, hiddenSection3]
+        b: [visibleSection1, visibleSection2, hiddenSection3],
       });
 
       expect(result).toBeObservable(expected);
@@ -147,7 +264,7 @@ describe('MenuService', () => {
 
         const result = service.getSubSectionsByParentID(MenuID.ADMIN, 'section');
         const expected = cold('b', {
-          b: [subSection4]
+          b: [subSection4],
         });
 
         expect(result).toBeObservable(expected);
@@ -171,7 +288,7 @@ describe('MenuService', () => {
 
         const result = service.hasSubSections(MenuID.ADMIN, 'section');
         const expected = cold('b', {
-          b: true
+          b: true,
         });
 
         expect(result).toBeObservable(expected);
@@ -183,7 +300,7 @@ describe('MenuService', () => {
 
         const result = service.hasSubSections(MenuID.ADMIN, 'fakeId');
         const expected = cold('b', {
-          b: false
+          b: false,
         });
 
         expect(result).toBeObservable(expected);
@@ -196,7 +313,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuSection(MenuID.ADMIN, 'section_3');
       const expected = cold('b', {
-        b: hiddenSection3
+        b: hiddenSection3,
       });
 
       expect(result).toBeObservable(expected);
@@ -206,7 +323,7 @@ describe('MenuService', () => {
 
       const result = service.getMenuSection(MenuID.ADMIN, 'fake');
       const expected = cold('b', {
-        b: undefined
+        b: undefined,
       });
 
       expect(result).toBeObservable(expected);
@@ -221,7 +338,7 @@ describe('MenuService', () => {
 
       const result = service.isMenuCollapsed(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: fakeMenu.collapsed
+        b: fakeMenu.collapsed,
       });
 
       expect(result).toBeObservable(expected);
@@ -236,7 +353,85 @@ describe('MenuService', () => {
 
       const result = service.isMenuPreviewCollapsed(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: fakeMenu.previewCollapsed
+        b: fakeMenu.previewCollapsed,
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('isMenuVisibleWithVisibleSections', () => {
+    it('should return false when the menu is empty', () => {
+      const testMenu = {
+        id: MenuID.ADMIN,
+        collapsed: false,
+        visible: true,
+        sections: {},
+        previewCollapsed: false,
+        sectionToSubsectionIndex: {},
+      } as any;
+      spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
+
+      const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+      const expected = cold('(b|)', {
+        b: false,
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+    it('should return false when no top-level sections are visible', () => {
+      const noTopLevelVisibleSections = {
+        section: { id: 's1', visible: false },
+        section_2: { id: 's2', visible: false },
+        section_3: { id: 's3', visible: false },
+        section_4: { id: 's1_1', visible: true, parentID: 's1' },
+        section_5: { id: 's2_1', visible: true, parentID: 's2' },
+      };
+      const testMenu = {
+        id: MenuID.ADMIN,
+        collapsed: false,
+        visible: true,
+        sections: noTopLevelVisibleSections,
+        previewCollapsed: false,
+        sectionToSubsectionIndex: {
+          'section': ['section_4'],
+          'section_2': ['section_5'],
+        },
+      } as any;
+      spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
+
+      const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+      const expected = cold('(b|)', {
+        b: false,
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+
+    it('should return true when any top-level section is visible', () => {
+      const noTopLevelVisibleSections = {
+        section: { id: 's1', visible: false },
+        section_2: { id: 's2', visible: true },
+        section_3: { id: 's3', visible: false },
+        section_4: { id: 's1_1', visible: true, parentID: 's1' },
+        section_5: { id: 's2_1', visible: true, parentID: 's2' },
+      };
+      const testMenu = {
+        id: MenuID.ADMIN,
+        collapsed: false,
+        visible: true,
+        sections: noTopLevelVisibleSections,
+        previewCollapsed: false,
+        sectionToSubsectionIndex: {
+          'section': ['section_4'],
+          'section_2': ['section_5'],
+        },
+      } as any;
+      spyOn(service, 'getMenu').and.returnValue(observableOf(testMenu));
+
+      const result = service.isMenuVisibleWithVisibleSections(MenuID.ADMIN);
+      const expected = cold('(b|)', {
+        b: true,
       });
 
       expect(result).toBeObservable(expected);
@@ -252,7 +447,7 @@ describe('MenuService', () => {
 
       const result = service.isMenuVisible(MenuID.ADMIN);
       const expected = cold('(b|)', {
-        b: fakeMenu.visible
+        b: fakeMenu.visible,
       });
 
       expect(result).toBeObservable(expected);
@@ -267,7 +462,7 @@ describe('MenuService', () => {
     it('should return false when the section is not active', () => {
       const result = service.isSectionActive(MenuID.ADMIN, 'fakeID');
       const expected = cold('(b|)', {
-        b: visibleSection1.active
+        b: visibleSection1.active,
       });
 
       expect(result).toBeObservable(expected);
@@ -282,7 +477,7 @@ describe('MenuService', () => {
     it('should return false when the section is hidden', () => {
       const result = service.isSectionVisible(MenuID.ADMIN, 'fakeID');
       const expected = cold('(b|)', {
-        b: hiddenSection3.visible
+        b: hiddenSection3.visible,
       });
       expect(result).toBeObservable(expected);
     });
@@ -371,4 +566,70 @@ describe('MenuService', () => {
       expect(store.dispatch).toHaveBeenCalledWith(new DeactivateMenuSectionAction(MenuID.ADMIN, 'fakeID'));
     });
   });
+
+  describe('buildRouteMenuSections', () => {
+    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');
+
+      spyOn(service, 'getNonPersistentMenuSections').and.returnValue(observableOf([toBeRemovedMenuSection, alreadyPresentMenuSection]));
+
+      service.buildRouteMenuSections(MenuID.PUBLIC);
+
+      expect(service.addSection).toHaveBeenCalledWith(MenuID.PUBLIC, routeDataMenuSectionResolved);
+      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);
+    });
+  });
+
+  describe('listenForRouteChanges', () => {
+    it('should build the menu sections on NavigationEnd event', () => {
+      spyOn(service, 'buildRouteMenuSections');
+
+      service.listenForRouteChanges();
+
+      expect(service.buildRouteMenuSections).toHaveBeenCalledWith(MenuID.ADMIN);
+      expect(service.buildRouteMenuSections).toHaveBeenCalledWith(MenuID.PUBLIC);
+    });
+  });
+
+  describe(`resolveSubstitutions`, () => {
+    let linkPrefix;
+    let link;
+    let uuid;
+
+    beforeEach(() => {
+      linkPrefix = 'statistics_collection_';
+      link = `${linkPrefix}:id`;
+      uuid = 'f7cc3ca4-3c2c-464d-8af8-add9f84f711c';
+    });
+
+    it(`shouldn't do anything when there are no params`, () => {
+      let result = (service as any).resolveSubstitutions(link, undefined);
+      expect(result).toEqual(link);
+      result = (service as any).resolveSubstitutions(link, null);
+      expect(result).toEqual(link);
+      result = (service as any).resolveSubstitutions(link, {});
+      expect(result).toEqual(link);
+    });
+
+    it(`should replace link params that are also route params`, () => {
+      const result = (service as any).resolveSubstitutions(link,{ 'id': uuid });
+      expect(result).toEqual(linkPrefix + uuid);
+    });
+
+    it(`should not replace link params that aren't route params`, () => {
+      const result = (service as any).resolveSubstitutions(link,{ 'something': 'else' });
+      expect(result).toEqual(link);
+    });
+
+    it(`should gracefully deal with routes that contain the name of the route param`, () => {
+      const selfReferentialParam = `:id:something`;
+      const result = (service as any).resolveSubstitutions(link,{ 'id': selfReferentialParam });
+      expect(result).toEqual(linkPrefix + selfReferentialParam);
+    });
+  });
+
 });
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index f44ddea649..0e087439bd 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -1,8 +1,39 @@
 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 { map, switchMap } from 'rxjs/operators';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  Router,
+} from '@angular/router';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import {
+  AppState,
+  keySelector,
+} from '../../app.reducer';
+import { compareArraysUsingIds } from '../../item-page/simple/item-types/shared/item-relationships-utils';
+import {
+  hasNoValue,
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
@@ -12,16 +43,17 @@ import {
   ExpandMenuAction,
   ExpandMenuPreviewAction,
   HideMenuAction,
+  HideMenuSectionAction,
   RemoveMenuSectionAction,
   ShowMenuAction,
+  ShowMenuSectionAction,
   ToggleActiveMenuSectionAction,
   ToggleMenuAction,
 } from './menu.actions';
-import { hasNoValue, hasValue, hasValueOperator, isNotEmpty } from '../empty.util';
-import { MenuState } from './menu-state.model';
-import { MenuSections } from './menu-sections.model';
-import { MenuSection } from './menu-section.model';
 import { MenuID } from './menu-id.model';
+import { MenuSection } from './menu-section.model';
+import { MenuSections } from './menu-sections.model';
+import { MenuState } from './menu-state.model';
 
 export function menuKeySelector<T>(key: string, selector): MemoizedSelector<MenuState, T> {
   return createSelector(selector, (state) => {
@@ -54,7 +86,11 @@ const getSubSectionsFromSectionSelector = (id: string): MemoizedSelector<MenuSta
 @Injectable()
 export class MenuService {
 
-  constructor(private store: Store<AppState>) {
+  constructor(
+    protected store: Store<AppState>,
+    protected route: ActivatedRoute,
+    protected router: Router,
+  ) {
   }
 
   /**
@@ -76,12 +112,14 @@ export class MenuService {
     return this.store.pipe(
       select(menuByIDSelector(menuID)),
       select(menuSectionStateSelector),
-      map((sections: MenuSections) => {
-          return Object.values(sections)
-            .filter((section: MenuSection) => hasNoValue(section.parentID))
-            .filter((section: MenuSection) => !mustBeVisible || section.visible);
-        }
-      )
+      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);
+      },
+      ),
     );
   }
 
@@ -98,9 +136,9 @@ export class MenuService {
       select(getSubSectionsFromSectionSelector(parentID)),
       map((ids: string[]) => isNotEmpty(ids) ? ids : []),
       switchMap((ids: string[]) =>
-        observableCombineLatest(ids.map((id: string) => this.getMenuSection(menuID, id)))
+        observableCombineLatest(ids.map((id: string) => this.getMenuSection(menuID, id))),
       ),
-      map((sections: MenuSection[]) => sections.filter((section: MenuSection) => hasValue(section) && (!mustBeVisible || section.visible)))
+      map((sections: MenuSection[]) => sections.filter((section: MenuSection) => hasValue(section) && (!mustBeVisible || section.visible))),
     );
   }
 
@@ -114,7 +152,7 @@ export class MenuService {
     return this.store.pipe(
       select(menuByIDSelector(menuID)),
       select(getSubSectionsFromSectionSelector(parentID)),
-      map((ids: string[]) => isNotEmpty(ids))
+      map((ids: string[]) => isNotEmpty(ids)),
     );
   }
 
@@ -137,7 +175,7 @@ export class MenuService {
    */
   getNonPersistentMenuSections(menuID: MenuID): Observable<MenuSection[]> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => Object.values(state.sections).filter((section: MenuSection) => !section.shouldPersistOnRouteChange))
+      map((state: MenuState) => Object.values(state.sections).filter((section: MenuSection) => !section.shouldPersistOnRouteChange)),
     );
   }
 
@@ -166,7 +204,7 @@ export class MenuService {
    */
   isMenuCollapsed(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => hasValue(state) ? state.collapsed : undefined)
+      map((state: MenuState) => hasValue(state) ? state.collapsed : undefined),
     );
   }
 
@@ -177,7 +215,19 @@ export class MenuService {
    */
   isMenuPreviewCollapsed(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => hasValue(state) ? state.previewCollapsed : undefined)
+      map((state: MenuState) => hasValue(state) ? state.previewCollapsed : undefined),
+    );
+  }
+
+  /**
+   * Check if a given menu is visible and has visible top-level (!) sections
+   * @param {MenuID} menuID The ID of the menu that is to be checked
+   * @returns {Observable<boolean>} Emits true if the given menu is
+   *   visible and has visible sections, emits false when it's hidden
+   */
+  isMenuVisibleWithVisibleSections(menuID: MenuID): Observable<boolean> {
+    return observableCombineLatest([this.isMenuVisible(menuID), this.menuHasVisibleSections(menuID)]).pipe(
+      map(([menuVisible, visibleSections]) => menuVisible && visibleSections),
     );
   }
 
@@ -188,7 +238,21 @@ export class MenuService {
    */
   isMenuVisible(menuID: MenuID): Observable<boolean> {
     return this.getMenu(menuID).pipe(
-      map((state: MenuState) => hasValue(state) ? state.visible : undefined)
+      map((state: MenuState) => hasValue(state) ? state.visible : undefined),
+    );
+  }
+
+  /**
+   * Check if a menu has at least one top-level (!) section that is visible.
+   * @param {MenuID} menuID The ID of the menu that is to be checked
+   * @returns {Observable<boolean>} Emits true if the given menu has visible sections, emits false otherwise
+   */
+  menuHasVisibleSections(menuID: MenuID): Observable<boolean> {
+    return this.getMenu(menuID).pipe(
+      map((state: MenuState) => hasValue(state)
+        ? Object.values(state.sections)
+          .some(section => section.visible && section.parentID === undefined)
+        : undefined),
     );
   }
 
@@ -240,6 +304,15 @@ export class MenuService {
     this.store.dispatch(new ShowMenuAction(menuID));
   }
 
+  /**
+   * Show a given menu section
+   * @param {MenuID} menuID The ID of the menu
+   * @param id The ID of the section
+   */
+  showMenuSection(menuID: MenuID, id: string): void {
+    this.store.dispatch(new ShowMenuSectionAction(menuID, id));
+  }
+
   /**
    * Hide a given menu
    * @param {MenuID} menuID The ID of the menu
@@ -248,6 +321,15 @@ export class MenuService {
     this.store.dispatch(new HideMenuAction(menuID));
   }
 
+  /**
+   * Hide a given menu section
+   * @param {MenuID} menuID The ID of the menu
+   * @param id The ID of the section
+   */
+  hideMenuSection(menuID: MenuID, id: string): void {
+    this.store.dispatch(new HideMenuSectionAction(menuID, id));
+  }
+
   /**
    * Activate a given menu section when it's currently inactive or deactivate it when it's currently active
    * @param {MenuID} menuID The ID of the menu
@@ -295,4 +377,95 @@ export class MenuService {
     return this.getMenuSection(menuID, id).pipe(map((section) => section.visible));
   }
 
+  listenForRouteChanges(): void {
+    this.router.events.pipe(
+      filter(event => event instanceof NavigationEnd),
+    ).subscribe(() => {
+      Object.values(MenuID).forEach((menuID) => {
+        this.buildRouteMenuSections(menuID);
+      });
+    });
+  }
+
+  /**
+   * Build menu sections depending on the current route
+   * - Adds sections found in the current route data that aren't active yet
+   * - Removes sections that are active, but not present in the current route data
+   * @param menuID  The menu to add/remove sections to/from
+   */
+  buildRouteMenuSections(menuID: MenuID) {
+    this.getNonPersistentMenuSections(menuID).pipe(
+      map((sections) => sections.map((section) => section.id)),
+      take(1),
+    ).subscribe((shouldNotPersistIDs: string[]) => {
+      const resolvedSections = this.resolveRouteMenuSections(this.route.root, menuID);
+      resolvedSections.forEach((section) => {
+        const index = shouldNotPersistIDs.indexOf(section.id);
+        if (index > -1) {
+          shouldNotPersistIDs.splice(index, 1);
+        } else {
+          this.addSection(menuID, section);
+        }
+      });
+      shouldNotPersistIDs.forEach((id) => {
+        this.removeSection(menuID, id);
+      });
+    });
+  }
+
+  /**
+   * Resolve menu sections defined in the current route data (including parent routes)
+   * @param route   The route to resolve data for
+   * @param menuID  The menu to resolve data for
+   */
+  resolveRouteMenuSections(route: ActivatedRoute, menuID: MenuID): MenuSection[] {
+    const data = route.snapshot.data;
+    const params = route.snapshot.params;
+    const last: boolean = hasNoValue(route.firstChild);
+
+    if (hasValue(data) && hasValue(data.menu) && hasValue(data.menu[menuID])) {
+      let menuSections: MenuSection[] | MenuSection = data.menu[menuID];
+      menuSections = this.resolveSubstitutions(menuSections, params);
+
+      if (!Array.isArray(menuSections)) {
+        menuSections = [menuSections];
+      }
+
+      if (!last) {
+        const childMenuSections = this.resolveRouteMenuSections(route.firstChild, menuID);
+        return [...menuSections.filter(menu => !(childMenuSections).map(childMenu => childMenu.id).includes(menu.id)), ...childMenuSections];
+      } else {
+        return [...menuSections];
+      }
+    }
+
+    return !last ? this.resolveRouteMenuSections(route.firstChild, menuID) : [];
+  }
+
+  protected resolveSubstitutions(object, params) {
+    let resolved;
+    if (isEmpty(params)) {
+      resolved = object;
+    } else if (typeof object === 'string') {
+      resolved = object;
+      Object.entries(params).forEach(([key, value]: [string, string]) =>
+        resolved = resolved.replaceAll(`:${key}`, value),
+      );
+    } else if (Array.isArray(object)) {
+      resolved = [];
+      object.forEach((entry, index) => {
+        resolved[index] = this.resolveSubstitutions(object[index], params);
+      });
+    } else if (typeof object === 'object') {
+      resolved = {};
+      Object.keys(object).forEach((key) => {
+        resolved[key] = this.resolveSubstitutions(object[key], params);
+      });
+    } else {
+      resolved = object;
+    }
+    return resolved;
+  }
+
+
 }
diff --git a/src/app/shared/menu/menus-state.model.ts b/src/app/shared/menu/menus-state.model.ts
index 9590fa1760..096da4d3eb 100644
--- a/src/app/shared/menu/menus-state.model.ts
+++ b/src/app/shared/menu/menus-state.model.ts
@@ -1,5 +1,5 @@
-import { MenuState } from './menu-state.model';
 import { MenuID } from './menu-id.model';
+import { MenuState } from './menu-state.model';
 
 /**
  * Represents the state of all menus in the store
diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
similarity index 74%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.html
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.html
index d69f87883b..7748e385ca 100644
--- a/src/app/item-page/field-components/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/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
similarity index 51%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.scss
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.scss
index 75dfd09d0d..bf17d63d6c 100644
--- a/src/app/item-page/field-components/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/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
similarity index 83%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
index 5ef272db3b..0047e72640 100644
--- a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.spec.ts
@@ -1,34 +1,41 @@
 /* eslint-disable max-classes-per-file */
-import { Component, Input } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 
 import { MetadataFieldWrapperComponent } from './metadata-field-wrapper.component';
 
 @Component({
-    selector: 'ds-component-without-content',
-    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
-      '</ds-metadata-field-wrapper>'
+  selector: 'ds-component-without-content',
+  template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
+      '</ds-metadata-field-wrapper>',
 })
 class NoContentComponent {
   public hideIfNoTextContent = true;
 }
 
 @Component({
-    selector: 'ds-component-with-empty-spans',
-    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
+  selector: 'ds-component-with-empty-spans',
+  template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '    <span></span>\n' +
       '    <span></span>\n' +
-      '</ds-metadata-field-wrapper>'
+      '</ds-metadata-field-wrapper>',
 })
 class SpanContentComponent {
   @Input() hideIfNoTextContent = true;
 }
 
 @Component({
-    selector: 'ds-component-with-text',
-    template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
+  selector: 'ds-component-with-text',
+  template: '<ds-metadata-field-wrapper [hideIfNoTextContent]="hideIfNoTextContent" [label]="\'test label\'">\n' +
       '    <span>The quick brown fox jumps over the lazy dog</span>\n' +
-      '</ds-metadata-field-wrapper>'
+      '</ds-metadata-field-wrapper>',
 })
 class TextContentComponent {
   @Input() hideIfNoTextContent = true;
@@ -41,7 +48,7 @@ describe('MetadataFieldWrapperComponent', () => {
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent]
+      declarations: [MetadataFieldWrapperComponent, NoContentComponent, SpanContentComponent, TextContentComponent],
     }).compileComponents();
   }));
 
diff --git a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
similarity index 78%
rename from src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
rename to src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
index 5c6b99248f..0a159e76ec 100644
--- a/src/app/item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component.ts
+++ b/src/app/shared/metadata-field-wrapper/metadata-field-wrapper.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 /**
  * This component renders any content inside this wrapper.
@@ -7,7 +10,7 @@ import { Component, Input } from '@angular/core';
 @Component({
   selector: 'ds-metadata-field-wrapper',
   styleUrls: ['./metadata-field-wrapper.component.scss'],
-  templateUrl: './metadata-field-wrapper.component.html'
+  templateUrl: './metadata-field-wrapper.component.html',
 })
 export class MetadataFieldWrapperComponent {
 
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.html b/src/app/shared/metadata-representation/metadata-representation-loader.component.html
deleted file mode 100644
index 3979c238ad..0000000000
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-container dsMetadataRepresentation></ng-container>
\ No newline at end of file
diff --git a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
index 7edf1a700e..8c9bf77f52 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.spec.ts
@@ -1,15 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
 import { Context } from '../../core/shared/context.model';
 import {
   MetadataRepresentation,
-  MetadataRepresentationType
+  MetadataRepresentationType,
 } from '../../core/shared/metadata-representation/metadata-representation.model';
-import { MetadataRepresentationLoaderComponent } from './metadata-representation-loader.component';
-import { MetadataRepresentationDirective } from './metadata-representation.directive';
-import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
-import { ThemeService } from '../theme-support/theme.service';
+import { DynamicComponentLoaderDirective } from '../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../mocks/theme-service.mock';
 import { PlainTextMetadataListElementComponent } from '../object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
+import { ThemeService } from '../theme-support/theme.service';
+import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
+import { MetadataRepresentationLoaderComponent } from './metadata-representation-loader.component';
 
 const testType = 'TestType';
 const testContext = Context.Search;
@@ -36,34 +45,37 @@ describe('MetadataRepresentationLoaderComponent', () => {
   const themeName = 'test-theme';
 
   beforeEach(waitForAsync(() => {
-    themeService = jasmine.createSpyObj('themeService', {
-      getThemeName: themeName,
-    });
+    themeService = getMockThemeService(themeName);
     TestBed.configureTestingModule({
       imports: [],
-      declarations: [MetadataRepresentationLoaderComponent, PlainTextMetadataListElementComponent, MetadataRepresentationDirective],
+      declarations: [
+        MetadataRepresentationLoaderComponent,
+        PlainTextMetadataListElementComponent,
+        DynamicComponentLoaderDirective,
+      ],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         {
           provide: METADATA_REPRESENTATION_COMPONENT_FACTORY,
-          useValue: jasmine.createSpy('getMetadataRepresentationComponent').and.returnValue(PlainTextMetadataListElementComponent)
+          useValue: jasmine.createSpy('getMetadataRepresentationComponent').and.returnValue(PlainTextMetadataListElementComponent),
         },
         {
           provide: ThemeService,
           useValue: themeService,
-        }
-      ]
+        },
+      ],
     }).overrideComponent(MetadataRepresentationLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [PlainTextMetadataListElementComponent]
-      }
+        entryComponents: [PlainTextMetadataListElementComponent],
+      },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(MetadataRepresentationLoaderComponent);
     comp = fixture.componentInstance;
+    spyOn(comp, 'getComponent').and.callThrough();
 
     comp.mdRepresentation = new TestType();
     comp.context = testContext;
@@ -71,8 +83,8 @@ describe('MetadataRepresentationLoaderComponent', () => {
   }));
 
   describe('When the component is rendered', () => {
-    it('should call the getMetadataRepresentationComponent function with the right entity type, representation type and context', () => {
-      expect((comp as any).getMetadataRepresentationComponent).toHaveBeenCalledWith(testType, testRepresentationType, testContext, themeName);
+    it('should call the getComponent function', () => {
+      expect(comp.getComponent).toHaveBeenCalled();
     });
   });
 });
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 7077949809..084ca8c32c 100644
--- a/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
+++ b/src/app/shared/metadata-representation/metadata-representation-loader.component.ts
@@ -1,77 +1,55 @@
-import { Component, ComponentFactoryResolver, Inject, Input, OnInit, ViewChild } from '@angular/core';
 import {
-  MetadataRepresentation,
-  MetadataRepresentationType
-} from '../../core/shared/metadata-representation/metadata-representation.model';
-import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
+  Component,
+  Inject,
+  Input,
+} from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  MetadataRepresentation,
+  MetadataRepresentationType,
+} from '../../core/shared/metadata-representation/metadata-representation.model';
+import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component';
 import { MetadataRepresentationListElementComponent } from '../object-list/metadata-representation-list-element/metadata-representation-list-element.component';
-import { MetadataRepresentationDirective } from './metadata-representation.directive';
-import { hasValue } from '../empty.util';
 import { ThemeService } from '../theme-support/theme.service';
+import { METADATA_REPRESENTATION_COMPONENT_FACTORY } from './metadata-representation.decorator';
 
 @Component({
   selector: 'ds-metadata-representation-loader',
-  // styleUrls: ['./metadata-representation-loader.component.scss'],
-  templateUrl: './metadata-representation-loader.component.html'
+  templateUrl: '../abstract-component-loader/abstract-component-loader.component.html',
 })
 /**
  * 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 {
-  private componentRefInstance: MetadataRepresentationListElementComponent;
+export class MetadataRepresentationLoaderComponent extends AbstractComponentLoaderComponent<MetadataRepresentationListElementComponent> {
+
+  @Input() context: Context;
 
   /**
    * The item or metadata to determine the component for
    */
-  private _mdRepresentation: MetadataRepresentation;
-  get mdRepresentation(): MetadataRepresentation {
-    return this._mdRepresentation;
-  }
-  @Input() set mdRepresentation(nextValue: MetadataRepresentation) {
-    this._mdRepresentation = nextValue;
-    if (hasValue(this.componentRefInstance)) {
-      this.componentRefInstance.metadataRepresentation = nextValue;
-    }
-  }
+  @Input() mdRepresentation: MetadataRepresentation;
 
-  /**
-   * The optional context
-   */
-  @Input() context: Context;
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [
+    'context',
+    'mdRepresentation',
+  ];
 
-  /**
-   * Directive to determine where the dynamic child component is located
-   */
-  @ViewChild(MetadataRepresentationDirective, {static: true}) mdRepDirective: MetadataRepresentationDirective;
+  protected inputNames: (keyof this & string)[] = [
+    'context',
+    'mdRepresentation',
+  ];
 
   constructor(
-    private componentFactoryResolver: ComponentFactoryResolver,
-    private themeService: ThemeService,
+    protected themeService: ThemeService,
     @Inject(METADATA_REPRESENTATION_COMPONENT_FACTORY) private getMetadataRepresentationComponent: (entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor<any>,
   ) {
+    super(themeService);
   }
 
-  /**
-   * Set up the dynamic child component
-   */
-  ngOnInit(): void {
-    const componentFactory = this.componentFactoryResolver.resolveComponentFactory(this.getComponent());
-
-    const viewContainerRef = this.mdRepDirective.viewContainerRef;
-    viewContainerRef.clear();
-
-    const componentRef = viewContainerRef.createComponent(componentFactory);
-    this.componentRefInstance = componentRef.instance as MetadataRepresentationListElementComponent;
-    this.componentRefInstance.metadataRepresentation = this.mdRepresentation;
-  }
-
-  /**
-   * Fetch the component depending on the item's entity type, metadata representation type and context
-   * @returns {string}
-   */
-  private getComponent(): GenericConstructor<MetadataRepresentationListElementComponent> {
+  public getComponent(): GenericConstructor<MetadataRepresentationListElementComponent> {
     return this.getMetadataRepresentationComponent(this.mdRepresentation.itemType, this.mdRepresentation.representationType, this.context, this.themeService.getThemeName());
   }
+
 }
diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts
index 09d4d60532..8a6ac7eb22 100644
--- a/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts
+++ b/src/app/shared/metadata-representation/metadata-representation.decorator.spec.ts
@@ -1,14 +1,15 @@
-  /* eslint-disable max-classes-per-file */
+/* eslint-disable max-classes-per-file */
+import { v4 as uuidv4 } from 'uuid';
+
+import { environment } from '../../../environments/environment';
+import { Context } from '../../core/shared/context.model';
+import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
 import {
   DEFAULT_ENTITY_TYPE,
   DEFAULT_REPRESENTATION_TYPE,
   getMetadataRepresentationComponent,
-  metadataRepresentationComponent
+  metadataRepresentationComponent,
 } from './metadata-representation.decorator';
-import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
-import { Context } from '../../core/shared/context.model';
-import { v4 as uuidv4 } from 'uuid';
-import { environment } from '../../../environments/environment';
 
 let ogEnvironmentThemes;
 
@@ -114,7 +115,7 @@ describe('MetadataRepresentation decorator function', () => {
           },
           {
             name: 'ancestor',         // Matches typeAncestor, but not typeUnthemed
-          }
+          },
         ];
       });
 
@@ -143,7 +144,7 @@ describe('MetadataRepresentation decorator function', () => {
         expect(() => {
           getMetadataRepresentationComponent(prefix + typeAncestor, MetadataRepresentationType.Item, Context.Any, 'extension-cycle');
         }).toThrowError(
-          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1'
+          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1',
         );
       });
     });
diff --git a/src/app/shared/metadata-representation/metadata-representation.decorator.ts b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
index ae601e480c..1267aa60c0 100644
--- a/src/app/shared/metadata-representation/metadata-representation.decorator.ts
+++ b/src/app/shared/metadata-representation/metadata-representation.decorator.ts
@@ -1,16 +1,21 @@
-import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
-import { hasNoValue, hasValue } from '../empty.util';
-import { Context } from '../../core/shared/context.model';
 import { InjectionToken } from '@angular/core';
+
+import { Context } from '../../core/shared/context.model';
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { MetadataRepresentationType } from '../../core/shared/metadata-representation/metadata-representation.model';
 import {
+  hasNoValue,
+  hasValue,
+} from '../empty.util';
+import {
+  DEFAULT_CONTEXT,
+  DEFAULT_THEME,
   resolveTheme,
-  DEFAULT_THEME, DEFAULT_CONTEXT
 } from '../object-collection/shared/listable-object/listable-object.decorator';
 
 export const METADATA_REPRESENTATION_COMPONENT_FACTORY = new InjectionToken<(entityType: string, mdRepresentationType: MetadataRepresentationType, context: Context, theme: string) => GenericConstructor<any>>('getMetadataRepresentationComponent', {
   providedIn: 'root',
-  factory: () => getMetadataRepresentationComponent
+  factory: () => getMetadataRepresentationComponent,
 });
 
 export const map = new Map();
diff --git a/src/app/shared/metadata-representation/metadata-representation.directive.ts b/src/app/shared/metadata-representation/metadata-representation.directive.ts
deleted file mode 100644
index 9ff0573baf..0000000000
--- a/src/app/shared/metadata-representation/metadata-representation.directive.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Directive, ViewContainerRef } from '@angular/core';
-
-@Directive({
-  selector: '[dsMetadataRepresentation]',
-})
-/**
- * Directive used as a hook to know where to inject the dynamic metadata representation component
- */
-export class MetadataRepresentationDirective {
-  constructor(public viewContainerRef: ViewContainerRef) { }
-}
diff --git a/src/app/shared/mocks/action.mock.ts b/src/app/shared/mocks/action.mock.ts
index e227946f64..f5c7c683b0 100644
--- a/src/app/shared/mocks/action.mock.ts
+++ b/src/app/shared/mocks/action.mock.ts
@@ -2,5 +2,5 @@ import { Action } from '@ngrx/store';
 
 export class ActionMock implements Action {
   type = null;
-  payload: {};
+  payload: any;
 }
diff --git a/src/app/shared/mocks/active-router.mock.ts b/src/app/shared/mocks/active-router.mock.ts
index 672cdcd8f6..448ee0a1b4 100644
--- a/src/app/shared/mocks/active-router.mock.ts
+++ b/src/app/shared/mocks/active-router.mock.ts
@@ -1,28 +1,37 @@
 import { Params } from '@angular/router';
-
 import { BehaviorSubject } from 'rxjs';
 
 export class MockActivatedRoute {
 
   private _testParams?: any;
+  private _testUrl?: any;
 
   // ActivatedRoute.params is Observable
   private subject?: BehaviorSubject<any> = new BehaviorSubject(this.testParams);
+  // ActivatedRoute.url is Observable
+  private urlSubject?: BehaviorSubject<any> = new BehaviorSubject(this.testUrl);
 
   params = this.subject.asObservable();
   queryParams = this.subject.asObservable();
+  url = this.urlSubject.asObservable();
 
-  constructor(params?: Params) {
+  constructor(params?: Params, url?: any) {
     if (params) {
       this.testParams = params;
     } else {
       this.testParams = {};
     }
+
+    if (url) {
+      this.testUrl = url;
+    } else {
+      this.testUrl = {};
+    }
   }
 
   // Test parameters
   get testParams() { return this._testParams; }
-  set testParams(params: {}) {
+  set testParams(params: any) {
     this._testParams = params;
     this.subject.next(params);
   }
@@ -31,4 +40,11 @@ export class MockActivatedRoute {
   get snapshot() {
     return { params: this.testParams, queryParams: this.testParams };
   }
+
+  //ActivatedRoute.url
+  get testUrl() { return this._testUrl; }
+  set testUrl(url: any) {
+    this._testUrl = url;
+    this.urlSubject.next(url);
+  }
 }
diff --git a/src/app/shared/mocks/admin-guard.service.mock.ts b/src/app/shared/mocks/admin-guard.service.mock.ts
index 5d77f4610c..ee7b599324 100644
--- a/src/app/shared/mocks/admin-guard.service.mock.ts
+++ b/src/app/shared/mocks/admin-guard.service.mock.ts
@@ -1,5 +1,10 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, CanActivate, CanActivateChild, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  CanActivate,
+  CanActivateChild,
+  RouterStateSnapshot,
+} from '@angular/router';
 
 import { hasValue } from '../empty.util';
 
diff --git a/src/app/shared/mocks/angulartics2.service.mock.ts b/src/app/shared/mocks/angulartics2.service.mock.ts
index ccafaf3f48..3d48b86a68 100644
--- a/src/app/shared/mocks/angulartics2.service.mock.ts
+++ b/src/app/shared/mocks/angulartics2.service.mock.ts
@@ -4,6 +4,6 @@ import { Injectable } from '@angular/core';
 @Injectable()
 export class Angulartics2Mock {
   public eventTrack = {
-    next: (param: any): void => {}
+    next: (param: any): void => {},
   };
 }
diff --git a/src/app/shared/mocks/auth.service.mock.ts b/src/app/shared/mocks/auth.service.mock.ts
index c32615a4f6..c5737ca170 100644
--- a/src/app/shared/mocks/auth.service.mock.ts
+++ b/src/app/shared/mocks/auth.service.mock.ts
@@ -1,5 +1,8 @@
 /* eslint-disable no-empty, @typescript-eslint/no-empty-function */
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 export class AuthServiceMock {
   public checksAuthenticationToken() {
diff --git a/src/app/shared/mocks/dso-name.service.mock.ts b/src/app/shared/mocks/dso-name.service.mock.ts
index f4947cc860..b8fbaebee4 100644
--- a/src/app/shared/mocks/dso-name.service.mock.ts
+++ b/src/app/shared/mocks/dso-name.service.mock.ts
@@ -3,7 +3,26 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 export const UNDEFINED_NAME = 'Undefined';
 
 export class DSONameServiceMock {
-  public getName(dso: DSpaceObject) {
+  public getName(dso: DSpaceObject | undefined) {
+    return dso?.name || UNDEFINED_NAME;
+  }
+
+  public getHitHighlights(object: any, dso: DSpaceObject) {
+    if (object.hitHighlights && object.hitHighlights['dc.title']) {
+      return object.hitHighlights['dc.title'][0].value;
+    } else if (object.hitHighlights && object.hitHighlights['organization.legalName']) {
+      return object.hitHighlights['organization.legalName'][0].value;
+    } else if (object.hitHighlights && (object.hitHighlights['person.familyName'] || object.hitHighlights['person.givenName'])) {
+      if (object.hitHighlights['person.familyName'] && object.hitHighlights['person.givenName']) {
+        return `${object.hitHighlights['person.familyName'][0].value}, ${object.hitHighlights['person.givenName'][0].value}`;
+      }
+      if (object.hitHighlights['person.familyName']) {
+        return `${object.hitHighlights['person.familyName'][0].value}`;
+      }
+      if (object.hitHighlights['person.givenName']) {
+        return `${object.hitHighlights['person.givenName'][0].value}`;
+      }
+    }
     return UNDEFINED_NAME;
   }
 }
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
index 0b6b218164..84664b7b20 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.spec.ts
@@ -1,5 +1,9 @@
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import {
+  HttpHeaders,
+  HttpResponse,
+} from '@angular/common/http';
 import { of as observableOf } from 'rxjs';
+
 import { RestRequestMethod } from '../../../core/data/rest-request-method';
 import { EndpointMockingRestService } from './endpoint-mocking-rest.service';
 import { ResponseMapMock } from './mocks/response-map.mock';
@@ -15,16 +19,16 @@ describe('EndpointMockingRestService', () => {
     serverHttpResponse = {
       body: { bar: false },
       headers: new HttpHeaders(),
-      statusText: '200'
+      statusText: '200',
     } as HttpResponse<any>;
 
     mockResponseMap = new Map([
-      ['/foo', { bar: true }]
+      ['/foo', { bar: true }],
     ]);
 
     const httpStub = jasmine.createSpyObj('http', {
       get: observableOf(serverHttpResponse),
-      request: observableOf(serverHttpResponse)
+      request: observableOf(serverHttpResponse),
     });
 
     service = new EndpointMockingRestService(mockResponseMap, httpStub);
diff --git a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
index 8d621ad4be..ad867e0cf0 100644
--- a/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
+++ b/src/app/shared/mocks/dspace-rest/endpoint-mocking-rest.service.ts
@@ -1,14 +1,28 @@
-import { HttpClient, HttpHeaders } from '@angular/common/http';
-import { Inject, Injectable } from '@angular/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { isEmpty } from '../../empty.util';
-import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import {
+  HttpClient,
+  HttpHeaders,
+} from '@angular/common/http';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
-import { DspaceRestService, HttpOptions } from '../../../core/dspace-rest/dspace-rest.service';
-import { MOCK_RESPONSE_MAP, ResponseMapMock } from './mocks/response-map.mock';
-import * as URL from 'url-parse';
 import { environment } from '../../../../environments/environment';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import {
+  DspaceRestService,
+  HttpOptions,
+} from '../../../core/dspace-rest/dspace-rest.service';
+import { RawRestResponse } from '../../../core/dspace-rest/raw-rest-response.model';
+import { isEmpty } from '../../empty.util';
+import {
+  MOCK_RESPONSE_MAP,
+  ResponseMapMock,
+} from './mocks/response-map.mock';
 
 /**
  * Service to access DSpace's REST API.
@@ -22,7 +36,7 @@ export class EndpointMockingRestService extends DspaceRestService {
 
   constructor(
     @Inject(MOCK_RESPONSE_MAP) protected mockResponseMap: ResponseMapMock,
-    protected http: HttpClient
+    protected http: HttpClient,
   ) {
     super(http);
   }
@@ -84,7 +98,7 @@ export class EndpointMockingRestService extends DspaceRestService {
       payload: mockData,
       headers: new HttpHeaders(),
       statusCode: 200,
-      statusText: 'OK'
+      statusText: 'OK',
     });
   }
 
diff --git a/src/app/shared/mocks/external-source.service.mock.ts b/src/app/shared/mocks/external-source.service.mock.ts
index 018f57d5f3..7769095f2c 100644
--- a/src/app/shared/mocks/external-source.service.mock.ts
+++ b/src/app/shared/mocks/external-source.service.mock.ts
@@ -9,15 +9,15 @@ export const externalSourceOrcid: ExternalSource = {
   hierarchical: false,
   _links: {
     entries: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid/entries',
     },
     entityTypes: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes',
     },
     self: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid'
-    }
-  }
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/orcid',
+    },
+  },
 };
 
 export const externalSourceCiencia: ExternalSource = {
@@ -27,15 +27,15 @@ export const externalSourceCiencia: ExternalSource = {
   hierarchical: false,
   _links: {
     entries: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia/entries',
     },
     entityTypes: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes',
     },
     self: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia'
-    }
-  }
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/ciencia',
+    },
+  },
 };
 
 export const externalSourceMyStaffDb: ExternalSource = {
@@ -45,15 +45,15 @@ export const externalSourceMyStaffDb: ExternalSource = {
   hierarchical: false,
   _links: {
     entries: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entries',
     },
     entityTypes: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes'
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db/entityTypes',
     },
     self: {
-      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db'
-    }
-  }
+      href: 'https://dspace7.4science.cloud/server/api/integration/externalsources/my_staff_db',
+    },
+  },
 };
 
 /**
diff --git a/src/app/shared/mocks/find-id-config-data.service.mock.ts b/src/app/shared/mocks/find-id-config-data.service.mock.ts
index c94fa6c0d6..1be0fc5720 100644
--- a/src/app/shared/mocks/find-id-config-data.service.mock.ts
+++ b/src/app/shared/mocks/find-id-config-data.service.mock.ts
@@ -1,5 +1,5 @@
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export function getMockFindByIdDataService(propertyKey: string, ...values: string[]) {
   return jasmine.createSpyObj('findByIdDataService', {
@@ -7,7 +7,7 @@ export function getMockFindByIdDataService(propertyKey: string, ...values: strin
       ... new ConfigurationProperty(),
       name: propertyKey,
       values: values,
-    })
+    }),
   });
 }
 
diff --git a/src/app/shared/mocks/form-builder-service.mock.ts b/src/app/shared/mocks/form-builder-service.mock.ts
index f9d9dffdcb..46845dcb10 100644
--- a/src/app/shared/mocks/form-builder-service.mock.ts
+++ b/src/app/shared/mocks/form-builder-service.mock.ts
@@ -1,14 +1,18 @@
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+
+import { DsDynamicInputModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { FormBuilderService } from '../form/builder/form-builder.service';
-import { FormControl, FormGroup } from '@angular/forms';
-import {DsDynamicInputModel} from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 
 export function getMockFormBuilderService(): FormBuilderService {
 
   return jasmine.createSpyObj('FormBuilderService', {
     modelFromConfiguration: [],
-    createFormGroup: new FormGroup({}),
+    createFormGroup: new UntypedFormGroup({}),
     getValueFromModel: {},
-    getFormControlById: new FormControl(),
+    getFormControlById: new UntypedFormControl(),
     hasMappedGroupValue: false,
     findById: {},
     getPath: ['test', 'path'],
@@ -22,24 +26,24 @@ export function getMockFormBuilderService(): FormBuilderService {
     isConcatGroup: false,
     hasArrayGroupValue: true,
     getTypeBindModel: new DsDynamicInputModel({
-        name: 'dc.type',
-        id: 'dc_type',
-        readOnly: false,
-        disabled: false,
-        repeatable: false,
-        value: {
-          value: 'boundType',
-          display: 'Bound Type',
-          authority: 'bound-auth-key'
-        },
-        submissionId: '1234',
-        metadataFields: ['dc.type'],
-        hasSelectableMetadata: false,
-        typeBindRelations: [
-          {match: 'VISIBLE', operator: 'OR', when: [{id: 'dc.type', value: 'boundType'}]}
-        ]
-      }
-    )
+      name: 'dc.type',
+      id: 'dc_type',
+      readOnly: false,
+      disabled: false,
+      repeatable: false,
+      value: {
+        value: 'boundType',
+        display: 'Bound Type',
+        authority: 'bound-auth-key',
+      },
+      submissionId: '1234',
+      metadataFields: ['dc.type'],
+      hasSelectableMetadata: false,
+      typeBindRelations: [
+        { match: 'VISIBLE', operator: 'OR', when: [{ id: 'dc.type', value: 'boundType' }] },
+      ],
+    },
+    ),
   });
 
 }
diff --git a/src/app/shared/mocks/form-models.mock.ts b/src/app/shared/mocks/form-models.mock.ts
index 3529f9e81b..39fc3823b0 100644
--- a/src/app/shared/mocks/form-models.mock.ts
+++ b/src/app/shared/mocks/form-models.mock.ts
@@ -1,19 +1,19 @@
 import { DynamicSelectModel } from '@ng-dynamic-forms/core';
 
+import { FormRowModel } from '../../core/config/models/config-submission-form.model';
+import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
 import { DsDynamicInputModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DynamicQualdropModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import {
   DynamicRowArrayModel,
-  DynamicRowArrayModelConfig
+  DynamicRowArrayModelConfig,
 } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
-import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import { DynamicRowGroupModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { DynamicRelationGroupModel } from '../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldModel } from '../form/builder/models/form-field.model';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
 import { FormFieldMetadataValueObject } from '../form/builder/models/form-field-metadata-value.model';
-import { DynamicRowGroupModel } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { FormRowModel } from '../../core/config/models/config-submission-form.model';
 
 export const qualdropSelectConfig = {
   name: 'dc.identifier_QUALDROP_METADATA',
@@ -25,30 +25,30 @@ export const qualdropSelectConfig = {
   options: [
     {
       label: 'ISSN',
-      value: 'dc.identifier.issn'
+      value: 'dc.identifier.issn',
     },
     {
       label: 'Other',
-      value: 'dc.identifier.other'
+      value: 'dc.identifier.other',
     },
     {
       label: 'ISMN',
-      value: 'dc.identifier.ismn'
+      value: 'dc.identifier.ismn',
     },
     {
       label: 'Gov\'t Doc #',
-      value: 'dc.identifier.govdoc'
+      value: 'dc.identifier.govdoc',
     },
     {
       label: 'URI',
-      value: 'dc.identifier.uri'
+      value: 'dc.identifier.uri',
     },
     {
       label: 'ISBN',
-      value: 'dc.identifier.isbn'
-    }
+      value: 'dc.identifier.isbn',
+    },
   ],
-  value: 'dc.identifier.issn'
+  value: 'dc.identifier.issn',
 };
 
 export const qualdropInputConfig = {
@@ -60,7 +60,7 @@ export const qualdropInputConfig = {
   value: 'test',
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockQualdropSelectModel = new DynamicSelectModel(qualdropSelectConfig);
@@ -71,7 +71,7 @@ export const qualdropConfig = {
   legend: 'Identifiers',
   readOnly: false,
   group: [mockQualdropSelectModel, mockQualdropInputModel],
-  required: false
+  required: false,
 };
 
 export const MockQualdropModel = new DynamicQualdropModel(qualdropConfig);
@@ -90,7 +90,7 @@ const rowArrayQualdropConfig = {
   metadataKey: 'dc.some.key',
   metadataFields: ['dc.some.key'],
   hasSelectableMetadata: false,
-  showButtons: true
+  showButtons: true,
 } as DynamicRowArrayModelConfig;
 
 export const MockRowArrayQualdropModel: DynamicRowArrayModel = new DynamicRowArrayModel(rowArrayQualdropConfig);
@@ -107,10 +107,10 @@ const mockFormRowModel = {
         {
           metadata: 'journal',
           controlledVocabulary: 'JOURNALAuthority',
-          closed: false
-        }
+          closed: false,
+        },
       ],
-      languageCodes: []
+      languageCodes: [],
     } as FormFieldModel,
     {
       input: { type: 'onebox' },
@@ -120,12 +120,12 @@ const mockFormRowModel = {
       hints: ' Enter issue number.',
       selectableMetadata: [
         {
-          metadata: 'issue'
-        }
+          metadata: 'issue',
+        },
       ],
-      languageCodes: []
-    } as FormFieldModel
-  ]
+      languageCodes: [],
+    } as FormFieldModel,
+  ],
 } as FormRowModel;
 
 const relationGroupConfig = {
@@ -140,15 +140,15 @@ const relationGroupConfig = {
   value: {
     journal: [
       'journal test 1',
-      'journal test 2'
+      'journal test 2',
     ],
     issue: [
       'issue test 1',
-      'issue test 2'
+      'issue test 2',
     ],
   },
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const MockRelationModel: DynamicRelationGroupModel = new DynamicRelationGroupModel(relationGroupConfig);
@@ -158,12 +158,12 @@ export const inputWithLanguageAndAuthorityConfig = {
   languageCodes: [
     {
       display: 'English',
-      code: 'en_US'
+      code: 'en_US',
     },
     {
       display: 'Italian',
-      code: 'it_IT'
-    }
+      code: 'it_IT',
+    },
   ],
   language: 'en_US',
   name: 'testWithAuthority',
@@ -178,7 +178,7 @@ export const inputWithLanguageAndAuthorityConfig = {
   },
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithLanguageAndAuthorityModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityConfig);
@@ -187,12 +187,12 @@ export const inputWithLanguageConfig = {
   languageCodes: [
     {
       display: 'English',
-      code: 'en_US'
+      code: 'en_US',
     },
     {
       display: 'Italian',
-      code: 'it_IT'
-    }
+      code: 'it_IT',
+    },
   ],
   language: 'en_US',
   name: 'testWithLanguage',
@@ -203,7 +203,7 @@ export const inputWithLanguageConfig = {
   value: 'testWithLanguage',
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithLanguageModel = new DsDynamicInputModel(inputWithLanguageConfig);
@@ -213,12 +213,12 @@ export const inputWithLanguageAndAuthorityArrayConfig = {
   languageCodes: [
     {
       display: 'English',
-      code: 'en_US'
+      code: 'en_US',
     },
     {
       display: 'Italian',
-      code: 'it_IT'
-    }
+      code: 'it_IT',
+    },
   ],
   language: 'en_US',
   name: 'testWithLanguageAndAuthorityArray',
@@ -233,7 +233,7 @@ export const inputWithLanguageAndAuthorityArrayConfig = {
   }],
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithLanguageAndAuthorityArrayModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityArrayConfig);
@@ -247,7 +247,7 @@ export const inputWithFormFieldValueConfig = {
   value: new FormFieldMetadataValueObject('testWithFormFieldValue'),
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithFormFieldValueModel = new DsDynamicInputModel(inputWithFormFieldValueConfig);
@@ -261,11 +261,11 @@ export const inputWithAuthorityValueConfig = {
   value: Object.assign({}, new VocabularyEntry(), {
     value: 'testWithAuthorityValue',
     authority: 'testWithAuthorityValue',
-    display: 'testWithAuthorityValue'
+    display: 'testWithAuthorityValue',
   }),
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithAuthorityValueModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
@@ -279,7 +279,7 @@ export const inputWithObjectValueConfig = {
   value: { value: 'testWithObjectValue', authority: 'testWithObjectValue', display: 'testWithObjectValue' },
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockInputWithObjectValueModel = new DsDynamicInputModel(inputWithObjectValueConfig);
@@ -297,14 +297,14 @@ export const fileFormEditInputConfig = {
   repeatable: false,
   submissionId: '1234',
   metadataFields: [],
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const mockFileFormEditInputModel = new DsDynamicInputModel(fileFormEditInputConfig);
 
 export const mockFileFormEditRowGroupModel = new DynamicRowGroupModel({
   id: 'mockRowGroupModel',
-  group: [mockFileFormEditInputModel]
+  group: [mockFileFormEditInputModel],
 });
 
 // Mock configuration and model for an input with type binding
@@ -317,30 +317,30 @@ export const inputWithTypeBindConfig = {
   value: {
     value: 'testWithTypeBind',
     display: 'testWithTypeBind',
-    authority: 'bound-auth-key'
+    authority: 'bound-auth-key',
   },
   submissionId: '1234',
   metadataFields: [],
   hasSelectableMetadata: false,
   getTypeBindModel: new DsDynamicInputModel({
-      name: 'testWithTypeBind',
-      id: 'testWithTypeBind',
-      readOnly: false,
-      disabled: false,
-      repeatable: false,
-      value: {
-        value: 'testWithTypeBind',
-        display: 'testWithTypeBind',
-        authority: 'bound-auth-key'
-      },
-      submissionId: '1234',
-      metadataFields: [],
-      hasSelectableMetadata: false,
-      typeBindRelations: [
-        {match: 'VISIBLE', operator: 'OR', when: [{'id': 'dc.type', 'value': 'boundType'}]}
-      ]
-    }
-  )
+    name: 'testWithTypeBind',
+    id: 'testWithTypeBind',
+    readOnly: false,
+    disabled: false,
+    repeatable: false,
+    value: {
+      value: 'testWithTypeBind',
+      display: 'testWithTypeBind',
+      authority: 'bound-auth-key',
+    },
+    submissionId: '1234',
+    metadataFields: [],
+    hasSelectableMetadata: false,
+    typeBindRelations: [
+      { match: 'VISIBLE', operator: 'OR', when: [{ 'id': 'dc.type', 'value': 'boundType' }] },
+    ],
+  },
+  ),
 };
 
 export const mockInputWithTypeBindModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
@@ -355,8 +355,8 @@ export const dcTypeInputConfig = {
   metadataFields: [],
   hasSelectableMetadata: false,
   value: {
-    value: 'boundType'
-  }
+    value: 'boundType',
+  },
 };
 
 export const mockDcTypeInputModel = new DsDynamicInputModel(dcTypeInputConfig);
diff --git a/src/app/shared/mocks/form-service.mock.ts b/src/app/shared/mocks/form-service.mock.ts
index 0475250627..5b6ef32814 100644
--- a/src/app/shared/mocks/form-service.mock.ts
+++ b/src/app/shared/mocks/form-service.mock.ts
@@ -6,7 +6,7 @@ import { FormService } from '../form/form.service';
  * Mock for [[FormService]]
  */
 export function getMockFormService(
-  id$: string = 'random_id'
+  id$: string = 'random_id',
 ): FormService {
   return jasmine.createSpyObj('FormService', {
     getFormData: jasmine.createSpy('getFormData'),
diff --git a/src/app/shared/mocks/health-endpoint.mocks.ts b/src/app/shared/mocks/health-endpoint.mocks.ts
index a9246d91a1..b3378f67eb 100644
--- a/src/app/shared/mocks/health-endpoint.mocks.ts
+++ b/src/app/shared/mocks/health-endpoint.mocks.ts
@@ -3,7 +3,7 @@ import {
   HealthInfoComponent,
   HealthInfoResponse,
   HealthResponse,
-  HealthStatus
+  HealthStatus,
 } from '../../health-page/models/health-component.model';
 
 export const HealthResponseObj: HealthResponse = {
@@ -17,47 +17,47 @@ export const HealthResponseObj: HealthResponse = {
           'details': {
             'database': 'PostgreSQL',
             'result': 1,
-            'validationQuery': 'SELECT 1'
-          }
+            'validationQuery': 'SELECT 1',
+          },
         },
         'dspaceDataSource': {
           'status': HealthStatus.UP,
           'details': {
             'database': 'PostgreSQL',
             'result': 1,
-            'validationQuery': 'SELECT 1'
-          }
-        }
-      }
+            'validationQuery': 'SELECT 1',
+          },
+        },
+      },
     },
     'geoIp': {
       'status': HealthStatus.UP_WITH_ISSUES,
       'details': {
-        'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.'
-      }
+        'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.',
+      },
     },
     'solrOaiCore': {
       'status': HealthStatus.UP,
       'details': {
         'status': 0,
-        'detectedPathType': 'particular core'
-      }
+        'detectedPathType': 'particular core',
+      },
     },
     'solrSearchCore': {
       'status': HealthStatus.UP,
       'details': {
         'status': 0,
-        'detectedPathType': 'particular core'
-      }
+        'detectedPathType': 'particular core',
+      },
     },
     'solrStatisticsCore': {
       'status': HealthStatus.UP,
       'details': {
         'status': 0,
-        'detectedPathType': 'particular core'
-      }
-    }
-  }
+        'detectedPathType': 'particular core',
+      },
+    },
+  },
 };
 
 export const HealthComponentOne: HealthComponent = {
@@ -68,25 +68,25 @@ export const HealthComponentOne: HealthComponent = {
       'details': {
         'database': 'PostgreSQL',
         'result': 1,
-        'validationQuery': 'SELECT 1'
-      }
+        'validationQuery': 'SELECT 1',
+      },
     },
     'dspaceDataSource': {
       'status': HealthStatus.UP,
       'details': {
         'database': 'PostgreSQL',
         'result': 1,
-        'validationQuery': 'SELECT 1'
-      }
-    }
-  }
+        'validationQuery': 'SELECT 1',
+      },
+    },
+  },
 };
 
 export const HealthComponentTwo: HealthComponent = {
   'status': HealthStatus.UP_WITH_ISSUES,
   'details': {
-    'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.'
-  }
+    'reason': 'The GeoLite Database file is missing (/var/lib/GeoIP/GeoLite2-City.mmdb)! Solr Statistics cannot generate location based reports! Please see the DSpace installation instructions for instructions to install this file.',
+  },
 };
 
 export const HealthInfoResponseObj: HealthInfoResponse = {
@@ -97,7 +97,7 @@ export const HealthInfoResponseObj: HealthInfoResponse = {
     'db': 'jdbc:postgresql://localhost:5432/dspace7',
     'solr': {
       'server': 'http://localhost:8983/solr',
-      'prefix': ''
+      'prefix': '',
     },
     'mail': {
       'server': 'smtp.example.com',
@@ -105,29 +105,29 @@ export const HealthInfoResponseObj: HealthInfoResponse = {
       'feedback-recipient': 'dspace-help@myu.edu',
       'mail-admin': 'dspace-help@myu.edu',
       'mail-helpdesk': 'dspace-help@myu.edu',
-      'alert-recipient': 'dspace-help@myu.edu'
+      'alert-recipient': 'dspace-help@myu.edu',
     },
     'cors': {
-      'allowed-origins': 'http://localhost:4000'
+      'allowed-origins': 'http://localhost:4000',
     },
     'ui': {
-      'url': 'http://localhost:4000'
-    }
+      'url': 'http://localhost:4000',
+    },
   },
   'java': {
     'vendor': 'Private Build',
     'version': '11.0.15',
     'runtime': {
       'name': 'OpenJDK Runtime Environment',
-      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1'
+      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1',
     },
     'jvm': {
       'name': 'OpenJDK 64-Bit Server VM',
       'vendor': 'Private Build',
-      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1'
-    }
+      'version': '11.0.15+10-Ubuntu-0ubuntu0.20.04.1',
+    },
   },
-  'version': '7.3-SNAPSHOT'
+  'version': '7.3-SNAPSHOT',
 };
 
 export const HealthInfoComponentOne: HealthInfoComponent = {
@@ -137,7 +137,7 @@ export const HealthInfoComponentOne: HealthInfoComponent = {
   'db': 'jdbc:postgresql://localhost:5432/dspace7',
   'solr': {
     'server': 'http://localhost:8983/solr',
-    'prefix': ''
+    'prefix': '',
   },
   'mail': {
     'server': 'smtp.example.com',
@@ -145,16 +145,16 @@ export const HealthInfoComponentOne: HealthInfoComponent = {
     'feedback-recipient': 'dspace-help@myu.edu',
     'mail-admin': 'dspace-help@myu.edu',
     'mail-helpdesk': 'dspace-help@myu.edu',
-    'alert-recipient': 'dspace-help@myu.edu'
+    'alert-recipient': 'dspace-help@myu.edu',
   },
   'cors': {
-    'allowed-origins': 'http://localhost:4000'
+    'allowed-origins': 'http://localhost:4000',
   },
   'ui': {
-    'url': 'http://localhost:4000'
-  }
+    'url': 'http://localhost:4000',
+  },
 };
 
 export const HealthInfoComponentTwo = {
-  'version': '7.3-SNAPSHOT'
+  'version': '7.3-SNAPSHOT',
 };
diff --git a/src/app/shared/mocks/host-window-service.mock.ts b/src/app/shared/mocks/host-window-service.mock.ts
index 4c8cd2b633..1e5bf222d7 100644
--- a/src/app/shared/mocks/host-window-service.mock.ts
+++ b/src/app/shared/mocks/host-window-service.mock.ts
@@ -1,4 +1,7 @@
-import {of as observableOf,  Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 // declare a stub service
 export class HostWindowServiceMock {
diff --git a/src/app/shared/mocks/href-only-data.service.mock.ts b/src/app/shared/mocks/href-only-data.service.mock.ts
index ba7d02ec25..a54b94c601 100644
--- a/src/app/shared/mocks/href-only-data.service.mock.ts
+++ b/src/app/shared/mocks/href-only-data.service.mock.ts
@@ -1,7 +1,11 @@
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../core/data/remote-data';
-import { createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
 
 export function getMockHrefOnlyDataService(
diff --git a/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts b/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts
index 78766a0b31..17dd25685e 100644
--- a/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts
+++ b/src/app/shared/mocks/http-xsrf-token-extractor.mock.ts
@@ -6,7 +6,7 @@ import { HttpXsrfTokenExtractor } from '@angular/common/http';
  * the same fake XSRF token.
  */
 export class HttpXsrfTokenExtractorMock extends HttpXsrfTokenExtractor {
-    constructor(private token: string | null) { super(); }
+  constructor(private token: string | null) { super(); }
 
-    getToken(): string | null { return this.token; }
+  getToken(): string | null { return this.token; }
 }
diff --git a/src/app/shared/mocks/item.mock.ts b/src/app/shared/mocks/item.mock.ts
index 77685cca9a..7f723bfd61 100644
--- a/src/app/shared/mocks/item.mock.ts
+++ b/src/app/shared/mocks/item.mock.ts
@@ -1,38 +1,38 @@
 import { of as observableOf } from 'rxjs';
-import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
-import { Bitstream } from '../../core/shared/bitstream.model';
 
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { BitstreamFormat } from '../../core/shared/bitstream-format.model';
+import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { createPaginatedList } from '../testing/utils.test';
-import { Bundle } from '../../core/shared/bundle.model';
 
 export const MockBitstreamFormat1: BitstreamFormat = Object.assign(new BitstreamFormat(), {
   shortDescription: 'Microsoft Word XML',
-    description: 'Microsoft Word XML',
-    mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-    supportLevel: 0,
-    internal: false,
-    extensions: null,
-    _links:{
+  description: 'Microsoft Word XML',
+  mimetype: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+  supportLevel: 0,
+  internal: false,
+  extensions: null,
+  _links:{
     self: {
-      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10'
-    }
-    }
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/10',
+    },
+  },
 });
 
 export const MockBitstreamFormat2: BitstreamFormat = Object.assign(new BitstreamFormat(), {
-    shortDescription: 'Adobe PDF',
-    description: 'Adobe Portable Document Format',
-    mimetype: 'application/pdf',
-    supportLevel: 0,
-    internal: false,
-    extensions: null,
-    _links:{
-      self: {
-        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4'
-      }
-    }
+  shortDescription: 'Adobe PDF',
+  description: 'Adobe Portable Document Format',
+  mimetype: 'application/pdf',
+  supportLevel: 0,
+  internal: false,
+  extensions: null,
+  _links:{
+    self: {
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4',
+    },
+  },
 });
 
 export const MockBitstreamFormat3: BitstreamFormat = Object.assign(new BitstreamFormat(), {
@@ -44,9 +44,9 @@ export const MockBitstreamFormat3: BitstreamFormat = Object.assign(new Bitstream
   extensions: null,
   _links:{
     self: {
-      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17'
-    }
-  }
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17',
+    },
+  },
 });
 
 export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
@@ -57,8 +57,8 @@ export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
     bundleName: 'ORIGINAL',
     _links:{
       self: {
-        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713'
-      }
+        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/cf9b0c8e-a1eb-4b65-afd0-567366448713',
+      },
     },
     id: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
     uuid: 'cf9b0c8e-a1eb-4b65-afd0-567366448713',
@@ -67,10 +67,10 @@ export const MockBitstream1: Bitstream = Object.assign(new Bitstream(),
       'dc.title': [
         {
           language: null,
-          value: 'test_word.docx'
-        }
-      ]
-    }
+          value: 'test_word.docx',
+        },
+      ],
+    },
   });
 
 export const MockBitstream2: Bitstream = Object.assign(new Bitstream(), {
@@ -85,16 +85,16 @@ export const MockBitstream2: Bitstream = Object.assign(new Bitstream(), {
     self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28' },
     content: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/99b00f3c-1cc6-4689-8158-91965bee6b28/content' },
     format: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/4' },
-    bundle: { href: '' }
+    bundle: { href: '' },
   },
   metadata: {
     'dc.title': [
       {
         language: null,
-        value: 'test_pdf.pdf'
-      }
-    ]
-  }
+        value: 'test_pdf.pdf',
+      },
+    ],
+  },
 });
 
 export const MockBitstream3: Bitstream = Object.assign(new Bitstream(), {
@@ -109,16 +109,16 @@ export const MockBitstream3: Bitstream = Object.assign(new Bitstream(), {
     self: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29' },
     content: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/4db100c1-e1f5-4055-9404-9bc3e2d15f29/content' },
     format: { href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreamformats/17' },
-    bundle: { href: '' }
+    bundle: { href: '' },
   },
   metadata: {
     'dc.title': [
       {
         language: null,
-        value: 'scary'
-      }
-    ]
-  }
+        value: 'scary',
+      },
+    ],
+  },
 });
 
 export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
@@ -128,7 +128,7 @@ export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
     _links: {
       self: {
         href: 'dspace-angular://aggregated/object/1507836003548',
-      }
+      },
     },
     requestPending: false,
     responsePending: false,
@@ -148,14 +148,14 @@ export const MockOriginalBundle: Bundle = Object.assign(new Bundle(), {
         elementsPerPage: 20,
         totalElements: 3,
         totalPages: 1,
-        currentPage: 2
+        currentPage: 2,
       },
       page: [
         MockBitstream1,
-        MockBitstream2
-      ]
-    }
-  }))
+        MockBitstream2,
+      ],
+    },
+  })),
 });
 
 
@@ -171,8 +171,8 @@ export const ItemMock: Item = Object.assign(new Item(), {
   ])),
   _links:{
     self: {
-      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357'
-    }
+      href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+    },
   },
   id: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
   uuid: '0ec7ff22-f211-40ab-a69e-c819b0b1f357',
@@ -181,116 +181,116 @@ export const ItemMock: Item = Object.assign(new Item(), {
     'dc.creator': [
       {
         language: 'en_US',
-        value: 'Doe, Jane'
-      }
+        value: 'Doe, Jane',
+      },
     ],
     'dc.date.accessioned': [
       {
         language: null,
-        value: '1650-06-26T19:58:25Z'
-      }
+        value: '1650-06-26T19:58:25Z',
+      },
     ],
     'dc.date.available': [
       {
         language: null,
-        value: '1650-06-26T19:58:25Z'
-      }
+        value: '1650-06-26T19:58:25Z',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '1650-06-26'
-      }
+        value: '1650-06-26',
+      },
     ],
     'dc.identifier.issn': [
       {
         language: 'en_US',
-        value: '123456789'
-      }
+        value: '123456789',
+      },
     ],
     'dc.identifier.uri': [
       {
         language: null,
-        value: 'http://dspace7.4science.it/xmlui/handle/10673/6'
-      }
+        value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!'
-      }
+        value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+      },
     ],
     'dc.description.provenance': [
       {
         language: 'en',
-        value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)'
+        value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
       },
       {
         language: 'en',
-        value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).'
+        value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
       },
       {
         language: 'en',
-        value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).'
+        value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
       },
       {
         language: 'en',
-        value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).'
-      }
+        value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+      },
     ],
     'dc.language': [
       {
         language: 'en_US',
-        value: 'en'
-      }
+        value: 'en',
+      },
     ],
     'dc.rights': [
       {
         language: 'en_US',
-        value: '© Jane Doe'
-      }
+        value: '© Jane Doe',
+      },
     ],
     'dc.subject': [
       {
         language: 'en_US',
-        value: 'keyword1'
+        value: 'keyword1',
       },
       {
         language: 'en_US',
-        value: 'keyword2'
+        value: 'keyword2',
       },
       {
         language: 'en_US',
-        value: 'keyword3'
-      }
+        value: 'keyword3',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test PowerPoint Document'
-      }
+        value: 'Test PowerPoint Document',
+      },
     ],
     'dc.type': [
       {
         language: 'en_US',
-        value: 'text'
-      }
-    ]
+        value: 'text',
+      },
+    ],
   },
   owningCollection: observableOf({
-      _links: {
-        self: {
-          href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb'
-        }
+    _links: {
+      self: {
+        href: 'https://dspace7.4science.it/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
       },
-      requestPending: false,
-      responsePending: false,
-      isSuccessful: true,
-      errorMessage: '',
-      statusCode: '202',
-      pageInfo: {},
-      payload: []
-    }
-  )
+    },
+    requestPending: false,
+    responsePending: false,
+    isSuccessful: true,
+    errorMessage: '',
+    statusCode: '202',
+    pageInfo: {},
+    payload: [],
+  },
+  ),
 });
 /* eslint-enable @typescript-eslint/no-shadow */
diff --git a/src/app/shared/mocks/link-service.mock.ts b/src/app/shared/mocks/link-service.mock.ts
index d50640a629..d691976198 100644
--- a/src/app/shared/mocks/link-service.mock.ts
+++ b/src/app/shared/mocks/link-service.mock.ts
@@ -4,6 +4,6 @@ export function getMockLinkService(): LinkService {
   return jasmine.createSpyObj('linkService', {
     resolveLinks: jasmine.createSpy('resolveLinks'),
     resolveLink: jasmine.createSpy('resolveLink'),
-    removeResolvedLinks: jasmine.createSpy('removeResolvedLinks')
+    removeResolvedLinks: jasmine.createSpy('removeResolvedLinks'),
   });
 }
diff --git a/src/app/shared/mocks/mock-native-window-ref.ts b/src/app/shared/mocks/mock-native-window-ref.ts
index 5a6d6c5f30..47f804fa4b 100644
--- a/src/app/shared/mocks/mock-native-window-ref.ts
+++ b/src/app/shared/mocks/mock-native-window-ref.ts
@@ -6,9 +6,9 @@ export const MockWindow = {
     },
     get href() {
       return this._href;
-    }
+    },
   },
-  origin: 'http://localhost'
+  origin: 'http://localhost',
 };
 
 export class NativeWindowRefMock {
diff --git a/src/app/shared/mocks/mock-resource-policy-service.ts b/src/app/shared/mocks/mock-resource-policy-service.ts
index 2cf73561e5..b6f2908508 100644
--- a/src/app/shared/mocks/mock-resource-policy-service.ts
+++ b/src/app/shared/mocks/mock-resource-policy-service.ts
@@ -5,6 +5,6 @@ export function getMockResourcePolicyService(): ResourcePolicyDataService {
     searchByResource: jasmine.createSpy('searchByResource'),
     create: jasmine.createSpy('create'),
     delete: jasmine.createSpy('delete'),
-    update: jasmine.createSpy('update')
+    update: jasmine.createSpy('update'),
   });
 }
diff --git a/src/app/shared/mocks/mock-trucatable.service.ts b/src/app/shared/mocks/mock-trucatable.service.ts
index 2641bcd89c..a0711015ed 100644
--- a/src/app/shared/mocks/mock-trucatable.service.ts
+++ b/src/app/shared/mocks/mock-trucatable.service.ts
@@ -14,6 +14,6 @@ export const mockTruncatableService: any = {
   collapse: (id: string) => {
   },
   toggle: (id: string) => {
-  }
+  },
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
diff --git a/src/app/shared/mocks/notifications.mock.ts b/src/app/shared/mocks/notifications.mock.ts
new file mode 100644
index 0000000000..30237b6b79
--- /dev/null
+++ b/src/app/shared/mocks/notifications.mock.ts
@@ -0,0 +1,1874 @@
+import { of as observableOf } from 'rxjs';
+
+import { QualityAssuranceEventDataService } from '../../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceEventObject } from '../../core/notifications/qa/models/quality-assurance-event.model';
+import { QualityAssuranceSourceObject } from '../../core/notifications/qa/models/quality-assurance-source.model';
+import { QualityAssuranceTopicObject } from '../../core/notifications/qa/models/quality-assurance-topic.model';
+import { QualityAssuranceTopicDataService } from '../../core/notifications/qa/topics/quality-assurance-topic-data.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { ResourceType } from '../../core/shared/resource-type';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { SearchResult } from '../search/models/search-result.model';
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+
+// Items
+// -------------------------------------------------------------------------------
+
+const ItemMockPid1: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174001',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174001',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Index nominum et rerum',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid2: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174004',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174004',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'UNA NUOVA RILETTURA DELL\u0027 ARISTOTELE DI FRANZ BRENTANO ALLA LUCE DI ALCUNI INEDITI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid3: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174005',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174005',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Sustainable development',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid4: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174006',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174006',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Reply to Critics',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid5: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174007',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174007',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'PROGETTAZIONE, SINTESI E VALUTAZIONE DELL\u0027ATTIVITA\u0027 ANTIMICOBATTERICA ED ANTIFUNGINA DI NUOVI DERIVATI ETEROCICLICI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid6: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174008',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174008',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Donald Davidson',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid7: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174009',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174009',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Missing abstract article',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid8: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174002',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid9: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174003',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174003',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Morocco, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid10: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const NotificationsMockDspaceObject: SearchResult<DSpaceObject> = Object.assign(
+  new SearchResult<DSpaceObject>(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'https://demo.dspace.org/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+// Sources
+// -------------------------------------------------------------------------------
+
+export const qualityAssuranceSourceObjectMorePid: QualityAssuranceSourceObject = {
+  type: new ResourceType('qasource'),
+  id: 'ENRICH!MORE!PID',
+  lastEvent: '2020/10/09 10:11 UTC',
+  totalEvents: 33,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qasources/ENRICH!MORE!PID',
+    },
+  },
+};
+
+export const qualityAssuranceSourceObjectMoreAbstract: QualityAssuranceSourceObject = {
+  type: new ResourceType('qasource'),
+  id: 'ENRICH!MORE!ABSTRACT',
+  lastEvent: '2020/09/08 21:14 UTC',
+  totalEvents: 5,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qasources/ENRICH!MORE!ABSTRACT',
+    },
+  },
+};
+
+export const qualityAssuranceSourceObjectMissingPid: QualityAssuranceSourceObject = {
+  type: new ResourceType('qasource'),
+  id: 'ENRICH!MISSING!PID',
+  lastEvent: '2020/10/01 07:36 UTC',
+  totalEvents: 4,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qasources/ENRICH!MISSING!PID',
+    },
+  },
+};
+
+// Topics
+// -------------------------------------------------------------------------------
+
+export const qualityAssuranceTopicObjectMorePid: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MORE!PID',
+  name: 'ENRICH/MORE/PID',
+  lastEvent: '2020/10/09 10:11 UTC',
+  totalEvents: 33,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MORE!PID',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMoreAbstract: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MORE!ABSTRACT',
+  name: 'ENRICH/MORE/ABSTRACT',
+  lastEvent: '2020/09/08 21:14 UTC',
+  totalEvents: 5,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MORE!ABSTRACT',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingPid: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!PID',
+  name: 'ENRICH/MISSING/PID',
+  lastEvent: '2020/10/01 07:36 UTC',
+  totalEvents: 4,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!PID',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingAbstract: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!ABSTRACT',
+  name: 'ENRICH/MISSING/ABSTRACT',
+  lastEvent: '2020/10/08 16:14 UTC',
+  totalEvents: 71,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!ABSTRACT',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingAcm: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!SUBJECT!ACM',
+  name: 'ENRICH/MISSING/SUBJECT/ACM',
+  lastEvent: '2020/09/21 17:51 UTC',
+  totalEvents: 18,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!SUBJECT!ACM',
+    },
+  },
+};
+
+export const qualityAssuranceTopicObjectMissingProject: QualityAssuranceTopicObject = {
+  type: new ResourceType('qatopic'),
+  id: 'ENRICH!MISSING!PROJECT',
+  name: 'ENRICH/MISSING/PROJECT',
+  lastEvent: '2020/09/17 10:28 UTC',
+  totalEvents: 6,
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qatopics/ENRICH!MISSING!PROJECT',
+    },
+  },
+};
+
+// Events
+// -------------------------------------------------------------------------------
+
+export const qualityAssuranceEventObjectMissingPid: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174001',
+  uuid: '123e4567-e89b-12d3-a456-426614174001',
+  type: new ResourceType('qaevent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21486',
+  title: 'Index nominum et rerum',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.18848/1447-9494/cgp/v15i09/45934',
+    pidHref: 'https://doi.org/10.18848/1447-9494/cgp/v15i09/45934',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174001',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174001/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174001/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid1)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid2: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174004',
+  uuid: '123e4567-e89b-12d3-a456-426614174004',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21486',
+  title: 'UNA NUOVA RILETTURA DELL\u0027 ARISTOTELE DI FRANZ BRENTANO ALLA LUCE DI ALCUNI INEDITI',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'urn',
+    value: 'http://thesis2.sba.units.it/store/handle/item/12238',
+    pidHref:'http://thesis2.sba.units.it/store/handle/item/12238',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174004',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174004/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174004/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid2)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid3: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174005',
+  uuid: '123e4567-e89b-12d3-a456-426614174005',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/554',
+  title: 'Sustainable development',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.4324/9780203408889',
+    pidHref: 'https://doi.org/10.4324/9780203408889',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174005',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174005/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174005/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid3)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid4: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174006',
+  uuid: '123e4567-e89b-12d3-a456-426614174006',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/10787',
+  title: 'Reply to Critics',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.1080/13698230.2018.1430104',
+    pidHref: 'https://doi.org/10.1080/13698230.2018.1430104',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing DOI',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174006',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174006/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174006/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid4)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid5: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174007',
+  uuid: '123e4567-e89b-12d3-a456-426614174007',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/11339',
+  title: 'PROGETTAZIONE, SINTESI E VALUTAZIONE DELL\u0027ATTIVITA\u0027 ANTIMICOBATTERICA ED ANTIFUNGINA DI NUOVI DERIVATI ETEROCICLICI',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'urn',
+    value: 'http://thesis2.sba.units.it/store/handle/item/12477',
+    pidHref:'http://thesis2.sba.units.it/store/handle/item/12477',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174007',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174007/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174007/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid5)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingPid6: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174008',
+  uuid: '123e4567-e89b-12d3-a456-426614174008',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/29860',
+  title: 'Donald Davidson',
+  trust: 0.375,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: 'doi',
+    value: '10.1111/j.1475-4975.2004.00098.x',
+    pidHref: 'https://doi.org/10.1111/j.1475-4975.2004.00098.x',
+    abstract: null,
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing PID',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174008',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174008/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174008/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid6)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingAbstract: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174009',
+  uuid: '123e4567-e89b-12d3-a456-426614174009',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21110',
+  title: 'Missing abstract article',
+  trust: 0.751,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: null,
+    value: null,
+    pidHref: null,
+    abstract: 'Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla scelerisque vestibulum tellus sed lacinia. Aenean vitae sapien a quam congue ultrices. Sed vehicula sollicitudin ligula, vitae lacinia velit. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nulla scelerisque vestibulum tellus sed lacinia. Aenean vitae sapien a quam congue ultrices. Sed vehicula sollicitudin ligula, vitae lacinia velit.',
+    sourceId: null,
+    acronym: null,
+    code: null,
+    funder: null,
+    fundingProgram: null,
+    jurisdiction: null,
+    title: null,
+    reason: 'Missing abstract',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174009',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174009/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174009/related',
+    },
+  },
+  target: observableOf(createSuccessfulRemoteDataObject(ItemMockPid7)),
+  related: observableOf(createSuccessfulRemoteDataObject(ItemMockPid10)),
+};
+
+export const qualityAssuranceEventObjectMissingProjectFound: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174002',
+  uuid: '123e4567-e89b-12d3-a456-426614174002',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21838',
+  title: 'Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: null,
+    value: null,
+    pidHref: null,
+    abstract: null,
+    sourceId: null,
+    acronym: 'PAThs',
+    code: '687567',
+    funder: 'EC',
+    fundingProgram: 'H2020',
+    jurisdiction: 'EU',
+    reason: 'Project found',
+    title: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174002',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174002/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174002/related',
+    },
+  },
+  target: createSuccessfulRemoteDataObject$(ItemMockPid8),
+  related: createSuccessfulRemoteDataObject$(ItemMockPid10),
+};
+
+export const qualityAssuranceEventObjectMissingProjectNotFound: QualityAssuranceEventObject = {
+  id: '123e4567-e89b-12d3-a456-426614174003',
+  uuid: '123e4567-e89b-12d3-a456-426614174003',
+  type: new ResourceType('qualityAssuranceEvent'),
+  originalId: 'oai:www.openstarts.units.it:10077/21838',
+  title: 'Morocco, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+  trust: 1.0,
+  eventDate: '2020/10/09 10:11 UTC',
+  status: 'PENDING',
+  message: {
+    type: null,
+    value: null,
+    pidHref: null,
+    abstract: null,
+    sourceId: null,
+    acronym: 'PAThs',
+    code: '687567B',
+    funder: 'EC',
+    fundingProgram: 'H2021',
+    jurisdiction: 'EU',
+    title: 'Tracking Unknown Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+    reason: 'Project not found',
+  },
+  _links: {
+    self: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174003',
+    },
+    target: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174003/target',
+    },
+    related: {
+      href: 'https://rest.api/rest/api/integration/qaevents/123e4567-e89b-12d3-a456-426614174003/related',
+    },
+  },
+  target: createSuccessfulRemoteDataObject$(ItemMockPid9),
+  related: createNoContentRemoteDataObject$(),
+};
+
+// Classes
+// -------------------------------------------------------------------------------
+
+/**
+ * Mock for [[NotificationsStateService]]
+ */
+export function getMockNotificationsStateService(): any {
+  return jasmine.createSpyObj('NotificationsStateService', {
+    getQualityAssuranceTopics: jasmine.createSpy('getQualityAssuranceTopics'),
+    isQualityAssuranceTopicsLoading: jasmine.createSpy('isQualityAssuranceTopicsLoading'),
+    isQualityAssuranceTopicsLoaded: jasmine.createSpy('isQualityAssuranceTopicsLoaded'),
+    isQualityAssuranceTopicsProcessing: jasmine.createSpy('isQualityAssuranceTopicsProcessing'),
+    getQualityAssuranceTopicsTotalPages: jasmine.createSpy('getQualityAssuranceTopicsTotalPages'),
+    getQualityAssuranceTopicsCurrentPage: jasmine.createSpy('getQualityAssuranceTopicsCurrentPage'),
+    getQualityAssuranceTopicsTotals: jasmine.createSpy('getQualityAssuranceTopicsTotals'),
+    dispatchRetrieveQualityAssuranceTopics: jasmine.createSpy('dispatchRetrieveQualityAssuranceTopics'),
+    getQualityAssuranceSource: jasmine.createSpy('getQualityAssuranceSource'),
+    isQualityAssuranceSourceLoading: jasmine.createSpy('isQualityAssuranceSourceLoading'),
+    isQualityAssuranceSourceLoaded: jasmine.createSpy('isQualityAssuranceSourceLoaded'),
+    isQualityAssuranceSourceProcessing: jasmine.createSpy('isQualityAssuranceSourceProcessing'),
+    getQualityAssuranceSourceTotalPages: jasmine.createSpy('getQualityAssuranceSourceTotalPages'),
+    getQualityAssuranceSourceCurrentPage: jasmine.createSpy('getQualityAssuranceSourceCurrentPage'),
+    getQualityAssuranceSourceTotals: jasmine.createSpy('getQualityAssuranceSourceTotals'),
+    dispatchRetrieveQualityAssuranceSource: jasmine.createSpy('dispatchRetrieveQualityAssuranceSource'),
+    dispatchMarkUserSuggestionsAsVisitedAction: jasmine.createSpy('dispatchMarkUserSuggestionsAsVisitedAction'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceSourceDataService]]
+ */
+export function getMockQualityAssuranceSourceRestService(): QualityAssuranceTopicDataService {
+  return jasmine.createSpyObj('QualityAssuranceSourceDataService', {
+    getSources: jasmine.createSpy('getSources'),
+    getSource: jasmine.createSpy('getSource'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceTopicDataService]]
+ */
+export function getMockQualityAssuranceTopicRestService(): QualityAssuranceTopicDataService {
+  return jasmine.createSpyObj('QualityAssuranceTopicDataService', {
+    getTopic: jasmine.createSpy('getTopic'),
+    searchTopicsByTarget: jasmine.createSpy('searchTopicsByTarget'),
+    searchTopicsBySource: jasmine.createSpy('searchTopicsBySource'),
+    clearFindAllTopicsRequests: jasmine.createSpy('clearFindAllTopicsRequests'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceEventDataService]]
+ */
+export function getMockQualityAssuranceEventRestService(): QualityAssuranceEventDataService {
+  return jasmine.createSpyObj('QualityAssuranceEventDataService', {
+    getEventsByTopic: jasmine.createSpy('getEventsByTopic'),
+    getEvent: jasmine.createSpy('getEvent'),
+    patchEvent: jasmine.createSpy('patchEvent'),
+    boundProject: jasmine.createSpy('boundProject'),
+    removeProject: jasmine.createSpy('removeProject'),
+    clearFindByTopicRequests: jasmine.createSpy('.clearFindByTopicRequests'),
+  });
+}
+
+/**
+ * Mock for [[QualityAssuranceEventDataService]]
+ */
+export function getMockSuggestionsService(): any {
+  return jasmine.createSpyObj('SuggestionsService', {
+    getTargets: jasmine.createSpy('getTargets'),
+    getSuggestions: jasmine.createSpy('getSuggestions'),
+    clearSuggestionRequests: jasmine.createSpy('clearSuggestionRequests'),
+    deleteReviewedSuggestion: jasmine.createSpy('deleteReviewedSuggestion'),
+    retrieveCurrentUserSuggestions: jasmine.createSpy('retrieveCurrentUserSuggestions'),
+    getTargetUuid: jasmine.createSpy('getTargetUuid'),
+  });
+}
diff --git a/src/app/shared/mocks/publication-claim-targets.mock.ts b/src/app/shared/mocks/publication-claim-targets.mock.ts
new file mode 100644
index 0000000000..0b3c3bc9b0
--- /dev/null
+++ b/src/app/shared/mocks/publication-claim-targets.mock.ts
@@ -0,0 +1,42 @@
+import { SuggestionTarget } from '../../core/notifications/models/suggestion-target.model';
+import { ResourceType } from '../../core/shared/resource-type';
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+export const mockSuggestionTargetsObjectOne: SuggestionTarget = {
+  type: new ResourceType('suggestiontarget'),
+  id: 'reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26',
+  display: 'Bollini, Andrea',
+  source: 'reciter',
+  total: 31,
+  _links: {
+    target: {
+      href: 'https://rest.api/rest/api/core/items/gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+    suggestions: {
+      href: 'https://rest.api/rest/api/integration/suggestions/search/findByTargetAndSource?target=gf3d657-9d6d-4a87-b905-fef0f8cae26c&source=reciter',
+    },
+    self: {
+      href: 'https://rest.api/rest/api/integration/suggestiontargets/reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+  },
+};
+
+export const mockSuggestionTargetsObjectTwo: SuggestionTarget = {
+  type: new ResourceType('suggestiontarget'),
+  id: 'reciter:nhy567-9d6d-ty67-b905-fef0f8cae26',
+  display: 'Digilio, Andrea',
+  source: 'reciter',
+  total: 12,
+  _links: {
+    target: {
+      href: 'https://rest.api/rest/api/core/items/nhy567-9d6d-ty67-b905-fef0f8cae26',
+    },
+    suggestions: {
+      href: 'https://rest.api/rest/api/integration/suggestions/search/findByTargetAndSource?target=nhy567-9d6d-ty67-b905-fef0f8cae26&source=reciter',
+    },
+    self: {
+      href: 'https://rest.api/rest/api/integration/suggestiontargets/reciter:nhy567-9d6d-ty67-b905-fef0f8cae26',
+    },
+  },
+};
diff --git a/src/app/shared/mocks/publication-claim.mock.ts b/src/app/shared/mocks/publication-claim.mock.ts
new file mode 100644
index 0000000000..41866a47f9
--- /dev/null
+++ b/src/app/shared/mocks/publication-claim.mock.ts
@@ -0,0 +1,210 @@
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+
+import { Suggestion } from '../../core/notifications/models/suggestion.model';
+import { SUGGESTION } from '../../core/notifications/models/suggestion-objects.resource-type';
+
+export const mockSuggestionPublicationOne: Suggestion =  {
+  id: '24694773',
+  display: 'publication one',
+  source: 'reciter',
+  externalSourceUri: 'https://dspace7.4science.cloud/server/api/integration/reciterSourcesEntry/pubmed/entryValues/24694772',
+  score: '48',
+  evidences: {
+    acceptedRejectedEvidence: {
+      score: '2.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    authorNameEvidence: {
+      score: '0',
+      notes: 'some notes, eventually empty or null',
+    },
+    journalCategoryEvidence: {
+      score: '6',
+      notes: 'some notes, eventually empty or null',
+    },
+    affiliationEvidence: {
+      score: 'xxx',
+      notes: 'some notes, eventually empty or null',
+    },
+    relationshipEvidence: {
+      score: '9',
+      notes: 'some notes, eventually empty or null',
+    },
+    educationYearEvidence: {
+      score: '3.6',
+      notes: 'some notes, eventually empty or null',
+    },
+    personTypeEvidence: {
+      score: '4',
+      notes: 'some notes, eventually empty or null',
+    },
+    articleCountEvidence: {
+      score: '6.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    averageClusteringEvidence: {
+      score: '7',
+      notes: 'some notes, eventually empty or null',
+    },
+  },
+  metadata: {
+    'dc.identifier.uri': [
+      {
+        value: 'https://publication/0000-0003-3681-2038',
+        language: null,
+        authority: null,
+        confidence: -1,
+        place: -1,
+      } as any,
+    ],
+    'dc.title': [
+      {
+        value: 'publication one',
+        language: null,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.date.issued': [
+      {
+        value: '2010-11-03',
+        language: null,
+        authority: null,
+        confidence: -1,
+      }  as any,
+    ],
+    'dspace.entity.type': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: 'OrgUnit',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.description': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).",
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+  },
+  type: SUGGESTION,
+  _links: {
+    target: {
+      href: 'https://dspace7.4science.cloud/server/api/core/items/gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/suggestions/reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26c:24694772',
+    },
+  },
+};
+
+export const mockSuggestionPublicationTwo: Suggestion =  {
+  id: '24694772',
+  display: 'publication two',
+  source: 'reciter',
+  externalSourceUri: 'https://dspace7.4science.cloud/server/api/integration/reciterSourcesEntry/pubmed/entryValues/24694772',
+  score: '48',
+  evidences: {
+    acceptedRejectedEvidence: {
+      score: '2.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    authorNameEvidence: {
+      score: '0',
+      notes: 'some notes, eventually empty or null',
+    },
+    journalCategoryEvidence: {
+      score: '6',
+      notes: 'some notes, eventually empty or null',
+    },
+    affiliationEvidence: {
+      score: 'xxx',
+      notes: 'some notes, eventually empty or null',
+    },
+    relationshipEvidence: {
+      score: '9',
+      notes: 'some notes, eventually empty or null',
+    },
+    educationYearEvidence: {
+      score: '3.6',
+      notes: 'some notes, eventually empty or null',
+    },
+    personTypeEvidence: {
+      score: '4',
+      notes: 'some notes, eventually empty or null',
+    },
+    articleCountEvidence: {
+      score: '6.7',
+      notes: 'some notes, eventually empty or null',
+    },
+    averageClusteringEvidence: {
+      score: '7',
+      notes: 'some notes, eventually empty or null',
+    },
+  },
+  metadata: {
+    'dc.identifier.uri': [
+      {
+        value: 'https://publication/0000-0003-3681-2038',
+        language: null,
+        authority: null,
+        confidence: -1,
+        place: -1,
+      } as any,
+    ],
+    'dc.title': [
+      {
+        value: 'publication one',
+        language: null,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.date.issued': [
+      {
+        value: '2010-11-03',
+        language: null,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dspace.entity.type': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: 'OrgUnit',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+    'dc.description': [
+      {
+        uuid: '95f21fe6-ce38-43d6-96d4-60ae66385a06',
+        language: null,
+        value: "It is a long established fact that a reader will be distracted by the readable content of a page when looking at its layout. The point of using Lorem Ipsum is that it has a more-or-less normal distribution of letters, as opposed to using 'Content here, content here', making it look like readable English. Many desktop publishing packages and web page editors now use Lorem Ipsum as their default model text, and a search for 'lorem ipsum' will uncover many web sites still in their infancy. Various versions have evolved over the years, sometimes by accident, sometimes on purpose (injected humour and the like).",
+        place: 0,
+        authority: null,
+        confidence: -1,
+      } as any,
+    ],
+  },
+  type: SUGGESTION,
+  _links: {
+    target: {
+      href: 'https://dspace7.4science.cloud/server/api/core/items/gf3d657-9d6d-4a87-b905-fef0f8cae26',
+    },
+    self: {
+      href: 'https://dspace7.4science.cloud/server/api/integration/suggestions/reciter:gf3d657-9d6d-4a87-b905-fef0f8cae26c:24694772',
+    },
+  },
+};
diff --git a/src/app/shared/mocks/remote-data-build.service.mock.ts b/src/app/shared/mocks/remote-data-build.service.mock.ts
index a0fc74a753..a44e54c92c 100644
--- a/src/app/shared/mocks/remote-data-build.service.mock.ts
+++ b/src/app/shared/mocks/remote-data-build.service.mock.ts
@@ -1,12 +1,19 @@
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
-import { PaginatedList, buildPaginatedList } from '../../core/data/paginated-list.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestEntry } from '../../core/data/request-entry.model';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { hasValue } from '../empty.util';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { RequestEntry } from '../../core/data/request-entry.model';
 
 export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observable<RemoteData<any>>, buildList$?: Observable<RemoteData<PaginatedList<any>>>): RemoteDataBuildService {
   return {
@@ -16,7 +23,7 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab
         return toRemoteDataObservable$;
       } else {
         return payload$.pipe(map((payload) => ({
-          payload
+          payload,
         } as RemoteData<any>)));
       }
     },
@@ -30,7 +37,7 @@ export function getMockRemoteDataBuildService(toRemoteDataObservable$?: Observab
     },
     buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({}),
     buildFromRequestUUIDAndAwait: (id: string, callback: (rd?: RemoteData<any>) => Observable<any>) => createSuccessfulRemoteDataObject$({}),
-    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({})
+    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({}),
   } as RemoteDataBuildService;
 
 }
@@ -43,7 +50,7 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
         return toRemoteDataObservable$;
       } else {
         return payload$.pipe(map((payload) => ({
-          payload
+          payload,
         } as RemoteData<any>)));
       }
     },
@@ -63,12 +70,12 @@ export function getMockRemoteDataBuildServiceHrefMap(toRemoteDataObservable$?: O
           } else {
             return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
           }
-        })
+        }),
       );
     },
     buildFromRequestUUID: (id: string) => createSuccessfulRemoteDataObject$({}),
     buildFromRequestUUIDAndAwait: (id: string, callback: (rd?: RemoteData<any>) => Observable<any>) => createSuccessfulRemoteDataObject$({}),
-    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({})
+    buildFromHref: (href: string) => createSuccessfulRemoteDataObject$({}),
   } as RemoteDataBuildService;
 
 }
diff --git a/src/app/shared/mocks/request.service.mock.ts b/src/app/shared/mocks/request.service.mock.ts
index bce5b2d466..fd6dd7fdfb 100644
--- a/src/app/shared/mocks/request.service.mock.ts
+++ b/src/app/shared/mocks/request.service.mock.ts
@@ -1,4 +1,8 @@
-import {of as observableOf,  Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { RequestService } from '../../core/data/request.service';
 import SpyObj = jasmine.SpyObj;
 import { RequestEntry } from '../../core/data/request-entry.model';
@@ -14,6 +18,7 @@ export function getMockRequestService(requestEntry$: Observable<RequestEntry> =
     removeByHrefSubstring: observableOf(true),
     setStaleByHrefSubstring: observableOf(true),
     setStaleByUUID: observableOf(true),
-    hasByHref$: observableOf(false)
+    hasByHref$: observableOf(false),
+    shouldDispatchRequest: true,
   });
 }
diff --git a/src/app/shared/mocks/role-service.mock.ts b/src/app/shared/mocks/role-service.mock.ts
index f13ae501ef..2ab9978e62 100644
--- a/src/app/shared/mocks/role-service.mock.ts
+++ b/src/app/shared/mocks/role-service.mock.ts
@@ -1,4 +1,8 @@
-import { BehaviorSubject, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+
 import { RoleType } from '../../core/roles/role-types';
 
 export class RoleServiceMock {
diff --git a/src/app/shared/mocks/router.mock.ts b/src/app/shared/mocks/router.mock.ts
index 98a63363b6..3e2b8f9ce1 100644
--- a/src/app/shared/mocks/router.mock.ts
+++ b/src/app/shared/mocks/router.mock.ts
@@ -9,9 +9,9 @@ export class RouterMock {
     snapshot: {
       url: '',
       root: {
-        queryParamMap: null
-      }
-    }
+        queryParamMap: null,
+      },
+    },
   };
 
   // noinspection TypeScriptUnresolvedFunction
diff --git a/src/app/shared/mocks/scroll-to-service.mock.ts b/src/app/shared/mocks/scroll-to-service.mock.ts
index 03b68e55d2..2ff92930e5 100644
--- a/src/app/shared/mocks/scroll-to-service.mock.ts
+++ b/src/app/shared/mocks/scroll-to-service.mock.ts
@@ -5,6 +5,6 @@ import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
  */
 export function getMockScrollToService(): ScrollToService {
   return jasmine.createSpyObj('scrollToService', {
-    scrollTo: jasmine.createSpy('scrollTo')
+    scrollTo: jasmine.createSpy('scrollTo'),
   });
 }
diff --git a/src/app/shared/mocks/search-service.mock.ts b/src/app/shared/mocks/search-service.mock.ts
index 74dec2ff40..41db3cd8e2 100644
--- a/src/app/shared/mocks/search-service.mock.ts
+++ b/src/app/shared/mocks/search-service.mock.ts
@@ -1,4 +1,5 @@
 import { of as observableOf } from 'rxjs';
+
 import { SearchService } from '../../core/shared/search/search.service';
 
 export function getMockSearchService(): SearchService {
@@ -7,6 +8,6 @@ export function getMockSearchService(): SearchService {
     getEndpoint: observableOf('discover/search/objects'),
     getSearchLink: '/mydspace',
     getScopes: observableOf(['test-scope']),
-    setServiceOptions: {}
+    setServiceOptions: {},
   });
 }
diff --git a/src/app/shared/mocks/section-accesses-config.service.mock.ts b/src/app/shared/mocks/section-accesses-config.service.mock.ts
index cc852b86a5..8e03913528 100644
--- a/src/app/shared/mocks/section-accesses-config.service.mock.ts
+++ b/src/app/shared/mocks/section-accesses-config.service.mock.ts
@@ -1,5 +1,5 @@
-import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { SubmissionFormsConfigDataService } from '../../core/config/submission-forms-config-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 const configRes = Object.assign(new SubmissionFormsModel(), {
@@ -9,32 +9,32 @@ const configRes = Object.assign(new SubmissionFormsModel(), {
     {
       'name': 'openaccess',
       'hasStartDate': false,
-      'hasEndDate': false
+      'hasEndDate': false,
     },
     {
       'name': 'lease',
       'hasStartDate': false,
       'hasEndDate': true,
-      'maxEndDate': '2022-06-20T12:17:44.420+00:00'
+      'maxEndDate': '2022-06-20T12:17:44.420+00:00',
     },
     {
       'name': 'embargo',
       'hasStartDate': true,
       'hasEndDate': false,
-      'maxStartDate': '2024-12-20T12:17:44.420+00:00'
+      'maxStartDate': '2024-12-20T12:17:44.420+00:00',
     },
     {
       'name': 'administrator',
       'hasStartDate': false,
-      'hasEndDate': false
-    }
+      'hasEndDate': false,
+    },
   ],
   'type': 'submissionaccessoption',
   '_links': {
     'self': {
-      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration'
-    }
-  }
+      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration',
+    },
+  },
 });
 
 
@@ -45,32 +45,32 @@ const configResNotChangeDiscoverable = Object.assign(new SubmissionFormsModel(),
     {
       'name': 'openaccess',
       'hasStartDate': false,
-      'hasEndDate': false
+      'hasEndDate': false,
     },
     {
       'name': 'lease',
       'hasStartDate': false,
       'hasEndDate': true,
-      'maxEndDate': '2022-06-20T12:17:44.420+00:00'
+      'maxEndDate': '2022-06-20T12:17:44.420+00:00',
     },
     {
       'name': 'embargo',
       'hasStartDate': true,
       'hasEndDate': false,
-      'maxStartDate': '2024-12-20T12:17:44.420+00:00'
+      'maxStartDate': '2024-12-20T12:17:44.420+00:00',
     },
     {
       'name': 'administrator',
       'hasStartDate': false,
-      'hasEndDate': false
-    }
+      'hasEndDate': false,
+    },
   ],
   'type': 'submissionaccessoption',
   '_links': {
     'self': {
-      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration'
-    }
-  }
+      'href': 'http://localhost:8080/server/api/config/submissionaccessoptions/AccessConditionDefaultConfiguration',
+    },
+  },
 });
 
 export function getSubmissionAccessesConfigService(): SubmissionFormsConfigDataService {
diff --git a/src/app/shared/mocks/section-accesses.service.mock.ts b/src/app/shared/mocks/section-accesses.service.mock.ts
index 5302b37a63..e212bfccbb 100644
--- a/src/app/shared/mocks/section-accesses.service.mock.ts
+++ b/src/app/shared/mocks/section-accesses.service.mock.ts
@@ -1,6 +1,7 @@
-import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
 import { of as observableOf } from 'rxjs';
 
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+
 const dataRes = Object.assign(new SubmissionFormsModel(), {
   'id': 'AccessConditionDefaultConfiguration',
   'accessConditions': [],
diff --git a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
index 9308325682..f379af2568 100644
--- a/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
+++ b/src/app/shared/mocks/section-sherpa-policies.service.mock.ts
@@ -1,6 +1,4 @@
-import {
-  WorkspaceitemSectionSherpaPoliciesObject
-} from '../../core/submission/models/workspaceitem-section-sherpa-policies.model';
+import { WorkspaceitemSectionSherpaPoliciesObject } from '../../core/submission/models/workspaceitem-section-sherpa-policies.model';
 
 export const SherpaDataResponse = {
   'id': 'sherpaPolicies',
@@ -15,7 +13,7 @@ export const SherpaDataResponse = {
       'dateCreated': '2012-11-20 14:51:52',
       'dateModified': '2020-03-06 11:25:54',
       'inDOAJ': false,
-      'publiclyVisible': true
+      'publiclyVisible': true,
     },
     'journals': [{
       'titles': ['The Lancet', 'Lancet'],
@@ -31,7 +29,7 @@ export const SherpaDataResponse = {
         'identifier': null,
         'publicationCount': 0,
         'paidAccessDescription': 'Open access',
-        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access'
+        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
       },
       'publishers': [{
         'name': 'Elsevier',
@@ -41,7 +39,7 @@ export const SherpaDataResponse = {
         'identifier': null,
         'publicationCount': 0,
         'paidAccessDescription': 'Open access',
-        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access'
+        'paidAccessUrl': 'https://www.elsevier.com/about/open-science/open-access',
       }],
       'policies': [{
         'id': 0,
@@ -55,7 +53,7 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Author\'s Homepage', 'Preprint Repository'],
           'licenses': [],
-          'embargo': null
+          'embargo': null,
         }, {
           'articleVersion': 'accepted',
           'option': 1,
@@ -63,7 +61,7 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Author\'s Homepage', 'Institutional Website'],
           'licenses': ['CC BY-NC-ND'],
-          'embargo': null
+          'embargo': null,
         }, {
           'articleVersion': 'accepted',
           'option': 2,
@@ -71,7 +69,7 @@ export const SherpaDataResponse = {
           'prerequisites': ['If Required by Funder'],
           'locations': ['Non-Commercial Repository'],
           'licenses': ['CC BY-NC-ND'],
-          'embargo': { amount: 6, units: 'Months' }
+          'embargo': { amount: 6, units: 'Months' },
         }, {
           'articleVersion': 'accepted',
           'option': 3,
@@ -79,7 +77,7 @@ export const SherpaDataResponse = {
           'prerequisites': [],
           'locations': ['Non-Commercial Repository'],
           'licenses': [],
-          'embargo': null
+          'embargo': null,
         }],
         'urls': {
           'http://download.thelancet.com/flatcontentassets/authors/lancet-information-for-authors.pdf': 'Guidelines for Authors',
@@ -87,15 +85,15 @@ export const SherpaDataResponse = {
           'http://www.thelancet.com/lancet-information-for-authors/after-publication': 'What happens after publication?',
           'http://www.thelancet.com/lancet/information-for-authors/disclosure-of-results': 'Disclosure of results before publication',
           'https://www.elsevier.com/__data/assets/pdf_file/0005/78476/external-embargo-list.pdf': 'Journal Embargo Period List',
-          'https://www.elsevier.com/__data/assets/pdf_file/0011/78473/UK-Embargo-Periods.pdf': 'Journal Embargo List for UK Authors'
+          'https://www.elsevier.com/__data/assets/pdf_file/0011/78473/UK-Embargo-Periods.pdf': 'Journal Embargo List for UK Authors',
         },
         'openAccessProhibited': false,
         'publicationCount': 0,
         'preArchiving': 'can',
         'postArchiving': 'can',
-        'pubArchiving': 'cannot'
+        'pubArchiving': 'cannot',
       }],
-      'inDOAJ': false
-    }]
-  }
+      'inDOAJ': false,
+    }],
+  },
 } as WorkspaceitemSectionSherpaPoliciesObject;
diff --git a/src/app/shared/mocks/section-upload.service.mock.ts b/src/app/shared/mocks/section-upload.service.mock.ts
index ae3515105d..3789bbac63 100644
--- a/src/app/shared/mocks/section-upload.service.mock.ts
+++ b/src/app/shared/mocks/section-upload.service.mock.ts
@@ -5,11 +5,14 @@ import { SubmissionFormsConfigDataService } from '../../core/config/submission-f
  */
 export function getMockSectionUploadService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SectionUploadService', {
+    updatePrimaryBitstreamOperation: jasmine.createSpy('updatePrimaryBitstreamOperation'),
+    updateFilePrimaryBitstream: jasmine.createSpy('updateFilePrimaryBitstream'),
+    getUploadedFilesData: jasmine.createSpy('getUploadedFilesData'),
     getUploadedFileList: jasmine.createSpy('getUploadedFileList'),
     getFileData: jasmine.createSpy('getFileData'),
     getDefaultPolicies: jasmine.createSpy('getDefaultPolicies'),
     addUploadedFile: jasmine.createSpy('addUploadedFile'),
     updateFileData: jasmine.createSpy('updateFileData'),
-    removeUploadedFile: jasmine.createSpy('removeUploadedFile')
+    removeUploadedFile: jasmine.createSpy('removeUploadedFile'),
   });
 }
diff --git a/src/app/shared/mocks/submission.mock.ts b/src/app/shared/mocks/submission.mock.ts
index b90cababcb..df31dc96f3 100644
--- a/src/app/shared/mocks/submission.mock.ts
+++ b/src/app/shared/mocks/submission.mock.ts
@@ -9,38 +9,38 @@ import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 export const mockSectionsData = {
   traditionalpageone: {
     'dc.title': [
-      new FormFieldMetadataValueObject('test', null, null, 'test')
-    ]
+      new FormFieldMetadataValueObject('test', null, null, 'test'),
+    ],
   },
   license: {
     url: null,
     acceptanceDate: null,
-    granted: false
+    granted: false,
   },
   upload: {
-    files: []
-  }
+    files: [],
+  },
 };
 
 export const mockSectionsDataTwo = {
   traditionalpageone: {
     'dc.title': [
-      new FormFieldMetadataValueObject('test', null, null, 'test')
-    ]
+      new FormFieldMetadataValueObject('test', null, null, 'test'),
+    ],
   },
   traditionalpagetwo: {
     'dc.relation': [
-      new FormFieldMetadataValueObject('test', null, null, 'test')
-    ]
+      new FormFieldMetadataValueObject('test', null, null, 'test'),
+    ],
   },
   license: {
     url: null,
     acceptanceDate: null,
-    granted: false
+    granted: false,
   },
   upload: {
-    files: []
-  }
+    files: [],
+  },
 };
 
 export const mockSectionsErrors = [
@@ -49,15 +49,15 @@ export const mockSectionsErrors = [
     paths: [
       '/sections/traditionalpageone/dc.contributor.author',
       '/sections/traditionalpageone/dc.title',
-      '/sections/traditionalpageone/dc.date.issued'
-    ]
+      '/sections/traditionalpageone/dc.date.issued',
+    ],
   },
   {
     message: 'error.validation.license.notgranted',
     paths: [
-      '/sections/license'
-    ]
-  }
+      '/sections/license',
+    ],
+  },
 ];
 
 export const mockSectionsErrorsTouchedField = [
@@ -65,14 +65,14 @@ export const mockSectionsErrorsTouchedField = [
     message: 'error.validation.required',
     paths: [
       '/sections/traditionalpageone/dc.title',
-    ]
+    ],
   },
   {
     message: 'error.validation.license.notgranted',
     paths: [
-      '/sections/license'
-    ]
-  }
+      '/sections/license',
+    ],
+  },
 ];
 
 export const mockUploadResponse1Errors = {
@@ -81,23 +81,23 @@ export const mockUploadResponse1Errors = {
       message: 'error.validation.required',
       paths: [
         '/sections/traditionalpageone/dc.title',
-        '/sections/traditionalpageone/dc.date.issued'
-      ]
-    }
-  ]
+        '/sections/traditionalpageone/dc.date.issued',
+      ],
+    },
+  ],
 };
 
 export const mockUploadResponse1ParsedErrors: any = {
   traditionalpageone: [
     { path: '/sections/traditionalpageone/dc.title', message: 'error.validation.required' },
-    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' }
-  ]
+    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' },
+  ],
 };
 
 export const mockLicenseParsedErrors: any = {
   license: [
-    { path: '/sections/license', message: 'error.validation.license.notgranted' }
-  ]
+    { path: '/sections/license', message: 'error.validation.license.notgranted' },
+  ],
 };
 
 export const mockUploadResponse2Errors = {
@@ -106,26 +106,26 @@ export const mockUploadResponse2Errors = {
       message: 'error.validation.required',
       paths: [
         '/sections/traditionalpageone/dc.title',
-        '/sections/traditionalpageone/dc.date.issued'
-      ]
+        '/sections/traditionalpageone/dc.date.issued',
+      ],
     },
     {
       message: 'error.upload',
       paths: [
-        '/sections/upload'
-      ]
-    }
-  ]
+        '/sections/upload',
+      ],
+    },
+  ],
 };
 
 export const mockUploadResponse2ParsedErrors = {
   traditionalpageone: [
     { path: '/sections/traditionalpageone/dc.title', message: 'error.validation.required' },
-    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' }
+    { path: '/sections/traditionalpageone/dc.date.issued', message: 'error.validation.required' },
   ],
   upload: [
-    { path: '/sections/upload', message: 'error.upload' }
-  ]
+    { path: '/sections/upload', message: 'error.upload' },
+  ],
 };
 
 export const mockSubmissionRestResponse = [
@@ -151,9 +151,9 @@ export const mockSubmissionRestResponse = [
             _links: {
               content: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/content' },
               format: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/format' },
-              self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' }
-            }
-          }
+              self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' },
+            },
+          },
         ],
         id: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
         uuid: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
@@ -163,46 +163,46 @@ export const mockSubmissionRestResponse = [
           {
             key: 'dc.provenance',
             language: null,
-            value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.'
+            value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.',
           },
           {
             key: 'dc.rights.license',
             language: null,
-            value: ''
+            value: '',
           },
           {
             key: 'dc.description',
             language: null,
-            value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>'
+            value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>',
           },
           {
             key: 'dc.description.abstract',
             language: null,
-            value: 'This collection contains sample items.'
+            value: 'This collection contains sample items.',
           },
           {
             key: 'dc.description.tableofcontents',
             language: null,
-            value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>'
+            value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>',
           },
           {
             key: 'dc.rights',
             language: null,
-            value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>'
+            value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>',
           },
           {
             key: 'dc.title',
             language: null,
-            value: 'Collection of Sample Items'
-          }
+            value: 'Collection of Sample Items',
+          },
         ],
         _links: {
           license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },
           defaultAccessConditions: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/defaultAccessConditions' },
           logo: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/logo' },
-          self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' }
-        }
-      }
+          self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' },
+        },
+      },
     ],
     item: [
       {
@@ -221,9 +221,9 @@ export const mockSubmissionRestResponse = [
           bitstreams: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5/bitstreams' },
           owningCollection: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5/owningCollection' },
           templateItemOf: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5/templateItemOf' },
-          self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5' }
-        }
-      }
+          self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/6f344222-6980-4738-8192-b808d79af8a5' },
+        },
+      },
     ],
     sections: {},
     submissionDefinition: [
@@ -235,12 +235,12 @@ export const mockSubmissionRestResponse = [
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/extraction' },
-              config: ''
+              config: '',
             },
           },
           {
@@ -248,12 +248,12 @@ export const mockSubmissionRestResponse = [
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-              config: ''
+              config: '',
             },
           },
           {
@@ -263,7 +263,7 @@ export const mockSubmissionRestResponse = [
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
             },
           },
           {
@@ -273,7 +273,7 @@ export const mockSubmissionRestResponse = [
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
             },
           },
           {
@@ -283,7 +283,7 @@ export const mockSubmissionRestResponse = [
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+              config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
             },
           },
           {
@@ -292,23 +292,23 @@ export const mockSubmissionRestResponse = [
             sectionType: 'license',
             visibility: {
               main: null,
-              other: 'READONLY'
+              other: 'READONLY',
             },
             type: 'submissionsection',
             _links: {
               self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-              config: ''
+              config: '',
             },
-          }
+          },
         ],
         name: 'traditional',
         type: 'submissiondefinition',
         _links: {
           collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
           sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-          self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+          self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
         },
-      }
+      },
     ],
     submitter: [],
     errors: [],
@@ -318,9 +318,9 @@ export const mockSubmissionRestResponse = [
       item: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/item' },
       submissionDefinition: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submissionDefinition' },
       submitter: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submitter' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' }
-    }
-  }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' },
+    },
+  },
 ];
 
 export const mockSubmissionObject = {
@@ -332,7 +332,7 @@ export const mockSubmissionObject = {
         elementsPerPage: 1,
         totalElements: 1,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -342,10 +342,10 @@ export const mockSubmissionObject = {
           uuid: 'resource-policy-20',
           type: 'resourcePolicy',
           _links: {
-            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' }
-          }
-        }
-      ]
+            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' },
+          },
+        },
+      ],
     },
     logo: {
       sizeBytes: 7451,
@@ -360,8 +360,8 @@ export const mockSubmissionObject = {
       _links: {
         content: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/content' },
         format: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/format' },
-        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' }
-      }
+        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' },
+      },
     },
     id: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
     uuid: '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb',
@@ -371,45 +371,45 @@ export const mockSubmissionObject = {
       {
         key: 'dc.provenance',
         language: null,
-        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.'
+        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.',
       },
       {
         key: 'dc.rights.license',
         language: null,
-        value: ''
+        value: '',
       },
       {
         key: 'dc.description',
         language: null,
-        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>'
+        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>',
       },
       {
         key: 'dc.description.abstract',
         language: null,
-        value: 'This collection contains sample items.'
+        value: 'This collection contains sample items.',
       },
       {
         key: 'dc.description.tableofcontents',
         language: null,
-        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>'
+        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>',
       },
       {
         key: 'dc.rights',
         language: null,
-        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>'
+        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>',
       },
       {
         key: 'dc.title',
         language: null,
-        value: 'Collection of Sample Items'
-      }
+        value: 'Collection of Sample Items',
+      },
     ],
     _links: {
       license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },
       defaultAccessConditions: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/defaultAccessConditions' },
       logo: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb/logo' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb' },
+    },
   },
   item: {
     handle: null,
@@ -423,9 +423,9 @@ export const mockSubmissionObject = {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
+      page: [],
     },
     id: 'cae8af78-c874-4468-af79-e6c996aa8270',
     uuid: 'cae8af78-c874-4468-af79-e6c996aa8270',
@@ -436,8 +436,8 @@ export const mockSubmissionObject = {
       bitstreams: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/bitstreams' },
       owningCollection: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/owningCollection' },
       templateItemOf: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/templateItemOf' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' },
+    },
   },
   submissionDefinition: {
     isDefault: true,
@@ -446,7 +446,7 @@ export const mockSubmissionObject = {
         elementsPerPage: 5,
         totalElements: 5,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -454,12 +454,12 @@ export const mockSubmissionObject = {
           sectionType: 'collection',
           visibility: {
             main: 'HIDDEN',
-            other: 'HIDDEN'
+            other: 'HIDDEN',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-            config: ''
+            config: '',
           },
         },
         {
@@ -469,7 +469,7 @@ export const mockSubmissionObject = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
           },
         },
         {
@@ -479,7 +479,7 @@ export const mockSubmissionObject = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
           },
         },
         {
@@ -489,7 +489,7 @@ export const mockSubmissionObject = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
           },
         },
         {
@@ -498,32 +498,32 @@ export const mockSubmissionObject = {
           sectionType: 'license',
           visibility: {
             main: null,
-            other: 'READONLY'
+            other: 'READONLY',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-            config: ''
+            config: '',
           },
-        }
-      ]
+        },
+      ],
     },
     name: 'traditional',
     type: 'submissiondefinition',
     _links: {
       collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
       sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
     },
     collections: {
       pageInfo: {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
-    }
+      page: [],
+    },
   },
   submitter: {
     handle: null,
@@ -542,17 +542,17 @@ export const mockSubmissionObject = {
       {
         key: 'eperson.firstname',
         language: null,
-        value: 'Demo'
+        value: 'Demo',
       },
       {
         key: 'eperson.lastname',
         language: null,
-        value: 'Submitter'
-      }
+        value: 'Submitter',
+      },
     ],
     _links: {
-      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-5tg6-a9cd-6d910e68dca5' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-5tg6-a9cd-6d910e68dca5' },
+    },
   },
   id: 826,
   lastModified: '2019-01-09T10:17:33.738+0000',
@@ -560,20 +560,20 @@ export const mockSubmissionObject = {
     license: {
       url: null,
       acceptanceDate: null,
-      granted: false
+      granted: false,
     },
     upload: {
-      files: []
-    }
+      files: [],
+    },
   },
   errors: [
     {
       message: 'error.validation.required',
       paths: [
         '/sections/traditionalpageone/dc.title',
-        '/sections/traditionalpageone/dc.date.issued'
-      ]
-    }
+        '/sections/traditionalpageone/dc.date.issued',
+      ],
+    },
   ],
   type: 'workspaceitem',
   _links: {
@@ -581,8 +581,8 @@ export const mockSubmissionObject = {
     item: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/item' },
     submissionDefinition: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submissionDefinition' },
     submitter: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submitter' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' }
-  }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' },
+  },
 };
 
 export const mockSubmissionObjectNew = {
@@ -594,7 +594,7 @@ export const mockSubmissionObjectNew = {
         elementsPerPage: 1,
         totalElements: 1,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -604,10 +604,10 @@ export const mockSubmissionObjectNew = {
           uuid: 'resource-policy-20',
           type: 'resourcePolicy',
           _links: {
-            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' }
-          }
-        }
-      ]
+            self: { href: 'https://rest.api/dspace-spring-rest/api/authz/resourcePolicies/20' },
+          },
+        },
+      ],
     },
     logo: {
       sizeBytes: 7451,
@@ -622,8 +622,8 @@ export const mockSubmissionObjectNew = {
       _links: {
         content: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/content' },
         format: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425/format' },
-        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' }
-      }
+        self: { href: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/3f859425-ffbd-4b0e-bf91-bfeb458a7425' },
+      },
     },
     id: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb',
     uuid: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb',
@@ -633,45 +633,45 @@ export const mockSubmissionObjectNew = {
       {
         key: 'dc.provenance',
         language: null,
-        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.'
+        value: 'This field is for private provenance information. It is only visible to Administrative users and is not displayed in the user interface by default.',
       },
       {
         key: 'dc.rights.license',
         language: null,
-        value: ''
+        value: '',
       },
       {
         key: 'dc.description',
         language: null,
-        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>'
+        value: '<p>This is a <em>DSpace Collection</em> which contains sample DSpace Items.</p>\r\n<p><strong>Collections in DSpace may only contain Items.</strong></p>\r\n<p>This particular Collection has its own logo (the <a href=\'http://www.opensource.org/\'>Open Source Initiative</a> logo).</p>\r\n<p>This introductory text is editable by System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection).</p>',
       },
       {
         key: 'dc.description.abstract',
         language: null,
-        value: 'This collection contains sample items.'
+        value: 'This collection contains sample items.',
       },
       {
         key: 'dc.description.tableofcontents',
         language: null,
-        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>'
+        value: '<p>This is the <strong>news</strong> section for this Collection. System Administrators, Community Administrators (of a parent Community) or Collection Administrators (of this Collection) can edit this News field.</p>',
       },
       {
         key: 'dc.rights',
         language: null,
-        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>'
+        value: '<p><em>If this collection had a specific copyright statement, it would be placed here.</em></p>',
       },
       {
         key: 'dc.title',
         language: null,
-        value: 'Collection of Sample Items'
-      }
+        value: 'Collection of Sample Items',
+      },
     ],
     _links: {
       license: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb/license' },
       defaultAccessConditions: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb/defaultAccessConditions' },
       logo: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb/logo' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/collections/45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb' },
+    },
   },
   item: {
     handle: null,
@@ -685,9 +685,9 @@ export const mockSubmissionObjectNew = {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
+      page: [],
     },
     id: 'cae8af78-c874-4468-af79-e6c996aa8270',
     uuid: 'cae8af78-c874-4468-af79-e6c996aa8270',
@@ -698,8 +698,8 @@ export const mockSubmissionObjectNew = {
       bitstreams: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/bitstreams' },
       owningCollection: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/owningCollection' },
       templateItemOf: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270/templateItemOf' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/core/items/cae8af78-c874-4468-af79-e6c996aa8270' },
+    },
   },
   submissionDefinition: {
     isDefault: true,
@@ -708,7 +708,7 @@ export const mockSubmissionObjectNew = {
         elementsPerPage: 5,
         totalElements: 5,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
       page: [
         {
@@ -716,12 +716,12 @@ export const mockSubmissionObjectNew = {
           sectionType: 'collection',
           visibility: {
             main: 'HIDDEN',
-            other: 'HIDDEN'
+            other: 'HIDDEN',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-            config: ''
+            config: '',
           },
         },
         {
@@ -731,7 +731,7 @@ export const mockSubmissionObjectNew = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
           },
         },
         {
@@ -741,7 +741,7 @@ export const mockSubmissionObjectNew = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
           },
         },
         {
@@ -751,7 +751,7 @@ export const mockSubmissionObjectNew = {
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+            config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
           },
         },
         {
@@ -760,32 +760,32 @@ export const mockSubmissionObjectNew = {
           sectionType: 'license',
           visibility: {
             main: null,
-            other: 'READONLY'
+            other: 'READONLY',
           },
           type: 'submissionsection',
           _links: {
             self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-            config: ''
+            config: '',
           },
-        }
-      ]
+        },
+      ],
     },
     name: 'traditionaltwo',
     type: 'submissiondefinition',
     _links: {
       collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
       sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
     },
     collections: {
       pageInfo: {
         elementsPerPage: 0,
         totalElements: 0,
         totalPages: 1,
-        currentPage: 1
+        currentPage: 1,
       },
-      page: []
-    }
+      page: [],
+    },
   },
   submitter: {
     handle: null,
@@ -804,17 +804,17 @@ export const mockSubmissionObjectNew = {
       {
         key: 'eperson.firstname',
         language: null,
-        value: 'Demo'
+        value: 'Demo',
       },
       {
         key: 'eperson.lastname',
         language: null,
-        value: 'Submitter'
-      }
+        value: 'Submitter',
+      },
     ],
     _links: {
-      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-4bb9-a9cd-45gh23e68dca5' }
-    }
+      self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/99423c27-b642-4bb9-a9cd-45gh23e68dca5' },
+    },
   },
   id: 826,
   lastModified: '2019-01-09T10:17:33.738+0000',
@@ -826,8 +826,8 @@ export const mockSubmissionObjectNew = {
     item: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/item' },
     submissionDefinition: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submissionDefinition' },
     submitter: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826/submitter' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' }
-  }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/submission/workspaceitems/826' },
+  },
 };
 
 export const mockSubmissionCollectionId = '1c11f3f1-ba1f-4f36-908a-3f1ea9a557eb';
@@ -844,12 +844,12 @@ export const mockSubmissionDefinitionResponse = {
       sectionType: 'utils',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/extraction' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -857,12 +857,12 @@ export const mockSubmissionDefinitionResponse = {
       sectionType: 'collection',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -872,7 +872,7 @@ export const mockSubmissionDefinitionResponse = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
       },
     },
     {
@@ -882,7 +882,7 @@ export const mockSubmissionDefinitionResponse = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
       },
     },
     {
@@ -892,7 +892,7 @@ export const mockSubmissionDefinitionResponse = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
       },
     },
     {
@@ -901,21 +901,21 @@ export const mockSubmissionDefinitionResponse = {
       sectionType: 'license',
       visibility: {
         main: null,
-        other: 'READONLY'
+        other: 'READONLY',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-        config: ''
+        config: '',
       },
-    }
+    },
   ],
   name: 'traditional',
   type: 'submissiondefinition',
   _links: {
     collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
     sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
   },
 } as any;
 
@@ -927,12 +927,12 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       sectionType: 'utils',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/extraction' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -940,12 +940,12 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       sectionType: 'collection',
       visibility: {
         main: 'HIDDEN',
-        other: 'HIDDEN'
+        other: 'HIDDEN',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/collection' },
-        config: ''
+        config: '',
       },
     },
     {
@@ -955,7 +955,7 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpageone' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone' },
       },
     },
     {
@@ -965,7 +965,7 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/traditionalpagetwo' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo' },
       },
     },
     {
@@ -975,7 +975,7 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/upload' },
-        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+        config: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
       },
     },
     {
@@ -984,21 +984,21 @@ export const mockSubmissionDefinition: SubmissionDefinitionsModel = {
       sectionType: 'license',
       visibility: {
         main: null,
-        other: 'READONLY'
+        other: 'READONLY',
       },
       type: 'submissionsection',
       _links: {
         self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionsections/license' },
-        config: ''
+        config: '',
       },
-    }
+    },
   ]),
   name: 'traditional',
   type: 'submissiondefinition',
   _links: {
     collections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/collections' },
     sections: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional/sections' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissiondefinitions/traditional' },
   },
 } as any;
 
@@ -1015,7 +1015,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         sectionType: 'utils',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
@@ -1023,7 +1023,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'collection': {
         config: '',
@@ -1031,7 +1031,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         sectionType: 'collection',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
@@ -1039,7 +1039,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'traditionalpageone': {
         header: 'submit.progressbar.describe.stepone',
@@ -1053,7 +1053,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         formId: '2_traditionalpageone',
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'traditionalpagetwo': {
         header: 'submit.progressbar.describe.steptwo',
@@ -1066,7 +1066,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'detect-duplicate': {
         header: 'submit.progressbar.detect-duplicate',
@@ -1076,12 +1076,12 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {
-          matches: {}
+          matches: {},
         },
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'upload': {
         header: 'submit.progressbar.upload',
@@ -1091,12 +1091,12 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         collapsed: false,
         enabled: true,
         data: {
-          files: []
+          files: [],
         },
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
+        removePending: false,
       } as any,
       'license': {
         header: 'submit.progressbar.license',
@@ -1105,7 +1105,7 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         sectionType: 'license',
         visibility: {
           main: null,
-          other: 'READONLY'
+          other: 'READONLY',
         },
         collapsed: false,
         enabled: true,
@@ -1113,13 +1113,16 @@ export const mockSubmissionState: SubmissionObjectState = Object.assign({}, {
         errorsToShow: [],
         isLoading: false,
         isValid: false,
-        removePending: false
-      } as any
+        removePending: false,
+      } as any,
+      'duplicates': {
+        potentialDuplicates: [],
+      } as any,
     },
     isLoading: false,
     savePending: false,
-    depositPending: false
-  }
+    depositPending: false,
+  },
 });
 
 export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.assign({}, {
@@ -1135,14 +1138,14 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         sectionType: 'utils',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       collection: {
         config: '',
@@ -1150,14 +1153,14 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         sectionType: 'collection',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpageone: {
         header: 'submit.progressbar.describe.stepone',
@@ -1170,7 +1173,7 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         errorsToShow: [],
         formId: '2_traditionalpageone',
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpagetwo: {
         header: 'submit.progressbar.describe.steptwo',
@@ -1182,7 +1185,7 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       upload: {
         header: 'submit.progressbar.upload',
@@ -1192,11 +1195,11 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         collapsed: false,
         enabled: true,
         data: {
-          files: []
+          files: [],
         },
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       license: {
         header: 'submit.progressbar.license',
@@ -1205,20 +1208,20 @@ export const mockSubmissionStateWithDuplicate: SubmissionObjectState = Object.as
         sectionType: 'license',
         visibility: {
           main: null,
-          other: 'READONLY'
+          other: 'READONLY',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
-      } as any
+        isValid: false,
+      } as any,
     },
     isLoading: false,
     savePending: false,
-    depositPending: false
-  }
+    depositPending: false,
+  },
 });
 
 export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.assign({}, {
@@ -1234,14 +1237,14 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         sectionType: 'utils',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       collection: {
         config: '',
@@ -1249,14 +1252,14 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         sectionType: 'collection',
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpageone: {
         header: 'submit.progressbar.describe.stepone',
@@ -1269,7 +1272,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         errorsToShow: [],
         formId: '2_traditionalpageone',
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       traditionalpagetwo: {
         header: 'submit.progressbar.describe.steptwo',
@@ -1281,7 +1284,7 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       } as any,
       license: {
         header: 'submit.progressbar.license',
@@ -1290,20 +1293,20 @@ export const mockSubmissionStateWithoutUpload: SubmissionObjectState = Object.as
         sectionType: 'license',
         visibility: {
           main: null,
-          other: 'READONLY'
+          other: 'READONLY',
         },
         collapsed: false,
         enabled: true,
         data: {},
         errorsToShow: [],
         isLoading: false,
-        isValid: false
-      } as any
+        isValid: false,
+      } as any,
     },
     isLoading: false,
     savePending: false,
-    depositPending: false
-  }
+    depositPending: false,
+  },
 });
 
 export const mockSectionsState = Object.assign({}, {
@@ -1313,14 +1316,14 @@ export const mockSectionsState = Object.assign({}, {
     sectionType: 'utils',
     visibility: {
       main: 'HIDDEN',
-      other: 'HIDDEN'
+      other: 'HIDDEN',
     },
     collapsed: false,
     enabled: true,
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   collection: {
     config: '',
@@ -1328,14 +1331,14 @@ export const mockSectionsState = Object.assign({}, {
     sectionType: 'collection',
     visibility: {
       main: 'HIDDEN',
-      other: 'HIDDEN'
+      other: 'HIDDEN',
     },
     collapsed: false,
     enabled: true,
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   traditionalpageone: {
     header: 'submit.progressbar.describe.stepone',
@@ -1347,7 +1350,7 @@ export const mockSectionsState = Object.assign({}, {
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   traditionalpagetwo: {
     header: 'submit.progressbar.describe.steptwo',
@@ -1359,7 +1362,7 @@ export const mockSectionsState = Object.assign({}, {
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   upload: {
     header: 'submit.progressbar.upload',
@@ -1371,7 +1374,7 @@ export const mockSectionsState = Object.assign({}, {
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
+    isValid: false,
   } as any,
   license: {
     header: 'submit.progressbar.license',
@@ -1380,15 +1383,15 @@ export const mockSectionsState = Object.assign({}, {
     sectionType: 'license',
     visibility: {
       main: null,
-      other: 'READONLY'
+      other: 'READONLY',
     },
     collapsed: false,
     enabled: true,
     data: {},
     errorsToShow: [],
     isLoading: false,
-    isValid: false
-  } as any
+    isValid: false,
+  } as any,
 });
 
 export const mockSectionsList = [
@@ -1399,7 +1402,7 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.describe.stepone',
     id: 'traditionalpageone',
-    sectionType: 'submission-form'
+    sectionType: 'submission-form',
   },
   {
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpagetwo',
@@ -1408,7 +1411,7 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.describe.steptwo',
     id: 'traditionalpagetwo',
-    sectionType: 'submission-form'
+    sectionType: 'submission-form',
   },
   {
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload',
@@ -1417,7 +1420,7 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.upload',
     id: 'upload',
-    sectionType: 'upload'
+    sectionType: 'upload',
   },
   {
     config: '',
@@ -1426,8 +1429,8 @@ export const mockSectionsList = [
     errors: [],
     header: 'submit.progressbar.license',
     id: 'license',
-    sectionType: 'license'
-  }
+    sectionType: 'license',
+  },
 ];
 
 export const mockUploadConfigResponseMetadata = {
@@ -1436,7 +1439,7 @@ export const mockUploadConfigResponseMetadata = {
       fields: [
         {
           input: {
-            type: 'onebox'
+            type: 'onebox',
           },
           label: 'Title',
           mandatory: true,
@@ -1448,18 +1451,18 @@ export const mockUploadConfigResponseMetadata = {
               metadata: 'dc.title',
               label: null,
               controlledVocabulary: null,
-              closed: null
-            }
+              closed: null,
+            },
           ],
-          languageCodes: []
-        }
-      ]
+          languageCodes: [],
+        },
+      ],
     },
     {
       fields: [
         {
           input: {
-            type: 'textarea'
+            type: 'textarea',
           },
           label: 'Description',
           mandatory: false,
@@ -1470,18 +1473,18 @@ export const mockUploadConfigResponseMetadata = {
               metadata: 'dc.description',
               label: null,
               controlledVocabulary: null,
-              closed: null
-            }
+              closed: null,
+            },
           ],
-          languageCodes: []
-        }
-      ]
-    }
+          languageCodes: [],
+        },
+      ],
+    },
   ],
   name: 'bitstream-metadata',
   type: 'submissionform',
   _links: {
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/bitstream-metadata' },
   },
 };
 
@@ -1490,25 +1493,25 @@ export const mockUploadConfigResponse = {
     {
       name: 'openaccess',
       hasStartDate: false,
-      hasEndDate: false
+      hasEndDate: false,
     },
     {
       name: 'lease',
       hasStartDate: false,
       hasEndDate: true,
-      maxEndDate: '2019-07-12T14:40:06.308+0000'
+      maxEndDate: '2019-07-12T14:40:06.308+0000',
     },
     {
       name: 'embargo',
       hasStartDate: true,
       hasEndDate: false,
-      maxStartDate: '2022-01-12T14:40:06.308+0000'
+      maxStartDate: '2022-01-12T14:40:06.308+0000',
     },
     {
       name: 'administrator',
       hasStartDate: false,
-      hasEndDate: false
-    }
+      hasEndDate: false,
+    },
   ],
   metadata: createSuccessfulRemoteDataObject$(mockUploadConfigResponseMetadata),
   required: true,
@@ -1517,7 +1520,7 @@ export const mockUploadConfigResponse = {
   type: 'submissionupload',
   _links: {
     metadata: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload/metadata' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/config/submissionuploads/upload' },
   },
 };
 
@@ -1534,17 +1537,17 @@ export const mockGroup = Object.assign(new Group(), {
   metadata: [],
   _links: {
     groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/groups/123456-g1/groups' },
-    self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/groups/123456-g1' }
+    self: { href: 'https://rest.api/dspace-spring-rest/api/eperson/groups/123456-g1' },
   },
   groups: {
     pageInfo: {
       elementsPerPage: 0,
       totalElements: 0,
       totalPages: 1,
-      currentPage: 1
+      currentPage: 1,
     },
-    page: []
-  }
+    page: [],
+  },
 });
 
 export const mockUploadFiles = [
@@ -1559,8 +1562,8 @@ export const mockUploadFiles = [
           display: '123456-test-upload.jpg',
           confidence: -1,
           place: 0,
-          otherInformation: null
-        }
+          otherInformation: null,
+        },
       ],
       'dc.title': [
         {
@@ -1570,9 +1573,9 @@ export const mockUploadFiles = [
           display: '123456-test-upload.jpg',
           confidence: -1,
           place: 0,
-          otherInformation: null
-        }
-      ]
+          otherInformation: null,
+        },
+      ],
     },
     accessConditions: [
       {
@@ -1582,7 +1585,7 @@ export const mockUploadFiles = [
         groupUUID: '123456-g',
         action: 'READ',
         endDate: '2019-01-16',
-        type: 'resourcePolicy'
+        type: 'resourcePolicy',
       },
       {
         id: 3676,
@@ -1590,8 +1593,8 @@ export const mockUploadFiles = [
         rpType: 'TYPE_CUSTOM',
         groupUUID: '123456-g',
         action: 'READ',
-        type: 'resourcePolicy'
-      }
+        type: 'resourcePolicy',
+      },
     ],
     format: {
       id: 16,
@@ -1601,18 +1604,24 @@ export const mockUploadFiles = [
       supportLevel: 0,
       internal: false,
       extensions: null,
-      type: 'bitstreamformat'
+      type: 'bitstreamformat',
     },
     sizeBytes: 202999,
     checkSum: {
       checkSumAlgorithm: 'MD5',
-      value: '5e0996996863d2623439cbb53052bc72'
+      value: '5e0996996863d2623439cbb53052bc72',
     },
-    url: 'https://test-ui.com/api/core/bitstreams/123456-test-upload/content'
-  }
+    url: 'https://test-ui.com/api/core/bitstreams/123456-test-upload/content',
+  },
 ];
 
+export const mockUploadFilesData = {
+  primary: null,
+  files: JSON.parse(JSON.stringify(mockUploadFiles)),
+};
+
 export const mockFileFormData = {
+  primary: [true],
   metadata: {
     'dc.title': [
       {
@@ -1622,8 +1631,8 @@ export const mockFileFormData = {
         display: 'title',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
+        otherInformation: null,
+      },
     ],
     'dc.description': [
       {
@@ -1633,9 +1642,9 @@ export const mockFileFormData = {
         display: 'description',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
-    ]
+        otherInformation: null,
+      },
+    ],
   },
   accessConditions: [
     {
@@ -1648,8 +1657,8 @@ export const mockFileFormData = {
             display: 'openaccess',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
       },
     },
@@ -1663,29 +1672,25 @@ export const mockFileFormData = {
             display: 'lease',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         endDate: [
           {
-            value: {
-              year: 2019,
-              month: 1,
-              day: 16
-            },
+            value: new Date('2019-01-16'),
             language: null,
             authority: null,
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
+      },
     },
     {
       accessConditionGroup: {
@@ -1694,34 +1699,30 @@ export const mockFileFormData = {
             value: 'embargo',
             language: null,
             authority: null,
-            display: 'lease',
+            display: 'embargo',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         startDate: [
           {
-            value: {
-              year: 2019,
-              month: 1,
-              day: 16
-            },
+            value: new Date('2019-01-16'),
             language: null,
             authority: null,
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
-    }
-  ]
+      },
+    },
+  ],
 };
 
 
@@ -1738,8 +1739,8 @@ export const mockAccessesFormData = {
             display: 'openaccess',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
       },
     },
@@ -1753,29 +1754,29 @@ export const mockAccessesFormData = {
             display: 'lease',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         endDate: [
           {
             value: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             language: null,
             authority: null,
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
+      },
     },
     {
       accessConditionGroup: {
@@ -1787,30 +1788,30 @@ export const mockAccessesFormData = {
             display: 'lease',
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
         startDate: [
           {
             value: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             language: null,
             authority: null,
             display: {
               year: 2019,
               month: 1,
-              day: 16
+              day: 16,
             },
             confidence: -1,
             place: 0,
-            otherInformation: null
-          }
+            otherInformation: null,
+          },
         ],
-      }
-    }
-  ]
+      },
+    },
+  ],
 };
 
diff --git a/src/app/shared/mocks/suggestion.mock.ts b/src/app/shared/mocks/suggestion.mock.ts
new file mode 100644
index 0000000000..90226841ef
--- /dev/null
+++ b/src/app/shared/mocks/suggestion.mock.ts
@@ -0,0 +1,1361 @@
+import { of as observableOf } from 'rxjs';
+
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { SearchResult } from '../search/models/search-result.model';
+
+// REST Mock ---------------------------------------------------------------------
+// -------------------------------------------------------------------------------
+
+// Items
+// -------------------------------------------------------------------------------
+
+const ItemMockPid1: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174001',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174001',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Index nominum et rerum',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid2: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174004',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174004',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'UNA NUOVA RILETTURA DELL\u0027 ARISTOTELE DI FRANZ BRENTANO ALLA LUCE DI ALCUNI INEDITI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid3: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174005',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174005',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Sustainable development',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid4: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174006',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174006',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Reply to Critics',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid5: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174007',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174007',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'PROGETTAZIONE, SINTESI E VALUTAZIONE DELL\u0027ATTIVITA\u0027 ANTIMICOBATTERICA ED ANTIFUNGINA DI NUOVI DERIVATI ETEROCICLICI',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid6: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174008',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174008',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Donald Davidson',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+const ItemMockPid7: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174009',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174009',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Missing abstract article',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid8: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174002',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Egypt, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid9: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10077/21486',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'ITEM4567-e89b-12d3-a456-426614174003',
+    uuid: 'ITEM4567-e89b-12d3-a456-426614174003',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Morocco, crossroad of translations and literary interweavings (3rd-6th centuries). A reconsideration of earlier Coptic literature',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const ItemMockPid10: Item = Object.assign(
+  new Item(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+export const OpenaireMockDspaceObject: SearchResult<DSpaceObject> = Object.assign(
+  new SearchResult<DSpaceObject>(),
+  {
+    handle: '10713/29832',
+    lastModified: '2017-04-24T19:44:08.178+0000',
+    isArchived: true,
+    isDiscoverable: true,
+    isWithdrawn: false,
+    _links:{
+      self: {
+        href: 'https://rest.api/rest/api/core/items/0ec7ff22-f211-40ab-a69e-c819b0b1f357',
+      },
+    },
+    id: 'P23e4567-e89b-12d3-a456-426614174002',
+    uuid: 'P23e4567-e89b-12d3-a456-426614174002',
+    type: 'item',
+    metadata: {
+      'dc.creator': [
+        {
+          language: 'en_US',
+          value: 'Doe, Jane',
+        },
+      ],
+      'dc.date.accessioned': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.available': [
+        {
+          language: null,
+          value: '1650-06-26T19:58:25Z',
+        },
+      ],
+      'dc.date.issued': [
+        {
+          language: null,
+          value: '1650-06-26',
+        },
+      ],
+      'dc.identifier.issn': [
+        {
+          language: 'en_US',
+          value: '123456789',
+        },
+      ],
+      'dc.identifier.uri': [
+        {
+          language: null,
+          value: 'http://dspace7.4science.it/xmlui/handle/10673/6',
+        },
+      ],
+      'dc.description.abstract': [
+        {
+          language: 'en_US',
+          value: 'This is really just a sample abstract. If it was a real abstract it would contain useful information about this test document. Sorry though, nothing useful in this paragraph. You probably shouldn\'t have even bothered to read it!',
+        },
+      ],
+      'dc.description.provenance': [
+        {
+          language: 'en',
+          value: 'Made available in DSpace on 2012-06-26T19:58:25Z (GMT). No. of bitstreams: 2\r\ntest_ppt.ppt: 12707328 bytes, checksum: a353fc7d29b3c558c986f7463a41efd3 (MD5)\r\ntest_ppt.pptx: 12468572 bytes, checksum: 599305edb4ebee329667f2c35b14d1d6 (MD5)',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T09:17:34Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2013-06-13T11:04:16Z (GMT).',
+        },
+        {
+          language: 'en',
+          value: 'Restored into DSpace on 2017-04-24T19:44:08Z (GMT).',
+        },
+      ],
+      'dc.language': [
+        {
+          language: 'en_US',
+          value: 'en',
+        },
+      ],
+      'dc.rights': [
+        {
+          language: 'en_US',
+          value: '© Jane Doe',
+        },
+      ],
+      'dc.subject': [
+        {
+          language: 'en_US',
+          value: 'keyword1',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword2',
+        },
+        {
+          language: 'en_US',
+          value: 'keyword3',
+        },
+      ],
+      'dc.title': [
+        {
+          language: 'en_US',
+          value: 'Tracking Papyrus and Parchment Paths: An Archaeological Atlas of Coptic Literature.\nLiterary Texts in their Geographical Context: Production, Copying, Usage, Dissemination and Storage',
+        },
+      ],
+      'dc.type': [
+        {
+          language: 'en_US',
+          value: 'text',
+        },
+      ],
+    },
+  },
+);
+
+// Classes
+// -------------------------------------------------------------------------------
+
+/**
+ * Mock for [[SuggestionNotificationsStateService]]
+ */
+export function getMockSuggestionNotificationsStateService(): any {
+  return jasmine.createSpyObj('SuggestionNotificationsStateService', {
+    getOpenaireBrokerTopics: jasmine.createSpy('getOpenaireBrokerTopics'),
+    isOpenaireBrokerTopicsLoading: jasmine.createSpy('isOpenaireBrokerTopicsLoading'),
+    isOpenaireBrokerTopicsLoaded: jasmine.createSpy('isOpenaireBrokerTopicsLoaded'),
+    isOpenaireBrokerTopicsProcessing: jasmine.createSpy('isOpenaireBrokerTopicsProcessing'),
+    getOpenaireBrokerTopicsTotalPages: jasmine.createSpy('getOpenaireBrokerTopicsTotalPages'),
+    getOpenaireBrokerTopicsCurrentPage: jasmine.createSpy('getOpenaireBrokerTopicsCurrentPage'),
+    getOpenaireBrokerTopicsTotals: jasmine.createSpy('getOpenaireBrokerTopicsTotals'),
+    dispatchRetrieveOpenaireBrokerTopics: jasmine.createSpy('dispatchRetrieveOpenaireBrokerTopics'),
+    dispatchMarkUserSuggestionsAsVisitedAction: jasmine.createSpy('dispatchMarkUserSuggestionsAsVisitedAction'),
+    dispatchRefreshUserSuggestionsAction: undefined,
+  });
+}
+/**
+ * Mock for [[OpenaireBrokerEventRestService]]
+ */
+export function getMockSuggestionsService(): any {
+  return jasmine.createSpyObj('SuggestionsService', {
+    getTargets: jasmine.createSpy('getTargets'),
+    getSuggestions: observableOf([]),
+    clearSuggestionRequests: jasmine.createSpy('clearSuggestionRequests'),
+    deleteReviewedSuggestion: jasmine.createSpy('deleteReviewedSuggestion'),
+    retrieveCurrentUserSuggestions: jasmine.createSpy('retrieveCurrentUserSuggestions'),
+    getTargetUuid: jasmine.createSpy('getTargetUuid'),
+    ignoreSuggestion: observableOf(null),
+    ignoreSuggestionMultiple: observableOf({ success: 1, fails: 0 }),
+    approveAndImportMultiple: observableOf({ success: 1, fails: 0 }),
+    approveAndImport: observableOf({ id: '1234' }),
+    isCollectionFixed: false,
+    translateSuggestionSource: 'testSource',
+    translateSuggestionType: 'testType',
+  });
+}
diff --git a/src/app/shared/mocks/theme-service.mock.ts b/src/app/shared/mocks/theme-service.mock.ts
index e3c2960e51..44d889c025 100644
--- a/src/app/shared/mocks/theme-service.mock.ts
+++ b/src/app/shared/mocks/theme-service.mock.ts
@@ -1,7 +1,8 @@
-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';
+import { ThemeService } from '../theme-support/theme.service';
 
 export function getMockThemeService(themeName = 'base', themes?: ThemeConfig[]): ThemeService {
   const spy = jasmine.createSpyObj('themeService', {
diff --git a/src/app/shared/mocks/translate-loader.mock.ts b/src/app/shared/mocks/translate-loader.mock.ts
index 3251de9ea1..ea1ee7528e 100644
--- a/src/app/shared/mocks/translate-loader.mock.ts
+++ b/src/app/shared/mocks/translate-loader.mock.ts
@@ -1,5 +1,8 @@
-import {of as observableOf,  Observable } from 'rxjs';
 import { TranslateLoader } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 export class TranslateLoaderMock implements TranslateLoader {
   getTranslation(lang: string): Observable<any> {
diff --git a/src/app/shared/mocks/translate.service.mock.ts b/src/app/shared/mocks/translate.service.mock.ts
index 38b088e50f..ecb87007e2 100644
--- a/src/app/shared/mocks/translate.service.mock.ts
+++ b/src/app/shared/mocks/translate.service.mock.ts
@@ -5,6 +5,6 @@ export function getMockTranslateService(): TranslateService {
     get: jasmine.createSpy('get'),
     use: jasmine.createSpy('use'),
     instant: jasmine.createSpy('instant'),
-    setDefaultLang: jasmine.createSpy('setDefaultLang')
+    setDefaultLang: jasmine.createSpy('setDefaultLang'),
   });
 }
diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts
new file mode 100644
index 0000000000..086cd9d81a
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/abstract/advanced-claimed-task-actions-abstract.component.ts
@@ -0,0 +1,96 @@
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  NavigationExtras,
+  Params,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { getAdvancedWorkflowRoute } from '../../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedTaskActionsAbstractComponent } from './claimed-task-actions-abstract.component';
+
+/**
+ * Abstract component for rendering an advanced claimed task's action
+ * To create a child-component for a new option:
+ * - Set the "{@link option}" and "{@link workflowType}" of the component
+ * - Add a @{@link rendersWorkflowTaskOption} annotation to your component providing the same enum value
+ */
+@Component({
+  selector: 'ds-advanced-claimed-task-action-abstract',
+  template: '',
+})
+export abstract class AdvancedClaimedTaskActionsAbstractComponent extends ClaimedTaskActionsAbstractComponent implements OnInit {
+
+  /**
+   * The {@link WorkflowAction} id of the advanced workflow that needs to be opened.
+   */
+  abstract workflowType: string;
+
+  /**
+   * Route to the workflow's task page
+   */
+  workflowTaskPageRoute: string;
+
+  constructor(
+    protected injector: Injector,
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService,
+    protected route: ActivatedRoute,
+  ) {
+    super(injector, router, notificationsService, translate, searchService, requestService);
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.initPageRoute();
+  }
+
+  /**
+   * Initialise the route to the advanced workflow page
+   */
+  initPageRoute() {
+    this.subs.push(this.object.workflowitem.pipe(
+      getFirstSucceededRemoteDataPayload(),
+    ).subscribe((workflowItem: WorkflowItem) => {
+      this.workflowTaskPageRoute = getAdvancedWorkflowRoute(workflowItem.id);
+    }));
+  }
+
+  /**
+   * Navigates to the advanced workflow page based on the {@link workflow}.
+   */
+  openAdvancedClaimedTaskTab(): void {
+    const navigationExtras: NavigationExtras = {
+      queryParams: this.getQueryParams(),
+    };
+    if (Object.keys(this.route.snapshot.queryParams).length > 0) {
+      navigationExtras.state = {};
+      navigationExtras.state.previousQueryParams = this.route.snapshot.queryParams;
+    }
+    void this.router.navigate([this.workflowTaskPageRoute], navigationExtras);
+  }
+
+  /**
+   * The {@link Params} that need to be given to the workflow page.
+   */
+  getQueryParams(): Params {
+    return {
+      workflow: this.workflowType,
+      claimedTask: this.object.id,
+    };
+  }
+
+}
diff --git a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
index 1ff55cefd6..2af6713885 100644
--- a/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/abstract/claimed-task-actions-abstract.component.ts
@@ -1,20 +1,25 @@
-import { Component, Injector, OnDestroy } from '@angular/core';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import {
+  Component,
+  Injector,
+  OnDestroy,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { take } from 'rxjs/operators';
-import { CLAIMED_TASK } from '../../../../core/tasks/models/claimed-task-object.resource-type';
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { Item } from '../../../../core/shared/item.model';
-import { MyDSpaceReloadableActionsComponent } from '../../mydspace-reloadable-actions';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { CLAIMED_TASK } from '../../../../core/tasks/models/claimed-task-object.resource-type';
 import { isEmpty } from '../../../empty.util';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { MyDSpaceReloadableActionsComponent } from '../../mydspace-reloadable-actions';
 
 /**
  * Abstract component for rendering a claimed task's action
@@ -25,7 +30,7 @@ import { isEmpty } from '../../../empty.util';
  */
 @Component({
   selector: 'ds-claimed-task-action-abstract',
-  template: ''
+  template: '',
 })
 export abstract class ClaimedTaskActionsAbstractComponent extends MyDSpaceReloadableActionsComponent<ClaimedTask, ClaimedTaskDataService> implements OnDestroy {
 
@@ -75,7 +80,7 @@ export abstract class ClaimedTaskActionsAbstractComponent extends MyDSpaceReload
    */
   createbody(): any {
     return {
-      [this.option]: 'true'
+      [this.option]: 'true',
     };
   }
 
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..9e364ac808 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
@@ -4,5 +4,5 @@
         [disabled]="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>
+  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-thumbs-up"></i> {{'submission.workflow.tasks.claimed.approve' | translate}}</span>
 </button>
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 ce67da1349..0d1463d44b 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
@@ -1,23 +1,37 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { async, ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+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 { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 
-import { ClaimedTaskActionsApproveComponent } from './claimed-task-actions-approve.component';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-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 { ClaimedTaskActionsApproveComponent } from './claimed-task-actions-approve.component';
 
 let component: ClaimedTaskActionsApproveComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsApproveComponent>;
@@ -31,7 +45,7 @@ let mockPoolTaskDataService: PoolTaskDataService;
 describe('ClaimedTaskActionsApproveComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
   const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
-    submitTask: observableOf(new ProcessTaskResponse(true))
+    submitTask: observableOf(new ProcessTaskResponse(true)),
   });
 
   beforeEach(waitForAsync(() => {
@@ -55,9 +69,9 @@ describe('ClaimedTaskActionsApproveComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsApproveComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsApproveComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -72,7 +86,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
   it('should display approve button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-success'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should display spin icon when approve is pending', () => {
@@ -81,7 +95,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
 
     const span = fixture.debugElement.query(By.css('.btn-success .fa-spin'));
 
-    expect(span).toBeDefined();
+    expect(span).not.toBeNull();
   });
 
   describe('submitTask', () => {
@@ -92,7 +106,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
       spyOn(component, 'startActionExecution').and.returnValue(of(null));
 
       expectedBody = {
-        [component.option]: 'true'
+        [component.option]: 'true',
       };
 
       component.submitTask();
@@ -109,7 +123,7 @@ describe('ClaimedTaskActionsApproveComponent', () => {
     it('should call claimedTaskService\'s submitTask', (done) => {
 
       const expectedBody = {
-        [component.option]: 'true'
+        [component.option]: 'true',
       };
 
       component.actionExecution().subscribe(() => {
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..809754ed7e 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
@@ -1,15 +1,22 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedApprovedTaskSearchResult } from '../../../object-collection/shared/claimed-approved-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Observable, of } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-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';
 
 export const WORKFLOW_TASK_OPTION_APPROVE = 'submit_approve';
 
@@ -43,7 +50,7 @@ export class ClaimedTaskActionsApproveComponent extends ClaimedTaskActionsAbstra
 
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     const reloadedObject = Object.assign(new ClaimedApprovedTaskSearchResult(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
     return reloadedObject;
   }
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index 34932f47bf..50e3b46dfe 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -12,12 +12,5 @@
       [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
       <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
     </button>
-
-    <ds-claimed-task-actions-loader [item]="item"
-                                    [option]="returnToPoolOption"
-                                    [object]="object"
-                                    [workflowitem]="workflowitem"
-                                    (processCompleted)="this.processCompleted.emit($event)">
-    </ds-claimed-task-actions-loader>
   </div>
 </ng-container>
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
index a2e0b14134..2d1453da71 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.spec.ts
@@ -1,28 +1,41 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { Router } from '@angular/router';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
-import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
 import { VarDirective } from '../../utils/var.directive';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { By } from '@angular/platform-browser';
+import { ClaimedTaskActionsComponent } from './claimed-task-actions.component';
 
 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -57,28 +70,28 @@ function init() {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
   rdItem = createSuccessfulRemoteDataObject(item);
   workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem), id: '333' });
@@ -87,7 +100,7 @@ function init() {
   workflowAction = Object.assign(new WorkflowAction(), { id: 'action-1', options: ['option-1', 'option-2'] });
 
   workflowActionService = jasmine.createSpyObj('workflowActionService', {
-    findById: createSuccessfulRemoteDataObject$(workflowAction)
+    findById: createSuccessfulRemoteDataObject$(workflowAction),
   });
 }
 
@@ -99,9 +112,9 @@ describe('ClaimedTaskActionsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ClaimedTaskActionsComponent, VarDirective],
       providers: [
@@ -111,11 +124,11 @@ describe('ClaimedTaskActionsComponent', () => {
         { provide: ClaimedTaskDataService, useValue: mockDataService },
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestServce },
-        { provide: WorkflowActionDataService, useValue: workflowActionService }
+        { provide: WorkflowActionDataService, useValue: workflowActionService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
index dc57105a4e..c1705b44fc 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.ts
@@ -1,22 +1,25 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable } from 'rxjs';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
 
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
 import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
-import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
-import { WORKFLOW_TASK_OPTION_RETURN_TO_POOL } from './return-to-pool/claimed-task-actions-return-to-pool.component';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
-import { Item } from '../../../core/shared/item.model';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents actions related to ClaimedTask object.
@@ -48,12 +51,6 @@ export class ClaimedTaskActionsComponent extends MyDSpaceActionsComponent<Claime
    */
   public actionRD$: Observable<RemoteData<WorkflowAction>>;
 
-  /**
-   * The option used to render the "return to pool" component
-   * Every claimed task contains this option
-   */
-  public returnToPoolOption = WORKFLOW_TASK_OPTION_RETURN_TO_POOL;
-
   /**
    * Initialize instance variables
    *
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
new file mode 100644
index 0000000000..2b95b02df4
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.html
@@ -0,0 +1,12 @@
+<button (click)="submitTask()"
+        [disabled]="processing$ | async"
+        class="declineTaskAction btn btn-warning"
+        ngbTooltip="{{'submission.workflow.tasks.claimed.decline_help' | translate}}"
+        type="button">
+  <span *ngIf="processing$ | async">
+    <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
+  </span>
+  <span *ngIf="(processing$ | async) !== true">
+    <i class="fa fa-ban"></i> {{'submission.workflow.tasks.claimed.decline' | translate}}
+  </span>
+</button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.scss b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts
new file mode 100644
index 0000000000..05500da7f4
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.spec.ts
@@ -0,0 +1,102 @@
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { ClaimedTaskActionsDeclineTaskComponent } from './claimed-task-actions-decline-task.component';
+
+let component: ClaimedTaskActionsDeclineTaskComponent;
+let fixture: ComponentFixture<ClaimedTaskActionsDeclineTaskComponent>;
+
+const searchService = getMockSearchService();
+
+const requestService = getMockRequestService();
+
+let mockPoolTaskDataService: PoolTaskDataService;
+
+describe('ClaimedTaskActionsDeclineTaskComponent', () => {
+  const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
+
+  let claimedTaskService: ClaimedTaskDataServiceStub;
+
+  beforeEach(waitForAsync(() => {
+    claimedTaskService = new ClaimedTaskDataServiceStub();
+
+    mockPoolTaskDataService = new PoolTaskDataService(null, null, null, null);
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      providers: [
+        { provide: ClaimedTaskDataService, useValue: claimedTaskService },
+        { provide: Injector, useValue: {} },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: SearchService, useValue: searchService },
+        { provide: RequestService, useValue: requestService },
+        { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
+      ],
+      declarations: [ClaimedTaskActionsDeclineTaskComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(ClaimedTaskActionsDeclineTaskComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ClaimedTaskActionsDeclineTaskComponent);
+    component = fixture.componentInstance;
+    component.object = object;
+    spyOn(component, 'initReloadAnchor').and.returnValue(undefined);
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
+  it('should display decline button', () => {
+    const btn = fixture.debugElement.query(By.css('.declineTaskAction'));
+
+    expect(btn).not.toBeNull();
+  });
+
+  it('should display spin icon when decline is pending', () => {
+    component.processing$.next(true);
+    fixture.detectChanges();
+
+    const span = fixture.debugElement.query(By.css('.declineTaskAction .fa-spin'));
+
+    expect(span).not.toBeNull();
+  });
+
+});
diff --git a/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
new file mode 100644
index 0000000000..c134647f15
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component.ts
@@ -0,0 +1,55 @@
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { RemoteData } from 'src/app/core/data/remote-data';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedDeclinedTaskTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-task-search-result.model';
+import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
+import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
+
+export const WORKFLOW_TASK_OPTION_DECLINE_TASK = 'submit_decline_task';
+
+@rendersWorkflowTaskOption(WORKFLOW_TASK_OPTION_DECLINE_TASK)
+@Component({
+  selector: 'ds-claimed-task-actions-decline-task',
+  templateUrl: './claimed-task-actions-decline-task.component.html',
+  styleUrls: ['./claimed-task-actions-decline-task.component.scss'],
+})
+/**
+ * Component for displaying and processing the decline task action on a workflow task item
+ */
+export class ClaimedTaskActionsDeclineTaskComponent extends ClaimedTaskActionsAbstractComponent {
+
+  option = WORKFLOW_TASK_OPTION_DECLINE_TASK;
+
+  constructor(protected injector: Injector,
+              protected router: Router,
+              protected notificationsService: NotificationsService,
+              protected translate: TranslateService,
+              protected searchService: SearchService,
+              protected requestService: RequestService) {
+    super(injector, router, notificationsService, translate, searchService, requestService);
+  }
+
+  reloadObjectExecution(): Observable<RemoteData<DSpaceObject> | DSpaceObject> {
+    return observableOf(this.object);
+  }
+
+  convertReloadedObject(dso: DSpaceObject): DSpaceObject {
+    return Object.assign(new ClaimedDeclinedTaskTaskSearchResult(), dso, {
+      indexableObject: dso,
+    });
+  }
+
+}
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
index 5bcddc9b11..680dc27502 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.spec.ts
@@ -1,21 +1,32 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task-actions-edit-metadata.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { TranslateLoaderMock } from '../../../testing/translate-loader.mock';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-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 { TranslateLoaderMock } from '../../../testing/translate-loader.mock';
+import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task-actions-edit-metadata.component';
 
 let component: ClaimedTaskActionsEditMetadataComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsEditMetadataComponent>;
@@ -49,9 +60,9 @@ describe('ClaimedTaskActionsEditMetadataComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsEditMetadataComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsEditMetadataComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -66,7 +77,7 @@ describe('ClaimedTaskActionsEditMetadataComponent', () => {
   it('should display edit button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-primary'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
 });
diff --git a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
index 7da189dddd..aab15afc58 100644
--- a/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component.ts
@@ -1,11 +1,15 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
 
 export const WORKFLOW_TASK_OPTION_EDIT_METADATA = 'submit_edit_metadata';
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html
new file mode 100644
index 0000000000..5b63aa381e
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html
@@ -0,0 +1,4 @@
+<button (click)="openAdvancedClaimedTaskTab()" class="ratingReviewerAction btn btn-primary"
+        ngbTooltip="{{ 'submission.workflow.generic.' + option + '-help' | translate }}">
+  <i class="fa fa-star-half-alt"></i> {{ 'submission.workflow.generic.' + option | translate}}
+</button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.scss b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts
new file mode 100644
index 0000000000..a768832b7e
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.spec.ts
@@ -0,0 +1,103 @@
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { ADVANCED_WORKFLOW_ACTION_RATING } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { AdvancedClaimedTaskActionRatingComponent } from './advanced-claimed-task-action-rating.component';
+
+const taskId = 'claimed-task-1';
+const workflowId = 'workflow-1';
+
+describe('AdvancedClaimedTaskActionRatingComponent', () => {
+  const object = Object.assign(new ClaimedTask(), {
+    id: taskId,
+    workflowitem: observableOf(Object.assign(new WorkflowItem(), {
+      id: workflowId,
+    })),
+  });
+  let component: AdvancedClaimedTaskActionRatingComponent;
+  let fixture: ComponentFixture<AdvancedClaimedTaskActionRatingComponent>;
+
+  let claimedTaskDataService: ClaimedTaskDataServiceStub;
+  let notificationService: NotificationsServiceStub;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
+  let searchService: SearchServiceStub;
+
+  beforeEach(async () => {
+    claimedTaskDataService = new ClaimedTaskDataServiceStub();
+    notificationService = new NotificationsServiceStub();
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
+    searchService = new SearchServiceStub();
+
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        AdvancedClaimedTaskActionRatingComponent,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: route },
+        { provide: ClaimedTaskDataService, useValue: claimedTaskDataService },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: RequestService, useValue: {} },
+        { provide: Router, useValue: router },
+        { provide: SearchService, useValue: searchService },
+        Location,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedClaimedTaskActionRatingComponent);
+    component = fixture.componentInstance;
+    component.object = object;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
+  it('should display select reviewer button', () => {
+    const btn = fixture.debugElement.query(By.css('.ratingReviewerAction'));
+
+    expect(btn).not.toBeNull();
+  });
+
+  it('should navigate to the advanced workflow page when clicked', () => {
+    component.workflowTaskPageRoute = `/workflowitems/${workflowId}/advanced`;
+    fixture.debugElement.query(By.css('.ratingReviewerAction')).nativeElement.click();
+
+    expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${workflowId}/advanced`], {
+      queryParams: {
+        workflow: ADVANCED_WORKFLOW_ACTION_RATING,
+        claimedTask: taskId,
+      },
+    });
+  });
+});
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts
new file mode 100644
index 0000000000..0da68e7347
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.ts
@@ -0,0 +1,51 @@
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import {
+  ADVANCED_WORKFLOW_ACTION_RATING,
+  ADVANCED_WORKFLOW_TASK_OPTION_RATING,
+} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component';
+import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
+
+/**
+ * Advanced Workflow button that redirect to the {@link AdvancedWorkflowActionRatingComponent}
+ */
+@rendersWorkflowTaskOption(ADVANCED_WORKFLOW_TASK_OPTION_RATING)
+@Component({
+  selector: 'ds-advanced-claimed-task-action-rating-reviewer',
+  templateUrl: './advanced-claimed-task-action-rating.component.html',
+  styleUrls: ['./advanced-claimed-task-action-rating.component.scss'],
+})
+export class AdvancedClaimedTaskActionRatingComponent extends AdvancedClaimedTaskActionsAbstractComponent {
+
+  /**
+   * This component represents the advanced select option
+   */
+  option = ADVANCED_WORKFLOW_TASK_OPTION_RATING;
+
+  workflowType = ADVANCED_WORKFLOW_ACTION_RATING;
+
+  constructor(
+    protected injector: Injector,
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService,
+    protected route: ActivatedRoute,
+  ) {
+    super(injector, router, notificationsService, translate, searchService, requestService, route);
+  }
+
+}
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..2f96c16f08 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
@@ -4,7 +4,7 @@
         [disabled]="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>
+  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.tasks.claimed.reject.submit' | translate}}</span>
 </button>
 
 <ng-template #rejectModal let-c="close" let-d="dismiss">
@@ -31,7 +31,7 @@
               [disabled]="!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>
+        <span *ngIf="(processing$ | async) !== true">{{'submission.workflow.tasks.claimed.reject.reason.submit' | translate}}</span>
       </button>
     </form>
   </div>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
index 2ccb671d83..2350b526d3 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.spec.ts
@@ -1,31 +1,48 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormBuilder,
+  UntypedFormGroup,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { ClaimedTaskActionsRejectComponent } from './claimed-task-actions-reject.component';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-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 { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
 import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { of } from 'rxjs';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { ClaimedTaskActionsRejectComponent } from './claimed-task-actions-reject.component';
 
 let component: ClaimedTaskActionsRejectComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsRejectComponent>;
-let formBuilder: FormBuilder;
+let formBuilder: UntypedFormBuilder;
 let modalService: NgbModal;
 
 const searchService = getMockSearchService();
@@ -35,7 +52,7 @@ const requestService = getMockRequestService();
 const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
 
 const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
-  submitTask: of(new ProcessTaskResponse(true))
+  submitTask: of(new ProcessTaskResponse(true)),
 });
 
 let mockPoolTaskDataService: PoolTaskDataService;
@@ -63,16 +80,16 @@ describe('ClaimedTaskActionsRejectComponent', () => {
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestService },
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
-        FormBuilder,
+        UntypedFormBuilder,
         NgbModal,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsRejectComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
     fixture = TestBed.createComponent(ClaimedTaskActionsRejectComponent);
     component = fixture.componentInstance;
-    formBuilder = TestBed.inject(FormBuilder);
+    formBuilder = TestBed.inject(UntypedFormBuilder);
     modalService = TestBed.inject(NgbModal);
     component.object = object;
     component.modalRef = modalService.open('ok');
@@ -82,14 +99,14 @@ describe('ClaimedTaskActionsRejectComponent', () => {
 
   it('should init reject form properly', () => {
     expect(component.rejectForm).toBeDefined();
-    expect(component.rejectForm instanceof FormGroup).toBeTruthy();
+    expect(component.rejectForm instanceof UntypedFormGroup).toBeTruthy();
     expect(component.rejectForm.controls.reason).toBeDefined();
   });
 
   it('should display reject button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-danger'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should display spin icon when reject is pending', () => {
@@ -98,7 +115,7 @@ describe('ClaimedTaskActionsRejectComponent', () => {
 
     const span = fixture.debugElement.query(By.css('.btn-danger .fa-spin'));
 
-    expect(span).toBeDefined();
+    expect(span).not.toBeNull();
   });
 
   it('should call openRejectModal on reject button click', () => {
@@ -122,7 +139,7 @@ describe('ClaimedTaskActionsRejectComponent', () => {
 
       expectedBody = {
         [component.option]: 'true',
-        reason: null
+        reason: null,
       };
 
       const btn = fixture.debugElement.query(By.css('.btn-danger'));
@@ -147,10 +164,10 @@ describe('ClaimedTaskActionsRejectComponent', () => {
     let expectedBody;
 
     beforeEach(() => {
-      spyOn((component.rejectForm as any), 'get').and.returnValue({value: 'required'});
+      spyOn((component.rejectForm as any), 'get').and.returnValue({ value: 'required' });
       expectedBody = {
         [component.option]: 'true',
-        reason: 'required'
+        reason: 'required',
       };
     });
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
index 31514613ce..b55d43c745 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.ts
@@ -1,18 +1,32 @@
-import { Component, Injector, OnInit } from '@angular/core';
-import { FormBuilder, FormGroup, Validators } from '@angular/forms';
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { Observable, of } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { ClaimedDeclinedTaskSearchResult } from '../../../object-collection/shared/claimed-declined-task-search-result.model';
 
 export const WORKFLOW_TASK_OPTION_REJECT = 'submit_reject';
 
@@ -34,7 +48,7 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac
   /**
    * The reject form group
    */
-  public rejectForm: FormGroup;
+  public rejectForm: UntypedFormGroup;
 
   /**
    * Reference to NgbModal
@@ -47,7 +61,7 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac
               protected translate: TranslateService,
               protected searchService: SearchService,
               protected requestService: RequestService,
-              private formBuilder: FormBuilder,
+              private formBuilder: UntypedFormBuilder,
               private modalService: NgbModal) {
     super(injector, router, notificationsService, translate, searchService, requestService);
   }
@@ -57,7 +71,7 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac
    */
   ngOnInit() {
     this.rejectForm = this.formBuilder.group({
-      reason: ['', Validators.required]
+      reason: ['', Validators.required],
     });
   }
 
@@ -94,7 +108,7 @@ export class ClaimedTaskActionsRejectComponent extends ClaimedTaskActionsAbstrac
 
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     const reloadedObject = Object.assign(new ClaimedDeclinedTaskSearchResult(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
     return reloadedObject;
   }
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..e10dec2e6e 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
@@ -4,5 +4,5 @@
         [disabled]="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>
+  <span *ngIf="(processing$ | async) !== true"><i class="fa fa-undo"></i> {{'submission.workflow.tasks.claimed.return' | translate}}</span>
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
index 46e89d9d3a..9ac6aba5d4 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.spec.ts
@@ -1,23 +1,35 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
 
-import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task-actions-return-to-pool.component';
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
 import { ProcessTaskResponse } from '../../../../core/tasks/models/process-task-response';
-import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-import { Router } from '@angular/router';
 import { RouterStub } from '../../../testing/router.stub';
-import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { of } from 'rxjs';
+import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task-actions-return-to-pool.component';
 
 let component: ClaimedTaskActionsReturnToPoolComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsReturnToPoolComponent>;
@@ -31,7 +43,7 @@ let mockPoolTaskDataService: PoolTaskDataService;
 describe('ClaimedTaskActionsReturnToPoolComponent', () => {
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
   const claimedTaskService = jasmine.createSpyObj('claimedTaskService', {
-    returnToPoolTask: of(new ProcessTaskResponse(true))
+    returnToPoolTask: of(new ProcessTaskResponse(true)),
   });
 
   beforeEach(waitForAsync(() => {
@@ -55,9 +67,9 @@ describe('ClaimedTaskActionsReturnToPoolComponent', () => {
         { provide: PoolTaskDataService, useValue: mockPoolTaskDataService },
       ],
       declarations: [ClaimedTaskActionsReturnToPoolComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskActionsReturnToPoolComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -72,7 +84,7 @@ describe('ClaimedTaskActionsReturnToPoolComponent', () => {
   it('should display return to pool button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-secondary'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should display spin icon when return to pool action is pending', () => {
@@ -81,7 +93,7 @@ describe('ClaimedTaskActionsReturnToPoolComponent', () => {
 
     const span = fixture.debugElement.query(By.css('.btn-secondary .fa-spin'));
 
-    expect(span).toBeDefined();
+    expect(span).not.toBeNull();
   });
 
   describe('actionExecution', () => {
diff --git a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
index 7949176968..7970772f2f 100644
--- a/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component.ts
@@ -1,16 +1,20 @@
-import { Component, Injector } from '@angular/core';
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { RemoteData } from '../../../../core/data/remote-data';
+import { RequestService } from '../../../../core/data/request.service';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
 import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
 import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
-import { Observable } from 'rxjs';
-import { Router } from '@angular/router';
-import { NotificationsService } from '../../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { RequestService } from '../../../../core/data/request.service';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
-import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { take } from 'rxjs/operators';
 
 export const WORKFLOW_TASK_OPTION_RETURN_TO_POOL = 'return_to_pool';
 
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html
new file mode 100644
index 0000000000..6a45e7e02c
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html
@@ -0,0 +1,4 @@
+<button (click)="openAdvancedClaimedTaskTab()" class="selectReviewerAction btn btn-primary"
+        ngbTooltip="{{ 'submission.workflow.generic.' + option + '-help' | translate }}">
+  <i class="fa fa-user"></i> {{ 'submission.workflow.generic.' + option | translate}}
+</button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.scss b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts
new file mode 100644
index 0000000000..d6b2a10b53
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.spec.ts
@@ -0,0 +1,105 @@
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbTooltip } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER } from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { ActivatedRouteStub } from '../../../testing/active-router.stub';
+import { ClaimedTaskDataServiceStub } from '../../../testing/claimed-task-data-service.stub';
+import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
+import { RouterStub } from '../../../testing/router.stub';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { AdvancedClaimedTaskActionSelectReviewerComponent } from './advanced-claimed-task-action-select-reviewer.component';
+
+const taskId = 'claimed-task-1';
+const workflowId = 'workflow-1';
+
+describe('AdvancedClaimedTaskActionSelectReviewerComponent', () => {
+  const object = Object.assign(new ClaimedTask(), {
+    id: taskId,
+    workflowitem: observableOf(Object.assign(new WorkflowItem(), {
+      id: workflowId,
+    })),
+  });
+  let component: AdvancedClaimedTaskActionSelectReviewerComponent;
+  let fixture: ComponentFixture<AdvancedClaimedTaskActionSelectReviewerComponent>;
+
+  let route: ActivatedRouteStub;
+  let claimedTaskDataService: ClaimedTaskDataServiceStub;
+  let notificationService: NotificationsServiceStub;
+  let router: RouterStub;
+  let searchService: SearchServiceStub;
+
+  beforeEach(async () => {
+    route = new ActivatedRouteStub();
+    claimedTaskDataService = new ClaimedTaskDataServiceStub();
+    notificationService = new NotificationsServiceStub();
+    router = new RouterStub();
+    searchService = new SearchServiceStub();
+
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        AdvancedClaimedTaskActionSelectReviewerComponent,
+        NgbTooltip,
+      ],
+      providers: [
+        { provide: ActivatedRoute, useValue: route },
+        { provide: ClaimedTaskDataService, useValue: claimedTaskDataService },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: RequestService, useValue: {} },
+        { provide: Router, useValue: router },
+        { provide: SearchService, useValue: searchService },
+        Location,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedClaimedTaskActionSelectReviewerComponent);
+    component = fixture.componentInstance;
+    component.object = object;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
+  it('should display select reviewer button', () => {
+    const btn = fixture.debugElement.query(By.css('.selectReviewerAction'));
+
+    expect(btn).not.toBeNull();
+  });
+
+  it('should navigate to the advanced workflow page when clicked', () => {
+    component.workflowTaskPageRoute = `/workflowitems/${workflowId}/advanced`;
+    fixture.debugElement.query(By.css('.selectReviewerAction')).nativeElement.click();
+
+    expect(router.navigate).toHaveBeenCalledWith([`/workflowitems/${workflowId}/advanced`], {
+      queryParams: {
+        workflow: ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER,
+        claimedTask: taskId,
+      },
+    });
+  });
+});
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts
new file mode 100644
index 0000000000..5081fc6ab4
--- /dev/null
+++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.ts
@@ -0,0 +1,51 @@
+import {
+  Component,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import {
+  ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER,
+  ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER,
+} from '../../../../workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { AdvancedClaimedTaskActionsAbstractComponent } from '../abstract/advanced-claimed-task-actions-abstract.component';
+import { rendersWorkflowTaskOption } from '../switcher/claimed-task-actions-decorator';
+
+/**
+ * Advanced Workflow button that redirect to the {@link AdvancedWorkflowActionSelectReviewerComponent}
+ */
+@rendersWorkflowTaskOption(ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER)
+@Component({
+  selector: 'ds-advanced-claimed-task-action-select-reviewer',
+  templateUrl: './advanced-claimed-task-action-select-reviewer.component.html',
+  styleUrls: ['./advanced-claimed-task-action-select-reviewer.component.scss'],
+})
+export class AdvancedClaimedTaskActionSelectReviewerComponent extends AdvancedClaimedTaskActionsAbstractComponent {
+
+  /**
+   * This component represents the advanced select option
+   */
+  option = ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER;
+
+  workflowType = ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER;
+
+  constructor(
+    protected injector: Injector,
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService,
+    protected searchService: SearchService,
+    protected requestService: RequestService,
+    protected route: ActivatedRoute,
+  ) {
+    super(injector, router, notificationsService, translate, searchService, requestService, route);
+  }
+
+}
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts
index 3630c7ea0c..99edf00824 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.spec.ts
@@ -1,5 +1,8 @@
-  /* eslint-disable max-classes-per-file */
-import { getComponentByWorkflowTaskOption, rendersWorkflowTaskOption } from './claimed-task-actions-decorator';
+/* eslint-disable max-classes-per-file */
+import {
+  getComponentByWorkflowTaskOption,
+  rendersWorkflowTaskOption,
+} from './claimed-task-actions-decorator';
 
 describe('ClaimedTaskActions decorator function', () => {
   const option1 = 'test_option_1';
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts
index a115c4e5b8..8e4dede9bb 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator.ts
@@ -1,23 +1,44 @@
 import { hasNoValue } from '../../../empty.util';
 
-const map = new Map();
+const workflowOptions = new Map();
+const advancedWorkflowOptions = new Map();
 
 /**
  * Decorator used for rendering ClaimedTaskActions pages by option type
  */
 export function rendersWorkflowTaskOption(option: string) {
   return function decorator(component: any) {
-    if (hasNoValue(map.get(option))) {
-      map.set(option, component);
+    if (hasNoValue(workflowOptions.get(option))) {
+      workflowOptions.set(option, component);
     } else {
       throw new Error(`There can't be more than one component to render ClaimedTaskActions for option "${option}"`);
     }
   };
 }
 
+/**
+ * Decorator used for rendering AdvancedClaimedTaskActions pages by option type
+ */
+export function rendersAdvancedWorkflowTaskOption(option: string) {
+  return function decorator(component: any) {
+    if (hasNoValue(advancedWorkflowOptions.get(option))) {
+      advancedWorkflowOptions.set(option, component);
+    } else {
+      throw new Error(`There can't be more than one component to render AdvancedClaimedTaskActions for option "${option}"`);
+    }
+  };
+}
+
 /**
  * Get the component used for rendering a ClaimedTaskActions page by option type
  */
 export function getComponentByWorkflowTaskOption(option: string) {
-  return map.get(option);
+  return workflowOptions.get(option);
+}
+
+/**
+ * Get the component used for rendering a AdvancedClaimedTaskActions page by option type
+ */
+export function getAdvancedComponentByWorkflowTaskOption(option: string) {
+  return advancedWorkflowOptions.get(option);
 }
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.html b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.html
deleted file mode 100644
index 364443c47f..0000000000
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.html
+++ /dev/null
@@ -1 +0,0 @@
-<ng-template dsClaimedTaskActions></ng-template>
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
index 95e31f5523..d9f31aef75 100644
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
+++ b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component.spec.ts
@@ -1,22 +1,33 @@
-import { ClaimedTaskActionsLoaderComponent } from './claimed-task-actions-loader.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
-import { ClaimedTaskActionsEditMetadataComponent } from '../edit-metadata/claimed-task-actions-edit-metadata.component';
+import { ThemeService } from 'src/app/shared/theme-support/theme.service';
+
+import { RequestService } from '../../../../core/data/request.service';
+import { Item } from '../../../../core/shared/item.model';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTaskDataService } from '../../../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
+import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockRequestService } from '../../../mocks/request.service.mock';
+import { getMockSearchService } from '../../../mocks/search-service.mock';
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../../testing/notifications-service.stub';
-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 { PoolTaskDataService } from '../../../../core/tasks/pool-task-data.service';
-import { getMockSearchService } from '../../../mocks/search-service.mock';
-import { getMockRequestService } from '../../../mocks/request.service.mock';
-import { Item } from '../../../../core/shared/item.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskActionsEditMetadataComponent } from '../edit-metadata/claimed-task-actions-edit-metadata.component';
+import { ClaimedTaskActionsLoaderComponent } from './claimed-task-actions-loader.component';
 
 const searchService = getMockSearchService();
 
@@ -25,6 +36,7 @@ const requestService = getMockRequestService();
 describe('ClaimedTaskActionsLoaderComponent', () => {
   let comp: ClaimedTaskActionsLoaderComponent;
   let fixture: ComponentFixture<ClaimedTaskActionsLoaderComponent>;
+  let themeService: ThemeService;
 
   const option = 'test_option';
   const object = Object.assign(new ClaimedTask(), { id: 'claimed-task-1' });
@@ -34,36 +46,42 @@ describe('ClaimedTaskActionsLoaderComponent', () => {
       'dc.title': [
         {
           language: 'en_US',
-          value: 'This is just another title'
-        }
+          value: 'This is just another title',
+        },
       ],
       'dc.type': [
         {
           language: null,
-          value: 'Article'
-        }
+          value: 'Article',
+        },
       ],
       'dc.contributor.author': [
         {
           language: 'en_US',
-          value: 'Smith, Donald'
-        }
+          value: 'Smith, Donald',
+        },
       ],
       'dc.date.issued': [
         {
           language: null,
-          value: '2015-06-26'
-        }
-      ]
-    }
+          value: '2015-06-26',
+        },
+      ],
+    },
   });
 
   const workflowitem = Object.assign(new WorkflowItem(), { id: '333' });
 
   beforeEach(waitForAsync(() => {
+    themeService = getMockThemeService('dspace');
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ClaimedTaskActionsLoaderComponent, ClaimedTaskActionsEditMetadataComponent, ClaimedTaskActionsDirective],
+      declarations: [
+        ClaimedTaskActionsLoaderComponent,
+        ClaimedTaskActionsEditMetadataComponent,
+        DynamicComponentLoaderDirective,
+      ],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         { provide: ClaimedTaskDataService, useValue: {} },
@@ -72,13 +90,14 @@ describe('ClaimedTaskActionsLoaderComponent', () => {
         { provide: Router, useValue: new RouterStub() },
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestService },
-        { provide: PoolTaskDataService, useValue: {} }
-      ]
+        { provide: PoolTaskDataService, useValue: {} },
+        { provide: ThemeService, useValue: themeService },
+      ],
     }).overrideComponent(ClaimedTaskActionsLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [ClaimedTaskActionsEditMetadataComponent]
-      }
+        entryComponents: [ClaimedTaskActionsEditMetadataComponent],
+      },
     }).compileComponents();
   }));
 
@@ -89,14 +108,14 @@ describe('ClaimedTaskActionsLoaderComponent', () => {
     comp.object = object;
     comp.option = option;
     comp.workflowitem = workflowitem;
-    spyOn(comp, 'getComponentByWorkflowTaskOption').and.returnValue(ClaimedTaskActionsEditMetadataComponent);
+    spyOn(comp, 'getComponent').and.returnValue(ClaimedTaskActionsEditMetadataComponent);
 
     fixture.detectChanges();
   }));
 
   describe('When the component is rendered', () => {
-    it('should call the getComponentByWorkflowTaskOption function with the right option', () => {
-      expect(comp.getComponentByWorkflowTaskOption).toHaveBeenCalledWith(option);
+    it('should call the getComponent function', () => {
+      expect(comp.getComponent).toHaveBeenCalled();
     });
   });
 });
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 6a14aeb5bc..f05dc75cf3 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,32 +1,28 @@
 import {
   Component,
-  ComponentFactoryResolver,
   EventEmitter,
   Input,
-  OnDestroy,
-  OnInit,
   Output,
-  ViewChild
 } from '@angular/core';
-import { getComponentByWorkflowTaskOption } from './claimed-task-actions-decorator';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { ClaimedTaskActionsDirective } from './claimed-task-actions.directive';
-import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
-import { hasValue } from '../../../empty.util';
-import { Subscription } from 'rxjs';
-import { MyDSpaceActionsResult } from '../../mydspace-actions';
+
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component';
+import { MyDSpaceActionsResult } from '../../mydspace-actions';
+import { ClaimedTaskActionsAbstractComponent } from '../abstract/claimed-task-actions-abstract.component';
+import { getComponentByWorkflowTaskOption } from './claimed-task-actions-decorator';
 
 @Component({
   selector: 'ds-claimed-task-actions-loader',
-  templateUrl: './claimed-task-actions-loader.component.html'
+  templateUrl: '../../../abstract-component-loader/abstract-component-loader.component.html',
 })
 /**
  * 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, OnDestroy {
+export class ClaimedTaskActionsLoaderComponent extends AbstractComponentLoaderComponent<ClaimedTaskActionsAbstractComponent> {
   /**
    * The item object that belonging to the ClaimedTask object
    */
@@ -54,52 +50,21 @@ export class ClaimedTaskActionsLoaderComponent implements OnInit, OnDestroy {
   @Output() processCompleted = new EventEmitter<MyDSpaceActionsResult>();
 
   /**
-   * Directive to determine where the dynamic child component is located
+   * The list of input and output names for the dynamic component
    */
-  @ViewChild(ClaimedTaskActionsDirective, {static: true}) claimedTaskActionsDirective: ClaimedTaskActionsDirective;
+  protected inputNames: (keyof this & string)[] = [
+    'item',
+    'object',
+    'option',
+    'workflowitem',
+  ];
 
-  /**
-   * Array to track all subscriptions and unsubscribe them onDestroy
-   * @type {Array}
-   */
-  protected subs: Subscription[] = [];
+  protected outputNames: (keyof this & string)[] = [
+    'processCompleted',
+  ];
 
-  constructor(private componentFactoryResolver: ComponentFactoryResolver) {
+  public getComponent(): GenericConstructor<ClaimedTaskActionsAbstractComponent> {
+    return getComponentByWorkflowTaskOption(this.option);
   }
 
-  /**
-   * Fetch, create and initialize the relevant component
-   */
-  ngOnInit(): void {
-
-    const comp = this.getComponentByWorkflowTaskOption(this.option);
-    if (hasValue(comp)) {
-      const componentFactory = this.componentFactoryResolver.resolveComponentFactory(comp);
-
-      const viewContainerRef = this.claimedTaskActionsDirective.viewContainerRef;
-      viewContainerRef.clear();
-
-      const componentRef = viewContainerRef.createComponent(componentFactory);
-      const componentInstance = (componentRef.instance as ClaimedTaskActionsAbstractComponent);
-      componentInstance.item = this.item;
-      componentInstance.object = this.object;
-      componentInstance.workflowitem = this.workflowitem;
-      if (hasValue(componentInstance.processCompleted)) {
-        this.subs.push(componentInstance.processCompleted.subscribe((result) => this.processCompleted.emit(result)));
-      }
-    }
-  }
-
-  getComponentByWorkflowTaskOption(option: string) {
-    return getComponentByWorkflowTaskOption(option);
-  }
-
-  /**
-   * Unsubscribe from open subscriptions
-   */
-  ngOnDestroy(): void {
-    this.subs
-      .filter((subscription) => hasValue(subscription))
-      .forEach((subscription) => subscription.unsubscribe());
-  }
 }
diff --git a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions.directive.ts b/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions.directive.ts
deleted file mode 100644
index a4a55b541b..0000000000
--- a/src/app/shared/mydspace-actions/claimed-task/switcher/claimed-task-actions.directive.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import { Directive, ViewContainerRef } from '@angular/core';
-
-@Directive({
-  selector: '[dsClaimedTaskActions]',
-})
-/**
- * Directive used as a hook to know where to inject the dynamic Claimed Task Actions component
- */
-export class ClaimedTaskActionsDirective {
-  constructor(public viewContainerRef: ViewContainerRef) { }
-}
diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts b/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts
index e6abfa76a1..fce043191a 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.spec.ts
@@ -1,21 +1,31 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ItemActionsComponent } from './item-actions.component';
 import { ItemDataService } from '../../../core/data/item-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { RouterStub } from '../../testing/router.stub';
+import { ItemActionsComponent } from './item-actions.component';
 
 let component: ItemActionsComponent;
 let fixture: ComponentFixture<ItemActionsComponent>;
@@ -30,28 +40,28 @@ mockObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const searchService = getMockSearchService();
@@ -65,9 +75,9 @@ describe('ItemActionsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ItemActionsComponent],
       providers: [
@@ -76,11 +86,11 @@ describe('ItemActionsComponent', () => {
         { provide: ItemDataService, useValue: mockDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestServce }
+        { provide: RequestService, useValue: requestServce },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.ts b/src/app/shared/mydspace-actions/item/item-actions.component.ts
index 4df11d65d9..a3288cae2c 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.ts
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.ts
@@ -1,13 +1,19 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
+
 import { ItemDataService } from '../../../core/data/item-data.service';
-import { Item } from '../../../core/shared/item.model';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
 import { SearchService } from '../../../core/shared/search/search.service';
 import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents mydspace actions related to Item object.
diff --git a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
index 6408dddac6..d61e99a08a 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions-service.factory.ts
@@ -1,19 +1,19 @@
-import { ResourceType } from '../../core/shared/resource-type';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
-import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { ItemDataService } from '../../core/data/item-data.service';
-import { Item } from '../../core/shared/item.model';
-import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
-import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
 import { CacheableObject } from '../../core/cache/cacheable-object.model';
 import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { Item } from '../../core/shared/item.model';
+import { ResourceType } from '../../core/shared/resource-type';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
+import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
+import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
+import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
 
 /**
- * Class to return DataService for given ResourceType
+ * Class to return UpdateDataServiceImpl for given ResourceType
  */
 export class MyDSpaceActionsServiceFactory<T extends CacheableObject, TService extends IdentifiableDataService<T>> {
   public getConstructor(type: ResourceType): TService {
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.module.ts b/src/app/shared/mydspace-actions/mydspace-actions.module.ts
new file mode 100644
index 0000000000..14a4de5592
--- /dev/null
+++ b/src/app/shared/mydspace-actions/mydspace-actions.module.ts
@@ -0,0 +1,60 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared.module';
+import { ClaimedTaskActionsApproveComponent } from './claimed-task/approve/claimed-task-actions-approve.component';
+import { ClaimedTaskActionsComponent } from './claimed-task/claimed-task-actions.component';
+import { ClaimedTaskActionsEditMetadataComponent } from './claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
+import { ClaimedTaskActionsRejectComponent } from './claimed-task/reject/claimed-task-actions-reject.component';
+import { ClaimedTaskActionsReturnToPoolComponent } from './claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
+import { ClaimedTaskActionsLoaderComponent } from './claimed-task/switcher/claimed-task-actions-loader.component';
+import { ItemActionsComponent } from './item/item-actions.component';
+import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
+import { WorkflowitemActionsComponent } from './workflowitem/workflowitem-actions.component';
+import { WorkspaceitemActionsComponent } from './workspaceitem/workspaceitem-actions.component';
+
+const ENTRY_COMPONENTS = [
+  ClaimedTaskActionsApproveComponent,
+  ClaimedTaskActionsRejectComponent,
+  ClaimedTaskActionsReturnToPoolComponent,
+  ClaimedTaskActionsEditMetadataComponent,
+];
+
+const DECLARATIONS = [
+  ...ENTRY_COMPONENTS,
+  ClaimedTaskActionsComponent,
+  ClaimedTaskActionsLoaderComponent,
+  ItemActionsComponent,
+  PoolTaskActionsComponent,
+  WorkflowitemActionsComponent,
+  WorkspaceitemActionsComponent,
+];
+
+/**
+ * This module contains Item actions used in MyDSpace
+ */
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+  ],
+  declarations: [
+    ...DECLARATIONS,
+  ],
+  providers: [
+    ...ENTRY_COMPONENTS,
+  ],
+  exports: [
+    ...DECLARATIONS,
+  ],
+})
+export class MyDSpaceActionsModule {
+
+}
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.ts b/src/app/shared/mydspace-actions/mydspace-actions.ts
index 931929ccce..5100d8122e 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions.ts
@@ -1,20 +1,31 @@
+import {
+  Component,
+  EventEmitter,
+  Injector,
+  Input,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { Component, EventEmitter, Injector, Input, Output } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  take,
+  tap,
+} from 'rxjs/operators';
 
-import { take, tap } from 'rxjs/operators';
-
-import { MyDSpaceActionsServiceFactory } from './mydspace-actions-service.factory';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
+import { SearchService } from '../../core/shared/search/search.service';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
 import { NotificationsService } from '../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { SearchService } from '../../core/shared/search/search.service';
-import { getFirstSucceededRemoteData } from '../../core/shared/operators';
-import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
+import { MyDSpaceActionsServiceFactory } from './mydspace-actions-service.factory';
 
 export interface MyDSpaceActionsResult {
   result: boolean;
@@ -47,7 +58,7 @@ export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService
   public processing$ = new BehaviorSubject<boolean>(false);
 
   /**
-   * Instance of DataService related to mydspace object
+   * Instance of UpdateDataServiceImpl related to mydspace object
    */
   protected objectDataService: TService;
 
@@ -99,7 +110,7 @@ export abstract class MyDSpaceActionsComponent<T extends DSpaceObject, TService
     // See https://github.com/DSpace/dspace-angular/pull/468
     this.searchService.getEndpoint().pipe(
       take(1),
-      tap((cachedHref: string) => this.requestService.removeByHrefSubstring(cachedHref))
+      tap((cachedHref: string) => this.requestService.removeByHrefSubstring(cachedHref)),
     ).subscribe(() => this.router.navigateByUrl(url));
   }
 
diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
index fe9d955287..c408137f70 100644
--- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
+++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.spec.ts
@@ -1,24 +1,39 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
-import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
-import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
-import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { RouterStub } from '../testing/router.stub';
-import { getMockSearchService } from '../mocks/search-service.mock';
-import { getMockRequestService } from '../mocks/request.service.mock';
+
+import { RequestService } from '../../core/data/request.service';
 import { Item } from '../../core/shared/item.model';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { SearchService } from '../../core/shared/search/search.service';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../core/tasks/claimed-task-data.service';
+import { PoolTask } from '../../core/tasks/models/pool-task-object.model';
+import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
+import { PoolTaskDataService } from '../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { getMockSearchService } from '../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { NotificationsService } from '../notifications/notifications.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { RequestService } from '../../core/data/request.service';
-import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../remote-data.utils';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { RouterStub } from '../testing/router.stub';
+import { PoolTaskActionsComponent } from './pool-task/pool-task-actions.component';
 
 let mockDataService: PoolTaskDataService;
 let mockClaimedTaskDataService: ClaimedTaskDataService;
@@ -40,28 +55,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -89,11 +104,11 @@ describe('MyDSpaceReloadableActionsComponent', () => {
         { provide: PoolTaskDataService, useValue: mockDataService },
         { provide: ClaimedTaskDataService, useValue: mockClaimedTaskDataService },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolTaskActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -222,7 +237,7 @@ describe('MyDSpaceReloadableActionsComponent', () => {
     it('should emit the reloaded object in case of success', (done) => {
 
       component.startActionExecution().subscribe( (result) => {
-        expect(component.processCompleted.emit).toHaveBeenCalledWith({result: true, reloadedObject: result as any});
+        expect(component.processCompleted.emit).toHaveBeenCalledWith({ result: true, reloadedObject: result as any });
         done();
       });
     });
diff --git a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
index c126c8c53b..28e3ac4040 100644
--- a/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-reloadable-actions.ts
@@ -1,22 +1,33 @@
+import {
+  Component,
+  Injector,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { Component, Injector, OnInit } from '@angular/core';
-
-import { map, switchMap, take, tap } from 'rxjs/operators';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { ResourceType } from '../../core/shared/resource-type';
+import { SearchService } from '../../core/shared/search/search.service';
+import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
 import { NotificationsService } from '../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { Observable, of } from 'rxjs';
-import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
 import { getSearchResultFor } from '../search/search-result-element-decorator';
 import { MyDSpaceActionsComponent } from './mydspace-actions';
-import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
 
 /**
  * Abstract class for all different representations of mydspace actions
@@ -72,7 +83,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
               (reloadedObject) => {
                 this.processing$.next(false);
                 this.handleReloadableActionResponse(res.hasSucceeded, reloadedObject);
-              })
+              }),
           );
         } else {
           this.processing$.next(false);
@@ -93,7 +104,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
   handleReloadableActionResponse(result: boolean, reloadedObject: DSpaceObject): void {
     if (result) {
       if (reloadedObject) {
-        this.processCompleted.emit({result, reloadedObject});
+        this.processCompleted.emit({ result, reloadedObject });
       } else {
         this.reload();
       }
@@ -120,7 +131,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
   convertReloadedObject(dso: DSpaceObject): DSpaceObject {
     const constructor = getSearchResultFor((dso as any).constructor);
     const reloadedObject = Object.assign(new constructor(), dso, {
-      indexableObject: dso
+      indexableObject: dso,
     });
     return reloadedObject;
   }
@@ -138,7 +149,7 @@ export abstract class MyDSpaceReloadableActionsComponent<T extends DSpaceObject,
           return of(res);
         }
       })).pipe(map((dso) => {
-          return dso ? this.convertReloadedObject(dso) : dso;
+      return dso ? this.convertReloadedObject(dso) : dso;
     }));
   }
 
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..1d98934011 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
@@ -3,7 +3,7 @@
   (click)="claim()">
   <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="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
+  <span *ngIf="(processing$ | async) !== true"><i class="fas fa-hand-paper"></i> {{'submission.workflow.tasks.pool.claim' |
     translate}}</span>
 </button>
 <button class="btn btn-primary workflow-view ml-1 mt-1 mb-3" data-test="view-btn"
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
index 385dea73f3..2a558c0ba6 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.spec.ts
@@ -1,28 +1,38 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
+import { PoolTaskSearchResult } from '../../object-collection/shared/pool-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
 import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { PoolTaskActionsComponent } from './pool-task-actions.component';
-import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { PoolTaskSearchResult } from '../../object-collection/shared/pool-task-search-result.model';
-import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
 
 let mockDataService: PoolTaskDataService;
 let mockClaimedTaskDataService: ClaimedTaskDataService;
@@ -44,28 +54,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -93,11 +103,11 @@ describe('PoolTaskActionsComponent', () => {
         { provide: PoolTaskDataService, useValue: mockDataService },
         { provide: ClaimedTaskDataService, useValue: mockClaimedTaskDataService },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestService }
+        { provide: RequestService, useValue: requestService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolTaskActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -131,13 +141,13 @@ describe('PoolTaskActionsComponent', () => {
   it('should display claim task button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-info'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should display view button', () => {
-    const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+    const btn = fixture.debugElement.query(By.css('button[data-test="view-btn"]'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should call claim task with href of getPoolTaskEndpointById', ((done) => {
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
index c8dcd87a33..7cb5ab154c 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.ts
@@ -1,23 +1,30 @@
-import { Component, Injector, Input, OnDestroy } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnDestroy,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { Observable } from 'rxjs';
-import { switchMap, take } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import {
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
-import { Item } from '../../../core/shared/item.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceReloadableActionsComponent } from '../mydspace-reloadable-actions';
 
 /**
  * This component represents mydspace actions related to PoolTask object.
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
index 79aece892e..9c7a103836 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.spec.ts
@@ -1,24 +1,34 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
 
 let component: WorkflowitemActionsComponent;
 let fixture: ComponentFixture<WorkflowitemActionsComponent>;
@@ -37,28 +47,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockObject = Object.assign(new WorkflowItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
@@ -70,9 +80,9 @@ describe('WorkflowitemActionsComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [WorkflowitemActionsComponent],
       providers: [
@@ -81,11 +91,11 @@ describe('WorkflowitemActionsComponent', () => {
         { provide: WorkflowItemDataService, useValue: mockDataService },
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: SearchService, useValue: searchService },
-        { provide: RequestService, useValue: requestServce }
+        { provide: RequestService, useValue: requestServce },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkflowitemActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -107,9 +117,9 @@ describe('WorkflowitemActionsComponent', () => {
   });
 
   it('should display view button', () => {
-    const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+    const btn = fixture.debugElement.query(By.css('button[data-test="view-btn"]'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
 });
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
index 3587356642..c0f6d33a9d 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
@@ -1,15 +1,18 @@
-import { Component, Injector, Input } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
 import { TranslateService } from '@ngx-translate/core';
 
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RequestService } from '../../../core/data/request.service';
 import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
 import { getWorkflowItemViewRoute } from '../../../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents actions related to WorkflowItem object.
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 c658651790..c3515b4d72 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -2,22 +2,27 @@
 
   <button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
     ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
+    [attr.aria-label]="'submission.workspace.generic.view-help' | translate"
     [routerLink]="[getWorkspaceItemViewRoute(object)]">
     <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
   </button>
 
-  <a class="btn btn-primary mt-1 mb-3" id="{{'edit_' + object.id}}"
+  <a class="btn btn-primary mt-1 mb-3 edit-btn" id="{{'edit_' + object.id}}"
+   *ngIf="(canEditItem$ | async)"
     ngbTooltip="{{'submission.workflow.generic.edit-help' | translate}}"
+    [attr.aria-label]="'submission.workflow.generic.edit-help' | translate"
     [routerLink]="['/workspaceitems/' + object.id + '/edit']" role="button">
     <i class="fa fa-edit"></i> {{'submission.workflow.generic.edit' | translate}}
   </a>
 
   <button type="button" id="{{'delete_' + object.id}}" class="btn btn-danger mt-1 mb-3"
+    *ngIf="(canEditItem$ | async)"
     ngbTooltip="{{'submission.workflow.generic.delete-help' | translate}}"
+    [attr.aria-label]="'submission.workflow.generic.delete-help' | translate"
     (click)="$event.preventDefault();confirmDiscard(content)">
     <span *ngIf="(processingDelete$ | async)"><i class='fas fa-circle-notch fa-spin'></i>
       {{'submission.workflow.tasks.generic.processing' | translate}}</span>
-    <span *ngIf="!(processingDelete$ | async)"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
+    <span *ngIf="(processingDelete$ | async) !== true"><i class="fa fa-trash"></i> {{'submission.workflow.generic.delete' |
       translate}}</span>
   </button>
 </div>
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
index 7299c28df2..f8e50c1ba0 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.spec.ts
@@ -1,38 +1,56 @@
-import { ChangeDetectionStrategy, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { Router } from '@angular/router';
+import {
+  ChangeDetectionStrategy,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { getMockRequestService } from '../../mocks/request.service.mock';
+import { getMockSearchService } from '../../mocks/search-service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../remote-data.utils';
-import { RequestService } from '../../../core/data/request.service';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { getMockSearchService } from '../../mocks/search-service.mock';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
 
 let component: WorkspaceitemActionsComponent;
 let fixture: ComponentFixture<WorkspaceitemActionsComponent>;
 
 let mockObject: WorkspaceItem;
 let notificationsServiceStub: NotificationsServiceStub;
+let authorizationService;
+let authService;
 
 const mockDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
-  delete: jasmine.createSpy('delete')
+  delete: jasmine.createSpy('delete'),
 });
 
 const searchService = getMockSearchService();
@@ -45,44 +63,125 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd), id: '1234', uuid: '1234' });
 
-describe('WorkspaceitemActionsComponent', () => {
-  beforeEach(waitForAsync(() => {
+const ePersonMock: EPerson = Object.assign(new EPerson(), {
+  handle: null,
+  netid: null,
+  lastActive: '2023-04-27T12:15:57.054+00:00',
+  canLogIn: true,
+  email: 'dspacedemo+submit@gmail.com',
+  requireCertificate: false,
+  selfRegistered: false,
+  _name: 'dspacedemo+submit@gmail.com',
+  id: '914955b1-cf2e-4884-8af7-a166aa24cf73',
+  uuid: '914955b1-cf2e-4884-8af7-a166aa24cf73',
+  type: 'eperson',
+  metadata: {
+    'dspace.agreements.cookies': [
+      {
+        uuid: '0a53a0f2-e168-4ed9-b4af-cba9a2d267ca',
+        language: null,
+        value:
+          '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true}',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      },
+    ],
+    'dspace.agreements.end-user': [
+      {
+        uuid: '0879e571-6e4a-4efe-af9b-704c755166be',
+        language: null,
+        value: 'true',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      },
+    ],
+    'eperson.firstname': [
+      {
+        uuid: '18052a3e-f19b-49ca-b9f9-ee4cf9c71b86',
+        language: null,
+        value: 'Demo',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      },
+    ],
+    'eperson.language': [
+      {
+        uuid: '98c2abdb-6a6f-4b41-b455-896bcf333ca3',
+        language: null,
+        value: 'en',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      },
+    ],
+    'eperson.lastname': [
+      {
+        uuid: 'df722e70-9497-468d-a92a-4038e7ef2586',
+        language: null,
+        value: 'Submitter',
+        place: 0,
+        authority: null,
+        confidence: -1,
+      },
+    ],
+  },
+  _links: {
+    groups: {
+      href: 'http://localhost:8080/server/api/eperson/epersons/914955b1-cf2e-4884-8af7-a166aa24cf73/groups',
+    },
+    self: {
+      href: 'http://localhost:8080/server/api/eperson/epersons/914955b1-cf2e-4884-8af7-a166aa24cf73',
+    },
+  },
+});
 
-    TestBed.configureTestingModule({
+authService = jasmine.createSpyObj('authService', {
+  getAuthenticatedUserFromStore: jasmine.createSpy('getAuthenticatedUserFromStore'),
+});
+
+describe('WorkspaceitemActionsComponent', () => {
+  beforeEach(waitForAsync(async () => {
+    authorizationService = jasmine.createSpyObj('authorizationService', {
+      isAuthorized: observableOf(true),
+    });
+    await TestBed.configureTestingModule({
       imports: [
         NgbModule,
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [WorkspaceitemActionsComponent],
       providers: [
@@ -92,11 +191,13 @@ describe('WorkspaceitemActionsComponent', () => {
         { provide: WorkspaceitemDataService, useValue: mockDataService },
         { provide: SearchService, useValue: searchService },
         { provide: RequestService, useValue: requestServce },
-        NgbModal
+        { provide: AuthService, useValue:  authService },
+        { provide: AuthorizationDataService, useValue: authorizationService },
+        NgbModal,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkspaceitemActionsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -105,6 +206,7 @@ describe('WorkspaceitemActionsComponent', () => {
     component = fixture.componentInstance;
     component.object = mockObject;
     notificationsServiceStub = TestBed.inject(NotificationsService as any);
+    (authService.getAuthenticatedUserFromStore as jasmine.Spy).and.returnValue(observableOf(ePersonMock));
     fixture.detectChanges();
   });
 
@@ -123,19 +225,19 @@ describe('WorkspaceitemActionsComponent', () => {
   it('should display edit button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-primary'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should display delete button', () => {
     const btn = fixture.debugElement.query(By.css('.btn-danger'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   it('should display view button', () => {
-    const btn = fixture.debugElement.query(By.css('button [data-test="view-btn"]'));
+    const btn = fixture.debugElement.query(By.css('button[data-test="view-btn"]'));
 
-    expect(btn).toBeDefined();
+    expect(btn).not.toBeNull();
   });
 
   describe('on discard confirmation', () => {
@@ -150,7 +252,6 @@ describe('WorkspaceitemActionsComponent', () => {
       confirmBtn.click();
 
       fixture.detectChanges();
-
       fixture.whenStable().then(() => {
         done();
       });
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
index a6d30728ac..7d340edfb9 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -1,20 +1,35 @@
-import { Component, Injector, Input } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { BehaviorSubject } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+  switchMap,
+} from 'rxjs';
+import { AuthorizationDataService } from 'src/app/core/data/feature-authorization/authorization-data.service';
 
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { MyDSpaceActionsComponent } from '../mydspace-actions';
-import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { RequestService } from '../../../core/data/request.service';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { AuthService } from '../../../core/auth/auth.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
 import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { Item } from '../../../core/shared/item.model';
 import { NoContent } from '../../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/workspaceitems-edit-page-routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { MyDSpaceActionsComponent } from '../mydspace-actions';
 
 /**
  * This component represents actions related to WorkspaceItem object.
@@ -24,7 +39,7 @@ import { getWorkspaceItemViewRoute } from '../../../workspaceitems-edit-page/wor
   styleUrls: ['./workspaceitem-actions.component.scss'],
   templateUrl: './workspaceitem-actions.component.html',
 })
-export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<WorkspaceItem, WorkspaceitemDataService> {
+export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<WorkspaceItem, WorkspaceitemDataService> implements OnInit {
 
   /**
    * The workspaceitem object
@@ -37,6 +52,14 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
    */
   public processingDelete$ = new BehaviorSubject<boolean>(false);
 
+  /**
+   * A boolean representing if the user can edit the item
+   * and therefore can delete it as well
+   * (since the user can discard the item also from the edit page)
+   * @type {Observable<boolean>}
+   */
+  canEditItem$: Observable<boolean>;
+
   /**
    * Initialize instance variables
    *
@@ -54,8 +77,12 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
     protected notificationsService: NotificationsService,
     protected translate: TranslateService,
     protected searchService: SearchService,
-    protected requestService: RequestService) {
+    protected requestService: RequestService,
+    private authService: AuthService,
+    public authorizationService: AuthorizationDataService,
+  ) {
     super(WorkspaceItem.type, injector, router, notificationsService, translate, searchService, requestService);
+
   }
 
   /**
@@ -73,10 +100,26 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
               this.handleActionResponse(response.hasSucceeded);
             });
         }
-      }
+      },
     );
   }
 
+
+  ngOnInit(): void {
+    const activeEPerson$ = this.authService.getAuthenticatedUserFromStore();
+
+    this.canEditItem$ = activeEPerson$.pipe(
+      switchMap((eperson) => {
+        return this.object?.item.pipe(
+          getFirstCompletedRemoteData(),
+          getRemoteDataPayload(),
+          switchMap((item: Item) => {
+            return this.authorizationService.isAuthorized(FeatureID.CanEditItem, item?._links?.self.href, eperson.uuid);
+          }),
+        ) as Observable<boolean>;
+      }));
+  }
+
   /**
    * Init the target object
    *
@@ -92,5 +135,4 @@ export class WorkspaceitemActionsComponent extends MyDSpaceActionsComponent<Work
   getWorkspaceItemViewRoute(workspaceItem: WorkspaceItem): string {
     return getWorkspaceItemViewRoute(workspaceItem?.id);
   }
-
 }
diff --git a/src/app/shared/ng-for-track-by-id.directive.ts b/src/app/shared/ng-for-track-by-id.directive.ts
index 00979bc2bf..5850c0582e 100644
--- a/src/app/shared/ng-for-track-by-id.directive.ts
+++ b/src/app/shared/ng-for-track-by-id.directive.ts
@@ -1,5 +1,8 @@
-import { Directive, Host } from '@angular/core';
 import { NgForOf } from '@angular/common';
+import {
+  Directive,
+  Host,
+} from '@angular/core';
 
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 
diff --git a/src/app/shared/ngrx/dspace-router-state-serializer.ts b/src/app/shared/ngrx/dspace-router-state-serializer.ts
index 46370e3ccd..f8c25540ad 100644
--- a/src/app/shared/ngrx/dspace-router-state-serializer.ts
+++ b/src/app/shared/ngrx/dspace-router-state-serializer.ts
@@ -1,6 +1,9 @@
-import { RouterStateSerializer } from '@ngrx/router-store';
-import { Params, RouterStateSnapshot } from '@angular/router';
 import { Injectable } from '@angular/core';
+import {
+  Params,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { RouterStateSerializer } from '@ngrx/router-store';
 
 export interface RouterStateUrl {
   url: string;
diff --git a/src/app/shared/ngrx/no-op.action.ts b/src/app/shared/ngrx/no-op.action.ts
index cd05c9c05f..96d03b8f9a 100644
--- a/src/app/shared/ngrx/no-op.action.ts
+++ b/src/app/shared/ngrx/no-op.action.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { type } from './type';
 
 export const NO_OP_ACTION_TYPE = type('dspace/ngrx/NO_OP_ACTION');
diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
new file mode 100644
index 0000000000..8e4b5bc2f6
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -0,0 +1,12 @@
+<div role="button"
+     class="w-100 h-100 pt-4 pb-3 px-2 box-container"
+     [ngStyle]="{'background-color': boxConfig.color}"
+     [dsHoverClass]="'shadow-lg'"
+     (click)="onClick(boxConfig)"
+     [title]="boxConfig.description | translate"
+>
+  <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
+    <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+    <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+  </div>
+</div>
diff --git a/src/app/shared/notification-box/notification-box.component.scss b/src/app/shared/notification-box/notification-box.component.scss
new file mode 100644
index 0000000000..3bc1d23248
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.scss
@@ -0,0 +1,8 @@
+.box-container {
+  min-width: max-content;
+}
+
+.box-counter {
+  font-size: calc(var(--bs-font-size-lg) * 1.5);
+}
+
diff --git a/src/app/shared/notification-box/notification-box.component.spec.ts b/src/app/shared/notification-box/notification-box.component.spec.ts
new file mode 100644
index 0000000000..f78cf5c332
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.spec.ts
@@ -0,0 +1,39 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { NotificationBoxComponent } from './notification-box.component';
+
+describe('NotificationBoxComponent', () => {
+  let component: NotificationBoxComponent;
+  let fixture: ComponentFixture<NotificationBoxComponent>;
+  let mockBoxConfig: AdminNotifyMetricsBox;
+
+  beforeEach(async () => {
+    mockBoxConfig = {
+      'color': '#D4EDDA',
+      'title': 'admin-notify-dashboard.delivered',
+      'config': 'NOTIFY.outgoing.delivered',
+      'count': 79,
+      'description': 'box description',
+    };
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [ NotificationBoxComponent ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(NotificationBoxComponent);
+    component = fixture.componentInstance;
+    component.boxConfig = mockBoxConfig;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/notification-box/notification-box.component.ts b/src/app/shared/notification-box/notification-box.component.ts
new file mode 100644
index 0000000000..f444c1e932
--- /dev/null
+++ b/src/app/shared/notification-box/notification-box.component.ts
@@ -0,0 +1,30 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { AdminNotifyMetricsBox } from '../../admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { AdminNotifySearchResult } from '../../admin/admin-notify-dashboard/models/admin-notify-message-search-result.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../object-collection/shared/listable-object/listable-object.decorator';
+
+@listableObjectComponent(AdminNotifySearchResult, ViewMode.ListElement)
+@Component({
+  selector: 'ds-notification-box',
+  templateUrl: './notification-box.component.html',
+  styleUrls: ['./notification-box.component.scss'],
+})
+/**
+ * Component to display the count of notifications for each type of LDN message and to access the related filtered search
+ * (each box works as a filter button setting a specific search configuration)
+ */
+export class NotificationBoxComponent {
+  @Input() boxConfig: AdminNotifyMetricsBox;
+  @Output() selectedBoxConfig: EventEmitter<string> = new EventEmitter();
+
+  public onClick(boxConfig: AdminNotifyMetricsBox) {
+    this.selectedBoxConfig.emit(boxConfig.config);
+  }
+}
diff --git a/src/app/shared/notifications/models/notification-options.model.ts b/src/app/shared/notifications/models/notification-options.model.ts
index 65011496b3..12bd25a201 100644
--- a/src/app/shared/notifications/models/notification-options.model.ts
+++ b/src/app/shared/notifications/models/notification-options.model.ts
@@ -12,8 +12,8 @@ export class NotificationOptions implements INotificationOptions {
   public animate: any;
 
   constructor(timeOut = 5000,
-              clickToClose = true,
-              animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
+    clickToClose = true,
+    animate: NotificationAnimationsType | string = NotificationAnimationsType.Scale) {
 
     this.timeOut = timeOut;
     this.clickToClose = clickToClose;
diff --git a/src/app/shared/notifications/models/notification.model.ts b/src/app/shared/notifications/models/notification.model.ts
index 98562a19b4..b79ecbc12e 100644
--- a/src/app/shared/notifications/models/notification.model.ts
+++ b/src/app/shared/notifications/models/notification.model.ts
@@ -1,8 +1,12 @@
-import { INotificationOptions, NotificationOptions } from './notification-options.model';
-import { NotificationType } from './notification-type';
-import { isEmpty } from '../../empty.util';
 import { Observable } from 'rxjs';
 
+import { isEmpty } from '../../empty.util';
+import {
+  INotificationOptions,
+  NotificationOptions,
+} from './notification-options.model';
+import { NotificationType } from './notification-type';
+
 export interface INotification {
   id: string;
   type: NotificationType;
@@ -21,11 +25,11 @@ export class Notification implements INotification {
   public html: boolean;
 
   constructor(id: string,
-              type: NotificationType,
-              title?: Observable<string> | string,
-              content?: Observable<string> | string,
-              options?: NotificationOptions,
-              html?: boolean) {
+    type: NotificationType,
+    title?: Observable<string> | string,
+    content?: Observable<string> | string,
+    options?: NotificationOptions,
+    html?: boolean) {
 
     this.id = id;
     this.type = type;
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index befa84cfc0..dae0207493 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -16,10 +16,10 @@
     <div class="d-flex flex-column justify-content-center align-items-center">
       <div class="notification-icon d-flex justify-content-center"><i
         [ngClass]="{'fas fa-2x': true,
-      'fa-check-circle': notification.type == 'alert-success',
-      'fa-times-circle': notification.type == 'alert-danger',
-      'fa-exclamation-triangle': notification.type == 'alert-warning',
-      'fa-info-circle': notification.type == 'alert-info'
+      'fa-check-circle': notification.type === 'alert-success',
+      'fa-times-circle': notification.type === 'alert-danger',
+      'fa-exclamation-triangle': notification.type === 'alert-warning',
+      'fa-info-circle': notification.type === 'alert-info'
       }"></i></div>
     </div>
     <div class="d-flex flex-column justify-content-center align-content-stretch">
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/notification/notification.component.spec.ts b/src/app/shared/notifications/notification/notification.component.spec.ts
index f6de303726..0871d1bae6 100644
--- a/src/app/shared/notifications/notification/notification.component.spec.ts
+++ b/src/app/shared/notifications/notification/notification.component.spec.ts
@@ -1,20 +1,38 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { BrowserModule, By } from '@angular/platform-browser';
-import { ChangeDetectorRef, DebugElement } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { BehaviorSubject } from 'rxjs';
 
-import { Store, StoreModule } from '@ngrx/store';
-
-import { NotificationComponent } from './notification.component';
-import { NotificationsService } from '../notifications.service';
+import { storeModuleConfig } from '../../../app.reducer';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { Notification } from '../models/notification.model';
+import { NotificationOptions } from '../models/notification-options.model';
 import { NotificationType } from '../models/notification-type';
 import { notificationsReducer } from '../notifications.reducers';
-import { NotificationOptions } from '../models/notification-options.model';
-import { Notification } from '../models/notification.model';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { storeModuleConfig } from '../../../app.reducer';
-import { BehaviorSubject } from 'rxjs';
+import { NotificationsService } from '../notifications.service';
+import { NotificationComponent } from './notification.component';
 
 describe('NotificationComponent', () => {
 
@@ -29,7 +47,7 @@ describe('NotificationComponent', () => {
   beforeEach(waitForAsync(() => {
     const store: Store<Notification> = jasmine.createSpyObj('store', {
       /* eslint-disable no-empty, @typescript-eslint/no-empty-function */
-      notifications: []
+      notifications: [],
     });
 
     TestBed.configureTestingModule({
@@ -40,8 +58,8 @@ describe('NotificationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         })],
       declarations: [NotificationComponent], // declare the test component
       providers: [
@@ -49,7 +67,7 @@ describe('NotificationComponent', () => {
         ChangeDetectorRef,
         NotificationsService,
         TranslateService,
-      ]
+      ],
     }).compileComponents();  // compile template and css
 
   }));
@@ -62,7 +80,7 @@ describe('NotificationComponent', () => {
       type: NotificationType.Info,
       title: 'Notif. title',
       content: 'Notif. content',
-      options: new NotificationOptions()
+      options: new NotificationOptions(),
     };
 
     fixture.detectChanges();
@@ -105,7 +123,7 @@ describe('NotificationComponent', () => {
       title: 'Notif. title',
       content: htmlContent,
       options: new NotificationOptions(),
-      html: true
+      html: true,
     };
 
     fixture.detectChanges();
@@ -129,9 +147,9 @@ describe('NotificationComponent', () => {
         content: 'test',
         options: Object.assign(
           new NotificationOptions(),
-          { timeout: TIMEOUT }
+          { timeout: TIMEOUT },
         ),
-        html: true
+        html: true,
       };
     });
 
diff --git a/src/app/shared/notifications/notification/notification.component.ts b/src/app/shared/notifications/notification/notification.component.ts
index 6dbda23e61..35081f57d3 100644
--- a/src/app/shared/notifications/notification/notification.component.ts
+++ b/src/app/shared/notifications/notification/notification.component.ts
@@ -1,4 +1,4 @@
-import { Observable, of as observableOf } from 'rxjs';
+import { trigger } from '@angular/animations';
 import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
@@ -8,22 +8,64 @@ import {
   OnDestroy,
   OnInit,
   TemplateRef,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
-import { trigger } from '@angular/animations';
 import { DomSanitizer } from '@angular/platform-browser';
-import { NotificationsService } from '../notifications.service';
-import { scaleEnter, scaleInState, scaleLeave, scaleOutState } from '../../animations/scale';
-import { rotateEnter, rotateInState, rotateLeave, rotateOutState } from '../../animations/rotate';
-import { fromBottomEnter, fromBottomInState, fromBottomLeave, fromBottomOutState } from '../../animations/fromBottom';
-import { fromRightEnter, fromRightInState, fromRightLeave, fromRightOutState } from '../../animations/fromRight';
-import { fromLeftEnter, fromLeftInState, fromLeftLeave, fromLeftOutState } from '../../animations/fromLeft';
-import { fromTopEnter, fromTopInState, fromTopLeave, fromTopOutState } from '../../animations/fromTop';
-import { fadeInEnter, fadeInState, fadeOutLeave, fadeOutState } from '../../animations/fade';
-import { NotificationAnimationsStatus } from '../models/notification-animations-type';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  first,
+} from 'rxjs/operators';
+
+import {
+  fadeInEnter,
+  fadeInState,
+  fadeOutLeave,
+  fadeOutState,
+} from '../../animations/fade';
+import {
+  fromBottomEnter,
+  fromBottomInState,
+  fromBottomLeave,
+  fromBottomOutState,
+} from '../../animations/fromBottom';
+import {
+  fromLeftEnter,
+  fromLeftInState,
+  fromLeftLeave,
+  fromLeftOutState,
+} from '../../animations/fromLeft';
+import {
+  fromRightEnter,
+  fromRightInState,
+  fromRightLeave,
+  fromRightOutState,
+} from '../../animations/fromRight';
+import {
+  fromTopEnter,
+  fromTopInState,
+  fromTopLeave,
+  fromTopOutState,
+} from '../../animations/fromTop';
+import {
+  rotateEnter,
+  rotateInState,
+  rotateLeave,
+  rotateOutState,
+} from '../../animations/rotate';
+import {
+  scaleEnter,
+  scaleInState,
+  scaleLeave,
+  scaleOutState,
+} from '../../animations/scale';
 import { isNotEmpty } from '../../empty.util';
 import { INotification } from '../models/notification.model';
-import { filter, first } from 'rxjs/operators';
+import { NotificationAnimationsStatus } from '../models/notification-animations-type';
+import { NotificationsService } from '../notifications.service';
 
 @Component({
   selector: 'ds-notification',
@@ -36,12 +78,12 @@ import { filter, first } from 'rxjs/operators';
       fromLeftEnter, fromLeftInState, fromLeftLeave, fromLeftOutState,
       fromTopEnter, fromTopInState, fromTopLeave, fromTopOutState,
       rotateInState, rotateEnter, rotateOutState, rotateLeave,
-      scaleInState, scaleEnter, scaleOutState, scaleLeave
-    ])
+      scaleInState, scaleEnter, scaleOutState, scaleLeave,
+    ]),
   ],
   templateUrl: './notification.component.html',
   styleUrls: ['./notification.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 
 export class NotificationComponent implements OnInit, OnDestroy {
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 1d3faabdaa..3d814a996b 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,20 +1,31 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { ChangeDetectorRef } from '@angular/core';
-
-import { NotificationsService } from '../notifications.service';
-import { notificationsReducer } from '../notifications.reducers';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
-import { NotificationsBoardComponent } from './notifications-board.component';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { cold } from 'jasmine-marbles';
+import uniqueId from 'lodash/uniqueId';
+
+import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { AppState } from '../../../app.reducer';
-import { NotificationComponent } from '../notification/notification.component';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { Notification } from '../models/notification.model';
 import { NotificationType } from '../models/notification-type';
-import { uniqueId } from 'lodash';
-import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { cold } from 'jasmine-marbles';
+import { NotificationComponent } from '../notification/notification.component';
+import { notificationsReducer } from '../notifications.reducers';
+import { NotificationsService } from '../notifications.service';
+import { NotificationsBoardComponent } from './notifications-board.component';
 
 export const bools = { f: false, t: true };
 
@@ -30,13 +41,13 @@ describe('NotificationsBoardComponent', () => {
         StoreModule.forRoot({ notificationsReducer }, {
           runtimeChecks: {
             strictStateImmutability: false,
-            strictActionImmutability: false
-          }
+            strictActionImmutability: false,
+          },
         })],
       declarations: [NotificationsBoardComponent, NotificationComponent], // declare the test component
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
-        ChangeDetectorRef]
+        ChangeDetectorRef],
     }).compileComponents();  // compile template and css
   }));
 
@@ -45,7 +56,7 @@ describe('NotificationsBoardComponent', () => {
       .subscribe((state) => {
         const notifications = [
           new Notification(uniqueId(), NotificationType.Success, 'title1', 'content1'),
-          new Notification(uniqueId(), NotificationType.Info, 'title2', 'content2')
+          new Notification(uniqueId(), NotificationType.Info, 'title2', 'content2'),
         ];
         state.notifications = notifications;
       });
@@ -58,7 +69,7 @@ describe('NotificationsBoardComponent', () => {
       maxStack: 5,
       timeOut: 5000,
       clickToClose: true,
-      animate: 'scale'
+      animate: 'scale',
     } as INotificationBoardOptions;
 
     fixture.detectChanges();
@@ -99,10 +110,10 @@ describe('NotificationsBoardComponent', () => {
 
     it('should be passed to all notifications', () => {
       fixture.debugElement.queryAll(By.css('ds-notification'))
-                          .map(node => node.componentInstance)
-                          .forEach(notification => {
-                            expect(notification.isPaused$).toEqual(comp.isPaused$);
-                          });
+        .map(node => node.componentInstance)
+        .forEach(notification => {
+          expect(notification.isPaused$).toEqual(comp.isPaused$);
+        });
     });
   });
 
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 f153d1009e..589e1780db 100644
--- a/src/app/shared/notifications/notifications-board/notifications-board.component.ts
+++ b/src/app/shared/notifications/notifications-board/notifications-board.component.ts
@@ -5,26 +5,31 @@ import {
   Input,
   OnDestroy,
   OnInit,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {
+  select,
+  Store,
+} from '@ngrx/store';
+import difference from 'lodash/difference';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
 
-import { select, Store } from '@ngrx/store';
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { difference } from 'lodash';
-
-import { NotificationsService } from '../notifications.service';
+import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
 import { AppState } from '../../../app.reducer';
-import { notificationsStateSelector } from '../selectors';
 import { INotification } from '../models/notification.model';
 import { NotificationsState } from '../notifications.reducers';
-import { INotificationBoardOptions } from '../../../../config/notifications-config.interfaces';
+import { NotificationsService } from '../notifications.service';
+import { notificationsStateSelector } from '../selectors';
 
 @Component({
   selector: 'ds-notifications-board',
   encapsulation: ViewEncapsulation.None,
   templateUrl: './notifications-board.component.html',
   styleUrls: ['./notifications-board.component.scss'],
-  changeDetection: ChangeDetectionStrategy.OnPush
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NotificationsBoardComponent implements OnInit, OnDestroy {
 
diff --git a/src/app/shared/notifications/notifications.actions.ts b/src/app/shared/notifications/notifications.actions.ts
index bf47ee3ad7..1fa1fab9c7 100644
--- a/src/app/shared/notifications/notifications.actions.ts
+++ b/src/app/shared/notifications/notifications.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
 import { INotification } from './models/notification.model';
 
diff --git a/src/app/shared/notifications/notifications.effects.ts b/src/app/shared/notifications/notifications.effects.ts
index 20f2b618cb..c9449af24a 100644
--- a/src/app/shared/notifications/notifications.effects.ts
+++ b/src/app/shared/notifications/notifications.effects.ts
@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 import { Actions } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
+
 import { AppState } from '../../app.reducer';
 
 @Injectable()
@@ -10,7 +11,7 @@ export class NotificationsEffects {
    * Authenticate user.
    * @method authenticate
    */
- /* @Effect()
+  /* @Effect()
   public timer: Observable<Action> = this.actions$
     .pipe(ofType(NotificationsActionTypes.NEW_NOTIFICATION_WITH_TIMER),
     // .debounceTime((action: any) => action.payload.options.timeOut)
diff --git a/src/app/shared/notifications/notifications.reducers.spec.ts b/src/app/shared/notifications/notifications.reducers.spec.ts
index b834797115..7bfebf2a65 100644
--- a/src/app/shared/notifications/notifications.reducers.spec.ts
+++ b/src/app/shared/notifications/notifications.reducers.spec.ts
@@ -1,17 +1,22 @@
-import { notificationsReducer } from './notifications.reducers';
-import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
-import { NotificationsService } from './notifications.service';
-import { fakeAsync, flush, inject, TestBed, tick } from '@angular/core/testing';
-import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
-import { StoreModule } from '@ngrx/store';
-import { NotificationComponent } from './notification/notification.component';
-import { NotificationOptions } from './models/notification-options.model';
-import { NotificationAnimationsType } from './models/notification-animations-type';
-import { NotificationType } from './models/notification-type';
-import { Notification } from './models/notification.model';
-import { uniqueId } from 'lodash';
 import { ChangeDetectorRef } from '@angular/core';
+import { TestBed } from '@angular/core/testing';
+import { StoreModule } from '@ngrx/store';
+import uniqueId from 'lodash/uniqueId';
+
 import { storeModuleConfig } from '../../app.reducer';
+import { Notification } from './models/notification.model';
+import { NotificationAnimationsType } from './models/notification-animations-type';
+import { NotificationOptions } from './models/notification-options.model';
+import { NotificationType } from './models/notification-type';
+import { NotificationComponent } from './notification/notification.component';
+import {
+  NewNotificationAction,
+  RemoveAllNotificationsAction,
+  RemoveNotificationAction,
+} from './notifications.actions';
+import { notificationsReducer } from './notifications.reducers';
+import { NotificationsService } from './notifications.service';
+import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
 
 describe('Notifications reducer', () => {
 
@@ -31,7 +36,7 @@ describe('Notifications reducer', () => {
       ],
       imports: [
         StoreModule.forRoot({ notificationsReducer }, storeModuleConfig),
-      ]
+      ],
     });
 
     options = new NotificationOptions(
@@ -106,38 +111,4 @@ describe('Notifications reducer', () => {
     expect(state3.length).toEqual(0);
   });
 
-  it('should create 2 notifications and check they close after different timeout', fakeAsync(() => {
-    inject([ChangeDetectorRef], (cdr: ChangeDetectorRef) => {
-      const optionsWithTimeout = new NotificationOptions(
-        1000,
-        true,
-        NotificationAnimationsType.Rotate);
-      // Timeout 1000ms
-      const notification = new Notification(uniqueId(), NotificationType.Success, 'title', 'content', optionsWithTimeout, null);
-      const state = notificationsReducer(undefined, new NewNotificationAction(notification));
-      expect(state.length).toEqual(1);
-
-      // Timeout default 5000ms
-      const notificationBis = new Notification(uniqueId(), NotificationType.Success, 'title', 'content');
-      const stateBis = notificationsReducer(state, new NewNotificationAction(notification));
-      expect(stateBis.length).toEqual(2);
-
-      tick(1000);
-      cdr.detectChanges();
-
-      const action = new NewNotificationAction(notification);
-      action.type = 'NothingToDo, return only the state';
-
-      const lastState = notificationsReducer(stateBis, action);
-      expect(lastState.length).toEqual(1);
-
-      flush();
-      cdr.detectChanges();
-
-      const finalState = notificationsReducer(lastState, action);
-      expect(finalState.length).toEqual(0);
-    });
-
-  }));
-
 });
diff --git a/src/app/shared/notifications/notifications.reducers.ts b/src/app/shared/notifications/notifications.reducers.ts
index f64cd891eb..02a41023eb 100644
--- a/src/app/shared/notifications/notifications.reducers.ts
+++ b/src/app/shared/notifications/notifications.reducers.ts
@@ -1,5 +1,9 @@
-import { NotificationsActions, NotificationsActionTypes, RemoveNotificationAction } from './notifications.actions';
 import { INotification } from './models/notification.model';
+import {
+  NotificationsActions,
+  NotificationsActionTypes,
+  RemoveNotificationAction,
+} from './notifications.actions';
 
 /**
  * The notification state.
diff --git a/src/app/shared/notifications/notifications.service.spec.ts b/src/app/shared/notifications/notifications.service.spec.ts
index 92c74e0017..fb7c9e4f5a 100644
--- a/src/app/shared/notifications/notifications.service.spec.ts
+++ b/src/app/shared/notifications/notifications.service.spec.ts
@@ -1,21 +1,36 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NotificationsService } from './notifications.service';
-import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
-import { NotificationComponent } from './notification/notification.component';
-import { Store, StoreModule } from '@ngrx/store';
-import { notificationsReducer } from './notifications.reducers';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
+
+import { storeModuleConfig } from '../../app.reducer';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { Notification } from './models/notification.model';
 import { NotificationType } from './models/notification-type';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { storeModuleConfig } from '../../app.reducer';
+import { NotificationComponent } from './notification/notification.component';
+import {
+  NewNotificationAction,
+  RemoveAllNotificationsAction,
+  RemoveNotificationAction,
+} from './notifications.actions';
+import { notificationsReducer } from './notifications.reducers';
+import { NotificationsService } from './notifications.service';
+import { NotificationsBoardComponent } from './notifications-board/notifications-board.component';
 
 describe('NotificationsService test', () => {
   const store: Store<Notification> = jasmine.createSpyObj('store', {
     dispatch: {},
-    select: observableOf(true)
+    select: observableOf(true),
   });
   let service: NotificationsService;
 
@@ -26,16 +41,16 @@ describe('NotificationsService test', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [NotificationComponent, NotificationsBoardComponent],
       providers: [
         { provide: Store, useValue: store },
         NotificationsService,
-        TranslateService
-      ]
+        TranslateService,
+      ],
     });
 
     service = TestBed.inject(NotificationsService);
diff --git a/src/app/shared/notifications/notifications.service.ts b/src/app/shared/notifications/notifications.service.ts
index 98272d4f43..a2498a61e9 100644
--- a/src/app/shared/notifications/notifications.service.ts
+++ b/src/app/shared/notifications/notifications.service.ts
@@ -1,17 +1,22 @@
 import { Injectable } from '@angular/core';
-
-import { of as observableOf } from 'rxjs';
-import { first } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { uniqueId } from 'lodash';
+import uniqueId from 'lodash/uniqueId';
+import { of as observableOf } from 'rxjs';
+import { first } from 'rxjs/operators';
 
-import { INotification, Notification } from './models/notification.model';
-import { NotificationType } from './models/notification-type';
-import { NotificationOptions } from './models/notification-options.model';
-
-import { NewNotificationAction, RemoveAllNotificationsAction, RemoveNotificationAction } from './notifications.actions';
 import { environment } from '../../../environments/environment';
+import {
+  INotification,
+  Notification,
+} from './models/notification.model';
+import { NotificationOptions } from './models/notification-options.model';
+import { NotificationType } from './models/notification-type';
+import {
+  NewNotificationAction,
+  RemoveAllNotificationsAction,
+  RemoveNotificationAction,
+} from './notifications.actions';
 
 @Injectable()
 export class NotificationsService {
@@ -21,15 +26,14 @@ export class NotificationsService {
   }
 
   private add(notification: Notification) {
-    let notificationAction;
-    notificationAction = new NewNotificationAction(notification);
+    const notificationAction = new NewNotificationAction(notification);
     this.store.dispatch(notificationAction);
   }
 
   success(title: any = observableOf(''),
-          content: any = observableOf(''),
-          options: Partial<NotificationOptions> = {},
-          html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: Partial<NotificationOptions> = {},
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Success, title, content, notificationOptions, html);
     this.add(notification);
@@ -37,9 +41,9 @@ export class NotificationsService {
   }
 
   error(title: any = observableOf(''),
-        content: any = observableOf(''),
-        options: Partial<NotificationOptions> = {},
-        html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: Partial<NotificationOptions> = {},
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Error, title, content, notificationOptions, html);
     this.add(notification);
@@ -47,9 +51,9 @@ export class NotificationsService {
   }
 
   info(title: any = observableOf(''),
-       content: any = observableOf(''),
-       options: Partial<NotificationOptions> = {},
-       html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: Partial<NotificationOptions> = {},
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Info, title, content, notificationOptions, html);
     this.add(notification);
@@ -57,9 +61,9 @@ export class NotificationsService {
   }
 
   warning(title: any = observableOf(''),
-          content: any = observableOf(''),
-          options: NotificationOptions = this.getDefaultOptions(),
-          html: boolean = false): INotification {
+    content: any = observableOf(''),
+    options: NotificationOptions = this.getDefaultOptions(),
+    html: boolean = false): INotification {
     const notificationOptions = { ...this.getDefaultOptions(), ...options };
     const notification = new Notification(uniqueId(), NotificationType.Warning, title, content, notificationOptions, html);
     this.add(notification);
@@ -67,11 +71,11 @@ export class NotificationsService {
   }
 
   notificationWithAnchor(notificationType: NotificationType,
-                         options: NotificationOptions,
-                         href: string,
-                         hrefTranslateLabel: string,
-                         messageTranslateLabel: string,
-                         interpolateParam: string) {
+    options: NotificationOptions,
+    href: string,
+    hrefTranslateLabel: string,
+    messageTranslateLabel: string,
+    interpolateParam: string) {
     this.translate.get(hrefTranslateLabel)
       .pipe(first())
       .subscribe((hrefMsg) => {
@@ -115,7 +119,7 @@ export class NotificationsService {
     return new NotificationOptions(
       environment.notifications.timeOut,
       environment.notifications.clickToClose,
-      environment.notifications.animate
+      environment.notifications.animate,
     );
   }
 }
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 3dafba8298..179a70bfd7 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -8,6 +8,7 @@
                 [context]="context"
                 [hidePaginationDetail]="hidePaginationDetail"
                 [showPaginator]="showPaginator"
+                [showThumbnails]="showThumbnails"
                 (paginationChange)="onPaginationChange($event)"
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"
@@ -34,6 +35,7 @@
                 [context]="context"
                 [hidePaginationDetail]="hidePaginationDetail"
                 [showPaginator]="showPaginator"
+                [showThumbnails]="showThumbnails"
                 (paginationChange)="onPaginationChange($event)"
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"
@@ -50,8 +52,25 @@
                   [context]="context"
                   [hidePaginationDetail]="hidePaginationDetail"
                   [showPaginator]="showPaginator"
+                  [showThumbnails]="showThumbnails"
                   (contentChange)="contentChange.emit($event)"
                   *ngIf="(currentMode$ | async) === viewModeEnum.DetailedListElement">
 </ds-object-detail>
 
 
+<ds-object-table  [config]="config"
+                  [sortConfig]="sortConfig"
+                  [objects]="objects"
+                  [hideGear]="hideGear"
+                  [linkType]="linkType"
+                  [context]="context"
+                  [hidePaginationDetail]="hidePaginationDetail"
+                  [showPaginator]="showPaginator"
+                  [showThumbnails]="showThumbnails"
+                  (paginationChange)="onPaginationChange($event)"
+                  (pageChange)="onPageChange($event)"
+                  (pageSizeChange)="onPageSizeChange($event)"
+                  (sortDirectionChange)="onSortDirectionChange($event)"
+                  (sortFieldChange)="onSortFieldChange($event)"
+                  *ngIf="(currentMode$ | async) === viewModeEnum.Table">
+</ds-object-table>
diff --git a/src/app/shared/object-collection/object-collection.component.spec.ts b/src/app/shared/object-collection/object-collection.component.spec.ts
index c28df74aa7..a5fda69061 100644
--- a/src/app/shared/object-collection/object-collection.component.spec.ts
+++ b/src/app/shared/object-collection/object-collection.component.spec.ts
@@ -1,11 +1,19 @@
-import { ObjectCollectionComponent } from './object-collection.component';
-import { By } from '@angular/platform-browser';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { of as observableOf } from 'rxjs';
-import { RouterStub } from '../testing/router.stub';
+
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { RouterStub } from '../testing/router.stub';
+import { ObjectCollectionComponent } from './object-collection.component';
 
 describe('ObjectCollectionComponent', () => {
   let fixture: ComponentFixture<ObjectCollectionComponent>;
@@ -16,41 +24,48 @@ describe('ObjectCollectionComponent', () => {
   const activatedRouteStub = {
     queryParams: observableOf({
       query: queryParam,
-      scope: scopeParam
-    })
+      scope: scopeParam,
+    }),
   };
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       declarations: [ObjectCollectionComponent],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
-        { provide: Router, useClass: RouterStub }
+        { provide: Router, useClass: RouterStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();  // compile template and css
   }));
 
-  beforeEach(waitForAsync(() => {
+  beforeEach(() => {
     fixture = TestBed.createComponent(ObjectCollectionComponent);
     objectCollectionComponent = fixture.componentInstance;
-  }));
+    fixture.detectChanges();
+  });
 
   it('should only show the grid component when the viewmode is set to grid', () => {
     objectCollectionComponent.currentMode$ = observableOf(ViewMode.GridElement);
+    fixture.detectChanges();
 
-    expect(fixture.debugElement.query(By.css('ds-object-grid'))).toBeDefined();
-    expect(fixture.debugElement.query(By.css('ds-object-list'))).toBeNull();
+    expect(fixture.debugElement.query(By.css('ds-object-grid'))).not.toBeNull();
+    expect(fixture.debugElement.query(By.css('ds-themed-object-list'))).toBeNull();
   });
 
   it('should only show the list component when the viewmode is set to list', () => {
     objectCollectionComponent.currentMode$ = observableOf(ViewMode.ListElement);
+    fixture.detectChanges();
 
-    expect(fixture.debugElement.query(By.css('ds-object-list'))).toBeDefined();
+    expect(fixture.debugElement.query(By.css('ds-themed-object-list'))).not.toBeNull();
     expect(fixture.debugElement.query(By.css('ds-object-grid'))).toBeNull();
   });
-  it('should set fallback placeholder font size during test', () => {
-    objectCollectionComponent.currentMode$ = observableOf(ViewMode.ListElement);
-    expect(fixture.debugElement.query(By.css('thumb-font-3'))).toBeDefined();
 
+  it('should set fallback placeholder font size during test', async () => {
+    objectCollectionComponent.currentMode$ = observableOf(ViewMode.ListElement);
+    fixture.detectChanges();
+
+    const comp = fixture.debugElement.query(By.css('ds-themed-object-list'));
+    expect(comp).not.toBeNull();
+    expect(comp.nativeElement.classList).not.toContain('hide-placeholder-text');
   });
 });
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 369192c488..e957431c70 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -1,28 +1,39 @@
+import { isPlatformBrowser } from '@angular/common';
 import {
   ChangeDetectorRef,
-  Component, ElementRef,
-  EventEmitter, Inject,
+  Component,
+  ElementRef,
+  EventEmitter,
+  Inject,
   Input,
   OnInit,
-  Output, PLATFORM_ID,
+  Output,
+  PLATFORM_ID,
 } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
 
-import { RemoteData } from '../../core/data/remote-data';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { ListableObject } from './shared/listable-object.model';
-import { isEmpty } from '../empty.util';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { CollectionElementLinkType } from './collection-element-link.type';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
 import { Context } from '../../core/shared/context.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { isEmpty } from '../empty.util';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { setPlaceHolderAttributes } from '../utils/object-list-utils';
-import { isPlatformBrowser } from '@angular/common';
+import { CollectionElementLinkType } from './collection-element-link.type';
+import { ListableObject } from './shared/listable-object.model';
 
 /**
  * Component that can render a list of listable objects in different view modes
@@ -107,6 +118,11 @@ export class ObjectCollectionComponent implements OnInit {
    */
   @Input() showPaginator = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * the page info of the list
    */
@@ -184,7 +200,7 @@ export class ObjectCollectionComponent implements OnInit {
     private route: ActivatedRoute,
     private router: Router,
     private elementRef: ElementRef,
-    @Inject(PLATFORM_ID) private platformId: Object) {
+    @Inject(PLATFORM_ID) private platformId: any) {
   }
 
   ngOnInit(): void {
@@ -192,7 +208,7 @@ export class ObjectCollectionComponent implements OnInit {
       .queryParams
       .pipe(
         map((params) => isEmpty(params?.view) ? ViewMode.ListElement : params.view),
-        distinctUntilChanged()
+        distinctUntilChanged(),
       );
     if (isPlatformBrowser(this.platformId)) {
       const width = this.elementRef.nativeElement.offsetWidth;
@@ -243,14 +259,14 @@ export class ObjectCollectionComponent implements OnInit {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
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
new file mode 100644
index 0000000000..5b20860684
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
@@ -0,0 +1,5 @@
+<ng-container *ngIf="showAccessStatus">
+  <span *ngIf="accessStatus$ | async as accessStatus">
+    <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-list/access-status-badge/access-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts
similarity index 88%
rename from src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
rename to src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts
index 9101df2f4c..90b2f373a0 100644
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.spec.ts
@@ -1,15 +1,20 @@
-import { Item } from '../../../core/shared/item.model';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../utils/truncate.pipe';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { AccessStatusBadgeComponent } from './access-status-badge.component';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { AccessStatusObject } from './access-status.model';
+import { TranslateModule } from '@ngx-translate/core';
 import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
 import { environment } from 'src/environments/environment';
 
+import { Item } from '../../../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { AccessStatusObject } from './access-status.model';
+import { AccessStatusBadgeComponent } from './access-status-badge.component';
+
 describe('ItemAccessStatusBadgeComponent', () => {
   let component: AccessStatusBadgeComponent;
   let fixture: ComponentFixture<AccessStatusBadgeComponent>;
@@ -26,31 +31,32 @@ describe('ItemAccessStatusBadgeComponent', () => {
 
   function init() {
     unknownStatus = Object.assign(new AccessStatusObject(), {
-      status: 'unknown'
+      status: 'unknown',
     });
 
     metadataOnlyStatus = Object.assign(new AccessStatusObject(), {
-      status: 'metadata.only'
+      status: 'metadata.only',
     });
 
     openAccessStatus = Object.assign(new AccessStatusObject(), {
-      status: 'open.access'
+      status: 'open.access',
     });
 
     embargoStatus = Object.assign(new AccessStatusObject(), {
-      status: 'embargo'
+      status: 'embargo',
     });
 
     restrictedStatus = Object.assign(new AccessStatusObject(), {
-      status: 'restricted'
+      status: 'restricted',
     });
 
     accessStatusDataService = jasmine.createSpyObj('accessStatusDataService', {
-      findAccessStatusFor: createSuccessfulRemoteDataObject$(unknownStatus)
+      findAccessStatusFor: createSuccessfulRemoteDataObject$(unknownStatus),
     });
 
     item = Object.assign(new Item(), {
-      uuid: 'item-uuid'
+      uuid: 'item-uuid',
+      type: 'item',
     });
   }
 
@@ -60,8 +66,8 @@ describe('ItemAccessStatusBadgeComponent', () => {
       declarations: [AccessStatusBadgeComponent, TruncatePipe],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
-        {provide: AccessStatusDataService, useValue: accessStatusDataService}
-      ]
+        { provide: AccessStatusDataService, useValue: accessStatusDataService },
+      ],
     }).compileComponents();
   }
 
@@ -69,7 +75,7 @@ describe('ItemAccessStatusBadgeComponent', () => {
     environment.item.showAccessStatuses = true;
     fixture = TestBed.createComponent(AccessStatusBadgeComponent);
     component = fixture.componentInstance;
-    component.item = item;
+    component.object = item;
     fixture.detectChanges();
     environment.item.showAccessStatuses = false;
   }
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
new file mode 100644
index 0000000000..e76ab1eaa8
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -0,0 +1,96 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+} from 'rxjs/operators';
+import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
+import { environment } from 'src/environments/environment';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ITEM } from '../../../../../core/shared/item.resource-type';
+import { hasValue } from '../../../../empty.util';
+import { AccessStatusObject } from './access-status.model';
+
+@Component({
+  selector: 'ds-access-status-badge',
+  templateUrl: './access-status-badge.component.html',
+  styleUrls: ['./access-status-badge.component.scss'],
+})
+/**
+ * Component rendering the access status of an item as a badge
+ */
+export class AccessStatusBadgeComponent {
+
+  @Input() object: DSpaceObject;
+  accessStatus$: Observable<string>;
+
+  /**
+   * Whether to show the access status badge or not
+   */
+  showAccessStatus: boolean;
+
+  /**
+   * Value based stylesheet class for access status badge
+   */
+  accessStatusClass: string;
+
+  /**
+   * List of subscriptions
+   */
+  subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {AccessStatusDataService} accessStatusDataService
+   */
+  constructor(private accessStatusDataService: AccessStatusDataService) { }
+
+  ngOnInit(): void {
+    this.showAccessStatus = environment.item.showAccessStatuses;
+    if (this.object.type.toString() !== ITEM.value || !this.showAccessStatus || this.object == null) {
+      // Do not show the badge if the feature is inactive or if the item is null.
+      return;
+    }
+
+    const item = this.object as Item;
+    if (item.accessStatus == null) {
+      // In case the access status has not been loaded, do it individually.
+      item.accessStatus = this.accessStatusDataService.findAccessStatusFor(item);
+    }
+    this.accessStatus$ = item.accessStatus.pipe(
+      map((accessStatusRD) => {
+        if (accessStatusRD.statusCode !== 401 && hasValue(accessStatusRD.payload)) {
+          return accessStatusRD.payload;
+        } else {
+          return [];
+        }
+      }),
+      map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
+      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-list/access-status-badge/access-status.model.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts
similarity index 86%
rename from src/app/shared/object-list/access-status-badge/access-status.model.ts
rename to src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts
index 69b5e920d0..aee3967d0f 100644
--- a/src/app/shared/object-list/access-status-badge/access-status.model.ts
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.model.ts
@@ -1,9 +1,13 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
 import { typedObject } from 'src/app/core/cache/builders/build-decorators';
 import { CacheableObject } from 'src/app/core/cache/cacheable-object.model';
 import { HALLink } from 'src/app/core/shared/hal-link.model';
 import { ResourceType } from 'src/app/core/shared/resource-type';
 import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
+
 import { ACCESS_STATUS } from './access-status.resource-type';
 
 @typedObject
@@ -15,19 +19,19 @@ export class AccessStatusObject implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The access status value
    */
   @autoserialize
-  status: string;
+    status: string;
 
   /**
    * The {@link HALLink}s for this AccessStatusObject
    */
    @deserialize
-   _links: {
+     _links: {
      self: HALLink;
    };
 }
diff --git a/src/app/shared/object-list/access-status-badge/access-status.resource-type.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type.ts
similarity index 100%
rename from src/app/shared/object-list/access-status-badge/access-status.resource-type.ts
rename to src/app/shared/object-collection/shared/badges/access-status-badge/access-status.resource-type.ts
diff --git a/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts
new file mode 100644
index 0000000000..c44ca18b13
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/access-status-badge/themed-access-status-badge.component.ts
@@ -0,0 +1,34 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../../../theme-support/themed.component';
+import { AccessStatusBadgeComponent } from './access-status-badge.component';
+
+/**
+ * Themed wrapper for AccessStatusBadgeComponent
+ */
+@Component({
+  selector: 'ds-themed-access-status-badge',
+  styleUrls: [],
+  templateUrl: '../../../../theme-support/themed.component.html',
+})
+export class ThemedAccessStatusBadgeComponent extends ThemedComponent<AccessStatusBadgeComponent> {
+  @Input() object: DSpaceObject;
+
+  protected inAndOutputNames: (keyof AccessStatusBadgeComponent & keyof this)[] = ['object'];
+
+  protected getComponentName(): string {
+    return 'AccessStatusBadgeComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./access-status-badge.component`);
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.html b/src/app/shared/object-collection/shared/badges/badges.component.html
new file mode 100644
index 0000000000..7fc08751aa
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/badges.component.html
@@ -0,0 +1,10 @@
+<ds-themed-status-badge [object]="object"></ds-themed-status-badge>
+<ng-container *ngIf="isMyDSpaceStatus">
+    <ds-themed-my-dspace-status-badge [context]="context"></ds-themed-my-dspace-status-badge>
+</ng-container>
+<div>
+    <ds-themed-type-badge class="pr-1" [object]="object"></ds-themed-type-badge>
+    <ng-container *ngIf="showAccessStatus">
+        <ds-themed-access-status-badge [object]="object"></ds-themed-access-status-badge>
+    </ng-container>
+</div>
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.scss b/src/app/shared/object-collection/shared/badges/badges.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.spec.ts b/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
new file mode 100644
index 0000000000..4f212f7f57
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/badges.component.spec.ts
@@ -0,0 +1,33 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+
+import { getMockThemeService } from '../../../mocks/theme-service.mock';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { BadgesComponent } from './badges.component';
+
+describe('BadgesComponent', () => {
+  let component: BadgesComponent;
+  let fixture: ComponentFixture<BadgesComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ BadgesComponent ],
+      providers: [{ provide: ThemeService, useValue: getMockThemeService() }],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BadgesComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/object-collection/shared/badges/badges.component.ts b/src/app/shared/object-collection/shared/badges/badges.component.ts
new file mode 100644
index 0000000000..a0d8326276
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/badges.component.ts
@@ -0,0 +1,51 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+
+/**
+ * List of MyDSpace Status Contexts
+ */
+const MY_DSPACE_STATUS_CONTEXTS = [
+  Context.MyDSpaceArchived,
+  Context.MyDSpaceWorkspace,
+  Context.MyDSpaceWorkflow,
+  Context.MyDSpaceDeclined,
+  Context.MyDSpaceApproved,
+  Context.MyDSpaceWaitingController,
+  Context.MyDSpaceValidation,
+];
+
+/**
+ * Component that renders all the badges for a listable object
+ */
+@Component({
+  selector: 'ds-badges',
+  templateUrl: './badges.component.html',
+  styleUrls: ['./badges.component.scss'],
+})
+export class BadgesComponent {
+  /**
+   * The DSpaceObject to render the badge for
+   */
+  @Input() object: DSpaceObject;
+  /**
+   * The context that the badge is rendered in
+   */
+  @Input() context?: Context;
+
+  /**
+   * Whether or not to show the access status
+   */
+  @Input() showAccessStatus = false;
+
+  /**
+   * Returns whether or not this context is a MyDSpace status context
+   */
+  get isMyDSpaceStatus(): boolean {
+    return MY_DSPACE_STATUS_CONTEXTS.includes(this.context);
+  }
+}
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type.ts
similarity index 87%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type.ts
index 5cf4d91b20..ec101f1ee7 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status-type.ts
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-item-status-type.ts
@@ -6,4 +6,5 @@ export enum MyDspaceItemStatusType {
   ARCHIVED = 'mydspace.status.archived',
   DECLINED = 'mydspace.status.declined',
   APPROVED = 'mydspace.status.approved',
+  DECLINED_TASk = 'mydspace.status.declined-task',
 }
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.html b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
similarity index 50%
rename from src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.html
rename to src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
index 848dd502a4..4cf93cbd1d 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.html
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
@@ -1,5 +1,5 @@
 <div>
   <span [className]="badgeClass">
-    {{badgeContent | translate}}
+    {{('mydspace.status.' + badgeContent) | translate}}
   </span>
 </div>
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
new file mode 100644
index 0000000000..276b0e9fe3
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.spec.ts
@@ -0,0 +1,97 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { Context } from '../../../../../core/shared/context.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { PoolTask } from '../../../../../core/tasks/models/pool-task-object.model';
+import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { EPersonMock } from '../../../../testing/eperson.mock';
+import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component';
+
+let component: MyDSpaceStatusBadgeComponent;
+let fixture: ComponentFixture<MyDSpaceStatusBadgeComponent>;
+
+let mockResultObject: PoolTask;
+
+const rdSumbitter = createSuccessfulRemoteDataObject(EPersonMock);
+const workflowitem = Object.assign(new WorkflowItem(), { submitter: observableOf(rdSumbitter) });
+const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
+mockResultObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
+
+describe('MyDSpaceItemStatusComponent', () => {
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      declarations: [MyDSpaceStatusBadgeComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(MyDSpaceStatusBadgeComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(MyDSpaceStatusBadgeComponent);
+    component = fixture.componentInstance;
+  });
+
+  it('should display badge', () => {
+    const badge = fixture.debugElement.query(By.css('span'));
+    expect(badge).not.toBeNull();
+  });
+
+  it('should init badge content and class', () => {
+    component.context = Context.MyDSpaceValidation;
+    fixture.detectChanges();
+    expect(component.badgeContent).toBe(Context.MyDSpaceValidation);
+    expect(component.badgeClass).toBe('text-light badge badge-validation');
+  });
+
+  it('should init badge content and class', () => {
+    component.context = Context.MyDSpaceWaitingController;
+    fixture.detectChanges();
+    expect(component.badgeContent).toBe(Context.MyDSpaceWaitingController);
+    expect(component.badgeClass).toBe('text-light badge badge-waiting-controller');
+  });
+
+  it('should init badge content and class', () => {
+    component.context = Context.MyDSpaceWorkspace;
+    fixture.detectChanges();
+    expect(component.badgeContent).toBe(Context.MyDSpaceWorkspace);
+    expect(component.badgeClass).toBe('text-light badge badge-workspace');
+  });
+
+  it('should init badge content and class', () => {
+    component.context = Context.MyDSpaceArchived;
+    fixture.detectChanges();
+    expect(component.badgeContent).toBe(Context.MyDSpaceArchived);
+    expect(component.badgeClass).toBe('text-light badge badge-archived');
+  });
+
+  it('should init badge content and class', () => {
+    component.context = Context.MyDSpaceWorkflow;
+    fixture.detectChanges();
+    expect(component.badgeContent).toBe(Context.MyDSpaceWorkflow);
+    expect(component.badgeClass).toBe('text-light badge badge-workflow');
+  });
+});
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
new file mode 100644
index 0000000000..5996deaba6
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
@@ -0,0 +1,58 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+
+/**
+ * This component represents a badge with mydspace item status
+ */
+@Component({
+  selector: 'ds-my-dspace-status-badge',
+  styleUrls: ['./my-dspace-status-badge.component.scss'],
+  templateUrl: './my-dspace-status-badge.component.html',
+})
+export class MyDSpaceStatusBadgeComponent implements OnInit {
+
+  /**
+   * This mydspace item context
+   */
+  @Input() context: Context;
+
+  /**
+   * This badge class
+   */
+  public badgeClass: string;
+
+  /**
+   * This badge content
+   */
+  public badgeContent: string;
+
+  /**
+   * Initialize badge content and class
+   */
+  ngOnInit() {
+    this.badgeContent = this.context;
+    this.badgeClass = 'text-light badge ';
+    switch (this.context) {
+      case Context.MyDSpaceValidation:
+        this.badgeClass += 'badge-validation';
+        break;
+      case Context.MyDSpaceWaitingController:
+        this.badgeClass += 'badge-waiting-controller';
+        break;
+      case Context.MyDSpaceWorkspace:
+        this.badgeClass += 'badge-workspace';
+        break;
+      case Context.MyDSpaceArchived:
+        this.badgeClass += 'badge-archived';
+        break;
+      case Context.MyDSpaceWorkflow:
+        this.badgeClass += 'badge-workflow';
+        break;
+    }
+  }
+
+}
diff --git a/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
new file mode 100644
index 0000000000..5589645505
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component.ts
@@ -0,0 +1,34 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { ThemedComponent } from '../../../../theme-support/themed.component';
+import { MyDSpaceStatusBadgeComponent } from './my-dspace-status-badge.component';
+
+/**
+ * Themed wrapper for MyDSpaceStatusBadge
+ */
+@Component({
+  selector: 'ds-themed-my-dspace-status-badge',
+  styleUrls: [],
+  templateUrl: '../../../../theme-support/themed.component.html',
+})
+export class ThemedMyDSpaceStatusBadgeComponent extends ThemedComponent<MyDSpaceStatusBadgeComponent> {
+  @Input() context: Context;
+
+  protected inAndOutputNames: (keyof MyDSpaceStatusBadgeComponent & keyof this)[] = ['context'];
+
+  protected getComponentName(): string {
+    return 'MyDSpaceStatusBadgeComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./my-dspace-status-badge.component`);
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
new file mode 100644
index 0000000000..c864f22afa
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
@@ -0,0 +1,6 @@
+<div *ngIf="privateBadge" class="private-badge">
+    <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
+</div>
+<div *ngIf="withdrawnBadge" class="withdrawn-badge">
+    <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
+</div>
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
new file mode 100644
index 0000000000..f5de762353
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.spec.ts
@@ -0,0 +1,99 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { StatusBadgeComponent } from './status-badge.component';
+
+let comp: StatusBadgeComponent;
+let fixture: ComponentFixture<StatusBadgeComponent>;
+
+let withdrawnItem = Object.assign(new Item(), { isWithdrawn: true });
+let notWithdrawnItem = Object.assign(new Item(), { isWithdrawn: false });
+let privateItem = Object.assign(new Item(), { isDiscoverable: false });
+let notPrivateItem = Object.assign(new Item(), { isDiscoverable: true });
+
+describe('ItemStatusBadgeComponent', () => {
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [StatusBadgeComponent, TruncatePipe],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(StatusBadgeComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+    init();
+  }));
+
+  function init() {
+    withdrawnItem = Object.assign(new Item(), { isWithdrawn: true });
+    notWithdrawnItem = Object.assign(new Item(), { isWithdrawn: false });
+    privateItem = Object.assign(new Item(), { isDiscoverable: false });
+    notPrivateItem = Object.assign(new Item(), { isDiscoverable: true });
+  }
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(StatusBadgeComponent);
+    comp = fixture.componentInstance;
+  }));
+
+
+  describe('when the item is not withdrawn', () => {
+    beforeEach(() => {
+      comp.object = notWithdrawnItem;
+      comp.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should not show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is withdrawn', () => {
+    beforeEach(() => {
+      comp.object = withdrawnItem;
+      comp.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should show the withdrawn badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
+      expect(badge).not.toBeNull();
+    });
+  });
+
+  describe('when the item is not private', () => {
+    beforeEach(() => {
+      comp.object = notPrivateItem;
+      comp.ngOnInit();
+      fixture.detectChanges();
+    });
+    it('should not show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).toBeNull();
+    });
+  });
+
+  describe('when the item is private', () => {
+    beforeEach(() => {
+      comp.object = privateItem;
+      comp.ngOnInit();
+      fixture.detectChanges();
+    });
+
+    it('should show the private badge', () => {
+      const badge = fixture.debugElement.query(By.css('div.private-badge'));
+      expect(badge).not.toBeNull();
+    });
+  });
+});
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
new file mode 100644
index 0000000000..5f188f6281
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -0,0 +1,46 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { hasValue } from '../../../../empty.util';
+
+@Component({
+  selector: 'ds-status-badge',
+  templateUrl: './status-badge.component.html',
+})
+/**
+ * Component rendering the status of an item as a badge
+ */
+export class StatusBadgeComponent implements OnInit {
+
+  /**
+   * The component used to retrieve the status from
+   */
+  @Input() object: DSpaceObject;
+
+  /**
+   * Whether or not the "Private" badge should be displayed for this listable object
+   */
+  privateBadge = false;
+
+  /**
+   * Whether or not the "Withdrawn" badge should be displayed for this listable object
+   */
+  withdrawnBadge = false;
+
+  /**
+   * Initialize which badges should be visible
+   */
+  ngOnInit(): void {
+    let objectAsAny = this.object as any;
+    if (hasValue(objectAsAny.indexableObject)) {
+      objectAsAny = objectAsAny.indexableObject;
+    }
+    const objectExists = hasValue(objectAsAny);
+    this.privateBadge = objectExists && hasValue(objectAsAny.isDiscoverable) && !objectAsAny.isDiscoverable;
+    this.withdrawnBadge = objectExists && hasValue(objectAsAny.isWithdrawn) && objectAsAny.isWithdrawn;
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
new file mode 100644
index 0000000000..0c56472618
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/status-badge/themed-status-badge.component.ts
@@ -0,0 +1,34 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../../../theme-support/themed.component';
+import { StatusBadgeComponent } from './status-badge.component';
+
+/**
+ * Themed wrapper for StatusBadgeComponent
+ */
+@Component({
+  selector: 'ds-themed-status-badge',
+  styleUrls: [],
+  templateUrl: '../../../../theme-support/themed.component.html',
+})
+export class ThemedStatusBadgeComponent extends ThemedComponent<StatusBadgeComponent> {
+  @Input() object: DSpaceObject;
+
+  protected inAndOutputNames: (keyof StatusBadgeComponent & keyof this)[] = ['object'];
+
+  protected getComponentName(): string {
+    return 'StatusBadgeComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/status-badge/status-badge.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./status-badge.component`);
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/themed-badges.component.ts b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
new file mode 100644
index 0000000000..c3157318e6
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/themed-badges.component.ts
@@ -0,0 +1,37 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../../theme-support/themed.component';
+import { BadgesComponent } from './badges.component';
+
+/**
+ * Themed wrapper for BadgesComponent
+ */
+@Component({
+  selector: 'ds-themed-badges',
+  styleUrls: [],
+  templateUrl: '../../../theme-support/themed.component.html',
+})
+export class ThemedBadgesComponent extends ThemedComponent<BadgesComponent> {
+  @Input() object: DSpaceObject;
+  @Input() context: Context;
+  @Input() showAccessStatus = false;
+
+  protected inAndOutputNames: (keyof BadgesComponent & keyof this)[] = ['object', 'context', 'showAccessStatus'];
+
+  protected getComponentName(): string {
+    return 'BadgesComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/badges.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./badges.component`);
+  }
+}
diff --git a/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
new file mode 100644
index 0000000000..b5c7263014
--- /dev/null
+++ b/src/app/shared/object-collection/shared/badges/type-badge/themed-type-badge.component.ts
@@ -0,0 +1,34 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import { ThemedComponent } from '../../../../theme-support/themed.component';
+import { TypeBadgeComponent } from './type-badge.component';
+
+/**
+ * Themed wrapper for TypeBadgeComponent
+ */
+@Component({
+  selector: 'ds-themed-type-badge',
+  styleUrls: [],
+  templateUrl: '../../../../theme-support/themed.component.html',
+})
+export class ThemedTypeBadgeComponent extends ThemedComponent<TypeBadgeComponent> {
+  @Input() object: DSpaceObject;
+
+  protected inAndOutputNames: (keyof TypeBadgeComponent & keyof this)[] = ['object'];
+
+  protected getComponentName(): string {
+    return 'TypeBadgeComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../../themes/${themeName}/app/shared/object-collection/shared/badges/type-badge/type-badge.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./type-badge.component`);
+  }
+}
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.html b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
similarity index 66%
rename from src/app/shared/object-list/type-badge/type-badge.component.html
rename to src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
index 0c2bd7544e..119702c375 100644
--- a/src/app/shared/object-list/type-badge/type-badge.component.html
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
@@ -1,3 +1,3 @@
-<div *ngIf="typeMessage">
+<span *ngIf="typeMessage">
   <span class="badge badge-info">{{ typeMessage | translate }}</span>
-</div>
+</span>
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.spec.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
similarity index 78%
rename from src/app/shared/object-list/type-badge/type-badge.component.spec.ts
rename to src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
index 9a7e22c551..ed13384b7f 100644
--- a/src/app/shared/object-list/type-badge/type-badge.component.spec.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.spec.ts
@@ -1,10 +1,18 @@
-import { Item } from '../../../core/shared/item.model';
-import { of as observableOf } from 'rxjs';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { TruncatePipe } from '../../utils/truncate.pipe';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
 import { TypeBadgeComponent } from './type-badge.component';
 
 let comp: TypeBadgeComponent;
@@ -18,10 +26,10 @@ const mockItemWithEntityType = Object.assign(new Item(), {
     'dspace.entity.type': [
       {
         language: 'en_US',
-        value: type
-      }
-    ]
-  }
+        value: type,
+      },
+    ],
+  },
 });
 
 const mockItemWithoutEntityType = Object.assign(new Item(), {
@@ -30,10 +38,10 @@ const mockItemWithoutEntityType = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('ItemTypeBadgeComponent', () => {
@@ -41,9 +49,9 @@ describe('ItemTypeBadgeComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [TypeBadgeComponent, TruncatePipe],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TypeBadgeComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/type-badge/type-badge.component.ts b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
similarity index 76%
rename from src/app/shared/object-list/type-badge/type-badge.component.ts
rename to src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
index 8e843af1e7..4e10267ed1 100644
--- a/src/app/shared/object-list/type-badge/type-badge.component.ts
+++ b/src/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -1,11 +1,18 @@
-import { Component, Input } from '@angular/core';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { hasValue, isEmpty } from '../../empty.util';
-import { getResourceTypeValueFor } from '../../../core/cache/object-cache.reducer';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { getResourceTypeValueFor } from '../../../../../core/cache/object-cache.reducer';
+import { DSpaceObject } from '../../../../../core/shared/dspace-object.model';
+import {
+  hasValue,
+  isEmpty,
+} from '../../../../empty.util';
 
 @Component({
   selector: 'ds-type-badge',
-  templateUrl: './type-badge.component.html'
+  templateUrl: './type-badge.component.html',
 })
 /**
  * Component rendering the type of an item as a badge
diff --git a/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts
index eaf63bf6dd..0afb79a274 100644
--- a/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/claimed-declined-task-search-result.model.ts
@@ -2,7 +2,7 @@ import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.mode
 import { SearchResult } from '../../search/models/search-result.model';
 
 /**
- * Represents a search result object of a Declined ClaimedTask object
+ * Represents a search result object of a Declined/Rejected ClaimedTask object (sent back to the submitter)
  */
 export class ClaimedDeclinedTaskSearchResult extends SearchResult<ClaimedTask> {
 }
diff --git a/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts
new file mode 100644
index 0000000000..dffb3c1313
--- /dev/null
+++ b/src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model.ts
@@ -0,0 +1,8 @@
+import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
+import { SearchResult } from '../../search/models/search-result.model';
+
+/**
+ * Represents a search result object of a Declined ClaimedTask object (sent back to the Review Managers)
+ */
+export class ClaimedDeclinedTaskTaskSearchResult extends SearchResult<ClaimedTask> {
+}
diff --git a/src/app/shared/object-collection/shared/collection-search-result.model.ts b/src/app/shared/object-collection/shared/collection-search-result.model.ts
index 615ef0809c..bd2f547808 100644
--- a/src/app/shared/object-collection/shared/collection-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/collection-search-result.model.ts
@@ -1,5 +1,5 @@
-import { SearchResult } from '../../search/models/search-result.model';
 import { Collection } from '../../../core/shared/collection.model';
+import { SearchResult } from '../../search/models/search-result.model';
 import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Collection)
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts
index f381a02d86..2e169e091b 100644
--- a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts
+++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.ts
@@ -1,9 +1,15 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { ListableObject } from '../listable-object.model';
 
 @Component({
   selector: 'ds-importable-list-item-control',
-  templateUrl: './importable-list-item-control.component.html'
+  templateUrl: './importable-list-item-control.component.html',
 })
 /**
  * Component adding an import button to a list item
diff --git a/src/app/shared/object-collection/shared/item-search-result.model.ts b/src/app/shared/object-collection/shared/item-search-result.model.ts
index 66f3eb1513..5409bdbec7 100644
--- a/src/app/shared/object-collection/shared/item-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/item-search-result.model.ts
@@ -1,9 +1,9 @@
-import { SearchResult } from '../../search/models/search-result.model';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { Item } from '../../../core/shared/item.model';
 import { inheritEquatable } from '../../../core/utilities/equals.decorators';
-import { GenericConstructor } from '../../../core/shared/generic-constructor';
-import { ListableObject } from './listable-object.model';
+import { SearchResult } from '../../search/models/search-result.model';
 import { searchResultFor } from '../../search/search-result-element-decorator';
+import { ListableObject } from './listable-object.model';
 
 @searchResultFor(Item)
 @inheritEquatable(SearchResult)
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html b/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
deleted file mode 100644
index 9ed4e9eaa8..0000000000
--- a/src/app/shared/object-collection/shared/listable-object/listable-object-component-loader.component.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div [ngClass]="{'d-none' : hideBadges}" #badges>
-  <div *ngIf="privateBadge" class="private-badge">
-    <span class="badge badge-danger">{{ "item.badge.private" | translate }}</span>
-  </div>
-  <div *ngIf="withdrawnBadge" class="withdrawn-badge">
-    <span class="badge badge-warning">{{ "item.badge.withdrawn" | translate }}</span>
-  </div>
-</div>
-<ng-template dsListableObject></ng-template>
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 ff88256f6a..929644661b 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,25 +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';
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Item } from '../../../../core/shared/item.model';
 import { provideMockStore } from '@ngrx/store/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { DynamicComponentLoaderDirective } from '../../../abstract-component-loader/dynamic-component-loader.directive';
+import { ItemListElementComponent } from '../../../object-list/item-list-element/item-types/item/item-list-element.component';
 import { ThemeService } from '../../../theme-support/theme.service';
+import { ListableObject } from '../listable-object.model';
+import { ListableObjectComponentLoaderComponent } from './listable-object-component-loader.component';
 
 const testType = 'TestType';
 const testContext = Context.Search;
 const testViewMode = ViewMode.StandalonePage;
 
-class TestType extends ListableObject {
+export class TestType extends ListableObject {
   getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
     return [testType];
   }
@@ -37,17 +44,17 @@ describe('ListableObjectComponentLoaderComponent', () => {
     });
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, ListableObjectDirective],
+      declarations: [ListableObjectComponentLoaderComponent, ItemListElementComponent, DynamicComponentLoaderDirective],
       schemas: [NO_ERRORS_SCHEMA],
       providers: [
         provideMockStore({}),
         { provide: ThemeService, useValue: themeService },
-      ]
+      ],
     }).overrideComponent(ListableObjectComponentLoaderComponent, {
       set: {
         changeDetection: ChangeDetectionStrategy.Default,
-        entryComponents: [ItemListElementComponent]
-      }
+        entryComponents: [ItemListElementComponent],
+      },
     }).compileComponents();
   }));
 
@@ -66,7 +73,7 @@ describe('ListableObjectComponentLoaderComponent', () => {
 
   describe('When the component is rendered', () => {
     it('should call the getListableObjectComponent function with the right types, view mode and context', () => {
-      expect(comp.getComponent).toHaveBeenCalledWith([testType], testViewMode, testContext);
+      expect(comp.getComponent).toHaveBeenCalled();
     });
 
     it('should connectInputsAndOutputs of loaded component', () => {
@@ -74,92 +81,34 @@ describe('ListableObjectComponentLoaderComponent', () => {
     });
   });
 
-  describe('when the object is an item and viewMode is a list', () => {
-    beforeEach(() => {
-      comp.object = Object.assign(new Item());
-      comp.viewMode = ViewMode.ListElement;
-    });
-
-    describe('when the item is not withdrawn', () => {
-      beforeEach(() => {
-        (comp.object as any).isWithdrawn = false;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-
-      it('should not show the withdrawn badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-        expect(badge).toBeNull();
-      });
-    });
-
-    describe('when the item is withdrawn', () => {
-      beforeEach(() => {
-        (comp.object as any).isWithdrawn = true;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-
-      it('should show the withdrawn badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.withdrawn-badge'));
-        expect(badge).not.toBeNull();
-      });
-    });
-
-    describe('when the item is not private', () => {
-      beforeEach(() => {
-        (comp.object as any).isDiscoverable = true;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-      it('should not show the private badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.private-badge'));
-        expect(badge).toBeNull();
-      });
-    });
-
-    describe('when the item is private', () => {
-      beforeEach(() => {
-        (comp.object as any).isDiscoverable = false;
-        comp.initBadges();
-        fixture.detectChanges();
-      });
-
-      it('should show the private badge', () => {
-        const badge = fixture.debugElement.query(By.css('div.private-badge'));
-        expect(badge).not.toBeNull();
-      });
-    });
-  });
-
   describe('When a reloadedObject is emitted', () => {
     let listableComponent;
     let reloadedObject: any;
 
     beforeEach(() => {
-      spyOn((comp as any), 'instantiateComponent').and.returnValue(null);
-      spyOn((comp as any).contentChange, 'emit').and.returnValue(null);
+      spyOn(comp, 'instantiateComponent').and.returnValue(null);
+      spyOn(comp.contentChange, 'emit').and.returnValue(null);
 
       listableComponent = fixture.debugElement.query(By.css('ds-item-list-element')).componentInstance;
       reloadedObject = 'object';
     });
 
     it('should re-instantiate the listable component', fakeAsync(() => {
-      expect((comp as any).instantiateComponent).not.toHaveBeenCalled();
+      expect(comp.instantiateComponent).not.toHaveBeenCalled();
 
-      (listableComponent as any).reloadedObject.emit(reloadedObject);
+      listableComponent.reloadedObject.emit(reloadedObject);
       tick(200);
 
-      expect((comp as any).instantiateComponent).toHaveBeenCalledWith(reloadedObject);
+      expect(comp.instantiateComponent).toHaveBeenCalledWith();
     }));
 
     it('should re-emit it as a contentChange', fakeAsync(() => {
-      expect((comp as any).contentChange.emit).not.toHaveBeenCalled();
+      expect(comp.contentChange.emit).not.toHaveBeenCalled();
 
-      (listableComponent as any).reloadedObject.emit(reloadedObject);
+      listableComponent.reloadedObject.emit(reloadedObject);
       tick(200);
 
-      expect((comp as any).contentChange.emit).toHaveBeenCalledWith(reloadedObject);
+      expect(comp.contentChange.emit).toHaveBeenCalledWith(reloadedObject);
     }));
 
   });
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 6b75c59181..0f3d95e5cd 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
@@ -1,41 +1,32 @@
 import {
   ChangeDetectorRef,
   Component,
-  ComponentRef,
-  ElementRef,
   EventEmitter,
   Input,
-  OnChanges,
-  OnDestroy,
-  OnInit,
   Output,
-  SimpleChanges,
-  ViewChild
 } from '@angular/core';
-
-import { Subscription } from 'rxjs';
 import { take } from 'rxjs/operators';
 
-import { ListableObject } from '../listable-object.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { Context } from '../../../../core/shared/context.model';
-import { getListableObjectComponent } from './listable-object.decorator';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
-import { ListableObjectDirective } from './listable-object.directive';
-import { CollectionElementLinkType } from '../../collection-element-link.type';
-import { hasValue, isNotEmpty } from '../../../empty.util';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { AbstractComponentLoaderComponent } from '../../../abstract-component-loader/abstract-component-loader.component';
 import { ThemeService } from '../../../theme-support/theme.service';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
+import { getListableObjectComponent } from './listable-object.decorator';
 
 @Component({
   selector: 'ds-listable-object-component-loader',
   styleUrls: ['./listable-object-component-loader.component.scss'],
-  templateUrl: './listable-object-component-loader.component.html'
+  templateUrl: '../../../abstract-component-loader/abstract-component-loader.component.html',
 })
 /**
  * Component for determining what component to use depending on the item's entity type (dspace.entity.type)
  */
-export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges, OnDestroy {
+export class ListableObjectComponentLoaderComponent extends AbstractComponentLoaderComponent<Component> {
+
   /**
    * The item or metadata to determine the component for
    */
@@ -71,123 +62,63 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
    */
   @Input() showLabel = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails: boolean;
+
   /**
    * The value to display for this element
    */
   @Input() value: string;
 
-  /**
-   * Whether or not informational badges (e.g. Private, Withdrawn) should be hidden
-   */
-  @Input() hideBadges = false;
-
-  /**
-   * Directive hook used to place the dynamic child component
-   */
-  @ViewChild(ListableObjectDirective, { static: true }) listableObjectDirective: ListableObjectDirective;
-
-  /**
-   * View on the badges template, to be passed on to the loaded component (which will place the badges in the desired
-   * location, or on top if not specified)
-   */
-  @ViewChild('badges', { static: true }) badges: ElementRef;
-
   /**
    * Emit when the listable object has been reloaded.
    */
   @Output() contentChange = new EventEmitter<ListableObject>();
 
-  /**
-   * Whether or not the "Private" badge should be displayed for this listable object
-   */
-  privateBadge = false;
-
-  /**
-   * Whether or not the "Withdrawn" badge should be displayed for this listable object
-   */
-  withdrawnBadge = false;
-
-  /**
-   * Array to track all subscriptions and unsubscribe them onDestroy
-   * @type {Array}
-   */
-  protected subs: Subscription[] = [];
-
-  /**
-   * The reference to the dynamic component
-   */
-  protected compRef: ComponentRef<Component>;
+  protected inputNamesDependentForComponent: (keyof this & string)[] = [
+    'object',
+    'viewMode',
+    'context',
+  ];
 
   /**
    * The list of input and output names for the dynamic component
    */
-  protected inAndOutputNames: string[] = [
+  protected inputNames: (keyof this & string)[] = [
     'object',
     'index',
+    'context',
     'linkType',
     'listID',
     'showLabel',
-    'context',
+    'showThumbnails',
     'viewMode',
     'value',
-    'hideBadges',
+  ];
+
+  protected outputNames: (keyof this & string)[] = [
     'contentChange',
   ];
 
-  constructor(private cdr: ChangeDetectorRef, private themeService: ThemeService) {
+  constructor(
+    protected themeService: ThemeService,
+    protected cdr: ChangeDetectorRef,
+  ) {
+    super(themeService);
   }
 
-  /**
-   * Setup the dynamic child component
-   */
-  ngOnInit(): void {
-    this.instantiateComponent(this.object);
-  }
-
-  /**
-   * Whenever the inputs change, update the inputs of the dynamic component
-   */
-  ngOnChanges(changes: SimpleChanges): void {
-    if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
-      this.connectInputsAndOutputs();
-    }
-  }
-
-  ngOnDestroy() {
-    this.subs
-      .filter((subscription) => hasValue(subscription))
-      .forEach((subscription) => subscription.unsubscribe());
-  }
-
-  private instantiateComponent(object) {
-
-    this.initBadges();
-
-    const component = this.getComponent(object.getRenderTypes(), this.viewMode, this.context);
-
-    const viewContainerRef = this.listableObjectDirective.viewContainerRef;
-    viewContainerRef.clear();
-
-    this.compRef = viewContainerRef.createComponent(
-      component, {
-        index: 0,
-        injector: undefined,
-        projectableNodes: [
-          [this.badges.nativeElement],
-        ]
-      }
-    );
-
-    this.connectInputsAndOutputs();
-
+  public instantiateComponent(): void {
+    super.instantiateComponent();
     if ((this.compRef.instance as any).reloadedObject) {
       (this.compRef.instance as any).reloadedObject.pipe(
-        take(1)
+        take(1),
       ).subscribe((reloadedObject: DSpaceObject) => {
         if (reloadedObject) {
-          this.compRef.destroy();
+          this.destroyComponentInstance();
           this.object = reloadedObject;
-          this.instantiateComponent(reloadedObject);
+          this.instantiateComponent();
           this.cdr.detectChanges();
           this.contentChange.emit(reloadedObject);
         }
@@ -195,39 +126,8 @@ export class ListableObjectComponentLoaderComponent implements OnInit, OnChanges
     }
   }
 
-  /**
-   * Initialize which badges should be visible in the listable component
-   */
-  initBadges() {
-    let objectAsAny = this.object as any;
-    if (hasValue(objectAsAny.indexableObject)) {
-      objectAsAny = objectAsAny.indexableObject;
-    }
-    const objectExistsAndValidViewMode = hasValue(objectAsAny) && this.viewMode !== ViewMode.StandalonePage;
-    this.privateBadge = objectExistsAndValidViewMode && hasValue(objectAsAny.isDiscoverable) && !objectAsAny.isDiscoverable;
-    this.withdrawnBadge = objectExistsAndValidViewMode && hasValue(objectAsAny.isWithdrawn) && objectAsAny.isWithdrawn;
-  }
-
-  /**
-   * Fetch the component depending on the item's entity type, view mode and context
-   * @returns {GenericConstructor<Component>}
-   */
-  getComponent(renderTypes: (string | GenericConstructor<ListableObject>)[],
-               viewMode: ViewMode,
-               context: Context): GenericConstructor<Component> {
-    return getListableObjectComponent(renderTypes, viewMode, context, this.themeService.getThemeName());
-  }
-
-  /**
-   * Connect the in and outputs of this component to the dynamic component,
-   * to ensure they're in sync
-   */
-  protected connectInputsAndOutputs(): void {
-    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
-      this.inAndOutputNames.forEach((name: any) => {
-        this.compRef.instance[name] = this[name];
-      });
-    }
+  public getComponent(): GenericConstructor<Component> {
+    return getListableObjectComponent(this.object.getRenderTypes(), this.viewMode, this.context, this.themeService.getThemeName());
   }
 
 }
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts
index 7475aac967..4487b24033 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts
+++ b/src/app/shared/object-collection/shared/listable-object/listable-object.decorator.spec.ts
@@ -1,9 +1,12 @@
-  /* eslint-disable max-classes-per-file */
-import { Item } from '../../../../core/shared/item.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { getListableObjectComponent, listableObjectComponent } from './listable-object.decorator';
-import { Context } from '../../../../core/shared/context.model';
+/* eslint-disable max-classes-per-file */
 import { environment } from '../../../../../environments/environment';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  DEFAULT_VIEW_MODE,
+  getListableObjectComponent,
+  listableObjectComponent,
+} from './listable-object.decorator';
 
 let ogEnvironmentThemes;
 
@@ -13,6 +16,10 @@ describe('ListableObject decorator function', () => {
   const type3 = 'TestType3';
   const typeAncestor = 'TestTypeAncestor';
   const typeUnthemed = 'TestTypeUnthemed';
+  const typeLowPriority = 'TypeLowPriority';
+  const typeLowPriority2 = 'TypeLowPriority2';
+  const typeMidPriority = 'TypeMidPriority';
+  const typeHighPriority = 'TypeHighPriority';
 
   class Test1List {
   }
@@ -38,6 +45,21 @@ describe('ListableObject decorator function', () => {
   class TestUnthemedComponent {
   }
 
+  class TestDefaultLowPriorityComponent {
+  }
+
+  class TestLowPriorityComponent {
+  }
+
+  class TestDefaultMidPriorityComponent {
+  }
+
+  class TestMidPriorityComponent {
+  }
+
+  class TestHighPriorityComponent {
+  }
+
   /* eslint-enable max-classes-per-file */
 
   beforeEach(() => {
@@ -54,6 +76,15 @@ describe('ListableObject decorator function', () => {
     listableObjectComponent(typeAncestor, ViewMode.ListElement, Context.Any, 'ancestor')(TestAncestorComponent);
     listableObjectComponent(typeUnthemed, ViewMode.ListElement, Context.Any)(TestUnthemedComponent);
 
+    // Register component with different priorities for expected parameters:
+    // ViewMode.DetailedListElement, Context.Search, 'custom'
+    listableObjectComponent(typeLowPriority, DEFAULT_VIEW_MODE, undefined, undefined)(TestDefaultLowPriorityComponent);
+    listableObjectComponent(typeLowPriority, DEFAULT_VIEW_MODE, Context.Search, 'custom')(TestLowPriorityComponent);
+    listableObjectComponent(typeLowPriority2, DEFAULT_VIEW_MODE, undefined, undefined)(TestDefaultLowPriorityComponent);
+    listableObjectComponent(typeMidPriority, ViewMode.DetailedListElement, undefined, undefined)(TestDefaultMidPriorityComponent);
+    listableObjectComponent(typeMidPriority, ViewMode.DetailedListElement, undefined, 'custom')(TestMidPriorityComponent);
+    listableObjectComponent(typeHighPriority, ViewMode.DetailedListElement, Context.Search, undefined)(TestHighPriorityComponent);
+
     ogEnvironmentThemes = environment.themes;
   });
 
@@ -81,7 +112,7 @@ describe('ListableObject decorator function', () => {
     });
   });
 
-  describe('If there isn\'nt an exact match', () => {
+  describe('If there isn\'t an exact match', () => {
     describe('If there is a match for one of the entity types and the view mode', () => {
       it('should return the class with the matching entity type and view mode and default context', () => {
         const component = getListableObjectComponent([type3], ViewMode.ListElement, Context.Workspace);
@@ -118,7 +149,7 @@ describe('ListableObject decorator function', () => {
           },
           {
             name: 'ancestor',         // Matches typeAncestor, but not typeUnthemed
-          }
+          },
         ];
       });
 
@@ -147,9 +178,50 @@ describe('ListableObject decorator function', () => {
         expect(() => {
           getListableObjectComponent([typeAncestor], ViewMode.ListElement, Context.Any, 'extension-cycle');
         }).toThrowError(
-          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1'
+          'Theme extension cycle detected: extension-cycle -> broken1 -> broken2 -> broken3 -> broken1',
         );
       });
     });
   });
+
+  describe('priorities', () => {
+    beforeEach(() => {
+      environment.themes = [
+        {
+          name: 'custom',
+        },
+      ];
+    });
+
+    describe('If a component with default ViewMode contains specific context and/or theme', () => {
+      it('requesting a specific ViewMode should return the one with the requested context and/or theme', () => {
+        const component = getListableObjectComponent([typeLowPriority], ViewMode.DetailedListElement, Context.Search, 'custom');
+        expect(component).toEqual(TestLowPriorityComponent);
+      });
+    });
+
+    describe('If a component with default Context contains specific ViewMode and/or theme', () => {
+      it('requesting a specific Context should return the one with the requested view-mode and/or theme', () => {
+        const component = getListableObjectComponent([typeMidPriority], ViewMode.DetailedListElement, Context.Search, 'custom');
+        expect(component).toEqual(TestMidPriorityComponent);
+      });
+    });
+
+    describe('If multiple components exist, each containing a different default value for one of the requested parameters', () => {
+      it('the component with the latest default value in the list should be returned', () => {
+        let component = getListableObjectComponent([typeMidPriority, typeLowPriority], ViewMode.DetailedListElement, Context.Search, 'custom');
+        expect(component).toEqual(TestMidPriorityComponent);
+
+        component = getListableObjectComponent([typeLowPriority, typeMidPriority, typeHighPriority], ViewMode.DetailedListElement, Context.Search, 'custom');
+        expect(component).toEqual(TestHighPriorityComponent);
+      });
+    });
+
+    describe('If two components exist for two different types, both configured for the same view-mode, but one for a specific context and/or theme', () => {
+      it('requesting a component for that specific context and/or theme while providing both types should return the most relevant one', () => {
+        const component = getListableObjectComponent([typeLowPriority2, typeLowPriority], ViewMode.DetailedListElement, Context.Search, 'custom');
+        expect(component).toEqual(TestLowPriorityComponent);
+      });
+    });
+  });
 });
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 b7f27d1553..8038833902 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
@@ -1,22 +1,74 @@
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Context } from '../../../../core/shared/context.model';
-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 { InjectionToken } from '@angular/core';
 
+import { ThemeConfig } from '../../../../../config/theme.config';
+import { environment } from '../../../../../environments/environment';
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { ListableObject } from '../listable-object.model';
+
 export const DEFAULT_VIEW_MODE = ViewMode.ListElement;
 export const DEFAULT_CONTEXT = Context.Any;
 export const DEFAULT_THEME = '*';
 
+/**
+ * A class used to compare two matches and their relevancy to determine which of the two gains priority over the other
+ *
+ * "level" represents the index of the first default value that was used to find the match with:
+ * ViewMode being index 0, Context index 1 and theme index 2. Examples:
+ * - If a default value was used for context, but not view-mode and theme, the "level" will be 1
+ * - If a default value was used for view-mode and context, but not for theme, the "level" will be 0
+ * - If no default value was used for any of the fields, the "level" will be 3
+ *
+ * "relevancy" represents the amount of values that didn't require a default value to fall back on. Examples:
+ * - If a default value was used for theme, but not view-mode and context, the "relevancy" will be 2
+ * - If a default value was used for view-mode and context, but not for theme, the "relevancy" will be 1
+ * - If a default value was used for all fields, the "relevancy" will be 0
+ * - If no default value was used for any of the fields, the "relevancy" will be 3
+ *
+ * To determine which of two MatchRelevancies is the most relevant, we compare "level" and "relevancy" in that order.
+ * If any of the two is higher than the other, that match is most relevant. Examples:
+ * - { level: 1, relevancy: 1 } is more relevant than { level: 0, relevancy: 2 }
+ * - { level: 1, relevancy: 1 } is less relevant than { level: 1, relevancy: 2 }
+ * - { level: 1, relevancy: 1 } is more relevant than { level: 1, relevancy: 0 }
+ * - { level: 1, relevancy: 1 } is less relevant than { level: 2, relevancy: 0 }
+ * - { level: 1, relevancy: 1 } is more relevant than null
+ */
+export class MatchRelevancy {
+  constructor(public match: any,
+              public level: number,
+              public relevancy: number) {
+  }
+
+  isMoreRelevantThan(otherMatch: MatchRelevancy): boolean {
+    if (hasNoValue(otherMatch)) {
+      return true;
+    }
+    if (otherMatch.level > this.level) {
+      return false;
+    }
+    if (otherMatch.level === this.level && otherMatch.relevancy > this.relevancy) {
+      return false;
+    }
+    return true;
+  }
+
+  isLessRelevantThan(otherMatch: MatchRelevancy): boolean {
+    return !this.isMoreRelevantThan(otherMatch);
+  }
+}
+
 /**
  * Factory to allow us to inject getThemeConfigFor so we can mock it in tests
  */
 export const GET_THEME_CONFIG_FOR_FACTORY = new InjectionToken<(str) => ThemeConfig>('getThemeConfigFor', {
   providedIn: 'root',
-  factory: () => getThemeConfigFor
+  factory: () => getThemeConfigFor,
 });
 
 const map = new Map();
@@ -48,47 +100,70 @@ export function listableObjectComponent(objectType: string | GenericConstructor<
 
 /**
  * Getter to retrieve the matching listable object component
+ *
+ * Looping over the provided types, it'll attempt to find the best match depending on the {@link MatchRelevancy} returned by getMatch()
+ * The most relevant match between types is kept and eventually returned
+ *
  * @param types The types of which one should match the listable component
  * @param viewMode The view mode that should match the components
  * @param context The context that should match the components
  * @param theme The theme that should match the components
  */
 export function getListableObjectComponent(types: (string | GenericConstructor<ListableObject>)[], viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme: string = DEFAULT_THEME) {
-  let bestMatch;
-  let bestMatchValue = 0;
+  let currentBestMatch: MatchRelevancy = null;
   for (const type of types) {
     const typeMap = map.get(type);
     if (hasValue(typeMap)) {
-      const typeModeMap = typeMap.get(viewMode);
-      if (hasValue(typeModeMap)) {
-        const contextMap = typeModeMap.get(context);
-        if (hasValue(contextMap)) {
-          const match = resolveTheme(contextMap, theme);
-          if (hasValue(match)) {
-            return match;
-          }
-          if (bestMatchValue < 3 && hasValue(contextMap.get(DEFAULT_THEME))) {
-            bestMatchValue = 3;
-            bestMatch = contextMap.get(DEFAULT_THEME);
-          }
-        }
-        if (bestMatchValue < 2 &&
-          hasValue(typeModeMap.get(DEFAULT_CONTEXT)) &&
-          hasValue(typeModeMap.get(DEFAULT_CONTEXT).get(DEFAULT_THEME))) {
-          bestMatchValue = 2;
-          bestMatch = typeModeMap.get(DEFAULT_CONTEXT).get(DEFAULT_THEME);
-        }
-      }
-      if (bestMatchValue < 1 &&
-        hasValue(typeMap.get(DEFAULT_VIEW_MODE)) &&
-        hasValue(typeMap.get(DEFAULT_VIEW_MODE).get(DEFAULT_CONTEXT)) &&
-        hasValue(typeMap.get(DEFAULT_VIEW_MODE).get(DEFAULT_CONTEXT).get(DEFAULT_THEME))) {
-        bestMatchValue = 1;
-        bestMatch = typeMap.get(DEFAULT_VIEW_MODE).get(DEFAULT_CONTEXT).get(DEFAULT_THEME);
+      const match = getMatch(typeMap, [viewMode, context, theme], [DEFAULT_VIEW_MODE, DEFAULT_CONTEXT, DEFAULT_THEME]);
+      if (hasNoValue(currentBestMatch) || currentBestMatch.isLessRelevantThan(match)) {
+        currentBestMatch = match;
       }
     }
   }
-  return bestMatch;
+  return hasValue(currentBestMatch) ? currentBestMatch.match : null;
+}
+
+/**
+ * Find an object within a nested map, matching the provided keys as best as possible, falling back on defaults wherever
+ * needed.
+ *
+ * Starting off with a Map, it loops over the provided keys, going deeper into the map until it finds a value
+ * If at some point, no value is found, it'll attempt to use the default value for that index instead
+ * If the default value exists, the index is stored in the "level"
+ * If no default value exists, 1 is added to "relevancy"
+ * See {@link MatchRelevancy} what these represent
+ *
+ * @param typeMap         a multi-dimensional map
+ * @param keys            the keys of the multi-dimensional map to loop over. Each key represents a level within the map
+ * @param defaults        the default values to use for each level, in case no value is found for the key at that index
+ * @returns matchAndLevel a {@link MatchRelevancy} object containing the match and its level of relevancy
+ */
+export function getMatch(typeMap: Map<any, any>, keys: any[], defaults: any[]): MatchRelevancy {
+  let currentMap = typeMap;
+  let level = -1;
+  let relevancy = 0;
+  for (let i = 0; i < keys.length; i++) {
+    // If we're currently checking the theme, resolve it first to take extended themes into account
+    let currentMatch = defaults[i] === DEFAULT_THEME ? resolveTheme(currentMap, keys[i]) : currentMap.get(keys[i]);
+    if (hasNoValue(currentMatch)) {
+      currentMatch = currentMap.get(defaults[i]);
+      if (level === -1) {
+        level = i;
+      }
+    } else {
+      relevancy++;
+    }
+    if (hasValue(currentMatch)) {
+      if (currentMatch instanceof Map) {
+        currentMap = currentMatch as Map<any, any>;
+      } else {
+        return new MatchRelevancy(currentMatch, level > -1 ? level : i + 1, relevancy);
+      }
+    } else {
+      return null;
+    }
+  }
+  return null;
 }
 
 /**
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
new file mode 100644
index 0000000000..513c132432
--- /dev/null
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.html
@@ -0,0 +1,7 @@
+<div class="mt-2 mb-2" *ngIf="(collection$ | async)">
+  <span class="text-muted">{{'collection.listelement.badge' | translate}}:
+    <a [routerLink]="['/collections', (collection$ | async)?.id]">
+      {{ dsoNameService.getName(collection$ | async) }}
+    </a>
+    </span>
+</div>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.scss b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
new file mode 100644
index 0000000000..386e6b0877
--- /dev/null
+++ b/src/app/shared/object-collection/shared/mydspace-item-collection/item-collection.component.ts
@@ -0,0 +1,79 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+} from 'rxjs/operators';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Collection } from '../../../../core/shared/collection.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { isNotEmpty } from '../../../empty.util';
+import { followLink } from '../../../utils/follow-link-config.model';
+
+/**
+ * This component represents a badge with collection information.
+ */
+@Component({
+  selector: 'ds-item-collection',
+  styleUrls: ['./item-collection.component.scss'],
+  templateUrl: './item-collection.component.html',
+})
+export class ItemCollectionComponent implements OnInit {
+
+  /**
+   * The target object
+   */
+  @Input() object: any;
+
+  /**
+   * The collection object
+   */
+  collection$: Observable<Collection>;
+
+  public constructor(
+    protected linkService: LinkService,
+    public dsoNameService: DSONameService,
+  ) {
+  }
+
+  /**
+   * Initialize collection object
+   */
+  ngOnInit() {
+
+    this.linkService.resolveLinks(this.object, followLink('workflowitem', {
+      isOptional: true,
+    },
+    followLink('collection',{}),
+    ));
+    this.collection$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
+      getFirstCompletedRemoteData(),
+      mergeMap((rd: RemoteData<WorkflowItem>) => {
+        if (rd.hasSucceeded && isNotEmpty(rd.payload)) {
+          return (rd.payload.collection as Observable<RemoteData<Collection>>).pipe(
+            getFirstCompletedRemoteData(),
+            map((rds: RemoteData<Collection>) => {
+              if (rds.hasSucceeded && isNotEmpty(rds.payload)) {
+                return rds.payload;
+              } else {
+                return null;
+              }
+            }),
+          );
+        } else {
+          return EMPTY;
+        }
+      }));
+  }
+}
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
deleted file mode 100644
index 44e6a44b70..0000000000
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.spec.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { MyDSpaceItemStatusComponent } from './my-dspace-item-status.component';
-import { MyDspaceItemStatusType } from './my-dspace-item-status-type';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
-import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-
-let component: MyDSpaceItemStatusComponent;
-let fixture: ComponentFixture<MyDSpaceItemStatusComponent>;
-
-let mockResultObject: PoolTask;
-
-const rdSumbitter = createSuccessfulRemoteDataObject(EPersonMock);
-const workflowitem = Object.assign(new WorkflowItem(), { submitter: observableOf(rdSumbitter) });
-const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
-mockResultObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
-
-describe('MyDSpaceItemStatusComponent', () => {
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
-      imports: [
-        TranslateModule.forRoot({
-          loader: {
-            provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
-      ],
-      declarations: [MyDSpaceItemStatusComponent],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(MyDSpaceItemStatusComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(MyDSpaceItemStatusComponent);
-    component = fixture.componentInstance;
-  });
-
-  it('should display badge', () => {
-    const badge = fixture.debugElement.query(By.css('span'));
-    expect(badge).toBeDefined();
-  });
-
-  it('should init badge content and class', () => {
-    component.status = MyDspaceItemStatusType.VALIDATION;
-    fixture.detectChanges();
-    expect(component.badgeContent).toBe(MyDspaceItemStatusType.VALIDATION);
-    expect(component.badgeClass).toBe('text-light badge badge-warning');
-  });
-
-  it('should init badge content and class', () => {
-    component.status = MyDspaceItemStatusType.WAITING_CONTROLLER;
-    fixture.detectChanges();
-    expect(component.badgeContent).toBe(MyDspaceItemStatusType.WAITING_CONTROLLER);
-    expect(component.badgeClass).toBe('text-light badge badge-info');
-  });
-
-  it('should init badge content and class', () => {
-    component.status = MyDspaceItemStatusType.WORKSPACE;
-    fixture.detectChanges();
-    expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKSPACE);
-    expect(component.badgeClass).toBe('text-light badge badge-primary');
-  });
-
-  it('should init badge content and class', () => {
-    component.status = MyDspaceItemStatusType.ARCHIVED;
-    fixture.detectChanges();
-    expect(component.badgeContent).toBe(MyDspaceItemStatusType.ARCHIVED);
-    expect(component.badgeClass).toBe('text-light badge badge-success');
-  });
-
-  it('should init badge content and class', () => {
-    component.status = MyDspaceItemStatusType.WORKFLOW;
-    fixture.detectChanges();
-    expect(component.badgeContent).toBe(MyDspaceItemStatusType.WORKFLOW);
-    expect(component.badgeClass).toBe('text-light badge badge-info');
-  });
-});
diff --git a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts b/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
deleted file mode 100644
index 917dd45acc..0000000000
--- a/src/app/shared/object-collection/shared/mydspace-item-status/my-dspace-item-status.component.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { MyDspaceItemStatusType } from './my-dspace-item-status-type';
-
-/**
- * This component represents a badge with mydspace item status
- */
-@Component({
-  selector: 'ds-mydspace-item-status',
-  styleUrls: ['./my-dspace-item-status.component.scss'],
-  templateUrl: './my-dspace-item-status.component.html'
-})
-export class MyDSpaceItemStatusComponent implements OnInit {
-
-  /**
-   * This mydspace item status
-   */
-  @Input() status: MyDspaceItemStatusType;
-
-  /**
-   * This badge class
-   */
-  public badgeClass: string;
-
-  /**
-   * This badge content
-   */
-  public badgeContent: string;
-
-  /**
-   * Initialize badge content and class
-   */
-  ngOnInit() {
-    this.badgeContent = this.status;
-    this.badgeClass = 'text-light badge ';
-    switch (this.status) {
-      case MyDspaceItemStatusType.VALIDATION:
-        this.badgeClass += 'badge-warning';
-        break;
-      case MyDspaceItemStatusType.WAITING_CONTROLLER:
-        this.badgeClass += 'badge-info';
-        break;
-      case MyDspaceItemStatusType.WORKSPACE:
-        this.badgeClass += 'badge-primary';
-        break;
-      case MyDspaceItemStatusType.ARCHIVED:
-        this.badgeClass += 'badge-success';
-        break;
-      case MyDspaceItemStatusType.WORKFLOW:
-        this.badgeClass += 'badge-info';
-        break;
-    }
-  }
-
-}
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
index 0f7ae433fa..0f9cdf846e 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.html
@@ -1,3 +1,13 @@
-<div class="mt-2 mb-2" *ngIf="(submitter$ | async)">
-  <span class="text-muted">{{'submission.workflow.tasks.generic.submitter' | translate}} : <span class="badge badge-info">{{(submitter$ | async)?.name}}</span></span>
+<div class="mt-2 mb-2">
+  <span class="text-muted">
+    {{'submission.workflow.tasks.generic.submitter' | translate}}:
+    <span class="badge badge-info">
+      <ng-container *ngIf="submitter$ | async as submitter; else noSubmitter">
+        {{ dsoNameService.getName(submitter) }}
+      </ng-container>
+      <ng-template #noSubmitter>
+        {{ 'submitter.empty' | translate }}
+      </ng-template>
+    </span>
+  </span>
 </div>
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
index 227db9ec82..9c588e49a5 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.spec.ts
@@ -1,18 +1,29 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { ItemSubmitterComponent } from './item-submitter.component';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { EPersonMock } from '../../../testing/eperson.mock';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
-import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { EPersonMock } from '../../../testing/eperson.mock';
+import { ItemSubmitterComponent } from './item-submitter.component';
 
 let component: ItemSubmitterComponent;
 let fixture: ComponentFixture<ItemSubmitterComponent>;
@@ -30,17 +41,17 @@ describe('ItemSubmitterComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ItemSubmitterComponent],
       providers: [
         { provide: LinkService, useValue: getMockLinkService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSubmitterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -56,14 +67,22 @@ describe('ItemSubmitterComponent', () => {
 
   it('should init submitter properly', () => {
     expect(component.submitter$).toBeObservable(cold('(b|)', {
-      b: EPersonMock
+      b: EPersonMock,
     }));
   });
 
-  it('should show a badge with submitter name', () => {
-    const badge = fixture.debugElement.query(By.css('.badge'));
+  it('should show N/A when submitter is null', () => {
+    component.submitter$ = observableOf(null);
+    fixture.detectChanges();
 
-    expect(badge).toBeDefined();
-    expect(badge.nativeElement.innerHTML).toBe(EPersonMock.name);
+    const badge: DebugElement = fixture.debugElement.query(By.css('.badge'));
+
+    expect(badge.nativeElement.innerText).toBe('submitter.empty');
+  });
+
+  it('should show a badge with submitter name', () => {
+    const badge: DebugElement = fixture.debugElement.query(By.css('.badge'));
+
+    expect(badge.nativeElement.innerText).toBe(EPersonMock.name);
   });
 });
diff --git a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
index fb644017db..ea504679c3 100644
--- a/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
+++ b/src/app/shared/object-collection/shared/mydspace-item-submitter/item-submitter.component.ts
@@ -1,14 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+} from 'rxjs/operators';
 
-import { EMPTY, Observable } from 'rxjs';
-import { map, mergeMap } from 'rxjs/operators';
-
-import { EPerson } from '../../../../core/eperson/models/eperson.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotEmpty } from '../../../empty.util';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { EPerson } from '../../../../core/eperson/models/eperson.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { isNotEmpty } from '../../../empty.util';
 import { followLink } from '../../../utils/follow-link-config.model';
 
 /**
@@ -17,7 +27,7 @@ import { followLink } from '../../../utils/follow-link-config.model';
 @Component({
   selector: 'ds-item-submitter',
   styleUrls: ['./item-submitter.component.scss'],
-  templateUrl: './item-submitter.component.html'
+  templateUrl: './item-submitter.component.html',
 })
 export class ItemSubmitterComponent implements OnInit {
 
@@ -31,8 +41,10 @@ export class ItemSubmitterComponent implements OnInit {
    */
   submitter$: Observable<EPerson>;
 
-  public constructor(protected linkService: LinkService) {
-
+  public constructor(
+    public dsoNameService: DSONameService,
+    protected linkService: LinkService,
+  ) {
   }
 
   /**
@@ -40,7 +52,7 @@ export class ItemSubmitterComponent implements OnInit {
    */
   ngOnInit() {
     this.linkService.resolveLinks(this.object, followLink('workflowitem', {},
-      followLink('submitter',{})
+      followLink('submitter',{}),
     ));
     this.submitter$ = (this.object.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
       getFirstCompletedRemoteData(),
@@ -54,7 +66,7 @@ export class ItemSubmitterComponent implements OnInit {
               } else {
                 return null;
               }
-            })
+            }),
           );
         } else {
           return EMPTY;
diff --git a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
index 7d4e107b2b..f7b9561269 100644
--- a/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
+++ b/src/app/shared/object-collection/shared/object-collection-element/abstract-listable-element.component.ts
@@ -1,9 +1,16 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ListableObject } from '../listable-object.model';
-import { CollectionElementLinkType } from '../../collection-element-link.type';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Context } from '../../../../core/shared/context.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
 
 @Component({
   selector: 'ds-abstract-object-element',
@@ -41,6 +48,11 @@ export class AbstractListableElementComponent<T extends ListableObject> {
    */
   @Input() showLabel = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * The context we matched on to get this component
    */
@@ -70,4 +82,10 @@ export class AbstractListableElementComponent<T extends ListableObject> {
    * The available contexts
    */
   contexts = Context;
+
+  constructor(
+    public dsoNameService: DSONameService,
+  ) {
+  }
+
 }
diff --git a/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
new file mode 100644
index 0000000000..84042358b3
--- /dev/null
+++ b/src/app/shared/object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component.ts
@@ -0,0 +1,88 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
+
+@Component({
+  selector: 'ds-objects-collection-tabulatable',
+  template: ``,
+})
+
+/**
+ * Abstract class that describe the properties for the rendering of search result's paginated lists of objects in a table.
+ * To be used as descriptor of the actual result component e.g. TabulatableResultListElementsComponent
+ */
+export class AbstractTabulatableElementComponent<T extends PaginatedList<ListableObject>> {
+
+  /**
+   * The object to render in this list element
+   */
+  @Input() objects: T;
+
+  /**
+   * The link type to determine the type of link rendered in this element
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The context we matched on to get this component
+   */
+  @Input() context: Context;
+
+  /**
+   * The viewmode we matched on to get this component
+   */
+  @Input() viewMode: ViewMode;
+
+  /**
+   * Emit when the object has been reloaded.
+   */
+  @Output() reloadedObject = new EventEmitter<RemoteData<PaginatedList<ListableObject>>>();
+
+  /**
+   * The available link types
+   */
+  linkTypes = CollectionElementLinkType;
+
+  /**
+   * The available view modes
+   */
+  viewModes = ViewMode;
+
+  /**
+   * The available contexts
+   */
+  contexts = Context;
+
+
+}
+
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..1a39cf61cf 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
@@ -1,12 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { SelectableListItemControlComponent } from './selectable-list-item-control.component';
-import { Item } from '../../../../core/shared/item.model';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { VarDirective } from '../../../utils/var.directive';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../../core/shared/item.model';
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { VarDirective } from '../../../utils/var.directive';
 import { ListableObject } from '../listable-object.model';
+import { SelectableListItemControlComponent } from './selectable-list-item-control.component';
 
 describe('SelectableListItemControlComponent', () => {
   let comp: SelectableListItemControlComponent;
@@ -33,11 +42,11 @@ describe('SelectableListItemControlComponent', () => {
     index = 0;
     selection = [otherObject];
     selectionService = jasmine.createSpyObj('selectionService', {
-        selectSingle: jasmine.createSpy('selectSingle'),
-        deselectSingle: jasmine.createSpy('deselectSingle'),
-        isObjectSelected: observableOf(true),
-        getSelectableList: observableOf({ selection })
-      }
+      selectSingle: jasmine.createSpy('selectSingle'),
+      deselectSingle: jasmine.createSpy('deselectSingle'),
+      isObjectSelected: observableOf(true),
+      getSelectableList: observableOf({ selection }),
+    },
     );
   }
 
@@ -45,14 +54,17 @@ describe('SelectableListItemControlComponent', () => {
     init();
     TestBed.configureTestingModule({
       declarations: [SelectableListItemControlComponent, VarDirective],
-      imports: [FormsModule],
+      imports: [
+        FormsModule,
+        TranslateModule.forRoot(),
+      ],
       providers: [
         {
           provide: SelectableListService,
-          useValue: selectionService
-        }
+          useValue: selectionService,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
index ebe49331d5..0a68d0e953 100644
--- a/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
@@ -1,13 +1,24 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ListableObject } from '../listable-object.model';
-import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
-import { map, skip, take } from 'rxjs/operators';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import {
+  map,
+  skip,
+  take,
+} from 'rxjs/operators';
+
+import { SelectableListService } from '../../../object-list/selectable-list/selectable-list.service';
+import { ListableObject } from '../listable-object.model';
 
 @Component({
   selector: 'ds-selectable-list-item-control',
   // styleUrls: ['./selectable-list-item-control.component.scss'],
-  templateUrl: './selectable-list-item-control.component.html'
+  templateUrl: './selectable-list-item-control.component.html',
 })
 /**
  * Component for rendering list item that has a control (checkbox or radio button) because it's selectable
@@ -41,12 +52,12 @@ export class SelectableListItemControlComponent implements OnInit {
     this.selected$ = this.selectionService.isObjectSelected(this.selectionConfig.listId, this.object);
     this.selected$
       .pipe(skip(1)).subscribe((selected: boolean) => {
-      if (selected) {
-        this.selectObject.emit(this.object);
-      } else {
-        this.deselectObject.emit(this.object);
-      }
-    });
+        if (selected) {
+          this.selectObject.emit(this.object);
+        } else {
+          this.deselectObject.emit(this.object);
+        }
+      });
   }
 
   selectCheckbox(value: boolean) {
@@ -62,16 +73,16 @@ export class SelectableListItemControlComponent implements OnInit {
       const selected$ = this.selectionService.getSelectableList(this.selectionConfig.listId);
       selected$.pipe(
         take(1),
-        map((selected) => selected ? selected.selection : [])
+        map((selected) => selected ? selected.selection : []),
       ).subscribe((selection) => {
-          // First deselect any existing selections, this is a radio button
-          selection.forEach((selectedObject) => {
-            this.selectionService.deselectSingle(this.selectionConfig.listId, selectedObject);
-            this.deselectObject.emit(selectedObject);
-          });
-          this.selectionService.selectSingle(this.selectionConfig.listId, this.object);
-          this.selectObject.emit(this.object);
-        }
+        // First deselect any existing selections, this is a radio button
+        selection.forEach((selectedObject) => {
+          this.selectionService.deselectSingle(this.selectionConfig.listId, selectedObject);
+          this.deselectObject.emit(selectedObject);
+        });
+        this.selectionService.selectSingle(this.selectionConfig.listId, this.object);
+        this.selectObject.emit(this.object);
+      },
       );
     }
   }
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
new file mode 100644
index 0000000000..ff51746cb9
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.html
@@ -0,0 +1 @@
+<ng-template dsTabulatableObjects></ng-template>
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
new file mode 100644
index 0000000000..d5fd3fd7b8
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.spec.ts
@@ -0,0 +1,108 @@
+import { ChangeDetectionStrategy } from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { provideMockStore } from '@ngrx/store/testing';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { TabulatableResultListElementsComponent } from '../../../object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { ListableObject } from '../listable-object.model';
+import { TestType } from '../listable-object/listable-object-component-loader.component.spec';
+import { TabulatableObjectsDirective } from './tabulatable-objects.directive';
+import { TabulatableObjectsLoaderComponent } from './tabulatable-objects-loader.component';
+
+
+const testType = 'TestType';
+const testContext = Context.CoarNotify;
+const testViewMode = ViewMode.Table;
+
+class TestTypes extends PaginatedList<ListableObject> {
+  page: TestType[] = [new TestType()];
+}
+
+
+describe('TabulatableObjectsLoaderComponent', () => {
+  let component: TabulatableObjectsLoaderComponent;
+  let fixture: ComponentFixture<TabulatableObjectsLoaderComponent>;
+
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    themeService = jasmine.createSpyObj('themeService', {
+      getThemeName: 'dspace',
+    });
+    await TestBed.configureTestingModule({
+      declarations: [ TabulatableObjectsLoaderComponent, TabulatableObjectsDirective ],
+      providers: [
+        provideMockStore({}),
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).overrideComponent(TabulatableObjectsLoaderComponent, {
+      set: {
+        changeDetection: ChangeDetectionStrategy.Default,
+        entryComponents: [TabulatableResultListElementsComponent],
+      },
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(TabulatableObjectsLoaderComponent);
+    component = fixture.componentInstance;
+    component.objects = new TestTypes();
+    component.context = Context.CoarNotify;
+    spyOn(component, 'getComponent').and.returnValue(TabulatableResultListElementsComponent as any);
+    spyOn(component as any, 'connectInputsAndOutputs').and.callThrough();
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('When the component is rendered', () => {
+    it('should call the getTabulatableObjectComponent function with the right types, view mode and context', () => {
+      expect(component.getComponent).toHaveBeenCalledWith([testType], testViewMode, testContext);
+    });
+
+    it('should connectInputsAndOutputs of loaded component', () => {
+      expect((component as any).connectInputsAndOutputs).toHaveBeenCalled();
+    });
+  });
+
+  describe('When a reloadedObject is emitted', () => {
+    let tabulatableComponent;
+    let reloadedObject: any;
+
+    beforeEach(() => {
+      spyOn((component as any), 'instantiateComponent').and.returnValue(null);
+      spyOn((component as any).contentChange, 'emit').and.returnValue(null);
+
+      tabulatableComponent = fixture.debugElement.query(By.css('ds-search-result-table-element')).componentInstance;
+      reloadedObject = 'object';
+    });
+
+    it('should re-instantiate the listable component', fakeAsync(() => {
+      expect((component as any).instantiateComponent).not.toHaveBeenCalled();
+
+      (tabulatableComponent as any).reloadedObject.emit(reloadedObject);
+      tick(200);
+
+      expect((component as any).instantiateComponent).toHaveBeenCalledWith(reloadedObject, undefined);
+    }));
+
+    it('should re-emit it as a contentChange', fakeAsync(() => {
+      expect((component as any).contentChange.emit).not.toHaveBeenCalled();
+
+      (tabulatableComponent as any).reloadedObject.emit(reloadedObject);
+      tick(200);
+
+      expect((component as any).contentChange.emit).toHaveBeenCalledWith(reloadedObject);
+    }));
+
+  });
+});
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
new file mode 100644
index 0000000000..7b8e45a17a
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component.ts
@@ -0,0 +1,218 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  ComponentRef,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+  ViewChild,
+} from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { ThemeService } from '../../../theme-support/theme.service';
+import { CollectionElementLinkType } from '../../collection-element-link.type';
+import { ListableObject } from '../listable-object.model';
+import { getTabulatableObjectsComponent } from './tabulatable-objects.decorator';
+import { TabulatableObjectsDirective } from './tabulatable-objects.directive';
+
+@Component({
+  selector: 'ds-tabulatable-objects-loader',
+  templateUrl: './tabulatable-objects-loader.component.html',
+})
+/**
+ * Component to load the matching component flagged by the tabulatableObjectsComponent decorator.
+ * Each component flagged by the decorator needs to have a ViewMode set as Table in order to be matched by the loader.
+ * e.g. @tabulatableObjectsComponent(PaginatedList<AdminNotifySearchResult>, ViewMode.Table, Context.CoarNotify)
+ */
+export class TabulatableObjectsLoaderComponent implements OnInit, OnChanges, OnDestroy {
+  /**
+   * The items to determine the component for
+   */
+  @Input() objects: PaginatedList<ListableObject>;
+
+
+  /**
+   * The context of tabulatable object
+   */
+  @Input() context: Context;
+
+  /**
+   * The type of link used to render the links inside the listable object
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
+  /**
+   * Whether to show the badge label or not
+   */
+  @Input() showLabel = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The value to display for this element
+   */
+  @Input() value: string;
+
+  /**
+   * Directive hook used to place the dynamic child component
+   */
+  @ViewChild(TabulatableObjectsDirective, { static: true }) tabulatableObjectsDirective: TabulatableObjectsDirective;
+
+  /**
+   * Emit when the listable object has been reloaded.
+   */
+  @Output() contentChange = new EventEmitter<PaginatedList<ListableObject>>();
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The reference to the dynamic component
+   */
+  protected compRef: ComponentRef<Component>;
+
+  /**
+   * The view mode used to identify the components
+   */
+  protected viewMode: ViewMode = ViewMode.Table;
+
+  /**
+   * The list of input and output names for the dynamic component
+   */
+  protected inAndOutputNames: string[] = [
+    'objects',
+    'linkType',
+    'listID',
+    'showLabel',
+    'showThumbnails',
+    'context',
+    'viewMode',
+    'value',
+    'hideBadges',
+    'contentChange',
+  ];
+
+  constructor(private cdr: ChangeDetectorRef, private themeService: ThemeService) {
+  }
+
+  /**
+   * Setup the dynamic child component
+   */
+  ngOnInit(): void {
+    this.instantiateComponent(this.objects);
+  }
+
+  /**
+   * Whenever the inputs change, update the inputs of the dynamic component
+   */
+  ngOnChanges(changes: SimpleChanges): void {
+    if (hasNoValue(this.compRef)) {
+      // sometimes the component has not been initialized yet, so it first needs to be initialized
+      // before being called again
+      this.instantiateComponent(this.objects, changes);
+    } else {
+      // if an input or output has changed
+      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
+        this.connectInputsAndOutputs();
+        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
+          (this.compRef.instance as any).ngOnChanges(changes);
+        }
+      }
+    }
+  }
+
+  ngOnDestroy() {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+  private instantiateComponent(objects: PaginatedList<ListableObject>, changes?: SimpleChanges): void {
+    // objects need to have same render type so we access just the first in the page
+    const component = this.getComponent(objects?.page[0]?.getRenderTypes(), this.viewMode, this.context);
+
+    const viewContainerRef = this.tabulatableObjectsDirective.viewContainerRef;
+    viewContainerRef.clear();
+
+    this.compRef = viewContainerRef.createComponent(
+      component, {
+        index: 0,
+        injector: undefined,
+      },
+    );
+
+    if (hasValue(changes)) {
+      this.ngOnChanges(changes);
+    } else {
+      this.connectInputsAndOutputs();
+    }
+
+    if ((this.compRef.instance as any).reloadedObject) {
+      combineLatest([
+        observableOf(changes),
+        (this.compRef.instance as any).reloadedObject.pipe(take(1)) as Observable<PaginatedList<ListableObject>>,
+      ]).subscribe(([simpleChanges, reloadedObjects]: [SimpleChanges, PaginatedList<ListableObject>]) => {
+        if (reloadedObjects) {
+          this.compRef.destroy();
+          this.objects = reloadedObjects;
+          this.instantiateComponent(reloadedObjects, simpleChanges);
+          this.cdr.detectChanges();
+          this.contentChange.emit(reloadedObjects);
+        }
+      });
+    }
+  }
+
+  /**
+   * Fetch the component depending on the item's entity type, view mode and context
+   * @returns {GenericConstructor<Component>}
+   */
+  getComponent(renderTypes: (string | GenericConstructor<ListableObject>)[],
+    viewMode: ViewMode,
+    context: Context): GenericConstructor<Component> {
+    return getTabulatableObjectsComponent(renderTypes, viewMode, context, this.themeService.getThemeName());
+  }
+
+  /**
+   * Connect the in and outputs of this component to the dynamic component,
+   * to ensure they're in sync
+   */
+  protected connectInputsAndOutputs(): void {
+    if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
+      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
+        this.compRef.instance[name] = this[name];
+      });
+    }
+  }
+
+}
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts
new file mode 100644
index 0000000000..a972c02907
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.spec.ts
@@ -0,0 +1,26 @@
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  getTabulatableObjectsComponent,
+  tabulatableObjectsComponent,
+} from './tabulatable-objects.decorator';
+
+const type = 'TestType';
+
+@tabulatableObjectsComponent(PaginatedList<any>, ViewMode.Table, Context.Search)
+class TestTable {
+}
+describe('TabulatableObject decorator function', () => {
+
+  it('should have a decorator for table', () => {
+    const tableDecorator = tabulatableObjectsComponent('Item', ViewMode.Table);
+    expect(tableDecorator.length).not.toBeNull();
+  });
+
+
+  it('should return the matching class', () => {
+    const component = getTabulatableObjectsComponent([type], ViewMode.Table, Context.Search);
+    expect(component).toEqual(TestTable);
+  });
+});
diff --git a/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
new file mode 100644
index 0000000000..fe40a99d9c
--- /dev/null
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.decorator.ts
@@ -0,0 +1,69 @@
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { Context } from '../../../../core/shared/context.model';
+import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
+import { ListableObject } from '../listable-object.model';
+import {
+  DEFAULT_CONTEXT,
+  DEFAULT_THEME,
+  DEFAULT_VIEW_MODE,
+  getMatch,
+  MatchRelevancy,
+} from '../listable-object/listable-object.decorator';
+
+const map = new Map();
+
+/**
+ * Decorator used for rendering tabulatable objects
+ * @param objectsType The object type or entity type the component represents
+ * @param viewMode The view mode the component represents
+ * @param context The optional context the component represents
+ * @param theme The optional theme for the component
+ */
+export function tabulatableObjectsComponent(objectsType: string | GenericConstructor<PaginatedList<ListableObject>>, viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme = DEFAULT_THEME) {
+  return function decorator(component: any) {
+    if (hasNoValue(objectsType)) {
+      return;
+    }
+    if (hasNoValue(map.get(objectsType))) {
+      map.set(objectsType, new Map());
+    }
+    if (hasNoValue(map.get(objectsType).get(viewMode))) {
+      map.get(objectsType).set(viewMode, new Map());
+    }
+    if (hasNoValue(map.get(objectsType).get(viewMode).get(context))) {
+      map.get(objectsType).get(viewMode).set(context, new Map());
+    }
+    map.get(objectsType).get(viewMode).get(context).set(theme, component);
+  };
+}
+
+/**
+ * Getter to retrieve the matching tabulatable objects component
+ *
+ * Looping over the provided types, it'll attempt to find the best match depending on the {@link MatchRelevancy} returned by getMatch()
+ * The most relevant match between types is kept and eventually returned
+ *
+ * @param types The types of which one should match the tabulatable component
+ * @param viewMode The view mode that should match the components
+ * @param context The context that should match the components
+ * @param theme The theme that should match the components
+ */
+export function getTabulatableObjectsComponent(types: (string | GenericConstructor<ListableObject>)[], viewMode: ViewMode, context: Context = DEFAULT_CONTEXT, theme: string = DEFAULT_THEME) {
+  let currentBestMatch: MatchRelevancy = null;
+  for (const type of types) {
+    const typeMap = map.get(PaginatedList<typeof type>);
+
+    if (hasValue(typeMap)) {
+      const match = getMatch(typeMap, [viewMode, context, theme], [DEFAULT_VIEW_MODE, DEFAULT_CONTEXT, DEFAULT_THEME]);
+      if (hasNoValue(currentBestMatch) || currentBestMatch.isLessRelevantThan(match)) {
+        currentBestMatch = match;
+      }
+    }
+  }
+  return hasValue(currentBestMatch) ? currentBestMatch.match : null;
+}
diff --git a/src/app/shared/object-collection/shared/listable-object/listable-object.directive.ts b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
similarity index 54%
rename from src/app/shared/object-collection/shared/listable-object/listable-object.directive.ts
rename to src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
index 93c06961f4..b859f5b3e6 100644
--- a/src/app/shared/object-collection/shared/listable-object/listable-object.directive.ts
+++ b/src/app/shared/object-collection/shared/tabulatable-objects/tabulatable-objects.directive.ts
@@ -1,11 +1,14 @@
-import { Directive, ViewContainerRef } from '@angular/core';
+import {
+  Directive,
+  ViewContainerRef,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsListableObject]',
+  selector: '[dsTabulatableObjects]',
 })
 /**
  * Directive used as a hook to know where to inject the dynamic listable object component
  */
-export class ListableObjectDirective {
+export class TabulatableObjectsDirective {
   constructor(public viewContainerRef: ViewContainerRef) { }
 }
diff --git a/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts b/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts
index fddd5dc203..3f57d2f4cd 100644
--- a/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/workspace-item-search-result.model.ts
@@ -1,6 +1,6 @@
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { searchResultFor } from '../../search/search-result-element-decorator';
 import { SearchResult } from '../../search/models/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a WorkspaceItem object
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
index 3695f4714d..9a80421fbf 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.html
@@ -2,7 +2,7 @@
   <ds-item-detail-preview [item]="item$?.value"
                           [object]="object"
                           [showSubmitter]="showSubmitter"
-                          [status]="status">
+                          [badgeContext]="badgeContext">
   </ds-item-detail-preview>
 
   <ds-claimed-task-actions [item]="item$.value"
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
index b2bbb69ef4..de13541916 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.spec.ts
@@ -1,23 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { ClaimedTaskSearchResultDetailElementComponent } from './claimed-task-search-result-detail-element.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { VarDirective } from '../../../utils/var.directive';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { By } from '@angular/platform-browser';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { VarDirective } from '../../../utils/var.directive';
+import { ClaimedTaskSearchResultDetailElementComponent } from './claimed-task-search-result-detail-element.component';
 
 let component: ClaimedTaskSearchResultDetailElementComponent;
 let fixture: ComponentFixture<ClaimedTaskSearchResultDetailElementComponent>;
@@ -33,28 +42,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -62,7 +71,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('ClaimedTaskSearchResultDetailElementComponent', () => {
@@ -71,12 +80,13 @@ describe('ClaimedTaskSearchResultDetailElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [ClaimedTaskSearchResultDetailElementComponent, VarDirective],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: LinkService, useValue: linkService },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedTaskSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -95,19 +105,19 @@ describe('ClaimedTaskSearchResultDetailElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
   }));
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.VALIDATION);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceValidation);
   });
 
   it('should forward claimed-task-actions processComplete event to reloadObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-claimed-task-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
index 2ee661ef38..fb230a2b2d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/claimed-task-search-result/claimed-task-search-result-detail-element.component.ts
@@ -1,24 +1,36 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+import { Context } from 'src/app/core/shared/context.model';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { isNotEmpty } from '../../../empty.util';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders claimed task object for the search result in the detail view.
@@ -26,7 +38,7 @@ import { ObjectCacheService } from '../../../../core/cache/object-cache.service'
 @Component({
   selector: 'ds-claimed-task-search-result-detail-element',
   styleUrls: ['../search-result-detail-element.component.scss'],
-  templateUrl: './claimed-task-search-result-detail-element.component.html'
+  templateUrl: './claimed-task-search-result-detail-element.component.html',
 })
 
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.DetailedListElement)
@@ -43,17 +55,21 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
   public showSubmitter = true;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.VALIDATION;
+  public badgeContext = Context.MyDSpaceValidation;
 
   /**
    * The workflowitem object that belonging to the result object
    */
   public workflowitem$: BehaviorSubject<WorkflowItem> = new BehaviorSubject<WorkflowItem>(null);
 
-  constructor(protected linkService: LinkService, protected objectCache: ObjectCacheService) {
-    super();
+  constructor(
+    public dsoNameService: DSONameService,
+    protected linkService: LinkService,
+    protected objectCache: ObjectCacheService,
+  ) {
+    super(dsoNameService);
   }
 
   /**
@@ -63,7 +79,7 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -72,7 +88,7 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -82,13 +98,15 @@ export class ClaimedTaskSearchResultDetailElementComponent extends SearchResultD
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
   }
 
   ngOnDestroy() {
     // This ensures the object is removed from cache, when action is performed on task
-    this.objectCache.remove(this.dso._links.workflowitem.href);
+    if (hasValue(this.dso)) {
+      this.objectCache.remove(this.dso._links.workflowitem.href);
+    }
   }
 
 }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts
index 56a0df1faa..01deadb305 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.spec.ts
@@ -1,15 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../../../mocks/translate-loader.mock';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field.component';
 
 let component: ItemDetailPreviewFieldComponent;
 let fixture: ComponentFixture<ItemDetailPreviewFieldComponent>;
@@ -20,28 +29,28 @@ const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
-    ]
-  }
+        value: 'Article',
+      },
+    ],
+  },
 });
 
 describe('ItemDetailPreviewFieldComponent', () => {
@@ -52,19 +61,19 @@ describe('ItemDetailPreviewFieldComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ItemDetailPreviewFieldComponent, TruncatePipe],
       providers: [
-        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } }
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } },
 
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemDetailPreviewFieldComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
index 5faf02eac0..7a0578313b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component.ts
@@ -1,7 +1,10 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
-import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { Item } from '../../../../../core/shared/item.model';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { SearchResult } from '../../../../search/models/search-result.model';
 
 /**
@@ -9,7 +12,7 @@ import { SearchResult } from '../../../../search/models/search-result.model';
  */
 @Component({
   selector: 'ds-item-detail-preview-field',
-  templateUrl: './item-detail-preview-field.component.html'
+  templateUrl: './item-detail-preview-field.component.html',
 })
 export class ItemDetailPreviewFieldComponent {
 
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 c9c2da5c2e..bd00c9411f 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
@@ -1,21 +1,19 @@
 <div *ngIf="item" class="item-page" @fadeInOut>
-  <ng-container *ngIf="status">
-    <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-  </ng-container>
+  <ds-themed-badges [object]="item" [context]="badgeContext"></ds-themed-badges>
   <div *ngIf="item">
-    <ds-item-page-title-field [item]="item">
-    </ds-item-page-title-field>
+    <ds-themed-item-page-title-field [item]="item">
+    </ds-themed-item-page-title-field>
     <div class="row mb-1">
       <div class="col-xs-12 col-md-4">
         <ds-metadata-field-wrapper [hideIfNoTextContent]="false">
-          <ds-thumbnail [thumbnail]="item?.thumbnail | async"></ds-thumbnail>
+          <ds-themed-thumbnail [thumbnail]="item?.thumbnail | async"></ds-themed-thumbnail>
         </ds-metadata-field-wrapper>
         <ng-container *ngVar="(getFiles() | 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)">
-                <span>{{file?.name}}</span>
-                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
+                <span>{{ dsoNameService.getName(file) }}</span>
+                <span>({{(file?.sizeBytes) | dsFileSize }})</span>
                 <span *ngIf="!last" innerHTML="{{separator}}"></span>
               </button>
             </div>
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..1362eb65ca 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
@@ -1,10 +1,19 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { Observable } from 'rxjs';
 
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
@@ -13,6 +22,7 @@ import { BitstreamDataService } from '../../../../core/data/bitstream-data.servi
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
+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 { Bitstream } from '../../../../core/shared/bitstream.model';
@@ -22,21 +32,20 @@ import { Item } from '../../../../core/shared/item.model';
 import { UUIDService } from '../../../../core/shared/uuid.service';
 import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
 import { NotificationsService } from '../../../notifications/notifications.service';
-import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../remote-data.utils';
+import { HALEndpointServiceStub } from '../../../testing/hal-endpoint-service.stub';
+import { createPaginatedList } from '../../../testing/utils.test';
 import { FileSizePipe } from '../../../utils/file-size-pipe';
 import { FollowLinkConfig } from '../../../utils/follow-link-config.model';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { VarDirective } from '../../../utils/var.directive';
-import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field/item-detail-preview-field.component';
 import { ItemDetailPreviewComponent } from './item-detail-preview.component';
-import { createPaginatedList } from '../../../testing/utils.test';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { ItemDetailPreviewFieldComponent } from './item-detail-preview-field/item-detail-preview-field.component';
 
 function getMockFileService(): FileService {
   return jasmine.createSpyObj('FileService', {
     downloadFile: jasmine.createSpy('downloadFile'),
-    getFileNameFromResponseContentDisposition: jasmine.createSpy('getFileNameFromResponseContentDisposition')
+    getFileNameFromResponseContentDisposition: jasmine.createSpy('getFileNameFromResponseContentDisposition'),
   });
 }
 
@@ -49,28 +58,28 @@ const mockItem: Item = Object.assign(new Item(), {
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
-    ]
-  }
+        value: 'Article',
+      },
+    ],
+  },
 });
 
 describe('ItemDetailPreviewComponent', () => {
@@ -89,8 +98,8 @@ describe('ItemDetailPreviewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [ItemDetailPreviewComponent, ItemDetailPreviewFieldComponent, TruncatePipe, FileSizePipe, VarDirective],
@@ -109,9 +118,9 @@ describe('ItemDetailPreviewComponent', () => {
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamDataService, useValue: mockBitstreamDataService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemDetailPreviewComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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 778e455004..f0f60561ed 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,16 +1,19 @@
-import { Component, Input } from '@angular/core';
-
+import {
+  Component,
+  Input,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 
-import { Item } from '../../../../core/shared/item.model';
-import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { fadeInOut } from '../../../animations/fade';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { Context } from '../../../../core/shared/context.model';
 import { FileService } from '../../../../core/shared/file.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstSucceededRemoteListPayload } from '../../../../core/shared/operators';
+import { fadeInOut } from '../../../animations/fade';
 import { SearchResult } from '../../../search/models/search-result.model';
 
 /**
@@ -20,10 +23,9 @@ import { SearchResult } from '../../../search/models/search-result.model';
   selector: 'ds-item-detail-preview',
   styleUrls: ['./item-detail-preview.component.scss'],
   templateUrl: './item-detail-preview.component.html',
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemDetailPreviewComponent {
-
   /**
    * The item to display
    */
@@ -35,9 +37,9 @@ export class ItemDetailPreviewComponent {
   @Input() object: SearchResult<any>;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  @Input() status: MyDspaceItemStatusType;
+  @Input() badgeContext: Context;
 
   /**
    * A boolean representing if to show submitter information
@@ -54,16 +56,12 @@ export class ItemDetailPreviewComponent {
    */
   public separator = ', ';
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {FileService} fileService
-   * @param {HALEndpointService} halService
-   * @param {BitstreamDataService} bitstreamDataService
-   */
-  constructor(private fileService: FileService,
-              private halService: HALEndpointService,
-              private bitstreamDataService: BitstreamDataService) {
+  constructor(
+    protected fileService: FileService,
+    protected halService: HALEndpointService,
+    protected bitstreamDataService: BitstreamDataService,
+    public dsoNameService: DSONameService,
+  ) {
   }
 
   /**
@@ -83,7 +81,7 @@ export class ItemDetailPreviewComponent {
     return this.bitstreamDataService
       .findAllByItemAndBundleName(this.item, 'ORIGINAL', { elementsPerPage: Number.MAX_SAFE_INTEGER })
       .pipe(
-        getFirstSucceededRemoteListPayload()
+        getFirstSucceededRemoteListPayload(),
       );
   }
 }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.html
index 2b687960ab..1c19201c63 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.html
@@ -1,6 +1,6 @@
 <ds-item-detail-preview [item]="dso"
                         [object]="object"
-                        [status]="status">
+                        [badgeContext]="badgeContext">
 </ds-item-detail-preview>
 
 <ds-item-actions [object]="dso"></ds-item-actions>
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
index 8d602d5eb2..48dc0b438b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.spec.ts
@@ -1,13 +1,21 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
+import { Context } from 'src/app/core/shared/context.model';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
-import { ItemSearchResultDetailElementComponent } from './item-search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { ItemSearchResultDetailElementComponent } from './item-search-result-detail-element.component';
 
 let component: ItemSearchResultDetailElementComponent;
 let fixture: ComponentFixture<ItemSearchResultDetailElementComponent>;
@@ -23,28 +31,28 @@ mockResultObject.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 describe('ItemSearchResultDetailElementComponent', () => {
@@ -52,9 +60,12 @@ describe('ItemSearchResultDetailElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [NoopAnimationsModule],
       declarations: [ItemSearchResultDetailElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -68,7 +79,7 @@ describe('ItemSearchResultDetailElementComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.ARCHIVED);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceArchived);
   });
 });
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
index 27a94b0cf5..05916cdaff 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-search-result/item-search-result-detail-element.component.ts
@@ -1,14 +1,11 @@
 import { Component } from '@angular/core';
 
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Item } from '../../../../core/shared/item.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders item object for the search result in the detail view.
@@ -16,7 +13,7 @@ import { Context } from '../../../../core/shared/context.model';
 @Component({
   selector: 'ds-item-search-result-detail-element',
   styleUrls: ['../search-result-detail-element.component.scss', './item-search-result-detail-element.component.scss'],
-  templateUrl: './item-search-result-detail-element.component.html'
+  templateUrl: './item-search-result-detail-element.component.html',
 })
 
 @listableObjectComponent(ItemSearchResult, ViewMode.DetailedListElement, Context.Workspace)
@@ -24,8 +21,8 @@ import { Context } from '../../../../core/shared/context.model';
 export class ItemSearchResultDetailElementComponent extends SearchResultDetailElementComponent<ItemSearchResult, Item> {
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.ARCHIVED;
+  public badgeContext = Context.MyDSpaceArchived;
 
 }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
index c9165b416a..d2a15b016f 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.html
@@ -2,7 +2,7 @@
   <ds-item-detail-preview [item]="item$?.value"
                           [object]="object"
                           [showSubmitter]="showSubmitter"
-                          [status]="status"></ds-item-detail-preview>
+                          [badgeContext]="badgeContext"></ds-item-detail-preview>
 
   <ds-pool-task-actions [item]="item$.value"
                         [object]="dso"
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
index 59725233ba..b7b229e6ad 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.spec.ts
@@ -1,23 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
-import { of as observableOf } from 'rxjs';
-
-import { Item } from '../../../../core/shared/item.model';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
-import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
-import { VarDirective } from '../../../utils/var.directive';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { of as observableOf } from 'rxjs';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { VarDirective } from '../../../utils/var.directive';
+import { PoolSearchResultDetailElementComponent } from './pool-search-result-detail-element.component';
 
 let component: PoolSearchResultDetailElementComponent;
 let fixture: ComponentFixture<PoolSearchResultDetailElementComponent>;
@@ -33,28 +42,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -62,7 +71,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('PoolSearchResultDetailElementComponent', () => {
@@ -71,14 +80,15 @@ describe('PoolSearchResultDetailElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [PoolSearchResultDetailElementComponent, VarDirective],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: 'objectElementProvider', useValue: (mockResultObject) },
         { provide: 'indexElementProvider', useValue: (compIndex) },
         { provide: LinkService, useValue: linkService },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -97,19 +107,19 @@ describe('PoolSearchResultDetailElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
   }));
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.WAITING_CONTROLLER);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceWaitingController);
   });
 
   it('should forward pool-task-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
     const actionsComponents = fixture.debugElement.query(By.css('ds-pool-task-actions'));
     actionsComponents.triggerEventHandler('processCompleted', actionPayload);
     tick();
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
index 6dec14f9cb..26ea26c6a7 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/pool-search-result/pool-search-result-detail-element.component.ts
@@ -1,24 +1,36 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
-
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
-
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { Item } from '../../../../core/shared/item.model';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { isNotEmpty } from '../../../empty.util';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders pool task object for the search result in the detail view.
@@ -43,17 +55,21 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
   public showSubmitter = true;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.WAITING_CONTROLLER;
+  public badgeContext = Context.MyDSpaceWaitingController;
 
   /**
    * The workflowitem object that belonging to the result object
    */
   public workflowitem$: BehaviorSubject<WorkflowItem> = new BehaviorSubject<WorkflowItem>(null);
 
-  constructor(protected linkService: LinkService, protected objectCache: ObjectCacheService) {
-    super();
+  constructor(
+    public dsoNameService: DSONameService,
+    protected linkService: LinkService,
+    protected objectCache: ObjectCacheService,
+  ) {
+    super(dsoNameService);
   }
 
   /**
@@ -63,7 +79,7 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -72,7 +88,7 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -82,14 +98,16 @@ export class PoolSearchResultDetailElementComponent extends SearchResultDetailEl
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
 
   }
 
   ngOnDestroy() {
     // This ensures the object is removed from cache, when action is performed on task
-    this.objectCache.remove(this.dso._links.workflowitem.href);
+    if (hasValue(this.dso)) {
+      this.objectCache.remove(this.dso._links.workflowitem.href);
+    }
   }
 
 }
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
index 5b0bd2c39b..1880da1eb0 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/search-result-detail-element.component.ts
@@ -1,9 +1,12 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { SearchResult } from '../../search/models/search-result.model';
 
 /**
@@ -11,7 +14,7 @@ import { SearchResult } from '../../search/models/search-result.model';
  */
 @Component({
   selector: 'ds-search-result-detail-element',
-  template: ``
+  template: ``,
 })
 export class SearchResultDetailElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> implements OnInit {
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.html
index 7ff1a9bf72..ddd6af453c 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.html
@@ -1,6 +1,6 @@
 <ds-item-detail-preview [item]="item"
                         [object]="object"
-                        [status]="status"></ds-item-detail-preview>
+                        [badgeContext]="badgeContext"></ds-item-detail-preview>
 
 <ds-workflowitem-actions [object]="dso"></ds-workflowitem-actions>
 
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
index 536bd6d0bb..8fb826f69b 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.spec.ts
@@ -1,19 +1,25 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { WorkflowItemSearchResultDetailElementComponent } from './workflow-item-search-result-detail-element.component';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { WorkflowItemSearchResultDetailElementComponent } from './workflow-item-search-result-detail-element.component';
 
 let component: WorkflowItemSearchResultDetailElementComponent;
 let fixture: ComponentFixture<WorkflowItemSearchResultDetailElementComponent>;
@@ -30,28 +36,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkflowItem(), { item: observableOf(rd) });
@@ -67,9 +73,9 @@ describe('WorkflowItemSearchResultDetailElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkflowItemSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -87,7 +93,7 @@ describe('WorkflowItemSearchResultDetailElementComponent', () => {
     expect(component.item).toEqual(item);
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.WORKFLOW);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceWorkflow);
   });
 });
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
index 8dc510d2aa..976b630acf 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workflow-item-search-result/workflow-item-search-result-detail-element.component.ts
@@ -1,18 +1,19 @@
 import { Component } from '@angular/core';
-
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { Item } from '../../../../core/shared/item.model';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
 import { find } from 'rxjs/operators';
+import { Context } from 'src/app/core/shared/context.model';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { isNotUndefined } from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { followLink } from '../../../utils/follow-link-config.model';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders workflowitem object for the search result in the detail view.
@@ -32,14 +33,15 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
   public item: Item;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.WORKFLOW;
+  public badgeContext = Context.MyDSpaceWorkflow;
 
   constructor(
-    protected linkService: LinkService
+    public dsoNameService: DSONameService,
+    protected linkService: LinkService,
   ) {
-    super();
+    super(dsoNameService);
   }
 
   /**
@@ -56,7 +58,7 @@ export class WorkflowItemSearchResultDetailElementComponent extends SearchResult
    */
   initItem(item$: Observable<RemoteData<Item>>) {
     item$.pipe(
-      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload))
+      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload)),
     ).subscribe((rd: RemoteData<Item>) => {
       this.item = rd.payload;
     });
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.html
index 8d4eee6ba9..4414933e02 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.html
@@ -1,5 +1,5 @@
 <ds-item-detail-preview [item]="item"
                         [object]="object"
-                        [status]="status"></ds-item-detail-preview>
+                        [badgeContext]="badgeContext"></ds-item-detail-preview>
 
 <ds-workspaceitem-actions [object]="dso"></ds-workspaceitem-actions>
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
index 00a20b006a..9fdf1b126d 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.spec.ts
@@ -1,19 +1,25 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
+import { Context } from 'src/app/core/shared/context.model';
 
-import { Item } from '../../../../core/shared/item.model';
-import { WorkspaceItemSearchResultDetailElementComponent } from './workspace-item-search-result-detail-element.component';
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { LinkService } from '../../../../core/cache/builders/link.service';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
 import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { WorkspaceItemSearchResultDetailElementComponent } from './workspace-item-search-result-detail-element.component';
 
 let component: WorkspaceItemSearchResultDetailElementComponent;
 let fixture: ComponentFixture<WorkspaceItemSearchResultDetailElementComponent>;
@@ -30,28 +36,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rd = createSuccessfulRemoteDataObject(item);
 mockResultObject.indexableObject = Object.assign(new WorkspaceItem(), { item: observableOf(rd) });
@@ -67,9 +73,9 @@ describe('WorkspaceItemSearchResultDetailElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkspaceItemSearchResultDetailElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -87,7 +93,7 @@ describe('WorkspaceItemSearchResultDetailElementComponent', () => {
     expect(component.item).toEqual(item);
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceWorkspace);
   });
 });
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
index e4781fe0b2..a6218fd9e8 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/workspace-item-search-result/workspace-item-search-result-detail-element.component.ts
@@ -1,19 +1,19 @@
 import { Component } from '@angular/core';
-
 import { Observable } from 'rxjs';
 import { find } from 'rxjs/operators';
 
-import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
-import { Item } from '../../../../core/shared/item.model';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../core/data/remote-data';
-import { isNotUndefined } from '../../../empty.util';
-import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { isNotUndefined } from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
+import { SearchResultDetailElementComponent } from '../search-result-detail-element.component';
 
 /**
  * This component renders workspace item object for the search result in the detail view.
@@ -33,14 +33,15 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
   public item: Item;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  status = MyDspaceItemStatusType.WORKSPACE;
+  public badgeContext = Context.MyDSpaceWorkspace;
 
   constructor(
-    protected linkService: LinkService
+    public dsoNameService: DSONameService,
+    protected linkService: LinkService,
   ) {
-    super();
+    super(dsoNameService);
   }
 
   /**
@@ -57,7 +58,7 @@ export class WorkspaceItemSearchResultDetailElementComponent extends SearchResul
    */
   initItem(item$: Observable<RemoteData<Item>>) {
     item$.pipe(
-      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload))
+      find((rd: RemoteData<Item>) => rd.hasSucceeded && isNotUndefined(rd.payload)),
     ).subscribe((rd: RemoteData<Item>) => {
       this.item = rd.payload;
     });
diff --git a/src/app/shared/object-detail/object-detail.component.html b/src/app/shared/object-detail/object-detail.component.html
index 05b8342ca3..d077e2fd2b 100644
--- a/src/app/shared/object-detail/object-detail.component.html
+++ b/src/app/shared/object-detail/object-detail.component.html
@@ -21,6 +21,7 @@
         <ds-listable-object-component-loader [object]="object"
                                              [viewMode]="viewMode"
                                              [context]="context"
+                                             [showThumbnails]="showThumbnails"
                                              (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
       </div>
     </div>
diff --git a/src/app/shared/object-detail/object-detail.component.spec.ts b/src/app/shared/object-detail/object-detail.component.spec.ts
index d0fcbed4eb..46c8234182 100644
--- a/src/app/shared/object-detail/object-detail.component.spec.ts
+++ b/src/app/shared/object-detail/object-detail.component.spec.ts
@@ -1,14 +1,27 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ObjectDetailComponent } from './object-detail.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { ObjectDetailComponent } from './object-detail.component';
 
 describe('ObjectDetailComponent', () => {
   let comp: ObjectDetailComponent;
@@ -31,7 +44,7 @@ describe('ObjectDetailComponent', () => {
     elementsPerPage: 1,
     totalElements: 10,
     totalPages: 10,
-    currentPage: 1
+    currentPage: 1,
   });
   const mockRD = createSuccessfulRemoteDataObject(buildPaginatedList(pageInfo, testObjects));
 
@@ -42,14 +55,14 @@ describe('ObjectDetailComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [ObjectDetailComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ObjectDetailComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-detail/object-detail.component.ts b/src/app/shared/object-detail/object-detail.component.ts
index 15bd5b7bca..800a003c21 100644
--- a/src/app/shared/object-detail/object-detail.component.ts
+++ b/src/app/shared/object-detail/object-detail.component.ts
@@ -1,16 +1,24 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
 
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
-
 import { RemoteData } from '../../core/data/remote-data';
-import { fadeIn } from '../animations/fade';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
 import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeIn } from '../animations/fade';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 /**
  * This component renders a paginated set of results in the detail view.
@@ -21,7 +29,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
   selector: 'ds-object-detail',
   styleUrls: [ './object-detail.component.scss' ],
   templateUrl: './object-detail.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class ObjectDetailComponent {
   /**
@@ -64,6 +72,11 @@ export class ObjectDetailComponent {
    */
   @Input() showPaginator = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * Emit when one of the listed object has changed.
    */
@@ -185,14 +198,14 @@ export class ObjectDetailComponent {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
index 4d6d5cb1c3..e74631dfa7 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.html
@@ -1,17 +1,17 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+    <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
+    <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </span>
   <div class="card-body">
-    <h4 class="card-title">{{object.name}}</h4>
+    <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
     <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+    <div *ngIf="linkType !== linkTypes.None" class="text-center">
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
index e5420f7d4f..85b448e9d5 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.spec.ts
@@ -1,11 +1,19 @@
-import { CollectionGridElementComponent } from './collection-grid-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Collection } from '../../../core/shared/collection.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { CollectionGridElementComponent } from './collection-grid-element.component';
+
 let collectionGridElementComponent: CollectionGridElementComponent;
 let fixture: ComponentFixture<CollectionGridElementComponent>;
 
@@ -14,10 +22,10 @@ const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
@@ -25,31 +33,31 @@ const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection()
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCollectionWithAbstract
+  resolveLink: mockCollectionWithAbstract,
 });
 
 describe('CollectionGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CollectionGridElementComponent],
       providers: [
         { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
index b6a7cc056b..2d70fe7b60 100644
--- a/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
+++ b/src/app/shared/object-grid/collection-grid-element/collection-grid-element.component.ts
@@ -1,11 +1,19 @@
-import { Component, Input } from '@angular/core';
-import { Collection } from '../../../core/shared/collection.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { hasNoValue, hasValue } from '../../empty.util';
-import { followLink } from '../../utils/follow-link-config.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../empty.util';
+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 { followLink } from '../../utils/follow-link-config.model';
 
 /**
  * Component representing a grid element for collection
@@ -21,8 +29,11 @@ export class CollectionGridElementComponent extends AbstractListableElementCompo
 > {
   private _object: Collection;
 
-  constructor(private linkService: LinkService) {
-    super();
+  constructor(
+    public dsoNameService: DSONameService,
+    private linkService: LinkService,
+  ) {
+    super(dsoNameService);
   }
 
   // @ts-ignore
@@ -31,7 +42,7 @@ export class CollectionGridElementComponent extends AbstractListableElementCompo
     if (hasValue(this._object) && hasNoValue(this._object.logo)) {
       this.linkService.resolveLink<Collection>(
         this._object,
-        followLink('logo')
+        followLink('logo'),
       );
     }
   }
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
index c9833b8829..d45ae05cd4 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.html
@@ -1,17 +1,17 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+    <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
+    <ds-themed-thumbnail [thumbnail]="(object.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </span>
   <div class="card-body">
-    <h4 class="card-title">{{object.name}}</h4>
+    <h4 class="card-title">{{ dsoNameService.getName(object) }}</h4>
     <p *ngIf="object.shortDescription" class="card-text">{{object.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+    <div *ngIf="linkType !== linkTypes.None" class="text-center">
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', object.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
index 2bf682350e..628fbe268e 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.spec.ts
@@ -1,11 +1,19 @@
-import { CommunityGridElementComponent } from './community-grid-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Community } from '../../../core/shared/community.model';
-import { LinkService } from '../../../core/cache/builders/link.service';
 import { TranslateModule } from '@ngx-translate/core';
 
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { Community } from '../../../core/shared/community.model';
+import { CommunityGridElementComponent } from './community-grid-element.component';
+
 let communityGridElementComponent: CommunityGridElementComponent;
 let fixture: ComponentFixture<CommunityGridElementComponent>;
 
@@ -14,10 +22,10 @@ const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
@@ -25,31 +33,31 @@ const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCommunityWithAbstract
+  resolveLink: mockCommunityWithAbstract,
 });
 
 describe('CommunityGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CommunityGridElementComponent],
       providers: [
         { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunityGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
index 001c3e3080..58fbde43c1 100644
--- a/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
+++ b/src/app/shared/object-grid/community-grid-element/community-grid-element.component.ts
@@ -1,11 +1,19 @@
-import { Component, Input } from '@angular/core';
-import { Community } from '../../../core/shared/community.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ViewMode } from '../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { followLink } from '../../utils/follow-link-config.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../core/cache/builders/link.service';
-import { hasNoValue, hasValue } from '../../empty.util';
+import { Community } from '../../../core/shared/community.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../empty.util';
+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 { followLink } from '../../utils/follow-link-config.model';
 
 /**
  * Component representing a grid element for a community
@@ -13,15 +21,18 @@ import { hasNoValue, hasValue } from '../../empty.util';
 @Component({
   selector: 'ds-community-grid-element',
   styleUrls: ['./community-grid-element.component.scss'],
-  templateUrl: './community-grid-element.component.html'
+  templateUrl: './community-grid-element.component.html',
 })
 
 @listableObjectComponent(Community, ViewMode.GridElement)
 export class CommunityGridElementComponent extends AbstractListableElementComponent<Community> {
   private _object: Community;
 
-  constructor( private linkService: LinkService) {
-    super();
+  constructor(
+    public dsoNameService: DSONameService,
+    private linkService: LinkService,
+  ) {
+    super(dsoNameService);
   }
 
   // @ts-ignore
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
index 645897ebbf..b104778e8b 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TruncatePipe } from '../../../../utils/truncate.pipe';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { ItemGridElementComponent } from './item-grid-element.component';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
 import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { Item } from '../../../../../core/shared/item.model';
 import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { ItemGridElementComponent } from './item-grid-element.component';
 
 const mockItem = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
@@ -17,28 +26,28 @@ const mockItem = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is an abstract'
-      }
-    ]
-  }
+        value: 'This is an abstract',
+      },
+    ],
+  },
 });
 
 describe('ItemGridElementComponent', () => {
@@ -54,11 +63,12 @@ describe('ItemGridElementComponent', () => {
       imports: [NoopAnimationsModule],
       declarations: [ItemGridElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
index c8a58c5a89..fd2c498c9a 100644
--- a/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
+++ b/src/app/shared/object-grid/item-grid-element/item-types/item/item-grid-element.component.ts
@@ -1,9 +1,10 @@
 import { Component } from '@angular/core';
-import { focusShadow } from '../../../../animations/focus';
+
+import { Item } from '../../../../../core/shared/item.model';
 import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { focusShadow } from '../../../../animations/focus';
 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';
 
 @listableObjectComponent('Publication', ViewMode.GridElement)
 @listableObjectComponent(Item, ViewMode.GridElement)
@@ -11,7 +12,7 @@ import { Item } from '../../../../../core/shared/item.model';
   selector: 'ds-item-grid-element',
   styleUrls: ['./item-grid-element.component.scss'],
   templateUrl: './item-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item of the type Publication
diff --git a/src/app/shared/object-grid/object-grid.component.html b/src/app/shared/object-grid/object-grid.component.html
index 4050f93f77..59fe18820d 100644
--- a/src/app/shared/object-grid/object-grid.component.html
+++ b/src/app/shared/object-grid/object-grid.component.html
@@ -19,7 +19,11 @@
     <div class="card-columns row" *ngIf="objects?.hasSucceeded">
       <div class="card-column col col-sm-6 col-lg-4" *ngFor="let column of (columns$ | async)" @fadeIn>
         <div class="card-element" *ngFor="let object of column" [attr.data-test]="'grid-object' | dsBrowserOnly">
-          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
+          <ds-listable-object-component-loader [object]="object"
+                                               [viewMode]="viewMode"
+                                               [context]="context"
+                                               [showThumbnails]="showThumbnails"
+                                               [linkType]="linkType"></ds-listable-object-component-loader>
         </div>
       </div>
     </div>
diff --git a/src/app/shared/object-grid/object-grid.component.spec.ts b/src/app/shared/object-grid/object-grid.component.spec.ts
index 61571f334d..11281207b3 100644
--- a/src/app/shared/object-grid/object-grid.component.spec.ts
+++ b/src/app/shared/object-grid/object-grid.component.spec.ts
@@ -1,5 +1,9 @@
-import { cold, hot } from 'jasmine-marbles';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
 import { map } from 'rxjs/operators';
+
 import { WidthCategory } from '../host-window.service';
 import { ObjectGridComponent } from './object-grid.component';
 
@@ -14,12 +18,12 @@ describe('ObjectGridComponent', () => {
     { seven: 7 },
     { eight: 8 },
     { nine: 9 },
-    { ten: 10 }
+    { ten: 10 },
   ];
   const mockRD = {
     payload: {
-      page: testObjects
-    }
+      page: testObjects,
+    },
   } as any;
 
   describe('the number of columns', () => {
@@ -37,7 +41,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 3 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -56,7 +60,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 3 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -75,7 +79,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 2 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -94,7 +98,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 2 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -113,7 +117,7 @@ describe('ObjectGridComponent', () => {
       const expected = cold('c', { c: 1 });
 
       const result = comp.columns$.pipe(
-        map((columns) => columns.length)
+        map((columns) => columns.length),
       );
 
       expect(result).toBeObservable(expected);
@@ -136,8 +140,8 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[3], testObjects[6], testObjects[9]],
           [testObjects[1], testObjects[4], testObjects[7]],
-          [testObjects[2], testObjects[5], testObjects[8]]
-        ]
+          [testObjects[2], testObjects[5], testObjects[8]],
+        ],
       });
 
       const result = comp.columns$;
@@ -159,8 +163,8 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[3], testObjects[6], testObjects[9]],
           [testObjects[1], testObjects[4], testObjects[7]],
-          [testObjects[2], testObjects[5], testObjects[8]]
-        ]
+          [testObjects[2], testObjects[5], testObjects[8]],
+        ],
       });
 
       const result = comp.columns$;
@@ -182,7 +186,7 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[2], testObjects[4], testObjects[6], testObjects[8]],
           [testObjects[1], testObjects[3], testObjects[5], testObjects[7], testObjects[9]],
-        ]
+        ],
       });
 
       const result = comp.columns$;
@@ -204,7 +208,7 @@ describe('ObjectGridComponent', () => {
         c: [
           [testObjects[0], testObjects[2], testObjects[4], testObjects[6], testObjects[8]],
           [testObjects[1], testObjects[3], testObjects[5], testObjects[7], testObjects[9]],
-        ]
+        ],
       });
 
       const result = comp.columns$;
diff --git a/src/app/shared/object-grid/object-grid.component.ts b/src/app/shared/object-grid/object-grid.component.ts
index 1b5ab075e2..e292cd07f0 100644
--- a/src/app/shared/object-grid/object-grid.component.ts
+++ b/src/app/shared/object-grid/object-grid.component.ts
@@ -1,28 +1,43 @@
-import { combineLatest as observableCombineLatest, BehaviorSubject, Observable } from 'rxjs';
-
-import { startWith, distinctUntilChanged, map } from 'rxjs/operators';
 import {
   ChangeDetectionStrategy,
   Component,
   EventEmitter,
-  Input, OnInit,
+  Input,
+  OnInit,
   Output,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  startWith,
+} from 'rxjs/operators';
 
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
-
 import { RemoteData } from '../../core/data/remote-data';
-import { fadeIn } from '../animations/fade';
-import { hasNoValue, hasValue } from '../empty.util';
-import { HostWindowService, WidthCategory } from '../host-window.service';
-import { ListableObject } from '../object-collection/shared/listable-object.model';
-
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
 import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeIn } from '../animations/fade';
+import {
+  hasNoValue,
+  hasValue,
+} from '../empty.util';
+import {
+  HostWindowService,
+  WidthCategory,
+} from '../host-window.service';
 import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
@@ -30,7 +45,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
   selector: 'ds-object-grid',
   styleUrls: ['./object-grid.component.scss'],
   templateUrl: './object-grid.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 
 export class ObjectGridComponent implements OnInit {
@@ -54,6 +69,11 @@ export class ObjectGridComponent implements OnInit {
    */
   @Input() showPaginator = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * The whether or not the gear is hidden
    */
@@ -177,7 +197,7 @@ export class ObjectGridComponent implements OnInit {
           }
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     ).pipe(startWith(3));
 
     this.columns$ = observableCombineLatest(
@@ -245,14 +265,14 @@ export class ObjectGridComponent implements OnInit {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
index b05bb4f7ba..5874ec8d67 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.html
@@ -1,18 +1,18 @@
 <div class="card">
-  <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+  <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+    <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </a>
-  <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+  <span *ngIf="linkType === linkTypes.None" class="card-img-top">
+    <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </span>
   <div class="card-body">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-    <h4 class="card-title">{{dso.name}}</h4>
+    <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
+    <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
     <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-    <div *ngIf="linkType != linkTypes.None" class="text-center">
-      <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+    <div *ngIf="linkType !== linkTypes.None" class="text-center">
+      <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/collections/',  dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
     </div>
   </div>
   <ng-content></ng-content>
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..f1e2eaa47f 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
@@ -1,12 +1,23 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
@@ -18,9 +29,6 @@ import { CollectionSearchResult } from '../../../object-collection/shared/collec
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { CollectionSearchResultGridElementComponent } from './collection-search-result-grid-element.component';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TranslateModule } from '@ngx-translate/core';
 
 let collectionSearchResultGridElementComponent: CollectionSearchResultGridElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultGridElementComponent>;
@@ -36,10 +44,10 @@ mockCollectionWithAbstract.indexableObject = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
@@ -49,20 +57,20 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(),
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCollectionWithAbstract
+  resolveLink: mockCollectionWithAbstract,
 });
 
 describe('CollectionSearchResultGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CollectionSearchResultGridElementComponent, TruncatePipe],
       providers: [
@@ -80,12 +88,12 @@ describe('CollectionSearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionSearchResultGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
index 9f715b0e79..26098c8f96 100644
--- a/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component.ts
@@ -1,19 +1,27 @@
-import { Component, Input } from '@angular/core';
-import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { Collection } from '../../../../core/shared/collection.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { hasNoValue, hasValue } from '../../../empty.util';
-import { followLink } from '../../../utils/follow-link-config.model';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
 
 @Component({
   selector: 'ds-collection-search-result-grid-element',
   styleUrls: ['../search-result-grid-element.component.scss', 'collection-search-result-grid-element.component.scss'],
-  templateUrl: 'collection-search-result-grid-element.component.html'
+  templateUrl: 'collection-search-result-grid-element.component.html',
 })
 /**
  * Component representing a grid element for a collection search result
@@ -23,11 +31,12 @@ export class CollectionSearchResultGridElementComponent extends SearchResultGrid
   private _dso: Collection;
 
   constructor(
+    public dsoNameService: DSONameService,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(truncatableService, bitstreamDataService);
+    super(dsoNameService, truncatableService, bitstreamDataService);
   }
 
   // @ts-ignore
@@ -36,7 +45,7 @@ export class CollectionSearchResultGridElementComponent extends SearchResultGrid
     if (hasValue(this._dso) && hasNoValue(this._dso.logo)) {
       this.linkService.resolveLink<Collection>(
         this._dso,
-        followLink('logo')
+        followLink('logo'),
       );
     }
   }
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
index d915cdb7a4..f4bf02e845 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.html
@@ -1,18 +1,18 @@
 <div class="card">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
-        <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-        </ds-thumbnail>
+    <a *ngIf="linkType !== linkTypes.None" [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="card-img-top" [attr.title]="'search.results.view-result' | translate">
+        <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+        </ds-themed-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top">
-    <ds-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
-    </ds-thumbnail>
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top">
+    <ds-themed-thumbnail [thumbnail]="(dso.logo | async)?.payload" [limitWidth]="false">
+    </ds-themed-thumbnail>
   </span>
     <div class="card-body">
-        <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-        <h4 class="card-title">{{dso.name}}</h4>
+        <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context"></ds-themed-badges>
+        <h4 class="card-title">{{ dsoNameService.getName(dso) }}</h4>
         <p *ngIf="dso.shortDescription" class="card-text">{{dso.shortDescription}}</p>
-        <div *ngIf="linkType != linkTypes.None" class="text-center">
-            <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
+        <div *ngIf="linkType !== linkTypes.None" class="text-center">
+            <a [target]="(linkType === linkTypes.ExternalLink) ? '_blank' : '_self'" [attr.rel]="(linkType === linkTypes.ExternalLink) ? 'noopener noreferrer' : null" [routerLink]="['/communities/', dso.id]" class="lead btn btn-primary viewButton">{{ 'search.results.view-result' | translate}}</a>
         </div>
     </div>
     <ng-content></ng-content>
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..5ba283ebde 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
@@ -1,12 +1,23 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
+import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
 import { CommunityDataService } from '../../../../core/data/community-data.service';
 import { DefaultChangeAnalyzer } from '../../../../core/data/default-change-analyzer.service';
 import { DSOChangeAnalyzer } from '../../../../core/data/dso-change-analyzer.service';
@@ -18,9 +29,6 @@ import { CommunitySearchResult } from '../../../object-collection/shared/communi
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { TruncatePipe } from '../../../utils/truncate.pipe';
 import { CommunitySearchResultGridElementComponent } from './community-search-result-grid-element.component';
-import { BitstreamFormatDataService } from '../../../../core/data/bitstream-format-data.service';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TranslateModule } from '@ngx-translate/core';
 
 let communitySearchResultGridElementComponent: CommunitySearchResultGridElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultGridElementComponent>;
@@ -36,10 +44,10 @@ mockCommunityWithAbstract.indexableObject = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
@@ -49,20 +57,20 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 const linkService = jasmine.createSpyObj('linkService', {
-  resolveLink: mockCommunityWithAbstract
+  resolveLink: mockCommunityWithAbstract,
 });
 
 describe('CommunitySearchResultGridElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [CommunitySearchResultGridElementComponent, TruncatePipe],
       providers: [
@@ -80,12 +88,12 @@ describe('CommunitySearchResultGridElementComponent', () => {
         { provide: DSOChangeAnalyzer, useValue: {} },
         { provide: DefaultChangeAnalyzer, useValue: {} },
         { provide: BitstreamFormatDataService, useValue: {} },
-        { provide: LinkService, useValue: linkService }
+        { provide: LinkService, useValue: linkService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunitySearchResultGridElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
index 18994e2cd7..dc813efd4b 100644
--- a/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component.ts
@@ -1,14 +1,22 @@
-import { Component, Input } from '@angular/core';
-import { Community } from '../../../../core/shared/community.model';
-import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { BitstreamDataService } from '../../../../core/data/bitstream-data.service';
-import { hasNoValue, hasValue } from '../../../empty.util';
+import { Community } from '../../../../core/shared/community.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  hasNoValue,
+  hasValue,
+} from '../../../empty.util';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
+import { SearchResultGridElementComponent } from '../search-result-grid-element.component';
 
 @Component({
   selector: 'ds-community-search-result-grid-element',
@@ -26,11 +34,12 @@ export class CommunitySearchResultGridElementComponent extends SearchResultGridE
   private _dso: Community;
 
   constructor(
+    public dsoNameService: DSONameService,
     private linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
-    super(truncatableService, bitstreamDataService);
+    super(dsoNameService, truncatableService, bitstreamDataService);
   }
 
   // @ts-ignore
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
index c7e7e2d056..bd11121c74 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.html
@@ -2,22 +2,21 @@
     <div class="position-absolute ml-1">
         <ng-content></ng-content>
     </div>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+    <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">
         <div>
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-            </ds-thumbnail>
+              <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+              </ds-themed-thumbnail>
         </div>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="card-img-top full-width">
+    <span *ngIf="linkType === linkTypes.None" class="card-img-top full-width">
         <div>
-            <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
-            </ds-thumbnail>
+              <ds-themed-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="false">
+              </ds-themed-thumbnail>
         </div>
     </span>
     <div class="card-body">
-        <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-        <ds-access-status-badge [item]="dso"></ds-access-status-badge>
+        <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-themed-badges>
         <ds-truncatable [id]="dso.id">
             <ds-truncatable-part [id]="dso.id" [minLines]="3" type="h4">
                 <h4 class="card-title" [innerHTML]="dsoTitle"></h4>
@@ -36,8 +35,8 @@
                 </p>
             </ds-truncatable-part>
         </ds-truncatable>
-        <div *ngIf="linkType != linkTypes.None" class="text-center">
-            <a [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="[itemPageRoute]"
+        <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>
         </div>
     </div>
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
index 57b863a1b1..ec4a7899c8 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.spec.ts
@@ -1,11 +1,21 @@
 import { HttpClient } from '@angular/common/http';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
+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';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
@@ -28,34 +38,148 @@ import { ItemSearchResultGridElementComponent } from './item-search-result-grid-
 
 const mockItemWithMetadata: ItemSearchResult = new ItemSearchResult();
 mockItemWithMetadata.hitHighlights = {};
+const dcTitle = 'This is just another <em>title</em>';
 mockItemWithMetadata.indexableObject = Object.assign(new Item(), {
+  hitHighlights: {
+    'dc.title': [{
+      value: dcTitle,
+    }],
+  },
   bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: dcTitle,
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is an abstract'
-      }
-    ]
-  }
+        value: 'This is an abstract',
+      },
+    ],
+  },
+});
+const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'person.familyName': [{
+      value: '<em>Michel</em>',
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+      entityType: 'Person',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title',
+          },
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald',
+          },
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher',
+          },
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26',
+          },
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract',
+          },
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'Person',
+          },
+        ],
+        'person.familyName': [
+          {
+            value: 'Michel',
+          },
+        ],
+      },
+    }),
+});
+const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'organization.legalName': [{
+      value: '<em>Science</em>',
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), [])),
+      entityType: 'OrgUnit',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title',
+          },
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald',
+          },
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher',
+          },
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26',
+          },
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract',
+          },
+        ],
+        'organization.legalName': [
+          {
+            value: 'Science',
+          },
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'OrgUnit',
+          },
+        ],
+      },
+    }),
 });
 
 const mockItemWithoutMetadata: ItemSearchResult = new ItemSearchResult();
@@ -66,10 +190,10 @@ mockItemWithoutMetadata.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
-    ]
-  }
+        value: 'This is just another title',
+      },
+    ],
+  },
 });
 
 describe('ItemGridElementComponent', getEntityGridElementTestComponent(ItemSearchResultGridElementComponent, mockItemWithMetadata, mockItemWithoutMetadata, ['authors', 'date', 'abstract']));
@@ -95,14 +219,14 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
     const mockBitstreamDataService = {
       getThumbnailFor(item: Item): Observable<RemoteData<Bitstream>> {
         return createSuccessfulRemoteDataObject$(new Bitstream());
-      }
+      },
     };
 
     beforeEach(waitForAsync(() => {
       TestBed.configureTestingModule({
         imports: [
           NoopAnimationsModule,
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [component, TruncatePipe],
         providers: [
@@ -119,9 +243,9 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
           { provide: DefaultChangeAnalyzer, useValue: {} },
           { provide: BitstreamDataService, useValue: mockBitstreamDataService },
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).overrideComponent(component, {
-        set: { changeDetection: ChangeDetectionStrategy.Default }
+        set: { changeDetection: ChangeDetectionStrategy.Default },
       }).compileComponents();
     }));
 
@@ -154,6 +278,41 @@ export function getEntityGridElementTestComponent(component, searchResultWithMet
           expect(itemAuthorField).toBeNull();
         });
       });
+
+      describe('When the item has title', () => {
+        beforeEach(() => {
+          comp.object = mockItemWithMetadata;
+          fixture.detectChanges();
+        });
+        it('should show highlighted title', () => {
+          const titleField = fixture.debugElement.query(By.css('.card-title'));
+          expect(titleField.nativeNode.innerHTML).toEqual(dcTitle);
+        });
+      });
+
+      describe('When the item is Person and has title', () => {
+        beforeEach(() => {
+          comp.object = mockPerson;
+          fixture.detectChanges();
+        });
+
+        it('should show highlighted title', () => {
+          const titleField = fixture.debugElement.query(By.css('.card-title'));
+          expect(titleField.nativeNode.innerHTML).toEqual('<em>Michel</em>');
+        });
+      });
+
+      describe('When the item is orgUnit and has title', () => {
+        beforeEach(() => {
+          comp.object = mockOrgUnit;
+          fixture.detectChanges();
+        });
+
+        it('should show highlighted title', () => {
+          const titleField = fixture.debugElement.query(By.css('.card-title'));
+          expect(titleField.nativeNode.innerHTML).toEqual('<em>Science</em>');
+        });
+      });
     });
   };
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
index b5f9c016e4..f37b7a21eb 100644
--- a/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component.ts
@@ -1,16 +1,15 @@
 import { Component } from '@angular/core';
-import { focusShadow } from '../../../../animations/focus';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import {
-  listableObjectComponent
-} from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { SearchResultGridElementComponent } from '../../search-result-grid-element.component';
-import { Item } from '../../../../../core/shared/item.model';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
+
 import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { BitstreamDataService } from '../../../../../core/data/bitstream-data.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { getItemPageRoute } from '../../../../../item-page/item-page-routing-paths';
+import { focusShadow } from '../../../../animations/focus';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { SearchResultGridElementComponent } from '../../search-result-grid-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.GridElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.GridElement)
@@ -18,7 +17,7 @@ import { BitstreamDataService } from '../../../../../core/data/bitstream-data.se
   selector: 'ds-item-search-result-grid-element',
   styleUrls: ['./item-search-result-grid-element.component.scss'],
   templateUrl: './item-search-result-grid-element.component.html',
-  animations: [focusShadow]
+  animations: [focusShadow],
 })
 /**
  * The component for displaying a grid element for an item search result of the type Publication
@@ -32,16 +31,16 @@ export class ItemSearchResultGridElementComponent extends SearchResultGridElemen
   dsoTitle: string;
 
   constructor(
+    public dsoNameService: DSONameService,
     protected truncatableService: TruncatableService,
     protected bitstreamDataService: BitstreamDataService,
-    private dsoNameService: DSONameService,
   ) {
-    super(truncatableService, bitstreamDataService);
+    super(dsoNameService, truncatableService, bitstreamDataService);
   }
 
   ngOnInit(): void {
     super.ngOnInit();
     this.itemPageRoute = getItemPageRoute(this.dso);
-    this.dsoTitle = this.dsoNameService.getName(this.dso);
+    this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso);
   }
 }
diff --git a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
index 6e72eaa942..95d233c22e 100644
--- a/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
+++ b/src/app/shared/object-grid/search-result-grid-element/search-result-grid-element.component.ts
@@ -1,17 +1,21 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { SearchResult } from '../../search/models/search-result.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { BitstreamDataService } from '../../../core/data/bitstream-data.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { SearchResult } from '../../search/models/search-result.model';
 import { TruncatableService } from '../../truncatable/truncatable.service';
 
 @Component({
   selector: 'ds-search-result-grid-element',
-  template: ``
+  template: ``,
 })
 export class SearchResultGridElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> implements OnInit {
   /**
@@ -25,10 +29,11 @@ export class SearchResultGridElementComponent<T extends SearchResult<K>, K exten
   isCollapsed$: Observable<boolean>;
 
   public constructor(
+    public dsoNameService: DSONameService,
     protected truncatableService: TruncatableService,
-    protected bitstreamDataService: BitstreamDataService
+    protected bitstreamDataService: BitstreamDataService,
   ) {
-    super();
+    super(dsoNameService);
   }
 
   /**
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html b/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
deleted file mode 100644
index 3877663419..0000000000
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<ng-container *ngIf="showAccessStatus">
-  <div *ngIf="accessStatus$ | async as accessStatus">
-    <span class="badge badge-secondary">{{ accessStatus | translate }}</span>
-  </div>
-</ng-container>
diff --git a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts b/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
deleted file mode 100644
index fbca3cb971..0000000000
--- a/src/app/shared/object-list/access-status-badge/access-status-badge.component.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Component, Input } from '@angular/core';
-import { catchError, map } from 'rxjs/operators';
-import { Observable, of as observableOf } from 'rxjs';
-import { AccessStatusObject } from './access-status.model';
-import { hasValue } from '../../empty.util';
-import { environment } from 'src/environments/environment';
-import { Item } from 'src/app/core/shared/item.model';
-import { AccessStatusDataService } from 'src/app/core/data/access-status-data.service';
-
-@Component({
-  selector: 'ds-access-status-badge',
-  templateUrl: './access-status-badge.component.html'
-})
-/**
- * Component rendering the access status of an item as a badge
- */
-export class AccessStatusBadgeComponent {
-
-  @Input() item: Item;
-  accessStatus$: Observable<string>;
-
-  /**
-   * Whether to show the access status badge or not
-   */
-  showAccessStatus: boolean;
-
-  /**
-   * Initialize instance variables
-   *
-   * @param {AccessStatusDataService} accessStatusDataService
-   */
-  constructor(private accessStatusDataService: AccessStatusDataService) { }
-
-  ngOnInit(): void {
-    this.showAccessStatus = environment.item.showAccessStatuses;
-    if (!this.showAccessStatus || this.item == null) {
-      // Do not show the badge if the feature is inactive or if the item is null.
-      return;
-    }
-    if (this.item.accessStatus == null) {
-      // In case the access status has not been loaded, do it individually.
-      this.item.accessStatus = this.accessStatusDataService.findAccessStatusFor(this.item);
-    }
-    this.accessStatus$ = this.item.accessStatus.pipe(
-      map((accessStatusRD) => {
-        if (accessStatusRD.statusCode !== 401 && hasValue(accessStatusRD.payload)) {
-          return accessStatusRD.payload;
-        } else {
-          return [];
-        }
-      }),
-      map((accessStatus: AccessStatusObject) => hasValue(accessStatus.status) ? accessStatus.status : 'unknown'),
-      map((status: string) => `access-status.${status.toLowerCase()}.listelement.badge`),
-      catchError(() => observableOf('access-status.unknown.listelement.badge'))
-    );
-  }
-}
diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.html b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.scss b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts
new file mode 100644
index 0000000000..fba72f8585
--- /dev/null
+++ b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.spec.ts
@@ -0,0 +1,38 @@
+import { CommonModule } from '@angular/common';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { SharedModule } from '../../shared.module';
+import { BitstreamListItemComponent } from './bitstream-list-item.component';
+
+describe('BitstreamListItemComponent', () => {
+  let component: BitstreamListItemComponent;
+  let fixture: ComponentFixture<BitstreamListItemComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ BitstreamListItemComponent ],
+      imports: [ CommonModule, SharedModule, TranslateModule, RouterTestingModule ],
+      providers: [{ provide: DSONameService, useValue: new DSONameServiceMock() }],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BitstreamListItemComponent);
+    component = fixture.componentInstance;
+    // @ts-ignore
+    component.object = { name: 'test' };
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts
new file mode 100644
index 0000000000..28c83e9662
--- /dev/null
+++ b/src/app/shared/object-list/bitstream-list-item/bitstream-list-item.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { Context } from '../../../core/shared/context.model';
+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';
+
+
+@listableObjectComponent(Bitstream, ViewMode.ListElement, Context.Bitstream)
+@Component({
+  selector: 'ds-bitstream-list-item',
+  template: ` {{object.name}} `,
+  styleUrls: ['./bitstream-list-item.component.scss'],
+})
+export class BitstreamListItemComponent extends AbstractListableElementComponent<Bitstream>{}
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 dcbdd77bff..757135d809 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,8 +1,8 @@
 <div class="d-flex flex-row">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [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">
         {{object.value}}
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="lead">
+    <span *ngIf="linkType === linkTypes.None" class="lead">
         {{object.value}}
     </span>
     <span class="pr-2">&nbsp;</span>
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
index a4490bd951..1919f6ad78 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.spec.ts
@@ -1,18 +1,29 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TruncatePipe } from '../../utils/truncate.pipe';
-import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
-import { BrowseEntry } from '../../../core/shared/browse-entry.model';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { PaginationService } from '../../../core/pagination/pagination.service';
 import { RouteService } from '../../../core/services/route.service';
-import { of as observableOf } from 'rxjs';
+import { BrowseEntry } from '../../../core/shared/browse-entry.model';
+import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { TruncatePipe } from '../../utils/truncate.pipe';
+import { BrowseEntryListElementComponent } from './browse-entry-list-element.component';
+
 let browseEntryListElementComponent: BrowseEntryListElementComponent;
 let fixture: ComponentFixture<BrowseEntryListElementComponent>;
 
 const mockValue: BrowseEntry = Object.assign(new BrowseEntry(), {
   type: 'browseEntry',
-  value: 'De Langhe Kristof'
+  value: 'De Langhe Kristof',
 });
 
 let paginationService;
@@ -21,11 +32,11 @@ const pageParam = 'bbm.page';
 
 function init() {
   paginationService = jasmine.createSpyObj('paginationService', {
-    getPageParam: pageParam
+    getPageParam: pageParam,
   });
 
   routeService = jasmine.createSpyObj('routeService', {
-    getQueryParameterValue: observableOf('1')
+    getQueryParameterValue: observableOf('1'),
   });
 }
 describe('BrowseEntryListElementComponent', () => {
@@ -34,14 +45,15 @@ describe('BrowseEntryListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [BrowseEntryListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: 'objectElementProvider', useValue: { mockValue } },
-        {provide: PaginationService, useValue: paginationService},
-        {provide: RouteService, useValue: routeService},
+        { provide: PaginationService, useValue: paginationService },
+        { provide: RouteService, useValue: routeService },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(BrowseEntryListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
index 667da726ed..ccbb927f03 100644
--- a/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
+++ b/src/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -1,20 +1,24 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Params } from '@angular/router';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RouteService } from 'src/app/core/services/route.service';
 
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { BBM_PAGINATION_ID } from '../../../browse-by/browse-by-metadata/browse-by-metadata.component';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { BrowseEntry } from '../../../core/shared/browse-entry.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { Params } from '@angular/router';
-import { BBM_PAGINATION_ID } from '../../../browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
-import { RouteService } from 'src/app/core/services/route.service';
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 
 @Component({
   selector: 'ds-browse-entry-list-element',
   styleUrls: ['./browse-entry-list-element.component.scss'],
-  templateUrl: './browse-entry-list-element.component.html'
+  templateUrl: './browse-entry-list-element.component.html',
 })
 
 /**
@@ -27,8 +31,12 @@ export class BrowseEntryListElementComponent extends AbstractListableElementComp
    */
   queryParams$: Observable<Params>;
 
-  constructor(private paginationService: PaginationService, private routeService: RouteService) {
-    super();
+  constructor(
+    public dsoNameService: DSONameService,
+    protected paginationService: PaginationService,
+    protected routeService: RouteService,
+  ) {
+    super(dsoNameService);
   }
 
   ngOnInit() {
@@ -44,12 +52,12 @@ export class BrowseEntryListElementComponent extends AbstractListableElementComp
       map((currentPage) => {
         return {
           value: this.object.value,
-          authority: !!this.object.authority ? this.object.authority : undefined,
+          authority: this.object.authority ? this.object.authority : undefined,
           startsWith: undefined,
           [pageParamName]: null,
-          [BBM_PAGINATION_ID + '.return']: currentPage
+          [BBM_PAGINATION_ID + '.return']: currentPage,
         };
-      })
+      }),
     );
   }
 }
diff --git a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.html b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.html
index dfe08144a8..77ed1e3b21 100644
--- a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.html
+++ b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.html
@@ -1 +1 @@
-<div>{{object.name}}</div>
+<div>{{ dsoNameService.getName(object) }}</div>
diff --git a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts
index 55eb5b116e..ad8fcc1e66 100644
--- a/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts
+++ b/src/app/shared/object-list/bundle-list-element/bundle-list-element.component.ts
@@ -1,12 +1,13 @@
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { Bundle } from '../../../core/shared/bundle.model';
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../object-collection/shared/listable-object/listable-object.decorator';
+
+import { Bundle } from '../../../core/shared/bundle.model';
 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';
 
 @Component({
   selector: 'ds-bundle-list-element',
-  templateUrl: './bundle-list-element.component.html'
+  templateUrl: './bundle-list-element.component.html',
 })
 /**
  * This component is automatically used to create a list view for Bundle objects
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 c61adf5dad..1c4f68fbcc 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,9 +1,13 @@
-<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/' + object.id]" class="lead">
-    {{object.name}}
-</a>
-<span *ngIf="linkType == linkTypes.None" class="lead">
-    {{object.name}}
-</span>
+<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">
+    {{ dsoNameService.getName(object) }}
+  </a>
+  <span *ngIf="linkType === linkTypes.None" class="lead">
+    {{ dsoNameService.getName(object) }}
+  </span>
+  <span class="pr-2">&nbsp;</span>
+  <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
+</div>
 <div *ngIf="object.shortDescription" class="text-muted abstract-text">
     {{object.shortDescription}}
 </div>
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
index c41d5a7314..dcbd4ce641 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.spec.ts
@@ -1,21 +1,54 @@
-import { CollectionListElementComponent } from './collection-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Collection } from '../../../core/shared/collection.model';
+import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { CollectionListElementComponent } from './collection-list-element.component';
 
 let collectionListElementComponent: CollectionListElementComponent;
 let fixture: ComponentFixture<CollectionListElementComponent>;
 
+const mockCollectionWithArchivedItems: Collection = Object.assign(new Collection(), {
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title',
+      },
+    ],
+  }, archivedItemsCount: 1,
+});
+
+const mockCollectionWithArchivedItemsDisabledAtBackend: Collection = Object.assign(new Collection(), {
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'Test title',
+      },
+    ],
+  }, archivedItemsCount: -1,
+});
+
+
 const mockCollectionWithAbstract: Collection = Object.assign(new Collection(), {
   metadata: {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  }, archivedItemsCount: 1,
 });
 
 const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection(), {
@@ -23,10 +56,10 @@ const mockCollectionWithoutAbstract: Collection = Object.assign(new Collection()
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  }, archivedItemsCount: 1,
 });
 
 describe('CollectionListElementComponent', () => {
@@ -34,12 +67,13 @@ describe('CollectionListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [CollectionListElementComponent],
       providers: [
-        { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) }
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: 'objectElementProvider', useValue: (mockCollectionWithAbstract) },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -71,4 +105,29 @@ describe('CollectionListElementComponent', () => {
       expect(collectionAbstractField).toBeNull();
     });
   });
+
+
+  describe('When the collection has archived items', () => {
+    beforeEach(() => {
+      collectionListElementComponent.object = mockCollectionWithArchivedItems;
+      fixture.detectChanges();
+    });
+
+    it('should show the archived items paragraph', () => {
+      const field = fixture.debugElement.query(By.css('span.archived-items-lead'));
+      expect(field).not.toBeNull();
+    });
+  });
+
+  describe('When the collection archived items are disabled at backend', () => {
+    beforeEach(() => {
+      collectionListElementComponent.object = mockCollectionWithArchivedItemsDisabledAtBackend;
+      fixture.detectChanges();
+    });
+
+    it('should not show the archived items paragraph', () => {
+      const field = fixture.debugElement.query(By.css('span.archived-items-lead'));
+      expect(field).toBeNull();
+    });
+  });
 });
diff --git a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index c36034ba34..6e531f9abb 100644
--- a/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,14 +1,14 @@
 import { Component } from '@angular/core';
 
 import { Collection } from '../../../core/shared/collection.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 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';
 
 @Component({
   selector: 'ds-collection-list-element',
   styleUrls: ['./collection-list-element.component.scss'],
-  templateUrl: './collection-list-element.component.html'
+  templateUrl: './collection-list-element.component.html',
 })
 /**
  * Component representing list element for a collection
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 af01999ca7..d63abd9672 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,9 +1,13 @@
-<a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/communities/' + object.id]" class="lead">
-    {{object.name}}
-</a>
-<span *ngIf="linkType == linkTypes.None" class="lead">
-    {{object.name}}
-</span>
+<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">
+    {{ dsoNameService.getName(object) }}
+  </a>
+  <span *ngIf="linkType === linkTypes.None" class="lead">
+    {{ dsoNameService.getName(object) }}
+  </span>
+  <span class="pr-2">&nbsp;</span>
+  <span *ngIf="object.archivedItemsCount >= 0" class="badge badge-pill badge-secondary align-self-center archived-items-lead">{{object.archivedItemsCount}}</span>
+</div>
 <div *ngIf="object.shortDescription" class="text-muted abstract-text">
     {{object.shortDescription}}
 </div>
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
index cd212e0399..74c8fe59ba 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.spec.ts
@@ -1,8 +1,18 @@
-import { CommunityListElementComponent } from './community-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Community } from '../../../core/shared/community.model';
+import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { CommunityListElementComponent } from './community-list-element.component';
 
 let communityListElementComponent: CommunityListElementComponent;
 let fixture: ComponentFixture<CommunityListElementComponent>;
@@ -12,10 +22,10 @@ const mockCommunityWithAbstract: Community = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
@@ -23,10 +33,10 @@ const mockCommunityWithoutAbstract: Community = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 describe('CommunityListElementComponent', () => {
@@ -34,12 +44,13 @@ describe('CommunityListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [CommunityListElementComponent],
       providers: [
-        { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) }
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
+        { provide: 'objectElementProvider', useValue: (mockCommunityWithAbstract) },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunityListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
index b41cd78107..8929db48be 100644
--- a/src/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,17 +1,26 @@
 import { Component } from '@angular/core';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { Community } from '../../../core/shared/community.model';
-import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 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';
 
 @Component({
   selector: 'ds-community-list-element',
   styleUrls: ['./community-list-element.component.scss'],
-  templateUrl: './community-list-element.component.html'
+  templateUrl: './community-list-element.component.html',
 })
 /**
  * Component representing a list element for a community
  */
 @listableObjectComponent(Community, ViewMode.ListElement)
-export class CommunityListElementComponent extends AbstractListableElementComponent<Community> {}
+export class CommunityListElementComponent extends AbstractListableElementComponent<Community> {
+
+  constructor(
+    public dsoNameService: DSONameService,
+  ) {
+    super(dsoNameService);
+  }
+
+}
diff --git a/src/app/shared/object-list/duplicate-data/duplicate.model.ts b/src/app/shared/object-list/duplicate-data/duplicate.model.ts
new file mode 100644
index 0000000000..9aba0c6871
--- /dev/null
+++ b/src/app/shared/object-list/duplicate-data/duplicate.model.ts
@@ -0,0 +1,61 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { DUPLICATE } from './duplicate.resource-type';
+
+/**
+ * This implements the model of a duplicate preview stub, to be displayed to submitters or reviewers
+ * if duplicate detection is enabled. The metadata map is configurable in the backend at duplicate-detection.cfg
+ */
+export class Duplicate implements CacheableObject {
+
+  static type = DUPLICATE;
+
+  /**
+   * The item title
+   */
+  @autoserialize
+    title: string;
+  /**
+   * The item uuid
+   */
+  @autoserialize
+    uuid: string;
+  /**
+   * The workfow item ID, if any
+   */
+  @autoserialize
+    workflowItemId: number;
+  /**
+   * The workspace item ID, if any
+   */
+  @autoserialize
+    workspaceItemId: number;
+  /**
+   * The owning collection of the item
+   */
+  @autoserialize
+    owningCollection: string;
+  /**
+   * Metadata for the preview item (e.g. dc.title)
+   */
+  @autoserialize
+    metadata: MetadataMap;
+
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The {@link HALLink}s for the URL that generated this item (in context of search results)
+   */
+  @deserialize
+    _links: {
+    self: HALLink;
+  };
+}
diff --git a/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts b/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts
new file mode 100644
index 0000000000..588ca2da55
--- /dev/null
+++ b/src/app/shared/object-list/duplicate-data/duplicate.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from 'src/app/core/shared/resource-type';
+
+/**
+ * The resource type for Duplicate preview stubs
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const DUPLICATE = new ResourceType('duplicate');
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.html b/src/app/shared/object-list/identifier-data/identifier-data.component.html
new file mode 100644
index 0000000000..91470628c4
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.html
@@ -0,0 +1,5 @@
+<ng-container>
+  <div *ngIf="identifiers$ | async as identifiers">
+    <span class="">{{ identifiers[0].value | translate }}</span>
+  </div>
+</ng-container>
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.component.ts b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
new file mode 100644
index 0000000000..65091b5ee4
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.component.ts
@@ -0,0 +1,51 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { Item } from 'src/app/core/shared/item.model';
+
+import { IdentifierDataService } from '../../../core/data/identifier-data.service';
+import { hasValue } from '../../empty.util';
+import { IdentifierData } from './identifier-data.model';
+
+@Component({
+  selector: 'ds-identifier-data',
+  templateUrl: './identifier-data.component.html',
+})
+/**
+ * Component rendering an identifier, eg. DOI or handle
+ */
+export class IdentifierDataComponent {
+
+  @Input() item: Item;
+  identifiers$: Observable<IdentifierData>;
+
+  /**
+   * Initialize instance variables
+   *
+   * @param {IdentifierDataService} identifierDataService
+   */
+  constructor(private identifierDataService: IdentifierDataService) { }
+
+  ngOnInit(): void {
+    if (this.item == null) {
+      // Do not show the identifier if the feature is inactive or if the item is null.
+      return;
+    }
+    if (this.item.identifiers == null) {
+      // In case the identifier has not been loaded, do it individually.
+      this.item.identifiers = this.identifierDataService.getIdentifierDataFor(this.item);
+    }
+    this.identifiers$ = this.item.identifiers.pipe(
+      map((identifierRD) => {
+        if (identifierRD.statusCode !== 401 && hasValue(identifierRD.payload)) {
+          return identifierRD.payload;
+        } else {
+          return null;
+        }
+      }),
+    );
+  }
+}
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.model.ts b/src/app/shared/object-list/identifier-data/identifier-data.model.ts
new file mode 100644
index 0000000000..a9e60c0175
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.model.ts
@@ -0,0 +1,37 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+import { typedObject } from 'src/app/core/cache/builders/build-decorators';
+import { CacheableObject } from 'src/app/core/cache/cacheable-object.model';
+import { HALLink } from 'src/app/core/shared/hal-link.model';
+import { ResourceType } from 'src/app/core/shared/resource-type';
+import { excludeFromEquals } from 'src/app/core/utilities/equals.decorators';
+
+import { Identifier } from './identifier.model';
+import { IDENTIFIERS } from './identifier-data.resource-type';
+
+@typedObject
+export class IdentifierData implements CacheableObject {
+  static type = IDENTIFIERS;
+  /**
+   * The type for this IdentifierData
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The
+   */
+  @autoserialize
+    identifiers: Identifier[];
+
+  /**
+   * The {@link HALLink}s for this IdentifierData
+   */
+   @deserialize
+     _links: {
+     self: HALLink;
+   };
+}
diff --git a/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts b/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts
new file mode 100644
index 0000000000..823a43eff9
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier-data.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from 'src/app/core/shared/resource-type';
+
+/**
+ * The resource type for Identifiers
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const IDENTIFIERS = new ResourceType('identifiers');
diff --git a/src/app/shared/object-list/identifier-data/identifier.model.ts b/src/app/shared/object-list/identifier-data/identifier.model.ts
new file mode 100644
index 0000000000..fedf2990c1
--- /dev/null
+++ b/src/app/shared/object-list/identifier-data/identifier.model.ts
@@ -0,0 +1,30 @@
+import { autoserialize } from 'cerialize';
+
+/**
+ * Identifier model. Identifiers using this model are returned in lists from the /item/{id}/identifiers endpoint
+ *
+ * @author Kim Shepherd
+ */
+export class Identifier {
+  /**
+   * The value of the identifier, eg. http://hdl.handle.net/123456789/123 or https://doi.org/test/doi/1234
+   */
+  @autoserialize
+    value: string;
+  /**
+   * The type of identiifer, eg. "doi", or "handle", or "other"
+   */
+  @autoserialize
+    identifierType: string;
+  /**
+   * The status of the identifier. Some schemes, like DOI, will have a different status based on whether it is
+   * queued for remote registration, reservation, or update, or has been registered, simply minted locally, etc.
+   */
+  @autoserialize
+    identifierStatus: string;
+  /**
+   * The type of resource, in this case Identifier
+   */
+  @autoserialize
+    type: string;
+}
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 de30c23216..25a31967f2 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,46 +1,55 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 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 { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { of as observableOf } from 'rxjs';
 
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../utils/truncate.pipe';
+import { ItemListElementComponent } from './item-list-element.component';
+
 const mockItem: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.publisher': [
       {
         language: 'en_US',
-        value: 'a publisher'
-      }
+        value: 'a publisher',
+      },
     ],
     'dc.date.issued': [
       {
         language: 'en_US',
-        value: '2015-06-26'
-      }
+        value: '2015-06-26',
+      },
     ],
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'This is the abstract'
-      }
-    ]
-  }
+        value: 'This is the abstract',
+      },
+    ],
+  },
 });
 
 describe('ItemListElementComponent', () => {
@@ -55,11 +64,12 @@ describe('ItemListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ItemListElementComponent, TruncatePipe],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..981a03eb4a 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,15 +1,16 @@
 import { Component } from '@angular/core';
+
+import { Item } from '../../../../../core/shared/item.model';
 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';
 
 @listableObjectComponent('Publication', ViewMode.ListElement)
 @listableObjectComponent(Item, ViewMode.ListElement)
 @Component({
   selector: 'ds-item-list-element',
   styleUrls: ['./item-list-element.component.scss'],
-  templateUrl: './item-list-element.component.html'
+  templateUrl: './item-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item of the type Publication
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html
new file mode 100644
index 0000000000..d29199bae3
--- /dev/null
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.html
@@ -0,0 +1 @@
+<div class="alert d-block {{ object?.notificationType }} m-0">{{ object?.message | translate }}</div>
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.scss b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts
new file mode 100644
index 0000000000..b3044e6ced
--- /dev/null
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.spec.ts
@@ -0,0 +1,47 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { NotificationType } from '../../notifications/models/notification-type';
+import { ListableNotificationObjectComponent } from './listable-notification-object.component';
+import { ListableNotificationObject } from './listable-notification-object.model';
+
+describe('ListableNotificationObjectComponent', () => {
+  let component: ListableNotificationObjectComponent;
+  let fixture: ComponentFixture<ListableNotificationObjectComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        ListableNotificationObjectComponent,
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ListableNotificationObjectComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('ui', () => {
+    it('should display the given error message', () => {
+      component.object = new ListableNotificationObject(NotificationType.Error, 'test error message');
+      fixture.detectChanges();
+
+      const listableNotificationObject: Element = fixture.debugElement.query(By.css('.alert')).nativeElement;
+      expect(listableNotificationObject.className).toContain(NotificationType.Error);
+      expect(listableNotificationObject.innerHTML).toBe('test error message');
+    });
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+});
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts
new file mode 100644
index 0000000000..8912b4867c
--- /dev/null
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.component.ts
@@ -0,0 +1,20 @@
+import { Component } 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 { ListableNotificationObject } from './listable-notification-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
+
+/**
+ * The component for displaying a notifications inside an object list
+ */
+@listableObjectComponent(ListableNotificationObject, ViewMode.ListElement)
+@listableObjectComponent(LISTABLE_NOTIFICATION_OBJECT.value, ViewMode.ListElement)
+@Component({
+  selector: 'ds-listable-notification-object',
+  templateUrl: './listable-notification-object.component.html',
+  styleUrls: ['./listable-notification-object.component.scss'],
+})
+export class ListableNotificationObjectComponent extends AbstractListableElementComponent<ListableNotificationObject> {
+}
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts
new file mode 100644
index 0000000000..b90b37e6a6
--- /dev/null
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.model.ts
@@ -0,0 +1,36 @@
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { TypedObject } from '../../../core/cache/typed-object.model';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { NotificationType } from '../../notifications/models/notification-type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { LISTABLE_NOTIFICATION_OBJECT } from './listable-notification-object.resource-type';
+
+/**
+ * Object representing a notification message inside a list of objects
+ */
+@typedObject
+export class ListableNotificationObject extends ListableObject implements TypedObject {
+
+  static type: ResourceType = LISTABLE_NOTIFICATION_OBJECT;
+  type: ResourceType = LISTABLE_NOTIFICATION_OBJECT;
+
+  protected renderTypes: string[];
+
+  constructor(
+    public notificationType: NotificationType = NotificationType.Error,
+    public message: string = 'listable-notification-object.default-message',
+    ...renderTypes: string[]
+  ) {
+    super();
+    this.renderTypes = renderTypes;
+  }
+
+  /**
+   * Method that returns as which type of object this object should be rendered.
+   */
+  getRenderTypes(): (string | GenericConstructor<ListableObject>)[] {
+    return [...this.renderTypes, this.constructor as GenericConstructor<ListableObject>];
+  }
+
+}
diff --git a/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts b/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts
new file mode 100644
index 0000000000..ed458126bb
--- /dev/null
+++ b/src/app/shared/object-list/listable-notification-object/listable-notification-object.resource-type.ts
@@ -0,0 +1,9 @@
+import { ResourceType } from '../../../core/shared/resource-type';
+
+/**
+ * The resource type for {@link ListableNotificationObject}
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+export const LISTABLE_NOTIFICATION_OBJECT = new ResourceType('listable-notification-object');
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
new file mode 100644
index 0000000000..bdf14463ad
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.html
@@ -0,0 +1,9 @@
+<div>
+  <a *ngIf="(mdRepresentation.representationType==='browse_link')"
+     target="_blank" class="dont-break-out"
+     [routerLink]="['/browse/', mdRepresentation.browseDefinition.id]"
+     [queryParams]="getQueryParams()">
+    {{mdRepresentation.getValue()}}
+  </a>
+  <b>(new browse link page)</b>
+</div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
new file mode 100644
index 0000000000..a6c0a55977
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.spec.ts
@@ -0,0 +1,83 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { ValueListBrowseDefinition } from '../../../../core/shared/value-list-browse-definition.model';
+import { BrowseLinkMetadataListElementComponent } from './browse-link-metadata-list-element.component';
+
+const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type'), {
+  key: 'dc.contributor.author',
+  value: 'Test Author',
+  browseDefinition: Object.assign(new ValueListBrowseDefinition(), {
+    id: 'author',
+  }),
+} as Partial<MetadatumRepresentation>);
+
+const mockMetadataRepresentationWithUrl = Object.assign(new MetadatumRepresentation('type'), {
+  key: 'dc.subject',
+  value: 'https://purl.org/test/subject',
+  browseDefinition: Object.assign(new ValueListBrowseDefinition(), {
+    id: 'subject',
+  }),
+} as Partial<MetadatumRepresentation>);
+
+describe('BrowseLinkMetadataListElementComponent', () => {
+  let comp: BrowseLinkMetadataListElementComponent;
+  let fixture: ComponentFixture<BrowseLinkMetadataListElementComponent>;
+
+  beforeEach(waitForAsync(() => {
+    void TestBed.configureTestingModule({
+      imports: [],
+      declarations: [BrowseLinkMetadataListElementComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(BrowseLinkMetadataListElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(BrowseLinkMetadataListElementComponent);
+    comp = fixture.componentInstance;
+  });
+
+  describe('with normal metadata', () => {
+    beforeEach(() => {
+      comp.mdRepresentation = mockMetadataRepresentation;
+      spyOnProperty(comp.mdRepresentation, 'representationType', 'get').and.returnValue(MetadataRepresentationType.BrowseLink);
+      fixture.detectChanges();
+    });
+
+    it('should contain the value as a browse link', () => {
+      expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentation.value);
+    });
+
+    it('should NOT match isLink', () => {
+      expect(comp.isLink()).toBe(false);
+    });
+  });
+
+  describe('with metadata wit an url', () => {
+    beforeEach(() => {
+      comp.mdRepresentation = mockMetadataRepresentationWithUrl;
+      spyOnProperty(comp.mdRepresentation, 'representationType', 'get').and.returnValue(MetadataRepresentationType.BrowseLink);
+      fixture.detectChanges();
+    });
+
+    it('should contain the value expected', () => {
+      expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentationWithUrl.value);
+    });
+
+    it('should match isLink', () => {
+      expect(comp.isLink()).toBe(true);
+    });
+  });
+
+});
diff --git a/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
new file mode 100644
index 0000000000..d206cbf459
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component.ts
@@ -0,0 +1,31 @@
+import { Component } from '@angular/core';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type';
+import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
+//@metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
+// For now, authority controlled fields are rendered the same way as plain text fields
+//@metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
+@metadataRepresentationComponent('Publication', MetadataRepresentationType.BrowseLink)
+@Component({
+  selector: 'ds-browse-link-metadata-list-element',
+  templateUrl: './browse-link-metadata-list-element.component.html',
+})
+/**
+ * A component for displaying MetadataRepresentation objects in the form of plain text
+ * It will simply use the value retrieved from MetadataRepresentation.getValue() to display as plain text
+ */
+export class BrowseLinkMetadataListElementComponent extends MetadataRepresentationListElementComponent {
+  /**
+   * Get the appropriate query parameters for this browse link, depending on whether the browse definition
+   * expects 'startsWith' (eg browse by date) or 'value' (eg browse by title)
+   */
+  getQueryParams() {
+    const queryParams = { startsWith: this.mdRepresentation.getValue() };
+    if (this.mdRepresentation.browseDefinition.getRenderType() === VALUE_LIST_BROWSE_DEFINITION.value) {
+      return { value: this.mdRepresentation.getValue() };
+    }
+    return queryParams;
+  }
+}
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html
index 91219c7189..904ea95c20 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.html
@@ -1 +1 @@
-<ds-listable-object-component-loader [object]="metadataRepresentation" [viewMode]="viewMode"></ds-listable-object-component-loader>
+<ds-listable-object-component-loader [object]="mdRepresentation" [viewMode]="viewMode"></ds-listable-object-component-loader>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
index 6e48ba3a6f..58607a82b4 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.spec.ts
@@ -1,8 +1,16 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ItemMetadataListElementComponent } from './item-metadata-list-element.component';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
 import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { ItemMetadataListElementComponent } from './item-metadata-list-element.component';
 
 const mockItemMetadataRepresentation = new ItemMetadataRepresentation(Object.assign({}));
 
@@ -14,16 +22,16 @@ describe('ItemMetadataListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [],
       declarations: [ItemMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(ItemMetadataListElementComponent);
     comp = fixture.componentInstance;
-    comp.metadataRepresentation = mockItemMetadataRepresentation;
+    comp.mdRepresentation = mockItemMetadataRepresentation;
     fixture.detectChanges();
   }));
 
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
index d0bbdf1ded..46230cf6f9 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-list-element.component.ts
@@ -1,13 +1,14 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.Item)
 @Component({
   selector: 'ds-item-metadata-list-element',
-  templateUrl: './item-metadata-list-element.component.html'
+  templateUrl: './item-metadata-list-element.component.html',
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of items
diff --git a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts
index 967b09986d..ff54a9e00d 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component.ts
@@ -1,17 +1,22 @@
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-representation/item/item-metadata-representation.model';
 import { getItemPageRoute } from '../../../../item-page/item-page-routing-paths';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 
 @Component({
   selector: 'ds-item-metadata-representation-list-element',
-  template: ''
+  template: '',
 })
 /**
  * An abstract class for displaying a single ItemMetadataRepresentation
  */
 export class ItemMetadataRepresentationListElementComponent extends MetadataRepresentationListElementComponent implements OnInit {
-  metadataRepresentation: ItemMetadataRepresentation;
+  @Input() mdRepresentation: ItemMetadataRepresentation;
 
   /**
    * Route to the item's page
@@ -19,6 +24,6 @@ export class ItemMetadataRepresentationListElementComponent extends MetadataRepr
   itemPageRoute: string;
 
   ngOnInit(): void {
-    this.itemPageRoute = getItemPageRoute(this.metadataRepresentation);
+    this.itemPageRoute = getItemPageRoute(this.mdRepresentation);
   }
 }
diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
new file mode 100644
index 0000000000..bcd972eb29
--- /dev/null
+++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.spec.ts
@@ -0,0 +1,63 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
+import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { mockData } from '../../testing/browse-definition-data-service.stub';
+import { MetadataRepresentationListElementComponent } from './metadata-representation-list-element.component';
+
+// Mock metadata representation values
+const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
+  key: 'dc.contributor.author',
+  value: 'Test Author',
+});
+const mockMetadataRepresentationUrl = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
+  key: 'dc.subject',
+  value: 'https://www.google.com',
+});
+
+describe('MetadataRepresentationListElementComponent', () => {
+  let comp: MetadataRepresentationListElementComponent;
+  let fixture: ComponentFixture<MetadataRepresentationListElementComponent>;
+
+  beforeEach(waitForAsync(() => {
+    return TestBed.configureTestingModule({
+      imports: [],
+      declarations: [MetadataRepresentationListElementComponent],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(MetadataRepresentationListElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(MetadataRepresentationListElementComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  }));
+
+  describe('when the value is not a URL', () => {
+    beforeEach(() => {
+      comp.mdRepresentation = mockMetadataRepresentation;
+    });
+    it('isLink correctly detects a non-URL string as false', () => {
+      expect(comp.isLink()).toBe(false);
+    });
+  });
+
+  describe('when the value is a URL', () => {
+    beforeEach(() => {
+      comp.mdRepresentation = mockMetadataRepresentationUrl;
+    });
+    it('isLink correctly detects a URL string as true', () => {
+      expect(comp.isLink()).toBe(true);
+    });
+  });
+
+});
diff --git a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
index 2e14485fbb..24f066a2c1 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/metadata-representation-list-element.component.ts
@@ -1,16 +1,36 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { Context } from '../../../core/shared/context.model';
 import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
 
 @Component({
   selector: 'ds-metadata-representation-list-element',
-  template: ''
+  template: '',
 })
 /**
  * An abstract class for displaying a single MetadataRepresentation
  */
 export class MetadataRepresentationListElementComponent {
+  /**
+   * The optional context
+   */
+  @Input() context: Context;
+
   /**
    * The metadata representation of this component
    */
-  metadataRepresentation: MetadataRepresentation;
+  @Input() mdRepresentation: MetadataRepresentation;
+
+  /**
+   * Returns true if this component's value matches a basic regex "Is this an HTTP URL" test
+   */
+  isLink(): boolean {
+    // Match any string that begins with http:// or https://
+    const linkPattern = new RegExp(/^https?:\/\/.*/);
+    return linkPattern.test(this.mdRepresentation.getValue());
+  }
+
 }
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 31b670b1a3..f88347a8b7 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
@@ -1,3 +1,17 @@
 <div>
-  <span class="dont-break-out">{{metadataRepresentation.getValue()}}</span>
+  <!-- Because this template is used by default, we will additionally test for representation type and display accordingly -->
+  <span *ngIf="(mdRepresentation.representationType==='plain_text') && !isLink()" class="dont-break-out">
+    {{mdRepresentation.getValue()}}
+  </span>
+  <a *ngIf="(mdRepresentation.representationType==='plain_text') && isLink()" class="dont-break-out"
+  target="_blank" [href]="mdRepresentation.getValue()">
+    {{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()">
+    {{mdRepresentation.getValue()}}
+  </a>
 </div>
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
index af09d3c204..cc38ad7b35 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.spec.ts
@@ -1,11 +1,23 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { PlainTextMetadataListElementComponent } from './plain-text-metadata-list-element.component';
-import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 
-const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type'), {
+import { MetadatumRepresentation } from '../../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
+import { mockData } from '../../../testing/browse-definition-data-service.stub';
+import { PlainTextMetadataListElementComponent } from './plain-text-metadata-list-element.component';
+
+// Render the mock representation with the default mock author browse definition so it is also rendered as a link
+// without affecting other tests
+const mockMetadataRepresentation = Object.assign(new MetadatumRepresentation('type', mockData[1]), {
   key: 'dc.contributor.author',
-  value: 'Test Author'
+  value: 'Test Author',
 });
 
 describe('PlainTextMetadataListElementComponent', () => {
@@ -16,16 +28,16 @@ describe('PlainTextMetadataListElementComponent', () => {
     TestBed.configureTestingModule({
       imports: [],
       declarations: [PlainTextMetadataListElementComponent],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PlainTextMetadataListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
   beforeEach(waitForAsync(() => {
     fixture = TestBed.createComponent(PlainTextMetadataListElementComponent);
     comp = fixture.componentInstance;
-    comp.metadataRepresentation = mockMetadataRepresentation;
+    comp.mdRepresentation = mockMetadataRepresentation;
     fixture.detectChanges();
   }));
 
@@ -33,4 +45,8 @@ describe('PlainTextMetadataListElementComponent', () => {
     expect(fixture.debugElement.nativeElement.textContent).toContain(mockMetadataRepresentation.value);
   });
 
+  it('should contain the browse link as plain text', () => {
+    expect(fixture.debugElement.query(By.css('a.ds-browse-link')).nativeElement.innerHTML).toContain(mockMetadataRepresentation.value);
+  });
+
 });
diff --git a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
index 198c3712d9..f6e9ca6930 100644
--- a/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
+++ b/src/app/shared/object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component.ts
@@ -1,18 +1,31 @@
-import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
 import { Component } from '@angular/core';
-import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
+
+import { MetadataRepresentationType } from '../../../../core/shared/metadata-representation/metadata-representation.model';
+import { VALUE_LIST_BROWSE_DEFINITION } from '../../../../core/shared/value-list-browse-definition.resource-type';
 import { metadataRepresentationComponent } from '../../../metadata-representation/metadata-representation.decorator';
+import { MetadataRepresentationListElementComponent } from '../metadata-representation-list-element.component';
 
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.PlainText)
 // For now, authority controlled fields are rendered the same way as plain text fields
 @metadataRepresentationComponent('Publication', MetadataRepresentationType.AuthorityControlled)
 @Component({
   selector: 'ds-plain-text-metadata-list-element',
-  templateUrl: './plain-text-metadata-list-element.component.html'
+  templateUrl: './plain-text-metadata-list-element.component.html',
 })
 /**
  * A component for displaying MetadataRepresentation objects in the form of plain text
  * It will simply use the value retrieved from MetadataRepresentation.getValue() to display as plain text
  */
 export class PlainTextMetadataListElementComponent extends MetadataRepresentationListElementComponent {
+  /**
+   * Get the appropriate query parameters for this browse link, depending on whether the browse definition
+   * expects 'startsWith' (eg browse by date) or 'value' (eg browse by title)
+   */
+  getQueryParams() {
+    const queryParams = { startsWith: this.mdRepresentation.getValue() };
+    if (this.mdRepresentation.browseDefinition.getRenderType() === VALUE_LIST_BROWSE_DEFINITION.value) {
+      return { value: this.mdRepresentation.getValue() };
+    }
+    return queryParams;
+  }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
index 544c1ebea8..bb8e4ebfc8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-success w-100" role="alert">
-    <h4 class="alert-heading">Approved</h4>
+    <h4 class="alert-heading mb-0">{{ 'claimed-approved-search-result-list-element.title' | translate }}</h4>
     <ds-themed-item-list-preview *ngIf="workflowitem"
                           [item]="(workflowitem?.item | async)?.payload"
                           [object]="object"
-                          [status]="status"
+                          [badgeContext]="badgeContext"
                           [showSubmitter]="showSubmitter"></ds-themed-item-list-preview>
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
index 742d71c59e..ed836482ed 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.spec.ts
@@ -1,24 +1,31 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { getMockLinkService } from '../../../../mocks/link-service.mock';
-import { VarDirective } from '../../../../utils/var.directive';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
-import { ClaimedApprovedSearchResultListElementComponent } from './claimed-approved-search-result-list-element.component';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../mocks/link-service.mock';
+import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../../utils/var.directive';
+import { ClaimedApprovedSearchResultListElementComponent } from './claimed-approved-search-result-list-element.component';
 
 let component: ClaimedApprovedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedApprovedSearchResultListElementComponent>;
@@ -32,28 +39,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -64,17 +71,20 @@ const linkService = getMockLinkService();
 describe('ClaimedApprovedSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [NoopAnimationsModule],
+      imports: [
+        TranslateModule.forRoot(),
+        NoopAnimationsModule,
+      ],
       declarations: [ClaimedApprovedSearchResultListElementComponent, VarDirective],
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedApprovedSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -93,15 +103,15 @@ describe('ClaimedApprovedSearchResultListElementComponent', () => {
       expect(linkService.resolveLinks).toHaveBeenCalledWith(
         component.dso,
         jasmine.objectContaining({ name: 'workflowitem' }),
-        jasmine.objectContaining({ name: 'action' })
+        jasmine.objectContaining({ name: 'action' }),
       );
       expect(workflowitemRD.payload).toEqual(workflowitem);
       done();
     });
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.APPROVED);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceApproved);
   });
 
 });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
index 5dda0e44ea..48286aebea 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-approved-search-result/claimed-approved-search-result-list-element.component.ts
@@ -1,19 +1,26 @@
-import { Component, Inject } from '@angular/core';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+import { Context } from 'src/app/core/shared/context.model';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { ClaimedApprovedTaskSearchResult } from '../../../../object-collection/shared/claimed-approved-task-search-result.model';
+import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 /**
  * This component renders claimed task approved object for the search result in the list view.
@@ -21,7 +28,7 @@ import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.inter
 @Component({
   selector: 'ds-claimed-approved-search-result-list-element',
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-approved-search-result-list-element.component.html'
+  templateUrl: './claimed-approved-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedApprovedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedApprovedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
@@ -32,9 +39,9 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
   public showSubmitter = true;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.APPROVED;
+  public badgeContext = Context.MyDSpaceApproved;
 
   /**
    * The workflowitem object that belonging to the result object
@@ -44,8 +51,8 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
   public constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -59,9 +66,9 @@ export class ClaimedApprovedSearchResultListElementComponent extends SearchResul
       followLink('workflowitem',
         { useCachedVersionIfAvailable: false },
         followLink('item'),
-        followLink('submitter')
+        followLink('submitter'),
       ),
-      followLink('action')
+      followLink('action'),
     );
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
   }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
index b642aef585..08f3f79a98 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.html
@@ -1,10 +1,10 @@
 <ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
   <div class="alert alert-secondary w-100" role="alert">
-    <h4 class="alert-heading">Declined</h4>
+    <h4 class="alert-heading mb-0">{{ 'claimed-declined-search-result-list-element.title' | translate }}</h4>
     <ds-themed-item-list-preview *ngIf="workflowitem"
                           [item]="(workflowitem?.item | async)?.payload"
                           [object]="object"
-                          [status]="status"
+                          [badgeContext]="badgeContext"
                           [showSubmitter]="showSubmitter"></ds-themed-item-list-preview>
   </div>
 </ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts
similarity index 79%
rename from src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
rename to src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts
index 16ed3d7f41..82c659ba63 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declided-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.spec.ts
@@ -1,24 +1,31 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { ClaimedDeclinedSearchResultListElementComponent } from './claimed-declined-search-result-list-element.component';
-import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
-import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { getMockLinkService } from '../../../../mocks/link-service.mock';
-import { VarDirective } from '../../../../utils/var.directive';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../../config/app-config.interface';
 import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Context } from '../../../../../core/shared/context.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../mocks/link-service.mock';
+import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../../utils/var.directive';
+import { ClaimedDeclinedSearchResultListElementComponent } from './claimed-declined-search-result-list-element.component';
 
 let component: ClaimedDeclinedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedDeclinedSearchResultListElementComponent>;
@@ -32,28 +39,28 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -64,17 +71,20 @@ const linkService = getMockLinkService();
 describe('ClaimedDeclinedSearchResultListElementComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
-      imports: [NoopAnimationsModule],
+      imports: [
+        TranslateModule.forRoot(),
+        NoopAnimationsModule,
+      ],
       declarations: [ClaimedDeclinedSearchResultListElementComponent, VarDirective],
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedDeclinedSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -93,15 +103,15 @@ describe('ClaimedDeclinedSearchResultListElementComponent', () => {
       expect(linkService.resolveLinks).toHaveBeenCalledWith(
         component.dso,
         jasmine.objectContaining({ name: 'workflowitem' }),
-        jasmine.objectContaining({ name: 'action' })
+        jasmine.objectContaining({ name: 'action' }),
       );
       expect(workflowitemRD.payload).toEqual(workflowitem);
       done();
     });
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.DECLINED);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceDeclined);
   });
 
 });
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
index 90f523a7fb..009c78d975 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-search-result/claimed-declined-search-result-list-element.component.ts
@@ -1,20 +1,26 @@
-import { Component, Inject } from '@angular/core';
-
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
-import { LinkService } from '../../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../../truncatable/truncatable.service';
-import { MyDspaceItemStatusType } from '../../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
 import { Observable } from 'rxjs';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
 import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { ClaimedDeclinedTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-search-result.model';
+import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
 import { followLink } from '../../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
-import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
-import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.interface';
 
 /**
  * This component renders claimed task declined object for the search result in the list view.
@@ -22,7 +28,7 @@ import { APP_CONFIG, AppConfig } from '../../../../../../config/app-config.inter
 @Component({
   selector: 'ds-claimed-declined-search-result-list-element',
   styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-declined-search-result-list-element.component.html'
+  templateUrl: './claimed-declined-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedDeclinedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedDeclinedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> {
@@ -33,9 +39,9 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
   public showSubmitter = true;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.DECLINED;
+  public badgeContext = Context.MyDSpaceDeclined;
 
   /**
    * The workflowitem object that belonging to the result object
@@ -45,8 +51,8 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
   public constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -60,7 +66,7 @@ export class ClaimedDeclinedSearchResultListElementComponent extends SearchResul
       followLink('workflowitem',
         { useCachedVersionIfAvailable: false },
         followLink('item'),
-        followLink('submitter')
+        followLink('submitter'),
       ),
       followLink('action'));
     this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
new file mode 100644
index 0000000000..715d350739
--- /dev/null
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.html
@@ -0,0 +1,11 @@
+<ng-container *ngVar="(workflowitemRD$ | async)?.payload as workflowitem">
+  <div class="alert alert-warning w-100" role="alert">
+    <h4 class="alert-heading mb-0">{{ 'claimed-declined-task-search-result-list-element.title' | translate }}</h4>
+    <ds-themed-item-list-preview *ngIf="workflowitem"
+                                 [item]="(workflowitem?.item | async)?.payload"
+                                 [object]="object"
+                                 [badgeContext]="badgeContext"
+                                 [showSubmitter]="showSubmitter">
+    </ds-themed-item-list-preview>
+  </div>
+</ng-container>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts
new file mode 100644
index 0000000000..61b6b8d9e8
--- /dev/null
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.spec.ts
@@ -0,0 +1,112 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { Item } from '../../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../../mocks/link-service.mock';
+import { ClaimedDeclinedTaskTaskSearchResult } from '../../../../object-collection/shared/claimed-declined-task-task-search-result.model';
+import { createSuccessfulRemoteDataObject } from '../../../../remote-data.utils';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../../utils/var.directive';
+import { ClaimedDeclinedTaskSearchResultListElementComponent } from './claimed-declined-task-search-result-list-element.component';
+
+let component: ClaimedDeclinedTaskSearchResultListElementComponent;
+let fixture: ComponentFixture<ClaimedDeclinedTaskSearchResultListElementComponent>;
+
+const mockResultObject: ClaimedDeclinedTaskTaskSearchResult = new ClaimedDeclinedTaskTaskSearchResult();
+mockResultObject.hitHighlights = {};
+
+const item = Object.assign(new Item(), {
+  bundles: observableOf({}),
+  metadata: {
+    'dc.title': [
+      {
+        language: 'en_US',
+        value: 'This is just another title',
+      },
+    ],
+    'dc.type': [
+      {
+        language: null,
+        value: 'Article',
+      },
+    ],
+    'dc.contributor.author': [
+      {
+        language: 'en_US',
+        value: 'Smith, Donald',
+      },
+    ],
+    'dc.date.issued': [
+      {
+        language: null,
+        value: '2015-06-26',
+      },
+    ],
+  },
+});
+const rdItem = createSuccessfulRemoteDataObject(item);
+const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
+const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
+mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
+const linkService = getMockLinkService();
+
+describe('ClaimedDeclinedTaskSearchResultListElementComponent', () => {
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [ClaimedDeclinedTaskSearchResultListElementComponent, VarDirective],
+      providers: [
+        { provide: TruncatableService, useValue: {} },
+        { provide: LinkService, useValue: linkService },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: environment },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(ClaimedDeclinedTaskSearchResultListElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(ClaimedDeclinedTaskSearchResultListElementComponent);
+    component = fixture.componentInstance;
+  }));
+
+  beforeEach(() => {
+    component.dso = mockResultObject.indexableObject;
+    fixture.detectChanges();
+  });
+
+  it('should init workflowitem properly', (done) => {
+    component.workflowitemRD$.subscribe((workflowitemRD) => {
+      expect(linkService.resolveLinks).toHaveBeenCalledWith(
+        component.dso,
+        jasmine.objectContaining({ name: 'workflowitem' }),
+        jasmine.objectContaining({ name: 'action' }),
+      );
+      expect(workflowitemRD.payload).toEqual(workflowitem);
+      done();
+    });
+  });
+
+});
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
new file mode 100644
index 0000000000..81059ba736
--- /dev/null
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-declined-task-search-result/claimed-declined-task-search-result-list-element.component.ts
@@ -0,0 +1,76 @@
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import { ClaimedDeclinedTaskTaskSearchResult } from 'src/app/shared/object-collection/shared/claimed-declined-task-task-search-result.model';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { Context } from '../../../../../core/shared/context.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../../core/submission/models/workflowitem.model';
+import { ClaimedTask } from '../../../../../core/tasks/models/claimed-task-object.model';
+import { ClaimedTaskSearchResult } from '../../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../../truncatable/truncatable.service';
+import { followLink } from '../../../../utils/follow-link-config.model';
+import { SearchResultListElementComponent } from '../../../search-result-list-element/search-result-list-element.component';
+
+/**
+ * This component renders claimed task declined task object for the search result in the list view.
+ */
+@Component({
+  selector: 'ds-claimed-declined-task-search-result-list-element',
+  styleUrls: ['../../../search-result-list-element/search-result-list-element.component.scss'],
+  templateUrl: './claimed-declined-task-search-result-list-element.component.html',
+})
+@listableObjectComponent(ClaimedDeclinedTaskTaskSearchResult, ViewMode.ListElement)
+export class ClaimedDeclinedTaskSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit {
+
+  /**
+   * A boolean representing if to show submitter information
+   */
+  public showSubmitter = true;
+
+  /**
+   * Represents the badge context
+   */
+  public badgeContext = Context.MyDSpaceDeclined;
+
+  /**
+   * The workflowitem object that belonging to the result object
+   */
+  public workflowitemRD$: Observable<RemoteData<WorkflowItem>>;
+
+  public constructor(
+    protected linkService: LinkService,
+    protected truncatableService: TruncatableService,
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+  ) {
+    super(truncatableService, dsoNameService, appConfig);
+  }
+
+  /**
+   * Initialize all instance variables
+   */
+  ngOnInit() {
+    super.ngOnInit();
+    this.linkService.resolveLinks(this.dso,
+      followLink('workflowitem',
+        { useCachedVersionIfAvailable: false },
+        followLink('item'),
+        followLink('submitter'),
+      ),
+      followLink('action'));
+    this.workflowitemRD$ = this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>;
+  }
+
+}
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
index 5e98b00926..9cdeb49e5c 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.html
@@ -2,8 +2,19 @@
   <ds-themed-item-list-preview [item]="item$.value"
                                [object]="object"
                                [showSubmitter]="showSubmitter"
-                               [status]="status"></ds-themed-item-list-preview>
-
+                               [badgeContext]="badgeContext"
+                               [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
+  <!-- Display duplicate alert, if feature enabled and duplicates detected -->
+  <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
+    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
+      <div [ngClass]="'col-2'"></div>
+      <div [ngClass]="'col-10'">
+        <div class="d-flex alert alert-warning w-100">
+          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+        </div>
+      </div>
+    </div>
+  </ng-container>
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
       <ds-claimed-task-actions [item]="item$.value"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
index 4ea716cc2a..3ba3862812 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.spec.ts
@@ -1,28 +1,42 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
-import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
-import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { VarDirective } from '../../../utils/var.directive';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
+import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { VarDirective } from '../../../utils/var.directive';
+import { ClaimedSearchResultListElementComponent } from './claimed-search-result-list-element.component';
 
 let component: ClaimedSearchResultListElementComponent;
 let fixture: ComponentFixture<ClaimedSearchResultListElementComponent>;
@@ -30,34 +44,49 @@ let fixture: ComponentFixture<ClaimedSearchResultListElementComponent>;
 const mockResultObject: ClaimedTaskSearchResult = new ClaimedTaskSearchResult();
 mockResultObject.hitHighlights = {};
 
+const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
+
+const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+  findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+    name: 'duplicate.enable',
+    values: [
+      'true',
+    ],
+  })),
+});
+const duplicateDataServiceStub = {
+  findListByHref: () => observableOf(emptyList),
+  findDuplicates: () => createSuccessfulRemoteDataObject$({}),
+};
+
 const item = Object.assign(new Item(), {
   bundles: observableOf({}),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const rdItem = createSuccessfulRemoteDataObject(item);
 const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
@@ -65,7 +94,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('ClaimedSearchResultListElementComponent', () => {
@@ -78,11 +107,13 @@ describe('ClaimedSearchResultListElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environment },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SubmissionDuplicateDataService, useValue: duplicateDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ClaimedSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -101,19 +132,19 @@ describe('ClaimedSearchResultListElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
   }));
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.VALIDATION);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceValidation);
   });
 
   it('should forward claimed-task-actions processComplete event to reloadObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-claimed-task-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
index 237a5f516e..0dddacdf58 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/claimed-search-result/claimed-search-result-list-element.component.ts
@@ -1,33 +1,54 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
 
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
 import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { followLink } from '../../../utils/follow-link-config.model';
-import {
-  SearchResultListElementComponent
-} from '../../search-result-list-element/search-result-list-element.component';
-import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
 import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
+import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../core/data/remote-data';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-import { mergeMap, tap } from 'rxjs/operators';
-import { isNotEmpty } from '../../../empty.util';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
+import { ClaimedTask } from '../../../../core/tasks/models/claimed-task-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { followLink } from '../../../utils/follow-link-config.model';
+import { Duplicate } from '../../duplicate-data/duplicate.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 @Component({
   selector: 'ds-claimed-search-result-list-element',
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss'],
-  templateUrl: './claimed-search-result-list-element.component.html'
+  templateUrl: './claimed-search-result-list-element.component.html',
 })
 @listableObjectComponent(ClaimedTaskSearchResult, ViewMode.ListElement)
 export class ClaimedSearchResultListElementComponent extends SearchResultListElementComponent<ClaimedTaskSearchResult, ClaimedTask> implements OnInit, OnDestroy {
@@ -38,9 +59,9 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
   public showSubmitter = true;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.VALIDATION;
+  public badgeContext = Context.MyDSpaceValidation;
 
   /**
    * The item object that belonging to the result object
@@ -52,6 +73,11 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
    */
   public workflowitem$: BehaviorSubject<WorkflowItem> = new BehaviorSubject<WorkflowItem>(null);
 
+  /**
+   * The potential duplicates of this item
+   */
+  public duplicates$: Observable<Duplicate[]>;
+
   /**
    * Display thumbnails if required by configuration
    */
@@ -60,9 +86,11 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
   public constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService,
+    public dsoNameService: DSONameService,
     protected objectCache: ObjectCacheService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    protected configService: ConfigurationDataService,
+    protected duplicateDataService: SubmissionDuplicateDataService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -74,7 +102,7 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -83,7 +111,7 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -93,15 +121,52 @@ export class ClaimedSearchResultListElementComponent extends SearchResultListEle
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
-
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    // Initialise duplicates, if enabled
+    this.duplicates$ = this.initializeDuplicateDetectionIfEnabled();
+  }
+
+  /**
+   * Initialize and set the duplicates observable based on whether the configuration in REST is enabled
+   * and the results returned
+   */
+  initializeDuplicateDetectionIfEnabled() {
+    return combineLatest([
+      this.configService.findByPropertyName('duplicate.enable').pipe(
+        getFirstCompletedRemoteData(),
+        map((remoteData: RemoteData<ConfigurationProperty>) => {
+          return (remoteData.isSuccess && remoteData.payload && remoteData.payload.values[0] === 'true');
+        }),
+      ),
+      this.item$.pipe(),
+    ],
+    ).pipe(
+      map(([enabled, rd]) => {
+        if (enabled) {
+          this.duplicates$ = this.duplicateDataService.findDuplicates(rd.uuid).pipe(
+            getFirstCompletedRemoteData(),
+            map((remoteData: RemoteData<PaginatedList<Duplicate>>) => {
+              if (remoteData.hasSucceeded) {
+                if (remoteData.payload.page) {
+                  return remoteData.payload.page;
+                }
+              }
+            }),
+          );
+        } else {
+          return [] as Duplicate[];
+        }
+      }),
+    );
   }
 
   ngOnDestroy() {
     // This ensures the object is removed from cache, when action is performed on task
-    this.objectCache.remove(this.dso._links.workflowitem.href);
+    if (hasValue(this.dso)) {
+      this.objectCache.remove(this.dso._links.workflowitem.href);
+    }
   }
 
 }
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 d2db0ba209..8c8a99aa9e 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
@@ -5,44 +5,42 @@
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div *ngIf="item" @fadeInOut>
-      <ng-container *ngIf="status">
-        <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-      </ng-container>
       <div class="d-flex">
-        <ds-type-badge [object]="item"></ds-type-badge>
-        <ds-access-status-badge [item]="item" class="pl-1"></ds-access-status-badge>
+        <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>
         <div>
-      <span class="text-muted">
-        <ds-truncatable-part [id]="item.id" [minLines]="1">
-          (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
-                 [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
-          <span class="item-list-date"
+          <span class="text-muted">
+            <ds-truncatable-part [id]="item.id" [minLines]="1">
+              (<span *ngIf="item.hasMetadata('dc.publisher')" class="item-list-publisher"
+                [innerHTML]="item.firstMetadataValue('dc.publisher') + ', '"></span>
+              <span class="item-list-date"
                 [innerHTML]="item.firstMetadataValue('dc.date.issued') || ('mydspace.results.no-date' | translate)"></span>)
-          <span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);"
+              <span *ngIf="item.hasMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']);"
                 class="item-list-authors">
-              <span
-                *ngIf="item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0">{{'mydspace.results.no-authors' | translate}}</span>
-              <span
-                *ngFor="let author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-                <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-                <span *ngIf="!last">; </span>
+                <span
+                  *ngIf="item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length === 0">{{'mydspace.results.no-authors'
+                 | translate}}</span>
+                <span
+                  *ngFor="let author of item.allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+                  <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                  <span *ngIf="!last">; </span>
+                </span>
               </span>
+
+            </ds-truncatable-part>
           </span>
 
-          </ds-truncatable-part>
-      </span>
-
           <ds-truncatable-part [id]="item.id" [minLines]="1" class="item-list-abstract">
-        <span [ngClass]="{'text-muted': !item.firstMetadataValue('dc.description.abstract')}"
+            <span [ngClass]="{'text-muted': !item.firstMetadataValue('dc.description.abstract')}"
               [innerHTML]="(item.firstMetadataValue('dc.description.abstract')) || ('mydspace.results.no-abstract' | translate)"></span>
           </ds-truncatable-part>
 
         </div>
       </ds-truncatable>
       <ds-item-submitter *ngIf="showSubmitter" [object]="object.indexableObject"></ds-item-submitter>
+      <ds-item-collection [object]="object.indexableObject"></ds-item-collection>
     </div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
index aaddebd8eb..ae6c4b46a8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.spec.ts
@@ -1,16 +1,25 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
 
-import { TruncatePipe } from '../../../utils/truncate.pipe';
-import { Item } from '../../../../core/shared/item.model';
-import { ItemListPreviewComponent } from './item-list-preview.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { Item } from '../../../../core/shared/item.model';
+import { TranslateLoaderMock } from '../../../mocks/translate-loader.mock';
+import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { ItemListPreviewComponent } from './item-list-preview.component';
 
 let component: ItemListPreviewComponent;
 let fixture: ComponentFixture<ItemListPreviewComponent>;
@@ -21,16 +30,16 @@ const mockItemWithAuthorAndDate: Item = Object.assign(new Item(), {
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -38,16 +47,16 @@ const mockItemWithoutAuthorAndDate: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
-    ]
-  }
+        value: 'Article',
+      },
+    ],
+  },
 });
 const mockItemWithEntityType: Item = Object.assign(new Item(), {
   bundles: observableOf({}),
@@ -55,28 +64,28 @@ const mockItemWithEntityType: Item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dspace.entity.type': [
       {
         language: null,
-        value: 'Publication'
-      }
-    ]
-  }
+        value: 'Publication',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('ItemListPreviewComponent', () => {
@@ -86,20 +95,20 @@ describe('ItemListPreviewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [ItemListPreviewComponent, TruncatePipe],
       providers: [
-        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate }},
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } },
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemListPreviewComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -178,8 +187,8 @@ describe('ItemListPreviewComponent', () => {
       fixture.detectChanges();
     });
 
-    it('should show the entity type span', () => {
-      const entityField = fixture.debugElement.query(By.css('ds-type-badge'));
+    it('should show the badges', () => {
+      const entityField = fixture.debugElement.query(By.css('ds-themed-badges'));
       expect(entityField).not.toBeNull();
     });
   });
@@ -192,20 +201,20 @@ describe('ItemListPreviewComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NoopAnimationsModule
+        NoopAnimationsModule,
       ],
       declarations: [ItemListPreviewComponent, TruncatePipe],
       providers: [
-        {provide: 'objectElementProvider', useValue: {mockItemWithAuthorAndDate}},
-        {provide: APP_CONFIG, useValue: enviromentNoThumbs}
+        { provide: 'objectElementProvider', useValue: { mockItemWithAuthorAndDate } },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemListPreviewComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
   beforeEach(waitForAsync(() => {
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
index 04f1e24d7b..ed17641f10 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.ts
@@ -1,13 +1,20 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
-import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { SearchResult } from '../../../search/models/search-result.model';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 
 /**
  * This component show metadata for the given item object in the list view.
@@ -16,7 +23,7 @@ import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
   selector: 'ds-item-list-preview',
   styleUrls: ['item-list-preview.component.scss'],
   templateUrl: 'item-list-preview.component.html',
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemListPreviewComponent implements OnInit {
 
@@ -31,15 +38,20 @@ export class ItemListPreviewComponent implements OnInit {
   @Input() object: SearchResult<any>;
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  @Input() status: MyDspaceItemStatusType;
+  @Input() badgeContext: Context;
 
   /**
    * A boolean representing if to show submitter information
    */
   @Input() showSubmitter = false;
 
+  /**
+   * Represents the workflow of the item
+   */
+  @Input() workflowItem: WorkflowItem;
+
   /**
    * Display thumbnails if required by configuration
    */
@@ -49,13 +61,13 @@ export class ItemListPreviewComponent implements OnInit {
 
   constructor(
     @Inject(APP_CONFIG) protected appConfig: AppConfig,
-    private dsoNameService: DSONameService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
   ngOnInit(): void {
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
-    this.dsoTitle = this.dsoNameService.getName(this.item);
+    this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.item);
   }
 
 
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
index 3fe825d236..075ce7dc92 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component.ts
@@ -1,9 +1,14 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Context } from 'src/app/core/shared/context.model';
+import { WorkflowItem } from 'src/app/core/submission/models/workflowitem.model';
+
+import { Item } from '../../../../core/shared/item.model';
+import { SearchResult } from '../../../search/models/search-result.model';
 import { ThemedComponent } from '../../../theme-support/themed.component';
 import { ItemListPreviewComponent } from './item-list-preview.component';
-import { Item } from '../../../../core/shared/item.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { SearchResult } from '../../../search/models/search-result.model';
 
 /**
  * Themed wrapper for ItemListPreviewComponent
@@ -14,16 +19,17 @@ import { SearchResult } from '../../../search/models/search-result.model';
   templateUrl: '../../../theme-support/themed.component.html',
 })
 export class ThemedItemListPreviewComponent extends ThemedComponent<ItemListPreviewComponent> {
-  protected inAndOutputNames: (keyof ItemListPreviewComponent & keyof this)[] = ['item', 'object', 'status', 'showSubmitter'];
+  protected inAndOutputNames: (keyof ItemListPreviewComponent & keyof this)[] = ['item', 'object', 'badgeContext', 'showSubmitter', 'workflowItem'];
 
   @Input() item: Item;
 
   @Input() object: SearchResult<any>;
 
-  @Input() status: MyDspaceItemStatusType;
+  @Input() badgeContext: Context;
 
-  @Input() showSubmitter = false;
+  @Input() showSubmitter: boolean;
 
+  @Input() workflowItem: WorkflowItem;
 
   protected getComponentName(): string {
     return 'ItemListPreviewComponent';
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
index b5e9155b81..c1f7098d5f 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.html
@@ -1,6 +1,6 @@
 <ds-themed-item-list-preview [item]="dso"
                       [object]="object"
-                      [status]="status"></ds-themed-item-list-preview>
+                      [badgeContext]="badgeContext"></ds-themed-item-list-preview>
 
 <div class="row">
   <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
index 1dc221f2ed..35165e0639 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.spec.ts
@@ -1,19 +1,27 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, TestBed, fakeAsync, tick } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
-import { Item } from '../../../../core/shared/item.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { ItemSearchResultListElementSubmissionComponent } from './item-search-result-list-element-submission.component';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
 import { environment } from '../../../../../environments/environment';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { ItemSearchResultListElementSubmissionComponent } from './item-search-result-list-element-submission.component';
 
 let component: ItemSearchResultListElementSubmissionComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementSubmissionComponent>;
@@ -27,28 +35,28 @@ mockResultObject.indexableObject = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 describe('ItemMyDSpaceResultListElementComponent', () => {
@@ -59,11 +67,11 @@ describe('ItemMyDSpaceResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environment }
+        { provide: APP_CONFIG, useValue: environment },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultListElementSubmissionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -77,13 +85,13 @@ describe('ItemMyDSpaceResultListElementComponent', () => {
     fixture.detectChanges();
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.ARCHIVED);
+  it('should have correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceArchived);
   });
 
   it('should forward item-actions processComplete event to reloadObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-item-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
index 26cbafc102..44714cfe76 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/item-search-result/item-search-result-list-element-submission.component.ts
@@ -1,11 +1,13 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 
-import { Item } from '../../../../core/shared/item.model';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 /**
@@ -14,16 +16,17 @@ import { SearchResultListElementComponent } from '../../search-result-list-eleme
 @Component({
   selector: 'ds-item-search-result-list-element-submission',
   styleUrls: ['../../search-result-list-element/search-result-list-element.component.scss', './item-search-result-list-element-submission.component.scss'],
-  templateUrl: './item-search-result-list-element-submission.component.html'
+  templateUrl: './item-search-result-list-element-submission.component.html',
 })
 
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Workspace)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Workflow)
 export class ItemSearchResultListElementSubmissionComponent extends SearchResultListElementComponent<ItemSearchResult, Item> implements OnInit {
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.ARCHIVED;
+  public badgeContext = Context.MyDSpaceArchived;
+
 
   /**
    * Display thumbnails if required by configuration
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
index 4f0d6f774a..ab7d7a7d8a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.html
@@ -2,7 +2,21 @@
   <ds-themed-item-list-preview [item]="item$.value"
                                [object]="object"
                                [showSubmitter]="showSubmitter"
-                               [status]="status"></ds-themed-item-list-preview>
+                               [badgeContext]="badgeContext"
+                               [workflowItem]="workflowitem$.value"></ds-themed-item-list-preview>
+
+  <!-- Display duplicate alert, if feature enabled and duplicates detected -->
+  <ng-container *ngVar="(duplicates$|async)?.length as duplicateCount">
+    <div [ngClass]="'row'" *ngIf="duplicateCount > 0">
+      <div [ngClass]="'col-2'"></div>
+      <div [ngClass]="'col-10'">
+        <div class="d-flex alert alert-warning w-100">
+          {{ duplicateCount }} {{ 'submission.workflow.tasks.duplicates' | translate }}
+        </div>
+      </div>
+    </div>
+  </ng-container>
+
   <div class="row">
     <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2 pl-3' : ''">
       <ds-pool-task-actions id="actions"
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
index 0e5b2eaa6f..ba2cc0b537 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.spec.ts
@@ -1,27 +1,41 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-import { PoolSearchResultListElementComponent } from './pool-search-result-list-element.component';
-import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
-import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
-import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
+import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { getMockLinkService } from '../../../mocks/link-service.mock';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../remote-data.utils';
+import { createPaginatedList } from '../../../testing/utils.test';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { VarDirective } from '../../../utils/var.directive';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { PoolSearchResultListElementComponent } from './pool-search-result-list-element.component';
 
 let component: PoolSearchResultListElementComponent;
 let fixture: ComponentFixture<PoolSearchResultListElementComponent>;
@@ -29,40 +43,56 @@ let fixture: ComponentFixture<PoolSearchResultListElementComponent>;
 const mockResultObject: PoolTaskSearchResult = new PoolTaskSearchResult();
 mockResultObject.hitHighlights = {};
 
+const emptyList = createSuccessfulRemoteDataObject(createPaginatedList([]));
+
+const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+  findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+    name: 'duplicate.enable',
+    values: [
+      'true',
+    ],
+  })),
+});
+const duplicateDataServiceStub = {
+  findListByHref: () => observableOf(emptyList),
+  findDuplicates: () => createSuccessfulRemoteDataObject$({}),
+};
+
 const item = Object.assign(new Item(), {
+  duplicates: observableOf([]),
   bundles: observableOf({}),
   metadata: {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const rdItem = createSuccessfulRemoteDataObject(item);
@@ -71,7 +101,7 @@ const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
 mockResultObject.indexableObject = Object.assign(new PoolTask(), { workflowitem: observableOf(rdWorkflowitem) });
 const linkService = getMockLinkService();
 const objectCacheServiceMock = jasmine.createSpyObj('ObjectCacheService', {
-  remove: jasmine.createSpy('remove')
+  remove: jasmine.createSpy('remove'),
 });
 
 describe('PoolSearchResultListElementComponent', () => {
@@ -84,11 +114,13 @@ describe('PoolSearchResultListElementComponent', () => {
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
         { provide: APP_CONFIG, useValue: environmentUseThumbs },
-        { provide: ObjectCacheService, useValue: objectCacheServiceMock }
+        { provide: ObjectCacheService, useValue: objectCacheServiceMock },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SubmissionDuplicateDataService, useValue: duplicateDataServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(PoolSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -107,19 +139,19 @@ describe('PoolSearchResultListElementComponent', () => {
     expect(linkService.resolveLinks).toHaveBeenCalledWith(
       component.dso,
       jasmine.objectContaining({ name: 'workflowitem' }),
-      jasmine.objectContaining({ name: 'action' })
+      jasmine.objectContaining({ name: 'action' }),
     );
     expect(component.workflowitem$.value).toEqual(workflowitem);
     expect(component.item$.value).toEqual(item);
   }));
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.WAITING_CONTROLLER);
+  it('should have correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceWaitingController);
   });
 
   it('should forward pool-task-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
     const actionsComponents = fixture.debugElement.query(By.css('ds-pool-task-actions'));
     actionsComponents.triggerEventHandler('processCompleted', actionPayload);
     tick();
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
index cb924af40f..e623ce19a8 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/pool-search-result/pool-search-result-list-element.component.ts
@@ -1,29 +1,49 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  EMPTY,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  tap,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, EMPTY, Observable } from 'rxjs';
-import { mergeMap, tap } from 'rxjs/operators';
-
-import { ViewMode } from '../../../../core/shared/view-mode.model';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../../core/cache/builders/link.service';
+import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
+import { ConfigurationDataService } from '../../../../core/data/configuration-data.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../core/data/remote-data';
+import { ConfigurationProperty } from '../../../../core/shared/configuration-property.model';
+import { Context } from '../../../../core/shared/context.model';
+import { Item } from '../../../../core/shared/item.model';
+import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
+import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { SubmissionDuplicateDataService } from '../../../../core/submission/submission-duplicate-data.service';
 import { PoolTask } from '../../../../core/tasks/models/pool-task-object.model';
 import {
-  MyDspaceItemStatusType
-} from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { PoolTaskSearchResult } from '../../../object-collection/shared/pool-task-search-result.model';
-import {
-  SearchResultListElementComponent
-} from '../../search-result-list-element/search-result-list-element.component';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
-import { LinkService } from '../../../../core/cache/builders/link.service';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { ObjectCacheService } from '../../../../core/cache/object-cache.service';
-import { getFirstCompletedRemoteData } from '../../../../core/shared/operators';
-import { Item } from '../../../../core/shared/item.model';
-import { isNotEmpty } from '../../../empty.util';
+import { Duplicate } from '../../duplicate-data/duplicate.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 /**
  * This component renders pool task object for the search result in the list view.
@@ -43,9 +63,9 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
   public showSubmitter = true;
 
   /**
-   * Represent item's status
+   * Represents the badge Context
    */
-  public status = MyDspaceItemStatusType.WAITING_CONTROLLER;
+  public badgeContext = Context.MyDSpaceWaitingController;
 
   /**
    * The item object that belonging to the result object
@@ -57,6 +77,11 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
    */
   public workflowitem$: BehaviorSubject<WorkflowItem> = new BehaviorSubject<WorkflowItem>(null);
 
+  /**
+   * The potential duplicates of this workflow item
+   */
+  public duplicates$: Observable<Duplicate[]>;
+
   /**
    * The index of this list element
    */
@@ -70,9 +95,11 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
   constructor(
     protected linkService: LinkService,
     protected truncatableService: TruncatableService,
-    protected dsoNameService: DSONameService,
+    public dsoNameService: DSONameService,
     protected objectCache: ObjectCacheService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    protected configService: ConfigurationDataService,
+    protected duplicateDataService: SubmissionDuplicateDataService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -84,7 +111,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
     super.ngOnInit();
     this.linkService.resolveLinks(this.dso, followLink('workflowitem', {},
       followLink('item', {}, followLink('bundles')),
-      followLink('submitter')
+      followLink('submitter'),
     ), followLink('action'));
 
     (this.dso.workflowitem as Observable<RemoteData<WorkflowItem>>).pipe(
@@ -93,7 +120,7 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
         if (wfiRD.hasSucceeded) {
           this.workflowitem$.next(wfiRD.payload);
           return (wfiRD.payload.item as Observable<RemoteData<Item>>).pipe(
-            getFirstCompletedRemoteData()
+            getFirstCompletedRemoteData(),
           );
         } else {
           return EMPTY;
@@ -103,14 +130,51 @@ export class PoolSearchResultListElementComponent extends SearchResultListElemen
         if (isNotEmpty(itemRD) && itemRD.hasSucceeded) {
           this.item$.next(itemRD.payload);
         }
-      })
+      }),
     ).subscribe();
-
     this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    // Initialise duplicates, if enabled
+    this.duplicates$ = this.initializeDuplicateDetectionIfEnabled();
+  }
+
+  /**
+   * Initialize and set the duplicates observable based on whether the configuration in REST is enabled
+   * and the results returned
+   */
+  initializeDuplicateDetectionIfEnabled() {
+    return combineLatest([
+      this.configService.findByPropertyName('duplicate.enable').pipe(
+        getFirstCompletedRemoteData(),
+        map((remoteData: RemoteData<ConfigurationProperty>) => {
+          return (remoteData.isSuccess && remoteData.payload && remoteData.payload.values[0] === 'true');
+        }),
+      ),
+      this.item$.pipe(),
+    ],
+    ).pipe(
+      map(([enabled, rd]) => {
+        if (enabled) {
+          this.duplicates$ = this.duplicateDataService.findDuplicates(rd.uuid).pipe(
+            getFirstCompletedRemoteData(),
+            map((remoteData: RemoteData<PaginatedList<Duplicate>>) => {
+              if (remoteData.hasSucceeded) {
+                if (remoteData.payload.page) {
+                  return remoteData.payload.page;
+                }
+              }
+            }),
+          );
+        } else {
+          return [] as Duplicate[];
+        }
+      }),
+    );
   }
 
   ngOnDestroy() {
     // This ensures the object is removed from cache, when action is performed on task
-    this.objectCache.remove(this.dso._links.workflowitem.href);
+    if (hasValue(this.dso)) {
+      this.objectCache.remove(this.dso._links.workflowitem.href);
+    }
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
index c3db054f8c..2b4d60bb24 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.html
@@ -1,12 +1,8 @@
 <ng-container *ngIf="derivedSearchResult$ | async">
-    <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
-            <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-        </div>
-    </div>
     <ds-listable-object-component-loader
             [viewMode]="ViewModes.ListElement"
-            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"></ds-listable-object-component-loader>
+            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
+            [context]="badgeContext"></ds-listable-object-component-loader>
     <div class="row">
         <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
             <ds-workflowitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workflowitem-actions>
@@ -15,5 +11,5 @@
 </ng-container>
 
 <ds-themed-loading
-        *ngIf="!(derivedSearchResult$ | async)"
+        *ngIf="(derivedSearchResult$ | async) === undefined"
         [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
index 576b103ea7..17e286935a 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.spec.ts
@@ -1,24 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { WorkflowItemSearchResultListElementComponent } from './workflow-item-search-result-list-element.component';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
 
 let component: WorkflowItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkflowItemSearchResultListElementComponent>;
@@ -32,34 +40,34 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const rd = createSuccessfulRemoteDataObject(item);
@@ -78,11 +86,11 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkflowItemSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -105,13 +113,13 @@ describe('WorkflowItemSearchResultListElementComponent', () => {
     });
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.WORKFLOW);
+  it('should have the correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceWorkflow);
   });
 
   it('should forward workflowitem-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-workflowitem-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
index 11d4e18137..f0144dbd45 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workflow-item-search-result/workflow-item-search-result-list-element.component.ts
@@ -1,23 +1,27 @@
-import { Component, Inject } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
 
-import { Observable } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { followLink } from '../../../utils/follow-link-config.model';
 import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
 
 /**
  * This component renders workflowitem object for the search result in the list view.
@@ -37,12 +41,12 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
   /**
    * The item search result derived from the WorkspaceItemSearchResult
    */
-  derivedSearchResult$: Observable<ItemSearchResult>;
+  derivedSearchResult$: BehaviorSubject<ItemSearchResult> = new BehaviorSubject(undefined);
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  public status = MyDspaceItemStatusType.WORKFLOW;
+  public badgeContext = Context.MyDSpaceWorkflow;
 
   /**
    * Display thumbnails if required by configuration
@@ -52,8 +56,8 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
   constructor(
     protected truncatableService: TruncatableService,
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -69,13 +73,14 @@ export class WorkflowItemSearchResultListElementComponent extends SearchResultLi
 
   private deriveSearchResult() {
     this.linkService.resolveLink(this.object.indexableObject, followLink('item'));
-    this.derivedSearchResult$ = this.object.indexableObject.item.pipe(
+    this.object.indexableObject.item.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((item: Item) => {
-        const result = new ItemSearchResult();
-        result.indexableObject = item;
-        result.hitHighlights = this.object.hitHighlights;
-        return result;
+    ).subscribe((item: Item) => {
+      const result = new ItemSearchResult();
+      this.derivedSearchResult$.next(Object.assign(new ItemSearchResult(), {
+        indexableObject: item,
+        hitHighlights: this.object.hitHighlights,
       }));
+    });
   }
 }
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
index 4e86132df6..2363c837a3 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.html
@@ -1,12 +1,8 @@
 <ng-container *ngIf="derivedSearchResult$ | async">
-    <div class="row">
-        <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
-            <ds-mydspace-item-status [status]="status"></ds-mydspace-item-status>
-        </div>
-    </div>
     <ds-listable-object-component-loader
             [viewMode]="ViewModes.ListElement"
-            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"></ds-listable-object-component-loader>
+            [object]="derivedSearchResult$ | async" [linkType]="LinkTypes.None"
+            [context]="badgeContext"></ds-listable-object-component-loader>
     <div class="row">
         <div [ngClass]="showThumbnails ? 'offset-3 offset-md-2  pl-3' : ''">
             <ds-workspaceitem-actions [object]="dso" (processCompleted)="reloadedObject.emit($event.reloadedObject)"></ds-workspaceitem-actions>
@@ -14,5 +10,5 @@
     </div>
 </ng-container>
 <ds-themed-loading
-        *ngIf="!(derivedSearchResult$ | async)"
+        *ngIf="(derivedSearchResult$ | async) === undefined"
         [showMessage]="false"></ds-themed-loading>
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
index 2d64b1b581..cb585f719d 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.spec.ts
@@ -1,24 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-
 import { of as observableOf } from 'rxjs';
 import { take } from 'rxjs/operators';
+
+import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
 import { getMockLinkService } from '../../../mocks/link-service.mock';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { WorkflowItemSearchResult } from '../../../object-collection/shared/workflow-item-search-result.model';
 import { createSuccessfulRemoteDataObject } from '../../../remote-data.utils';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 import { WorkspaceItemSearchResultListElementComponent } from './workspace-item-search-result-list-element.component';
-import { By } from '@angular/platform-browser';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
-import { APP_CONFIG } from '../../../../../config/app-config.interface';
 
 let component: WorkspaceItemSearchResultListElementComponent;
 let fixture: ComponentFixture<WorkspaceItemSearchResultListElementComponent>;
@@ -32,34 +40,34 @@ const item = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'This is just another title'
-      }
+        value: 'This is just another title',
+      },
     ],
     'dc.type': [
       {
         language: null,
-        value: 'Article'
-      }
+        value: 'Article',
+      },
     ],
     'dc.contributor.author': [
       {
         language: 'en_US',
-        value: 'Smith, Donald'
-      }
+        value: 'Smith, Donald',
+      },
     ],
     'dc.date.issued': [
       {
         language: null,
-        value: '2015-06-26'
-      }
-    ]
-  }
+        value: '2015-06-26',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const rd = createSuccessfulRemoteDataObject(item);
@@ -77,11 +85,11 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
         { provide: ItemDataService, useValue: {} },
         { provide: LinkService, useValue: linkService },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(WorkspaceItemSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -104,14 +112,14 @@ describe('WorkspaceItemSearchResultListElementComponent', () => {
     });
   });
 
-  it('should have properly status', () => {
-    expect(component.status).toEqual(MyDspaceItemStatusType.WORKSPACE);
+  it('should have correct badge context', () => {
+    expect(component.badgeContext).toEqual(Context.MyDSpaceWorkspace);
   });
 
   it('should forward workspaceitem-actions processCompleted event to the reloadedObject event emitter', fakeAsync(() => {
 
     spyOn(component.reloadedObject, 'emit').and.callThrough();
-    const actionPayload: any = { reloadedObject: {}};
+    const actionPayload: any = { reloadedObject: {} };
 
     const actionsComponent = fixture.debugElement.query(By.css('ds-workspaceitem-actions'));
     actionsComponent.triggerEventHandler('processCompleted', actionPayload);
diff --git a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
index 08ac896035..e74cd45ed6 100644
--- a/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/my-dspace-result-list-element/workspace-item-search-result/workspace-item-search-result-list-element.component.ts
@@ -1,23 +1,27 @@
-import { Component, Inject } from '@angular/core';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
 
-import { Observable } from 'rxjs';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
 import { LinkService } from '../../../../core/cache/builders/link.service';
+import { Context } from '../../../../core/shared/context.model';
 import { Item } from '../../../../core/shared/item.model';
-
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
 import { WorkspaceItem } from '../../../../core/submission/models/workspaceitem.model';
+import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
-import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { WorkspaceItemSearchResult } from '../../../object-collection/shared/workspace-item-search-result.model';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../../config/app-config.interface';
-import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
-import { map } from 'rxjs/operators';
-import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
-import { CollectionElementLinkType } from '../../../object-collection/collection-element-link.type';
 import { followLink } from '../../../utils/follow-link-config.model';
+import { SearchResultListElementComponent } from '../../search-result-list-element/search-result-list-element.component';
 
 /**
  * This component renders workspaceitem object for the search result in the list view.
@@ -37,12 +41,12 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
   /**
    * The item search result derived from the WorkspaceItemSearchResult
    */
-  derivedSearchResult$: Observable<ItemSearchResult>;
+  derivedSearchResult$: BehaviorSubject<ItemSearchResult> = new BehaviorSubject(undefined);
 
   /**
-   * Represent item's status
+   * Represents the badge context
    */
-  status = MyDspaceItemStatusType.WORKSPACE;
+  public badgeContext = Context.MyDSpaceWorkspace;
 
   /**
    * Display thumbnails if required by configuration
@@ -52,8 +56,8 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
   constructor(
     protected truncatableService: TruncatableService,
     protected linkService: LinkService,
-    protected dsoNameService: DSONameService,
-    @Inject(APP_CONFIG) protected appConfig: AppConfig
+    public dsoNameService: DSONameService,
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
   ) {
     super(truncatableService, dsoNameService, appConfig);
   }
@@ -69,13 +73,14 @@ export class  WorkspaceItemSearchResultListElementComponent extends SearchResult
 
   private deriveSearchResult() {
     this.linkService.resolveLink(this.object.indexableObject, followLink('item'));
-    this.derivedSearchResult$ = this.object.indexableObject.item.pipe(
+    this.object.indexableObject.item.pipe(
       getFirstSucceededRemoteDataPayload(),
-      map((item: Item) => {
+    ).subscribe((item: Item) => {
       const result = new ItemSearchResult();
-      result.indexableObject = item;
-      result.hitHighlights = this.object.hitHighlights;
-      return result;
-    }));
+      this.derivedSearchResult$.next(Object.assign(new ItemSearchResult(), {
+        indexableObject: item,
+        hitHighlights: this.object.hitHighlights,
+      }));
+    });
   }
 }
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index 863d328a69..5fe57e1369 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -15,7 +15,7 @@
         (paginationChange)="onPaginationChange($event)"
         (prev)="goPrev()"
         (next)="goNext()">
-    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}">
+    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}" data-test="objects">
         <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4 d-flex" [class.border-bottom]="hasBorder && !last" [attr.data-test]="'list-object' | dsBrowserOnly">
           <ds-selectable-list-item-control *ngIf="selectable" [index]="i"
                                            [object]="object"
@@ -25,7 +25,11 @@
           <ds-importable-list-item-control *ngIf="importable" [object]="object"
                                            [importConfig]="importConfig"
                                            (importObject)="importObject.emit($event)"></ds-importable-list-item-control>
-          <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"
+          <ds-listable-object-component-loader [object]="object"
+                                               [viewMode]="viewMode"
+                                               [index]="i"
+                                               [context]="context"
+                                               [linkType]="linkType"
                                                [listID]="selectionConfig?.listId"
                                                (contentChange)="contentChange.emit($event)"></ds-listable-object-component-loader>
         </li>
diff --git a/src/app/shared/object-list/object-list.component.spec.ts b/src/app/shared/object-list/object-list.component.spec.ts
index ef04582695..86f681ce11 100644
--- a/src/app/shared/object-list/object-list.component.spec.ts
+++ b/src/app/shared/object-list/object-list.component.spec.ts
@@ -1,7 +1,17 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ObjectListComponent } from './object-list.component';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+
+import { ObjectListComponent } from './object-list.component';
 import { SelectableListService } from './selectable-list/selectable-list.service';
 
 describe('ObjectListComponent', () => {
@@ -14,9 +24,9 @@ describe('ObjectListComponent', () => {
       imports: [],
       declarations: [ObjectListComponent],
       providers: [{ provide: SelectableListService, useValue: {} }],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ObjectListComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 65e2b508da..1600ec3243 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -1,14 +1,25 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output, ViewEncapsulation } from '@angular/core';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
 import { fadeIn } from '../animations/fade';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { SelectableListService } from './selectable-list/selectable-list.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { Context } from '../../core/shared/context.model';
-import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.Default,
@@ -16,7 +27,7 @@ import { CollectionElementLinkType } from '../object-collection/collection-eleme
   selector: 'ds-object-list',
   styleUrls: ['./object-list.component.scss'],
   templateUrl: './object-list.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class ObjectListComponent {
   /**
@@ -81,6 +92,11 @@ export class ObjectListComponent {
    */
   @Input() showPaginator = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * Emit when one of the listed object has changed.
    */
@@ -212,14 +228,14 @@ export class ObjectListComponent {
    * Go to the previous page
    */
   goPrev() {
-      this.prev.emit(true);
+    this.prev.emit(true);
   }
 
- /**
+  /**
   * Go to the next page
   */
   goNext() {
-      this.next.emit(true);
+    this.next.emit(true);
   }
 
 }
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
index 83a8f4fdfa..08f7cee933 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.html
@@ -1,9 +1,9 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="offset-3 offset-md-2 "></div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer" [routerLink]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
+    <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]="['/collections/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
+    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
     <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
index e5ea60b35d..4788f8ecbd 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { CollectionSearchResultListElementComponent } from './collection-search-result-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TruncatePipe } from '../../../utils/truncate.pipe';
-import { Collection } from '../../../../core/shared/collection.model';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../../../core/shared/collection.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { CollectionSearchResultListElementComponent } from './collection-search-result-list-element.component';
 
 let collectionSearchResultListElementComponent: CollectionSearchResultListElementComponent;
 let fixture: ComponentFixture<CollectionSearchResultListElementComponent>;
@@ -25,10 +34,10 @@ mockCollectionWithAbstract.indexableObject = Object.assign(new Collection(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCollectionWithoutAbstract: CollectionSearchResult = new CollectionSearchResult();
@@ -38,16 +47,16 @@ mockCollectionWithoutAbstract.indexableObject = Object.assign(new Collection(),
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 describe('CollectionSearchResultListElementComponent', () => {
@@ -57,11 +66,11 @@ describe('CollectionSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CollectionSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -98,7 +107,8 @@ describe('CollectionSearchResultListElementComponent', () => {
 
   describe('when environment is set to show thumbnail images', () => {
     it('should offset content', () => {
-      const offset = fixture.debugElement.query(By.css('offset-md-2'));
+      const offset: DebugElement = fixture.debugElement.query(By.css('.offset-md-2'));
+      expect(offset).not.toBeNull();
     });
   });
 
diff --git a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
index 60415f649e..7e8294de2f 100644
--- a/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { SearchResultListElementComponent } from '../search-result-list-element.component';
+
 import { Collection } from '../../../../core/shared/collection.model';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
 
 @Component({
   selector: 'ds-collection-search-result-list-element',
   styleUrls: ['../search-result-list-element.component.scss', 'collection-search-result-list-element.component.scss'],
-  templateUrl: 'collection-search-result-list-element.component.html'
+  templateUrl: 'collection-search-result-list-element.component.html',
 })
 /**
  * Component representing a collection search result in list view
@@ -23,7 +24,7 @@ export class CollectionSearchResultListElementComponent extends SearchResultList
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
   }
 
 }
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 22be357a53..c66cf21e5a 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,9 +1,9 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="offset-md-2"></div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
-    <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"  [routerLink]="['/communities/' + dso.id]" class="lead" [innerHTML]="dsoTitle"></a>
-    <span *ngIf="linkType == linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
+    <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>
+    <span *ngIf="linkType === linkTypes.None" class="lead" [innerHTML]="dsoTitle"></span>
     <div *ngIf="dso.shortDescription" class="text-muted abstract-text" [innerHTML]="firstMetadataValue('dc.description.abstract')"></div>
   </div>
 </div>
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
index ce12f5f7da..f434d9d756 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.spec.ts
@@ -1,15 +1,24 @@
-import { CommunitySearchResultListElementComponent } from './community-search-result-list-element.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TruncatePipe } from '../../../utils/truncate.pipe';
-import { Community } from '../../../../core/shared/community.model';
-import { TruncatableService } from '../../../truncatable/truncatable.service';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { of as observableOf } from 'rxjs';
+
 import { APP_CONFIG } from '../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../../../core/shared/community.model';
+import { DSONameServiceMock } from '../../../mocks/dso-name.service.mock';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
+import { TruncatableService } from '../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../utils/truncate.pipe';
+import { CommunitySearchResultListElementComponent } from './community-search-result-list-element.component';
 
 let communitySearchResultListElementComponent: CommunitySearchResultListElementComponent;
 let fixture: ComponentFixture<CommunitySearchResultListElementComponent>;
@@ -25,10 +34,10 @@ mockCommunityWithAbstract.indexableObject = Object.assign(new Community(), {
     'dc.description.abstract': [
       {
         language: 'en_US',
-        value: 'Short description'
-      }
-    ]
-  }
+        value: 'Short description',
+      },
+    ],
+  },
 });
 
 const mockCommunityWithoutAbstract: CommunitySearchResult = new CommunitySearchResult();
@@ -38,16 +47,16 @@ mockCommunityWithoutAbstract.indexableObject = Object.assign(new Community(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Test title'
-      }
-    ]
-  }
+        value: 'Test title',
+      },
+    ],
+  },
 });
 
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 describe('CommunitySearchResultListElementComponent', () => {
@@ -57,12 +66,12 @@ describe('CommunitySearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: truncatableServiceStub },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(CommunitySearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -99,7 +108,8 @@ describe('CommunitySearchResultListElementComponent', () => {
 
   describe('when environment is set to show thumbnail images', () => {
     it('should offset content', () => {
-      const offset = fixture.debugElement.query(By.css('offset-md-2'));
+      const offset: DebugElement = fixture.debugElement.query(By.css('.offset-md-2'));
+      expect(offset).not.toBeNull();
     });
   });
 });
diff --git a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
index 4cc25b8b76..41d354c55c 100644
--- a/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/community-search-result/community-search-result-list-element.component.ts
@@ -1,14 +1,15 @@
 import { Component } from '@angular/core';
-import { SearchResultListElementComponent } from '../search-result-list-element.component';
+
 import { Community } from '../../../../core/shared/community.model';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../search-result-list-element.component';
 
 @Component({
   selector: 'ds-community-search-result-list-element',
   styleUrls: ['../search-result-list-element.component.scss', 'community-search-result-list-element.component.scss'],
-  templateUrl: 'community-search-result-list-element.component.html'
+  templateUrl: 'community-search-result-list-element.component.html',
 })
 /**
  * Component representing a community search result in list view
@@ -23,6 +24,6 @@ export class CommunitySearchResultListElementComponent extends SearchResultListE
 
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
   }
 }
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 6b2951495d..78a33b5a5d 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,41 +1,41 @@
 <div class="row">
   <div *ngIf="showThumbnails" class="col-3 col-md-2">
-    <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+    <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">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </a>
-    <span *ngIf="linkType == linkTypes.None" class="dont-break-out">
+    <span *ngIf="linkType === linkTypes.None" class="dont-break-out">
     <ds-thumbnail [thumbnail]="dso?.thumbnail | async" [limitWidth]="true">
     </ds-thumbnail>
     </span>
   </div>
   <div [ngClass]="showThumbnails ? 'col-9' : 'col-md-12'">
     <div class="d-flex">
-      <ds-type-badge *ngIf="showLabel" [object]="dso"></ds-type-badge>
-      <ds-access-status-badge [item]="dso" class="pl-1"></ds-access-status-badge>
+      <ds-themed-badges *ngIf="showLabel" [object]="dso" [context]="context" [showAccessStatus]="true"></ds-themed-badges>
     </div>
 
     <ds-truncatable [id]="dso.id" *ngIf="object !== undefined && object !== null">
-      <a *ngIf="linkType != linkTypes.None" [target]="(linkType == linkTypes.ExternalLink) ? '_blank' : '_self'" rel="noopener noreferrer"
+      <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>
-      <span *ngIf="linkType == linkTypes.None" class="lead item-list-title dont-break-out"
+      <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">
-        <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
-          (<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher') + ', '"></span>
+        <ds-truncatable-part [id]="dso.id" [minLines]="1">
+          <ng-container *ngIf="dso.firstMetadataValue('dc.publisher') || dso.firstMetadataValue('dc.date.issued')">
+            (<span *ngIf="dso.firstMetadataValue('dc.publisher')" class="item-list-publisher" [innerHTML]="firstMetadataValue('dc.publisher')"></span>
+            <span *ngIf="dso.firstMetadataValue('dc.publisher') && dso.firstMetadataValue('dc.date.issued')">, </span>
           <span *ngIf="dso.firstMetadataValue('dc.date.issued')" class="item-list-date" [innerHTML]="firstMetadataValue('dc.date.issued')"></span>)
-        </ng-container>
-        <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
-          <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
-              <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
-              <span *ngIf="!last">; </span>
+          </ng-container>
+          <span *ngIf="dso.allMetadata(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']).length > 0" class="item-list-authors">
+            <span *ngFor="let author of allMetadataValues(['dc.contributor.author', 'dc.creator', 'dc.contributor.*']); let last=last;">
+                <span [innerHTML]="author"><span [innerHTML]="author"></span></span>
+                <span *ngIf="!last">; </span>
+            </span>
           </span>
-        </span>
-      </ds-truncatable-part>
-    </span>
+        </ds-truncatable-part>
+      </span>
       <div *ngIf="dso.firstMetadataValue('dc.description.abstract')" class="item-list-abstract">
         <ds-truncatable-part [id]="dso.id" [minLines]="3"><span
           [innerHTML]="firstMetadataValue('dc.description.abstract')"></span>
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss
index 5e4536cf95..0d93ec744b 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss
@@ -1 +1,7 @@
 @import '../../../../../../../styles/variables';
+
+.item-list-supervision {
+    a {
+        cursor: pointer;
+    }
+}
\ No newline at end of file
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
index d1e6c27ba4..c28d63c79c 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.spec.ts
@@ -1,20 +1,36 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { of as observableOf } from 'rxjs';
-import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
-import { Item } from '../../../../../../core/shared/item.model';
-import { TruncatePipe } from '../../../../../utils/truncate.pipe';
-import { TruncatableService } from '../../../../../truncatable/truncatable.service';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock, UNDEFINED_NAME } from '../../../../../mocks/dso-name.service.mock';
+
 import { APP_CONFIG } from '../../../../../../../config/app-config.interface';
+import { DSONameService } from '../../../../../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../../../../../core/shared/item.model';
+import {
+  DSONameServiceMock,
+  UNDEFINED_NAME,
+} from '../../../../../mocks/dso-name.service.mock';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { TruncatableService } from '../../../../../truncatable/truncatable.service';
+import { TruncatePipe } from '../../../../../utils/truncate.pipe';
+import { ItemSearchResultListElementComponent } from './item-search-result-list-element.component';
 
 let publicationListElementComponent: ItemSearchResultListElementComponent;
 let fixture: ComponentFixture<ItemSearchResultListElementComponent>;
-
+const dcTitle = 'This is just another <em>title</em>';
 const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'dc.title': [{
+      value: dcTitle,
+    }],
+  },
   indexableObject:
     Object.assign(new Item(), {
       bundles: observableOf({}),
@@ -22,54 +38,161 @@ const mockItemWithMetadata: ItemSearchResult = Object.assign(new ItemSearchResul
         'dc.title': [
           {
             language: 'en_US',
-            value: 'This is just another title'
-          }
+            value: dcTitle,
+          },
         ],
         'dc.contributor.author': [
           {
             language: 'en_US',
-            value: 'Smith, Donald'
-          }
+            value: 'Smith, Donald',
+          },
         ],
         'dc.publisher': [
           {
             language: 'en_US',
-            value: 'a publisher'
-          }
+            value: 'a publisher',
+          },
         ],
         'dc.date.issued': [
           {
             language: 'en_US',
-            value: '2015-06-26'
-          }
+            value: '2015-06-26',
+          },
         ],
         'dc.description.abstract': [
           {
             language: 'en_US',
-            value: 'This is the abstract'
-          }
-        ]
-      }
-    })
+            value: 'This is the abstract',
+          },
+        ],
+      },
+    }),
 });
 const mockItemWithoutMetadata: ItemSearchResult = Object.assign(new ItemSearchResult(), {
   indexableObject:
     Object.assign(new Item(), {
       bundles: observableOf({}),
-      metadata: {}
-    })
+      metadata: {},
+    }),
+});
+const mockPerson: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'person.familyName': [{
+      value: '<em>Michel</em>',
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: observableOf({}),
+      entityType: 'Person',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title',
+          },
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald',
+          },
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher',
+          },
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26',
+          },
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract',
+          },
+        ],
+        'person.familyName': [
+          {
+            value: 'Michel',
+          },
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'Person',
+          },
+        ],
+      },
+    }),
+});
+const mockOrgUnit: ItemSearchResult = Object.assign(new ItemSearchResult(), {
+  hitHighlights: {
+    'organization.legalName': [{
+      value: '<em>Science</em>',
+    }],
+  },
+  indexableObject:
+    Object.assign(new Item(), {
+      bundles: observableOf({}),
+      entityType: 'OrgUnit',
+      metadata: {
+        'dc.title': [
+          {
+            language: 'en_US',
+            value: 'This is just another title',
+          },
+        ],
+        'dc.contributor.author': [
+          {
+            language: 'en_US',
+            value: 'Smith, Donald',
+          },
+        ],
+        'dc.publisher': [
+          {
+            language: 'en_US',
+            value: 'a publisher',
+          },
+        ],
+        'dc.date.issued': [
+          {
+            language: 'en_US',
+            value: '2015-06-26',
+          },
+        ],
+        'dc.description.abstract': [
+          {
+            language: 'en_US',
+            value: 'This is the abstract',
+          },
+        ],
+        'organization.legalName': [
+          {
+            value: 'Science',
+          },
+        ],
+        'dspace.entity.type': [
+          {
+            value: 'OrgUnit',
+          },
+        ],
+      },
+    }),
 });
-
 const environmentUseThumbs = {
   browseBy: {
-    showThumbnails: true
-  }
+    showThumbnails: true,
+  },
 };
 
 const enviromentNoThumbs = {
   browseBy: {
-    showThumbnails: false
-  }
+    showThumbnails: false,
+  },
 };
 
 describe('ItemSearchResultListElementComponent', () => {
@@ -79,12 +202,12 @@ describe('ItemSearchResultListElementComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: {} },
         { provide: DSONameService, useClass: DSONameServiceMock },
-        { provide: APP_CONFIG, useValue: environmentUseThumbs }
+        { provide: APP_CONFIG, useValue: environmentUseThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultListElementComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -205,6 +328,42 @@ describe('ItemSearchResultListElementComponent', () => {
     });
   });
 
+  describe('When the item has title', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should show highlighted title', () => {
+      const titleField = fixture.debugElement.query(By.css('.item-list-title'));
+      expect(titleField.nativeNode.innerHTML).toEqual(dcTitle);
+    });
+  });
+
+  describe('When the item is Person and has title', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockPerson;
+      fixture.detectChanges();
+    });
+
+    it('should show highlighted title', () => {
+      const titleField = fixture.debugElement.query(By.css('.item-list-title'));
+      expect(titleField.nativeNode.innerHTML).toEqual('<em>Michel</em>');
+    });
+  });
+
+  describe('When the item is orgUnit and has title', () => {
+    beforeEach(() => {
+      publicationListElementComponent.object = mockOrgUnit;
+      fixture.detectChanges();
+    });
+
+    it('should show highlighted title', () => {
+      const titleField = fixture.debugElement.query(By.css('.item-list-title'));
+      expect(titleField.nativeNode.innerHTML).toEqual('<em>Science</em>');
+    });
+  });
+
   describe('When the item has no title', () => {
     beforeEach(() => {
       publicationListElementComponent.object = mockItemWithoutMetadata;
@@ -224,14 +383,14 @@ describe('ItemSearchResultListElementComponent', () => {
     TestBed.configureTestingModule({
       declarations: [ItemSearchResultListElementComponent, TruncatePipe],
       providers: [
-        {provide: TruncatableService, useValue: {}},
-        {provide: DSONameService, useClass: DSONameServiceMock},
-        { provide: APP_CONFIG, useValue: enviromentNoThumbs }
+        { provide: TruncatableService, useValue: {} },
+        { provide: DSONameService, useClass: DSONameServiceMock },
+        { provide: APP_CONFIG, useValue: enviromentNoThumbs },
       ],
 
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(ItemSearchResultListElementComponent, {
-      set: {changeDetection: ChangeDetectionStrategy.Default}
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
index f84ae642ad..0dc1e6d541 100644
--- a/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
+++ b/src/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -1,17 +1,18 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../../core/shared/view-mode.model';
-import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
-import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
+
 import { Item } from '../../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../../core/shared/view-mode.model';
 import { getItemPageRoute } from '../../../../../../item-page/item-page-routing-paths';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SearchResultListElementComponent } from '../../../search-result-list-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement)
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement)
 @Component({
   selector: 'ds-item-search-result-list-element',
   styleUrls: ['./item-search-result-list-element.component.scss'],
-  templateUrl: './item-search-result-list-element.component.html'
+  templateUrl: './item-search-result-list-element.component.html',
 })
 /**
  * The component for displaying a list element for an item search result of the type Publication
@@ -22,14 +23,9 @@ export class ItemSearchResultListElementComponent extends SearchResultListElemen
    */
   itemPageRoute: string;
 
-  /**
-   * Display thumbnails if required by configuration
-   */
-  showThumbnails: boolean;
-
   ngOnInit(): void {
     super.ngOnInit();
-    this.showThumbnails = this.appConfig.browseBy.showThumbnails;
+    this.showThumbnails = this.showThumbnails ?? this.appConfig.browseBy.showThumbnails;
     this.itemPageRoute = getItemPageRoute(this.dso);
   }
 }
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 72120a6b68..5573dfad6c 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
@@ -1,18 +1,25 @@
-import { Component, Inject, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { SearchResult } from '../../search/models/search-result.model';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../config/app-config.interface';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { Metadata } from '../../../core/shared/metadata.utils';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { SearchResult } from '../../search/models/search-result.model';
 import { TruncatableService } from '../../truncatable/truncatable.service';
-import { Metadata } from '../../../core/shared/metadata.utils';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { APP_CONFIG, AppConfig } from '../../../../config/app-config.interface';
 
 @Component({
   selector: 'ds-search-result-list-element',
-  template: ``
+  template: ``,
 })
 export class SearchResultListElementComponent<T extends SearchResult<K>, K extends DSpaceObject> extends AbstractListableElementComponent<T> implements OnInit {
   /**
@@ -22,9 +29,9 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   dsoTitle: string;
 
   public constructor(protected truncatableService: TruncatableService,
-                     protected dsoNameService: DSONameService,
+                     public dsoNameService: DSONameService,
                      @Inject(APP_CONFIG) protected appConfig?: AppConfig) {
-    super();
+    super(dsoNameService);
   }
 
   /**
@@ -33,7 +40,7 @@ export class SearchResultListElementComponent<T extends SearchResult<K>, K exten
   ngOnInit(): void {
     if (hasValue(this.object)) {
       this.dso = this.object.indexableObject;
-      this.dsoTitle = this.dsoNameService.getName(this.dso);
+      this.dsoTitle = this.dsoNameService.getHitHighlights(this.object, this.dso);
     }
   }
 
diff --git a/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
new file mode 100644
index 0000000000..262df49bbf
--- /dev/null
+++ b/src/app/shared/object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+import { AbstractTabulatableElementComponent } from '../../../object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
+import { SearchResult } from '../../../search/models/search-result.model';
+
+@Component({
+  selector: 'ds-search-result-table-element',
+  template: ``,
+})
+/**
+ * Component that describes the implementations and interfaces needed from any extension of this class to be used in search results for visualization in ViewMode.Table
+ */
+export class TabulatableResultListElementsComponent<T extends PaginatedList<K>, K extends SearchResult<any>> extends AbstractTabulatableElementComponent<T> {}
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
index 9aa7d46543..68762ab6f4 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../../ngrx/type';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 
@@ -17,7 +18,7 @@ export const SelectableListActionTypes = {
   DESELECT: type('dspace/selectable-lists/DESELECT'),
   DESELECT_SINGLE: type('dspace/selectable-lists/DESELECT_SINGLE'),
   SET_SELECTION: type('dspace/selectable-lists/SET_SELECTION'),
-  DESELECT_ALL: type('dspace/selectable-lists/DESELECT_ALL')
+  DESELECT_ALL: type('dspace/selectable-lists/DESELECT_ALL'),
 };
 
 /**
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts b/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
index 052caad62d..7d1a8e86d4 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
@@ -1,4 +1,6 @@
 /* eslint-disable max-classes-per-file */
+import { hasValue } from '../../empty.util';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListAction,
   SelectableListDeselectAction,
@@ -6,11 +8,9 @@ import {
   SelectableListDeselectSingleAction,
   SelectableListSelectAction,
   SelectableListSelectSingleAction,
-  SelectableListSetSelectionAction
+  SelectableListSetSelectionAction,
 } from './selectable-list.actions';
 import { selectableListReducer } from './selectable-list.reducer';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { hasValue } from '../../empty.util';
 
 class SelectableObject extends ListableObject {
   constructor(private value: string) {
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
index e24dd906d3..427f6395a0 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
@@ -1,13 +1,14 @@
+import { hasNoValue } from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListAction,
   SelectableListActionTypes,
+  SelectableListDeselectAction,
+  SelectableListDeselectSingleAction,
   SelectableListSelectAction,
   SelectableListSelectSingleAction,
-  SelectableListDeselectAction,
-  SelectableListDeselectSingleAction, SelectableListSetSelectionAction
+  SelectableListSetSelectionAction,
 } from './selectable-list.actions';
-import { hasNoValue } from '../../empty.util';
 
 /**
  * Represents the state of all selectable lists in the store
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts b/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
index 1535671f79..23d2baaf00 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
@@ -1,17 +1,21 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { SelectableListService } from './selectable-list.service';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
+
+import { AppState } from '../../../app.reducer';
 import { hasValue } from '../../empty.util';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListDeselectAction,
   SelectableListDeselectSingleAction,
   SelectableListSelectAction,
-  SelectableListSelectSingleAction
+  SelectableListSelectSingleAction,
 } from './selectable-list.actions';
-import { AppState } from '../../../app.reducer';
+import { SelectableListService } from './selectable-list.service';
 
-class SelectableObject extends ListableObject {
+export class SelectableObject extends ListableObject {
   constructor(private value: string) {
     super();
   }
@@ -48,9 +52,9 @@ describe('SelectableListService', () => {
 
       providers: [
         {
-          provide: Store, useValue: store
-        }
-      ]
+          provide: Store, useValue: store,
+        },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/object-list/selectable-list/selectable-list.service.ts b/src/app/shared/object-list/selectable-list/selectable-list.service.ts
index 91ecdf1a1a..7fd25c3550 100644
--- a/src/app/shared/object-list/selectable-list/selectable-list.service.ts
+++ b/src/app/shared/object-list/selectable-list/selectable-list.service.ts
@@ -1,18 +1,32 @@
 import { Injectable } from '@angular/core';
-import { MemoizedSelector, select, Store } from '@ngrx/store';
+import {
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { SelectableListState } from './selectable-list.reducer';
-import { AppState, keySelector } from '../../../app.reducer';
+import {
+  distinctUntilChanged,
+  map,
+} from 'rxjs/operators';
+
+import {
+  AppState,
+  keySelector,
+} from '../../../app.reducer';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import {
   SelectableListDeselectAction,
   SelectableListDeselectAllAction,
   SelectableListDeselectSingleAction,
   SelectableListSelectAction,
-  SelectableListSelectSingleAction
+  SelectableListSelectSingleAction,
 } from './selectable-list.actions';
-import { hasValue, isNotEmpty } from '../../empty.util';
+import { SelectableListState } from './selectable-list.reducer';
 
 const selectableListsStateSelector = (state: AppState) => state.selectableLists;
 
@@ -88,7 +102,7 @@ export class SelectableListService {
   isObjectSelected(id: string, object: ListableObject): Observable<boolean> {
     return this.getSelectableList(id).pipe(
       map((state: SelectableListState) => hasValue(state) && isNotEmpty(state.selection) && hasValue(state.selection.find((selected) => selected.equals(object)))),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -99,7 +113,7 @@ export class SelectableListService {
    */
   findSelectedByCondition(id: string, condition: (object: ListableObject) => boolean): Observable<ListableObject> {
     return this.getSelectableList(id).pipe(
-      map((state: SelectableListState) => (hasValue(state) && isNotEmpty(state.selection)) ? state.selection.find((selected) => condition(selected)) : undefined)
+      map((state: SelectableListState) => (hasValue(state) && isNotEmpty(state.selection)) ? state.selection.find((selected) => condition(selected)) : undefined),
     );
   }
 }
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
index be3ee7d1bb..5b0e07ba23 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.spec.ts
@@ -1,8 +1,8 @@
-import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { Collection } from '../../../../core/shared/collection.model';
 import { Community } from '../../../../core/shared/community.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
 import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
+import { CollectionSidebarSearchListElementComponent } from './collection-sidebar-search-list-element.component';
 
 const object = Object.assign(new CollectionSearchResult(), {
   indexableObject: Object.assign(new Collection(), {
@@ -10,28 +10,28 @@ const object = Object.assign(new CollectionSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.description.abstract': [
         {
-          value: 'description'
-        }
-      ]
-    }
-  })
+          value: 'description',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Community(), {
   id: 'test-community',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('CollectionSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+  createSidebarSearchListElementTests(CollectionSidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
index 13703240f4..bd17dffa4c 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component.ts
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
-import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+
 import { Collection } from '../../../../core/shared/collection.model';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { CollectionSearchResult } from '../../../object-collection/shared/collection-search-result.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
 import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CollectionSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-collection-sidebar-search-list-element',
-  templateUrl: '../sidebar-search-list-element.component.html'
+  templateUrl: '../sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link CollectionSearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
index d6bcfc8581..f3114feda4 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component.spec.ts
@@ -1,7 +1,7 @@
 import { Community } from '../../../../core/shared/community.model';
+import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 import { createSidebarSearchListElementTests } from '../sidebar-search-list-element.component.spec';
 import { CommunitySidebarSearchListElementComponent } from './community-sidebar-search-list-element.component';
-import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
 
 const object = Object.assign(new CommunitySearchResult(), {
   indexableObject: Object.assign(new Community(), {
@@ -9,28 +9,28 @@ const object = Object.assign(new CommunitySearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.description.abstract': [
         {
-          value: 'description'
-        }
-      ]
-    }
-  })
+          value: 'description',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Community(), {
   id: 'test-parent-community',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('CommunitySidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description')
+  createSidebarSearchListElementTests(CommunitySidebarSearchListElementComponent, object, parent, 'parent title', 'title', 'description'),
 );
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..9bd907e8f1 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
@@ -1,16 +1,17 @@
 import { Component } from '@angular/core';
-import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+
+import { Community } from '../../../../core/shared/community.model';
 import { Context } from '../../../../core/shared/context.model';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
-import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 import { CommunitySearchResult } from '../../../object-collection/shared/community-search-result.model';
-import { Community } from '../../../../core/shared/community.model';
+import { listableObjectComponent } from '../../../object-collection/shared/listable-object/listable-object.decorator';
+import { SidebarSearchListElementComponent } from '../sidebar-search-list-element.component';
 
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModal)
 @listableObjectComponent(CommunitySearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
-  selector: 'ds-collection-sidebar-search-list-element',
-  templateUrl: '../sidebar-search-list-element.component.html'
+  selector: 'ds-community-sidebar-search-list-element',
+  templateUrl: '../sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link CommunitySearchResult} within the context of a sidebar search modal
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
index 106289bba6..d078d8e1c5 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.spec.ts
@@ -1,8 +1,8 @@
+import { Collection } from '../../../../../core/shared/collection.model';
+import { Item } from '../../../../../core/shared/item.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { createSidebarSearchListElementTests } from '../../sidebar-search-list-element.component.spec';
 import { PublicationSidebarSearchListElementComponent } from './publication-sidebar-search-list-element.component';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
-import { Item } from '../../../../../core/shared/item.model';
-import { Collection } from '../../../../../core/shared/collection.model';
 
 const object = Object.assign(new ItemSearchResult(), {
   indexableObject: Object.assign(new Item(), {
@@ -10,38 +10,38 @@ const object = Object.assign(new ItemSearchResult(), {
     metadata: {
       'dc.title': [
         {
-          value: 'title'
-        }
+          value: 'title',
+        },
       ],
       'dc.publisher': [
         {
-          value: 'publisher'
-        }
+          value: 'publisher',
+        },
       ],
       'dc.date.issued': [
         {
-          value: 'date'
-        }
+          value: 'date',
+        },
       ],
       'dc.contributor.author': [
         {
-          value: 'author'
-        }
-      ]
-    }
-  })
+          value: 'author',
+        },
+      ],
+    },
+  }),
 });
 const parent = Object.assign(new Collection(), {
   id: 'test-collection',
   metadata: {
     'dc.title': [
       {
-        value: 'parent title'
-      }
-    ]
-  }
+        value: 'parent title',
+      },
+    ],
+  },
 });
 
 describe('PublicationSidebarSearchListElementComponent',
-  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author')
+  createSidebarSearchListElementTests(PublicationSidebarSearchListElementComponent, object, parent, 'parent title', 'title', '(publisher, date) author'),
 );
diff --git a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
index 0822accc50..9f6a42808d 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component.ts
@@ -1,9 +1,10 @@
-import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
-import { ViewMode } from '../../../../../core/shared/view-mode.model';
 import { Component } from '@angular/core';
+
 import { Context } from '../../../../../core/shared/context.model';
-import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../../../core/shared/item.model';
+import { ViewMode } from '../../../../../core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../object-collection/shared/listable-object/listable-object.decorator';
 import { SidebarSearchListElementComponent } from '../../sidebar-search-list-element.component';
 
 @listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal)
@@ -12,7 +13,7 @@ import { SidebarSearchListElementComponent } from '../../sidebar-search-list-ele
 @listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent)
 @Component({
   selector: 'ds-publication-sidebar-search-list-element',
-  templateUrl: '../../sidebar-search-list-element.component.html'
+  templateUrl: '../../sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link ItemSearchResult} of type "Publication" within the context of
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
index 897ec43491..e3e5825b2e 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.spec.ts
@@ -1,17 +1,21 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../../utils/var.directive';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { SearchResult } from '../../search/models/search-result.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { TruncatableService } from '../../truncatable/truncatable.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { HALResource } from '../../../core/shared/hal-resource.model';
-import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { DSONameServiceMock } from '../../mocks/dso-name.service.mock';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { HALResource } from '../../../core/shared/hal-resource.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { SearchResult } from '../../search/models/search-result.model';
+import { TruncatableService } from '../../truncatable/truncatable.service';
+import { VarDirective } from '../../utils/var.directive';
 
 export function createSidebarSearchListElementTests(
   componentClass: any,
@@ -20,7 +24,7 @@ export function createSidebarSearchListElementTests(
   expectedParentTitle: string,
   expectedTitle: string,
   expectedDescription: string,
-  extraProviders: any[] = []
+  extraProviders: any[] = [],
 ) {
   return () => {
     let component;
@@ -31,8 +35,8 @@ export function createSidebarSearchListElementTests(
     beforeEach(waitForAsync(() => {
       linkService = jasmine.createSpyObj('linkService', {
         resolveLink: Object.assign(new HALResource(), {
-          [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent)
-        })
+          [object.indexableObject.getParentLinkKey()]: createSuccessfulRemoteDataObject$(parent),
+        }),
       });
       TestBed.configureTestingModule({
         declarations: [componentClass, VarDirective],
@@ -41,9 +45,9 @@ export function createSidebarSearchListElementTests(
           { provide: TruncatableService, useValue: {} },
           { provide: LinkService, useValue: linkService },
           DSONameService,
-          ...extraProviders
+          ...extraProviders,
         ],
-        schemas: [NO_ERRORS_SCHEMA]
+        schemas: [NO_ERRORS_SCHEMA],
       }).compileComponents();
     }));
 
diff --git a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
index c87559e11d..5ab6f4018d 100644
--- a/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
+++ b/src/app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.ts
@@ -1,21 +1,31 @@
-import { SearchResult } from '../../search/models/search-result.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
 import { Component } from '@angular/core';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { Observable, of as observableOf } from 'rxjs';
-import { TruncatableService } from '../../truncatable/truncatable.service';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { find, map } from 'rxjs/operators';
-import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
-import { followLink } from '../../utils/follow-link-config.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Context } from '../../../core/shared/context.model';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  find,
+  map,
+} from 'rxjs/operators';
+
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ChildHALResource } from '../../../core/shared/child-hal-resource.model';
+import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { SearchResult } from '../../search/models/search-result.model';
+import { TruncatableService } from '../../truncatable/truncatable.service';
+import { followLink } from '../../utils/follow-link-config.model';
+import { SearchResultListElementComponent } from '../search-result-list-element/search-result-list-element.component';
 
 @Component({
   selector: 'ds-sidebar-search-list-element',
-  templateUrl: './sidebar-search-list-element.component.html'
+  templateUrl: './sidebar-search-list-element.component.html',
 })
 /**
  * Component displaying a list element for a {@link SearchResult} in the sidebar search modal
@@ -35,7 +45,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
 
   public constructor(protected truncatableService: TruncatableService,
                      protected linkService: LinkService,
-                     protected dsoNameService: DSONameService
+                     public dsoNameService: DSONameService,
   ) {
     super(truncatableService, dsoNameService, null);
   }
@@ -66,7 +76,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
     return this.getParent().pipe(
       map((parentRD: RemoteData<DSpaceObject>) => {
         return hasValue(parentRD) && hasValue(parentRD.payload) ? this.dsoNameService.getName(parentRD.payload) : undefined;
-      })
+      }),
     );
   }
 
@@ -77,7 +87,7 @@ export class SidebarSearchListElementComponent<T extends SearchResult<K>, K exte
     if (typeof (this.dso as any).getParentLinkKey === 'function') {
       const propertyName = (this.dso as any).getParentLinkKey();
       return this.linkService.resolveLink(this.dso, followLink(propertyName))[propertyName].pipe(
-        find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204)
+        find((parentRD: RemoteData<ChildHALResource & DSpaceObject>) => parentRD.hasSucceeded || parentRD.statusCode === 204),
       );
     }
     return observableOf(undefined);
diff --git a/src/app/shared/object-list/themed-object-list.component.ts b/src/app/shared/object-list/themed-object-list.component.ts
index 8d47f9e108..a59f045b37 100644
--- a/src/app/shared/object-list/themed-object-list.component.ts
+++ b/src/app/shared/object-list/themed-object-list.component.ts
@@ -1,14 +1,22 @@
-import {Component, EventEmitter, Input, Output} from '@angular/core';
-import { ObjectListComponent } from './object-list.component';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Context } from '../../core/shared/context.model';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 import { ThemedComponent } from '../theme-support/themed.component';
-import {ViewMode} from '../../core/shared/view-mode.model';
-import {PaginationComponentOptions} from '../pagination/pagination-component-options.model';
-import {SortDirection, SortOptions} from '../../core/cache/models/sort-options.model';
-import {CollectionElementLinkType} from '../object-collection/collection-element-link.type';
-import {Context} from '../../core/shared/context.model';
-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 { ObjectListComponent } from './object-list.component';
 
 /**
  * Themed wrapper for ObjectListComponent
@@ -19,10 +27,6 @@ import {ListableObject} from '../object-collection/shared/listable-object.model'
   templateUrl: '../theme-support/themed.component.html',
 })
 export class ThemedObjectListComponent extends ThemedComponent<ObjectListComponent> {
-  /**
-   * The view mode of the this component
-   */
-  viewMode = ViewMode.ListElement;
 
   /**
    * The current pagination configuration
@@ -37,18 +41,20 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
   /**
    * Whether or not the list elements have a border
    */
-  @Input() hasBorder = false;
+  @Input() hasBorder: boolean;
 
   /**
    * The whether or not the gear is hidden
    */
-  @Input() hideGear = false;
+  @Input() hideGear: boolean;
 
   /**
    * Whether or not the pager is visible when there is only a single page of results
    */
-  @Input() hidePagerWhenSinglePage = true;
-  @Input() selectable = false;
+  @Input() hidePagerWhenSinglePage: boolean;
+
+  @Input() selectable: boolean;
+
   @Input() selectionConfig: { repeatable: boolean, listId: string };
 
   /**
@@ -64,12 +70,12 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
   /**
    * Option for hiding the pagination detail
    */
-  @Input() hidePaginationDetail = false;
+  @Input() hidePaginationDetail: boolean;
 
   /**
    * Whether or not to add an import button to the object
    */
-  @Input() importable = false;
+  @Input() importable: boolean;
 
   /**
    * Config used for the import button
@@ -79,42 +85,29 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
   /**
    * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
    */
-  @Input() showPaginator = true;
+  @Input() showPaginator: boolean;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
 
   /**
    * Emit when one of the listed object has changed.
    */
-  @Output() contentChange = new EventEmitter<any>();
+  @Output() contentChange: EventEmitter<any> = new EventEmitter();
 
   /**
    * If showPaginator is set to true, emit when the previous button is clicked
    */
-  @Output() prev = new EventEmitter<boolean>();
+  @Output() prev: EventEmitter<boolean> = new EventEmitter();
 
   /**
    * If showPaginator is set to true, emit when the next button is clicked
    */
-  @Output() next = new EventEmitter<boolean>();
+  @Output() next: EventEmitter<boolean> = new EventEmitter();
 
-  /**
-   * The current listable objects
-   */
-  private _objects: RemoteData<PaginatedList<ListableObject>>;
-
-  /**
-   * Setter for the objects
-   * @param objects The new objects
-   */
-  @Input() set objects(objects: RemoteData<PaginatedList<ListableObject>>) {
-    this._objects = objects;
-  }
-
-  /**
-   * Getter to return the current objects
-   */
-  get objects() {
-    return this._objects;
-  }
+  @Input() objects: RemoteData<PaginatedList<ListableObject>>;
 
   /**
    * An event fired when the page is changed.
@@ -123,48 +116,45 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
   @Output() change: EventEmitter<{
     pagination: PaginationComponentOptions,
     sort: SortOptions
-  }> = new EventEmitter<{
-    pagination: PaginationComponentOptions,
-    sort: SortOptions
-  }>();
+  }> = new EventEmitter();
 
   /**
    * An event fired when the page is changed.
    * Event's payload equals to the newly selected page.
    */
-  @Output() pageChange: EventEmitter<number> = new EventEmitter<number>();
+  @Output() pageChange: EventEmitter<number> = new EventEmitter();
 
   /**
    * An event fired when the page wsize is changed.
    * Event's payload equals to the newly selected page size.
    */
-  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter<number>();
+  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter();
 
   /**
    * An event fired when the sort direction is changed.
    * Event's payload equals to the newly selected sort direction.
    */
-  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter<SortDirection>();
+  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter();
 
   /**
    * An event fired when on of the pagination parameters changes
    */
-  @Output() paginationChange: EventEmitter<any> = new EventEmitter<any>();
+  @Output() paginationChange: EventEmitter<any> = new EventEmitter();
 
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
 
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
 
   /**
    * Send an import event to the parent component
    */
-  @Output() importObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() importObject: EventEmitter<ListableObject> = new EventEmitter();
 
   /**
    * An event fired when the sort field is changed.
    * Event's payload equals to the newly selected sort field.
    */
-  @Output() sortFieldChange: EventEmitter<string> = new EventEmitter<string>();
+  @Output() sortFieldChange: EventEmitter<string> = new EventEmitter();
 
   inAndOutputNames: (keyof ObjectListComponent & keyof this)[] = [
     'config',
@@ -180,6 +170,7 @@ export class ThemedObjectListComponent extends ThemedComponent<ObjectListCompone
     'importable',
     'importConfig',
     'showPaginator',
+    'showThumbnails',
     'contentChange',
     'prev',
     'next',
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 84577f645e..135579aff7 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
@@ -11,14 +11,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]">{{collection.name}}</a></td>
+            <td><input #selectCollectionBtn [attr.aria-label]="(selectCollectionBtn.checked ? 'collection.select.table.deselect' : 'collection.select.table.select') | translate" 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>
         </tbody>
       </table>
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.scss b/src/app/shared/object-select/collection-select/collection-select.component.scss
new file mode 100644
index 0000000000..b505f2895d
--- /dev/null
+++ b/src/app/shared/object-select/collection-select/collection-select.component.scss
@@ -0,0 +1,3 @@
+table tr th:first-of-type, table tr td:first-of-type, {
+  width: 1rem !important;
+}
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
index 0b1ae83ca7..1d064f240a 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
+++ b/src/app/shared/object-select/collection-select/collection-select.component.spec.ts
@@ -1,28 +1,33 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared.module';
-import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
-import { ObjectSelectService } from '../object-select.service';
-import { HostWindowService } from '../../host-window.service';
-import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { CollectionSelectComponent } from './collection-select.component';
-import { Collection } from '../../../core/shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { createPaginatedList } from '../../testing/utils.test';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-import { LinkHeadService } from '../../../core/services/link-head.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
+
 import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../core/services/link-head.service';
+import { Collection } from '../../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../host-window.service';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { SharedModule } from '../../shared.module';
+import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
+import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
+import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../testing/utils.test';
+import { ObjectSelectService } from '../object-select.service';
+import { CollectionSelectComponent } from './collection-select.component';
 
 describe('CollectionSelectComponent', () => {
   let comp: CollectionSelectComponent;
@@ -32,26 +37,26 @@ describe('CollectionSelectComponent', () => {
   const mockCollectionList = [
     Object.assign(new Collection(), {
       id: 'id1',
-      name: 'name1'
+      name: 'name1',
     }),
     Object.assign(new Collection(), {
       id: 'id2',
-      name: 'name2'
-    })
+      name: 'name2',
+    }),
   ];
   const mockCollections = createSuccessfulRemoteDataObject$(createPaginatedList(mockCollectionList));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   const authorizationDataService = jasmine.createSpyObj('authorizationDataService', {
-    isAuthorized: observableOf(true)
+    isAuthorized: observableOf(true),
   });
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -64,9 +69,9 @@ describe('CollectionSelectComponent', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   const paginationService = new PaginationServiceStub();
@@ -84,7 +89,7 @@ describe('CollectionSelectComponent', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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 a02305f116..fdb3103748 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,13 +1,16 @@
 import { Component } from '@angular/core';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 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 { ObjectSelectComponent } from '../object-select/object-select.component';
 
 @Component({
   selector: 'ds-collection-select',
-  templateUrl: './collection-select.component.html'
+  templateUrl: './collection-select.component.html',
+  styleUrls: ['./collection-select.component.scss'],
 })
 
 /**
@@ -15,8 +18,11 @@ import { AuthorizationDataService } from '../../../core/data/feature-authorizati
  */
 export class CollectionSelectComponent extends ObjectSelectComponent<Collection> {
 
-  constructor(protected objectSelectService: ObjectSelectService,
-              protected authorizationService: AuthorizationDataService) {
+  constructor(
+    protected objectSelectService: ObjectSelectService,
+    protected authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
+  ) {
     super(objectSelectService, authorizationService);
   }
 
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 b7fce78289..54ce54d9f3 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
@@ -11,7 +11,7 @@
       <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>
@@ -19,14 +19,16 @@
         </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>
+          <td><input #selectItemBtn [attr.aria-label]="(selectItemBtn.checked ? 'item.select.table.deselect' : 'item.select.table.select') | translate" [disabled]="(canSelect(item) | async) !== true" class="item-checkbox" [ngModel]="getSelected(item.id) | async" (change)="switch(item.id)" type="checkbox" name="{{item.id}}"></td>
           <td *ngIf="!hideCollection">
             <span *ngVar="(item.owningCollection | async)?.payload as collection">
-              <a *ngIf="collection" [routerLink]="['/collections', collection?.id]">{{collection?.name}}</a>
+              <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]]">{{item.firstMetadataValue("dc.title")}}</a></td>
+          <td><a [routerLink]="[(itemPageRoutes$ | async)[item.id]]">{{ dsoNameService.getName(item) }}</a></td>
         </tr>
         </tbody>
       </table>
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..4969121bf8 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
@@ -1,29 +1,34 @@
-import { ItemSelectComponent } from './item-select.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { Item } from '../../../core/shared/item.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { TranslateModule } from '@ngx-translate/core';
-import { SharedModule } from '../../shared.module';
-import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
-import { ObjectSelectService } from '../object-select.service';
-import { HostWindowService } from '../../host-window.service';
-import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
-import { createPaginatedList } from '../../testing/utils.test';
-import { PaginationService } from '../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
-import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
-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 { PaginationService } from '../../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../../core/services/link-head.service';
 import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { Item } from '../../../core/shared/item.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { HostWindowService } from '../../host-window.service';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { SharedModule } from '../../shared.module';
+import { HostWindowServiceStub } from '../../testing/host-window-service.stub';
+import { ObjectSelectServiceStub } from '../../testing/object-select-service.stub';
+import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { createPaginatedList } from '../../testing/utils.test';
+import { ObjectSelectService } from '../object-select.service';
+import { ItemSelectComponent } from './item-select.component';
 
 describe('ItemSelectComponent', () => {
   let comp: ItemSelectComponent;
@@ -39,14 +44,14 @@ describe('ItemSelectComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'This is just a title'
+          value: 'This is just a title',
         },
         {
           key: 'dc.type',
           language: null,
-          value: 'Article'
+          value: 'Article',
         }],
-      _links: { self: { href: 'selfId1' } }
+      _links: { self: { href: 'selfId1' } },
     }),
     Object.assign(new Item(), {
       id: 'id2',
@@ -55,21 +60,21 @@ describe('ItemSelectComponent', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'This is just another title'
+          value: 'This is just another title',
         },
         {
           key: 'dc.type',
           language: null,
-          value: 'Article'
+          value: 'Article',
         }],
-      _links: { self: { href: 'selfId2' } }
-    })
+      _links: { self: { href: 'selfId2' } },
+    }),
   ];
   const mockItems = createSuccessfulRemoteDataObject$(createPaginatedList(mockItemList));
   const mockPaginationOptions = Object.assign(new PaginationComponentOptions(), {
     id: 'search-page-configuration',
     pageSize: 10,
-    currentPage: 1
+    currentPage: 1,
   });
 
   paginationService = new PaginationServiceStub(mockPaginationOptions);
@@ -77,7 +82,7 @@ describe('ItemSelectComponent', () => {
   const authorizationDataService = new AuthorizationDataService(null, null, null, null, null);
 
   const linkHeadService = jasmine.createSpyObj('linkHeadService', {
-    addTag: ''
+    addTag: '',
   });
 
   const groupDataService = jasmine.createSpyObj('groupsDataService', {
@@ -90,9 +95,9 @@ describe('ItemSelectComponent', () => {
     findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
       name: 'test',
       values: [
-        'org.dspace.ctask.general.ProfileFormats = test'
-      ]
-    }))
+        'org.dspace.ctask.general.ProfileFormats = test',
+      ],
+    })),
   });
 
   beforeEach(waitForAsync(() => {
@@ -109,7 +114,7 @@ describe('ItemSelectComponent', () => {
         { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
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 5cf32c2953..18eda8374f 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,17 +1,25 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
 import { Item } from '../../../core/shared/item.model';
+import { getAllSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { getItemPageRoute } from '../../../item-page/item-page-routing-paths';
+import {
+  hasValueOperator,
+  isNotEmpty,
+} from '../../empty.util';
 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';
 
 @Component({
   selector: 'ds-item-select',
-  templateUrl: './item-select.component.html'
+  templateUrl: './item-select.component.html',
 })
 
 /**
@@ -23,7 +31,7 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
    * Whether or not to hide the collection column
    */
   @Input()
-  hideCollection = false;
+    hideCollection = false;
 
   /**
    * The routes to the items their pages
@@ -34,8 +42,11 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
     [itemId: string]: string
   }>;
 
-  constructor(protected objectSelectService: ObjectSelectService,
-              protected authorizationService: AuthorizationDataService ) {
+  constructor(
+    protected objectSelectService: ObjectSelectService,
+    protected authorizationService: AuthorizationDataService,
+    public dsoNameService: DSONameService,
+  ) {
     super(objectSelectService, authorizationService);
   }
 
@@ -51,7 +62,7 @@ export class ItemSelectComponent extends ObjectSelectComponent<Item> {
         const itemPageRoutes = {};
         items.page.forEach((item) => itemPageRoutes[item.uuid] = getItemPageRoute(item));
         return itemPageRoutes;
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/object-select/object-select.actions.ts b/src/app/shared/object-select/object-select.actions.ts
index a8c50ef55d..2128cec878 100644
--- a/src/app/shared/object-select/object-select.actions.ts
+++ b/src/app/shared/object-select/object-select.actions.ts
@@ -1,14 +1,15 @@
 /* eslint-disable max-classes-per-file */
-import { type } from '../ngrx/type';
 import { Action } from '@ngrx/store';
 
+import { type } from '../ngrx/type';
+
 export const ObjectSelectionActionTypes = {
   INITIAL_DESELECT: type('dspace/object-select/INITIAL_DESELECT'),
   INITIAL_SELECT: type('dspace/object-select/INITIAL_SELECT'),
   SELECT: type('dspace/object-select/SELECT'),
   DESELECT: type('dspace/object-select/DESELECT'),
   SWITCH: type('dspace/object-select/SWITCH'),
-  RESET: type('dspace/object-select/RESET')
+  RESET: type('dspace/object-select/RESET'),
 };
 
 export class ObjectSelectionAction implements Action {
diff --git a/src/app/shared/object-select/object-select.reducer.spec.ts b/src/app/shared/object-select/object-select.reducer.spec.ts
index dce66f25dd..fd67f4af64 100644
--- a/src/app/shared/object-select/object-select.reducer.spec.ts
+++ b/src/app/shared/object-select/object-select.reducer.spec.ts
@@ -4,7 +4,7 @@ import {
   ObjectSelectionInitialSelectAction,
   ObjectSelectionResetAction,
   ObjectSelectionSelectAction,
-  ObjectSelectionSwitchAction
+  ObjectSelectionSwitchAction,
 } from './object-select.actions';
 import { objectSelectionReducer } from './object-select.reducer';
 
diff --git a/src/app/shared/object-select/object-select.reducer.ts b/src/app/shared/object-select/object-select.reducer.ts
index 0157ef0be3..103fbcf21b 100644
--- a/src/app/shared/object-select/object-select.reducer.ts
+++ b/src/app/shared/object-select/object-select.reducer.ts
@@ -1,5 +1,8 @@
 import { isEmpty } from '../empty.util';
-import { ObjectSelectionAction, ObjectSelectionActionTypes } from './object-select.actions';
+import {
+  ObjectSelectionAction,
+  ObjectSelectionActionTypes,
+} from './object-select.actions';
 
 /**
  * Interface that represents the state for a single selection of an object
@@ -39,9 +42,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
         return Object.assign({}, state, {
           [action.key]: Object.assign({}, state[action.key], {
             [action.id]: {
-              checked: true
-            }
-          })
+              checked: true,
+            },
+          }),
         });
       }
       return state;
@@ -52,9 +55,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
         return Object.assign({}, state, {
           [action.key]: Object.assign({}, state[action.key], {
             [action.id]: {
-              checked: false
-            }
-          })
+              checked: false,
+            },
+          }),
         });
       }
       return state;
@@ -64,9 +67,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
       return Object.assign({}, state, {
         [action.key]: Object.assign({}, state[action.key], {
           [action.id]: {
-            checked: true
-          }
-        })
+            checked: true,
+          },
+        }),
       });
     }
 
@@ -74,9 +77,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
       return Object.assign({}, state, {
         [action.key]: Object.assign({}, state[action.key], {
           [action.id]: {
-            checked: false
-          }
-        })
+            checked: false,
+          },
+        }),
       });
     }
 
@@ -84,9 +87,9 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
       return Object.assign({}, state, {
         [action.key]: Object.assign({}, state[action.key], {
           [action.id]: {
-            checked: (isEmpty(state) || isEmpty(state[action.key]) || isEmpty(state[action.key][action.id])) ? true : !state[action.key][action.id].checked
-          }
-        })
+            checked: (isEmpty(state) || isEmpty(state[action.key]) || isEmpty(state[action.key][action.id])) ? true : !state[action.key][action.id].checked,
+          },
+        }),
       });
     }
 
@@ -95,7 +98,7 @@ export function objectSelectionReducer(state = initialState, action: ObjectSelec
         return {};
       } else {
         return Object.assign({}, state, {
-          [action.key]: {}
+          [action.key]: {},
         });
       }
     }
diff --git a/src/app/shared/object-select/object-select.service.spec.ts b/src/app/shared/object-select/object-select.service.spec.ts
index 35c46c48e6..ace1bcdd23 100644
--- a/src/app/shared/object-select/object-select.service.spec.ts
+++ b/src/app/shared/object-select/object-select.service.spec.ts
@@ -1,6 +1,6 @@
-import { ObjectSelectService } from './object-select.service';
 import { Store } from '@ngrx/store';
-import { ObjectSelectionListState, ObjectSelectionsState } from './object-select.reducer';
+import { of } from 'rxjs';
+
 import { AppState } from '../../app.reducer';
 import {
   ObjectSelectionDeselectAction,
@@ -8,9 +8,13 @@ import {
   ObjectSelectionInitialSelectAction,
   ObjectSelectionResetAction,
   ObjectSelectionSelectAction,
-  ObjectSelectionSwitchAction
+  ObjectSelectionSwitchAction,
 } from './object-select.actions';
-import { of } from 'rxjs';
+import {
+  ObjectSelectionListState,
+  ObjectSelectionsState,
+} from './object-select.reducer';
+import { ObjectSelectService } from './object-select.service';
 
 describe('ObjectSelectService', () => {
   let service: ObjectSelectService;
@@ -22,21 +26,21 @@ describe('ObjectSelectService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-    select: of(true)
+    select: of(true),
   });
 
   const store: Store<ObjectSelectionsState> = jasmine.createSpyObj('store', {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty,@typescript-eslint/no-empty-function */
-    select: of(true)
+    select: of(true),
   });
 
   const appStore: Store<AppState> = jasmine.createSpyObj('appStore', {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: of(true)
+    select: of(true),
   });
 
   beforeEach(() => {
diff --git a/src/app/shared/object-select/object-select.service.ts b/src/app/shared/object-select/object-select.service.ts
index 8e30bca24d..ec5eb7b0ca 100644
--- a/src/app/shared/object-select/object-select.service.ts
+++ b/src/app/shared/object-select/object-select.service.ts
@@ -1,16 +1,27 @@
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, Store } from '@ngrx/store';
-import { ObjectSelectionListState, ObjectSelectionsState, ObjectSelectionState } from './object-select.reducer';
+import {
+  createSelector,
+  MemoizedSelector,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AppState } from '../../app.reducer';
+import { hasValue } from '../empty.util';
 import {
   ObjectSelectionDeselectAction,
   ObjectSelectionInitialDeselectAction,
-  ObjectSelectionInitialSelectAction, ObjectSelectionResetAction,
-  ObjectSelectionSelectAction, ObjectSelectionSwitchAction
+  ObjectSelectionInitialSelectAction,
+  ObjectSelectionResetAction,
+  ObjectSelectionSelectAction,
+  ObjectSelectionSwitchAction,
 } from './object-select.actions';
-import { Observable } from 'rxjs';
-import { hasValue } from '../empty.util';
-import { map } from 'rxjs/operators';
-import { AppState } from '../../app.reducer';
+import {
+  ObjectSelectionListState,
+  ObjectSelectionsState,
+  ObjectSelectionState,
+} from './object-select.reducer';
 
 const objectSelectionsStateSelector = (state: ObjectSelectionListState) => state.objectSelection;
 const objectSelectionListStateSelector = (state: AppState) => state.objectSelection;
@@ -23,7 +34,7 @@ export class ObjectSelectService {
 
   constructor(
     private store: Store<ObjectSelectionListState>,
-    private appStore: Store<AppState>
+    private appStore: Store<AppState>,
   ) {
   }
 
@@ -41,7 +52,7 @@ export class ObjectSelectService {
         } else {
           return false;
         }
-      })
+      }),
     );
   }
 
@@ -57,7 +68,7 @@ export class ObjectSelectService {
         } else {
           return [];
         }
-      })
+      }),
     );
   }
 
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..12a4baf66a 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
@@ -1,21 +1,35 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { startWith, take } from 'rxjs/operators';
-import { of, Observable } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  startWith,
+  take,
+} from 'rxjs/operators';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+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 { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { ObjectSelectService } from '../object-select.service';
-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';
 
 /**
  * An abstract component used to select DSpaceObjects from a specific list and returning the UUIDs of the selected DSpaceObjects
  */
 @Component({
   selector: 'ds-object-select-abstract',
-  template: ''
+  template: '',
 })
 export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestroy {
 
@@ -23,65 +37,65 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
    * A unique key used for the object select service
    */
   @Input()
-  key: string;
+    key: string;
 
   /**
    * The list of DSpaceObjects to display
    */
   @Input()
-  dsoRD$: Observable<RemoteData<PaginatedList<TDomain>>>;
+    dsoRD$: Observable<RemoteData<PaginatedList<TDomain>>>;
 
   /**
    * The pagination options used to display the DSpaceObjects
    */
   @Input()
-  paginationOptions: PaginationComponentOptions;
+    paginationOptions: PaginationComponentOptions;
 
   /**
    * The sorting options used to display the DSpaceObjects
    */
   @Input()
-  sortOptions: SortOptions;
+    sortOptions: SortOptions;
 
   /**
    * The message key used for the confirm button
    * @type {string}
    */
   @Input()
-  confirmButton: string;
+    confirmButton: string;
 
   /**
    * Authorize check to enable the selection when present.
    */
   @Input()
-  featureId: FeatureID;
+    featureId: FeatureID;
 
   /**
    * The message key used for the cancel button
    * @type {string}
    */
   @Input()
-  cancelButton: string;
+    cancelButton: string;
 
   /**
    * An event fired when the cancel button is clicked
    */
   @Output()
-  cancel = new EventEmitter<any>();
+    cancel = new EventEmitter<any>();
 
   /**
    * EventEmitter to return the selected UUIDs when the confirm button is pressed
    * @type {EventEmitter<string[]>}
    */
   @Output()
-  confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
+    confirm: EventEmitter<string[]> = new EventEmitter<string[]>();
 
   /**
    * Whether or not to render the confirm button as danger (for example if confirm deletes objects)
    * Defaults to false
    */
   @Input()
-  dangerConfirm = false;
+    dangerConfirm = false;
 
   /**
    * The list of selected UUIDs
@@ -133,7 +147,7 @@ export abstract class ObjectSelectComponent<TDomain> implements OnInit, OnDestro
    */
   confirmSelected() {
     this.selectedIds$.pipe(
-      take(1)
+      take(1),
     ).subscribe((ids: string[]) => {
       this.confirm.emit(ids);
       this.objectSelectService.reset(this.key);
diff --git a/src/app/shared/object-table/object-table.component.html b/src/app/shared/object-table/object-table.component.html
new file mode 100644
index 0000000000..39743a5922
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.html
@@ -0,0 +1,33 @@
+<ds-pagination
+  [paginationOptions]="config"
+  [pageInfoState]="objects?.payload"
+  [collectionSize]="objects?.payload?.totalElements"
+  [sortOptions]="sortConfig"
+  [hideGear]="hideGear"
+  [objects]="objects"
+  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+  [hidePaginationDetail]="hidePaginationDetail"
+  [showPaginator]="showPaginator"
+  (pageChange)="onPageChange($event)"
+  (pageSizeChange)="onPageSizeChange($event)"
+  (sortDirectionChange)="onSortDirectionChange($event)"
+  (sortFieldChange)="onSortFieldChange($event)"
+  (paginationChange)="onPaginationChange($event)"
+  (prev)="goPrev()"
+  (next)="goNext()"
+  [retainScrollPosition]="true"
+>
+  <div *ngIf="objects?.hasSucceeded">
+    <div @fadeIn>
+      <ds-tabulatable-objects-loader [objects]="objects.payload"
+                                     [context]="context"
+                                     [showThumbnails]="showThumbnails"
+                                     [linkType]="linkType">
+      </ds-tabulatable-objects-loader>
+    </div>
+  </div>
+  <ds-error *ngIf="objects?.hasFailed" message="{{'error.objects' | translate}}"></ds-error>
+  <ds-themed-loading *ngIf="objects?.isLoading" message="{{'loading.objects' | translate}}"></ds-themed-loading>
+</ds-pagination>
+
+
diff --git a/src/app/shared/object-table/object-table.component.scss b/src/app/shared/object-table/object-table.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/object-table/object-table.component.spec.ts b/src/app/shared/object-table/object-table.component.spec.ts
new file mode 100644
index 0000000000..de4719fc2e
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.spec.ts
@@ -0,0 +1,157 @@
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+
+import { ObjectTableComponent } from './object-table.component';
+
+describe('ObjectTableComponent', () => {
+  let component: ObjectTableComponent;
+  let fixture: ComponentFixture<ObjectTableComponent>;
+  const testEvent: any = { test: 'test' };
+
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ ObjectTableComponent ],
+    })
+      .compileComponents();
+
+    fixture = TestBed.createComponent(ObjectTableComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+
+  describe('when the pageChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onPageChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('pageChange', testEvent);
+    });
+
+    it('should call onPageChange on the componentonent', () => {
+      expect(component.onPageChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the pageSizeChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onPageSizeChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('pageSizeChange', testEvent);
+    });
+
+    it('should call onPageSizeChange on the componentonent', () => {
+      expect(component.onPageSizeChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the sortDirectionChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onSortDirectionChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('sortDirectionChange', testEvent);
+    });
+
+    it('should call onSortDirectionChange on the componentonent', () => {
+      expect(component.onSortDirectionChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the sortFieldChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onSortFieldChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('sortFieldChange', testEvent);
+    });
+
+    it('should call onSortFieldChange on the componentonent', () => {
+      expect(component.onSortFieldChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when the paginationChange output on the pagination is triggered', () => {
+    beforeEach(() => {
+      spyOn(component, 'onPaginationChange');
+      const paginationEl = fixture.debugElement.query(By.css('ds-pagination'));
+      paginationEl.triggerEventHandler('paginationChange', testEvent);
+    });
+
+    it('should call onPaginationChange on the componentonent', () => {
+      expect(component.onPaginationChange).toHaveBeenCalledWith(testEvent);
+    });
+  });
+
+  describe('when onPageChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.pageChange, 'emit');
+      component.onPageChange(testEvent);
+    });
+
+    it('should emit the value from the pageChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.pageChange.emit).toHaveBeenCalled();
+      expect(component.pageChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onPageSizeChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.pageSizeChange, 'emit');
+      component.onPageSizeChange(testEvent);
+    });
+
+    it('should emit the value from the pageSizeChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.pageSizeChange.emit).toHaveBeenCalled();
+      expect(component.pageSizeChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onSortDirectionChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.sortDirectionChange, 'emit');
+      component.onSortDirectionChange(testEvent);
+    });
+
+    it('should emit the value from the sortDirectionChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.sortDirectionChange.emit).toHaveBeenCalled();
+      expect(component.sortDirectionChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onSortFieldChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.sortFieldChange, 'emit');
+      component.onSortFieldChange(testEvent);
+    });
+
+    it('should emit the value from the sortFieldChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.sortFieldChange.emit).toHaveBeenCalled();
+      expect(component.sortFieldChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+
+  describe('when onPaginationChange is triggered with an event', () => {
+    beforeEach(() => {
+      spyOn(component.paginationChange, 'emit');
+      component.onPaginationChange(testEvent);
+    });
+
+    it('should emit the value from the paginationChange EventEmitter', fakeAsync(() => {
+      tick(1);
+      expect(component.paginationChange.emit).toHaveBeenCalled();
+      expect(component.paginationChange.emit).toHaveBeenCalledWith(testEvent);
+    }));
+  });
+});
diff --git a/src/app/shared/object-table/object-table.component.ts b/src/app/shared/object-table/object-table.component.ts
new file mode 100644
index 0000000000..94e2a9d093
--- /dev/null
+++ b/src/app/shared/object-table/object-table.component.ts
@@ -0,0 +1,216 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { Context } from '../../core/shared/context.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { fadeIn } from '../animations/fade';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.Default,
+  encapsulation: ViewEncapsulation.Emulated,
+  selector: 'ds-object-table',
+  templateUrl: './object-table.component.html',
+  styleUrls: ['./object-table.component.scss'],
+  animations: [fadeIn],
+})
+
+/**
+ * Component used to wrap and load paginated search results if the ViewMode is set to Table.
+ * Each ViewMode has a different type of wrapper that can be checked in ObjectCollectionComponent
+ */
+export class ObjectTableComponent {
+  /**
+   * The view mode of this component
+   */
+  viewMode = ViewMode.Table;
+
+  /**
+   * The current pagination configuration
+   */
+  @Input() config: PaginationComponentOptions;
+
+  /**
+   * The current sort configuration
+   */
+  @Input() sortConfig: SortOptions;
+
+  /**
+   * Whether or not the pagination should be rendered as simple previous and next buttons instead of the normal pagination
+   */
+  @Input() showPaginator = true;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
+  /**
+   * The whether or not the gear is hidden
+   */
+  @Input() hideGear = false;
+
+  /**
+   * Whether or not the pager is visible when there is only a single page of results
+   */
+  @Input() hidePagerWhenSinglePage = true;
+
+  /**
+   * The link type of the listable elements
+   */
+  @Input() linkType: CollectionElementLinkType;
+
+  /**
+   * The context of the listable elements
+   */
+  @Input() context: Context;
+
+  /**
+   * Option for hiding the pagination detail
+   */
+  @Input() hidePaginationDetail = false;
+
+  /**
+   * Behavior subject to output the current listable objects
+   */
+  private _objects$: BehaviorSubject<RemoteData<PaginatedList<ListableObject>>>;
+
+  /**
+   * Setter to make sure the observable is turned into an observable
+   * @param objects The new objects to output
+   */
+  @Input() set objects(objects: RemoteData<PaginatedList<ListableObject>>) {
+    this._objects$.next(objects);
+  }
+
+  /**
+   * Getter to return the current objects
+   */
+  get objects() {
+    return this._objects$.getValue();
+  }
+
+  /**
+   * An event fired when the page is changed.
+   * Event's payload equals to the newly selected page.
+   */
+  @Output() change: EventEmitter<{
+    pagination: PaginationComponentOptions,
+    sort: SortOptions
+  }> = new EventEmitter<{
+    pagination: PaginationComponentOptions,
+    sort: SortOptions
+  }>();
+
+  /**
+   * An event fired when the page is changed.
+   * Event's payload equals to the newly selected page.
+   */
+  @Output() pageChange: EventEmitter<number> = new EventEmitter<number>();
+
+  /**
+   * An event fired when the page wsize is changed.
+   * Event's payload equals to the newly selected page size.
+   */
+  @Output() pageSizeChange: EventEmitter<number> = new EventEmitter<number>();
+
+  /**
+   * An event fired when the sort direction is changed.
+   * Event's payload equals to the newly selected sort direction.
+   */
+  @Output() sortDirectionChange: EventEmitter<SortDirection> = new EventEmitter<SortDirection>();
+
+  /**
+   * An event fired when on of the pagination parameters changes
+   */
+  @Output() paginationChange: EventEmitter<any> = new EventEmitter<any>();
+
+  /**
+   * An event fired when the sort field is changed.
+   * Event's payload equals to the newly selected sort field.
+   */
+  @Output() sortFieldChange: EventEmitter<string> = new EventEmitter<string>();
+
+  /**
+   * If showPaginator is set to true, emit when the previous button is clicked
+   */
+  @Output() prev = new EventEmitter<boolean>();
+
+  /**
+   * If showPaginator is set to true, emit when the next button is clicked
+   */
+  @Output() next = new EventEmitter<boolean>();
+
+  data: any = {};
+
+  constructor() {
+    this._objects$ = new BehaviorSubject(undefined);
+  }
+
+  /**
+   * Emits the current page when it changes
+   * @param event The new page
+   */
+  onPageChange(event) {
+    this.pageChange.emit(event);
+  }
+  /**
+   * Emits the current page size when it changes
+   * @param event The new page size
+   */
+  onPageSizeChange(event) {
+    this.pageSizeChange.emit(event);
+  }
+  /**
+   * Emits the current sort direction when it changes
+   * @param event The new sort direction
+   */
+  onSortDirectionChange(event) {
+    this.sortDirectionChange.emit(event);
+  }
+
+  /**
+   * Emits the current sort field when it changes
+   * @param event The new sort field
+   */
+  onSortFieldChange(event) {
+    this.sortFieldChange.emit(event);
+  }
+
+  /**
+   * Emits the current pagination when it changes
+   * @param event The new pagination
+   */
+  onPaginationChange(event) {
+    this.paginationChange.emit(event);
+  }
+
+  /**
+   * Go to the previous page
+   */
+  goPrev() {
+    this.prev.emit(true);
+  }
+
+  /**
+   * Go to the next page
+   */
+  goNext() {
+    this.next.emit(true);
+  }
+}
diff --git a/src/app/shared/object.util.spec.ts b/src/app/shared/object.util.spec.ts
index 9d7f9dee37..817b875667 100644
--- a/src/app/shared/object.util.spec.ts
+++ b/src/app/shared/object.util.spec.ts
@@ -1,4 +1,8 @@
-import { deleteProperty, difference, hasOnlyEmptyProperties } from './object.util';
+import {
+  deleteProperty,
+  difference,
+  hasOnlyEmptyProperties,
+} from './object.util';
 
 describe('Object Utils', () => {
   let object: any = {};
diff --git a/src/app/shared/object.util.ts b/src/app/shared/object.util.ts
index 1602fb9839..38827f9a14 100644
--- a/src/app/shared/object.util.ts
+++ b/src/app/shared/object.util.ts
@@ -1,5 +1,8 @@
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+import transform from 'lodash/transform';
+
 import { isNotEmpty } from './empty.util';
-import { isEqual, isObject, transform } from 'lodash';
 
 /**
  * Returns passed object without specified property
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
index 67947c3425..13c54e890c 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
@@ -1,19 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-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 {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { first, take } from 'rxjs/operators';
-import { PageSizeSelectorComponent } from './page-size-selector.component';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+import {
+  first,
+  take,
+} from 'rxjs/operators';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { EnumKeysPipe } from '../utils/enum-keys-pipe';
 import { VarDirective } from '../utils/var.directive';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { PageSizeSelectorComponent } from './page-size-selector.component';
 
 describe('PageSizeSelectorComponent', () => {
 
@@ -32,7 +43,7 @@ describe('PageSizeSelectorComponent', () => {
     query: queryParam,
     scope: scopeParam,
     pagination,
-    sort
+    sort,
   };
 
   const paginationService = new PaginationServiceStub(pagination, sort);
@@ -40,8 +51,8 @@ describe('PageSizeSelectorComponent', () => {
   const activatedRouteStub = {
     queryParams: observableOf({
       query: queryParam,
-      scope: scopeParam
-    })
+      scope: scopeParam,
+    }),
   };
 
   beforeEach(waitForAsync(() => {
@@ -55,10 +66,10 @@ describe('PageSizeSelectorComponent', () => {
           provide: SEARCH_CONFIG_SERVICE,
           useValue: {
             paginatedSearchOptions: observableOf(paginatedSearchOptions),
-          }
+          },
         },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -72,21 +83,22 @@ describe('PageSizeSelectorComponent', () => {
   });
 
   it('it should show the size settings with the respective selectable options', (done) => {
-    (comp as any).paginationOptions$.pipe(first()).subscribe((options) => {
-        const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
-        expect(pageSizeSetting).toBeDefined();
-        const childElements = pageSizeSetting.queryAll(By.css('option'));
-        expect(childElements.length).toEqual(options.pageSizeOptions.length);
-        done();
-      }
+    comp.paginationOptions$.pipe(first()).subscribe((options: PaginationComponentOptions) => {
+      const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+      expect(pageSizeSetting).not.toBeNull();
+      const childElements = pageSizeSetting.queryAll(By.css('option'));
+      expect(childElements.length).toEqual(options.pageSizeOptions.length);
+      done();
+    },
     );
   });
 
   it('should have the proper rpp value selected by default', (done) => {
-    (comp as any).paginationOptions$.pipe(take(1)).subscribe((options) => {
+    comp.paginationOptions$.pipe(take(1)).subscribe(() => {
       const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
-      const childElementToBeSelected = pageSizeSetting.query(By.css('option[value="10"][selected="selected"]'));
-      expect(childElementToBeSelected).toBeDefined();
+      const childElementToBeSelected = pageSizeSetting.query(By.css('option[value="10"]'));
+      expect(childElementToBeSelected).not.toBeNull();
+      expect(childElementToBeSelected.nativeElement.selected).toBeTrue();
       done();
     });
   });
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.ts b/src/app/shared/page-size-selector/page-size-selector.component.ts
index 0dce32a4ba..fe17095afc 100644
--- a/src/app/shared/page-size-selector/page-size-selector.component.ts
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -1,17 +1,28 @@
-import { Component, Inject, OnInit } from '@angular/core';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import {
+  Component,
+  Inject,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
-import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { map, take } from 'rxjs/operators';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 
 @Component({
   selector: 'ds-page-size-selector',
   styleUrls: ['./page-size-selector.component.scss'],
-  templateUrl: './page-size-selector.component.html'
+  templateUrl: './page-size-selector.component.html',
 })
 
 /**
@@ -44,9 +55,9 @@ export class PageSizeSelectorComponent implements OnInit {
   reloadRPP(event: Event) {
     const value = (event.target as HTMLInputElement).value;
     this.paginationOptions$.pipe(
-      take(1)
+      take(1),
     ).subscribe((pagination: PaginationComponentOptions) => {
-      this.paginationService.updateRoute(pagination.id, {page: 1, pageSize: +value});
+      this.paginationService.updateRoute(pagination.id, { page: 1, pageSize: +value });
     }) ;
   }
 }
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
index 7db53425d5..dc8a413f1f 100644
--- 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
@@ -1,24 +1,30 @@
-import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  Component,
+  ElementRef,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { FieldUpdates } from '../../core/data/object-updates/field-updates.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 { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { PaginationComponent } from '../pagination/pagination.component';
 import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { createPaginatedList } from '../testing/utils.test';
 import { ObjectValuesPipe } from '../utils/object-values-pipe';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
+import { AbstractPaginatedDragAndDropListComponent } from './abstract-paginated-drag-and-drop-list.component';
 
 @Component({
   selector: 'ds-mock-paginated-drag-drop-abstract',
-  template: ''
+  template: '',
 })
 class MockAbstractPaginatedDragAndDropListComponent extends AbstractPaginatedDragAndDropListComponent<DSpaceObject> {
 
@@ -57,7 +63,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
 
   const updates = {
     [object1.uuid]: { field: object1, changeType: undefined },
-    [object2.uuid]: { field: object2, changeType: undefined }
+    [object2.uuid]: { field: object2, changeType: undefined },
   } as FieldUpdates;
 
   let paginationComponent: PaginationComponent;
@@ -65,16 +71,16 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
   beforeEach(() => {
     objectUpdatesService = jasmine.createSpyObj('objectUpdatesService', {
       initialize: {},
-      getFieldUpdatesExclusive: observableOf(updates)
+      getFieldUpdatesExclusive: observableOf(updates),
     });
     elRef = {
       nativeElement: jasmine.createSpyObj('nativeElement', {
-        querySelector: {}
-      })
+        querySelector: {},
+      }),
     };
     objectValuesPipe = new ObjectValuesPipe();
     paginationComponent = jasmine.createSpyObj('paginationComponent', {
-      doPageChange: {}
+      doPageChange: {},
     });
     paginationService = new PaginationServiceStub();
     objectsRD$ = new BehaviorSubject(objectsRD);
@@ -98,7 +104,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
     const event = {
       previousIndex: 0,
       currentIndex: 1,
-      item: { element: { nativeElement: { id: object1.uuid } } }
+      item: { element: { nativeElement: { id: object1.uuid } } },
     } as any;
 
     describe('when the user is hovering over a new page', () => {
@@ -115,7 +121,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
         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()
+          finish: jasmine.anything(),
         }));
       });
     });
@@ -130,7 +136,7 @@ describe('AbstractPaginatedDragAndDropListComponent', () => {
         expect(component.dropObject.emit).toHaveBeenCalledWith(Object.assign({
           fromIndex: event.previousIndex,
           toIndex: event.currentIndex,
-          finish: jasmine.anything()
+          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
index 8dba47566f..1ebf626484 100644
--- 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
@@ -1,24 +1,43 @@
-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';
+  CdkDragDrop,
+  moveItemInArray,
+} from '@angular/cdk/drag-drop';
+import {
+  Component,
+  ElementRef,
+  EventEmitter,
+  OnDestroy,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { FieldUpdate } from '../../core/data/object-updates/field-update.model';
 import { FieldUpdates } from '../../core/data/object-updates/field-updates.model';
+import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstSucceededRemoteData,
+  paginatedListToArray,
+} from '../../core/shared/operators';
+import { compareArraysUsing } from '../../item-page/simple/item-types/shared/item-relationships-utils';
+import { hasValue } from '../empty.util';
+import { PaginationComponent } from '../pagination/pagination.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { ObjectValuesPipe } from '../utils/object-values-pipe';
 
 /**
  * Operator used for comparing {@link FieldUpdate}s by their field's UUID
@@ -44,7 +63,7 @@ export const compareArraysUsingFieldUuids = () =>
  */
 @Component({
   selector: 'ds-paginated-drag-drop-abstract',
-  template: ''
+  template: '',
 })
 export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpaceObject> implements OnDestroy {
   /**
@@ -92,7 +111,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   options = Object.assign(new PaginationComponentOptions(),{
     id: 'dad',
     currentPage: 1,
-    pageSize: this.pageSize
+    pageSize: this.pageSize,
   });
 
   /**
@@ -116,8 +135,8 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
   protected constructor(protected objectUpdatesService: ObjectUpdatesService,
                         protected elRef: ElementRef,
                         protected objectValuesPipe: ObjectValuesPipe,
-                        protected paginationService: PaginationService
-                        ) {
+                        protected paginationService: PaginationService,
+  ) {
   }
 
   /**
@@ -162,19 +181,19 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
     this.updates$ = this.objectsRD$.pipe(
       getAllSucceededRemoteData(),
       paginatedListToArray(),
-      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects))
+      switchMap((objects: T[]) => this.objectUpdatesService.getFieldUpdatesExclusive(this.url, objects)),
     );
     this.subs.push(
       this.updates$.pipe(
         map((fieldUpdates) => this.objectValuesPipe.transform(fieldUpdates)),
-        distinctUntilChanged(compareArraysUsingFieldUuids())
+        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)
+      this.loading$.subscribe((loading) => this.options.disabled = loading),
     );
   }
 
@@ -224,7 +243,7 @@ export abstract class AbstractPaginatedDragAndDropListComponent<T extends DSpace
           if (isNewPage) {
             this.paginationComponent.doPageChange(redirectPage);
           }
-        }
+        },
       }));
     }
   }
diff --git a/src/app/shared/pagination/pagination-component-options.model.ts b/src/app/shared/pagination/pagination-component-options.model.ts
index 2b60c93275..b964b50fda 100644
--- a/src/app/shared/pagination/pagination-component-options.model.ts
+++ b/src/app/shared/pagination/pagination-component-options.model.ts
@@ -1,5 +1,5 @@
-import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap';
 import { Injectable } from '@angular/core';
+import { NgbPaginationConfig } from '@ng-bootstrap/ng-bootstrap';
 
 @Injectable()
 export class PaginationComponentOptions extends NgbPaginationConfig {
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index f0a8866049..9ae978c41b 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -1,4 +1,4 @@
-<div *ngIf="currentPageState == undefined || currentPageState == (currentPage$|async)" [id]="'p-' + id">
+<div *ngIf="currentPageState === undefined || currentPageState === (currentPage$|async)" [id]="'p-' + id">
   <div *ngIf="(!hidePaginationDetail && collectionSize > 0) || !hideGear" class="pagination-masked clearfix top">
     <div class="row">
       <div *ngIf="!hidePaginationDetail && collectionSize > 0" class="col-auto pagination-info">
@@ -7,13 +7,29 @@
       </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"><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">
+                    <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
+                  </button>
+                </li>
+              </ul>
+            </li>
+            <li *ngIf="hideSortOptions === false" 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)">
+                    <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>
@@ -39,12 +55,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">
+                [disabled]="(objects?.payload?.currentPage <= 1) && (paginationOptions?.currentPage <= 1)">
           <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">
+              [disabled]="(objects?.payload?.currentPage >= objects?.payload?.totalPages) || (paginationOptions?.currentPage >= objects?.payload?.totalPages)">
           <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.spec.ts b/src/app/shared/pagination/pagination.component.spec.ts
index 2d913da8a3..36b0313ddf 100644
--- a/src/app/shared/pagination/pagination.component.spec.ts
+++ b/src/app/shared/pagination/pagination.component.spec.ts
@@ -1,41 +1,51 @@
 // Load the implementations that should be tested
 import { CommonModule } from '@angular/common';
-
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-
-import { RouterTestingModule } from '@angular/router/testing';
-
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { StoreModule } from '@ngrx/store';
-
-import { NgxPaginationModule } from 'ngx-pagination';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreModule } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { NgxPaginationModule } from 'ngx-pagination';
+import { BehaviorSubject } from 'rxjs';
 
+import { storeModuleConfig } from '../../app.reducer';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { HostWindowService } from '../host-window.service';
+import { MockActivatedRoute } from '../mocks/active-router.mock';
+import { HostWindowServiceMock } from '../mocks/host-window-service.mock';
+import { RouterMock } from '../mocks/router.mock';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
+import { createTestComponent } from '../testing/utils.test';
+import { EnumKeysPipe } from '../utils/enum-keys-pipe';
 import { PaginationComponent } from './pagination.component';
 import { PaginationComponentOptions } from './pagination-component-options.model';
 
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
-import { HostWindowServiceMock } from '../mocks/host-window-service.mock';
-import { MockActivatedRoute } from '../mocks/active-router.mock';
-import { RouterMock } from '../mocks/router.mock';
-
-import { HostWindowService } from '../host-window.service';
-import { EnumKeysPipe } from '../utils/enum-keys-pipe';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-
-import { createTestComponent } from '../testing/utils.test';
-import { storeModuleConfig } from '../../app.reducer';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { FindListOptions } from '../../core/data/find-list-options.model';
-
 function expectPages(fixture: ComponentFixture<any>, pagesDef: string[]): void {
   const de = fixture.debugElement.query(By.css('.pagination'));
   const pages = de.nativeElement.querySelectorAll('li');
@@ -141,7 +151,7 @@ describe('Pagination component', () => {
       getFindListOptions: currentFindListOptions,
       resetPage: {},
       updateRoute: {},
-      updateRouteWithUrl: {}
+      updateRouteWithUrl: {},
     });
 
     TestBed.configureTestingModule({
@@ -151,18 +161,18 @@ describe('Pagination component', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         NgxPaginationModule,
         NgbModule,
         RouterTestingModule.withRoutes([
-          { path: 'home', component: TestComponent }
+          { path: 'home', component: TestComponent },
         ])],
       declarations: [
         PaginationComponent,
         TestComponent,
-        EnumKeysPipe
+        EnumKeysPipe,
       ], // declare the test component
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -170,9 +180,9 @@ describe('Pagination component', () => {
         { provide: HostWindowService, useValue: hostWindowServiceStub },
         { provide: PaginationService, useValue: paginationService },
         ChangeDetectorRef,
-        PaginationComponent
+        PaginationComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -213,12 +223,12 @@ describe('Pagination component', () => {
       testFixture.detectChanges();
 
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {currentPage: 3}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { currentPage: 3 }));
       testFixture.detectChanges();
 
       expectPages(testFixture, ['« Previous', '1', '2', '+3', '-» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {currentPage: 2}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { currentPage: 2 }));
       testFixture.detectChanges();
 
       expectPages(testFixture, ['« Previous', '1', '+2', '3', '» Next']);
@@ -242,16 +252,16 @@ describe('Pagination component', () => {
       testFixture.detectChanges();
       expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {pageSize: 5}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: 5 }));
       testFixture.detectChanges();
 
       expectPages(testFixture, ['-« Previous', '+1', '2', '3', '4', '5', '6', '» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {pageSize: 10}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: 10 }));
       testFixture.detectChanges();
       expectPages(testFixture, ['-« Previous', '+1', '2', '3', '» Next']);
 
-      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, {pageSize: 20}));
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: 20 }));
       testFixture.detectChanges();
       expectPages(testFixture, ['-« Previous', '+1', '2', '» Next']);
     });
@@ -272,11 +282,11 @@ describe('Pagination component', () => {
 
       changePage(testFixture, 3);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: '3'}), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 3 }), {},  false);
 
       changePage(testFixture, 0);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: '2'}), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 2 }), {},  false);
     }));
 
     it('should set correct pageSize route parameters', fakeAsync(() => {
@@ -286,7 +296,7 @@ describe('Pagination component', () => {
 
       changePageSize(testFixture, '20');
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ pageId: 'test', page: 1, pageSize: 20}), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 1, pageSize: 20 }), {},  false);
     }));
 
     it('should respond to windows resize', () => {
@@ -391,8 +401,8 @@ class TestComponent {
   objects = {
     payload: {
       currentPage: 2,
-      totalPages: 100
-    }
+      totalPages: 100,
+    },
   };
 
   constructor() {
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index 6da813cbc7..04f7e446e6 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -7,23 +7,33 @@ import {
   OnDestroy,
   OnInit,
   Output,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { PaginationRouteParams } from '../../core/pagination/pagination-route-params.interface';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { hasValue } from '../empty.util';
 import { HostWindowService } from '../host-window.service';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
 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 { PaginationService } from '../../core/pagination/pagination.service';
-import { map, take } 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';
 
 /**
  * The default pagination controls component.
@@ -34,7 +44,7 @@ import { ViewMode } from '../../core/shared/view-mode.model';
   styleUrls: ['pagination.component.scss'],
   templateUrl: 'pagination.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
-  encapsulation: ViewEncapsulation.Emulated
+  encapsulation: ViewEncapsulation.Emulated,
 })
 export class PaginationComponent implements OnDestroy, OnInit {
   /**
@@ -122,6 +132,11 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   @Input() public hideGear = false;
 
+  /**
+   * Option for hiding the gear
+   */
+  @Input() public hideSortOptions = false;
+
   /**
    * Option for hiding the pager when there is less than 2 pages
    */
@@ -162,7 +177,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,7 +198,7 @@ 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';
 
   /**
@@ -231,10 +246,10 @@ export class PaginationComponent implements OnDestroy, OnInit {
     this.id = this.paginationOptions.id || null;
     this.pageSizeOptions = this.paginationOptions.pageSizeOptions;
     this.currentPage$ = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-      map((currentPagination) => currentPagination.currentPage)
+      map((currentPagination) => currentPagination.currentPage),
     );
     this.pageSize$ = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-      map((currentPagination) => currentPagination.pageSize)
+      map((currentPagination) => currentPagination.pageSize),
     );
 
     let sortOptions;
@@ -243,12 +258,12 @@ export class PaginationComponent implements OnDestroy, OnInit {
     } else {
       sortOptions = new SortOptions(this.defaultSortField, this.defaultsortDirection);
     }
-      this.sortDirection$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
-        map((currentSort) => currentSort.direction)
-      );
-      this.sortField$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
-        map((currentSort) => currentSort.field)
-      );
+    this.sortDirection$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
+      map((currentSort) => currentSort.direction),
+    );
+    this.sortField$ = this.paginationService.getCurrentSort(this.id, sortOptions).pipe(
+      map((currentSort) => currentSort.field),
+    );
   }
 
   /**
@@ -273,7 +288,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page being navigated to.
    */
   public doPageChange(page: number) {
-    this.updateParams({page: page.toString()});
+    this.updateParams({ page: page });
     this.emitPaginationChange();
   }
 
@@ -284,7 +299,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page size being navigated to.
    */
   public doPageSizeChange(pageSize: number) {
-    this.updateParams({ pageId: this.id, page: 1, pageSize: pageSize });
+    this.updateParams({ page: 1, pageSize: pageSize });
     this.emitPaginationChange();
   }
 
@@ -295,7 +310,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The sort direction being navigated to.
    */
   public doSortDirectionChange(sortDirection: SortDirection) {
-    this.updateParams({ pageId: this.id, page: 1, sortDirection: sortDirection });
+    this.updateParams({ page: 1, sortDirection: sortDirection });
     this.emitPaginationChange();
   }
 
@@ -306,7 +321,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The sort field being navigated to.
    */
   public doSortFieldChange(field: string) {
-    this.updateParams({ pageId: this.id, page: 1, sortField: field });
+    this.updateParams({ page: 1, sortField: field });
     this.emitPaginationChange();
   }
 
@@ -321,7 +336,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    * Update the current query params and optionally update the route
    * @param params
    */
-  private updateParams(params: {}) {
+  private updateParams(params: PaginationRouteParams) {
     this.paginationService.updateRoute(this.id, params, {}, this.retainScrollPosition);
   }
 
@@ -333,18 +348,17 @@ export class PaginationComponent implements OnDestroy, OnInit {
     if (collectionSize) {
       showingDetails = this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
         map((currentPaginationOptions) => {
-          let firstItem;
           let lastItem;
           const pageMax = currentPaginationOptions.pageSize * currentPaginationOptions.currentPage;
 
-          firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
+          const firstItem = currentPaginationOptions.pageSize * (currentPaginationOptions.currentPage - 1) + 1;
           if (collectionSize > pageMax) {
             lastItem = pageMax;
           } else {
             lastItem = collectionSize;
           }
-          return {range: firstItem + ' - ' + lastItem, total: collectionSize};
-        })
+          return { range: firstItem + ' - ' + lastItem, total: collectionSize };
+        }),
       );
     }
     return showingDetails;
@@ -372,7 +386,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   get hasMultiplePages(): Observable<boolean> {
     return this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(
-      map((currentPaginationOptions) =>  this.collectionSize > currentPaginationOptions.pageSize)
+      map((currentPaginationOptions) =>  this.collectionSize > currentPaginationOptions.pageSize),
     );
   }
 
@@ -382,14 +396,14 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   get shouldShowBottomPager(): Observable<boolean> {
     return this.hasMultiplePages.pipe(
-      map((hasMultiplePages) => hasMultiplePages || !this.hidePagerWhenSinglePage)
+      map((hasMultiplePages) => hasMultiplePages || !this.hidePagerWhenSinglePage),
     );
   }
 
   /**
    * Go to the previous page
    */
-   goPrev() {
+  goPrev() {
     this.prev.emit(true);
     this.updatePagination(-1);
   }
@@ -408,7 +422,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    */
   updatePagination(value: number) {
     this.paginationService.getCurrentPagination(this.id, this.paginationOptions).pipe(take(1)).subscribe((currentPaginationOptions) => {
-      this.updateParams({page: (currentPaginationOptions.currentPage + value).toString()});
+      this.updateParams({ page: (currentPaginationOptions.currentPage + value) });
     });
   }
 
diff --git a/src/app/shared/pagination/pagination.utils.ts b/src/app/shared/pagination/pagination.utils.ts
index f70a3d1030..2add33e2ea 100644
--- a/src/app/shared/pagination/pagination.utils.ts
+++ b/src/app/shared/pagination/pagination.utils.ts
@@ -1,5 +1,5 @@
-import { PaginationComponentOptions } from './pagination-component-options.model';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginationComponentOptions } from './pagination-component-options.model';
 
 /**
  * Transform a PaginationComponentOptions object into a FindListOptions object
@@ -9,6 +9,6 @@ import { FindListOptions } from '../../core/data/find-list-options.model';
 export function toFindListOptions(pagination: PaginationComponentOptions, original?: FindListOptions): FindListOptions {
   return Object.assign(new FindListOptions(), original, {
     currentPage: pagination.currentPage,
-    elementsPerPage: pagination.pageSize
+    elementsPerPage: pagination.pageSize,
   });
 }
diff --git a/src/app/shared/pagination/paginationChangeEvent.interface.ts b/src/app/shared/pagination/paginationChangeEvent.interface.ts
index ccd2f2174d..a6b10f9cff 100644
--- a/src/app/shared/pagination/paginationChangeEvent.interface.ts
+++ b/src/app/shared/pagination/paginationChangeEvent.interface.ts
@@ -1,5 +1,5 @@
-import {PaginationComponentOptions} from './pagination-component-options.model';
-import {SortOptions} from '../../core/cache/models/sort-options.model';
+import { SortOptions } from '../../core/cache/models/sort-options.model';
+import { PaginationComponentOptions } from './pagination-component-options.model';
 
 
 /**
diff --git a/src/app/shared/remote-data.utils.ts b/src/app/shared/remote-data.utils.ts
index 50b7d7f9f9..3ec7ace051 100644
--- a/src/app/shared/remote-data.utils.ts
+++ b/src/app/shared/remote-data.utils.ts
@@ -1,6 +1,10 @@
-import { RemoteData } from '../core/data/remote-data';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { environment } from '../../environments/environment';
+import { RemoteData } from '../core/data/remote-data';
 import { RequestEntryState } from '../core/data/request-entry-state.model';
 
 /**
@@ -21,7 +25,7 @@ export function createSuccessfulRemoteDataObject<T>(object: T, timeCompleted = F
     RequestEntryState.Success,
     undefined,
     object,
-    200
+    200,
   );
 }
 
@@ -49,7 +53,7 @@ export function createFailedRemoteDataObject<T>(errorMessage?: string, statusCod
     RequestEntryState.Error,
     errorMessage,
     undefined,
-    statusCode
+    statusCode,
   );
 }
 
@@ -76,7 +80,7 @@ export function createPendingRemoteDataObject<T>(lastVerified = FIXED_TIMESTAMP)
     RequestEntryState.ResponsePending,
     undefined,
     undefined,
-    undefined
+    undefined,
   );
 }
 
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
index b60e7f64c0..82ff15dc9c 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.spec.ts
@@ -1,33 +1,51 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  ChangeDetectorRef,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateModule } from '@ngx-translate/core';
 
+import { LinkService } from '../../../core/cache/builders/link.service';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { Item } from '../../../core/shared/item.model';
+import { getMockLinkService } from '../../mocks/link-service.mock';
+import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
+import { NotificationsService } from '../../notifications/notifications.service';
 import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../remote-data.utils';
-import { createPaginatedList, createTestComponent } from '../../testing/utils.test';
-import { ResourcePolicyCreateComponent } from './resource-policy-create.component';
-import { LinkService } from '../../../core/cache/builders/link.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
-import { getMockLinkService } from '../../mocks/link-service.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
-import { GroupMock } from '../../testing/group-mock';
-import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../../core/resource-policy/models/action-type.model';
 import { EPersonMock } from '../../testing/eperson.mock';
+import { GroupMock } from '../../testing/group-mock';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../testing/utils.test';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
+import { ResourcePolicyCreateComponent } from './resource-policy-create.component';
 
 describe('ResourcePolicyCreateComponent test suite', () => {
   let comp: ResourcePolicyCreateComponent;
@@ -49,17 +67,17 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const item = Object.assign(new Item(), {
@@ -67,34 +85,34 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     id: 'itemUUID',
     metadata: {
       'dc.title': [{
-        value: 'test item'
-      }]
+        value: 'test item',
+      }],
     },
     _links: {
-      self: { href: 'item-selflink' }
+      self: { href: 'item-selflink' },
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([])),
   });
 
   const resourcePolicyService: any = getMockResourcePolicyService();
   const linkService: any = getMockLinkService();
   const routeStub = {
     data: observableOf({
-      resourcePolicyTarget: createSuccessfulRemoteDataObject(item)
-    })
+      resourcePolicyTarget: createSuccessfulRemoteDataObject(item),
+    }),
   };
   const routerStub = Object.assign(new RouterStub(), {
-    url: `url/edit`
+    url: `url/edit`,
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePolicyCreateComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
@@ -104,11 +122,11 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         { provide: Router, useValue: routerStub },
         ResourcePolicyCreateComponent,
         ChangeDetectorRef,
-        Injector
+        Injector,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -168,7 +186,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     it('should return true when is Processing', (done) => {
       compAsAny.processing$.next(true);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
       done();
     });
@@ -176,7 +194,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
     it('should return false when is not Processing', (done) => {
       compAsAny.processing$.next(false);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
       done();
     });
@@ -191,7 +209,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         eventPayload.object = submittedResourcePolicy;
         eventPayload.target = {
           type: 'group',
-          uuid: GroupMock.id
+          uuid: GroupMock.id,
         };
       });
 
@@ -229,7 +247,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
         eventPayload.object = submittedResourcePolicy;
         eventPayload.target = {
           type: 'eperson',
-          uuid: EPersonMock.id
+          uuid: EPersonMock.id,
         };
       });
 
@@ -262,7 +280,7 @@ describe('ResourcePolicyCreateComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/create/resource-policy-create.component.ts b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
index 236351571f..7156d9b00c 100644
--- a/src/app/shared/resource-policies/create/resource-policy-create.component.ts
+++ b/src/app/shared/resource-policies/create/resource-policy-create.component.ts
@@ -1,23 +1,34 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
 
 @Component({
   selector: 'ds-resource-policy-create',
-  templateUrl: './resource-policy-create.component.html'
+  templateUrl: './resource-policy-create.component.html',
 })
 export class ResourcePolicyCreateComponent implements OnInit {
 
@@ -62,7 +73,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
   ngOnInit(): void {
     this.route.data.pipe(
       map((data) => data),
-      take(1)
+      take(1),
     ).subscribe((data: any) => {
       this.targetResourceUUID = (data.resourcePolicyTarget as RemoteData<DSpaceObject>).payload.id;
       this.targetResourceName = this.dsoNameService.getName((data.resourcePolicyTarget as RemoteData<DSpaceObject>).payload);
@@ -99,7 +110,7 @@ export class ResourcePolicyCreateComponent implements OnInit {
       response$ = this.resourcePolicyService.create(event.object, this.targetResourceUUID, null, event.target.uuid);
     }
     response$.pipe(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((responseRD: RemoteData<ResourcePolicy>) => {
       this.processing$.next(false);
       if (responseRD.hasSucceeded) {
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/edit/resource-policy-edit.component.spec.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
index ff473d5c49..432bff56ae 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.spec.ts
@@ -1,28 +1,46 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, Injector, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import {
+  ChangeDetectorRef,
+  Component,
+  Injector,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateModule } from '@ngx-translate/core';
 
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { createTestComponent } from '../../testing/utils.test';
 import { LinkService } from '../../../core/cache/builders/link.service';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
-import { getMockLinkService } from '../../mocks/link-service.mock';
-import { RouterStub } from '../../testing/router.stub';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
-import { GroupMock } from '../../testing/group-mock';
-import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { ActionType } from '../../../core/resource-policy/models/action-type.model';
-import { ResourcePolicyEditComponent } from './resource-policy-edit.component';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { getMockLinkService } from '../../mocks/link-service.mock';
+import { getMockResourcePolicyService } from '../../mocks/mock-resource-policy-service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../../remote-data.utils';
+import { GroupMock } from '../../testing/group-mock';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import { RouterStub } from '../../testing/router.stub';
+import { createTestComponent } from '../../testing/utils.test';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
+import { submittedResourcePolicy } from '../form/resource-policy-form.component.spec';
+import { ResourcePolicyEditComponent } from './resource-policy-edit.component';
 
 describe('ResourcePolicyEditComponent test suite', () => {
   let comp: ResourcePolicyEditComponent;
@@ -45,38 +63,38 @@ describe('ResourcePolicyEditComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const resourcePolicyService: any = getMockResourcePolicyService();
   const linkService: any = getMockLinkService();
   const routeStub = {
     data: observableOf({
-      resourcePolicy: createSuccessfulRemoteDataObject(resourcePolicy)
-    })
+      resourcePolicy: createSuccessfulRemoteDataObject(resourcePolicy),
+    }),
   };
   const routerStub = Object.assign(new RouterStub(), {
-    url: `url/edit`
+    url: `url/edit`,
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePolicyEditComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
@@ -86,11 +104,11 @@ describe('ResourcePolicyEditComponent test suite', () => {
         { provide: Router, useValue: routerStub },
         ResourcePolicyEditComponent,
         ChangeDetectorRef,
-        Injector
+        Injector,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -149,7 +167,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
     it('should return true when is Processing', (done) => {
       compAsAny.processing$.next(true);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: true
+        a: true,
       }));
       done();
     });
@@ -157,7 +175,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
     it('should return false when is not Processing', (done) => {
       compAsAny.processing$.next(false);
       expect(comp.isProcessing()).toBeObservable(cold('a', {
-        a: false
+        a: false,
       }));
       done();
     });
@@ -173,7 +191,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
         eventPayload.object = submittedResourcePolicy;
         eventPayload.target = {
           type: 'group',
-          uuid: GroupMock.id
+          uuid: GroupMock.id,
         };
 
         compAsAny.resourcePolicy = resourcePolicy;
@@ -181,7 +199,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
         updatedObject = Object.assign({}, submittedResourcePolicy, {
           id: resourcePolicy.id,
           type: RESOURCE_POLICY.value,
-          _links: resourcePolicy._links
+          _links: resourcePolicy._links,
         });
       });
 
@@ -214,7 +232,7 @@ describe('ResourcePolicyEditComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
index a16f409bcb..59c80ea755 100644
--- a/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
+++ b/src/app/shared/resource-policies/edit/resource-policy-edit.component.ts
@@ -1,22 +1,35 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, Observable, of, combineLatest as observableCombineLatest, } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
 
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { NotificationsService } from '../../notifications/notifications.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
-import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ITEM_EDIT_AUTHORIZATIONS_PATH } from '../../../item-page/edit-item-page/edit-item-page.routing-paths';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { ResourcePolicyEvent } from '../form/resource-policy-form.component';
 
 @Component({
   selector: 'ds-resource-policy-edit',
-  templateUrl: './resource-policy-edit.component.html'
+  templateUrl: './resource-policy-edit.component.html',
 })
 export class ResourcePolicyEditComponent implements OnInit {
 
@@ -54,7 +67,7 @@ export class ResourcePolicyEditComponent implements OnInit {
   ngOnInit(): void {
     this.route.data.pipe(
       map((data) => data),
-      take(1)
+      take(1),
     ).subscribe((data: any) => {
       this.resourcePolicy = (data.resourcePolicy as RemoteData<ResourcePolicy>).payload;
     });
@@ -86,19 +99,19 @@ export class ResourcePolicyEditComponent implements OnInit {
     const updatedObject = Object.assign({}, event.object, {
       id: this.resourcePolicy.id,
       type: RESOURCE_POLICY.value,
-      _links: this.resourcePolicy._links
+      _links: this.resourcePolicy._links,
     });
 
     const updateTargetSucceeded$ = event.updateTarget ? this.resourcePolicyService.updateTarget(
-      this.resourcePolicy.id, this.resourcePolicy._links.self.href, event.target.uuid, event.target.type
+      this.resourcePolicy.id, this.resourcePolicy._links.self.href, event.target.uuid, event.target.type,
     ).pipe(
       getFirstCompletedRemoteData(),
-      map((responseRD) => responseRD && responseRD.hasSucceeded)
+      map((responseRD) => responseRD && responseRD.hasSucceeded),
     ) : of(true);
 
     const updateResourcePolicySucceeded$ = this.resourcePolicyService.update(updatedObject).pipe(
       getFirstCompletedRemoteData(),
-      map((responseRD) => responseRD && responseRD.hasSucceeded)
+      map((responseRD) => responseRD && responseRD.hasSucceeded),
     );
 
     observableCombineLatest([updateTargetSucceeded$, updateResourcePolicySucceeded$]).subscribe(
@@ -114,7 +127,7 @@ export class ResourcePolicyEditComponent implements OnInit {
         } else { // nothing has been updated
           this.notificationsService.error(null, this.translate.get('resource-policies.edit.page.failure.content'));
         }
-      }
+      },
     );
   }
 }
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..cd3b5b932f 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"
+    <button *ngIf="groupName$ | async | dsHasValue" 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.spec.ts b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
index b5232459f5..71b4ae9368 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.spec.ts
@@ -6,23 +6,31 @@
  * http://www.dspace.org/license/
  */
 
-import { of as observableOf } from 'rxjs';
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { GroupMock } from '../../testing/group-mock';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../../core/resource-policy/models/action-type.model';
-import { EPersonMock } from '../../testing/eperson.mock';
-import { ResourcePolicyEntryComponent } from './resource-policy-entry.component';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { RouterStub } from '../../testing/router.stub';
-import { Item } from '../../../core/shared/item.model';
-import { cold } from 'jasmine-marbles';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { Item } from '../../../core/shared/item.model';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { GroupMock } from '../../testing/group-mock';
+import { RouterStub } from '../../testing/router.stub';
+import { HasValuePipe } from '../../utils/has-value.pipe';
+import { ResourcePolicyEntryComponent } from './resource-policy-entry.component';
 import createSpyObj = jasmine.createSpyObj;
 
 const groupRP: any = {
@@ -37,17 +45,17 @@ const groupRP: any = {
   uuid: 'resource-policy-1',
   _links: {
     eperson: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson',
     },
     group: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/group'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/group',
     },
     self: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1'
+      href: 'https://rest.api/rest/api/resourcepolicies/1',
     },
   },
   eperson: observableOf(createSuccessfulRemoteDataObject(undefined)),
-  group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+  group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
 };
 
 const epersonRP: any = {
@@ -62,24 +70,24 @@ const epersonRP: any = {
   uuid: 'resource-policy-1',
   _links: {
     eperson: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/eperson',
     },
     group: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1/group'
+      href: 'https://rest.api/rest/api/resourcepolicies/1/group',
     },
     self: {
-      href: 'https://rest.api/rest/api/resourcepolicies/1'
+      href: 'https://rest.api/rest/api/resourcepolicies/1',
     },
   },
   eperson: observableOf(createSuccessfulRemoteDataObject(EPersonMock)),
-  group: observableOf(createSuccessfulRemoteDataObject(undefined))
+  group: observableOf(createSuccessfulRemoteDataObject(undefined)),
 };
 
 const item = Object.assign(new Item(), {
   uuid: 'itemUUID',
   id: 'itemUUID',
   _links: {
-    self: { href: 'item-selflink' }
+    self: { href: 'item-selflink' },
   },
 });
 
@@ -99,34 +107,35 @@ describe('ResourcePolicyEntryComponent', () => {
 
   beforeEach(() => {
     dsoNameService = createSpyObj('dsoNameMock', {
-      getName: 'NAME'
+      getName: 'NAME',
     });
     groupService = jasmine.createSpyObj('groupService', {
       findByHref: jasmine.createSpy('findByHref'),
     });
     routeStub = {
       data: observableOf({
-        item: createSuccessfulRemoteDataObject(item)
-      })
+        item: createSuccessfulRemoteDataObject(item),
+      }),
     };
     routerStub = Object.assign(new RouterStub(), {
-      url: `url/edit`
+      url: `url/edit`,
     });
 
 
     TestBed.configureTestingModule({
       imports: [
         CommonModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePolicyEntryComponent,
+        HasValuePipe,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: routeStub },
         { provide: Router, useValue: routerStub },
         { provide: GroupDataService, useValue: groupService },
-        { provide: DSONameService, useValue: dsoNameService }
+        { provide: DSONameService, useValue: dsoNameService },
       ],
       // schemas: [
       //   NO_ERRORS_SCHEMA
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..7afff302d9 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
@@ -5,21 +5,39 @@
  *
  * http://www.dspace.org/license/
  */
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { dateToString, stringToNgbDateStruct } from '../../date.util';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getAllSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+
+import { getGroupEditRoute } from '../../../access-control/access-control-routing-paths';
 import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 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 { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  getAllSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  dateToString,
+  stringToNgbDateStruct,
+} from '../../date.util';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
 
 export interface ResourcePolicyCheckboxEntry {
   id: string;
@@ -34,7 +52,7 @@ export interface ResourcePolicyCheckboxEntry {
 })
 export class ResourcePolicyEntryComponent implements OnInit {
   @Input()
-  entry: ResourcePolicyCheckboxEntry;
+    entry: ResourcePolicyCheckboxEntry;
 
   @Output()
   public toggleCheckbox: EventEmitter<boolean> = new EventEmitter();
@@ -97,7 +115,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..3d5465f0e6 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"
@@ -35,12 +35,12 @@
                   (click)="onReset()">{{'form.cancel' | translate}}</button>
           <button type="button"
                   class="btn btn-primary"
-                  [disabled]="!(isFormValid() | async) || (isProcessing | async)"
+                  [disabled]="(isFormValid() | async) !== true || (isProcessing | async)"
                   (click)="onSubmit()">
             <span *ngIf="(isProcessing | async)">
                   <i class='fas fa-circle-notch fa-spin'></i> {{'submission.workflow.tasks.generic.processing' | translate}}
                 </span>
-            <span *ngIf="!(isProcessing | async)">
+            <span *ngIf="(isProcessing | async) !== true">
                   {{'form.submit' | translate}}
                 </span>
           </button>
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 e555522c79..86577e0645 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
@@ -1,44 +1,67 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-
+import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { TestScheduler } from 'rxjs/testing';
 import { delay } from 'rxjs/operators';
-import { TranslateModule } from '@ngx-translate/core';
+import { TestScheduler } from 'rxjs/testing';
 
-import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
-import { createTestComponent } from '../../testing/utils.test';
+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 { RequestService } from '../../../core/data/request.service';
-import { getMockRequestService } from '../../mocks/request.service.mock';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 import { ActionType } from '../../../core/resource-policy/models/action-type.model';
-import { GroupMock } from '../../testing/group-mock';
-import { ResourcePolicyEvent, ResourcePolicyFormComponent } from './resource-policy-form.component';
-import { FormService } from '../../form/form.service';
-import { getMockFormService } from '../../mocks/form-service.mock';
-import { FormBuilderService } from '../../form/builder/form-builder.service';
-import { EpersonGroupListComponent } from './eperson-group-list/eperson-group-list.component';
-import { FormComponent } from '../../form/form.component';
-import { stringToNgbDateStruct, dateToISOFormat } from '../../date.util';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
 import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
-import { EPersonMock } from '../../testing/eperson.mock';
+import {
+  dateToISOFormat,
+  stringToNgbDateStruct,
+} from '../../date.util';
 import { isNotEmptyOperator } from '../../empty.util';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RemoteData } from '../../../core/data/remote-data';
+import { EpersonGroupListComponent } from '../../eperson-group-list/eperson-group-list.component';
+import { FormBuilderService } from '../../form/builder/form-builder.service';
+import { FormComponent } from '../../form/form.component';
+import { FormService } from '../../form/form.service';
+import { getMockFormService } from '../../mocks/form-service.mock';
+import { getMockRequestService } from '../../mocks/request.service.mock';
 import { RouterMock } from '../../mocks/router.mock';
-import { Store } from '@ngrx/store';
+import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
+import { EPersonMock } from '../../testing/eperson.mock';
+import { GroupMock } from '../../testing/group-mock';
 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 { createTestComponent } from '../../testing/utils.test';
+import {
+  ResourcePolicyEvent,
+  ResourcePolicyFormComponent,
+} from './resource-policy-form.component';
 
 export const mockResourcePolicyFormData = {
   name: [
@@ -49,8 +72,8 @@ export const mockResourcePolicyFormData = {
       display: 'name',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   description: [
     {
@@ -60,8 +83,8 @@ export const mockResourcePolicyFormData = {
       display: 'description',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   policyType: [
     {
@@ -71,8 +94,8 @@ export const mockResourcePolicyFormData = {
       display: 'TYPE_WORKFLOW',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   action: [
     {
@@ -82,8 +105,8 @@ export const mockResourcePolicyFormData = {
       display: 'WRITE',
       confidence: -1,
       place: 0,
-      otherInformation: null
-    }
+      otherInformation: null,
+    },
   ],
   date: {
     start: [
@@ -94,8 +117,8 @@ export const mockResourcePolicyFormData = {
         display: '2019-04-14',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
+        otherInformation: null,
+      },
     ],
     end: [
       {
@@ -105,10 +128,10 @@ export const mockResourcePolicyFormData = {
         display: '2020-04-14',
         confidence: -1,
         place: 0,
-        otherInformation: null
-      }
+        otherInformation: null,
+      },
     ],
-  }
+  },
 };
 
 export const submittedResourcePolicy = Object.assign(new ResourcePolicy(), {
@@ -118,7 +141,7 @@ export const submittedResourcePolicy = Object.assign(new ResourcePolicy(), {
   action: ActionType.WRITE,
   startDate: dateToISOFormat('2019-04-14T00:00:00Z'),
   endDate: dateToISOFormat('2020-04-14T00:00:00Z'),
-  type: RESOURCE_POLICY
+  type: RESOURCE_POLICY,
 });
 
 describe('ResourcePolicyFormComponent test suite', () => {
@@ -142,36 +165,36 @@ describe('ResourcePolicyFormComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const epersonService = jasmine.createSpyObj('epersonService', {
     findByHref: jasmine.createSpy('findByHref'),
-    findAll: jasmine.createSpy('findAll')
+    findAll: jasmine.createSpy('findAll'),
   });
 
   const groupService = jasmine.createSpyObj('groupService', {
     findByHref: jasmine.createSpy('findByHref'),
-    findAll: jasmine.createSpy('findAll')
+    findAll: jasmine.createSpy('findAll'),
   });
 
   const mockPolicyRD: RemoteData<ResourcePolicy> = createSuccessfulRemoteDataObject(resourcePolicy);
   const activatedRouteStub = {
     parent: {
       data: observableOf({
-        dso: mockPolicyRD
-      })
-    }
+        dso: mockPolicyRD,
+      }),
+    },
   };
 
   beforeEach(waitForAsync(() => {
@@ -183,13 +206,13 @@ describe('ResourcePolicyFormComponent test suite', () => {
         NgbModule,
         NoopAnimationsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         EpersonGroupListComponent,
         ResourcePolicyFormComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: ActivatedRoute, useValue: activatedRouteStub },
@@ -202,11 +225,11 @@ describe('ResourcePolicyFormComponent test suite', () => {
         { provide: RequestService, useValue: getMockRequestService() },
         FormBuilderService,
         ChangeDetectorRef,
-        ResourcePolicyFormComponent
+        ResourcePolicyFormComponent,
       ],
       schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -307,7 +330,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       compAsAny.resourcePolicy = resourcePolicy;
       comp.isProcessing = observableOf(false);
       compAsAny.ePersonService.findByHref.and.returnValue(
-        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100)),
       );
       compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
     });
@@ -340,7 +363,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       compAsAny.isActive = true;
       comp.ngOnInit();
       comp.resourcePolicyTargetName$.pipe(
-        isNotEmptyOperator()
+        isNotEmptyOperator(),
       ).subscribe(() => {
         expect(compAsAny.resourcePolicyGrant).toEqual(GroupMock);
         done();
@@ -368,7 +391,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       comp.resourcePolicy = resourcePolicy;
       comp.isProcessing = observableOf(false);
       compAsAny.ePersonService.findByHref.and.returnValue(
-        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100)),
       );
       compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
       compAsAny.formService.isValid.and.returnValue(observableOf(true));
@@ -400,7 +423,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       eventPayload.object = submittedResourcePolicy;
       eventPayload.target = {
         type: 'group',
-        uuid: GroupMock.id
+        uuid: GroupMock.id,
       };
       eventPayload.updateTarget = false;
 
@@ -424,7 +447,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
       comp.resourcePolicy = resourcePolicy;
       comp.isProcessing = observableOf(false);
       compAsAny.ePersonService.findByHref.and.returnValue(
-        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100))
+        observableOf(createSuccessfulRemoteDataObject({})).pipe(delay(100)),
       );
       compAsAny.groupService.findByHref.and.returnValue(observableOf(createSuccessfulRemoteDataObject(GroupMock)));
       compAsAny.formService.isValid.and.returnValue(observableOf(false));
@@ -452,7 +475,7 @@ describe('ResourcePolicyFormComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/form/resource-policy-form.component.ts b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
index 223e610908..477706ec1e 100644
--- a/src/app/shared/resource-policies/form/resource-policy-form.component.ts
+++ b/src/app/shared/resource-policies/form/resource-policy-form.component.ts
@@ -1,22 +1,58 @@
-import { Component, ElementRef, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
-
 import {
-  Observable,
-  of as observableOf,
-  combineLatest as observableCombineLatest,
-  Subscription,
-  BehaviorSubject
-} from 'rxjs';
-import { filter, map, take } from 'rxjs/operators';
+  Component,
+  ElementRef,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+  ViewChild,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbNavChangeEvent,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicDatePickerModel,
   DynamicFormControlModel,
   DynamicFormGroupModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+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 { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import {
+  dateToISOFormat,
+  stringToNgbDateStruct,
+} from '../../date.util';
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../../empty.util';
 import { DsDynamicInputModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DsDynamicTextAreaModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
+import { FormService } from '../../form/form.service';
 import {
   RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG,
   RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG,
@@ -27,21 +63,8 @@ import {
   RESOURCE_POLICY_FORM_NAME_CONFIG,
   RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG,
   RESOURCE_POLICY_FORM_START_DATE_CONFIG,
-  RESOURCE_POLICY_FORM_START_DATE_LAYOUT
+  RESOURCE_POLICY_FORM_START_DATE_LAYOUT,
 } from './resource-policy-form.model';
-import { DsDynamicTextAreaModel } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
-import { hasValue, isEmpty, isNotEmpty, hasValueOperator } from '../../empty.util';
-import { FormService } from '../../form/form.service';
-import { RESOURCE_POLICY } from '../../../core/resource-policy/models/resource-policy.resource-type';
-import { RemoteData } from '../../../core/data/remote-data';
-import { dateToISOFormat, stringToNgbDateStruct } from '../../date.util';
-import { EPersonDataService } from '../../../core/eperson/eperson-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { RequestService } from '../../../core/data/request.service';
-import { NgbModal, NgbNavChangeEvent } from '@ng-bootstrap/ng-bootstrap';
 
 export interface ResourcePolicyEvent {
   object: ResourcePolicy;
@@ -163,10 +186,10 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
 
     if (this.isBeingEdited()) {
       const epersonRD$ = this.ePersonService.findByHref(this.resourcePolicy._links.eperson.href, false).pipe(
-        getFirstSucceededRemoteData()
+        getFirstSucceededRemoteData(),
       );
       const groupRD$ = this.groupService.findByHref(this.resourcePolicy._links.group.href, false).pipe(
-        getFirstSucceededRemoteData()
+        getFirstSucceededRemoteData(),
       );
       const dsoRD$: Observable<RemoteData<DSpaceObject>> = observableCombineLatest([epersonRD$, groupRD$]).pipe(
         map((rdArr: RemoteData<DSpaceObject>[]) => {
@@ -181,7 +204,7 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
           this.resourcePolicyGrant = dsoRD.payload;
           this.navActiveId = String(dsoRD.payload.type);
           this.resourcePolicyTargetName$.next(this.getResourcePolicyTargetName());
-        })
+        }),
       );
     }
   }
@@ -193,7 +216,7 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
    */
   isFormValid(): Observable<boolean> {
     return this.formService.isValid(this.formId).pipe(
-      map((isValid: boolean) => isValid && isNotEmpty(this.resourcePolicyGrant))
+      map((isValid: boolean) => isValid && isNotEmpty(this.resourcePolicyGrant)),
     );
   }
 
@@ -209,16 +232,16 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
       new DsDynamicInputModel(RESOURCE_POLICY_FORM_NAME_CONFIG),
       new DsDynamicTextAreaModel(RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG),
       new DynamicSelectModel(RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG),
-      new DynamicSelectModel(RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG)
+      new DynamicSelectModel(RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG),
     );
 
     const startDateModel = new DynamicDatePickerModel(
       RESOURCE_POLICY_FORM_START_DATE_CONFIG,
-      RESOURCE_POLICY_FORM_START_DATE_LAYOUT
+      RESOURCE_POLICY_FORM_START_DATE_LAYOUT,
     );
     const endDateModel = new DynamicDatePickerModel(
       RESOURCE_POLICY_FORM_END_DATE_CONFIG,
-      RESOURCE_POLICY_FORM_END_DATE_LAYOUT
+      RESOURCE_POLICY_FORM_END_DATE_LAYOUT,
     );
     const dateGroupConfig = Object.assign({}, RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG, { group: [] });
     dateGroupConfig.group.push(startDateModel, endDateModel);
@@ -301,7 +324,7 @@ export class ResourcePolicyFormComponent implements OnInit, OnDestroy {
         eventPayload.object = this.createResourcePolicyByFormData(data);
         eventPayload.target = {
           type: this.resourcePolicyGrantType,
-          uuid: this.resourcePolicyGrant.id
+          uuid: this.resourcePolicyGrant.id,
         };
         eventPayload.updateTarget = this.resourcePolicyTargetUpdated;
         this.submit.emit(eventPayload);
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..64237f9e23 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
@@ -6,63 +6,63 @@ import {
   DynamicSelectModelConfig,
 } from '@ng-dynamic-forms/core';
 
+import { ActionType } from '../../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
 import { DsDynamicInputModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
 import { DsDynamicTextAreaModelConfig } from '../../form/builder/ds-dynamic-form-ui/models/ds-dynamic-textarea.model';
-import { PolicyType } from '../../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../../core/resource-policy/models/action-type.model';
 
 const policyTypeList: DynamicFormOptionConfig<any>[] = [
   {
     label: PolicyType.TYPE_SUBMISSION,
-    value: PolicyType.TYPE_SUBMISSION
+    value: PolicyType.TYPE_SUBMISSION,
   },
   {
     label: PolicyType.TYPE_WORKFLOW,
-    value: PolicyType.TYPE_WORKFLOW
+    value: PolicyType.TYPE_WORKFLOW,
   },
   {
     label: PolicyType.TYPE_INHERITED,
-    value: PolicyType.TYPE_INHERITED
+    value: PolicyType.TYPE_INHERITED,
   },
   {
     label: PolicyType.TYPE_CUSTOM,
-    value: PolicyType.TYPE_CUSTOM
+    value: PolicyType.TYPE_CUSTOM,
   },
 ];
 
 const policyActionList: DynamicFormOptionConfig<any>[] = [
   {
     label: ActionType.READ.toString(),
-    value: ActionType.READ
+    value: ActionType.READ,
   },
   {
     label: ActionType.WRITE.toString(),
-    value: ActionType.WRITE
+    value: ActionType.WRITE,
   },
   {
     label: ActionType.REMOVE.toString(),
-    value: ActionType.REMOVE
+    value: ActionType.REMOVE,
   },
   {
     label: ActionType.ADMIN.toString(),
-    value: ActionType.ADMIN
+    value: ActionType.ADMIN,
   },
   {
     label: ActionType.DELETE.toString(),
-    value: ActionType.DELETE
+    value: ActionType.DELETE,
   },
   {
     label: ActionType.WITHDRAWN_READ.toString(),
-    value: ActionType.WITHDRAWN_READ
+    value: ActionType.WITHDRAWN_READ,
   },
   {
     label: ActionType.DEFAULT_BITSTREAM_READ.toString(),
-    value: ActionType.DEFAULT_BITSTREAM_READ
+    value: ActionType.DEFAULT_BITSTREAM_READ,
   },
   {
     label: ActionType.DEFAULT_ITEM_READ.toString(),
-    value: ActionType.DEFAULT_ITEM_READ
-  }
+    value: ActionType.DEFAULT_ITEM_READ,
+  },
 ];
 
 export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
@@ -71,7 +71,7 @@ export const RESOURCE_POLICY_FORM_NAME_CONFIG: DsDynamicInputModelConfig = {
   metadataFields: [],
   repeatable: false,
   submissionId: '',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG: DsDynamicTextAreaModelConfig = {
@@ -81,7 +81,7 @@ export const RESOURCE_POLICY_FORM_DESCRIPTION_CONFIG: DsDynamicTextAreaModelConf
   repeatable: false,
   rows: 10,
   submissionId: '',
-  hasSelectableMetadata: false
+  hasSelectableMetadata: false,
 };
 
 export const RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
@@ -90,11 +90,11 @@ export const RESOURCE_POLICY_FORM_POLICY_TYPE_CONFIG: DynamicSelectModelConfig<a
   options: policyTypeList,
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'resource-policies.form.policy-type.required'
-  }
+    required: 'resource-policies.form.policy-type.required',
+  },
 };
 
 export const RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
@@ -103,21 +103,21 @@ export const RESOURCE_POLICY_FORM_ACTION_TYPE_CONFIG: DynamicSelectModelConfig<a
   options: policyActionList,
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'resource-policies.form.action-type.required'
-  }
+    required: 'resource-policies.form.action-type.required',
+  },
 };
 
 export const RESOURCE_POLICY_FORM_DATE_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'date',
-  group: []
+  group: [],
 };
 export const RESOURCE_POLICY_FORM_DATE_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     control: 'form-row',
-  }
+  },
 };
 
 export const RESOURCE_POLICY_FORM_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -125,17 +125,17 @@ export const RESOURCE_POLICY_FORM_START_DATE_CONFIG: DynamicDatePickerModelConfi
   label: 'resource-policies.form.date.start.label',
   placeholder: 'resource-policies.form.date.start.label',
   inline: false,
-  toggleIcon: 'far fa-calendar-alt'
+  toggleIcon: 'far fa-calendar-alt',
 };
 
 export const RESOURCE_POLICY_FORM_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'p-0',
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-md-6'
-  }
+    host: 'col-md-6',
+  },
 };
 
 export const RESOURCE_POLICY_FORM_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -143,14 +143,14 @@ export const RESOURCE_POLICY_FORM_END_DATE_CONFIG: DynamicDatePickerModelConfig
   label: 'resource-policies.form.date.end.label',
   placeholder: 'resource-policies.form.date.end.label',
   inline: false,
-  toggleIcon: 'far fa-calendar-alt'
+  toggleIcon: 'far fa-calendar-alt',
 };
 export const RESOURCE_POLICY_FORM_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'p-0',
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-md-6'
-  }
+    host: 'col-md-6',
+  },
 };
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
index 95f27c7934..4f587a3ed4 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy-target.resolver.ts
@@ -1,15 +1,22 @@
-import { Injectable, Injector } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
-import { ResourceType } from '../../../core/shared/resource-type';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { isEmpty } from '../../empty.util';
-import { RemoteData } from '../../../core/data/remote-data';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
 import { getDataServiceFor } from '../../../core/data/base/data-service.decorator';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { isEmpty } from '../../empty.util';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -42,7 +49,7 @@ export class ResourcePolicyTargetResolver implements Resolve<RemoteData<DSpaceOb
     const provider = getDataServiceFor(new ResourceType(targetType));
     this.dataService = Injector.create({
       providers: [],
-      parent: this.parentInjector
+      parent: this.parentInjector,
     }).get(provider);
 
     return this.dataService.findById(policyTargetId).pipe(
diff --git a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
index 3b7ac692fb..ee8525d422 100644
--- a/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
+++ b/src/app/shared/resource-policies/resolvers/resource-policy.resolver.ts
@@ -1,14 +1,18 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, Router, RouterStateSnapshot } from '@angular/router';
-
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  Router,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
 
-import { isEmpty } from '../../empty.util';
 import { RemoteData } from '../../../core/data/remote-data';
 import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
 import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { followLink } from '../../utils/follow-link-config.model';
 import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { isEmpty } from '../../empty.util';
+import { followLink } from '../../utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index 277f6e4998..bb6073df85 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -7,20 +7,20 @@
             <span>
               {{ 'resource-policies.table.headers.title.for.' + resourceType | translate }}
               <span class="text-info"> {{resourceName}} </span>
-              <ng-container *ngIf="resourceType != 'item'">
+              <ng-container *ngIf="resourceType !== 'item'">
                 ({{resourceUUID}})
               </ng-container>
             </span>
             <div class="space-children-mr flex-shrink-0">
               <button class="btn btn-danger p-1"
-                      [disabled]="(!(canDelete() | async)) || (isProcessingDelete() | async)"
+                      [disabled]="((canDelete() | async) !== true) || (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>
+                <span *ngIf="(isProcessingDelete() | async) !== true">
+                  <i class='fas fa-trash-alt fa-fw' aria-hidden="true"></i>
                   {{'resource-policies.delete.btn' | translate}}
                 </span>
               </button>
@@ -28,7 +28,7 @@
                       [disabled]="(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/resource-policies/resource-policies.component.spec.ts b/src/app/shared/resource-policies/resource-policies.component.spec.ts
index 77eaffd413..35f42dbd73 100644
--- a/src/app/shared/resource-policies/resource-policies.component.spec.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.spec.ts
@@ -1,40 +1,65 @@
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { RequestService } from '../../core/data/request.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { ActionType } from '../../core/resource-policy/models/action-type.model';
+import { PolicyType } from '../../core/resource-policy/models/policy-type.model';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
 import { Bitstream } from '../../core/shared/bitstream.model';
 import { Bundle } from '../../core/shared/bundle.model';
 import { Item } from '../../core/shared/item.model';
-import { LinkService } from '../../core/cache/builders/link.service';
-import { getMockLinkService } from '../mocks/link-service.mock';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { createPaginatedList, createTestComponent } from '../testing/utils.test';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
-import { NotificationsService } from '../notifications/notifications.service';
-import { NotificationsServiceStub } from '../testing/notifications-service.stub';
-import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
-import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { RequestService } from '../../core/data/request.service';
-import { getMockRequestService } from '../mocks/request.service.mock';
-import { RouterStub } from '../testing/router.stub';
-import { buildPaginatedList } from '../../core/data/paginated-list.model';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { ResourcePoliciesComponent } from './resource-policies.component';
-import { PolicyType } from '../../core/resource-policy/models/policy-type.model';
-import { ActionType } from '../../core/resource-policy/models/action-type.model';
+import { getMockLinkService } from '../mocks/link-service.mock';
+import { getMockResourcePolicyService } from '../mocks/mock-resource-policy-service';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { NotificationsService } from '../notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
 import { EPersonMock } from '../testing/eperson.mock';
 import { GroupMock } from '../testing/group-mock';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { RouterStub } from '../testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../testing/utils.test';
+import { HasValuePipe } from '../utils/has-value.pipe';
 import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { ResourcePoliciesComponent } from './resource-policies.component';
 
 describe('ResourcePoliciesComponent test suite', () => {
   let comp: ResourcePoliciesComponent;
@@ -59,17 +84,17 @@ describe('ResourcePoliciesComponent test suite', () => {
     uuid: 'resource-policy-1',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject({})),
-    group: observableOf(createSuccessfulRemoteDataObject(GroupMock))
+    group: observableOf(createSuccessfulRemoteDataObject(GroupMock)),
   };
 
   const anotherResourcePolicy: any = {
@@ -84,65 +109,65 @@ describe('ResourcePoliciesComponent test suite', () => {
     uuid: 'resource-policy-2',
     _links: {
       eperson: {
-        href: 'https://rest.api/rest/api/eperson'
+        href: 'https://rest.api/rest/api/eperson',
       },
       group: {
-        href: 'https://rest.api/rest/api/group'
+        href: 'https://rest.api/rest/api/group',
       },
       self: {
-        href: 'https://rest.api/rest/api/resourcepolicies/1'
+        href: 'https://rest.api/rest/api/resourcepolicies/1',
       },
     },
     eperson: observableOf(createSuccessfulRemoteDataObject(EPersonMock)),
-    group: observableOf(createSuccessfulRemoteDataObject({}))
+    group: observableOf(createSuccessfulRemoteDataObject({})),
   };
 
   const bitstream1 = Object.assign(new Bitstream(), {
     id: 'bitstream1',
-    uuid: 'bitstream1'
+    uuid: 'bitstream1',
   });
   const bitstream2 = Object.assign(new Bitstream(), {
     id: 'bitstream2',
-    uuid: 'bitstream2'
+    uuid: 'bitstream2',
   });
   const bitstream3 = Object.assign(new Bitstream(), {
     id: 'bitstream3',
-    uuid: 'bitstream3'
+    uuid: 'bitstream3',
   });
   const bitstream4 = Object.assign(new Bitstream(), {
     id: 'bitstream4',
-    uuid: 'bitstream4'
+    uuid: 'bitstream4',
   });
   const bundle1 = Object.assign(new Bundle(), {
     id: 'bundle1',
     uuid: 'bundle1',
     _links: {
-      self: { href: 'bundle1-selflink' }
+      self: { href: 'bundle1-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream1, bitstream2])),
   });
   const bundle2 = Object.assign(new Bundle(), {
     id: 'bundle2',
     uuid: 'bundle2',
     _links: {
-      self: { href: 'bundle2-selflink' }
+      self: { href: 'bundle2-selflink' },
     },
-    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4]))
+    bitstreams: createSuccessfulRemoteDataObject$(createPaginatedList([bitstream3, bitstream4])),
   });
 
   const item = Object.assign(new Item(), {
     uuid: 'itemUUID',
     id: 'itemUUID',
     _links: {
-      self: { href: 'item-selflink' }
+      self: { href: 'item-selflink' },
     },
-    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2]))
+    bundles: createSuccessfulRemoteDataObject$(createPaginatedList([bundle1, bundle2])),
   });
 
   const routeStub = {
     data: observableOf({
-      item: createSuccessfulRemoteDataObject(item)
-    })
+      item: createSuccessfulRemoteDataObject(item),
+    }),
   };
 
   const epersonService = jasmine.createSpyObj('epersonService', {
@@ -154,7 +179,7 @@ describe('ResourcePoliciesComponent test suite', () => {
   });
 
   routerStub = Object.assign(new RouterStub(), {
-    url: `url/edit`
+    url: `url/edit`,
   });
 
   const getInitEntries = () => {
@@ -162,13 +187,13 @@ describe('ResourcePoliciesComponent test suite', () => {
       Object.assign({}, {
         id: resourcePolicy.id,
         policy: resourcePolicy,
-        checked: false
+        checked: false,
       }),
       Object.assign({}, {
         id: anotherResourcePolicy.id,
         policy: anotherResourcePolicy,
-        checked: false
-      })
+        checked: false,
+      }),
     ];
   };
 
@@ -176,13 +201,13 @@ describe('ResourcePoliciesComponent test suite', () => {
     {
       id: resourcePolicy.id,
       policy: resourcePolicy,
-      checked: true
+      checked: true,
     },
     {
       id: anotherResourcePolicy.id,
       policy: anotherResourcePolicy,
-      checked: false
-    }
+      checked: false,
+    },
   ];
 
   const pageInfo = new PageInfo();
@@ -191,7 +216,7 @@ describe('ResourcePoliciesComponent test suite', () => {
   const paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
 
   const dsoNameService = jasmine.createSpyObj('dsoNameMock', {
-    getName: 'NAME'
+    getName: 'NAME',
   });
 
   beforeEach(waitForAsync(() => {
@@ -200,12 +225,13 @@ describe('ResourcePoliciesComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         ResourcePoliciesComponent,
         ResourcePolicyEntryComponent,
-        TestComponent
+        TestComponent,
+        HasValuePipe,
       ],
       providers: [
         { provide: LinkService, useValue: linkService },
@@ -218,10 +244,10 @@ describe('ResourcePoliciesComponent test suite', () => {
         { provide: Router, useValue: routerStub },
         { provide: DSONameService, useValue: dsoNameService },
         ChangeDetectorRef,
-        ResourcePoliciesComponent
+        ResourcePoliciesComponent,
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
@@ -232,7 +258,7 @@ describe('ResourcePoliciesComponent test suite', () => {
     // synchronous beforeEach
     beforeEach(() => {
       resourcePolicyService.searchByResource.and.returnValue(hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }));
       const html = `
         <ds-resource-policies [resourceUUID]="resourceUUID" [resourceType]="resourceType"></ds-resource-policies>`;
@@ -278,7 +304,7 @@ describe('ResourcePoliciesComponent test suite', () => {
       const expected = getInitEntries();
       compAsAny.isActive = true;
       resourcePolicyService.searchByResource.and.returnValue(hot('a|', {
-        a: paginatedListRD
+        a: paginatedListRD,
       }));
 
       scheduler = getTestScheduler();
@@ -326,7 +352,7 @@ describe('ResourcePoliciesComponent test suite', () => {
 
       it('should return false when no row is selected', () => {
         expect(comp.canDelete()).toBeObservable(cold('(a|)', {
-          a: false
+          a: false,
         }));
       });
 
@@ -335,7 +361,7 @@ describe('ResourcePoliciesComponent test suite', () => {
         const event = { target: { checked: true } };
         checkbox.triggerEventHandler('change', event);
         expect(comp.canDelete()).toBeObservable(cold('(a|)', {
-          a: true
+          a: true,
         }));
       });
     });
@@ -387,7 +413,7 @@ describe('ResourcePoliciesComponent test suite', () => {
     it('should get the resource\'s policy list', () => {
       const initResourcePolicyEntries = getInitEntries();
       expect(comp.getResourcePolicies()).toBeObservable(cold('a', {
-        a: initResourcePolicyEntries
+        a: initResourcePolicyEntries,
       }));
 
     });
@@ -421,7 +447,7 @@ describe('ResourcePoliciesComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index afe23b13d1..2f5e1fd7d6 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -1,18 +1,43 @@
-import { ChangeDetectorRef, Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, from as observableFrom, Observable, Subscription } from 'rxjs';
-import { concatMap, distinctUntilChanged, filter, map, reduce, scan, take } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  from as observableFrom,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  concatMap,
+  distinctUntilChanged,
+  filter,
+  map,
+  reduce,
+  scan,
+  take,
+} from 'rxjs/operators';
 
-import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
-import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { hasValue, isEmpty, isNotEmpty } from '../empty.util';
-import { EPersonDataService } from '../../core/eperson/eperson-data.service';
 import { RequestService } from '../../core/data/request.service';
+import { EPersonDataService } from '../../core/eperson/eperson-data.service';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { ResourcePolicy } from '../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyDataService } from '../../core/resource-policy/resource-policy-data.service';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
 import { NotificationsService } from '../notifications/notifications.service';
 import { followLink } from '../utils/follow-link-config.model';
 import { ResourcePolicyCheckboxEntry } from './entry/resource-policy-entry.component';
@@ -94,7 +119,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
     private resourcePolicyService: ResourcePolicyDataService,
     private route: ActivatedRoute,
     private router: Router,
-    private translate: TranslateService
+    private translate: TranslateService,
   ) {
   }
 
@@ -116,7 +141,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
       filter((entry: ResourcePolicyCheckboxEntry) => entry.checked),
       reduce((acc: any, value: any) => [...acc, value], []),
       map((entries: ResourcePolicyCheckboxEntry[]) => isNotEmpty(entries)),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -141,7 +166,7 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
           this.notificationsService.error(null, this.translate.get('resource-policies.delete.failure.content'));
         }
         this.processingDelete$.next(false);
-      })
+      }),
     );
   }
 
@@ -160,15 +185,15 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
   initResourcePolicyList() {
     this.subs.push(this.resourcePolicyService.searchByResource(
       this.resourceUUID, null, false, true,
-      followLink('eperson'), followLink('group')
+      followLink('eperson'), followLink('group'),
     ).pipe(
       filter(() => this.isActive),
-      getAllSucceededRemoteData()
+      getAllSucceededRemoteData(),
     ).subscribe((result) => {
       const entries = result.payload.page.map((policy: ResourcePolicy) => ({
         id: policy.id,
         policy: policy,
-        checked: false
+        checked: false,
       }));
       this.resourcePoliciesEntries$.next(entries);
       // TODO detectChanges still needed?
@@ -193,8 +218,8 @@ export class ResourcePoliciesComponent implements OnInit, OnDestroy {
       relativeTo: this.route,
       queryParams: {
         policyTargetId: this.resourceUUID,
-        targetType: this.resourceType
-      }
+        targetType: this.resourceType,
+      },
     });
   }
 
diff --git a/src/app/shared/resource-policies/resource-policies.module.ts b/src/app/shared/resource-policies/resource-policies.module.ts
index a7dc19b83e..7d7e440cff 100644
--- a/src/app/shared/resource-policies/resource-policies.module.ts
+++ b/src/app/shared/resource-policies/resource-policies.module.ts
@@ -1,21 +1,17 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-
+import { NgModule } from '@angular/core';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { ResourcePoliciesComponent } from './resource-policies.component';
-import { ResourcePolicyFormComponent } from './form/resource-policy-form.component';
-import { ResourcePolicyEditComponent } from './edit/resource-policy-edit.component';
-import { ResourcePolicyCreateComponent } from './create/resource-policy-create.component';
 import { FormModule } from '../form/form.module';
+import { SharedModule } from '../shared.module';
+import { ResourcePolicyCreateComponent } from './create/resource-policy-create.component';
+import { ResourcePolicyEditComponent } from './edit/resource-policy-edit.component';
+import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
+import { ResourcePolicyFormComponent } from './form/resource-policy-form.component';
 import { ResourcePolicyResolver } from './resolvers/resource-policy.resolver';
 import { ResourcePolicyTargetResolver } from './resolvers/resource-policy-target.resolver';
-import { EpersonGroupListComponent } from './form/eperson-group-list/eperson-group-list.component';
-import { GroupSearchBoxComponent } from './form/eperson-group-list/group-search-box/group-search-box.component';
-import { EpersonSearchBoxComponent } from './form/eperson-group-list/eperson-search-box/eperson-search-box.component';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { SharedModule } from '../shared.module';
-import { ResourcePolicyEntryComponent } from './entry/resource-policy-entry.component';
+import { ResourcePoliciesComponent } from './resource-policies.component';
 
 const COMPONENTS = [
   ResourcePoliciesComponent,
@@ -23,32 +19,29 @@ const COMPONENTS = [
   ResourcePolicyFormComponent,
   ResourcePolicyEditComponent,
   ResourcePolicyCreateComponent,
-  EpersonGroupListComponent,
-  EpersonSearchBoxComponent,
-  GroupSearchBoxComponent
 ];
 
 const PROVIDERS = [
   ResourcePolicyResolver,
-  ResourcePolicyTargetResolver
+  ResourcePolicyTargetResolver,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     NgbModule,
     CommonModule,
     FormModule,
     TranslateModule,
-    SharedModule
+    SharedModule,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 export class ResourcePoliciesModule { }
diff --git a/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts b/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts
index b68774d46f..8004ae0f67 100644
--- a/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts
+++ b/src/app/shared/responsive-table-sizes/responsive-table-sizes.ts
@@ -1,5 +1,5 @@
-import { ResponsiveColumnSizes } from './responsive-column-sizes';
 import { hasValue } from '../empty.util';
+import { ResponsiveColumnSizes } from './responsive-column-sizes';
 
 /**
  * A helper class storing the sizes in which to render a table
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
new file mode 100644
index 0000000000..79910fa332
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -0,0 +1,5 @@
+<button class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
+  <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/results-back-button/results-back-button.component.scss b/src/app/shared/results-back-button/results-back-button.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/results-back-button/results-back-button.component.spec.ts b/src/app/shared/results-back-button/results-back-button.component.spec.ts
new file mode 100644
index 0000000000..17284ff5eb
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.component.spec.ts
@@ -0,0 +1,81 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { ResultsBackButtonComponent } from './results-back-button.component';
+
+describe('ResultsBackButtonComponent', () => {
+
+  let component: ResultsBackButtonComponent;
+  let fixture: ComponentFixture<ResultsBackButtonComponent>;
+
+  const translate = {
+    get: jasmine.createSpy('get').and.returnValue(of('item button')),
+  };
+
+  describe('back to results', () => {
+
+
+    beforeEach(waitForAsync(() => {
+      TestBed.configureTestingModule({
+        declarations: [ResultsBackButtonComponent],
+        imports: [TranslateModule.forRoot(),
+          RouterTestingModule.withRoutes([]),
+        ],
+        providers: [
+          { provide: TranslateService, useValue: translate },
+        ],
+        schemas: [NO_ERRORS_SCHEMA],
+      }).compileComponents();
+    }));
+
+    describe('from a metadata browse list', () => {
+
+      beforeEach(waitForAsync(() => {
+        translate.get.calls.reset();
+        fixture = TestBed.createComponent(ResultsBackButtonComponent);
+        component = fixture.componentInstance;
+        component.buttonLabel = of('browse button');
+        component.ngOnInit();
+        fixture.detectChanges();
+      }));
+
+      it('should have back from browse label', () => {
+        expect(translate.get).not.toHaveBeenCalled();
+        const el = fixture.debugElement.nativeElement;
+        expect(el.innerHTML).toContain('browse button');
+      });
+
+    });
+
+    describe('from an item', () => {
+
+      beforeEach(waitForAsync(() => {
+        translate.get.calls.reset();
+        fixture = TestBed.createComponent(ResultsBackButtonComponent);
+        component = fixture.componentInstance;
+        component.ngOnInit();
+        fixture.detectChanges();
+      }));
+
+      it('should set item label by default', () => {
+        expect(translate.get).toHaveBeenCalledWith('search.browse.item-back');
+        const el = fixture.debugElement.nativeElement;
+        expect(el.innerHTML).toContain('item button');
+      });
+
+    });
+
+  });
+
+});
+
diff --git a/src/app/shared/results-back-button/results-back-button.component.ts b/src/app/shared/results-back-button/results-back-button.component.ts
new file mode 100644
index 0000000000..2fdc7b2c8a
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.component.ts
@@ -0,0 +1,42 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+
+@Component({
+  selector: 'ds-results-back-button',
+  styleUrls: ['./results-back-button.component.scss'],
+  templateUrl: './results-back-button.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+/**
+ * Component for creating a back to result list button.
+ */
+export class ResultsBackButtonComponent implements OnInit {
+
+  /**
+   * The function used for back navigation.
+   */
+  @Input() back: () => void;
+
+  /**
+   * The button label translation.
+   */
+  @Input() buttonLabel?: Observable<any>;
+
+  constructor(private translateService: TranslateService) {
+
+  }
+
+  ngOnInit(): void {
+    if (!this.buttonLabel) {
+      // Use the 'Back to Results' label as default.
+      this.buttonLabel = this.translateService.get('search.browse.item-back');
+    }
+  }
+
+}
diff --git a/src/app/shared/results-back-button/results-back-button.module.ts b/src/app/shared/results-back-button/results-back-button.module.ts
new file mode 100644
index 0000000000..cfb6024248
--- /dev/null
+++ b/src/app/shared/results-back-button/results-back-button.module.ts
@@ -0,0 +1,23 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { ResultsBackButtonComponent } from './results-back-button.component';
+import { ThemedResultsBackButtonComponent } from './themed-results-back-button.component';
+
+@NgModule({
+  declarations: [
+    ResultsBackButtonComponent,
+    ThemedResultsBackButtonComponent,
+  ],
+  imports: [
+    CommonModule,
+    TranslateModule,
+  ],
+  exports: [
+    ThemedResultsBackButtonComponent,
+  ],
+})
+export class ResultsBackButtonModule {
+
+}
diff --git a/src/app/shared/results-back-button/themed-results-back-button.component.ts b/src/app/shared/results-back-button/themed-results-back-button.component.ts
new file mode 100644
index 0000000000..1067faa833
--- /dev/null
+++ b/src/app/shared/results-back-button/themed-results-back-button.component.ts
@@ -0,0 +1,35 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { ThemedComponent } from '../theme-support/themed.component';
+import { ResultsBackButtonComponent } from './results-back-button.component';
+
+@Component({
+  selector: 'ds-themed-results-back-button',
+  styleUrls: [],
+  templateUrl: '../theme-support/themed.component.html',
+})
+export class ThemedResultsBackButtonComponent extends ThemedComponent<ResultsBackButtonComponent> {
+
+  @Input() buttonLabel?: Observable<any>;
+
+  @Input() back: () => void;
+
+  protected inAndOutputNames: (keyof ResultsBackButtonComponent & keyof this)[] = ['back', 'buttonLabel'];
+
+  protected getComponentName(): string {
+    return 'ResultsBackButtonComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/results-back-button/results-back-button.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./results-back-button.component`);
+  }
+
+}
diff --git a/src/app/shared/roles/role.directive.ts b/src/app/shared/roles/role.directive.ts
index 3ee99959d1..7f9d00fde4 100644
--- a/src/app/shared/roles/role.directive.ts
+++ b/src/app/shared/roles/role.directive.ts
@@ -6,18 +6,25 @@ import {
   OnDestroy,
   SimpleChanges,
   TemplateRef,
-  ViewContainerRef
+  ViewContainerRef,
 } from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  first,
+  map,
+} from 'rxjs/operators';
 
-import { combineLatest, Observable, Subscription } from 'rxjs';
-import { filter, first, map } from 'rxjs/operators';
-
-import { hasValue } from '../empty.util';
 import { RoleService } from '../../core/roles/role.service';
 import { RoleType } from '../../core/roles/role-types';
+import { hasValue } from '../empty.util';
 
 @Directive({
-  selector: '[dsShowOnlyForRole],[dsShowExceptForRole]'
+  selector: '[dsShowOnlyForRole],[dsShowExceptForRole]',
 })
 /**
  * Structural Directive for showing or hiding a template based on current user role
@@ -40,7 +47,7 @@ export class RoleDirective implements OnChanges, OnDestroy {
     private roleService: RoleService,
     private viewContainer: ViewContainerRef,
     private changeDetector: ChangeDetectorRef,
-    private templateRef: TemplateRef<any>
+    private templateRef: TemplateRef<any>,
   ) {
   }
 
@@ -108,7 +115,7 @@ export class RoleDirective implements OnChanges, OnDestroy {
 
     return combineLatest(checks).pipe(
       map((permissions: boolean[]) => permissions.includes(true)),
-      first()
+      first(),
     );
   }
 }
diff --git a/src/app/shared/rss-feed/rss.component.spec.ts b/src/app/shared/rss-feed/rss.component.spec.ts
index fd7f2c5321..aeb8c19a0c 100644
--- a/src/app/shared/rss-feed/rss.component.spec.ts
+++ b/src/app/shared/rss-feed/rss.component.spec.ts
@@ -1,5 +1,11 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { Router } from '@angular/router';
+import { of as observableOf } from 'rxjs';
+
 import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
 import { GroupDataService } from '../../core/eperson/group-data.service';
@@ -8,106 +14,104 @@ import { LinkHeadService } from '../../core/services/link-head.service';
 import { Collection } from '../../core/shared/collection.model';
 import { ConfigurationProperty } from '../../core/shared/configuration-property.model';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { RouterMock } from '../mocks/router.mock';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
 import { createPaginatedList } from '../testing/utils.test';
 import { RSSComponent } from './rss.component';
-import { of as observableOf } from 'rxjs';
-import { SearchConfigurationServiceStub } from '../testing/search-configuration-service.stub';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
-import { Router } from '@angular/router';
-import { RouterMock } from '../mocks/router.mock';
 
 
 
 describe('RssComponent', () => {
-    let comp: RSSComponent;
-    let options: SortOptions;
-    let fixture: ComponentFixture<RSSComponent>;
-    let uuid: string;
-    let query: string;
-    let groupDataService: GroupDataService;
-    let linkHeadService: LinkHeadService;
-    let configurationDataService: ConfigurationDataService;
-    let paginationService;
+  let comp: RSSComponent;
+  let fixture: ComponentFixture<RSSComponent>;
+  let uuid: string;
+  let query: string;
+  let groupDataService: GroupDataService;
+  let linkHeadService: LinkHeadService;
+  let configurationDataService: ConfigurationDataService;
+  let paginationService;
 
-    beforeEach(waitForAsync(() => {
-        const mockCollection: Collection = Object.assign(new Collection(), {
-            id: 'ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
-            name: 'test-collection',
-            _links: {
-              mappedItems: {
-                href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems'
-              },
-              self: {
-                href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4'
-              }
-            }
-          });
-        configurationDataService = jasmine.createSpyObj('configurationDataService', {
-            findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
-              name: 'test',
-              values: [
-                'org.dspace.ctask.general.ProfileFormats = test'
-              ]
-            }))
-          });
-        linkHeadService = jasmine.createSpyObj('linkHeadService', {
-            addTag: ''
-        });
-        const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
-        const mockSearchOptions = observableOf(new PaginatedSearchOptions({
-            pagination: Object.assign(new PaginationComponentOptions(), {
-              id: 'search-page-configuration',
-              pageSize: 10,
-              currentPage: 1
-            }),
-            sort: new SortOptions('dc.title', SortDirection.ASC),
-          }));
-        groupDataService = jasmine.createSpyObj('groupsDataService', {
-            findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
-            getGroupRegistryRouterLink: '',
-            getUUIDFromString: '',
-          });
-        paginationService = new PaginationServiceStub();
-        const searchConfigService = {
-            paginatedSearchOptions: mockSearchOptions
-          };
-        TestBed.configureTestingModule({
-          providers: [
-            { provide: GroupDataService, useValue: groupDataService },
-            { provide: LinkHeadService, useValue: linkHeadService },
-            { provide: ConfigurationDataService, useValue: configurationDataService },
-            { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
-            { provide: PaginationService, useValue: paginationService },
-            { provide: Router, useValue: new RouterMock() }
-          ],
-          declarations: [RSSComponent]
-        }).compileComponents();
-      }));
-
-    beforeEach(() => {
-        options = new SortOptions('dc.title', SortDirection.DESC);
-        uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790';
-        query = 'test';
-        fixture = TestBed.createComponent(RSSComponent);
-        comp = fixture.componentInstance;
+  beforeEach(waitForAsync(() => {
+    const mockCollection: Collection = Object.assign(new Collection(), {
+      id: 'ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+      name: 'test-collection',
+      _links: {
+        mappedItems: {
+          href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4/mappedItems',
+        },
+        self: {
+          href: 'https://rest.api/collections/ce41d451-97ed-4a9c-94a1-7de34f16a9f4',
+        },
+      },
     });
-
-    it('should formulate the correct url given params in url', () => {
-        const route = comp.formulateRoute(uuid, 'opensearch', options, query);
-        expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&sort=dc.title&sort_direction=DESC&query=test');
+    configurationDataService = jasmine.createSpyObj('configurationDataService', {
+      findByPropertyName: createSuccessfulRemoteDataObject$(Object.assign(new ConfigurationProperty(), {
+        name: 'test',
+        values: [
+          'org.dspace.ctask.general.ProfileFormats = test',
+        ],
+      })),
     });
-
-    it('should skip uuid if its null', () => {
-        const route = comp.formulateRoute(null, 'opensearch', options, query);
-        expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=test');
+    linkHeadService = jasmine.createSpyObj('linkHeadService', {
+      addTag: '',
     });
-
-    it('should default to query * if none provided', () => {
-        const route = comp.formulateRoute(null, 'opensearch', options, null);
-        expect(route).toBe('/opensearch/search?format=atom&sort=dc.title&sort_direction=DESC&query=*');
+    const mockCollectionRD: RemoteData<Collection> = createSuccessfulRemoteDataObject(mockCollection);
+    const mockSearchOptions = observableOf(new PaginatedSearchOptions({
+      pagination: Object.assign(new PaginationComponentOptions(), {
+        id: 'search-page-configuration',
+        pageSize: 10,
+        currentPage: 1,
+      }),
+    }));
+    groupDataService = jasmine.createSpyObj('groupsDataService', {
+      findListByHref: createSuccessfulRemoteDataObject$(createPaginatedList([])),
+      getGroupRegistryRouterLink: '',
+      getUUIDFromString: '',
     });
+    paginationService = new PaginationServiceStub();
+    const searchConfigService = {
+      paginatedSearchOptions: mockSearchOptions,
+    };
+    TestBed.configureTestingModule({
+      providers: [
+        { provide: GroupDataService, useValue: groupDataService },
+        { provide: LinkHeadService, useValue: linkHeadService },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
+        { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
+        { provide: PaginationService, useValue: paginationService },
+        { provide: Router, useValue: new RouterMock() },
+      ],
+      declarations: [RSSComponent],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    uuid = '2cfcf65e-0a51-4bcb-8592-b8db7b064790';
+    query = 'test';
+    fixture = TestBed.createComponent(RSSComponent);
+    comp = fixture.componentInstance;
+  });
+
+  it('should formulate the correct url given params in url', () => {
+    const route = comp.formulateRoute(uuid, 'opensearch/search', query);
+    expect(route).toBe('/opensearch/search?format=atom&scope=2cfcf65e-0a51-4bcb-8592-b8db7b064790&query=test');
+  });
+
+  it('should skip uuid if its null', () => {
+    const route = comp.formulateRoute(null, 'opensearch/search', query);
+    expect(route).toBe('/opensearch/search?format=atom&query=test');
+  });
+
+  it('should default to query * if none provided', () => {
+    const route = comp.formulateRoute(null, 'opensearch/search', null);
+    expect(route).toBe('/opensearch/search?format=atom&query=*');
+  });
 });
 
diff --git a/src/app/shared/rss-feed/rss.component.ts b/src/app/shared/rss-feed/rss.component.ts
index 3fdb859bdc..6f53346dcf 100644
--- a/src/app/shared/rss-feed/rss.component.ts
+++ b/src/app/shared/rss-feed/rss.component.ts
@@ -3,21 +3,28 @@ import {
   Component,
   OnDestroy,
   OnInit,
-  ViewEncapsulation
+  ViewEncapsulation,
 } from '@angular/core';
-import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { GroupDataService } from '../../core/eperson/group-data.service';
-import { LinkHeadService } from '../../core/services/link-head.service';
-import { ConfigurationDataService } from '../../core/data/configuration-data.service';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { environment } from '../../../../src/environments/environment';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { Router } from '@angular/router';
-import { map, switchMap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { environment } from '../../../../src/environments/environment';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { GroupDataService } from '../../core/eperson/group-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { LinkHeadService } from '../../core/services/link-head.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { PaginatedSearchOptions } from '../search/models/paginated-search-options.model';
 
 
 /**
@@ -29,17 +36,16 @@ import { RemoteData } from '../../core/data/remote-data';
   styleUrls: ['rss.component.scss'],
   templateUrl: 'rss.component.html',
   changeDetection: ChangeDetectionStrategy.Default,
-  encapsulation: ViewEncapsulation.Emulated
+  encapsulation: ViewEncapsulation.Emulated,
 })
 export class RSSComponent implements OnInit, OnDestroy  {
 
-  route$: BehaviorSubject<string>;
+  route$: BehaviorSubject<string> = new BehaviorSubject<string>('');
 
   isEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(null);
 
   uuid: string;
   configuration$: Observable<string>;
-  sortOption$: Observable<SortOptions>;
 
   subs: Subscription[] = [];
 
@@ -85,23 +91,23 @@ export class RSSComponent implements OnInit, OnDestroy  {
       }),
       switchMap((openSearchUri: string) =>
         this.searchConfigurationService.paginatedSearchOptions.pipe(
-          map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri,  searchOptions }))
-        )
+          map((searchOptions: PaginatedSearchOptions) => ({ openSearchUri,  searchOptions })),
+        ),
       ),
     ).subscribe(({ openSearchUri,  searchOptions }) => {
       if (!openSearchUri) {
         return null;
       }
       this.uuid = this.groupDataService.getUUIDFromString(this.router.url);
-      const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.sort, searchOptions.query);
+      const route = environment.rest.baseUrl + this.formulateRoute(this.uuid, openSearchUri, searchOptions.query);
       this.addLinks(route);
       this.linkHeadService.addTag({
         href: environment.rest.baseUrl + '/' + openSearchUri + '/service',
         type: 'application/atom+xml',
         rel: 'search',
-        title: 'Dspace'
+        title: 'Dspace',
       });
-      this.route$ = new BehaviorSubject<string>(route);
+      this.route$.next(route);
     }));
   }
 
@@ -109,24 +115,20 @@ export class RSSComponent implements OnInit, OnDestroy  {
    * Function created a route given the different params available to opensearch
    * @param uuid The uuid if a scope is present
    * @param opensearch openSearch uri
-   * @param sort The sort options for the opensearch request
    * @param query The query string that was provided in the search
    * @returns The combine URL to opensearch
    */
-  formulateRoute(uuid: string, opensearch: string, sort: SortOptions, query: string): string {
-    let route = 'search?format=atom';
+  formulateRoute(uuid: string, opensearch: string, query: string): string {
+    let route = '?format=atom';
     if (uuid) {
       route += `&scope=${uuid}`;
     }
-    if (sort && sort.direction && sort.field && sort.field !== 'id') {
-      route += `&sort=${sort.field}&sort_direction=${sort.direction}`;
-    }
     if (query) {
       route += `&query=${query}`;
     } else {
       route += `&query=*`;
     }
-    route = '/' + opensearch + '/' + route;
+    route = '/' + opensearch + route;
     return route;
   }
 
@@ -150,14 +152,14 @@ export class RSSComponent implements OnInit, OnDestroy  {
       href: route,
       type: 'application/atom+xml',
       rel: 'alternate',
-      title: 'Sitewide Atom feed'
+      title: 'Sitewide Atom feed',
     });
     route = route.replace('format=atom', 'format=rss');
     this.linkHeadService.addTag({
       href: route,
       type: 'application/rss+xml',
       rel: 'alternate',
-      title: 'Sitewide RSS feed'
+      title: 'Sitewide RSS feed',
     });
   }
 }
diff --git a/src/app/shared/sass-helper/css-variable.actions.ts b/src/app/shared/sass-helper/css-variable.actions.ts
new file mode 100644
index 0000000000..f8b135a959
--- /dev/null
+++ b/src/app/shared/sass-helper/css-variable.actions.ts
@@ -0,0 +1,45 @@
+/* eslint-disable max-classes-per-file */
+import { Action } from '@ngrx/store';
+
+import { KeyValuePair } from '../key-value-pair.model';
+import { type } from '../ngrx/type';
+
+/**
+ * For each action type in an action group, make a simple
+ * enum object for all of this group's action types.
+ *
+ * The 'type' utility function coerces strings into string
+ * literal types and runs a simple check to guarantee all
+ * action types in the application are unique.
+ */
+export const CSSVariableActionTypes = {
+  ADD: type('dspace/css-variables/ADD'),
+  ADD_ALL: type('dspace/css-variables/ADD_ALL'),
+  CLEAR: type('dspace/css-variables/CLEAR'),
+};
+
+export class AddCSSVariableAction implements Action {
+  type = CSSVariableActionTypes.ADD;
+  payload: {
+    name: string,
+    value: string
+  };
+
+  constructor(name: string, value: string) {
+    this.payload = { name, value };
+  }
+}
+export class AddAllCSSVariablesAction implements Action {
+  type = CSSVariableActionTypes.ADD_ALL;
+  payload: KeyValuePair<string, string>[];
+
+  constructor(variables: KeyValuePair<string, string>[]) {
+    this.payload = variables;
+  }
+}
+
+export class ClearCSSVariablesAction implements Action {
+  type = CSSVariableActionTypes.CLEAR;
+}
+
+export type CSSVariableAction = AddCSSVariableAction | AddAllCSSVariablesAction | ClearCSSVariablesAction;
diff --git a/src/app/shared/sass-helper/css-variable.reducer.ts b/src/app/shared/sass-helper/css-variable.reducer.ts
new file mode 100644
index 0000000000..15bb179fb1
--- /dev/null
+++ b/src/app/shared/sass-helper/css-variable.reducer.ts
@@ -0,0 +1,33 @@
+import { KeyValuePair } from '../key-value-pair.model';
+import {
+  CSSVariableAction,
+  CSSVariableActionTypes,
+} from './css-variable.actions';
+
+export interface CSSVariablesState {
+  [name: string]: string;
+}
+
+const initialState: CSSVariablesState = Object.create({});
+
+/**
+ * Reducer that handles the state of CSS variables in the store
+ * @param state The current state of the store
+ * @param action The action to apply onto the current state of the store
+ */
+export function cssVariablesReducer(state = initialState, action: CSSVariableAction): CSSVariablesState {
+  switch (action.type) {
+    case CSSVariableActionTypes.ADD: {
+      const variable = action.payload;
+      return Object.assign({}, state, { [variable.name]: variable.value });
+    } case CSSVariableActionTypes.ADD_ALL: {
+      const variables = action.payload;
+      return Object.assign({}, state, ...variables.map(({ key, value }: KeyValuePair<string, string>) => {return { [key]: value };}));
+    } case CSSVariableActionTypes.CLEAR: {
+      return initialState;
+    }
+    default: {
+      return state;
+    }
+  }
+}
diff --git a/src/app/shared/sass-helper/css-variable.service.spec.ts b/src/app/shared/sass-helper/css-variable.service.spec.ts
new file mode 100644
index 0000000000..1b56527c48
--- /dev/null
+++ b/src/app/shared/sass-helper/css-variable.service.spec.ts
@@ -0,0 +1,82 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  MockStore,
+  provideMockStore,
+} from '@ngrx/store/testing';
+import { getTestScheduler } from 'jasmine-marbles';
+
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { KeyValuePair } from '../key-value-pair.model';
+import { CSSVariableService } from './css-variable.service';
+
+describe('CSSVariableService', () => {
+  let store: MockStore;
+
+  let service: CSSVariableService;
+  let initialState;
+  const varKey1 = '--test-1';
+  const varValue1 = 'test-value-1';
+  const varKey2 = '--test-2';
+  const varValue2 = 'test-value-2';
+  const varKey3 = '--test-3';
+  const varValue3 = 'test-value-3';
+  const queryInAll = 'test';
+  const queryFor3 = '3';
+
+  function init() {
+    initialState = {
+      ['cssVariables']: {
+        [varKey1]: varValue1,
+        [varKey2]: varValue2,
+        [varKey3]: varValue3,
+      },
+    };
+  }
+
+  beforeEach(() => {
+    init();
+    TestBed.configureTestingModule({
+      providers: [
+        CSSVariableService,
+        provideMockStore({ initialState }),
+      ],
+    });
+    service = TestBed.inject(CSSVariableService as any);
+    store = TestBed.inject(MockStore as any);
+  });
+
+  it('should create', () => {
+    expect(service).toBeTruthy();
+  });
+
+  describe('searchVariable', () => {
+    it('should return the right keys and variables in a paginated list for query that returns all 3 results', () => {
+      const currentPage = 1;
+      const pageSize = 5;
+      const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalPages: 1, totalElements: 3 });
+      const page: KeyValuePair<string, string>[] = [{ key: varKey1, value: varValue1 }, { key: varKey2, value: varValue2 }, { key: varKey3, value: varValue3 }];
+      const result = buildPaginatedList(pageInfo, page);
+      getTestScheduler().expectObservable(service.searchVariable(queryInAll, { currentPage, pageSize } as any)).toBe('a', { a: result });
+    });
+
+    it('should return the right keys and variables in a paginated list for query that returns only the 3rd results', () => {
+      const currentPage = 1;
+      const pageSize = 5;
+      const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalPages: 1, totalElements: 1 });
+      const page: KeyValuePair<string, string>[] = [{ key: varKey3, value: varValue3 }];
+      const result = buildPaginatedList(pageInfo, page);
+      getTestScheduler().expectObservable(service.searchVariable(queryFor3, { currentPage, pageSize } as any)).toBe('a', { a: result });
+    });
+
+    it('should return the right keys and variables in a paginated list that\'s not longer than the page size', () => {
+      const currentPage = 1;
+      const pageSize = 2;
+      const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalPages: 2, totalElements: 3 });
+      const page: KeyValuePair<string, string>[] = [{ key: varKey1, value: varValue1 }, { key: varKey2, value: varValue2 }];
+      const result = buildPaginatedList(pageInfo, page);
+      getTestScheduler().expectObservable(service.searchVariable(queryInAll, { currentPage, pageSize } as any)).toBe('a', { a: result });
+    });
+  });
+
+});
diff --git a/src/app/shared/sass-helper/css-variable.service.ts b/src/app/shared/sass-helper/css-variable.service.ts
new file mode 100644
index 0000000000..a2be806285
--- /dev/null
+++ b/src/app/shared/sass-helper/css-variable.service.ts
@@ -0,0 +1,195 @@
+import { Injectable } from '@angular/core';
+import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+
+import {
+  AppState,
+  keySelector,
+} from '../../app.reducer';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { KeyValuePair } from '../key-value-pair.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import {
+  AddAllCSSVariablesAction,
+  AddCSSVariableAction,
+  ClearCSSVariablesAction,
+} from './css-variable.actions';
+import { CSSVariablesState } from './css-variable.reducer';
+
+/**
+ * This service deals with adding and retrieving CSS variables to and from the store
+ */
+@Injectable({
+  providedIn: 'root',
+})
+export class CSSVariableService {
+  isSameDomain = (styleSheet) => {
+    // Internal style blocks won't have an href value
+    if (!styleSheet.href) {
+      return true;
+    }
+
+    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
+  */
+  isStyleRule = (rule) => rule.type === 1;
+
+  constructor(
+    protected store: Store<AppState>) {
+  }
+
+  /**
+   * Adds a CSS variable to the store
+   * @param name The name/key of the CSS variable
+   * @param value The value of the CSS variable
+   */
+  addCSSVariable(name: string, value: string) {
+    this.store.dispatch(new AddCSSVariableAction(name, value));
+  }
+
+  /**
+   * Adds multiples CSS variables to the store
+   * @param variables The key-value pairs with the CSS variables to be added
+   */
+  addCSSVariables(variables: KeyValuePair<string, string>[]) {
+    this.store.dispatch(new AddAllCSSVariablesAction(variables));
+  }
+
+  /**
+   * Clears all CSS variables ƒrom the store
+   */
+  clearCSSVariables() {
+    this.store.dispatch(new ClearCSSVariablesAction());
+  }
+
+  /**
+   * Returns the value of a specific CSS key
+   * @param name The name/key of the CSS value
+   */
+  getVariable(name: string): Observable<string> {
+    return this.store.pipe(select(themeVariableByNameSelector(name)));
+  }
+
+  /**
+   * Returns the CSSVariablesState of the store containing all variables
+   */
+  getAllVariables(): Observable<CSSVariablesState> {
+    return this.store.pipe(select(themeVariablesSelector));
+  }
+
+  /**
+   * Method to find CSS variables by their partially supplying their key. Case sensitive. Returns a paginated list of KeyValuePairs with CSS variables that match the query.
+   * @param query The query to look for in the keys
+   * @param paginationOptions The pagination options for the requested page
+   */
+  searchVariable(query: string, paginationOptions: PaginationComponentOptions): Observable<PaginatedList<KeyValuePair<string, string>>> {
+    return this.store.pipe(select(themePaginatedVariablesByQuery(query, paginationOptions)));
+  }
+
+  /**
+   * Get all custom properties on a page
+   * @return array<KeyValuePair<string, string>>
+   * ex; [{key: "--color-accent", value: "#b9f500"}, {key: "--color-text", value: "#252525"}, ...]
+   */
+  getCSSVariablesFromStylesheets(document: Document): KeyValuePair<string, string>[] {
+    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(
+              // cssRules is array-like, so we convert it to an array
+              [...sheet.cssRules].filter(this.isStyleRule).reduce((propValArr, rule: any) => {
+                const props = [...rule.style]
+                  .map((propName) => {
+                    return {
+                      key: propName.trim(),
+                      value: rule.style.getPropertyValue(propName).trim(),
+                    } as KeyValuePair<string, string>;
+                  },
+                  )
+                  // Discard any props that don't start with "--". Custom props are required to.
+                  .filter(({ key }: KeyValuePair<string, string>) => key.indexOf('--') === 0);
+
+                return [...propValArr, ...props];
+              }, []),
+            ),
+          [],
+        );
+    } else {
+      return [];
+    }
+  }
+}
+
+const themeVariablesSelector = (state: AppState) => state.cssVariables;
+
+const themeVariableByNameSelector = (name: string): MemoizedSelector<AppState, string> => {
+  return keySelector<string>(name, themeVariablesSelector);
+};
+
+// Split this up into two memoized selectors so the query search gets cached separately from the pagination,
+// since the entire list has to be retrieved every time anyway
+const themePaginatedVariablesByQuery = (query: string, pagination: PaginationComponentOptions): MemoizedSelector<AppState, PaginatedList<KeyValuePair<string, string>>> => {
+  return createSelector(themeVariablesByQuery(query), (pairs) => {
+    if (hasValue(pairs)) {
+      const { currentPage, pageSize } = pagination;
+      const startIndex = (currentPage - 1) * pageSize;
+      const endIndex = startIndex + pageSize;
+      const pairsPage = pairs.slice(startIndex, endIndex);
+      const totalPages = Math.ceil(pairs.length / pageSize);
+      const pageInfo = new PageInfo({ currentPage, elementsPerPage: pageSize, totalElements: pairs.length, totalPages });
+      return buildPaginatedList(pageInfo, pairsPage);
+    } else {
+      return undefined;
+    }
+  });
+};
+
+const themeVariablesByQuery = (query: string): MemoizedSelector<AppState, KeyValuePair<string, string>[]> => {
+  return createSelector(themeVariablesSelector, (state) => {
+    if (hasValue(state)) {
+      return Object.keys(state)
+        .filter((key: string) => key.includes(query))
+        .map((key: string) => {
+          return { key, value: state[key] };
+        });
+    } else {
+      return undefined;
+    }
+  });
+};
diff --git a/src/app/shared/sass-helper/sass-helper.actions.ts b/src/app/shared/sass-helper/sass-helper.actions.ts
deleted file mode 100644
index 144904646e..0000000000
--- a/src/app/shared/sass-helper/sass-helper.actions.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Action } from '@ngrx/store';
-import { type } from '../ngrx/type';
-
-/**
- * For each action type in an action group, make a simple
- * enum object for all of this group's action types.
- *
- * The 'type' utility function coerces strings into string
- * literal types and runs a simple check to guarantee all
- * action types in the application are unique.
- */
-export const CSSVariableActionTypes = {
-  ADD: type('dspace/css-variables/ADD'),
-};
-
-export class AddCSSVariableAction implements Action {
-  type = CSSVariableActionTypes.ADD;
-  payload: {
-    name: string,
-    value: string
-  };
-
-  constructor(name: string, value: string) {
-    this.payload = {name, value};
-  }
-}
-
-export type CSSVariableAction = AddCSSVariableAction;
diff --git a/src/app/shared/sass-helper/sass-helper.reducer.ts b/src/app/shared/sass-helper/sass-helper.reducer.ts
deleted file mode 100644
index 6f080619fa..0000000000
--- a/src/app/shared/sass-helper/sass-helper.reducer.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-import { CSSVariableAction, CSSVariableActionTypes } from './sass-helper.actions';
-
-export interface CSSVariablesState {
-  [name: string]: string;
-}
-
-const initialState: CSSVariablesState = Object.create({});
-
-export function cssVariablesReducer(state = initialState, action: CSSVariableAction): CSSVariablesState {
-  switch (action.type) {
-    case CSSVariableActionTypes.ADD: {
-      const variable = action.payload;
-      const t =  Object.assign({}, state, { [variable.name]: variable.value });
-      return t;
-    }
-    default: {
-      return state;
-    }
-  }
-}
diff --git a/src/app/shared/sass-helper/sass-helper.service.ts b/src/app/shared/sass-helper/sass-helper.service.ts
deleted file mode 100644
index 7cc83dab2d..0000000000
--- a/src/app/shared/sass-helper/sass-helper.service.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { Injectable } from '@angular/core';
-import { AppState, keySelector } from '../../app.reducer';
-import { MemoizedSelector, select, Store } from '@ngrx/store';
-import { AddCSSVariableAction } from './sass-helper.actions';
-
-@Injectable()
-export class CSSVariableService {
-  constructor(
-    protected store: Store<AppState>) {
-  }
-
-  addCSSVariable(name: string, value: string) {
-    this.store.dispatch(new AddCSSVariableAction(name, value));
-  }
-
-  getVariable(name: string) {
-    return this.store.pipe(select(themeVariableByNameSelector(name)));
-  }
-
-  getAllVariables() {
-    return this.store.pipe(select(themeVariablesSelector));
-  }
-
-}
-
-const themeVariablesSelector = (state: AppState) => state.cssVariables;
-
-const themeVariableByNameSelector = (name: string): MemoizedSelector<AppState, string> => {
-  return keySelector<string>(name, themeVariablesSelector);
-};
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 bf5c15e963..013274320b 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
@@ -9,11 +9,11 @@
         <h3 class="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">or</span>
+                <span class="px-4 bg-white">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.or-divider' | translate}}</span>
             </div>
         </h3>
 
         <h5 class="px-2">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.input-header' | translate}}</h5>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <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/scope-selector-modal/scope-selector-modal.component.spec.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts
index 42d00aaa08..ac1aa8ef58 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.spec.ts
@@ -1,13 +1,24 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, Router } from '@angular/router';
-import { ScopeSelectorModalComponent } from './scope-selector-modal.component';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { Community } from '../../../core/shared/community.model';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject } from '../../remote-data.utils';
 import { RouterStub } from '../../testing/router.stub';
+import { ScopeSelectorModalComponent } from './scope-selector-modal.component';
 
 describe('ScopeSelectorModalComponent', () => {
   let component: ScopeSelectorModalComponent;
@@ -19,8 +30,8 @@ describe('ScopeSelectorModalComponent', () => {
   community.metadata = {
     'dc.title': [Object.assign(new MetadataValue(), {
       value: 'Community title',
-      language: undefined
-    })]
+      language: undefined,
+    })],
   };
   const router = new RouterStub();
   const communityRD = createSuccessfulRemoteDataObject(community);
@@ -41,14 +52,14 @@ describe('ScopeSelectorModalComponent', () => {
                   dso: communityRD,
                 },
               },
-            }
+            },
           },
         },
         {
-          provide: Router, useValue: router
-        }
+          provide: Router, useValue: router,
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
 
   }));
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
index 86c3010287..c947c2abae 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.ts
@@ -1,9 +1,22 @@
-import { Component, EventEmitter, OnInit } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  OnInit,
+} from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { DSOSelectorModalWrapperComponent, SelectorActionType } from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
+
+import { environment } from '../../../../environments/environment';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import {
+  DSOSelectorModalWrapperComponent,
+  SelectorActionType,
+} from '../../dso-selector/modal-wrappers/dso-selector-modal-wrapper.component';
 
 /**
  * Component to wrap a button - to select the entire repository -
@@ -33,6 +46,11 @@ export class ScopeSelectorModalComponent extends DSOSelectorModalWrapperComponen
    */
   scopeChange = new EventEmitter<DSpaceObject>();
 
+  /**
+   * Default DSO ordering
+   */
+  defaultSort = new SortOptions(environment.comcolSelectionSort.sortField, environment.comcolSelectionSort.sortDirection as SortDirection);
+
   constructor(protected activeModal: NgbActiveModal, protected route: ActivatedRoute) {
     super(activeModal, route);
   }
diff --git a/src/app/shared/search-form/search-form.component.html b/src/app/shared/search-form/search-form.component.html
index 226962cc61..f916785804 100644
--- a/src/app/shared/search-form/search-form.component.html
+++ b/src/app/shared/search-form/search-form.component.html
@@ -2,9 +2,14 @@
     <div>
         <div class="form-group input-group">
             <div *ngIf="showScopeSelector" class="input-group-prepend">
-                <button class="scope-button btn btn-outline-secondary text-truncate" [ngbTooltip]="(selectedScope | async)?.name" type="button" (click)="openScopeModal()">{{(selectedScope | async)?.name || ('search.form.scope.all' | translate)}}</button>
+                <button class="scope-button btn btn-outline-secondary text-truncate"
+                        [ngbTooltip]="dsoNameService.getName(selectedScope | async)" type="button"
+                        (click)="openScopeModal()">
+                  {{dsoNameService.getName(selectedScope | async) || ('search.form.scope.all' | translate)}}
+                </button>
             </div>
-            <input type="text" [(ngModel)]="query" name="query" class="form-control" attr.aria-label="{{ searchPlaceholder }}" [attr.data-test]="'search-box' | dsBrowserOnly"
+            <input type="text" [(ngModel)]="query" name="query" class="form-control"
+                   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>
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 4b5844f660..61cb44c7b0 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -1,22 +1,29 @@
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import { SearchFormComponent } from './search-form.component';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Community } from '../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
+
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { Community } from '../../core/shared/community.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { SearchService } from '../../core/shared/search/search.service';
-import { PaginationService } from '../../core/pagination/pagination.service';
 import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { PaginationServiceStub } from '../testing/pagination-service.stub';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
-import { SearchServiceStub } from '../testing/search-service.stub';
-import { Router } from '@angular/router';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
 import { RouterStub } from '../testing/router.stub';
+import { SearchServiceStub } from '../testing/search-service.stub';
+import { SearchFormComponent } from './search-form.component';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
@@ -28,12 +35,13 @@ 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),
   };
 
   beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    return TestBed.configureTestingModule({
       imports: [FormsModule, RouterTestingModule, TranslateModule.forRoot()],
       providers: [
         { provide: Router, useValue: router },
@@ -45,7 +53,7 @@ describe('SearchFormComponent', () => {
       declarations: [
         SearchFormComponent,
         BrowserOnlyMockPipe,
-      ]
+      ],
     }).compileComponents();
   }));
 
@@ -96,7 +104,7 @@ describe('SearchFormComponent', () => {
     tick();
     const scopeSelect = de.query(By.css('.scope-button')).nativeElement;
 
-    expect(scopeSelect.textContent).toBe(testCommunity.name);
+    expect(scopeSelect.textContent).toContain('Sample Community');
   }));
 
   describe('updateSearch', () => {
@@ -104,38 +112,38 @@ 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,
-        queryParamsHandling: 'merge'
+        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
+        query: query,
       };
 
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
+        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
+        scope: scope,
       };
 
       comp.updateSearch(searchQuery);
 
       expect(router.navigate).toHaveBeenCalledWith(comp.getSearchLinkParts(), {
-        queryParams: searchQuery,
-        queryParamsHandling: 'merge'
+        queryParams: { ...searchQuery, ...firstPage },
+        queryParamsHandling: 'merge',
       });
     });
   });
@@ -152,7 +160,7 @@ describe('SearchFormComponent', () => {
     it('should only search in the provided scope', () => {
       searchQuery = {
         query: query,
-        scope: scope
+        scope: scope,
       };
 
       comp.scope = scope;
@@ -163,7 +171,7 @@ describe('SearchFormComponent', () => {
 
     it('should not create searchQuery with the scope if an empty scope is provided', () => {
       searchQuery = {
-        query: query
+        query: query,
       };
 
       comp.scope = '';
@@ -172,46 +180,23 @@ describe('SearchFormComponent', () => {
       expect(comp.updateSearch).toHaveBeenCalledWith(searchQuery);
     });
   });
-
-  // it('should call updateSearch when clicking the submit button with correct parameters', fakeAsync(() => {
-  //   comp.query = 'Test String'
-  //   fixture.detectChanges();
-  //   spyOn(comp, 'updateSearch').and.callThrough();
-  //   fixture.detectChanges();
-  //
-  //   const submit = de.query(By.css('button.search-button')).nativeElement;
-  //   const scope = '123456';
-  //   const query = 'test';
-  //   const select = de.query(By.css('select')).nativeElement;
-  //   const input = de.query(By.css('input')).nativeElement;
-  //
-  //   tick();
-  //   select.value = scope;
-  //   input.value = query;
-  //
-  //   fixture.detectChanges();
-  //
-  //   submit.click();
-  //
-  //   expect(comp.updateSearch).toHaveBeenCalledWith({ scope: scope, query: query });
-  // }));
 });
 
-export const objects: DSpaceObject[] = [
+const objects: DSpaceObject[] = [
   Object.assign(new Community(), {
     logo: {
       self: {
         _isScalar: true,
         value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/10b636d0-7890-4968-bcd6-0d83bf4e2b42',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     collections: {
       self: {
         _isScalar: true,
         value: '1506937433727',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     _links: {
       self: {
@@ -225,40 +210,40 @@ export const objects: DSpaceObject[] = [
       'dc.description': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.description.abstract': [
         {
           language: null,
-          value: 'This is a test community to hold content for the OR2017 demostration'
-        }
+          value: 'This is a test community to hold content for the OR2017 demostration',
+        },
       ],
       'dc.description.tableofcontents': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.rights': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.title': [
         {
           language: null,
-          value: 'OR2017 - Demonstration'
-        }
+          value: 'OR2017 - Demonstration',
+        },
       ],
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://localhost:4000/handle/10673/11'
-        }
+          value: 'http://localhost:4000/handle/10673/11',
+        },
       ],
-    }
+    },
   }),
   Object.assign(new Community(),
     {
@@ -266,15 +251,15 @@ export const objects: DSpaceObject[] = [
         self: {
           _isScalar: true,
           value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/f446c17d-6d51-45ea-a610-d58a73642d40',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       collections: {
         self: {
           _isScalar: true,
           value: '1506937433727',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       _links: {
         self: {
@@ -288,40 +273,40 @@ export const objects: DSpaceObject[] = [
         'dc.description': [
           {
             language: null,
-            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-          }
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>',
+          },
         ],
         'dc.description.abstract': [
           {
             language: null,
-            value: 'This is a sample top-level community'
-          }
+            value: 'This is a sample top-level community',
+          },
         ],
         'dc.description.tableofcontents': [
           {
             language: null,
-            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-          }
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>',
+          },
         ],
         'dc.rights': [
           {
             language: null,
-            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-          }
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>',
+          },
         ],
         'dc.title': [
           {
             language: null,
-            value: 'Sample Community'
-          }
+            value: 'Sample Community',
+          },
         ],
         'dc.identifier.uri': [
           {
             language: null,
-            value: 'http://localhost:4000/handle/10673/1'
-          }
+            value: 'http://localhost:4000/handle/10673/1',
+          },
         ],
-      }
-    }
-  )
+      },
+    },
+  ),
 ];
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 7ea51e4c1e..8f06b73a35 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -1,34 +1,38 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  Output,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { isNotEmpty } from '../empty.util';
-import { SearchService } from '../../core/shared/search/search.service';
-import { currentPath } from '../utils/route.utils';
-import { PaginationService } from '../../core/pagination/pagination.service';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-selector-modal.component';
-import { take } from 'rxjs/operators';
 import { BehaviorSubject } from 'rxjs';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { take } from 'rxjs/operators';
 
-/**
- * This component renders a simple item page.
- * The route parameter 'id' is used to request the item it represents.
- * All fields of the item that should be displayed, are defined in its template.
- */
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { currentPath } from '../utils/route.utils';
+import { ScopeSelectorModalComponent } from './scope-selector-modal/scope-selector-modal.component';
 
 @Component({
   selector: 'ds-search-form',
   styleUrls: ['./search-form.component.scss'],
-  templateUrl: './search-form.component.html'
+  templateUrl: './search-form.component.html',
 })
-
 /**
  * Component that represents the search form
  */
-export class SearchFormComponent implements OnInit {
+export class SearchFormComponent implements OnChanges {
   /**
    * The search query
    */
@@ -37,13 +41,18 @@ export class SearchFormComponent implements OnInit {
   /**
    * True when the search component should show results on the current page
    */
-  @Input() inPlaceSearch;
+  @Input() inPlaceSearch: boolean;
 
   /**
    * The currently selected scope object's UUID
    */
   @Input()
-  scope = '';
+    scope = '';
+
+  /**
+   * Hides the scope in the url, this can be useful when you hardcode the scope in another way
+   */
+  @Input() hideScopeInUrl = false;
 
   selectedScope: BehaviorSubject<DSpaceObject> = new BehaviorSubject<DSpaceObject>(undefined);
 
@@ -74,19 +83,21 @@ export class SearchFormComponent implements OnInit {
    */
   @Output() submitSearch = new EventEmitter<any>();
 
-  constructor(private router: Router,
-              private searchService: SearchService,
-              private paginationService: PaginationService,
-              private searchConfig: SearchConfigurationService,
-              private modalService: NgbModal,
-              private dsoService: DSpaceObjectDataService
+  constructor(
+    protected router: Router,
+    protected searchService: SearchService,
+    protected paginationService: PaginationService,
+    protected searchConfig: SearchConfigurationService,
+    protected modalService: NgbModal,
+    protected dsoService: DSpaceObjectDataService,
+    public dsoNameService: DSONameService,
   ) {
   }
 
   /**
    * Retrieve the scope object from the URL so we can show its name
    */
-  ngOnInit(): void {
+  ngOnChanges(): void {
     if (isNotEmpty(this.scope)) {
       this.dsoService.findById(this.scope).pipe(getFirstSucceededRemoteDataPayload())
         .subscribe((scope: DSpaceObject) => this.selectedScope.next(scope));
@@ -118,21 +129,24 @@ export class SearchFormComponent implements OnInit {
    * @param data Updated parameters
    */
   updateSearch(data: any) {
-    const queryParams = Object.assign({}, data);
+    const goToFirstPage = { 'spc.page': 1 };
 
-    this.router.navigate(this.getSearchLinkParts(), {
+    const queryParams = Object.assign(
+      {
+        ...goToFirstPage,
+      },
+      data,
+    );
+    if (hasValue(data.scope) && this.hideScopeInUrl) {
+      delete queryParams.scope;
+    }
+
+    void this.router.navigate(this.getSearchLinkParts(), {
       queryParams: queryParams,
-      queryParamsHandling: 'merge'
+      queryParamsHandling: 'merge',
     });
   }
 
-  /**
-   * For usage of the isNotEmpty function in the template
-   */
-  isNotEmpty(object: any) {
-    return isNotEmpty(object);
-  }
-
   /**
    * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
    */
diff --git a/src/app/shared/search-form/themed-search-form.component.ts b/src/app/shared/search-form/themed-search-form.component.ts
new file mode 100644
index 0000000000..adddf29de6
--- /dev/null
+++ b/src/app/shared/search-form/themed-search-form.component.ts
@@ -0,0 +1,66 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
+import { ThemedComponent } from '../theme-support/themed.component';
+import { SearchFormComponent } from './search-form.component';
+
+/**
+ * Themed wrapper for {@link SearchFormComponent}
+ */
+@Component({
+  selector: 'ds-themed-search-form',
+  styleUrls: [],
+  templateUrl: '../../shared/theme-support/themed.component.html',
+})
+export class ThemedSearchFormComponent extends ThemedComponent<SearchFormComponent> {
+
+  @Input() query: string;
+
+  @Input() inPlaceSearch: boolean;
+
+  @Input() scope: string;
+
+  @Input() hideScopeInUrl: boolean;
+
+  @Input() currentUrl: string;
+
+  @Input() large: boolean;
+
+  @Input() brandColor: string;
+
+  @Input() searchPlaceholder: string;
+
+  @Input() showScopeSelector: boolean;
+
+  @Output() submitSearch: EventEmitter<any> = new EventEmitter();
+
+  protected inAndOutputNames: (keyof SearchFormComponent & keyof this)[] = [
+    'query',
+    'inPlaceSearch',
+    'scope',
+    'hideScopeInUrl',
+    'currentUrl',
+    'large',
+    'brandColor',
+    'searchPlaceholder',
+    'showScopeSelector',
+    'submitSearch',
+  ];
+
+  protected getComponentName(): string {
+    return 'SearchFormComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/shared/search-form/search-form.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./search-form.component');
+  }
+
+}
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
new file mode 100644
index 0000000000..e03fb40532
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -0,0 +1,51 @@
+<div class="facet-filter d-block mb-3 p-3" [ngClass]="{ 'focus': focusBox }" role="region">
+    <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false" class="filter-name d-flex"
+        [attr.aria-expanded]="false" 
+        [attr.aria-label]="((collapsedSearch ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.advanced.filters.head') | translate | lowercase)" 
+        [attr.data-test]="'filter-toggle' | dsBrowserOnly">
+        <span class="h4 d-inline-block text-left mt-auto mb-auto">
+            {{'search.advanced.filters.head' | translate}}
+        </span>
+        <i class="filter-toggle flex-grow-1 fas p-auto" aria-hidden="true" [ngClass]="collapsedSearch ? 'fa-plus' : 'fa-minus'"
+            [title]="(collapsedSearch ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate">
+        </i>
+    </button>
+    <div [@slide]="collapsedSearch ? 'collapsed' : 'expanded'" (@slide.start)="startSlide($event)"
+        (@slide.done)="finishSlide($event)" class="search-filter-wrapper"
+        [ngClass]="{ 'closed' : closed, 'notab': notab }">
+        <form [class]="'ng-invalid'" [formGroup]="advSearchForm" (ngSubmit)="onSubmit(advSearchForm.value)">
+            <div class="row">
+                <div class="col-lg-12">
+                    <select
+                        [className]="(filter.invalid) && (filter.dirty || filter.touched) ? 'form-control is-invalid' :'form-control'"
+                        aria-label="filter" name="filter" id="filter" placeholder="select operator"
+                        formControlName="filter" required>
+                        <ng-container *ngFor="let filter of appConfig.search.advancedFilters.filter;">
+                            <option [value]="filter">
+                                {{'search.filters.filter.' + filter + '.text'| translate}}
+                            </option>
+                        </ng-container>
+                    </select>
+                </div>
+                <div class="col-lg-12 mt-1">
+                    <select
+                        [className]="(operator.invalid) && (operator.dirty || operator.touched) ? 'form-control is-invalid' :'form-control'"
+                        aria-label="operator" name="operator" id="operator" formControlName="operator" required>
+                        <option value="equals">{{'search.filters.operator.equals.text'| translate}}</option>
+                        <option value="notequals">{{'search.filters.operator.notequals.text'| translate}}</option>
+                        <option value="contains">{{'search.filters.operator.contains.text'| translate}}</option>
+                        <option value="notcontains">{{'search.filters.operator.notcontains.text'| translate}}</option>
+                    </select>
+                </div>
+                <div class="col-lg-12 mt-1">
+                    <input type="text" aria-label="textsearch" class="form-control" id="textsearch" name="textsearch"
+                        formControlName="textsearch" #text [placeholder]="('filter.search.text.placeholder' | translate)" required>
+                </div>
+                <div class="col-lg-12 mt-1">
+                    <button class="form-control btn w-50 float-right btn-primary" type="submit"
+                        [disabled]="advSearchForm.invalid">{{'advancesearch.form.submit'| translate}}</button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.scss b/src/app/shared/search/advanced-search/advanced-search.component.scss
new file mode 100644
index 0000000000..13ca767b2b
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.scss
@@ -0,0 +1 @@
+@import '../search-filters/search-filter/search-filter.component.scss';
\ No newline at end of file
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.spec.ts b/src/app/shared/search/advanced-search/advanced-search.component.spec.ts
new file mode 100644
index 0000000000..0832b61efe
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.spec.ts
@@ -0,0 +1,86 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  FormBuilder,
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { APP_CONFIG } from '../../../../config/app-config.interface';
+import { environment } from '../../../../environments/environment';
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { BrowserOnlyMockPipe } from '../../testing/browser-only-mock.pipe';
+import { RouterStub } from '../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { AdvancedSearchComponent } from './advanced-search.component';
+
+describe('AdvancedSearchComponent', () => {
+  let component: AdvancedSearchComponent;
+  let fixture: ComponentFixture<AdvancedSearchComponent>;
+  let builderService: FormBuilderService = getMockFormBuilderService();
+  let searchService: SearchService;
+  let router;
+  const searchServiceStub = {
+    /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
+    getClearFiltersQueryParams: () => {
+    },
+    getSearchLink: () => {
+    },
+    getConfigurationSearchConfig: () => { },
+    /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
+  };
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [AdvancedSearchComponent, BrowserOnlyMockPipe],
+      imports: [FormsModule, RouterTestingModule, TranslateModule.forRoot(), BrowserAnimationsModule, ReactiveFormsModule],
+      providers: [
+        FormBuilder,
+        { provide: APP_CONFIG, useValue: environment },
+        { provide: FormBuilderService, useValue: builderService },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { provide: SearchService, useValue: searchServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(AdvancedSearchComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default },
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedSearchComponent);
+    component = fixture.componentInstance;
+    router = TestBed.inject(Router);
+    fixture.detectChanges();
+  });
+  describe('when the getSearchLink method is called', () => {
+    const data = { filter: 'title', textsearch: 'demo', operator: 'equals' };
+    it('should call navigate on the router with the right searchlink and parameters when the filter is provided with a valid operator', () => {
+      component.advSearchForm.get('textsearch').patchValue('1');
+      component.advSearchForm.get('filter').patchValue('1');
+      component.advSearchForm.get('operator').patchValue('1');
+
+      component.onSubmit(data);
+      expect(router.navigate).toHaveBeenCalledWith([undefined], {
+        queryParams: { ['f.' + data.filter]: data.textsearch + ',' + data.operator },
+        queryParamsHandling: 'merge',
+      });
+
+    });
+  });
+});
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.ts b/src/app/shared/search/advanced-search/advanced-search.component.ts
new file mode 100644
index 0000000000..f00748afa3
--- /dev/null
+++ b/src/app/shared/search/advanced-search/advanced-search.component.ts
@@ -0,0 +1,129 @@
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
+
+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';
+import { slide } from '../../animations/slide';
+
+@Component({
+  selector: 'ds-advanced-search',
+  templateUrl: './advanced-search.component.html',
+  styleUrls: ['./advanced-search.component.scss'],
+  animations: [slide],
+})
+/**
+   * This component represents the part of the search sidebar that contains advanced filters.
+   */
+export class AdvancedSearchComponent implements OnInit {
+  /**
+   * True when the search component should show results on the current page
+   */
+  @Input() inPlaceSearch;
+
+
+  /**
+   * Link to the search page
+   */
+  notab: boolean;
+
+  closed: boolean;
+  collapsedSearch = false;
+  focusBox = false;
+
+  advSearchForm: FormGroup;
+  constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
+    private formBuilder: FormBuilder,
+    protected searchService: SearchService,
+    protected router: Router,
+    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
+  }
+
+  ngOnInit(): void {
+
+    this.advSearchForm = this.formBuilder.group({
+      textsearch: new FormControl('', {
+        validators: [Validators.required],
+      }),
+      filter: new FormControl('title', {
+        validators: [Validators.required],
+      }),
+      operator: new FormControl('equals',
+        { validators: [Validators.required] }),
+
+    });
+    this.collapsedSearch = this.isCollapsed();
+
+  }
+
+  get textsearch() {
+    return this.advSearchForm.get('textsearch');
+  }
+
+  get filter() {
+    return this.advSearchForm.get('filter');
+  }
+
+  get operator() {
+    return this.advSearchForm.get('operator');
+  }
+  paramName(filter) {
+    return 'f.' + filter;
+  }
+  onSubmit(data) {
+    if (this.advSearchForm.valid) {
+      const queryParams = { [this.paramName(data.filter)]: data.textsearch + ',' + data.operator };
+      if (!this.inPlaceSearch) {
+        this.router.navigate([this.searchService.getSearchLink()], { queryParams: queryParams, queryParamsHandling: 'merge' });
+      } else {
+        if (!this.router.url.includes('?')) {
+          this.router.navigateByUrl(this.router.url + '?f.' + data.filter + '=' + data.textsearch + ',' + data.operator);
+        } else {
+          this.router.navigateByUrl(this.router.url + '&f.' + data.filter + '=' + data.textsearch + ',' + data.operator);
+        }
+      }
+
+      this.advSearchForm.reset({ operator: data.operator, filter: data.filter, textsearch: '' });
+    }
+  }
+  startSlide(event: any): void {
+    if (event.toState === 'collapsed') {
+      this.closed = true;
+    }
+    if (event.fromState === 'collapsed') {
+      this.notab = false;
+    }
+  }
+  finishSlide(event: any): void {
+    if (event.fromState === 'collapsed') {
+      this.closed = false;
+    }
+    if (event.toState === 'collapsed') {
+      this.notab = true;
+    }
+  }
+  toggle() {
+    this.collapsedSearch = !this.collapsedSearch;
+  }
+  private isCollapsed(): boolean {
+    return !this.collapsedSearch;
+  }
+
+}
+
diff --git a/src/app/shared/search/host-window.reducer.ts b/src/app/shared/search/host-window.reducer.ts
index 17be02c992..a8cefb992a 100644
--- a/src/app/shared/search/host-window.reducer.ts
+++ b/src/app/shared/search/host-window.reducer.ts
@@ -1,4 +1,7 @@
-import { HostWindowAction, HostWindowActionTypes } from '../host-window.actions';
+import {
+  HostWindowAction,
+  HostWindowActionTypes,
+} from '../host-window.actions';
 
 export interface HostWindowState {
   width: number;
@@ -7,7 +10,7 @@ export interface HostWindowState {
 
 const initialState: HostWindowState = {
   width: null,
-  height: null
+  height: null,
 };
 
 export function hostWindowReducer(state = initialState, action: HostWindowAction): HostWindowState {
diff --git a/src/app/shared/search/models/facet-config-response.model.ts b/src/app/shared/search/models/facet-config-response.model.ts
index deb86def22..6b1cc37997 100644
--- a/src/app/shared/search/models/facet-config-response.model.ts
+++ b/src/app/shared/search/models/facet-config-response.model.ts
@@ -1,10 +1,11 @@
+import { deserialize } from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { FACET_CONFIG_RESPONSE } from './types/facet-config-response.resouce-type';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { SearchFilterConfig } from './search-filter-config.model';
-import { deserialize } from 'cerialize';
-import { HALLink } from '../../../core/shared/hal-link.model';
-import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { FACET_CONFIG_RESPONSE } from './types/facet-config-response.resouce-type';
 
 /**
  * The response from the discover/facets endpoint
@@ -18,7 +19,7 @@ export class FacetConfigResponse implements CacheableObject {
    * hardcoded because rest doesn't a unique one.
    */
   @excludeFromEquals
-  type = FACET_CONFIG_RESPONSE;
+    type = FACET_CONFIG_RESPONSE;
 
   /**
    * the filters in this response
@@ -29,7 +30,7 @@ export class FacetConfigResponse implements CacheableObject {
    * The {@link HALLink}s for this SearchFilterConfig
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
   };
 }
diff --git a/src/app/shared/search/models/facet-value.model.ts b/src/app/shared/search/models/facet-value.model.ts
index 6c1d353480..a343e007c9 100644
--- a/src/app/shared/search/models/facet-value.model.ts
+++ b/src/app/shared/search/models/facet-value.model.ts
@@ -1,4 +1,9 @@
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { HALLink } from '../../../core/shared/hal-link.model';
 import { HALResource } from '../../../core/shared/hal-resource.model';
 
@@ -10,31 +15,31 @@ export class FacetValue implements HALResource {
    * The display label of the facet value
    */
   @autoserialize
-  label: string;
+    label: string;
 
   /**
    * The value of the facet value
    */
   @autoserializeAs(String, 'label')
-  value: string;
+    value: string;
 
   /**
    * The number of results this facet value would have if selected
    */
   @autoserialize
-  count: number;
+    count: number;
 
   /**
    * The Authority Value for this facet
    */
   @autoserialize
-  authorityKey?: string;
+    authorityKey?: string;
 
   /**
    * The {@link HALLink}s for this FacetValue
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink
     search: HALLink
   };
diff --git a/src/app/shared/search/models/facet-values.model.ts b/src/app/shared/search/models/facet-values.model.ts
index 09bef25876..4c14c7d90c 100644
--- a/src/app/shared/search/models/facet-values.model.ts
+++ b/src/app/shared/search/models/facet-values.model.ts
@@ -1,11 +1,16 @@
+import {
+  autoserialize,
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
-import { FACET_VALUES } from './types/facet-values.resource-type';
-import { FacetValue } from './facet-value.model';
-import { SearchQueryResponse } from './search-query-response.model';
-import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
-import { FilterType } from './filter-type.model';
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { FacetValue } from './facet-value.model';
+import { FilterType } from './filter-type.model';
+import { SearchQueryResponse } from './search-query-response.model';
+import { FACET_VALUES } from './types/facet-values.resource-type';
 
 @typedObject
 @inheritSerialization(PaginatedList)
@@ -24,23 +29,23 @@ export class FacetValues extends SearchQueryResponse<FacetValue> {
    * The name of the facet the values are for
    */
   @autoserialize
-  name: string;
+    name: string;
 
   /**
    * The type of facet the values are for
    */
   @autoserializeAs(String, 'facetType')
-  filterType: FilterType;
+    filterType: FilterType;
 
   /**
    * The max number of returned facetValues
    */
   @autoserialize
-  facetLimit: number;
+    facetLimit: number;
 
   /**
    * The results for this query
    */
   @autoserializeAs(FacetValue, 'values')
-  page: FacetValue[];
+    page: FacetValue[];
 }
diff --git a/src/app/shared/search/models/paginated-search-options.model.spec.ts b/src/app/shared/search/models/paginated-search-options.model.spec.ts
index 7afee06abf..d39e3c958e 100644
--- a/src/app/shared/search/models/paginated-search-options.model.spec.ts
+++ b/src/app/shared/search/models/paginated-search-options.model.spec.ts
@@ -1,7 +1,10 @@
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { SearchFilter } from './search-filter.model';
 
 describe('PaginatedSearchOptions', () => {
@@ -44,7 +47,7 @@ describe('PaginatedSearchOptions', () => {
         'f.test=value&' +
         'f.example=another%20value&' +
         'f.example=second%20value&' +
-        'f.range=%5B2002%20TO%202021%5D,equals'
+        'f.range=%5B2002%20TO%202021%5D,equals',
       );
     });
 
diff --git a/src/app/shared/search/models/paginated-search-options.model.ts b/src/app/shared/search/models/paginated-search-options.model.ts
index 76ed6cdaa8..2c8546d202 100644
--- a/src/app/shared/search/models/paginated-search-options.model.ts
+++ b/src/app/shared/search/models/paginated-search-options.model.ts
@@ -1,10 +1,10 @@
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { isNotEmpty } from '../../empty.util';
-import { SearchOptions } from './search-options.model';
-import { SearchFilter } from './search-filter.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { isNotEmpty } from '../../empty.util';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
+import { SearchFilter } from './search-filter.model';
+import { SearchOptions } from './search-options.model';
 
 /**
  * This model class represents all parameters needed to request information about a certain page of a search request, in a certain order
diff --git a/src/app/shared/search/models/search-filter-config.model.ts b/src/app/shared/search/models/search-filter-config.model.ts
index 59512ee29d..4498ba5763 100644
--- a/src/app/shared/search/models/search-filter-config.model.ts
+++ b/src/app/shared/search/models/search-filter-config.model.ts
@@ -1,72 +1,77 @@
-import { FilterType } from './filter-type.model';
-import { autoserialize, autoserializeAs, deserialize } from 'cerialize';
-import { HALLink } from '../../../core/shared/hal-link.model';
+import {
+  autoserialize,
+  autoserializeAs,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
-import { SEARCH_FILTER_CONFIG } from './types/search-filter-config.resource-type';
 import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { FilterType } from './filter-type.model';
+import { SEARCH_FILTER_CONFIG } from './types/search-filter-config.resource-type';
 
 /**
  * The configuration for a search filter
  */
 @typedObject
-  export class SearchFilterConfig implements CacheableObject {
-    static type = SEARCH_FILTER_CONFIG;
+export class SearchFilterConfig implements CacheableObject {
+  static type = SEARCH_FILTER_CONFIG;
 
     /**
      * The object type,
      * hardcoded because rest doesn't set one.
      */
     @excludeFromEquals
-    type = SEARCH_FILTER_CONFIG;
+      type = SEARCH_FILTER_CONFIG;
 
     /**
      * The name of this filter
      */
     @autoserialize
-    name: string;
+      name: string;
 
     /**
      * The FilterType of this filter
      */
     @autoserializeAs(String, 'facetType')
-    filterType: FilterType;
+      filterType: FilterType;
 
     /**
      * True if the filter has facets
      */
     @autoserialize
-    hasFacets: boolean;
+      hasFacets: boolean;
 
     /**
      * @type {number} The page size used for this facet
      */
     @autoserializeAs(String, 'facetLimit')
-    pageSize = 5;
+      pageSize = 5;
 
     /**
      * Defines if the item facet is collapsed by default or not on the search page
      */
     @autoserialize
-    isOpenByDefault: boolean;
+      isOpenByDefault: boolean;
 
     /**
      * Minimum value possible for this facet in the repository
      */
     @autoserialize
-    maxValue: string;
+      maxValue: string;
 
     /**
      * Maximum value possible for this facet in the repository
      */
     @autoserialize
-    minValue: string;
+      minValue: string;
 
     /**
      * The {@link HALLink}s for this SearchFilterConfig
      */
     @deserialize
-    _links: {
+      _links: {
       self: HALLink;
     };
 
@@ -77,4 +82,4 @@ import { CacheableObject } from '../../../core/cache/cacheable-object.model';
     get paramName(): string {
       return 'f.' + this.name;
     }
-  }
+}
diff --git a/src/app/shared/search/models/search-objects.model.ts b/src/app/shared/search/models/search-objects.model.ts
index 2afbab372b..fa483017ee 100644
--- a/src/app/shared/search/models/search-objects.model.ts
+++ b/src/app/shared/search/models/search-objects.model.ts
@@ -1,11 +1,15 @@
-import { autoserializeAs, inheritSerialization } from 'cerialize';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { SearchResult } from './search-result.model';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
+import {
+  autoserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
-import { SEARCH_OBJECTS } from './types/search-objects.resource-type';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
 import { SearchQueryResponse } from './search-query-response.model';
+import { SearchResult } from './search-result.model';
+import { SEARCH_OBJECTS } from './types/search-objects.resource-type';
 
 /**
  * Class representing the response returned by the server when performing a search request
@@ -27,5 +31,5 @@ export class SearchObjects<T extends DSpaceObject> extends SearchQueryResponse<S
    * The results for this query
    */
   @autoserializeAs(SearchResult, 'objects')
-  page: SearchResult<T>[];
+    page: SearchResult<T>[];
 }
diff --git a/src/app/shared/search/models/search-options.model.spec.ts b/src/app/shared/search/models/search-options.model.spec.ts
index 176d321999..614ca89160 100644
--- a/src/app/shared/search/models/search-options.model.spec.ts
+++ b/src/app/shared/search/models/search-options.model.spec.ts
@@ -1,6 +1,6 @@
-import { SearchOptions } from './search-options.model';
-import { SearchFilter } from './search-filter.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
+import { SearchFilter } from './search-filter.model';
+import { SearchOptions } from './search-options.model';
 
 describe('SearchOptions', () => {
   let options: SearchOptions;
@@ -36,7 +36,7 @@ describe('SearchOptions', () => {
         'f.test=value&' +
         'f.example=another%20value&' +
         'f.example=second%20value&' +
-        'f.range=%5B2002%20TO%202021%5D,equals'
+        'f.range=%5B2002%20TO%202021%5D,equals',
       );
     });
 
diff --git a/src/app/shared/search/models/search-options.model.ts b/src/app/shared/search/models/search-options.model.ts
index 470ef8a06f..88866e7ef2 100644
--- a/src/app/shared/search/models/search-options.model.ts
+++ b/src/app/shared/search/models/search-options.model.ts
@@ -1,8 +1,11 @@
-import { hasValue, isNotEmpty } from '../../empty.util';
-import { URLCombiner } from '../../../core/url-combiner/url-combiner';
-import { SearchFilter } from './search-filter.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { SearchFilter } from './search-filter.model';
 
 /**
  * This model class represents all parameters needed to request information about a certain search request
@@ -20,14 +23,14 @@ export class SearchOptions {
     options: {
       configuration?: string, scope?: string, query?: string, dsoTypes?: DSpaceObjectType[], filters?: SearchFilter[],
       fixedFilter?: string
-    }
+    },
   ) {
-      this.configuration = options.configuration;
-      this.scope = options.scope;
-      this.query = options.query;
-      this.dsoTypes = options.dsoTypes;
-      this.filters = options.filters;
-      this.fixedFilter = options.fixedFilter;
+    this.configuration = options.configuration;
+    this.scope = options.scope;
+    this.query = options.query;
+    this.dsoTypes = options.dsoTypes;
+    this.filters = options.filters;
+    this.fixedFilter = options.fixedFilter;
   }
 
   /**
diff --git a/src/app/shared/search/models/search-query-response.model.ts b/src/app/shared/search/models/search-query-response.model.ts
index a436a7c045..961095e5f3 100644
--- a/src/app/shared/search/models/search-query-response.model.ts
+++ b/src/app/shared/search/models/search-query-response.model.ts
@@ -1,6 +1,7 @@
 import { autoserialize } from 'cerialize';
-import { PageInfo } from '../../../core/shared/page-info.model';
+
 import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
 
 /**
  * Class representing the response returned by the server when performing a search request
@@ -10,44 +11,44 @@ export abstract class SearchQueryResponse<T> extends PaginatedList<T> {
    * The scope used in the search request represented by the UUID of a DSpaceObject
    */
   @autoserialize
-  scope: string;
+    scope: string;
 
   /**
    * The search query used in the search request
    */
   @autoserialize
-  query: string;
+    query: string;
 
   /**
    * The currently active filters used in the search request
    */
   @autoserialize
-  appliedFilters: any[]; // TODO
+    appliedFilters: any[]; // TODO
 
   /**
    * The sort parameters used in the search request
    */
   @autoserialize
-  sort: any; // TODO
+    sort: any; // TODO
 
   /**
    * The sort parameters used in the search request
    */
   @autoserialize
-  configuration: string;
+    configuration: string;
 
   /**
    * Pagination configuration for this response
    */
   @autoserialize
-  pageInfo: PageInfo;
+    pageInfo: PageInfo;
 
   /**
    * The results for this query
    */
   @autoserialize
-  page: T[];
+    page: T[];
 
   @autoserialize
-  facets: any; // TODO
+    facets: any; // TODO
 }
diff --git a/src/app/shared/search/models/search-result.model.ts b/src/app/shared/search/models/search-result.model.ts
index 6079c4af63..b2bc167c81 100644
--- a/src/app/shared/search/models/search-result.model.ts
+++ b/src/app/shared/search/models/search-result.model.ts
@@ -1,12 +1,19 @@
-import { autoserialize, deserialize } from 'cerialize';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../../../core/cache/builders/build-decorators';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { HALLink } from '../../../core/shared/hal-link.model';
-import { MetadataMap } from '../../../core/shared/metadata.models';
-import { excludeFromEquals, fieldsForEquals } from '../../../core/utilities/equals.decorators';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { HALResource } from '../../../core/shared/hal-resource.model';
+import { MetadataMap } from '../../../core/shared/metadata.models';
+import {
+  excludeFromEquals,
+  fieldsForEquals,
+} from '../../../core/utilities/equals.decorators';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { SEARCH_RESULT } from './types/search-result.resource-type';
 
 /**
@@ -26,13 +33,13 @@ export class SearchResult<T extends DSpaceObject> extends ListableObject impleme
    */
   @excludeFromEquals
   @autoserialize
-  hitHighlights: MetadataMap;
+    hitHighlights: MetadataMap;
 
   /**
    * The {@link HALLink}s for this SearchResult
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     indexableObject: HALLink;
   };
@@ -41,7 +48,7 @@ export class SearchResult<T extends DSpaceObject> extends ListableObject impleme
    * The DSpaceObject that was found
    */
   @fieldsForEquals('uuid')
-  indexableObject: T;
+    indexableObject: T;
 
   /**
    * Method that returns as which type of object this object should be rendered
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..1172db80de 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
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
-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';
-import { Router } from '@angular/router';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
 import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
-import { SearchFilter } from '../models/search-filter.model';
+import { Process } from '../../../process-page/processes/process.model';
+import { Script } from '../../../process-page/scripts/script.model';
+import { NotificationsService } from '../../notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../remote-data.utils';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilter } from '../models/search-filter.model';
+import { SearchExportCsvComponent } from './search-export-csv.component';
 
 describe('SearchExportCsvComponent', () => {
   let component: SearchExportCsvComponent;
@@ -25,8 +33,8 @@ 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 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({
     configuration: 'test-configuration',
@@ -35,17 +43,17 @@ describe('SearchExportCsvComponent', () => {
     filters: [
       new SearchFilter('f.filter1', ['filter1value1,equals', 'filter1value2,equals']),
       new SearchFilter('f.filter2', ['filter2value1,contains']),
-      new SearchFilter('f.filter3', ['[2000 TO 2001]'], 'equals')
-    ]
+      new SearchFilter('f.filter3', ['[2000 TO 2001]'], 'equals'),
+    ],
   });
 
   function initBeforeEachAsync() {
     scriptDataService = jasmine.createSpyObj('scriptDataService', {
       findById: createSuccessfulRemoteDataObject$(script),
-      invoke: createSuccessfulRemoteDataObject$(process)
+      invoke: createSuccessfulRemoteDataObject$(process),
     });
     authorizationDataService = jasmine.createSpyObj('authorizationService', {
-      isAuthorized: observableOf(true)
+      isAuthorized: observableOf(true),
     });
 
     notificationsService = new NotificationsServiceStub();
@@ -55,11 +63,11 @@ describe('SearchExportCsvComponent', () => {
       declarations: [SearchExportCsvComponent],
       imports: [TranslateModule.forRoot(), NgbModule],
       providers: [
-        {provide: ScriptDataService, useValue: scriptDataService},
-        {provide: AuthorizationDataService, useValue: authorizationDataService},
-        {provide: NotificationsService, useValue: notificationsService},
-        {provide: Router, useValue: router},
-      ]
+        { provide: ScriptDataService, useValue: scriptDataService },
+        { provide: AuthorizationDataService, useValue: authorizationDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
+      ],
     }).compileComponents();
   }
 
@@ -132,13 +140,13 @@ describe('SearchExportCsvComponent', () => {
       component.export();
       expect(scriptDataService.invoke).toHaveBeenCalledWith('metadata-export-search',
         [
-          {name: '-q', value: searchConfig.query},
-          {name: '-s', value: searchConfig.scope},
-          {name: '-c', value: searchConfig.configuration},
-          {name: '-f', value: 'filter1,equals=filter1value1'},
-          {name: '-f', value: 'filter1,equals=filter1value2'},
-          {name: '-f', value: 'filter2,contains=filter2value1'},
-          {name: '-f', value: 'filter3,equals=[2000 TO 2001]'},
+          { name: '-q', value: searchConfig.query },
+          { name: '-s', value: searchConfig.scope },
+          { name: '-c', value: searchConfig.configuration },
+          { name: '-f', value: 'filter1,equals=filter1value1' },
+          { name: '-f', value: 'filter1,equals=filter1value2' },
+          { name: '-f', value: 'filter2,contains=filter2value1' },
+          { name: '-f', value: 'filter3,equals=[2000 TO 2001]' },
         ], []);
 
       component.searchConfig = null;
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..69272b4ac4 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,17 +1,28 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
-import { ScriptDataService } from '../../../core/data/processes/script-data.service';
-import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
-import { map } 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';
-import { RemoteData } from '../../../core/data/remote-data';
-import { Process } from '../../../process-page/processes/process.model';
-import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
-import { NotificationsService } from '../../notifications/notifications.service';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { AuthorizationDataService } from '../../../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../../../core/data/feature-authorization/feature-id';
+import { ScriptDataService } from '../../../core/data/processes/script-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { getFirstCompletedRemoteData } from '../../../core/shared/operators';
+import { getProcessDetailRoute } from '../../../process-page/process-page-routing.paths';
+import { Process } from '../../../process-page/processes/process.model';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { NotificationsService } from '../../notifications/notifications.service';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 
 @Component({
@@ -43,20 +54,20 @@ export class SearchExportCsvComponent implements OnInit {
               private authorizationDataService: AuthorizationDataService,
               private notificationsService: NotificationsService,
               private translateService: TranslateService,
-              private router: Router
+              private router: Router,
   ) {
   }
 
   ngOnInit(): void {
     const scriptExists$ = this.scriptDataService.findById('metadata-export-search').pipe(
       getFirstCompletedRemoteData(),
-      map((rd) => rd.isSuccess && hasValue(rd.payload))
+      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)
+      map(([scriptExists, isAuthorized]: [boolean, boolean]) => scriptExists && isAuthorized),
     );
   }
 
@@ -67,13 +78,13 @@ export class SearchExportCsvComponent implements OnInit {
     const parameters = [];
     if (hasValue(this.searchConfig)) {
       if (isNotEmpty(this.searchConfig.query)) {
-        parameters.push({name: '-q', value: this.searchConfig.query});
+        parameters.push({ name: '-q', value: this.searchConfig.query });
       }
       if (isNotEmpty(this.searchConfig.scope)) {
-        parameters.push({name: '-s', value: this.searchConfig.scope});
+        parameters.push({ name: '-s', value: this.searchConfig.scope });
       }
       if (isNotEmpty(this.searchConfig.configuration)) {
-        parameters.push({name: '-c', value: this.searchConfig.configuration});
+        parameters.push({ name: '-c', value: this.searchConfig.configuration });
       }
       if (isNotEmpty(this.searchConfig.filters)) {
         this.searchConfig.filters.forEach((filter) => {
@@ -89,15 +100,28 @@ export class SearchExportCsvComponent implements OnInit {
                 filterValue = value.substring(0, value.lastIndexOf(','));
               }
               const valueToAdd = `${filter.key.substring(2)},${operator}=${filterValue}`;
-              parameters.push({name: '-f', value: valueToAdd});
+              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(
-      getFirstCompletedRemoteData()
+      getFirstCompletedRemoteData(),
     ).subscribe((rd: RemoteData<Process>) => {
       if (rd.hasSucceeded) {
         this.notificationsService.success(this.translateService.get('metadata-export-search.submit.success'));
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..cdba401743 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
@@ -7,7 +7,7 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
index 8f61f5ebf1..9e01e19d02 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
@@ -1,7 +1,7 @@
 .filters {
     a {
         color: var(--bs-body-color);
-        &:hover, &focus {
+        &:hover, &:focus {
           text-decoration: none;
         }
         span.badge {
diff --git a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index 6dcb47ce9f..f19b9b67d4 100644
--- a/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
@@ -1,13 +1,20 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
 
 @Component({
   selector: 'ds-search-authority-filter',
   styleUrls: ['./search-authority-filter.component.scss'],
   templateUrl: './search-authority-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
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..aaf533e481 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
@@ -7,7 +7,7 @@
         </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
index c9da8500d0..10fbdcb570 100644
--- a/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
@@ -1,13 +1,20 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { FilterType } from '../../../models/filter-type.model';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 
 @Component({
   selector: 'ds-search-boolean-filter',
   styleUrls: ['./search-boolean-filter.component.scss'],
   templateUrl: './search-boolean-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
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 3c15eff127..9a4bffadb8 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
@@ -2,13 +2,12 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="addQueryParams" queryParamsHandling="merge">
-  <label class="mb-0">
-    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch"/>
-    <span class="filter-value px-1">
+  <label class="mb-0 d-flex w-100">
+    <input type="checkbox" [checked]="false" class="my-1 align-self-stretch filter-checkbox"/>
+    <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} }}
     </span>
   </label>
-  <span class="float-right filter-value-count ml-auto">
-    <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
-  </span>
+
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
index 74cede54a8..9f214a4bac 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
@@ -1,9 +1,17 @@
 a {
     color: var(--bs-body-color);
-    &:hover, &focus {
+    &:hover, &:focus {
         text-decoration: none;
     }
     span.badge {
         vertical-align: text-top;
     }
 }
+
+.break-facet {
+    word-break: break-word;
+}
+
+.filter-checkbox {
+    height: fit-content;
+}
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 d92f6444ac..c387be3eb9 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
@@ -1,23 +1,32 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { RouterStub } from '../../../../../testing/router.stub';
 import { SearchServiceStub } from '../../../../../testing/search-service.stub';
+import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { FilterType } from '../../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchFacetOptionComponent } from './search-facet-option.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 
 describe('SearchFacetOptionComponent', () => {
   let comp: SearchFacetOptionComponent;
@@ -43,7 +52,7 @@ describe('SearchFacetOptionComponent', () => {
     filterType: FilterType.authority,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
 
   const value: FacetValue = {
@@ -52,8 +61,8 @@ describe('SearchFacetOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link2' },
-      search: { href: `` }
-    }
+      search: { href: `` },
+    },
   };
 
   const selectedValue: FacetValue = {
@@ -62,8 +71,8 @@ describe('SearchFacetOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link1' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1},${operator}` },
+    },
   };
 
   const authorityValue: FacetValue = {
@@ -72,8 +81,8 @@ describe('SearchFacetOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'authorityValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` },
+    },
   };
 
   const searchLink = '/search';
@@ -89,7 +98,7 @@ describe('SearchFacetOptionComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
-      declarations: [SearchFacetOptionComponent],
+      declarations: [SearchFacetOptionComponent, ShortNumberPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
@@ -97,8 +106,8 @@ describe('SearchFacetOptionComponent', () => {
         {
           provide: SearchConfigurationService, useValue: {
             paginationID: 'page-id',
-            searchOptions: observableOf({})
-          }
+            searchOptions: observableOf({}),
+          },
         },
         {
           provide: SearchFilterService, useValue: {
@@ -109,14 +118,14 @@ describe('SearchFacetOptionComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetOptionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -138,7 +147,7 @@ describe('SearchFacetOptionComponent', () => {
       (comp as any).updateAddParams(selectedValues);
       expect(comp.addQueryParams).toEqual({
         [mockFilterConfig.paramName]: [`${value1},${operator}`, value.value + ',equals'],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
@@ -153,7 +162,7 @@ describe('SearchFacetOptionComponent', () => {
       (comp as any).updateAddParams(selectedValues);
       expect(comp.addQueryParams).toEqual({
         [mockAuthorityFilterConfig.paramName]: [value1 + ',equals', `${value2},${operator}`],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
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..8f2656c56f 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
@@ -1,16 +1,26 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { FacetValue } from '../../../../models/facet-value.model';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { getFacetValueForType } from '../../../../search.utils';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -67,7 +77,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
   ) {
   }
 
@@ -109,7 +119,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
     const page = this.paginationService.getPageParam(this.searchConfigService.paginationID);
     this.addQueryParams = {
       [this.filterConfig.paramName]: [...selectedValues.map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)), this.getFacetValue()],
-      [page]: 1
+      [page]: 1,
     };
   }
 
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 798038503f..0e6090b0fa 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
@@ -3,6 +3,6 @@
    [queryParams]="changeQueryParams" queryParamsHandling="merge">
   <span class="filter-value px-1">{{filterValue.label}}</span>
   <span class="float-right filter-value-count ml-auto">
-                        <span class="badge badge-secondary badge-pill">{{filterValue.count}}</span>
-                    </span>
+    <span class="badge badge-secondary badge-pill">{{filterValue.count | dsShortNumber}}</span>
+  </span>
 </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index 7eb0cb8a54..aeee40f781 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
@@ -1,24 +1,36 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
-import { FilterType } from '../../../../models/filter-type.model';
-import { FacetValue } from '../../../../models/facet-value.model';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
-import { SearchServiceStub } from '../../../../../testing/search-service.stub';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../testing/router.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
-import { By } from '@angular/platform-browser';
-import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
-import { RANGE_FILTER_MAX_SUFFIX, RANGE_FILTER_MIN_SUFFIX } from '../../search-range-filter/search-range-filter.component';
 import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
+import { RouterStub } from '../../../../../testing/router.stub';
+import { SearchServiceStub } from '../../../../../testing/search-service.stub';
+import { ShortNumberPipe } from '../../../../../utils/short-number.pipe';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { FilterType } from '../../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  RANGE_FILTER_MAX_SUFFIX,
+  RANGE_FILTER_MIN_SUFFIX,
+} from '../../search-range-filter/search-range-filter.component';
+import { SearchFacetRangeOptionComponent } from './search-facet-range-option.component';
 
 describe('SearchFacetRangeOptionComponent', () => {
   let comp: SearchFacetRangeOptionComponent;
@@ -40,12 +52,12 @@ describe('SearchFacetRangeOptionComponent', () => {
     count: 20,
     _links: {
       self: {
-        href: ''
+        href: '',
       },
       search: {
-        href: ''
-      }
-    }
+        href: '',
+      },
+    },
   };
 
   const searchLink = '/search';
@@ -60,7 +72,7 @@ describe('SearchFacetRangeOptionComponent', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
-      declarations: [SearchFacetRangeOptionComponent],
+      declarations: [SearchFacetRangeOptionComponent, ShortNumberPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
         { provide: Router, useValue: new RouterStub() },
@@ -68,8 +80,8 @@ describe('SearchFacetRangeOptionComponent', () => {
         {
           provide: SearchConfigurationService, useValue: {
             searchOptions: observableOf({}),
-            paginationId: 'page-id'
-          }
+            paginationId: 'page-id',
+          },
         },
         {
           provide: SearchFilterService, useValue: {
@@ -79,14 +91,14 @@ describe('SearchFacetRangeOptionComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetRangeOptionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -110,18 +122,18 @@ describe('SearchFacetRangeOptionComponent', () => {
         count: 20,
         _links: {
           self: {
-            href: ''
+            href: '',
           },
           search: {
-            href: ''
-          }
-        }
+            href: '',
+          },
+        },
       };
       (comp as any).updateChangeParams();
       expect(comp.changeQueryParams).toEqual({
         [mockFilterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: ['50'],
         [mockFilterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: ['60'],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index b08a54e42b..39bfd6fe8c 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
@@ -1,19 +1,28 @@
-import { Observable, Subscription } from 'rxjs';
-import { map } from 'rxjs/operators';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { Router } from '@angular/router';
-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 {
-  RANGE_FILTER_MAX_SUFFIX,
-  RANGE_FILTER_MIN_SUFFIX
-} from '../../search-range-filter/search-range-filter.component';
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { hasValue } from '../../../../../empty.util';
 import { currentPath } from '../../../../../utils/route.utils';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  RANGE_FILTER_MAX_SUFFIX,
+  RANGE_FILTER_MIN_SUFFIX,
+} from '../../search-range-filter/search-range-filter.component';
 
 const rangeDelimiter = '-';
 
@@ -67,7 +76,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
   ) {
   }
 
@@ -110,7 +119,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
     this.changeQueryParams = {
       [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: [min],
       [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: [max],
-      [page]: 1
+      [page]: 1,
     };
   }
 
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 d6cb7a3d79..42fa7f9e6b 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
@@ -2,9 +2,9 @@
    [tabIndex]="-1"
    [routerLink]="[searchLink]"
    [queryParams]="removeQueryParams" queryParamsHandling="merge">
-  <label class="mb-0">
-    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
-    <span class="filter-value pl-1 text-capitalize">
+  <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 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-options/search-facet-selected-option/search-facet-selected-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
index 74cede54a8..9f214a4bac 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
@@ -1,9 +1,17 @@
 a {
     color: var(--bs-body-color);
-    &:hover, &focus {
+    &:hover, &:focus {
         text-decoration: none;
     }
     span.badge {
         vertical-align: text-top;
     }
 }
+
+.break-facet {
+    word-break: break-word;
+}
+
+.filter-checkbox {
+    height: fit-content;
+}
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index 15e418842f..c5cdd0c0cf 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
@@ -1,22 +1,30 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
-import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 import { RouterStub } from '../../../../../testing/router.stub';
 import { SearchServiceStub } from '../../../../../testing/search-service.stub';
 import { FacetValue } from '../../../../models/facet-value.model';
 import { FilterType } from '../../../../models/filter-type.model';
 import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { SearchFacetSelectedOptionComponent } from './search-facet-selected-option.component';
-import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
-import { PaginationServiceStub } from '../../../../../testing/pagination-service.stub';
 
 describe('SearchFacetSelectedOptionComponent', () => {
   let comp: SearchFacetSelectedOptionComponent;
@@ -42,7 +50,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
     filterType: FilterType.authority,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
 
   const searchLink = '/search';
@@ -52,8 +60,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link1' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value1}` },
+    },
   };
   const selectedValue2: FacetValue = {
     label: value2,
@@ -61,8 +69,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value2}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName1}=${value2}` },
+    },
   };
   const selectedAuthorityValue: FacetValue = {
     label: label1,
@@ -70,8 +78,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedAuthorityValue-self-link1' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value1},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value1},${operator}` },
+    },
   };
   const selectedAuthorityValue2: FacetValue = {
     label: label2,
@@ -79,8 +87,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'selectedAuthorityValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` },
+    },
   };
   const selectedValues = [selectedValue, selectedValue2];
   const selectedAuthorityValues = [selectedAuthorityValue, selectedAuthorityValue2];
@@ -90,8 +98,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 1,
     _links: {
       self: { href: 'facetValue-self-link2' },
-      search: { href: `` }
-    }
+      search: { href: `` },
+    },
   };
   const authorityValue: FacetValue = {
     label: label2,
@@ -99,8 +107,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
     count: 20,
     _links: {
       self: { href: 'authorityValue-self-link2' },
-      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` }
-    }
+      search: { href: `http://test.org/api/discover/search/objects?f.${filterName2}=${value2},${operator}` },
+    },
   };
   const selectedValues$ = observableOf(selectedValues);
   const selectedAuthorityValues$ = observableOf(selectedAuthorityValues);
@@ -122,8 +130,8 @@ describe('SearchFacetSelectedOptionComponent', () => {
         { provide: PaginationService, useValue: paginationService },
         {
           provide: SearchConfigurationService, useValue: {
-            searchOptions: observableOf({})
-          }
+            searchOptions: observableOf({}),
+          },
         },
         {
           provide: SearchFilterService, useValue: {
@@ -134,14 +142,14 @@ describe('SearchFacetSelectedOptionComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetSelectedOptionComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -163,7 +171,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
       (comp as any).updateRemoveParams(selectedValues);
       expect(comp.removeQueryParams).toEqual({
         [mockFilterConfig.paramName]: [`${value1},equals`],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
@@ -179,7 +187,7 @@ describe('SearchFacetSelectedOptionComponent', () => {
       (comp as any).updateRemoveParams(selectedAuthorityValues);
       expect(comp.removeQueryParams).toEqual({
         [mockAuthorityFilterConfig.paramName]: [`${value1},${operator}`],
-        ['page-id.page']: 1
+        ['page-id.page']: 1,
       });
     });
   });
diff --git a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 4566b882eb..f6f2c35874 100644
--- a/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
@@ -1,15 +1,25 @@
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+
+import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { hasValue } from '../../../../../empty.util';
-import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
-import { FacetValue } from '../../../../models/facet-value.model';
 import { currentPath } from '../../../../../utils/route.utils';
+import { FacetValue } from '../../../../models/facet-value.model';
+import { SearchFilterConfig } from '../../../../models/search-filter-config.model';
 import { getFacetValueForType } from '../../../../search.utils';
-import { PaginationService } from '../../../../../../core/pagination/pagination.service';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
@@ -60,7 +70,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
               protected filterService: SearchFilterService,
               protected searchConfigService: SearchConfigurationService,
               protected router: Router,
-              protected paginationService: PaginationService
+              protected paginationService: PaginationService,
   ) {
   }
 
@@ -95,7 +105,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
       [this.filterConfig.paramName]: selectedValues
         .filter((facetValue: FacetValue) => facetValue.label !== this.selectedValue.label)
         .map((facetValue: FacetValue) => this.getFacetValue(facetValue)),
-      [page]: 1
+      [page]: 1,
     };
   }
   /**
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..896319e666 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
@@ -1,19 +1,26 @@
-import { Component, Injector, Input, OnInit } from '@angular/core';
-import { renderFilterType } from '../search-filter-type-decorator';
-import { FilterType } from '../../../models/filter-type.model';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { BehaviorSubject } from 'rxjs';
+
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
-  REFRESH_FILTER
+  REFRESH_FILTER,
+  SCOPE,
 } from '../../../../../core/shared/search/search-filter.service';
-import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
 import { SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
-import { BehaviorSubject } from 'rxjs';
+import { renderFilterType } from '../search-filter-type-decorator';
 
 @Component({
   selector: 'ds-search-facet-filter-wrapper',
-  templateUrl: './search-facet-filter-wrapper.component.html'
+  templateUrl: './search-facet-filter-wrapper.component.html',
 })
 
 /**
@@ -35,6 +42,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,9 +68,10 @@ 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
+      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..f130b19f54 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
@@ -1,29 +1,41 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { FacetValue } from '../../../models/facet-value.model';
-import { FormsModule } from '@angular/forms';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RouterStub } from '../../../../testing/router.stub';
-import { Router } from '@angular/router';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { SearchFacetFilterComponent } from './search-facet-filter.component';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
+import { RouterStub } from '../../../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../../../testing/search-service.stub';
+import { FacetValue } from '../../../models/facet-value.model';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchFacetFilterComponent } from './search-facet-filter.component';
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
@@ -37,7 +49,7 @@ describe('SearchFacetFilterComponent', () => {
     filterType: FilterType.text,
     hasFacets: false,
     isOpenByDefault: false,
-    pageSize: 2
+    pageSize: 2,
   });
   const values: FacetValue[] = [
     {
@@ -46,37 +58,37 @@ describe('SearchFacetFilterComponent', () => {
       count: 52,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value2,
       value: value2,
       count: 20,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value3,
       value: value3,
       count: 5,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
-    }
+          href: '',
+        },
+      },
+    },
   ];
 
   const searchLink = '/search';
@@ -99,6 +111,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),
@@ -108,14 +121,14 @@ describe('SearchFacetFilterComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFacetFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -204,7 +217,7 @@ describe('SearchFacetFilterComponent', () => {
       comp.selectedValues$ = observableOf(selectedValues.map((value) =>
         Object.assign(new FacetValue(), {
           label: value,
-          value: value
+          value: value,
         })));
       fixture.detectChanges();
       spyOn(comp, 'getSearchLink').and.returnValue(searchUrl);
@@ -214,7 +227,7 @@ describe('SearchFacetFilterComponent', () => {
       comp.onSubmit(testValue + ',equals');
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
         queryParams: { [mockFilterConfig.paramName]: [...selectedValues.map((value) => `${value},equals`), `${testValue},equals`] },
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     });
 
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..7a1e75dce5 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
@@ -1,40 +1,67 @@
-import { animate, state, style, transition, trigger } from '@angular/animations';
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  animate,
+  state,
+  style,
+  transition,
+  trigger,
+} from '@angular/animations';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
 import {
   BehaviorSubject,
   combineLatest as observableCombineLatest,
   Observable,
   of as observableOf,
   Subject,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, map, mergeMap, switchMap, take, tap } from 'rxjs/operators';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { PaginatedList } from '../../../../../core/data/paginated-list.model';
 import { RemoteData } from '../../../../../core/data/remote-data';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../../empty.util';
-import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
-import { FacetValue } from '../../../models/facet-value.model';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
 import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
-import { getFirstSucceededRemoteData } from '../../../../../core/shared/operators';
-import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
-import { SearchOptions } from '../../../models/search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { currentPath } from '../../../../utils/route.utils';
-import { getFacetValueForType, stripOperatorFromFilterValue } from '../../../search.utils';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../../../../empty.util';
+import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { createPendingRemoteDataObject } from '../../../../remote-data.utils';
+import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
+import { currentPath } from '../../../../utils/route.utils';
+import { FacetValue } from '../../../models/facet-value.model';
 import { FacetValues } from '../../../models/facet-values.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchOptions } from '../../../models/search-options.model';
+import {
+  getFacetValueForType,
+  stripOperatorFromFilterValue,
+} from '../../../search.utils';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -104,7 +131,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,16 +143,19 @@ 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({}, options, {
+        scope: this.scope,
+      })),
+    );
     this.subs.push(
       this.searchOptions$.subscribe(() => this.updateFilterValueList()),
       this.refreshFilters.asObservable().pipe(
         filter((toRefresh: boolean) => toRefresh),
         // NOTE This is a workaround, otherwise retrieving filter values returns tha old cached response
         debounceTime((100)),
-        mergeMap(() => this.retrieveFilterValues(false))
-      ).subscribe()
+        mergeMap(() => this.retrieveFilterValues(false)),
+      ).subscribe(),
     );
     this.retrieveFilterValues().subscribe();
   }
@@ -236,12 +268,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
                     return {
                       displayValue: this.getDisplayValue(facet, data),
                       query: this.getFacetValue(facet),
-                      value: stripOperatorFromFilterValue(this.getFacetValue(facet))
+                      value: stripOperatorFromFilterValue(this.getFacetValue(facet)),
                     };
                   });
-                }
+                },
               ));
-        }
+        },
       );
     } else {
       this.filterSearchResults = observableOf([]);
@@ -261,10 +293,10 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               {
                 [this.filterConfig.paramName]: [
                   ...selectedValues.map((facet) => this.getFacetValue(facet)),
-                  data
-                ]
+                  data,
+                ],
               },
-            queryParamsHandling: 'merge'
+            queryParamsHandling: 'merge',
           });
           this.filter = '';
         }
@@ -293,12 +325,12 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
               this.isLastPage$.next(hasNoValue(rd?.payload?.next));
             }),
             map((rd: RemoteData<FacetValues>) => ({
-                values: observableOf(rd),
-                page: page
-              })
-            )
+              values: observableOf(rd),
+              page: page,
+            }),
+            ),
           );
-      })
+      }),
     );
 
     let filterValues = [];
@@ -324,20 +356,20 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
           map((selectedValues) => {
             return selectedValues.map((value: string) => {
               const fValue = [].concat(...rd.payload.map((page) => page.page))
-                               .find((facetValue: FacetValue) => this.getFacetValue(facetValue) === value);
+                .find((facetValue: FacetValue) => this.getFacetValue(facetValue) === value);
               if (hasValue(fValue)) {
                 return fValue;
               }
               const filterValue = stripOperatorFromFilterValue(value);
               return Object.assign(new FacetValue(), { label: filterValue, value: filterValue });
             });
-          })
+          }),
         );
       }),
       tap((rd: RemoteData<PaginatedList<FacetValue>[]>) => {
         this.animationState = 'ready';
         this.filterValues$.next(rd);
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
index e1c8446b3c..1d912150e3 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
@@ -19,7 +19,7 @@ export const SearchFilterActionTypes = {
   TOGGLE: type('dspace/search-filter/TOGGLE'),
   DECREMENT_PAGE: type('dspace/search-filter/DECREMENT_PAGE'),
   INCREMENT_PAGE: type('dspace/search-filter/INCREMENT_PAGE'),
-  RESET_PAGE: type('dspace/search-filter/RESET_PAGE')
+  RESET_PAGE: type('dspace/search-filter/RESET_PAGE'),
 };
 
 export class SearchFilterAction implements Action {
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 13457cc008..0aefa0c6c1 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,24 @@
      [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-label]="((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate"
+          [attr.aria-expanded]="(collapsed$ | async) !== true"
+          [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"
   >
-    <h5 class="d-inline-block mb-0">
+    <span class="h4 d-inline-block text-left mt-auto mb-auto">
       {{'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.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 7abe45ca8c..3b622b2582 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -1,19 +1,29 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { SearchService } from '../../../../core/shared/search/search.service';
-import { SearchFilterComponent } from './search-filter.component';
-import { SearchFilterConfig } from '../../models/search-filter-config.model';
-import { FilterType } from '../../models/filter-type.model';
-import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { SequenceService } from '../../../../core/shared/sequence.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
 import { BrowserOnlyMockPipe } from '../../../testing/browser-only-mock.pipe';
+import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
+import { FilterType } from '../../models/filter-type.model';
+import { SearchFilterConfig } from '../../models/search-filter-config.model';
+import { SearchFilterComponent } from './search-filter.component';
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
@@ -27,7 +37,7 @@ describe('SearchFilterComponent', () => {
     name: filterName1,
     filterType: FilterType.text,
     hasFacets: false,
-    isOpenByDefault: false
+    isOpenByDefault: false,
   });
   const mockFilterService = {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -47,7 +57,7 @@ describe('SearchFilterComponent', () => {
     },
     isCollapsed: (filter) => {
       return observableOf(true);
-    }
+    },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 
   };
@@ -55,7 +65,7 @@ describe('SearchFilterComponent', () => {
   let sequenceService;
   const mockResults = observableOf(['test', 'data']);
   const searchServiceStub = {
-    getFacetValuesFor: (filter) => mockResults
+    getFacetValuesFor: (filter) => mockResults,
   };
 
   beforeEach(waitForAsync(() => {
@@ -71,14 +81,14 @@ describe('SearchFilterComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         {
           provide: SearchFilterService,
-          useValue: mockFilterService
+          useValue: mockFilterService,
         },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SequenceService, useValue: sequenceService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..b67ab1e31a 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,16 +1,33 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  startWith,
+  switchMap,
+  take,
+} from 'rxjs/operators';
 
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-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 { 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';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
 import { SequenceService } from '../../../../core/shared/sequence.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
+import { slide } from '../../../animations/slide';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { SearchFilterConfig } from '../../models/search-filter-config.model';
 
 @Component({
   selector: 'ds-search-filter',
@@ -38,6 +55,11 @@ export class SearchFilterComponent implements OnInit {
    */
   @Input() refreshFilters: BehaviorSubject<boolean>;
 
+  /**
+   * The current scope
+   */
+  @Input() scope: string;
+
   /**
    * True when the filter is 100% collapsed in the UI
    */
@@ -152,11 +174,20 @@ export class SearchFilterComponent implements OnInit {
   }
 
   get regionId(): string {
-    return `search-filter-region-${this.sequenceId}`;
+    if (this.inPlaceSearch) {
+      return `search-filter-region-${this.sequenceId}`;
+    } else {
+      return `search-filter-region-home-${this.sequenceId}`;
+    }
+
   }
 
   get toggleId(): string {
-    return `search-filter-toggle-${this.sequenceId}`;
+    if (this.inPlaceSearch) {
+      return `search-filter-toggle-${this.sequenceId}`;
+    } else {
+      return `search-filter-toggle-home-${this.sequenceId}`;
+    }
   }
 
   /**
@@ -171,12 +202,15 @@ export class SearchFilterComponent implements OnInit {
         } else {
           return this.searchConfigService.searchOptions.pipe(
             switchMap((options) => {
-                return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
-                  filter((RD) => !RD.isLoading),
-                  map((valuesRD) => {
-                    return valuesRD.payload?.totalElements > 0;
-                  }),);
+              if (hasValue(this.scope)) {
+                options.scope = this.scope;
               }
+              return this.searchService.getFacetValuesFor(this.filter, 1, options).pipe(
+                filter((RD) => !RD.isLoading),
+                map((valuesRD) => {
+                  return valuesRD.payload?.totalElements > 0;
+                }));
+            },
             ));
         }
       }),
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
index ae8108662d..114147606e 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
@@ -1,4 +1,6 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
+
 import {
   SearchFilterCollapseAction,
   SearchFilterDecrementPageAction,
@@ -6,7 +8,7 @@ import {
   SearchFilterIncrementPageAction,
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
-  SearchFilterToggleAction
+  SearchFilterToggleAction,
 } from './search-filter.actions';
 import { filterReducer } from './search-filter.reducer';
 
@@ -59,6 +61,7 @@ describe('filterReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set filterCollapsed to false in response to the EXPAND action', () => {
@@ -77,6 +80,10 @@ describe('filterReducer', () => {
 
     const action = new SearchFilterExpandAction(filterName1);
     filterReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should flip the value of filterCollapsed in response to the TOGGLE action', () => {
@@ -98,6 +105,10 @@ describe('filterReducer', () => {
 
     const action = new SearchFilterToggleAction(filterName1);
     filterReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set filterCollapsed to true in response to the INITIALIZE action with isOpenByDefault to false when no state has been set for this filter', () => {
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
index 1109e4ea41..f38db42b26 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
@@ -1,4 +1,8 @@
-import { SearchFilterAction, SearchFilterActionTypes, SearchFilterInitializeAction } from './search-filter.actions';
+import {
+  SearchFilterAction,
+  SearchFilterActionTypes,
+  SearchFilterInitializeAction,
+} from './search-filter.actions';
 
 /**
  * Interface that represents the state for a single filters
@@ -32,8 +36,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: !initAction.initiallyExpanded,
-          page: 1
-        }
+          page: 1,
+        },
       });
       return state;
     }
@@ -42,8 +46,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: true,
-          page: state[action.filterName].page
-        }
+          page: state[action.filterName].page,
+        },
       });
     }
 
@@ -51,8 +55,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: false,
-          page: state[action.filterName].page
-        }
+          page: state[action.filterName].page,
+        },
       });
 
     }
@@ -62,8 +66,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: state[action.filterName].filterCollapsed,
-          page: (page >= 1 ? page : 1)
-        }
+          page: (page >= 1 ? page : 1),
+        },
       });
     }
 
@@ -71,8 +75,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: state[action.filterName].filterCollapsed,
-          page: state[action.filterName].page + 1
-        }
+          page: state[action.filterName].page + 1,
+        },
       });
 
     }
@@ -80,8 +84,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: state[action.filterName].filterCollapsed,
-          page: 1
-        }
+          page: 1,
+        },
       });
 
     }
@@ -90,8 +94,8 @@ export function filterReducer(state = initialState, action: SearchFilterAction):
       return Object.assign({}, state, {
         [action.filterName]: {
           filterCollapsed: !state[action.filterName].filterCollapsed,
-          page: state[action.filterName].page
-        }
+          page: state[action.filterName].page,
+        },
       });
 
     }
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 49ca6fe3fd..1dc21d64c3 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
@@ -7,7 +7,7 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
@@ -29,3 +29,10 @@
                           ngDefaultControl
     ></ds-filter-input-suggestions>
 </div>
+
+<a *ngIf="vocabularyExists$ | async"
+     href="javascript:void(0);"
+     id="show-{{filterConfig.name}}-tree"
+     (click)="showVocabularyTree()">
+  {{'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 9302e66d98..80ab4bb463 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
@@ -1,155 +1,177 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
+import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../../../../config/app-config.interface';
+import { environment } from '../../../../../../environments/environment.test';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { RequestEntryState } from '../../../../../core/data/request-entry-state.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { SearchFiltersComponent } from '../../search-filters.component';
-import { Router } from '@angular/router';
-import { RouterStub } from '../../../../testing/router.stub';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { RouterStub } from '../../../../testing/router.stub';
 import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { TranslateModule } from '@ngx-translate/core';
-import {
-  FilterInputSuggestionsComponent
-} from '../../../../input-suggestions/filter-suggestions/filter-input-suggestions.component';
-import { FormsModule } from '@angular/forms';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
 import { FacetValue } from '../../../models/facet-value.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { createPaginatedList } from '../../../../testing/utils.test';
-import { RemoteData } from '../../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../../core/data/paginated-list.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchHierarchyFilterComponent } from './search-hierarchy-filter.component';
 
 describe('SearchHierarchyFilterComponent', () => {
-  let comp: SearchHierarchyFilterComponent;
+
   let fixture: ComponentFixture<SearchHierarchyFilterComponent>;
-  let searchService: SearchService;
-  let router;
+  let showVocabularyTreeLink: DebugElement;
 
-  const value1 = 'testvalue1';
-  const value2 = 'test2';
-  const value3 = 'another value3';
-  const values: FacetValue[] = [
-    {
-      label: value1,
-      value: value1,
-      count: 52,
-      _links: {
-        self: {
-          href: ''
-        },
-        search: {
-          href: ''
-        }
-      }
-    }, {
-      label: value2,
-      value: value2,
-      count: 20,
-      _links: {
-        self: {
-          href: ''
-        },
-        search: {
-          href: ''
-        }
-      }
-    }, {
-      label: value3,
-      value: value3,
-      count: 5,
-      _links: {
-        self: {
-          href: ''
-        },
-        search: {
-          href: ''
-        }
-      }
-    }
-  ];
-  const mockValues = createSuccessfulRemoteDataObject$(createPaginatedList(values));
-
-  const searchFilterServiceStub = {
-    getSelectedValuesForFilter(_filterConfig: SearchFilterConfig): Observable<string[]> {
-      return observableOf(values.map((value: FacetValue) => value.value));
-    },
-    getPage(_paramName: string): Observable<number> {
-      return observableOf(0);
-    },
-    resetPage(_filterName: string): void {
-      // empty
-    }
+  const testSearchLink = 'test-search';
+  const testSearchFilter = 'subject';
+  const VocabularyTreeViewComponent = {
+    select: new EventEmitter<VocabularyEntryDetail>(),
   };
 
-  const remoteDataBuildServiceStub = {
-    aggregate(_input: Observable<RemoteData<FacetValue>>[]): Observable<RemoteData<PaginatedList<FacetValue>[]>> {
-      return createSuccessfulRemoteDataObject$([createPaginatedList(values)]);
-    }
+  const searchService = {
+    getSearchLink: () => testSearchLink,
+    getFacetValuesFor: () => observableOf([]),
+  };
+  const searchFilterService = {
+    getPage: () => observableOf(0),
+  };
+  const router = new RouterStub();
+  const ngbModal = jasmine.createSpyObj('modal', {
+    open: {
+      componentInstance: VocabularyTreeViewComponent,
+    },
+  });
+  const vocabularyService = {
+    searchTopEntries: () => undefined,
   };
 
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
+  beforeEach(() => {
+    return TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        NgbModule,
+        TranslateModule.forRoot(),
+      ],
       declarations: [
         SearchHierarchyFilterComponent,
-        SearchFiltersComponent,
-        FilterInputSuggestionsComponent
       ],
       providers: [
-        { provide: SearchService, useValue: new SearchServiceStub() },
-        { provide: SearchFilterService, useValue: searchFilterServiceStub },
-        { provide: RemoteDataBuildService, useValue: remoteDataBuildServiceStub },
-        { provide: Router, useValue: new RouterStub() },
+        { provide: SearchService, useValue: searchService },
+        { provide: SearchFilterService, useValue: searchFilterService },
+        { provide: RemoteDataBuildService, useValue: {} },
+        { 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: new SearchFilterConfig() },
-        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) }
+        { provide: FILTER_CONFIG, useValue: Object.assign(new SearchFilterConfig(), { name: testSearchFilter }) },
+        { provide: REFRESH_FILTER, useValue: new BehaviorSubject<boolean>(false) },
+        { provide: SCOPE, useValue: undefined },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
-    }).overrideComponent(SearchHierarchyFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
-  })
-  ;
-  const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
-    name: 'filterName1',
-    filterType: FilterType.text,
-    hasFacets: false,
-    isOpenByDefault: false,
-    pageSize: 2
   });
 
-  beforeEach(async () => {
+  function init() {
     fixture = TestBed.createComponent(SearchHierarchyFilterComponent);
-    comp = fixture.componentInstance; // SearchHierarchyFilterComponent test instance
-    comp.filterConfig = mockFilterConfig;
-    searchService = (comp as any).searchService;
-    // @ts-ignore
-    spyOn(searchService, 'getFacetValuesFor').and.returnValue(mockValues);
-    router = (comp as any).router;
     fixture.detectChanges();
+    showVocabularyTreeLink = fixture.debugElement.query(By.css(`a#show-${testSearchFilter}-tree`));
+  }
+
+  describe('if the vocabulary doesn\'t exist', () => {
+
+    beforeEach(() => {
+      spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
+        undefined, 0, 0, RequestEntryState.Error, undefined, undefined, 404,
+      )));
+      init();
+    });
+
+    it('should not show the vocabulary tree link', () => {
+      expect(showVocabularyTreeLink).toBeNull();
+    });
   });
 
-  it('should navigate to the correct filter with the query operator', () => {
-    expect((comp as any).searchService.getFacetValuesFor).toHaveBeenCalledWith(comp.filterConfig, 0, {}, null, true);
+  describe('if the vocabulary exists', () => {
 
-    const searchQuery = 'MARVEL';
-    comp.onSubmit(searchQuery);
+    beforeEach(() => {
+      spyOn(vocabularyService, 'searchTopEntries').and.returnValue(observableOf(new RemoteData(
+        undefined, 0, 0, RequestEntryState.Success, undefined, buildPaginatedList(new PageInfo(), []), 200,
+      )));
+      init();
+    });
 
-    expect(router.navigate).toHaveBeenCalledWith(['', 'search'], Object({
-      queryParams: Object({ [mockFilterConfig.paramName]: [...values.map((value: FacetValue) => `${value.value},equals`), `${searchQuery},query`] }),
-      queryParamsHandling: 'merge'
-    }));
+    it('should show the vocabulary tree link', () => {
+      expect(showVocabularyTreeLink).toBeTruthy();
+    });
+
+    describe('when clicking the vocabulary tree link', () => {
+
+      const alreadySelectedValues = [
+        'already-selected-value-1',
+        'already-selected-value-2',
+      ];
+      const newSelectedValue = 'new-selected-value';
+
+      beforeEach(async () => {
+        fixture.componentInstance.selectedValues$ = observableOf(
+          alreadySelectedValues.map(value => Object.assign(new FacetValue(), { value })),
+        );
+        showVocabularyTreeLink.nativeElement.click();
+        VocabularyTreeViewComponent.select.emit(Object.assign(new VocabularyEntryDetail(), {
+          value: newSelectedValue,
+        }));
+      });
+
+      it('should open the vocabulary tree modal', () => {
+        expect(ngbModal.open).toHaveBeenCalled();
+      });
+
+      describe('when selecting a value from the vocabulary tree', () => {
+
+        it('should add a new search filter to the existing search filters', fakeAsync(() => {
+          tick();
+          expect(router.navigate).toHaveBeenCalledWith([testSearchLink], {
+            queryParams: {
+              [`f.${testSearchFilter}`]: [
+                ...alreadySelectedValues,
+                newSelectedValue,
+              ].map((value => `${value},equals`)),
+            },
+            queryParamsHandling: 'merge',
+          });
+        }));
+      });
+    });
   });
 });
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 b3349a5dd9..c107083bdd 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
@@ -1,21 +1,98 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../../../../config/app-config.interface';
+import { FilterVocabularyConfig } from '../../../../../../config/filter-vocabulary-config';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import {
+  FILTER_CONFIG,
+  IN_PLACE_SEARCH,
+  REFRESH_FILTER,
+  SCOPE,
+  SearchFilterService,
+} from '../../../../../core/shared/search/search-filter.service';
+import { VocabularyEntryDetail } from '../../../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import { VocabularyService } from '../../../../../core/submission/vocabularies/vocabulary.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../../../empty.util';
+import { VocabularyTreeviewModalComponent } from '../../../../form/vocabulary-treeview-modal/vocabulary-treeview-modal.component';
+import { FacetValue } from '../../../models/facet-value.model';
 import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import {
+  addOperatorToFilterValue,
+  getFacetValueForType,
+} from '../../../search.utils';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
-import { addOperatorToFilterValue } from '../../../search.utils';
 
 @Component({
   selector: 'ds-search-hierarchy-filter',
   styleUrls: ['./search-hierarchy-filter.component.scss'],
   templateUrl: './search-hierarchy-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
  * Component that represents a hierarchy facet for a specific filter configuration
  */
 @renderFacetFor(FilterType.hierarchy)
-export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnInit {
+export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent implements OnDestroy, OnInit {
+
+  subscriptions: Subscription[] = [];
+
+  constructor(protected searchService: SearchService,
+              protected filterService: SearchFilterService,
+              protected rdbs: RemoteDataBuildService,
+              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(SCOPE) public scope: string,
+  ) {
+    super(searchService, filterService, rdbs, router, searchConfigService, inPlaceSearch, filterConfig, refreshFilters, scope);
+  }
+
+  vocabularyExists$: Observable<boolean>;
+
+  ngOnDestroy(): void {
+    super.ngOnDestroy();
+    this.subscriptions.forEach((subscription: Subscription) => subscription.unsubscribe());
+  }
+
   /**
    * Submits a new active custom value to the filter from the input field
    * Overwritten method from parent component, adds the "query" operator to the received data before passing it on
@@ -24,4 +101,61 @@ export class SearchHierarchyFilterComponent extends SearchFacetFilterComponent i
   onSubmit(data: any) {
     super.onSubmit(addOperatorToFilterValue(data, 'query'));
   }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    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;
+        }),
+      );
+    }
+  }
+
+  /**
+   * Open the vocabulary tree modal popup.
+   * When an entry is selected, add the filter query to the search options.
+   */
+  showVocabularyTree() {
+    const modalRef: NgbModalRef = this.modalService.open(VocabularyTreeviewModalComponent, {
+      size: 'lg',
+      windowClass: 'treeview',
+    });
+    modalRef.componentInstance.vocabularyOptions = {
+      name: this.getVocabularyEntry(),
+      closed: true,
+    };
+    this.subscriptions.push(combineLatest([
+      (modalRef.componentInstance as VocabularyTreeviewModalComponent).select,
+      this.selectedValues$.pipe(take(1)),
+    ]).subscribe(([detail, selectedValues]: [VocabularyEntryDetail, FacetValue[]]) => {
+      void this.router.navigate(
+        [this.searchService.getSearchLink()],
+        {
+          queryParams: {
+            [this.filterConfig.paramName]: [...selectedValues, { value: detail.value }]
+              .map((facetValue: FacetValue) => getFacetValueForType(facetValue, this.filterConfig)),
+          },
+          queryParamsHandling: 'merge',
+        },
+      );
+    }));
+  }
+
+  /**
+   * Returns the matching vocabulary entry for the given search filter.
+   * These are configurable in the config file.
+   */
+  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..6d4ba44920 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
@@ -9,8 +9,8 @@
                   </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"
+                         [attr.aria-label]="minLabel"
+                         [placeholder]="minLabel"
                   />
                 </label>
             </div>
@@ -21,19 +21,18 @@
                     </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"
+                           [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">
+                {{'search.filters.search.submit' | translate}}
+            </button>
         </form>
 
         <ng-container *ngIf="shouldShowSlider()">
-            <nouislider [connect]="true" [min]="min" [max]="max" [step]="1"
+            <nouislider [connect]="true" [config]="config" [min]="min" [max]="max" [step]="1"
                         [dsDebounce]="250" (onDebounce)="onSubmit()"
                         (keydown)="startKeyboardControl()" (keyup)="stopKeyboardControl()"
                         [(ngModel)]="range" ngDefaultControl>
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 44dda40d15..960057f662 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
@@ -1,37 +1,48 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
+import { RouteService } from '../../../../../core/services/route.service';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
-import { FilterType } from '../../../models/filter-type.model';
-import { FacetValue } from '../../../models/facet-value.model';
-import { FormsModule } from '@angular/forms';
-import { BehaviorSubject, of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { SearchServiceStub } from '../../../../testing/search-service.stub';
-import { buildPaginatedList } from '../../../../../core/data/paginated-list.model';
-import { RouterStub } from '../../../../testing/router.stub';
-import { Router } from '@angular/router';
-import { PageInfo } from '../../../../../core/shared/page-info.model';
-import { SearchRangeFilterComponent } from './search-range-filter.component';
-import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../../../my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
 import { createSuccessfulRemoteDataObject$ } from '../../../../remote-data.utils';
-import { RouteService } from '../../../../../core/services/route.service';
+import { RouterStub } from '../../../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../../../testing/search-service.stub';
+import { FacetValue } from '../../../models/facet-value.model';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { SearchRangeFilterComponent } from './search-range-filter.component';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
   let fixture: ComponentFixture<SearchRangeFilterComponent>;
   const minSuffix = '.min';
   const maxSuffix = '.max';
-  const dateFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
   const filterName1 = 'test name';
   const value1 = '2000 - 2012';
   const value2 = '1992 - 2000';
@@ -52,37 +63,37 @@ describe('SearchRangeFilterComponent', () => {
       count: 52,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value2,
       value: value2,
       count: 20,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
+          href: '',
+        },
+      },
     }, {
       label: value3,
       value: value3,
       count: 5,
       _links: {
         self: {
-          href: ''
+          href: '',
         },
         search: {
-          href: ''
-        }
-      }
-    }
+          href: '',
+        },
+      },
+    },
   ];
 
   const searchLink = '/search';
@@ -106,6 +117,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,
@@ -115,14 +127,14 @@ describe('SearchRangeFilterComponent', () => {
             incrementPage: (filterName: string) => {
             },
             resetPage: (filterName: string) => {
-            }
+            },
             /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-          }
-        }
+          },
+        },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchRangeFilterComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -149,9 +161,9 @@ describe('SearchRangeFilterComponent', () => {
       expect(router.navigate).toHaveBeenCalledWith(searchUrl.split('/'), {
         queryParams: {
           [mockFilterConfig.paramName + minSuffix]: [1900],
-          [mockFilterConfig.paramName + maxSuffix]: [1950]
+          [mockFilterConfig.paramName + maxSuffix]: [1950],
         },
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     });
   });
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 fbd767284f..8831268a37 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
@@ -1,25 +1,44 @@
-import { BehaviorSubject, combineLatest as observableCombineLatest, Subscription } from 'rxjs';
-import { map, startWith } from 'rxjs/operators';
 import { isPlatformBrowser } from '@angular/common';
-import { Component, Inject, OnDestroy, OnInit, PLATFORM_ID } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest as observableCombineLatest,
+  Subscription,
+} from 'rxjs';
+import {
+  map,
+  startWith,
+} from 'rxjs/operators';
+import { yearFromString } from 'src/app/shared/date.util';
+
 import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
-import { FilterType } from '../../../models/filter-type.model';
-import { renderFacetFor } from '../search-filter-type-decorator';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
-import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import { RouteService } from '../../../../../core/services/route.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
 import {
   FILTER_CONFIG,
   IN_PLACE_SEARCH,
   REFRESH_FILTER,
-  SearchFilterService
+  SCOPE,
+  SearchFilterService,
 } from '../../../../../core/shared/search/search-filter.service';
-import { SearchService } from '../../../../../core/shared/search/search.service';
-import { Router } from '@angular/router';
-import * as moment from 'moment';
 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 { hasValue } from '../../../../empty.util';
+import { FilterType } from '../../../models/filter-type.model';
+import { SearchFilterConfig } from '../../../models/search-filter-config.model';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
+import { renderFacetFor } from '../search-filter-type-decorator';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
@@ -31,11 +50,6 @@ export const RANGE_FILTER_MIN_SUFFIX = '.min';
  */
 export const RANGE_FILTER_MAX_SUFFIX = '.max';
 
-/**
- * The date formats that are possible to appear in a date filter
- */
-const dateFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
-
 /**
  * This component renders a simple item page.
  * The route parameter 'id' is used to request the item it represents.
@@ -45,7 +59,7 @@ const dateFormats = ['YYYY', 'YYYY-MM', 'YYYY-MM-DD'];
   selector: 'ds-search-range-filter',
   styleUrls: ['./search-range-filter.component.scss'],
   templateUrl: './search-range-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
@@ -58,11 +72,27 @@ 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
    */
@@ -83,13 +113,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);
 
   }
 
@@ -99,8 +131,10 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.min = moment(this.filterConfig.minValue, dateFormats).year() || this.min;
-    this.max = moment(this.filterConfig.maxValue, dateFormats).year() || this.max;
+    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(
@@ -108,8 +142,17 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
         const minimum = hasValue(min) ? min : this.min;
         const maximum = hasValue(max) ? max : this.max;
         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 },
+      ],
+    };
   }
 
   /**
@@ -126,9 +169,9 @@ export class SearchRangeFilterComponent extends SearchFacetFilterComponent imple
       queryParams:
         {
           [this.filterConfig.paramName + RANGE_FILTER_MIN_SUFFIX]: newMin,
-          [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax
+          [this.filterConfig.paramName + RANGE_FILTER_MAX_SUFFIX]: newMax,
         },
-      queryParamsHandling: 'merge'
+      queryParamsHandling: 'merge',
     });
     this.filter = '';
   }
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..cdba401743 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
@@ -7,7 +7,7 @@
           </div>
         </ng-container>
         <div class="clearfix toggle-more-filters">
-            <a class="float-left" *ngIf="!(isLastPage$ | async)"
+            <a class="float-left" *ngIf="(isLastPage$ | async) !== true"
                (click)="showMore()" href="javascript:void(0);">
               {{"search.filters.filter.show-more" | translate}}
             </a>
diff --git a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index cfd81c3750..d7371e8fb1 100644
--- a/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
@@ -1,8 +1,15 @@
-import { Component, OnInit } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+
 import { FilterType } from '../../../models/filter-type.model';
-import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
+import { addOperatorToFilterValue } from '../../../search.utils';
+import {
+  facetLoad,
+  SearchFacetFilterComponent,
+} from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { addOperatorToFilterValue, } from '../../../search.utils';
 
 /**
  * This component renders a simple item page.
@@ -14,7 +21,7 @@ import { addOperatorToFilterValue, } from '../../../search.utils';
   selector: 'ds-search-text-filter',
   styleUrls: ['./search-text-filter.component.scss'],
   templateUrl: './search-text-filter.component.html',
-  animations: [facetLoad]
+  animations: [facetLoad],
 })
 
 /**
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..3f70a759bc 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,10 @@
-<h3>{{"search.filters.head" | translate}}</h3>
+<h3 *ngIf="inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h3>
+<h2 *ngIf="!inPlaceSearch">{{filterLabel+'.filters.head' | translate}}</h2>
 <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>
+        <ds-search-filter [scope]="currentScope" [filter]="filter" [inPlaceSearch]="inPlaceSearch" [refreshFilters]="refreshFilters"></ds-search-filter>
     </div>
 </div>
+<ds-advanced-search *ngIf="appConfig.search.advancedFilters.enabled"
+    [inPlaceSearch]="inPlaceSearch"></ds-advanced-search>
 <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.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
index 522459b603..67631d69bb 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
@@ -1,14 +1,23 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
-import { SearchFiltersComponent } from './search-filters.component';
+import { APP_CONFIG } from 'src/config/app-config.interface';
+import { environment } from 'src/environments/environment';
+
 import { SearchService } from '../../../core/shared/search/search.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchFiltersComponent } from './search-filters.component';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
@@ -20,13 +29,14 @@ describe('SearchFiltersComponent', () => {
     getClearFiltersQueryParams: () => {
     },
     getSearchLink: () => {
-    }
+    },
+    getConfigurationSearchConfig: () => { },
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
   };
 
   const searchFiltersStub = {
     getSelectedValuesForFilter: (filter) =>
-      []
+      [],
   };
 
   beforeEach(waitForAsync(() => {
@@ -37,11 +47,12 @@ 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]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchFiltersComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..3eead1982f 100644
--- a/src/app/shared/search/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -1,17 +1,30 @@
-import { Component, Inject, Input, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { BehaviorSubject, Observable } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
+import {
+  APP_CONFIG,
+  AppConfig,
+} from 'src/config/app-config.interface';
 
-import { SearchService } from '../../../core/shared/search/search.service';
 import { RemoteData } from '../../../core/data/remote-data';
-import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { currentPath } from '../../utils/route.utils';
 import { hasValue } from '../../empty.util';
+import { currentPath } from '../../utils/route.utils';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilterConfig } from '../models/search-filter-config.model';
 
 @Component({
   selector: 'ds-search-filters',
@@ -28,7 +41,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    * An observable containing configuration about which filters are shown and how they are shown
    */
   @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
-
+  @Input() searchOptions: PaginatedSearchOptions;
   /**
    * List of all filters that are currently active with their value set to null.
    * Used to reset all filters at once
@@ -61,6 +74,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
   searchLink: string;
 
   subs = [];
+  filterLabel = 'search';
 
   /**
    * Initialize instance variables
@@ -70,6 +84,7 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
    * @param {SearchConfigurationService} searchConfigService
    */
   constructor(
+    @Inject(APP_CONFIG) protected appConfig: AppConfig,
     private searchService: SearchService,
     private filterService: SearchFilterService,
     private router: Router,
@@ -77,6 +92,9 @@ export class SearchFiltersComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit(): void {
+    if (!this.inPlaceSearch) {
+      this.filterLabel = 'discover';
+    }
     this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
       Object.keys(filters).forEach((f) => filters[f] = null);
       return filters;
diff --git a/src/app/shared/search/search-filters/themed-search-filters.component.ts b/src/app/shared/search/search-filters/themed-search-filters.component.ts
new file mode 100644
index 0000000000..5e89c27b26
--- /dev/null
+++ b/src/app/shared/search/search-filters/themed-search-filters.component.ts
@@ -0,0 +1,42 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
+import { RemoteData } from '../../../core/data/remote-data';
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchFiltersComponent } from './search-filters.component';
+
+/**
+ * Themed wrapper for SearchFiltersComponent
+ */
+@Component({
+  selector: 'ds-themed-search-filters',
+  styleUrls: [],
+  templateUrl: '../../theme-support/themed.component.html',
+})
+export class ThemedSearchFiltersComponent extends ThemedComponent<SearchFiltersComponent> {
+
+  @Input() currentConfiguration;
+  @Input() currentScope: string;
+  @Input() inPlaceSearch;
+  @Input() refreshFilters: Observable<any>;
+  @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
+
+  protected inAndOutputNames: (keyof SearchFiltersComponent & keyof this)[] = [
+    'filters', 'currentConfiguration', 'currentScope', 'inPlaceSearch', 'refreshFilters'];
+
+  protected getComponentName(): string {
+    return 'SearchFiltersComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/shared/search/search-filters/search-filters.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./search-filters.component');
+  }
+}
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..2269771de1 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,7 @@
-<a class="badge badge-primary mr-1 mb-1 text-capitalize"
+<a class="badge badge-primary mr-1 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 aria-hidden="true"> ×</span>
 </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
index 50bcbc6938..5642f40057 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
@@ -1,22 +1,34 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { Observable, of as observableOf } from 'rxjs';
-import { Params, Router } from '@angular/router';
-import { SearchLabelComponent } from './search-label.component';
-import { ObjectKeysPipe } from '../../../utils/object-keys-pipe';
-import { SEARCH_CONFIG_SERVICE } from '../../../../my-dspace-page/my-dspace-page.component';
-import { SearchServiceStub } from '../../../testing/search-service.stub';
-import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../../core/cache/models/sort-options.model';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  Params,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+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';
+import { PaginationComponentOptions } from '../../../pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../../testing/pagination-service.stub';
-import { FindListOptions } from '../../../../core/data/find-list-options.model';
+import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service.stub';
+import { SearchServiceStub } from '../../../testing/search-service.stub';
+import { ObjectKeysPipe } from '../../../utils/object-keys-pipe';
+import { SearchLabelComponent } from './search-label.component';
 
 describe('SearchLabelComponent', () => {
   let comp: SearchLabelComponent;
@@ -36,7 +48,7 @@ describe('SearchLabelComponent', () => {
   const filter2 = [key2, value2];
   const mockFilters = [
     filter1,
-    filter2
+    filter2,
   ];
 
   const pagination = Object.assign(new PaginationComponentOptions(), { id: 'page-id', currentPage: 1, pageSize: 20 });
@@ -51,12 +63,12 @@ describe('SearchLabelComponent', () => {
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
         { provide: SearchConfigurationService, useValue: new SearchConfigurationServiceStub() },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: {} }
+        { provide: Router, useValue: {} },
         // { provide: SearchConfigurationService, useValue: {getCurrentFrontendFilters : () =>  observableOf({})} }
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchLabelComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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 74526ad2ad..bebf3dd15d 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
@@ -1,12 +1,24 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import {
+  Params,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Params, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../../empty.util';
-import { SearchService } from '../../../../core/shared/search/search.service';
-import { currentPath } from '../../../utils/route.utils';
+
 import { PaginationService } from '../../../../core/pagination/pagination.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../empty.util';
+import { currentPath } from '../../../utils/route.utils';
+import { stripOperatorFromFilterValue } from '../../search.utils';
 
 @Component({
   selector: 'ds-search-label',
@@ -57,9 +69,9 @@ export class SearchLabelComponent implements OnInit {
         const page = this.paginationService.getPageParam(this.searchConfigurationService.paginationID);
         return {
           [field]: isNotEmpty(newValues) ? newValues : null,
-          [page]: 1
+          [page]: 1,
         };
-      })
+      }),
     );
   }
 
@@ -83,7 +95,8 @@ export class SearchLabelComponent implements OnInit {
   normalizeFilterValue(value: string) {
     // const pattern = /,[^,]*$/g;
     const pattern = /,authority*$/g;
-    return value.replace(pattern, '');
+    value = value.replace(pattern, '');
+    return stripOperatorFromFilterValue(value);
   }
 
   private getFilterName(): string {
diff --git a/src/app/shared/search/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts
index e00c56aabc..ec53427f94 100644
--- a/src/app/shared/search/search-labels/search-labels.component.spec.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.spec.ts
@@ -1,15 +1,23 @@
-import { SearchLabelsComponent } from './search-labels.component';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateModule } from '@ngx-translate/core';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { FormsModule } from '@angular/forms';
-import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
-import { SearchServiceStub } from '../../testing/search-service.stub';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { SearchService } from '../../../core/shared/search/search.service';
 import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SearchServiceStub } from '../../testing/search-service.stub';
+import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
+import { SearchLabelsComponent } from './search-labels.component';
 
 describe('SearchLabelsComponent', () => {
   let comp: SearchLabelsComponent;
@@ -26,7 +34,7 @@ describe('SearchLabelsComponent', () => {
   const filter2 = [field2, value2];
   const mockFilters = [
     filter1,
-    filter2
+    filter2,
   ];
 
   beforeEach(waitForAsync(() => {
@@ -35,11 +43,11 @@ describe('SearchLabelsComponent', () => {
       declarations: [SearchLabelsComponent, ObjectKeysPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
-        { provide: SEARCH_CONFIG_SERVICE, useValue: { getCurrentFrontendFilters: () => observableOf(mockFilters) } }
+        { provide: SEARCH_CONFIG_SERVICE, useValue: { getCurrentFrontendFilters: () => observableOf(mockFilters) } },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(SearchLabelsComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/search/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
index 8f77d73b21..2d97731abe 100644
--- a/src/app/shared/search/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,10 +1,17 @@
-import { Component, Inject, Input } from '@angular/core';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import {
+  Component,
+  Inject,
+  Input,
+} from '@angular/core';
+import {
+  Params,
+  Router,
+} from '@angular/router';
 import { Observable } from 'rxjs';
-import { Params, Router } from '@angular/router';
-import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { map } from 'rxjs/operators';
-import { stripOperatorFromFilterValue } from '../search.utils';
+
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
 
 @Component({
   selector: 'ds-search-labels',
@@ -37,10 +44,10 @@ export class SearchLabelsComponent {
         const labels = {};
         Object.keys(params)
           .forEach((key) => {
-            labels[key] = [...params[key].map((value) => stripOperatorFromFilterValue(value))];
+            labels[key] = [...params[key].map((value) => value)];
           });
         return labels;
-      })
+      }),
     );
   }
 }
diff --git a/src/app/shared/search/search-result-element-decorator.ts b/src/app/shared/search/search-result-element-decorator.ts
index 78305b55f1..5241318122 100644
--- a/src/app/shared/search/search-result-element-decorator.ts
+++ b/src/app/shared/search/search-result-element-decorator.ts
@@ -26,5 +26,5 @@ export function searchResultFor(domainConstructor: GenericConstructor<ListableOb
  * @returns The component's constructor that matches the given DSpaceObject
  */
 export function getSearchResultFor(domainConstructor: GenericConstructor<ListableObject>) {
-    return searchResultMap.get(domainConstructor);
+  return searchResultMap.get(domainConstructor);
 }
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 44498c3cab..e3f4d0d883 100644
--- a/src/app/shared/search/search-results/search-results.component.html
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex justify-content-between">
     <h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
-    <ds-search-export-csv [searchConfig]="searchConfig"></ds-search-export-csv>
+    <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>
     <ds-viewable-collection
@@ -13,6 +13,7 @@
             [linkType]="linkType"
             [context]="context"
             [hidePaginationDetail]="hidePaginationDetail"
+            [showThumbnails]="showThumbnails"
             (contentChange)="contentChange.emit($event)"
             (deselectObject)="deselectObject.emit($event)"
             (selectObject)="selectObject.emit($event)">
@@ -21,7 +22,7 @@
 <ds-themed-loading *ngIf="isLoading()" message="{{'loading.search-results' | translate}}"></ds-themed-loading>
 <ds-error *ngIf="showError()"
           message="{{errorMessageLabel() | translate}}"></ds-error>
-<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.statusCode == 400">
+<div *ngIf="searchResults?.payload?.page.length === 0 || searchResults?.statusCode === 400">
     {{ 'search.results.no-results' | translate }}
     <a [routerLink]="['/search']"
        [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
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..cd11c5eb12 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
@@ -1,12 +1,20 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { Community } from '../../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
-import { SearchResultsComponent } from './search-results.component';
-import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+
+import { Community } from '../../../core/shared/community.model';
 import { createFailedRemoteDataObject } from '../../remote-data.utils';
+import { QueryParamsDirectiveStub } from '../../testing/query-params-directive.stub';
+import { SearchResultsComponent } from './search-results.component';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
@@ -20,7 +28,7 @@ describe('SearchResultsComponent', () => {
       declarations: [
         SearchResultsComponent,
         QueryParamsDirectiveStub],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -110,15 +118,15 @@ export const objects = [
       self: {
         _isScalar: true,
         value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/10b636d0-7890-4968-bcd6-0d83bf4e2b42',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     collections: {
       self: {
         _isScalar: true,
         value: '1506937433727',
-        scheduler: null
-      }
+        scheduler: null,
+      },
     },
     _links: {
       self: {
@@ -132,40 +140,40 @@ export const objects = [
       'dc.description': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.description.abstract': [
         {
           language: null,
-          value: 'This is a test community to hold content for the OR2017 demostration'
-        }
+          value: 'This is a test community to hold content for the OR2017 demostration',
+        },
       ],
       'dc.description.tableofcontents': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.rights': [
         {
           language: null,
-          value: ''
-        }
+          value: '',
+        },
       ],
       'dc.title': [
         {
           language: null,
-          value: 'OR2017 - Demonstration'
-        }
+          value: 'OR2017 - Demonstration',
+        },
       ],
       'dc.identifier.uri': [
         {
           language: null,
-          value: 'http://localhost:4000/handle/10673/11'
-        }
-      ]
-    }
+          value: 'http://localhost:4000/handle/10673/11',
+        },
+      ],
+    },
   }),
   Object.assign(new Community(),
     {
@@ -173,15 +181,15 @@ export const objects = [
         self: {
           _isScalar: true,
           value: 'https://dspace7.4science.it/dspace-spring-rest/api/core/bitstreams/f446c17d-6d51-45ea-a610-d58a73642d40',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       collections: {
         self: {
           _isScalar: true,
           value: '1506937433727',
-          scheduler: null
-        }
+          scheduler: null,
+        },
       },
       _links: {
         self: {
@@ -195,40 +203,40 @@ export const objects = [
         'dc.description': [
           {
             language: null,
-            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>'
-          }
+            value: '<p>This is the introductory text for the <em>Sample Community</em> on the DSpace Demonstration Site. It is editable by System or Community Administrators (of this Community).</p>\r\n<p><strong>DSpace Communities may contain one or more Sub-Communities or Collections (of Items).</strong></p>\r\n<p>This particular Community has its own logo (the <a href=\'http://www.duraspace.org/\'>DuraSpace</a> logo).</p>',
+          },
         ],
         'dc.description.abstract': [
           {
             language: null,
-            value: 'This is a sample top-level community'
-          }
+            value: 'This is a sample top-level community',
+          },
         ],
         'dc.description.tableofcontents': [
           {
             language: null,
-            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>'
-          }
+            value: '<p>This is the <em>news section</em> for this <em>Sample Community</em>. System or Community Administrators (of this Community) can edit this News field.</p>',
+          },
         ],
         'dc.rights': [
           {
             language: null,
-            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>'
-          }
+            value: '<p><em>If this Community had special copyright text to display, it would be displayed here.</em></p>',
+          },
         ],
         'dc.title': [
           {
             language: null,
-            value: 'Sample Community'
-          }
+            value: 'Sample Community',
+          },
         ],
         'dc.identifier.uri': [
           {
             language: null,
-            value: 'http://localhost:4000/handle/10673/1'
-          }
-        ]
-      }
-    }
-  )
+            value: 'http://localhost:4000/handle/10673/1',
+          },
+        ],
+      },
+    },
+  ),
 ];
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 a11e076833..ba6ba887de 100644
--- a/src/app/shared/search/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,16 +1,28 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { RemoteData } from '../../../core/data/remote-data';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { fadeIn, fadeInOut } from '../../animations/fade';
-import { SearchResult } from '../models/search-result.model';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { hasNoValue, isNotEmpty } from '../../empty.util';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
-import { ViewMode } from '../../../core/shared/view-mode.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../animations/fade';
+import {
+  hasNoValue,
+  isNotEmpty,
+} from '../../empty.util';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
 import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchResult } from '../models/search-result.model';
 
 export interface SelectionConfig {
   repeatable: boolean;
@@ -22,8 +34,8 @@ export interface SelectionConfig {
   templateUrl: './search-results.component.html',
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 
 /**
@@ -47,6 +59,16 @@ export class SearchResultsComponent {
    */
   @Input() searchConfig: PaginatedSearchOptions;
 
+  /**
+   * A boolean representing if show csv export button
+   */
+  @Input() showCsvExport = false;
+
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * The current sorting configuration of the search
    */
diff --git a/src/app/shared/search/search-results/themed-search-results.component.ts b/src/app/shared/search/search-results/themed-search-results.component.ts
index deb64bf840..3ccd066628 100644
--- a/src/app/shared/search/search-results/themed-search-results.component.ts
+++ b/src/app/shared/search/search-results/themed-search-results.component.ts
@@ -1,16 +1,25 @@
-import { ThemedComponent } from '../../theme-support/themed.component';
-import { SearchResultsComponent, SelectionConfig } from './search-results.component';
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedList } from '../../../core/data/paginated-list.model';
-import { SearchResult } from '../models/search-result.model';
-import { DSpaceObject } from '../../../core/shared/dspace-object.model';
-import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Context } from '../../../core/shared/context.model';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../../object-collection/collection-element-link.type';
 import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchResult } from '../models/search-result.model';
+import {
+  SearchResultsComponent,
+  SelectionConfig,
+} from './search-results.component';
 
 /**
  * Themed wrapper for SearchResultsComponent
@@ -21,7 +30,8 @@ import { ListableObject } from '../../object-collection/shared/listable-object.m
   templateUrl: '../../theme-support/themed.component.html',
 })
 export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsComponent> {
-  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject'];
+
+  protected inAndOutputNames: (keyof SearchResultsComponent & keyof this)[] = ['linkType', 'searchResults', 'searchConfig', 'showCsvExport', 'showThumbnails', 'sortConfig', 'viewMode', 'configuration', 'disableHeader', 'selectable', 'context', 'hidePaginationDetail', 'selectionConfig', 'contentChange', 'deselectObject', 'selectObject'];
 
   @Input() linkType: CollectionElementLinkType;
 
@@ -29,27 +39,31 @@ export class ThemedSearchResultsComponent extends ThemedComponent<SearchResultsC
 
   @Input() searchConfig: PaginatedSearchOptions;
 
+  @Input() showCsvExport: boolean;
+
+  @Input() showThumbnails: boolean;
+
   @Input() sortConfig: SortOptions;
 
   @Input() viewMode: ViewMode;
 
   @Input() configuration: string;
 
-  @Input() disableHeader = false;
+  @Input() disableHeader: boolean;
 
-  @Input() selectable = false;
+  @Input() selectable: boolean;
 
   @Input() context: Context;
 
-  @Input() hidePaginationDetail = false;
+  @Input() hidePaginationDetail: boolean;
 
-  @Input() selectionConfig: SelectionConfig = null;
+  @Input() selectionConfig: SelectionConfig;
 
-  @Output() contentChange: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() contentChange: EventEmitter<ListableObject> = new EventEmitter();
 
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
 
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
 
   protected getComponentName(): string {
     return 'SearchResultsComponent';
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 06e506ddb0..abcd63eee6 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,53 +1,47 @@
-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';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-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 {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 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 { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import { VarDirective } from '../../utils/var.directive';
+import { SearchSettingsComponent } from './search-settings.component';
 
 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 +52,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,
@@ -91,7 +67,7 @@ describe('SearchSettingsComponent', () => {
           useValue: {
             paginatedSearchOptions: observableOf(paginatedSearchOptions),
             getCurrentScope: observableOf('test-id'),
-          }
+          },
         },
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -105,15 +81,13 @@ describe('SearchSettingsComponent', () => {
     comp.sortOptionsList = [
       new SortOptions('score', SortDirection.DESC),
       new SortOptions('dc.title', SortDirection.ASC),
-      new SortOptions('dc.title', SortDirection.DESC)
+      new SortOptions('dc.title', SortDirection.DESC),
     ];
+    comp.currentSortOption = new SortOptions('score', SortDirection.DESC);
 
     // 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', () => {
@@ -133,7 +107,8 @@ describe('SearchSettingsComponent', () => {
   it('should have the proper order value selected by default', () => {
     fixture.detectChanges();
     const orderSetting = fixture.debugElement.query(By.css('div.result-order-settings'));
-    const childElementToBeSelected = orderSetting.query(By.css('option[value="score,DESC"][selected="selected"]'));
-    expect(childElementToBeSelected).toBeDefined();
+    const childElementToBeSelected = orderSetting.query(By.css('option[value="score,DESC"]'));
+    expect(childElementToBeSelected).not.toBeNull();
+    expect(childElementToBeSelected.nativeElement.selected).toBeTrue();
   });
 });
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..45679f95b1 100644
--- a/src/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,15 +1,21 @@
-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 {
+  Component,
+  Inject,
+  Input,
+} from '@angular/core';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../../core/cache/models/sort-options.model';
+import { PaginationService } from '../../../core/pagination/pagination.service';
 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';
 
 @Component({
   selector: 'ds-search-settings',
   styleUrls: ['./search-settings.component.scss'],
-  templateUrl: './search-settings.component.html'
+  templateUrl: './search-settings.component.html',
 })
 
 /**
@@ -26,11 +32,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,
+  ) {
   }
 
   /**
@@ -42,7 +47,7 @@ export class SearchSettingsComponent {
     this.paginationService.updateRoute(this.searchConfigurationService.paginationID, {
       sortField: values[0],
       sortDirection: values[1] as SortDirection,
-      page: 1
+      page: 1,
     });
   }
 }
diff --git a/src/app/shared/search/search-settings/themed-search-settings.component.ts b/src/app/shared/search/search-settings/themed-search-settings.component.ts
index b1f1d08264..ab6f62d56e 100644
--- a/src/app/shared/search/search-settings/themed-search-settings.component.ts
+++ b/src/app/shared/search/search-settings/themed-search-settings.component.ts
@@ -1,7 +1,11 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
 import { ThemedComponent } from '../../theme-support/themed.component';
 import { SearchSettingsComponent } from './search-settings.component';
-import { SortOptions } from '../../../core/cache/models/sort-options.model';
 
 /**
  * Themed wrapper for SearchSettingsComponent
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 59d84ee383..f14854593e 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">
@@ -17,12 +18,12 @@
                                             [defaultConfiguration]="configuration"
                                             [inPlaceSearch]="inPlaceSearch"
                                             (changeConfiguration)="changeConfiguration.emit($event)"></ds-search-switch-configuration>
-            <ds-search-filters [currentScope]="currentScope"
+            <ds-themed-search-filters [currentScope]="currentScope"
                                [currentConfiguration]="configuration"
                                [filters]="filters"
                                [refreshFilters]="refreshFilters"
-                               [inPlaceSearch]="inPlaceSearch"></ds-search-filters>
-            <ds-themed-search-settings [currentSortOption]="currentSortOption"
+                               [inPlaceSearch]="inPlaceSearch"></ds-themed-search-filters>
+            <ds-themed-search-settings *ngIf="inPlaceSearch" [currentSortOption]="currentSortOption"
                                        [sortOptionsList]="sortOptionsList"></ds-themed-search-settings>
         </div>
     </div>
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
index a16387cf51..472b249962 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
@@ -1,9 +1,14 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { SearchSidebarComponent } from './search-sidebar.component';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { By } from '@angular/platform-browser';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SearchSidebarComponent } from './search-sidebar.component';
 
 describe('SearchSidebarComponent', () => {
   let comp: SearchSidebarComponent;
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
index 929f819ca3..23a9e1d012 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -1,12 +1,20 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
 
-import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
-import { BehaviorSubject, Observable } from 'rxjs';
-import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 import { SortOptions } from '../../../core/cache/models/sort-options.model';
-import { ViewMode } from '../../../core/shared/view-mode.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
 import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
 
 /**
  * This component renders a simple item page.
diff --git a/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
new file mode 100644
index 0000000000..449438ef51
--- /dev/null
+++ b/src/app/shared/search/search-sidebar/themed-search-sidebar.component.ts
@@ -0,0 +1,63 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+
+import { SortOptions } from '../../../core/cache/models/sort-options.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ViewMode } from '../../../core/shared/view-mode.model';
+import { ThemedComponent } from '../../theme-support/themed.component';
+import { PaginatedSearchOptions } from '../models/paginated-search-options.model';
+import { SearchFilterConfig } from '../models/search-filter-config.model';
+import { SearchConfigurationOption } from '../search-switch-configuration/search-configuration-option.model';
+import { SearchSidebarComponent } from './search-sidebar.component';
+
+/**
+ * Themed wrapper for SearchSidebarComponent
+ */
+@Component({
+  selector: 'ds-themed-search-sidebar',
+  styleUrls: [],
+  templateUrl: '../../theme-support/themed.component.html',
+})
+export class ThemedSearchSidebarComponent extends ThemedComponent<SearchSidebarComponent> {
+
+  @Input() configuration;
+  @Input() configurationList: SearchConfigurationOption[];
+  @Input() currentScope: string;
+  @Input() currentSortOption: SortOptions;
+  @Input() filters: Observable<RemoteData<SearchFilterConfig[]>>;
+  @Input() resultCount;
+  @Input() viewModeList: ViewMode[];
+  @Input() showViewModes = true;
+  @Input() inPlaceSearch;
+  @Input() searchOptions: PaginatedSearchOptions;
+  @Input() sortOptionsList: SortOptions[];
+  @Input() refreshFilters: BehaviorSubject<boolean>;
+  @Output() toggleSidebar = new EventEmitter<boolean>();
+  @Output() changeConfiguration: EventEmitter<SearchConfigurationOption> = new EventEmitter<SearchConfigurationOption>();
+  @Output() changeViewMode: EventEmitter<ViewMode> = new EventEmitter<ViewMode>();
+
+  protected inAndOutputNames: (keyof SearchSidebarComponent & keyof this)[] = [
+    'configuration', 'configurationList', 'currentScope', 'currentSortOption',
+    'resultCount', 'filters', 'viewModeList', 'showViewModes', 'inPlaceSearch',
+    'searchOptions', 'sortOptionsList', 'refreshFilters', 'toggleSidebar', 'changeConfiguration', 'changeViewMode'];
+
+  protected getComponentName(): string {
+    return 'SearchSidebarComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../themes/${themeName}/app/shared/search/search-sidebar/search-sidebar.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./search-sidebar.component');
+  }
+}
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-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
index fadde46e53..094e95fd8e 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
@@ -1,19 +1,31 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
-import { SearchSwitchConfigurationComponent } from './search-switch-configuration.component';
-import { NavigationExtras, Router } from '@angular/router';
-import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
-import { RouterStub } from '../../testing/router.stub';
-import { SearchService } from '../../../core/shared/search/search.service';
-import { MYDSPACE_ROUTE, SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
-import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
-import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
 import { Context } from '../../../core/shared/context.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
+import {
+  MYDSPACE_ROUTE,
+  SEARCH_CONFIG_SERVICE,
+} from '../../../my-dspace-page/my-dspace-page.component';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { RouterStub } from '../../testing/router.stub';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service.stub';
+import { SearchSwitchConfigurationComponent } from './search-switch-configuration.component';
 
 describe('SearchSwitchConfigurationComponent', () => {
 
@@ -23,19 +35,19 @@ describe('SearchSwitchConfigurationComponent', () => {
   let select: any;
 
   const searchServiceStub = jasmine.createSpyObj('SearchService', {
-    getSearchLink: jasmine.createSpy('getSearchLink')
+    getSearchLink: jasmine.createSpy('getSearchLink'),
   });
 
   const configurationList = [
     {
       value: MyDSpaceConfigurationValueType.Workspace,
       label: 'workspace',
-      context: Context.Workspace
+      context: Context.Workspace,
     },
     {
       value: MyDSpaceConfigurationValueType.Workflow,
       label: 'workflow',
-      context: Context.Workflow
+      context: Context.Workflow,
     },
   ];
   beforeEach(waitForAsync(() => {
@@ -44,9 +56,9 @@ describe('SearchSwitchConfigurationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       declarations: [SearchSwitchConfigurationComponent],
       providers: [
@@ -54,7 +66,7 @@ describe('SearchSwitchConfigurationComponent', () => {
         { provide: SearchService, useValue: searchServiceStub },
         { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -78,7 +90,7 @@ describe('SearchSwitchConfigurationComponent', () => {
 
   it('should display select field properly', () => {
     const selectField = fixture.debugElement.query(By.css('.form-control'));
-    expect(selectField).toBeDefined();
+    expect(selectField).not.toBeNull();
 
     const childElements = selectField.children;
     expect(childElements.length).toEqual(comp.configurationList.length);
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index 1852277673..2493a627cb 100644
--- a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -1,16 +1,26 @@
-import { Component, EventEmitter, Inject, Input, OnDestroy, OnInit, Output } from '@angular/core';
-import { NavigationExtras, Router } from '@angular/router';
-
+import {
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NavigationExtras,
+  Router,
+} from '@angular/router';
+import findIndex from 'lodash/findIndex';
 import { Subscription } from 'rxjs';
 
-import { hasValue } from '../../empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 import { MyDSpaceConfigurationValueType } from '../../../my-dspace-page/my-dspace-configuration-value-type';
-import { SearchConfigurationOption } from './search-configuration-option.model';
-import { SearchService } from '../../../core/shared/search/search.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../my-dspace-page/my-dspace-page.component';
+import { hasValue } from '../../empty.util';
 import { currentPath } from '../../utils/route.utils';
-import { findIndex } from 'lodash';
+import { SearchConfigurationOption } from './search-configuration-option.model';
 
 @Component({
   selector: 'ds-search-switch-configuration',
@@ -60,7 +70,7 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
   ngOnInit() {
     this.searchConfigService.getCurrentConfiguration(this.defaultConfiguration)
       .subscribe((currentConfiguration) => {
-        const index = findIndex(this.configurationList, {value: currentConfiguration });
+        const index = findIndex(this.configurationList, { value: currentConfiguration });
         this.selectedOption = this.configurationList[index];
       });
   }
@@ -70,7 +80,7 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
    */
   onSelect() {
     const navigationExtras: NavigationExtras = {
-      queryParams: {configuration: this.selectedOption.value},
+      queryParams: { configuration: this.selectedOption.value },
     };
 
     this.changeConfiguration.emit(this.selectedOption);
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index cdad62dcbd..c51acf0a7e 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -10,42 +10,47 @@
   <ng-template *ngTemplateOutlet="searchContent"></ng-template>
 </div>
 
-<ds-page-with-sidebar *ngIf="showSidebar && (initialized$ | async)" [id]="'search-page'" [sidebarContent]="sidebarContent">
-  <ng-template *ngTemplateOutlet="searchContent"></ng-template>
+<ds-page-with-sidebar *ngIf="showSidebar && (initialized$ | async)" [id]="'search-page'" [sideBarWidth]="sideBarWidth"
+    [sidebarContent]="sidebarContent">
+    <ng-template *ngTemplateOutlet="searchContent"></ng-template>
 </ds-page-with-sidebar>
 
 <ng-template #searchContent>
     <div class="row">
-        <div class="col-12" *ngIf="!(isXsOrSm$ | async)">
+        <div class="col-12" *ngIf="(isXsOrSm$ | async) !== true">
             <ng-template *ngTemplateOutlet="searchForm"></ng-template>
             <ng-content select="[additionalSearchOptions]"></ng-content>
         </div>
         <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>
+                <ds-view-mode-switch *ngIf="inPlaceSearch && showViewModes" [viewModeList]="viewModeList"
+                    [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
                 <button (click)="openSidebar()" aria-controls="#search-body"
                         class="btn btn-outline-primary float-right open-sidebar"><i
                         class="fas fa-sliders"></i> {{"search.sidebar.open"
-                        | translate}}
+                       | translate}}
                 </button>
             </div>
-            <ds-themed-search-results [searchResults]="resultsRD$ | async"
-                               [searchConfig]="searchOptions$ | async"
-                               [configuration]="(currentConfiguration$ | async)"
-                               [disableHeader]="!searchEnabled"
-                               [linkType]="linkType"
-                               [context]="(currentContext$ | async)"
-                               [selectable]="selectable"
-                               [selectionConfig]="selectionConfig"
-                               (contentChange)="onContentChange($event)"
-                               (deselectObject)="deselectObject.emit($event)"
-                               (selectObject)="selectObject.emit($event)"></ds-themed-search-results>
+            <ds-themed-search-results *ngIf="inPlaceSearch"
+                                      [searchResults]="resultsRD$ | async"
+                                      [searchConfig]="searchOptions$ | async"
+                                      [configuration]="(currentConfiguration$ | async)"
+                                      [disableHeader]="!searchEnabled"
+                                      [linkType]="linkType"
+                                      [context]="(currentContext$ | async)"
+                                      [selectable]="selectable"
+                                      [selectionConfig]="selectionConfig"
+                                      [showCsvExport]="showCsvExport"
+                                      [showThumbnails]="showThumbnails"
+                                      (contentChange)="onContentChange($event)"
+                                      (deselectObject)="deselectObject.emit($event)"
+                                      (selectObject)="selectObject.emit($event)"></ds-themed-search-results>
         </div>
     </div>
 </ng-template>
 
 <ng-template #sidebarContent>
-    <ds-search-sidebar id="search-sidebar" *ngIf="!(isXsOrSm$ | async)"
+    <ds-themed-search-sidebar id="search-sidebar" *ngIf="(isXsOrSm$ | async) !== true"
                        [configurationList]="configurationList"
                        [configuration]="(currentConfiguration$ | async)"
                        [currentScope]="(currentScope$ | async)"
@@ -59,8 +64,8 @@
                        [viewModeList]="viewModeList"
                        [showViewModes]="showViewModes"
                        (changeConfiguration)="changeContext($event.context)"
-                       (changeViewMode)="changeViewMode()"></ds-search-sidebar>
-    <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
+                       (changeViewMode)="changeViewMode()"></ds-themed-search-sidebar>
+    <ds-themed-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
                        [configurationList]="configurationList"
                        [configuration]="(currentConfiguration$ | async)"
                        [currentScope]="(currentScope$ | async)"
@@ -75,18 +80,19 @@
                        (toggleSidebar)="closeSidebar()"
                        (changeConfiguration)="changeContext($event.context)"
                        (changeViewMode)="changeViewMode()">
-    </ds-search-sidebar>
+    </ds-themed-search-sidebar>
 </ng-template>
 
 <ng-template #searchForm>
-    <ds-search-form *ngIf="searchEnabled" id="search-form"
+    <ds-themed-search-form *ngIf="searchEnabled" id="search-form"
                     [query]="(searchOptions$ | async)?.query"
                     [scope]="(searchOptions$ | async)?.scope"
+                    [hideScopeInUrl]="hideScopeInUrl"
                     [currentUrl]="searchLink"
                     [showScopeSelector]="showScopeSelector"
                     [inPlaceSearch]="inPlaceSearch"
                     [searchPlaceholder]="searchFormPlaceholder | translate">
-    </ds-search-form>
+    </ds-themed-search-form>
     <div class="row mb-3 mb-md-1">
         <div class="labels col-sm-9">
             <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
diff --git a/src/app/shared/search/search.component.spec.ts b/src/app/shared/search/search.component.spec.ts
index 3f00cf354f..dd1b1dd8a8 100644
--- a/src/app/shared/search/search.component.spec.ts
+++ b/src/app/shared/search/search.component.spec.ts
@@ -1,59 +1,83 @@
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
-import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { APP_CONFIG } from '../../../config/app-config.interface';
+import { environment } from '../../../environments/environment.test';
+import { getCollectionPageRoute } from '../../collection-page/collection-page-routing-paths';
+import { getCommunityPageRoute } from '../../community-page/community-page-routing-paths';
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { CommunityDataService } from '../../core/data/community-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { RouteService } from '../../core/services/route.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../core/shared/search/search-filter.service';
+import {
+  SearchConfig,
+  SortConfig,
+} from '../../core/shared/search/search-filters/search-config.model';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
 import { HostWindowService } from '../host-window.service';
 import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SearchComponent } from './search.component';
-import { SearchService } from '../../core/shared/search/search.service';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ActivatedRoute } from '@angular/router';
-import { By } from '@angular/platform-browser';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
 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 { RouteService } from '../../core/services/route.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
-import { PaginatedSearchOptions } from './models/paginated-search-options.model';
 import { SidebarServiceStub } from '../testing/sidebar-service.stub';
-import { SearchConfig, SortConfig } from '../../core/shared/search/search-filters/search-config.model';
-import { Item } from '../../core/shared/item.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { SearchObjects } from './models/search-objects.model';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchFilterConfig } from './models/search-filter-config.model';
 import { FilterType } from './models/filter-type.model';
+import { PaginatedSearchOptions } from './models/paginated-search-options.model';
+import { SearchFilterConfig } from './models/search-filter-config.model';
+import { SearchObjects } from './models/search-objects.model';
+import { SearchComponent } from './search.component';
 
 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: {},
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-  select: observableOf(true)
+  select: observableOf(true),
 });
 const sortConfigList: SortConfig[] = [
   { name: 'score', sortOrder: SortDirection.DESC },
   { name: 'dc.title', sortOrder: SortDirection.ASC },
-  { name: 'dc.title', sortOrder: SortDirection.DESC }
+  { name: 'dc.title', sortOrder: SortDirection.DESC },
 ];
 const sortOptionsList: SortOptions[] = [
   new SortOptions('score', SortDirection.DESC),
   new SortOptions('dc.title', SortDirection.ASC),
-  new SortOptions('dc.title', SortDirection.DESC)
+  new SortOptions('dc.title', SortDirection.DESC),
 ];
 const searchConfig = Object.assign(new SearchConfig(), {
-  sortOptions: sortConfigList
+  sortOptions: sortConfigList,
 });
 const paginationId = 'search-test-page-id';
 const pagination: PaginationComponentOptions = new PaginationComponentOptions();
@@ -65,15 +89,15 @@ const mockDso = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Item nr 1'
-      }
-    ]
+        value: 'Item nr 1',
+      },
+    ],
   },
   _links: {
     self: {
-      href: 'selfLink1'
-    }
-  }
+      href: 'selfLink1',
+    },
+  },
 });
 
 const mockDso2 = Object.assign(new Item(), {
@@ -81,19 +105,18 @@ const mockDso2 = Object.assign(new Item(), {
     'dc.title': [
       {
         language: 'en_US',
-        value: 'Item nr 2'
-      }
-    ]
+        value: 'Item nr 2',
+      },
+    ],
   },
   _links: {
     self: {
-      href: 'selfLink2'
-    }
-  }
+      href: 'selfLink2',
+    },
+  },
 });
-const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
 const mockSearchResults: SearchObjects<DSpaceObject> = Object.assign(new SearchObjects(), {
-  page: [mockDso, mockDso2]
+  page: [mockDso, mockDso2],
 });
 const mockResultsRD: RemoteData<SearchObjects<DSpaceObject>> = createSuccessfulRemoteDataObject(mockSearchResults);
 const mockResultsRD$: Observable<RemoteData<SearchObjects<DSpaceObject>>> = observableOf(mockResultsRD);
@@ -101,36 +124,27 @@ const searchServiceStub = jasmine.createSpyObj('SearchService', {
   search: mockResultsRD$,
   getSearchLink: '/search',
   getScopes: observableOf(['test-scope']),
-  getSearchConfigurationFor: createSuccessfulRemoteDataObject$(searchConfig)
-});
-const configurationParam = 'default';
+  getSearchConfigurationFor: createSuccessfulRemoteDataObject$(searchConfig),
+  trackSearch: {},
+}) as SearchService;
 const queryParam = 'test 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([
       ['query', queryParam],
-      ['scope', scopeParam]
-    ])
+      ['scope', scopeParam],
+    ]),
   },
   queryParams: observableOf({
     query: queryParam,
-    scope: scopeParam
-  })
+    scope: scopeParam,
+  }),
 };
 
 const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
@@ -138,32 +152,29 @@ const mockFilterConfig: SearchFilterConfig = Object.assign(new SearchFilterConfi
   filterType: FilterType.text,
   hasFacets: false,
   isOpenByDefault: false,
-  pageSize: 2
+  pageSize: 2,
 });
 const mockFilterConfig2: SearchFilterConfig = Object.assign(new SearchFilterConfig(), {
   name: 'test2',
   filterType: FilterType.text,
   hasFacets: false,
   isOpenByDefault: false,
-  pageSize: 1
+  pageSize: 1,
 });
 
 const filtersConfigRD = createSuccessfulRemoteDataObject([mockFilterConfig, mockFilterConfig2]);
 const filtersConfigRD$ = observableOf(filtersConfigRD);
 
 const routeServiceStub = {
-  getRouteParameterValue: () => {
-    return observableOf('');
-  },
   getQueryParameterValue: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   getQueryParamsWithPrefix: () => {
-    return observableOf('');
+    return observableOf(null);
   },
   setParameter: () => {
     return;
-  }
+  },
 };
 
 let searchConfigurationServiceStub;
@@ -177,17 +188,17 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
     getCurrentScope: observableOf('test-id'),
     getCurrentSort: observableOf(sortOptionsList[0]),
     updateFixedFilter: jasmine.createSpy('updateFixedFilter'),
-    setPaginationId: jasmine.createSpy('setPaginationId')
+    setPaginationId: jasmine.createSpy('setPaginationId'),
   });
 
   searchConfigurationServiceStub.setPaginationId.and.callFake((pageId) => {
     paginatedSearchOptions$.next(Object.assign(paginatedSearchOptions$.value, {
       pagination: Object.assign(new PaginationComponentOptions(), {
-        id: pageId
-      })
+        id: pageId,
+      }),
     }));
   });
-  searchConfigurationServiceStub.paginatedSearchOptions = new BehaviorSubject(new PaginatedSearchOptions({pagination: {id: 'default'} as any}));
+  searchConfigurationServiceStub.paginatedSearchOptions = new BehaviorSubject(new PaginatedSearchOptions({ pagination: { id: 'default' } as any }));
 
   TestBed.configureTestingModule({
     imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, NgbCollapseModule],
@@ -196,42 +207,43 @@ export function configureSearchComponentTestingModule(compType, additionalDeclar
       { provide: SearchService, useValue: searchServiceStub },
       {
         provide: CommunityDataService,
-        useValue: jasmine.createSpyObj('communityService', ['findById', 'findAll'])
+        useValue: jasmine.createSpyObj('communityService', ['findById', 'findAll']),
       },
       { provide: ActivatedRoute, useValue: activatedRouteStub },
       { provide: RouteService, useValue: routeServiceStub },
       {
-        provide: Store, useValue: store
+        provide: Store, useValue: store,
       },
       {
         provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService',
           {
             isXs: observableOf(true),
             isSm: observableOf(false),
-            isXsOrSm: observableOf(true)
-          })
+            isXsOrSm: observableOf(true),
+          }),
       },
       {
         provide: SidebarService,
-        useValue: SidebarServiceStub
+        useValue: SidebarServiceStub,
       },
       {
         provide: SearchFilterService,
-        useValue: {}
+        useValue: {},
       },
       {
         provide: SEARCH_CONFIG_SERVICE,
-        useValue: searchConfigurationServiceStub
-      }
+        useValue: searchConfigurationServiceStub,
+      },
+      { provide: APP_CONFIG, useValue: environment },
     ],
-    schemas: [NO_ERRORS_SCHEMA]
+    schemas: [NO_ERRORS_SCHEMA],
   }).overrideComponent(compType, {
     set: {
       changeDetection: ChangeDetectionStrategy.Default,
       providers: [{
         provide: SearchConfigurationService,
-        useValue: searchConfigurationServiceStub
-      }]
+        useValue: searchConfigurationServiceStub,
+      }],
     },
 
   }).compileComponents();
@@ -249,16 +261,10 @@ describe('SearchComponent', () => {
     comp.paginationId = paginationId;
 
     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(() => {
@@ -268,19 +274,19 @@ describe('SearchComponent', () => {
 
     const expectedSearchOptions = Object.assign(paginatedSearchOptions$.value, {
       configuration: 'default',
-      sort: sortOptionsList[0]
+      sort: sortOptionsList[0],
     });
     expect(comp.currentConfiguration$).toBeObservable(cold('b', {
-      b: 'default'
+      b: 'default',
     }));
     expect(comp.currentSortOptions$).toBeObservable(cold('b', {
-      b: sortOptionsList[0]
+      b: sortOptionsList[0],
     }));
     expect(comp.sortOptionsList$).toBeObservable(cold('b', {
-      b: sortOptionsList
+      b: sortOptionsList,
     }));
     expect(comp.searchOptions$).toBeObservable(cold('b', {
-      b: expectedSearchOptions
+      b: expectedSearchOptions,
     }));
     expect((comp as any).retrieveSearchResults).toHaveBeenCalledWith(expectedSearchOptions);
   }));
@@ -290,7 +296,7 @@ describe('SearchComponent', () => {
     tick(100);
     const expectedResults = mockResultsRD;
     expect(comp.resultsRD$).toBeObservable(cold('b', {
-      b: expectedResults
+      b: expectedResults,
     }));
   }));
 
@@ -299,7 +305,7 @@ describe('SearchComponent', () => {
     tick(100);
     const expectedResults = filtersConfigRD;
     expect(comp.filtersRD$).toBeObservable(cold('b', {
-      b: expectedResults
+      b: expectedResults,
     }));
   }));
 
@@ -327,4 +333,64 @@ describe('SearchComponent', () => {
     }));
 
   });
+
+  describe('getDsoUUIDFromUrl', () => {
+    let url: string;
+    let result: string;
+
+    describe('when the navigated URL is an entity route', () => {
+      beforeEach(() => {
+        url = '/entities/publication/9a364471-3f19-4e7b-916a-a24a44ff48e3';
+        result = (comp as any).getDsoUUIDFromUrl(url);
+      });
+
+      it('should return the UUID', () => {
+        expect(result).toEqual('9a364471-3f19-4e7b-916a-a24a44ff48e3');
+      });
+    });
+
+    describe('when the navigated URL is a community route', () => {
+      beforeEach(() => {
+        url = `${getCommunityPageRoute('9a364471-3f19-4e7b-916a-a24a44ff48e3')}`;
+        result = (comp as any).getDsoUUIDFromUrl(url);
+      });
+
+      it('should return the UUID', () => {
+        expect(result).toEqual('9a364471-3f19-4e7b-916a-a24a44ff48e3');
+      });
+    });
+
+    describe('when the navigated URL is a collection route', () => {
+      beforeEach(() => {
+        url = `${getCollectionPageRoute('9a364471-3f19-4e7b-916a-a24a44ff48e3')}`;
+        result = (comp as any).getDsoUUIDFromUrl(url);
+      });
+
+      it('should return the UUID', () => {
+        expect(result).toEqual('9a364471-3f19-4e7b-916a-a24a44ff48e3');
+      });
+    });
+
+    describe('when the navigated URL is an item route', () => {
+      beforeEach(() => {
+        url = '/items/9a364471-3f19-4e7b-916a-a24a44ff48e3';
+        result = (comp as any).getDsoUUIDFromUrl(url);
+      });
+
+      it('should return the UUID', () => {
+        expect(result).toEqual('9a364471-3f19-4e7b-916a-a24a44ff48e3');
+      });
+    });
+
+    describe('when the navigated URL is an invalid route', () => {
+      beforeEach(() => {
+        url = '/invalid/object/route/9a364471-3f19-4e7b-916a-a24a44ff48e3';
+        result = (comp as any).getDsoUUIDFromUrl(url);
+      });
+
+      it('should return null', () => {
+        expect(result).toBeNull();
+      });
+    });
+  });
 });
diff --git a/src/app/shared/search/search.component.ts b/src/app/shared/search/search.component.ts
index 2abd5290cb..113e788a97 100644
--- a/src/app/shared/search/search.component.ts
+++ b/src/app/shared/search/search.component.ts
@@ -1,39 +1,73 @@
-import { ChangeDetectionStrategy, Component, EventEmitter, Inject, Input, OnInit, Output } from '@angular/core';
-import { Router } from '@angular/router';
-
-import { BehaviorSubject, combineLatest, Observable, Subscription } from 'rxjs';
-import { debounceTime, distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
-import { uniqueId } from 'lodash';
+import {
+  ChangeDetectionStrategy,
+  Component,
+  EventEmitter,
+  Inject,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  NavigationStart,
+  Router,
+} from '@angular/router';
+import uniqueId from 'lodash/uniqueId';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
+import {
+  APP_CONFIG,
+  AppConfig,
+} from '../../../config/app-config.interface';
+import { COLLECTION_MODULE_PATH } from '../../collection-page/collection-page-routing-paths';
+import { COMMUNITY_MODULE_PATH } from '../../community-page/community-page-routing-paths';
+import { SortOptions } from '../../core/cache/models/sort-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 { pushInOut } from '../animations/push';
-import { HostWindowService } from '../host-window.service';
-import { SidebarService } from '../sidebar/sidebar.service';
-import { hasValue } 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';
-import { SearchResult } from './models/search-result.model';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { SearchService } from '../../core/shared/search/search.service';
-import { currentPath } from '../utils/route.utils';
 import { Context } from '../../core/shared/context.model';
-import { SortOptions } from '../../core/cache/models/sort-options.model';
-import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model';
-import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
-import { getFirstCompletedRemoteData } from '../../core/shared/operators';
-import { followLink } from '../utils/follow-link-config.model';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { Item } from '../../core/shared/item.model';
-import { SearchObjects } from './models/search-objects.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { SearchService } from '../../core/shared/search/search.service';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model';
 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 { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { ITEM_MODULE_PATH } from '../../item-page/item-page-routing-paths';
+import { SEARCH_CONFIG_SERVICE } from '../../my-dspace-page/my-dspace-page.component';
+import { pushInOut } from '../animations/push';
+import {
+  hasValue,
+  hasValueOperator,
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
+import { HostWindowService } from '../host-window.service';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { SidebarService } from '../sidebar/sidebar.service';
+import { followLink } from '../utils/follow-link-config.model';
+import { currentPath } from '../utils/route.utils';
+import { PaginatedSearchOptions } from './models/paginated-search-options.model';
 import { SearchFilterConfig } from './models/search-filter-config.model';
+import { SearchObjects } from './models/search-objects.model';
+import { SearchResult } from './models/search-result.model';
+import { SelectionConfig } from './search-results/search-results.component';
+import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
 
 @Component({
   selector: 'ds-search',
@@ -46,7 +80,7 @@ import { SearchFilterConfig } from './models/search-filter-config.model';
 /**
  * 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
@@ -63,7 +97,7 @@ export class SearchComponent implements OnInit {
    * The configuration to use for the search options
    * If empty, 'default' is used
    */
-  @Input() configuration = 'default';
+  @Input() configuration;
 
   /**
    * The actual query for the fixed filter.
@@ -117,11 +151,21 @@ export class SearchComponent implements OnInit {
    */
   @Input() selectionConfig: SelectionConfig;
 
+  /**
+   * A boolean representing if show csv export button
+   */
+  @Input() showCsvExport = false;
+
   /**
    * A boolean representing if show search sidebar button
    */
   @Input() showSidebar = true;
 
+  /**
+   * Whether to show the thumbnail preview
+   */
+  @Input() showThumbnails;
+
   /**
    * Whether to show the view mode switch
    */
@@ -130,7 +174,7 @@ export class SearchComponent implements OnInit {
   /**
    * List of available view mode
    */
-  @Input() useUniquePageId: false;
+  @Input() useUniquePageId: boolean;
 
   /**
    * List of available view mode
@@ -147,6 +191,21 @@ export class SearchComponent implements OnInit {
    */
   @Input() trackStatistics = false;
 
+  /**
+   * The default value for the search query when none is already defined in the {@link SearchConfigurationService}
+   */
+  @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;
+
+  /**
+   * Hides the scope in the url, this can be useful when you hardcode the scope in another way
+   */
+  @Input() hideScopeInUrl: boolean;
+
   /**
    * The current configuration used during the search
    */
@@ -160,7 +219,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
@@ -218,9 +277,21 @@ export class SearchComponent implements OnInit {
   searchLink: string;
 
   /**
-   * Subscription to unsubscribe from
+   * Regex to match UUIDs
    */
-  sub: Subscription;
+  uuidRegex = /\b[0-9a-f]{8}\b-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-\b[0-9a-f]{12}\b/g;
+
+  /**
+   * List of paths that are considered to be the start of a route to an object page (excluding "/", e.g. "items")
+   * These are expected to end on an object UUID
+   * If they match the route we're navigating to, an object property will be added to the search event sent
+   */
+  allowedObjectPaths: string[] = ['entities', ITEM_MODULE_PATH, COLLECTION_MODULE_PATH, COMMUNITY_MODULE_PATH];
+
+  /**
+   * Subscriptions to unsubscribe from
+   */
+  subs: Subscription[] = [];
 
   /**
    * Emits an event with the current search result entries
@@ -242,7 +313,9 @@ 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,
+  ) {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
   }
 
@@ -268,6 +341,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);
@@ -275,34 +352,39 @@ 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()
+      distinctUntilChanged(),
     );
     const sortOption$: Observable<SortOptions> = searchSortOptions$.pipe(
       switchMap((searchSortOptions: SortOptions[]) => {
         const defaultSort: SortOptions = searchSortOptions[0];
         return this.searchConfigService.getCurrentSort(this.paginationId, defaultSort);
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
     const searchOptions$: Observable<PaginatedSearchOptions> = this.getSearchOptions().pipe(distinctUntilChanged());
 
-    this.sub = 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]) => {
+      debounceTime(100),
+    ).subscribe(([configuration, searchSortOptions, searchOptions, sortOption, scope]: [string, SortOptions[], PaginatedSearchOptions, SortOptions, string]) => {
       // Build the PaginatedSearchOptions object
       const combinedOptions = Object.assign({}, searchOptions,
         {
           configuration: searchOptions.configuration || configuration,
-          sort: sortOption || searchOptions.sort
+          sort: sortOption || searchOptions.sort,
         });
+      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
@@ -310,15 +392,16 @@ 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);
       }
-    });
+    }));
+
+    this.subscribeToRoutingEvents();
   }
 
   /**
@@ -360,12 +443,10 @@ export class SearchComponent implements OnInit {
   }
 
   /**
-   * Unsubscribe from the subscription
+   * Unsubscribe from the subscriptions
    */
   ngOnDestroy(): void {
-    if (hasValue(this.sub)) {
-      this.sub.unsubscribe();
-    }
+    this.subs.filter((sub) => hasValue(sub)).forEach((sub) => sub.unsubscribe());
   }
 
   /**
@@ -398,14 +479,22 @@ export class SearchComponent implements OnInit {
   private retrieveSearchResults(searchOptions: PaginatedSearchOptions) {
     this.resultsRD$.next(null);
     this.lastSearchOptions = searchOptions;
+    const followLinks = [
+      followLink<Item>('thumbnail', { isOptional: true }),
+      followLink<SubmissionObject>('item', { isOptional: true }, followLink<Item>('thumbnail', { isOptional: true })) as any,
+    ];
+    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);
+    }
     this.service.search(
       searchOptions,
       undefined,
       this.useCachedVersionIfAvailable,
       true,
-      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 })
+      ...followLinks,
     ).pipe(getFirstCompletedRemoteData())
       .subscribe((results: RemoteData<SearchObjects<DSpaceObject>>) => {
         if (results.hasSucceeded) {
@@ -420,6 +509,45 @@ export class SearchComponent implements OnInit {
       });
   }
 
+  /**
+   * Subscribe to routing events to detect when a user moves away from the search page
+   * When the user is routing to an object page, it needs to send out a separate search event containing that object's UUID
+   * This method should only be called once and is essentially what SearchTrackingComponent used to do (now removed)
+   * @private
+   */
+  private subscribeToRoutingEvents(): void {
+    if (this.trackStatistics) {
+      this.subs.push(
+        this.router.events.pipe(
+          filter((event) => event instanceof NavigationStart),
+          map((event: NavigationStart) => this.getDsoUUIDFromUrl(event.url)),
+          hasValueOperator(),
+        ).subscribe((uuid) => {
+          if (this.resultsRD$.value.hasSucceeded) {
+            this.service.trackSearch(this.searchOptions$.value, this.resultsRD$.value.payload as SearchObjects<DSpaceObject>, uuid);
+          }
+        }),
+      );
+    }
+  }
+
+  /**
+   * Get the UUID from a DSO url
+   * Return null if the url isn't an object page (allowedObjectPaths) or the UUID couldn't be found
+   * @param url
+   */
+  private getDsoUUIDFromUrl(url: string): string {
+    if (isNotEmpty(url)) {
+      if (this.allowedObjectPaths.some((path) => url.startsWith(`/${path}`))) {
+        const uuid = url.substring(url.lastIndexOf('/') + 1);
+        if (uuid.match(this.uuidRegex)) {
+          return uuid;
+        }
+      }
+    }
+    return null;
+  }
+
   /**
    * Check if the sidebar is collapsed
    * @returns {Observable<boolean>} emits true if the sidebar is currently collapsed, false if it is expanded
diff --git a/src/app/shared/search/search.module.ts b/src/app/shared/search/search.module.ts
index 426ed82aef..18b3f46a0a 100644
--- a/src/app/shared/search/search.module.ts
+++ b/src/app/shared/search/search.module.ts
@@ -1,36 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
-import { SearchFiltersComponent } from './search-filters/search-filters.component';
-import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
-import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
-import { SearchLabelsComponent } from './search-labels/search-labels.component';
-import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
-import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
-import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
-import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
-import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
-import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
-import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
-import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
-import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
-import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
-import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
-import { SearchSettingsComponent } from './search-settings/search-settings.component';
+import { NgModule } from '@angular/core';
+import {
+  MissingTranslationHandler,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { NouisliderModule } from 'ng2-nouislider';
+
 import { ConfigurationSearchPageComponent } from '../../search-page/configuration-search-page.component';
 import { ThemedConfigurationSearchPageComponent } from '../../search-page/themed-configuration-search-page.component';
-import { SearchObjects } from './models/search-objects.model';
+import { SharedModule } from '../shared.module';
+import { MissingTranslationHelper } from '../translate/missing-translation.helper';
+import { AdvancedSearchComponent } from './advanced-search/advanced-search.component';
 import { FacetConfigResponse } from './models/facet-config-response.model';
 import { FacetValues } from './models/facet-values.model';
+import { SearchObjects } from './models/search-objects.model';
 import { SearchResult } from './models/search-result.model';
-import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
-import { MissingTranslationHelper } from '../translate/missing-translation.helper';
-import { SharedModule } from '../shared.module';
-import { SearchResultsComponent } from './search-results/search-results.component';
 import { SearchComponent } from './search.component';
-import { ThemedSearchComponent } from './themed-search.component';
+import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
+import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
+import { SearchFacetFilterComponent } from './search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { SearchFacetOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
+import { SearchFacetRangeOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
+import { SearchFacetSelectedOptionComponent } from './search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
+import { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
+import { SearchFilterComponent } from './search-filters/search-filter/search-filter.component';
+import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchRangeFilterComponent } from './search-filters/search-filter/search-range-filter/search-range-filter.component';
+import { SearchTextFilterComponent } from './search-filters/search-filter/search-text-filter/search-text-filter.component';
+import { SearchFiltersComponent } from './search-filters/search-filters.component';
+import { ThemedSearchFiltersComponent } from './search-filters/themed-search-filters.component';
+import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
+import { SearchLabelsComponent } from './search-labels/search-labels.component';
+import { SearchResultsComponent } from './search-results/search-results.component';
 import { ThemedSearchResultsComponent } from './search-results/themed-search-results.component';
+import { SearchSettingsComponent } from './search-settings/search-settings.component';
 import { ThemedSearchSettingsComponent } from './search-settings/themed-search-settings.component';
+import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
+import { ThemedSearchSidebarComponent } from './search-sidebar/themed-search-sidebar.component';
+import { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
+import { ThemedSearchComponent } from './themed-search.component';
 
 const COMPONENTS = [
   SearchComponent,
@@ -57,6 +65,9 @@ const COMPONENTS = [
   ThemedConfigurationSearchPageComponent,
   ThemedSearchResultsComponent,
   ThemedSearchSettingsComponent,
+  AdvancedSearchComponent,
+  ThemedSearchFiltersComponent,
+  ThemedSearchSidebarComponent,
 ];
 
 const ENTRY_COMPONENTS = [
@@ -78,24 +89,25 @@ export const MODELS = [
   SearchObjects,
   FacetConfigResponse,
   FacetValues,
-  SearchResult
+  SearchResult,
 ];
 
 @NgModule({
   declarations: [
-    ...COMPONENTS
+    ...COMPONENTS,
   ],
   imports: [
     CommonModule,
     TranslateModule.forChild({
       missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
-      useDefaultLang: true
+      useDefaultLang: true,
     }),
-    SharedModule.withEntryComponents()
+    SharedModule.withEntryComponents(),
+    NouisliderModule,
   ],
   exports: [
-    ...COMPONENTS
-  ]
+    ...COMPONENTS,
+  ],
 })
 export class SearchModule {
   /**
@@ -105,7 +117,7 @@ export class SearchModule {
   static withEntryComponents() {
     return {
       ngModule: SearchModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/shared/search/search.utils.spec.ts b/src/app/shared/search/search.utils.spec.ts
index 70bf9a43a0..1689fa4cbb 100644
--- a/src/app/shared/search/search.utils.spec.ts
+++ b/src/app/shared/search/search.utils.spec.ts
@@ -4,7 +4,7 @@ import {
   addOperatorToFilterValue,
   escapeRegExp,
   getFacetValueForType,
-  stripOperatorFromFilterValue
+  stripOperatorFromFilterValue,
 } from './search.utils';
 
 describe('Search Utils', () => {
@@ -19,20 +19,20 @@ describe('Search Utils', () => {
         value: 'Value with search href',
         _links: {
           search: {
-            href: 'rest/api/search?f.otherFacet=Other facet value,operator&f.facetName=Value with search href,operator'
-          }
-        }
+            href: 'rest/api/search?f.otherFacet=Other facet value,operator&f.facetName=Value with search href,operator',
+          },
+        },
       });
       facetValueWithSearchHrefAuthority = Object.assign(new FacetValue(), {
         value: 'Value with search href',
         authorityKey: 'uuid',
-        }
+      },
       );
       facetValueWithoutSearchHref = Object.assign(new FacetValue(), {
-        value: 'Value without search href'
+        value: 'Value without search href',
       });
       searchFilterConfig = Object.assign(new SearchFilterConfig(), {
-        name: 'facetName'
+        name: 'facetName',
       });
     });
 
diff --git a/src/app/shared/search/search.utils.ts b/src/app/shared/search/search.utils.ts
index cfb96a5285..f2be597d75 100644
--- a/src/app/shared/search/search.utils.ts
+++ b/src/app/shared/search/search.utils.ts
@@ -1,6 +1,6 @@
+import { isNotEmpty } from '../empty.util';
 import { FacetValue } from './models/facet-value.model';
 import { SearchFilterConfig } from './models/search-filter-config.model';
-import { isNotEmpty } from '../empty.util';
 
 /**
  * Get a facet's value by matching its parameter in the search href, this will include the operator of the facet value
@@ -49,7 +49,7 @@ export function stripOperatorFromFilterValue(value: string) {
  * @param operator
  */
 export function addOperatorToFilterValue(value: string, operator: string) {
-  if (!value.match(new RegExp(`^.+,(equals|query|authority)$`))) {
+  if (!value.match(new RegExp(`^.+,(equals|query|authority|contains|notcontains|notequals)$`))) {
     return `${value},${operator}`;
   }
   return value;
diff --git a/src/app/shared/search/themed-search.component.ts b/src/app/shared/search/themed-search.component.ts
index 64a2befeb2..15a3006de4 100644
--- a/src/app/shared/search/themed-search.component.ts
+++ b/src/app/shared/search/themed-search.component.ts
@@ -1,69 +1,113 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { ThemedComponent } from '../theme-support/themed.component';
-import { SearchComponent } from './search.component';
-import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+
 import { Context } from '../../core/shared/context.model';
-import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
-import { SelectionConfig } from './search-results/search-results.component';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { SearchObjects } from './models/search-objects.model';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
+import { CollectionElementLinkType } from '../object-collection/collection-element-link.type';
 import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { ThemedComponent } from '../theme-support/themed.component';
+import { SearchObjects } from './models/search-objects.model';
+import { SearchComponent } from './search.component';
+import { SelectionConfig } from './search-results/search-results.component';
+import { SearchConfigurationOption } from './search-switch-configuration/search-configuration-option.model';
 
 /**
- * Themed wrapper for SearchComponent
+ * Themed wrapper for {@link SearchComponent}
  */
 @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', 'showSidebar', 'showViewModes', 'useUniquePageId', 'viewModeList', 'showScopeSelector', 'resultFound', 'deselectObject', 'selectObject', 'trackStatistics'];
 
-  @Input() configurationList: SearchConfigurationOption[] = [];
+  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',
+    'trackStatistics',
+    'query',
+    'scope',
+    'hideScopeInUrl',
+    'resultFound',
+    'deselectObject',
+    'selectObject',
+  ];
 
-  @Input() context: Context = Context.Search;
+  @Input() configurationList: SearchConfigurationOption[];
 
-  @Input() configuration = 'default';
+  @Input() context: Context;
+
+  @Input() configuration: string;
 
   @Input() fixedFilterQuery: string;
 
-  @Input() useCachedVersionIfAvailable = true;
+  @Input() useCachedVersionIfAvailable: boolean;
 
-  @Input() inPlaceSearch = true;
+  @Input() inPlaceSearch: boolean;
 
   @Input() linkType: CollectionElementLinkType;
 
-  @Input() paginationId = 'spc';
+  @Input() paginationId: string;
 
-  @Input() searchEnabled = true;
+  @Input() searchEnabled: boolean;
 
-  @Input() sideBarWidth = 3;
+  @Input() sideBarWidth: number;
 
-  @Input() searchFormPlaceholder = 'search.search-form.placeholder';
+  @Input() searchFormPlaceholder: string;
 
-  @Input() selectable = false;
+  @Input() selectable: boolean;
 
   @Input() selectionConfig: SelectionConfig;
 
-  @Input() showSidebar = true;
+  @Input() showCsvExport: boolean;
 
-  @Input() showViewModes = true;
+  @Input() showSidebar: boolean;
 
-  @Input() useUniquePageId: false;
+  @Input() showThumbnails: boolean;
+
+  @Input() showViewModes: boolean;
+
+  @Input() useUniquePageId: boolean;
 
   @Input() viewModeList: ViewMode[];
 
-  @Input() showScopeSelector = true;
+  @Input() showScopeSelector: boolean;
 
-  @Input() trackStatistics = false;
+  @Input() trackStatistics: boolean;
 
-  @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter<SearchObjects<DSpaceObject>>();
+  @Input() query: string;
 
-  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Input() scope: string;
 
-  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Input() hideScopeInUrl: boolean;
+
+  @Output() resultFound: EventEmitter<SearchObjects<DSpaceObject>> = new EventEmitter();
+
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter();
+
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter();
 
   protected getComponentName(): string {
     return 'SearchComponent';
diff --git a/src/app/shared/selector.util.ts b/src/app/shared/selector.util.ts
new file mode 100644
index 0000000000..a0419086c6
--- /dev/null
+++ b/src/app/shared/selector.util.ts
@@ -0,0 +1,31 @@
+import {
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import { hasValue } from './empty.util';
+
+/**
+ * Export a function to return a subset of the state by key
+ */
+export function keySelector<T, V>(parentSelector, subState: string, key: string): MemoizedSelector<T, V> {
+  return createSelector(parentSelector, (state: T) => {
+    if (hasValue(state) && hasValue(state[subState])) {
+      return state[subState][key];
+    } else {
+      return undefined;
+    }
+  });
+}
+/**
+ * Export a function to return a subset of the state
+ */
+export function subStateSelector<T, V>(parentSelector, subState: string): MemoizedSelector<T, V> {
+  return createSelector(parentSelector, (state: T) => {
+    if (hasValue(state) && hasValue(state[subState])) {
+      return state[subState];
+    } else {
+      return undefined;
+    }
+  });
+}
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 45e9764151..7362451676 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -1,358 +1,220 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { RouterModule } from '@angular/router';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { CdkTreeModule } from '@angular/cdk/tree';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-
-import { NouisliderModule } from 'ng2-nouislider';
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { RouterModule } from '@angular/router';
 import {
-  NgbDatepickerModule,
   NgbDropdownModule,
   NgbNavModule,
   NgbPaginationModule,
-  NgbTimepickerModule,
   NgbTooltipModule,
   NgbTypeaheadModule,
 } from '@ng-bootstrap/ng-bootstrap';
-import { MissingTranslationHandler, TranslateModule } from '@ngx-translate/core';
-import { NgxPaginationModule } from 'ngx-pagination';
-import { FileUploadModule } from 'ng2-file-upload';
+import {
+  MissingTranslationHandler,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
-import { MomentModule } from 'ngx-moment';
-import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
-import {
-  ExportMetadataSelectorComponent
-} from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
-import {
-  ExportBatchSelectorComponent
-} from './dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
-import {
-  ImportBatchSelectorComponent
-} from './dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
-import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
-import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
-import { EnumKeysPipe } from './utils/enum-keys-pipe';
-import { FileSizePipe } from './utils/file-size-pipe';
-import { MetadataFieldValidator } from './utils/metadatafield-validator.directive';
-import { SafeUrlPipe } from './utils/safe-url-pipe';
-import { ConsolePipe } from './utils/console.pipe';
-import {
-  CollectionListElementComponent
-} from './object-list/collection-list-element/collection-list-element.component';
-import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
-import {
-  SearchResultListElementComponent
-} from './object-list/search-result-list-element/search-result-list-element.component';
-import { ObjectListComponent } from './object-list/object-list.component';
-import { ThemedObjectListComponent } from './object-list/themed-object-list.component';
-import {
-  CollectionGridElementComponent
-} from './object-grid/collection-grid-element/collection-grid-element.component';
-import { CommunityGridElementComponent } from './object-grid/community-grid-element/community-grid-element.component';
-import {
-  AbstractListableElementComponent
-} from './object-collection/shared/object-collection-element/abstract-listable-element.component';
-import { ObjectGridComponent } from './object-grid/object-grid.component';
-import { ObjectCollectionComponent } from './object-collection/object-collection.component';
-import { ErrorComponent } from './error/error.component';
-import { LoadingComponent } from './loading/loading.component';
-import { PaginationComponent } from './pagination/pagination.component';
+import { NgxPaginationModule } from 'ngx-pagination';
+
+import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
+import { QualityAssuranceEventDataService } from '../core/notifications/qa/events/quality-assurance-event-data.service';
+import { QualityAssuranceSourceDataService } from '../core/notifications/qa/source/quality-assurance-source-data.service';
+import { CurationFormComponent } from '../curation-form/curation-form.component';
+import { ModifyItemOverviewComponent } from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
+import { ItemPageTitleFieldComponent } from '../item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+import { ThemedItemPageTitleFieldComponent } from '../item-page/simple/field-components/specific-field/title/themed-item-page-field.component';
+import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
+import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
+import { ThemedThumbnailComponent } from '../thumbnail/themed-thumbnail.component';
 import { ThumbnailComponent } from '../thumbnail/thumbnail.component';
-import { SearchFormComponent } from './search-form/search-form.component';
-import {
-  SearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/search-result-grid-element.component';
-import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
-import { VarDirective } from './utils/var.directive';
+import { DynamicComponentLoaderDirective } from './abstract-component-loader/dynamic-component-loader.directive';
+import { AlertComponent } from './alert/alert.component';
 import { AuthNavMenuComponent } from './auth-nav-menu/auth-nav-menu.component';
 import { ThemedAuthNavMenuComponent } from './auth-nav-menu/themed-auth-nav-menu.component';
+import { ThemedUserMenuComponent } from './auth-nav-menu/user-menu/themed-user-menu.component';
+import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
+import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
+import { ThemedCollectionDropdownComponent } from './collection-dropdown/themed-collection-dropdown.component';
+import { ComcolMetadataComponent } from './comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
+import { ConfirmationModalComponent } from './confirmation-modal/confirmation-modal.component';
+import { ContextHelpDirective } from './context-help.directive';
+import { ContextHelpWrapperComponent } from './context-help-wrapper/context-help-wrapper.component';
+import { DsSelectComponent } from './ds-select/ds-select.component';
+import { AuthorizedCollectionSelectorComponent } from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
+import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component';
+import { CreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+import { ThemedCreateCollectionParentSelectorComponent } from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
+import { CreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+import { ThemedCreateCommunityParentSelectorComponent } from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
+import { CreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { ThemedCreateItemParentSelectorComponent } from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
+import { EditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import { ThemedEditCollectionSelectorComponent } from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
+import { EditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+import { ThemedEditCommunitySelectorComponent } from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
+import { EditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import { ThemedEditItemSelectorComponent } from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
+import { ExportBatchSelectorComponent } from './dso-selector/modal-wrappers/export-batch-selector/export-batch-selector.component';
+import { ExportMetadataSelectorComponent } from './dso-selector/modal-wrappers/export-metadata-selector/export-metadata-selector.component';
+import { ImportBatchSelectorComponent } from './dso-selector/modal-wrappers/import-batch-selector/import-batch-selector.component';
+import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.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';
+import { ErrorComponent } from './error/error.component';
+import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
+import { ThemedFileDownloadLinkComponent } from './file-download-link/themed-file-download-link.component';
+import { HoverClassDirective } from './hover-class.directive';
+import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
+import { DsoInputSuggestionsComponent } from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
+import { FilterInputSuggestionsComponent } from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
+import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
+import { ValidationSuggestionsComponent } from './input-suggestions/validation-suggestions/validation-suggestions.component';
+import { LangSwitchComponent } from './lang-switch/lang-switch.component';
+import { ThemedLangSwitchComponent } from './lang-switch/themed-lang-switch.component';
+import { LoadingComponent } from './loading/loading.component';
+import { ThemedLoadingComponent } from './loading/themed-loading.component';
+import { LogInContainerComponent } from './log-in/container/log-in-container.component';
+import { LogInComponent } from './log-in/log-in.component';
+import { LogInExternalProviderComponent } from './log-in/methods/log-in-external-provider/log-in-external-provider.component';
+import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
+import { ThemedLogInComponent } from './log-in/themed-log-in.component';
 import { LogOutComponent } from './log-out/log-out.component';
-import { DragClickDirective } from './utils/drag-click.directive';
-import { TruncatePipe } from './utils/truncate.pipe';
+import { MenuModule } from './menu/menu.module';
+import { MetadataFieldWrapperComponent } from './metadata-field-wrapper/metadata-field-wrapper.component';
+import { MetadataRepresentationLoaderComponent } from './metadata-representation/metadata-representation-loader.component';
+import { MockAdminGuard } from './mocks/admin-guard.service.mock';
+import { ClaimedTaskActionsDeclineTaskComponent } from './mydspace-actions/claimed-task/decline-task/claimed-task-actions-decline-task.component';
+import { AdvancedClaimedTaskActionRatingComponent } from './mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component';
+import { AdvancedClaimedTaskActionSelectReviewerComponent } from './mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component';
+import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
+import { NotificationBoxComponent } from './notification-box/notification-box.component';
+import { ObjectCollectionComponent } from './object-collection/object-collection.component';
+import { AccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/access-status-badge.component';
+import { ThemedAccessStatusBadgeComponent } from './object-collection/shared/badges/access-status-badge/themed-access-status-badge.component';
+import { BadgesComponent } from './object-collection/shared/badges/badges.component';
+import { MyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+import { ThemedMyDSpaceStatusBadgeComponent } from './object-collection/shared/badges/my-dspace-status-badge/themed-my-dspace-status-badge.component';
+import { StatusBadgeComponent } from './object-collection/shared/badges/status-badge/status-badge.component';
+import { ThemedStatusBadgeComponent } from './object-collection/shared/badges/status-badge/themed-status-badge.component';
+import { ThemedBadgesComponent } from './object-collection/shared/badges/themed-badges.component';
+import { ThemedTypeBadgeComponent } from './object-collection/shared/badges/type-badge/themed-type-badge.component';
+import { TypeBadgeComponent } from './object-collection/shared/badges/type-badge/type-badge.component';
+import { ImportableListItemControlComponent } from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
+import { ListableObjectComponentLoaderComponent } from './object-collection/shared/listable-object/listable-object-component-loader.component';
+import { AbstractListableElementComponent } from './object-collection/shared/object-collection-element/abstract-listable-element.component';
+import { AbstractTabulatableElementComponent } from './object-collection/shared/objects-collection-tabulatable/objects-collection-tabulatable.component';
+import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
+import { TabulatableObjectsDirective } from './object-collection/shared/tabulatable-objects/tabulatable-objects.directive';
+import { TabulatableObjectsLoaderComponent } from './object-collection/shared/tabulatable-objects/tabulatable-objects-loader.component';
+import { SearchResultDetailElementComponent } from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
+import { ObjectDetailComponent } from './object-detail/object-detail.component';
+import { CollectionGridElementComponent } from './object-grid/collection-grid-element/collection-grid-element.component';
+import { CommunityGridElementComponent } from './object-grid/community-grid-element/community-grid-element.component';
+import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
+import { ObjectGridComponent } from './object-grid/object-grid.component';
+import { CollectionSearchResultGridElementComponent } from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
+import { CommunitySearchResultGridElementComponent } from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
+import { ItemSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
+import { SearchResultGridElementComponent } from './object-grid/search-result-grid-element/search-result-grid-element.component';
+import { BitstreamListItemComponent } from './object-list/bitstream-list-item/bitstream-list-item.component';
+import { BrowseEntryListElementComponent } from './object-list/browse-entry-list-element/browse-entry-list-element.component';
+import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
+import { CollectionListElementComponent } from './object-list/collection-list-element/collection-list-element.component';
+import { CommunityListElementComponent } from './object-list/community-list-element/community-list-element.component';
+import { ItemListElementComponent } from './object-list/item-list-element/item-types/item/item-list-element.component';
+import { ListableNotificationObjectComponent } from './object-list/listable-notification-object/listable-notification-object.component';
+import { BrowseLinkMetadataListElementComponent } from './object-list/metadata-representation-list-element/browse-link/browse-link-metadata-list-element.component';
+import { ItemMetadataListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
+import { ItemMetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
+import { MetadataRepresentationListElementComponent } from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
+import { PlainTextMetadataListElementComponent } from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
+import { ObjectListComponent } from './object-list/object-list.component';
+import { CollectionSearchResultListElementComponent } from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
+import { CommunitySearchResultListElementComponent } from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
+import { ItemSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { SearchResultListElementComponent } from './object-list/search-result-list-element/search-result-list-element.component';
+import { TabulatableResultListElementsComponent } from './object-list/search-result-list-element/tabulatable-search-result/tabulatable-result-list-elements.component';
+import { CollectionSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
+import { CommunitySidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
+import { PublicationSidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
+import { SidebarSearchListElementComponent } from './object-list/sidebar-search-list-element/sidebar-search-list-element.component';
+import { ThemedObjectListComponent } from './object-list/themed-object-list.component';
+import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
+import { ItemSelectComponent } from './object-select/item-select/item-select.component';
+import { ObjectTableComponent } from './object-table/object-table.component';
+import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
+import { PaginationComponent } from './pagination/pagination.component';
+import { RoleDirective } from './roles/role.directive';
+import { RSSComponent } from './rss-feed/rss.component';
+import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
+import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
+import { SearchFormComponent } from './search-form/search-form.component';
+import { ThemedSearchFormComponent } from './search-form/themed-search-form.component';
+import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
+import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
+import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
+import { StartsWithLoaderComponent } from './starts-with/starts-with-loader.component';
+import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
+import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
+import { MissingTranslationHelper } from './translate/missing-translation.helper';
 import { TruncatableComponent } from './truncatable/truncatable.component';
 import { TruncatableService } from './truncatable/truncatable.service';
 import { TruncatablePartComponent } from './truncatable/truncatable-part/truncatable-part.component';
-import { UploaderComponent } from './uploader/uploader.component';
-import { ChipsComponent } from './chips/chips.component';
-import { NumberPickerComponent } from './number-picker/number-picker.component';
-import { MockAdminGuard } from './mocks/admin-guard.service.mock';
-import { AlertComponent } from './alert/alert.component';
-import {
-  SearchResultDetailElementComponent
-} from './object-detail/my-dspace-result-detail-element/search-result-detail-element.component';
-import { ClaimedTaskActionsComponent } from './mydspace-actions/claimed-task/claimed-task-actions.component';
-import { PoolTaskActionsComponent } from './mydspace-actions/pool-task/pool-task-actions.component';
-import { ObjectDetailComponent } from './object-detail/object-detail.component';
-import {
-  ItemDetailPreviewComponent
-} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component';
-import {
-  MyDSpaceItemStatusComponent
-} from './object-collection/shared/mydspace-item-status/my-dspace-item-status.component';
-import { WorkspaceitemActionsComponent } from './mydspace-actions/workspaceitem/workspaceitem-actions.component';
-import { WorkflowitemActionsComponent } from './mydspace-actions/workflowitem/workflowitem-actions.component';
-import { ItemSubmitterComponent } from './object-collection/shared/mydspace-item-submitter/item-submitter.component';
-import { ItemActionsComponent } from './mydspace-actions/item/item-actions.component';
-import {
-  ClaimedTaskActionsApproveComponent
-} from './mydspace-actions/claimed-task/approve/claimed-task-actions-approve.component';
-import {
-  ClaimedTaskActionsRejectComponent
-} from './mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component';
-import { ObjNgFor } from './utils/object-ngfor.pipe';
-import { BrowseByComponent } from './browse-by/browse-by.component';
-import {
-  BrowseEntryListElementComponent
-} from './object-list/browse-entry-list-element/browse-entry-list-element.component';
-import { DebounceDirective } from './utils/debounce.directive';
-import { ClickOutsideDirective } from './utils/click-outside.directive';
-import { EmphasizePipe } from './utils/emphasize.pipe';
-import { InputSuggestionsComponent } from './input-suggestions/input-suggestions.component';
-import { CapitalizePipe } from './utils/capitalize.pipe';
-import { ObjectKeysPipe } from './utils/object-keys-pipe';
-import { AuthorityConfidenceStateDirective } from './authority-confidence/authority-confidence-state.directive';
-import { LangSwitchComponent } from './lang-switch/lang-switch.component';
-import {
-  PlainTextMetadataListElementComponent
-} from './object-list/metadata-representation-list-element/plain-text/plain-text-metadata-list-element.component';
-import {
-  ItemMetadataListElementComponent
-} from './object-list/metadata-representation-list-element/item/item-metadata-list-element.component';
-import {
-  MetadataRepresentationListElementComponent
-} from './object-list/metadata-representation-list-element/metadata-representation-list-element.component';
-import { ObjectValuesPipe } from './utils/object-values-pipe';
-import { InListValidator } from './utils/in-list-validator.directive';
 import { AutoFocusDirective } from './utils/auto-focus.directive';
-import { StartsWithDateComponent } from './starts-with/date/starts-with-date.component';
-import { StartsWithTextComponent } from './starts-with/text/starts-with-text.component';
-import { DSOSelectorComponent } from './dso-selector/dso-selector/dso-selector.component';
-import {
-  CreateCommunityParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import {
-    ThemedCreateCommunityParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-community-parent-selector/themed-create-community-parent-selector.component';
-import {
-  CreateItemParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import {
-    ThemedCreateItemParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-item-parent-selector/themed-create-item-parent-selector.component';
-import {
-  CreateCollectionParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import {
-    ThemedCreateCollectionParentSelectorComponent
-} from './dso-selector/modal-wrappers/create-collection-parent-selector/themed-create-collection-parent-selector.component';
-import {
-  CommunitySearchResultListElementComponent
-} from './object-list/search-result-list-element/community-search-result/community-search-result-list-element.component';
-import {
-  CollectionSearchResultListElementComponent
-} from './object-list/search-result-list-element/collection-search-result/collection-search-result-list-element.component';
-import {
-  EditItemSelectorComponent
-} from './dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-import {
-    ThemedEditItemSelectorComponent
-} from './dso-selector/modal-wrappers/edit-item-selector/themed-edit-item-selector.component';
-import {
-  EditCommunitySelectorComponent
-} from './dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import {
-    ThemedEditCommunitySelectorComponent
-} from './dso-selector/modal-wrappers/edit-community-selector/themed-edit-community-selector.component';
-import {
-  EditCollectionSelectorComponent
-} from './dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import {
-    ThemedEditCollectionSelectorComponent
-} from './dso-selector/modal-wrappers/edit-collection-selector/themed-edit-collection-selector.component';
-import {
-  ItemListPreviewComponent
-} from './object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component';
-import {
-  MetadataFieldWrapperComponent
-} from '../item-page/field-components/metadata-field-wrapper/metadata-field-wrapper.component';
-import { MetadataValuesComponent } from '../item-page/field-components/metadata-values/metadata-values.component';
-import { RoleDirective } from './roles/role.directive';
-import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
-import {
-  ClaimedTaskActionsReturnToPoolComponent
-} from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
-import {
-  ItemDetailPreviewFieldComponent
-} from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
-import {
-  CollectionSearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
-import {
-  CommunitySearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
-import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
-import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
-import {
-  ComcolMetadataComponent
-} from './comcol/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component';
-import { ItemSelectComponent } from './object-select/item-select/item-select.component';
-import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
-import {
-  FilterInputSuggestionsComponent
-} from './input-suggestions/filter-suggestions/filter-input-suggestions.component';
-import {
-  DsoInputSuggestionsComponent
-} from './input-suggestions/dso-input-suggestions/dso-input-suggestions.component';
-import { ItemGridElementComponent } from './object-grid/item-grid-element/item-types/item/item-grid-element.component';
-import { TypeBadgeComponent } from './object-list/type-badge/type-badge.component';
-import { AccessStatusBadgeComponent } from './object-list/access-status-badge/access-status-badge.component';
-import {
-  MetadataRepresentationLoaderComponent
-} from './metadata-representation/metadata-representation-loader.component';
-import { MetadataRepresentationDirective } from './metadata-representation/metadata-representation.directive';
-import {
-  ListableObjectComponentLoaderComponent
-} from './object-collection/shared/listable-object/listable-object-component-loader.component';
-import {
-  ItemSearchResultListElementComponent
-} from './object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
-import { ListableObjectDirective } from './object-collection/shared/listable-object/listable-object.directive';
-import {
-  ItemMetadataRepresentationListElementComponent
-} from './object-list/metadata-representation-list-element/item/item-metadata-representation-list-element.component';
-import { PageWithSidebarComponent } from './sidebar/page-with-sidebar.component';
-import { SidebarDropdownComponent } from './sidebar/sidebar-dropdown.component';
-import { SidebarFilterComponent } from './sidebar/filter/sidebar-filter.component';
-import { SidebarFilterSelectedOptionComponent } from './sidebar/filter/sidebar-filter-selected-option.component';
-import {
-  SelectableListItemControlComponent
-} from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
-import {
-  ImportableListItemControlComponent
-} from './object-collection/shared/importable-list-item-control/importable-list-item-control.component';
-import { ItemVersionsComponent } from './item/item-versions/item-versions.component';
-import { SortablejsModule } from 'ngx-sortablejs';
-import { LogInContainerComponent } from './log-in/container/log-in-container.component';
-import { LogInShibbolethComponent } from './log-in/methods/shibboleth/log-in-shibboleth.component';
-import { LogInPasswordComponent } from './log-in/methods/password/log-in-password.component';
-import { LogInComponent } from './log-in/log-in.component';
-import { BundleListElementComponent } from './object-list/bundle-list-element/bundle-list-element.component';
-import { MissingTranslationHelper } from './translate/missing-translation.helper';
-import { ItemVersionsNoticeComponent } from './item/item-versions/notice/item-versions-notice.component';
-import { FileValidator } from './utils/require-file.validator';
-import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
-import { FileSectionComponent } from '../item-page/simple/field-components/file-section/file-section.component';
-import {
-  ModifyItemOverviewComponent
-} from '../item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
-import {
-  ClaimedTaskActionsLoaderComponent
-} from './mydspace-actions/claimed-task/switcher/claimed-task-actions-loader.component';
-import { ClaimedTaskActionsDirective } from './mydspace-actions/claimed-task/switcher/claimed-task-actions.directive';
-import {
-  ClaimedTaskActionsEditMetadataComponent
-} from './mydspace-actions/claimed-task/edit-metadata/claimed-task-actions-edit-metadata.component';
-import { ImpersonateNavbarComponent } from './impersonate-navbar/impersonate-navbar.component';
-import { NgForTrackByIdDirective } from './ng-for-track-by-id.directive';
-import { FileDownloadLinkComponent } from './file-download-link/file-download-link.component';
-import { CollectionDropdownComponent } from './collection-dropdown/collection-dropdown.component';
-import { EntityDropdownComponent } from './entity-dropdown/entity-dropdown.component';
-import { VocabularyTreeviewComponent } from './vocabulary-treeview/vocabulary-treeview.component';
-import { CurationFormComponent } from '../curation-form/curation-form.component';
-import {
-  PublicationSidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
-import {
-  SidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/sidebar-search-list-element.component';
-import {
-  CollectionSidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/collection/collection-sidebar-search-list-element.component';
-import {
-  CommunitySidebarSearchListElementComponent
-} from './object-list/sidebar-search-list-element/community/community-sidebar-search-list-element.component';
-import {
-  AuthorizedCollectionSelectorComponent
-} from './dso-selector/dso-selector/authorized-collection-selector/authorized-collection-selector.component';
-import { DsoPageEditButtonComponent } from './dso-page/dso-page-edit-button/dso-page-edit-button.component';
-import { DsoPageVersionButtonComponent } from './dso-page/dso-page-version-button/dso-page-version-button.component';
-import { HoverClassDirective } from './hover-class.directive';
-import {
-  ValidationSuggestionsComponent
-} from './input-suggestions/validation-suggestions/validation-suggestions.component';
-import { ItemAlertsComponent } from './item/item-alerts/item-alerts.component';
-import {
-  ItemSearchResultGridElementComponent
-} from './object-grid/search-result-grid-element/item-search-result/item/item-search-result-grid-element.component';
-import { BitstreamDownloadPageComponent } from './bitstream-download-page/bitstream-download-page.component';
-import {
-  GenericItemPageFieldComponent
-} from '../item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
-import {
-  MetadataRepresentationListComponent
-} from '../item-page/simple/metadata-representation-list/metadata-representation-list.component';
-import { RelatedItemsComponent } from '../item-page/simple/related-items/related-items-component';
-import { LinkMenuItemComponent } from './menu/menu-item/link-menu-item.component';
-import { OnClickMenuItemComponent } from './menu/menu-item/onclick-menu-item.component';
-import { TextMenuItemComponent } from './menu/menu-item/text-menu-item.component';
-import { SearchNavbarComponent } from '../search-navbar/search-navbar.component';
-import { ThemedSearchNavbarComponent } from '../search-navbar/themed-search-navbar.component';
-import {
-  ItemVersionsSummaryModalComponent
-} from './item/item-versions/item-versions-summary-modal/item-versions-summary-modal.component';
-import {
-  ItemVersionsDeleteModalComponent
-} from './item/item-versions/item-versions-delete-modal/item-versions-delete-modal.component';
-import { ScopeSelectorModalComponent } from './search-form/scope-selector-modal/scope-selector-modal.component';
-import {
-  BitstreamRequestACopyPageComponent
-} from './bitstream-request-a-copy-page/bitstream-request-a-copy-page.component';
-import { DsSelectComponent } from './ds-select/ds-select.component';
-import { LogInOidcComponent } from './log-in/methods/oidc/log-in-oidc.component';
-import { ThemedItemListPreviewComponent } from './object-list/my-dspace-result-list-element/item-list-preview/themed-item-list-preview.component';
-import { RSSComponent } from './rss-feed/rss.component';
-import { ExternalLinkMenuItemComponent } from './menu/menu-item/external-link-menu-item.component';
-import { DsoPageOrcidButtonComponent } from './dso-page/dso-page-orcid-button/dso-page-orcid-button.component';
-import { LogInOrcidComponent } from './log-in/methods/orcid/log-in-orcid.component';
 import { BrowserOnlyPipe } from './utils/browser-only.pipe';
-import { ThemedLoadingComponent } from './loading/themed-loading.component';
-import { PersonPageClaimButtonComponent } from './dso-page/person-page-claim-button/person-page-claim-button.component';
-import { SearchExportCsvComponent } from './search/search-export-csv/search-export-csv.component';
-import {
-  ItemPageTitleFieldComponent
-} from '../item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+import { CapitalizePipe } from './utils/capitalize.pipe';
+import { ClickOutsideDirective } from './utils/click-outside.directive';
+import { ConsolePipe } from './utils/console.pipe';
+import { DebounceDirective } from './utils/debounce.directive';
+import { DragClickDirective } from './utils/drag-click.directive';
+import { EmphasizePipe } from './utils/emphasize.pipe';
+import { EnumKeysPipe } from './utils/enum-keys-pipe';
+import { FileSizePipe } from './utils/file-size-pipe';
+import { FileValueAccessorDirective } from './utils/file-value-accessor.directive';
+import { HasNoValuePipe } from './utils/has-no-value.pipe';
+import { HasValuePipe } from './utils/has-value.pipe';
+import { InListValidator } from './utils/in-list-validator.directive';
+import { IpV4Validator } from './utils/ipV4.validator';
 import { MarkdownPipe } from './utils/markdown.pipe';
-import { GoogleRecaptchaModule } from '../core/google-recaptcha/google-recaptcha.module';
+import { MetadataFieldValidator } from './utils/metadatafield-validator.directive';
+import { ObjectKeysPipe } from './utils/object-keys-pipe';
+import { ObjNgFor } from './utils/object-ngfor.pipe';
+import { ObjectValuesPipe } from './utils/object-values-pipe';
+import { FileValidator } from './utils/require-file.validator';
+import { SafeUrlPipe } from './utils/safe-url-pipe';
+import { ShortNumberPipe } from './utils/short-number.pipe';
+import { SplitPipe } from './utils/split.pipe';
+import { TruncatePipe } from './utils/truncate.pipe';
+import { VarDirective } from './utils/var.directive';
+import { ViewModeSwitchComponent } from './view-mode-switch/view-mode-switch.component';
 
 const MODULES = [
   CommonModule,
-  SortablejsModule,
-  FileUploadModule,
   FormsModule,
   InfiniteScrollModule,
   NgbNavModule,
-  NgbDatepickerModule,
-  NgbTimepickerModule,
   NgbTypeaheadModule,
-  NgxPaginationModule,
   NgbPaginationModule,
   NgbDropdownModule,
   NgbTooltipModule,
   ReactiveFormsModule,
   RouterModule,
-  NouisliderModule,
-  MomentModule,
   DragDropModule,
-  CdkTreeModule,
   GoogleRecaptchaModule,
+  MenuModule,
+  NgxPaginationModule,
 ];
 
 const ROOT_MODULES = [
   TranslateModule.forChild({
     missingTranslationHandler: { provide: MissingTranslationHandler, useClass: MissingTranslationHelper },
-    useDefaultLang: true
-  })
+    useDefaultLang: true,
+  }),
 ];
 
 const PIPES = [
@@ -369,6 +231,10 @@ const PIPES = [
   ObjNgFor,
   BrowserOnlyPipe,
   MarkdownPipe,
+  ShortNumberPipe,
+  SplitPipe,
+  HasValuePipe,
+  HasNoValuePipe,
 ];
 
 const COMPONENTS = [
@@ -377,148 +243,89 @@ const COMPONENTS = [
   AuthNavMenuComponent,
   ThemedAuthNavMenuComponent,
   UserMenuComponent,
-  ChipsComponent,
+  ThemedUserMenuComponent,
   DsSelectComponent,
   ErrorComponent,
-  FileSectionComponent,
   LangSwitchComponent,
+  ThemedLangSwitchComponent,
   LoadingComponent,
   ThemedLoadingComponent,
   LogInComponent,
+  ThemedLogInComponent,
   LogOutComponent,
-  NumberPickerComponent,
   ObjectListComponent,
   ThemedObjectListComponent,
   ObjectDetailComponent,
   ObjectGridComponent,
+  ObjectTableComponent,
   AbstractListableElementComponent,
+  AbstractTabulatableElementComponent,
   ObjectCollectionComponent,
   PaginationComponent,
   RSSComponent,
   SearchFormComponent,
+  ThemedSearchFormComponent,
   PageWithSidebarComponent,
   SidebarDropdownComponent,
-  SidebarFilterComponent,
-  SidebarFilterSelectedOptionComponent,
   ThumbnailComponent,
-  UploaderComponent,
-  FileDropzoneNoUploaderComponent,
-  ItemListPreviewComponent,
-  ThemedItemListPreviewComponent,
-  MyDSpaceItemStatusComponent,
-  ItemSubmitterComponent,
-  ItemDetailPreviewComponent,
-  ItemDetailPreviewFieldComponent,
-  ClaimedTaskActionsComponent,
-  ClaimedTaskActionsApproveComponent,
-  ClaimedTaskActionsRejectComponent,
-  ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent,
-  ClaimedTaskActionsLoaderComponent,
-  ItemActionsComponent,
-  PoolTaskActionsComponent,
-  WorkflowitemActionsComponent,
-  WorkspaceitemActionsComponent,
+  ThemedThumbnailComponent,
+  MyDSpaceStatusBadgeComponent,
+  ThemedMyDSpaceStatusBadgeComponent,
   ViewModeSwitchComponent,
   TruncatableComponent,
   TruncatablePartComponent,
-  BrowseByComponent,
   InputSuggestionsComponent,
   FilterInputSuggestionsComponent,
   ValidationSuggestionsComponent,
   DsoInputSuggestionsComponent,
   DSOSelectorComponent,
-  CreateCommunityParentSelectorComponent,
-  ThemedCreateCommunityParentSelectorComponent,
-  CreateCollectionParentSelectorComponent,
-  ThemedCreateCollectionParentSelectorComponent,
-  CreateItemParentSelectorComponent,
-  ThemedCreateItemParentSelectorComponent,
-  EditCommunitySelectorComponent,
-  ThemedEditCommunitySelectorComponent,
-  EditCollectionSelectorComponent,
-  ThemedEditCollectionSelectorComponent,
-  EditItemSelectorComponent,
-  ThemedEditItemSelectorComponent,
-  CommunitySearchResultListElementComponent,
-  CollectionSearchResultListElementComponent,
-  BrowseByComponent,
-
-  CollectionSearchResultGridElementComponent,
-  CommunitySearchResultGridElementComponent,
   SearchExportCsvComponent,
   PageSizeSelectorComponent,
   ListableObjectComponentLoaderComponent,
-  CollectionListElementComponent,
-  CommunityListElementComponent,
-  CollectionGridElementComponent,
-  CommunityGridElementComponent,
-  BrowseByComponent,
   AbstractTrackableComponent,
   ComcolMetadataComponent,
   TypeBadgeComponent,
   AccessStatusBadgeComponent,
-  BrowseByComponent,
-  AbstractTrackableComponent,
-
+  ThemedAccessStatusBadgeComponent,
+  ThemedTypeBadgeComponent,
+  StatusBadgeComponent,
+  ThemedStatusBadgeComponent,
+  BadgesComponent,
+  ThemedBadgesComponent,
+  StartsWithLoaderComponent,
   ItemSelectComponent,
   CollectionSelectComponent,
   MetadataRepresentationLoaderComponent,
   SelectableListItemControlComponent,
-
   ImportableListItemControlComponent,
-
-  LogInShibbolethComponent,
-  LogInOidcComponent,
-  LogInOrcidComponent,
-  LogInPasswordComponent,
   LogInContainerComponent,
-  ItemVersionsComponent,
-  ItemSearchResultListElementComponent,
-  ItemVersionsNoticeComponent,
   ModifyItemOverviewComponent,
   ImpersonateNavbarComponent,
-  FileDownloadLinkComponent,
-  BitstreamDownloadPageComponent,
-  BitstreamRequestACopyPageComponent,
-  CollectionDropdownComponent,
   EntityDropdownComponent,
   ExportMetadataSelectorComponent,
   ImportBatchSelectorComponent,
   ExportBatchSelectorComponent,
   ConfirmationModalComponent,
-  VocabularyTreeviewComponent,
   AuthorizedCollectionSelectorComponent,
-  CurationFormComponent,
-  SearchResultListElementComponent,
-  SearchResultGridElementComponent,
-  ItemListElementComponent,
-  ItemGridElementComponent,
-  ItemSearchResultGridElementComponent,
-  BrowseEntryListElementComponent,
-  SearchResultDetailElementComponent,
-  PlainTextMetadataListElementComponent,
-  ItemMetadataListElementComponent,
-  MetadataRepresentationListElementComponent,
-  ItemMetadataRepresentationListElementComponent,
-  BundleListElementComponent,
-  StartsWithDateComponent,
-  StartsWithTextComponent,
-  SidebarSearchListElementComponent,
-  PublicationSidebarSearchListElementComponent,
-  CollectionSidebarSearchListElementComponent,
-  CommunitySidebarSearchListElementComponent,
   SearchNavbarComponent,
-  ScopeSelectorModalComponent,
   ItemPageTitleFieldComponent,
   ThemedSearchNavbarComponent,
+  ListableNotificationObjectComponent,
+  MetadataFieldWrapperComponent,
+  ContextHelpWrapperComponent,
+  EpersonGroupListComponent,
+  EpersonSearchBoxComponent,
+  GroupSearchBoxComponent,
+  ThemedItemPageTitleFieldComponent,
 ];
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
+  BundleListElementComponent,
   CollectionListElementComponent,
   CommunityListElementComponent,
   SearchResultListElementComponent,
+  TabulatableResultListElementsComponent,
   CommunitySearchResultListElementComponent,
   CollectionSearchResultListElementComponent,
   CollectionGridElementComponent,
@@ -528,6 +335,7 @@ const ENTRY_COMPONENTS = [
   SearchResultGridElementComponent,
   ItemListElementComponent,
   ItemGridElementComponent,
+  BitstreamListItemComponent,
   ItemSearchResultListElementComponent,
   ItemSearchResultGridElementComponent,
   BrowseEntryListElementComponent,
@@ -547,57 +355,43 @@ const ENTRY_COMPONENTS = [
   EditItemSelectorComponent,
   ThemedEditItemSelectorComponent,
   PlainTextMetadataListElementComponent,
+  BrowseLinkMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
   ItemMetadataRepresentationListElementComponent,
   LogInPasswordComponent,
-  LogInShibbolethComponent,
-  LogInOidcComponent,
-  LogInOrcidComponent,
-  BundleListElementComponent,
-  ClaimedTaskActionsApproveComponent,
-  ClaimedTaskActionsRejectComponent,
-  ClaimedTaskActionsReturnToPoolComponent,
-  ClaimedTaskActionsEditMetadataComponent,
+  LogInExternalProviderComponent,
+  ClaimedTaskActionsDeclineTaskComponent,
   CollectionDropdownComponent,
+  ThemedCollectionDropdownComponent,
   FileDownloadLinkComponent,
-  BitstreamDownloadPageComponent,
-  BitstreamRequestACopyPageComponent,
+  ThemedFileDownloadLinkComponent,
   CurationFormComponent,
   ExportMetadataSelectorComponent,
   ImportBatchSelectorComponent,
   ExportBatchSelectorComponent,
   ConfirmationModalComponent,
-  VocabularyTreeviewComponent,
   SidebarSearchListElementComponent,
   PublicationSidebarSearchListElementComponent,
   CollectionSidebarSearchListElementComponent,
   CommunitySidebarSearchListElementComponent,
-  LinkMenuItemComponent,
-  OnClickMenuItemComponent,
-  TextMenuItemComponent,
   ScopeSelectorModalComponent,
-  ExternalLinkMenuItemComponent
-];
-
-const SHARED_ITEM_PAGE_COMPONENTS = [
-  MetadataFieldWrapperComponent,
-  MetadataValuesComponent,
-  DsoPageEditButtonComponent,
-  DsoPageVersionButtonComponent,
-  PersonPageClaimButtonComponent,
-  ItemAlertsComponent,
-  GenericItemPageFieldComponent,
-  MetadataRepresentationListComponent,
-  RelatedItemsComponent,
-  DsoPageOrcidButtonComponent
-
+  ListableNotificationObjectComponent,
+  AdvancedClaimedTaskActionSelectReviewerComponent,
+  AdvancedClaimedTaskActionRatingComponent,
+  EpersonGroupListComponent,
+  EpersonSearchBoxComponent,
+  GroupSearchBoxComponent,
+  NotificationBoxComponent,
+  TabulatableObjectsLoaderComponent,
 ];
 
 const PROVIDERS = [
   TruncatableService,
   MockAdminGuard,
-  AbstractTrackableComponent
+  AbstractTrackableComponent,
+  QualityAssuranceEventDataService,
+  QualityAssuranceSourceDataService,
 ];
 
 const DIRECTIVES = [
@@ -605,45 +399,42 @@ const DIRECTIVES = [
   DragClickDirective,
   DebounceDirective,
   ClickOutsideDirective,
-  AuthorityConfidenceStateDirective,
   InListValidator,
   AutoFocusDirective,
   RoleDirective,
-  MetadataRepresentationDirective,
-  ListableObjectDirective,
-  ClaimedTaskActionsDirective,
   FileValueAccessorDirective,
   FileValidator,
-  ClaimedTaskActionsDirective,
   NgForTrackByIdDirective,
   MetadataFieldValidator,
-  HoverClassDirective
+  HoverClassDirective,
+  ContextHelpDirective,
+  DynamicComponentLoaderDirective,
+  IpV4Validator,
+  TabulatableObjectsDirective,
 ];
 
 @NgModule({
   imports: [
     ...MODULES,
-    ...ROOT_MODULES
+    ...ROOT_MODULES,
   ],
   declarations: [
     ...PIPES,
     ...COMPONENTS,
+    ...ENTRY_COMPONENTS,
     ...DIRECTIVES,
-    ...SHARED_ITEM_PAGE_COMPONENTS,
-    ItemVersionsSummaryModalComponent,
-    ItemVersionsDeleteModalComponent,
   ],
   providers: [
-    ...PROVIDERS
+    ...PROVIDERS,
   ],
   exports: [
     ...MODULES,
     ...PIPES,
     ...COMPONENTS,
-    ...SHARED_ITEM_PAGE_COMPONENTS,
+    ...ENTRY_COMPONENTS,
     ...DIRECTIVES,
-    TranslateModule
-  ]
+    TranslateModule,
+  ],
 })
 
 /**
@@ -657,7 +448,7 @@ export class SharedModule {
   static withEntryComponents() {
     return {
       ngModule: SharedModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html
deleted file mode 100644
index bbe0b93566..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<a class="d-flex flex-row" (click)="click.emit($event)">
-  <label>
-    <input type="checkbox" [checked]="true" class="my-1 align-self-stretch"/>
-    <span class="filter-value pl-1 text-capitalize">{{label}}</span>
-  </label>
-</a>
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss
deleted file mode 100644
index 30ab8912d3..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-a {
-  color: var(--bs-body-color);
-
-  &:hover, &focus {
-    text-decoration: none;
-  }
-
-  span.badge {
-    vertical-align: text-top;
-  }
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
deleted file mode 100644
index 4f1d2415ae..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
-@Component({
-  selector: 'ds-sidebar-filter-selected-option',
-  styleUrls: ['./sidebar-filter-selected-option.component.scss'],
-  templateUrl: './sidebar-filter-selected-option.component.html',
-})
-
-/**
- * Represents a single selected option in a sidebar filter
- */
-export class SidebarFilterSelectedOptionComponent {
-  @Input() label: string;
-  @Output() click: EventEmitter<any> = new EventEmitter<any>();
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.actions.ts b/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
deleted file mode 100644
index 5dab677c5c..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/* eslint-disable max-classes-per-file */
-import { Action } from '@ngrx/store';
-
-import { type } from '../../ngrx/type';
-
-/**
- * For each action type in an action group, make a simple
- * enum object for all of this group's action types.
- *
- * The 'type' utility function coerces strings into string
- * literal types and runs a simple check to guarantee all
- * action types in the application are unique.
- */
-export const SidebarFilterActionTypes = {
-  INITIALIZE: type('dspace/sidebar-filter/INITIALIZE'),
-  COLLAPSE: type('dspace/sidebar-filter/COLLAPSE'),
-  EXPAND: type('dspace/sidebar-filter/EXPAND'),
-  TOGGLE: type('dspace/sidebar-filter/TOGGLE'),
-};
-
-export class SidebarFilterAction implements Action {
-  /**
-   * Name of the filter the action is performed on, used to identify the filter
-   */
-  filterName: string;
-
-  /**
-   * Type of action that will be performed
-   */
-  type;
-
-  /**
-   * Initialize with the filter's name
-   * @param {string} name of the filter
-   */
-  constructor(name: string) {
-    this.filterName = name;
-  }
-}
-
-/**
- * Used to initialize a filter
- */
-export class FilterInitializeAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.INITIALIZE;
-  initiallyExpanded;
-
-  constructor(name: string, initiallyExpanded: boolean) {
-    super(name);
-    this.initiallyExpanded = initiallyExpanded;
-  }
-}
-
-/**
- * Used to collapse a filter
- */
-export class FilterCollapseAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.COLLAPSE;
-}
-
-/**
- * Used to expand a filter
- */
-export class FilterExpandAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.EXPAND;
-}
-
-/**
- * Used to collapse a filter when it's expanded and expand it when it's collapsed
- */
-export class FilterToggleAction extends SidebarFilterAction {
-  type = SidebarFilterActionTypes.TOGGLE;
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.html b/src/app/shared/sidebar/filter/sidebar-filter.component.html
deleted file mode 100644
index 79afaa7583..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="facet-filter d-block mb-3 p-3">
-  <div (click)="toggle()" class="filter-name" [attr.data-test]="'filter-toggle' | dsBrowserOnly">
-    <h5 class="d-inline-block mb-0">
-      {{ label | translate }}
-    </h5>
-    <span class="filter-toggle fas float-right"
-          [ngClass]="(collapsed$ | async) ? 'fa-plus' : 'fa-minus'">
-    </span>
-  </div>
-  <div [@slide]="(collapsed$ | async) ? 'collapsed' : 'expanded'"
-       (@slide.start)="startSlide($event)" (@slide.done)="finishSlide($event)"
-       class="sidebar-filter-wrapper" [ngClass]="{'closed' : closed}">
-    <div>
-      <div class="filters py-2">
-        <ng-template *ngIf="!singleValue">
-          <ds-sidebar-filter-selected-option
-            *ngFor="let value of (selectedValues | async)"
-            [label]="value"
-            (click)="removeValue.emit(value)">
-          </ds-sidebar-filter-selected-option>
-        </ng-template>
-      </div>
-      <ng-content></ng-content>
-    </div>
-  </div>
-</div>
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.scss b/src/app/shared/sidebar/filter/sidebar-filter.component.scss
deleted file mode 100644
index bf7a089cb1..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-:host .facet-filter {
-  border: 1px solid var(--bs-light);
-  cursor: pointer;
-
-  .sidebar-filter-wrapper.closed {
-    overflow: hidden;
-  }
-
-  .filter-toggle {
-    line-height: var(--bs-line-height-base);
-  }
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.ts b/src/app/shared/sidebar/filter/sidebar-filter.component.ts
deleted file mode 100644
index 5a019d41df..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { Observable } from 'rxjs';
-import { SidebarFilterService } from './sidebar-filter.service';
-import { slide } from '../../animations/slide';
-
-@Component({
-  selector: 'ds-sidebar-filter',
-  styleUrls: ['./sidebar-filter.component.scss'],
-  templateUrl: './sidebar-filter.component.html',
-  animations: [slide],
-})
-/**
- * This components renders a sidebar filter including the label and the selected values.
- * The filter input itself should still be provided in the content.
- */
-export class SidebarFilterComponent implements OnInit {
-
-  @Input() name: string;
-  @Input() type: string;
-  @Input() label: string;
-  @Input() expanded = true;
-  @Input() singleValue = false;
-  @Input() selectedValues: Observable<string[]>;
-  @Output() removeValue: EventEmitter<any> = new EventEmitter<any>();
-
-  /**
-   * True when the filter is 100% collapsed in the UI
-   */
-  closed = true;
-
-  /**
-   * Emits true when the filter is currently collapsed in the store
-   */
-  collapsed$: Observable<boolean>;
-
-  constructor(
-    protected filterService: SidebarFilterService,
-  ) {
-  }
-
-  /**
-   *  Changes the state for this filter to collapsed when it's expanded and to expanded it when it's collapsed
-   */
-  toggle() {
-    this.filterService.toggle(this.name);
-  }
-
-  /**
-   * Method to change this.collapsed to false when the slide animation ends and is sliding open
-   * @param event The animation event
-   */
-  finishSlide(event: any): void {
-    if (event.fromState === 'collapsed') {
-      this.closed = false;
-    }
-  }
-
-  /**
-   * Method to change this.collapsed to true when the slide animation starts and is sliding closed
-   * @param event The animation event
-   */
-  startSlide(event: any): void {
-    if (event.toState === 'collapsed') {
-      this.closed = true;
-    }
-  }
-
-  ngOnInit(): void {
-    this.closed = !this.expanded;
-    this.initializeFilter();
-    this.collapsed$ = this.isCollapsed();
-  }
-
-  /**
-   *  Sets the initial state of the filter
-   */
-  initializeFilter() {
-    this.filterService.initializeFilter(this.name, this.expanded);
-  }
-
-  /**
-   * Checks if the filter is currently collapsed
-   * @returns {Observable<boolean>} Emits true when the current state of the filter is collapsed, false when it's expanded
-   */
-  private isCollapsed(): Observable<boolean> {
-    return this.filterService.isCollapsed(this.name);
-  }
-
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts b/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
deleted file mode 100644
index b7784dd12b..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import {
-  FilterInitializeAction,
-  SidebarFilterAction,
-  SidebarFilterActionTypes
-} from './sidebar-filter.actions';
-
-/**
- * Interface that represents the state for a single filters
- */
-export interface SidebarFilterState {
-  filterCollapsed: boolean;
-}
-
-/**
- * Interface that represents the state for all available filters
- */
-export interface SidebarFiltersState {
-  [name: string]: SidebarFilterState;
-}
-
-const initialState: SidebarFiltersState = Object.create(null);
-
-/**
- * Performs a  filter action on the current state
- * @param {SidebarFiltersState} state The state before the action is performed
- * @param {SidebarFilterAction} action The action that should be performed
- * @returns {SidebarFiltersState} The state after the action is performed
- */
-export function sidebarFilterReducer(state = initialState, action: SidebarFilterAction): SidebarFiltersState {
-
-  switch (action.type) {
-
-    case SidebarFilterActionTypes.INITIALIZE: {
-      const initAction = (action as FilterInitializeAction);
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: !initAction.initiallyExpanded,
-        }
-      });
-    }
-
-    case SidebarFilterActionTypes.COLLAPSE: {
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: true,
-        }
-      });
-    }
-
-    case SidebarFilterActionTypes.EXPAND: {
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: false,
-        }
-      });
-    }
-
-    case SidebarFilterActionTypes.TOGGLE: {
-      return Object.assign({}, state, {
-        [action.filterName]: {
-          filterCollapsed: !state[action.filterName].filterCollapsed,
-        }
-      });
-    }
-
-    default: {
-      return state;
-    }
-  }
-}
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts b/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
deleted file mode 100644
index 49192a2006..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
+++ /dev/null
@@ -1,107 +0,0 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { provideMockStore } from '@ngrx/store/testing';
-import { cold } from 'jasmine-marbles';
-
-import { sidebarFilterReducer } from './sidebar-filter.reducer';
-import { SidebarFilterService } from './sidebar-filter.service';
-import {
-  FilterCollapseAction,
-  FilterExpandAction,
-  FilterInitializeAction,
-  FilterToggleAction
-} from './sidebar-filter.actions';
-import { storeModuleConfig } from '../../../app.reducer';
-
-describe('SidebarFilterService', () => {
-  let service: SidebarFilterService;
-  let store: any;
-  let initialState;
-
-  function init() {
-
-    initialState = {
-      sidebarFilter: {
-        filter_1: {
-          filterCollapsed: true
-        },
-        filter_2: {
-          filterCollapsed: false
-        },
-        filter_3: {
-          filterCollapsed: true
-        }
-      }
-    };
-
-  }
-
-  beforeEach(waitForAsync(() => {
-    init();
-    TestBed.configureTestingModule({
-      imports: [
-        StoreModule.forRoot({ sidebarFilter: sidebarFilterReducer }, storeModuleConfig)
-      ],
-      providers: [
-        provideMockStore({ initialState }),
-        { provide: SidebarFilterService, useValue: service }
-      ]
-    }).compileComponents();
-  }));
-
-  beforeEach(() => {
-    store = TestBed.inject(Store);
-    service = new SidebarFilterService(store);
-    spyOn(store, 'dispatch');
-  });
-
-  describe('initializeFilter', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.initializeFilter('fakeFilter', true);
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterInitializeAction('fakeFilter', true));
-    });
-  });
-
-  describe('collapse', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.collapse('fakeFilter');
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterCollapseAction('fakeFilter'));
-    });
-  });
-
-  describe('expand', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.expand('fakeFilter');
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterExpandAction('fakeFilter'));
-    });
-  });
-
-  describe('toggle', () => {
-    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
-      service.toggle('fakeFilter');
-      expect(store.dispatch).toHaveBeenCalledWith(new FilterToggleAction('fakeFilter'));
-    });
-  });
-
-  describe('isCollapsed', () => {
-    it('should return true', () => {
-
-      const result = service.isCollapsed('filter_1');
-      const expected = cold('b', {
-        b: true
-      });
-
-      expect(result).toBeObservable(expected);
-    });
-
-    it('should return false', () => {
-
-      const result = service.isCollapsed('filter_2');
-      const expected = cold('b', {
-        b: false
-      });
-
-      expect(result).toBeObservable(expected);
-    });
-  });
-});
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.service.ts b/src/app/shared/sidebar/filter/sidebar-filter.service.ts
deleted file mode 100644
index b67de24f9e..0000000000
--- a/src/app/shared/sidebar/filter/sidebar-filter.service.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-  FilterCollapseAction,
-  FilterExpandAction, FilterInitializeAction,
-  FilterToggleAction
-} from './sidebar-filter.actions';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { SidebarFiltersState, SidebarFilterState } from './sidebar-filter.reducer';
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, map } from 'rxjs/operators';
-import { hasValue } from '../../empty.util';
-
-/**
- * Service that performs all actions that have to do with sidebar filters like collapsing or expanding them.
- */
-@Injectable()
-export class SidebarFilterService {
-
-  constructor(private store: Store<SidebarFiltersState>) {
-  }
-
-  /**
-   * Dispatches an initialize action to the store for a given filter
-   * @param {string} filter The filter for which the action is dispatched
-   * @param {boolean} expanded If the filter should be open from the start
-   */
-  public initializeFilter(filter: string, expanded: boolean): void {
-    this.store.dispatch(new FilterInitializeAction(filter, expanded));
-  }
-
-  /**
-   * Dispatches a collapse action to the store for a given filter
-   * @param {string} filterName The filter for which the action is dispatched
-   */
-  public collapse(filterName: string): void {
-    this.store.dispatch(new FilterCollapseAction(filterName));
-  }
-
-  /**
-   * Dispatches an expand action to the store for a given filter
-   * @param {string} filterName The filter for which the action is dispatched
-   */
-  public expand(filterName: string): void {
-    this.store.dispatch(new FilterExpandAction(filterName));
-  }
-
-  /**
-   * Dispatches a toggle action to the store for a given filter
-   * @param {string} filterName The filter for which the action is dispatched
-   */
-  public toggle(filterName: string): void {
-    this.store.dispatch(new FilterToggleAction(filterName));
-  }
-
-  /**
-   * Checks if the state of a given filter is currently collapsed or not
-   * @param {string} filterName The filtername for which the collapsed state is checked
-   * @returns {Observable<boolean>} Emits the current collapsed state of the given filter, if it's unavailable, return false
-   */
-  isCollapsed(filterName: string): Observable<boolean> {
-    return this.store.pipe(
-      select(filterByNameSelector(filterName)),
-      map((object: SidebarFilterState) => {
-        if (object) {
-          return object.filterCollapsed;
-        } else {
-          return false;
-        }
-      }),
-      distinctUntilChanged()
-    );
-  }
-
-}
-
-const filterStateSelector = (state: SidebarFiltersState) => state.sidebarFilter;
-
-function filterByNameSelector(name: string): MemoizedSelector<SidebarFiltersState, SidebarFilterState> {
-  return keySelector<SidebarFilterState>(name);
-}
-
-export function keySelector<T>(key: string): MemoizedSelector<SidebarFiltersState, T> {
-  return createSelector(filterStateSelector, (state: SidebarFilterState) => {
-    if (hasValue(state)) {
-      return state[key];
-    } else {
-      return undefined;
-    }
-  });
-}
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.html b/src/app/shared/sidebar/page-with-sidebar.component.html
index 9feb6c792e..853258e6dd 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) !== true && (isXsOrSm$ | async) === true">
         <ng-content></ng-content>
       </div>
     </div>
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
index f04632488c..fd0614858c 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
@@ -1,13 +1,16 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { of as observableOf } from 'rxjs';
 
-import { PageWithSidebarComponent } from './page-with-sidebar.component';
-import { SidebarService } from './sidebar.service';
 import { HostWindowService } from '../host-window.service';
 import { SidebarServiceStub } from '../testing/sidebar-service.stub';
+import { PageWithSidebarComponent } from './page-with-sidebar.component';
+import { SidebarService } from './sidebar.service';
 
 describe('PageWithSidebarComponent', () => {
   let comp: PageWithSidebarComponent;
@@ -19,18 +22,18 @@ describe('PageWithSidebarComponent', () => {
       providers: [
         {
           provide: SidebarService,
-          useClass: SidebarServiceStub
+          useClass: SidebarServiceStub,
         },
         {
           provide: HostWindowService, useValue: jasmine.createSpyObj('hostWindowService',
             {
               isXs: observableOf(true),
               isSm: observableOf(false),
-              isXsOrSm: observableOf(true)
-            })
+              isXsOrSm: observableOf(true),
+            }),
         },
       ],
-      declarations: [PageWithSidebarComponent]
+      declarations: [PageWithSidebarComponent],
     }).compileComponents().then(() => {
       fixture = TestBed.createComponent(PageWithSidebarComponent);
       comp = fixture.componentInstance;
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index 63b4a6195c..ad5d28197d 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -1,10 +1,16 @@
-import { Component, Input, OnInit, TemplateRef } from '@angular/core';
-import { SidebarService } from './sidebar.service';
-import { HostWindowService } from '../host-window.service';
+import {
+  Component,
+  Input,
+  OnInit,
+  TemplateRef,
+} from '@angular/core';
 import { Observable } from 'rxjs';
-import { pushInOut } from '../animations/push';
 import { map } from 'rxjs/operators';
 
+import { pushInOut } from '../animations/push';
+import { HostWindowService } from '../host-window.service';
+import { SidebarService } from './sidebar.service';
+
 @Component({
   selector: 'ds-page-with-sidebar',
   styleUrls: ['./page-with-sidebar.component.scss'],
@@ -30,7 +36,7 @@ export class PageWithSidebarComponent implements OnInit {
    * The width of the sidebar (bootstrap columns)
    */
   @Input()
-  sideBarWidth = 3;
+    sideBarWidth = 3;
 
   /**
    * Observable for whether or not the sidebar is currently collapsed
@@ -48,7 +54,7 @@ export class PageWithSidebarComponent implements OnInit {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();
     this.sidebarClasses = this.isSidebarCollapsed$.pipe(
-      map((isCollapsed) => isCollapsed ? '' : 'active')
+      map((isCollapsed) => isCollapsed ? '' : 'active'),
     );
   }
 
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.html b/src/app/shared/sidebar/sidebar-dropdown.component.html
index 0c2a1c05d2..88795be121 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>
+  <h4><label for="{{id}}">{{label | translate}}</label></h4>
   <select id="{{id}}" class="form-control" (change)="change.emit($event)">
     <ng-content></ng-content>
   </select>
-</div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.ts b/src/app/shared/sidebar/sidebar-dropdown.component.ts
index 471d357e25..26460276fe 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.ts
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.ts
@@ -1,4 +1,9 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
 
 @Component({
   selector: 'ds-sidebar-dropdown',
diff --git a/src/app/shared/sidebar/sidebar-effects.service.ts b/src/app/shared/sidebar/sidebar-effects.service.ts
index ba53e2fec9..e8a0e76357 100644
--- a/src/app/shared/sidebar/sidebar-effects.service.ts
+++ b/src/app/shared/sidebar/sidebar-effects.service.ts
@@ -1,10 +1,18 @@
-import { map, tap, filter } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { createEffect, Actions, ofType } from '@ngrx/effects';
-import * as fromRouter from '@ngrx/router-store';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import { ROUTER_NAVIGATION } from '@ngrx/router-store';
+import {
+  filter,
+  map,
+  tap,
+} from 'rxjs/operators';
 
-import { SidebarCollapseAction } from './sidebar.actions';
 import { URLBaser } from '../../core/url-baser/url-baser';
+import { SidebarCollapseAction } from './sidebar.actions';
 
 /**
  * Makes sure that if the user navigates to another route, the sidebar is collapsed
@@ -12,14 +20,14 @@ import { URLBaser } from '../../core/url-baser/url-baser';
 @Injectable()
 export class SidebarEffects {
   private previousPath: string;
-   routeChange$ = createEffect(() => this.actions$
+  routeChange$ = createEffect(() => this.actions$
     .pipe(
-      ofType(fromRouter.ROUTER_NAVIGATION),
+      ofType(ROUTER_NAVIGATION),
       filter((action) => this.previousPath !== this.getBaseUrl(action)),
       tap((action) => {
         this.previousPath = this.getBaseUrl(action);
       }),
-      map(() => new SidebarCollapseAction())
+      map(() => new SidebarCollapseAction()),
     ));
 
   constructor(private actions$: Actions) {
diff --git a/src/app/shared/sidebar/sidebar.actions.ts b/src/app/shared/sidebar/sidebar.actions.ts
index f9d243223d..c62a45284f 100644
--- a/src/app/shared/sidebar/sidebar.actions.ts
+++ b/src/app/shared/sidebar/sidebar.actions.ts
@@ -14,7 +14,7 @@ import { type } from '../ngrx/type';
 export const SidebarActionTypes = {
   COLLAPSE: type('dspace/sidebar/COLLAPSE'),
   EXPAND: type('dspace/sidebar/EXPAND'),
-  TOGGLE: type('dspace/sidebar/TOGGLE')
+  TOGGLE: type('dspace/sidebar/TOGGLE'),
 };
 
 /**
diff --git a/src/app/shared/sidebar/sidebar.reducer.spec.ts b/src/app/shared/sidebar/sidebar.reducer.spec.ts
index 796c40537c..a654b0af18 100644
--- a/src/app/shared/sidebar/sidebar.reducer.spec.ts
+++ b/src/app/shared/sidebar/sidebar.reducer.spec.ts
@@ -1,7 +1,12 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
+import {
+  SidebarCollapseAction,
+  SidebarExpandAction,
+  SidebarToggleAction,
+} from './sidebar.actions';
 import { sidebarReducer } from './sidebar.reducer';
-import { SidebarCollapseAction, SidebarExpandAction, SidebarToggleAction } from './sidebar.actions';
 
 class NullAction extends SidebarCollapseAction {
   type = null;
@@ -46,6 +51,7 @@ describe('sidebarReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set sidebarCollapsed to false in response to the EXPAND action', () => {
@@ -62,6 +68,10 @@ describe('sidebarReducer', () => {
 
     const action = new SidebarExpandAction();
     sidebarReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should flip the value of sidebarCollapsed in response to the TOGGLE action', () => {
@@ -81,6 +91,10 @@ describe('sidebarReducer', () => {
 
     const action = new SidebarToggleAction();
     sidebarReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
 });
diff --git a/src/app/shared/sidebar/sidebar.reducer.ts b/src/app/shared/sidebar/sidebar.reducer.ts
index 05e7d38d48..3630e7af8e 100644
--- a/src/app/shared/sidebar/sidebar.reducer.ts
+++ b/src/app/shared/sidebar/sidebar.reducer.ts
@@ -1,4 +1,7 @@
-import { SidebarAction, SidebarActionTypes } from './sidebar.actions';
+import {
+  SidebarAction,
+  SidebarActionTypes,
+} from './sidebar.actions';
 
 /**
  * Interface that represents the state of the sidebar
@@ -8,7 +11,7 @@ export interface SidebarState {
 }
 
 const initialState: SidebarState = {
-  sidebarCollapsed: true
+  sidebarCollapsed: true,
 };
 
 /**
@@ -22,20 +25,20 @@ export function sidebarReducer(state = initialState, action: SidebarAction): Sid
 
     case SidebarActionTypes.COLLAPSE: {
       return Object.assign({}, state, {
-        sidebarCollapsed: true
+        sidebarCollapsed: true,
       });
     }
 
     case SidebarActionTypes.EXPAND: {
       return Object.assign({}, state, {
-        sidebarCollapsed: false
+        sidebarCollapsed: false,
       });
 
     }
 
     case SidebarActionTypes.TOGGLE: {
       return Object.assign({}, state, {
-        sidebarCollapsed: !state.sidebarCollapsed
+        sidebarCollapsed: !state.sidebarCollapsed,
       });
 
     }
diff --git a/src/app/shared/sidebar/sidebar.service.spec.ts b/src/app/shared/sidebar/sidebar.service.spec.ts
index 7cb5efbfd1..f5c1b5c733 100644
--- a/src/app/shared/sidebar/sidebar.service.spec.ts
+++ b/src/app/shared/sidebar/sidebar.service.spec.ts
@@ -1,10 +1,17 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { SidebarService } from './sidebar.service';
-import { AppState } from '../../app.reducer';
-import { TestBed, waitForAsync } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { SidebarCollapseAction, SidebarExpandAction } from './sidebar.actions';
+
+import { AppState } from '../../app.reducer';
 import { HostWindowService } from '../host-window.service';
+import {
+  SidebarCollapseAction,
+  SidebarExpandAction,
+} from './sidebar.actions';
+import { SidebarService } from './sidebar.service';
 
 describe('SidebarService', () => {
   let service: SidebarService;
@@ -12,25 +19,25 @@ describe('SidebarService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    pipe: observableOf(true)
+    pipe: observableOf(true),
   });
   const windowService = jasmine.createSpyObj('hostWindowService',
     {
       isXs: observableOf(true),
       isSm: observableOf(false),
-      isXsOrSm: observableOf(true)
+      isXsOrSm: observableOf(true),
     });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
 
       providers: [
         {
-          provide: Store, useValue: store
+          provide: Store, useValue: store,
         },
         {
-          provide: HostWindowService, useValue: windowService
+          provide: HostWindowService, useValue: windowService,
         },
-      ]
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/sidebar/sidebar.service.ts b/src/app/shared/sidebar/sidebar.service.ts
index 8e3bbbf117..0007cbdbb4 100644
--- a/src/app/shared/sidebar/sidebar.service.ts
+++ b/src/app/shared/sidebar/sidebar.service.ts
@@ -1,11 +1,22 @@
-import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
-import { SidebarState } from './sidebar.reducer';
-import { createSelector, select, Store } from '@ngrx/store';
-import { SidebarCollapseAction, SidebarExpandAction } from './sidebar.actions';
+import {
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
+
 import { AppState } from '../../app.reducer';
 import { HostWindowService } from '../host-window.service';
-import { map } from 'rxjs/operators';
+import {
+  SidebarCollapseAction,
+  SidebarExpandAction,
+} from './sidebar.actions';
+import { SidebarState } from './sidebar.reducer';
 
 const sidebarStateSelector = (state: AppState) => state.sidebar;
 const sidebarCollapsedSelector = createSelector(sidebarStateSelector, (sidebar: SidebarState) => sidebar.sidebarCollapsed);
@@ -37,9 +48,9 @@ export class SidebarService {
   get isCollapsed(): Observable<boolean> {
     return observableCombineLatest(
       this.isXsOrSm$,
-      this.isCollapsedInStore
+      this.isCollapsedInStore,
     ).pipe(
-      map(([mobile, store]) => mobile ? store : true)
+      map(([mobile, store]) => mobile ? store : true),
     );
   }
 
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
index 3cd22a625f..7b54bf1edb 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.spec.ts
@@ -1,59 +1,59 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { StartsWithDateComponent } from './starts-with-date.component';
-import { ActivatedRouteStub } from '../../testing/active-router.stub';
-import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
-import { RouterStub } from '../../testing/router.stub';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { RouterStub } from '../../testing/router.stub';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import { StartsWithDateComponent } from './starts-with-date.component';
 
 describe('StartsWithDateComponent', () => {
   let comp: StartsWithDateComponent;
   let fixture: ComponentFixture<StartsWithDateComponent>;
-  let route: ActivatedRoute;
-  let router: Router;
-  let paginationService;
+
+  let route: ActivatedRouteStub;
+  let paginationService: PaginationServiceStub;
+  let router: RouterStub;
 
   const options = [2019, 2018, 2017, 2016, 2015];
 
-  const activatedRouteStub = Object.assign(new ActivatedRouteStub(), {
-    params: observableOf({}),
-    queryParams: observableOf({})
-  });
+  beforeEach(waitForAsync(async () => {
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
+    paginationService = new PaginationServiceStub();
 
-  paginationService = new PaginationServiceStub();
-
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [StartsWithDateComponent, EnumKeysPipe],
       providers: [
-        { provide: 'startsWithOptions', useValue: options },
-        { provide: 'paginationId', useValue: 'page-id' },
-        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        { provide: ActivatedRoute, useValue: route },
         { provide: PaginationService, useValue: paginationService },
-        { provide: Router, useValue: new RouterStub() }
+        { provide: Router, useValue: router },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StartsWithDateComponent);
     comp = fixture.componentInstance;
+    comp.paginationId = 'page-id';
+    comp.startsWithOptions = options;
     fixture.detectChanges();
-    route = (comp as any).route;
-    router = (comp as any).router;
   });
 
   it('should create a FormGroup containing a startsWith FormControl', () => {
@@ -101,7 +101,7 @@ describe('StartsWithDateComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
     });
 
     it('should automatically fill in the input field', () => {
@@ -123,7 +123,7 @@ describe('StartsWithDateComponent', () => {
       });
 
       it('should add a startsWith query parameter', () => {
-        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
       });
 
       it('should automatically fill in the input field', () => {
@@ -147,7 +147,7 @@ describe('StartsWithDateComponent', () => {
       });
 
       it('should add a startsWith query parameter', () => {
-        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+        expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
       });
 
       it('should automatically fill in the input field', () => {
@@ -159,10 +159,6 @@ describe('StartsWithDateComponent', () => {
   describe('when filling in the input form', () => {
     let form;
     const expectedValue = '2015';
-    const extras: NavigationExtras = {
-      queryParams: Object.assign({ startsWith: expectedValue }),
-      queryParamsHandling: 'merge'
-    };
 
     beforeEach(() => {
       form = fixture.debugElement.query(By.css('form'));
@@ -176,7 +172,7 @@ describe('StartsWithDateComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
     });
   });
 
diff --git a/src/app/shared/starts-with/date/starts-with-date.component.ts b/src/app/shared/starts-with/date/starts-with-date.component.ts
index d65d12b413..bcb3dfbcdd 100644
--- a/src/app/shared/starts-with/date/starts-with-date.component.ts
+++ b/src/app/shared/starts-with/date/starts-with-date.component.ts
@@ -1,10 +1,14 @@
-import { Component, Inject } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
 
-import { renderStartsWithFor, StartsWithType } from '../starts-with-decorator';
-import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
 import { hasValue } from '../../empty.util';
-import { PaginationService } from '../../../core/pagination/pagination.service';
+import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from '../starts-with-decorator';
 
 /**
  * A switchable component rendering StartsWith options for the type "Date".
@@ -13,10 +17,10 @@ import { PaginationService } from '../../../core/pagination/pagination.service';
 @Component({
   selector: 'ds-starts-with-date',
   styleUrls: ['./starts-with-date.component.scss'],
-  templateUrl: './starts-with-date.component.html'
+  templateUrl: './starts-with-date.component.html',
 })
 @renderStartsWithFor(StartsWithType.date)
-export class StartsWithDateComponent extends StartsWithAbstractComponent {
+export class StartsWithDateComponent extends StartsWithAbstractComponent implements OnInit {
 
   /**
    * A list of options for months to select from
@@ -33,14 +37,6 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
    */
   startsWithYear: number;
 
-  public constructor(@Inject('startsWithOptions') public startsWithOptions: any[],
-                     @Inject('paginationId') public paginationId: string,
-                     protected paginationService: PaginationService,
-                     protected route: ActivatedRoute,
-                     protected router: Router) {
-    super(startsWithOptions, paginationId, paginationService, route, router);
-  }
-
   ngOnInit() {
     this.monthOptions = [
       'none',
@@ -55,7 +51,7 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
       'september',
       'october',
       'november',
-      'december'
+      'december',
     ];
 
     super.ngOnInit();
@@ -131,14 +127,6 @@ export class StartsWithDateComponent extends StartsWithAbstractComponent {
     } else {
       this.startsWithYear = +startsWith;
     }
-    this.setStartsWithParam(false);
-  }
-
-  /**
-   * Get startsWithYear as a number;
-   */
-  getStartsWithYear() {
-    return this.startsWithYear;
   }
 
   /**
diff --git a/src/app/shared/starts-with/starts-with-abstract.component.ts b/src/app/shared/starts-with/starts-with-abstract.component.ts
index 3b35a11269..35efe312aa 100644
--- a/src/app/shared/starts-with/starts-with-abstract.component.ts
+++ b/src/app/shared/starts-with/starts-with-abstract.component.ts
@@ -1,18 +1,38 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { Subscription } from 'rxjs';
-import { FormControl, FormGroup } from '@angular/forms';
-import { hasValue } from '../empty.util';
+
 import { PaginationService } from '../../core/pagination/pagination.service';
+import { hasValue } from '../empty.util';
+import { StartsWithType } from './starts-with-decorator';
 
 /**
  * An abstract component to render StartsWith options
  */
 @Component({
   selector: 'ds-start-with-abstract',
-  template: ''
+  template: '',
 })
 export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
+
+  @Input() paginationId: string;
+
+  @Input() startsWithOptions: (string | number)[];
+
+  @Input() type: StartsWithType;
+
   /**
    * The currently selected startsWith in string format
    */
@@ -21,18 +41,18 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
   /**
    * The formdata controlling the StartsWith input
    */
-  formData: FormGroup;
+  formData: UntypedFormGroup;
 
   /**
    * List of subscriptions
    */
   subs: Subscription[] = [];
 
-  public constructor(@Inject('startsWithOptions') public startsWithOptions: any[],
-                     @Inject('paginationId') public paginationId: string,
-                     protected paginationService: PaginationService,
-                     protected route: ActivatedRoute,
-                     protected router: Router) {
+  public constructor(
+    protected paginationService: PaginationService,
+    protected route: ActivatedRoute,
+    protected router: Router,
+  ) {
   }
 
   ngOnInit(): void {
@@ -41,10 +61,10 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
         if (hasValue(params.startsWith)) {
           this.setStartsWith(params.startsWith);
         }
-      })
+      }),
     );
-    this.formData = new FormGroup({
-      startsWith: new FormControl()
+    this.formData = new UntypedFormGroup({
+      startsWith: new UntypedFormControl(),
     });
   }
 
@@ -55,22 +75,12 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
     return this.startsWith;
   }
 
-  /**
-   * Set the startsWith by event
-   * @param event
-   */
-  setStartsWithEvent(event: Event) {
-    this.startsWith = (event.target as HTMLInputElement).value;
-    this.setStartsWithParam();
-  }
-
   /**
    * Set the startsWith by string
    * @param startsWith
    */
   setStartsWith(startsWith: string) {
     this.startsWith = startsWith;
-    this.setStartsWithParam(false);
   }
 
   /**
@@ -81,11 +91,11 @@ export abstract class StartsWithAbstractComponent implements OnInit, OnDestroy {
       this.startsWith = undefined;
     }
     if (resetPage) {
-      this.paginationService.updateRoute(this.paginationId, {page: 1}, { startsWith: this.startsWith });
+      this.paginationService.updateRoute(this.paginationId, { page: 1 }, { startsWith: this.startsWith });
     } else {
-      this.router.navigate([], {
+      void this.router.navigate([], {
         queryParams: Object.assign({ startsWith: this.startsWith }),
-        queryParamsHandling: 'merge'
+        queryParamsHandling: 'merge',
       });
     }
   }
diff --git a/src/app/shared/starts-with/starts-with-decorator.spec.ts b/src/app/shared/starts-with/starts-with-decorator.spec.ts
index 0ba72d8ac4..c5eac51ffc 100644
--- a/src/app/shared/starts-with/starts-with-decorator.spec.ts
+++ b/src/app/shared/starts-with/starts-with-decorator.spec.ts
@@ -1,4 +1,7 @@
-import { renderStartsWithFor, StartsWithType } from './starts-with-decorator';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from './starts-with-decorator';
 
 describe('BrowseByStartsWithDecorator', () => {
   const textDecorator = renderStartsWithFor(StartsWithType.text);
diff --git a/src/app/shared/starts-with/starts-with-loader.component.spec.ts b/src/app/shared/starts-with/starts-with-loader.component.spec.ts
new file mode 100644
index 0000000000..e8c6cd2be9
--- /dev/null
+++ b/src/app/shared/starts-with/starts-with-loader.component.spec.ts
@@ -0,0 +1,82 @@
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { PaginationService } from '../../core/pagination/pagination.service';
+import { DynamicComponentLoaderDirective } from '../abstract-component-loader/dynamic-component-loader.directive';
+import { getMockThemeService } from '../mocks/theme-service.mock';
+import { ActivatedRouteStub } from '../testing/active-router.stub';
+import { PaginationServiceStub } from '../testing/pagination-service.stub';
+import { RouterStub } from '../testing/router.stub';
+import { ThemeService } from '../theme-support/theme.service';
+import { StartsWithType } from './starts-with-decorator';
+import { StartsWithLoaderComponent } from './starts-with-loader.component';
+import { StartsWithTextComponent } from './text/starts-with-text.component';
+
+describe('StartsWithLoaderComponent', () => {
+  let comp: StartsWithLoaderComponent;
+  let fixture: ComponentFixture<StartsWithLoaderComponent>;
+
+  let paginationService: PaginationServiceStub;
+  let route: ActivatedRouteStub;
+  let themeService: ThemeService;
+
+  const type: StartsWithType = StartsWithType.text;
+
+  beforeEach(waitForAsync(() => {
+    paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    themeService = getMockThemeService('dspace');
+
+    void TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        StartsWithLoaderComponent,
+        StartsWithTextComponent,
+        DynamicComponentLoaderDirective,
+      ],
+      providers: [
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: ThemeService, useValue: themeService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).overrideComponent(StartsWithLoaderComponent, {
+      set: {
+        changeDetection: ChangeDetectionStrategy.Default,
+        entryComponents: [StartsWithTextComponent],
+      },
+    }).compileComponents();
+  }));
+
+  beforeEach(waitForAsync(() => {
+    fixture = TestBed.createComponent(StartsWithLoaderComponent);
+    comp = fixture.componentInstance;
+    comp.type = type;
+    comp.paginationId = 'bbm';
+    comp.startsWithOptions = [];
+    spyOn(comp, 'getComponent').and.returnValue(StartsWithTextComponent);
+
+    fixture.detectChanges();
+  }));
+
+  describe('When the component is rendered', () => {
+    it('should call the getComponent function', () => {
+      expect(comp.getComponent).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/shared/starts-with/starts-with-loader.component.ts b/src/app/shared/starts-with/starts-with-loader.component.ts
new file mode 100644
index 0000000000..663c5e8401
--- /dev/null
+++ b/src/app/shared/starts-with/starts-with-loader.component.ts
@@ -0,0 +1,40 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+import { AbstractComponentLoaderComponent } from '../abstract-component-loader/abstract-component-loader.component';
+import { StartsWithAbstractComponent } from './starts-with-abstract.component';
+import {
+  getStartsWithComponent,
+  StartsWithType,
+} from './starts-with-decorator';
+
+/**
+ * Component for loading a {@link StartsWithAbstractComponent} depending on the "type" input
+ */
+@Component({
+  selector: 'ds-starts-with-loader',
+  templateUrl: '../abstract-component-loader/abstract-component-loader.component.html',
+})
+export class StartsWithLoaderComponent extends AbstractComponentLoaderComponent<StartsWithAbstractComponent> {
+
+  @Input() paginationId: string;
+
+  @Input() startsWithOptions: (string | number)[];
+
+  @Input() type: StartsWithType;
+
+  protected inputNames: (keyof this & string)[] = [
+    ...this.inputNames,
+    'paginationId',
+    'startsWithOptions',
+    'type',
+  ];
+
+  public getComponent(): GenericConstructor<StartsWithAbstractComponent> {
+    return getStartsWithComponent(this.type);
+  }
+
+}
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 3314d9cc4a..926a2f932d 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,7 +1,7 @@
 <form class="w-100" [formGroup]="formData" (ngSubmit)="submitForm(formData.value)">
   <div class="row">
     <div class="form-group input-group col-8 col-sm-12 col-md-6">
-      <input class="form-control" placeholder="{{'browse.startsWith.type_text' | translate}}" type="text" name="startsWith" formControlName="startsWith" [value]="getStartsWith()" />
+      <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()" />
       <span class="input-group-append">
         <button class="btn btn-primary" type="submit"><i class="fas fa-book-open"></i> {{'browse.startsWith.submit' | translate}}</button>
       </span>
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
index c08ef5cfdc..94fccce55f 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.spec.ts
@@ -1,50 +1,59 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
-import { RouterTestingModule } from '@angular/router/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { StartsWithTextComponent } from './starts-with-text.component';
-import { PaginationComponentOptions } from '../../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
-import { of as observableOf } from 'rxjs';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
 import { PaginationService } from '../../../core/pagination/pagination.service';
+import { ActivatedRouteStub } from '../../testing/active-router.stub';
 import { PaginationServiceStub } from '../../testing/pagination-service.stub';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { RouterStub } from '../../testing/router.stub';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
+import { StartsWithTextComponent } from './starts-with-text.component';
 
 describe('StartsWithTextComponent', () => {
   let comp: StartsWithTextComponent;
   let fixture: ComponentFixture<StartsWithTextComponent>;
-  let route: ActivatedRoute;
-  let router: Router;
+
+  let paginationService: PaginationServiceStub;
+  let route: ActivatedRouteStub;
+  let router: RouterStub;
 
   const options = ['0-9', 'A', 'B', 'C'];
 
-  const paginationService = new PaginationServiceStub();
+  beforeEach(waitForAsync(async () => {
+    paginationService = new PaginationServiceStub();
+    route = new ActivatedRouteStub();
+    router = new RouterStub();
 
-  beforeEach(waitForAsync(() => {
-    TestBed.configureTestingModule({
+    await TestBed.configureTestingModule({
       imports: [CommonModule, RouterTestingModule.withRoutes([]), TranslateModule.forRoot(), NgbModule],
       declarations: [StartsWithTextComponent, EnumKeysPipe],
       providers: [
-        { provide: 'startsWithOptions', useValue: options },
-        { provide: 'paginationId', useValue: 'page-id' },
-        { provide: PaginationService, useValue: paginationService }
+        { provide: PaginationService, useValue: paginationService },
+        { provide: ActivatedRoute, useValue: route },
+        { provide: Router, useValue: router },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
   beforeEach(() => {
     fixture = TestBed.createComponent(StartsWithTextComponent);
     comp = fixture.componentInstance;
+    comp.paginationId = 'page-id';
+    comp.startsWithOptions = options;
     fixture.detectChanges();
-    route = (comp as any).route;
-    router = (comp as any).router;
-    spyOn(router, 'navigate');
   });
 
   it('should create a FormGroup containing a startsWith FormControl', () => {
@@ -67,7 +76,7 @@ describe('StartsWithTextComponent', () => {
     });
 
     it('should add a startsWith query parameter', () => {
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', {page: 1}, {startsWith: expectedValue});
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('page-id', { page: 1 }, { startsWith: expectedValue });
     });
   });
 
diff --git a/src/app/shared/starts-with/text/starts-with-text.component.ts b/src/app/shared/starts-with/text/starts-with-text.component.ts
index 9f44fc4d40..0f29f932ad 100644
--- a/src/app/shared/starts-with/text/starts-with-text.component.ts
+++ b/src/app/shared/starts-with/text/starts-with-text.component.ts
@@ -1,7 +1,11 @@
 import { Component } from '@angular/core';
-import { renderStartsWithFor, StartsWithType } from '../starts-with-decorator';
-import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
+
 import { hasValue } from '../../empty.util';
+import { StartsWithAbstractComponent } from '../starts-with-abstract.component';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from '../starts-with-decorator';
 
 /**
  * A switchable component rendering StartsWith options for the type "Text".
@@ -9,7 +13,7 @@ import { hasValue } from '../../empty.util';
 @Component({
   selector: 'ds-starts-with-text',
   styleUrls: ['./starts-with-text.component.scss'],
-  templateUrl: './starts-with-text.component.html'
+  templateUrl: './starts-with-text.component.html',
 })
 @renderStartsWithFor(StartsWithType.text)
 export class StartsWithTextComponent extends StartsWithAbstractComponent {
@@ -35,15 +39,4 @@ export class StartsWithTextComponent extends StartsWithAbstractComponent {
     super.setStartsWithParam(resetPage);
   }
 
-  /**
-   * Checks whether the provided option is equal to the current startsWith
-   * @param option
-   */
-  isSelectedOption(option: string): boolean {
-    if (this.startsWith === '0' && option === '0-9') {
-      return true;
-    }
-    return option === this.startsWith;
-  }
-
 }
diff --git a/src/app/shared/subscriptions/models/subscription.model.ts b/src/app/shared/subscriptions/models/subscription.model.ts
new file mode 100644
index 0000000000..cf3ea645dd
--- /dev/null
+++ b/src/app/shared/subscriptions/models/subscription.model.ts
@@ -0,0 +1,80 @@
+import {
+  autoserialize,
+  deserialize,
+  inheritSerialization,
+} from 'cerialize';
+import { Observable } from 'rxjs';
+
+import {
+  link,
+  typedObject,
+} from '../../../core/cache/builders/build-decorators';
+import { RemoteData } from '../../../core/data/remote-data';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { EPERSON } from '../../../core/eperson/models/eperson.resource-type';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { DSPACE_OBJECT } from '../../../core/shared/dspace-object.resource-type';
+import { HALLink } from '../../../core/shared/hal-link.model';
+import { SUBSCRIPTION } from './subscription.resource-type';
+
+@typedObject
+@inheritSerialization(DSpaceObject)
+export class Subscription extends DSpaceObject {
+  static type = SUBSCRIPTION;
+
+  /**
+   * A string representing subscription type
+   */
+  @autoserialize
+  public id: string;
+
+  /**
+   * A string representing subscription type
+   */
+  @autoserialize
+  public subscriptionType: string;
+
+  /**
+   * An array of parameters for the subscription
+   */
+  @autoserialize
+  public subscriptionParameterList: SubscriptionParameterList[];
+
+  /**
+   * The {@link HALLink}s for this Subscription
+   */
+  @deserialize
+    _links: {
+    self: HALLink;
+    eperson: HALLink;
+    resource: HALLink;
+  };
+
+  /**
+   * The logo for this Community
+   * Will be undefined unless the logo {@link HALLink} has been resolved.
+   */
+  @link(EPERSON)
+    eperson?: Observable<RemoteData<EPerson>>;
+
+  /**
+   * The logo for this Community
+   * Will be undefined unless the logo {@link HALLink} has been resolved.
+   */
+  @link(DSPACE_OBJECT)
+    resource?: Observable<RemoteData<DSpaceObject>>;
+  /**
+   * The embedded ePerson & dSpaceObject for this Subscription
+   */
+  /*  @deserialize
+    _embedded: {
+      ePerson: EPerson;
+      dSpaceObject: DSpaceObject;
+    };*/
+}
+
+export interface SubscriptionParameterList {
+  id: string;
+  name: string;
+  value: string;
+}
diff --git a/src/app/shared/subscriptions/models/subscription.resource-type.ts b/src/app/shared/subscriptions/models/subscription.resource-type.ts
new file mode 100644
index 0000000000..a1dad5cba0
--- /dev/null
+++ b/src/app/shared/subscriptions/models/subscription.resource-type.ts
@@ -0,0 +1,10 @@
+import { ResourceType } from '../../../core/shared/resource-type';
+
+/**
+ * The resource type for Subscription
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+
+export const SUBSCRIPTION = new ResourceType('subscription');
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
new file mode 100644
index 0000000000..4894d66de3
--- /dev/null
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -0,0 +1,46 @@
+<form *ngIf="subscriptionForm" [formGroup]="subscriptionForm" (ngSubmit)="submit()" data-test="subscription-form">
+  <div class="modal-header">
+    <h4 class="modal-title">{{'subscriptions.modal.title' | translate}}</h4>
+    <button type="button" class="close" aria-label="Close" (click)="activeModal.close()">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <p class="mb-3"><strong>{{ dsoNameService.getName(dso) }}</strong>
+      <span *ngIf="!!dso" class="float-right"><ds-themed-type-badge *ngIf="!!dso" [object]="dso"></ds-themed-type-badge></span>
+    </p>
+    <div>
+      <fieldset *ngFor="let subscriptionType of subscriptionForm?.controls | keyvalue" formGroupName="{{subscriptionType.key}}" class="form-group form-row">
+        <legend class="col-md-4 col-form-label float-md-left pt-0">
+          {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
+        </legend>
+        <div class="col-md-8">
+          <input type="hidden" formControlName="subscriptionId" [value]="subscriptionType?.value?.controls['subscriptionId'].value" >
+          <div class="form-check" formGroupName="frequencies" *ngFor="let frequency of frequencyDefaultValues">
+            <input type="checkbox" [id]="'checkbox-' + frequency" class="form-check-input" [formControlName]="frequency"/>
+            <label class="form-check-label"
+                   [for]="'checkbox-' + frequency">{{ 'subscriptions.modal.new-subscription-form.frequency.' + frequency | translate }}</label>
+          </div>
+        </div>
+        <ds-alert *ngIf="!!submitted && subscriptionType?.value?.controls['frequencies'].errors?.required" [type]="'alert-danger'">
+          {{ 'context-menu.actions.subscription.frequency.required' | translate }}
+        </ds-alert>
+      </fieldset>
+    </div>
+    <p class="text-muted" *ngIf="(showDeleteInfo$ | async)">{{'subscriptions.modal.delete-info' | translate}}</p>
+  </div>
+  <div class="modal-footer">
+    <button type="button" class="btn btn-outline-secondary"
+            (click)="activeModal.close()">
+      {{'subscriptions.modal.close' | translate}}
+    </button>
+    <button type="submit" class="btn btn-success" [disabled]="(processing$ | async) || !isValid">
+        <span *ngIf="(processing$ | async)">
+          <i class='fas fa-circle-notch fa-spin'></i> {{'subscriptions.modal.new-subscription-form.processing' | translate}}
+        </span>
+      <span *ngIf="(processing$ | async) !== true">
+        {{'subscriptions.modal.new-subscription-form.submit' | translate}}
+      </span>
+    </button>
+  </div>
+</form>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.scss b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
new file mode 100644
index 0000000000..b069b1efd1
--- /dev/null
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.spec.ts
@@ -0,0 +1,280 @@
+import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ReactiveFormsModule,
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import {
+  NgbActiveModal,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { Item } from '../../../core/shared/item.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import {
+  subscriptionMock,
+  subscriptionMock2,
+} from '../../testing/subscriptions-data.mock';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
+import { SubscriptionModalComponent } from './subscription-modal.component';
+
+describe('SubscriptionModalComponent', () => {
+  let component: SubscriptionModalComponent;
+  let fixture: ComponentFixture<SubscriptionModalComponent>;
+  let de: DebugElement;
+
+  let subscriptionServiceStub;
+
+  const notificationServiceStub = jasmine.createSpyObj('authService', {
+    notificationWithAnchor: true,
+    success: undefined,
+  });
+
+  const emptyPageInfo = Object.assign(new PageInfo(), {
+    'elementsPerPage': 0,
+    'totalElements': 0,
+  });
+
+
+  const pageInfo = Object.assign(new PageInfo(), {
+    'elementsPerPage': 2,
+    'totalElements': 2,
+  });
+
+  const mockEperson = Object.assign(new EPerson(), {
+    id: 'fake-id',
+    uuid: 'fake-id',
+    _links: {
+      self: {
+        href: 'https://localhost:8000/eperson/fake-id',
+      },
+    },
+  });
+
+  const mockItem = Object.assign(new Item(), {
+    id: 'fake-id',
+    uuid: 'fake-id',
+    handle: 'fake/handle',
+    lastModified: '2018',
+    _links: {
+      self: {
+        href: 'https://localhost:8000/items/fake-id',
+      },
+    },
+  });
+
+  const authService = jasmine.createSpyObj('authService', {
+    getAuthenticatedUserFromStore: createSuccessfulRemoteDataObject$(mockEperson),
+  });
+
+  subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', {
+    getSubscriptionsByPersonDSO: jasmine.createSpy('getSubscriptionsByPersonDSO'),
+    createSubscription: createSuccessfulRemoteDataObject$({}),
+    updateSubscription: createSuccessfulRemoteDataObject$({}),
+  });
+
+  beforeEach(waitForAsync(() => {
+
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        NgbModalModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      declarations: [SubscriptionModalComponent],
+      providers: [
+        NgbActiveModal,
+        { provide: AuthService, useValue: authService },
+        { provide: NotificationsService, useValue: notificationServiceStub },
+        { provide: SubscriptionsDataService, useValue: subscriptionServiceStub },
+      ],
+      schemas: [
+        NO_ERRORS_SCHEMA,
+      ],
+    }).compileComponents();
+
+  }));
+
+  describe('when submitting subscriptions', () => {
+
+    const testSubscriptionId = 'test-subscription-id';
+    const testTypes = ['test1', 'test2'];
+    const testFrequencies = ['f', 'g'];
+
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubscriptionModalComponent);
+      component = fixture.componentInstance;
+      component.dso = mockItem;
+      (component as any).subscriptionDefaultTypes = testTypes;
+      (component as any).frequencyDefaultValues = testFrequencies;
+      de = fixture.debugElement;
+      subscriptionServiceStub.createSubscription.calls.reset();
+      subscriptionServiceStub.updateSubscription.calls.reset();
+      fixture.detectChanges();
+    });
+
+    it('should edit an existing subscription', () => {
+      component.subscriptionForm = new UntypedFormGroup({});
+      for (let t of testTypes) {
+        const formGroup = new UntypedFormGroup({
+          subscriptionId: new UntypedFormControl(testSubscriptionId),
+          frequencies: new UntypedFormGroup({
+            f: new UntypedFormControl(false),
+            g: new UntypedFormControl(true),
+          }),
+        });
+        component.subscriptionForm.addControl(t, formGroup);
+        component.subscriptionForm.get('test1').markAsDirty();
+        component.subscriptionForm.get('test1').markAsTouched();
+      }
+
+      fixture.detectChanges();
+      component.submit();
+
+      expect(subscriptionServiceStub.createSubscription).not.toHaveBeenCalled();
+      expect(subscriptionServiceStub.updateSubscription).toHaveBeenCalled();
+      expect(component.subscriptionForm.controls).toBeTruthy();
+    });
+
+    it('should create a new subscription', () => {
+      component.subscriptionForm = new UntypedFormGroup({});
+      for (let t of testTypes) {
+        const formGroup = new UntypedFormGroup({
+          subscriptionId: new UntypedFormControl(undefined),
+          frequencies: new UntypedFormGroup({
+            f: new UntypedFormControl(false),
+            g: new UntypedFormControl(true),
+          }),
+        });
+        component.subscriptionForm.addControl(t, formGroup);
+        component.subscriptionForm.get('test1').markAsDirty();
+        component.subscriptionForm.get('test1').markAsTouched();
+      }
+
+      fixture.detectChanges();
+      component.submit();
+
+      expect(subscriptionServiceStub.createSubscription).toHaveBeenCalled();
+      expect(subscriptionServiceStub.updateSubscription).not.toHaveBeenCalled();
+      expect(component.subscriptionForm.controls).toBeTruthy();
+    });
+
+  });
+
+  describe('when no subscription is given', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubscriptionModalComponent);
+      component = fixture.componentInstance;
+      component.dso = mockItem;
+      (component as any).subscriptionDefaultTypes = ['test1', 'test2'];
+      de = fixture.debugElement;
+    });
+
+    describe('and no subscriptions are present for the given dso', () => {
+      beforeEach(() => {
+        subscriptionServiceStub.getSubscriptionsByPersonDSO.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(emptyPageInfo, [])));
+        fixture.detectChanges();
+      });
+
+      it('should create', () => {
+        expect(component).toBeTruthy();
+      });
+
+      it('should init form properly', () => {
+        expect(de.query(By.css(' [data-test="subscription-form"]'))).toBeTruthy();
+        expect(component.subscriptionForm).toBeTruthy();
+        expect(component.subscriptionForm.get('test1')).toBeTruthy();
+        expect(component.subscriptionForm.get('test2')).toBeTruthy();
+        (component as any).frequencyDefaultValues.forEach((frequency) => {
+          expect(component.subscriptionForm.get('test1').get('frequencies').get(frequency)).toBeTruthy();
+          expect(component.subscriptionForm.get('test2').get('frequencies').get(frequency)).toBeTruthy();
+        });
+      });
+    });
+
+    describe('and subscriptions are present for the given dso', () => {
+      beforeEach(() => {
+        subscriptionServiceStub.getSubscriptionsByPersonDSO.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(pageInfo, [subscriptionMock, subscriptionMock2])));
+        fixture.detectChanges();
+      });
+
+      it('should create', () => {
+        expect(component).toBeTruthy();
+      });
+
+      it('should init form properly', () => {
+        expect(de.query(By.css(' [data-test="subscription-form"]'))).toBeTruthy();
+        expect(component.subscriptionForm).toBeTruthy();
+        expect(component.subscriptionForm.get('test1')).toBeTruthy();
+        expect(component.subscriptionForm.get('test2')).toBeTruthy();
+        (component as any).frequencyDefaultValues.forEach((frequency) => {
+          expect(component.subscriptionForm.get('test1').get('frequencies').get(frequency)).toBeTruthy();
+
+          expect(component.subscriptionForm.get('test2').get('frequencies').get(frequency)).toBeTruthy();
+        });
+        expect(component.subscriptionForm.get('test1').get('frequencies').get('D').value).toBeTrue();
+        expect(component.subscriptionForm.get('test1').get('frequencies').get('M').value).toBeTrue();
+        expect(component.subscriptionForm.get('test1').get('frequencies').get('W').value).toBeFalse();
+
+        expect(component.subscriptionForm.get('test2').get('frequencies').get('D').value).toBeTrue();
+        expect(component.subscriptionForm.get('test2').get('frequencies').get('M').value).toBeFalse();
+        expect(component.subscriptionForm.get('test2').get('frequencies').get('W').value).toBeFalse();
+      });
+    });
+  });
+
+  describe('when no subscription is given', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubscriptionModalComponent);
+      component = fixture.componentInstance;
+      component.dso = mockItem;
+      component.subscription = subscriptionMock as any;
+      (component as any).subscriptionDefaultTypes = ['test1', 'test2'];
+      de = fixture.debugElement;
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should init form properly', () => {
+      expect(de.query(By.css(' [data-test="subscription-form"]'))).toBeTruthy();
+      expect(component.subscriptionForm).toBeTruthy();
+      expect(component.subscriptionForm.get('test1')).toBeTruthy();
+      (component as any).frequencyDefaultValues.forEach((frequency) => {
+        expect(component.subscriptionForm.get('test1').get('frequencies').get(frequency)).toBeTruthy();
+      });
+      expect(component.subscriptionForm.get('test1').get('frequencies').get('D').value).toBeTrue();
+      expect(component.subscriptionForm.get('test1').get('frequencies').get('M').value).toBeTrue();
+      expect(component.subscriptionForm.get('test1').get('frequencies').get('W').value).toBeFalse();
+    });
+  });
+
+});
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
new file mode 100644
index 0000000000..0eb17ef835
--- /dev/null
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.ts
@@ -0,0 +1,307 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import findIndex from 'lodash/findIndex';
+import {
+  BehaviorSubject,
+  combineLatest,
+  from,
+  shareReplay,
+} from 'rxjs';
+import {
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { AuthService } from '../../../core/auth/auth.service';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { PaginatedList } from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { isNotEmpty } from '../../empty.util';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { Subscription } from '../models/subscription.model';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
+
+@Component({
+  selector: 'ds-subscription-modal',
+  templateUrl: './subscription-modal.component.html',
+  styleUrls: ['./subscription-modal.component.scss'],
+})
+/**
+ * Modal that allows to manage the subscriptions for the selected item
+ */
+export class SubscriptionModalComponent implements OnInit {
+
+  /**
+   * DSpaceObject of which to get the subscriptions
+   */
+  @Input() dso: DSpaceObject;
+
+  /**
+   * If given the subscription to edit by the form
+   */
+  @Input() subscription: Subscription;
+
+  /**
+   * The eperson related to the subscription
+   */
+  ePersonId: string;
+
+  /**
+   * A boolean representing if a request operation is pending
+   * @type {BehaviorSubject<boolean>}
+   */
+  public processing$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * If true, show a message explaining how to delete a subscription
+   */
+  public showDeleteInfo$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * Reactive form group that will be used to add/edit subscriptions
+   */
+  subscriptionForm: UntypedFormGroup;
+
+  /**
+   * Used to show validation errors when user submits
+   */
+  submitted = false;
+
+  /**
+   * Types of subscription to be shown on select
+   */
+  subscriptionDefaultTypes = ['content'];
+
+  /**
+   * Frequencies to be shown as checkboxes
+   */
+  frequencyDefaultValues = ['D', 'W', 'M'];
+
+  /**
+   * True if form status has changed and at least one frequency is checked
+   */
+  isValid = false;
+  /**
+   * Event emitted when a given subscription has been updated
+   */
+  @Output() updateSubscription: EventEmitter<Subscription> = new EventEmitter<Subscription>();
+
+  constructor(
+    private formBuilder: UntypedFormBuilder,
+    private modalService: NgbModal,
+    private notificationsService: NotificationsService,
+    private subscriptionService: SubscriptionsDataService,
+    public activeModal: NgbActiveModal,
+    private authService: AuthService,
+    private translate: TranslateService,
+    public dsoNameService: DSONameService,
+  ) {
+  }
+
+  /**
+   * When component starts initialize starting functionality
+   */
+  ngOnInit(): void {
+    this.authService.getAuthenticatedUserFromStore().pipe(
+      take(1),
+      map((ePerson) => ePerson.uuid),
+      shareReplay({ refCount: false }),  // todo: check if this is ok
+    ).subscribe((ePersonId: string) => {
+      this.ePersonId = ePersonId;
+      if (isNotEmpty(this.subscription)) {
+        this.initFormByGivenSubscription();
+      } else {
+        this.initFormByAllSubscriptions();
+      }
+    });
+
+    this.subscriptionForm.valueChanges.subscribe((newValue) => {
+      let anyFrequencySelected = false;
+      for (const f of this.frequencyDefaultValues) {
+        anyFrequencySelected = anyFrequencySelected || newValue.content.frequencies[f];
+      }
+      this.isValid = anyFrequencySelected;
+    });
+  }
+
+  initFormByAllSubscriptions(): void {
+    this.subscriptionForm = new UntypedFormGroup({});
+    for (const t of this.subscriptionDefaultTypes) {
+      const formGroup = new UntypedFormGroup({});
+      formGroup.addControl('subscriptionId', this.formBuilder.control(''));
+      formGroup.addControl('frequencies', this.formBuilder.group({}));
+      for (const f of this.frequencyDefaultValues) {
+        (formGroup.controls.frequencies as UntypedFormGroup).addControl(f, this.formBuilder.control(false));
+      }
+      this.subscriptionForm.addControl(t, formGroup);
+    }
+
+    this.initFormDataBySubscriptions();
+  }
+
+  /**
+   * If the subscription is passed start the form with the information of subscription
+   */
+  initFormByGivenSubscription(): void {
+    const formGroup = new UntypedFormGroup({});
+    formGroup.addControl('subscriptionId', this.formBuilder.control(this.subscription.id));
+    formGroup.addControl('frequencies', this.formBuilder.group({}));
+    (formGroup.get('frequencies') as UntypedFormGroup).addValidators(Validators.required);
+    for (const f of this.frequencyDefaultValues) {
+      const value = findIndex(this.subscription.subscriptionParameterList, ['value', f]) !== -1;
+      (formGroup.controls.frequencies as UntypedFormGroup).addControl(f, this.formBuilder.control(value));
+    }
+
+    this.subscriptionForm = this.formBuilder.group({
+      [this.subscription.subscriptionType]: formGroup,
+    });
+  }
+
+  /**
+   * Get subscriptions for the current ePerson & dso object relation.
+   * If there are no subscriptions then start with an empty form.
+   */
+  initFormDataBySubscriptions(): void {
+    this.processing$.next(true);
+    this.subscriptionService.getSubscriptionsByPersonDSO(this.ePersonId, this.dso?.uuid).pipe(
+      getFirstSucceededRemoteDataPayload(),
+    ).subscribe({
+      next: (res: PaginatedList<Subscription>) => {
+        if (res.pageInfo.totalElements > 0) {
+          this.showDeleteInfo$.next(true);
+          for (const subscription of res.page) {
+            const type = subscription.subscriptionType;
+            const subscriptionGroup: UntypedFormGroup = this.subscriptionForm.get(type) as UntypedFormGroup;
+            if (isNotEmpty(subscriptionGroup)) {
+              subscriptionGroup.controls.subscriptionId.setValue(subscription.id);
+              for (const parameter of subscription.subscriptionParameterList.filter((p) => p.name === 'frequency')) {
+                (subscriptionGroup.controls.frequencies as UntypedFormGroup).controls[parameter.value]?.setValue(true);
+              }
+            }
+          }
+        }
+        this.processing$.next(false);
+      },
+      error: (err: unknown) => {
+        this.processing$.next(false);
+      },
+    });
+  }
+
+  /**
+   * Create/update subscriptions if needed
+   */
+  submit() {
+    this.submitted = true;
+    const subscriptionTypes: string[] = Object.keys(this.subscriptionForm.controls);
+    const subscriptionsToBeCreated = [];
+    const subscriptionsToBeUpdated = [];
+
+    subscriptionTypes.forEach((subscriptionType: string) => {
+      const subscriptionGroup: UntypedFormGroup = this.subscriptionForm.controls[subscriptionType] as UntypedFormGroup;
+      if (subscriptionGroup.touched && subscriptionGroup.dirty) {
+        const body = this.createBody(
+          subscriptionGroup.controls.subscriptionId.value,
+          subscriptionType,
+          subscriptionGroup.controls.frequencies as UntypedFormGroup,
+        );
+
+        if (isNotEmpty(body.id)) {
+          subscriptionsToBeUpdated.push(body);
+        } else if (isNotEmpty(body.subscriptionParameterList)) {
+          subscriptionsToBeCreated.push(body);
+        }
+      }
+
+    });
+
+    const toBeProcessed = [];
+    if (isNotEmpty(subscriptionsToBeCreated)) {
+      toBeProcessed.push(from(subscriptionsToBeCreated).pipe(
+        mergeMap((subscriptionBody) => {
+          return this.subscriptionService.createSubscription(subscriptionBody, this.ePersonId, this.dso.uuid).pipe(
+            getFirstCompletedRemoteData(),
+          );
+        }),
+        tap((res: RemoteData<Subscription>) => {
+          if (res.hasSucceeded) {
+            const msg = this.translate.instant('subscriptions.modal.create.success', { type: res.payload.subscriptionType });
+            this.notificationsService.success(null, msg);
+          } else {
+            this.notificationsService.error(null, this.translate.instant('subscriptions.modal.create.error'));
+          }
+        }),
+      ));
+    }
+
+    if (isNotEmpty(subscriptionsToBeUpdated)) {
+      toBeProcessed.push(from(subscriptionsToBeUpdated).pipe(
+        mergeMap((subscriptionBody) => {
+          return this.subscriptionService.updateSubscription(subscriptionBody, this.ePersonId, this.dso.uuid).pipe(
+            getFirstCompletedRemoteData(),
+          );
+        }),
+        tap((res: RemoteData<Subscription>) => {
+          if (res.hasSucceeded) {
+            const msg = this.translate.instant('subscriptions.modal.update.success', { type: res.payload.subscriptionType });
+            this.notificationsService.success(null, msg);
+            if (isNotEmpty(this.subscription)) {
+              this.updateSubscription.emit(res.payload);
+            }
+          } else {
+            this.notificationsService.error(null, this.translate.instant('subscriptions.modal.update.error'));
+          }
+        }),
+      ));
+    }
+
+    combineLatest([...toBeProcessed]).subscribe((res) => {
+      this.activeModal.close();
+    });
+
+  }
+
+  private createBody(subscriptionId: string, subscriptionType: string, frequencies: UntypedFormGroup): Partial<any> {
+    const body = {
+      id: (isNotEmpty(subscriptionId) ? subscriptionId : null),
+      subscriptionType: subscriptionType,
+      subscriptionParameterList: [],
+    };
+
+    for (const frequency of this.frequencyDefaultValues) {
+      if (frequencies.value[frequency]) {
+        body.subscriptionParameterList.push(
+          {
+            name: 'frequency',
+            value: frequency,
+          },
+        );
+      }
+    }
+
+    return body;
+  }
+
+}
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
new file mode 100644
index 0000000000..b181bcbef6
--- /dev/null
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -0,0 +1,35 @@
+<td class="dso-info">
+  <ng-container *ngIf="!!dso">
+    <ds-themed-type-badge [object]="dso"></ds-themed-type-badge>
+    <p><a [routerLink]="[getPageRoutePrefix(), dso.id]">{{ dsoNameService.getName(dso) }}</a></p>
+  </ng-container>
+  <ng-container *ngIf="!dso">
+    <p class="my-0">{{ 'subscriptions.table.not-available' | translate }}</p>
+    <p class="text-muted my-0">{{ 'subscriptions.table.not-available-message' | translate }}</p>
+  </ng-container>
+</td>
+<td>
+  <span *ngIf="!!subscription" class="subscription-type">{{subscription.subscriptionType}}</span>
+</td>
+<td class="subscription-parameters">
+  <ng-container *ngIf="!!subscription">
+		<span *ngFor="let parameterList of subscription.subscriptionParameterList; let i = index">
+			{{ 'subscriptions.frequency.' + parameterList.value | translate}}<span
+      *ngIf="i < subscription.subscriptionParameterList.length-1 ">,</span>
+		</span>
+  </ng-container>
+</td>
+<td class="subscription-actions">
+  <div class="btn-group edit-field">
+    <button (click)="$event.preventDefault();openSubscriptionModal();" [disabled]="!dso"
+            [title]="'subscriptions.table.edit' | translate"
+            class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
+      <i class="fas fa-edit fa-fw"></i>
+    </button>
+    <button (click)="deleteSubscriptionPopup(subscription)"
+            [title]="'subscriptions.table.delete' | translate"
+            class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton">
+      <i class="fas fa-trash-alt fa-fw"></i>
+    </button>
+  </div>
+</td>
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.scss b/src/app/shared/subscriptions/subscription-view/subscription-view.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
new file mode 100644
index 0000000000..acd764c18d
--- /dev/null
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.spec.ts
@@ -0,0 +1,143 @@
+// Import modules
+import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  ComponentFixtureAutoDetect,
+  TestBed,
+} from '@angular/core/testing';
+import { ReactiveFormsModule } from '@angular/forms';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { Item } from '../../../core/shared/item.model';
+import { ITEM } from '../../../core/shared/item.resource-type';
+// Import mocks
+import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
+// Import utils
+import { NotificationsService } from '../../notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../remote-data.utils';
+import { NotificationsServiceStub } from '../../testing/notifications-service.stub';
+import {
+  findByEPersonAndDsoResEmpty,
+  subscriptionMock,
+} from '../../testing/subscriptions-data.mock';
+import { Subscription } from '../models/subscription.model';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
+import { SubscriptionViewComponent } from './subscription-view.component';
+
+describe('SubscriptionViewComponent', () => {
+  let component: SubscriptionViewComponent;
+  let fixture: ComponentFixture<SubscriptionViewComponent>;
+  let de: DebugElement;
+  let modalService;
+
+  const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', {
+    getSubscriptionByPersonDSO: observableOf(findByEPersonAndDsoResEmpty),
+    deleteSubscription: createSuccessfulRemoteDataObject$({}),
+    updateSubscription: createSuccessfulRemoteDataObject$({}),
+  });
+
+  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: [
+        CommonModule,
+        NgbModule,
+        ReactiveFormsModule,
+        BrowserModule,
+        RouterTestingModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      declarations: [ SubscriptionViewComponent ],
+      providers: [
+        { provide: ComponentFixtureAutoDetect, useValue: true },
+        { provide: NotificationsService, useValue: NotificationsServiceStub },
+        { provide: SubscriptionsDataService, useValue: subscriptionServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SubscriptionViewComponent);
+    component = fixture.componentInstance;
+    component.eperson = 'testid123';
+    component.dso = mockItem;
+    component.subscription = Object.assign(new Subscription(), subscriptionMock);
+    de = fixture.debugElement;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have dso object info', () => {
+    expect(de.query(By.css('.dso-info > ds-themed-type-badge'))).toBeTruthy();
+    expect(de.query(By.css('.dso-info > p > a'))).toBeTruthy();
+  });
+
+  it('should have subscription type info', () => {
+    expect(de.query(By.css('.subscription-type'))).toBeTruthy();
+  });
+
+  it('should have subscription paramenter info', () => {
+    expect(de.query(By.css('.subscription-parameters > span'))).toBeTruthy();
+  });
+
+  it('should have subscription action info', () => {
+    expect(de.query(By.css('.btn-outline-primary'))).toBeTruthy();
+    expect(de.query(By.css('.btn-outline-danger'))).toBeTruthy();
+  });
+
+  it('should open modal when clicked edit button', () => {
+    modalService = (component as any).modalService;
+    const modalSpy = spyOn(modalService, 'open');
+
+    const editBtn = de.query(By.css('.btn-outline-primary')).nativeElement;
+    editBtn.click();
+
+    expect(modalService.open).toHaveBeenCalled();
+  });
+
+  it('should call delete function when clicked delete button', () => {
+    const deleteSpy = spyOn(component, 'deleteSubscriptionPopup');
+
+    const deleteBtn = de.query(By.css('.btn-outline-danger')).nativeElement;
+    deleteBtn.click();
+
+    expect(deleteSpy).toHaveBeenCalled();
+  });
+
+});
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
new file mode 100644
index 0000000000..187a9740d0
--- /dev/null
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.ts
@@ -0,0 +1,118 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  Output,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { take } from 'rxjs/operators';
+
+import { getCollectionModuleRoute } from '../../../collection-page/collection-page-routing-paths';
+import { getCommunityModuleRoute } from '../../../community-page/community-page-routing-paths';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths';
+import { ConfirmationModalComponent } from '../../confirmation-modal/confirmation-modal.component';
+import { hasValue } from '../../empty.util';
+import { Subscription } from '../models/subscription.model';
+import { SubscriptionModalComponent } from '../subscription-modal/subscription-modal.component';
+import { SubscriptionsDataService } from '../subscriptions-data.service';
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '[ds-subscription-view]',
+  templateUrl: './subscription-view.component.html',
+  styleUrls: ['./subscription-view.component.scss'],
+})
+/**
+ * Table row representing a subscription that displays all information and action buttons to manage it
+ */
+export class SubscriptionViewComponent {
+
+  /**
+   * Subscription to be rendered
+   */
+  @Input() subscription: Subscription;
+
+  /**
+   * DSpaceObject of the subscription
+   */
+  @Input() dso: DSpaceObject;
+
+  /**
+   * EPerson of the subscription
+   */
+  @Input() eperson: string;
+
+  /**
+   * When an action is made emit a reload event
+   */
+  @Output() reload = new EventEmitter();
+
+  /**
+   * Reference to NgbModal
+   */
+  public modalRef: NgbModalRef;
+
+  constructor(
+    private modalService: NgbModal,
+    private subscriptionService: SubscriptionsDataService,
+    public dsoNameService: DSONameService,
+  ) { }
+
+  /**
+   * Return the prefix of the route to the dso object page ( e.g. "items")
+   */
+  getPageRoutePrefix(): string {
+    let routePrefix;
+    switch (this.dso.type.toString()) {
+      case 'community':
+        routePrefix = getCommunityModuleRoute();
+        break;
+      case 'collection':
+        routePrefix = getCollectionModuleRoute();
+        break;
+      case 'item':
+        routePrefix = getItemModuleRoute();
+        break;
+    }
+    return routePrefix;
+  }
+
+  /**
+   * Deletes Subscription, show notification on success/failure & updates list
+   * @param subscription Subscription to be deleted
+   */
+  deleteSubscriptionPopup(subscription: Subscription) {
+    if (hasValue(subscription.id)) {
+      const modalRef = this.modalService.open(ConfirmationModalComponent);
+      modalRef.componentInstance.name = this.dsoNameService.getName(this.dso);
+      modalRef.componentInstance.headerLabel = 'confirmation-modal.delete-subscription.header';
+      modalRef.componentInstance.infoLabel = 'confirmation-modal.delete-subscription.info';
+      modalRef.componentInstance.cancelLabel = 'confirmation-modal.delete-subscription.cancel';
+      modalRef.componentInstance.confirmLabel = 'confirmation-modal.delete-subscription.confirm';
+      modalRef.componentInstance.brandColor = 'danger';
+      modalRef.componentInstance.confirmIcon = 'fas fa-trash';
+      modalRef.componentInstance.response.pipe(take(1)).subscribe((confirm: boolean) => {
+        if (confirm) {
+          this.subscriptionService.deleteSubscription(subscription.id).subscribe( (res) => {
+            this.reload.emit();
+          });
+        }
+      });
+    }
+  }
+
+  public openSubscriptionModal() {
+    this.modalRef = this.modalService.open(SubscriptionModalComponent);
+    this.modalRef.componentInstance.dso = this.dso;
+    this.modalRef.componentInstance.subscription = this.subscription;
+    this.modalRef.componentInstance.updateSubscription.pipe(take(1)).subscribe((subscription: Subscription) => {
+      this.subscription = subscription;
+    });
+
+  }
+}
diff --git a/src/app/shared/subscriptions/subscriptions-data.service.spec.ts b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts
new file mode 100644
index 0000000000..860d3ad5ef
--- /dev/null
+++ b/src/app/shared/subscriptions/subscriptions-data.service.spec.ts
@@ -0,0 +1,134 @@
+import { HttpClient } from '@angular/common/http';
+import { Store } from '@ngrx/store';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service';
+import { RequestService } from '../../core/data/request.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { getMockRemoteDataBuildService } from '../mocks/remote-data-build.service.mock';
+import { getMockRequestService } from '../mocks/request.service.mock';
+import { NotificationsService } from '../notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { HALEndpointServiceStub } from '../testing/hal-endpoint-service.stub';
+import { NotificationsServiceStub } from '../testing/notifications-service.stub';
+import { createPaginatedList } from '../testing/utils.test';
+import { Subscription } from './models/subscription.model';
+import { SubscriptionsDataService } from './subscriptions-data.service';
+
+describe('SubscriptionsDataService', () => {
+
+
+  let service: SubscriptionsDataService;
+
+  let comparator: DSOChangeAnalyzer<Subscription>;
+  let http: HttpClient;
+  let notificationsService: NotificationsService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let store: Store<any>;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let nameService: DSONameService;
+
+  function initService() {
+    comparator = {} as any;
+    http = {} as HttpClient;
+    notificationsService = new NotificationsServiceStub() as any;
+    requestService = getMockRequestService();
+    rdbService = getMockRemoteDataBuildService();
+    halService = new HALEndpointServiceStub('linkPath') as any;
+    service = new SubscriptionsDataService(comparator, http, notificationsService, requestService, rdbService, store, objectCache, halService, nameService);
+    spyOn((service as any).deleteData, 'delete').and.returnValue(createNoContentRemoteDataObject$());
+  }
+
+  describe('createSubscription', () => {
+
+    beforeEach(() => {
+      initService();
+    });
+
+    it('should create the subscription', () => {
+      const id = 'test-id';
+      const ePerson = 'test-ePerson';
+      const subscription = new Subscription();
+      service.createSubscription(subscription, ePerson, id).subscribe((res) => {
+        expect(requestService.generateRequestId).toHaveBeenCalled();
+        expect(res.hasCompleted).toBeTrue();
+      });
+    });
+
+  });
+
+  describe('deleteSubscription', () => {
+
+    beforeEach(() => {
+      initService();
+    });
+
+    it('should delete the subscription', () => {
+      const id = 'test-id';
+      service.deleteSubscription(id).subscribe((res) => {
+        expect((service as any).deleteData.delete).toHaveBeenCalledWith(id);
+        expect(res.hasCompleted).toBeTrue();
+      });
+    });
+
+  });
+
+  describe('updateSubscription', () => {
+
+    beforeEach(() => {
+      initService();
+    });
+
+    it('should update the subscription', () => {
+      const id = 'test-id';
+      const ePerson = 'test-ePerson';
+      const subscription = new Subscription();
+      service.updateSubscription(subscription, ePerson, id).subscribe((res) => {
+        expect(requestService.generateRequestId).toHaveBeenCalled();
+        expect(res.hasCompleted).toBeTrue();
+      });
+    });
+
+  });
+
+  describe('findByEPerson', () => {
+
+    beforeEach(() => {
+      initService();
+    });
+
+    it('should update the subscription', () => {
+      const ePersonId = 'test-ePersonId';
+      spyOn(service, 'findListByHref').and.returnValue(createSuccessfulRemoteDataObject$(createPaginatedList()));
+      service.findByEPerson(ePersonId).subscribe((res) => {
+        expect(service.findListByHref).toHaveBeenCalled();
+        expect(res.hasCompleted).toBeTrue();
+      });
+    });
+
+  });
+
+  describe('getSubscriptionsByPersonDSO', () => {
+
+    beforeEach(() => {
+      initService();
+    });
+
+    it('should get the subscriptions', () => {
+      spyOn((service as any).searchData, 'searchBy');
+      const id = 'test-id';
+      const ePersonId = 'test-ePersonId';
+      service.getSubscriptionsByPersonDSO(ePersonId, id);
+      expect((service as any).searchData.searchBy).toHaveBeenCalled();
+    });
+
+  });
+
+});
diff --git a/src/app/shared/subscriptions/subscriptions-data.service.ts b/src/app/shared/subscriptions/subscriptions-data.service.ts
new file mode 100644
index 0000000000..bc46c86835
--- /dev/null
+++ b/src/app/shared/subscriptions/subscriptions-data.service.ts
@@ -0,0 +1,181 @@
+import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+import { sendRequest } from 'src/app/core/shared/request.operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../core/cache/object-cache.service';
+import { dataService } from '../../core/data/base/data-service.decorator';
+import { DeleteDataImpl } from '../../core/data/base/delete-data';
+import { FindAllData } from '../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../core/data/base/identifiable-data.service';
+import { SearchDataImpl } from '../../core/data/base/search-data';
+import { DSOChangeAnalyzer } from '../../core/data/dso-change-analyzer.service';
+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 {
+  CreateRequest,
+  PutRequest,
+} from '../../core/data/request.models';
+import { RequestService } from '../../core/data/request.service';
+import { RestRequest } from '../../core/data/rest-request.model';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../core/shared/NoContent.model';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  isNotEmpty,
+  isNotEmptyOperator,
+} from '../empty.util';
+import { NotificationsService } from '../notifications/notifications.service';
+import { followLink } from '../utils/follow-link-config.model';
+import { Subscription } from './models/subscription.model';
+import { SUBSCRIPTION } from './models/subscription.resource-type';
+
+/**
+ * Provides methods to retrieve subscription resources from the REST API related CRUD actions.
+ */
+@Injectable({
+  providedIn: 'root',
+})
+@dataService(SUBSCRIPTION)
+export class SubscriptionsDataService extends IdentifiableDataService<Subscription> {
+  protected findByEpersonLinkPath = 'findByEPerson';
+
+  private deleteData: DeleteDataImpl<Subscription>;
+  private findAllData: FindAllData<Subscription>;
+  private searchData: SearchDataImpl<Subscription>;
+
+  constructor(
+    protected comparator: DSOChangeAnalyzer<Subscription>,
+    protected http: HttpClient,
+    protected notificationsService: NotificationsService,
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected store: Store<any>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected nameService: DSONameService,
+  ) {
+    super('subscriptions', 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);
+  }
+  /**
+   * Get subscriptions for a given item or community or collection & eperson.
+   *
+   * @param eperson The eperson to search for
+   * @param uuid The uuid of the dsobjcet to search for
+   */
+  getSubscriptionsByPersonDSO(eperson: string, uuid: string): Observable<RemoteData<PaginatedList<Subscription>>> {
+
+    const optionsWithObject = Object.assign(new FindListOptions(), {
+      searchParams: [
+        new RequestParam('resource', uuid),
+        new RequestParam('eperson_id', eperson),
+      ],
+    });
+
+    return this.searchData.searchBy('findByEPersonAndDso', optionsWithObject, false, true);
+  }
+
+  /**
+   * Create a subscription for a given item or community or collection.
+   *
+   * @param subscription The subscription to create
+   * @param ePerson The ePerson to create for
+   * @param uuid The uuid of the dsobjcet to create for
+   */
+  createSubscription(subscription: Subscription, ePerson: string, uuid: string): Observable<RemoteData<Subscription>> {
+
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      isNotEmptyOperator(),
+      take(1),
+      map((endpointUrl: string) => `${endpointUrl}?resource=${uuid}&eperson_id=${ePerson}`),
+      map((endpointURL: string) => new CreateRequest(this.requestService.generateRequestId(), endpointURL, JSON.stringify(subscription))),
+      sendRequest(this.requestService),
+      switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
+      getFirstCompletedRemoteData(),
+    ) as Observable<RemoteData<Subscription>>;
+  }
+
+  /**
+   * Update a subscription for a given item or community or collection.
+   *
+   * @param subscription The subscription to update
+   * @param ePerson The ePerson to update for
+   * @param uuid The uuid of the dsobjcet to update for
+   */
+  updateSubscription(subscription, ePerson: string, uuid: string) {
+
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      isNotEmptyOperator(),
+      take(1),
+      map((endpointUrl: string) => `${endpointUrl}/${subscription.id}?resource=${uuid}&eperson_id=${ePerson}`),
+      map((endpointURL: string) => new PutRequest(this.requestService.generateRequestId(), endpointURL, JSON.stringify(subscription))),
+      sendRequest(this.requestService),
+      switchMap((restRequest: RestRequest) => this.rdbService.buildFromRequestUUID(restRequest.uuid)),
+      getFirstCompletedRemoteData(),
+    ) as Observable<RemoteData<Subscription>>;
+  }
+
+
+  /**
+   * Deletes the subscription with a give id
+   *
+   * @param id  the id of Subscription to delete
+   */
+  deleteSubscription(id: string): Observable<RemoteData<NoContent>> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      filter((href: string) => isNotEmpty(href)),
+      distinctUntilChanged(),
+      switchMap((endpointUrl) => this.deleteData.delete(id)),
+      getFirstCompletedRemoteData(),
+    );
+  }
+
+  /**
+   * Retrieves the list of subscription with {@link dSpaceObject} and {@link ePerson}
+   *
+   * @param options                     options for the find all request
+   */
+  findAllSubscriptions(options?): Observable<RemoteData<PaginatedList<Subscription>>> {
+    return this.findAllData.findAll(options, true, true, followLink('resource'), followLink('eperson'));
+  }
+
+
+  /**
+   * Retrieves the list of subscription with {@link dSpaceObject} and {@link ePerson}
+   *
+   * @param ePersonId  The eperson id
+   * @param options    The options for the find all request
+   */
+  findByEPerson(ePersonId: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Subscription>>> {
+    const optionsWithObject = Object.assign(new FindListOptions(), options, {
+      searchParams: [
+        new RequestParam('uuid', ePersonId),
+      ],
+    });
+
+    // return this.searchData.searchBy(this.findByEpersonLinkPath, optionsWithObject, true, true, followLink('dSpaceObject'), followLink('ePerson'));
+
+    return this.getEndpoint().pipe(
+      map(href => `${href}/search/${this.findByEpersonLinkPath}`),
+      switchMap(href => this.findListByHref(href, optionsWithObject, false, true, followLink('resource'), followLink('eperson'))),
+    );
+
+
+  }
+
+}
diff --git a/src/app/shared/subscriptions/subscriptions.module.ts b/src/app/shared/subscriptions/subscriptions.module.ts
new file mode 100644
index 0000000000..bf2cbd8eaa
--- /dev/null
+++ b/src/app/shared/subscriptions/subscriptions.module.ts
@@ -0,0 +1,34 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { ReactiveFormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { SharedModule } from '../shared.module';
+import { SubscriptionModalComponent } from './subscription-modal/subscription-modal.component';
+import { SubscriptionViewComponent } from './subscription-view/subscription-view.component';
+
+const COMPONENTS = [
+  SubscriptionViewComponent,
+  SubscriptionModalComponent,
+];
+
+@NgModule({
+  declarations: [
+    ...COMPONENTS,
+  ],
+  imports: [
+    CommonModule,
+    NgbModalModule,
+    ReactiveFormsModule,
+    TranslateModule,
+    RouterModule,
+    SharedModule,
+  ],
+  exports: [
+    ...COMPONENTS,
+  ],
+})
+export class SubscriptionsModule {
+}
diff --git a/src/app/shared/testing/action.mock.ts b/src/app/shared/testing/action.mock.ts
index e227946f64..fc1e741c20 100644
--- a/src/app/shared/testing/action.mock.ts
+++ b/src/app/shared/testing/action.mock.ts
@@ -2,5 +2,5 @@ import { Action } from '@ngrx/store';
 
 export class ActionMock implements Action {
   type = null;
-  payload: {};
+  payload: unknown;
 }
diff --git a/src/app/shared/testing/active-router.stub.ts b/src/app/shared/testing/active-router.stub.ts
index 13cb81b42e..4d58d61769 100644
--- a/src/app/shared/testing/active-router.stub.ts
+++ b/src/app/shared/testing/active-router.stub.ts
@@ -1,19 +1,24 @@
-import { map } from 'rxjs/operators';
-import { convertToParamMap, Params } from '@angular/router';
-
+import {
+  ActivatedRoute,
+  convertToParamMap,
+  Data,
+  Params,
+} from '@angular/router';
 import { BehaviorSubject } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 export class ActivatedRouteStub {
 
-  private _testParams?: any;
-  private _testData?: any;
+  private _testParams?: Params;
+  private _testData?: Data;
   // ActivatedRoute.params is Observable
-  private subject?: BehaviorSubject<any> = new BehaviorSubject(this.testParams);
-  private dataSubject?: BehaviorSubject<any> = new BehaviorSubject(this.testData);
+  private subject?: BehaviorSubject<Params> = new BehaviorSubject(this.testParams);
+  private dataSubject?: BehaviorSubject<Data> = new BehaviorSubject(this.testData);
 
   params = this.subject.asObservable();
   queryParams = this.subject.asObservable();
   paramMap = this.subject.asObservable().pipe(map((params: Params) => convertToParamMap(params)));
+  parent: ActivatedRoute | ActivatedRouteStub;
   queryParamMap = this.subject.asObservable().pipe(map((params: Params) => convertToParamMap(params)));
   data = this.dataSubject.asObservable();
 
@@ -35,17 +40,17 @@ export class ActivatedRouteStub {
     return this._testParams;
   }
 
-  set testParams(params: {}) {
+  set testParams(params: Params) {
     this._testParams = params;
     this.subject.next(params);
   }
 
   // Test data
   get testData() {
-    return this._testParams;
+    return this._testData;
   }
 
-  set testData(data: {}) {
+  set testData(data: Data) {
     this._testData = data;
     this.dataSubject.next(data);
   }
@@ -55,7 +60,8 @@ export class ActivatedRouteStub {
     return {
       params: this.testParams,
       paramMap: convertToParamMap(this.params),
-      queryParamMap: convertToParamMap(this.testParams)
+      queryParamMap: convertToParamMap(this.testParams),
+      queryParams: {} as Params,
     };
   }
 }
diff --git a/src/app/shared/testing/auth-request-service.stub.ts b/src/app/shared/testing/auth-request-service.stub.ts
index 0094324518..aeebc08df4 100644
--- a/src/app/shared/testing/auth-request-service.stub.ts
+++ b/src/app/shared/testing/auth-request-service.stub.ts
@@ -1,11 +1,15 @@
-import { Observable, of as observableOf } from 'rxjs';
-import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { AuthStatus } from '../../core/auth/models/auth-status.model';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
+import { HttpOptions } from '../../core/dspace-rest/dspace-rest.service';
 import { EPerson } from '../../core/eperson/models/eperson.model';
 import { isNotEmpty } from '../empty.util';
-import { EPersonMock } from './eperson.mock';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
 export class AuthRequestServiceStub {
   protected mockUser: EPerson = EPersonMock;
@@ -33,11 +37,11 @@ export class AuthRequestServiceStub {
             href: 'dspace.org/api/status',
           },
           eperson: {
-            href: this.mockUser._links.self.href
+            href: this.mockUser._links.self.href,
           },
           specialGroups: {
-            href: this.mockUser._links.self.href
-          }
+            href: this.mockUser._links.self.href,
+          },
         };
       } else {
         authStatusStub.authenticated = false;
@@ -51,10 +55,11 @@ export class AuthRequestServiceStub {
   public getRequest(method: string, options?: HttpOptions): Observable<any> {
     const authStatusStub: AuthStatus = new AuthStatus();
     switch (method) {
-      case 'logout':
+      case 'logout': {
         authStatusStub.authenticated = false;
         break;
-      case 'status':
+      }
+      case 'status': {
         const token = ((options.headers as any).lazyUpdate[1]) ? (options.headers as any).lazyUpdate[1].value : null;
         if (this.validateToken(token)) {
           authStatusStub.authenticated = true;
@@ -64,16 +69,17 @@ export class AuthRequestServiceStub {
               href: 'dspace.org/api/status',
             },
             eperson: {
-              href: this.mockUser._links.self.href
+              href: this.mockUser._links.self.href,
             },
             specialGroups: {
-              href: this.mockUser._links.self.href
-            }
+              href: this.mockUser._links.self.href,
+            },
           };
         } else {
           authStatusStub.authenticated = false;
         }
         break;
+      }
     }
     return createSuccessfulRemoteDataObject$(authStatusStub);
   }
diff --git a/src/app/shared/testing/auth-service.stub.ts b/src/app/shared/testing/auth-service.stub.ts
index b8d822252d..5a40e05d1d 100644
--- a/src/app/shared/testing/auth-service.stub.ts
+++ b/src/app/shared/testing/auth-service.stub.ts
@@ -1,15 +1,20 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { AuthMethod } from '../../core/auth/models/auth.method';
+import { AuthMethodType } from '../../core/auth/models/auth.method-type';
 import { AuthStatus } from '../../core/auth/models/auth-status.model';
 import { AuthTokenInfo } from '../../core/auth/models/auth-token-info.model';
-import { EPersonMock } from './eperson.mock';
 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 { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
-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 {
@@ -17,6 +22,7 @@ export class AuthServiceStub {
   token: AuthTokenInfo = new AuthTokenInfo('token_test');
   impersonating: string;
   private _tokenExpired = false;
+  private _isExternalAuth = false;
   private redirectUrl;
 
   constructor() {
@@ -122,6 +128,13 @@ export class AuthServiceStub {
   checkAuthenticationCookie() {
     return;
   }
+  setExternalAuthStatus(externalCookie: boolean) {
+    this._isExternalAuth = externalCookie;
+  }
+
+  isExternalAuthentication(): Observable<boolean> {
+    return observableOf(this._isExternalAuth);
+  }
 
   retrieveAuthMethodsFromAuthStatus(status: AuthStatus) {
     return observableOf(authMethodsMock);
diff --git a/src/app/shared/testing/authorization-service.stub.ts b/src/app/shared/testing/authorization-service.stub.ts
index 253599233e..8e7c0e586f 100644
--- a/src/app/shared/testing/authorization-service.stub.ts
+++ b/src/app/shared/testing/authorization-service.stub.ts
@@ -1,4 +1,8 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { FeatureID } from '../../core/data/feature-authorization/feature-id';
 
 export class AuthorizationDataServiceStub {
diff --git a/src/app/shared/testing/base-data-service.stub.ts b/src/app/shared/testing/base-data-service.stub.ts
new file mode 100644
index 0000000000..3df661ba5b
--- /dev/null
+++ b/src/app/shared/testing/base-data-service.stub.ts
@@ -0,0 +1,17 @@
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { CacheableObject } from '../../core/cache/cacheable-object.model';
+
+/**
+ * Stub class for {@link BaseDataService}
+ */
+export abstract class BaseDataServiceStub<T extends CacheableObject> {
+
+  invalidateByHref(_href: string): Observable<boolean> {
+    return observableOf(true);
+  }
+
+}
diff --git a/src/app/shared/testing/bitstream-data-service.stub.ts b/src/app/shared/testing/bitstream-data-service.stub.ts
new file mode 100644
index 0000000000..932d20b323
--- /dev/null
+++ b/src/app/shared/testing/bitstream-data-service.stub.ts
@@ -0,0 +1,17 @@
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { RequestEntryState } from '../../core/data/request-entry-state.model';
+import { Bitstream } from '../../core/shared/bitstream.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+
+export class BitstreamDataServiceStub {
+
+  removeMultiple(_bitstreams: Bitstream[]): Observable<RemoteData<NoContent>> {
+    return observableOf(new RemoteData(0, 0, 0, RequestEntryState.Success));
+  }
+
+}
diff --git a/src/app/shared/testing/browse-definition-data-service.stub.ts b/src/app/shared/testing/browse-definition-data-service.stub.ts
new file mode 100644
index 0000000000..3bad04b668
--- /dev/null
+++ b/src/app/shared/testing/browse-definition-data-service.stub.ts
@@ -0,0 +1,73 @@
+import {
+  EMPTY,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { BrowseService } from '../../core/browse/browse.service';
+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 { PageInfo } from '../../core/shared/page-info.model';
+import { ValueListBrowseDefinition } from '../../core/shared/value-list-browse-definition.model';
+import { createSuccessfulRemoteDataObject } from '../remote-data.utils';
+
+// This data is in post-serialized form (metadata -> metadataKeys)
+export const mockData: BrowseDefinition[] = [
+  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,
+  }),
+];
+
+export const BrowseDefinitionDataServiceStub: any = {
+
+  /**
+   * Get all BrowseDefinitions
+   */
+  findAll(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return observableOf(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), mockData)));
+  },
+
+  /**
+   * Get all BrowseDefinitions with any link configuration
+   */
+  findAllLinked(): Observable<RemoteData<PaginatedList<BrowseDefinition>>> {
+    return observableOf(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), mockData)));
+  },
+
+  /**
+   * Get the browse URL by providing a list of metadata keys
+   *
+   * @param metadataKeys  a list of fields eg. ['dc.contributor.author', 'dc.creator']
+   */
+  findByFields(metadataKeys: string[]): Observable<RemoteData<BrowseDefinition>> {
+    let searchKeyArray: string[] = [];
+    metadataKeys.forEach((metadataKey) => {
+      searchKeyArray = searchKeyArray.concat(BrowseService.toSearchKeyArray(metadataKey));
+    });
+    // Return just the first, as a pretend match
+    return observableOf(createSuccessfulRemoteDataObject(mockData[0]));
+  },
+
+};
diff --git a/src/app/shared/testing/browser-only-mock.pipe.ts b/src/app/shared/testing/browser-only-mock.pipe.ts
index 12e5a7b2d7..129f666bb1 100644
--- a/src/app/shared/testing/browser-only-mock.pipe.ts
+++ b/src/app/shared/testing/browser-only-mock.pipe.ts
@@ -1,10 +1,13 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 /**
  * Support dsBrowserOnly in unit tests.
  */
 @Pipe({
-  name: 'dsBrowserOnly'
+  name: 'dsBrowserOnly',
 })
 export class BrowserOnlyMockPipe implements PipeTransform {
   transform(value: string): string | undefined {
diff --git a/src/app/shared/testing/claimed-task-data-service.stub.ts b/src/app/shared/testing/claimed-task-data-service.stub.ts
new file mode 100644
index 0000000000..610098a337
--- /dev/null
+++ b/src/app/shared/testing/claimed-task-data-service.stub.ts
@@ -0,0 +1,20 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { ClaimedTask } from '../../core/tasks/models/claimed-task-object.model';
+import { ProcessTaskResponse } from '../../core/tasks/models/process-task-response';
+
+export class ClaimedTaskDataServiceStub {
+
+  public submitTask(_scopeId: string, _body: any): Observable<ProcessTaskResponse> {
+    return EMPTY;
+  }
+
+  public findByItem(_uuid: string): Observable<RemoteData<ClaimedTask>> {
+    return EMPTY;
+  }
+
+}
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..66324218f5
--- /dev/null
+++ b/src/app/shared/testing/configuration-data.service.stub.ts
@@ -0,0 +1,15 @@
+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/css-variable-service.stub.ts b/src/app/shared/testing/css-variable-service.stub.ts
index 6159d89655..b1f1ba6ee2 100644
--- a/src/app/shared/testing/css-variable-service.stub.ts
+++ b/src/app/shared/testing/css-variable-service.stub.ts
@@ -1,10 +1,15 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { KeyValuePair } from '../key-value-pair.model';
 
 const variables = {
-  smMin: '576px,',
-  mdMin: '768px,',
-  lgMin: '992px',
-  xlMin: '1200px',
+  '--bs-sm-min': '576px,',
+  '--bs-md-min': '768px,',
+  '--bs-lg-min': '992px',
+  '--bs-xl-min': '1200px',
 } as any;
 
 export class CSSVariableServiceStub {
@@ -19,4 +24,16 @@ export class CSSVariableServiceStub {
   addCSSVariable(name: string, value: string): void {
     /**/
   }
+
+  addCSSVariables(variablesToAdd: KeyValuePair<string, string>[]): void {
+    /**/
+  }
+
+  clearCSSVariables(): void {
+    /**/
+  }
+
+  getCSSVariablesFromStylesheets(document: Document): void {
+    /**/
+  }
 }
diff --git a/src/app/shared/testing/data-service.stub.ts b/src/app/shared/testing/data-service.stub.ts
deleted file mode 100644
index 62334a95e0..0000000000
--- a/src/app/shared/testing/data-service.stub.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { Observable, of as observableOf } from 'rxjs';
-
-export class DataServiceStub {
-
-  invalidateByHref(_href: string): Observable<boolean> {
-    return observableOf(true);
-  }
-
-}
diff --git a/src/app/shared/testing/dynamic-form-mock-services.ts b/src/app/shared/testing/dynamic-form-mock-services.ts
index 1cbd470e23..7b8573fd6e 100644
--- a/src/app/shared/testing/dynamic-form-mock-services.ts
+++ b/src/app/shared/testing/dynamic-form-mock-services.ts
@@ -4,5 +4,5 @@ export const mockDynamicFormLayoutService = jasmine.createSpyObj('DynamicFormLay
 });
 
 export const mockDynamicFormValidationService = jasmine.createSpyObj('DynamicFormValidationService', {
-  showErrorMessages: jasmine.createSpy('showErrorMessages')
+  showErrorMessages: jasmine.createSpy('showErrorMessages'),
 });
diff --git a/src/app/shared/testing/eperson.mock.ts b/src/app/shared/testing/eperson.mock.ts
index 370c2ff1b9..002ee9326f 100644
--- a/src/app/shared/testing/eperson.mock.ts
+++ b/src/app/shared/testing/eperson.mock.ts
@@ -13,7 +13,7 @@ export const EPersonMock: EPerson = Object.assign(new EPerson(), {
     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' }
+    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid/groups' },
   },
   id: 'testid',
   uuid: 'testid',
@@ -22,28 +22,28 @@ export const EPersonMock: EPerson = Object.assign(new EPerson(), {
     'dc.title': [
       {
         language: null,
-        value: 'User Test'
-      }
+        value: 'User Test',
+      },
     ],
     'eperson.firstname': [
       {
         language: null,
-        value: 'User'
-      }
+        value: 'User',
+      },
     ],
     'eperson.lastname': [
       {
         language: null,
-        value: 'Test'
+        value: 'Test',
       },
     ],
     'eperson.language': [
       {
         language: null,
-        value: 'en'
+        value: 'en',
       },
-    ]
-  }
+    ],
+  },
 });
 
 export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
@@ -59,7 +59,7 @@ export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
     self: {
       href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid2',
     },
-    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid2/groups' }
+    groups: { href: 'https://rest.api/dspace-spring-rest/api/eperson/epersons/testid2/groups' },
   },
   id: 'testid2',
   uuid: 'testid2',
@@ -68,26 +68,26 @@ export const EPersonMock2: EPerson = Object.assign(new EPerson(), {
     'dc.title': [
       {
         language: null,
-        value: 'User Test 2'
-      }
+        value: 'User Test 2',
+      },
     ],
     'eperson.firstname': [
       {
         language: null,
-        value: 'User2'
-      }
+        value: 'User2',
+      },
     ],
     'eperson.lastname': [
       {
         language: null,
-        value: 'MeepMeep'
+        value: 'MeepMeep',
       },
     ],
     'eperson.language': [
       {
         language: null,
-        value: 'fr'
+        value: 'fr',
       },
-    ]
-  }
+    ],
+  },
 });
diff --git a/src/app/shared/testing/form-event.stub.ts b/src/app/shared/testing/form-event.stub.ts
index 30436a82fc..6380a4b2ff 100644
--- a/src/app/shared/testing/form-event.stub.ts
+++ b/src/app/shared/testing/form-event.stub.ts
@@ -1,100 +1,106 @@
-import { FormControl, FormGroup } from '@angular/forms';
-import { DynamicCheckboxModel, DynamicSelectModel } from '@ng-dynamic-forms/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+import {
+  DynamicCheckboxModel,
+  DynamicSelectModel,
+} from '@ng-dynamic-forms/core';
 
 export const accessConditionChangeEvent = {
-    $event: {
-        bubbles: true,
-        cancelBubble: false,
-        cancelable: false,
-        composed: false,
-        currentTarget: null,
-        defaultPrevented: false,
-        eventPhase: 0,
-        isTrusted: true,
-        returnValue: true,
-        timeStamp: 143042.8999999999,
-        type: 'change',
-    },
-    context: null,
-    control: new FormControl({
-        errors: null,
-        pristine: false,
-        status: 'VALID',
-        statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        touched: true,
-        value: { year: 2021, month: 12, day: 30 },
-        valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        _updateOn: 'change',
-    }),
-    group: new FormGroup({}),
-    model: new DynamicSelectModel({
-        additional: null,
-        asyncValidators: null,
-        controlTooltip: null,
-        errorMessages: { required: 'submission.sections.upload.form.date-required-until' },
-        hidden: false,
-        hint: null,
-        id: 'endDate',
-        label: 'submission.sections.upload.form.until-label',
-        labelTooltip: null,
-        name: 'endDate',
-        placeholder: 'Until',
-        prefix: null,
-        relations: [],
-        required: true,
-        suffix: null,
-        tabIndex: null,
-        updateOn: null,
-        validators: { required: null },
-    }),
-    type: 'change'
+  $event: {
+    bubbles: true,
+    cancelBubble: false,
+    cancelable: false,
+    composed: false,
+    currentTarget: null,
+    defaultPrevented: false,
+    eventPhase: 0,
+    isTrusted: true,
+    returnValue: true,
+    timeStamp: 143042.8999999999,
+    type: 'change',
+  },
+  context: null,
+  control: new UntypedFormControl({
+    errors: null,
+    pristine: false,
+    status: 'VALID',
+    statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    touched: true,
+    value: { year: 2021, month: 12, day: 30 },
+    valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    _updateOn: 'change',
+  }),
+  group: new UntypedFormGroup({}),
+  model: new DynamicSelectModel({
+    additional: null,
+    asyncValidators: null,
+    controlTooltip: null,
+    errorMessages: { required: 'submission.sections.upload.form.date-required-until' },
+    hidden: false,
+    hint: null,
+    id: 'endDate',
+    label: 'submission.sections.upload.form.until-label',
+    labelTooltip: null,
+    name: 'endDate',
+    placeholder: 'Until',
+    prefix: null,
+    relations: [],
+    required: true,
+    suffix: null,
+    tabIndex: null,
+    updateOn: null,
+    validators: { required: null },
+  }),
+  type: 'change',
 };
 
 
 export const checkboxChangeEvent = {
-    $event: {
-        bubbles: true,
-        cancelBubble: false,
-        cancelable: false,
-        composed: false,
-        currentTarget: null,
-        defaultPrevented: false,
-        eventPhase: 0,
-        isTrusted: true,
-        returnValue: true,
-        timeStamp: 143042.8999999999,
-        type: 'change',
-    },
-    context: null,
-    control: new FormControl({
-        errors: null,
-        pristine: false,
-        status: 'VALID',
-        statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        touched: true,
-        value: { year: 2021, month: 12, day: 30 },
-        valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
-        _updateOn: 'change',
-    }),
-    group: new FormGroup({}),
-    model: new DynamicCheckboxModel({
-        additional: null,
-        asyncValidators: null,
-        controlTooltip: null,
-        errorMessages: null,
-        hidden: false,
-        hint: null,
-        id: 'discoverable',
-        indeterminate: false,
-        label: 'Discoverable',
-        labelPosition: null,
-        labelTooltip: null,
-        name: 'discoverable',
-        relations: [],
-        required: false,
-        tabIndex: null,
-        updateOn: null,
-        validators: { required: null },
-    }),
-    type: 'change'
+  $event: {
+    bubbles: true,
+    cancelBubble: false,
+    cancelable: false,
+    composed: false,
+    currentTarget: null,
+    defaultPrevented: false,
+    eventPhase: 0,
+    isTrusted: true,
+    returnValue: true,
+    timeStamp: 143042.8999999999,
+    type: 'change',
+  },
+  context: null,
+  control: new UntypedFormControl({
+    errors: null,
+    pristine: false,
+    status: 'VALID',
+    statusChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    touched: true,
+    value: { year: 2021, month: 12, day: 30 },
+    valueChanges: { _isScalar: false, observers: [], closed: false, isStopped: false, hasError: false },
+    _updateOn: 'change',
+  }),
+  group: new UntypedFormGroup({}),
+  model: new DynamicCheckboxModel({
+    additional: null,
+    asyncValidators: null,
+    controlTooltip: null,
+    errorMessages: null,
+    hidden: false,
+    hint: null,
+    id: 'discoverable',
+    indeterminate: false,
+    label: 'Discoverable',
+    labelPosition: null,
+    labelTooltip: null,
+    name: 'discoverable',
+    relations: [],
+    required: false,
+    tabIndex: null,
+    updateOn: null,
+    validators: { required: null },
+  }),
+  type: 'change',
 };
diff --git a/src/app/shared/testing/group-mock.ts b/src/app/shared/testing/group-mock.ts
index a6db4c922e..599afaa20d 100644
--- a/src/app/shared/testing/group-mock.ts
+++ b/src/app/shared/testing/group-mock.ts
@@ -1,45 +1,44 @@
 import { Group } from '../../core/eperson/models/group.model';
-import { EPersonMock } from './eperson.mock';
-import { of } from 'rxjs';
 import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
 export const GroupMock2: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [],
-    epersons: [],
-    permanent: true,
-    selfRegistered: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/groups/testgroupid2',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/epersons' }
+  handle: null,
+  subgroups: [],
+  epersons: [],
+  permanent: true,
+  selfRegistered: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/groups/testgroupid2',
     },
-    _name: 'testgroupname2',
-    id: 'testgroupid2',
-    uuid: 'testgroupid2',
-    type: 'group',
-    object: createSuccessfulRemoteDataObject$({ name: 'testgroupid2objectName'})
+    subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/epersons' },
+  },
+  _name: 'testgroupname2',
+  id: 'testgroupid2',
+  uuid: 'testgroupid2',
+  type: 'group',
+  object: createSuccessfulRemoteDataObject$({ name: 'testgroupid2objectName' }),
 });
 
 export const GroupMock: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [GroupMock2],
-    epersons: [EPersonMock],
-    selfRegistered: false,
-    permanent: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/groups/testgroupid',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/epersons' }
+  handle: null,
+  subgroups: [GroupMock2],
+  epersons: [EPersonMock],
+  selfRegistered: false,
+  permanent: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/groups/testgroupid',
     },
-    _name: 'testgroupname',
-    id: 'testgroupid',
-    uuid: 'testgroupid',
-    type: 'group',
+    subgroups: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/groups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/groups/testgroupid/epersons' },
+  },
+  _name: 'testgroupname',
+  id: 'testgroupid',
+  uuid: 'testgroupid',
+  type: 'group',
 });
diff --git a/src/app/shared/testing/hal-endpoint-service.stub.ts b/src/app/shared/testing/hal-endpoint-service.stub.ts
index 753efcdb5d..f53eecb0bb 100644
--- a/src/app/shared/testing/hal-endpoint-service.stub.ts
+++ b/src/app/shared/testing/hal-endpoint-service.stub.ts
@@ -1,4 +1,5 @@
 import { of as observableOf } from 'rxjs';
+
 import { hasValue } from '../empty.util';
 
 export class HALEndpointServiceStub {
diff --git a/src/app/shared/testing/host-window-service.stub.ts b/src/app/shared/testing/host-window-service.stub.ts
index ecb8c26acb..af1b159026 100644
--- a/src/app/shared/testing/host-window-service.stub.ts
+++ b/src/app/shared/testing/host-window-service.stub.ts
@@ -1,4 +1,9 @@
-import {of as observableOf,  Observable } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { WidthCategory } from '../host-window.service';
 
 // declare a stub service
 export class HostWindowServiceStub {
@@ -20,4 +25,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/identifiable-data-service.stub.ts b/src/app/shared/testing/identifiable-data-service.stub.ts
new file mode 100644
index 0000000000..e8928b568d
--- /dev/null
+++ b/src/app/shared/testing/identifiable-data-service.stub.ts
@@ -0,0 +1,20 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { BaseDataServiceStub } from './base-data-service.stub';
+
+/**
+ * Stub class for {@link IdentifiableDataService}
+ */
+export class IdentifiableDataServiceStub<T extends CacheableObject> extends BaseDataServiceStub<T> {
+
+  findById(_id: string, _useCachedVersionIfAvailable = true, _reRequestOnStale = true, ..._linksToFollow: FollowLinkConfig<T>[]): Observable<RemoteData<T>> {
+    return EMPTY;
+  }
+
+}
diff --git a/src/app/shared/testing/location.stub.ts b/src/app/shared/testing/location.stub.ts
new file mode 100644
index 0000000000..7e130c4de2
--- /dev/null
+++ b/src/app/shared/testing/location.stub.ts
@@ -0,0 +1,7 @@
+export class LocationStub {
+
+  getState(): unknown {
+    return {};
+  }
+
+}
diff --git a/src/app/shared/testing/menu-service.stub.ts b/src/app/shared/testing/menu-service.stub.ts
index 926232bad0..e2e1118021 100644
--- a/src/app/shared/testing/menu-service.stub.ts
+++ b/src/app/shared/testing/menu-service.stub.ts
@@ -1,26 +1,30 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { MenuID } from '../menu/menu-id.model';
 import { MenuSection } from '../menu/menu-section.model';
 import { MenuState } from '../menu/menu-state.model';
-import { MenuID } from '../menu/menu-id.model';
 
 export class MenuServiceStub {
   visibleSection1 = {
     id: 'section',
     visible: true,
-    active: false
+    active: false,
   } as any;
   visibleSection2 = {
     id: 'section_2',
-    visible: true
+    visible: true,
   } as any;
   hiddenSection3 = {
     id: 'section_3',
-    visible: false
+    visible: false,
   } as any;
   subSection4 = {
     id: 'section_4',
     visible: true,
-    parentID: 'section1'
+    parentID: 'section1',
   } as any;
 
   toggleMenu(): void { /***/
@@ -53,6 +57,9 @@ export class MenuServiceStub {
   deactivateSection(): void { /***/
   }
 
+  toggleSection(): void { /***/
+  }
+
   addSection(menuID: MenuID, section: MenuSection): void { /***/
   }
 
@@ -66,6 +73,10 @@ export class MenuServiceStub {
     return observableOf(true);
   }
 
+  isMenuVisibleWithVisibleSections(id: MenuID): Observable<boolean> {
+    return observableOf(true);
+  }
+
   isMenuCollapsed(id: MenuID): Observable<boolean> {
     return observableOf(false);
   }
diff --git a/src/app/shared/testing/ng-component-outlet-directive.stub.ts b/src/app/shared/testing/ng-component-outlet-directive.stub.ts
index 7b413e7443..796f0fdd32 100644
--- a/src/app/shared/testing/ng-component-outlet-directive.stub.ts
+++ b/src/app/shared/testing/ng-component-outlet-directive.stub.ts
@@ -1,4 +1,7 @@
-import { Directive, Input } from '@angular/core';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive({
diff --git a/src/app/shared/testing/object-cache-service.stub.ts b/src/app/shared/testing/object-cache-service.stub.ts
new file mode 100644
index 0000000000..d6b21b3922
--- /dev/null
+++ b/src/app/shared/testing/object-cache-service.stub.ts
@@ -0,0 +1,35 @@
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { CacheableObject } from '../../core/cache/cacheable-object.model';
+import { ObjectCacheEntry } from '../../core/cache/object-cache.reducer';
+
+/* eslint-disable @typescript-eslint/no-empty-function */
+/**
+ * Stub class of {@link ObjectCacheService}
+ */
+export class ObjectCacheServiceStub {
+
+  add(_object: CacheableObject, _msToLive: number, _requestUUID: string, _alternativeLink?: string): void {
+  }
+
+  remove(_href: string): void {
+  }
+
+  getByHref(_href: string): Observable<ObjectCacheEntry> {
+    return observableOf(undefined);
+  }
+
+  hasByHref$(_href: string): Observable<boolean> {
+    return observableOf(false);
+  }
+
+  addDependency(_href$: string | Observable<string>, _dependsOnHref$: string | Observable<string>): void {
+  }
+
+  removeDependents(_href: string): void {
+  }
+
+}
diff --git a/src/app/shared/testing/object-select-service.stub.ts b/src/app/shared/testing/object-select-service.stub.ts
index 4841463913..05f5a509c0 100644
--- a/src/app/shared/testing/object-select-service.stub.ts
+++ b/src/app/shared/testing/object-select-service.stub.ts
@@ -1,4 +1,7 @@
-import { Observable, of } from 'rxjs';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 
 export class ObjectSelectServiceStub {
 
diff --git a/src/app/shared/testing/pagination-service.stub.ts b/src/app/shared/testing/pagination-service.stub.ts
index 3ea8e732c8..8755adc759 100644
--- a/src/app/shared/testing/pagination-service.stub.ts
+++ b/src/app/shared/testing/pagination-service.stub.ts
@@ -1,14 +1,18 @@
 import { of as observableOf } from 'rxjs';
-import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { FindListOptions } from '../../core/data/find-list-options.model';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
 
 export class PaginationServiceStub {
 
   constructor(
-    public pagination = Object.assign(new PaginationComponentOptions(), {currentPage: 1, pageSize: 20}),
+    public pagination = Object.assign(new PaginationComponentOptions(), { currentPage: 1, pageSize: 20 }),
     public sort = new SortOptions('score', SortDirection.DESC),
-    public findlistOptions = Object.assign(new FindListOptions(), {currentPage: 1, elementsPerPage: 20}),
+    public findlistOptions = Object.assign(new FindListOptions(), { currentPage: 1, elementsPerPage: 20 }),
   ) {
   }
 
diff --git a/src/app/shared/testing/query-params-directive.stub.ts b/src/app/shared/testing/query-params-directive.stub.ts
index 60f76786c7..7c9d1e28d7 100644
--- a/src/app/shared/testing/query-params-directive.stub.ts
+++ b/src/app/shared/testing/query-params-directive.stub.ts
@@ -1,4 +1,7 @@
-import { Directive, Input } from '@angular/core';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive({
diff --git a/src/app/shared/testing/related-relationships.mock.ts b/src/app/shared/testing/related-relationships.mock.ts
index 7ea90d5935..fad782f6c1 100644
--- a/src/app/shared/testing/related-relationships.mock.ts
+++ b/src/app/shared/testing/related-relationships.mock.ts
@@ -1,72 +1,72 @@
 export const relatedRelationships = {
-    'type': {
-        'value': 'paginated-list'
-    },
-    'pageInfo': {
-        'elementsPerPage': 5,
-        'totalElements': 2,
-        'totalPages': 1,
-        'currentPage': 1
-    },
-    '_links': {
-        'self': {
-            'href': 'http://localhost:8080/server/api/core/relationships/search/byItemsAndType?typeId=1&focusItem=b1b2c768-bda1-448a-a073-fc541e8b24d9&relationshipLabel=isPublicationOfAuthor&size=5&relatedItem=72635f7f-37b5-4875-b4f2-5ff45d97a09b&relatedItem=674f695e-8001-4150-8f9c-095c536a6bcb&relatedItem=a64719f8-ba7b-41d1-8eb6-f8feb0c000b7&relatedItem=75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63&relatedItem=10bc6f8b-0796-486f-94d8-4d2e1814586f'
-        },
-        'page': [
-            {
-                'href': 'http://localhost:8080/server/api/core/relationships/1408'
-            },
-            {
-                'href': 'http://localhost:8080/server/api/core/relationships/1409'
-            }
-        ]
+  'type': {
+    'value': 'paginated-list',
+  },
+  'pageInfo': {
+    'elementsPerPage': 5,
+    'totalElements': 2,
+    'totalPages': 1,
+    'currentPage': 1,
+  },
+  '_links': {
+    'self': {
+      'href': 'http://localhost:8080/server/api/core/relationships/search/byItemsAndType?typeId=1&focusItem=b1b2c768-bda1-448a-a073-fc541e8b24d9&relationshipLabel=isPublicationOfAuthor&size=5&relatedItem=72635f7f-37b5-4875-b4f2-5ff45d97a09b&relatedItem=674f695e-8001-4150-8f9c-095c536a6bcb&relatedItem=a64719f8-ba7b-41d1-8eb6-f8feb0c000b7&relatedItem=75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63&relatedItem=10bc6f8b-0796-486f-94d8-4d2e1814586f',
     },
     'page': [
-        {
-            'type': 'relationship',
-            'uuid': 'relationship-1408',
-            'id': 1408,
-            'leftPlace': 0,
-            'rightPlace': 0,
-            'leftwardValue': null,
-            'rightwardValue': null,
-            '_links': {
-                'relationshipType': {
-                    'href': 'http://localhost:8080/server/api/core/relationshiptypes/1'
-                },
-                'self': {
-                    'href': 'http://localhost:8080/server/api/core/relationships/1408'
-                },
-                'leftItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63'
-                },
-                'rightItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9'
-                }
-            }
+      {
+        'href': 'http://localhost:8080/server/api/core/relationships/1408',
+      },
+      {
+        'href': 'http://localhost:8080/server/api/core/relationships/1409',
+      },
+    ],
+  },
+  'page': [
+    {
+      'type': 'relationship',
+      'uuid': 'relationship-1408',
+      'id': 1408,
+      'leftPlace': 0,
+      'rightPlace': 0,
+      'leftwardValue': null,
+      'rightwardValue': null,
+      '_links': {
+        'relationshipType': {
+          'href': 'http://localhost:8080/server/api/core/relationshiptypes/1',
         },
-        {
-            'type': 'relationship',
-            'uuid': 'relationship-1409',
-            'id': 1409,
-            'leftPlace': 0,
-            'rightPlace': 1,
-            'leftwardValue': null,
-            'rightwardValue': null,
-            '_links': {
-                'relationshipType': {
-                    'href': 'http://localhost:8080/server/api/core/relationshiptypes/1'
-                },
-                'self': {
-                    'href': 'http://localhost:8080/server/api/core/relationships/1409'
-                },
-                'leftItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/10bc6f8b-0796-486f-94d8-4d2e1814586f'
-                },
-                'rightItem': {
-                    'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9'
-                }
-            }
-        }
-    ]
+        'self': {
+          'href': 'http://localhost:8080/server/api/core/relationships/1408',
+        },
+        'leftItem': {
+          'href': 'http://localhost:8080/server/api/core/items/75c0f7f5-5a69-40e8-aa1f-8f35b1ce5a63',
+        },
+        'rightItem': {
+          'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9',
+        },
+      },
+    },
+    {
+      'type': 'relationship',
+      'uuid': 'relationship-1409',
+      'id': 1409,
+      'leftPlace': 0,
+      'rightPlace': 1,
+      'leftwardValue': null,
+      'rightwardValue': null,
+      '_links': {
+        'relationshipType': {
+          'href': 'http://localhost:8080/server/api/core/relationshiptypes/1',
+        },
+        'self': {
+          'href': 'http://localhost:8080/server/api/core/relationships/1409',
+        },
+        'leftItem': {
+          'href': 'http://localhost:8080/server/api/core/items/10bc6f8b-0796-486f-94d8-4d2e1814586f',
+        },
+        'rightItem': {
+          'href': 'http://localhost:8080/server/api/core/items/b1b2c768-bda1-448a-a073-fc541e8b24d9',
+        },
+      },
+    },
+  ],
 };
diff --git a/src/app/shared/testing/relationship-types.mock.ts b/src/app/shared/testing/relationship-types.mock.ts
index 2c1f210820..1f2ee0fb25 100644
--- a/src/app/shared/testing/relationship-types.mock.ts
+++ b/src/app/shared/testing/relationship-types.mock.ts
@@ -1,71 +1,71 @@
 export const relationshipTypes = [
-    {
-        'id': 1,
-        'leftwardType': 'isAuthorOfPublication',
-        'rightwardType': 'isPublicationOfAuthor',
-        'copyToLeft': false,
-        'copyToRight': false,
-        'leftMinCardinality': 0,
-        'leftMaxCardinality': null,
-        'rightMinCardinality': 0,
-        'rightMaxCardinality': null,
-        'type': 'relationshiptype',
-        '_links': {
-            'leftType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/1'
-            },
-            'rightType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/2'
-            },
-            'self': {
-                'href': 'http://localhost:8080/server/api/core/relationshiptypes/1'
-            }
-        }
+  {
+    'id': 1,
+    'leftwardType': 'isAuthorOfPublication',
+    'rightwardType': 'isPublicationOfAuthor',
+    'copyToLeft': false,
+    'copyToRight': false,
+    'leftMinCardinality': 0,
+    'leftMaxCardinality': null,
+    'rightMinCardinality': 0,
+    'rightMaxCardinality': null,
+    'type': 'relationshiptype',
+    '_links': {
+      'leftType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/1',
+      },
+      'rightType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/2',
+      },
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/relationshiptypes/1',
+      },
     },
-    {
-        'id': 4,
-        'leftwardType': 'isProjectOfPerson',
-        'rightwardType': 'isPersonOfProject',
-        'copyToLeft': false,
-        'copyToRight': false,
-        'leftMinCardinality': 0,
-        'leftMaxCardinality': null,
-        'rightMinCardinality': 0,
-        'rightMaxCardinality': null,
-        'type': 'relationshiptype',
-        '_links': {
-            'leftType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/2'
-            },
-            'rightType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/3'
-            },
-            'self': {
-                'href': 'http://localhost:8080/server/api/core/relationshiptypes/4'
-            }
-        }
+  },
+  {
+    'id': 4,
+    'leftwardType': 'isProjectOfPerson',
+    'rightwardType': 'isPersonOfProject',
+    'copyToLeft': false,
+    'copyToRight': false,
+    'leftMinCardinality': 0,
+    'leftMaxCardinality': null,
+    'rightMinCardinality': 0,
+    'rightMaxCardinality': null,
+    'type': 'relationshiptype',
+    '_links': {
+      'leftType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/2',
+      },
+      'rightType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/3',
+      },
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/relationshiptypes/4',
+      },
     },
-    {
-        'id': 5,
-        'leftwardType': 'isOrgUnitOfPerson',
-        'rightwardType': 'isPersonOfOrgUnit',
-        'copyToLeft': false,
-        'copyToRight': false,
-        'leftMinCardinality': 0,
-        'leftMaxCardinality': null,
-        'rightMinCardinality': 0,
-        'rightMaxCardinality': null,
-        'type': 'relationshiptype',
-        '_links': {
-            'leftType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/2'
-            },
-            'rightType': {
-                'href': 'http://localhost:8080/server/api/core/entitytypes/4'
-            },
-            'self': {
-                'href': 'http://localhost:8080/server/api/core/relationshiptypes/5'
-            }
-        }
-    }
+  },
+  {
+    'id': 5,
+    'leftwardType': 'isOrgUnitOfPerson',
+    'rightwardType': 'isPersonOfOrgUnit',
+    'copyToLeft': false,
+    'copyToRight': false,
+    'leftMinCardinality': 0,
+    'leftMaxCardinality': null,
+    'rightMinCardinality': 0,
+    'rightMaxCardinality': null,
+    'type': 'relationshiptype',
+    '_links': {
+      'leftType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/2',
+      },
+      'rightType': {
+        'href': 'http://localhost:8080/server/api/core/entitytypes/4',
+      },
+      'self': {
+        'href': 'http://localhost:8080/server/api/core/relationshiptypes/5',
+      },
+    },
+  },
 ];
diff --git a/src/app/shared/testing/request-service.stub.ts b/src/app/shared/testing/request-service.stub.ts
new file mode 100644
index 0000000000..a0f05f4b50
--- /dev/null
+++ b/src/app/shared/testing/request-service.stub.ts
@@ -0,0 +1,15 @@
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+/**
+ * Stub service for {@link RequestService}.
+ */
+export class RequestServiceStub {
+
+  removeByHrefSubstring(_href: string): Observable<boolean> {
+    return observableOf(true);
+  }
+
+}
diff --git a/src/app/shared/testing/route-service.stub.ts b/src/app/shared/testing/route-service.stub.ts
index 8384c3efbc..97d6a65adb 100644
--- a/src/app/shared/testing/route-service.stub.ts
+++ b/src/app/shared/testing/route-service.stub.ts
@@ -1,4 +1,7 @@
-import { EMPTY, of as observableOf } from 'rxjs';
+import {
+  EMPTY,
+  of as observableOf,
+} from 'rxjs';
 
 export const routeServiceStub: any = {
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
@@ -37,6 +40,6 @@ export const routeServiceStub: any = {
   },
   getPreviousUrl: () => {
     return observableOf('/home');
-  }
+  },
   /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
 };
diff --git a/src/app/shared/testing/router-link-directive.stub.ts b/src/app/shared/testing/router-link-directive.stub.ts
index 2357c89225..31132d4cf2 100644
--- a/src/app/shared/testing/router-link-directive.stub.ts
+++ b/src/app/shared/testing/router-link-directive.stub.ts
@@ -1,4 +1,7 @@
-import { Directive, Input } from '@angular/core';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-class-suffix */
 @Directive({
diff --git a/src/app/shared/testing/router.stub.ts b/src/app/shared/testing/router.stub.ts
index 8630e16b2e..4e7b0e460b 100644
--- a/src/app/shared/testing/router.stub.ts
+++ b/src/app/shared/testing/router.stub.ts
@@ -1,7 +1,8 @@
 import { of as observableOf } from 'rxjs';
+
 export class RouterStub {
   url: string;
-  routeReuseStrategy = {shouldReuseRoute: {}};
+  routeReuseStrategy = { shouldReuseRoute: {} };
   //noinspection TypeScriptUnresolvedFunction
   navigate = jasmine.createSpy('navigate');
   parseUrl = jasmine.createSpy('parseUrl');
@@ -9,4 +10,10 @@ export class RouterStub {
   navigateByUrl(url): void {
     this.url = url;
   }
+  createUrlTree(commands, navigationExtras = {}) {
+    return '/testing-url';
+  }
+  serializeUrl(commands, navExtras = {}) {
+    return '/testing-url';
+  }
 }
diff --git a/src/app/shared/testing/search-configuration-service.stub.ts b/src/app/shared/testing/search-configuration-service.stub.ts
index 78b358f0d4..57587b1718 100644
--- a/src/app/shared/testing/search-configuration-service.stub.ts
+++ b/src/app/shared/testing/search-configuration-service.stub.ts
@@ -1,6 +1,13 @@
-import { BehaviorSubject, of as observableOf } from 'rxjs';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  SortDirection,
+  SortOptions,
+} from '../../core/cache/models/sort-options.model';
 import { SearchConfig } from '../../core/shared/search/search-filters/search-config.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
 
 export class SearchConfigurationServiceStub {
 
@@ -30,7 +37,7 @@ export class SearchConfigurationServiceStub {
   }
 
   getAvailableConfigurationOptions() {
-    return observableOf([{value: 'test', label: 'test'}]);
+    return observableOf([{ value: 'test', label: 'test' }]);
   }
 
   getConfigurationSearchConfigObservable() {
@@ -42,6 +49,6 @@ export class SearchConfigurationServiceStub {
   }
 
   initializeSortOptionsFromConfiguration() {
-   /* empty */
+    /* empty */
   }
 }
diff --git a/src/app/shared/testing/search-service.stub.ts b/src/app/shared/testing/search-service.stub.ts
index b64fdd1330..18638ff73a 100644
--- a/src/app/shared/testing/search-service.stub.ts
+++ b/src/app/shared/testing/search-service.stub.ts
@@ -1,4 +1,9 @@
-import {of as observableOf,  Observable ,  BehaviorSubject } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { ViewMode } from '../../core/shared/view-mode.model';
 
 export class SearchServiceStub {
diff --git a/src/app/shared/testing/sidebar-service.stub.ts b/src/app/shared/testing/sidebar-service.stub.ts
index 8a73532f42..d10eb71227 100644
--- a/src/app/shared/testing/sidebar-service.stub.ts
+++ b/src/app/shared/testing/sidebar-service.stub.ts
@@ -1,4 +1,4 @@
-import {of as observableOf } from 'rxjs';
+import { of as observableOf } from 'rxjs';
 
 export class SidebarServiceStub {
   isCollapsed = observableOf(true);
diff --git a/src/app/shared/testing/special-group.mock.ts b/src/app/shared/testing/special-group.mock.ts
index f1102e0584..6d5f123ffe 100644
--- a/src/app/shared/testing/special-group.mock.ts
+++ b/src/app/shared/testing/special-group.mock.ts
@@ -1,51 +1,57 @@
 import { Observable } from 'rxjs';
 
-import { EPersonMock } from './eperson.mock';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { Group } from '../../core/eperson/models/group.model';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
+import { Group } from '../../core/eperson/models/group.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { EPersonMock } from './eperson.mock';
 
 export const SpecialGroupMock2: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [],
-    epersons: [],
-    permanent: true,
-    selfRegistered: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/epersons' }
+  handle: null,
+  subgroups: [],
+  epersons: [],
+  permanent: true,
+  selfRegistered: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2',
     },
-    _name: 'testgroupname2',
-    id: 'testgroupid2',
-    uuid: 'testgroupid2',
-    type: 'specialGroups',
-   // object: createSuccessfulRemoteDataObject$({ name: 'testspecialGroupsid2objectName'})
+    subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/epersons' },
+  },
+  _name: 'testgroupname2',
+  id: 'testgroupid2',
+  uuid: 'testgroupid2',
+  type: 'specialGroups',
+  // object: createSuccessfulRemoteDataObject$({ name: 'testspecialGroupsid2objectName'})
 });
 
 export const SpecialGroupMock: Group = Object.assign(new Group(), {
-    handle: null,
-    subgroups: [SpecialGroupMock2],
-    epersons: [EPersonMock],
-    selfRegistered: false,
-    permanent: false,
-    _links: {
-        self: {
-            href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid',
-        },
-        subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/subgroups' },
-        object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
-        epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/epersons' }
+  handle: null,
+  subgroups: [SpecialGroupMock2],
+  epersons: [EPersonMock],
+  selfRegistered: false,
+  permanent: false,
+  _links: {
+    self: {
+      href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid',
     },
-    _name: 'testgroupname',
-    id: 'testgroupid',
-    uuid: 'testgroupid',
-    type: 'specialGroups',
+    subgroups: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/subgroups' },
+    object: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid2/object' },
+    epersons: { href: 'https://rest.api/server/api/eperson/specialGroups/testgroupid/epersons' },
+  },
+  _name: 'testgroupname',
+  id: 'testgroupid',
+  uuid: 'testgroupid',
+  type: 'specialGroups',
 });
 
 export const SpecialGroupDataMock: RemoteData<PaginatedList<Group>> = createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), [SpecialGroupMock2,SpecialGroupMock]));
diff --git a/src/app/shared/testing/store.mock.ts b/src/app/shared/testing/store.mock.ts
index 7967e2678a..027200925b 100644
--- a/src/app/shared/testing/store.mock.ts
+++ b/src/app/shared/testing/store.mock.ts
@@ -1,5 +1,10 @@
 import { Injectable } from '@angular/core';
-import { ActionsSubject, ReducerManager, StateObservable, Store } from '@ngrx/store';
+import {
+  ActionsSubject,
+  ReducerManager,
+  StateObservable,
+  Store,
+} from '@ngrx/store';
 import { BehaviorSubject } from 'rxjs';
 
 @Injectable()
@@ -9,7 +14,7 @@ export class StoreMock<T> extends Store<T> {
   constructor(
     state$: StateObservable,
     actionsObserver: ActionsSubject,
-    reducerManager: ReducerManager
+    reducerManager: ReducerManager,
   ) {
     super(state$, actionsObserver, reducerManager);
     this.source = this.stateSubject.asObservable();
diff --git a/src/app/shared/testing/submission-oject-data-service.mock.ts b/src/app/shared/testing/submission-oject-data-service.mock.ts
index d0bd29c3e8..8acb97c3a5 100644
--- a/src/app/shared/testing/submission-oject-data-service.mock.ts
+++ b/src/app/shared/testing/submission-oject-data-service.mock.ts
@@ -1,4 +1,4 @@
 export const mockSubmissionObjectDataService = jasmine.createSpyObj('SubmissionObjectDataService', {
   getHrefByID: jasmine.createSpy('getHrefByID'),
-  findById: jasmine.createSpy('findById')
+  findById: jasmine.createSpy('findById'),
 });
diff --git a/src/app/shared/testing/submission-rest-service.stub.ts b/src/app/shared/testing/submission-rest-service.stub.ts
index b6ec9a86a2..677fb05026 100644
--- a/src/app/shared/testing/submission-rest-service.stub.ts
+++ b/src/app/shared/testing/submission-rest-service.stub.ts
@@ -1,9 +1,9 @@
-import { of as observableOf } from 'rxjs';
 import { Store } from '@ngrx/store';
+import { of as observableOf } from 'rxjs';
 
+import { CoreState } from '../../core/core-state.model';
 import { RequestService } from '../../core/data/request.service';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { CoreState } from '../../core/core-state.model';
 
 export class SubmissionRestServiceStub {
   protected linkPath = 'workspaceitems';
diff --git a/src/app/shared/testing/subscriptions-data.mock.ts b/src/app/shared/testing/subscriptions-data.mock.ts
new file mode 100644
index 0000000000..771f1e38fb
--- /dev/null
+++ b/src/app/shared/testing/subscriptions-data.mock.ts
@@ -0,0 +1,160 @@
+import { EPerson } from '../../core/eperson/models/eperson.model';
+import { Item } from '../../core/shared/item.model';
+import { ITEM_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+
+export const mockSubscriptionEperson = Object.assign(new EPerson(), {
+  'id': 'fake-eperson-id',
+  'uuid': 'fake-eperson-id',
+  'handle': null,
+  'metadata': {
+    'eperson.firstname': [
+      {
+        'value': 'user',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0,
+      },
+    ],
+    'eperson.lastname': [
+      {
+        'value': 'testr',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0,
+      },
+    ],
+  },
+  'netid': null,
+  'lastActive': '2021-09-01T12:06:19.000+00:00',
+  'canLogIn': true,
+  'email': 'user@test.com',
+  'requireCertificate': false,
+  'selfRegistered': false,
+  'type': 'eperson',
+  '_links': {
+    'groups': {
+      'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id/groups',
+    },
+    'self': {
+      'href': 'https://dspace.org/server/api/eperson/epersons/fake-eperson-id',
+    },
+  },
+});
+
+export const mockSubscriptionDSO = Object.assign(new Item(),
+  {
+    id: 'fake-item-id',
+    uuid: 'fake-item-id',
+    metadata: {
+      'dc.title': [{ value: 'test item subscription' }],
+    },
+    type: ITEM_TYPE,
+    _links: {
+      self: {
+        href: 'https://dspace.org/server/api/core/items/fake-item-id',
+      },
+    },
+  },
+);
+
+export const mockSubscriptionDSO2 = Object.assign(new Item(),
+  {
+    id: 'fake-item-id2',
+    uuid: 'fake-item-id2',
+    metadata: {
+      'dc.title': [{ value: 'test item subscription 2' }],
+    },
+    type: ITEM_TYPE,
+    _links: {
+      self: {
+        href: 'https://dspace.org/server/api/core/items/fake-item-id2',
+      },
+    },
+  },
+);
+export const findByEPersonAndDsoResEmpty = {
+  'type': {
+    'value': 'paginated-list',
+  },
+  'pageInfo': {
+    'elementsPerPage': 0,
+    'totalElements': 0,
+    'totalPages': 1,
+    'currentPage': 1,
+  },
+  '_links': {
+    'self': {
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/search/findByEPersonAndDso?resource=092b59e8-8159-4e70-98b5-93ec60bd3431&eperson_id=335647b6-8a52-4ecb-a8c1-7ebabb199bda',
+    },
+    'page': [
+      {
+        'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/22',
+      },
+      {
+        'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/48',
+      },
+    ],
+  },
+  'page': [],
+};
+
+export const subscriptionMock = {
+  'id': 21,
+  'type': 'subscription',
+  'subscriptionParameterList': [
+    {
+      'id': 77,
+      'name': 'frequency',
+      'value': 'D',
+    },
+    {
+      'id': 78,
+      'name': 'frequency',
+      'value': 'M',
+    },
+  ],
+  'subscriptionType': 'test1',
+  'ePerson': createSuccessfulRemoteDataObject$(mockSubscriptionEperson),
+  'dSpaceObject': createSuccessfulRemoteDataObject$(mockSubscriptionDSO),
+  '_links': {
+    'dSpaceObject': {
+      'href': 'https://dspace/server/api/core/subscriptions/21/dSpaceObject',
+    },
+    'ePerson': {
+      'href': 'https://dspace/server/api/core/subscriptions/21/ePerson',
+    },
+    'self': {
+      'href': 'https://dspace/server/api/core/subscriptions/21',
+    },
+  },
+};
+
+export const subscriptionMock2 = {
+  'id': 21,
+  'type': 'subscription',
+  'subscriptionParameterList': [
+    {
+      'id': 77,
+      'name': 'frequency',
+      'value': 'D',
+    },
+  ],
+  'subscriptionType': 'test2',
+  'ePerson': createSuccessfulRemoteDataObject$(mockSubscriptionEperson),
+  'dSpaceObject': createSuccessfulRemoteDataObject$(mockSubscriptionDSO2),
+  '_links': {
+    'dSpaceObject': {
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/dSpaceObject',
+    },
+    'ePerson': {
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21/ePerson',
+    },
+    'self': {
+      'href': 'https://dspacecris7.4science.cloud/server/api/core/subscriptions/21',
+    },
+  },
+};
+
diff --git a/src/app/shared/testing/supervision-order.mock.ts b/src/app/shared/testing/supervision-order.mock.ts
new file mode 100644
index 0000000000..bc98de0dfb
--- /dev/null
+++ b/src/app/shared/testing/supervision-order.mock.ts
@@ -0,0 +1,101 @@
+import { buildPaginatedList } from '../../core/data/paginated-list.model';
+import { Item } from '../../core/shared/item.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SupervisionOrder } from '../../core/supervision-order/models/supervision-order.model';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import {
+  GroupMock,
+  GroupMock2,
+} from './group-mock';
+
+const itemMock = Object.assign(new Item(), {
+  metadata: {
+    'dc.title': [
+      {
+        value: 'Item one',
+      },
+    ],
+    'dc.contributor.author': [
+      {
+        value: 'Smith, Donald',
+      },
+    ],
+    'dc.publisher': [
+      {
+        value: 'a publisher',
+      },
+    ],
+    'dc.date.issued': [
+      {
+        value: '2015-06-26',
+      },
+    ],
+    'dc.description.abstract': [
+      {
+        value: 'This is the abstract',
+      },
+    ],
+  },
+});
+
+const anotherItemMock = Object.assign(new Item(), {
+  metadata: {
+    'dc.title': [
+      {
+        value: 'Item two',
+      },
+    ],
+    'dc.contributor.author': [
+      {
+        value: 'Smith, Donald',
+      },
+    ],
+    'dc.publisher': [
+      {
+        value: 'a publisher',
+      },
+    ],
+    'dc.date.issued': [
+      {
+        value: '2015-06-26',
+      },
+    ],
+    'dc.description.abstract': [
+      {
+        value: 'This is the abstract',
+      },
+    ],
+  },
+});
+
+export const supervisionOrderMock: any = Object.assign(new SupervisionOrder(),{
+  id: '1',
+  item: createSuccessfulRemoteDataObject$(itemMock),
+  group: createSuccessfulRemoteDataObject$(GroupMock),
+});
+
+export const anotherSupervisionOrderMock: any = {
+  id: '2',
+  item: createSuccessfulRemoteDataObject$(anotherItemMock),
+  group: createSuccessfulRemoteDataObject$(GroupMock2),
+};
+
+export const supervisionOrderListMock = [supervisionOrderMock, anotherSupervisionOrderMock];
+export const supervisionOrderEntryMock = {
+  supervisionOrder: supervisionOrderMock,
+  group: GroupMock,
+};
+
+const pageInfo = new PageInfo({
+  elementsPerPage: 10,
+  totalElements: 2,
+  totalPages: 1,
+  currentPage: 1,
+});
+const array = [supervisionOrderMock, anotherSupervisionOrderMock];
+const paginatedList = buildPaginatedList(pageInfo, array);
+export const supervisionOrderPaginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
+export const supervisionOrderPaginatedListRD$ = createSuccessfulRemoteDataObject$(paginatedList);
diff --git a/src/app/shared/testing/test-module.ts b/src/app/shared/testing/test-module.ts
index 7d45dd41f3..181cb34065 100644
--- a/src/app/shared/testing/test-module.ts
+++ b/src/app/shared/testing/test-module.ts
@@ -1,11 +1,15 @@
 import { CommonModule } from '@angular/common';
-import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import {
+  CUSTOM_ELEMENTS_SCHEMA,
+  NgModule,
+} from '@angular/core';
+
 import { MySimpleItemActionComponent } from '../../item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.spec';
 import { SharedModule } from '../shared.module';
+import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
 import { NgComponentOutletDirectiveStub } from './ng-component-outlet-directive.stub';
 import { QueryParamsDirectiveStub } from './query-params-directive.stub';
 import { RouterLinkDirectiveStub } from './router-link-directive.stub';
-import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
 
 /**
  * This module isn't used. It serves to prevent the AoT compiler
@@ -16,7 +20,7 @@ import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
 @NgModule({
   imports: [
     CommonModule,
-    SharedModule
+    SharedModule,
   ],
   declarations: [
     QueryParamsDirectiveStub,
@@ -26,11 +30,12 @@ import { BrowserOnlyMockPipe } from './browser-only-mock.pipe';
     BrowserOnlyMockPipe,
   ],
   exports: [
-    QueryParamsDirectiveStub
+    QueryParamsDirectiveStub,
+    RouterLinkDirectiveStub,
   ],
   schemas: [
-    CUSTOM_ELEMENTS_SCHEMA
-  ]
+    CUSTOM_ELEMENTS_SCHEMA,
+  ],
 })
 export class TestModule {
 }
diff --git a/src/app/shared/testing/translate-loader.mock.ts b/src/app/shared/testing/translate-loader.mock.ts
index 3251de9ea1..ea1ee7528e 100644
--- a/src/app/shared/testing/translate-loader.mock.ts
+++ b/src/app/shared/testing/translate-loader.mock.ts
@@ -1,5 +1,8 @@
-import {of as observableOf,  Observable } from 'rxjs';
 import { TranslateLoader } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
 export class TranslateLoaderMock implements TranslateLoader {
   getTranslation(lang: string): Observable<any> {
diff --git a/src/app/shared/testing/utils.test.ts b/src/app/shared/testing/utils.test.ts
index 2f3b85d791..850d50358c 100644
--- a/src/app/shared/testing/utils.test.ts
+++ b/src/app/shared/testing/utils.test.ts
@@ -1,11 +1,20 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { Observable } from 'rxjs/internal/Observable';
-import { of as observableOf } from 'rxjs/internal/observable/of';
-import { UnCacheableObject } from '../../core/shared/uncacheable-object.model';
-import { RequestEntryState } from '../../core/data/request-entry-state.model';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RequestEntry } from '../../core/data/request-entry.model';
+import { RequestEntryState } from '../../core/data/request-entry-state.model';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { UnCacheableObject } from '../../core/shared/uncacheable-object.model';
 
 /**
  * Returns true if a Native Element has a specified css class.
@@ -30,7 +39,7 @@ export const hasClass = (element: any, className: string): boolean => {
  */
 export const createTestComponent = <T>(html: string, type: new (...args: any[]) => T ): ComponentFixture<T> => {
   TestBed.overrideComponent(type, {
-    set: { template: html }
+    set: { template: html },
   });
   const fixture = TestBed.createComponent(type);
 
@@ -52,7 +61,7 @@ export function spyOnOperator(obj: any, prop: string): any {
     configurable: true,
     enumerable: true,
     value: oldProp,
-    writable: true
+    writable: true,
   });
 
   return spyOn(obj, prop);
@@ -72,7 +81,7 @@ export function createPaginatedList<T>(objects?: T[]): PaginatedList<T> {
  * @param prop The property/function to spy on
  */
 export function spyOnExported<T>(target: T, prop: keyof T): jasmine.Spy {
-  const spy = jasmine.createSpy(`${prop}Spy`);
+  const spy = jasmine.createSpy(`${String(prop)}Spy`);
   spyOnProperty(target, prop).and.returnValue(spy);
   return spy;
 }
@@ -91,9 +100,9 @@ export function createRequestEntry$(unCacheableObject?: UnCacheableObject, statu
       timeCompleted: new Date().getTime(),
       statusCode,
       errorMessage,
-      unCacheableObject
+      unCacheableObject,
     },
-    lastUpdated: new Date().getTime()
+    lastUpdated: new Date().getTime(),
   });
 }
 
diff --git a/src/app/shared/testing/vocabulary-service.stub.ts b/src/app/shared/testing/vocabulary-service.stub.ts
index f6a578dd3d..fd4483c5a2 100644
--- a/src/app/shared/testing/vocabulary-service.stub.ts
+++ b/src/app/shared/testing/vocabulary-service.stub.ts
@@ -1,12 +1,18 @@
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { PageInfo } from '../../core/shared/page-info.model';
-import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { PageInfo } from '../../core/shared/page-info.model';
 import { Vocabulary } from '../../core/submission/vocabularies/models/vocabulary.model';
+import { VocabularyEntry } from '../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyOptions } from '../../core/submission/vocabularies/models/vocabulary-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../remote-data.utils';
 
 export class VocabularyServiceStub {
 
@@ -42,4 +48,8 @@ export class VocabularyServiceStub {
   findVocabularyById(id: string): Observable<RemoteData<Vocabulary>> {
     return;
   }
+
+  getVocabularyByMetadataAndCollection(metadataField: string, collectionUUID: string): Observable<RemoteData<Vocabulary>> {
+    return createSuccessfulRemoteDataObject$(null);
+  }
 }
diff --git a/src/app/shared/testing/workflow-action-data-service.stub.ts b/src/app/shared/testing/workflow-action-data-service.stub.ts
new file mode 100644
index 0000000000..9cd61d7955
--- /dev/null
+++ b/src/app/shared/testing/workflow-action-data-service.stub.ts
@@ -0,0 +1,22 @@
+import {
+  EMPTY,
+  Observable,
+} from 'rxjs';
+
+import { FindListOptions } from '../../core/data/find-list-options.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { FollowLinkConfig } from '../utils/follow-link-config.model';
+import { IdentifiableDataServiceStub } from './identifiable-data-service.stub';
+
+/**
+ * Stub class for {@link WorkflowActionDataService}
+ */
+export class WorkflowActionDataServiceStub extends IdentifiableDataServiceStub<WorkflowItem> {
+
+  public findByItem(_uuid: string, _useCachedVersionIfAvailable = false, _reRequestOnStale = true, _options: FindListOptions = {}, ..._linksToFollow: FollowLinkConfig<WorkspaceItem>[]): Observable<RemoteData<WorkspaceItem>> {
+    return EMPTY;
+  }
+
+}
diff --git a/src/app/shared/testing/workflow-item-data-service.stub.ts b/src/app/shared/testing/workflow-item-data-service.stub.ts
new file mode 100644
index 0000000000..3b5ce938f8
--- /dev/null
+++ b/src/app/shared/testing/workflow-item-data-service.stub.ts
@@ -0,0 +1,8 @@
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { IdentifiableDataServiceStub } from './identifiable-data-service.stub';
+
+/**
+ * Stub class for {@link WorkflowItemDataService}
+ */
+export class WorkflowItemDataServiceStub extends IdentifiableDataServiceStub<WorkflowItem> {
+}
diff --git a/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts b/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts
index 6df7fe52e6..7b9abefadb 100644
--- a/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts
+++ b/src/app/shared/theme-support/test/custom/themed-test.component.spec.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 // noinspection AngularMissingOrInvalidDeclarationInModule
 @Component({
   selector: 'ds-test-component',
-  template: ''
+  template: '',
 })
 export class TestComponent {
   type = 'themed';
diff --git a/src/app/shared/theme-support/test/test.component.spec.ts b/src/app/shared/theme-support/test/test.component.spec.ts
index 85e2e5aaa7..8f048aa2a7 100644
--- a/src/app/shared/theme-support/test/test.component.spec.ts
+++ b/src/app/shared/theme-support/test/test.component.spec.ts
@@ -3,7 +3,7 @@ import { Component } from '@angular/core';
 // noinspection AngularMissingOrInvalidDeclarationInModule
 @Component({
   selector: 'ds-test-component',
-  template: ''
+  template: '',
 })
 export class TestComponent {
   type = 'default';
diff --git a/src/app/shared/theme-support/theme.actions.ts b/src/app/shared/theme-support/theme.actions.ts
index dbc885772d..32ba431b1f 100644
--- a/src/app/shared/theme-support/theme.actions.ts
+++ b/src/app/shared/theme-support/theme.actions.ts
@@ -1,4 +1,5 @@
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
 
 export const ThemeActionTypes = {
diff --git a/src/app/shared/theme-support/theme.effects.spec.ts b/src/app/shared/theme-support/theme.effects.spec.ts
index 43727df8d6..96699498c9 100644
--- a/src/app/shared/theme-support/theme.effects.spec.ts
+++ b/src/app/shared/theme-support/theme.effects.spec.ts
@@ -1,11 +1,15 @@
-import { ThemeEffects } from './theme.effects';
 import { TestBed } from '@angular/core/testing';
-import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
 import { ROOT_EFFECTS_INIT } from '@ngrx/effects';
-import { SetThemeAction } from './theme.actions';
+import { provideMockActions } from '@ngrx/effects/testing';
 import { provideMockStore } from '@ngrx/store/testing';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+
+import { SetThemeAction } from './theme.actions';
 import { BASE_THEME_NAME } from './theme.constants';
+import { ThemeEffects } from './theme.effects';
 
 describe('ThemeEffects', () => {
   let themeEffects: ThemeEffects;
@@ -25,8 +29,8 @@ describe('ThemeEffects', () => {
       providers: [
         ThemeEffects,
         provideMockStore({ initialState }),
-        provideMockActions(() => mockActions)
-      ]
+        provideMockActions(() => mockActions),
+      ],
     });
 
     themeEffects = TestBed.inject(ThemeEffects);
@@ -37,15 +41,15 @@ describe('ThemeEffects', () => {
       setupEffectsWithActions(
         hot('--a-', {
           a: {
-            type: ROOT_EFFECTS_INIT
-          }
-        })
+            type: ROOT_EFFECTS_INIT,
+          },
+        }),
       );
     });
 
     it('should set the default theme', () => {
       const expected = cold('--b-', {
-        b: new SetThemeAction(BASE_THEME_NAME)
+        b: new SetThemeAction(BASE_THEME_NAME),
       });
 
       expect(themeEffects.initTheme$).toBeObservable(expected);
diff --git a/src/app/shared/theme-support/theme.effects.ts b/src/app/shared/theme-support/theme.effects.ts
index df74818fa8..f16c6cee70 100644
--- a/src/app/shared/theme-support/theme.effects.ts
+++ b/src/app/shared/theme-support/theme.effects.ts
@@ -1,10 +1,16 @@
 import { Injectable } from '@angular/core';
-import { createEffect, Actions, ofType, ROOT_EFFECTS_INIT } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+  ROOT_EFFECTS_INIT,
+} from '@ngrx/effects';
 import { map } from 'rxjs/operators';
-import { SetThemeAction } from './theme.actions';
-import { hasValue } from '../empty.util';
-import { BASE_THEME_NAME } from './theme.constants';
+
 import { getDefaultThemeConfig } from '../../../config/config.util';
+import { hasValue } from '../empty.util';
+import { SetThemeAction } from './theme.actions';
+import { BASE_THEME_NAME } from './theme.constants';
 
 @Injectable()
 export class ThemeEffects {
@@ -21,8 +27,8 @@ export class ThemeEffects {
         } else {
           return new SetThemeAction(BASE_THEME_NAME);
         }
-      })
-    )
+      }),
+    ),
   );
 
   constructor(
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..07c200ce06
--- /dev/null
+++ b/src/app/shared/theme-support/theme.model.ts
@@ -0,0 +1,108 @@
+/* eslint-disable max-classes-per-file */
+import { Injector } from '@angular/core';
+import {
+  combineLatest,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import {
+  HandleThemeConfig,
+  NamedThemeConfig,
+  RegExThemeConfig,
+  ThemeConfig,
+  UUIDThemeConfig,
+} from '../../../config/theme.config';
+import { getDSORoute } from '../../app-routing-paths';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { HandleObject } from '../../core/shared/handle-object.model';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { HandleService } from '../handle.service';
+
+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.reducer.spec.ts b/src/app/shared/theme-support/theme.reducer.spec.ts
index 8733b88cda..16ad22c2cf 100644
--- a/src/app/shared/theme-support/theme.reducer.spec.ts
+++ b/src/app/shared/theme-support/theme.reducer.spec.ts
@@ -3,12 +3,12 @@ import { themeReducer } from './theme.reducer';
 
 describe('themeReducer', () => {
   const testState = {
-    currentTheme: 'test'
+    currentTheme: 'test',
   };
 
   it('should set the current theme in response to the SET action', () => {
     const expectedState = {
-      currentTheme: 'newTheme'
+      currentTheme: 'newTheme',
     };
     const action = new SetThemeAction('newTheme');
     const newState = themeReducer(testState, action);
diff --git a/src/app/shared/theme-support/theme.reducer.ts b/src/app/shared/theme-support/theme.reducer.ts
index 26083a0cef..aa963e4da4 100644
--- a/src/app/shared/theme-support/theme.reducer.ts
+++ b/src/app/shared/theme-support/theme.reducer.ts
@@ -1,18 +1,21 @@
-import { ThemeAction, ThemeActionTypes } from './theme.actions';
+import {
+  ThemeAction,
+  ThemeActionTypes,
+} from './theme.actions';
 
 export interface ThemeState {
   currentTheme: string;
 }
 
 const initialState: ThemeState = {
-  currentTheme: null
+  currentTheme: null,
 };
 
 export function themeReducer(state: ThemeState = initialState, action: ThemeAction): ThemeState {
   switch (action.type) {
     case ThemeActionTypes.SET: {
       return {
-        currentTheme: action.payload.name
+        currentTheme: action.payload.name,
       };
     }
     default: {
diff --git a/src/app/shared/theme-support/theme.service.spec.ts b/src/app/shared/theme-support/theme.service.spec.ts
index f56fb86cbc..c012932705 100644
--- a/src/app/shared/theme-support/theme.service.spec.ts
+++ b/src/app/shared/theme-support/theme.service.spec.ts
@@ -1,29 +1,39 @@
-import { of as observableOf } from 'rxjs';
+import {
+  CommonModule,
+  DOCUMENT,
+} from '@angular/common';
 import { TestBed } from '@angular/core/testing';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
 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 { ROUTER_NAVIGATED } from '@ngrx/router-store';
 import { provideMockStore } from '@ngrx/store/testing';
-import { Community } from '../../core/shared/community.model';
-import { COMMUNITY } from '../../core/shared/community.resource-type';
-import { NoOpAction } from '../ngrx/no-op.action';
-import { ITEM } from '../../core/shared/item.resource-type';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { Item } from '../../core/shared/item.model';
+import { hot } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { LinkService } from '../../core/cache/builders/link.service';
+import { ConfigurationDataService } from '../../core/data/configuration-data.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { Collection } from '../../core/shared/collection.model';
 import { COLLECTION } from '../../core/shared/collection.resource-type';
-import {
-  createNoContentRemoteDataObject$, createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../remote-data.utils';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { ThemeService } from './theme.service';
-import { ROUTER_NAVIGATED } from '@ngrx/router-store';
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { CommonModule, DOCUMENT } from '@angular/common';
+import { Community } from '../../core/shared/community.model';
+import { COMMUNITY } from '../../core/shared/community.resource-type';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { Item } from '../../core/shared/item.model';
+import { ITEM } from '../../core/shared/item.resource-type';
 import { RouterMock } from '../mocks/router.mock';
+import { NoOpAction } from '../ngrx/no-op.action';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../remote-data.utils';
+import { ConfigurationDataServiceStub } from '../testing/configuration-data.service.stub';
+import { SetThemeAction } from './theme.actions';
+import { Theme } from './theme.model';
+import { ThemeService } from './theme.service';
 
 /**
  * LinkService able to mock recursively resolving DSO parent links
@@ -49,6 +59,7 @@ class MockLinkService {
 describe('ThemeService', () => {
   let themeService: ThemeService;
   let linkService: LinkService;
+  let configurationService: ConfigurationDataServiceStub;
   let initialState;
 
   let ancestorDSOs: DSpaceObject[];
@@ -63,12 +74,12 @@ describe('ThemeService', () => {
       Object.assign(new Collection(), {
         type: COLLECTION.value,
         uuid: 'collection-uuid',
-        _links: { owningCommunity: { href: 'owning-community-link' } }
+        _links: { owningCommunity: { href: 'owning-community-link' } },
       }),
       Object.assign(new Community(), {
         type: COMMUNITY.value,
         uuid: 'sub-community-uuid',
-        _links: { parentCommunity: { href: 'parent-community-link' } }
+        _links: { parentCommunity: { href: 'parent-community-link' } },
       }),
       mockCommunity,
     ];
@@ -78,12 +89,13 @@ describe('ThemeService', () => {
         currentTheme: 'custom',
       },
     };
+    configurationService = new ConfigurationDataServiceStub();
   }
 
   function setupServiceWithActions(mockActions) {
     init();
     const mockDsoService = {
-      findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+      findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
     };
     TestBed.configureTestingModule({
       imports: [
@@ -96,7 +108,8 @@ describe('ThemeService', () => {
         provideMockActions(() => mockActions),
         { provide: DSpaceObjectDataService, useValue: mockDsoService },
         { provide: Router, useValue: new RouterMock() },
-      ]
+        { provide: ConfigurationDataService, useValue: configurationService },
+      ],
     });
 
     themeService = TestBed.inject(ThemeService);
@@ -112,7 +125,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'));
     }
 
@@ -124,7 +137,7 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         spyOnPrivateMethods();
       });
@@ -152,7 +165,7 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         (themeService as any).themes = [];
       });
@@ -182,13 +195,13 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         spyOnPrivateMethods();
         snapshot = Object.assign({
           data: {
-            dso: createSuccessfulRemoteDataObject(dso)
-          }
+            dso: createSuccessfulRemoteDataObject(dso),
+          },
         });
       });
 
@@ -224,13 +237,13 @@ describe('ThemeService', () => {
               type: ROUTER_NAVIGATED,
               payload: { routerState: { url } },
             },
-          })
+          }),
         );
         spyOnPrivateMethods();
         snapshot = Object.assign({
           queryParams: {
-            scope: mockCommunity.uuid
-          }
+            scope: mockCommunity.uuid,
+          },
         });
       });
 
@@ -283,13 +296,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 +326,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 +340,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();
+          });
         });
       });
     });
@@ -351,7 +378,7 @@ describe('ThemeService', () => {
         });
 
         observableOf(dso).pipe(
-          (themeService as any).getAncestorDSOs()
+          (themeService as any).getAncestorDSOs(),
         ).subscribe((result) => {
           expect(result).toEqual([dso, ...ancestorDSOs]);
           done();
@@ -365,7 +392,7 @@ describe('ThemeService', () => {
         };
 
         observableOf(dso).pipe(
-          (themeService as any).getAncestorDSOs()
+          (themeService as any).getAncestorDSOs(),
         ).subscribe((result) => {
           expect(result).toEqual([dso]);
           done();
@@ -380,8 +407,9 @@ describe('ThemeService', () => {
 
     beforeEach(() => {
       const mockDsoService = {
-        findById: () => createSuccessfulRemoteDataObject$(mockCommunity)
+        findById: () => createSuccessfulRemoteDataObject$(mockCommunity),
       };
+      configurationService = new ConfigurationDataServiceStub();
 
       TestBed.configureTestingModule({
         imports: [
@@ -393,7 +421,8 @@ describe('ThemeService', () => {
           provideMockStore({ initialState }),
           { provide: DSpaceObjectDataService, useValue: mockDsoService },
           { provide: Router, useValue: new RouterMock() },
-        ]
+          { provide: ConfigurationDataService, useValue: configurationService },
+        ],
       });
 
       document = TestBed.inject(DOCUMENT);
diff --git a/src/app/shared/theme-support/theme.service.ts b/src/app/shared/theme-support/theme.service.ts
index 6d2939a5f8..6d0ba38b5b 100644
--- a/src/app/shared/theme-support/theme.service.ts
+++ b/src/app/shared/theme-support/theme.service.ts
@@ -1,39 +1,85 @@
-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 { ThemeState } from './theme.reducer';
-import { SetThemeAction, ThemeActionTypes } from './theme.actions';
-import { expand, filter, map, switchMap, take, toArray } from 'rxjs/operators';
-import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
+import { DOCUMENT } from '@angular/common';
+import {
+  Inject,
+  Injectable,
+  Injector,
+} from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  ResolveEnd,
+  Router,
+} from '@angular/router';
+import {
+  createFeatureSelector,
+  createSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import {
+  BehaviorSubject,
+  concatMap,
+  EMPTY,
+  from,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  defaultIfEmpty,
+  expand,
+  filter,
+  map,
+  switchMap,
+  take,
+  toArray,
+} from 'rxjs/operators';
+
+import { getDefaultThemeConfig } from '../../../config/config.util';
+import {
+  HeadTagConfig,
+  ThemeConfig,
+} from '../../../config/theme.config';
+import { environment } from '../../../environments/environment';
+import { LinkService } from '../../core/cache/builders/link.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { distinctNext } from '../../core/shared/distinct-next';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import {
   getFirstCompletedRemoteData,
   getFirstSucceededRemoteData,
-  getRemoteDataPayload
+  getRemoteDataPayload,
 } from '../../core/shared/operators';
-import { HeadTagConfig, Theme, ThemeConfig, themeFactory } from '../../../config/theme.model';
-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';
-import { environment } from '../../../environments/environment';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { ActivatedRouteSnapshot, ResolveEnd, Router } from '@angular/router';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import {
+  NO_OP_ACTION_TYPE,
+  NoOpAction,
+} from '../ngrx/no-op.action';
 import { GET_THEME_CONFIG_FOR_FACTORY } from '../object-collection/shared/listable-object/listable-object.decorator';
-import { distinctNext } from 'src/app/core/shared/distinct-next';
-import { DOCUMENT } from '@angular/common';
-import { getDefaultThemeConfig } from '../../../config/config.util';
+import { followLink } from '../utils/follow-link-config.model';
+import {
+  SetThemeAction,
+  ThemeActionTypes,
+} from './theme.actions';
 import { BASE_THEME_NAME } from './theme.constants';
+import {
+  Theme,
+  themeFactory,
+} from './theme.model';
+import { ThemeState } from './theme.reducer';
 
 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({
-  providedIn: 'root'
+  providedIn: 'root',
 })
 export class ThemeService {
   /**
@@ -63,7 +109,7 @@ export class ThemeService {
     this.hasDynamicTheme = environment.themes.some((themeConfig: any) =>
       hasValue(themeConfig.regex) ||
       hasValue(themeConfig.handle) ||
-      hasValue(themeConfig.uuid)
+      hasValue(themeConfig.uuid),
     );
   }
 
@@ -82,9 +128,9 @@ export class ThemeService {
     let currentTheme: string;
     this.store.pipe(
       select(currentThemeSelector),
-      take(1)
+      take(1),
     ).subscribe((name: string) =>
-      currentTheme = name
+      currentTheme = name,
     );
     return currentTheme;
   }
@@ -94,7 +140,7 @@ export class ThemeService {
    */
   getThemeName$(): Observable<string> {
     return this.store.pipe(
-      select(currentThemeSelector)
+      select(currentThemeSelector),
     );
   }
 
@@ -145,7 +191,7 @@ export class ThemeService {
         } else {
           return [false];
         }
-      })
+      }),
     ).subscribe((changed) => {
       distinctNext(this._isThemeLoading$, changed);
     });
@@ -219,7 +265,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 +286,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({
@@ -256,13 +295,10 @@ export class ThemeService {
               'rel': 'icon',
               'href': 'assets/images/favicon.ico',
               'sizes': 'any',
-            }
-          })
+            },
+          }),
         ];
       }
-
-      // inherit the head tags of the default theme
-      return this.createHeadTags(defaultThemeConfig.name);
     }
 
     return headTagConfigs.map(this.createHeadTag.bind(this));
@@ -278,7 +314,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 +338,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,10 +348,12 @@ 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 +364,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),
     );
   }
 
@@ -413,7 +459,7 @@ export class ThemeService {
         // only allow through DSOs that have a value
         filter((dso: DSpaceObject) => hasValue(dso)),
         // Wait for recursion to complete, and emit all results at once, in an array
-        toArray()
+        toArray(),
       );
   }
 
@@ -425,9 +471,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 +489,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.html b/src/app/shared/theme-support/themed.component.html
index 4256518a10..a39b288f0e 100644
--- a/src/app/shared/theme-support/themed.component.html
+++ b/src/app/shared/theme-support/themed.component.html
@@ -1 +1,5 @@
-<ng-template #vcr></ng-template>
+<ng-template #vcr>
+</ng-template>
+<div #content>
+  <ng-content></ng-content>
+</div>
diff --git a/src/app/shared/theme-support/themed.component.spec.ts b/src/app/shared/theme-support/themed.component.spec.ts
index 404e970a7a..d39024a7f5 100644
--- a/src/app/shared/theme-support/themed.component.spec.ts
+++ b/src/app/shared/theme-support/themed.component.spec.ts
@@ -1,16 +1,24 @@
 /* eslint-disable max-classes-per-file */
-import { ThemedComponent } from './themed.component';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { VarDirective } from '../utils/var.directive';
-import { ThemeService } from './theme.service';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+
+import { ThemeConfig } from '../../../config/theme.config';
 import { getMockThemeService } from '../mocks/theme-service.mock';
+import { VarDirective } from '../utils/var.directive';
 import { TestComponent } from './test/test.component.spec';
-import { ThemeConfig } from '../../../config/theme.model';
+import { ThemeService } from './theme.service';
+import { ThemedComponent } from './themed.component';
 
 @Component({
   selector: 'ds-test-themed-component',
-  templateUrl: './themed.component.html'
+  templateUrl: './themed.component.html',
 })
 class TestThemedComponent extends ThemedComponent<TestComponent> {
   protected inAndOutputNames: (keyof TestComponent & keyof this)[] = ['testInput'];
@@ -41,7 +49,7 @@ describe('ThemedComponent', () => {
       providers: [
         { provide: ThemeService, useValue: themeService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }
 
@@ -71,6 +79,12 @@ describe('ThemedComponent', () => {
         expect((component as any).compRef.instance.testInput).toEqual('changed');
       });
     }));
+
+    it(`should set usedTheme to the name of the matched theme`, waitForAsync(() => {
+      fixture.whenStable().then(() => {
+        expect(component.usedTheme).toEqual('custom');
+      });
+    }));
   });
 
   describe('when the current theme doesn\'t match a themed component', () => {
@@ -92,6 +106,12 @@ describe('ThemedComponent', () => {
           expect((component as any).compRef.instance.testInput).toEqual('changed');
         });
       }));
+
+      it(`should set usedTheme to the name of the base theme`, waitForAsync(() => {
+        fixture.whenStable().then(() => {
+          expect(component.usedTheme).toEqual('base');
+        });
+      }));
     });
 
     describe('and it extends another theme', () => {
@@ -117,6 +137,12 @@ describe('ThemedComponent', () => {
             expect((component as any).compRef.instance.testInput).toEqual('changed');
           });
         }));
+
+        it(`should set usedTheme to the name of the base theme`, waitForAsync(() => {
+          fixture.whenStable().then(() => {
+            expect(component.usedTheme).toEqual('base');
+          });
+        }));
       });
 
       describe('that does match it', () => {
@@ -141,6 +167,12 @@ describe('ThemedComponent', () => {
             expect((component as any).compRef.instance.testInput).toEqual('changed');
           });
         }));
+
+        it(`should set usedTheme to the name of the matched theme`, waitForAsync(() => {
+          fixture.whenStable().then(() => {
+            expect(component.usedTheme).toEqual('custom');
+          });
+        }));
       });
 
       describe('that extends another theme that doesn\'t match it either', () => {
@@ -167,6 +199,12 @@ describe('ThemedComponent', () => {
             expect((component as any).compRef.instance.testInput).toEqual('changed');
           });
         }));
+
+        it(`should set usedTheme to the name of the base theme`, waitForAsync(() => {
+          fixture.whenStable().then(() => {
+            expect(component.usedTheme).toEqual('base');
+          });
+        }));
       });
 
       describe('that extends another theme that does match it', () => {
@@ -193,6 +231,12 @@ describe('ThemedComponent', () => {
             expect((component as any).compRef.instance.testInput).toEqual('changed');
           });
         }));
+
+        it(`should set usedTheme to the name of the matched theme`, waitForAsync(() => {
+          fixture.whenStable().then(() => {
+            expect(component.usedTheme).toEqual('custom');
+          });
+        }));
       });
     });
   });
diff --git a/src/app/shared/theme-support/themed.component.ts b/src/app/shared/theme-support/themed.component.ts
index 87f182a5ff..689b8189da 100644
--- a/src/app/shared/theme-support/themed.component.ts
+++ b/src/app/shared/theme-support/themed.component.ts
@@ -1,39 +1,70 @@
 import {
+  AfterViewInit,
+  ChangeDetectorRef,
   Component,
+  ComponentRef,
+  ElementRef,
+  HostBinding,
+  OnChanges,
+  OnDestroy,
+  SimpleChanges,
   ViewChild,
   ViewContainerRef,
-  ComponentRef,
-  SimpleChanges,
-  OnInit,
-  OnDestroy,
-  ComponentFactoryResolver,
-  ChangeDetectorRef,
-  OnChanges
 } from '@angular/core';
-import { hasValue, isNotEmpty } from '../empty.util';
-import { from as fromPromise, Observable, of as observableOf, Subscription } from 'rxjs';
-import { ThemeService } from './theme.service';
-import { catchError, switchMap, map } from 'rxjs/operators';
+import {
+  BehaviorSubject,
+  combineLatest,
+  from as fromPromise,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  map,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+
 import { GenericConstructor } from '../../core/shared/generic-constructor';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+} from '../empty.util';
+import { BASE_THEME_NAME } from './theme.constants';
+import { ThemeService } from './theme.service';
 
 @Component({
   selector: 'ds-themed',
   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>;
 
+  /**
+   * A reference to the themed component. Will start as undefined and emit every time the themed
+   * component is rendered
+   */
+  public compRef$: BehaviorSubject<ComponentRef<T>> = new BehaviorSubject(undefined);
+
+  protected lazyLoadObs: Observable<any>;
   protected lazyLoadSub: Subscription;
   protected themeSub: Subscription;
 
   protected inAndOutputNames: (keyof T & keyof this)[] = [];
 
+  /**
+   * A data attribute on the ThemedComponent to indicate which theme the rendered component came from.
+   */
+  @HostBinding('attr.data-used-theme') usedTheme: string;
+
   constructor(
-    protected resolver: ComponentFactoryResolver,
     protected cdr: ChangeDetectorRef,
-    protected themeService: ThemeService
+    protected themeService: ThemeService,
   ) {
   }
 
@@ -43,20 +74,23 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
   protected abstract importUnthemedComponent(): Promise<any>;
 
   ngOnChanges(changes: SimpleChanges): void {
-    // if an input or output has changed
-    if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
-      this.connectInputsAndOutputs();
-      if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
-        (this.compRef.instance as any).ngOnChanges(changes);
+    if (hasNoValue(this.compRef)) {
+      // sometimes the component has not been initialized yet, so it first needs to be initialized
+      // before being called again
+      this.initComponentInstance(changes);
+    } else {
+      // if an input or output has changed
+      if (this.inAndOutputNames.some((name: any) => hasValue(changes[name]))) {
+        this.connectInputsAndOutputs();
+        if (this.compRef?.instance && 'ngOnChanges' in this.compRef.instance) {
+          (this.compRef.instance as any).ngOnChanges(changes);
+        }
       }
     }
   }
 
-  ngOnInit(): void {
-    this.destroyComponentInstance();
-    this.themeSub = this.themeService.getThemeName$().subscribe(() => {
-      this.renderComponentInstance();
-    });
+  ngAfterViewInit(): void {
+    this.initComponentInstance();
   }
 
   ngOnDestroy(): void {
@@ -64,33 +98,52 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
     this.destroyComponentInstance();
   }
 
-  protected renderComponentInstance(): void {
-    this.destroyComponentInstance();
+  initComponentInstance(changes?: SimpleChanges) {
+    this.themeSub = this.themeService?.getThemeName$().subscribe(() => {
+      this.renderComponentInstance(changes);
+    });
+  }
 
+  protected renderComponentInstance(changes?: SimpleChanges): void {
     if (hasValue(this.lazyLoadSub)) {
       this.lazyLoadSub.unsubscribe();
     }
 
-    this.lazyLoadSub = this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
-      switchMap((themedFile: any) => {
-        if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) {
-          // if the file is not null, and exports a component with the specified name,
-          // return that component
-          return [themedFile[this.getComponentName()]];
-        } else {
-          // otherwise import and return the default component
-          return fromPromise(this.importUnthemedComponent()).pipe(
-            map((unthemedFile: any) => {
-              return unthemedFile[this.getComponentName()];
-            })
-          );
-        }
-      }),
-    ).subscribe((constructor: GenericConstructor<T>) => {
-      const factory = this.resolver.resolveComponentFactory(constructor);
-      this.compRef = this.vcr.createComponent(factory);
-      this.connectInputsAndOutputs();
+    if (hasNoValue(this.lazyLoadObs)) {
+      this.lazyLoadObs = combineLatest([
+        observableOf(changes),
+        this.resolveThemedComponent(this.themeService.getThemeName()).pipe(
+          switchMap((themedFile: any) => {
+            if (hasValue(themedFile) && hasValue(themedFile[this.getComponentName()])) {
+              // if the file is not null, and exports a component with the specified name,
+              // return that component
+              return [themedFile[this.getComponentName()]];
+            } else {
+              // otherwise import and return the default component
+              return fromPromise(this.importUnthemedComponent()).pipe(
+                tap(() => this.usedTheme = BASE_THEME_NAME),
+                map((unthemedFile: any) => {
+                  return unthemedFile[this.getComponentName()];
+                }),
+              );
+            }
+          })),
+      ]);
+    }
+
+    this.lazyLoadSub = this.lazyLoadObs.subscribe(([simpleChanges, constructor]: [SimpleChanges, GenericConstructor<T>]) => {
+      this.destroyComponentInstance();
+      this.compRef = this.vcr.createComponent(constructor, {
+        projectableNodes: [this.themedElementContent.nativeElement.childNodes],
+      });
+      if (hasValue(simpleChanges)) {
+        this.ngOnChanges(simpleChanges);
+      } else {
+        this.connectInputsAndOutputs();
+      }
+      this.compRef$.next(this.compRef);
       this.cdr.markForCheck();
+      this.themedElementContent.nativeElement.remove();
     });
   }
 
@@ -106,7 +159,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
 
   protected connectInputsAndOutputs(): void {
     if (isNotEmpty(this.inAndOutputNames) && hasValue(this.compRef) && hasValue(this.compRef.instance)) {
-      this.inAndOutputNames.forEach((name: any) => {
+      this.inAndOutputNames.filter((name: any) => this[name] !== undefined).forEach((name: any) => {
         this.compRef.instance[name] = this[name];
       });
     }
@@ -123,6 +176,7 @@ export abstract class ThemedComponent<T> implements OnInit, OnDestroy, OnChanges
   private resolveThemedComponent(themeName?: string, checkedThemeNames: string[] = []): Observable<any> {
     if (isNotEmpty(themeName)) {
       return fromPromise(this.importThemedComponent(themeName)).pipe(
+        tap(() => this.usedTheme = themeName),
         catchError(() => {
           // Try the next ancestor theme instead
           const nextTheme = this.themeService.getThemeConfigFor(themeName)?.extends;
diff --git a/src/app/shared/trackable/abstract-trackable.component.spec.ts b/src/app/shared/trackable/abstract-trackable.component.spec.ts
index c538f074c5..3c2e25f6f6 100644
--- a/src/app/shared/trackable/abstract-trackable.component.spec.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.spec.ts
@@ -1,14 +1,22 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { AbstractTrackableComponent } from './abstract-trackable.component';
-import { INotification, Notification } from '../notifications/models/notification.model';
-import { NotificationType } from '../notifications/models/notification-type';
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { NotificationsService } from '../notifications/notifications.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { TestScheduler } from 'rxjs/testing';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
+import {
+  INotification,
+  Notification,
+} from '../notifications/models/notification.model';
+import { NotificationType } from '../notifications/models/notification-type';
+import { NotificationsService } from '../notifications/notifications.service';
+import { AbstractTrackableComponent } from './abstract-trackable.component';
 
 describe('AbstractTrackableComponent', () => {
   let comp: AbstractTrackableComponent;
@@ -24,8 +32,8 @@ describe('AbstractTrackableComponent', () => {
     {
       info: infoNotification,
       warning: warningNotification,
-      success: successNotification
-    }
+      success: successNotification,
+    },
   );
 
   const url = 'http://test-url.com/test-url';
@@ -39,8 +47,8 @@ describe('AbstractTrackableComponent', () => {
         initialize: {},
         hasUpdates: observableOf(true),
         isReinstatable: observableOf(false), // should always return something --> its in ngOnInit
-        isValidPage: observableOf(true)
-      }
+        isValidPage: observableOf(true),
+      },
     );
 
     scheduler = getTestScheduler();
@@ -52,8 +60,8 @@ describe('AbstractTrackableComponent', () => {
         { provide: ObjectUpdatesService, useValue: objectUpdatesService },
         { provide: NotificationsService, useValue: notificationsService },
       ], schemas: [
-        NO_ERRORS_SCHEMA
-      ]
+        NO_ERRORS_SCHEMA,
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/trackable/abstract-trackable.component.ts b/src/app/shared/trackable/abstract-trackable.component.ts
index e1a99d90b9..de1bb7a841 100644
--- a/src/app/shared/trackable/abstract-trackable.component.ts
+++ b/src/app/shared/trackable/abstract-trackable.component.ts
@@ -1,15 +1,16 @@
-import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
-import { NotificationsService } from '../notifications/notifications.service';
+import { Component } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
-import { Component } from '@angular/core';
+
+import { ObjectUpdatesService } from '../../core/data/object-updates/object-updates.service';
+import { NotificationsService } from '../notifications/notifications.service';
 
 /**
  * Abstract Component that is able to track changes made in the inheriting component using the ObjectUpdateService
  */
 @Component({
   selector: 'ds-abstract-trackable',
-  template: ''
+  template: '',
 })
 export class AbstractTrackableComponent {
 
@@ -34,7 +35,7 @@ export class AbstractTrackableComponent {
    * Shows a notification to remind the user that they can undo this
    */
   discard() {
-    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), {timeOut: this.discardTimeOut});
+    const undoNotification = this.notificationsService.info(this.getNotificationTitle('discarded'), this.getNotificationContent('discarded'), { timeOut: this.discardTimeOut });
     this.objectUpdatesService.discardFieldUpdates(this.url, undoNotification);
   }
 
diff --git a/src/app/shared/translate/missing-translation.helper.ts b/src/app/shared/translate/missing-translation.helper.ts
index 71a1dc3620..0129e7971c 100644
--- a/src/app/shared/translate/missing-translation.helper.ts
+++ b/src/app/shared/translate/missing-translation.helper.ts
@@ -1,4 +1,7 @@
-import { MissingTranslationHandler, MissingTranslationHandlerParams } from '@ngx-translate/core';
+import {
+  MissingTranslationHandler,
+  MissingTranslationHandlerParams,
+} from '@ngx-translate/core';
 
 /**
  * Class to handle missing translations for the ngx-translate library
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..1d7d4fef14 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
@@ -1,15 +1,30 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { of as observableOf } from 'rxjs';
-import { TruncatablePartComponent } from './truncatable-part.component';
-import { TruncatableService } from '../truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import {
+  NativeWindowRef,
+  NativeWindowService,
+} from '../../../core/services/window.service';
+import { mockTruncatableService } from '../../mocks/mock-trucatable.service';
 import { getMockTranslateService } from '../../mocks/translate.service.mock';
 import { TranslateLoaderMock } from '../../mocks/translate-loader.mock';
-import { mockTruncatableService } from '../../mocks/mock-trucatable.service';
-import { By } from '@angular/platform-browser';
-import { NativeWindowRef, NativeWindowService } from '../../../core/services/window.service';
+import { TruncatableService } from '../truncatable.service';
+import { TruncatablePartComponent } from './truncatable-part.component';
 
 describe('TruncatablePartComponent', () => {
   let comp: TruncatablePartComponent;
@@ -26,7 +41,7 @@ describe('TruncatablePartComponent', () => {
       } else {
         return observableOf(false);
       }
-    }
+    },
   };
   beforeEach(waitForAsync(() => {
     translateService = getMockTranslateService();
@@ -35,8 +50,8 @@ describe('TruncatablePartComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [TruncatablePartComponent],
@@ -44,9 +59,9 @@ describe('TruncatablePartComponent', () => {
         { provide: NativeWindowService, useValue: new NativeWindowRef() },
         { provide: TruncatableService, useValue: truncatableServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TruncatablePartComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
   beforeEach(() => {
@@ -118,8 +133,8 @@ describe('TruncatablePartComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [TruncatablePartComponent],
@@ -127,9 +142,9 @@ describe('TruncatablePartComponent', () => {
         { provide: NativeWindowService, useValue: new NativeWindowRef() },
         { provide: TruncatableService, useValue: mockTruncatableService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TruncatablePartComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
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..f07fc9a601 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.ts
@@ -1,11 +1,20 @@
-import { AfterViewChecked, Component, ElementRef, Input, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { TruncatableService } from '../truncatable.service';
+import {
+  AfterViewChecked,
+  Component,
+  ElementRef,
+  Input,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+
 import { hasValue } from '../../empty.util';
+import { TruncatableService } from '../truncatable.service';
 
 @Component({
   selector: 'ds-truncatable-part',
   templateUrl: './truncatable-part.component.html',
-  styleUrls: ['./truncatable-part.component.scss']
+  styleUrls: ['./truncatable-part.component.scss'],
 })
 
 /**
@@ -49,7 +58,7 @@ export class TruncatablePartComponent implements AfterViewChecked, OnInit, OnDes
   /**
    * The view on the truncatable part
    */
-  @ViewChild('content', {static: true}) content: ElementRef;
+  @ViewChild('content', { static: true }) content: ElementRef;
 
   /**
    * Current amount of lines shown of this part
diff --git a/src/app/shared/truncatable/truncatable.actions.ts b/src/app/shared/truncatable/truncatable.actions.ts
index cd9a92f935..a6eb86cb0e 100644
--- a/src/app/shared/truncatable/truncatable.actions.ts
+++ b/src/app/shared/truncatable/truncatable.actions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
+
 import { type } from '../ngrx/type';
 
 /**
diff --git a/src/app/shared/truncatable/truncatable.component.spec.ts b/src/app/shared/truncatable/truncatable.component.spec.ts
index 29100e50d2..518ba06309 100644
--- a/src/app/shared/truncatable/truncatable.component.spec.ts
+++ b/src/app/shared/truncatable/truncatable.component.spec.ts
@@ -1,9 +1,17 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+
 import { mockTruncatableService } from '../mocks/mock-trucatable.service';
 import { TruncatableComponent } from './truncatable.component';
 import { TruncatableService } from './truncatable.service';
-import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('TruncatableComponent', () => {
   let comp: TruncatableComponent;
@@ -17,9 +25,9 @@ describe('TruncatableComponent', () => {
       providers: [
         { provide: TruncatableService, useValue: mockTruncatableService },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).overrideComponent(TruncatableComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
   beforeEach(() => {
diff --git a/src/app/shared/truncatable/truncatable.component.ts b/src/app/shared/truncatable/truncatable.component.ts
index 8fca300cd4..a1a6bbb200 100644
--- a/src/app/shared/truncatable/truncatable.component.ts
+++ b/src/app/shared/truncatable/truncatable.component.ts
@@ -1,4 +1,11 @@
-import { AfterViewChecked, Component, ElementRef, Input, OnInit } from '@angular/core';
+import {
+  AfterViewChecked,
+  Component,
+  ElementRef,
+  Input,
+  OnInit,
+} from '@angular/core';
+
 import { TruncatableService } from './truncatable.service';
 
 @Component({
@@ -33,7 +40,7 @@ export class TruncatableComponent implements OnInit, AfterViewChecked {
    */
   @Input() showToggle = true;
 
-  public constructor(private service: TruncatableService, private el: ElementRef,) {
+  public constructor(private service: TruncatableService, private el: ElementRef) {
   }
 
   /**
diff --git a/src/app/shared/truncatable/truncatable.reducer.spec.ts b/src/app/shared/truncatable/truncatable.reducer.spec.ts
index 841ec5e367..dca19d0225 100644
--- a/src/app/shared/truncatable/truncatable.reducer.spec.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.spec.ts
@@ -1,7 +1,12 @@
+// eslint-disable-next-line import/no-namespace
 import * as deepFreeze from 'deep-freeze';
 
+import {
+  TruncatableCollapseAction,
+  TruncatableExpandAction,
+  TruncatableToggleAction,
+} from './truncatable.actions';
 import { truncatableReducer } from './truncatable.reducer';
-import { TruncatableCollapseAction, TruncatableExpandAction, TruncatableToggleAction } from './truncatable.actions';
 
 const id1 = '123';
 const id2 = '456';
@@ -52,6 +57,7 @@ describe('truncatableReducer', () => {
 
     // no expect required, deepFreeze will ensure an exception is thrown if the state
     // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should set filterCollapsed to false in response to the EXPAND action', () => {
@@ -70,6 +76,10 @@ describe('truncatableReducer', () => {
 
     const action = new TruncatableExpandAction(id1);
     truncatableReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 
   it('should flip the value of filterCollapsed in response to the TOGGLE action', () => {
@@ -91,5 +101,9 @@ describe('truncatableReducer', () => {
 
     const action = new TruncatableToggleAction(id2);
     truncatableReducer(state, action);
+
+    // no expect required, deepFreeze will ensure an exception is thrown if the state
+    // is mutated, and any uncaught exception will cause the test to fail
+    expect().nothing();
   });
 });
diff --git a/src/app/shared/truncatable/truncatable.reducer.ts b/src/app/shared/truncatable/truncatable.reducer.ts
index 252a7f2c38..661e80d830 100644
--- a/src/app/shared/truncatable/truncatable.reducer.ts
+++ b/src/app/shared/truncatable/truncatable.reducer.ts
@@ -1,4 +1,7 @@
-import { TruncatableAction, TruncatableActionTypes } from './truncatable.actions';
+import {
+  TruncatableAction,
+  TruncatableActionTypes,
+} from './truncatable.actions';
 
 /**
  * Interface that represents the state of a single truncatable
@@ -30,22 +33,22 @@ export function truncatableReducer(state = initialState, action: TruncatableActi
       return Object.assign({}, state, {
         [action.id]: {
           collapsed: true,
-        }
+        },
       });
     } case TruncatableActionTypes.EXPAND: {
       return Object.assign({}, state, {
         [action.id]: {
           collapsed: false,
-        }
+        },
       });
     } case TruncatableActionTypes.TOGGLE: {
       if (!state[action.id]) {
-        state[action.id] = {collapsed: false};
+        state[action.id] = { collapsed: false };
       }
       return Object.assign({}, state, {
         [action.id]: {
           collapsed: !state[action.id].collapsed,
-        }
+        },
       });
     }
     default: {
diff --git a/src/app/shared/truncatable/truncatable.service.spec.ts b/src/app/shared/truncatable/truncatable.service.spec.ts
index 005e463052..9889b97883 100644
--- a/src/app/shared/truncatable/truncatable.service.spec.ts
+++ b/src/app/shared/truncatable/truncatable.service.spec.ts
@@ -1,10 +1,17 @@
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
-import { TestBed, waitForAsync } from '@angular/core/testing';
-import { TruncatableService } from './truncatable.service';
-import { TruncatableCollapseAction, TruncatableExpandAction } from './truncatable.actions';
-import { TruncatablesState } from './truncatable.reducer';
 import { of as observableOf } from 'rxjs';
 
+import {
+  TruncatableCollapseAction,
+  TruncatableExpandAction,
+} from './truncatable.actions';
+import { TruncatablesState } from './truncatable.reducer';
+import { TruncatableService } from './truncatable.service';
+
 describe('TruncatableService', () => {
   const id1 = '123';
   const id2 = '456';
@@ -13,16 +20,16 @@ describe('TruncatableService', () => {
     /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
     dispatch: {},
     /* eslint-enable no-empty, @typescript-eslint/no-empty-function */
-    select: observableOf(true)
+    select: observableOf(true),
   });
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
 
       providers: [
         {
-          provide: Store, useValue: store
-        }
-      ]
+          provide: Store, useValue: store,
+        },
+      ],
     }).compileComponents();
   }));
 
diff --git a/src/app/shared/truncatable/truncatable.service.ts b/src/app/shared/truncatable/truncatable.service.ts
index 60e8a7df41..e6acffb388 100644
--- a/src/app/shared/truncatable/truncatable.service.ts
+++ b/src/app/shared/truncatable/truncatable.service.ts
@@ -1,14 +1,23 @@
-import { map } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
-import { Observable } from 'rxjs';
-import { TruncatablesState, TruncatableState } from './truncatable.reducer';
 import {
+  createSelector,
+  MemoizedSelector,
+  select,
+  Store,
+} from '@ngrx/store';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { hasValue } from '../empty.util';
+import {
+  TruncatableCollapseAction,
   TruncatableExpandAction,
   TruncatableToggleAction,
-  TruncatableCollapseAction
 } from './truncatable.actions';
-import { hasValue } from '../empty.util';
+import {
+  TruncatablesState,
+  TruncatableState,
+} from './truncatable.reducer';
 
 const truncatableStateSelector = (state: TruncatablesState) => state.truncatable;
 
@@ -35,7 +44,7 @@ export class TruncatableService {
         } else {
           return false;
         }
-      })
+      }),
     );
   }
 
diff --git a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
similarity index 84%
rename from src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
rename to src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index 759f84ef45..3d1d2b3734 100644
--- a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -14,10 +14,10 @@
 </div>
 <div class="well ds-base-drop-zone mt-1 mb-3 text-muted p-2">
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center"
-     *ngIf="fileObject!=null">  {{ fileObject.name }} </p>
+     *ngIf="fileObject!==null">  {{ fileObject.name }} </p>
   <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center">
       <span><i class="fas fa-cloud-upload"
-               aria-hidden="true"></i> {{ (fileObject == null ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
+               aria-hidden="true"></i> {{ (fileObject === null ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
     <label class="btn btn-link m-0 p-0 ml-1">
       <input class="form-control-file d-none" requireFile #file="ngModel" type="file" name="file-upload"
              id="file-upload"
diff --git a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
similarity index 90%
rename from src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
rename to src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
index 58960af19e..6b67ecd166 100644
--- a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.ts
@@ -1,7 +1,18 @@
-import { Component, EventEmitter, HostListener, Input, OnInit, Output } from '@angular/core';
-import { uniqueId } from 'lodash';
+import {
+  Component,
+  EventEmitter,
+  HostListener,
+  Input,
+  OnInit,
+  Output,
+} from '@angular/core';
+import uniqueId from 'lodash/uniqueId';
 import { FileUploader } from 'ng2-file-upload';
-import { Observable, of as observableOf } from 'rxjs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
 import { UploaderOptions } from '../uploader/uploader-options.model';
 
 /**
@@ -14,7 +25,7 @@ import { UploaderOptions } from '../uploader/uploader-options.model';
 @Component({
   selector: 'ds-file-dropzone-no-uploader',
   templateUrl: './file-dropzone-no-uploader.component.html',
-  styleUrls: ['./file-dropzone-no-uploader.scss']
+  styleUrls: ['./file-dropzone-no-uploader.scss'],
 })
 export class FileDropzoneNoUploaderComponent implements OnInit {
 
diff --git a/src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.scss b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
similarity index 100%
rename from src/app/shared/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
rename to src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.scss
diff --git a/src/app/shared/upload/upload.module.ts b/src/app/shared/upload/upload.module.ts
new file mode 100644
index 0000000000..e453c7fea9
--- /dev/null
+++ b/src/app/shared/upload/upload.module.ts
@@ -0,0 +1,39 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE and NOTICE files at the root of the source
+ * tree and available online at
+ *
+ * http://www.dspace.org/license/
+ */
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { FileUploadModule } from 'ng2-file-upload';
+
+import { SharedModule } from '../shared.module';
+import { FileDropzoneNoUploaderComponent } from './file-dropzone-no-uploader/file-dropzone-no-uploader.component';
+import { UploaderComponent } from './uploader/uploader.component';
+
+const COMPONENTS = [
+  UploaderComponent,
+  FileDropzoneNoUploaderComponent,
+];
+
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    FileUploadModule,
+  ],
+  declarations: [
+    ...COMPONENTS,
+  ],
+  providers: [
+    ...COMPONENTS,
+  ],
+  exports: [
+    ...COMPONENTS,
+    FileUploadModule,
+  ],
+})
+export class UploadModule {
+}
diff --git a/src/app/shared/uploader/uploader-error.model.ts b/src/app/shared/upload/uploader/uploader-error.model.ts
similarity index 100%
rename from src/app/shared/uploader/uploader-error.model.ts
rename to src/app/shared/upload/uploader/uploader-error.model.ts
diff --git a/src/app/shared/uploader/uploader-options.model.ts b/src/app/shared/upload/uploader/uploader-options.model.ts
similarity index 86%
rename from src/app/shared/uploader/uploader-options.model.ts
rename to src/app/shared/upload/uploader/uploader-options.model.ts
index 959e5c3295..559fb0485b 100644
--- a/src/app/shared/uploader/uploader-options.model.ts
+++ b/src/app/shared/upload/uploader/uploader-options.model.ts
@@ -1,4 +1,4 @@
-import { RestRequestMethod } from '../../core/data/rest-request-method';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
 
 export class UploaderOptions {
   /**
diff --git a/src/app/shared/uploader/uploader-properties.model.ts b/src/app/shared/upload/uploader/uploader-properties.model.ts
similarity index 83%
rename from src/app/shared/uploader/uploader-properties.model.ts
rename to src/app/shared/upload/uploader/uploader-properties.model.ts
index bc0376b809..b84ae30bf8 100644
--- a/src/app/shared/uploader/uploader-properties.model.ts
+++ b/src/app/shared/upload/uploader/uploader-properties.model.ts
@@ -1,4 +1,4 @@
-import { MetadataMap } from '../../core/shared/metadata.models';
+import { MetadataMap } from '../../../core/shared/metadata.models';
 
 /**
  * Properties to send to the REST API for uploading a bitstream
diff --git a/src/app/shared/uploader/uploader.component.html b/src/app/shared/upload/uploader/uploader.component.html
similarity index 86%
rename from src/app/shared/uploader/uploader.component.html
rename to src/app/shared/upload/uploader/uploader.component.html
index c55a3eee1a..b1fd8199d8 100644
--- a/src/app/shared/uploader/uploader.component.html
+++ b/src/app/shared/upload/uploader/uploader.component.html
@@ -22,10 +22,10 @@
         <span>
           <i class="fas fa-upload" aria-hidden="true"></i>
           {{dropMsg | translate}}{{'uploader.or' | translate}}
-          <label for="inputFileUploader" 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>
+          <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]="ariaLabel | translate">{{'uploader.browse' | translate}}</span>
           </label>
-          <input #fileInput id="inputFileUploader" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
+          <input #fileInput id="inputFileUploader-{{uploaderId}}" class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple tabindex="0" />
         </span>
       </div>
       <div *ngIf="(isOverBaseDropZone | async) || uploader?.queue?.length !== 0">
diff --git a/src/app/shared/uploader/uploader.component.scss b/src/app/shared/upload/uploader/uploader.component.scss
similarity index 100%
rename from src/app/shared/uploader/uploader.component.scss
rename to src/app/shared/upload/uploader/uploader.component.scss
diff --git a/src/app/shared/uploader/uploader.component.spec.ts b/src/app/shared/upload/uploader/uploader.component.spec.ts
similarity index 75%
rename from src/app/shared/uploader/uploader.component.spec.ts
rename to src/app/shared/upload/uploader/uploader.component.spec.ts
index 84fee2e147..a67bde4539 100644
--- a/src/app/shared/uploader/uploader.component.spec.ts
+++ b/src/app/shared/upload/uploader/uploader.component.spec.ts
@@ -1,19 +1,27 @@
 // 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 { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-
-import { UploaderService } from './uploader.service';
-import { UploaderOptions } from './uploader-options.model';
-import { UploaderComponent } from './uploader.component';
-import { FileUploadModule } from 'ng2-file-upload';
-import { TranslateModule } from '@ngx-translate/core';
-import { createTestComponent } from '../testing/utils.test';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
-import { CookieService } from '../../core/services/cookie.service';
-import { CookieServiceMock } from '../mocks/cookie.service.mock';
-import { HttpXsrfTokenExtractorMock } from '../mocks/http-xsrf-token-extractor.mock';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import { FileUploadModule } from 'ng2-file-upload';
+
+import { DragService } from '../../../core/drag.service';
+import { CookieService } from '../../../core/services/cookie.service';
+import { CookieServiceMock } from '../../mocks/cookie.service.mock';
+import { HttpXsrfTokenExtractorMock } from '../../mocks/http-xsrf-token-extractor.mock';
+import { createTestComponent } from '../../testing/utils.test';
+import { UploaderComponent } from './uploader.component';
+import { UploaderOptions } from './uploader-options.model';
 
 describe('Chips component', () => {
 
@@ -27,7 +35,7 @@ describe('Chips component', () => {
     TestBed.configureTestingModule({
       imports: [
         FileUploadModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         UploaderComponent,
@@ -37,11 +45,11 @@ describe('Chips component', () => {
         ChangeDetectorRef,
         ScrollToService,
         UploaderComponent,
-        UploaderService,
+        DragService,
         { provide: HttpXsrfTokenExtractor, useValue: new HttpXsrfTokenExtractorMock('mock-token') },
         { provide: CookieService, useValue: new CookieServiceMock() },
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     });
 
   }));
@@ -67,14 +75,14 @@ describe('Chips component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   public uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
     url: 'http://test',
     authToken: null,
     disableMultipart: false,
-    itemAlias: null
+    itemAlias: null,
   });
 
   /* eslint-disable no-empty,@typescript-eslint/no-empty-function */
diff --git a/src/app/shared/uploader/uploader.component.ts b/src/app/shared/upload/uploader/uploader.component.ts
similarity index 88%
rename from src/app/shared/uploader/uploader.component.ts
rename to src/app/shared/upload/uploader/uploader.component.ts
index a0dd0e5bba..a3fb50a5fc 100644
--- a/src/app/shared/uploader/uploader.component.ts
+++ b/src/app/shared/upload/uploader/uploader.component.ts
@@ -1,24 +1,40 @@
-import { ChangeDetectionStrategy, ChangeDetectorRef, Component, EventEmitter, HostListener, Input, Output, ViewEncapsulation, } from '@angular/core';
-
-import { of as observableOf } from 'rxjs';
-import { FileUploader } from 'ng2-file-upload';
-import { uniqueId } from 'lodash';
-import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-
-import { UploaderOptions } from './uploader-options.model';
-import { hasValue, isNotEmpty, isUndefined } from '../empty.util';
-import { UploaderService } from './uploader.service';
-import { UploaderProperties } from './uploader-properties.model';
 import { HttpXsrfTokenExtractor } from '@angular/common/http';
-import { XSRF_COOKIE, XSRF_REQUEST_HEADER, XSRF_RESPONSE_HEADER } from '../../core/xsrf/xsrf.interceptor';
-import { CookieService } from '../../core/services/cookie.service';
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  HostListener,
+  Input,
+  Output,
+  ViewEncapsulation,
+} from '@angular/core';
+import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
+import uniqueId from 'lodash/uniqueId';
+import { FileUploader } from 'ng2-file-upload';
+import { of as observableOf } from 'rxjs';
+
+import { DragService } from '../../../core/drag.service';
+import { CookieService } from '../../../core/services/cookie.service';
+import {
+  XSRF_COOKIE,
+  XSRF_REQUEST_HEADER,
+  XSRF_RESPONSE_HEADER,
+} from '../../../core/xsrf/xsrf.constants';
+import {
+  hasValue,
+  isNotEmpty,
+  isUndefined,
+} from '../../empty.util';
+import { UploaderOptions } from './uploader-options.model';
+import { UploaderProperties } from './uploader-properties.model';
 
 @Component({
   selector: 'ds-uploader',
   templateUrl: 'uploader.component.html',
   styleUrls: ['uploader.component.scss'],
   changeDetection: ChangeDetectionStrategy.Default,
-  encapsulation: ViewEncapsulation.Emulated
+  encapsulation: ViewEncapsulation.Emulated,
 })
 
 export class UploaderComponent {
@@ -53,6 +69,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
    */
@@ -76,7 +97,7 @@ export class UploaderComponent {
   @HostListener('window:dragover', ['$event'])
   onDragOver(event: any) {
 
-    if (this.enableDragOverDocument && this.uploaderService.isAllowedDragOverPage()) {
+    if (this.enableDragOverDocument && this.dragService.isAllowedDragOverPage()) {
       // Show drop area on the page
       event.preventDefault();
       if ((event.target as any).tagName !== 'HTML') {
@@ -85,9 +106,13 @@ export class UploaderComponent {
     }
   }
 
-  constructor(private cdr: ChangeDetectorRef, private scrollToService: ScrollToService,
-    private uploaderService: UploaderService, private tokenExtractor: HttpXsrfTokenExtractor,
-    private cookieService: CookieService) {
+  constructor(
+    private cdr: ChangeDetectorRef,
+    private scrollToService: ScrollToService,
+    private dragService: DragService,
+    private tokenExtractor: HttpXsrfTokenExtractor,
+    private cookieService: CookieService,
+  ) {
   }
 
   /**
diff --git a/src/app/shared/utils/auto-focus.directive.ts b/src/app/shared/utils/auto-focus.directive.ts
index a2d860a8e1..e48ec7e1df 100644
--- a/src/app/shared/utils/auto-focus.directive.ts
+++ b/src/app/shared/utils/auto-focus.directive.ts
@@ -1,11 +1,17 @@
-import { Directive, AfterViewInit, ElementRef, Input } from '@angular/core';
+import {
+  AfterViewInit,
+  Directive,
+  ElementRef,
+  Input,
+} from '@angular/core';
+
 import { isNotEmpty } from '../empty.util';
 
 /**
  * Directive to set focus on an element when it is rendered
  */
 @Directive({
-  selector: '[dsAutoFocus]'
+  selector: '[dsAutoFocus]',
 })
 export class AutoFocusDirective implements AfterViewInit {
 
diff --git a/src/app/shared/utils/browser-only.pipe.ts b/src/app/shared/utils/browser-only.pipe.ts
index e3ee3df69d..65e6653256 100644
--- a/src/app/shared/utils/browser-only.pipe.ts
+++ b/src/app/shared/utils/browser-only.pipe.ts
@@ -1,5 +1,10 @@
-import { Inject, Pipe, PipeTransform, PLATFORM_ID } from '@angular/core';
 import { isPlatformBrowser } from '@angular/common';
+import {
+  Inject,
+  Pipe,
+  PipeTransform,
+  PLATFORM_ID,
+} from '@angular/core';
 
 /**
  * A pipe that only returns its input when run in the browser.
@@ -17,7 +22,7 @@ import { isPlatformBrowser } from '@angular/common';
  * until such components are fully interactive before trying to interact with them.
  */
 @Pipe({
-  name: 'dsBrowserOnly'
+  name: 'dsBrowserOnly',
 })
 export class BrowserOnlyPipe implements PipeTransform {
   constructor(
diff --git a/src/app/shared/utils/capitalize.pipe.ts b/src/app/shared/utils/capitalize.pipe.ts
index 2842d1dc7e..562434d731 100644
--- a/src/app/shared/utils/capitalize.pipe.ts
+++ b/src/app/shared/utils/capitalize.pipe.ts
@@ -1,7 +1,10 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({
-  name: 'dsCapitalize'
+  name: 'dsCapitalize',
 })
 
 /**
diff --git a/src/app/shared/utils/click-outside.directive.ts b/src/app/shared/utils/click-outside.directive.ts
index b9397c65e5..70587becd8 100644
--- a/src/app/shared/utils/click-outside.directive.ts
+++ b/src/app/shared/utils/click-outside.directive.ts
@@ -1,7 +1,13 @@
-import { Directive, ElementRef, Output, EventEmitter, HostListener } from '@angular/core';
+import {
+  Directive,
+  ElementRef,
+  EventEmitter,
+  HostListener,
+  Output,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsClickOutside]'
+  selector: '[dsClickOutside]',
 })
 /**
  * Directive to detect when the users clicks outside of the element the directive was put on
diff --git a/src/app/shared/utils/console.pipe.ts b/src/app/shared/utils/console.pipe.ts
index fc672a84ae..5d49eaea84 100644
--- a/src/app/shared/utils/console.pipe.ts
+++ b/src/app/shared/utils/console.pipe.ts
@@ -1,7 +1,10 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({
-  name: 'dsConsole'
+  name: 'dsConsole',
 })
 export class ConsolePipe implements PipeTransform {
   transform(value: any): string {
diff --git a/src/app/shared/utils/debounce.directive.ts b/src/app/shared/utils/debounce.directive.ts
index 8830679e2b..a509af7a07 100644
--- a/src/app/shared/utils/debounce.directive.ts
+++ b/src/app/shared/utils/debounce.directive.ts
@@ -1,8 +1,18 @@
-import {distinctUntilChanged, debounceTime, takeUntil} from 'rxjs/operators';
-import { Directive, Input, Output, EventEmitter, OnDestroy, OnInit } from '@angular/core';
+import {
+  Directive,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
 import { NgControl } from '@angular/forms';
-
 import { Subject } from 'rxjs';
+import {
+  debounceTime,
+  distinctUntilChanged,
+  takeUntil,
+} from 'rxjs/operators';
 
 @Directive({
   selector: '[ngModel][dsDebounce]',
@@ -11,6 +21,7 @@ import { Subject } from 'rxjs';
  * Directive for setting a debounce time on an input field
  * It will emit the input field's value when no changes were made to this value in a given debounce time
  */
+// todo: this class is unused, consider removing it instead of fixing lint
 export class DebounceDirective implements OnInit, OnDestroy {
 
   /**
@@ -39,14 +50,14 @@ export class DebounceDirective implements OnInit, OnDestroy {
    */
   ngOnInit() {
     this.model.valueChanges.pipe(
-      takeUntil(this.subject),
       debounceTime(this.dsDebounce),
-      distinctUntilChanged())
-      .subscribe((modelValue) => {
-        if (this.model.dirty) {
-          this.onDebounce.emit(modelValue);
-        }
-      });
+      distinctUntilChanged(),
+      takeUntil(this.subject),  // todo: check if this is ok
+    ).subscribe((modelValue) => {
+      if (this.model.dirty) {
+        this.onDebounce.emit(modelValue);
+      }
+    });
   }
 
   /**
diff --git a/src/app/shared/utils/drag-click.directive.ts b/src/app/shared/utils/drag-click.directive.ts
index b7377b4c55..9d04c0527f 100644
--- a/src/app/shared/utils/drag-click.directive.ts
+++ b/src/app/shared/utils/drag-click.directive.ts
@@ -1,7 +1,12 @@
-import { Directive, EventEmitter, HostListener, Output } from '@angular/core';
+import {
+  Directive,
+  EventEmitter,
+  HostListener,
+  Output,
+} from '@angular/core';
 
 @Directive({
-  selector: '[dsDragClick]'
+  selector: '[dsDragClick]',
 })
 
 /**
diff --git a/src/app/shared/utils/emphasize.pipe.ts b/src/app/shared/utils/emphasize.pipe.ts
index 613074a308..632a812617 100644
--- a/src/app/shared/utils/emphasize.pipe.ts
+++ b/src/app/shared/utils/emphasize.pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({ name: 'dsEmphasize' })
 /**
@@ -26,7 +29,7 @@ export class EmphasizePipe implements PipeTransform {
     , '\\'
     , '^'
     , '$'
-    , '|'
+    , '|',
   ];
   /**
    * Regular expression for escaping the string we're trying to find
@@ -50,7 +53,7 @@ export class EmphasizePipe implements PipeTransform {
    * @param str Escape special characters in the string we're looking for
    * @returns {any} The escaped version of the input string
    */
-   escapeRegExp(str) {
+  escapeRegExp(str) {
     return str.replace(this.regex, '\\$&');
   }
 }
diff --git a/src/app/shared/utils/enum-keys-pipe.ts b/src/app/shared/utils/enum-keys-pipe.ts
index 0a4a445c02..c07c42fb9c 100644
--- a/src/app/shared/utils/enum-keys-pipe.ts
+++ b/src/app/shared/utils/enum-keys-pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 @Pipe({ name: 'dsKeys' })
 /**
diff --git a/src/app/shared/utils/file-size-pipe.ts b/src/app/shared/utils/file-size-pipe.ts
index 2d219cdaf4..820840b115 100644
--- a/src/app/shared/utils/file-size-pipe.ts
+++ b/src/app/shared/utils/file-size-pipe.ts
@@ -1,4 +1,8 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+// eslint-disable-next-line import/no-namespace
 import * as fileSize from 'filesize';
 
 /*
diff --git a/src/app/shared/utils/file-value-accessor.directive.ts b/src/app/shared/utils/file-value-accessor.directive.ts
index 82ce2e6ab0..95c76b2484 100644
--- a/src/app/shared/utils/file-value-accessor.directive.ts
+++ b/src/app/shared/utils/file-value-accessor.directive.ts
@@ -1,27 +1,30 @@
-import {Directive} from '@angular/core';
-import {NG_VALUE_ACCESSOR, ControlValueAccessor} from '@angular/forms';
+import { Directive } from '@angular/core';
+import {
+  ControlValueAccessor,
+  NG_VALUE_ACCESSOR,
+} from '@angular/forms';
 
 @Directive({
-    // eslint-disable-next-line @angular-eslint/directive-selector
-    selector: 'input[type=file]',
-    // eslint-disable-next-line @angular-eslint/no-host-metadata-property
-    host : {
-        '(change)' : 'onChange($event.target.files)',
-        '(blur)': 'onTouched()'
-    },
-    providers: [
-        { provide: NG_VALUE_ACCESSOR, useExisting: FileValueAccessorDirective, multi: true }
-    ]
+  // eslint-disable-next-line @angular-eslint/directive-selector
+  selector: 'input[type=file]',
+  // eslint-disable-next-line @angular-eslint/no-host-metadata-property
+  host : {
+    '(change)' : 'onChange($event.target.files)',
+    '(blur)': 'onTouched()',
+  },
+  providers: [
+    { provide: NG_VALUE_ACCESSOR, useExisting: FileValueAccessorDirective, multi: true },
+  ],
 })
 /**
  * Value accessor directive for inputs of type 'file'
  */
 export class FileValueAccessorDirective implements ControlValueAccessor {
-    value: any;
-    onChange = (_) => { /* empty */ };
-    onTouched = () => { /* empty */};
+  value: any;
+  onChange = (_) => { /* empty */ };
+  onTouched = () => { /* empty */};
 
-    writeValue(value) { /* empty */}
-    registerOnChange(fn: any) { this.onChange = fn; }
-    registerOnTouched(fn: any) { this.onTouched = fn; }
+  writeValue(value) { /* empty */}
+  registerOnChange(fn: any) { this.onChange = fn; }
+  registerOnTouched(fn: any) { this.onTouched = fn; }
 }
diff --git a/src/app/shared/utils/follow-link-config.model.ts b/src/app/shared/utils/follow-link-config.model.ts
index 8d785dbaaf..0eb1ad0cae 100644
--- a/src/app/shared/utils/follow-link-config.model.ts
+++ b/src/app/shared/utils/follow-link-config.model.ts
@@ -1,6 +1,6 @@
+import { FindListOptions } from '../../core/data/find-list-options.model';
 import { HALResource } from '../../core/shared/hal-resource.model';
 import { hasValue } from '../empty.util';
-import { FindListOptions } from '../../core/data/find-list-options.model';
 
 /**
  * A class to send the retrieval of a {@link HALLink}
@@ -75,7 +75,7 @@ export const followLink = <R extends HALResource>(
     shouldEmbed,
     useCachedVersionIfAvailable,
     reRequestOnStale,
-    isOptional
+    isOptional,
   }: {
     findListOptions?: FindListOptions,
     shouldEmbed?: boolean,
@@ -92,7 +92,7 @@ export const followLink = <R extends HALResource>(
     useCachedVersionIfAvailable: hasValue(useCachedVersionIfAvailable) ? useCachedVersionIfAvailable : true,
     reRequestOnStale: hasValue(reRequestOnStale) ? reRequestOnStale : true,
     isOptional: hasValue(isOptional) ? isOptional : false,
-    linksToFollow
+    linksToFollow,
   };
   return followLinkConfig;
 };
diff --git a/src/app/shared/utils/has-no-value.pipe.ts b/src/app/shared/utils/has-no-value.pipe.ts
new file mode 100644
index 0000000000..c5e23d01ef
--- /dev/null
+++ b/src/app/shared/utils/has-no-value.pipe.ts
@@ -0,0 +1,16 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+import { hasNoValue } from '../empty.util';
+
+/**
+ * Returns true if the passed value is null or undefined.
+ */
+@Pipe({ name: 'dsHasNoValue' })
+export class HasNoValuePipe implements PipeTransform {
+  transform(value: any): boolean {
+    return hasNoValue(value);
+  }
+}
diff --git a/src/app/shared/utils/has-value.pipe.ts b/src/app/shared/utils/has-value.pipe.ts
new file mode 100644
index 0000000000..a669a77093
--- /dev/null
+++ b/src/app/shared/utils/has-value.pipe.ts
@@ -0,0 +1,16 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+import { hasValue } from '../empty.util';
+
+/**
+ * Returns true if the passed value is not null or undefined.
+ */
+@Pipe({ name: 'dsHasValue' })
+export class HasValuePipe implements PipeTransform {
+  transform(value: any): boolean {
+    return hasValue(value);
+  }
+}
diff --git a/src/app/shared/utils/in-list-validator.directive.ts b/src/app/shared/utils/in-list-validator.directive.ts
index 42ff7da1fd..278efa2dc3 100644
--- a/src/app/shared/utils/in-list-validator.directive.ts
+++ b/src/app/shared/utils/in-list-validator.directive.ts
@@ -1,5 +1,14 @@
-import { Directive, Input } from '@angular/core';
-import { FormControl, NG_VALIDATORS, ValidationErrors, Validator } from '@angular/forms';
+import {
+  Directive,
+  Input,
+} from '@angular/core';
+import {
+  NG_VALIDATORS,
+  UntypedFormControl,
+  ValidationErrors,
+  Validator,
+} from '@angular/forms';
+
 import { inListValidator } from './validator.functions';
 
 /**
@@ -9,21 +18,21 @@ import { inListValidator } from './validator.functions';
   selector: '[ngModel][dsInListValidator]',
   // We add our directive to the list of existing validators
   providers: [
-    { provide: NG_VALIDATORS, useExisting: InListValidator, multi: true }
-  ]
+    { provide: NG_VALIDATORS, useExisting: InListValidator, multi: true },
+  ],
 })
 export class InListValidator implements Validator {
   /**
    * The list to look in
    */
   @Input()
-  dsInListValidator: string[];
+    dsInListValidator: string[];
 
   /**
    * The function that checks if the form control's value is currently valid
    * @param c The FormControl
    */
-  validate(c: FormControl): ValidationErrors | null {
+  validate(c: UntypedFormControl): ValidationErrors | null {
     return inListValidator(this.dsInListValidator)(c);
   }
 }
diff --git a/src/app/shared/utils/ipV4.validator.spec.ts b/src/app/shared/utils/ipV4.validator.spec.ts
new file mode 100644
index 0000000000..2410722d61
--- /dev/null
+++ b/src/app/shared/utils/ipV4.validator.spec.ts
@@ -0,0 +1,39 @@
+import { TestBed } from '@angular/core/testing';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+} from '@angular/forms';
+
+import { IpV4Validator } from './ipV4.validator';
+
+describe('IpV4 validator', () => {
+
+  let ipV4Validator: IpV4Validator;
+  const validIp = '192.168.0.1';
+  const formGroup = new UntypedFormGroup({
+    ip: new UntypedFormControl(''),
+  });
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        IpV4Validator,
+      ],
+    }).compileComponents();
+
+    ipV4Validator = TestBed.inject(IpV4Validator);
+  });
+
+  it('should return null for valid ipV4',  () => {
+    formGroup.controls.ip.setValue(validIp);
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toBeNull();
+  });
+
+  it('should return {isValidIp: false} for invalid Ip',  () => {
+    formGroup.controls.ip.setValue('100.260.45.1');
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({ isValidIp: false });
+    formGroup.controls.ip.setValue('100');
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({ isValidIp: false });
+    formGroup.controls.ip.setValue('testString');
+    expect(ipV4Validator.validate(formGroup.controls.ip as UntypedFormControl)).toEqual({ isValidIp: false });
+  });
+});
diff --git a/src/app/shared/utils/ipV4.validator.ts b/src/app/shared/utils/ipV4.validator.ts
new file mode 100644
index 0000000000..04f2a4b022
--- /dev/null
+++ b/src/app/shared/utils/ipV4.validator.ts
@@ -0,0 +1,30 @@
+import { Directive } from '@angular/core';
+import {
+  NG_VALIDATORS,
+  UntypedFormControl,
+  Validator,
+} from '@angular/forms';
+
+@Directive({
+  // eslint-disable-next-line @angular-eslint/directive-selector
+  selector: '[ipV4format]',
+  providers: [
+    { provide: NG_VALIDATORS, useExisting: IpV4Validator, multi: true },
+  ],
+})
+/**
+ * Validator to validate if an Ip is in the right format
+ */
+export class IpV4Validator implements Validator {
+  validate(formControl: UntypedFormControl): {[key: string]: boolean} | null {
+    const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
+    const ipValue = formControl.value;
+    const ipParts = ipValue?.split('.');
+
+    if (ipv4Regex.test(ipValue) && ipParts.every(part => parseInt(part, 10) <= 255)) {
+      return null;
+    }
+
+    return { isValidIp: false };
+  }
+}
diff --git a/src/app/shared/utils/markdown.pipe.spec.ts b/src/app/shared/utils/markdown.pipe.spec.ts
index 50f772097d..cf644767e2 100644
--- a/src/app/shared/utils/markdown.pipe.spec.ts
+++ b/src/app/shared/utils/markdown.pipe.spec.ts
@@ -1,7 +1,8 @@
-import { MarkdownPipe } from './markdown.pipe';
 import { TestBed } from '@angular/core/testing';
+
 import { APP_CONFIG } from '../../../config/app-config.interface';
 import { environment } from '../../../environments/environment';
+import { MarkdownPipe } from './markdown.pipe';
 
 describe('Markdown Pipe', () => {
 
@@ -17,8 +18,8 @@ describe('Markdown Pipe', () => {
             markdown: {
               enabled: true,
               mathjax: true,
-            }
-          })
+            },
+          }),
         },
       ],
     }).compileComponents();
@@ -29,36 +30,36 @@ describe('Markdown Pipe', () => {
   it('should render markdown', async () => {
     await testTransform(
       '# Header',
-      '<h1>Header</h1>'
+      '<h1>Header</h1>',
     );
   });
 
   it('should render mathjax', async () => {
     await testTransform(
       '$\\sqrt{2}^2$',
-      '<svg.*?>.*</svg>'
+      '<svg.*?>.*</svg>',
     );
   });
 
   it('should render regular links', async () => {
     await testTransform(
       '<a href="https://www.dspace.com">DSpace</a>',
-      '<a href="https://www.dspace.com">DSpace</a>'
+      '<a href="https://www.dspace.com">DSpace</a>',
     );
   });
 
   it('should not render javascript links', async () => {
     await testTransform(
       '<a href="javascript:window.alert(\'bingo!\');">exploit</a>',
-      '<a>exploit</a>'
+      '<a>exploit</a>',
     );
   });
 
   async function testTransform(input: string, output: string) {
     expect(
-      await markdownPipe.transform(input)
+      await markdownPipe.transform(input),
     ).toMatch(
-      new RegExp('.*' + output + '.*')
+      new RegExp('.*' + output + '.*'),
     );
   }
 });
diff --git a/src/app/shared/utils/markdown.pipe.ts b/src/app/shared/utils/markdown.pipe.ts
index f7e1032cac..d86a8d95ca 100644
--- a/src/app/shared/utils/markdown.pipe.ts
+++ b/src/app/shared/utils/markdown.pipe.ts
@@ -1,14 +1,36 @@
-import { Inject, InjectionToken, Pipe, PipeTransform } from '@angular/core';
-import MarkdownIt from 'markdown-it';
-import * as sanitizeHtml from 'sanitize-html';
-import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
+import {
+  Inject,
+  InjectionToken,
+  Pipe,
+  PipeTransform,
+  SecurityContext,
+} from '@angular/core';
+import {
+  DomSanitizer,
+  SafeHtml,
+} from '@angular/platform-browser';
+
 import { environment } from '../../../environments/environment';
 
+const markdownItLoader = async () => (await import('markdown-it')).default;
+type LazyMarkdownIt = ReturnType<typeof markdownItLoader>;
+const MARKDOWN_IT = new InjectionToken<LazyMarkdownIt>(
+  'Lazily loaded MarkdownIt',
+  { providedIn: 'root', factory: markdownItLoader },
+);
+
 const mathjaxLoader = async () => (await import('markdown-it-mathjax3')).default;
 type Mathjax = ReturnType<typeof mathjaxLoader>;
 const MATHJAX = new InjectionToken<Mathjax>(
   'Lazily loaded mathjax',
-  { providedIn: 'root', factory: mathjaxLoader }
+  { providedIn: 'root', factory: mathjaxLoader },
+);
+
+const sanitizeHtmlLoader = async () => (await import('sanitize-html') as any).default;
+type SanitizeHtml = ReturnType<typeof sanitizeHtmlLoader>;
+const SANITIZE_HTML = new InjectionToken<SanitizeHtml>(
+  'Lazily loaded sanitize-html',
+  { providedIn: 'root', factory: sanitizeHtmlLoader },
 );
 
 /**
@@ -25,13 +47,15 @@ const MATHJAX = new InjectionToken<Mathjax>(
  *   </span>
  */
 @Pipe({
-  name: 'dsMarkdown'
+  name: 'dsMarkdown',
 })
 export class MarkdownPipe implements PipeTransform {
 
   constructor(
     protected sanitizer: DomSanitizer,
+    @Inject(MARKDOWN_IT) private markdownIt: LazyMarkdownIt,
     @Inject(MATHJAX) private mathjax: Mathjax,
+    @Inject(SANITIZE_HTML) private sanitizeHtml: SanitizeHtml,
   ) {
   }
 
@@ -39,45 +63,62 @@ export class MarkdownPipe implements PipeTransform {
     if (!environment.markdown.enabled) {
       return value;
     }
+    const MarkdownIt = await this.markdownIt;
     const md = new MarkdownIt({
       html: true,
       linkify: true,
     });
+
+    let html: string;
     if (environment.markdown.mathjax) {
       md.use(await this.mathjax);
-    }
-    return this.sanitizer.bypassSecurityTrustHtml(
-      sanitizeHtml(md.render(value), {
+      const sanitizeHtml = await this.sanitizeHtml;
+      html = sanitizeHtml(md.render(value), {
         // 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,
           'mjx-container': [
-            'class', 'style', 'jax'
+            'class', 'style', 'jax',
           ],
           svg: [
-            'xmlns', 'viewBox', 'style', 'width', 'height', 'role', 'focusable', 'alt', 'aria-label'
+            'xmlns', 'viewBox', 'style', 'width', 'height', 'role', 'focusable', 'alt', 'aria-label',
           ],
           g: [
-            'data-mml-node', 'style', 'stroke', 'fill', 'stroke-width', 'transform'
+            'data-mml-node', 'style', 'stroke', 'fill', 'stroke-width', 'transform',
           ],
           path: [
-            'd', 'style', 'transform'
+            'd', 'style', 'transform',
           ],
           rect: [
-            'width', 'height', 'x', 'y', 'transform', 'style'
+            'width', 'height', 'x', 'y', 'transform', 'style',
           ],
           text: [
-            'transform', 'font-size'
-          ]
+            'transform', 'font-size',
+          ],
+          'mjx-assistive-mml': [
+            'unselectable', 'display', 'style',
+          ],
+          math: [
+            'xmlns',
+          ],
+          mrow: [
+            'data-mjx-texclass',
+          ],
         },
         parser: {
           lowerCaseAttributeNames: false,
         },
-      })
-    );
+      });
+    } else {
+      html = this.sanitizer.sanitize(SecurityContext.HTML, md.render(value));
+    }
+
+    return this.sanitizer.bypassSecurityTrustHtml(html);
   }
 }
diff --git a/src/app/shared/utils/metadatafield-validator.directive.ts b/src/app/shared/utils/metadatafield-validator.directive.ts
index 8725246eeb..badfad5b72 100644
--- a/src/app/shared/utils/metadatafield-validator.directive.ts
+++ b/src/app/shared/utils/metadatafield-validator.directive.ts
@@ -1,7 +1,24 @@
-import { Directive, Injectable } from '@angular/core';
-import { AbstractControl, AsyncValidator, NG_VALIDATORS, ValidationErrors } from '@angular/forms';
-import { map, switchMap, take } from 'rxjs/operators';
-import { of as observableOf, timer as observableTimer, Observable } from 'rxjs';
+import {
+  Directive,
+  Injectable,
+} from '@angular/core';
+import {
+  AbstractControl,
+  AsyncValidator,
+  NG_VALIDATORS,
+  ValidationErrors,
+} from '@angular/forms';
+import {
+  Observable,
+  of as observableOf,
+  timer as observableTimer,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { MetadataFieldDataService } from '../../core/data/metadata-field-data.service';
 import { PaginatedList } from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
@@ -15,8 +32,8 @@ import { getFirstSucceededRemoteData } from '../../core/shared/operators';
   selector: '[ngModel][dsMetadataFieldValidator]',
   // We add our directive to the list of existing validators
   providers: [
-    { provide: NG_VALIDATORS, useExisting: MetadataFieldValidator, multi: true }
-  ]
+    { provide: NG_VALIDATORS, useExisting: MetadataFieldValidator, multi: true },
+  ],
 })
 @Injectable({ providedIn: 'root' })
 export class MetadataFieldValidator implements AsyncValidator {
@@ -48,13 +65,13 @@ export class MetadataFieldValidator implements AsyncValidator {
               } else if (matchingFieldRD.payload.pageInfo.totalElements === 1) {
                 return null;
               }
-            })
+            }),
           );
 
         res.pipe(take(1)).subscribe();
 
         return res;
-      })
+      }),
     );
     resTimer.pipe(take(1)).subscribe();
     return resTimer;
diff --git a/src/app/shared/utils/object-keys-pipe.ts b/src/app/shared/utils/object-keys-pipe.ts
index 0d6a2c8222..095e076b8e 100644
--- a/src/app/shared/utils/object-keys-pipe.ts
+++ b/src/app/shared/utils/object-keys-pipe.ts
@@ -1,6 +1,9 @@
-import { PipeTransform, Pipe } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
-@Pipe({name: 'dsObjectKeys'})
+@Pipe({ name: 'dsObjectKeys' })
 /**
  * Pipe for parsing all keys of an object to an array of key-value pairs
  */
diff --git a/src/app/shared/utils/object-ngfor.pipe.ts b/src/app/shared/utils/object-ngfor.pipe.ts
index 982e3342e0..0e2d65b43e 100644
--- a/src/app/shared/utils/object-ngfor.pipe.ts
+++ b/src/app/shared/utils/object-ngfor.pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 
 /**
  * Pipe that allows to iterate over an object and to access to entry key and value :
@@ -9,10 +12,10 @@ import { Pipe, PipeTransform } from '@angular/core';
  *
  */
 @Pipe({
-  name: 'dsObjNgFor'
+  name: 'dsObjNgFor',
 })
 export class ObjNgFor implements PipeTransform {
   transform(value: any, args: any[] = null): any {
-    return Object.keys(value).map((key) => Object.assign({ key }, {value: value[key]}));
+    return Object.keys(value).map((key) => Object.assign({ key }, { value: value[key] }));
   }
 }
diff --git a/src/app/shared/utils/object-values-pipe.ts b/src/app/shared/utils/object-values-pipe.ts
index 5fab8bf841..a72d443b7e 100644
--- a/src/app/shared/utils/object-values-pipe.ts
+++ b/src/app/shared/utils/object-values-pipe.ts
@@ -1,9 +1,13 @@
-import { PipeTransform, Pipe } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
 import { isNotEmpty } from '../empty.util';
 
 @Pipe({
   name: 'dsObjectValues',
-  pure: true
+  pure: true,
 })
 /**
  * Pipe for parsing all values of an object to an array of values
diff --git a/src/app/shared/utils/relation-query.utils.spec.ts b/src/app/shared/utils/relation-query.utils.spec.ts
index f40c331497..1f2a725a9f 100644
--- a/src/app/shared/utils/relation-query.utils.spec.ts
+++ b/src/app/shared/utils/relation-query.utils.spec.ts
@@ -1,4 +1,7 @@
-import { getFilterByRelation, getQueryByRelations } from './relation-query.utils';
+import {
+  getFilterByRelation,
+  getQueryByRelations,
+} from './relation-query.utils';
 
 describe('Relation Query Utils', () => {
   const relationtype = 'isAuthorOfPublication';
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
index 62a69075fc..e2f3a0eb6c 100644
--- a/src/app/shared/utils/relation-query.utils.ts
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -1,5 +1,8 @@
-import { followLink, FollowLinkConfig } from './follow-link-config.model';
 import { Relationship } from '../../core/shared/item-relationships/relationship.model';
+import {
+  followLink,
+  FollowLinkConfig,
+} from './follow-link-config.model';
 
 /**
  * Get the query for looking up items by relation type
@@ -30,7 +33,7 @@ export function itemLinksToFollow(showThumbnail: boolean):  FollowLinkConfig<Rel
   if (showThumbnail) {
     linksToFollow = [
       followLink('leftItem',{}, followLink('thumbnail')),
-      followLink('rightItem',{}, followLink('thumbnail'))
+      followLink('rightItem',{}, followLink('thumbnail')),
     ];
   } else {
     linksToFollow = [followLink('leftItem'), followLink('rightItem')];
diff --git a/src/app/shared/utils/require-file.validator.ts b/src/app/shared/utils/require-file.validator.ts
index 7902bfec28..c4ec59e160 100644
--- a/src/app/shared/utils/require-file.validator.ts
+++ b/src/app/shared/utils/require-file.validator.ts
@@ -1,22 +1,26 @@
-import {Directive} from '@angular/core';
-import {NG_VALIDATORS, Validator, FormControl} from '@angular/forms';
+import { Directive } from '@angular/core';
+import {
+  NG_VALIDATORS,
+  UntypedFormControl,
+  Validator,
+} from '@angular/forms';
 
 @Directive({
   // eslint-disable-next-line @angular-eslint/directive-selector
-    selector: '[requireFile]',
-    providers: [
-        { provide: NG_VALIDATORS, useExisting: FileValidator, multi: true },
-    ]
+  selector: '[requireFile]',
+  providers: [
+    { provide: NG_VALIDATORS, useExisting: FileValidator, multi: true },
+  ],
 })
 /**
  * Validator directive to validate if a file is selected
  */
 export class FileValidator implements Validator {
-    static validate(c: FormControl): {[key: string]: any} {
-      return c.value == null || c.value.length === 0 ? { required : true } : null;
-    }
+  static validate(c: UntypedFormControl): {[key: string]: any} {
+    return c.value == null || c.value.length === 0 ? { required : true } : null;
+  }
 
-    validate(c: FormControl): {[key: string]: any} {
-      return FileValidator.validate(c);
-    }
+  validate(c: UntypedFormControl): {[key: string]: any} {
+    return FileValidator.validate(c);
+  }
 }
diff --git a/src/app/shared/utils/route.utils.spec.ts b/src/app/shared/utils/route.utils.spec.ts
index 7ec6c879d8..aa91a886db 100644
--- a/src/app/shared/utils/route.utils.spec.ts
+++ b/src/app/shared/utils/route.utils.spec.ts
@@ -7,12 +7,12 @@ describe('Route Utils', () => {
         primary: {
           segments: [
             { path: 'test' },
-            { path: 'path' }
-          ]
-        }
+            { path: 'path' },
+          ],
+        },
 
-      }
-    }
+      },
+    },
   };
   const router = { parseUrl: () => urlTree } as any;
   it('Should return the correct current path based on the router', () => {
diff --git a/src/app/shared/utils/route.utils.ts b/src/app/shared/utils/route.utils.ts
index 8f7bb9120d..9f45b7ec23 100644
--- a/src/app/shared/utils/route.utils.ts
+++ b/src/app/shared/utils/route.utils.ts
@@ -1,6 +1,10 @@
-import { ActivatedRouteSnapshot, Router } from '@angular/router';
-import { hasValue } from '../empty.util';
+import {
+  ActivatedRouteSnapshot,
+  Router,
+} from '@angular/router';
+
 import { URLCombiner } from '../../core/url-combiner/url-combiner';
+import { hasValue } from '../empty.util';
 
 /**
  * Util function to retrieve the current path (without query parameters) the user is on
diff --git a/src/app/shared/utils/safe-url-pipe.ts b/src/app/shared/utils/safe-url-pipe.ts
index 3f35ed9262..1d04c7e08a 100644
--- a/src/app/shared/utils/safe-url-pipe.ts
+++ b/src/app/shared/utils/safe-url-pipe.ts
@@ -1,4 +1,7 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 
 /**
diff --git a/src/app/shared/utils/short-number.pipe.spec.ts b/src/app/shared/utils/short-number.pipe.spec.ts
new file mode 100644
index 0000000000..9fda54f470
--- /dev/null
+++ b/src/app/shared/utils/short-number.pipe.spec.ts
@@ -0,0 +1,96 @@
+import { TestBed } from '@angular/core/testing';
+
+import { ShortNumberPipe } from './short-number.pipe';
+
+describe('ShortNumber Pipe', () => {
+
+  let shortNumberPipe: ShortNumberPipe;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [
+        ShortNumberPipe,
+      ],
+    }).compileComponents();
+
+    shortNumberPipe = TestBed.inject(ShortNumberPipe);
+  });
+
+  it('should not transform with an invalid number', async () => {
+    await testTransform(
+      'tre',
+      'tre',
+    );
+  });
+
+  it('should not transform with an empty string', async () => {
+    await testTransform(
+      '',
+      '',
+    );
+  });
+
+  it('should not transform with zero', async () => {
+    await testTransform(
+      0,
+      '0',
+    );
+  });
+
+  it('should render 1K', async () => {
+    await testTransform(
+      '1000',
+      '1K',
+    );
+  });
+
+  it('should render 1K', async () => {
+    await testTransform(
+      1000,
+      '1K',
+    );
+  });
+
+  it('should render 19.3K', async () => {
+    await testTransform(
+      19300,
+      '19.3K',
+    );
+  });
+
+  it('should render 1M', async () => {
+    await testTransform(
+      1000000,
+      '1M',
+    );
+  });
+
+  it('should render 1B', async () => {
+    await testTransform(
+      1000000000,
+      '1B',
+    );
+  });
+
+  it('should render 1T', async () => {
+    await testTransform(
+      1000000000000,
+      '1T',
+    );
+  });
+
+  it('should render 1Q', async () => {
+    await testTransform(
+      1000000000000000,
+      '1Q',
+    );
+  });
+
+  async function testTransform(input: any, output: string) {
+    expect(
+      await shortNumberPipe.transform(input),
+    ).toMatch(
+      output,
+    );
+  }
+});
diff --git a/src/app/shared/utils/short-number.pipe.ts b/src/app/shared/utils/short-number.pipe.ts
new file mode 100644
index 0000000000..dc06e7f52a
--- /dev/null
+++ b/src/app/shared/utils/short-number.pipe.ts
@@ -0,0 +1,44 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+import { isEmpty } from '../empty.util';
+
+
+@Pipe({
+  name: 'dsShortNumber',
+})
+export class ShortNumberPipe implements PipeTransform {
+
+  transform(number: number, args?: any): any {
+    // will only work value is a valid number
+    if (isNaN(number) || isEmpty(number) || number === 0) {
+      return number;
+    }
+
+    let abs = Math.abs(number);
+    const rounder = Math.pow(10, 1);
+    const isNegative = number < 0; // will also work for Negetive numbers
+    let key = '';
+
+    const powers = [
+      { key: 'Q', value: Math.pow(10, 15) },
+      { key: 'T', value: Math.pow(10, 12) },
+      { key: 'B', value: Math.pow(10, 9) },
+      { key: 'M', value: Math.pow(10, 6) },
+      { key: 'K', value: 1000 },
+    ];
+
+    for (let i = 0; i < powers.length; i++) {
+      let reduced = abs / powers[i].value;
+      reduced = Math.round(reduced * rounder) / rounder;
+      if (reduced >= 1) {
+        abs = reduced;
+        key = powers[i].key;
+        break;
+      }
+    }
+    return (isNegative ? '-' : '') + abs + key;
+  }
+}
diff --git a/src/app/shared/utils/split.pipe.ts b/src/app/shared/utils/split.pipe.ts
new file mode 100644
index 0000000000..2f6290322a
--- /dev/null
+++ b/src/app/shared/utils/split.pipe.ts
@@ -0,0 +1,20 @@
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
+/**
+ * Custom pipe to split a string into an array of substrings based on a specified separator.
+ * @param value - The string to be split.
+ * @param separator - The separator used to split the string.
+ * @returns An array of substrings.
+ */
+@Pipe({
+  name: 'dsSplit',
+})
+export class SplitPipe implements PipeTransform {
+  transform(value: string, separator: string): string[] {
+    return value.split(separator);
+  }
+
+}
diff --git a/src/app/shared/utils/truncate.pipe.ts b/src/app/shared/utils/truncate.pipe.ts
index f841535bb8..35d94656ba 100644
--- a/src/app/shared/utils/truncate.pipe.ts
+++ b/src/app/shared/utils/truncate.pipe.ts
@@ -1,4 +1,8 @@
-import { Pipe, PipeTransform } from '@angular/core';
+import {
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+
 import { hasValue } from '../empty.util';
 
 /**
@@ -6,7 +10,7 @@ import { hasValue } from '../empty.util';
  * Default value: 10
  */
 @Pipe({
-  name: 'dsTruncate'
+  name: 'dsTruncate',
 })
 export class TruncatePipe implements PipeTransform {
 
diff --git a/src/app/shared/utils/validator.functions.ts b/src/app/shared/utils/validator.functions.ts
index 164ac7885e..da3b94d303 100644
--- a/src/app/shared/utils/validator.functions.ts
+++ b/src/app/shared/utils/validator.functions.ts
@@ -1,4 +1,8 @@
-import { AbstractControl, ValidatorFn } from '@angular/forms';
+import {
+  AbstractControl,
+  ValidatorFn,
+} from '@angular/forms';
+
 import { isNotEmpty } from '../empty.util';
 
 /**
diff --git a/src/app/shared/utils/var.directive.ts b/src/app/shared/utils/var.directive.ts
index 497fc91a8b..a5f6818214 100644
--- a/src/app/shared/utils/var.directive.ts
+++ b/src/app/shared/utils/var.directive.ts
@@ -1,4 +1,9 @@
-import { Directive, Input, TemplateRef, ViewContainerRef } from '@angular/core';
+import {
+  Directive,
+  Input,
+  TemplateRef,
+  ViewContainerRef,
+} from '@angular/core';
 
 /* eslint-disable @angular-eslint/directive-selector */
 @Directive({
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 5f70bc699c..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">
-    <a *ngIf="isToShow(viewModeEnum.ListElement)"
+    <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">
-          <i class="fas fa-list" title="{{'search.view-switch.show-list' | translate}}"></i>
-    </a>
-    <a *ngIf="isToShow(viewModeEnum.GridElement)"
+       <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,9 +23,9 @@
        [class.active]="currentMode === viewModeEnum.GridElement"
        class="btn btn-secondary"
        [attr.data-test]="'grid-view' | dsBrowserOnly">
-          <i class="fas fa-th-large" title="{{'search.view-switch.show-grid' | translate}}"></i>
-    </a>
-    <a *ngIf="isToShow(viewModeEnum.DetailedListElement)"
+       <i class="fas fa-th-large"></i>
+    </button>
+    <button *ngIf="isToShow(viewModeEnum.DetailedListElement)"
        routerLink="."
        [queryParams]="{view: 'detailed'}"
        queryParamsHandling="merge"
@@ -30,6 +34,6 @@
        [class.active]="currentMode === viewModeEnum.DetailedListElement"
        class="btn btn-secondary"
        [attr.data-test]="'detail-view' | dsBrowserOnly">
-      <i class="far fa-square" title="{{'search.view-switch.show-detail' | translate}}"></i>
-    </a>
+      <span class="far fa-square"></span><span class="sr-only">{{'search.view-switch.show-detail' | translate}}</span>
+    </button>
 </div>
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
index 5780ea5cf3..90c5b64e72 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.spec.ts
@@ -1,15 +1,27 @@
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ComponentFixture, fakeAsync, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { SearchService } from '../../core/shared/search/search.service';
-import { ViewModeSwitchComponent } from './view-mode-switch.component';
-import { SearchServiceStub } from '../testing/search-service.stub';
 import { ViewMode } from '../../core/shared/view-mode.model';
+import { TranslateLoaderMock } from '../mocks/translate-loader.mock';
 import { BrowserOnlyMockPipe } from '../testing/browser-only-mock.pipe';
+import { SearchServiceStub } from '../testing/search-service.stub';
+import { ViewModeSwitchComponent } from './view-mode-switch.component';
 
 @Component({ template: '' })
 class DummyComponent {
@@ -28,12 +40,12 @@ describe('ViewModeSwitchComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
         RouterTestingModule.withRoutes([
           { path: 'search', component: DummyComponent, pathMatch: 'full' },
-        ])
+        ]),
       ],
       declarations: [
         ViewModeSwitchComponent,
@@ -44,7 +56,7 @@ describe('ViewModeSwitchComponent', () => {
         { provide: SearchService, useValue: searchService },
       ],
     }).overrideComponent(ViewModeSwitchComponent, {
-      set: { changeDetection: ChangeDetectionStrategy.Default }
+      set: { changeDetection: ChangeDetectionStrategy.Default },
     }).compileComponents();
   }));
 
@@ -61,7 +73,7 @@ describe('ViewModeSwitchComponent', () => {
       searchService.setViewMode(ViewMode.ListElement);
       tick();
       fixture.detectChanges();
-      const debugElements = fixture.debugElement.queryAll(By.css('a'));
+      const debugElements = fixture.debugElement.queryAll(By.css('button'));
       listButton = debugElements[0].nativeElement;
       gridButton = debugElements[1].nativeElement;
     }));
@@ -96,7 +108,7 @@ describe('ViewModeSwitchComponent', () => {
       searchService.setViewMode(ViewMode.ListElement);
       tick();
       fixture.detectChanges();
-      const debugElements = fixture.debugElement.queryAll(By.css('a'));
+      const debugElements = fixture.debugElement.queryAll(By.css('button'));
       listButton = debugElements[0].nativeElement;
       detailButton = debugElements[1].nativeElement;
     }));
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.ts b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
index 95f35abf17..b4b50462a1 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.ts
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.ts
@@ -1,13 +1,22 @@
-import { Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import { Router } from '@angular/router';
 import { Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
 
 import { SearchService } from '../../core/shared/search/search.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
-import { isEmpty, isNotEmpty } from '../empty.util';
+import {
+  isEmpty,
+  isNotEmpty,
+} from '../empty.util';
 import { currentPath } from '../utils/route.utils';
-import { Router } from '@angular/router';
-import { filter } from 'rxjs/operators';
 
 /**
  * Component to switch between list and grid views.
@@ -15,7 +24,7 @@ import { filter } from 'rxjs/operators';
 @Component({
   selector: 'ds-view-mode-switch',
   styleUrls: ['./view-mode-switch.component.scss'],
-  templateUrl: './view-mode-switch.component.html'
+  templateUrl: './view-mode-switch.component.html',
 })
 export class ViewModeSwitchComponent implements OnInit, OnDestroy {
 
@@ -62,7 +71,7 @@ export class ViewModeSwitchComponent implements OnInit, OnDestroy {
     }
 
     this.sub = this.searchService.getViewMode().pipe(
-      filter((viewMode: ViewMode) => isNotEmpty(viewMode))
+      filter((viewMode: ViewMode) => isNotEmpty(viewMode)),
     ).subscribe((viewMode: ViewMode) => {
       this.currentMode = viewMode;
     });
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
deleted file mode 100644
index 39c62d6e53..0000000000
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<div class="modal-header">
-  <h4 class="modal-title">{{'vocabulary-treeview.header' | translate}}</h4>
-  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
-  </button>
-</div>
-<div class="modal-body">
-  <div class="p-3">
-    <ds-alert *ngIf="description | async" [content]="description | async" [type]="'alert-info'"></ds-alert>
-    <div class="treeview-header row">
-      <div class="col-12">
-        <div class="input-group">
-          <input type="text" class="form-control" [(ngModel)]="searchText" (keyup.enter)="search()">
-          <div class="input-group-append" id="button-addon4">
-            <button class="btn btn-outline-primary" type="button" (click)="search()" [disabled]="!isSearchEnabled()">
-              {{'vocabulary-treeview.search.form.search' | translate}}
-            </button>
-            <button class="btn btn-outline-secondary" type="button" (click)="reset()">
-              {{'vocabulary-treeview.search.form.reset' | 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>
-      <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 fa-2x invisible" aria-hidden="true"></span>
-            </button>
-            <button class="btn btn-outline-link btn-sm text-left"
-                    [class.text-success]="node.item?.value === selectedItem?.value"
-                    [disabled]="!node.item?.selectable"
-                    [ngbTooltip]="node.item?.otherInformation?.note"
-                    [openDelay]="500"
-                    container="body"
-                    (click)="onSelect(node.item)">{{node.item.display}}</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
-                    [attr.aria-label]="'toggle ' + node.name"
-                    (click)="loadChildren(node)">
-              <span class="fas {{treeControl.isExpanded(node) ? 'fa-angle-down' : 'fa-angle-right'}} fa-2x"
-                    aria-hidden="true"></span>
-            </button>
-
-            <button class="btn btn-outline-link btn-sm text-left"
-                    [class.text-success]="node.item?.value === selectedItem?.value"
-                    [disabled]="!node.item?.selectable"
-                    [ngbTooltip]="node.item?.otherInformation?.note"
-                    [openDelay]="500"
-                    container="body"
-                    (click)="onSelect(node.item)">{{node.item.display}}</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)">
-            {{'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)">
-            {{'vocabulary-treeview.load-more' | translate}}...
-          </button>
-        </cdk-tree-node>
-      </cdk-tree>
-    </div>
-  </div>
-</div>
diff --git a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.scss b/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.scss
deleted file mode 100644
index 39050ff85b..0000000000
--- a/src/app/shared/vocabulary-treeview/vocabulary-treeview.component.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-::ng-deep .tooltip-inner {
-  text-align:left;
-}
-
-cdk-tree .btn:focus {
-  box-shadow: none !important;
-}
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
index d5bb80dfde..241ab66405 100644
--- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Collection } from '../../core/shared/collection.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Collection } from '../../core/shared/collection.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
 
 describe('CollectionStatisticsPageComponent', () => {
 
@@ -29,9 +37,9 @@ describe('CollectionStatisticsPageComponent', () => {
         scope: createSuccessfulRemoteDataObject(
           Object.assign(new Collection(), {
             id: 'collection_id',
-          })
-        )
-      })
+          }),
+        ),
+      }),
     };
 
     const router = {
@@ -47,9 +55,9 @@ describe('CollectionStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `${scope}-${type}-report`,
             points: [],
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
 
     const nameService = {
@@ -58,7 +66,7 @@ describe('CollectionStatisticsPageComponent', () => {
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
index 4875ce39cd..c8b51765e6 100644
--- a/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
+++ b/src/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
@@ -1,10 +1,14 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute , Router} from '@angular/router';
-import { Collection } from '../../core/shared/collection.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Collection } from '../../core/shared/collection.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the statistics page for a collection.
@@ -12,7 +16,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-collection-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./collection-statistics-page.component.scss']
+  styleUrls: ['./collection-statistics-page.component.scss'],
 })
 export class CollectionStatisticsPageComponent extends StatisticsPageComponent<Collection> {
 
@@ -31,7 +35,7 @@ export class CollectionStatisticsPageComponent extends StatisticsPageComponent<C
     protected router: Router,
     protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
-    protected authService: AuthService
+    protected authService: AuthService,
   ) {
     super(
       route,
diff --git a/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts b/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
index dab96aef04..90981363f1 100644
--- a/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
+++ b/src/app/statistics-page/collection-statistics-page/themed-collection-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CollectionStatisticsPageComponent } from './collection-statistics-page.component';
 
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
index 2e63f83b8f..a51e201043 100644
--- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Community } from '../../core/shared/community.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Community } from '../../core/shared/community.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
 
 describe('CommunityStatisticsPageComponent', () => {
 
@@ -29,9 +37,9 @@ describe('CommunityStatisticsPageComponent', () => {
         scope: createSuccessfulRemoteDataObject(
           Object.assign(new Community(), {
             id: 'community_id',
-          })
-        )
-      })
+          }),
+        ),
+      }),
     };
 
     const router = {
@@ -47,9 +55,9 @@ describe('CommunityStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `${scope}-${type}-report`,
             points: [],
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
 
     const nameService = {
@@ -58,7 +66,7 @@ describe('CommunityStatisticsPageComponent', () => {
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
index de7a8bbf8c..f6f7e8c78c 100644
--- a/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
+++ b/src/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
@@ -1,10 +1,14 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Community } from '../../core/shared/community.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Community } from '../../core/shared/community.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the statistics page for a community.
@@ -12,7 +16,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-community-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./community-statistics-page.component.scss']
+  styleUrls: ['./community-statistics-page.component.scss'],
 })
 export class CommunityStatisticsPageComponent extends StatisticsPageComponent<Community> {
 
diff --git a/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts b/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
index 17f185f786..a3309ff83b 100644
--- a/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
+++ b/src/app/statistics-page/community-statistics-page/themed-community-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { CommunityStatisticsPageComponent } from './community-statistics-page.component';
 
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
index 88bbca3fba..e5ee114e39 100644
--- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ItemStatisticsPageComponent } from './item-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Item } from '../../core/shared/item.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Item } from '../../core/shared/item.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 
 describe('ItemStatisticsPageComponent', () => {
 
@@ -29,9 +37,9 @@ describe('ItemStatisticsPageComponent', () => {
         scope: createSuccessfulRemoteDataObject(
           Object.assign(new Item(), {
             id: 'item_id',
-          })
-        )
-      })
+          }),
+        ),
+      }),
     };
 
     const router = {
@@ -47,9 +55,9 @@ describe('ItemStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `${scope}-${type}-report`,
             points: [],
-          }
-        )
-      )
+          },
+        ),
+      ),
     );
 
     const nameService = {
@@ -58,7 +66,7 @@ describe('ItemStatisticsPageComponent', () => {
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
index f5f107af74..f7ec8299fc 100644
--- a/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
+++ b/src/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
@@ -1,10 +1,14 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Item } from '../../core/shared/item.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { Item } from '../../core/shared/item.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the statistics page for an item.
@@ -12,7 +16,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-item-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./item-statistics-page.component.scss']
+  styleUrls: ['./item-statistics-page.component.scss'],
 })
 export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
 
@@ -32,7 +36,7 @@ export class ItemStatisticsPageComponent extends StatisticsPageComponent<Item> {
     protected router: Router,
     protected usageReportService: UsageReportDataService,
     protected nameService: DSONameService,
-    protected authService: AuthService
+    protected authService: AuthService,
   ) {
     super(
       route,
diff --git a/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts b/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
index 50e26329a9..b9a46308a0 100644
--- a/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
+++ b/src/app/statistics-page/item-statistics-page/themed-item-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { ItemStatisticsPageComponent } from './item-statistics-page.component';
 
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
index 3c181c1816..60148bc55b 100644
--- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.spec.ts
@@ -1,20 +1,28 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SiteStatisticsPageComponent } from './site-statistics-page.component';
-import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
-import { TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { of as observableOf } from 'rxjs';
-import { Site } from '../../core/shared/site.model';
-import { DebugElement } from '@angular/core';
-import { By } from '@angular/platform-browser';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { SharedModule } from '../../shared/shared.module';
 import { CommonModule } from '@angular/common';
+import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../../core/auth/auth.service';
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
 import { SiteDataService } from '../../core/data/site-data.service';
-import { AuthService } from '../../core/auth/auth.service';
+import { Site } from '../../core/shared/site.model';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { SharedModule } from '../../shared/shared.module';
+import { StatisticsTableComponent } from '../statistics-table/statistics-table.component';
+import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 
 describe('SiteStatisticsPageComponent', () => {
 
@@ -36,7 +44,7 @@ describe('SiteStatisticsPageComponent', () => {
           new UsageReport(), {
             id: `site_id-TotalVisits-report`,
             points: [],
-          }
+          },
         ),
       ]),
     };
@@ -53,12 +61,12 @@ describe('SiteStatisticsPageComponent', () => {
             href: 'test_site_link',
           },
         },
-      }))
+      })),
     };
 
     const authService = jasmine.createSpyObj('authService', {
       isAuthenticated: observableOf(true),
-      setRedirectUrl: {}
+      setRedirectUrl: {},
     });
 
     TestBed.configureTestingModule({
diff --git a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
index 5eb19bec56..4fa3e10d36 100644
--- a/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
+++ b/src/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
@@ -1,12 +1,16 @@
 import { Component } from '@angular/core';
-import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
-import { SiteDataService } from '../../core/data/site-data.service';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Site } from '../../core/shared/site.model';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { switchMap } from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { SiteDataService } from '../../core/data/site-data.service';
+import { Site } from '../../core/shared/site.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
+import { StatisticsPageComponent } from '../statistics-page/statistics-page.component';
 
 /**
  * Component representing the site-wide statistics page.
@@ -14,7 +18,7 @@ import { AuthService } from '../../core/auth/auth.service';
 @Component({
   selector: 'ds-site-statistics-page',
   templateUrl: '../statistics-page/statistics-page.component.html',
-  styleUrls: ['./site-statistics-page.component.scss']
+  styleUrls: ['./site-statistics-page.component.scss'],
 })
 export class SiteStatisticsPageComponent extends StatisticsPageComponent<Site> {
 
diff --git a/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts b/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
index 3f841163ed..e38cfe8247 100644
--- a/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
+++ b/src/app/statistics-page/site-statistics-page/themed-site-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SiteStatisticsPageComponent } from './site-statistics-page.component';
 
diff --git a/src/app/statistics-page/statistics-page-routing.module.ts b/src/app/statistics-page/statistics-page-routing.module.ts
index ef6f68d557..a435948db9 100644
--- a/src/app/statistics-page/statistics-page-routing.module.ts
+++ b/src/app/statistics-page/statistics-page-routing.module.ts
@@ -1,16 +1,17 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
-import { StatisticsPageModule } from './statistics-page.module';
+
 import { CollectionPageResolver } from '../collection-page/collection-page.resolver';
 import { CommunityPageResolver } from '../community-page/community-page.resolver';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
+import { StatisticsAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard';
+import { ItemResolver } from '../item-page/item.resolver';
 import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component';
 import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component';
 import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component';
 import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component';
-import { ItemResolver } from '../item-page/item.resolver';
-import { StatisticsAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/statistics-administrator.guard';
+import { StatisticsPageModule } from './statistics-page.module';
 
 @NgModule({
   imports: [
@@ -19,11 +20,11 @@ import { StatisticsAdministratorGuard } from '../core/data/feature-authorization
       {
         path: '',
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         children: [
           {
@@ -31,57 +32,57 @@ import { StatisticsAdministratorGuard } from '../core/data/feature-authorization
             component: ThemedSiteStatisticsPageComponent,
           },
         ],
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
       {
         path: `items/:id`,
         resolve: {
           scope: ItemResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         component: ThemedItemStatisticsPageComponent,
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
       {
         path: `collections/:id`,
         resolve: {
           scope: CollectionPageResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         component: ThemedCollectionStatisticsPageComponent,
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
       {
         path: `communities/:id`,
         resolve: {
           scope: CommunityPageResolver,
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
         data: {
           title: 'statistics.title',
-          breadcrumbKey: 'statistics'
+          breadcrumbKey: 'statistics',
         },
         component: ThemedCommunityStatisticsPageComponent,
-        canActivate: [StatisticsAdministratorGuard]
+        canActivate: [StatisticsAdministratorGuard],
       },
-    ]
-    )
+    ],
+    ),
   ],
   providers: [
     I18nBreadcrumbResolver,
     I18nBreadcrumbsService,
     CollectionPageResolver,
     CommunityPageResolver,
-    ItemResolver
-  ]
+    ItemResolver,
+  ],
 })
 export class StatisticsPageRoutingModule {
 }
diff --git a/src/app/statistics-page/statistics-page.module.ts b/src/app/statistics-page/statistics-page.module.ts
index 75726de94c..b0d54341a5 100644
--- a/src/app/statistics-page/statistics-page.module.ts
+++ b/src/app/statistics-page/statistics-page.module.ts
@@ -1,19 +1,19 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
 
 import { CoreModule } from '../core/core.module';
+import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
 import { SharedModule } from '../shared/shared.module';
 import { StatisticsModule } from '../statistics/statistics.module';
-import { UsageReportDataService } from '../core/statistics/usage-report-data.service';
-import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
-import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
-import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
 import { CollectionStatisticsPageComponent } from './collection-statistics-page/collection-statistics-page.component';
-import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component';
 import { ThemedCollectionStatisticsPageComponent } from './collection-statistics-page/themed-collection-statistics-page.component';
+import { CommunityStatisticsPageComponent } from './community-statistics-page/community-statistics-page.component';
 import { ThemedCommunityStatisticsPageComponent } from './community-statistics-page/themed-community-statistics-page.component';
+import { ItemStatisticsPageComponent } from './item-statistics-page/item-statistics-page.component';
 import { ThemedItemStatisticsPageComponent } from './item-statistics-page/themed-item-statistics-page.component';
+import { SiteStatisticsPageComponent } from './site-statistics-page/site-statistics-page.component';
 import { ThemedSiteStatisticsPageComponent } from './site-statistics-page/themed-site-statistics-page.component';
+import { StatisticsTableComponent } from './statistics-table/statistics-table.component';
 
 const components = [
   StatisticsTableComponent,
@@ -24,7 +24,7 @@ const components = [
   ThemedCollectionStatisticsPageComponent,
   ThemedCommunityStatisticsPageComponent,
   ThemedItemStatisticsPageComponent,
-  ThemedSiteStatisticsPageComponent
+  ThemedSiteStatisticsPageComponent,
 ];
 
 @NgModule({
@@ -32,13 +32,13 @@ const components = [
     CommonModule,
     SharedModule,
     CoreModule.forRoot(),
-    StatisticsModule.forRoot()
+    StatisticsModule.forRoot(),
   ],
   declarations: components,
   providers: [
     UsageReportDataService,
   ],
-  exports: components
+  exports: components,
 })
 
 /**
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..5ee12b72d9 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">
@@ -19,7 +19,7 @@
                            [report]="report"
                            class="m-2 {{ report.id }}">
       </ds-statistics-table>
-      <div *ngIf="!(hasData$ | async)">
+      <div *ngIf="(hasData$ | async) !== true">
         {{ 'statistics.page.no-data' | translate }}
       </div>
     </ng-container>
diff --git a/src/app/statistics-page/statistics-page/statistics-page.component.ts b/src/app/statistics-page/statistics-page/statistics-page.component.ts
index 8b91d54ae8..8f2b13a034 100644
--- a/src/app/statistics-page/statistics-page/statistics-page.component.ts
+++ b/src/app/statistics-page/statistics-page/statistics-page.component.ts
@@ -1,25 +1,38 @@
-import { Component, OnInit } from '@angular/core';
-import { combineLatest, Observable } from 'rxjs';
-import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
-import { map, switchMap } from 'rxjs/operators';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
-import { RemoteData } from '../../core/data/remote-data';
 import {
-  getRemoteDataPayload,
-  getFirstSucceededRemoteData
-} from '../../core/shared/operators';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { ActivatedRoute, Router } from '@angular/router';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
 import { AuthService } from '../../core/auth/auth.service';
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../core/data/remote-data';
 import { redirectOn4xx } from '../../core/shared/authorized.operators';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { UsageReportDataService } from '../../core/statistics/usage-report-data.service';
 
 /**
  * Class representing an abstract statistics page component.
  */
 @Component({
   selector: 'ds-statistics-page',
-  template: ''
+  template: '',
 })
 export abstract class StatisticsPageComponent<T extends DSpaceObject> implements OnInit {
 
@@ -54,7 +67,7 @@ export abstract class StatisticsPageComponent<T extends DSpaceObject> implements
     this.reports$ = this.getReports$();
     this.hasData$ = this.reports$.pipe(
       map((reports) => reports.some(
-        (report) => report.points.length > 0
+        (report) => report.points.length > 0,
       )),
     );
   }
@@ -78,7 +91,7 @@ export abstract class StatisticsPageComponent<T extends DSpaceObject> implements
     return this.scope$.pipe(
       switchMap((scope) =>
         combineLatest(
-          this.types.map((type) => this.usageReportService.getStatistic(scope.id, type))
+          this.types.map((type) => this.usageReportService.getStatistic(scope.id, type)),
         ),
       ),
     );
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 3ecd256812..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,16 +1,16 @@
 <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">
+  <table class="table table-striped" [attr.data-test]="report.reportType">
 
     <tbody>
 
     <tr>
-      <th scope="col"></th>
+      <td></td>
       <th scope="col"
           *ngFor="let header of headers"
           class="{{header}}-header">
@@ -20,7 +20,7 @@
 
     <tr *ngFor="let point of report.points"
         class="{{point.id}}-data">
-      <th scope="row">
+      <th scope="row" data-test="statistics-label">
         {{ getLabel(point) | async }}
       </th>
       <td *ngFor="let header of headers"
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
index c7900cd278..3c1c69fc6a 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.spec.ts
@@ -1,12 +1,16 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { StatisticsTableComponent } from './statistics-table.component';
-import { UsageReport } from '../../core/statistics/models/usage-report.model';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+
 import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { UsageReport } from '../../core/statistics/models/usage-report.model';
+import { StatisticsTableComponent } from './statistics-table.component';
 
 describe('StatisticsTableComponent', () => {
 
@@ -27,7 +31,7 @@ describe('StatisticsTableComponent', () => {
         { provide: DSONameService, useValue: {} },
       ],
     })
-    .compileComponents();
+      .compileComponents();
   }));
 
   beforeEach(() => {
@@ -69,8 +73,8 @@ describe('StatisticsTableComponent', () => {
               views: 8,
               downloads: 8,
             },
-          }
-        ]
+          },
+        ],
       });
       component.ngOnInit();
       fixture.detectChanges();
diff --git a/src/app/statistics-page/statistics-table/statistics-table.component.ts b/src/app/statistics-page/statistics-table/statistics-table.component.ts
index 5916adc023..8c972b3bea 100644
--- a/src/app/statistics-page/statistics-table/statistics-table.component.ts
+++ b/src/app/statistics-page/statistics-table/statistics-table.component.ts
@@ -1,10 +1,26 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { Point, UsageReport } from '../../core/statistics/models/usage-report.model';
-import { Observable, of } from 'rxjs';
-import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { getRemoteDataPayload, getFirstSucceededRemoteData } from '../../core/shared/operators';
+
+import { DSONameService } from '../../core/breadcrumbs/dso-name.service';
 import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import {
+  getFinishedRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import {
+  Point,
+  UsageReport,
+} from '../../core/statistics/models/usage-report.model';
+import { isEmpty } from '../../shared/empty.util';
 
 /**
  * Component representing a statistics table for a given usage report.
@@ -12,7 +28,7 @@ import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.serv
 @Component({
   selector: 'ds-statistics-table',
   templateUrl: './statistics-table.component.html',
-  styleUrls: ['./statistics-table.component.scss']
+  styleUrls: ['./statistics-table.component.scss'],
 })
 export class StatisticsTableComponent implements OnInit {
 
@@ -20,7 +36,7 @@ export class StatisticsTableComponent implements OnInit {
    * The usage report to display a statistics table for
    */
   @Input()
-  report: UsageReport;
+    report: UsageReport;
 
   /**
    * Boolean indicating whether the usage report has data
@@ -35,6 +51,7 @@ export class StatisticsTableComponent implements OnInit {
   constructor(
     protected dsoService: DSpaceObjectDataService,
     protected nameService: DSONameService,
+    private translateService: TranslateService,
   ) {
 
   }
@@ -54,9 +71,9 @@ export class StatisticsTableComponent implements OnInit {
     switch (this.report.reportType) {
       case 'TotalVisits':
         return this.dsoService.findById(point.id).pipe(
-          getFirstSucceededRemoteData(),
+          getFinishedRemoteData(),
           getRemoteDataPayload(),
-          map((item) => this.nameService.getName(item)),
+          map((item) => !isEmpty(item) ?  this.nameService.getName(item) : this.translateService.instant('statistics.table.no-name')),
         );
       case 'TopCities':
       case 'topCountries':
diff --git a/src/app/statistics/angulartics/dspace-provider.spec.ts b/src/app/statistics/angulartics/dspace-provider.spec.ts
index 8491d8e80c..80176c3e94 100644
--- a/src/app/statistics/angulartics/dspace-provider.spec.ts
+++ b/src/app/statistics/angulartics/dspace-provider.spec.ts
@@ -1,8 +1,9 @@
-import { Angulartics2DSpace } from './dspace-provider';
 import { Angulartics2 } from 'angulartics2';
-import { StatisticsService } from '../statistics.service';
-import { filter } from 'rxjs/operators';
 import { of as observableOf } from 'rxjs';
+import { filter } from 'rxjs/operators';
+
+import { StatisticsService } from '../statistics.service';
+import { Angulartics2DSpace } from './dspace-provider';
 
 describe('Angulartics2DSpace', () => {
   let provider: Angulartics2DSpace;
@@ -11,16 +12,19 @@ describe('Angulartics2DSpace', () => {
 
   beforeEach(() => {
     angulartics2 = {
-      eventTrack: observableOf({action: 'pageView', properties: {object: 'mock-object'}}),
-      filterDeveloperMode: () => filter(() => true)
+      eventTrack: observableOf({ action: 'page_view', properties: {
+        object: 'mock-object',
+        referrer: 'https://www.referrer.com',
+      } }),
+      filterDeveloperMode: () => filter(() => true),
     } as any;
-    statisticsService = jasmine.createSpyObj('statisticsService', {trackViewEvent: null});
+    statisticsService = jasmine.createSpyObj('statisticsService', { trackViewEvent: null });
     provider = new Angulartics2DSpace(angulartics2, statisticsService);
   });
 
   it('should use the statisticsService', () => {
     provider.startTracking();
-    expect(statisticsService.trackViewEvent).toHaveBeenCalledWith('mock-object' as any);
+    expect(statisticsService.trackViewEvent).toHaveBeenCalledWith('mock-object' as any, 'https://www.referrer.com');
   });
 
 });
diff --git a/src/app/statistics/angulartics/dspace-provider.ts b/src/app/statistics/angulartics/dspace-provider.ts
index cd1aab94bd..c4143bbf97 100644
--- a/src/app/statistics/angulartics/dspace-provider.ts
+++ b/src/app/statistics/angulartics/dspace-provider.ts
@@ -1,11 +1,15 @@
 import { Injectable } from '@angular/core';
-import { Angulartics2 } from 'angulartics2';
+import {
+  Angulartics2,
+  EventTrack,
+} from 'angulartics2';
+
 import { StatisticsService } from '../statistics.service';
 
 /**
  * Angulartics2DSpace is a angulartics2 plugin that provides DSpace with the events.
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class Angulartics2DSpace {
 
   constructor(
@@ -23,15 +27,16 @@ export class Angulartics2DSpace {
       .subscribe((event) => this.eventTrack(event));
   }
 
-  private eventTrack(event) {
-    if (event.action === 'pageView') {
-      this.statisticsService.trackViewEvent(event.properties.object);
+  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') {
       this.statisticsService.trackSearchEvent(
         event.properties.searchOptions,
         event.properties.page,
         event.properties.sort,
-        event.properties.filters
+        event.properties.filters,
+        event.properties.clickedObject?.split('?')[0],
       );
     }
   }
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.ts b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
index 85588aeb97..1820b03be6 100644
--- a/src/app/statistics/angulartics/dspace/view-tracker.component.ts
+++ b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
@@ -1,6 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Angulartics2 } from 'angulartics2';
+import { Subscription } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+import { ReferrerService } from '../../../core/services/referrer.service';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+import { hasValue } from '../../../shared/empty.util';
 
 /**
  * This component triggers a page view statistic
@@ -10,18 +20,43 @@ import { DSpaceObject } from '../../../core/shared/dspace-object.model';
   styleUrls: ['./view-tracker.component.scss'],
   templateUrl: './view-tracker.component.html',
 })
-export class ViewTrackerComponent implements OnInit {
+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 angulartics2: Angulartics2,
+    public referrerService: ReferrerService,
   ) {
   }
 
   ngOnInit(): void {
-    this.angulartics2.eventTrack.next({
-      action: 'pageView',
-      properties: {object: this.object},
-    });
+    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/google-analytics.service.spec.ts b/src/app/statistics/google-analytics.service.spec.ts
index 9e2b1c7edf..eb35750c4c 100644
--- a/src/app/statistics/google-analytics.service.spec.ts
+++ b/src/app/statistics/google-analytics.service.spec.ts
@@ -1,12 +1,18 @@
-import { Angulartics2GoogleAnalytics, Angulartics2GoogleTagManager } from 'angulartics2';
+import {
+  Angulartics2GoogleAnalytics,
+  Angulartics2GoogleGlobalSiteTag,
+} from 'angulartics2';
 import { of } from 'rxjs';
 
-import { GoogleAnalyticsService } from './google-analytics.service';
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ConfigurationProperty } from '../core/shared/configuration-property.model';
 import { KlaroService } from '../shared/cookies/klaro.service';
 import { GOOGLE_ANALYTICS_KLARO_KEY } from '../shared/cookies/klaro-configuration';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
+import { GoogleAnalyticsService } from './google-analytics.service';
 
 describe('GoogleAnalyticsService', () => {
   const trackingIdProp = 'google.analytics.key';
@@ -16,7 +22,7 @@ describe('GoogleAnalyticsService', () => {
   const srcTestValue = 'mock-script-src';
   let service: GoogleAnalyticsService;
   let googleAnalyticsSpy: Angulartics2GoogleAnalytics;
-  let googleTagManagerSpy: Angulartics2GoogleTagManager;
+  let googleTagManagerSpy: Angulartics2GoogleGlobalSiteTag;
   let configSpy: ConfigurationDataService;
   let klaroServiceSpy: jasmine.SpyObj<KlaroService>;
   let scriptElementMock: any;
@@ -37,12 +43,12 @@ describe('GoogleAnalyticsService', () => {
     googleAnalyticsSpy = jasmine.createSpyObj('Angulartics2GoogleAnalytics', [
       'startTracking',
     ]);
-    googleTagManagerSpy = jasmine.createSpyObj('Angulartics2GoogleTagManager', [
+    googleTagManagerSpy = jasmine.createSpyObj('Angulartics2GoogleGlobalSiteTag', [
       'startTracking',
     ]);
 
     klaroServiceSpy = jasmine.createSpyObj('KlaroService', {
-      'getSavedPreferences': jasmine.createSpy('getSavedPreferences')
+      'getSavedPreferences': jasmine.createSpy('getSavedPreferences'),
     });
 
     configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
@@ -51,7 +57,7 @@ describe('GoogleAnalyticsService', () => {
       set src(newVal) { /* noop */ },
       get src() { return innerHTMLTestValue; },
       set innerHTML(newVal) { /* noop */ },
-      get innerHTML() { return srcTestValue; }
+      get innerHTML() { return srcTestValue; },
     };
 
     innerHTMLSpy = spyOnProperty(scriptElementMock, 'innerHTML', 'set');
@@ -68,7 +74,7 @@ describe('GoogleAnalyticsService', () => {
     });
 
     klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-      GOOGLE_ANALYTICS_KLARO_KEY: true
+      GOOGLE_ANALYTICS_KLARO_KEY: true,
     }));
 
     service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy );
@@ -92,7 +98,7 @@ describe('GoogleAnalyticsService', () => {
         });
 
         klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-          GOOGLE_ANALYTICS_KLARO_KEY: true
+          GOOGLE_ANALYTICS_KLARO_KEY: true,
         }));
 
         service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
@@ -115,7 +121,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy();
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true
+            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
@@ -156,7 +162,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: false
+            [GOOGLE_ANALYTICS_KLARO_KEY]: false,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
@@ -178,7 +184,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV4TestValue);
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true
+            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
@@ -215,7 +221,7 @@ describe('GoogleAnalyticsService', () => {
         beforeEach(() => {
           configSpy = createConfigSuccessSpy(trackingIdV3TestValue);
           klaroServiceSpy.getSavedPreferences.and.returnValue(of({
-            [GOOGLE_ANALYTICS_KLARO_KEY]: true
+            [GOOGLE_ANALYTICS_KLARO_KEY]: true,
           }));
           service = new GoogleAnalyticsService(googleAnalyticsSpy, googleTagManagerSpy, klaroServiceSpy, configSpy, documentSpy);
         });
diff --git a/src/app/statistics/google-analytics.service.ts b/src/app/statistics/google-analytics.service.ts
index 9c5883d183..508297c3b9 100644
--- a/src/app/statistics/google-analytics.service.ts
+++ b/src/app/statistics/google-analytics.service.ts
@@ -1,14 +1,19 @@
 import { DOCUMENT } from '@angular/common';
-import { Inject, Injectable } from '@angular/core';
-
-import { Angulartics2GoogleAnalytics, Angulartics2GoogleTagManager } from 'angulartics2';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
+import {
+  Angulartics2GoogleAnalytics,
+  Angulartics2GoogleGlobalSiteTag,
+} from 'angulartics2';
 import { combineLatest } from 'rxjs';
 
 import { ConfigurationDataService } from '../core/data/configuration-data.service';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
-import { isEmpty } from '../shared/empty.util';
 import { KlaroService } from '../shared/cookies/klaro.service';
 import { GOOGLE_ANALYTICS_KLARO_KEY } from '../shared/cookies/klaro-configuration';
+import { isEmpty } from '../shared/empty.util';
 
 /**
  * Set up Google Analytics on the client side.
@@ -19,7 +24,7 @@ export class GoogleAnalyticsService {
 
   constructor(
     private googleAnalytics: Angulartics2GoogleAnalytics,
-    private googleTagManager: Angulartics2GoogleTagManager,
+    private googleGlobalSiteTag: Angulartics2GoogleGlobalSiteTag,
     private klaroService: KlaroService,
     private configService: ConfigurationDataService,
     @Inject(DOCUMENT) private document: any,
@@ -70,7 +75,7 @@ export class GoogleAnalyticsService {
           this.document.body.appendChild(libScript);
 
           // start tracking
-          this.googleTagManager.startTracking();
+          this.googleGlobalSiteTag.startTracking();
         } else {
           // add trackingId snippet to page
           const keyScript = this.document.createElement('script');
diff --git a/src/app/statistics/statistics-endpoint.model.ts b/src/app/statistics/statistics-endpoint.model.ts
index 0a3671432e..e1152e4a50 100644
--- a/src/app/statistics/statistics-endpoint.model.ts
+++ b/src/app/statistics/statistics-endpoint.model.ts
@@ -1,10 +1,14 @@
-import { HALLink } from '../core/shared/hal-link.model';
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
 import { typedObject } from '../core/cache/builders/build-decorators';
-import { excludeFromEquals } from '../core/utilities/equals.decorators';
-import { autoserialize, deserialize } from 'cerialize';
-import { ResourceType } from '../core/shared/resource-type';
-import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type';
 import { CacheableObject } from '../core/cache/cacheable-object.model';
+import { HALLink } from '../core/shared/hal-link.model';
+import { ResourceType } from '../core/shared/resource-type';
+import { excludeFromEquals } from '../core/utilities/equals.decorators';
+import { STATISTICS_ENDPOINT } from './statistics-endpoint.resource-type';
 
 /**
  * Model class for the statistics endpoint
@@ -18,13 +22,13 @@ export class StatisticsEndpoint implements CacheableObject {
    */
   @excludeFromEquals
   @autoserialize
-  type: ResourceType;
+    type: ResourceType;
 
   /**
    * The {@link HALLink}s for the statistics endpoint
    */
   @deserialize
-  _links: {
+    _links: {
     self: HALLink;
     searchevents: HALLink;
     viewevents: HALLink;
diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts
index 4870e4fbf0..9e1c248da8 100644
--- a/src/app/statistics/statistics.module.ts
+++ b/src/app/statistics/statistics.module.ts
@@ -1,5 +1,9 @@
-import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
+import {
+  ModuleWithProviders,
+  NgModule,
+} from '@angular/core';
+
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
@@ -9,7 +13,7 @@ import { StatisticsEndpoint } from './statistics-endpoint.model';
  * Declaration needed to make sure all decorator functions are called in time
  */
 export const models = [
-  StatisticsEndpoint
+  StatisticsEndpoint,
 ];
 
 @NgModule({
@@ -23,7 +27,7 @@ export const models = [
   ],
   exports: [
     ViewTrackerComponent,
-  ]
+  ],
 })
 /**
  * This module handles the statistics
diff --git a/src/app/statistics/statistics.service.spec.ts b/src/app/statistics/statistics.service.spec.ts
index 76eadb2d31..ff57e31970 100644
--- a/src/app/statistics/statistics.service.spec.ts
+++ b/src/app/statistics/statistics.service.spec.ts
@@ -1,11 +1,12 @@
-import { StatisticsService } from './statistics.service';
+import isEqual from 'lodash/isEqual';
+
 import { RequestService } from '../core/data/request.service';
-import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub';
-import { getMockRequestService } from '../shared/mocks/request.service.mock';
-import { isEqual } from 'lodash';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
-import { SearchOptions } from '../shared/search/models/search-options.model';
 import { RestRequest } from '../core/data/rest-request.model';
+import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { getMockRequestService } from '../shared/mocks/request.service.mock';
+import { SearchOptions } from '../shared/search/models/search-options.model';
+import { HALEndpointServiceStub } from '../shared/testing/hal-endpoint-service.stub';
+import { StatisticsService } from './statistics.service';
 
 describe('StatisticsService', () => {
   let service: StatisticsService;
@@ -25,13 +26,14 @@ describe('StatisticsService', () => {
     service = initTestService();
 
     it('should send a request to track an item view ', () => {
-      const mockItem: any = {uuid: 'mock-item-uuid', type: 'item'};
-      service.trackViewEvent(mockItem);
+      const mockItem: any = { uuid: 'mock-item-uuid', type: 'item' };
+      service.trackViewEvent(mockItem, 'https://www.referrer.com');
       const request: RestRequest = requestService.send.calls.mostRecent().args[0];
       expect(request.body).toBeDefined('request.body');
       const body = JSON.parse(request.body);
       expect(body.targetId).toBe('mock-item-uuid');
       expect(body.targetType).toBe('item');
+      expect(body.referrer).toBe('https://www.referrer.com');
     });
   });
 
@@ -47,9 +49,9 @@ describe('StatisticsService', () => {
       size: 10,
       totalElements: 248,
       totalPages: 25,
-      number: 4
+      number: 4,
     };
-    const sort = {by: 'search-field', order: 'ASC'};
+    const sort = { by: 'search-field', order: 'ASC' };
     service.trackSearchEvent(mockSearch, page, sort);
     const request: RestRequest = requestService.send.calls.mostRecent().args[0];
     const body = JSON.parse(request.body);
@@ -63,14 +65,14 @@ describe('StatisticsService', () => {
         size: 10,
         totalElements: 248,
         totalPages: 25,
-        number: 4
+        number: 4,
       });
     });
 
     it('should specify the sort options', () => {
       expect(body.sort).toEqual({
         by: 'search-field',
-        order: 'asc'
+        order: 'asc',
       });
     });
   });
@@ -83,29 +85,29 @@ describe('StatisticsService', () => {
       query: 'mock-query',
       configuration: 'mock-configuration',
       dsoTypes: [DSpaceObjectType.ITEM],
-      scope: 'mock-scope'
+      scope: 'mock-scope',
     });
 
     const page = {
       size: 10,
       totalElements: 248,
       totalPages: 25,
-      number: 4
+      number: 4,
     };
-    const sort = {by: 'search-field', order: 'ASC'};
+    const sort = { by: 'search-field', order: 'ASC' };
     const filters = [
       {
         filter: 'title',
         operator: 'notcontains',
         value: 'dolor sit',
-        label: 'dolor sit'
+        label: 'dolor sit',
       },
       {
         filter: 'author',
         operator: 'authority',
         value: '9zvxzdm4qru17or5a83wfgac',
-        label: 'Amet, Consectetur'
-      }
+        label: 'Amet, Consectetur',
+      },
     ];
     service.trackSearchEvent(mockSearch, page, sort, filters);
     const request: RestRequest = requestService.send.calls.mostRecent().args[0];
@@ -129,14 +131,14 @@ describe('StatisticsService', () => {
           filter: 'title',
           operator: 'notcontains',
           value: 'dolor sit',
-          label: 'dolor sit'
+          label: 'dolor sit',
         },
         {
           filter: 'author',
           operator: 'authority',
           value: '9zvxzdm4qru17or5a83wfgac',
-          label: 'Amet, Consectetur'
-        }
+          label: 'Amet, Consectetur',
+        },
       ])).toBe(true);
     });
   });
diff --git a/src/app/statistics/statistics.service.ts b/src/app/statistics/statistics.service.ts
index a5888e1455..9c63b67be7 100644
--- a/src/app/statistics/statistics.service.ts
+++ b/src/app/statistics/statistics.service.ts
@@ -1,17 +1,24 @@
-import { RequestService } from '../core/data/request.service';
 import { Injectable } from '@angular/core';
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { map, take } from 'rxjs/operators';
-import { TrackRequest } from './track-request.model';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { HALEndpointService } from '../core/shared/hal-endpoint.service';
-import { SearchOptions } from '../shared/search/models/search-options.model';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { RequestService } from '../core/data/request.service';
 import { RestRequest } from '../core/data/rest-request.model';
+import { DSpaceObject } from '../core/shared/dspace-object.model';
+import { HALEndpointService } from '../core/shared/hal-endpoint.service';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../shared/empty.util';
+import { SearchOptions } from '../shared/search/models/search-options.model';
+import { TrackRequest } from './track-request.model';
 
 /**
  * The statistics service
  */
-@Injectable({providedIn: 'root'})
+@Injectable({ providedIn: 'root' })
 export class StatisticsService {
 
   constructor(
@@ -24,18 +31,23 @@ export class StatisticsService {
     const requestId = this.requestService.generateRequestId();
     this.halService.getEndpoint(linkPath).pipe(
       map((endpoint: string) => new TrackRequest(requestId, endpoint, JSON.stringify(body))),
-      take(1) // otherwise the previous events will fire again
+      take(1), // otherwise the previous events will fire again
     ).subscribe((request: RestRequest) => this.requestService.send(request));
   }
 
   /**
    * To track a page view
    * @param dso: The dso which was viewed
+   * @param referrer: The referrer used by the client to reach the dso page
    */
-  trackViewEvent(dso: DSpaceObject) {
+  trackViewEvent(
+    dso: DSpaceObject,
+    referrer: string,
+  ) {
     this.sendEvent('/statistics/viewevents', {
       targetId: dso.uuid,
-      targetType: (dso as any).type
+      targetType: (dso as any).type,
+      referrer,
     });
   }
 
@@ -45,12 +57,14 @@ export class StatisticsService {
    * @param page: An object that describes the pagination status
    * @param sort: An object that describes the sort status
    * @param filters: An array of search filters used to filter the result set
+   * @param clickedObject: UUID of object clicked
    */
   trackSearchEvent(
     searchOptions: SearchOptions,
     page: { size: number, totalElements: number, totalPages: number, number: number },
     sort: { by: string, order: string },
-    filters?: { filter: string, operator: string, value: string, label: string }[]
+    filters?: { filter: string, operator: string, value: string, label: string }[],
+    clickedObject?: string,
   ) {
     const body = {
       query: searchOptions.query,
@@ -58,11 +72,11 @@ export class StatisticsService {
         size: page.size,
         totalElements: page.totalElements,
         totalPages: page.totalPages,
-        number: page.number
+        number: page.number,
       },
       sort: {
         by: sort.by,
-        order: sort.order.toLowerCase()
+        order: sort.order.toLowerCase(),
       },
     };
     if (hasValue(searchOptions.configuration)) {
@@ -82,11 +96,14 @@ export class StatisticsService {
           filter: filter.filter,
           operator: filter.operator,
           value: filter.value,
-          label: filter.label
+          label: filter.label,
         });
       }
       Object.assign(body, { appliedFilters: bodyFilters });
     }
+    if (hasValue(clickedObject)) {
+      Object.assign(body, { clickedObject });
+    }
     this.sendEvent('/statistics/searchevents', body);
   }
 
diff --git a/src/app/store.actions.ts b/src/app/store.actions.ts
index 59ce00a243..5839778ac0 100644
--- a/src/app/store.actions.ts
+++ b/src/app/store.actions.ts
@@ -1,6 +1,7 @@
-import { type } from './shared/ngrx/type';
 import { Action } from '@ngrx/store';
+
 import { AppState } from './app.reducer';
+import { type } from './shared/ngrx/type';
 
 export const StoreActionTypes = {
   REHYDRATE: type('dspace/ngrx/REHYDRATE'),
diff --git a/src/app/store.effects.ts b/src/app/store.effects.ts
index c7add76add..4efb940c3d 100644
--- a/src/app/store.effects.ts
+++ b/src/app/store.effects.ts
@@ -1,17 +1,24 @@
+import { Injectable } from '@angular/core';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
+import {
+  Action,
+  Store,
+} from '@ngrx/store';
 import { of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { Injectable } from '@angular/core';
-import { Action, Store } from '@ngrx/store';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
 
 import { AppState } from './app.reducer';
-import { StoreActionTypes } from './store.actions';
 import { HostWindowResizeAction } from './shared/host-window.actions';
+import { StoreActionTypes } from './store.actions';
 
 @Injectable()
 export class StoreEffects {
 
-   replay = createEffect(() => this.actions.pipe(
+  replay = createEffect(() => this.actions.pipe(
     ofType(StoreActionTypes.REPLAY),
     map((replayAction: Action) => {
       // TODO: should be able to replay all actions before the browser attempts to
@@ -21,9 +28,9 @@ export class StoreEffects {
       return observableOf({});
     })), { dispatch: false });
 
-   resize = createEffect(() => this.actions.pipe(
+  resize = createEffect(() => this.actions.pipe(
     ofType(StoreActionTypes.REPLAY, StoreActionTypes.REHYDRATE),
-    map(() => new HostWindowResizeAction(window.innerWidth, window.innerHeight))
+    map(() => new HostWindowResizeAction(window.innerWidth, window.innerHeight)),
   ));
 
   constructor(private actions: Actions, private store: Store<AppState>) {
diff --git a/src/app/submission/edit/submission-edit.component.html b/src/app/submission/edit/submission-edit.component.html
index b74d3861f8..9c0e9eae72 100644
--- a/src/app/submission/edit/submission-edit.component.html
+++ b/src/app/submission/edit/submission-edit.component.html
@@ -5,5 +5,6 @@
                       [submissionDefinition]="submissionDefinition"
                       [submissionErrors]="submissionErrors"
                       [item]="item"
+                      [collectionModifiable]="collectionModifiable"
                       [submissionId]="submissionId"></ds-submission-form>
 </div>
diff --git a/src/app/submission/edit/submission-edit.component.spec.ts b/src/app/submission/edit/submission-edit.component.spec.ts
index 8013162d85..ac623e6c6a 100644
--- a/src/app/submission/edit/submission-edit.component.spec.ts
+++ b/src/app/submission/edit/submission-edit.component.spec.ts
@@ -1,25 +1,34 @@
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
-import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-
+import {
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
-import { SubmissionEditComponent } from './submission-edit.component';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../submission.service';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-
-import { RouterStub } from '../../shared/testing/router.stub';
-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 { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
+import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SubmissionService } from '../submission.service';
+import { SubmissionEditComponent } from './submission-edit.component';
 
 describe('SubmissionEditComponent Component', () => {
 
@@ -43,7 +52,7 @@ describe('SubmissionEditComponent Component', () => {
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([
           { path: ':id/edit', component: SubmissionEditComponent, pathMatch: 'full' },
-        ])
+        ]),
       ],
       declarations: [SubmissionEditComponent],
       providers: [
@@ -56,7 +65,7 @@ describe('SubmissionEditComponent Component', () => {
         { provide: ActivatedRoute, useValue: route },
 
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -78,7 +87,7 @@ describe('SubmissionEditComponent Component', () => {
 
     route.testParams = { id: submissionId };
     submissionServiceStub.retrieveSubmission.and.returnValue(
-      createSuccessfulRemoteDataObject$(submissionObject)
+      createSuccessfulRemoteDataObject$(submissionObject),
     );
 
     fixture.detectChanges();
@@ -94,7 +103,7 @@ describe('SubmissionEditComponent Component', () => {
   it('should redirect to mydspace when an empty SubmissionObject has been retrieved',() => {
 
     route.testParams = { id: submissionId };
-    submissionServiceStub.retrieveSubmission.and.returnValue(createSuccessfulRemoteDataObject$({})
+    submissionServiceStub.retrieveSubmission.and.returnValue(createSuccessfulRemoteDataObject$({}),
     );
 
     fixture.detectChanges();
diff --git a/src/app/submission/edit/submission-edit.component.ts b/src/app/submission/edit/submission-edit.component.ts
index 840d57c661..153ed42588 100644
--- a/src/app/submission/edit/submission-edit.component.ts
+++ b/src/app/submission/edit/submission-edit.component.ts
@@ -1,24 +1,44 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { ActivatedRoute, ParamMap, Router } from '@angular/router';
-
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { debounceTime, filter, switchMap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  ParamMap,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  filter,
+  switchMap,
+} from 'rxjs/operators';
 
-import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { hasValue, isEmpty, isNotEmptyOperator, isNotNull } from '../../shared/empty.util';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
-import { SubmissionService } from '../submission.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { Collection } from '../../core/shared/collection.model';
+import { ItemDataService } from '../../core/data/item-data.service';
 import { RemoteData } from '../../core/data/remote-data';
+import { Collection } from '../../core/shared/collection.model';
 import { Item } from '../../core/shared/item.model';
 import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { ItemDataService } from '../../core/data/item-data.service';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
-import parseSectionErrors from '../utils/parseSectionErrors';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmptyOperator,
+  isNotNull,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionError } from '../objects/submission-error.model';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrors from '../utils/parseSectionErrors';
 
 /**
  * This component allows to edit an existing workspaceitem/workflowitem.
@@ -26,7 +46,7 @@ import { SubmissionError } from '../objects/submission-error.model';
 @Component({
   selector: 'ds-submission-edit',
   styleUrls: ['./submission-edit.component.scss'],
-  templateUrl: './submission-edit.component.html'
+  templateUrl: './submission-edit.component.html',
 })
 export class SubmissionEditComponent implements OnDestroy, OnInit {
 
@@ -36,6 +56,13 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
    */
   public collectionId: string;
 
+  /**
+   * Checks if the collection can be modifiable by the user
+   * @type {booelan}
+   */
+  public collectionModifiable: boolean | null = null;
+
+
   /**
    * The list of submission's sections
    * @type {WorkspaceitemSectionsObject}
@@ -109,11 +136,14 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
    * Retrieve workspaceitem/workflowitem from server and initialize all instance variables
    */
   ngOnInit() {
+
+    this.collectionModifiable = this.route.snapshot.data?.collectionModifiable ?? null;
+
     this.subs.push(
       this.route.paramMap.pipe(
         switchMap((params: ParamMap) => this.submissionService.retrieveSubmission(params.get('id'))),
         // NOTE new submission is retrieved on the browser side only, so get null on server side rendering
-        filter((submissionObjectRD: RemoteData<SubmissionObject>) => isNotNull(submissionObjectRD))
+        filter((submissionObjectRD: RemoteData<SubmissionObject>) => isNotNull(submissionObjectRD)),
       ).subscribe((submissionObjectRD: RemoteData<SubmissionObject>) => {
         if (submissionObjectRD.hasSucceeded) {
           if (isEmpty(submissionObjectRD.payload)) {
@@ -141,7 +171,7 @@ export class SubmissionEditComponent implements OnDestroy, OnInit {
       this.itemLink$.pipe(
         isNotEmptyOperator(),
         switchMap((itemLink: string) =>
-          this.itemDataService.findByHref(itemLink)
+          this.itemDataService.findByHref(itemLink),
         ),
         getAllSucceededRemoteData(),
         // Multiple sources can update the item in quick succession.
diff --git a/src/app/submission/edit/themed-submission-edit.component.ts b/src/app/submission/edit/themed-submission-edit.component.ts
index bbaf432c13..62e4c1a4da 100644
--- a/src/app/submission/edit/themed-submission-edit.component.ts
+++ b/src/app/submission/edit/themed-submission-edit.component.ts
@@ -2,13 +2,14 @@
  * Themed wrapper for SubmissionEditComponent
  */
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SubmissionEditComponent } from './submission-edit.component';
 
 @Component({
   selector: 'ds-themed-submission-edit',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionEditComponent extends ThemedComponent<SubmissionEditComponent> {
   protected getComponentName(): string {
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 d897cc31fd..4e4200d16b 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -1,6 +1,6 @@
 <div>
   <div
-    *ngIf="!(available$ | async)"
+    *ngIf="(available$ | async) !== true"
     class="input-group mb-3">
     <div class="input-group-prepend">
       <span class="input-group-text">{{ 'submission.sections.general.collection' | translate }}</span>
@@ -25,19 +25,19 @@
             class="btn btn-outline-primary"
             (blur)="onClose()"
             (click)="onClose()"
-            [disabled]="(processingChange$ | async)"
+            [disabled]="(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>
+      <span *ngIf="(processingChange$ | async) !== true">{{ selectedCollectionName$ | async }}</span>
     </button>
 
     <div ngbDropdownMenu
-         class="dropdown-menu"
+         class="dropdown-menu p-0"
          id="collectionControlsDropdownMenu"
          aria-labelledby="collectionControlsMenuButton">
-      <ds-collection-dropdown
+      <ds-themed-collection-dropdown
         (selectionChange)="onSelect($event)">
-      </ds-collection-dropdown>
+      </ds-themed-collection-dropdown>
     </div>
   </div>
 </div>
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 5b9946e1a4..e2a90641e3 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
@@ -1,28 +1,47 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
 import { By } from '@angular/platform-browser';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of } from 'rxjs';
 
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { CommunityDataService } from '../../../core/data/community-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { Collection } from '../../../core/shared/collection.model';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { DSONameServiceMock } from '../../../shared/mocks/dso-name.service.mock';
+import {
+  mockSubmissionId,
+  mockSubmissionRestResponse,
+} from '../../../shared/mocks/submission.mock';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { mockSubmissionId, mockSubmissionRestResponse } from '../../../shared/mocks/submission.mock';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SectionsService } from '../../sections/sections.service';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormCollectionComponent } from './submission-form-collection.component';
-import { CommunityDataService } from '../../../core/data/community-data.service';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { SectionsService } from '../../sections/sections.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
 
 describe('SubmissionFormCollectionComponent Component', () => {
 
@@ -44,11 +63,11 @@ describe('SubmissionFormCollectionComponent Component', () => {
       {
         key: 'dc.title',
         language: 'en_US',
-        value: 'Community 1-Collection 1'
+        value: 'Community 1-Collection 1',
       }],
     _links: {
-      defaultAccessConditions: collectionId + '/defaultAccessConditions'
-    }
+      defaultAccessConditions: collectionId + '/defaultAccessConditions',
+    },
   });
 
   const mockCollectionList = [
@@ -56,71 +75,71 @@ describe('SubmissionFormCollectionComponent Component', () => {
       communities: [
         {
           id: '123456789-1',
-          name: 'Community 1'
-        }
+          name: 'Community 1',
+        },
       ],
       collection: {
         id: '1234567890-1',
-        name: 'Community 1-Collection 1'
-      }
+        name: 'Community 1-Collection 1',
+      },
     },
     {
       communities: [
         {
           id: '123456789-1',
-          name: 'Community 1'
-        }
+          name: 'Community 1',
+        },
       ],
       collection: {
         id: '1234567890-2',
-        name: 'Community 1-Collection 2'
-      }
+        name: 'Community 1-Collection 2',
+      },
     },
     {
       communities: [
         {
           id: '123456789-2',
-          name: 'Community 2'
-        }
+          name: 'Community 2',
+        },
       ],
       collection: {
         id: '1234567890-3',
-        name: 'Community 2-Collection 1'
-      }
+        name: 'Community 2-Collection 1',
+      },
     },
     {
       communities: [
         {
           id: '123456789-2',
-          name: 'Community 2'
-        }
+          name: 'Community 2',
+        },
       ],
       collection: {
         id: '1234567890-4',
-        name: 'Community 2-Collection 2'
-      }
-    }
+        name: 'Community 2-Collection 2',
+      },
+    },
   ];
 
   const communityDataService: any = jasmine.createSpyObj('communityDataService', {
-    findAll: jasmine.createSpy('findAll')
+    findAll: jasmine.createSpy('findAll'),
   });
 
   const collectionDataService: any = jasmine.createSpyObj('collectionDataService', {
     findById: jasmine.createSpy('findById'),
-    getAuthorizedCollectionByCommunity: jasmine.createSpy('getAuthorizedCollectionByCommunity')
+    getAuthorizedCollectionByCommunity: jasmine.createSpy('getAuthorizedCollectionByCommunity'),
   });
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
   const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
-    replace: jasmine.createSpy('replace')
+    replace: jasmine.createSpy('replace'),
   });
 
   const sectionsService: any = jasmine.createSpyObj('sectionsService', {
-    isSectionTypeAvailable: of(true)
+    isSectionTypeAvailable: of(true),
   });
 
   beforeEach(waitForAsync(() => {
@@ -129,13 +148,14 @@ describe('SubmissionFormCollectionComponent Component', () => {
         FormsModule,
         ReactiveFormsModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionFormCollectionComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
+        { provide: DSONameService, useValue: new DSONameServiceMock() },
         { provide: CollectionDataService, useValue: collectionDataService },
         { provide: SubmissionJsonPatchOperationsService, useClass: SubmissionJsonPatchOperationsServiceStub },
         { provide: SubmissionService, useClass: SubmissionServiceStub },
@@ -144,9 +164,9 @@ describe('SubmissionFormCollectionComponent Component', () => {
         { provide: Store, useValue: store },
         { provide: SectionsService, useValue: sectionsService },
         ChangeDetectorRef,
-        SubmissionFormCollectionComponent
+        SubmissionFormCollectionComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -249,6 +269,12 @@ describe('SubmissionFormCollectionComponent Component', () => {
         expect(dropDown).toBeFalsy();
       });
 
+      it('the dropdown button should be disabled when isReadonly is true', () => {
+        comp.isReadonly = true;
+        fixture.detectChanges();
+        expect(dropdowBtn.nativeNode.attributes.disabled).toBeDefined();
+      });
+
       it('should be simulated when the drop-down menu is closed', () => {
         spyOn(comp, 'onClose');
         comp.onClose();
@@ -272,7 +298,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
         expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
         expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
         expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
-          a: mockCollectionList[1].collection.name
+          a: mockCollectionList[1].collection.name,
         }));
       });
     });
@@ -283,7 +309,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/collection/submission-form-collection.component.ts b/src/app/submission/form/collection/submission-form-collection.component.ts
index f90814f185..89d9112284 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -7,28 +7,37 @@ import {
   OnInit,
   Output,
   SimpleChanges,
-  ViewChild
+  ViewChild,
 } from '@angular/core';
-
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
+import {
+  BehaviorSubject,
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
 import {
   find,
-  map, mergeMap
+  map,
+  mergeMap,
 } from 'rxjs/operators';
 
-import { Collection } from '../../../core/shared/collection.model';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionService } from '../../submission.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { CollectionDropdownComponent } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../../shared/empty.util';
 import { SectionsService } from '../../sections/sections.service';
-import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
 import { SectionsType } from '../../sections/sections-type';
+import { SubmissionService } from '../../submission.service';
 
 /**
  * This component allows to show the current collection the submission belonging to and to change it.
@@ -36,7 +45,7 @@ import { SectionsType } from '../../sections/sections-type';
 @Component({
   selector: 'ds-submission-form-collection',
   styleUrls: ['./submission-form-collection.component.scss'],
-  templateUrl: './submission-form-collection.component.html'
+  templateUrl: './submission-form-collection.component.html',
 })
 export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
 
@@ -52,12 +61,23 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   @Input() currentDefinition: string;
 
+  /**
+   * Checks if the collection can be modifiable by the user
+   * @type {booelan}
+   */
+  @Input() collectionModifiable: boolean | null = null;
+
   /**
    * The submission id
    * @type {string}
    */
   @Input() submissionId;
 
+  /**
+   * Flag to indicate if the submission dropdown is read only
+   */
+  @Input() isReadonly = false;
+
   /**
    * An event fired when a different collection is selected.
    * Event's payload equals to new SubmissionObject.
@@ -105,22 +125,14 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   available$: Observable<boolean>;
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {ChangeDetectorRef} cdr
-   * @param {CollectionDataService} collectionDataService
-   * @param {JsonPatchOperationsBuilder} operationsBuilder
-   * @param {SubmissionJsonPatchOperationsService} operationsService
-   * @param {SubmissionService} submissionService
-   * @param {SectionsService} sectionsService
-   */
   constructor(protected cdr: ChangeDetectorRef,
               private collectionDataService: CollectionDataService,
               private operationsBuilder: JsonPatchOperationsBuilder,
               private operationsService: SubmissionJsonPatchOperationsService,
               private submissionService: SubmissionService,
-              private sectionsService: SectionsService) {
+              private sectionsService: SectionsService,
+              public dsoNameService: DSONameService,
+  ) {
   }
 
   /**
@@ -133,7 +145,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
 
       this.selectedCollectionName$ = this.collectionDataService.findById(this.currentCollectionId).pipe(
         find((collectionRD: RemoteData<Collection>) => isNotEmpty(collectionRD.payload)),
-        map((collectionRD: RemoteData<Collection>) => collectionRD.payload.name)
+        map((collectionRD: RemoteData<Collection>) => this.dsoNameService.getName(collectionRD.payload)),
       );
     }
   }
@@ -167,20 +179,20 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
       this.submissionId,
       'sections',
       'collection').pipe(
-        mergeMap((submissionObject: SubmissionObject[]) => {
-          // retrieve the full submission object with embeds
-          return this.submissionService.retrieveSubmission(submissionObject[0].id).pipe(
-            getFirstSucceededRemoteDataPayload()
-          );
-        })
-      ).subscribe((submissionObject: SubmissionObject) => {
-        this.selectedCollectionId = event.collection.id;
-        this.selectedCollectionName$ = observableOf(event.collection.name);
-        this.collectionChange.emit(submissionObject);
-        this.submissionService.changeSubmissionCollection(this.submissionId, event.collection.id);
-        this.processingChange$.next(false);
-        this.cdr.detectChanges();
-      })
+      mergeMap((submissionObject: SubmissionObject[]) => {
+        // retrieve the full submission object with embeds
+        return this.submissionService.retrieveSubmission(submissionObject[0].id).pipe(
+          getFirstSucceededRemoteDataPayload(),
+        );
+      }),
+    ).subscribe((submissionObject: SubmissionObject) => {
+      this.selectedCollectionId = event.collection.id;
+      this.selectedCollectionName$ = observableOf(event.collection.name);
+      this.collectionChange.emit(submissionObject);
+      this.submissionService.changeSubmissionCollection(this.submissionId, event.collection.id);
+      this.processingChange$.next(false);
+      this.cdr.detectChanges();
+    }),
     );
   }
 
@@ -188,7 +200,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    * Reset search form control on dropdown menu close
    */
   onClose() {
-    this.collectionDropdown.reset();
+    this.collectionDropdown?.reset();
   }
 
   /**
@@ -199,7 +211,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
    */
   toggled(isOpen: boolean) {
     if (!isOpen) {
-      this.collectionDropdown.reset();
+      this.collectionDropdown?.reset();
     }
   }
 }
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..f1162cea4d 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.html
+++ b/src/app/submission/form/footer/submission-form-footer.component.html
@@ -11,10 +11,10 @@
     </button>
   </div>
   <div class="col text-right d-flex justify-content-end align-items-center">
-    <span *ngIf="!(hasUnsavedModification | async) && !(processingSaveStatus | async) && !(processingDepositStatus | async)">
+    <span *ngIf="(hasUnsavedModification | async) !== true && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
       <i class="fas fa-check-circle"></i> {{'submission.general.info.saved' | translate}}
     </span>
-    <span *ngIf="(hasUnsavedModification | async) && !(processingSaveStatus | async) && !(processingDepositStatus | async)">
+    <span *ngIf="(hasUnsavedModification | async) && (processingSaveStatus | async) !== true && (processingDepositStatus | async) !== true">
       <i class="fas fa-exclamation-circle"></i> {{'submission.general.info.pending-changes' | translate}}
     </span>
     <div *ngIf="(processingSaveStatus | async) || (processingDepositStatus | async)" class="col d-flex justify-content-end align-items-center">
@@ -28,12 +28,12 @@
               class="btn btn-secondary"
               id="save"
               [attr.data-test]="'save' | dsBrowserOnly"
-              [disabled]="(processingSaveStatus | async) || !(hasUnsavedModification | async)"
+              [disabled]="(processingSaveStatus | async) || (hasUnsavedModification | async) !== true"
               (click)="save($event)">
         <span><i class="fas fa-save"></i> {{'submission.general.save' | translate}}</span>
       </button>
       <button type="button"
-              [class.btn-primary]="!(showDepositAndDiscard | async)"
+              [class.btn-primary]="(showDepositAndDiscard | async) !== true"
               [class.btn-secondary]="(showDepositAndDiscard | async)"
               class="btn"
               id="saveForLater"
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..14270f2dea 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
@@ -1,21 +1,37 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, SimpleChange } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { TestScheduler } from 'rxjs/testing';
-import { of as observableOf } from 'rxjs';
-import { cold, getTestScheduler, hot } from 'jasmine-marbles';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
-import { SubmissionFormFooterComponent } from './submission-form-footer.component';
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
+import { mockSubmissionId } from '../../../shared/mocks/submission.mock';
 import { BrowserOnlyMockPipe } from '../../../shared/testing/browser-only-mock.pipe';
+import { SubmissionRestServiceStub } from '../../../shared/testing/submission-rest-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionFormFooterComponent } from './submission-form-footer.component';
 
 const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
 
@@ -33,7 +49,7 @@ describe('SubmissionFormFooterComponent', () => {
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionFormFooterComponent,
@@ -45,9 +61,9 @@ describe('SubmissionFormFooterComponent', () => {
         { provide: SubmissionRestService, useClass: SubmissionRestServiceStub },
         ChangeDetectorRef,
         NgbModal,
-        SubmissionFormFooterComponent
+        SubmissionFormFooterComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -98,17 +114,17 @@ describe('SubmissionFormFooterComponent', () => {
       beforeEach(() => {
         submissionServiceStub.getSubmissionStatus.and.returnValue(hot('-a-b', {
           a: false,
-          b: true
+          b: true,
         }));
 
         submissionServiceStub.getSubmissionSaveProcessingStatus.and.returnValue(hot('-a-b', {
           a: false,
-          b: true
+          b: true,
         }));
 
         submissionServiceStub.getSubmissionDepositProcessingStatus.and.returnValue(hot('-a-b', {
           a: false,
-          b: true
+          b: true,
         }));
       });
 
@@ -116,11 +132,11 @@ describe('SubmissionFormFooterComponent', () => {
 
         const expected = cold('-c-d', {
           c: true,
-          d: false
+          d: false,
         });
 
         comp.ngOnChanges({
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
 
         fixture.detectChanges();
@@ -132,11 +148,11 @@ describe('SubmissionFormFooterComponent', () => {
 
         const expected = cold('-c-d', {
           c: false,
-          d: true
+          d: true,
         });
 
         comp.ngOnChanges({
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
 
         fixture.detectChanges();
@@ -148,11 +164,11 @@ describe('SubmissionFormFooterComponent', () => {
 
         const expected = cold('-c-d', {
           c: false,
-          d: true
+          d: true,
         });
 
         comp.ngOnChanges({
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
 
         fixture.detectChanges();
@@ -249,7 +265,7 @@ describe('SubmissionFormFooterComponent', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index 7a11537616..1db4b606d7 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -1,13 +1,20 @@
-import { Component, Input, OnChanges, SimpleChanges } from '@angular/core';
-
-import { Observable, of as observableOf } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  Component,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import { map } from 'rxjs/operators';
 
 import { SubmissionRestService } from '../../../core/submission/submission-rest.service';
-import { SubmissionService } from '../../submission.service';
 import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
 import { isNotEmpty } from '../../../shared/empty.util';
+import { SubmissionService } from '../../submission.service';
 
 /**
  * This component represents submission form footer bar.
@@ -15,7 +22,7 @@ import { isNotEmpty } from '../../../shared/empty.util';
 @Component({
   selector: 'ds-submission-form-footer',
   styleUrls: ['./submission-form-footer.component.scss'],
-  templateUrl: './submission-form-footer.component.html'
+  templateUrl: './submission-form-footer.component.html',
 })
 export class SubmissionFormFooterComponent implements OnChanges {
 
@@ -72,7 +79,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
   ngOnChanges(changes: SimpleChanges) {
     if (isNotEmpty(this.submissionId)) {
       this.submissionIsInvalid = this.submissionService.getSubmissionStatus(this.submissionId).pipe(
-        map((isValid: boolean) => isValid === false)
+        map((isValid: boolean) => isValid === false),
       );
 
       this.processingSaveStatus = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
@@ -112,7 +119,7 @@ export class SubmissionFormFooterComponent implements OnChanges {
         if (result === 'ok') {
           this.submissionService.dispatchDiscard(this.submissionId);
         }
-      }
+      },
     );
   }
 }
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..0c7035c7f8 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,18 +3,20 @@
      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)"
+          [disabled]="(hasSections$ | async) !== true"
           [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"
        [ngClass]="{'w-100': (windowService.isXs() | async)}">
-    <button class="dropdown-item disabled" *ngIf="!(hasSections$ | async)">
+    <button class="dropdown-item disabled" *ngIf="(hasSections$ | async) !== true">
       {{ 'submission.sections.general.no-sections' | translate }}
     </button>
     <button class="dropdown-item" *ngFor="let listItem of (sectionList$ | async)" (click)="addSection(listItem.id)">
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts b/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts
index 971b15d7b0..fe59c06357 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.spec.ts
@@ -1,21 +1,35 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA, DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+  DebugElement,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateModule } from '@ngx-translate/core';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
+import { HostWindowService } from '../../../shared/host-window.service';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
+import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
 import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SectionsService } from '../../sections/sections.service';
 import { SubmissionService } from '../../submission.service';
 import { SubmissionFormSectionAddComponent } from './submission-form-section-add.component';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SectionsService } from '../../sections/sections.service';
-import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
 
 const mockAvailableSections: any = [
   {
@@ -25,7 +39,7 @@ const mockAvailableSections: any = [
     errors: [],
     header: 'submit.progressbar.describe.newsectionone',
     id: 'newsectionone',
-    sectionType: 'submission-form'
+    sectionType: 'submission-form',
   },
   {
     config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/newsectiontwo',
@@ -34,8 +48,8 @@ const mockAvailableSections: any = [
     errors: [],
     header: 'submit.progressbar.describe.newsectiontwo',
     id: 'newsectiontwo',
-    sectionType: 'submission-form'
-  }
+    sectionType: 'submission-form',
+  },
 ];
 
 describe('SubmissionFormSectionAddComponent Component', () => {
@@ -50,7 +64,7 @@ describe('SubmissionFormSectionAddComponent Component', () => {
   const submissionServiceStub: SubmissionServiceStub = new SubmissionServiceStub();
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   const window = new HostWindowServiceStub(800);
@@ -59,11 +73,11 @@ describe('SubmissionFormSectionAddComponent Component', () => {
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionFormSectionAddComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: HostWindowService, useValue: window },
@@ -71,9 +85,9 @@ describe('SubmissionFormSectionAddComponent Component', () => {
         { provide: SectionsService, useClass: SectionsServiceStub },
         { provide: Store, useValue: store },
         ChangeDetectorRef,
-        SubmissionFormSectionAddComponent
+        SubmissionFormSectionAddComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -96,6 +110,7 @@ describe('SubmissionFormSectionAddComponent Component', () => {
 
     afterEach(() => {
       testFixture.destroy();
+      testFixture.debugElement.nativeElement.remove();
     });
 
     it('should create SubmissionFormSectionAddComponent', inject([SubmissionFormSectionAddComponent], (app: SubmissionFormSectionAddComponent) => {
@@ -163,7 +178,7 @@ describe('SubmissionFormSectionAddComponent Component', () => {
 
       it('should have dropdown menu closed', () => {
 
-        expect(dropdowBtn).not.toBeUndefined();
+        expect(dropdowBtn).not.toBeNull();
         expect(dropdownMenu.nativeElement.classList).not.toContain('show');
 
       });
@@ -207,7 +222,7 @@ describe('SubmissionFormSectionAddComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.ts b/src/app/submission/form/section-add/submission-form-section-add.component.ts
index 1a758961d6..60452aa51b 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.ts
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.ts
@@ -1,12 +1,15 @@
-import { Component, Input, OnInit, } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
-import { SectionsService } from '../../sections/sections.service';
 import { HostWindowService } from '../../../shared/host-window.service';
-import { SubmissionService } from '../../submission.service';
 import { SectionDataObject } from '../../sections/models/section-data.model';
+import { SectionsService } from '../../sections/sections.service';
+import { SubmissionService } from '../../submission.service';
 
 /**
  * This component allow to add any new section to submission form
@@ -14,7 +17,7 @@ import { SectionDataObject } from '../../sections/models/section-data.model';
 @Component({
   selector: 'ds-submission-form-section-add',
   styleUrls: [ './submission-form-section-add.component.scss' ],
-  templateUrl: './submission-form-section-add.component.html'
+  templateUrl: './submission-form-section-add.component.html',
 })
 export class SubmissionFormSectionAddComponent implements OnInit {
 
@@ -60,7 +63,7 @@ export class SubmissionFormSectionAddComponent implements OnInit {
   ngOnInit() {
     this.sectionList$ = this.submissionService.getDisabledSectionsList(this.submissionId);
     this.hasSections$ = this.sectionList$.pipe(
-      map((list: SectionDataObject[]) => list.length > 0)
+      map((list: SectionDataObject[]) => list.length > 0),
     );
   }
 
diff --git a/src/app/submission/form/submission-form.component.html b/src/app/submission/form/submission-form.component.html
index a80fe35f4e..84767c8c6f 100644
--- a/src/app/submission/form/submission-form.component.html
+++ b/src/app/submission/form/submission-form.component.html
@@ -1,5 +1,5 @@
 <div class="container-fluid">
-    <div *ngIf="!(isLoading() | async)" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
+    <div *ngIf="(isLoading() | async) !== true" class="submission-form-header mb-3 d-flex flex-wrap position-sticky">
         <div *ngIf="(uploadEnabled$ | async)" class="w-100">
             <ds-submission-upload-files [submissionId]="submissionId"
                                         [collectionId]="collectionId"
@@ -8,11 +8,16 @@
         </div>
 
         <div class="submission-form-header-item mb-3 mb-sm-0 flex-sm-grow-1 flex-md-grow-0">
-            <ds-submission-form-collection [currentCollectionId]="collectionId"
+          <ng-container *ngIf="!isSectionHidden">
+            <ds-submission-form-collection
+            [currentCollectionId]="collectionId"
                                            [currentDefinition]="definitionId"
                                            [submissionId]="submissionId"
+                                           [collectionModifiable]="collectionModifiable"
+                                           [isReadonly]="isSectionReadonly"
                                            (collectionChange)="onCollectionChange($event)">
             </ds-submission-form-collection>
+          </ng-container>
         </div>
         <div class="submission-form-header-item text-right">
             <ds-submission-form-section-add [collectionId]="collectionId"
@@ -26,10 +31,12 @@
         <ng-container *ngFor="let object of (submissionSections | async)">
             <ds-submission-section-container [collectionId]="collectionId"
                                              [submissionId]="submissionId"
-                                             [sectionData]="object"></ds-submission-section-container>
+                                             [sectionData]="object">
+            </ds-submission-section-container>
         </ng-container>
     </div>
-    <div *ngIf="!(isLoading() | async)" class="submission-form-footer mt-3 mb-3 position-sticky">
+    <div *ngIf="(isLoading() | async) !== true" class="submission-form-footer mt-3 mb-3 position-sticky">
         <ds-submission-form-footer [submissionId]="submissionId"></ds-submission-form-footer>
     </div>
 </div>
+
diff --git a/src/app/submission/form/submission-form.component.spec.ts b/src/app/submission/form/submission-form.component.spec.ts
index bd504e09c1..94001f14fa 100644
--- a/src/app/submission/form/submission-form.component.spec.ts
+++ b/src/app/submission/form/submission-form.component.spec.ts
@@ -1,10 +1,25 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
-import { cold, getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { AuthService } from '../../core/auth/auth.service';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { Item } from '../../core/shared/item.model';
 import {
   mockSectionsData,
   mockSectionsList,
@@ -13,18 +28,16 @@ import {
   mockSubmissionId,
   mockSubmissionObjectNew,
   mockSubmissionSelfUrl,
-  mockSubmissionState
+  mockSubmissionState,
 } from '../../shared/mocks/submission.mock';
+import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../shared/testing/utils.test';
+import { SectionsService } from '../sections/sections.service';
+import { VisibilityType } from '../sections/visibility-type';
 import { SubmissionService } from '../submission.service';
 import { SubmissionFormComponent } from './submission-form.component';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { AuthServiceStub } from '../../shared/testing/auth-service.stub';
-import { AuthService } from '../../core/auth/auth.service';
-import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service.stub';
-import { createTestComponent } from '../../shared/testing/utils.test';
-import { Item } from '../../core/shared/item.model';
-import { TestScheduler } from 'rxjs/testing';
-import { SectionsService } from '../sections/sections.service';
 
 describe('SubmissionFormComponent Component', () => {
 
@@ -49,7 +62,7 @@ describe('SubmissionFormComponent Component', () => {
       imports: [],
       declarations: [
         SubmissionFormComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: AuthService, useClass: AuthServiceStub },
@@ -57,9 +70,9 @@ describe('SubmissionFormComponent Component', () => {
         { provide: SubmissionService, useValue: submissionServiceStub },
         { provide: SectionsService, useValue: { isSectionTypeAvailable: () => observableOf(true) } },
         ChangeDetectorRef,
-        SubmissionFormComponent
+        SubmissionFormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -136,7 +149,7 @@ describe('SubmissionFormComponent Component', () => {
       scheduler.schedule(() => {
         comp.ngOnChanges({
           collectionId: new SimpleChange(null, collectionId, true),
-          submissionId: new SimpleChange(null, submissionId, true)
+          submissionId: new SimpleChange(null, submissionId, true),
         });
         fixture.detectChanges();
       });
@@ -156,6 +169,32 @@ describe('SubmissionFormComponent Component', () => {
       done();
     });
 
+    it('should return the visibility object of the collection section', () => {
+      comp.submissionDefinition = submissionDefinition;
+      fixture.detectChanges();
+      const result = compAsAny.getCollectionVisibility();
+      expect(result).toEqual({
+        main: VisibilityType.HIDDEN,
+        other: VisibilityType.HIDDEN,
+      });
+    });
+
+    it('should return true if collection section visibility is hidden', () => {
+      comp.submissionDefinition = submissionDefinition;
+      fixture.detectChanges();
+      expect(comp.isSectionHidden).toBe(true);
+    });
+
+    it('should return false for isSectionReadonly when collection section visibility is not READONLY', () => {
+      const visibility = {
+        main: VisibilityType.READONLY,
+        other: VisibilityType.READONLY,
+      };
+      comp.submissionDefinition = Object.assign({}, submissionDefinition, { visibility: visibility });
+      fixture.detectChanges();
+      expect(comp.isSectionReadonly).toBe(false);
+    });
+
     it('should update properly on collection change', (done) => {
       comp.collectionId = collectionId;
       comp.submissionId = submissionId;
@@ -198,11 +237,11 @@ describe('SubmissionFormComponent Component', () => {
       scheduler.schedule(() => {
         comp.onCollectionChange({
           collection: {
-            id: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb'
+            id: '45f2f3f1-ba1f-4f36-908a-3f1ea9a557eb',
           },
           submissionDefinition: {
-            name: 'traditional'
-          }
+            name: 'traditional',
+          },
         } as any);
         fixture.detectChanges();
       });
@@ -219,7 +258,7 @@ describe('SubmissionFormComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index 6c17be0c71..d697b64f9d 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -1,23 +1,48 @@
-import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  SimpleChanges,
+} from '@angular/core';
+import isEqual from 'lodash/isEqual';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, map, switchMap } from 'rxjs/operators';
 import { AuthService } from '../../core/auth/auth.service';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
 import { Collection } from '../../core/shared/collection.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { Item } from '../../core/shared/item.model';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { UploaderOptions } from '../../shared/upload/uploader/uploader-options.model';
+import { SubmissionError } from '../objects/submission-error.model';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
 import { SectionDataObject } from '../sections/models/section-data.model';
-import { SubmissionService } from '../submission.service';
-import { Item } from '../../core/shared/item.model';
-import { SectionsType } from '../sections/sections-type';
 import { SectionsService } from '../sections/sections.service';
-import { SubmissionError } from '../objects/submission-error.model';
+import { SectionsType } from '../sections/sections-type';
+import { VisibilityType } from '../sections/visibility-type';
+import { SubmissionService } from '../submission.service';
+import {
+  SubmissionSectionModel,
+  SubmissionSectionVisibility,
+} from './../../core/config/models/config-submission-section.model';
 
 /**
  * This component represents the submission form.
@@ -34,8 +59,16 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
    * @type {string}
    */
   @Input() collectionId: string;
+
   @Input() item: Item;
 
+  /**
+   * Checks if the collection can be modifiable by the user
+   * @type {booelan}
+   */
+  @Input() collectionModifiable: boolean | null = null;
+
+
   /**
    * The list of submission's sections
    * @type {WorkspaceitemSectionsObject}
@@ -172,7 +205,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
               this.item,
               this.submissionErrors);
             this.changeDetectorRef.detectChanges();
-          })
+          }),
       );
 
       // start auto save
@@ -180,6 +213,42 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
     }
   }
 
+  /**
+   *  Returns the visibility object of the collection section
+   */
+  private getCollectionVisibility(): SubmissionSectionVisibility {
+    const submissionSectionModel: SubmissionSectionModel =
+      this.submissionDefinition.sections.page.find(
+        (section) => isEqual(section.sectionType, SectionsType.Collection),
+      );
+
+    return isNotUndefined(submissionSectionModel.visibility) ? submissionSectionModel.visibility : null;
+  }
+
+  /**
+   * Getter to see if the collection section visibility is hidden
+   */
+  get isSectionHidden(): boolean {
+    const visibility = this.getCollectionVisibility();
+    return (
+      hasValue(visibility) &&
+      isEqual(visibility.main, VisibilityType.HIDDEN) &&
+      isEqual(visibility.other, VisibilityType.HIDDEN)
+    );
+  }
+
+  /**
+   * Getter to see if the collection section visibility is readonly
+   */
+  get isSectionReadonly(): boolean {
+    const visibility = this.getCollectionVisibility();
+    return (
+      hasValue(visibility) &&
+      isEqual(visibility.main, VisibilityType.READONLY) &&
+      isEqual(visibility.other, VisibilityType.READONLY)
+    );
+  }
+
   /**
    * Unsubscribe from all subscriptions, destroy instance variables
    * and reset submission state
@@ -231,6 +300,8 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
   protected getSectionsList(): Observable<any> {
     return this.submissionService.getSubmissionSections(this.submissionId).pipe(
       filter((sections: SectionDataObject[]) => isNotEmpty(sections)),
-      map((sections: SectionDataObject[]) => sections));
+      map((sections: SectionDataObject[]) =>
+        sections.filter((section: SectionDataObject) => !isEqual(section.sectionType,SectionsType.Collection))),
+    );
   }
 }
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
index bcdd01d5a1..28f6803c48 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.spec.ts
@@ -1,11 +1,26 @@
-import { ChangeDetectorRef, Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Store } from '@ngrx/store';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import {
   mockSectionsData,
   mockSubmissionCollectionId,
@@ -13,22 +28,20 @@ import {
   mockSubmissionObject,
   mockUploadResponse1ParsedErrors,
   mockUploadResponse2Errors,
-  mockUploadResponse2ParsedErrors
+  mockUploadResponse2ParsedErrors,
 } from '../../../shared/mocks/submission.mock';
-import { SubmissionService } from '../../submission.service';
-
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SectionsService } from '../../sections/sections.service';
-import { SubmissionUploadFilesComponent } from './submission-upload-files.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { cold, hot } from 'jasmine-marbles';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { SharedModule } from '../../../shared/shared.module';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../shared/testing/utils.test';
-import { UploaderOptions } from '../../../shared/uploader/uploader-options.model';
+import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
+import { SectionsService } from '../../sections/sections.service';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionUploadFilesComponent } from './submission-upload-files.component';
 
 describe('SubmissionUploadFilesComponent Component', () => {
 
@@ -47,18 +60,18 @@ describe('SubmissionUploadFilesComponent Component', () => {
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
         SharedModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionUploadFilesComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
@@ -68,9 +81,9 @@ describe('SubmissionUploadFilesComponent Component', () => {
         { provide: SubmissionJsonPatchOperationsService, useValue: submissionJsonPatchOperationsServiceStub },
         { provide: Store, useValue: store },
         ChangeDetectorRef,
-        SubmissionUploadFilesComponent
+        SubmissionUploadFilesComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -116,7 +129,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
         url: '',
         authToken: null,
         disableMultipart: false,
-        itemAlias: null
+        itemAlias: null,
       });
 
     });
@@ -134,12 +147,12 @@ describe('SubmissionUploadFilesComponent Component', () => {
     it('should init uploadEnabled properly', () => {
       sectionsServiceStub.isSectionTypeAvailable.and.returnValue(hot('-a-b', {
         a: false,
-        b: true
+        b: true,
       }));
 
       const expected = cold('-c-d', {
         c: false,
-        d: true
+        d: true,
       });
 
       comp.ngOnChanges();
@@ -165,8 +178,8 @@ describe('SubmissionUploadFilesComponent Component', () => {
             submissionId,
             sectionId,
             mockSectionsData[sectionId],
-          expectedErrors[sectionId],
-            expectedErrors[sectionId]
+            expectedErrors[sectionId],
+            expectedErrors[sectionId],
           );
         });
 
@@ -181,7 +194,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
 
         comp.onCompleteItem(Object.assign({}, uploadRestResponse, {
           sections: mockSectionsData,
-          errors: responseErrors.errors
+          errors: responseErrors.errors,
         }));
 
         Object.keys(mockSectionsData).forEach((sectionId) => {
@@ -189,8 +202,8 @@ describe('SubmissionUploadFilesComponent Component', () => {
             submissionId,
             sectionId,
             mockSectionsData[sectionId],
-          expectedErrors[sectionId],
-            expectedErrors[sectionId]
+            expectedErrors[sectionId],
+            expectedErrors[sectionId],
           );
         });
 
@@ -204,7 +217,7 @@ describe('SubmissionUploadFilesComponent Component', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
@@ -214,7 +227,7 @@ class TestComponent {
     url: '',
     authToken: null,
     disableMultipart: false,
-    itemAlias: null
+    itemAlias: null,
   });
 
 }
diff --git a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
index a56b371456..630356b1f8 100644
--- a/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
+++ b/src/app/submission/form/submission-upload-files/submission-upload-files.component.ts
@@ -1,19 +1,33 @@
-import { Component, Input, OnChanges } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnChanges,
+} from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { first, take } from 'rxjs/operators';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  first,
+  take,
+} from 'rxjs/operators';
 
-import { SectionsService } from '../../sections/sections.service';
-import { hasValue, isEmpty, isNotEmpty } from '../../../shared/empty.util';
-import { normalizeSectionData } from '../../../core/submission/submission-response-parsing.service';
-import { SubmissionService } from '../../submission.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { UploaderOptions } from '../../../shared/uploader/uploader-options.model';
-import parseSectionErrors from '../../utils/parseSectionErrors';
-import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { normalizeSectionData } from '../../../core/submission/submission-response-parsing.service';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { UploaderOptions } from '../../../shared/upload/uploader/uploader-options.model';
+import { SectionsService } from '../../sections/sections.service';
 import { SectionsType } from '../../sections/sections-type';
+import { SubmissionService } from '../../submission.service';
+import parseSectionErrors from '../../utils/parseSectionErrors';
 
 /**
  * This component represents the drop zone that provides to add files to the submission.
@@ -132,23 +146,23 @@ export class SubmissionUploadFilesComponent implements OnChanges {
                   const sectionData = normalizeSectionData(sections[sectionId]);
                   const sectionErrors = errorsList[sectionId];
                   this.sectionService.isSectionType(this.submissionId, sectionId, SectionsType.Upload)
-                      .pipe(take(1))
-                      .subscribe((isUpload) => {
-                        if (isUpload) {
-                          // Look for errors on upload
-                          if ((isEmpty(sectionErrors))) {
-                            this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
-                          } else {
-                            this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
-                          }
+                    .pipe(take(1))
+                    .subscribe((isUpload) => {
+                      if (isUpload) {
+                        // Look for errors on upload
+                        if ((isEmpty(sectionErrors))) {
+                          this.notificationsService.success(null, this.translate.get('submission.sections.upload.upload-successful'));
+                        } else {
+                          this.notificationsService.error(null, this.translate.get('submission.sections.upload.upload-failed'));
                         }
-                      });
+                      }
+                    });
                   this.sectionService.updateSectionData(this.submissionId, sectionId, sectionData, sectionErrors, sectionErrors);
                 });
             }
 
           }
-        })
+        }),
     );
   }
 
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
index 29c99732c3..58697b09f3 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.html
@@ -6,11 +6,10 @@
   </div>
   <div class="modal-body">
     <ds-themed-loading *ngIf="isLoading()"></ds-themed-loading>
-    <ds-collection-dropdown [ngClass]="{'d-none': isLoading()}"
+    <ds-themed-collection-dropdown [ngClass]="{'d-none': isLoading()}"
                             (selectionChange)="selectObject($event)"
                             (searchComplete)="searchComplete()"
-                            (theOnlySelectable)="theOnlySelectable($event)"
                             [entityType]="entityType">
-    </ds-collection-dropdown>
+    </ds-themed-collection-dropdown>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
index 4f3c54b642..0ad28959ed 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.spec.ts
@@ -1,11 +1,21 @@
-import { Component, EventEmitter, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SubmissionImportExternalCollectionComponent } from './submission-import-external-collection.component';
-import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { By } from '@angular/platform-browser';
 
 describe('SubmissionImportExternalCollectionComponent test suite', () => {
   let comp: SubmissionImportExternalCollectionComponent;
@@ -23,9 +33,9 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       ],
       providers: [
         NgbActiveModal,
-        SubmissionImportExternalCollectionComponent
+        SubmissionImportExternalCollectionComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -64,21 +74,22 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       compAsAny = null;
     });
 
-    it('should emit from selectedEvent on selectObject', () => {
+    it('should emit from selectedEvent on selectObject and set loading to true', () => {
       spyOn(comp.selectedEvent, 'emit').and.callThrough();
 
       const entry = {
         communities: [
           { id: 'community1' },
-          { id: 'community2' }
+          { id: 'community2' },
         ],
         collection: {
-          id: 'collection'
-        }
+          id: 'collection',
+        },
       } as CollectionListEntry;
       comp.selectObject(entry);
 
       expect(comp.selectedEvent.emit).toHaveBeenCalledWith(entry);
+      expect(comp.loading).toBeTrue();
     });
 
     it('should dismiss modal on closeCollectionModal', () => {
@@ -122,7 +133,7 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
       fixture.detectChanges();
 
       fixture.whenStable().then(() => {
-        const dropdownMenu = fixture.debugElement.query(By.css('ds-collection-dropdown')).nativeElement;
+        const dropdownMenu = fixture.debugElement.query(By.css('ds-themed-collection-dropdown')).nativeElement;
         expect(dropdownMenu.classList).toContain('d-none');
       });
     }));
@@ -133,7 +144,7 @@ describe('SubmissionImportExternalCollectionComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
index 5fb4e5d406..0642d4156b 100644
--- a/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
+++ b/src/app/submission/import-external/import-external-collection/submission-import-external-collection.component.ts
@@ -1,14 +1,19 @@
-import { Component, EventEmitter, Output } from '@angular/core';
-import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import {
+  Component,
+  EventEmitter,
+  Output,
+} from '@angular/core';
 import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+
 /**
  * Wrap component for 'ds-collection-dropdown'.
  */
 @Component({
   selector: 'ds-submission-import-external-collection',
   styleUrls: ['./submission-import-external-collection.component.scss'],
-  templateUrl: './submission-import-external-collection.component.html'
+  templateUrl: './submission-import-external-collection.component.html',
 })
 export class SubmissionImportExternalCollectionComponent {
   /**
@@ -31,13 +36,14 @@ export class SubmissionImportExternalCollectionComponent {
    * @param {NgbActiveModal} activeModal
    */
   constructor(
-    private activeModal: NgbActiveModal
+    private activeModal: NgbActiveModal,
   ) { }
 
   /**
    * This method emits the selected Collection from the 'selectedEvent' variable.
    */
   public selectObject(object: CollectionListEntry): void {
+    this.loading = true;
     this.selectedEvent.emit(object);
   }
 
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..210ae9cf27 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
@@ -1,24 +1,34 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { Router } from '@angular/router';
-
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TestScheduler } from 'rxjs/testing';
-import { of as observableOf } from 'rxjs';
 import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionImportExternalPreviewComponent } from './submission-import-external-preview.component';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { RouterStub } from '../../../shared/testing/router.stub';
-import { SubmissionService } from '../../submission.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
 import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model';
 import { Metadata } from '../../../core/shared/metadata.utils';
-import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
 import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
+import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
+import { SubmissionImportExternalPreviewComponent } from './submission-import-external-preview.component';
 
 const externalEntry = Object.assign(new ExternalSourceEntry(), {
   id: '0001-0001-0001-0001',
@@ -27,11 +37,11 @@ const externalEntry = Object.assign(new ExternalSourceEntry(), {
   metadata: {
     'dc.identifier.uri': [
       {
-        value: 'https://orcid.org/0001-0001-0001-0001'
-      }
-    ]
+        value: 'https://orcid.org/0001-0001-0001-0001',
+      },
+    ],
   },
-  _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } }
+  _links: { self: { href: 'http://test-rest.com/server/api/integration/externalSources/orcidV2/entryValues/0000-0003-4851-8004' } },
 });
 
 describe('SubmissionImportExternalPreviewComponent test suite', () => {
@@ -48,11 +58,11 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
     scheduler = getTestScheduler();
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionImportExternalPreviewComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: Router, useValue: new RouterStub() },
@@ -60,9 +70,9 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
         { provide: NotificationsService, useValue: new NotificationsServiceStub() },
         { provide: NgbModal, useValue: ngbModal },
         { provide: NgbActiveModal, useValue: ngbActiveModal },
-        SubmissionImportExternalPreviewComponent
+        SubmissionImportExternalPreviewComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -105,7 +115,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', value: Metadata.first(comp.externalSourceEntry.metadata, 'dc.identifier.uri') },
       ];
       fixture.detectChanges();
 
@@ -126,23 +136,23 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
             id: 'dummy',
             uuid: 'dummy',
             name: 'dummy',
-          }
+          },
         ],
         collection: {
           id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
           uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
           name: 'Collection 1',
-        }
+        },
       };
       const submissionObjects = [
-        { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' }
+        { id: 'jk11k13o-9v4z-632i-sr88-wq071n0h1d47' },
       ];
       comp.externalSourceEntry = externalEntry;
       ngbModal.open.and.returnValue({
         componentInstance: { selectedEvent: observableOf(emittedEvent) },
         close: () => {
           return;
-        }
+        },
       });
       spyOn(comp, 'closeMetadataModal');
       submissionServiceStub.createSubmissionFromExternalSource.and.returnValue(observableOf(submissionObjects));
@@ -162,7 +172,7 @@ describe('SubmissionImportExternalPreviewComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
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..279e087093 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
@@ -1,14 +1,23 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-import { NgbActiveModal, NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbActiveModal,
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import { mergeMap } from 'rxjs/operators';
+
 import { ExternalSourceEntry } from '../../../core/shared/external-source-entry.model';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { Metadata } from '../../../core/shared/metadata.utils';
-import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
-import { mergeMap } from 'rxjs/operators';
-import { SubmissionService } from '../../submission.service';
 import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { CollectionListEntry } from '../../../shared/collection-dropdown/collection-dropdown.component';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { SubmissionService } from '../../submission.service';
 import { SubmissionImportExternalCollectionComponent } from '../import-external-collection/submission-import-external-collection.component';
 
 /**
@@ -17,7 +26,7 @@ import { SubmissionImportExternalCollectionComponent } from '../import-external-
 @Component({
   selector: 'ds-submission-import-external-preview',
   styleUrls: ['./submission-import-external-preview.component.scss'],
-  templateUrl: './submission-import-external-preview.component.html'
+  templateUrl: './submission-import-external-preview.component.html',
 })
 export class SubmissionImportExternalPreviewComponent implements OnInit {
   /**
@@ -50,7 +59,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     private submissionService: SubmissionService,
     private modalService: NgbModal,
     private router: Router,
-    private notificationService: NotificationsService
+    private notificationService: NotificationsService,
   ) { }
 
   /**
@@ -62,7 +71,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     metadataKeys.forEach((key) => {
       this.metadataList.push({
         key: key,
-        value: Metadata.first(this.externalSourceEntry.metadata, key)
+        value: Metadata.first(this.externalSourceEntry.metadata, key),
       });
     });
   }
@@ -87,7 +96,7 @@ export class SubmissionImportExternalPreviewComponent implements OnInit {
     this.modalRef.componentInstance.selectedEvent.pipe(
       mergeMap((collectionListEntry: CollectionListEntry) => {
         return this.submissionService.createSubmissionFromExternalSource(this.externalSourceEntry._links.self.href, collectionListEntry.collection.id);
-      })
+      }),
     ).subscribe((submissionObjects: SubmissionObject[]) => {
       let isValid = false;
       if (submissionObjects.length === 1) {
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..7b5a2004d7 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) !== true" 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) !== true}" 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):''" [disabled]="searchString === ''" (click)="search()">{{'submission.import-external.search.button' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
index e1f59c3a5e..7715835c64 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.spec.ts
@@ -1,29 +1,42 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { TranslateModule } from '@ngx-translate/core';
-import { of as observableOf } from 'rxjs';
 import {
-  SourceElement,
-  SubmissionImportExternalSearchbarComponent
-} from './submission-import-external-searchbar.component';
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RequestParam } from '../../../core/cache/models/request-param.model';
 import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
-import { createTestComponent } from '../../../shared/testing/utils.test';
+import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { ExternalSource } from '../../../core/shared/external-source.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { HostWindowService } from '../../../shared/host-window.service';
 import {
   externalSourceCiencia,
   externalSourceMyStaffDb,
   externalSourceOrcid,
-  getMockExternalSourceService
+  getMockExternalSourceService,
 } from '../../../shared/mocks/external-source.service.mock';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
 import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { ExternalSource } from '../../../core/shared/external-source.model';
-import { HostWindowService } from '../../../shared/host-window.service';
 import { HostWindowServiceStub } from '../../../shared/testing/host-window-service.stub';
-import { getTestScheduler } from 'jasmine-marbles';
-import { TestScheduler } from 'rxjs/testing';
-import { RequestParam } from '../../../core/cache/models/request-param.model';
-import { FindListOptions } from '../../../core/data/find-list-options.model';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import {
+  SourceElement,
+  SubmissionImportExternalSearchbarComponent,
+} from './submission-import-external-searchbar.component';
 
 describe('SubmissionImportExternalSearchbarComponent test suite', () => {
   let comp: SubmissionImportExternalSearchbarComponent;
@@ -51,9 +64,9 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
         { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
         ChangeDetectorRef,
         { provide: HostWindowService, useValue: new HostWindowServiceStub(800) },
-        SubmissionImportExternalSearchbarComponent
+        SubmissionImportExternalSearchbarComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -91,9 +104,9 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
       paginatedListRD = createSuccessfulRemoteDataObject(paginatedList);
       compAsAny.externalService.searchBy.and.returnValue(observableOf(paginatedListRD));
       sourceList = [
-        {id: 'orcid', name: 'orcid'},
-        {id: 'ciencia', name: 'ciencia'},
-        {id: 'my_staff_db', name: 'my_staff_db'},
+        { id: 'orcid', name: 'orcid' },
+        { id: 'ciencia', name: 'ciencia' },
+        { id: 'my_staff_db', name: 'my_staff_db' },
       ];
     });
 
@@ -124,7 +137,7 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
     });
 
     it('Variable \'selectedElement\' should be assigned', () => {
-      const selectedElement = {id: 'orcid', name: 'orcid'};
+      const selectedElement = { id: 'orcid', name: 'orcid' };
       comp.makeSourceSelection(selectedElement);
       expect(comp.selectedElement).toEqual(selectedElement);
     });
@@ -136,14 +149,14 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
         elementsPerPage: 3,
         totalElements: 6,
         totalPages: 2,
-        currentPage: 0
+        currentPage: 0,
       });
       compAsAny.findListOptions = Object.assign({}, new FindListOptions(), {
         elementsPerPage: 3,
         currentPage: 0,
         searchParams: [
-          new RequestParam('entityType', 'Publication')
-        ]
+          new RequestParam('entityType', 'Publication'),
+        ],
       });
       comp.sourceList = sourceList;
       const expected = sourceList.concat(sourceList);
@@ -170,7 +183,7 @@ describe('SubmissionImportExternalSearchbarComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
   initExternalSourceData = { entity: 'Publication', query: 'dummy', sourceId: 'ciencia' };
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
index 522d71cc22..a3fd396dc2 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.ts
@@ -1,19 +1,39 @@
-import { ChangeDetectorRef, Component, EventEmitter, Input, OnDestroy, OnInit, Output } from '@angular/core';
-
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  EventEmitter,
+  Input,
+  OnDestroy,
+  OnInit,
+  Output,
+} from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  catchError,
+  tap,
+} from 'rxjs/operators';
 
 import { RequestParam } from '../../../core/cache/models/request-param.model';
 import { ExternalSourceDataService } from '../../../core/data/external-source-data.service';
-import { ExternalSource } from '../../../core/shared/external-source.model';
-import { buildPaginatedList, PaginatedList } from '../../../core/data/paginated-list.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { PageInfo } from '../../../core/shared/page-info.model';
-import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
-import { getFirstSucceededRemoteData, getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
-import { HostWindowService } from '../../../shared/host-window.service';
-import { hasValue } from '../../../shared/empty.util';
 import { FindListOptions } from '../../../core/data/find-list-options.model';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../../core/data/paginated-list.model';
+import { RemoteData } from '../../../core/data/remote-data';
+import { ExternalSource } from '../../../core/shared/external-source.model';
+import {
+  getFirstSucceededRemoteData,
+  getFirstSucceededRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { hasValue } from '../../../shared/empty.util';
+import { HostWindowService } from '../../../shared/host-window.service';
+import { createSuccessfulRemoteDataObject } from '../../../shared/remote-data.utils';
 
 /**
  * Interface for the selected external source element.
@@ -38,7 +58,7 @@ export interface ExternalSourceData {
 @Component({
   selector: 'ds-submission-import-external-searchbar',
   styleUrls: ['./submission-import-external-searchbar.component.scss'],
-  templateUrl: './submission-import-external-searchbar.component.html'
+  templateUrl: './submission-import-external-searchbar.component.html',
 })
 export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDestroy {
   /**
@@ -93,7 +113,7 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
   constructor(
     private externalService: ExternalSourceDataService,
     private cdr: ChangeDetectorRef,
-    protected windowService: HostWindowService
+    protected windowService: HostWindowService,
   ) {
   }
 
@@ -103,7 +123,7 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
   ngOnInit() {
     this.selectedElement = {
       id: '',
-      name: 'loading'
+      name: 'loading',
     };
     this.searchString = '';
     this.sourceList = [];
@@ -111,8 +131,8 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
       elementsPerPage: 5,
       currentPage: 1,
       searchParams: [
-        new RequestParam('entityType', this.initExternalSourceData.entity)
-      ]
+        new RequestParam('entityType', this.initExternalSourceData.entity),
+      ],
     });
     this.externalService.searchBy('findByEntityType', this.findListOptions).pipe(
       catchError(() => {
@@ -156,8 +176,8 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
         elementsPerPage: 5,
         currentPage: this.findListOptions.currentPage + 1,
         searchParams: [
-          new RequestParam('entityType', this.initExternalSourceData.entity)
-        ]
+          new RequestParam('entityType', this.initExternalSourceData.entity),
+        ],
       });
       this.externalService.searchBy('findByEntityType', this.findListOptions).pipe(
         catchError(() => {
@@ -167,7 +187,7 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
           return observableOf(paginatedListRD);
         }),
         getFirstSucceededRemoteData(),
-        tap(() => this.sourceListLoading = false)
+        tap(() => this.sourceListLoading = false),
       ).subscribe((externalSource: RemoteData<PaginatedList<ExternalSource>>) => {
         externalSource.payload.page.forEach((element) => {
           this.sourceList.push({ id: element.id, name: element.name });
@@ -186,8 +206,8 @@ export class SubmissionImportExternalSearchbarComponent implements OnInit, OnDes
       {
         entity: this.initExternalSourceData.entity,
         sourceId: this.selectedElement.id,
-        query: this.searchString
-      }
+        query: this.searchString,
+      },
     );
   }
 
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..55acb591d4 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,8 +11,8 @@
   <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>
-        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !(isLoading$ | async) && entriesRD?.payload?.page?.length > 0" @fadeIn
+        <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) !== true && entriesRD?.payload?.page?.length > 0" @fadeIn
                                 [objects]="entriesRD"
                                 [selectionConfig]="{ repeatable: repeatable, listId: listId }"
                                 [config]="initialPagination"
@@ -24,16 +24,16 @@
         </ds-viewable-collection>
         <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>
+        <div *ngIf="(isLoading$ | async) !== true && entriesRD?.payload?.page?.length === 0" data-test="empty-external-entry-list">
+          <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>
+        <div *ngIf="(isLoading$ | async) !== true && entriesRD.statusCode === 500" data-test="empty-external-error-500">
+          <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.spec.ts b/src/app/submission/import-external/submission-import-external.component.spec.ts
index 29b75bab44..a0955c9ea5 100644
--- a/src/app/submission/import-external/submission-import-external.component.spec.ts
+++ b/src/app/submission/import-external/submission-import-external.component.spec.ts
@@ -1,33 +1,43 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { getTestScheduler } from 'jasmine-marbles';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
 
-import { SubmissionImportExternalComponent } from './submission-import-external.component';
 import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
-import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
 import { RouteService } from '../../core/services/route.service';
-import { createPaginatedList, createTestComponent } from '../../shared/testing/utils.test';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { VarDirective } from '../../shared/utils/var.directive';
-import { routeServiceStub } from '../../shared/testing/route-service.stub';
-import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { getMockExternalSourceService } from '../../shared/mocks/external-source.service.mock';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
+  createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { PaginatedSearchOptions } from '../../shared/search/models/paginated-search-options.model';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import {
+  createPaginatedList,
+  createTestComponent,
+} from '../../shared/testing/utils.test';
+import { VarDirective } from '../../shared/utils/var.directive';
 import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
-import { By } from '@angular/platform-browser';
-import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { SubmissionImportExternalComponent } from './submission-import-external.component';
 
 describe('SubmissionImportExternalComponent test suite', () => {
   let comp: SubmissionImportExternalComponent;
@@ -38,12 +48,12 @@ describe('SubmissionImportExternalComponent test suite', () => {
   const mockSearchOptions = observableOf(new PaginatedSearchOptions({
     pagination: Object.assign(new PaginationComponentOptions(), {
       pageSize: 10,
-      currentPage: 0
+      currentPage: 0,
     }),
-    query: 'test'
+    query: 'test',
   }));
   const searchConfigServiceStub = {
-    paginatedSearchOptions: mockSearchOptions
+    paginatedSearchOptions: mockSearchOptions,
   };
   const mockExternalSourceService: any = getMockExternalSourceService();
 
@@ -51,12 +61,12 @@ describe('SubmissionImportExternalComponent test suite', () => {
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot(),
-        BrowserAnimationsModule
+        BrowserAnimationsModule,
       ],
       declarations: [
         SubmissionImportExternalComponent,
         TestComponent,
-        VarDirective
+        VarDirective,
       ],
       providers: [
         { provide: ExternalSourceDataService, useValue: mockExternalSourceService },
@@ -64,9 +74,9 @@ describe('SubmissionImportExternalComponent test suite', () => {
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: new RouterStub() },
         { provide: NgbModal, useValue: ngbModal },
-        SubmissionImportExternalComponent
+        SubmissionImportExternalComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -109,17 +119,17 @@ describe('SubmissionImportExternalComponent test suite', () => {
 
     it('Should init component properly (without route data)', () => {
       const expectedEntries = createSuccessfulRemoteDataObject(createPaginatedList([]));
-      comp.routeData = {entity: '', sourceId: '', query: '' };
+      comp.routeData = { entity: '', sourceId: '', query: '' };
       spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValue(observableOf(''));
       fixture.detectChanges();
 
-      expect(comp.routeData).toEqual({entity: '', sourceId: '', query: '' });
+      expect(comp.routeData).toEqual({ entity: '', sourceId: '', query: '' });
       expect(comp.isLoading$.value).toBe(false);
       expect(comp.entriesRD$.value).toEqual(expectedEntries);
     });
 
     it('Should init component properly (with route data)', () => {
-      comp.routeData = {entity: '', sourceId: '', query: '' };
+      comp.routeData = { entity: '', sourceId: '', query: '' };
       spyOn(compAsAny, 'retrieveExternalSources');
       spyOn(compAsAny.routeService, 'getQueryParameterValue').and.returnValues(observableOf('entity'), observableOf('source'), observableOf('dummy'));
       fixture.detectChanges();
@@ -145,10 +155,10 @@ describe('SubmissionImportExternalComponent test suite', () => {
     });
 
     it('Should call \'router.navigate\'', () => {
-      comp.routeData = {entity: 'Person', sourceId: '', query: '' };
+      comp.routeData = { entity: 'Person', sourceId: '', query: '' };
       spyOn(compAsAny, 'retrieveExternalSources').and.callFake(() => null);
       compAsAny.router.navigate.and.returnValue( new Promise(() => {return;}));
-      const event = {entity: 'Person', sourceId: 'orcidV2', query: 'dummy' };
+      const event = { entity: 'Person', sourceId: 'orcidV2', query: 'dummy' };
 
       scheduler.schedule(() => comp.getExternalSourceData(event));
       scheduler.flush();
@@ -164,12 +174,12 @@ describe('SubmissionImportExternalComponent test suite', () => {
         metadata: {
           'dc.identifier.uri': [
             {
-              value: 'https://orcid.org/0001-0001-0001-0001'
-            }
-          ]
-        }
+              value: 'https://orcid.org/0001-0001-0001-0001',
+            },
+          ],
+        },
       });
-      ngbModal.open.and.returnValue({componentInstance: { externalSourceEntry: null}});
+      ngbModal.open.and.returnValue({ componentInstance: { externalSourceEntry: null } });
       comp.import(entry);
 
       expect(compAsAny.modalService.open).toHaveBeenCalledWith(SubmissionImportExternalPreviewComponent, { size: 'lg' });
@@ -193,32 +203,32 @@ describe('SubmissionImportExternalComponent test suite', () => {
       'errorMessage': null,
       'payload': {
         'type': {
-          'value': 'paginated-list'
+          'value': 'paginated-list',
         },
         'pageInfo': {
           'elementsPerPage': 10,
           'totalElements': 11971608,
           'totalPages': 1197161,
-          'currentPage': 1
+          'currentPage': 1,
         },
         '_links': {
           'first': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=0&size=10&sort=id,asc',
           },
           'self': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?sort=id,ASC&page=0&size=10&query=test',
           },
           'next': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1&size=10&sort=id,asc',
           },
           'last': {
-            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc'
+            'href': 'https://example.com/server/api/integration/externalsources/scopus/entries?query=test&page=1197160&size=10&sort=id,asc',
           },
           'page': [
             {
-              'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
-            }
-          ]
+              'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665',
+            },
+          ],
         },
         'page': [
           {
@@ -235,8 +245,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Silva I.M.M.',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.date.issued': [
                 {
@@ -245,8 +255,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '2024-01-01',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.description.abstract': [
                 {
@@ -255,8 +265,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'This systematic review integrates the data available in the literature regarding the biological activities of the extracts of endophytic fungi isolated from Annona muricata and their secondary metabolites. The search was performed using four electronic databases, and studies’ quality was evaluated using an adapted assessment tool. The initial database search yielded 436 results; ten studies were selected for inclusion. The leaf was the most studied part of the plant (in nine studies); Periconia sp. was the most tested fungus (n = 4); the most evaluated biological activity was anticancer (n = 6), followed by antiviral (n = 3). Antibacterial, antifungal, and antioxidant activities were also tested. Terpenoids or terpenoid hybrid compounds were the most abundant chemical metabolites. Phenolic compounds, esters, alkaloids, saturated and unsaturated fatty acids, aromatic compounds, and peptides were also reported. The selected studies highlighted the biotechnological potentiality of the endophytic fungi extracts from A. muricata. Consequently, it can be considered a promising source of biological compounds with antioxidant effects and active against different microorganisms and cancer cells. Further research is needed involving different plant tissues, other microorganisms, such as SARS-CoV-2, and different cancer cells.',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.identifier.doi': [
                 {
@@ -265,8 +275,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '10.1590/1519-6984.259525',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.identifier.pmid': [
                 {
@@ -275,8 +285,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '35588520',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.identifier.scopus': [
                 {
@@ -285,8 +295,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '2-s2.0-85130258665',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.grantno': [
                 {
@@ -295,8 +305,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'undefined',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.ispartof': [
                 {
@@ -305,8 +315,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Brazilian Journal of Biology',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.ispartofseries': [
                 {
@@ -315,8 +325,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Brazilian Journal of Biology',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.relation.issn': [
                 {
@@ -325,8 +335,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '15196984',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.subject': [
                 {
@@ -335,8 +345,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'biological products | biotechnology | mycology | soursop',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.title': [
                 {
@@ -345,8 +355,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Biological activities of endophytic fungi isolated from Annona muricata Linnaeus: a systematic review',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'dc.type': [
                 {
@@ -355,8 +365,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Journal',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'oaire.citation.volume': [
                 {
@@ -365,8 +375,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '84',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'oairecerif.affiliation.orgunit': [
                 {
@@ -375,8 +385,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'Universidade Federal do Reconcavo da Bahia',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'oairecerif.citation.number': [
                 {
@@ -385,8 +395,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': 'e259525',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'person.identifier.orcid': [
                 {
@@ -395,8 +405,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '#PLACEHOLDER_PARENT_METADATA_VALUE#',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
+                  'confidence': -1,
+                },
               ],
               'person.identifier.scopus-author-id': [
                 {
@@ -405,19 +415,19 @@ describe('SubmissionImportExternalComponent test suite', () => {
                   'value': '42561627000',
                   'place': -1,
                   'authority': null,
-                  'confidence': -1
-                }
-              ]
+                  'confidence': -1,
+                },
+              ],
             },
             '_links': {
               'self': {
-                'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665'
-              }
-            }
-          }
-        ]
+                'href': 'https://example.com/server/api/integration/externalsources/scopus/entryValues/2-s2.0-85130258665',
+              },
+            },
+          },
+        ],
       },
-      'statusCode': 200
+      'statusCode': 200,
     };
     const errorObj = {
       errorMessage: 'Http failure response for ' +
@@ -425,8 +435,8 @@ describe('SubmissionImportExternalComponent test suite', () => {
       statusCode: 500,
       timeCompleted: 1656950434666,
       errors: [{
-        'message': 'Internal Server Error', 'paths': ['/server/api/integration/externalsources/pubmed/entries']
-      }]
+        'message': 'Internal Server Error', 'paths': ['/server/api/integration/externalsources/pubmed/entries'],
+      }],
     };
     beforeEach(() => {
       fixture = TestBed.createComponent(SubmissionImportExternalComponent);
@@ -483,7 +493,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
       mockExternalSourceService.getExternalSourceEntries.and.returnValue(createFailedRemoteDataObject$(
         errorObj.errorMessage,
         errorObj.statusCode,
-        errorObj.timeCompleted
+        errorObj.timeCompleted,
       ));
       spyOn(routeServiceStub, 'getQueryParameterValue').and.callFake((param) => {
         if (param === 'entity') {
@@ -509,7 +519,7 @@ describe('SubmissionImportExternalComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
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 f0a9dca508..73fd472e29 100644
--- a/src/app/submission/import-external/submission-import-external.component.ts
+++ b/src/app/submission/import-external/submission-import-external.component.ts
@@ -1,26 +1,49 @@
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
 import { Router } from '@angular/router';
-
-import { BehaviorSubject, combineLatest, Subscription } from 'rxjs';
-import { filter, mergeMap, switchMap, take, tap } from 'rxjs/operators';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+import { AlertType } from 'src/app/shared/alert/alert-type';
 
 import { ExternalSourceDataService } from '../../core/data/external-source-data.service';
-import { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../../core/data/paginated-list.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { buildPaginatedList, PaginatedList } from '../../core/data/paginated-list.model';
-import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
-import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
-import { Context } from '../../core/shared/context.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { RouteService } from '../../core/services/route.service';
+import { Context } from '../../core/shared/context.model';
+import { ExternalSourceEntry } from '../../core/shared/external-source-entry.model';
+import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type.resource-type';
+import { getFinishedRemoteData } from '../../core/shared/operators';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SearchConfigurationService } from '../../core/shared/search/search-configuration.service';
+import { fadeIn } from '../../shared/animations/fade';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
 import { SubmissionImportExternalPreviewComponent } from './import-external-preview/submission-import-external-preview.component';
-import { fadeIn } from '../../shared/animations/fade';
-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 { ExternalSourceData } from './import-external-searchbar/submission-import-external-searchbar.component';
 
 /**
  * This component allows to submit a new workspaceitem importing the data from an external source.
@@ -29,7 +52,7 @@ import { NONE_ENTITY_TYPE } from '../../core/shared/item-relationships/item-type
   selector: 'ds-submission-import-external',
   styleUrls: ['./submission-import-external.component.scss'],
   templateUrl: './submission-import-external.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
 
@@ -49,7 +72,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
   public reload$: BehaviorSubject<ExternalSourceData> = new BehaviorSubject<ExternalSourceData>({
     entity: '',
     query: '',
-    sourceId: ''
+    sourceId: '',
   });
   /**
    * Configuration to use for the import buttons
@@ -72,7 +95,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
    */
   public initialPagination = Object.assign(new PaginationComponentOptions(), {
     id: 'spc',
-    pageSize: 10
+    pageSize: 10,
   });
   /**
    * The context to displaying lists for
@@ -90,6 +113,8 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
 
   private retrieveExternalSourcesSub: Subscription;
 
+  public readonly AlertType = AlertType;
+
   /**
    * Initialize the component variables.
    * @param {SearchConfigurationService} searchConfigService
@@ -114,9 +139,9 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
     this.listId = 'list-submission-external-sources';
     this.context = Context.EntitySearchModalWithNameVariants;
     this.repeatable = false;
-    this.routeData = {entity: '', sourceId: '', query: ''};
+    this.routeData = { entity: '', sourceId: '', query: '' };
     this.importConfig = {
-      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label,
     };
     this.entriesRD$ = new BehaviorSubject(createSuccessfulRemoteDataObject(buildPaginatedList(new PageInfo(), [])));
     this.isLoading$ = new BehaviorSubject(false);
@@ -124,11 +149,11 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
       [
         this.routeService.getQueryParameterValue('entity'),
         this.routeService.getQueryParameterValue('sourceId'),
-        this.routeService.getQueryParameterValue('query')
+        this.routeService.getQueryParameterValue('query'),
       ]).pipe(
-      take(1)
+      take(1),
     ).subscribe(([entity, sourceId, query]: [string, string, string]) => {
-      this.reload$.next({entity: entity || NONE_ENTITY_TYPE, query: query, sourceId: sourceId});
+      this.reload$.next({ entity: entity || NONE_ENTITY_TYPE, query: query, sourceId: sourceId });
       this.selectLabel(entity);
       this.retrieveExternalSources();
     }));
@@ -142,8 +167,8 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
       [],
       {
         queryParams: event,
-        replaceUrl: true
-      }
+        replaceUrl: true,
+      },
     ).then(() => {
       this.reload$.next(event);
       this.retrieveExternalSources();
@@ -186,16 +211,16 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
     this.retrieveExternalSourcesSub = this.reload$.pipe(
       filter((sourceQueryObject: ExternalSourceData) => isNotEmpty(sourceQueryObject.sourceId) && isNotEmpty(sourceQueryObject.query)),
       switchMap((sourceQueryObject: ExternalSourceData) => {
-          const query = sourceQueryObject.query;
-          this.routeData = sourceQueryObject;
-          return this.searchConfigService.paginatedSearchOptions.pipe(
-            tap(() => this.isLoading$.next(true)),
-            filter((searchOptions) => searchOptions.query === query),
-            mergeMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe(
-              getFinishedRemoteData(),
-            ))
-          );
-        }
+        const query = sourceQueryObject.query;
+        this.routeData = sourceQueryObject;
+        return this.searchConfigService.paginatedSearchOptions.pipe(
+          tap(() => this.isLoading$.next(true)),
+          filter((searchOptions) => searchOptions.query === query),
+          mergeMap((searchOptions) => this.externalService.getExternalSourceEntries(this.routeData.sourceId, searchOptions).pipe(
+            getFinishedRemoteData(),
+          )),
+        );
+      },
       ),
     ).subscribe((rdData) => {
       this.entriesRD$.next(rdData);
@@ -211,7 +236,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy {
   private selectLabel(entity: string): void {
     this.label = entity;
     this.importConfig = {
-      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label
+      buttonLabel: 'submission.sections.describe.relationship-lookup.external-source.import-button-title.' + this.label,
     };
   }
 
diff --git a/src/app/submission/import-external/themed-submission-import-external.component.ts b/src/app/submission/import-external/themed-submission-import-external.component.ts
index 698a64842d..a452ad09a9 100644
--- a/src/app/submission/import-external/themed-submission-import-external.component.ts
+++ b/src/app/submission/import-external/themed-submission-import-external.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SubmissionImportExternalComponent } from './submission-import-external.component';
 
@@ -8,7 +9,7 @@ import { SubmissionImportExternalComponent } from './submission-import-external.
 @Component({
   selector: 'ds-themed-submission-import-external',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionImportExternalComponent extends ThemedComponent<SubmissionImportExternalComponent> {
   protected getComponentName(): string {
diff --git a/src/app/submission/objects/submission-objects.actions.ts b/src/app/submission/objects/submission-objects.actions.ts
index 9182611e47..e075ce5e5b 100644
--- a/src/app/submission/objects/submission-objects.actions.ts
+++ b/src/app/submission/objects/submission-objects.actions.ts
@@ -1,16 +1,16 @@
 /* eslint-disable max-classes-per-file */
 import { Action } from '@ngrx/store';
 
-import { type } from '../../shared/ngrx/type';
+import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { Item } from '../../core/shared/item.model';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkspaceitemSectionUploadFileObject } from '../../core/submission/models/workspaceitem-section-upload-file.model';
 import {
   WorkspaceitemSectionDataType,
-  WorkspaceitemSectionsObject
+  WorkspaceitemSectionsObject,
 } from '../../core/submission/models/workspaceitem-sections.model';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { type } from '../../shared/ngrx/type';
 import { SectionsType } from '../sections/sections-type';
-import { Item } from '../../core/shared/item.model';
 import { SectionVisibility } from './section-visibility.model';
 import { SubmissionError } from './submission-error.model';
 import { SubmissionSectionError } from './submission-section-error.model';
@@ -56,9 +56,13 @@ export const SubmissionObjectActionTypes = {
   DISCARD_SUBMISSION_SUCCESS: type('dspace/submission/DISCARD_SUBMISSION_SUCCESS'),
   DISCARD_SUBMISSION_ERROR: type('dspace/submission/DISCARD_SUBMISSION_ERROR'),
 
+  // Clearing active section types
+  CLEAN_DUPLICATE_DETECTION: type('dspace/submission/CLEAN_DUPLICATE_DETECTION'),
+
   // Upload file types
   NEW_FILE: type('dspace/submission/NEW_FILE'),
   EDIT_FILE_DATA: type('dspace/submission/EDIT_FILE_DATA'),
+  EDIT_FILE_PRIMARY_BITSTREAM_DATA: type('dspace/submission/EDIT_FILE_PRIMARY_BITSTREAM_DATA'),
   DELETE_FILE: type('dspace/submission/DELETE_FILE'),
 
   // Errors
@@ -148,15 +152,15 @@ export class InitSectionAction implements Action {
    *    the section's errors
    */
   constructor(submissionId: string,
-              sectionId: string,
-              header: string,
-              config: string,
-              mandatory: boolean,
-              sectionType: SectionsType,
-              visibility: SectionVisibility,
-              enabled: boolean,
-              data: WorkspaceitemSectionDataType,
-              errors: SubmissionSectionError[]) {
+    sectionId: string,
+    header: string,
+    config: string,
+    mandatory: boolean,
+    sectionType: SectionsType,
+    visibility: SectionVisibility,
+    enabled: boolean,
+    data: WorkspaceitemSectionDataType,
+    errors: SubmissionSectionError[]) {
     this.payload = { submissionId, sectionId, header, config, mandatory, sectionType, visibility, enabled, data, errors };
   }
 }
@@ -177,7 +181,7 @@ export class EnableSectionAction implements Action {
    *    the section's ID to add
    */
   constructor(submissionId: string,
-              sectionId: string) {
+    sectionId: string) {
     this.payload = { submissionId, sectionId };
   }
 }
@@ -230,15 +234,34 @@ export class UpdateSectionDataAction implements Action {
    *    the section's metadata
    */
   constructor(submissionId: string,
-              sectionId: string,
-              data: WorkspaceitemSectionDataType,
-              errorsToShow: SubmissionSectionError[],
-              serverValidationErrors: SubmissionSectionError[],
-              metadata?: string[]) {
+    sectionId: string,
+    data: WorkspaceitemSectionDataType,
+    errorsToShow: SubmissionSectionError[],
+    serverValidationErrors: SubmissionSectionError[],
+    metadata?: string[]) {
     this.payload = { submissionId, sectionId, data, errorsToShow, serverValidationErrors, metadata };
   }
 }
 
+/**
+ * Removes data and makes 'detect-duplicate' section not visible.
+ */
+export class CleanDuplicateDetectionAction implements Action {
+  type = SubmissionObjectActionTypes.CLEAN_DUPLICATE_DETECTION;
+  payload: {
+    submissionId: string;
+  };
+
+  /**
+   * creates a new CleanDetectDuplicateAction
+   *
+   * @param submissionId Id of the submission on which perform the action
+   */
+  constructor(submissionId: string ) {
+    this.payload = { submissionId };
+  }
+}
+
 export class UpdateSectionDataSuccessAction implements Action {
   type = SubmissionObjectActionTypes.UPDATE_SECTION_DATA_SUCCESS;
 }
@@ -334,12 +357,12 @@ export class InitSubmissionFormAction implements Action {
    *    the submission's sections errors
    */
   constructor(collectionId: string,
-              submissionId: string,
-              selfUrl: string,
-              submissionDefinition: SubmissionDefinitionsModel,
-              sections: WorkspaceitemSectionsObject,
-              item: Item,
-              errors: SubmissionError) {
+    submissionId: string,
+    selfUrl: string,
+    submissionDefinition: SubmissionDefinitionsModel,
+    sections: WorkspaceitemSectionsObject,
+    item: Item,
+    errors: SubmissionError) {
     this.payload = { collectionId, submissionId, selfUrl, submissionDefinition, sections, item, errors };
   }
 }
@@ -760,6 +783,29 @@ export class NewUploadedFileAction implements Action {
   }
 }
 
+export class EditFilePrimaryBitstreamAction implements Action {
+  type = SubmissionObjectActionTypes.EDIT_FILE_PRIMARY_BITSTREAM_DATA;
+  payload: {
+    submissionId: string;
+    sectionId: string;
+    fileId: string | null;
+  };
+
+  /**
+   * Edit a file data
+   *
+   * @param submissionId
+   *    the submission's ID
+   * @param sectionId
+   *    the section's ID
+   * @param fileId
+   *    the file's ID
+   */
+  constructor(submissionId: string, sectionId: string, fileId: string | null) {
+    this.payload = { submissionId, sectionId, fileId: fileId };
+  }
+}
+
 export class EditFileDataAction implements Action {
   type = SubmissionObjectActionTypes.EDIT_FILE_DATA;
   payload: {
@@ -821,6 +867,7 @@ export type SubmissionObjectAction = DisableSectionAction
   | InitSubmissionFormAction
   | ResetSubmissionFormAction
   | CancelSubmissionFormAction
+  | CleanDuplicateDetectionAction
   | CompleteInitSubmissionFormAction
   | ChangeSubmissionCollectionAction
   | SaveAndDepositSubmissionAction
@@ -833,6 +880,7 @@ export type SubmissionObjectAction = DisableSectionAction
   | SectionStatusChangeAction
   | NewUploadedFileAction
   | EditFileDataAction
+  | EditFilePrimaryBitstreamAction
   | DeleteUploadedFileAction
   | InertSectionErrorsAction
   | DeleteSectionErrorsAction
diff --git a/src/app/submission/objects/submission-objects.effects.spec.ts b/src/app/submission/objects/submission-objects.effects.spec.ts
index a1bb878aa5..66c6e8316e 100644
--- a/src/app/submission/objects/submission-objects.effects.spec.ts
+++ b/src/app/submission/objects/submission-objects.effects.spec.ts
@@ -1,12 +1,59 @@
 import { TestBed } from '@angular/core/testing';
-
-import { cold, hot } from 'jasmine-marbles';
 import { provideMockActions } from '@ngrx/effects/testing';
-import { Store, StoreModule } from '@ngrx/store';
-import { Observable, of as observableOf, throwError as observableThrowError } from 'rxjs';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  hot,
+} from 'jasmine-marbles';
+import {
+  Observable,
+  of as observableOf,
+  throwError as observableThrowError,
+} from 'rxjs';
 
-import { SubmissionObjectEffects } from './submission-objects.effects';
+import {
+  AppState,
+  storeModuleConfig,
+} from '../../app.reducer';
+import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
+import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+import { Item } from '../../core/shared/item.model';
+import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
+import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import {
+  mockSectionsData,
+  mockSectionsDataTwo,
+  mockSectionsErrors,
+  mockSectionsErrorsTouchedField,
+  mockSubmissionCollectionId,
+  mockSubmissionDefinition,
+  mockSubmissionDefinitionResponse,
+  mockSubmissionId,
+  mockSubmissionRestResponse,
+  mockSubmissionSelfUrl,
+  mockSubmissionState,
+} from '../../shared/mocks/submission.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../shared/testing/sections-service.stub';
+import { StoreMock } from '../../shared/testing/store.mock';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
+import { mockSubmissionObjectDataService } from '../../shared/testing/submission-oject-data-service.mock';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SectionsService } from '../sections/sections.service';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrors from '../utils/parseSectionErrors';
 import {
   CompleteInitSubmissionFormAction,
   DepositSubmissionAction,
@@ -22,40 +69,9 @@ import {
   SaveSubmissionSectionFormErrorAction,
   SaveSubmissionSectionFormSuccessAction,
   SubmissionObjectActionTypes,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from './submission-objects.actions';
-import {
-  mockSectionsData,
-  mockSectionsDataTwo,
-  mockSectionsErrors,
-  mockSectionsErrorsTouchedField,
-  mockSubmissionCollectionId,
-  mockSubmissionDefinition,
-  mockSubmissionDefinitionResponse,
-  mockSubmissionId,
-  mockSubmissionRestResponse,
-  mockSubmissionSelfUrl,
-  mockSubmissionState
-} from '../../shared/mocks/submission.mock';
-import { SubmissionSectionModel } from '../../core/config/models/config-submission-section.model';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
-import { SectionsService } from '../sections/sections.service';
-import { SectionsServiceStub } from '../../shared/testing/sections-service.stub';
-import { SubmissionService } from '../submission.service';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { StoreMock } from '../../shared/testing/store.mock';
-import { AppState, storeModuleConfig } from '../../app.reducer';
-import parseSectionErrors from '../utils/parseSectionErrors';
-import { Item } from '../../core/shared/item.model';
-import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
-import { mockSubmissionObjectDataService } from '../../shared/testing/submission-oject-data-service.mock';
+import { SubmissionObjectEffects } from './submission-objects.effects';
 
 describe('SubmissionObjectEffects test suite', () => {
   let submissionObjectEffects: SubmissionObjectEffects;
@@ -88,8 +104,8 @@ describe('SubmissionObjectEffects test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       providers: [
@@ -124,10 +140,10 @@ describe('SubmissionObjectEffects test suite', () => {
             selfUrl: selfUrl,
             submissionDefinition: submissionDefinition,
             sections: {},
-            item: {metadata: {}},
+            item: { metadata: {} },
             errors: [],
-          }
-        }
+          },
+        },
       });
 
       const mappedActions = [];
@@ -159,7 +175,7 @@ describe('SubmissionObjectEffects test suite', () => {
         e: mappedActions[3],
         f: mappedActions[4],
         g: mappedActions[5],
-        h: mappedActions[6]
+        h: mappedActions[6],
       });
 
       expect(submissionObjectEffects.loadForm$).toBeObservable(expected);
@@ -179,8 +195,8 @@ describe('SubmissionObjectEffects test suite', () => {
             sections: {},
             item: new Item(),
             errors: [],
-          }
-        }
+          },
+        },
       });
 
       const expected = cold('--b-', {
@@ -191,8 +207,8 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionDefinition,
           {},
           new Item(),
-          null
-        )
+          null,
+        ),
       });
 
       expect(submissionObjectEffects.resetForm$).toBeObservable(expected);
@@ -205,17 +221,17 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new SaveSubmissionFormSuccessAction(
           submissionId,
-          mockSubmissionRestResponse as any
-        )
+          mockSubmissionRestResponse as any,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -227,9 +243,9 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
             submissionId: submissionId,
-            isManual: true
-          }
-        }
+            isManual: true,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
@@ -238,8 +254,8 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           mockSubmissionRestResponse as any,
           true,
-          true
-        )
+          true,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -251,9 +267,9 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
             submissionId: submissionId,
-            isManual: false
-          }
-        }
+            isManual: false,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
@@ -262,8 +278,8 @@ describe('SubmissionObjectEffects test suite', () => {
           submissionId,
           mockSubmissionRestResponse as any,
           false,
-          false
-        )
+          false,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -274,18 +290,18 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveSubmission$).toBeObservable(expected);
@@ -298,17 +314,17 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new SaveForLaterSubmissionFormSuccessAction(
           submissionId,
-          mockSubmissionRestResponse as any
-        )
+          mockSubmissionRestResponse as any,
+        ),
       });
 
       expect(submissionObjectEffects.saveForLaterSubmission$).toBeObservable(expected);
@@ -319,18 +335,18 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveForLaterSubmission$).toBeObservable(expected);
@@ -342,13 +358,13 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a UPDATE_SECTION_DATA action for each updated section', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
@@ -356,9 +372,9 @@ describe('SubmissionObjectEffects test suite', () => {
           payload: {
             submissionId: submissionId,
             submissionObject: response,
-            notify: true
-          }
-        }
+            notify: true,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -368,21 +384,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           errorsList.traditionalpageone || [],
-          errorsList.traditionalpageone || []
+          errorsList.traditionalpageone || [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -394,20 +410,20 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should not display errors when notification are disabled and field are not touched', () => {
       store.nextState({
         submission: {
-          objects: submissionState
+          objects: submissionState,
         },
         forms: {
           '2_traditionalpageone': {
             touched: {
-              'dc.title': true
-            }
-          }
-        }
+              'dc.title': true,
+            },
+          },
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
@@ -415,9 +431,9 @@ describe('SubmissionObjectEffects test suite', () => {
           payload: {
             submissionId: submissionId,
             submissionObject: response,
-            notify: false
-          }
-        }
+            notify: false,
+          },
+        },
       });
 
       const errorsToShowList = parseSectionErrors(mockSectionsErrorsTouchedField);
@@ -428,21 +444,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           errorsToShowList.traditionalpageone,
-          serverValidationErrorsList.traditionalpageone
+          serverValidationErrorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsToShowList.license || [],
-          serverValidationErrorsList.license || []
+          serverValidationErrorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsToShowList.upload || [],
-          serverValidationErrorsList.upload || []
+          serverValidationErrorsList.upload || [],
         ),
       });
 
@@ -453,21 +469,21 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should display a success notification', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
-        sections: mockSectionsData
+        sections: mockSectionsData,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const expected = cold('--(bcd)-', {
@@ -476,21 +492,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          []
+          [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           [],
-          []
+          [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           [],
-          []
+          [],
         ),
       });
 
@@ -501,22 +517,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should display a warning notification when there are errors', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -526,21 +542,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           errorsList.traditionalpageone || [],
-          errorsList.traditionalpageone || []
+          errorsList.traditionalpageone || [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -551,22 +567,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should detect and notify a new section', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsDataTwo,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -576,28 +592,28 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsDataTwo.traditionalpageone as any,
           errorsList.traditionalpageone || [],
-          errorsList.traditionalpageone || []
+          errorsList.traditionalpageone || [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'traditionalpagetwo',
           mockSectionsDataTwo.traditionalpagetwo as any,
           errorsList.traditionalpagetwo || [],
-          errorsList.traditionalpagetwo || []
+          errorsList.traditionalpagetwo || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsDataTwo.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         e: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsDataTwo.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -612,22 +628,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a UPDATE_SECTION_DATA action for each updated section', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -637,21 +653,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          errorsList.traditionalpageone
+          errorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -662,21 +678,21 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should not display a success notification', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
-        sections: mockSectionsData
+        sections: mockSectionsData,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const expected = cold('--(bcd)-', {
@@ -685,21 +701,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          []
+          [],
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           [],
-          []
+          [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           [],
-          []
+          [],
         ),
       });
 
@@ -710,22 +726,22 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should not display a warning notification when there are errors', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: response
-          }
-        }
+            submissionObject: response,
+          },
+        },
       });
 
       const serverValidationErrorsList = parseSectionErrors(mockSectionsErrors);
@@ -735,21 +751,21 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsData.traditionalpageone as any,
           [],
-          serverValidationErrorsList.traditionalpageone
+          serverValidationErrorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsData.license as any,
           serverValidationErrorsList.license || [],
-          serverValidationErrorsList.license || []
+          serverValidationErrorsList.license || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsData.upload as any,
           serverValidationErrorsList.upload || [],
-          serverValidationErrorsList.upload || []
+          serverValidationErrorsList.upload || [],
         ),
       });
 
@@ -760,13 +776,13 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should detect new sections but not notify for it', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsDataTwo,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
       actions = hot('--a-', {
         a: {
@@ -774,8 +790,8 @@ describe('SubmissionObjectEffects test suite', () => {
           payload: {
             submissionId: submissionId,
             submissionObject: response,
-          }
-        }
+          },
+        },
       });
 
       const errorsList = parseSectionErrors(mockSectionsErrors);
@@ -785,28 +801,28 @@ describe('SubmissionObjectEffects test suite', () => {
           'traditionalpageone',
           mockSectionsDataTwo.traditionalpageone as any,
           [],
-          errorsList.traditionalpageone
+          errorsList.traditionalpageone,
         ),
         c: new UpdateSectionDataAction(
           submissionId,
           'traditionalpagetwo',
           mockSectionsDataTwo.traditionalpagetwo as any,
           errorsList.traditionalpagetwo || [],
-          errorsList.traditionalpagetwo || []
+          errorsList.traditionalpagetwo || [],
         ),
         d: new UpdateSectionDataAction(
           submissionId,
           'license',
           mockSectionsDataTwo.license as any,
           errorsList.license || [],
-          errorsList.license || []
+          errorsList.license || [],
         ),
         e: new UpdateSectionDataAction(
           submissionId,
           'upload',
           mockSectionsDataTwo.upload as any,
           errorsList.upload || [],
-          errorsList.upload || []
+          errorsList.upload || [],
         ),
       });
 
@@ -823,17 +839,17 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM,
           payload: {
             submissionId: submissionId,
-            sectionId: 'traditionalpageone'
-          }
-        }
+            sectionId: 'traditionalpageone',
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceID.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new SaveSubmissionSectionFormSuccessAction(
           submissionId,
-          mockSubmissionRestResponse as any
-        )
+          mockSubmissionRestResponse as any,
+        ),
       });
 
       expect(submissionObjectEffects.saveSection$).toBeObservable(expected);
@@ -845,18 +861,18 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM,
           payload: {
             submissionId: submissionId,
-            sectionId: 'traditionalpageone'
-          }
-        }
+            sectionId: 'traditionalpageone',
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceID.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionSectionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveSection$).toBeObservable(expected);
@@ -869,20 +885,20 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
-        sections: mockSectionsDataTwo
+        sections: mockSectionsDataTwo,
       })];
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(response));
       const expected = cold('--b-', {
         b: new DepositSubmissionAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveAndDeposit$).toBeObservable(expected);
@@ -892,28 +908,28 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a SAVE_SUBMISSION_FORM_SUCCESS action when there are errors', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       const response = [Object.assign({}, mockSubmissionRestResponse[0], {
         sections: mockSectionsData,
-        errors: mockSectionsErrors
+        errors: mockSectionsErrors,
       })];
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.returnValue(observableOf(response));
 
       const expected = cold('--b-', {
-        b: new SaveSubmissionFormSuccessAction(submissionId, response as any[], false, true)
+        b: new SaveSubmissionFormSuccessAction(submissionId, response as any[], false, true),
       });
 
       expect(submissionObjectEffects.saveAndDeposit$).toBeObservable(expected);
@@ -925,18 +941,18 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_AND_DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionJsonPatchOperationsServiceStub.jsonPatchByResourceType.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new SaveSubmissionFormErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.saveAndDeposit$).toBeObservable(expected);
@@ -947,24 +963,24 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DEPOSIT_SUBMISSION_SUCCESS action on success', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.depositSubmission.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new DepositSubmissionSuccessAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.depositSubmission$).toBeObservable(expected);
@@ -973,26 +989,26 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DEPOSIT_SUBMISSION_ERROR action on error', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.depositSubmission.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new DepositSubmissionErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.depositSubmission$).toBeObservable(expected);
@@ -1006,9 +1022,9 @@ describe('SubmissionObjectEffects test suite', () => {
           type: SubmissionObjectActionTypes.SAVE_FOR_LATER_SUBMISSION_FORM_SUCCESS,
           payload: {
             submissionId: submissionId,
-            submissionObject: mockSubmissionRestResponse
-          }
-        }
+            submissionObject: mockSubmissionRestResponse,
+          },
+        },
       });
 
       submissionObjectEffects.saveForLaterSubmissionSuccess$.subscribe(() => {
@@ -1024,9 +1040,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_SUCCESS,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.depositSubmissionSuccess$.subscribe(() => {
@@ -1042,9 +1058,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DEPOSIT_SUBMISSION_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.depositSubmissionError$.subscribe(() => {
@@ -1059,9 +1075,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_FORM_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.saveError$.subscribe(() => {
@@ -1074,9 +1090,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.SAVE_SUBMISSION_SECTION_FORM_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.saveError$.subscribe(() => {
@@ -1089,24 +1105,24 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DISCARD_SUBMISSION_SUCCESS action on success', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.discardSubmission.and.returnValue(observableOf(mockSubmissionRestResponse));
       const expected = cold('--b-', {
         b: new DiscardSubmissionSuccessAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.discardSubmission$).toBeObservable(expected);
@@ -1115,26 +1131,26 @@ describe('SubmissionObjectEffects test suite', () => {
     it('should return a DISCARD_SUBMISSION_ERROR action on error', () => {
       store.nextState({
         submission: {
-          objects: submissionState
-        }
+          objects: submissionState,
+        },
       } as any);
 
       actions = hot('--a-', {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionServiceStub.discardSubmission.and.callFake(
-        () => observableThrowError('Error')
+        () => observableThrowError('Error'),
       );
       const expected = cold('--b-', {
         b: new DiscardSubmissionErrorAction(
-          submissionId
-        )
+          submissionId,
+        ),
       });
 
       expect(submissionObjectEffects.discardSubmission$).toBeObservable(expected);
@@ -1147,9 +1163,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION_SUCCESS,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.discardSubmissionSuccess$.subscribe(() => {
@@ -1165,9 +1181,9 @@ describe('SubmissionObjectEffects test suite', () => {
         a: {
           type: SubmissionObjectActionTypes.DISCARD_SUBMISSION_ERROR,
           payload: {
-            submissionId: submissionId
-          }
-        }
+            submissionId: submissionId,
+          },
+        },
       });
 
       submissionObjectEffects.discardSubmissionError$.subscribe(() => {
diff --git a/src/app/submission/objects/submission-objects.effects.ts b/src/app/submission/objects/submission-objects.effects.ts
index 4a7907cab1..53dcd9a19e 100644
--- a/src/app/submission/objects/submission-objects.effects.ts
+++ b/src/app/submission/objects/submission-objects.effects.ts
@@ -1,25 +1,58 @@
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import {
+  Actions,
+  createEffect,
+  ofType,
+} from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { findKey, isEqual, union } from 'lodash';
+import findKey from 'lodash/findKey';
+import isEqual from 'lodash/isEqual';
+import union from 'lodash/union';
+import {
+  from as observableFrom,
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+import {
+  catchError,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  take,
+  tap,
+  withLatestFrom,
+} from 'rxjs/operators';
 
-import { from as observableFrom, Observable, of as observableOf } from 'rxjs';
-import { catchError, filter, map, mergeMap, switchMap, take, tap, withLatestFrom } from 'rxjs/operators';
+import { environment } from '../../../environments/environment';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
 import { SubmissionObject } from '../../core/submission/models/submission-object.model';
 import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemSectionDuplicatesObject } from '../../core/submission/models/workspaceitem-section-duplicates.model';
 import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
 import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 import { SubmissionJsonPatchOperationsService } from '../../core/submission/submission-json-patch-operations.service';
-import { isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
+import {
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { FormState } from '../../shared/form/form.reducer';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SectionsType } from '../sections/sections-type';
+import { followLink } from '../../shared/utils/follow-link-config.model';
 import { SectionsService } from '../sections/sections.service';
+import { SectionsType } from '../sections/sections-type';
 import { SubmissionState } from '../submission.reducers';
 import { SubmissionService } from '../submission.service';
+import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import parseSectionErrors from '../utils/parseSectionErrors';
 import {
+  CleanDuplicateDetectionAction,
   CompleteInitSubmissionFormAction,
   DepositSubmissionAction,
   DepositSubmissionErrorAction,
@@ -41,18 +74,11 @@ import {
   SubmissionObjectAction,
   SubmissionObjectActionTypes,
   UpdateSectionDataAction,
-  UpdateSectionDataSuccessAction
+  UpdateSectionDataSuccessAction,
 } from './submission-objects.actions';
 import { SubmissionObjectEntry } from './submission-objects.reducer';
-import { Item } from '../../core/shared/item.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { getFirstSucceededRemoteDataPayload } from '../../core/shared/operators';
-import { SubmissionObjectDataService } from '../../core/submission/submission-object-data.service';
-import { followLink } from '../../shared/utils/follow-link-config.model';
-import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { FormState } from '../../shared/form/form.reducer';
-import { SubmissionSectionObject } from './submission-section-object.model';
 import { SubmissionSectionError } from './submission-section-error.model';
+import { SubmissionSectionObject } from './submission-section-object.model';
 
 @Injectable()
 export class SubmissionObjectEffects {
@@ -69,7 +95,12 @@ export class SubmissionObjectEffects {
         const selfLink = sectionDefinition._links.self.href || sectionDefinition._links.self;
         const sectionId = selfLink.substr(selfLink.lastIndexOf('/') + 1);
         const config = sectionDefinition._links.config ? (sectionDefinition._links.config.href || sectionDefinition._links.config) : '';
-        const enabled = (sectionDefinition.mandatory) || (isNotEmpty(action.payload.sections) && action.payload.sections.hasOwnProperty(sectionId));
+        // A section is enabled if it is mandatory or contains data in its section payload
+        // except for detect duplicate steps which will be hidden with no data unless overridden in config, even if mandatory
+        const enabled = (sectionDefinition.mandatory && (sectionDefinition.sectionType !== SectionsType.Duplicates))
+          || (isNotEmpty(action.payload.sections) && action.payload.sections.hasOwnProperty(sectionId)
+            && (sectionDefinition.sectionType === SectionsType.Duplicates && (alwaysDisplayDuplicates() || isNotEmpty((action.payload.sections[sectionId] as WorkspaceitemSectionDuplicatesObject).potentialDuplicates)))
+          );
         let sectionData;
         if (sectionDefinition.sectionType !== SectionsType.SubmissionForm) {
           sectionData = (isNotUndefined(action.payload.sections) && isNotUndefined(action.payload.sections[sectionId])) ? action.payload.sections[sectionId] : Object.create(null);
@@ -88,8 +119,8 @@ export class SubmissionObjectEffects {
             sectionDefinition.visibility,
             enabled,
             sectionData,
-            sectionErrors
-          )
+            sectionErrors,
+          ),
         );
       });
       return { action: action, definition: definition, mappedActions: mappedActions };
@@ -97,7 +128,7 @@ export class SubmissionObjectEffects {
     mergeMap((result) => {
       return observableFrom(
         result.mappedActions.concat(
-          new CompleteInitSubmissionFormAction(result.action.payload.submissionId)
+          new CompleteInitSubmissionFormAction(result.action.payload.submissionId),
         ));
     })));
 
@@ -114,7 +145,7 @@ export class SubmissionObjectEffects {
         action.payload.submissionDefinition,
         action.payload.sections,
         action.payload.item,
-        null
+        null,
       ))));
 
   /**
@@ -127,8 +158,8 @@ export class SubmissionObjectEffects {
         this.submissionService.getSubmissionObjectLinkName(),
         action.payload.submissionId,
         'sections').pipe(
-          map((response: SubmissionObject[]) => new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, action.payload.isManual, action.payload.isManual)),
-          catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
+        map((response: SubmissionObject[]) => new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, action.payload.isManual, action.payload.isManual)),
+        catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -141,8 +172,8 @@ export class SubmissionObjectEffects {
         this.submissionService.getSubmissionObjectLinkName(),
         action.payload.submissionId,
         'sections').pipe(
-          map((response: SubmissionObject[]) => new SaveForLaterSubmissionFormSuccessAction(action.payload.submissionId, response)),
-          catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
+        map((response: SubmissionObject[]) => new SaveForLaterSubmissionFormSuccessAction(action.payload.submissionId, response)),
+        catchError(() => observableOf(new SaveSubmissionFormErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -182,8 +213,8 @@ export class SubmissionObjectEffects {
         action.payload.submissionId,
         'sections',
         action.payload.sectionId).pipe(
-          map((response: SubmissionObject[]) => new SaveSubmissionSectionFormSuccessAction(action.payload.submissionId, response)),
-          catchError(() => observableOf(new SaveSubmissionSectionFormErrorAction(action.payload.submissionId))));
+        map((response: SubmissionObject[]) => new SaveSubmissionSectionFormSuccessAction(action.payload.submissionId, response)),
+        catchError(() => observableOf(new SaveSubmissionSectionFormErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -208,9 +239,9 @@ 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])
+          map((submissionObject: SubmissionObject) => [submissionObject]),
         );
       }
       return response$.pipe(
@@ -222,7 +253,7 @@ export class SubmissionObjectEffects {
               null,
               this.translate.instant('submission.sections.general.cannot_deposit'),
               null,
-              true
+              true,
             );
             return new SaveSubmissionFormSuccessAction(action.payload.submissionId, response, false, true);
           }
@@ -239,7 +270,7 @@ export class SubmissionObjectEffects {
     switchMap(([action, state]: [DepositSubmissionAction, any]) => {
       return this.submissionService.depositSubmission(state.submission.objects[action.payload.submissionId].selfUrl).pipe(
         map(() => new DepositSubmissionSuccessAction(action.payload.submissionId)),
-        catchError((error) => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
+        catchError((error: unknown) => observableOf(new DepositSubmissionErrorAction(action.payload.submissionId))));
     })));
 
   /**
@@ -290,7 +321,7 @@ export class SubmissionObjectEffects {
       if (section.sectionType === SectionsType.SubmissionForm) {
         const submissionObject$ = this.submissionObjectService
           .findById(action.payload.submissionId, true, false, followLink('item')).pipe(
-            getFirstSucceededRemoteDataPayload()
+            getFirstSucceededRemoteDataPayload(),
           );
 
         const item$ = submissionObject$.pipe(
@@ -301,7 +332,7 @@ export class SubmissionObjectEffects {
         return item$.pipe(
           map((item: Item) => item.metadata),
           filter((metadata) => !isEqual(action.payload.data, metadata)),
-          map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errorsToShow, action.payload.serverValidationErrors, action.payload.metadata))
+          map((metadata: any) => new UpdateSectionDataAction(action.payload.submissionId, action.payload.sectionId, metadata, action.payload.errorsToShow, action.payload.serverValidationErrors, action.payload.metadata)),
         );
       } else {
         return observableOf(new UpdateSectionDataSuccessAction());
@@ -432,8 +463,16 @@ export class SubmissionObjectEffects {
           && isEmpty(sections[sherpaPoliciesSectionId])) {
           mappedActions.push(new UpdateSectionDataAction(submissionId, sherpaPoliciesSectionId, null, [], []));
         }
-      });
 
+        // When Duplicate Detection step is enabled, add it only if there are duplicates in the response section data
+        // or if configuration overrides this behaviour
+        if (!alwaysDisplayDuplicates()) {
+          const duplicatesSectionId = findKey(currentState.sections, (section) => section.sectionType === SectionsType.Duplicates);
+          if (isNotUndefined(duplicatesSectionId) && sections.hasOwnProperty(duplicatesSectionId) && isEmpty((sections[duplicatesSectionId] as WorkspaceitemSectionDuplicatesObject).potentialDuplicates)) {
+            mappedActions.push(new CleanDuplicateDetectionAction(submissionId));
+          }
+        }
+      });
     }
     return mappedActions;
   }
@@ -479,3 +518,7 @@ function filterErrors(sectionForm: FormState, sectionErrors: SubmissionSectionEr
   });
   return filteredErrors;
 }
+
+function alwaysDisplayDuplicates(): boolean {
+  return (environment.submission.duplicateDetection.alwaysShowSection);
+}
diff --git a/src/app/submission/objects/submission-objects.reducer.spec.ts b/src/app/submission/objects/submission-objects.reducer.spec.ts
index 2a24afae19..2389a5600c 100644
--- a/src/app/submission/objects/submission-objects.reducer.spec.ts
+++ b/src/app/submission/objects/submission-objects.reducer.spec.ts
@@ -1,7 +1,16 @@
-import { submissionObjectReducer, SubmissionObjectState } from './submission-objects.reducer';
+import { Item } from '../../core/shared/item.model';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionDefinitionResponse,
+  mockSubmissionId,
+  mockSubmissionSelfUrl,
+  mockSubmissionState,
+} from '../../shared/mocks/submission.mock';
+import { SectionsType } from '../sections/sections-type';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
+  CleanDuplicateDetectionAction,
   CompleteInitSubmissionFormAction,
   DeleteSectionErrorsAction,
   DeleteUploadedFileAction,
@@ -30,17 +39,12 @@ import {
   SaveSubmissionSectionFormSuccessAction,
   SectionStatusChangeAction,
   SubmissionObjectAction,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from './submission-objects.actions';
-import { SectionsType } from '../sections/sections-type';
 import {
-  mockSubmissionCollectionId,
-  mockSubmissionDefinitionResponse,
-  mockSubmissionId,
-  mockSubmissionSelfUrl,
-  mockSubmissionState
-} from '../../shared/mocks/submission.mock';
-import { Item } from '../../core/shared/item.model';
+  submissionObjectReducer,
+  SubmissionObjectState,
+} from './submission-objects.reducer';
 
 describe('submissionReducer test suite', () => {
 
@@ -66,7 +70,7 @@ describe('submissionReducer test suite', () => {
         isLoading: true,
         savePending: false,
         depositPending: false,
-      }
+      },
     };
 
     const action = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
@@ -78,8 +82,8 @@ describe('submissionReducer test suite', () => {
   it('should complete submission initialization', () => {
     const state = Object.assign({}, initState, {
       [submissionId]: Object.assign({}, initState[submissionId], {
-        isLoading: true
-      })
+        isLoading: true,
+      }),
     });
 
     const action = new CompleteInitSubmissionFormAction(submissionId);
@@ -99,7 +103,7 @@ describe('submissionReducer test suite', () => {
         isLoading: true,
         savePending: false,
         depositPending: false,
-      }
+      },
     };
 
     const action = new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, {}, submissionDefinition, new Item());
@@ -143,7 +147,7 @@ describe('submissionReducer test suite', () => {
     const state = Object.assign({}, initState, {
       [submissionId]: Object.assign({}, initState[submissionId], {
         savePending: true,
-      })
+      }),
     });
 
     let action: any = new SaveSubmissionFormSuccessAction(submissionId, []);
@@ -191,7 +195,7 @@ describe('submissionReducer test suite', () => {
     const state = Object.assign({}, initState, {
       [submissionId]: Object.assign({}, initState[submissionId], {
         depositPending: true,
-      })
+      }),
     });
 
     const action: any = new DepositSubmissionSuccessAction(submissionId);
@@ -241,7 +245,7 @@ describe('submissionReducer test suite', () => {
       errorsToShow: [],
       serverValidationErrors: [],
       isLoading: false,
-      isValid: true
+      isValid: true,
     } as any;
 
     let action: any = new InitSubmissionFormAction(collectionId, submissionId, selfUrl, submissionDefinition, {}, new Item(), null);
@@ -273,7 +277,7 @@ describe('submissionReducer test suite', () => {
     expect(newState[826].sections.traditionalpagetwo.enabled).toBeTruthy();
   });
 
-  it('should enable submission section properly', () => {
+  it('should disable submission section properly', () => {
 
     let action: SubmissionObjectAction = new EnableSectionAction(submissionId, 'traditionalpagetwo');
     let newState = submissionObjectReducer(initState, action);
@@ -306,8 +310,8 @@ describe('submissionReducer test suite', () => {
           authority: null,
           display: 'Author, Test',
           confidence: -1,
-          place: 0
-        }
+          place: 0,
+        },
       ],
       'dc.title': [
         {
@@ -316,8 +320,8 @@ describe('submissionReducer test suite', () => {
           authority: null,
           display: 'Title Test',
           confidence: -1,
-          place: 0
-        }
+          place: 0,
+        },
       ],
       'dc.date.issued': [
         {
@@ -326,9 +330,9 @@ describe('submissionReducer test suite', () => {
           authority: null,
           display: '2015',
           confidence: -1,
-          place: 0
-        }
-      ]
+          place: 0,
+        },
+      ],
     } as any;
 
     const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', data, [], []);
@@ -352,8 +356,8 @@ describe('submissionReducer test suite', () => {
     const errors = [
       {
         path: '/sections/license',
-        message: 'error.validation.license.notgranted'
-      }
+        message: 'error.validation.license.notgranted',
+      },
     ];
 
     const action = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
@@ -374,7 +378,7 @@ describe('submissionReducer test suite', () => {
   it('should add submission section error properly', () => {
     const error = {
       path: '/sections/traditionalpageone/dc.title/0',
-      message: 'error.validation.traditionalpageone.required'
+      message: 'error.validation.traditionalpageone.required',
     };
 
     const action = new InertSectionErrorsAction(submissionId, 'traditionalpageone', error);
@@ -387,21 +391,21 @@ describe('submissionReducer test suite', () => {
     const errors = [
       {
         path: '/sections/traditionalpageone/dc.contributor.author',
-        message: 'error.validation.required'
+        message: 'error.validation.required',
       },
       {
         path: '/sections/traditionalpageone/dc.date.issued',
-        message: 'error.validation.required'
-      }
+        message: 'error.validation.required',
+      },
     ];
     const error = {
       path: '/sections/traditionalpageone/dc.contributor.author',
-      message: 'error.validation.required'
+      message: 'error.validation.required',
     };
 
     const expectedErrors = [{
       path: '/sections/traditionalpageone/dc.date.issued',
-      message: 'error.validation.required'
+      message: 'error.validation.required',
     }];
 
     let action: any = new UpdateSectionDataAction(submissionId, 'traditionalpageone', {}, errors, errors);
@@ -433,9 +437,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: '28297_389341539060_6452876_n.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -446,17 +450,17 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
     };
     const expectedState = {
-      files: [fileData]
+      files: [fileData],
     };
 
     const action = new NewUploadedFileAction(submissionId, 'upload', uuid, fileData);
@@ -478,9 +482,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'image_test.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -491,14 +495,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
     };
     const fileData2: any = {
       uuid: uuid2,
@@ -510,9 +514,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'image_test.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -523,14 +527,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content',
     };
 
     const state: SubmissionObjectState = Object.assign({}, initState, {
@@ -538,15 +542,15 @@ describe('submissionReducer test suite', () => {
         sections: Object.assign({}, initState[submissionId].sections, {
           upload: Object.assign({}, initState[submissionId].sections.upload, {
             data: {
-              files: [fileData, fileData2]
-            }
-          })
-        })
-      })
+              files: [fileData, fileData2],
+            },
+          }),
+        }),
+      }),
     });
 
     const expectedState = {
-      files: [fileData]
+      files: [fileData],
     };
 
     const action = new DeleteUploadedFileAction(submissionId, 'upload', uuid2);
@@ -567,9 +571,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'image_test.jpg',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -580,14 +584,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/8cd86fba-70c8-483d-838a-70d28e7ed570/content',
     };
     const fileData2: any = {
       uuid: uuid,
@@ -599,9 +603,9 @@ describe('submissionReducer test suite', () => {
             authority: null,
             display: 'New title',
             confidence: -1,
-            place: 0
-          }
-        ]
+            place: 0,
+          },
+        ],
       },
       accessConditions: [],
       format: {
@@ -612,14 +616,14 @@ describe('submissionReducer test suite', () => {
         supportLevel: 0,
         internal: false,
         extensions: null,
-        type: 'bitstreamformat'
+        type: 'bitstreamformat',
       },
       sizeBytes: 22737,
       checkSum: {
         checkSumAlgorithm: 'MD5',
-        value: '8722864dd671912f94a999ac7c4949d2'
+        value: '8722864dd671912f94a999ac7c4949d2',
       },
-      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content'
+      url: 'https://rest.api/dspace-spring-rest/api/core/bitstreams/7e2f4ba9-9316-41fd-844a-1ef435f41a42/content',
     };
 
     const state: SubmissionObjectState = Object.assign({}, initState, {
@@ -627,15 +631,15 @@ describe('submissionReducer test suite', () => {
         sections: Object.assign({}, initState[submissionId].sections, {
           upload: Object.assign({}, initState[submissionId].sections.upload, {
             data: {
-              files: [fileData]
-            }
-          })
-        })
-      })
+              files: [fileData],
+            },
+          }),
+        }),
+      }),
     });
 
     const expectedState = {
-      files: [fileData2]
+      files: [fileData2],
     };
 
     const action = new EditFileDataAction(submissionId, 'upload', uuid, fileData2);
@@ -644,4 +648,20 @@ describe('submissionReducer test suite', () => {
     expect(newState[826].sections.upload.data).toEqual(expectedState);
   });
 
+  it('should enable duplicates section properly', () => {
+
+    let action: SubmissionObjectAction = new EnableSectionAction(submissionId, 'duplicates');
+    let newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].sections.duplicates.enabled).toBeTruthy();
+  });
+
+  it('should clean duplicates section properly', () => {
+
+    let action = new CleanDuplicateDetectionAction(submissionId);
+    let newState = submissionObjectReducer(initState, action);
+
+    expect(newState[826].sections.duplicates.enabled).toBeFalsy();
+  });
+
 });
diff --git a/src/app/submission/objects/submission-objects.reducer.ts b/src/app/submission/objects/submission-objects.reducer.ts
index 564e5a701b..82e33062cd 100644
--- a/src/app/submission/objects/submission-objects.reducer.ts
+++ b/src/app/submission/objects/submission-objects.reducer.ts
@@ -1,8 +1,20 @@
-import { hasValue, isEmpty, isNotEmpty, isNotNull, isUndefined } from '../../shared/empty.util';
-import { differenceWith, findKey, isEqual, uniqWith } from 'lodash';
+import differenceWith from 'lodash/differenceWith';
+import findKey from 'lodash/findKey';
+import isEqual from 'lodash/isEqual';
+import uniqWith from 'lodash/uniqWith';
 
+import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotNull,
+  isNull,
+  isUndefined,
+} from '../../shared/empty.util';
 import {
   ChangeSubmissionCollectionAction,
+  CleanDuplicateDetectionAction,
   CompleteInitSubmissionFormAction,
   DeleteSectionErrorsAction,
   DeleteUploadedFileAction,
@@ -11,6 +23,7 @@ import {
   DepositSubmissionSuccessAction,
   DisableSectionAction,
   EditFileDataAction,
+  EditFilePrimaryBitstreamAction,
   EnableSectionAction,
   InertSectionErrorsAction,
   InitSectionAction,
@@ -33,9 +46,8 @@ import {
   SetSectionFormId,
   SubmissionObjectAction,
   SubmissionObjectActionTypes,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from './submission-objects.actions';
-import { WorkspaceitemSectionUploadObject } from '../../core/submission/models/workspaceitem-section-upload.model';
 import { SubmissionSectionObject } from './submission-section-object.model';
 
 /**
@@ -200,6 +212,10 @@ export function submissionObjectReducer(state = initialState, action: Submission
       return newFile(state, action as NewUploadedFileAction);
     }
 
+    case SubmissionObjectActionTypes.EDIT_FILE_PRIMARY_BITSTREAM_DATA: {
+      return editPrimaryBitstream(state, action as EditFilePrimaryBitstreamAction);
+    }
+
     case SubmissionObjectActionTypes.EDIT_FILE_DATA: {
       return editFileData(state, action as EditFileDataAction);
     }
@@ -221,6 +237,10 @@ export function submissionObjectReducer(state = initialState, action: Submission
       return removeSectionErrors(state, action as RemoveSectionErrorsAction);
     }
 
+    case SubmissionObjectActionTypes.CLEAN_DUPLICATE_DETECTION: {
+      return cleanDuplicateDetectionSection(state, action as CleanDuplicateDetectionAction);
+    }
+
     default: {
       return state;
     }
@@ -246,10 +266,10 @@ const removeError = (state: SubmissionObjectState, action: DeleteSectionErrorsAc
       [ submissionId ]: Object.assign({}, state[ submissionId ], {
         sections: Object.assign({}, state[ submissionId ].sections, {
           [ sectionId ]: Object.assign({}, state[ submissionId ].sections [ sectionId ], {
-            errorsToShow: filteredErrors
-          })
-        })
-      })
+            errorsToShow: filteredErrors,
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -266,10 +286,10 @@ const addError = (state: SubmissionObjectState, action: InertSectionErrorsAction
       [ submissionId ]: Object.assign({}, state[ submissionId ], {
         activeSection: state[ action.payload.submissionId ].activeSection,        sections: Object.assign({}, state[ submissionId ].sections, {
           [ sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-            errorsToShow
-          })
+            errorsToShow,
+          }),
         }),
-      })
+      }),
     });
   } else {
     return state;
@@ -293,10 +313,10 @@ function removeSectionErrors(state: SubmissionObjectState, action: RemoveSection
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-            errorsToShow: []
-          })
-        })
-      })
+            errorsToShow: [],
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -346,8 +366,8 @@ function resetSubmission(state: SubmissionObjectState, action: ResetSubmissionFo
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         sections: Object.create(null),
-        isLoading: true
-      })
+        isLoading: true,
+      }),
     });
   } else {
     return state;
@@ -368,8 +388,8 @@ function completeInit(state: SubmissionObjectState, action: CompleteInitSubmissi
   if (hasValue(state[ action.payload.submissionId ])) {
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
-        isLoading: false
-      })
+        isLoading: false,
+      }),
     });
   } else {
     return state;
@@ -388,7 +408,7 @@ function completeInit(state: SubmissionObjectState, action: CompleteInitSubmissi
  *    the new state, with the flag set to true.
  */
 function saveSubmission(state: SubmissionObjectState,
-                        action: SaveSubmissionFormAction
+  action: SaveSubmissionFormAction
                           | SaveSubmissionSectionFormAction
                           | SaveForLaterSubmissionFormAction
                           | SaveAndDepositSubmissionAction): SubmissionObjectState {
@@ -399,7 +419,7 @@ function saveSubmission(state: SubmissionObjectState,
         sections: state[ action.payload.submissionId ].sections,
         isLoading: state[ action.payload.submissionId ].isLoading,
         savePending: true,
-      })
+      }),
     });
   } else {
     return state;
@@ -419,7 +439,7 @@ function saveSubmission(state: SubmissionObjectState,
  *    the new state, with the flag set to false.
  */
 function completeSave(state: SubmissionObjectState,
-                      action: SaveSubmissionFormSuccessAction
+  action: SaveSubmissionFormSuccessAction
                         | SaveForLaterSubmissionFormSuccessAction
                         | SaveSubmissionSectionFormSuccessAction
                         | SaveSubmissionFormErrorAction
@@ -429,7 +449,7 @@ function completeSave(state: SubmissionObjectState,
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         savePending: false,
-      })
+      }),
     });
   } else {
     return state;
@@ -452,7 +472,7 @@ function startDeposit(state: SubmissionObjectState, action: DepositSubmissionAct
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         savePending: false,
         depositPending: true,
-      })
+      }),
     });
   } else {
     return state;
@@ -474,7 +494,7 @@ function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSucce
     return Object.assign({}, state, {
       [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
         depositPending: false,
-      })
+      }),
     });
   } else {
     return state;
@@ -494,8 +514,8 @@ function endDeposit(state: SubmissionObjectState, action: DepositSubmissionSucce
 function changeCollection(state: SubmissionObjectState, action: ChangeSubmissionCollectionAction): SubmissionObjectState {
   return Object.assign({}, state, {
     [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
-      collection: action.payload.collectionId
-    })
+      collection: action.payload.collectionId,
+    }),
   });
 }
 
@@ -519,7 +539,7 @@ function setActiveSection(state: SubmissionObjectState, action: SetActiveSection
         sections: state[ action.payload.submissionId ].sections,
         isLoading: state[ action.payload.submissionId ].isLoading,
         savePending: state[ action.payload.submissionId ].savePending,
-      })
+      }),
     });
   } else {
     return state;
@@ -553,10 +573,10 @@ function initSection(state: SubmissionObjectState, action: InitSectionAction): S
             errorsToShow: [],
             serverValidationErrors: action.payload.errors || [],
             isLoading: false,
-            isValid: isEmpty(action.payload.errors)
-          }
-        })
-      })
+            isValid: isEmpty(action.payload.errors),
+          },
+        }),
+      }),
     });
   } else {
     return state;
@@ -580,10 +600,10 @@ function setSectionFormId(state: SubmissionObjectState, action: SetSectionFormId
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: {
             ...state[ action.payload.submissionId ].sections [action.payload.sectionId],
-            formId: action.payload.formId
-          }
-        })
-      })
+            formId: action.payload.formId,
+          },
+        }),
+      }),
     });
   } else {
     return state;
@@ -611,10 +631,10 @@ function updateSectionData(state: SubmissionObjectState, action: UpdateSectionDa
             data: action.payload.data,
             errorsToShow: action.payload.errorsToShow,
             serverValidationErrors: action.payload.serverValidationErrors,
-            metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata)
-          })
-        })
-      })
+            metadata: reduceSectionMetadata(action.payload.metadata, state[ action.payload.submissionId ].sections [ action.payload.sectionId ].metadata),
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -658,10 +678,10 @@ function changeSectionState(state: SubmissionObjectState, action: EnableSectionA
         // sections: deleteProperty(state[ action.payload.submissionId ].sections, action.payload.sectionId),
         sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
           [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-            enabled
-          })
-        })
-      })
+            enabled,
+          }),
+        }),
+      }),
     });
   } else {
     return state;
@@ -685,11 +705,11 @@ function setIsValid(state: SubmissionObjectState, action: SectionStatusChangeAct
         sections: Object.assign({}, state[ action.payload.submissionId ].sections,
           Object.assign({}, {
             [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
-              isValid: action.payload.status
-            })
-          })
-        )
-      })
+              isValid: action.payload.status,
+            }),
+          }),
+        ),
+      }),
     });
   } else {
     return state;
@@ -713,7 +733,7 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
   let newData;
   if (isUndefined(filesData.files)) {
     newData = {
-      files: [action.payload.data]
+      files: [action.payload.data],
     };
   } else {
     newData = filesData;
@@ -725,13 +745,53 @@ function newFile(state: SubmissionObjectState, action: NewUploadedFileAction): S
       sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
         [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
           enabled: true,
-          data: newData
-        })
-      })
-    })
+          data: newData,
+        }),
+      }),
+    }),
   });
 }
 
+/**
+ * Edit primary bitstream.
+ *
+ * @param state
+ *    the current state
+ * @param action
+ *    an EditFilePrimaryBitstreamAction action
+ * @return SubmissionObjectState
+ *    the new state, with the edited file.
+ */
+function editPrimaryBitstream(state: SubmissionObjectState, action: EditFilePrimaryBitstreamAction): SubmissionObjectState {
+  const filesData = state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data as WorkspaceitemSectionUploadObject;
+  const { submissionId, sectionId, fileId } = action.payload;
+
+  const fileIndex = findKey(filesData.files, { uuid: fileId });
+  if (isNull(fileIndex)) {
+    return state;
+  }
+
+  const submission = state[submissionId];
+  return {
+    ...state,
+    [submissionId]: {
+      ...submission,
+      sections: {
+        ...submission.sections,
+        [sectionId]: {
+          ...submission.sections[sectionId],
+          data: {
+            ...submission.sections[sectionId].data as WorkspaceitemSectionUploadObject,
+            primary: fileId,
+          },
+        },
+      },
+      isLoading: submission.isLoading,
+      savePending: submission.savePending,
+    },
+  };
+}
+
 /**
  * Edit a file.
  *
@@ -758,14 +818,14 @@ function editFileData(state: SubmissionObjectState, action: EditFileDataAction):
             Object.assign({}, {
               [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections [ action.payload.sectionId ], {
                 data: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data, {
-                  files: newData
-                })
-              })
-            })
+                  files: newData,
+                }),
+              }),
+            }),
           ),
           isLoading: state[ action.payload.submissionId ].isLoading,
           savePending: state[ action.payload.submissionId ].savePending,
-        })
+        }),
       });
     }
   }
@@ -787,7 +847,7 @@ function deleteFile(state: SubmissionObjectState, action: DeleteUploadedFileActi
   if (hasValue(filesData.files)) {
     const fileIndex: any = findKey(
       filesData.files,
-      {uuid: action.payload.fileId});
+      { uuid: action.payload.fileId });
     if (isNotNull(fileIndex)) {
       const newData = Array.from(filesData.files);
       newData.splice(fileIndex, 1);
@@ -797,14 +857,31 @@ function deleteFile(state: SubmissionObjectState, action: DeleteUploadedFileActi
             Object.assign({}, {
               [ action.payload.sectionId ]: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ], {
                 data: Object.assign({}, state[ action.payload.submissionId ].sections[ action.payload.sectionId ].data, {
-                  files: newData
-                })
-              })
-            })
-          )
-        })
+                  files: newData,
+                }),
+              }),
+            }),
+          ),
+        }),
       });
     }
   }
   return state;
 }
+
+function cleanDuplicateDetectionSection(state: SubmissionObjectState, action: CleanDuplicateDetectionAction): SubmissionObjectState {
+  if (isNotEmpty(state[ action.payload.submissionId ]) && state[action.payload.submissionId].sections.hasOwnProperty('duplicates')) {
+    return Object.assign({}, state, {
+      [ action.payload.submissionId ]: Object.assign({}, state[ action.payload.submissionId ], {
+        sections: Object.assign({}, state[ action.payload.submissionId ].sections, {
+          [ 'duplicates' ]: Object.assign({}, state[ action.payload.submissionId ].sections.duplicates, {
+            enabled: false,
+            data: { potentialDuplicates: [] },
+          }),
+        }),
+      }),
+    });
+  } else {
+    return state;
+  }
+}
diff --git a/src/app/submission/objects/submission-section-object.model.ts b/src/app/submission/objects/submission-section-object.model.ts
index 16e437da80..7338539607 100644
--- a/src/app/submission/objects/submission-section-object.model.ts
+++ b/src/app/submission/objects/submission-section-object.model.ts
@@ -1,6 +1,6 @@
+import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SectionsType } from '../sections/sections-type';
 import { SectionVisibility } from './section-visibility.model';
-import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
 import { SubmissionSectionError } from './submission-section-error.model';
 
 /**
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..92fc7eefd7 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.spec.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.spec.ts
@@ -1,45 +1,49 @@
-import { FormService } from '../../../shared/form/form.service';
-import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
-
-import { SubmissionSectionAccessesComponent } from './section-accesses.component';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
 import {
-  getSubmissionAccessesConfigNotChangeDiscoverableService,
-  getSubmissionAccessesConfigService
-} from '../../../shared/mocks/section-accesses-config.service.mock';
-import { SectionAccessesService } from './section-accesses.service';
-import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../core/submission/submission-json-patch-operations.service';
-import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock';
-import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import {
-  SubmissionJsonPatchOperationsServiceStub
-} from '../../../shared/testing/submission-json-patch-operations-service.stub';
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
 import { BrowserModule } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
-import { Store } from '@ngrx/store';
-import { FormComponent } from '../../../shared/form/form.component';
 import {
   DynamicCheckboxModel,
   DynamicDatePickerModel,
   DynamicFormArrayModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import { Store } from '@ngrx/store';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
 import { AppState } from '../../../app.reducer';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import { getSectionAccessesService } from '../../../shared/mocks/section-accesses.service.mock';
+import {
+  getSubmissionAccessesConfigNotChangeDiscoverableService,
+  getSubmissionAccessesConfigService,
+} from '../../../shared/mocks/section-accesses-config.service.mock';
 import { mockAccessesFormData } from '../../../shared/mocks/submission.mock';
-import { accessConditionChangeEvent, checkboxChangeEvent } from '../../../shared/testing/form-event.stub';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import {
+  accessConditionChangeEvent,
+  checkboxChangeEvent,
+} from '../../../shared/testing/form-event.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionsService } from '../sections.service';
+import { SubmissionSectionAccessesComponent } from './section-accesses.component';
+import { SectionAccessesService } from './section-accesses.service';
 
 describe('SubmissionSectionAccessesComponent', () => {
   let component: SubmissionSectionAccessesComponent;
@@ -70,12 +74,12 @@ describe('SubmissionSectionAccessesComponent', () => {
     enabled: true,
     data: {
       discoverable: true,
-      accessConditions: []
+      accessConditions: [],
     },
     errorsToShow: [],
     serverValidationErrors: [],
     isLoading: false,
-    isValid: true
+    isValid: true,
   };
 
   describe('First with canChangeDiscoverable true', () => {
@@ -84,7 +88,7 @@ describe('SubmissionSectionAccessesComponent', () => {
       await TestBed.configureTestingModule({
         imports: [
           BrowserModule,
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
@@ -99,8 +103,8 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
-          FormBuilderService
-        ]
+          FormBuilderService,
+        ],
       })
         .compileComponents();
     });
@@ -144,8 +148,8 @@ describe('SubmissionSectionAccessesComponent', () => {
     });
 
     it('should have set maxStartDate and maxEndDate properly', () => {
-      const maxStartDate = {year: 2024, month: 12, day: 20};
-      const maxEndDate = {year: 2022, month: 6, day: 20};
+      const maxStartDate = { year: 2024, month: 12, day: 20 };
+      const maxEndDate = { year: 2022, month: 6, day: 20 };
 
       const startDateModel = formbuilderService.findById('startDate', component.formModel);
       expect(startDateModel.max).toEqual(maxStartDate);
@@ -175,7 +179,7 @@ describe('SubmissionSectionAccessesComponent', () => {
       await TestBed.configureTestingModule({
         imports: [
           BrowserModule,
-          TranslateModule.forRoot()
+          TranslateModule.forRoot(),
         ],
         declarations: [SubmissionSectionAccessesComponent, FormComponent],
         providers: [
@@ -191,7 +195,7 @@ describe('SubmissionSectionAccessesComponent', () => {
           { provide: SubmissionJsonPatchOperationsService, useValue: SubmissionJsonPatchOperationsServiceStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
-        ]
+        ],
       })
         .compileComponents();
     });
diff --git a/src/app/submission/sections/accesses/section-accesses.component.ts b/src/app/submission/sections/accesses/section-accesses.component.ts
index 25106f3ba8..5c8d7afb14 100644
--- a/src/app/submission/sections/accesses/section-accesses.component.ts
+++ b/src/app/submission/sections/accesses/section-accesses.component.ts
@@ -1,16 +1,9 @@
-import { SectionAccessesService } from './section-accesses.service';
-import { Component, Inject, ViewChild } from '@angular/core';
-import { FormControl } from '@angular/forms';
-
-import { filter, map, mergeMap, take } from 'rxjs/operators';
-import { combineLatest, Observable, of, Subscription } from 'rxjs';
-import { TranslateService } from '@ngx-translate/core';
-
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsService } from '../sections.service';
-import { SectionModelComponent } from '../models/section.model';
+import {
+  Component,
+  Inject,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormControl } from '@angular/forms';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_CHECKBOX,
   DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER,
@@ -22,10 +15,46 @@ import {
   DynamicFormGroupModel,
   DynamicSelectModel,
   MATCH_ENABLED,
-  OR_OPERATOR
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
+import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  combineLatest,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
+import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
+import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
+import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
+import { dateToISOFormat } from '../../../shared/date.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 import {
   ACCESS_CONDITION_GROUP_CONFIG,
   ACCESS_CONDITION_GROUP_LAYOUT,
@@ -38,26 +67,9 @@ import {
   FORM_ACCESS_CONDITION_START_DATE_CONFIG,
   FORM_ACCESS_CONDITION_START_DATE_LAYOUT,
   FORM_ACCESS_CONDITION_TYPE_CONFIG,
-  FORM_ACCESS_CONDITION_TYPE_LAYOUT
+  FORM_ACCESS_CONDITION_TYPE_LAYOUT,
 } from './section-accesses.model';
-import { hasValue, isNotEmpty, isNotNull } from '../../../shared/empty.util';
-import {
-  WorkspaceitemSectionAccessesObject
-} from '../../../core/submission/models/workspaceitem-section-accesses.model';
-import { SubmissionAccessesConfigDataService } from '../../../core/config/submission-accesses-config-data.service';
-import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
-import { FormComponent } from '../../../shared/form/form.component';
-import { FormService } from '../../../shared/form/form.service';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { AccessesConditionOption } from '../../../core/config/models/config-accesses-conditions-options.model';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../core/submission/submission-json-patch-operations.service';
-import { dateToISOFormat } from '../../../shared/date.util';
-import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
-import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { SectionAccessesService } from './section-accesses.service';
 
 /**
  * This component represents a section for managing item's access conditions.
@@ -65,7 +77,7 @@ import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynami
 @Component({
   selector: 'ds-section-accesses',
   templateUrl: './section-accesses.component.html',
-  styleUrls: ['./section-accesses.component.scss']
+  styleUrls: ['./section-accesses.component.scss'],
 })
 @renderSectionFor(SectionsType.AccessesCondition)
 export class SubmissionSectionAccessesComponent extends SectionModelComponent {
@@ -163,7 +175,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
               metadataModel.value = {
                 year: date.getUTCFullYear(),
                 month: date.getUTCMonth() + 1,
-                day: date.getUTCDate()
+                day: date.getUTCDate(),
               };
             } else {
               metadataModel.value = accessCondition[key];
@@ -186,8 +198,8 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
       if (event.model.id === FORM_ACCESS_CONDITION_TYPE_CONFIG.id) {
         // Clear previous state when switching through different access conditions
 
-        const startDateControl: FormControl = event.control.parent.get('startDate') as FormControl;
-        const endDateControl: FormControl = event.control.parent.get('endDate') as FormControl;
+        const startDateControl: UntypedFormControl = event.control.parent.get('startDate') as UntypedFormControl;
+        const endDateControl: UntypedFormControl = event.control.parent.get('endDate') as UntypedFormControl;
 
         startDateControl?.markAsUntouched();
         endDateControl?.markAsUntouched();
@@ -203,7 +215,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
         take(1),
         filter((isValid) => isValid),
         mergeMap(() => this.formService.getFormData(this.formId)),
-        take(1)
+        take(1),
       ).subscribe((formData: any) => {
         const accessConditionsToSave = [];
         formData.accessCondition
@@ -307,10 +319,10 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
       const discoverableCheckboxConfig = Object.assign({}, ACCESS_FORM_CHECKBOX_CONFIG, {
         label: this.translate.instant('submission.sections.accesses.form.discoverable-label'),
         hint: this.translate.instant('submission.sections.accesses.form.discoverable-description'),
-        value: this.accessesData.discoverable
+        value: this.accessesData.discoverable,
       });
       formModel.push(
-        new DynamicCheckboxModel(discoverableCheckboxConfig, ACCESS_FORM_CHECKBOX_LAYOUT)
+        new DynamicCheckboxModel(discoverableCheckboxConfig, ACCESS_FORM_CHECKBOX_LAYOUT),
       );
     }
 
@@ -322,8 +334,8 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
       accessConditionTypeOptions.push(
         {
           label: accessCondition.name,
-          value: accessCondition.name
-        }
+          value: accessCondition.name,
+        },
       );
     }
     accessConditionTypeModelConfig.options = accessConditionTypeOptions;
@@ -342,7 +354,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
           maxStartDate = {
             year: min.getUTCFullYear(),
             month: min.getUTCMonth() + 1,
-            day: min.getUTCDate()
+            day: min.getUTCDate(),
           };
         }
       }
@@ -353,7 +365,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
           maxEndDate = {
             year: max.getUTCFullYear(),
             month: max.getUTCMonth() + 1,
-            day: max.getUTCDate()
+            day: max.getUTCDate(),
           };
         }
       }
@@ -391,7 +403,7 @@ export class SubmissionSectionAccessesComponent extends SectionModelComponent {
     // Number of access conditions blocks in form
     accessConditionsArrayConfig.initialCount = isNotEmpty(this.accessesData.accessConditions) ? this.accessesData.accessConditions.length : 1;
     formModel.push(
-      new DynamicFormArrayModel(accessConditionsArrayConfig, ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT)
+      new DynamicFormArrayModel(accessConditionsArrayConfig, ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT),
     );
 
     this.initModelData(formModel);
diff --git a/src/app/submission/sections/accesses/section-accesses.model.ts b/src/app/submission/sections/accesses/section-accesses.model.ts
index 435c521175..6b4732b881 100644
--- a/src/app/submission/sections/accesses/section-accesses.model.ts
+++ b/src/app/submission/sections/accesses/section-accesses.model.ts
@@ -12,7 +12,7 @@ import { DynamicCheckboxModelConfig } from '@ng-dynamic-forms/core/lib/model/che
 
 export const ACCESS_FORM_CHECKBOX_CONFIG: DynamicCheckboxModelConfig = {
   id: 'discoverable',
-  name: 'discoverable'
+  name: 'discoverable',
 };
 
 export const ACCESS_FORM_CHECKBOX_LAYOUT = {
@@ -20,21 +20,21 @@ export const ACCESS_FORM_CHECKBOX_LAYOUT = {
   element: {
     container: 'custom-control custom-checkbox pl-1',
     control: 'custom-control-input',
-    label: 'custom-control-label pt-1'
-  }
+    label: 'custom-control-label pt-1',
+  },
 };
 
 export const ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'accessConditionGroup',
-  group: []
+  group: [],
 };
 
 export const ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'form-group access-condition-group col',
     container: 'pl-1 pr-1',
-    control: 'form-row '
-  }
+    control: 'form-row ',
+  },
 };
 
 export const ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig = {
@@ -44,20 +44,20 @@ export const ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig =
 export const ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
     group: 'form-row pt-4',
-  }
+  },
 };
 
 export const FORM_ACCESS_CONDITION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
   id: 'name',
   label: 'submission.sections.accesses.form.access-condition-label',
   hint: 'submission.sections.accesses.form.access-condition-hint',
-  options: []
+  options: [],
 };
 export const FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'col-12',
-    label: 'col-form-label name-label'
-  }
+    label: 'col-form-label name-label',
+  },
 };
 
 export const FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -71,24 +71,24 @@ export const FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConf
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.accesses.form.date-required-from'
-  }
+    required: 'submission.sections.accesses.form.date-required-from',
+  },
 };
 export const FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
 
 export const FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -102,22 +102,22 @@ export const FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerModelConfig
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.accesses.form.date-required-until'
-  }
+    required: 'submission.sections.accesses.form.date-required-until',
+  },
 };
 export const FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
diff --git a/src/app/submission/sections/accesses/section-accesses.service.ts b/src/app/submission/sections/accesses/section-accesses.service.ts
index f358582136..cb9b1e5ef3 100644
--- a/src/app/submission/sections/accesses/section-accesses.service.ts
+++ b/src/app/submission/sections/accesses/section-accesses.service.ts
@@ -1,13 +1,15 @@
 import { Injectable } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+} from 'rxjs/operators';
 
-import { SubmissionState } from '../../submission.reducers';
+import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
 import { isNotUndefined } from '../../../shared/empty.util';
 import { submissionSectionDataFromIdSelector } from '../../selectors';
-import { WorkspaceitemSectionAccessesObject } from '../../../core/submission/models/workspaceitem-section-accesses.model';
+import { SubmissionState } from '../../submission.reducers';
 
 /**
  * A service that provides methods to handle submission item's accesses condition state.
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 6b9d542abc..7c6145a65e 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
@@ -20,7 +20,7 @@
     </ng-container>
 
     <ng-container class="menu">
-      <button *ngIf="submissionCcLicenses?.length == 0"
+      <button *ngIf="submissionCcLicenses?.length === 0"
               class="dropdown-item disabled">
         {{ 'submission.sections.ccLicense.none' | translate }}
       </button>
@@ -81,7 +81,7 @@
 
     </ng-template>
 
-    <ds-select *ngIf="field.enums?.length > 5">
+    <ds-select *ngIf="field.enums?.length > 5" [disabled]="field.id === 'jurisdiction' && defaultJurisdiction !== undefined && defaultJurisdiction !== 'none'">
       <ng-container class="selection" *ngVar="getSelectedOption(getSelectedCcLicense(), field) as option">
         <span *ngIf="option">
           {{ option.label }}
@@ -134,9 +134,10 @@
       <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>
+          <span> {{ 'submission.sections.ccLicense.confirmation' | translate }}</span>
         </div>
       </div>
     </div>
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 3757ca87b8..9048a3d25e 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
@@ -1,21 +1,28 @@
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
-import { SubmissionSectionCcLicensesComponent } from './submission-section-cc-licenses.component';
-import { SUBMISSION_CC_LICENSE } from '../../../core/submission/models/submission-cc-licence.resource-type';
-import { of as observableOf } from 'rxjs';
-import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { SharedModule } from '../../../shared/shared.module';
-import { SectionsService } from '../sections.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
 import { TranslateModule } from '@ngx-translate/core';
-import { SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
 import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { ConfigurationProperty } from '../../../core/shared/configuration-property.model';
+import { SUBMISSION_CC_LICENSE } from '../../../core/submission/models/submission-cc-licence.resource-type';
+import { SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
+import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
 import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SharedModule } from '../../../shared/shared.module';
 import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionCcLicensesComponent } from './submission-section-cc-licenses.component';
 
 describe('SubmissionSectionCcLicensesComponent', () => {
 
@@ -31,7 +38,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     serverValidationErrors: [],
     header: 'test header',
     id: 'test section id',
-    sectionType: SectionsType.SubmissionForm
+    sectionType: SectionsType.SubmissionForm,
   };
 
   const submissionCcLicenses: SubmissionCcLicence[] = [
@@ -94,12 +101,12 @@ describe('SubmissionSectionCcLicensesComponent', () => {
             {
               id: 'test enum id 2a I',
               label: 'test enum label 2a I',
-              description: 'test enum description 2a I'
+              description: 'test enum description 2a I',
             },
             {
               id: 'test enum id 2a II',
               label: 'test enum label 2a II',
-              description: 'test enum description 2a II'
+              description: 'test enum description 2a II',
             },
           ],
         },
@@ -111,12 +118,12 @@ describe('SubmissionSectionCcLicensesComponent', () => {
             {
               id: 'test enum id 2b I',
               label: 'test enum label 2b I',
-              description: 'test enum description 2b I'
+              description: 'test enum description 2b I',
             },
             {
               id: 'test enum id 2b II',
               label: 'test enum label 2b II',
-              description: 'test enum description 2b II'
+              description: 'test enum description 2b II',
             },
           ],
         },
@@ -137,7 +144,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     getCcLicenseLink: createSuccessfulRemoteDataObject$(
       {
         url: 'test cc license link',
-      }
+      },
     ),
   });
 
@@ -148,7 +155,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     setSectionStatus: () => undefined,
     updateSectionData: (submissionId, sectionId, updatedData) => {
       component.sectionData.data = updatedData;
-    }
+    },
   };
 
   const operationsBuilder = jasmine.createSpyObj('operationsBuilder', {
@@ -156,6 +163,14 @@ describe('SubmissionSectionCcLicensesComponent', () => {
     remove: undefined,
   });
 
+  const configurationDataService = jasmine.createSpyObj('configurationDataService', {
+    findByPropertyName: createSuccessfulRemoteDataObject$({
+      ... new ConfigurationProperty(),
+      name: 'cc.license.jurisdiction',
+      values: ['mock-jurisdiction-value'],
+    }),
+  });
+
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
@@ -170,6 +185,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
         { provide: SubmissionCcLicenseUrlDataService, useValue: submissionCcLicenseUrlDataService },
         { provide: SectionsService, useValue: sectionService },
         { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
+        { provide: ConfigurationDataService, useValue: configurationDataService },
         { provide: 'collectionIdProvider', useValue: 'test collection id' },
         { provide: 'sectionDataProvider', useValue: Object.assign({}, sectionObject) },
         { provide: 'submissionIdProvider', useValue: 'test submission id' },
@@ -187,10 +203,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 ds-select .dropdown-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 ds-select .dropdown-menu button:nth-child(2)')).nativeElement.innerText,
     ).toContain('test license name 2');
   });
 
@@ -205,7 +221,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
 
     it('should display the selected cc license', () => {
       expect(
-        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText
+        de.query(By.css('.ccLicense-select ds-select button.selection')).nativeElement.innerText,
       ).toContain('test license name 2');
     });
 
@@ -238,7 +254,7 @@ describe('SubmissionSectionCcLicensesComponent', () => {
           new Map([
             [ccLicence.fields[0], ccLicence.fields[0].enums[1]],
             [ccLicence.fields[1], ccLicence.fields[1].enums[0]],
-          ])
+          ]),
         );
       });
 
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 9e6a5ae07f..78feb16f11 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,20 +1,45 @@
-import { Component, Inject } from '@angular/core';
-import { Observable, of as observableOf, Subscription } from 'rxjs';
-import { Field, Option, SubmissionCcLicence } from '../../../core/submission/models/submission-cc-license.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import {
+  NgbModal,
+  NgbModalRef,
+} from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { ConfigurationDataService } from '../../../core/data/configuration-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import {
+  getFirstCompletedRemoteData,
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  Field,
+  Option,
+  SubmissionCcLicence,
+} from '../../../core/submission/models/submission-cc-license.model';
+import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
 import { SubmissionCcLicenseDataService } from '../../../core/submission/submission-cc-license-data.service';
-import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
+import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/submission-cc-license-url-data.service';
+import { isNotEmpty } from '../../../shared/empty.util';
 import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
-import { WorkspaceitemSectionCcLicenseObject } from '../../../core/submission/models/workspaceitem-section-cc-license.model';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-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 { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 
 /**
  * This component represents the submission section to select the Creative Commons license.
@@ -22,7 +47,7 @@ import { SubmissionCcLicenseUrlDataService } from '../../../core/submission/subm
 @Component({
   selector: 'ds-submission-section-cc-licenses',
   templateUrl: './submission-section-cc-licenses.component.html',
-  styleUrls: ['./submission-section-cc-licenses.component.scss']
+  styleUrls: ['./submission-section-cc-licenses.component.scss'],
 })
 @renderSectionFor(SectionsType.CcLicense)
 export class SubmissionSectionCcLicensesComponent extends SectionModelComponent {
@@ -60,6 +85,11 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   protected modalRef: NgbModalRef;
 
+  /**
+   * Default jurisdiction configured
+   */
+  defaultJurisdiction: string;
+
   /**
    * The Creative Commons link saved in the workspace item.
    */
@@ -83,9 +113,10 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     protected submissionCcLicensesDataService: SubmissionCcLicenseDataService,
     protected submissionCcLicenseUrlDataService: SubmissionCcLicenseUrlDataService,
     protected operationsBuilder: JsonPatchOperationsBuilder,
+    protected configService: ConfigurationDataService,
     @Inject('collectionIdProvider') public injectedCollectionId: string,
     @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
-    @Inject('submissionIdProvider') public injectedSubmissionId: string
+    @Inject('submissionIdProvider') public injectedSubmissionId: string,
   ) {
     super(
       injectedCollectionId,
@@ -143,7 +174,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
       ccLicense: {
         id: ccLicense.id,
         fields: Object.assign({}, this.data.ccLicense.fields, {
-          [field.id]: option
+          [field.id]: option,
         }),
       },
       accepted: false,
@@ -156,6 +187,9 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    * @param field       the field for which to get the selected option value.
    */
   getSelectedOption(ccLicense: SubmissionCcLicence, field: Field): Option {
+    if (field.id === 'jurisdiction' && this.defaultJurisdiction !== undefined && this.defaultJurisdiction !== 'none') {
+      return field.enums.find(option => option.id === this.defaultJurisdiction);
+    }
     return this.data.ccLicense.fields[field.id];
   }
 
@@ -174,7 +208,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   getCcLicenseLink$(): Observable<string> {
 
-    if (!!this.storedCcLicenseLink) {
+    if (this.storedCcLicenseLink) {
       return observableOf(this.storedCcLicenseLink);
     }
     if (!this.getSelectedCcLicense() || this.getSelectedCcLicense().fields.some(
@@ -185,7 +219,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
     return this.submissionCcLicenseUrlDataService.getCcLicenseLink(
       selectedCcLicense,
       new Map(selectedCcLicense.fields.map(
-        (field) => [field, this.getSelectedOption(selectedCcLicense, field)]
+        (field) => [field, this.getSelectedOption(selectedCcLicense, field)],
       )),
     );
   }
@@ -243,7 +277,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
             ).subscribe((link) => {
               this.operationsBuilder.add(path, link.toString(), false, true);
             });
-          } else if (!!this.data.uri) {
+          } else if (this.data.uri) {
             this.operationsBuilder.remove(path);
           }
         }
@@ -254,8 +288,19 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
         getRemoteDataPayload(),
         map((list) => list.page),
       ).subscribe(
-        (licenses) => this.submissionCcLicenses = licenses
+        (licenses) => this.submissionCcLicenses = licenses,
       ),
+      this.configService.findByPropertyName('cc.license.jurisdiction').pipe(
+        getFirstCompletedRemoteData(),
+        getRemoteDataPayload(),
+      ).subscribe((remoteData) => {
+        if (remoteData === undefined || remoteData.values.length === 0) {
+          // No value configured, use blank value (International jurisdiction)
+          this.defaultJurisdiction = '';
+        } else {
+          this.defaultJurisdiction = remoteData.values[0];
+        }
+      }),
     );
   }
 
@@ -265,7 +310,7 @@ export class SubmissionSectionCcLicensesComponent extends SectionModelComponent
    */
   setAccepted(accepted: boolean) {
     this.updateSectionData({
-      accepted
+      accepted,
     });
     this.updateSectionStatus();
   }
diff --git a/src/app/submission/sections/container/section-container.component.html b/src/app/submission/sections/container/section-container.component.html
index e6ae9d1b9c..3f0050ea51 100644
--- a/src/app/submission/sections/container/section-container.component.html
+++ b/src/app/submission/sections/container/section-container.component.html
@@ -9,7 +9,7 @@
           'submission.sections.'+sectionData.header | translate
           }}</span>
         <div class="d-inline-block float-right">
-          <i *ngIf="!(sectionRef.isValid() | async) && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
+          <i *ngIf="(sectionRef.isValid() | async) !== true && !(sectionRef.hasErrors()) && !(sectionRef.isInfo())"
             class="fas fa-exclamation-circle text-warning mr-3"
             title="{{'submission.sections.status.warnings.title' | translate}}" role="img"
             [attr.aria-label]="'submission.sections.status.warnings.aria' | translate"></i>
@@ -48,4 +48,4 @@
       </ng-template>
     </ngb-panel>
   </ngb-accordion>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/submission/sections/container/section-container.component.spec.ts b/src/app/submission/sections/container/section-container.component.spec.ts
index 7568b17ea7..2bec3c0ac5 100644
--- a/src/app/submission/sections/container/section-container.component.spec.ts
+++ b/src/app/submission/sections/container/section-container.component.spec.ts
@@ -1,35 +1,45 @@
 // Load the implementations that should be tested
-import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync, } from '@angular/core/testing';
+import {
+  Component,
+  CUSTOM_ELEMENTS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-
-import { of as observableOf } from 'rxjs';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
 
-import { SubmissionSectionContainerComponent } from './section-container.component';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { SectionsType } from '../sections-type';
-import { SectionsDirective } from '../sections.directive';
-import { SubmissionService } from '../../submission.service';
-import { SectionsService } from '../sections.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
 import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
 import { SectionDataObject } from '../models/section-data.model';
-import { mockSubmissionCollectionId, mockSubmissionId } from '../../../shared/mocks/submission.mock';
+import { SectionsDirective } from '../sections.directive';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionContainerComponent } from './section-container.component';
 
 const sectionState = {
   header: 'submit.progressbar.describe.stepone',
-    config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
-    mandatory: true,
-    sectionType: SectionsType.SubmissionForm,
-    collapsed: false,
-    enabled: true,
-    data: {},
-    errorsToShow:	[],
-    serverValidationErrors:	[],
-    isLoading: false,
-    isValid: false
+  config: 'https://rest.api/dspace-spring-rest/api/config/submissionforms/traditionalpageone',
+  mandatory: true,
+  sectionType: SectionsType.SubmissionForm,
+  collapsed: false,
+  enabled: true,
+  data: {},
+  errorsToShow:	[],
+  serverValidationErrors:	[],
+  isLoading: false,
+  isValid: false,
 } as any;
 
 const sectionObject: SectionDataObject = {
@@ -40,7 +50,7 @@ const sectionObject: SectionDataObject = {
   serverValidationErrors:		[],
   header:	'submit.progressbar.describe.stepone',
   id:	'traditionalpageone',
-  sectionType:	SectionsType.SubmissionForm
+  sectionType:	SectionsType.SubmissionForm,
 };
 
 describe('SubmissionSectionContainerComponent test suite', () => {
@@ -68,7 +78,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
     TestBed.configureTestingModule({
       imports: [
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionSectionContainerComponent,
@@ -78,9 +88,9 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       providers: [
         { provide: SectionsService, useValue: sectionsServiceStub },
         { provide: SubmissionService, useValue: submissionServiceStub },
-        SubmissionSectionContainerComponent
+        SubmissionSectionContainerComponent,
       ],
-      schemas: [CUSTOM_ELEMENTS_SCHEMA]
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
     }).compileComponents();
 
   }));
@@ -137,7 +147,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
 
       const section = fixture.debugElement.query(By.css('[id^=\'sectionContent_\']'));
       expect(comp.getSectionContent).toHaveBeenCalled();
-      expect(section).toBeDefined();
+      expect(section).not.toBeNull();
     });
 
     it('should call removeSection properly', () => {
@@ -165,7 +175,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       fixture.detectChanges();
 
       sectionErrorsDiv = fixture.debugElement.query(By.css('[id^=\'sectionGenericError_\']'));
-      expect(sectionErrorsDiv).toBeDefined();
+      expect(sectionErrorsDiv).not.toBeNull();
     });
 
     it('should display warning icon', () => {
@@ -180,7 +190,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       const iconWarn = fixture.debugElement.query(By.css('i.text-warning'));
       const iconErr = fixture.debugElement.query(By.css('i.text-danger'));
       const iconSuccess = fixture.debugElement.query(By.css('i.text-success'));
-      expect(iconWarn).toBeDefined();
+      expect(iconWarn).not.toBeNull();
       expect(iconErr).toBeNull();
       expect(iconSuccess).toBeNull();
     });
@@ -198,7 +208,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       const iconErr = fixture.debugElement.query(By.css('i.text-danger'));
       const iconSuccess = fixture.debugElement.query(By.css('i.text-success'));
       expect(iconWarn).toBeNull();
-      expect(iconErr).toBeDefined();
+      expect(iconErr).not.toBeNull();
       expect(iconSuccess).toBeNull();
     });
 
@@ -216,7 +226,7 @@ describe('SubmissionSectionContainerComponent test suite', () => {
       const iconSuccess = fixture.debugElement.query(By.css('i.text-success'));
       expect(iconWarn).toBeNull();
       expect(iconErr).toBeNull();
-      expect(iconSuccess).toBeDefined();
+      expect(iconSuccess).not.toBeNull();
     });
 
   });
@@ -224,8 +234,9 @@ describe('SubmissionSectionContainerComponent test suite', () => {
 
 // declare a test component
 @Component({
-  selector: 'ds-test-cmp',
-  template: ``
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/container/section-container.component.ts b/src/app/submission/sections/container/section-container.component.ts
index 8f9ebfbfda..ed035ee6ff 100644
--- a/src/app/submission/sections/container/section-container.component.ts
+++ b/src/app/submission/sections/container/section-container.component.ts
@@ -1,9 +1,15 @@
-import { Component, Injector, Input, OnInit, ViewChild } from '@angular/core';
+import {
+  Component,
+  Injector,
+  Input,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
 
-import { SectionsDirective } from '../sections.directive';
+import { AlertType } from '../../../shared/alert/alert-type';
 import { SectionDataObject } from '../models/section-data.model';
+import { SectionsDirective } from '../sections.directive';
 import { rendersSectionType } from '../sections-decorator';
-import { AlertType } from '../../../shared/alert/aletr-type';
 
 /**
  * This component represents a section that contains the submission license form.
@@ -11,7 +17,7 @@ import { AlertType } from '../../../shared/alert/aletr-type';
 @Component({
   selector: 'ds-submission-section-container',
   templateUrl: './section-container.component.html',
-  styleUrls: ['./section-container.component.scss']
+  styleUrls: ['./section-container.component.scss'],
 })
 export class SubmissionSectionContainerComponent implements OnInit {
 
@@ -68,7 +74,7 @@ export class SubmissionSectionContainerComponent implements OnInit {
         { provide: 'sectionDataProvider', useFactory: () => (this.sectionData), deps: [] },
         { provide: 'submissionIdProvider', useFactory: () => (this.submissionId), deps: [] },
       ],
-      parent: this.injector
+      parent: this.injector,
     });
   }
 
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.html b/src/app/submission/sections/duplicates/section-duplicates.component.html
new file mode 100644
index 0000000000..d9e33a70f7
--- /dev/null
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.html
@@ -0,0 +1,20 @@
+<!--
+Template for the detect duplicates submission section component
+@author Kim Shepherd
+-->
+<div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data">
+  <ng-container *ngIf="data?.potentialDuplicates.length === 0">
+    <div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div>
+  </ng-container>
+    <ng-container *ngIf="data?.potentialDuplicates.length > 0">
+      <div class="alert alert-warning w-100">{{ 'submission.sections.duplicates.detected' | translate }}</div>
+      <div *ngFor="let dupe of data?.potentialDuplicates" class="ds-duplicate">
+        <a target="_blank" [href]="getItemLink(dupe.uuid)">{{dupe.title}}</a>
+        <div *ngFor="let metadatum of Metadata.toViewModelList(dupe.metadata)">
+          {{('item.preview.' + metadatum.key) | translate}} {{metadatum.value}}
+        </div>
+        <p *ngIf="dupe.workspaceItemId">{{ 'submission.sections.duplicates.in-workspace' | translate }}</p>
+        <p *ngIf="dupe.workflowItemId">{{ 'submission.sections.duplicates.in-workflow' | translate }}</p>
+      </div>
+    </ng-container>
+</div>
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
new file mode 100644
index 0000000000..3128a775fd
--- /dev/null
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.spec.ts
@@ -0,0 +1,261 @@
+import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { NgxPaginationModule } from 'ngx-pagination';
+import { of as observableOf } from 'rxjs';
+
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { License } from '../../../core/shared/license.model';
+import { MetadataValue } from '../../../core/shared/metadata.models';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
+import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
+import { defaultUUID } from '../../../shared/mocks/uuid.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { Duplicate } from '../../../shared/object-list/duplicate-data/duplicate.model';
+import { DUPLICATE } from '../../../shared/object-list/duplicate-data/duplicate.resource-type';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { SubmissionService } from '../../submission.service';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionDuplicatesComponent } from './section-duplicates.component';
+
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
+  return jasmine.createSpyObj('FormOperationsService', {
+    getConfigAll: jasmine.createSpy('getConfigAll'),
+    getConfigByHref: jasmine.createSpy('getConfigByHref'),
+    getConfigByName: jasmine.createSpy('getConfigByName'),
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
+  });
+}
+
+function getMockCollectionDataService(): CollectionDataService {
+  return jasmine.createSpyObj('CollectionDataService', {
+    findById: jasmine.createSpy('findById'),
+    findByHref: jasmine.createSpy('findByHref'),
+  });
+}
+
+const duplicates: Duplicate[] = [{
+  title: 'Unique title',
+  uuid: defaultUUID,
+  workflowItemId: 1,
+  workspaceItemId: 2,
+  owningCollection: 'Test Collection',
+  metadata: {
+    'dc.title': [
+      Object.assign(new MetadataValue(), {
+        'value': 'Unique title',
+        'language': null,
+        'authority': null,
+        'confidence': -1,
+        'place': 0,
+      })],
+  },
+  type: DUPLICATE,
+  _links: {
+    self: {
+      href: 'http://localhost:8080/server/api/core/submission/duplicates/search?uuid=testid',
+    },
+  },
+}];
+
+const sectionObject = {
+  header: 'submission.sections.submit.progressbar.duplicates',
+  mandatory: true,
+  opened: true,
+  data: { potentialDuplicates: duplicates },
+  errorsToShow: [],
+  serverValidationErrors: [],
+  id: 'duplicates',
+  sectionType: SectionsType.Duplicates,
+  sectionVisibility: null,
+};
+
+describe('SubmissionSectionDuplicatesComponent test suite', () => {
+  let comp: SubmissionSectionDuplicatesComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionSectionDuplicatesComponent>;
+  let submissionServiceStub: any = new SubmissionServiceStub();
+  const sectionsServiceStub: any = new SectionsServiceStub();
+  let formService: any;
+  let formOperationsService: any;
+  let formBuilderService: any;
+  let collectionDataService: any;
+
+  const submissionId = mockSubmissionId;
+  const collectionId = mockSubmissionCollectionId;
+  const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+    add: jasmine.createSpy('add'),
+    replace: jasmine.createSpy('replace'),
+    remove: jasmine.createSpy('remove'),
+  });
+
+  const licenseText = 'License text';
+  const mockCollection = Object.assign(new Collection(), {
+    name: 'Community 1-Collection 1',
+    id: collectionId,
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 1',
+      }],
+    license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText })),
+  });
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        NgxPaginationModule,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionSectionDuplicatesComponent,
+        TestComponent,
+        ObjNgFor,
+        VarDirective,
+      ],
+      providers: [
+        { provide: CollectionDataService, useValue: getMockCollectionDataService() },
+        { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
+        { provide: FormService, useValue: getMockFormService() },
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+        { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: SectionsService, useClass: SectionsServiceStub },
+        { provide: SubmissionService, useClass: SubmissionServiceStub },
+        { provide: 'collectionIdProvider', useValue: collectionId },
+        { provide: 'sectionDataProvider', useValue: sectionObject },
+        { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: PaginationService, useValue: paginationService },
+        ChangeDetectorRef,
+        FormBuilderService,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionObject));
+      testFixture = TestBed.createComponent(SubmissionSectionDuplicatesComponent);
+      testComp = testFixture.componentInstance;
+
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionSectionDuplicatesComponent', () => {
+      expect(testComp).toBeTruthy();
+    });
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionSectionDuplicatesComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      submissionServiceStub = TestBed.inject(SubmissionService);
+      formService = TestBed.inject(FormService);
+      formBuilderService = TestBed.inject(FormBuilderService);
+      formOperationsService = TestBed.inject(SectionFormOperationsService);
+      collectionDataService = TestBed.inject(CollectionDataService);
+      compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    // Test initialisation of the submission section
+    it('Should init section properly', () => {
+      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
+      spyOn(comp, 'getSectionStatus').and.returnValue(observableOf(true));
+      spyOn(comp, 'getDuplicateData').and.returnValue(observableOf({ potentialDuplicates: duplicates }));
+      expect(comp.isLoading).toBeTruthy();
+      comp.onSectionInit();
+      fixture.detectChanges();
+      expect(comp.isLoading).toBeFalsy();
+    });
+
+    // The following tests look for proper logic in the getSectionStatus() implementation
+    // These are very simple as we don't really have a 'false' state unless we're still loading
+    it('Should return TRUE if the isLoading is FALSE', () => {
+      compAsAny.isLoading = false;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: true,
+      }));
+    });
+    it('Should return FALSE', () => {
+      compAsAny.isLoadin = true;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.ts b/src/app/submission/sections/duplicates/section-duplicates.component.ts
new file mode 100644
index 0000000000..d4065153ae
--- /dev/null
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.ts
@@ -0,0 +1,130 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { Metadata } from '../../../core/shared/metadata.utils';
+import { WorkspaceitemSectionDuplicatesObject } from '../../../core/submission/models/workspaceitem-section-duplicates.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { getItemModuleRoute } from '../../../item-page/item-page-routing-paths';
+import { AlertType } from '../../../shared/alert/alert-type';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+
+/**
+ * Detect duplicates step
+ *
+ * @author Kim Shepherd
+ */
+@Component({
+  selector: 'ds-submission-section-duplicates',
+  templateUrl: './section-duplicates.component.html',
+  changeDetection: ChangeDetectionStrategy.Default,
+})
+
+@renderSectionFor(SectionsType.Duplicates)
+export class SubmissionSectionDuplicatesComponent extends SectionModelComponent {
+  protected readonly Metadata = Metadata;
+  /**
+   * The Alert categories.
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * Variable to track if the section is loading.
+   * @type {boolean}
+   */
+  public isLoading = true;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * Initialize instance variables.
+   *
+   * @param {TranslateService} translate
+   * @param {SectionsService} sectionService
+   * @param {SubmissionService} submissionService
+   * @param {string} injectedCollectionId
+   * @param {SectionDataObject} injectedSectionData
+   * @param {string} injectedSubmissionId
+   */
+  constructor(protected translate: TranslateService,
+              protected sectionService: SectionsService,
+              protected submissionService: SubmissionService,
+              @Inject('collectionIdProvider') public injectedCollectionId: string,
+              @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+              @Inject('submissionIdProvider') public injectedSubmissionId: string) {
+    super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+  }
+
+  /**
+   * Initialize all instance variables and retrieve configuration.
+   */
+  onSectionInit() {
+    this.isLoading = false;
+  }
+
+  /**
+   * Check if identifier section has read-only visibility
+   */
+  isReadOnly(): boolean {
+    return true;
+  }
+
+  /**
+   * Unsubscribe from all subscriptions, if needed.
+   */
+  onSectionDestroy(): void {
+    return;
+  }
+
+  /**
+   * Get section status. Because this simple component never requires human interaction, this is basically
+   * always going to be the opposite of "is this section still loading". This is not the place for API response
+   * error checking but determining whether the step can 'proceed'.
+   *
+   * @return Observable<boolean>
+   *     the section status
+   */
+  public getSectionStatus(): Observable<boolean> {
+    return observableOf(!this.isLoading);
+  }
+
+  /**
+   * Get duplicate data as observable from the section data
+   */
+  public getDuplicateData(): Observable<WorkspaceitemSectionDuplicatesObject> {
+    return this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType) as
+      Observable<WorkspaceitemSectionDuplicatesObject>;
+  }
+
+  /**
+   * Construct and return an item link for use with a preview item stub
+   * @param uuid
+   */
+  public getItemLink(uuid: any) {
+    return new URLCombiner(getItemModuleRoute(), uuid).toString();
+  }
+
+
+}
diff --git a/src/app/submission/sections/form/section-form-operations.service.spec.ts b/src/app/submission/sections/form/section-form-operations.service.spec.ts
index 65ddbe0cb0..2e0c5cccb5 100644
--- a/src/app/submission/sections/form/section-form-operations.service.spec.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.spec.ts
@@ -1,20 +1,26 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DynamicFormControlEvent,
-  DynamicInputModel
+  DynamicInputModel,
 } from '@ng-dynamic-forms/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { SectionFormOperationsService } from './section-form-operations.service';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
 import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
 import {
   mockInputWithAuthorityValueModel,
   mockInputWithFormFieldValueModel,
@@ -25,11 +31,10 @@ import {
   mockQualdropInputModel,
   MockQualdropModel,
   MockRelationModel,
-  mockRowGroupModel
+  mockRowGroupModel,
 } from '../../../shared/mocks/form-models.mock';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { SectionFormOperationsService } from './section-form-operations.service';
 
 describe('SectionFormOperationsService test suite', () => {
   let formBuilderService: any;
@@ -37,10 +42,10 @@ describe('SectionFormOperationsService test suite', () => {
   let serviceAsAny: any;
 
   const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
-      add: jasmine.createSpy('add'),
-      replace: jasmine.createSpy('replace'),
-      remove: jasmine.createSpy('remove'),
-    });
+    add: jasmine.createSpy('add'),
+    replace: jasmine.createSpy('replace'),
+    remove: jasmine.createSpy('remove'),
+  });
   const pathCombiner = new JsonPatchOperationPathCombiner('sections', 'test');
 
   const dynamicFormControlChangeEvent: DynamicFormControlEvent = {
@@ -49,7 +54,7 @@ describe('SectionFormOperationsService test suite', () => {
     control: null,
     group: null,
     model: null,
-    type: 'change'
+    type: 'change',
   };
 
   const dynamicFormControlRemoveEvent: DynamicFormControlEvent = {
@@ -58,7 +63,7 @@ describe('SectionFormOperationsService test suite', () => {
     control: null,
     group: null,
     model: null,
-    type: 'remove'
+    type: 'remove',
   };
 
   beforeEach(waitForAsync(() => {
@@ -67,15 +72,15 @@ describe('SectionFormOperationsService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
         { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
-        SectionFormOperationsService
-      ]
+        SectionFormOperationsService,
+      ],
     }).compileComponents().then();
   }));
 
@@ -114,8 +119,8 @@ describe('SectionFormOperationsService test suite', () => {
     it('should return the index of the array to which the element belongs', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         context: {
-          index: 1
-        }
+          index: 1,
+        },
       });
 
       expect(service.getArrayIndexFromEvent(event)).toBe(1);
@@ -126,10 +131,10 @@ describe('SectionFormOperationsService test suite', () => {
         model: {
           parent: {
             parent: {
-              index: 2
-            }
-          }
-        }
+              index: 2,
+            },
+          },
+        },
       });
       spyOn(serviceAsAny, 'isPartOfArrayOfGroup').and.returnValue(true);
 
@@ -157,10 +162,10 @@ describe('SectionFormOperationsService test suite', () => {
           type: DYNAMIC_FORM_CONTROL_TYPE_GROUP,
           parent: {
             context: {
-              type: DYNAMIC_FORM_CONTROL_TYPE_ARRAY
-            }
-          }
-        }
+              type: DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
+            },
+          },
+        },
       };
 
       expect(service.isPartOfArrayOfGroup(model as any)).toBeTruthy();
@@ -168,7 +173,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return false when parent element doesn\'t belong to an array group element', () => {
       const model = {
-        parent: null
+        parent: null,
       };
 
       expect(service.isPartOfArrayOfGroup(model as any)).toBeFalsy();
@@ -181,19 +186,19 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
           parent: {
-            context: context
-          }
-        }
+            context: context,
+          },
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectMap = new Map();
       expectMap.set(MockQualdropModel.qualdropId, [MockQualdropModel.value]);
@@ -207,17 +212,17 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
-          context: context
-        }
+          context: context,
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectMap = new Map();
       expectMap.set(MockQualdropModel.qualdropId, [MockQualdropModel.value]);
@@ -247,19 +252,19 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
           parent: {
-            context: context
-          }
-        }
+            context: context,
+          },
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectPath = 'dc.identifier.issn/0';
       spyOn(serviceAsAny, 'getArrayIndexFromEvent').and.returnValue(0);
@@ -273,17 +278,17 @@ describe('SectionFormOperationsService test suite', () => {
       const context = {
         groups: [
           {
-            group: [MockQualdropModel]
-          }
-        ]
+            group: [MockQualdropModel],
+          },
+        ],
       };
       const model = {
         parent: {
-          context: context
-        }
+          context: context,
+        },
       };
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: model
+        model: model,
       });
       const expectPath = 'dc.identifier.issn/0';
       spyOn(serviceAsAny, 'getArrayIndexFromEvent').and.returnValue(0);
@@ -297,7 +302,7 @@ describe('SectionFormOperationsService test suite', () => {
   describe('getFieldPathSegmentedFromChangeEvent', () => {
     it('should return field segmented path properly', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockQualdropInputModel
+        model: mockQualdropInputModel,
       });
       formBuilderService.isQualdropGroup.and.returnValues(false, false);
 
@@ -306,7 +311,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field segmented path properly when model is DynamicQualdropModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: MockQualdropModel
+        model: MockQualdropModel,
       });
       formBuilderService.isQualdropGroup.and.returnValue(true);
 
@@ -316,8 +321,8 @@ describe('SectionFormOperationsService test suite', () => {
     it('should return field segmented path properly when model belongs to a DynamicQualdropModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockQualdropModel
-        }
+          parent: MockQualdropModel,
+        },
       });
       formBuilderService.isQualdropGroup.and.returnValues(false, true);
 
@@ -330,8 +335,8 @@ describe('SectionFormOperationsService test suite', () => {
     it('should return field value properly when model belongs to a DynamicQualdropModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockQualdropModel
-        }
+          parent: MockQualdropModel,
+        },
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(true);
       const expectedValue = 'test';
@@ -341,18 +346,18 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field value properly when model is DynamicRelationGroupModel', () => {
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: MockRelationModel
+        model: MockRelationModel,
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(false);
       formBuilderService.isRelationGroup.and.returnValue(true);
       const expectedValue = {
         journal: [
           'journal test 1',
-          'journal test 2'
+          'journal test 2',
         ],
         issue: [
           'issue test 1',
-          'issue test 2'
+          'issue test 2',
         ],
       };
 
@@ -361,7 +366,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field value properly when model has language', () => {
       let event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithLanguageModel
+        model: mockInputWithLanguageModel,
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(false);
       formBuilderService.isRelationGroup.and.returnValue(false);
@@ -370,19 +375,19 @@ describe('SectionFormOperationsService test suite', () => {
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithLanguageAndAuthorityModel
+        model: mockInputWithLanguageAndAuthorityModel,
       });
-      expectedValue = Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityModel.value, {language: mockInputWithLanguageAndAuthorityModel.language});
+      expectedValue = Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityModel.value, { language: mockInputWithLanguageAndAuthorityModel.language });
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithLanguageAndAuthorityArrayModel
+        model: mockInputWithLanguageAndAuthorityArrayModel,
       });
       expectedValue = [
         Object.assign(new VocabularyEntry(), mockInputWithLanguageAndAuthorityArrayModel.value[0],
-        { language: mockInputWithLanguageAndAuthorityArrayModel.language }
-        )
+          { language: mockInputWithLanguageAndAuthorityArrayModel.language },
+        ),
       ];
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
@@ -390,7 +395,7 @@ describe('SectionFormOperationsService test suite', () => {
 
     it('should return field value properly when model has an object as value', () => {
       let event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithFormFieldValueModel
+        model: mockInputWithFormFieldValueModel,
       });
       formBuilderService.isModelInCustomGroup.and.returnValue(false);
       formBuilderService.isRelationGroup.and.returnValue(false);
@@ -399,14 +404,14 @@ describe('SectionFormOperationsService test suite', () => {
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithAuthorityValueModel
+        model: mockInputWithAuthorityValueModel,
       });
       expectedValue = mockInputWithAuthorityValueModel.value;
 
       expect(service.getFieldValueFromChangeEvent(event)).toEqual(expectedValue);
 
       event = Object.assign({}, dynamicFormControlChangeEvent, {
-        model: mockInputWithObjectValueModel
+        model: mockInputWithObjectValueModel,
       });
       expectedValue = mockInputWithObjectValueModel.value;
 
@@ -461,8 +466,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockQualdropModel
-        }
+          parent: MockQualdropModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -481,8 +486,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: MockRelationModel
-        }
+          parent: MockRelationModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -502,8 +507,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -523,8 +528,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       const spyPath = spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -552,8 +557,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -577,8 +582,8 @@ describe('SectionFormOperationsService test suite', () => {
       let previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       const spyPath = spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -607,8 +612,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -632,8 +637,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], null);
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -658,8 +663,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       const spyPath = spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/0');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -693,8 +698,8 @@ describe('SectionFormOperationsService test suite', () => {
       const previousValue = new FormFieldPreviousValueObject(['path', 'test'], 'value');
       const event = Object.assign({}, dynamicFormControlChangeEvent, {
         model: {
-          parent: mockRowGroupModel
-        }
+          parent: mockRowGroupModel,
+        },
       });
       spyOn(service, 'getFieldPathFromEvent').and.returnValue('path/1');
       spyOn(service, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
@@ -712,7 +717,7 @@ describe('SectionFormOperationsService test suite', () => {
       expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
         pathCombiner.getPath('path'),
         new FormFieldMetadataValueObject('test'),
-        true
+        true,
       );
     });
   });
@@ -808,7 +813,7 @@ describe('SectionFormOperationsService test suite', () => {
           isDraggable: true,
           groupFactory: () => {
             return [
-              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' })
+              new DynamicInputModel({ id: 'testFormRowArrayGroupInput' }),
             ];
           },
           required: false,
@@ -816,8 +821,8 @@ describe('SectionFormOperationsService test suite', () => {
           metadataFields: ['dc.contributor.author'],
           hasSelectableMetadata: true,
           showButtons: true,
-          typeBindRelations: []
-        }
+          typeBindRelations: [],
+        },
       );
       spyOn(serviceAsAny, 'getFieldPathSegmentedFromChangeEvent').and.returnValue('path');
       previousValue = new FormFieldPreviousValueObject(['path'], null);
@@ -831,7 +836,7 @@ describe('SectionFormOperationsService test suite', () => {
         pathCombiner,
         dynamicFormControlChangeEvent,
         arrayModel,
-        previousValue
+        previousValue,
       );
 
       expect(jsonPatchOpBuilder.add).not.toHaveBeenCalled();
@@ -841,10 +846,10 @@ describe('SectionFormOperationsService test suite', () => {
     it('should dispatch a json-path add operation when a array value is not empty', () => {
       const pathValue = [
         new FormFieldMetadataValueObject('test'),
-        new FormFieldMetadataValueObject('test two')
+        new FormFieldMetadataValueObject('test two'),
       ];
       formBuilderService.getValueFromModel.and.returnValue({
-        path:pathValue
+        path:pathValue,
       });
       spyOn(previousValue, 'isPathEqual').and.returnValue(false);
 
@@ -852,13 +857,13 @@ describe('SectionFormOperationsService test suite', () => {
         pathCombiner,
         dynamicFormControlChangeEvent,
         arrayModel,
-        previousValue
+        previousValue,
       );
 
       expect(jsonPatchOpBuilder.add).toHaveBeenCalledWith(
         pathCombiner.getPath('path'),
         pathValue,
-        false
+        false,
       );
       expect(jsonPatchOpBuilder.remove).not.toHaveBeenCalled();
     });
@@ -871,7 +876,7 @@ describe('SectionFormOperationsService test suite', () => {
         pathCombiner,
         dynamicFormControlChangeEvent,
         arrayModel,
-        previousValue
+        previousValue,
       );
 
       expect(jsonPatchOpBuilder.add).not.toHaveBeenCalled();
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 7c6c242d42..f8c14cf96c 100644
--- a/src/app/submission/sections/form/section-form-operations.service.ts
+++ b/src/app/submission/sections/form/section-form-operations.service.ts
@@ -1,30 +1,40 @@
 import { Injectable } from '@angular/core';
-
-import { isEqual, isObject } from 'lodash';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
   DYNAMIC_FORM_CONTROL_TYPE_GROUP,
   DynamicFormArrayGroupModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
-  isDynamicFormControlEvent
+  isDynamicFormControlEvent,
 } from '@ng-dynamic-forms/core';
-
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined, isNull, isUndefined } from '../../../shared/empty.util';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
-import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
-import { DynamicRelationGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
 import { deepClone } from 'fast-json-patch';
-import { dateToString, isNgbDateStruct } from '../../../shared/date.util';
+import isEqual from 'lodash/isEqual';
+import isObject from 'lodash/isObject';
+
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { VocabularyEntry } from '../../../core/submission/vocabularies/models/vocabulary-entry.model';
+import { VocabularyEntryDetail } from '../../../core/submission/vocabularies/models/vocabulary-entry-detail.model';
+import {
+  dateToString,
+  isNgbDateStruct,
+} from '../../../shared/date.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+  isNull,
+  isUndefined,
+} from '../../../shared/empty.util';
+import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicQualdropModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-qualdrop.model';
 import { DynamicRowArrayModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRelationGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldLanguageValueObject } from '../../../shared/form/builder/models/form-field-language-value.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 
 /**
  * The service handling all form section operations
@@ -56,9 +66,9 @@ export class SectionFormOperationsService {
    *    representing if field value related to the specified operation has stored value
    */
   public dispatchOperationsFromEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                     event: DynamicFormControlEvent,
-                                     previousValue: FormFieldPreviousValueObject,
-                                     hasStoredValue: boolean): void {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject,
+    hasStoredValue: boolean): void {
     switch (event.type) {
       case 'remove':
         this.dispatchOperationsFromRemoveEvent(pathCombiner, event, previousValue);
@@ -295,8 +305,8 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   protected dispatchOperationsFromRemoveEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                              event: DynamicFormControlEvent,
-                                              previousValue: FormFieldPreviousValueObject): void {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject): void {
 
     const path = this.getFieldPathFromEvent(event);
     const value = this.getFieldValueFromChangeEvent(event);
@@ -320,7 +330,7 @@ export class SectionFormOperationsService {
    */
   protected dispatchOperationsFromAddEvent(
     pathCombiner: JsonPatchOperationPathCombiner,
-    event: DynamicFormControlEvent
+    event: DynamicFormControlEvent,
   ): void {
     const path = this.getFieldPathSegmentedFromChangeEvent(event);
     const value = deepClone(this.getFieldValueFromChangeEvent(event));
@@ -359,11 +369,11 @@ export class SectionFormOperationsService {
    *    representing if field value related to the specified operation has stored value
    */
   protected dispatchOperationsFromChangeEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                              event: DynamicFormControlEvent,
-                                              previousValue: FormFieldPreviousValueObject,
-                                              hasStoredValue: boolean): void {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject,
+    hasStoredValue: boolean): void {
 
-   if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
+    if (event.context && event.context instanceof DynamicFormArrayGroupModel) {
       // Model is a DynamicRowArrayModel
       this.handleArrayGroupPatch(pathCombiner, event, (event as any).context.context, previousValue);
       return;
@@ -398,7 +408,7 @@ export class SectionFormOperationsService {
           if (isNotEmpty(moveFrom.path) && isNotEmpty(moveTo.path) && moveFrom.path !== moveTo.path) {
             this.operationsBuilder.move(
               moveTo,
-              moveFrom.path
+              moveFrom.path,
             );
           }
         }
@@ -447,9 +457,9 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   protected dispatchOperationsFromMap(valueMap: Map<string, any>,
-                                      pathCombiner: JsonPatchOperationPathCombiner,
-                                      event: DynamicFormControlEvent,
-                                      previousValue: FormFieldPreviousValueObject): void {
+    pathCombiner: JsonPatchOperationPathCombiner,
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject): void {
     const currentValueMap = valueMap;
     if (event.type === 'remove') {
       const path = this.getQualdropItemPathFromEvent(event);
@@ -492,8 +502,8 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   private dispatchOperationsFromMoveEvent(pathCombiner: JsonPatchOperationPathCombiner,
-                                          event: DynamicFormControlEvent,
-                                          previousValue: FormFieldPreviousValueObject) {
+    event: DynamicFormControlEvent,
+    previousValue: FormFieldPreviousValueObject) {
 
     return this.handleArrayGroupPatch(pathCombiner, event.$event, (event as any).$event.arrayModel, previousValue);
   }
@@ -511,9 +521,9 @@ export class SectionFormOperationsService {
    *    the [[FormFieldPreviousValueObject]] for the specified operation
    */
   private handleArrayGroupPatch(pathCombiner: JsonPatchOperationPathCombiner,
-                                event,
-                                model: DynamicRowArrayModel,
-                                previousValue: FormFieldPreviousValueObject) {
+    event,
+    model: DynamicRowArrayModel,
+    previousValue: FormFieldPreviousValueObject) {
 
     const arrayValue = this.formBuilder.getValueFromModel([model]);
     const segmentedPath = this.getFieldPathSegmentedFromChangeEvent(event);
@@ -521,7 +531,7 @@ export class SectionFormOperationsService {
       this.operationsBuilder.add(
         pathCombiner.getPath(segmentedPath),
         arrayValue[segmentedPath],
-        false
+        false,
       );
     } else if (previousValue.isPathEqual(this.formBuilder.getPath(event.model))) {
       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 889f17c393..70639db07d 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -1,49 +1,68 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
-
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { SubmissionSectionFormComponent } from './section-form.component';
-import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
-import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
-import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
-import { SectionFormOperationsService } from './section-form-operations.service';
-import { getMockFormService } from '../../../shared/mocks/form-service.mock';
-import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
-import {
-  mockSubmissionCollectionId, mockSubmissionId, mockUploadResponse1ParsedErrors,
-} from '../../../shared/mocks/submission.mock';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { FormComponent } from '../../../shared/form/form.component';
-import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
-import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
-import { DynamicRowGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
-import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
-import { DynamicFormControlEvent, DynamicFormControlEventType } from '@ng-dynamic-forms/core';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  DynamicFormControlEvent,
+  DynamicFormControlEventType,
+} from '@ng-dynamic-forms/core';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { RequestService } from '../../../core/data/request.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RequestService } from '../../../core/data/request.service';
+import { DsDynamicInputModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model';
+import { DynamicRowGroupModel } from '../../../shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldModel } from '../../../shared/form/builder/models/form-field.model';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormBuilderService } from '../../../shared/mocks/form-builder-service.mock';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
+import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+  mockUploadResponse1ParsedErrors,
+} from '../../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { cold } from 'jasmine-marbles';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
 import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SubmissionService } from '../../submission.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionFormComponent } from './section-form.component';
+import { SectionFormOperationsService } from './section-form-operations.service';
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('FormOperationsService', {
@@ -63,7 +82,7 @@ const sectionObject: SectionDataObject = {
   serverValidationErrors: [],
   header: 'submit.progressbar.describe.stepone',
   id: 'traditionalpageone',
-  sectionType: SectionsType.SubmissionForm
+  sectionType: SectionsType.SubmissionForm,
 };
 
 const testFormConfiguration = {
@@ -73,7 +92,7 @@ const testFormConfiguration = {
       fields: [
         {
           input: {
-            type: 'onebox'
+            type: 'onebox',
           },
           label: 'Title',
           mandatory: 'true',
@@ -81,18 +100,18 @@ const testFormConfiguration = {
           hints: ' Enter Title.',
           selectableMetadata: [
             {
-              metadata: 'dc.title'
-            }
+              metadata: 'dc.title',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel,
     {
       fields: [
         {
           input: {
-            type: 'onebox'
+            type: 'onebox',
           },
           label: 'Author',
           mandatory: 'false',
@@ -100,20 +119,20 @@ const testFormConfiguration = {
           hints: ' Enter Author.',
           selectableMetadata: [
             {
-              metadata: 'dc.contributor'
-            }
+              metadata: 'dc.contributor',
+            },
           ],
-          languageCodes: []
-        } as FormFieldModel
-      ]
+          languageCodes: [],
+        } as FormFieldModel,
+      ],
     } as FormRowModel,
   ],
   type: 'submissionform',
   _links: {
     self: {
-      href: 'testFormConfiguration.url'
-    }
-  }
+      href: 'testFormConfiguration.url',
+    },
+  },
 } as any;
 
 const testFormModel = [
@@ -124,7 +143,7 @@ const testFormModel = [
   new DynamicRowGroupModel({
     id: 'df-row-group-config-2',
     group: [new DsDynamicInputModel({ id: 'dc.contributor', metadataFields: [], repeatable: false, submissionId: '1234', hasSelectableMetadata: false })],
-  })
+  }),
 ];
 
 const dynamicFormControlEvent: DynamicFormControlEvent = {
@@ -133,7 +152,7 @@ const dynamicFormControlEvent: DynamicFormControlEvent = {
   control: null,
   group: testFormModel[0] as any,
   model: testFormModel[0].group[0],
-  type: DynamicFormControlEventType.Change
+  type: DynamicFormControlEventType.Change,
 };
 
 describe('SubmissionSectionFormComponent test suite', () => {
@@ -162,12 +181,12 @@ describe('SubmissionSectionFormComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         SubmissionSectionFormComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: FormBuilderService, useValue: getMockFormBuilderService() },
@@ -185,9 +204,9 @@ describe('SubmissionSectionFormComponent test suite', () => {
         { provide: 'submissionIdProvider', useValue: submissionId },
         { provide: SubmissionObjectDataService, useValue: { getHrefByID: () => observableOf('testUrl'), findById: () => createSuccessfulRemoteDataObject$(new WorkspaceItem()) } },
         ChangeDetectorRef,
-        SubmissionSectionFormComponent
+        SubmissionSectionFormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -249,6 +268,8 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(testFormConfiguration));
       sectionsServiceStub.getSectionData.and.returnValue(observableOf(sectionData));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+
       spyOn(comp, 'initForm');
       spyOn(comp, 'subscriptions');
 
@@ -279,7 +300,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       const sectionData = {};
       const sectionError: SubmissionSectionError = {
         message: 'test' + 'Error: test',
-        path: '/sections/' + sectionObject.id
+        path: '/sections/' + sectionObject.id,
       };
 
       comp.initForm(sectionData);
@@ -291,10 +312,12 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should return true when has Metadata Enrichment', () => {
       const newSectionData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       compAsAny.formData = {};
-      compAsAny.sectionMetadata = ['dc.title'];
+      compAsAny.sectionData.data = {
+        'dc.title': [new FormFieldMetadataValueObject('test')],
+      };
       spyOn(compAsAny, 'inCurrentSubmissionScope').and.callThrough();
 
       expect(comp.hasMetadataEnrichment(newSectionData)).toBeTruthy();
@@ -303,10 +326,12 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should return false when has not Metadata Enrichment', () => {
       const newSectionData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       compAsAny.formData = newSectionData;
-      compAsAny.sectionMetadata = ['dc.title'];
+      compAsAny.sectionData.data = {
+        'dc.title': [new FormFieldMetadataValueObject('test')],
+      };
       spyOn(compAsAny, 'inCurrentSubmissionScope').and.callThrough();
 
       expect(comp.hasMetadataEnrichment(newSectionData)).toBeFalsy();
@@ -315,7 +340,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should return false when metadata has Metadata Enrichment but not belonging to sectionMetadata', () => {
       const newSectionData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       compAsAny.formData = newSectionData;
       compAsAny.sectionMetadata = [];
@@ -332,25 +357,41 @@ describe('SubmissionSectionFormComponent test suite', () => {
                 {
                   selectableMetadata: [{ metadata: 'scoped.workflow' }],
                   scope: 'WORKFLOW',
-                } as FormFieldModel
-              ]
+                } as FormFieldModel,
+              ],
             },
             {
               fields: [
                 {
                   selectableMetadata: [{ metadata: 'scoped.workspace' }],
                   scope: 'WORKSPACE',
-                } as FormFieldModel
-              ]
+                } as FormFieldModel,
+              ],
+            },
+            {
+              fields: [
+                {
+                  selectableMetadata: [{ metadata: 'scoped.workflow.relation' }],
+                  scope: 'WORKFLOW',
+                } as FormFieldModel,
+              ],
+            },
+            {
+              fields: [
+                {
+                  selectableMetadata: [{ metadata: 'scoped.workspace.relation' }],
+                  scope: 'WORKSPACE',
+                } as FormFieldModel,
+              ],
             },
             {
               fields: [
                 {
                   selectableMetadata: [{ metadata: 'dc.title' }],
-                } as FormFieldModel
-              ]
-            }
-          ]
+                } as FormFieldModel,
+              ],
+            },
+          ],
         };
       });
 
@@ -371,6 +412,14 @@ describe('SubmissionSectionFormComponent test suite', () => {
         it('should return false for fields scoped to workflow', () => {
           expect((comp as any).inCurrentSubmissionScope('scoped.workflow')).toBe(false);
         });
+
+        it('should return true for relation fields scoped to workspace', () => {
+          expect((comp as any).inCurrentSubmissionScope('scoped.workspace.relation')).toBe(true);
+        });
+
+        it('should return false for relation fields scoped to workflow', () => {
+          expect((comp as any).inCurrentSubmissionScope('scoped.workflow.relation')).toBe(false);
+        });
       });
 
       describe('in workflow scope', () => {
@@ -390,6 +439,14 @@ describe('SubmissionSectionFormComponent test suite', () => {
         it('should return false for fields scoped to workspace', () => {
           expect((comp as any).inCurrentSubmissionScope('scoped.workspace')).toBe(false);
         });
+
+        it('should return true for relation fields scoped to workflow', () => {
+          expect((comp as any).inCurrentSubmissionScope('scoped.workflow.relation')).toBe(true);
+        });
+
+        it('should return false for relation fields scoped to workspace', () => {
+          expect((comp as any).inCurrentSubmissionScope('scoped.workspace.relation')).toBe(false);
+        });
       });
     });
 
@@ -397,7 +454,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       const sectionError = [];
       comp.sectionData.data = {};
@@ -418,7 +475,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       spyOn(comp, 'initForm');
       spyOn(comp, 'checksForErrors');
       const sectionData: any = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       comp.sectionData.data = {};
       comp.sectionData.errorsToShow = [];
@@ -457,7 +514,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
         sectionObject.id,
         'test',
         parsedSectionErrors,
-        []
+        [],
       );
       expect(comp.sectionData.errorsToShow).toEqual(parsedSectionErrors);
     });
@@ -466,7 +523,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(true));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(compAsAny.getSectionStatus()).toBeObservable(expected);
@@ -476,7 +533,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(true));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf(parsedSectionErrors));
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(compAsAny.getSectionStatus()).toBeObservable(expected);
@@ -486,7 +543,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
       formService.isValid.and.returnValue(observableOf(false));
       sectionsServiceStub.getSectionServerErrors.and.returnValue(observableOf([]));
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(compAsAny.getSectionStatus()).toBeObservable(expected);
@@ -495,14 +552,14 @@ describe('SubmissionSectionFormComponent test suite', () => {
     it('should subscribe to state properly', () => {
       spyOn(comp, 'updateForm');
       const formData = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       const sectionData: any = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       };
       const sectionState = {
         data: sectionData,
-        errorsToShow: parsedSectionErrors
+        errorsToShow: parsedSectionErrors,
       };
 
       formService.getFormData.and.returnValue(observableOf(formData));
@@ -579,7 +636,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 
     it('should check if has stored value in the section state', () => {
       comp.sectionData.data = {
-        'dc.title': [new FormFieldMetadataValueObject('test')]
+        'dc.title': [new FormFieldMetadataValueObject('test')],
       } as any;
 
       expect(comp.hasStoredValue('dc.title', 0)).toBeTruthy();
@@ -593,7 +650,7 @@ describe('SubmissionSectionFormComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 6299b0ccdc..defc78d611 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -1,43 +1,72 @@
-import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
-import { DynamicFormControlEvent, DynamicFormControlModel } from '@ng-dynamic-forms/core';
-
-import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, take, tap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  ViewChild,
+} from '@angular/core';
+import {
+  DynamicFormControlEvent,
+  DynamicFormControlModel,
+} from '@ng-dynamic-forms/core';
 import { TranslateService } from '@ngx-translate/core';
-import { findIndex, isEqual } from 'lodash';
+import findIndex from 'lodash/findIndex';
+import isEqual from 'lodash/isEqual';
+import {
+  combineLatest as observableCombineLatest,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  take,
+  tap,
+} from 'rxjs/operators';
 
+import { environment } from '../../../../environments/environment';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { ConfigObject } from '../../../core/config/models/config.model';
+import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import {
+  getFirstSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model';
+import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isUndefined,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { difference } from '../../../shared/object.util';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SubmissionSectionObject } from '../../objects/submission-section-object.model';
+import { SubmissionService } from '../../submission.service';
 import { SectionModelComponent } from '../models/section.model';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { hasValue, isEmpty, isNotEmpty, isUndefined } from '../../../shared/empty.util';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionsType } from '../sections-type';
-import { SubmissionService } from '../../submission.service';
 import { SectionFormOperationsService } from './section-form-operations.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { SectionsService } from '../sections.service';
-import { difference } from '../../../shared/object.util';
-import { WorkspaceitemSectionFormObject } from '../../../core/submission/models/workspaceitem-section-form.model';
-import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
-import { getFirstSucceededRemoteData, getRemoteDataPayload } from '../../../core/shared/operators';
-import { SubmissionObjectDataService } from '../../../core/submission/submission-object-data.service';
-import { ObjectCacheService } from '../../../core/cache/object-cache.service';
-import { RequestService } from '../../../core/data/request.service';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
-import { environment } from '../../../../environments/environment';
-import { ConfigObject } from '../../../core/config/models/config.model';
-import { RemoteData } from '../../../core/data/remote-data';
-import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
-import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { SubmissionObject } from '../../../core/submission/models/submission-object.model';
-import { SubmissionSectionObject } from '../../objects/submission-section-object.model';
-import { SubmissionSectionError } from '../../objects/submission-section-error.model';
 
 /**
  * This component represents a section that contains a Form.
@@ -117,6 +146,12 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   protected subs: Subscription[] = [];
 
   protected submissionObject: SubmissionObject;
+
+  /**
+   * A flag representing if this section is readonly
+   */
+  protected isSectionReadonly = false;
+
   /**
    * The FormComponent reference
    */
@@ -174,13 +209,15 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
           this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType),
           this.submissionObjectService.findById(this.submissionId, true, false, followLink('item')).pipe(
             getFirstSucceededRemoteData(),
-            getRemoteDataPayload())
+            getRemoteDataPayload()),
+          this.sectionService.isSectionReadOnly(this.submissionId, this.sectionData.id, this.submissionService.getSubmissionScope()),
         ])),
       take(1))
-      .subscribe(([sectionData, submissionObject]: [WorkspaceitemSectionFormObject, SubmissionObject]) => {
+      .subscribe(([sectionData, submissionObject, isSectionReadOnly]: [WorkspaceitemSectionFormObject, SubmissionObject, boolean]) => {
         if (isUndefined(this.formModel)) {
           // this.sectionData.errorsToShow = [];
           this.submissionObject = submissionObject;
+          this.isSectionReadonly = isSectionReadOnly;
           // Is the first loading so init form
           this.initForm(sectionData);
           this.sectionData.data = sectionData;
@@ -209,11 +246,11 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   protected getSectionStatus(): Observable<boolean> {
     const formStatus$ = this.formService.isValid(this.formId);
     const serverValidationStatus$ = this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
-      map((validationErrors) => isEmpty(validationErrors))
+      map((validationErrors) => isEmpty(validationErrors)),
     );
 
     return observableCombineLatest([formStatus$, serverValidationStatus$]).pipe(
-      map(([formValidation, serverSideValidation]: [boolean, boolean]) => formValidation && serverSideValidation)
+      map(([formValidation, serverSideValidation]: [boolean, boolean]) => formValidation && serverSideValidation),
     );
   }
 
@@ -227,7 +264,9 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
 
     const sectionDataToCheck = {};
     Object.keys(sectionData).forEach((key) => {
-      if (this.sectionMetadata && this.sectionMetadata.includes(key) && this.inCurrentSubmissionScope(key)) {
+      // todo: removing Relationships works due to a bug -- dspace.entity.type is included in sectionData, which is what triggers the update;
+      //       if we use this.sectionMetadata.includes(key), this field is filtered out and removed Relationships won't disappear from the form.
+      if (this.inCurrentSubmissionScope(key)) {
         sectionDataToCheck[key] = sectionData[key];
       }
     });
@@ -255,9 +294,15 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
    * @private
    */
   private inCurrentSubmissionScope(field: string): boolean {
-    const scope = this.formConfig?.rows.find(row => {
-      return row.fields?.[0]?.selectableMetadata?.[0]?.metadata === field;
-    }).fields?.[0]?.scope;
+    const scope = this.formConfig?.rows.find((row: FormRowModel) => {
+      if (row.fields?.[0]?.selectableMetadata) {
+        return row.fields?.[0]?.selectableMetadata?.[0]?.metadata === field;
+      } else if (row.fields?.[0]?.selectableRelationship) {
+        return row.fields?.[0]?.selectableRelationship.relationshipType === field.replace(/^relationship\./g, '');
+      } else {
+        return false;
+      }
+    })?.fields?.[0]?.scope;
 
     switch (scope) {
       case SubmissionScopeType.WorkspaceItem: {
@@ -285,18 +330,20 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
         this.formConfig,
         this.collectionId,
         sectionData,
-        this.submissionService.getSubmissionScope()
+        this.submissionService.getSubmissionScope(),
+        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);
-
     } catch (e) {
       const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
       const sectionError: SubmissionSectionError = {
         message: msg,
-        path: '/sections/' + this.sectionData.id
+        path: '/sections/' + this.sectionData.id,
       };
-      console.error(e.stack);
+      if (e instanceof Error) {
+        console.error(e.stack);
+      }
       this.sectionService.setSectionError(this.submissionId, this.sectionData.id, sectionError);
     }
   }
@@ -372,7 +419,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
           this.fieldsOnTheirWayToBeRemoved = new Map();
           this.sectionMetadata = sectionState.metadata;
           this.updateForm(sectionState.data as WorkspaceitemSectionFormObject, sectionState.errorsToShow);
-        })
+        }),
     );
   }
 
@@ -398,7 +445,7 @@ export class SubmissionSectionFormComponent extends SectionModelComponent {
   }
 
   private hasRelatedCustomError(medatata): boolean {
-    const index = findIndex(this.sectionData.errorsToShow, {path: this.pathCombiner.getPath(medatata).path});
+    const index = findIndex(this.sectionData.errorsToShow, { path: this.pathCombiner.getPath(medatata).path });
     if (index  !== -1) {
       const error = this.sectionData.errorsToShow[index];
       const validator = error.message.replace('error.validation.', '');
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.html b/src/app/submission/sections/identifiers/section-identifiers.component.html
new file mode 100644
index 0000000000..dd0b5d2930
--- /dev/null
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.html
@@ -0,0 +1,20 @@
+<!--
+Template for the identifiers submission section component
+@author Kim Shepherd
+-->
+<!-- Main identifier data -->
+<ng-container *ngVar="(getIdentifierData() | async) as identifierData">
+  <ng-container *ngIf="identifierData && identifierData.identifiers">
+  <div>
+  <span>{{'submission.sections.identifiers.info' | translate}}</span>
+  <ul>
+    <ng-container *ngFor="let identifier of identifierData.identifiers">
+      <ng-container *ngIf="identifierData.displayTypes.includes(identifier.identifierType) && identifier.value">
+        <li>{{'submission.sections.identifiers.' + identifier.identifierType + '_label' | translate}}
+          {{identifier.value}}</li>
+      </ng-container>
+    </ng-container>
+  </ul>
+ </div>
+ </ng-container>
+</ng-container>
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
new file mode 100644
index 0000000000..3184010278
--- /dev/null
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.spec.ts
@@ -0,0 +1,272 @@
+import { CommonModule } from '@angular/common';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { TranslateModule } from '@ngx-translate/core';
+import { cold } from 'jasmine-marbles';
+import { NgxPaginationModule } from 'ngx-pagination';
+import { of as observableOf } from 'rxjs';
+
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { PaginationService } from '../../../core/pagination/pagination.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { Item } from '../../../core/shared/item.model';
+import { License } from '../../../core/shared/license.model';
+import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
+import { SubmissionScopeType } from '../../../core/submission/submission-scope-type';
+import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormService } from '../../../shared/form/form.service';
+import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
+import { getMockFormService } from '../../../shared/mocks/form-service.mock';
+import {
+  mockSubmissionCollectionId,
+  mockSubmissionId,
+} from '../../../shared/mocks/submission.mock';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../shared/testing/pagination-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { ObjNgFor } from '../../../shared/utils/object-ngfor.pipe';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { SubmissionService } from '../../submission.service';
+import { SectionFormOperationsService } from '../form/section-form-operations.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionIdentifiersComponent } from './section-identifiers.component';
+
+function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
+  return jasmine.createSpyObj('FormOperationsService', {
+    getConfigAll: jasmine.createSpy('getConfigAll'),
+    getConfigByHref: jasmine.createSpy('getConfigByHref'),
+    getConfigByName: jasmine.createSpy('getConfigByName'),
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
+  });
+}
+
+function getMockCollectionDataService(): CollectionDataService {
+  return jasmine.createSpyObj('CollectionDataService', {
+    findById: jasmine.createSpy('findById'),
+    findByHref: jasmine.createSpy('findByHref'),
+  });
+}
+
+const mockItem = Object.assign(new Item(), {
+  id: 'fake-match-id',
+  handle: 'fake/handle',
+  metadata: {
+    'dc.title': [
+      {
+        language: null,
+        value: 'mockmatch',
+      },
+    ],
+  },
+});
+
+// Mock identifier data to use with tests
+const identifierData: WorkspaceitemSectionIdentifiersObject = {
+  identifiers: [{
+    value: 'https://doi.org/10.33515/dspace-61',
+    identifierType: 'doi',
+    identifierStatus: 'TO_BE_REGISTERED',
+    type: 'identifier',
+  },
+  {
+    value: '123456789/418',
+    identifierType: 'handle',
+    identifierStatus: null,
+    type: 'identifier',
+  },
+  ],
+  displayTypes: ['doi', 'handle'],
+};
+
+// Mock section object to use with tests
+const sectionObject: SectionDataObject = {
+  config: 'https://dspace.org/api/config/submissionforms/identifiers',
+  mandatory: true,
+  opened: true,
+  data: identifierData,
+  errorsToShow: [],
+  serverValidationErrors: [],
+  header: 'submission.sections.submit.progressbar.identifiers',
+  id: 'identifiers',
+  sectionType: SectionsType.Identifiers,
+  sectionVisibility: null,
+};
+
+describe('SubmissionSectionIdentifiersComponent test suite', () => {
+  let comp: SubmissionSectionIdentifiersComponent;
+  let compAsAny: any;
+  let fixture: ComponentFixture<SubmissionSectionIdentifiersComponent>;
+  let submissionServiceStub: any = new SubmissionServiceStub();
+  const sectionsServiceStub: any = new SectionsServiceStub();
+  let formService: any;
+  let formOperationsService: any;
+  let formBuilderService: any;
+  let collectionDataService: any;
+
+  const submissionId = mockSubmissionId;
+  const collectionId = mockSubmissionCollectionId;
+  const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+    add: jasmine.createSpy('add'),
+    replace: jasmine.createSpy('replace'),
+    remove: jasmine.createSpy('remove'),
+  });
+
+  const licenseText = 'License text';
+  const mockCollection = Object.assign(new Collection(), {
+    name: 'Community 1-Collection 1',
+    id: collectionId,
+    metadata: [
+      {
+        key: 'dc.title',
+        language: 'en_US',
+        value: 'Community 1-Collection 1',
+      }],
+    license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText })),
+  });
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        FormsModule,
+        ReactiveFormsModule,
+        NgxPaginationModule,
+        NoopAnimationsModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SubmissionSectionIdentifiersComponent,
+        TestComponent,
+        ObjNgFor,
+        VarDirective,
+      ],
+      providers: [
+        { provide: CollectionDataService, useValue: getMockCollectionDataService() },
+        { provide: SectionFormOperationsService, useValue: getMockFormOperationsService() },
+        { provide: FormService, useValue: getMockFormService() },
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+        { provide: SubmissionFormsConfigDataService, useValue: getMockSubmissionFormsConfigService() },
+        { provide: NotificationsService, useClass: NotificationsServiceStub },
+        { provide: SectionsService, useClass: SectionsServiceStub },
+        { provide: SubmissionService, useClass: SubmissionServiceStub },
+        { provide: 'collectionIdProvider', useValue: collectionId },
+        { provide: 'sectionDataProvider', useValue: sectionObject },
+        { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: PaginationService, useValue: paginationService },
+        ChangeDetectorRef,
+        FormBuilderService,
+        SubmissionSectionIdentifiersComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents().then();
+  }));
+
+  // First test to check the correct component creation
+  describe('', () => {
+    let testComp: TestComponent;
+    let testFixture: ComponentFixture<TestComponent>;
+
+    // synchronous beforeEach
+    beforeEach(() => {
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.getSectionData.and.returnValue(observableOf(identifierData));
+      const html = `<ds-submission-section-identifiers></ds-submission-section-identifiers>`;
+      testFixture = createTestComponent(html, TestComponent) as ComponentFixture<TestComponent>;
+      testComp = testFixture.componentInstance;
+    });
+
+    afterEach(() => {
+      testFixture.destroy();
+    });
+
+    it('should create SubmissionSectionIdentifiersComponent', inject([SubmissionSectionIdentifiersComponent], (idComp: SubmissionSectionIdentifiersComponent) => {
+      expect(idComp).toBeDefined();
+    }));
+  });
+
+  describe('', () => {
+    beforeEach(() => {
+      fixture = TestBed.createComponent(SubmissionSectionIdentifiersComponent);
+      comp = fixture.componentInstance;
+      compAsAny = comp;
+      submissionServiceStub = TestBed.inject(SubmissionService);
+      formService = TestBed.inject(FormService);
+      formBuilderService = TestBed.inject(FormBuilderService);
+      formOperationsService = TestBed.inject(SectionFormOperationsService);
+      collectionDataService = TestBed.inject(CollectionDataService);
+      compAsAny.pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionObject.id);
+    });
+
+    afterEach(() => {
+      fixture.destroy();
+      comp = null;
+      compAsAny = null;
+    });
+
+    // Test initialisation of the submission section
+    it('Should init section properly', () => {
+      collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
+      sectionsServiceStub.getSectionErrors.and.returnValue(observableOf([]));
+      sectionsServiceStub.isSectionReadOnly.and.returnValue(observableOf(false));
+      compAsAny.submissionService.getSubmissionScope.and.returnValue(SubmissionScopeType.WorkspaceItem);
+      spyOn(comp, 'getSectionStatus').and.returnValue(observableOf(true));
+      spyOn(comp, 'getIdentifierData').and.returnValue(observableOf(identifierData));
+      expect(comp.isLoading).toBeTruthy();
+      comp.onSectionInit();
+      fixture.detectChanges();
+      expect(comp.isLoading).toBeFalsy();
+    });
+
+    // The following tests look for proper logic in the getSectionStatus() implementation
+    // These are very simple as we don't really have a 'false' state unless we're still loading
+    it('Should return TRUE if the isLoading is FALSE', () => {
+      compAsAny.isLoading = false;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: true,
+      }));
+    });
+    it('Should return FALSE if the identifier data is missing handle', () => {
+      compAsAny.isLoadin = true;
+      expect(compAsAny.getSectionStatus()).toBeObservable(cold('(a|)', {
+        a: false,
+      }));
+    });
+  });
+
+});
+
+// declare a test component
+@Component({
+  selector: 'ds-test-cmp',
+  template: ``,
+})
+class TestComponent {
+
+}
diff --git a/src/app/submission/sections/identifiers/section-identifiers.component.ts b/src/app/submission/sections/identifiers/section-identifiers.component.ts
new file mode 100644
index 0000000000..b32458c757
--- /dev/null
+++ b/src/app/submission/sections/identifiers/section-identifiers.component.ts
@@ -0,0 +1,129 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+  Inject,
+} from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+  Subscription,
+} from 'rxjs';
+
+import { WorkspaceitemSectionIdentifiersObject } from '../../../core/submission/models/workspaceitem-section-identifiers.model';
+import { AlertType } from '../../../shared/alert/alert-type';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+
+/**
+ * This simple component displays DOI, handle and other identifiers that are already minted for the item in
+ * a workflow / submission section.
+ * ShowMintIdentifierStep will attempt to reserve an identifier before injecting result data for this component.
+ *
+ * @author Kim Shepherd
+ */
+@Component({
+  selector: 'ds-submission-section-identifiers',
+  templateUrl: './section-identifiers.component.html',
+  changeDetection: ChangeDetectionStrategy.Default,
+})
+
+@renderSectionFor(SectionsType.Identifiers)
+export class SubmissionSectionIdentifiersComponent extends SectionModelComponent {
+  /**
+   * The Alert categories.
+   * @type {AlertType}
+   */
+  public AlertTypeEnum = AlertType;
+
+  /**
+   * Variable to track if the section is loading.
+   * @type {boolean}
+   */
+  public isLoading = true;
+
+  /**
+   * Observable identifierData subject
+   * @type {Observable<WorkspaceitemSectionIdentifiersObject>}
+   */
+  public identifierData$: Observable<WorkspaceitemSectionIdentifiersObject> = new Observable<WorkspaceitemSectionIdentifiersObject>();
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+  public subbedIdentifierData: WorkspaceitemSectionIdentifiersObject;
+
+  /**
+   * Initialize instance variables.
+   *
+   * @param {PaginationService} paginationService
+   * @param {TranslateService} translate
+   * @param {SectionsService} sectionService
+   * @param {SubmissionService} submissionService
+   * @param {string} injectedCollectionId
+   * @param {SectionDataObject} injectedSectionData
+   * @param {string} injectedSubmissionId
+   */
+  constructor(protected translate: TranslateService,
+              protected sectionService: SectionsService,
+              protected submissionService: SubmissionService,
+              @Inject('collectionIdProvider') public injectedCollectionId: string,
+              @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+              @Inject('submissionIdProvider') public injectedSubmissionId: string) {
+    super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+  }
+
+  /**
+   * Initialize all instance variables and retrieve configuration.
+   */
+  onSectionInit() {
+    this.isLoading = false;
+    this.identifierData$ = this.getIdentifierData();
+  }
+
+  /**
+   * Check if identifier section has read-only visibility
+   */
+  isReadOnly(): boolean {
+    return true;
+  }
+
+  /**
+   * Unsubscribe from all subscriptions, if needed.
+   */
+  onSectionDestroy(): void {
+    return;
+  }
+
+  /**
+   * Get section status. Because this simple component never requires human interaction, this is basically
+   * always going to be the opposite of "is this section still loading". This is not the place for API response
+   * error checking but determining whether the step can 'proceed'.
+   *
+   * @return Observable<boolean>
+   *     the section status
+   */
+  public getSectionStatus(): Observable<boolean> {
+    return observableOf(!this.isLoading);
+  }
+
+  /**
+   * Get identifier data (from the REST service) as a simple object with doi, handle, otherIdentifiers variables
+   * and as an observable so it can update in real-time.
+   */
+  getIdentifierData() {
+    return this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType) as
+      Observable<WorkspaceitemSectionIdentifiersObject>;
+  }
+
+}
diff --git a/src/app/submission/sections/license/section-license.component.html b/src/app/submission/sections/license/section-license.component.html
index 5ee8a2db6b..ed10203596 100644
--- a/src/app/submission/sections/license/section-license.component.html
+++ b/src/app/submission/sections/license/section-license.component.html
@@ -1,4 +1,4 @@
-<span class="mb-5" [innerHTML]="licenseText$ | async"></span>
+<span class="mb-5 preserve-line-breaks" [innerHTML]="licenseText$ | async"></span>
 <br> <br>
 <ds-form *ngIf="formModel" #formRef="formComponent"
          [formId]="formId"
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..b0e51985fe 100644
--- a/src/app/submission/sections/license/section-license.component.spec.ts
+++ b/src/app/submission/sections/license/section-license.component.spec.ts
@@ -1,43 +1,58 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
-import { of as observableOf } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  DynamicCheckboxModel,
+  DynamicFormControlEvent,
+  DynamicFormControlEventType,
+} from '@ng-dynamic-forms/core';
 import { TranslateModule } from '@ngx-translate/core';
-import { DynamicCheckboxModel, DynamicFormControlEvent, DynamicFormControlEventType } from '@ng-dynamic-forms/core';
+import { cold } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { Collection } from '../../../core/shared/collection.model';
+import { License } from '../../../core/shared/license.model';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
+import { FormFieldMetadataValueObject } from '../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormComponent } from '../../../shared/form/form.component';
+import { FormService } from '../../../shared/form/form.service';
 import { getMockFormOperationsService } from '../../../shared/mocks/form-operations-service.mock';
 import { getMockFormService } from '../../../shared/mocks/form-service.mock';
-import { FormService } from '../../../shared/form/form.service';
-import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
 import {
   mockLicenseParsedErrors,
   mockSubmissionCollectionId,
-  mockSubmissionId
+  mockSubmissionId,
 } from '../../../shared/mocks/submission.mock';
-import { FormComponent } from '../../../shared/form/form.component';
-import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SubmissionSectionLicenseComponent } from './section-license.component';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionService } from '../../submission.service';
 import { SectionFormOperationsService } from '../form/section-form-operations.service';
-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 { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
+import { SubmissionSectionLicenseComponent } from './section-license.component';
 
 const collectionId = mockSubmissionCollectionId;
 const licenseText = 'License text';
@@ -48,9 +63,9 @@ const mockCollection = Object.assign(new Collection(), {
     {
       key: 'dc.title',
       language: 'en_US',
-      value: 'Community 1-Collection 1'
+      value: 'Community 1-Collection 1',
     }],
-  license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText }))
+  license: createSuccessfulRemoteDataObject$(Object.assign(new License(), { text: licenseText })),
 });
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService {
@@ -58,7 +73,7 @@ function getMockSubmissionFormsConfigService(): SubmissionFormsConfigDataService
     getConfigAll: jasmine.createSpy('getConfigAll'),
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
-    getConfigBySearch: jasmine.createSpy('getConfigBySearch')
+    getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
   });
 }
 
@@ -68,13 +83,13 @@ const sectionObject: SectionDataObject = {
   data: {
     url: null,
     acceptanceDate: null,
-    granted: false
+    granted: false,
   },
   errorsToShow: [],
   serverValidationErrors: [],
   header: 'submit.progressbar.describe.license',
   id: 'license',
-  sectionType: SectionsType.License
+  sectionType: SectionsType.License,
 };
 
 const dynamicFormControlEvent: DynamicFormControlEvent = {
@@ -83,7 +98,7 @@ const dynamicFormControlEvent: DynamicFormControlEvent = {
   control: null,
   group: null,
   model: null,
-  type: DynamicFormControlEventType.Change
+  type: DynamicFormControlEventType.Change,
 };
 
 describe('SubmissionSectionLicenseComponent test suite', () => {
@@ -108,7 +123,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
 
   const mockCollectionDataService = jasmine.createSpyObj('CollectionDataService', {
     findById: jasmine.createSpy('findById'),
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 
   beforeEach(waitForAsync(() => {
@@ -118,12 +133,12 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         SubmissionSectionLicenseComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: CollectionDataService, useValue: mockCollectionDataService },
@@ -139,9 +154,9 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         { provide: 'submissionIdProvider', useValue: submissionId },
         ChangeDetectorRef,
         FormBuilderService,
-        SubmissionSectionLicenseComponent
+        SubmissionSectionLicenseComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -213,7 +228,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         expect(model.value).toBeFalsy();
         expect(comp.licenseText$).toBeObservable(cold('(ab|)', {
           a: '',
-          b: licenseText
+          b: licenseText,
         }));
       });
 
@@ -221,7 +236,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         comp.sectionData.data = {
           url: 'url',
           acceptanceDate: Date.now(),
-          granted: true
+          granted: true,
         } as any;
 
         spyOn(compAsAny, 'getSectionStatus');
@@ -235,7 +250,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         expect(model.value).toBeTruthy();
         expect(comp.licenseText$).toBeObservable(cold('(ab|)', {
           a: '',
-          b: licenseText
+          b: licenseText,
         }));
       });
 
@@ -283,7 +298,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
         comp.sectionData.data = {
           url: 'url',
           acceptanceDate: Date.now(),
-          granted: true
+          granted: true,
         } as any;
 
         comp.onSectionInit();
@@ -325,7 +340,7 @@ describe('SubmissionSectionLicenseComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/license/section-license.component.ts b/src/app/submission/sections/license/section-license.component.ts
index e9a0cf1566..701bf75cb6 100644
--- a/src/app/submission/sections/license/section-license.component.ts
+++ b/src/app/submission/sections/license/section-license.component.ts
@@ -1,13 +1,30 @@
-import { ChangeDetectorRef, Component, Inject, ViewChild } from '@angular/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  ViewChild,
+} from '@angular/core';
 import {
   DynamicCheckboxModel,
   DynamicFormControlEvent,
   DynamicFormControlModel,
-  DynamicFormLayout
+  DynamicFormLayout,
 } from '@ng-dynamic-forms/core';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  map,
+  mergeMap,
+  startWith,
+  take,
+} from 'rxjs/operators';
 
-import { Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, find, map, mergeMap, startWith, take } from 'rxjs/operators';
 import { CollectionDataService } from '../../../core/data/collection-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
@@ -15,21 +32,27 @@ import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/jso
 import { Collection } from '../../../core/shared/collection.model';
 import { License } from '../../../core/shared/license.model';
 import { WorkspaceitemSectionLicenseObject } from '../../../core/submission/models/workspaceitem-section-license.model';
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../shared/empty.util';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+  isNotUndefined,
+} from '../../../shared/empty.util';
 import { FormBuilderService } from '../../../shared/form/builder/form-builder.service';
 import { FormComponent } from '../../../shared/form/form.component';
 import { FormService } from '../../../shared/form/form.service';
 import { followLink } from '../../../shared/utils/follow-link-config.model';
 import { SubmissionService } from '../../submission.service';
 import { SectionFormOperationsService } from '../form/section-form-operations.service';
-import { SectionDataObject } from '../models/section-data.model';
-
 import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
 import { renderSectionFor } from '../sections-decorator';
 import { SectionsType } from '../sections-type';
-import { SectionsService } from '../sections.service';
-import { SECTION_LICENSE_FORM_LAYOUT, SECTION_LICENSE_FORM_MODEL } from './section-license.model';
-import { TranslateService } from '@ngx-translate/core';
+import {
+  SECTION_LICENSE_FORM_LAYOUT,
+  SECTION_LICENSE_FORM_MODEL,
+} from './section-license.model';
 
 /**
  * This component represents a section that contains the submission license form.
@@ -182,7 +205,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
             this.sectionService.dispatchRemoveSectionErrors(this.submissionId, this.sectionData.id);
           }
           this.changeDetectorRef.detectChanges();
-        })
+        }),
     );
   }
 
@@ -213,6 +236,7 @@ export class SubmissionSectionLicenseComponent extends SectionModelComponent {
     } else {
       this.operationsBuilder.remove(this.pathCombiner.getPath(path));
     }
+    this.submissionService.dispatchSaveSection(this.submissionId, this.sectionData.id);
   }
 
   /**
diff --git a/src/app/submission/sections/license/section-license.model.ts b/src/app/submission/sections/license/section-license.model.ts
index 0f21ef98a4..33f7721ac3 100644
--- a/src/app/submission/sections/license/section-license.model.ts
+++ b/src/app/submission/sections/license/section-license.model.ts
@@ -5,9 +5,9 @@ export const SECTION_LICENSE_FORM_LAYOUT = {
     element: {
       container: 'custom-control custom-checkbox pl-1',
       control: 'custom-control-input',
-      label: 'custom-control-label pt-1'
-    }
-  }
+      label: 'custom-control-label pt-1',
+    },
+  },
 };
 
 export const SECTION_LICENSE_FORM_MODEL = [
@@ -17,12 +17,12 @@ export const SECTION_LICENSE_FORM_MODEL = [
     required: true,
     value: false,
     validators: {
-      required: null
+      required: null,
     },
     errorMessages: {
       required: 'submission.sections.license.required',
-      notgranted: 'submission.sections.license.notgranted'
+      notgranted: 'submission.sections.license.notgranted',
     },
     type: 'CHECKBOX',
-  }
+  },
 ];
diff --git a/src/app/submission/sections/models/section-data.model.ts b/src/app/submission/sections/models/section-data.model.ts
index 6f8126dffc..7ecb820db7 100644
--- a/src/app/submission/sections/models/section-data.model.ts
+++ b/src/app/submission/sections/models/section-data.model.ts
@@ -1,6 +1,6 @@
 import { WorkspaceitemSectionDataType } from '../../../core/submission/models/workspaceitem-sections.model';
-import { SectionsType } from '../sections-type';
 import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SectionsType } from '../sections-type';
 
 /**
  * An interface to represent section model
diff --git a/src/app/submission/sections/models/section.model.ts b/src/app/submission/sections/models/section.model.ts
index c9be079213..4868f0c6c1 100644
--- a/src/app/submission/sections/models/section.model.ts
+++ b/src/app/submission/sections/models/section.model.ts
@@ -1,11 +1,24 @@
-import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  startWith,
+} from 'rxjs/operators';
 
-import { Observable, Subscription } from 'rxjs';
-import { filter, startWith } from 'rxjs/operators';
-
-import { SectionDataObject } from './section-data.model';
+import {
+  hasValue,
+  isNotUndefined,
+} from '../../../shared/empty.util';
 import { SectionsService } from '../sections.service';
-import { hasValue, isNotUndefined } from '../../../shared/empty.util';
+import { SectionDataObject } from './section-data.model';
 
 export interface SectionDataModel {
   sectionData: SectionDataObject;
@@ -16,7 +29,7 @@ export interface SectionDataModel {
  */
 @Component({
   selector: 'ds-section-model',
-  template: ''
+  template: '',
 })
 export abstract class SectionModelComponent implements OnDestroy, OnInit, SectionDataModel {
   protected abstract sectionService: SectionsService;
diff --git a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts
new file mode 100644
index 0000000000..cfad518b85
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.spec.ts
@@ -0,0 +1,96 @@
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { RestResponse } from '../../../core/cache/response.models';
+import { CreateData } from '../../../core/data/base/create-data';
+import { testCreateDataImplementation } from '../../../core/data/base/create-data.spec';
+import { DeleteData } from '../../../core/data/base/delete-data';
+import { testDeleteDataImplementation } from '../../../core/data/base/delete-data.spec';
+import { FindAllData } from '../../../core/data/base/find-all-data';
+import { testFindAllDataImplementation } from '../../../core/data/base/find-all-data.spec';
+import { PatchData } from '../../../core/data/base/patch-data';
+import { testPatchDataImplementation } from '../../../core/data/base/patch-data.spec';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RequestService } from '../../../core/data/request.service';
+import { RequestEntry } from '../../../core/data/request-entry.model';
+import { RequestEntryState } from '../../../core/data/request-entry-state.model';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { CoarNotifyConfigDataService } from './coar-notify-config-data.service';
+
+describe('CoarNotifyConfigDataService test', () => {
+  let scheduler: TestScheduler;
+  let service: CoarNotifyConfigDataService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+  let halService: HALEndpointService;
+  let notificationsService: NotificationsService;
+  let responseCacheEntry: RequestEntry;
+
+  const endpointURL = `https://rest.api/rest/api/coar-notify`;
+  const requestUUID = '8b3c613a-5a4b-438b-9686-be1d5b4a1c5a';
+
+  const remoteDataMocks = {
+    Success: new RemoteData(null, null, null, RequestEntryState.Success, null, null, 200),
+  };
+
+  function initTestService() {
+    return new CoarNotifyConfigDataService(
+      requestService,
+      rdbService,
+      objectCache,
+      halService,
+      notificationsService,
+    );
+  }
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    objectCache = {} as ObjectCacheService;
+    notificationsService = {} as NotificationsService;
+    responseCacheEntry = new RequestEntry();
+    responseCacheEntry.request = { href: 'https://rest.api/' } as any;
+    responseCacheEntry.response = new RestResponse(true, 200, 'Success');
+
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      send: true,
+      removeByHrefSubstring: {},
+      getByHref: of(responseCacheEntry),
+      getByUUID: of(responseCacheEntry),
+    });
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: of(endpointURL),
+    });
+
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildSingle: createSuccessfulRemoteDataObject$({}, 500),
+      buildList: cold('a', { a: remoteDataMocks.Success }),
+    });
+
+
+    service = initTestService();
+  });
+
+  describe('composition', () => {
+    const initCreateService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as CreateData<any>;
+    const initFindAllService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as FindAllData<any>;
+    const initDeleteService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as DeleteData<any>;
+    const initPatchService = () => new CoarNotifyConfigDataService(null, null, null, null, null) as unknown as PatchData<any>;
+    testCreateDataImplementation(initCreateService);
+    testFindAllDataImplementation(initFindAllService);
+    testPatchDataImplementation(initPatchService);
+    testDeleteDataImplementation(initDeleteService);
+  });
+
+});
diff --git a/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts
new file mode 100644
index 0000000000..cb5155dd32
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/coar-notify-config-data.service.ts
@@ -0,0 +1,129 @@
+import { Injectable } from '@angular/core';
+import { Operation } from 'fast-json-patch';
+import { Observable } from 'rxjs';
+import {
+  map,
+  take,
+} from 'rxjs/operators';
+
+import { RemoteDataBuildService } from '../../../core/cache/builders/remote-data-build.service';
+import { RequestParam } from '../../../core/cache/models/request-param.model';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import {
+  CreateData,
+  CreateDataImpl,
+} from '../../../core/data/base/create-data';
+import { dataService } from '../../../core/data/base/data-service.decorator';
+import {
+  DeleteData,
+  DeleteDataImpl,
+} from '../../../core/data/base/delete-data';
+import {
+  FindAllData,
+  FindAllDataImpl,
+} from '../../../core/data/base/find-all-data';
+import { IdentifiableDataService } from '../../../core/data/base/identifiable-data.service';
+import {
+  PatchData,
+  PatchDataImpl,
+} from '../../../core/data/base/patch-data';
+import { ChangeAnalyzer } from '../../../core/data/change-analyzer';
+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 { MultipartPostRequest } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { RestRequest } from '../../../core/data/rest-request.model';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { HALEndpointService } from '../../../core/shared/hal-endpoint.service';
+import { NoContent } from '../../../core/shared/NoContent.model';
+import { URLCombiner } from '../../../core/url-combiner/url-combiner';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { FollowLinkConfig } from '../../../shared/utils/follow-link-config.model';
+import { SUBMISSION_COAR_NOTIFY_CONFIG } from './section-coar-notify-service.resource-type';
+import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config';
+
+
+/**
+ * A service responsible for fetching/sending data from/to the REST API on the CoarNotifyConfig endpoint
+ */
+@Injectable()
+@dataService(SUBMISSION_COAR_NOTIFY_CONFIG)
+export class CoarNotifyConfigDataService extends IdentifiableDataService<SubmissionCoarNotifyConfig> implements FindAllData<SubmissionCoarNotifyConfig>, DeleteData<SubmissionCoarNotifyConfig>, PatchData<SubmissionCoarNotifyConfig>, CreateData<SubmissionCoarNotifyConfig> {
+  createData: CreateDataImpl<SubmissionCoarNotifyConfig>;
+  private findAllData: FindAllDataImpl<SubmissionCoarNotifyConfig>;
+  private deleteData: DeleteDataImpl<SubmissionCoarNotifyConfig>;
+  private patchData: PatchDataImpl<SubmissionCoarNotifyConfig>;
+  private comparator: ChangeAnalyzer<SubmissionCoarNotifyConfig>;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+  ) {
+    super('submissioncoarnotifyconfigs', requestService, rdbService, objectCache, halService);
+
+    this.findAllData = new FindAllDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.responseMsToLive);
+    this.deleteData = new DeleteDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive, this.constructIdEndpoint);
+    this.patchData = new PatchDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, this.comparator, this.responseMsToLive, this.constructIdEndpoint);
+    this.createData = new CreateDataImpl(this.linkPath, requestService, rdbService, objectCache, halService, notificationsService, this.responseMsToLive);
+  }
+
+
+  create(object: SubmissionCoarNotifyConfig, ...params: RequestParam[]): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    return this.createData.create(object, ...params);
+  }
+
+  patch(object: SubmissionCoarNotifyConfig, operations: Operation[]): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    return this.patchData.patch(object, operations);
+  }
+
+  update(object: SubmissionCoarNotifyConfig): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    return this.patchData.update(object);
+  }
+
+  commitUpdates(method?: RestRequestMethod): void {
+    return this.patchData.commitUpdates(method);
+  }
+
+  createPatchFromCache(object: SubmissionCoarNotifyConfig): Observable<Operation[]> {
+    return this.patchData.createPatchFromCache(object);
+  }
+
+  findAll(options?: FindListOptions, useCachedVersionIfAvailable?: boolean, reRequestOnStale?: boolean, ...linksToFollow: FollowLinkConfig<SubmissionCoarNotifyConfig>[]): Observable<RemoteData<PaginatedList<SubmissionCoarNotifyConfig>>> {
+    return this.findAllData.findAll(options, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
+  }
+
+
+  public delete(objectId: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.delete(objectId, copyVirtualMetadata);
+  }
+
+  public deleteByHref(href: string, copyVirtualMetadata?: string[]): Observable<RemoteData<NoContent>> {
+    return this.deleteData.deleteByHref(href, copyVirtualMetadata);
+  }
+
+  public invoke(serviceName: string, serviceId: string, files: File[]): Observable<RemoteData<SubmissionCoarNotifyConfig>> {
+    const requestId = this.requestService.generateRequestId();
+    this.getBrowseEndpoint().pipe(
+      take(1),
+      map((endpoint: string) => new URLCombiner(endpoint, serviceName, 'submissioncoarnotifyconfigmodel', serviceId).toString()),
+      map((endpoint: string) => {
+        const body = this.getInvocationFormData(files);
+        return new MultipartPostRequest(requestId, endpoint, body);
+      }),
+    ).subscribe((request: RestRequest) => this.requestService.send(request));
+
+    return this.rdbService.buildFromRequestUUID<SubmissionCoarNotifyConfig>(requestId);
+  }
+
+  private getInvocationFormData(files: File[]): FormData {
+    const form: FormData = new FormData();
+    files.forEach((file: File) => {
+      form.append('file', file);
+    });
+    return form;
+  }
+}
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts
new file mode 100644
index 0000000000..53e41783ce
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify-service.resource-type.ts
@@ -0,0 +1,13 @@
+/**
+ * The resource type for Ldn-Services
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+import { ResourceType } from '../../../core/shared/resource-type';
+
+
+export const SUBMISSION_COAR_NOTIFY_CONFIG = new ResourceType('submissioncoarnotifyconfig');
+
+export const COAR_NOTIFY_WORKSPACEITEM = new ResourceType('workspaceitem');
+
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
new file mode 100644
index 0000000000..49742892ca
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
@@ -0,0 +1,149 @@
+<div class="container-fluid">
+  <ng-container *ngIf="patterns?.length > 0 ">
+    <div *ngFor="let ldnPattern of patterns; let i = index" class="col">
+      <div *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0">
+        <label class="row col-form-label">
+          {{'submission.section.section-coar-notify.control.' + ldnPattern.pattern + '.label' | translate }}
+        </label
+        >
+        <div *ngIf="ldnServiceByPattern[ldnPattern.pattern]?.services.length">
+          <div
+            *ngFor="
+            let service of ldnServiceByPattern[ldnPattern.pattern].services;
+            let serviceIndex = index
+          "
+          >
+            <div class="row">
+              <div ngbDropdown #myDropdown="ngbDropdown" [class.mt-2]="serviceIndex > 0" class="flex-grow-1">
+                <div class="position-relative right-addon"
+                     [attr.aria-label]="ldnPattern.pattern + '.dropdown'">
+                  <i ngbDropdownToggle class="position-absolute scrollable-dropdown-toggle"
+                     aria-hidden="true"></i>
+                  <input
+                    [attr.aria-label]="ldnPattern.pattern+'.dropdownanchor'"
+                    type="text"
+                    [readonly]="true"
+                    [ngClass]="{'border-danger': (getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0}"
+                    class="form-control w-100 scrollable-dropdown-input"
+                    [value]="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.name"
+                    (click)="myDropdown.open()"
+                  />
+                </div>
+                <div
+                  ngbDropdownMenu
+                  class="dropdown-menu scrollable-dropdown-menu w-100"
+                  aria-haspopup="true"
+                  aria-expanded="false"
+                >
+                  <div
+                    class="scrollable-menu"
+                    role="listbox"
+                    infiniteScroll
+                    [infiniteScrollDistance]="2"
+                    [infiniteScrollThrottle]="50"
+                    [scrollWindow]="false"
+                  >
+                    <button
+                      *ngIf="(filterServices(ldnPattern.pattern) | async)?.length === 0"
+                      class="dropdown-item collection-item text-truncate w-100"
+                    >
+                      {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
+                    </button>
+                    <button
+                      *ngIf="(filterServices(ldnPattern.pattern ) | async)?.length > 0"
+                      class="dropdown-item collection-item text-truncate w-100"
+                      (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
+                    >
+                      {{'submission.section.section-coar-notify.dropdown.select-none' | translate}}
+                    </button>
+                    <button
+                      *ngFor="let serviceOption of filterServices(ldnPattern.pattern ) | async"
+                      [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
+                      class="dropdown-item collection-item text-truncate w-100"
+                      (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
+                    >
+                      <b>
+                        {{ serviceOption.name }}
+                      </b>
+                      <br />
+                      {{ serviceOption.description }}
+                    </button>
+                  </div>
+                </div>
+              </div>
+              <button *ngIf="ldnServiceByPattern[ldnPattern.pattern].services.length > 1"
+                      type="button" [class.mt-2]="serviceIndex > 0"
+                      class="btn btn-secondary ml-2"
+                      role="button"
+                      title="{{'form.remove' | translate}}"
+                      [attr.aria-label]="'form.remove' | translate"
+                      (click)="removeService(ldnPattern, serviceIndex)"
+              >
+                <span><i class="fas fa-trash" aria-hidden="true"></i></span>
+              </button>
+            </div>
+
+            <small
+              class="row text-muted"
+              *ngIf="!ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex] &&
+                    serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length -1"
+            >
+              {{'submission.section.section-coar-notify.small.notification' | translate : {pattern : ldnPattern.pattern} }}
+            </small>
+            <ng-container *ngIf="(getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)?.length > 0">
+              <small class="row text-danger" *ngFor="let error of (getShownSectionErrors$(ldnPattern.pattern , serviceIndex) | async)">
+                {{ error.message | translate}}
+              </small>
+            </ng-container>
+            <div
+              class="row mt-1"
+              *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]"
+            >
+              <div
+                class="alert alert-info w-100 d-flex align-items-center flex-row"
+              >
+                <i class="fa-solid fa-circle-info fa-xl ml-2"></i>
+                <div class="ml-4">
+                  <div>{{ 'submission.section.section-coar-notify.selection.description' | translate }}</div>
+                  <div *ngIf="ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex]?.description; else noDesc">
+                    {{ ldnServiceByPattern[ldnPattern.pattern].services[serviceIndex].description }}
+                  </div>
+                  <ng-template #noDesc>
+                <span class="text-muted">
+                  {{ 'submission.section.section-coar-notify.selection.no-description' | translate }}
+                </span>
+                  </ng-template>
+                </div>
+              </div>
+            </div>
+            <div class="row" *ngIf="(getShownSectionErrors$(ldnPattern.pattern, serviceIndex) | async)?.length > 0">
+              <div
+                class="alert alert-danger w-100 d-flex align-items-center flex-row"
+              >
+                <div class="ml-4">
+              <span>
+                {{ 'submission.section.section-coar-notify.notification.error' | translate }}
+              </span>
+                </div>
+              </div>
+            </div>
+            <div class="row">
+              <div *ngIf="ldnPattern.multipleRequest && (serviceIndex === ldnServiceByPattern[ldnPattern.pattern].services.length - 1)"
+                   (click)="addNewService(ldnPattern)"
+                   class="btn btn-link mt-2 pl-0"
+              >
+                <i class="fas fa-plus"></i>
+                {{ 'submission.sections.general.add-more' | translate }}
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </ng-container>
+    <ng-container *ngIf="!hasSectionData">
+    <p>
+      {{ 'submission.section.section-coar-notify.info.no-pattern' | translate }}
+    </p>
+  </ng-container>
+</div>
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.scss b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.scss
new file mode 100644
index 0000000000..4a3e7072a3
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.scss
@@ -0,0 +1,5 @@
+// Getting styles for NgbDropdown
+@import '../../../shared/form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component.scss';
+@import '../../../shared/form/form.component.scss';
+
+
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts
new file mode 100644
index 0000000000..f92ceff902
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.spec.ts
@@ -0,0 +1,446 @@
+import { ChangeDetectorRef } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
+
+import { LdnServicesService } from '../../../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import { NotifyServicePattern } from '../../../admin/admin-ldn-services/ldn-services-model/ldn-service-patterns.model';
+import {
+  LdnService,
+  LdnServiceByPattern,
+} from '../../../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { createPaginatedList } from '../../../shared/testing/utils.test';
+import { SectionsService } from '../sections.service';
+import { CoarNotifyConfigDataService } from './coar-notify-config-data.service';
+import { SubmissionSectionCoarNotifyComponent } from './section-coar-notify.component';
+import { SubmissionCoarNotifyConfig } from './submission-coar-notify.config';
+
+describe('SubmissionSectionCoarNotifyComponent', () => {
+  let component: SubmissionSectionCoarNotifyComponent;
+  let componentAsAny: any;
+  let fixture: ComponentFixture<SubmissionSectionCoarNotifyComponent>;
+
+  let ldnServicesService: jasmine.SpyObj<LdnServicesService>;
+  let coarNotifyConfigDataService: jasmine.SpyObj<CoarNotifyConfigDataService>;
+  let operationsBuilder: jasmine.SpyObj<JsonPatchOperationsBuilder>;
+  let sectionService: jasmine.SpyObj<SectionsService>;
+  let cdRefStub: any;
+
+
+  const patterns: SubmissionCoarNotifyConfig[] = Object.assign(
+    [new SubmissionCoarNotifyConfig()],
+    {
+      patterns: [{ pattern: 'review', multipleRequest: false }, { pattern: 'endorsment', multipleRequest: false }],
+    },
+  );
+  const patternsPL = createPaginatedList(patterns);
+  const coarNotifyConfig = createSuccessfulRemoteDataObject$(patternsPL);
+
+  beforeEach(async () => {
+    ldnServicesService = jasmine.createSpyObj('LdnServicesService', [
+      'findByInboundPattern',
+    ]);
+    coarNotifyConfigDataService = jasmine.createSpyObj(
+      'CoarNotifyConfigDataService',
+      ['findAll'],
+    );
+    operationsBuilder = jasmine.createSpyObj('JsonPatchOperationsBuilder', [
+      'remove',
+      'replace',
+      'add',
+      'flushOperation',
+    ]);
+    sectionService = jasmine.createSpyObj('SectionsService', [
+      'dispatchRemoveSectionErrors',
+      'getSectionServerErrors',
+      'setSectionError',
+    ]);
+    cdRefStub = Object.assign({
+      detectChanges: () => fixture.detectChanges(),
+    });
+
+    await TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [SubmissionSectionCoarNotifyComponent],
+      providers: [
+        { provide: LdnServicesService, useValue: ldnServicesService },
+        { provide: CoarNotifyConfigDataService, useValue: coarNotifyConfigDataService },
+        { provide: JsonPatchOperationsBuilder, useValue: operationsBuilder },
+        { provide: SectionsService, useValue: sectionService },
+        { provide: ChangeDetectorRef, useValue: cdRefStub },
+        { provide: 'collectionIdProvider', useValue: 'collectionId' },
+        { provide: 'sectionDataProvider', useValue: { id: 'sectionId', data: {} } },
+        { provide: 'submissionIdProvider', useValue: 'submissionId' },
+        NgbDropdown,
+      ],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(SubmissionSectionCoarNotifyComponent);
+    component = fixture.componentInstance;
+    componentAsAny = component;
+
+    component.patterns = patterns[0].patterns;
+    coarNotifyConfigDataService.findAll.and.returnValue(coarNotifyConfig);
+    sectionService.getSectionServerErrors.and.returnValue(
+      of(
+        Object.assign([], {
+          path: 'sections/sectionId/data/notifyCoar',
+          message: 'error',
+        }),
+      ),
+    );
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('onSectionInit', () => {
+    it('should call setCoarNotifyConfig and getSectionServerErrorsAndSetErrorsToDisplay', () => {
+      spyOn(component, 'setCoarNotifyConfig');
+      spyOn(componentAsAny, 'getSectionServerErrorsAndSetErrorsToDisplay');
+
+      component.onSectionInit();
+
+      expect(component.setCoarNotifyConfig).toHaveBeenCalled();
+      expect(componentAsAny.getSectionServerErrorsAndSetErrorsToDisplay).toHaveBeenCalled();
+    });
+  });
+
+  describe('onChange', () => {
+    const ldnPattern = { pattern: 'review', multipleRequest: false };
+    const index = 0;
+    const selectedService: LdnService = Object.assign(new LdnService(), {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [
+        {
+          pattern: 'review',
+        },
+      ],
+      description: '',
+    });
+
+    beforeEach(() => {
+      component.ldnServiceByPattern[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+
+      component.patterns = [];
+    });
+
+    it('should do nothing if the selected value is the same as the previous one', () => {
+
+      component.ldnServiceByPattern[ldnPattern.pattern].services[index] = selectedService;
+      component.onChange(ldnPattern.pattern, index, selectedService);
+
+      expect(componentAsAny.operationsBuilder.remove).not.toHaveBeenCalled();
+      expect(componentAsAny.operationsBuilder.replace).not.toHaveBeenCalled();
+      expect(componentAsAny.operationsBuilder.add).not.toHaveBeenCalled();
+    });
+
+    it('should remove the path when the selected value is null', () => {
+      component.ldnServiceByPattern[ldnPattern.pattern].services[index] = selectedService;
+      component.onChange(ldnPattern.pattern, index, null);
+
+      expect(componentAsAny.operationsBuilder.flushOperation).toHaveBeenCalledWith(
+        componentAsAny.pathCombiner.getPath([ldnPattern.pattern, '-']),
+      );
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services[index]).toBeNull();
+      expect(component.previousServices[ldnPattern.pattern].services[index]).toBeNull();
+    });
+
+    it('should replace the path when there is a previous value stored and it is different from the new one', () => {
+      const previousService: LdnService = Object.assign(new LdnService(), {
+        id: 2,
+        name: 'service2',
+        notifyServiceInboundPatterns: [
+          {
+            pattern: 'endorsement',
+          },
+        ],
+        description: 'test',
+      });
+      component.ldnServiceByPattern[ldnPattern.pattern].services[index] = previousService;
+      component.previousServices[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [previousService],
+      } as LdnServiceByPattern;
+
+      component.onChange(ldnPattern.pattern, index, selectedService);
+
+      expect(componentAsAny.operationsBuilder.add).toHaveBeenCalledWith(
+        componentAsAny.pathCombiner.getPath([ldnPattern.pattern, '-']),
+        [selectedService.id],
+        false,
+        true,
+      );
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services[index]).toEqual(
+        selectedService,
+      );
+      expect(component.previousServices[ldnPattern.pattern].services[index].id).toEqual(
+        selectedService.id,
+      );
+    });
+
+    it('should add the path when there is no previous value stored', () => {
+      component.onChange(ldnPattern.pattern, index, selectedService);
+
+      expect(componentAsAny.operationsBuilder.add).toHaveBeenCalledWith(
+        componentAsAny.pathCombiner.getPath([ldnPattern.pattern, '-']),
+        [selectedService.id],
+        false,
+        true,
+      );
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services[index]).toEqual(
+        selectedService,
+      );
+      expect(component.previousServices[ldnPattern.pattern].services[index].id).toEqual(
+        selectedService.id,
+      );
+    });
+  });
+
+  describe('initSelectedServicesByPattern', () => {
+    const pattern1 = { pattern: 'review', multipleRequest: false };
+    const pattern2 = { pattern: 'endorsement', multipleRequest: false };
+    const service1: LdnService = Object.assign(new LdnService(), {
+      id: 1,
+      uuid: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern1,
+        }),
+      ],
+    });
+    const service2: LdnService = Object.assign(new LdnService(), {
+      id: 2,
+      uuid: 2,
+      name: 'service2',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern2,
+        }),
+      ],
+    });
+    const service3: LdnService = Object.assign(new LdnService(), {
+      id: 3,
+      uuid: 3,
+      name: 'service3',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern1,
+        }),
+        Object.assign(new NotifyServicePattern(), {
+          pattern: pattern2,
+        }),
+      ],
+    });
+
+    const services = [service1, service2, service3];
+
+    beforeEach(() => {
+      ldnServicesService.findByInboundPattern.and.returnValue(
+        createSuccessfulRemoteDataObject$(createPaginatedList(services)),
+      );
+      component.ldnServiceByPattern[pattern1.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+
+      component.ldnServiceByPattern[pattern2.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+
+      component.patterns = [pattern1, pattern2];
+
+      spyOn(component, 'filterServices').and.callFake((pattern) => {
+        return of(services);
+      });
+    });
+
+    it('should initialize the selected services by pattern', () => {
+      component.initSelectedServicesByPattern();
+
+      expect(component.ldnServiceByPattern[pattern1.pattern].services).toEqual([null]);
+      expect(component.ldnServiceByPattern[pattern2.pattern].services).toEqual([null]);
+    });
+
+    it('should add the service to the selected services by pattern if the section data has a value for the pattern', () => {
+      component.sectionData.data[pattern1.pattern] = [service1.uuid, service3.uuid];
+      component.sectionData.data[pattern2.pattern] = [service2.uuid, service3.uuid];
+      component.initSelectedServicesByPattern();
+
+      expect(component.ldnServiceByPattern[pattern1.pattern].services).toEqual([
+        service1,
+        service3,
+      ]);
+      expect(component.ldnServiceByPattern[pattern2.pattern].services).toEqual([
+        service2,
+        service3,
+      ]);
+    });
+  });
+
+  describe('addService', () => {
+    const ldnPattern = { pattern: 'review', multipleRequest: false };
+    const service: any = {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [{ pattern: ldnPattern.pattern }],
+    };
+
+    beforeEach(() => {
+      component.ldnServiceByPattern[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+    });
+
+    it('should push the new service to the array corresponding to the pattern', () => {
+      component.addService(ldnPattern, service);
+
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services).toEqual([service]);
+    });
+  });
+
+  describe('removeService', () => {
+    const ldnPattern = { pattern: 'review', multipleRequest: false };
+    const service1: LdnService = Object.assign(new LdnService(), {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: ldnPattern.pattern,
+        }),
+      ],
+    });
+    const service2: LdnService = Object.assign(new LdnService(), {
+      id: 2,
+      name: 'service2',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: ldnPattern.pattern,
+        }),
+      ],
+    });
+    const service3: LdnService = Object.assign(new LdnService(), {
+      id: 3,
+      name: 'service3',
+      notifyServiceInboundPatterns: [
+        Object.assign(new NotifyServicePattern(), {
+          pattern: ldnPattern.pattern,
+        }),
+      ],
+    });
+
+    beforeEach(() => {
+      component.ldnServiceByPattern[ldnPattern.pattern] = {
+        allowsMultipleRequests: false,
+        services: [],
+      } as LdnServiceByPattern;
+    });
+
+
+    it('should remove the service at the specified index from the array corresponding to the pattern', () => {
+      component.ldnServiceByPattern[ldnPattern.pattern].services = [service1, service2, service3];
+      component.removeService(ldnPattern, 1);
+
+      expect(component.ldnServiceByPattern[ldnPattern.pattern].services).toEqual([
+        service1,
+        service3,
+      ]);
+    });
+  });
+
+  describe('filterServices', () => {
+    const pattern = 'review';
+    const service1: any = {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+    const service2: any = {
+      id: 2,
+      name: 'service2',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+    const service3: any = {
+      id: 3,
+      name: 'service3',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+    const services = [service1, service2, service3];
+
+    beforeEach(() => {
+      ldnServicesService.findByInboundPattern.and.returnValue(
+        createSuccessfulRemoteDataObject$(createPaginatedList(services)),
+      );
+    });
+
+    it('should return an observable of the services that match the given pattern', () => {
+      component.filterServices(pattern).subscribe((result) => {
+        expect(result).toEqual(services);
+      });
+    });
+  });
+
+  describe('hasInboundPattern', () => {
+    const pattern = 'review';
+    const service: any = {
+      id: 1,
+      name: 'service1',
+      notifyServiceInboundPatterns: [{ pattern: pattern }],
+    };
+
+    it('should return true if the service has the specified inbound pattern type', () => {
+      expect(component.hasInboundPattern(service, pattern)).toBeTrue();
+    });
+
+    it('should return false if the service does not have the specified inbound pattern type', () => {
+      expect(component.hasInboundPattern(service, 'endorsement')).toBeFalse();
+    });
+  });
+
+  describe('getSectionServerErrorsAndSetErrorsToDisplay', () => {
+    it('should set the validation errors for the current section to display', () => {
+      const validationErrors = [
+        { path: 'sections/sectionId/data/notifyCoar', message: 'error' },
+      ];
+      sectionService.getSectionServerErrors.and.returnValue(
+        of(validationErrors),
+      );
+
+      componentAsAny.getSectionServerErrorsAndSetErrorsToDisplay();
+
+      expect(sectionService.setSectionError).toHaveBeenCalledWith(
+        component.submissionId,
+        component.sectionData.id,
+        validationErrors[0],
+      );
+    });
+  });
+
+  describe('onSectionDestroy', () => {
+    it('should unsubscribe from all subscriptions', () => {
+      const sub1 = of(null).subscribe();
+      const sub2 = of(null).subscribe();
+      componentAsAny.subs = [sub1, sub2];
+      spyOn(sub1, 'unsubscribe');
+      spyOn(sub2, 'unsubscribe');
+      component.onSectionDestroy();
+      expect(sub1.unsubscribe).toHaveBeenCalled();
+      expect(sub2.unsubscribe).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
new file mode 100644
index 0000000000..6415e21f31
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.ts
@@ -0,0 +1,359 @@
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+} from '@angular/core';
+import { NgbDropdown } from '@ng-bootstrap/ng-bootstrap';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { LdnServicesService } from '../../../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
+import {
+  LdnService,
+  LdnServiceByPattern,
+} from '../../../admin/admin-ldn-services/ldn-services-model/ldn-services.model';
+import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import {
+  getFirstCompletedRemoteData,
+  getPaginatedListPayload,
+  getRemoteDataPayload,
+} from '../../../core/shared/operators';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+} from '../../../shared/empty.util';
+import { SubmissionSectionError } from '../../objects/submission-section-error.model';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+import { CoarNotifyConfigDataService } from './coar-notify-config-data.service';
+import { LdnPattern } from './submission-coar-notify.config';
+
+/**
+ * This component represents a section that contains the submission section-coar-notify form.
+ */
+@Component({
+  selector: 'ds-submission-section-coar-notify',
+  templateUrl: './section-coar-notify.component.html',
+  styleUrls: ['./section-coar-notify.component.scss'],
+  providers: [NgbDropdown],
+})
+@renderSectionFor(SectionsType.CoarNotify)
+export class SubmissionSectionCoarNotifyComponent extends SectionModelComponent {
+
+  hasSectionData = false;
+  /**
+   * Contains an array of string patterns.
+   */
+  patterns: LdnPattern[] = [];
+  /**
+   * An object that maps string keys to arrays of LdnService objects.
+   * Used to store LdnService objects by pattern.
+   */
+  ldnServiceByPattern: { [key: string]: LdnServiceByPattern } = {};
+  /**
+   * A map representing all services for each pattern
+   * {
+   *  'pattern': {
+   *   'index': 'service.id'
+   *   }
+   * }
+   *
+   * @type {{ [key: string]: {[key: number]: number} }}
+   * @memberof SubmissionSectionCoarNotifyComponent
+   */
+  previousServices: { [key: string]: LdnServiceByPattern } = {};
+
+  /**
+   * The [[JsonPatchOperationPathCombiner]] object
+   * @type {JsonPatchOperationPathCombiner}
+   */
+  protected pathCombiner: JsonPatchOperationPathCombiner;
+  /**
+   * A map representing all field on their way to be removed
+   * @type {Map}
+   */
+  protected fieldsOnTheirWayToBeRemoved: Map<string, number[]> = new Map();
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  private filteredServicesByPattern = {};
+
+  constructor(protected ldnServicesService: LdnServicesService,
+              // protected formOperationsService: SectionFormOperationsService,
+              protected operationsBuilder: JsonPatchOperationsBuilder,
+              protected sectionService: SectionsService,
+              protected coarNotifyConfigDataService: CoarNotifyConfigDataService,
+              protected chd: ChangeDetectorRef,
+              @Inject('collectionIdProvider') public injectedCollectionId: string,
+              @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
+              @Inject('submissionIdProvider') public injectedSubmissionId: string) {
+    super(injectedCollectionId, injectedSectionData, injectedSubmissionId);
+  }
+
+  /**
+   * Initialize all instance variables
+   */
+  onSectionInit() {
+    this.setCoarNotifyConfig();
+    this.getSectionServerErrorsAndSetErrorsToDisplay();
+    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionData.id);
+  }
+
+  /**
+   * Method called when section is initialized
+   * Retriev available NotifyConfigs
+   */
+  setCoarNotifyConfig() {
+    this.subs.push(
+      this.coarNotifyConfigDataService.findAll().pipe(
+        getFirstCompletedRemoteData(),
+      ).subscribe((data) => {
+        if (data.hasSucceeded) {
+          this.patterns = data.payload.page[0].patterns;
+          this.initSelectedServicesByPattern();
+        }
+      }));
+  }
+
+  /**
+   * Handles the change event of a select element.
+   * @param pattern - The pattern of the select element.
+   * @param index - The index of the select element.
+   * @param selectedService - The selected LDN service.
+   */
+  onChange(pattern: string, index: number, selectedService: LdnService | null) {
+    // do nothing if the selected value is the same as the previous one
+    if (this.ldnServiceByPattern[pattern].services[index]?.id === selectedService?.id) {
+      return;
+    }
+
+    // initialize the previousServices object for the pattern if it does not exist
+    if (!this.previousServices[pattern]) {
+      this.previousServices[pattern] = {
+        services: [],
+        allowsMultipleRequests: this.patterns.find(ldnPattern => ldnPattern.pattern === pattern)?.multipleRequest,
+      };
+    }
+
+    // store the previous value
+    this.previousServices[pattern].services[index] = this.ldnServiceByPattern[pattern].services[index];
+    // set the new value
+    this.ldnServiceByPattern[pattern].services[index] = selectedService;
+
+    const hasPrevValueStored = hasValue(this.previousServices[pattern].services[index]) && this.previousServices[pattern].services[index].id !== selectedService?.id;
+    if (hasPrevValueStored) {
+      // when there is a previous value stored and it is different from the new one
+      this.operationsBuilder.flushOperation(this.pathCombiner.getPath([pattern, '-']));
+      if (this.filteredServicesByPattern[pattern]?.includes(this.previousServices[pattern].services[index])){
+        this.operationsBuilder.remove(this.pathCombiner.getPath([pattern, index.toString()]));
+      }
+    }
+
+    if (!hasPrevValueStored || (selectedService?.id && hasPrevValueStored)) {
+      // add the path when there is no previous value stored
+      this.operationsBuilder.add(this.pathCombiner.getPath([pattern, '-']), [selectedService.id], false, true);
+    }
+    // set the previous value to the new value
+    this.previousServices[pattern].services[index] = this.ldnServiceByPattern[pattern].services[index];
+    this.sectionService.dispatchRemoveSectionErrors(this.submissionId, this.sectionData.id);
+    this.chd.detectChanges();
+  }
+
+  /**
+   * Initializes the selected services by pattern.
+   * Loops through each pattern and filters the services based on the pattern.
+   * If the section data has a value for the pattern, it adds the service to the selected services by pattern.
+   * If the section data does not have a value for the pattern, it adds a null service to the selected services by pattern,
+   * so that the select element is initialized with a null value and to display the default select input.
+   */
+  initSelectedServicesByPattern(): void {
+    this.patterns.forEach((ldnPattern) => {
+      if (hasValue(this.sectionData.data[ldnPattern.pattern])) {
+        this.subs.push(
+          this.filterServices(ldnPattern.pattern)
+            .subscribe((services: LdnService[]) => {
+
+              if (!this.ldnServiceByPattern[ldnPattern.pattern]) {
+                this.ldnServiceByPattern[ldnPattern.pattern] = {
+                  services: [],
+                  allowsMultipleRequests: ldnPattern.multipleRequest,
+                };
+              }
+
+              this.ldnServiceByPattern[ldnPattern.pattern].services = services.filter((service) => {
+                const selection = (this.sectionData.data[ldnPattern.pattern] as LdnService[]).find((s: LdnService) => s.id === service.id);
+                this.addService(ldnPattern, selection);
+                return this.sectionData.data[ldnPattern.pattern].includes(service.uuid);
+              });
+            }),
+        );
+      } else {
+        this.ldnServiceByPattern[ldnPattern.pattern] = {
+          services: [],
+          allowsMultipleRequests: ldnPattern.multipleRequest,
+        };
+        this.addService(ldnPattern, null);
+      }
+    });
+  }
+
+  /**
+   * Adds a new service to the selected services for the given pattern.
+   * @param ldnPattern - The pattern to add the new service to.
+   * @param newService - The new service to add.
+   */
+  addService(ldnPattern: LdnPattern, newService: LdnService) {
+    // Your logic to add a new service to the selected services for the pattern
+    // Example: Push the newService to the array corresponding to the pattern
+    if (!this.ldnServiceByPattern[ldnPattern.pattern]) {
+      this.ldnServiceByPattern[ldnPattern.pattern] = {
+        services: [],
+        allowsMultipleRequests: ldnPattern.multipleRequest,
+      };
+    }
+    this.ldnServiceByPattern[ldnPattern.pattern].services.push(newService);
+  }
+
+  /**
+   * Removes the service at the specified index from the array corresponding to the pattern.
+   * @param ldnPattern - The LDN pattern from which to remove the service
+   * @param serviceIndex - the service index to remove
+   */
+  removeService(ldnPattern: LdnPattern, serviceIndex: number) {
+    if (this.ldnServiceByPattern[ldnPattern.pattern]) {
+      // Remove the service at the specified index from the array
+      this.ldnServiceByPattern[ldnPattern.pattern].services.splice(serviceIndex, 1);
+      this.previousServices[ldnPattern.pattern]?.services.splice(serviceIndex, 1);
+      this.operationsBuilder.flushOperation(this.pathCombiner.getPath([ldnPattern.pattern, '-']));
+      this.sectionService.dispatchRemoveSectionErrors(this.submissionId, this.sectionData.id);
+    }
+    if (!this.ldnServiceByPattern[ldnPattern.pattern].services.length) {
+      this.addNewService(ldnPattern);
+    }
+  }
+
+  /**
+   * Method called when dropdowns for the section are initialized
+   * Retrieve services with corresponding patterns to the dropdowns.
+   */
+  filterServices(pattern: string): Observable<LdnService[]> {
+    return this.ldnServicesService.findByInboundPattern(pattern).pipe(
+      getFirstCompletedRemoteData(),
+      tap((rd) => {
+        if (rd.hasFailed) {
+          throw new Error(`Failed to retrieve services for pattern ${pattern}`);
+        }
+      }),
+      filter((rd) => rd.hasSucceeded),
+      getRemoteDataPayload(),
+      getPaginatedListPayload(),
+      tap(res => {
+        if (!this.filteredServicesByPattern[pattern]){
+          this.filteredServicesByPattern[pattern] = [];
+        }
+        if (this.filteredServicesByPattern[pattern].length === 0) {
+          this.filteredServicesByPattern[pattern].push(...res);
+        }
+      }),
+      map((res: LdnService[]) => res.filter((service) => {
+        if (!this.hasSectionData){
+          this.hasSectionData = this.hasInboundPattern(service, pattern);
+        }
+        return this.hasInboundPattern(service, pattern);
+      })),
+    );
+  }
+
+  /**
+   * Checks if the given service has the specified inbound pattern type.
+   * @param service - The service to check.
+   * @param patternType - The inbound pattern type to look for.
+   * @returns True if the service has the specified inbound pattern type, false otherwise.
+   */
+  hasInboundPattern(service: any, patternType: string): boolean {
+    return service.notifyServiceInboundPatterns.some((pattern: { pattern: string }) => {
+      return pattern.pattern === patternType;
+    });
+  }
+
+  /**
+   * Retrieves server errors for the current section and sets them to display.
+   * @returns An Observable that emits the validation errors for the current section.
+   */
+  private getSectionServerErrorsAndSetErrorsToDisplay() {
+    this.subs.push(
+      this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
+        take(1),
+        filter((validationErrors) => isNotEmpty(validationErrors)),
+      ).subscribe((validationErrors: SubmissionSectionError[]) => {
+        if (isNotEmpty(validationErrors)) {
+          validationErrors.forEach((error) => {
+            this.sectionService.setSectionError(this.submissionId, this.sectionData.id, error);
+          });
+        }
+      }));
+  }
+
+  /**
+   * Returns an observable of the errors for the current section that match the given pattern and index.
+   * @param pattern - The pattern to match against the error paths.
+   * @param index - The index to match against the error paths.
+   * @returns An observable of the errors for the current section that match the given pattern and index.
+   */
+  public getShownSectionErrors$(pattern: string, index: number): Observable<SubmissionSectionError[]> {
+    return this.sectionService.getShownSectionErrors(this.submissionId, this.sectionData.id, this.sectionData.sectionType)
+      .pipe(
+        take(1),
+        filter((validationErrors) => isNotEmpty(validationErrors)),
+        map((validationErrors: SubmissionSectionError[]) => {
+          return validationErrors.filter((error) => {
+            const path = `${pattern}/${index}`;
+            return error.path.includes(path);
+          });
+        }),
+      );
+  }
+
+  /**
+   * @returns An observable that emits a boolean indicating whether the section has any server errors or not.
+   */
+  protected getSectionStatus(): Observable<boolean> {
+    return this.sectionService.getSectionServerErrors(this.submissionId, this.sectionData.id).pipe(
+      map((validationErrors) => isEmpty(validationErrors),
+      ));
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  onSectionDestroy() {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
+
+  /**
+   * Add new row to dropdown for multiple service selection
+   * @param ldnPattern - the related LDN pattern where the service is added
+   */
+  addNewService(ldnPattern: LdnPattern): void {
+    //idle new service for new selection
+    this.ldnServiceByPattern[ldnPattern.pattern].services.push(null);
+  }
+}
diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts
new file mode 100644
index 0000000000..3ca16a7f24
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/submission-coar-notify-workspaceitem.model.ts
@@ -0,0 +1,39 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { COAR_NOTIFY_WORKSPACEITEM } from './section-coar-notify-service.resource-type';
+
+/** An CoarNotify  and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class SubmissionCoarNotifyWorkspaceitemModel extends CacheableObject {
+  static type = COAR_NOTIFY_WORKSPACEITEM;
+
+  @excludeFromEquals
+  @autoserialize
+    endorsement?: number[];
+
+  @deserializeAs('id')
+    review?: number[];
+
+  @autoserialize
+    ingest?: number[];
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts b/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts
new file mode 100644
index 0000000000..59a9125fed
--- /dev/null
+++ b/src/app/submission/sections/section-coar-notify/submission-coar-notify.config.ts
@@ -0,0 +1,47 @@
+import {
+  autoserialize,
+  deserialize,
+  deserializeAs,
+  inheritSerialization,
+} from 'cerialize';
+
+import { typedObject } from '../../../core/cache/builders/build-decorators';
+import { CacheableObject } from '../../../core/cache/cacheable-object.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { excludeFromEquals } from '../../../core/utilities/equals.decorators';
+import { SUBMISSION_COAR_NOTIFY_CONFIG } from './section-coar-notify-service.resource-type';
+
+export  interface LdnPattern {
+  pattern: string,
+  multipleRequest: boolean
+}
+/** A SubmissionCoarNotifyConfig and its properties. */
+@typedObject
+@inheritSerialization(CacheableObject)
+export class SubmissionCoarNotifyConfig extends CacheableObject {
+  static type = SUBMISSION_COAR_NOTIFY_CONFIG;
+
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  @autoserialize
+    id: string;
+
+  @deserializeAs('id')
+    uuid: string;
+
+  @autoserialize
+    patterns: LdnPattern[];
+
+  @deserialize
+    _links: {
+    self: {
+      href: string;
+    };
+  };
+
+  get self(): string {
+    return this._links.self.href;
+  }
+}
diff --git a/src/app/submission/sections/sections-type.ts b/src/app/submission/sections/sections-type.ts
index 6b6f839b7c..50d15427d2 100644
--- a/src/app/submission/sections/sections-type.ts
+++ b/src/app/submission/sections/sections-type.ts
@@ -7,4 +7,8 @@ export enum SectionsType {
   collection = 'collection',
   AccessesCondition = 'accessCondition',
   SherpaPolicies = 'sherpaPolicy',
+  Identifiers = 'identifiers',
+  Collection = 'collection',
+  CoarNotify = 'coarnotify',
+  Duplicates = 'duplicates'
 }
diff --git a/src/app/submission/sections/sections.directive.ts b/src/app/submission/sections/sections.directive.ts
index d82cff82d6..9d32699770 100644
--- a/src/app/submission/sections/sections.directive.ts
+++ b/src/app/submission/sections/sections.directive.ts
@@ -1,22 +1,34 @@
-import { ChangeDetectorRef, Directive, Input, OnDestroy, OnInit } from '@angular/core';
-
-import { Observable, Subscription } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Directive,
+  Input,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import uniq from 'lodash/uniq';
+import {
+  Observable,
+  Subscription,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { uniq } from 'lodash';
 
-import { SectionsService } from './sections.service';
-import { hasValue, isNotEmpty, isNotNull } from '../../shared/empty.util';
-import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { SubmissionService } from '../submission.service';
-import { SectionsType } from './sections-type';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../shared/empty.util';
 import { SubmissionSectionError } from '../objects/submission-section-error.model';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
+import { SectionsService } from './sections.service';
+import { SectionsType } from './sections-type';
 
 /**
  * Directive for handling generic section functionality
  */
 @Directive({
   selector: '[dsSection]',
-  exportAs: 'sectionRef'
+  exportAs: 'sectionRef',
 })
 export class SectionsDirective implements OnDestroy, OnInit {
 
@@ -140,7 +152,7 @@ export class SectionsDirective implements OnDestroy, OnInit {
               this.submissionService.dispatchSave(this.submissionId);
             }
           }
-        })
+        }),
     );
 
     this.enabled = this.sectionService.isSectionEnabled(this.submissionId, this.sectionId);
diff --git a/src/app/submission/sections/sections.service.spec.ts b/src/app/submission/sections/sections.service.spec.ts
index 5aa47d1447..d8644a0db8 100644
--- a/src/app/submission/sections/sections.service.spec.ts
+++ b/src/app/submission/sections/sections.service.spec.ts
@@ -1,42 +1,54 @@
-import { TestBed, waitForAsync } from '@angular/core/testing';
-
-import { cold, getTestScheduler } from 'jasmine-marbles';
-import { of as observableOf } from 'rxjs';
-import { Store, StoreModule } from '@ngrx/store';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+} from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
 
-import { submissionReducers } from '../submission.reducers';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { SubmissionService } from '../submission.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { SectionsService } from './sections.service';
+import { storeModuleConfig } from '../../app.reducer';
+import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import { FormClearErrorsAction } from '../../shared/form/form.actions';
+import { FormService } from '../../shared/form/form.service';
+import { getMockFormService } from '../../shared/mocks/form-service.mock';
+import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
 import {
   mockSectionsData,
   mockSectionsErrors,
   mockSubmissionState,
-  mockSubmissionStateWithoutUpload
+  mockSubmissionStateWithoutUpload,
 } from '../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
 import {
   DisableSectionAction,
   EnableSectionAction,
   InertSectionErrorsAction,
   RemoveSectionErrorsAction,
   SectionStatusChangeAction,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from '../objects/submission-objects.actions';
-import { FormClearErrorsAction } from '../../shared/form/form.actions';
-import parseSectionErrors from '../utils/parseSectionErrors';
-import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
-import { getMockScrollToService } from '../../shared/mocks/scroll-to-service.mock';
-import { storeModuleConfig } from '../../app.reducer';
-import { SectionsType } from './sections-type';
-import { FormService } from '../../shared/form/form.service';
-import { getMockFormService } from '../../shared/mocks/form-service.mock';
 import { SubmissionSectionError } from '../objects/submission-section-error.model';
+import { submissionReducers } from '../submission.reducers';
+import { SubmissionService } from '../submission.service';
+import parseSectionErrors from '../utils/parseSectionErrors';
+import { SectionsService } from './sections.service';
+import { SectionsType } from './sections-type';
 
 describe('SectionsService test suite', () => {
   let notificationsServiceStub: NotificationsServiceStub;
@@ -56,7 +68,7 @@ describe('SectionsService test suite', () => {
 
   const store: any = jasmine.createSpyObj('store', {
     dispatch: jasmine.createSpy('dispatch'),
-    select: jasmine.createSpy('select')
+    select: jasmine.createSpy('select'),
   });
 
   const formService: any = getMockFormService();
@@ -68,9 +80,9 @@ describe('SectionsService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: NotificationsService, useClass: NotificationsServiceStub },
@@ -79,8 +91,8 @@ describe('SectionsService test suite', () => {
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Store, useValue: store },
         { provide: FormService, useValue: formService },
-        SectionsService
-      ]
+        SectionsService,
+      ],
     }).compileComponents();
   }));
 
@@ -161,7 +173,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(sectionData[sectionId]));
 
       const expected = cold('(b|)', {
-        b: sectionData[sectionId]
+        b: sectionData[sectionId],
       });
 
       expect(service.getSectionData(submissionId, sectionId, SectionsType.SubmissionForm)).toBeObservable(expected);
@@ -173,7 +185,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(sectionErrors[sectionId]));
 
       const expected = cold('(b|)', {
-        b: sectionErrors[sectionId]
+        b: sectionErrors[sectionId],
       });
 
       expect(service.getSectionErrors(submissionId, sectionId)).toBeObservable(expected);
@@ -185,7 +197,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(sectionState));
 
       const expected = cold('(b|)', {
-        b: sectionState
+        b: sectionState,
       });
 
       expect(service.getSectionState(submissionId, sectionId, SectionsType.SubmissionForm)).toBeObservable(expected);
@@ -197,7 +209,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ isValid: false }));
 
       let expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionValid(submissionId, sectionId)).toBeObservable(expected);
@@ -205,7 +217,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ isValid: true }));
 
       expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionValid(submissionId, sectionId)).toBeObservable(expected);
@@ -217,7 +229,7 @@ describe('SectionsService test suite', () => {
       submissionServiceStub.getActiveSectionId.and.returnValue(observableOf(sectionId));
 
       let expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionActive(submissionId, sectionId)).toBeObservable(expected);
@@ -225,7 +237,7 @@ describe('SectionsService test suite', () => {
       submissionServiceStub.getActiveSectionId.and.returnValue(observableOf('test'));
 
       expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionActive(submissionId, sectionId)).toBeObservable(expected);
@@ -237,7 +249,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ enabled: false }));
 
       let expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionEnabled(submissionId, sectionId)).toBeObservable(expected);
@@ -245,7 +257,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({ enabled: true }));
 
       expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionEnabled(submissionId, sectionId)).toBeObservable(expected);
@@ -257,12 +269,12 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({
         visibility: {
           main: null,
-          other: 'READONLY'
-        }
+          other: 'READONLY',
+        },
       }));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
@@ -272,12 +284,12 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf({
         visibility: {
           main: null,
-          other: 'READONLY'
-        }
+          other: 'READONLY',
+        },
       }));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkspaceItem)).toBeObservable(expected);
@@ -285,11 +297,11 @@ describe('SectionsService test suite', () => {
 
     it('should return an observable of false when it\'s not a readonly section', () => {
       store.select.and.returnValue(observableOf({
-        visibility: null
+        visibility: null,
       }));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionReadOnly(submissionId, sectionId, SubmissionScopeType.WorkflowItem)).toBeObservable(expected);
@@ -301,7 +313,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionAvailable(submissionId, sectionId)).toBeObservable(expected);
@@ -311,7 +323,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionAvailable(submissionId, 'test')).toBeObservable(expected);
@@ -323,7 +335,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionTypeAvailable(submissionId, SectionsType.Upload)).toBeObservable(expected);
@@ -333,7 +345,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionStateWithoutUpload));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionAvailable(submissionId, SectionsType.Upload)).toBeObservable(expected);
@@ -345,7 +357,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSectionType(submissionId, 'upload', SectionsType.Upload)).toBeObservable(expected);
@@ -355,7 +367,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionType(submissionId, sectionId, SectionsType.Upload)).toBeObservable(expected);
@@ -365,7 +377,7 @@ describe('SectionsService test suite', () => {
       store.select.and.returnValue(observableOf(submissionState));
 
       const expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSectionType(submissionId, 'no-such-id', SectionsType.Upload)).toBeObservable(expected);
@@ -396,7 +408,7 @@ describe('SectionsService test suite', () => {
 
       const error: SubmissionSectionError = {
         path: 'test',
-        message: 'message test'
+        message: 'message test',
       };
       service.setSectionError(submissionId, sectionId, error);
 
@@ -446,10 +458,10 @@ describe('SectionsService test suite', () => {
         rows: [{
           fields: [{
             selectableMetadata: [{
-              metadata: 'dc.contributor.author'
-            }]
-          }]
-        }]
+              metadata: 'dc.contributor.author',
+            }],
+          }],
+        }],
       };
 
       const expectedConfiguredMetadata =  [ 'dc.contributor.author' ];
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index 56b2356ed7..58a4e90fbc 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -1,14 +1,41 @@
 import { Injectable } from '@angular/core';
-
-import { combineLatest, Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, take } from 'rxjs/operators';
+import { parseReviver } from '@ng-dynamic-forms/core';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { ScrollToConfigOptions, ScrollToService } from '@nicky-lenaers/ngx-scroll-to';
-import { findIndex, findKey, isEqual } from 'lodash';
+import {
+  ScrollToConfigOptions,
+  ScrollToService,
+} from '@nicky-lenaers/ngx-scroll-to';
+import findIndex from 'lodash/findIndex';
+import findKey from 'lodash/findKey';
+import isEqual from 'lodash/isEqual';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
 
-import { SubmissionState } from '../submission.reducers';
-import { hasValue, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
+import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
+import { JsonPatchOperationPathCombiner } from '../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
+import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service';
+import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmpty,
+  isNotUndefined,
+} from '../../shared/empty.util';
+import { FormClearErrorsAction } from '../../shared/form/form.actions';
+import { FormError } from '../../shared/form/form.reducer';
+import { FormService } from '../../shared/form/form.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import {
   DisableSectionAction,
   EnableSectionAction,
@@ -16,33 +43,22 @@ import {
   RemoveSectionErrorsAction,
   SectionStatusChangeAction,
   SetSectionFormId,
-  UpdateSectionDataAction
+  UpdateSectionDataAction,
 } from '../objects/submission-objects.actions';
-import {
-  SubmissionObjectEntry
-} from '../objects/submission-objects.reducer';
+import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
+import { SubmissionSectionError } from '../objects/submission-section-error.model';
+import { SubmissionSectionObject } from '../objects/submission-section-object.model';
 import {
   submissionObjectFromIdSelector,
   submissionSectionDataFromIdSelector,
   submissionSectionErrorsFromIdSelector,
   submissionSectionFromIdSelector,
-  submissionSectionServerErrorsFromIdSelector
+  submissionSectionServerErrorsFromIdSelector,
 } from '../selectors';
-import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
-import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
-import { FormClearErrorsAction } from '../../shared/form/form.actions';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SubmissionState } from '../submission.reducers';
 import { SubmissionService } from '../submission.service';
-import { WorkspaceitemSectionDataType } from '../../core/submission/models/workspaceitem-sections.model';
+import parseSectionErrorPaths, { SectionErrorPath } from '../utils/parseSectionErrorPaths';
 import { SectionsType } from './sections-type';
-import { normalizeSectionData } from '../../core/submission/submission-response-parsing.service';
-import { SubmissionFormsModel } from '../../core/config/models/config-submission-forms.model';
-import { parseReviver } from '@ng-dynamic-forms/core';
-import { FormService } from '../../shared/form/form.service';
-import { JsonPatchOperationPathCombiner } from '../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { FormError } from '../../shared/form/form.reducer';
-import { SubmissionSectionObject } from '../objects/submission-section-object.model';
-import { SubmissionSectionError } from '../objects/submission-section-error.model';
 
 /**
  * A service that provides methods used in submission process.
@@ -195,12 +211,12 @@ export class SectionsService {
             const sectionErrors = formErrors
               .map((error) => ({
                 path: pathCombiner.getPath(error.fieldId.replace(/\_/g, '.')).path,
-                message: error.message
+                message: error.message,
               } as SubmissionSectionError))
               .filter((sectionError: SubmissionSectionError) => findIndex(state.errorsToShow, { path: sectionError.path }) === -1);
             return [...state.errorsToShow, ...sectionErrors];
-          })
-        ))
+          }),
+        )),
       );
     }
 
@@ -255,13 +271,13 @@ export class SectionsService {
       map((sectionState: SubmissionSectionObject) => {
         if (hasValue(sectionState.data) && sectionType === SectionsType.SubmissionForm) {
           return Object.assign({}, sectionState, {
-            data: normalizeSectionData(sectionState.data)
+            data: normalizeSectionData(sectionState.data),
           });
         } else {
           return sectionState;
         }
       }),
-      distinctUntilChanged()
+      distinctUntilChanged(),
     );
   }
 
@@ -332,8 +348,9 @@ export class SectionsService {
       filter((sectionObj) => hasValue(sectionObj)),
       map((sectionObj: SubmissionSectionObject) => {
         return isNotEmpty(sectionObj.visibility)
-          && sectionObj.visibility.other === 'READONLY'
-          && submissionScope !== SubmissionScopeType.WorkspaceItem;
+          && ((sectionObj.visibility.other === 'READONLY' && submissionScope !== SubmissionScopeType.WorkspaceItem)
+              || (sectionObj.visibility.main === 'READONLY' && submissionScope === SubmissionScopeType.WorkspaceItem)
+          );
       }),
       distinctUntilChanged());
   }
@@ -404,7 +421,7 @@ export class SectionsService {
     this.store.dispatch(new EnableSectionAction(submissionId, sectionId));
     const config: ScrollToConfigOptions = {
       target: sectionId,
-      offset: -70
+      offset: -70,
     };
 
     this.scrollToService.scrollTo(config);
@@ -446,7 +463,7 @@ export class SectionsService {
     data: WorkspaceitemSectionDataType,
     errorsToShow: SubmissionSectionError[] = [],
     serverValidationErrors: SubmissionSectionError[] = [],
-    metadata?: string[]
+    metadata?: string[],
   ) {
     if (isNotEmpty(data)) {
       const isAvailable$ = this.isSectionAvailable(submissionId, sectionId);
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
index b65cb5e00f..45822c5898 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.spec.ts
@@ -1,13 +1,18 @@
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ContentAccordionComponent } from './content-accordion.component';
-
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { ContentAccordionComponent } from './content-accordion.component';
 
 describe('ContentAccordionComponent', () => {
   let component: ContentAccordionComponent;
@@ -20,12 +25,12 @@ describe('ContentAccordionComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
-        NgbCollapseModule
+        NgbCollapseModule,
       ],
-      declarations: [ContentAccordionComponent]
+      declarations: [ContentAccordionComponent],
     })
       .compileComponents();
   });
diff --git a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
index 0e7bc863ad..05fdad693e 100644
--- a/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
+++ b/src/app/submission/sections/sherpa-policies/content-accordion/content-accordion.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { PermittedVersions } from '../../../../core/submission/models/sherpa-policies-details.model';
 
@@ -8,7 +11,7 @@ import { PermittedVersions } from '../../../../core/submission/models/sherpa-pol
 @Component({
   selector: 'ds-content-accordion',
   templateUrl: './content-accordion.component.html',
-  styleUrls: ['./content-accordion.component.scss']
+  styleUrls: ['./content-accordion.component.scss'],
 })
 export class ContentAccordionComponent {
   /**
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
index 9a60a6d010..3255e7d5de 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.spec.ts
@@ -1,12 +1,17 @@
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { MetadataInformationComponent } from './metadata-information.component';
-
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { MetadataInformationComponent } from './metadata-information.component';
 
 describe('MetadataInformationComponent', () => {
   let component: MetadataInformationComponent;
@@ -19,11 +24,11 @@ describe('MetadataInformationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
-      declarations: [MetadataInformationComponent]
+      declarations: [MetadataInformationComponent],
     })
       .compileComponents();
   });
diff --git a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
index 307c18d8cc..f96479c70c 100644
--- a/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/metadata-information/metadata-information.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Metadata } from '../../../../core/submission/models/sherpa-policies-details.model';
 
@@ -8,7 +11,7 @@ import { Metadata } from '../../../../core/submission/models/sherpa-policies-det
 @Component({
   selector: 'ds-metadata-information',
   templateUrl: './metadata-information.component.html',
-  styleUrls: ['./metadata-information.component.scss']
+  styleUrls: ['./metadata-information.component.scss'],
 })
 export class MetadataInformationComponent {
   /**
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
index 3c35da8f08..534b95397e 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.html
@@ -23,7 +23,7 @@
         </div>
         <div class="col-4">
             <p class="m-1">
-                <a href="{{journal.url}}" target="_blank">
+                <a href="{{journal.url}}" target="_blank" rel="noopener noreferrer">
                     {{journal.url}}
                 </a>
             </p>
@@ -35,7 +35,7 @@
         </div>
         <div class="col-4" *ngFor="let publisher of journal.publishers">
             <p class="m-1">
-                <a href="{{publisher.uri}}" target="_blank">
+                <a href="{{publisher.uri}}" target="_blank" rel="noopener noreferrer">
                     {{publisher.name}}
                 </a>
             </p>
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
index c5dc896858..0815fedf50 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.spec.ts
@@ -1,11 +1,17 @@
-import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { PublicationInformationComponent } from './publication-information.component';
 import { DebugElement } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { PublicationInformationComponent } from './publication-information.component';
 
 describe('PublicationInformationComponent', () => {
   let component: PublicationInformationComponent;
@@ -19,11 +25,11 @@ describe('PublicationInformationComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
-      declarations: [PublicationInformationComponent]
+      declarations: [PublicationInformationComponent],
     })
       .compileComponents();
   });
diff --git a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
index cfe42adf7b..bb62e57564 100644
--- a/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
+++ b/src/app/submission/sections/sherpa-policies/publication-information/publication-information.component.ts
@@ -1,4 +1,7 @@
-import { Component, Input } from '@angular/core';
+import {
+  Component,
+  Input,
+} from '@angular/core';
 
 import { Journal } from '../../../../core/submission/models/sherpa-policies-details.model';
 
@@ -8,7 +11,7 @@ import { Journal } from '../../../../core/submission/models/sherpa-policies-deta
 @Component({
   selector: 'ds-publication-information',
   templateUrl: './publication-information.component.html',
-  styleUrls: ['./publication-information.component.scss']
+  styleUrls: ['./publication-information.component.scss'],
 })
 export class PublicationInformationComponent {
   /**
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
index 87370cf7e3..96e42202b3 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.html
@@ -8,7 +8,7 @@
             </p>
             <ul>
                 <li *ngFor="let url of policy.urls | keyvalue">
-                    <a href="{{url.key}}" target="_blank">{{url.value}}</a>
+                    <a href="{{url.key}}" target="_blank" rel="noopener noreferrer">{{url.value}}</a>
                 </li>
             </ul>
         </div>
diff --git a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
index 3e2c33481a..0780370d89 100644
--- a/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/publisher-policy/publisher-policy.component.spec.ts
@@ -1,11 +1,17 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-import { PublisherPolicyComponent } from './publisher-policy.component';
-import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 
 import { SherpaDataResponse } from '../../../../shared/mocks/section-sherpa-policies.service.mock';
 import { TranslateLoaderMock } from '../../../../shared/mocks/translate-loader.mock';
+import { PublisherPolicyComponent } from './publisher-policy.component';
 
 describe('PublisherPolicyComponent', () => {
   let component: PublisherPolicyComponent;
@@ -18,8 +24,8 @@ describe('PublisherPolicyComponent', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
+            useClass: TranslateLoaderMock,
+          },
         }),
       ],
       declarations: [PublisherPolicyComponent],
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..58ca300865 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,10 @@
-import { Component, Input } from '@angular/core';
+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.
@@ -9,7 +12,7 @@ import { AlertType } from '../../../../shared/alert/aletr-type';
 @Component({
   selector: 'ds-publisher-policy',
   templateUrl: './publisher-policy.component.html',
-  styleUrls: ['./publisher-policy.component.scss']
+  styleUrls: ['./publisher-policy.component.scss'],
 })
 export class PublisherPolicyComponent {
 
diff --git a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
index 76a980ed3c..11c0fdb97f 100644
--- a/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
+++ b/src/app/submission/sections/sherpa-policies/section-sherpa-policies.component.spec.ts
@@ -1,23 +1,32 @@
-import { SharedModule } from '../../../shared/shared.module';
-import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock';
-import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
-
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
-import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { BrowserModule, By } from '@angular/platform-browser';
-
-import { Store } from '@ngrx/store';
-import { AppState } from '../../../app.reducer';
-import { SubmissionSectionSherpaPoliciesComponent } from './section-sherpa-policies.component';
-import { SubmissionService } from '../../submission.service';
 import { DebugElement } from '@angular/core';
-import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
-import { of as observableOf } from 'rxjs';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { NgbCollapseModule } from '@ng-bootstrap/ng-bootstrap';
+import { Store } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AppState } from '../../../app.reducer';
+import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { SherpaDataResponse } from '../../../shared/mocks/section-sherpa-policies.service.mock';
+import { TranslateLoaderMock } from '../../../shared/mocks/translate-loader.mock';
+import { SharedModule } from '../../../shared/shared.module';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { SubmissionService } from '../../submission.service';
+import { SectionsService } from '../sections.service';
+import { SubmissionSectionSherpaPoliciesComponent } from './section-sherpa-policies.component';
 
 describe('SubmissionSectionSherpaPoliciesComponent', () => {
   let component: SubmissionSectionSherpaPoliciesComponent;
@@ -45,7 +54,7 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
     errorsToShow: [],
     serverValidationErrors: [],
     isLoading: false,
-    isValid: true
+    isValid: true,
   };
 
   describe('SubmissionSectionSherpaPoliciesComponent', () => {
@@ -58,11 +67,11 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
           TranslateModule.forRoot({
             loader: {
               provide: TranslateLoader,
-              useClass: TranslateLoaderMock
-            }
+              useClass: TranslateLoaderMock,
+            },
           }),
           NgbCollapseModule,
-          SharedModule
+          SharedModule,
         ],
         declarations: [SubmissionSectionSherpaPoliciesComponent],
         providers: [
@@ -72,7 +81,7 @@ describe('SubmissionSectionSherpaPoliciesComponent', () => {
           { provide: Store, useValue: storeStub },
           { provide: 'sectionDataProvider', useValue: sectionData },
           { provide: 'submissionIdProvider', useValue: '1508' },
-        ]
+        ],
       })
         .compileComponents();
     });
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..1f37c887bf 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,20 +1,28 @@
-import { AlertType } from '../../../shared/alert/aletr-type';
-import { Component, Inject } from '@angular/core';
-
-import { BehaviorSubject, Observable, of, Subscription } from 'rxjs';
+import {
+  Component,
+  Inject,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  Observable,
+  of,
+  Subscription,
+} from 'rxjs';
 
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { JsonPatchOperationsBuilder } from '../../../core/json-patch/builder/json-patch-operations-builder';
+import { WorkspaceitemSectionSherpaPoliciesObject } from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
+import { AlertType } from '../../../shared/alert/alert-type';
 import {
-  WorkspaceitemSectionSherpaPoliciesObject
-} from '../../../core/submission/models/workspaceitem-section-sherpa-policies.model';
-import { renderSectionFor } from '../sections-decorator';
-import { SectionsType } from '../sections-type';
+  hasValue,
+  isEmpty,
+} from '../../../shared/empty.util';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
 import { SectionDataObject } from '../models/section-data.model';
 import { SectionsService } from '../sections.service';
-import { SectionModelComponent } from '../models/section.model';
-import { SubmissionService } from '../../submission.service';
-import { hasValue, isEmpty } from '../../../shared/empty.util';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
 
 /**
  * This component represents a section for the sherpa policy informations structure.
@@ -22,7 +30,7 @@ import { hasValue, isEmpty } from '../../../shared/empty.util';
 @Component({
   selector: 'ds-section-sherpa-policies',
   templateUrl: './section-sherpa-policies.component.html',
-  styleUrls: ['./section-sherpa-policies.component.scss']
+  styleUrls: ['./section-sherpa-policies.component.scss'],
 })
 @renderSectionFor(SectionsType.SherpaPolicies)
 export class SubmissionSectionSherpaPoliciesComponent extends SectionModelComponent {
@@ -95,7 +103,7 @@ export class SubmissionSectionSherpaPoliciesComponent extends SectionModelCompon
       this.sectionService.getSectionData(this.submissionId, this.sectionData.id, this.sectionData.sectionType)
         .subscribe((sherpaPolicies: WorkspaceitemSectionSherpaPoliciesObject) => {
           this.sherpaPoliciesData$.next(sherpaPolicies);
-        })
+        }),
     );
   }
 
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
index 7c5a979eed..f217abf88e 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.html
@@ -1,8 +1,8 @@
 <ng-container *ngFor="let accessCondition of accessConditionsList">
-  <span *ngIf="accessCondition.action == 'DEFAULT_BITSTREAM_READ'" class="badge badge-primary mt-3 mr-2">
+  <span *ngIf="accessCondition.action === 'DEFAULT_BITSTREAM_READ'" class="badge badge-primary mt-3 mr-2">
     {{accessCondition.name}} {{accessCondition.startDate}} {{accessCondition.endDate}}
   </span>
-  <span *ngIf="accessCondition.name == 'lease'" class="badge badge-primary mt-3 mr-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
-  <span *ngIf="accessCondition.name == 'embargo'" class="badge badge-dark mt-3 mr-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
+  <span *ngIf="accessCondition.name === 'lease'" class="badge badge-primary mt-3 mr-2">{{accessCondition.name}} from {{accessCondition.endDate}}</span>
+  <span *ngIf="accessCondition.name === 'embargo'" class="badge badge-dark mt-3 mr-2">{{accessCondition.name}} until {{accessCondition.startDate}}</span>
   <br>
 </ng-container>
diff --git a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
index 22654e5688..de614b45e3 100644
--- a/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
+++ b/src/app/submission/sections/upload/accessConditions/submission-section-upload-access-conditions.component.ts
@@ -1,12 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
-
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 import { find } from 'rxjs/operators';
 
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { RemoteData } from '../../../../core/data/remote-data';
 import { GroupDataService } from '../../../../core/eperson/group-data.service';
+import { Group } from '../../../../core/eperson/models/group.model';
 import { ResourcePolicy } from '../../../../core/resource-policy/models/resource-policy.model';
 import { isEmpty } from '../../../../shared/empty.util';
-import { Group } from '../../../../core/eperson/models/group.model';
-import { RemoteData } from '../../../../core/data/remote-data';
 
 /**
  * This component represents a badge that describe an access condition
@@ -27,14 +31,13 @@ export class SubmissionSectionUploadAccessConditionsComponent implements OnInit
    * The list of access conditions
    * @type {Array}
    */
-  public accessConditionsList = [];
+  public accessConditionsList: ResourcePolicy[] = [];
 
-  /**
-   * Initialize instance variables
-   *
-   * @param {GroupDataService} groupService
-   */
-  constructor(private groupService: GroupDataService) {}
+  constructor(
+    public dsoNameService: DSONameService,
+    protected groupService: GroupDataService,
+  ) {
+  }
 
   /**
    * Retrieve access conditions list
@@ -47,7 +50,7 @@ export class SubmissionSectionUploadAccessConditionsComponent implements OnInit
           .subscribe((rd: RemoteData<Group>) => {
             const group: Group = rd.payload;
             const accessConditionEntry = Object.assign({}, accessCondition);
-            accessConditionEntry.name = group.name;
+            accessConditionEntry.name = this.dsoNameService.getName(group);
             this.accessConditionsList.push(accessConditionEntry);
           });
       } else {
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..0cb79e51cb 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
@@ -6,7 +6,6 @@
     </button>
   </div>
   <div class="modal-body">
-
     <ds-form *ngIf="formModel"
              #formRef="formComponent"
              [formId]="formId"
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..4e4f487fbf 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
@@ -1,20 +1,46 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, fakeAsync, inject, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-import { TranslateModule } from '@ngx-translate/core';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  inject,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  NgbActiveModal,
+  NgbModal,
+} from '@ng-bootstrap/ng-bootstrap';
 import {
   DynamicFormArrayModel,
   DynamicFormControlEvent,
   DynamicFormGroupModel,
-  DynamicSelectModel
+  DynamicSelectModel,
 } from '@ng-dynamic-forms/core';
+import { TranslateModule } from '@ngx-translate/core';
+import { of } from 'rxjs';
 
+import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
+import { dateToISOFormat } from '../../../../../shared/date.util';
+import { DynamicCustomSwitchModel } from '../../../../../shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
-import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service.stub';
-import { SubmissionService } from '../../../../submission.service';
-import { SubmissionSectionUploadFileEditComponent } from './section-upload-file-edit.component';
-import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
+import { FormFieldMetadataValueObject } from '../../../../../shared/form/builder/models/form-field-metadata-value.model';
+import { FormComponent } from '../../../../../shared/form/form.component';
+import { FormService } from '../../../../../shared/form/form.service';
+import { getMockFormService } from '../../../../../shared/mocks/form-service.mock';
+import { getMockSectionUploadService } from '../../../../../shared/mocks/section-upload.service.mock';
 import {
   mockFileFormData,
   mockSubmissionCollectionId,
@@ -24,29 +50,13 @@ import {
   mockUploadConfigResponseMetadata,
   mockUploadFiles,
 } from '../../../../../shared/mocks/submission.mock';
-import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { FormComponent } from '../../../../../shared/form/form.component';
-import { FormService } from '../../../../../shared/form/form.service';
-import { getMockFormService } from '../../../../../shared/mocks/form-service.mock';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../../../shared/testing/utils.test';
-import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
-import {
-  SubmissionJsonPatchOperationsServiceStub
-} from '../../../../../shared/testing/submission-json-patch-operations-service.stub';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../../../core/submission/submission-json-patch-operations.service';
+import { SubmissionService } from '../../../../submission.service';
+import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
 import { SectionUploadService } from '../../section-upload.service';
-import { getMockSectionUploadService } from '../../../../../shared/mocks/section-upload.service.mock';
-import {
-  FormFieldMetadataValueObject
-} from '../../../../../shared/form/builder/models/form-field-metadata-value.model';
-import {
-  JsonPatchOperationPathCombiner
-} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { dateToISOFormat } from '../../../../../shared/date.util';
-import { of } from 'rxjs';
+import { SubmissionSectionUploadFileEditComponent } from './section-upload-file-edit.component';
 
 const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
   add: jasmine.createSpy('add'),
@@ -78,7 +88,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
   const fileIndex = '0';
   const fileId = '123456-test-upload';
   const fileData: any = mockUploadFiles[0];
-  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
+
+  let noAccessConditionsMock = Object.assign({}, mockFileFormData);
+  delete noAccessConditionsMock.accessConditions;
 
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
@@ -87,12 +100,12 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         CommonModule,
         FormsModule,
         ReactiveFormsModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FormComponent,
         SubmissionSectionUploadFileEditComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: FormService, useValue: getMockFormService() },
@@ -107,7 +120,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         NgbActiveModal,
         FormComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -178,16 +191,20 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     it('should init form model properly', () => {
       comp.fileData = fileData;
       comp.formId = 'testFileForm';
-      const maxStartDate = {year: 2022, month: 1, day: 12};
-      const maxEndDate = {year: 2019, month: 7, day: 12};
+      const maxStartDate = { year: 2022, month: 1, day: 12 };
+      const maxEndDate = { year: 2019, month: 7, day: 12 };
 
       comp.ngOnInit();
 
+      const models = [DynamicCustomSwitchModel, DynamicFormGroupModel, DynamicFormArrayModel];
+
       expect(comp.formModel).toBeDefined();
-      expect(comp.formModel.length).toBe(2);
-      expect(comp.formModel[0] instanceof DynamicFormGroupModel).toBeTruthy();
-      expect(comp.formModel[1] instanceof DynamicFormArrayModel).toBeTruthy();
-      expect((comp.formModel[1] as DynamicFormArrayModel).groups.length).toBe(2);
+      expect(comp.formModel.length).toBe(models.length);
+      models.forEach((model, i) => {
+        expect(comp.formModel[i] instanceof model).toBeTruthy();
+      });
+
+      expect((comp.formModel[2] as DynamicFormArrayModel).groups.length).toBe(2);
       const startDateModel = formbuilderService.findById('startDate', comp.formModel);
       expect(startDateModel.max).toEqual(maxStartDate);
       const endDateModel = formbuilderService.findById('endDate', comp.formModel);
@@ -200,8 +217,8 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         context: null,
         control: null,
         group: null,
-        model: {id: 'name'} as any,
-        type: 'change'
+        model: { id: 'name' } as any,
+        type: 'change',
       };
       spyOn(comp, 'setOptions');
 
@@ -248,9 +265,10 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
     });
 
     it('should save Bitstream File data properly when form is valid', fakeAsync(() => {
-      compAsAny.formRef = {formGroup: null};
+      compAsAny.formRef = { formGroup: null };
       compAsAny.fileData = fileData;
       compAsAny.pathCombiner = pathCombiner;
+      compAsAny.isPrimary = null;
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(of(true));
       formService.getFormData.and.returnValue(of(mockFileFormData));
@@ -259,10 +277,11 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
         Object.assign(mockSubmissionObject, {
           sections: {
             upload: {
-              files: mockUploadFiles
-            }
-          }
-        })
+              primary: true,
+              files: mockUploadFiles,
+            },
+          },
+        }),
       ];
       operationsService.jsonPatchByResourceID.and.returnValue(of(response));
 
@@ -274,33 +293,60 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
       comp.saveBitstreamData();
       tick();
 
-      let path = 'metadata/dc.title';
+      let path = 'primary';
+      expect(uploadService.updatePrimaryBitstreamOperation).toHaveBeenCalledWith(pathCombiner.getPath(path),  compAsAny.isPrimary,  mockFileFormData.primary[0], compAsAny.fileId);
+
+      const pathFragment = ['files', fileIndex];
+
+      path = 'metadata/dc.title';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         mockFileFormData.metadata['dc.title'],
-        true
+        true,
       );
 
       path = 'metadata/dc.description';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         mockFileFormData.metadata['dc.description'],
-        true
+        true,
       );
 
       path = 'accessConditions';
       expect(operationsBuilder.add).toHaveBeenCalledWith(
-        pathCombiner.getPath(path),
+        pathCombiner.getPath([...pathFragment, path]),
         accessConditionsToSave,
-        true
+        true,
       );
 
       expect(uploadService.updateFileData).toHaveBeenCalledWith(submissionId, sectionId, mockUploadFiles[0].uuid, mockUploadFiles[0]);
 
     }));
 
+    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.formRef = { formGroup: null };
       compAsAny.pathCombiner = pathCombiner;
       formService.validateAllFormFields.and.callFake(() => null);
       formService.isValid.and.returnValue(of(false));
@@ -317,7 +363,7 @@ describe('SubmissionSectionUploadFileEditComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
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 195d291530..8d5779c12c 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
@@ -1,6 +1,12 @@
-import { ChangeDetectorRef, Component, OnInit, ViewChild } from '@angular/core';
-import { FormControl } from '@angular/forms';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewChild,
+} from '@angular/core';
+import { UntypedFormControl } from '@angular/forms';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
 import {
   DYNAMIC_FORM_CONTROL_TYPE_DATEPICKER,
   DynamicDatePickerModel,
@@ -10,13 +16,40 @@ import {
   DynamicFormGroupModel,
   DynamicSelectModel,
   MATCH_ENABLED,
-  OR_OPERATOR
+  OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
-
+import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
+import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
+import { Subscription } from 'rxjs';
 import {
-  WorkspaceitemSectionUploadFileObject
-} from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
+  filter,
+  mergeMap,
+  take,
+} from 'rxjs/operators';
+import { DynamicCustomSwitchModel } from 'src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.model';
+
+import { AccessConditionOption } from '../../../../../core/config/models/config-access-condition-option.model';
+import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
+import { JsonPatchOperationPathCombiner } from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
+import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionUploadObject } from '../../../../../core/submission/models/workspaceitem-section-upload.model';
+import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { SubmissionJsonPatchOperationsService } from '../../../../../core/submission/submission-json-patch-operations.service';
+import { dateToISOFormat } from '../../../../../shared/date.util';
+import {
+  hasNoValue,
+  hasValue,
+  isNotEmpty,
+  isNotNull,
+} from '../../../../../shared/empty.util';
 import { FormBuilderService } from '../../../../../shared/form/builder/form-builder.service';
+import { FormFieldModel } from '../../../../../shared/form/builder/models/form-field.model';
+import { FormComponent } from '../../../../../shared/form/form.component';
+import { FormService } from '../../../../../shared/form/form.service';
+import { SubmissionService } from '../../../../submission.service';
+import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
+import { SectionUploadService } from '../../section-upload.service';
 import {
   BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG,
   BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT,
@@ -28,35 +61,11 @@ import {
   BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG,
   BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT,
+  BITSTREAM_FORM_PRIMARY,
+  BITSTREAM_FORM_PRIMARY_LAYOUT,
   BITSTREAM_METADATA_FORM_GROUP_CONFIG,
-  BITSTREAM_METADATA_FORM_GROUP_LAYOUT
+  BITSTREAM_METADATA_FORM_GROUP_LAYOUT,
 } from './section-upload-file-edit.model';
-import { POLICY_DEFAULT_WITH_LIST } from '../../section-upload.component';
-import { hasNoValue, hasValue, isNotEmpty, isNotNull } from '../../../../../shared/empty.util';
-import { SubmissionFormsModel } from '../../../../../core/config/models/config-submission-forms.model';
-import { FormFieldModel } from '../../../../../shared/form/builder/models/form-field.model';
-import { AccessConditionOption } from '../../../../../core/config/models/config-access-condition-option.model';
-import { SubmissionService } from '../../../../submission.service';
-import { FormService } from '../../../../../shared/form/form.service';
-import { FormComponent } from '../../../../../shared/form/form.component';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
-import { filter, mergeMap, take } from 'rxjs/operators';
-import { dateToISOFormat } from '../../../../../shared/date.util';
-import { SubmissionObject } from '../../../../../core/submission/models/submission-object.model';
-import {
-  WorkspaceitemSectionUploadObject
-} from '../../../../../core/submission/models/workspaceitem-section-upload.model';
-import { JsonPatchOperationsBuilder } from '../../../../../core/json-patch/builder/json-patch-operations-builder';
-import {
-  SubmissionJsonPatchOperationsService
-} from '../../../../../core/submission/submission-json-patch-operations.service';
-import {
-  JsonPatchOperationPathCombiner
-} from '../../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { SectionUploadService } from '../../section-upload.service';
-import { Subscription } from 'rxjs';
-import { DynamicFormControlCondition } from '@ng-dynamic-forms/core/lib/model/misc/dynamic-form-control-relation.model';
-import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynamic-date-control.model';
 
 /**
  * This component represents the edit form for bitstream
@@ -66,13 +75,21 @@ import { DynamicDateControlValue } from '@ng-dynamic-forms/core/lib/model/dynami
   styleUrls: ['./section-upload-file-edit.component.scss'],
   templateUrl: './section-upload-file-edit.component.html',
 })
-export class SubmissionSectionUploadFileEditComponent implements OnInit {
+export class SubmissionSectionUploadFileEditComponent
+implements OnInit, OnDestroy {
 
   /**
    * The FormComponent reference
    */
   @ViewChild('formRef') public formRef: FormComponent;
 
+  /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+  isPrimary: boolean;
+
   /**
    * The list of available access condition
    * @type {Array}
@@ -190,6 +207,10 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
    *    The form model
    */
   public initModelData(formModel: DynamicFormControlModel[]) {
+
+    const primaryBitstreamModel: any = this.formBuilderService.findById('primary', formModel, this.fileIndex);
+    primaryBitstreamModel.value = this.isPrimary || false;
+
     this.fileData.accessConditions.forEach((accessCondition, index) => {
       Array.of('name', 'startDate', 'endDate')
         .filter((key) => accessCondition.hasOwnProperty(key) && isNotEmpty(accessCondition[key]))
@@ -201,7 +222,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
               metadataModel.value = {
                 year: date.getUTCFullYear(),
                 month: date.getUTCMonth() + 1,
-                day: date.getUTCDate()
+                day: date.getUTCDate(),
               };
             } else {
               metadataModel.value = accessCondition[key];
@@ -240,13 +261,13 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
    * @param control
    *    The [[FormControl]] object
    */
-  public setOptions(model: DynamicFormControlModel, control: FormControl) {
+  public setOptions(model: DynamicFormControlModel, control: UntypedFormControl) {
     let accessCondition: AccessConditionOption = null;
     this.availableAccessConditionOptions.filter((element) => element.name === control.value)
       .forEach((element) => accessCondition = element );
     if (isNotEmpty(accessCondition)) {
-      const startDateControl: FormControl = control.parent.get('startDate') as FormControl;
-      const endDateControl: FormControl = control.parent.get('endDate') as FormControl;
+      const startDateControl: UntypedFormControl = control.parent.get('startDate') as UntypedFormControl;
+      const endDateControl: UntypedFormControl = control.parent.get('endDate') as UntypedFormControl;
 
       // Clear previous state
       startDateControl?.markAsUntouched();
@@ -286,17 +307,20 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
     const configForm = Object.assign({}, this.configMetadataForm, {
       fields: Object.assign([], this.configMetadataForm.rows[0].fields[0], [
         this.configMetadataForm.rows[0].fields[0],
-        configDescr
-      ])
+        configDescr,
+      ]),
     });
     const formModel: DynamicFormControlModel[] = [];
+
+    formModel.push(new DynamicCustomSwitchModel(BITSTREAM_FORM_PRIMARY, BITSTREAM_FORM_PRIMARY_LAYOUT));
+
     const metadataGroupModelConfig = Object.assign({}, BITSTREAM_METADATA_FORM_GROUP_CONFIG);
     metadataGroupModelConfig.group = this.formBuilderService.modelFromConfiguration(
       this.submissionId,
       configForm,
       this.collectionId,
       this.fileData.metadata,
-      this.submissionService.getSubmissionScope()
+      this.submissionService.getSubmissionScope(),
     );
     formModel.push(new DynamicFormGroupModel(metadataGroupModelConfig, BITSTREAM_METADATA_FORM_GROUP_LAYOUT));
     const accessConditionTypeModelConfig = Object.assign({}, BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG);
@@ -308,8 +332,8 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
         accessConditionTypeOptions.push(
           {
             label: accessCondition.name,
-            value: accessCondition.name
-          }
+            value: accessCondition.name,
+          },
         );
       }
       accessConditionTypeModelConfig.options = accessConditionTypeOptions;
@@ -328,7 +352,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
             maxStartDate = {
               year: min.getUTCFullYear(),
               month: min.getUTCMonth() + 1,
-              day: min.getUTCDate()
+              day: min.getUTCDate(),
             };
           }
         }
@@ -339,7 +363,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
             maxEndDate = {
               year: max.getUTCFullYear(),
               month: max.getUTCMonth() + 1,
-              day: max.getUTCDate()
+              day: max.getUTCDate(),
             };
           }
         }
@@ -377,7 +401,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
       // Number of access conditions blocks in form
       accessConditionsArrayConfig.initialCount = isNotEmpty(this.fileData.accessConditions) ? this.fileData.accessConditions.length : 1;
       formModel.push(
-        new DynamicFormArrayModel(accessConditionsArrayConfig, BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT)
+        new DynamicFormArrayModel(accessConditionsArrayConfig, BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT),
       );
 
     }
@@ -385,10 +409,14 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
     return formModel;
   }
 
+
   /**
    * Save bitstream metadata
    */
   saveBitstreamData() {
+
+    const pathFragment = ['files', this.fileIndex];
+
     // validate form
     this.formService.validateAllFormFields(this.formRef.formGroup);
     const saveBitstreamDataSubscription = this.formService.isValid(this.formId).pipe(
@@ -397,13 +425,15 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
       mergeMap(() => this.formService.getFormData(this.formId)),
       take(1),
       mergeMap((formData: any) => {
+        this.uploadService.updatePrimaryBitstreamOperation(this.pathCombiner.getPath('primary'), this.isPrimary, formData.primary[0], this.fileId);
+
         // collect bitstream metadata
         Object.keys((formData.metadata))
           .filter((key) => isNotEmpty(formData.metadata[key]))
           .forEach((key) => {
             const metadataKey = key.replace(/_/g, '.');
             const path = `metadata/${metadataKey}`;
-            this.operationsBuilder.add(this.pathCombiner.getPath(path), formData.metadata[key], true);
+            this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, path]), formData.metadata[key], true);
           });
         Object.keys((this.fileData.metadata))
           .filter((key) => isNotEmpty(this.fileData.metadata[key]))
@@ -412,61 +442,85 @@ export class SubmissionSectionUploadFileEditComponent implements OnInit {
           .forEach((key) => {
             const metadataKey = key.replace(/_/g, '.');
             const path = `metadata/${metadataKey}`;
-            this.operationsBuilder.remove(this.pathCombiner.getPath(path));
+            this.operationsBuilder.remove(this.pathCombiner.getPath([...pathFragment, 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,
+                /* 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);
-                currentAccessCondition.startDate = dateToISOFormat(startDate);
+                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;
+                    }
+                  }
+                  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) {
+                    const maxEndDateDate = new Date(accessConditionOpt.maxEndDate);
+                    if (endDateDate > maxEndDateDate) {
+                      endDateDate = maxEndDateDate;
+                    }
+                  }
+                  currentAccessCondition.endDate = dateToISOFormat(endDateDate);
+                }
+                accessConditionsToSave.push(currentAccessCondition);
               }
-              if (!accessConditionOpt.hasEndDate) {
-                delete currentAccessCondition.endDate;
-              } else if (accessCondition.endDate) {
-                const endDate = this.retrieveValueFromField(accessCondition.endDate);
-                currentAccessCondition.endDate = dateToISOFormat(endDate);
-              }
-              accessConditionsToSave.push(currentAccessCondition);
-            }
-          });
-
-        if (isNotEmpty(accessConditionsToSave)) {
-          this.operationsBuilder.add(this.pathCombiner.getPath('accessConditions'), accessConditionsToSave, true);
+            });
+        }
+        if (isNotEmpty(accessConditionsToSave)) {
+          this.operationsBuilder.add(this.pathCombiner.getPath([...pathFragment, 'accessConditions']), accessConditionsToSave, true);
         }
-
         // dispatch a PATCH request to save metadata
         return this.operationsService.jsonPatchByResourceID(
           this.submissionService.getSubmissionObjectLinkName(),
           this.submissionId,
           this.pathCombiner.rootElement,
           this.pathCombiner.subRootElement);
-      })
+      }),
     ).subscribe((result: SubmissionObject[]) => {
-      if (result[0].sections[this.sectionId]) {
-        const uploadSection = (result[0].sections[this.sectionId] as WorkspaceitemSectionUploadObject);
-        Object.keys(uploadSection.files)
-          .filter((key) => uploadSection.files[key].uuid === this.fileId)
-          .forEach((key) => this.uploadService.updateFileData(
-            this.submissionId, this.sectionId, this.fileId, uploadSection.files[key])
-          );
+      const section = result[0].sections[this.sectionId];
+      if (!section) {
+        return;
       }
+      const uploadSection = (section as WorkspaceitemSectionUploadObject);
+
+      this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, uploadSection.primary);
+
+      Object.keys(uploadSection.files)
+        .filter((key) => uploadSection.files[key].uuid === this.fileId)
+        .forEach((key) => this.uploadService.updateFileData(
+          this.submissionId, this.sectionId, this.fileId, uploadSection.files[key]),
+        );
       this.isSaving = false;
       this.activeModal.close();
     });
diff --git a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
index 7bd48559bf..4a39dfcfc8 100644
--- a/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
+++ b/src/app/submission/sections/upload/file/edit/section-upload-file-edit.model.ts
@@ -4,34 +4,35 @@ import {
   DynamicFormControlLayout,
   DynamicFormGroupModelConfig,
   DynamicSelectModelConfig,
+  DynamicSwitchModelConfig,
   MATCH_ENABLED,
   OR_OPERATOR,
 } from '@ng-dynamic-forms/core';
 
 export const BITSTREAM_METADATA_FORM_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'metadata',
-  group: []
+  group: [],
 };
 export const BITSTREAM_METADATA_FORM_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     container: 'form-group',
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    label: 'col-sm-3'
-  }
+    label: 'col-sm-3',
+  },
 };
 export const BITSTREAM_ACCESS_CONDITION_GROUP_CONFIG: DynamicFormGroupModelConfig = {
   id: 'accessConditionGroup',
-  group: []
+  group: [],
 };
 
 export const BITSTREAM_ACCESS_CONDITION_GROUP_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'form-group access-condition-group col',
     container: 'pl-1 pr-1',
-    control: 'form-row '
-  }
+    control: 'form-row ',
+  },
 };
 
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayModelConfig = {
@@ -41,21 +42,34 @@ export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_CONFIG: DynamicFormArrayMode
 export const BITSTREAM_ACCESS_CONDITIONS_FORM_ARRAY_LAYOUT: DynamicFormControlLayout = {
   grid: {
     group: 'form-row pt-4',
-  }
+  },
 };
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_CONFIG: DynamicSelectModelConfig<any> = {
   id: 'name',
   label: 'submission.sections.upload.form.access-condition-label',
   hint: 'submission.sections.upload.form.access-condition-hint',
-  options: []
+  options: [],
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_TYPE_LAYOUT: DynamicFormControlLayout = {
   element: {
     host: 'col-12',
-    label: 'col-form-label name-label'
-  }
+    label: 'col-form-label name-label',
+  },
 };
+export const BITSTREAM_FORM_PRIMARY_LAYOUT: DynamicFormControlLayout = {
+  element: {
+    host: 'col-12',
+    container: 'text-right',
+  },
+};
+
+export const BITSTREAM_FORM_PRIMARY: DynamicSwitchModelConfig = {
+  id: 'primary',
+  name: 'primary',
+  label: 'bitstream.edit.form.primaryBitstream.label',
+};
+
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePickerModelConfig = {
   id: 'startDate',
@@ -68,24 +82,24 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_CONFIG: DynamicDatePicke
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.upload.form.date-required-from'
-  }
+    required: 'submission.sections.upload.form.date-required-from',
+  },
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_START_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
 
 export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerModelConfig = {
@@ -99,22 +113,22 @@ export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_CONFIG: DynamicDatePickerM
     {
       match: MATCH_ENABLED,
       operator: OR_OPERATOR,
-      when: []
-    }
+      when: [],
+    },
   ],
   required: true,
   validators: {
-    required: null
+    required: null,
   },
   errorMessages: {
-    required: 'submission.sections.upload.form.date-required-until'
-  }
+    required: 'submission.sections.upload.form.date-required-until',
+  },
 };
 export const BITSTREAM_FORM_ACCESS_CONDITION_END_DATE_LAYOUT: DynamicFormControlLayout = {
   element: {
-    label: 'col-form-label'
+    label: 'col-form-label',
   },
   grid: {
-    host: 'col-6'
-  }
+    host: 'col-6',
+  },
 };
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 1bfc52529b..436c5a3323 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,8 +1,20 @@
 <ng-container *ngIf="fileData">
   <div class="row">
-    <div class="col-md-2">
-      <!--ds-thumbnail [thumbnail]="bitstreamsList[bitstreamKey].url | async"></ds-thumbnail-->
-      <ds-thumbnail [thumbnail]="fileData?.thumbnail"></ds-thumbnail>
+    <!-- Default switch -->
+    <div class="col-md-2 d-flex justify-content-center align-items-center" >
+      <div class="custom-control custom-switch">
+        <input
+        type="checkbox"
+        class="custom-control-input"
+        id="primaryBitstream{{fileIndex}}"
+        [disabled]="processingSaveStatus$ | async"
+        [checked]="isPrimary"
+        (change)="togglePrimaryBitstream($event)">
+        <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
+          <span class="sr-only" *ngIf="!isPrimary">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
+          <span class="sr-only" *ngIf="isPrimary">{{'submission.sections.upload.primary.remove' | translate:{ fileName: fileName } }}</span>
+        </label>
+      </div>
     </div>
     <div class="col-md-10">
       <div class="float-left w-75">
@@ -10,9 +22,10 @@
       </div>
       <div class="float-right w-15">
         <ng-container>
-          <ds-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-file-download-link>
+          </ds-themed-file-download-link>
           <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
                   title="{{ 'submission.sections.upload.edit.title' | translate }}"
@@ -25,7 +38,7 @@
                   [disabled]="(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>
+            <i *ngIf="(processingDelete$ | async) !== true" class="fa fa-trash fa-2x text-danger"></i>
           </button>
         </ng-container>
       </div>
@@ -46,7 +59,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/section-upload-file.component.spec.ts b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
index 4fea8d3f25..83b3a33689 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.spec.ts
@@ -1,47 +1,63 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowserModule, By } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-
-import { of, of as observableOf } from 'rxjs';
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import {
+  NgbModal,
+  NgbModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
+import {
+  of as observableOf,
+  of,
+} from 'rxjs';
 
+import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
+import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 import { FormService } from '../../../../shared/form/form.service';
 import { getMockFormService } from '../../../../shared/mocks/form-service.mock';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { HALEndpointServiceStub } from '../../../../shared/testing/hal-endpoint-service.stub';
-import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
-import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
-import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service.stub';
-import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
-import { SubmissionSectionUploadFileComponent } from './section-upload-file.component';
-import { SubmissionServiceStub } from '../../../../shared/testing/submission-service.stub';
+import { getMockSectionUploadService } from '../../../../shared/mocks/section-upload.service.mock';
 import {
   mockSubmissionCollectionId,
   mockSubmissionId,
   mockUploadConfigResponse,
-  mockUploadFiles
+  mockUploadFiles,
 } from '../../../../shared/mocks/submission.mock';
-
-import { SubmissionService } from '../../../submission.service';
-import { SectionUploadService } from '../section-upload.service';
+import { HALEndpointServiceStub } from '../../../../shared/testing/hal-endpoint-service.stub';
+import { SubmissionJsonPatchOperationsServiceStub } from '../../../../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionServiceStub } from '../../../../shared/testing/submission-service.stub';
 import { createTestComponent } from '../../../../shared/testing/utils.test';
 import { FileSizePipe } from '../../../../shared/utils/file-size-pipe';
+import { SubmissionService } from '../../../submission.service';
 import { POLICY_DEFAULT_WITH_LIST } from '../section-upload.component';
-import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { getMockSectionUploadService } from '../../../../shared/mocks/section-upload.service.mock';
+import { SectionUploadService } from '../section-upload.service';
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
-import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { SubmissionSectionUploadFileComponent } from './section-upload-file.component';
 
 const configMetadataFormMock = {
   rows: [{
     fields: [{
       selectableMetadata: [
-        {metadata: 'dc.title', label: null, closed: false},
-        {metadata: 'dc.description', label: null, closed: false}
-      ]
-    }]
-  }]
+        { metadata: 'dc.title', label: null, closed: false },
+        { metadata: 'dc.description', label: null, closed: false },
+      ],
+    }],
+  }],
 };
 
 describe('SubmissionSectionUploadFileComponent test suite', () => {
@@ -66,7 +82,7 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
   const fileName = '123456-test-upload.jpg';
   const fileId = '123456-test-upload';
   const fileData: any = mockUploadFiles[0];
-  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId, 'files', fileIndex);
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', sectionId);
 
   const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
     add: jasmine.createSpy('add'),
@@ -80,12 +96,12 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         BrowserModule,
         CommonModule,
         NgbModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         FileSizePipe,
         SubmissionSectionUploadFileComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: FormService, useValue: getMockFormService() },
@@ -98,9 +114,9 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         NgbModal,
         SubmissionSectionUploadFileComponent,
         SubmissionSectionUploadFileEditComponent,
-        FormBuilderService
+        FormBuilderService,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -175,12 +191,12 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
     it('should init file data properly', () => {
       uploadService.getFileData.and.returnValue(observableOf(fileData));
 
-      comp.ngOnChanges();
+      comp.ngOnChanges({});
 
       expect(comp.fileData).toEqual(fileData);
     });
 
-    it('should call deleteFile on delete confirmation', () => {
+    it('should call deleteFile on delete confirmation', async () => {
       spyOn(compAsAny, 'deleteFile');
       comp.fileData = fileData;
 
@@ -196,9 +212,25 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
 
       fixture.detectChanges();
 
-      fixture.whenStable().then(() => {
-        expect(compAsAny.deleteFile).toHaveBeenCalled();
-      });
+      await fixture.whenStable();
+      expect(compAsAny.deleteFile).toHaveBeenCalled();
+    });
+
+    it('should delete primary if file we delete is primary', () => {
+      compAsAny.isPrimary = true;
+      compAsAny.pathCombiner = pathCombiner;
+      operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
+      compAsAny.deleteFile();
+      expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath('primary'));
+      expect(uploadService.updateFilePrimaryBitstream).toHaveBeenCalledWith(submissionId, sectionId, null);
+    });
+
+    it('should NOT delete primary if file we delete is NOT primary', () => {
+      compAsAny.isPrimary = false;
+      compAsAny.pathCombiner = pathCombiner;
+      operationsService.jsonPatchByResourceID.and.returnValue(observableOf({}));
+      compAsAny.deleteFile();
+      expect(uploadService.updateFilePrimaryBitstream).not.toHaveBeenCalledTimes(1);
     });
 
     it('should delete file properly', () => {
@@ -209,7 +241,8 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
       compAsAny.deleteFile();
 
       expect(uploadService.removeUploadedFile).toHaveBeenCalledWith(submissionId, sectionId, fileId);
-      expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath());
+      expect(operationsBuilder.remove).toHaveBeenCalledWith(pathCombiner.getPath(['files', fileIndex]));
+
       expect(operationsService.jsonPatchByResourceID).toHaveBeenCalledWith(
         'workspaceitems',
         submissionId,
@@ -237,7 +270,7 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.ts b/src/app/submission/sections/upload/file/section-upload-file.component.ts
index a8e05fcf40..8b86b1ec0f 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.ts
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -1,23 +1,36 @@
-import { ChangeDetectorRef, Component, Input, OnChanges, OnInit, ViewChild } from '@angular/core';
-
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { filter } from 'rxjs/operators';
-import { DynamicFormControlModel, } from '@ng-dynamic-forms/core';
+import {
+  Component,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  SimpleChanges,
+  ViewChild,
+} from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-
-import { SectionUploadService } from '../section-upload.service';
-import { hasValue, isNotUndefined } from '../../../../shared/empty.util';
-import { FormService } from '../../../../shared/form/form.service';
-import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
-import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
-import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
-import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
-import { SubmissionService } from '../../../submission.service';
-import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
-import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
-import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
-import { Bitstream } from '../../../../core/shared/bitstream.model';
 import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
+import { DynamicFormControlModel } from '@ng-dynamic-forms/core';
+import {
+  BehaviorSubject,
+  Observable,
+  Subscription,
+} from 'rxjs';
+import { filter } from 'rxjs/operators';
+
+import { SubmissionFormsModel } from '../../../../core/config/models/config-submission-forms.model';
+import { JsonPatchOperationPathCombiner } from '../../../../core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from '../../../../core/json-patch/builder/json-patch-operations-builder';
+import { Bitstream } from '../../../../core/shared/bitstream.model';
+import { WorkspaceitemSectionUploadFileObject } from '../../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { SubmissionJsonPatchOperationsService } from '../../../../core/submission/submission-json-patch-operations.service';
+import {
+  hasValue,
+  isNotUndefined,
+} from '../../../../shared/empty.util';
+import { FormService } from '../../../../shared/form/form.service';
+import { SubmissionService } from '../../../submission.service';
+import { SectionUploadService } from '../section-upload.service';
+import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
 
 /**
  * This component represents a single bitstream contained in the submission
@@ -27,7 +40,13 @@ import { NgbModalOptions } from '@ng-bootstrap/ng-bootstrap/modal/modal-config';
   styleUrls: ['./section-upload-file.component.scss'],
   templateUrl: './section-upload-file.component.html',
 })
-export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
+export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit, OnDestroy {
+  /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+  @Input() isPrimary: boolean | null;
 
   /**
    * The list of available access condition
@@ -91,6 +110,11 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    */
   @ViewChild(SubmissionSectionUploadFileEditComponent) fileEditComp: SubmissionSectionUploadFileEditComponent;
 
+  /**
+   * A boolean representing if a submission save operation is pending
+   * @type {Observable<boolean>}
+   */
+  public processingSaveStatus$: Observable<boolean>;
 
   /**
    * The bitstream's metadata data
@@ -128,6 +152,12 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    */
   protected pathCombiner: JsonPatchOperationPathCombiner;
 
+  /**
+   * The [JsonPatchOperationPathCombiner] object
+   * @type {JsonPatchOperationPathCombiner}
+   */
+  protected primaryBitstreamPathCombiner: JsonPatchOperationPathCombiner;
+
   /**
    * Array to track all subscriptions and unsubscribe them onDestroy
    * @type {Array}
@@ -153,9 +183,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    * @param {SectionUploadService} uploadService
    */
   constructor(
-    private cdr: ChangeDetectorRef,
     private formService: FormService,
-    private halService: HALEndpointService,
     private modalService: NgbModal,
     private operationsBuilder: JsonPatchOperationsBuilder,
     private operationsService: SubmissionJsonPatchOperationsService,
@@ -168,17 +196,17 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
   /**
    * Retrieve bitstream's metadata
    */
-  ngOnChanges() {
+  ngOnChanges(changes: SimpleChanges): void {
     if (this.availableAccessConditionOptions) {
       // Retrieve file state
       this.subscriptions.push(
         this.uploadService
-          .getFileData(this.submissionId, this.sectionId, this.fileId).pipe(
-            filter((bitstream) => isNotUndefined(bitstream)))
+          .getFileData(this.submissionId, this.sectionId, this.fileId)
+          .pipe(filter((bitstream) => isNotUndefined(bitstream)))
           .subscribe((bitstream) => {
-              this.fileData = bitstream;
-            }
-          )
+            this.fileData = bitstream;
+          },
+          ),
       );
     }
   }
@@ -188,7 +216,8 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    */
   ngOnInit() {
     this.formId = this.formService.getUniqueId(this.fileId);
-    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId, 'files', this.fileIndex);
+    this.processingSaveStatus$ = this.submissionService.getSubmissionSaveProcessingStatus(this.submissionId);
+    this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionId);
     this.loadFormMetadata();
   }
 
@@ -202,7 +231,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
           this.processingDelete$.next(true);
           this.deleteFile();
         }
-      }
+      },
     );
   }
 
@@ -213,7 +242,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    */
   public getBitstream(): Bitstream {
     return Object.assign(new Bitstream(), {
-      uuid: this.fileData.uuid
+      uuid: this.fileData.uuid,
     });
   }
 
@@ -238,7 +267,12 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
     activeModal.componentInstance.formMetadata = this.formMetadata;
     activeModal.componentInstance.pathCombiner = this.pathCombiner;
     activeModal.componentInstance.submissionId = this.submissionId;
+    activeModal.componentInstance.isPrimary = this.isPrimary;
+  }
 
+  togglePrimaryBitstream(event) {
+    this.uploadService.updatePrimaryBitstreamOperation(this.pathCombiner.getPath('primary'), this.isPrimary, event.target.checked, this.fileId);
+    this.submissionService.dispatchSaveSection(this.submissionId, this.sectionId);
   }
 
   ngOnDestroy(): void {
@@ -256,7 +290,7 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
           this.formMetadata.push(metadatum.metadata);
         });
       });
-    }
+    },
     );
   }
 
@@ -264,13 +298,20 @@ export class SubmissionSectionUploadFileComponent implements OnChanges, OnInit {
    * Delete bitstream from submission
    */
   protected deleteFile() {
-    this.operationsBuilder.remove(this.pathCombiner.getPath());
+    this.operationsBuilder.remove(this.pathCombiner.getPath(['files', this.fileIndex]));
+    if (this.isPrimary) {
+      this.operationsBuilder.remove(this.pathCombiner.getPath('primary'));
+    }
+
     this.subscriptions.push(this.operationsService.jsonPatchByResourceID(
       this.submissionService.getSubmissionObjectLinkName(),
       this.submissionId,
       this.pathCombiner.rootElement,
       this.pathCombiner.subRootElement)
       .subscribe(() => {
+        if (this.isPrimary) {
+          this.uploadService.updateFilePrimaryBitstream(this.submissionId, this.sectionId, null);
+        }
         this.uploadService.removeUploadedFile(this.submissionId, this.sectionId, this.fileId);
         this.processingDelete$.next(false);
       }));
diff --git a/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
new file mode 100644
index 0000000000..2280013147
--- /dev/null
+++ b/src/app/submission/sections/upload/file/themed-section-upload-file.component.ts
@@ -0,0 +1,105 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+import { SubmissionFormsModel } from 'src/app/core/config/models/config-submission-forms.model';
+import { ThemedComponent } from 'src/app/shared/theme-support/themed.component';
+
+import { SubmissionSectionUploadFileComponent } from './section-upload-file.component';
+
+@Component({
+  selector: 'ds-themed-submission-upload-section-file',
+  styleUrls: [],
+  templateUrl: '../../../../shared/theme-support/themed.component.html',
+})
+export class ThemedSubmissionSectionUploadFileComponent
+  extends ThemedComponent<SubmissionSectionUploadFileComponent> {
+
+  /**
+   * The list of available access condition
+   * @type {Array}
+   */
+  @Input() availableAccessConditionOptions: any[];
+
+   /**
+   * The indicator is the primary bitstream
+   * it will be null if no primary bitstream is set for the ORIGINAL bundle
+   * @type {boolean, null}
+   */
+   @Input() isPrimary: boolean | null;
+
+  /**
+   * The submission id
+   * @type {string}
+   */
+  @Input() collectionId: string;
+
+  /**
+   * Define if collection access conditions policy type :
+   * POLICY_DEFAULT_NO_LIST : is not possible to define additional access group/s for the single file
+   * POLICY_DEFAULT_WITH_LIST : is possible to define additional access group/s for the single file
+   * @type {number}
+   */
+  @Input() collectionPolicyType: number;
+
+  /**
+   * The configuration for the bitstream's metadata form
+   * @type {SubmissionFormsModel}
+   */
+  @Input() configMetadataForm: SubmissionFormsModel;
+
+  /**
+   * The bitstream id
+   * @type {string}
+   */
+  @Input() fileId: string;
+
+  /**
+   * The bitstream array key
+   * @type {string}
+   */
+  @Input() fileIndex: string;
+
+  /**
+   * The bitstream id
+   * @type {string}
+   */
+  @Input() fileName: string;
+
+  /**
+   * The section id
+   * @type {string}
+   */
+  @Input() sectionId: string;
+
+  /**
+   * The submission id
+   * @type {string}
+   */
+  @Input() submissionId: string;
+
+  protected inAndOutputNames: (keyof SubmissionSectionUploadFileComponent & keyof this)[] = [
+    'availableAccessConditionOptions',
+    'isPrimary',
+    'collectionId',
+    'collectionPolicyType',
+    'configMetadataForm',
+    'fileId',
+    'fileIndex',
+    'fileName',
+    'sectionId',
+    'submissionId',
+  ];
+
+  protected getComponentName(): string {
+    return 'SubmissionSectionUploadFileComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../../../themes/${themeName}/app/submission/sections/upload/file/section-upload-file.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./section-upload-file.component`);
+  }
+}
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.spec.ts b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts
index dddc6cdc36..cfbeb4c5ae 100644
--- a/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts
+++ b/src/app/submission/sections/upload/file/view/section-upload-file-view.component.spec.ts
@@ -1,14 +1,21 @@
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { mockUploadFiles } from '../../../../../shared/mocks/submission.mock';
-import { FormComponent } from '../../../../../shared/form/form.component';
-import { SubmissionSectionUploadFileViewComponent } from './section-upload-file-view.component';
-import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
 import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { FormComponent } from '../../../../../shared/form/form.component';
+import { mockUploadFiles } from '../../../../../shared/mocks/submission.mock';
 import { createTestComponent } from '../../../../../shared/testing/utils.test';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { SubmissionSectionUploadFileViewComponent } from './section-upload-file-view.component';
 
 describe('SubmissionSectionUploadFileViewComponent test suite', () => {
 
@@ -21,18 +28,18 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
   beforeEach(waitForAsync(() => {
     TestBed.configureTestingModule({
       imports: [
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         TruncatePipe,
         FormComponent,
         SubmissionSectionUploadFileViewComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
-        SubmissionSectionUploadFileViewComponent
+        SubmissionSectionUploadFileViewComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -92,7 +99,7 @@ describe('SubmissionSectionUploadFileViewComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
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..5aa2af2e2f 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
@@ -1,9 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
 
+import {
+  MetadataMap,
+  MetadataValue,
+} from '../../../../../core/shared/metadata.models';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { WorkspaceitemSectionUploadFileObject } from '../../../../../core/submission/models/workspaceitem-section-upload-file.model';
 import { isNotEmpty } from '../../../../../shared/empty.util';
-import { Metadata } from '../../../../../core/shared/metadata.utils';
-import { MetadataMap, MetadataValue } from '../../../../../core/shared/metadata.models';
 
 /**
  * This component allow to show bitstream's metadata
@@ -38,6 +45,13 @@ export class SubmissionSectionUploadFileViewComponent implements OnInit {
    */
   public fileDescrKey = 'Description';
 
+  public fileFormat!: string;
+
+  public fileCheckSum!: {
+    checkSumAlgorithm: string;
+    value: string;
+  };
+
   /**
    * Initialize instance variables
    */
@@ -46,6 +60,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 8a19f66220..41e912e613 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -2,15 +2,7 @@
           [dismissible]="true"
           [type]="AlertTypeEnum.Info"></ds-alert>
 
-<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>
-  </div>
-</ng-container>
-
-<ng-container *ngIf="fileList.length > 0">
+<ng-container *ngIf="fileList.length > 0; else noFileUploaded">
 
   <div *ngIf="collectionDefaultAccessConditions.length > 0" class="row">
     <div class="col-sm-12" >
@@ -26,18 +18,28 @@
       </ds-alert>
     </div>
   </div>
-
-  <ng-container *ngFor="let fileEntry of fileList">
-    <ds-submission-upload-section-file
+  <div class="row">
+    <div class="col-md-2">
+      <span class="text-left font-weight-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
+    </div>
+  </div>
+  <div class="row">
+    <div class="col-md-12">
+      <hr/>
+    </div>
+  </div>
+  <ng-container *ngFor="let fileEntry of fileList; let i = index;">
+    <ds-themed-submission-upload-section-file
+                                       [isPrimary]="primaryBitstreamUUID ? primaryBitstreamUUID === fileEntry.uuid : null"
                                        [availableAccessConditionOptions]="availableAccessConditionOptions"
                                        [collectionId]="collectionId"
                                        [collectionPolicyType]="collectionPolicyType"
                                        [configMetadataForm]="(configMetadataForm$ | async)"
-                                       [fileId]="fileIndexes[fileList.indexOf(fileEntry)]"
-                                       [fileIndex]="fileList.indexOf(fileEntry)"
-                                       [fileName]="fileNames[fileList.indexOf(fileEntry)]"
+                                       [fileId]="fileEntry.uuid"
+                                       [fileIndex]="i"
+                                       [fileName]="fileNames[i]"
                                        [sectionId]="sectionData.id"
-                                       [submissionId]="submissionId"></ds-submission-upload-section-file>
+                                       [submissionId]="submissionId"></ds-themed-submission-upload-section-file>
     <div class="row">
       <div class="col-md-12">
         <hr/>
@@ -45,3 +47,11 @@
     </div>
   </ng-container>
 </ng-container>
+
+<ng-template #noFileUploaded>
+  <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>
+  </div>
+</ng-template>
diff --git a/src/app/submission/sections/upload/section-upload.component.spec.ts b/src/app/submission/sections/upload/section-upload.component.spec.ts
index 068fc5c766..59179166a3 100644
--- a/src/app/submission/sections/upload/section-upload.component.spec.ts
+++ b/src/app/submission/sections/upload/section-upload.component.spec.ts
@@ -1,22 +1,32 @@
-import { ChangeDetectorRef, Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ComponentFixture, inject, TestBed, waitForAsync } from '@angular/core/testing';
-import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  inject,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { BrowserModule } from '@angular/platform-browser';
 import { TranslateModule } from '@ngx-translate/core';
 import { cold } from 'jasmine-marbles';
 import { of as observableOf } from 'rxjs';
 
-import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
-import { createTestComponent } from '../../../shared/testing/utils.test';
-import { SubmissionObjectState } from '../../objects/submission-objects.reducer';
-import { SubmissionService } from '../../submission.service';
-import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
-import { SectionsService } from '../sections.service';
-import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
 import { SubmissionFormsConfigDataService } from '../../../core/config/submission-forms-config-data.service';
-import { SectionDataObject } from '../models/section-data.model';
-import { SectionsType } from '../sections-type';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { buildPaginatedList } from '../../../core/data/paginated-list.model';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { Collection } from '../../../core/shared/collection.model';
+import { PageInfo } from '../../../core/shared/page-info.model';
+import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
 import {
   mockGroup,
   mockSubmissionCollectionId,
@@ -25,20 +35,19 @@ import {
   mockUploadConfigResponse,
   mockUploadConfigResponseNotRequired,
   mockUploadFiles,
+  mockUploadFilesData,
 } from '../../../shared/mocks/submission.mock';
-import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
-import { SectionUploadService } from './section-upload.service';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/remote-data.utils';
+import { SectionsServiceStub } from '../../../shared/testing/sections-service.stub';
+import { SubmissionServiceStub } from '../../../shared/testing/submission-service.stub';
+import { createTestComponent } from '../../../shared/testing/utils.test';
+import { SubmissionObjectState } from '../../objects/submission-objects.reducer';
+import { SubmissionService } from '../../submission.service';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { SectionsType } from '../sections-type';
 import { SubmissionSectionUploadComponent } from './section-upload.component';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { Collection } from '../../../core/shared/collection.model';
-import { ResourcePolicy } from '../../../core/resource-policy/models/resource-policy.model';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { Group } from '../../../core/eperson/models/group.model';
-import { getMockSectionUploadService } from '../../../shared/mocks/section-upload.service.mock';
-import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
-import { buildPaginatedList } from '../../../core/data/paginated-list.model';
-import { PageInfo } from '../../../core/shared/page-info.model';
+import { SectionUploadService } from './section-upload.service';
 
 function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataService {
   return jasmine.createSpyObj('SubmissionUploadsConfigService', {
@@ -46,13 +55,13 @@ function getMockSubmissionUploadsConfigService(): SubmissionFormsConfigDataServi
     getConfigByHref: jasmine.createSpy('getConfigByHref'),
     getConfigByName: jasmine.createSpy('getConfigByName'),
     getConfigBySearch: jasmine.createSpy('getConfigBySearch'),
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 }
 
 function getMockCollectionDataService(): CollectionDataService {
   return jasmine.createSpyObj('CollectionDataService', {
-    findById: jasmine.createSpy('findById')
+    findById: jasmine.createSpy('findById'),
   });
 }
 
@@ -65,7 +74,7 @@ function getMockGroupEpersonService(): GroupDataService {
 
 function getMockResourcePolicyService(): ResourcePolicyDataService {
   return jasmine.createSpyObj('ResourcePolicyService', {
-    findByHref: jasmine.createSpy('findByHref')
+    findByHref: jasmine.createSpy('findByHref'),
   });
 }
 
@@ -96,13 +105,13 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       config: 'https://dspace7.4science.it/or2018/api/config/submissionforms/upload',
       mandatory: true,
       data: {
-        files: []
+        files: [],
       },
       errorsToShow: [],
       serverValidationErrors: [],
       header: 'submit.progressbar.describe.upload',
       id: 'upload-id',
-      sectionType: SectionsType.Upload
+      sectionType: SectionsType.Upload,
     };
     submissionId = mockSubmissionId;
     collectionId = mockSubmissionCollectionId;
@@ -114,18 +123,18 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         {
           key: 'dc.title',
           language: 'en_US',
-          value: 'Community 1-Collection 1'
+          value: 'Community 1-Collection 1',
         }],
       _links: {
-        defaultAccessConditions: collectionId + '/defaultAccessConditions'
-      }
+        defaultAccessConditions: collectionId + '/defaultAccessConditions',
+      },
     });
 
     mockDefaultAccessCondition = Object.assign(new ResourcePolicy(), {
       name: null,
       groupUUID: '11cc35e5-a11d-4b64-b5b9-0052a5d15509',
       id: 20,
-      uuid: 'resource-policy-20'
+      uuid: 'resource-policy-20',
     });
     uploadsConfigService = getMockSubmissionUploadsConfigService();
 
@@ -145,32 +154,33 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
-        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
+        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition),
       })));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
 
       uploadsConfigService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(
-        buildPaginatedList(new PageInfo(), [mockUploadConfigResponse as any]))
+        buildPaginatedList(new PageInfo(), [mockUploadConfigResponse as any])),
       );
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
     };
 
     TestBed.configureTestingModule({
       imports: [
         BrowserModule,
         CommonModule,
-        TranslateModule.forRoot()
+        TranslateModule.forRoot(),
       ],
       declarations: [
         SubmissionSectionUploadComponent,
-        TestComponent
+        TestComponent,
       ],
       providers: [
         { provide: CollectionDataService, useValue: collectionDataService },
@@ -183,9 +193,9 @@ describe('SubmissionSectionUploadComponent test suite', () => {
         { provide: 'sectionDataProvider', useValue: sectionObject },
         { provide: 'submissionIdProvider', useValue: submissionId },
         ChangeDetectorRef,
-        SubmissionSectionUploadComponent
+        SubmissionSectionUploadComponent,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents().then();
   }));
 
@@ -230,11 +240,11 @@ describe('SubmissionSectionUploadComponent test suite', () => {
     });
 
     it('should init component properly', () => {
-
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(Object.assign(new Collection(), mockCollection, {
-        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition)
+        defaultAccessConditions: createSuccessfulRemoteDataObject$(mockDefaultAccessCondition),
       })));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
@@ -243,18 +253,11 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
-      bitstreamService.getUploadedFileList.and.returnValue(observableOf([]));
-
       comp.onSectionInit();
 
-      const expectedGroupsMap = new Map([
-        [mockUploadConfigResponse.accessConditionOptions[1].name, [mockGroup as any]],
-        [mockUploadConfigResponse.accessConditionOptions[2].name, [mockGroup as any]],
-      ]);
-
       expect(comp.collectionId).toBe(collectionId);
       expect(comp.collectionName).toBe(mockCollection.name);
       expect(comp.availableAccessConditionOptions.length).toBe(4);
@@ -262,12 +265,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       expect(comp.required$.getValue()).toBe(true);
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.fileList).toEqual([]);
-      expect(compAsAny.fileIndexes).toEqual([]);
       expect(compAsAny.fileNames).toEqual([]);
-
+      expect(compAsAny.primaryBitstreamUUID).toEqual(null);
     });
 
     it('should init file list properly', () => {
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
 
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
@@ -279,10 +282,10 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
-      bitstreamService.getUploadedFileList.and.returnValue(observableOf(mockUploadFiles));
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf(mockUploadFilesData));
 
       comp.onSectionInit();
 
@@ -298,12 +301,14 @@ describe('SubmissionSectionUploadComponent test suite', () => {
       expect(comp.required$.getValue()).toBe(true);
       expect(compAsAny.subs.length).toBe(2);
       expect(compAsAny.fileList).toEqual(mockUploadFiles);
-      expect(compAsAny.fileIndexes).toEqual(['123456-test-upload']);
+      expect(compAsAny.primaryBitstreamUUID).toEqual(null);
       expect(compAsAny.fileNames).toEqual(['123456-test-upload.jpg']);
 
     });
 
     it('should properly read the section status when required is true', () => {
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
+
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
@@ -314,12 +319,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(cold('-a-b', {
         a: [],
-        b: mockUploadFiles
+        b: mockUploadFiles,
       }));
 
       comp.onSectionInit();
@@ -328,13 +333,14 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
         c: false,
-        d: true
+        d: true,
       }));
     });
 
     it('should properly read the section status when required is false', () => {
       submissionServiceStub.getSubmissionObject.and.returnValue(observableOf(submissionState));
 
+      bitstreamService.getUploadedFilesData.and.returnValue(observableOf({ primary: null, files: [] }));
       collectionDataService.findById.and.returnValue(createSuccessfulRemoteDataObject$(mockCollection));
 
       resourcePolicyService.findByHref.and.returnValue(createSuccessfulRemoteDataObject$(mockDefaultAccessCondition));
@@ -343,12 +349,12 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       groupService.findById.and.returnValues(
         createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
-        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup))
+        createSuccessfulRemoteDataObject$(Object.assign(new Group(), mockGroup)),
       );
 
       bitstreamService.getUploadedFileList.and.returnValue(cold('-a-b', {
         a: [],
-        b: mockUploadFiles
+        b: mockUploadFiles,
       }));
 
       comp.onSectionInit();
@@ -357,7 +363,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 
       expect(compAsAny.getSectionStatus()).toBeObservable(cold('-c-d', {
         c: true,
-        d: true
+        d: true,
       }));
     });
   });
@@ -366,7 +372,7 @@ describe('SubmissionSectionUploadComponent test suite', () => {
 // declare a test component
 @Component({
   selector: 'ds-test-cmp',
-  template: ``
+  template: ``,
 })
 class TestComponent {
 
diff --git a/src/app/submission/sections/upload/section-upload.component.ts b/src/app/submission/sections/upload/section-upload.component.ts
index 5b89806134..2afd059bfc 100644
--- a/src/app/submission/sections/upload/section-upload.component.ts
+++ b/src/app/submission/sections/upload/section-upload.component.ts
@@ -1,35 +1,53 @@
-import { ChangeDetectorRef, Component, Inject } from '@angular/core';
-
+import {
+  ChangeDetectorRef,
+  Component,
+  Inject,
+} from '@angular/core';
 import {
   BehaviorSubject,
+  combineLatest,
   combineLatest as observableCombineLatest,
   Observable,
-  Subscription
+  Subscription,
 } from 'rxjs';
-import { distinctUntilChanged, filter, map, mergeMap, switchMap, tap } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+  mergeMap,
+  switchMap,
+  tap,
+} from 'rxjs/operators';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
-import { SectionModelComponent } from '../models/section.model';
-import { hasValue, isNotEmpty, isNotUndefined, isUndefined } from '../../../shared/empty.util';
-import { SectionUploadService } from './section-upload.service';
-import { CollectionDataService } from '../../../core/data/collection-data.service';
-import { GroupDataService } from '../../../core/eperson/group-data.service';
-import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
-import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
-import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
-import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-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 { RemoteData } from '../../../core/data/remote-data';
-import { Group } from '../../../core/eperson/models/group.model';
-import { SectionsService } from '../sections.service';
-import { SubmissionService } from '../../submission.service';
-import { Collection } from '../../../core/shared/collection.model';
+import { DSONameService } from '../../../core/breadcrumbs/dso-name.service';
 import { AccessConditionOption } from '../../../core/config/models/config-access-condition-option.model';
-import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
+import { SubmissionUploadsModel } from '../../../core/config/models/config-submission-uploads.model';
+import { SubmissionUploadsConfigDataService } from '../../../core/config/submission-uploads-config-data.service';
+import { CollectionDataService } from '../../../core/data/collection-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { GroupDataService } from '../../../core/eperson/group-data.service';
+import { Group } from '../../../core/eperson/models/group.model';
+import { ResourcePolicyDataService } from '../../../core/resource-policy/resource-policy-data.service';
+import { Collection } from '../../../core/shared/collection.model';
 import { getFirstSucceededRemoteData } from '../../../core/shared/operators';
+import { AlertType } from '../../../shared/alert/alert-type';
+import {
+  hasValue,
+  isNotEmpty,
+  isNotUndefined,
+  isUndefined,
+} from '../../../shared/empty.util';
+import { followLink } from '../../../shared/utils/follow-link-config.model';
+import { SubmissionObjectEntry } from '../../objects/submission-objects.reducer';
+import { SubmissionService } from '../../submission.service';
+import { SectionModelComponent } from '../models/section.model';
+import { SectionDataObject } from '../models/section-data.model';
+import { SectionsService } from '../sections.service';
+import { renderSectionFor } from '../sections-decorator';
+import { SectionsType } from '../sections-type';
+import { SectionUploadService } from './section-upload.service';
 
 export const POLICY_DEFAULT_NO_LIST = 1; // Banner1
 export const POLICY_DEFAULT_WITH_LIST = 2; // Banner2
@@ -57,10 +75,10 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
   public AlertTypeEnum = AlertType;
 
   /**
-   * The array containing the keys of file list array
+   * The uuid of primary bitstream file
    * @type {Array}
    */
-  public fileIndexes: string[] = [];
+  public primaryBitstreamUUID: string | null = null;
 
   /**
    * The file list
@@ -138,6 +156,7 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
               protected sectionService: SectionsService,
               private submissionService: SubmissionService,
               private uploadsConfigService: SubmissionUploadsConfigDataService,
+              public dsoNameService: DSONameService,
               @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
               @Inject('submissionIdProvider') public injectedSubmissionId: string) {
     super(undefined, injectedSectionData, injectedSubmissionId);
@@ -156,8 +175,8 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
       switchMap((config: SubmissionUploadsModel) =>
         config.metadata.pipe(
           getFirstSucceededRemoteData(),
-          map((remoteData: RemoteData<SubmissionFormsModel>) => remoteData.payload)
-        )
+          map((remoteData: RemoteData<SubmissionFormsModel>) => remoteData.payload),
+        ),
       ));
 
     this.subs.push(
@@ -167,9 +186,9 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
         tap((submissionObject: SubmissionObjectEntry) => this.collectionId = submissionObject.collection),
         mergeMap((submissionObject: SubmissionObjectEntry) => this.collectionDataService.findById(submissionObject.collection)),
         filter((rd: RemoteData<Collection>) => isNotUndefined((rd.payload))),
-        tap((collectionRemoteData: RemoteData<Collection>) => this.collectionName = collectionRemoteData.payload.name),
+        tap((collectionRemoteData: RemoteData<Collection>) => this.collectionName = this.dsoNameService.getName(collectionRemoteData.payload)),
         // TODO review this part when https://github.com/DSpace/dspace-angular/issues/575 is resolved
-/*        mergeMap((collectionRemoteData: RemoteData<Collection>) => {
+        /*        mergeMap((collectionRemoteData: RemoteData<Collection>) => {
           return this.resourcePolicyService.findByHref(
             (collectionRemoteData.payload as any)._links.defaultAccessConditions.href
           );
@@ -192,29 +211,20 @@ export class SubmissionSectionUploadComponent extends SectionModelComponent {
         this.changeDetectorRef.detectChanges();
       }),
 
-      // retrieve submission's bitstreams from state
-      observableCombineLatest(this.configMetadataForm$,
-        this.bitstreamService.getUploadedFileList(this.submissionId, this.sectionData.id)).pipe(
-        filter(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
-          return isNotEmpty(configMetadataForm) && isNotUndefined(fileList);
+
+      // retrieve submission's bitstream data from state
+      combineLatest([this.configMetadataForm$,
+        this.bitstreamService.getUploadedFilesData(this.submissionId, this.sectionData.id)]).pipe(
+        filter(([configMetadataForm, { files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
+          return isNotEmpty(configMetadataForm) && isNotEmpty(files);
         }),
         distinctUntilChanged())
-        .subscribe(([configMetadataForm, fileList]: [SubmissionFormsModel, any[]]) => {
-            this.fileList = [];
-            this.fileIndexes = [];
-            this.fileNames = [];
-            this.changeDetectorRef.detectChanges();
-            if (isNotUndefined(fileList) && fileList.length > 0) {
-              fileList.forEach((file) => {
-                this.fileList.push(file);
-                this.fileIndexes.push(file.uuid);
-                this.fileNames.push(this.getFileName(configMetadataForm, file));
-              });
-            }
-
-            this.changeDetectorRef.detectChanges();
-          }
-        )
+        .subscribe(([configMetadataForm, { primary, files }]: [SubmissionFormsModel, WorkspaceitemSectionUploadObject]) => {
+          this.primaryBitstreamUUID = primary;
+          this.fileList = files;
+          this.fileNames = Array.from(files, file => this.getFileName(configMetadataForm, file));
+        },
+        ),
     );
   }
 
diff --git a/src/app/submission/sections/upload/section-upload.service.spec.ts b/src/app/submission/sections/upload/section-upload.service.spec.ts
new file mode 100644
index 0000000000..c57aac0ac9
--- /dev/null
+++ b/src/app/submission/sections/upload/section-upload.service.spec.ts
@@ -0,0 +1,70 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  Store,
+  StoreModule,
+} from '@ngrx/store';
+import { JsonPatchOperationPathCombiner } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder';
+
+import { SectionUploadService } from './section-upload.service';
+
+const jsonPatchOpBuilder: any = jasmine.createSpyObj('jsonPatchOpBuilder', {
+  add: jasmine.createSpy('add'),
+  replace: jasmine.createSpy('replace'),
+  remove: jasmine.createSpy('remove'),
+});
+
+describe('SectionUploadService test suite', () => {
+  let sectionUploadService: SectionUploadService;
+  let operationsBuilder: any;
+  const pathCombiner = new JsonPatchOperationPathCombiner('sections', 'upload');
+  const primaryPath = pathCombiner.getPath('primary');
+  const fileId = 'test';
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [StoreModule],
+      providers: [
+        { provide: Store, useValue: {} },
+        SectionUploadService,
+        { provide: JsonPatchOperationsBuilder, useValue: jsonPatchOpBuilder },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    });
+  }));
+
+  beforeEach(() => {
+    sectionUploadService = TestBed.inject(SectionUploadService);
+    operationsBuilder = TestBed.inject(JsonPatchOperationsBuilder);
+  });
+
+  [
+    {
+      initialPrimary: null,
+      primary: true,
+      operationName: 'add',
+      expected: [primaryPath, fileId, false, true],
+    },
+    {
+      initialPrimary: true,
+      primary: false,
+      operationName: 'remove',
+      expected: [primaryPath],
+    },
+    {
+      initialPrimary: false,
+      primary: true,
+      operationName: 'replace',
+      expected: [primaryPath,  fileId, true],
+    },
+  ].forEach(({ initialPrimary, primary, operationName, expected }) => {
+    it(`updatePrimaryBitstreamOperation should add ${operationName} operation`, () => {
+      const path = pathCombiner.getPath('primary');
+      sectionUploadService.updatePrimaryBitstreamOperation(path, initialPrimary, primary, fileId);
+      expect(operationsBuilder[operationName]).toHaveBeenCalledWith(...expected);
+    });
+  });
+});
diff --git a/src/app/submission/sections/upload/section-upload.service.ts b/src/app/submission/sections/upload/section-upload.service.ts
index a851fa9daf..152d4e174a 100644
--- a/src/app/submission/sections/upload/section-upload.service.ts
+++ b/src/app/submission/sections/upload/section-upload.service.ts
@@ -1,18 +1,29 @@
 import { Injectable } from '@angular/core';
-
-import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, map } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
+import { Observable } from 'rxjs';
+import {
+  distinctUntilChanged,
+  filter,
+  map,
+} from 'rxjs/operators';
+import { JsonPatchOperationPathObject } from 'src/app/core/json-patch/builder/json-patch-operation-path-combiner';
+import { JsonPatchOperationsBuilder } from 'src/app/core/json-patch/builder/json-patch-operations-builder';
+import { WorkspaceitemSectionUploadObject } from 'src/app/core/submission/models/workspaceitem-section-upload.model';
 
-import { SubmissionState } from '../../submission.reducers';
+import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
+import { isUndefined } from '../../../shared/empty.util';
 import {
   DeleteUploadedFileAction,
   EditFileDataAction,
-  NewUploadedFileAction
+  EditFilePrimaryBitstreamAction,
+  NewUploadedFileAction,
 } from '../../objects/submission-objects.actions';
-import { submissionUploadedFileFromUuidSelector, submissionUploadedFilesFromIdSelector } from '../../selectors';
-import { isUndefined } from '../../../shared/empty.util';
-import { WorkspaceitemSectionUploadFileObject } from '../../../core/submission/models/workspaceitem-section-upload-file.model';
+import {
+  submissionSectionDataFromIdSelector,
+  submissionUploadedFileFromUuidSelector,
+  submissionUploadedFilesFromIdSelector,
+} from '../../selectors';
+import { SubmissionState } from '../../submission.reducers';
 
 /**
  * A service that provides methods to handle submission's bitstream state.
@@ -24,8 +35,53 @@ export class SectionUploadService {
    * Initialize service variables
    *
    * @param {Store<SubmissionState>} store
+   * @param {JsonPatchOperationsBuilder} operationsBuilder
    */
-  constructor(private store: Store<SubmissionState>) {}
+  constructor(private store: Store<SubmissionState>, private operationsBuilder: JsonPatchOperationsBuilder) {}
+
+  /**
+   * Define and add an operation based on a change
+   *
+   * @param path
+   *    The path to endpoint
+   * @param intitialPrimary
+   *    The initial primary indicator
+   * @param primary
+   *    the new primary indicator
+    * @param fileId
+   *    The file id
+   * @returns {void}
+   */
+  public updatePrimaryBitstreamOperation(path: JsonPatchOperationPathObject, intitialPrimary: boolean | null, primary: boolean | null, fileId: string): void {
+    if (intitialPrimary === null && primary) {
+      this.operationsBuilder.add(path, fileId, false, true);
+      return;
+    }
+
+    if (intitialPrimary !== primary) {
+      if (primary) {
+        this.operationsBuilder.replace(path, fileId, true);
+        return;
+      }
+      this.operationsBuilder.remove(path);
+    }
+  }
+
+  /**
+   * Return submission's bitstream data from state
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @returns {WorkspaceitemSectionUploadObject}
+   *    Returns submission's bitstream data
+   */
+  public getUploadedFilesData(submissionId: string, sectionId: string): Observable<WorkspaceitemSectionUploadObject> {
+    return this.store.select(submissionSectionDataFromIdSelector(submissionId, sectionId)).pipe(
+      map((state) => state),
+      distinctUntilChanged());
+  }
 
   /**
    * Return submission's bitstream list from state
@@ -100,7 +156,23 @@ export class SectionUploadService {
    */
   public addUploadedFile(submissionId: string, sectionId: string, fileUUID: string, data: WorkspaceitemSectionUploadFileObject) {
     this.store.dispatch(
-      new NewUploadedFileAction(submissionId, sectionId, fileUUID, data)
+      new NewUploadedFileAction(submissionId, sectionId, fileUUID, data),
+    );
+  }
+
+  /**
+   * Update primary bitstream into the state
+   *
+   * @param submissionId
+   *    The submission id
+   * @param sectionId
+   *    The section id
+   * @param fileUUID
+   *    The bitstream UUID
+   */
+  public updateFilePrimaryBitstream(submissionId: string, sectionId: string, fileUUID: string | null) {
+    this.store.dispatch(
+      new EditFilePrimaryBitstreamAction(submissionId, sectionId, fileUUID),
     );
   }
 
@@ -118,7 +190,7 @@ export class SectionUploadService {
    */
   public updateFileData(submissionId: string, sectionId: string, fileUUID: string, data: WorkspaceitemSectionUploadFileObject) {
     this.store.dispatch(
-      new EditFileDataAction(submissionId, sectionId, fileUUID, data)
+      new EditFileDataAction(submissionId, sectionId, fileUUID, data),
     );
   }
 
@@ -134,7 +206,7 @@ export class SectionUploadService {
    */
   public removeUploadedFile(submissionId: string, sectionId: string, fileUUID: string) {
     this.store.dispatch(
-      new DeleteUploadedFileAction(submissionId, sectionId, fileUUID)
+      new DeleteUploadedFileAction(submissionId, sectionId, fileUUID),
     );
   }
 }
diff --git a/src/app/submission/sections/visibility-type.ts b/src/app/submission/sections/visibility-type.ts
new file mode 100644
index 0000000000..b2e167285c
--- /dev/null
+++ b/src/app/submission/sections/visibility-type.ts
@@ -0,0 +1,4 @@
+export enum VisibilityType {
+  HIDDEN = 'HIDDEN',
+  READONLY = 'READONLY',
+}
diff --git a/src/app/submission/selectors.ts b/src/app/submission/selectors.ts
index 6284aca892..432a5377a5 100644
--- a/src/app/submission/selectors.ts
+++ b/src/app/submission/selectors.ts
@@ -1,9 +1,16 @@
-import { createSelector, MemoizedSelector, Selector } from '@ngrx/store';
+import {
+  createSelector,
+  MemoizedSelector,
+  Selector,
+} from '@ngrx/store';
 
 import { hasValue } from '../shared/empty.util';
-import { submissionSelector, SubmissionState } from './submission.reducers';
-import { SubmissionObjectEntry} from './objects/submission-objects.reducer';
+import { SubmissionObjectEntry } from './objects/submission-objects.reducer';
 import { SubmissionSectionObject } from './objects/submission-section-object.model';
+import {
+  submissionSelector,
+  SubmissionState,
+} from './submission.reducers';
 
 /**
  * Export a function to return a subset of the state by key
diff --git a/src/app/submission/server-submission.service.ts b/src/app/submission/server-submission.service.ts
index 3aa55a9d58..993e38cdaa 100644
--- a/src/app/submission/server-submission.service.ts
+++ b/src/app/submission/server-submission.service.ts
@@ -1,10 +1,12 @@
 import { Injectable } from '@angular/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-import { Observable, of as observableOf } from 'rxjs';
-
-import { SubmissionService } from './submission.service';
-import { SubmissionObject } from '../core/submission/models/submission-object.model';
 import { RemoteData } from '../core/data/remote-data';
+import { SubmissionObject } from '../core/submission/models/submission-object.model';
+import { SubmissionService } from './submission.service';
 
 /**
  * Instance of SubmissionService used on SSR.
diff --git a/src/app/submission/submission.effects.ts b/src/app/submission/submission.effects.ts
index 30e01451d1..5a4105e4ab 100644
--- a/src/app/submission/submission.effects.ts
+++ b/src/app/submission/submission.effects.ts
@@ -1,5 +1,5 @@
 import { SubmissionObjectEffects } from './objects/submission-objects.effects';
 
 export const submissionEffects = [
-  SubmissionObjectEffects
+  SubmissionObjectEffects,
 ];
diff --git a/src/app/submission/submission.module.ts b/src/app/submission/submission.module.ts
index d1e8dfd44e..88c81bdee5 100644
--- a/src/app/submission/submission.module.ts
+++ b/src/app/submission/submission.module.ts
@@ -1,68 +1,74 @@
+import {
+  CommonModule,
+  NgOptimizedImage,
+} from '@angular/common';
 import { NgModule } from '@angular/core';
-import { CoreModule } from '../core/core.module';
-import { SharedModule } from '../shared/shared.module';
-
-import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
-import { SectionsDirective } from './sections/sections.directive';
-import { SectionsService } from './sections/sections.service';
-import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
-import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
-import { SubmissionFormComponent } from './form/submission-form.component';
-import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
-import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
-import { CommonModule } from '@angular/common';
-import { Action, StoreConfig, StoreModule } from '@ngrx/store';
+import {
+  NgbAccordionModule,
+  NgbCollapseModule,
+  NgbModalModule,
+} from '@ng-bootstrap/ng-bootstrap';
 import { EffectsModule } from '@ngrx/effects';
-import { submissionReducers, SubmissionState } from './submission.reducers';
-import { submissionEffects } from './submission.effects';
-import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
-import { SectionUploadService } from './sections/upload/section-upload.service';
-import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
-import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
-import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
-import { SubmissionEditComponent } from './edit/submission-edit.component';
-import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
 import {
-  SubmissionSectionUploadFileEditComponent
-} from './sections/upload/file/edit/section-upload-file-edit.component';
-import {
-  SubmissionSectionUploadFileViewComponent
-} from './sections/upload/file/view/section-upload-file-view.component';
-import {
-  SubmissionSectionUploadAccessConditionsComponent
-} from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
-import { SubmissionSubmitComponent } from './submit/submission-submit.component';
+  Action,
+  StoreConfig,
+  StoreModule,
+} from '@ngrx/store';
+
+import { LdnServicesService } from '../admin/admin-ldn-services/ldn-services-data/ldn-services-data.service';
 import { storeModuleConfig } from '../app.reducer';
-import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
-import {
-  SubmissionImportExternalSearchbarComponent
-} from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
-import {
-  SubmissionImportExternalPreviewComponent
-} from './import-external/import-external-preview/submission-import-external-preview.component';
-import {
-  SubmissionImportExternalCollectionComponent
-} from './import-external/import-external-collection/submission-import-external-collection.component';
-import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
+import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
+import { SubmissionUploadsConfigDataService } from '../core/config/submission-uploads-config-data.service';
+import { CoreModule } from '../core/core.module';
 import { JournalEntitiesModule } from '../entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from '../entity-groups/research-entities/research-entities.module';
-import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
-import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
-import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
 import { FormModule } from '../shared/form/form.module';
-import { NgbAccordionModule, NgbCollapseModule, NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import { SharedModule } from '../shared/shared.module';
+import { UploadModule } from '../shared/upload/upload.module';
+import { SubmissionEditComponent } from './edit/submission-edit.component';
+import { ThemedSubmissionEditComponent } from './edit/themed-submission-edit.component';
+import { SubmissionFormCollectionComponent } from './form/collection/submission-form-collection.component';
+import { SubmissionFormFooterComponent } from './form/footer/submission-form-footer.component';
+import { SubmissionFormSectionAddComponent } from './form/section-add/submission-form-section-add.component';
+import { SubmissionFormComponent } from './form/submission-form.component';
+import { SubmissionUploadFilesComponent } from './form/submission-upload-files/submission-upload-files.component';
+import { SubmissionImportExternalCollectionComponent } from './import-external/import-external-collection/submission-import-external-collection.component';
+import { SubmissionImportExternalPreviewComponent } from './import-external/import-external-preview/submission-import-external-preview.component';
+import { SubmissionImportExternalSearchbarComponent } from './import-external/import-external-searchbar/submission-import-external-searchbar.component';
+import { SubmissionImportExternalComponent } from './import-external/submission-import-external.component';
+import { ThemedSubmissionImportExternalComponent } from './import-external/themed-submission-import-external.component';
 import { SubmissionSectionAccessesComponent } from './sections/accesses/section-accesses.component';
-import { SubmissionAccessesConfigDataService } from '../core/config/submission-accesses-config-data.service';
 import { SectionAccessesService } from './sections/accesses/section-accesses.service';
-import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
+import { SubmissionSectionCcLicensesComponent } from './sections/cc-license/submission-section-cc-licenses.component';
+import { SubmissionSectionContainerComponent } from './sections/container/section-container.component';
+import { SubmissionSectionDuplicatesComponent } from './sections/duplicates/section-duplicates.component';
+import { SubmissionSectionFormComponent } from './sections/form/section-form.component';
+import { SectionFormOperationsService } from './sections/form/section-form-operations.service';
+import { SubmissionSectionIdentifiersComponent } from './sections/identifiers/section-identifiers.component';
+import { SubmissionSectionLicenseComponent } from './sections/license/section-license.component';
+import { CoarNotifyConfigDataService } from './sections/section-coar-notify/coar-notify-config-data.service';
+import { SubmissionSectionCoarNotifyComponent } from './sections/section-coar-notify/section-coar-notify.component';
+import { SectionsDirective } from './sections/sections.directive';
+import { SectionsService } from './sections/sections.service';
 import { ContentAccordionComponent } from './sections/sherpa-policies/content-accordion/content-accordion.component';
+import { MetadataInformationComponent } from './sections/sherpa-policies/metadata-information/metadata-information.component';
+import { PublicationInformationComponent } from './sections/sherpa-policies/publication-information/publication-information.component';
 import { PublisherPolicyComponent } from './sections/sherpa-policies/publisher-policy/publisher-policy.component';
+import { SubmissionSectionSherpaPoliciesComponent } from './sections/sherpa-policies/section-sherpa-policies.component';
+import { SubmissionSectionUploadAccessConditionsComponent } from './sections/upload/accessConditions/submission-section-upload-access-conditions.component';
+import { SubmissionSectionUploadFileEditComponent } from './sections/upload/file/edit/section-upload-file-edit.component';
+import { SubmissionSectionUploadFileComponent } from './sections/upload/file/section-upload-file.component';
+import { ThemedSubmissionSectionUploadFileComponent } from './sections/upload/file/themed-section-upload-file.component';
+import { SubmissionSectionUploadFileViewComponent } from './sections/upload/file/view/section-upload-file-view.component';
+import { SubmissionSectionUploadComponent } from './sections/upload/section-upload.component';
+import { SectionUploadService } from './sections/upload/section-upload.service';
+import { submissionEffects } from './submission.effects';
 import {
-  PublicationInformationComponent
-} from './sections/sherpa-policies/publication-information/publication-information.component';
-import {
-  MetadataInformationComponent
-} from './sections/sherpa-policies/metadata-information/metadata-information.component';
+  submissionReducers,
+  SubmissionState,
+} from './submission.reducers';
+import { SubmissionSubmitComponent } from './submit/submission-submit.component';
+import { ThemedSubmissionSubmitComponent } from './submit/themed-submission-submit.component';
 
 const ENTRY_COMPONENTS = [
   // put only entry components that use custom decorator
@@ -72,6 +78,8 @@ const ENTRY_COMPONENTS = [
   SubmissionSectionCcLicensesComponent,
   SubmissionSectionAccessesComponent,
   SubmissionSectionSherpaPoliciesComponent,
+  SubmissionSectionCoarNotifyComponent,
+  SubmissionSectionDuplicatesComponent,
 ];
 
 const DECLARATIONS = [
@@ -91,6 +99,8 @@ const DECLARATIONS = [
   SubmissionSectionUploadFileComponent,
   SubmissionSectionUploadFileEditComponent,
   SubmissionSectionUploadFileViewComponent,
+  SubmissionSectionIdentifiersComponent,
+  SubmissionSectionDuplicatesComponent,
   SubmissionImportExternalComponent,
   ThemedSubmissionImportExternalComponent,
   SubmissionImportExternalSearchbarComponent,
@@ -100,6 +110,7 @@ const DECLARATIONS = [
   PublisherPolicyComponent,
   PublicationInformationComponent,
   MetadataInformationComponent,
+  ThemedSubmissionSectionUploadFileComponent,
 ];
 
 @NgModule({
@@ -108,23 +119,32 @@ const DECLARATIONS = [
     CoreModule.forRoot(),
     SharedModule,
     StoreModule.forFeature('submission', submissionReducers, storeModuleConfig as StoreConfig<SubmissionState, Action>),
+    EffectsModule.forFeature(),
     EffectsModule.forFeature(submissionEffects),
     JournalEntitiesModule.withEntryComponents(),
     ResearchEntitiesModule.withEntryComponents(),
     FormModule,
     NgbModalModule,
     NgbCollapseModule,
-    NgbAccordionModule
+    NgbAccordionModule,
+    UploadModule,
+    NgOptimizedImage,
   ],
   declarations: DECLARATIONS,
-  exports: DECLARATIONS,
+  exports: [
+    ...DECLARATIONS,
+    FormModule,
+  ],
   providers: [
     SectionUploadService,
     SectionsService,
     SubmissionUploadsConfigDataService,
     SubmissionAccessesConfigDataService,
     SectionAccessesService,
-  ]
+    SectionFormOperationsService,
+    CoarNotifyConfigDataService,
+    LdnServicesService,
+  ],
 })
 
 /**
@@ -138,7 +158,7 @@ export class SubmissionModule {
   static withEntryComponents() {
     return {
       ngModule: SubmissionModule,
-      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+      providers: ENTRY_COMPONENTS.map((component) => ({ provide: component })),
     };
   }
 }
diff --git a/src/app/submission/submission.reducers.ts b/src/app/submission/submission.reducers.ts
index 8d98a7d5c1..23cacbf13f 100644
--- a/src/app/submission/submission.reducers.ts
+++ b/src/app/submission/submission.reducers.ts
@@ -1,8 +1,11 @@
-import { ActionReducerMap, createFeatureSelector } from '@ngrx/store';
+import {
+  ActionReducerMap,
+  createFeatureSelector,
+} from '@ngrx/store';
 
 import {
   submissionObjectReducer,
-  SubmissionObjectState
+  SubmissionObjectState,
 } from './objects/submission-objects.reducer';
 
 /**
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index 1e2be5b612..0ba8e5d9a2 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -1,25 +1,57 @@
-import { StoreModule } from '@ngrx/store';
-import { fakeAsync, flush, TestBed, tick, waitForAsync } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
 import { HttpHeaders } from '@angular/common/http';
-
-import { of as observableOf, throwError as observableThrowError } from 'rxjs';
+import {
+  fakeAsync,
+  flush,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { StoreModule } from '@ngrx/store';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  cold,
+  getTestScheduler,
+  hot,
+} from 'jasmine-marbles';
+import {
+  of as observableOf,
+  throwError as observableThrowError,
+} from 'rxjs';
 import { TestScheduler } from 'rxjs/testing';
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { cold, getTestScheduler, hot, } from 'jasmine-marbles';
 
-import { RouterMock } from '../shared/mocks/router.mock';
-import { SubmissionService } from './submission.service';
-import { submissionReducers } from './submission.reducers';
-import { SubmissionRestService } from '../core/submission/submission-rest.service';
-import { RouteService } from '../core/services/route.service';
-import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
-import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { environment } from '../../environments/environment';
+import { storeModuleConfig } from '../app.reducer';
+import { ErrorResponse } from '../core/cache/response.models';
+import { RequestService } from '../core/data/request.service';
+import { RequestError } from '../core/data/request-error.model';
 import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
+import { RouteService } from '../core/services/route.service';
+import { Item } from '../core/shared/item.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
+import { SubmissionRestService } from '../core/submission/submission-rest.service';
 import { SubmissionScopeType } from '../core/submission/submission-scope-type';
-import { mockSubmissionDefinition, mockSubmissionRestResponse } from '../shared/mocks/submission.mock';
-import { NotificationsService } from '../shared/notifications/notifications.service';
+import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { getMockRequestService } from '../shared/mocks/request.service.mock';
+import { RouterMock } from '../shared/mocks/router.mock';
+import { getMockSearchService } from '../shared/mocks/search-service.mock';
+import {
+  mockSubmissionDefinition,
+  mockSubmissionRestResponse,
+} from '../shared/mocks/submission.mock';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { createFailedRemoteDataObject } from '../shared/remote-data.utils';
+import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
+import { SubmissionRestServiceStub } from '../shared/testing/submission-rest-service.stub';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -30,18 +62,10 @@ import {
   SaveForLaterSubmissionFormAction,
   SaveSubmissionFormAction,
   SaveSubmissionSectionFormAction,
-  SetActiveSectionAction
+  SetActiveSectionAction,
 } from './objects/submission-objects.actions';
-import { createFailedRemoteDataObject, } from '../shared/remote-data.utils';
-import { getMockSearchService } from '../shared/mocks/search-service.mock';
-import { getMockRequestService } from '../shared/mocks/request.service.mock';
-import { RequestService } from '../core/data/request.service';
-import { SearchService } from '../core/shared/search/search.service';
-import { Item } from '../core/shared/item.model';
-import { storeModuleConfig } from '../app.reducer';
-import { environment } from '../../environments/environment';
-import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
-import { SubmissionJsonPatchOperationsServiceStub } from '../shared/testing/submission-json-patch-operations-service.stub';
+import { submissionReducers } from './submission.reducers';
+import { SubmissionService } from './submission.service';
 
 describe('SubmissionService test suite', () => {
   const collectionId = '43fe1f8c-09a6-4fcf-9c78-5d4fed8f2c8f';
@@ -61,7 +85,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -69,7 +93,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           collection: {
             config: '',
@@ -77,7 +101,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -85,7 +109,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           keyinformation: {
             header: 'submit.progressbar.describe.keyinformation',
@@ -98,7 +122,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           indexing: {
             header: 'submit.progressbar.describe.indexing',
@@ -111,7 +135,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           publicationchannel: {
             header: 'submit.progressbar.describe.publicationchannel',
@@ -124,7 +148,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           acknowledgement: {
             header: 'submit.progressbar.describe.acknowledgement',
@@ -137,7 +161,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           identifiers: {
             header: 'submit.progressbar.describe.identifiers',
@@ -150,7 +174,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           references: {
             header: 'submit.progressbar.describe.references',
@@ -163,7 +187,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           upload: {
             header: 'submit.progressbar.upload',
@@ -176,7 +200,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           license: {
             header: 'submit.progressbar.license',
@@ -185,7 +209,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'license',
             visibility: {
               main: null,
-              other: 'READONLY'
+              other: 'READONLY',
             },
             collapsed: false,
             enabled: true,
@@ -193,14 +217,14 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
-          }
+            isValid: false,
+          },
         },
         isLoading: false,
         savePending: false,
-        depositPending: false
-      }
-    }
+        depositPending: false,
+      },
+    },
   };
   const validSubState = {
     objects: {
@@ -216,7 +240,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'utils',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -224,7 +248,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           collection: {
             config: '',
@@ -232,7 +256,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'collection',
             visibility: {
               main: 'HIDDEN',
-              other: 'HIDDEN'
+              other: 'HIDDEN',
             },
             collapsed: false,
             enabled: true,
@@ -240,7 +264,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           keyinformation: {
             header: 'submit.progressbar.describe.keyinformation',
@@ -253,7 +277,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           indexing: {
             header: 'submit.progressbar.describe.indexing',
@@ -266,7 +290,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           publicationchannel: {
             header: 'submit.progressbar.describe.publicationchannel',
@@ -279,7 +303,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           acknowledgement: {
             header: 'submit.progressbar.describe.acknowledgement',
@@ -292,7 +316,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           identifiers: {
             header: 'submit.progressbar.describe.identifiers',
@@ -305,7 +329,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           references: {
             header: 'submit.progressbar.describe.references',
@@ -318,7 +342,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: false
+            isValid: false,
           },
           upload: {
             header: 'submit.progressbar.upload',
@@ -331,7 +355,7 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
+            isValid: true,
           },
           license: {
             header: 'submit.progressbar.license',
@@ -340,7 +364,7 @@ describe('SubmissionService test suite', () => {
             sectionType: 'license',
             visibility: {
               main: null,
-              other: 'READONLY'
+              other: 'READONLY',
             },
             collapsed: false,
             enabled: true,
@@ -348,14 +372,14 @@ describe('SubmissionService test suite', () => {
             errorsToShow: [],
             serverValidationErrors: [],
             isLoading: false,
-            isValid: true
-          }
+            isValid: true,
+          },
         },
         isLoading: false,
         savePending: false,
-        depositPending: false
-      }
-    }
+        depositPending: false,
+      },
+    },
   };
   const restService = new SubmissionRestServiceStub();
   const router = new RouterMock();
@@ -378,9 +402,9 @@ describe('SubmissionService test suite', () => {
         TranslateModule.forRoot({
           loader: {
             provide: TranslateLoader,
-            useClass: TranslateLoaderMock
-          }
-        })
+            useClass: TranslateLoaderMock,
+          },
+        }),
       ],
       providers: [
         { provide: Router, useValue: router },
@@ -392,8 +416,8 @@ describe('SubmissionService test suite', () => {
         NotificationsService,
         RouteService,
         SubmissionService,
-        TranslateService
-      ]
+        TranslateService,
+      ],
     }).compileComponents();
   }));
 
@@ -470,7 +494,7 @@ describe('SubmissionService test suite', () => {
         submissionDefinition,
         {},
         new Item(),
-        null
+        null,
       );
       const expected = new InitSubmissionFormAction(
         collectionId,
@@ -487,7 +511,7 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchDeposit', () => {
     it('should dispatch a new SaveAndDepositSubmissionAction', () => {
-      service.dispatchDeposit(submissionId,);
+      service.dispatchDeposit(submissionId);
       const expected = new SaveAndDepositSubmissionAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -496,7 +520,7 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchDiscard', () => {
     it('should dispatch a new DiscardSubmissionAction', () => {
-      service.dispatchDiscard(submissionId,);
+      service.dispatchDiscard(submissionId);
       const expected = new DiscardSubmissionAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -521,7 +545,7 @@ describe('SubmissionService test suite', () => {
 
   describe('dispatchSaveForLater', () => {
     it('should dispatch a new SaveForLaterSubmissionFormAction', () => {
-      service.dispatchSaveForLater(submissionId,);
+      service.dispatchSaveForLater(submissionId);
       const expected = new SaveForLaterSubmissionFormAction(submissionId);
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -540,7 +564,7 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionObject', () => {
     it('should return submission object state from the store', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionObject('826');
@@ -553,7 +577,7 @@ describe('SubmissionService test suite', () => {
   describe('getActiveSectionId', () => {
     it('should return current active submission form section', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getActiveSectionId('826');
@@ -567,7 +591,7 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionSections', () => {
     it('should return submission form sections', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('a|', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionSections('826');
@@ -583,7 +607,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.indexing',
@@ -593,7 +617,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.publicationchannel',
@@ -603,7 +627,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.acknowledgement',
@@ -613,7 +637,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.identifiers',
@@ -623,7 +647,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.describe.references',
@@ -633,7 +657,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'submission-form',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.upload',
@@ -643,7 +667,7 @@ describe('SubmissionService test suite', () => {
               sectionType: 'upload',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
+              serverValidationErrors: [],
             },
             {
               header: 'submit.progressbar.license',
@@ -653,9 +677,9 @@ describe('SubmissionService test suite', () => {
               sectionType: 'license',
               data: {},
               errorsToShow: [],
-              serverValidationErrors: []
-            }
-          ]
+              serverValidationErrors: [],
+            },
+          ],
       });
 
       expect(result).toBeObservable(expected);
@@ -665,7 +689,7 @@ describe('SubmissionService test suite', () => {
   describe('getDisabledSectionsList', () => {
     it('should return list of submission disabled sections', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a|', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getDisabledSectionsList('826');
@@ -688,8 +712,8 @@ describe('SubmissionService test suite', () => {
             {
               header: 'submit.progressbar.describe.references',
               id: 'references',
-            }
-          ]
+            },
+          ],
       });
 
       expect(result).toBeObservable(expected);
@@ -737,12 +761,12 @@ describe('SubmissionService test suite', () => {
     it('should return properly submission status', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a-b', {
         a: subState,
-        b: validSubState
+        b: validSubState,
       }));
       const result = service.getSubmissionStatus('826');
       const expected = cold('cc-d', {
         c: false,
-        d: true
+        d: true,
       });
 
       expect(result).toBeObservable(expected);
@@ -752,12 +776,12 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionSaveProcessingStatus', () => {
     it('should return submission save processing status', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionSaveProcessingStatus('826');
       const expected = cold('bb', {
-        b: false
+        b: false,
       });
 
       expect(result).toBeObservable(expected);
@@ -767,12 +791,12 @@ describe('SubmissionService test suite', () => {
   describe('getSubmissionDepositProcessingStatus', () => {
     it('should return submission deposit processing status', () => {
       spyOn((service as any).store, 'select').and.returnValue(hot('-a', {
-        a: subState.objects[826]
+        a: subState.objects[826],
       }));
 
       const result = service.getSubmissionDepositProcessingStatus('826');
       const expected = cold('bb', {
-        b: false
+        b: false,
       });
 
       expect(result).toBeObservable(expected);
@@ -802,7 +826,7 @@ describe('SubmissionService test suite', () => {
         sectionType: 'collection' as any,
         visibility: {
           main: 'HIDDEN',
-          other: 'HIDDEN'
+          other: 'HIDDEN',
         },
         collapsed: false,
         enabled: true,
@@ -810,7 +834,7 @@ describe('SubmissionService test suite', () => {
         errorsToShow: [],
         serverValidationErrors: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       };
       expect(service.isSectionHidden(section)).toBeTruthy();
 
@@ -825,7 +849,7 @@ describe('SubmissionService test suite', () => {
         errorsToShow: [],
         serverValidationErrors: [],
         isLoading: false,
-        isValid: false
+        isValid: false,
       };
       expect(service.isSectionHidden(section)).toBeFalsy();
     });
@@ -836,7 +860,7 @@ describe('SubmissionService test suite', () => {
       const spy = spyOn(service, 'getSubmissionObject').and.returnValue(observableOf({ isLoading: true }));
 
       let expected = cold('(b|)', {
-        b: true
+        b: true,
       });
 
       expect(service.isSubmissionLoading(submissionId)).toBeObservable(expected);
@@ -844,7 +868,7 @@ describe('SubmissionService test suite', () => {
       spy.and.returnValue(observableOf({ isLoading: false }));
 
       expected = cold('(b|)', {
-        b: false
+        b: false,
       });
 
       expect(service.isSubmissionLoading(submissionId)).toBeObservable(expected);
@@ -906,7 +930,7 @@ describe('SubmissionService test suite', () => {
         selfUrl,
         submissionDefinition,
         {},
-        new Item()
+        new Item(),
       )
       ;
       const expected = new ResetSubmissionFormAction(
@@ -915,7 +939,7 @@ describe('SubmissionService test suite', () => {
         selfUrl,
         {},
         submissionDefinition,
-        new Item()
+        new Item(),
       );
 
       expect((service as any).store.dispatch).toHaveBeenCalledWith(expected);
@@ -925,23 +949,24 @@ describe('SubmissionService test suite', () => {
   describe('retrieveSubmission', () => {
     it('should retrieve submission from REST endpoint', () => {
       (service as any).restService.getDataById.and.returnValue(hot('a|', {
-        a: mockSubmissionRestResponse
+        a: mockSubmissionRestResponse,
       }));
 
       const result = service.retrieveSubmission('826');
       const expected = cold('(b|)', {
-        b: jasmine.objectContaining({ payload: mockSubmissionRestResponse[0] })
+        b: jasmine.objectContaining({ payload: mockSubmissionRestResponse[0] }),
       });
 
       expect(result).toBeObservable(expected);
     });
 
     it('should catch error from REST endpoint', () => {
+      const requestError = new RequestError('Internal Server Error');
+      requestError.statusCode = 500;
+      const errorResponse = new ErrorResponse(requestError);
+
       (service as any).restService.getDataById.and.callFake(
-        () => observableThrowError({
-          statusCode: 500,
-          errorMessage: 'Internal Server Error',
-        })
+        () => observableThrowError(errorResponse),
       );
 
       service.retrieveSubmission('826').subscribe((r) => {
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index 9eb8cf110a..312d74bc8a 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -1,14 +1,51 @@
-import { Injectable } from '@angular/core';
 import { HttpHeaders } from '@angular/common/http';
+import { Injectable } from '@angular/core';
 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 { TranslateService } from '@ngx-translate/core';
+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 { submissionSelector, SubmissionState } from './submission.reducers';
-import { hasValue, isEmpty, isNotUndefined } from '../shared/empty.util';
+import { environment } from '../../environments/environment';
+import { ErrorResponse } from '../core/cache/response.models';
+import { SubmissionDefinitionsModel } from '../core/config/models/config-submission-definitions.model';
+import { RemoteData } from '../core/data/remote-data';
+import { RequestService } from '../core/data/request.service';
+import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
+import { RouteService } from '../core/services/route.service';
+import { Item } from '../core/shared/item.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SubmissionObject } from '../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model';
+import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
+import { SubmissionRestService } from '../core/submission/submission-rest.service';
+import { SubmissionScopeType } from '../core/submission/submission-scope-type';
+import {
+  hasValue,
+  isEmpty,
+  isNotUndefined,
+} from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject,
+} from '../shared/remote-data.utils';
+import { SubmissionError } from './objects/submission-error.model';
 import {
   CancelSubmissionFormAction,
   ChangeSubmissionCollectionAction,
@@ -19,33 +56,20 @@ import {
   SaveForLaterSubmissionFormAction,
   SaveSubmissionFormAction,
   SaveSubmissionSectionFormAction,
-  SetActiveSectionAction
+  SetActiveSectionAction,
 } from './objects/submission-objects.actions';
 import {
   SubmissionObjectEntry,
-  SubmissionSectionEntry
+  SubmissionSectionEntry,
 } from './objects/submission-objects.reducer';
-import { submissionObjectFromIdSelector } from './selectors';
-import { HttpOptions } from '../core/dspace-rest/dspace-rest.service';
-import { SubmissionRestService } from '../core/submission/submission-rest.service';
-import { SectionDataObject } from './sections/models/section-data.model';
-import { SubmissionScopeType } from '../core/submission/submission-scope-type';
-import { SubmissionObject } from '../core/submission/models/submission-object.model';
-import { RouteService } from '../core/services/route.service';
-import { SectionsType } from './sections/sections-type';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { SubmissionDefinitionsModel } from '../core/config/models/config-submission-definitions.model';
-import { WorkspaceitemSectionsObject } from '../core/submission/models/workspaceitem-sections.model';
-import { RemoteData } from '../core/data/remote-data';
-import { ErrorResponse } from '../core/cache/response.models';
-import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
-import { RequestService } from '../core/data/request.service';
-import { SearchService } from '../core/shared/search/search.service';
-import { Item } from '../core/shared/item.model';
-import { environment } from '../../environments/environment';
-import { SubmissionJsonPatchOperationsService } from '../core/submission/submission-json-patch-operations.service';
 import { SubmissionSectionObject } from './objects/submission-section-object.model';
-import { SubmissionError } from './objects/submission-error.model';
+import { SectionDataObject } from './sections/models/section-data.model';
+import { SectionsType } from './sections/sections-type';
+import { submissionObjectFromIdSelector } from './selectors';
+import {
+  submissionSelector,
+  SubmissionState,
+} from './submission.reducers';
 
 /**
  * A service that provides methods used in submission process.
@@ -217,7 +241,7 @@ export class SubmissionService {
    */
   dispatchSave(submissionId, manual?: boolean) {
     this.getSubmissionSaveProcessingStatus(submissionId).pipe(
-      find((isPending: boolean) => !isPending)
+      find((isPending: boolean) => !isPending),
     ).subscribe(() => {
       this.store.dispatch(new SaveSubmissionFormAction(submissionId, manual));
     });
@@ -505,7 +529,7 @@ export class SubmissionService {
             } else {
               this.router.navigateByUrl(previousUrl);
             }
-        })))
+          }))),
     ).subscribe();
   }
 
@@ -536,7 +560,7 @@ export class SubmissionService {
     selfUrl: string,
     submissionDefinition: SubmissionDefinitionsModel,
     sections: WorkspaceitemSectionsObject,
-    item: Item
+    item: Item,
   ) {
     this.store.dispatch(new ResetSubmissionFormAction(collectionId, submissionId, selfUrl, sections, submissionDefinition, item));
   }
@@ -552,9 +576,11 @@ export class SubmissionService {
       find((submissionObjects: SubmissionObject[]) => isNotUndefined(submissionObjects)),
       map((submissionObjects: SubmissionObject[]) => createSuccessfulRemoteDataObject(
         submissionObjects[0])),
-      catchError((errorResponse: ErrorResponse) => {
-        return createFailedRemoteDataObject$<SubmissionObject>(errorResponse.errorMessage, errorResponse.statusCode);
-      })
+      catchError((errorResponse: unknown) => {
+        if (errorResponse instanceof ErrorResponse) {
+          return createFailedRemoteDataObject$<SubmissionObject>(errorResponse.errorMessage, errorResponse.statusCode);
+        }
+      }),
     );
   }
 
diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts
index 1b76082d1b..6b44714ff8 100644
--- a/src/app/submission/submit/submission-submit.component.spec.ts
+++ b/src/app/submission/submit/submission-submit.component.spec.ts
@@ -1,22 +1,34 @@
-import { waitForAsync, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
+import {
+  NO_ERRORS_SCHEMA,
+  ViewContainerRef,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
-import { ActivatedRoute, Router } from '@angular/router';
-import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core';
-
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { TranslateModule, TranslateService } from '@ngx-translate/core';
 
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { SubmissionService } from '../submission.service';
-import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
-import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
-import { SubmissionSubmitComponent } from './submission-submit.component';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
 import { ItemDataService } from '../../core/data/item-data.service';
+import { mockSubmissionObject } from '../../shared/mocks/submission.mock';
+import { getMockTranslateService } from '../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { SubmissionServiceStub } from '../../shared/testing/submission-service.stub';
+import { SubmissionService } from '../submission.service';
+import { SubmissionSubmitComponent } from './submission-submit.component';
 
 describe('SubmissionSubmitComponent Component', () => {
 
@@ -37,7 +49,7 @@ describe('SubmissionSubmitComponent Component', () => {
         TranslateModule.forRoot(),
         RouterTestingModule.withRoutes([
           { path: '', component: SubmissionSubmitComponent, pathMatch: 'full' },
-        ])
+        ]),
       ],
       declarations: [SubmissionSubmitComponent],
       providers: [
@@ -47,9 +59,9 @@ describe('SubmissionSubmitComponent Component', () => {
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Router, useValue: new RouterStub() },
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
-        ViewContainerRef
+        ViewContainerRef,
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     }).compileComponents();
   }));
 
@@ -78,11 +90,11 @@ describe('SubmissionSubmitComponent Component', () => {
 
   it('should redirect to workspaceitem edit when a not empty SubmissionObject has been retrieved',() => {
 
-    submissionServiceStub.createSubmission.and.returnValue(observableOf({ id: '1234'}));
+    submissionServiceStub.createSubmission.and.returnValue(observableOf({ id: '1234' }));
 
     fixture.detectChanges();
 
-    expect(router.navigate).toHaveBeenCalledWith(['/workspaceitems', '1234', 'edit'], { replaceUrl: true});
+    expect(router.navigate).toHaveBeenCalledWith(['/workspaceitems', '1234', 'edit'], { replaceUrl: true });
 
   });
 
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index a66d1e4656..c76d90a5bc 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -1,20 +1,39 @@
-import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-
-import { BehaviorSubject, Subscription } from 'rxjs';
-import { debounceTime, switchMap } from 'rxjs/operators';
+import {
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit,
+  ViewContainerRef,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  Subscription,
+} from 'rxjs';
+import {
+  debounceTime,
+  switchMap,
+} from 'rxjs/operators';
 
-import { hasValue, isEmpty, isNotEmptyOperator, isNotNull } from '../../shared/empty.util';
 import { SubmissionDefinitionsModel } from '../../core/config/models/config-submission-definitions.model';
+import { ItemDataService } from '../../core/data/item-data.service';
+import { RemoteData } from '../../core/data/remote-data';
+import { Item } from '../../core/shared/item.model';
+import { getAllSucceededRemoteData } from '../../core/shared/operators';
+import { SubmissionObject } from '../../core/submission/models/submission-object.model';
+import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
+import {
+  hasValue,
+  isEmpty,
+  isNotEmptyOperator,
+  isNotNull,
+} from '../../shared/empty.util';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { SubmissionService } from '../submission.service';
-import { SubmissionObject } from '../../core/submission/models/submission-object.model';
-import { Item } from '../../core/shared/item.model';
-import { WorkspaceitemSectionsObject } from '../../core/submission/models/workspaceitem-sections.model';
-import { getAllSucceededRemoteData } from '../../core/shared/operators';
-import { RemoteData } from '../../core/data/remote-data';
-import { ItemDataService } from '../../core/data/item-data.service';
 
 /**
  * This component allows to submit a new workspaceitem.
@@ -22,7 +41,7 @@ import { ItemDataService } from '../../core/data/item-data.service';
 @Component({
   selector: 'ds-submission-submit',
   styleUrls: ['./submission-submit.component.scss'],
-  templateUrl: './submission-submit.component.html'
+  templateUrl: './submission-submit.component.html',
 })
 export class SubmissionSubmitComponent implements OnDestroy, OnInit {
 
@@ -120,14 +139,14 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
               this.notificationsService.info(null, this.translate.get('submission.general.cannot_submit'));
               this.router.navigate(['/mydspace']);
             } else {
-              this.router.navigate(['/workspaceitems', submissionObject.id, 'edit'], { replaceUrl: true});
+              this.router.navigate(['/workspaceitems', submissionObject.id, 'edit'], { replaceUrl: true });
             }
           }
         }),
       this.itemLink$.pipe(
         isNotEmptyOperator(),
         switchMap((itemLink: string) =>
-          this.itemDataService.findByHref(itemLink)
+          this.itemDataService.findByHref(itemLink),
         ),
         getAllSucceededRemoteData(),
         // Multiple sources can update the item in quick succession.
@@ -136,7 +155,7 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
       ).subscribe((itemRd: RemoteData<Item>) => {
         this.item = itemRd.payload;
         this.changeDetectorRef.detectChanges();
-      })
+      }),
     );
   }
 
diff --git a/src/app/submission/submit/themed-submission-submit.component.ts b/src/app/submission/submit/themed-submission-submit.component.ts
index 328113252f..6ea3eb9690 100644
--- a/src/app/submission/submit/themed-submission-submit.component.ts
+++ b/src/app/submission/submit/themed-submission-submit.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { SubmissionSubmitComponent } from './submission-submit.component';
 
@@ -8,7 +9,7 @@ import { SubmissionSubmitComponent } from './submission-submit.component';
 @Component({
   selector: 'ds-themed-submission-submit',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedSubmissionSubmitComponent extends ThemedComponent<SubmissionSubmitComponent> {
   protected getComponentName(): string {
diff --git a/src/app/submission/utils/parseSectionErrorPaths.ts b/src/app/submission/utils/parseSectionErrorPaths.ts
index 4c973dedcf..b6c818f919 100644
--- a/src/app/submission/utils/parseSectionErrorPaths.ts
+++ b/src/app/submission/utils/parseSectionErrorPaths.ts
@@ -39,21 +39,21 @@ const parseSectionErrorPaths = (path: string | string[]): SectionErrorPath[] =>
   const paths = typeof path === 'string' ? [path] : path;
 
   return paths.map((item) => {
-      if (item.match(regex) && item.match(regex).length > 2) {
-        return {
-          sectionId: item.match(regex)[1],
-          fieldId: item.match(regex)[2],
-          fieldIndex: hasValue(item.match(regex)[3]) ? +item.match(regex)[3] : 0,
-          originalPath: item,
-        };
-      } else {
-        return {
-          sectionId: item.match(regexShort)[1],
-          originalPath: item,
-        };
-      }
-
+    if (item.match(regex) && item.match(regex).length > 2) {
+      return {
+        sectionId: item.match(regex)[1],
+        fieldId: item.match(regex)[2],
+        fieldIndex: hasValue(item.match(regex)[3]) ? +item.match(regex)[3] : 0,
+        originalPath: item,
+      };
+    } else {
+      return {
+        sectionId: item.match(regexShort)[1],
+        originalPath: item,
+      };
     }
+
+  },
   );
 };
 
diff --git a/src/app/submission/utils/parseSectionErrors.ts b/src/app/submission/utils/parseSectionErrors.ts
index 5f2867c8b8..e2e405915d 100644
--- a/src/app/submission/utils/parseSectionErrors.ts
+++ b/src/app/submission/utils/parseSectionErrors.ts
@@ -1,5 +1,8 @@
 import { SubmissionObjectError } from '../../core/submission/models/submission-object.model';
-import { default as parseSectionErrorPaths, SectionErrorPath } from './parseSectionErrorPaths';
+import {
+  default as parseSectionErrorPaths,
+  SectionErrorPath,
+} from './parseSectionErrorPaths';
 
 /**
  * the following method accept an array of SubmissionObjectError and return a section errors object
@@ -13,7 +16,7 @@ const parseSectionErrors = (errors: SubmissionObjectError[] = []): any => {
     const paths: SectionErrorPath[] = parseSectionErrorPaths(error.paths);
 
     paths.forEach((path: SectionErrorPath) => {
-      const sectionError = {path: path.originalPath, message: error.message};
+      const sectionError = { path: path.originalPath, message: error.message };
       if (!errorsList[path.sectionId]) {
         errorsList[path.sectionId] = [];
       }
diff --git a/src/app/submit-page/submit-page-routing.module.ts b/src/app/submit-page/submit-page-routing.module.ts
index 1572580b6a..b7e6d3e6f5 100644
--- a/src/app/submit-page/submit-page-routing.module.ts
+++ b/src/app/submit-page/submit-page-routing.module.ts
@@ -2,8 +2,8 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component';
 
 @NgModule({
   imports: [
@@ -14,12 +14,12 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
         pathMatch: 'full',
         component: ThemedSubmissionSubmitComponent,
         resolve: {
-          breadcrumb: I18nBreadcrumbResolver
+          breadcrumb: I18nBreadcrumbResolver,
         },
-        data: { title: 'submission.submit.title', breadcrumbKey: 'submission.submit' }
-      }
-    ])
-  ]
+        data: { title: 'submission.submit.title', breadcrumbKey: 'submission.submit' },
+      },
+    ]),
+  ],
 })
 /**
  * This module defines the default component to load when navigating to the submit page path.
diff --git a/src/app/submit-page/submit-page.module.ts b/src/app/submit-page/submit-page.module.ts
index e43d9d36aa..f6428e47e8 100644
--- a/src/app/submit-page/submit-page.module.ts
+++ b/src/app/submit-page/submit-page.module.ts
@@ -1,8 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
+import { FormModule } from '../shared/form/form.module';
 import { SharedModule } from '../shared/shared.module';
-import { SubmitPageRoutingModule } from './submit-page-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
+import { SubmitPageRoutingModule } from './submit-page-routing.module';
 
 @NgModule({
   imports: [
@@ -10,6 +12,7 @@ import { SubmissionModule } from '../submission/submission.module';
     CommonModule,
     SharedModule,
     SubmissionModule,
+    FormModule,
   ],
 })
 /**
diff --git a/src/app/subscriptions-page/subscriptions-page-routing.module.ts b/src/app/subscriptions-page/subscriptions-page-routing.module.ts
new file mode 100644
index 0000000000..15600688e7
--- /dev/null
+++ b/src/app/subscriptions-page/subscriptions-page-routing.module.ts
@@ -0,0 +1,28 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { SubscriptionsPageComponent } from './subscriptions-page.component';
+import { SubscriptionsPageModule } from './subscriptions-page.module';
+
+
+@NgModule({
+  imports: [
+    SubscriptionsPageModule,
+    RouterModule.forChild([
+      {
+        path: '',
+        data: {
+          title: 'subscriptions.title',
+        },
+        children: [
+          {
+            path: '',
+            component: SubscriptionsPageComponent,
+          },
+        ],
+      },
+    ]),
+  ],
+})
+export class SubscriptionsPageRoutingModule {
+}
diff --git a/src/app/subscriptions-page/subscriptions-page.component.html b/src/app/subscriptions-page/subscriptions-page.component.html
new file mode 100644
index 0000000000..fcdaaaeace
--- /dev/null
+++ b/src/app/subscriptions-page/subscriptions-page.component.html
@@ -0,0 +1,47 @@
+<div class="container">
+  <div class="row">
+    <div class="col-md-12 m-40">
+      <h1>{{'subscriptions.title' | translate}}</h1>
+      <div class="row">
+        <div class="col-md-12 m-40">
+          <ds-themed-loading *ngIf="loading$ | async"></ds-themed-loading>
+          <ng-container *ngVar="(subscriptions$ | async) as subscriptions">
+
+            <ds-pagination *ngIf="subscriptions?.pageInfo?.totalElements > 0 && (loading$ | async) !== true"
+                           [paginationOptions]="config"
+                           [collectionSize]="subscriptions?.pageInfo?.totalElements"
+                           [hideGear]="true"
+                           [hidePagerWhenSinglePage]="true">
+              <div class="table-responsive">
+                <table id="formats" class="table table-striped table-hover" data-test="subscription-table">
+                  <thead>
+                    <tr>
+                      <th style="width: 50%" scope="col">{{'subscriptions.table.dso' | translate}}</th>
+                      <th scope="col">{{'subscriptions.table.subscription_type' | translate}}</th>
+                      <th scope="col">{{'subscriptions.table.subscription_frequency' | translate}}</th>
+                      <th scope="col">{{'subscriptions.table.action' | translate}}</th>
+                    </tr>
+                  </thead>
+                  <tbody>
+                    <tr ds-subscription-view *ngFor="let subscription of subscriptions?.page"
+                                             [dso]="(subscription?.resource | async)?.payload"
+                                             [eperson]="(subscription?.eperson | async)?.payload?.id"
+                                             [subscription]="subscription"
+                                             (reload)="refresh()">
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </ds-pagination>
+
+            <ds-alert *ngIf="subscriptions?.pageInfo?.totalElements === 0 && (loading$ | async) !== true" [type]="AlertType.Info" data-test="empty-alert">
+              {{ 'subscriptions.table.empty.message' | translate }}
+            </ds-alert>
+
+          </ng-container>
+        </div>
+
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/src/app/subscriptions-page/subscriptions-page.component.scss b/src/app/subscriptions-page/subscriptions-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/subscriptions-page/subscriptions-page.component.spec.ts b/src/app/subscriptions-page/subscriptions-page.component.spec.ts
new file mode 100644
index 0000000000..34b6e682d6
--- /dev/null
+++ b/src/app/subscriptions-page/subscriptions-page.component.spec.ts
@@ -0,0 +1,139 @@
+import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  BrowserModule,
+  By,
+} from '@angular/platform-browser';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { AuthService } from '../core/auth/auth.service';
+import { buildPaginatedList } from '../core/data/paginated-list.model';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { PageInfo } from '../core/shared/page-info.model';
+import { MockActivatedRoute } from '../shared/mocks/active-router.mock';
+import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { SubscriptionViewComponent } from '../shared/subscriptions/subscription-view/subscription-view.component';
+import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service';
+import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
+import {
+  mockSubscriptionEperson,
+  subscriptionMock,
+  subscriptionMock2,
+} from '../shared/testing/subscriptions-data.mock';
+import { VarDirective } from '../shared/utils/var.directive';
+import { SubscriptionsPageComponent } from './subscriptions-page.component';
+
+describe('SubscriptionsPageComponent', () => {
+  let component: SubscriptionsPageComponent;
+  let fixture: ComponentFixture<SubscriptionsPageComponent>;
+  let de: DebugElement;
+
+  const authServiceStub = jasmine.createSpyObj('authorizationService', {
+    getAuthenticatedUserFromStore: observableOf(mockSubscriptionEperson),
+  });
+
+  const subscriptionServiceStub = jasmine.createSpyObj('SubscriptionsDataService', {
+    findByEPerson: jasmine.createSpy('findByEPerson'),
+  });
+
+  const paginationService = new PaginationServiceStub();
+
+  const mockSubscriptionList = [subscriptionMock, subscriptionMock2];
+
+  const emptyPageInfo = Object.assign(new PageInfo(), {
+    totalElements: 0,
+  });
+
+  const pageInfo = Object.assign(new PageInfo(), {
+    totalElements: 2,
+  });
+
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        BrowserModule,
+        RouterTestingModule.withRoutes([]),
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+        NoopAnimationsModule,
+      ],
+      declarations: [SubscriptionsPageComponent, SubscriptionViewComponent, VarDirective],
+      providers: [
+        { provide: SubscriptionsDataService, useValue: subscriptionServiceStub },
+        { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
+        { provide: AuthService, useValue: authServiceStub },
+        { provide: PaginationService, useValue: paginationService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SubscriptionsPageComponent);
+    component = fixture.componentInstance;
+    de = fixture.debugElement;
+  });
+
+  describe('when there are subscriptions', () => {
+
+    beforeEach(() => {
+      subscriptionServiceStub.findByEPerson.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(pageInfo, mockSubscriptionList)));
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should show table', () => {
+      expect(de.query(By.css('[data-test="subscription-table"]'))).toBeTruthy();
+      expect(de.query(By.css('[data-test="empty-alert"]'))).toBeNull();
+    });
+
+    it('should show a row for each results entry',() => {
+      expect(de.query(By.css('[data-test="subscription-table"]'))).toBeTruthy();
+      expect(de.query(By.css('[data-test="empty-alert"]'))).toBeNull();
+      expect(de.queryAll(By.css('tbody > tr')).length).toEqual(2);
+    });
+  });
+
+  describe('when there are no subscriptions', () => {
+
+    beforeEach(() => {
+      subscriptionServiceStub.findByEPerson.and.returnValue(createSuccessfulRemoteDataObject$(buildPaginatedList(emptyPageInfo, [])));
+      fixture.detectChanges();
+    });
+
+    it('should create', () => {
+      expect(component).toBeTruthy();
+    });
+
+    it('should not show table', () => {
+      expect(de.query(By.css('[data-test="subscription-table"]'))).toBeNull();
+      expect(de.query(By.css('[data-test="empty-alert"]'))).toBeTruthy();
+    });
+  });
+
+});
diff --git a/src/app/subscriptions-page/subscriptions-page.component.ts b/src/app/subscriptions-page/subscriptions-page.component.ts
new file mode 100644
index 0000000000..e468a3918e
--- /dev/null
+++ b/src/app/subscriptions-page/subscriptions-page.component.ts
@@ -0,0 +1,135 @@
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  combineLatestWith,
+  Observable,
+  shareReplay,
+  Subscription as rxjsSubscription,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+  tap,
+} from 'rxjs/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import {
+  buildPaginatedList,
+  PaginatedList,
+} from '../core/data/paginated-list.model';
+import { RemoteData } from '../core/data/remote-data';
+import { EPerson } from '../core/eperson/models/eperson.model';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { getAllCompletedRemoteData } from '../core/shared/operators';
+import { PageInfo } from '../core/shared/page-info.model';
+import { AlertType } from '../shared/alert/alert-type';
+import { hasValue } from '../shared/empty.util';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { Subscription } from '../shared/subscriptions/models/subscription.model';
+import { SubscriptionsDataService } from '../shared/subscriptions/subscriptions-data.service';
+
+@Component({
+  selector: 'ds-subscriptions-page',
+  templateUrl: './subscriptions-page.component.html',
+  styleUrls: ['./subscriptions-page.component.scss'],
+})
+/**
+ * List and allow to manage all the active subscription for the current user
+ */
+export class SubscriptionsPageComponent implements OnInit, OnDestroy {
+
+  /**
+   * The subscriptions to show on this page, as an Observable list.
+   */
+  subscriptions$: BehaviorSubject<PaginatedList<Subscription>> = new BehaviorSubject(buildPaginatedList<Subscription>(new PageInfo(), []));
+
+  /**
+   * The current pagination configuration for the page
+   */
+  config: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'elp',
+    pageSize: 10,
+    currentPage: 1,
+  });
+
+  /**
+   * A boolean representing if is loading
+   */
+  loading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The current eperson id
+   */
+  ePersonId$: Observable<string>;
+
+  /**
+   * The rxjs subscription used to retrieve the result list
+   */
+  sub: rxjsSubscription = null;
+
+  readonly AlertType = AlertType;
+
+  constructor(
+    private paginationService: PaginationService,
+    private authService: AuthService,
+    private subscriptionService: SubscriptionsDataService,
+  ) {
+
+  }
+
+  /**
+   * Retrieve the current eperson id and call method to retrieve the subscriptions
+   */
+  ngOnInit(): void {
+    this.ePersonId$ = this.authService.getAuthenticatedUserFromStore().pipe(
+      take(1),
+      map((ePerson: EPerson) => ePerson.id),
+      shareReplay({ refCount: false }),
+    );
+    this.retrieveSubscriptions();
+  }
+
+  /**
+   * Retrieve subscription list related to the current user.
+   * When page is changed it will request the new subscriptions for the new page config
+   * @private
+   */
+  private retrieveSubscriptions(): void {
+    this.sub = this.paginationService.getCurrentPagination(this.config.id, this.config).pipe(
+      combineLatestWith(this.ePersonId$),
+      tap(() => this.loading$.next(true)),
+      switchMap(([currentPagination, ePersonId]) => this.subscriptionService.findByEPerson(ePersonId,{
+        currentPage: currentPagination.currentPage,
+        elementsPerPage: currentPagination.pageSize,
+      })),
+      getAllCompletedRemoteData(),
+    ).subscribe((res: RemoteData<PaginatedList<Subscription>>) => {
+      if (res.hasSucceeded) {
+        this.subscriptions$.next(res.payload);
+      }
+      this.loading$.next(false);
+    });
+  }
+  /**
+   * When a subscription is deleted refresh the subscription list
+   */
+  refresh(): void {
+    if (hasValue(this.sub)) {
+      this.sub.unsubscribe();
+    }
+
+    this.retrieveSubscriptions();
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.sub)) {
+      this.sub.unsubscribe();
+    }
+  }
+
+}
diff --git a/src/app/subscriptions-page/subscriptions-page.module.ts b/src/app/subscriptions-page/subscriptions-page.module.ts
new file mode 100644
index 0000000000..1527c84e6e
--- /dev/null
+++ b/src/app/subscriptions-page/subscriptions-page.module.ts
@@ -0,0 +1,16 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { SharedModule } from '../shared/shared.module';
+import { SubscriptionsModule } from '../shared/subscriptions/subscriptions.module';
+import { SubscriptionsPageComponent } from './subscriptions-page.component';
+
+@NgModule({
+  declarations: [SubscriptionsPageComponent],
+  imports: [
+    CommonModule,
+    SharedModule,
+    SubscriptionsModule,
+  ],
+})
+export class SubscriptionsPageModule { }
diff --git a/src/app/suggestion-notifications/selectors.ts b/src/app/suggestion-notifications/selectors.ts
new file mode 100644
index 0000000000..a8ec8c7def
--- /dev/null
+++ b/src/app/suggestion-notifications/selectors.ts
@@ -0,0 +1,105 @@
+import {
+  createFeatureSelector,
+  createSelector,
+  MemoizedSelector,
+} from '@ngrx/store';
+
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import {
+  suggestionNotificationsSelector,
+  SuggestionNotificationsState,
+} from '../notifications/notifications.reducer';
+import { SuggestionTargetState } from '../notifications/suggestion-targets/suggestion-targets.reducer';
+import { subStateSelector } from '../submission/selectors';
+
+/**
+ * Returns the Reciter Suggestion Target state.
+ * @function _getSuggestionTargetState
+ * @param {AppState} state Top level state.
+ * @return {SuggestionNotificationsState}
+ */
+const _getSuggestionTargetState = createFeatureSelector<SuggestionNotificationsState>('suggestionNotifications');
+
+// Reciter Suggestion Targets
+// ----------------------------------------------------------------------------
+
+/**
+ * Returns the Suggestion Targets State.
+ * @function suggestionTargetStateSelector
+ * @return {SuggestionNotificationsState}
+ */
+export function suggestionTargetStateSelector(): MemoizedSelector<SuggestionNotificationsState, SuggestionTargetState> {
+  return subStateSelector<SuggestionNotificationsState, SuggestionTargetState>(suggestionNotificationsSelector, 'suggestionTarget');
+}
+
+/**
+ * Returns the Suggestion Targets list.
+ * @function suggestionTargetObjectSelector
+ * @return {SuggestionTarget[]}
+ */
+export function suggestionTargetObjectSelector(): MemoizedSelector<SuggestionNotificationsState, SuggestionTarget[]> {
+  return subStateSelector<SuggestionNotificationsState, SuggestionTarget[]>(suggestionTargetStateSelector(), 'targets');
+}
+
+/**
+ * Returns true if the Suggestion Targets are loaded.
+ * @function isSuggestionTargetLoadedSelector
+ * @return {boolean}
+ */
+export const isSuggestionTargetLoadedSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.loaded,
+);
+
+/**
+ * Returns true if the deduplication sets are processing.
+ * @function isDeduplicationSetsProcessingSelector
+ * @return {boolean}
+ */
+export const isReciterSuggestionTargetProcessingSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.processing,
+);
+
+/**
+ * Returns the total available pages of Reciter Suggestion Targets.
+ * @function getSuggestionTargetTotalPagesSelector
+ * @return {number}
+ */
+export const getSuggestionTargetTotalPagesSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.totalPages,
+);
+
+/**
+ * Returns the current page of Suggestion Targets.
+ * @function getSuggestionTargetCurrentPageSelector
+ * @return {number}
+ */
+export const getSuggestionTargetCurrentPageSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.currentPage,
+);
+
+/**
+ * Returns the total number of Suggestion Targets.
+ * @function getSuggestionTargetTotalsSelector
+ * @return {number}
+ */
+export const getSuggestionTargetTotalsSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.totalElements,
+);
+
+/**
+ * Returns Suggestion Targets for the current user.
+ * @function getCurrentUserSuggestionTargetSelector
+ * @return {SuggestionTarget[]}
+ */
+export const getCurrentUserSuggestionTargetsSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.currentUserTargets,
+);
+
+/**
+ * Returns whether or not the user has consulted their suggestions
+ * @function getCurrentUserSuggestionTargetSelector
+ * @return {boolean}
+ */
+export const getCurrentUserSuggestionTargetsVisitedSelector = createSelector(_getSuggestionTargetState,
+  (state: SuggestionNotificationsState) => state.suggestionTarget.currentUserTargetsVisited,
+);
diff --git a/src/app/suggestions-page/suggestions-page-routing-paths.ts b/src/app/suggestions-page/suggestions-page-routing-paths.ts
new file mode 100644
index 0000000000..0f3aa782d2
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page-routing-paths.ts
@@ -0,0 +1,11 @@
+import { URLCombiner } from '../core/url-combiner/url-combiner';
+
+export const SUGGESTION_MODULE_PATH = 'suggestions';
+
+export function getSuggestionModuleRoute() {
+  return `/${SUGGESTION_MODULE_PATH}`;
+}
+
+export function getSuggestionPageRoute(SuggestionId: string) {
+  return new URLCombiner(getSuggestionModuleRoute(), SuggestionId).toString();
+}
diff --git a/src/app/suggestions-page/suggestions-page-routing.module.ts b/src/app/suggestions-page/suggestions-page-routing.module.ts
new file mode 100644
index 0000000000..0e5add0a7c
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page-routing.module.ts
@@ -0,0 +1,36 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { PublicationClaimBreadcrumbResolver } from '../core/breadcrumbs/publication-claim-breadcrumb.resolver';
+import { SuggestionsPageComponent } from './suggestions-page.component';
+import { SuggestionsPageResolver } from './suggestions-page.resolver';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: ':targetId',
+        resolve: {
+          suggestionTargets: SuggestionsPageResolver,
+          breadcrumb: PublicationClaimBreadcrumbResolver,//I18nBreadcrumbResolver
+        },
+        data: {
+          title: 'admin.notifications.publicationclaim.page.title',
+          breadcrumbKey: 'admin.notifications.publicationclaim',
+          showBreadcrumbsFluid: false,
+        },
+        canActivate: [AuthenticatedGuard],
+        runGuardsAndResolvers: 'always',
+        component: SuggestionsPageComponent,
+      },
+    ]),
+  ],
+  providers: [
+    SuggestionsPageResolver,
+    PublicationClaimBreadcrumbResolver,
+  ],
+})
+export class SuggestionsPageRoutingModule {
+
+}
diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html
new file mode 100644
index 0000000000..75ba0315f3
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.component.html
@@ -0,0 +1,48 @@
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+        <ng-container *ngVar="(suggestionsRD$ | async) as suggestionsRD">
+          <div *ngIf="suggestionsRD?.pageInfo?.totalElements > 0">
+
+            <h1>
+              {{'suggestion.suggestionFor' | translate}}
+              <a target="_blank" [routerLink]="['/entities/person/', researcherUuid]">{{researcherName}}</a>
+              {{'suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}
+            </h1>
+
+            <div class="mb-3 mt-3">
+              <button class="btn mr-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
+              <em>({{ getSelectedSuggestionsCount() }})</em>
+              <ds-suggestion-actions *ngIf="getSelectedSuggestionsCount() > 0"
+                                      class="m-2"
+                                     [isBulk]="true"
+                                     [isCollectionFixed]="isCollectionFixed(suggestionsRD.page)"
+                                     (approveAndImport)="approveAndImportAllSelected($event)"
+                                     (ignoreSuggestionClicked)="ignoreSuggestionAllSelected()"></ds-suggestion-actions>
+              <i class='fas fa-circle-notch fa-spin' *ngIf="isBulkOperationPending"></i>
+            </div>
+            <ds-loading *ngIf="(processing$ | async)"></ds-loading>
+            <ds-pagination *ngIf="(processing$ | async) !== true"
+                           [paginationOptions]="paginationOptions"
+                           [sortOptions]="paginationSortConfig"
+                           [collectionSize]="suggestionsRD?.pageInfo?.totalElements" [hideGear]="false"
+                           [hidePagerWhenSinglePage]="false" [hidePaginationDetail]="false"
+                           (paginationChange)="onPaginationChange()">
+              <ul class="list-unstyled">
+                <li *ngFor="let object of suggestionsRD?.page; let i = index; let last = last" class="mt-4 mb-4">
+                  <ds-suggestion-list-item
+                    [object]="object"
+                    [isSelected]="!!selectedSuggestions[object.id]"
+                    [isCollectionFixed]="isCollectionFixed([object])"
+                    (ignoreSuggestionClicked)="ignoreSuggestion($event)"
+                    (selected)="onSelected(object, $event)"
+                    (approveAndImport)="approveAndImport($event)"></ds-suggestion-list-item>
+                </li>
+              </ul>
+            </ds-pagination>
+          </div>
+          <div  *ngIf="suggestionsRD?.pageInfo?.totalElements === 0">{{ 'suggestion.count.missing' | translate }}</div>
+        </ng-container>
+    </div>
+  </div>
+</div>
diff --git a/src/app/suggestions-page/suggestions-page.component.scss b/src/app/suggestions-page/suggestions-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/suggestions-page/suggestions-page.component.spec.ts b/src/app/suggestions-page/suggestions-page.component.spec.ts
new file mode 100644
index 0000000000..9863f0012d
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.component.spec.ts
@@ -0,0 +1,231 @@
+import { CommonModule } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  async,
+  ComponentFixture,
+  fakeAsync,
+  TestBed,
+  tick,
+} from '@angular/core/testing';
+import { BrowserModule } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { getTestScheduler } from 'jasmine-marbles';
+import { of as observableOf } from 'rxjs';
+import { TestScheduler } from 'rxjs/testing';
+
+import { AuthService } from '../core/auth/auth.service';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { SuggestionEvidencesComponent } from '../notifications/suggestion-list-element/suggestion-evidences/suggestion-evidences.component';
+import {
+  SuggestionApproveAndImport,
+  SuggestionListElementComponent,
+} from '../notifications/suggestion-list-element/suggestion-list-element.component';
+import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
+import { SuggestionsService } from '../notifications/suggestions.service';
+import {
+  mockSuggestionPublicationOne,
+  mockSuggestionPublicationTwo,
+} from '../shared/mocks/publication-claim.mock';
+import { mockSuggestionTargetsObjectOne } from '../shared/mocks/publication-claim-targets.mock';
+import {
+  getMockSuggestionNotificationsStateService,
+  getMockSuggestionsService,
+} from '../shared/mocks/suggestion.mock';
+import { getMockTranslateService } from '../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../shared/testing/pagination-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { ObjectKeysPipe } from '../shared/utils/object-keys-pipe';
+import { VarDirective } from '../shared/utils/var.directive';
+import { SuggestionsPageComponent } from './suggestions-page.component';
+
+describe('SuggestionPageComponent', () => {
+  let component: SuggestionsPageComponent;
+  let fixture: ComponentFixture<SuggestionsPageComponent>;
+  let scheduler: TestScheduler;
+  const mockSuggestionsService = getMockSuggestionsService();
+  const mockSuggestionsTargetStateService = getMockSuggestionNotificationsStateService();
+  const router = new RouterStub();
+  const routeStub = {
+    data: observableOf({
+      suggestionTargets: createSuccessfulRemoteDataObject(mockSuggestionTargetsObjectOne),
+    }),
+    queryParams: observableOf({}),
+  };
+  const workspaceitemServiceMock = jasmine.createSpyObj('WorkspaceitemDataService', {
+    importExternalSourceEntry: jasmine.createSpy('importExternalSourceEntry'),
+  });
+
+  const authService = jasmine.createSpyObj('authService', {
+    isAuthenticated: observableOf(true),
+    setRedirectUrl: {},
+  });
+  const paginationService = new PaginationServiceStub();
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        BrowserModule,
+        CommonModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        SuggestionEvidencesComponent,
+        SuggestionListElementComponent,
+        SuggestionsPageComponent,
+        ObjectKeysPipe,
+        VarDirective,
+      ],
+      providers: [
+        { provide: AuthService, useValue: authService },
+        { provide: ActivatedRoute, useValue: routeStub },
+        { provide: WorkspaceitemDataService, useValue: workspaceitemServiceMock },
+        { provide: Router, useValue: router },
+        { provide: SuggestionsService, useValue: mockSuggestionsService },
+        { provide: SuggestionTargetsStateService, useValue: mockSuggestionsTargetStateService },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: TranslateService, useValue: getMockTranslateService() },
+        { provide: PaginationService, useValue: paginationService },
+        SuggestionsPageComponent,
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    })
+      .compileComponents().then();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SuggestionsPageComponent);
+    component = fixture.componentInstance;
+    scheduler = getTestScheduler();
+  });
+
+  it('should create', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+
+    expect(component).toBeTruthy();
+    expect(component.suggestionId).toBe(mockSuggestionTargetsObjectOne.id);
+    expect(component.researcherName).toBe(mockSuggestionTargetsObjectOne.display);
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should update page on pagination change', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.onPaginationChange();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should update suggestion on page update', (done) => {
+    spyOn(component.processing$, 'next');
+    spyOn(component.suggestionsRD$, 'next');
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    paginationService.getFindListOptions().subscribe(() => {
+      expect(component.processing$.next).toHaveBeenCalled();
+      expect(mockSuggestionsService.getSuggestions).toHaveBeenCalled();
+      expect(component.suggestionsRD$.next).toHaveBeenCalled();
+      expect(mockSuggestionsService.clearSuggestionRequests).toHaveBeenCalled();
+      done();
+    });
+    component.updatePage();
+  });
+
+  it('should flag suggestion for deletion', fakeAsync(() => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.ignoreSuggestion('1');
+    expect(mockSuggestionsService.ignoreSuggestion).toHaveBeenCalledWith('1');
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    tick(201);
+    expect(component.updatePage).toHaveBeenCalled();
+  }));
+
+  it('should flag all suggestion for deletion', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.ignoreSuggestionAllSelected();
+    expect(mockSuggestionsService.ignoreSuggestionMultiple).toHaveBeenCalled();
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should approve and import', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.approveAndImport({ collectionId: '1234' } as unknown as SuggestionApproveAndImport);
+    expect(mockSuggestionsService.approveAndImport).toHaveBeenCalled();
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should approve and import multiple suggestions', () => {
+    spyOn(component, 'updatePage').and.stub();
+
+    scheduler.schedule(() => fixture.detectChanges());
+    scheduler.flush();
+    component.approveAndImportAllSelected({ collectionId: '1234' } as unknown as SuggestionApproveAndImport);
+    expect(mockSuggestionsService.approveAndImportMultiple).toHaveBeenCalled();
+    expect(mockSuggestionsTargetStateService.dispatchRefreshUserSuggestionsAction).toHaveBeenCalled();
+    expect(component.updatePage).toHaveBeenCalled();
+  });
+
+  it('should select and deselect suggestion', () => {
+    component.selectedSuggestions = {};
+    component.onSelected(mockSuggestionPublicationOne, true);
+    expect(component.selectedSuggestions[mockSuggestionPublicationOne.id]).toBe(mockSuggestionPublicationOne);
+    component.onSelected(mockSuggestionPublicationOne, false);
+    expect(component.selectedSuggestions[mockSuggestionPublicationOne.id]).toBeUndefined();
+  });
+
+  it('should toggle all suggestions', () => {
+    component.selectedSuggestions = {};
+    component.onToggleSelectAll([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(component.selectedSuggestions[mockSuggestionPublicationOne.id]).toEqual(mockSuggestionPublicationOne);
+    expect(component.selectedSuggestions[mockSuggestionPublicationTwo.id]).toEqual(mockSuggestionPublicationTwo);
+    component.onToggleSelectAll([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(component.selectedSuggestions).toEqual({});
+  });
+
+  it('should return all selected suggestions count', () => {
+    component.selectedSuggestions = {};
+    component.onToggleSelectAll([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(component.getSelectedSuggestionsCount()).toEqual(2);
+  });
+
+  it('should check if all collection is fixed', () => {
+    component.isCollectionFixed([mockSuggestionPublicationOne, mockSuggestionPublicationTwo]);
+    expect(mockSuggestionsService.isCollectionFixed).toHaveBeenCalled();
+  });
+
+  it('should translate suggestion source', () => {
+    component.translateSuggestionSource();
+    expect(mockSuggestionsService.translateSuggestionSource).toHaveBeenCalled();
+  });
+
+  it('should translate suggestion type', () => {
+    component.translateSuggestionType();
+    expect(mockSuggestionsService.translateSuggestionType).toHaveBeenCalled();
+  });
+});
diff --git a/src/app/suggestions-page/suggestions-page.component.ts b/src/app/suggestions-page/suggestions-page.component.ts
new file mode 100644
index 0000000000..fefc655070
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.component.ts
@@ -0,0 +1,305 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  BehaviorSubject,
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  distinctUntilChanged,
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
+import { AuthService } from '../core/auth/auth.service';
+import {
+  SortDirection,
+  SortOptions,
+} from '../core/cache/models/sort-options.model';
+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 { Suggestion } from '../core/notifications/models/suggestion.model';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { PaginationService } from '../core/pagination/pagination.service';
+import { redirectOn4xx } from '../core/shared/authorized.operators';
+import { getFirstSucceededRemoteDataPayload } from '../core/shared/operators';
+import { WorkspaceItem } from '../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { SuggestionApproveAndImport } from '../notifications/suggestion-list-element/suggestion-list-element.component';
+import { SuggestionTargetsStateService } from '../notifications/suggestion-targets/suggestion-targets.state.service';
+import {
+  SuggestionBulkResult,
+  SuggestionsService,
+} from '../notifications/suggestions.service';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { getWorkspaceItemEditRoute } from '../workflowitems-edit-page/workflowitems-edit-page-routing-paths';
+
+@Component({
+  selector: 'ds-suggestion-page',
+  templateUrl: './suggestions-page.component.html',
+  styleUrls: ['./suggestions-page.component.scss'],
+})
+
+/**
+ * Component used to visualize one of the suggestions from the publication claim page or from the notification pop up
+ */
+
+export class SuggestionsPageComponent implements OnInit {
+
+  /**
+   * The pagination configuration
+   */
+  paginationOptions: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'sp',
+    pageSizeOptions: [5, 10, 20, 40, 60],
+  });
+
+  /**
+   * The sorting configuration
+   */
+  paginationSortConfig: SortOptions = new SortOptions('trust', SortDirection.DESC);
+
+  /**
+   * The FindListOptions object
+   */
+  defaultConfig: FindListOptions = Object.assign(new FindListOptions(), { sort: this.paginationSortConfig });
+
+  /**
+   * A boolean representing if results are loading
+   */
+  public processing$ = new BehaviorSubject<boolean>(false);
+
+  /**
+   * A list of remote data objects of suggestions
+   */
+  suggestionsRD$: BehaviorSubject<PaginatedList<Suggestion>> = new BehaviorSubject<PaginatedList<Suggestion>>({} as any);
+
+  targetRD$: Observable<RemoteData<SuggestionTarget>>;
+  targetId$: Observable<string>;
+
+  suggestionTarget: SuggestionTarget;
+  suggestionId: any;
+  suggestionSource: any;
+  researcherName: any;
+  researcherUuid: any;
+
+  selectedSuggestions: { [id: string]: Suggestion } = {};
+  isBulkOperationPending = false;
+
+  constructor(
+    private authService: AuthService,
+    private notificationService: NotificationsService,
+    private paginationService: PaginationService,
+    private route: ActivatedRoute,
+    private router: Router,
+    private suggestionService: SuggestionsService,
+    private suggestionTargetsStateService: SuggestionTargetsStateService,
+    private translateService: TranslateService,
+    private workspaceItemService: WorkspaceitemDataService,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.targetRD$ = this.route.data.pipe(
+      map((data: Data) => data.suggestionTargets as RemoteData<SuggestionTarget>),
+      redirectOn4xx(this.router, this.authService),
+    );
+
+    this.targetId$ = this.targetRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+      map((target: SuggestionTarget) => target.id),
+    );
+    this.targetRD$.pipe(
+      getFirstSucceededRemoteDataPayload(),
+    ).subscribe((suggestionTarget: SuggestionTarget) => {
+      this.suggestionTarget = suggestionTarget;
+      this.suggestionId = suggestionTarget.id;
+      this.researcherName = suggestionTarget.display;
+      this.suggestionSource = suggestionTarget.source;
+      this.researcherUuid = this.suggestionService.getTargetUuid(suggestionTarget);
+      this.updatePage();
+    });
+
+    this.suggestionTargetsStateService.dispatchMarkUserSuggestionsAsVisitedAction();
+  }
+
+  /**
+   * Called when one of the pagination settings is changed
+   */
+  onPaginationChange() {
+    this.updatePage();
+  }
+
+  /**
+   * Update the list of suggestions
+   */
+  updatePage() {
+    this.processing$.next(true);
+    const pageConfig$: Observable<FindListOptions> = this.paginationService.getFindListOptions(
+      this.paginationOptions.id,
+      this.defaultConfig,
+    ).pipe(
+      distinctUntilChanged(),
+    );
+    combineLatest([this.targetId$, pageConfig$]).pipe(
+      switchMap(([targetId, config]: [string, FindListOptions]) => {
+        return this.suggestionService.getSuggestions(
+          targetId,
+          config.elementsPerPage,
+          config.currentPage,
+          config.sort,
+        );
+      }),
+      take(1),
+    ).subscribe((results: PaginatedList<Suggestion>) => {
+      this.processing$.next(false);
+      this.suggestionsRD$.next(results);
+      this.suggestionService.clearSuggestionRequests();
+    });
+  }
+
+  /**
+   * Used to delete a suggestion.
+   * @suggestionId
+   */
+  ignoreSuggestion(suggestionId) {
+    this.suggestionService.ignoreSuggestion(suggestionId).subscribe(() => {
+      this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+      //We add a little delay in the page refresh so that we ensure the deletion has been propagated
+      setTimeout(() => this.updatePage(), 200);
+    });
+  }
+
+  /**
+   * Used to delete all selected suggestions.
+   */
+  ignoreSuggestionAllSelected() {
+    this.isBulkOperationPending = true;
+    this.suggestionService
+      .ignoreSuggestionMultiple(Object.values(this.selectedSuggestions))
+      .subscribe((results: SuggestionBulkResult) => {
+        this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+        this.updatePage();
+        this.isBulkOperationPending = false;
+        this.selectedSuggestions = {};
+        if (results.success > 0) {
+          this.notificationService.success(
+            this.translateService.get('suggestion.ignoreSuggestion.bulk.success',
+              { count: results.success }));
+        }
+        if (results.fails > 0) {
+          this.notificationService.error(
+            this.translateService.get('suggestion.ignoreSuggestion.bulk.error',
+              { count: results.fails }));
+        }
+      });
+  }
+
+  /**
+   * Used to approve & import.
+   * @param event contains the suggestion and the target collection
+   */
+  approveAndImport(event: SuggestionApproveAndImport) {
+    this.suggestionService.approveAndImport(this.workspaceItemService, event.suggestion, event.collectionId)
+      .subscribe((workspaceitem: WorkspaceItem) => {
+        const content = this.translateService.instant('suggestion.approveAndImport.success', { url: getWorkspaceItemEditRoute(workspaceitem.id) });
+        this.notificationService.success('', content, { timeOut:0 }, true);
+        this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+        this.updatePage();
+      });
+  }
+
+  /**
+   * Used to approve & import all selected suggestions.
+   * @param event contains the target collection
+   */
+  approveAndImportAllSelected(event: SuggestionApproveAndImport) {
+    this.isBulkOperationPending = true;
+    this.suggestionService
+      .approveAndImportMultiple(this.workspaceItemService, Object.values(this.selectedSuggestions), event.collectionId)
+      .subscribe((results: SuggestionBulkResult) => {
+        this.suggestionTargetsStateService.dispatchRefreshUserSuggestionsAction();
+        this.updatePage();
+        this.isBulkOperationPending = false;
+        this.selectedSuggestions = {};
+        if (results.success > 0) {
+          this.notificationService.success(
+            this.translateService.get('suggestion.approveAndImport.bulk.success',
+              { count: results.success }));
+        }
+        if (results.fails > 0) {
+          this.notificationService.error(
+            this.translateService.get('suggestion.approveAndImport.bulk.error',
+              { count: results.fails }));
+        }
+      });
+  }
+
+  /**
+   * When a specific suggestion is selected.
+   * @param object the suggestions
+   * @param selected the new selected value for the suggestion
+   */
+  onSelected(object: Suggestion, selected: boolean) {
+    if (selected) {
+      this.selectedSuggestions[object.id] = object;
+    } else {
+      delete this.selectedSuggestions[object.id];
+    }
+  }
+
+  /**
+   * When Toggle Select All occurs.
+   * @param suggestions all the visible suggestions inside the page
+   */
+  onToggleSelectAll(suggestions: Suggestion[]) {
+    if ( this.getSelectedSuggestionsCount() > 0) {
+      this.selectedSuggestions = {};
+    } else {
+      suggestions.forEach((suggestion) => {
+        this.selectedSuggestions[suggestion.id] = suggestion;
+      });
+    }
+  }
+
+  /**
+   * The current number of selected suggestions.
+   */
+  getSelectedSuggestionsCount(): number {
+    return Object.keys(this.selectedSuggestions).length;
+  }
+
+  /**
+   * Return true if all the suggestion are configured with the same fixed collection in the configuration.
+   * @param suggestions
+   */
+  isCollectionFixed(suggestions: Suggestion[]): boolean {
+    return this.suggestionService.isCollectionFixed(suggestions);
+  }
+
+  /**
+   * Label to be used to translate the suggestion source.
+   */
+  translateSuggestionSource() {
+    return this.suggestionService.translateSuggestionSource(this.suggestionSource);
+  }
+
+  /**
+   * Label to be used to translate the suggestion type.
+   */
+  translateSuggestionType() {
+    return this.suggestionService.translateSuggestionType(this.suggestionSource);
+  }
+
+}
diff --git a/src/app/suggestions-page/suggestions-page.module.ts b/src/app/suggestions-page/suggestions-page.module.ts
new file mode 100644
index 0000000000..8ba4f587f6
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.module.ts
@@ -0,0 +1,24 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+
+import { SuggestionsDataService } from '../core/notifications/suggestions-data.service';
+import { NotificationsModule } from '../notifications/notifications.module';
+import { SuggestionsService } from '../notifications/suggestions.service';
+import { SharedModule } from '../shared/shared.module';
+import { SuggestionsPageComponent } from './suggestions-page.component';
+import { SuggestionsPageRoutingModule } from './suggestions-page-routing.module';
+
+@NgModule({
+  declarations: [SuggestionsPageComponent],
+  imports: [
+    CommonModule,
+    SharedModule,
+    SuggestionsPageRoutingModule,
+    NotificationsModule,
+  ],
+  providers: [
+    SuggestionsDataService,
+    SuggestionsService,
+  ],
+})
+export class SuggestionsPageModule { }
diff --git a/src/app/suggestions-page/suggestions-page.resolver.ts b/src/app/suggestions-page/suggestions-page.resolver.ts
new file mode 100644
index 0000000000..e066065c9a
--- /dev/null
+++ b/src/app/suggestions-page/suggestions-page.resolver.ts
@@ -0,0 +1,35 @@
+import { Injectable } from '@angular/core';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
+import { Observable } from 'rxjs';
+import { find } from 'rxjs/operators';
+
+import { RemoteData } from '../core/data/remote-data';
+import { SuggestionTarget } from '../core/notifications/models/suggestion-target.model';
+import { SuggestionTargetDataService } from '../core/notifications/target/suggestion-target-data.service';
+import { hasValue } from '../shared/empty.util';
+
+/**
+ * This class represents a resolver that requests a specific collection before the route is activated
+ */
+@Injectable()
+export class SuggestionsPageResolver implements Resolve<RemoteData<SuggestionTarget>> {
+  constructor(private suggestionsDataService: SuggestionTargetDataService) {
+  }
+
+  /**
+   * Method for resolving a suggestion target based on the parameters in the current route
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<<RemoteData<Collection>> Emits the found collection based on the parameters in the current route,
+   * or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<RemoteData<SuggestionTarget>> {
+    return this.suggestionsDataService.getTargetById(route.params.targetId).pipe(
+      find((RD) => hasValue(RD.hasFailed) || RD.hasSucceeded),
+    );
+  }
+}
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
new file mode 100644
index 0000000000..d97d3d5d70
--- /dev/null
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.html
@@ -0,0 +1,27 @@
+<div *ngIf="(systemWideAlert$ |async)?.active">
+    <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>
+            <span>{{(systemWideAlert$ |async)?.message}}</span>
+        </div>
+    </div>
+</div>
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.scss b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
new file mode 100644
index 0000000000..155893f160
--- /dev/null
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.spec.ts
@@ -0,0 +1,122 @@
+import {
+  ComponentFixture,
+  discardPeriodicTasks,
+  fakeAsync,
+  TestBed,
+  tick,
+  waitForAsync,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+import { utcToZonedTime } from 'date-fns-tz';
+import { getTestScheduler } from 'jasmine-marbles';
+import { TestScheduler } from 'rxjs/testing';
+
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { SystemWideAlertBannerComponent } from './system-wide-alert-banner.component';
+
+
+describe('SystemWideAlertBannerComponent', () => {
+  let comp: SystemWideAlertBannerComponent;
+  let fixture: ComponentFixture<SystemWideAlertBannerComponent>;
+  let systemWideAlertDataService: SystemWideAlertDataService;
+
+  let systemWideAlert: SystemWideAlert;
+  let scheduler: TestScheduler;
+
+  beforeEach(waitForAsync(() => {
+    scheduler = getTestScheduler();
+
+    const countDownDate = new Date();
+    countDownDate.setDate(countDownDate.getDate() + 1);
+    countDownDate.setHours(countDownDate.getHours() + 1);
+    countDownDate.setMinutes(countDownDate.getMinutes() + 1);
+
+    systemWideAlert = Object.assign(new SystemWideAlert(), {
+      alertId: 1,
+      message: 'Test alert message',
+      active: true,
+      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString(),
+    });
+
+    systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
+      searchBy: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])),
+    });
+
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot()],
+      declarations: [SystemWideAlertBannerComponent],
+      providers: [
+        { provide: SystemWideAlertDataService, useValue: systemWideAlertDataService },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SystemWideAlertBannerComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should init the comp', () => {
+      expect(comp).toBeTruthy();
+    });
+    it('should set the time countdown parts in their respective behaviour subjects', fakeAsync(() => {
+      spyOn(comp.countDownDays, 'next');
+      spyOn(comp.countDownHours, 'next');
+      spyOn(comp.countDownMinutes, 'next');
+      comp.ngOnInit();
+      tick(2000);
+      expect(comp.countDownDays.next).toHaveBeenCalled();
+      expect(comp.countDownHours.next).toHaveBeenCalled();
+      expect(comp.countDownMinutes.next).toHaveBeenCalled();
+      discardPeriodicTasks();
+
+    }));
+  });
+
+  describe('banner', () => {
+    it('should display the alert message and the timer', () => {
+      comp.countDownDays.next(1);
+      comp.countDownHours.next(1);
+      comp.countDownMinutes.next(1);
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.queryAll(By.css('span'));
+      expect(banner.length).toEqual(6);
+
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.prefix');
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.days');
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.hours');
+      expect(banner[0].nativeElement.innerHTML).toContain('system-wide-alert-banner.countdown.minutes');
+
+      expect(banner[5].nativeElement.innerHTML).toContain(systemWideAlert.message);
+    });
+
+    it('should display the alert message but no timer when no timer is present', () => {
+      comp.countDownDays.next(0);
+      comp.countDownHours.next(0);
+      comp.countDownMinutes.next(0);
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.queryAll(By.css('span'));
+      expect(banner.length).toEqual(2);
+      expect(banner[1].nativeElement.innerHTML).toContain(systemWideAlert.message);
+    });
+
+    it('should not display an alert when none is present', () => {
+      comp.systemWideAlert$.next(null);
+      fixture.detectChanges();
+
+      const banner = fixture.debugElement.queryAll(By.css('span'));
+      expect(banner.length).toEqual(0);
+    });
+  });
+});
diff --git a/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
new file mode 100644
index 0000000000..a9550944d7
--- /dev/null
+++ b/src/app/system-wide-alert/alert-banner/system-wide-alert-banner.component.ts
@@ -0,0 +1,142 @@
+import { isPlatformBrowser } from '@angular/common';
+import {
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit,
+  PLATFORM_ID,
+} from '@angular/core';
+import { zonedTimeToUtc } from 'date-fns-tz';
+import {
+  BehaviorSubject,
+  EMPTY,
+  interval,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  map,
+  switchMap,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { getAllSucceededRemoteDataPayload } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SystemWideAlert } from '../system-wide-alert.model';
+
+/**
+ * Component responsible for rendering a banner and the countdown for an active system-wide alert
+ */
+@Component({
+  selector: 'ds-system-wide-alert-banner',
+  styleUrls: ['./system-wide-alert-banner.component.scss'],
+  templateUrl: './system-wide-alert-banner.component.html',
+})
+export class SystemWideAlertBannerComponent implements OnInit, OnDestroy {
+
+  /**
+   * BehaviorSubject that keeps track of the currently configured system-wide alert
+   */
+  systemWideAlert$ = new BehaviorSubject<SystemWideAlert>(undefined);
+
+  /**
+   * BehaviorSubject that keeps track of the amount of minutes left to count down to
+   */
+  countDownMinutes = new BehaviorSubject<number>(0);
+
+  /**
+   * BehaviorSubject that keeps track of the amount of hours left to count down to
+   */
+  countDownHours = new BehaviorSubject<number>(0);
+
+  /**
+   * BehaviorSubject that keeps track of the amount of days left to count down to
+   */
+  countDownDays = new BehaviorSubject<number>(0);
+
+  /**
+   * List of subscriptions
+   */
+  subscriptions: Subscription[] = [];
+
+  constructor(
+    @Inject(PLATFORM_ID) protected platformId: any,
+    protected systemWideAlertDataService: SystemWideAlertDataService,
+    protected notificationsService: NotificationsService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.subscriptions.push(this.systemWideAlertDataService.searchBy('active').pipe(
+      getAllSucceededRemoteDataPayload(),
+      map((payload: PaginatedList<SystemWideAlert>) => payload.page),
+      filter((page) => isNotEmpty(page)),
+      map((page) => page[0]),
+    ).subscribe((alert: SystemWideAlert) => {
+      this.systemWideAlert$.next(alert);
+    }));
+
+    this.subscriptions.push(this.systemWideAlert$.pipe(
+      switchMap((alert: SystemWideAlert) => {
+        if (hasValue(alert) && hasValue(alert.countdownTo)) {
+          const date = zonedTimeToUtc(alert.countdownTo, 'UTC');
+          const timeDifference = date.getTime() - new Date().getTime();
+          if (timeDifference > 0) {
+            this.allocateTimeUnits(timeDifference);
+            if (isPlatformBrowser(this.platformId)) {
+              return interval(1000);
+            } else {
+              return EMPTY;
+            }
+
+          }
+        }
+        // Reset the countDown times to 0 and return EMPTY to prevent unnecessary countdown calculations
+        this.countDownDays.next(0);
+        this.countDownHours.next(0);
+        this.countDownMinutes.next(0);
+        return EMPTY;
+      }),
+    ).subscribe(() => {
+      this.setTimeDifference(this.systemWideAlert$.getValue().countdownTo);
+    }));
+  }
+
+  /**
+   * Helper method to calculate the time difference between the countdown date from the system-wide alert and "now"
+   * @param countdownTo - The date to count down to
+   */
+  private setTimeDifference(countdownTo: string) {
+    const date = zonedTimeToUtc(countdownTo, 'UTC');
+
+    const timeDifference = date.getTime() - new Date().getTime();
+    this.allocateTimeUnits(timeDifference);
+  }
+
+  /**
+   * Helper method to push how many days, hours and minutes are left in the countdown to their respective behaviour subject
+   * @param timeDifference  - The time difference to calculate and push the time units for
+   */
+  private allocateTimeUnits(timeDifference) {
+    const minutes = Math.floor((timeDifference) / (1000 * 60) % 60);
+    const hours = Math.floor((timeDifference) / (1000 * 60 * 60) % 24);
+    const days = Math.floor((timeDifference) / (1000 * 60 * 60 * 24));
+
+    this.countDownMinutes.next(minutes);
+    this.countDownHours.next(hours);
+    this.countDownDays.next(days);
+  }
+
+  ngOnDestroy(): void {
+    this.subscriptions.forEach((sub: Subscription) => {
+      if (hasValue(sub)) {
+        sub.unsubscribe();
+      }
+    });
+  }
+}
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
new file mode 100644
index 0000000000..95c7a69448
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -0,0 +1,116 @@
+<div class="container">
+    <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>
+                </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">
+                </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>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col mb-2 d-flex align-items-end">
+            <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>
+    <div *ngIf="counterEnabled$ |async">
+        <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 [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">
+                <div class="input-group">
+                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+                </div>
+            </div>
+            <div class="d-none d-md-block col-md-6 timepicker-margin">
+                <div class="input-group">
+                    <ngb-timepicker [(ngModel)]="time" (ngModelChange)="updatePreviewTime()"></ngb-timepicker>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="mb-2">
+        <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>
+            </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>
+            <span>{{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>
+    </div>
+
+</div>
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss
new file mode 100644
index 0000000000..cdcfd8b0cd
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.scss
@@ -0,0 +1,4 @@
+.timepicker-margin {
+    // Negative margin to offset the time picker arrows and ensure the date and time are correctly aligned
+    margin-top: -38px;
+}
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
new file mode 100644
index 0000000000..c5beed4439
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.spec.ts
@@ -0,0 +1,325 @@
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import { FormsModule } from '@angular/forms';
+import { Router } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import {
+  utcToZonedTime,
+  zonedTimeToUtc,
+} from 'date-fns-tz';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
+import { RequestService } from '../../core/data/request.service';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { createPaginatedList } from '../../shared/testing/utils.test';
+import { SystemWideAlert } from '../system-wide-alert.model';
+import { SystemWideAlertModule } from '../system-wide-alert.module';
+import { SystemWideAlertFormComponent } from './system-wide-alert-form.component';
+
+describe('SystemWideAlertFormComponent', () => {
+  let comp: SystemWideAlertFormComponent;
+  let fixture: ComponentFixture<SystemWideAlertFormComponent>;
+  let systemWideAlertDataService: SystemWideAlertDataService;
+
+  let systemWideAlert: SystemWideAlert;
+  let requestService: RequestService;
+  let notificationsService;
+  let router;
+
+
+  beforeEach(waitForAsync(() => {
+
+    const countDownDate = new Date();
+    countDownDate.setDate(countDownDate.getDate() + 1);
+    countDownDate.setHours(countDownDate.getHours() + 1);
+    countDownDate.setMinutes(countDownDate.getMinutes() + 1);
+
+    systemWideAlert = Object.assign(new SystemWideAlert(), {
+      alertId: 1,
+      message: 'Test alert message',
+      active: true,
+      countdownTo: utcToZonedTime(countDownDate, 'UTC').toISOString(),
+    });
+
+    systemWideAlertDataService = jasmine.createSpyObj('systemWideAlertDataService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList([systemWideAlert])),
+      put: createSuccessfulRemoteDataObject$(systemWideAlert),
+      create: createSuccessfulRemoteDataObject$(systemWideAlert),
+    });
+
+    requestService = jasmine.createSpyObj('requestService', ['setStaleByHrefSubstring']);
+
+    notificationsService = new NotificationsServiceStub();
+    router = new RouterStub();
+
+    TestBed.configureTestingModule({
+      imports: [FormsModule, SystemWideAlertModule, UiSwitchModule, TranslateModule.forRoot()],
+      declarations: [SystemWideAlertFormComponent],
+      providers: [
+        { provide: SystemWideAlertDataService, useValue: systemWideAlertDataService },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: Router, useValue: router },
+        { provide: RequestService, useValue: requestService },
+      ],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SystemWideAlertFormComponent);
+    comp = fixture.componentInstance;
+
+    spyOn(comp, 'createForm').and.callThrough();
+    spyOn(comp, 'initFormValues').and.callThrough();
+
+    fixture.detectChanges();
+  });
+
+  describe('init', () => {
+    it('should init the comp', () => {
+      expect(comp).toBeTruthy();
+    });
+    it('should create the form and init the values based on an existing alert', () => {
+      expect(comp.createForm).toHaveBeenCalled();
+      expect(comp.initFormValues).toHaveBeenCalledWith(systemWideAlert);
+    });
+  });
+
+  describe('createForm', () => {
+    it('should create the form', () => {
+      const now = new Date();
+
+      comp.createForm();
+      expect(comp.formMessage.value).toEqual('');
+      expect(comp.formActive.value).toEqual(false);
+      expect(comp.time).toEqual({ hour: now.getHours(), minute: now.getMinutes() });
+      expect(comp.date).toEqual({ year: now.getFullYear(), month: now.getMonth() + 1, day: now.getDate() });
+    });
+  });
+
+  describe('initFormValues', () => {
+    it('should fill in the form based on the provided system-wide alert', () => {
+      comp.initFormValues(systemWideAlert);
+
+      const countDownTo = zonedTimeToUtc(systemWideAlert.countdownTo, 'UTC');
+
+      expect(comp.formMessage.value).toEqual(systemWideAlert.message);
+      expect(comp.formActive.value).toEqual(true);
+      expect(comp.time).toEqual({ hour: countDownTo.getHours(), minute: countDownTo.getMinutes() });
+      expect(comp.date).toEqual({
+        year: countDownTo.getFullYear(),
+        month: countDownTo.getMonth() + 1,
+        day: countDownTo.getDate(),
+      });
+    });
+  });
+  describe('setCounterEnabled', () => {
+    it('should set the preview time on enable and update the behaviour subject', () => {
+      spyOn(comp, 'updatePreviewTime');
+      comp.setCounterEnabled(true);
+
+      expect(comp.updatePreviewTime).toHaveBeenCalled();
+      expect(comp.counterEnabled$.value).toBeTrue();
+    });
+    it('should reset the preview time on disable and update the behaviour subject', () => {
+      spyOn(comp, 'updatePreviewTime');
+      comp.setCounterEnabled(false);
+
+      expect(comp.updatePreviewTime).not.toHaveBeenCalled();
+      expect(comp.previewDays).toEqual(0);
+      expect(comp.previewHours).toEqual(0);
+      expect(comp.previewMinutes).toEqual(0);
+      expect(comp.counterEnabled$.value).toBeFalse();
+    });
+  });
+
+  describe('updatePreviewTime', () => {
+    it('should calculate the difference between the current date and the date configured in the form', () => {
+      const countDownDate = new Date();
+      countDownDate.setDate(countDownDate.getDate() + 1);
+      countDownDate.setHours(countDownDate.getHours() + 1);
+      countDownDate.setMinutes(countDownDate.getMinutes() + 1);
+
+      comp.time = { hour: countDownDate.getHours(), minute: countDownDate.getMinutes() };
+      comp.date = { year: countDownDate.getFullYear(), month: countDownDate.getMonth() + 1, day: countDownDate.getDate() };
+
+      comp.updatePreviewTime();
+
+      expect(comp.previewDays).toEqual(1);
+      expect(comp.previewHours).toEqual(1);
+      expect(comp.previewDays).toEqual(1);
+    });
+  });
+
+  describe('setActive', () => {
+    it('should set whether the alert is active and save the current alert', () => {
+      spyOn(comp, 'save');
+      spyOn(comp.formActive, 'patchValue');
+      comp.setActive(true);
+
+      expect(comp.formActive.patchValue).toHaveBeenCalledWith(true);
+      expect(comp.save).toHaveBeenCalledWith(false);
+    });
+  });
+
+  describe('save', () => {
+    it('should update the exising alert with the form values and show a success notification on success and navigate back', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).toHaveBeenCalled();
+    });
+    it('should update the exising alert with the form values and show a success notification on success and not navigate back when false is provided to the save method', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save(false);
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).not.toHaveBeenCalled();
+    });
+    it('should update the exising alert with the form values but add an empty countdown date when disabled and show a success notification on success', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
+      comp.counterEnabled$.next(false);
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      expectedAlert.countdownTo = null;
+
+      comp.save();
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).toHaveBeenCalled();
+    });
+    it('should update the exising alert with the form values and show a error notification on error', () => {
+      spyOn(comp, 'back');
+      (systemWideAlertDataService.put as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+      comp.currentAlert = systemWideAlert;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.alertId = systemWideAlert.alertId;
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.put).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).not.toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).not.toHaveBeenCalled();
+    });
+    it('should create a new alert with the form values and show a success notification on success', () => {
+      spyOn(comp, 'back');
+      comp.currentAlert = undefined;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.create).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.success).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).toHaveBeenCalled();
+
+    });
+    it('should create a new alert with the form values and show a error notification on error', () => {
+      spyOn(comp, 'back');
+      (systemWideAlertDataService.create as jasmine.Spy).and.returnValue(createFailedRemoteDataObject$());
+
+      comp.currentAlert = undefined;
+
+      comp.formMessage.patchValue('New message');
+      comp.formActive.patchValue(true);
+      comp.time = { hour: 4, minute: 26 };
+      comp.date = { year: 2023, month: 1, day: 25 };
+
+      const expectedAlert = new SystemWideAlert();
+      expectedAlert.message = 'New message';
+      expectedAlert.active = true;
+      const countDownTo = new Date(2023, 0, 25, 4, 26);
+      expectedAlert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+
+      comp.save();
+
+      expect(systemWideAlertDataService.create).toHaveBeenCalledWith(expectedAlert);
+      expect(notificationsService.error).toHaveBeenCalled();
+      expect(requestService.setStaleByHrefSubstring).not.toHaveBeenCalledWith('systemwidealerts');
+      expect(comp.back).not.toHaveBeenCalled();
+
+    });
+  });
+  describe('back', () => {
+    it('should navigate back to the home page', () => {
+      comp.back();
+      expect(router.navigate).toHaveBeenCalledWith(['/home']);
+    });
+  });
+
+
+});
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
new file mode 100644
index 0000000000..bfe5e39c5d
--- /dev/null
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.ts
@@ -0,0 +1,275 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormBuilder,
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+import { Router } from '@angular/router';
+import { NgbDateStruct } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  utcToZonedTime,
+  zonedTimeToUtc,
+} from 'date-fns-tz';
+import {
+  BehaviorSubject,
+  Observable,
+} from 'rxjs';
+import {
+  filter,
+  map,
+} from 'rxjs/operators';
+
+import { PaginatedList } from '../../core/data/paginated-list.model';
+import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
+import { SystemWideAlertDataService } from '../../core/data/system-wide-alert-data.service';
+import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import {
+  hasValue,
+  isNotEmpty,
+} from '../../shared/empty.util';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { SystemWideAlert } from '../system-wide-alert.model';
+
+
+/**
+ * Component responsible for rendering the form to update a system-wide alert
+ */
+@Component({
+  selector: 'ds-system-wide-alert-form',
+  styleUrls: ['./system-wide-alert-form.component.scss'],
+  templateUrl: './system-wide-alert-form.component.html',
+})
+export class SystemWideAlertFormComponent implements OnInit {
+
+  /**
+   * Observable to track an existing system-wide alert
+   */
+  systemWideAlert$: Observable<SystemWideAlert>;
+
+  /**
+   * The currently configured system-wide alert
+   */
+  currentAlert: SystemWideAlert;
+
+  /**
+   * The form group representing the system-wide alert
+   */
+  alertForm: UntypedFormGroup;
+
+  /**
+   * Date object to store the countdown date part
+   */
+  date: NgbDateStruct;
+
+  /**
+   * The minimum date for the countdown timer
+   */
+  minDate: NgbDateStruct;
+
+  /**
+   * Object to store the countdown time part
+   */
+  time;
+
+  /**
+   * Behaviour subject to track whether the counter is enabled
+   */
+  counterEnabled$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
+
+  /**
+   * The amount of minutes to be used in the banner preview
+   */
+  previewMinutes: number;
+
+  /**
+   * The amount of hours to be used in the banner preview
+   */
+  previewHours: number;
+
+  /**
+   * The amount of days to be used in the banner preview
+   */
+  previewDays: number;
+
+
+  constructor(
+    protected systemWideAlertDataService: SystemWideAlertDataService,
+    protected notificationsService: NotificationsService,
+    protected router: Router,
+    protected requestService: RequestService,
+    protected translateService: TranslateService,
+  ) {
+  }
+
+  ngOnInit() {
+    this.systemWideAlert$ = this.systemWideAlertDataService.findAll().pipe(
+      getFirstCompletedRemoteData(),
+      map((rd) => {
+        if (rd.hasSucceeded) {
+          return rd.payload;
+        } else {
+          this.notificationsService.error('system-wide-alert-form.retrieval.error');
+        }
+      }),
+      map((payload: PaginatedList<SystemWideAlert>) => payload.page),
+      filter((page) => isNotEmpty(page)),
+      map((page) => page[0]),
+    );
+    this.createForm();
+
+    const currentDate = new Date();
+    this.minDate = { year: currentDate.getFullYear(), month: currentDate.getMonth() + 1, day: currentDate.getDate() };
+
+
+    this.systemWideAlert$.subscribe((alert) => {
+      this.currentAlert = alert;
+      this.initFormValues(alert);
+    });
+  }
+
+  /**
+   * Creates the form with empty values
+   */
+  createForm() {
+    this.alertForm = new UntypedFormBuilder().group({
+      formMessage: new UntypedFormControl('', {
+        validators: [Validators.required],
+      }),
+      formActive: new UntypedFormControl(false),
+    },
+    );
+    this.setDateTime(new Date());
+  }
+
+  /**
+   * Sets the form values based on the values retrieve from the provided system-wide alert
+   * @param alert   - System-wide alert to use to init the form
+   */
+  initFormValues(alert: SystemWideAlert) {
+    this.formMessage.patchValue(alert.message);
+    this.formActive.patchValue(alert.active);
+    const countDownTo = zonedTimeToUtc(alert.countdownTo, 'UTC');
+    if (countDownTo.getTime() - new Date().getTime() > 0) {
+      this.counterEnabled$.next(true);
+      this.setDateTime(countDownTo);
+    }
+
+  }
+
+  /**
+   * Set whether the system-wide alert is active
+   * Will also save the info in the current system-wide alert
+   * @param active
+   */
+  setActive(active: boolean) {
+    this.formActive.patchValue(active);
+    this.save(false);
+  }
+
+  /**
+   * Set whether the countdown timer is enabled or disabled. This will also update the counter in the preview
+   * @param enabled   - Whether the countdown timer is enabled or disabled.
+   */
+  setCounterEnabled(enabled: boolean) {
+    this.counterEnabled$.next(enabled);
+    if (!enabled) {
+      this.previewMinutes = 0;
+      this.previewHours = 0;
+      this.previewDays = 0;
+    } else {
+      this.updatePreviewTime();
+    }
+  }
+
+
+  private setDateTime(dateToSet) {
+    this.time = { hour: dateToSet.getHours(), minute: dateToSet.getMinutes() };
+    this.date = { year: dateToSet.getFullYear(), month: dateToSet.getMonth() + 1, day: dateToSet.getDate() };
+
+    this.updatePreviewTime();
+  }
+
+  /**
+   * Update the preview time based on the configured countdown date and the current time
+   */
+  updatePreviewTime() {
+    const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute);
+    const timeDifference = countDownTo.getTime() - new Date().getTime();
+    this.allocateTimeUnits(timeDifference);
+  }
+
+  /**
+   * Helper method to push how many days, hours and minutes are left in the countdown to their respective behaviour subject
+   * @param timeDifference  - The time difference to calculate and push the time units for
+   */
+  private allocateTimeUnits(timeDifference) {
+    this.previewMinutes = Math.floor((timeDifference) / (1000 * 60) % 60);
+    this.previewHours = Math.floor((timeDifference) / (1000 * 60 * 60) % 24);
+    this.previewDays = Math.floor((timeDifference) / (1000 * 60 * 60 * 24));
+  }
+
+
+  get formMessage() {
+    return this.alertForm.get('formMessage');
+  }
+
+  get formActive() {
+    return this.alertForm.get('formActive');
+  }
+
+  /**
+   * Save the system-wide alert present in the form
+   * When no alert is present yet on the server, a new one will be created
+   * When one already exists, the existing one will be updated
+   *
+   * @param navigateToHomePage  - Whether the user should be navigated back on successful save or not
+   */
+  save(navigateToHomePage  = true) {
+    const alert = new SystemWideAlert();
+    alert.message = this.formMessage.value;
+    alert.active = this.formActive.value;
+    if (this.counterEnabled$.getValue()) {
+      const countDownTo = new Date(this.date.year, this.date.month - 1, this.date.day, this.time.hour, this.time.minute);
+      alert.countdownTo = utcToZonedTime(countDownTo, 'UTC').toUTCString();
+    } 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);
+    }
+  }
+
+  private handleResponse(response$: Observable<RemoteData<SystemWideAlert>>, messagePrefix, navigateToHomePage: boolean) {
+    response$.pipe(
+      getFirstCompletedRemoteData(),
+    ).subscribe((response: RemoteData<SystemWideAlert>) => {
+      if (response.hasSucceeded) {
+        this.notificationsService.success(this.translateService.get(`${messagePrefix}.success`));
+        this.requestService.setStaleByHrefSubstring('systemwidealerts');
+        if (navigateToHomePage) {
+          this.back();
+        }
+      } else {
+        this.notificationsService.error(this.translateService.get(`${messagePrefix}.error`, response.errorMessage));
+      }
+    });
+  }
+
+  /**
+   * Navigate back to the homepage
+   */
+  back() {
+    this.router.navigate(['/home']);
+  }
+
+
+}
diff --git a/src/app/system-wide-alert/system-wide-alert-routing.module.ts b/src/app/system-wide-alert/system-wide-alert-routing.module.ts
new file mode 100644
index 0000000000..f9c9664600
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert-routing.module.ts
@@ -0,0 +1,21 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { SiteAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
+import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        canActivate: [SiteAdministratorGuard],
+        component: SystemWideAlertFormComponent,
+      },
+
+    ]),
+  ],
+})
+export class SystemWideAlertRoutingModule {
+
+}
diff --git a/src/app/system-wide-alert/system-wide-alert.model.ts b/src/app/system-wide-alert/system-wide-alert.model.ts
new file mode 100644
index 0000000000..3c2b524c1f
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert.model.ts
@@ -0,0 +1,59 @@
+import {
+  autoserialize,
+  deserialize,
+} from 'cerialize';
+
+import { typedObject } from '../core/cache/builders/build-decorators';
+import { CacheableObject } from '../core/cache/cacheable-object.model';
+import { HALLink } from '../core/shared/hal-link.model';
+import { ResourceType } from '../core/shared/resource-type';
+import { excludeFromEquals } from '../core/utilities/equals.decorators';
+import { SYSTEMWIDEALERT } from './system-wide-alert.resource-type';
+
+/**
+ * Object representing a system-wide alert
+ */
+@typedObject
+export class SystemWideAlert implements CacheableObject {
+  static type = SYSTEMWIDEALERT;
+
+  /**
+   * The object type
+   */
+  @excludeFromEquals
+  @autoserialize
+    type: ResourceType;
+
+  /**
+   * The identifier for this system-wide alert
+   */
+  @autoserialize
+    alertId: string;
+
+  /**
+   * The message for this system-wide alert
+   */
+  @autoserialize
+    message: string;
+
+  /**
+   * A string representation of the date to which this system-wide alert will count down when active
+   */
+  @autoserialize
+    countdownTo: string;
+
+  /**
+   * Whether the system-wide alert is active
+   */
+  @autoserialize
+    active: boolean;
+
+
+  /**
+   * The {@link HALLink}s for this system-wide alert
+   */
+  @deserialize
+    _links: {
+    self: HALLink,
+  };
+}
diff --git a/src/app/system-wide-alert/system-wide-alert.module.ts b/src/app/system-wide-alert/system-wide-alert.module.ts
new file mode 100644
index 0000000000..bad87363bc
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert.module.ts
@@ -0,0 +1,37 @@
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import {
+  NgbDatepickerModule,
+  NgbTimepickerModule,
+} from '@ng-bootstrap/ng-bootstrap';
+import { UiSwitchModule } from 'ngx-ui-switch';
+
+import { SystemWideAlertDataService } from '../core/data/system-wide-alert-data.service';
+import { SharedModule } from '../shared/shared.module';
+import { SystemWideAlertBannerComponent } from './alert-banner/system-wide-alert-banner.component';
+import { SystemWideAlertFormComponent } from './alert-form/system-wide-alert-form.component';
+import { SystemWideAlertRoutingModule } from './system-wide-alert-routing.module';
+
+@NgModule({
+  imports: [
+    FormsModule,
+    SharedModule,
+    UiSwitchModule,
+    SystemWideAlertRoutingModule,
+    NgbTimepickerModule,
+    NgbDatepickerModule,
+  ],
+  exports: [
+    SystemWideAlertBannerComponent,
+  ],
+  declarations: [
+    SystemWideAlertBannerComponent,
+    SystemWideAlertFormComponent,
+  ],
+  providers: [
+    SystemWideAlertDataService,
+  ],
+})
+export class SystemWideAlertModule {
+
+}
diff --git a/src/app/system-wide-alert/system-wide-alert.resource-type.ts b/src/app/system-wide-alert/system-wide-alert.resource-type.ts
new file mode 100644
index 0000000000..f67f00719b
--- /dev/null
+++ b/src/app/system-wide-alert/system-wide-alert.resource-type.ts
@@ -0,0 +1,10 @@
+/**
+ * The resource type for SystemWideAlert
+ *
+ * Needs to be in a separate file to prevent circular
+ * dependencies in webpack.
+ */
+
+import { ResourceType } from '../core/shared/resource-type';
+
+export const SYSTEMWIDEALERT = new ResourceType('systemwidealert');
diff --git a/src/app/thumbnail/themed-thumbnail.component.ts b/src/app/thumbnail/themed-thumbnail.component.ts
new file mode 100644
index 0000000000..2073ec1171
--- /dev/null
+++ b/src/app/thumbnail/themed-thumbnail.component.ts
@@ -0,0 +1,48 @@
+import {
+  Component,
+  Input,
+} from '@angular/core';
+
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { ThemedComponent } from '../shared/theme-support/themed.component';
+import { ThumbnailComponent } from './thumbnail.component';
+
+@Component({
+  selector: 'ds-themed-thumbnail',
+  styleUrls: [],
+  templateUrl: '../shared/theme-support/themed.component.html',
+})
+export class ThemedThumbnailComponent extends ThemedComponent<ThumbnailComponent> {
+
+  @Input() thumbnail: Bitstream | RemoteData<Bitstream>;
+
+  @Input() defaultImage?: string | null;
+
+  @Input() alt?: string;
+
+  @Input() placeholder?: string;
+
+  @Input() limitWidth?: boolean;
+
+  protected inAndOutputNames: (keyof ThumbnailComponent & keyof this)[] = [
+    'thumbnail',
+    'defaultImage',
+    'alt',
+    'placeholder',
+    'limitWidth',
+  ];
+
+  protected getComponentName(): string {
+    return 'ThumbnailComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../themes/${themeName}/app/thumbnail/thumbnail.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import('./thumbnail.component');
+  }
+
+}
diff --git a/src/app/thumbnail/thumbnail.component.scss b/src/app/thumbnail/thumbnail.component.scss
index e9cb1a6cb5..cb75e38d8c 100644
--- a/src/app/thumbnail/thumbnail.component.scss
+++ b/src/app/thumbnail/thumbnail.component.scss
@@ -12,7 +12,7 @@ img {
     display: block;
     content: "";
     width: 100%;
-    padding-top: (297 / 210) * 100%;  // A4 ratio
+    padding-top: calc((297 / 210) * 100%);  // A4 ratio
   }
   > .inner {
     position: absolute;
diff --git a/src/app/thumbnail/thumbnail.component.spec.ts b/src/app/thumbnail/thumbnail.component.spec.ts
index 29aebe03fc..696427630e 100644
--- a/src/app/thumbnail/thumbnail.component.spec.ts
+++ b/src/app/thumbnail/thumbnail.component.spec.ts
@@ -1,17 +1,28 @@
-import { DebugElement, Pipe, PipeTransform } from '@angular/core';
-import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
+import {
+  DebugElement,
+  Pipe,
+  PipeTransform,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { Bitstream } from '../core/shared/bitstream.model';
-import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
 import { of as observableOf } from 'rxjs';
 
-import { ThumbnailComponent } from './thumbnail.component';
-import { RemoteData } from '../core/data/remote-data';
-import { createFailedRemoteDataObject, createSuccessfulRemoteDataObject } from '../shared/remote-data.utils';
 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 { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
+import { FileService } from '../core/shared/file.service';
+import {
+  createFailedRemoteDataObject,
+  createSuccessfulRemoteDataObject,
+} from '../shared/remote-data.utils';
+import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
+import { VarDirective } from '../shared/utils/var.directive';
+import { ThumbnailComponent } from './thumbnail.component';
 
 // eslint-disable-next-line @angular-eslint/pipe-prefix
 @Pipe({ name: 'translate' })
@@ -40,7 +51,7 @@ describe('ThumbnailComponent', () => {
       isAuthorized: observableOf(true),
     });
     fileService = jasmine.createSpyObj('FileService', {
-      retrieveFileDownloadLink: null
+      retrieveFileDownloadLink: null,
     });
     fileService.retrieveFileDownloadLink.and.callFake((url) => observableOf(`${url}?authentication-token=fake`));
 
@@ -49,8 +60,8 @@ describe('ThumbnailComponent', () => {
       providers: [
         { provide: AuthService, useValue: authService },
         { provide: AuthorizationDataService, useValue: authorizationService },
-        { provide: FileService, useValue: fileService }
-      ]
+        { provide: FileService, useValue: fileService },
+      ],
     }).compileComponents();
   }));
 
@@ -134,7 +145,7 @@ describe('ThumbnailComponent', () => {
       const img = fixture.debugElement.query(By.css('img.thumbnail-content'));
       img.nativeNode.onerror = null;
 
-      comp.ngOnChanges();
+      comp.ngOnChanges({});
       setSrcSpy = spyOn(comp, 'setSrc').and.callThrough();
     });
 
@@ -261,14 +272,14 @@ describe('ThumbnailComponent', () => {
 
     describe('if content can be loaded', () => {
       it('should display an image', () => {
-        comp.ngOnChanges();
+        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();
+        comp.ngOnChanges({});
         fixture.detectChanges();
         const image: HTMLElement = fixture.debugElement.query(By.css('img')).nativeElement;
         expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
@@ -290,7 +301,7 @@ describe('ThumbnailComponent', () => {
         bundle: { href: 'bundle.url' },
         format: { href: 'format.url' },
         content: { href: CONTENT },
-        thumbnail: undefined
+        thumbnail: undefined,
       };
     });
 
@@ -301,14 +312,14 @@ describe('ThumbnailComponent', () => {
 
       describe('if content can be loaded', () => {
         it('should display an image', () => {
-          comp.ngOnChanges();
+          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();
+          comp.ngOnChanges({});
           fixture.detectChanges();
           const image: HTMLElement = de.query(By.css('img')).nativeElement;
           expect(image.getAttribute('alt')).toBe('TRANSLATED ' + comp.alt);
@@ -327,7 +338,7 @@ describe('ThumbnailComponent', () => {
 
       it('should show the default image', () => {
         comp.defaultImage = 'default/image.jpg';
-        comp.ngOnChanges();
+        comp.ngOnChanges({});
         expect(comp.src$.getValue()).toBe('default/image.jpg');
       });
     });
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index 5a7557def1..765a81961f 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,13 +1,25 @@
-import { Component, Input, OnChanges } 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 {
+  Component,
+  Input,
+  OnChanges,
+  SimpleChanges,
+} from '@angular/core';
+import {
+  BehaviorSubject,
+  of as observableOf,
+} 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 { AuthorizationDataService } from '../core/data/feature-authorization/authorization-data.service';
+import { FeatureID } from '../core/data/feature-authorization/feature-id';
+import { RemoteData } from '../core/data/remote-data';
+import { Bitstream } from '../core/shared/bitstream.model';
 import { FileService } from '../core/shared/file.service';
+import {
+  hasNoValue,
+  hasValue,
+} from '../shared/empty.util';
 
 /**
  * This component renders a given Bitstream as a thumbnail.
@@ -70,8 +82,9 @@ export class ThumbnailComponent implements OnChanges {
    * Resolve the thumbnail.
    * Use a default image if no actual image is available.
    */
-  ngOnChanges(): void {
+  ngOnChanges(changes: SimpleChanges): void {
     if (hasNoValue(this.thumbnail)) {
+      this.setSrc(this.defaultImage);
       return;
     }
 
@@ -133,7 +146,7 @@ export class ThumbnailComponent implements OnChanges {
           } else {
             return observableOf(null);
           }
-        })
+        }),
       ).subscribe((url: string) => {
         if (hasValue(url)) {
           // If we got a URL, try to load it
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.html
new file mode 100644
index 0000000000..7b0528d906
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.html
@@ -0,0 +1,5 @@
+<div class="container">
+  <h2>{{'workflow-item.' + type + '.header' | translate}}</h2>
+  <ds-advanced-workflow-actions-loader [type]="type">
+  </ds-advanced-workflow-actions-loader>
+</div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.scss b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts
new file mode 100644
index 0000000000..4ab935a4e9
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.spec.ts
@@ -0,0 +1,46 @@
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+
+import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action-page.component';
+
+describe('AdvancedWorkflowActionPageComponent', () => {
+  let component: AdvancedWorkflowActionPageComponent;
+  let fixture: ComponentFixture<AdvancedWorkflowActionPageComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        AdvancedWorkflowActionPageComponent,
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            snapshot: {
+              queryParams: {
+                workflow: 'testaction',
+              },
+            },
+          },
+        },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedWorkflowActionPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts
new file mode 100644
index 0000000000..a1e475e57f
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component.ts
@@ -0,0 +1,29 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { ActivatedRoute } from '@angular/router';
+
+/**
+ * The Advanced Workflow page containing the correct {@link AdvancedWorkflowActionComponent}
+ * based on the route parameters.
+ */
+@Component({
+  selector: 'ds-advanced-workflow-action-page',
+  templateUrl: './advanced-workflow-action-page.component.html',
+  styleUrls: ['./advanced-workflow-action-page.component.scss'],
+})
+export class AdvancedWorkflowActionPageComponent implements OnInit {
+
+  public type: string;
+
+  constructor(
+    protected route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.type = this.route.snapshot.queryParams.workflow;
+  }
+
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
new file mode 100644
index 0000000000..aca9b4da73
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
@@ -0,0 +1,50 @@
+<div *ngVar="getAdvancedInfo(workflowAction$ | async) as advancedInfo">
+  <p *ngIf="advancedInfo?.descriptionRequired">
+    {{ 'advanced-workflow-action.rating.description-requiredDescription' | translate }}
+  </p>
+  <p *ngIf="!advancedInfo?.descriptionRequired">
+    {{ 'advanced-workflow-action.rating.description' | translate }}
+  </p>
+
+  <form (ngSubmit)="performAction()" *ngIf="ratingForm" [formGroup]="ratingForm">
+    <div class="form-group">
+      <label class="control-label">
+        <span>{{ 'advanced-workflow-action.rating.form.review.label' | translate }}</span>
+        <span *ngIf="advancedInfo?.descriptionRequired">*</span>
+      </label>
+      <textarea [ngClass]="{ 'is-invalid' : isInvalid('review') }"
+                [required]="advancedInfo?.descriptionRequired" class="form-control" formControlName="review">
+      </textarea>
+      <small *ngIf="isInvalid('review')" class="invalid-feedback d-block">
+        {{ 'advanced-workflow-action.rating.form.review.error' | translate }}
+      </small>
+    </div>
+
+    <div class="form-group">
+      <label class="control-label mb-1">
+        {{ 'advanced-workflow-action.rating.form.rating.label' | translate }}*
+      </label>
+      <div class="d-block">
+        <ngb-rating [max]="advancedInfo?.maxValue" [ngClass]="{ 'text-danger': isInvalid('rating') }"
+                    formControlName="rating">
+        </ngb-rating>
+      </div>
+      <small *ngIf="isInvalid('rating')" class="invalid-feedback d-block">
+        {{ 'advanced-workflow-action.rating.form.rating.error' | translate }}
+      </small>
+    </div>
+  </form>
+
+  <ds-modify-item-overview *ngIf="item$ | async"
+                           [item]="item$ | async">
+  </ds-modify-item-overview>
+
+  <div class="d-flex flex-wrap justify-content-end">
+    <button (click)="previousPage()" class="btn btn-default">
+      {{'workflow-item.' + getType() + '.button.cancel' | translate}}
+    </button>
+    <button (click)="performAction()" class="btn btn-primary">
+      {{'workflow-item.' + getType() + '.button.confirm' | translate}}
+    </button>
+  </div>
+</div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.scss b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts
new file mode 100644
index 0000000000..eb148a9f0f
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.spec.ts
@@ -0,0 +1,209 @@
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  FormsModule,
+  ReactiveFormsModule,
+} from '@angular/forms';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { Item } from '../../../core/shared/item.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
+import { LocationStub } from '../../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import {
+  ADVANCED_WORKFLOW_TASK_OPTION_RATING,
+  AdvancedWorkflowActionRatingComponent,
+} from './advanced-workflow-action-rating.component';
+
+const claimedTaskId = '2';
+const workflowId = '1';
+
+describe('AdvancedWorkflowActionRatingComponent', () => {
+  const workflowItem: WorkflowItem = new WorkflowItem();
+  workflowItem.item = createSuccessfulRemoteDataObject$(new Item());
+  let component: AdvancedWorkflowActionRatingComponent;
+  let fixture: ComponentFixture<AdvancedWorkflowActionRatingComponent>;
+
+  let claimedTaskDataService: ClaimedTaskDataServiceStub;
+  let notificationService: NotificationsServiceStub;
+  let workflowActionDataService: WorkflowItemDataServiceStub;
+  let workflowItemDataService: WorkflowItemDataServiceStub;
+
+  beforeEach(async () => {
+    claimedTaskDataService = new ClaimedTaskDataServiceStub();
+    notificationService = new NotificationsServiceStub();
+    workflowActionDataService = new WorkflowActionDataServiceStub();
+    workflowItemDataService = new WorkflowItemDataServiceStub();
+
+    await TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        NgbModule,
+        ReactiveFormsModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        AdvancedWorkflowActionRatingComponent,
+        VarDirective,
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            data: observableOf({
+              id: workflowId,
+              wfi: createSuccessfulRemoteDataObject(workflowItem),
+            }),
+            snapshot: {
+              queryParams: {
+                claimedTask: claimedTaskId,
+                workflow: 'testaction',
+              },
+            },
+          },
+        },
+        { provide: ClaimedTaskDataService, useValue: claimedTaskDataService },
+        { provide: Location, useValue: new LocationStub() },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: Router, useValue: new RouterStub() },
+        { provide: WorkflowActionDataService, useValue: workflowActionDataService },
+        { provide: WorkflowItemDataService, useValue: workflowItemDataService },
+        { provide: RequestService, useClass: RequestServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedWorkflowActionRatingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
+  describe('performAction', () => {
+    let ratingAdvancedWorkflowInfo: RatingAdvancedWorkflowInfo;
+    beforeEach(() => {
+      ratingAdvancedWorkflowInfo = new RatingAdvancedWorkflowInfo();
+      ratingAdvancedWorkflowInfo.maxValue = 5;
+      spyOn(component, 'getAdvancedInfo').and.returnValue(ratingAdvancedWorkflowInfo);
+      spyOn(component, 'previousPage');
+      // The form validators are set in the HTML code so the getAdvancedInfo needs to return a value
+      fixture.detectChanges();
+    });
+
+    describe('with required review', () => {
+      beforeEach(() => {
+        ratingAdvancedWorkflowInfo.descriptionRequired = true;
+        fixture.detectChanges();
+      });
+
+      it('should call the claimedTaskDataService with the rating and the required description when it has been rated and return to the mydspace page', () => {
+        spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
+        component.ratingForm.setValue({
+          review: 'Good job!',
+          rating: 4,
+        });
+
+        component.performAction();
+
+        expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith(claimedTaskId, {
+          [ADVANCED_WORKFLOW_TASK_OPTION_RATING]: true,
+          review: 'Good job!',
+          score: 4,
+        });
+        expect(notificationService.success).toHaveBeenCalled();
+        expect(component.previousPage).toHaveBeenCalled();
+      });
+
+      it('should not call the claimedTaskDataService when the required description is empty', () => {
+        spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
+        component.ratingForm.setValue({
+          review: '',
+          rating: 4,
+        });
+
+        component.performAction();
+
+        expect(claimedTaskDataService.submitTask).not.toHaveBeenCalled();
+        expect(notificationService.success).not.toHaveBeenCalled();
+        expect(component.previousPage).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('with an optional review', () => {
+      beforeEach(() => {
+        ratingAdvancedWorkflowInfo.descriptionRequired = false;
+        fixture.detectChanges();
+      });
+
+      it('should call the claimedTaskDataService with the optional review when provided and return to the mydspace page', () => {
+        spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
+        component.ratingForm.setValue({
+          review: 'Good job!',
+          rating: 4,
+        });
+
+        component.performAction();
+
+        expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith(claimedTaskId, {
+          [ADVANCED_WORKFLOW_TASK_OPTION_RATING]: true,
+          review: 'Good job!',
+          score: 4,
+        });
+        expect(notificationService.success).toHaveBeenCalled();
+        expect(component.previousPage).toHaveBeenCalled();
+      });
+
+      it('should call the claimedTaskDataService when the optional description is empty and return to the mydspace page', () => {
+        spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
+        component.ratingForm.setValue({
+          review: '',
+          rating: 4,
+        });
+
+        component.performAction();
+
+        expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith(claimedTaskId, {
+          [ADVANCED_WORKFLOW_TASK_OPTION_RATING]: true,
+          score: 4,
+        });
+        expect(notificationService.success).toHaveBeenCalled();
+        expect(component.previousPage).toHaveBeenCalled();
+      });
+    });
+  });
+});
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
new file mode 100644
index 0000000000..d92ed73ff3
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.ts
@@ -0,0 +1,85 @@
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  UntypedFormControl,
+  UntypedFormGroup,
+  Validators,
+} from '@angular/forms';
+
+import { RatingAdvancedWorkflowInfo } from '../../../core/tasks/models/rating-advanced-workflow-info.model';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
+
+export const ADVANCED_WORKFLOW_TASK_OPTION_RATING = 'submit_score';
+export const ADVANCED_WORKFLOW_ACTION_RATING = 'scorereviewaction';
+
+/**
+ * The page on which reviewers can rate submitted items.
+ */
+@rendersAdvancedWorkflowTaskOption(ADVANCED_WORKFLOW_ACTION_RATING)
+@Component({
+  selector: 'ds-advanced-workflow-action-rating-reviewer',
+  templateUrl: './advanced-workflow-action-rating.component.html',
+  styleUrls: ['./advanced-workflow-action-rating.component.scss'],
+  preserveWhitespaces: false,
+})
+export class AdvancedWorkflowActionRatingComponent extends AdvancedWorkflowActionComponent implements OnInit {
+
+  ratingForm: UntypedFormGroup;
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.ratingForm = new UntypedFormGroup({
+      review: new UntypedFormControl(''),
+      rating: new UntypedFormControl(0, Validators.min(1)),
+    });
+  }
+
+  /**
+   * Only run **performAction()** when the form has been correctly filled in
+   */
+  performAction(): void {
+    this.ratingForm.updateValueAndValidity();
+    if (this.ratingForm.valid) {
+      super.performAction();
+    } else {
+      this.ratingForm.markAllAsTouched();
+    }
+  }
+
+  /**
+   * Returns the task option, the score and the review if one was provided
+   */
+  createBody(): any {
+    const body = {
+      [ADVANCED_WORKFLOW_TASK_OPTION_RATING]: true,
+      score: this.ratingForm.get('rating').value,
+    };
+    if (this.ratingForm.get('review').value !== '') {
+      const review: string = this.ratingForm.get('review').value;
+      Object.assign(body, { review: review });
+    }
+    return body;
+  }
+
+  getType(): string {
+    return ADVANCED_WORKFLOW_ACTION_RATING;
+  }
+
+  getAdvancedInfo(workflowAction: WorkflowAction | null): RatingAdvancedWorkflowInfo | null {
+    return workflowAction ? (workflowAction.advancedInfo[0] as RatingAdvancedWorkflowInfo) : null;
+  }
+
+  /**
+   * Returns whether the field is valid or not.
+   *
+   * @param formControlName The input field
+   */
+  isInvalid(formControlName: string): boolean {
+    return this.ratingForm.get(formControlName).touched && !this.ratingForm.get(formControlName).valid;
+  }
+
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
new file mode 100644
index 0000000000..d4ac620811
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
@@ -0,0 +1,29 @@
+<div>
+  <p *ngIf="multipleReviewers">{{ 'advanced-workflow-action.select-reviewer.description-multiple' | translate }}</p>
+  <p *ngIf="!multipleReviewers">{{ 'advanced-workflow-action.select-reviewer.description-single' | translate }}</p>
+
+  <ds-reviewers-list *ngIf="groupId !== undefined"
+                     [actionConfig]="reviewersListActionConfig"
+                     [groupId]="groupId"
+                     [ngClass]="groupId ? 'reviewersListWithGroup' : ''"
+                     [multipleReviewers]="multipleReviewers"
+                     (selectedReviewersUpdated)="selectedReviewers = $event; displayError = false"
+                     messagePrefix="advanced-workflow-action-select-reviewer.groups.form.reviewers-list"
+  ></ds-reviewers-list>
+  <small *ngIf="displayError" class="invalid-feedback d-block mb-3">
+    {{ 'advanced-workflow-action.select-reviewer.no-reviewer-selected.error' | translate }}
+  </small>
+
+  <ds-modify-item-overview *ngIf="item$ | async"
+                           [item]="item$ | async">
+  </ds-modify-item-overview>
+
+  <div class="d-flex flex-wrap justify-content-end">
+    <button class="btn btn-default" (click)="previousPage()">
+      {{'workflow-item.' + getType() + '.button.cancel' | translate}}
+    </button>
+    <button class="btn btn-primary" (click)="performAction()">
+      {{'workflow-item.' + getType() + '.button.confirm' | translate}}
+    </button>
+  </div>
+</div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss
new file mode 100644
index 0000000000..65f38247c8
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.scss
@@ -0,0 +1,7 @@
+:host ::ng-deep {
+   .reviewersListWithGroup {
+    #search, #search + form, #search + form + ds-pagination {
+      display: none !important;
+    }
+  }
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts
new file mode 100644
index 0000000000..ea6ef0706f
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.spec.ts
@@ -0,0 +1,178 @@
+import { Location } from '@angular/common';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateModule } from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { Item } from '../../../core/shared/item.model';
+import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../../shared/remote-data.utils';
+import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../shared/testing/eperson.mock';
+import { LocationStub } from '../../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import {
+  ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER,
+  AdvancedWorkflowActionSelectReviewerComponent,
+} from './advanced-workflow-action-select-reviewer.component';
+
+const claimedTaskId = '2';
+const workflowId = '1';
+
+describe('AdvancedWorkflowActionSelectReviewerComponent', () => {
+  const workflowItem: WorkflowItem = new WorkflowItem();
+  workflowItem.item = createSuccessfulRemoteDataObject$(new Item());
+  let component: AdvancedWorkflowActionSelectReviewerComponent;
+  let fixture: ComponentFixture<AdvancedWorkflowActionSelectReviewerComponent>;
+
+  let claimedTaskDataService: ClaimedTaskDataServiceStub;
+  let location: LocationStub;
+  let notificationService: NotificationsServiceStub;
+  let router: RouterStub;
+  let workflowActionDataService: WorkflowItemDataServiceStub;
+  let workflowItemDataService: WorkflowItemDataServiceStub;
+
+  beforeEach(async () => {
+    claimedTaskDataService = new ClaimedTaskDataServiceStub();
+    location = new LocationStub();
+    notificationService = new NotificationsServiceStub();
+    router = new RouterStub();
+    workflowActionDataService = new WorkflowActionDataServiceStub();
+    workflowItemDataService = new WorkflowItemDataServiceStub();
+
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+      ],
+      declarations: [
+        AdvancedWorkflowActionSelectReviewerComponent,
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            data: observableOf({
+              id: workflowId,
+              wfi: createSuccessfulRemoteDataObject(workflowItem),
+            }),
+            snapshot: {
+              queryParams: {
+                claimedTask: claimedTaskId,
+                workflow: 'testaction',
+                previousSearchQuery: 'Thor%20Love%20and%20Thunder',
+              },
+            },
+          },
+        },
+        { provide: ClaimedTaskDataService, useValue: claimedTaskDataService },
+        { provide: Location, useValue: location },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: Router, useValue: router },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: WorkflowActionDataService, useValue: workflowActionDataService },
+        { provide: WorkflowItemDataService, useValue: workflowItemDataService },
+        { provide: RequestService, useClass: RequestServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedWorkflowActionSelectReviewerComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
+  describe('previousPage', () => {
+    it('should navigate back to the Workflow tasks page with the previous query', () => {
+      spyOn(location, 'getState').and.returnValue({
+        previousQueryParams: {
+          configuration: 'workflow',
+          query: 'Thor Love and Thunder',
+        },
+      });
+
+      component.ngOnInit();
+      component.previousPage();
+
+      expect(router.navigate).toHaveBeenCalledWith(['/mydspace'], {
+        queryParams: {
+          configuration: 'workflow',
+          query: 'Thor Love and Thunder',
+        },
+      });
+    });
+  });
+
+  describe('performAction', () => {
+    beforeEach(() => {
+      spyOn(component, 'previousPage');
+    });
+
+    it('should call the claimedTaskDataService with the list of selected ePersons', () => {
+      spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
+      component.selectedReviewers = [EPersonMock, EPersonMock2];
+
+      component.performAction();
+
+      expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith(claimedTaskId, {
+        [ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER]: true,
+        eperson: [EPersonMock.id, EPersonMock2.id],
+      });
+      expect(notificationService.success).toHaveBeenCalled();
+      expect(component.previousPage).toHaveBeenCalled();
+    });
+
+    it('should not call the claimedTaskDataService with the list of selected ePersons when it\'s empty', () => {
+      spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true)));
+      component.selectedReviewers = [];
+
+      component.performAction();
+
+      expect(claimedTaskDataService.submitTask).not.toHaveBeenCalled();
+    });
+
+    it('should not call the return to mydspace page when the request failed', () => {
+      spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(false)));
+      component.selectedReviewers = [EPersonMock, EPersonMock2];
+
+      component.performAction();
+
+      expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith(claimedTaskId, {
+        [ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER]: true,
+        eperson: [EPersonMock.id, EPersonMock2.id],
+      });
+      expect(notificationService.error).toHaveBeenCalled();
+      expect(component.previousPage).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
new file mode 100644
index 0000000000..9d4fd3ff30
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
@@ -0,0 +1,155 @@
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnDestroy,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Params,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Subscription } from 'rxjs';
+
+import { EPersonListActionConfig } from '../../../access-control/group-registry/group-form/members-list/members-list.component';
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { EPerson } from '../../../core/eperson/models/eperson.model';
+import { RouteService } from '../../../core/services/route.service';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { SelectReviewerAdvancedWorkflowInfo } from '../../../core/tasks/models/select-reviewer-advanced-workflow-info.model';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { hasValue } from '../../../shared/empty.util';
+import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { AdvancedWorkflowActionComponent } from '../advanced-workflow-action/advanced-workflow-action.component';
+
+export const ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER = 'submit_select_reviewer';
+export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction';
+
+/**
+ * The page on which Review Managers can assign Reviewers to review an item.
+ */
+@rendersAdvancedWorkflowTaskOption(ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER)
+@Component({
+  selector: 'ds-advanced-workflow-action-select-reviewer',
+  templateUrl: './advanced-workflow-action-select-reviewer.component.html',
+  styleUrls: ['./advanced-workflow-action-select-reviewer.component.scss'],
+})
+export class AdvancedWorkflowActionSelectReviewerComponent extends AdvancedWorkflowActionComponent implements OnInit, OnDestroy {
+
+  multipleReviewers = true;
+
+  selectedReviewers: EPerson[] = [];
+
+  reviewersListActionConfig: EPersonListActionConfig;
+
+  /**
+   * When the component is created the value is `undefined`, afterwards it will be set to either the group id or `null`.
+   * It needs to be subscribed in the **ngOnInit()** because otherwise some unnecessary request will be made.
+   */
+  groupId?: string | null;
+
+  subs: Subscription[] = [];
+
+  displayError = false;
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected workflowItemService: WorkflowItemDataService,
+    protected router: Router,
+    protected routeService: RouteService,
+    protected notificationsService: NotificationsService,
+    protected translationService: TranslateService,
+    protected workflowActionService: WorkflowActionDataService,
+    protected claimedTaskDataService: ClaimedTaskDataService,
+    protected requestService: RequestService,
+    protected location: Location,
+  ) {
+    super(route, workflowItemService, router, routeService, notificationsService, translationService, workflowActionService, claimedTaskDataService, requestService, location);
+  }
+
+  ngOnDestroy(): void {
+    this.subs.forEach((subscription: Subscription) => subscription.unsubscribe());
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    if (this.multipleReviewers) {
+      this.reviewersListActionConfig = {
+        add: {
+          css: 'btn-outline-primary',
+          disabled: false,
+          icon: 'fas fa-plus',
+        },
+        remove: {
+          css: 'btn-outline-danger',
+          disabled: false,
+          icon: 'fas fa-minus',
+        },
+      };
+    } else {
+      this.reviewersListActionConfig = {
+        add: {
+          css: 'btn-outline-primary',
+          disabled: false,
+          icon: 'fas fa-check',
+        },
+        remove: {
+          css: 'btn-primary',
+          disabled: true,
+          icon: 'fas fa-check',
+        },
+      };
+    }
+    this.subs.push(this.workflowAction$.subscribe((workflowAction: WorkflowAction) => {
+      if (workflowAction) {
+        this.groupId = (workflowAction.advancedInfo as SelectReviewerAdvancedWorkflowInfo[])[0].group;
+      } else {
+        this.groupId = null;
+      }
+    }));
+  }
+
+  getType(): string {
+    return ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER;
+  }
+
+  /**
+   * Only performs the action when some reviewers have been selected.
+   */
+  performAction(): void {
+    if (this.selectedReviewers.length > 0) {
+      super.performAction();
+    } else {
+      this.displayError = true;
+    }
+  }
+
+  /**
+   * Returns the task option and the selected {@link EPerson} id(s)
+   */
+  createBody(): any {
+    return {
+      [ADVANCED_WORKFLOW_TASK_OPTION_SELECT_REVIEWER]: true,
+      eperson: this.selectedReviewers.map((ePerson: EPerson) => ePerson.id),
+    };
+  }
+
+  /**
+   * Hardcoded the previous page url because the {@link ReviewersListComponent} changes the previous route when
+   * switching between the different pages
+   */
+  previousPage(): void {
+    let queryParams: Params = this.previousQueryParameters;
+    if (!hasValue(queryParams)) {
+      queryParams = {
+        configuration: 'workflow',
+      };
+    }
+    void this.router.navigate(['/mydspace'], { queryParams: queryParams });
+  }
+
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
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
new file mode 100644
index 0000000000..7608d3751f
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.spec.ts
@@ -0,0 +1,270 @@
+import { CommonModule } from '@angular/common';
+import {
+  DebugElement,
+  NO_ERRORS_SCHEMA,
+  SimpleChange,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  fakeAsync,
+  flush,
+  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,
+} 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';
+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 { PaginationService } from '../../../../core/pagination/pagination.service';
+import { PageInfo } from '../../../../core/shared/page-info.model';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
+import { getMockFormBuilderService } from '../../../../shared/mocks/form-builder-service.mock';
+import { RouterMock } from '../../../../shared/mocks/router.mock';
+import { getMockTranslateService } from '../../../../shared/mocks/translate.service.mock';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+import {
+  createNoContentRemoteDataObject$,
+  createSuccessfulRemoteDataObject$,
+} from '../../../../shared/remote-data.utils';
+import {
+  EPersonMock,
+  EPersonMock2,
+} from '../../../../shared/testing/eperson.mock';
+import { GroupMock } from '../../../../shared/testing/group-mock';
+import { NotificationsServiceStub } from '../../../../shared/testing/notifications-service.stub';
+import { PaginationServiceStub } from '../../../../shared/testing/pagination-service.stub';
+import { TranslateLoaderMock } from '../../../../shared/testing/translate-loader.mock';
+import { ReviewersListComponent } from './reviewers-list.component';
+
+// todo: optimize imports
+
+// 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>;
+  let translateService: TranslateService;
+  let builderService: FormBuilderService;
+  let ePersonDataServiceStub: any;
+  let groupsDataServiceStub: any;
+  let activeGroup: Group;
+  let epersonMembers: EPerson[];
+  let epersonNonMembers: EPerson[];
+  let paginationService;
+
+  beforeEach(waitForAsync(() => {
+    activeGroup = GroupMock;
+    epersonMembers = [EPersonMock2];
+    epersonNonMembers = [EPersonMock];
+    ePersonDataServiceStub = {
+      activeGroup: activeGroup,
+      epersonMembers: epersonMembers,
+      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(), epersonNonMembers));
+        }
+        return createSuccessfulRemoteDataObject$(buildPaginatedList(new PageInfo(), []));
+      },
+      clearEPersonRequests() {
+        // empty
+      },
+      clearLinkRequests() {
+        // empty
+      },
+    };
+    groupsDataServiceStub = {
+      activeGroup: activeGroup,
+      epersonMembers: epersonMembers,
+      epersonNonMembers: epersonNonMembers,
+      getActiveGroup(): Observable<Group> {
+        return observableOf(activeGroup);
+      },
+      getEPersonMembers() {
+        return this.epersonMembers;
+      },
+      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() {
+        // empty
+      },
+      clearGroupLinkRequests() {
+        // empty
+      },
+      getGroupEditPageRouterLink(group: Group): string {
+        return '/access-control/groups/' + group.id;
+      },
+      deleteMemberFromGroup(parentGroup, epersonToDelete: EPerson): Observable<RestResponse> {
+        // Remove eperson from list of members
+        this.epersonMembers.forEach( (eperson: EPerson, index: number) => {
+          if (eperson.id === epersonToDelete.id) {
+            this.epersonMembers.splice(index, 1);
+          }
+        });
+        // 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) {
+        if (activeGroup.id === id) {
+          return createSuccessfulRemoteDataObject$(activeGroup);
+        }
+        return createNoContentRemoteDataObject$();
+      },
+      editGroup() {
+        // empty
+      },
+    };
+    builderService = getMockFormBuilderService();
+    translateService = getMockTranslateService();
+
+    paginationService = new PaginationServiceStub();
+    return TestBed.configureTestingModule({
+      imports: [CommonModule, NgbModule, FormsModule, ReactiveFormsModule, BrowserModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: TranslateLoaderMock,
+          },
+        }),
+      ],
+      declarations: [ReviewersListComponent],
+      providers: [ReviewersListComponent,
+        { provide: EPersonDataService, useValue: ePersonDataServiceStub },
+        { provide: GroupDataService, useValue: groupsDataServiceStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() },
+        { provide: FormBuilderService, useValue: builderService },
+        { provide: Router, useValue: new RouterMock() },
+        { provide: PaginationService, useValue: paginationService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ReviewersListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+  afterEach(fakeAsync(() => {
+    fixture.destroy();
+    flush();
+    component = null;
+    fixture.debugElement.nativeElement.remove();
+  }));
+
+
+  describe('when no group is selected', () => {
+    beforeEach(() => {
+      component.ngOnChanges({
+        groupId: new SimpleChange(undefined, null, true),
+      });
+      fixture.detectChanges();
+    });
+
+    it('should show no ePersons because no group is selected', () => {
+      const ePersonIdsFound = fixture.debugElement.queryAll(By.css('#ePeopleMembersOfGroup tr td:first-child'));
+      expect(ePersonIdsFound.length).toEqual(0);
+      epersonMembers.map((ePerson: EPerson) => {
+        expect(ePersonIdsFound.find((foundEl) => {
+          return (foundEl.nativeElement.textContent.trim() === ePerson.uuid);
+        })).not.toBeTruthy();
+      });
+    });
+  });
+
+  describe('when a group is selected', () => {
+    beforeEach(() => {
+      component.ngOnChanges({
+        groupId: new SimpleChange(undefined, GroupMock.id, true),
+      });
+      fixture.detectChanges();
+    });
+
+    it('should show all ePerson members of 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: DebugElement) => {
+          return (foundEl.nativeElement.textContent.trim() === ePerson.uuid);
+        })).toBeTruthy();
+      });
+    });
+  });
+
+
+  it('should replace the value when a new member is added when multipleReviewers is false', () => {
+    spyOn(component.selectedReviewersUpdated, 'emit');
+    component.multipleReviewers = false;
+    component.selectedReviewers = [EPersonMock];
+
+    component.addMemberToGroup(EPersonMock2);
+
+    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 = [EPersonMock];
+
+    component.addMemberToGroup(EPersonMock2);
+
+    expect(component.selectedReviewers).toEqual([EPersonMock, EPersonMock2]);
+    expect(component.selectedReviewersUpdated.emit).toHaveBeenCalledWith([EPersonMock, EPersonMock2]);
+  });
+
+  it('should delete the member when present', () => {
+    spyOn(component.selectedReviewersUpdated, 'emit');
+    component.selectedReviewers = [EPersonMock];
+
+    component.deleteMemberFromGroup(EPersonMock);
+
+    expect(component.selectedReviewers).toEqual([]);
+    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
new file mode 100644
index 0000000000..84841f2fc4
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component.ts
@@ -0,0 +1,146 @@
+import {
+  Component,
+  EventEmitter,
+  Input,
+  OnChanges,
+  OnDestroy,
+  OnInit,
+  Output,
+  SimpleChanges,
+} from '@angular/core';
+import { UntypedFormBuilder } from '@angular/forms';
+import { Router } from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+
+import {
+  EPersonListActionConfig,
+  MembersListComponent,
+} from '../../../../access-control/group-registry/group-form/members-list/members-list.component';
+import { DSONameService } from '../../../../core/breadcrumbs/dso-name.service';
+import { PaginatedList } from '../../../../core/data/paginated-list.model';
+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 { PaginationService } from '../../../../core/pagination/pagination.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../../core/shared/operators';
+import { NotificationsService } from '../../../../shared/notifications/notifications.service';
+
+/**
+ * Keys to keep track of specific subscriptions
+ */
+enum SubKey {
+  ActiveGroup,
+  Members,
+  SearchResults,
+}
+
+/**
+ * A custom {@link MembersListComponent} for the advanced SelectReviewer workflow.
+ */
+@Component({
+  selector: 'ds-reviewers-list',
+  // templateUrl: './reviewers-list.component.html',
+  templateUrl: '../../../../access-control/group-registry/group-form/members-list/members-list.component.html',
+})
+export class ReviewersListComponent extends MembersListComponent implements OnInit, OnChanges, OnDestroy {
+
+  @Input()
+    groupId: string | null;
+
+  @Input()
+    actionConfig: EPersonListActionConfig;
+
+  @Input()
+    multipleReviewers: boolean;
+
+  @Output()
+    selectedReviewersUpdated: EventEmitter<EPerson[]> = new EventEmitter();
+
+  selectedReviewers: EPerson[] = [];
+
+  constructor(
+    protected groupService: GroupDataService,
+    public ePersonDataService: EPersonDataService,
+    protected translateService: TranslateService,
+    protected notificationsService: NotificationsService,
+    protected formBuilder: UntypedFormBuilder,
+    protected paginationService: PaginationService,
+    protected router: Router,
+    public dsoNameService: DSONameService,
+  ) {
+    super(groupService, ePersonDataService, translateService, notificationsService, formBuilder, paginationService, router, dsoNameService);
+  }
+
+  ngOnInit() {
+    this.searchForm = this.formBuilder.group(({
+      scope: 'metadata',
+      query: '',
+    }));
+  }
+
+  ngOnChanges(changes: SimpleChanges): void {
+    this.groupId = changes.groupId.currentValue;
+    if (changes.groupId.currentValue !== changes.groupId.previousValue) {
+      if (this.groupId === null) {
+        this.retrieveMembers(this.config.currentPage);
+      } else {
+        this.subs.set(SubKey.ActiveGroup, this.groupService.findById(this.groupId).pipe(
+          getFirstSucceededRemoteDataPayload(),
+        ).subscribe((activeGroup: Group) => {
+          if (activeGroup != null) {
+            this.groupDataService.editGroup(activeGroup);
+            this.groupBeingEdited = activeGroup;
+            this.retrieveMembers(this.config.currentPage);
+          }
+        }));
+      }
+    }
+  }
+
+  /**
+   * Sets the list of currently selected members, when no group is defined the list of {@link selectedReviewers}
+   * will be set.
+   *
+   *  @param page The number of the page to retrieve
+   */
+  retrieveMembers(page: number): void {
+    this.config.currentPage = page;
+    if (this.groupId === null) {
+      this.unsubFrom(SubKey.Members);
+      const paginatedListOfEPersons: PaginatedList<EPerson> = new PaginatedList();
+      paginatedListOfEPersons.page = this.selectedReviewers;
+      this.ePeopleMembersOfGroup.next(paginatedListOfEPersons);
+    } else {
+      super.retrieveMembers(page);
+    }
+  }
+
+  /**
+   * Removes the {@link eperson} from the {@link selectedReviewers}
+   *
+   * @param eperson The {@link EPerson} to remove
+   */
+  deleteMemberFromGroup(eperson: EPerson) {
+    const index = this.selectedReviewers.indexOf(eperson);
+    if (index !== -1) {
+      this.selectedReviewers.splice(index, 1);
+    }
+    this.selectedReviewersUpdated.emit(this.selectedReviewers);
+  }
+
+  /**
+   * 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
+   */
+  addMemberToGroup(eperson: EPerson) {
+    if (!this.multipleReviewers) {
+      this.selectedReviewers = [];
+    }
+    this.selectedReviewers.push(eperson);
+    this.selectedReviewersUpdated.emit(this.selectedReviewers);
+  }
+
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts
new file mode 100644
index 0000000000..f63fb0e97e
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.spec.ts
@@ -0,0 +1,138 @@
+import { Location } from '@angular/common';
+import { Component } from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { ActivatedRoute } from '@angular/router';
+import { RouterTestingModule } from '@angular/router/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { MockComponent } from 'ng-mocks';
+import { of as observableOf } from 'rxjs';
+
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { DSOSelectorComponent } from '../../../shared/dso-selector/dso-selector/dso-selector.component';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { ClaimedTaskDataServiceStub } from '../../../shared/testing/claimed-task-data-service.stub';
+import { LocationStub } from '../../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../../../shared/testing/request-service.stub';
+import { routeServiceStub } from '../../../shared/testing/route-service.stub';
+import { WorkflowActionDataServiceStub } from '../../../shared/testing/workflow-action-data-service.stub';
+import { WorkflowItemDataServiceStub } from '../../../shared/testing/workflow-item-data-service.stub';
+import { AdvancedWorkflowActionComponent } from './advanced-workflow-action.component';
+
+const workflowId = '1';
+
+describe('AdvancedWorkflowActionComponent', () => {
+  let component: AdvancedWorkflowActionComponent;
+  let fixture: ComponentFixture<AdvancedWorkflowActionComponent>;
+
+  let claimedTaskDataService: ClaimedTaskDataServiceStub;
+  let location: LocationStub;
+  let notificationService: NotificationsServiceStub;
+  let workflowActionDataService: WorkflowActionDataServiceStub;
+  let workflowItemDataService: WorkflowItemDataServiceStub;
+
+  beforeEach(async () => {
+    claimedTaskDataService = new ClaimedTaskDataServiceStub();
+    location = new LocationStub();
+    notificationService = new NotificationsServiceStub();
+    workflowActionDataService = new WorkflowActionDataServiceStub();
+    workflowItemDataService = new WorkflowItemDataServiceStub();
+
+    await TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        RouterTestingModule,
+      ],
+      declarations: [
+        TestComponent,
+        MockComponent(DSOSelectorComponent),
+      ],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            data: observableOf({
+              id: workflowId,
+            }),
+            snapshot: {
+              queryParams: {
+                workflow: 'testaction',
+              },
+            },
+          },
+        },
+        { provide: ClaimedTaskDataService, useValue: claimedTaskDataService },
+        { provide: Location, useValue: location },
+        { provide: NotificationsService, useValue: notificationService },
+        { provide: RouteService, useValue: routeServiceStub },
+        { provide: WorkflowActionDataService, useValue: workflowActionDataService },
+        { provide: WorkflowItemDataService, useValue: workflowItemDataService },
+        { provide: RequestService, useClass: RequestServiceStub },
+      ],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TestComponent);
+    component = fixture.componentInstance;
+    component.ngOnInit();
+    fixture.detectChanges();
+  });
+
+  describe('sendRequest', () => {
+    it('should return true if the request succeeded', () => {
+      spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(true, 200)));
+      spyOn(workflowActionDataService, 'findById');
+
+      const result = component.sendRequest(workflowId);
+
+      expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith('1', {
+        'submit_test': true,
+      });
+      result.subscribe((value: boolean) => {
+        expect(value).toBeTrue();
+      });
+    });
+
+    it('should return false if the request didn\'t succeeded', () => {
+      spyOn(claimedTaskDataService, 'submitTask').and.returnValue(observableOf(new ProcessTaskResponse(false, 404)));
+      spyOn(workflowActionDataService, 'findById');
+
+      const result = component.sendRequest(workflowId);
+
+      expect(claimedTaskDataService.submitTask).toHaveBeenCalledWith('1', {
+        'submit_test': true,
+      });
+      result.subscribe((value: boolean) => {
+        expect(value).toBeFalse();
+      });
+    });
+  });
+});
+
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '',
+})
+class TestComponent extends AdvancedWorkflowActionComponent {
+
+  createBody(): any {
+    return {
+      'submit_test': true,
+    };
+  }
+
+  getType(): string {
+    return 'testaction';
+  }
+
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts
new file mode 100644
index 0000000000..7635020ebf
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action/advanced-workflow-action.component.ts
@@ -0,0 +1,95 @@
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+import { RequestService } from '../../../core/data/request.service';
+import { WorkflowActionDataService } from '../../../core/data/workflow-action-data.service';
+import { RouteService } from '../../../core/services/route.service';
+import { getFirstSucceededRemoteDataPayload } from '../../../core/shared/operators';
+import { WorkflowItemDataService } from '../../../core/submission/workflowitem-data.service';
+import { ClaimedTaskDataService } from '../../../core/tasks/claimed-task-data.service';
+import { ProcessTaskResponse } from '../../../core/tasks/models/process-task-response';
+import { WorkflowAction } from '../../../core/tasks/models/workflow-action-object.model';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { WorkflowItemActionPageComponent } from '../../workflow-item-action-page.component';
+
+/**
+ * Abstract component for rendering an advanced claimed task's workflow page
+ * To create a child-component for a new option:
+ * - Set the "{@link getType}()" of the component
+ * - Implement the {@link createBody}, should always contain at least the ADVANCED_WORKFLOW_TASK_OPTION_*
+ */
+@Component({
+  selector: 'ds-advanced-workflow-action',
+  template: '',
+})
+export abstract class AdvancedWorkflowActionComponent extends WorkflowItemActionPageComponent implements OnInit {
+
+  workflowAction$: Observable<WorkflowAction>;
+
+  constructor(
+    protected route: ActivatedRoute,
+    protected workflowItemService: WorkflowItemDataService,
+    protected router: Router,
+    protected routeService: RouteService,
+    protected notificationsService: NotificationsService,
+    protected translationService: TranslateService,
+    protected workflowActionService: WorkflowActionDataService,
+    protected claimedTaskDataService: ClaimedTaskDataService,
+    protected requestService: RequestService,
+    protected location: Location,
+  ) {
+    super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService, location);
+  }
+
+  ngOnInit(): void {
+    super.ngOnInit();
+    this.workflowAction$ = this.workflowActionService.findById(this.route.snapshot.queryParams.workflow).pipe(
+      getFirstSucceededRemoteDataPayload(),
+    );
+  }
+
+  /**
+   * Performs the action and shows a notification based on the outcome of the action
+   */
+  performAction(): void {
+    this.sendRequest(this.route.snapshot.queryParams.claimedTask).subscribe((successful: boolean) => {
+      if (successful) {
+        const title = this.translationService.get('workflow-item.' + this.type + '.notification.success.title');
+        const content = this.translationService.get('workflow-item.' + this.type + '.notification.success.content');
+        this.notificationsService.success(title, content);
+        this.previousPage();
+      } else {
+        const title = this.translationService.get('workflow-item.' + this.type + '.notification.error.title');
+        const content = this.translationService.get('workflow-item.' + this.type + '.notification.error.content');
+        this.notificationsService.error(title, content);
+      }
+    });
+  }
+
+  /**
+   * Submits the task with the given {@link createBody}.
+   *
+   * @param id The task id
+   */
+  sendRequest(id: string): Observable<boolean> {
+    return this.claimedTaskDataService.submitTask(id, this.createBody()).pipe(
+      map((processTaskResponse: ProcessTaskResponse) => processTaskResponse.hasSucceeded),
+    );
+  }
+
+  /**
+   * The body that needs to be passed to the {@link ClaimedTaskDataService}.submitTask().
+   */
+  abstract createBody(): any;
+
+}
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts
new file mode 100644
index 0000000000..df08d3e8ac
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.spec.ts
@@ -0,0 +1,93 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import { Router } from '@angular/router';
+import { getMockThemeService } from 'src/app/shared/mocks/theme-service.mock';
+import { ThemeService } from 'src/app/shared/theme-support/theme.service';
+
+import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths';
+import { DynamicComponentLoaderDirective } from '../../../shared/abstract-component-loader/dynamic-component-loader.directive';
+import { rendersAdvancedWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { RouterStub } from '../../../shared/testing/router.stub';
+import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-actions-loader.component';
+
+const ADVANCED_WORKFLOW_ACTION_TEST = 'testaction';
+
+describe('AdvancedWorkflowActionsLoaderComponent', () => {
+  let component: AdvancedWorkflowActionsLoaderComponent;
+  let fixture: ComponentFixture<AdvancedWorkflowActionsLoaderComponent>;
+
+  let router: RouterStub;
+  let themeService: ThemeService;
+
+  beforeEach(async () => {
+    router = new RouterStub();
+    themeService = getMockThemeService();
+
+    await TestBed.configureTestingModule({
+      declarations: [
+        DynamicComponentLoaderDirective,
+        AdvancedWorkflowActionsLoaderComponent,
+      ],
+      providers: [
+        { provide: Router, useValue: router },
+        { provide: ThemeService, useValue: themeService },
+      ],
+    }).overrideComponent(AdvancedWorkflowActionsLoaderComponent, {
+      set: {
+        changeDetection: ChangeDetectionStrategy.Default,
+        entryComponents: [AdvancedWorkflowActionTestComponent],
+      },
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(AdvancedWorkflowActionsLoaderComponent);
+    component = fixture.componentInstance;
+    component.type = ADVANCED_WORKFLOW_ACTION_TEST;
+    fixture.detectChanges();
+  });
+
+  afterEach(() => {
+    fixture.debugElement.nativeElement.remove();
+  });
+
+  describe('When the component is rendered', () => {
+    it('should display the AdvancedWorkflowActionTestComponent when the type has been defined in a rendersAdvancedWorkflowTaskOption', () => {
+      spyOn(component, 'getComponent').and.returnValue(AdvancedWorkflowActionTestComponent);
+
+      component.ngOnInit();
+      fixture.detectChanges();
+
+      expect(component.getComponent).toHaveBeenCalled();
+      expect(fixture.debugElement.query(By.css('#AdvancedWorkflowActionsLoaderComponent'))).not.toBeNull();
+      expect(router.navigate).not.toHaveBeenCalled();
+    });
+
+    it('should redirect to page not found when the type has not been defined in a rendersAdvancedWorkflowTaskOption', () => {
+      spyOn(component, 'getComponent').and.returnValue(undefined);
+      component.type = 'nonexistingaction';
+
+      component.ngOnInit();
+      fixture.detectChanges();
+
+      expect(component.getComponent).toHaveBeenCalled();
+      expect(router.navigate).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
+    });
+  });
+});
+
+@rendersAdvancedWorkflowTaskOption(ADVANCED_WORKFLOW_ACTION_TEST)
+@Component({
+  // eslint-disable-next-line @angular-eslint/component-selector
+  selector: '',
+  template: '<span id="AdvancedWorkflowActionsLoaderComponent"></span>',
+})
+class AdvancedWorkflowActionTestComponent {
+}
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
new file mode 100644
index 0000000000..e196f1417c
--- /dev/null
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component.ts
@@ -0,0 +1,54 @@
+import {
+  Component,
+  Input,
+  OnInit,
+} from '@angular/core';
+import { Router } from '@angular/router';
+import { AbstractComponentLoaderComponent } from 'src/app/shared/abstract-component-loader/abstract-component-loader.component';
+
+import { PAGE_NOT_FOUND_PATH } from '../../../app-routing-paths';
+import { GenericConstructor } from '../../../core/shared/generic-constructor';
+import { hasValue } from '../../../shared/empty.util';
+import { getAdvancedComponentByWorkflowTaskOption } from '../../../shared/mydspace-actions/claimed-task/switcher/claimed-task-actions-decorator';
+import { ThemeService } from '../../../shared/theme-support/theme.service';
+
+/**
+ * Component for loading a {@link AdvancedWorkflowActionComponent} depending on the "{@link type}" input
+ */
+@Component({
+  selector: 'ds-advanced-workflow-actions-loader',
+  templateUrl: '../../../shared/abstract-component-loader/abstract-component-loader.component.html',
+})
+export class AdvancedWorkflowActionsLoaderComponent extends AbstractComponentLoaderComponent<Component> implements OnInit {
+
+  /**
+   * The name of the type to render
+   * Passed on to the decorator to fetch the relevant component for this option
+   */
+  @Input() type: string;
+
+  protected inputNames: (keyof this & string)[] = [
+    ...this.inputNames,
+    'type',
+  ];
+
+  constructor(
+    protected themeService: ThemeService,
+    private router: Router,
+  ) {
+    super(themeService);
+  }
+
+  ngOnInit(): void {
+    if (hasValue(this.getComponent())) {
+      super.ngOnInit();
+    } else {
+      void this.router.navigate([PAGE_NOT_FOUND_PATH]);
+    }
+  }
+
+  public getComponent(): GenericConstructor<Component> {
+    return getAdvancedComponentByWorkflowTaskOption(this.type);
+  }
+
+}
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..5bf6aec2ff 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
@@ -1,4 +1,5 @@
 import { first } from 'rxjs/operators';
+
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
@@ -11,13 +12,13 @@ describe('ItemFromWorkflowResolver', () => {
     const itemUuid = '8888-8888-8888-8888';
     const wfi = {
       id: uuid,
-      item: createSuccessfulRemoteDataObject$({ id: itemUuid })
+      item: createSuccessfulRemoteDataObject$({ id: itemUuid }),
     };
 
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
+        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi),
       } as any;
       resolver = new ItemFromWorkflowResolver(wfiService, null);
     });
@@ -29,7 +30,7 @@ describe('ItemFromWorkflowResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(itemUuid);
             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..237a6ad945 100644
--- a/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
+++ b/src/app/workflowitems-edit-page/item-from-workflow.resolver.ts
@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Resolve } from '@angular/router';
+import { Store } from '@ngrx/store';
+
 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';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated
@@ -13,7 +14,7 @@ import { SubmissionObjectResolver } from '../core/submission/resolver/submission
 export class ItemFromWorkflowResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
   constructor(
     private workflowItemService: WorkflowItemDataService,
-    protected store: Store<any>
+    protected store: Store<any>,
   ) {
     super(workflowItemService, store);
   }
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
index c7b9858836..d775823746 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.spec.ts
@@ -1,21 +1,45 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TranslateLoader, TranslateModule, TranslateService } from '@ngx-translate/core';
-import { WorkflowItemActionPageComponent } from './workflow-item-action-page.component';
-import { NotificationsService } from '../shared/notifications/notifications.service';
-import { RouteService } from '../core/services/route.service';
-import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
-import { Observable, of as observableOf } from 'rxjs';
-import { VarDirective } from '../shared/utils/var.directive';
+import { Location } from '@angular/common';
+import {
+  Component,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
+
+import { RequestService } from '../core/data/request.service';
+import { RouteService } from '../core/services/route.service';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { TranslateLoaderMock } from '../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../shared/remote-data.utils';
 import { ActivatedRouteStub } from '../shared/testing/active-router.stub';
-import { RouterStub } from '../shared/testing/router.stub';
+import { LocationStub } from '../shared/testing/location.stub';
 import { NotificationsServiceStub } from '../shared/testing/notifications-service.stub';
+import { RequestServiceStub } from '../shared/testing/request-service.stub';
+import { RouterStub } from '../shared/testing/router.stub';
+import { VarDirective } from '../shared/utils/var.directive';
+import { WorkflowItemActionPageComponent } from './workflow-item-action-page.component';
 
 const type = 'testType';
 describe('WorkflowItemActionPageComponent', () => {
@@ -28,7 +52,7 @@ describe('WorkflowItemActionPageComponent', () => {
 
   function init() {
     wfiService = jasmine.createSpyObj('workflowItemService', {
-      sendBack: observableOf(true)
+      sendBack: observableOf(true),
     });
     itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
     wfi = new WorkflowItem();
@@ -42,18 +66,20 @@ describe('WorkflowItemActionPageComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [TestComponent, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub({}, { wfi: createSuccessfulRemoteDataObject(wfi) }) },
         { provide: Router, useClass: RouterStub },
         { provide: RouteService, useValue: {} },
+        { provide: Location, useValue: new LocationStub() },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: WorkflowItemDataService, useValue: wfiService },
+        { provide: RequestService, useClass: RequestServiceStub },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
@@ -100,9 +126,9 @@ describe('WorkflowItemActionPageComponent', () => {
 });
 
 @Component({
-    selector: 'ds-workflow-item-test-action-page',
-    templateUrl: 'workflow-item-action-page.component.html'
-  }
+  selector: 'ds-workflow-item-test-action-page',
+  templateUrl: 'workflow-item-action-page.component.html',
+},
 )
 class TestComponent extends WorkflowItemActionPageComponent {
   constructor(protected route: ActivatedRoute,
@@ -110,8 +136,11 @@ class TestComponent extends WorkflowItemActionPageComponent {
               protected router: Router,
               protected routeService: RouteService,
               protected notificationsService: NotificationsService,
-              protected translationService: TranslateService) {
-    super(route, workflowItemService, router, routeService, notificationsService, translationService);
+              protected translationService: TranslateService,
+              protected requestService: RequestService,
+              protected location: Location,
+  ) {
+    super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService, location);
   }
 
   getType(): string {
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
index 7f09f3a3d2..d245fc3082 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.ts
@@ -1,35 +1,60 @@
-import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
-import { map, switchMap, take } from 'rxjs/operators';
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Params,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
-import { Item } from '../core/shared/item.model';
-import { ActivatedRoute, Data, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { RouteService } from '../core/services/route.service';
-import { NotificationsService } from '../shared/notifications/notifications.service';
+import {
+  combineLatest,
+  Observable,
+} from 'rxjs';
+import {
+  map,
+  switchMap,
+  take,
+} from 'rxjs/operators';
+
 import { RemoteData } from '../core/data/remote-data';
-import { getAllSucceededRemoteData, getRemoteDataPayload } from '../core/shared/operators';
+import { RequestService } from '../core/data/request.service';
+import { RouteService } from '../core/services/route.service';
+import { Item } from '../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+} from '../core/shared/operators';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { isEmpty } from '../shared/empty.util';
+import { NotificationsService } from '../shared/notifications/notifications.service';
 
 /**
  * Abstract component representing a page to perform an action on a workflow item
  */
 @Component({
   selector: 'ds-workflowitem-action-page',
-  template: ''
+  template: '',
 })
 export abstract class WorkflowItemActionPageComponent implements OnInit {
   public type;
   public wfi$: Observable<WorkflowItem>;
   public item$: Observable<Item>;
+  protected previousQueryParameters?: Params;
 
   constructor(protected route: ActivatedRoute,
               protected workflowItemService: WorkflowItemDataService,
               protected router: Router,
               protected routeService: RouteService,
               protected notificationsService: NotificationsService,
-              protected translationService: TranslateService) {
+              protected translationService: TranslateService,
+              protected requestService: RequestService,
+              protected location: Location,
+  ) {
   }
 
   /**
@@ -39,15 +64,16 @@ export abstract class WorkflowItemActionPageComponent implements OnInit {
     this.type = this.getType();
     this.wfi$ = this.route.data.pipe(map((data: Data) => data.wfi as RemoteData<WorkflowItem>), getRemoteDataPayload());
     this.item$ = this.wfi$.pipe(switchMap((wfi: WorkflowItem) => (wfi.item as Observable<RemoteData<Item>>).pipe(getAllSucceededRemoteData(), getRemoteDataPayload())));
+    this.previousQueryParameters = (this.location.getState() as { [key: string]: any }).previousQueryParams;
   }
 
   /**
    * Performs the action and shows a notification based on the outcome of the action
    */
   performAction() {
-    this.wfi$.pipe(
+    combineLatest([this.wfi$, this.requestService.removeByHrefSubstring('/discover')]).pipe(
       take(1),
-      switchMap((wfi: WorkflowItem) => this.sendRequest(wfi.id))
+      switchMap(([wfi]) => this.sendRequest(wfi.id)),
     ).subscribe((successful: boolean) => {
       if (successful) {
         const title = this.translationService.get('workflow-item.' + this.type + '.notification.success.title');
@@ -69,11 +95,18 @@ export abstract class WorkflowItemActionPageComponent implements OnInit {
   previousPage() {
     this.routeService.getPreviousUrl().pipe(take(1))
       .subscribe((url) => {
-          if (isEmpty(url)) {
-            url = '/mydspace';
-          }
-          this.router.navigateByUrl(url);
+        let params: Params = {};
+        if (isEmpty(url)) {
+          url = '/mydspace';
+          params = this.previousQueryParameters;
         }
+        if (url.split('?').length > 1) {
+          for (const param of url.split('?')[1].split('&')) {
+            params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]);
+          }
+        }
+        void this.router.navigate([url.split('?')[0]], { queryParams: params });
+      },
       );
   }
 
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
index 358d26b482..c2f0abbde4 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/themed-workflow-item-delete.component.ts
@@ -1,7 +1,8 @@
-import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { Component } from '@angular/core';
 
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
+
 /**
  * Themed wrapper for WorkflowItemDeleteComponent
  */
@@ -9,7 +10,7 @@ import { Component } from '@angular/core';
 @Component({
   selector: 'ds-themed-workflow-item-delete',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedWorkflowItemDeleteComponent extends ThemedComponent<WorkflowItemDeleteComponent> {
   protected getComponentName(): string {
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
index a4e8f7d849..0b89452694 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.spec.ts
@@ -1,22 +1,37 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
+
 import { RequestService } from '../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouteService } from '../../core/services/route.service';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { LocationStub } from '../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { WorkflowItemDeleteComponent } from './workflow-item-delete.component';
 
 describe('WorkflowItemDeleteComponent', () => {
   let component: WorkflowItemDeleteComponent;
@@ -28,7 +43,7 @@ describe('WorkflowItemDeleteComponent', () => {
 
   function init() {
     wfiService = jasmine.createSpyObj('workflowItemService', {
-      delete: observableOf(true)
+      delete: observableOf(true),
     });
     itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
     wfi = new WorkflowItem();
@@ -42,19 +57,20 @@ describe('WorkflowItemDeleteComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [WorkflowItemDeleteComponent, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub({}, { wfi: createSuccessfulRemoteDataObject(wfi) }) },
         { provide: Router, useClass: RouterStub },
         { provide: RouteService, useValue: {} },
+        { provide: Location, useValue: new LocationStub() },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: WorkflowItemDataService, useValue: wfiService },
         { provide: RequestService, useValue: getMockRequestService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 451469b5e4..516d57e1a4 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,20 +1,25 @@
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
-import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
-import { RequestService } from '../../core/data/request.service';
+import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
+
 import { RemoteData } from '../../core/data/remote-data';
+import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
 import { NoContent } from '../../core/shared/NoContent.model';
 import { getFirstCompletedRemoteData } from '../../core/shared/operators';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
 
 @Component({
   selector: 'ds-workflow-item-delete',
-  templateUrl: '../workflow-item-action-page.component.html'
+  templateUrl: '../workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to delete a workflow item
@@ -26,8 +31,10 @@ export class WorkflowItemDeleteComponent extends WorkflowItemActionPageComponent
               protected routeService: RouteService,
               protected notificationsService: NotificationsService,
               protected translationService: TranslateService,
-              protected requestService: RequestService) {
-    super(route, workflowItemService, router, routeService, notificationsService, translationService);
+              protected requestService: RequestService,
+              protected location: Location,
+  ) {
+    super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService, location);
   }
 
   /**
@@ -42,10 +49,9 @@ export class WorkflowItemDeleteComponent extends WorkflowItemActionPageComponent
    * @param id The id of the WorkflowItem
    */
   sendRequest(id: string): Observable<boolean> {
-    this.requestService.removeByHrefSubstring('/discover');
     return this.workflowItemService.delete(id).pipe(
       getFirstCompletedRemoteData(),
-      map((response: RemoteData<NoContent>) => response.hasSucceeded)
+      map((response: RemoteData<NoContent>) => response.hasSucceeded),
     );
   }
 }
diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
index 8f6a1f1de0..21f9e6e00a 100644
--- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.spec.ts
@@ -1,7 +1,8 @@
 import { first } from 'rxjs/operators';
-import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
+
 import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
 
 describe('WorkflowItemPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('WorkflowItemPageResolver', () => {
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       } as any;
       resolver = new WorkflowItemPageResolver(wfiService);
     });
@@ -23,7 +24,7 @@ describe('WorkflowItemPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
index 4bb3eac513..c5c2d4d717 100644
--- a/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-page.resolver.ts
@@ -1,11 +1,16 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
 import { RemoteData } from '../core/data/remote-data';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../core/submission/workflowitem-data.service';
+import { followLink } from '../shared/utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific workflow item before the route is activated
diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
index 5a3e9ca476..2a6054f691 100644
--- a/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-send-back/themed-workflow-item-send-back.component.ts
@@ -1,5 +1,6 @@
-import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
 import { WorkflowItemSendBackComponent } from './workflow-item-send-back.component';
 
 /**
@@ -9,7 +10,7 @@ import { WorkflowItemSendBackComponent } from './workflow-item-send-back.compone
 @Component({
   selector: 'ds-themed-workflow-item-send-back',
   styleUrls: [],
-  templateUrl: './../../shared/theme-support/themed.component.html'
+  templateUrl: './../../shared/theme-support/themed.component.html',
 })
 export class ThemedWorkflowItemSendBackComponent extends ThemedComponent<WorkflowItemSendBackComponent> {
   protected getComponentName(): string {
diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
index d9dde8244c..95f90b34dd 100644
--- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.spec.ts
@@ -1,22 +1,37 @@
-import { waitForAsync, ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { Location } from '@angular/common';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { VarDirective } from '../../shared/utils/var.directive';
+import {
+  ComponentFixture,
+  TestBed,
+  waitForAsync,
+} from '@angular/core/testing';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { of as observableOf } from 'rxjs';
-import { WorkflowItemSendBackComponent } from './workflow-item-send-back.component';
+
 import { RequestService } from '../../core/data/request.service';
-import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/remote-data.utils';
-import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
-import { RouterStub } from '../../shared/testing/router.stub';
-import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
-import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { RouteService } from '../../core/services/route.service';
+import { WorkflowItem } from '../../core/submission/models/workflowitem.model';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
 import { getMockRequestService } from '../../shared/mocks/request.service.mock';
+import { TranslateLoaderMock } from '../../shared/mocks/translate-loader.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  createSuccessfulRemoteDataObject,
+  createSuccessfulRemoteDataObject$,
+} from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { LocationStub } from '../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { RouterStub } from '../../shared/testing/router.stub';
+import { VarDirective } from '../../shared/utils/var.directive';
+import { WorkflowItemSendBackComponent } from './workflow-item-send-back.component';
 
 describe('WorkflowItemSendBackComponent', () => {
   let component: WorkflowItemSendBackComponent;
@@ -28,7 +43,7 @@ describe('WorkflowItemSendBackComponent', () => {
 
   function init() {
     wfiService = jasmine.createSpyObj('workflowItemService', {
-      sendBack: observableOf(true)
+      sendBack: observableOf(true),
     });
     itemRD$ = createSuccessfulRemoteDataObject$(itemRD$);
     wfi = new WorkflowItem();
@@ -42,19 +57,20 @@ describe('WorkflowItemSendBackComponent', () => {
       imports: [TranslateModule.forRoot({
         loader: {
           provide: TranslateLoader,
-          useClass: TranslateLoaderMock
-        }
+          useClass: TranslateLoaderMock,
+        },
       })],
       declarations: [WorkflowItemSendBackComponent, VarDirective],
       providers: [
         { provide: ActivatedRoute, useValue: new ActivatedRouteStub({}, { wfi: createSuccessfulRemoteDataObject(wfi) }) },
         { provide: Router, useClass: RouterStub },
         { provide: RouteService, useValue: {} },
+        { provide: Location, useValue: new LocationStub() },
         { provide: NotificationsService, useClass: NotificationsServiceStub },
         { provide: WorkflowItemDataService, useValue: wfiService },
         { provide: RequestService, useValue: getMockRequestService() },
       ],
-      schemas: [NO_ERRORS_SCHEMA]
+      schemas: [NO_ERRORS_SCHEMA],
     })
       .compileComponents();
   }));
diff --git a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
index 002e5dcc9a..651924787f 100644
--- a/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component.ts
@@ -1,16 +1,21 @@
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
-import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
-import { Observable } from 'rxjs';
-import { ActivatedRoute, Router } from '@angular/router';
-import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
-import { RouteService } from '../../core/services/route.service';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
 import { TranslateService } from '@ngx-translate/core';
+import { Observable } from 'rxjs';
+
 import { RequestService } from '../../core/data/request.service';
+import { RouteService } from '../../core/services/route.service';
+import { WorkflowItemDataService } from '../../core/submission/workflowitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { WorkflowItemActionPageComponent } from '../workflow-item-action-page.component';
 
 @Component({
   selector: 'ds-workflow-item-send-back',
-  templateUrl: '../workflow-item-action-page.component.html'
+  templateUrl: '../workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to send back a workflow item to the submitter
@@ -22,8 +27,10 @@ export class WorkflowItemSendBackComponent extends WorkflowItemActionPageCompone
               protected routeService: RouteService,
               protected notificationsService: NotificationsService,
               protected translationService: TranslateService,
-              protected requestService: RequestService) {
-    super(route, workflowItemService, router, routeService, notificationsService, translationService);
+              protected requestService: RequestService,
+              protected location: Location,
+  ) {
+    super(route, workflowItemService, router, routeService, notificationsService, translationService, requestService, location);
   }
 
   /**
@@ -38,7 +45,6 @@ export class WorkflowItemSendBackComponent extends WorkflowItemActionPageCompone
    * @param id The id of the WorkflowItem
    */
   sendRequest(id: string): Observable<boolean> {
-    this.requestService.removeByHrefSubstring('/discover');
     return this.workflowItemService.sendBack(id);
   }
 }
diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
index e2d969a872..1b21174c60 100644
--- a/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page-routing-paths.ts
@@ -1,5 +1,8 @@
+import {
+  getWorkflowItemModuleRoute,
+  getWorkspaceItemModuleRoute,
+} from '../app-routing-paths';
 import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getWorkflowItemModuleRoute } from '../app-routing-paths';
 
 export function getWorkflowItemPageRoute(wfiId: string) {
   return new URLCombiner(getWorkflowItemModuleRoute(), wfiId).toString();
@@ -20,7 +23,22 @@ export function getWorkflowItemSendBackRoute(wfiId: string) {
   return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, WORKFLOW_ITEM_SEND_BACK_PATH).toString();
 }
 
+export function getAdvancedWorkflowRoute(wfiId: string) {
+  return new URLCombiner(getWorkflowItemModuleRoute(), wfiId, ADVANCED_WORKFLOW_PATH).toString();
+}
+
+export function getWorkspaceItemDeleteRoute(wsiId: string) {
+  return new URLCombiner(getWorkspaceItemModuleRoute(), wsiId, WORKSPACE_ITEM_DELETE_PATH).toString();
+}
+
+export function getWorkspaceItemEditRoute(wsiId: string) {
+  return new URLCombiner(getWorkspaceItemModuleRoute(), wsiId, WORKSPACE_ITEM_EDIT_PATH).toString();
+}
+
 export const WORKFLOW_ITEM_EDIT_PATH = 'edit';
 export const WORKFLOW_ITEM_DELETE_PATH = 'delete';
 export const WORKFLOW_ITEM_VIEW_PATH = 'view';
 export const WORKFLOW_ITEM_SEND_BACK_PATH = 'sendback';
+export const ADVANCED_WORKFLOW_PATH = 'advanced';
+export const WORKSPACE_ITEM_DELETE_PATH = 'delete';
+export const WORKSPACE_ITEM_EDIT_PATH = 'edit';
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 9c24bacb98..a5e0a261b0 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
@@ -2,19 +2,21 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
+import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
+import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
+import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
+import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
+import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
 import { WorkflowItemPageResolver } from './workflow-item-page.resolver';
+import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
 import {
+  ADVANCED_WORKFLOW_PATH,
   WORKFLOW_ITEM_DELETE_PATH,
   WORKFLOW_ITEM_EDIT_PATH,
   WORKFLOW_ITEM_SEND_BACK_PATH,
-  WORKFLOW_ITEM_VIEW_PATH
+  WORKFLOW_ITEM_VIEW_PATH,
 } from './workflowitems-edit-page-routing-paths';
-import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
-import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
-import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
-import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { ItemFromWorkflowResolver } from './item-from-workflow.resolver';
-import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
 
 @NgModule({
   imports: [
@@ -28,9 +30,13 @@ import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-
             path: WORKFLOW_ITEM_EDIT_PATH,
             component: ThemedSubmissionEditComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
+            },
+            data: {
+              title: 'workflow-item.edit.title',
+              breadcrumbKey: 'workflow-item.edit',
+              collectionModifiable: false,
             },
-            data: { title: 'workflow-item.edit.title', breadcrumbKey: 'workflow-item.edit' }
           },
           {
             canActivate: [AuthenticatedGuard],
@@ -38,33 +44,42 @@ import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-
             component: ThemedFullItemPageComponent,
             resolve: {
               dso: ItemFromWorkflowResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' }
+            data: { title: 'workflow-item.view.title', breadcrumbKey: 'workflow-item.view' },
           },
           {
             canActivate: [AuthenticatedGuard],
             path: WORKFLOW_ITEM_DELETE_PATH,
             component: ThemedWorkflowItemDeleteComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.delete.title', breadcrumbKey: 'workflow-item.edit' }
+            data: { title: 'workflow-item.delete.title', breadcrumbKey: 'workflow-item.edit' },
           },
           {
             canActivate: [AuthenticatedGuard],
             path: WORKFLOW_ITEM_SEND_BACK_PATH,
             component: ThemedWorkflowItemSendBackComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' }
-          }
-        ]
-      }]
-    )
+            data: { title: 'workflow-item.send-back.title', breadcrumbKey: 'workflow-item.edit' },
+          },
+          {
+            canActivate: [AuthenticatedGuard],
+            path: ADVANCED_WORKFLOW_PATH,
+            component: AdvancedWorkflowActionPageComponent,
+            resolve: {
+              breadcrumb: I18nBreadcrumbResolver,
+            },
+            data: { title: 'workflow-item.advanced.title', breadcrumbKey: 'workflow-item.edit' },
+          },
+        ],
+      }],
+    ),
   ],
-  providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver]
+  providers: [WorkflowItemPageResolver, ItemFromWorkflowResolver],
 })
 /**
  * This module defines the default component to load when navigating to the workflowitems edit page path.
diff --git a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
index e99a3ca958..338e6c8a74 100644
--- a/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
+++ b/src/app/workflowitems-edit-page/workflowitems-edit-page.module.ts
@@ -1,14 +1,23 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { SharedModule } from '../shared/shared.module';
-import { WorkflowItemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
-import { SubmissionModule } from '../submission/submission.module';
-import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component';
-import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
-import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
-import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
-import { StatisticsModule } from '../statistics/statistics.module';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { AccessControlModule } from '../access-control/access-control.module';
 import { ItemPageModule } from '../item-page/item-page.module';
+import { FormModule } from '../shared/form/form.module';
+import { SharedModule } from '../shared/shared.module';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { SubmissionModule } from '../submission/submission.module';
+import { AdvancedWorkflowActionPageComponent } from './advanced-workflow-action/advanced-workflow-action-page/advanced-workflow-action-page.component';
+import { AdvancedWorkflowActionRatingComponent } from './advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component';
+import { AdvancedWorkflowActionSelectReviewerComponent } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component';
+import { ReviewersListComponent } from './advanced-workflow-action/advanced-workflow-action-select-reviewer/reviewers-list/reviewers-list.component';
+import { AdvancedWorkflowActionsLoaderComponent } from './advanced-workflow-action/advanced-workflow-actions-loader/advanced-workflow-actions-loader.component';
+import { ThemedWorkflowItemDeleteComponent } from './workflow-item-delete/themed-workflow-item-delete.component';
+import { WorkflowItemDeleteComponent } from './workflow-item-delete/workflow-item-delete.component';
+import { ThemedWorkflowItemSendBackComponent } from './workflow-item-send-back/themed-workflow-item-send-back.component';
+import { WorkflowItemSendBackComponent } from './workflow-item-send-back/workflow-item-send-back.component';
+import { WorkflowItemsEditPageRoutingModule } from './workflowitems-edit-page-routing.module';
 
 @NgModule({
   imports: [
@@ -17,14 +26,22 @@ import { ItemPageModule } from '../item-page/item-page.module';
     SharedModule,
     SubmissionModule,
     StatisticsModule,
-    ItemPageModule
+    ItemPageModule,
+    AccessControlModule,
+    FormModule,
+    NgbModule,
   ],
   declarations: [
     WorkflowItemDeleteComponent,
     ThemedWorkflowItemDeleteComponent,
     WorkflowItemSendBackComponent,
-    ThemedWorkflowItemSendBackComponent
-  ]
+    ThemedWorkflowItemSendBackComponent,
+    AdvancedWorkflowActionsLoaderComponent,
+    AdvancedWorkflowActionRatingComponent,
+    AdvancedWorkflowActionSelectReviewerComponent,
+    AdvancedWorkflowActionPageComponent,
+    ReviewersListComponent,
+  ],
 })
 /**
  * This module handles all modules that need to access the workflowitems edit page.
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..77232762c3 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
@@ -1,4 +1,5 @@
 import { first } from 'rxjs/operators';
+
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
 import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
@@ -11,13 +12,13 @@ describe('ItemFromWorkspaceResolver', () => {
     const itemUuid = '8888-8888-8888-8888';
     const wfi = {
       id: uuid,
-      item: createSuccessfulRemoteDataObject$({ id: itemUuid })
+      item: createSuccessfulRemoteDataObject$({ id: itemUuid }),
     };
 
 
     beforeEach(() => {
       wfiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi)
+        findById: (id: string) => createSuccessfulRemoteDataObject$(wfi),
       } as any;
       resolver = new ItemFromWorkspaceResolver(wfiService, null);
     });
@@ -29,7 +30,7 @@ describe('ItemFromWorkspaceResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(itemUuid);
             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..efbf28c61c 100644
--- a/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
+++ b/src/app/workspaceitems-edit-page/item-from-workspace.resolver.ts
@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
 import { Resolve } from '@angular/router';
+import { Store } from '@ngrx/store';
+
 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';
 
@@ -11,11 +12,11 @@ import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.
  */
 @Injectable()
 export class ItemFromWorkspaceResolver extends SubmissionObjectResolver<Item> implements Resolve<RemoteData<Item>>  {
-    constructor(
+  constructor(
         private workspaceItemService: WorkspaceitemDataService,
-        protected store: Store<any>
-    ) {
-        super(workspaceItemService, store);
-    }
+        protected store: Store<any>,
+  ) {
+    super(workspaceItemService, store);
+  }
 
 }
diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
index bbd3360db4..0502da186b 100644
--- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
+++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.spec.ts
@@ -1,7 +1,8 @@
 import { first } from 'rxjs/operators';
-import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
+
 import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/remote-data.utils';
+import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
 
 describe('WorkflowItemPageResolver', () => {
   describe('resolve', () => {
@@ -11,7 +12,7 @@ describe('WorkflowItemPageResolver', () => {
 
     beforeEach(() => {
       wsiService = {
-        findById: (id: string) => createSuccessfulRemoteDataObject$({ id })
+        findById: (id: string) => createSuccessfulRemoteDataObject$({ id }),
       } as any;
       resolver = new WorkspaceItemPageResolver(wsiService);
     });
@@ -23,7 +24,7 @@ describe('WorkflowItemPageResolver', () => {
           (resolved) => {
             expect(resolved.payload.id).toEqual(uuid);
             done();
-          }
+          },
         );
     });
   });
diff --git a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
index 1b1aa25492..d10fb8a2b8 100644
--- a/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
+++ b/src/app/workspaceitems-edit-page/workspace-item-page.resolver.ts
@@ -1,11 +1,16 @@
 import { Injectable } from '@angular/core';
-import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
+import {
+  ActivatedRouteSnapshot,
+  Resolve,
+  RouterStateSnapshot,
+} from '@angular/router';
 import { Observable } from 'rxjs';
+
 import { RemoteData } from '../core/data/remote-data';
-import { followLink } from '../shared/utils/follow-link-config.model';
-import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
-import { WorkflowItem } from '../core/submission/models/workflowitem.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
+import { WorkflowItem } from '../core/submission/models/workflowitem.model';
+import { WorkspaceitemDataService } from '../core/submission/workspaceitem-data.service';
+import { followLink } from '../shared/utils/follow-link-config.model';
 
 /**
  * This class represents a resolver that requests a specific workflow item before the route is activated
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts
new file mode 100644
index 0000000000..5f30cc0d1c
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/themed-workspaceitems-delete-page.component.ts
@@ -0,0 +1,27 @@
+import { Component } from '@angular/core';
+
+import { ThemedComponent } from '../../shared/theme-support/themed.component';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component';
+
+/**
+ * Themed wrapper for WorkspaceItemsDeletePageComponent
+ */
+
+@Component({
+  selector: 'ds-themed-workspace-items-delete',
+  styleUrls: [],
+  templateUrl: './../../shared/theme-support/themed.component.html',
+})
+export class ThemedWorkspaceItemsDeletePageComponent extends ThemedComponent<WorkspaceItemsDeletePageComponent> {
+  protected getComponentName(): string {
+    return 'WorkspaceItemsDeletePageComponent';
+  }
+
+  protected importThemedComponent(themeName: string): Promise<any> {
+    return import(`../../../themes/${themeName}/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component`);
+  }
+
+  protected importUnthemedComponent(): Promise<any> {
+    return import(`./workspaceitems-delete-page.component`);
+  }
+}
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
new file mode 100644
index 0000000000..a0f0a1711e
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -0,0 +1,24 @@
+<div class="container">
+  <h2>{{ 'workspace-item.delete.header' | translate }}</h2>
+  <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>
+</div>
+
+<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>
+    <button type="button" id="delete_close" class="close" aria-label="Close" (click)="d('cancel')">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="modal-body">
+    <p>{{ 'submission.general.discard.confirm.info' | translate }}</p>
+  </div>
+  <div class="modal-footer">
+    <button type="button" id="delete_cancel" class="btn btn-secondary"
+      (click)="c('cancel')">{{ 'submission.general.discard.confirm.cancel' | translate }}</button>
+    <button type="button" id="delete_confirm" class="btn btn-danger"
+      (click)="c('ok')">{{ 'submission.general.discard.confirm.submit' | translate }}</button>
+  </div>
+</ng-template>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss
new file mode 100644
index 0000000000..e52175abea
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss
@@ -0,0 +1,4 @@
+
+:host ::ng-deep ds-modify-item-overview table {
+  display: inline-table !important;
+}
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts
new file mode 100644
index 0000000000..06fa6ddb80
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.spec.ts
@@ -0,0 +1,117 @@
+import { Location } from '@angular/common';
+import {
+  EventEmitter,
+  NO_ERRORS_SCHEMA,
+} from '@angular/core';
+import {
+  ComponentFixture,
+  TestBed,
+} from '@angular/core/testing';
+import { By } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  Router,
+} from '@angular/router';
+import { NgbModalModule } from '@ng-bootstrap/ng-bootstrap';
+import {
+  TranslateModule,
+  TranslateService,
+} from '@ngx-translate/core';
+import { of as observableOf } from 'rxjs';
+
+import { RouteService } from '../../core/services/route.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { RouterMock } from '../../shared/mocks/router.mock';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { createSuccessfulRemoteDataObject } from '../../shared/remote-data.utils';
+import { ActivatedRouteStub } from '../../shared/testing/active-router.stub';
+import { LocationStub } from '../../shared/testing/location.stub';
+import { NotificationsServiceStub } from '../../shared/testing/notifications-service.stub';
+import { routeServiceStub } from '../../shared/testing/route-service.stub';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page.component';
+
+describe('WorkspaceitemsDeletePageComponent', () => {
+  let component: WorkspaceItemsDeletePageComponent;
+  let fixture: ComponentFixture<WorkspaceItemsDeletePageComponent>;
+
+  const workspaceitemDataServiceSpy = jasmine.createSpyObj('WorkspaceitemDataService', {
+    delete: observableOf(createSuccessfulRemoteDataObject({})),
+  });
+
+  const wsi = new WorkspaceItem();
+  wsi.id = '1234';
+  const dso = new DSpaceObject();
+  dso.uuid = '1234';
+
+  const translateServiceStub = {
+    get: () => observableOf('test-message'),
+    onLangChange: new EventEmitter(),
+    onTranslationChange: new EventEmitter(),
+    onDefaultLangChange: new EventEmitter(),
+  };
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      imports: [
+        NgbModalModule,
+        TranslateModule.forRoot(),
+      ],
+      declarations: [WorkspaceItemsDeletePageComponent],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: new ActivatedRouteStub(
+            {},
+            {
+              wsi: createSuccessfulRemoteDataObject(wsi),
+              dso: createSuccessfulRemoteDataObject(dso),
+            },
+          ),
+        },
+        { provide: Router, useValue: new RouterMock() },
+        {
+          provide: WorkspaceitemDataService,
+          useValue: workspaceitemDataServiceSpy,
+        },
+        { provide: Location, useValue: new LocationStub() },
+        {
+          provide: NotificationsService,
+          useValue: new NotificationsServiceStub(),
+        },
+        { provide: TranslateService, useValue: translateServiceStub },
+        { provide: RouteService, useValue: routeServiceStub },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(WorkspaceItemsDeletePageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should have the current WorkspaceItem', () => {
+    (component as any).activatedRoute.data.subscribe((data) => {
+      expect(data.wsi.payload.id).toEqual('1234');
+    });
+  });
+
+  it('should delete the target workspace item', () => {
+    spyOn((component as any).modalService, 'open').and.returnValue({ result: Promise.resolve('ok') });
+    component.confirmDelete(By.css('#delete-modal'));
+    fixture.detectChanges();
+    expect((component as any).modalService.open).toHaveBeenCalled();
+  });
+
+  it('should call workspaceItemService.delete', () => {
+    component.sendDeleteRequest();
+    expect((component as any).workspaceItemService.delete).toHaveBeenCalledWith('1234');
+  });
+});
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
new file mode 100644
index 0000000000..af1a12ed46
--- /dev/null
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
@@ -0,0 +1,128 @@
+import { Location } from '@angular/common';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import {
+  ActivatedRoute,
+  Data,
+  Params,
+  Router,
+} from '@angular/router';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { TranslateService } from '@ngx-translate/core';
+import {
+  map,
+  Observable,
+  switchMap,
+  take,
+} from 'rxjs';
+
+import { RemoteData } from '../../core/data/remote-data';
+import { RouteService } from '../../core/services/route.service';
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { NoContent } from '../../core/shared/NoContent.model';
+import {
+  getFirstCompletedRemoteData,
+  getRemoteDataPayload,
+} from '../../core/shared/operators';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
+import { WorkspaceitemDataService } from '../../core/submission/workspaceitem-data.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+
+@Component({
+  selector: 'ds-workspaceitems-delete-page',
+  templateUrl: './workspaceitems-delete-page.component.html',
+  styleUrls: ['./workspaceitems-delete-page.component.scss'],
+})
+export class WorkspaceItemsDeletePageComponent implements OnInit {
+
+  /**
+   * The workspaceitem to delete
+   */
+  public wsi$: Observable<WorkspaceItem>;
+
+  /**
+   * The dspace object
+   */
+  public dso$: Observable<DSpaceObject>;
+
+  /**
+   * The previous query parameters
+   */
+  private previousQueryParameters?: Params;
+
+  constructor(
+    private activatedRoute: ActivatedRoute,
+    private router: Router,
+    private routeService: RouteService,
+    private workspaceItemService: WorkspaceitemDataService,
+    private notificationsService: NotificationsService,
+    private translationService: TranslateService,
+    private location: Location,
+    private modalService: NgbModal,
+  ) { }
+
+  ngOnInit(): void {
+    this.wsi$ = this.activatedRoute.data.pipe(map((data: Data) => data.wsi as RemoteData<WorkspaceItem>), getRemoteDataPayload());
+    this.dso$ = this.activatedRoute.data.pipe(map((data: Data) => data.dso as RemoteData<WorkspaceItem>), getRemoteDataPayload());
+    this.previousQueryParameters = (this.location.getState() as { [key: string]: any }).previousQueryParams;
+  }
+
+  /**
+   * Navigates to the previous url
+   * If there's not previous url, it continues to the mydspace page instead
+   */
+  previousPage() {
+    this.routeService.getPreviousUrl().pipe(take(1))
+      .subscribe((url: string) => {
+        let params: Params = {};
+        if (!url) {
+          url = '/mydspace';
+          params = this.previousQueryParameters;
+        }
+        if (url.split('?').length > 1) {
+          for (const param of url.split('?')[1].split('&')) {
+            params[param.split('=')[0]] = decodeURIComponent(param.split('=')[1]);
+          }
+        }
+        void this.router.navigate([url.split('?')[0]], { queryParams: params });
+      },
+      );
+  }
+
+  /**
+   * Open the modal to confirm the deletion of the workspaceitem
+   */
+  public async confirmDelete(content) {
+    await this.modalService.open(content).result.then(
+      (result) => {
+        if (result === 'ok') {
+          this.sendDeleteRequest();
+        }
+      },
+    );
+  }
+
+  /**
+   * Delete the target workspaceitem object
+   */
+  sendDeleteRequest() {
+    this.wsi$.pipe(
+      switchMap((wsi: WorkspaceItem) => this.workspaceItemService.delete(wsi.id).pipe(
+        getFirstCompletedRemoteData(),
+      )),
+    ).subscribe((response: RemoteData<NoContent>) => {
+      if (response.hasSucceeded) {
+        const title = this.translationService.get('workspace-item.delete.notification.success.title');
+        const content = this.translationService.get('workspace-item.delete.title');
+        this.notificationsService.success(title, content);
+        this.previousPage();
+      } else {
+        const title = this.translationService.get('workspace-item.delete.notification.error.title');
+        const content = this.translationService.get('workspace-item.delete.notification.error.content');
+        this.notificationsService.error(title, content);
+      }
+    });
+  }
+}
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 cc76634c03..712c1e9ece 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
@@ -2,11 +2,13 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
-import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ThemedFullItemPageComponent } from '../item-page/full/themed-full-item-page.component';
+import { ThemedSubmissionEditComponent } from '../submission/edit/themed-submission-edit.component';
 import { ItemFromWorkspaceResolver } from './item-from-workspace.resolver';
 import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
+import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
 
 @NgModule({
   imports: [
@@ -21,9 +23,9 @@ import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
             path: 'edit',
             component: ThemedSubmissionEditComponent,
             resolve: {
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' }
+            data: { title: 'submission.edit.title', breadcrumbKey: 'submission.edit' },
           },
           {
             canActivate: [AuthenticatedGuard],
@@ -31,15 +33,35 @@ import { WorkspaceItemPageResolver } from './workspace-item-page.resolver';
             component: ThemedFullItemPageComponent,
             resolve: {
               dso: ItemFromWorkspaceResolver,
-              breadcrumb: I18nBreadcrumbResolver
+              breadcrumb: I18nBreadcrumbResolver,
             },
-            data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' }
-          }
-        ]
-      }
-    ])
+            data: { title: 'workspace-item.view.title', breadcrumbKey: 'workspace-item.view' },
+          },
+          {
+            canActivate: [AuthenticatedGuard],
+            path: 'delete',
+            component: WorkspaceItemsDeletePageComponent,
+            resolve: {
+              dso: ItemFromWorkspaceResolver,
+              breadcrumb: I18nBreadcrumbResolver,
+            },
+            data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
+          },
+          {
+            canActivate: [AuthenticatedGuard],
+            path: 'delete',
+            component: ThemedWorkspaceItemsDeletePageComponent,
+            resolve: {
+              dso: ItemFromWorkspaceResolver,
+              breadcrumb: I18nBreadcrumbResolver,
+            },
+            data: { title: 'workspace-item.delete', breadcrumbKey: 'workspace-item.delete' },
+          },
+        ],
+      },
+    ]),
   ],
-  providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver]
+  providers: [WorkspaceItemPageResolver, ItemFromWorkspaceResolver],
 })
 /**
  * This module defines the default component to load when navigating to the workspaceitems edit page path
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
index 65a40f3f7c..0ef3ea7e71 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-edit-page.module.ts
@@ -1,8 +1,11 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
+
 import { SharedModule } from '../shared/shared.module';
-import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module';
 import { SubmissionModule } from '../submission/submission.module';
+import { ThemedWorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/themed-workspaceitems-delete-page.component';
+import { WorkspaceItemsDeletePageComponent } from './workspaceitems-delete-page/workspaceitems-delete-page.component';
+import { WorkspaceitemsEditPageRoutingModule } from './workspaceitems-edit-page-routing.module';
 
 @NgModule({
   imports: [
@@ -11,7 +14,10 @@ import { SubmissionModule } from '../submission/submission.module';
     SharedModule,
     SubmissionModule,
   ],
-  declarations: []
+  declarations: [
+    WorkspaceItemsDeletePageComponent,
+    ThemedWorkspaceItemsDeletePageComponent,
+  ],
 })
 /**
  * This module handles all modules that need to access the workspaceitems edit page.
diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5
index bfe0ae186d..0b69b46b55 100644
--- a/src/assets/i18n/ar.json5
+++ b/src/assets/i18n/ar.json5
@@ -1,6748 +1,7166 @@
 {
-  
+
   // "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.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",
-  
-  
-  
+
+
+
   // "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.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.forbidden": "forbidden",
   // TODO New key - Add a translation
   "403.forbidden": "forbidden",
-  
-  
-  
+
+
+
   // "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.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.page-not-found": "page not found",
   // TODO New key - Add a translation
   "404.page-not-found": "page not found",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.title": "System curation tasks",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.header": "System curation tasks",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  
+
   // "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.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.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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.success.head": "Success",
-  
+
   // "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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.success.head": "Success",
-  
+
   // "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.edit.breadcrumbs": "Bitstream format",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  
+
   // "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.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.label": "File extensions",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  
+
   // "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.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.label": "Internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  
+
   // "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.label": "MIME Type",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
+
   // "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.label": "Name",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.success.head": "Success",
-  
+
   // "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.label": "Support level",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  
+
   // "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.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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  
+
   // "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.internal": "internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.internal": "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.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.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.return": "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.SUPPORTED": "Supported",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "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.head": "Support Level",
   // 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",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   // TODO New key - Add a translation
   "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.",
   // 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.form.create": "Create metadata schema",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.create": "Create metadata schema",
-  
+
   // "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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.name": "Name",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.namespace": "Namespace",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   // TODO New key - Add a translation
   "admin.registries.metadata.head": "Metadata Registry",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.delete": "Delete 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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.name": "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.schema.breadcrumbs": "Metadata schema",
   // TODO New key - Add a translation
   "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
+
   // "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.fields.head": "Schema metadata fields",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.head": "Schema metadata fields",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.delete": "Delete selected",
-  
+
   // "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.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  
+
   // "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.edit": "Edit metadata field",
   // TODO New key - Add a translation
   "admin.registries.schema.form.edit": "Edit metadata field",
-  
+
   // "admin.registries.schema.form.element": "Element",
   // TODO New key - Add a translation
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   // TODO New key - Add a translation
   "admin.registries.schema.form.qualifier": "Qualifier",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.form.scopenote": "Scope Note",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   // TODO New key - Add a translation
   "admin.registries.schema.head": "Metadata Schema",
-  
+
   // "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.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.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.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.failure": "Error",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.failure": "Error",
-  
+
   // "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.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.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.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.success": "Success",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.success": "Success",
-  
+
   // "admin.registries.schema.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.schema.return": "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.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.impersonate": "Impersonate EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
+
   // "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.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.title": "DSpace Angular :: EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.head": "EPeople",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.head": "Search",
-  
+
   // "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.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.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.button": "Search",
-  
+
   // "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.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.email": "E-mail (exact)",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
+
   // "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{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.form.create": "Create EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.create": "Create EPerson",
-  
+
   // "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.firstName": "First name",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.firstName": "First name",
-  
+
   // "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.email": "E-mail",
   // TODO New key - Add a 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.canLogIn": "Can log in",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.goToGroups": "Add to groups",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
+
   // "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.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.groups.title": "DSpace Angular :: Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
+
   // "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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.head": "Groups",
-  
+
   // "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.search.head": "Search groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.head": "Search groups",
-  
+
   // "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.search.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.button": "Search",
-  
+
   // "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.members": "Members",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.members": "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{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.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.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.content": "Cause: \"{{cause}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.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.edit": "Edit group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.head.edit": "Edit group",
-  
+
   // "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.groupDescription": "Description",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.groupDescription": "Description",
-  
+
   // "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.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.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.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.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.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.actions.delete": "Delete Group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
+
   // "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.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.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.confirm": "Delete",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-subgroups-yet": "No subgroups in group yet.",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.collection.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.collection.edit": "Edit",
-  
+
   // "admin.search.community.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.community.edit": "Edit",
-  
+
   // "admin.search.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.search.item.delete": "Delete",
-  
+
   // "admin.search.item.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.item.edit": "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-public": "Make Public",
   // TODO New key - Add a translation
   "admin.search.item.make-public": "Make Public",
-  
+
   // "admin.search.item.move": "Move",
   // TODO New key - Add a translation
   "admin.search.item.move": "Move",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   // TODO New key - Add a translation
   "admin.search.item.reinstate": "Reinstate",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   // TODO New key - Add a translation
   "admin.search.item.withdraw": "Withdraw",
-  
+
   // "admin.search.title": "Administrative Search",
   // TODO New key - Add a translation
   "admin.search.title": "Administrative Search",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   // TODO New key - Add a translation
   "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.breadcrumbs": "Administer Workflow",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.title": "Administer Workflow",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
-  
+
   // "admin.workflow.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.workflow.item.delete": "Delete",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   // TODO New key - Add a translation
   "admin.workflow.item.send-back": "Send back",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.title": "Import Metadata",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.page.header": "Import Metadata",
-  
+
   // "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.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.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.button.return": "Return",
   // TODO New key - Add a translation
   "admin.metadata-import.page.button.return": "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.error.addFile": "Select file first!",
   // TODO New key - Add a translation
   "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
+
+
+
+
   // "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.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.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   // TODO New key - Add a translation
   "bitstream.edit.bitstream": "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.label": "Description",
   // TODO New key - Add a translation
   "bitstream.edit.form.description.label": "Description",
-  
+
   // "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.label": "Embargo until specific date",
   // TODO New key - Add a translation
   "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
+
   // "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.label": "Filename",
   // TODO New key - Add a translation
   "bitstream.edit.form.fileName.label": "Filename",
-  
+
   // "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.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.primaryBitstream.label": "Primary bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
+
   // "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.label": "Selected Format",
   // TODO New key - Add a translation
   "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
+
   // "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.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.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.title": "Bitstream saved",
   // TODO New key - Add a translation
   "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
+
+
+
   // "browse.comcol.by.author": "By Author",
   // TODO New key - Add a translation
   "browse.comcol.by.author": "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.subject": "By Subject",
   // TODO New key - Add a translation
   "browse.comcol.by.subject": "By Subject",
-  
+
   // "browse.comcol.by.title": "By Title",
   // TODO New key - Add a translation
   "browse.comcol.by.title": "By Title",
-  
+
   // "browse.comcol.head": "Browse",
   // TODO New key - Add a translation
   "browse.comcol.head": "Browse",
-  
+
   // "browse.empty": "No items to show.",
   // TODO New key - Add a translation
   "browse.empty": "No items to show.",
-  
+
   // "browse.metadata.author": "Author",
   // TODO New key - Add a translation
   "browse.metadata.author": "Author",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued": "Issue Date",
-  
+
   // "browse.metadata.subject": "Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject": "Subject",
-  
+
   // "browse.metadata.title": "Title",
   // TODO New key - Add a translation
   "browse.metadata.title": "Title",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   // TODO New key - Add a translation
   "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   // TODO New key - Add a translation
   "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_start": "(Choose start)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_year": "(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.months.april": "April",
   // TODO New key - Add a translation
   "browse.startsWith.months.april": "April",
-  
+
   // "browse.startsWith.months.august": "August",
   // TODO New key - Add a translation
   "browse.startsWith.months.august": "August",
-  
+
   // "browse.startsWith.months.december": "December",
   // TODO New key - Add a translation
   "browse.startsWith.months.december": "December",
-  
+
   // "browse.startsWith.months.february": "February",
   // TODO New key - Add a translation
   "browse.startsWith.months.february": "February",
-  
+
   // "browse.startsWith.months.january": "January",
   // TODO New key - Add a translation
   "browse.startsWith.months.january": "January",
-  
+
   // "browse.startsWith.months.july": "July",
   // TODO New key - Add a translation
   "browse.startsWith.months.july": "July",
-  
+
   // "browse.startsWith.months.june": "June",
   // TODO New key - Add a translation
   "browse.startsWith.months.june": "June",
-  
+
   // "browse.startsWith.months.march": "March",
   // TODO New key - Add a translation
   "browse.startsWith.months.march": "March",
-  
+
   // "browse.startsWith.months.may": "May",
   // TODO New key - Add a translation
   "browse.startsWith.months.may": "May",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   // TODO New key - Add a translation
   "browse.startsWith.months.none": "(Choose month)",
-  
+
   // "browse.startsWith.months.november": "November",
   // TODO New key - Add a translation
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   // TODO New key - Add a translation
   "browse.startsWith.months.october": "October",
-  
+
   // "browse.startsWith.months.september": "September",
   // TODO New key - Add a translation
   "browse.startsWith.months.september": "September",
-  
+
   // "browse.startsWith.submit": "Go",
   // TODO New key - Add a translation
   "browse.startsWith.submit": "Go",
-  
+
   // "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_text": "Or enter first few letters:",
   // TODO New key - Add a translation
   "browse.startsWith.type_text": "Or enter first few letters:",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   // TODO New key - Add a translation
   "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   // TODO New key - Add a translation
   "chips.remove": "Remove chip",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   // TODO New key - Add a translation
   "collection.create.head": "Create a Collection",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   // TODO New key - Add a translation
   "collection.create.notifications.success": "Successfully created the Collection",
-  
+
   // "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.curate.header": "Curate Collection: {{collection}}",
   // TODO New key - Add a translation
   "collection.curate.header": "Curate Collection: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.delete.cancel": "Cancel",
-  
+
   // "collection.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "collection.delete.confirm": "Confirm",
-  
+
   // "collection.delete.head": "Delete Collection",
   // TODO New key - Add a translation
   "collection.delete.head": "Delete Collection",
-  
+
   // "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.success": "Successfully deleted collection",
   // TODO New key - Add a translation
   "collection.delete.notification.success": "Successfully deleted collection",
-  
+
   // "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.edit.delete": "Delete this collection",
   // TODO New key - Add a translation
   "collection.edit.delete": "Delete this collection",
-  
+
   // "collection.edit.head": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.head": "Edit Collection",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "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.item-mapper.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.cancel": "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.confirm": "Map selected items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.confirm": "Map selected items",
-  
+
   // "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.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.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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.remove": "Remove selected item mappings",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  
+
   // "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.map": "Map new items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.tabs.map": "Map new items",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   // TODO New key - Add a translation
   "collection.edit.logo.label": "Collection logo",
-  
+
   // "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.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.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.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.error.title": "Error deleting logo",
   // TODO New key - Add a translation
   "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+
   // "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.notifications.success": "Successfully edited the Collection",
   // TODO New key - Add a translation
   "collection.edit.notifications.success": "Successfully edited the Collection",
-  
+
   // "collection.edit.return": "Return",
   // TODO New key - Add a translation
   "collection.edit.return": "Return",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "collection.edit.tabs.curate.head": "Curate",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "collection.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "collection.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.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.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.harvestType": "Content being harvested",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
+
   // "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.metadataConfigId": "Metadata Format",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
+
   // "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.oaiSource": "OAI Provider",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
+
   // "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_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_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.head": "Content Source",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.head": "Content Source",
-  
+
   // "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.title": "Changed discarded",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Content Source saved",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
+
   // "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.template.add-button": "Add",
   // TODO New key - Add a translation
   "collection.edit.template.add-button": "Add",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   // TODO New key - Add a translation
   "collection.edit.template.breadcrumbs": "Item template",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.template.cancel": "Cancel",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   // TODO New key - Add a translation
   "collection.edit.template.delete-button": "Delete",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   // TODO New key - Add a translation
   "collection.edit.template.edit-button": "Edit",
-  
+
   // "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.label": "Template item",
   // TODO New key - Add a translation
   "collection.edit.template.label": "Template item",
-  
+
   // "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.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.title": "Edit Template Item",
   // TODO New key - Add a translation
   "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "collection.form.abstract": "Short Description",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "collection.form.description": "Introductory 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.license": "License",
   // TODO New key - Add a translation
   "collection.form.license": "License",
-  
+
   // "collection.form.provenance": "Provenance",
   // TODO New key - Add a translation
   "collection.form.provenance": "Provenance",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "collection.form.rights": "Copyright text (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "collection.form.tableofcontents": "News (HTML)",
-  
+
   // "collection.form.title": "Name",
   // TODO New key - Add a translation
   "collection.form.title": "Name",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   // 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.edit": "Edit this collection",
   // TODO New key - Add a translation
   "collection.page.edit": "Edit this collection",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   // TODO New key - Add a translation
   "collection.page.handle": "Permanent URI for this collection",
-  
+
   // "collection.page.license": "License",
   // TODO New key - Add a translation
   "collection.page.license": "License",
-  
+
   // "collection.page.news": "News",
   // TODO New key - Add a translation
   "collection.page.news": "News",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "collection.select.confirm": "Confirm selected",
-  
+
   // "collection.select.empty": "No collections to show",
   // TODO New key - Add a translation
   "collection.select.empty": "No collections to show",
-  
+
   // "collection.select.table.title": "Title",
   // TODO New key - Add a translation
   "collection.select.table.title": "Title",
-  
-  
-  
+
+
+
   // "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.title": "Server Error",
   // TODO New key - Add a translation
   "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
+
+
+
   // "communityList.tabTitle": "DSpace - Community List",
   // TODO New key - Add a translation
   "communityList.tabTitle": "DSpace - Community List",
-  
+
   // "communityList.title": "List of Communities",
   // TODO New key - Add a translation
   "communityList.title": "List of Communities",
-  
+
   // "communityList.showMore": "Show More",
   // TODO New key - Add a translation
   "communityList.showMore": "Show More",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   // TODO New key - Add a translation
   "community.create.head": "Create a Community",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   // TODO New key - Add a translation
   "community.create.notifications.success": "Successfully created the Community",
-  
+
   // "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.curate.header": "Curate Community: {{community}}",
   // TODO New key - Add a translation
   "community.curate.header": "Curate Community: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "community.delete.cancel": "Cancel",
-  
+
   // "community.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "community.delete.confirm": "Confirm",
-  
+
   // "community.delete.head": "Delete Community",
   // TODO New key - Add a translation
   "community.delete.head": "Delete Community",
-  
+
   // "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.success": "Successfully deleted community",
   // TODO New key - Add a translation
   "community.delete.notification.success": "Successfully deleted community",
-  
+
   // "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.edit.delete": "Delete this community",
   // TODO New key - Add a translation
   "community.edit.delete": "Delete this community",
-  
+
   // "community.edit.head": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.head": "Edit Community",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.breadcrumbs": "Edit Community",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   // TODO New key - Add a translation
   "community.edit.logo.label": "Community logo",
-  
+
   // "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.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.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.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.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.notifications.success": "Successfully edited the Community",
   // TODO New key - Add a translation
   "community.edit.notifications.success": "Successfully edited the Community",
-  
+
   // "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.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "community.edit.tabs.curate.head": "Curate",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "community.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "community.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   // TODO New key - Add a translation
   "community.listelement.badge": "Community",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   // TODO New key - Add a translation
   "comcol-role.edit.no-group": "None",
-  
+
   // "comcol-role.edit.create": "Create",
   // TODO New key - Add a translation
   "comcol-role.edit.create": "Create",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   // TODO New key - Add a translation
   "comcol-role.edit.restrict": "Restrict",
-  
+
   // "comcol-role.edit.delete": "Delete",
   // TODO New key - Add a translation
   "comcol-role.edit.delete": "Delete",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.community-admin.name": "Administrators",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
+
+
   // "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.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.submitters.name": "Submitters",
   // TODO New key - Add a translation
   "comcol-role.edit.submitters.name": "Submitters",
-  
+
   // "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.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.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.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.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.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.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.editor.name": "Editors",
   // TODO New key - Add a translation
   "comcol-role.edit.editor.name": "Editors",
-  
+
   // "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.finaleditor.name": "Final editors",
   // TODO New key - Add a translation
   "comcol-role.edit.finaleditor.name": "Final editors",
-  
+
   // "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.reviewer.name": "Reviewers",
   // TODO New key - Add a translation
   "comcol-role.edit.reviewer.name": "Reviewers",
-  
+
   // "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.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "community.form.abstract": "Short Description",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "community.form.description": "Introductory 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.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "community.form.rights": "Copyright text (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "community.form.tableofcontents": "News (HTML)",
-  
+
   // "community.form.title": "Name",
   // TODO New key - Add a translation
   "community.form.title": "Name",
-  
+
   // "community.page.edit": "Edit this community",
   // TODO New key - Add a translation
   "community.page.edit": "Edit this community",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   // TODO New key - Add a translation
   "community.page.handle": "Permanent URI for this community",
-  
+
   // "community.page.license": "License",
   // TODO New key - Add a translation
   "community.page.license": "License",
-  
+
   // "community.page.news": "News",
   // TODO New key - Add a translation
   "community.page.news": "News",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   // 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",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   // TODO New key - Add a translation
   "cookies.consent.accept-all": "Accept all",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   // TODO New key - Add a translation
   "cookies.consent.accept-selected": "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.title": "(opt-out)",
   // TODO New key - Add a translation
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   // TODO New key - Add a translation
   "cookies.consent.app.purpose": "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.title": "(always required)",
   // TODO New key - Add a translation
   "cookies.consent.app.required.title": "(always required)",
-  
+
   // "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.close": "Close",
   // TODO New key - Add a translation
   "cookies.consent.close": "Close",
-  
+
   // "cookies.consent.decline": "Decline",
   // TODO New key - Add a translation
   "cookies.consent.decline": "Decline",
-  
+
   // "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.learnMore": "Customize",
   // TODO New key - Add a translation
   "cookies.consent.content-notice.learnMore": "Customize",
-  
+
   // "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.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.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.title": "Information that we collect",
   // TODO New key - Add a translation
   "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   // TODO New key - Add a translation
   "cookies.consent.app.title.authentication": "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.title.preferences": "Preferences",
   // TODO New key - Add a translation
   "cookies.consent.app.title.preferences": "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.title.acknowledgement": "Acknowledgement",
   // TODO New key - Add a translation
   "cookies.consent.app.title.acknowledgement": "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.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.purpose.functional": "Functional",
   // TODO New key - Add a translation
   "cookies.consent.purpose.functional": "Functional",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   // TODO New key - Add a translation
   "cookies.consent.purpose.statistical": "Statistical",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
+
   // "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.requiredmetadata.label": "Check for Required Metadata",
   // TODO New key - Add a translation
   "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   // TODO New key - Add a translation
   "curation-task.task.translate.label": "Microsoft Translator",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   // TODO New key - Add a translation
   "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   // TODO New key - Add a translation
   "curation.form.task-select.label": "Task:",
-  
+
   // "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.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.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.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.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)",
   // 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)",
-  
-  
-  
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   // TODO New key - Add a translation
   "dso-selector.create.collection.head": "New collection",
-  
+
   // "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.community.head": "New community",
   // TODO New key - Add a translation
   "dso-selector.create.community.head": "New community",
-  
+
   // "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.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.item.head": "New item",
   // TODO New key - Add a translation
   "dso-selector.create.item.head": "New item",
-  
+
   // "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.submission.head": "New submission",
   // TODO New key - Add a translation
   "dso-selector.create.submission.head": "New submission",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   // TODO New key - Add a translation
   "dso-selector.edit.collection.head": "Edit collection",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   // TODO New key - Add a translation
   "dso-selector.edit.community.head": "Edit community",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   // TODO New key - Add a translation
   "dso-selector.edit.item.head": "Edit item",
-  
+
   // "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.no-results": "No {{ type }} found",
   // TODO New key - Add a translation
   "dso-selector.no-results": "No {{ type }} found",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   // TODO New key - Add a translation
   "dso-selector.placeholder": "Search for a {{ type }}",
-  
-  
-  
+
+
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.cancel": "Cancel",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.confirm": "Export",
-  
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   // TODO New key - Add a translation
   "error.bitstream": "Error fetching bitstream",
-  
+
   // "error.browse-by": "Error fetching items",
   // TODO New key - Add a translation
   "error.browse-by": "Error fetching items",
-  
+
   // "error.collection": "Error fetching collection",
   // TODO New key - Add a translation
   "error.collection": "Error fetching collection",
-  
+
   // "error.collections": "Error fetching collections",
   // TODO New key - Add a translation
   "error.collections": "Error fetching collections",
-  
+
   // "error.community": "Error fetching community",
   // TODO New key - Add a translation
   "error.community": "Error fetching community",
-  
+
   // "error.identifier": "No item found for the identifier",
   // TODO New key - Add a translation
   "error.identifier": "No item found for the identifier",
-  
+
   // "error.default": "Error",
   // TODO New key - Add a translation
   "error.default": "Error",
-  
+
   // "error.item": "Error fetching item",
   // TODO New key - Add a translation
   "error.item": "Error fetching item",
-  
+
   // "error.items": "Error fetching items",
   // TODO New key - Add a translation
   "error.items": "Error fetching items",
-  
+
   // "error.objects": "Error fetching objects",
   // TODO New key - Add a translation
   "error.objects": "Error fetching objects",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   // TODO New key - Add a translation
   "error.recent-submissions": "Error fetching recent submissions",
-  
+
   // "error.search-results": "Error fetching search results",
   // TODO New key - Add a translation
   "error.search-results": "Error fetching search results",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   // TODO New key - Add a translation
   "error.sub-collections": "Error fetching sub-collections",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   // TODO New key - Add a translation
   "error.sub-communities": "Error fetching 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.top-level-communities": "Error fetching top-level communities",
   // TODO New key - Add a translation
   "error.top-level-communities": "Error fetching 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.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.filerequired": "The file upload is mandatory",
   // TODO New key - Add a translation
   "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
+
+
+
   // "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",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   // TODO New key - Add a translation
   "footer.copyright": "copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   // TODO New key - Add a translation
   "footer.link.dspace": "DSpace software",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   // TODO New key - Add a translation
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   // TODO New key - Add a translation
   "footer.link.cookies": "Cookie settings",
-  
+
   // "footer.link.privacy-policy": "Privacy policy",
   // 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.end-user-agreement": "End User Agreement",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-email.form.header": "Forgot Password",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "forgot-email.form.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Submit",
   // TODO New key - Add a translation
   "forgot-email.form.submit": "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.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-password.title": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.title": "Forgot Password",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.form.head": "Forgot Password",
-  
+
   // "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.card.security": "Security",
   // TODO New key - Add a translation
   "forgot-password.form.card.security": "Security",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   // TODO New key - Add a translation
   "forgot-password.form.identification.header": "Identify",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   // TODO New key - Add a translation
   "forgot-password.form.identification.email": "Email address: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   // TODO New key - Add a translation
   "forgot-password.form.label.password": "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.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.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.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.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.title": "Password reset completed",
   // TODO New key - Add a translation
   "forgot-password.form.notification.success.title": "Password reset completed",
-  
+
   // "forgot-password.form.submit": "Submit password",
   // TODO New key - Add a translation
   "forgot-password.form.submit": "Submit password",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   // TODO New key - Add a translation
   "form.add": "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.cancel": "Cancel",
   // TODO New key - Add a translation
   "form.cancel": "Cancel",
-  
+
   // "form.clear": "Clear",
   // TODO New key - Add a translation
   "form.clear": "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.edit": "Edit",
   // TODO New key - Add a translation
   "form.edit": "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.first-name": "First name",
   // TODO New key - Add a translation
   "form.first-name": "First name",
-  
+
   // "form.group-collapse": "Collapse",
   // TODO New key - Add a translation
   "form.group-collapse": "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-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.last-name": "Last name",
   // TODO New key - Add a translation
   "form.last-name": "Last name",
-  
+
   // "form.loading": "Loading...",
   // TODO New key - Add a translation
   "form.loading": "Loading...",
-  
+
   // "form.lookup": "Lookup",
   // TODO New key - Add a translation
   "form.lookup": "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.no-results": "No results found",
   // TODO New key - Add a translation
   "form.no-results": "No results found",
-  
+
   // "form.no-value": "No value entered",
   // TODO New key - Add a translation
   "form.no-value": "No value entered",
-  
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   // TODO New key - Add a translation
   "form.remove": "Remove",
-  
+
   // "form.save": "Save",
   // TODO New key - Add a translation
   "form.save": "Save",
-  
+
   // "form.save-help": "Save changes",
   // TODO New key - Add a translation
   "form.save-help": "Save changes",
-  
+
   // "form.search": "Search",
   // TODO New key - Add a translation
   "form.search": "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.submit": "Submit",
   // TODO New key - Add a translation
   "form.submit": "Submit",
-  
-  
-  
+
+
+
   // "home.description": "",
   // TODO New key - Add a translation
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   // TODO New key - Add a translation
   "home.breadcrumbs": "Home",
-  
+
   // "home.title": "DSpace Angular :: Home",
   // TODO New key - Add a translation
   "home.title": "DSpace Angular :: Home",
-  
+
   // "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.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.",
-  
-  
-  
+
+
+
   // "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.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.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.breadcrumbs": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
+
   // "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.save": "Save",
   // TODO New key - Add a translation
   "info.end-user-agreement.buttons.save": "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.title": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.title": "End User Agreement",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.breadcrumbs": "Privacy Statement",
-  
+
   // "info.privacy.head": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.head": "Privacy Statement",
-  
+
   // "info.privacy.title": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.title": "Privacy Statement",
-  
-  
-  
+
+
+
   // "item.alerts.private": "This item is private",
   // TODO New key - Add a translation
   "item.alerts.private": "This item is private",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   // TODO New key - Add a translation
   "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
+
+
+
   // "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.title": "Edit item's Policies",
   // TODO New key - Add a translation
   "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   // TODO New key - Add a translation
   "item.badge.private": "Private",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle": "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.new": "Create bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle.new": "Create bundle",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "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": "This item doesn't contain any bundles to upload a bitstream to.",
+
   // "item.bitstreams.upload.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.bitstreams.upload.cancel": "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.item": "Item: ",
   // TODO New key - Add a translation
   "item.bitstreams.upload.item": "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.title": "Created bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
+
   // "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.title": "Upload bitstream",
   // TODO New key - Add a translation
   "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
+
+
+
   // "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.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.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.more": "Load more",
   // TODO New key - Add a translation
   "item.edit.bitstreams.bundle.load.more": "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.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.bitstreams.discard-button": "Discard",
-  
+
   // "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.drag": "Drag",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.drag": "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.remove": "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.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.headers.actions": "Actions",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.description": "Description",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.name": "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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Move changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
+
   // "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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.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.title": "Removal changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.bitstreams.reinstate-button": "Undo",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.bitstreams.save-button": "Save",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   // TODO New key - Add a translation
   "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.delete.cancel": "Cancel",
-  
+
   // "item.edit.delete.confirm": "Delete",
   // TODO New key - Add a translation
   "item.edit.delete.confirm": "Delete",
-  
+
   // "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.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.header": "Delete item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.delete.header": "Delete item: {{ 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.head": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.head": "Edit Item",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.breadcrumbs": "Edit Item",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "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.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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.item-mapper.cancel": "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.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.item": "Item: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
   "item.edit.item-mapper.item": "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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.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.map": "Map new collections",
   // TODO New key - Add a translation
   "item.edit.item-mapper.tabs.map": "Map new collections",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   // TODO New key - Add a translation
   "item.edit.metadata.add-button": "Add",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.metadata.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.remove": "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.unedit": "Stop editing",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  
+
   // "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.headers.edit": "Edit",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.edit": "Edit",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.field": "Field",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.language": "Lang",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.value": "Value",
-  
+
   // "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.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.title": "Changed discarded",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Changed outdated",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  
+
   // "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.title": "Metadata saved",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.metadata.reinstate-button": "Undo",
-  
+
   // "item.edit.metadata.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.metadata.save-button": "Save",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   // TODO New key - Add a translation
   "item.edit.modify.overview.field": "Field",
-  
+
   // "item.edit.modify.overview.language": "Language",
   // TODO New key - Add a translation
   "item.edit.modify.overview.language": "Language",
-  
+
   // "item.edit.modify.overview.value": "Value",
   // TODO New key - Add a translation
   "item.edit.modify.overview.value": "Value",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.move.cancel": "Cancel",
-  
+
   // "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.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.head": "Move item: {{id}}",
   // TODO New key - Add a translation
   "item.edit.move.head": "Move item: {{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.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.move": "Move",
   // TODO New key - Add a translation
   "item.edit.move.move": "Move",
-  
+
   // "item.edit.move.processing": "Moving...",
   // TODO New key - Add a translation
   "item.edit.move.processing": "Moving...",
-  
+
   // "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.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.title": "Move item",
   // TODO New key - Add a translation
   "item.edit.move.title": "Move item",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.private.cancel": "Cancel",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   // TODO New key - Add a translation
   "item.edit.private.confirm": "Make it Private",
-  
+
   // "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.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.public.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.public.cancel": "Cancel",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   // TODO New key - Add a translation
   "item.edit.public.confirm": "Make it Public",
-  
+
   // "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.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.reinstate.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.reinstate.cancel": "Cancel",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   // TODO New key - Add a translation
   "item.edit.reinstate.confirm": "Reinstate",
-  
+
   // "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.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.header": "Reinstate item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.reinstate.header": "Reinstate item: {{ 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.relationships.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.relationships.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.relationships.edit.buttons.remove": "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.no-relationships": "No relationships",
   // TODO New key - Add a translation
   "item.edit.relationships.no-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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.title": "Relationships saved",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.relationships.reinstate-button": "Undo",
-  
+
   // "item.edit.relationships.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.relationships.save-button": "Save",
-  
+
   // "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.tabs.bitstreams.head": "Bitstreams",
   // TODO New key - Add a translation
   "item.edit.tabs.bitstreams.head": "Bitstreams",
-  
+
   // "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.curate.head": "Curate",
   // TODO New key - Add a translation
   "item.edit.tabs.curate.head": "Curate",
-  
+
   // "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.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.relationships.head": "Relationships",
   // TODO New key - Add a translation
   "item.edit.tabs.relationships.head": "Relationships",
-  
+
   // "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.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.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.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.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.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.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.move.button": "Move...",
+
+  // "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...",
-  
+  "item.edit.tabs.status.buttons.move.button": "Mover éste ítem a una colección distinta",
+
   // "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.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.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.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.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.reinstate.button": "Reinstate...",
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  
+
   // "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.withdraw.button": "Withdraw...",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar éste ítem",
+
   // "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.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.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.itemPage": "Item Page",
   // TODO New key - Add a translation
   "item.edit.tabs.status.labels.itemPage": "Item Page",
-  
+
   // "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.title": "Item Edit -  Status",
   // TODO New key - Add a translation
   "item.edit.tabs.status.title": "Item Edit -  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.title": "Item Edit - Version History",
   // TODO New key - Add a translation
   "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
+
   // "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.view.head": "View Item",
   // TODO New key - Add a translation
   "item.edit.tabs.view.head": "View Item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   // TODO New key - Add a translation
   "item.edit.tabs.view.title": "Item Edit -  View",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.withdraw.cancel": "Cancel",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   // TODO New key - Add a translation
   "item.edit.withdraw.confirm": "Withdraw",
-  
+
   // "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.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.header": "Withdraw item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.withdraw.header": "Withdraw item: {{ 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.listelement.badge": "Item",
   // TODO New key - Add a translation
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   // TODO New key - Add a translation
   "item.page.description": "Description",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "item.page.journal-issn": "Journal ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "item.page.journal-title": "Journal Title",
-  
+
   // "item.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "item.page.publisher": "Publisher",
-  
+
   // "item.page.titleprefix": "Item: ",
   // TODO New key - Add a translation
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "item.page.volume-title": "Volume Title",
-  
+
   // "item.search.results.head": "Item Search Results",
   // TODO New key - Add a translation
   "item.search.results.head": "Item Search Results",
-  
+
   // "item.search.title": "DSpace Angular :: Item Search",
   // TODO New key - Add a translation
   "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   // TODO New key - Add a translation
   "item.page.abstract": "Abstract",
-  
+
   // "item.page.author": "Authors",
   // TODO New key - Add a translation
   "item.page.author": "Authors",
-  
+
   // "item.page.citation": "Citation",
   // TODO New key - Add a translation
   "item.page.citation": "Citation",
-  
+
   // "item.page.collections": "Collections",
   // TODO New key - Add a translation
   "item.page.collections": "Collections",
-  
+
   // "item.page.date": "Date",
   // TODO New key - Add a translation
   "item.page.date": "Date",
-  
+
   // "item.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "item.page.edit": "Edit this item",
-  
+
   // "item.page.files": "Files",
   // TODO New key - Add a translation
   "item.page.files": "Files",
-  
+
   // "item.page.filesection.description": "Description:",
   // TODO New key - Add a translation
   "item.page.filesection.description": "Description:",
-  
+
   // "item.page.filesection.download": "Download",
   // TODO New key - Add a translation
   "item.page.filesection.download": "Download",
-  
+
   // "item.page.filesection.format": "Format:",
   // TODO New key - Add a translation
   "item.page.filesection.format": "Format:",
-  
+
   // "item.page.filesection.name": "Name:",
   // TODO New key - Add a translation
   "item.page.filesection.name": "Name:",
-  
+
   // "item.page.filesection.size": "Size:",
   // TODO New key - Add a translation
   "item.page.filesection.size": "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.link.full": "Full item page",
   // TODO New key - Add a translation
   "item.page.link.full": "Full item page",
-  
+
   // "item.page.link.simple": "Simple item page",
   // TODO New key - Add a translation
   "item.page.link.simple": "Simple item page",
-  
+
   // "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.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-less": "Hide last {{ amount }}",
   // TODO New key - Add a translation
   "item.page.related-items.view-less": "Hide last {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isAuthorOfPublication": "Publications",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isJournalOfPublication": "Publications",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
+
   // "item.page.subject": "Keywords",
   // TODO New key - Add a translation
   "item.page.subject": "Keywords",
-  
+
   // "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.collapse": "Collapse",
   // TODO New key - Add a translation
   "item.page.bitstreams.collapse": "Collapse",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
-  
+  "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.filesection.license.bundle": "License bundle",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.uri": "Identifier:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   // TODO New key - Add a translation
   "item.preview.dc.contributor.author": "Authors:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   // TODO New key - Add a translation
   "item.preview.dc.date.issued": "Published date:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   // TODO New key - Add a translation
   "item.preview.dc.description.abstract": "Abstract:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.other": "Other identifier:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   // TODO New key - Add a translation
   "item.preview.dc.language.iso": "Language:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   // TODO New key - Add a translation
   "item.preview.dc.subject": "Subjects:",
-  
+
   // "item.preview.dc.title": "Title:",
   // TODO New key - Add a translation
   "item.preview.dc.title": "Title:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   // TODO New key - Add a translation
   "item.preview.person.familyName": "Surname:",
-  
+
   // "item.preview.person.givenName": "Name:",
   // TODO New key - Add a translation
   "item.preview.person.givenName": "Name:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "item.select.confirm": "Confirm selected",
-  
+
   // "item.select.empty": "No items to show",
   // TODO New key - Add a translation
   "item.select.empty": "No items to show",
-  
+
   // "item.select.table.author": "Author",
   // TODO New key - Add a translation
   "item.select.table.author": "Author",
-  
+
   // "item.select.table.collection": "Collection",
   // TODO New key - Add a translation
   "item.select.table.collection": "Collection",
-  
+
   // "item.select.table.title": "Title",
   // TODO New key - Add a translation
   "item.select.table.title": "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.head": "Version History",
   // TODO New key - Add a translation
   "item.version.history.head": "Version History",
-  
+
   // "item.version.history.return": "Return",
   // TODO New key - Add a translation
   "item.version.history.return": "Return",
-  
+
   // "item.version.history.selected": "Selected version",
   // TODO New key - Add a translation
   "item.version.history.selected": "Selected version",
-  
+
   // "item.version.history.table.version": "Version",
   // TODO New key - Add a translation
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
   // TODO New key - Add a translation
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   // TODO New key - Add a translation
   "item.version.history.table.editor": "Editor",
-  
+
   // "item.version.history.table.date": "Date",
   // TODO New key - Add a translation
   "item.version.history.table.date": "Date",
-  
+
   // "item.version.history.table.summary": "Summary",
   // TODO New key - Add a translation
   "item.version.history.table.summary": "Summary",
-  
-  
-  
+
+
+
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   // 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>.",
-  
-  
-  
+
+
+
   // "journal.listelement.badge": "Journal",
   // TODO New key - Add a translation
   "journal.listelement.badge": "Journal",
-  
+
   // "journal.page.description": "Description",
   // TODO New key - Add a translation
   "journal.page.description": "Description",
-  
+
   // "journal.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journal.page.edit": "Edit this item",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   // TODO New key - Add a translation
   "journal.page.editor": "Editor-in-Chief",
-  
+
   // "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.titleprefix": "Journal: ",
   // TODO New key - Add a translation
   "journal.page.titleprefix": "Journal: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   // TODO New key - Add a translation
   "journalissue.listelement.badge": "Journal Issue",
-  
+
   // "journalissue.page.description": "Description",
   // TODO New key - Add a translation
   "journalissue.page.description": "Description",
-  
+
   // "journalissue.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalissue.page.edit": "Edit this item",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalissue.page.issuedate": "Issue Date",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "journalissue.page.journal-issn": "Journal ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "journalissue.page.journal-title": "Journal Title",
-  
+
   // "journalissue.page.keyword": "Keywords",
   // TODO New key - Add a translation
   "journalissue.page.keyword": "Keywords",
-  
+
   // "journalissue.page.number": "Number",
   // TODO New key - Add a translation
   "journalissue.page.number": "Number",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   // TODO New key - Add a translation
   "journalissue.page.titleprefix": "Journal Issue: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   // TODO New key - Add a translation
   "journalvolume.listelement.badge": "Journal Volume",
-  
+
   // "journalvolume.page.description": "Description",
   // TODO New key - Add a translation
   "journalvolume.page.description": "Description",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalvolume.page.edit": "Edit this item",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalvolume.page.issuedate": "Issue Date",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   // TODO New key - Add a translation
   "journalvolume.page.titleprefix": "Journal Volume: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   // TODO New key - Add a translation
   "journalvolume.page.volume": "Volume",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   // TODO New key - Add a translation
   "loading.bitstream": "Loading bitstream...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   // TODO New key - Add a translation
   "loading.bitstreams": "Loading bitstreams...",
-  
+
   // "loading.browse-by": "Loading items...",
   // TODO New key - Add a translation
   "loading.browse-by": "Loading items...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   // TODO New key - Add a translation
   "loading.browse-by-page": "Loading page...",
-  
+
   // "loading.collection": "Loading collection...",
   // TODO New key - Add a translation
   "loading.collection": "Loading collection...",
-  
+
   // "loading.collections": "Loading collections...",
   // TODO New key - Add a translation
   "loading.collections": "Loading collections...",
-  
+
   // "loading.content-source": "Loading content source...",
   // TODO New key - Add a translation
   "loading.content-source": "Loading content source...",
-  
+
   // "loading.community": "Loading community...",
   // TODO New key - Add a translation
   "loading.community": "Loading community...",
-  
+
   // "loading.default": "Loading...",
   // TODO New key - Add a translation
   "loading.default": "Loading...",
-  
+
   // "loading.item": "Loading item...",
   // TODO New key - Add a translation
   "loading.item": "Loading item...",
-  
+
   // "loading.items": "Loading items...",
   // TODO New key - Add a translation
   "loading.items": "Loading items...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   // TODO New key - Add a translation
   "loading.mydspace-results": "Loading items...",
-  
+
   // "loading.objects": "Loading...",
   // TODO New key - Add a translation
   "loading.objects": "Loading...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   // TODO New key - Add a translation
   "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.sub-collections": "Loading sub-collections...",
   // TODO New key - Add a translation
   "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.top-level-communities": "Loading top-level communities...",
   // TODO New key - Add a translation
   "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.forgot-password": "Have you forgotten your password?",
   // TODO New key - Add a translation
   "login.form.forgot-password": "Have you forgotten your 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.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.or-divider": "or",
   // TODO New key - Add a translation
   "login.form.or-divider": "or",
-  
+
   // "login.form.password": "Password",
   // TODO New key - Add a translation
   "login.form.password": "Password",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   // TODO New key - Add a translation
   "login.form.shibboleth": "Log in with Shibboleth",
-  
+
   // "login.form.submit": "Log in",
   // TODO New key - Add a translation
   "login.form.submit": "Log in",
-  
+
   // "login.title": "Login",
   // TODO New key - Add a translation
   "login.title": "Login",
-  
+
   // "login.breadcrumbs": "Login",
   // TODO New key - Add a translation
   "login.breadcrumbs": "Login",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   // TODO New key - Add a translation
   "logout.form.header": "Log out from DSpace",
-  
+
   // "logout.form.submit": "Log out",
   // TODO New key - Add a translation
   "logout.form.submit": "Log out",
-  
+
   // "logout.title": "Logout",
   // TODO New key - Add a translation
   "logout.title": "Logout",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   // TODO New key - Add a translation
   "menu.header.admin": "Admin",
-  
+
   // "menu.header.image.logo": "Repository logo",
   // TODO New key - Add a translation
   "menu.header.image.logo": "Repository logo",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   // TODO New key - Add a translation
   "menu.section.access_control": "Access Control",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   // TODO New key - Add a translation
   "menu.section.access_control_authorizations": "Authorizations",
-  
+
   // "menu.section.access_control_groups": "Groups",
   // TODO New key - Add a translation
   "menu.section.access_control_groups": "Groups",
-  
+
   // "menu.section.access_control_people": "People",
   // TODO New key - Add a translation
   "menu.section.access_control_people": "People",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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.browse_community": "This Community",
   // TODO New key - Add a translation
   "menu.section.browse_community": "This 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_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_title": "By Title",
   // TODO New key - Add a translation
   "menu.section.browse_community_by_title": "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_by_author": "By Author",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_author": "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_subject": "By Subject",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_subject": "By Subject",
-  
+
   // "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_communities_and_collections": "Communities & Collections",
   // TODO New key - Add a translation
   "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   // TODO New key - Add a translation
   "menu.section.control_panel": "Control Panel",
-  
+
   // "menu.section.curation_task": "Curation Task",
   // TODO New key - Add a translation
   "menu.section.curation_task": "Curation Task",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   // TODO New key - Add a translation
   "menu.section.edit": "Edit",
-  
+
   // "menu.section.edit_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.edit_collection": "Collection",
-  
+
   // "menu.section.edit_community": "Community",
   // TODO New key - Add a translation
   "menu.section.edit_community": "Community",
-  
+
   // "menu.section.edit_item": "Item",
   // TODO New key - Add a translation
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "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_community": "Community",
   // TODO New key - Add a translation
   "menu.section.export_community": "Community",
-  
+
   // "menu.section.export_item": "Item",
   // TODO New key - Add a translation
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "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.control_panel": "Control Panel menu section",
   // TODO New key - Add a translation
   "menu.section.icon.control_panel": "Control Panel menu section",
-  
+
   // "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.edit": "Edit menu section",
   // TODO New key - Add a translation
   "menu.section.icon.edit": "Edit menu section",
-  
+
   // "menu.section.icon.export": "Export menu section",
   // TODO New key - Add a translation
   "menu.section.icon.export": "Export menu section",
-  
+
   // "menu.section.icon.find": "Find menu section",
   // TODO New key - Add a translation
   "menu.section.icon.find": "Find menu section",
-  
+
   // "menu.section.icon.import": "Import menu section",
   // TODO New key - Add a translation
   "menu.section.icon.import": "Import menu section",
-  
+
   // "menu.section.icon.new": "New menu section",
   // TODO New key - Add a translation
   "menu.section.icon.new": "New menu section",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.pin": "Pin sidebar",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   // TODO New key - Add a translation
   "menu.section.icon.processes": "Processes menu section",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   // TODO New key - Add a translation
   "menu.section.icon.registries": "Registries menu section",
-  
+
   // "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.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   // TODO New key - Add a translation
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   // TODO New key - Add a translation
   "menu.section.import_batch": "Batch 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_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.new_collection": "Collection",
-  
+
   // "menu.section.new_community": "Community",
   // TODO New key - Add a translation
   "menu.section.new_community": "Community",
-  
+
   // "menu.section.new_item": "Item",
   // TODO New key - Add a translation
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   // TODO New key - Add a translation
   "menu.section.new_item_version": "Item Version",
-  
+
   // "menu.section.new_process": "Process",
   // TODO New key - Add a translation
   "menu.section.new_process": "Process",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.pin": "Pin sidebar",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   // TODO New key - Add a translation
   "menu.section.processes": "Processes",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   // TODO New key - Add a translation
   "menu.section.registries": "Registries",
-  
+
   // "menu.section.registries_format": "Format",
   // TODO New key - Add a translation
   "menu.section.registries_format": "Format",
-  
+
   // "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_task": "Statistics Task",
   // TODO New key - Add a translation
   "menu.section.statistics_task": "Statistics Task",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
   "menu.section.toggle.access_control": "Toggle Access Control 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.curation_task": "Toggle Curation Task section",
   // TODO New key - Add a translation
   "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   // TODO New key - Add a translation
   "menu.section.toggle.edit": "Toggle Edit section",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   // TODO New key - Add a translation
   "menu.section.toggle.export": "Toggle Export section",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   // TODO New key - Add a translation
   "menu.section.toggle.find": "Toggle Find section",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   // TODO New key - Add a translation
   "menu.section.toggle.import": "Toggle Import section",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   // TODO New key - Add a translation
   "menu.section.toggle.new": "Toggle New section",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   // TODO New key - Add a translation
   "menu.section.toggle.registries": "Toggle Registries section",
-  
+
   // "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.workflow": "Administer Workflow",
   // TODO New key - Add a translation
   "menu.section.workflow": "Administer Workflow",
-  
-  
+
+
   // "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.description-placeholder": "Insert your message here...",
   // TODO New key - Add a translation
   "mydspace.messages.description-placeholder": "Insert your message here...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   // TODO New key - Add a translation
   "mydspace.messages.hide-msg": "Hide message",
-  
+
   // "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-unread": "Mark as unread",
   // TODO New key - Add a translation
   "mydspace.messages.mark-as-unread": "Mark as unread",
-  
+
   // "mydspace.messages.no-content": "No content.",
   // TODO New key - Add a translation
   "mydspace.messages.no-content": "No content.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   // TODO New key - Add a translation
   "mydspace.messages.no-messages": "No messages yet.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   // TODO New key - Add a translation
   "mydspace.messages.send-btn": "Send",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   // TODO New key - Add a translation
   "mydspace.messages.show-msg": "Show message",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   // TODO New key - Add a translation
   "mydspace.messages.subject-placeholder": "Subject...",
-  
+
   // "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.title": "Messages",
   // TODO New key - Add a translation
   "mydspace.messages.title": "Messages",
-  
+
   // "mydspace.messages.to": "To",
   // TODO New key - Add a translation
   "mydspace.messages.to": "To",
-  
+
   // "mydspace.new-submission": "New submission",
   // TODO New key - Add a translation
   "mydspace.new-submission": "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-short": "Import metadata",
   // TODO New key - Add a translation
   "mydspace.new-submission-external-short": "Import metadata",
-  
+
   // "mydspace.results.head": "Your submissions",
   // TODO New key - Add a translation
   "mydspace.results.head": "Your submissions",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   // TODO New key - Add a translation
   "mydspace.results.no-abstract": "No Abstract",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   // TODO New key - Add a translation
   "mydspace.results.no-authors": "No Authors",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   // TODO New key - Add a translation
   "mydspace.results.no-collections": "No Collections",
-  
+
   // "mydspace.results.no-date": "No Date",
   // TODO New key - Add a translation
   "mydspace.results.no-date": "No Date",
-  
+
   // "mydspace.results.no-files": "No Files",
   // TODO New key - Add a translation
   "mydspace.results.no-files": "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-title": "No title",
   // TODO New key - Add a translation
   "mydspace.results.no-title": "No title",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   // TODO New key - Add a translation
   "mydspace.results.no-uri": "No Uri",
-  
+
   // "mydspace.show.workflow": "All tasks",
   // TODO New key - Add a translation
   "mydspace.show.workflow": "All tasks",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   // 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.validation": "Validation",
+  "mydspace.status.mydspaceArchived": "Archived",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceValidation": "Validation",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
-  
-  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
-  
-  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "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
   "mydspace.title": "MyDSpace",
-  
+
   // "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-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-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-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.view-btn": "View",
   // TODO New key - Add a translation
   "mydspace.view-btn": "View",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   // TODO New key - Add a translation
   "nav.browse.header": "All of DSpace",
-  
+
   // "nav.community-browse.header": "By Community",
   // TODO New key - Add a translation
   "nav.community-browse.header": "By Community",
-  
+
   // "nav.language": "Language switch",
   // TODO New key - Add a translation
   "nav.language": "Language switch",
-  
+
   // "nav.login": "Log In",
   // TODO New key - Add a translation
   "nav.login": "Log In",
-  
+
   // "nav.logout": "Log Out",
   // TODO New key - Add a translation
   "nav.logout": "Log Out",
-  
+
   // "nav.mydspace": "MyDSpace",
   // TODO New key - Add a translation
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
   // TODO New key - Add a translation
   "nav.profile": "Profile",
-  
+
   // "nav.search": "Search",
   // TODO New key - Add a translation
   "nav.search": "Search",
-  
+
   // "nav.statistics.header": "Statistics",
   // TODO New key - Add a translation
   "nav.statistics.header": "Statistics",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   // TODO New key - Add a translation
   "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   // TODO New key - Add a translation
   "orgunit.listelement.badge": "Organizational Unit",
-  
+
   // "orgunit.page.city": "City",
   // TODO New key - Add a translation
   "orgunit.page.city": "City",
-  
+
   // "orgunit.page.country": "Country",
   // TODO New key - Add a translation
   "orgunit.page.country": "Country",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   // TODO New key - Add a translation
   "orgunit.page.dateestablished": "Date established",
-  
+
   // "orgunit.page.description": "Description",
   // TODO New key - Add a translation
   "orgunit.page.description": "Description",
-  
+
   // "orgunit.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "orgunit.page.edit": "Edit this item",
-  
+
   // "orgunit.page.id": "ID",
   // TODO New key - Add a translation
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   // TODO New key - Add a translation
   "orgunit.page.titleprefix": "Organizational Unit: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   // TODO New key - Add a translation
   "pagination.results-per-page": "Results Per Page",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   // TODO New key - Add a translation
   "pagination.showing.detail": "{{ range }} of {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   // TODO New key - Add a translation
   "pagination.showing.label": "Now showing ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   // TODO New key - Add a translation
   "pagination.sort-direction": "Sort Options",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   // TODO New key - Add a translation
   "person.listelement.badge": "Person",
-  
+
   // "person.listelement.no-title": "No name found",
   // TODO New key - Add a translation
   "person.listelement.no-title": "No name found",
-  
+
   // "person.page.birthdate": "Birth Date",
   // TODO New key - Add a translation
   "person.page.birthdate": "Birth Date",
-  
+
   // "person.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "person.page.edit": "Edit this item",
-  
+
   // "person.page.email": "Email Address",
   // TODO New key - Add a translation
   "person.page.email": "Email Address",
-  
+
   // "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.lastname": "Last Name",
   // TODO New key - Add a translation
   "person.page.lastname": "Last Name",
-  
+
   // "person.page.link.full": "Show all metadata",
   // TODO New key - Add a translation
   "person.page.link.full": "Show all 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.titleprefix": "Person: ",
   // TODO New key - Add a translation
   "person.page.titleprefix": "Person: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   // TODO New key - Add a translation
   "process.new.select-parameters": "Parameters",
-  
+
   // "process.new.cancel": "Cancel",
   // TODO New key - Add a translation
   "process.new.cancel": "Cancel",
-  
+
   // "process.new.submit": "Submit",
   // TODO New key - Add a translation
   "process.new.submit": "Submit",
-  
+
   // "process.new.select-script": "Script",
   // TODO New key - Add a translation
   "process.new.select-script": "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.required": "Script is required",
   // TODO New key - Add a translation
   "process.new.select-script.required": "Script is 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.required": "Please select a file",
   // TODO New key - Add a translation
   "process.new.parameter.file.required": "Please select a file",
-  
+
   // "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.type.value": "value",
   // TODO New key - Add a translation
   "process.new.parameter.type.value": "value",
-  
+
   // "process.new.parameter.type.file": "file",
   // TODO New key - Add a translation
   "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.notification.success.title": "Success",
   // TODO New key - Add a translation
   "process.new.notification.success.title": "Success",
-  
+
   // "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.error.title": "Error",
   // TODO New key - Add a translation
   "process.new.notification.error.title": "Error",
-  
+
   // "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.header": "Create a new process",
   // TODO New key - Add a translation
   "process.new.header": "Create a new process",
-  
+
   // "process.new.title": "Create a new process",
   // TODO New key - Add a translation
   "process.new.title": "Create a new process",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   // TODO New key - Add a translation
   "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
-  
+  "process.detail.arguments": "Arguments",
+
   // "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": "This process doesn't contain any arguments",
+
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
-  
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
   "process.detail.logs.button": "Retrieve process output",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   // TODO New key - Add a translation
   "process.detail.logs.loading": "Retrieving",
-  
+
   // "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.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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
-  
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
+  "process.detail.end-time": "Finish time",
+
   // "process.detail.status" : "Status",
   // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
+  "process.detail.status": "Status",
+
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
+  "process.detail.create": "Create similar process",
+
+
+
   // "process.overview.table.finish" : "Finish time",
   // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
+  "process.overview.table.finish": "Finish time",
+
   // "process.overview.table.id" : "Process ID",
   // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
+  "process.overview.table.id": "Process ID",
+
   // "process.overview.table.name" : "Name",
   // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name": "Name",
+
   // "process.overview.table.start" : "Start time",
   // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
-  
+  "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.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.title": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.title": "Processes Overview",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.breadcrumbs": "Processes Overview",
-  
+
   // "process.overview.new": "New",
   // TODO New key - Add a translation
   "process.overview.new": "New",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   // TODO New key - Add a translation
   "profile.breadcrumbs": "Update Profile",
-  
+
   // "profile.card.identify": "Identify",
   // TODO New key - Add a translation
   "profile.card.identify": "Identify",
-  
+
   // "profile.card.security": "Security",
   // TODO New key - Add a translation
   "profile.card.security": "Security",
-  
+
   // "profile.form.submit": "Update Profile",
   // TODO New key - Add a translation
   "profile.form.submit": "Update Profile",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   // TODO New key - Add a translation
   "profile.groups.head": "Authorization groups you belong to",
-  
+
   // "profile.head": "Update Profile",
   // TODO New key - Add a translation
   "profile.head": "Update Profile",
-  
+
   // "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.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.label.email": "Email Address",
   // TODO New key - Add a translation
   "profile.metadata.form.label.email": "Email Address",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   // TODO New key - Add a translation
   "profile.metadata.form.label.firstname": "First Name",
-  
+
   // "profile.metadata.form.label.language": "Language",
   // TODO New key - Add a translation
   "profile.metadata.form.label.language": "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.phone": "Contact Telephone",
   // TODO New key - Add a translation
   "profile.metadata.form.label.phone": "Contact Telephone",
-  
+
   // "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.title": "Profile saved",
   // TODO New key - Add a translation
   "profile.metadata.form.notifications.success.title": "Profile saved",
-  
+
   // "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.title": "No changes",
   // TODO New key - Add a translation
   "profile.notifications.warning.no-changes.title": "No changes",
-  
+
   // "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.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.label.password": "Password",
   // TODO New key - Add a translation
   "profile.security.form.label.password": "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.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.title": "Password saved",
   // TODO New key - Add a translation
   "profile.security.form.notifications.success.title": "Password saved",
-  
+
   // "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.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.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.title": "Update Profile",
   // TODO New key - Add a translation
   "profile.title": "Update Profile",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   // TODO New key - Add a translation
   "project.listelement.badge": "Research Project",
-  
+
   // "project.page.contributor": "Contributors",
   // TODO New key - Add a translation
   "project.page.contributor": "Contributors",
-  
+
   // "project.page.description": "Description",
   // TODO New key - Add a translation
   "project.page.description": "Description",
-  
+
   // "project.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "project.page.edit": "Edit this item",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   // TODO New key - Add a translation
   "project.page.expectedcompletion": "Expected Completion",
-  
+
   // "project.page.funder": "Funders",
   // TODO New key - Add a translation
   "project.page.funder": "Funders",
-  
+
   // "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.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.search.results.head": "Project Search Results",
   // TODO New key - Add a translation
   "project.search.results.head": "Project Search Results",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   // TODO New key - Add a translation
   "publication.listelement.badge": "Publication",
-  
+
   // "publication.page.description": "Description",
   // TODO New key - Add a translation
   "publication.page.description": "Description",
-  
+
   // "publication.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "publication.page.edit": "Edit this item",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "publication.page.journal-issn": "Journal ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "publication.page.journal-title": "Journal Title",
-  
+
   // "publication.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "publication.page.publisher": "Publisher",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   // TODO New key - Add a translation
   "publication.page.titleprefix": "Publication: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "publication.page.volume-title": "Volume Title",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   // TODO New key - Add a translation
   "publication.search.results.head": "Publication Search Results",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   // TODO New key - Add a translation
   "publication.search.title": "DSpace Angular :: Publication Search",
-  
-  
+
+
   // "register-email.title": "New user registration",
   // TODO New key - Add a translation
   "register-email.title": "New user registration",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   // TODO New key - Add a translation
   "register-page.create-profile.header": "Create Profile",
-  
+
   // "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.email": "Email Address",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.email": "Email Address",
-  
+
   // "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.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.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.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.contact": "Contact Telephone",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.contact": "Contact Telephone",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.language": "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.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.label.password": "Password *",
   // TODO New key - Add a translation
   "register-page.create-profile.security.label.password": "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.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.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.submit": "Complete Registration",
   // TODO New key - Add a translation
   "register-page.create-profile.submit": "Complete Registration",
-  
+
   // "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.head": "Registration failed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.error.head": "Registration failed",
-  
+
   // "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.head": "Registration completed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   // TODO New key - Add a translation
   "register-page.registration.header": "New user registration",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "register-page.registration.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Register",
   // TODO New key - Add a translation
   "register-page.registration.submit": "Register",
-  
+
   // "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.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.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.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 }}",
-  
-  
-  
+
+
+
   // "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.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.title": "Unable to add relationship",
   // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
-  
+
   // "relationships.isAuthorOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isAuthorOf": "Authors",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.Person": "Authors (persons)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   // TODO New key - Add a translation
   "relationships.isIssueOf": "Journal Issues",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   // TODO New key - Add a translation
   "relationships.isJournalIssueOf": "Journal Issue",
-  
+
   // "relationships.isJournalOf": "Journals",
   // TODO New key - Add a translation
   "relationships.isJournalOf": "Journals",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   // TODO New key - Add a translation
   "relationships.isOrgUnitOf": "Organizational Units",
-  
+
   // "relationships.isPersonOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isPersonOf": "Authors",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   // TODO New key - Add a translation
   "relationships.isProjectOf": "Research Projects",
-  
+
   // "relationships.isPublicationOf": "Publications",
   // TODO New key - Add a translation
   "relationships.isPublicationOf": "Publications",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   // TODO New key - Add a translation
   "relationships.isPublicationOfJournalIssue": "Articles",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   // TODO New key - Add a translation
   "relationships.isSingleJournalOf": "Journal",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   // TODO New key - Add a translation
   "relationships.isSingleVolumeOf": "Journal Volume",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   // TODO New key - Add a translation
   "relationships.isVolumeOf": "Journal Volumes",
-  
+
   // "relationships.isContributorOf": "Contributors",
   // TODO New key - Add a translation
   "relationships.isContributorOf": "Contributors",
-  
-  
-  
+
+
+
   // "resource-policies.add.button": "Add",
   // TODO New key - Add a translation
   "resource-policies.add.button": "Add",
-  
+
   // "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.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.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.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.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.collection": "Add a new Collection policy",
   // TODO New key - Add a translation
   "resource-policies.add.for.collection": "Add a new Collection policy",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.create.page.success.content": "Operation successful",
-  
+
   // "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.delete.btn": "Delete selected",
   // TODO New key - Add a translation
   "resource-policies.delete.btn": "Delete selected",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.delete.success.content": "Operation successful",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.edit.page.success.content": "Operation successful",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   // TODO New key - Add a translation
   "resource-policies.edit.page.title": "Edit resource policy",
-  
+
   // "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.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.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.select.btn": "Select",
   // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
+
   // "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.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.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.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.date.end.label": "End Date",
   // TODO New key - Add a translation
   "resource-policies.form.date.end.label": "End Date",
-  
+
   // "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.description.label": "Description",
   // TODO New key - Add a translation
   "resource-policies.form.description.label": "Description",
-  
+
   // "resource-policies.form.name.label": "Name",
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
-  
+
   // "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.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.table.headers.action": "Action",
   // TODO New key - Add a translation
   "resource-policies.table.headers.action": "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.start": "Start Date",
   // TODO New key - Add a translation
   "resource-policies.table.headers.date.start": "Start Date",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit": "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.policy": "Edit policy",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit.policy": "Edit policy",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   // TODO New key - Add a translation
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
   // TODO New key - Add a translation
   "resource-policies.table.headers.group": "Group",
-  
+
   // "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.policyType": "type",
   // TODO New key - Add a translation
   "resource-policies.table.headers.policyType": "type",
-  
+
   // "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.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.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.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.collection": "Policies for Collection",
   // TODO New key - Add a translation
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
+
+
+
   // "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.title": "DSpace Angular :: Search",
   // TODO New key - Add a translation
   "search.title": "DSpace Angular :: Search",
-  
+
   // "search.breadcrumbs": "Search",
   // TODO New key - Add a translation
   "search.breadcrumbs": "Search",
-  
-  
+
+
   // "search.filters.applied.f.author": "Author",
   // TODO New key - Add a translation
   "search.filters.applied.f.author": "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.min": "Start date",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateIssued.min": "Start date",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateSubmitted": "Date submitted",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   // TODO New key - Add a translation
   "search.filters.applied.f.discoverable": "Private",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.entityType": "Item Type",
-  
+
   // "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.itemtype": "Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.itemtype": "Type",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   // TODO New key - Add a translation
   "search.filters.applied.f.namedresourcetype": "Status",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   // TODO New key - Add a translation
   "search.filters.applied.f.subject": "Subject",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   // TODO New key - Add a translation
   "search.filters.applied.f.submitter": "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.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.min": "Start birth date",
   // TODO New key - Add a translation
   "search.filters.applied.f.birthDate.min": "Start birth date",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   // TODO New key - Add a translation
   "search.filters.filter.author.head": "Author",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   // TODO New key - Add a translation
   "search.filters.filter.author.placeholder": "Author name",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.head": "Birth Date",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.placeholder": "Birth Date",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.head": "Date Published",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  
+
   // "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.creativeWorkKeywords.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  
+
   // "search.filters.filter.dateIssued.head": "Date",
   // TODO New key - Add a translation
   "search.filters.filter.dateIssued.head": "Date",
-  
+
   // "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.min.placeholder": "Maximum Date",
   // TODO New key - Add a translation
   "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.head": "Date submitted",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   // TODO New key - Add a translation
   "search.filters.filter.discoverable.head": "Private",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.filter.withdrawn.head": "Withdrawn",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.head": "Item Type",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.placeholder": "Item Type",
-  
+
   // "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.itemtype.head": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.head": "Type",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.placeholder": "Type",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.head": "Job Title",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.placeholder": "Job Title",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.head": "Known language",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  
+
   // "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.objectpeople.head": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.head": "People",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.placeholder": "People",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.head": "Country",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.head": "City",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   // TODO New key - Add a translation
   "search.filters.filter.scope.head": "Scope",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   // TODO New key - Add a translation
   "search.filters.filter.scope.placeholder": "Scope filter",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   // TODO New key - Add a translation
   "search.filters.filter.show-less": "Collapse",
-  
+
   // "search.filters.filter.show-more": "Show more",
   // TODO New key - Add a translation
   "search.filters.filter.show-more": "Show more",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.subject.head": "Subject",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.subject.placeholder": "Subject",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.head": "Submitter",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.placeholder": "Submitter",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalIssue": "Journal Issue",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalVolume": "Journal Volume",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   // TODO New key - Add a translation
   "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
+
   // "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.false": "No",
   // TODO New key - Add a translation
   "search.filters.has_content_in_original_bundle.false": "No",
-  
+
   // "search.filters.discoverable.true": "No",
   // TODO New key - Add a translation
   "search.filters.discoverable.true": "No",
-  
+
   // "search.filters.discoverable.false": "Yes",
   // TODO New key - Add a translation
   "search.filters.discoverable.false": "Yes",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   // TODO New key - Add a translation
   "search.filters.withdrawn.true": "Yes",
-  
+
   // "search.filters.withdrawn.false": "No",
   // TODO New key - Add a translation
   "search.filters.withdrawn.false": "No",
-  
-  
+
+
   // "search.filters.head": "Filters",
   // TODO New key - Add a translation
   "search.filters.head": "Filters",
-  
+
   // "search.filters.reset": "Reset filters",
   // TODO New key - Add a translation
   "search.filters.reset": "Reset filters",
-  
-  
-  
+
+
+
   // "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.results.head": "Search Results",
   // TODO New key - Add a translation
   "search.results.head": "Search Results",
-  
+
   // "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-link": "quotes around it",
   // TODO New key - Add a translation
   "search.results.no-results-link": "quotes around it",
-  
+
   // "search.results.empty": "Your search returned no results.",
   // TODO New key - Add a translation
   "search.results.empty": "Your search returned no results.",
-  
-  
-  
+
+
+
   // "search.sidebar.close": "Back to results",
   // TODO New key - Add a translation
   "search.sidebar.close": "Back to results",
-  
+
   // "search.sidebar.filters.title": "Filters",
   // TODO New key - Add a translation
   "search.sidebar.filters.title": "Filters",
-  
+
   // "search.sidebar.open": "Search Tools",
   // TODO New key - Add a translation
   "search.sidebar.open": "Search Tools",
-  
+
   // "search.sidebar.results": "results",
   // TODO New key - Add a translation
   "search.sidebar.results": "results",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   // TODO New key - Add a translation
   "search.sidebar.settings.rpp": "Results per page",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   // TODO New key - Add a translation
   "search.sidebar.settings.sort-by": "Sort By",
-  
+
   // "search.sidebar.settings.title": "Settings",
   // TODO New key - Add a translation
   "search.sidebar.settings.title": "Settings",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   // TODO New key - Add a translation
   "search.view-switch.show-detail": "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-list": "Show as list",
   // TODO New key - Add a translation
   "search.view-switch.show-list": "Show as list",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   // TODO New key - Add a translation
   "sorting.ASC": "Ascending",
-  
+
   // "sorting.DESC": "Descending",
   // TODO New key - Add a translation
   "sorting.DESC": "Descending",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   // TODO New key - Add a translation
   "sorting.dc.title.ASC": "Title Ascending",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   // TODO New key - Add a translation
   "sorting.dc.title.DESC": "Title Descending",
-  
+
   // "sorting.score.DESC": "Relevance",
   // TODO New key - Add a translation
   "sorting.score.DESC": "Relevance",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
   // TODO New key - Add a translation
   "statistics.title": "Statistics",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   // TODO New key - Add a translation
   "statistics.header": "Statistics for {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   // TODO New key - Add a translation
   "statistics.breadcrumbs": "Statistics",
-  
+
   // "statistics.page.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.page.no-data": "No data available",
-  
+
   // "statistics.table.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.table.no-data": "No data available",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalVisits": "Total visits",
-  
+
   // "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.TotalDownloads": "File Visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalDownloads": "File Visits",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCountries": "Top country views",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCities": "Top city views",
-  
+
   // "statistics.table.header.views": "Views",
   // TODO New key - Add a translation
   "statistics.table.header.views": "Views",
-  
-  
-  
+
+
+
   // "submission.edit.title": "Edit Submission",
   // TODO New key - Add a translation
   "submission.edit.title": "Edit Submission",
-  
+
   // "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.deposit": "Deposit",
   // TODO New key - Add a translation
   "submission.general.deposit": "Deposit",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.cancel": "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.submit": "Yes, I'm sure",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.title": "Discard submission",
-  
+
   // "submission.general.discard.submit": "Discard",
   // TODO New key - Add a translation
   "submission.general.discard.submit": "Discard",
-  
+
   // "submission.general.save": "Save",
   // TODO New key - Add a translation
   "submission.general.save": "Save",
-  
+
   // "submission.general.save-later": "Save for later",
   // TODO New key - Add a translation
   "submission.general.save-later": "Save for 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.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.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.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.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.button": "Search",
   // TODO New key - Add a translation
   "submission.import-external.search.button": "Search",
-  
+
   // "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.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.source.arxiv": "arXiv",
   // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   // TODO New key - Add a translation
   "submission.import-external.source.loading": "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.sherpaPublisher": "SHERPA Publishers",
   // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   // TODO New key - Add a translation
   "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.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",
   // TODO New key - Add a translation
   "submission.import-external.preview.title": "Item Preview",
-  
+
   // "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.button.import": "Start submission",
   // TODO New key - Add a translation
   "submission.import-external.preview.button.import": "Start submission",
-  
+
   // "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.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.sections.describe.relationship-lookup.close": "Close",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.close": "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.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.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 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 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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 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.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.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 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.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.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.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.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-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.loading": "Loading...",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.loading": "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.search": "Go",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
+
   // "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-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.selected": "Selected {{ size }} items",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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",
   // 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.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.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.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.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.JournalIssue": "Journal Issues",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
+
   // "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.JournalVolume": "Journal Volumes",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
+
   // "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.isAuthorOfPublication": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
+
   // "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.Project": "Projects",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
+
   // "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.Person": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
+
   // "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.DataPackage": "Data Packages",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
+
   // "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.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.isFundingOfPublication": "Funding",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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": "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": "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.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.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.ccLicense.type": "License Type",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.type": "License 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.change": "Change your license type…",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.change": "Change your license type…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.none": "No licenses available",
-  
+
   // "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.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.confirmation": "I grant the license above",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
+
   // "submission.sections.general.add-more": "Add more",
   // TODO New key - Add a translation
   "submission.sections.general.add-more": "Add more",
-  
+
   // "submission.sections.general.collection": "Collection",
   // TODO New key - Add a translation
   "submission.sections.general.collection": "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_success_notice": "Submission deposited successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  
+
   // "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_success_notice": "Submission discarded successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  
+
   // "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-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.no-collection": "No collection found",
   // TODO New key - Add a translation
   "submission.sections.general.no-collection": "No collection 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.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_success_notice": "Submission saved successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  
+
   // "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.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.submit.progressbar.CClicense": "Creative commons license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
+
   // "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.stepcustom": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  
+
   // "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.steptwo": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.license": "Deposit license",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.upload": "Upload files",
-  
-  
-  
+
+
+
   // "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.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.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.title": "Delete bitstream",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.submit": "Delete",
-  
+
   // "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.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.date-required": "Date is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.date-required": "Date is required.",
-  
+
   // "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-placeholder": "From",
   // TODO New key - Add a translation
   "submission.sections.upload.form.from-placeholder": "From",
-  
+
   // "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-required": "Group is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.group-required": "Group is 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-placeholder": "Until",
   // TODO New key - Add a translation
   "submission.sections.upload.form.until-placeholder": "Until",
-  
+
   // "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.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.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>",
   // 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 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.no-entry": "No",
   // TODO New key - Add a translation
   "submission.sections.upload.no-entry": "No",
-  
+
   // "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.save-metadata": "Save metadata",
   // TODO New key - Add a translation
   "submission.sections.upload.save-metadata": "Save metadata",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   // TODO New key - Add a translation
   "submission.sections.upload.undo": "Cancel",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-failed": "Upload failed",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-successful": "Upload successful",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   // TODO New key - Add a translation
   "submission.submit.title": "Submission",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   // TODO New key - Add a translation
   "submission.workflow.generic.delete": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.generic.edit": "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.view": "View",
   // TODO New key - Add a translation
   "submission.workflow.generic.view": "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.tasks.claimed.approve": "Approve",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.approve": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.edit": "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.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.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.submit": "Reject item",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  
+
   // "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.submit": "Reject",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  
+
   // "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.return": "Return to pool",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.return": "Return to pool",
-  
+
   // "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.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.processing": "Processing...",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.processing": "Processing...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.submitter": "Submitter",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.success": "Operation successful",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.claim": "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.hide-detail": "Hide detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.show-detail": "Show detail",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   // TODO New key - Add a translation
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   // TODO New key - Add a translation
   "vocabulary-treeview.header": "Hierarchical tree view",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   // TODO New key - Add a translation
   "vocabulary-treeview.load-more": "Load more",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.reset": "Reset",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.search": "Search",
-  
+
   // "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.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.srsc": "Research Subject Categories",
   // TODO New key - Add a translation
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   // TODO New key - Add a translation
   "uploader.browse": "browse",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   // TODO New key - Add a translation
   "uploader.drag-message": "Drag & Drop your files here",
-  
+
   // "uploader.or": ", or ",
   // TODO New key - Add a translation
   "uploader.or": ", 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.queue-length": "Queue length",
   // TODO New key - Add a translation
   "uploader.queue-length": "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.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-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",
-  
-  
-  
+
+
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   // TODO New key - Add a translation
   "workflowAdmin.search.results.head": "Administer 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.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.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.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.title": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.title": "Delete workflow item",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.header": "Delete workflow item",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.delete.button.cancel": "Cancel",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   // TODO New key - Add a translation
   "workflow-item.delete.button.confirm": "Delete",
-  
-  
+
+
   // "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.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.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.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.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.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.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.send-back.button.cancel": "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",
 
-}
\ No newline at end of file
+
+}
diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5
index a29a9a9c40..8c99662d4b 100644
--- a/src/assets/i18n/bn.json5
+++ b/src/assets/i18n/bn.json5
@@ -1,1416 +1,1821 @@
 {
-  
+
   // "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",
   "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.",
   "403.help": "আপনার এই পৃষ্ঠাটি অ্যাক্সেস করার অনুমতি নেই। আপনি হোম পেজে ফিরে যেতে নীচের বোতামটি ব্যবহার করতে পারেন।",
-  
+
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "আমাকে হোম পেজে নিয়ে যাও",
-  
+
   // "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. ",
   "404.help": "আপনি যে পৃষ্ঠাটি খুঁজছেন তা আমরা খুঁজে পাচ্ছি না। পৃষ্ঠাটি সরানো বা মুছে ফেলা হতে পারে। আপনি হোম পেজে ফিরে যেতে নীচের বোতামটি ব্যবহার করতে পারেন।",
-  
+
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "আমাকে হোম পেজে নিয়ে যাও",
-  
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "পৃষ্ঠা খুঁজে পাওয়া যায়নি",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "সিস্টেম নিরাময়ের কাজ",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   "admin.curation-tasks.title": "সিস্টেম নিরাময়ের কাজ",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   "admin.curation-tasks.header": "সিস্টেম নিরাময়ের কাজ",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "বিন্যাস রেজিস্ট্রি",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.create.failure.content": "নতুন বিটস্ট্রিম বিন্যাস তৈরি করার সময় একটি ত্রুটি ঘটেছে।",
-  
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "ব্যর্থতা",
-  
+
   // "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",
   "admin.registries.bitstream-formats.create.new": "একটি নতুন বিটস্ট্রিম বিন্যাস যোগ করুন",
-  
+
   // "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",
   "admin.registries.bitstream-formats.create.success.head": "সাফল্য",
-  
+
   // "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",
   "admin.registries.bitstream-formats.delete.failure.head": "ব্যর্থতা",
-  
+
   // "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",
   "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.",
   "admin.registries.bitstream-formats.description": "বিটস্ট্রিম ফরম্যাটের এই তালিকা পরিচিত ফরম্যাট এবং তাদের সমর্থন স্তর সম্পর্কে তথ্য সরবরাহ করে।",
-  
+
   // "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",
   "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.",
   "admin.registries.bitstream-formats.edit.extensions.hint": "এক্সটেনশানগুলি হল ফাইল এক্সটেনশান যা স্বয়ংক্রিয়ভাবে আপলোড করা ফাইলগুলির বিন্যাস সনাক্ত করতে ব্যবহৃত হয়। আপনি প্রতিটি বিন্যাসের জন্য বিভিন্ন এক্সটেনশন লিখতে পারেন।",
-  
+
   // "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",
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "ডট ছাড়া একটি ফাইল এক্সটেনশান লিখুন",
-  
+
   // "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",
   "admin.registries.bitstream-formats.edit.failure.head": "ব্যর্থতা",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.edit.internal.hint": "অভ্যন্তরীণ হিসাবে চিহ্নিত ফর্ম্যাট ব্যবহারকারী থেকে লুকানো এবং প্রশাসনিক উদ্দেশ্যে ব্যবহার করা হয়।",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.edit.mimetype.hint": "এই বিন্যাসের সাথে যুক্ত মিম টাইপ ইউনিক হতে হবে না।",
-  
+
   // "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)",
   "admin.registries.bitstream-formats.edit.shortDescription.hint": "এই বিন্যাসের জন্য একটি ইউনিক নাম (উদাহরণ সরূপঃ  মাইক্রোসফ্ট ওয়ার্ড এক্সপি বা মাইক্রোসফ্ট ওয়ার্ড 2000)",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.edit.success.content": "বিটস্ট্রিম বিন্যাস সফলভাবে সম্পাদিত হয়।",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "এই বিন্যাসের জন্য আপনার প্রতিষ্ঠানের প্রতিশ্রুতি সমর্থনের স্তর",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "সমর্থন স্তর",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "বিটস্ট্রিম ফরম্যাট রেজিস্ট্রি",
-  
+
   // "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",
   "admin.registries.bitstream-formats.table.delete": "নির্বাচিতটা মুছুন",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "সব গুলো অনির্বাচিত কর",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "অভ্যন্তরীণ",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "মিম টাইপ",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "নাম",
-  
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
+
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "পেছনে",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "পরিচিত",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "সমর্থিত",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "অজানা",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "সমর্থন স্তর",
-  
+
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "বিটস্ট্রিম রেজিস্ট্রি ফরম্যাট",
-  
-  
-  
+
+
+
   // "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.",
   "admin.registries.metadata.description": "মেটাডেটা রেজিস্ট্রি রিপোজিটরিতে উপলব্ধ সমস্ত মেটাডেটা ক্ষেত্রের একটি তালিকা বজায় রাখে। এই ক্ষেত্রগুলি একাধিক স্কিমাসের মধ্যে বিভক্ত করা যেতে পারে। তবে ডিস্পেস যোগ্য ডাবলিন কোর স্কিমা প্রয়োজন।",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "মেটাডাটা স্কিমা তৈরি করুন",
-  
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "মেটাডাটা স্কিমা সম্পাদনা করুন",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "নাম",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "নামস্থান",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "মেটাডেটা রেজিস্ট্রি",
-  
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "প্রদর্শন করার মত কোন মেটাডেটা স্কিমা নেই",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "নির্বাচিতটা মুছুন",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "আইডি",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "নাম",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "নামস্থান",
-  
+
   // "admin.registries.metadata.title": "Metadata Registry",
   "admin.registries.metadata.title": "মেটাডেটা রেজিস্ট্রি",
-  
-  
-  
+
+
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "মেটাডাটা স্কিমা",
-  
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "এটি \"{{ namespace }}\" এর জন্য মেটাডেটা স্কিমা।",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "স্কিমা মেটাডেটা ক্ষেত্র",
-  
+
   // "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",
   "admin.registries.schema.fields.table.delete": "নির্বাচিতটা মুছুন",
-  
+
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "ক্ষেত্র",
-  
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "স্কোপ নোট",
-  
+
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "মেটাডেটা ক্ষেত্র তৈরি করুন",
-  
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
   "admin.registries.schema.form.edit": "মেটাডেটা ফিল্ড সম্পাদনা করুন",
-  
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "উপাদান",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "কোয়ালিফায়ার",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "স্কোপ নোট",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "মেটাডাটা স্কিমা",
-  
+
   // "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",
   "admin.registries.schema.notification.deleted.failure": "মেটাডেটা স্কিমা গুলো মুছে ফেলতে ব্যর্থ হয়েছে {{ amount }} মেটাডাটা স্কিমাস",
-  
+
   // "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}}\"",
   "admin.registries.schema.notification.edited": "সফলভাবে সম্পাদিত মেটাডেটা স্কিমা \"{{prefix}}\"।",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "ত্রুটি",
-  
+
   // "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",
   "admin.registries.schema.notification.field.deleted.failure": "{{ amount }} মেটাডেটা ক্ষেত্র মুছে ফেলতে ব্যর্থ হয়েছে",
-  
+
   // "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}}\"",
   "admin.registries.schema.notification.field.edited": "সফলভাবে সম্পাদিত মেটাডেটা ক্ষেত্র \"{{ field }}\"।",
-  
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "সাফল্য",
-  
+
   // "admin.registries.schema.return": "Back",
   "admin.registries.schema.return": "পেছনে",
-  
+
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "মেটাডাটা স্কিমা রেজিস্ট্রি",
-  
-  
-  
+
+
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "ই-পারসন মুছে দিন",
-  
+
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
   "admin.access-control.epeople.actions.impersonate": "ছদ্মবেশী ই-পারসন",
-  
+
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "পাসওয়ার্ড রিসেট করুন",
-  
+
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "ছদ্মবেশী ই-পারসন বন্ধ করুন",
-  
+
   // "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.head": "EPeople",
   "admin.access-control.epeople.head": "ই-পারসন",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "অনুসন্ধান করুন",
-  
+
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "সব ব্রাউজ করুন",
-  
+
   // "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)",
   "admin.access-control.epeople.search.scope.email": "ই-মেইল (সঠিক)",
-  
+
   // "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",
   "admin.access-control.epeople.button.add": "ই-পারসন যোগ করুন",
-  
+
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "আইডি",
-  
+
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "নাম",
-  
+
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
   "admin.access-control.epeople.table.email": "ই-মেইল (সঠিক)",
-  
+
   // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "সম্পাদনা করুন",
-  
+
   // "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}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "\"{{ name }}\" মুছে ফেলুন",
-  
+
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
   "admin.access-control.epeople.no-items": "কোন ই-পারসিওন প্রদর্শন করার জন্যে নেই।",
-  
+
   // "admin.access-control.epeople.form.create": "Create EPerson",
   "admin.access-control.epeople.form.create": "ই-পারসন তৈরি করুন",
-  
+
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
   "admin.access-control.epeople.form.edit": "ই-পারসন সম্পাদনা করুন",
-  
+
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "নামের প্রথম অংশ",
-  
+
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "নামের শেষাংশ",
-  
+
   // "admin.access-control.epeople.form.email": "E-mail",
   "admin.access-control.epeople.form.email": "ই-মেইল",
-  
+
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
   "admin.access-control.epeople.form.emailHint": "বৈধ ইমেইল ঠিকানা হতে হবে",
-  
+
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "লগ ইন করতে পারেন",
-  
+
   // "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}}\"",
   "admin.access-control.epeople.form.notification.created.success": "সফলভাবে তৈরি ই-পারসন \"{{ name }}\"।",
-  
+
   // "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.",
   "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.",
   "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "ই-পারসন \"{{ name }}\" সম্পাদনা করতে ব্যর্থ। ইমেল \"{{ email }}\" ইতিমধ্যে ব্যবহার করা হয়েছে।",
-  
+
   // "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}}\"",
   "admin.access-control.epeople.form.notification.edited.failure": "ই-পারসন সম্পাদনা করতে ব্যর্থ \"{{ name }}\"।",
-  
+
   // "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}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "ই-পারসন মুছে ফেলতে ব্যর্থ হয়েছে \"{{ name }}\"।",
-  
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "এই দলের সদস্য:",
-  
+
   // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "আইডি",
-  
+
   // "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",
   "admin.access-control.epeople.form.memberOfNoGroups": "এই ই-পারসন কোন দলের সদস্য নয়",
-  
+
   // "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}}\"",
   "admin.access-control.epeople.notification.deleted.failure": "ই-পারসন মুছে ফেলতে ব্যর্থ হয়েছে: \"{{name}}\"",
-  
+
   // "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.singleGroup.breadcrumbs": "Edit Group",
   "admin.access-control.groups.singleGroup.breadcrumbs": "গ্রুপ সম্পাদনা করুন",
-  
+
   // "admin.access-control.groups.title.singleGroup": "Edit Group",
   "admin.access-control.groups.title.singleGroup": "গ্রুপ সম্পাদনা করুন",
-  
+
   // "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",
   "admin.access-control.groups.head": "গ্রুপ",
-  
+
   // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "গ্রুপ যোগ করুন",
-  
+
   // "admin.access-control.groups.search.head": "Search groups",
   "admin.access-control.groups.search.head": "অনুসন্ধান গ্রুপ",
-  
+
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "সব ব্রাউজ করুন",
-  
+
   // "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",
   "admin.access-control.groups.table.id": "আইডি",
-  
+
   // "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",
   "admin.access-control.groups.table.members": "সদস্যগণ",
-  
+
   // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "সম্পাদনা করুন",
-  
+
   // "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}}\"",
   "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",
   "admin.access-control.groups.no-items": "তাদের নাম বা এই UUID হিসাবে কোন গ্রুপ পাওয়া যায় নি",
-  
+
   // "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}}\"",
   "admin.access-control.groups.notification.deleted.failure.title": "গ্রুপ \"{{ name }}\" মুছে ফেলতে ব্যর্থ হয়েছে",
-  
+
   // "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.",
   "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.",
   "admin.access-control.groups.form.alert.workflowGroup": "এই গোষ্ঠীটি সংশোধন করা বা মুছে ফেলা যাবে না কারণ এটি \"{{ name }}\" \"{{ comcol }}\" -এ জমা এবং ওয়ার্কফ্লো প্রক্রিয়াতে ভূমিকা অনুসারে। আপনি এটি মুছে ফেলতে পারেন from the <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> tab on the edit {{comcol}} page। আপনি এখনও এই পৃষ্ঠাটি ব্যবহার করে গ্রুপ সদস্যদের যোগ এবং অপসারণ করতে পারেন।",
-  
+
   // "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",
   "admin.access-control.groups.form.head.edit": "গ্রুপ সম্পাদনা করুন",
-  
+
   // "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",
   "admin.access-control.groups.form.groupDescription": "বর্ণনা",
-  
+
   // "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}}\"",
   "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.",
   "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "নামের সাথে গ্রুপ তৈরি করতে ব্যর্থ হয়েছে: \"{{name}}\", নিশ্চিত করুন যে নামটি ইতিমধ্যে ব্যবহার করা হচ্ছে না।",
-  
+
   // "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!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "নাম \"{{ name }}\" ইতিমধ্যে ব্যবহার হয়েছে!",
-  
+
   // "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",
   "admin.access-control.groups.form.actions.delete": "গ্রুপ মুছুন",
-  
+
   // "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 }}\"",
   "admin.access-control.groups.form.delete-group.modal.info": "আপনি কি গ্রুপ \"{{ dsoName }}\" মুছে ফেলতে চান তা নিশ্চিত করুন।",
-  
+
   // "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",
   "admin.access-control.groups.form.delete-group.modal.confirm": "মুছে ফেলা",
-  
+
   // "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 }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.title": "গ্রুপ \"{{ name }}\" মুছে ফেলতে ব্যর্থ হয়েছে",
-  
+
   // "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",
   "admin.access-control.groups.form.members-list.head": "ই-পারসন",
-  
+
   // "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",
   "admin.access-control.groups.form.members-list.button.see-all": "সব ব্রাউজ করুন",
-  
+
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "বর্তমান সদস্যগণ",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
   "admin.access-control.groups.form.members-list.search.scope.metadata": "মেটাডেটা",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
   "admin.access-control.groups.form.members-list.search.scope.email": "ই-মেইল (সঠিক)",
-  
+
   // "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",
   "admin.access-control.groups.form.members-list.table.id": "আইডি",
-  
+
   // "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": "নেটআইডি",
-  
+
   // "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}}\"",
   "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}}\"",
   "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}}\"",
   "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}}\"",
   "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}}\"",
   "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}}\"",
   "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.",
   "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.",
   "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",
   "admin.access-control.groups.form.members-list.no-items": "ওই অনুসন্ধান কোন ই-পারসন পাওয়া যায় নি",
-  
+
   // "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",
   "admin.access-control.groups.form.subgroups-list.head": "গ্রুপ",
-  
+
   // "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",
   "admin.access-control.groups.form.subgroups-list.button.see-all": "সব ব্রাউজ করুন",
-  
+
   // "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",
   "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.id": "আইডি",
-  
+
   // "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",
   "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}}\"",
   "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}}\"",
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "নাম দিয়ে উপগোষ্ঠী যোগ করুন \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "বর্তমান গ্রুপ",
-  
+
   // "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}}\"",
   "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}}\"",
   "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}}\"",
   "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.",
   "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.",
   "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",
   "admin.access-control.groups.form.subgroups-list.no-items": "তাদের নাম বা এই 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": "গ্রুপে এখন কোন সাবগ্রুপ নেই",
-  
+
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "পেছনে",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "প্রশাসনিক অনুসন্ধান",
-  
+
   // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "সম্পাদনা করুন",
-  
+
   // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "সম্পাদনা করুন",
-  
+
   // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "মুছে ফেলা",
-  
+
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "সম্পাদনা করুন",
-  
+
   // "admin.search.item.make-private": "Make Private",
   "admin.search.item.make-private": "প্রাইভেট করুন",
-  
+
   // "admin.search.item.make-public": "Make Public",
   "admin.search.item.make-public": "জনসাধারণের জন্য উন্মুক্ত করুন",
-  
+
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "সরানো",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "পুনঃস্থাপন",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "প্রত্যাহার করুন",
-  
+
   // "admin.search.title": "Administrative Search",
   "admin.search.title": "প্রশাসনিক অনুসন্ধান",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "প্রশাসনিক অনুসন্ধান",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "প্রশাসনিক কর্মধারা",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "প্রশাসনিক কর্মধারা",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "কর্মধারা",
-  
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "মুছে ফেলা",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "ফেরত পাঠাও",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "মেটাডেটা আমদানি করুন",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "মেটাডেটা আমদানি করুন",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "মেটাডেটা আমদানি করুন",
-  
+
   // "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": "আপনি এখানে ফাইলগুলিতে ব্যাচ মেটাডেটা অপারেশন ধারণ করে এমন সিএসভি ফাইলগুলি ড্রপ বা ব্রাউজ করতে পারেন৷",
-  
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "আমদানি করতে একটি মেটাডেটা সিএসভি ড্রপ করুন",
-  
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "মেটাডেটা সিএসভি আমদানি করতে ড্রপ করুন",
-  
+
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "পেছনে",
-  
+
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "এগিয়ে যান",
-  
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "প্রথম ফাইল নির্বাচন করুন!",
-  
-  
-  
-  
+
+
+
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "অবৈধ ইমেইল ঠিকানা বা পাসওয়ার্ড.",
-  
+
   // "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: ",
   "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>\".",
   "bitstream.edit.form.description.hint": "বিকল্পভাবে ফাইলটির সংক্ষিপ্ত বিবরণ প্রদান করুন উদাহরণস্বরূপ \"<i> মূল নিবন্ধ </i>\" অথবা  \"<i> পরীক্ষা ডেটা রিডিং </i>\"।",
-  
+
   // "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.",
   "bitstream.edit.form.embargo.hint": "প্রথম দিন থেকে অ্যাক্সেস অনুমতি দেওয়া হয়। <b>এই তারিখটি এই ফর্মটি সংশোধন করা যাবে না। </b> বিটস্ট্রিমের জন্য একটি নিষেধাজ্ঞা নির্ধারণ করতে <i> আইটেমের স্থিতি </i> ট্যাবটিতে যান <i>অনুমোদন ...</i>, তৈরি করুন বা বিটস্ট্রিমের <i> পড়ুন </i> নীতিটি, এবং সম্পাদনা করুন <i> শুরু তারিখ </i> সেট করুন।",
-  
+
   // "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.",
   "bitstream.edit.form.fileName.hint": "বিটস্ট্রিমের জন্য ফাইলের নাম পরিবর্তন করুন। মনে রাখবেন যে এটি প্রদর্শন বিটস্ট্রিম URL টি পরিবর্তন করবে তবে পুরোনো লিঙ্কগুলি এখনও ক্রমটি সমাধান করবে না যতক্ষণ না ক্রম আইডিটি পরিবর্তন হয় না।",
-  
+
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "ফাইলের নাম",
-  
+
   // "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>\").",
   "bitstream.edit.form.newFormat.hint": "আপনি যে ফাইলটি ফাইল এবং সংস্করণ নম্বর তৈরি করতে ব্যবহৃত হয়েছিল তা হল (উদাহরণস্বরূপ, \"<i>ACMESoft SuperApp version 1.5</i>\")।",
-  
+
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
   "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\".",
   "bitstream.edit.form.selectedFormat.hint": "যদি ফর্ম্যাটটি উপরের তালিকাতে না থাকে তবে <b> তালিকাটি \"ফর্ম্যাটটি নির্বাচন করুন \"</b> এবং এটির অধীনে এটি বর্ণনা করুন \"নতুন বিন্যাস বর্ণনা করুন\"।",
-  
+
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "নির্বাচিত বিন্যাস",
-  
+
   // "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",
   "bitstream.edit.notifications.error.format.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": "এই ছবির জন্য ক্যানভাস লেবেল। যদি প্রদান না হয় ডিফল্ট লেবেল ব্যবহার করা হবে।",
-  
+
   // "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 ক্যানভাস প্রস্থ",
-  
+
   // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
   "bitstream.edit.form.iiifWidth.hint": "ক্যানভাস প্রস্থ সাধারণত ইমেজ প্রস্থের সাথে মেলা উচিত।",
-  
+
   // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
   "bitstream.edit.form.iiifHeight.label": "IIIF ক্যানভাস উচ্চতা",
-  
+
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
   "bitstream.edit.form.iiifHeight.hint": "ক্যানভাস উচ্চতা সাধারণত ইমেজের উচ্চতার সাথে মেলে উচিত।",
-  
-  
+
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "এই বিটস্ট্রিমে আপনার পরিবর্তন সংরক্ষিত করা হয়েছে।",
-  
+
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "বিটস্ট্রিম সংরক্ষিত",
-  
+
   // "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 e-mail 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.comcol.by.author": "By Author",
   "browse.comcol.by.author": "লেখক দ্বারা",
-  
+
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "ইস্যু তারিখ দ্বারা",
-  
+
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "বিষয় দ্বারা",
-  
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "শিরোনাম দ্বারা",
-  
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "ব্রাউজ করুন",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "দেখানোর মত কোন আইটেম নেই।",
-  
+
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "লেখক",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "প্রদানের তারিখ",
-  
+
   // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "বিষয়",
-  
+
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "শিরোনাম",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "লেখক দ্বারা ব্রাউজ করুন",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   "browse.metadata.dateissued.breadcrumbs": "তারিখ দ্বারা ব্রাউজ করুন",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "বিষয় দ্বারা ব্রাউজ করুন",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "শিরোনাম দ্বারা ব্রাউজ করুন",
-  
+
   // "browse.next.button": "Next",
   "browse.next.button": "পরবর্তী",
-  
+
   // "browse.previous.button": "Previous",
   "browse.previous.button": "পূর্ববর্তী",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(শুরু নির্বাচন করুন)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(বছর নির্বাচন করুন)",
-  
+
   // "browse.startsWith.choose_year.label": "Choose the issue year",
   "browse.startsWith.choose_year.label": "ইস্যুর বছর নির্বাচন করুন",
-  
+
   // "browse.startsWith.jump": "Jump to a point in the index:",
   "browse.startsWith.jump": "সূচকের একটি পয়েন্টে যান:",
-  
+
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "এপ্রিল",
-  
+
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "আগস্ট",
-  
+
   // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "ডিসেম্বর",
-  
+
   // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "ফেব্রুয়ারি.",
-  
+
   // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "জানুয়ারি",
-  
+
   // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "জুলাই",
-  
+
   // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "জুন",
-  
+
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "মার্চ",
-  
+
   // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "মে",
-  
+
   // "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",
   "browse.startsWith.months.november": "নভেম্বর",
-  
+
   // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "অক্টোবর",
-  
+
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "সেপ্টেম্বর",
-  
+
   // "browse.startsWith.submit": "Browse",
   "browse.startsWith.submit": "ব্রাউজ",
-  
+
   // "browse.startsWith.type_date": "Or type in a date (year-month) and click 'Browse'",
   "browse.startsWith.type_date": "অথবা একটি তারিখ (বছরের-মাস) টাইপ করুন এবং 'ব্রাউজ' ক্লিক করুন",
-  
+
   // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
   "browse.startsWith.type_date.label": "অথবা একটি তারিখ (বছরের-মাস) টাইপ করুন এবং ব্রাউজ বোতামে ক্লিক করুন",
-  
+
   // "browse.startsWith.type_text": "Type the first few letters and click on the Browse button",
   "browse.startsWith.type_text": "প্রথম কয়েকটি অক্ষর টাইপ করুন এবং ব্রাউজ বোতামে ক্লিক করুন",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title": "ব্রাউজিং {{collection}} এর {{field}} {{value}}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   "chips.remove": "চিপ সরান",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "একটি সংগ্রহ তৈরি করুন",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   "collection.create.notifications.success": "সফলভাবে সংগ্রহ তৈরি",
-  
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "সম্প্রদায়ের জন্য একটি সংগ্রহ তৈরি করুন {{praent}}",
-  
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "কিউরেট সংগ্রহ: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "বাতিল করুন",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "নিশ্চিত করুন",
-  
+
   // "collection.delete.processing": "Deleting",
   "collection.delete.processing": "মুছে ফেলা হচ্ছে",
-  
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "সংগ্রহ মুছে ফেলুন",
-  
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "সংগ্রহ মুছে ফেলা যাবে না",
-  
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "সফলভাবে মুছে ফেলা সংগ্রহ",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "আপনি কি আপনি সংগ্রহের মুছতে চান \"{{dos}}\"",
-  
-  
-  
+
+
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "এই সংগ্রহ মুছে দিন",
-  
+
   // "collection.edit.head": "Edit Collection",
   "collection.edit.head": "সংগ্রহ সম্পাদনা",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "সংগ্রহ সম্পাদনা",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "আইটেম ম্যাপার",
-  
+
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
   "collection.edit.tabs.item-mapper.title": "সংগ্রহ সম্পাদনা - আইটেম ম্যাপার",
-  
+
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "বাতিল করুন",
-  
+
   // "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",
   "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.",
   "collection.edit.item-mapper.description": "এটি আইটেম ম্যাপার টুল যা সংগ্রহের অ্যাডমিনিস্ট্রেটররা এই সংগ্রহে অন্যান্য সংগ্রহ থেকে আইটেমগুলি মানচিত্রের অনুমতি দেয়। আপনি অন্যান্য সংগ্রহ থেকে আইটেমগুলি অনুসন্ধান করতে এবং তাদের মানচিত্র বা বর্তমানে ম্যাপযুক্ত আইটেমগুলির তালিকা ব্রাউজ করতে পারেন।",
-  
+
   // "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",
   "collection.edit.item-mapper.no-search": "দয়া করে অনুসন্ধানের জন্য একটি কুয়েরি লিখুন ",
-  
+
   // "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",
   "collection.edit.item-mapper.notifications.map.error.head": "সমন্নয় ত্রুটি",
-  
+
   // "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",
   "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.",
   "collection.edit.item-mapper.notifications.unmap.error.content": "ত্রুটি {{amount}} আইটেমগুলির mappings অপসারণের জন্য ঘটেছে।",
-  
+
   // "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.",
   "collection.edit.item-mapper.notifications.unmap.success.content": "সফলভাবে {{amount}} আইটেমগুলির সমন্বয় সরানো হয়েছে।",
-  
+
   // "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",
   "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",
   "collection.edit.item-mapper.tabs.browse": "সমন্বিত আইটেম ব্রাউজ করুন",
-  
+
   // "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",
   "collection.edit.logo.label": "সংগ্রহ লোগো",
-  
+
   // "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.",
   "collection.edit.logo.notifications.add.success": "সংগ্রহের লোগো আপলোড সফল হয়েছে",
-  
+
   // "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",
   "collection.edit.logo.notifications.delete.success.content": "সফলভাবে সংগ্রহের লোগো মুছে ফেলা হয়েছে",
-  
+
   // "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",
   "collection.edit.logo.upload": "আপলোড করার জন্য একটি সংগ্রহ লোগো ড্রপ করুন",
-  
-  
-  
+
+
+
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "সফলভাবে সংগ্রহ সম্পাদনা",
-  
+
   // "collection.edit.return": "Back",
   "collection.edit.return": "পেছনে",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "কিউরেট",
-  
+
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
   "collection.edit.tabs.curate.title": "সংগ্রহ সম্পাদনা - কিউরেট",
-  
+
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "অনুমোদনগুলো",
-  
+
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   "collection.edit.tabs.authorizations.title": "সংগ্রহ সম্পাদনা - অনুমোদনগুলো",
-  
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "মেটাডেটা সম্পাদনা করুন",
-  
+
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
   "collection.edit.tabs.metadata.title": "সংগ্রহ সম্পাদনা - মেটাডাটা",
-  
+
   // "collection.edit.tabs.roles.head": "Assign Roles",
   "collection.edit.tabs.roles.head": "ভূমিকা (রোল) বরাদ্দ করুন",
-  
+
   // "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",
   "collection.edit.tabs.source.external": "এই সংগ্রহটি একটি বহিরাগত উৎস থেকে তার কন্টেন্ট সংগ্রহ করে",
-  
+
   // "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",
   "collection.edit.tabs.source.form.harvestType": "বিষয়বস্তু সংগ্রহীত হয়েছে",
-  
+
   // "collection.edit.tabs.source.form.head": "Configure an external source",
   "collection.edit.tabs.source.form.head": "একটি বহিরাগত উৎস কনফিগার করুন",
-  
+
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
   "collection.edit.tabs.source.form.metadataConfigId": "মেটাডেটা বিন্যাস",
-  
+
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "OAI নির্দিষ্ট সেট আইডি",
-  
+
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
   "collection.edit.tabs.source.form.oaiSource": "OAI প্রদানকারী",
-  
+
   // "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)",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "মেটাডাটা সংগ্রহ এবং বিটস্ট্রিমের রেফারেন্স (ORE সমর্থন প্রয়োজন)",
-  
+
   // "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",
   "collection.edit.tabs.source.head": "বিষয়বস্তু উৎস",
-  
+
   // "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",
   "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.",
   "collection.edit.tabs.source.notifications.invalid.content": "আপনার পরিবর্তন সংরক্ষিত ছিল না। আপনি সংরক্ষণ করার আগে সমস্ত ক্ষেত্রের বৈধতা নিশ্চিত করুন দয়া করে।",
-  
+
   // "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.",
   "collection.edit.tabs.source.notifications.saved.content": "সংগ্রহগুলোর কন্টেন্টের উৎসে আপনার পরিবর্তনগুলো সংরক্ষিত ছিল।",
-  
+
   // "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",
   "collection.edit.tabs.source.title": "সংগ্রহ সম্পাদনা - কন্টেন্ট উৎস",
-  
-  
-  
+
+
+
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "যোগ করুন",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "আইটেম টেমপ্লেট",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "বাতিল করুন",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "মুছে ফেলা",
-  
+
   // "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 }}\"",
   "collection.edit.template.head": "সংগ্রহের জন্য টেমপ্লেট আইটেমটি সম্পাদনা করুন \"{{ collection }}\"",
-  
+
   // "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",
   "collection.edit.template.notifications.delete.error": "আইটেম টেমপ্লেট মুছে ফেলতে ব্যর্থ হয়েছে",
-  
+
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
   "collection.edit.template.notifications.delete.success": "সফলভাবে আইটেম টেমপ্লেট মুছে ফেলা হয়েছে",
-  
+
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "টেমপ্লেট আইটেম সম্পাদনা করুন",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "ছোট বিবরণ",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "প্রারম্ভিক টেক্সট (এইচটিএমএল)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "দয়া করে একটি সংগ্রহ নাম লিখুন",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "লাইসেন্স",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "উদ্ভব",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "কপিরাইট টেক্সট (এইচটিএমএল)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "সংবাদ (এইচটিএমএল)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "নাম",
-  
+
   // "collection.form.entityType": "Entity Type",
   "collection.form.entityType": "এনটিটির (সত্তা) ধরন",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "সংগ্রহ",
-  
-  
-  
+
+
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "সাম্প্রতিক জমা",
-  
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "দেখানোর মত কোন আইটেম নেই",
-  
+
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "এই সংগ্রহটি সম্পাদনা করুন",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   "collection.page.handle": "এই সংগ্রহের জন্য স্থায়ী URI",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "লাইসেন্স",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "সংবাদ",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "সিলেকশন নিশ্চিত করুন",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "দেখানোর মত কোন সংগ্রহ নেই",
-  
+
   // "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",
@@ -1457,4674 +1862,4689 @@
   "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.",
   "collection.source.update.notifications.error.content": "প্রদত্ত সেটিংস পরীক্ষা করা হয়েছে এবং কাজ করে না।",
-  
+
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "সার্ভার সমস্যা",
-  
-  
-  
+
+
+
   // "communityList.breadcrumbs": "Community List",
   "communityList.breadcrumbs": "কমিউনিটির তালিকা",
-  
+
   // "communityList.tabTitle": "Community List",
   "communityList.tabTitle": "কমিউনিটির তালিকা",
-  
+
   // "communityList.title": "List of Communities",
   "communityList.title": "সম্প্রদায়ের তালিকা",
-  
+
   // "communityList.showMore": "Show More",
   "communityList.showMore": "আরো দেখুন",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   "community.create.head": "একটি সম্প্রদায় তৈরি করুন",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   "community.create.notifications.success": "সফলভাবে সম্প্রদায় তৈরি হয়েছে",
-  
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "সম্প্রদায়ের জন্য একটি উপ-সম্প্রদায় তৈরি করুন {{praent}}",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "কিউরেট সম্প্রদায়: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "বাতিল করুন",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "নিশ্চিত করুন",
-  
+
   // "community.delete.processing": "Deleting...",
   "community.delete.processing": "মুছে ফেলা হচ্ছে ...",
-  
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "কমিউনিটি মুছুন",
-  
+
   // "community.delete.notification.fail": "Community could not be deleted",
   "community.delete.notification.fail": "সম্প্রদায় মুছে ফেলা যাবে না",
-  
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "সফলভাবে মুছে ফেলা সম্প্রদায়",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "আপনি কি নিশ্চিত যে আপনি কমিউনিটি মুছে ফেলতে চান \"{{dso}}}\"",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "এই সম্প্রদায় মুছে ফেলুন",
-  
+
   // "community.edit.head": "Edit Community",
   "community.edit.head": "সম্প্রদায় সম্পাদনা করুন",
-  
+
   // "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",
   "community.edit.logo.label": "কমিউনিটি লোগো",
-  
+
   // "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.",
   "community.edit.logo.notifications.add.success": "কমিউনিটি লোগো সফল আপলোড করুন।",
-  
+
   // "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",
   "community.edit.logo.notifications.delete.success.content": "সফলভাবে সম্প্রদায়ের লোগো মুছে ফেলা হয়েছে",
-  
+
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "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",
   "community.edit.notifications.success": "সফলভাবে সম্প্রদায় সম্পাদনা",
-  
+
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "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",
   "community.edit.tabs.curate.head": "কিউরেট",
-  
+
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "কমিউনিটি সম্পাদনা - কিউরেট",
-  
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "মেটাডেটা সম্পাদনা করুন",
-  
+
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
   "community.edit.tabs.metadata.title": "কমিউনিটি সম্পাদনা - মেটাডাটা",
-  
+
   // "community.edit.tabs.roles.head": "Assign Roles",
   "community.edit.tabs.roles.head": "ভূমিকা (রোল) বরাদ্দ করুন",
-  
+
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
   "community.edit.tabs.roles.title": "কমিউনিটি সম্পাদনা - ভূমিকা (রোল)",
-  
+
   // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "অনুমোদনসমূহ",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "কমিউনিটি সম্পাদনা - অনুমোদনসমূহ",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "সম্প্রদায়",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "কেউ না",
-  
+
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "সৃষ্টি",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "সীমাবদ্ধতা",
-  
+
   // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "মুছে ফেলা",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "প্রশাসক",
-  
+
   // "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).",
   "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).",
   "comcol-role.edit.collection-admin.description": "সংগ্রহ অ্যাডমিনিস্ট্রেটররা সিদ্ধান্ত নেয় কে আইটেমটি মেটাডেটা (জমা দেওয়ার পরে) সম্পাদনা করতে এবং এই সংগ্রহে অন্যান্য সংগ্রহ থেকে বিদ্যমান আইটেমগুলি যোগ করুন (মানচিত্র) বিদ্যমান আইটেমগুলি হতে অন্নে সংগ্রহওগুলো (অনুমোদন সাপেক্ষে)।",
-  
-  
+
+
   // "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.",
   "comcol-role.edit.submitters.description": "এই সংগ্রহে নতুন আইটেম জমা দেওয়ার অনুমতি আছে এমন ই-ব্যাক্তি এবং গোষ্ঠী।",
-  
-  
+
+
   // "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.",
   "comcol-role.edit.item_read.description": "ই-ব্যাক্তি এবং গোষ্ঠী যা এই সংগ্রহে জমা দেওয়া নতুন আইটেমগুলি পড়তে পারে। এই ভূমিকা পরিবর্তন retroactive হয় না। সিস্টেমের বিদ্যমান আইটেমগুলি এখনও তাদের সংযোজনের সময় অ্যাক্সেস পড়তে যারা দ্বারা দর্শনীয় হবে।",
-  
+
   // "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",
   "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).",
   "comcol-role.edit.bitstream_read.description": "কমিউনিটি অ্যাডমিনিস্ট্রেটররা উপ-সম্প্রদায়গুলি বা সংগ্রহগুলি তৈরি করতে পারে এবং সেই উপ-সম্প্রদায়গুলির বা সংগ্রহগুলির জন্য পরিচালনা বা পরিচালনা করতে পারে। উপরন্তু তারা যে কোনও উপ-সংগ্রহগুলিতে আইটেম জমা দিতে পারে তা মেটাডেটা (জমা দেওয়ার পরে) এবং অন্যান্য সংগ্রহগুলির (মানচিত্র) বিদ্যমান আইটেমগুলি (অনুমোদন সাপেক্ষে) যোগ করতে পারে তা নির্ধারণ করে।",
-  
+
   // "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",
   "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.",
   "comcol-role.edit.editor.description": "সম্পাদকগণ ইনকামিং জমা মেটাডেটা সম্পাদনা করতে সক্ষম এবং তারপর তাদের গ্রহণ বা প্রত্যাখ্যান করতে পারবেন।",
-  
-  
+
+
   // "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.",
   "comcol-role.edit.finaleditor.description": "চূড়ান্ত সম্পাদকরা ইনকামিং জমা মেটাডেটা সম্পাদনা করতে সক্ষম কিন্তু তাদের প্রত্যাখ্যান করতে সক্ষম হবে না।",
-  
-  
+
+
   // "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.",
   "comcol-role.edit.reviewer.description": "সমালোচকরা ইনকামিং জমা গ্রহণ বা প্রত্যাখ্যান করতে পারবেন। তবে তারা জমা দেওয়া মেটাডেটা সম্পাদনা করতে পারবেন না।",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "ছোট বিবরণ",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "প্রারম্ভিক টেক্সট (এইচটিএমএল)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "একটি সম্প্রদায়ের নাম লিখুন দয়া করে",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "কপিরাইট টেক্সট (এইচটিএমএল)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "সংবাদ (এইচটিএমএল)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "নাম",
-  
+
   // "community.page.edit": "Edit this community",
   "community.page.edit": "এই সম্প্রদায়টি সম্পাদনা করুন",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   "community.page.handle": "এই সম্প্রদায়ের জন্য স্থায়ী URI",
-  
+
   // "community.page.license": "License",
   "community.page.license": "লাইসেন্স",
-  
+
   // "community.page.news": "News",
   "community.page.news": "সংবাদ",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "উপ-সম্প্রদায় এবং সংগ্রহ",
-  
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "এই সম্প্রদায়ের সংগ্রহ",
-  
+
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "এই সম্প্রদায়ের সম্প্রদায়",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "সব গ্রহণ করুন",
-  
+
   // "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)",
   "cookies.consent.app.opt-out.description": "এই অ্যাপ্লিকেশনটি ডিফল্টরূপে লোড করা হয় (তবে আপনি অপ্ট আউট করতে পারেন)",
-  
+
   // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(অপ্ট আউট)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   "cookies.consent.app.purpose": "উদ্দেশ্য",
-  
+
   // "cookies.consent.app.required.description": "This application is always required",
   "cookies.consent.app.required.description": "এই অ্যাপ্লিকেশন সবসময় প্রয়োজন হয়",
-  
+
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(সর্বদা প্রয়োজন)",
-  
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "আপনার শেষ পরিদর্শন থেকে পরিবর্তন হয়েছে দয়া করে আপনার সম্মতি আপডেট করুন।",
-  
+
   // "cookies.consent.close": "Close",
   "cookies.consent.close": "বন্ধ",
-  
+
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "পতন",
-  
+
   // "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.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.",
   "cookies.consent.content-modal.description": "এখানে আপনি আপনার সম্পর্কে সংগৃহীত তথ্যটি দেখতে এবং কাস্টমাইজ করতে পারেন।",
-  
+
   // "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}.",
   "cookies.consent.content-modal.privacy-policy.text": "আরো জানতে, আমাদের {privacyPolicy} পড়ুন.",
-  
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "আমরা যে তথ্য সংগ্রহ করি",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "প্রমাণীকরণ",
-  
+
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "আপনার সাইন ইন করার জন্য প্রয়োজন",
-  
-  
+
+
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "পছন্দসমূহ",
-  
+
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "আপনার পছন্দ সংরক্ষণের জন্য প্রয়োজন",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "স্বীকৃতি",
-  
+
   // "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",
   "cookies.consent.app.title.google-analytics": "গুগল বিশ্লেষক",
-  
+
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "আমাদের পরিসংখ্যানগত ডেটা ট্র্যাক করার অনুমতি দিন",
-  
-  
-  
+
+
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "কার্যকরী",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "পরিসংখ্যানগত",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   "curation-task.task.checklinks.label": "মেটাডেটা লিঙ্ক চেক করুন",
-  
+
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "না",
-  
+
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "প্রোফাইলের বিটস্ট্রিম ফরম্যাট",
-  
+
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "প্রয়োজনীয় মেটাডেটা জন্য চেক করুন",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "মাইক্রোসফ্ট অনুবাদক",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "ভাইরাস স্ক্যান",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "টাস্ক:",
-  
+
   // "curation.form.submit": "Start",
   "curation.form.submit": "শুরু করুন",
-  
+
   // "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.",
   "curation.form.submit.success.content": "আপনি সংশ্লিষ্ট প্রক্রিয়া পৃষ্ঠায় পুনঃনির্দেশিত করা হবে।",
-  
+
   // "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.",
   "curation.form.submit.error.content": "কিউরেসনের কাজ শুরু করার চেষ্টা করার সময় একটি ত্রুটি ঘটেছে।",
-  
+
   // "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)",
   "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-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "নতুন সংগ্রহ",
-  
+
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "একটি নতুন সংগ্রহ তৈরি করুন",
-  
+
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "নতুন সম্প্রদায়",
-  
+
   // "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",
   "dso-selector.create.community.top-level": "একটি নতুন শীর্ষ স্তরের সম্প্রদায় তৈরি করুন",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "নতুন আইটেম",
-  
+
   // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "একটি নতুন আইটেম তৈরি করুন",
-  
+
   // "dso-selector.create.submission.head": "New submission",
   "dso-selector.create.submission.head": "নতুন জমা",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "সংগ্রহ সম্পাদনা",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "সম্প্রদায় সম্পাদনা করুন",
-  
+
   // "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",
   "dso-selector.export-metadata.dspaceobject.head": "রপ্তানি মেটাডেটা থেকে",
-  
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "কোন {{type}} পাওয়া যায় নি",
-  
+
   // "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.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "একটি সম্প্রদায় বা সংগ্রহের জন্য অনুসন্ধান করুন",
-  
-  
-  
+
+
+
   // "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 }}",
   "confirmation-modal.export-metadata.info": "আপনি কি নিশ্চিত যে আপনি {{ dsoName }} এর জন্য মেটাডাটা রপ্তানি করতে চান",
-  
+
   // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "বাতিল করুন",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "এক্সপোর্ট",
-  
+
   // "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 }}\"",
   "confirmation-modal.delete-eperson.info": "আপনি কি নিশ্চিত যে আপনি ই-পারসন \"{{ dsoName }}\" মুছে ফেলতে চান",
-  
+
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "বাতিল করুন",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "মুছে ফেলা",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "বিটস্ট্রিম নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "আইটেম নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "সংগ্রহগুলো নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.collections": "Error fetching collections",
   "error.collections": "সংগ্রহ নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "সম্প্রদায় নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.identifier": "No item found for the identifier",
   "error.identifier": "কোন আইটেম সনাক্তকারী জন্য পাওয়া যায় নি",
-  
+
   // "error.default": "Error",
   "error.default": "ত্রুটি",
-  
+
   // "error.item": "Error fetching item",
   "error.item": "আইটেম নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.items": "Error fetching items",
   "error.items": "আইটেমগুলো নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "অবজেক্ট নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "সাম্প্রতিক জমাগুলো আনতে ত্রুটি হচ্ছে",
-  
+
   // "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\">সোলার কোয়েরি সিনট্যাক্স</a> সর্বোত্তম অনুশীলন দেখুন এই ত্রুটি সম্পর্কে তথ্য।",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "উপ-সংগ্রহগুলো নিয়ে আসতে ত্রুটি হচ্ছে",
-  
+
   // "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>",
   "error.submission.sections.init-form-error": "বিভাগ শুরু করার সময় একটি ত্রুটি ঘটেছে, অনুগ্রহ করে আপনার ইনপুট-ফর্ম কনফিগারেশন পরীক্ষা করুন। বিস্তারিত নিচে দেওয়া হল: <br> <br>",
-  
+
   // "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.",
   "error.validation.license.notgranted": "আপনি আপনার জমা সম্পূর্ণ করার জন্য এই লাইসেন্স প্রদান করতে হবে। আপনি যদি এই লাইসেন্সটি অনুগ্রহ করতে অক্ষম হন তবে আপনি আপনার কাজটি সংরক্ষণ করতে এবং পরে ফিরে বা জমাটি সরাতে পারেন।",
-  
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "এই ইনপুট বর্তমান প্যাটার্ন দ্বারা সীমাবদ্ধ: {{ pattern }}.",
-  
+
   // "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 E-mail is not a valid email",
   "error.validation.NotValidEmail": "এই ইমেইল একটি বৈধ ইমেইল নয়",
-  
+
   // "error.validation.emailTaken": "This E-mail is already taken",
   "error.validation.emailTaken": "এই ইমেইলটি ইতিমধ্যে নেওয়া হয়েছে",
-  
+
   // "error.validation.groupExists": "This group already exists",
   "error.validation.groupExists": "এই গ্রুপ ইতিমধ্যে বিদ্যমান",
-  
-  
+
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "এই আইটেমটি জন্য ফাইল প্রাপ্ত করার সময় ত্রুটি",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "কপিরাইট © 2002 - {{year}}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "ডিস্পেস সফটওয়্যার",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "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": "মতামত পাঠানো",
-  
-  
-  
+
+
+
   // "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.",
   "forgot-email.form.info": "ইমেল আপডেটের জন্য সংগ্রহে সাবস্ক্রাইব করার জন্য একটি অ্যাকাউন্ট নিবন্ধন করুন এবং ডিস্পেস এ নতুন আইটেম জমা দিন।",
-  
+
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "ইমেইল ঠিকানা *",
-  
+
   // "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",
   "forgot-email.form.email.error.pattern": "একটি বৈধ ইমেইল ঠিকানা পূরণ করুন",
-  
+
   // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
   "forgot-email.form.email.hint": "এই ঠিকানাটি যাচাই করা হবে এবং আপনার লগইন নাম হিসাবে ব্যবহার করা হবে।",
-  
+
   // "forgot-email.form.submit": "Save",
   "forgot-email.form.submit": "সংরক্ষণ",
-  
+
   // "forgot-email.form.success.head": "Verification 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.",
   "forgot-email.form.success.content": "একটি বিশেষ ইউআরএল এবং আরও নির্দেশাবলী ধারণকারী {{email}} এ একটি ইমেল পাঠানো হয়েছে।",
-  
+
   // "forgot-email.form.error.head": "Error when trying to register email",
   "forgot-email.form.error.head": "ইমেল নিবন্ধন করার চেষ্টা করার সময় ত্রুটি",
-  
+
   // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
   "forgot-email.form.error.content": "নিম্নলিখিত ইমেল ঠিকানা নিবন্ধন করার সময় একটি ত্রুটি ঘটেছে:{{ email }}",
-  
-  
-  
+
+
+
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "পাসওয়ার্ড ভুলে গেছেন",
-  
+
   // "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.",
   "forgot-password.form.info": "নীচের বাক্সে একটি নতুন পাসওয়ার্ড লিখুন এবং এটি আবার দ্বিতীয় বাক্সে টাইপ করে এটি নিশ্চিত করুন। এটি অন্তত ছয় অক্ষর দীর্ঘ হতে হবে।",
-  
+
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "নিরাপত্তা",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "চিহ্নিত করুন",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "ইমেইলের ঠিকানা: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "পাসওয়ার্ড",
-  
+
   // "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.",
   "forgot-password.form.error.empty-password": "নীচের বাক্সে একটি পাসওয়ার্ড লিখুন দয়া করে।",
-  
+
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "পাসওয়ার্ড মেলে না.",
-  
+
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
   "forgot-password.form.error.password-length": "পাসওয়ার্ড অন্তত ৬ অক্ষর দীর্ঘ হওয়া উচিত।",
-  
+
   // "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.",
   "forgot-password.form.notification.success.content": "পাসওয়ার্ড রিসেট সফল ছিল। আপনি তৈরি ব্যবহারকারী হিসাবে লগ ইন করা হয়েছে।",
-  
+
   // "forgot-password.form.notification.success.title": "Password reset completed",
   "forgot-password.form.notification.success.title": "পাসওয়ার্ড রিসেট সম্পন্ন",
-  
+
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "পাসওয়ার্ড জমা দিন",
-  
-  
-  
+
+
+
   // "form.add": "Add more",
   "form.add": "আরো যোগ করো",
-  
+
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "বর্তমান এন্ট্রি যোগ করতে এবং অন্য একটি যোগ করার জন্য এখানে ক্লিক করুন",
-  
+
   // "form.cancel": "Cancel",
   "form.cancel": "বাতিল করুন",
-  
+
   // "form.clear": "Clear",
   "form.clear": "স্পষ্ট",
-  
+
   // "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",
   "form.edit": "সম্পাদনা করুন",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "নির্বাচিত মান সম্পাদনা করতে এখানে ক্লিক করুন",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "নামের প্রথম অংশ",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "ধৈর্য",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "ধসে পড়তে এখানে ক্লিক করুন",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "বিস্তৃত করা",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "প্রসারিত এবং আরো উপাদান যোগ করতে এখানে ক্লিক করুন",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "নামের শেষাংশ",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "লোড হচ্ছে ...",
-  
+
   // "form.lookup": "Lookup",
   "form.lookup": "খুঁজে দেখো",
-  
+
   // "form.lookup-help": "Click here to look up an existing relation",
   "form.lookup-help": "একটি বিদ্যমান সম্পর্ক তাকান এখানে ক্লিক করুন",
-  
+
   // "form.no-results": "No results found",
   "form.no-results": "কোন ফলাফল পাওয়া যায়নি",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "কোন মান প্রবেশ",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "অপসারণ",
-  
+
   // "form.save": "Save",
   "form.save": "সংরক্ষণ",
-  
+
   // "form.save-help": "Save changes",
   "form.save-help": "পরিবর্তনগুলোর সংরক্ষন",
-  
+
   // "form.search": "Search",
   "form.search": "অনুসন্ধান করুন",
-  
+
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "একটি বিদ্যমান চিঠিপত্রের জন্য এখানে ক্লিক করুন",
-  
+
   // "form.submit": "Save",
   "form.submit": "সংরক্ষণ",
-  
+
   // "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": "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.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": "প্রিয় {{ recipientName }},\nআপনার অনুরোধের জবাবে আমি আপনাকে নথি সংক্রান্ত ফাইল(গুলি) এর একটি অনুলিপি সংযুক্তিতে পাঠাতে পেরে আনন্দিত: \"{{ itemUrl }}\" ({{ itemName }}) , যার মধ্যে আমি একজন লেখক।\n\nশুভেচ্ছা,\n{{ authorName }} <{{ authorEmail }}>",
-  
+
   // "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": "This 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": "সফলভাবে আইটেম অনুরোধ দেওয়া",
-  
-  
-  
+
+
+
   // "home.description": "",
   "home.description": "অপসারণ করা আবশ্যক",
-  
+
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "হোম",
-  
+
   // "home.search-form.placeholder": "Search the repository ...",
   "home.search-form.placeholder": "সংগ্রহস্থল অনুসন্ধান করুন ...",
-  
+
   // "home.title": "Home",
   "home.title": "হোম",
-  
+
   // "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.",
   "home.top-level-communities.help": "তার সংগ্রহ ব্রাউজ করতে একটি সম্প্রদায় নির্বাচন করুন।",
-  
-  
-  
+
+
+
   // "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",
   "info.end-user-agreement.accept.error": "একটি ত্রুটি শেষ ব্যবহারকারী চুক্তি গ্রহণ ঘটেছে",
-  
+
   // "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",
   "info.end-user-agreement.breadcrumbs": "শেষ ব্যবহারকারী চুক্তি",
-  
+
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "বাতিল করুন",
-  
+
   // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "সংরক্ষণ",
-  
+
   // "info.end-user-agreement.head": "End User Agreement",
   "info.end-user-agreement.head": "শেষ ব্যবহারকারী চুক্তি",
-  
+
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "শেষ ব্যবহারকারী চুক্তি",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "গোপনীয়তা বিবৃতি",
-  
+
   // "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.create.success": "প্রতিক্রিয়া সফলভাবে পাঠানো হয়েছে!",
+
   // "info.feedback.error.email.required" : "A valid email address is required",
-  "info.feedback.error.email.required" : "একটি বৈধ ইমেইল ঠিকানা প্রয়োজন বোধ করা হয়",
-  
+  "info.feedback.error.email.required": "একটি বৈধ ইমেইল ঠিকানা প্রয়োজন বোধ করা হয়",
+
   // "info.feedback.error.message.required" : "A comment is required",
-  "info.feedback.error.message.required" : "একটি মন্তব্য প্রয়োজন",
-  
+  "info.feedback.error.message.required": "একটি মন্তব্য প্রয়োজন",
+
   // "info.feedback.page-label" : "Page",
-  "info.feedback.page-label" : "পৃষ্ঠা",
-  
+  "info.feedback.page-label": "পৃষ্ঠা",
+
   // "info.feedback.page_help" : "Tha page related to your feedback",
-  "info.feedback.page_help" : "আপনার মতামত সম্পর্কিত পৃষ্ঠা",
-  
-  
-  
+  "info.feedback.page_help": "আপনার মতামত সম্পর্কিত পৃষ্ঠা",
+
+
+
   // "item.alerts.private": "This item is private",
   "item.alerts.private": "এই আইটেমটি ব্যক্তিগত",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "এই আইটেমটি প্রত্যাহার করা হয়েছে",
-  
-  
-  
+
+
+
   // "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",
   "item.edit.authorizations.title": "আইটেম এর নীতি সম্পাদনা করুন",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   "item.badge.private": "ব্যক্তিগত",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "প্রত্যাহার",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "পাঁজা",
-  
+
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
   "item.bitstreams.upload.bundle.placeholder": "একটি বান্ডিল নির্বাচন করুন",
-  
+
   // "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.",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "এই আইটেমটি একটি বিটস্ট্রিম আপলোড করার জন্য কোন bundles থাকে না।",
-  
+
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "বাতিল করুন",
-  
+
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "আপলোড করার জন্য একটি ফাইল ড্রপ",
-  
+
   // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "আইটেম: ",
-  
+
   // "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",
   "item.bitstreams.upload.notifications.bundle.created.title": "তৈরি বান্ডিল",
-  
+
   // "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",
   "item.bitstreams.upload.title": "বিটস্ট্রিম আপলোড করুন",
-  
-  
-  
+
+
+
   // "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 }}.",
   "item.edit.bitstreams.bundle.displaying": "বর্তমানে {{ amount }} এবং {{ total }} এর বিটস্ট্রিমগুলি প্রদর্শন করে।",
-  
+
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "সব লোড করুন ({{ total }})",
-  
+
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "আর ঢুকাও",
-  
+
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-  
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "বাতিল করা",
-  
+
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "ডাউনলোড করুন",
-  
+
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
   "item.edit.bitstreams.edit.buttons.drag": "Drag",
-  
+
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "সম্পাদনা করুন",
-  
+
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "অপসারণ",
-  
+
   // "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.",
   "item.edit.bitstreams.empty": "এই আইটেমটি কোন বিটস্ট্রিম ধারণ করে না। একটি তৈরি করতে আপলোড বাটনে ক্লিক করুন।",
-  
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "বর্ণনা",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   "item.edit.bitstreams.headers.format": "বিন্যাস",
-  
+
   // "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",
   "item.edit.bitstreams.notifications.discarded.content": "আপনার পরিবর্তন বাতিল করা হয়েছে। আপনার পরিবর্তনগুলি পুনঃস্থাপন করতে 'পূর্বাবস্থায় ফিরুন' বাটনে ক্লিক করুন",
-  
+
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "পরিবর্তন বাতিল করা হয়েছে",
-  
+
   // "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.",
   "item.edit.bitstreams.notifications.move.saved.content": "আপনার পদক্ষেপ এই আইটেমটি এর বিটস্ট্রিম এবং bundles পরিবর্তন করা হয়েছে।",
-  
+
   // "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",
   "item.edit.bitstreams.notifications.outdated.content": "আপনি বর্তমানে কাজ করছেন এমন আইটেমটি অন্য ব্যবহারকারী দ্বারা পরিবর্তিত হয়েছে। আপনার বর্তমান পরিবর্তন দ্বন্দ্ব প্রতিরোধ করতে বাতিল করা হয়",
-  
+
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "পরিবর্তনগুলি পুরানো",
-  
+
   // "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.",
   "item.edit.bitstreams.notifications.remove.saved.content": "এই আইটেমটির বিটস্ট্রিমগুলিতে আপনার অপসারণ পরিবর্তনগুলি সংরক্ষণ করা হয়েছে।",
-  
+
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "অপসারণ পরিবর্তন সংরক্ষিত",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   "item.edit.bitstreams.reinstate-button": "পূর্বাবস্থায় ফেরানো",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "সংরক্ষণ",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "আপলোড করুন",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "বাতিল করুন",
-  
+
   // "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.",
   "item.edit.delete.description": "আপনি কি নিশ্চিত যে এই আইটেমটি সম্পূর্ণরূপে মুছে ফেলা উচিত? সতর্কতা: বর্তমানে, কোন সমাধি পাথর অবশিষ্ট থাকবে না।",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "আইটেমটি মুছে ফেলার সময় একটি ত্রুটি ঘটেছে",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "আইটেম মুছুন: {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "আইটেম মুছে ফেলা হয়েছে",
-  
+
   // "item.edit.head": "Edit Item",
   "item.edit.head": "আইটেম সম্পাদনা করুন",
-  
+
   // "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",
   "item.edit.tabs.mapper.head": "সংগ্রহ ম্যাপার",
-  
+
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "আইটেম সম্পাদনা - সংগ্রহ ম্যাপার",
-  
+
   // "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",
   "item.edit.item-mapper.buttons.remove": "নির্বাচিত সংগ্রহের জন্য আইটেম এর সমন্নয় সরান",
-  
+
   // "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.",
   "item.edit.item-mapper.description": "এটি আইটেম ম্যাপার টুল যা প্রশাসকদের এই আইটেমটিকে অন্যান্য সংগ্রহগুলিতে মানচিত্র করতে দেয়। আপনি সংগ্রহগুলি এবং তাদের মানচিত্রের জন্য অনুসন্ধান করতে পারেন বা সংগ্রহের তালিকাটি বর্তমানে ম্যাপ করা হয়েছে।",
-  
+
   // "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>\"",
   "item.edit.item-mapper.item": "আইটেম: \"<b>{{name}}</b>\"",
-  
+
   // "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.",
   "item.edit.item-mapper.notifications.add.error.content": "{{amount}} গুলি সংগ্রহের আইটেমটি সমন্নয়য়ের জন্য ত্রুটি ঘটেছে।",
-  
+
   // "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.",
   "item.edit.item-mapper.notifications.add.success.content": "সফলভাবে {{amount}} সংগ্রহের আইটেমটি সমন্নয় করা হয়েছে।",
-  
+
   // "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.",
   "item.edit.item-mapper.notifications.remove.error.content": "{{amount}} গুলি সংগ্রহের আইটেমটি সমন্নয়য়ের জন্য ত্রুটি ঘটেছে।",
-  
+
   // "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.",
   "item.edit.item-mapper.notifications.remove.success.content": "সফলভাবে {{amount}} সংগ্রহের আইটেম সমন্নয় সরানো হয়েছে।",
-  
+
   // "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",
   "item.edit.item-mapper.tabs.browse": "সমন্বিত সংগ্রহ ব্রাউজ করুন",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "মানচিত্র নতুন সংগ্রহ",
-  
-  
-  
+
+
+
   // "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.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "সম্পাদনা করুন",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "অপসারণ",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "পূর্বাবস্থায় ফিরিয়ে আনুন",
-  
+
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "সম্পাদনা বন্ধ করুন",
-  
+
   // "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",
   "item.edit.metadata.headers.edit": "সম্পাদনা করুন",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   "item.edit.metadata.headers.field": "মাঠ",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "ল্যাং।",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "মূল্য",
-  
+
   // "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",
   "item.edit.metadata.notifications.discarded.content": "আপনার পরিবর্তন বাতিল করা হয়েছে। আপনার পরিবর্তনগুলি পুনঃস্থাপন করতে 'পূর্বাবস্থায় ফিরুন' বাটনে ক্লিক করুন",
-  
+
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
   "item.edit.metadata.notifications.discarded.title": "পরিবর্তিত পরিবর্তন",
-  
+
   // "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.",
   "item.edit.metadata.notifications.invalid.content": "আপনার পরিবর্তন সংরক্ষিত ছিল না। আপনি সংরক্ষণ করার আগে সমস্ত ক্ষেত্র বৈধ নিশ্চিত করুন দয়া করে।",
-  
+
   // "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",
   "item.edit.metadata.notifications.outdated.content": "আপনি বর্তমানে কাজ করছেন এমন আইটেমটি অন্য ব্যবহারকারী দ্বারা পরিবর্তিত হয়েছে। আপনার বর্তমান পরিবর্তন দ্বন্দ্ব প্রতিরোধ করতে বাতিল করা হয়",
-  
+
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
   "item.edit.metadata.notifications.outdated.title": "পরিবর্তিত হয়েছে",
-  
+
   // "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",
   "item.edit.metadata.notifications.saved.title": "মেটাডেটা সংরক্ষিত",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "পূর্বাবস্থায় ফেরানো",
-  
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "সংরক্ষণ",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "মাঠ",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "ভাষা",
-  
+
   // "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.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.",
   "item.edit.move.description": "আপনি এই আইটেমটি সরানো করতে চান সংগ্রহ করুন নির্বাচন করুন। প্রদর্শিত সংগ্রহগুলির তালিকাটি সংকীর্ণ করার জন্য আপনি বাক্সে একটি অনুসন্ধান অনুসন্ধান করতে পারেন।",
-  
+
   // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "আইটেমটি সরানোর চেষ্টা করার সময় একটি ত্রুটি ঘটেছে",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "আইটেম সরান: {{id}}",
-  
+
   // "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",
   "item.edit.move.inheritpolicies.description": "গন্তব্য সংগ্রহের ডিফল্ট নীতিগুলি উত্তরাধিকারী",
-  
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "সরানো",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "চলন্ত ...",
-  
+
   // "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",
   "item.edit.move.success": "আইটেম সফলভাবে সরানো হয়েছে",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "আইটেমটি সরান",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "বাতিল করুন",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   "item.edit.private.confirm": "এটা ব্যক্তিগত করা",
-  
+
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
   "item.edit.private.description": "আপনি এই আইটেমটি সংরক্ষণাগার মধ্যে ব্যক্তিগত করা উচিত কি নিশ্চিত?",
-  
+
   // "item.edit.private.error": "An error occurred while making the item private",
   "item.edit.private.error": "আইটেম ব্যক্তিগত করার সময় একটি ত্রুটি ঘটেছে",
-  
+
   // "item.edit.private.header": "Make item private: {{ id }}",
   "item.edit.private.header": "আইটেম ব্যক্তিগত করুন: {{ id }}",
-  
+
   // "item.edit.private.success": "The item is now private",
   "item.edit.private.success": "আইটেম এখন ব্যক্তিগত",
-  
-  
-  
+
+
+
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "বাতিল করুন",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   "item.edit.public.confirm": "এটা পাবলিক করা",
-  
+
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
   "item.edit.public.description": "আপনি কি নিশ্চিত এই আইটেমটি সংরক্ষণাগার মধ্যে পাবলিক করা উচিত?",
-  
+
   // "item.edit.public.error": "An error occurred while making the item public",
   "item.edit.public.error": "আইটেমটি জনসাধারণের কাছে একটি ত্রুটি ঘটেছে",
-  
+
   // "item.edit.public.header": "Make item public: {{ id }}",
   "item.edit.public.header": "আইটেম সর্বজনীন করুন: {{ id }}",
-  
+
   // "item.edit.public.success": "The item is now public",
   "item.edit.public.success": "আইটেম এখন পাবলিক",
-  
-  
-  
+
+
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "বাতিল করুন",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "পুনঃস্থাপন",
-  
+
   // "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",
   "item.edit.reinstate.error": "আইটেমটি পুনঃস্থাপন করার সময় একটি ত্রুটি ঘটেছে",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "আইটেম পুনঃস্থাপন: {{ id }}",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "আইটেম সফলভাবে পুনর্বহাল করা হয়",
-  
-  
-  
+
+
+
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "বাতিল করা",
-  
+
   // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "যোগ করুন",
-  
+
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "অপসারণ",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
   "item.edit.relationships.edit.buttons.undo": "পূর্বাবস্থায় ফিরিয়ে আনুন",
-  
+
   // "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",
   "item.edit.relationships.notifications.discarded.content": "আপনার পরিবর্তন বাতিল করা হয়েছে। আপনার পরিবর্তনগুলি পুনঃস্থাপন করতে 'পূর্বাবস্থায় ফিরুন' বাটনে ক্লিক করুন",
-  
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "পরিবর্তন বাতিল করা হয়েছে",
-  
+
   // "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",
   "item.edit.relationships.notifications.outdated.content": "আপনি বর্তমানে কাজ করছেন এমন আইটেমটি অন্য ব্যবহারকারী দ্বারা পরিবর্তিত হয়েছে। আপনার বর্তমান পরিবর্তন দ্বন্দ্ব প্রতিরোধ করতে বাতিল করা হয়",
-  
+
   // "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.",
   "item.edit.relationships.notifications.saved.content": "এই আইটেমটির সম্পর্কগুলিতে আপনার পরিবর্তনগুলি সংরক্ষণ করা হয়েছে।",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "সম্পর্ক সংরক্ষিত",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "পূর্বাবস্থায় ফেরানো",
-  
+
   // "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",
   "item.edit.relationships.no-entity-type": "এই আইটেমটির জন্য সম্পর্ক সক্ষম করতে 'dspace.entity.type' মেটাডেটা যোগ করুন",
-  
-  
+
+
   // "item.edit.return": "Back",
   "item.edit.return": "পেছনে",
-  
-  
+
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "বিটস্ট্রিমস",
-  
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "আইটেম সম্পাদনা - বিটস্ট্রিমস",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "কিউরেট.",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "আইটেম সম্পাদনা - কিউরেট",
-  
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "মেটাডেটা",
-  
+
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
   "item.edit.tabs.metadata.title": "আইটেম সম্পাদনা - মেটাডাটা",
-  
+
   // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "সম্পর্ক",
-  
+
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "আইটেম সম্পাদনা - সম্পর্ক",
-  
+
   // "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",
   "item.edit.tabs.status.buttons.authorizations.label": "আইটেম এর অনুমোদন নীতি সম্পাদনা করুন",
-  
+
   // "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",
   "item.edit.tabs.status.buttons.delete.label": "সম্পূর্ণরূপে আইটেম এক্সপোজ করুন",
-  
+
   // "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",
   "item.edit.tabs.status.buttons.mappedCollections.label": "ম্যাপড সংগ্রহ পরিচালনা করুন",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "সরানো ...",
-  
+
   // "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...",
   "item.edit.tabs.status.buttons.private.button": "এটা ব্যক্তিগত করা ...",
-  
+
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
   "item.edit.tabs.status.buttons.private.label": "আইটেম ব্যক্তিগত করা",
-  
+
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
   "item.edit.tabs.status.buttons.public.button": "এটা পাবলিক করা ...",
-  
+
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
   "item.edit.tabs.status.buttons.public.label": "আইটেম পাবলিক করুন",
-  
+
   // "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",
   "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...",
-  "item.edit.tabs.status.buttons.withdraw.button": "প্রত্যাহার ...",
-  
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "এই আইটেম প্রত্যাহার করুন",
+
   // "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.",
   "item.edit.tabs.status.description": "আইটেম ম্যানেজমেন্ট পেজে স্বাগতম। এখানে থেকে আপনি আইটেমটি সরানো বা আইটেমটি মুছে ফেলতে পারেন। আপনি অন্যান্য ট্যাবে নতুন মেটাডেটা / বিটস্ট্রিমগুলি আপডেট বা যোগ করতে পারেন।",
-  
+
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "অবস্থা",
-  
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "হাতল",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "আইটেম অভ্যন্তরীণ আইডি",
-  
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "আইটেম পৃষ্ঠা",
-  
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "সর্বশেষ পরিবর্তিত",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "আইটেম সম্পাদনা - স্থিতি",
-  
+
   // "item.edit.tabs.versionhistory.head": "Version History",
   "item.edit.tabs.versionhistory.head": "সংস্করণ ইতিহাস",
-  
+
   // "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.",
   "item.edit.tabs.versionhistory.under-construction": "সম্পাদনা বা নতুন সংস্করণ যোগ করা এই ব্যবহারকারী ইন্টারফেসে এখনো সম্ভব নয়।",
-  
+
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "দেখুন আইটেম",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "আইটেম সম্পাদনা - দেখুন",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "বাতিল করুন",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "প্রত্যাহার করুন",
-  
+
   // "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",
   "item.edit.withdraw.error": "আইটেমটি প্রত্যাহারের সময় একটি ত্রুটি ঘটেছে",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "প্রত্যাহার আইটেম: {{ id }}",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "আইটেম সফলভাবে প্রত্যাহার করা হয়",
-  
-  
-  
+
+
+
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "আইটেম",
-  
+
   // "item.page.description": "Description",
   "item.page.description": "বর্ণনা",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "জার্নাল ইশান",
-  
+
   // "item.page.journal-title": "Journal Title",
   "item.page.journal-title": "জার্নাল শিরোনাম",
-  
+
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "প্রকাশক",
-  
+
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "আইটেম: ",
-  
+
   // "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.page.abstract": "Abstract",
   "item.page.abstract": "বিমূর্ত",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "লেখক",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "উদ্ধৃতি",
-  
+
   // "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",
   "item.page.date": "তারিখ.",
-  
+
   // "item.page.edit": "Edit this item",
   "item.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "item.page.files": "Files",
   "item.page.files": "নথি পত্র",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "বর্ণনা:",
-  
+
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "ডাউনলোড করুন",
-  
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "বিন্যাস:",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "নাম:",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "আকার:",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "এই জার্নাল নিবন্ধ",
-  
+
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "সম্পূর্ণ আইটেম পৃষ্ঠা",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "সহজ আইটেম পৃষ্ঠা",
-  
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "এই লেখক দ্বারা প্রবন্ধ",
-  
+
   // "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 }}",
   "item.page.related-items.view-less": "শেষ {{amount}} লুকান",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   "item.page.relationships.isAuthorOfPublication": "প্রকাশনা",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   "item.page.relationships.isJournalOfPublication": "প্রকাশনা",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "লেখক",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   "item.page.relationships.isOrgUnitOfProject": "গবেষণা প্রকল্প",
-  
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "কীওয়ার্ড",
-  
+
   // "item.page.uri": "URI",
   "item.page.uri": "ঘৃণা",
-  
+
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "আরো দেখুন",
-  
+
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "ধৈর্য",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "আসল বান্ডিল",
-  
+  "item.page.filesection.original.bundle": "আসল বান্ডিল",
+
   // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.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.version.hasDraft": "A new version cannot be created because there is an inprogress submission in the version history",
   "item.page.version.hasDraft": "একটি নতুন সংস্করণ তৈরি করা যাচ্ছে না কারণ ভার্সন হিস্ট্রিতে একটি জমা ইনপ্রগ্রেসস অবস্থাই রয়েছে",
-  
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "শনাক্তকারী:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "লেখক:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "প্রকাশের তারিখ:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "সংক্ষিপ্তসার:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "অন্য শনাক্তকারী:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "ভাষা:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   "item.preview.dc.subject": "বিষয়:",
-  
+
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "শিরোনাম:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "পদবি:",
-  
+
   // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "নাম:",
-  
+
   // "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.select.confirm": "Confirm selected",
   "item.select.confirm": "নির্বাচিত নিশ্চিত করুন",
-  
+
   // "item.select.empty": "No items to show",
   "item.select.empty": "কোন আইটেম দেখাতে",
-  
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "লেখক",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "সংগ্রহ",
-  
+
   // "item.select.table.title": "Title",
   "item.select.table.title": "শিরোনাম",
-  
-  
+
+
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "এখনো এই আইটেমটি জন্য অন্য কোন সংস্করণ নেই।",
-  
+
   // "item.version.history.head": "Version History",
   "item.version.history.head": "সংস্করণ ইতিহাস",
-  
+
   // "item.version.history.return": "Back",
   "item.version.history.return": "পেছনে",
-  
+
   // "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",
   "item.version.history.table.version": "সংস্করণ.",
-  
+
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "আইটেম",
-  
+
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "সম্পাদক",
-  
+
   // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "তারিখ.",
-  
+
   // "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": "Sumary সম্পাদনা করুন",
-  
+
   // "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.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.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "বাতিল করুন",
-  
+
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
   "item.version.create.modal.button.cancel.tooltip": "নতুন সংস্করণ তৈরি করবেন না",
-  
+
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "সারসংক্ষেপ",
-  
+
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
   "item.version.create.modal.form.summary.placeholder": "নতুন সংস্করণের জন্য সারাংশ সন্নিবেশ করান",
-  
+
   // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
-  "item.version.create.notification.success" : "সংস্করণ নম্বর {{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.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.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.success": "সংস্করণ নম্বর {{version}} মুছে ফেলা হয়েছে",
+
   // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
-  "item.version.delete.notification.failure" : "সংস্করণ নম্বর {{version}} মুছে ফেলা হয়নি",
-  
-  
+  "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.success": "সংস্করণ নম্বর {{version}}-এর সারাংশ পরিবর্তন করা হয়েছে",
+
   // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
-  "item.version.edit.notification.failure" : "সংস্করণ নম্বর {{version}}-এর সারাংশ পরিবর্তন করা হয়নি",
-  
-  
-  
+  "item.version.edit.notification.failure": "সংস্করণ নম্বর {{version}}-এর সারাংশ পরিবর্তন করা হয়নি",
+
+
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "জার্নাল",
-  
+
   // "journal.page.description": "Description",
   "journal.page.description": "বর্ণনা",
-  
+
   // "journal.page.edit": "Edit this item",
   "journal.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "প্রধান সম্পাদক",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "প্রকাশক",
-  
+
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "জার্নাল: ",
-  
+
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "জার্নাল অনুসন্ধান ফলাফল",
-  
+
   // "journal.search.title": "Journal Search",
   "journal.search.title": "জার্নাল অনুসন্ধান",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "জার্নাল ইস্যু",
-  
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "বর্ণনা",
-  
+
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "প্রদানের তারিখ",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "জার্নাল ইশান",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   "journalissue.page.journal-title": "জার্নাল শিরোনাম",
-  
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "কীওয়ার্ড",
-  
+
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "সংখ্যা",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "জার্নাল ইস্যু: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "জার্নাল ভলিউম",
-  
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "বর্ণনা",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "প্রদানের তারিখ",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   "journalvolume.page.titleprefix": "জার্নাল ভলিউম: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "ভলিউম",
-  
-  
+
+
   // "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...",
   "loading.bitstream": "বিটস্ট্রিম লোড হচ্ছে ...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "বিটস্ট্রিম লোড হচ্ছে ...",
-  
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "লোড হচ্ছে আইটেম ...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "লোড হচ্ছে পাতা ...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "লোড হচ্ছে সংগ্রহ ...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "লোড হচ্ছে সংগ্রহ ...",
-  
+
   // "loading.content-source": "Loading content source...",
   "loading.content-source": "কন্টেন্ট উৎস লোড হচ্ছে ...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "কমিউনিটি লোড হচ্ছে ...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "লোড হচ্ছে ...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "লোড হচ্ছে আইটেম ...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "লোড হচ্ছে আইটেম ...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "লোড হচ্ছে আইটেম ...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "লোড হচ্ছে ...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "সাম্প্রতিক জমাগুলো লোড হচ্ছে ...",
-  
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "অনুসন্ধানের ফলাফল লোড হচ্ছে ...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "উপ-সংগ্রহগুলো লোড হচ্ছে ...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   "loading.sub-communities": "উপ-সম্প্রদায়গুলো লোড হচ্ছে ...",
-  
+
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "শীর্ষ-স্তরের সম্প্রদায়গুলো লোড হচ্ছে ...",
-  
-  
-  
+
+
+
   // "login.form.email": "Email address",
   "login.form.email": "ইমেইল ঠিকানা",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "আপনি আপনার পাসওয়ার্ড ভুলে গেছেন?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "ডিস্পেস লগ ইন করুন",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "নতুন ব্যবহারকারী? নিবন্ধন করতে এখানে ক্লিক করুন।",
-  
+
   // "login.form.or-divider": "or",
   "login.form.or-divider": "অথবা",
-  
+
   // "login.form.oidc": "Log in with OIDC",
   "login.form.oidc": "OIDC সঙ্গে লগ ইন করুন",
-  
+
   // "login.form.password": "Password",
   "login.form.password": "পাসওয়ার্ড",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "Shibboleth এর সঙ্গে লগ ইন করুন",
-  
+
   // "login.form.submit": "Log in",
   "login.form.submit": "প্রবেশ করুন",
-  
+
   // "login.title": "Login",
   "login.title": "প্রবেশ করুন",
-  
+
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "প্রবেশ করুন",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "ডিস্পেস থেকে লগ আউট করুন",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "প্রস্থান",
-  
+
   // "logout.title": "Logout",
   "logout.title": "প্রস্থান",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Management",
   "menu.header.admin": "ব্যবস্থাপনা",
-  
+
   // "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",
   "menu.section.access_control": "প্রবেশাধিকার নিয়ন্ত্রণ",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "অনুমোদনকরণ",
-  
+
   // "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.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",
   "menu.section.admin_search": "অ্যাডমিন অনুসন্ধান",
-  
-  
-  
+
+
+
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "এই সম্প্রদায়",
-  
+
   // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "লেখক দ্বারা",
-  
+
   // "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",
   "menu.section.browse_community_by_title": "শিরোনাম দ্বারা",
-  
+
   // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "ডিস্পেস এর সবকিছু",
-  
+
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "লেখক দ্বারা",
-  
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "ইস্যু তারিখ দ্বারা",
-  
+
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "বিষয় দ্বারা",
-  
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "শিরোনাম দ্বারা",
-  
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "সম্প্রদায় ও সংগ্রহ",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "কন্ট্রোল প্যানেল",
-  
+
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "নিরাময় টাস্ক",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "সম্পাদনা করুন",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "সংগ্রহ",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "সম্প্রদায়",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "আইটেম",
-  
-  
-  
+
+
+
   // "menu.section.export": "Export",
   "menu.section.export": "এক্সপোর্ট",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "সংগ্রহ",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "সম্প্রদায়",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "আইটেম",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "মেটাডেটা",
-  
-  
-  
+
+
+
   // "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.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "অ্যাডমিন অনুসন্ধান মেনু বিভাগ",
-  
+
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "কন্ট্রোল প্যানেল মেনু বিভাগ",
-  
+
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
   "menu.section.icon.curation_tasks": "নিরাময় টাস্ক মেনু বিভাগ",
-  
+
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "মেনু বিভাগ সম্পাদনা করুন",
-  
+
   // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "রপ্তানি মেনু অধ্যায়",
-  
+
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "মেনু বিভাগ খুঁজুন",
-  
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "আমদানি মেনু বিভাগ",
-  
+
   // "menu.section.icon.new": "New menu section",
   "menu.section.icon.new": "নতুন মেনু বিভাগ",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "পিন সাইডবার",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   "menu.section.icon.processes": "প্রসেস মেনু বিভাগ",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "নিবন্ধন মেনু বিভাগ",
-  
+
   // "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",
   "menu.section.icon.unpin": "আনপিন সাইডবার",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   "menu.section.import": "আমদানি",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "ব্যাচ আমদানি (ZIP)",
-  
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "মেটাডেটা",
-  
-  
-  
+
+
+
   // "menu.section.new": "New",
   "menu.section.new": "নতুন",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "সংগ্রহ",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "সম্প্রদায়",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "আইটেম",
-  
+
   // "menu.section.new_item_version": "Item Version",
   "menu.section.new_item_version": "আইটেম সংস্করণ",
-  
+
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "প্রক্রিয়া",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "পিন সাইডবার",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "আনপিন সাইডবার",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   "menu.section.processes": "প্রসেস.",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "নিবন্ধন",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "বিন্যাস",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "মেটাডেটা",
-  
-  
-  
+
+
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "পরিসংখ্যান",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "পরিসংখ্যান টাস্ক",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "অ্যাক্সেস কন্ট্রোল বিভাগ টগল করুন",
-  
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "টগল কন্ট্রোল প্যানেল অধ্যায়",
-  
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "কুপন টাস্ক বিভাগ টগল করুন",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "সম্পাদনা বিভাগ টগল করুন",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "টগল এক্সপোর্ট বিভাগ",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "টগল করুন বিভাগে",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "আমদানি বিভাগ টগল করুন",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "নতুন অধ্যায় টগল করুন",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "নিবন্ধন বিভাগ টগল করুন",
-  
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "পরিসংখ্যান টাস্ক বিভাগ টগল করুন",
-  
-  
+
+
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "প্রশাসনিক কর্মধারা",
-  
-  
+
+
   // "mydspace.breadcrumbs": "MyDSpace",
   "mydspace.breadcrumbs": "আমার ডিস্পেস",
-  
+
   // "mydspace.description": "",
   "mydspace.description": "অপসারণ করা আবশ্যক",
-  
+
   // "mydspace.general.text-here": "here",
   "mydspace.general.text-here": "এখানে",
-  
+
   // "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...",
   "mydspace.messages.description-placeholder": "এখানে আপনার বার্তা দিন...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "বার্তা লুকান",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "পঠিত হিসেবে চিহ্নিত করুন",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "অপঠিত হিসাবে চিহ্নিত",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "কোন উপাদান নেই.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "এখনো কোন বার্তা নেই।",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "পাঠান",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "বার্তা দেখান",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "বিষয়...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "কন্ট্রোলারের কাছে একটি বার্তা পাঠাতে এই বিকল্পটি নির্বাচন করুন।",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "বার্তা",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "প্রতি",
-  
+
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "নতুন জমা",
-  
+
   // "mydspace.new-submission-external": "Import metadata from external source",
   "mydspace.new-submission-external": "বহিরাগত উৎস থেকে মেটাডাটা আমদানি করুন",
-  
+
   // "mydspace.new-submission-external-short": "Import metadata",
   "mydspace.new-submission-external-short": "মেটাডেটা আমদানি করুন",
-  
+
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "আপনার জমাগুলো",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "কোন বিমূর্ত",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "কোন লেখক",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   "mydspace.results.no-collections": "কোন সংগ্রহ",
-  
+
   // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "তারিখ নেই",
-  
+
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "কোন ফাইল নেই",
-  
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "দেখানোর জন্য কোন আইটেম ছিল না",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "কোনো শিরোনাম নেই",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "কোন ইউ আর আই (uri) নেই",
-  
+
   // "mydspace.search-form.placeholder": "Search in mydspace...",
   "mydspace.search-form.placeholder": "আমার ডিস্পেস এর মধ্যে অনুসন্ধান করুন ...",
-  
+
   // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "ওয়ার্কফ্লো কাজগুলো",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "আপনার জমাগুলো",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "সংরক্ষণাগারভুক্ত",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "বৈধতা",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "নিয়ামক জন্য অপেক্ষা করছে",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "ওয়ার্কফ্লো",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "কর্মক্ষেত্র",
-  
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "সংরক্ষণাগারভুক্ত",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "বৈধতা",
+
+  // "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",
   "mydspace.title": "আমার ডিস্পেস",
-  
+
   // "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.",
   "mydspace.upload.upload-failed-manyentries": "অরক্ষিত ফাইল। অনেক এন্ট্রি সনাক্ত কিন্তু শুধুমাত্র ফাইলের জন্য শুধুমাত্র একটি অনুমোদিত।",
-  
+
   // "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.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} টি নতুন ওয়ার্কস্পেস আইটেম তৈরি করা হয়েছে।",
-  
+
   // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
   "mydspace.upload.upload-successful": "নতুন ওয়ার্কস্পেস আইটেম তৈরি হয়েছে। এটি সম্পাদনা করার জন্য এখানে {{here}} ক্লিক করুন।",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "দেখুন",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "ডিস্পেসের সবকিছু",
-  
+
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "সম্প্রদায় দ্বারা",
-  
+
   // "nav.language": "Language switch",
   "nav.language": "ভাষা পরিবর্তন",
-  
+
   // "nav.login": "Log In",
   "nav.login": "প্রবেশ করুন",
-  
+
   // "nav.logout": "User profile menu and Log Out",
   "nav.logout": "ব্যবহারকারী প্রোফাইল মেনু এবং লগ আউট",
-  
+
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "প্রধান ন্যাভিগেশন বার",
-  
+
   // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "আমার ডিস্পেস",
-  
+
   // "nav.profile": "Profile",
   "nav.profile": "প্রোফাইল",
-  
+
   // "nav.search": "Search",
   "nav.search": "অনুসন্ধান করুন",
-  
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "পরিসংখ্যান",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "ই-পারসন ছদ্মবেশী থামান",
-  
+
   // "nav.toggle" : "Toggle navigation",
-  "nav.toggle" : "নেভিগেশন টগল করুন",
-  
+  "nav.toggle": "নেভিগেশন টগল করুন",
+
   // "nav.user.description" : "User profile bar",
-  "nav.user.description" : "ব্যবহারকারীর প্রোফাইল বার",
-  
+  "nav.user.description": "ব্যবহারকারীর প্রোফাইল বার",
+
   // "none.listelement.badge": "Item",
   "none.listelement.badge": "আইটেম",
-  
-  
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "প্রাতিষ্ঠানিক একক অংশ",
-  
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "শহর",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "দেশ",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "স্থাপিত তারিখ",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "বর্ণনা",
-  
+
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "আইডি",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "প্রাতিষ্ঠানিক একক অংশ: ",
-  
-  
-  
+
+
+
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "পেজিনেশনের বিকল্পগুলো",
-  
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "প্রতি পৃষ্ঠায় ফলাফল",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{range}} এর {{total}}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "এখন দেখানো হচ্ছে ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "সাজানোর বিকল্পগুলো",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "ব্যক্তি",
-  
+
   // "person.listelement.no-title": "No name found",
   "person.listelement.no-title": "কোন নাম পাওয়া যায় নি",
-  
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "জন্ম তারিখ",
-  
+
   // "person.page.edit": "Edit this item",
   "person.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "person.page.email": "Email Address",
   "person.page.email": "ইমেইল ঠিকানা",
-  
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "নামের প্রথম অংশ",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "কাজের শিরোনাম",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "নামের শেষাংশ",
-  
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "সব মেটাডেটা দেখান",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "Orcid.",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "স্টাফ আইডি",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "ব্যক্তি: ",
-  
+
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "ব্যক্তি অনুসন্ধান ফলাফল",
-  
+
   // "person.search.title": "Person Search",
   "person.search.title": "ব্যক্তি অনুসন্ধান",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "পরামিতি",
-  
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "বাতিল করুন",
-  
+
   // "process.new.submit": "Save",
   "process.new.submit": "সংরক্ষণ",
-  
+
   // "process.new.select-script": "Script",
   "process.new.select-script": "লিপি",
-  
+
   // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "একটি স্ক্রিপ্ট নির্বাচন করুন ...",
-  
+
   // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "স্ক্রিপ্ট প্রয়োজন",
-  
+
   // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "ফাইল নির্বাচন...",
-  
+
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "দয়াকরে একটি ফাইল নির্বাচন করুন",
-  
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "পরামিতির মান প্রয়োজন",
-  
+
   // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "মূল্য",
-  
+
   // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "ফাইল",
-  
+
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "নিম্নলিখিত পরামিতি প্রয়োজন কিন্তু এখনও অনুপস্থিত:",
-  
+
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "সাফল্য",
-  
+
   // "process.new.notification.success.content": "The process was successfully created",
   "process.new.notification.success.content": "প্রক্রিয়া সফলভাবে তৈরি করা হয়েছে",
-  
+
   // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "ত্রুটি",
-  
+
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "এই প্রক্রিয়াটি তৈরি করার সময় একটি ত্রুটি ঘটেছে",
-  
+
   // "process.new.header": "Create a new process",
   "process.new.header": "একটি নতুন প্রক্রিয়া তৈরি করুন",
-  
+
   // "process.new.title": "Create a new process",
   "process.new.title": "একটি নতুন প্রক্রিয়া তৈরি করুন",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "একটি নতুন প্রক্রিয়া তৈরি করুন",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "যুক্তি",
-  
+  "process.detail.arguments": "যুক্তি",
+
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "এই প্রক্রিয়া কোনো যুক্তি ধারণ করে না",
-  
+  "process.detail.arguments.empty": "এই প্রক্রিয়া কোনো যুক্তি ধারণ করে না",
+
   // "process.detail.back" : "Back",
-  "process.detail.back" : "ফিরে যান",
-  
+  "process.detail.back": "ফিরে যান",
+
   // "process.detail.output" : "Process Output",
-  "process.detail.output" : "প্রসেস আউটপুট",
-  
+  "process.detail.output": "প্রসেস আউটপুট",
+
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "প্রক্রিয়া আউটপুট পুনরুদ্ধার",
-  
+
   // "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": "আউটপুট ফাইল",
+
   // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "এই প্রক্রিয়ায় কোনো আউটপুট ফাইল নেই",
-  
+  "process.detail.output-files.empty": "এই প্রক্রিয়ায় কোনো আউটপুট ফাইল নেই",
+
   // "process.detail.script" : "Script",
-  "process.detail.script" : "লিপি",
-  
+  "process.detail.script": "লিপি",
+
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "প্রক্রিয়া: {{ id }} - {{ name }}",
-  
+  "process.detail.title": "প্রক্রিয়া: {{ id }} - {{ name }}",
+
   // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "শুরুর সময়",
-  
+  "process.detail.start-time": "শুরুর সময়",
+
   // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "শেষ সময়",
-  
+  "process.detail.end-time": "শেষ সময়",
+
   // "process.detail.status" : "Status",
-  "process.detail.status" : "স্ট্যাটাস",
-  
+  "process.detail.status": "স্ট্যাটাস",
+
   // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "অনুরূপ প্রক্রিয়া তৈরি করুন",
-  
-  
-  
+  "process.detail.create": "অনুরূপ প্রক্রিয়া তৈরি করুন",
+
+
+
   // "process.overview.table.finish" : "Finish time (UTC)",
-  "process.overview.table.finish" : "শেষ সময় (UTC)",
-  
+  "process.overview.table.finish": "শেষ সময় (UTC)",
+
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "প্রসেস আইডি",
-  
+  "process.overview.table.id": "প্রসেস আইডি",
+
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "নাম",
-  
+  "process.overview.table.name": "নাম",
+
   // "process.overview.table.start" : "Start time (UTC)",
-  "process.overview.table.start" : "শুরুর সময় (UTC)",
-  
+  "process.overview.table.start": "শুরুর সময় (UTC)",
+
   // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "স্ট্যাটাস",
-  
+  "process.overview.table.status": "স্ট্যাটাস",
+
   // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "বাবহারকারি",
-  
+  "process.overview.table.user": "বাবহারকারি",
+
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "প্রসেসের সংক্ষিপ্ত বিবরণ",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "প্রসেসের সংক্ষিপ্ত বিবরণ",
-  
+
   // "process.overview.new": "New",
   "process.overview.new": "নতুন",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "আপডেট প্রফাইল",
-  
+
   // "profile.card.identify": "Identify",
   "profile.card.identify": "চিহ্নিত করুন",
-  
+
   // "profile.card.security": "Security",
   "profile.card.security": "নিরাপত্তা",
-  
+
   // "profile.form.submit": "Save",
   "profile.form.submit": "সংরক্ষণ",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "অনুমোদিত গ্রুপগুলোতে আপনি অন্তর্গত",
-  
+
   // "profile.head": "Update Profile",
   "profile.head": "আপডেট প্রফাইল",
-  
+
   // "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",
   "profile.metadata.form.error.lastname.required": "শেষ নাম প্রয়োজন",
-  
+
   // "profile.metadata.form.label.email": "Email Address",
   "profile.metadata.form.label.email": "ইমেইল ঠিকানা",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "নামের প্রথম অংশ",
-  
+
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "ভাষা",
-  
+
   // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "নামের শেষাংশ",
-  
+
   // "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.",
   "profile.metadata.form.notifications.success.content": "প্রোফাইল আপনার পরিবর্তন সংরক্ষিত ছিল।",
-  
+
   // "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.",
   "profile.notifications.warning.no-changes.content": "প্রোফাইলে কোন পরিবর্তন করা হয়নি।",
-  
+
   // "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.",
   "profile.security.form.error.matching-passwords": "পাসওয়ার্ড মেলে না",
-  
+
   // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
   "profile.security.form.error.password-length": "পাসওয়ার্ড অন্তত ৬ অক্ষর দীর্ঘ হওয়া উচিত।",
-  
+
   // "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": "বিকল্পভাবে, আপনি নীচের বাক্সে একটি নতুন পাসওয়ার্ড লিখতে পারেন এবং এটি আবার দ্বিতীয় বাক্সে টাইপ করে এটি নিশ্চিত করতে পারেন। এটি অন্তত ছয় অক্ষর দীর্ঘ হতে হবে।",
-  
+
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "পাসওয়ার্ড",
-  
+
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "নিশ্চিত করতে পুনরাই লিখুন",
-  
+
   // "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",
   "profile.security.form.notifications.success.title": "পাসওয়ার্ড সংরক্ষিত",
-  
+
   // "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.",
   "profile.security.form.notifications.error.not-long-enough": "পাসওয়ার্ড অন্তত ৬ অক্ষর দীর্ঘ হতে হবে।",
-  
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "প্রদত্ত পাসওয়ার্ড একই নয়।",
-  
+
   // "profile.title": "Update Profile",
   "profile.title": "আপডেট প্রফাইল",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "গবেষণা প্রকল্প",
-  
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "অবদানকারী",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "বর্ণনা",
-  
+
   // "project.page.edit": "Edit this item",
   "project.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "প্রত্যাশিত সমাপ্তি",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "যারা আর্থিক সাহায্য করে",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "আইডি",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "কীওয়ার্ড",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "অবস্থা",
-  
+
   // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "গবেষণা প্রকল্প: ",
-  
+
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "প্রকল্প অনুসন্ধান ফলাফল",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "প্রকাশনার",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "বর্ণনা",
-  
+
   // "publication.page.edit": "Edit this item",
   "publication.page.edit": "এই আইটেমটি সম্পাদনা করুন",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "জার্নাল  ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   "publication.page.journal-title": "জার্নাল শিরোনাম",
-  
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "প্রকাশক",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "প্রকাশনা: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "ভলিউম শিরোনাম",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   "publication.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": "প্লেলিস্ট",
-  
-  
+
+
   // "register-email.title": "New user registration",
   "register-email.title": "নতুন ব্যবহারকারীর জন্য নিবন্ধন",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "প্রোফাইল তৈরি করুন",
-  
+
   // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "চিহ্নিত করুন",
-  
+
   // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "ইমেইল ঠিকানা",
-  
+
   // "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",
   "register-page.create-profile.identification.first-name.error": "একটি প্রথম নাম পূরণ করুন",
-  
+
   // "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",
   "register-page.create-profile.identification.last-name.error": "একটি শেষ নাম পূরণ করুন",
-  
+
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "যোগাযোগ টেলিফোন",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "ভাষা",
-  
+
   // "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.",
   "register-page.create-profile.security.info": "নীচের বাক্সে একটি পাসওয়ার্ড লিখুন এবং দ্বিতীয় বাক্সে আবার টাইপ করে এটি নিশ্চিত করুন। এটি অন্তত ছয় অক্ষর দীর্ঘ হতে হবে।",
-  
+
   // "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 *",
   "register-page.create-profile.security.label.passwordrepeat": "নিশ্চিত করতে পুনরাই লিখুন *",
-  
+
   // "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.",
   "register-page.create-profile.security.error.matching-passwords": "পাসওয়ার্ড মেলে না.",
-  
+
   // "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": "পাসওয়ার্ড অন্তত ৬  অক্ষর দীর্ঘ হওয়া উচিত।",
-  
+
   // "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.",
   "register-page.create-profile.submit.error.content": "একটি নতুন ব্যবহারকারী নিবন্ধন করার সময় কিছু ভুল হয়েছে।",
-  
+
   // "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.",
   "register-page.create-profile.submit.success.content": "নিবন্ধন সফল হয়েছে। আপনি তৈরি ব্যবহারকারী হিসাবে লগ ইন করেছেন।",
-  
+
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "নিবন্ধন সম্পন্ন",
-  
-  
+
+
   // "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.",
   "register-page.registration.info": "ইমেল আপডেটের জন্য সংগ্রহে সদস্যতা নিতে একটি অ্যাকাউন্ট নিবন্ধন করুন এবং ডিস্পেস এ নতুন আইটেম জমা দিন।",
-  
+
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "ইমেইল ঠিকানা *",
-  
+
   // "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",
   "register-page.registration.email.error.pattern": "একটি বৈধ ইমেইল ঠিকানা পূরণ করুন",
-  
+
   // "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",
   "register-page.registration.submit": "নিবন্ধন",
-  
+
   // "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.",
   "register-page.registration.success.content": "একটি বিশেষ ইউআরএল এবং আরও নির্দেশাবলী ধারণকারী {{email}} এ একটি ইমেল পাঠানো হয়েছে।",
-  
+
   // "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 }}",
   "register-page.registration.error.content": "নিম্নলিখিত ইমেল ঠিকানা নিবন্ধন করার সময় একটি ত্রুটি ঘটেছে: {{ email }}",
-  
-  
-  
+
+
+
   // "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",
   "relationships.add.error.server.content": "সার্ভারে একটি ত্রুটি হয়েছে",
-  
+
   // "relationships.add.error.title": "Unable to add relationship",
   "relationships.add.error.title": "সম্পর্ক যোগ করতে অক্ষম",
-  
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "লেখক",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   "relationships.isAuthorOf.Person": "লেখক (ব্যক্তি)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "লেখক (সাংগঠনিক ইউনিট)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "জার্নাল সমস্যা",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "জার্নাল ইস্যু",
-  
+
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "জার্নালগুলো",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "সাংগঠনিক ইউনিট",
-  
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "লেখক",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   "relationships.isProjectOf": "গবেষণা প্রকল্পগুলো",
-  
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "প্রকাশনা",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "নিবন্ধসমূহ",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   "relationships.isSingleJournalOf": "জার্নাল",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "জার্নাল ভলিউম",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "জার্নাল ভলিউম",
-  
+
   // "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.prefix": "DSpace Angular :: ",
   "repository.title.prefix": "ডিস্পেস অ্যাংগুলার :: ",
-  
+
   // "repository.title.prefixDSpace": "DSpace Angular ::",
   "repository.title.prefixDSpace": "ডিস্পেস অ্যাংগুলার ::",
-  
-  
+
+
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "যোগ করুন",
-  
+
   // "resource-policies.add.for.": "Add a new policy",
   "resource-policies.add.for.": "একটি নতুন নীতি যোগ করুন",
-  
+
   // "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",
   "resource-policies.add.for.bundle": "একটি নতুন বান্ডিল নীতি যোগ করুন",
-  
+
   // "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",
   "resource-policies.add.for.community": "একটি নতুন সম্প্রদায় নীতি যোগ করুন",
-  
+
   // "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 ",
   "resource-policies.create.page.heading": "জন্য নতুন রিসোর্স নীতি তৈরি করুন",
-  
+
   // "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",
   "resource-policies.create.page.success.content": "কাজটি সফল হয়েছে",
-  
+
   // "resource-policies.create.page.title": "Create new resource policy",
   "resource-policies.create.page.title": "নতুন সম্পদ নীতি তৈরি করুন",
-  
+
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "নির্বাচিতটি মুছুন",
-  
+
   // "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.",
   "resource-policies.delete.failure.content": "নির্বাচিত সম্পদ নীতি মুছে ফেলার সময় একটি ত্রুটি ঘটেছে।",
-  
+
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "কাজটি সফল হয়েছে",
-  
+
   // "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.",
   "resource-policies.edit.page.failure.content": "সম্পদ নীতি সম্পাদনা করার সময় একটি ত্রুটি ঘটেছে।",
-  
+
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "কাজটি সফল হয়েছে",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   "resource-policies.edit.page.title": "রিসোর্স নীতি সম্পাদনা করুন",
-  
+
   // "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.",
   "resource-policies.form.action-type.required": "আপনাকে অবশই একটি সম্পদ নীতি নির্বাচন করতে হবে।",
-  
+
   // "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",
   "resource-policies.form.eperson-group-list.select.btn": "নির্বাচন করুন",
-  
+
   // "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",
   "resource-policies.form.eperson-group-list.tab.group": "একটি গ্রুপ জন্য অনুসন্ধান করুন",
-  
+
   // "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",
   "resource-policies.form.eperson-group-list.table.headers.id": "আইডি",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "নাম",
-  
+
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "শেষ তারিখ",
-  
+
   // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "শুরুর তারিখ",
-  
+
   // "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.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.",
   "resource-policies.form.policy-type.required": "আপনার অবশই রিসোর্স নীতি নির্বাচন করতে হবে।",
-  
+
   // "resource-policies.table.headers.action": "Action",
   "resource-policies.table.headers.action": "অ্যাকশন",
-  
+
   // "resource-policies.table.headers.date.end": "End Date",
   "resource-policies.table.headers.date.end": "শেষ তারিখ",
-  
+
   // "resource-policies.table.headers.date.start": "Start Date",
   "resource-policies.table.headers.date.start": "শুরুর তারিখ",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "সম্পাদনা করুন",
-  
+
   // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "গ্রুপ সম্পাদনা করুন",
-  
+
   // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "নীতি সম্পাদনা করুন",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   "resource-policies.table.headers.eperson": "ই-পারসন",
-  
+
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "গ্রুপ",
-  
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "আইডি",
-  
+
   // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "নাম",
-  
+
   // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "টাইপ.",
-  
+
   // "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",
   "resource-policies.table.headers.title.for.bundle": "বান্ডিলের জন্য নীতি",
-  
+
   // "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",
   "resource-policies.table.headers.title.for.community": "সম্প্রদায়ের জন্য নীতি",
-  
+
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "সংগ্রহের জন্য নীতি",
-  
-  
-  
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "দেখাও",
-  
+
   // "search.title": "Search",
   "search.title": "অনুসন্ধান করুন",
-  
+
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "অনুসন্ধান করুন",
-  
+
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "সংগ্রহস্থল অনুসন্ধান করুন ...",
-  
-  
+
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "লেখক",
-  
+
   // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "শেষ তারিখ",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "শুরুর তারিখ",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "জন্ম জমা",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   "search.filters.applied.f.discoverable": "ব্যক্তিগত",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "বস্তুর ধরন",
-  
+
   // "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",
   "search.filters.applied.f.itemtype": "ধরন",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "অবস্থা",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "বিষয়",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "জমাকারী",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "কাজের শিরোনাম",
-  
+
   // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "শেষ জন্ম তারিখ",
-  
+
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "জন্ম তারিখ শুরু করুন",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "প্রত্যাহার",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "লেখক",
-  
+
   // "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",
   "search.filters.filter.birthDate.head": "জন্ম তারিখ",
-  
+
   // "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",
   "search.filters.filter.creativeDatePublished.head": "তারিখ প্রকাশিত",
-  
+
   // "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",
   "search.filters.filter.creativeWorkEditor.head": "সম্পাদক",
-  
+
   // "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",
   "search.filters.filter.creativeWorkKeywords.head": "বিষয়",
-  
+
   // "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",
   "search.filters.filter.creativeWorkPublisher.head": "প্রকাশক",
-  
+
   // "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",
   "search.filters.filter.dateIssued.head": "তারিখ",
-  
+
   // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.max.placeholder": "সর্বোচ্চ তারিখ",
-  
+
   // "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",
   "search.filters.filter.dateSubmitted.head": "জমাদানের তারিখ",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "জমাদানের তারিখ",
-  
+
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
   "search.filters.filter.dateSubmitted.label": "অনুসন্ধান তারিখ জমা হয়েছে",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   "search.filters.filter.discoverable.head": "ব্যক্তিগত",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "প্রত্যাহার",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "বস্তুর ধরন",
-  
+
   // "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",
   "search.filters.filter.has_content_in_original_bundle.head": "ফাইল আছে",
-  
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "ধরন",
-  
+
   // "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",
   "search.filters.filter.jobTitle.head": "কাজের শিরোনাম",
-  
+
   // "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",
   "search.filters.filter.knowsLanguage.head": "পরিচিত ভাষা",
-  
+
   // "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",
   "search.filters.filter.namedresourcetype.head": "অবস্থা",
-  
+
   // "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",
   "search.filters.filter.objectpeople.head": "ব্যাক্তি",
-  
+
   // "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",
   "search.filters.filter.organizationAddressCountry.head": "দেশ",
-  
+
   // "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",
   "search.filters.filter.organizationAddressLocality.head": "শহর",
-  
+
   // "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",
   "search.filters.filter.organizationFoundingDate.head": "প্রতিষ্ঠার তারিখ",
-  
+
   // "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",
   "search.filters.filter.scope.head": "সুযোগ",
-  
+
   // "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",
   "search.filters.filter.show-less": "সঙ্কুচিত করুন",
-  
+
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "আরো দেখুন",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "বিষয়",
-  
+
   // "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",
   "search.filters.filter.submitter.head": "জমাকারী",
-  
+
   // "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.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "জার্নাল ইস্যু",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   "search.filters.entityType.JournalVolume": "জার্নাল ভলিউম",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "প্রাতিষ্ঠানিক একক অংশ",
-  
+
   // "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",
   "search.filters.has_content_in_original_bundle.false": "না",
-  
+
   // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "না",
-  
+
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "হ্যাঁ",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "হ্যাঁ",
-  
+
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "না",
-  
-  
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "ফিল্টার",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "ফিল্টার রিসেট করুন",
-  
+
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "জমা দিন",
-  
-  
-  
+
+
+
   // "search.form.search": "Search",
   "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",
   "search.results.head": "অনুসন্ধানের ফলাফল",
-  
+
   // "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",
   "search.results.no-results-link": "এর চারপাশে উদ্ধৃতি",
-  
+
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "আপনার অনুসন্ধানের কোন ফলাফল পাওয়া যাই নি",
-  
-  
+
+
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "অনুসন্ধানের ফলাফল",
-  
-  
+
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "ফলাফলে ফিরে যান",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "ফিল্টারগুলো",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "খোঁজার যন্ত্র",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "ফলাফল",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "প্রতি পৃষ্ঠায় ফলাফল",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "ক্রমানুসার",
-  
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "সেটিংস",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "বিস্তারিত দেখাও",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "গ্রিড হিসাবে দেখান",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "তালিকা হিসাবে দেখান",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "উর্দ্ধক্রমানুসারে",
-  
+
   // "sorting.DESC": "Descending",
   "sorting.DESC": "নিম্নক্রমানুসারে",
-  
+
   // "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": "সর্বশেষ সংশোধিত নিম্নক্রমানুসারে.",
-  
-  
+
+
   // "statistics.title": "Statistics",
   "statistics.title": "পরিসংখ্যান",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "{{scope}} এর জন্য পরিসংখ্যান",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "পরিসংখ্যান",
-  
+
   // "statistics.page.no-data": "No data available",
   "statistics.page.no-data": "কোন তথ্য নেই",
-  
+
   // "statistics.table.no-data": "No data available",
   "statistics.table.no-data": "কোন তথ্য নেই",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   "statistics.table.title.TotalVisits": "মোট পরিদর্শন",
-  
+
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "প্রতি মাসে মোট পরিদর্শন",
-  
+
   // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "ফাইল পরিদর্শন",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   "statistics.table.title.TopCountries": "শীর্ষ দেশ পরিদর্শন",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   "statistics.table.title.TopCities": "শীর্ষ শহর পরিদর্শন",
-  
+
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "পরিদর্শন",
-  
-  
-  
+
+
+
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "সম্পাদনা সম্পাদনা করুন",
-  
+
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "জমা সম্পাদনা করুন",
-  
+
   // "submission.general.cancel": "Cancel",
   "submission.general.cancel": "বাতিল করুন",
-  
+
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "আপনার নতুন জমা দেওয়ার বিশেষাধিকার নেই।",
-  
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "আমানত.",
-  
+
   // "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?",
   "submission.general.discard.confirm.info": "এই অপারেশন পূর্বাবস্থায় ফেরানো যাবে না। তুমি কি নিশ্চিত?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "হ্যা, আমি নিশ্চিত",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   "submission.general.discard.confirm.title": "জমা বাতিল করুন",
-  
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "বাতিল করা",
-  
+
   // "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",
   "submission.general.save": "সংরক্ষণ করুন",
-  
+
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "পরে জন্য সংরক্ষণ করুন",
-  
-  
+
+
   // "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",
   "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": "একটি বহিরাগত উৎস থেকে একটি জার্নাল ইস্যু আমদানি করুন",
-  
+
   // "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.",
   "submission.import-external.page.hint": "ডিস্পেস এ আমদানি করার জন্য ওয়েব থেকে আইটেমগুলি খুঁজে পেতে উপরের একটি প্রশ্নের উপরে প্রবেশ করুন।",
-  
+
   // "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",
   "submission.import-external.search.placeholder": "বাহ্যিক উৎস অনুসন্ধান করুন",
-  
+
   // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "অনুসন্ধান করুন",
-  
+
   // "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",
   "submission.import-external.search.source.hint": "একটি বহিরাগত উৎস বাছাই করুন",
-  
+
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "লোড হচ্ছে ...",
-  
+
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "SHERPA জার্নাল",
-  
+
   // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
   "submission.import-external.source.sherpaJournalIssn": "SHERPA জার্নাল দ্বারা ISSN",
-  
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "SHERPA পাবলিশার্স",
-  
+
   // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
   "submission.import-external.source.openAIREFunding": "OpenAIRE এ পি আই (API) কে আর্থিক ভাবে সাহায্য",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "Orcid.",
-  
+
   // "submission.import-external.source.pubmed": "Pubmed",
   "submission.import-external.source.pubmed": "PubMed.",
-  
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "লাইব্রেরি অব কংগ্রেসের নামগুলো",
-  
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "আইটেম পূর্বরূপ",
-  
+
   // "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",
   "submission.import-external.preview.button.import": "জমাদেয়া শুরু করুন",
-  
+
   // "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.",
   "submission.import-external.preview.error.import.body": "বহিরাগত উৎস থেকে এন্ট্রি আমদানি প্রক্রিয়ার সময় একটি ত্রুটি ঘটেছে।",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.external-source.added": "সফলভাবে নির্বাচন স্থানীয় এন্ট্রি যোগ করা হয়েছে",
-  
+
   // "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",
   "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",
   "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",
   "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-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 এ পি আই (API) কে আর্থিক ভাবে সাহায্য করা",
-  
+
   // "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",
   "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",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "সফলভাবে আমদানি করা হয়েছে এবং নির্বাচনে বহিরাগত লেখক যোগ করা হয়েছে",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "একটি নতুন স্থানীয় কর্তৃপক্ষ এন্ট্রি হিসাবে আমদানি করুন",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "নতুন এন্ট্রি আমদানি করতে একটি সংগ্রহ নির্বাচন করুন",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities(সত্তা)",
-  
+
   // "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",
   "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",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID থেকে আমদানি করুন",
-  
+
   // "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",
   "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",
   "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",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "arXiv থেকে আমদানি করুন",
-  
+
   // "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",
   "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",
   "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",
   "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",
   "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",
   "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",
   "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",
   "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",
   "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",
   "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:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "একটি স্থানীয় মিল নির্বাচন করুন:",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "পাতা অনির্বাচিত করুন",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "অনুসন্ধান কুয়েরি",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "সব নির্বাচন করুন",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selected": "নির্বাচিত {{size}} আইটেমগুলো",
-  
+
   // "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "স্থানীয় জার্নাল ({{count}})",
   // "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "স্থানীয় প্রকাশনা ({count}})",
-  
+
   // "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 }})",
   "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 }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "স্থানীয় তথ্য ফাইল ({{count}})",
-  
+
   // "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 }})",
   "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 }})",
   "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 }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "স্থানীয় জার্নাল ভলিউম ({{count}})",
-  
+
   // "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "শেরপা পাবলিশার্স ({{count}})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "এলসি নাম ({{count}})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ 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.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.isFundingAgencyOfPublication": "তহবিল সংস্থাগুলোর জন্য অনুসন্ধান করুন",
-  
+
   // "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",
   "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 এ পি আই (API) কে আর্থিক ভাবে সাহায্য করা",
-  
+
   // "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.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "OpenAIRE এ পি আই (API) কে আর্থিক ভাবে সাহায্য করা",
-  
+
   // "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 }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "বর্তমান নির্বাচন ({{count}})",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "জার্নাল সমস্যা",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "জার্নাল ভলিউম",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "জার্নাল",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "লেখক",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "তহবিল সংস্থা",
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "প্রকল্প",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
   "submission.sections.describe.relationship-lookup.title.Publication": "প্রকাশনা",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
   "submission.sections.describe.relationship-lookup.title.Person": "লেখক",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.title.DataPackage": "তথ্য প্যাকেজ",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "তহবিল সংস্থা",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "অভিভাবক সাংগঠনিক ইউনিট",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "সেটিংস",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "নির্বাচিত লেখক",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "নির্বাচিত জার্নাল ভলিউম",
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "নির্বাচিত প্রকাশনা",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "নির্বাচিত সাংগঠনিক ইউনিট",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "নির্বাচিত তথ্য ফাইল",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "নির্বাচিত সমস্যা",
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "নির্বাচিত তহবিল সংস্থা",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "নির্বাচিত সমস্যা",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "অনুসন্ধানের ফলাফল",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "অনুসন্ধানের ফলাফল",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "অনুসন্ধানের ফলাফল",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "অনুসন্ধানের ফলাফল",
-  
-  // "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": "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": "আপনি এই ব্যক্তির জন্য একটি নাম বৈকল্পিক \"{{ value }}\" হিসাবে সংরক্ষণ করতে চান তাই আপনি এবং অন্যদের ভবিষ্যতের জমা দেওয়ার জন্য এটি পুনঃব্যবহার করতে পারেন? আপনি যদি আপনি এই জমা দেওয়ার জন্য এখনও এটি ব্যবহার করতে পারেন না।",
-  
+
   // "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",
   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "এই জমা জন্য শুধুমাত্র ব্যবহার করুন",
-  
+
   // "submission.sections.ccLicense.type": "License Type",
   "submission.sections.ccLicense.type": "লাইসেন্সের ধরন",
-  
+
   // "submission.sections.ccLicense.select": "Select a license type…",
   "submission.sections.ccLicense.select": "একটি লাইসেন্সের ধরন নির্বাচন করুন ...",
-  
+
   // "submission.sections.ccLicense.change": "Change your license type…",
   "submission.sections.ccLicense.change": "আপনার লাইসেন্সের ধরন পরিবর্তন করুন ...",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   "submission.sections.ccLicense.none": "কোন লাইসেন্স পাওয়া যাই নি",
-  
+
   // "submission.sections.ccLicense.option.select": "Select an option…",
   "submission.sections.ccLicense.option.select": "যেকোনো একটি নির্বাচন করুন…",
-  
+
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
   "submission.sections.ccLicense.link": "আপনি নিম্নলিখিত লাইসেন্স নির্বাচন করেছেন:",
-  
+
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "আমি উপরের লাইসেন্স অনুমোদন করেছি",
-  
+
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "আরো যোগ করো",
-  
+
   // "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.",
   "submission.sections.general.deposit_error_notice": "আইটেমটি জমা দেওয়ার সময় একটি সমস্যা ছিল, দয়া করে পরে আবার চেষ্টা করুন।",
-  
+
   // "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.",
   "submission.sections.general.discard_error_notice": "আইটেমটি বাতিল করার সময় একটি সমস্যা ছিল দয়া করে পরে আবার চেষ্টা করুন।",
-  
+
   // "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.",
   "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.",
   "submission.sections.general.metadata-extracted-new-section": "নতুন <strong>{{sectionId}}</strong> বিভাগটি জমা দেওয়ার জন্য যুক্ত করা হয়েছে।",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "কোন সংগ্রহ পাওয়া যায় নি",
-  
+
   // "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.",
   "submission.sections.general.save_error_notice": "আইটেমটি সংরক্ষণ করার সময় একটি সমস্যা ছিল, দয়া করে পরে আবার চেষ্টা করুন।",
-  
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "নথি সফলভাবে সংরক্ষিত।",
-  
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "একটি সংগ্রহের জন্য অনুসন্ধান করুন",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "অসম্পূর্ণ বিভাগ আছে।",
-  
-  
-  
+
+
+
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "আইটেম অ্যাক্সেসের শর্তাবলী",
-  
+
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "ক্রিয়েটিভ কমন্স লাইসেন্স",
-  
+
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "পুনরাই ব্যবহারযোগ্য করুন",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "বর্ণনা করুন",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "বর্ণনা করুন",
-  
+
   // "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.detect-duplicate": "সম্ভাব্য ডুপ্লিকেট",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "আমানত লাইসেন্স",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "ফাইল আপলোড",
-  
-  
-  
+
+
+
   // "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.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.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?",
   "submission.sections.upload.delete.confirm.info": "এই অপারেশন পূর্বাবস্থায় ফেরানো যাবে না। তুমি কি নিশ্চিত?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "হ্যা, আমি নিশ্চিত",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "বিটস্ট্রিম মুছুন",
-  
+
   // "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",
   "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",
   "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.",
   "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",
   "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",
   "submission.sections.upload.form.from-placeholder": "থেকে",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "গ্রুপ",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "গ্রুপ প্রয়োজন।",
-  
+
   // "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",
   "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):",
   "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):",
   "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 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": "এখানে আপনি বর্তমানে আইটেমটিতে সমস্ত ফাইল পাবেন। আপনি ফাইল মেটাডেটা এবং অ্যাক্সেস শর্তাদি আপডেট করতে পারেন অথবা <strong> অতিরিক্ত ফাইল আপলোড করুন - পৃষ্ঠাটিতে সর্বত্র ড্র্যাগ করুন এবং ড্রপ করুন </strong>",
-  
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "না",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "কোন ফাইল এখনো আপলোড হয়নি।",
-  
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "মেটাডেটা সংরক্ষণ করুন",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "বাতিল করুন",
-  
+
   // "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": "চেক যখন এই আইটেমটি অনুসন্ধান / ব্রাউজ আবিষ্কারযোগ্য হবে। আইটেমটি unchecked যখন শুধুমাত্র সরাসরি লিঙ্কের মাধ্যমে উপলব্ধ হবে এবং অনুসন্ধান / ব্রাউজ প্রদর্শিত হবে না।",
-  
+
   // "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.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "নতুন নথি/জমা",
-  
+
   // "submission.submit.title": "New submission",
   "submission.submit.title": "নতুন নথি/জমা",
-  
-  
-  
+
+
+
   // "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.",
   "submission.workflow.generic.delete-help": "আপনি এই আইটেমটি বাতিল করতে চান \"মুছে ফেলুন\"। তারপর আপনি এটি নিশ্চিত করতে বলা হবে।",
-  
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "সম্পাদনা করুন",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
   "submission.workflow.generic.edit-help": "আইটেমটির মেটাডেটা পরিবর্তন করার জন্য এই বিকল্পটি নির্বাচন করুন।",
-  
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "দেখুন",
-  
+
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "আইটেমটির মেটাডাটা দেখতে এই বিকল্পটি নির্বাচন করুন।",
-  
-  
-  
+
+
+
   // "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\".",
   "submission.workflow.tasks.claimed.approve_help": "আপনি যদি আইটেমটি পর্যালোচনা করেছেন এবং এটি সংগ্রহের অন্তর্ভুক্তির জন্য উপযুক্ত। \"অনুমোদন\" নির্বাচন করুন।",
-  
+
   // "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.",
   "submission.workflow.tasks.claimed.edit_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": "অনুগ্রহ করে নীচের বাক্সে জমা দেওয়ার প্রত্যাখ্যান করার জন্য আপনার কারণটি প্রবেশ করান কিনা তা নির্দেশ করে যে জমাটি একটি সমস্যা সমাধান করতে পারে এবং পুনরায় জমা দিতে পারে কিনা তা নির্দেশ করে।",
-  
+
   // "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",
   "submission.workflow.tasks.claimed.reject.reason.submit": "আইটেম প্রত্যাখ্যান করুন",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "কারণ",
-  
+
   // "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.",
   "submission.workflow.tasks.claimed.reject_help": "যদি আপনি আইটেমটি পর্যালোচনা করেছেন এবং এটি খুঁজে পেয়েছেন এটি <strong> না </strong> সংগ্রহের অন্তর্ভুক্তির জন্য উপযুক্ত \"প্রত্যাখ্যান\"। তারপর আপনাকে একটি বার্তা প্রবেশ করতে বলা হবে যে আইটেমটি অনুপযুক্ত কেন এবং জমা দেওয়ার কিছু পরিবর্তন এবং পুনরায় জমা দিতে হবে কিনা।",
-  
+
   // "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.",
   "submission.workflow.tasks.claimed.return_help": "পুলে টাস্কটি ফেরত দিন যাতে অন্য ব্যবহারকারীটি কাজটি সম্পাদন করতে পারে।",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "অপারেশন চলাকালীন ত্রুটি ঘটেছে ...",
-  
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "প্রক্রিয়াকরণ ...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   "submission.workflow.tasks.generic.submitter": "জমাদানকারী",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "কাজটি সফল হয়েছে",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "দাবি",
-  
+
   // "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",
   "submission.workflow.tasks.pool.hide-detail": "বিস্তারিত লুকান",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "বিস্তারিত দেখাও",
-  
-  
-  
+
+
+
   // "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",
   "title": "ডিস্পেস",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "শ্রেণীবিন্যাস ট্রি ভিউ",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "আর লোড করুন",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "রিসেট",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "অনুসন্ধান করুন",
-  
+
   // "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",
   "vocabulary-treeview.tree.description.nsi": "নরওয়েজিয়ান বিজ্ঞান সূচক",
-  
+
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "গবেষণা বিষয় বিভাগ",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   "uploader.browse": "ব্রাউজ করুন",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "এখানে আপনার ফাইল ড্র্যাগ এবং ড্রপ করুন",
-  
+
   // "uploader.delete.btn-title": "Delete",
   "uploader.delete.btn-title": "মুছুন",
-  
+
   // "uploader.or": ", or ",
   "uploader.or": "অথবা",
-  
+
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
   "uploader.processing": "প্রক্রিয়াকরণ",
-  
+
   // "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",
   "virtual-metadata.delete-item.info": "আপনি প্রকৃত মেটাডাটা হিসাবে ভার্চুয়াল মেটাডাটা সংরক্ষণ করতে চান এমন ধরনের নির্বাচন করুন",
-  
+
   // "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",
   "virtual-metadata.delete-relationship.modal-head": "রিয়েল মেটাডেটা হিসাবে আপনি ভার্চুয়াল মেটাডেটা সংরক্ষণ করতে চান এমন আইটেমগুলি নির্বাচন করুন",
-  
-  
-  
+
+
+
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "আপনার জমা দেয়া নথি",
-  
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "প্রশাসনিক কর্মধারা",
-  
+
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.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",
   "workflow-item.delete.notification.success.title": "মুছে ফেলা হয়েছে",
-  
+
   // "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",
   "workflow-item.delete.notification.error.title": "কিছু ভুল হয়েছে",
-  
+
   // "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",
   "workflow-item.delete.title": "ওয়ার্কফ্লো আইটেম মুছে দিন",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   "workflow-item.delete.header": "ওয়ার্কফ্লো আইটেম মুছে দিন",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "বাতিল করুন",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "মুছে ফেলা",
-  
-  
+
+
   // "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",
   "workflow-item.send-back.notification.success.content": "এই ওয়ার্কফ্লো আইটেম সফলভাবে জমাকারী ফিরে পাঠানো হয়েছে",
-  
+
   // "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",
   "workflow-item.send-back.notification.error.content": "ওয়ার্কফ্লো আইটেম জমাদানকারির কাছে ফেরত পাঠানো যাই নি",
-  
+
   // "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",
   "workflow-item.send-back.header": "ওয়ার্কফ্লো আইটেম জমাদানকারির কাছে ফেরত পাঠান",
-  
+
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "বাতিল করুন",
-  
+
   // "workflow-item.send-back.button.confirm": "Send back",
   "workflow-item.send-back.button.confirm": "ফেরত পাঠাও",
-  
+
   // "workflow-item.view.breadcrumbs": "Workflow View",
   "workflow-item.view.breadcrumbs": "ওয়ার্কফ্লো ভিউ",
-  
-  
+
+
   // "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": "সেশন প্রসারিত করুন"
-  
 
-}
\ No newline at end of file
+  // "idle-modal.extend-session": "Extend session"
+  "idle-modal.extend-session": "সেশন প্রসারিত করুন",
+
+
+}
diff --git a/src/assets/i18n/ca.json5 b/src/assets/i18n/ca.json5
new file mode 100644
index 0000000000..6fefff87dc
--- /dev/null
+++ b/src/assets/i18n/ca.json5
@@ -0,0 +1,7577 @@
+{
+
+  // "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": "No està autoritzat a accedir a aquesta pàgina. Podeu utilitzar el botó de sota per tornar a la pàgina inicial.",
+
+  // "401.link.home-page": "Take me to the home page",
+  "401.link.home-page": "Porta'm a la pàgina d'inici",
+
+  // "401.unauthorized": "unauthorized",
+  "401.unauthorized": "no autoritzat",
+
+
+
+  // "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 teniu permisos per accedir a aquesta pàgina. Podeu utilitzar el botó de sota per tornar a la pàgina inicial.",
+
+  // "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Porta'm a la pàgina d'inici",
+
+  // "403.forbidden": "forbidden",
+  "403.forbidden": "prohibit",
+
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Servei no disponible",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "No es pot atendre la vostra petició a causa de problemes de capacitat o manteniments programats del servidor. Intenteu-ho més endavant, si us plau.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Porta'm a la pàgina d'inici",
+
+
+  // "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 podem trobar la pàgina que busqueu. La pàgina pot haver estat moguda o eliminada. Podeu utilitzar el botó de sota per tornar a la pàgina d'inici. ",
+
+  // "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "Porta'm a la pàgina d'inici",
+
+  // "404.page-not-found": "page not found",
+  "404.page-not-found": "pàgina no trobada",
+
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401": "no autoritzat",
+
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403": "prohibit",
+
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Servei no disponible",
+
+  // "error-page.description.404": "page not found",
+  "error-page.description.404": "pàgina no trobada",
+
+  // "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": "S'ha produït un error al login via ORCID. Assegureu-vos que heu compartit el correu electrònic del vostre compte ORCID amb Dspace. Si l'error continua, contacteu amb l'administrador",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargament",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Només Metadades",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Accés Obert",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Restringit",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Desconegut",
+
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Tasques de curació del sistema",
+
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Tasques de curació del sistema",
+
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Tasques de curació del sistema",
+
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Registre de formats",
+
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Format del fitxer",
+
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "S'ha produït un error en crear el nou format de fitxer.",
+
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Fallada",
+
+  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Crear format de fitxer",
+
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Afegir un nou format de fitxer",
+
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "El format de fitxer nou s'ha crear correctament.",
+
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Èxit",
+
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Error en eliminar {{ amount }} format(s)",
+
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Fallada",
+
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "S'han eliminat correctament {{ amount }} format(s)",
+
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Èxit",
+
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "Aquesta llista de formats de fitxer proporciona informació sobre formats coneguts i el nivell de suport.",
+
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Format del fitxer",
+
+  // "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+
+  // "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Descripció",
+
+  // "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": "Les extensions fan referència a les extensions de fitxers que s'utilitzen per identificar automàticament el format dels fitxers carregats. Podeu introduir vàries extensions per a cada format.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Extensions de fitxer",
+
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Introduïu una extensió de fitxer (sense el punt)",
+
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "S'ha produït un error en editar el format del fitxer.",
+
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Fallada",
+
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Format del fitxer: {{ 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": "Els formats marcats com a interns estan ocults a l'usuari i s'utilitzen amb finalitats administratives.",
+
+  // "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.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "El tipus MIME associat amb aquest format no ha de ser únic.",
+
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Tipus MIME",
+
+  // "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": "Un nom únic per a aquest format, (per exemple, Microsoft Word XP o Microsoft Word 2000)",
+
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Nom",
+
+  // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
+  "admin.registries.bitstream-formats.edit.success.content": "El format del fitxer s'ha editat correctament.",
+
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Èxit",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivell de suport que la seva institució promet per a aquest format.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivell de suport",
+
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "Registre de formats de fitxer",
+
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "No hi ha formats de fitxer a mostrar.",
+
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Eliminar seleccionat",
+
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Deseleccionar tot",
+
+  // "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "intern",
+
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Tipus MIME",
+
+  // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Nom",
+  // "admin.registries.bitstream-formats.table.id" : "ID",
+  "admin.registries.bitstream-formats.table.id": "ID",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "Enrere",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conegut",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Suportat",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Desconegut",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Nivell de suport",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Registre de format Fitxer",
+
+
+
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "Registre de metadades",
+
+  // "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": "El registre de metadades manté una llista de tots els camps de metadades disponibles al dipòsit. Aquests camps poden estar dividits entre múltiples esquemes. No obstant això, DSpace requereix l'esquema qualificat de Dublin Core.",
+
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Crear esquema de metadades",
+
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Editar esquema de metadades",
+
+  // "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Nom",
+
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "Espai de noms",
+
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "Registre de metadades",
+
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "No hi ha esquemes de metadades per mostrar.",
+
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionat",
+
+  // "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "ID",
+
+  // "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "Nom",
+
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "Espai de noms",
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Registre de metadades",
+
+
+
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "Esquema de metadades",
+
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "Aquest és l'esquema de metadades per a \"{{ namespace }}\".",
+
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "Camps de metadades de l'esquema",
+
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "No hi ha camps de metadades per mostrar.",
+
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Elimina seleccionat",
+
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "Camp",
+  // "admin.registries.schema.fields.table.id" : "ID",
+  "admin.registries.schema.fields.table.id": "ID",
+
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "Nota d'abast",
+
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Crear camp de metadades",
+
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Editar camp de metadades",
+
+  // "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Element",
+
+  // "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Qualificador",
+
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Nota d'abast",
+
+  // "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "Esquema de metadades",
+
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "Esquema de metadades creat correctament \"{{ prefix }}\"",
+
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "Error en eliminar {{ amount }} esquemes de metadades",
+
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "{{ amount }} esquemes de metadades eliminats correctament",
+
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Esquema de metadades editat correctament \"{{ prefix }}\"",
+
+  // "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Error",
+
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "Camp de metadades creat correctament \"{{ field }}\"",
+
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "No s'han pogut esborrar {{ amount }} camps de metadades",
+
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "{{ amount }} camps de metadades eliminats correctament",
+
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "Camp de metadades editat correctament \"{{ field }}\"",
+
+  // "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "Èxit",
+
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "Enrere",
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Registre d'esquemes de metadades",
+
+
+
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "Eliminar usuari",
+
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Fer-se passar per usuari",
+
+  // "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Restablir la contrasenya",
+
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "Deixa de fer-se passar per usuari",
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Usuaris",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Usuaris",
+
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Usuaris",
+
+  // "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Cerca",
+
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "Examinar tot",
+
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "Metadades",
+
+  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "Correu electrònic (exacte)",
+
+  // "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Cerca",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Cerca usuaris...",
+
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Afegir un usuari",
+
+  // "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "ID",
+
+  // "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "Nom",
+
+  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "Correu electrònic (exacte)",
+
+  // "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Editar",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Editar \"{{ 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": "No teniu autorització per editar aquest grup.",
+
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }}\"",
+
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "No hi ha usuaris per mostrar.",
+
+  // "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Crear un usuari",
+
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Editar usuari",
+
+  // "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Nom",
+
+  // "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Cognoms",
+
+  // "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Correu electrònic",
+
+  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Ha de ser una adreça de correu electrònic vàlida",
+
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Pot iniciar sessió",
+
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Requereix certificat",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Enrere",
+
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "Usuari \"{{ name }}\" creat correctament",
+
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Error en crear usuari \"{{ name }}\"",
+
+  // "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": "Error creant usuari \"{{ name }}\", el correu electrònic \"{{ email }}\" ja està en ús.",
+
+  // "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": "Error editant usuari \"{{ name }}\", el correu electrònic \"{{ email }}\" ja està en ús.",
+
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "Usuari \"{{ name }}\" editat correctament",
+
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Error editant usuari \"{{ name }}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Usuari \"{{ name }}\" eliminat correctament",
+
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "No s'ha pogut esborrar l'usuari \"{{ name }}\"",
+
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membre d'aquests grups:",
+
+  // "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "ID",
+
+  // "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "Nom",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Col·lecció/Comunitat",
+
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Aquest usuari no és membre de cap grup",
+
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Afegir a grups",
+
+  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "No s'ha pogut esborrar l'usuari: \"{{ name }}\"",
+
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Usuari eliminat correctament: \"{{ name }}\"",
+
+
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Grups",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Grups",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Editar grup",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Editar grup",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Nou grup",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nou grup",
+
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Grups",
+
+  // "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Afegir grup",
+
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Cerca grups",
+
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Examinar-ho tot",
+
+  // "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Cerca",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Cerca grups...",
+
+  // "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": "Nom",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Col·lecció/Comunitat",
+
+  // "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Membres",
+
+  // "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Editar",
+
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "Editar \"{{ name }}\"",
+
+  // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Eliminar \"{{ 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": "No s'han trobat grups cercant al camp nom o al camp UUID",
+
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "El grup \"{{ name }}\" s'ha eliminat correctament",
+
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "No s'ha pogut esborrar el grup \"{{ name }}\"",
+
+  // "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": "Aquest grup és permanent, per la qual cosa no es pot editar ni eliminar. Però podeu afegir i eliminar membres del grup utilitzant aquesta pàgina.",
+
+  // "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": "Aquest grup no pot ser modificat o eliminat perquè correspon a un rol en el procés d'entrada i revisió d'enviaments a {{ comcol }} \"{{ name }}\". Podeu eliminar-lo des de la pestanya <a href='{{comcolEditRolesRoute}}'>\" assignar rols\"</a> de la pàgina d'edició de la {{ comcol }}. Sí que podeu afegir i eliminar membres del grup utilitzant aquesta pàgina.",
+
+  // "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "Crear un grup",
+
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "Editar grup",
+
+  // "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Nom del grup",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Comunitat o Col·lecció",
+
+  // "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "Descripció",
+
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Grup creat amb èxit \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "No s'ha pogut crear el grup \"{{ 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.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "No s'ha pogut crear el grup amb el nom: \"{{ name }}\", assegureu-vos que el nom no estigui en ús.",
+
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "No s'ha pogut editar el grup \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "El nom \"{{ name }}\" ja està en ús!",
+
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "Grup \"{{ name }}\" editat correctament",
+
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Eliminar grup",
+
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Eliminar grup \"{{ dsoName }}\"",
+
+  // "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": "Esteu segur que voleu suprimir el grup \"{{ dsoName }}\"?",
+
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel·lar",
+
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Esborrar",
+
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "El grup \"{{ name }}\" s'ha eliminat correctament",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "No s'ha pogut esborrar el grup \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
+
+  // "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "Usuaris",
+
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Afegir usuaris",
+
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Examinar tot",
+
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "Membres actuals",
+
+  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadades",
+
+  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.search.scope.email": "Correu electrònic (exacte)",
+
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Cerca",
+
+  // "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+
+  // "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "Nom",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identitat",
+
+  // "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.email": "Correu electrònic",
+
+  // "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",
+  "admin.access-control.groups.form.members-list.table.edit": "Eliminar / Afegir",
+
+  // "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": "Eliminar membre amb nom \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Membre afegit amb èxit: \"{{ name }}\"",
+
+  // "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": "No s'ha pogut afegir el membre: \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Membre eliminat correctament: \"{{ name }}\"",
+
+  // "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": "No s'ha pogut suprimir el membre: \"{{ name }}\"",
+
+  // "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": "Afegir membre amb nom \"{{ name }}\"",
+
+  // "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": "No hi ha un grup actiu actual, envieu primer un nom.",
+
+  // "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": "Encara no hi ha membres al grup, cerqueu i afegiu.",
+
+  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "No s'han trobat usuaris en aquesta cerca",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Alguna cosa ha sortir malament: \"{{ cause }}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "Grups",
+
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Afegir subgrup",
+
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Examinar tot",
+
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Subgrups actuals",
+
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Cerca",
+
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Nom",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Col·lecció/Comunitat",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Eliminar / Afegir",
+
+  // "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": "Eliminar subgrup amb nom \"{{ name }}\"",
+
+  // "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.buttons.add": "Afegir subgrup amb el nom \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grup actual",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrup afegit correctament: \"{{ name }}\"",
+
+  // "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": "No s'ha pogut afegir el subgrup: \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrup eliminat correctament: \"{{ name }}\"",
+
+  // "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": "No s'ha pogut suprimir el subgrup: \"{{ name }}\"",
+
+  // "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": "No hi ha un grup actiu actual, envieu un nom primer.",
+
+  // "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": "Aquest és el grup actual, no es pot afegir.",
+
+  // "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": "No s'han trobat grups amb aquest text al nom o al 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": "Encara no hi ha subgrups al grup.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "Enrere",
+
+
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
+  "admin.search.breadcrumbs": "Cerca administrativa",
+
+  // "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Editar",
+
+  // "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Editar",
+
+  // "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Esborrar",
+
+  // "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Editar",
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "Fer-ho privat",
+
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "Fer-ho públic",
+
+  // "admin.search.item.move": "Move",
+  "admin.search.item.move": "Moure",
+
+  // "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Reintegrar",
+
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Retira",
+
+  // "admin.search.title": "Administrative Search",
+  "admin.search.title": "Cerca administrativa",
+
+  // "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Cerca administrativa",
+
+
+
+
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Administrar flux de treball",
+
+  // "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Administrar flux de treball",
+
+  // "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "Flux de treball",
+
+  // "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Esborrar",
+
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Tornar",
+
+
+
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Importa metadades",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importació per lots",
+
+  // "admin.metadata-import.title": "Import Metadata",
+  "admin.metadata-import.title": "Importar metadades",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importació per lots",
+
+  // "admin.metadata-import.page.header": "Import Metadata",
+  "admin.metadata-import.page.header": "Importa metadades",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importació per 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": "Podeu deixar anar o examinar fitxers CSV que contenen operacions de metadades per lots aquí",
+
+  // "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": "Seleccioneu la Col·lecció a la qual importar. Després, deixeu anar o busqueu el fitxer zip en format Simple Archive Format (SAF) que inclou els ítems a importar",
+
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+  "admin.metadata-import.page.dropMsg": "Deixeu anar un CSV de metadades per importar",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Deixeu anar un ZIP per lots per importar",
+
+  // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
+  "admin.metadata-import.page.dropMsgReplace": "Deixa anar per reemplaçar el CSV de metadades a importar",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Deixa anar per reemplaçar el ZIP per lots a importar",
+
+  // "admin.metadata-import.page.button.return": "Back",
+  "admin.metadata-import.page.button.return": "Enrere",
+
+  // "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": "Selecciona la Col·lecció",
+
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+  "admin.metadata-import.page.error.addFile": "Seleccioneu el fitxer primer!",
+
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Seleccioneu el fitxer ZIP primer!",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Només Validar",
+
+  // "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": "En seleccionar, es validarà el CSV pujat. Rebreu un informe amb els canvis detectats, però no s'efectuaran aquests canvis.",
+
+  // "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": "En seleccionar, es validarà el fitxer ZIP pujat. Rebreu un informe amb els canvis detectats, però no s'efectuaran aquests canvis.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "eliminar",
+
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "Adreça de correu electrònic o contrasenya no vàlids.",
+
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "La vostra sessió ha caducat. Inicieu sessió de nou.",
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "No s'ha pogut actualitzar el token de la sessió. Inicieu sessió de nou.",
+
+
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  "bitstream.download.page": "Descarregant {{ bitstream }}...",
+
+  // "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back": "Enrere",
+
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Editar les polítiques del fitxer",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Editar les polítiques de fitxer",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Enrere",
+
+  // "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "Arxiu: ",
+
+  // "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": "Opcionalment, proporcioneu una breu descripció del fitxer, per exemple \"<i>Article principal</i>\" o \"<i>Lectures de dades de l'experiment</i>\".",
+
+  // "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "Descripció",
+
+  // "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": "El primer dia a partir del qual es permet l'accés. <b>Aquesta data no es pot modificar en aquest formulari.</b> Per establir una data d'embargament per a un fitxer, aneu a la pestanya <i>Estat de l'ítem</i> , feu clic a <i>Autoritzacions...</i> , creeu o editeu la política <i>READ</i> del fitxer i configureu la <i>Data d'inici</i> com vulgueu.",
+
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "bitstream.edit.form.embargo.label": "Embargament fins a data concreta",
+
+  // "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": "Canvieu el nom del fitxer. Tingueu en compte que això canviarà l'URL de visualització del fitxer, però els enllaços antics continuaran resolent-se sempre que la ID de seqüència no canviï.",
+
+  // "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Nom del fitxer",
+
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "Descriu el nou format",
+
+  // "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": "L'aplicació que heu utilitzat per crear el fitxer i el número de versió (per exemple, \"<i>ACMESoft SuperApp versió 1.5</i>\").",
+
+  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "Fitxer principal",
+
+  // "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": "Si el format no és a la llista anterior, <b>seleccioneu \"el format no és a la llista\" a dalt</b> i descriviu-lo a \"Descriure el nou format\".",
+
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Format seleccionat",
+
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "El format no és a la llista",
+
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "S'ha produït un error en desar el format del fitxer.",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "Etiqueta IIIF",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Etiqueta Canvas per a aquesta imatge. Si no es proporciona, s'utilitzarà l'etiqueta per defecte.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "Índex de l'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": "Afegir text aquí crea un nou començament de l'índex.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "Amplada del marc IIIF",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "L'amplada del marc normalment hauria de coincidir amb l'amplada de la imatge.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "Alçada del marc IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "L'alçada del marc normalment hauria de coincidir amb l'alçada de la imatge",
+
+
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "S'han desat els canvis en aquest fitxer.",
+
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Fitxer desat",
+
+  // "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Editar fitxer",
+
+  // "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": "Ja teniu accés al fitxer, si voleu descarregar-lo premeu ",
+
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "aquí",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Sol·licitar una còpia del fitxer",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Introduïu la informació següent per sol·licitar una còpia del següent ítem: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Sol·licitant el fitxer següent: ",
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Sol·licitant tots els fitxers. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Nom *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Es requereix un nom",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "La vostra adreça de correu electrònic *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "S'enviarà el fitxer a aquesta adreça de correu electrònic.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Si us plau, introduïu una adreça de correu electrònic vàlida.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Fitxers",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Només el fitxer indicat",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Tots els fitxers (d'aquest ítem) en accés restringit",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Missatge",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Enrere",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Sol·licitar còpia",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "S'ha enviat la sol·licitud de còpia.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "S'ha produït un error en l'enviament de la sol·licitud de còpia.",
+
+
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Tots els resultats de la cerca",
+
+  // "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Per autor",
+
+  // "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Per data de publicació",
+
+  // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Per matèria",
+
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Per títol",
+
+  // "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Examinar",
+
+  // "browse.empty": "No items to show.",
+  "browse.empty": "No hi ha ítems per mostrar.",
+
+  // "browse.metadata.author": "Author",
+  "browse.metadata.author": "Autor",
+
+  // "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Data de publicació",
+
+  // "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Matèria",
+
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Títol",
+
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Cerca per autor",
+
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Examinar per data",
+
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Examinar per matèria",
+
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Examinar per títol",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Següent",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Anterior",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "No hi ha més pàgines de resultats",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", començant per {{ startsWith }}",
+
+  // "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Triar inici)",
+
+  // "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Triar any)",
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Trieu l'any de publicació",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Filtrar resultats per any o per mes:",
+
+  // "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "abril",
+
+  // "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "agost",
+
+  // "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "desembre",
+
+  // "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "febrer",
+
+  // "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "gener",
+
+  // "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "juliol",
+
+  // "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "juny",
+
+  // "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "març",
+
+  // "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "maig",
+
+  // "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Triar mes)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Trieu el mes de publicació",
+
+  // "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "novembre",
+
+  // "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "octubre",
+
+  // "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "setembre",
+
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "Examinar",
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Resultats per data",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "O escriviu una data (any-mes) i feu clic al botó Examinar",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Seleccioneu resultats teclejant les primeres lletres",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Examinant {{ collection }} per {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Examinant {{ collection }} per {{ field }} {{ value }}",
+
+
+  // "chips.remove": "Remove chip",
+  "chips.remove": "Treu xip",
+
+
+
+  // "collection.create.head": "Create a Collection",
+  "collection.create.head": "Crear una col·lecció",
+
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Col·lecció creada amb èxit",
+
+  // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
+  "collection.create.sub-head": "Crea una col·lecció per a la comunitat {{ parent }}",
+
+  // "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Curar col·lecció: {{ collection }}",
+
+  // "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Cancel·lar",
+
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Confirmar",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Eliminant",
+
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Eliminar col·lecció",
+
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "No s'ha pogut esborrar la col·lecció",
+
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Col·lecció eliminada correctament",
+
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "Estàs segur que vols eliminar la col·lecció \"{{ dso }}\"?",
+
+
+
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Eliminar aquesta col·lecció",
+
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Editar col·lecció",
+
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "Editar col·lecció",
+
+
+
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Mapeig d'ítems",
+
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Editar col·lecció: mapeig d'ítems",
+
+  // "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Cancel·lar",
+
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Col·lecció: \"<b>{{ name }}</b>\"",
+
+  // "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Mapeja els ítems seleccionats",
+
+  // "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": "Aquesta és l'eina de mapatge d'ítems que permet als administradors de col·leccions assignar ítems d'altres col·leccions a aquesta col·lecció. Podeu cercar ítems d'altres col·leccions i mapejar-los, o explorar la llista d'ítems mapeats.",
+
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Mapeig d'ítems: mapea ítems d'altres col·leccions",
+
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Introduïu una consulta per cercar",
+
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "S'han produït errors en l'assignació de {{ amount }} ítems.",
+
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Errors de mapatge",
+
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "{{ amount }} ítems mapejats correctament.",
+
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapeig completat",
+
+  // "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": "S'han produït errors en eliminar els mapeigs de {{ amount }} ítems.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Eliminar errors de mapatge",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "S'han eliminat correctament els mapeigs de {{ amount }} ítems.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Finalitzada l'eliminació del mapatge",
+
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Eliminar els mapeigs d'ítems seleccionats",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Cerca els ítems...",
+
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Examinar ítems mapejats",
+
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Assignar nous ítems",
+
+
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Eliminar logo",
+
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Desfer eliminació",
+
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Logotip de la col·lecció",
+
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "Error en carregar el logotip de la col·lecció. Verifiqueu el contingut abans de tornar-ho a provar.",
+
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "Pujada correcta del logotip de la col·lecció.",
+
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "Logotip eliminat",
+
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "S'ha eliminat correctament el logotip de la col·lecció.",
+
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Error en eliminar el logotip",
+
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "Deixeu anar un logotip de col·lecció per carregar-lo",
+
+
+
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Col·lecció editada amb èxit",
+
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "Enrere",
+
+
+
+  // "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ó de col·lecció - Curar",
+
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Autoritzacions",
+
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Edició de col·lecció: autoritzacions",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Carregar més paquets",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Carregar més",
+
+  // "collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Mostrar les autoritzacions dels fitxers del paquet",
+
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "Editar metadades",
+
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Edició de col·lecció: metadades",
+
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Assignar rols",
+
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Edició de col·lecció - Rols",
+
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "Aquesta col·lecció recull el contingut d'una font externa",
+
+  // "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": "Heu de proporcionar el set-ID de la col·lecció de destinació.",
+
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "Contingut que s'està recol·lectant",
+
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Configura una font externa",
+
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Format de metadades",
+
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "ID de set específic d'OAI",
+
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "Proveïdor OAI",
+
+  // "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": "Recollir metadades i fitxers (requereix suport ORE)",
+
+  // "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": "Recollir metadades i referències a fitxers (requereix suport ORE)",
+
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Recollir només metadades",
+
+  // "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "Origen del contingut",
+
+  // "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": "Els teus canvis han sigut descartats. Per recuperar-los, premeu el botó 'Desfer'",
+
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "Canvis descartats",
+
+  // "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": "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metadades invàlides",
+
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "S'han desat els canvis a la font de contingut d'aquesta col·lecció.",
+
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Font de contingut desat",
+
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "Edició de col·lecció: font de contingut",
+
+
+
+  // "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Afegir",
+
+  // "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Plantilla d'ítem",
+
+  // "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "Cancel·lar",
+
+  // "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Esborrar",
+
+  // "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Editar",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "S'ha produït un error en recuperar la plantilla de l'ítem.",
+
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Editar plantilla de l'ítem per a la col·lecció \"{{ collection }}\"",
+
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Plantilla d'ítem",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Carregant plantilla d'ítem...",
+
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "No s'ha pogut suprimir la plantilla d'ítem.",
+
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "S'ha eliminat correctament la plantilla d'ítem.",
+
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "Editar plantilla d'ítem",
+
+
+
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Breu descripció",
+
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Text introductori (HTML)",
+
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Introduïu un nom de col·lecció",
+
+  // "collection.form.license": "License",
+  "collection.form.license": "Llicència",
+
+  // "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Procedència",
+
+  // "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Text de copyright (HTML)",
+
+  // "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Notícies (HTML)",
+
+  // "collection.form.title": "Name",
+  "collection.form.title": "Nom",
+
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Tipus d'Entitat",
+
+
+
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "Col·lecció",
+
+
+
+  // "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head": "Enviaments recents",
+
+  // "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.recent.empty": "No hi ha elements per mostrar",
+
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "Editar aquesta col·lecció",
+
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI permanent per a aquesta col·lecció",
+
+  // "collection.page.license": "License",
+  "collection.page.license": "Llicència",
+
+  // "collection.page.news": "News",
+  "collection.page.news": "Notícies",
+
+
+
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Confirmar selecció",
+
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "No hi ha col·leccions per mostrar",
+
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "Títol",
+
+
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Controls de recol·lecció",
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Hi ha hagut errors en realitzar les proves de comprovació de la configuració",
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "La prova de la configuració ha fallat",
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "L'script de prova de la configuració s'ha acabat correctament",
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Proveu la configuració",
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Provant la configuració...",
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "La importació ha començat correctament",
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Hi ha hagut alguna errada en iniciar la importació",
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importa ara",
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Important...",
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "S'ha produït un error durant la importació",
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "La importació ha finalitzat",
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "La restauració i reimportació ha començat correctament",
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "S'ha produït un error en iniciar la restauració i reimportació",
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "S'ha produït un error en la restauració i reimportació",
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Restauració i reimportació finalitzades",
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Restauració i reimportació",
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Restaurant i reimportant...",
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Estat de la Recol·lecció:",
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Inici de la recol·lecció:",
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.last": "Data de la darrera recol·lecció:",
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Informació de recol·lecció:",
+  // "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ó proporcionada s'ha provat i no ha funcionat.",
+
+  // "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Error del servidor",
+
+
+
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Llista de comunitats",
+
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Llista de comunitats",
+
+  // "communityList.title": "List of Communities",
+  "communityList.title": "Llista de comunitats",
+
+  // "communityList.showMore": "Show More",
+  "communityList.showMore": "Mostrar més",
+
+
+
+  // "community.create.head": "Create a Community",
+  "community.create.head": "Crear una comunitat",
+
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Comunitat creada amb èxit",
+
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Crear una subcomunitat per a la comunitat {{ parent }}",
+
+  // "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Curar comunitat: {{ community }}",
+
+  // "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Cancel·lar",
+
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Confirmar",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Eliminant...",
+
+  // "community.delete.head": "Delete Community",
+  "community.delete.head": "Eliminar comunitat",
+
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "No s'ha pogut eliminar la comunitat",
+
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Comunitat eliminada amb èxit",
+
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "Esteu segur que voleu suprimir la comunitat \"{{ dso }}\"?",
+
+  // "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Eliminar aquesta comunitat",
+
+  // "community.edit.head": "Edit Community",
+  "community.edit.head": "Editar comunitat",
+
+  // "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Editar comunitat",
+
+
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Eliminar logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Desfer eliminació",
+
+  // "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "Logotip de la comunitat",
+
+  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Error en carregar el logotip de la comunitat. Verifiqueu el contingut abans de tornar-ho a provar.",
+
+  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Logotip de la comunitat pujat correctament.",
+
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logotip eliminat",
+
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "S'ha eliminat correctament el logotip de la comunitat.",
+
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "community.edit.logo.notifications.delete.error.title": "Error en eliminar el logotip",
+
+  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Deixeu anar un logotip de la comunitat per carregar",
+
+
+
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "Comunitat editada amb èxit",
+
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized": "No tens privilegis per fer aquest canvi",
+
+  // "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "S'ha produït un error en editar la comunitat.",
+
+  // "community.edit.return": "Back",
+  "community.edit.return": "Enrere",
+
+
+
+  // "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ó de la comunitat - Curar",
+
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Editar metadades",
+
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Edició de la comunitat: metadades",
+
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Assignar rols",
+
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Edició de la comunitat: funcions",
+
+  // "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Autoritzacions",
+
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+  "community.edit.tabs.authorizations.title": "Edició de la comunitat: autoritzacions",
+
+
+
+  // "community.listelement.badge": "Community",
+  "community.listelement.badge": "Comunitat",
+
+
+
+  // "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Cap",
+
+  // "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Crear",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Error en crear un grup per al rol '{{ role }}'",
+
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Restringir",
+
+  // "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Esborrar",
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "Error en esborrar el grup del rol '{{ role }}'",
+
+
+  // "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "Administradors",
+
+  // "comcol-role.edit.collection-admin.name": "Administrators",
+  "comcol-role.edit.collection-admin.name": "Administradors",
+
+
+  // "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": "Els administradors de la comunitat poden crear subcomunitats o col·leccions i gestionar o assignar la gestió per a aquestes subcomunitats o col·leccions. A més, decideixen qui pot enviar ítems a les subcol·leccions, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions (subjecte a autorització).",
+
+  // "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": "Els administradors de la col·lecció decideixen qui pot enviar ítems a la col·lecció, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions a aquesta col·lecció (subjecte a autorització).",
+
+
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "Remitents",
+
+  // "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": "Els Usuaris i Grups que tenen permís per enviar nous ítems a aquesta col·lecció.",
+
+
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "Accés de lectura predeterminat de l'ítem",
+
+  // "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": "Usuaris i Grups que poden llegir nous ítems enviats a aquesta col·lecció. Els canvis en aquest rol no són retroactius. Els ítems existents al sistema encara seran visibles per a aquells que tenien accés de lectura en el moment de la seva addició.",
+
+  // "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 per als ítems entrants està configurada actualment com a Anònim.",
+
+
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "Accés de lectura per defecte de fitxers",
+
+  // "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": "Els administradors de la comunitat poden crear subcomunitats o col·leccions i gestionar o assignar la gestió per a aquestes subcomunitats o col·leccions. A més, decideixen qui pot enviar ítems a les subcol·leccions, editar les metadades de l'ítem (un cop publicats) i afegir (mapejar) ítems existents d'altres col·leccions (subjecte a autorització).",
+
+  // "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 per als fitxers entrants s'estableix actualment a Anònim.",
+
+
+  // "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "Editors",
+
+  // "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": "Els editors poden editar les metadades dels enviaments entrants i després acceptar-los o rebutjar-los.",
+
+
+  // "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "Editors finals",
+
+  // "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": "Els editors finals poden editar les metadades dels enviaments entrants, però no els poden rebutjar.",
+
+
+  // "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "Revisors",
+
+  // "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": "Els revisors poden acceptar o rebutjar enviaments entrants. No obstant això, no poden editar les metadades de l'enviament.",
+
+
+
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "Breu descripció",
+
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Text introductori (HTML)",
+
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Introduïu un nom de comunitat",
+
+  // "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Text de copyright (HTML)",
+
+  // "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Notícies (HTML)",
+
+  // "community.form.title": "Name",
+  "community.form.title": "Nom",
+
+  // "community.page.edit": "Edit this community",
+  "community.page.edit": "Editar aquesta comunitat",
+
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "URI permanent per a aquesta comunitat",
+
+  // "community.page.license": "License",
+  "community.page.license": "Llicència",
+
+  // "community.page.news": "News",
+  "community.page.news": "Notícies",
+
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Subcomunitats i col·leccions",
+
+  // "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head": "Col·leccions d'aquesta comunitat",
+
+  // "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head": "Comunitats d'aquesta comunitat",
+
+
+
+  // "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Acceptar tot",
+
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "Acceptar selecció",
+
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "Aquesta aplicació es carrega per defecte (però podeu optar per sortir)",
+
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(optar per sortir)",
+
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "objectiu",
+
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Aquesta aplicació sempre és necessària",
+
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(sempre requerit)",
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Utilitzeu aquest camp per activar o desactivar tots els serveis.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Activar o desactivar tots els serveis",
+
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "Hi ha hagut canvis des de la darrera visita, si us plau, actualitzeu el vostre consentiment.",
+
+  // "cookies.consent.close": "Close",
+  "cookies.consent.close": "Tancar",
+
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Declinar",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "D'acord",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Guardar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Cookie Consent",
+
+  // "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": "Recopilem i processem la vostra informació personal amb les finalitats següents: <strong>Autenticació, Preferències, Reconeixement i Estadístiques</strong>. <br/> Per obtenir més informació, llegiu 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>.",
+  "cookies.consent.content-notice.description.no-privacy": "Recopilem i processem la vostra informació personal per als següents propòsits: <strong>Autenticació, Preferències, Reconeixement i Estadístiques<strong>.",
+
+  // "cookies.consent.content-notice.learnMore": "Customize",
+  "cookies.consent.content-notice.learnMore": "Personalitzar",
+
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Aquí podeu veure i personalitzar la informació que recopilem sobre vostè.",
+
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "política de privacitat",
+
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Per a més informació, llegiu si us plau la nostra {privacyPolicy}.",
+
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Informació que recopilem",
+
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "serveis",
+
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servei",
+
+  // "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Autenticació",
+
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication": "Requerit per iniciar sessió",
+
+
+  // "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Preferències",
+
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "Requerit per desar les vostres preferències",
+
+
+
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Reconeixement",
+
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement": "Requerit per guardar els seus reconeixements i consentiments",
+
+
+
+  // "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": "Ens permet rastrejar dades estadístiques",
+
+
+
+  // "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": "Utilitzem el servei google reCAPTCHA durant el registre i la recuperació de contrasenya",
+
+
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Funcional",
+
+  // "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Estadístic",
+
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registre i recuperació de contrasenya",
+
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Compartició",
+
+  // "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": "Comprovar enllaços a metadades",
+
+  // "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "NOOP",
+
+  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Perfil de formats de fitxer",
+
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Comprovar les metadades obligatòries",
+
+  // "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Traductor de Microsoft",
+
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "Comprovacio de virus",
+
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  "curation-task.task.registerdoi.label": "Registrar DOI",
+
+
+
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Tasca:",
+
+  // "curation.form.submit": "Start",
+  "curation.form.submit": "Iniciar",
+
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "La tasca de curació s'ha iniciat amb èxit.",
+
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "Serà redirigit a la pàgina del procés corresponent.",
+
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Error en executar la tasca de curació",
+
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "S'ha produït un error en intentar iniciar la tasca de curació.",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "No s'ha pogut determinar l'handle d'aquest objecte",
+
+  // "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": "Suggeriment: Introduïu [el-vostre-prefix-handle]/0 per executar una tasca en tota la instal·lació (no totes les tasques permeten aquesta opció)",
+
+
+
+  // "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": "Estimat {{ recipientName }},\nEn resposta a la vostra sol·licitud, lamento informar-vos que no és possible enviar-vos una còpia dels fitxers que heu sol·licitat, en relació amb el document: \"{{ itemUrl }}\" ({{ itemName }}), del qual sóc autor.\n\nSalutacions cordials,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Sol·licitar una còpia del document",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "S'ha produit un error",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Denegar còpia del document",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Aquest és el text que serà enviat al sol·licitant.",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Sol·licitud de còpia de document denegada",
+
+
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Sense títol",
+
+
+
+  // "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Nova col·lecció",
+
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Crea una nova col·lecció a",
+
+  // "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Nova comunitat",
+
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "o",
+
+  // "dso-selector.create.community.sub-level": "Create a new community in",
+  "dso-selector.create.community.sub-level": "Crea una nova comunitat a",
+
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Crea una nova comunitat de primer nivell",
+
+  // "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Nou ítem",
+
+  // "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "Crea un nou ítem a",
+
+  // "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Nou enviament",
+
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Editar col·lecció",
+
+  // "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Editar comunitat",
+
+  // "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Editar ítem",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "S'ha produït un error en cercar un {{ type }}",
+
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Exportar metadades des de",
+
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Exportar fitxer per lots (ZIP) des de",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importar fitxer per lots des de",
+
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "No s'ha trobat {{ type }}",
+
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Cerca un/a {{ type }}",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Seleccionar una col·lecció",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Seleccionar un àmbit de cerca",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Cercar a tot DSpace",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "o",
+
+  // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+  "dso-selector.set-scope.community.input-header": "Cerca una comunitat o una col·lecció",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Suggeriments de perfil",
+
+  // "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": "Hi ha perfils que podrien estar relacionats amb vostè. Si es veu reflectit en un d'ells, seleccioneu-lo i a la pàgina de detalls, escolliu l'opció de reclamar-lo. Opcionalment, podeu crear un nou perfil des de zero amb el botó inferior.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Cap d'aquests és meu",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Crear-ne un de nou",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "S'ha produït un error, si us plau, actualitzeu de nou ↻",
+
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "Exporta metadades per a {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Esteu segur que voleu exportar metadades per a {{ dsoName }}?",
+
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Cancel·lar",
+
+  // "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Exporta",
+
+  // "confirmation-modal.export-batch.header": "Export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.header": "Exportar fitxer per lots (ZIP) per a {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Esteu segur que voleu exportar un fitxer per lots (ZIP) per a {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Cancel·lar",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportar",
+
+  // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.header": "Esborrar usuari \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Esteu segur que voleu eliminar l'usuari \"{{ dsoName }}\"?",
+
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Cancel·lar",
+
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Esborrar",
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Esborrar Perfil",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Esteu segur que voleu suprimir el vostre perfil?",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Cancel·lar",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Esborrar",
+
+
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Error en obtenir el fitxer",
+
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "Error en recuperar ítems",
+
+  // "error.collection": "Error fetching collection",
+  "error.collection": "Error en recuperar la col·lecció",
+
+  // "error.collections": "Error fetching collections",
+  "error.collections": "Error en recuperar col·leccions",
+
+  // "error.community": "Error fetching community",
+  "error.community": "Error en recuperar la comunitat",
+
+  // "error.identifier": "No item found for the identifier",
+  "error.identifier": "No s'ha trobat cap ítem amb aquest identificador",
+
+  // "error.default": "Error",
+  "error.default": "Error",
+
+  // "error.item": "Error fetching item",
+  "error.item": "Error en recuperar l'ítem",
+
+  // "error.items": "Error fetching items",
+  "error.items": "Error en recuperar ítems",
+
+  // "error.objects": "Error fetching objects",
+  "error.objects": "Error en recuperar objectes",
+
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "Error en recuperar els enviaments recents",
+
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "Error en recuperar els resultats de cerca",
+
+  // "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": "La cerca no és vàlida. Reviseu a <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">la sintaxi de cerques Solr</a> per a més informació sobre aquest error.",
+
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "Error en recuperar subcol·leccions",
+
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Error en recuperar subcomunitats",
+
+  // "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": "S'ha produït un error durant la inicialització de la secció. Comproveu la configuració del formulari d'entrada. Els detalls es mostren a continuació: <br> <br>",
+
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "error.top-level-communities": "Error en recuperar les comunitats de primer nivell",
+
+  // "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": "Ha de concedir aquesta llicència de dipòsit per completar l'enviament. Si no podeu concedir aquesta llicència en aquest moment, podeu desar el vostre treball i tornar més tard o bé eliminar l'enviament.",
+
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Aquest camp d'entrada està restringit per aquest patró: {{ pattern }}.",
+
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "La càrrega d'un fitxer és obligatòria",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Aquest camp es obligatori",
+
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Aquest no és un correu electrònic vàlid",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Aquest correu electrònic ja està en ús",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Aquest grup ja existeix",
+
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Fil de sindicació",
+
+
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "Error en obtenir els fitxers per a aquest ítem",
+
+
+
+  // "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "copyright © 2002-{{ year }}",
+
+  // "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "Software DSpace",
+
+  // "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "LYRASIS",
+
+  // "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "Configuració de cookies",
+
+  // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Política de privadesa",
+
+  // "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement": "Acord d'usuari final",
+
+  // "footer.link.feedback":"Send Feedback",
+  "footer.link.feedback": "Enviar Suggeriments",
+
+
+
+  // "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "Oblit de contrasenya",
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Introduïu l'adreça de correu electrònic que vau proporcionar al registrar-vos.",
+
+  // "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "Adreça de correu electrònic *",
+
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Si us plau introduïu una adreça de correu electrònic",
+
+  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.pattern": "Si us plau introduïu una adreça de correu electrònic vàlida",
+
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "Se us enviarà un missatge a aquesta adreça amb les instruccions pertinents.",
+
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Restablir contrasenya",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "S'ha enviat el missatge de restabliment de contrasenya",
+
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content": "S'ha enviat un correu a {{ email }} que conté una URL especial i instruccions addicionals.",
+
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "Error en intentar restablir la contrasenya",
+
+  // "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": "S'ha produït un error intentant restablir la contrasenya del compte associat al correu electrònic: {{ email }}",
+
+
+
+  // "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Oblit de contrasenya",
+
+  // "forgot-password.form.head": "Forgot Password",
+  "forgot-password.form.head": "Oblit de contrasenya",
+
+  // "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": "Introduïu una nova contrasenya al camp a continuació i confirmeu-la reescrivint-la al segon camp.",
+
+  // "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Seguretat",
+
+  // "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Identitat",
+
+  // "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "Adreça de correu electrònic: ",
+
+  // "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Contrasenya",
+
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Reescriviu per confirmar",
+
+  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Introduïu una contrasenya al cap a continuació.",
+
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+  "forgot-password.form.error.matching-passwords": "Les contrasenyes no coincideixen.",
+
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Error en intentar enviar una contrasenya nova",
+
+  // "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": "El restabliment de la contrasenya ha sigut exitós. Heu iniciat sessió com a l'usuari creat.",
+
+  // "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "S'ha completat el restabliment de la contrasenya",
+
+  // "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Envia contrasenya",
+
+
+  // "form.add": "Add more",
+  "form.add": "Afegir més",
+
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Feu clic aquí per afegir l'entrada actual i per afegir-ne una altra",
+
+  // "form.cancel": "Cancel",
+  "form.cancel": "Cancel·lar",
+
+  // "form.clear": "Clear",
+  "form.clear": "Netejar",
+
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Feu clic aquí per eliminar el valor seleccionat",
+
+  // "form.discard": "Discard",
+  "form.discard": "Descartar",
+
+  // "form.drag": "Drag",
+  "form.drag": "Arrossegar",
+
+  // "form.edit": "Edit",
+  "form.edit": "Editar",
+
+  // "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Feu clic aquí per editar el valor seleccionat",
+
+  // "form.first-name": "First name",
+  "form.first-name": "Nom",
+
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse": "Contraure",
+
+  // "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "Feu clic aquí per contraure",
+
+  // "form.group-expand": "Expand",
+  "form.group-expand": "Expandir",
+
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "Feu clic aquí per expandir i afegir més elements",
+
+  // "form.last-name": "Last name",
+  "form.last-name": "Cognoms",
+
+  // "form.loading": "Loading...",
+  "form.loading": "Carregant...",
+
+  // "form.lookup": "Lookup",
+  "form.lookup": "Cercar",
+
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Feu clic aquí per cercar una relació existent",
+
+  // "form.no-results": "No results found",
+  "form.no-results": "No s'han trobat resultats",
+
+  // "form.no-value": "No value entered",
+  "form.no-value": "No s'ha introduït cap valor",
+
+  // "form.remove": "Remove",
+  "form.remove": "Eliminar",
+
+  // "form.save": "Save",
+  "form.save": "Guardar",
+
+  // "form.save-help": "Save changes",
+  "form.save-help": "Desa els canvis",
+
+  // "form.search": "Search",
+  "form.search": "Cercar",
+
+  // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Feu clic aquí per cercar una correspondència existent",
+
+  // "form.submit": "Save",
+  "form.submit": "Guardar",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Deixeu anar l'ítem a la nova posició",
+
+
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "No envieu còpia",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Enrere",
+
+  // "grant-deny-request-copy.email.message": "Message",
+  "grant-deny-request-copy.email.message": "Missatge",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Si us plau, introduïu un missatge",
+
+  // "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": "Podeu aprofitar aquesta ocasió per reconsiderar les restriccions d'accés del document, per evitar haver de respondre a aquestes sol·licituds. Si voleu demanar als administradors del dipòsit que eliminen aquestes restriccions, marqueu la casella següent.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Canvi a Accés Obert",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Enviar",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Assumpte",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Si us plau, introduïu un assumpte",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Enviar còpia",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Sol·licitud de còpia de document",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Porta'm a la pàgina d'inici",
+
+  // "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": "Si sou un dels autors del document <a href='{{ url }}'>{{ name }}</a>, utilitzeu els botons inferiors per respondre la sol·licitud de l'usuari",
+
+  // "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": "Després de triar una opció, us suggerirem un text de correu electrònic que podeu editar.",
+
+  // "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": "Aquesta sol·licitud ja ha estat processada. Podeu utilitzar els botons inferiors per tornar a la pàgina inicial",
+
+
+
+  // "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": "Estimat {{ recipientName }},\nResponent a la vostra sol·licitud, us envio annexada una còpia del fitxer corresponent al document: \"{{ itemUrl }}\" ({{ itemName }} .\n\nUna cordial salutació,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Sol·licitar còpia de document",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "S'ha produït un error",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Concedir sol·licitud de còpia de document",
+
+  // "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": "Aquest missatge s'enviarà al sol·licitant de la còpia. Se us annexarà una còpia del document.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Sol·licitud d'ítem concedida amb èxit",
+
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Revisió de salut",
+
+  // "health-page.heading" : "Health",
+  "health-page.heading": "Revisió de salut",
+
+  // "health-page.info-tab" : "Info",
+  "health-page.info-tab": "Informació",
+
+  // "health-page.status-tab" : "Status",
+  "health-page.status-tab": "Estat",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "El servei de comprovació de salud no està temporalment disponible",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Codi d'estat",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Database",
+
+  // "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",
+  "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": "Backend de l'aplicació",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Estat",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Operatiu",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Problemes detectats",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Detectats problemes potencials",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Revisió de salut",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "No s'han detectat problemes",
+
+
+  // "home.description": "",
+  "home.description": "",
+
+  // "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Inici",
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Cerca al repositori ...",
+
+  // "home.title": "Home",
+  "home.title": "Inici",
+
+  // "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "Comunitats a DSpace",
+
+  // "home.top-level-communities.help": "Select a community to browse its collections.",
+  "home.top-level-communities.help": "Seleccioneu una comunitat per explorar les seves col·leccions.",
+
+
+
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "He llegit i accepto l'Acord d'usuari final.",
+
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "S'ha produït un error en acceptar l'Acord d'usuari final.",
+
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "S'ha actualitzat correctament l'Acord d'usuari final.",
+
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Acord d'usuari final",
+
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Cancel·lar",
+
+  // "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Guardar",
+
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Acord d'usuari final",
+
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Acord d'usuari final",
+
+  // "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Declaració de privadesa",
+
+  // "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Declaració de privadesa",
+
+  // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Declaració de privadesa",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Suggeriments",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Suggeriments",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Suggeriments",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Gràcies per compartir els vostres suggeriments sobre el repositori. Tindrem en compte els vostres comentaris!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Aquesta adreça s'utilitzarà per al seguiment del vostre suggeriment.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Enviar suggeriment",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Comentaris",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "El vostre correu electrònic",
+
+  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Enviament exitós de suggeriment",
+
+  // "info.feedback.error.email.required" : "A valid email address is required",
+  "info.feedback.error.email.required": "es requereix una adreça vàlida de correu electrònic",
+
+  // "info.feedback.error.message.required" : "A comment is required",
+  "info.feedback.error.message.required": "Es requereix un comentari",
+
+  // "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": "La pàgina relacionada amb el vostre suggeriment",
+
+
+
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private": "Aquest ítem és privat",
+
+  // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Aquest ítem ha estat retirat",
+
+
+
+  // "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": "Amb aquest editor pot veure i modificar les polítiques d'un ítem, a més de modificar les polítiques dels components individuals de l'ítem: paquets i fitxers. Breument, un ítem és un contenidor de paquets i els paquets són contenidors d'arxius. Els contenidors solen tenir polítiques AFEGIR/ELIMINAR/LLEGIR/ESCRIURE, mentre que els fitxers només tenen polítiques LLEGIR/ESCRIURE.",
+
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Editar les polítiques de l'ítem",
+
+
+
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "Privat",
+
+  // "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn": "Retirat",
+
+
+
+  // "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Paquet",
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "Seleccioneu un paquet o introduïu un nou nom de paquet",
+
+  // "item.bitstreams.upload.bundle.new": "Create bundle",
+  "item.bitstreams.upload.bundle.new": "Crear paquet",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "Aquest ítem no conté cap paquet per carregar un fitxer.",
+
+  // "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Cancel·lar",
+
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Deixeu anar un fitxer per pujar",
+
+  // "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Ítem: ",
+
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Nou paquet creat amb èxit.",
+
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Paquet creat",
+
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "Pujada fallida. Verifiqueu el contingut abans de tornar-ho a provar.",
+
+  // "item.bitstreams.upload.title": "Upload bitstream",
+  "item.bitstreams.upload.title": "Pujar fitxer",
+
+
+
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Pujar",
+
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Actualment es mostren {{ amount }} fitxers de {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Carregar tot ({{ total }})",
+
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Càrrega més",
+
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "PAQUET: {{ name }}",
+
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Descartar",
+
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Descarregar",
+
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Arrossegar",
+
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Editar",
+
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Eliminar",
+
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Desfer canvis",
+
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Aquest ítem no conté cap fitxer. Feu clic al botó de càrrega per crear-ne un.",
+
+  // "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Accions",
+
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Paquet",
+
+  // "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Descripció",
+
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Format",
+
+  // "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "Nom",
+
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "Els teus canvis han sigut descartats. Per restaurar els teus canvis feu clic al botó 'Desfer'",
+
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Canvis descartats",
+
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Error en moure fitxers",
+
+  // "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": "S'han desat els canvis de moviments als fitxers i paquets d'aquest ítem.",
+
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "Canvis de moviments desats",
+
+  // "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": "Un altre usuari ha canviat l'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Canvis desactualitzats",
+
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Error en suprimir fitxer",
+
+  // "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": "S'han desat els canvis d'eliminació dels fitxers d'aquest ítem.",
+
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "S'han desat els canvis d'eliminació",
+
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Desfer",
+
+  // "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Guardar",
+
+  // "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button": "Pujar",
+
+
+
+  // "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Cancel·lar",
+
+  // "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Esborrar",
+
+  // "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": "Estàs segur que aquest ítem s'ha d'eliminar completament? Precaució: actualment no es deixaria cap rastre.",
+
+  // "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "S'ha produït un error en eliminar l'ítem.",
+
+  // "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Eliminar ítem: {{ id }}",
+
+  // "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "L'ítem ha estat eliminat",
+
+  // "item.edit.head": "Edit Item",
+  "item.edit.head": "Editar ítem",
+
+  // "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Editar ítem",
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "No tens autorització per accedir a aquesta pestanya",
+
+
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Mapejador de col·leccions",
+
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Edició d'ítem - Mapeador de col·leccions",
+
+  // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
+  "item.edit.item-mapper.buttons.add": "Assignar ítem a col·leccions seleccionades",
+
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Eliminar l'assignació d'ítem per a les col·leccions seleccionades",
+
+  // "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "Cancel·lar",
+
+  // "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": "Aquesta és l'eina d'assignació d'ítems que permet als administradors assignar aquest ítem a altres col·leccions. Podeu cercar col·leccions i mapejar-les, o explorar la llista de col·leccions a les quals l'ítem està mapejat actualment.",
+
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Assignador d'ítems: assigna ítems a col·leccions",
+
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Ítem: \"<b>{{ name }}</b>\"",
+
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Introduïu una consulta per cercar",
+
+  // "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": "S'han produït errors en mapejar l'ítem a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Errors de mapatge",
+
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "L'ítem s'ha assignat correctament a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapeig completat",
+
+  // "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": "S'han produït errors en l'eliminació de l'assignació a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Errors a l'eliminació de mapatge",
+
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "S'ha eliminat correctament l'assignació de l'ítem a {{ amount }} col·leccions.",
+
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Eliminació del mapatge completat",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Cerca col·leccions...",
+
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Examinar col·leccions mapejades",
+
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "Mapejar noves col·leccions",
+
+
+
+  // "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Afegir",
+
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Descartar",
+
+  // "item.edit.metadata.edit.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Eliminar",
+
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Desfer canvis",
+
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Deixar d'editar",
+
+  // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "item.edit.metadata.empty": "Actualment, l'ítem no conté metadades. Feu clic a Afegir per començar a afegir un valor de metadades.",
+
+  // "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Editar",
+
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Camp",
+
+  // "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Idioma",
+
+  // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Valor",
+
+  // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "item.edit.metadata.metadatafield.invalid": "Trieu un camp de metadades vàlid",
+
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.metadata.notifications.discarded.content": "Els teus canvis han sigut descartats. ",
+
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title": "Canvis descartats",
+
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "S'ha produït un error",
+
+  // "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": "Els canvis no s'han desat. Assegureu-vos que tots els camps siguin vàlids abans de desar.",
+
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Metadades invàlides",
+
+  // "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": "Un altre usuari ha canviat l'ítem en què està treballant actualment. Els teus canvis han estat descartats per evitar conflictes",
+
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "Canvis desactualitzats",
+
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "S'han desat els canvis a les metadades d'aquest ítem.",
+
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadades desades",
+
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Desfer",
+
+  // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Guardar",
+
+
+
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Camp",
+
+  // "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Idioma",
+
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Valor",
+
+
+
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "Enrere",
+
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Guardar",
+
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Descartar",
+
+  // "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": "Seleccioneu la col·lecció a la qual voleu moure aquest ítem. Per reduir la llista de col·leccions mostrades, podeu introduir una cerca al camp.",
+
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "S'ha produït un error en intentar moure l'ítem.",
+
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Moure ítem: {{ id }}",
+
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Heretar polítiques",
+
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Hereta les polítiques predeterminades de la col·lecció de destinació",
+
+  // "item.edit.move.move": "Move",
+  "item.edit.move.move": "Moure",
+
+  // "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Movent...",
+
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Introduïu una consulta de cerca per cercar col·leccions",
+
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "L'ítem s'ha mogut correctament.",
+
+  // "item.edit.move.title": "Move item",
+  "item.edit.move.title": "Moure ítem",
+
+
+
+  // "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Cancel·lar",
+
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  "item.edit.private.confirm": "Convertir-ho en privat",
+
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "item.edit.private.description": "Està segur que aquest ítem s'ha de convertir en privat?",
+
+  // "item.edit.private.error": "An error occurred while making the item non-discoverable",
+  "item.edit.private.error": "S'ha produït un error en convertir l'ítem en privat.",
+
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Convertir l'ítem a privat: {{ id }}",
+
+  // "item.edit.private.success": "The item is now non-discoverable",
+  "item.edit.private.success": "L'ítem ara és privat",
+
+
+
+  // "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "Cancel·lar",
+
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "Convertir-ho en públic",
+
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "item.edit.public.description": "Està segur que aquest ítem s'ha de convertir en públic?",
+
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  "item.edit.public.error": "S'ha produït un error en convertir l'ítem en públic.",
+
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Convertir l'ítem en públic: {{ id }}",
+
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "L'ítem ara és públic",
+
+
+
+  // "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Cancel·lar",
+
+  // "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Reintegrar",
+
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "Està segur que aquest ítem s'ha de reintegrar?",
+
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "S'ha produït un error en reintegrar l'ítem",
+
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Reintegrar l'ítem: {{ id }}",
+
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "L'ítem s'ha reintegrat correctament",
+
+
+
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Descartar",
+
+  // "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Afegir",
+
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Eliminar",
+
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Desfer canvis",
+
+  // "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "Sense relacions",
+
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Els seus canvis han sigut descartats. Per recuperar els canvis premi el botó 'Desfer'",
+
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Canvis descartats",
+
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "Error en editar les relacions",
+
+  // "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": "Un altre usuari ha canviat l'ítem en què està treballant actualment. Els seus canvis es descartaran per prevenir conflictes",
+
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Canvis desactualitzats",
+
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "S'han desat els canvis en les relacions d'aquest ítem.",
+
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Relacions guardades",
+
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Desfer",
+
+  // "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Guardar",
+
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "Afegiu la metadada 'dspace.entity.type' per habilitar les relacions per a aquest ítem",
+
+
+  // "item.edit.return": "Back",
+  "item.edit.return": "Enrere",
+
+
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Fitxers",
+
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Edició d'ítems: fitxers",
+
+  // "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Curar",
+
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Edició d'ítem: Curar",
+
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "Metadades",
+
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Edició d'ítem: Metadades",
+
+  // "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Relacions",
+
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Edició d'ítem: Relacions",
+
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Autoritzacions...",
+
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Editar privilegis d'autorització de l'ítem:",
+
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Esborrar permanentment",
+
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Esborrar completament l'ítem:",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Col·leccions mapejades",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Administra col·leccions mapejades",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Moure...",
+
+  // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
+  "item.edit.tabs.status.buttons.move.label": "Moure ítem a una altra col·lecció",
+
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  "item.edit.tabs.status.buttons.private.button": "Convertir-ho en privat...",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "Convertir l'ítem a privat",
+
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "Convertir-ho en públic...",
+
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "Convertir l'ítem en públic",
+
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Reintegrar...",
+
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Restablir l'ítem al repositori",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "No estàs autoritzat a realitzar aquesta acció.",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retira...",
+
+  // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
+  "item.edit.tabs.status.buttons.withdraw.label": "Retirar ítem del repositori",
+
+  // "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": "Benvingut a la pàgina d'administració d'ítems. Des d'aquí podeu retirar, restablir, moure o eliminar l'ítem. També podeu actualitzar o afegir noves metadades / fitxers a les altres pestanyes.",
+
+  // "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "Estat",
+
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "Handle",
+
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "ID intern de l'ítem",
+
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Pàgina de l'ítem",
+
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Última modificació",
+
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Edició d'ítem: Estat",
+
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Historial de versions",
+
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "Edició d'ítems: Historial de versions",
+
+  // "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": "Encara no és possible editar o afegir noves versions en aquesta interfície d'usuari.",
+
+  // "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Veure ítem",
+
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "Edició d'ítem - Visualitza",
+
+
+
+  // "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Cancel·lar",
+
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Retirar",
+
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "Esteu segur que aquest ítem s'ha de retirar del fitxer?",
+
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "S'ha produït un error en retirar l'ítem",
+
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Retira l'ítem: {{ id }}",
+
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "L'ítem s'ha retirat amb èxit",
+
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Enrere",
+
+
+  // "item.listelement.badge": "Item",
+  "item.listelement.badge": "Ítem",
+
+  // "item.page.description": "Description",
+  "item.page.description": "Descripció",
+
+  // "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ISSN de la revista",
+
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Títol de la revista",
+
+  // "item.page.publisher": "Publisher",
+  "item.page.publisher": "Editor",
+
+  // "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Ítem: ",
+
+  // "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Títol del volum",
+
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Resultats de la cerca d'ítems",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "Cerca d'ítems",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Més...",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Contraure",
+
+
+
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "Resum",
+
+  // "item.page.author": "Authors",
+  "item.page.author": "Autors",
+
+  // "item.page.citation": "Citation",
+  "item.page.citation": "Citació",
+
+  // "item.page.collections": "Collections",
+  "item.page.collections": "Col·leccions",
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Carregant...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Carregar més",
+
+  // "item.page.date": "Date",
+  "item.page.date": "Data",
+
+  // "item.page.edit": "Edit this item",
+  "item.page.edit": "Editar aquest ítem",
+
+  // "item.page.files": "Files",
+  "item.page.files": "Fitxers",
+
+  // "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Descripció:",
+
+  // "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "Descarregar",
+
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Format:",
+
+  // "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Nom:",
+
+  // "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Mida:",
+
+  // "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Ítems d'aquesta revista",
+
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "Pàgina completa de l'ítem",
+
+  // "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "Vista senzilla d'ítem",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Obrir la pàgina de configuració de ORCID",
+
+  // "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Ítems d'aquest autor",
+
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Mostra {{ amount }} més",
+
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Ocultar els últims {{ amount }}",
+
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Publicacions",
+
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Publicacions",
+
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Autors",
+
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Projectes de recerca",
+
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "Paraules clau",
+
+  // "item.page.uri": "URI",
+  "item.page.uri": "URI",
+
+  // "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Mostrar més",
+
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Contraure",
+
+  // "item.page.filesection.original.bundle" : "Original bundle",
+  "item.page.filesection.original.bundle": "Paquet original",
+
+  // "item.page.filesection.license.bundle" : "License bundle",
+  "item.page.filesection.license.bundle": "Paquet de llicències",
+
+  // "item.page.return": "Back",
+  "item.page.return": "Enrere",
+
+  // "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": "No es pot crear una nova versió perquè a l'historial de versions hi ha un enviament en curs",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Reclamar",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Reclamar aquest ítem com a perfil",
+
+  // "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Identificador:",
+
+  // "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Autors:",
+
+  // "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Data de publicació:",
+
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Resum:",
+
+  // "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Un altre identificador:",
+
+  // "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Idioma:",
+
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Matèries:",
+
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Títol:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Tipus:",
+
+  // "item.preview.oaire.citation.issue" : "Issue",
+  "item.preview.oaire.citation.issue": "Número",
+
+  // "item.preview.oaire.citation.volume" : "Volume",
+  "item.preview.oaire.citation.volume": "Volum",
+
+  // "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": "Identificador:",
+
+  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Revista o Sèrie",
+
+  // "item.preview.dc.identifier.doi" : "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Cognoms:",
+
+  // "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Nom:",
+
+  // "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Finançador:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Identificador del finançador:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "ID de finançament:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Acrònim:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Jurisdicció:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Línia de finançament:",
+
+
+
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Confirmar seleccionat",
+
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "No hi ha elements per mostrar",
+
+  // "item.select.table.author": "Author",
+  "item.select.table.author": "Autor",
+
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Col·lecció",
+
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "Títol",
+
+
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Encara no hi ha altres versions per a aquest ítem.",
+
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "Historial de versions",
+
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "Enrere",
+
+  // "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Versió seleccionada",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Esta veient la versió {{version}} de l'ítem.",
+
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Versió",
+
+  // "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Ítem",
+
+  // "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Editor",
+
+  // "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Data",
+
+  // "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Resum",
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Ítem de l'espai de treball",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Ítem del flux de treball",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Acció",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Editar ítem de l'espai de treball",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Editar resum",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Salvar resum",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Descartar canvis del resum",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Crear nova versió a partir d'aquesta",
+
+  // "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": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
+
+
+  // "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": "Aquesta no és l'última versió d'aquest ítem. L'última versió es pot trobar <a href='{{destination}}'>aquí</a>.",
+
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Nova versió",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Crear una nova versió d'aquest ítem",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "començant des de versió {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Crear",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Crear nova versió",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Cancel·lar",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "No crear una nova versió",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Resum",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Introduïu el resum d'aquesta nova versió",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Creant nova versió...",
+
+  // "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": "S'està creant la nova versió. Si l'ítem té moltes relacions, aquest procés podria trigar.",
+
+  // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "S'ha creat una nova versió amb número {{version}}",
+
+  // "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": "No és possible crear una nova versió ja que existeix a l'historial de versions un enviament pendent",
+
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Esborrar versió",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Vol esborrar la versió {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Esborrar",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Esborrar aquesta versió",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Cancel·lar",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "No esborrar aquesta versió",
+
+  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "S'ha esborrat la versió número {{version}}",
+
+  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "No s'ha esborrat la versió número {{version}}",
+
+
+  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "Ha canviat el resum de la versió número {{version}}",
+
+  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "No ha canviat el resum de la versió número {{version}}",
+
+
+
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Revista",
+
+  // "journal.page.description": "Description",
+  "journal.page.description": "Descripció",
+
+  // "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Editar aquest ítem",
+
+  // "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Editor en cap",
+
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
+
+  // "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Editor",
+
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Revista: ",
+
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "Resultats de la cerca de revistes",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Resultats de la cerca de revistes",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Cerca de revistes",
+
+
+
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Número de la revista",
+
+  // "journalissue.page.description": "Description",
+  "journalissue.page.description": "Descripció",
+
+  // "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Editar aquest ítem",
+
+  // "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Data de publicació",
+
+  // "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ISSN de la revista",
+
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Títol de la revista",
+
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Paraules clau",
+
+  // "journalissue.page.number": "Number",
+  "journalissue.page.number": "Número",
+
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Número de la revista: ",
+
+
+
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Volum de la revista",
+
+  // "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Descripció",
+
+  // "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "Editar aquest ítem",
+
+  // "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Data de publicació",
+
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Volum de la revista: ",
+
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Volum",
+
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Suport del document",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Document: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Enllaç permanent: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Número: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Descripció: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Per visualitzar millor, utilitzeu el mode pantalla completa.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Image Media",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Imatge: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Enllaç permanent: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Número: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Descripció: ",
+
+
+  // "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Carregant fitxer...",
+
+  // "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Carregant fitxers...",
+
+  // "loading.browse-by": "Loading items...",
+  "loading.browse-by": "Carregant ítems...",
+
+  // "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Carregant pàgina...",
+
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "Carregant col·lecció...",
+
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "Carregant col·leccions...",
+
+  // "loading.content-source": "Loading content source...",
+  "loading.content-source": "Carregant font de contingut...",
+
+  // "loading.community": "Loading community...",
+  "loading.community": "Carregant comunitat...",
+
+  // "loading.default": "Loading...",
+  "loading.default": "Carregant...",
+
+  // "loading.item": "Loading item...",
+  "loading.item": "Carregant ítem...",
+
+  // "loading.items": "Loading items...",
+  "loading.items": "Carregant ítems...",
+
+  // "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Carregant ítems...",
+
+  // "loading.objects": "Loading...",
+  "loading.objects": "Carregant...",
+
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "Carregant enviaments recents...",
+
+  // "loading.search-results": "Loading search results...",
+  "loading.search-results": "Carregant resultats de cerca...",
+
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "Carregant subcol·leccions...",
+
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Carregant subcomunitats...",
+
+  // "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities": "Carregant comunitats de primer nivell...",
+
+
+
+  // "login.form.email": "Email address",
+  "login.form.email": "Correu electrònic",
+
+  // "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "Has oblidat la teva contrasenya?",
+
+  // "login.form.header": "Please log in to DSpace",
+  "login.form.header": "Inicia sessió a DSpace",
+
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "Nou Usuari? Feu clic aquí per registrar-se",
+
+  // "login.form.or-divider": "or",
+  "login.form.or-divider": "o",
+
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Iniciar sessió amb OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Iniciar sessió amb ORCID",
+
+  // "login.form.password": "Password",
+  "login.form.password": "Contrasenya",
+
+  // "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Iniciar sessió amb Shibboleth",
+
+  // "login.form.submit": "Log in",
+  "login.form.submit": "Iniciar sessió",
+
+  // "login.title": "Login",
+  "login.title": "Iniciar sessió",
+
+  // "login.breadcrumbs": "Login",
+  "login.breadcrumbs": "Iniciar sessió",
+
+
+
+  // "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "Tancar sessió a DSpace",
+
+  // "logout.form.submit": "Log out",
+  "logout.form.submit": "Tancar sessió",
+
+  // "logout.title": "Logout",
+  "logout.title": "Tancar sessió",
+
+
+
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "Administració",
+
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "Logotip del repositori",
+
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Menú d'administració",
+
+
+
+  // "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Control d'accés",
+
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Autoritzacions",
+
+  // "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Grups",
+
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Usuaris",
+
+
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
+  "menu.section.admin_search": "Cerca d'administrador",
+
+
+
+  // "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Aquesta comunitat",
+
+  // "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Per autor",
+
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Per data de publicació",
+
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Per títol",
+
+  // "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Tot DSpace",
+
+  // "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "Per autor",
+
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "Per data de publicació",
+
+  // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Per tema",
+
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "Per títol",
+
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "Comunitats i col·leccions",
+
+
+
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Panel de control",
+
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "Tasques de curació",
+
+
+
+  // "menu.section.edit": "Edit",
+  "menu.section.edit": "Editar",
+
+  // "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Col·lecció",
+
+  // "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Comunitat",
+
+  // "menu.section.edit_item": "Item",
+  "menu.section.edit_item": "Ítem",
+
+
+
+  // "menu.section.export": "Export",
+  "menu.section.export": "Exportar",
+
+  // "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Col·lecció",
+
+  // "menu.section.export_community": "Community",
+  "menu.section.export_community": "Comunitat",
+
+  // "menu.section.export_item": "Item",
+  "menu.section.export_item": "Ítem",
+
+  // "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata": "Metadades",
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Exportació per lots (ZIP)",
+
+
+  // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Secció del menú de control d'accés",
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Secció del menú de cerca d'administrador",
+
+  // "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Secció del menú del Tauler de control",
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Secció del menú de Tasques de curació",
+
+  // "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Secció del menú d'edició",
+
+  // "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Secció de menú d'exportació",
+
+  // "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Secció de menú de cerca",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Secció de menú de Revisió de salut",
+
+  // "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Secció de menú d'importació",
+
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Secció de menú de creació",
+
+  // "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Ancorar barra lateral",
+
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "Secció de menú de Processos de revisió",
+
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Secció de menú de Registres",
+
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Secció del menú de Tasques d'estadístiques",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Secció del menú d'Administració de fluxos de treball",
+
+  // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Desanclar la barra lateral",
+
+
+
+  // "menu.section.import": "Import",
+  "menu.section.import": "Importar",
+
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Importació per lots (ZIP)",
+
+  // "menu.section.import_metadata": "Metadata",
+  "menu.section.import_metadata": "Metadades",
+
+
+
+  // "menu.section.new": "New",
+  "menu.section.new": "Nou",
+
+  // "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Col·lecció",
+
+  // "menu.section.new_community": "Community",
+  "menu.section.new_community": "Comunitat",
+
+  // "menu.section.new_item": "Item",
+  "menu.section.new_item": "Ítem",
+
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Versió de l'ítem",
+
+  // "menu.section.new_process": "Process",
+  "menu.section.new_process": "Procés",
+
+
+
+  // "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Ancorar barra lateral",
+
+  // "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin": "Desancorar la barra lateral",
+
+
+
+  // "menu.section.processes": "Processes",
+  "menu.section.processes": "Processos",
+
+  // "menu.section.health": "Health",
+  "menu.section.health": "Revisió de salut",
+
+
+
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "Registres",
+
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Format",
+
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "Metadades",
+
+
+
+  // "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Estadístiques",
+
+  // "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task": "Tasques d'estadístiques",
+
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Alternar secció de Control d'accés",
+
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Alternar la secció del Panell de control",
+
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Alternar la secció Tasques de curació",
+
+  // "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Alternar secció d'Edició",
+
+  // "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Alternar secció d'Exportació",
+
+  // "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Alternar secció de Cerca",
+
+  // "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Alternar secció d'Importació",
+
+  // "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Alternar secció de Creació",
+
+  // "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Alternar secció de Registres",
+
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task": "Alternar secció de Tasca d'estadístiques",
+
+
+  // "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "Administrar flux de treball",
+
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Exporta els resultats de cerca a CSV",
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "L'exportació s'ha iniciat satisfactòriament",
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Ha fallat l'inici de l'exportació",
+
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "El meu DSpace",
+
+  // "mydspace.description": "",
+  "mydspace.description": "",
+
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Seleccioneu aquesta opció per enviar un missatge al remitent de l'ítem.",
+
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Insereix el teu missatge aquí...",
+
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Amagar missatge",
+
+  // "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Marcar com a llegit",
+
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Marcar com no llegit",
+
+  // "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Sense contingut.",
+
+  // "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Encara no hi ha missatges.",
+
+  // "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Enviar",
+
+  // "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Mostrar missatge",
+
+  // "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Assumpte...",
+
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Seleccioneu aquesta opció per enviar un missatge al controlador.",
+
+  // "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Missatges",
+
+  // "mydspace.messages.to": "To",
+  "mydspace.messages.to": "Per",
+
+  // "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Nou enviament",
+
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "Importa metadades d'una font externa",
+
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Importa metadades",
+
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Els teus enviaments",
+
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Sense resum",
+
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Sense autors",
+
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "No hi ha col·leccions",
+
+  // "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Sense data",
+
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Sense fitxers",
+
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "No hi ha elements per mostrar",
+
+  // "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Sense títol",
+
+  // "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "Sense URI",
+
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Cerca al meu DSpace...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Tasques del flux de treball",
+
+  // "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Els seus enviaments",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arxivat",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validació",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperant el controlador",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Flux de treball",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espai de treball",
+
+  // "mydspace.title": "MyDSpace",
+  "mydspace.title": "El meu DSpace",
+
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Error en crear un nou ítem de l'espai de treball. Verifiqueu el contingut carregat abans de tornar-ho a provar.",
+
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "Fitxer no processable. S'han detectat massa entrades, però només se'n permet una per fitxer.",
+
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "Sol·licitud no processable. Només es permet un fitxer.",
+
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "S'han creat {{ qty }} nous ítems de l'espai de treball.",
+
+  // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Veure",
+
+
+
+  // "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Tot DSpace",
+
+  // "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Per comunitat",
+
+  // "nav.language": "Language switch",
+  "nav.language": "Canvi d'idioma",
+
+  // "nav.login": "Log In",
+  "nav.login": "Iniciar sessió",
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menú de perfil d'usuari i tancament de sessió",
+
+  // "nav.logout": "Log Out",
+  "nav.logout": "Tancar sessió",
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Barra de navegació principal",
+
+  // "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "El meu DSpace",
+
+  // "nav.profile": "Profile",
+  "nav.profile": "Perfil",
+
+  // "nav.search": "Search",
+  "nav.search": "Cerca",
+
+  // "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Estadístiques",
+
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "Deixeu de fer-vos passar per usuari",
+
+  // "nav.toggle" : "Toggle navigation",
+  "nav.toggle": "Alternar navegació",
+
+  // "nav.user.description" : "User profile bar",
+  "nav.user.description": "Barra de perfil d'usuari",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Ítem",
+
+
+  // "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Unitat organitzativa",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Sense títol",
+
+  // "orgunit.page.city": "City",
+  "orgunit.page.city": "Ciutat",
+
+  // "orgunit.page.country": "Country",
+  "orgunit.page.country": "País",
+
+  // "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Data d'establiment",
+
+  // "orgunit.page.description": "Description",
+  "orgunit.page.description": "Descripció",
+
+  // "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Editar aquest ítem",
+
+  // "orgunit.page.id": "ID",
+  "orgunit.page.id": "ID",
+
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Unitat organitzativa: ",
+
+
+
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Opcions de paginació",
+
+  // "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "Resultats per pàgina",
+
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} de {{ total }}",
+
+  // "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "Mostrant ",
+
+  // "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction": "Opcions d'ordenació",
+
+
+
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "Persona",
+
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "No s'ha trobat cap nom",
+
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Data de naixement",
+
+  // "person.page.edit": "Edit this item",
+  "person.page.edit": "Editar aquest ítem",
+
+  // "person.page.email": "Email Address",
+  "person.page.email": "Adreça de correu electrònic",
+
+  // "person.page.firstname": "First Name",
+  "person.page.firstname": "Nom",
+
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Lloc de treball",
+
+  // "person.page.lastname": "Last Name",
+  "person.page.lastname": "Cognoms",
+
+  // "person.page.name": "Name",
+  "person.page.name": "Nom",
+
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Mostra totes les metadades",
+
+  // "person.page.orcid": "ORCID",
+  "person.page.orcid": "ORCID",
+
+  // "person.page.staffid": "Staff ID",
+  "person.page.staffid": "Identificació de Personal",
+
+  // "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Persona: ",
+
+  // "person.search.results.head": "Person Search Results",
+  "person.search.results.head": "Resultats de cerca de persones",
+
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Resultats de cerca de persones",
+
+  // "person.search.title": "Person Search",
+  "person.search.title": "Cerca de persones",
+
+
+
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Paràmetres",
+
+  // "process.new.cancel": "Cancel",
+  "process.new.cancel": "Cancel·lar",
+
+  // "process.new.submit": "Save",
+  "process.new.submit": "Guardar",
+
+  // "process.new.select-script": "Script",
+  "process.new.select-script": "Script",
+
+  // "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Trieu un script...",
+
+  // "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Es requereix un script",
+
+  // "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Selecciona fitxer...",
+
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Si us plau seleccioneu un fitxer",
+
+  // "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Es requereix el valor del paràmetre",
+
+  // "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "valor",
+
+  // "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "arxiu",
+
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "Els paràmetres següents són obligatoris però encara falten:",
+
+  // "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Èxit",
+
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "El procés s'ha creat amb èxit",
+
+  // "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Error",
+
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "S'ha produït un error en crear aquest procés.",
+
+  // "process.new.header": "Create a new process",
+  "process.new.header": "Crea un nou procés",
+
+  // "process.new.title": "Create a new process",
+  "process.new.title": "Crea un nou procés",
+
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Crea un nou procés",
+
+
+
+  // "process.detail.arguments" : "Arguments",
+  "process.detail.arguments": "Arguments",
+
+  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Aquest procés no conté cap argument",
+
+  // "process.detail.back" : "Back",
+  "process.detail.back": "Enrere",
+
+  // "process.detail.output" : "Process Output",
+  "process.detail.output": "Sortida del procés",
+
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Recuperar la sortida del procés",
+
+  // "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "Recuperant",
+
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Aquest procés no té sortida",
+
+  // "process.detail.output-files" : "Output Files",
+  "process.detail.output-files": "Fitxers de sortida",
+
+  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Aquest procés no conté cap fitxer de sortida",
+
+  // "process.detail.script" : "Script",
+  "process.detail.script": "Seqüència d'ordres",
+
+  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Procés: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time" : "Start time",
+  "process.detail.start-time": "Hora d'inici",
+
+  // "process.detail.end-time" : "Finish time",
+  "process.detail.end-time": "Hora de finalització",
+
+  // "process.detail.status" : "Status",
+  "process.detail.status": "Estat",
+
+  // "process.detail.create" : "Create similar process",
+  "process.detail.create": "Crear un procés similar",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Accions",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Eliminar procés",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Eliminar procés",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Esteu segur que voleu eliminar el procés actual?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Cancel·lar",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Eliminar procés",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Procés eliminat satisfactòriament.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Alguna cosa ha fallat eliminant el procés",
+
+
+
+  // "process.overview.table.finish" : "Finish time (UTC)",
+  "process.overview.table.finish": "Hora de finalització (UTC)",
+
+  // "process.overview.table.id" : "Process ID",
+  "process.overview.table.id": "ID de procés",
+
+  // "process.overview.table.name" : "Name",
+  "process.overview.table.name": "Nom",
+
+  // "process.overview.table.start" : "Start time (UTC)",
+  "process.overview.table.start": "Hora d'inici (UTC)",
+
+  // "process.overview.table.status" : "Status",
+  "process.overview.table.status": "Estat",
+
+  // "process.overview.table.user" : "User",
+  "process.overview.table.user": "Usuari",
+
+  // "process.overview.title": "Processes Overview",
+  "process.overview.title": "Resum de processos",
+
+  // "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Resum de processos",
+
+  // "process.overview.new": "New",
+  "process.overview.new": "Nou",
+
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Accions",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Eliminar {{count}} processos",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Netejar la selecció",
+
+  // "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": "S'eliminen {{count}} procés(sos). Espereu que l'eliminació es completi completament. Tingueu en compte que això pot trigar un temps.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Està segur que voleu eliminar {{count}} procés(sos)?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Elimina processos",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Error eliminant procés",
+
+  // "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": "No s'ha pogut eliminar el procés amb ID {{processId}}. La resta de processos es continuaran eliminant. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} procés(sos) s'han eliminat correctament",
+
+
+
+  // "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Actualització del perfil",
+
+  // "profile.card.identify": "Identify",
+  "profile.card.identify": "Identitat",
+
+  // "profile.card.security": "Security",
+  "profile.card.security": "Seguretat",
+
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "Guardar",
+
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Grups d'autorització als quals pertanys",
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Grups d'autorització especials als quals pertanys",
+
+  // "profile.head": "Update Profile",
+  "profile.head": "Actualització del perfil",
+
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "Es requereix el nom",
+
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "Es requereix el cognom",
+
+  // "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "Adreça de correu electrònic",
+
+  // "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Nom",
+
+  // "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Idioma",
+
+  // "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Cognoms",
+
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "Telèfon de contacte",
+
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "S'han desat els vostres canvis al perfil.",
+
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Perfil desat",
+
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "No s'han fet canvis al perfil.",
+
+  // "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Sense canvis",
+
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "profile.security.form.error.matching-passwords": "Les contrasenyes no coincideixen.",
+
+  // "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": "Opcionalment, podeu introduir una nova contrasenya al quadre a continuació i confirmar-la escrivint-la novament al segon quadre.",
+
+  // "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Contrasenya",
+
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Rescriviu per confirmar",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Contrasenya actual",
+
+  // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
+  "profile.security.form.notifications.success.content": "S'han desat els canvis de contrasenya.",
+
+  // "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Contrasenya desada",
+
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
+  "profile.security.form.notifications.error.title": "Error en canviar la contrasenya",
+
+  // "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": "S'ha produït un error en intentar canviar la contrasenya. Si us plau, comproveu si la contrasenya actual és correcta.",
+
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "Les contrasenyes proporcionades no coincideixen.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Si us plau, ompliu els camps obligatoris del formulari de seguretat.",
+
+  // "profile.title": "Update Profile",
+  "profile.title": "Actualització del perfil",
+
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Perfil d'investigador",
+
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Projecte de Recerca",
+
+  // "project.page.contributor": "Contributors",
+  "project.page.contributor": "Col·laboradors",
+
+  // "project.page.description": "Description",
+  "project.page.description": "Descripció",
+
+  // "project.page.edit": "Edit this item",
+  "project.page.edit": "Editar aquest ítem",
+
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Finalització prevista",
+
+  // "project.page.funder": "Funders",
+  "project.page.funder": "Finançadors",
+
+  // "project.page.id": "ID",
+  "project.page.id": "ID",
+
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "Paraules clau",
+
+  // "project.page.status": "Status",
+  "project.page.status": "Estat",
+
+  // "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Projecte de recerca: ",
+
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "Resultats de cerca de projectes",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Resultats de cerca de projectes",
+
+
+
+  // "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Publicació",
+
+  // "publication.page.description": "Description",
+  "publication.page.description": "Descripció",
+
+  // "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Editar aquest ítem",
+
+  // "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ISSN de la revista",
+
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Títol de la revista",
+
+  // "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Editor",
+
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Publicació: ",
+
+  // "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Títol del volum",
+
+  // "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Resultats de la cerca de publicacions",
+
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Resultats de la cerca de publicacions",
+
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Cerca de publicacions",
+
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Següent",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Anterior",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Llista de reproducció",
+
+
+  // "register-email.title": "New user registration",
+  "register-email.title": "Registre de nou usuari",
+
+  // "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Crear perfil",
+
+  // "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Identitat",
+
+  // "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "Adreça de correu electrònic",
+
+  // "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "Nom *",
+
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Si us plau introduïu el Nom",
+
+  // "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "Cognoms *",
+
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Si us plau introduïu els Cognoms",
+
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "Telèfon de contacte",
+
+  // "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Idioma",
+
+  // "register-page.create-profile.security.header": "Security",
+  "register-page.create-profile.security.header": "Seguretat",
+
+  // "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": "Introduïu una contrasenya al quadre següent i confirmeu-la escrivint-la novament al segon quadre. ",
+
+  // "register-page.create-profile.security.label.password": "Password *",
+  "register-page.create-profile.security.label.password": "Contrasenya *",
+
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "Rescriviu per confirmar *",
+
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Introduïu una contrasenya al quadre a continuació.",
+
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords": "Les contrasenyes no coincideixen.",
+
+  // "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "Registre complet",
+
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "S'ha produït un error en registrar un nou usuari.",
+
+  // "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "El registre ha fallat",
+
+  // "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": "El registre s'ha fet correctament. Heu iniciat sessió com a usuari creat.",
+
+  // "register-page.create-profile.submit.success.head": "Registration completed",
+  "register-page.create-profile.submit.success.head": "Registre completat",
+
+
+  // "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "Registre de nou usuari",
+
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "Registreu un compte per subscriure's a col·leccions i rebre actualitzacions per correu electrònic, així com enviar nous ítems a DSpace.",
+
+  // "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "Adreça de correu electrònic *",
+
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "register-page.registration.email.error.required": "Si us plau, introduïu una adreça de correu electrònic",
+
+  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+  "register-page.registration.email.error.pattern": "Si us plau, introduïu una adreça de correu electrònic vàlida",
+
+  // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
+  "register-page.registration.email.hint": "Aquesta adreça serà verificada i utilitzada com a nom d'inici de sessió.",
+
+  // "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Registrar-se",
+
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "El missatge de verificació ha estat enviat",
+
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "S'ha enviat un correu electrònic a {{ email }} que conté una URL especial i més instruccions.",
+
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "register-page.registration.error.head": "Error en intentar registrar el correu electrònic",
+
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+  "register-page.registration.error.content": "S'ha produït un error en registrar la següent adreça de correu electrònic: {{ email }}",
+
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Error en intentar autenticar amb 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": "Per registrar-se heu d'acceptar les cookies de <b>Registre i recuperació de contrasenya</b> (Google reCaptcha).",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Obrir configuració de cookies",
+
+  // "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": "S'ha produït un error durant la verificació de reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificació caducada. Verifiqueu de nou.",
+
+  // "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": "No s'ha pogut trobar una coincidència adequada per al tipus de relació {{ type }} entre els dos ítems",
+
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "El servidor ha tornat un error",
+
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "No es pot afegir una relació",
+
+  // "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Autors",
+
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Autors (persones)",
+
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Autors (unitats organitzatives)",
+
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Números de revista",
+
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Número de la revista",
+
+  // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Revistes",
+
+  // "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Unitats organitzatives",
+
+  // "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Autors",
+
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Projectes de recerca",
+
+  // "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Publicacions",
+
+  // "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Articles",
+
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Revista",
+
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Volum de la revista",
+
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Volums de revistes",
+
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Col·laboradors",
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Col·laborador (Unitat organitzativa)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Contribuïdor",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Finançador",
+
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Logotip del repositori",
+
+  // "repository.title.prefix": "DSpace Angular :: ",
+  "repository.title.prefix": "DSpace Angular :: ",
+
+  // "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title.prefixDSpace": "DSpace Angular ::",
+
+
+  // "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Afegir",
+
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "Afegir una política nova",
+
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "resource-policies.add.for.bitstream": "Afegir una nova política d'arxiu",
+
+  // "resource-policies.add.for.bundle": "Add a new Bundle policy",
+  "resource-policies.add.for.bundle": "Afegir una nova política de paquet",
+
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "resource-policies.add.for.item": "Afegir una nova política d'Item",
+
+  // "resource-policies.add.for.community": "Add a new Community policy",
+  "resource-policies.add.for.community": "Afegir una nova política de Comunitat",
+
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "resource-policies.add.for.collection": "Afegir una nova política de col·lecció",
+
+  // "resource-policies.create.page.heading": "Create new resource policy for ",
+  "resource-policies.create.page.heading": "Crear una nova política de recursos per a ",
+
+  // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
+  "resource-policies.create.page.failure.content": "S'ha produït un error en crear la política de recursos.",
+
+  // "resource-policies.create.page.success.content": "Operation successful",
+  "resource-policies.create.page.success.content": "Operació completada amb èxit",
+
+  // "resource-policies.create.page.title": "Create new resource policy",
+  "resource-policies.create.page.title": "Crear nova política de recursos",
+
+  // "resource-policies.delete.btn": "Delete selected",
+  "resource-policies.delete.btn": "Eliminar seleccionat",
+
+  // "resource-policies.delete.btn.title": "Delete selected resource policies",
+  "resource-policies.delete.btn.title": "Eliminar les polítiques de recursos seleccionades",
+
+  // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
+  "resource-policies.delete.failure.content": "S'ha produït un error en eliminar les polítiques de recursos seleccionades.",
+
+  // "resource-policies.delete.success.content": "Operation successful",
+  "resource-policies.delete.success.content": "Operació completada amb èxit",
+
+  // "resource-policies.edit.page.heading": "Edit resource policy ",
+  "resource-policies.edit.page.heading": "Editar la política de recursos ",
+
+  // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
+  "resource-policies.edit.page.failure.content": "S'ha produït un error en editar la política de recursos.",
+
+  // "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": "S'ha produït un error en editar el destinatari (usuari o grup) de la política de recursos.",
+
+  // "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": "S'ha produït un error en editar la política de recursos. El destinatari (usuari o grup) ha estat actualitzat amb èxit",
+
+  // "resource-policies.edit.page.success.content": "Operation successful",
+  "resource-policies.edit.page.success.content": "Operació completada amb èxit",
+
+  // "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Editar la política de recursos",
+
+  // "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Seleccioneu el tipus d'acció",
+
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "Heu de seleccionar l'acció de la política de recursos.",
+
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "L'usuari o grup al qual se li atorgarà el permís",
+
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
+
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Cerca un usuari",
+
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Cerca un grup",
+
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Acció",
+
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Nom",
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "No es pot canviar el tipus",
+
+  // "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": "No és possible canviar un usuari per un grup.",
+
+  // "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": "No és possible canviar un grup per un usuari.",
+
+  // "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": "Esborra la política de recursos actual i creeu-ne una de nova amb el tipus desitjat.",
+
+  // "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.close": "D'acord",
+
+  // "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Data de finalització",
+
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Data d'inici",
+
+  // "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Descripció",
+
+  // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Nom",
+
+  // "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "Seleccioneu el tipus de política",
+
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "Heu de seleccionar el tipus de política de recursos.",
+
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Acció",
+
+  // "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Data final",
+
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Data d'inici",
+
+  // "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Editar",
+
+  // "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Editar grup",
+
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Editar política",
+
+  // "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "Usuari",
+
+  // "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "Grup",
+
+  // "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "ID",
+
+  // "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Nom",
+
+  // "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "Tipus",
+
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "Polítiques per a Arxius",
+
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Polítiques per al paquet",
+
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Polítiques per a l'ítem",
+
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Polítiques per a la comunitat",
+
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Polítiques per a la col·lecció",
+
+
+
+  // "search.description": "",
+  "search.description": "",
+
+  // "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Mostrar",
+
+  // "search.title": "Search",
+  "search.title": "Cerca",
+
+  // "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Cerca",
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Cerca al repositori ...",
+
+
+  // "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": "Data de finalització",
+
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "Data d'inici",
+
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Data d'enviament",
+
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "Privat",
+
+  // "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Tipus d'ítem",
+
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "Té fitxers",
+
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Tipus",
+
+  // "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "Estat",
+
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "Matèria",
+
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Remitent",
+
+  // "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Lloc de treball",
+
+  // "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "Data de naixement, final",
+
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Data de naixement, inicial",
+
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Retirat",
+
+
+
+  // "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "Autor",
+
+  // "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "Nom d'autor",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Cerca per nom d'autor",
+
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Data de naixement",
+
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Data de naixement",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Cerca per data de naixement",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Contraure filtre",
+
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Data de publicació",
+
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Data de publicació",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Cerca per data de publicació",
+
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "Editor",
+
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Cerca per Editor",
+
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Matèries",
+
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Matèries",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Cerca per Matèries",
+
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Editor",
+
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Editor",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Cerca per Editor",
+
+  // "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "Data",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Data màxima",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Fi",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Data mínima",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Començament",
+
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Data d'enviament",
+
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Data d'enviament",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Cerca per Data d'enviament",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "Privat",
+
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Retirat",
+
+  // "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Tipus d'ítem",
+
+  // "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Tipus d'ítem",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Cerca per tipus d'ítem",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Expandir filtre",
+
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "Té fitxers",
+
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Tipus",
+
+  // "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Tipus",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Cerca per Tipus",
+
+  // "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Lloc de treball",
+
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Lloc de treball",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Cerca per lloc de treball",
+
+  // "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Idioma conegut",
+
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Idioma conegut",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Cerca per idioma conegut",
+
+  // "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Estat",
+
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Estat",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Cerca per Estat",
+
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Persones",
+
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Persones",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Cerca per Persones",
+
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "País",
+
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "País",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Cerca per País",
+
+  // "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Ciutat",
+
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Ciutat",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Cerca per ciutat",
+
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Data de fundació",
+
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Data de fundació",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Cerca per Data de fundació",
+
+  // "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "Abast",
+
+  // "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "Filtre d'abast",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Filtre d'abast de cerca",
+
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "Contraure",
+
+  // "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "Mostrar més",
+
+  // "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "Matèries",
+
+  // "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "Matèries",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Cerca de matèries",
+
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Remitent",
+
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Remitent",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Remitent de cerca",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Navega per l'arbre {{ name }}",
+
+
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Número de la revista",
+
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Volum de la revista",
+
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Unitat organitzativa",
+
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "Sí",
+
+  // "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "No",
+
+  // "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "No",
+
+  // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Sí",
+
+  // "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Sí",
+
+  // "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false": "No",
+
+
+  // "search.filters.head": "Filters",
+  "search.filters.head": "Filtres",
+
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "Restablir filtres",
+
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Enviar",
+
+
+
+  // "search.form.search": "Search",
+  "search.form.search": "Cerca",
+
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Tot el repositori",
+
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Tot DSpace",
+
+
+
+  // "search.results.head": "Search Results",
+  "search.results.head": "Resultats de la cerca",
+
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "La cerca no ha produït resultats. Té problemes per trobar el que busca? Intenteu posar",
+
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "cites al seu voltant",
+
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "La vostra cerca no ha produït resultats.",
+
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Veure",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "S'ha produït un error durant l'execució de la consulta, torneu a provar més tard",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Resultats de la cerca",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Resultats de la cerca",
+
+
+  // "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "Tornar a resultats",
+
+  // "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "Filtres",
+
+  // "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "Eines de cerca",
+
+  // "search.sidebar.results": "results",
+  "search.sidebar.results": "resultats",
+
+  // "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "Resultats per pàgina",
+
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "Ordenar per",
+
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "Configuració",
+
+
+
+  // "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Mostrar detall",
+
+  // "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "Mostra com a quadrícula",
+
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "Mostra com a llista",
+
+
+
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC": "Ascendent",
+
+  // "sorting.DESC": "Descending",
+  "sorting.DESC": "Descendent",
+
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "Títol Ascendent",
+
+  // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "Títol descendent",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "El menys rellevant",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "El més rellevant",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Data de publicació Ascendent",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Data de publicació Descendent",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Data d'enviament Ascendent",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Data d'enviament Descendent",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Última modificació Ascendent",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Última modificació Descendent",
+
+
+  // "statistics.title": "Statistics",
+  "statistics.title": "Estadístiques",
+
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "Estadístiques de {{ scope }}",
+
+  // "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "Estadístiques",
+
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Dades no disponibles",
+
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Dades no disponibles",
+
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.title.TotalVisits": "Visites totals",
+
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Visites totals per mes",
+
+  // "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Visites del fitxer",
+
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Vistes principals per país",
+
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Visites principals per ciutat",
+
+  // "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Visites",
+
+
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Editar enviament",
+
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Editar enviament",
+
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Cancel·lar",
+
+  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit": "No teniu els permisos per fer un enviament nou.",
+
+  // "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Dipositar",
+
+  // "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Cancel·lar",
+
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Aquesta operació no es pot desfer. Esteu segur?",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Sí que estic segur",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Descartar enviament",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Descartar",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Guardat",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Canvis no desats",
+
+  // "submission.general.save": "Save",
+  "submission.general.save": "Guardar",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "Desa per més endavant",
+
+
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Importar metadades des d'una font externa",
+
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "Importar metadades des d'una font externa",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importar una revista des d'una font externa",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importar un número de revista des d'una font externa",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importar un volum de revista des d'una font externa",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importar editor des d'una font externa",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importar una persona des d'una font externa",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importar projectes des d'una font externa",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importar una publicació des d'una font externa",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importar metadades des d'una font externa",
+
+  // "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": "Introduïu una consulta a dalt per buscar ítems de la web per importar-los a DSpace.",
+
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "Tornar al meu DSpace",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Cerca font externa",
+
+  // "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Cerca",
+
+  // "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Escriviu algunes paraules per cercar",
+
+  // "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Trieu una font externa",
+
+  // "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": "Oficina Europea de Patents (EPO)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "Carregant ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "Revistes SHERPA",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "Revistes SHERPA per ISSN",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "Editors SHERPA",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "API de Finançament d'OpenAIRE",
+
+  // "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "ORCID",
+
+  // "submission.import-external.source.pubmed": "Pubmed",
+  "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",
+  "submission.import-external.source.lcname": "Noms de la Biblioteca del Congrés",
+
+  // "submission.import-external.preview.title": "Item Preview",
+  "submission.import-external.preview.title": "Vista prèvia de l'ítem",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Previsualització de Publicació",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Previsualització d'Ítem",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Previsualització de Revista",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Previsualització d'Unitat organitzativa",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Previsualització de Persona",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Previsualització de Projecte",
+
+  // "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": "Les metadades següents s'han importat d'una font externa. S'omplirà prèviament quan inicieu l'enviament.",
+
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Iniciar enviament",
+
+  // "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Error d'enviament",
+
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "S'ha produït un error durant el procés d'importació de l'entrada de font externa.",
+
+  // "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "Tancar",
+
+  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Entrada local afegida amb èxit a la selecció",
+
+  // "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": "Importació remota d'autor",
+
+  // "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": "Importació remota de revista",
+
+  // "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": "Importació remota de número de revista",
+
+  // "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": "Importació remota de volum de revista",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projecte",
+
+  // "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": "Importació remota d'ítem",
+
+  // "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": "Importació remota d'esdeveniment",
+
+  // "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": "Importació remota de producte",
+
+  // "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": "Importació remota d'equipament",
+
+  // "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": "Importació remota d'unitat organitzativa",
+
+  // "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": "Importació remota de finançament",
+
+  // "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": "Importació remota de persona",
+
+  // "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": "Importació remota de 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": "Importació remota de projecte",
+
+  // "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": "Importació remota de publicació",
+
+  // "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": "Nova entitat afegida!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projecte",
+
+  // "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": "API OpenAIRE de Finançament",
+
+  // "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": "Importació remota d'autor",
+
+  // "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": "Autor local afegit amb èxit a la selecció",
+
+  // "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": "Autor extern importat i afegit amb èxit a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoritat",
+
+  // "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": "Importa com una nova entrada d'autoritat local",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel·lar",
+
+  // "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": "Seleccioneu una col·lecció per importar entrades noves",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entitats",
+
+  // "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": "Importar com una nova entitat local",
+
+  // "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": "Importa des de LCName",
+
+  // "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": "Important des d'ORCID",
+
+  // "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": "Importar des de Sherpa Journal",
+
+  // "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": "Importar des de Sherpa Publisher",
+
+  // "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": "Importa des de 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": "Important des d'arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
+
+  // "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": "Importació remota de Revista",
+
+  // "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": "Revista local afegida amb èxit a la selecció",
+
+  // "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": "Revista externa importada i afegida amb èxit a la selecció",
+
+  // "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": "Importació remota de número de revista",
+
+  // "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": "S'ha afegit localment un número de revista a la selecció.",
+
+  // "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": "S'ha importat amb èxit i s'ha afegit externament un número de revista a la selecció.",
+
+  // "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": "Importació remota de volum de revista",
+
+  // "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": "S'ha afegit amb èxit el volum de la revista local a la selecció.",
+
+  // "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": "S'ha importat i afegit amb èxit un volum de revista extern a la selecció",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccioneu una coincidència local:",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar tot",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Desseleccionar pàgina",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Carregant...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Consulta de cerca",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Anar",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Cerca...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Seleccionar tot",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Selecciona la pàgina",
+
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "{{ size }} ítems seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autors locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revistes locals ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projectes locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicacions locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autors locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unitats organitzatives locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Paquets de dades locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Fitxers de dades locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistes locals ({{ count }})",
+
+  // "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 locals ({{ 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 locals ({{ 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": "Volums de revista locals ({{ 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": "Volums de revista locals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Revistes 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": "Editors Sherpa ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "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 }})",
+  "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 }})",
+  "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.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.isFundingAgencyOfPublication": "Cerca d'agències de finançament",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Cerca de finançament",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Cerca d'unitats organitzatives",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "API OpenAire de Finançament",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projectes",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Finançador del Projecte",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicació de l'autor",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "API OpenAIRE de Finançament",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projecte",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projectes",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Finançador del Projecte",
+
+
+
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Cerca...",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selecció actual ({{ count }})",
+
+  // "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": "Volums de revista",
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volums de revista",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistes",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autors",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agència finançadora",
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projectes",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publicacions",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autors",
+
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Unitats organitzatives",
+
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Paquets de dades",
+
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Fitxers d'informació",
+
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agència finançadora",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finançament",
+
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unitat organitzativa matriu",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicació",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Configuració",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "La vostra selecció està actualment buida.",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autors seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistes seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volum de revista seleccionada",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projectes seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicacions seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autors seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unitats organitzatives seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Paquets de dades seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Fitxers de dades seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistes seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número de revista seleccionat",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volums de revista seleccionats",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agències de finançament seleccionades",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Finançaments seleccionats",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número seleccionat",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Unitat organitzativa seleccionada",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultats de la cerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultats de la cerca",
+
+  // "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": "Li agradaria desar \"{{ value }}\" com una variant de nom per a aquesta persona perquè vostè i altres puguin reutilitzar-lo per a enviaments futurs? Si no ho fa, encara pot usar-lo per a aquest enviament.",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar una nova variant de nom",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar només per a aquest enviament",
+
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Tipus de llicència",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Seleccioneu un tipus de llicència…",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Canvieu el vostre tipus de llicència…",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "No hi ha llicències disponibles",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Seleccioneu una opció…",
+
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+  "submission.sections.ccLicense.link": "Ha seleccionat la llicència següent:",
+
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+  "submission.sections.ccLicense.confirmation": "Concedeixo la llicència",
+
+  // "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Afegir més",
+
+  // "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": "El dipòsit no s'ha pogut completar per errors al formulari.<br>Omple tots els camps obligatoris per completar el dipòsit",
+
+  // "submission.sections.general.collection": "Collection",
+  "submission.sections.general.collection": "Col·lecció",
+
+  // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
+  "submission.sections.general.deposit_error_notice": "S'ha produït un problema en enviar l'ítem. Torneu-ho a provar més tard.",
+
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Enviament dipositat amb èxit.",
+
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "S'ha produït un problema en descartar l'ítem. Torneu-ho a provar més tard.",
+
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Enviament descartat amb èxit.",
+
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "S'han extret i han afegit noves metadades a la secció <strong>{{ sectionId }}</strong>.",
+
+  // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "S'ha afegit una nova secció <strong>{{ sectionId }}</strong> a l'enviament.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "No s'ha trobat cap col·lecció",
+
+  // "submission.sections.general.no-sections": "No options available",
+  "submission.sections.general.no-sections": "No hi ha opcions disponibles",
+
+  // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
+  "submission.sections.general.save_error_notice": "S'ha produït un problema en desar l'ítem. Torneu-ho a provar més tard.",
+
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Enviament desat amb èxit.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Cerca una col·lecció",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Hi ha seccions incompletes.",
+
+
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Condicions d'accés a l'ítem",
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Llicència Creative Commons",
+
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Reciclar",
+
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Descriure",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Descriure",
+
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Descriure",
+
+  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.detect-duplicate": "Possibles duplicats",
+
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Llicència de dipòsit",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "Polítiques Sherpa",
+
+  // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Pujar fitxers",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informació sobre polítiques editorials d'accés obert",
+
+
+  // "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 es troba disponible la informació sobre política editorial. Si teniu un ISSN associat, introduïu-lo a dalt per veure informació sobre polítiques editorials d'accés obert.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Errors",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Vàlid",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Avisos",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "amb errors",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "és vàlid",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "amb avisos",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Informació addicional",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Informació addicional",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Obrir secció",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Tancar secció",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Expandir secció {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Contraure secció {{sectionHeader}}",
+
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "Cancel·lar",
+
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Aquesta operació no es pot desfer. Esteu segur?",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Sí, n'estic segur",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Eliminar fitxer",
+
+  // "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Esborrar",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Descarregar fitxer",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Deixeu anar fitxers per adjuntar-los a l'ítem",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Editar fitxer",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Tipus de condició d'accés",
+
+  // "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": "Seleccioneu la condició d'accés que s'aplicarà als fitxers una vegada es dipositi l'ítem",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Es requereix la data.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "Per aplicar l'accés es requereix una data d'inici.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Per aplicar l'accés es requereix una data de finalització.",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "Permetre accés des de",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Seleccioneu la data a partir de la qual serà aplicada la condició d'accés",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "Des de",
+
+  // "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Grup",
+
+  // "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Es requereix el grup.",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "Concedir accés fins",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Seleccioneu la data fins a la qual serà aplicada la condició d'accés",
+
+  // "submission.sections.upload.form.until-placeholder": "Until",
+  "submission.sections.upload.form.until-placeholder": "Fins",
+
+  // "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": "Es podrà accedir als fitxers carregats a la col·lecció {{ collectionName }} d'acord amb els grups següents:",
+
+  // "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": "Tingueu en compte que els fitxers carregats a la col·lecció {{ collectionName }} seran accessibles, a més del que es decideixi explícitament per al fitxer, per als grups següents:",
+
+  // "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": "Aquí trobareu tots els fitxers que es troben actualment a l'ítem. Podeu actualitzar les metadades del fitxer i les condicions d'accés o <strong>incloure fitxers addicionals simplement arrossegant i deixant anar a qualsevol lloc de la pàgina</strong>",
+
+  // "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "No",
+
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Encara no s'ha penjat cap fitxer.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Guardar metadades",
+
+  // "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Cancel·lar",
+
+  // "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Pujada fallida",
+
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Pujada completada amb èxit",
+
+  // "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": "Si el marca, l'ítem serà detectable al cercador/navegador. Si el desmarca, l'ítem només estarà disponible mitjançant l'enllaç directe, i no apareixerà al cercar/navegar.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Públic (Detectable)",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Tipus de condició d'accés",
+
+  // "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": "Seleccioneu la condició d'accés que s'aplicarà a l'ítem una vegada dipositat",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Es requereix una data.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Per aplicar l'accés cal una data d'inici.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Per aplicar l'accés cal una data de finalització.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Permetre accés des de",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Seleccioneu la data a partir de la qual serà aplicada la condició d'accés",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Des de",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Grup",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Es requereix un grup.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Permetre accés fins",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Seleccioneu la data fins a quina serà aplicada la condició d'accés",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Fins",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confirmo la llicència",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Ha d'acceptar la llicència",
+
+  // "submission.sections.license.notgranted":  "You must accept the license",
+  "submission.sections.license.notgranted": "Heu d'acceptar la llicència",
+
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informació de la Publicació",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Títol",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "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": "Editor",
+
+  // "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": "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 següent informacióm s'ha trobat via Sherpa Romeo. En base a aquestes polítiques, es proporcionen consells sobre les necessitats d'un embargament i d'aquells fitxers que podeu utilitzar. Si teniu dubtes, si us plau, contacteu amb l'administrador del repositori mitjançant el formulari de suggeriments.",
+
+  // "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": "Els camins cap a l'accés Obert que aquesta revista permet es llisten a sota per versió d'article. Feu clic en un camí per a una visió més detallada",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Per a més informació, si us plau, seguiu els següents enllaços:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versió",
+
+  // "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargament",
+
+  // "submission.sections.sherpa.publisher.policy.noembargo": "No Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Sense Embargament",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Cap",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Llicència",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisits",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Lloc",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Condicions",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Refrescar",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informació del registre",
+
+  // "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": "Data de creació",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Última modificació",
+
+  // "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": "S'ha produït un error recuperant la informació de Sherpa",
+
+
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Nou enviament",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Nou enviament",
+
+
+
+  // "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Eliminar",
+
+  // "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": "Si voleu descartar aquest element, seleccioneu \"Eliminar\". Després se us demanarà que ho confirmeu.",
+
+  // "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Editar",
+
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Seleccioneu aquesta opció per canviar les metadades de l'ítem.",
+
+  // "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Veure",
+
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Seleccioneu aquesta opció per veure les metadades de l'ítem.",
+
+
+
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "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": "Si heu revisat l'ítem i és adequat per incloure'l a la col·lecció, seleccioneu \"Aprovar\".",
+
+  // "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Editar",
+
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Seleccioneu aquesta opció per canviar les metadades de l'ítem.",
+
+  // "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": "Introduïu el vostre motiu per rebutjar l'enviament al quadre a continuació, indicant si el remitent pot solucionar el problema i tornar-lo a enviar.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Descriviu el motiu del rebuig.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Rebutjar l'element",
+
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Raó",
+
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Rebutjar",
+
+  // "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": "Si heu revisat l'ítem i heu trobat que <strong>no</strong> és adequat per a la seva inclusió a la col·lecció, seleccioneu \"Rebutjar\". Després, se us demanarà que introduïu un missatge que indiqui per què l'ítem no és adequat i si el remitent ha de canviar alguna cosa i tornar-ho a enviar.",
+
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Retornar al pool",
+
+  // "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": "Torneu la tasca al pool perquè un altre usuari pugui realitzar-la.",
+
+
+
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "S'ha produït un error durant l'operació...",
+
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Processant...",
+
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Remitent",
+
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "Operació completada amb èxit",
+
+
+
+  // "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Assumir tasca",
+
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Assignar aquesta tasca a vosaltres mateixos.",
+
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Amagar detalls",
+
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Mostrar detalls",
+
+
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Veure",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Seleccioneu aquesta opció per veure les metadades de l'ítem.",
+
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Miniatura",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "No hi ha miniatura disponible",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Logotip del projecte",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Imatge del projecte al marcador de posició",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Logotip d'Unitat Organitzativa",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Imatge d'Unitat Organitzativa al marcador de posició",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Foto de perfil",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "No hi ha imatge de perfil disponible",
+
+
+
+  // "title": "DSpace",
+  "title": "DSpace",
+
+
+
+  // "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Vista d'arbre jeràrquic",
+
+  // "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Carregar més",
+
+  // "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Reiniciar",
+
+  // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Cerca",
+
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "No hi havia elements per mostrar",
+
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "Norwegian Science Index",
+
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc": "Categories de temes de recerca",
+
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Selecciona un tema per afegir com a filtre de cerca",
+
+  // "uploader.browse": "browse",
+  "uploader.browse": "examinar",
+
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Arrossegar i deixar anar els fitxers aquí",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Esborrar",
+
+  // "uploader.or": ", or ",
+  "uploader.or": ", o ",
+
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "Processant pujada de fitxer(s), (ara és segur tancar aquesta pàgina)",
+
+  // "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Longitud de la cua",
+
+  // "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": "Seleccioneu els tipus per als quals voleu desar les metadades virtuals com a metadades reals",
+
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "Les metadades virtuals d'aquesta relació",
+
+  // "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": "Seleccioneu els ítems per als quals voleu desar les metadades virtuals com a metadades reals",
+
+
+
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Els teus enviaments",
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Administrar flux de treball",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Tasques del flux de treball",
+
+
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Editar ítem del flux de treball",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Editar ítem del flux de treball",
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Eliminat",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Aquest ítem del flux de treball s'ha eliminat correctament",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "No s'ha pogut eliminar l'ítem del flux de treball",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Eliminar ítem del flux de treball",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Eliminar ítem del flux de treball",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Cancel·lar",
+
+  // "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm": "Esborrar",
+
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Tornar al remitent",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Aquest ítem del flux de treball s'ha tornat correctament al remitent.",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Alguna cosa ha sortit malament",
+
+  // "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": "L'ítem del flux de treball no s'ha pogut tornar al remitent.",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Enviar l'ítem del flux de treball al remitent",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Enviar l'ítem del flux de treball al remitent",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Cancel·lar",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "Tornar",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Vista del flux de treball",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Vista del flux de treball",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Vista del flux de treball",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "La sessió caducarà aviat",
+
+  // "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": "Per raons de seguretat, les sessions d'usuari caduquen després de {{ timeToExpire }} minuts d'inactivitat. La vostra sessió caducarà aviat. Voleu prolongar-la o tancar la sessió?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Tancar sessió",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Prolongar la sessió",
+
+  // "researcher.profile.action.processing" : "Processing...",
+  "researcher.profile.action.processing": "Processant...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Perfil associat d'investigador",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "S'ha produït un error en canviar la visibilitat del perfil",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Crear nou",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Perfil d'investigador creat amb èxit",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "S'ha produït un error en la creació del perfil d'investigador",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Esborrar",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Mostrar",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Ocultar",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "No hi ha associat encara un perfil d'investigador",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Veure",
+
+  // "researcher.profile.private.visibility" : "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVAT",
+
+  // "researcher.profile.public.visibility" : "PUBLIC",
+  "researcher.profile.public.visibility": "PÚBLIC",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Estat:",
+
+  // "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à autoritzat per reclamar aquest ítem. Contacteu amb l'administrador per a més detalls.",
+
+  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "S'ha produït un error reclamant el perfil, si us plau, intenteu-ho més tard",
+
+  // "researcherprofile.error.claim.title" : "Error",
+  "researcherprofile.error.claim.title": "Error",
+
+  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Perfil reclamat amb èxit",
+
+  // "researcherprofile.success.claim.title" : "Success",
+  "researcherprofile.success.claim.title": "Èxit",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Crear un ORCID ID",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autoritzacions concedides",
+
+  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Concedir autoritzacions",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Connectar amb ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Connectant perfil amb 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": "Alguna cosa ha fallat en connectar el perfil amb ORCID. Si el problema continua, contacteu amb l'administrador.",
+
+  // "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'ORCID iD d'aquest perfil ({{ orcid }}) encara no s'ha connectat amb un compte al registre ORCID o la connexió ha caducat.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Desconectar d'ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Processant...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Falten autoritzacions",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Falten les següents autoritzacions:",
+
+  // "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": "Perfecte! Aquesta caixa està buida, per la qual cosa vostè ha concedit tots els permisos d'accés per a totes les funcions que utilitza la vostra institució.",
+
+  // "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": "Encara no està associat amb un ORCID iD. En prémer el botó inferior pot enllaçar aquest perfil amb un compte ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Preferències del perfil",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Preferències de finançament",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Preferències de publicació",
+
+  // "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 necessiteu retirar el vostre ORCID, contacteu si us plau amb l'administrador del repositori",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Actualitzar configuració",
+
+  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Afiliació",
+
+  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Biografia",
+
+  // "person.page.orcid.sync-profile.education" : "Education",
+  "person.page.orcid.sync-profile.education": "Titulació",
+
+  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identificadors",
+
+  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  "person.page.orcid.sync-fundings.all": "Tots els finançaments",
+
+  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  "person.page.orcid.sync-fundings.mine": "El meu finançament",
+
+  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Finançaments seleccionats",
+
+  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Deshabilitat",
+
+  // "person.page.orcid.sync-publications.all" : "All publications",
+  "person.page.orcid.sync-publications.all": "Totes les publicacions",
+
+  // "person.page.orcid.sync-publications.mine" : "My publications",
+  "person.page.orcid.sync-publications.mine": "Les meves publicacions",
+
+  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Publicacions seleccionades",
+
+  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Deshabilitat",
+
+  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Desfer el canvi i no sincronitzar amb ORCID",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "No s'ha pogut descartar el registre de la cua ORCID",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "El registre ORCID ha estat eliminat amb èxit de la cua",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "La cua del registre d'ORCID és buida",
+
+  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  "person.page.orcid.sync-queue.table.header.type": "Tipus",
+
+  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  "person.page.orcid.sync-queue.table.header.description": "Descripció",
+
+  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Acció",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Afiliacions",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "País",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Titulacions",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "IDs externs",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Altres signatures",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualificacions",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLs de l'investigador",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Paraules clau",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Afegir una nova entrada al registre ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Actualitzar aquesta entrada al registre ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Retira aquesta entrada del registre ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publicació",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projecte",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Afiliació",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Titulació",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificació",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Altres signatures",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "País",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Paraules clau",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identificador extern",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL de l'investigador",
+
+  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Sincronitzar amb el 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": "Ha fallar l'enviament a ORCID degut a autorització insuficient.",
+
+  // "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": "Premeu <a href='{{orcid}}'>aquí</a> per tornar a concedir els permisos requerits. Si continueu el problema, contacteu amb l'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": "L'enviament a ORCID ha fallat perquè el recurs que s'ha enviat no era vàlid",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "Ha fallat l'enviament 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": "L'enviament a ORCID ha fallat pel fet que el recurs ja existia al 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": "El recurs ja no existeix al registre ORCID.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "L'enviament a ORCID ha estat completat amb èxit",
+
+  // "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 dades que vol sincronitzar amb ORCID no són vàlides",
+
+  // "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": "Es requereix la quantitat de divisa",
+
+  // "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": "El recurs que es vol enviar necessita com a mínim un identificador",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Es requereix un títol",
+
+  // "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": "Es requereix un 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": "Es requereix una data d'inici",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Es requereix un finançador",
+
+  // "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": "Els 2 dígits ISO 3166 de país són invàlids",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Es requereix una organització",
+
+  // "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": "Es requereix el nom de l'organització",
+
+  // "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 data de la publicació ha de 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": "Es requereix l'adreça de l'organització",
+
+  // "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": "Es requereix que la direcció de l'organització tingui una ciutat",
+
+  // "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": "Cal que l'adreça de l'organització tingui un codi de país de 2 dígits ISO 3166 vàlid",
+
+  // "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": "Es requereix un identificador per desambiguar l'organització. Els identificadors admesos són GRID, Ringgold, Legal Entity identifiers (LEIs) i Crossref Funder Registry",
+
+  // "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": "Es requereix que els identificadors de l'organització tinguin un valor",
+
+  // "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": "Es requereix que els identificadors de l'organització tinguin una font",
+
+  // "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 font d'un dels identificadors d'organització és invàlida. Les fonts admeses són RINGGOLD, GRID, LEI i FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Mode sincronització",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Mode sincronització",
+
+  // "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": "Seleccioneu com preferiu realitzar la sincronització amb ORCID. Podeu escollir \"Manual\" (vosaltres envieu les dades a ORCID manualment), o \"Batch\" (el sistema enviarà les vostres dades a ORCID.",
+
+  // "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": "Seleccioneu si enviareu informació de les vostres entitats connectades de tipus Projecte a la informació de finançament d'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": "Seleccioneu si enviareu informació de les vostres entitats connectades de tipus Publicació a la informació de treballs d'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": "Seleccioneu si enviareu informació de les vostres dades biogràfiques o identificadors personals a ORCID",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Els paràmetres de sincronització s'han actualitzat amb èxit",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "Ha fallat l'actualització dels paràmetres de sincronització",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manual",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtingueu el vostre ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Llegiu la vostra informació amb la visibilitat ajustada a Tercers Confiables",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Afegir/actualitzar les vostres activitats de recerca",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Afegir/actualitzar altres informacions sobre vostè",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "S'ha efectuat amb èxit la desconnexió entre el perfil i el registre d'ORCID",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "S'ha produït un error en la desconnexió entre el perfil i el registre d'ORCID. Torneu-ho a provar",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Paràmetres de sincronització d'ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Cua de registre d'ORCID",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autoritzacions ORCID",
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Enviaments recents",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Aquest objecte no s'ha pogut recuperar",
+
+
+}
diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5
index 718d715cbf..651a3fd6b3 100644
--- a/src/assets/i18n/cs.json5
+++ b/src/assets/i18n/cs.json5
@@ -1,6615 +1,7031 @@
 {
-  
+
   // "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.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",
-  
-  
-  
+
+
+
   // "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.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.forbidden": "forbidden",
   // TODO New key - Add a translation
   "403.forbidden": "forbidden",
-  
-  
-  
+
+
+
   // "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.link.home-page": "Take me to the home page",
   "404.link.home-page": "Přejít na domovskou stránku",
-  
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "stránka nenalezena",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.title": "System curation tasks",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.header": "System curation tasks",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  
+
   // "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.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.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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.success.head": "Success",
-  
+
   // "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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.success.head": "Success",
-  
+
   // "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.edit.breadcrumbs": "Bitstream format",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  
+
   // "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.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.label": "File extensions",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  
+
   // "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.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.label": "Internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  
+
   // "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.label": "MIME Type",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
+
   // "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.label": "Name",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.success.head": "Success",
-  
+
   // "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.label": "Support level",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "Registr formátů souborů",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  
+
   // "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.internal": "internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.internal": "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.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.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.return": "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.SUPPORTED": "Supported",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "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.head": "Support Level",
   // 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.metadata.breadcrumbs": "Metadata registry",
   // TODO New key - Add a translation
   "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.",
   "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.form.create": "Create metadata schema",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.create": "Create metadata schema",
-  
+
   // "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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.name": "Name",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.delete": "Delete selected",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "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.schema.breadcrumbs": "Metadata schema",
   // TODO New key - Add a translation
   "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
+
   // "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.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Pole schématu metadat",
-  
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Žádná metadatová pole.",
-  
+
   // "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.field": "Field",
   "admin.registries.schema.fields.table.field": "Pole",
-  
+  // TODO New key - Add a 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.form.create": "Create metadata field",
   // TODO New key - Add a translation
   "admin.registries.schema.form.create": "Create metadata field",
-  
+
   // "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.element": "Element",
   // TODO New key - Add a translation
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   // TODO New key - Add a translation
   "admin.registries.schema.form.qualifier": "Qualifier",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.form.scopenote": "Scope Note",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Schéma metadat",
-  
+
   // "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.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.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.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.failure": "Error",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.failure": "Error",
-  
+
   // "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.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.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.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.success": "Success",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.success": "Success",
-  
+
   // "admin.registries.schema.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.schema.return": "Return",
-  
+
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
   "admin.registries.schema.title": "DSpace Angular :: Registr schémat metadat",
-  
-  
-  
+
+
+
   // "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.impersonate": "Impersonate EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
+
   // "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.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.title": "DSpace Angular :: EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.head": "EPeople",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.head": "Search",
-  
+
   // "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.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.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.button": "Search",
-  
+
   // "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.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.email": "E-mail (exact)",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
+
   // "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{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.form.create": "Create EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.create": "Create EPerson",
-  
+
   // "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.firstName": "First name",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.firstName": "First name",
-  
+
   // "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.email": "E-mail",
   // TODO New key - Add a 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.canLogIn": "Can log in",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.goToGroups": "Add to groups",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
+
   // "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.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.groups.title": "DSpace Angular :: Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
+
   // "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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.head": "Groups",
-  
+
   // "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.search.head": "Search groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.head": "Search groups",
-  
+
   // "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.search.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.button": "Search",
-  
+
   // "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.members": "Members",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.members": "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{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.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.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.content": "Cause: \"{{cause}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.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.edit": "Edit group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.head.edit": "Edit group",
-  
+
   // "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.groupDescription": "Description",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.groupDescription": "Description",
-  
+
   // "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.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.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.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.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.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.actions.delete": "Delete Group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
+
   // "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.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.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.confirm": "Delete",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-subgroups-yet": "No subgroups in group yet.",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.collection.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.collection.edit": "Edit",
-  
+
   // "admin.search.community.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.community.edit": "Edit",
-  
+
   // "admin.search.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.search.item.delete": "Delete",
-  
+
   // "admin.search.item.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.item.edit": "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-public": "Make Public",
   // TODO New key - Add a translation
   "admin.search.item.make-public": "Make Public",
-  
+
   // "admin.search.item.move": "Move",
   // TODO New key - Add a translation
   "admin.search.item.move": "Move",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   // TODO New key - Add a translation
   "admin.search.item.reinstate": "Reinstate",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   // TODO New key - Add a translation
   "admin.search.item.withdraw": "Withdraw",
-  
+
   // "admin.search.title": "Administrative Search",
   // TODO New key - Add a translation
   "admin.search.title": "Administrative Search",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   // TODO New key - Add a translation
   "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.breadcrumbs": "Administer Workflow",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.title": "Administer Workflow",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
-  
+
   // "admin.workflow.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.workflow.item.delete": "Delete",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   // TODO New key - Add a translation
   "admin.workflow.item.send-back": "Send back",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.title": "Import Metadata",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.page.header": "Import Metadata",
-  
+
   // "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.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.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.button.return": "Return",
   // TODO New key - Add a translation
   "admin.metadata-import.page.button.return": "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.error.addFile": "Select file first!",
   // TODO New key - Add a translation
   "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
+
+
+
+
   // "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.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   // TODO New key - Add a translation
   "bitstream.edit.bitstream": "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.label": "Description",
   // TODO New key - Add a translation
   "bitstream.edit.form.description.label": "Description",
-  
+
   // "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.label": "Embargo until specific date",
   // TODO New key - Add a translation
   "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
+
   // "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.label": "Filename",
   // TODO New key - Add a translation
   "bitstream.edit.form.fileName.label": "Filename",
-  
+
   // "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.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.primaryBitstream.label": "Primary bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
+
   // "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.label": "Selected Format",
   // TODO New key - Add a translation
   "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
+
   // "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.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.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.title": "Bitstream saved",
   // TODO New key - Add a translation
   "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
+
+
+
   // "browse.comcol.by.author": "By Author",
   // TODO New key - Add a translation
   "browse.comcol.by.author": "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.subject": "By Subject",
   // TODO New key - Add a translation
   "browse.comcol.by.subject": "By Subject",
-  
+
   // "browse.comcol.by.title": "By Title",
   // TODO New key - Add a translation
   "browse.comcol.by.title": "By Title",
-  
+
   // "browse.comcol.head": "Browse",
   // TODO New key - Add a translation
   "browse.comcol.head": "Browse",
-  
+
   // "browse.empty": "No items to show.",
   // TODO New key - Add a translation
   "browse.empty": "No items to show.",
-  
+
   // "browse.metadata.author": "Author",
   // TODO New key - Add a translation
   "browse.metadata.author": "Author",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued": "Issue Date",
-  
+
   // "browse.metadata.subject": "Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject": "Subject",
-  
+
   // "browse.metadata.title": "Title",
   // TODO New key - Add a translation
   "browse.metadata.title": "Title",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   // TODO New key - Add a translation
   "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   // TODO New key - Add a translation
   "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_start": "(Choose start)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_year": "(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.months.april": "April",
   // TODO New key - Add a translation
   "browse.startsWith.months.april": "April",
-  
+
   // "browse.startsWith.months.august": "August",
   // TODO New key - Add a translation
   "browse.startsWith.months.august": "August",
-  
+
   // "browse.startsWith.months.december": "December",
   // TODO New key - Add a translation
   "browse.startsWith.months.december": "December",
-  
+
   // "browse.startsWith.months.february": "February",
   // TODO New key - Add a translation
   "browse.startsWith.months.february": "February",
-  
+
   // "browse.startsWith.months.january": "January",
   // TODO New key - Add a translation
   "browse.startsWith.months.january": "January",
-  
+
   // "browse.startsWith.months.july": "July",
   // TODO New key - Add a translation
   "browse.startsWith.months.july": "July",
-  
+
   // "browse.startsWith.months.june": "June",
   // TODO New key - Add a translation
   "browse.startsWith.months.june": "June",
-  
+
   // "browse.startsWith.months.march": "March",
   // TODO New key - Add a translation
   "browse.startsWith.months.march": "March",
-  
+
   // "browse.startsWith.months.may": "May",
   // TODO New key - Add a translation
   "browse.startsWith.months.may": "May",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   // TODO New key - Add a translation
   "browse.startsWith.months.none": "(Choose month)",
-  
+
   // "browse.startsWith.months.november": "November",
   // TODO New key - Add a translation
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   // TODO New key - Add a translation
   "browse.startsWith.months.october": "October",
-  
+
   // "browse.startsWith.months.september": "September",
   // TODO New key - Add a translation
   "browse.startsWith.months.september": "September",
-  
+
   // "browse.startsWith.submit": "Go",
   // TODO New key - Add a translation
   "browse.startsWith.submit": "Go",
-  
+
   // "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_text": "Or enter first few letters:",
   // TODO New key - Add a translation
   "browse.startsWith.type_text": "Or enter first few letters:",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title": "Prohlížíte {{ collection }} dle {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   // TODO New key - Add a translation
   "chips.remove": "Remove chip",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   // TODO New key - Add a translation
   "collection.create.head": "Create a Collection",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   // TODO New key - Add a translation
   "collection.create.notifications.success": "Successfully created the Collection",
-  
+
   // "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.curate.header": "Curate Collection: {{collection}}",
   // TODO New key - Add a translation
   "collection.curate.header": "Curate Collection: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.delete.cancel": "Cancel",
-  
+
   // "collection.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "collection.delete.confirm": "Confirm",
-  
+
   // "collection.delete.head": "Delete Collection",
   // TODO New key - Add a translation
   "collection.delete.head": "Delete Collection",
-  
+
   // "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.success": "Successfully deleted collection",
   // TODO New key - Add a translation
   "collection.delete.notification.success": "Successfully deleted collection",
-  
+
   // "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.edit.delete": "Delete this collection",
   // TODO New key - Add a translation
   "collection.edit.delete": "Delete this collection",
-  
+
   // "collection.edit.head": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.head": "Edit Collection",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "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.item-mapper.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.cancel": "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.confirm": "Map selected items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.confirm": "Map selected items",
-  
+
   // "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.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.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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.remove": "Remove selected item mappings",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  
+
   // "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.map": "Map new items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.tabs.map": "Map new items",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   // TODO New key - Add a translation
   "collection.edit.logo.label": "Collection logo",
-  
+
   // "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.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.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.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.error.title": "Error deleting logo",
   // TODO New key - Add a translation
   "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+
   // "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.notifications.success": "Successfully edited the Collection",
   // TODO New key - Add a translation
   "collection.edit.notifications.success": "Successfully edited the Collection",
-  
+
   // "collection.edit.return": "Return",
   // TODO New key - Add a translation
   "collection.edit.return": "Return",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "collection.edit.tabs.curate.head": "Curate",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "collection.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "collection.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.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.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.harvestType": "Content being harvested",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
+
   // "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.metadataConfigId": "Metadata Format",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
+
   // "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.oaiSource": "OAI Provider",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
+
   // "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_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_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.head": "Content Source",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.head": "Content Source",
-  
+
   // "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.title": "Changed discarded",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Content Source saved",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
+
   // "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.template.add-button": "Add",
   // TODO New key - Add a translation
   "collection.edit.template.add-button": "Add",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   // TODO New key - Add a translation
   "collection.edit.template.breadcrumbs": "Item template",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.template.cancel": "Cancel",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   // TODO New key - Add a translation
   "collection.edit.template.delete-button": "Delete",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   // TODO New key - Add a translation
   "collection.edit.template.edit-button": "Edit",
-  
+
   // "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.label": "Template item",
   // TODO New key - Add a translation
   "collection.edit.template.label": "Template item",
-  
+
   // "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.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.title": "Edit Template Item",
   // TODO New key - Add a translation
   "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "collection.form.abstract": "Short Description",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "collection.form.description": "Introductory 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.license": "License",
   // TODO New key - Add a translation
   "collection.form.license": "License",
-  
+
   // "collection.form.provenance": "Provenance",
   // TODO New key - Add a translation
   "collection.form.provenance": "Provenance",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "collection.form.rights": "Copyright text (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "collection.form.tableofcontents": "News (HTML)",
-  
+
   // "collection.form.title": "Name",
   // TODO New key - Add a translation
   "collection.form.title": "Name",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   // TODO New key - Add a translation
   "collection.listelement.badge": "Collection",
-  
-  
-  
+
+
+
   // "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",
   // TODO New key - Add a translation
   "collection.page.browse.recent.empty": "No items to show",
-  
+
   // "collection.page.edit": "Edit this collection",
   // TODO New key - Add a translation
   "collection.page.edit": "Edit this collection",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   // TODO New key - Add a translation
   "collection.page.handle": "Permanent URI for this collection",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "Licence",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Novinky",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "collection.select.confirm": "Confirm selected",
-  
+
   // "collection.select.empty": "No collections to show",
   // TODO New key - Add a translation
   "collection.select.empty": "No collections to show",
-  
+
   // "collection.select.table.title": "Title",
   // TODO New key - Add a translation
   "collection.select.table.title": "Title",
-  
-  
-  
+
+
+
   // "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.title": "Server Error",
   // TODO New key - Add a translation
   "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
+
+
+
   // "communityList.tabTitle": "DSpace - Community List",
   // TODO New key - Add a translation
   "communityList.tabTitle": "DSpace - Community List",
-  
+
   // "communityList.title": "List of Communities",
   // TODO New key - Add a translation
   "communityList.title": "List of Communities",
-  
+
   // "communityList.showMore": "Show More",
   // TODO New key - Add a translation
   "communityList.showMore": "Show More",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   // TODO New key - Add a translation
   "community.create.head": "Create a Community",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   // TODO New key - Add a translation
   "community.create.notifications.success": "Successfully created the Community",
-  
+
   // "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.curate.header": "Curate Community: {{community}}",
   // TODO New key - Add a translation
   "community.curate.header": "Curate Community: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "community.delete.cancel": "Cancel",
-  
+
   // "community.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "community.delete.confirm": "Confirm",
-  
+
   // "community.delete.head": "Delete Community",
   // TODO New key - Add a translation
   "community.delete.head": "Delete Community",
-  
+
   // "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.success": "Successfully deleted community",
   // TODO New key - Add a translation
   "community.delete.notification.success": "Successfully deleted community",
-  
+
   // "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.edit.delete": "Delete this community",
   // TODO New key - Add a translation
   "community.edit.delete": "Delete this community",
-  
+
   // "community.edit.head": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.head": "Edit Community",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.breadcrumbs": "Edit Community",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   // TODO New key - Add a translation
   "community.edit.logo.label": "Community logo",
-  
+
   // "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.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.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.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.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.notifications.success": "Successfully edited the Community",
   // TODO New key - Add a translation
   "community.edit.notifications.success": "Successfully edited the Community",
-  
+
   // "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.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "community.edit.tabs.curate.head": "Curate",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "community.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "community.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   // TODO New key - Add a translation
   "community.listelement.badge": "Community",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   // TODO New key - Add a translation
   "comcol-role.edit.no-group": "None",
-  
+
   // "comcol-role.edit.create": "Create",
   // TODO New key - Add a translation
   "comcol-role.edit.create": "Create",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   // TODO New key - Add a translation
   "comcol-role.edit.restrict": "Restrict",
-  
+
   // "comcol-role.edit.delete": "Delete",
   // TODO New key - Add a translation
   "comcol-role.edit.delete": "Delete",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.community-admin.name": "Administrators",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
+
+
   // "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.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.submitters.name": "Submitters",
   // TODO New key - Add a translation
   "comcol-role.edit.submitters.name": "Submitters",
-  
+
   // "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.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.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.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.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.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.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.editor.name": "Editors",
   // TODO New key - Add a translation
   "comcol-role.edit.editor.name": "Editors",
-  
+
   // "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.finaleditor.name": "Final editors",
   // TODO New key - Add a translation
   "comcol-role.edit.finaleditor.name": "Final editors",
-  
+
   // "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.reviewer.name": "Reviewers",
   // TODO New key - Add a translation
   "comcol-role.edit.reviewer.name": "Reviewers",
-  
+
   // "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.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "community.form.abstract": "Short Description",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "community.form.description": "Introductory 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.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "community.form.rights": "Copyright text (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "community.form.tableofcontents": "News (HTML)",
-  
+
   // "community.form.title": "Name",
   // TODO New key - Add a translation
   "community.form.title": "Name",
-  
+
   // "community.page.edit": "Edit this community",
   // TODO New key - Add a translation
   "community.page.edit": "Edit this community",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   // TODO New key - Add a translation
   "community.page.handle": "Permanent URI for this community",
-  
+
   // "community.page.license": "License",
   "community.page.license": "Licence",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Novinky",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   // 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",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   // TODO New key - Add a translation
   "cookies.consent.accept-all": "Accept all",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   // TODO New key - Add a translation
   "cookies.consent.accept-selected": "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.title": "(opt-out)",
   // TODO New key - Add a translation
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   // TODO New key - Add a translation
   "cookies.consent.app.purpose": "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.title": "(always required)",
   // TODO New key - Add a translation
   "cookies.consent.app.required.title": "(always required)",
-  
+
   // "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.close": "Close",
   // TODO New key - Add a translation
   "cookies.consent.close": "Close",
-  
+
   // "cookies.consent.decline": "Decline",
   // TODO New key - Add a translation
   "cookies.consent.decline": "Decline",
-  
+
   // "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.learnMore": "Customize",
   // TODO New key - Add a translation
   "cookies.consent.content-notice.learnMore": "Customize",
-  
+
   // "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.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.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.title": "Information that we collect",
   // TODO New key - Add a translation
   "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   // TODO New key - Add a translation
   "cookies.consent.app.title.authentication": "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.title.preferences": "Preferences",
   // TODO New key - Add a translation
   "cookies.consent.app.title.preferences": "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.title.acknowledgement": "Acknowledgement",
   // TODO New key - Add a translation
   "cookies.consent.app.title.acknowledgement": "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.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.purpose.functional": "Functional",
   // TODO New key - Add a translation
   "cookies.consent.purpose.functional": "Functional",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   // TODO New key - Add a translation
   "cookies.consent.purpose.statistical": "Statistical",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
+
   // "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.requiredmetadata.label": "Check for Required Metadata",
   // TODO New key - Add a translation
   "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   // TODO New key - Add a translation
   "curation-task.task.translate.label": "Microsoft Translator",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   // TODO New key - Add a translation
   "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   // TODO New key - Add a translation
   "curation.form.task-select.label": "Task:",
-  
+
   // "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.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.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.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.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)",
   // 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)",
-  
-  
-  
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   // TODO New key - Add a translation
   "dso-selector.create.collection.head": "New collection",
-  
+
   // "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.community.head": "New community",
   // TODO New key - Add a translation
   "dso-selector.create.community.head": "New community",
-  
+
   // "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.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.item.head": "New item",
   // TODO New key - Add a translation
   "dso-selector.create.item.head": "New item",
-  
+
   // "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.submission.head": "New submission",
   // TODO New key - Add a translation
   "dso-selector.create.submission.head": "New submission",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   // TODO New key - Add a translation
   "dso-selector.edit.collection.head": "Edit collection",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   // TODO New key - Add a translation
   "dso-selector.edit.community.head": "Edit community",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   // TODO New key - Add a translation
   "dso-selector.edit.item.head": "Edit item",
-  
+
   // "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.no-results": "No {{ type }} found",
   // TODO New key - Add a translation
   "dso-selector.no-results": "No {{ type }} found",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   // TODO New key - Add a translation
   "dso-selector.placeholder": "Search for a {{ type }}",
-  
-  
-  
+
+
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.cancel": "Cancel",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.confirm": "Export",
-  
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   // TODO New key - Add a translation
   "error.bitstream": "Error fetching bitstream",
-  
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Chyba během stahování záznamů",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "Chyba během stahování kolekce",
-  
+
   // "error.collections": "Error fetching collections",
   // TODO New key - Add a translation
   "error.collections": "Error fetching collections",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "Chyba během stahová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.default": "Error",
   "error.default": "Chyba",
-  
+
   // "error.item": "Error fetching item",
   "error.item": "Chyba během stahování záznamu",
-  
+
   // "error.items": "Error fetching items",
   // TODO New key - Add a translation
   "error.items": "Error fetching items",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "Chyba během stahování objektů",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "Chyba během stahování posledních příspěvků",
-  
+
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Chyba během stahování výsledků hledání",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Chyba během stahování subkolekcí",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   // TODO New key - Add a translation
   "error.sub-communities": "Error fetching 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.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Chyba během stahová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.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.filerequired": "The file upload is mandatory",
   // TODO New key - Add a translation
   "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
+
+
+
   // "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",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "software DSpace",
-  
+
   // "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.privacy-policy": "Privacy policy",
   // 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.end-user-agreement": "End User Agreement",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-email.form.header": "Forgot Password",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "forgot-email.form.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Submit",
   // TODO New key - Add a translation
   "forgot-email.form.submit": "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.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-password.title": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.title": "Forgot Password",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.form.head": "Forgot Password",
-  
+
   // "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.card.security": "Security",
   // TODO New key - Add a translation
   "forgot-password.form.card.security": "Security",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   // TODO New key - Add a translation
   "forgot-password.form.identification.header": "Identify",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   // TODO New key - Add a translation
   "forgot-password.form.identification.email": "Email address: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   // TODO New key - Add a translation
   "forgot-password.form.label.password": "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.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.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.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.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.title": "Password reset completed",
   // TODO New key - Add a translation
   "forgot-password.form.notification.success.title": "Password reset completed",
-  
+
   // "forgot-password.form.submit": "Submit password",
   // TODO New key - Add a translation
   "forgot-password.form.submit": "Submit password",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   // TODO New key - Add a translation
   "form.add": "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.cancel": "Cancel",
   "form.cancel": "Zrušit",
-  
+
   // "form.clear": "Clear",
   // TODO New key - Add a translation
   "form.clear": "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.edit": "Edit",
   // TODO New key - Add a translation
   "form.edit": "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.first-name": "First name",
   "form.first-name": "Křestní jméno",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Sbalit",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Kliknutím sem sbalíte",
-  
+
   // "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.last-name": "Last name",
   "form.last-name": "Příjmení",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "Načítá se...",
-  
+
   // "form.lookup": "Lookup",
   // TODO New key - Add a translation
   "form.lookup": "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.no-results": "No results found",
   "form.no-results": "Nebyli nalezeny žádné výsledky",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Nebyla zadána hodnota",
-  
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "Smazat",
-  
+
   // "form.save": "Save",
   // TODO New key - Add a translation
   "form.save": "Save",
-  
+
   // "form.save-help": "Save changes",
   // TODO New key - Add a translation
   "form.save-help": "Save changes",
-  
+
   // "form.search": "Search",
   "form.search": "Hledat",
-  
+
   // "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.submit": "Submit",
   "form.submit": "Odeslat",
-  
-  
-  
+
+
+
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   // TODO New key - Add a translation
   "home.breadcrumbs": "Home",
-  
+
   // "home.title": "DSpace Angular :: Home",
   "home.title": "DSpace Angular :: Domů",
-  
+
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Komunity v DSpace",
-  
+
   // "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.",
-  
-  
-  
+
+
+
   // "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.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.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.breadcrumbs": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
+
   // "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.save": "Save",
   // TODO New key - Add a translation
   "info.end-user-agreement.buttons.save": "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.title": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.title": "End User Agreement",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.breadcrumbs": "Privacy Statement",
-  
+
   // "info.privacy.head": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.head": "Privacy Statement",
-  
+
   // "info.privacy.title": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.title": "Privacy Statement",
-  
-  
-  
+
+
+
   // "item.alerts.private": "This item is private",
   // TODO New key - Add a translation
   "item.alerts.private": "This item is private",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   // TODO New key - Add a translation
   "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
+
+
+
   // "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.title": "Edit item's Policies",
   // TODO New key - Add a translation
   "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   // TODO New key - Add a translation
   "item.badge.private": "Private",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle": "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.new": "Create bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle.new": "Create bundle",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "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": "This item doesn't contain any bundles to upload a bitstream to.",
+
   // "item.bitstreams.upload.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.bitstreams.upload.cancel": "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.item": "Item: ",
   // TODO New key - Add a translation
   "item.bitstreams.upload.item": "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.title": "Created bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
+
   // "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.title": "Upload bitstream",
   // TODO New key - Add a translation
   "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
+
+
+
   // "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.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.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.more": "Load more",
   // TODO New key - Add a translation
   "item.edit.bitstreams.bundle.load.more": "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.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.bitstreams.discard-button": "Discard",
-  
+
   // "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.drag": "Drag",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.drag": "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.remove": "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.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.headers.actions": "Actions",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.description": "Description",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.name": "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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Move changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
+
   // "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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.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.title": "Removal changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.bitstreams.reinstate-button": "Undo",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.bitstreams.save-button": "Save",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   // TODO New key - Add a translation
   "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.delete.cancel": "Cancel",
-  
+
   // "item.edit.delete.confirm": "Delete",
   // TODO New key - Add a translation
   "item.edit.delete.confirm": "Delete",
-  
+
   // "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.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.header": "Delete item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.delete.header": "Delete item: {{ 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.head": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.head": "Edit Item",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.breadcrumbs": "Edit Item",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "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.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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.item-mapper.cancel": "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.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.item": "Item: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
   "item.edit.item-mapper.item": "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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.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.map": "Map new collections",
   // TODO New key - Add a translation
   "item.edit.item-mapper.tabs.map": "Map new collections",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   // TODO New key - Add a translation
   "item.edit.metadata.add-button": "Add",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.metadata.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.remove": "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.unedit": "Stop editing",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  
+
   // "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.headers.edit": "Edit",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.edit": "Edit",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.field": "Field",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.language": "Lang",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.value": "Value",
-  
+
   // "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.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.title": "Changed discarded",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Changed outdated",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  
+
   // "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.title": "Metadata saved",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.metadata.reinstate-button": "Undo",
-  
+
   // "item.edit.metadata.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.metadata.save-button": "Save",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   // TODO New key - Add a translation
   "item.edit.modify.overview.field": "Field",
-  
+
   // "item.edit.modify.overview.language": "Language",
   // TODO New key - Add a translation
   "item.edit.modify.overview.language": "Language",
-  
+
   // "item.edit.modify.overview.value": "Value",
   // TODO New key - Add a translation
   "item.edit.modify.overview.value": "Value",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.move.cancel": "Cancel",
-  
+
   // "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.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.head": "Move item: {{id}}",
   // TODO New key - Add a translation
   "item.edit.move.head": "Move item: {{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.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.move": "Move",
   // TODO New key - Add a translation
   "item.edit.move.move": "Move",
-  
+
   // "item.edit.move.processing": "Moving...",
   // TODO New key - Add a translation
   "item.edit.move.processing": "Moving...",
-  
+
   // "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.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.title": "Move item",
   // TODO New key - Add a translation
   "item.edit.move.title": "Move item",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.private.cancel": "Cancel",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   // TODO New key - Add a translation
   "item.edit.private.confirm": "Make it Private",
-  
+
   // "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.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.public.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.public.cancel": "Cancel",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   // TODO New key - Add a translation
   "item.edit.public.confirm": "Make it Public",
-  
+
   // "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.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.reinstate.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.reinstate.cancel": "Cancel",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   // TODO New key - Add a translation
   "item.edit.reinstate.confirm": "Reinstate",
-  
+
   // "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.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.header": "Reinstate item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.reinstate.header": "Reinstate item: {{ 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.relationships.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.relationships.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.relationships.edit.buttons.remove": "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.no-relationships": "No relationships",
   // TODO New key - Add a translation
   "item.edit.relationships.no-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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.title": "Relationships saved",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.relationships.reinstate-button": "Undo",
-  
+
   // "item.edit.relationships.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.relationships.save-button": "Save",
-  
+
   // "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.tabs.bitstreams.head": "Bitstreams",
   // TODO New key - Add a translation
   "item.edit.tabs.bitstreams.head": "Bitstreams",
-  
+
   // "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.curate.head": "Curate",
   // TODO New key - Add a translation
   "item.edit.tabs.curate.head": "Curate",
-  
+
   // "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.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.relationships.head": "Relationships",
   // TODO New key - Add a translation
   "item.edit.tabs.relationships.head": "Relationships",
-  
+
   // "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.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.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.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.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.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.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.move.button": "Move...",
+
+  // "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...",
-  
+  "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+
   // "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.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.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.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.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.reinstate.button": "Reinstate...",
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  
+
   // "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.withdraw.button": "Withdraw...",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+
   // "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.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.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.itemPage": "Item Page",
   // TODO New key - Add a translation
   "item.edit.tabs.status.labels.itemPage": "Item Page",
-  
+
   // "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.title": "Item Edit -  Status",
   // TODO New key - Add a translation
   "item.edit.tabs.status.title": "Item Edit -  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.title": "Item Edit - Version History",
   // TODO New key - Add a translation
   "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
+
   // "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.view.head": "View Item",
   // TODO New key - Add a translation
   "item.edit.tabs.view.head": "View Item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   // TODO New key - Add a translation
   "item.edit.tabs.view.title": "Item Edit -  View",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.withdraw.cancel": "Cancel",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   // TODO New key - Add a translation
   "item.edit.withdraw.confirm": "Withdraw",
-  
+
   // "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.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.header": "Withdraw item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.withdraw.header": "Withdraw item: {{ 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.listelement.badge": "Item",
   // TODO New key - Add a translation
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   // TODO New key - Add a translation
   "item.page.description": "Description",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "item.page.journal-issn": "Journal ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "item.page.journal-title": "Journal Title",
-  
+
   // "item.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "item.page.publisher": "Publisher",
-  
+
   // "item.page.titleprefix": "Item: ",
   // TODO New key - Add a translation
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "item.page.volume-title": "Volume Title",
-  
+
   // "item.search.results.head": "Item Search Results",
   // TODO New key - Add a translation
   "item.search.results.head": "Item Search Results",
-  
+
   // "item.search.title": "DSpace Angular :: Item Search",
   // TODO New key - Add a translation
   "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Abstrakt",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Autor",
-  
+
   // "item.page.citation": "Citation",
   // TODO New key - Add a translation
   "item.page.citation": "Citation",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Kolekce",
-  
+
   // "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.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.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.name": "Name:",
   // TODO New key - Add a translation
   "item.page.filesection.name": "Name:",
-  
+
   // "item.page.filesection.size": "Size:",
   // TODO New key - Add a translation
   "item.page.filesection.size": "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.link.full": "Full item page",
   "item.page.link.full": "Úplný záznam",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Minimální záznam",
-  
+
   // "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.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-less": "Hide last {{ amount }}",
   // TODO New key - Add a translation
   "item.page.related-items.view-less": "Hide last {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isAuthorOfPublication": "Publications",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isJournalOfPublication": "Publications",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
+
   // "item.page.subject": "Keywords",
   // TODO New key - Add a translation
   "item.page.subject": "Keywords",
-  
+
   // "item.page.uri": "URI",
   "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.collapse": "Collapse",
   // TODO New key - Add a translation
   "item.page.bitstreams.collapse": "Collapse",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
-  
+  "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.filesection.license.bundle": "License bundle",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.uri": "Identifier:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   // TODO New key - Add a translation
   "item.preview.dc.contributor.author": "Authors:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   // TODO New key - Add a translation
   "item.preview.dc.date.issued": "Published date:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   // TODO New key - Add a translation
   "item.preview.dc.description.abstract": "Abstract:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.other": "Other identifier:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   // TODO New key - Add a translation
   "item.preview.dc.language.iso": "Language:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   // TODO New key - Add a translation
   "item.preview.dc.subject": "Subjects:",
-  
+
   // "item.preview.dc.title": "Title:",
   // TODO New key - Add a translation
   "item.preview.dc.title": "Title:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   // TODO New key - Add a translation
   "item.preview.person.familyName": "Surname:",
-  
+
   // "item.preview.person.givenName": "Name:",
   // TODO New key - Add a translation
   "item.preview.person.givenName": "Name:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "item.select.confirm": "Confirm selected",
-  
+
   // "item.select.empty": "No items to show",
   // TODO New key - Add a translation
   "item.select.empty": "No items to show",
-  
+
   // "item.select.table.author": "Author",
   // TODO New key - Add a translation
   "item.select.table.author": "Author",
-  
+
   // "item.select.table.collection": "Collection",
   // TODO New key - Add a translation
   "item.select.table.collection": "Collection",
-  
+
   // "item.select.table.title": "Title",
   // TODO New key - Add a translation
   "item.select.table.title": "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.head": "Version History",
   // TODO New key - Add a translation
   "item.version.history.head": "Version History",
-  
+
   // "item.version.history.return": "Return",
   // TODO New key - Add a translation
   "item.version.history.return": "Return",
-  
+
   // "item.version.history.selected": "Selected version",
   // TODO New key - Add a translation
   "item.version.history.selected": "Selected version",
-  
+
   // "item.version.history.table.version": "Version",
   // TODO New key - Add a translation
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
   // TODO New key - Add a translation
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   // TODO New key - Add a translation
   "item.version.history.table.editor": "Editor",
-  
+
   // "item.version.history.table.date": "Date",
   // TODO New key - Add a translation
   "item.version.history.table.date": "Date",
-  
+
   // "item.version.history.table.summary": "Summary",
   // TODO New key - Add a translation
   "item.version.history.table.summary": "Summary",
-  
-  
-  
+
+
+
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   // 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>.",
-  
-  
-  
+
+
+
   // "journal.listelement.badge": "Journal",
   // TODO New key - Add a translation
   "journal.listelement.badge": "Journal",
-  
+
   // "journal.page.description": "Description",
   // TODO New key - Add a translation
   "journal.page.description": "Description",
-  
+
   // "journal.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journal.page.edit": "Edit this item",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   // TODO New key - Add a translation
   "journal.page.editor": "Editor-in-Chief",
-  
+
   // "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.titleprefix": "Journal: ",
   // TODO New key - Add a translation
   "journal.page.titleprefix": "Journal: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   // TODO New key - Add a translation
   "journalissue.listelement.badge": "Journal Issue",
-  
+
   // "journalissue.page.description": "Description",
   // TODO New key - Add a translation
   "journalissue.page.description": "Description",
-  
+
   // "journalissue.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalissue.page.edit": "Edit this item",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalissue.page.issuedate": "Issue Date",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "journalissue.page.journal-issn": "Journal ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "journalissue.page.journal-title": "Journal Title",
-  
+
   // "journalissue.page.keyword": "Keywords",
   // TODO New key - Add a translation
   "journalissue.page.keyword": "Keywords",
-  
+
   // "journalissue.page.number": "Number",
   // TODO New key - Add a translation
   "journalissue.page.number": "Number",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   // TODO New key - Add a translation
   "journalissue.page.titleprefix": "Journal Issue: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   // TODO New key - Add a translation
   "journalvolume.listelement.badge": "Journal Volume",
-  
+
   // "journalvolume.page.description": "Description",
   // TODO New key - Add a translation
   "journalvolume.page.description": "Description",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalvolume.page.edit": "Edit this item",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalvolume.page.issuedate": "Issue Date",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   // TODO New key - Add a translation
   "journalvolume.page.titleprefix": "Journal Volume: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   // TODO New key - Add a translation
   "journalvolume.page.volume": "Volume",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   // TODO New key - Add a translation
   "loading.bitstream": "Loading bitstream...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   // TODO New key - Add a translation
   "loading.bitstreams": "Loading bitstreams...",
-  
+
   // "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.collection": "Loading collection...",
   "loading.collection": "Načítá se kolekce...",
-  
+
   // "loading.collections": "Loading collections...",
   // TODO New key - Add a translation
   "loading.collections": "Loading collections...",
-  
+
   // "loading.content-source": "Loading content source...",
   // TODO New key - Add a translation
   "loading.content-source": "Loading content source...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "Načítá se komunita...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "Načítá se...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "Načítá se záznam...",
-  
+
   // "loading.items": "Loading items...",
   // TODO New key - Add a translation
   "loading.items": "Loading items...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   // TODO New key - Add a translation
   "loading.mydspace-results": "Loading items...",
-  
+
   // "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.search-results": "Loading search results...",
   "loading.search-results": "Načítají se výsledky hledání...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "Načítají se subkolekce...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   // TODO New key - Add a translation
   "loading.sub-communities": "Loading sub-communities...",
-  
+
   // "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",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "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.new-user": "New user? Click here to register.",
   "login.form.new-user": "Nový uživatel? Zaregistrujte se kliknutím sem.",
-  
+
   // "login.form.or-divider": "or",
   // TODO New key - Add a translation
   "login.form.or-divider": "or",
-  
+
   // "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.submit": "Log in",
   "login.form.submit": "Přihlásit se",
-  
+
   // "login.title": "Login",
   "login.title": "Přihlásit se",
-  
+
   // "login.breadcrumbs": "Login",
   // TODO New key - Add a translation
   "login.breadcrumbs": "Login",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Odhlásit se z DSpace",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Odhlásit se",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Odhlásit se",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   // TODO New key - Add a translation
   "menu.header.admin": "Admin",
-  
+
   // "menu.header.image.logo": "Repository logo",
   // TODO New key - Add a translation
   "menu.header.image.logo": "Repository logo",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   // TODO New key - Add a translation
   "menu.section.access_control": "Access Control",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   // TODO New key - Add a translation
   "menu.section.access_control_authorizations": "Authorizations",
-  
+
   // "menu.section.access_control_groups": "Groups",
   // TODO New key - Add a translation
   "menu.section.access_control_groups": "Groups",
-  
+
   // "menu.section.access_control_people": "People",
   // TODO New key - Add a translation
   "menu.section.access_control_people": "People",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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.browse_community": "This Community",
   // TODO New key - Add a translation
   "menu.section.browse_community": "This 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_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_title": "By Title",
   // TODO New key - Add a translation
   "menu.section.browse_community_by_title": "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_by_author": "By Author",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_author": "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_subject": "By Subject",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_subject": "By Subject",
-  
+
   // "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_communities_and_collections": "Communities & Collections",
   // TODO New key - Add a translation
   "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   // TODO New key - Add a translation
   "menu.section.control_panel": "Control Panel",
-  
+
   // "menu.section.curation_task": "Curation Task",
   // TODO New key - Add a translation
   "menu.section.curation_task": "Curation Task",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   // TODO New key - Add a translation
   "menu.section.edit": "Edit",
-  
+
   // "menu.section.edit_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.edit_collection": "Collection",
-  
+
   // "menu.section.edit_community": "Community",
   // TODO New key - Add a translation
   "menu.section.edit_community": "Community",
-  
+
   // "menu.section.edit_item": "Item",
   // TODO New key - Add a translation
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "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_community": "Community",
   // TODO New key - Add a translation
   "menu.section.export_community": "Community",
-  
+
   // "menu.section.export_item": "Item",
   // TODO New key - Add a translation
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "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.control_panel": "Control Panel menu section",
   // TODO New key - Add a translation
   "menu.section.icon.control_panel": "Control Panel menu section",
-  
+
   // "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.edit": "Edit menu section",
   // TODO New key - Add a translation
   "menu.section.icon.edit": "Edit menu section",
-  
+
   // "menu.section.icon.export": "Export menu section",
   // TODO New key - Add a translation
   "menu.section.icon.export": "Export menu section",
-  
+
   // "menu.section.icon.find": "Find menu section",
   // TODO New key - Add a translation
   "menu.section.icon.find": "Find menu section",
-  
+
   // "menu.section.icon.import": "Import menu section",
   // TODO New key - Add a translation
   "menu.section.icon.import": "Import menu section",
-  
+
   // "menu.section.icon.new": "New menu section",
   // TODO New key - Add a translation
   "menu.section.icon.new": "New menu section",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.pin": "Pin sidebar",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   // TODO New key - Add a translation
   "menu.section.icon.processes": "Processes menu section",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   // TODO New key - Add a translation
   "menu.section.icon.registries": "Registries menu section",
-  
+
   // "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.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   // TODO New key - Add a translation
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   // TODO New key - Add a translation
   "menu.section.import_batch": "Batch 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_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.new_collection": "Collection",
-  
+
   // "menu.section.new_community": "Community",
   // TODO New key - Add a translation
   "menu.section.new_community": "Community",
-  
+
   // "menu.section.new_item": "Item",
   // TODO New key - Add a translation
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   // TODO New key - Add a translation
   "menu.section.new_item_version": "Item Version",
-  
+
   // "menu.section.new_process": "Process",
   // TODO New key - Add a translation
   "menu.section.new_process": "Process",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.pin": "Pin sidebar",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   // TODO New key - Add a translation
   "menu.section.processes": "Processes",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   // TODO New key - Add a translation
   "menu.section.registries": "Registries",
-  
+
   // "menu.section.registries_format": "Format",
   // TODO New key - Add a translation
   "menu.section.registries_format": "Format",
-  
+
   // "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_task": "Statistics Task",
   // TODO New key - Add a translation
   "menu.section.statistics_task": "Statistics Task",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
   "menu.section.toggle.access_control": "Toggle Access Control 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.curation_task": "Toggle Curation Task section",
   // TODO New key - Add a translation
   "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   // TODO New key - Add a translation
   "menu.section.toggle.edit": "Toggle Edit section",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   // TODO New key - Add a translation
   "menu.section.toggle.export": "Toggle Export section",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   // TODO New key - Add a translation
   "menu.section.toggle.find": "Toggle Find section",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   // TODO New key - Add a translation
   "menu.section.toggle.import": "Toggle Import section",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   // TODO New key - Add a translation
   "menu.section.toggle.new": "Toggle New section",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   // TODO New key - Add a translation
   "menu.section.toggle.registries": "Toggle Registries section",
-  
+
   // "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.workflow": "Administer Workflow",
   // TODO New key - Add a translation
   "menu.section.workflow": "Administer Workflow",
-  
-  
+
+
   // "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.description-placeholder": "Insert your message here...",
   // TODO New key - Add a translation
   "mydspace.messages.description-placeholder": "Insert your message here...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   // TODO New key - Add a translation
   "mydspace.messages.hide-msg": "Hide message",
-  
+
   // "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-unread": "Mark as unread",
   // TODO New key - Add a translation
   "mydspace.messages.mark-as-unread": "Mark as unread",
-  
+
   // "mydspace.messages.no-content": "No content.",
   // TODO New key - Add a translation
   "mydspace.messages.no-content": "No content.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   // TODO New key - Add a translation
   "mydspace.messages.no-messages": "No messages yet.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   // TODO New key - Add a translation
   "mydspace.messages.send-btn": "Send",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   // TODO New key - Add a translation
   "mydspace.messages.show-msg": "Show message",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   // TODO New key - Add a translation
   "mydspace.messages.subject-placeholder": "Subject...",
-  
+
   // "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.title": "Messages",
   // TODO New key - Add a translation
   "mydspace.messages.title": "Messages",
-  
+
   // "mydspace.messages.to": "To",
   // TODO New key - Add a translation
   "mydspace.messages.to": "To",
-  
+
   // "mydspace.new-submission": "New submission",
   // TODO New key - Add a translation
   "mydspace.new-submission": "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-short": "Import metadata",
   // TODO New key - Add a translation
   "mydspace.new-submission-external-short": "Import metadata",
-  
+
   // "mydspace.results.head": "Your submissions",
   // TODO New key - Add a translation
   "mydspace.results.head": "Your submissions",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   // TODO New key - Add a translation
   "mydspace.results.no-abstract": "No Abstract",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   // TODO New key - Add a translation
   "mydspace.results.no-authors": "No Authors",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   // TODO New key - Add a translation
   "mydspace.results.no-collections": "No Collections",
-  
+
   // "mydspace.results.no-date": "No Date",
   // TODO New key - Add a translation
   "mydspace.results.no-date": "No Date",
-  
+
   // "mydspace.results.no-files": "No Files",
   // TODO New key - Add a translation
   "mydspace.results.no-files": "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-title": "No title",
   // TODO New key - Add a translation
   "mydspace.results.no-title": "No title",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   // TODO New key - Add a translation
   "mydspace.results.no-uri": "No Uri",
-  
+
   // "mydspace.show.workflow": "All tasks",
   // TODO New key - Add a translation
   "mydspace.show.workflow": "All tasks",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   // 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.validation": "Validation",
+  "mydspace.status.mydspaceArchived": "Archived",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceValidation": "Validation",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
-  
-  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
-  
-  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "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
   "mydspace.title": "MyDSpace",
-  
+
   // "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-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-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-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.view-btn": "View",
   // TODO New key - Add a translation
   "mydspace.view-btn": "View",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   // TODO New key - Add a translation
   "nav.browse.header": "All of DSpace",
-  
+
   // "nav.community-browse.header": "By Community",
   // TODO New key - Add a translation
   "nav.community-browse.header": "By Community",
-  
+
   // "nav.language": "Language switch",
   // TODO New key - Add a translation
   "nav.language": "Language switch",
-  
+
   // "nav.login": "Log In",
   "nav.login": "Přihlásit se",
-  
+
   // "nav.logout": "Log Out",
   "nav.logout": "Odhlásit se",
-  
+
   // "nav.mydspace": "MyDSpace",
   // TODO New key - Add a translation
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
   // TODO New key - Add a translation
   "nav.profile": "Profile",
-  
+
   // "nav.search": "Search",
   // TODO New key - Add a translation
   "nav.search": "Search",
-  
+
   // "nav.statistics.header": "Statistics",
   // TODO New key - Add a translation
   "nav.statistics.header": "Statistics",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   // TODO New key - Add a translation
   "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   // TODO New key - Add a translation
   "orgunit.listelement.badge": "Organizational Unit",
-  
+
   // "orgunit.page.city": "City",
   // TODO New key - Add a translation
   "orgunit.page.city": "City",
-  
+
   // "orgunit.page.country": "Country",
   // TODO New key - Add a translation
   "orgunit.page.country": "Country",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   // TODO New key - Add a translation
   "orgunit.page.dateestablished": "Date established",
-  
+
   // "orgunit.page.description": "Description",
   // TODO New key - Add a translation
   "orgunit.page.description": "Description",
-  
+
   // "orgunit.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "orgunit.page.edit": "Edit this item",
-  
+
   // "orgunit.page.id": "ID",
   // TODO New key - Add a translation
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   // TODO New key - Add a translation
   "orgunit.page.titleprefix": "Organizational Unit: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Výsledků na stránku",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} z {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Zobrazují se záznamy ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Seřazení",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   // TODO New key - Add a translation
   "person.listelement.badge": "Person",
-  
+
   // "person.listelement.no-title": "No name found",
   // TODO New key - Add a translation
   "person.listelement.no-title": "No name found",
-  
+
   // "person.page.birthdate": "Birth Date",
   // TODO New key - Add a translation
   "person.page.birthdate": "Birth Date",
-  
+
   // "person.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "person.page.edit": "Edit this item",
-  
+
   // "person.page.email": "Email Address",
   // TODO New key - Add a translation
   "person.page.email": "Email Address",
-  
+
   // "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.lastname": "Last Name",
   // TODO New key - Add a translation
   "person.page.lastname": "Last Name",
-  
+
   // "person.page.link.full": "Show all metadata",
   // TODO New key - Add a translation
   "person.page.link.full": "Show all 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.titleprefix": "Person: ",
   // TODO New key - Add a translation
   "person.page.titleprefix": "Person: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   // TODO New key - Add a translation
   "process.new.select-parameters": "Parameters",
-  
+
   // "process.new.cancel": "Cancel",
   // TODO New key - Add a translation
   "process.new.cancel": "Cancel",
-  
+
   // "process.new.submit": "Submit",
   // TODO New key - Add a translation
   "process.new.submit": "Submit",
-  
+
   // "process.new.select-script": "Script",
   // TODO New key - Add a translation
   "process.new.select-script": "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.required": "Script is required",
   // TODO New key - Add a translation
   "process.new.select-script.required": "Script is 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.required": "Please select a file",
   // TODO New key - Add a translation
   "process.new.parameter.file.required": "Please select a file",
-  
+
   // "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.type.value": "value",
   // TODO New key - Add a translation
   "process.new.parameter.type.value": "value",
-  
+
   // "process.new.parameter.type.file": "file",
   // TODO New key - Add a translation
   "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.notification.success.title": "Success",
   // TODO New key - Add a translation
   "process.new.notification.success.title": "Success",
-  
+
   // "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.error.title": "Error",
   // TODO New key - Add a translation
   "process.new.notification.error.title": "Error",
-  
+
   // "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.header": "Create a new process",
   // TODO New key - Add a translation
   "process.new.header": "Create a new process",
-  
+
   // "process.new.title": "Create a new process",
   // TODO New key - Add a translation
   "process.new.title": "Create a new process",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   // TODO New key - Add a translation
   "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
-  
+  "process.detail.arguments": "Arguments",
+
   // "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": "This process doesn't contain any arguments",
+
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
-  
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
   "process.detail.logs.button": "Retrieve process output",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   // TODO New key - Add a translation
   "process.detail.logs.loading": "Retrieving",
-  
+
   // "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.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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
-  
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
+  "process.detail.end-time": "Finish time",
+
   // "process.detail.status" : "Status",
   // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
+  "process.detail.status": "Status",
+
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
+  "process.detail.create": "Create similar process",
+
+
+
   // "process.overview.table.finish" : "Finish time",
   // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
+  "process.overview.table.finish": "Finish time",
+
   // "process.overview.table.id" : "Process ID",
   // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
+  "process.overview.table.id": "Process ID",
+
   // "process.overview.table.name" : "Name",
   // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name": "Name",
+
   // "process.overview.table.start" : "Start time",
   // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
-  
+  "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.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.title": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.title": "Processes Overview",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.breadcrumbs": "Processes Overview",
-  
+
   // "process.overview.new": "New",
   // TODO New key - Add a translation
   "process.overview.new": "New",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   // TODO New key - Add a translation
   "profile.breadcrumbs": "Update Profile",
-  
+
   // "profile.card.identify": "Identify",
   // TODO New key - Add a translation
   "profile.card.identify": "Identify",
-  
+
   // "profile.card.security": "Security",
   // TODO New key - Add a translation
   "profile.card.security": "Security",
-  
+
   // "profile.form.submit": "Update Profile",
   // TODO New key - Add a translation
   "profile.form.submit": "Update Profile",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   // TODO New key - Add a translation
   "profile.groups.head": "Authorization groups you belong to",
-  
+
   // "profile.head": "Update Profile",
   // TODO New key - Add a translation
   "profile.head": "Update Profile",
-  
+
   // "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.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.label.email": "Email Address",
   // TODO New key - Add a translation
   "profile.metadata.form.label.email": "Email Address",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   // TODO New key - Add a translation
   "profile.metadata.form.label.firstname": "First Name",
-  
+
   // "profile.metadata.form.label.language": "Language",
   // TODO New key - Add a translation
   "profile.metadata.form.label.language": "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.phone": "Contact Telephone",
   // TODO New key - Add a translation
   "profile.metadata.form.label.phone": "Contact Telephone",
-  
+
   // "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.title": "Profile saved",
   // TODO New key - Add a translation
   "profile.metadata.form.notifications.success.title": "Profile saved",
-  
+
   // "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.title": "No changes",
   // TODO New key - Add a translation
   "profile.notifications.warning.no-changes.title": "No changes",
-  
+
   // "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.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.label.password": "Password",
   // TODO New key - Add a translation
   "profile.security.form.label.password": "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.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.title": "Password saved",
   // TODO New key - Add a translation
   "profile.security.form.notifications.success.title": "Password saved",
-  
+
   // "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.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.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.title": "Update Profile",
   // TODO New key - Add a translation
   "profile.title": "Update Profile",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   // TODO New key - Add a translation
   "project.listelement.badge": "Research Project",
-  
+
   // "project.page.contributor": "Contributors",
   // TODO New key - Add a translation
   "project.page.contributor": "Contributors",
-  
+
   // "project.page.description": "Description",
   // TODO New key - Add a translation
   "project.page.description": "Description",
-  
+
   // "project.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "project.page.edit": "Edit this item",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   // TODO New key - Add a translation
   "project.page.expectedcompletion": "Expected Completion",
-  
+
   // "project.page.funder": "Funders",
   // TODO New key - Add a translation
   "project.page.funder": "Funders",
-  
+
   // "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.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.search.results.head": "Project Search Results",
   // TODO New key - Add a translation
   "project.search.results.head": "Project Search Results",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   // TODO New key - Add a translation
   "publication.listelement.badge": "Publication",
-  
+
   // "publication.page.description": "Description",
   // TODO New key - Add a translation
   "publication.page.description": "Description",
-  
+
   // "publication.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "publication.page.edit": "Edit this item",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "publication.page.journal-issn": "Journal ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "publication.page.journal-title": "Journal Title",
-  
+
   // "publication.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "publication.page.publisher": "Publisher",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   // TODO New key - Add a translation
   "publication.page.titleprefix": "Publication: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "publication.page.volume-title": "Volume Title",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   // TODO New key - Add a translation
   "publication.search.results.head": "Publication Search Results",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   // TODO New key - Add a translation
   "publication.search.title": "DSpace Angular :: Publication Search",
-  
-  
+
+
   // "register-email.title": "New user registration",
   // TODO New key - Add a translation
   "register-email.title": "New user registration",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   // TODO New key - Add a translation
   "register-page.create-profile.header": "Create Profile",
-  
+
   // "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.email": "Email Address",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.email": "Email Address",
-  
+
   // "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.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.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.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.contact": "Contact Telephone",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.contact": "Contact Telephone",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.language": "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.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.label.password": "Password *",
   // TODO New key - Add a translation
   "register-page.create-profile.security.label.password": "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.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.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.submit": "Complete Registration",
   // TODO New key - Add a translation
   "register-page.create-profile.submit": "Complete Registration",
-  
+
   // "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.head": "Registration failed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.error.head": "Registration failed",
-  
+
   // "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.head": "Registration completed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   // TODO New key - Add a translation
   "register-page.registration.header": "New user registration",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "register-page.registration.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Register",
   // TODO New key - Add a translation
   "register-page.registration.submit": "Register",
-  
+
   // "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.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.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.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 }}",
-  
-  
-  
+
+
+
   // "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.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.title": "Unable to add relationship",
   // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
-  
+
   // "relationships.isAuthorOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isAuthorOf": "Authors",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.Person": "Authors (persons)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   // TODO New key - Add a translation
   "relationships.isIssueOf": "Journal Issues",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   // TODO New key - Add a translation
   "relationships.isJournalIssueOf": "Journal Issue",
-  
+
   // "relationships.isJournalOf": "Journals",
   // TODO New key - Add a translation
   "relationships.isJournalOf": "Journals",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   // TODO New key - Add a translation
   "relationships.isOrgUnitOf": "Organizational Units",
-  
+
   // "relationships.isPersonOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isPersonOf": "Authors",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   // TODO New key - Add a translation
   "relationships.isProjectOf": "Research Projects",
-  
+
   // "relationships.isPublicationOf": "Publications",
   // TODO New key - Add a translation
   "relationships.isPublicationOf": "Publications",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   // TODO New key - Add a translation
   "relationships.isPublicationOfJournalIssue": "Articles",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   // TODO New key - Add a translation
   "relationships.isSingleJournalOf": "Journal",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   // TODO New key - Add a translation
   "relationships.isSingleVolumeOf": "Journal Volume",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   // TODO New key - Add a translation
   "relationships.isVolumeOf": "Journal Volumes",
-  
+
   // "relationships.isContributorOf": "Contributors",
   // TODO New key - Add a translation
   "relationships.isContributorOf": "Contributors",
-  
-  
-  
+
+
+
   // "resource-policies.add.button": "Add",
   // TODO New key - Add a translation
   "resource-policies.add.button": "Add",
-  
+
   // "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.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.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.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.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.collection": "Add a new Collection policy",
   // TODO New key - Add a translation
   "resource-policies.add.for.collection": "Add a new Collection policy",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.create.page.success.content": "Operation successful",
-  
+
   // "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.delete.btn": "Delete selected",
   // TODO New key - Add a translation
   "resource-policies.delete.btn": "Delete selected",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.delete.success.content": "Operation successful",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.edit.page.success.content": "Operation successful",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   // TODO New key - Add a translation
   "resource-policies.edit.page.title": "Edit resource policy",
-  
+
   // "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.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.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.select.btn": "Select",
   // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
+
   // "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.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.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.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.date.end.label": "End Date",
   // TODO New key - Add a translation
   "resource-policies.form.date.end.label": "End Date",
-  
+
   // "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.description.label": "Description",
   // TODO New key - Add a translation
   "resource-policies.form.description.label": "Description",
-  
+
   // "resource-policies.form.name.label": "Name",
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
-  
+
   // "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.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.table.headers.action": "Action",
   // TODO New key - Add a translation
   "resource-policies.table.headers.action": "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.start": "Start Date",
   // TODO New key - Add a translation
   "resource-policies.table.headers.date.start": "Start Date",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit": "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.policy": "Edit policy",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit.policy": "Edit policy",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   // TODO New key - Add a translation
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
   // TODO New key - Add a translation
   "resource-policies.table.headers.group": "Group",
-  
+
   // "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.policyType": "type",
   // TODO New key - Add a translation
   "resource-policies.table.headers.policyType": "type",
-  
+
   // "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.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.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.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.collection": "Policies for Collection",
   // TODO New key - Add a translation
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   // TODO New key - Add a translation
   "search.switch-configuration.title": "Show",
-  
+
   // "search.title": "DSpace Angular :: Search",
   "search.title": "DSpace Angular :: Hledat",
-  
+
   // "search.breadcrumbs": "Search",
   // TODO New key - Add a translation
   "search.breadcrumbs": "Search",
-  
-  
+
+
   // "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.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Od data",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateSubmitted": "Date submitted",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   // TODO New key - Add a translation
   "search.filters.applied.f.discoverable": "Private",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.entityType": "Item Type",
-  
+
   // "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",
   // TODO New key - Add a translation
   "search.filters.applied.f.itemtype": "Type",
-  
+
   // "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.jobTitle": "Job Title",
   // TODO New key - Add a translation
   "search.filters.applied.f.jobTitle": "Job Title",
-  
+
   // "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.min": "Start birth date",
   // TODO New key - Add a translation
   "search.filters.applied.f.birthDate.min": "Start birth date",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "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.placeholder": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.placeholder": "Birth Date",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.head": "Date Published",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  
+
   // "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.creativeWorkKeywords.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  
+
   // "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.min.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.min.placeholder": "Datum do",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.head": "Date submitted",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   // TODO New key - Add a translation
   "search.filters.filter.discoverable.head": "Private",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.filter.withdrawn.head": "Withdrawn",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.head": "Item Type",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.placeholder": "Item Type",
-  
+
   // "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",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.head": "Type",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.placeholder": "Type",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.head": "Job Title",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.placeholder": "Job Title",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.head": "Known language",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  
+
   // "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.objectpeople.head": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.head": "People",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.placeholder": "People",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.head": "Country",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.head": "City",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Rozsah",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Filtr rozsahu",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Sbalit",
-  
+
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "Zobrazit více",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Předmět",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "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.placeholder": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.placeholder": "Submitter",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalIssue": "Journal Issue",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalVolume": "Journal Volume",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   // TODO New key - Add a translation
   "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
+
   // "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.false": "No",
   // TODO New key - Add a translation
   "search.filters.has_content_in_original_bundle.false": "No",
-  
+
   // "search.filters.discoverable.true": "No",
   // TODO New key - Add a translation
   "search.filters.discoverable.true": "No",
-  
+
   // "search.filters.discoverable.false": "Yes",
   // TODO New key - Add a translation
   "search.filters.discoverable.false": "Yes",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   // TODO New key - Add a translation
   "search.filters.withdrawn.true": "Yes",
-  
+
   // "search.filters.withdrawn.false": "No",
   // TODO New key - Add a translation
   "search.filters.withdrawn.false": "No",
-  
-  
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtry",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Obnovit filtry",
-  
-  
-  
+
+
+
   // "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.results.head": "Search Results",
   "search.results.head": "Výsledky hledá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-link": "quotes around it",
   // TODO New key - Add a translation
   "search.results.no-results-link": "quotes around it",
-  
+
   // "search.results.empty": "Your search returned no results.",
   // TODO New key - Add a translation
   "search.results.empty": "Your search returned no results.",
-  
-  
-  
+
+
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Zpět na výsledky",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Filtry",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Vyhledávací nástroje",
-  
+
   // "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.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Řadit dle",
-  
+
   // "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-grid": "Show as grid",
   "search.view-switch.show-grid": "Zobrazit mřížku",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Zobrazit seznam",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   // TODO New key - Add a translation
   "sorting.ASC": "Ascending",
-  
+
   // "sorting.DESC": "Descending",
   // TODO New key - Add a translation
   "sorting.DESC": "Descending",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Název vzestupně",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Název sestupně",
-  
+
   // "sorting.score.DESC": "Relevance",
   "sorting.score.DESC": "Relevance",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
   // TODO New key - Add a translation
   "statistics.title": "Statistics",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   // TODO New key - Add a translation
   "statistics.header": "Statistics for {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   // TODO New key - Add a translation
   "statistics.breadcrumbs": "Statistics",
-  
+
   // "statistics.page.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.page.no-data": "No data available",
-  
+
   // "statistics.table.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.table.no-data": "No data available",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalVisits": "Total visits",
-  
+
   // "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.TotalDownloads": "File Visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalDownloads": "File Visits",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCountries": "Top country views",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCities": "Top city views",
-  
+
   // "statistics.table.header.views": "Views",
   // TODO New key - Add a translation
   "statistics.table.header.views": "Views",
-  
-  
-  
+
+
+
   // "submission.edit.title": "Edit Submission",
   // TODO New key - Add a translation
   "submission.edit.title": "Edit Submission",
-  
+
   // "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.deposit": "Deposit",
   // TODO New key - Add a translation
   "submission.general.deposit": "Deposit",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.cancel": "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.submit": "Yes, I'm sure",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.title": "Discard submission",
-  
+
   // "submission.general.discard.submit": "Discard",
   // TODO New key - Add a translation
   "submission.general.discard.submit": "Discard",
-  
+
   // "submission.general.save": "Save",
   // TODO New key - Add a translation
   "submission.general.save": "Save",
-  
+
   // "submission.general.save-later": "Save for later",
   // TODO New key - Add a translation
   "submission.general.save-later": "Save for 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.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.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.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.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.button": "Search",
   // TODO New key - Add a translation
   "submission.import-external.search.button": "Search",
-  
+
   // "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.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.source.arxiv": "arXiv",
   // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   // TODO New key - Add a translation
   "submission.import-external.source.loading": "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.sherpaPublisher": "SHERPA Publishers",
   // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   // TODO New key - Add a translation
   "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.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",
   // TODO New key - Add a translation
   "submission.import-external.preview.title": "Item Preview",
-  
+
   // "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.button.import": "Start submission",
   // TODO New key - Add a translation
   "submission.import-external.preview.button.import": "Start submission",
-  
+
   // "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.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.sections.describe.relationship-lookup.close": "Close",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.close": "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.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.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 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 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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 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.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.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 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.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.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.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.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-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.loading": "Loading...",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.loading": "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.search": "Go",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
+
   // "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-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.selected": "Selected {{ size }} items",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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",
   // 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.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.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.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.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.JournalIssue": "Journal Issues",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
+
   // "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.JournalVolume": "Journal Volumes",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
+
   // "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.isAuthorOfPublication": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
+
   // "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.Project": "Projects",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
+
   // "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.Person": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
+
   // "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.DataPackage": "Data Packages",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
+
   // "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.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.isFundingOfPublication": "Funding",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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": "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": "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.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.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.ccLicense.type": "License Type",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.type": "License 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.change": "Change your license type…",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.change": "Change your license type…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.none": "No licenses available",
-  
+
   // "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.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.confirmation": "I grant the license above",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
+
   // "submission.sections.general.add-more": "Add more",
   // TODO New key - Add a translation
   "submission.sections.general.add-more": "Add more",
-  
+
   // "submission.sections.general.collection": "Collection",
   // TODO New key - Add a translation
   "submission.sections.general.collection": "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_success_notice": "Submission deposited successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  
+
   // "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_success_notice": "Submission discarded successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  
+
   // "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-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.no-collection": "No collection found",
   // TODO New key - Add a translation
   "submission.sections.general.no-collection": "No collection 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.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_success_notice": "Submission saved successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  
+
   // "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.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.submit.progressbar.CClicense": "Creative commons license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
+
   // "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.stepcustom": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  
+
   // "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.steptwo": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.license": "Deposit license",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.upload": "Upload files",
-  
-  
-  
+
+
+
   // "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.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.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.title": "Delete bitstream",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.submit": "Delete",
-  
+
   // "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.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.date-required": "Date is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.date-required": "Date is required.",
-  
+
   // "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-placeholder": "From",
   // TODO New key - Add a translation
   "submission.sections.upload.form.from-placeholder": "From",
-  
+
   // "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-required": "Group is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.group-required": "Group is 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-placeholder": "Until",
   // TODO New key - Add a translation
   "submission.sections.upload.form.until-placeholder": "Until",
-  
+
   // "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.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.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>",
   // 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 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.no-entry": "No",
   // TODO New key - Add a translation
   "submission.sections.upload.no-entry": "No",
-  
+
   // "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.save-metadata": "Save metadata",
   // TODO New key - Add a translation
   "submission.sections.upload.save-metadata": "Save metadata",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   // TODO New key - Add a translation
   "submission.sections.upload.undo": "Cancel",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-failed": "Upload failed",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-successful": "Upload successful",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   // TODO New key - Add a translation
   "submission.submit.title": "Submission",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   // TODO New key - Add a translation
   "submission.workflow.generic.delete": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.generic.edit": "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.view": "View",
   // TODO New key - Add a translation
   "submission.workflow.generic.view": "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.tasks.claimed.approve": "Approve",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.approve": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.edit": "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.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.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.submit": "Reject item",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  
+
   // "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.submit": "Reject",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  
+
   // "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.return": "Return to pool",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.return": "Return to pool",
-  
+
   // "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.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.processing": "Processing...",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.processing": "Processing...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.submitter": "Submitter",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.success": "Operation successful",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.claim": "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.hide-detail": "Hide detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.show-detail": "Show detail",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   // TODO New key - Add a translation
   "vocabulary-treeview.header": "Hierarchical tree view",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   // TODO New key - Add a translation
   "vocabulary-treeview.load-more": "Load more",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.reset": "Reset",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.search": "Search",
-  
+
   // "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.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.srsc": "Research Subject Categories",
   // TODO New key - Add a translation
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   // TODO New key - Add a translation
   "uploader.browse": "browse",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   // TODO New key - Add a translation
   "uploader.drag-message": "Drag & Drop your files here",
-  
+
   // "uploader.or": ", or ",
   // TODO New key - Add a translation
   "uploader.or": ", 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.queue-length": "Queue length",
   // TODO New key - Add a translation
   "uploader.queue-length": "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.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-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",
-  
-  
-  
+
+
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   // TODO New key - Add a translation
   "workflowAdmin.search.results.head": "Administer 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.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.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.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.title": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.title": "Delete workflow item",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.header": "Delete workflow item",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.delete.button.cancel": "Cancel",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   // TODO New key - Add a translation
   "workflow-item.delete.button.confirm": "Delete",
-  
-  
+
+
   // "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.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.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.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.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.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.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.send-back.button.cancel": "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",
 
-}
\ No newline at end of file
+
+}
diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5
index cbd11e5c3d..b726f62b71 100644
--- a/src/assets/i18n/de.json5
+++ b/src/assets/i18n/de.json5
@@ -1,36 +1,36 @@
 {
-  
+
   // "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": "Sie sind nicht berechtigt, auf diese Seite zuzugreifen. Mit dem Link unten kommen Sie zurück zur Startseite.",
-  
+
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Zur Startseite",
-  
+
   // "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.",
-  
+
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Zur Startseite",
-  
+
   // "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.",
-  
+
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Zur Startseite",
-  
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Seite nicht gefunden",
-  
+
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
   "admin.access-control.epeople.breadcrumbs": "Personen suchen",
 
@@ -54,728 +54,1130 @@
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Wartungsarbeiten",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   "admin.curation-tasks.title": "Wartungsarbeiten",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   "admin.curation-tasks.header": "Wartungsarbeiten",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "Referenzliste der Dateiformate",
-  
+
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.create.breadcrumbs": "Dateiformat",
-  
+
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
   "admin.registries.bitstream-formats.create.failure.content": "Beim Anlegen eines neuen Dateiformates ist ein Fehler aufgetreten.",
-  
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Aktion fehlgeschlagen",
-  
+
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
   "admin.registries.bitstream-formats.create.head": "Neues Dateiformat anlegen",
-  
+
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
   "admin.registries.bitstream-formats.create.new": "Ein neues Dateiformat hinzufügen",
-  
+
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "Das neue Dateiformat wurde erfolgreich angelegt.",
-  
+
   // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "Aktion erfolgreich",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} Dateiformat(e)  konnte(n) nicht gelöscht werden.",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "Fehler",
-  
+
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "{{ amount }} Dateiformat(e) wurden erfolgreich gelöscht.",
-  
+
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Aktion erfolgreich",
-  
+
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "Die Liste der Dateiformate enthält Informationen über bekannte Formate und deren Unterstützungsgrad.",
-  
+
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.edit.breadcrumbs": "Dateiformat",
-  
+
   // "admin.registries.bitstream-formats.edit.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
-  
+
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.description.label": "Beschreibung",
-  
+
   // "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": "Hier können Sie Endungen angeben, anhand derer das Format hochgeladener Dateien automatisch erkannt wird. Sie können mehrere Endungen pro Dateiformat angeben.",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "Dateiendungen",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Bitte geben Sie die Dateiendung ohne Punkt ein.",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.content": "Beim Bearbeiten des Dateiformats ist ein Fehler aufgetreten.",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Aktion fehlgeschlagen",
-  
+
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
   "admin.registries.bitstream-formats.edit.head": "Dateiformat: {{ 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": "Als \"intern\" gekennzeichnete Dateiformate dienen administrativen Zwecken und sind nicht öffentlich sichtbar.",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.edit.mimetype.hint": "MIME-Type dieses Dateiformats. Ein MIME-Type kann auch mehreren Dateiformaten zugeordnet werden.",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME-Type",
-  
+
   // "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": "Ein eindeutiger Name für dieses Format, (z.B. Microsoft Word XP oder Microsoft Word 2000)",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  
+
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
   "admin.registries.bitstream-formats.edit.success.content": "Das Dateiformat wurde erfolgreich bearbeitet.",
-  
+
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Aktion erfolgreich",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "Der Unterstützungsgrad, den Ihre Einrichtung für dieses Format anbietet",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Unterstützungsgrad",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "Referenzliste der Dateiformate",
-  
+
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Es gibt keine Dateiformate in der Referenzliste.",
-  
+
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Auswahl löschen",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "Nichts auswählen",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "intern",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "MIME-Type",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "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.return": "Return",
   "admin.registries.bitstream-formats.table.return": "Zurück",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Bekannt",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Unterstützt",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unbekannt",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Unterstützungsgrad",
-  
+
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "Referenzliste der Dateiformate",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Referenzliste der Metadaten",
-  
+
   // "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": "In der Referenzliste der Metadaten sind alle Metadatenfelder aufgeführt, die in diesem Repositorium zur Verfügung stehen. Diese Felder können auf verschiedene Schemata aufgeteilt sein. Für DSpace ist das Dublin Core Schema auf jeden Fall erforderlich.",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "Metadatenschema anlegen",
-  
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "Metadatenschema bearbeiten",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "Name",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "Namensraum",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Metadatenreferenzliste",
-  
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Es gibt keine Metadatenschemata in der Referenzliste.",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Auswahl löschen",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Name",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Namensraum",
-  
+
   // "admin.registries.metadata.title": "Metadata Registry",
   "admin.registries.metadata.title": "Metadatenreferenzliste",
-  
-  
-  
+
+
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Metadatenschema",
-  
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Dies ist das Metadatenschema für den Namensraum \"{{namespace}}\".",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Im Schema enthaltene Metadatenfelder",
-  
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Es gibt keine Metadatenfelder in diesem Schema.",
-  
+
   // "admin.registries.schema.fields.table.delete": "Delete selected",
   "admin.registries.schema.fields.table.delete": "Auswahl löschen",
-  
+
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Feld",
-  
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  "admin.registries.schema.fields.table.scopenote": "Gültigkeitsbereich",
-  
+  "admin.registries.schema.fields.table.scopenote": "Geltungs- bzw. Gültigkeitsbereich",
+
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "Metadatenfeld anlegen",
-  
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
   "admin.registries.schema.form.edit": "Metadatenfeld bearbeiten",
-  
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "Qualifizierer",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  "admin.registries.schema.form.scopenote": "Geltungsbereich",
-  
+  "admin.registries.schema.form.scopenote": "Geltungs- bzw. Gültigkeitsbereich",
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Metadatenschema",
-  
+
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "\"{{prefix}}\" wurde erfolgreich angelegt.",
-  
+
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "{{amount}} Metadatenschema(ta) konnte(n) nicht gelöscht werden.",
-  
+
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.success": "{{amount}} Metadatenschema(ta) wurde(n) gelöscht.",
-  
+
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Das Schema \"{{prefix}}\" wurde erfolgreich bearbeitet.",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Fehler",
-  
+
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.created": "Das Feld \"{{field}}\" wurde erfolgreich angelegt.",
-  
+
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "{{amount}} Metadatenfeld(er) konnte(n) nicht gelöscht werden.",
-  
+
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "{{amount}} Metadatenfeld(er) wurde(n) erfolgreich gelöscht.",
-  
+
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "Das Feld \"{{field}}\" wurde erfolgreich bearbeitet.",
-  
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Erfolg",
-  
+
   // "admin.registries.schema.return": "Return",
   "admin.registries.schema.return": "Zurück",
-  
+
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Referenzliste der Metadatenschemata",
-  
-  
-  
+
+
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "Person löschen",
-  
+
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
   "admin.access-control.epeople.actions.impersonate": "Als Person einloggen",
-  
+
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Passwort zurücksetzen",
-  
+
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "Von Person ausloggen",
-  
+
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "Personen",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Personen",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Suche",
-  
+
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "Alles durchsuchen",
-  
+
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadaten",
-  
+
   // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
   "admin.access-control.epeople.search.scope.email": "E-Mail (exakt)",
-  
+
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Suche",
-  
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
   "admin.access-control.epeople.button.add": "Person hinzufügen",
-  
+
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "ID",
-  
+
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Name",
-  
+
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
   "admin.access-control.epeople.table.email": "E-Mail (exakt)",
-  
+
   // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "Bearbeiten",
-  
+
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "\"{{name}}\" bearbeiten",
-  
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "\"{{name}}\" löschen",
-  
+
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
   "admin.access-control.epeople.no-items": "Keine Personen dazu.",
-  
+
   // "admin.access-control.epeople.form.create": "Create EPerson",
   "admin.access-control.epeople.form.create": "Person erstellen",
-  
+
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
   "admin.access-control.epeople.form.edit": "Person bearbeiten",
-  
+
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "Vorname",
-  
+
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Nachname",
-  
+
   // "admin.access-control.epeople.form.email": "E-mail",
   "admin.access-control.epeople.form.email": "E-Mail-Adresse",
-  
+
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
   "admin.access-control.epeople.form.emailHint": "Bitte geben Sie eine gültige E-Mail-Adresse an.",
-  
+
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Darf sich anmelden",
-  
+
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Es wird ein Zertifikat benötigt.",
-  
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "Die Person \"{{name}}\" wurde erstellt.",
-  
+
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "Die Person \"{{name}}\" konnte nicht erstellt werden.",
-  
+
   // "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": "Die Person \"{{name}}\" konnte nicht erstellt werden, weil die E-Mail-Adresse \"{{email}}\" bereits verwendet wird.",
-  
+
   // "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": "Die Person \"{{name}}\" konnte nicht bearbeitet werden, weil die E-Mail-Adresse \"{{email}}\" bereits verwendet wird.",
-  
+
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "Die Person \"{{name}}\" wurde erfolgreich bearbeitet.",
-  
+
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.failure": "Die Person \"{{name}}\" konnte nicht bearbeitet werden.",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "Die Person \"{{name}}\" wurde gelöscht.",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "Die Person \"{{name}}\" konnte nicht gelöscht werden.",
-  
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Mitglied dieser Gruppen:",
-  
+
   // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "ID",
-  
+
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Name",
-  
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Diese Person ist kein Mitglied einer Gruppe.",
-  
+
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Zu Gruppen hinzufügen",
-  
+
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.failure": "Person: \"{{name}}\" konnte nicht gelöscht werden",
-  
+
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "Person: \"{{name}}\" erfolgreich gelöscht",
-  
-  
-  
+
+
+
   // "admin.access-control.groups.title": "Groups",
   "admin.access-control.groups.title": "Gruppen",
-  
+
   // "admin.access-control.groups.title.singleGroup": "Edit Group",
   "admin.access-control.groups.title.singleGroup": "Gruppe bearbeiten",
-  
+
   // "admin.access-control.groups.title.addGroup": "New Group",
   "admin.access-control.groups.title.addGroup": "Neue Gruppe",
-  
+
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Gruppen",
-  
+
   // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "Gruppe hinzufügen",
-  
+
   // "admin.access-control.groups.search.head": "Search groups",
   "admin.access-control.groups.search.head": "Gruppen suchen",
-  
+
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "Alles durchsuchen",
-  
+
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Suche",
-  
+
   // "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": "Name",
-  
+
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Mitglieder",
-  
+
   // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "Bearbeiten",
-  
+
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "\"{{name}}\" bearbeiten",
-  
+
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.remove": "\"{{name}}\" löschen",
-  
+
   // "admin.access-control.groups.no-items": "No groups found with this in their name or this as UUID",
   "admin.access-control.groups.no-items": "Keine Gruppen gefunden, die dies in ihrem Namen oder als UUID haben",
-  
+
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "Gruppe \"{{name}}\" erfolgreich gelöscht",
-  
+
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.failure.title": "Gruppe \"{{name}}\" konnte nicht gelöscht werden",
-  
+
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Ursache: \"{{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": "Diese Gruppe ist permanent, das heißt sie kann nicht bearbeitet oder gelöscht werden. Sie können jedoch über diese Seite Gruppenmitglieder hinzufügen und entfernen.",
-  
+
   // "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": "Diese Gruppe kann nicht geändert oder gelöscht werden, da sie einer Rolle im Einreichungs- und Workflow-Prozess im \"{{name}}\" {{comcol}} zugeordnet ist. Sie können sie auf der Bearbeitungsseite {{comcol}} im Tab <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> löschen. Hier können Sie  Gruppenmitglieder hinzufügen und entfernen.",
-  
+
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Gruppe erstellen",
-  
+
   // "admin.access-control.groups.form.head.edit": "Edit group",
   "admin.access-control.groups.form.head.edit": "Gruppe bearbeiten",
-  
+
   // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "Gruppenname",
-  
+
   // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "Beschreibung",
-  
+
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "Gruppe \"{{name}}\" erfolgreich erstellt",
-  
+
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "Gruppe \"{{name}}\" konnte nicht erstellt werden",
-  
+
   // "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": "Die Gruppe mit dem Namen: \"{{name}}\" konnte nicht erstellt werden. Stellen Sie sicher, dass der Name nicht bereits verwendet wird.",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "Gruppe \"{{name}}\" konnte nicht bearbeitet werden",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Der Name \"{{name}}\" wird bereits verwendet!",
-  
+
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "Gruppe \"{{name}}\" erfolgreich bearbeitet",
-  
+
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Gruppe löschen",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
   "admin.access-control.groups.form.delete-group.modal.header": "Gruppe \"{{ dsoName }}\" löschen",
-  
+
   // "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": "Sind Sie sicher, dass Sie die Gruppe \"{{ dsoName }}\" löschen möchten",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "Abbrechen",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "Löschen",
-  
+
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.success": "Gruppe \"{{ name }}\" erfolgreich gelöscht",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.title": "Gruppe \"{{ name }}\" konnte nicht gelöscht werden",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "Ursache: \"{{ cause }}\"",
-  
+
   // "admin.access-control.groups.form.members-list.head": "EPeople",
   "admin.access-control.groups.form.members-list.head": "Personen",
-  
+
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
   "admin.access-control.groups.form.members-list.search.head": "Personen hinzufügen",
-  
+
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.members-list.button.see-all": "Alles durchsuchen",
-  
+
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Derzeitige Mitglieder",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
   "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadaten",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
   "admin.access-control.groups.form.members-list.search.scope.email": "E-Mail (exakt)",
-  
+
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Suche",
-  
+
   // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "ID",
-  
+
   // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "Name",
-  
+
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.members-list.table.edit": "Entfernen / Hinzufügen",
-  
+
   // "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": "Mitglieder mit dem Namen \"{{name}}\" entfernen",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.addMember": "Das Mitglied \"{{name}}\" wurde hinzugefügt.",
-  
+
   // "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": "Das Mitglied \"{{name}}\" konnte nicht hinzugefügt werden.",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Das Mitglied \"{{name}}\" wurde gelöscht.",
-  
+
   // "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": "Das Mitglied \"{{name}}\" konnte nicht gelöscht werden.",
-  
+
   // "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": "Mitglied mit dem Namen \"{{name}}\" hinzufügen",
-  
+
   // "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": "Keine derzeit aktive Gruppe, bitte erst einen Namen eingeben.",
-  
+
   // "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": "Noch keine Mitglieder in der Gruppe, bitte suchen und hinzufügen.",
-  
+
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
   "admin.access-control.groups.form.members-list.no-items": "Keine Personen in dieser Suche gefunden",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "Etwas ist fehlgeschlagen: \"{{cause}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Gruppen",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
   "admin.access-control.groups.form.subgroups-list.search.head": "Untergruppe hinzufügen",
-  
+
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.subgroups-list.button.see-all": "Alles durchsuchen",
-  
+
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
   "admin.access-control.groups.form.subgroups-list.headSubgroups": "Derzeitige Untergruppen",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "Suche",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
   "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Name",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Entfernen / Hinzufügen",
-  
+
   // "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": "Untergruppe mit Namen \"{{name}}\" entfernen",
-  
+
   // "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.buttons.add": "Untergruppe mit Namen \"{{name}}\" hinzufügen",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Derzeitige Gruppe",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Untergruppe: \"{{name}}\" erfolgreich hinzugefügt",
-  
+
   // "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": "Untergruppe: \"{{name}}\" konnte nicht hinzugefügt werden",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Untergruppe: \"{{name}}\" erfolgreich gelöscht",
-  
+
   // "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": "Untergruppe: \"{{name}}\" konnte nicht gelöscht werden",
-  
+
   // "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": "Keine derzeit aktive Gruppe, bitte erst einen Namen eingeben.",
-  
+
   // "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": "Dies ist die derzeitige Gruppe, sie kann nicht hinzugefügt werden.",
-  
+
   // "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": "Keine Gruppen gefunden, die dies in ihrem Namen oder als UUID haben",
-  
+
   // "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": "Die Gruppe hat noch keine Untergruppen.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   "admin.access-control.groups.form.return": "Zurück zu den Gruppen",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Admin-Suche",
-  
+
   // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "Bearbeiten",
-  
+
   // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "Bearbeiten",
-  
+
   // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "Löschen",
-  
+
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Bearbeiten",
-  
+
   // "admin.search.item.make-private": "Make Private",
   "admin.search.item.make-private": "Verbergen",
-  
+
   // "admin.search.item.make-public": "Make Public",
   "admin.search.item.make-public": "Öffentlich anzeigen",
-  
+
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "Verschieben",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Wiederherstellen",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Zurückziehen",
-  
+
   // "admin.search.title": "Administrative Search",
   "admin.search.title": "Admin-Suche",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Admin-Suche",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Workflows verwalten",
-  
+
   // "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",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Zurücksenden",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Metadaten importieren",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Metadaten importieren",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Metadaten importieren",
-  
+
   // "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": "Um Metadaten im Batch-Verfahren zu importieren, wählen Sie bitte eine CSV-Datei zum Hochladen aus oder ziehen Sie diese ins Browser-Fenster.",
-  
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Ziehen Sie eine CSV-Datei mit Metadaten zum Importieren in das Browser-Fenster.",
-  
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Legen Sie eine neue CSV-Datei hier ab, um die Importdatei zu ersetzen.",
-  
+
   // "admin.metadata-import.page.button.return": "Return",
   "admin.metadata-import.page.button.return": "Zurück",
-  
+
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Fortfahren",
-  
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Bitte wählen Sie zuerst eine Datei aus.",
-  
-  
-  
-  
+
+
+
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Passwort oder E-Mail-Adresse ungültig.",
-  
+
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Ihre Sitzung ist abgelaufen. Bitte melden Sie sich erneut an.",
-  
-  
-  
+
+
+
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
   "auth.messages.token-refresh-failed": "Aktualisierung fehlgeschlagen. Bitte melden Sie sich erneut an.",
 
@@ -838,232 +1240,235 @@
 
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "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>\".",
   "bitstream.edit.form.description.hint": "Hier können Sie eine kurze Beschreibung der Datei angeben, zum Beispiel \"<i>Artikel</i>\" oder \"<i>Tabellenhanhang</i>\".",
-  
+
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Beschreibung",
-  
+
   // "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": "Der erste Tag, ab dem der Zugang erlaubt ist. <b>Dieses Datum kann in diesem Formular nicht verändert werden.</b> Um eine Embargo-Frist für eine Datei festzulegen, zu <i>Item Status</i> gehen, auf <i>Authorizations...</i> klicken, die Richtlinie <i>READ</i> für die Datei erstellen oder verändern und das <i>Start Date</i> wie gewünscht einstellen.",
 
-  
+
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
   "bitstream.edit.form.embargo.label": "Sperrfrist",
-  
+
   // "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": "Hier können Sie den Dateinamen ändern. Beachten Sie bitte, dass sich dadurch die angezeigte Datei-URL ändert. Alte Links werden jedoch weiterhin aufgelöst, solange sich die Sequenz-ID nicht ändert.",
-  
+
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Dateiname",
-  
+
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
   "bitstream.edit.form.iiifLabel.label": "IIIF-Bezeichnung",
 
   // "bitstream.edit.form.newFormat.label": "Describe new format",
   "bitstream.edit.form.newFormat.label": "Neues Format beschreiben",
-  
+
   // "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": "Name und Versionsnummer des Programms, das Sie verwendet haben, um die Datei zu erstellen (z. B. \"<i>ACMESoft SuperApp, Version 1.5</i>\").",
-  
+
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
   "bitstream.edit.form.primaryBitstream.label": "Primäre Datei",
-  
+
   // "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": "Falls das Format nicht in der obigen Liste enthalten ist, <b>wählen Sie bitte \"Anderes Format\"</b> und beschreiben Sie es unter \"Neues Format beschreiben\".",
-  
+
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Ausgewähltes Format",
-  
+
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
   "bitstream.edit.form.selectedFormat.unknown": "Anderes Format",
-  
+
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Beim Speichern des Dateiformats ist ein Fehler aufgetreten",
-  
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Ihre Änderungen an der Datei wurden gespeichert.",
-  
+
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "Datei gespeichert",
-  
+
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Zurück",
 
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Datei bearbeiten",
-  
-  
+
+
   // "browse.back.all-results": "All browse results",
   "browse.back.all-results": "Filter zurücksetzen",
-  
+
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Nach Autor:in",
-  
+
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "Nach Erscheinungsjahr",
-  
+
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Nach Schlagwort",
-  
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Nach Titel",
-  
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Listen",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "Es gibt keine Items, die angezeigt werden können.",
-  
+
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "Autor:in",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "Erscheinungsdatum",
-  
+
   // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "Schlagwort",
-  
+
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Titel",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Auflistung nach Autor:in",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   "browse.metadata.dateissued.breadcrumbs": "Auflistung nach Datum",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Schlagwörter",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Titel",
-  
+
   // "browse.next.button": "Next",
   "browse.next.button": "Weiter",
 
   // "browse.previous.button": "Previous",
   "browse.previous.button": "Zurück",
 
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", beginnend mit {{ startsWith }}",
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Startpunkt wählen)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Zeitpunkt wählen)",
-  
+
   // "browse.startsWith.choose_year.label": "Choose the issue year",
   "browse.startsWith.choose_year.label": "Erscheinungsjahr auswählen",
 
   // "browse.startsWith.jump": "Jump to a point in the index:",
   "browse.startsWith.jump": "Zu einem Punkt im Index springen:",
-  
+
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "April",
-  
+
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "August",
-  
+
   // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "Dezember",
-  
+
   // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "Februar",
-  
+
   // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "Januar",
-  
+
   // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "Juli",
-  
+
   // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "Juni",
-  
+
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "März",
-  
+
   // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "Mai",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Monat auswählen)",
-  
+
   // "browse.startsWith.months.none.label": "Choose the issue month",
   "browse.startsWith.months.none.label": "Erscheinungsmonat auswählen",
 
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "Oktober",
-  
+
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "September",
-  
+
   // "browse.startsWith.submit": "Go",
   "browse.startsWith.submit": "Los",
-  
+
   // "browse.startsWith.type_date": "Or type in a date (year-month):",
   "browse.startsWith.type_date": "Oder geben Sie ein Datum ein:",
-  
+
   // "browse.startsWith.type_text": "Or enter first few letters:",
   "browse.startsWith.type_text": "Oder geben Sie die ersten Buchstaben ein:",
-    
+
   // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
   "browse.title": "Auflistung {{ collection }} nach {{ field }}{{ startsWith }} {{ value }}",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title.page": "Auflistung {{ collection }} nach {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Teil löschen",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Eine Sammlung anlegen",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   "collection.create.notifications.success": "Sammlung erfolgreich angelegt",
-  
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Eine Sammlung in dem Bereich {{ parent }} anlegen",
-  
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "Sammlung: {{collection}} pflegen",
-  
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Abbrechen",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Bestätigen",
-  
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Sammlung löschen",
-  
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "Die Sammlung konnte nicht gelöscht werden.",
-  
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "Die Sammlung wurde erfolgreich gelöscht",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Sind Sie sicher, dass Sie die Sammlung \"{{ dso }}\" löschen wollen?",
-  
-  
-  
+
+
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Diese Sammlung löschen",
-  
+
   // "collection.edit.head": "Edit Collection",
   "collection.edit.head": "Sammlung bearbeiten",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Sammlung bearbeiten",
-  
-  
-  
+
+
+
   // "collection.edit.logo.delete-undo.title": "Undo delete",
   "collection.edit.logo.delete-undo.title": "Löschen rückgängig machen",
 
@@ -1072,268 +1477,268 @@
 
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Item spiegeln",
-  
+
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
   "collection.edit.tabs.item-mapper.title": "Sammlung bearbeiten - Item spiegeln",
-  
+
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Abbrechen",
-  
+
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   "collection.edit.item-mapper.collection": "Sammlung: \"<b>{{name}}</b>\"",
-  
+
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Ausgewählte Items spiegeln",
-  
+
   // "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": "Sammlungsadministrator:innen haben die Möglichkeit Items von einer Sammlung in eine andere zu spiegeln. Man kann nach Items in anderen Sammlungen suchen und diese spiegeln oder sich eine Liste der gespiegelten Items anzeigen lassen.",
-  
+
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
   "collection.edit.item-mapper.head": "Item spiegeln - Spiegelt Items aus anderen Sammlungen",
-  
+
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
   "collection.edit.item-mapper.no-search": "Bitte geben Sie eine Suchanfrage ein.",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.error.content": "Beim Spiegeln von {{amount}} Ressource(n) ist ein Fehler aufgetreten.",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "Fehler beim Spiegeln",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} Item(s) erfolgreich gespiegelt.",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Spiegelung abgeschlossen",
-  
+
   // "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": "Beim Spiegeln von {{amount}} Item(s) ist ein Fehler aufgetreten.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Spiegeln Entfernen Fehler",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
   "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} Spiegelung(en) wurde(n) entfernt.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Spiegelung entfernen abgeschlossen",
-  
+
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Spiegelung der ausgewählten Items entfernen",
-  
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Gespiegelte Items auflisten",
-  
+
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Neue Items spiegeln",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   "collection.edit.logo.label": "Sammlungslogo",
-  
+
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
   "collection.edit.logo.notifications.add.error": "Hochladen des Sammlungslogos fehlgeschlagen. Bitte überprüfen Sie den Inhalt, bevor Sie es erneut versuchen.",
-  
+
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
   "collection.edit.logo.notifications.add.success": "Sammlungslogo erfolgreich hochgeladen.",
-  
+
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "Logo gelöscht",
-  
+
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Logo der Sammlung erfolgreich gelöscht",
-  
+
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "Fehler beim Löschen des Logos",
-  
+
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Ziehen Sie ein Logo herüber, um es hochzuladen.",
-  
-  
-  
+
+
+
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Sammlung erfolgreich bearbeitet",
-  
+
   // "collection.edit.return": "Return",
   "collection.edit.return": "Zurück",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Datenpflege",
-  
+
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
   "collection.edit.tabs.curate.title": "Sammlung bearbeiten - Datenpflege",
-  
+
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Berechtigungen",
-  
+
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   "collection.edit.tabs.authorizations.title": "Sammlung bearbeiten - Berechtigungen",
-  
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Metadaten bearbeiten",
-  
+
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
   "collection.edit.tabs.metadata.title": "Sammlung bearbeiten - Metadaten",
-  
+
   // "collection.edit.tabs.roles.head": "Assign Roles",
   "collection.edit.tabs.roles.head": "Rollen zuweisen",
-  
+
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
   "collection.edit.tabs.roles.title": "Sammlung bearbeiten - Rollen",
-  
+
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
   "collection.edit.tabs.source.external": "Diese Sammlung bezieht ihre Inhalte aus einer externen Quelle",
-  
+
   // "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": "Sie müssen die OAI-Set-Id der Zielsammlung angeben.",
-  
+
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
   "collection.edit.tabs.source.form.harvestType": "Der Inhalt wird automatisch bezogen",
-  
+
   // "collection.edit.tabs.source.form.head": "Configure an external source",
   "collection.edit.tabs.source.form.head": "Externe Quelle konfigurieren",
-  
+
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
   "collection.edit.tabs.source.form.metadataConfigId": "Metadatenformat",
-  
+
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "OAI-spezifische Set-ID",
-  
+
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
   "collection.edit.tabs.source.form.oaiSource": "OAI-Anbieter",
-  
+
   // "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": "Bezieht Metadaten und Dateien (ORE-Schnittstelle erforderlich)",
-  
+
   // "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": "Bezieht Metadaten und Referenzen auf Dateien (ORE-Schnittstelle erforderlich))",
-  
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Nur Metadaten beziehen",
-  
+
   // "collection.edit.tabs.source.head": "Content Source",
   "collection.edit.tabs.source.head": "Herkunft des Inhalts",
-  
+
   // "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": "Die Änderungen wurden verworfen. Bitte klicken Sie auf \"Rückgängig\", um sie wieder einzusetzen.",
-  
+
   // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
   "collection.edit.tabs.source.notifications.discarded.title": "Änderungen verworfen",
-  
+
   // "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": "Ihre Änderungen wurden nicht gespeichert. Stellen Sie sicher, dass alle Felder gültig sind bevor Sie speichern.",
-  
+
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
   "collection.edit.tabs.source.notifications.invalid.title": "Metadaten ungültig",
-  
+
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "Die Quelle für den Inhalt der Sammlung wurde geändert.",
-  
+
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
   "collection.edit.tabs.source.notifications.saved.title": "Bezugsquelle für den Inhalt gespeichert",
-  
+
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Sammlung bearbeiten - Bezugsquelle für den Inhalt",
-  
-  
-  
+
+
+
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Hinzufügen",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "Metadatenvorlage",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "Abbrechen",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "Löschen",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "Bearbeiten",
-  
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
   "collection.edit.template.head": "Itemvorlage für Sammlung \"{{ collection }}\" bearbeiten",
-  
+
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Itemvorlage",
-  
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Löschen der Metadatenvorlage fehlgeschlagen",
-  
+
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
   "collection.edit.template.notifications.delete.success": "Die Metadatenvorlage wurde erfolgreich gelöscht.",
-  
+
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Metadatenvorlage bearbeiten",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Kurzbeschreibung",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "Einleitender Text (HTML)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "Bitte geben Sie einen Namen für die Sammlung ein.",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "Lizenzbestimmung",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "Herkunft",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "Copyright Text (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Neuigkeiten (HTML)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "Name",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Sammlung",
-  
-  
-  
+
+
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Neueste Veröffentlichungen",
-  
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "Es gibt keine Items, die angezeigt werden können.",
-  
+
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Diese Sammlung bearbeiten",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   "collection.page.handle": "Dauerhafte URI für die Sammlung",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "Lizenz",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Neuigkeiten",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Auswahl bestätigen",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Es gibt keine Sammlungen, die angezeigt werden können",
-  
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Titel",
-  
-  
-  
+
+
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Importiere...",
 
@@ -1348,391 +1753,392 @@
 
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "Die angegebenen Einstellungen wurden getestet und haben nicht funktioniert.",
-  
+
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Serverfehler",
-  
-  
-  
+
+
+
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Löschen rückgängig machen",
 
   // "community.edit.logo.delete.title": "Delete logo",
   "community.edit.logo.delete.title": "Logo löschen",
-  
+
   // "communityList.breadcrumbs": "Community List",
   "communityList.breadcrumbs": "Bereichsliste",
 
   // "communityList.tabTitle": "Community List",
   "communityList.tabTitle": "Bereichsliste",
-  
+
   // "communityList.title": "List of Communities",
   "communityList.title": "Liste der Bereiche",
-  
+
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mehr anzeigen",
-  
-  
-  
+
+
+
   // "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",
-  
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Teilbereich im Bereich {{ parent }} anlegen",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Bereich: {{community}} pflegen",
-  
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Abbrechen",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Bestätigen",
-  
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Bereich Löschen",
-  
+
   // "community.delete.notification.fail": "Community could not be deleted",
   "community.delete.notification.fail": "Der Bereich konnte nicht gelöscht werden.",
-  
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "Der Bereich wurde erfolgreich gelöscht.",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "Sind Sie sicher, dass Sie den Bereich \"{{ dso }}\" löschen möchten?",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Diesen Bereich löschen",
-  
+
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Bereich bearbeiten",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Bereich bearbeiten",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Bereichslogo",
-  
+
   // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Hochladen des Bereichslogos fehlgeschlagen. Bitte überprüfen Sie den Inhalt bevor Sie es erneut versuchen.",
-  
+
   // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
   "community.edit.logo.notifications.add.success": "Hochladen des Bereichslogos erfolgreich.",
-  
+
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "Logo gelöscht",
-  
+
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "Das Bereichslogo wurde erfolgreich gelöscht",
-  
+
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Fehler beim Löschen des Logos",
-  
+
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Ziehen Sie ein Bereichslogo herüber, um es hochzuladen",
-  
-  
-  
+
+
+
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Bereich erfolgreich bearbeitet",
-  
+
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Sie haben keine Berechtigung, diese Änderung vorzunehmen",
-  
+
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Bei der Bearbeitung des Bereichs ist ein Fehler aufgetreten",
-  
+
   // "community.edit.return": "Return",
   "community.edit.return": "Zurück",
-  
-  
-  
+
+
+
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Datenpflege",
-  
+
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Bereich bearbeiten - Datenpflege",
-  
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Metadaten bearbeiten",
-  
+
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
   "community.edit.tabs.metadata.title": "Bereich bearbeiten - Metadaten",
-  
+
   // "community.edit.tabs.roles.head": "Assign Roles",
   "community.edit.tabs.roles.head": "Rollen zuordnen",
-  
+
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
   "community.edit.tabs.roles.title": "Bereich bearbeiten - Rollen",
-  
+
   // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "Berechtigungen",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Bereich bearbeiten - Berechtigungen",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Bereich",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Keine",
-  
+
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "Erstellen",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "Beschränken",
-  
+
   // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "Löschen",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Administrator:innen",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Administrator:innen",
-  
-  
+
+
   // "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": "Community-Administrator:innen können Teilbereiche oder Sammlungen erstellen, verwalten oder die Verwaltung anderen zuweisen. Darüber hinaus entscheiden sie, wer Items zu einer Teilsammlung einreichen, Item-Metadaten bearbeiten (nach der Einreichung) und bestehende Items von anderen Sammlungen verknüpfen kann (vorbehaltlich einer Berechtigung).",
-  
+
   // "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": "Sammlungsadministrator:innen entscheiden, wer Items zu einer Sammlung einreichen, Item-Metadaten bearbeiten (nach der Einreichung) and und bestehende Items von anderen Sammlungen mit dieser Sammlung verknüpfen kann (vorbehaltlich einer Berechtigung für diese Sammlung).",
-  
-  
+
+
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Einreichende",
-  
+
   // "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": "Personen und Gruppen, die neue Items für diese Sammlung einreichen dürfen",
-  
-  
+
+
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Standardeinstellungen für den Lesezugriff auf Items",
-  
+
   // "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": "Personen und Gruppen, die neu eingereichte Items dieser Sammlung lesen können. Änderungen an dieser Rolle sind nicht rückwirkend. Bestehende Items im System können weiterhin von denjenigen eingesehen werden, die zum Zeitpunkt des Hinzufügens Lesezugriff hatten.",
-  
+
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "Freigeschaltete Items sind standardmäßig für jede:n öffentlich sichtbar.",
-  
-  
+
+
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Standardeinstellungen für den Lesezugriff auf Dateien",
-  
+
   // "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": "Community-Administrator:innen können Teilbereiche oder Sammlungen erstellen, verwalten oder die Verwaltung anderen zuweisen. Darüber hinaus entscheiden sie, wer Items zu einer Teilsammlung einreichen, Item-Metadaten bearbeiten (nach der Einreichung) und bestehende Items von anderen Sammlungen verknüpfen kann (vorbehaltlich einer Berechtigung).",
-  
+
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "Freigeschaltete Dateien sind standardmäßig für jede:n öffentlich sichtbar.",
-  
-  
+
+
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Redakteur:innen",
-  
+
   // "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": "Die Redakteure können die Metadaten der eingehenden Beiträge bearbeiten und sie dann annehmen oder ablehnen.",
-  
-  
+
+
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Endredakteur:innen",
-  
+
   // "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": "Die Endredakteur:innen können die Metadaten der eingehenden Beiträge bearbeiten, sie können sie jedoch nicht ablehnen.",
-  
-  
+
+
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Prüfer:innen",
-  
+
   // "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": "Die Prüfer:innen können eingehende Beiträge annehmen oder ablehnen. Sie können jedoch nicht die Metadaten der Einreichung bearbeiten.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Kurzbeschreibung",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "Einleitender Text (HTML)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "Bitte geben Sie einen Namen für den Bereich ein.",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "Copyright Text (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Neuigkeiten (HTML)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "Name",
-  
+
   // "community.page.edit": "Edit this community",
   "community.page.edit": "Diesen Bereich bearbeiten",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   "community.page.handle": "Dauerhafte URI für den Bereich",
-  
+
   // "community.page.license": "License",
   "community.page.license": "Lizenz",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Neuigkeiten",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Teilbereiche in diesem Bereich",
-  
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Sammlungen in diesem Bereich",
-  
+
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Teilbereiche in diesem Bereich",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Alle Cookies akzeptieren",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   "cookies.consent.accept-selected": "Nur ausgewählte Cookies akzeptieren",
-  
+
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
   "cookies.consent.app.opt-out.description": "Diese App wird standardmäßig geladen (Sie können dies jedoch deaktivieren).",
-  
+
   // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   "cookies.consent.app.purpose": "Verwendungszweck",
-  
+
   // "cookies.consent.app.required.description": "This application is always required",
   "cookies.consent.app.required.description": "Dieser Eintrag ist immer erforderlich.",
-  
+
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(immer erforderlich)",
-  
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Seit Ihrem letzten Besuch haben sich Änderungen ergeben, bitte aktualisieren Sie Ihr Einverständnis.",
-  
+
   // "cookies.consent.close": "Close",
   "cookies.consent.close": "Schließen",
-  
+
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Ablehnen",
-  
+
   // "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": "Wir sammeln und verarbeiten Ihre personenbezogenen Daten für die folgenden Zwecke: <strong>Authentifikation, Einstellungen, Zustimmungen und Statistiken</strong>. <br/> Um mehr zu erfahren, lesen Sie bitte unsere {privacyPolicy}.",
-  
+
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Anpassen",
-  
+
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
   "cookies.consent.content-modal.description": "Hier können Sie die Informationen, die wir über Sie sammeln, einsehen und anpassen.",
-  
+
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
   "cookies.consent.content-modal.privacy-policy.name": "Datenschutzbestimmungen",
-  
+
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Um mehr zu erfahren, lesen Sie bitte unsere {privacyPolicy}.",
-  
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Information, die wir sammeln",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Authentifizierung",
-  
+
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Erforderlich für Ihre Anmeldung",
-  
-  
+
+
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Präferenzen",
-  
+
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Erforderlich zum Speichern Ihrer Präferenzen",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Bestätigung",
-  
+
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Erforderlich für die Speicherung Ihrer Bestätigungen und Einwilligungen",
-  
-  
-  
+
+
+
   // "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": "Gestattet es uns, statistische Daten zu erheben",
-  
-  
-  
+
+
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funktionell",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Statistisch",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Links in Metadaten prüfen",
-  
+  "curation-task.task.checklinks.label": "Links in Metadaten prüfen",
+
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
-  
+
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "Dateiformate auflisten",
-  
+
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "Prüfung auf erforderliche Metadaten",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "Microsoft Übersetzer",
-  
+
   // "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:",
-  
+
   // "curation.form.submit": "Start",
   "curation.form.submit": "Start",
-  
+
   // "curation.form.submit.success.head": "The curation task has been started successfully",
   "curation.form.submit.success.head": "Die Datenpflegeroutine wurde erfolgreich gestartet",
-  
+
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "Sie werden auf die entsprechende Prozessseite weitergeleitet.",
-  
+
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Die Ausführung der Datenpflegeroutine ist fehlgeschlagen",
-  
+
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Beim Versuch, die Datenpflegeroutine zu starten, ist ein Fehler aufgetreten.",
-  
+
   // "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": "Tipp: Geben Sie [your-handle-prefix]/0 ein, um eine Aufgabe für die ganze Website auszuführen. Nicht alle Aufgaben unterstützen diese Funktion.",
-  
-  
-  
+
+
+
   // "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": "Sehr geehrte:r {{ recipientName }},\nLeider kann ich Ihnen die angeforderte Datei zu meiner Veröffentlichung \"{{ itemUrl }}\" ({{ itemName }}) nicht schicken.\n\nMit freundlichen Grüßen\n{{ authorName }} <{{ authorEmail }}>",
 
@@ -1750,46 +2156,46 @@
 
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Neue Sammlung",
-  
+
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "Eine neue Sammlung erstellen in",
-  
+
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Neuer Bereich",
-  
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Einen neuen Bereich anlegen in",
-  
+
   // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "Einen neuen Bereich auf oberster Ebene anlegen",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Neues Item",
-  
+
   // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "Ein neues Item erstellen in",
-  
+
   // "dso-selector.create.submission.head": "New submission",
   "dso-selector.create.submission.head": "Neue Veröffentlichung",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Sammlung bearbeiten",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "Bereich bearbeiten",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Item bearbeiten",
-  
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Exportieren der Metadaten aus",
-  
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Kein(e) {{ type }} gefunden",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Suche nach {{ type }}",
-  
+
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Sammlung auswählen",
 
@@ -1801,91 +2207,88 @@
 
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "Suche Bereich oder Sammlung",
-  
-  
-  
+
+
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportieren der Metadaten für {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "Möchten Sie wirklich Metadaten für {{ dsoName }} exportieren?",
-  
+
   // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "Abbrechen",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Exportieren",
-  
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "Person \"{{ dsoName }}\" löschen",
-  
+
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.info": "Möchten Sie die Person \"{{ dsoName }}\" wirklich löschen?",
-  
+
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Abbrechen",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Löschen",
-  
-  
-  // "dso-selector.select.collection.head": "Select a collection",
-  "dso-selector.select.collection.head": "Bitte wählen Sie eine Sammlung aus.",
+
 
   // "dso.name.untitled": "Untitled",
   "dso.name.untitled": "Unbenannt",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Die Datei konnte nicht geladen werden.",
-  
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Fehler beim Laden der Items",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "Fehler beim Laden der Sammlung",
-  
+
   // "error.collections": "Error fetching collections",
   "error.collections": "Fehler beim Laden der Sammlungen",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "Fehler beim Laden des Bereichs",
-  
+
   // "error.identifier": "No item found for the identifier",
   "error.identifier": "Zu dieser Kennung wurde kein Item gefunden.",
-  
+
   // "error.default": "Error",
   "error.default": "Fehler",
-  
+
   // "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": "Ihre Suchanfrage ist ungültig. Weitere Informationen zur Syntax für Solr-Queries finden Sie <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">hier</a>.",
 
   // "error.item": "Error fetching item",
   "error.item": "Fehler beim Laden des Items",
-  
+
   // "error.items": "Error fetching items",
   "error.items": "Fehler beim Laden der Items",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "Fehler beim Laden der Objekte",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "Fehler beim Laden der neuesten Veröffentlichungen",
-  
+
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Fehler beim Laden der Suchergebnisse",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Fehler beim Laden der Teilsammlungen",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   "error.sub-communities": "Fehler beim Laden der Teilbereiche",
-  
+
   // "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": "Ein Fehler ist bei der Initialisierung der Eingabemaske aufgetreten. Bitte Überprüfen Sie die Konfiguration Ihrer Eingabemaske. Details s.u. <br> <br>",
-  
+
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Hauptbereich konnte nicht geladen werden",
-  
+
   // "error.validation.NotValidEmail": "This E-mail is not a valid email",
   "error.validation.NotValidEmail": "Ungültige E-Mail-Adresse",
 
@@ -1897,208 +2300,205 @@
 
   // "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": "Um die Veröffentlichung abzuschließen, müssen Sie die Lizenzbedingungen akzeptieren. Wenn Sie zur Zeit dazu nicht in der Lage sind, können Sie Ihre Arbeit sichern und später dazu zurückkehren, um zuzustimmen oder die Einreichung zu löschen.",
-  
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Die Eingabe muss dem folgenden Muster entsprechen: {{ pattern }}.",
-  
+
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Das Hochladen einer Datei ist erforderlich.",
-  
-  
-  
+
+
+
   // "error.validation.required": "This field is required",
   "error.validation.required": "Dieses Feld darf nicht leer bleiben.",
 
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Fehler beim Abrufen der Dateien für dieses Item",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "Copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "DSpace Software",
-  
+
   // "footer.link.feedback": "Send Feedback",
   "footer.link.feedback": "Feedback schicken",
 
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   "footer.link.cookies": "Cookie-Einstellungen",
-  
+
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Datenschutzbestimmungen",
-  
+
   // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"Endnutzervereinbarung",
-  
-  
+  "footer.link.end-user-agreement": "Endnutzervereinbarung",
+
+
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Passwort vergessen",
-  
+
   // "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": "Erstellen Sie ein Konto, um neue Einträge in DSpace hochzuladen und per E-Mail über Neuigkeiten informiert zu werden.",
-  
+
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "E-Mail-Addresse *",
-  
+
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Bitte geben Sie eine E-Mail-Adresse an.",
-  
+
   // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
   "forgot-email.form.email.error.pattern": "Bitte geben Sie eine gültige E-Mail-Adresse an.",
-  
+
   // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
   "forgot-email.form.email.hint": "Diese Adresse wird überprüft und als Ihr Anmeldename verwendet.",
-  
+
   // "forgot-email.form.submit": "Submit",
   "forgot-email.form.submit": "Einreichen",
-  
+
   // "forgot-email.form.success.head": "Verification email sent",
   "forgot-email.form.success.head": "Verifizierungs-E-Mail gesendet",
-  
+
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "Eine E-Mail mit weitergehenden Informationen wurde an {{ email }} verschickt.",
-  
+
   // "forgot-email.form.error.head": "Error when trying to register email",
   "forgot-email.form.error.head": "Registrierung der E-Mail-Adresse fehlgeschlagen",
-  
+
   // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
   "forgot-email.form.error.content": "Bei der Registrierung der E-Mail-Adresse {{ email }} ist ein Fehler aufgetreten.",
-  
-  
-  
+
+
+
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Passwort vergessen",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "Passwort vergessen",
-  
-  // "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": "Bitte geben Sie ein neues Passwort (mindestens sechs Zeichen) ein und bestätigen Sie es erneut.",
-  
+
+  // "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": "Bitte geben Sie ein neues Passwort ein und bestätigen Sie es erneut.",
+
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Sicherheit",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "Identifizieren",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "E-Mail-Addresse: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Passwort",
-  
+
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Zum Bestätigen wiederholen",
-  
+
   // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
   "forgot-password.form.error.empty-password": "Bitte geben Sie unten ein Passwort ein.",
-  
+
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Die Passwörter stimmen nicht überein.",
-  
+
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
   "forgot-password.form.error.password-length": "Das Passwort sollte mindestens 6 Zeichen lang sein.",
-  
+
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Fehler beim Versuch, ein neues Passwort zu übermitteln",
-  
+
   // "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": "Ihr Passwort wurde erfolgreich zurückgesetzt und Sie wurden eingeloggt.",
-  
+
   // "forgot-password.form.notification.success.title": "Password reset completed",
   "forgot-password.form.notification.success.title": "Passwort erfolgreich zurückgesetzt",
-  
+
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Passwort abschicken",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   "form.add": "Hinzufügen",
-  
+
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "Klicken Sie hier, um den aktuellen Eintrag und einen weiteren hinzuzufügen",
-  
+
   // "form.cancel": "Cancel",
   "form.cancel": "Abbrechen",
-  
+
   // "form.clear": "Clear",
   "form.clear": "Eingaben löschen",
-  
+
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Klicken Sie hier, um den ausgewählten Wert zu entfernen",
-  
+
   // "form.discard": "Discard",
   "form.discard": "Verwerfen",
 
   // "form.edit": "Edit",
   "form.edit": "Bearbeiten",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "Klicken Sie hier, um den ausgewählten Wert zu bearbeiten",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "Vorname",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Zusammenklappen",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Einklappen",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "Ausklappen",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "Zum Ausklappen und Hinzufügen weiterer Elemente klicken Sie bitte hier.",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "Nachname",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "Lädt...",
-  
+
   // "form.lookup": "Lookup",
   "form.lookup": "Nachschlagen",
-  
+
   // "form.lookup-help": "Click here to look up an existing relation",
   "form.lookup-help": "Klicken Sie hier, um eine bestehende Beziehung nachzuschlagen",
-  
+
   // "form.no-results": "No results found",
   "form.no-results": "Keine Ergebnisse gefunden",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Kein Wert eingegeben",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "Entfernen",
-  
+
   // "form.save": "Save",
   "form.save": "Speichern",
-  
+
   // "form.save-help": "Save changes",
   "form.save-help": "Änderungen speichern",
-  
+
   // "form.search": "Search",
   "form.search": "Suche",
-  
+
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Klicken Sie hier, um eine Übereinstimmung zu suchen",
-  
+
   // "form.submit": "Submit",
   "form.submit": "Abschicken",
-  
-  
-  
+
+
+
   // "grant-deny-request-copy.deny": "Don't send copy",
   "grant-deny-request-copy.deny": "Anfrage ablehnen",
 
@@ -2140,1951 +2540,2002 @@
 
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Startseite",
-  
+
   // "home.search-form.placeholder": "Search the repository ...",
   "home.search-form.placeholder": "Durchsuche Repositorium",
-  
+
   // "home.title": "Home",
   "home.title": "Startseite",
-  
+
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Hauptbereiche in DSpace",
-  
+
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Wählen Sie einen Bereich, um dessen Inhalt anzusehen.",
-  
-  
-  
+
+
+
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "Ich habe die Endnutzer-Vereinbarung gelesen und stimme ihr zu.",
-  
+
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
   "info.end-user-agreement.accept.error": "Beim Akzeptieren der Endnutzer-Vereinbarung ist ein Fehler aufgetreten",
-  
+
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
   "info.end-user-agreement.accept.success": "Endnutzer-Vereinbarung erfolgreich aktualisiert",
-  
+
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
   "info.end-user-agreement.breadcrumbs": "Endnutzer-Vereinbarung",
-  
+
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "Abbrechen",
-  
+
   // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "Speichern",
-  
+
   // "info.end-user-agreement.head": "End User Agreement",
   "info.end-user-agreement.head": "Endnutzer-Vereinbarung",
-  
+
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Endnutzer-Vereinbarung",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Datenschutzerklärung",
-  
+
   // "info.privacy.head": "Privacy Statement",
   "info.privacy.head": "Datenschutzerklärung",
-  
+
   // "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",
   "item.alerts.private": "Dieses Item ist nicht öffentlich sichtbar.",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Dieses Item wurde zurückgezogen.",
-  
-  
-  
+
+
+
   // "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": "Mit diesem Editor können Sie die Richtlinien für Items sowie für einzelne Item-Komponenten (Pakete und Bitstreams) anzeigen und ändern. Ein Item ist ein Container für Pakete, und ein Paket ist ein Container für Bitstreams. Container haben normalerweise ADD/REMOVE/READ/WRITE-Richtlinien, während Bitstreams nur READ/WRITE-Richtlinien haben.",
-  
+
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Item-Richtlinien bearbeiten",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   "item.badge.private": "Verborgen",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Zurückgezogen",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Bündel",
-  
+
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
   "item.bitstreams.upload.bundle.placeholder": "Wählen Sie ein Bündel aus",
-  
+
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Bündel erstellen",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Diesem Item fehlt ein Bundle. Ohne Bundle kann keine Datei hochgeladen werden.",
-  
+
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "Abbrechen",
-  
+
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "Eine Datei zum Hochladen ablegen",
-  
+
   // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "Item: ",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Neues Bündel erfolgreich erstellt.",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
   "item.bitstreams.upload.notifications.bundle.created.title": "Bündel erstellt",
-  
+
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
   "item.bitstreams.upload.notifications.upload.failed": "Hochladen fehlgeschlagen. Bitte überprüfen Sie den Inhalt, bevor Sie es erneut versuchen.",
-  
+
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Datei hochladen",
-  
-  
-  
+
+
+
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Hochladen",
-  
+
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
   "item.edit.bitstreams.bundle.displaying": "Derzeit werden {{ amount }} von insgesamt {{ total }} Dateien angezeigt.",
-  
+
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "Alle ({{ total }}) laden",
-  
+
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Mehr laden",
-  
+
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "Bündel: {{ name }}",
-  
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Verwerfen",
-  
+
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "Herunterladen",
-  
+
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
   "item.edit.bitstreams.edit.buttons.drag": "Ziehen",
-  
+
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "Bearbeiten",
-  
+
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "Entfernen",
-  
+
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Änderungen rückgängig machen",
-  
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Dieses Item enthält keine Dateien. Klicken Sie auf das Feld \"Hochladen\", um eine Datei hinzuzufügen.",
-  
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Aktionen",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Bündel",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "Beschreibung",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "Name",
-  
+
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.bitstreams.notifications.discarded.content": "Ihre Änderungen wurden verworfen. Um sie wiederherzustellen, klicken Sie bitte auf \"Rückgängig\".",
-  
+
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "Änderungen verworfen",
-  
+
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Fehler beim Verschieben von Dateien",
-  
+
   // "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": "Die von Ihnen vorgenommenen Änderungen an den Dateien und Bündeln dieses Artikels wurden gespeichert.",
-  
+
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
   "item.edit.bitstreams.notifications.move.saved.title": "Änderungen gespeichert",
-  
+
   // "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": "Das Item, an der Sie gerade arbeiten, wurde von einem anderen Account geändert. Ihre aktuellen Änderungen werden verworfen, um Konflikte zu vermeiden.",
-  
+
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Veraltete Änderungen",
-  
+
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
   "item.edit.bitstreams.notifications.remove.failed.title": "Fehler beim Löschen der Datei",
-  
+
   // "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": "Sie haben die Datei(en) entfernt.",
-  
+
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "Änderungen gespeichert",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   "item.edit.bitstreams.reinstate-button": "Rückgängig",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "Speichern",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Hochladen",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Abbrechen",
-  
+
   // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "Löschen",
-  
+
   // "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": "Möchten Sie das Item wirklich löschen? Achtung: Wenn Sie es löschen, wird bei Aufruf der URL kein Hinweis auf ein zurückgezogenes Item angezeigt, sondern eine 404er-Fehlermeldung.",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Beim Löschen der Ressource ist ein Fehler aufgetreten",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "Löschen des Items: {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "Das Item wurde gelöscht.",
-  
+
   // "item.edit.head": "Edit Item",
   "item.edit.head": "Item bearbeiten",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "Item bearbeiten",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Spiegeln",
-  
+
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Item bearbeiten - Spiegeln",
-  
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Item in die gewählte(n) Sammlung(en) spiegeln",
-  
+
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "Spiegelung des Items aus den ausgewählten Sammlungen entfernen",
-  
+
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Abbrechen",
-  
+
   // "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": "Sammlungsadministrator:innen haben die Möglichkeit Items von einer Sammlung in eine andere zu spiegeln. Man kann nach Items in anderen Sammlungen suchen und diese spiegeln oder sich eine Liste der gespiegelten Items anzeigen lassen.",
-  
+
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Item spiegeln - Spiegelt ein Item in andere Sammlungen",
-  
+
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  
+
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Bitte geben Sie einen Suchbegriff ein",
-  
+
   // "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": "Beim Spiegeln des Items in {{amount}} Sammlung(en) ist ein Fehler aufgetreten.",
-  
+
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Fehler beim Spiegeln",
-  
+
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.success.content": "Das Item wurde erfolgreich in {{amount}} Sammlung(en) gespiegelt.",
-  
+
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Spiegeln abgeschlossen",
-  
+
   // "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": "Beim Entfernen der Spiegelung in {{amount}} Sammlung(en) ist ein Fehler aufgetreten.",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "Fehler beim Entfernen von gespiegelten Items",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.remove.success.content": "Die Spiegelung dieses Items wurde aus {{amount}} Sammlung(en) entfernt.",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Entfernen der Spiegelung abgeschlossen",
-  
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Gespiegelte Sammlungen anzeigen",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Neue Sammlungen spiegeln",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Hinzufügen",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Verwerfen",
-  
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Bearbeiten",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Entfernen",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "Änderungen rückgängig machen",
-  
+
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Bearbeitung beenden",
-  
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Das Item enthält derzeit keine Metadaten. Klicken Sie auf \"Hinzufügen\", um Metadaten zu ergänzen.",
-  
+
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Bearbeiten",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   "item.edit.metadata.headers.field": "Feld",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Sprache",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Wert",
-  
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Bitte wählen Sie ein gültiges Metadatenfeld",
-  
+
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Ihre Änderungen wurden verworfen. Um sie wiederherzustellen, klicken Sie bitte auf \"Rückgängig\".",
-  
+
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
   "item.edit.metadata.notifications.discarded.title": "Änderungen verworfen",
-  
+
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Es ist ein Fehler aufgetreten.",
-  
+
   // "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": "Ihre Änderungen wurden nicht gespeichert. Stellen Sie sicher, dass alle Felder gültig sind, bevor Sie Abspeichern.",
-  
+
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Metadaten ungültig",
-  
+
   // "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": "Das Item, an dem Sie gerade arbeiten, wurde von einem anderen Account geändert. Ihre aktuellen Änderungen werden nicht angewandt, um Konflikte zu vermeiden.",
-  
+
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
   "item.edit.metadata.notifications.outdated.title": "Änderung veraltet",
-  
+
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
   "item.edit.metadata.notifications.saved.content": "Ihre Änderungen an den Metadaten des Items wurden gespeichert.",
-  
+
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadaten gespeichert",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Rückgängig machen",
-  
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Speichern",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Feld",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "Sprache",
-  
+
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Wert",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   "item.edit.move.cancel": "Abbrechen",
-  
+
   // "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": "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.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "Verschieben des Items fehlgeschlagen",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "Item : {{id}} verschieben",
-  
+
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Rechte erben",
-  
+
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Standardrechte der Zielsammlung erben",
-  
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Verschieben",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "Verschieben...",
-  
+
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Geben Sie einen Begriff ein, um nach Sammlungen zu suchen",
-  
+
   // "item.edit.move.success": "The item has been moved successfully",
   "item.edit.move.success": "Das Item wurde verschoben.",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Item verschieben",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Abbrechen",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   "item.edit.private.confirm": "Verbergen",
-  
+
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
   "item.edit.private.description": "Möchten Sie diesen Eintrag als nicht öffentlich sichtbar markieren?",
-  
+
   // "item.edit.private.error": "An error occurred while making the item private",
   "item.edit.private.error": "Verbergen des Items fehlgeschlagen",
-  
+
   // "item.edit.private.header": "Make item private: {{ id }}",
   "item.edit.private.header": "Item: {{ id }} verbergen",
-  
+
   // "item.edit.private.success": "The item is now private",
   "item.edit.private.success": "Dieses Items ist nicht öffentlich sichtbar",
-  
-  
-  
+
+
+
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Abbrechen",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   "item.edit.public.confirm": "Öffentlich machen",
-  
+
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
   "item.edit.public.description": "Möchten Sie das Item wirklich öffentlich sichtbar machen?",
-  
+
   // "item.edit.public.error": "An error occurred while making the item public",
   "item.edit.public.error": "Veröffentlichung des Items fehlgeschlagen",
-  
+
   // "item.edit.public.header": "Make item public: {{ id }}",
   "item.edit.public.header": "Item: {{ id }} öffentlich sichtbar machen",
-  
+
   // "item.edit.public.success": "The item is now public",
   "item.edit.public.success": "Das Item ist nun öffentlich sichtbar.",
-  
-  
-  
+
+
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Abbrechen",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "Wiederherstellen",
-  
+
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "Möchten Sie das Item wirklich wieder aufnehmen?",
-  
+
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Wiederherstellen des Items fehlgeschlagen",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "Item: {{ id }} wiederherstellen",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Das Item wurde wiederhergestellt.",
-  
-  
-  
+
+
+
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Abbrechen",
-  
+
   // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "Hinzufügen",
-  
+
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Entfernen",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
   "item.edit.relationships.edit.buttons.undo": "Rückgängig machen",
-  
+
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "Keine Beziehungen",
-  
+
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.relationships.notifications.discarded.content": "Ihre Änderungen wurden verworfen. Um sie wiederherzustellen, klicken Sie bitte auf \"Rückgängig\".",
-  
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Änderungen verworfen",
-  
+
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "Fehler beim Bearbeiten der Beziehung",
-  
+
   // "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": "Das Item, das Sie gerade bearbeiten, wurde von einem anderen Account geändert. Ihre aktuellen Änderungen werden verworfen, um Konflikte zu vermeiden.",
-  
+
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Änderungen veraltet",
-  
+
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
   "item.edit.relationships.notifications.saved.content": "Ihre Änderungen an den Beziehungen des Items wurden gespeichert.",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "Beziehungen gespeichert",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "Rückgängig machen",
-  
+
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Speichern",
-  
+
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Fügt den Metadaten 'dspace.entity.type' hinzu, damit Beziehungen für dieses Item angelegt werden können.",
-  
-  
-  
+
+
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Dateien",
-  
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Item bearbeiten - Dateien",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Pflegen",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Item bearbeiten - Pflegen",
-  
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadaten",
-  
+
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
   "item.edit.tabs.metadata.title": "Item bearbeiten -  Metadaten",
-  
+
   // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "Beziehungen",
-  
+
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "Item bearbeiten - Relationen",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Berechtigungen...",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
   "item.edit.tabs.status.buttons.authorizations.label": "Rechte des Items bearbeiten",
-  
+
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
   "item.edit.tabs.status.buttons.delete.button": "Endgültig löschen",
-  
+
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Unwiderruflich löschen",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.button": "Gespiegelte Sammlungen",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gespiegelte Sammlungen bearbeiten",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Verschieben...",
-  
+
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Verschieben Sie diesen Artikel in eine andere Sammlung",
+
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Item in eine andere Sammlung verschieben",
-  
+
   // "item.edit.tabs.status.buttons.private.button": "Make it private...",
   "item.edit.tabs.status.buttons.private.button": "Verbergen",
-  
+
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
   "item.edit.tabs.status.buttons.private.label": "Item verbergen",
-  
+
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
   "item.edit.tabs.status.buttons.public.button": "Öffentlich machen...",
-  
+
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
   "item.edit.tabs.status.buttons.public.label": "Item öffentlich sichtbar machen",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Wiederherstellen...",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Item im Repositorium wiederherstellen",
-  
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Zurückziehen...",
-  
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Ziehen Sie diesen Artikel zurück",
+
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Item aus dem Repositorium zurückziehen",
-  
+
   // "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": "Herzlich willkommen auf der Item-Bearbeitungs-Seite. Hier können Sie Items zurückziehen, wiederherstellen, verschieben oder löschen. In den anderen Tabs können Sie Dateien und Metadaten bearbeiten.",
-  
+
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Status",
-  
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Handle",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Interne ID des Items",
-  
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Startseite des Items",
-  
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Zuletzt geändert",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "Item bearbeiten -  Status",
-  
+
   // "item.edit.tabs.versionhistory.head": "Version History",
   "item.edit.tabs.versionhistory.head": "Versionsgeschichte",
-  
+
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
   "item.edit.tabs.versionhistory.title": "Item bearbeiten - Versionsgeschichte",
-  
+
   // "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": "Das Bearbeiten oder Hinzufügen neuer Versionen ist in dieser Benutzeroberfläche noch nicht möglich.",
-  
+
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "Item ansehen",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Item bearbeiten -  Ansicht",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Abbrechen",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "Zurückziehen",
-  
+
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "Möchten Sie das Item wirklich aus dem Repositorium zurückziehen?",
-  
+
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Zurückziehen des Items fehlgeschlagen",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "Item: {{ id }} zurückziehen",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Das Item wurde zurückgezogen.",
-  
-  
-  
+
+
+
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   "item.page.description": "Beschreibung",
-  
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Dieses Item bearbeiten",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "ISSN der Zeitschrift",
-  
+
   // "item.page.journal-title": "Journal Title",
   "item.page.journal-title": "Zeitschriftentitel",
-  
+
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "Verlag",
-  
+
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Bandtitel",
-  
+
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Item-Suchergebnisse",
-  
+
   // "item.search.title": "Item Search",
   "item.search.title": "Item-Suche",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Zusammenfassung",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Autor:innen",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "Zitierform",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Sammlungen",
-  
+
   // "item.page.date": "Date",
   "item.page.date": "Datum",
-  
+
   // "item.page.edit": "Edit this item",
   "item.page.edit": "Dieses Item bearbeiten",
-  
+
   // "item.page.files": "Files",
   "item.page.files": "Dateien",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Beschreibung:",
-  
+
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Herunterladen",
-  
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Format:",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "Name:",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Größe:",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Artikel in dieser Zeitschrift",
-  
+
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "Komplettanzeige",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Kurzanzeige",
-  
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Veröffentlichungen dieses:dieser Autor:in",
-  
+
   // "item.page.related-items.view-more": "Show {{ amount }} more",
   "item.page.related-items.view-more": "{{ amount }} mehr anzeigen",
-  
+
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
   "item.page.related-items.view-less": "{{ amount }} weniger anzeigen",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   "item.page.relationships.isAuthorOfPublication": "Veröffentichungen",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   "item.page.relationships.isJournalOfPublication": "Veröffentlichungen",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "Autor:innen",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   "item.page.relationships.isOrgUnitOfProject": "Forschungsprojekte",
-  
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "Schlagwörter",
-  
+
   // "item.page.uri": "URI",
   "item.page.uri": "URI",
-  
+
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Mehr anzeigen",
-  
+
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Zuklappen",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Originalbündel",
-  
+  "item.page.filesection.original.bundle": "Originalbündel",
+
   // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.license.bundle" : "Lizenzbündel",
-  
+  "item.page.filesection.license.bundle": "Lizenzbündel",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identifikator:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "Autor:innen:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "Erscheinungsdatum:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "Zusammenfassung:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "Sonstiger Identifikator:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "Sprache:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   "item.preview.dc.subject": "Themen:",
-  
+
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Titel:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Nachname:",
-  
+
   // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "Vorname:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Auswahl bestätigen",
-  
+
   // "item.select.empty": "No items to show",
   "item.select.empty": "Es gibt keine Items, die angezeigt werden können.",
-  
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor:in",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "Sammlung",
-  
+
   // "item.select.table.title": "Title",
   "item.select.table.title": "Titel",
-  
-  
+
+
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Dieses Item hat noch keine anderen Versionen.",
-  
+
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Versionsgeschichte",
-  
+
   // "item.version.history.return": "Return",
   "item.version.history.return": "Zurück",
-  
+
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Ausgewählte Version",
-  
+
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "Herausgeber:in",
-  
+
   // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "Datum",
-  
+
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Zusammenfassung",
-  
-  
-  
+
+
+
   // "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": "Dies ist nicht die neueste Version dieses Items. Die neueste Version finden Sie unter <a href='{{destination}}'>hier</a>.",
-  
-  
-  
+
+
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Zeitschrift",
-  
+
   // "journal.page.description": "Description",
   "journal.page.description": "Beschreibung",
-  
+
   // "journal.page.edit": "Edit this item",
   "journal.page.edit": "Dieses Item bearbeiten",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Chefredakteur:in",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Verlag",
-  
+
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Zeitschrift: ",
-  
+
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Suchergebnisse für Zeitschriften",
-  
+
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Zeitschriftensuche",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Zeitschriftenheft",
-  
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Beschreibeung",
-  
+
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Dieses Item bearbeiten",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Erscheinungsdatum",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "ISSN der Zeitschrift",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   "journalissue.page.journal-title": "Titel der Zeitschrift",
-  
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "Schlagwörter",
-  
+
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Zählung",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Zeitschriftenheft:",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Zeitschriftenband",
-  
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Beschreibung",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "Dieses Item bearbeiten",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Erscheinungsdatum",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   "journalvolume.page.titleprefix": "Zeitschriftenband: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Band",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Lade Datei...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "Lade Datei...",
-  
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Lade Items...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Lade Seite...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "Lade Sammlung...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "Lade Sammlungen...",
-  
+
   // "loading.content-source": "Loading content source...",
   "loading.content-source": "Lade Bezugsquelle...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "Lade Bereich...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "Lade...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "Lade Item...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "Lade Items...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "Lade Items...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "Lade...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "Lade neueste Veröffentlichungen...",
-  
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "Lade Suchergebnisse...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "Lade Untersammlungen...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   "loading.sub-communities": "Lade Teilbereiche...",
-  
+
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Lade Hauptbereiche...",
-  
-  
-  
+
+
+
   // "login.form.email": "Email address",
   "login.form.email": "E-Mail-Adresse",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "Haben Sie Ihr Passwort vergessen?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Bitte melden Sie sich an.",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Neu hier? Klicken Sie hier, um sich zu registrieren.",
-  
+
   // "login.form.or-divider": "or",
   "login.form.or-divider": "oder",
-  
+
   // "login.form.password": "Password",
   "login.form.password": "Passwort",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "Anmeldung mit Shibboleth",
-  
+
   // "login.form.submit": "Log in",
   "login.form.submit": "Anmelden",
-  
+
   // "login.title": "Login",
   "login.title": "Anmelden",
-  
+
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Anmelden",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Abmelden",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Abmelden",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Abmelden",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   "menu.header.admin": "Administration",
-  
+
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Logo des Repositoriums",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Zugriffskontrolle",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Rechte",
-  
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Gruppen",
-  
+
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Personen",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Berichte",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Filtrierte Sammlungen",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Metadatenabfrage",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Admin-Suche",
-  
-  
-  
+
+
+
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Dieser Bereich",
-  
+
   // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "Nach Autor:in",
-  
+
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "Nach Erscheinungsdatum",
-  
+
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Nach Titel",
-  
+
   // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "Das gesamte Repositorium",
-  
+
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "Nach Autor:in",
-  
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "Nach Erscheinungsjahr",
-  
+
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Nach Schlagwort",
-  
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Nach Titel",
-  
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Bereiche & Sammlungen",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Kontrollfeld",
-  
+
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Datenpflegeroutinen",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Bearbeiten",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Sammlung",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "Bereich",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "menu.section.export": "Export",
   "menu.section.export": "Export",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "Sammlung",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "Bereich",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadaten",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Menübereich Zugriffskontrolle",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Menüabschnitt (Admin-Suche)",
-  
+
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Menübereich Kontrollfeld",
-  
+
   // "menu.section.icon.curation_task": "Curation Task menu section",
   "menu.section.icon.curation_task": "Menübereich Datepflegeroutinen",
-  
+
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Menübereich bearbeiten",
-  
+
   // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "Menübereich Export",
-  
+
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Menübereich Suche",
-  
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Menübereich Import",
-  
+
   // "menu.section.icon.new": "New menu section",
   "menu.section.icon.new": "Neuer Menübereich",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Seitenleiste Anheften",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   "menu.section.icon.processes": "Menübereich Prozesse",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Menübereich Referenzlisten",
-  
+
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "Menübereich Statistikaufgaben",
-  
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Seitenbereich loslösen",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Import (ZIP)",
-  
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadaten",
-  
-  
-  
+
+
+
   // "menu.section.new": "New",
   "menu.section.new": "Neu",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Sammlung",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "Bereich",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   "menu.section.new_item_version": "Item-Version",
-  
+
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Prozess",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Seitenleiste anheften",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Seitenleiste loslösen",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Prozesse",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Referenzlisten",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Format",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadaten",
-  
-  
-  
+
+
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Statistiken",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Statistikaufgaben",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Bereich Zugriffskontrolle umschalten",
-  
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Bereich Kontrollfeld umschalten",
-  
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "Bereich Datenpflegeroutinen umschalten",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Bereich Bearbeiten umschalten",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "Bereich Export umschalten",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "Bereich Suche umschalten",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "Bereich Import umschalten",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "Neuen Bereich umschalten",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Bereich Referenzlisten umschalten",
-  
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Bereich Statistikaufgaben umschalten",
-  
-  
+
+
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Geschäftsgänge verwalten",
-  
-  
+
+
   // "mydspace.description": "",
   "mydspace.description": "",
-  
+
   // "mydspace.general.text-here": "here",
   "mydspace.general.text-here": "hier",
-  
+
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Wählen Sie diese Option, um der Person eine Nachricht zu schicken, die das Item eingereicht hat.",
-  
+
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Geben Sie Ihre Nachricht hier ein...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "Nachricht ausblenden",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "Als gelesen markieren",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "Als ungelesen markieren",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Kein Inhalt.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Es sind noch keine Nachrichten vorhanden.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "Senden",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "Nachricht anzeigen",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "Betreff...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "Wählen Sie diese Option, um dem Supervisor eine Nachricht zu schicken.",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Nachrichten",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "An",
-  
+
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "Neue Veröffentlichung",
-  
+
   // "mydspace.new-submission-external": "Import metadata from external source",
   "mydspace.new-submission-external": "Importieren von Metadaten aus einer externen Quelle",
-  
+
   // "mydspace.new-submission-external-short": "Import metadata",
   "mydspace.new-submission-external-short": "Importieren von Metadaten",
-  
+
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "Ihre Veröffentlichungen",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Keine Zusammenfassung",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "Keine Autor:innen",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   "mydspace.results.no-collections": "Keine Sammlungen",
-  
+
   // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "Kein Datum",
-  
+
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Keine Dateien",
-  
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "Es gibt keine Items, die angezeigt werden können.",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Kein Titel",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Keine URI",
-  
+
   // "mydspace.show.workflow": "All tasks",
   "mydspace.show.workflow": "Alle Aufgaben",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Ihre Veröffentlichungen",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archiviert",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validierung",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Warten auf die Überprüfung",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Geschäftsgang",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Arbeitsbereich",
-  
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archiviert",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validierung",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Warten auf die Überprüfung",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Geschäftsgang",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Arbeitsbereich",
+
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mein DSpace",
-  
+
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Fehler beim Anlegen eines neuen Arbeitsbereiches. Bitte überprüfen Sie den Inhalt bevor Sie es nochmal versuchen.",
-  
+
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
   "mydspace.upload.upload-failed-manyentries": "Unverarbeitbare Datei. Es wurden zu viele Einträge erkannt, aber nur einer für die Datei zugelassen.",
-  
+
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
   "mydspace.upload.upload-failed-moreonefile": "Unverarbeitbare Anfrage. Nur eine Datei ist erlaubt.",
-  
+
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} neue(s) Arbeitsbereichsitem(s) angelegt.",
-  
+
   // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
   "mydspace.upload.upload-successful": "Das Workspace-Item wurde neu angelegt. Klicken Sie {{here}}, um es zu bearbeiten.",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Anzeige",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Das gesamte Repositorium",
-  
+
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Nach Bereich",
-  
+
   // "nav.language": "Language switch",
   "nav.language": "Sprachumschalter",
-  
+
   // "nav.login": "Log In",
   "nav.login": "Anmelden",
-  
+
   // "nav.logout": "Log Out",
   "nav.logout": "Abmelden",
-  
+
   // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "Mein DSpace",
-  
+
   // "nav.profile": "Profile",
   "nav.profile": "Profil",
-  
+
   // "nav.search": "Search",
   "nav.search": "Suche",
-  
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Statistiken",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Als Person ausloggen",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organisationseinheit",
-  
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Stadt",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "Land",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Ursprungsdatum",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "Beschreibung",
-  
+
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "Dieses Item bearbeiten",
-  
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Organisationseinheit: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Treffer pro Seite",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} von {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Gerade angezeigt ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Sortieroptionen",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Person",
-  
+
   // "person.listelement.no-title": "No name found",
   "person.listelement.no-title": "Kein Name gefunden",
-  
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Geburtsdatum",
-  
+
   // "person.page.edit": "Edit this item",
   "person.page.edit": "Dieses Item bearbeiten",
-  
+
   // "person.page.email": "Email Address",
   "person.page.email": "E-Mail-Adresse",
-  
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "Vorname",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "Berufsbeschreibung",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Nachname",
-  
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Alle Metadaten anzeigen",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "Personalnummer",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "Person: ",
-  
+
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Ergebnisse der Personensuche",
-  
+
   // "person.search.title": "Person Search",
   "person.search.title": "Personensuche",
-  
-  
-  
-  // "process.detail.output": "Process Output",
-  "process.detail.output": "Prozessausgabe (Log)",
 
-  // "process.detail.output-files.empty": "This process doesn't contain any output files",
-  "process.detail.output-files.empty": "Dieser Prozess enthält keine Ausgabedateien.",
+
 
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parameter",
-  
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Abbrechen",
-  
+
   // "process.new.submit": "Submit",
   "process.new.submit": "Eingabe",
-  
+
   // "process.new.select-script": "Script",
   "process.new.select-script": "Skript",
-  
+
   // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "Wählen Sie ein Skript...",
-  
+
   // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "Skript ist erforderlich",
-  
+
   // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "Datei auswählen",
-  
+
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Bitte wählen Sie eine Datei aus",
-  
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "Parameterwert ist erforderlich",
-  
+
   // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "Wert",
-  
+
   // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "Datei",
-  
+
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "Die folgenden Parameter sind erforderlich, fehlen aber noch:",
-  
+
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Erfolg",
-  
+
   // "process.new.notification.success.content": "The process was successfully created",
   "process.new.notification.success.content": "Der Prozess wurde erfolgreich erstellt",
-  
+
   // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "Fehler",
-  
+
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Beim Erstellen dieses Prozesses ist ein Fehler aufgetreten",
-  
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Einen neuen Prozess erstellen",
-  
+
   // "process.new.title": "Create a new process",
   "process.new.title": "Einen neuen Prozess erstellen",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Einen neuen Prozess erstellen",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "Parameter",
-  
+  "process.detail.arguments": "Parameter",
+
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Dieser Prozess beinhaltet keine Parameter",
-  
+  "process.detail.arguments.empty": "Dieser Prozess beinhaltet keine Parameter",
+
   // "process.detail.back" : "Back",
-  "process.detail.back" : "Zurück",
-  
+  "process.detail.back": "Zurück",
+
   // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Prozessausgabe",
-  
+  "process.detail.output": "Prozessausgabe",
+
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Log anzeigen",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "Abrufen",
-  
+
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Dieser Prozess gibt nichts aus.",
-  
+
   // "process.detail.output-files" : "Output Files",
-  "process.detail.output-files" : "Ausgabedateien",
-  
+  "process.detail.output-files": "Ausgabedateien",
+
   // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "Dieser Prozess enthält keine Ausgabedateien",
-  
+  "process.detail.output-files.empty": "Dieser Prozess enthält keine Ausgabedateien",
+
   // "process.detail.script" : "Script",
-  "process.detail.script" : "Skript",
-  
+  "process.detail.script": "Skript",
+
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Prozess: {{ id }} - {{ name }}",
-  
+  "process.detail.title": "Prozess: {{ id }} - {{ name }}",
+
   // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Startzeit",
-  
+  "process.detail.start-time": "Startzeit",
+
   // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Schlusszeit",
-  
+  "process.detail.end-time": "Schlusszeit",
+
   // "process.detail.status" : "Status",
-  "process.detail.status" : "Status",
-  
+  "process.detail.status": "Status",
+
   // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Erstelle ähnlichen Prozess",
-  
-  
-  
+  "process.detail.create": "Erstelle ähnlichen Prozess",
+
+
+
   // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish" : "Schlusszeit",
-  
+  "process.overview.table.finish": "Schlusszeit",
+
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "Prozess ID",
-  
+  "process.overview.table.id": "Prozess ID",
+
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name": "Name",
+
   // "process.overview.table.start" : "Start time",
-  "process.overview.table.start" : "Startzeit",
-  
+  "process.overview.table.start": "Startzeit",
+
   // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Status",
-  
+  "process.overview.table.status": "Status",
+
   // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Benutzer:in",
-  
+  "process.overview.table.user": "Benutzer:in",
+
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Überblick der Prozesse",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "Überblick der Prozesse",
-  
+
   // "process.overview.new": "New",
   "process.overview.new": "Neu",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profil aktualisieren",
-  
+
   // "profile.card.identify": "Identify",
   "profile.card.identify": "Identifizieren",
-  
+
   // "profile.card.security": "Security",
   "profile.card.security": "Sicherheit",
-  
+
   // "profile.form.submit": "Update Profile",
   "profile.form.submit": "Profil aktualisieren",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Berechtigungsgruppen, denen Sie angehören",
-  
+
   // "profile.head": "Update Profile",
   "profile.head": "Profil aktualisieren",
-  
+
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Vorname muss angegeben werden",
-  
+
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
   "profile.metadata.form.error.lastname.required": "Nachname muss angegeben werden",
-  
+
   // "profile.metadata.form.label.email": "Email Address",
   "profile.metadata.form.label.email": "E-Mail-Adresse",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "Vorname",
-  
+
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "Sprache",
-  
+
   // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "Nachname",
-  
+
   // "profile.metadata.form.label.phone": "Contact Telephone",
   "profile.metadata.form.label.phone": "Telefonnummer",
-  
+
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
   "profile.metadata.form.notifications.success.content": "Ihre Profiländerungen wurden gespeichert.",
-  
+
   // "profile.metadata.form.notifications.success.title": "Profile saved",
   "profile.metadata.form.notifications.success.title": "Profil gespeichert",
-  
+
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
   "profile.notifications.warning.no-changes.content": "Es wurden keine Änderungen am Profil vorgenommen.",
-  
+
   // "profile.notifications.warning.no-changes.title": "No changes",
   "profile.notifications.warning.no-changes.title": "Keine Änderungen",
-  
+
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "Die Passwörter stimmen nicht überein.",
-  
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "Das Passwort sollte mindestens 6 Zeichen lang sein.",
-  
-  // "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": "Optional können Sie ein neues Passwort in das Feld darunter eingeben und es durch erneute Eingabe in das zweite Feld bestätigen. Es sollte mindestens sechs Zeichen lang sein.",
-  
+
+  // "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": "Im nachfolgenden Feld können Sie bei Bedarf ein neues Passwort eingeben und es durch erneute Eingabe in das zweite Feld bestätigen.",
+
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Passwort",
-  
+
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  "profile.security.form.label.passwordrepeat": "Zum Bestätigen erneut eingeben",
-  
+  "profile.security.form.label.passwordrepeat": "Zum Bestätigen das Passwort erneut eingeben",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Ihr aktuelles Passwort",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Ihr geändertes Passwort wurde gespeichert.",
-  
+
   // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "Passwort gespeichert",
-  
+
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Fehler beim Ändern von Passwörtern",
-  
+
   // "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": "Das Passwort sollte mindestens 6 Zeichen lang sein.",
-  
+
+  // "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": "Es ist ein Fehler beim Ändern des Passworts aufgetreten. Bitte überprüfen Sie, ob Ihr aktuelles Passwort korrekt eingegeben wurde.",
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Die angegebenen Passwörter sind nicht identisch.",
-  
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Bitte füllen Sie alle Pflichtfelder im Formular aus.",
+
   // "profile.title": "Update Profile",
   "profile.title": "Profil aktualisieren",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Forschungsprojekt",
-  
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Beteiligte",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "Beschreibung",
-  
+
   // "project.page.edit": "Edit this item",
   "project.page.edit": "Dieses Item bearbeiten",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Erwartetes Abschlussdatum",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "Förderer",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "ID",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Schlagwörter",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "Status",
-  
+
   // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "Forschungsvorhaben: ",
-  
+
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Suchergebnisse für Projekte",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Veröffentlichung",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "Beschreibung",
-  
+
   // "publication.page.edit": "Edit this item",
   "publication.page.edit": "Dieses Item bearbeiten",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "ISSN der Zeitschrift",
-  
+
   // "publication.page.journal-title": "Journal Title",
   "publication.page.journal-title": "Zeitschriftentitel",
-  
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Verlag",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publikation: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Bandtitel",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Suchergebnisse Publikationen",
-  
+
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Publikationssuche",
-  
-  
+
+
   // "register-email.title": "New user registration",
   "register-email.title": "Neu registrieren",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "Profil erstellen",
-  
+
   // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "Identifizieren",
-  
+
   // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "E-Mail-Adresse",
-  
+
   // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "Vorname *",
-  
+
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
   "register-page.create-profile.identification.first-name.error": "Bitte geben Sie einen Vornamen ein",
-  
+
   // "register-page.create-profile.identification.last-name": "Last Name *",
   "register-page.create-profile.identification.last-name": "Nachname *",
-  
+
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
   "register-page.create-profile.identification.last-name.error": "Bitte geben Sie einen Nachnamen ein",
-  
+
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "Telefonnummer",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "Sprache",
-  
+
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Sicherheit",
-  
-  // "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": "Bitte geben Sie ein Passwort in das unten stehende Feld ein und bestätigen Sie es, indem Sie es in das zweite Feld erneut eingeben. Es sollte mindestens sechs Zeichen lang sein.",
-  
+
+  // "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": "Bitte geben Sie ein Passwort in das unten stehende Feld ein und bestätigen Sie es, indem Sie es in das zweite Feld erneut eingeben.",
+
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Passwort *",
-  
+
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
   "register-page.create-profile.security.label.passwordrepeat": "Zum Bestätigen erneut eingeben *",
-  
+
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
   "register-page.create-profile.security.error.empty-password": "Bitte geben Sie in das unten stehende Feld ein Passwort ein.",
-  
+
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "Die Passwörter stimmen nicht überein.",
-  
+
   // "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": "Das Passwort sollte mindestens 6 Zeichen lang sein.",
-  
+
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Vollständige Registrierung",
-  
+
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
   "register-page.create-profile.submit.error.content": "Bei der Registrierung eines neuen Accounts ist ein Fehler aufgetreten.",
-  
+
   // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "Registrierung fehlgeschlagen",
-  
+
   // "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": "Sie haben sich erfolgreich registriert und wurden angemeldet.",
-  
+
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Registrierung abgeschlossen",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Neues Konto anlegen",
-  
+
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
   "register-page.registration.info": "Registrieren Sie ein Konto, um Sammlungen für E-Mail-Updates zu abonnieren und neue Items in DSpace einzugeben.",
-  
+
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "E-Mail-Adresse *",
-  
+
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Bitte geben Sie eine E-Mail Adresse an",
-  
+
   // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
   "register-page.registration.email.error.pattern": "Bitte geben Sie eine gültige E-Mail Adresse an",
-  
+
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Diese Adresse wird überprüft und als Ihr Accountname verwendet..",
-  
+
   // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "Registrieren",
-  
+
   // "register-page.registration.success.head": "Verification email sent",
   "register-page.registration.success.head": "Bestätigungs-E-Mail gesendet",
-  
+
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "register-page.registration.success.content": "Es wurde eine E-Mail mit einer speziellen URL und weiteren Anweisungen an {{ email }} gesendet.",
-  
+
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Fehler beim Versuch, eine E-Mail zu registrieren",
-  
+
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Bei der Registrierung der folgenden E-Mail-Adresse ist ein Fehler aufgetreten: {{ email }}",
-  
-  
-  
+
+
+
   // "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": "Für den Beziehungstyp {{ type }} zwischen den beiden Items konnte keine passende Übereinstimmung gefunden werden",
-  
+
   // "relationships.add.error.server.content": "The server returned an error",
   "relationships.add.error.server.content": "Der Server hat einen Fehler zurückgegeben",
-  
+
   // "relationships.add.error.title": "Unable to add relationship",
   "relationships.add.error.title": "Beziehung kann nicht hinzugefügt werden",
-  
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Autor:innen",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   "relationships.isAuthorOf.Person": "Autor:innen (Personen)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "Autor:innen (Organisationseinheiten)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Zeitschriftenhefte",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Zeitschriftenheft",
-  
+
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Zeitschriften",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Organisationseinheiten",
-  
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "Autor:innen",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   "relationships.isProjectOf": "Forschungsvorhaben",
-  
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Publikationen",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "Artikel",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   "relationships.isSingleJournalOf": "Zeitschrift",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Zeitschriftenband",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Zeitschriftenbände",
-  
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Beteiligte",
 
@@ -4110,489 +4561,504 @@
 
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Hinzufügen",
-  
+
   // "resource-policies.add.for.": "Add a new policy",
   "resource-policies.add.for.": "Eine neue Richtlinie hinzufügen",
-  
+
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
   "resource-policies.add.for.bitstream": "Eine neue Datei-Richtlinie hinzufügen",
-  
+
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
   "resource-policies.add.for.bundle": "Eine neue Bündel-Richtlinie hinzufügen",
-  
+
   // "resource-policies.add.for.item": "Add a new Item policy",
   "resource-policies.add.for.item": "Eine neue Item-Richtlinie hinzufügen",
-  
+
   // "resource-policies.add.for.community": "Add a new Community policy",
   "resource-policies.add.for.community": "Eine neue Bereiche-Richtlinie hinzufügen",
-  
+
   // "resource-policies.add.for.collection": "Add a new Collection policy",
   "resource-policies.add.for.collection": "Eine neue Sammlungen-Richtlinie hinzufügen",
-  
+
   // "resource-policies.create.page.heading": "Create new resource policy for ",
   "resource-policies.create.page.heading": "Eine neue Ressourcen-Richtlinie erstellen für ",
-  
+
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
   "resource-policies.create.page.failure.content": "Bei der Erstellung der Ressourcen-Richtlinie ist ein Fehler aufgetreten.",
-  
+
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "Vorgang erfolgreich",
-  
+
   // "resource-policies.create.page.title": "Create new resource policy",
   "resource-policies.create.page.title": "Eine neue Ressourcen-Richtlinie erstellen",
-  
+
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Markierte löschen",
-  
+
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
   "resource-policies.delete.btn.title": "Ausgewählte Ressourcen-Richtlinien löschen",
-  
+
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
   "resource-policies.delete.failure.content": "Beim Löschen der ausgewählten Ressourcen-Richtlinien ist ein Fehler aufgetreten.",
-  
+
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "Vorgang erfolgreich",
-  
+
   // "resource-policies.edit.page.heading": "Edit resource policy ",
   "resource-policies.edit.page.heading": "Ressourcen-Richtlinie bearbeiten ",
-  
+
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Beim Bearbeiten der Ressourcen-Richtlinie ist ein Fehler aufgetreten.",
-  
+
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Vorgang erfolgreich",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   "resource-policies.edit.page.title": "Ressourcen-Richtlinie bearbeiten",
-  
+
   // "resource-policies.form.action-type.label": "Select the action type",
   "resource-policies.form.action-type.label": "Wählen Sie die Aktionsart",
-  
+
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
   "resource-policies.form.action-type.required": "Bitte wählen Sie eine Aktion für die Ressourcenrichtlinie aus.",
-  
+
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
   "resource-policies.form.eperson-group-list.label": "Die Person oder Gruppe, der die Genehmigung erteilt wird",
-  
+
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "Auswählen",
-  
+
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
   "resource-policies.form.eperson-group-list.tab.eperson": "Suche nach einer Person",
-  
+
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Suche nach einer Gruppe",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
   "resource-policies.form.eperson-group-list.table.headers.action": "Aktion",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-  
+
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "Enddatum",
-  
+
   // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "Startdatum",
-  
+
   // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "Beschreibung",
-  
+
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Name",
-  
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Wählen Sie den Richtlinientyp",
-  
+
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
   "resource-policies.form.policy-type.required": "Bitte wählen Sie einen Richtlinientyp für die Ressource aus.",
-  
+
   // "resource-policies.table.headers.action": "Action",
   "resource-policies.table.headers.action": "Aktion",
-  
+
   // "resource-policies.table.headers.date.end": "End Date",
   "resource-policies.table.headers.date.end": "Enddatum",
-  
+
   // "resource-policies.table.headers.date.start": "Start Date",
   "resource-policies.table.headers.date.start": "Startdatum",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "Bearbeiten",
-  
+
   // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "Gruppe bearbeiten",
-  
+
   // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "Richtlinie bearbeiten",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   "resource-policies.table.headers.eperson": "Person",
-  
+
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Gruppe",
-  
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
-  
+
   // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "Name",
-  
+
   // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "Typ",
-  
+
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
   "resource-policies.table.headers.title.for.bitstream": "Richtlinien für Dateien",
-  
+
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
   "resource-policies.table.headers.title.for.bundle": "Richtlinien für Bündel",
-  
+
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
   "resource-policies.table.headers.title.for.item": "Richtlinien für Items",
-  
+
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
   "resource-policies.table.headers.title.for.community": "Richtlinien für Bereiche",
-  
+
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Richtlinien für Sammlungen",
-  
-  
-  
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.filters.filter.birthDate.label": "Search birth date",
   "search.filters.filter.birthDate.label": "Geburtsdatum suchen",
 
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Zeige",
-  
+
   // "search.title": "Search",
   "search.title": "Suche",
-  
+
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Suche",
-  
+
   // "search.search-form.placeholder": "Search the repository ...",
   "search.search-form.placeholder": "Durchsuche Repositorium",
-  
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Autor:in",
-  
+
   // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "Enddatum",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Anfangsdatum",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Datum der Einreichung",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   "search.filters.applied.f.discoverable": "Verborgen",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "Item-Typ",
-  
+
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Dateien dazu vorhanden?",
-  
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Typ",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "Status",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Thema",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "Einreichende:r",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Berufsbezeichnung",
-  
+
   // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "Geburtsdatum (bis)",
-  
+
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Geburtsdatum (von)",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Zurückgezogen",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor:in",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Autor:innenname",
-  
+
   // "search.filters.filter.author.label": "Search author name",
   "search.filters.filter.author.label": "Autorensuche",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Geburtsdatum",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Geburtsdatum",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Erscheinungsdatum",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "Erscheinungsdatum",
-  
+
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Herausgeber:in",
-  
+
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Herausgeber:in",
-  
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Thema",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Thema",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Verlag",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Verlag",
-  
+
   // "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": "Ältestes Datum",
-  
+
   // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.min.placeholder": "Jüngstes Datum",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Datum der Einreichung",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Datum der Einreichung",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   "search.filters.filter.discoverable.head": "Verborgen",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "Zurückgezogen",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Item-Typ",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Item-Typ",
-  
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Enthält Dateien",
-  
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Typ",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Typ",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Berufsbezeichnung",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Berufsbezeichnung",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Bekannte Sprache",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Bekannte Sprache",
-  
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Status",
-  
+
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Status",
-  
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Personen",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Personen",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Land",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Land",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Stadt",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Stadt",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Gründungsdatum",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Gründungsdatum",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Bereich",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Bereichsfilter",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Zusammenklappen",
-  
+
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "Mehr anzeigen",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Thema",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Thema",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Einreichende:r",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Einreichende:r",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Zeitschriftenheft",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   "search.filters.entityType.JournalVolume": "Zeitschriftenband",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Organisationseinheit",
-  
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Ja",
-  
+
   // "search.filters.has_content_in_original_bundle.false": "No",
   "search.filters.has_content_in_original_bundle.false": "Nein",
-  
+
   // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "Nein",
-  
+
   // "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",
-  
+
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Nein",
-  
-  
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Filter",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Filter zurücksetzen",
-  
-  
-  
+
+
+
   // "search.form.search": "Search",
   "search.form.search": "Suche",
-  
+
   // "search.form.search_dspace": "Search DSpace",
   "search.form.search_dspace": "Suche in DSpace",
-  
+
   // "search.form.search_mydspace": "Search MyDSpace",
   "search.form.search_mydspace": "Suche im persönlichen Arbeitsbereich",
-  
+
   // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "Alles durchsuchen",
 
-   
+
   // "search.results.head": "Search Results",
   "search.results.head": "Suchergebnisse",
-  
+
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "Ihre Suche führte zu keinem Ergebnis. Versuchen Sie es mit ",
-  
+
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "Anführungszeichen",
-  
+
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "Ihre Suche führte zu keinem Ergebnis.",
-  
+
   // "search.results.view-result": "View",
   "search.results.view-result": "Anzeigen",
 
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "Suchergebnisse",
-  
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Zurück zu den Ergebnissen",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Filter",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Suchwerkzeuge",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "Ergebnisse",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Ergebnisse pro Seite",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Sortieren nach",
-  
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Einstellungen",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Detailanzeige",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "Als Raster anzeigen",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Als Liste anzeigen",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Aufsteigend",
-  
+
   // "sorting.DESC": "Descending",
   "sorting.DESC": "Absteigend",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Titel aufsteigend",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Titel absteigend",
-  
+
   // "sorting.score.ASC": "Least Relevant",
   "sorting.score.ASC": "Relevanz aufsteigend",
 
   // "sorting.score.DESC": "Most Relevant",
   "sorting.score.DESC": "Relevanz absteigend",
-    
+
   // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
   "sorting.dc.date.issued.ASC": "Erscheinungsdatum aufsteigend",
 
   // "sorting.dc.date.issued.DESC": "Date Issued Descending",
   "sorting.dc.date.issued.DESC": "Erscheinungsdatum absteigend",
-  
+
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
   "sorting.dc.date.accessioned.ASC": "Freischaltungsdatum aufsteigend",
 
@@ -4604,721 +5070,721 @@
 
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Änderungsdatum absteigend",
-  
+
   // "statistics.title": "Statistics",
   "statistics.title": "Statistiken",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "Statistiken für {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "Statistiken",
-  
+
   // "statistics.page.no-data": "No data available",
   "statistics.page.no-data": "Keine Daten verfügbar",
-  
+
   // "statistics.table.no-data": "No data available",
   "statistics.table.no-data": "Keine Daten verfügbar",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   "statistics.table.title.TotalVisits": "Aufrufe insgesamt",
-  
+
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "Aufrufe pro Monat",
-  
+
   // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "Datei-Aufrufe",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   "statistics.table.title.TopCountries": "Top-Länder-Aufrufe",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   "statistics.table.title.TopCities": "Top-Städte-Aufrufe",
-  
+
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Aufrufe",
-  
-  
+
+
   // "submission.edit.breadcrumbs": "Edit Submission",
   "submission.edit.breadcrumbs": "Einreichung bearbeiten",
-  
+
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Einreichung bearbeiten",
-  
+
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "Sie verfügen nicht über die Rechte, eine neue Einreichung zu machen.",
-  
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Einreichen",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Abbrechen",
-  
+
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Diese Aktion kann nicht rückgängig gemacht werden. Sind Sie sicher?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Ja, ich bin sicher",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   "submission.general.discard.confirm.title": "Einreichung verwerfen",
-  
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Verwerfen",
-  
+
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Gespeichert",
 
   // "submission.general.info.pending-changes": "Unsaved changes",
   "submission.general.info.pending-changes": "Ungespeicherte Änderungen",
-  
+
   // "submission.general.save": "Save",
   "submission.general.save": "Speichern",
-  
+
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Für später speichern",
-  
-  
+
+
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importieren von Metadaten aus einer externen Quelle",
-  
+
   // "submission.import-external.title": "Import metadata from an external source",
   "submission.import-external.title": "Importieren von Metadaten aus einer externen Quelle",
-  
+
   // "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": "Geben Sie oben eine Abfrage ein, um Items aus dem Internet zu finden, die in DSpace importiert werden sollen.",
-  
+
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "Zurück zu MyDSpace",
-  
+
   // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "Suche in der externen Quelle",
-  
+
   // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "Suche",
-  
+
   // "submission.import-external.search.button.hint": "Write some words to search",
   "submission.import-external.search.button.hint": "Schreiben Sie einige Wörter zum Suchen",
-  
+
   // "submission.import-external.search.source.hint": "Pick an external source",
   "submission.import-external.search.source.hint": "Wählen Sie eine externe Quelle",
-  
+
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Laden ...",
-  
+
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "SHERPA Zeitschriften",
-  
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "SHERPA Verlage",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
-  
+
   // "submission.import-external.source.pubmed": "Pubmed",
   "submission.import-external.source.pubmed": "Pubmed",
-  
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Library of Congress Names",
-  
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Item-Vorschau",
-  
+
   // "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": "Die folgenden Metadaten wurden aus einer externen Quelle importiert. Sie werden vorausgefüllt, wenn Sie die Eingabe starten.",
-  
+
   // "submission.import-external.preview.button.import": "Start submission",
   "submission.import-external.preview.button.import": "Start Eingabe",
-  
+
   // "submission.import-external.preview.error.import.title": "Submission error",
   "submission.import-external.preview.error.import.title": "Eingabefehler",
-  
+
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Während des Importvorgangs für Einträge aus externen Quellen ist ein Fehler aufgetreten.",
-  
+
   // "submission.sections.describe.relationship-lookup.close": "Close",
   "submission.sections.describe.relationship-lookup.close": "Schließen",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
   "submission.sections.describe.relationship-lookup.external-source.added": "Der lokale Eintrage wurde erfolgreich zur Auswahl hinzugefügt.",
-  
+
   // "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": "Importiere Autor:innen-Metadaten",
-  
+
   // "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": "Zeitschrift importieren",
-  
+
   // "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": "Zeitschriftenheft importieren",
-  
+
   // "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-modal.isAuthorOfPublication.title": "Import Remote Author",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importiere Autor:innen-Metadaten",
-  
+
   // "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": "Lokal:e Autor:in wurde der Auswahl hinzugefügt",
-  
+
   // "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": "Externe:r Autor:in wurde importiert und zur Auswahl hinzugefügt",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Referenz",
-  
+
   // "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": " Als neuen lokalen Referenzwert importieren",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Abbrechen",
-  
+
   // "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": "Wählen Sie eine Sammlung, um neue Einträge dorthin zu importieren.",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entitäten",
-  
+
   // "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": "Als neue lokale Entität importieren",
-  
+
   // "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": "Von LC Name importieren",
-  
+
   // "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": "Von ORCID importieren",
-  
+
   // "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": "Von Sherpa Zeitschriften importieren",
-  
+
   // "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": "Von Sherpa Verlag importieren",
-  
+
   // "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": "Importieren aus 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": "Importieren aus arXiv",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "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",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Zeitschrift aus externer Quelle importieren",
-  
+
   // "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": "Lokale Zeitschrift wurde erfolgreich zur Auswahl hinzugefügt",
-  
+
   // "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": "Externe Zeitschrift wurde erfolgreich importiert und der Auswahl hinzugefügt",
-  
+
   // "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": "Externe Zeitschriftenausgabe importieren",
-  
+
   // "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": "Lokale Zeitschriftenausgabe wurde erfolgreich zur Auswahl hinzugefügt",
-  
+
   // "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": "Externe Zeitschriftenausgabe wurde erfolgreich importiert und zur Auswahl hinzugefügt",
-  
+
   // "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": "Externen Zeitschriftenband importieren",
-  
+
   // "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": "Der lokale Zeitschriftenband wurde erfolgreich zur Auswahl hinzugefügt",
-  
+
   // "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": "Externer Zeitschriftenband wurde erfolgreich importiert und zur Auswahl hinzugefügt",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Wählen Sie einen lokalen Treffer aus:",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Nichts auswählen",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Seite abwählen",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
   "submission.sections.describe.relationship-lookup.search-tab.loading": "Laden...",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Suchanfrage",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "Los",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Alles auswählen",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "Seite auswählen",
-  
+
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "{{ size }} Items ausgewählt",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Lokale Autor:innen ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Lokale Zeitschriften ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Lokale Projekte ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Lokale Publicationen ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Lokale Autor:innen ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Lokale Organisationseinheiten ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Lokale Datenpakete ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Lokale Dateien ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Lokale Zeitschriften ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Lokale Zeitschriftenhefte ({{ 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": "Lokale Zeitschriftenhefte ({{ 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": "Lokale Zeitschriftenbände ({{ 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": "Lokale Zeitschriftenbände ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Zeitschriften ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Verlage ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Namen ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ 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.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.isFundingAgencyOfPublication": "Suche nach Fördereinrichtungen",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Suche nach Förderungen",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Suche nach Organisationseinheiten",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Aktuelle Auswahl ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Zeitschriftenhefte",
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Zeitschriftenhefte",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Zeitschriftenbände",
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Zeitschriftenbände",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Zeitschriften",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autor:innen",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Fördereinrichtung",
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projekte",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
   "submission.sections.describe.relationship-lookup.title.Publication": "Publikationen",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
   "submission.sections.describe.relationship-lookup.title.Person": "Autor:innen",
-  
+
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
   "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organisationseinheiten",
-  
+
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Datenpakete",
-  
+
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
   "submission.sections.describe.relationship-lookup.title.DataFile": "Dateien",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Fördereinrichtung",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Förderung",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Übergeordnete Organisationeinheit",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Liste umschalten",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Einstellungen",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
   "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Ihre Auswahl ist momentan leer.",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Ausgewählte Autor:innen",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Ausgewählte Zeitschriften",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Ausgewählte Zeitschriftenbände",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Ausgewählte Projekte",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Ausgewählte Publikationen",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Ausgewählte Autor:innen",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
   "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Ausgewählte Organisationseinheiten",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Ausgewählte Datenpakete",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Ausgewählte Dateien",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Ausgewählte Zeitschriften",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Ausgewählte Ausgaben",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Ausgewählte Zeitschriftenbände",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Ausgewählte Fördereinrichtung",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Ausgewählte Förderung",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Ausgewählte Ausgabe",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Ausgewählte Organisationseinheit",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Suchergebnisse",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Suchergebnisse",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Suchergebnisse",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Suchergebnisse",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Suchergebnisse",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Suchergebnisse",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Suchergebnisse",
-  
-  // "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": "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": "Möchten Sie die Namensvariante \"{{ value }}\" speichern, damit sie bei zukünftigen Veröffentlichungen erneut verwendet werden kann? Sie können die Variante bei dieser Veröffentlichung auch verwenden, ohne sie zu speichern.",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Als Namensvariante speichern",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Nur für diese Einreichung verwenden",
-  
+
   // "submission.sections.ccLicense.type": "License Type",
   "submission.sections.ccLicense.type": "Lizenztyp",
-  
+
   // "submission.sections.ccLicense.select": "Select a license type…",
   "submission.sections.ccLicense.select": "Wählen Sie einen Lizenztyp…",
-  
+
   // "submission.sections.ccLicense.change": "Change your license type…",
   "submission.sections.ccLicense.change": "Wechseln Sie Ihren Lizenztyp…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   "submission.sections.ccLicense.none": "Keine Lizenzen verfügbar",
-  
+
   // "submission.sections.ccLicense.option.select": "Select an option…",
   "submission.sections.ccLicense.option.select": "Wählen Sie eine Option…",
-  
+
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
   "submission.sections.ccLicense.link": "Sie haben folgende Lizenz gewählt:",
-  
+
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "Ich räume die oben genannte Lizenz ein.",
-  
+
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Mehr Hinzufügen",
-  
+
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Sammlung",
-  
+
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
   "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.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_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Einreichung erfolgreich verworfen.",
-  
+
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
   "submission.sections.general.metadata-extracted": "Neue Metadaten wurden extrahiert und dem Bereich <strong>{{sectionId}}</strong> zugeordnet.",
-  
+
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
   "submission.sections.general.metadata-extracted-new-section": "Neuer Bereich <strong>{{sectionId}}</strong> wurde zur Einreichung hinzugefügt.",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Keine Sammlung gefunden",
-  
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Es stehen keine Optionen zur Verfügung",
-  
+
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
   "submission.sections.general.save_error_notice": "Beim Speichern des Items ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.",
-  
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "Einreichung erfolgreich gespeichert.",
-  
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "Suche nach einer Sammlung",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Es gibt unvollständige Abschnitte.",
-  
-  
-  
+
+
+
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
+
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Wiederverwerten",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Beschreiben",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Beschreiben",
-  
+
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Beschreiben",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Doppelter Eintrag?",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Einreichlizenz",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Hochgeladene Dateien",
-  
-  
-  
+
+
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Abbrechen",
-  
+
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.sections.upload.delete.confirm.info": "Diese Aktion kann nicht rückgängig gemacht werden. Sind Sie sicher?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Ja, ich bin sicher",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "Datei löschen",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Löschen",
-  
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Dateien herüberziehen, um sie dem Item hinzuzufügen",
-  
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Zugriffsbedingung Typ",
-  
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Datum erforderlich.",
-  
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Zugriff gewährt ab",
-  
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Ab",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Gruppe",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "Bitte geben Sie eine Gruppe an.",
-  
+
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Zugriff gewährt bis",
-  
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Bis",
-  
+
   // "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": "In diese Sammlung {{collectionName}} hochgeladene Dateien werden für folgende(n) Gruppe(n) zugänglich sein:",
-  
+
   // "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": "Bitte beachten Sie, dass in diese Sammlung {{collectionName}} hochgeladene Dateien zugüglich zu dem, was für einzelne Dateien entschieden wurde, für folgende Gruppe(n) zugänglich sein:",
-  
-  // "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": "Hier finden Sie alle Dateien, die aktuell zum Item gehören. Sie können ihre Metadaten und Zugriffsrechte bearbeiten oder <strong>weitere Dateien per Drag & Drop hinzufügen.</strong>",
-  
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Kein Eintrag",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "Es wurde noch keine Datei hochgeladen.",
-  
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "Metadaten speichern",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Abbrechen",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "Hochladen fehlgeschlagen",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Hochladen erfolgreich",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   "submission.submit.title": "Einreichung",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Löschen",
-  
+
   // "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": "Wenn Sie dieses Item verwerfen möchten, wählen Sie bitte \"Löschen\". Sie werden danach um Bestätigung gebeten.",
-  
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Bearbeiten",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
   "submission.workflow.generic.edit-help": "Wählen Sie diese Option, um die Metadaten des Items zu bearbeiten.",
-  
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "Anzeige",
-  
+
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Wählen Sie diese Option, um die Metadaten des Items anzuzeigen.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Zustimmen",
-  
+
   // "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": "Wenn Sie dieses Item begutachtet haben und die Aufnahme in die Sammlung befürworten, wählen Sie bitte \"Zustimmen\".",
-  
+
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Bearbeiten",
-  
+
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Wählen Sie diese Option, um die Metadaten des Items zu bearbeiten.",
-  
+
   // "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": "Bitte geben Sie unten den Grund für Ihre Ablehnung und Änderungswünsche für eine erneute Einreichung an.",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Beschreiben Sie den Grund für die Ablehnung",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
   "submission.workflow.tasks.claimed.reject.reason.submit": "Item ablehnen",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "Grund",
-  
+
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
   "submission.workflow.tasks.claimed.reject.submit": "Ablehnen",
-  
+
   // "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": "Wenn Sie dieses Item begutachtet und für <strong>ungeeignet</strong> zur Aufnahme in die Sammlung befunden haben, wählen Sie bitte \"Ablehnen\". Sie können anschließend der:dem Einreichenden den Grund für die Ablehnung und mögliche Änderungswünsche für eine erneute Einreichung mitteilen.",
-  
+
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Zurück in den gemeinsamen Aufgabenbereich",
-  
+
   // "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": "Aufgabe in den Aufgabenpool zurückgeben, so dass jemand Anderes die Aufgabe übernehmen kann",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Ein Fehler ist aufgetreten...",
-  
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "Verarbeitung läuft...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   "submission.workflow.tasks.generic.submitter": "Einreichende:r",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Aktion erfolgreich",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Übernehmen",
-  
+
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Aufgabe übernehmen",
-  
+
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
   "submission.workflow.tasks.pool.hide-detail": "Details verbergen",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Details anzeigen",
-  
+
   // "submission.workspace.generic.view": "View",
   "submission.workspace.generic.view": "Anzeige",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workspace.generic.view-help": "Wählen Sie diese Option, um die Metadaten des Items anzuzeigen.",
-  
-  
-  
+
+
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vorschaubild",
 
@@ -5342,62 +5808,62 @@
 
   // "thumbnail.person.placeholder": "No Profile Picture Available",
   "thumbnail.person.placeholder": "Profilbild nicht verfügbar",
-  
-  
+
+
   // "title": "DSpace",
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Hierarchische Baumansicht",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "Mehr laden",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "Zurücksetzen",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Suche",
-  
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "Keine passenden Items vorhanden",
-  
+
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
   "vocabulary-treeview.tree.description.nsi": "Norwegischer Wissenschaftsindex (Norwegian Science Index)",
-  
+
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Forschungsthemen-Kategorien",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   "uploader.browse": "stöbern",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Bitte ziehen Sie Ihre Dateien hierhin.",
-  
+
   // "uploader.or": ", or ",
   "uploader.or": ", oder",
-  
+
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
   "uploader.processing": "In Arbeit...",
-  
+
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Länge der Warteschlange",
-  
+
   // "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": "Wählen Sie die Typen für die Sie die virtuellen Metadaten als reelle Metadaten speichern wollen",
-  
+
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
   "virtual-metadata.delete-item.modal-head": "Virtuelle Metadaten dieser Relation",
-  
+
   // "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": "Wählen Sie die Items aus, deren virtuelle Metadaten Sie als echte Metadaten speichern möchten.",
-  
-  
+
+
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Ihre Veröffentlichungen",
 
@@ -5406,55 +5872,55 @@
 
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Workflow-Aufgaben",
-  
-  
+
+
   // "workflow-item.delete.notification.success.title": "Deleted",
   "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.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Das hat leider nicht funktioniert.",
-  
+
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
   "workflow-item.delete.notification.error.content": "Das Workflow-Item konnte nicht gelöscht werden.",
-  
+
   // "workflow-item.delete.title": "Delete workflow item",
   "workflow-item.delete.title": "Workflow-Item löschen",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   "workflow-item.delete.header": "Workflow-Item löschen",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "Abbrechen",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Löschen",
-  
-  
+
+
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "An die:den Einreichende:n zurückgeschickt",
-  
+
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
   "workflow-item.send-back.notification.success.content": "Dieses Workflow-Item wurde an die:den Einreichende:n zurückgeschickt.",
-  
+
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Das hat leider nicht funktioniert.",
-  
+
   // "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": "Das Workflow-Item konnte nicht an die:den Einreichende:n zurückgeschickt werden.",
-  
+
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
   "workflow-item.send-back.title": "Workflow-Item an die:den Einreichende:n zurücksenden",
-  
+
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
   "workflow-item.send-back.header": "Workflow-Item an die:den Einreichende:n zurücksenden",
-  
+
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Abbrechen",
-  
+
   // "workflow-item.send-back.button.confirm": "Send back"
-  "workflow-item.send-back.button.confirm": "Zurücksenden"
-  
+  "workflow-item.send-back.button.confirm": "Zurücksenden",
+
 }
diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5
index d99856272f..018181c43f 100644
--- a/src/assets/i18n/el.json5
+++ b/src/assets/i18n/el.json5
@@ -1,2244 +1,2675 @@
 {
-	"401.help": "Δεν έχετε εξουσιοδότηση πρόσβασης σε αυτήν τη σελίδα. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
-	"401.link.home-page": "Μετάβαση στην αρχική σελίδα",
-	"401.unauthorized": "Χωρίς εξουσιοδότηση",
-	"403.forbidden": "Απαγορευμένη πρόσβαση",
-	"403.help": "Δεν έχετε άδεια πρόσβασης σε αυτήν τη σελίδα. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
-	"403.link.home-page": "Μετάβαση στην αρχική σελίδα",
-	"404.help": "Δεν μπορούμε να βρούμε τη σελίδα που ψάχνετε. Η σελίδα μπορεί να έχει μετακινηθεί ή διαγραφεί. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
-	"404.link.home-page": "Μετάβαση στην αρχική σελίδα",
-	"404.page-not-found": "Η σελίδα δεν βρέθηκε",
-	"500.help": "Ο διακομιστής δεν μπορεί προσωρινά να εξυπηρετήσει το αίτημά σας λόγω εργασιών συντήρησης ή προβλημάτων χωρητικότητας. Παρακαλώ προσπαθήστε ξανά αργότερα.",
-	"500.link.home-page": "Μετάβαση στην αρχική σελίδα",
-	"500.page-internal-server-error": "Μη διαθέσιμη υπηρεσία",
-	"access-status.embargo.listelement.badge": "Embargo",
-	"access-status.metadata.only.listelement.badge": "Μόνο μεταδεδομένα",
-	"access-status.open.access.listelement.badge": "Ανοιχτή πρόσβαση",
-	"access-status.restricted.listelement.badge": "Περιορισμένος",
-	"access-status.unknown.listelement.badge": "Αγνωστος",
-	"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": "Διακοπή προσομοίωσης χρήστη",
-	"admin.access-control.epeople.breadcrumbs": "Χρήστες",
-	"admin.access-control.epeople.button.add": "Προσθήκη Eperson",
-	"admin.access-control.epeople.button.see-all": "Περιήγηση σε όλα",
-	"admin.access-control.epeople.form.canLogIn": "Δυνατότητα σύνδεσης",
-	"admin.access-control.epeople.form.create": "Δημιουργία EPerson",
-	"admin.access-control.epeople.form.edit": "Επεξεργασία EPerson",
-	"admin.access-control.epeople.form.email": "Ηλεκτρονική Διεύθυνση",
-	"admin.access-control.epeople.form.emailHint": "Πρέπει να είναι έγκυρη διεύθυνση e-mail",
-	"admin.access-control.epeople.form.firstName": "Ονομα",
-	"admin.access-control.epeople.form.goToGroups": "Προσθήκη σε ομάδες",
-	"admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Μέλος αυτών των ομάδων:",
-	"admin.access-control.epeople.form.lastName": "Επίθετο",
-	"admin.access-control.epeople.form.memberOfNoGroups": "Αυτό το EPerson δεν είναι μέλος καμίας ομάδας",
-	"admin.access-control.epeople.form.notification.created.failure": "Αποτυχία δημιουργίας EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.created.failure.emailInUse": "Αποτυχία δημιουργίας Eperson \"{{name}}\", email \"{{email}}\" που χρησιμοποιείται ήδη.",
-	"admin.access-control.epeople.form.notification.created.success": "Δημιουργήθηκε με επιτυχία το Eperson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.deleted.failure": "Απέτυχε η διαγραφή του EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.deleted.success": "Διαγράφηκε επιτυχώς το Eperson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.edited.failure": "Απέτυχε η επεξεργασία του EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Απέτυχε η επεξεργασία του EPerson \"{{name}}\", email \"{{email}}\" που χρησιμοποιείται ήδη.",
-	"admin.access-control.epeople.form.notification.edited.success": "Έγινε επιτυχής επεξεργασία του EPerson \"{{name}}\"",
-	"admin.access-control.epeople.form.requireCertificate": "Απαιτεί πιστοποιητικό",
-	"admin.access-control.epeople.form.return": "Επιστροφή",
-	"admin.access-control.epeople.form.table.collectionOrCommunity": "Συλλογή/Κοινότητα",
-	"admin.access-control.epeople.form.table.id": "ID",
-	"admin.access-control.epeople.form.table.name": "Ονομα",
-	"admin.access-control.epeople.head": "Χρήστες",
-	"admin.access-control.epeople.no-items": "Δεν υπάρχουν χρήστες για εμφάνιση.",
-	"admin.access-control.epeople.notification.deleted.failure": "Απέτυχε η διαγραφή του EPerson: \"{{name}}\"",
-	"admin.access-control.epeople.notification.deleted.success": "Διαγράφηκε επιτυχώς το EPerson: \"{{name}}\"",
-	"admin.access-control.epeople.search.button": "Αναζήτηση",
-	"admin.access-control.epeople.search.head": "Αναζήτηση",
-	"admin.access-control.epeople.search.placeholder": "Αναζήτηση χρηστών...",
-	"admin.access-control.epeople.search.scope.email": "E-mail (ακριβώς)",
-	"admin.access-control.epeople.search.scope.metadata": "Μεταδεδομένα",
-	"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.table.email": "E-mail (ακριβώς)",
-	"admin.access-control.epeople.table.id": "ID",
-	"admin.access-control.epeople.table.name": "Ονομα",
-	"admin.access-control.epeople.title": "χρήστες",
-	"admin.access-control.groups.addGroup.breadcrumbs": "Νέα ομάδα",
-	"admin.access-control.groups.breadcrumbs": "Ομάδες",
-	"admin.access-control.groups.button.add": "Προσθήκη ομάδας",
-	"admin.access-control.groups.button.see-all": "Περιήγηση σε όλα",
-	"admin.access-control.groups.form.actions.delete": "Διαγραφή ομάδας",
-	"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.delete-group.modal.cancel": "Ακύρωση",
-	"admin.access-control.groups.form.delete-group.modal.confirm": "Διαγραφή",
-	"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.groupCommunity": "Κοινότητα ή Συλλογή",
-	"admin.access-control.groups.form.groupDescription": "Περιγραφή",
-	"admin.access-control.groups.form.groupName": "Ονομα ομάδας",
-	"admin.access-control.groups.form.head.create": "Δημιουργία ομάδας",
-	"admin.access-control.groups.form.head.edit": "Επεξεργασία ομάδας",
-	"admin.access-control.groups.form.members-list.button.see-all": "Περιήγηση σε όλα",
-	"admin.access-control.groups.form.members-list.head": "Χρήστες",
-	"admin.access-control.groups.form.members-list.headMembers": "Τρέχοντα Μέλη",
-	"admin.access-control.groups.form.members-list.no-items": "Δεν βρέθηκαν χρήτες σε αυτήν την αναζήτηση",
-	"admin.access-control.groups.form.members-list.no-members-yet": "Δεν υπάρχουν ακόμη μέλη στην ομάδα, αναζητήστε και προσθέστε.",
-	"admin.access-control.groups.form.members-list.notification.failure.addMember": "Αποτυχία προσθήκης μέλους: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Αποτυχία διαγραφής μέλους: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Δεν υπάρχει τρέχουσα ενεργή ομάδα, υποβάλετε πρώτα ένα όνομα.",
-	"admin.access-control.groups.form.members-list.notification.success.addMember": "Προστέθηκε με επιτυχία μέλος: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.notification.success.deleteMember": "Το μέλος διαγράφηκε επιτυχώς: \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.search.button": "Αναζήτηση",
-	"admin.access-control.groups.form.members-list.search.head": "Προσθήκη EPeople",
-	"admin.access-control.groups.form.members-list.search.scope.email": "E-mail (ακριβώς)",
-	"admin.access-control.groups.form.members-list.search.scope.metadata": "Μεταδεδομένα",
-	"admin.access-control.groups.form.members-list.table.edit": "Αφαίρεση / Προσθήκη",
-	"admin.access-control.groups.form.members-list.table.edit.buttons.add": "Προσθήκη μέλους με όνομα \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Κατάργηση μέλους με όνομα \"{{name}}\"",
-	"admin.access-control.groups.form.members-list.table.email": "Ηλεκτρονική διεύθυνση",
-	"admin.access-control.groups.form.members-list.table.id": "ID",
-	"admin.access-control.groups.form.members-list.table.identity": "ID",
-	"admin.access-control.groups.form.members-list.table.name": "Ονομα",
-	"admin.access-control.groups.form.members-list.table.netid": "NetID",
-	"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.created.success": "Η ομάδα \"{{name}}\" δημιουργήθηκε με επιτυχία",
-	"admin.access-control.groups.form.notification.deleted.failure.content": "Αιτία: \"{{ cause }}\"",
-	"admin.access-control.groups.form.notification.deleted.failure.title": "Απέτυχε η διαγραφή της ομάδας \"{{ name }}\"",
-	"admin.access-control.groups.form.notification.deleted.success": "Η ομάδα \"{{ 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.return": "Επιστροφή",
-	"admin.access-control.groups.form.subgroups-list.button.see-all": "Περιήγηση σε όλα",
-	"admin.access-control.groups.form.subgroups-list.head": "Ομάδες",
-	"admin.access-control.groups.form.subgroups-list.headSubgroups": "Τρέχουσες υποομάδες",
-	"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.subgroups-list.notification.failure": "Κάτι πήγε στραβά: \"{{cause}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Αποτυχία προσθήκης υποομάδας: \"{{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.notification.success.addSubgroup": "Η υποομάδα προστέθηκε με επιτυχία: \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Η υποομάδα διαγράφηκε επιτυχώς: \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.search.button": "Αναζήτηση",
-	"admin.access-control.groups.form.subgroups-list.search.head": "Προσθήκη υποομάδας",
-	"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.add": "Προσθήκη υποομάδας με όνομα \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Κατάργηση υποομάδας με όνομα \"{{name}}\"",
-	"admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Τρέχουσα ομάδα",
-	"admin.access-control.groups.form.subgroups-list.table.id": "ID",
-	"admin.access-control.groups.form.subgroups-list.table.name": "Ονομα",
-	"admin.access-control.groups.head": "Ομάδες",
-	"admin.access-control.groups.no-items": "Δεν βρέθηκαν ομάδες με αυτό στο όνομά τους ή αυτό ως UUID",
-	"admin.access-control.groups.notification.deleted.failure.content": "Αιτία: \"{{cause}}\"",
-	"admin.access-control.groups.notification.deleted.failure.title": "Απέτυχε η διαγραφή της ομάδας \"{{name}}\"",
-	"admin.access-control.groups.notification.deleted.success": "Η ομάδα \"{{name}}\" διαγράφηκε επιτυχώς",
-	"admin.access-control.groups.search.button": "Αναζήτηση",
-	"admin.access-control.groups.search.head": "Αναζήτηση ομάδων",
-	"admin.access-control.groups.search.placeholder": "Αναζήτηση ομάδων...",
-	"admin.access-control.groups.singleGroup.breadcrumbs": "Επεξεργασία ομάδας",
-	"admin.access-control.groups.table.collectionOrCommunity": "Συλλογή/Κοινότητα",
-	"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.table.id": "ID",
-	"admin.access-control.groups.table.members": "Μέλη",
-	"admin.access-control.groups.table.name": "Ονομα",
-	"admin.access-control.groups.title": "Ομάδες",
-	"admin.access-control.groups.title.addGroup": "Νέα ομάδα",
-	"admin.access-control.groups.title.singleGroup": "Επεξεργασία ομάδας",
-	"admin.curation-tasks.breadcrumbs": "Εργασίες επιμέλειας συστήματος",
-	"admin.curation-tasks.header": "Εργασίες επιμέλειας συστήματος",
-	"admin.curation-tasks.title": "Εργασίες επιμέλειας συστήματος",
-	"admin.metadata-import.breadcrumbs": "Εισαγωγή μεταδεδομένων",
-	"admin.metadata-import.page.button.proceed": "Συνέχεια",
-	"admin.metadata-import.page.button.return": "Επιστροφή",
-	"admin.metadata-import.page.dropMsg": "Αποθέστε ένα CSV μεταδεδομένων για εισαγωγή",
-	"admin.metadata-import.page.dropMsgReplace": "Αποθέστε για να αντικαταστήσετε το CSV μεταδεδομένων για εισαγωγή",
-	"admin.metadata-import.page.error.addFile": "Επιλέξτε πρώτα το αρχείο!",
-	"admin.metadata-import.page.header": "Εισαγωγή μεταδεδομένων",
-	"admin.metadata-import.page.help": "Μπορείτε να αποθέσετε ή να περιηγηθείτε σε αρχεία CSV που περιέχουν λειτουργίες μαζικών μεταδεδομένων σε αρχεία εδώ",
-	"admin.metadata-import.page.validateOnly": "Μόνο επικύρωση",
-	"admin.metadata-import.title": "Εισαγωγή μεταδεδομένων",
-	"admin.registries.bitstream-formats.breadcrumbs": "Μορφοποίηση μητρώου",
-	"admin.registries.bitstream-formats.create.breadcrumbs": "Μορφότυπο bitstream",
-	"admin.registries.bitstream-formats.create.failure.content": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία του νέου μορφοτύπου bitstream.",
-	"admin.registries.bitstream-formats.create.failure.head": "Αποτυχία",
-	"admin.registries.bitstream-formats.create.head": "Δημιουργήστε μορφότυπο Bitstream",
-	"admin.registries.bitstream-formats.create.new": "Προσθέστε μορφότυπο bitstream",
-	"admin.registries.bitstream-formats.create.success.content": "Το νέο μορφότυπο bitstream δημιουργήθηκε με επιτυχία.",
-	"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": "Αυτή η λίστα μορφοτύπων bitstream παρέχει πληροφορίες σχετικά με γνωστά μορφότυπα και το επίπεδο υποστήριξής τους.",
-	"admin.registries.bitstream-formats.edit.breadcrumbs": "Μορφότυπο bitstream",
-	"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": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία του μορφότυπου bitstream.",
-	"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": "Το μορφότυπο bitstream επεξεργάστηκε με επιτυχία.",
-	"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": "Δεν υπάρχουν μορφότυπα bitstream για εμφάνιση.",
-	"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": "mimetype",
-	"admin.registries.bitstream-formats.table.name": "Ονομα",
-	"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": "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": "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.scopenote": "Πεδίο εφαρμογής",
-	"admin.registries.schema.form.create": "Δημιουργία πεδίου μεταδεδομένων",
-	"admin.registries.schema.form.edit": "Επεξεργασία πεδίου μεταδεδομένων",
-	"admin.registries.schema.form.element": "Element",
-	"admin.registries.schema.form.qualifier": "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.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": "Αναζήτηση",
-	"admin.workflow.breadcrumbs": "Διαχείριση ροής εργασιών",
-	"admin.workflow.item.delete": "Διαγραφή",
-	"admin.workflow.item.send-back": "Επιστροφή",
-	"admin.workflow.item.workflow": "Ροή εργασιών",
-	"admin.workflow.title": "Διαχείριση ροής εργασιών",
-	"administrativeView.search.results.head": "Αναζήτηση Διαχειριστή",
-	"auth.errors.invalid-user": "Μη έγκυρη διεύθυνση ηλ. ταχυδρομείου ή κωδικός πρόσβασης.",
-	"auth.messages.expired": "Η συνεδρία (session) σας έχει λήξει. Παρακαλούμε συνδεθείτε ξανά.",
-	"auth.messages.token-refresh-failed": "Η ανανέωση της συνεδρίας (session) απέτυχε. Παρακαλούμε συνδεθείτε ξανά.",
-	"bitstream-request-a-copy.alert.canDownload1": "Έχετε ήδη πρόσβαση σε αυτό το αρχείο. Εάν θέλετε να κατεβάσετε το αρχείο, κάντε κλικ",
-	"bitstream-request-a-copy.alert.canDownload2": "εδώ",
-	"bitstream-request-a-copy.allfiles.label": "Αρχεία",
-	"bitstream-request-a-copy.email.error": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.",
-	"bitstream-request-a-copy.email.hint": "Αυτή η διεύθυνση email χρησιμοποιείται για την αποστολή του αρχείου.",
-	"bitstream-request-a-copy.email.label": "Η ηλεκτρονική σου διεύθυνση *",
-	"bitstream-request-a-copy.files-all-false.label": "Μόνο το αρχείο που ζητήθηκε",
-	"bitstream-request-a-copy.files-all-true.label": "Όλα τα αρχεία (του τεκμηρίου αυτού) σε περιορισμένη πρόσβαση",
-	"bitstream-request-a-copy.header": "Ζητήστε ένα αντίγραφο του αρχείου",
-	"bitstream-request-a-copy.intro": "Εισαγάγετε τις ακόλουθες πληροφορίες για να ζητήσετε αντίγραφο για το ακόλουθο τεκμήριο:",
-	"bitstream-request-a-copy.intro.bitstream.all": "Αίτημα όλων των αρχείων.",
-	"bitstream-request-a-copy.intro.bitstream.one": "Ζητώντας το ακόλουθο αρχείο:",
-	"bitstream-request-a-copy.message.label": "Μήνυμα",
-	"bitstream-request-a-copy.name.error": "Το όνομα είναι υποχρεωτικό",
-	"bitstream-request-a-copy.name.label": "Ονομα *",
-	"bitstream-request-a-copy.return": "Επιστροφή",
-	"bitstream-request-a-copy.submit": "Ζητήστε αντίγραφο",
-	"bitstream-request-a-copy.submit.error": "Παρουσιάστηκε κάποιο πρόβλημα με την υποβολή του αιτήματος για το τεκμήριο.",
-	"bitstream-request-a-copy.submit.success": "Το αίτημα τεκμηρίου υποβλήθηκε με επιτυχία.",
-	"bitstream.download.page": "Τώρα γίνεται λήψη του {{bitstream}}...",
-	"bitstream.download.page.back": "Επιστροφή",
-	"bitstream.edit.authorizations.link": "Επεξεργαστείτε τις πολιτικές του αρχείου",
-	"bitstream.edit.authorizations.title": "Επεξεργαστείτε τις πολιτικές του αρχείου",
-	"bitstream.edit.bitstream": "Αρχείο:",
-	"bitstream.edit.form.description.hint": "Προαιρετικά, δώστε μια σύντομη περιγραφή του αρχείου, για παράδειγμα \"<i>Κύριο άρθρο</i>\" ή \"<i>Αναγνώσεις δεδομένων πειράματος</i>\".",
-	"bitstream.edit.form.description.label": "Περιγραφή",
-	"bitstream.edit.form.embargo.hint": "Η πρώτη ημέρα από την οποία επιτρέπεται η πρόσβαση. <b>Αυτή η ημερομηνία δεν μπορεί να τροποποιηθεί σε αυτήν τη φόρμα.</b> Για να ορίσετε μια ημερομηνία embargo για ένα αρχείο, μεταβείτε στην καρτέλα <i>Κατάσταση τεκμηρίου</i>, κάντε κλικ στην επιλογή <i>Εξουσιοδοτήσεις...</i >, δημιουργήστε ή επεξεργαστείτε την πολιτική <i>READ</i> του αρχείου και ορίστε την <i>Ημερομηνία έναρξης</i> όπως επιθυμείτε.",
-	"bitstream.edit.form.embargo.label": "Εμπάργκο (embargo) μέχρι συγκεκριμένη ημερομηνία",
-	"bitstream.edit.form.fileName.hint": "Αλλάξτε το όνομα αρχείου για το αρχείο. Λάβετε υπόψη ότι αυτό θα αλλάξει τη διεύθυνση URL του αρχείου, αλλά οι παλιοί σύνδεσμοι θα εξακολουθούν να ισχύουν όσο το αναγνωριστικό ακολουθίας (sequence) δεν αλλάζει.",
-	"bitstream.edit.form.fileName.label": "Ονομα αρχείου",
-	"bitstream.edit.form.iiifHeight.hint": "Το ύψος του καμβά πρέπει συνήθως να ταιριάζει με το ύψος της εικόνας.",
-	"bitstream.edit.form.iiifHeight.label": "Ύψος καμβά IIIF",
-	"bitstream.edit.form.iiifLabel.hint": "Ετικέτα καμβά για αυτήν την εικόνα. Εάν δεν παρέχεται, θα χρησιμοποιηθεί η προεπιλεγμένη ετικέτα.",
-	"bitstream.edit.form.iiifLabel.label": "Ετικέτα IIIF",
-	"bitstream.edit.form.iiifToc.hint": "Η προσθήκη κειμένου εδώ καθιστά την αρχή ενός νέου εύρους πίνακα περιεχομένων.",
-	"bitstream.edit.form.iiifToc.label": "IIIF Πίνακας περιεχομένων",
-	"bitstream.edit.form.iiifWidth.hint": "Το πλάτος του καμβά πρέπει συνήθως να ταιριάζει με το πλάτος της εικόνας.",
-	"bitstream.edit.form.iiifWidth.label": "Πλάτος καμβά IIIF",
-	"bitstream.edit.form.newFormat.hint": "Η εφαρμογή που χρησιμοποιήσατε για τη δημιουργία του αρχείου και ο αριθμός έκδοσης (για παράδειγμα, \"<i>ACMESoft SuperApp έκδοση 1.5</i>\").",
-	"bitstream.edit.form.newFormat.label": "Περιγράψτε το νέο μορφότυπο",
-	"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.saved.content": "Οι αλλαγές σας σε αυτό το αρχείο αποθηκεύτηκαν.",
-	"bitstream.edit.notifications.saved.title": "το αρχείο αποθηκεύτηκε",
-	"bitstream.edit.return": "Επιστροφή",
-	"bitstream.edit.title": "Επεξεργασία αρχείου",
-	"browse.back.all-results": "Όλα τα αποτελέσματα περιήγησης",
-	"browse.comcol.by.author": "Από Συγγραφέα",
-	"browse.comcol.by.dateissued": "Κατά Ημερομηνία Έκδοσης",
-	"browse.comcol.by.subject": "Κατά θέμα",
-	"browse.comcol.by.title": "Με τίτλο",
-	"browse.comcol.head": "Περιηγούμαι",
-	"browse.empty": "Δεν υπάρχουν τεκμήρια για εμφάνιση.",
-	"browse.metadata.author": "Συγγραφέας",
-	"browse.metadata.author.breadcrumbs": "Πλοήγηση ανά συγγραφέα",
-	"browse.metadata.dateissued": "Ημερομηνία έκδοσης",
-	"browse.metadata.dateissued.breadcrumbs": "Πλοήγηση ανά ημερομηνία",
-	"browse.metadata.subject": "Θέμα",
-	"browse.metadata.subject.breadcrumbs": "Πλοήγηση ανά θέμα",
-	"browse.metadata.title": "Τίτλος",
-	"browse.metadata.title.breadcrumbs": "Πλοήγηση ανά τίτλο",
-	"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.title": "Πλοήγηση στη {{ collection }} ανά {{ field }}{{ startsWith }} {{ value }}",
-	"browse.title.page": "Πλοήγηση στη {{ collection }} ανά {{ field }} {{ value }}",
-	"chips.remove": "Remove chip",
-	"collection.create.head": "Δημιουργήστε μια Συλλογή",
-	"collection.create.notifications.success": "Δημιουργήθηκε με επιτυχία η Συλλογή",
-	"collection.create.sub-head": "Δημιουργήστε μια συλλογή για την κοινότητα {{ parent }}",
-	"collection.curate.header": "Επιμέλεια συλλογής: {{collection}}",
-	"collection.delete.cancel": "Ακύρωση",
-	"collection.delete.confirm": "Επιβεβαίωση",
-	"collection.delete.head": "Διαγραφή συλλογής",
-	"collection.delete.notification.fail": "Δεν ήταν δυνατή η διαγραφή της συλλογής",
-	"collection.delete.notification.success": "Η συλλογή διαγράφηκε με επιτυχία",
-	"collection.delete.processing": "Διαγραφή",
-	"collection.delete.text": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τη συλλογή \"{{ dso }}\"",
-	"collection.edit.breadcrumbs": "Επεξεργασία συλλογής",
-	"collection.edit.delete": "Διαγραφή αυτής της συλλογής",
-	"collection.edit.head": "Επεξεργασία συλλογής",
-	"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.item.authorizations.load-bundle-button": "Φορτώστε περισσότερα πακέτα",
-	"collection.edit.item.authorizations.load-more-button": "Φόρτωσε περισσότερα",
-	"collection.edit.item.authorizations.show-bitstreams-button": "Εμφάνιση πολιτικών αρχείου για το πακέτο",
-	"collection.edit.logo.delete-undo.title": "Αναίρεση διαγραφή",
-	"collection.edit.logo.delete.title": "Διαγραφή λογότυπου",
-	"collection.edit.logo.label": "Λογότυπο συλλογής",
-	"collection.edit.logo.notifications.add.error": "Η μεταφόρτωση του λογότυπου της Συλλογής απέτυχε. Επαληθεύστε το περιεχόμενο πριν προσπαθήσετε ξανά.",
-	"collection.edit.logo.notifications.add.success": "Επιτυχής μεταφόρτωση λογότυπου συλλογής.",
-	"collection.edit.logo.notifications.delete.error.title": "Σφάλμα κατά τη διαγραφή του λογότυπου",
-	"collection.edit.logo.notifications.delete.success.content": "Το λογότυπο της συλλογής διαγράφηκε με επιτυχία",
-	"collection.edit.logo.notifications.delete.success.title": "Το λογότυπο διαγράφηκε",
-	"collection.edit.logo.upload": "Σύρετε ένα λογότυπο συλλογής για μεταφόρτωση",
-	"collection.edit.notifications.success": "Έγινε επιτυχής επεξεργασία της Συλλογής",
-	"collection.edit.return": "Επιστροφή",
-	"collection.edit.tabs.authorizations.head": "Εξουσιοδοτήσεις",
-	"collection.edit.tabs.authorizations.title": "Επεξεργασία συλλογής - Εξουσιοδοτήσεις",
-	"collection.edit.tabs.curate.head": "Βοηθός ιερέα",
-	"collection.edit.tabs.curate.title": "Επεξεργασία συλλογής - Επιμέλεια",
-	"collection.edit.tabs.item-mapper.title": "Επεξεργασία συλλογής - Αντιστοίχιση τεκμηρίων",
-	"collection.edit.tabs.mapper.head": "Αντιστοίχιση τεκμηρίων",
-	"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": "Πρέπει να παρέχετε ένα αναγνωριστικό συνόλου της συλλογής προορισμού.",
-	"collection.edit.tabs.source.form.harvestType": "Συγκομιδή περιεχομένου",
-	"collection.edit.tabs.source.form.head": "Διαμόρφωση εξωτερικής πηγής",
-	"collection.edit.tabs.source.form.metadataConfigId": "Μορφή μεταδεδομένων",
-	"collection.edit.tabs.source.form.oaiSetId": "Αναγνωριστικό συγκεκριμένου συνόλου OAI",
-	"collection.edit.tabs.source.form.oaiSource": "Πάροχος ΟΑΙ",
-	"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.entityType": "Τύπος οντότητας",
-	"collection.form.errors.title.required": "Εισαγάγετε ένα όνομα συλλογής",
-	"collection.form.license": "Αδεια",
-	"collection.form.provenance": "Προέλευση",
-	"collection.form.rights": "Κείμενο πνευματικών δικαιωμάτων (HTML)",
-	"collection.form.tableofcontents": "Ειδήσεις (HTML)",
-	"collection.form.title": "Ονομα",
-	"collection.listelement.badge": "Συλλογή",
-	"collection.page.browse.recent.empty": "Δεν υπάρχουν τεκμήρια για εμφάνιση",
-	"collection.page.browse.recent.head": "Πρόσφατες Υποβολές",
-	"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.harvest.last": "Τελευταία συγκομιδή:",
-	"collection.source.controls.harvest.message": "Πληροφορίες συγκομιδής:",
-	"collection.source.controls.harvest.no-information": "N/A",
-	"collection.source.controls.harvest.start": "Ώρα έναρξης συγκομιδής:",
-	"collection.source.controls.harvest.status": "Κατάσταση συγκομιδής:",
-	"collection.source.controls.head": "Έλεγχοι συγκομιδής",
-	"collection.source.controls.import.completed": "Η εισαγωγή ολοκληρώθηκε",
-	"collection.source.controls.import.failed": "Παρουσιάστηκε σφάλμα κατά την εισαγωγή",
-	"collection.source.controls.import.running": "Εισαγωγή...",
-	"collection.source.controls.import.submit": "Εισαγωγή τώρα",
-	"collection.source.controls.import.submit.error": "Κάτι πήγε στραβά με την έναρξη της εισαγωγής",
-	"collection.source.controls.import.submit.success": "Η εισαγωγή ξεκίνησε με επιτυχία",
-	"collection.source.controls.reset.completed": "Η επαναφορά και η επανεισαγωγή ολοκληρώθηκαν",
-	"collection.source.controls.reset.failed": "Παρουσιάστηκε σφάλμα κατά την επαναφορά και την επανεισαγωγή",
-	"collection.source.controls.reset.running": "Επαναφορά και επανεισαγωγή...",
-	"collection.source.controls.reset.submit": "Επαναφορά και επανεισαγωγή",
-	"collection.source.controls.reset.submit.error": "Κάτι πήγε στραβά με την εκκίνηση της επαναφοράς και της επανεισαγωγής",
-	"collection.source.controls.reset.submit.success": "Η επαναφορά και η επανεισαγωγή ξεκίνησαν με επιτυχία",
-	"collection.source.controls.test.completed": "Το σενάριο για τη δοκιμή των ρυθμίσεων ολοκληρώθηκε με επιτυχία",
-	"collection.source.controls.test.failed": "Το σενάριο για τον έλεγχο των ρυθμίσεων απέτυχε",
-	"collection.source.controls.test.running": "Έλεγχος παραμετροποίησης...",
-	"collection.source.controls.test.submit": "Η παραμετροποίηση ελέγχεται",
-	"collection.source.controls.test.submit.error": "Κάτι πήγε στραβά με την έναρξη του ελέγχου των ρυθμίσεων",
-	"collection.source.update.notifications.error.content": "Οι παρεχόμενες ρυθμίσεις έχουν ελεχθεί και δεν λειτούργησαν.",
-	"collection.source.update.notifications.error.title": "Σφάλμα Διακομιστή",
-	"comcol-role.edit.bitstream_read.anonymous-group": "Η προεπιλεγμένη ανάγνωση για εισερχόμενα αρχεία έχει οριστεί αυτήν τη στιγμή σε Ανώνυμη.",
-	"comcol-role.edit.bitstream_read.description": "Οι διαχειριστές της κοινότητας μπορούν να δημιουργήσουν υποκοινότητες ή συλλογές και να διαχειρίζονται ή να αναθέτουν διαχείριση για αυτές τις υποκοινότητες ή συλλογές. Επιπλέον, αποφασίζουν ποιος μπορεί να υποβάλει τεκμήρια σε οποιεσδήποτε υποσυλλογές, να επεξεργαστεί τα μεταδεδομένα των τεκμηρίων (μετά την υποβολή) και να προσθέσει (αντιστοιχίσει) υπάρχοντα τεκμήρια από άλλες συλλογές (υπόκειται σε εξουσιοδότηση).",
-	"comcol-role.edit.bitstream_read.name": "Προεπιλεγμένη πρόσβαση ανάγνωσης αρχείου",
-	"comcol-role.edit.collection-admin.description": "Οι διαχειριστές της συλλογής αποφασίζουν ποιος μπορεί να υποβάλει τεκμήρια στη συλλογή, να επεξεργαστεί τα μεταδεδομένα των τεκμηρίων (μετά την υποβολή) και να προσθέσει (αντιστοιχίσει) υπάρχοντα τεκμήρια από άλλες συλλογές σε αυτήν τη συλλογή (με την επιφύλαξη εξουσιοδότησης για αυτήν τη συλλογή).",
-	"comcol-role.edit.collection-admin.name": "Διαχειριστές",
-	"comcol-role.edit.community-admin.description": "Οι διαχειριστές της κοινότητας μπορούν να δημιουργήσουν υποκοινότητες ή συλλογές και να διαχειρίζονται ή να αναθέτουν διαχείριση για αυτές τις υποκοινότητες ή συλλογές. Επιπλέον, αποφασίζουν ποιος μπορεί να υποβάλει τεκμήρια σε οποιεσδήποτε υποσυλλογές, να επεξεργαστεί τα μεταδεδομένα των τεκμηρίων (μετά την υποβολή) και να προσθέσει (αντιστοιχίσει) υπάρχοντα τεκμήρια από άλλες συλλογές (υπόκειται σε εξουσιοδότηση).",
-	"comcol-role.edit.community-admin.name": "Διαχειριστές",
-	"comcol-role.edit.create": "Δημιουργώ",
-	"comcol-role.edit.create.error.title": "Αποτυχία δημιουργίας ομάδας για τον ρόλο \"{{ role }}\".",
-	"comcol-role.edit.delete": "Διαγραφή",
-	"comcol-role.edit.delete.error.title": "Απέτυχε η διαγραφή της ομάδας ρόλων \"{{ role }}\".",
-	"comcol-role.edit.editor.description": "Οι συντάκτες μπορούν να επεξεργαστούν τα μεταδεδομένα των εισερχόμενων υποβολών και, στη συνέχεια, να τις αποδεχτούν ή να τις απορρίψουν.",
-	"comcol-role.edit.editor.name": "Συντάκτες",
-	"comcol-role.edit.finaleditor.description": "Οι τελικοί συντάκτες μπορούν να επεξεργαστούν τα μεταδεδομένα των εισερχόμενων υποβολών, αλλά δεν θα μπορούν να τα απορρίψουν.",
-	"comcol-role.edit.finaleditor.name": "Τελικοί συντάκτες",
-	"comcol-role.edit.item_read.anonymous-group": "Η προεπιλεγμένη ανάγνωση για τα εισερχόμενα τεκμήρια έχει οριστεί σε Ανώνυμο.",
-	"comcol-role.edit.item_read.description": "Οι χρήστες και οι ομάδες με δικαίωμα read σε νέα τεκμήρια που υποβάλλονται στη συλλογή. Οι αλλαγές σε αυτόν τον ρόλο δεν έχουν αναδρομική ισχύ. Τα υπάρχοντα τεκμήρια στο σύστημα θα εξακολουθούν να είναι ορατά από όσους είχαν πρόσβαση ανάγνωσης τη στιγμή της προσθήκης τους.",
-	"comcol-role.edit.item_read.name": "Προεπιλεγμένη πρόσβαση για ανάγνωση τεκμηρίων",
-	"comcol-role.edit.no-group": "Κανένας",
-	"comcol-role.edit.restrict": "Περιορίζω",
-	"comcol-role.edit.reviewer.description": "Οι αξιολογητές μπορούν να αποδεχτούν ή να απορρίψουν εισερχόμενες υποβολές. Ωστόσο, δεν είναι σε θέση να επεξεργαστούν τα μεταδεδομένα της υποβολής.",
-	"comcol-role.edit.reviewer.name": "Αναθεωρητές",
-	"comcol-role.edit.submitters.description": "Οι χρήστες και οι ομάδες που έχουν άδεια να υποβάλουν νέα τεκμήρια σε αυτήν τη συλλογή.",
-	"comcol-role.edit.submitters.name": "Υποβολείς",
-	"community.all-lists.head": "Υποκοινότητες και Συλλογές",
-	"community.create.head": "Δημιουργήστε μια Κοινότητα",
-	"community.create.notifications.success": "Δημιουργήθηκε με επιτυχία η Κοινότητα",
-	"community.create.sub-head": "Δημιουργία υποκοινότητας για την κοινότητα {{ parent }}",
-	"community.curate.header": "Επιμέλεια κοινότητας: {{community}}",
-	"community.delete.cancel": "Ακύρωση",
-	"community.delete.confirm": "Επιβεβαίωση",
-	"community.delete.head": "Διαγραφή Κοινότητας",
-	"community.delete.notification.fail": "Δεν ήταν δυνατή η διαγραφή της κοινότητας",
-	"community.delete.notification.success": "Η κοινότητα διαγράφηκε με επιτυχία",
-	"community.delete.processing": "Διαγραφή...",
-	"community.delete.text": "Είστε βέβαιοι ότι θέλετε να διαγράψετε την κοινότητα \"{{ dso }}\"",
-	"community.edit.breadcrumbs": "Επεξεργασία Κοινότητας",
-	"community.edit.delete": "Διαγραφή αυτής της κοινότητας",
-	"community.edit.head": "Επεξεργασία Κοινότητας",
-	"community.edit.logo.delete-undo.title": "Αναίρεση διαγραφής",
-	"community.edit.logo.delete.title": "Διαγραφή λογότυπου",
-	"community.edit.logo.label": "Λογότυπο κοινότητας",
-	"community.edit.logo.notifications.add.error": "Η μεταφόρτωση του λογότυπου της Κοινότητας απέτυχε. Επαληθεύστε το περιεχόμενο πριν προσπαθήσετε ξανά.",
-	"community.edit.logo.notifications.add.success": "Επιτυχής μεταφόρτωση λογότυπου Κοινότητας.",
-	"community.edit.logo.notifications.delete.error.title": "Σφάλμα κατά τη διαγραφή του λογότυπου",
-	"community.edit.logo.notifications.delete.success.content": "Το λογότυπο της κοινότητας διαγράφηκε με επιτυχία",
-	"community.edit.logo.notifications.delete.success.title": "Το λογότυπο διαγράφηκε",
-	"community.edit.logo.upload": "Σύρετε ένα λογότυπο κοινότητας για μεταφόρτωση",
-	"community.edit.notifications.error": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία της Κοινότητας",
-	"community.edit.notifications.success": "Έγινε επιτυχής επεξεργασία της Κοινότητας",
-	"community.edit.notifications.unauthorized": "Δεν έχετε τα προνόμια να κάνετε αυτήν την αλλαγή",
-	"community.edit.return": "Επιστροφή",
-	"community.edit.tabs.authorizations.head": "Εξουσιοδοτήσεις",
-	"community.edit.tabs.authorizations.title": "Επεξεργασία κοινότητας - Εξουσιοδοτήσεις",
-	"community.edit.tabs.curate.head": "Βοηθός ιερέα",
-	"community.edit.tabs.curate.title": "Επεξεργασία κοινότητας - Επιμέλεια",
-	"community.edit.tabs.metadata.head": "Επεξεργασία Μεταδεδομένων",
-	"community.edit.tabs.metadata.title": "Επεξεργασία κοινότητας - Μεταδεδομένα",
-	"community.edit.tabs.roles.head": "Αναθέστε ρόλους",
-	"community.edit.tabs.roles.title": "Επεξεργασία κοινότητας - Ρόλοι",
-	"community.form.abstract": "Σύντομη περιγραφή",
-	"community.form.description": "Εισαγωγικό κείμενο (HTML)",
-	"community.form.errors.title.required": "Εισαγάγετε ένα όνομα κοινότητας",
-	"community.form.rights": "Κείμενο πνευματικών δικαιωμάτων (HTML)",
-	"community.form.tableofcontents": "Ειδήσεις (HTML)",
-	"community.form.title": "Ονομα",
-	"community.listelement.badge": "Κοινότητα",
-	"community.page.edit": "Επεξεργαστείτε αυτήν την κοινότητα",
-	"community.page.handle": "Μόνιμο URI για αυτήν την κοινότητα",
-	"community.page.license": "Αδεια",
-	"community.page.news": "Νέα",
-	"community.sub-collection-list.head": "Συλλογές αυτής της Κοινότητας",
-	"community.sub-community-list.head": "Κοινότητες αυτής της Κοινότητας",
-	"communityList.breadcrumbs": "Λίστα κοινότητας",
-	"communityList.showMore": "Δείτε περισσότερα",
-	"communityList.tabTitle": "Λίστα κοινότητας",
-	"communityList.title": "Κατάλογος Κοινοτήτων",
-	"confirmation-modal.delete-eperson.cancel": "Ακύρωση",
-	"confirmation-modal.delete-eperson.confirm": "Διαγραφή",
-	"confirmation-modal.delete-eperson.header": "Διαγραφή EPerson \"{{ dsoName }}\"",
-	"confirmation-modal.delete-eperson.info": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το EPerson \"{{ dsoName }}\"",
-	"confirmation-modal.delete-profile.cancel": "Ακύρωση",
-	"confirmation-modal.delete-profile.confirm": "Διαγραφή",
-	"confirmation-modal.delete-profile.header": "Διαγραφή προφίλ",
-	"confirmation-modal.delete-profile.info": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το προφίλ σας",
-	"confirmation-modal.export-metadata.cancel": "Ακύρωση",
-	"confirmation-modal.export-metadata.confirm": "Εξαγωγή",
-	"confirmation-modal.export-metadata.header": "Εξαγωγή μεταδεδομένων για {{ dsoName }}",
-	"confirmation-modal.export-metadata.info": "Είστε βέβαιοι ότι θέλετε να εξαγάγετε μεταδεδομένα για το {{ dsoName }}",
-	"cookies.consent.accept-all": "Αποδοχή όλων",
-	"cookies.consent.accept-selected": "Αποδοχή επιλεγμένων",
-	"cookies.consent.app.description.acknowledgement": "Απαιτείται για την αποθήκευση των επιβεβαιώσεων και των συγκατάθεσών σας",
-	"cookies.consent.app.description.authentication": "Απαιτείται για τη σύνδεσή σας",
-	"cookies.consent.app.description.google-analytics": "Μας επιτρέπει να παρακολουθούμε στατιστικά δεδομένα",
-	"cookies.consent.app.description.preferences": "Απαιτείται για την αποθήκευση των προτιμήσεών σας",
-	"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.title.acknowledgement": "Αναγνώριση",
-	"cookies.consent.app.title.authentication": "Αυθεντικοποίηση",
-	"cookies.consent.app.title.google-analytics": "Google Analytics",
-	"cookies.consent.app.title.preferences": "Προτιμήσεις",
-	"cookies.consent.close": "Κλείσε",
-	"cookies.consent.content-modal.description": "Εδώ μπορείτε να δείτε και να προσαρμόσετε τις πληροφορίες που συλλέγουμε για εσάς.",
-	"cookies.consent.content-modal.privacy-policy.name": "πολιτική απορρήτου",
-	"cookies.consent.content-modal.privacy-policy.text": "Για να μάθετε περισσότερα, διαβάστε την {Πολιτική απορρήτου} μας.",
-	"cookies.consent.content-modal.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.decline": "Απόρριψη",
-	"cookies.consent.purpose.functional": "Λειτουργικός",
-	"cookies.consent.purpose.statistical": "Στατιστικός",
-	"cookies.consent.update": "Υπήρξαν αλλαγές από την τελευταία σας επίσκεψη, ενημερώστε τη συγκατάθεσή σας.",
-	"curation-task.task.checklinks.label": "Ελέγξτε τους συνδέσμους στα μεταδεδομένα",
-	"curation-task.task.noop.label": "ΝΟΟΠ",
-	"curation-task.task.profileformats.label": "Προφίλ Μορφοτύπων Αρχείων",
-	"curation-task.task.requiredmetadata.label": "Ελέγξτε για Απαιτούμενα Μεταδεδομένα",
-	"curation-task.task.translate.label": "Μεταφραστής της Microsoft",
-	"curation-task.task.vscan.label": "Ελεγχος για ιούς",
-	"curation.form.handle.hint": "Συμβουλή: Εισαγάγετε [your-handle-prefix]/0 για να εκτελέσετε μια εργασία σε ολόκληρο τον ιστότοπο (μπορεί να μην υποστηρίζουν όλες οι εργασίες αυτήν τη δυνατότητα)",
-	"curation.form.handle.label": "Handle:",
-	"curation.form.submit": "Αρχή",
-	"curation.form.submit.error.content": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια έναρξης της εργασίας επιμέλειας.",
-	"curation.form.submit.error.head": "Η εκτέλεση της εργασίας επιμέλειας απέτυχε",
-	"curation.form.submit.error.invalid-handle": "Δεν ήταν δυνατός ο προσδιορισμός Handle για αυτό το τεκμήριο",
-	"curation.form.submit.success.content": "Θα ανακατευθυνθείτε στην αντίστοιχη σελίδα διαδικασίας.",
-	"curation.form.submit.success.head": "Η εργασία επιμέλειας ξεκίνησε με επιτυχία",
-	"curation.form.task-select.label": "Εργο:",
-	"default-relationships.search.results.head": "Αποτελέσματα αναζήτησης",
-	"default.search.results.head": "Αποτελέσματα αναζήτησης",
-	"deny-request-copy.email.message": "Αγαπητέ {{ recipientName }},\nΩς απάντηση στο αίτημά σας, με λύπη σας ενημερώνω ότι δεν είναι δυνατό να σας αποσταλεί αντίγραφο των αρχείων που ζητήσατε, σχετικά με το έγγραφο: \"{{ itemUrl }}\" ({{ itemName }}), εκ των οποίων Είμαι συγγραφέας.\n\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-selector.claim.item.body": "Αυτά είναι υπάρχοντα προφίλ που μπορεί να σχετίζονται με εσάς. Εάν αναγνωρίζετε τον εαυτό σας σε ένα από αυτά τα προφίλ, επιλέξτε το και στη σελίδα λεπτομερειών, ανάμεσα στις επιλογές, επιλέξτε να το διεκδικήσετε. Διαφορετικά, μπορείτε να δημιουργήσετε ένα νέο προφίλ από την αρχή χρησιμοποιώντας το παρακάτω κουμπί.",
-	"dso-selector.claim.item.create-from-scratch": "Δημιουργήστε ένα νέο",
-	"dso-selector.claim.item.head": "Συμβουλές προφίλ",
-	"dso-selector.claim.item.not-mine-label": "Κανένα από αυτά δεν είναι δικό μου",
-	"dso-selector.create.collection.head": "Νέα συλλογή",
-	"dso-selector.create.collection.sub-level": "Δημιουργήστε μια νέα συλλογή στο",
-	"dso-selector.create.community.head": "Νέα κοινότητα",
-	"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.no-results": "Δεν βρέθηκε {{ type }}",
-	"dso-selector.placeholder": "Αναζήτηση για ένα {{ type }}",
-	"dso-selector.select.collection.head": "Επιλέξτε μια συλλογή",
-	"dso-selector.set-scope.community.button": "Αναζήτηση σε όλο το DSpace",
-	"dso-selector.set-scope.community.head": "Επιλέξτε ένα εύρος αναζήτησης",
-	"dso-selector.set-scope.community.input-header": "Αναζήτηση κοινότητας ή συλλογής",
-	"dso.name.untitled": "Χωρίς τίτλο",
-	"error-page.description.401": "ανεξουσιοδότητος",
-	"error-page.description.403": "απαγορευμένος",
-	"error-page.description.404": "Η σελίδα δεν βρέθηκε",
-	"error-page.description.500": "Μη διαθέσιμη υπηρεσία",
-	"error-page.orcid.generic-error": "Παρουσιάστηκε σφάλμα κατά τη σύνδεση μέσω ORCID. Βεβαιωθείτε ότι έχετε μοιραστεί τη διεύθυνση email του λογαριασμού σας ORCID με το DSpace. Εάν το σφάλμα παραμένει, επικοινωνήστε με τον διαχειριστή",
-	"error.bitstream": "Σφάλμα κατά την ανάκτηση αρχείου",
-	"error.browse-by": "Σφάλμα κατά την ανάκτηση τεκμηρίων",
-	"error.collection": "Σφάλμα κατά την ανάκτηση της συλλογής",
-	"error.collections": "Σφάλμα κατά την ανάκτηση συλλογών",
-	"error.community": "Σφάλμα κατά την ανάκτηση της κοινότητας",
-	"error.default": "Λάθος",
-	"error.identifier": "Δεν βρέθηκε τεκμήριο για το αναγνωριστικό",
-	"error.invalid-search-query": "Το ερώτημα αναζήτησης δεν είναι έγκυρο. Ελέγξτε τις βέλτιστες πρακτικές <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Σύνταξη ερωτήματος Solr</a> για περισσότερες πληροφορίες σχετικά με αυτό το σφάλμα .",
-	"error.item": "Σφάλμα κατά την ανάκτηση του τεκμηρίου",
-	"error.items": "Σφάλμα κατά την ανάκτηση τεκμηρίων",
-	"error.objects": "Σφάλμα κατά την ανάκτηση αντικειμένων",
-	"error.recent-submissions": "Σφάλμα κατά την ανάκτηση πρόσφατων υποβολών",
-	"error.search-results": "Σφάλμα κατά την ανάκτηση των αποτελεσμάτων αναζήτησης",
-	"error.sub-collections": "Σφάλμα κατά την ανάκτηση υποσυλλογών",
-	"error.sub-communities": "Σφάλμα κατά την ανάκτηση υποκοινοτήτων",
-	"error.submission.sections.init-form-error": "Παρουσιάστηκε σφάλμα κατά την προετοιμασία ενότητας, ελέγξτε τη διαμόρφωση της φόρμας εισαγωγής. Λεπτομέρειες είναι παρακάτω: <br> <br>",
-	"error.top-level-communities": "Σφάλμα κατά την ανάκτηση κοινοτήτων ανώτατου επιπέδου",
-	"error.validation.NotValidEmail": "Αυτό το e-mail δεν είναι έγκυρο email",
-	"error.validation.emailTaken": "Αυτό το e-mail έχει ήδη ληφθεί",
-	"error.validation.filerequired": "Η αποστολή του αρχείου είναι υποχρεωτική",
-	"error.validation.groupExists": "Αυτή η ομάδα υπάρχει ήδη",
-	"error.validation.license.notgranted": "Πρέπει να χορηγήσετε αυτήν την άδεια για να ολοκληρώσετε την υποβολή σας. Εάν δεν μπορείτε να εκχωρήσετε αυτήν την άδεια αυτήν τη στιγμή, μπορείτε να αποθηκεύσετε την εργασία σας και να επιστρέψετε αργότερα ή να καταργήσετε την υποβολή.",
-	"error.validation.pattern": "Αυτή η είσοδος περιορίζεται από το τρέχον μοτίβο: {{ pattern }}.",
-	"error.validation.required": "Αυτό το πεδίο είναι υποχρεωτικό",
-	"feed.description": "Συνδικάτο τροφοδοσία",
-	"file-section.error.header": "Σφάλμα κατά τη λήψη αρχείων για αυτό το τεκμήριο",
-	"footer.copyright": "πνευματικά δικαιώματα © 2002-{{ year }}",
-	"footer.link.cookies": "Ρυθμίσεις cookie",
-	"footer.link.dspace": "Λογισμικό DSpace",
-	"footer.link.end-user-agreement": "Συμφωνία Τελικού Χρήστη",
-	"footer.link.feedback": "Στείλετε τα σχόλιά σας",
-	"footer.link.lyrasis": "LYRASIS",
-	"footer.link.privacy-policy": "Πολιτική απορρήτου",
-	"forgot-email.form.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου *",
-	"forgot-email.form.email.error.pattern": "Συμπληρώστε μια έγκυρη διεύθυνση email",
-	"forgot-email.form.email.error.required": "Συμπληρώστε μια διεύθυνση email",
-	"forgot-email.form.email.hint": "Θα σταλεί ένα email σε αυτή τη διεύθυνση με περαιτέρω οδηγίες.",
-	"forgot-email.form.error.content": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια επαναφοράς του κωδικού πρόσβασης για τον λογαριασμό που σχετίζεται με την ακόλουθη διεύθυνση ηλεκτρονικού ταχυδρομείου: {{ email }}",
-	"forgot-email.form.error.head": "Σφάλμα κατά την προσπάθεια επαναφοράς του κωδικού πρόσβασης",
-	"forgot-email.form.header": "Ξεχάσατε τον κωδικό",
-	"forgot-email.form.info": "Εισαγάγετε τη διεύθυνση email που σχετίζεται με τον λογαριασμό.",
-	"forgot-email.form.submit": "Επαναφέρετε τον κωδικό πρόσβασης",
-	"forgot-email.form.success.content": "Έχει σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση {{ email }} που περιέχει μια ειδική διεύθυνση URL και περαιτέρω οδηγίες.",
-	"forgot-email.form.success.head": "Στάλθηκε email επαναφοράς κωδικού πρόσβασης",
-	"forgot-password.form.card.security": "Ασφάλεια",
-	"forgot-password.form.error.empty-password": "Εισαγάγετε έναν κωδικό πρόσβασης στο παρακάτω πλαίσιο.",
-	"forgot-password.form.error.matching-passwords": "Οι κωδικοί δεν ταιριάζουν.",
-	"forgot-password.form.error.password-length": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
-	"forgot-password.form.head": "Ξεχάσατε τον κωδικό",
-	"forgot-password.form.identification.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου:",
-	"forgot-password.form.identification.header": "Αναγνωρίζω",
-	"forgot-password.form.info": "Εισαγάγετε έναν νέο κωδικό πρόσβασης στο παρακάτω πλαίσιο και επιβεβαιώστε τον πληκτρολογώντας τον ξανά στο δεύτερο πλαίσιο. Θα πρέπει να αποτελείται από τουλάχιστον έξι χαρακτήρες.",
-	"forgot-password.form.label.password": "Κωδικός πρόσβασης",
-	"forgot-password.form.label.passwordrepeat": "Πληκτρολογήστε ξανά για επιβεβαίωση",
-	"forgot-password.form.notification.error.title": "Σφάλμα κατά την προσπάθεια υποβολής νέου κωδικού πρόσβασης",
-	"forgot-password.form.notification.success.content": "Η επαναφορά του κωδικού πρόσβασης ήταν επιτυχής. Έχετε συνδεθεί ως ο χρήστης που δημιουργήθηκε.",
-	"forgot-password.form.notification.success.title": "Η επαναφορά του κωδικού πρόσβασης ολοκληρώθηκε",
-	"forgot-password.form.submit": "Υποβολή κωδικού πρόσβασης",
-	"forgot-password.title": "Ξεχάσατε τον κωδικό",
-	"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.remove": "Αφαίρεση",
-	"form.repeatable.sort.tip": "Σύρετε το τεκμήριο στη νέα θέση",
-	"form.save": "Αποθήκευση",
-	"form.save-help": "Αποθήκευσε τις αλλαγές",
-	"form.search": "Αναζήτηση",
-	"form.search-help": "Κάντε κλικ εδώ για να αναζητήσετε μια υπάρχουσα αλληλογραφία",
-	"form.submit": "Αποθήκευση",
-	"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": "Αφού επιλέξετε μια επιλογή, θα σας παρουσιαστεί μια προτεινόμενη απάντηση μέσω email την οποία μπορείτε να επεξεργαστείτε.",
-	"grant-deny-request-copy.processed": "Αυτό το αίτημα έχει ήδη διεκπεραιωθεί. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
-	"grant-request-copy.email.message": "Αγαπητέ {{ recipientName }},\nΩς απάντηση στο αίτημά σας, έχω τη χαρά να σας στείλω επισυναπτόμενο αντίγραφο του αρχείου(ων) που αφορά το έγγραφο: \"{{ itemUrl }}\" ({{ itemName }}), του οποίου είμαι συντάκτης.\n\nΤις καλύτερες ευχές,\n{{ authorName }} <{{ authorEmail }}>",
-	"grant-request-copy.email.subject": "Ζητήστε αντίγραφο εγγράφου",
-	"grant-request-copy.error": "Παρουσιάστηκε σφάλμα",
-	"grant-request-copy.header": "Αίτημα αντιγραφής παραχώρησης εγγράφου",
-	"grant-request-copy.intro": "Αυτό το μήνυμα θα σταλεί στον αιτούντα του αιτήματος. Το(τα) έγγραφο(α) που ζητήθηκαν θα επισυναφθούν.",
-	"grant-request-copy.success": "Το αίτημα τεκμηρίου εγκρίθηκε με επιτυχία",
-	"health-page.error.msg": "Η υπηρεσία ελέγχου υγείας δεν είναι διαθέσιμη προσωρινά",
-	"health-page.heading": "Υγεία",
-	"health-page.info-tab": "Πληροφορίες",
-	"health-page.property.status": "Κωδικός κατάστασης",
-	"health-page.section-info.app.title": "Εφαρμογή Backend",
-	"health-page.section-info.java.title": "Java",
-	"health-page.section.db.title": "Βάση δεδομένων",
-	"health-page.section.geoIp.title": "GeoIp",
-	"health-page.section.no-issues": "Δεν εντοπίστηκαν προβλήματα",
-	"health-page.section.solrAuthorityCore.title": "Solr: πυρήνας authority",
-	"health-page.section.solrOaiCore.title": "Solr: πυρήνας oai",
-	"health-page.section.solrSearchCore.title": "Solr: πυρήνας search",
-	"health-page.section.solrStatisticsCore.title": "Solr: πυρήνας statistics",
-	"health-page.status": "Κατάσταση",
-	"health-page.status-tab": "Κατάσταση",
-	"health-page.status.error.info": "Εντοπίστηκαν προβλήματα",
-	"health-page.status.ok.info": "Λειτουργικό",
-	"health-page.status.warning.info": "Εντοπίστηκαν πιθανά προβλήματα",
-	"health-page.title": "Υγεία",
-	"health.breadcrumbs": "Υγεία",
-	"home.breadcrumbs": "Αρχική",
-	"home.description": "",
-	"home.search-form.placeholder": "Αναζήτηση στο αποθετήριο...",
-	"home.title": "Αρχική",
-	"home.top-level-communities.head": "Κοινότητες στο DSpace",
-	"home.top-level-communities.help": "Επιλέξτε μια κοινότητα για να περιηγηθείτε στις συλλογές της.",
-	"idle-modal.extend-session": "Επέκταση συνεδρίας",
-	"idle-modal.header": "Η συνεδρία θα λήξει σύντομα",
-	"idle-modal.info": "Για λόγους ασφαλείας, οι περίοδοι σύνδεσης χρήστη λήγουν μετά από {{ timeToExpire }} λεπτά αδράνειας. Η συνεδρία σας θα λήξει σύντομα. Θέλετε να το επεκτείνετε ή να αποσυνδεθείτε;",
-	"idle-modal.log-out": "Αποσύνδεση",
-	"iiif.listelement.badge": "Μέσα εικόνας",
-	"iiif.page.description": "Περιγραφή:",
-	"iiif.page.doi": "Μόνιμος σύνδεσμος:",
-	"iiif.page.issue": "Θέμα:",
-	"iiif.page.titleprefix": "Εικόνα:",
-	"iiifsearchable.listelement.badge": "Μέσα εγγράφων",
-	"iiifsearchable.page.description": "Περιγραφή:",
-	"iiifsearchable.page.doi": "Μόνιμος σύνδεσμος:",
-	"iiifsearchable.page.issue": "Θέμα:",
-	"iiifsearchable.page.titleprefix": "Εγγραφο:",
-	"iiifviewer.fullscreen.notice": "Χρησιμοποιήστε πλήρη οθόνη για καλύτερη προβολή.",
-	"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.feedback.breadcrumbs": "Ανατροφοδότηση",
-	"info.feedback.comments": "Σχόλια",
-	"info.feedback.create.success": "Τα σχόλια εστάλησαν με επιτυχία!",
-	"info.feedback.email-label": "Το ηλεκτρονικό σου ταχυδρομείο",
-	"info.feedback.email_help": "Αυτή η διεύθυνση θα χρησιμοποιηθεί για την παρακολούθηση των σχολίων σας.",
-	"info.feedback.error.email.required": "Μια έγκυρη διεύθυνση email απαιτείται",
-	"info.feedback.error.message.required": "Απαιτείται σχόλιο",
-	"info.feedback.head": "Ανατροφοδότηση",
-	"info.feedback.info": "Ευχαριστούμε που μοιραστήκατε τα σχόλιά σας σχετικά με το σύστημα DSpace. Τα σχόλιά σας εκτιμώνται!",
-	"info.feedback.page-label": "Σελίδα",
-	"info.feedback.page_help": "Αυτή η σελίδα σχετίζεται με τα σχόλιά σας",
-	"info.feedback.send": "Στείλετε τα σχόλιά σας",
-	"info.feedback.title": "Επικοινωνία",
-	"info.privacy.breadcrumbs": "Δήλωση προστασίας προσωπικών δεδομένων",
-	"info.privacy.head": "Δήλωση προστασίας προσωπικών δεδομένων",
-	"info.privacy.title": "Δήλωση προστασίας προσωπικών δεδομένων",
-	"item.alerts.private": "Αυτό το τεκμήριο δεν μπορεί να ανακαλυφθεί",
-	"item.alerts.withdrawn": "Αυτό το τεκμήριο έχει αποσυρθεί",
-	"item.badge.private": "Μη ανακαλυπτόμενο",
-	"item.badge.withdrawn": "Αποτραβηγμένος",
-	"item.bitstreams.upload.bundle": "Φάκελος/Πακέτο",
-	"item.bitstreams.upload.bundle.new": "Δημιουργία φακέλου/πακέτου",
-	"item.bitstreams.upload.bundle.placeholder": "Επιλέξτε ένα φάκελο/πακέτο ή εισαγάγετε νέο όνομα φακέλου/πακέτου",
-	"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.authorizations.heading": "Με αυτό το πρόγραμμα επεξεργασίας μπορείτε να προβάλετε και να τροποποιήσετε τις πολιτικές μιας εγγραφής, καθώς και να τροποποιήσετε τις πολιτικές για μεμονωμένα τεκμήρια εγγραφών: φάκελους/πακέτα και αρχεία. Εν συντομία, μια εγγραφή είναι ένα κοντέινερ με φακέλους/πακέτα και οι φάκελοι/πακέτα είναι συλλέκτες αρχείων. Οι φάκελοι/πακέτα έχουν συνήθως πολιτικές ADD/REMOVE/READ/WRITE, ενώ τα αρχεία έχουν μόνο πολιτικές READ/WRITE.",
-	"item.edit.authorizations.title": "Επεξεργασία των πολιτικών του τεκμηρίου",
-	"item.edit.bitstreams.bundle.displaying": "Αυτήν τη στιγμή εμφανίζονται {{ amount }} αρχεία από {{ total }}.",
-	"item.edit.bitstreams.bundle.edit.buttons.upload": "Μεταφόρτωση",
-	"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": "Οι αλλαγές είναι ξεπερασμένες (outdated)",
-	"item.edit.bitstreams.notifications.remove.failed.title": "Σφάλμα κατά τη διαγραφή bitstream",
-	"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.breadcrumbs": "Επεξεργασία τεκμηρίου",
-	"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.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.edit": "Επεξεργασία",
-	"item.edit.metadata.edit.buttons.remove": "Αφαίρεση",
-	"item.edit.metadata.edit.buttons.undo": "Αναίρεση αλλαγών",
-	"item.edit.metadata.edit.buttons.unedit": "Σταματήστε την επεξεργασία",
-	"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.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": "Τροποποιήθηκε (outdated)",
-	"item.edit.metadata.notifications.saved.content": "Οι αλλαγές σας στα μεταδεδομένα αυτού του τεκμηρίου αποθηκεύτηκαν.",
-	"item.edit.metadata.notifications.saved.title": "Τα μεταδεδομένα αποθηκεύτηκαν",
-	"item.edit.metadata.reinstate-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.description": "Επιλέξτε τη συλλογή στην οποία θέλετε να μετακινήσετε αυτό το τεκμήριο. Για να περιορίσετε τη λίστα των εμφανιζόμενων συλλογών, μπορείτε να εισαγάγετε ένα ερώτημα αναζήτησης στο πλαίσιο.",
-	"item.edit.move.discard-button": "Απόρριψη",
-	"item.edit.move.error": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια μετακίνησης του τεκμηρίου",
-	"item.edit.move.head": "Μετακίνηση τεκμηρίου: {{id}}",
-	"item.edit.move.inheritpolicies.checkbox": "Inherited πολιτικές",
-	"item.edit.move.inheritpolicies.description": "Μεταβιβάστε τις προεπιλεγμένες πολιτικές της συλλογής προορισμού",
-	"item.edit.move.move": "Μετακίνηση",
-	"item.edit.move.processing": "Μετακίνηση...",
-	"item.edit.move.save-button": "Αποθήκευση",
-	"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-entity-type": "Προσθέστε μεταδεδομένα 'dspace.entity.type' για να ενεργοποιήσετε τις σχέσεις για αυτό το τεκμήριο",
-	"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": "Οι αλλαγές είναι ξεπερασμένες (outdated)",
-	"item.edit.relationships.notifications.saved.content": "Οι αλλαγές σας στις σχέσεις αυτού του τεκμηρίου αποθηκεύτηκαν.",
-	"item.edit.relationships.notifications.saved.title": "Οι σχέσεις σώθηκαν",
-	"item.edit.relationships.reinstate-button": "Αναίρεση",
-	"item.edit.relationships.save-button": "Αποθήκευση",
-	"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.tabs.disabled.tooltip": "Δεν έχετε εξουσιοδότηση πρόσβασης σε αυτήν την καρτέλα",
-	"item.edit.tabs.item-mapper.title": "Επεξεργασία τεκμηρίου - αντιστοίχηση συλλογής",
-	"item.edit.tabs.mapper.head": "αντιστοίχηση συλλογής",
-	"item.edit.tabs.metadata.head": "Metadata",
-	"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": "Εσωτερικό αναγνωριστικό τεκμηρίου",
-	"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.listelement.badge": "Τεκμήριο",
-	"item.orcid.return": "Επιστροφή",
-	"item.page.abstract": "Περίληψη",
-	"item.page.author": "Συγγραφείς",
-	"item.page.bitstreams.collapse": "Σύμπτηξη",
-	"item.page.bitstreams.view-more": "Δείτε περισσότερα",
-	"item.page.citation": "Παραπομπή",
-	"item.page.claim.button": "Απαίτηση",
-	"item.page.claim.tooltip": "Διεκδικήστε αυτό το τεκμήριο ως προφίλ",
-	"item.page.collections": "Συλλογές",
-	"item.page.collections.load-more": "Φόρτωσε περισσότερα",
-	"item.page.collections.loading": "Φόρτωση...",
-	"item.page.date": "Ημερομηνία",
-	"item.page.description": "Περιγραφή",
-	"item.page.edit": "Επεξεργαστείτε αυτό το τεκμήριο",
-	"item.page.files": "Αρχεία",
-	"item.page.filesection.description": "Περιγραφή:",
-	"item.page.filesection.download": "Κατεβάστε",
-	"item.page.filesection.format": "Μορφότυπο:",
-	"item.page.filesection.license.bundle": "Φάκελος/Πακέτο αδειών",
-	"item.page.filesection.name": "Ονομα:",
-	"item.page.filesection.original.bundle": "Πρωτότυπος φάκελος/πακέτο",
-	"item.page.filesection.size": "Μέγεθος:",
-	"item.page.journal-issn": "Περιοδικό ISSN",
-	"item.page.journal-title": "Τίτλος Εφημερίδας",
-	"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.publisher": "Εκδότης",
-	"item.page.related-items.view-less": "Απόκρυψη τελευταίου {{ amount }}",
-	"item.page.related-items.view-more": "Εμφάνιση {{ amount }} ακόμη",
-	"item.page.relationships.isAuthorOfPublication": "Δημοσιεύσεις",
-	"item.page.relationships.isJournalOfPublication": "Δημοσιεύσεις",
-	"item.page.relationships.isOrgUnitOfPerson": "Συγγραφείς",
-	"item.page.relationships.isOrgUnitOfProject": "Ερευνητικά έργα",
-	"item.page.return": "Επιστροφή",
-	"item.page.subject": "Λέξεις-κλειδιά",
-	"item.page.titleprefix": "Είδος:",
-	"item.page.uri": "URI",
-	"item.page.version.create": "Δημιουργία νέας έκδοσης",
-	"item.page.version.hasDraft": "Δεν είναι δυνατή η δημιουργία νέας έκδοσης επειδή υπάρχει μια υποβολή σε εξέλιξη στο ιστορικό εκδόσεων",
-	"item.page.volume-title": "Τίτλος τόμου",
-	"item.preview.dc.contributor.author": "Συγγραφείς:",
-	"item.preview.dc.coverage.spatial": "Τοπική κάλυψη:",
-	"item.preview.dc.date.issued": "Ημερομηνία δημοσίευσης:",
-	"item.preview.dc.description.abstract": "Περίληψη:",
-	"item.preview.dc.identifier": "Αναγνωριστικό:",
-	"item.preview.dc.identifier.doi": "DOI",
-	"item.preview.dc.identifier.isbn": "ISBN",
-	"item.preview.dc.identifier.other": "Άλλο αναγνωριστικό:",
-	"item.preview.dc.identifier.uri": "Αναγνωριστικό URI:",
-	"item.preview.dc.language.iso": "Γλώσσα:",
-	"item.preview.dc.relation.ispartof": "Περιοδικό ή Σειρά",
-	"item.preview.dc.relation.issn": "ISSN",
-	"item.preview.dc.subject": "Μαθήματα:",
-	"item.preview.dc.title": "Τίτλος:",
-	"item.preview.dc.title.alternative": "Αρκτικόλεξο:",
-	"item.preview.dc.type": "Τύπος:",
-	"item.preview.oaire.awardNumber": "Αναγνωριστικό χρηματοδότησης:",
-	"item.preview.oaire.citation.issue": "Θέμα",
-	"item.preview.oaire.citation.volume": "Τόμος",
-	"item.preview.oaire.fundingStream": "Ροή χρηματοδότησης:",
-	"item.preview.person.familyName": "Επώνυμο:",
-	"item.preview.person.givenName": "Ονομα:",
-	"item.preview.person.identifier.orcid": "ORCID:",
-	"item.preview.project.funder.identifier": "Αναγνωριστικό χρηματοδότη:",
-	"item.preview.project.funder.name": "Χρηματοδότης:",
-	"item.search.results.head": "Αποτελέσματα αναζήτησης τεκμηρίων",
-	"item.search.title": "Αναζήτηση τεκμηρ'ιου",
-	"item.select.confirm": "Επιβεβαιώστε την επιλογή",
-	"item.select.empty": "Δεν υπάρχουν τεκμήρια για εμφάνιση",
-	"item.select.table.author": "Συγγραφέας",
-	"item.select.table.collection": "Συλλογή",
-	"item.select.table.title": "Τίτλος",
-	"item.truncatable-part.show-less": "Σύμπτηξη",
-	"item.truncatable-part.show-more": "Δείτε περισσότερα",
-	"item.version.create.modal.button.cancel": "Ακύρωση",
-	"item.version.create.modal.button.cancel.tooltip": "Μην δημιουργήσετε νέα έκδοση",
-	"item.version.create.modal.button.confirm": "Δημιουργώ",
-	"item.version.create.modal.button.confirm.tooltip": "Δημιουργία νέας έκδοσης",
-	"item.version.create.modal.form.summary.label": "Περίληψη",
-	"item.version.create.modal.form.summary.placeholder": "Εισαγάγετε τη σύνοψη για τη νέα έκδοση",
-	"item.version.create.modal.header": "Νέα έκδοση",
-	"item.version.create.modal.submitted.header": "Δημιουργία νέας έκδοσης...",
-	"item.version.create.modal.submitted.text": "Η νέα έκδοση δημιουργείται. Αυτό μπορεί να πάρει κάποιο χρόνο εάν το τεκμήριο έχει πολλές σχέσεις.",
-	"item.version.create.modal.text": "Δημιουργήστε μια νέα έκδοση για αυτό το τεκμήριο",
-	"item.version.create.modal.text.startingFrom": "ξεκινώντας από την έκδοση {{version}}",
-	"item.version.create.notification.failure": "Δεν έχει δημιουργηθεί νέα έκδοση",
-	"item.version.create.notification.inProgress": "Δεν είναι δυνατή η δημιουργία νέας έκδοσης επειδή υπάρχει μια υποβολή σε εξέλιξη στο ιστορικό εκδόσεων",
-	"item.version.create.notification.success": "Δημιουργήθηκε νέα έκδοση με αριθμό έκδοσης {{version}}",
-	"item.version.delete.modal.button.cancel": "Ακύρωση",
-	"item.version.delete.modal.button.cancel.tooltip": "Μην διαγράψετε αυτήν την έκδοση",
-	"item.version.delete.modal.button.confirm": "Διαγραφή",
-	"item.version.delete.modal.button.confirm.tooltip": "Διαγράψτε αυτήν την έκδοση",
-	"item.version.delete.modal.header": "Διαγραφή έκδοσης",
-	"item.version.delete.modal.text": "Θέλετε να διαγράψετε την έκδοση {{version}};",
-	"item.version.delete.notification.failure": "Ο αριθμός έκδοσης {{version}} δεν έχει διαγραφεί",
-	"item.version.delete.notification.success": "Ο αριθμός έκδοσης {{version}} έχει διαγραφεί",
-	"item.version.edit.notification.failure": "Η περίληψη του αριθμού έκδοσης {{version}} δεν έχει αλλάξει",
-	"item.version.edit.notification.success": "Η σύνοψη του αριθμού έκδοσης {{version}} έχει αλλάξει",
-	"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.action.deleteVersion": "Διαγραφή έκδοσης",
-	"item.version.history.table.action.discardSummary": "Απόρριψη συνοπτικών επεξεργασιών",
-	"item.version.history.table.action.editSummary": "Επεξεργασία περίληψης",
-	"item.version.history.table.action.editWorkspaceItem": "Επεξεργασία workspace τεκμηρίου",
-	"item.version.history.table.action.hasDraft": "Δεν είναι δυνατή η δημιουργία νέας έκδοσης επειδή υπάρχει μια υποβολή σε εξέλιξη στο ιστορικό εκδόσεων",
-	"item.version.history.table.action.newVersion": "Δημιουργήστε νέα έκδοση από αυτήν",
-	"item.version.history.table.action.saveSummary": "Αποθήκευση συνοπτικών επεξεργασιών",
-	"item.version.history.table.actions": "Ενέργεια",
-	"item.version.history.table.date": "Ημερομηνία",
-	"item.version.history.table.editor": "Συντάκτης",
-	"item.version.history.table.item": "Τεκμήριο",
-	"item.version.history.table.summary": "Περίληψη",
-	"item.version.history.table.version": "Εκδοχή",
-	"item.version.history.table.workflowItem": "τεκμήριο ροής εργασιών",
-	"item.version.history.table.workspaceItem": "τεκμήριο χώρου εργασίας",
-	"item.version.notice": "Αυτή δεν είναι η πιο πρόσφατη έκδοση αυτού του τεκμηρίου. Μπορείτε να βρείτε την πιο πρόσφατη έκδοση <a href='{{destination}}'>εδώ</a>.",
-	"journal-relationships.search.results.head": "Αποτελέσματα αναζήτησης περιοδικών",
-	"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.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": "Τομος",
-	"loading.bitstream": "Φόρτωση αρχείου...",
-	"loading.bitstreams": "Φόρτωση αρχείων...",
-	"loading.browse-by": "Φόρτωση τεκμηρίων...",
-	"loading.browse-by-page": "Φόρτωση σελίδας...",
-	"loading.collection": "Φόρτωση συλλογής...",
-	"loading.collections": "Φόρτωση συλλογών...",
-	"loading.community": "Φόρτωση κοινότητας...",
-	"loading.content-source": "Φόρτωση πηγής περιεχομένου...",
-	"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.breadcrumbs": "Σύνδεση",
-	"login.form.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-	"login.form.forgot-password": "Έχετε ξεχάσει τον κωδικό σας;",
-	"login.form.header": "Παρακαλούμε συνδεθείτε στο DSpace",
-	"login.form.new-user": "Νέος χρήστης? Κάντε κλικ εδώ για να εγγραφείτε.",
-	"login.form.oidc": "Συνδεθείτε με το OIDC",
-	"login.form.or-divider": "ή",
-	"login.form.orcid": "Συνδεθείτε με το ORCID",
-	"login.form.password": "Κωδικός πρόσβασης",
-	"login.form.shibboleth": "Συνδεθείτε με το Shibboleth",
-	"login.form.submit": "Σύνδεση",
-	"login.title": "Σύνδεση",
-	"logout.form.header": "Αποσυνδεθείτε από το DSpace",
-	"logout.form.submit": "Αποσύνδεση",
-	"logout.title": "Αποσύνδεση",
-	"media-viewer.next": "Επόμενο",
-	"media-viewer.playlist": "Λίστα αναπαραγωγής",
-	"media-viewer.previous": "Προηγούμενο",
-	"menu.header.admin": "Διαχείριση",
-	"menu.header.admin.description": "Μενού διαχείρισης",
-	"menu.header.image.logo": "Λογότυπο αποθετηρίου",
-	"menu.section.access_control": "Έλεγχος πρόσβασης",
-	"menu.section.access_control_authorizations": "Εξουσιοδοτήσεις",
-	"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": "Όλο το DSpace",
-	"menu.section.browse_global_by_author": "Ανά Συγγραφέα",
-	"menu.section.browse_global_by_dateissued": "Ανά Ημερομηνία Έκδοσης",
-	"menu.section.browse_global_by_subject": "Ανά θέμα",
-	"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.health": "Υγεία",
-	"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": "Ενότητα μενού εργασιών Statistics",
-	"menu.section.icon.unpin": "Ξεκαρφιτσώστε την πλαϊνή γραμμή",
-	"menu.section.icon.workflow": "Διαχείριση ενότητας μενού ροής εργασιών",
-	"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.processes": "Διαδικασίες",
-	"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.unpin": "Ξεκαρφιτσώστε το πλαϊνό μενού",
-	"menu.section.workflow": "Διαχείριση ροής εργασιών",
-	"metadata-export-search.submit.error": "Η έναρξη της εξαγωγής απέτυχε",
-	"metadata-export-search.submit.success": "Η εξαγωγή ξεκίνησε με επιτυχία",
-	"metadata-export-search.tooltip": "Εξαγωγή αποτελεσμάτων αναζήτησης ως CSV",
-	"mydspace.breadcrumbs": "MyDSpace",
-	"mydspace.description": "",
-	"mydspace.general.text-here": "εδώ",
-	"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.status.archived": "Αρχειοθετημένα",
-	"mydspace.status.validation": "Επικύρωση",
-	"mydspace.status.waiting-for-controller": "Αναμονή για τον ελεγκτή",
-	"mydspace.status.workflow": "Ροή εργασιών",
-	"mydspace.status.workspace": "Χώρος εργασίας",
-	"mydspace.title": "MyDSpace",
-	"mydspace.upload.upload-failed": "Σφάλμα κατά τη δημιουργία νέου χώρου εργασίας. Επαληθεύστε το περιεχόμενο που ανεβάσατε πριν δοκιμάσετε ξανά.",
-	"mydspace.upload.upload-failed-manyentries": "Μη επεξεργάσιμο αρχείο. Εντοπίστηκαν πάρα πολλές καταχωρίσεις, αλλά επιτρέπεται μόνο μία για αρχείο.",
-	"mydspace.upload.upload-failed-moreonefile": "Μη διεκπεραιώσιμο αίτημα. Επιτρέπεται μόνο ένα αρχείο.",
-	"mydspace.upload.upload-multiple-successful": "Δημιουργήθηκαν {{qty}} νέα τεκμήρια χώρου εργασίας.",
-	"mydspace.upload.upload-successful": "Δημιουργήθηκε νέο τεκμήριο χώρου εργασίας. Κάντε κλικ {{here}} για να το επεξεργαστείτε.",
-	"mydspace.view-btn": "Προβολή",
-	"nav.browse.header": "Όλο το DSpace",
-	"nav.community-browse.header": "Ανά Κοινότητα",
-	"nav.language": "Εναλλαγή γλώσσας",
-	"nav.login": "Σύνδεση",
-	"nav.logout": "Μενού προφίλ χρήστη και Αποσύνδεση",
-	"nav.main.description": "Κύρια γραμμή πλοήγησης",
-	"nav.mydspace": "MyDSpace",
-	"nav.profile": "Προφίλ",
-	"nav.search": "Αναζήτηση",
-	"nav.statistics.header": "Στατιστικά",
-	"nav.stop-impersonating": "Σταματήστε να υποδύεστε το EPerson",
-	"nav.toggle": "Εναλλαγή πλοήγησης",
-	"nav.user.description": "Γραμμή προφίλ χρήστη",
-	"none.listelement.badge": "Τεκμήριο",
-	"orgunit.listelement.badge": "Οργανωτική Μονάδα",
-	"orgunit.page.city": "Πόλη",
-	"orgunit.page.country": "Χώρα",
-	"orgunit.page.dateestablished": "Ημερομηνία καθορισμού",
-	"orgunit.page.description": "Περιγραφή",
-	"orgunit.page.edit": "Επεξεργαστείτε αυτό το τεκμήριο",
-	"orgunit.page.id": "ID",
-	"orgunit.page.titleprefix": "Μονάδα οργανισμού:",
-	"pagination.next.button": "Επόμενο",
-	"pagination.next.button.disabled.tooltip": "Δεν υπάρχουν άλλες σελίδες αποτελεσμάτων",
-	"pagination.options.description": "Επιλογές σελιδοποίησης",
-	"pagination.previous.button": "Προηγούμενος",
-	"pagination.results-per-page": "Αποτελέσματα ανά σελίδα",
-	"pagination.showing.detail": "{{ range }} of {{ total }}",
-	"pagination.showing.label": "Τώρα δείχνει",
-	"pagination.sort-direction": "Επιλογές ταξινόμησης",
-	"person-relationships.search.results.head": "Αποτελέσματα αναζήτησης ατόμων",
-	"person.listelement.badge": "Πρόσωπο",
-	"person.listelement.no-title": "Δεν βρέθηκε όνομα",
-	"person.orcid.registry.auth": "Εξουσιοδοτήσεις ORCID",
-	"person.orcid.registry.queue": "Ουρά μητρώου ORCID",
-	"person.orcid.sync.setting": "ORCID Ρυθμίσεις συγχρονισμού",
-	"person.page.birthdate": "Ημερομηνία γέννησης",
-	"person.page.edit": "Επεξεργαστείτε αυτό το τεκμήριο",
-	"person.page.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
-	"person.page.firstname": "Ονομα",
-	"person.page.jobtitle": "Τίτλος εργασίας",
-	"person.page.lastname": "Επίθετο",
-	"person.page.link.full": "Εμφάνιση όλων των μεταδεδομένων",
-	"person.page.name": "Ονομα",
-	"person.page.orcid": "ORCID",
-	"person.page.orcid.create": "Δημιουργήστε ένα αναγνωριστικό ORCID",
-	"person.page.orcid.funding-preferences": "Προτιμήσεις χρηματοδότησης",
-	"person.page.orcid.grant-authorizations": "Χορήγηση εξουσιοδοτήσεων",
-	"person.page.orcid.granted-authorizations": "Χορηγημένες εξουσιοδοτήσεις",
-	"person.page.orcid.link": "Συνδεθείτε στο ORCID ID",
-	"person.page.orcid.link.error.message": "Κάτι πήγε στραβά κατά τη σύνδεση του προφίλ με το ORCID. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον διαχειριστή.",
-	"person.page.orcid.link.processing": "Σύνδεση προφίλ με ORCID...",
-	"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. Κάνοντας κλικ στο κουμπί παρακάτω, μπορείτε να συνδέσετε αυτό το προφίλ με έναν λογαριασμό ORCID.",
-	"person.page.orcid.orcid-not-linked-message": "Το αναγνωριστικό ORCID αυτού του προφίλ ({{ orcid }}) δεν έχει συνδεθεί ακόμη σε λογαριασμό στο μητρώο ORCID ή η σύνδεση έχει λήξει.",
-	"person.page.orcid.profile-preferences": "Προτιμήσεις προφίλ",
-	"person.page.orcid.publications-preferences": "Προτιμήσεις δημοσίευσης",
-	"person.page.orcid.remove-orcid-message": "Εάν πρέπει να καταργήσετε το ORCID σας, επικοινωνήστε με τον διαχειριστή του αποθετηρίου",
-	"person.page.orcid.save.preference.changes": "Ρυθμίσεις ενημέρωσης",
-	"person.page.orcid.scope.activities-update": "Προσθέστε/ενημερώστε τις ερευνητικές σας δραστηριότητες",
-	"person.page.orcid.scope.authenticate": "Λάβετε το αναγνωριστικό ORCID σας",
-	"person.page.orcid.scope.person-update": "Προσθέστε/ενημερώστε άλλες πληροφορίες για εσάς",
-	"person.page.orcid.scope.read-limited": "Διαβάστε τις πληροφορίες σας με ορατότητα σε Αξιόπιστα μέρη",
-	"person.page.orcid.sync-fundings.all": "Όλες οι χρηματοδοτήσεις",
-	"person.page.orcid.sync-fundings.disabled": "χρήστες με ειδικές ανάγκες",
-	"person.page.orcid.sync-fundings.mine": "Οι χρηματοδοτήσεις μου",
-	"person.page.orcid.sync-fundings.my_selected": "Επιλεγμένες χρηματοδοτήσεις",
-	"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-publications.all": "Όλες οι δημοσιεύσεις",
-	"person.page.orcid.sync-publications.disabled": "χρήστες με ειδικές ανάγκες",
-	"person.page.orcid.sync-publications.mine": "Οι δημοσιεύσεις μου",
-	"person.page.orcid.sync-publications.my_selected": "Επιλεγμένες δημοσιεύσεις",
-	"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": "Εξωτερικά αναγνωριστικά",
-	"person.page.orcid.sync-queue.description.keywords": "Λέξεις-κλειδιά",
-	"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.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.send": "Συγχρονισμός με το μητρώο ORCID",
-	"person.page.orcid.sync-queue.send.bad-request-error": "Η υποβολή στο ORCID απέτυχε επειδή ο πόρος που στάλθηκε στο μητρώο ORCID δεν είναι έγκυρος",
-	"person.page.orcid.sync-queue.send.conflict-error": "Η υποβολή στο ORCID απέτυχε επειδή ο πόρος υπάρχει ήδη στο μητρώο ORCID",
-	"person.page.orcid.sync-queue.send.error": "Η υποβολή στο 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.unauthorized-error.content": "Κάντε κλικ <a href='{{orcid}}'>εδώ</a> για να εκχωρήσετε ξανά τα απαιτούμενα δικαιώματα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον διαχειριστή",
-	"person.page.orcid.sync-queue.send.unauthorized-error.title": "Η υποβολή στο 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.country.invalid": "Μη έγκυρη 2ψήφια χώρα ISO 3166",
-	"person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Απαιτείται ένα αναγνωριστικό για την αποσαφήνιση των οργανισμών. Τα υποστηριζόμενα αναγνωριστικά είναι αναγνωριστικά GRID, Ringgold, Legal Entity identifiers (LEI) και Crossref Funder Registry",
-	"person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Τα αναγνωριστικά του οργανισμού απαιτούν μια τιμή",
-	"person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Η πηγή ενός από τα αναγνωριστικά οργανισμού δεν είναι έγκυρη. Οι υποστηριζόμενες πηγές είναι οι RINGGOLD, GRID, LEI και FUNDREF",
-	"person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Τα αναγνωριστικά του οργανισμού απαιτούν πηγή",
-	"person.page.orcid.sync-queue.send.validation-error.external-id.required": "Ο πόρος που θα σταλεί απαιτεί τουλάχιστον ένα αναγνωριστικό",
-	"person.page.orcid.sync-queue.send.validation-error.funder.required": "Ζητείται ο χρηματοδότης",
-	"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.organization.name-required": "Το όνομα του οργανισμού είναι υποχρεωτικό",
-	"person.page.orcid.sync-queue.send.validation-error.organization.required": "Η οργάνωση απαιτείται",
-	"person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Η ημερομηνία δημοσίευσης πρέπει να είναι ένα έτος μετά το 1900",
-	"person.page.orcid.sync-queue.send.validation-error.start-date.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.table.header.action": "Ενέργεια",
-	"person.page.orcid.sync-queue.table.header.description": "Περιγραφή",
-	"person.page.orcid.sync-queue.table.header.type": "Τύπος",
-	"person.page.orcid.sync-queue.tooltip.affiliation": "Σχετιζόμενος οργανισμός",
-	"person.page.orcid.sync-queue.tooltip.country": "Χώρα",
-	"person.page.orcid.sync-queue.tooltip.delete": "Καταργήστε αυτήν την καταχώρηση από το μητρώο ORCID",
-	"person.page.orcid.sync-queue.tooltip.education": "Επίπεδο εκπαίδευσης",
-	"person.page.orcid.sync-queue.tooltip.external_ids": "Εξωτερικό αναγνωριστικό",
-	"person.page.orcid.sync-queue.tooltip.insert": "Προσθέστε μια νέα καταχώρηση στο μητρώο ORCID",
-	"person.page.orcid.sync-queue.tooltip.keywords": "Λέξη-κλειδί",
-	"person.page.orcid.sync-queue.tooltip.other_names": "Αλλο όνομα",
-	"person.page.orcid.sync-queue.tooltip.project": "Εργο",
-	"person.page.orcid.sync-queue.tooltip.publication": "Δημοσίευση",
-	"person.page.orcid.sync-queue.tooltip.qualification": "Προσόν",
-	"person.page.orcid.sync-queue.tooltip.researcher_urls": "Διεύθυνση URL ερευνητή",
-	"person.page.orcid.sync-queue.tooltip.update": "Ενημερώστε αυτήν την καταχώρηση στο μητρώο ORCID",
-	"person.page.orcid.synchronization-mode": "Λειτουργία συγχρονισμού",
-	"person.page.orcid.synchronization-mode-funding-message": "Επιλέξτε εάν θα στείλετε τις συνδεδεμένες οντότητες του Έργου στη λίστα πληροφοριών χρηματοδότησης της εγγραφής σας ORCID.",
-	"person.page.orcid.synchronization-mode-message": "Επιλέξτε πώς θέλετε να γίνει ο συγχρονισμός με το ORCID. Οι επιλογές περιλαμβάνουν \"Μη αυτόματα\" (πρέπει να στείλετε τα δεδομένα σας στο ORCID με μη αυτόματο τρόπο) ή \"Μαζί\" (το σύστημα θα στείλει τα δεδομένα σας στο ORCID μέσω προγραμματισμένου σεναρίου).",
-	"person.page.orcid.synchronization-mode-profile-message": "Επιλέξτε εάν θα στείλετε τα βιογραφικά σας δεδομένα ή τα προσωπικά σας αναγνωριστικά στο αρχείο ORCID.",
-	"person.page.orcid.synchronization-mode-publication-message": "Επιλέξτε εάν θα στείλετε τις συνδεδεμένες οντότητες Δημοσιεύσεών σας στη λίστα έργων της εγγραφής σας ORCID.",
-	"person.page.orcid.synchronization-mode.batch": "Σύνολο παραγωγής",
-	"person.page.orcid.synchronization-mode.label": "Λειτουργία συγχρονισμού",
-	"person.page.orcid.synchronization-mode.manual": "Εγχειρίδιο",
-	"person.page.orcid.synchronization-settings-update.error": "Η ενημέρωση των ρυθμίσεων συγχρονισμού απέτυχε",
-	"person.page.orcid.synchronization-settings-update.success": "Οι ρυθμίσεις συγχρονισμού ενημερώθηκαν με επιτυχία",
-	"person.page.orcid.unlink": "Αποσύνδεση από το ORCID",
-	"person.page.orcid.unlink.error": "Παρουσιάστηκε σφάλμα κατά την αποσύνδεση μεταξύ του προφίλ και του μητρώου ORCID. Προσπάθησε ξανά",
-	"person.page.orcid.unlink.processing": "Επεξεργασία...",
-	"person.page.orcid.unlink.success": "Η αποσύνδεση μεταξύ του προφίλ και του μητρώου ORCID ήταν επιτυχής",
-	"person.page.staffid": "Ταυτότητα προσωπικού",
-	"person.page.titleprefix": "Πρόσωπο:",
-	"person.search.results.head": "Αποτελέσματα αναζήτησης ατόμων",
-	"person.search.title": "Αναζήτηση Προσώπων",
-	"process.detail.arguments": "Παράμετροι",
-	"process.detail.arguments.empty": "Αυτή η διαδικασία δεν περιέχει παραμέτρους",
-	"process.detail.back": "Επιστροφή",
-	"process.detail.create": "Δημιουργήστε παρόμοια διαδικασία",
-	"process.detail.end-time": "Ώρα λήξης",
-	"process.detail.logs.button": "Ανάκτηση εξόδου διαδικασίας",
-	"process.detail.logs.loading": "Ανάκτηση",
-	"process.detail.logs.none": "Αυτή η διαδικασία δεν έχει κάποιο αποτέλεσμα εξόδου",
-	"process.detail.output": "Έξοδος διαδικασίας",
-	"process.detail.output-files": "Αρχεία εξόδου",
-	"process.detail.output-files.empty": "Αυτή η διαδικασία δεν περιέχει αρχεία εξόδου",
-	"process.detail.script": "Γραφή",
-	"process.detail.start-time": "Ωρα έναρξης",
-	"process.detail.status": "Κατάσταση",
-	"process.detail.title": "Διαδικασία: {{ id }} - {{ name }}",
-	"process.new.breadcrumbs": "Δημιουργήστε μια νέα διαδικασία",
-	"process.new.cancel": "Ακύρωση",
-	"process.new.header": "Δημιουργήστε μια νέα διαδικασία",
-	"process.new.notification.error.content": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία αυτής της διαδικασίας",
-	"process.new.notification.error.title": "Λάθος",
-	"process.new.notification.success.content": "Η διαδικασία δημιουργήθηκε με επιτυχία",
-	"process.new.notification.success.title": "Επιτυχία",
-	"process.new.parameter.file.required": "Επιλέξτε ένα αρχείο",
-	"process.new.parameter.file.upload-button": "Επιλογή αρχείου...",
-	"process.new.parameter.required.missing": "Απαιτούνται οι ακόλουθες παράμετροι αλλά εξακολουθούν να λείπουν:",
-	"process.new.parameter.string.required": "Απαιτείται τιμή παραμέτρου",
-	"process.new.parameter.type.file": "αρχείο",
-	"process.new.parameter.type.value": "τιμή",
-	"process.new.select-parameters": "Παράμετροι",
-	"process.new.select-script": "Script",
-	"process.new.select-script.placeholder": "Επιλέξτε ένα Script...",
-	"process.new.select-script.required": "Απαιτείται Script",
-	"process.new.submit": "Αποθήκευση",
-	"process.new.title": "Δημιουργήστε μια νέα διαδικασία",
-	"process.overview.breadcrumbs": "Επισκόπηση διαδικασιών",
-	"process.overview.new": "Νέο",
-	"process.overview.table.finish": "Ώρα λήξης (UTC)",
-	"process.overview.table.id": "Αναγνωριστικό διαδικασίας",
-	"process.overview.table.name": "Ονομα",
-	"process.overview.table.start": "Ώρα έναρξης (UTC)",
-	"process.overview.table.status": "Κατάσταση",
-	"process.overview.table.user": "Χρήστης",
-	"process.overview.title": "Επισκόπηση διαδικασιών",
-	"profile.breadcrumbs": "Ανανέωση προφίλ",
-	"profile.card.identify": "Αναγνωρίζω",
-	"profile.card.researcher": "Προφίλ ερευνητή",
-	"profile.card.security": "Ασφάλεια",
-	"profile.form.submit": "Αποθήκευση",
-	"profile.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.error.password-length": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
-	"profile.security.form.info": "Προαιρετικά, μπορείτε να εισαγάγετε έναν νέο κωδικό πρόσβασης στο παρακάτω πλαίσιο και να τον επιβεβαιώσετε πληκτρολογώντας τον ξανά στο δεύτερο πλαίσιο. Θα πρέπει να αποτελείται από τουλάχιστον έξι χαρακτήρες.",
-	"profile.security.form.label.password": "Κωδικός πρόσβασης",
-	"profile.security.form.label.passwordrepeat": "Πληκτρολογήστε ξανά για επιβεβαίωση",
-	"profile.security.form.notifications.error.not-long-enough": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
-	"profile.security.form.notifications.error.not-same": "Οι παρεχόμενοι κωδικοί πρόσβασης δεν είναι οι ίδιοι.",
-	"profile.security.form.notifications.error.title": "Σφάλμα αλλαγής κωδικών πρόσβασης",
-	"profile.security.form.notifications.success.content": "Οι αλλαγές σας στον κωδικό πρόσβασης αποθηκεύτηκαν.",
-	"profile.security.form.notifications.success.title": "Ο κωδικός πρόσβασης αποθηκεύτηκε",
-	"profile.special.groups.head": "Εξουσιοδότηση ειδικών ομάδων στις οποίες ανήκετε",
-	"profile.title": "Ανανέωση προφίλ",
-	"project-relationships.search.results.head": "Αποτελέσματα αναζήτησης έργου",
-	"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": "Αποτελέσματα αναζήτησης έργου",
-	"publication-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.search.title": "Αναζήτηση δημοσιεύσεων",
-	"register-email.title": "Εγγραφή νέου χρήστη",
-	"register-page.create-profile.header": "Δημιουργία Προφίλ",
-	"register-page.create-profile.identification.contact": "Τηλέφωνο Επικοινωνίας",
-	"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.header": "Αναγνωριστικό",
-	"register-page.create-profile.identification.language": "Γλώσσα",
-	"register-page.create-profile.identification.last-name": "Επίθετο *",
-	"register-page.create-profile.identification.last-name.error": "Παρακαλώ συμπληρώστε ένα Επώνυμο",
-	"register-page.create-profile.security.error.empty-password": "Εισαγάγετε έναν κωδικό πρόσβασης στο παρακάτω πλαίσιο.",
-	"register-page.create-profile.security.error.matching-passwords": "Οι κωδικοί δεν ταιριάζουν.",
-	"register-page.create-profile.security.error.password-length": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
-	"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.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.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου *",
-	"register-page.registration.email.error.pattern": "Συμπληρώστε μια έγκυρη διεύθυνση email",
-	"register-page.registration.email.error.required": "Συμπληρώστε μια διεύθυνση email",
-	"register-page.registration.email.hint": "Αυτή η διεύθυνση θα επαληθευτεί και θα χρησιμοποιηθεί ως το όνομα σύνδεσής σας.",
-	"register-page.registration.error.content": "Παρουσιάστηκε σφάλμα κατά την εγγραφή της ακόλουθης διεύθυνσης email: {{ email }}",
-	"register-page.registration.error.head": "Σφάλμα κατά την προσπάθεια εγγραφής email",
-	"register-page.registration.header": "Εγγραφή νέου χρήστη",
-	"register-page.registration.info": "Καταχωρίστε έναν λογαριασμό για να εγγραφείτε σε συλλογές για ενημερώσεις email και υποβάλετε νέα τεκμήρια στο DSpace.",
-	"register-page.registration.submit": "Εγγραφή",
-	"register-page.registration.success.content": "Έχει σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση {{ email }} που περιέχει μια ειδική διεύθυνση URL και περαιτέρω οδηγίες.",
-	"register-page.registration.success.head": "Το email επαλήθευσης στάλθηκε",
-	"relationships.add.error.relationship-type.content": "Δεν βρέθηκε κατάλληλη αντιστοίχιση για τον τύπο σχέσης {{ type }} μεταξύ των δύο τεκμηρίων",
-	"relationships.add.error.server.content": "Ο διακομιστής επέστρεψε ένα σφάλμα",
-	"relationships.add.error.title": "Δεν είναι δυνατή η προσθήκη σχέσης",
-	"relationships.isAuthorOf": "Συγγραφείς",
-	"relationships.isAuthorOf.OrgUnit": "Συγγραφείς (οργανωτικές μονάδες)",
-	"relationships.isAuthorOf.Person": "Συγγραφείς (πρόσωπα)",
-	"relationships.isContributorOf": "Συντελεστής",
-	"relationships.isContributorOf.OrgUnit": "Συντελεστής (Οργανωτική Μονάδα)",
-	"relationships.isContributorOf.Person": "Συντελεστής",
-	"relationships.isFundingAgencyOf.OrgUnit": "Χρηματοδότης",
-	"relationships.isIssueOf": "Θέματα περιοδικών",
-	"relationships.isJournalIssueOf": "Τεύχος περιοδικού",
-	"relationships.isJournalOf": "περιοδικά",
-	"relationships.isOrgUnitOf": "Μονάδες οργανισμού",
-	"relationships.isPersonOf": "Συγγραφείς",
-	"relationships.isProjectOf": "Ερευνητικά έργα",
-	"relationships.isPublicationOf": "Δημοσιεύσεις",
-	"relationships.isPublicationOfJournalIssue": "Άρθρα",
-	"relationships.isSingleJournalOf": "Εφημερίδα",
-	"relationships.isSingleVolumeOf": "Τόμος περιοδικού",
-	"relationships.isVolumeOf": "Τόμοι περιοδικών",
-	"repository.image.logo": "Λογότυπο αποθετηρίου",
-	"repository.title.prefix": "DSpace Angular ::",
-	"repository.title.prefixDSpace": "DSpace Angular ::",
-	"researcher.profile.action.processing": "Επεξεργασία...",
-	"researcher.profile.associated": "Σχετικό προφίλ ερευνητή",
-	"researcher.profile.change-visibility.fail": "Παρουσιάστηκε ένα μη αναμενόμενο σφάλμα κατά την αλλαγή της προβολής του προφίλ",
-	"researcher.profile.create.fail": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία του προφίλ ερευνητή",
-	"researcher.profile.create.new": "Δημιουργία νέου",
-	"researcher.profile.create.success": "Το προφίλ ερευνητή δημιουργήθηκε με επιτυχία",
-	"researcher.profile.delete": "Διαγραφή",
-	"researcher.profile.expose": "Εκθέτω",
-	"researcher.profile.hide": "Κρύβω",
-	"researcher.profile.not.associated": "Το προφίλ ερευνητή δεν έχει συσχετιστεί ακόμη",
-	"researcher.profile.private.visibility": "ΙΔΙΩΤΙΚΟ",
-	"researcher.profile.public.visibility": "ΔΗΜΟΣΙΟ",
-	"researcher.profile.status": "Κατάσταση:",
-	"researcher.profile.view": "Προβολή",
-	"researcherprofile.claim.not-authorized": "Δεν είστε εξουσιοδοτημένοι να διεκδικήσετε αυτό το τεκμήριο. Για περισσότερες λεπτομέρειες επικοινωνήστε με τους διαχειριστές.",
-	"researcherprofile.error.claim.body": "Παρουσιάστηκε σφάλμα κατά την αξίωση του προφίλ, δοκιμάστε ξανά αργότερα",
-	"researcherprofile.error.claim.title": "Λάθος",
-	"researcherprofile.success.claim.body": "Το προφίλ διεκδικήθηκε με επιτυχία",
-	"researcherprofile.success.claim.title": "Επιτυχία",
-	"resource-policies.add.button": "Προσθήκη",
-	"resource-policies.add.for.": "Προσθέστε μια νέα πολιτική",
-	"resource-policies.add.for.bitstream": "Προσθέστε μια νέα πολιτική αρχείου",
-	"resource-policies.add.for.bundle": "Προσθέστε μια νέα πολιτική φακέλου/πακέτου",
-	"resource-policies.add.for.collection": "Προσθέστε μια νέα πολιτική συλλογής",
-	"resource-policies.add.for.community": "Προσθέστε μια νέα πολιτική Κοινότητας",
-	"resource-policies.add.for.item": "Προσθέστε μια νέα πολιτική αντικειμένου",
-	"resource-policies.create.page.failure.content": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία της πολιτικής πόρων.",
-	"resource-policies.create.page.heading": "Δημιουργία νέας πολιτικής πόρων για",
-	"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.failure.content": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία της πολιτικής πόρων.",
-	"resource-policies.edit.page.heading": "Επεξεργασία πολιτικής πόρων",
-	"resource-policies.edit.page.other-failure.content": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία της πολιτικής πόρων. Ο στόχος (ePerson ή ομάδα) ενημερώθηκε με επιτυχία.",
-	"resource-policies.edit.page.success.content": "Επιτυχής λειτουργία",
-	"resource-policies.edit.page.target-failure.content": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία του στόχου (ePerson ή ομάδα) της πολιτικής πόρων.",
-	"resource-policies.edit.page.title": "Επεξεργασία πολιτικής πόρων",
-	"resource-policies.form.action-type.label": "Επιλέξτε τον τύπο ενέργειας",
-	"resource-policies.form.action-type.required": "Πρέπει να επιλέξετε την ενέργεια της πολιτικής πόρων.",
-	"resource-policies.form.date.end.label": "Ημερομηνία λήξης",
-	"resource-policies.form.date.start.label": "Ημερομηνία έναρξης",
-	"resource-policies.form.description.label": "Περιγραφή",
-	"resource-policies.form.eperson-group-list.label": "Το άτομο ή η ομάδα που θα λάβει την άδεια",
-	"resource-policies.form.eperson-group-list.modal.close": "Εντάξει",
-	"resource-policies.form.eperson-group-list.modal.header": "Δεν είναι δυνατή η αλλαγή τύπου",
-	"resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Δεν είναι δυνατή η αντικατάσταση μιας ομάδας με ένα ePerson.",
-	"resource-policies.form.eperson-group-list.modal.text1.toGroup": "Δεν είναι δυνατή η αντικατάσταση ενός ePerson με μια ομάδα.",
-	"resource-policies.form.eperson-group-list.modal.text2": "Διαγράψτε την τρέχουσα πολιτική πόρων και δημιουργήστε μια νέα με τον επιθυμητό τύπο.",
-	"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.name.label": "Ονομα",
-	"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": "EPson",
-	"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.collection": "Πολιτικές για τη συλλογή",
-	"resource-policies.table.headers.title.for.community": "Πολιτικές για την Κοινότητα",
-	"resource-policies.table.headers.title.for.item": "Πολιτικές για το τεκμήριο",
-	"search.breadcrumbs": "Αναζήτηση",
-	"search.description": null,
-	"search.filters.applied.f.author": "Συγγραφέας",
-	"search.filters.applied.f.birthDate.max": "Ημερομηνία λήξης γέννησης",
-	"search.filters.applied.f.birthDate.min": "Ημερομηνία γέννησης",
-	"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.jobTitle": "Τίτλος εργασίας",
-	"search.filters.applied.f.namedresourcetype": "Κατάσταση",
-	"search.filters.applied.f.subject": "Θέμα",
-	"search.filters.applied.f.submitter": "Αναρτητής",
-	"search.filters.applied.f.withdrawn": "Διαγραμμένο",
-	"search.filters.discoverable.false": "Ναί",
-	"search.filters.discoverable.true": "Οχι",
-	"search.filters.entityType.JournalIssue": "Τεύχος περιοδικού",
-	"search.filters.entityType.JournalVolume": "Τόμος περιοδικού",
-	"search.filters.entityType.OrgUnit": "Οργανωτική Μονάδα",
-	"search.filters.filter.author.head": "Συγγραφέας",
-	"search.filters.filter.author.label": "Αναζήτηση ονόματος συγγραφέα",
-	"search.filters.filter.author.placeholder": "Όνομα συγγραφέα",
-	"search.filters.filter.birthDate.head": "Ημερομηνία γέννησης",
-	"search.filters.filter.birthDate.label": "Αναζήτηση ημερομηνίας γέννησης",
-	"search.filters.filter.birthDate.placeholder": "Ημερομηνία γέννησης",
-	"search.filters.filter.collapse": "Σύμπτυξη φίλτρου",
-	"search.filters.filter.creativeDatePublished.head": "Ημερομηνία δημοσίευσης",
-	"search.filters.filter.creativeDatePublished.label": "Δημοσίευση ημερομηνίας αναζήτησης",
-	"search.filters.filter.creativeDatePublished.placeholder": "Ημερομηνία δημοσίευσης",
-	"search.filters.filter.creativeWorkEditor.head": "Συντάκτης",
-	"search.filters.filter.creativeWorkEditor.label": "Επεξεργαστής αναζήτησης",
-	"search.filters.filter.creativeWorkEditor.placeholder": "Συντάκτης",
-	"search.filters.filter.creativeWorkKeywords.head": "Θέμα",
-	"search.filters.filter.creativeWorkKeywords.label": "Αναζήτηση θέματος",
-	"search.filters.filter.creativeWorkKeywords.placeholder": "Θέμα",
-	"search.filters.filter.creativeWorkPublisher.head": "Εκδότης",
-	"search.filters.filter.creativeWorkPublisher.label": "Αναζήτηση εκδότη",
-	"search.filters.filter.creativeWorkPublisher.placeholder": "Εκδότης",
-	"search.filters.filter.dateIssued.head": "Ημερομηνία",
-	"search.filters.filter.dateIssued.max.label": "Τέλος",
-	"search.filters.filter.dateIssued.max.placeholder": "Μέγιστη ημερομηνία",
-	"search.filters.filter.dateIssued.min.label": "Αρχή",
-	"search.filters.filter.dateIssued.min.placeholder": "Ελάχιστη ημερομηνία",
-	"search.filters.filter.dateSubmitted.head": "Ημερομηνία υποβολής",
-	"search.filters.filter.dateSubmitted.label": "Ημερομηνία υποβολής αναζήτησης",
-	"search.filters.filter.dateSubmitted.placeholder": "Ημερομηνία υποβολής",
-	"search.filters.filter.discoverable.head": "Μη ανακαλύψιμο",
-	"search.filters.filter.entityType.head": "Τύπος αντικειμένου",
-	"search.filters.filter.entityType.label": "Αναζήτηση τύπου αντικειμένου",
-	"search.filters.filter.entityType.placeholder": "Τύπος αντικειμένου",
-	"search.filters.filter.expand": "Αναπτύξτε το φίλτρο",
-	"search.filters.filter.has_content_in_original_bundle.head": "Έχει αρχεία",
-	"search.filters.filter.itemtype.head": "Τύπος",
-	"search.filters.filter.itemtype.label": "Τύπος αναζήτησης",
-	"search.filters.filter.itemtype.placeholder": "Τύπος",
-	"search.filters.filter.jobTitle.head": "Τίτλος εργασίας",
-	"search.filters.filter.jobTitle.label": "Αναζήτηση τίτλου εργασίας",
-	"search.filters.filter.jobTitle.placeholder": "Τίτλος εργασίας",
-	"search.filters.filter.knowsLanguage.head": "Γνωστή γλώσσα",
-	"search.filters.filter.knowsLanguage.label": "Αναζήτηση γνωστής γλώσσας",
-	"search.filters.filter.knowsLanguage.placeholder": "Γνωστή γλώσσα",
-	"search.filters.filter.namedresourcetype.head": "Κατάσταση",
-	"search.filters.filter.namedresourcetype.label": "Κατάσταση αναζήτησης",
-	"search.filters.filter.namedresourcetype.placeholder": "Κατάσταση",
-	"search.filters.filter.objectpeople.head": "Ανθρωποι",
-	"search.filters.filter.objectpeople.label": "Αναζήτηση ατόμων",
-	"search.filters.filter.objectpeople.placeholder": "Ανθρωποι",
-	"search.filters.filter.organizationAddressCountry.head": "Χώρα",
-	"search.filters.filter.organizationAddressCountry.label": "Αναζήτηση χώρας",
-	"search.filters.filter.organizationAddressCountry.placeholder": "Χώρα",
-	"search.filters.filter.organizationAddressLocality.head": "Πόλη",
-	"search.filters.filter.organizationAddressLocality.label": "Αναζήτηση πόλης",
-	"search.filters.filter.organizationAddressLocality.placeholder": "Πόλη",
-	"search.filters.filter.organizationFoundingDate.head": "Ημερομηνία ίδρυσης",
-	"search.filters.filter.organizationFoundingDate.label": "Ημερομηνία ίδρυσης αναζήτησης",
-	"search.filters.filter.organizationFoundingDate.placeholder": "Ημερομηνία ίδρυσης",
-	"search.filters.filter.scope.head": "Πεδίο εφαρμογής",
-	"search.filters.filter.scope.label": "Φίλτρο εύρους αναζήτησης",
-	"search.filters.filter.scope.placeholder": "Φίλτρο εύρους",
-	"search.filters.filter.show-less": "Δείτε λιγότερα",
-	"search.filters.filter.show-more": "Δείτε περισσότερα",
-	"search.filters.filter.subject.head": "Θέμα",
-	"search.filters.filter.subject.label": "Αναζήτηση θέματος",
-	"search.filters.filter.subject.placeholder": "Θέμα",
-	"search.filters.filter.submitter.head": "Υποβάλλων",
-	"search.filters.filter.submitter.label": "Αναζήτηση υποβάλλοντος",
-	"search.filters.filter.submitter.placeholder": "Υποβάλλων",
-	"search.filters.filter.withdrawn.head": "Διαγραμμένο",
-	"search.filters.has_content_in_original_bundle.false": "Οχι",
-	"search.filters.has_content_in_original_bundle.true": "Ναί",
-	"search.filters.head": "Φίλτρα",
-	"search.filters.reset": "Επαναφορά φίλτρων",
-	"search.filters.search.submit": "υποβάλλουν",
-	"search.filters.withdrawn.false": "Οχι",
-	"search.filters.withdrawn.true": "Ναί",
-	"search.form.scope.all": "Όλο το DSpace",
-	"search.form.search": "Αναζήτηση",
-	"search.form.search_dspace": "Όλο το αποθετήριο",
-	"search.results.empty": "Η αναζήτηση δεν επέστρεψε κανένα αποτέλεσμα.",
-	"search.results.head": "Αποτελέσματα αναζήτησης",
-	"search.results.no-results": "Η αναζήτηση δεν επέστρεψε κανένα αποτέλεσμα. Δυσκολεύεστε να βρείτε αυτό που ψάχνετε; Δοκιμάστε να βάλετε",
-	"search.results.no-results-link": "κάποια αποσπάσματα",
-	"search.results.view-result": "Προβολή",
-	"search.search-form.placeholder": "Αναζήτηση στο αποθετήριο...",
-	"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.switch-configuration.title": "προβολή",
-	"search.title": "Αναζήτηση",
-	"search.view-switch.show-detail": "Δείξε λεπτομέρεια",
-	"search.view-switch.show-grid": "Εμφάνιση ως πλέγμα",
-	"search.view-switch.show-list": "Εμφάνιση ως λίστα",
-	"sorting.ASC": "Αύξουσα",
-	"sorting.DESC": "Φθίνων",
-	"sorting.dc.date.accessioned.ASC": "Ημερομηνία πρόσβασης Αύξουσα",
-	"sorting.dc.date.accessioned.DESC": "Ημερομηνία πρόσβασης Φθίνουσα",
-	"sorting.dc.date.issued.ASC": "Ημερομηνία Διάθεσης Αύξουσα",
-	"sorting.dc.date.issued.DESC": "Ημερομηνία Διάθεσης Φθίνουσα",
-	"sorting.dc.title.ASC": "Τίτλος Αύξουσα",
-	"sorting.dc.title.DESC": "Τίτλος Φθίνουσα",
-	"sorting.lastModified.ASC": "Τελευταία τροποποίηση Αύξουσα",
-	"sorting.lastModified.DESC": "Τελευταία τροποποίηση Φθίνουσα",
-	"sorting.score.ASC": "Λιγότερο σχετικό",
-	"sorting.score.DESC": "Το πιο σχετικό",
-	"statistics.breadcrumbs": "Στατιστικά",
-	"statistics.header": "Στατιστικά στοιχεία για {{ range }}",
-	"statistics.page.no-data": "Δεν υπάρχουν διαθέσιμα δεδομένα",
-	"statistics.table.header.views": "Προβολές",
-	"statistics.table.no-data": "Δεν υπάρχουν διαθέσιμα δεδομένα",
-	"statistics.table.title.TopCities": "Κορυφαίες προβολές ανά πόλη",
-	"statistics.table.title.TopCountries": "Κορυφαίες προβολές ανά χώρα",
-	"statistics.table.title.TotalDownloads": "Λήψεις αρχείων",
-	"statistics.table.title.TotalVisits": "Συνολικές επισκέψεις",
-	"statistics.table.title.TotalVisitsPerMonth": "Συνολικές επισκέψεις ανά μήνα",
-	"statistics.title": "Στατιστικά",
-	"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.pending-changes": "Μη αποθηκευμένες αλλαγές",
-	"submission.general.info.saved": "Αποθηκεύτηκε",
-	"submission.general.save": "Αποθήκευση",
-	"submission.general.save-later": "Αποθήκευση για αργότερα",
-	"submission.import-external.back-to-my-dspace": "Επιστροφή στο χώρο μου",
-	"submission.import-external.page.hint": "Εισαγάγετε ένα ερώτημα παραπάνω για να βρείτε τεκμήρια από τον ιστό για εισαγωγή στο DSpace.",
-	"submission.import-external.page.title": "Εισαγωγή μεταδεδομένων από εξωτερική πηγή",
-	"submission.import-external.preview.button.import": "Έναρξη υποβολής",
-	"submission.import-external.preview.error.import.body": "Παρουσιάζεται σφάλμα κατά τη διαδικασία εισαγωγής εισαγωγής εξωτερικής πηγής.",
-	"submission.import-external.preview.error.import.title": "Σφάλμα υποβολής",
-	"submission.import-external.preview.subtitle": "Τα παρακάτω μεταδεδομένα εισήχθησαν από εξωτερική πηγή. Θα είναι προσυμπληρωμένο όταν ξεκινήσετε την υποβολή.",
-	"submission.import-external.preview.title": "Προεπισκόπηση τεκμηρίου",
-	"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.title.Publication": "Προεπισκόπηση δημοσίευσης",
-	"submission.import-external.preview.title.none": "Προεπισκόπηση τεκμηρίου",
-	"submission.import-external.search.button": "Αναζήτηση",
-	"submission.import-external.search.button.hint": "Γράψτε μερικές λέξεις για αναζήτηση",
-	"submission.import-external.search.placeholder": "Αναζήτηση στην εξωτερική πηγή",
-	"submission.import-external.search.source.hint": "Επιλέξτε μια εξωτερική πηγή",
-	"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.epo": "Ευρωπαϊκό Γραφείο Διπλωμάτων Ευρεσιτεχνίας (EPO)",
-	"submission.import-external.source.lcname": "Βιβλιοθήκη Ονομάτων του Κογκρέσου (Library of Congress Names)",
-	"submission.import-external.source.loading": "Φόρτωση ...",
-	"submission.import-external.source.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
-	"submission.import-external.source.orcid": "ORCID",
-	"submission.import-external.source.orcidWorks": "ORCID",
-	"submission.import-external.source.pubmed": "Δημοσιεύτηκε",
-	"submission.import-external.source.pubmedeu": "Pubmed Europe",
-	"submission.import-external.source.scielo": "SciELO",
-	"submission.import-external.source.scopus": "Scopus",
-	"submission.import-external.source.sherpaJournal": "Περιοδικά SHERPA",
-	"submission.import-external.source.sherpaJournalIssn": "Περιοδικά SHERPA από το ISSN",
-	"submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-	"submission.import-external.source.vufind": "VuFind",
-	"submission.import-external.source.wos": "Web Of Science",
-	"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.sections.accesses.form.access-condition-hint": "Επιλέξτε μια συνθήκη πρόσβασης που θα εφαρμοστεί στο τεκμήριο μετά την κατάθεσή του",
-	"submission.sections.accesses.form.access-condition-label": "Τύπος συνθήκης πρόσβασης",
-	"submission.sections.accesses.form.date-required": "Απαιτείται ημερομηνία.",
-	"submission.sections.accesses.form.date-required-from": "Απαιτείται πρόσβαση επιχορήγησης από την ημερομηνία.",
-	"submission.sections.accesses.form.date-required-until": "Απαιτείται παραχώρηση πρόσβασης μέχρι την ημερομηνία.",
-	"submission.sections.accesses.form.discoverable-description": "Όταν είναι επιλεγμένο, αυτό το τεκμήριο θα μπορεί να εντοπιστεί στην αναζήτηση/περιήγηση. Όταν δεν είναι επιλεγμένο, το τεκμήριο θα είναι διαθέσιμο μόνο μέσω απευθείας συνδέσμου και δεν θα εμφανίζεται ποτέ στην αναζήτηση/περιήγηση.",
-	"submission.sections.accesses.form.discoverable-label": "Ανακαλύψιμο",
-	"submission.sections.accesses.form.from-hint": "Επιλέξτε την ημερομηνία από την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
-	"submission.sections.accesses.form.from-label": "Παραχώρηση πρόσβασης από",
-	"submission.sections.accesses.form.from-placeholder": "Από",
-	"submission.sections.accesses.form.group-label": "Ομάδα",
-	"submission.sections.accesses.form.group-required": "Απαιτείται ομάδα.",
-	"submission.sections.accesses.form.until-hint": "Επιλέξτε την ημερομηνία μέχρι την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
-	"submission.sections.accesses.form.until-label": "Παραχώρηση πρόσβασης μέχρι",
-	"submission.sections.accesses.form.until-placeholder": "Μέχρι",
-	"submission.sections.ccLicense.change": "Αλλάξτε τον τύπο της άδειας σας…",
-	"submission.sections.ccLicense.confirmation": "Παραχωρώ την παραπάνω άδεια",
-	"submission.sections.ccLicense.link": "Έχετε επιλέξει την ακόλουθη άδεια χρήσης:",
-	"submission.sections.ccLicense.none": "Δεν υπάρχουν διαθέσιμες άδειες",
-	"submission.sections.ccLicense.option.select": "Επιλέξτε μια επιλογή…",
-	"submission.sections.ccLicense.select": "Επιλέξτε έναν τύπο άδειας…",
-	"submission.sections.ccLicense.type": "Τύπος άδειας",
-	"submission.sections.describe.relationship-lookup.close": "Κλείσιμο",
-	"submission.sections.describe.relationship-lookup.external-source.added": "Προστέθηκε με επιτυχία η τοπική καταχώριση στην επιλογή",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Εισαγωγή απομακρυσμένου εξοπλισμού",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Εισαγωγή απομακρυσμένης εκδήλωσης",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Εισαγωγή απομακρυσμένης χρηματοδότησης",
-	"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.Journal": "Εισαγωγή απομακρυσμένου περιοδικού",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Εισαγωγή απομακρυσμένης μονάδας οργανισμού",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Εισαγωγή απομακρυσμένου διπλώματος ευρεσιτεχνίας",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Εισαγωγή απομακρυσμένου ατόμου",
-	"submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Εισαγωγή απομακρυσμένου προϊόντος",
-	"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-button-title.isAuthorOfPublication": "Εισαγωγή απομακρυσμένου συγγραφέα",
-	"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-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 Issue.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.Journal Volume.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.title": "Εισαγωγή απομακρυσμένου περιοδικού",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Εισαγωγή authority",
-	"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.arxiv": "Εισαγωγή από το arXiv",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Εισαγωγή από LC Name",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Εισαγωγή από ORCID",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Εισαγωγή από το PubMed",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Εισαγωγή από το Sherpa Journal",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Εισαγωγή από τον Sherpa Publisher",
-	"submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Εισαγωγή",
-	"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.isAuthorOfPublication.title": "Εισαγωγή απομακρυσμένου συντάκτη",
-	"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.select": "Επιλέξτε ένα τοπικό αποτέλεσμα (ταίριασμα):",
-	"submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Αποθηκεύστε μια νέα παραλλαγή ονόματος",
-	"submission.sections.describe.relationship-lookup.name-variant.notification.content": "Θέλετε να αποθηκεύσετε το \"{{ value }}\" ως παραλλαγή ονόματος για αυτό το άτομο, ώστε εσείς και άλλοι να το χρησιμοποιήσετε ξανά για μελλοντικές υποβολές; Εάν δεν το κάνετε, μπορείτε ακόμα να το χρησιμοποιήσετε για αυτήν την υποβολή.",
-	"submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Χρησιμοποιήστε μόνο για αυτήν την υποβολή",
-	"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.search-tab.tab-title.DataFile": "Αρχεία τοπικών δεδομένων ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Τοπικά πακέτα δεδομένων ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Τοπικά περιοδικά ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Θέματα τοπικών περιοδικών ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Τόμοι τοπικών περιοδικών ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Τοπικές οργανωτικές μονάδες ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Τοπικοί συντάκτες ({{ 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.arxiv": "arXiv ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Τοπικοί συντάκτες ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Αναζήτηση για Οργανωτικές Μονάδες",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Χρηματοδότης του Έργου",
-	"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.isJournalIssueOfPublication": "Θέματα τοπικών περιοδικών ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Τοπικά περιοδικά ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Τόμοι τοπικών περιοδικών ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Εργα",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Ονόματα LC ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Περιοδικά Sherpa ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
-	"submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Εναλλαγή αναπτυσσόμενου μενού",
-	"submission.sections.describe.relationship-lookup.selected": "Επιλεγμένα {{ size }} τεκμήρια",
-	"submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Η επιλογή σας αυτή τη στιγμή είναι κενή.",
-	"submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Αναζήτηση...",
-	"submission.sections.describe.relationship-lookup.selection-tab.settings": "Ρυθμίσεις",
-	"submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Τρέχουσα επιλογή ({{ count }})",
-	"submission.sections.describe.relationship-lookup.selection-tab.title": "Αποτελέσματα αναζήτησης",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Επιλεγμένα Αρχεία Δεδομένων",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Επιλεγμένα πακέτα δεδομένων",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Επιλεγμένα περιοδικά",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Επιλεγμένο θέμα",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Επιλεγμένος τόμος περιοδικού",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Επιλεγμένες μονάδες οργανισμού",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Επιλεγμένοι Συγγραφείς",
-	"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.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.isAuthorOfPublication": "Επιλεγμένοι Συγγραφείς",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Επιλεγμένη Μονάδα Οργανισμού",
-	"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.isJournalIssueOfPublication": "Επιλεγμένος τομος",
-	"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.isProjectOfPublication": "Εργο",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Αποτελέσματα αναζήτησης",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
-	"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.pubmed": "Αποτελέσματα αναζήτησης",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Αποτελέσματα αναζήτησης",
-	"submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Αποτελέσματα αναζήτησης",
-	"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.wos": "Αποτελέσματα αναζήτησης",
-	"submission.sections.describe.relationship-lookup.title.DataFile": "Αρχεία δεδομένων",
-	"submission.sections.describe.relationship-lookup.title.DataPackage": "Πακέτα δεδομένων",
-	"submission.sections.describe.relationship-lookup.title.Funding Agency": "Οργανισμός Χρηματοδότησης",
-	"submission.sections.describe.relationship-lookup.title.JournalIssue": "Θέματα περιοδικών",
-	"submission.sections.describe.relationship-lookup.title.JournalVolume": "Τόμοι περιοδικών",
-	"submission.sections.describe.relationship-lookup.title.OrgUnit": "Οργανωτικές Μονάδες",
-	"submission.sections.describe.relationship-lookup.title.Person": "Συγγραφείς",
-	"submission.sections.describe.relationship-lookup.title.Project": "Εργα",
-	"submission.sections.describe.relationship-lookup.title.Publication": "Δημοσιεύσεις",
-	"submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Συγγραφείς",
-	"submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Οργανωτική Μονάδα Γονέων",
-	"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Χρηματοδότης του Έργου",
-	"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Οργανισμός Χρηματοδότησης",
-	"submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Χρηματοδότηση",
-	"submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Θέματα περιοδικών",
-	"submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "περιοδικά",
-	"submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Τόμοι περιοδικών",
-	"submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Εργα",
-	"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.license.granted-label": "Επιβεβαιώνω την παραπάνω άδεια",
-	"submission.sections.license.notgranted": "Πρέπει να αποδεχτείτε την άδεια",
-	"submission.sections.license.required": "Πρέπει να αποδεχτείτε την άδεια",
-	"submission.sections.sherpa-policy.title-empty": "Δεν υπάρχουν διαθέσιμες πληροφορίες πολιτικής εκδότη. Εάν η εργασία σας έχει συσχετισμένο ISSN, καταχωρίστε το παραπάνω για να δείτε τυχόν σχετικές πολιτικές ανοιχτής πρόσβασης εκδότη.",
-	"submission.sections.sherpa.error.message": "Παρουσιάστηκε σφάλμα κατά την ανάκτηση των πληροφοριών σέρπα",
-	"submission.sections.sherpa.publication.information": "Πληροφορίες δημοσίευσης",
-	"submission.sections.sherpa.publication.information.issns": "ISSN",
-	"submission.sections.sherpa.publication.information.publishers": "Εκδότης",
-	"submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
-	"submission.sections.sherpa.publication.information.title": "Τίτλος",
-	"submission.sections.sherpa.publication.information.url": "URL",
-	"submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
-	"submission.sections.sherpa.publisher.policy": "Πολιτική εκδότη",
-	"submission.sections.sherpa.publisher.policy.conditions": "Συνθήκες",
-	"submission.sections.sherpa.publisher.policy.description": "Οι παρακάτω πληροφορίες βρέθηκαν μέσω του Sherpa Romeo. Βάσει των πολιτικών του εκδότη σας, παρέχει συμβουλές σχετικά με το εάν μπορεί να είναι απαραίτητο ένα εμπάργκο ή/και ποια αρχεία επιτρέπεται να ανεβάσετε. Εάν έχετε ερωτήσεις, επικοινωνήστε με τον διαχειριστή του ιστότοπού σας μέσω της φόρμας σχολίων στο υποσέλιδο.",
-	"submission.sections.sherpa.publisher.policy.embargo": "Απαγόρευση",
-	"submission.sections.sherpa.publisher.policy.license": "Αδεια",
-	"submission.sections.sherpa.publisher.policy.location": "Τοποθεσία",
-	"submission.sections.sherpa.publisher.policy.more.information": "Για περισσότερες πληροφορίες, δείτε τους παρακάτω συνδέσμους:",
-	"submission.sections.sherpa.publisher.policy.noembargo": "Χωρίς εμπάργκο",
-	"submission.sections.sherpa.publisher.policy.nolocation": "Κανένας",
-	"submission.sections.sherpa.publisher.policy.openaccess": "Οι διαδρομές ανοιχτής πρόσβασης που επιτρέπονται από την πολιτική αυτού του περιοδικού παρατίθενται παρακάτω ανά έκδοση άρθρου. Κάντε κλικ σε μια διαδρομή για μια πιο λεπτομερή προβολή",
-	"submission.sections.sherpa.publisher.policy.prerequisites": "Προαπαιτούμενα",
-	"submission.sections.sherpa.publisher.policy.refresh": "Ανανέωση",
-	"submission.sections.sherpa.publisher.policy.version": "Εκδοχή",
-	"submission.sections.sherpa.record.information": "Πληροφορίες εγγραφής",
-	"submission.sections.sherpa.record.information.date.created": "Ημερομηνία Δημιουργίας",
-	"submission.sections.sherpa.record.information.date.modified": "Τελευταία τροποποίηση",
-	"submission.sections.sherpa.record.information.id": "ID",
-	"submission.sections.sherpa.record.information.uri": "URI",
-	"submission.sections.status.errors.aria": "έχει λάθη",
-	"submission.sections.status.errors.title": "Σφάλματα",
-	"submission.sections.status.info.aria": "Επιπλέον πληροφορίες",
-	"submission.sections.status.info.title": "Επιπλέον πληροφορίες",
-	"submission.sections.status.valid.aria": "είναι έγκυρο",
-	"submission.sections.status.valid.title": "Εγκυρος",
-	"submission.sections.status.warnings.aria": "έχει προειδοποιήσεις",
-	"submission.sections.status.warnings.title": "Προειδοποιήσεις",
-	"submission.sections.submit.progressbar.CClicense": "Άδεια Creative Commons",
-	"submission.sections.submit.progressbar.accessCondition": "Συνθήκες πρόσβασης σε είδη",
-	"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.license": "Άδεια κατάθεσης",
-	"submission.sections.submit.progressbar.sherpaPolicies": "Πληροφορίες πολιτικής ανοιχτής πρόσβασης εκδότη",
-	"submission.sections.submit.progressbar.sherpapolicy": "Πολιτικές Σέρπα",
-	"submission.sections.submit.progressbar.upload": "Μεταφόρτωση αρχείων",
-	"submission.sections.toggle.aria.close": "Σύμπτυξη ενότητας {{sectionHeader}}",
-	"submission.sections.toggle.aria.open": "Αναπτύξτε την ενότητα {{sectionHeader}}",
-	"submission.sections.toggle.close": "Κλείσιμο ενότητας",
-	"submission.sections.toggle.open": "Ανοίξτε την ενότητα",
-	"submission.sections.upload.delete.confirm.cancel": "Ακύρωση",
-	"submission.sections.upload.delete.confirm.info": "Αυτή η λειτουργία δεν μπορεί να αναιρεθεί. Είσαι σίγουρος?",
-	"submission.sections.upload.delete.confirm.submit": "Ναι είμαι σίγουρος",
-	"submission.sections.upload.delete.confirm.title": "Διαγραφή bitstream",
-	"submission.sections.upload.delete.submit": "Διαγραφή",
-	"submission.sections.upload.download.title": "Λήψη αρχείου",
-	"submission.sections.upload.drop-message": "Αποθέστε αρχεία για να τα επισυνάψετε στο τεκμήριο",
-	"submission.sections.upload.edit.title": "Επεξεργασία bitstream",
-	"submission.sections.upload.form.access-condition-hint": "Επιλέξτε μια συνθήκη πρόσβασης που θα εφαρμοστεί στη ροή bit μόλις κατατεθεί το τεκμήριο",
-	"submission.sections.upload.form.access-condition-label": "Τύπος συνθήκης πρόσβασης",
-	"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-hint": "Επιλέξτε την ημερομηνία από την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
-	"submission.sections.upload.form.from-label": "Παραχώρηση πρόσβασης από",
-	"submission.sections.upload.form.from-placeholder": "Από",
-	"submission.sections.upload.form.group-label": "Ομάδα",
-	"submission.sections.upload.form.group-required": "Απαιτείται ομάδα.",
-	"submission.sections.upload.form.until-hint": "Επιλέξτε την ημερομηνία μέχρι την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
-	"submission.sections.upload.form.until-label": "Παραχώρηση πρόσβασης μέχρι",
-	"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.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.tasks.claimed.approve": "Εγκρίνω",
-	"submission.workflow.tasks.claimed.approve_help": "Εάν έχετε ελέγξει το τεκμήριο και είναι κατάλληλο για συμπερίληψη στη συλλογή, επιλέξτε \"Έγκριση\".",
-	"submission.workflow.tasks.claimed.edit": "Επεξεργασία",
-	"submission.workflow.tasks.claimed.edit_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": "Επιστροφή στο pool",
-	"submission.workflow.tasks.claimed.return_help": "Επιστρέψτε την εργασία στο pool έτσι ώστε ένας άλλος χρήστης να μπορεί να εκτελέσει την εργασία.",
-	"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": "Ορίστε αυτήν την επιλογή για να προβάλετε τα μεταδεδομένα του τεκμηρίου.",
-	"thumbnail.default.alt": "Μικρογραφία εικόνας",
-	"thumbnail.default.placeholder": "Δεν υπάρχει διαθέσιμη μικρογραφία",
-	"thumbnail.orgunit.alt": "Λογότυπο OrgUnit",
-	"thumbnail.orgunit.placeholder": "Εικόνα μονάδας οργανισμού",
-	"thumbnail.person.alt": "Εικόνα προφίλ",
-	"thumbnail.person.placeholder": "Δεν υπάρχει διαθέσιμη εικόνα προφίλ",
-	"thumbnail.project.alt": "Λογότυπο Έργου",
-	"thumbnail.project.placeholder": "Εικόνα θέσης κράτησης έργου",
-	"title": "DSpace",
-	"uploader.browse": "Πλοήγηση",
-	"uploader.delete.btn-title": "Διαγραφή",
-	"uploader.drag-message": "Σύρετε και αποθέστε τα αρχεία σας εδώ",
-	"uploader.or": ", ή",
+  "401.help": "Δεν έχετε εξουσιοδότηση πρόσβασης σε αυτήν τη σελίδα. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
+  "401.link.home-page": "Μετάβαση στην αρχική σελίδα",
+  "401.unauthorized": "Χωρίς εξουσιοδότηση",
+  "403.forbidden": "Απαγορευμένη πρόσβαση",
+  "403.help": "Δεν έχετε άδεια πρόσβασης σε αυτήν τη σελίδα. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
+  "403.link.home-page": "Μετάβαση στην αρχική σελίδα",
+  "404.help": "Δεν μπορούμε να βρούμε τη σελίδα που ψάχνετε. Η σελίδα μπορεί να έχει μετακινηθεί ή διαγραφεί. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
+  "404.link.home-page": "Μετάβαση στην αρχική σελίδα",
+  "404.page-not-found": "Η σελίδα δεν βρέθηκε",
+  "500.help": "Ο διακομιστής δεν μπορεί προσωρινά να εξυπηρετήσει το αίτημά σας λόγω εργασιών συντήρησης ή προβλημάτων χωρητικότητας. Παρακαλώ προσπαθήστε ξανά αργότερα.",
+  "500.link.home-page": "Μετάβαση στην αρχική σελίδα",
+  "500.page-internal-server-error": "Μη διαθέσιμη υπηρεσία",
+  "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.metadata.only.listelement.badge": "Μόνο μεταδεδομένα",
+  "access-status.open.access.listelement.badge": "Ανοιχτή πρόσβαση",
+  "access-status.restricted.listelement.badge": "Περιορισμένος",
+  "access-status.unknown.listelement.badge": "Αγνωστος",
+  "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": "Διακοπή προσομοίωσης χρήστη",
+  "admin.access-control.epeople.breadcrumbs": "Χρήστες",
+  "admin.access-control.epeople.button.add": "Προσθήκη Eperson",
+  "admin.access-control.epeople.button.see-all": "Περιήγηση σε όλα",
+  "admin.access-control.epeople.form.canLogIn": "Δυνατότητα σύνδεσης",
+  "admin.access-control.epeople.form.create": "Δημιουργία EPerson",
+  "admin.access-control.epeople.form.edit": "Επεξεργασία EPerson",
+  "admin.access-control.epeople.form.email": "Ηλεκτρονική Διεύθυνση",
+  "admin.access-control.epeople.form.emailHint": "Πρέπει να είναι έγκυρη διεύθυνση e-mail",
+  "admin.access-control.epeople.form.firstName": "Ονομα",
+  "admin.access-control.epeople.form.goToGroups": "Προσθήκη σε ομάδες",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Μέλος αυτών των ομάδων:",
+  "admin.access-control.epeople.form.lastName": "Επίθετο",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Αυτό το EPerson δεν είναι μέλος καμίας ομάδας",
+  "admin.access-control.epeople.form.notification.created.failure": "Αποτυχία δημιουργίας EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Αποτυχία δημιουργίας Eperson \"{{name}}\", email \"{{email}}\" που χρησιμοποιείται ήδη.",
+  "admin.access-control.epeople.form.notification.created.success": "Δημιουργήθηκε με επιτυχία το Eperson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Απέτυχε η διαγραφή του EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Διαγράφηκε επιτυχώς το Eperson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Απέτυχε η επεξεργασία του EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Απέτυχε η επεξεργασία του EPerson \"{{name}}\", email \"{{email}}\" που χρησιμοποιείται ήδη.",
+  "admin.access-control.epeople.form.notification.edited.success": "Έγινε επιτυχής επεξεργασία του EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.requireCertificate": "Απαιτεί πιστοποιητικό",
+  "admin.access-control.epeople.form.return": "Επιστροφή",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Συλλογή/Κοινότητα",
+  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.name": "Ονομα",
+  "admin.access-control.epeople.head": "Χρήστες",
+  "admin.access-control.epeople.no-items": "Δεν υπάρχουν χρήστες για εμφάνιση.",
+  "admin.access-control.epeople.notification.deleted.failure": "Απέτυχε η διαγραφή του EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Διαγράφηκε επιτυχώς το EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.search.button": "Αναζήτηση",
+  "admin.access-control.epeople.search.head": "Αναζήτηση",
+  "admin.access-control.epeople.search.placeholder": "Αναζήτηση χρηστών...",
+  "admin.access-control.epeople.search.scope.email": "E-mail (ακριβώς)",
+  "admin.access-control.epeople.search.scope.metadata": "Μεταδεδομένα",
+  "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.table.email": "E-mail (ακριβώς)",
+  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.name": "Ονομα",
+  "admin.access-control.epeople.title": "χρήστες",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Νέα ομάδα",
+  "admin.access-control.groups.breadcrumbs": "Ομάδες",
+  "admin.access-control.groups.button.add": "Προσθήκη ομάδας",
+  "admin.access-control.groups.button.see-all": "Περιήγηση σε όλα",
+  "admin.access-control.groups.form.actions.delete": "Διαγραφή ομάδας",
+  "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.delete-group.modal.cancel": "Ακύρωση",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Διαγραφή",
+  "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.groupCommunity": "Κοινότητα ή Συλλογή",
+  "admin.access-control.groups.form.groupDescription": "Περιγραφή",
+  "admin.access-control.groups.form.groupName": "Όνομα ομάδας",
+  "admin.access-control.groups.form.head.create": "Δημιουργία ομάδας",
+  "admin.access-control.groups.form.head.edit": "Επεξεργασία ομάδας",
+  "admin.access-control.groups.form.members-list.button.see-all": "Περιήγηση σε όλα",
+  "admin.access-control.groups.form.members-list.head": "Χρήστες",
+  "admin.access-control.groups.form.members-list.headMembers": "Τρέχοντα Μέλη",
+  "admin.access-control.groups.form.members-list.no-items": "Δεν βρέθηκαν χρήτες σε αυτήν την αναζήτηση",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Δεν υπάρχουν ακόμη μέλη στην ομάδα, αναζητήστε και προσθέστε.",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Αποτυχία προσθήκης μέλους: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Αποτυχία διαγραφής μέλους: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Δεν υπάρχει τρέχουσα ενεργή ομάδα, υποβάλετε πρώτα ένα όνομα.",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Προστέθηκε με επιτυχία μέλος: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Το μέλος διαγράφηκε επιτυχώς: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.search.button": "Αναζήτηση",
+  "admin.access-control.groups.form.members-list.search.head": "Προσθήκη EPeople",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (ακριβώς)",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Μεταδεδομένα",
+  "admin.access-control.groups.form.members-list.table.edit": "Αφαίρεση / Προσθήκη",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Προσθήκη μέλους με όνομα \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Κατάργηση μέλους με όνομα \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.email": "Ηλεκτρονική διεύθυνση",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.identity": "ID",
+  "admin.access-control.groups.form.members-list.table.name": "Ονομα",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "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.created.success": "Η ομάδα \"{{name}}\" δημιουργήθηκε με επιτυχία",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Αιτία: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Απέτυχε η διαγραφή της ομάδας \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "Η ομάδα \"{{ 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.return": "Επιστροφή",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Περιήγηση σε όλα",
+  "admin.access-control.groups.form.subgroups-list.head": "Ομάδες",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Τρέχουσες υποομάδες",
+  "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.subgroups-list.notification.failure": "Κάτι πήγε στραβά: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Αποτυχία προσθήκης υποομάδας: \"{{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.notification.success.addSubgroup": "Η υποομάδα προστέθηκε με επιτυχία: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Η υποομάδα διαγράφηκε επιτυχώς: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Αναζήτηση",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Προσθήκη υποομάδας",
+  "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.add": "Προσθήκη υποομάδας με όνομα \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Κατάργηση υποομάδας με όνομα \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Τρέχουσα ομάδα",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Ονομα",
+  "admin.access-control.groups.head": "Ομάδες",
+  "admin.access-control.groups.no-items": "Δεν βρέθηκαν ομάδες με αυτό στο όνομά τους ή αυτό ως UUID",
+  "admin.access-control.groups.notification.deleted.failure.content": "Αιτία: \"{{cause}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Απέτυχε η διαγραφή της ομάδας \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "Η ομάδα \"{{name}}\" διαγράφηκε επιτυχώς",
+  "admin.access-control.groups.search.button": "Αναζήτηση",
+  "admin.access-control.groups.search.head": "Αναζήτηση ομάδων",
+  "admin.access-control.groups.search.placeholder": "Αναζήτηση ομάδων...",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Επεξεργασία ομάδας",
+  "admin.access-control.groups.table.collectionOrCommunity": "Συλλογή/Κοινότητα",
+  "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.table.id": "ID",
+  "admin.access-control.groups.table.members": "Μέλη",
+  "admin.access-control.groups.table.name": "Ονομα",
+  "admin.access-control.groups.title": "Ομάδες",
+  "admin.access-control.groups.title.addGroup": "Νέα ομάδα",
+  "admin.access-control.groups.title.singleGroup": "Επεξεργασία ομάδας",
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.curation-tasks.breadcrumbs": "Εργασίες επιμέλειας συστήματος",
+  "admin.curation-tasks.header": "Εργασίες επιμέλειας συστήματος",
+  "admin.curation-tasks.title": "Εργασίες επιμέλειας συστήματος",
+  "admin.metadata-import.breadcrumbs": "Εισαγωγή μεταδεδομένων",
+  "admin.metadata-import.page.button.proceed": "Συνέχεια",
+  "admin.metadata-import.page.button.return": "Επιστροφή",
+  "admin.metadata-import.page.dropMsg": "Αποθέστε ένα CSV μεταδεδομένων για εισαγωγή",
+  "admin.metadata-import.page.dropMsgReplace": "Αποθέστε για να αντικαταστήσετε το CSV μεταδεδομένων για εισαγωγή",
+  "admin.metadata-import.page.error.addFile": "Επιλέξτε πρώτα το αρχείο!",
+  "admin.metadata-import.page.header": "Εισαγωγή μεταδεδομένων",
+  "admin.metadata-import.page.help": "Μπορείτε να αποθέσετε ή να περιηγηθείτε σε αρχεία CSV που περιέχουν λειτουργίες μαζικών μεταδεδομένων σε αρχεία εδώ",
+  "admin.metadata-import.page.validateOnly": "Μόνο επικύρωση",
+  "admin.metadata-import.title": "Εισαγωγή μεταδεδομένων",
+  "admin.registries.bitstream-formats.breadcrumbs": "Μορφοποίηση μητρώου",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Μορφότυπο bitstream",
+  "admin.registries.bitstream-formats.create.failure.content": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία του νέου μορφοτύπου bitstream.",
+  "admin.registries.bitstream-formats.create.failure.head": "Αποτυχία",
+  "admin.registries.bitstream-formats.create.head": "Δημιουργήστε μορφότυπο Bitstream",
+  "admin.registries.bitstream-formats.create.new": "Προσθέστε μορφότυπο bitstream",
+  "admin.registries.bitstream-formats.create.success.content": "Το νέο μορφότυπο bitstream δημιουργήθηκε με επιτυχία.",
+  "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": "Αυτή η λίστα μορφοτύπων bitstream παρέχει πληροφορίες σχετικά με γνωστά μορφότυπα και το επίπεδο υποστήριξής τους.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Μορφότυπο bitstream",
+  "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": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία του μορφότυπου bitstream.",
+  "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": "Το μορφότυπο bitstream επεξεργάστηκε με επιτυχία.",
+  "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": "Δεν υπάρχουν μορφότυπα bitstream για εμφάνιση.",
+  "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": "mimetype",
+  "admin.registries.bitstream-formats.table.name": "Ονομα",
+  // TODO New key - Add a translation
+  "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": "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": "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": "Πεδίο",
+  // TODO New key - Add a translation
+  "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": "Element",
+  "admin.registries.schema.form.qualifier": "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.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": "Αναζήτηση",
+  "admin.workflow.breadcrumbs": "Διαχείριση ροής εργασιών",
+  "admin.workflow.item.delete": "Διαγραφή",
+  "admin.workflow.item.send-back": "Επιστροφή",
+  "admin.workflow.item.workflow": "Ροή εργασιών",
+  "admin.workflow.title": "Διαχείριση ροής εργασιών",
+  "administrativeView.search.results.head": "Αναζήτηση Διαχειριστή",
+  "auth.errors.invalid-user": "Μη έγκυρη διεύθυνση ηλ. ταχυδρομείου ή κωδικός πρόσβασης.",
+  "auth.messages.expired": "Η συνεδρία (session) σας έχει λήξει. Παρακαλούμε συνδεθείτε ξανά.",
+  "auth.messages.token-refresh-failed": "Η ανανέωση της συνεδρίας (session) απέτυχε. Παρακαλούμε συνδεθείτε ξανά.",
+  "bitstream-request-a-copy.alert.canDownload1": "Έχετε ήδη πρόσβαση σε αυτό το αρχείο. Εάν θέλετε να κατεβάσετε το αρχείο, κάντε κλικ",
+  "bitstream-request-a-copy.alert.canDownload2": "εδώ",
+  "bitstream-request-a-copy.allfiles.label": "Αρχεία",
+  "bitstream-request-a-copy.email.error": "Παρακαλώ εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου.",
+  "bitstream-request-a-copy.email.hint": "Αυτή η διεύθυνση email χρησιμοποιείται για την αποστολή του αρχείου.",
+  "bitstream-request-a-copy.email.label": "Η ηλεκτρονική σου διεύθυνση *",
+  "bitstream-request-a-copy.files-all-false.label": "Μόνο το αρχείο που ζητήθηκε",
+  "bitstream-request-a-copy.files-all-true.label": "Όλα τα αρχεία (του τεκμηρίου αυτού) σε περιορισμένη πρόσβαση",
+  "bitstream-request-a-copy.header": "Ζητήστε ένα αντίγραφο του αρχείου",
+  "bitstream-request-a-copy.intro": "Εισαγάγετε τις ακόλουθες πληροφορίες για να ζητήσετε αντίγραφο για το ακόλουθο τεκμήριο:",
+  "bitstream-request-a-copy.intro.bitstream.all": "Αίτημα όλων των αρχείων.",
+  "bitstream-request-a-copy.intro.bitstream.one": "Ζητώντας το ακόλουθο αρχείο:",
+  "bitstream-request-a-copy.message.label": "Μήνυμα",
+  "bitstream-request-a-copy.name.error": "Το όνομα είναι υποχρεωτικό",
+  "bitstream-request-a-copy.name.label": "Ονομα *",
+  "bitstream-request-a-copy.return": "Επιστροφή",
+  "bitstream-request-a-copy.submit": "Ζητήστε αντίγραφο",
+  "bitstream-request-a-copy.submit.error": "Παρουσιάστηκε κάποιο πρόβλημα με την υποβολή του αιτήματος για το τεκμήριο.",
+  "bitstream-request-a-copy.submit.success": "Το αίτημα τεκμηρίου υποβλήθηκε με επιτυχία.",
+  "bitstream.download.page": "Τώρα γίνεται λήψη του {{bitstream}}...",
+  "bitstream.download.page.back": "Επιστροφή",
+  "bitstream.edit.authorizations.link": "Επεξεργαστείτε τις πολιτικές του αρχείου",
+  "bitstream.edit.authorizations.title": "Επεξεργαστείτε τις πολιτικές του αρχείου",
+  "bitstream.edit.bitstream": "Αρχείο:",
+  "bitstream.edit.form.description.hint": "Προαιρετικά, δώστε μια σύντομη περιγραφή του αρχείου, για παράδειγμα \"<i>Κύριο άρθρο</i>\" ή \"<i>Αναγνώσεις δεδομένων πειράματος</i>\".",
+  "bitstream.edit.form.description.label": "Περιγραφή",
+  "bitstream.edit.form.embargo.hint": "Η πρώτη ημέρα από την οποία επιτρέπεται η πρόσβαση. <b>Αυτή η ημερομηνία δεν μπορεί να τροποποιηθεί σε αυτήν τη φόρμα.</b> Για να ορίσετε μια ημερομηνία embargo για ένα αρχείο, μεταβείτε στην καρτέλα <i>Κατάσταση τεκμηρίου</i>, κάντε κλικ στην επιλογή <i>Εξουσιοδοτήσεις...</i >, δημιουργήστε ή επεξεργαστείτε την πολιτική <i>READ</i> του αρχείου και ορίστε την <i>Ημερομηνία έναρξης</i> όπως επιθυμείτε.",
+  "bitstream.edit.form.embargo.label": "Εμπάργκο (embargo) μέχρι συγκεκριμένη ημερομηνία",
+  "bitstream.edit.form.fileName.hint": "Αλλάξτε το όνομα αρχείου για το αρχείο. Λάβετε υπόψη ότι αυτό θα αλλάξει τη διεύθυνση URL του αρχείου, αλλά οι παλιοί σύνδεσμοι θα εξακολουθούν να ισχύουν όσο το αναγνωριστικό ακολουθίας (sequence) δεν αλλάζει.",
+  "bitstream.edit.form.fileName.label": "Ονομα αρχείου",
+  "bitstream.edit.form.iiifHeight.hint": "Το ύψος του καμβά πρέπει συνήθως να ταιριάζει με το ύψος της εικόνας.",
+  "bitstream.edit.form.iiifHeight.label": "Ύψος καμβά IIIF",
+  "bitstream.edit.form.iiifLabel.hint": "Ετικέτα καμβά για αυτήν την εικόνα. Εάν δεν παρέχεται, θα χρησιμοποιηθεί η προεπιλεγμένη ετικέτα.",
+  "bitstream.edit.form.iiifLabel.label": "Ετικέτα IIIF",
+  "bitstream.edit.form.iiifToc.hint": "Η προσθήκη κειμένου εδώ καθιστά την αρχή ενός νέου εύρους πίνακα περιεχομένων.",
+  "bitstream.edit.form.iiifToc.label": "IIIF Πίνακας περιεχομένων",
+  "bitstream.edit.form.iiifWidth.hint": "Το πλάτος του καμβά πρέπει συνήθως να ταιριάζει με το πλάτος της εικόνας.",
+  "bitstream.edit.form.iiifWidth.label": "Πλάτος καμβά IIIF",
+  "bitstream.edit.form.newFormat.hint": "Η εφαρμογή που χρησιμοποιήσατε για τη δημιουργία του αρχείου και ο αριθμός έκδοσης (για παράδειγμα, \"<i>ACMESoft SuperApp έκδοση 1.5</i>\").",
+  "bitstream.edit.form.newFormat.label": "Περιγράψτε το νέο μορφότυπο",
+  "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.saved.content": "Οι αλλαγές σας σε αυτό το αρχείο αποθηκεύτηκαν.",
+  "bitstream.edit.notifications.saved.title": "το αρχείο αποθηκεύτηκε",
+  "bitstream.edit.return": "Επιστροφή",
+  "bitstream.edit.title": "Επεξεργασία αρχείου",
+  "browse.back.all-results": "Όλα τα αποτελέσματα περιήγησης",
+  "browse.comcol.by.author": "Από Συγγραφέα",
+  "browse.comcol.by.dateissued": "Κατά Ημερομηνία Έκδοσης",
+  "browse.comcol.by.subject": "Κατά θέμα",
+  "browse.comcol.by.title": "Με τίτλο",
+  "browse.comcol.head": "Περιηγούμαι",
+  "browse.empty": "Δεν υπάρχουν τεκμήρια για εμφάνιση.",
+  "browse.metadata.author": "Συγγραφέας",
+  "browse.metadata.author.breadcrumbs": "Πλοήγηση ανά συγγραφέα",
+  "browse.metadata.dateissued": "Ημερομηνία έκδοσης",
+  "browse.metadata.dateissued.breadcrumbs": "Πλοήγηση ανά ημερομηνία",
+  "browse.metadata.subject": "Θέμα",
+  "browse.metadata.subject.breadcrumbs": "Πλοήγηση ανά θέμα",
+  "browse.metadata.title": "Τίτλος",
+  "browse.metadata.title.breadcrumbs": "Πλοήγηση ανά τίτλο",
+  "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.title": "Πλοήγηση στη {{ collection }} ανά {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title.page": "Πλοήγηση στη {{ collection }} ανά {{ field }} {{ value }}",
+  "chips.remove": "Remove chip",
+  "collection.create.head": "Δημιουργήστε μια Συλλογή",
+  "collection.create.notifications.success": "Δημιουργήθηκε με επιτυχία η Συλλογή",
+  "collection.create.sub-head": "Δημιουργήστε μια συλλογή για την κοινότητα {{ parent }}",
+  "collection.curate.header": "Επιμέλεια συλλογής: {{collection}}",
+  "collection.delete.cancel": "Ακύρωση",
+  "collection.delete.confirm": "Επιβεβαίωση",
+  "collection.delete.head": "Διαγραφή συλλογής",
+  "collection.delete.notification.fail": "Δεν ήταν δυνατή η διαγραφή της συλλογής",
+  "collection.delete.notification.success": "Η συλλογή διαγράφηκε με επιτυχία",
+  "collection.delete.processing": "Διαγραφή",
+  "collection.delete.text": "Είστε βέβαιοι ότι θέλετε να διαγράψετε τη συλλογή \"{{ dso }}\"",
+  "collection.edit.breadcrumbs": "Επεξεργασία συλλογής",
+  "collection.edit.delete": "Διαγραφή αυτής της συλλογής",
+  "collection.edit.head": "Επεξεργασία συλλογής",
+  "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.item.authorizations.load-bundle-button": "Φορτώστε περισσότερα πακέτα",
+  "collection.edit.item.authorizations.load-more-button": "Φόρτωσε περισσότερα",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Εμφάνιση πολιτικών αρχείου για το πακέτο",
+  "collection.edit.logo.delete-undo.title": "Αναίρεση διαγραφή",
+  "collection.edit.logo.delete.title": "Διαγραφή λογότυπου",
+  "collection.edit.logo.label": "Λογότυπο συλλογής",
+  "collection.edit.logo.notifications.add.error": "Η μεταφόρτωση του λογότυπου της Συλλογής απέτυχε. Επαληθεύστε το περιεχόμενο πριν προσπαθήσετε ξανά.",
+  "collection.edit.logo.notifications.add.success": "Επιτυχής μεταφόρτωση λογότυπου συλλογής.",
+  "collection.edit.logo.notifications.delete.error.title": "Σφάλμα κατά τη διαγραφή του λογότυπου",
+  "collection.edit.logo.notifications.delete.success.content": "Το λογότυπο της συλλογής διαγράφηκε με επιτυχία",
+  "collection.edit.logo.notifications.delete.success.title": "Το λογότυπο διαγράφηκε",
+  "collection.edit.logo.upload": "Σύρετε ένα λογότυπο συλλογής για μεταφόρτωση",
+  "collection.edit.notifications.success": "Έγινε επιτυχής επεξεργασία της Συλλογής",
+  "collection.edit.return": "Επιστροφή",
+  "collection.edit.tabs.authorizations.head": "Εξουσιοδοτήσεις",
+  "collection.edit.tabs.authorizations.title": "Επεξεργασία συλλογής - Εξουσιοδοτήσεις",
+  "collection.edit.tabs.curate.head": "Βοηθός ιερέα",
+  "collection.edit.tabs.curate.title": "Επεξεργασία συλλογής - Επιμέλεια",
+  "collection.edit.tabs.item-mapper.title": "Επεξεργασία συλλογής - Αντιστοίχιση τεκμηρίων",
+  "collection.edit.tabs.mapper.head": "Αντιστοίχιση τεκμηρίων",
+  "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": "Πρέπει να παρέχετε ένα αναγνωριστικό συνόλου της συλλογής προορισμού.",
+  "collection.edit.tabs.source.form.harvestType": "Συγκομιδή περιεχομένου",
+  "collection.edit.tabs.source.form.head": "Διαμόρφωση εξωτερικής πηγής",
+  "collection.edit.tabs.source.form.metadataConfigId": "Μορφή μεταδεδομένων",
+  "collection.edit.tabs.source.form.oaiSetId": "Αναγνωριστικό συγκεκριμένου συνόλου OAI",
+  "collection.edit.tabs.source.form.oaiSource": "Πάροχος ΟΑΙ",
+  "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.entityType": "Τύπος οντότητας",
+  "collection.form.errors.title.required": "Εισαγάγετε ένα όνομα συλλογής",
+  "collection.form.license": "Αδεια",
+  "collection.form.provenance": "Προέλευση",
+  "collection.form.rights": "Κείμενο πνευματικών δικαιωμάτων (HTML)",
+  "collection.form.tableofcontents": "Ειδήσεις (HTML)",
+  "collection.form.title": "Ονομα",
+  "collection.listelement.badge": "Συλλογή",
+  "collection.page.browse.recent.empty": "Δεν υπάρχουν τεκμήρια για εμφάνιση",
+  "collection.page.browse.recent.head": "Πρόσφατες Υποβολές",
+  "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.harvest.last": "Τελευταία συγκομιδή:",
+  "collection.source.controls.harvest.message": "Πληροφορίες συγκομιδής:",
+  "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.start": "Ώρα έναρξης συγκομιδής:",
+  "collection.source.controls.harvest.status": "Κατάσταση συγκομιδής:",
+  "collection.source.controls.head": "Έλεγχοι συγκομιδής",
+  "collection.source.controls.import.completed": "Η εισαγωγή ολοκληρώθηκε",
+  "collection.source.controls.import.failed": "Παρουσιάστηκε σφάλμα κατά την εισαγωγή",
+  "collection.source.controls.import.running": "Εισαγωγή...",
+  "collection.source.controls.import.submit": "Εισαγωγή τώρα",
+  "collection.source.controls.import.submit.error": "Κάτι πήγε στραβά με την έναρξη της εισαγωγής",
+  "collection.source.controls.import.submit.success": "Η εισαγωγή ξεκίνησε με επιτυχία",
+  "collection.source.controls.reset.completed": "Η επαναφορά και η επανεισαγωγή ολοκληρώθηκαν",
+  "collection.source.controls.reset.failed": "Παρουσιάστηκε σφάλμα κατά την επαναφορά και την επανεισαγωγή",
+  "collection.source.controls.reset.running": "Επαναφορά και επανεισαγωγή...",
+  "collection.source.controls.reset.submit": "Επαναφορά και επανεισαγωγή",
+  "collection.source.controls.reset.submit.error": "Κάτι πήγε στραβά με την εκκίνηση της επαναφοράς και της επανεισαγωγής",
+  "collection.source.controls.reset.submit.success": "Η επαναφορά και η επανεισαγωγή ξεκίνησαν με επιτυχία",
+  "collection.source.controls.test.completed": "Το σενάριο για τη δοκιμή των ρυθμίσεων ολοκληρώθηκε με επιτυχία",
+  "collection.source.controls.test.failed": "Το σενάριο για τον έλεγχο των ρυθμίσεων απέτυχε",
+  "collection.source.controls.test.running": "Έλεγχος παραμετροποίησης...",
+  "collection.source.controls.test.submit": "Η παραμετροποίηση ελέγχεται",
+  "collection.source.controls.test.submit.error": "Κάτι πήγε στραβά με την έναρξη του ελέγχου των ρυθμίσεων",
+  "collection.source.update.notifications.error.content": "Οι παρεχόμενες ρυθμίσεις έχουν ελεχθεί και δεν λειτούργησαν.",
+  "collection.source.update.notifications.error.title": "Σφάλμα Διακομιστή",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Η προεπιλεγμένη ανάγνωση για εισερχόμενα αρχεία έχει οριστεί αυτήν τη στιγμή σε Ανώνυμη.",
+  "comcol-role.edit.bitstream_read.description": "Οι διαχειριστές της κοινότητας μπορούν να δημιουργήσουν υποκοινότητες ή συλλογές και να διαχειρίζονται ή να αναθέτουν διαχείριση για αυτές τις υποκοινότητες ή συλλογές. Επιπλέον, αποφασίζουν ποιος μπορεί να υποβάλει τεκμήρια σε οποιεσδήποτε υποσυλλογές, να επεξεργαστεί τα μεταδεδομένα των τεκμηρίων (μετά την υποβολή) και να προσθέσει (αντιστοιχίσει) υπάρχοντα τεκμήρια από άλλες συλλογές (υπόκειται σε εξουσιοδότηση).",
+  "comcol-role.edit.bitstream_read.name": "Προεπιλεγμένη πρόσβαση ανάγνωσης αρχείου",
+  "comcol-role.edit.collection-admin.description": "Οι διαχειριστές της συλλογής αποφασίζουν ποιος μπορεί να υποβάλει τεκμήρια στη συλλογή, να επεξεργαστεί τα μεταδεδομένα των τεκμηρίων (μετά την υποβολή) και να προσθέσει (αντιστοιχίσει) υπάρχοντα τεκμήρια από άλλες συλλογές σε αυτήν τη συλλογή (με την επιφύλαξη εξουσιοδότησης για αυτήν τη συλλογή).",
+  "comcol-role.edit.collection-admin.name": "Διαχειριστές",
+  "comcol-role.edit.community-admin.description": "Οι διαχειριστές της κοινότητας μπορούν να δημιουργήσουν υποκοινότητες ή συλλογές και να διαχειρίζονται ή να αναθέτουν διαχείριση για αυτές τις υποκοινότητες ή συλλογές. Επιπλέον, αποφασίζουν ποιος μπορεί να υποβάλει τεκμήρια σε οποιεσδήποτε υποσυλλογές, να επεξεργαστεί τα μεταδεδομένα των τεκμηρίων (μετά την υποβολή) και να προσθέσει (αντιστοιχίσει) υπάρχοντα τεκμήρια από άλλες συλλογές (υπόκειται σε εξουσιοδότηση).",
+  "comcol-role.edit.community-admin.name": "Διαχειριστές",
+  "comcol-role.edit.create": "Δημιουργώ",
+  "comcol-role.edit.create.error.title": "Αποτυχία δημιουργίας ομάδας για τον ρόλο \"{{ role }}\".",
+  "comcol-role.edit.delete": "Διαγραφή",
+  "comcol-role.edit.delete.error.title": "Απέτυχε η διαγραφή της ομάδας ρόλων \"{{ role }}\".",
+  "comcol-role.edit.editor.description": "Οι συντάκτες μπορούν να επεξεργαστούν τα μεταδεδομένα των εισερχόμενων υποβολών και, στη συνέχεια, να τις αποδεχτούν ή να τις απορρίψουν.",
+  "comcol-role.edit.editor.name": "Συντάκτες",
+  "comcol-role.edit.finaleditor.description": "Οι τελικοί συντάκτες μπορούν να επεξεργαστούν τα μεταδεδομένα των εισερχόμενων υποβολών, αλλά δεν θα μπορούν να τα απορρίψουν.",
+  "comcol-role.edit.finaleditor.name": "Τελικοί συντάκτες",
+  "comcol-role.edit.item_read.anonymous-group": "Η προεπιλεγμένη ανάγνωση για τα εισερχόμενα τεκμήρια έχει οριστεί σε Ανώνυμο.",
+  "comcol-role.edit.item_read.description": "Οι χρήστες και οι ομάδες με δικαίωμα read σε νέα τεκμήρια που υποβάλλονται στη συλλογή. Οι αλλαγές σε αυτόν τον ρόλο δεν έχουν αναδρομική ισχύ. Τα υπάρχοντα τεκμήρια στο σύστημα θα εξακολουθούν να είναι ορατά από όσους είχαν πρόσβαση ανάγνωσης τη στιγμή της προσθήκης τους.",
+  "comcol-role.edit.item_read.name": "Προεπιλεγμένη πρόσβαση για ανάγνωση τεκμηρίων",
+  "comcol-role.edit.no-group": "Κανένας",
+  "comcol-role.edit.restrict": "Περιορίζω",
+  "comcol-role.edit.reviewer.description": "Οι αξιολογητές μπορούν να αποδεχτούν ή να απορρίψουν εισερχόμενες υποβολές. Ωστόσο, δεν είναι σε θέση να επεξεργαστούν τα μεταδεδομένα της υποβολής.",
+  "comcol-role.edit.reviewer.name": "Αναθεωρητές",
+  "comcol-role.edit.submitters.description": "Οι χρήστες και οι ομάδες που έχουν άδεια να υποβάλουν νέα τεκμήρια σε αυτήν τη συλλογή.",
+  "comcol-role.edit.submitters.name": "Υποβολείς",
+  "community.all-lists.head": "Υποκοινότητες και Συλλογές",
+  "community.create.head": "Δημιουργήστε μια Κοινότητα",
+  "community.create.notifications.success": "Δημιουργήθηκε με επιτυχία η Κοινότητα",
+  "community.create.sub-head": "Δημιουργία υποκοινότητας για την κοινότητα {{ parent }}",
+  "community.curate.header": "Επιμέλεια κοινότητας: {{community}}",
+  "community.delete.cancel": "Ακύρωση",
+  "community.delete.confirm": "Επιβεβαίωση",
+  "community.delete.head": "Διαγραφή Κοινότητας",
+  "community.delete.notification.fail": "Δεν ήταν δυνατή η διαγραφή της κοινότητας",
+  "community.delete.notification.success": "Η κοινότητα διαγράφηκε με επιτυχία",
+  "community.delete.processing": "Διαγραφή...",
+  "community.delete.text": "Είστε βέβαιοι ότι θέλετε να διαγράψετε την κοινότητα \"{{ dso }}\"",
+  "community.edit.breadcrumbs": "Επεξεργασία Κοινότητας",
+  "community.edit.delete": "Διαγραφή αυτής της κοινότητας",
+  "community.edit.head": "Επεξεργασία Κοινότητας",
+  "community.edit.logo.delete-undo.title": "Αναίρεση διαγραφής",
+  "community.edit.logo.delete.title": "Διαγραφή λογότυπου",
+  "community.edit.logo.label": "Λογότυπο κοινότητας",
+  "community.edit.logo.notifications.add.error": "Η μεταφόρτωση του λογότυπου της Κοινότητας απέτυχε. Επαληθεύστε το περιεχόμενο πριν προσπαθήσετε ξανά.",
+  "community.edit.logo.notifications.add.success": "Επιτυχής μεταφόρτωση λογότυπου Κοινότητας.",
+  "community.edit.logo.notifications.delete.error.title": "Σφάλμα κατά τη διαγραφή του λογότυπου",
+  "community.edit.logo.notifications.delete.success.content": "Το λογότυπο της κοινότητας διαγράφηκε με επιτυχία",
+  "community.edit.logo.notifications.delete.success.title": "Το λογότυπο διαγράφηκε",
+  "community.edit.logo.upload": "Σύρετε ένα λογότυπο κοινότητας για μεταφόρτωση",
+  "community.edit.notifications.error": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία της Κοινότητας",
+  "community.edit.notifications.success": "Έγινε επιτυχής επεξεργασία της Κοινότητας",
+  "community.edit.notifications.unauthorized": "Δεν έχετε τα προνόμια να κάνετε αυτήν την αλλαγή",
+  "community.edit.return": "Επιστροφή",
+  "community.edit.tabs.authorizations.head": "Εξουσιοδοτήσεις",
+  "community.edit.tabs.authorizations.title": "Επεξεργασία κοινότητας - Εξουσιοδοτήσεις",
+  "community.edit.tabs.curate.head": "Βοηθός ιερέα",
+  "community.edit.tabs.curate.title": "Επεξεργασία κοινότητας - Επιμέλεια",
+  "community.edit.tabs.metadata.head": "Επεξεργασία Μεταδεδομένων",
+  "community.edit.tabs.metadata.title": "Επεξεργασία κοινότητας - Μεταδεδομένα",
+  "community.edit.tabs.roles.head": "Αναθέστε ρόλους",
+  "community.edit.tabs.roles.title": "Επεξεργασία κοινότητας - Ρόλοι",
+  "community.form.abstract": "Σύντομη περιγραφή",
+  "community.form.description": "Εισαγωγικό κείμενο (HTML)",
+  "community.form.errors.title.required": "Εισαγάγετε ένα όνομα κοινότητας",
+  "community.form.rights": "Κείμενο πνευματικών δικαιωμάτων (HTML)",
+  "community.form.tableofcontents": "Ειδήσεις (HTML)",
+  "community.form.title": "Ονομα",
+  "community.listelement.badge": "Κοινότητα",
+  "community.page.edit": "Επεξεργαστείτε αυτήν την κοινότητα",
+  "community.page.handle": "Μόνιμο URI για αυτήν την κοινότητα",
+  "community.page.license": "Αδεια",
+  "community.page.news": "Νέα",
+  "community.sub-collection-list.head": "Συλλογές αυτής της Κοινότητας",
+  "community.sub-community-list.head": "Κοινότητες αυτής της Κοινότητας",
+  "communityList.breadcrumbs": "Λίστα κοινότητας",
+  "communityList.showMore": "Δείτε περισσότερα",
+  "communityList.tabTitle": "Λίστα κοινότητας",
+  "communityList.title": "Κατάλογος Κοινοτήτων",
+  "confirmation-modal.delete-eperson.cancel": "Ακύρωση",
+  "confirmation-modal.delete-eperson.confirm": "Διαγραφή",
+  "confirmation-modal.delete-eperson.header": "Διαγραφή EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-profile.cancel": "Ακύρωση",
+  "confirmation-modal.delete-profile.confirm": "Διαγραφή",
+  "confirmation-modal.delete-profile.header": "Διαγραφή προφίλ",
+  "confirmation-modal.delete-profile.info": "Είστε βέβαιοι ότι θέλετε να διαγράψετε το προφίλ σας",
+  "confirmation-modal.export-metadata.cancel": "Ακύρωση",
+  "confirmation-modal.export-metadata.confirm": "Εξαγωγή",
+  "confirmation-modal.export-metadata.header": "Εξαγωγή μεταδεδομένων για {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Είστε βέβαιοι ότι θέλετε να εξαγάγετε μεταδεδομένα για το {{ dsoName }}",
+  "cookies.consent.accept-all": "Αποδοχή όλων",
+  "cookies.consent.accept-selected": "Αποδοχή επιλεγμένων",
+  "cookies.consent.app.description.acknowledgement": "Απαιτείται για την αποθήκευση των επιβεβαιώσεων και των συγκατάθεσών σας",
+  "cookies.consent.app.description.authentication": "Απαιτείται για τη σύνδεσή σας",
+  "cookies.consent.app.description.google-analytics": "Μας επιτρέπει να παρακολουθούμε στατιστικά δεδομένα",
+  "cookies.consent.app.description.preferences": "Απαιτείται για την αποθήκευση των προτιμήσεών σας",
+  "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.title.acknowledgement": "Αναγνώριση",
+  "cookies.consent.app.title.authentication": "Αυθεντικοποίηση",
+  "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.preferences": "Προτιμήσεις",
+  "cookies.consent.close": "Κλείσε",
+  "cookies.consent.content-modal.description": "Εδώ μπορείτε να δείτε και να προσαρμόσετε τις πληροφορίες που συλλέγουμε για εσάς.",
+  "cookies.consent.content-modal.privacy-policy.name": "πολιτική απορρήτου",
+  "cookies.consent.content-modal.privacy-policy.text": "Για να μάθετε περισσότερα, διαβάστε την {Πολιτική απορρήτου} μας.",
+  "cookies.consent.content-modal.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.decline": "Απόρριψη",
+  "cookies.consent.purpose.functional": "Λειτουργικός",
+  "cookies.consent.purpose.statistical": "Στατιστικός",
+  "cookies.consent.update": "Υπήρξαν αλλαγές από την τελευταία σας επίσκεψη, ενημερώστε τη συγκατάθεσή σας.",
+  "curation-task.task.checklinks.label": "Ελέγξτε τους συνδέσμους στα μεταδεδομένα",
+  "curation-task.task.noop.label": "ΝΟΟΠ",
+  "curation-task.task.profileformats.label": "Προφίλ Μορφοτύπων Αρχείων",
+  "curation-task.task.requiredmetadata.label": "Ελέγξτε για Απαιτούμενα Μεταδεδομένα",
+  "curation-task.task.translate.label": "Μεταφραστής της Microsoft",
+  "curation-task.task.vscan.label": "Ελεγχος για ιούς",
+  "curation.form.handle.hint": "Συμβουλή: Εισαγάγετε [your-handle-prefix]/0 για να εκτελέσετε μια εργασία σε ολόκληρο τον ιστότοπο (μπορεί να μην υποστηρίζουν όλες οι εργασίες αυτήν τη δυνατότητα)",
+  "curation.form.handle.label": "Handle:",
+  "curation.form.submit": "Αρχή",
+  "curation.form.submit.error.content": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια έναρξης της εργασίας επιμέλειας.",
+  "curation.form.submit.error.head": "Η εκτέλεση της εργασίας επιμέλειας απέτυχε",
+  "curation.form.submit.error.invalid-handle": "Δεν ήταν δυνατός ο προσδιορισμός Handle για αυτό το τεκμήριο",
+  "curation.form.submit.success.content": "Θα ανακατευθυνθείτε στην αντίστοιχη σελίδα διαδικασίας.",
+  "curation.form.submit.success.head": "Η εργασία επιμέλειας ξεκίνησε με επιτυχία",
+  "curation.form.task-select.label": "Εργο:",
+  "default-relationships.search.results.head": "Αποτελέσματα αναζήτησης",
+  "default.search.results.head": "Αποτελέσματα αναζήτησης",
+  "deny-request-copy.email.message": "Αγαπητέ {{ recipientName }},\nΩς απάντηση στο αίτημά σας, με λύπη σας ενημερώνω ότι δεν είναι δυνατό να σας αποσταλεί αντίγραφο των αρχείων που ζητήσατε, σχετικά με το έγγραφο: \"{{ itemUrl }}\" ({{ itemName }}), εκ των οποίων Είμαι συγγραφέας.\n\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-selector.claim.item.body": "Αυτά είναι υπάρχοντα προφίλ που μπορεί να σχετίζονται με εσάς. Εάν αναγνωρίζετε τον εαυτό σας σε ένα από αυτά τα προφίλ, επιλέξτε το και στη σελίδα λεπτομερειών, ανάμεσα στις επιλογές, επιλέξτε να το διεκδικήσετε. Διαφορετικά, μπορείτε να δημιουργήσετε ένα νέο προφίλ από την αρχή χρησιμοποιώντας το παρακάτω κουμπί.",
+  "dso-selector.claim.item.create-from-scratch": "Δημιουργήστε ένα νέο",
+  "dso-selector.claim.item.head": "Συμβουλές προφίλ",
+  "dso-selector.claim.item.not-mine-label": "Κανένα από αυτά δεν είναι δικό μου",
+  "dso-selector.create.collection.head": "Νέα συλλογή",
+  "dso-selector.create.collection.sub-level": "Δημιουργήστε μια νέα συλλογή στο",
+  "dso-selector.create.community.head": "Νέα κοινότητα",
+  "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.no-results": "Δεν βρέθηκε {{ type }}",
+  "dso-selector.placeholder": "Αναζήτηση για ένα {{ type }}",
+  "dso-selector.select.collection.head": "Επιλέξτε μια συλλογή",
+  "dso-selector.set-scope.community.button": "Αναζήτηση σε όλο το DSpace",
+  "dso-selector.set-scope.community.head": "Επιλέξτε ένα εύρος αναζήτησης",
+  "dso-selector.set-scope.community.input-header": "Αναζήτηση κοινότητας ή συλλογής",
+  "dso.name.untitled": "Χωρίς τίτλο",
+  "error-page.description.401": "ανεξουσιοδότητος",
+  "error-page.description.403": "απαγορευμένος",
+  "error-page.description.404": "Η σελίδα δεν βρέθηκε",
+  "error-page.description.500": "Μη διαθέσιμη υπηρεσία",
+  "error-page.orcid.generic-error": "Παρουσιάστηκε σφάλμα κατά τη σύνδεση μέσω ORCID. Βεβαιωθείτε ότι έχετε μοιραστεί τη διεύθυνση email του λογαριασμού σας ORCID με το DSpace. Εάν το σφάλμα παραμένει, επικοινωνήστε με τον διαχειριστή",
+  "error.bitstream": "Σφάλμα κατά την ανάκτηση αρχείου",
+  "error.browse-by": "Σφάλμα κατά την ανάκτηση τεκμηρίων",
+  "error.collection": "Σφάλμα κατά την ανάκτηση της συλλογής",
+  "error.collections": "Σφάλμα κατά την ανάκτηση συλλογών",
+  "error.community": "Σφάλμα κατά την ανάκτηση της κοινότητας",
+  "error.default": "Λάθος",
+  "error.identifier": "Δεν βρέθηκε τεκμήριο για το αναγνωριστικό",
+  "error.invalid-search-query": "Το ερώτημα αναζήτησης δεν είναι έγκυρο. Ελέγξτε τις βέλτιστες πρακτικές <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Σύνταξη ερωτήματος Solr</a> για περισσότερες πληροφορίες σχετικά με αυτό το σφάλμα .",
+  "error.item": "Σφάλμα κατά την ανάκτηση του τεκμηρίου",
+  "error.items": "Σφάλμα κατά την ανάκτηση τεκμηρίων",
+  "error.objects": "Σφάλμα κατά την ανάκτηση αντικειμένων",
+  "error.recent-submissions": "Σφάλμα κατά την ανάκτηση πρόσφατων υποβολών",
+  "error.search-results": "Σφάλμα κατά την ανάκτηση των αποτελεσμάτων αναζήτησης",
+  "error.sub-collections": "Σφάλμα κατά την ανάκτηση υποσυλλογών",
+  "error.sub-communities": "Σφάλμα κατά την ανάκτηση υποκοινοτήτων",
+  "error.submission.sections.init-form-error": "Παρουσιάστηκε σφάλμα κατά την προετοιμασία ενότητας, ελέγξτε τη διαμόρφωση της φόρμας εισαγωγής. Λεπτομέρειες είναι παρακάτω: <br> <br>",
+  "error.top-level-communities": "Σφάλμα κατά την ανάκτηση κοινοτήτων ανώτατου επιπέδου",
+  "error.validation.NotValidEmail": "Αυτό το e-mail δεν είναι έγκυρο email",
+  "error.validation.emailTaken": "Αυτό το e-mail έχει ήδη ληφθεί",
+  "error.validation.filerequired": "Η αποστολή του αρχείου είναι υποχρεωτική",
+  "error.validation.groupExists": "Αυτή η ομάδα υπάρχει ήδη",
+  "error.validation.license.notgranted": "Πρέπει να χορηγήσετε αυτήν την άδεια για να ολοκληρώσετε την υποβολή σας. Εάν δεν μπορείτε να εκχωρήσετε αυτήν την άδεια αυτήν τη στιγμή, μπορείτε να αποθηκεύσετε την εργασία σας και να επιστρέψετε αργότερα ή να καταργήσετε την υποβολή.",
+  "error.validation.pattern": "Αυτή η είσοδος περιορίζεται από το τρέχον μοτίβο: {{ pattern }}.",
+  "error.validation.required": "Αυτό το πεδίο είναι υποχρεωτικό",
+  "feed.description": "Συνδικάτο τροφοδοσία",
+  "file-section.error.header": "Σφάλμα κατά τη λήψη αρχείων για αυτό το τεκμήριο",
+  "footer.copyright": "πνευματικά δικαιώματα © 2002-{{ year }}",
+  "footer.link.cookies": "Ρυθμίσεις cookie",
+  "footer.link.dspace": "Λογισμικό DSpace",
+  "footer.link.end-user-agreement": "Συμφωνία Τελικού Χρήστη",
+  "footer.link.feedback": "Στείλετε τα σχόλιά σας",
+  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.privacy-policy": "Πολιτική απορρήτου",
+  "forgot-email.form.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου *",
+  "forgot-email.form.email.error.pattern": "Συμπληρώστε μια έγκυρη διεύθυνση email",
+  "forgot-email.form.email.error.required": "Συμπληρώστε μια διεύθυνση email",
+  "forgot-email.form.email.hint": "Θα σταλεί ένα email σε αυτή τη διεύθυνση με περαιτέρω οδηγίες.",
+  "forgot-email.form.error.content": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια επαναφοράς του κωδικού πρόσβασης για τον λογαριασμό που σχετίζεται με την ακόλουθη διεύθυνση ηλεκτρονικού ταχυδρομείου: {{ email }}",
+  "forgot-email.form.error.head": "Σφάλμα κατά την προσπάθεια επαναφοράς του κωδικού πρόσβασης",
+  "forgot-email.form.header": "Ξεχάσατε τον κωδικό",
+  "forgot-email.form.info": "Εισαγάγετε τη διεύθυνση email που σχετίζεται με τον λογαριασμό.",
+  "forgot-email.form.submit": "Επαναφέρετε τον κωδικό πρόσβασης",
+  "forgot-email.form.success.content": "Έχει σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση {{ email }} που περιέχει μια ειδική διεύθυνση URL και περαιτέρω οδηγίες.",
+  "forgot-email.form.success.head": "Στάλθηκε email επαναφοράς κωδικού πρόσβασης",
+  "forgot-password.form.card.security": "Ασφάλεια",
+  "forgot-password.form.error.empty-password": "Εισαγάγετε έναν κωδικό πρόσβασης στο παρακάτω πλαίσιο.",
+  "forgot-password.form.error.matching-passwords": "Οι κωδικοί δεν ταιριάζουν.",
+  "forgot-password.form.error.password-length": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
+  "forgot-password.form.head": "Ξεχάσατε τον κωδικό",
+  "forgot-password.form.identification.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου:",
+  "forgot-password.form.identification.header": "Αναγνωρίζω",
+  "forgot-password.form.info": "Εισαγάγετε έναν νέο κωδικό πρόσβασης στο παρακάτω πλαίσιο και επιβεβαιώστε τον πληκτρολογώντας τον ξανά στο δεύτερο πλαίσιο. Θα πρέπει να αποτελείται από τουλάχιστον έξι χαρακτήρες.",
+  "forgot-password.form.label.password": "Κωδικός πρόσβασης",
+  "forgot-password.form.label.passwordrepeat": "Πληκτρολογήστε ξανά για επιβεβαίωση",
+  "forgot-password.form.notification.error.title": "Σφάλμα κατά την προσπάθεια υποβολής νέου κωδικού πρόσβασης",
+  "forgot-password.form.notification.success.content": "Η επαναφορά του κωδικού πρόσβασης ήταν επιτυχής. Έχετε συνδεθεί ως ο χρήστης που δημιουργήθηκε.",
+  "forgot-password.form.notification.success.title": "Η επαναφορά του κωδικού πρόσβασης ολοκληρώθηκε",
+  "forgot-password.form.submit": "Υποβολή κωδικού πρόσβασης",
+  "forgot-password.title": "Ξεχάσατε τον κωδικό",
+  "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.remove": "Αφαίρεση",
+  "form.repeatable.sort.tip": "Σύρετε το τεκμήριο στη νέα θέση",
+  "form.save": "Αποθήκευση",
+  "form.save-help": "Αποθήκευσε τις αλλαγές",
+  "form.search": "Αναζήτηση",
+  "form.search-help": "Κάντε κλικ εδώ για να αναζητήσετε μια υπάρχουσα αλληλογραφία",
+  "form.submit": "Αποθήκευση",
+  "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": "Αφού επιλέξετε μια επιλογή, θα σας παρουσιαστεί μια προτεινόμενη απάντηση μέσω email την οποία μπορείτε να επεξεργαστείτε.",
+  "grant-deny-request-copy.processed": "Αυτό το αίτημα έχει ήδη διεκπεραιωθεί. Μπορείτε να χρησιμοποιήσετε το παρακάτω κουμπί για να επιστρέψετε στην αρχική σελίδα.",
+  "grant-request-copy.email.message": "Αγαπητέ {{ recipientName }},\nΩς απάντηση στο αίτημά σας, έχω τη χαρά να σας στείλω επισυναπτόμενο αντίγραφο του αρχείου(ων) που αφορά το έγγραφο: \"{{ itemUrl }}\" ({{ itemName }}), του οποίου είμαι συντάκτης.\n\nΤις καλύτερες ευχές,\n{{ authorName }} <{{ authorEmail }}>",
+  "grant-request-copy.email.subject": "Ζητήστε αντίγραφο εγγράφου",
+  "grant-request-copy.error": "Παρουσιάστηκε σφάλμα",
+  "grant-request-copy.header": "Αίτημα αντιγραφής παραχώρησης εγγράφου",
+  "grant-request-copy.intro": "Αυτό το μήνυμα θα σταλεί στον αιτούντα του αιτήματος. Το(τα) έγγραφο(α) που ζητήθηκαν θα επισυναφθούν.",
+  "grant-request-copy.success": "Το αίτημα τεκμηρίου εγκρίθηκε με επιτυχία",
+  "health-page.error.msg": "Η υπηρεσία ελέγχου υγείας δεν είναι διαθέσιμη προσωρινά",
+  "health-page.heading": "Υγεία",
+  "health-page.info-tab": "Πληροφορίες",
+  "health-page.property.status": "Κωδικός κατάστασης",
+  "health-page.section-info.app.title": "Εφαρμογή Backend",
+  "health-page.section-info.java.title": "Java",
+  "health-page.section.db.title": "Βάση δεδομένων",
+  "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.no-issues": "Δεν εντοπίστηκαν προβλήματα",
+  "health-page.section.solrAuthorityCore.title": "Solr: πυρήνας authority",
+  "health-page.section.solrOaiCore.title": "Solr: πυρήνας oai",
+  "health-page.section.solrSearchCore.title": "Solr: πυρήνας search",
+  "health-page.section.solrStatisticsCore.title": "Solr: πυρήνας statistics",
+  "health-page.status": "Κατάσταση",
+  "health-page.status-tab": "Κατάσταση",
+  "health-page.status.error.info": "Εντοπίστηκαν προβλήματα",
+  "health-page.status.ok.info": "Λειτουργικό",
+  "health-page.status.warning.info": "Εντοπίστηκαν πιθανά προβλήματα",
+  "health-page.title": "Υγεία",
+  "health.breadcrumbs": "Υγεία",
+  "home.breadcrumbs": "Αρχική",
+  "home.description": "",
+  "home.search-form.placeholder": "Αναζήτηση στο αποθετήριο...",
+  "home.title": "Αρχική",
+  "home.top-level-communities.head": "Κοινότητες στο DSpace",
+  "home.top-level-communities.help": "Επιλέξτε μια κοινότητα για να περιηγηθείτε στις συλλογές της.",
+  "idle-modal.extend-session": "Επέκταση συνεδρίας",
+  "idle-modal.header": "Η συνεδρία θα λήξει σύντομα",
+  "idle-modal.info": "Για λόγους ασφαλείας, οι περίοδοι σύνδεσης χρήστη λήγουν μετά από {{ timeToExpire }} λεπτά αδράνειας. Η συνεδρία σας θα λήξει σύντομα. Θέλετε να το επεκτείνετε ή να αποσυνδεθείτε;",
+  "idle-modal.log-out": "Αποσύνδεση",
+  "iiif.listelement.badge": "Μέσα εικόνας",
+  "iiif.page.description": "Περιγραφή:",
+  "iiif.page.doi": "Μόνιμος σύνδεσμος:",
+  "iiif.page.issue": "Θέμα:",
+  "iiif.page.titleprefix": "Εικόνα:",
+  "iiifsearchable.listelement.badge": "Μέσα εγγράφων",
+  "iiifsearchable.page.description": "Περιγραφή:",
+  "iiifsearchable.page.doi": "Μόνιμος σύνδεσμος:",
+  "iiifsearchable.page.issue": "Θέμα:",
+  "iiifsearchable.page.titleprefix": "Εγγραφο:",
+  "iiifviewer.fullscreen.notice": "Χρησιμοποιήστε πλήρη οθόνη για καλύτερη προβολή.",
+  "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.feedback.breadcrumbs": "Ανατροφοδότηση",
+  "info.feedback.comments": "Σχόλια",
+  "info.feedback.create.success": "Τα σχόλια εστάλησαν με επιτυχία!",
+  "info.feedback.email-label": "Το ηλεκτρονικό σου ταχυδρομείο",
+  "info.feedback.email_help": "Αυτή η διεύθυνση θα χρησιμοποιηθεί για την παρακολούθηση των σχολίων σας.",
+  "info.feedback.error.email.required": "Μια έγκυρη διεύθυνση email απαιτείται",
+  "info.feedback.error.message.required": "Απαιτείται σχόλιο",
+  "info.feedback.head": "Ανατροφοδότηση",
+  "info.feedback.info": "Ευχαριστούμε που μοιραστήκατε τα σχόλιά σας σχετικά με το σύστημα DSpace. Τα σχόλιά σας εκτιμώνται!",
+  "info.feedback.page-label": "Σελίδα",
+  "info.feedback.page_help": "Αυτή η σελίδα σχετίζεται με τα σχόλιά σας",
+  "info.feedback.send": "Στείλετε τα σχόλιά σας",
+  "info.feedback.title": "Επικοινωνία",
+  "info.privacy.breadcrumbs": "Δήλωση προστασίας προσωπικών δεδομένων",
+  "info.privacy.head": "Δήλωση προστασίας προσωπικών δεδομένων",
+  "info.privacy.title": "Δήλωση προστασίας προσωπικών δεδομένων",
+  "item.alerts.private": "Αυτό το τεκμήριο δεν μπορεί να ανακαλυφθεί",
+  "item.alerts.withdrawn": "Αυτό το τεκμήριο έχει αποσυρθεί",
+  "item.badge.private": "Μη ανακαλυπτόμενο",
+  "item.badge.withdrawn": "Αποτραβηγμένος",
+  "item.bitstreams.upload.bundle": "Φάκελος/Πακέτο",
+  "item.bitstreams.upload.bundle.new": "Δημιουργία φακέλου/πακέτου",
+  "item.bitstreams.upload.bundle.placeholder": "Επιλέξτε ένα φάκελο/πακέτο ή εισαγάγετε νέο όνομα φακέλου/πακέτου",
+  "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.authorizations.heading": "Με αυτό το πρόγραμμα επεξεργασίας μπορείτε να προβάλετε και να τροποποιήσετε τις πολιτικές μιας εγγραφής, καθώς και να τροποποιήσετε τις πολιτικές για μεμονωμένα τεκμήρια εγγραφών: φάκελους/πακέτα και αρχεία. Εν συντομία, μια εγγραφή είναι ένα κοντέινερ με φακέλους/πακέτα και οι φάκελοι/πακέτα είναι συλλέκτες αρχείων. Οι φάκελοι/πακέτα έχουν συνήθως πολιτικές ADD/REMOVE/READ/WRITE, ενώ τα αρχεία έχουν μόνο πολιτικές READ/WRITE.",
+  "item.edit.authorizations.title": "Επεξεργασία των πολιτικών του τεκμηρίου",
+  "item.edit.bitstreams.bundle.displaying": "Αυτήν τη στιγμή εμφανίζονται {{ amount }} αρχεία από {{ total }}.",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Μεταφόρτωση",
+  "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": "Οι αλλαγές είναι ξεπερασμένες (outdated)",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Σφάλμα κατά τη διαγραφή bitstream",
+  "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.breadcrumbs": "Επεξεργασία τεκμηρίου",
+  "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.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.edit": "Επεξεργασία",
+  "item.edit.metadata.edit.buttons.remove": "Αφαίρεση",
+  "item.edit.metadata.edit.buttons.undo": "Αναίρεση αλλαγών",
+  "item.edit.metadata.edit.buttons.unedit": "Σταματήστε την επεξεργασία",
+  "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.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": "Τροποποιήθηκε (outdated)",
+  "item.edit.metadata.notifications.saved.content": "Οι αλλαγές σας στα μεταδεδομένα αυτού του τεκμηρίου αποθηκεύτηκαν.",
+  "item.edit.metadata.notifications.saved.title": "Τα μεταδεδομένα αποθηκεύτηκαν",
+  "item.edit.metadata.reinstate-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.description": "Επιλέξτε τη συλλογή στην οποία θέλετε να μετακινήσετε αυτό το τεκμήριο. Για να περιορίσετε τη λίστα των εμφανιζόμενων συλλογών, μπορείτε να εισαγάγετε ένα ερώτημα αναζήτησης στο πλαίσιο.",
+  "item.edit.move.discard-button": "Απόρριψη",
+  "item.edit.move.error": "Παρουσιάστηκε σφάλμα κατά την προσπάθεια μετακίνησης του τεκμηρίου",
+  "item.edit.move.head": "Μετακίνηση τεκμηρίου: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Inherited πολιτικές",
+  "item.edit.move.inheritpolicies.description": "Μεταβιβάστε τις προεπιλεγμένες πολιτικές της συλλογής προορισμού",
+  "item.edit.move.move": "Μετακίνηση",
+  "item.edit.move.processing": "Μετακίνηση...",
+  "item.edit.move.save-button": "Αποθήκευση",
+  "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-entity-type": "Προσθέστε μεταδεδομένα 'dspace.entity.type' για να ενεργοποιήσετε τις σχέσεις για αυτό το τεκμήριο",
+  "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": "Οι αλλαγές είναι ξεπερασμένες (outdated)",
+  "item.edit.relationships.notifications.saved.content": "Οι αλλαγές σας στις σχέσεις αυτού του τεκμηρίου αποθηκεύτηκαν.",
+  "item.edit.relationships.notifications.saved.title": "Οι σχέσεις σώθηκαν",
+  "item.edit.relationships.reinstate-button": "Αναίρεση",
+  "item.edit.relationships.save-button": "Αποθήκευση",
+  "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.tabs.disabled.tooltip": "Δεν έχετε εξουσιοδότηση πρόσβασης σε αυτήν την καρτέλα",
+  "item.edit.tabs.item-mapper.title": "Επεξεργασία τεκμηρίου - αντιστοίχηση συλλογής",
+  "item.edit.tabs.mapper.head": "αντιστοίχηση συλλογής",
+  "item.edit.tabs.metadata.head": "Metadata",
+  "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": "Εσωτερικό αναγνωριστικό τεκμηρίου",
+  "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.listelement.badge": "Τεκμήριο",
+  "item.orcid.return": "Επιστροφή",
+  "item.page.abstract": "Περίληψη",
+  "item.page.author": "Συγγραφείς",
+  "item.page.bitstreams.collapse": "Σύμπτηξη",
+  "item.page.bitstreams.view-more": "Δείτε περισσότερα",
+  "item.page.citation": "Παραπομπή",
+  "item.page.claim.button": "Απαίτηση",
+  "item.page.claim.tooltip": "Διεκδικήστε αυτό το τεκμήριο ως προφίλ",
+  "item.page.collections": "Συλλογές",
+  "item.page.collections.load-more": "Φόρτωσε περισσότερα",
+  "item.page.collections.loading": "Φόρτωση...",
+  "item.page.date": "Ημερομηνία",
+  "item.page.description": "Περιγραφή",
+  "item.page.edit": "Επεξεργαστείτε αυτό το τεκμήριο",
+  "item.page.files": "Αρχεία",
+  "item.page.filesection.description": "Περιγραφή:",
+  "item.page.filesection.download": "Κατεβάστε",
+  "item.page.filesection.format": "Μορφότυπο:",
+  "item.page.filesection.license.bundle": "Φάκελος/Πακέτο αδειών",
+  "item.page.filesection.name": "Ονομα:",
+  "item.page.filesection.original.bundle": "Πρωτότυπος φάκελος/πακέτο",
+  "item.page.filesection.size": "Μέγεθος:",
+  "item.page.journal-issn": "Περιοδικό ISSN",
+  "item.page.journal-title": "Τίτλος Εφημερίδας",
+  "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.publisher": "Εκδότης",
+  "item.page.related-items.view-less": "Απόκρυψη τελευταίου {{ amount }}",
+  "item.page.related-items.view-more": "Εμφάνιση {{ amount }} ακόμη",
+  "item.page.relationships.isAuthorOfPublication": "Δημοσιεύσεις",
+  "item.page.relationships.isJournalOfPublication": "Δημοσιεύσεις",
+  "item.page.relationships.isOrgUnitOfPerson": "Συγγραφείς",
+  "item.page.relationships.isOrgUnitOfProject": "Ερευνητικά έργα",
+  "item.page.return": "Επιστροφή",
+  "item.page.subject": "Λέξεις-κλειδιά",
+  "item.page.titleprefix": "Είδος:",
+  "item.page.uri": "URI",
+  "item.page.version.create": "Δημιουργία νέας έκδοσης",
+  "item.page.version.hasDraft": "Δεν είναι δυνατή η δημιουργία νέας έκδοσης επειδή υπάρχει μια υποβολή σε εξέλιξη στο ιστορικό εκδόσεων",
+  "item.page.volume-title": "Τίτλος τόμου",
+  "item.preview.dc.contributor.author": "Συγγραφείς:",
+  "item.preview.dc.coverage.spatial": "Τοπική κάλυψη:",
+  "item.preview.dc.date.issued": "Ημερομηνία δημοσίευσης:",
+  "item.preview.dc.description.abstract": "Περίληψη:",
+  "item.preview.dc.identifier": "Αναγνωριστικό:",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.other": "Άλλο αναγνωριστικό:",
+  "item.preview.dc.identifier.uri": "Αναγνωριστικό URI:",
+  "item.preview.dc.language.iso": "Γλώσσα:",
+  "item.preview.dc.relation.ispartof": "Περιοδικό ή Σειρά",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.subject": "Μαθήματα:",
+  "item.preview.dc.title": "Τίτλος:",
+  "item.preview.dc.title.alternative": "Αρκτικόλεξο:",
+  "item.preview.dc.type": "Τύπος:",
+  "item.preview.oaire.awardNumber": "Αναγνωριστικό χρηματοδότησης:",
+  "item.preview.oaire.citation.issue": "Θέμα",
+  "item.preview.oaire.citation.volume": "Τόμος",
+  "item.preview.oaire.fundingStream": "Ροή χρηματοδότησης:",
+  "item.preview.person.familyName": "Επώνυμο:",
+  "item.preview.person.givenName": "Ονομα:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.identifier": "Αναγνωριστικό χρηματοδότη:",
+  "item.preview.project.funder.name": "Χρηματοδότης:",
+  "item.search.results.head": "Αποτελέσματα αναζήτησης τεκμηρίων",
+  "item.search.title": "Αναζήτηση τεκμηρ'ιου",
+  "item.select.confirm": "Επιβεβαιώστε την επιλογή",
+  "item.select.empty": "Δεν υπάρχουν τεκμήρια για εμφάνιση",
+  "item.select.table.author": "Συγγραφέας",
+  "item.select.table.collection": "Συλλογή",
+  "item.select.table.title": "Τίτλος",
+  "item.truncatable-part.show-less": "Σύμπτηξη",
+  "item.truncatable-part.show-more": "Δείτε περισσότερα",
+  "item.version.create.modal.button.cancel": "Ακύρωση",
+  "item.version.create.modal.button.cancel.tooltip": "Μην δημιουργήσετε νέα έκδοση",
+  "item.version.create.modal.button.confirm": "Δημιουργώ",
+  "item.version.create.modal.button.confirm.tooltip": "Δημιουργία νέας έκδοσης",
+  "item.version.create.modal.form.summary.label": "Περίληψη",
+  "item.version.create.modal.form.summary.placeholder": "Εισαγάγετε τη σύνοψη για τη νέα έκδοση",
+  "item.version.create.modal.header": "Νέα έκδοση",
+  "item.version.create.modal.submitted.header": "Δημιουργία νέας έκδοσης...",
+  "item.version.create.modal.submitted.text": "Η νέα έκδοση δημιουργείται. Αυτό μπορεί να πάρει κάποιο χρόνο εάν το τεκμήριο έχει πολλές σχέσεις.",
+  "item.version.create.modal.text": "Δημιουργήστε μια νέα έκδοση για αυτό το τεκμήριο",
+  "item.version.create.modal.text.startingFrom": "ξεκινώντας από την έκδοση {{version}}",
+  "item.version.create.notification.failure": "Δεν έχει δημιουργηθεί νέα έκδοση",
+  "item.version.create.notification.inProgress": "Δεν είναι δυνατή η δημιουργία νέας έκδοσης επειδή υπάρχει μια υποβολή σε εξέλιξη στο ιστορικό εκδόσεων",
+  "item.version.create.notification.success": "Δημιουργήθηκε νέα έκδοση με αριθμό έκδοσης {{version}}",
+  "item.version.delete.modal.button.cancel": "Ακύρωση",
+  "item.version.delete.modal.button.cancel.tooltip": "Μην διαγράψετε αυτήν την έκδοση",
+  "item.version.delete.modal.button.confirm": "Διαγραφή",
+  "item.version.delete.modal.button.confirm.tooltip": "Διαγράψτε αυτήν την έκδοση",
+  "item.version.delete.modal.header": "Διαγραφή έκδοσης",
+  "item.version.delete.modal.text": "Θέλετε να διαγράψετε την έκδοση {{version}};",
+  "item.version.delete.notification.failure": "Ο αριθμός έκδοσης {{version}} δεν έχει διαγραφεί",
+  "item.version.delete.notification.success": "Ο αριθμός έκδοσης {{version}} έχει διαγραφεί",
+  "item.version.edit.notification.failure": "Η περίληψη του αριθμού έκδοσης {{version}} δεν έχει αλλάξει",
+  "item.version.edit.notification.success": "Η σύνοψη του αριθμού έκδοσης {{version}} έχει αλλάξει",
+  "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.action.deleteVersion": "Διαγραφή έκδοσης",
+  "item.version.history.table.action.discardSummary": "Απόρριψη συνοπτικών επεξεργασιών",
+  "item.version.history.table.action.editSummary": "Επεξεργασία περίληψης",
+  "item.version.history.table.action.editWorkspaceItem": "Επεξεργασία workspace τεκμηρίου",
+  "item.version.history.table.action.hasDraft": "Δεν είναι δυνατή η δημιουργία νέας έκδοσης επειδή υπάρχει μια υποβολή σε εξέλιξη στο ιστορικό εκδόσεων",
+  "item.version.history.table.action.newVersion": "Δημιουργήστε νέα έκδοση από αυτήν",
+  "item.version.history.table.action.saveSummary": "Αποθήκευση συνοπτικών επεξεργασιών",
+  "item.version.history.table.actions": "Ενέργεια",
+  "item.version.history.table.date": "Ημερομηνία",
+  "item.version.history.table.editor": "Συντάκτης",
+  "item.version.history.table.item": "Τεκμήριο",
+  "item.version.history.table.summary": "Περίληψη",
+  "item.version.history.table.version": "Εκδοχή",
+  "item.version.history.table.workflowItem": "τεκμήριο ροής εργασιών",
+  "item.version.history.table.workspaceItem": "τεκμήριο χώρου εργασίας",
+  "item.version.notice": "Αυτή δεν είναι η πιο πρόσφατη έκδοση αυτού του τεκμηρίου. Μπορείτε να βρείτε την πιο πρόσφατη έκδοση <a href='{{destination}}'>εδώ</a>.",
+  "journal-relationships.search.results.head": "Αποτελέσματα αναζήτησης περιοδικών",
+  "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.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": "Τομος",
+  "loading.bitstream": "Φόρτωση αρχείου...",
+  "loading.bitstreams": "Φόρτωση αρχείων...",
+  "loading.browse-by": "Φόρτωση τεκμηρίων...",
+  "loading.browse-by-page": "Φόρτωση σελίδας...",
+  "loading.collection": "Φόρτωση συλλογής...",
+  "loading.collections": "Φόρτωση συλλογών...",
+  "loading.community": "Φόρτωση κοινότητας...",
+  "loading.content-source": "Φόρτωση πηγής περιεχομένου...",
+  "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.breadcrumbs": "Σύνδεση",
+  "login.form.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
+  "login.form.forgot-password": "Έχετε ξεχάσει τον κωδικό σας;",
+  "login.form.header": "Παρακαλούμε συνδεθείτε στο DSpace",
+  "login.form.new-user": "Νέος χρήστης? Κάντε κλικ εδώ για να εγγραφείτε.",
+  "login.form.oidc": "Συνδεθείτε με το OIDC",
+  "login.form.or-divider": "ή",
+  "login.form.orcid": "Συνδεθείτε με το ORCID",
+  "login.form.password": "Κωδικός πρόσβασης",
+  "login.form.shibboleth": "Συνδεθείτε με το Shibboleth",
+  "login.form.submit": "Σύνδεση",
+  "login.title": "Σύνδεση",
+  "logout.form.header": "Αποσυνδεθείτε από το DSpace",
+  "logout.form.submit": "Αποσύνδεση",
+  "logout.title": "Αποσύνδεση",
+  "media-viewer.next": "Επόμενο",
+  "media-viewer.playlist": "Λίστα αναπαραγωγής",
+  "media-viewer.previous": "Προηγούμενο",
+  "menu.header.admin": "Διαχείριση",
+  "menu.header.admin.description": "Μενού διαχείρισης",
+  "menu.header.image.logo": "Λογότυπο αποθετηρίου",
+  "menu.section.access_control": "Έλεγχος πρόσβασης",
+  "menu.section.access_control_authorizations": "Εξουσιοδοτήσεις",
+  "menu.section.access_control_groups": "Ομάδες",
+  "menu.section.access_control_people": "Ανθρωποι",
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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": "Αναζήτηση διαχειριστή",
+  "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": "Όλο το DSpace",
+  "menu.section.browse_global_by_author": "Ανά Συγγραφέα",
+  "menu.section.browse_global_by_dateissued": "Ανά Ημερομηνία Έκδοσης",
+  "menu.section.browse_global_by_subject": "Ανά θέμα",
+  "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.health": "Υγεία",
+  "menu.section.icon.access_control": "Ενότητα μενού ελέγχου πρόσβασης",
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
+  "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": "Ενότητα μενού εργασιών Statistics",
+  "menu.section.icon.unpin": "Ξεκαρφιτσώστε την πλαϊνή γραμμή",
+  "menu.section.icon.workflow": "Διαχείριση ενότητας μενού ροής εργασιών",
+  "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.processes": "Διαδικασίες",
+  "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.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  "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.unpin": "Ξεκαρφιτσώστε το πλαϊνό μενού",
+  "menu.section.workflow": "Διαχείριση ροής εργασιών",
+  "metadata-export-search.submit.error": "Η έναρξη της εξαγωγής απέτυχε",
+  "metadata-export-search.submit.success": "Η εξαγωγή ξεκίνησε με επιτυχία",
+  "metadata-export-search.tooltip": "Εξαγωγή αποτελεσμάτων αναζήτησης ως CSV",
+  "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.description": "",
+  "mydspace.general.text-here": "εδώ",
+  "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.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.upload.upload-successful": "Δημιουργήθηκε νέο τεκμήριο χώρου εργασίας. Κάντε κλικ {{here}} για να το επεξεργαστείτε.",
+  "mydspace.view-btn": "Προβολή",
+  "nav.browse.header": "Όλο το DSpace",
+  "nav.community-browse.header": "Ανά Κοινότητα",
+  "nav.language": "Εναλλαγή γλώσσας",
+  "nav.login": "Σύνδεση",
+  "nav.logout": "Μενού προφίλ χρήστη και Αποσύνδεση",
+  "nav.main.description": "Κύρια γραμμή πλοήγησης",
+  "nav.mydspace": "MyDSpace",
+  "nav.profile": "Προφίλ",
+  "nav.search": "Αναζήτηση",
+  "nav.statistics.header": "Στατιστικά",
+  "nav.stop-impersonating": "Σταματήστε να υποδύεστε το EPerson",
+  "nav.toggle": "Εναλλαγή πλοήγησης",
+  "nav.user.description": "Γραμμή προφίλ χρήστη",
+  "none.listelement.badge": "Τεκμήριο",
+  "orgunit.listelement.badge": "Οργανωτική Μονάδα",
+  "orgunit.page.city": "Πόλη",
+  "orgunit.page.country": "Χώρα",
+  "orgunit.page.dateestablished": "Ημερομηνία καθορισμού",
+  "orgunit.page.description": "Περιγραφή",
+  "orgunit.page.edit": "Επεξεργαστείτε αυτό το τεκμήριο",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Μονάδα οργανισμού:",
+  "pagination.next.button": "Επόμενο",
+  "pagination.next.button.disabled.tooltip": "Δεν υπάρχουν άλλες σελίδες αποτελεσμάτων",
+  "pagination.options.description": "Επιλογές σελιδοποίησης",
+  "pagination.previous.button": "Προηγούμενος",
+  "pagination.results-per-page": "Αποτελέσματα ανά σελίδα",
+  "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.label": "Τώρα δείχνει",
+  "pagination.sort-direction": "Επιλογές ταξινόμησης",
+  "person-relationships.search.results.head": "Αποτελέσματα αναζήτησης ατόμων",
+  "person.listelement.badge": "Πρόσωπο",
+  "person.listelement.no-title": "Δεν βρέθηκε όνομα",
+  "person.orcid.registry.auth": "Εξουσιοδοτήσεις ORCID",
+  "person.orcid.registry.queue": "Ουρά μητρώου ORCID",
+  "person.orcid.sync.setting": "ORCID Ρυθμίσεις συγχρονισμού",
+  "person.page.birthdate": "Ημερομηνία γέννησης",
+  "person.page.edit": "Επεξεργαστείτε αυτό το τεκμήριο",
+  "person.page.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
+  "person.page.firstname": "Ονομα",
+  "person.page.jobtitle": "Τίτλος εργασίας",
+  "person.page.lastname": "Επίθετο",
+  "person.page.link.full": "Εμφάνιση όλων των μεταδεδομένων",
+  "person.page.name": "Ονομα",
+  "person.page.orcid": "ORCID",
+  "person.page.orcid.create": "Δημιουργήστε ένα αναγνωριστικό ORCID",
+  "person.page.orcid.funding-preferences": "Προτιμήσεις χρηματοδότησης",
+  "person.page.orcid.grant-authorizations": "Χορήγηση εξουσιοδοτήσεων",
+  "person.page.orcid.granted-authorizations": "Χορηγημένες εξουσιοδοτήσεις",
+  "person.page.orcid.link": "Συνδεθείτε στο ORCID ID",
+  "person.page.orcid.link.error.message": "Κάτι πήγε στραβά κατά τη σύνδεση του προφίλ με το ORCID. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον διαχειριστή.",
+  "person.page.orcid.link.processing": "Σύνδεση προφίλ με ORCID...",
+  "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. Κάνοντας κλικ στο κουμπί παρακάτω, μπορείτε να συνδέσετε αυτό το προφίλ με έναν λογαριασμό ORCID.",
+  "person.page.orcid.orcid-not-linked-message": "Το αναγνωριστικό ORCID αυτού του προφίλ ({{ orcid }}) δεν έχει συνδεθεί ακόμη σε λογαριασμό στο μητρώο ORCID ή η σύνδεση έχει λήξει.",
+  "person.page.orcid.profile-preferences": "Προτιμήσεις προφίλ",
+  "person.page.orcid.publications-preferences": "Προτιμήσεις δημοσίευσης",
+  "person.page.orcid.remove-orcid-message": "Εάν πρέπει να καταργήσετε το ORCID σας, επικοινωνήστε με τον διαχειριστή του αποθετηρίου",
+  "person.page.orcid.save.preference.changes": "Ρυθμίσεις ενημέρωσης",
+  "person.page.orcid.scope.activities-update": "Προσθέστε/ενημερώστε τις ερευνητικές σας δραστηριότητες",
+  "person.page.orcid.scope.authenticate": "Λάβετε το αναγνωριστικό ORCID σας",
+  "person.page.orcid.scope.person-update": "Προσθέστε/ενημερώστε άλλες πληροφορίες για εσάς",
+  "person.page.orcid.scope.read-limited": "Διαβάστε τις πληροφορίες σας με ορατότητα σε Αξιόπιστα μέρη",
+  "person.page.orcid.sync-fundings.all": "Όλες οι χρηματοδοτήσεις",
+  "person.page.orcid.sync-fundings.disabled": "χρήστες με ειδικές ανάγκες",
+  "person.page.orcid.sync-fundings.mine": "Οι χρηματοδοτήσεις μου",
+  "person.page.orcid.sync-fundings.my_selected": "Επιλεγμένες χρηματοδοτήσεις",
+  "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-publications.all": "Όλες οι δημοσιεύσεις",
+  "person.page.orcid.sync-publications.disabled": "χρήστες με ειδικές ανάγκες",
+  "person.page.orcid.sync-publications.mine": "Οι δημοσιεύσεις μου",
+  "person.page.orcid.sync-publications.my_selected": "Επιλεγμένες δημοσιεύσεις",
+  "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": "Εξωτερικά αναγνωριστικά",
+  "person.page.orcid.sync-queue.description.keywords": "Λέξεις-κλειδιά",
+  "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.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.send": "Συγχρονισμός με το μητρώο ORCID",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Η υποβολή στο ORCID απέτυχε επειδή ο πόρος που στάλθηκε στο μητρώο ORCID δεν είναι έγκυρος",
+  "person.page.orcid.sync-queue.send.conflict-error": "Η υποβολή στο ORCID απέτυχε επειδή ο πόρος υπάρχει ήδη στο μητρώο ORCID",
+  "person.page.orcid.sync-queue.send.error": "Η υποβολή στο 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.unauthorized-error.content": "Κάντε κλικ <a href='{{orcid}}'>εδώ</a> για να εκχωρήσετε ξανά τα απαιτούμενα δικαιώματα. Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον διαχειριστή",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Η υποβολή στο 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.country.invalid": "Μη έγκυρη 2ψήφια χώρα ISO 3166",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Απαιτείται ένα αναγνωριστικό για την αποσαφήνιση των οργανισμών. Τα υποστηριζόμενα αναγνωριστικά είναι αναγνωριστικά GRID, Ringgold, Legal Entity identifiers (LEI) και Crossref Funder Registry",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Τα αναγνωριστικά του οργανισμού απαιτούν μια τιμή",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Η πηγή ενός από τα αναγνωριστικά οργανισμού δεν είναι έγκυρη. Οι υποστηριζόμενες πηγές είναι οι RINGGOLD, GRID, LEI και FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Τα αναγνωριστικά του οργανισμού απαιτούν πηγή",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Ο πόρος που θα σταλεί απαιτεί τουλάχιστον ένα αναγνωριστικό",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Ζητείται ο χρηματοδότης",
+  "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.organization.name-required": "Το όνομα του οργανισμού είναι υποχρεωτικό",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Η οργάνωση απαιτείται",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Η ημερομηνία δημοσίευσης πρέπει να είναι ένα έτος μετά το 1900",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.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.table.header.action": "Ενέργεια",
+  "person.page.orcid.sync-queue.table.header.description": "Περιγραφή",
+  "person.page.orcid.sync-queue.table.header.type": "Τύπος",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Σχετιζόμενος οργανισμός",
+  "person.page.orcid.sync-queue.tooltip.country": "Χώρα",
+  "person.page.orcid.sync-queue.tooltip.delete": "Καταργήστε αυτήν την καταχώρηση από το μητρώο ORCID",
+  "person.page.orcid.sync-queue.tooltip.education": "Επίπεδο εκπαίδευσης",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Εξωτερικό αναγνωριστικό",
+  "person.page.orcid.sync-queue.tooltip.insert": "Προσθέστε μια νέα καταχώρηση στο μητρώο ORCID",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Λέξη-κλειδί",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Αλλο όνομα",
+  "person.page.orcid.sync-queue.tooltip.project": "Εργο",
+  "person.page.orcid.sync-queue.tooltip.publication": "Δημοσίευση",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Προσόν",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "Διεύθυνση URL ερευνητή",
+  "person.page.orcid.sync-queue.tooltip.update": "Ενημερώστε αυτήν την καταχώρηση στο μητρώο ORCID",
+  "person.page.orcid.synchronization-mode": "Λειτουργία συγχρονισμού",
+  "person.page.orcid.synchronization-mode-funding-message": "Επιλέξτε εάν θα στείλετε τις συνδεδεμένες οντότητες του Έργου στη λίστα πληροφοριών χρηματοδότησης της εγγραφής σας ORCID.",
+  "person.page.orcid.synchronization-mode-message": "Επιλέξτε πώς θέλετε να γίνει ο συγχρονισμός με το ORCID. Οι επιλογές περιλαμβάνουν \"Μη αυτόματα\" (πρέπει να στείλετε τα δεδομένα σας στο ORCID με μη αυτόματο τρόπο) ή \"Μαζί\" (το σύστημα θα στείλει τα δεδομένα σας στο ORCID μέσω προγραμματισμένου σεναρίου).",
+  "person.page.orcid.synchronization-mode-profile-message": "Επιλέξτε εάν θα στείλετε τα βιογραφικά σας δεδομένα ή τα προσωπικά σας αναγνωριστικά στο αρχείο ORCID.",
+  "person.page.orcid.synchronization-mode-publication-message": "Επιλέξτε εάν θα στείλετε τις συνδεδεμένες οντότητες Δημοσιεύσεών σας στη λίστα έργων της εγγραφής σας ORCID.",
+  "person.page.orcid.synchronization-mode.batch": "Σύνολο παραγωγής",
+  "person.page.orcid.synchronization-mode.label": "Λειτουργία συγχρονισμού",
+  "person.page.orcid.synchronization-mode.manual": "Εγχειρίδιο",
+  "person.page.orcid.synchronization-settings-update.error": "Η ενημέρωση των ρυθμίσεων συγχρονισμού απέτυχε",
+  "person.page.orcid.synchronization-settings-update.success": "Οι ρυθμίσεις συγχρονισμού ενημερώθηκαν με επιτυχία",
+  "person.page.orcid.unlink": "Αποσύνδεση από το ORCID",
+  "person.page.orcid.unlink.error": "Παρουσιάστηκε σφάλμα κατά την αποσύνδεση μεταξύ του προφίλ και του μητρώου ORCID. Προσπάθησε ξανά",
+  "person.page.orcid.unlink.processing": "Επεξεργασία...",
+  "person.page.orcid.unlink.success": "Η αποσύνδεση μεταξύ του προφίλ και του μητρώου ORCID ήταν επιτυχής",
+  "person.page.staffid": "Ταυτότητα προσωπικού",
+  "person.page.titleprefix": "Πρόσωπο:",
+  "person.search.results.head": "Αποτελέσματα αναζήτησης ατόμων",
+  "person.search.title": "Αναζήτηση Προσώπων",
+  "process.detail.arguments": "Παράμετροι",
+  "process.detail.arguments.empty": "Αυτή η διαδικασία δεν περιέχει παραμέτρους",
+  "process.detail.back": "Επιστροφή",
+  "process.detail.create": "Δημιουργήστε παρόμοια διαδικασία",
+  "process.detail.end-time": "Ώρα λήξης",
+  "process.detail.logs.button": "Ανάκτηση εξόδου διαδικασίας",
+  "process.detail.logs.loading": "Ανάκτηση",
+  "process.detail.logs.none": "Αυτή η διαδικασία δεν έχει κάποιο αποτέλεσμα εξόδου",
+  "process.detail.output": "Έξοδος διαδικασίας",
+  "process.detail.output-files": "Αρχεία εξόδου",
+  "process.detail.output-files.empty": "Αυτή η διαδικασία δεν περιέχει αρχεία εξόδου",
+  "process.detail.script": "Γραφή",
+  "process.detail.start-time": "Ωρα έναρξης",
+  "process.detail.status": "Κατάσταση",
+  "process.detail.title": "Διαδικασία: {{ id }} - {{ name }}",
+  "process.new.breadcrumbs": "Δημιουργήστε μια νέα διαδικασία",
+  "process.new.cancel": "Ακύρωση",
+  "process.new.header": "Δημιουργήστε μια νέα διαδικασία",
+  "process.new.notification.error.content": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία αυτής της διαδικασίας",
+  "process.new.notification.error.title": "Λάθος",
+  "process.new.notification.success.content": "Η διαδικασία δημιουργήθηκε με επιτυχία",
+  "process.new.notification.success.title": "Επιτυχία",
+  "process.new.parameter.file.required": "Επιλέξτε ένα αρχείο",
+  "process.new.parameter.file.upload-button": "Επιλογή αρχείου...",
+  "process.new.parameter.required.missing": "Απαιτούνται οι ακόλουθες παράμετροι αλλά εξακολουθούν να λείπουν:",
+  "process.new.parameter.string.required": "Απαιτείται τιμή παραμέτρου",
+  "process.new.parameter.type.file": "αρχείο",
+  "process.new.parameter.type.value": "τιμή",
+  "process.new.select-parameters": "Παράμετροι",
+  "process.new.select-script": "Script",
+  "process.new.select-script.placeholder": "Επιλέξτε ένα Script...",
+  "process.new.select-script.required": "Απαιτείται Script",
+  "process.new.submit": "Αποθήκευση",
+  "process.new.title": "Δημιουργήστε μια νέα διαδικασία",
+  "process.overview.breadcrumbs": "Επισκόπηση διαδικασιών",
+  "process.overview.new": "Νέο",
+  "process.overview.table.finish": "Ώρα λήξης (UTC)",
+  "process.overview.table.id": "Αναγνωριστικό διαδικασίας",
+  "process.overview.table.name": "Ονομα",
+  "process.overview.table.start": "Ώρα έναρξης (UTC)",
+  "process.overview.table.status": "Κατάσταση",
+  "process.overview.table.user": "Χρήστης",
+  "process.overview.title": "Επισκόπηση διαδικασιών",
+  "profile.breadcrumbs": "Ανανέωση προφίλ",
+  "profile.card.identify": "Αναγνωρίζω",
+  "profile.card.researcher": "Προφίλ ερευνητή",
+  "profile.card.security": "Ασφάλεια",
+  "profile.form.submit": "Αποθήκευση",
+  "profile.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.error.password-length": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
+  "profile.security.form.info": "Προαιρετικά, μπορείτε να εισαγάγετε έναν νέο κωδικό πρόσβασης στο παρακάτω πλαίσιο και να τον επιβεβαιώσετε πληκτρολογώντας τον ξανά στο δεύτερο πλαίσιο. Θα πρέπει να αποτελείται από τουλάχιστον έξι χαρακτήρες.",
+  "profile.security.form.label.password": "Κωδικός πρόσβασης",
+  "profile.security.form.label.passwordrepeat": "Πληκτρολογήστε ξανά για επιβεβαίωση",
+  "profile.security.form.notifications.error.not-long-enough": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
+  "profile.security.form.notifications.error.not-same": "Οι παρεχόμενοι κωδικοί πρόσβασης δεν είναι οι ίδιοι.",
+  "profile.security.form.notifications.error.title": "Σφάλμα αλλαγής κωδικών πρόσβασης",
+  "profile.security.form.notifications.success.content": "Οι αλλαγές σας στον κωδικό πρόσβασης αποθηκεύτηκαν.",
+  "profile.security.form.notifications.success.title": "Ο κωδικός πρόσβασης αποθηκεύτηκε",
+  "profile.special.groups.head": "Εξουσιοδότηση ειδικών ομάδων στις οποίες ανήκετε",
+  "profile.title": "Ανανέωση προφίλ",
+  "project-relationships.search.results.head": "Αποτελέσματα αναζήτησης έργου",
+  "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": "Αποτελέσματα αναζήτησης έργου",
+  "publication-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.search.title": "Αναζήτηση δημοσιεύσεων",
+  "register-email.title": "Εγγραφή νέου χρήστη",
+  "register-page.create-profile.header": "Δημιουργία Προφίλ",
+  "register-page.create-profile.identification.contact": "Τηλέφωνο Επικοινωνίας",
+  "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.header": "Αναγνωριστικό",
+  "register-page.create-profile.identification.language": "Γλώσσα",
+  "register-page.create-profile.identification.last-name": "Επίθετο *",
+  "register-page.create-profile.identification.last-name.error": "Παρακαλώ συμπληρώστε ένα Επώνυμο",
+  "register-page.create-profile.security.error.empty-password": "Εισαγάγετε έναν κωδικό πρόσβασης στο παρακάτω πλαίσιο.",
+  "register-page.create-profile.security.error.matching-passwords": "Οι κωδικοί δεν ταιριάζουν.",
+  "register-page.create-profile.security.error.password-length": "Ο κωδικός πρόσβασης πρέπει να αποτελείται από τουλάχιστον 6 χαρακτήρες.",
+  "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.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.email": "Διεύθυνση ηλεκτρονικού ταχυδρομείου *",
+  "register-page.registration.email.error.pattern": "Συμπληρώστε μια έγκυρη διεύθυνση email",
+  "register-page.registration.email.error.required": "Συμπληρώστε μια διεύθυνση email",
+  "register-page.registration.email.hint": "Αυτή η διεύθυνση θα επαληθευτεί και θα χρησιμοποιηθεί ως το όνομα σύνδεσής σας.",
+  "register-page.registration.error.content": "Παρουσιάστηκε σφάλμα κατά την εγγραφή της ακόλουθης διεύθυνσης email: {{ email }}",
+  "register-page.registration.error.head": "Σφάλμα κατά την προσπάθεια εγγραφής email",
+  "register-page.registration.header": "Εγγραφή νέου χρήστη",
+  "register-page.registration.info": "Καταχωρίστε έναν λογαριασμό για να εγγραφείτε σε συλλογές για ενημερώσεις email και υποβάλετε νέα τεκμήρια στο DSpace.",
+  "register-page.registration.submit": "Εγγραφή",
+  "register-page.registration.success.content": "Έχει σταλεί ένα μήνυμα ηλεκτρονικού ταχυδρομείου στη διεύθυνση {{ email }} που περιέχει μια ειδική διεύθυνση URL και περαιτέρω οδηγίες.",
+  "register-page.registration.success.head": "Το email επαλήθευσης στάλθηκε",
+  "relationships.add.error.relationship-type.content": "Δεν βρέθηκε κατάλληλη αντιστοίχιση για τον τύπο σχέσης {{ type }} μεταξύ των δύο τεκμηρίων",
+  "relationships.add.error.server.content": "Ο διακομιστής επέστρεψε ένα σφάλμα",
+  "relationships.add.error.title": "Δεν είναι δυνατή η προσθήκη σχέσης",
+  "relationships.isAuthorOf": "Συγγραφείς",
+  "relationships.isAuthorOf.OrgUnit": "Συγγραφείς (οργανωτικές μονάδες)",
+  "relationships.isAuthorOf.Person": "Συγγραφείς (πρόσωπα)",
+  "relationships.isContributorOf": "Συντελεστής",
+  "relationships.isContributorOf.OrgUnit": "Συντελεστής (Οργανωτική Μονάδα)",
+  "relationships.isContributorOf.Person": "Συντελεστής",
+  "relationships.isFundingAgencyOf.OrgUnit": "Χρηματοδότης",
+  "relationships.isIssueOf": "Θέματα περιοδικών",
+  "relationships.isJournalIssueOf": "Τεύχος περιοδικού",
+  "relationships.isJournalOf": "περιοδικά",
+  "relationships.isOrgUnitOf": "Μονάδες οργανισμού",
+  "relationships.isPersonOf": "Συγγραφείς",
+  "relationships.isProjectOf": "Ερευνητικά έργα",
+  "relationships.isPublicationOf": "Δημοσιεύσεις",
+  "relationships.isPublicationOfJournalIssue": "Άρθρα",
+  "relationships.isSingleJournalOf": "Εφημερίδα",
+  "relationships.isSingleVolumeOf": "Τόμος περιοδικού",
+  "relationships.isVolumeOf": "Τόμοι περιοδικών",
+  "repository.image.logo": "Λογότυπο αποθετηρίου",
+  "repository.title.prefix": "DSpace Angular ::",
+  "repository.title.prefixDSpace": "DSpace Angular ::",
+  "researcher.profile.action.processing": "Επεξεργασία...",
+  "researcher.profile.associated": "Σχετικό προφίλ ερευνητή",
+  "researcher.profile.change-visibility.fail": "Παρουσιάστηκε ένα μη αναμενόμενο σφάλμα κατά την αλλαγή της προβολής του προφίλ",
+  "researcher.profile.create.fail": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία του προφίλ ερευνητή",
+  "researcher.profile.create.new": "Δημιουργία νέου",
+  "researcher.profile.create.success": "Το προφίλ ερευνητή δημιουργήθηκε με επιτυχία",
+  "researcher.profile.delete": "Διαγραφή",
+  "researcher.profile.expose": "Εκθέτω",
+  "researcher.profile.hide": "Κρύβω",
+  "researcher.profile.not.associated": "Το προφίλ ερευνητή δεν έχει συσχετιστεί ακόμη",
+  "researcher.profile.private.visibility": "ΙΔΙΩΤΙΚΟ",
+  "researcher.profile.public.visibility": "ΔΗΜΟΣΙΟ",
+  "researcher.profile.status": "Κατάσταση:",
+  "researcher.profile.view": "Προβολή",
+  "researcherprofile.claim.not-authorized": "Δεν είστε εξουσιοδοτημένοι να διεκδικήσετε αυτό το τεκμήριο. Για περισσότερες λεπτομέρειες επικοινωνήστε με τους διαχειριστές.",
+  "researcherprofile.error.claim.body": "Παρουσιάστηκε σφάλμα κατά την αξίωση του προφίλ, δοκιμάστε ξανά αργότερα",
+  "researcherprofile.error.claim.title": "Λάθος",
+  "researcherprofile.success.claim.body": "Το προφίλ διεκδικήθηκε με επιτυχία",
+  "researcherprofile.success.claim.title": "Επιτυχία",
+  "resource-policies.add.button": "Προσθήκη",
+  "resource-policies.add.for.": "Προσθέστε μια νέα πολιτική",
+  "resource-policies.add.for.bitstream": "Προσθέστε μια νέα πολιτική αρχείου",
+  "resource-policies.add.for.bundle": "Προσθέστε μια νέα πολιτική φακέλου/πακέτου",
+  "resource-policies.add.for.collection": "Προσθέστε μια νέα πολιτική συλλογής",
+  "resource-policies.add.for.community": "Προσθέστε μια νέα πολιτική Κοινότητας",
+  "resource-policies.add.for.item": "Προσθέστε μια νέα πολιτική αντικειμένου",
+  "resource-policies.create.page.failure.content": "Παρουσιάστηκε σφάλμα κατά τη δημιουργία της πολιτικής πόρων.",
+  "resource-policies.create.page.heading": "Δημιουργία νέας πολιτικής πόρων για",
+  "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.failure.content": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία της πολιτικής πόρων.",
+  "resource-policies.edit.page.heading": "Επεξεργασία πολιτικής πόρων",
+  "resource-policies.edit.page.other-failure.content": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία της πολιτικής πόρων. Ο στόχος (ePerson ή ομάδα) ενημερώθηκε με επιτυχία.",
+  "resource-policies.edit.page.success.content": "Επιτυχής λειτουργία",
+  "resource-policies.edit.page.target-failure.content": "Παρουσιάστηκε σφάλμα κατά την επεξεργασία του στόχου (ePerson ή ομάδα) της πολιτικής πόρων.",
+  "resource-policies.edit.page.title": "Επεξεργασία πολιτικής πόρων",
+  "resource-policies.form.action-type.label": "Επιλέξτε τον τύπο ενέργειας",
+  "resource-policies.form.action-type.required": "Πρέπει να επιλέξετε την ενέργεια της πολιτικής πόρων.",
+  "resource-policies.form.date.end.label": "Ημερομηνία λήξης",
+  "resource-policies.form.date.start.label": "Ημερομηνία έναρξης",
+  "resource-policies.form.description.label": "Περιγραφή",
+  "resource-policies.form.eperson-group-list.label": "Το άτομο ή η ομάδα που θα λάβει την άδεια",
+  "resource-policies.form.eperson-group-list.modal.close": "Εντάξει",
+  "resource-policies.form.eperson-group-list.modal.header": "Δεν είναι δυνατή η αλλαγή τύπου",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Δεν είναι δυνατή η αντικατάσταση μιας ομάδας με ένα ePerson.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Δεν είναι δυνατή η αντικατάσταση ενός ePerson με μια ομάδα.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Διαγράψτε την τρέχουσα πολιτική πόρων και δημιουργήστε μια νέα με τον επιθυμητό τύπο.",
+  "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.name.label": "Ονομα",
+  "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": "EPson",
+  "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.collection": "Πολιτικές για τη συλλογή",
+  "resource-policies.table.headers.title.for.community": "Πολιτικές για την Κοινότητα",
+  "resource-policies.table.headers.title.for.item": "Πολιτικές για το τεκμήριο",
+  "search.breadcrumbs": "Αναζήτηση",
+  "search.description": null,
+  "search.filters.applied.f.author": "Συγγραφέας",
+  "search.filters.applied.f.birthDate.max": "Ημερομηνία λήξης γέννησης",
+  "search.filters.applied.f.birthDate.min": "Ημερομηνία γέννησης",
+  "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.jobTitle": "Τίτλος εργασίας",
+  "search.filters.applied.f.namedresourcetype": "Κατάσταση",
+  "search.filters.applied.f.subject": "Θέμα",
+  "search.filters.applied.f.submitter": "Αναρτητής",
+  "search.filters.applied.f.withdrawn": "Διαγραμμένο",
+  "search.filters.discoverable.false": "Ναί",
+  "search.filters.discoverable.true": "Οχι",
+  "search.filters.entityType.JournalIssue": "Τεύχος περιοδικού",
+  "search.filters.entityType.JournalVolume": "Τόμος περιοδικού",
+  "search.filters.entityType.OrgUnit": "Οργανωτική Μονάδα",
+  "search.filters.filter.author.head": "Συγγραφέας",
+  "search.filters.filter.author.label": "Αναζήτηση ονόματος συγγραφέα",
+  "search.filters.filter.author.placeholder": "Όνομα συγγραφέα",
+  "search.filters.filter.birthDate.head": "Ημερομηνία γέννησης",
+  "search.filters.filter.birthDate.label": "Αναζήτηση ημερομηνίας γέννησης",
+  "search.filters.filter.birthDate.placeholder": "Ημερομηνία γέννησης",
+  "search.filters.filter.collapse": "Σύμπτυξη φίλτρου",
+  "search.filters.filter.creativeDatePublished.head": "Ημερομηνία δημοσίευσης",
+  "search.filters.filter.creativeDatePublished.label": "Δημοσίευση ημερομηνίας αναζήτησης",
+  "search.filters.filter.creativeDatePublished.placeholder": "Ημερομηνία δημοσίευσης",
+  "search.filters.filter.creativeWorkEditor.head": "Συντάκτης",
+  "search.filters.filter.creativeWorkEditor.label": "Επεξεργαστής αναζήτησης",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Συντάκτης",
+  "search.filters.filter.creativeWorkKeywords.head": "Θέμα",
+  "search.filters.filter.creativeWorkKeywords.label": "Αναζήτηση θέματος",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Θέμα",
+  "search.filters.filter.creativeWorkPublisher.head": "Εκδότης",
+  "search.filters.filter.creativeWorkPublisher.label": "Αναζήτηση εκδότη",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Εκδότης",
+  "search.filters.filter.dateIssued.head": "Ημερομηνία",
+  "search.filters.filter.dateIssued.max.label": "Τέλος",
+  "search.filters.filter.dateIssued.max.placeholder": "Μέγιστη ημερομηνία",
+  "search.filters.filter.dateIssued.min.label": "Αρχή",
+  "search.filters.filter.dateIssued.min.placeholder": "Ελάχιστη ημερομηνία",
+  "search.filters.filter.dateSubmitted.head": "Ημερομηνία υποβολής",
+  "search.filters.filter.dateSubmitted.label": "Ημερομηνία υποβολής αναζήτησης",
+  "search.filters.filter.dateSubmitted.placeholder": "Ημερομηνία υποβολής",
+  "search.filters.filter.discoverable.head": "Μη ανακαλύψιμο",
+  "search.filters.filter.entityType.head": "Τύπος αντικειμένου",
+  "search.filters.filter.entityType.label": "Αναζήτηση τύπου αντικειμένου",
+  "search.filters.filter.entityType.placeholder": "Τύπος αντικειμένου",
+  "search.filters.filter.expand": "Αναπτύξτε το φίλτρο",
+  "search.filters.filter.has_content_in_original_bundle.head": "Έχει αρχεία",
+  "search.filters.filter.itemtype.head": "Τύπος",
+  "search.filters.filter.itemtype.label": "Τύπος αναζήτησης",
+  "search.filters.filter.itemtype.placeholder": "Τύπος",
+  "search.filters.filter.jobTitle.head": "Τίτλος εργασίας",
+  "search.filters.filter.jobTitle.label": "Αναζήτηση τίτλου εργασίας",
+  "search.filters.filter.jobTitle.placeholder": "Τίτλος εργασίας",
+  "search.filters.filter.knowsLanguage.head": "Γνωστή γλώσσα",
+  "search.filters.filter.knowsLanguage.label": "Αναζήτηση γνωστής γλώσσας",
+  "search.filters.filter.knowsLanguage.placeholder": "Γνωστή γλώσσα",
+  "search.filters.filter.namedresourcetype.head": "Κατάσταση",
+  "search.filters.filter.namedresourcetype.label": "Κατάσταση αναζήτησης",
+  "search.filters.filter.namedresourcetype.placeholder": "Κατάσταση",
+  "search.filters.filter.objectpeople.head": "Ανθρωποι",
+  "search.filters.filter.objectpeople.label": "Αναζήτηση ατόμων",
+  "search.filters.filter.objectpeople.placeholder": "Ανθρωποι",
+  "search.filters.filter.organizationAddressCountry.head": "Χώρα",
+  "search.filters.filter.organizationAddressCountry.label": "Αναζήτηση χώρας",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Χώρα",
+  "search.filters.filter.organizationAddressLocality.head": "Πόλη",
+  "search.filters.filter.organizationAddressLocality.label": "Αναζήτηση πόλης",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Πόλη",
+  "search.filters.filter.organizationFoundingDate.head": "Ημερομηνία ίδρυσης",
+  "search.filters.filter.organizationFoundingDate.label": "Ημερομηνία ίδρυσης αναζήτησης",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Ημερομηνία ίδρυσης",
+  "search.filters.filter.scope.head": "Πεδίο εφαρμογής",
+  "search.filters.filter.scope.label": "Φίλτρο εύρους αναζήτησης",
+  "search.filters.filter.scope.placeholder": "Φίλτρο εύρους",
+  "search.filters.filter.show-less": "Δείτε λιγότερα",
+  "search.filters.filter.show-more": "Δείτε περισσότερα",
+  "search.filters.filter.subject.head": "Θέμα",
+  "search.filters.filter.subject.label": "Αναζήτηση θέματος",
+  "search.filters.filter.subject.placeholder": "Θέμα",
+  "search.filters.filter.submitter.head": "Υποβάλλων",
+  "search.filters.filter.submitter.label": "Αναζήτηση υποβάλλοντος",
+  "search.filters.filter.submitter.placeholder": "Υποβάλλων",
+  "search.filters.filter.withdrawn.head": "Διαγραμμένο",
+  "search.filters.has_content_in_original_bundle.false": "Οχι",
+  "search.filters.has_content_in_original_bundle.true": "Ναί",
+  "search.filters.head": "Φίλτρα",
+  "search.filters.reset": "Επαναφορά φίλτρων",
+  "search.filters.search.submit": "υποβάλλουν",
+  "search.filters.withdrawn.false": "Οχι",
+  "search.filters.withdrawn.true": "Ναί",
+  "search.form.scope.all": "Όλο το DSpace",
+  "search.form.search": "Αναζήτηση",
+  "search.form.search_dspace": "Όλο το αποθετήριο",
+  "search.results.empty": "Η αναζήτηση δεν επέστρεψε κανένα αποτέλεσμα.",
+  "search.results.head": "Αποτελέσματα αναζήτησης",
+  "search.results.no-results": "Η αναζήτηση δεν επέστρεψε κανένα αποτέλεσμα. Δυσκολεύεστε να βρείτε αυτό που ψάχνετε; Δοκιμάστε να βάλετε",
+  "search.results.no-results-link": "κάποια αποσπάσματα",
+  "search.results.view-result": "Προβολή",
+  "search.search-form.placeholder": "Αναζήτηση στο αποθετήριο...",
+  "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.switch-configuration.title": "προβολή",
+  "search.title": "Αναζήτηση",
+  "search.view-switch.show-detail": "Δείξε λεπτομέρεια",
+  "search.view-switch.show-grid": "Εμφάνιση ως πλέγμα",
+  "search.view-switch.show-list": "Εμφάνιση ως λίστα",
+  "sorting.ASC": "Αύξουσα",
+  "sorting.DESC": "Φθίνων",
+  "sorting.dc.date.accessioned.ASC": "Ημερομηνία πρόσβασης Αύξουσα",
+  "sorting.dc.date.accessioned.DESC": "Ημερομηνία πρόσβασης Φθίνουσα",
+  "sorting.dc.date.issued.ASC": "Ημερομηνία Διάθεσης Αύξουσα",
+  "sorting.dc.date.issued.DESC": "Ημερομηνία Διάθεσης Φθίνουσα",
+  "sorting.dc.title.ASC": "Τίτλος Αύξουσα",
+  "sorting.dc.title.DESC": "Τίτλος Φθίνουσα",
+  "sorting.lastModified.ASC": "Τελευταία τροποποίηση Αύξουσα",
+  "sorting.lastModified.DESC": "Τελευταία τροποποίηση Φθίνουσα",
+  "sorting.score.ASC": "Λιγότερο σχετικό",
+  "sorting.score.DESC": "Το πιο σχετικό",
+  "statistics.breadcrumbs": "Στατιστικά",
+  "statistics.header": "Στατιστικά στοιχεία για {{ range }}",
+  "statistics.page.no-data": "Δεν υπάρχουν διαθέσιμα δεδομένα",
+  "statistics.table.header.views": "Προβολές",
+  "statistics.table.no-data": "Δεν υπάρχουν διαθέσιμα δεδομένα",
+  "statistics.table.title.TopCities": "Κορυφαίες προβολές ανά πόλη",
+  "statistics.table.title.TopCountries": "Κορυφαίες προβολές ανά χώρα",
+  "statistics.table.title.TotalDownloads": "Λήψεις αρχείων",
+  "statistics.table.title.TotalVisits": "Συνολικές επισκέψεις",
+  "statistics.table.title.TotalVisitsPerMonth": "Συνολικές επισκέψεις ανά μήνα",
+  "statistics.title": "Στατιστικά",
+  "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.pending-changes": "Μη αποθηκευμένες αλλαγές",
+  "submission.general.info.saved": "Αποθηκεύτηκε",
+  "submission.general.save": "Αποθήκευση",
+  "submission.general.save-later": "Αποθήκευση για αργότερα",
+  "submission.import-external.back-to-my-dspace": "Επιστροφή στο χώρο μου",
+  "submission.import-external.page.hint": "Εισαγάγετε ένα ερώτημα παραπάνω για να βρείτε τεκμήρια από τον ιστό για εισαγωγή στο DSpace.",
+  "submission.import-external.page.title": "Εισαγωγή μεταδεδομένων από εξωτερική πηγή",
+  "submission.import-external.preview.button.import": "Έναρξη υποβολής",
+  "submission.import-external.preview.error.import.body": "Παρουσιάζεται σφάλμα κατά τη διαδικασία εισαγωγής εισαγωγής εξωτερικής πηγής.",
+  "submission.import-external.preview.error.import.title": "Σφάλμα υποβολής",
+  "submission.import-external.preview.subtitle": "Τα παρακάτω μεταδεδομένα εισήχθησαν από εξωτερική πηγή. Θα είναι προσυμπληρωμένο όταν ξεκινήσετε την υποβολή.",
+  "submission.import-external.preview.title": "Προεπισκόπηση τεκμηρίου",
+  "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.title.Publication": "Προεπισκόπηση δημοσίευσης",
+  "submission.import-external.preview.title.none": "Προεπισκόπηση τεκμηρίου",
+  "submission.import-external.search.button": "Αναζήτηση",
+  "submission.import-external.search.button.hint": "Γράψτε μερικές λέξεις για αναζήτηση",
+  "submission.import-external.search.placeholder": "Αναζήτηση στην εξωτερική πηγή",
+  "submission.import-external.search.source.hint": "Επιλέξτε μια εξωτερική πηγή",
+  "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.epo": "Ευρωπαϊκό Γραφείο Διπλωμάτων Ευρεσιτεχνίας (EPO)",
+  "submission.import-external.source.lcname": "Βιβλιοθήκη Ονομάτων του Κογκρέσου (Library of Congress Names)",
+  "submission.import-external.source.loading": "Φόρτωση ...",
+  "submission.import-external.source.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.pubmed": "Δημοσιεύτηκε",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.sherpaJournal": "Περιοδικά SHERPA",
+  "submission.import-external.source.sherpaJournalIssn": "Περιοδικά SHERPA από το ISSN",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Web Of Science",
+  "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.sections.accesses.form.access-condition-hint": "Επιλέξτε μια συνθήκη πρόσβασης που θα εφαρμοστεί στο τεκμήριο μετά την κατάθεσή του",
+  "submission.sections.accesses.form.access-condition-label": "Τύπος συνθήκης πρόσβασης",
+  "submission.sections.accesses.form.date-required": "Απαιτείται ημερομηνία.",
+  "submission.sections.accesses.form.date-required-from": "Απαιτείται πρόσβαση επιχορήγησης από την ημερομηνία.",
+  "submission.sections.accesses.form.date-required-until": "Απαιτείται παραχώρηση πρόσβασης μέχρι την ημερομηνία.",
+  "submission.sections.accesses.form.discoverable-description": "Όταν είναι επιλεγμένο, αυτό το τεκμήριο θα μπορεί να εντοπιστεί στην αναζήτηση/περιήγηση. Όταν δεν είναι επιλεγμένο, το τεκμήριο θα είναι διαθέσιμο μόνο μέσω απευθείας συνδέσμου και δεν θα εμφανίζεται ποτέ στην αναζήτηση/περιήγηση.",
+  "submission.sections.accesses.form.discoverable-label": "Ανακαλύψιμο",
+  "submission.sections.accesses.form.from-hint": "Επιλέξτε την ημερομηνία από την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
+  "submission.sections.accesses.form.from-label": "Παραχώρηση πρόσβασης από",
+  "submission.sections.accesses.form.from-placeholder": "Από",
+  "submission.sections.accesses.form.group-label": "Ομάδα",
+  "submission.sections.accesses.form.group-required": "Απαιτείται ομάδα.",
+  "submission.sections.accesses.form.until-hint": "Επιλέξτε την ημερομηνία μέχρι την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
+  "submission.sections.accesses.form.until-label": "Παραχώρηση πρόσβασης μέχρι",
+  "submission.sections.accesses.form.until-placeholder": "Μέχρι",
+  "submission.sections.ccLicense.change": "Αλλάξτε τον τύπο της άδειας σας…",
+  "submission.sections.ccLicense.confirmation": "Παραχωρώ την παραπάνω άδεια",
+  "submission.sections.ccLicense.link": "Έχετε επιλέξει την ακόλουθη άδεια χρήσης:",
+  "submission.sections.ccLicense.none": "Δεν υπάρχουν διαθέσιμες άδειες",
+  "submission.sections.ccLicense.option.select": "Επιλέξτε μια επιλογή…",
+  "submission.sections.ccLicense.select": "Επιλέξτε έναν τύπο άδειας…",
+  "submission.sections.ccLicense.type": "Τύπος άδειας",
+  "submission.sections.describe.relationship-lookup.close": "Κλείσιμο",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Προστέθηκε με επιτυχία η τοπική καταχώριση στην επιλογή",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Εισαγωγή απομακρυσμένου εξοπλισμού",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Εισαγωγή απομακρυσμένης εκδήλωσης",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Εισαγωγή απομακρυσμένης χρηματοδότησης",
+  "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.Journal": "Εισαγωγή απομακρυσμένου περιοδικού",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Εισαγωγή απομακρυσμένης μονάδας οργανισμού",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Εισαγωγή απομακρυσμένου διπλώματος ευρεσιτεχνίας",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Εισαγωγή απομακρυσμένου ατόμου",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Εισαγωγή απομακρυσμένου προϊόντος",
+  "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-button-title.isAuthorOfPublication": "Εισαγωγή απομακρυσμένου συγγραφέα",
+  "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-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 Issue.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.Journal Volume.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.title": "Εισαγωγή απομακρυσμένου περιοδικού",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Εισαγωγή authority",
+  "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.arxiv": "Εισαγωγή από το arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Εισαγωγή από LC Name",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Εισαγωγή από ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Εισαγωγή από το PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Εισαγωγή από το Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Εισαγωγή από τον Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Εισαγωγή",
+  "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.isAuthorOfPublication.title": "Εισαγωγή απομακρυσμένου συντάκτη",
+  "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.select": "Επιλέξτε ένα τοπικό αποτέλεσμα (ταίριασμα):",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Αποθηκεύστε μια νέα παραλλαγή ονόματος",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Θέλετε να αποθηκεύσετε το \"{{ value }}\" ως παραλλαγή ονόματος για αυτό το άτομο, ώστε εσείς και άλλοι να το χρησιμοποιήσετε ξανά για μελλοντικές υποβολές; Εάν δεν το κάνετε, μπορείτε ακόμα να το χρησιμοποιήσετε για αυτήν την υποβολή.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Χρησιμοποιήστε μόνο για αυτήν την υποβολή",
+  "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.search-tab.tab-title.DataFile": "Αρχεία τοπικών δεδομένων ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Τοπικά πακέτα δεδομένων ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Τοπικά περιοδικά ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Θέματα τοπικών περιοδικών ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Τόμοι τοπικών περιοδικών ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Τοπικές οργανωτικές μονάδες ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Τοπικοί συντάκτες ({{ 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.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Τοπικοί συντάκτες ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Αναζήτηση για Οργανωτικές Μονάδες",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Χρηματοδότης του Έργου",
+  "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.isJournalIssueOfPublication": "Θέματα τοπικών περιοδικών ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Τοπικά περιοδικά ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Τόμοι τοπικών περιοδικών ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Εργα",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Ονόματα LC ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Περιοδικά Sherpa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Εναλλαγή αναπτυσσόμενου μενού",
+  "submission.sections.describe.relationship-lookup.selected": "Επιλεγμένα {{ size }} τεκμήρια",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Η επιλογή σας αυτή τη στιγμή είναι κενή.",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Αναζήτηση...",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ρυθμίσεις",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Τρέχουσα επιλογή ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Αποτελέσματα αναζήτησης",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Επιλεγμένα Αρχεία Δεδομένων",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Επιλεγμένα πακέτα δεδομένων",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Επιλεγμένα περιοδικά",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Επιλεγμένο θέμα",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Επιλεγμένος τόμος περιοδικού",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Επιλεγμένες μονάδες οργανισμού",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Επιλεγμένοι Συγγραφείς",
+  "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.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.isAuthorOfPublication": "Επιλεγμένοι Συγγραφείς",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Επιλεγμένη Μονάδα Οργανισμού",
+  "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.isJournalIssueOfPublication": "Επιλεγμένος τομος",
+  "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.isProjectOfPublication": "Εργο",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Αποτελέσματα αναζήτησης",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Χρηματοδότηση OpenAIRE API",
+  "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.pubmed": "Αποτελέσματα αναζήτησης",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Αποτελέσματα αναζήτησης",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Αποτελέσματα αναζήτησης",
+  "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.wos": "Αποτελέσματα αναζήτησης",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Αρχεία δεδομένων",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Πακέτα δεδομένων",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Οργανισμός Χρηματοδότησης",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Θέματα περιοδικών",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Τόμοι περιοδικών",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Οργανωτικές Μονάδες",
+  "submission.sections.describe.relationship-lookup.title.Person": "Συγγραφείς",
+  "submission.sections.describe.relationship-lookup.title.Project": "Εργα",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Δημοσιεύσεις",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Συγγραφείς",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Οργανωτική Μονάδα Γονέων",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Χρηματοδότης του Έργου",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Οργανισμός Χρηματοδότησης",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Χρηματοδότηση",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Θέματα περιοδικών",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "περιοδικά",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Τόμοι περιοδικών",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Εργα",
+  "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.license.granted-label": "Επιβεβαιώνω την παραπάνω άδεια",
+  "submission.sections.license.notgranted": "Πρέπει να αποδεχτείτε την άδεια",
+  "submission.sections.license.required": "Πρέπει να αποδεχτείτε την άδεια",
+  "submission.sections.sherpa-policy.title-empty": "Δεν υπάρχουν διαθέσιμες πληροφορίες πολιτικής εκδότη. Εάν η εργασία σας έχει συσχετισμένο ISSN, καταχωρίστε το παραπάνω για να δείτε τυχόν σχετικές πολιτικές ανοιχτής πρόσβασης εκδότη.",
+  "submission.sections.sherpa.error.message": "Παρουσιάστηκε σφάλμα κατά την ανάκτηση των πληροφοριών σέρπα",
+  "submission.sections.sherpa.publication.information": "Πληροφορίες δημοσίευσης",
+  "submission.sections.sherpa.publication.information.issns": "ISSN",
+  "submission.sections.sherpa.publication.information.publishers": "Εκδότης",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.title": "Τίτλος",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publisher.policy": "Πολιτική εκδότη",
+  "submission.sections.sherpa.publisher.policy.conditions": "Συνθήκες",
+  "submission.sections.sherpa.publisher.policy.description": "Οι παρακάτω πληροφορίες βρέθηκαν μέσω του Sherpa Romeo. Βάσει των πολιτικών του εκδότη σας, παρέχει συμβουλές σχετικά με το εάν μπορεί να είναι απαραίτητο ένα εμπάργκο ή/και ποια αρχεία επιτρέπεται να ανεβάσετε. Εάν έχετε ερωτήσεις, επικοινωνήστε με τον διαχειριστή του ιστότοπού σας μέσω της φόρμας σχολίων στο υποσέλιδο.",
+  "submission.sections.sherpa.publisher.policy.embargo": "Απαγόρευση",
+  "submission.sections.sherpa.publisher.policy.license": "Αδεια",
+  "submission.sections.sherpa.publisher.policy.location": "Τοποθεσία",
+  "submission.sections.sherpa.publisher.policy.more.information": "Για περισσότερες πληροφορίες, δείτε τους παρακάτω συνδέσμους:",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Χωρίς εμπάργκο",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Κανένας",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Οι διαδρομές ανοιχτής πρόσβασης που επιτρέπονται από την πολιτική αυτού του περιοδικού παρατίθενται παρακάτω ανά έκδοση άρθρου. Κάντε κλικ σε μια διαδρομή για μια πιο λεπτομερή προβολή",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Προαπαιτούμενα",
+  "submission.sections.sherpa.publisher.policy.refresh": "Ανανέωση",
+  "submission.sections.sherpa.publisher.policy.version": "Εκδοχή",
+  "submission.sections.sherpa.record.information": "Πληροφορίες εγγραφής",
+  "submission.sections.sherpa.record.information.date.created": "Ημερομηνία Δημιουργίας",
+  "submission.sections.sherpa.record.information.date.modified": "Τελευταία τροποποίηση",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.status.errors.aria": "έχει λάθη",
+  "submission.sections.status.errors.title": "Σφάλματα",
+  "submission.sections.status.info.aria": "Επιπλέον πληροφορίες",
+  "submission.sections.status.info.title": "Επιπλέον πληροφορίες",
+  "submission.sections.status.valid.aria": "είναι έγκυρο",
+  "submission.sections.status.valid.title": "Εγκυρος",
+  "submission.sections.status.warnings.aria": "έχει προειδοποιήσεις",
+  "submission.sections.status.warnings.title": "Προειδοποιήσεις",
+  "submission.sections.submit.progressbar.CClicense": "Άδεια Creative Commons",
+  "submission.sections.submit.progressbar.accessCondition": "Συνθήκες πρόσβασης σε είδη",
+  "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.license": "Άδεια κατάθεσης",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Πληροφορίες πολιτικής ανοιχτής πρόσβασης εκδότη",
+  "submission.sections.submit.progressbar.sherpapolicy": "Πολιτικές Σέρπα",
+  "submission.sections.submit.progressbar.upload": "Μεταφόρτωση αρχείων",
+  "submission.sections.toggle.aria.close": "Σύμπτυξη ενότητας {{sectionHeader}}",
+  "submission.sections.toggle.aria.open": "Αναπτύξτε την ενότητα {{sectionHeader}}",
+  "submission.sections.toggle.close": "Κλείσιμο ενότητας",
+  "submission.sections.toggle.open": "Ανοίξτε την ενότητα",
+  "submission.sections.upload.delete.confirm.cancel": "Ακύρωση",
+  "submission.sections.upload.delete.confirm.info": "Αυτή η λειτουργία δεν μπορεί να αναιρεθεί. Είσαι σίγουρος?",
+  "submission.sections.upload.delete.confirm.submit": "Ναι είμαι σίγουρος",
+  "submission.sections.upload.delete.confirm.title": "Διαγραφή bitstream",
+  "submission.sections.upload.delete.submit": "Διαγραφή",
+  "submission.sections.upload.download.title": "Λήψη αρχείου",
+  "submission.sections.upload.drop-message": "Αποθέστε αρχεία για να τα επισυνάψετε στο τεκμήριο",
+  "submission.sections.upload.edit.title": "Επεξεργασία bitstream",
+  "submission.sections.upload.form.access-condition-hint": "Επιλέξτε μια συνθήκη πρόσβασης που θα εφαρμοστεί στη ροή bit μόλις κατατεθεί το τεκμήριο",
+  "submission.sections.upload.form.access-condition-label": "Τύπος συνθήκης πρόσβασης",
+  "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-hint": "Επιλέξτε την ημερομηνία από την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
+  "submission.sections.upload.form.from-label": "Παραχώρηση πρόσβασης από",
+  "submission.sections.upload.form.from-placeholder": "Από",
+  "submission.sections.upload.form.group-label": "Ομάδα",
+  "submission.sections.upload.form.group-required": "Απαιτείται ομάδα.",
+  "submission.sections.upload.form.until-hint": "Επιλέξτε την ημερομηνία μέχρι την οποία εφαρμόζεται η σχετική συνθήκη πρόσβασης",
+  "submission.sections.upload.form.until-label": "Παραχώρηση πρόσβασης μέχρι",
+  "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.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.tasks.claimed.approve": "Εγκρίνω",
+  "submission.workflow.tasks.claimed.approve_help": "Εάν έχετε ελέγξει το τεκμήριο και είναι κατάλληλο για συμπερίληψη στη συλλογή, επιλέξτε \"Έγκριση\".",
+  "submission.workflow.tasks.claimed.edit": "Επεξεργασία",
+  "submission.workflow.tasks.claimed.edit_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": "Επιστροφή στο pool",
+  "submission.workflow.tasks.claimed.return_help": "Επιστρέψτε την εργασία στο pool έτσι ώστε ένας άλλος χρήστης να μπορεί να εκτελέσει την εργασία.",
+  "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": "Ορίστε αυτήν την επιλογή για να προβάλετε τα μεταδεδομένα του τεκμηρίου.",
+  "thumbnail.default.alt": "Μικρογραφία εικόνας",
+  "thumbnail.default.placeholder": "Δεν υπάρχει διαθέσιμη μικρογραφία",
+  "thumbnail.orgunit.alt": "Λογότυπο OrgUnit",
+  "thumbnail.orgunit.placeholder": "Εικόνα μονάδας οργανισμού",
+  "thumbnail.person.alt": "Εικόνα προφίλ",
+  "thumbnail.person.placeholder": "Δεν υπάρχει διαθέσιμη εικόνα προφίλ",
+  "thumbnail.project.alt": "Λογότυπο Έργου",
+  "thumbnail.project.placeholder": "Εικόνα θέσης κράτησης έργου",
+  "title": "DSpace",
+  "uploader.browse": "Πλοήγηση",
+  "uploader.delete.btn-title": "Διαγραφή",
+  "uploader.drag-message": "Σύρετε και αποθέστε τα αρχεία σας εδώ",
+  "uploader.or": ", ή",
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
-	"uploader.processing": "Επεξεργασία",
-	"uploader.queue-length": "Μέγεθος ουράς",
-	"virtual-metadata.delete-item.info": "Επιλέξτε τους τύπους για τους οποίους θέλετε να αποθηκεύσετε τα εικονικά μεταδεδομένα ως πραγματικά μεταδεδομένα",
-	"virtual-metadata.delete-item.modal-head": "Τα εικονικά μεταδεδομένα αυτής της σχέσης",
-	"virtual-metadata.delete-relationship.modal-head": "Επιλέξτε τα τεκμήρια για τα οποία θέλετε να αποθηκεύσετε τα εικονικά μεταδεδομένα ως πραγματικά μεταδεδομένα",
-	"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": "Ο Νορβηγικός Δείκτης Επιστήμης",
-	"vocabulary-treeview.tree.description.srsc": "Ερευνητικές Θεματικές Κατηγορίες",
-	"workflow-item.delete.button.cancel": "Ακύρωση",
-	"workflow-item.delete.button.confirm": "Διαγραφή",
-	"workflow-item.delete.header": "Διαγραφή τεκμηρίου ροής εργασίας",
-	"workflow-item.delete.notification.error.content": "Δεν ήταν δυνατή η διαγραφή του τεκμηρίου ροής εργασίας",
-	"workflow-item.delete.notification.error.title": "Κάτι πήγε στραβά",
-	"workflow-item.delete.notification.success.content": "Αυτό το τεκμήριο ροής εργασίας διαγράφηκε με επιτυχία",
-	"workflow-item.delete.notification.success.title": "Διαγράφηκε",
-	"workflow-item.delete.title": "Διαγραφή τεκμηρίου ροής εργασίας",
-	"workflow-item.edit.breadcrumbs": "Επεξεργασία τεκμηρίου ροής εργασίας",
-	"workflow-item.edit.title": "Επεξεργασία τεκμηρίου ροής εργασίας",
-	"workflow-item.send-back.button.cancel": "Ακύρωση",
-	"workflow-item.send-back.button.confirm": "Αποστολή πίσω",
-	"workflow-item.send-back.header": "Αποστολή τεκμηρίου ροής εργασίας πίσω στον υποβάλλοντα",
-	"workflow-item.send-back.notification.error.content": "Δεν ήταν δυνατή η αποστολή του τεκμηρίου ροής εργασίας στον υποβάλλοντα",
-	"workflow-item.send-back.notification.error.title": "Κάτι πήγε στραβά",
-	"workflow-item.send-back.notification.success.content": "Αυτό το τεκμήριο ροής εργασίας στάλθηκε με επιτυχία στον υποβάλλοντα",
-	"workflow-item.send-back.notification.success.title": "Στάλθηκε πίσω στον υποβάλλοντα",
-	"workflow-item.send-back.title": "Αποστολή τεκμηρίου ροής εργασίας πίσω στον υποβάλλοντα",
-	"workflow-item.view.breadcrumbs": "Προβολή ροής εργασίας",
-	"workflow.search.results.head": "Εργασίες ροής εργασιών",
-	"workflowAdmin.search.results.head": "Διαχείριση ροής εργασιών",
-	"workspace-item.view.breadcrumbs": "Προβολή χώρου εργασίας",
-	"workspace-item.view.title": "Προβολή χώρου εργασίας",
-	"workspace.search.results.head": "Οι υποβολές σας"
+  "uploader.processing": "Επεξεργασία",
+  "uploader.queue-length": "Μέγεθος ουράς",
+  "virtual-metadata.delete-item.info": "Επιλέξτε τους τύπους για τους οποίους θέλετε να αποθηκεύσετε τα εικονικά μεταδεδομένα ως πραγματικά μεταδεδομένα",
+  "virtual-metadata.delete-item.modal-head": "Τα εικονικά μεταδεδομένα αυτής της σχέσης",
+  "virtual-metadata.delete-relationship.modal-head": "Επιλέξτε τα τεκμήρια για τα οποία θέλετε να αποθηκεύσετε τα εικονικά μεταδεδομένα ως πραγματικά μεταδεδομένα",
+  "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": "Ο Νορβηγικός Δείκτης Επιστήμης",
+  "vocabulary-treeview.tree.description.srsc": "Ερευνητικές Θεματικές Κατηγορίες",
+  "workflow-item.delete.button.cancel": "Ακύρωση",
+  "workflow-item.delete.button.confirm": "Διαγραφή",
+  "workflow-item.delete.header": "Διαγραφή τεκμηρίου ροής εργασίας",
+  "workflow-item.delete.notification.error.content": "Δεν ήταν δυνατή η διαγραφή του τεκμηρίου ροής εργασίας",
+  "workflow-item.delete.notification.error.title": "Κάτι πήγε στραβά",
+  "workflow-item.delete.notification.success.content": "Αυτό το τεκμήριο ροής εργασίας διαγράφηκε με επιτυχία",
+  "workflow-item.delete.notification.success.title": "Διαγράφηκε",
+  "workflow-item.delete.title": "Διαγραφή τεκμηρίου ροής εργασίας",
+  "workflow-item.edit.breadcrumbs": "Επεξεργασία τεκμηρίου ροής εργασίας",
+  "workflow-item.edit.title": "Επεξεργασία τεκμηρίου ροής εργασίας",
+  "workflow-item.send-back.button.cancel": "Ακύρωση",
+  "workflow-item.send-back.button.confirm": "Αποστολή πίσω",
+  "workflow-item.send-back.header": "Αποστολή τεκμηρίου ροής εργασίας πίσω στον υποβάλλοντα",
+  "workflow-item.send-back.notification.error.content": "Δεν ήταν δυνατή η αποστολή του τεκμηρίου ροής εργασίας στον υποβάλλοντα",
+  "workflow-item.send-back.notification.error.title": "Κάτι πήγε στραβά",
+  "workflow-item.send-back.notification.success.content": "Αυτό το τεκμήριο ροής εργασίας στάλθηκε με επιτυχία στον υποβάλλοντα",
+  "workflow-item.send-back.notification.success.title": "Στάλθηκε πίσω στον υποβάλλοντα",
+  "workflow-item.send-back.title": "Αποστολή τεκμηρίου ροής εργασίας πίσω στον υποβάλλοντα",
+  "workflow-item.view.breadcrumbs": "Προβολή ροής εργασίας",
+  "workflow.search.results.head": "Εργασίες ροής εργασιών",
+  "workflowAdmin.search.results.head": "Διαχείριση ροής εργασιών",
+  "workspace-item.view.breadcrumbs": "Προβολή χώρου εργασίας",
+  "workspace-item.view.title": "Προβολή χώρου εργασίας",
+  "workspace.search.results.head": "Οι υποβολές σας",
 }
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 597f226cc7..541bb4f39d 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -4,36 +4,33 @@
 
   "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.",
 
   "500.link.home-page": "Take me to the 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. ",
 
   "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",
 
@@ -61,7 +58,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",
 
@@ -131,6 +128,10 @@
 
   "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",
 
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
@@ -143,7 +144,9 @@
 
   "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",
 
@@ -161,8 +164,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",
@@ -171,12 +180,14 @@
 
   "admin.registries.metadata.title": "Metadata Registry",
 
-
-
   "admin.registries.schema.breadcrumbs": "Metadata schema",
 
   "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.",
@@ -185,6 +196,10 @@
 
   "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",
 
   "admin.registries.schema.form.create": "Create metadata field",
@@ -223,7 +238,21 @@
 
   "admin.registries.schema.title": "Metadata Schema Registry",
 
+  "admin.access-control.bulk-access.breadcrumbs": "Bulk Access Management",
 
+  "administrativeBulkAccess.search.results.head": "Search Results",
+
+  "admin.access-control.bulk-access": "Bulk Access Management",
+
+  "admin.access-control.bulk-access.title": "Bulk Access Management",
+
+  "admin.access-control.bulk-access-browse.header": "Step 1: Select Objects",
+
+  "admin.access-control.bulk-access-browse.search.header": "Search",
+
+  "admin.access-control.bulk-access-browse.selected.header": "Current selection({{number}})",
+
+  "admin.access-control.bulk-access-settings.header": "Step 2: Operation to Perform",
 
   "admin.access-control.epeople.actions.delete": "Delete EPerson",
 
@@ -237,6 +266,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",
@@ -245,7 +282,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",
 
@@ -257,7 +294,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",
 
@@ -277,9 +314,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",
 
@@ -315,12 +352,10 @@
 
   "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}}\"",
 
-
-
   "admin.access-control.groups.title": "Groups",
 
   "admin.access-control.groups.breadcrumbs": "Groups",
@@ -367,8 +402,6 @@
 
   "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.",
@@ -419,10 +452,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",
@@ -479,8 +508,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}}\"",
@@ -499,7 +526,221 @@
 
   "admin.access-control.groups.form.return": "Back",
 
+  "admin.quality-assurance.breadcrumbs": "Quality Assurance",
 
+  "admin.notifications.event.breadcrumbs": "Quality Assurance Suggestions",
+
+  "admin.notifications.event.page.title": "Quality Assurance Suggestions",
+
+  "admin.quality-assurance.page.title": "Quality Assurance",
+
+  "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.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 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.reports.collections.title": "Collection Filter Report",
+
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
+
+  "admin.reports.collections.head": "Collection Filter Report",
+
+  "admin.reports.button.show-collections": "Show Collections",
+
+  "admin.reports.collections.collections-report": "Collection Report",
+
+  "admin.reports.collections.item-results": "Item Results",
+
+  "admin.reports.collections.community": "Community",
+
+  "admin.reports.collections.collection": "Collection",
+
+  "admin.reports.collections.nb_items": "Nb. Items",
+
+  "admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
+
+  "admin.reports.items.head": "Metadata Query Report",
+
+  "admin.reports.items.run": "Run Item Query",
+
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
+
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
+
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+
+  "admin.reports.items.limit": "Limit/",
+
+  "admin.reports.items.offset": "Offset",
+
+  "admin.reports.items.wholeRepo": "Whole Repository",
+
+  "admin.reports.items.anyField": "Any field",
+
+  "admin.reports.items.predicate.exists": "exists",
+
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
+
+  "admin.reports.items.predicate.equals": "equals",
+
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
+
+  "admin.reports.items.predicate.like": "like",
+
+  "admin.reports.items.predicate.notLike": "not like",
+
+  "admin.reports.items.predicate.contains": "contains",
+
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
+
+  "admin.reports.items.predicate.matches": "matches",
+
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
+
+  "admin.reports.items.preset.new": "New Query",
+
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
+
+  "admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+
+  "admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+
+  "admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+
+  "admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+
+  "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",
+
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ascii character in metadata",
+
+  "admin.reports.items.number": "No.",
+
+  "admin.reports.items.id": "UUID",
+
+  "admin.reports.items.collection": "Collection",
+
+  "admin.reports.items.handle": "URI",
+
+  "admin.reports.items.title": "Title",
+
+
+  "admin.reports.commons.filters": "Filters",
+
+  "admin.reports.commons.additional-data": "Additional data to return",
+
+  "admin.reports.commons.previous-page": "Prev Page",
+
+  "admin.reports.commons.next-page": "Next Page",
+
+  "admin.reports.commons.page": "Page",
+
+  "admin.reports.commons.of": "of",
+
+  "admin.reports.commons.export": "Export for Metadata Update",
+
+  "admin.reports.commons.filters.deselect_all": "Deselect all filters",
+
+  "admin.reports.commons.filters.select_all": "Select all filters",
+
+  "admin.reports.commons.filters.matches_all": "Matches all specified filters",
+
+
+  "admin.reports.commons.filters.property": "Item Property Filters",
+
+  "admin.reports.commons.filters.property.is_item": "Is Item - always true",
+
+  "admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+
+  "admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+
+  "admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+
+  "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",
+
+  "admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+
+  "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)",
+
+  "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)",
+
+  "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",
+
+  "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",
+
+  "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",
+
+  "admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+
+  "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",
+
+  "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",
+
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+
+  "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",
+
+  "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)",
+
+  "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",
+
+  "admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+
+  "admin.reports.commons.filters.permission": "Permission Filters",
+
+  "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",
+
+  "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",
+
+  "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",
 
   "admin.search.breadcrumbs": "Administrative Search",
 
@@ -525,20 +766,21 @@
 
   "administrativeView.search.results.head": "Administrative Search",
 
-
-
-
   "admin.workflow.breadcrumbs": "Administer Workflow",
 
   "admin.workflow.title": "Administer Workflow",
 
   "admin.workflow.item.workflow": "Workflow",
 
+  "admin.workflow.item.workspace": "Workspace",
+
   "admin.workflow.item.delete": "Delete",
 
   "admin.workflow.item.send-back": "Send back",
 
+  "admin.workflow.item.policies": "Policies",
 
+  "admin.workflow.item.supervision": "Supervision",
 
   "admin.metadata-import.breadcrumbs": "Import Metadata",
 
@@ -556,6 +798,8 @@
 
   "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.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.dropMsg": "Drop a metadata CSV to import",
 
   "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
@@ -572,12 +816,78 @@
 
   "admin.metadata-import.page.error.addFile": "Select file first!",
 
-  "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.metadata-import.page.error.addFileUrl": "Insert file URL first!",
+
+  "admin.batch-import.page.error.addFile": "Select ZIP file first!",
+
+  "admin.metadata-import.page.toggle.upload": "Upload",
+
+  "admin.metadata-import.page.toggle.url": "URL",
+
+  "admin.metadata-import.page.urlMsg": "Insert the batch ZIP url to import",
 
   "admin.metadata-import.page.validateOnly": "Validate Only",
 
   "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.",
 
+  "advanced-workflow-action.rating.form.rating.label": "Rating",
+
+  "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+
+  "advanced-workflow-action.rating.form.review.label": "Review",
+
+  "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+
+  "advanced-workflow-action.rating.description": "Please select a rating below",
+
+  "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+
+  "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+
+  "advanced-workflow-action.select-reviewer.description-multiple": "Please select one or more reviewers below before submitting",
+
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Browse All",
+
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+
+  "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.identity": "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": "Remove / Add",
+
+  "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.notification.success.addMember": "Successfully added member: \"{{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.success.deleteMember": "Successfully deleted member: \"{{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.table.edit.buttons.add": "Add member with name \"{{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.no-members-yet": "No members in group yet, search and add.",
+
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "No EPeople found in that search",
+
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+
   "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.remove": "remove",
@@ -588,12 +898,9 @@
 
   "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
 
+  "bitstream.download.page": "Now downloading {{bitstream}}...",
 
-
-  "bitstream.download.page": "Now downloading {{bitstream}}..." ,
-
-  "bitstream.download.page.back": "Back" ,
-
+  "bitstream.download.page.back": "Back",
 
   "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
 
@@ -619,7 +926,7 @@
 
   "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.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "Primary File",
 
   "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\".",
 
@@ -629,6 +936,8 @@
 
   "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
 
+  "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+
   "bitstream.edit.form.iiifLabel.label": "IIIF Label",
 
   "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
@@ -645,7 +954,6 @@
 
   "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
 
-
   "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
 
   "bitstream.edit.notifications.saved.title": "Bitstream saved",
@@ -661,13 +969,14 @@
   "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
 
   "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+
   "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
 
   "bitstream-request-a-copy.name.label": "Name *",
 
   "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.",
 
@@ -689,8 +998,6 @@
 
   "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
 
-
-
   "browse.back.all-results": "All browse results",
 
   "browse.comcol.by.author": "By Author",
@@ -699,6 +1006,10 @@
 
   "browse.comcol.by.subject": "By Subject",
 
+  "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",
@@ -713,12 +1024,18 @@
 
   "browse.metadata.title": "Title",
 
+  "browse.metadata.srsc": "Subject Category",
+
   "browse.metadata.author.breadcrumbs": "Browse by Author",
 
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
 
   "browse.metadata.subject.breadcrumbs": "Browse by Subject",
 
+  "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",
@@ -773,14 +1090,25 @@
 
   "browse.startsWith.type_text": "Filter results by typing the first few letters",
 
-  "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.startsWith.input": "Filter",
 
-  "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.taxonomy.button": "Browse",
 
+  "browse.title": "Browsing by {{ field }}{{ startsWith }} {{ value }}",
+
+  "browse.title.page": "Browsing by {{ field }} {{ value }}",
+
+  "search.browse.item-back": "Back to Results",
 
   "chips.remove": "Remove chip",
 
+  "claimed-approved-search-result-list-element.title": "Approved",
 
+  "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+
+  "claimed-declined-task-search-result-list-element.title": "Declined, sent back to Review Manager's workflow",
+
+  "collection.browse.logo": "Browse for a collection logo",
 
   "collection.create.head": "Create a Collection",
 
@@ -804,16 +1132,12 @@
 
   "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
 
-
-
   "collection.edit.delete": "Delete this collection",
 
   "collection.edit.head": "Edit Collection",
 
   "collection.edit.breadcrumbs": "Edit Collection",
 
-
-
   "collection.edit.tabs.mapper.head": "Item Mapper",
 
   "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
@@ -854,7 +1178,6 @@
 
   "collection.edit.item-mapper.tabs.map": "Map new items",
 
-
   "collection.edit.logo.delete.title": "Delete logo",
 
   "collection.edit.logo.delete-undo.title": "Undo delete",
@@ -873,13 +1196,13 @@
 
   "collection.edit.logo.upload": "Drop a Collection Logo to upload",
 
-
-
   "collection.edit.notifications.success": "Successfully edited the Collection",
 
   "collection.edit.return": "Back",
 
+  "collection.edit.tabs.access-control.head": "Access Control",
 
+  "collection.edit.tabs.access-control.title": "Collection Edit - Access Control",
 
   "collection.edit.tabs.curate.head": "Curate",
 
@@ -939,8 +1262,6 @@
 
   "collection.edit.tabs.source.title": "Collection Edit - Content Source",
 
-
-
   "collection.edit.template.add-button": "Add",
 
   "collection.edit.template.breadcrumbs": "Item template",
@@ -965,8 +1286,6 @@
 
   "collection.edit.template.title": "Edit Template Item",
 
-
-
   "collection.form.abstract": "Short Description",
 
   "collection.form.description": "Introductory text (HTML)",
@@ -985,15 +1304,11 @@
 
   "collection.form.entityType": "Entity Type",
 
-
-
   "collection.listelement.badge": "Collection",
 
+  "collection.logo": "Collection logo",
 
-
-  "collection.page.browse.recent.head": "Recent Submissions",
-
-  "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.search.head": "Search",
 
   "collection.page.edit": "Edit this collection",
 
@@ -1003,46 +1318,70 @@
 
   "collection.page.news": "News",
 
-
+  "collection.search.results.head": "Search Results",
 
   "collection.select.confirm": "Confirm selected",
 
   "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",
-  "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
-  "collection.source.controls.test.failed": "The script to test the settings has failed",
-  "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
-  "collection.source.controls.test.submit": "Test configuration",
-  "collection.source.controls.test.running": "Testing configuration...",
-  "collection.source.controls.import.submit.success": "The import has been successfully initiated",
-  "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
-  "collection.source.controls.import.submit": "Import now",
-  "collection.source.controls.import.running": "Importing...",
-  "collection.source.controls.import.failed": "An error occurred during the import",
-  "collection.source.controls.import.completed": "The import completed",
-  "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
-  "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
-  "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
-  "collection.source.controls.reset.completed": "The reset and reimport completed",
-  "collection.source.controls.reset.submit": "Reset and reimport",
-  "collection.source.controls.reset.running": "Resetting and reimporting...",
-  "collection.source.controls.harvest.status": "Harvest status:",
-  "collection.source.controls.harvest.start": "Harvest start time:",
-  "collection.source.controls.harvest.last": "Last time harvested:",
-  "collection.source.controls.harvest.message": "Harvest info:",
-  "collection.source.controls.harvest.no-information": "N/A",
 
+  "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+
+  "collection.source.controls.test.failed": "The script to test the settings has failed",
+
+  "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+
+  "collection.source.controls.test.submit": "Test configuration",
+
+  "collection.source.controls.test.running": "Testing configuration...",
+
+  "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+
+  "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+
+  "collection.source.controls.import.submit": "Import now",
+
+  "collection.source.controls.import.running": "Importing...",
+
+  "collection.source.controls.import.failed": "An error occurred during the import",
+
+  "collection.source.controls.import.completed": "The import completed",
+
+  "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+
+  "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+
+  "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+
+  "collection.source.controls.reset.completed": "The reset and reimport completed",
+
+  "collection.source.controls.reset.submit": "Reset and reimport",
+
+  "collection.source.controls.reset.running": "Resetting and reimporting...",
+
+  "collection.source.controls.harvest.status": "Harvest status:",
+
+  "collection.source.controls.harvest.start": "Harvest start time:",
+
+  "collection.source.controls.harvest.last": "Last time harvested:",
+
+  "collection.source.controls.harvest.message": "Harvest info:",
+
+  "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.title": "Server Error",
 
-
-
   "communityList.breadcrumbs": "Community List",
 
   "communityList.tabTitle": "Community List",
@@ -1051,7 +1390,13 @@
 
   "communityList.showMore": "Show More",
 
+  "communityList.expand": "Expand {{ name }}",
 
+  "communityList.collapse": "Collapse {{ name }}",
+
+  "community.browse.logo": "Browse for a community logo",
+
+  "community.subcoms-cols.breadcrumbs": "Subcommunities and Collections",
 
   "community.create.head": "Create a Community",
 
@@ -1081,16 +1426,15 @@
 
   "community.edit.breadcrumbs": "Edit Community",
 
-
   "community.edit.logo.delete.title": "Delete logo",
 
   "community.edit.logo.delete-undo.title": "Undo delete",
 
   "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",
 
@@ -1098,24 +1442,24 @@
 
   "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 occured while editing the community",
 
   "community.edit.return": "Back",
 
-
-
   "community.edit.tabs.curate.head": "Curate",
 
   "community.edit.tabs.curate.title": "Community Edit - Curate",
 
+  "community.edit.tabs.access-control.head": "Access Control",
+
+  "community.edit.tabs.access-control.title": "Community Edit - Access Control",
+
   "community.edit.tabs.metadata.head": "Edit Metadata",
 
   "community.edit.tabs.metadata.title": "Community Edit - Metadata",
@@ -1128,11 +1472,9 @@
 
   "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
 
-
-
   "community.listelement.badge": "Community",
 
-
+  "community.logo": "Community logo",
 
   "comcol-role.edit.no-group": "None",
 
@@ -1146,51 +1488,45 @@
 
   "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
 
-
   "comcol-role.edit.community-admin.name": "Administrators",
 
   "comcol-role.edit.collection-admin.name": "Administrators",
 
-
   "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.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.submitters.name": "Submitters",
 
   "comcol-role.edit.submitters.description": "The E-People and Groups that have permission to submit new items to this collection.",
 
-
   "comcol-role.edit.item_read.name": "Default item read access",
 
   "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.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
 
-
   "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.",
 
-
   "comcol-role.edit.editor.name": "Editors",
 
   "comcol-role.edit.editor.description": "Editors are able to edit the metadata of incoming submissions, and then accept or reject them.",
 
-
   "comcol-role.edit.finaleditor.name": "Final editors",
 
   "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.reviewer.name": "Reviewers",
 
   "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.scorereviewers.name": "Score Reviewers",
 
+  "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.",
 
   "community.form.abstract": "Short Description",
 
@@ -1214,11 +1550,11 @@
 
   "community.all-lists.head": "Subcommunities and Collections",
 
-  "community.sub-collection-list.head": "Collections of this Community",
-
-  "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-community-list.head": "Communities in this Community",
 
   "cookies.consent.accept-all": "Accept all",
 
@@ -1234,12 +1570,22 @@
 
   "cookies.consent.app.required.title": "(always required)",
 
+  "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+
+  "cookies.consent.app.disable-all.title": "Enable or disable all services",
+
   "cookies.consent.update": "There were changes since your last visit, please update your consent.",
 
   "cookies.consent.close": "Close",
 
   "cookies.consent.decline": "Decline",
 
+  "cookies.consent.ok": "That's ok",
+
+  "cookies.consent.save": "Save",
+
+  "cookies.consent.content-notice.title": "Cookie Consent",
+
   "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.no-privacy": "We collect and process your personal information for the following purposes: <strong>Authentication, Preferences, Acknowledgement and Statistics</strong>.",
@@ -1254,37 +1600,30 @@
 
   "cookies.consent.content-modal.title": "Information that we collect",
 
+  "cookies.consent.content-modal.services": "services",
 
+  "cookies.consent.content-modal.service": "service",
 
   "cookies.consent.app.title.authentication": "Authentication",
 
   "cookies.consent.app.description.authentication": "Required for signing you in",
 
-
   "cookies.consent.app.title.preferences": "Preferences",
 
   "cookies.consent.app.description.preferences": "Required for saving your preferences",
 
-
-
   "cookies.consent.app.title.acknowledgement": "Acknowledgement",
 
   "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
 
-
-
   "cookies.consent.app.title.google-analytics": "Google Analytics",
 
   "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
 
-
-
   "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.purpose.functional": "Functional",
 
   "cookies.consent.purpose.statistical": "Statistical",
@@ -1293,9 +1632,9 @@
 
   "cookies.consent.purpose.sharing": "Sharing",
 
-  "curation-task.task.citationpage.label":  "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Generate Citation Page",
 
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
 
   "curation-task.task.noop.label": "NOOP",
 
@@ -1307,7 +1646,7 @@
 
   "curation-task.task.vscan.label": "Virus Scan",
 
-
+  "curation-task.task.registerdoi.label": "Register DOI",
 
   "curation.form.task-select.label": "Task:",
 
@@ -1327,8 +1666,6 @@
 
   "curation.form.handle.hint": "Hint: Enter [your-handle-prefix]/0 to run a task across entire site (not all tasks may support this capability)",
 
-
-
   "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.subject": "Request copy of document",
@@ -1341,11 +1678,9 @@
 
   "deny-request-copy.success": "Successfully denied item request",
 
-
-
   "dso.name.untitled": "Untitled",
 
-
+  "dso.name.unnamed": "Unnamed",
 
   "dso-selector.create.collection.head": "New collection",
 
@@ -1353,6 +1688,8 @@
 
   "dso-selector.create.community.head": "New community",
 
+  "dso-selector.create.community.or-divider": "or",
+
   "dso-selector.create.community.sub-level": "Create a new community in",
 
   "dso-selector.create.community.top-level": "Create a new top-level community",
@@ -1387,6 +1724,8 @@
 
   "dso-selector.set-scope.community.button": "Search all of DSpace",
 
+  "dso-selector.set-scope.community.or-divider": "or",
+
   "dso-selector.set-scope.community.input-header": "Search for a community or collection",
 
   "dso-selector.claim.item.head": "Profile tips",
@@ -1397,6 +1736,34 @@
 
   "dso-selector.claim.item.create-from-scratch": "Create a new one",
 
+  "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+
+  "supervision-group-selector.header": "Supervision Group Selector",
+
+  "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+
+  "supervision-group-selector.select.type-of-order.option.none": "NONE",
+
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+
+  "supervision-group-selector.select.group.label": "Select a Group",
+
+  "supervision-group-selector.button.cancel": "Cancel",
+
+  "supervision-group-selector.button.save": "Save",
+
+  "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+
+  "supervision-group-selector.select.group.error": "Please select a group",
+
+  "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+
+  "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",
+
   "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
 
   "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
@@ -1429,6 +1796,13 @@
 
   "confirmation-modal.delete-profile.confirm": "Delete",
 
+  "confirmation-modal.delete-subscription.header": "Delete Subscription",
+
+  "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+
+  "confirmation-modal.delete-subscription.cancel": "Cancel",
+
+  "confirmation-modal.delete-subscription.confirm": "Delete",
 
   "error.bitstream": "Error fetching bitstream",
 
@@ -1472,20 +1846,32 @@
 
   "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",
 
+  "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.max-length": "This field may not contain more than 32 characters",
+
+  "error.validation.metadata.namespace.max-length": "This field may not contain more than 256 characters",
+
+  "error.validation.metadata.element.invalid-pattern": "This field cannot contain dots, commas or spaces. Please use the Qualifier field instead",
+
+  "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+
+  "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",
 
   "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 }}",
 
   "footer.link.dspace": "DSpace software",
@@ -1496,11 +1882,9 @@
 
   "footer.link.privacy-policy": "Privacy policy",
 
-  "footer.link.end-user-agreement":"End User Agreement",
-
-  "footer.link.feedback":"Send Feedback",
-
+  "footer.link.end-user-agreement": "End User Agreement",
 
+  "footer.link.feedback": "Send Feedback",
 
   "forgot-email.form.header": "Forgot Password",
 
@@ -1510,7 +1894,7 @@
 
   "forgot-email.form.email.error.required": "Please fill in an email address",
 
-  "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.hint": "An email will be sent to this address with a further instructions.",
 
@@ -1524,8 +1908,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-password.title": "Forgot Password",
 
   "forgot-password.form.head": "Forgot Password",
@@ -1542,7 +1924,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.",
 
@@ -1554,7 +1936,6 @@
 
   "forgot-password.form.submit": "Submit password",
 
-
   "form.add": "Add more",
 
   "form.add-help": "Click here to add the current entry and to add another one",
@@ -1595,7 +1976,17 @@
 
   "form.no-value": "No value entered",
 
-  "form.other-information": {},
+  "form.other-information.email": "Email",
+
+  "form.other-information.first-name": "First Name",
+
+  "form.other-information.insolr": "In Solr Index",
+
+  "form.other-information.institution": "Institution",
+
+  "form.other-information.last-name": "Last Name",
+
+  "form.other-information.orcid": "ORCID",
 
   "form.remove": "Remove",
 
@@ -1609,15 +2000,19 @@
 
   "form.submit": "Save",
 
+  "form.create": "Create",
+
+  "form.number-picker.decrement": "Decrement {{field}}",
+
+  "form.number-picker.increment": "Increment {{field}}",
+
   "form.repeatable.sort.tip": "Drop the item in the new position",
 
-
-
   "grant-deny-request-copy.deny": "Don't send copy",
 
   "grant-deny-request-copy.email.back": "Back",
 
-  "grant-deny-request-copy.email.message": "Message",
+  "grant-deny-request-copy.email.message": "Optional additional message",
 
   "grant-deny-request-copy.email.message.empty": "Please enter a message",
 
@@ -1643,28 +2038,23 @@
 
   "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-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.subject": "Request copy of document",
 
   "grant-request-copy.error": "An error occurred",
 
   "grant-request-copy.header": "Grant document copy request",
 
-  "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.success": "Successfully granted item request",
 
-
   "health.breadcrumbs": "Health",
 
-  "health-page.heading" : "Health",
+  "health-page.heading": "Health",
 
-  "health-page.info-tab" : "Info",
+  "health-page.info-tab": "Info",
 
-  "health-page.status-tab" : "Status",
+  "health-page.status-tab": "Status",
 
   "health-page.error.msg": "The health check service is temporarily unavailable",
 
@@ -1674,13 +2064,13 @@
 
   "health-page.section.geoIp.title": "GeoIp",
 
-  "health-page.section.solrAuthorityCore.title": "Sor: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
-  "health-page.section.solrOaiCore.title": "Sor: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: oai core",
 
-  "health-page.section.solrSearchCore.title": "Sor: search core",
+  "health-page.section.solrSearchCore.title": "Solr: search core",
 
-  "health-page.section.solrStatisticsCore.title": "Sor: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
 
   "health-page.section-info.app.title": "Application Backend",
 
@@ -1698,7 +2088,6 @@
 
   "health-page.section.no-issues": "No issues detected",
 
-
   "home.description": "",
 
   "home.breadcrumbs": "Home",
@@ -1711,8 +2100,6 @@
 
   "home.top-level-communities.help": "Select a community to browse its collections.",
 
-
-
   "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
 
   "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
@@ -1729,6 +2116,8 @@
 
   "info.end-user-agreement.title": "End User Agreement",
 
+  "info.end-user-agreement.hosting-country": "the United States",
+
   "info.privacy.breadcrumbs": "Privacy Statement",
 
   "info.privacy.head": "Privacy Statement",
@@ -1751,43 +2140,39 @@
 
   "info.feedback.email-label": "Your Email",
 
-  "info.feedback.create.success" : "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Feedback Sent Successfully!",
 
-  "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.message.required" : "A comment is required",
-
-  "info.feedback.page-label" : "Page",
-
-  "info.feedback.page_help" : "Tha page related to your feedback",
+  "info.feedback.error.message.required": "A comment is required",
 
+  "info.feedback.page-label": "Page",
 
+  "info.feedback.page_help": "The page related to your feedback",
 
   "item.alerts.private": "This item is non-discoverable",
 
   "item.alerts.withdrawn": "This item has been withdrawn",
 
+  "item.alerts.reinstate-request": "Request reinstate",
 
+  "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.",
 
   "item.edit.authorizations.title": "Edit item's Policies",
 
-
-
   "item.badge.private": "Non-discoverable",
 
   "item.badge.withdrawn": "Withdrawn",
 
-
-
   "item.bitstreams.upload.bundle": "Bundle",
 
   "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
 
   "item.bitstreams.upload.bundle.new": "Create bundle",
 
-  "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
 
   "item.bitstreams.upload.cancel": "Cancel",
 
@@ -1803,8 +2188,6 @@
 
   "item.bitstreams.upload.title": "Upload bitstream",
 
-
-
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
 
   "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
@@ -1865,8 +2248,6 @@
 
   "item.edit.bitstreams.upload-button": "Upload",
 
-
-
   "item.edit.delete.cancel": "Cancel",
 
   "item.edit.delete.confirm": "Delete",
@@ -1885,11 +2266,52 @@
 
   "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
 
-
   "item.edit.tabs.mapper.head": "Collection Mapper",
 
   "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
 
+  "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+
+  "item.edit.identifiers.doi.status.DELETED": "Deleted",
+
+  "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+
+  "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+
+  "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+
+  "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+
+  "item.edit.register-doi.header": "Register a new or pending 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.confirm": "Confirm",
+
+  "item.edit.register-doi.cancel": "Cancel",
+
+  "item.edit.register-doi.success": "DOI queued for registration successfully.",
+
+  "item.edit.register-doi.error": "Error registering DOI",
+
+  "item.edit.register-doi.to-update": "The following DOI has already been minted and will be queued for registration online",
+
   "item.edit.item-mapper.buttons.add": "Map item to selected collections",
 
   "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
@@ -1926,12 +2348,20 @@
 
   "item.edit.item-mapper.tabs.map": "Map new collections",
 
-
-
   "item.edit.metadata.add-button": "Add",
 
   "item.edit.metadata.discard-button": "Discard",
 
+  "item.edit.metadata.edit.language": "Edit language",
+
+  "item.edit.metadata.edit.value": "Edit value",
+
+  "item.edit.metadata.edit.authority.key": "Edit authority key",
+
+  "item.edit.metadata.edit.buttons.confirm": "Confirm",
+
+  "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+
   "item.edit.metadata.edit.buttons.edit": "Edit",
 
   "item.edit.metadata.edit.buttons.remove": "Remove",
@@ -1940,6 +2370,8 @@
 
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
 
+  "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.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
 
   "item.edit.metadata.headers.edit": "Edit",
@@ -1950,6 +2382,10 @@
 
   "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",
 
   "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
@@ -1972,9 +2408,15 @@
 
   "item.edit.metadata.reinstate-button": "Undo",
 
+  "item.edit.metadata.reset-order-button": "Undo reorder",
+
   "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",
+
+  "item.edit.metadata.edit.buttons.close-authority-edition": "Lock the authority key value for manual editing",
 
   "item.edit.modify.overview.field": "Field",
 
@@ -1982,8 +2424,6 @@
 
   "item.edit.modify.overview.value": "Value",
 
-
-
   "item.edit.move.cancel": "Back",
 
   "item.edit.move.save-button": "Save",
@@ -2000,6 +2440,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...",
@@ -2010,8 +2452,6 @@
 
   "item.edit.move.title": "Move item",
 
-
-
   "item.edit.private.cancel": "Cancel",
 
   "item.edit.private.confirm": "Make it non-discoverable",
@@ -2024,8 +2464,6 @@
 
   "item.edit.private.success": "The item is now non-discoverable",
 
-
-
   "item.edit.public.cancel": "Cancel",
 
   "item.edit.public.confirm": "Make it discoverable",
@@ -2038,8 +2476,6 @@
 
   "item.edit.public.success": "The item is now discoverable",
 
-
-
   "item.edit.reinstate.cancel": "Cancel",
 
   "item.edit.reinstate.confirm": "Reinstate",
@@ -2052,8 +2488,6 @@
 
   "item.edit.reinstate.success": "The item was reinstated successfully",
 
-
-
   "item.edit.relationships.discard-button": "Discard",
 
   "item.edit.relationships.edit.buttons.add": "Add",
@@ -2084,10 +2518,8 @@
 
   "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
 
-
   "item.edit.return": "Back",
 
-
   "item.edit.tabs.bitstreams.head": "Bitstreams",
 
   "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
@@ -2096,6 +2528,12 @@
 
   "item.edit.tabs.curate.title": "Item Edit - Curate",
 
+  "item.edit.curate.title": "Curate Item: {{item}}",
+
+  "item.edit.tabs.access-control.head": "Access Control",
+
+  "item.edit.tabs.access-control.title": "Item Edit - Access Control",
+
   "item.edit.tabs.metadata.head": "Metadata",
 
   "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
@@ -2116,7 +2554,7 @@
 
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
 
-  "item.edit.tabs.status.buttons.move.button": "Move...",
+  "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
 
   "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
 
@@ -2134,7 +2572,7 @@
 
   "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
 
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
 
   "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
 
@@ -2162,8 +2600,6 @@
 
   "item.edit.tabs.view.title": "Item Edit -  View",
 
-
-
   "item.edit.withdraw.cancel": "Cancel",
 
   "item.edit.withdraw.confirm": "Withdraw",
@@ -2178,7 +2614,6 @@
 
   "item.orcid.return": "Back",
 
-
   "item.listelement.badge": "Item",
 
   "item.page.description": "Description",
@@ -2201,7 +2636,47 @@
 
   "item.truncatable-part.show-less": "Collapse",
 
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
 
+  "item.qa-event-notification-info.check.button": "View",
+
+  "mydspace.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  "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.info": "Are you sure you want to delete Supervision Order",
+
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+
+  "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+
+  "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+
+  "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+
+  "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",
+
+  "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",
+
+  "confidence.indicator.help-text.failed": "The authority encountered an internal failure",
+
+  "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",
+
+  "confidence.indicator.help-text.unset": "Confidence was never recorded for this value",
+
+  "confidence.indicator.help-text.unknown": "Unknown confidence value",
 
   "item.page.abstract": "Abstract",
 
@@ -2263,20 +2738,28 @@
 
   "item.page.bitstreams.collapse": "Collapse",
 
-  "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.license.bundle": "License bundle",
 
   "item.page.return": "Back",
 
   "item.page.version.create": "Create new version",
 
+  "item.page.withdrawn": "Request a withdrawal for this item",
+
+  "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.claim.button": "Claim",
 
   "item.page.claim.tooltip": "Claim this item as profile",
 
+  "item.page.image.alt.ROR": "ROR logo",
+
   "item.preview.dc.identifier.uri": "Identifier:",
 
   "item.preview.dc.contributor.author": "Authors:",
@@ -2295,19 +2778,21 @@
 
   "item.preview.dc.type": "Type:",
 
-  "item.preview.oaire.citation.issue" : "Issue",
+  "item.preview.oaire.citation.issue": "Issue",
 
-  "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.identifier.isbn" : "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
 
   "item.preview.dc.identifier": "Identifier:",
 
-  "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Journal or Series",
 
-  "item.preview.dc.identifier.doi" : "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  "item.preview.dc.publisher": "Publisher:",
 
   "item.preview.person.familyName": "Surname:",
 
@@ -2327,19 +2812,38 @@
 
   "item.preview.oaire.fundingStream": "Funding Stream:",
 
+  "item.preview.oairecerif.identifier.url": "URL",
 
+  "item.preview.organization.address.addressCountry": "Country",
+
+  "item.preview.organization.foundingDate": "Founding Date",
+
+  "item.preview.organization.identifier.crossrefid": "CrossRef ID",
+
+  "item.preview.organization.identifier.isni": "ISNI",
+
+  "item.preview.organization.identifier.ror": "ROR ID",
+
+  "item.preview.organization.legalName": "Legal Name",
+
+  "item.preview.dspace.entity.type": "Entity Type:",
 
   "item.select.confirm": "Confirm selected",
 
   "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",
 
   "item.select.table.title": "Title",
 
-
   "item.version.history.empty": "There are no other versions for this item yet.",
 
   "item.version.history.head": "Version History",
@@ -2380,12 +2884,16 @@
 
   "item.version.history.table.action.hasDraft": "A new version cannot be created because there is an inprogress 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>.",
 
-
   "item.version.create.modal.header": "New version",
 
+  "item.qa.withdrawn.modal.header": "Request withdrawal",
+
+  "item.qa.reinstate.modal.header": "Request reinstate",
+
+  "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.startingFrom": "starting from version {{version}}",
@@ -2394,24 +2902,51 @@
 
   "item.version.create.modal.button.confirm.tooltip": "Create new version",
 
+  "item.qa.withdrawn-reinstate.modal.button.confirm.tooltip": "Send request",
+
+  "qa-withdrown.create.modal.button.confirm": "Withdraw",
+
+  "qa-reinstate.create.modal.button.confirm": "Reinstate",
+
   "item.version.create.modal.button.cancel": "Cancel",
 
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel": "Cancel",
+
   "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
 
+  "item.qa.withdrawn-reinstate.create.modal.button.cancel.tooltip": "Do not send request",
+
   "item.version.create.modal.form.summary.label": "Summary",
 
+  "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",
+
+  "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",
+
   "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
 
+  "qa-withdrown.modal.form.summary.placeholder": "Enter the reason for the withdrawal",
+
+  "qa-reinstate.modal.form.summary.placeholder": "Enter the reason for the reinstatement",
+
   "item.version.create.modal.submitted.header": "Creating new version...",
 
+  "item.qa.withdrawn.modal.submitted.header": "Sending withdrawn request...",
+
+  "correction-type.manage-relation.action.notification.reinstate": "Reinstate request sent.",
+
+  "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.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.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.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.delete.modal.header": "Delete version",
 
@@ -2425,16 +2960,73 @@
 
   "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
 
-  "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.failure" : "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
 
+  "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.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",
+  "itemtemplate.edit.metadata.add-button": "Add",
 
+  "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",
+
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+
+  "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+
+  "itemtemplate.edit.metadata.headers.edit": "Edit",
+
+  "itemtemplate.edit.metadata.headers.field": "Field",
+
+  "itemtemplate.edit.metadata.headers.language": "Lang",
+
+  "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",
+
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+
+  "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+
+  "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.title": "Metadata invalid",
+
+  "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.title": "Changes outdated",
+
+  "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+
+  "itemtemplate.edit.metadata.reinstate-button": "Undo",
+
+  "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+
+  "itemtemplate.edit.metadata.save-button": "Save",
 
   "journal.listelement.badge": "Journal",
 
@@ -2456,8 +3048,6 @@
 
   "journal.search.title": "Journal Search",
 
-
-
   "journalissue.listelement.badge": "Journal Issue",
 
   "journalissue.page.description": "Description",
@@ -2476,7 +3066,7 @@
 
   "journalissue.page.titleprefix": "Journal Issue: ",
 
-
+  "journalissue.search.results.head": "Journal Issue Search Results",
 
   "journalvolume.listelement.badge": "Journal Volume",
 
@@ -2490,6 +3080,7 @@
 
   "journalvolume.page.volume": "Volume",
 
+  "journalvolume.search.results.head": "Journal Volume Search Results",
 
   "iiifsearchable.listelement.badge": "Document Media",
 
@@ -2513,7 +3104,6 @@
 
   "iiif.page.description": "Description: ",
 
-
   "loading.bitstream": "Loading bitstream...",
 
   "loading.bitstreams": "Loading bitstreams...",
@@ -2550,8 +3140,6 @@
 
   "loading.top-level-communities": "Loading top-level communities...",
 
-
-
   "login.form.email": "Email address",
 
   "login.form.forgot-password": "Have you forgotten your password?",
@@ -2560,8 +3148,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",
@@ -2576,15 +3162,13 @@
 
   "login.breadcrumbs": "Login",
 
-
-
   "logout.form.header": "Log out from DSpace",
 
   "logout.form.submit": "Log out",
 
   "logout.title": "Logout",
 
-
+  "menu.header.nav.description": "Admin navigation bar",
 
   "menu.header.admin": "Management",
 
@@ -2592,22 +3176,24 @@
 
   "menu.header.admin.description": "Management menu",
 
-
-
   "menu.section.access_control": "Access Control",
 
   "menu.section.access_control_authorizations": "Authorizations",
 
+  "menu.section.access_control_bulk": "Bulk Access Management",
+
   "menu.section.access_control_groups": "Groups",
 
   "menu.section.access_control_people": "People",
 
+  "menu.section.reports": "Reports",
 
+  "menu.section.reports.collections": "Filtered Collections",
+
+  "menu.section.reports.queries": "Metadata Query",
 
   "menu.section.admin_search": "Admin Search",
 
-
-
   "menu.section.browse_community": "This Community",
 
   "menu.section.browse_community_by_author": "By Author",
@@ -2624,18 +3210,18 @@
 
   "menu.section.browse_global_by_subject": "By Subject",
 
+  "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",
 
-
-
   "menu.section.control_panel": "Control Panel",
 
   "menu.section.curation_task": "Curation Task",
 
-
-
   "menu.section.edit": "Edit",
 
   "menu.section.edit_collection": "Collection",
@@ -2644,8 +3230,6 @@
 
   "menu.section.edit_item": "Item",
 
-
-
   "menu.section.export": "Export",
 
   "menu.section.export_collection": "Collection",
@@ -2658,9 +3242,10 @@
 
   "menu.section.export_batch": "Batch Export (ZIP)",
 
-
   "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",
 
   "menu.section.icon.control_panel": "Control Panel menu section",
@@ -2691,7 +3276,7 @@
 
   "menu.section.icon.unpin": "Unpin sidebar",
 
-
+  "menu.section.icon.notifications": "Notifications menu section",
 
   "menu.section.import": "Import",
 
@@ -2699,8 +3284,6 @@
 
   "menu.section.import_metadata": "Metadata",
 
-
-
   "menu.section.new": "New",
 
   "menu.section.new_collection": "Collection",
@@ -2713,36 +3296,34 @@
 
   "menu.section.new_process": "Process",
 
+  "menu.section.notifications": "Notifications",
 
+  "menu.section.quality-assurance": "Quality Assurance",
+
+  "menu.section.notifications_publication-claim": "Publication Claim",
 
   "menu.section.pin": "Pin sidebar",
 
   "menu.section.unpin": "Unpin sidebar",
 
-
-
   "menu.section.processes": "Processes",
 
   "menu.section.health": "Health",
 
-
-
   "menu.section.registries": "Registries",
 
   "menu.section.registries_format": "Format",
 
   "menu.section.registries_metadata": "Metadata",
 
-
-
   "menu.section.statistics": "Statistics",
 
   "menu.section.statistics_task": "Statistics Task",
 
-
-
   "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",
 
   "menu.section.toggle.curation_task": "Toggle Curation Task section",
@@ -2761,14 +3342,13 @@
 
   "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
 
-
   "menu.section.workflow": "Administer Workflow",
 
-
   "metadata-export-search.tooltip": "Export search results as CSV",
-  "metadata-export-search.submit.success": "The export was started successfully",
-  "metadata-export-search.submit.error": "Starting the export has failed",
 
+  "metadata-export-search.submit.success": "The export was started successfully",
+
+  "metadata-export-search.submit.error": "Starting the export has failed",
 
   "mydspace.breadcrumbs": "MyDSpace",
 
@@ -2822,23 +3402,25 @@
 
   "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.status.archived": "Archived",
+  "mydspace.show.supervisedWorkspace": "Supervised items",
 
-  "mydspace.status.validation": "Validation",
+  "mydspace.status.mydspaceArchived": "Archived",
 
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceValidation": "Validation",
 
-  "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
 
-  "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  "mydspace.status.mydspaceWorkspace": "Workspace",
 
   "mydspace.title": "MyDSpace",
 
@@ -2852,17 +3434,27 @@
 
   "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>",
+
+  "notification.suggestion.review": "review the suggestions",
+
+  "notification.suggestion.please": "Please",
 
   "nav.browse.header": "All of DSpace",
 
   "nav.community-browse.header": "By Community",
 
+  "nav.context-help-toggle": "Toggle context help",
+
   "nav.language": "Language switch",
 
   "nav.login": "Log In",
 
-  "nav.logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "User profile menu and log out",
+
+  "nav.logout": "Log Out",
 
   "nav.main.description": "Main navigation bar",
 
@@ -2872,16 +3464,159 @@
 
   "nav.search": "Search",
 
+  "nav.search.button": "Submit search",
+
   "nav.statistics.header": "Statistics",
 
   "nav.stop-impersonating": "Stop impersonating EPerson",
 
-  "nav.toggle" : "Toggle navigation",
+  "nav.subscriptions": "Subscriptions",
 
-  "nav.user.description" : "User profile bar",
+  "nav.toggle": "Toggle navigation",
+
+  "nav.user.description": "User profile bar",
 
   "none.listelement.badge": "Item",
 
+  "quality-assurance.title": "Quality Assurance",
+
+  "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.",
+
+  "quality-assurance.topics": "Current Topics",
+
+  "quality-assurance.source": "Current Sources",
+
+  "quality-assurance.table.topic": "Topic",
+
+  "quality-assurance.table.source": "Source",
+
+  "quality-assurance.table.last-event": "Last Event",
+
+  "quality-assurance.table.actions": "Actions",
+
+  "quality-assurance.source-list.button.detail": "Show topics for {{param}}",
+
+  "quality-assurance.topics-list.button.detail": "Show suggestions for {{param}}",
+
+  "quality-assurance.noTopics": "No topics found.",
+
+  "quality-assurance.noSource": "No sources found.",
+
+  "notifications.events.title": "Quality Assurance Suggestions",
+
+  "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",
+
+  "quality-assurance.loading": "Loading ...",
+
+  "quality-assurance.events.topic": "Topic:",
+
+  "quality-assurance.noEvents": "No suggestions found.",
+
+  "quality-assurance.event.table.trust": "Trust",
+
+  "quality-assurance.event.table.publication": "Publication",
+
+  "quality-assurance.event.table.details": "Details",
+
+  "quality-assurance.event.table.project-details": "Project details",
+
+  "quality-assurance.event.table.reasons": "Reasons",
+
+  "quality-assurance.event.table.actions": "Actions",
+
+  "quality-assurance.event.action.accept": "Accept suggestion",
+
+  "quality-assurance.event.action.ignore": "Ignore suggestion",
+
+  "quality-assurance.event.action.undo": "DELETE",
+
+  "quality-assurance.event.action.reject": "Reject suggestion",
+
+  "quality-assurance.event.action.import": "Import project and accept suggestion",
+
+  "quality-assurance.event.table.pidtype": "PID Type:",
+
+  "quality-assurance.event.table.pidvalue": "PID Value:",
+
+  "quality-assurance.event.table.subjectValue": "Subject Value:",
+
+  "quality-assurance.event.table.abstract": "Abstract:",
+
+  "quality-assurance.event.table.suggestedProject": "OpenAIRE Suggested Project data",
+
+  "quality-assurance.event.table.project": "Project title:",
+
+  "quality-assurance.event.table.acronym": "Acronym:",
+
+  "quality-assurance.event.table.code": "Code:",
+
+  "quality-assurance.event.table.funder": "Funder:",
+
+  "quality-assurance.event.table.fundingProgram": "Funding program:",
+
+  "quality-assurance.event.table.jurisdiction": "Jurisdiction:",
+
+  "quality-assurance.events.back": "Back to topics",
+
+  "quality-assurance.events.back-to-sources": "Back to sources",
+
+  "quality-assurance.event.table.less": "Show less",
+
+  "quality-assurance.event.table.more": "Show more",
+
+  "quality-assurance.event.project.found": "Bound to the local record:",
+
+  "quality-assurance.event.project.notFound": "No local record found",
+
+  "quality-assurance.event.sure": "Are you sure?",
+
+  "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!",
+
+  "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.",
+
+  "quality-assurance.event.action.cancel": "Cancel",
+
+  "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.",
+
+  "quality-assurance.event.modal.project.title": "Choose a project to bound",
+
+  "quality-assurance.event.modal.project.publication": "Publication:",
+
+  "quality-assurance.event.modal.project.bountToLocal": "Bound to the local record:",
+
+  "quality-assurance.event.modal.project.select": "Project search",
+
+  "quality-assurance.event.modal.project.search": "Search",
+
+  "quality-assurance.event.modal.project.clear": "Clear",
+
+  "quality-assurance.event.modal.project.cancel": "Cancel",
+
+  "quality-assurance.event.modal.project.bound": "Bound project",
+
+  "quality-assurance.event.modal.project.remove": "Remove",
+
+  "quality-assurance.event.modal.project.placeholder": "Enter a project name",
+
+  "quality-assurance.event.modal.project.notFound": "No project found.",
+
+  "quality-assurance.event.project.bounded": "The project has been linked successfully.",
+
+  "quality-assurance.event.project.removed": "The project has been successfully unlinked.",
+
+  "quality-assurance.event.project.error": "An error has occurred. No operation performed.",
+
+  "quality-assurance.event.reason": "Reason",
 
   "orgunit.listelement.badge": "Organizational Unit",
 
@@ -2901,7 +3636,7 @@
 
   "orgunit.page.titleprefix": "Organizational Unit: ",
 
-
+  "orgunit.page.ror": "ROR Identifier",
 
   "pagination.options.description": "Pagination options",
 
@@ -2913,8 +3648,6 @@
 
   "pagination.sort-direction": "Sort Options",
 
-
-
   "person.listelement.badge": "Person",
 
   "person.listelement.no-title": "No name found",
@@ -2947,10 +3680,16 @@
 
   "person.search.title": "Person Search",
 
-
-
   "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",
@@ -2981,21 +3720,21 @@
 
   "process.new.notification.error.content": "An error occurred while creating this process",
 
+  "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+
   "process.new.header": "Create a new process",
 
   "process.new.title": "Create a new process",
 
   "process.new.breadcrumbs": "Create a new process",
 
+  "process.detail.arguments": "Arguments",
 
+  "process.detail.arguments.empty": "This process doesn't contain any arguments",
 
-  "process.detail.arguments" : "Arguments",
+  "process.detail.back": "Back",
 
-  "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-
-  "process.detail.back" : "Back",
-
-  "process.detail.output" : "Process Output",
+  "process.detail.output": "Process Output",
 
   "process.detail.logs.button": "Retrieve process output",
 
@@ -3003,21 +3742,21 @@
 
   "process.detail.logs.none": "This process has no output",
 
-  "process.detail.output-files" : "Output Files",
+  "process.detail.output-files": "Output Files",
 
-  "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.script" : "Script",
+  "process.detail.script": "Script",
 
-  "process.detail.title" : "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Process: {{ id }} - {{ name }}",
 
-  "process.detail.start-time" : "Start time",
+  "process.detail.start-time": "Start time",
 
-  "process.detail.end-time" : "Finish time",
+  "process.detail.end-time": "Finish time",
 
-  "process.detail.status" : "Status",
+  "process.detail.status": "Status",
 
-  "process.detail.create" : "Create similar process",
+  "process.detail.create": "Create similar process",
 
   "process.detail.actions": "Actions",
 
@@ -3035,19 +3774,37 @@
 
   "process.detail.delete.error": "Something went wrong when deleting the process",
 
+  "process.detail.refreshing": "Auto-refreshing…",
 
+  "process.overview.table.completed.info": "Finish time (UTC)",
 
-  "process.overview.table.finish" : "Finish time (UTC)",
+  "process.overview.table.completed.title": "Succeeded processes",
 
-  "process.overview.table.id" : "Process ID",
+  "process.overview.table.empty": "No matching processes found.",
 
-  "process.overview.table.name" : "Name",
+  "process.overview.table.failed.info": "Finish time (UTC)",
 
-  "process.overview.table.start" : "Start time (UTC)",
+  "process.overview.table.failed.title": "Failed processes",
 
-  "process.overview.table.status" : "Status",
+  "process.overview.table.finish": "Finish time (UTC)",
 
-  "process.overview.table.user" : "User",
+  "process.overview.table.id": "Process ID",
+
+  "process.overview.table.name": "Name",
+
+  "process.overview.table.running.info": "Start time (UTC)",
+
+  "process.overview.table.running.title": "Running processes",
+
+  "process.overview.table.scheduled.info": "Creation time (UTC)",
+
+  "process.overview.table.scheduled.title": "Scheduled processes",
+
+  "process.overview.table.start": "Start time (UTC)",
+
+  "process.overview.table.status": "Status",
+
+  "process.overview.table.user": "User",
 
   "process.overview.title": "Processes Overview",
 
@@ -3059,6 +3816,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.",
@@ -3073,8 +3832,6 @@
 
   "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
 
-
-
   "profile.breadcrumbs": "Update Profile",
 
   "profile.card.identify": "Identify",
@@ -3087,8 +3844,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",
@@ -3161,8 +3916,6 @@
 
   "project-relationships.search.results.head": "Project Search Results",
 
-
-
   "publication.listelement.badge": "Publication",
 
   "publication.page.description": "Description",
@@ -3185,13 +3938,77 @@
 
   "publication.search.title": "Publication Search",
 
-
   "media-viewer.next": "Next",
 
   "media-viewer.previous": "Previous",
 
   "media-viewer.playlist": "Playlist",
 
+  "suggestion.loading": "Loading ...",
+
+  "suggestion.title": "Publication Claim",
+
+  "suggestion.title.breadcrumbs": "Publication Claim",
+
+  "suggestion.targets.description": "Below you can see all the suggestions ",
+
+  "suggestion.targets": "Current Suggestions",
+
+  "suggestion.table.name": "Researcher Name",
+
+  "suggestion.table.actions": "Actions",
+
+  "suggestion.button.review": "Review {{ total }} suggestion(s)",
+
+  "suggestion.button.review.title": "Review {{ total }} suggestion(s) for ",
+
+  "suggestion.noTargets": "No target found.",
+
+  "suggestion.target.error.service.retrieve": "An error occurred while loading the Suggestion targets",
+
+  "suggestion.evidence.type": "Type",
+
+  "suggestion.evidence.score": "Score",
+
+  "suggestion.evidence.notes": "Notes",
+
+  "suggestion.approveAndImport": "Approve & import",
+
+  "suggestion.approveAndImport.success": "The suggestion has been imported successfully. <a href='{{ url }}'>View.</a>",
+
+  "suggestion.approveAndImport.bulk": "Approve & import Selected",
+
+  "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",
+
+  "suggestion.ignoreSuggestion": "Ignore Suggestion",
+
+  "suggestion.ignoreSuggestion.success": "The suggestion has been discarded",
+
+  "suggestion.ignoreSuggestion.bulk": "Ignore Suggestion Selected",
+
+  "suggestion.ignoreSuggestion.bulk.success": "{{ count }} suggestions have been discarded ",
+
+  "suggestion.ignoreSuggestion.bulk.error": "{{ count }} suggestions haven't been discarded due to unexpected server errors",
+
+  "suggestion.seeEvidence": "See evidence",
+
+  "suggestion.hideEvidence": "Hide evidence",
+
+  "suggestion.suggestionFor": "Suggestions for",
+
+  "suggestion.suggestionFor.breadcrumb": "Suggestions for {{ name }}",
+
+  "suggestion.source.openaire": "OpenAIRE Graph",
+
+  "suggestion.from.source": "from the ",
+
+  "suggestion.count.missing": "You have no publication claims left",
+
+  "suggestion.totalScore": "Total Score",
+
+  "suggestion.type.openaire": "OpenAIRE",
 
   "register-email.title": "New user registration",
 
@@ -3235,7 +4052,6 @@
 
   "register-page.create-profile.submit.success.head": "Registration completed",
 
-
   "register-page.registration.header": "New user registration",
 
   "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
@@ -3244,7 +4060,9 @@
 
   "register-page.registration.email.error.required": "Please fill in an email address",
 
-  "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-valid-domain": "Use email with allowed domains: {{ domains }}",
 
   "register-page.registration.email.hint": "This address will be verified and used as your login name.",
 
@@ -3262,6 +4080,8 @@
 
   "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.error.maildomain": "This email address is not on the list of domains who can register. Allowed domains are {{ domains }}",
+
   "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
 
   "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
@@ -3270,6 +4090,8 @@
 
   "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
 
+  "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+
   "relationships.add.error.relationship-type.content": "No suitable match could be found for relationship type {{ type }} between the two items",
 
   "relationships.add.error.server.content": "The server returned an error",
@@ -3284,10 +4106,14 @@
 
   "relationships.isIssueOf": "Journal Issues",
 
+  "relationships.isIssueOf.JournalIssue": "Journal Issue",
+
   "relationships.isJournalIssueOf": "Journal Issue",
 
   "relationships.isJournalOf": "Journals",
 
+  "relationships.isJournalVolumeOf": "Journal Volume",
+
   "relationships.isOrgUnitOf": "Organizational Units",
 
   "relationships.isPersonOf": "Authors",
@@ -3304,6 +4130,8 @@
 
   "relationships.isVolumeOf": "Journal Volumes",
 
+  "relationships.isVolumeOf.JournalVolume": "Journal Volume",
+
   "relationships.isContributorOf": "Contributors",
 
   "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
@@ -3312,13 +4140,11 @@
 
   "relationships.isFundingAgencyOf.OrgUnit": "Funder",
 
-
   "repository.image.logo": "Repository logo",
 
-  "repository.title.prefix": "DSpace Angular :: ",
-
-  "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title": "DSpace Repository",
 
+  "repository.title.prefix": "DSpace Repository :: ",
 
   "resource-policies.add.button": "Add",
 
@@ -3418,6 +4244,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",
@@ -3434,7 +4268,7 @@
 
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
 
-
+  "root.skip-to-content": "Skip to main content",
 
   "search.description": "",
 
@@ -3446,6 +4280,7 @@
 
   "search.search-form.placeholder": "Search the repository ...",
 
+  "search.filters.remove": "Remove filter of type {{ type }} with value {{ value }}",
 
   "search.filters.applied.f.author": "Author",
 
@@ -3475,10 +4310,10 @@
 
   "search.filters.applied.f.birthDate.min": "Start birth date",
 
+  "search.filters.applied.f.supervisedBy": "Supervised by",
+
   "search.filters.applied.f.withdrawn": "Withdrawn",
 
-
-
   "search.filters.filter.author.head": "Author",
 
   "search.filters.filter.author.placeholder": "Author name",
@@ -3617,7 +4452,17 @@
 
   "search.filters.filter.submitter.label": "Search submitter",
 
+  "search.filters.filter.show-tree": "Browse {{ name }} tree",
 
+  "search.filters.filter.funding.head": "Funding",
+
+  "search.filters.filter.funding.placeholder": "Funding",
+
+  "search.filters.filter.supervisedBy.head": "Supervised By",
+
+  "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+
+  "search.filters.filter.supervisedBy.label": "Search Supervised By",
 
   "search.filters.entityType.JournalIssue": "Journal Issue",
 
@@ -3633,27 +4478,32 @@
 
   "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",
 
-
   "search.filters.head": "Filters",
 
   "search.filters.reset": "Reset filters",
 
   "search.filters.search.submit": "Submit",
 
-
-
   "search.form.search": "Search",
 
   "search.form.search_dspace": "All repository",
 
   "search.form.scope.all": "All of DSpace",
 
-
-
   "search.results.head": "Search Results",
 
   "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
@@ -3670,7 +4520,6 @@
 
   "default-relationships.search.results.head": "Search Results",
 
-
   "search.sidebar.close": "Back to results",
 
   "search.sidebar.filters.title": "Filters",
@@ -3685,15 +4534,15 @@
 
   "search.sidebar.settings.title": "Settings",
 
-
-
   "search.view-switch.show-detail": "Show detail",
 
   "search.view-switch.show-grid": "Show as grid",
 
   "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",
 
@@ -3719,6 +4568,17 @@
 
   "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",
 
@@ -3742,7 +4602,7 @@
 
   "statistics.table.header.views": "Views",
 
-
+  "statistics.table.no-name": "(object name could not be loaded)",
 
   "submission.edit.breadcrumbs": "Edit Submission",
 
@@ -3750,7 +4610,7 @@
 
   "submission.general.cancel": "Cancel",
 
-  "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.deposit": "Deposit",
 
@@ -3764,6 +4624,8 @@
 
   "submission.general.discard.submit": "Discard",
 
+  "submission.general.back.submit": "Back",
+
   "submission.general.info.saved": "Saved",
 
   "submission.general.info.pending-changes": "Unsaved changes",
@@ -3772,7 +4634,6 @@
 
   "submission.general.save-later": "Save for later",
 
-
   "submission.import-external.page.title": "Import metadata from an external source",
 
   "submission.import-external.title": "Import metadata from an external source",
@@ -3813,6 +4674,10 @@
 
   "submission.import-external.source.crossref": "CrossRef",
 
+  "submission.import-external.source.datacite": "DataCite",
+
+  "submission.import-external.source.doi": "DOI",
+
   "submission.import-external.source.scielo": "SciELO",
 
   "submission.import-external.source.scopus": "Scopus",
@@ -3843,6 +4708,8 @@
 
   "submission.import-external.source.lcname": "Library of Congress Names",
 
+  "submission.import-external.source.ror": "Research Organization Registry (ROR)",
+
   "submission.import-external.preview.title": "Item Preview",
 
   "submission.import-external.preview.title.Publication": "Publication Preview",
@@ -3935,6 +4802,8 @@
 
   "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",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Import Remote Journal",
@@ -3957,6 +4826,12 @@
 
   "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",
+
+  "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",
 
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
@@ -3978,6 +4853,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
@@ -3993,9 +4869,11 @@
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Local Journal Issues ({{ 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 }})",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
@@ -4010,6 +4888,18 @@
 
   "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.orcidWorks": "ORCID ({{ 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.openaireFunding": "Funding 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.isFundingAgencyOfPublication": "Search for Funding Agencies",
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
@@ -4022,6 +4912,10 @@
 
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isOrgUnitOfProject": "OrgUnit of the Project",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
@@ -4030,17 +4924,18 @@
 
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
 
-
-
-
   "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
 
   "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",
+
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
 
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
 
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
@@ -4048,6 +4943,7 @@
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
 
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+
   "submission.sections.describe.relationship-lookup.title.Project": "Projects",
 
   "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
@@ -4066,6 +4962,10 @@
 
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
 
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+
+  "submission.sections.describe.relationship-lookup.title.isOrgUnitOfProject": "OrgUnit",
+
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
 
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
@@ -4077,6 +4977,7 @@
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
@@ -4092,11 +4993,13 @@
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
@@ -4125,9 +5028,11 @@
 
   "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "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.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": "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.confirm": "Save a new name variant",
 
@@ -4167,6 +5072,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.",
@@ -4177,7 +5084,17 @@
 
   "submission.sections.general.sections_not_valid": "There are incomplete sections.",
 
+  "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
 
+  "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+
+  "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+
+  "submission.sections.identifiers.handle_label": "Handle: ",
+
+  "submission.sections.identifiers.doi_label": "DOI: ",
+
+  "submission.sections.identifiers.otherIdentifiers_label": "Other identifiers: ",
 
   "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
 
@@ -4191,7 +5108,9 @@
 
   "submission.sections.submit.progressbar.describe.steptwo": "Describe",
 
-  "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.license": "Deposit license",
 
@@ -4201,7 +5120,6 @@
 
   "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
 
-
   "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.status.errors.title": "Errors",
@@ -4228,6 +5146,10 @@
 
   "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
 
+  "submission.sections.upload.primary.make": "Make {{fileName}} the primary bitstream",
+
+  "submission.sections.upload.primary.remove": "Remove {{fileName}} as the primary bitstream",
+
   "submission.sections.upload.delete.confirm.cancel": "Cancel",
 
   "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
@@ -4274,7 +5196,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.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.no-entry": "No",
 
@@ -4318,12 +5240,19 @@
 
   "submission.sections.accesses.form.until-placeholder": "Until",
 
+  "submission.sections.duplicates.none": "No duplicates were detected.",
+
+  "submission.sections.duplicates.detected": "Potential duplicates were detected. Please review the list below.",
+
+  "submission.sections.duplicates.in-workspace": "This item is in workspace",
+
+  "submission.sections.duplicates.in-workflow": "This item is in workflow",
+
   "submission.sections.license.granted-label": "I confirm the license above",
 
   "submission.sections.license.required": "You must accept the license",
 
-  "submission.sections.license.notgranted":  "You must accept the license",
-
+  "submission.sections.license.notgranted": "You must accept the license",
 
   "submission.sections.sherpa.publication.information": "Publication information",
 
@@ -4377,17 +5306,13 @@
 
   "submission.sections.sherpa.error.message": "There was an error retrieving sherpa informations",
 
-
-
   "submission.submit.breadcrumbs": "New submission",
 
   "submission.submit.title": "New submission",
 
-
-
   "submission.workflow.generic.delete": "Delete",
 
-  "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.edit": "Edit",
 
@@ -4397,7 +5322,13 @@
 
   "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
 
+  "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
 
+  "submission.workflow.generic.submit_select_reviewer-help": "",
+
+  "submission.workflow.generic.submit_score": "Rate",
+
+  "submission.workflow.generic.submit_score-help": "",
 
   "submission.workflow.tasks.claimed.approve": "Approve",
 
@@ -4407,6 +5338,10 @@
 
   "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
 
+  "submission.workflow.tasks.claimed.decline": "Decline",
+
+  "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.placeholder": "Describe the reason of reject",
@@ -4423,8 +5358,6 @@
 
   "submission.workflow.tasks.claimed.return_help": "Return the task to the pool so that another user may perform the task.",
 
-
-
   "submission.workflow.tasks.generic.error": "Error occurred during operation...",
 
   "submission.workflow.tasks.generic.processing": "Processing...",
@@ -4433,8 +5366,6 @@
 
   "submission.workflow.tasks.generic.success": "Operation successful",
 
-
-
   "submission.workflow.tasks.pool.claim": "Claim",
 
   "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
@@ -4443,11 +5374,83 @@
 
   "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-help": "Select this option to view the item's metadata.",
 
+  "submitter.empty": "N/A",
+
+  "subscriptions.title": "Subscriptions",
+
+  "subscriptions.item": "Subscriptions for items",
+
+  "subscriptions.collection": "Subscriptions for collections",
+
+  "subscriptions.community": "Subscriptions for communities",
+
+  "subscriptions.subscription_type": "Subscription type",
+
+  "subscriptions.frequency": "Subscription frequency",
+
+  "subscriptions.frequency.D": "Daily",
+
+  "subscriptions.frequency.M": "Monthly",
+
+  "subscriptions.frequency.W": "Weekly",
+
+  "subscriptions.tooltip": "Subscribe",
+
+  "subscriptions.modal.title": "Subscriptions",
+
+  "subscriptions.modal.type-frequency": "Type and frequency",
+
+  "subscriptions.modal.close": "Close",
+
+  "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+
+  "subscriptions.modal.new-subscription-form.type.content": "Content",
+
+  "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+
+  "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+
+  "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+
+  "subscriptions.modal.new-subscription-form.submit": "Submit",
+
+  "subscriptions.modal.new-subscription-form.processing": "Processing...",
+
+  "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+
+  "subscriptions.modal.delete.success": "Subscription deleted successfully",
+
+  "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+
+  "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+
+  "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+
+  "subscriptions.modal.update.error": "An error occurs during the subscription update",
+
+  "subscriptions.table.dso": "Subject",
+
+  "subscriptions.table.subscription_type": "Subscription Type",
+
+  "subscriptions.table.subscription_frequency": "Subscription Frequency",
+
+  "subscriptions.table.action": "Action",
+
+  "subscriptions.table.edit": "Edit",
+
+  "subscriptions.table.delete": "Delete",
+
+  "subscriptions.table.not-available": "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.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.",
 
   "thumbnail.default.alt": "Thumbnail Image",
 
@@ -4465,12 +5468,8 @@
 
   "thumbnail.person.placeholder": "No Profile Picture Available",
 
-
-
   "title": "DSpace",
 
-
-
   "vocabulary-treeview.header": "Hierarchical tree view",
 
   "vocabulary-treeview.load-more": "Load more",
@@ -4479,13 +5478,15 @@
 
   "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",
 
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
 
-
+  "vocabulary-treeview.info": "Select a subject to add as search filter",
 
   "uploader.browse": "browse",
 
@@ -4505,7 +5506,7 @@
 
   "virtual-metadata.delete-relationship.modal-head": "Select the items for which you want to save the virtual metadata as real metadata",
 
-
+  "supervisedWorkspace.search.results.head": "Supervised Items",
 
   "workspace.search.results.head": "Your submissions",
 
@@ -4513,7 +5514,9 @@
 
   "workflow.search.results.head": "Workflow tasks",
 
+  "supervision.search.results.head": "Workflow and Workspace tasks",
 
+  "orgunit.search.results.head": "Organizational Unit Search Results",
 
   "workflow-item.edit.breadcrumbs": "Edit workflowitem",
 
@@ -4535,7 +5538,6 @@
 
   "workflow-item.delete.button.confirm": "Delete",
 
-
   "workflow-item.send-back.notification.success.title": "Sent back to submitter",
 
   "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
@@ -4558,6 +5560,56 @@
 
   "workspace-item.view.title": "Workspace View",
 
+  "workspace-item.delete.breadcrumbs": "Workspace Delete",
+
+  "workspace-item.delete.header": "Delete workspace item",
+
+  "workspace-item.delete.button.confirm": "Delete",
+
+  "workspace-item.delete.button.cancel": "Cancel",
+
+  "workspace-item.delete.notification.success.title": "Deleted",
+
+  "workspace-item.delete.title": "This workspace item was successfully deleted",
+
+  "workspace-item.delete.notification.error.title": "Something went wrong",
+
+  "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+
+  "workflow-item.advanced.title": "Advanced workflow",
+
+  "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+
+  "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+
+  "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+
+  "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+
+  "workflow-item.selectrevieweraction.title": "Select Reviewer",
+
+  "workflow-item.selectrevieweraction.header": "Select Reviewer",
+
+  "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+
+  "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+
+  "workflow-item.scorereviewaction.notification.success.title": "Rating review",
+
+  "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+
+  "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+
+  "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+
+  "workflow-item.scorereviewaction.title": "Rate this item",
+
+  "workflow-item.scorereviewaction.header": "Rate this item",
+
+  "workflow-item.scorereviewaction.button.cancel": "Cancel",
+
+  "workflow-item.scorereviewaction.button.confirm": "Confirm",
+
   "idle-modal.header": "Session will expire soon",
 
   "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?",
@@ -4566,7 +5618,7 @@
 
   "idle-modal.extend-session": "Extend session",
 
-  "researcher.profile.action.processing" : "Processing...",
+  "researcher.profile.action.processing": "Processing...",
 
   "researcher.profile.associated": "Researcher profile associated",
 
@@ -4588,27 +5640,27 @@
 
   "researcher.profile.view": "View",
 
-  "researcher.profile.private.visibility" : "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVATE",
 
-  "researcher.profile.public.visibility" : "PUBLIC",
+  "researcher.profile.public.visibility": "PUBLIC",
 
   "researcher.profile.status": "Status:",
 
   "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
 
-  "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.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.title" : "Success",
+  "researcherprofile.success.claim.title": "Success",
 
   "person.page.orcid.create": "Create an ORCID ID",
 
   "person.page.orcid.granted-authorizations": "Granted authorizations",
 
-  "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Grant authorizations",
 
   "person.page.orcid.link": "Connect to ORCID ID",
 
@@ -4640,31 +5692,31 @@
 
   "person.page.orcid.save.preference.changes": "Update settings",
 
-  "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": "Biographical data",
 
-  "person.page.orcid.sync-profile.education" : "Education",
+  "person.page.orcid.sync-profile.education": "Education",
 
-  "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identifiers",
 
-  "person.page.orcid.sync-fundings.all" : "All fundings",
+  "person.page.orcid.sync-fundings.all": "All fundings",
 
-  "person.page.orcid.sync-fundings.mine" : "My fundings",
+  "person.page.orcid.sync-fundings.mine": "My fundings",
 
-  "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
 
-  "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Disabled",
 
-  "person.page.orcid.sync-publications.all" : "All publications",
+  "person.page.orcid.sync-publications.all": "All publications",
 
-  "person.page.orcid.sync-publications.mine" : "My publications",
+  "person.page.orcid.sync-publications.mine": "My publications",
 
-  "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Selected publications",
 
-  "person.page.orcid.sync-publications.disabled" : "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Disabled",
 
-  "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.error": "The discarding of the ORCID queue record failed",
 
@@ -4672,11 +5724,11 @@
 
   "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
 
-  "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",
 
@@ -4720,7 +5772,7 @@
 
   "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
 
-  "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.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
 
@@ -4756,7 +5808,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.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.organization.address-required": "The organization to be sent requires an address",
 
@@ -4809,6 +5861,784 @@
   "person.orcid.registry.queue": "ORCID Registry Queue",
 
   "person.orcid.registry.auth": "ORCID Authorizations",
+
   "home.recent-submissions.head": "Recent Submissions",
 
+  "listable-notification-object.default-message": "This object couldn't be retrieved",
+
+  "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+
+  "system-wide-alert-banner.countdown.prefix": "In",
+
+  "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+
+  "menu.section.system-wide-alert": "System-wide Alert",
+
+  "system-wide-alert.form.header": "System-wide Alert",
+
+  "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+
+  "system-wide-alert.form.cancel": "Cancel",
+
+  "system-wide-alert.form.save": "Save",
+
+  "system-wide-alert.form.label.active": "ACTIVE",
+
+  "system-wide-alert.form.label.inactive": "INACTIVE",
+
+  "system-wide-alert.form.error.message": "The system wide alert must have a message",
+
+  "system-wide-alert.form.label.message": "Alert message",
+
+  "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+
+  "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",
+
+  "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+
+  "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+
+  "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+
+  "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+
+  "admin.system-wide-alert.title": "System-wide Alerts",
+
+  "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.",
+
+  "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).",
+
+  "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).",
+
+  "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",
+
+  "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-replace-all": "Replace access conditions",
+
+  "access-control-add-to-existing": "Add to existing ones",
+
+  "access-control-limit-to-specific": "Limit the changes to specific bitstreams",
+
+  "access-control-process-all-bitstreams": "Update all the bitstreams in the item",
+
+  "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.",
+
+  "access-control-select-bitstreams-modal.close": "Close",
+
+  "access-control-option-label": "Access condition type",
+
+  "access-control-option-note": "Choose an access condition to apply to selected objects.",
+
+  "access-control-option-start-date": "Grant access from",
+
+  "access-control-option-start-date-note": "Select the date from which the related access condition is applied",
+
+  "access-control-option-end-date": "Grant access until",
+
+  "access-control-option-end-date-note": "Select the date until which the related access condition is applied",
+
+  "vocabulary-treeview.search.form.add": "Add",
+
+  "admin.notifications.publicationclaim.breadcrumbs": "Publication Claim",
+
+  "admin.notifications.publicationclaim.page.title": "Publication Claim",
+
+  "filter.search.operator.placeholder": "Operator",
+
+  "search.filters.filter.entityType.text": "Item Type",
+
+  "search.filters.operator.equals.text": "Equals",
+
+  "search.filters.operator.notequals.text": "Not Equals",
+
+  "search.filters.operator.notcontains.text": "Not Contains",
+
+  "search.filters.operator.contains.text": "Contains",
+
+  "search.filters.filter.title.text": "Title",
+
+  "search.filters.applied.f.title": "Title",
+
+  "search.filters.filter.author.text": "Author",
+
+  "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>.",
+
+  "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.",
+
+  "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",
+
+  "coar-notify-support.message-moderation.feedback-form": " Feedback form.",
+
+  "service.overview.delete.header": "Delete Service",
+
+  "ldn-registered-services.title": "Registered Services",
+  "ldn-registered-services.table.name": "Name",
+  "ldn-registered-services.table.description": "Description",
+  "ldn-registered-services.table.status": "Status",
+  "ldn-registered-services.table.action": "Action",
+  "ldn-registered-services.new": "NEW",
+  "ldn-registered-services.new.breadcrumbs": "Registered Services",
+
+  "ldn-service.overview.table.enabled": "Enabled",
+  "ldn-service.overview.table.disabled": "Disabled",
+  "ldn-service.overview.table.clickToEnable": "Click to enable",
+  "ldn-service.overview.table.clickToDisable": "Click to disable",
+
+  "ldn-edit-registered-service.title": "Edit Service",
+  "ldn-create-service.title": "Create service",
+  "service.overview.create.modal": "Create Service",
+  "service.overview.create.body": "Please confirm the creation of this service.",
+  "ldn-service-status": "Status",
+  "service.confirm.create": "Create",
+  "service.refuse.create": "Cancel",
+  "ldn-register-new-service.title": "Register a new service",
+  "ldn-new-service.form.label.submit": "Save",
+  "ldn-new-service.form.label.name": "Name",
+  "ldn-new-service.form.label.description": "Description",
+  "ldn-new-service.form.label.url": "Service URL",
+  "ldn-new-service.form.label.ip-range": "Service IP range",
+  "ldn-new-service.form.label.score": "Level of trust",
+  "ldn-new-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-new-service.form.placeholder.name": "Please provide service name",
+  "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",
+  "ldn-new-service.form.placeholder.lowerIp": "IPv4 range lower bound",
+  "ldn-new-service.form.placeholder.upperIp": "IPv4 range upper bound",
+  "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",
+  "ldn-service.form.label.placeholder.default-select": "Select a pattern",
+
+  "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.",
+  "ldn-service.form.pattern.ack-accept.category": "Acknowledgements",
+
+  "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.",
+  "ldn-service.form.pattern.ack-reject.category": "Acknowledgements",
+
+  "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.",
+  "ldn-service.form.pattern.ack-tentative-accept.category": "Acknowledgements",
+
+  "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.",
+  "ldn-service.form.pattern.ack-tentative-reject.category": "Acknowledgements",
+
+  "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.",
+  "ldn-service.form.pattern.announce-endorsement.category": "Announcements",
+
+  "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.",
+  "ldn-service.form.pattern.announce-ingest.category": "Announcements",
+
+  "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.",
+  "ldn-service.form.pattern.announce-relationship.category": "Announcements",
+
+  "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.",
+  "ldn-service.form.pattern.announce-review.category": "Announcements",
+
+  "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.",
+  "ldn-service.form.pattern.announce-service-result.category": "Announcements",
+
+  "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.",
+  "ldn-service.form.pattern.request-endorsement.category": "Requests",
+
+  "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.",
+  "ldn-service.form.pattern.request-ingest.category": "Requests",
+
+  "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.",
+  "ldn-service.form.pattern.request-review.category": "Requests",
+
+  "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.",
+  "ldn-service.form.pattern.undo-offer.category": "Undo",
+
+  "ldn-new-service.form.label.placeholder.selectedItemFilter": "No Item Filter Selected",
+  "ldn-new-service.form.label.ItemFilter": "Item Filter",
+  "ldn-new-service.form.label.automatic": "Automatic",
+  "ldn-new-service.form.error.name": "Name is required",
+  "ldn-new-service.form.error.url": "URL is required",
+  "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)",
+  "ldn-new-service.form.error.ldnurl": "LDN URL is required",
+  "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",
+
+  "ldn-new-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-new-service.form.label.addPattern": "+ Add more",
+  "ldn-new-service.form.label.removeItemFilter": "Remove",
+  "ldn-register-new-service.breadcrumbs": "New Service",
+  "service.overview.delete.body": "Are you sure you want to delete this service?",
+  "service.overview.edit.body": "Do you confirm the changes?",
+  "service.overview.edit.modal": "Edit Service",
+  "service.detail.update": "Confirm",
+  "service.detail.return": "Cancel",
+  "service.overview.reset-form.body": "Are you sure you want to discard the changes and leave?",
+  "service.overview.reset-form.modal": "Discard Changes",
+  "service.overview.reset-form.reset-confirm": "Discard",
+  "admin.registries.services-formats.modify.success.head": "Successful Edit",
+  "admin.registries.services-formats.modify.success.content": "The service has been edited",
+  "admin.registries.services-formats.modify.failure.head": "Failed Edit",
+  "admin.registries.services-formats.modify.failure.content": "The service has not been edited",
+  "ldn-service-notification.created.success.title": "Successful Create",
+  "ldn-service-notification.created.success.body": "The service has been created",
+  "ldn-service-notification.created.failure.title": "Failed Create",
+  "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",
+  "ldn-enable-service.notification.success.title": "Successful status updated",
+  "ldn-enable-service.notification.success.content": "The service status has been updated",
+  "ldn-service-delete.notification.success.title": "Successful Deletion",
+  "ldn-service-delete.notification.success.content": "The service has been deleted",
+  "ldn-service-delete.notification.error.title": "Failed Deletion",
+  "ldn-service-delete.notification.error.content": "The service has not been deleted",
+  "service.overview.reset-form.reset-return": "Cancel",
+  "service.overview.delete": "Delete service",
+  "ldn-edit-service.title": "Edit service",
+  "ldn-edit-service.form.label.name": "Name",
+  "ldn-edit-service.form.label.description": "Description",
+  "ldn-edit-service.form.label.url": "Service URL",
+  "ldn-edit-service.form.label.ldnUrl": "LDN Inbox URL",
+  "ldn-edit-service.form.label.inboundPattern": "Inbound Pattern",
+  "ldn-edit-service.form.label.noInboundPatternSelected": "No Inbound Pattern",
+  "ldn-edit-service.form.label.selectedItemFilter": "Selected Item Filter",
+  "ldn-edit-service.form.label.selectItemFilter": "No Item Filter",
+  "ldn-edit-service.form.label.automatic": "Automatic",
+  "ldn-edit-service.form.label.addInboundPattern": "+ Add more",
+  "ldn-edit-service.form.label.submit": "Save",
+  "ldn-edit-service.breadcrumbs": "Edit Service",
+  "ldn-service.control-constaint-select-none": "Select none",
+
+  "ldn-register-new-service.notification.error.title": "Error",
+  "ldn-register-new-service.notification.error.content": "An error occurred while creating this process",
+  "ldn-register-new-service.notification.success.title": "Success",
+  "ldn-register-new-service.notification.success.content": "The process was successfully created",
+
+  "info.coar-notify-support.title": "Notify Support",
+
+  "info.coar-notify.breadcrumbs": "Notify Support",
+
+  "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",
+
+  "item.page.review": "Review",
+
+  "item.page.dataset": "Dataset",
+  "menu.section.icon.ldn_services": "LDN Services overview",
+  "menu.section.services": "LDN Services",
+
+  "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",
+  "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 ",
+
+  "quality-assurance.event.table.event.message.serviceUrl": "Service URL:",
+
+  "quality-assurance.event.table.event.message.link": "Link:",
+
+  "service.detail.delete.cancel": "Cancel",
+
+  "service.detail.delete.button": "Delete service",
+
+  "service.detail.delete.header": "Delete service",
+
+  "service.detail.delete.body": "Are you sure you want to delete the current service?",
+
+  "service.detail.delete.confirm": "Delete service",
+
+  "service.detail.delete.success": "The service was successfully deleted.",
+
+  "service.detail.delete.error": "Something went wrong when deleting the service",
+
+  "service.overview.table.id": "Services ID",
+
+  "service.overview.table.name": "Name",
+
+  "service.overview.table.start": "Start time (UTC)",
+
+  "service.overview.table.status": "Status",
+
+  "service.overview.table.user": "User",
+
+  "service.overview.title": "Services Overview",
+
+  "service.overview.breadcrumbs": "Services Overview",
+
+  "service.overview.table.actions": "Actions",
+
+  "service.overview.table.description": "Description",
+
+  "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",
+
+  "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",
+
+  "submission.section.section-coar-notify.dropdown.no-data": "No data available",
+
+  "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",
+
+  "submission.section.section-coar-notify.selection.description": "Selected service's description:",
+
+  "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.",
+
+  "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.",
+
+  "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.",
+
+  "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",
+
+  "ldn-service-button-unmark-inbound-deletion": "Unmark inbound pattern for deletion",
+
+  "ldn-service-input-inbound-item-filter-dropdown": "Select Item filter for inbound pattern",
+
+  "ldn-service-input-inbound-pattern-dropdown": "Select inbound pattern for service",
+
+  "ldn-service-overview-select-delete": "Select service for deletion",
+
+  "ldn-service-overview-select-edit": "Edit LDN service",
+
+  "ldn-service-overview-close-modal": "Close modal",
+
+  "a-common-or_statement.label": "Item type is Journal Article or Dataset",
+
+  "always_true_filter.label": "Always true",
+
+  "automatic_processing_collection_filter_16.label": "Automatic processing",
+
+  "dc-identifier-uri-contains-doi_condition.label": "URI contains DOI",
+
+  "doi-filter.label": "DOI filter",
+
+  "driver-document-type_condition.label": "Document type equals driver",
+
+  "has-at-least-one-bitstream_condition.label": "Has at least one Bitstream",
+
+  "has-bitstream_filter.label": "Has Bitstream",
+
+  "has-one-bitstream_condition.label": "Has one Bitstream",
+
+  "is-archived_condition.label": "Is archived",
+
+  "is-withdrawn_condition.label": "Is withdrawn",
+
+  "item-is-public_condition.label": "Item is public",
+
+  "journals_ingest_suggestion_collection_filter_18.label": "Journals ingest",
+
+  "title-starts-with-pattern_condition.label": "Title starts with pattern",
+
+  "type-equals-dataset_condition.label": "Type equals Dataset",
+
+  "type-equals-journal-article_condition.label": "Type equals Journal Article",
+
+  "search.filters.filter.subject.text": "Subject",
+
+  "search.advanced.filters.head": "Advanced Search",
+
+  "filter.search.text.placeholder": "Search text",
+
+  "advancesearch.form.submit": "Add",
+
+  "ldn.no-filter.label": "None",
+
+  "admin.notify.dashboard": "Dashboard",
+
+  "menu.section.notify_dashboard": "Dashboard",
+
+  "menu.section.coar_notify": "COAR Notify",
+
+  "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.",
+
+  "admin-notify-dashboard.metrics": "Metrics",
+
+  "admin-notify-dashboard.received-ldn": "Number of received LDN",
+
+  "admin-notify-dashboard.generated-ldn": "Number of generated LDN",
+
+  "admin-notify-dashboard.NOTIFY.incoming.accepted": "Accepted",
+
+  "admin-notify-dashboard.NOTIFY.incoming.accepted.description": "Accepted inbound notifications",
+
+  "admin-notify-logs.NOTIFY.incoming.accepted": "Currently displaying: Accepted notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.processed": "Processed LDN",
+
+  "admin-notify-dashboard.NOTIFY.incoming.processed.description": "Processed inbound notifications",
+
+  "admin-notify-logs.NOTIFY.incoming.processed": "Currently displaying: Processed LDN",
+
+  "admin-notify-logs.NOTIFY.incoming.failure": "Currently displaying: Failed notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.failure": "Failure",
+
+  "admin-notify-dashboard.NOTIFY.incoming.failure.description": "Failed inbound notifications",
+
+  "admin-notify-logs.NOTIFY.outgoing.failure": "Currently displaying: Failed notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.failure": "Failure",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.failure.description": "Failed outbound notifications",
+
+  "admin-notify-logs.NOTIFY.incoming.untrusted": "Currently displaying: Untrusted notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted": "Untrusted",
+
+  "admin-notify-dashboard.NOTIFY.incoming.untrusted.description": "Inbound notifications not trusted",
+
+  "admin-notify-logs.NOTIFY.incoming.delivered": "Currently displaying: Delivered notifications",
+
+  "admin-notify-dashboard.NOTIFY.incoming.delivered.description": "Inbound notifications successfully delivered",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered": "Delivered",
+
+  "admin-notify-logs.NOTIFY.outgoing.delivered": "Currently displaying: Delivered notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.delivered.description": "Outbound notifications successfully delivered",
+
+  "admin-notify-logs.NOTIFY.outgoing.queued": "Currently displaying: Queued notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued.description": "Notifications currently queued",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued": "Queued",
+
+  "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",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description": "Notifications currently queued for retry",
+
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems": "Items involved",
+
+  "admin-notify-dashboard.NOTIFY.incoming.involvedItems.description": "Items related to inbound notifications",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems": "Items involved",
+
+  "admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description": "Items related to outbound notifications",
+
+  "admin.notify.dashboard.breadcrumbs": "Dashboard",
+
+  "admin.notify.dashboard.inbound": "Inbound messages",
+
+  "admin.notify.dashboard.inbound-logs": "Logs/Inbound",
+
+  "admin.notify.dashboard.filter": "Filter: ",
+
+  "search.filters.applied.f.relateditem": "Related items",
+
+  "search.filters.applied.f.ldn_service": "LDN Service",
+
+  "search.filters.applied.f.notifyReview": "Notify Review",
+
+  "search.filters.applied.f.notifyEndorsement": "Notify Endorsement",
+
+  "search.filters.applied.f.notifyRelation": "Notify Relation",
+
+  "search.filters.filter.queue_last_start_time.head": "Last processing time ",
+
+  "search.filters.filter.queue_last_start_time.min.label": "Min range",
+
+  "search.filters.filter.queue_last_start_time.max.label": "Max range",
+
+  "search.filters.applied.f.queue_last_start_time.min": "Min range",
+
+  "search.filters.applied.f.queue_last_start_time.max": "Max range",
+
+  "admin.notify.dashboard.outbound": "Outbound messages",
+
+  "admin.notify.dashboard.outbound-logs": "Logs/Outbound",
+
+  "NOTIFY.incoming.search.results.head": "Incoming",
+
+  "search.filters.filter.relateditem.head": "Related item",
+
+  "search.filters.filter.origin.head": "Origin",
+
+  "search.filters.filter.ldn_service.head": "LDN Service",
+
+  "search.filters.filter.target.head": "Target",
+
+  "search.filters.filter.queue_status.head": "Queue status",
+
+  "search.filters.filter.activity_stream_type.head": "Activity stream type",
+
+  "search.filters.filter.coar_notify_type.head": "COAR Notify type",
+
+  "search.filters.filter.notification_type.head": "Notification type",
+
+  "search.filters.filter.relateditem.label": "Search related items",
+
+  "search.filters.filter.queue_status.label": "Search queue status",
+
+  "search.filters.filter.target.label": "Search target",
+
+  "search.filters.filter.activity_stream_type.label": "Search activity stream type",
+
+  "search.filters.applied.f.queue_status": "Queue Status",
+
+  "search.filters.queue_status.0,authority": "Untrusted Ip",
+
+  "search.filters.queue_status.1,authority": "Queued",
+
+  "search.filters.queue_status.2,authority": "Processing",
+
+  "search.filters.queue_status.3,authority": "Processed",
+
+  "search.filters.queue_status.4,authority": "Failed",
+
+  "search.filters.queue_status.5,authority": "Untrusted",
+
+  "search.filters.queue_status.6,authority": "Unmapped Action",
+
+  "search.filters.queue_status.7,authority": "Queued for retry",
+
+  "search.filters.applied.f.activity_stream_type": "Activity stream type",
+
+  "search.filters.applied.f.coar_notify_type": "COAR Notify type",
+
+  "search.filters.applied.f.notification_type": "Notification type",
+
+  "search.filters.filter.coar_notify_type.label": "Search COAR Notify type",
+
+  "search.filters.filter.notification_type.label": "Search notification type",
+
+  "search.filters.filter.relateditem.placeholder": "Related items",
+
+  "search.filters.filter.target.placeholder": "Target",
+
+  "search.filters.filter.origin.label": "Search source",
+
+  "search.filters.filter.origin.placeholder": "Source",
+
+  "search.filters.filter.ldn_service.label": "Search LDN Service",
+
+  "search.filters.filter.ldn_service.placeholder": "LDN Service",
+
+  "search.filters.filter.queue_status.placeholder": "Queue status",
+
+  "search.filters.filter.activity_stream_type.placeholder": "Activity stream type",
+
+  "search.filters.filter.coar_notify_type.placeholder": "COAR Notify type",
+
+  "search.filters.filter.notification_type.placeholder": "Notification",
+
+  "search.filters.filter.notifyRelation.head": "Notify Relation",
+
+  "search.filters.filter.notifyRelation.label": "Search Notify Relation",
+
+  "search.filters.filter.notifyRelation.placeholder": "Notify Relation",
+
+  "search.filters.filter.notifyReview.head": "Notify Review",
+
+  "search.filters.filter.notifyReview.label": "Search Notify Review",
+
+  "search.filters.filter.notifyReview.placeholder": "Notify Review",
+
+  "search.filters.coar_notify_type.coar-notify:ReviewAction": "Review action",
+
+  "search.filters.coar_notify_type.coar-notify:ReviewAction,authority": "Review action",
+
+  "notify-detail-modal.coar-notify:ReviewAction": "Review action",
+
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction": "Endorsement action",
+
+  "search.filters.coar_notify_type.coar-notify:EndorsementAction,authority": "Endorsement action",
+
+  "notify-detail-modal.coar-notify:EndorsementAction": "Endorsement action",
+
+  "search.filters.coar_notify_type.coar-notify:IngestAction": "Ingest action",
+
+  "search.filters.coar_notify_type.coar-notify:IngestAction,authority": "Ingest action",
+
+  "notify-detail-modal.coar-notify:IngestAction": "Ingest action",
+
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction": "Relationship action",
+
+  "search.filters.coar_notify_type.coar-notify:RelationshipAction,authority": "Relationship action",
+
+  "notify-detail-modal.coar-notify:RelationshipAction": "Relationship action",
+
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED": "Queued",
+
+  "notify-detail-modal.QUEUE_STATUS_QUEUED": "Queued",
+
+  "search.filters.queue_status.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  "notify-detail-modal.QUEUE_STATUS_QUEUED_FOR_RETRY": "Queued for retry",
+
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSING": "Processing",
+
+  "notify-detail-modal.QUEUE_STATUS_PROCESSING": "Processing",
+
+  "search.filters.queue_status.QUEUE_STATUS_PROCESSED": "Processed",
+
+  "notify-detail-modal.QUEUE_STATUS_PROCESSED": "Processed",
+
+  "search.filters.queue_status.QUEUE_STATUS_FAILED": "Failed",
+
+  "notify-detail-modal.QUEUE_STATUS_FAILED": "Failed",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED": "Untrusted",
+
+  "notify-detail-modal.QUEUE_STATUS_UNTRUSTED_IP": "Untrusted Ip",
+
+  "search.filters.queue_status.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  "notify-detail-modal.QUEUE_STATUS_UNMAPPED_ACTION": "Unmapped Action",
+
+  "sorting.queue_last_start_time.DESC": "Last started queue Descending",
+
+  "sorting.queue_last_start_time.ASC": "Last started queue Ascending",
+
+  "sorting.queue_attempts.DESC": "Queue attempted Descending",
+
+  "sorting.queue_attempts.ASC": "Queue attempted Ascending",
+
+  "NOTIFY.incoming.involvedItems.search.results.head": "Items involved in incoming LDN",
+
+  "NOTIFY.outgoing.involvedItems.search.results.head": "Items involved in outgoing LDN",
+
+  "type.notify-detail-modal": "Type",
+
+  "id.notify-detail-modal": "Id",
+
+  "coarNotifyType.notify-detail-modal": "COAR Notify type",
+
+  "activityStreamType.notify-detail-modal": "Activity stream type",
+
+  "inReplyTo.notify-detail-modal": "In reply to",
+
+  "object.notify-detail-modal": "Repository Item",
+
+  "context.notify-detail-modal": "Repository Item",
+
+  "queueAttempts.notify-detail-modal": "Queue attempts",
+
+  "queueLastStartTime.notify-detail-modal": "Queue last started",
+
+  "origin.notify-detail-modal": "LDN Service",
+
+  "target.notify-detail-modal": "LDN Service",
+
+  "queueStatusLabel.notify-detail-modal": "Queue status",
+
+  "queueTimeout.notify-detail-modal": "Queue timeout",
+
+  "notify-message-modal.title": "Message Detail",
+
+  "notify-message-modal.show-message": "Show message",
+
+  "notify-message-result.timestamp": "Timestamp",
+
+  "notify-message-result.repositoryItem": "Repository Item",
+
+  "notify-message-result.ldnService": "LDN Service",
+
+  "notify-message-result.type": "Type",
+
+  "notify-message-result.status": "Status",
+
+  "notify-message-result.action": "Action",
+
+  "notify-message-result.detail": "Detail",
+
+  "notify-message-result.reprocess": "Reprocess",
+
+  "notify-queue-status.processed": "Processed",
+
+  "notify-queue-status.failed": "Failed",
+
+  "notify-queue-status.queue_retry": "Queued for retry",
+
+  "notify-queue-status.unmapped_action": "Unmapped action",
+
+  "notify-queue-status.processing": "Processing",
+
+  "notify-queue-status.queued": "Queued",
+
+  "notify-queue-status.untrusted": "Untrusted",
+
+  "ldnService.notify-detail-modal": "LDN Service",
+
+  "relatedItem.notify-detail-modal": "Related Item",
+
+  "search.filters.filter.notifyEndorsement.head": "Notify Endorsement",
+
+  "search.filters.filter.notifyEndorsement.placeholder": "Notify Endorsement",
+
+  "search.filters.filter.notifyEndorsement.label": "Search Notify Endorsement",
 }
diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5
index c641d683c4..298c0ff21f 100644
--- a/src/assets/i18n/es.json5
+++ b/src/assets/i18n/es.json5
@@ -9,7 +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.",
 
@@ -22,13 +21,12 @@
   // "500.page-internal-server-error": "Service Unavailable",
   "500.page-internal-server-error": "Servicio no disponible",
 
-  // "500.help": "The server is  temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
-  "500.help": "No se puede atender su petición debido a problemas de capacidad o mantenimeintos programados del servidor. Inténtelo mas adelante, por favor.",
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "No se puede atender su petición debido a problemas de capacidad o mantenimientos programados del servidor. Inténtelo más tarde, por favor.",
 
   // "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. ",
 
@@ -51,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",
@@ -72,7 +70,7 @@
   "admin.curation-tasks.breadcrumbs": "Tareas de curación del sistema",
 
   // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Tareas de conservación del sistema",
+  "admin.curation-tasks.title": "Tareas de curación del sistema",
 
   // "admin.curation-tasks.header": "System curation tasks",
   "admin.curation-tasks.header": "Tareas de curación del sistema",
@@ -168,13 +166,13 @@
   "admin.registries.bitstream-formats.edit.success.head": "Éxito",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
-  "admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivel de apoyo que su institución promete para este formato.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "El nivel de soporte que su institución promete para este formato.",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Nivel de soporte",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registro de formato Archivo",
+  "admin.registries.bitstream-formats.head": "Registro de formatos de archivo",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "No hay formatos de archivo para mostrar.",
@@ -194,6 +192,9 @@
   // "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.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Atrás",
 
@@ -212,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",
 
@@ -242,7 +241,7 @@
   "admin.registries.metadata.schemas.table.delete": "Eliminar seleccionado",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
-  "admin.registries.metadata.schemas.table.id": "IDENTIFICACIÓN",
+  "admin.registries.metadata.schemas.table.id": "ID",
 
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Nombre",
@@ -253,13 +252,11 @@
   // "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",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
-  "admin.registries.schema.description": "Este es el esquema de metadatos para \"{{ namespace }} \".",
+  "admin.registries.schema.description": "Este es el esquema de metadatos para \"{{ namespace }}\".",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Campos de metadatos de esquema",
@@ -273,6 +270,9 @@
   // "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.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota de alcance",
 
@@ -283,10 +283,10 @@
   "admin.registries.schema.form.edit": "Editar campo de metadatos",
 
   // "admin.registries.schema.form.element": "Element",
-  "admin.registries.schema.form.element": "Artículo",
+  "admin.registries.schema.form.element": "Elemento",
 
   // "admin.registries.schema.form.qualifier": "Qualifier",
-  "admin.registries.schema.form.qualifier": "Calificatorio",
+  "admin.registries.schema.form.qualifier": "Cualificador",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "Nota de alcance",
@@ -295,7 +295,7 @@
   "admin.registries.schema.head": "Esquema de metadatos",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.created": "Esquema de metadatos creado correctamente \"{{ prefix }} \"",
+  "admin.registries.schema.notification.created": "Esquema de metadatos creado correctamente \"{{ prefix }}\"",
 
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "Error al eliminar {{ amount }} esquemas de metadatos",
@@ -304,22 +304,22 @@
   "admin.registries.schema.notification.deleted.success": "{{ amount }} esquemas de metadatos eliminados correctamente",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-  "admin.registries.schema.notification.edited": "Esquema de metadatos editado correctamente \"{{ prefix }} \"",
+  "admin.registries.schema.notification.edited": "Esquema de metadatos \"{{ prefix }}\" editado correctamente",
 
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Error",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.created": "Campo de metadatos creado correctamente \"{{ field }} \"",
+  "admin.registries.schema.notification.field.created": "Campo de metadatos \"{{ field }}\" creado correctamente",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-  "admin.registries.schema.notification.field.deleted.failure": "No se pudieron borrar los campos de metadatos de {{ amount }}",
+  "admin.registries.schema.notification.field.deleted.failure": "No se pudieron borrar {{ amount }} campos de metadatos",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "{{ amount }} campos de metadatos eliminados correctamente",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "Campo de metadatos editado correctamente \"{{ field }} \"",
+  "admin.registries.schema.notification.field.edited": "Campo de metadatos \"{{ field }}\" editado correctamente",
 
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Éxito",
@@ -330,28 +330,50 @@
   // "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 EPerson",
+  "admin.access-control.epeople.actions.delete": "Eliminar usuario",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  "admin.access-control.epeople.actions.impersonate": "Hacerse pasar por EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Hacerse pasar por usuario",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "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 EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "Dejar de hacerse pasar por usuario",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
-  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Usuarios",
 
   // "admin.access-control.epeople.title": "EPeople",
-  "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Usuarios",
 
   // "admin.access-control.epeople.head": "EPeople",
-  "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Usuarios",
 
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Buscar",
@@ -369,13 +391,13 @@
   "admin.access-control.epeople.search.button": "Buscar",
 
   // "admin.access-control.epeople.search.placeholder": "Search people...",
-  "admin.access-control.epeople.search.placeholder": "Busca gente...",
+  "admin.access-control.epeople.search.placeholder": "Busca usuarios...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  "admin.access-control.epeople.button.add": "Agregar una persona",
+  "admin.access-control.epeople.button.add": "Agregar un usuario",
 
   // "admin.access-control.epeople.table.id": "ID",
-  "admin.access-control.epeople.table.id": "IDENTIFICACIÓN",
+  "admin.access-control.epeople.table.id": "ID",
 
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nombre",
@@ -393,22 +415,22 @@
   "admin.access-control.epeople.table.edit.buttons.edit-disabled": "No tienes autorización para editar este grupo.",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
-  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }} \"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminar \"{{ name }}\"",
 
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  "admin.access-control.epeople.no-items": "No hay EPeople para mostrar.",
+  "admin.access-control.epeople.no-items": "No hay usuarios para mostrar.",
 
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  "admin.access-control.epeople.form.create": "Crear una persona",
+  "admin.access-control.epeople.form.create": "Crear un usuario",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  "admin.access-control.epeople.form.edit": "Editar EPerson",
+  "admin.access-control.epeople.form.edit": "Editar usuario",
 
   // "admin.access-control.epeople.form.firstName": "First name",
-  "admin.access-control.epeople.form.firstName": "Nombre de pila",
+  "admin.access-control.epeople.form.firstName": "Nombre",
 
   // "admin.access-control.epeople.form.lastName": "Last name",
-  "admin.access-control.epeople.form.lastName": "Apellido",
+  "admin.access-control.epeople.form.lastName": "Apellidos",
 
   // "admin.access-control.epeople.form.email": "E-mail",
   "admin.access-control.epeople.form.email": "Correo electrónico",
@@ -426,34 +448,34 @@
   "admin.access-control.epeople.form.return": "Atrás",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.success": "EPerson \"{{ name }} \" creada correctamente",
+  "admin.access-control.epeople.form.notification.created.success": "Usuario \"{{ name }}\" creado correctamente",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.created.failure": "Error al crear EPerson \"{{ name }} \"",
+  "admin.access-control.epeople.form.notification.created.failure": "Error al crear usuario \"{{ name }}\"",
 
   // "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": "Error al crear EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Error al crear usuario \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
 
   // "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": "Error al editar EPerson \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Error al editar usuario \"{{ name }}\", el correo electrónico \"{{ email }}\" ya está en uso.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{ name }} \" editado correctamente",
+  "admin.access-control.epeople.form.notification.edited.success": "Usuario \"{{ name }}\" editado correctamente",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.edited.failure": "Error al editar EPerson \"{{ name }} \"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Error al editar usuario \"{{ name }}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.success": "EPerson \"{{ name }} \" eliminada correctamente",
+  "admin.access-control.epeople.form.notification.deleted.success": "Usuario \"{{ name }}\" eliminado correctamente",
 
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.failure": "No se pudo borrar EPerson \"{{ name }} \"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "No se pudo borrar el usuario \"{{ name }}\"",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Miembro de estos grupos:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-  "admin.access-control.epeople.form.table.id": "IDENTIFICACIÓN",
+  "admin.access-control.epeople.form.table.id": "ID",
 
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Nombre",
@@ -462,18 +484,16 @@
   "admin.access-control.epeople.form.table.collectionOrCommunity": "Colección/Comunidad",
 
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  "admin.access-control.epeople.form.memberOfNoGroups": "Esta EPerson no es miembro de ningún grupo",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Este usuario no es miembro de ningún grupo",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Agregar a grupos",
 
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "No se pudo borrar EPerson: \"{{ name }} \"",
+  "admin.access-control.epeople.notification.deleted.failure": "No se pudo borrar el usuario: \"{{ name }}\"",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "EPerson eliminada correctamente: \"{{ name }} \"",
-
-
+  "admin.access-control.epeople.notification.deleted.success": "Usuario eliminado correctamente: \"{{ name }}\"",
 
   // "admin.access-control.groups.title": "Groups",
   "admin.access-control.groups.title": "Grupos",
@@ -500,7 +520,7 @@
   "admin.access-control.groups.button.add": "Añadir grupo",
 
   // "admin.access-control.groups.search.head": "Search groups",
-  "admin.access-control.groups.search.head": "Grupos de búsqueda",
+  "admin.access-control.groups.search.head": "Buscar grupos",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "Examinar todo",
@@ -512,7 +532,7 @@
   "admin.access-control.groups.search.placeholder": "Buscar grupos...",
 
   // "admin.access-control.groups.table.id": "ID",
-  "admin.access-control.groups.table.id": "IDENTIFICACIÓN",
+  "admin.access-control.groups.table.id": "ID",
 
   // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "Nombre",
@@ -542,15 +562,13 @@
   "admin.access-control.groups.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }}\"",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
-  "admin.access-control.groups.notification.deleted.failure.content": "Causa: \"{{ 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.",
 
   // "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": "Este grupo no puede ser modificado o eliminado porque corresponde a un rol en el proceso de presentación y flujo de trabajo en el \"{{ name }}\" {{ comcol }}. Puede eliminarlo desde la pestaña <a href='{{ comcolEditRolesRoute }}'>\"asignar roles\"</a> de la página de edición del {{ comcol }}. Todavía puede añadir y eliminar miembros del grupo utilizando esta página.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Este grupo no puede ser modificado o eliminado porque corresponde a un rol en el proceso de entrada y revisión de envíos en {{ comcol }} \"{{ name }}\". Puede eliminarlo desde la pestaña <a href='{{ comcolEditRolesRoute }}'>\"asignar roles\"</a> de la página de edición de la {{ comcol }}. Sí puede añadir y eliminar miembros del grupo utilizando esta página.",
 
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Crea un grupo",
@@ -568,31 +586,31 @@
   "admin.access-control.groups.form.groupDescription": "Descripción",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.success": "Grupo creado con éxito \"{{ name }} \"",
+  "admin.access-control.groups.form.notification.created.success": "Grupo creado con éxito \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.created.failure": "No se pudo crear el grupo \"{{ name }} \"",
+  "admin.access-control.groups.form.notification.created.failure": "No se pudo crear el grupo \"{{ 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.",
   "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "No se pudo crear el grupo con el nombre: \"{{ name }}\", asegúrese de que el nombre no esté en uso.",
 
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.failure": "No se pudo editar el grupo \"{{ name }} \"",
+  "admin.access-control.groups.form.notification.edited.failure": "No se pudo editar el grupo \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "¡El nombre \"{{ name }} \" ya está en uso!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "¡El nombre \"{{ name }}\" ya está en uso!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-  "admin.access-control.groups.form.notification.edited.success": "Grupo editado correctamente \"{{ name }} \"",
+  "admin.access-control.groups.form.notification.edited.success": "Grupo \"{{ name }}\" editado correctamente",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Eliminar grupo",
 
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
-  "admin.access-control.groups.form.delete-group.modal.header": "Eliminar grupo \"{{ dsoName }} \"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Eliminar grupo \"{{ dsoName }}\"",
 
   // "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": "¿Está seguro de que desea eliminar el grupo \"{{ dsoName }} \"?",
+  "admin.access-control.groups.form.delete-group.modal.info": "¿Está seguro de que desea eliminar el grupo \"{{ dsoName }}\"?",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar",
@@ -601,19 +619,19 @@
   "admin.access-control.groups.form.delete-group.modal.confirm": "Borrar",
 
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
-  "admin.access-control.groups.form.notification.deleted.success": "El grupo \"{{ name }} \" se eliminó correctamente",
+  "admin.access-control.groups.form.notification.deleted.success": "El grupo \"{{ name }}\" se eliminó correctamente",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-  "admin.access-control.groups.form.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }} \"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "No se pudo borrar el grupo \"{{ name }}\"",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
-  "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }} \"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.members-list.head": "EPeople",
-  "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "Usuarios",
 
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  "admin.access-control.groups.form.members-list.search.head": "Agregar EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Agregar usuarios",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.members-list.button.see-all": "Examinar todo",
@@ -649,22 +667,22 @@
   "admin.access-control.groups.form.members-list.table.edit": "Eliminar / Agregar",
 
   // "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": "Eliminar miembro con nombre \"{{ name }} \"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Eliminar miembro con nombre \"{{ name }}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "Miembro agregado exitosamente: \"{{ name }} \"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Miembro agregado exitosamente: \"{{ name }}\"",
 
   // "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": "No se pudo agregar el miembro: \"{{ name }} \"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "No se pudo agregar el miembro: \"{{ name }}\"",
 
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Miembro eliminado correctamente: \"{{ name }} \"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Miembro eliminado correctamente: \"{{ name }}\"",
 
   // "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": "No se pudo borrar el miembro: \"{{ name }} \"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "No se pudo borrar el miembro: \"{{ name }}\"",
 
   // "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": "Agregar miembro con nombre \"{{ name }} \"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Agregar miembro con nombre \"{{ name }}\"",
 
   // "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": "No hay un grupo activo actual, envíe un nombre primero.",
@@ -673,10 +691,10 @@
   "admin.access-control.groups.form.members-list.no-members-yet": "Aún no hay miembros en el grupo, busque y agregue.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-  "admin.access-control.groups.form.members-list.no-items": "No se encontraron E-People en esa búsqueda",
+  "admin.access-control.groups.form.members-list.no-items": "No se encontraron usuarios en esa búsqueda",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "Algo salió mal: \"{{ cause }} \"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Algo salió mal: \"{{ cause }}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Grupos",
@@ -694,7 +712,7 @@
   "admin.access-control.groups.form.subgroups-list.search.button": "Buscar",
 
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  "admin.access-control.groups.form.subgroups-list.table.id": "IDENTIFICACIÓN",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
 
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Nombre",
@@ -706,25 +724,431 @@
   "admin.access-control.groups.form.subgroups-list.table.edit": "Eliminar / Agregar",
 
   // "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": "Eliminar subgrupo con nombre \"{{ name }} \"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Eliminar subgrupo con nombre \"{{ name }}\"",
 
   // "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.buttons.add": "Agregar subgrupo con el nombre \"{{ name }} \"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Agregar subgrupo con el nombre \"{{ name }}\"",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo actual",
 
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
+  "admin.search.breadcrumbs": "Búsqueda administrativa",
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }} \"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo agregado exitosamente: \"{{ name }}\"",
 
   // "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": "No se pudo agregar el subgrupo: \"{{ name }} \"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "No se pudo agregar el subgrupo: \"{{ name }}\"",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo eliminado correctamente: \"{{ name }} \"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo eliminado correctamente: \"{{ name }}\"",
 
   // "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": "No se pudo borrar el subgrupo: \"{{ name }} \"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "No se pudo borrar el subgrupo: \"{{ name }}\"",
 
   // "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": "No hay un grupo activo actual, envíe un nombre primero.",
@@ -741,7 +1165,14 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Atrás",
 
+  // "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": "En esta página, puede modificar las propiedades y miembros de un grupo. En la sección superior, puede editar el nombre del grupo y la descripción, a menos que este sea un grupo de administración de una colección o comunidad, en cuyo caso el nombre y descripción del grupo fueron auto-generadas y no podrán ser editadas. En las secciones siguientes, puede editar la afiliación al grupo. Para más detalles ver [la 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. 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 agregar o remover una persona en este grupo, pulse el botón ‘Examinar todo’ o utilice la barra de búsqueda de abajo para buscar los usuario (Use el desplegable que se encuentra a la derecha de la barra de búsqueda para seleccionar entre buscar por metadato o por correo electrónico). Posteriormente pulse el botón con el icono más por cada usuario que desea agregar a la lista, o el icono de papelera por cada usuario que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
+
+  // "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 agregar o remover un sub-grupo en este grupo, pulse el botón 'Examinar todo' o utilice la barra de búsqueda de abajo para buscar los subgrupos- Posteriormente pulse el botón con el icono más por cada sub-grupo que desea agregar a la lista, o el icono de papelera por cada sub-grupo que desea remover. La lista puede contener varias páginas: utilice los controles de paginación debajo de la lista, para navegar a las siguientes páginas. Cuando haya finalizado, guarde sus cambios pulsando el botón ‘Guardar’ ubicado en la parte superior de la sección.",
 
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Búsqueda administrativa",
@@ -762,10 +1193,10 @@
   "admin.search.item.make-private": "Hacerlo privado",
 
   // "admin.search.item.make-public": "Make discoverable",
-  "admin.search.item.make-public": "Hacer público",
+  "admin.search.item.make-public": "Hacerlo público",
 
   // "admin.search.item.move": "Move",
-  "admin.search.item.move": "Moverse",
+  "admin.search.item.move": "Mover",
 
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Reintegrar",
@@ -779,9 +1210,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",
 
@@ -791,31 +1219,59 @@
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Flujo de trabajo",
 
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Espacio de trabajo",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Borrar",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Enviar de vuelta",
 
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Políticas",
 
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisión",
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Importar metadatos",
 
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importación por lotes",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Importar metadatos",
 
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importación por lotes",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Importar metadatos",
 
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importación por lotes",
+
   // "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": "Puede soltar o explorar archivos CSV que contienen operaciones de metadatos por lotes en archivos aquí",
+  "admin.metadata-import.page.help": "Puede soltar o examinar archivos CSV que contienen operaciones de metadatos por lotes aquí",
+
+  // "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",
 
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Suelta un ZIP por lotes para importar",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  "admin.metadata-import.page.dropMsgReplace": "Suelta para reemplazar el CSV de metadatos para importar",
+  "admin.metadata-import.page.dropMsgReplace": "Suelta para reemplazar el CSV de metadatos a importar",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Suelta para reemplazar el ZIP por lotes a importar",
 
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Atrás",
@@ -823,17 +1279,131 @@
   // "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": "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",
 
   // "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": "Al seleccionar, se validará el CSV subido. Recibirá un informe con los cambios detectados, pero no se efectuarán dichos cambios.",
 
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Evaluación",
 
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Usted debe evaluar el ítem",
 
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Revisión",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Debe ingresar una revisión para enviar esta evaluación",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Por favor, a continuación seleccione una evaluación",
+
+  // "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",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Agregar usuario",
+
+  // "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": "Explorar todo",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Miembros actuales",
+
+  // "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": "Metadatos",
+
+  // "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": "Correo electrónico (exacto)",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Buscar",
+
+  // "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": "Nombre",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identidad",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Correo electrónico",
+
+  // "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": "Eliminar / Agregar",
+
+  // "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": "Eliminar miembro con nombre \"{{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": "Miembro agregado exitosamente: \"{{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": "Error al agregar miembro: \"{{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": "Miembro borrado exitosamente: \"{{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": "No fue posible borrar el miembro: \"{{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": "Agregar miembro con nombre \"{{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": "Actualmente no hay un grupo activo, primero envíe un nombre.",
+
+  // "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": "Aún no hay miembros en el grupo, busque y agregue.",
+
+  // "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": "No se encontró ningún usuario en la búsqueda",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Ningún 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": "Al seleccionar, se validará el archivo ZIP subido. Recibirá un informe con los cambios detectados, pero no se efectuarán dichos cambios.",
+
+  // "admin.batch-import.page.remove": "remove",
+  "admin.batch-import.page.remove": "eliminar",
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Dirección de correo electrónico o contraseña no válidos.",
@@ -844,26 +1414,23 @@
   // "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 de archivo",
+  "bitstream.edit.authorizations.link": "Editar las políticas del archivo",
 
   // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-  "bitstream.edit.authorizations.title": "Editar las políticas de archivo",
+  "bitstream.edit.authorizations.title": "Editar las políticas del archivo",
 
   // "bitstream.edit.return": "Back",
   "bitstream.edit.return": "Atrás",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-  "bitstream.edit.bitstream": "Archivo:",
+  "bitstream.edit.bitstream": "Archivo: ",
 
   // "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": "Opcionalmente, proporcione una breve descripción del archivo, por ejemplo \"<i>Artículo principal</i>\" o \"<i>Lecturas de datos del experimento</i>\".",
@@ -872,13 +1439,13 @@
   "bitstream.edit.form.description.label": "Descripción",
 
   // "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": "El primer día a partir del cual se permite el acceso. <b>Esta fecha no se puede modificar en este formulario.</b> Para establecer una fecha de embargo para un archivo, vaya a la pestaña <i> Estado del artículo </i>, haga clic en <i> Autorizaciones... </ i >, cree o edite la política <i> READ </i> del archivo y configure la <i> Fecha de inicio </i> como desee.",
+  "bitstream.edit.form.embargo.hint": "El primer día a partir del cual se permite el acceso. <b>Esta fecha no se puede modificar en este formulario.</b> Para establecer una fecha de embargo para un archivo, vaya a la pestaña <i>Estado del ítem</i>, haga clic en <i>Autorizaciones...</i>, cree o edite la política <i>READ</i> del archivo y configure la <i>Fecha de inicio</i> como desee.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
   "bitstream.edit.form.embargo.label": "Embargo hasta fecha concreta",
 
   // "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": "Cambie el nombre de archivo del archivo. Tenga en cuenta que esto cambiará la URL de archivo de visualización, pero los enlaces antiguos seguirán resolviéndose siempre que la ID de secuencia no cambie.",
+  "bitstream.edit.form.fileName.hint": "Cambie el nombre del archivo. Tenga en cuenta que esto cambiará la URL de visualización del archivo, pero los enlaces antiguos seguirán resolviéndose siempre que la ID de secuencia no cambie.",
 
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Nombre del archivo",
@@ -887,13 +1454,13 @@
   "bitstream.edit.form.newFormat.label": "Describe el nuevo formato",
 
   // "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": "La aplicación que usó para crear el archivo y el número de versión (por ejemplo, \"<i> ACMESoft SuperApp versión 1.5 </i>\").",
+  "bitstream.edit.form.newFormat.hint": "La aplicación que usó para crear el archivo y el número de versión (por ejemplo, \"<i>ACMESoft SuperApp versión 1.5</i>\").",
 
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  "bitstream.edit.form.primaryBitstream.label": "archivo primario",
+  "bitstream.edit.form.primaryBitstream.label": "Archivo principal",
 
   // "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": "Si el formato no está en la lista anterior, <b> seleccione \"el formato no está en la lista \" arriba </b> y descríbalo en \"Describir el nuevo formato \".",
+  "bitstream.edit.form.selectedFormat.hint": "Si el formato no está en la lista anterior, <b>seleccione \"el formato no está en la lista\" arriba</b> y descríbalo en \"Describir el nuevo formato\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Formato seleccionado",
@@ -904,11 +1471,14 @@
   // "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",
 
   // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
-  "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Etiqueta Canvas para esta imagen. Si no se proporciona, se utilizará la etiqueta predeterminada.",
 
   // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
   "bitstream.edit.form.iiifToc.label": "Índice del IIIF",
@@ -928,7 +1498,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.",
 
@@ -951,8 +1520,8 @@
   "bitstream-request-a-copy.intro": "Introduzca la siguiente información para solicitar una copia del siguiente ítem: ",
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
-  "bitstream-request-a-copy.intro.bitstream.one": "Solicitando el fichero siguiente: ",
- 
+  "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. ",
 
@@ -995,7 +1564,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",
 
@@ -1003,13 +1571,16 @@
   "browse.comcol.by.author": "Por autor",
 
   // "browse.comcol.by.dateissued": "By Issue Date",
-  "browse.comcol.by.dateissued": "Por fecha de emisión",
+  "browse.comcol.by.dateissued": "Por fecha de publicación",
 
   // "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",
@@ -1038,6 +1609,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",
 
@@ -1054,7 +1628,7 @@
   "browse.startsWith": ", comenzando por {{ startsWith }}",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-  "browse.startsWith.choose_start": "(Elija inicio)",
+  "browse.startsWith.choose_start": "(Elegir inicio)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Elegir año)",
@@ -1063,7 +1637,7 @@
   "browse.startsWith.choose_year.label": "Elija el año de publicación",
 
   // "browse.startsWith.jump": "Filter results by year or month",
-  "browse.startsWith.jump": "Filtrar  resultado spor año o por mes:",
+  "browse.startsWith.jump": "Filtrar resultados por año o por mes:",
 
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "abril",
@@ -1093,7 +1667,7 @@
   "browse.startsWith.months.may": "mayo",
 
   // "browse.startsWith.months.none": "(Choose month)",
-  "browse.startsWith.months.none": "(Elija mes)",
+  "browse.startsWith.months.none": "(Elegir mes)",
 
   // "browse.startsWith.months.none.label": "Choose the issue month",
   "browse.startsWith.months.none.label": "Elija el mes de publicación",
@@ -1119,17 +1693,32 @@
   // "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 }}porby {{ 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",
 
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Rechazado, enviar de vuelta al depositante",
+
+  // "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",
@@ -1162,9 +1751,7 @@
   "collection.delete.notification.success": "Colección eliminada correctamente",
 
   // "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.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",
@@ -1175,8 +1762,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",
 
@@ -1208,19 +1793,19 @@
   "collection.edit.item-mapper.notifications.map.error.head": "Errores de mapeo",
 
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-  "collection.edit.item-mapper.notifications.map.success.content": "{{ amount }}  ítems mapeados correctamente.",
+  "collection.edit.item-mapper.notifications.map.success.content": "{{ amount }} ítems mapeados correctamente.",
 
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Mapeo completado",
 
   // "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": "Se produjeron errores al eliminar los mapeos  de {{ amount }} ítems.",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Se produjeron errores al eliminar los mapeos de {{ amount }} ítems.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Eliminar errores de mapeo",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Se eliminaron correctamente los mapeos  de {{ amount }} ítems.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Se eliminaron correctamente los mapeos de {{ amount }} ítems.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Finalizada la eliminación del mapeo",
@@ -1237,7 +1822,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",
 
@@ -1265,21 +1849,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",
@@ -1312,7 +1898,7 @@
   "collection.edit.tabs.source.external": "Esta colección recolecta su contenido de una fuente externa",
 
   // "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": "Debe proporcionar el set-ID  de la colección de destino.",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Debe proporcionar el set-ID de la colección de destino.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
   "collection.edit.tabs.source.form.harvestType": "Contenido que se está recolectando",
@@ -1344,8 +1930,8 @@
   // "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": "Tus cambios fueron descartados.  Para recuperarlos, pulse el botón 'Deshacer'",
 
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  "collection.edit.tabs.source.notifications.discarded.title": "Cambiado descartado",
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "Cambios descartados",
 
   // "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": "Tus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.",
@@ -1362,8 +1948,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",
 
@@ -1383,7 +1967,7 @@
   "collection.edit.template.error": "Se produjo un error al recuperar la plantilla del ítem.",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  "collection.edit.template.head": "Editar plantilla del ítem para la colección \"{{ collection }} \"",
+  "collection.edit.template.head": "Editar plantilla del ítem para la colección \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Plantilla de ítem",
@@ -1400,8 +1984,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",
 
@@ -1429,13 +2011,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",
 
@@ -1463,104 +2041,98 @@
   // "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.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",
 
   // "communityList.tabTitle": "Community List",
   "communityList.tabTitle": "Lista de comunidades",
 
-  // "communityList.title": "List of communities",
+  // "communityList.title": "List of Communities",
   "communityList.title": "Lista de Comunidades",
 
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Mostrar más",
 
-
-
   // "community.create.head": "Create a Community",
   "community.create.head": "Crear una comunidad",
 
   // "community.create.notifications.success": "Successfully created the Community",
-  "community.create.notifications.success": "Creada con éxito la comunidad",
+  "community.create.notifications.success": "Comunidad creada con éxito",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Crear una subcomunidad para la comunidad {{ parent }}",
@@ -1587,7 +2159,7 @@
   "community.delete.notification.success": "Comunidad eliminada con éxito",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
-  "community.delete.text": "¿Está seguro de que desea eliminar la comunidad \"{{ dso }} \"?",
+  "community.delete.text": "¿Está seguro de que desea eliminar la comunidad \"{{ dso }}\"?",
 
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Eliminar esta comunidad",
@@ -1598,7 +2170,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",
 
@@ -1626,8 +2197,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",
 
@@ -1640,13 +2209,17 @@
   // "community.edit.return": "Back",
   "community.edit.return": "Atrás",
 
-
-
   // "community.edit.tabs.curate.head": "Curate",
-  "community.edit.tabs.curate.head": "Cura",
+  "community.edit.tabs.curate.head": "Curar",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Edición de la comunidad - 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",
@@ -1666,13 +2239,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",
 
@@ -1691,69 +2260,65 @@
   // "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 artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).",
+  "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 artículos a la colección, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones a esta colección (sujeto a autorización para esa colección).",
-
+  "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 E-People y Grupos que tienen permiso para enviar nuevos artículos a esta colección.",
-
+  "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 de artículo predeterminado",
+  "comcol-role.edit.item_read.name": "Acceso de lectura predeterminado del ítem",
 
   // "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": "E-People y Grupos que pueden leer nuevos artículos enviados a esta colección. Los cambios en este rol no son retroactivos. Los artículos existentes en el sistema aún serán visibles para aquellos que tenían acceso de lectura en el momento de su adición.",
+  "comcol-role.edit.item_read.description": "Usuarios y Grupos que pueden leer nuevos ítems enviados a esta colección. Los cambios en este rol no son retroactivos. Los ítems existentes en el sistema aún serán visibles para aquellos que tenían acceso de lectura en el momento de su adición.",
 
   // "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 artículos entrantes está configurada actualmente como Anónimo.",
-
+  "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 de archivo predeterminado",
+  "comcol-role.edit.bitstream_read.name": "Acceso de lectura predeterminado de archivos",
 
   // "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": "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 artículos a las subcolecciones, editar los metadatos del artículo (después del envío) y agregar (mapear) artículos existentes de otras colecciones (sujeto a autorización).",
+  "comcol-role.edit.bitstream_read.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.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",
 
+  // "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": "Los revisores pueden dar una puntuación a un envío entrante, esto definirá si el envío será rechazado o no.",
 
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Breve descripción",
@@ -1788,14 +2353,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",
 
@@ -1817,6 +2380,12 @@
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(siempre requerido)",
 
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Use este campo para habilitar o deshabilitar todos los servicios.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "cookies.consent.app.disable-all.title": "Habilita o deshabilita todos los servicios",
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Hubo cambios desde su última visita, actualice su consentimiento.",
 
@@ -1824,10 +2393,22 @@
   "cookies.consent.close": "Cerrar",
 
   // "cookies.consent.decline": "Decline",
-  "cookies.consent.decline": "Disminución",
+  "cookies.consent.decline": "Rechazar",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Aceptar",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Guardar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Cookie Consent",
 
   // "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": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong> Autenticación, Preferencias, Reconocimiento y Estadísticas </strong>. <br/> Para obtener más información, lea nuestra {privacyPolicy}.",
+  "cookies.consent.content-notice.description": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong>Autenticación, Preferencias, Reconocimiento y Estadísticas</strong>. <br/> Para obtener más información, lea nuestra {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": "Recopilamos y procesamos su información personal para los siguientes propósitos: <strong>Autenticación, Preferencias, Reconocimiento y Estadísticas</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Personalizar",
@@ -1839,12 +2420,16 @@
   "cookies.consent.content-modal.privacy-policy.name": "política de privacidad",
 
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
-  "cookies.consent.content-modal.privacy-policy.text": "Para mas información, lea por favor nuestra{privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Para más información, lea por favor nuestra {privacyPolicy}.",
 
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Información que recopilamos",
 
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "servicios",
 
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servicio",
 
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticación",
@@ -1852,30 +2437,29 @@
   // "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",
@@ -1883,15 +2467,23 @@
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Estadístico",
 
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registro y recuperación de contraseña",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Compartición",
+
+  // "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": "Comprobar enlaces en metadatos",
 
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  "curation-task.task.profileformats.label": "Formatos de perfil de archivo de perfil",
+  "curation-task.task.profileformats.label": "Perfil de formatos de archivo",
 
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "Comprobar los metadatos requeridos",
@@ -1902,13 +2494,14 @@
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Búsqueda de virus",
 
-
+  // "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:",
 
   // "curation.form.submit": "Start",
-  "curation.form.submit": "Comienzo",
+  "curation.form.submit": "Iniciar",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
   "curation.form.submit.success.head": "La tarea de curación se ha iniciado con éxito.",
@@ -1929,11 +2522,10 @@
   "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": "Sugerencia: Introduzca [su-prefijo-handle] / 0 para ejecutar una tarea en toda su instalación (no todas las tareas permiten esta opción)",
-
+  "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 }},\nrespondiendo a su solicitud, lamento informarle que noe s posible 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 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",
@@ -1945,16 +2537,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",
@@ -1965,6 +2557,9 @@
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nueva comunidad",
 
+  // "dso-selector.create.community.or-divider": "or",
+  "dso-selector.create.community.or-divider": "o",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Crea una nueva comunidad en",
 
@@ -1995,6 +2590,12 @@
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Exportar metadatos desde",
 
+  // "dso-selector.export-batch.dspaceobject.head": "Export Batch (ZIP) from",
+  "dso-selector.export-batch.dspaceobject.head": "Exportar archivo por lotes (ZIP) desde",
+
+  // "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+  "dso-selector.import-batch.dspaceobject.head": "Importar archivo por lotes desde",
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "No se encontró {{ type }}",
 
@@ -2008,16 +2609,19 @@
   "dso-selector.set-scope.community.head": "Seleccione un ámbito de búsqueda",
 
   // "dso-selector.set-scope.community.button": "Search all of DSpace",
-  "dso-selector.set-scope.community.button": "Buscar en todo  DSpace",
+  "dso-selector.set-scope.community.button": "Buscar en todo DSpace",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "dso-selector.set-scope.community.or-divider": "o",
 
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
   "dso-selector.set-scope.community.input-header": "Busque una comunidad o colección",
 
   // "dso-selector.claim.item.head": "Profile tips",
-  "dso-selector.claim.item.head": "Consejos de perfil",
+  "dso-selector.claim.item.head": "Sugerencias de perfil",
 
   // "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": "Hay perfiles que podrían estar relacionados con usted. SI se ve reflejado en uno de ellos, selecciónelo y en la página de detalles, elija la opción de reclamarlo. Opcionalmente puede crear un nuevo perfil desde cero usando el botón inferior.",
+  "dso-selector.claim.item.body": "Hay perfiles que podrían estar relacionados con usted. Si se ve reflejado en uno de ellos, selecciónelo y en la página de detalles, elija la opción de reclamarlo. Opcionalmente puede crear un nuevo perfil desde cero usando el botón inferior.",
 
   // "dso-selector.claim.item.not-mine-label": "None of these are mine",
   "dso-selector.claim.item.not-mine-label": "Ninguno de esos es mio",
@@ -2025,6 +2629,48 @@
   // "dso-selector.claim.item.create-from-scratch": "Create a new one",
   "dso-selector.claim.item.create-from-scratch": "Crear uno nuevo",
 
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again ↻",
+  "dso-selector.results-could-not-be-retrieved": "Algo salió mal, por favor actualice de nuevo ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Selector de grupo de supervisión",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Seleccione un tipo de Orden",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "NINGUNO",
+
+  // "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": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleccione un grupo",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Cancelar",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Guardar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Por favor seleccione un tipo de orden",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Por favor seleccione un grupo",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Orden de supervisión creada exitosamente para el grupo {{ name }}",
+
+  // "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": "Ya existe una orden de supervisión para este ítem en el grupo selecionado",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportar metadatos para {{ dsoName }}",
 
@@ -2037,11 +2683,23 @@
   // "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": "Exportar archivo por lotes (ZIP) para {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.info": "Are you sure you want to export batch (ZIP) for {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "¿Está seguro de que desea exportar un archivo por lotes (ZIP) para {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Cancelar",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportar",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.header": "Borrar usuario \"{{ dsoName }} \"",
+  "confirmation-modal.delete-eperson.header": "Borrar usuario \"{{ dsoName }}\"",
 
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
-  "confirmation-modal.delete-eperson.info": "¿Está seguro de que desea eliminar al usuario \"{{ dsoName }} \"?",
+  "confirmation-modal.delete-eperson.info": "¿Está seguro de que desea eliminar al usuario \"{{ dsoName }}\"?",
 
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Cancelar",
@@ -2061,6 +2719,17 @@
   // "confirmation-modal.delete-profile.confirm": "Delete",
   "confirmation-modal.delete-profile.confirm": "Borrar",
 
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Borrar suscripción",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Esta usted seguro que desea borrar la suscripción a \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Cancelar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Borrar",
 
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Error al obtener el archivo",
@@ -2099,7 +2768,7 @@
   "error.search-results": "Error al recuperar los resultados de búsqueda",
 
   // "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": "La búsqueda no es válida. Revise en <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">la sintaxis de búsquedas Solr</a> para mas información sobre este error.",
+  "error.invalid-search-query": "La búsqueda no es válida. Revise en <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">la sintaxis de búsquedas Solr</a> para más información sobre este error.",
 
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Error al recuperar subcolecciones",
@@ -2108,16 +2777,16 @@
   "error.sub-communities": "Error al recuperar subcomunidades",
 
   // "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": "Se produjo un error durante la inicialización de la sección, verifique la configuración de su formulario de entrada. Se dan detalles a continuación:",
+  "error.submission.sections.init-form-error": "Se produjo un error durante la inicialización de la sección, verifique la configuración de su formulario de entrada. Se dan detalles a continuación: <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Error al recuperar las comunidades de nivel superior",
+  "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 actual: {{ pattern }}.",
+  "error.validation.pattern": "Esta entrada está restringida por este patrón: {{ pattern }}.",
 
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "La carga de un archivo es obligatoria",
@@ -2126,7 +2795,7 @@
   "error.validation.required": "Se requiere este campo",
 
   // "error.validation.NotValidEmail": "This E-mail is not a valid email",
-  "error.validation.NotValidEmail": "Este no es correo electrónico válido",
+  "error.validation.NotValidEmail": "Este no es un correo electrónico válido",
 
   // "error.validation.emailTaken": "This E-mail is already taken",
   "error.validation.emailTaken": "Este correo electrónico ya está en uso",
@@ -2134,18 +2803,35 @@
   // "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 }}",
+  "footer.copyright": "copyright © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "Software DSpace",
@@ -2159,13 +2845,11 @@
   // "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":"Enviar Sugerencias",
-
-
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Enviar Sugerencias",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Olvido de contraseña",
@@ -2179,8 +2863,8 @@
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Por favor introduzca una dirección de correo electrónico",
 
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Por favor introduzca una dirección de correo electrónico válida",
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Por favor introduzca una dirección de correo electrónico valida",
 
   // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
   "forgot-email.form.email.hint": "Se le enviará un mensaje a esa dirección con las instrucciones pertinentes.",
@@ -2200,25 +2884,23 @@
   // "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",
 
   // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "Olvido de contraseña",
 
-  // "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": "Introduzca una nueva contraseña en el cuadro a continuación y confírmela reescribiéndola en el segundo cuadro. Debe tener al menos seis caracteres.",
+  // "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": "Introduzca una nueva contraseña en el cuadro a continuación y confírmela reescribiéndola en el segundo cuadro.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Seguridad",
 
   // "forgot-password.form.identification.header": "Identify",
-  "forgot-password.form.identification.header": "Identificar",
+  "forgot-password.form.identification.header": "Identidad",
 
   // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "Dirección de correo electrónico:",
+  "forgot-password.form.identification.email": "Dirección de correo electrónico: ",
 
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Contraseña",
@@ -2232,9 +2914,6 @@
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Las contraseñas no coinciden.",
 
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.",
-
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Error al intentar enviar una nueva contraseña",
 
@@ -2247,8 +2926,6 @@
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Enviar contraseña",
 
-
-
   // "form.add": "Add more",
   "form.add": "Añadir más",
 
@@ -2292,7 +2969,7 @@
   "form.group-expand-help": "Haga clic aquí para expandir y agregar más elementos",
 
   // "form.last-name": "Last name",
-  "form.last-name": "Apellido",
+  "form.last-name": "Apellidos",
 
   // "form.loading": "Loading...",
   "form.loading": "Cargando...",
@@ -2309,8 +2986,23 @@
   // "form.no-value": "No value entered",
   "form.no-value": "No se introdujo ningún valor",
 
-  // "form.other-information": {},
-  "form.other-information": {},
+  // "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",
@@ -2330,24 +3022,26 @@
   // "form.submit": "Save",
   "form.submit": "Guardar",
 
+  // "form.create": "Create",
+  "form.create": "Crear",
+
   // "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",
 
   // "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": "Puede aprovechar la ocasión para reconsiderar las restricciones de acceso al documento (para evitar tener que responder a estas solicitudes).  Para consultar con los administadores del repositorio para retirar estas resticciones, marque por favor la casilla inferior.",
+  "grant-deny-request-copy.email.permissions.info": "Puede aprovechar la ocasión para reconsiderar las restricciones de acceso al documento (para evitar tener que responder a estas solicitudes). Si desea solicitar a los administadores del repositorio que retiren estas resticciones, marque por favor la casilla inferior.",
 
   // "grant-deny-request-copy.email.permissions.label": "Change to open access",
   "grant-deny-request-copy.email.permissions.label": "Cambio a Acceso Abierto",
@@ -2365,7 +3059,7 @@
   "grant-deny-request-copy.grant": "Enviar copia",
 
   // "grant-deny-request-copy.header": "Document copy request",
-  "grant-deny-request-copy.header": "Solciitud de copia de documento",
+  "grant-deny-request-copy.header": "Solicitud de copia de documento",
 
   // "grant-deny-request-copy.home-page": "Take me to the home page",
   "grant-deny-request-copy.home-page": "Llévame a la página de inicio",
@@ -2373,18 +3067,11 @@
   // "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": "Si usted es uno de los autores del documento <a href='{{ url }}'>{{ name }}</a>, use los botones inferiores para responder la solicitud del usuario",
 
-
   // "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": "Tras elegir una opción, le sugeriremos un texto de correo electrónico que usted puede editar.",
 
-
   // "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 fue ya 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-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.subject": "Request copy of document",
   "grant-request-copy.email.subject": "Solicitar copia de documento",
@@ -2393,26 +3080,25 @@
   "grant-request-copy.error": "Ocurrió un error",
 
   // "grant-request-copy.header": "Grant document copy request",
-  "grant-request-copy.header": "Permitir solicitud de copia de documento",
+  "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" : "Chequeos",
+  // "health-page.heading": "Health",
+  "health-page.heading": "Chequeos",
 
-  // "health-page.info-tab" : "Info",
-  "health-page.info-tab" : "Información",
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Información",
 
-  // "health-page.status-tab" : "Status",
-  "health-page.status-tab" : "Estado",
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Estado",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "El servicio de comprobación no se encuentra temporalmente disponible",
@@ -2426,16 +3112,16 @@
   // "health-page.section.geoIp.title": "GeoIp",
   "health-page.section.geoIp.title": "GeoIp",
 
-  // "health-page.section.solrAuthorityCore.title": "Sor: authority core",
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
   "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
-  // "health-page.section.solrOaiCore.title": "Sor: oai core",
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
   "health-page.section.solrOaiCore.title": "Solr: oai core",
 
-  // "health-page.section.solrSearchCore.title": "Sor: search core",
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
   "health-page.section.solrSearchCore.title": "Solr: search core",
 
-  // "health-page.section.solrStatisticsCore.title": "Sor: statistics 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",
@@ -2454,7 +3140,7 @@
   "health-page.status.error.info": "Problemas detectados",
 
   // "health-page.status.warning.info": "Possible issues detected",
-   "health-page.status.warning.info": "Detectados problemas potenciales",
+  "health-page.status.warning.info": "Detectados problemas potenciales",
 
   // "health-page.title": "Health",
   "health-page.title": "Chequeos",
@@ -2462,7 +3148,6 @@
   // "health-page.section.no-issues": "No issues detected",
   "health-page.section.no-issues": "No se detectaron problemas",
 
-
   // "home.description": "",
   "home.description": "",
 
@@ -2481,8 +3166,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.",
 
@@ -2507,6 +3190,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",
 
@@ -2540,38 +3226,32 @@
   // "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" : "Envío exitoso de sugerencia",
+  // "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" : "se requiere una dirección válida de correo electrónico",
+  // "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" : "Se requiere un comentario",
-
-  // "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" : "La página relacionada con su sugerencia",
+  // "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": "Página",
 
+  // "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 artículo es privado",
+  "item.alerts.private": "Este ítem es privado",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
-  "item.alerts.withdrawn": "Este artículo ha sido retirado",
-
-
+  "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 artículo, además de modificar las políticas de los componentes individuales del artículo: paquetes y archivos. Brevemente, un artículo 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.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 artículo",
-
-
+  "item.edit.authorizations.title": "Editar las políticas del ítem",
 
   // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privado",
@@ -2579,8 +3259,6 @@
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Retirado",
 
-
-
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Bloque",
 
@@ -2590,8 +3268,8 @@
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Crear bloque",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
-  "item.bitstreams.upload.bundles.empty": "Este artículo no contiene ningún bloque para cargar un archivo.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
+  "item.bitstreams.upload.bundles.empty": "Este ítem no contiene ningún bloque para cargar un archivo.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "Cancelar",
@@ -2600,7 +3278,7 @@
   "item.bitstreams.upload.drop-message": "Suelta un archivo para subir",
 
   // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item": "Artículo:",
+  "item.bitstreams.upload.item": "Ítem: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Nuevo bloque creado con éxito.",
@@ -2614,8 +3292,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",
 
@@ -2632,7 +3308,7 @@
   "item.edit.bitstreams.bundle.name": "BLOQUE: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-  "item.edit.bitstreams.discard-button": "Descarte",
+  "item.edit.bitstreams.discard-button": "Descartar",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "Descargar",
@@ -2650,13 +3326,13 @@
   "item.edit.bitstreams.edit.buttons.undo": "Deshacer cambios",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
-  "item.edit.bitstreams.empty": "Este artículo no contiene ningún archivo. Haga clic en el botón de carga para crear uno.",
+  "item.edit.bitstreams.empty": "Este ítem no contiene ningún archivo. Haga clic en el botón de carga para crear uno.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  "item.edit.bitstreams.headers.actions": "Comportamiento",
+  "item.edit.bitstreams.headers.actions": "Acciones",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
-  "item.edit.bitstreams.headers.bundle": "Manojo",
+  "item.edit.bitstreams.headers.bundle": "Bloque",
 
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "Descripción",
@@ -2668,7 +3344,7 @@
   "item.edit.bitstreams.headers.name": "Nombre",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.bitstreams.notifications.discarded.content": "Tus cambios fueron descartados. ",
+  "item.edit.bitstreams.notifications.discarded.content": "Tus cambios fueron descartados. Para restaurar tus cambios haga clic en el botón 'Deshacer'",
 
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "Cambios descartados",
@@ -2677,13 +3353,13 @@
   "item.edit.bitstreams.notifications.move.failed.title": "Error al mover archivos",
 
   // "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": "Se han guardado los cambios de movimiento en los archivos y paquetes de este artículo.",
+  "item.edit.bitstreams.notifications.move.saved.content": "Se han guardado los cambios de movimientos en los archivos y paquetes de este ítem.",
 
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  "item.edit.bitstreams.notifications.move.saved.title": "Mover cambios guardados",
+  "item.edit.bitstreams.notifications.move.saved.title": "Cambios de movimientos guardados",
 
   // "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": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
+  "item.edit.bitstreams.notifications.outdated.content": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Tus cambios han sido descartados para evitar conflictos",
 
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Cambios desactualizados",
@@ -2692,7 +3368,7 @@
   "item.edit.bitstreams.notifications.remove.failed.title": "Error al eliminar archivo",
 
   // "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": "Se han guardado los cambios de eliminación de los archivos de este artículo.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Se han guardado los cambios de eliminación de los archivos de este ítem.",
 
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "Se guardaron los cambios de eliminación",
@@ -2706,8 +3382,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Subir",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancelar",
 
@@ -2715,74 +3389,136 @@
   "item.edit.delete.confirm": "Borrar",
 
   // "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": "¿Estás seguro de que este artículo debería eliminarse por completo? Precaución: en la actualidad, no se dejaría ninguna lápida.",
+  "item.edit.delete.description": "¿Estás seguro de que este ítem debería eliminarse por completo? Precaución: en la actualidad, no se dejaría ningun rastro.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
-  "item.edit.delete.error": "Se produjo un error al eliminar el artículo.",
+  "item.edit.delete.error": "Se produjo un error al eliminar el ítem.",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-  "item.edit.delete.header": "Eliminar artículo: {{ id }}",
+  "item.edit.delete.header": "Eliminar ítem: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
-  "item.edit.delete.success": "El artículo ha sido eliminado",
+  "item.edit.delete.success": "El ítem ha sido eliminado",
 
   // "item.edit.head": "Edit Item",
-  "item.edit.head": "Editar artículo",
+  "item.edit.head": "Editar ítem",
 
   // "item.edit.breadcrumbs": "Edit Item",
-  "item.edit.breadcrumbs": "Editar artículo",
+  "item.edit.breadcrumbs": "Editar ítem",
 
   // "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",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-  "item.edit.tabs.item-mapper.title": "Edición de artículos - Mapeador de colecciones",
+  "item.edit.tabs.item-mapper.title": "Edición de ítem - Mapeador de colecciones",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconocido",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "En cola para registro",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "En cola para reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrado",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservado",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservado (actualización en cola)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registrado (actualización en cola)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "En cola para actualización y registro",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "En cola para eliminación",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Borrado",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Pendiente (no registrado)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Asignado (no registrado)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registrar un nuevo DOI o uno pendiente",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registrar DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registrar un nuevo DOI o uno pendiente",
+
+  // "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": "Revise los identificadores pendientes y los metadatos a continuación y pulse Confirmar para proceder con el registro DOI, o pulse Cancelar para devolverse",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Cancelar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "Registro exitoso del DOI en cola.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Error registrando el 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": "El siguiente DOI ya ha sido asignado y estará en cola para el registro en línea",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-  "item.edit.item-mapper.buttons.add": "Asignar artículo a colecciones seleccionadas",
+  "item.edit.item-mapper.buttons.add": "Asignar ítem a colecciones seleccionadas",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  "item.edit.item-mapper.buttons.remove": "Eliminar la asignación de artículos para las colecciones seleccionadas",
+  "item.edit.item-mapper.buttons.remove": "Eliminar la asignación de ítem para las colecciones seleccionadas",
 
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Cancelar",
 
   // "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": "Esta es la herramienta de asignación de artículos que permite a los administradores asignar este artículo a otras colecciones. Puede buscar colecciones y mapearlas, o explorar la lista de colecciones a las que el artículo está mapeado actualmente.",
+  "item.edit.item-mapper.description": "Esta es la herramienta de asignación de ítems que permite a los administradores asignar este ítem a otras colecciones. Puede buscar colecciones y mapearlas, o explorar la lista de colecciones a las que el ítem está mapeado actualmente.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  "item.edit.item-mapper.head": "Asignador de artículos: asigna artículos a colecciones",
+  "item.edit.item-mapper.head": "Asignador de ítems: asigna ítems a colecciones",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  "item.edit.item-mapper.item": "Artículo: \"<b>{{ name }}</b>\"",
+  "item.edit.item-mapper.item": "Ítem: \"<b>{{ name }}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Introduzca una consulta para buscar",
 
   // "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": "Se produjeron errores al mapear el artículo a {{ amount }} colecciones.",
+  "item.edit.item-mapper.notifications.add.error.content": "Se produjeron errores al mapear el ítem a {{ amount }} colecciones.",
 
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Errores de mapeo",
 
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.add.success.content": "Se asignó correctamente el artículo a {{ amount }} colecciones.",
+  "item.edit.item-mapper.notifications.add.success.content": "Se asignó correctamente el ítem a {{ amount }} colecciones.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Mapeo completado",
 
   // "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": "Se produjeron errores para la eliminación de la asignación a {{ amount }} colecciones.",
+  "item.edit.item-mapper.notifications.remove.error.content": "Se produjeron errores en la eliminación de la asignación a {{ amount }} colecciones.",
 
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "Eliminación de errores de mapeo",
 
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
-  "item.edit.item-mapper.notifications.remove.success.content": "Se eliminó correctamente la asignación del artículo a {{ amount }} colecciones.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Se eliminó correctamente la asignación del ítem a {{ amount }} colecciones.",
 
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Eliminación del mapeo completada",
@@ -2796,13 +3532,17 @@
   // "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",
 
   // "item.edit.metadata.discard-button": "Discard",
-  "item.edit.metadata.discard-button": "Descarte",
+  "item.edit.metadata.discard-button": "Descartar",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Arrastre para reordenar",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
@@ -2816,8 +3556,11 @@
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Dejar de editar",
 
+  // "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": "Este es un valor de metadato virtual, es decir, un valor heredado de una entidad relacionada. Este no pude ser modificado directamente. Agregue o remueva la relación correspondiente en la pestaña \"Relaciones\"",
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
-  "item.edit.metadata.empty": "Actualmente, el artículo no contiene metadatos. Haga clic en Agregar para comenzar a agregar un valor de metadatos.",
+  "item.edit.metadata.empty": "Actualmente, el ítem no contiene metadatos. Haga clic en Agregar para comenzar a agregar un valor de metadatos.",
 
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Editar",
@@ -2831,14 +3574,17 @@
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
 
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "item.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
-  "item.edit.metadata.metadatafield.invalid": "Elija un campo de metadatos válido",
+  "item.edit.metadata.metadatafield.invalid": "Por favor, escoja un campo de metadatos valido",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Tus cambios fueron descartados. ",
 
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  "item.edit.metadata.notifications.discarded.title": "Cambiado descartado",
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title": "Cambios descartados",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Ocurrió un error",
@@ -2850,13 +3596,13 @@
   "item.edit.metadata.notifications.invalid.title": "Metadatos inválidos",
 
   // "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": "Otro usuario ha cambiado el artículo en el que está trabajando actualmente. ",
+  "item.edit.metadata.notifications.outdated.content": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Tus cambios han sido descartados para evitar conflictos",
 
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  "item.edit.metadata.notifications.outdated.title": "Cambiado desactualizado",
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "Cambios desactualizados",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  "item.edit.metadata.notifications.saved.content": "Se guardaron sus cambios en los metadatos de este artículo.",
+  "item.edit.metadata.notifications.saved.content": "Se guardaron sus cambios en los metadatos de este ítem.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadatos guardados",
@@ -2864,11 +3610,12 @@
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Deshacer",
 
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Deshacer reordenar",
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Guardar",
 
-
-
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
 
@@ -2878,8 +3625,6 @@
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
 
-
-
   // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Atrás",
 
@@ -2887,16 +3632,16 @@
   "item.edit.move.save-button": "Guardar",
 
   // "item.edit.move.discard-button": "Discard",
-  "item.edit.move.discard-button": "Descarte",
+  "item.edit.move.discard-button": "Descartar",
 
   // "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": "Seleccione la colección a la que desea mover este artículo. Para reducir la lista de colecciones mostradas, puede introducir una consulta de búsqueda en el cuadro.",
+  "item.edit.move.description": "Seleccione la colección a la que desea mover este ítem. Para reducir la lista de colecciones mostradas, puede introducir una búsqueda en el cuadro.",
 
   // "item.edit.move.error": "An error occurred when attempting to move the item",
-  "item.edit.move.error": "Se produjo un error al intentar mover el artículo.",
+  "item.edit.move.error": "Se produjo un error al intentar mover el ítem.",
 
   // "item.edit.move.head": "Move item: {{id}}",
-  "item.edit.move.head": "Mover artículo: {{ id }}",
+  "item.edit.move.head": "Mover ítem: {{ id }}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Heredar políticas",
@@ -2905,10 +3650,10 @@
   "item.edit.move.inheritpolicies.description": "Heredar las políticas predeterminadas de la colección de destino",
 
   // "item.edit.move.move": "Move",
-  "item.edit.move.move": "Moverse",
+  "item.edit.move.move": "Mover",
 
   // "item.edit.move.processing": "Moving...",
-  "item.edit.move.processing": "Moviente...",
+  "item.edit.move.processing": "Moviendo...",
 
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Introduzca una consulta de búsqueda para buscar colecciones",
@@ -2919,8 +3664,6 @@
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Mover ítem",
 
-
-
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Cancelar",
 
@@ -2934,13 +3677,11 @@
   "item.edit.private.error": "Se produjo un error al convertir el ítem en privado.",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
-  "item.edit.private.header": "Convertir el ítem en privado {{ id }}",
+  "item.edit.private.header": "Convertir el ítem en privado: {{ id }}",
 
   // "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",
 
@@ -2954,13 +3695,11 @@
   "item.edit.public.error": "Se produjo un error al convertir el ítem en público.",
 
   // "item.edit.public.header": "Make item discoverable: {{ id }}",
-  "item.edit.public.header": "Convertir el ítem en público{{ id }}",
+  "item.edit.public.header": "Convertir el ítem en público: {{ id }}",
 
   // "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",
 
@@ -2979,8 +3718,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",
 
@@ -2997,7 +3734,7 @@
   "item.edit.relationships.no-relationships": "Sin relaciones",
 
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Sus cambios fueron descartados. Para recuperar sus cambios pulse el botón 'Deshacer' ",
+  "item.edit.relationships.notifications.discarded.content": "Sus cambios fueron descartados. Para recuperar sus cambios pulse el botón 'Deshacer'",
 
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Cambios descartados",
@@ -3006,7 +3743,7 @@
   "item.edit.relationships.notifications.failed.title": "Error al editar las relaciones",
 
   // "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": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Sus cambios se descartarán para prevenir conflictos ",
+  "item.edit.relationships.notifications.outdated.content": "Otro usuario ha cambiado el ítem en el que está trabajando actualmente. Sus cambios se descartarán para prevenir conflictos",
 
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Cambios desactualizados",
@@ -3024,13 +3761,11 @@
   "item.edit.relationships.save-button": "Guardar",
 
   // "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 artículo",
-
+  "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",
 
@@ -3043,6 +3778,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",
 
@@ -3073,8 +3817,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Administrar colecciones mapeadas",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Mover...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "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",
@@ -3100,14 +3844,14 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "No estás autorizado para realizar esta acción.",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "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",
 
   // "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": "Bienvenido a la página de administración de artículos. Desde aquí puede retirar, restablecer, mover o eliminar el ítem. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.",
+  "item.edit.tabs.status.description": "Bienvenido a la página de administración de ítems. Desde aquí puede retirar, restablecer, mover o eliminar el ítem. También puede actualizar o agregar nuevos metadatos / archivos en las otras pestañas.",
 
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Estado",
@@ -3142,8 +3886,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",
 
@@ -3165,7 +3907,6 @@
   // "item.orcid.return": "Back",
   "item.orcid.return": "Atrás",
 
-
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Ítem",
 
@@ -3182,7 +3923,7 @@
   "item.page.publisher": "Editor",
 
   // "item.page.titleprefix": "Item: ",
-  "item.page.titleprefix": "Ítem:",
+  "item.page.titleprefix": "Ítem: ",
 
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Título del volumen",
@@ -3194,12 +3935,34 @@
   "item.search.title": "Búsqueda de ítems",
 
   // "item.truncatable-part.show-more": "Show more",
-  "item.truncatable-part.show-more": "Mas..",
+  "item.truncatable-part.show-more": "Más...",
 
   // "item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Contraer",
 
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Borrar Orden de Supervisión",
 
+  // "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": "Esta seguro de querer borrar la Orden de Supervisión",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancelar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Borrar",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "La orden de supervisión \"{{ name }}\" ha sido borrada exitosamente",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Error al borrar la orden de supervisión \"{{ name }}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisado por:",
+
+  // "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",
@@ -3243,6 +4006,18 @@
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Tamaño:",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Informes",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Colecciones filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consulta de metadatos",
+
+  // "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search": "Búsqueda de administrador",
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Ítems de esta revista",
 
@@ -3291,10 +4066,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",
@@ -3339,26 +4114,29 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipo:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
-  "item.preview.oaire.citation.issue" : "Número",
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Número",
 
-  // "item.preview.oaire.citation.volume" : "Volume",
-  "item.preview.oaire.citation.volume" : "Volumen",
+  // "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.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.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 o 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.identifier.doi": "DOI",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editor:",
 
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Apellido:",
@@ -3387,13 +4165,11 @@
   // "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",
 
   // "item.select.empty": "No items to show",
-  "item.select.empty": "No hay artículos para mostrar",
+  "item.select.empty": "No hay ítems para mostrar",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
@@ -3404,9 +4180,8 @@
   // "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 artículo.",
+  "item.version.history.empty": "Aún no hay otras versiones para este ítem.",
 
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Historial de versiones",
@@ -3424,7 +4199,7 @@
   "item.version.history.table.version": "Versión",
 
   // "item.version.history.table.item": "Item",
-  "item.version.history.table.item": "Artículo",
+  "item.version.history.table.item": "Ítem",
 
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "Editor",
@@ -3465,10 +4240,8 @@
   // "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": "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 artículo. La última versión se puede encontrar <a href='{{ destination }}'> aquí </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",
@@ -3483,7 +4256,7 @@
   "item.version.create.modal.button.confirm": "Crear",
 
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
-  "item.version.create.modal.button.confirm.tooltip": "Crear  nueva versión",
+  "item.version.create.modal.button.confirm.tooltip": "Crear nueva versión",
 
   // "item.version.create.modal.button.cancel": "Cancel",
   "item.version.create.modal.button.cancel": "Cancelar",
@@ -3501,23 +4274,22 @@
   "item.version.create.modal.submitted.header": "Creando nueva versión...",
 
   // "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.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" : "Se ha creado una nueva versión con número {{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" : "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" : "No es posible crear una nueva versión puesto que existe en el historial de versiones un envío pendiente",
+  // "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": "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": "Quierr 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",
@@ -3531,19 +4303,98 @@
   // "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" : "Se ha borrado la versión número{{version}}",
+  // "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" : "No 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": "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": "No 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" : "No ha cambiado el resumen de la versión número {{version}}",
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Agregar",
 
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Descartar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arrastre para reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Eliminar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Deshacer cambios",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Dejar de editar",
+
+  // "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": "La plantilla de ítem no contiene ningún metadato. Pulse Agregar para empezar a agregar valores de metadatos.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Campo",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "Un error ha ocurrido al validar el campo del metadato",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Por favor, escoja un campo de metadato valido",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Sus cambios fueron descartados. Para recuperar sus cambios pulse el botón 'Deshacer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Cambios descartados",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Ocurrió un error",
+
+  // "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": "Sus cambios no se guardaron. Asegúrese de que todos los campos sean válidos antes de guardar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadatos 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",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "La plantilla de ítem en la que usted esta trabajando actualmente ha sido cambiada por otro usuario. Sus cambios han sido descartados para evitar conflictos",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Cambios obsoletos",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Sus cambios a los metadatos de esta plantilla de ítem han sido guardados.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadatos guardados",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Deshacer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Deshacer reordenar",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Guardar",
 
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
@@ -3564,7 +4415,7 @@
   "journal.page.publisher": "Editor",
 
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Revista:",
+  "journal.page.titleprefix": "Revista: ",
 
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Resultados de la búsqueda de revistas",
@@ -3575,8 +4426,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",
 
@@ -3584,7 +4433,7 @@
   "journalissue.page.description": "Descripción",
 
   // "journalissue.page.edit": "Edit this item",
-  "journalissue.page.edit": "Editar este ítema",
+  "journalissue.page.edit": "Editar este ítem",
 
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Fecha de publicación",
@@ -3602,9 +4451,7 @@
   "journalissue.page.number": "Número",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Número de la revista:",
-
-
+  "journalissue.page.titleprefix": "Número de la revista: ",
 
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volumen de la revista",
@@ -3619,12 +4466,11 @@
   "journalvolume.page.issuedate": "Fecha de publicación",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volumen de la revista:",
+  "journalvolume.page.titleprefix": "Volumen de la revista: ",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volumen",
 
-
   // "iiifsearchable.listelement.badge": "Document Media",
   "iiifsearchable.listelement.badge": "Soporte (media) del documento",
 
@@ -3658,7 +4504,6 @@
   // "iiif.page.description": "Description: ",
   "iiif.page.description": "Descripción: ",
 
-
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Cargando archivo...",
 
@@ -3666,7 +4511,7 @@
   "loading.bitstreams": "Cargando archivos...",
 
   // "loading.browse-by": "Loading items...",
-  "loading.browse-by": "Cargando artículos...",
+  "loading.browse-by": "Cargando ítems...",
 
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Cargando página...",
@@ -3687,13 +4532,13 @@
   "loading.default": "Cargando...",
 
   // "loading.item": "Loading item...",
-  "loading.item": "Cargando artículo...",
+  "loading.item": "Cargando ítem...",
 
   // "loading.items": "Loading items...",
-  "loading.items": "Cargando artículos...",
+  "loading.items": "Cargando ítems...",
 
   // "loading.mydspace-results": "Loading items...",
-  "loading.mydspace-results": "Cargando artículos...",
+  "loading.mydspace-results": "Cargando ítems...",
 
   // "loading.objects": "Loading...",
   "loading.objects": "Cargando...",
@@ -3711,9 +4556,7 @@
   "loading.sub-communities": "Cargando subcomunidades...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
-  "loading.top-level-communities": "Cargando comunidades de nivel superior...",
-
-
+  "loading.top-level-communities": "Cargando comunidades de primer nivel...",
 
   // "login.form.email": "Email address",
   "login.form.email": "Correo electrónico",
@@ -3751,8 +4594,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Acceso",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Cerrar sesión en DSpace",
 
@@ -3762,8 +4603,6 @@
   // "logout.title": "Logout",
   "logout.title": "Cerrar sesión",
 
-
-
   // "menu.header.admin": "Management",
   "menu.header.admin": "Gestión",
 
@@ -3773,27 +4612,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": "Gente",
-
-
+  "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",
 
@@ -3801,7 +4637,7 @@
   "menu.section.browse_community_by_author": "Por autor",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  "menu.section.browse_community_by_issue_date": "Por fecha de emisión",
+  "menu.section.browse_community_by_issue_date": "Por fecha de publicación",
 
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Por titulo",
@@ -3813,26 +4649,25 @@
   "menu.section.browse_global_by_author": "Por autor",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  "menu.section.browse_global_by_dateissued": "Por fecha de emisión",
+  "menu.section.browse_global_by_dateissued": "Por fecha de publicación",
 
   // "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": "Tarea de conservación",
-
-
+  "menu.section.curation_task": "Tareas de curación",
 
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Editar",
@@ -3844,9 +4679,7 @@
   "menu.section.edit_community": "Comunidad",
 
   // "menu.section.edit_item": "Item",
-  "menu.section.edit_item": "Artículo",
-
-
+  "menu.section.edit_item": "Ítem",
 
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
@@ -3858,16 +4691,21 @@
   "menu.section.export_community": "Comunidad",
 
   // "menu.section.export_item": "Item",
-  "menu.section.export_item": "Artículo",
+  "menu.section.export_item": "Ítem",
 
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadatos",
 
-
+  // "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",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Sección del menú de búsqueda de administrador",
 
@@ -3878,28 +4716,28 @@
   "menu.section.icon.curation_tasks": "Sección del menú de Tareas de curación",
 
   // "menu.section.icon.edit": "Edit menu section",
-  "menu.section.icon.edit": "Editar sección del menú",
+  "menu.section.icon.edit": "Sección del menú de edición",
 
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Exportar sección de menú",
+  "menu.section.icon.export": "Sección de menú de exportación",
 
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Buscar sección de menú",
+  "menu.section.icon.find": "Sección de menú de búsqueda",
 
   // "menu.section.icon.health": "Health check menu section",
   "menu.section.icon.health": "Sección de menú de Chequeos",
 
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Importar sección de menú",
+  "menu.section.icon.import": "Sección de menú de importación",
 
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Nueva sección de menú",
+  "menu.section.icon.new": "Sección de menú de creación",
 
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Anclar barra lateral",
 
   // "menu.section.icon.processes": "Processes Health",
-  "menu.section.icon.processes": "Sección de menú de Procesosde chequeo",
+  "menu.section.icon.processes": "Sección de menú de Procesos de chequeo",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Sección de menu de Registros",
@@ -3913,8 +4751,6 @@
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Desanclar la barra lateral",
 
-
-
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
 
@@ -3924,8 +4760,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadatos",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Nuevo",
 
@@ -3936,32 +4770,26 @@
   "menu.section.new_community": "Comunidad",
 
   // "menu.section.new_item": "Item",
-  "menu.section.new_item": "Artículo",
+  "menu.section.new_item": "Ítem",
 
   // "menu.section.new_item_version": "Item Version",
-  "menu.section.new_item_version": "Versión del artículo",
+  "menu.section.new_item_version": "Versión del ítem",
 
   // "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",
 
@@ -3971,15 +4799,15 @@
   // "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.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar sección de control de acceso",
@@ -3988,7 +4816,7 @@
   "menu.section.toggle.control_panel": "Alternar la sección del Panel de control",
 
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Alternar la sección Tarea de curación",
+  "menu.section.toggle.curation_task": "Alternar la sección Tareas de curación",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Alternar sección de Edición",
@@ -4003,7 +4831,7 @@
   "menu.section.toggle.import": "Alternar sección de Importación",
 
   // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Alternar nueva sección",
+  "menu.section.toggle.new": "Alternar sección de Creación",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Alternar sección de Registros",
@@ -4011,30 +4839,24 @@
   // "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 exortación ha comenzado satisfactoriamente",
-  
+  "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",
 
   // "mydspace.description": "",
   "mydspace.description": "",
 
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "aquí",
-
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Seleccione esta opción para enviar un mensaje al remitente del ítem.",
 
@@ -4048,7 +4870,7 @@
   "mydspace.messages.mark-as-read": "Marcar como leído",
 
   // "mydspace.messages.mark-as-unread": "Mark as unread",
-  "mydspace.messages.mark-as-unread": "marcar como no leído",
+  "mydspace.messages.mark-as-unread": "Marcar como no leído",
 
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Sin contenido.",
@@ -4108,7 +4930,7 @@
   "mydspace.results.no-title": "Sin título",
 
   // "mydspace.results.no-uri": "No Uri",
-  "mydspace.results.no-uri": "Sin Uri",
+  "mydspace.results.no-uri": "Sin URI",
 
   // "mydspace.search-form.placeholder": "Search in mydspace...",
   "mydspace.search-form.placeholder": "Buscar en Mi DSpace...",
@@ -4119,20 +4941,23 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Sus envíos",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archivado",
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Ítems supervisados",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validación",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivado",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperando al controlador",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validación",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Flujo de trabajo",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Esperando al controlador",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espacio de trabajo",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Flujo de trabajo",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Espacio de trabajo",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mi DSpace",
@@ -4141,7 +4966,7 @@
   "mydspace.upload.upload-failed": "Error al crear un nuevo espacio de trabajo. Verifique el contenido cargado antes de volver a intentarlo.",
 
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-  "mydspace.upload.upload-failed-manyentries": "Archivo no procesable. Se detectaron demasiadas entradas, pero solo se permitió una para el archivo.",
+  "mydspace.upload.upload-failed-manyentries": "Archivo no procesable. Se detectaron demasiadas entradas, pero solo se permite una por archivo.",
 
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
   "mydspace.upload.upload-failed-moreonefile": "Solicitud no procesable. Solo se permite un archivo.",
@@ -4149,13 +4974,8 @@
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "Se crearon {{ qty }} nuevos ítems del espacio de trabajo.",
 
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  "mydspace.upload.upload-successful": "Se creó un nuevo ítems en el espacio de trabajo. Haga clic en {{ here }} para editarlo.",
-
   // "mydspace.view-btn": "View",
-  "mydspace.view-btn": "Vista",
-
-
+  "mydspace.view-btn": "Ver",
 
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Todo DSpace",
@@ -4163,14 +4983,20 @@
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Por comunidad",
 
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Alternar ayuda contextual",
+
   // "nav.language": "Language switch",
   "nav.language": "Cambio de idioma",
 
   // "nav.login": "Log In",
   "nav.login": "Iniciar sesión",
 
-  // "nav.logout": "User profile menu and Log Out",
-  "nav.logout": "Menú de perfil de usuario y cierre de sesión",
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menú de perfil de usuario y cierre de sesión",
+
+  // "nav.logout": "Log Out",
+  "nav.logout": "Cerrar sesión",
 
   // "nav.main.description": "Main navigation bar",
   "nav.main.description": "Barra de navegación principal",
@@ -4184,16 +5010,22 @@
   // "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 impersonar a EPerson",
+  "nav.stop-impersonating": "Dejar de impersonar al usuario",
 
-  // "nav.toggle" : "Toggle navigation",
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Suscripciones",
+
+  // "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",
@@ -4202,6 +5034,9 @@
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Unidad organizativa",
 
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Sin título",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Ciudad",
 
@@ -4221,8 +5056,7 @@
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Unidad organizativa:",
-
+  "orgunit.page.titleprefix": "Unidad organizativa: ",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Opciones de paginación",
@@ -4234,12 +5068,10 @@
   "pagination.showing.detail": "{{ range }} de {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-  "pagination.showing.label": "Mostrando",
+  "pagination.showing.label": "Mostrando ",
 
   // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Opciones de clasificación",
-
-
+  "pagination.sort-direction": "Opciones de ordenación",
 
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persona",
@@ -4251,19 +5083,19 @@
   "person.page.birthdate": "Fecha de nacimiento",
 
   // "person.page.edit": "Edit this item",
-  "person.page.edit": "Editar este artículo",
+  "person.page.edit": "Editar este ítem",
 
   // "person.page.email": "Email Address",
   "person.page.email": "Dirección de correo electrónico",
 
   // "person.page.firstname": "First Name",
-  "person.page.firstname": "Primer nombre",
+  "person.page.firstname": "Nombre de pila",
 
   // "person.page.jobtitle": "Job Title",
-  "person.page.jobtitle": "Título profesional",
+  "person.page.jobtitle": "Puesto de trabajo",
 
   // "person.page.lastname": "Last Name",
-  "person.page.lastname": "Apellido",
+  "person.page.lastname": "Apellidos",
 
   // "person.page.name": "Name",
   "person.page.name": "Nombre",
@@ -4275,10 +5107,10 @@
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "Identificación del personal",
+  "person.page.staffid": "Identificación de Personal",
 
   // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix": "Persona:",
+  "person.page.titleprefix": "Persona: ",
 
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Resultados de búsqueda de personas",
@@ -4289,8 +5121,6 @@
   // "person.search.title": "Person Search",
   "person.search.title": "Búsqueda de personas",
 
-
-
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parámetros",
 
@@ -4301,16 +5131,16 @@
   "process.new.submit": "Guardar",
 
   // "process.new.select-script": "Script",
-  "process.new.select-script": "Texto",
+  "process.new.select-script": "Script",
 
   // "process.new.select-script.placeholder": "Choose a script...",
-  "process.new.select-script.placeholder": "Elija un guión...",
+  "process.new.select-script.placeholder": "Elija un script...",
 
   // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "Se requiere script",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  "process.new.parameter.file.upload-button": "Seleccione Archivo...",
+  "process.new.parameter.file.upload-button": "Seleccionar archivo...",
 
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Por favor seleccione un archivo",
@@ -4322,7 +5152,7 @@
   "process.new.parameter.type.value": "valor",
 
   // "process.new.parameter.type.file": "file",
-  "process.new.parameter.type.file": "expediente",
+  "process.new.parameter.type.file": "archivo",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "Los siguientes parámetros son obligatorios pero aún faltan:",
@@ -4339,6 +5169,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",
 
@@ -4348,18 +5181,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",
@@ -4371,48 +5202,71 @@
   // "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",
+  "process.detail.actions": "Acciones",
 
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Eliminar proceso",
 
-  // "process.overview.table.finish" : "Finish time (UTC)",
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Eliminar proceso",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "¿Está seguro de que desea eliminar el proceso actual?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Cancelar",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Eliminar proceso",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Proceso eliminado satisfactoriamente.",
+
+  // "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": "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",
@@ -4424,12 +5278,38 @@
   // "process.overview.new": "New",
   "process.overview.new": "Nuevo",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Acciones",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Eliminar {{count}} procesos",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Limpiar la selecció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": "Se están eliminando {{count}} proceso(s). Espere a que la eliminación se complete por completo. Tenga en cuenta que esto puede llevar un tiempo.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "¿Está seguro de que desea eliminar {{count}} proceso(s)?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Elimina procesos",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Error eliminando proceso",
+
+  // "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": "No se pudo eliminar el proceso con ID {{processId}}. El resto de procesos seguirán eliminándose. ",
+
+  // "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",
 
   // "profile.card.identify": "Identify",
-  "profile.card.identify": "Identificar",
+  "profile.card.identify": "Identidad",
 
   // "profile.card.security": "Security",
   "profile.card.security": "Seguridad",
@@ -4456,13 +5336,13 @@
   "profile.metadata.form.label.email": "Dirección de correo electrónico",
 
   // "profile.metadata.form.label.firstname": "First Name",
-  "profile.metadata.form.label.firstname": "Nombre¡",
+  "profile.metadata.form.label.firstname": "Nombre",
 
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "Idioma",
 
   // "profile.metadata.form.label.lastname": "Last Name",
-  "profile.metadata.form.label.lastname": "Apellido",
+  "profile.metadata.form.label.lastname": "Apellidos",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
   "profile.metadata.form.label.phone": "Teléfono de contacto",
@@ -4482,11 +5362,8 @@
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "Las contraseñas no coinciden.",
 
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "La contraseña debe tener al menos 6 caracteres.",
-
-  // "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": "Opcionalmente, puede introducir una nueva contraseña en el cuadro a continuación y confirmarla escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
+  // "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": "Opcionalmente, puede introducir una nueva contraseña en el cuadro a continuación y confirmarla escribiéndola nuevamente en el segundo cuadro.",
 
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Contraseña",
@@ -4494,8 +5371,11 @@
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Rescriba para confirmar",
 
+  // "profile.security.form.label.current-password": "Current password",
+  "profile.security.form.label.current-password": "Contraseña actual",
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-  "profile.security.form.notifications.success.content": "Se guardaron sus cambios a la contraseña.",
+  "profile.security.form.notifications.success.content": "Se guardaron sus cambios de contraseña.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "Contraseña guardada",
@@ -4503,12 +5383,15 @@
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Error al cambiar las contraseñas",
 
-  // "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": "La contraseña debe tener al menos 6 caracteres.",
+  // "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": "Ocurrió un error al intentar cambiar la contraseña. Por favor, compruebe si la contraseña actual es correcta.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Las contraseñas proporcionadas no coinciden.",
 
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Por favor, rellene los campos obligatorios del formulario de seguridad.",
+
   // "profile.title": "Update Profile",
   "profile.title": "Actualización del perfil",
 
@@ -4543,7 +5426,7 @@
   "project.page.status": "Estado",
 
   // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Proyecto de Investigación:",
+  "project.page.titleprefix": "Proyecto de Investigación: ",
 
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Resultados de búsqueda de proyectos",
@@ -4551,8 +5434,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",
 
@@ -4572,7 +5453,7 @@
   "publication.page.publisher": "Editor",
 
   // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Publicación:",
+  "publication.page.titleprefix": "Publicación: ",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Título del volumen",
@@ -4586,7 +5467,6 @@
   // "publication.search.title": "Publication Search",
   "publication.search.title": "Búsqueda de publicaciones",
 
-
   // "media-viewer.next": "Next",
   "media-viewer.next": "Siguiente",
 
@@ -4596,7 +5476,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",
 
@@ -4604,7 +5483,7 @@
   "register-page.create-profile.header": "Crear perfil",
 
   // "register-page.create-profile.identification.header": "Identify",
-  "register-page.create-profile.identification.header": "Identificar",
+  "register-page.create-profile.identification.header": "Identidad",
 
   // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "Dirección de correo electrónico",
@@ -4613,13 +5492,13 @@
   "register-page.create-profile.identification.first-name": "Nombre *",
 
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  "register-page.create-profile.identification.first-name.error": "Por favor introduzca Nombre",
+  "register-page.create-profile.identification.first-name.error": "Por favor introduzca el Nombre",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  "register-page.create-profile.identification.last-name": "Apellido *",
+  "register-page.create-profile.identification.last-name": "Apellidos *",
 
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  "register-page.create-profile.identification.last-name.error": "Por favor introduzca Apellido",
+  "register-page.create-profile.identification.last-name.error": "Por favor introduzca los Apellidos",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "Teléfono de contacto",
@@ -4630,8 +5509,8 @@
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Seguridad",
 
-  // "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": "Introduzca una contraseña en el cuadro siguiente y confírmela escribiéndola nuevamente en el segundo cuadro. Debe tener al menos seis caracteres.",
+  // "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": "Introduzca una contraseña en el cuadro siguiente y confírmela escribiéndola nuevamente en el segundo cuadro. ",
 
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Contraseña *",
@@ -4645,9 +5524,6 @@
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "Las contraseñas no coinciden.",
 
-  // "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": "La contraseña debe tener al menos 6 caracteres.",
-
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Registro completo",
 
@@ -4663,7 +5539,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",
 
@@ -4676,8 +5551,11 @@
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Por favor, introduzca una dirección de correo electrónico",
 
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Por favor, introduzca una dirección de correo electrónico válida",
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Por favor, introduzca una dirección de correo electrónico válida.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Utilice un correo electrónico con uno de los dominos permitidos: {{ domains }}",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Esta dirección será verificada y utilizada como su nombre de inicio de sesión.",
@@ -4697,10 +5575,32 @@
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Se produjo un error al registrar la siguiente dirección de correo electrónico: {{ email }}",
 
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Error al intentar autenticar 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.",
+  "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 }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Abrir configuración de cookies",
+
+  // "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": "Se produjo un error durante la verificación de reCaptcha",
+
+  // "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",
 
   // "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": "No se pudo encontrar una coincidencia adecuada para el tipo de relación {{ type }} entre los dos artículos",
+  "relationships.add.error.relationship-type.content": "No se pudo encontrar una coincidencia adecuada para el tipo de relación {{ type }} entre los dos ítems",
 
   // "relationships.add.error.server.content": "The server returned an error",
   "relationships.add.error.server.content": "El servidor devolvió un error",
@@ -4718,7 +5618,7 @@
   "relationships.isAuthorOf.OrgUnit": "Autores (unidades organizativas)",
 
   // "relationships.isIssueOf": "Journal Issues",
-  "relationships.isIssueOf": "Problemas de la revista",
+  "relationships.isIssueOf": "Números de revista",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Número de la revista",
@@ -4742,7 +5642,7 @@
   "relationships.isPublicationOfJournalIssue": "Artículos",
 
   // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf": "diario",
+  "relationships.isSingleJournalOf": "Revista",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Volumen de la revista",
@@ -4757,21 +5657,19 @@
   "relationships.isContributorOf.OrgUnit": "Colaborador (Unidad organizativa)",
 
   // "relationships.isContributorOf.Person": "Contributor",
-  "relationships.isContributorOf.Person": "Contribuyente",
+  "relationships.isContributorOf.Person": "Contribuidor",
 
   // "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",
@@ -4786,16 +5684,16 @@
   "resource-policies.add.for.bundle": "Agregar una nueva política de bloque",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item": "Agregar una nueva política de artículos",
+  "resource-policies.add.for.item": "Agregar una nueva política de Item",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-  "resource-policies.add.for.community": "Agregar una nueva política comunitaria",
+  "resource-policies.add.for.community": "Agregar una nueva política de Comunidad",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-  "resource-policies.add.for.collection": "Agregar una nueva política de colección",
+  "resource-policies.add.for.collection": "Agregar una nueva política de Colección",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-  "resource-policies.create.page.heading": "Crear una nueva política de recursos para",
+  "resource-policies.create.page.heading": "Crear una nueva política de recursos para ",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
   "resource-policies.create.page.failure.content": "Se produjo un error al crear la política de recursos.",
@@ -4819,16 +5717,16 @@
   "resource-policies.delete.success.content": "Operación exitosa",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-  "resource-policies.edit.page.heading": "Editar la política de recursos",
+  "resource-policies.edit.page.heading": "Editar la política de recursos ",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Se produjo un error al editar la política de recursos.",
 
   // "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": "Se produjo un error al editar el destinatario (ePersona o grupo) de la política de recursos.",
+  "resource-policies.edit.page.target-failure.content": "Se produjo un error al editar el destinatario (usuario o grupo) de la política de recursos.",
 
   // "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": "Se produjo un error al editar la política de recursos. El destinatario (Grupo o ePersona) ha sido actualizado con éxito ",
+  "resource-policies.edit.page.other-failure.content": "Se produjo un error al editar la política de recursos. El destinatario (usuario o grupo) ha sido actualizado con éxito",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Operación exitosa",
@@ -4843,13 +5741,13 @@
   "resource-policies.form.action-type.required": "Debe seleccionar la acción de la política de recursos.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  "resource-policies.form.eperson-group-list.label": "La ePersona o grupo al que se le otorgará el permiso",
+  "resource-policies.form.eperson-group-list.label": "El usuario o grupo al que se le otorgará el permiso",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
-  "resource-policies.form.eperson-group-list.select.btn": "Seleccione",
+  "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
 
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  "resource-policies.form.eperson-group-list.tab.eperson": "Buscar una ePersona",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Buscar un usuario",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Buscar un grupo",
@@ -4867,13 +5765,13 @@
   "resource-policies.form.eperson-group-list.modal.header": "No puede cambiarse el tipo",
 
   // "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": "No es posible cambiar una ePersona por un grupo.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "No es posible cambiar un usuario por un grupo.",
 
   // "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": "No es posible cambiar un grupo por una ePersona.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "No es posible cambiar un grupo por un usuario.",
 
   // "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": "Borre la  política de recursos actual y cree una nueva con el tipo deseado.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Borre la política de recursos actual y cree una nueva con el tipo deseado.",
 
   // "resource-policies.form.eperson-group-list.modal.close": "Ok",
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
@@ -4915,7 +5813,7 @@
   "resource-policies.table.headers.edit.policy": "Editar política",
 
   // "resource-policies.table.headers.eperson": "EPerson",
-  "resource-policies.table.headers.eperson": "EPersona",
+  "resource-policies.table.headers.eperson": "Usuario",
 
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
@@ -4944,8 +5842,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": "",
 
@@ -4961,7 +5857,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",
 
@@ -4996,19 +5891,20 @@
   "search.filters.applied.f.submitter": "Remitente",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-  "search.filters.applied.f.jobTitle": "Título profesional",
+  "search.filters.applied.f.jobTitle": "Puesto de trabajo",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-  "search.filters.applied.f.birthDate.max": "Fecha de nacimiento, final ",
+  "search.filters.applied.f.birthDate.max": "Fecha de nacimiento, final",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Fecha de nacimiento, inicial",
 
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  "search.filters.applied.f.supervisedBy": "Supervisado por",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
 
-
-
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
 
@@ -5172,7 +6068,7 @@
   "search.filters.filter.organizationAddressLocality.placeholder": "Ciudad",
 
   // "search.filters.filter.organizationAddressLocality.label": "Search city",
-  "search.filters.filter.organizationAddressLocality.label": "Búsqueda deciudad",
+  "search.filters.filter.organizationAddressLocality.label": "Búsqueda de ciudad",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Fecha de fundación",
@@ -5214,7 +6110,19 @@
   "search.filters.filter.submitter.placeholder": "Remitente",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  "search.filters.filter.submitter.label": "Remitente de búsqueda",
+  "search.filters.filter.submitter.label": "Búsqueda de remitente",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Examinar árbol {{ name }}",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisado Por",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisado Por",
+
+  // "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",
@@ -5243,7 +6151,6 @@
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "No",
 
-
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtros",
 
@@ -5253,8 +6160,6 @@
   // "search.filters.search.submit": "Submit",
   "search.filters.search.submit": "Enviar",
 
-
-
   // "search.form.search": "Search",
   "search.form.search": "Buscar",
 
@@ -5279,6 +6184,8 @@
   // "search.results.view-result": "View",
   "search.results.view-result": "Ver",
 
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Ocurrió un error durante la ejecución de la consulta, intente nuevamente más tarde",
 
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "Resultados de la búsqueda",
@@ -5286,7 +6193,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",
 
@@ -5308,8 +6214,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",
 
@@ -5319,8 +6223,6 @@
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
 
-
-
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
 
@@ -5340,16 +6242,16 @@
   "sorting.score.DESC": "Lo más relevante",
 
   // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
-  "sorting.dc.date.issued.ASC": "Fecha de emisión Ascendente",
+  "sorting.dc.date.issued.ASC": "Fecha de publicación Ascendente",
 
   // "sorting.dc.date.issued.DESC": "Date Issued Descending",
-  "sorting.dc.date.issued.DESC": "Fecha de emisión Descendente",
+  "sorting.dc.date.issued.DESC": "Fecha de publicación Descendente",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-  "sorting.dc.date.accessioned.ASC": "Fecha de adhesión Ascendente",
+  "sorting.dc.date.accessioned.ASC": "Fecha de envío Ascendente",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-  "sorting.dc.date.accessioned.DESC": "Fecha de adhesión Descendente",
+  "sorting.dc.date.accessioned.DESC": "Fecha de envío Descendente",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
   "sorting.lastModified.ASC": "Última modificación Ascendente",
@@ -5357,7 +6259,6 @@
   // "sorting.lastModified.DESC": "Last modified Descending",
   "sorting.lastModified.DESC": "Última modificación Descendente",
 
-
   // "statistics.title": "Statistics",
   "statistics.title": "Estadísticas",
 
@@ -5391,7 +6292,8 @@
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Visitas",
 
-
+  // "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",
@@ -5402,7 +6304,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",
@@ -5412,7 +6314,7 @@
   "submission.general.discard.confirm.cancel": "Cancelar",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.general.discard.confirm.info": "Esta operación no se puede deshacer. ¿Está seguro? ",
+  "submission.general.discard.confirm.info": "Esta operación no se puede deshacer. ¿Está seguro?",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Sí estoy seguro",
@@ -5421,7 +6323,7 @@
   "submission.general.discard.confirm.title": "Descartar envío",
 
   // "submission.general.discard.submit": "Discard",
-  "submission.general.discard.submit": "Descarte",
+  "submission.general.discard.submit": "Descartar",
 
   // "submission.general.info.saved": "Saved",
   "submission.general.info.saved": "Guardado",
@@ -5435,7 +6337,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",
 
@@ -5496,6 +6397,9 @@
   // "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",
 
@@ -5542,7 +6446,7 @@
   "submission.import-external.source.lcname": "Nombres de la Biblioteca del Congreso",
 
   // "submission.import-external.preview.title": "Item Preview",
-  "submission.import-external.preview.title": "Vista previa del artículo",
+  "submission.import-external.preview.title": "Vista previa del ítem",
 
   // "submission.import-external.preview.title.Publication": "Publication Preview",
   "submission.import-external.preview.title.Publication": "Previsualización de Publicación",
@@ -5554,7 +6458,7 @@
   "submission.import-external.preview.title.Journal": "Previsualización de Revista",
 
   // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  "submission.import-external.preview.title.OrgUnit": "Previsualización de Unidad organizativa ",
+  "submission.import-external.preview.title.OrgUnit": "Previsualización de Unidad organizativa",
 
   // "submission.import-external.preview.title.Person": "Person Preview",
   "submission.import-external.preview.title.Person": "Previsualización de Persona",
@@ -5563,7 +6467,7 @@
   "submission.import-external.preview.title.Project": "Previsualización de Proyecto",
 
   // "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": "Los siguientes metadatos se importaron de una fuente externa. Se completará previamente cuando inicie el envío.",
+  "submission.import-external.preview.subtitle": "Los siguientes metadatos se importaron de una fuente externa. Se añadirán cuando inicie el envío.",
 
   // "submission.import-external.preview.button.import": "Start submission",
   "submission.import-external.preview.button.import": "Iniciar envío",
@@ -5596,7 +6500,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Proyecto",
 
   // "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": "Importación remota de ítem ",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Importación remota de ítem",
 
   // "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": "Importación remota de evento",
@@ -5623,7 +6527,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Importación remota de proyecto",
 
   // "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": "Importación remota de publication",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Importación remota de publicación",
 
   // "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": "¡Nueva entidad agregada!",
@@ -5692,16 +6596,16 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Revista externa importada y agregada con éxito a la selección",
 
   // "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": "Importación remota de numero de revista ",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importación remota de numero de revista",
 
   // "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": "Se agregó localmenteun número de revista a la selección.",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Se agregó localmente un número de revista a la selección.",
 
   // "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": "Se importó con éxito y se agregó externamente un número de revista a la selección.",
 
   // "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": "Importación remota de volumen de revista ",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importación remota de volumen de revista",
 
   // "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": "Se agregó con éxito el volumen de la revista local a la selección.",
@@ -5737,14 +6641,14 @@
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "Seleccionar página",
 
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  "submission.sections.describe.relationship-lookup.selected": "Ítems {{ size }} seleccionados",
+  "submission.sections.describe.relationship-lookup.selected": "{{ size }} ítems seleccionados",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locales ({{ count }})",
 
   // "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 }})",
 
@@ -5768,18 +6672,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 }})",
@@ -5814,6 +6718,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 del Proyecto",
 
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publication of the Author",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicación del Autor",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "API OpenAIRE de Financiamiento",
 
@@ -5826,7 +6733,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...",
 
@@ -5834,14 +6740,14 @@
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selección actual ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Numeros de la revista",
-  
+  "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": "Numeros de la revista",
+  "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",
 
@@ -5853,7 +6759,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",
 
@@ -5881,6 +6787,9 @@
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unidad organizativa matriz",
 
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publicación",
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Alternar menú desplegable",
 
@@ -5898,7 +6807,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",
 
@@ -5922,16 +6831,16 @@
 
   // "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  ",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volúmenes de revista seleccionados",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agencias de financiación seleccionadas",
 
   // "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",
 
@@ -5977,7 +6886,7 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados de la búsqueda",
 
-  // "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": "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": "¿Le gustaría guardar \"{{ value }}\" como una variante de nombre para esta persona para que usted y otros puedan reutilizarlo para envíos futuros? Si no lo hace, aún puede usarlo para este envío.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -6052,6 +6961,23 @@
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Hay secciones incompletas.",
 
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Se crearán los siguientes identificadores para su ítem:",
+
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Ningún handle ha sido asignado a este ítem.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "No se han asignado DOIs para este ítem.",
+
+  // "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": "Otros identificadores: ",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
   "submission.sections.submit.progressbar.accessCondition": "Condiciones de acceso al ítem",
@@ -6074,6 +7000,9 @@
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Posibles duplicados",
 
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificadores",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Licencia de depósito",
 
@@ -6086,7 +7015,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.",
 
@@ -6115,22 +7043,22 @@
   "submission.sections.status.info.aria": "Información adicional",
 
   // "submission.sections.toggle.open": "Open section",
-  "submission.sections.toggle.open": "Sección abierta",
+  "submission.sections.toggle.open": "Abrir sección",
 
   // "submission.sections.toggle.close": "Close section",
   "submission.sections.toggle.close": "Cerrar sección",
 
   // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
-  "submission.sections.toggle.aria.open": "Expandir {{sectionHeader}} sección",
+  "submission.sections.toggle.aria.open": "Expandir sección {{sectionHeader}}",
 
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
-  "submission.sections.toggle.aria.close": "Contraer {{sectionHeader}} sección",
+  "submission.sections.toggle.aria.close": "Contraer sección {{sectionHeader}}",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.sections.upload.delete.confirm.info": "Esta operación no se puede deshacer. ¿Está seguro? ",
+  "submission.sections.upload.delete.confirm.info": "Esta operación no se puede deshacer. ¿Está seguro?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Sí, estoy seguro",
@@ -6178,7 +7106,7 @@
   "submission.sections.upload.form.group-label": "Grupo",
 
   // "submission.sections.upload.form.group-required": "Group is required.",
-  "submission.sections.upload.form.group-required": "Se requiere grupo.",
+  "submission.sections.upload.form.group-required": "Se requiere el grupo.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Conceder acceso hasta",
@@ -6193,10 +7121,10 @@
   "submission.sections.upload.header.policy.default.nolist": "Se podrá acceder a los archivos cargados en la colección {{ collectionName }} de acuerdo con los siguientes grupos:",
 
   // "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": "Tenga en cuenta que los archivos cargados en la colección {{ collectionName }} serán accesibles, además de lo que se decida explícitamente para el fichero, con los siguientes grupos:",
+  "submission.sections.upload.header.policy.default.withlist": "Tenga en cuenta que los archivos cargados en la colección {{ collectionName }} serán accesibles, además de lo que se decida explícitamente para el fichero, para los siguientes grupos:",
 
-  // "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": "Aquí encontrará todos los archivos que se encuentran actualmente en el ítem.  Puede actualizar los metadatos del fichero y las condiciones de acceso e <strong> incluir ficheros adicionales simplemente arrastrando-y-soltando en cualquier instante en la página</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": "Aquí encontrará todos los archivos que se encuentran actualmente en el ítem.  Puede actualizar los metadatos del fichero y las condiciones de acceso e <strong> incluir ficheros adicionales simplemente arrastrando-y-soltando en cualquier lugar de la página</strong>",
 
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "No",
@@ -6216,10 +7144,10 @@
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Subida exitosa",
 
-  // "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": "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": "Si lo marca, el ítem será detectable en el buscador/navegador. Si lo desmarca, el ítems solo estará disponible mediante el enlace directo, y no aparecerá en el buscador/navegador.",
- 
- // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
   "submission.sections.accesses.form.discoverable-label": "Detectable",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
@@ -6267,12 +7195,11 @@
   // "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":  "Debe aceptar la licencia",
-
+  // "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 Publicac",
+  "submission.sections.sherpa.publication.information": "Información de la Publicación",
 
   // "submission.sections.sherpa.publication.information.title": "Title",
   "submission.sections.sherpa.publication.information.title": "Título",
@@ -6295,14 +7222,14 @@
   // "submission.sections.sherpa.publisher.policy": "Publisher Policy",
   "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": "Lq 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": "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ó 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",
 
   // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
-  "submission.sections.sherpa.publisher.policy.more.information": "Para mas información, por favor, siga los siguientes enlaces:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Para más información, por favor, siga los siguientes enlaces:",
 
   // "submission.sections.sherpa.publisher.policy.version": "Version",
   "submission.sections.sherpa.publisher.policy.version": "Versión",
@@ -6349,45 +7276,59 @@
   // "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": "Borrar",
+  "submission.workflow.generic.delete": "Eliminar",
 
-  // "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": "Si desea descartar este artículo, seleccione \"Eliminar\". Luego se le pedirá que lo confirme.",
+  // "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": "Seleccione esta opción para descartar este ítem. A contunuación se le pedirá confirmación.",
 
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
 
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  "submission.workflow.generic.edit-help": "Seleccione esta opción para cambiar los metadatos del artículo.",
+  "submission.workflow.generic.edit-help": "Seleccione esta opción para cambiar los metadatos del ítem.",
 
   // "submission.workflow.generic.view": "View",
-  "submission.workflow.generic.view": "Vista",
+  "submission.workflow.generic.view": "Ver",
 
   // "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 artículo.",
+  "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",
 
   // "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": "Si ha revisado el artículo y es adecuado para su inclusión en la colección, seleccione \"Aprobar \".",
+  "submission.workflow.tasks.claimed.approve_help": "Si ha revisado el ítem y es adecuado para su inclusión en la colección, seleccione \"Aprobar\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Editar",
 
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
-  "submission.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del artículo.",
+  "submission.workflow.tasks.claimed.edit_help": "Seleccione esta opción para cambiar los metadatos del ítem.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Rechazar",
+
+  // "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": "Introduzca su motivo para rechazar el envío en el cuadro a continuación, indicando si el remitente puede solucionar un problema y volver a enviarlo.",
@@ -6405,16 +7346,14 @@
   "submission.workflow.tasks.claimed.reject.submit": "Rechazar",
 
   // "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": "Si ha revisado el ítem y ha encontrado que <strong> no </strong> es adecuado para su inclusión en la colección, seleccione \"Rechazar\". Luego, se le pedirá que introduzca un mensaje que indique por qué el artículo no es adecuado y si el remitente debe cambiar algo y volver a enviarlo.",
+  "submission.workflow.tasks.claimed.reject_help": "Si ha revisado el ítem y ha encontrado que <strong> no </strong> es adecuado para su inclusión en la colección, seleccione \"Rechazar\". Luego, se le pedirá que introduzca un mensaje que indique por qué el ítem no es adecuado y si el remitente debe cambiar algo y volver a enviarlo.",
 
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  "submission.workflow.tasks.claimed.return": "Volver al pool",
+  "submission.workflow.tasks.claimed.return": "Devolver al pool",
 
   // "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...",
 
@@ -6427,10 +7366,8 @@
   // "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": "Afirmar",
+  "submission.workflow.tasks.pool.claim": "Asumir tarea",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Asigne esta tarea a usted mismo.",
@@ -6441,13 +7378,119 @@
   // "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",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Suscripciones a ítems",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Suscripciones a colecciones",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Suscripciones a comunidades",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tipo de suscripción",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Frecuencia de la suscripción",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Diaria",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Mensual",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Semanal",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Suscribir",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Suscripciones",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipo y frecuencia",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Cerrar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Para eliminar esta suscripción, por favor visite la página \"Suscripciones\" en su perfil de usuario",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenido",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diario",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Semanal",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensual",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Enviar",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Procesando...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Suscrito a {{ type }} exitosamente.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "La suscripción fue borrada exitosamente",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "La suscripción a {{ type }} fue exitosamente actualizada",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Un error ocurrió durante la creación de la suscripción",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Un error ocurrió durante la eliminación de la suscripción",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Un error ocurrió durante la actualización de la suscripción",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Tema",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tipo de suscripción",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Frecuencia de Suscripción",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Acción",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Borrar",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "No disponible",
+
+  // "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": "El ítem suscrito ha sido eliminado, o actualmente usted no tiene permisos suficiente para poder visualizarlo.",
+
+  // "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",
@@ -6459,13 +7502,13 @@
   "thumbnail.project.alt": "Logotipo del proyecto",
 
   // "thumbnail.project.placeholder": "Project Placeholder Image",
-  "thumbnail.project.placeholder": "Imagen del proyecto en el marcador de posición ",
+  "thumbnail.project.placeholder": "Imagen del proyecto en el marcador de posición",
 
   // "thumbnail.orgunit.alt": "OrgUnit Logo",
   "thumbnail.orgunit.alt": "Logotipo de Unidad Organizativa",
 
   // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
- "thumbnail.orgunit.placeholder": "Imagen de Unidad Organizativa en el marcador de posición ",
+  "thumbnail.orgunit.placeholder": "Imagen de Unidad Organizativa en el marcador de posición",
 
   // "thumbnail.person.alt": "Profile Picture",
   "thumbnail.person.alt": "Foto de perfil",
@@ -6473,13 +7516,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",
 
@@ -6501,7 +7540,8 @@
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorías de temas de investigación",
 
-
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Selecciona un tema para agregar como filtro de búsqueda",
 
   // "uploader.browse": "browse",
   "uploader.browse": "examinar",
@@ -6516,8 +7556,7 @@
   "uploader.or": ", o ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "Procesando",
+  "uploader.processing": "Procesando subida de archivo(s), (ahora es seguro cerrar esta página)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Longitud de la cola",
@@ -6531,7 +7570,8 @@
   // "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",
 
   // "workspace.search.results.head": "Your submissions",
   "workspace.search.results.head": "Sus envíos",
@@ -6542,7 +7582,8 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tareas del flujo de trabajo",
 
-
+  // "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",
@@ -6574,7 +7615,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",
 
@@ -6608,6 +7648,81 @@
   // "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",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "El revisor para este flujo de trabajo ha sido seleccionado exitosamente",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Algo salió mal",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "No fue posible seleccionar el revisor para este flujo de trabajo",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleccionar revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Cancelar",
+
+  // "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",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "La evaluación para este ítem ha sido enviada exitosamente",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Algo salió mal",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "No fue posible evaluar este ítem",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Evaluar este ítem",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Evaluar este ítem",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Cancelar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La sesión caducará pronto",
 
@@ -6620,8 +7735,8 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Prolongar la sesión",
 
-  // "researcher.profile.action.processing" : "Processing...",
-  "researcher.profile.action.processing" : "Procesando...",
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Procesando...",
 
   // "researcher.profile.associated": "Researcher profile associated",
   "researcher.profile.associated": "Perfil asociado de investigador",
@@ -6653,11 +7768,11 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Ver",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
-  "researcher.profile.private.visibility" : "PRIVADO",
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVADO",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
-  "researcher.profile.public.visibility" : "PÚBLICO",
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PÚBLICO",
 
   // "researcher.profile.status": "Status:",
   "researcher.profile.status": "Estado:",
@@ -6665,17 +7780,17 @@
   // "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" : "Hubo un error reclamando el perfil, por favor, inténtelo mas tarde",
+  // "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.error.claim.title": "Error",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
-  "researcherprofile.success.claim.body" : "Perfil reclamado con éxito",
+  // "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" : "Éxito",
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Éxito",
 
   // "person.page.orcid.create": "Create an ORCID ID",
   "person.page.orcid.create": "Crear un ORCID ID",
@@ -6683,8 +7798,8 @@
   // "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" : "Conceder autorizaciones",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Conceder autorizaciones",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
   "person.page.orcid.link": "Conectar con ORCID ID",
@@ -6699,7 +7814,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...",
@@ -6731,44 +7846,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" : "Afiliación",
+  // "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" : "Biografía",
+  // "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" : "Grados",
+  // "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" : "Identificadores",
+  // "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" : "Todas las financiaciones",
+  // "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" : "Mi financiación ",
+  // "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" : "Financiaciones seleccionadas",
+  // "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" : "Deshabilitado",
+  // "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" : "Todas las publicaciones",
+  // "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" : "Mis publicaciones",
+  // "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" : "Publicaciones seleccionadas",
+  // "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" : "Deshabilitado",
+  // "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",
@@ -6779,14 +7894,14 @@
   // "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" : "Tipo",
+  // "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" : "Descripción",
+  // "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" : "Acción",
+  // "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",
   "person.page.orcid.sync-queue.description.affiliation": "Affiliaciones",
@@ -6851,8 +7966,8 @@
   // "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" : "Sincronizar con el registro ORCID",
+  // "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.",
   "person.page.orcid.sync-queue.send.unauthorized-error.title": "Falló el envío a ORCID debdo a autorización insuficiente.",
@@ -6861,13 +7976,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.",
@@ -6888,7 +8003,7 @@
   "person.page.orcid.sync-queue.send.validation-error.title.required": "Se requiere un título",
 
   // "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": "Se requiere un  dc.type",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Se requiere un 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": "Se requiere una fecha de comienzo",
@@ -6905,15 +8020,15 @@
   // "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",
 
   // "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": "Se requiere que la dirección de la organización tenga una ciudad",
-  
+
   // "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": "Se requiere que la dirección de la organización tenga un código de pais de 2 dígitos ISO 3166 válido",
 
@@ -6922,12 +8037,12 @@
 
   // "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": "Se requiere que los identificadores de la organización tengan un valor",
-  
+
   // "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": "Se requiere que los identificadores de la organización tengan una fuente",
 
-   //  "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 fuente de uno de los identificadores de organización es inválida. Las fuentes admitidas son RINGGOLD, GRID, LEI and FUNDREF",
+  // "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 fuente de uno de los identificadores de organización es inválida. Las fuentes admitidas son RINGGOLD, GRID, LEI and FUNDREF",
 
   // "person.page.orcid.synchronization-mode": "Synchronization mode",
   "person.page.orcid.synchronization-mode": "Modo sincronización",
@@ -6938,8 +8053,8 @@
   // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
   "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": "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 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.",
@@ -6981,12 +8096,161 @@
   "person.orcid.sync.setting": "Ajustes de sincronización de ORCID",
 
   // "person.orcid.registry.queue": "ORCID Registry Queue",
-  // TODO New key - Add a translation
-  "person.orcid.registry.queue": "Cola de registro de ORCID  ",
+  "person.orcid.registry.queue": "Cola de registro de ORCID",
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
-  "person.orcid.registry.auth": "Autorizaciones ORCID ",
+  "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",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "En",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} día(s),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora(s) y",
+
+  // "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",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Alerta del Sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Algo salió mal al recuperar la alerta del sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Cancelar",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Guardar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ACTIVO",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INACTIVO",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "La alerta de sistema debe tener un mensaje",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Mensaje de alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Habilitar un temporizador de cuenta regresiva",
+
+  // "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": "Sugerencia: Configure un temporizador. Cuando esté habilitado, se puede establecer una fecha en el futuro y el banner del sistema de alerta realizara una cuenta regresiva hasta la fecha establecida. Cuando finalice el temporizador, este desaparecerá de la alerta. El servidor NO se detendrá automáticamente..",
+
+  // "system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Vista preliminar de la alerta del sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "La alerta de sistema fue actualizada exitosamente",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Algo salió mal al actualizar la alerta del sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "La alerta del sistema fue creada exitosamente",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Algo salió mal al crear la alerta del sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Alertas del sistema",
+
+  // "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",
 
 
 
-}
\ No newline at end of file
+}
diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5
index 866cb34736..122d95704a 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,8 +192,11 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nimi",
 
-  // "admin.registries.bitstream-formats.table.return": "Return",
-  "admin.registries.bitstream-formats.table.return": "Palaa",
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "ID",
+
+  // "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",
@@ -172,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",
@@ -205,7 +241,7 @@
   "admin.registries.metadata.schemas.table.delete": "Poista valittu",
 
   // "admin.registries.metadata.schemas.table.id": "ID",
-  "admin.registries.metadata.schemas.table.id": "ID-tunnus",
+  "admin.registries.metadata.schemas.table.id": "ID",
 
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Nimi",
@@ -213,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",
@@ -236,6 +270,9 @@
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Kenttä",
 
+  // "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Soveltamisala",
 
@@ -287,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ä",
@@ -307,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",
@@ -328,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ä",
 
@@ -346,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}}\"",
 
@@ -376,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",
 
@@ -404,11 +451,14 @@
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Jäsenenä näissä ryhmissä:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-  "admin.access-control.epeople.form.table.id": "ID-tunnus",
+  "admin.access-control.epeople.form.table.id": "ID",
 
   // "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",
 
@@ -421,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",
@@ -447,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",
 
@@ -477,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.",
 
@@ -494,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",
 
@@ -566,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ää",
 
@@ -620,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ää",
 
@@ -656,10 +732,420 @@
   // "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.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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Ylläpitäjän haku",
@@ -676,17 +1162,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ä",
@@ -697,9 +1183,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",
 
@@ -709,43 +1192,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.",
@@ -753,7 +1384,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: ",
@@ -797,6 +1444,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.",
 
@@ -806,7 +1480,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",
@@ -817,6 +1549,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",
 
@@ -847,17 +1582,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",
@@ -889,6 +1642,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",
 
@@ -898,23 +1654,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",
@@ -934,6 +1711,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",
 
@@ -946,8 +1726,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",
 
@@ -957,8 +1735,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",
 
@@ -1010,13 +1786,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",
@@ -1039,15 +1822,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",
@@ -1061,6 +1840,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",
 
@@ -1109,7 +1897,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.",
@@ -1127,8 +1915,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ää",
 
@@ -1144,12 +1930,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",
 
@@ -1159,8 +1951,6 @@
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Muokkaa mallitietuetta",
 
-
-
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Lyhyt kuvaus",
 
@@ -1185,13 +1975,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",
 
@@ -1210,8 +1999,6 @@
   // "collection.page.news": "News",
   "collection.page.news": "Uutiset",
 
-
-
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Vahvista valinta",
 
@@ -1221,7 +2008,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.",
@@ -1229,10 +2083,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ä",
@@ -1240,8 +2095,6 @@
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Näytä lisää",
 
-
-
   // "community.create.head": "Create a Community",
   "community.create.head": "Luo yhteisö",
 
@@ -1260,6 +2113,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ö",
 
@@ -1281,6 +2137,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",
@@ -1303,8 +2164,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",
 
@@ -1314,10 +2173,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",
@@ -1343,25 +2200,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",
@@ -1369,21 +2227,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",
 
@@ -1393,7 +2248,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",
 
@@ -1403,28 +2257,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",
@@ -1465,8 +2320,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",
 
@@ -1488,6 +2341,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.",
 
@@ -1497,9 +2356,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",
 
@@ -1515,7 +2386,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",
@@ -1523,30 +2398,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",
@@ -1554,9 +2428,17 @@
   // "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",
-  "curation-task.task.checklinks.label":  "Tarkista metadatan linkit",
+  // "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",
   "curation-task.task.noop.label": "Ei toimintaa",
@@ -1573,7 +2455,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ä:",
@@ -1593,13 +2476,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",
@@ -1610,6 +2518,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: ",
 
@@ -1634,16 +2545,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",
@@ -1657,11 +2644,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",
@@ -1669,6 +2668,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",
@@ -1706,6 +2728,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",
 
@@ -1727,13 +2752,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 }}",
 
@@ -1749,16 +2806,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 *",
@@ -1766,28 +2824,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",
@@ -1795,8 +2851,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",
@@ -1819,9 +2875,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ä",
 
@@ -1834,10 +2887,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",
@@ -1849,13 +2900,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",
@@ -1890,8 +2947,23 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Ei syötettyä arvoa",
 
-  // "form.other-information": {},
-  "form.other-information": {},
+  // "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",
@@ -1908,10 +2980,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": "",
@@ -1919,8 +3115,11 @@
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Etusivu",
 
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Etusivu",
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Hae julkaisuarkistosta ...",
+
+  // "home.title": "Home",
+  "home.title": "Etusivu",
 
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Julkaisuarkiston yhteisöt",
@@ -1928,19 +3127,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",
@@ -1949,10 +3146,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",
@@ -1963,44 +3163,73 @@
   // "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",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Tällä tietueella ei ole nippua, johon tiedoston voisi ladata.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -2024,8 +3253,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",
 
@@ -2057,7 +3284,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.",
@@ -2116,8 +3343,6 @@
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Lataa",
 
-
-
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Peruuta",
 
@@ -2142,6 +3367,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",
@@ -2149,6 +3376,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",
 
@@ -2194,20 +3484,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",
 
@@ -2220,6 +3517,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.",
 
@@ -2235,13 +3535,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",
@@ -2256,7 +3559,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.",
@@ -2266,13 +3569,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ä",
 
@@ -2282,10 +3586,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.",
@@ -2317,48 +3625,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",
 
@@ -2377,8 +3679,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ää",
 
@@ -2389,13 +3689,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",
@@ -2416,7 +3716,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",
@@ -2424,6 +3724,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",
 
@@ -2436,6 +3739,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",
 
@@ -2466,32 +3772,35 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Hallinnoi liitettyjä kokoelmia",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Siirrä...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Siirrä tämä kohde toiseen kokoelmaan",
 
   // "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.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Poista käytöstä...",
+  // "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",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Poista tietue käytöstä",
@@ -2503,10 +3812,10 @@
   "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-tunnus",
+  "item.edit.tabs.status.labels.id": "Tietueen sisäinen ID",
 
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Tietueen tiedot",
@@ -2532,8 +3841,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",
 
@@ -2552,7 +3859,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",
@@ -2560,9 +3868,6 @@
   // "item.page.description": "Description",
   "item.page.description": "Kuvaus",
 
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Muokkaa tietuetta",
-
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "Kausijulkaisun ISSN",
 
@@ -2581,10 +3886,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ä",
@@ -2598,6 +3931,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ä",
 
@@ -2631,6 +3970,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",
 
@@ -2664,11 +4009,26 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Sulje",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Alkuperäinen nippu",
+  // "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" : "Lisenssinippu",
+  // "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:",
@@ -2677,7 +4037,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ä:",
@@ -2694,6 +4054,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:",
 
@@ -2703,6 +4090,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",
@@ -2719,19 +4123,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",
 
@@ -2747,12 +4153,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",
@@ -2778,10 +4363,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",
@@ -2810,8 +4396,6 @@
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Kausijulkaisun numero: ",
 
-
-
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Kausijulkaisun vuosikerta",
 
@@ -2830,7 +4414,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...",
@@ -2886,8 +4501,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",
 
@@ -2903,6 +4516,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",
 
@@ -2918,8 +4537,6 @@
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Sisäänkirjautuminen",
 
-
-
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Kirjaudu ulos",
 
@@ -2929,15 +4546,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",
@@ -2951,13 +4567,21 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Käyttäjät",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
   "menu.section.admin_search": "Ylläpitäjän haku",
 
-
-
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Tämä yhteisö",
 
@@ -2965,7 +4589,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",
@@ -2977,27 +4601,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",
 
@@ -3010,8 +4633,6 @@
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Tietue",
 
-
-
   // "menu.section.export": "Export",
   "menu.section.export": "Eksportoi",
 
@@ -3027,19 +4648,24 @@
   // "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",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Ylläpitäjän haku",
 
   // "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",
@@ -3050,6 +4676,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",
 
@@ -3059,8 +4688,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",
@@ -3068,11 +4697,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",
 
@@ -3082,8 +4712,6 @@
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadata",
 
-
-
   // "menu.section.new": "New",
   "menu.section.new": "Uusi",
 
@@ -3102,20 +4730,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",
@@ -3126,57 +4751,64 @@
   // "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.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "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.",
 
@@ -3252,26 +4884,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",
@@ -3280,7 +4918,7 @@
   "mydspace.upload.upload-failed": "Virhe uutta työtilaa luotaessa. Tarkista ladattava sisältö ennen kuin yrität uudelleen.",
 
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
-    "mydspace.upload.upload-failed-manyentries": "Tiedostoa ei voida käsitellä. Vain yksi kohde on sallittu, mutta niitä on useita.",
+  "mydspace.upload.upload-failed-manyentries": "Tiedostoa ei voida käsitellä. Vain yksi kohde on sallittu, mutta niitä on useita.",
 
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
   "mydspace.upload.upload-failed-moreonefile": "Pyyntöä ei voida käsitellä. Vain yksi tiedosto sallittu.",
@@ -3288,31 +4926,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",
@@ -3320,17 +4962,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",
 
@@ -3347,12 +5005,13 @@
   "orgunit.page.edit": "Muokkaa tietuetta",
 
   // "orgunit.page.id": "ID",
-  "orgunit.page.id": "ID-tunnus",
+  "orgunit.page.id": "ID",
 
   // "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",
@@ -3366,8 +5025,6 @@
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Lajitteluvalinnat",
 
-
-
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Käyttäjä",
 
@@ -3392,6 +5049,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",
 
@@ -3399,18 +5059,19 @@
   "person.page.orcid": "ORCID-tunniste",
 
   // "person.page.staffid": "Staff ID",
-  "person.page.staffid": "Henkilökunnan ID-tunnus",
+  "person.page.staffid": "Henkilökunnan ID",
 
   // "person.page.titleprefix": "Person: ",
   "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",
@@ -3418,8 +5079,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",
@@ -3460,6 +5121,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",
 
@@ -3469,19 +5133,17 @@
   // "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.back": "Back",
+  "process.detail.back": "Paluu",
 
-  // "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" : "Paluu",
-
-  // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Prosessin tulos",
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "Prosessin tulos",
 
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Nouda prosessin tulos",
@@ -3492,49 +5154,71 @@
   // "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" : "Tulostiedostot",
+  // "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" : "Prosessilla ei ole tulostiedostoja",
+  // "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" : "Skripti",
+  // "process.detail.script": "Script",
+  "process.detail.script": "Skripti",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Prosessi: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Prosessi: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Aloitusaika",
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Aloitusaika",
 
-  // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Lopetusaika",
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Lopetusaika",
 
-  // "process.detail.status" : "Status",
-  "process.detail.status" : "Tila",
+  // "process.detail.status": "Status",
+  "process.detail.status": "Tila",
 
-  // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Luo vastaava prosessi",
+  // "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.overview.table.id" : "Prosessin 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.overview.table.name" : "Name",
-  "process.overview.table.name" : "Nimi",
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Peruuta",
 
-  // "process.overview.table.start" : "Start time",
-  "process.overview.table.start" : "Aloitusaika",
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Poista prosessi",
 
-  // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Tila",
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "Prosessi on poistettu.",
 
-  // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Käyttäjä",
+  // "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": "Nimi",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Aloitusaika (UTC)",
+
+  // "process.overview.table.status": "Status",
+  "process.overview.table.status": "Tila",
+
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "Käyttäjä",
 
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Prosessien yleiskatsaukset",
@@ -3545,6 +5229,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",
@@ -3555,11 +5265,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",
@@ -3600,11 +5313,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",
@@ -3612,6 +5322,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.",
 
@@ -3621,16 +5334,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",
@@ -3651,7 +5368,7 @@
   "project.page.funder": "Rahoittajat",
 
   // "project.page.id": "ID",
-  "project.page.id": "ID-tunnus",
+  "project.page.id": "ID",
 
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Asiasanat",
@@ -3665,7 +5382,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",
@@ -3694,9 +5412,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",
@@ -3731,8 +5460,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 *",
@@ -3746,14 +5475,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",
@@ -3764,7 +5490,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",
 
@@ -3777,8 +5502,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.",
@@ -3798,7 +5526,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ä",
@@ -3854,7 +5604,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ää",
@@ -3907,6 +5673,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",
 
@@ -3935,15 +5707,30 @@
   "resource-policies.form.eperson-group-list.table.headers.action": "Toimenpide",
 
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  "resource-policies.form.eperson-group-list.table.headers.id": "ID-tunnus",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
 
   // "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",
@@ -3983,7 +5770,7 @@
   "resource-policies.table.headers.group": "Ryhmä",
 
   // "resource-policies.table.headers.id": "ID",
-  "resource-policies.table.headers.id": "ID-tunnus",
+  "resource-policies.table.headers.id": "ID",
 
   // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "Nimi",
@@ -4006,20 +5793,20 @@
   // "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": "Hae julkaisuarkistosta ...",
 
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Tekijä",
@@ -4033,7 +5820,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",
@@ -4063,28 +5850,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",
@@ -4092,26 +5892,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",
@@ -4119,7 +5934,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",
@@ -4131,6 +5949,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",
 
@@ -4140,53 +5964,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",
@@ -4200,13 +6051,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",
@@ -4235,25 +6102,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",
@@ -4267,7 +6132,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",
@@ -4290,19 +6165,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",
 
@@ -4315,10 +6186,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",
@@ -4353,12 +6243,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",
@@ -4379,21 +6276,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",
@@ -4413,27 +6339,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.",
 
@@ -4464,6 +6447,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ä",
 
@@ -4557,6 +6582,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",
 
@@ -4632,13 +6660,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",
 
@@ -4684,8 +6738,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",
@@ -4762,7 +6819,25 @@
   // "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.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.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.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -4787,14 +6862,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",
 
@@ -4834,7 +6912,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",
@@ -4854,19 +6951,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",
@@ -4877,18 +7020,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",
 
@@ -4901,6 +7062,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",
 
@@ -4910,8 +7074,8 @@
   // "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": "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.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",
   "submission.sections.upload.no-entry": "Ei",
@@ -4931,18 +7095,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",
@@ -4956,7 +7251,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",
@@ -4970,6 +7275,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.",
 
@@ -4994,8 +7305,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...",
 
@@ -5008,8 +7317,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",
 
@@ -5022,13 +7329,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ä",
 
@@ -5050,7 +7491,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",
@@ -5058,12 +7500,14 @@
   // "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",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "Käsitellään",
+  "uploader.processing": "Käsitellään ladattuja tiedostoja... (voit sulkea tämän sivun)",
 
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Jonon pituus",
@@ -5077,30 +7521,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",
@@ -5108,30 +7566,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": "Lähetä takaisin"
+  // "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 ce258c1dda..ba427292bc 100644
--- a/src/assets/i18n/fr.json5
+++ b/src/assets/i18n/fr.json5
@@ -176,6 +176,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nom",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Retour",
@@ -251,6 +253,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Champ",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Note d'application",
@@ -714,6 +718,303 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Retour",
 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  "admin.reports.collections.title": "Rapport de collections filtrées",
+
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  "admin.reports.collections.breadcrumbs": "Collections filtrées",
+
+  //"admin.reports.collections.head": "Collection Filter Report",
+  "admin.reports.collections.head": "Rapport de collections filtrées",
+
+  //"admin.reports.button.show-collections": "Show Collections",
+  "admin.reports.button.show-collections": "Afficher les collections",
+
+  //"admin.reports.collections.collections-report": "Collection Report",
+  "admin.reports.collections.collections-report": "Rapport des collections",
+
+  //"admin.reports.collections.item-results": "Item Results",
+  "admin.reports.collections.item-results": "Éléments résultants",
+
+  //"admin.reports.collections.community": "Community",
+  "admin.reports.collections.community": "Communauté",
+
+  //"admin.reports.collections.collection": "Collection",
+  "admin.reports.collections.collection": "Collection",
+
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  "admin.reports.collections.nb_items": "Nb. d'éléments",
+
+  //"admin.reports.collections.match_all_selected_filters": "Matching all selected filters",
+  "admin.reports.collections.match_all_selected_filters": "Correspondant à tous les filtres sélectionnés",
+
+
+  //"admin.reports.items.title": "Metadata Query Report",
+  "admin.reports.items.title": "Rapport de requête de métadonnées",
+
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  "admin.reports.items.breadcrumbs": "Requête de métadonnées",
+
+  //"admin.reports.items.head": "Metadata Query Report",
+  "admin.reports.items.head": "Rapport de requête de métadonnées",
+
+  //"admin.reports.items.run": "Run Item Query",
+  "admin.reports.items.run": "Exécuter la requête",
+
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  "admin.reports.items.section.collectionSelector": "Sélecteur de collections",
+
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  "admin.reports.items.section.metadataFieldQueries": "Requêtes sur les champs de métadonnées",
+
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  "admin.reports.items.predefinedQueries": "Requêtes prédéfinies",
+
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  "admin.reports.items.section.limitPaginateQueries": "Limiter/paginer les résultats",
+
+  //"admin.reports.items.limit": "Limit/",
+  "admin.reports.items.limit": "Limite",
+
+  //"admin.reports.items.limit": "Offset/",
+  "admin.reports.items.offset": "À partir de",
+
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  "admin.reports.items.wholeRepo": "Tout le dépôt",
+
+  //"admin.reports.items.anyField": "Any field",
+  "admin.reports.items.anyField": "Tous les champs",
+
+  //"admin.reports.items.predicate.exists": "exists",
+  "admin.reports.items.predicate.exists": "existe",
+
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  "admin.reports.items.predicate.doesNotExist": "n'existe pas",
+
+  //"admin.reports.items.predicate.equals": "equals",
+  "admin.reports.items.predicate.equals": "est égal à",
+
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  "admin.reports.items.predicate.doesNotEqual": "n'est pas égal à",
+
+  //"admin.reports.items.predicate.like": "like",
+  "admin.reports.items.predicate.like": "est de forme (like)",
+
+  //"admin.reports.items.predicate.notLike": "not like",
+  "admin.reports.items.predicate.notLike": "n'est pas de forme (not like)",
+
+  //"admin.reports.items.predicate.contains": "contains",
+  "admin.reports.items.predicate.contains": "contient",
+
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  "admin.reports.items.predicate.doesNotContain": "ne contient pas",
+
+  //"admin.reports.items.predicate.matches": "matches",
+  "admin.reports.items.predicate.matches": "correspond à (matches)",
+
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  "admin.reports.items.predicate.doesNotMatch": "ne correspond pas à (does not match)",
+
+  //"admin.reports.items.preset.new": "New Query",
+  "admin.reports.items.preset.new": "Nouvelle requête",
+
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  "admin.reports.items.preset.hasNoTitle": "Sans titre",
+
+  //"admin.reports.items.preset.hasNoIdentifierUri": "Has No dc.identifier.uri",
+  "admin.reports.items.preset.hasNoIdentifierUri": "Sans dc.identifier.uri",
+
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  "admin.reports.items.preset.hasCompoundSubject": "A un sujet composite",
+
+  //"admin.reports.items.preset.hasCompoundAuthor": "Has compound dc.contributor.author",
+  "admin.reports.items.preset.hasCompoundAuthor": "A un dc.contributor.author composite",
+
+  //"admin.reports.items.preset.hasCompoundCreator": "Has compound dc.creator",
+  "admin.reports.items.preset.hasCompoundCreator": "A un dc.creator composite",
+
+  //"admin.reports.items.preset.hasUrlInDescription": "Has URL in dc.description",
+  "admin.reports.items.preset.hasUrlInDescription": "A un URL dans dc.description",
+
+  //"admin.reports.items.preset.hasFullTextInProvenance": "Has full text in dc.description.provenance",
+  "admin.reports.items.preset.hasFullTextInProvenance": "A des documents texte dans dc.description.provenance",
+
+  //"admin.reports.items.preset.hasNonFullTextInProvenance": "Has non-full text in dc.description.provenance",
+  "admin.reports.items.preset.hasNonFullTextInProvenance": "N'a pas de document texte dans dc.description.provenance",
+
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  "admin.reports.items.preset.hasEmptyMetadata": "A des métadonnées vides",
+
+  //"admin.reports.items.preset.hasUnbreakingDataInDescription": "Has unbreaking metadata in description",
+  "admin.reports.items.preset.hasUnbreakingDataInDescription": "A du contenu insécable dans la description",
+
+  //"admin.reports.items.preset.hasXmlEntityInMetadata": "Has XML entity in metadata",
+  "admin.reports.items.preset.hasXmlEntityInMetadata": "A des entités XML dans les métadonnées",
+
+  //"admin.reports.items.preset.hasNonAsciiCharInMetadata": "Has non-ASCII character in metadata",
+  "admin.reports.items.preset.hasNonAsciiCharInMetadata": "A des caractères non ASCII dans les métadonnées",
+
+  //"admin.reports.items.number": "No.",
+  "admin.reports.items.number": "Nº",
+
+  //"admin.reports.items.id": "UUID",
+  "admin.reports.items.id": "UUID",
+
+  //"admin.reports.items.collection": "Collection",
+  "admin.reports.items.collection": "Collection",
+
+  //"admin.reports.items.handle": "URI",
+  "admin.reports.items.handle": "URI",
+
+  //"admin.reports.items.title": "Title",
+  "admin.reports.items.title": "Titre",
+
+
+  //"admin.reports.commons.filters": "Filters",
+  "admin.reports.commons.filters": "Filtres",
+
+  //"admin.reports.commons.additional-data": "Additional data to return",
+  "admin.reports.commons.additional-data": "Données additionnelles",
+
+  //"admin.reports.commons.previous-page": "Prev Page",
+  "admin.reports.commons.previous-page": "Page précédente",
+
+  //"admin.reports.commons.next-page": "Next Page",
+  "admin.reports.commons.next-page": "Page suivante",
+
+  //"admin.reports.commons.page": "Page",
+  "admin.reports.commons.page": "Page",
+
+  //"admin.reports.commons.of": "of",
+  "admin.reports.commons.of": "de",
+
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  "admin.reports.commons.export": "Exporter les métadonnées",
+
+  //"admin.reports.commons.filters.deselect_all": "Deselect all filters",
+  "admin.reports.commons.filters.deselect_all": "Désélectionner tous les filtres",
+
+  //"admin.reports.commons.filters.select_all": "Select all filters",
+  "admin.reports.commons.filters.select_all": "Sélectionner tous les filtres",
+
+  //"admin.reports.commons.filters.matches_all": "Matches all specified filters",
+  "admin.reports.commons.filters.matches_all": "Tous les filtres spécifiés",
+
+
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  "admin.reports.commons.filters.property": "Filtres de propriétés d'éléments",
+
+  //"admin.reports.commons.filters.property.is_item": "Is Item - always true",
+  "admin.reports.commons.filters.property.is_item": "Est un élément - toujours vrai",
+
+  //"admin.reports.commons.filters.property.is_withdrawn": "Withdrawn Items",
+  "admin.reports.commons.filters.property.is_withdrawn": "Éléments retirés",
+
+  //"admin.reports.commons.filters.property.is_not_withdrawn": "Available Items - Not Withdrawn",
+  "admin.reports.commons.filters.property.is_not_withdrawn": "Éléments disponibles - Non retirés",
+
+  //"admin.reports.commons.filters.property.is_discoverable": "Discoverable Items - Not Private",
+  "admin.reports.commons.filters.property.is_discoverable": "Éléments découvrables - Non privés",
+
+  //"admin.reports.commons.filters.property.is_not_discoverable": "Not Discoverable - Private Item",
+  "admin.reports.commons.filters.property.is_not_discoverable": "Éléments non découvrables - Privés",
+
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  "admin.reports.commons.filters.bitstream": "Filtres Bitstream de base",
+
+  //"admin.reports.commons.filters.bitstream.has_multiple_originals": "Item has Multiple Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_multiple_originals": "L'élément a plusieurs Bitstreams originaux",
+
+  //"admin.reports.commons.filters.bitstream.has_no_originals": "Item has No Original Bitstreams",
+  "admin.reports.commons.filters.bitstream.has_no_originals": "L'élément n'a pas de Bitstreams originaux",
+
+  //"admin.reports.commons.filters.bitstream.has_one_original": "Item has One Original Bitstream",
+  "admin.reports.commons.filters.bitstream.has_one_original": "L'élément a un seul Bitstream original",
+
+  //"admin.reports.commons.filters.bitstream_mime": "Bitstream Filters by MIME Type",
+  "admin.reports.commons.filters.bitstream_mime": "Filtres Bitstream par type MIME",
+
+  //"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_doc_original": "L'élément a un Bitstream original de type document (PDF, Office, Text, HTML, XML, etc.)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_image_original": "Item has an Image Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_image_original": "L'élément a un Bitstream original de type image",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "Has Other Bitstream Types (not Doc or Image)",
+  "admin.reports.commons.filters.bitstream_mime.has_unsupp_type": "L'élément a d'autres types de Bitstream (ni document ni image)",
+
+  //"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_mixed_original": "L'élément a des Bitstreams originaux de types multiples (document, image, autres)",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_pdf_original": "Item has a PDF Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_pdf_original": "L'élément a un Bitstream original PDF",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_jpg_original": "Item has JPG Original Bitstream",
+  "admin.reports.commons.filters.bitstream_mime.has_jpg_original": "L'élément a un Bitstream original JPG",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_small_pdf": "Has unusually small PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_small_pdf": "L'élément a un PDF anormalement petit",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_large_pdf": "Has unusually large PDF",
+  "admin.reports.commons.filters.bitstream_mime.has_large_pdf": "L'élément a un PDF anormalement grand",
+
+  //"admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "Has document bitstream without TEXT item",
+  "admin.reports.commons.filters.bitstream_mime.has_doc_without_text": "L'élément a un Bitstream sans élément TEXT",
+
+  //"admin.reports.commons.filters.mime": "Supported MIME Type Filters",
+  "admin.reports.commons.filters.mime": "Filtres de types MIME pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_image_type": "Item Image Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_image_type": "L'élément a des Bitstreams image pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_image_type": "Item has Image Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_image_type": "L'élément a des Bitstreams image non pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_only_supp_doc_type": "Item Document Bitstreams are Supported",
+  "admin.reports.commons.filters.mime.has_only_supp_doc_type": "Les Bitstreams document de l'élément sont pris en charge",
+
+  //"admin.reports.commons.filters.mime.has_unsupp_doc_type": "Item has Document Bitstream that is Unsupported",
+  "admin.reports.commons.filters.mime.has_unsupp_doc_type": "L'élément a des Bitstreams document non pris en charge",
+
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  "admin.reports.commons.filters.bundle": "Filtres de Bitstreams de type Bundle",
+
+  //"admin.reports.commons.filters.bundle.has_unsupported_bundle": "Has bitstream in an unsupported bundle",
+  "admin.reports.commons.filters.bundle.has_unsupported_bundle": "L'élément a un Bitstream dans un Bundle non pris en charge",
+
+  //"admin.reports.commons.filters.bundle.has_small_thumbnail": "Has unusually small thumbnail",
+  "admin.reports.commons.filters.bundle.has_small_thumbnail": "L'élément a une vignette anormalement petite",
+
+  //"admin.reports.commons.filters.bundle.has_original_without_thumbnail": "Has original bitstream without thumbnail",
+  "admin.reports.commons.filters.bundle.has_original_without_thumbnail": "L'élément a un Bitstream original sans vignette",
+
+  //"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_invalid_thumbnail_name": "L'élément a une vignette ayant un nom invalide (une vignette par original)",
+
+  //"admin.reports.commons.filters.bundle.has_non_generated_thumb": "Has non-generated thumbnail",
+  "admin.reports.commons.filters.bundle.has_non_generated_thumb": "L'élément a une vignette non générée",
+
+  //"admin.reports.commons.filters.bundle.no_license": "Doesn't have a license",
+  "admin.reports.commons.filters.bundle.no_license": "L'élément n'a pas de licence",
+
+  //"admin.reports.commons.filters.bundle.has_license_documentation": "Has documentation in the license bundle",
+  "admin.reports.commons.filters.bundle.has_license_documentation": "L'élément a de la documentation dans le Bundle de licence",
+
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  "admin.reports.commons.filters.permission": "Filtres de permissions",
+  //"admin.reports.commons.filters.permission.has_restricted_original": "Item has Restricted Original Bitstream",
+  "admin.reports.commons.filters.permission.has_restricted_original": "L'élément a un Bitstream original à accès restreint",
+  //"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_original.tooltip": "L'élément a au moins un Bitstream original non accessible aux utilisateurs anonymes",
+  //"admin.reports.commons.filters.permission.has_restricted_thumbnail": "Item has Restricted Thumbnail",
+  "admin.reports.commons.filters.permission.has_restricted_thumbnail": "L'élément a une vignette à accès restreint",
+  //"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_thumbnail.tooltip": "L'élément a au moins une vignette non accessible aux utilisateurs anonymes",
+  //"admin.reports.commons.filters.permission.has_restricted_metadata": "Item has Restricted Metadata",
+  "admin.reports.commons.filters.permission.has_restricted_metadata": "L'élément a des métadonnées à accès restreint",
+  //"admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+  "admin.reports.commons.filters.permission.has_restricted_metadata.tooltip": "L'élément a des métadonnées non accessibles aux utilisateurs anonymes",
+
   // "admin.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Recherche Administrateur",
 
@@ -899,13 +1200,13 @@
 
   // "bitstream-request-a-copy.header": "Request a copy of the file",
   "bitstream-request-a-copy.header": "Demander une copie du fichier",
-  
-   // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
   "bitstream-request-a-copy.intro": "Entrer les informations suivantes pour demander une copie de l'élément suivant : ",
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
   "bitstream-request-a-copy.intro.bitstream.one": "Demander les fichiers suivants : ",
-  
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
   "bitstream-request-a-copy.intro.bitstream.all": "Demander tous les fichiers",
 
@@ -948,6 +1249,9 @@
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
   "bitstream-request-a-copy.submit.error": "Un problème est survenu lors de la soumission de la demande d'Item",
 
+  //"browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Tous les résultats",
+
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Auteur",
 
@@ -1006,7 +1310,7 @@
   "browse.startsWith.choose_year.label": "Choisir l'année de publication",
 
   // "browse.startsWith.jump": "Jump to a point in the index:",
-  "browse.startsWith.jump": "Aller directement à une entrée de l'index :",
+  "browse.startsWith.jump": "Aller directement à une entrée de l'index:",
 
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Avril",
@@ -1054,10 +1358,10 @@
   "browse.startsWith.submit": "Valider",
 
   // "browse.startsWith.type_date": "Or type in a date (year-month) and click 'Browse'",
-  "browse.startsWith.type_date": "Ou saisir une date (année-mois) puis cliquer sur « Parcourir par »",
+  "browse.startsWith.type_date": "Ou saisir une date (année-mois) puis cliquer sur « Parcourir par »",
 
   // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
-  "browse.startsWith.type_date.label": "Ou saisir une date (année-mois) puis cliquer sur le bouton « Parcourir »",
+  "browse.startsWith.type_date.label": "Ou saisir une date (année-mois) puis cliquer sur le bouton « Parcourir »",
 
   // "browse.startsWith.type_text": "Type the first few letters and click on the Browse button",
   "browse.startsWith.type_text": "Ou saisir les premières lettres puis cliquer sur le bouton « Parcourir »",
@@ -1065,9 +1369,18 @@
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
 
+  //"browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Parcourir la collection {{ collection }} par {{ field }} {{ value }}",
+
+  //"search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Retour aux résultats",
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Supprimer fragment",
 
+  //"claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Approuvé",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Créer une collection",
 
@@ -1120,7 +1433,7 @@
   "collection.edit.item-mapper.cancel": "Annuler",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-  "collection.edit.item-mapper.collection": "Collection : « <b>{{name}}</b> »",
+  "collection.edit.item-mapper.collection": "Collection: « <b>{{name}}</b> »",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Associer les Items sélectionnés",
@@ -1215,17 +1528,17 @@
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   "collection.edit.tabs.authorizations.title": "Édition de collection - Autorisations",
 
-   //"collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  //"collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
   "collection.edit.item.authorizations.load-bundle-button": "Charger plus de Bundles",
-  
+
   //"collection.edit.item.authorizations.load-more-button": "Load more",
   "collection.edit.item.authorizations.load-more-button": "Charger plus",
-  
+
   //"collection.edit.item.authorizations.show-bitstreams-button": "Show bitstream policies for bundle",
   "collection.edit.item.authorizations.show-bitstreams-button": "Afficher les politiques de Bitstream pour le Bundle",
 
-  
-  
+
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Éditer les Métadonnées",
 
@@ -1387,70 +1700,70 @@
 
   // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Paramétrage du moissonnage",
-  
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
   "collection.source.controls.test.submit.error": "Un problème est survenu lors du lancement du test des paramètres.",
-  
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
   "collection.source.controls.test.failed": "Le script pour tester les paramètres a échoué",
-  
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "Le script pour tester les paramètres s'est terminé avec succès",
-  
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Test de configuration",
-  
+
   // "collection.source.controls.test.running": "Testing configuration...",
   "collection.source.controls.test.running": "Test de la configuration lancé...",
-  
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "L'importation a été lancée avec succès",
-  
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Un problème est survenu lors du lancement de l'importation",
 
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Lancer l'importation",
-  
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "Importation lancée...",
-  
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
   "collection.source.controls.import.failed": "Un problème est survenu lors de l'importation",
-  
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "Importation complétée",
-  
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
   "collection.source.controls.reset.submit.success": "La réinitialisation et la réimportation ont été lancées avec succès.",
-  
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "Un problème est survenu lors du lancement de la réinitialisation et de la réimportation. ",
-  
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "Une erreur s'est produite pendant la réinitialisation et la réimportation.",
-  
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
   "collection.source.controls.reset.completed": "La réinitialisation et la réimportation sont terminées",
-  
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
   "collection.source.controls.reset.submit": "Réinitialisation et réimportation",
-  
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Réinitialisation et réimportation...",
-  
+
   // "collection.source.controls.harvest.status": "Harvest status:",
   "collection.source.controls.harvest.status": "État du moissonnage",
-  
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Heure de début du moissonnage :",
-  
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   "collection.source.controls.harvest.last": "Dernier moissonnage en date du :",
-  
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Détails du moissonnage :",
-  
+
   // "collection.source.controls.harvest.no-information": "N/A",
   "collection.source.controls.harvest.no-information": "Non disponible",
 
@@ -1715,6 +2028,9 @@
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Refuser",
 
+  //"cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Accepter",
+
   // "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": "Vos données personnelles sont récupérées et utilisées dans les contextes suivants : <strong>authentification, préférences, consentement et statistiques</strong>. <br/> Pour plus d'informations, veuillez vous référer à la {privacyPolicy}.",
 
@@ -1764,7 +2080,7 @@
   "cookies.consent.purpose.statistical": "Statistique",
 
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Vérification des liens dans les métadonnées",
+  "curation-task.task.checklinks.label": "Vérification des liens dans les métadonnées",
 
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
@@ -1880,6 +2196,9 @@
   // "dso-selector.set-scope.community.button": "Search all of DSpace",
   "dso-selector.set-scope.community.button": "Chercher dans toutes les collections",
 
+  //"dso-selector.set-scope.community.or-divider": "or",
+  "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": "Chercher une communauté ou une collection",
 
@@ -1953,7 +2272,7 @@
   "error.sub-communities": "Erreur lors de la récupération des sous-communautés",
 
   // "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": "Une erreur s'est produite dans la section d'initialisation, veuillez vérifier la configuration de votre formulaire de dépôt. Plus de détails sont disponibles ci-dessous : <br> <br>",
+  "error.submission.sections.init-form-error": "Une erreur s'est produite dans la section d'initialisation, veuillez vérifier la configuration de votre formulaire de dépôt. Plus de détails sont disponibles ci-dessous: <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Erreur lors de la récupération des communautés de 1er niveau",
@@ -1998,7 +2317,7 @@
   "footer.link.privacy-policy": "Politique de protection de la vie privée",
 
   // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"Licence de l'utilisateur final",
+  "footer.link.end-user-agreement": "Licence de l'utilisateur final",
 
   // "footer.link.feedback":"Send Feedback",
   "footer.link.feedback": "Envoyer un commentaire",
@@ -2141,9 +2460,6 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Aucune valeur entrée",
 
-  // "form.other-information": {},
-  "form.other-information": {},
-
   // "form.remove": "Remove",
   "form.remove": "Supprimer",
 
@@ -2313,8 +2629,8 @@
   "info.feedback.error.message.required": "Un contenu est requis",
 
   // "info.feedback.page-label": "Page",
- "info.feedback.page-label": "Page",
- 
+  "info.feedback.page-label": "Page",
+
   // "info.feedback.page_help": "The page related to your feedback",
   "info.feedback.page_help": "La page relative à vos commentaires",
 
@@ -2345,7 +2661,7 @@
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Créer un Bundle",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Il n'existe pas, au niveau de cet Item, de Bundle dans lequel un Bitstream pourrait être téléchargé.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -2466,7 +2782,7 @@
   "item.edit.delete.confirm": "Supprimer",
 
   // "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": "Êtes-vous certain(e) de vouloir complètement supprimer cet Item ? Attention, il n'y aura pas de retour en arrière possible.",
+  "item.edit.delete.description": "Êtes-vous certain(e) de vouloir complètement supprimer cet Item? Attention, il n'y aura pas de retour en arrière possible.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Une erreur s'est produite lors de la suppression de l'Item",
@@ -2492,6 +2808,71 @@
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Édition d'Item - Association de collection",
 
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Inconnu",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "En attente d'inscription",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "En attente de réservation",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Inscrit",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Réservé",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Réservé (en attente)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Inscrit (en attente)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "En attente pour la mise à jour et l'inscription",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "En attente pour la suppression",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Supprimé",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "En attente (non inscrit)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Émis (non inscrit)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Inscrire un nouveau DOI ou un DOI en attente",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Inscrire le DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Inscrire un nouveau DOI ou un DOI en attente",
+
+  // "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": "Réviser les identifiants en attente et les métadonnées ci-dessous puis cliquer sur Confirmer afin de lancer l'inscription du DOI ou sur Annuler pour interrompre l'inscription",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Confirmer",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Annuler",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI mis en attente pour l'inscription.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Erreur lors de l'inscription du 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": "Le DOI suivant a déjà été généré et sera mis en attente pour être inscrit",
+
+
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Associer l'Item aux collections sélectionnées",
 
@@ -2670,7 +3051,7 @@
   "item.edit.private.confirm": "Définir comme privé",
 
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
-  "item.edit.private.description": "Êtes-vous certain(e) de vouloir définir cet Item comme privé ?",
+  "item.edit.private.description": "Êtes-vous certain(e) de vouloir définir cet Item comme privé?",
 
   // "item.edit.private.error": "An error occurred while making the item private",
   "item.edit.private.error": "Une erreur s'est produite lors de la privatisation de l'Item",
@@ -2688,7 +3069,7 @@
   "item.edit.public.confirm": "Définir comme public",
 
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
-  "item.edit.public.description": "Êtes-vous certain(e) de vouloir définir cet Item comme public ?",
+  "item.edit.public.description": "Êtes-vous certain(e) de vouloir définir cet Item comme public?",
 
   // "item.edit.public.error": "An error occurred while making the item public",
   "item.edit.public.error": "Une erreur s'est produite lors de la définition de l'Item en tant qu'Item public",
@@ -2706,7 +3087,7 @@
   "item.edit.reinstate.confirm": "Réintégrer",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  "item.edit.reinstate.description": "Êtes-vous certain(e) de vouloir réintégrer cet Item ?",
+  "item.edit.reinstate.description": "Êtes-vous certain(e) de vouloir réintégrer cet Item?",
 
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Une erreur s'est produite lors de la réintégration de l'Item",
@@ -2807,8 +3188,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gérer les collections associées",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Déplacer...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Déplacer cet élément vers une autre collection",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Déplacer l'Item dans une autre collection",
@@ -2834,8 +3215,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Vous n'êtes pas autorisé à effectuer cette action",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirer...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirer cet article",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirer l'Item du dépôt",
@@ -2883,7 +3264,7 @@
   "item.edit.withdraw.confirm": "Retirer",
 
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
-  "item.edit.withdraw.description": "Êtes-vous certain que cet Item doit être retiré du dépôt ?",
+  "item.edit.withdraw.description": "Êtes-vous certain que cet Item doit être retiré du dépôt?",
 
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Une erreur s'est produite lors du retrait de l'Item",
@@ -2920,13 +3301,13 @@
 
   // "item.search.title": "Item Search",
   "item.search.title": "Recherche d'Items",
-  
+
   // "item.truncatable-part.show-more": "Show more",
   "item.truncatable-part.show-more": "Voir plus",
 
   //"item.truncatable-part.show-less": "Collapse",
   "item.truncatable-part.show-less": "Réduire",
-  
+
 
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Résumé",
@@ -2956,19 +3337,19 @@
   "item.page.files": "Fichiers",
 
   // "item.page.filesection.description": "Description:",
-  "item.page.filesection.description": "Description :",
+  "item.page.filesection.description": "Description:",
 
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Télécharger",
 
   // "item.page.filesection.format": "Format:",
-  "item.page.filesection.format": "Format :",
+  "item.page.filesection.format": "Format:",
 
   // "item.page.filesection.name": "Name:",
-  "item.page.filesection.name": "Nom :",
+  "item.page.filesection.name": "Nom:",
 
   // "item.page.filesection.size": "Size:",
-  "item.page.filesection.size": "Taille :",
+  "item.page.filesection.size": "Taille:",
 
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Articles dans cette revue",
@@ -3015,7 +3396,7 @@
   // "item.page.filesection.original.bundle": "Original bundle",
   "item.page.filesection.original.bundle": "Bundle original",
 
- // "item.page.filesection.license.bundle": "License bundle",
+  // "item.page.filesection.license.bundle": "License bundle",
   "item.page.filesection.license.bundle": "Bundle de license",
 
   // "item.page.return": "Back",
@@ -3188,7 +3569,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": "Une nouvelle version ne peut pas être créée parce qu'il y a une soumission en cours dans l'historique des versions.",
 
@@ -3241,7 +3622,7 @@
   "journal.page.publisher": "Éditeur",
 
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Revue : ",
+  "journal.page.titleprefix": "Revue: ",
 
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Résultats de recherche de revues",
@@ -3274,7 +3655,7 @@
   "journalissue.page.number": "Nombre",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Numéro de revue : ",
+  "journalissue.page.titleprefix": "Numéro de revue: ",
 
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Volume de la revue",
@@ -3289,7 +3670,7 @@
   "journalvolume.page.issuedate": "Date de publication",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volume de la revue : ",
+  "journalvolume.page.titleprefix": "Volume de la revue: ",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volume",
@@ -3385,13 +3766,13 @@
   "login.form.email": "Adresse électronique",
 
   // "login.form.forgot-password": "Have you forgotten your password?",
-  "login.form.forgot-password": "Mot de passe oublié ?",
+  "login.form.forgot-password": "Mot de passe oublié?",
 
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Se connecter à DSpace",
 
   // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user": "Pas encore de compte ? Cliquer ici pour vous enregistrer.",
+  "login.form.new-user": "Pas encore de compte? Cliquer ici pour vous enregistrer.",
 
   // "login.form.or-divider": "or",
   "login.form.or-divider": "ou",
@@ -3444,6 +3825,15 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Utilisateurs",
 
+  //"menu.section.reports": "Reports",
+  "menu.section.reports": "Rapports",
+
+  //"menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Collections filtrées",
+
+  //"menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Requête de métadonnées",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Recherche Administrateur",
 
@@ -3510,9 +3900,15 @@
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Métadonnées",
 
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Exporter en lot (ZIP)",
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Section du menu relative au contrôle d'accès",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  "menu.section.icon.reports": "Section du menu d'accès aux rapports",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Section du menu relative à la recherche Administrateur",
 
@@ -3590,7 +3986,7 @@
 
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Processus",
-  
+
   // "menu.section.health": "Health",
   "menu.section.health": "Santé du système",
 
@@ -3612,6 +4008,9 @@
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Ouvrir/Fermer section Contrôle d'accès",
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  "menu.section.toggle.reports": "Ouvrir/Fermer section Rapports",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Ouvrir/Fermer section Panneau de configuration",
 
@@ -3732,20 +4131,23 @@
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Vos dépôts",
 
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Archivés",
+  //"mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Items supervisés",
 
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "En cours de validation",
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archivés",
 
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "En attente d'assignation",
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "En cours de validation",
 
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "En traitement",
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "En attente d'assignation",
 
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Dépôts en cours",
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "En traitement",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Dépôts en cours",
 
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "Mon compte DSpace",
@@ -3798,9 +4200,12 @@
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Retour à votre propre EPerson",
 
+  //"nav.subscriptions" : "Subscriptions",
+  "nav.subscriptions": "Abonnements",
+
   // "nav.toggle": "Toggle navigation",
   "nav.toggle": "Basculer la navigation",
-  
+
   // "nav.user.description": "User profile bar",
   "nav.user.description": "Barre de profil utilisateur",
 
@@ -3829,7 +4234,7 @@
   "orgunit.page.id": "ID",
 
   // "orgunit.page.titleprefix": "Organizational Unit: ",
-  "orgunit.page.titleprefix": "Structure Organisationnelle : ",
+  "orgunit.page.titleprefix": "Structure Organisationnelle: ",
 
   // "pagination.options.description": "Pagination options",
   "pagination.options.description": "Options de pagination",
@@ -3950,13 +4355,13 @@
 
   // "process.detail.arguments.empty": "This process doesn't contain any arguments",
   "process.detail.arguments.empty": "Ce processus ne contient pas d'arguments",
-  
+
   // "process.detail.back": "Back",
   "process.detail.back": "Retour",
-  
+
   // "process.detail.output": "Process Output",
   "process.detail.output": "Sortie du processus",
-  
+
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Récupérer la sortie du processus",
 
@@ -3968,46 +4373,46 @@
 
   // "process.detail.output-files": "Output Files",
   "process.detail.output-files": "Fichiers de sortie",
-  
+
   // "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.script": "Script",
   "process.detail.script": "Script",
-  
+
   // "process.detail.title": "Process: {{ id }} - {{ name }}",
   "process.detail.title": "Processus : {{ id }} - {{ name }}",
-  
+
   // "process.detail.start-time": "Start time",
   "process.detail.start-time": "Début",
-  
+
   // "process.detail.end-time": "Finish time",
   "process.detail.end-time": "Fin",
-  
+
   // "process.detail.status": "Status",
   "process.detail.status": "Statut",
-  
+
   // "process.detail.create": "Create similar process",
   "process.detail.create": "Créer un processus similaire",
 
   // "process.overview.table.finish": "Finish time (UTC)",
   "process.overview.table.finish": "Heure de fin (TUC)",
-  
+
   // "process.overview.table.id": "Process ID",
   "process.overview.table.id": "ID du processus",
-  
+
   // "process.overview.table.name": "Name",
   "process.overview.table.name": "Nom",
 
   // "process.overview.table.start": "Start time (UTC)",
   "process.overview.table.start": "Heure de début (TUC)",
-  
+
   // "process.overview.table.status": "Status",
   "process.overview.table.status": "Statut",
-  
+
   // "process.overview.table.user": "User",
   "process.overview.table.user": "Utilisateur",
-  
+
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Sommaire des processus",
 
@@ -4017,6 +4422,32 @@
   // "process.overview.new": "New",
   "process.overview.new": "Nouveau",
 
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Actions",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Supprimer {{count}} processus",
+
+  // "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}} processus sont en train d'être supprimés. Patientez jusqu'à ce que la suppression soit terminée. Notez que cela peut prendre un certain temps.",
+
+  // "process.overview.delete.body": "Are you sure you want to delete {{count}} process(es)?",
+  "process.overview.delete.body": "Êtes-vous certain-e de vouloir supprimer {{count}} processus?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Supprimer les processus",
+
+  // "process.bulk.delete.error.head": "Error on deleteing process",
+  "process.bulk.delete.error.head": "Erreur lors de la suppression de processus",
+
+  // "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": "Le processus numéro {{processId}} n'a pu être supprimé. Les processus restants continueront à être supprimés. ",
+
+  // "process.bulk.delete.success": "{{count}} process(es) have been succesfully deleted",
+  "process.bulk.delete.success": "{{count}} processus ont été supprimés.",
+
+
+
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Mise à jour profil",
 
@@ -4129,7 +4560,7 @@
   "project.page.status": "Statut",
 
   // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Projet de recherche : ",
+  "project.page.titleprefix": "Projet de recherche: ",
 
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Résultats de recherche de projets",
@@ -4153,7 +4584,7 @@
   "publication.page.publisher": "Éditeur",
 
   // "publication.page.titleprefix": "Publication: ",
-  "publication.page.titleprefix": "Publication : ",
+  "publication.page.titleprefix": "Publication: ",
 
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Titre du volume",
@@ -4187,7 +4618,7 @@
 
   // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "Prénom *",
-  
+
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
   "register-page.create-profile.identification.first-name.error": "Veuillez saisir un prénom",
 
@@ -4610,7 +5041,7 @@
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
   "search.filters.filter.creativeWorkPublisher.label": "Recherche d'un éditeur",
- 
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Date",
 
@@ -4810,22 +5241,22 @@
   "search.results.head": "Résultats de recherche",
 
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
-  "search.results.no-results": "Votre recherche n'a retourné aucun résultat. Vous n'arrivez pas à trouver ce que vous recherchez ? Essayez de mettre",
+  "search.results.no-results": "Votre recherche n'a retourné aucun résultat. Vous n'arrivez pas à trouver ce que vous recherchez? Essayez de mettre",
 
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "des guillemets avant et après les termes recherchés",
 
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "Votre recherche n'a retourné aucun résultat.",
-  
+
   // "search.results.view-result": "View",
   "search.results.view-result": "Afficher",
 
   // "default.search.results.head": "Search Results",
   "default.search.results.head": "Résultats de recherche",
-  
+
   // "default-relationships.search.results.head": "Search Results",
-   "default-relationships.search.results.head": "Résultats de recherche",
+  "default-relationships.search.results.head": "Résultats de recherche",
 
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Retour aux résultats",
@@ -4945,7 +5376,7 @@
   "submission.general.discard.confirm.cancel": "Annuler",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.general.discard.confirm.info": "L'annulation est irréversible, les données de la soumission en cours seront perdues. Êtes-vous certain(e) ?",
+  "submission.general.discard.confirm.info": "L'annulation est irréversible, les données de la soumission en cours seront perdues. Êtes-vous certain(e)?",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Oui, je suis certain(e)",
@@ -5019,6 +5450,36 @@
   // "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 (DOI)",
+
+  //"submission.import-external.source.datacite": "DataCite",
+  "submission.import-external.source.datacite": "DataCite (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": "Office Européen des brevets (OEB)",
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "En cours de chargement ...",
 
@@ -5040,6 +5501,9 @@
   // "submission.import-external.source.pubmed": "Pubmed",
   "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",
   "submission.import-external.source.lcname": "Autorités de noms de la Bibliothèque du Congrès",
 
@@ -5198,7 +5662,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Revues 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": "Projects locaux ({{ count }})",
 
@@ -5222,13 +5686,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": "Numéros de revue locaux ({{ 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": "Numéros de revue locaux ({{ 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 revues locaux ({{ 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 revues locaux ({{ count }})",
 
@@ -5237,7 +5701,7 @@
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Éditeurs SHERPA ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
 
@@ -5288,13 +5752,13 @@
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Numéros de revue",
-  
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Numéros de revue",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de revue",
-  
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de revue",
 
@@ -5306,7 +5770,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agence de financement",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projets",
 
@@ -5351,7 +5815,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volumes de revue sélectionnés",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projets sélectionnés",
 
@@ -5375,7 +5839,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Numéro sélectionné",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de revue sélectionné",
 
@@ -5384,7 +5848,7 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Financement sélectionné",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Numéro sélectionné",
 
@@ -5412,7 +5876,7 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Résultats de recherche",
 
-  // "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": "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": "Souhaitez-vous sauvegarder \"{{ value }}\" en tant que nom alternatif pour cette personne afin que vous ou un autre utilisateur puisse l'utiliser pour de futures soumissions ? Si vous ne le souhaitez pas, vous pouvez tout de même l'utiliser pour cette soumission.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -5485,7 +5949,7 @@
   "submission.sections.general.sections_not_valid": "Sections incomplètes.",
 
   // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
-  "submission.sections.submit.progressbar.accessCondition": "Autorisations d'accès à l'Item",  
+  "submission.sections.submit.progressbar.accessCondition": "Autorisations d'accès à l'Item",
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "Licence Creative Commons",
@@ -5545,7 +6009,7 @@
   "submission.sections.upload.delete.confirm.cancel": "Annuler",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.sections.upload.delete.confirm.info": "Cette opération est irréversible. Êtes-vous certain(e) ?",
+  "submission.sections.upload.delete.confirm.info": "Cette opération est irréversible. Êtes-vous certain(e)?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Oui, je suis certain(e)",
@@ -5605,12 +6069,12 @@
   "submission.sections.upload.form.until-placeholder": "Jusqu'au",
 
   // "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": "Les fichiers téléchargés dans la collection {{collectionName}} seront accessibles au(x) groupe(s) suivant(s) :",
+  "submission.sections.upload.header.policy.default.nolist": "Les fichiers téléchargés dans la collection {{collectionName}} seront accessibles au(x) groupe(s) suivant(s):",
 
   // "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": "Veuillez noter que, en complément des accès spécifiquement accordés pour le fichier, les fichiers téléchargés dans la collection {{collectionName}} seront accessibles par défaut au(x) groupe(s) suivant(s) :",
+  "submission.sections.upload.header.policy.default.withlist": "Veuillez noter que, en complément des accès spécifiquement accordés pour le fichier, les fichiers téléchargés dans la collection {{collectionName}} seront accessibles par défaut au(x) groupe(s) suivant(s):",
 
-  // "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": "Vous trouverez ici tous les fichiers actuellement associés à l'Item. Vous pouvez éditer les métadonnés et les niveaux d'accès de ce(s) fichier(s) ou <strong>télécharger des fichiers complémentaires simplement en les glissant n'importe où sur cette page</strong>",
 
   // "submission.sections.upload.no-entry": "No",
@@ -5676,6 +6140,95 @@
   // "submission.sections.accesses.form.until-placeholder": "Until",
   "submission.sections.accesses.form.until-placeholder": "Jusqu'au",
 
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "J'approuve la licence ci-dessus",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "Vous devez accepter la licence",
+
+  // "submission.sections.license.notgranted":  "You must accept the license",
+  "submission.sections.license.notgranted": "Vous devez accepter la licence",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Information sur la publication",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Titre",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "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": "Éditeur",
+
+  // "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": "Politique de l'éditeur",
+
+  // "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": "L'information ci-dessous provient de Sherpa Romeo. Elle vous permet de savoir quelle version vous êtes autorisé-e à déposer et si une restriction de diffusion (embargo) doit être appliquée. Si vous avez des questions, contactez votre administrateur-trice en utilisant le formulaire en pied de page.",
+
+  // "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": "Les voies de libre accès autorisées par la politique de cette revue sont listées ci-dessous par version d'article. Cliquez sur l'une des voies pour plus de détails.",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Pour plus d'information, cliquez sur le lien suivant :",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Version",
+
+  // "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": "Aucun embargo",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Aucun",
+
+  // "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": "Prérequis",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Lieu",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Rafraîchir",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Information",
+
+  // "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": "Date de création",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Dernière modification",
+
+  // "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": "Une erreur s'est produite lors de la recherche d'infomation dans Sherpa.",
+
+
   // "submission.submit.breadcrumbs": "New submission",
   "submission.submit.breadcrumbs": "Nouvelle soumission",
 
@@ -5760,6 +6313,12 @@
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Afficher le détail",
 
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Voir",
+
+  // "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.",
+
   // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Vignette d'image",
 
@@ -5836,8 +6395,15 @@
   // "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": "Sélectionner les Items pour lesquels vous souhaitez sauvegarder les métadonnées virtuelles en tant que métadonnées réelles",
 
+
+  //"supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Documents supervisés",
+
+  //"workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Vos dépôts",
+
   // "workspace.search.results.head": "Your submissions",
-  "workspace.search.results.head": "Vos soumissions",
+  "workspace.search.results.head": "Vos dépôts",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Workflow Administrateur",
@@ -5845,6 +6411,9 @@
   // "workflow.search.results.head": "Workflow tasks",
   "workflow.search.results.head": "Tableau de suivi",
 
+  //"supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Tableau de suivi et dépôts en cours",
+
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
   "workflow-item.edit.breadcrumbs": "Éditer l'Item du Workflow",
 
@@ -5902,6 +6471,12 @@
   // "workflow-item.view.breadcrumbs": "Workflow View",
   "workflow-item.view.breadcrumbs": "Vue d'ensemble du Workflow",
 
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Vue du tableau de suivi",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Vue du tableau de suivi",
+
   // "idle-modal.header": "Session will expire soon",
   "idle-modal.header": "La session expirera bientôt",
 
@@ -5911,7 +6486,83 @@
   // "idle-modal.log-out": "Log out",
   "idle-modal.log-out": "Déconnexion",
 
-  // "idle-modal.extend-session": "Extend session"
-  "idle-modal.extend-session": "Prolonger la session"
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Prolonger la session",
+
+
+
+  // "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",
+
+  //"system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Dans",
+
+  //  "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{days}} jour(s),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} heure(s) et",
+
+  // "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",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Messages d'avertissement",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Une erreur s'est produite lors de la récupération de la bannière du message d'avertissement",
+
+  //"system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Annuler",
+
+
+  //"system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Sauvegarder",
+
+  //"system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ACTIF",
+
+  //"system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INACTIF",
+
+  //"system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "Le message d'avertissement ne peut pas être vide",
+
+  //"system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Message d'avertissement",
+
+  //"system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Activer un compte à rebours",
+
+  //"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": "Lorsque cette option est activée, il est possible de fixer une date dans le futur et la bannière du message d'avertissement effectuera un compte à rebours jusqu'à la date fixée. À la fin du compte à rebours, le message d'avertissement disparaîtra mais le serveur ne sera pas arrêté automatiquement.",
+
+  //"system-wide-alert.form.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Aperçu du message d'avertissement",
+
+  //"system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "Le message d'avertissement a été mis à jour",
+
+  //"system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Un erreur s'est produite lors de la mise à jour du message d'avertissement",
+
+  //"system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "Le message d'avertissement a été crée",
+
+  //"system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Un erreur s'est produite lors de la création du message d'avertissement",
+
+  //"admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Messages d'avertissement",
+
+  //"admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Messages d'avertissement",
+
+
 }
 
diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5
index 09938fcf5d..4d0e77c086 100644
--- a/src/assets/i18n/gd.json5
+++ b/src/assets/i18n/gd.json5
@@ -1,10 +1,10 @@
 {
 
   // "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": "Chan eil cead agad airson na duilleig seo. Cleachd am putan gu h-ìosal airson tilleadh chun na duilleig-dachaigh.",
+  "401.help": "Chan eil cead agad airson na duilleig seo. Cleachd am putan gu h-ìosal airson tilleadh chun na duilleig-dachaigh.",
 
   // "401.link.home-page": "Take me to the home page",
-    "401.link.home-page": "Thoir mi chun na duilleig-dachaigh",
+  "401.link.home-page": "Thoir mi chun na duilleig-dachaigh",
 
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "toirmisgte",
@@ -15,7 +15,7 @@
   "403.help": "Chan eil cead agad airson na duilleig seo. Cleachd am putan gu h-ìosal airson tilleadh chun na duilleig-dachaigh.",
 
   // "403.link.home-page": "Take me to the home page",
-    "403.link.home-page": "Thoir mi chun na duilleig-dachaigh",
+  "403.link.home-page": "Thoir mi chun na duilleig-dachaigh",
 
   // "403.forbidden": "forbidden",
   "403.forbidden": "toirmisgte",
@@ -23,31 +23,31 @@
 
 
   // "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": "Cha lorg sinn an duilleag a tha thu a' sireadh. Math dh'fhaodte gun deach an duilleag a ghluasad no a dhubhadh às. Cleachd am putan gu h-ìosal airson tilleadh chun na duilleig-dachaigh. ",
+  "404.help": "Cha lorg sinn an duilleag a tha thu a' sireadh. Math dh'fhaodte gun deach an duilleag a ghluasad no a dhubhadh às. Cleachd am putan gu h-ìosal airson tilleadh chun na duilleig-dachaigh. ",
 
   // "404.link.home-page": "Take me to the home page",
-   "404.link.home-page": "Thoir mi chun na duilleig-dachaigh",
+  "404.link.home-page": "Thoir mi chun na duilleig-dachaigh",
 
   // "404.page-not-found": "page not found",
-   "404.page-not-found": "cha lorgar an duilleag",
+  "404.page-not-found": "cha lorgar an duilleag",
 
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-    "admin.curation-tasks.breadcrumbs": "Obair eagrachaidh air an t-siostam",
+  "admin.curation-tasks.breadcrumbs": "Obair eagrachaidh air an t-siostam",
 
   // "admin.curation-tasks.title": "System curation tasks",
-    "admin.curation-tasks.title": "Obair eagrachaidh air an t-siostam",
+  "admin.curation-tasks.title": "Obair eagrachaidh air an t-siostam",
 
   // "admin.curation-tasks.header": "System curation tasks",
-   "admin.curation-tasks.header": "Obair eagrachaidh air an t-siostam",
+  "admin.curation-tasks.header": "Obair eagrachaidh air an t-siostam",
 
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-   "admin.registries.bitstream-formats.breadcrumbs": "Clàr-lann fhòrmatan",
+  "admin.registries.bitstream-formats.breadcrumbs": "Clàr-lann fhòrmatan",
 
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-   "admin.registries.bitstream-formats.create.breadcrumbs": "Fòrmat bitstream",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Fòrmat bitstream",
 
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-    "admin.registries.bitstream-formats.create.failure.content": "Bha mearachd ann a' cruthachadh fòrmat ùr a' bhitstream.",
+  "admin.registries.bitstream-formats.create.failure.content": "Bha mearachd ann a' cruthachadh fòrmat ùr a' bhitstream.",
 
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Cha do dh'obraich sin",
@@ -56,46 +56,46 @@
   "admin.registries.bitstream-formats.create.head": "Cruthaich fòrmat Bitstream",
 
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
-   "admin.registries.bitstream-formats.create.new": "Cuir-ris fòrmat bitstream ùr",
+  "admin.registries.bitstream-formats.create.new": "Cuir-ris fòrmat bitstream ùr",
 
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
-   "admin.registries.bitstream-formats.create.success.content": "Chaidh fòrmat ùr a' bhitstream a chruthachadh.",
+  "admin.registries.bitstream-formats.create.success.content": "Chaidh fòrmat ùr a' bhitstream a chruthachadh.",
 
   // "admin.registries.bitstream-formats.create.success.head": "Success",
-   "admin.registries.bitstream-formats.create.success.head": "Dh'obraich sin",
+  "admin.registries.bitstream-formats.create.success.head": "Dh'obraich sin",
 
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
-   "admin.registries.bitstream-formats.delete.failure.amount": "Cha deach {{ amount }} fòrmat(an) a thoirt às",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Cha deach {{ amount }} fòrmat(an) a thoirt às",
 
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-    "admin.registries.bitstream-formats.delete.failure.head": "Cha do dh'obraich sin",
+  "admin.registries.bitstream-formats.delete.failure.head": "Cha do dh'obraich sin",
 
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
-   "admin.registries.bitstream-formats.delete.success.amount": "Chaidh {{ amount }} fòrmat(an) a thoirt às",
+  "admin.registries.bitstream-formats.delete.success.amount": "Chaidh {{ amount }} fòrmat(an) a thoirt às",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
-   "admin.registries.bitstream-formats.delete.success.head": "Dh'obraich sin",
+  "admin.registries.bitstream-formats.delete.success.head": "Dh'obraich sin",
 
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "San liosta seo de fhòrmatan bitstream tha fiosrachadh air fòrmatan aithnichte agus an ìre taic.",
 
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-    "admin.registries.bitstream-formats.edit.breadcrumbs": "Fòrmat bitstream",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Fòrmat bitstream",
 
   // "admin.registries.bitstream-formats.edit.description.hint": "",
-   "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
 
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
-    "admin.registries.bitstream-formats.edit.description.label": "Cunntas",
+  "admin.registries.bitstream-formats.edit.description.label": "Cunntas",
 
   // "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": "Tha leudachain nan leudachain faidhle a tha gan cleachdadh gus fòrmat fhaidhlichean luchdaichte suas aithneachadh. Is urrainn dhut grunn leudachan a chur ann airson gach fòrmat.",
 
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-   "admin.registries.bitstream-formats.edit.extensions.label": "Leudachain faidhle",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Leudachain faidhle",
 
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
-   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Cuir ann leudachan faidhle gun an dotag",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Cuir ann leudachan faidhle gun an dotag",
 
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.content": "Bha mearachd ann a' deasachadh fòrmat a' bhitstream.",
@@ -110,43 +110,43 @@
   "admin.registries.bitstream-formats.edit.internal.hint": "Tha fòrmatan a-staigh falaichte bhon neach-cleachdaidh, agus air an cleachdadh airson adhbharan rianachd.",
 
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-    "admin.registries.bitstream-formats.edit.internal.label": "A-staigh",
+  "admin.registries.bitstream-formats.edit.internal.label": "A-staigh",
 
   // "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": "Chan fheum an seòrsa MIME co-cheangailte ris an fhòrmat seo a bhith air leth.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Chan fheum an seòrsa MIME co-cheangailte ris an fhòrmat seo a bhith air leth.",
 
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-   "admin.registries.bitstream-formats.edit.mimetype.label": "Seòrsa MIME",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Seòrsa MIME",
 
   // "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": "Ainm air leth don fhòrmat seo, (me, Microsoft Word XP no Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Ainm air leth don fhòrmat seo, (me, Microsoft Word XP no Microsoft Word 2000)",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-    "admin.registries.bitstream-formats.edit.shortDescription.label": "Ainm",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Ainm",
 
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
-   "admin.registries.bitstream-formats.edit.success.content": "Chaidh fòrmat a' bhitstream a dheasachadh.",
+  "admin.registries.bitstream-formats.edit.success.content": "Chaidh fòrmat a' bhitstream a dheasachadh.",
 
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
-   "admin.registries.bitstream-formats.edit.success.head": "Dh'obraich sin",
+  "admin.registries.bitstream-formats.edit.success.head": "Dh'obraich sin",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "An ìre taic a tha do bhuidheann a' gealltainn airson an fhòrmat seo.",
 
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-   "admin.registries.bitstream-formats.edit.supportLevel.label": "Ìre taic",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Ìre taic",
 
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-   "admin.registries.bitstream-formats.head": "Clàr-lann Fhòrmatan Bitstream",
+  "admin.registries.bitstream-formats.head": "Clàr-lann Fhòrmatan Bitstream",
 
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
-   "admin.registries.bitstream-formats.no-items": "Chan eil fòrmatan bitstream ri shealltainn.",
+  "admin.registries.bitstream-formats.no-items": "Chan eil fòrmatan bitstream ri shealltainn.",
 
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Dubh às an taghadh",
 
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
-   "admin.registries.bitstream-formats.table.deselect-all": "Dì-thagh na h-uile",
+  "admin.registries.bitstream-formats.table.deselect-all": "Dì-thagh na h-uile",
 
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "a-staigh",
@@ -156,6 +156,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Ainm",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Air ais",
@@ -167,33 +169,33 @@
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Le taic",
 
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
-   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Neo-aithnichte",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Neo-aithnichte",
 
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-   "admin.registries.bitstream-formats.table.supportLevel.head": "Ìre taic",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Ìre taic",
 
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
-   "admin.registries.bitstream-formats.title": "Clàr-lann Fhòrmatan Bitstream",
+  "admin.registries.bitstream-formats.title": "Clàr-lann Fhòrmatan Bitstream",
 
 
 
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-    "admin.registries.metadata.breadcrumbs": "Clàr-lann metadata",
+  "admin.registries.metadata.breadcrumbs": "Clàr-lann metadata",
 
   // "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": "Ann an clàr-lann metadata tha liosta de na raointean metadata gu lèir a tha san ionad-tasgaidh. Gabhaidh na raointean a roinn am measg iomadh sgeama. Ach tha DSpace ag iarraidh sgeama barantaichte Dublin Core.",
+  "admin.registries.metadata.description": "Ann an clàr-lann metadata tha liosta de na raointean metadata gu lèir a tha san ionad-tasgaidh. Gabhaidh na raointean a roinn am measg iomadh sgeama. Ach tha DSpace ag iarraidh sgeama barantaichte Dublin Core.",
 
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "Cruthaich sgeama metadata",
 
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-   "admin.registries.metadata.form.edit": "Deasaich sgeama metadata",
+  "admin.registries.metadata.form.edit": "Deasaich sgeama metadata",
 
   // "admin.registries.metadata.form.name": "Name",
-   "admin.registries.metadata.form.name": "Ainm",
+  "admin.registries.metadata.form.name": "Ainm",
 
   // "admin.registries.metadata.form.namespace": "Namespace",
-   "admin.registries.metadata.form.namespace": "Ainm-spàs",
+  "admin.registries.metadata.form.namespace": "Ainm-spàs",
 
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Clàr-lann Metadata",
@@ -211,21 +213,21 @@
   "admin.registries.metadata.schemas.table.name": "Ainm",
 
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
-    "admin.registries.metadata.schemas.table.namespace": "Ainm-spàs",
+  "admin.registries.metadata.schemas.table.namespace": "Ainm-spàs",
 
   // "admin.registries.metadata.title": "Metadata Registry",
-    "admin.registries.metadata.title": "Clàr-lann Metadata",
+  "admin.registries.metadata.title": "Clàr-lann Metadata",
 
 
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-   "admin.registries.schema.breadcrumbs": "Sgeama Metadata",
+  "admin.registries.schema.breadcrumbs": "Sgeama Metadata",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Seo an sgeama metadata airson \"{{namespace}}\".",
 
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-   "admin.registries.schema.fields.head": "Raointean metadata sgeama ",
+  "admin.registries.schema.fields.head": "Raointean metadata sgeama ",
 
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Chan eil raointean metadata ri shealltainn.",
@@ -235,6 +237,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Raon",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota Leudachd",
@@ -252,10 +256,10 @@
   "admin.registries.schema.form.qualifier": "Càilichear",
 
   // "admin.registries.schema.form.scopenote": "Scope Note",
-   "admin.registries.schema.form.scopenote": "Nota Leudachd",
+  "admin.registries.schema.form.scopenote": "Nota Leudachd",
 
   // "admin.registries.schema.head": "Metadata Schema",
-   "admin.registries.schema.head": "Sgeama Metadata",
+  "admin.registries.schema.head": "Sgeama Metadata",
 
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "Chaidh sgeama metadata \"{{prefix}}\" a chruthachadh",
@@ -264,31 +268,31 @@
   "admin.registries.schema.notification.deleted.failure": "Cha deach {{amount}} sgeamaichean metadata a dhubhadh às",
 
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
-   "admin.registries.schema.notification.deleted.success": "Chaidh {{amount}} sgeamaichean metadata a dhubhadh às",
+  "admin.registries.schema.notification.deleted.success": "Chaidh {{amount}} sgeamaichean metadata a dhubhadh às",
 
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
-   "admin.registries.schema.notification.edited": "Chaidh sgeama metadata \"{{prefix}}\" a dheasachadh",
+  "admin.registries.schema.notification.edited": "Chaidh sgeama metadata \"{{prefix}}\" a dheasachadh",
 
   // "admin.registries.schema.notification.failure": "Error",
-    "admin.registries.schema.notification.failure": "Mearachd",
+  "admin.registries.schema.notification.failure": "Mearachd",
 
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
-   "admin.registries.schema.notification.field.created": "Chaidh raon metadata \"{{field}}\" a chruthachadh",
+  "admin.registries.schema.notification.field.created": "Chaidh raon metadata \"{{field}}\" a chruthachadh",
 
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
-    "admin.registries.schema.notification.field.deleted.failure": "Cha deach {{amount}} sgeamaichean metadata a dhubhadh às",
+  "admin.registries.schema.notification.field.deleted.failure": "Cha deach {{amount}} sgeamaichean metadata a dhubhadh às",
 
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
-   "admin.registries.schema.notification.field.deleted.success": "Chaidh {{amount}} raointean metadata a dhubhadh às",
+  "admin.registries.schema.notification.field.deleted.success": "Chaidh {{amount}} raointean metadata a dhubhadh às",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "Chaidh raon metadata \"{{field}}\" a dheasachadh",
 
   // "admin.registries.schema.notification.success": "Success",
-   "admin.registries.schema.notification.success": "Dh'obraich sin",
+  "admin.registries.schema.notification.success": "Dh'obraich sin",
 
   // "admin.registries.schema.return": "Back",
-   "admin.registries.schema.return": "Air ais",
+  "admin.registries.schema.return": "Air ais",
 
   // "admin.registries.schema.title": "Metadata Schema Registry",
   "admin.registries.schema.title": "Clàr-lann Sgeama Metadata",
@@ -299,16 +303,16 @@
   "admin.access-control.epeople.actions.delete": "Dubh às E-Neach",
 
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-   "admin.access-control.epeople.actions.impersonate": "Gabh riochd E-Neach",
+  "admin.access-control.epeople.actions.impersonate": "Gabh riochd E-Neach",
 
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Ath-sheat facal-faire",
 
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-   "admin.access-control.epeople.actions.stop-impersonating": "Sguir a ghabhail riochd E-Neach",
+  "admin.access-control.epeople.actions.stop-impersonating": "Sguir a ghabhail riochd E-Neach",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
-   "admin.access-control.epeople.breadcrumbs": "E-Dhaoine",
+  "admin.access-control.epeople.breadcrumbs": "E-Dhaoine",
 
   // "admin.access-control.epeople.title": "EPeople",
   "admin.access-control.epeople.title": "E-Dhaoine",
@@ -317,16 +321,16 @@
   "admin.access-control.epeople.head": "E-Dhaoine",
 
   // "admin.access-control.epeople.search.head": "Search",
-   "admin.access-control.epeople.search.head": "Rannsaich",
+  "admin.access-control.epeople.search.head": "Rannsaich",
 
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "Brobhs na h-Uile",
 
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
-   "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "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": "Post-d (ceart)",
+  "admin.access-control.epeople.search.scope.email": "Post-d (ceart)",
 
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Rannsaich",
@@ -335,7 +339,7 @@
   "admin.access-control.epeople.search.placeholder": "Rannsaich daoine...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
-   "admin.access-control.epeople.button.add": "Cuir-ris E-Neach",
+  "admin.access-control.epeople.button.add": "Cuir-ris E-Neach",
 
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "ID",
@@ -353,7 +357,7 @@
   "admin.access-control.epeople.table.edit.buttons.edit": "Deasaich \"{{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": "Chan eil cead agad am buidheann seo a dheasachadh",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Chan eil cead agad am buidheann seo a dheasachadh",
 
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Dubh às \"{{name}}\"",
@@ -365,7 +369,7 @@
   "admin.access-control.epeople.form.create": "Cruthaich E-Neach",
 
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-   "admin.access-control.epeople.form.edit": "Deasaich E-Neach",
+  "admin.access-control.epeople.form.edit": "Deasaich E-Neach",
 
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "Ciad ainm",
@@ -377,10 +381,10 @@
   "admin.access-control.epeople.form.email": "Post-d",
 
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
-   "admin.access-control.epeople.form.emailHint": "Feum air seòladh post-d brìgheil",
+  "admin.access-control.epeople.form.emailHint": "Feum air seòladh post-d brìgheil",
 
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
-   "admin.access-control.epeople.form.canLogIn": "Faodar logadh a-steach",
+  "admin.access-control.epeople.form.canLogIn": "Faodar logadh a-steach",
 
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Teisteanas a dhìth",
@@ -389,22 +393,22 @@
   "admin.access-control.epeople.form.return": "Air ais",
 
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
-   "admin.access-control.epeople.form.notification.created.success": "Chaidh E-Neach \"{{name}}\" a chruthachadh",
+  "admin.access-control.epeople.form.notification.created.success": "Chaidh E-Neach \"{{name}}\" a chruthachadh",
 
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
-    "admin.access-control.epeople.form.notification.created.failure": "Cha deach E-Neach \"{{name}}\" a chruthachadh",
+  "admin.access-control.epeople.form.notification.created.failure": "Cha deach E-Neach \"{{name}}\" a chruthachadh",
 
   // "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": "Cha deach E-Neach \"{{name}}\" a chruthachadh; post-d \"{{email}}\"ga chleachdadh mu thràth.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Cha deach E-Neach \"{{name}}\" a chruthachadh; post-d \"{{email}}\"ga chleachdadh mu thràth.",
 
   // "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": "Cha do dh'obraich deasachadh air E-Neach \"{{name}}\"; post-d \"{{email}}\"ga chleachdadh mu thràth.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Cha do dh'obraich deasachadh air E-Neach \"{{name}}\"; post-d \"{{email}}\"ga chleachdadh mu thràth.",
 
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
-   "admin.access-control.epeople.form.notification.edited.success": "Chaidh E-Neach \"{{name}}\" a dheasachadh",
+  "admin.access-control.epeople.form.notification.edited.success": "Chaidh E-Neach \"{{name}}\" a dheasachadh",
 
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
-    "admin.access-control.epeople.form.notification.edited.failure": "Cha deach E-Neach \"{{name}}\" a dheasachadh",
+  "admin.access-control.epeople.form.notification.edited.failure": "Cha deach E-Neach \"{{name}}\" a dheasachadh",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "Chaidh E-Neach \"{{name}}\" a dhubhadh às",
@@ -413,28 +417,28 @@
   "admin.access-control.epeople.form.notification.deleted.failure": "Cha deach E-Neach \"{{name}}\" a dhubhadh às",
 
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
-   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Ball de na buidhnean seo:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Ball de na buidhnean seo:",
 
   // "admin.access-control.epeople.form.table.id": "ID",
-    "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "ID",
 
   // "admin.access-control.epeople.form.table.name": "Name",
-   "admin.access-control.epeople.form.table.name": "Ainm",
+  "admin.access-control.epeople.form.table.name": "Ainm",
 
   // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
   "admin.access-control.epeople.form.table.collectionOrCommunity": "Cruinneachadh/Coimhearsnachd",
 
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-    "admin.access-control.epeople.form.memberOfNoGroups": "Chan eil an E-Neach seo na bhall de bhuidheann sam bith",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Chan eil an E-Neach seo na bhall de bhuidheann sam bith",
 
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
-   "admin.access-control.epeople.form.goToGroups": "Cuir ri buidhnean",
+  "admin.access-control.epeople.form.goToGroups": "Cuir ri buidhnean",
 
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.failure": "Cha deach E-Neach \"{{name}}\" a dhubhadh às",
 
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-   "admin.access-control.epeople.notification.deleted.success": "Chaidh E-Neach \"{{name}}\" a dhubhadh às",
+  "admin.access-control.epeople.notification.deleted.success": "Chaidh E-Neach \"{{name}}\" a dhubhadh às",
 
 
 
@@ -448,25 +452,25 @@
   "admin.access-control.groups.singleGroup.breadcrumbs": "Deasaich Buidheann",
 
   // "admin.access-control.groups.title.singleGroup": "Edit Group",
-   "admin.access-control.groups.title.singleGroup": "Deasaich Buidheann",
+  "admin.access-control.groups.title.singleGroup": "Deasaich Buidheann",
 
   // "admin.access-control.groups.title.addGroup": "New Group",
   "admin.access-control.groups.title.addGroup": "Buidheann Ùr",
 
   // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
-   "admin.access-control.groups.addGroup.breadcrumbs": "Buidheann Ùr",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Buidheann Ùr",
 
   // "admin.access-control.groups.head": "Groups",
-    "admin.access-control.groups.head": "Buidhnean",
+  "admin.access-control.groups.head": "Buidhnean",
 
   // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "Cuir-ris buidheann",
 
   // "admin.access-control.groups.search.head": "Search groups",
-    "admin.access-control.groups.search.head": "Rannsaich buidhnean",
+  "admin.access-control.groups.search.head": "Rannsaich buidhnean",
 
   // "admin.access-control.groups.button.see-all": "Browse all",
-    "admin.access-control.groups.button.see-all": "Brobhs na h-uile",
+  "admin.access-control.groups.button.see-all": "Brobhs na h-uile",
 
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Rannsaich",
@@ -475,7 +479,7 @@
   "admin.access-control.groups.search.placeholder": "Rannsaich buidhnean...",
 
   // "admin.access-control.groups.table.id": "ID",
-    "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": "Ainm",
@@ -484,25 +488,25 @@
   "admin.access-control.groups.table.collectionOrCommunity": "Cruinneachadh/Coimhearsnachd",
 
   // "admin.access-control.groups.table.members": "Members",
-   "admin.access-control.groups.table.members": "Buill",
+  "admin.access-control.groups.table.members": "Buill",
 
   // "admin.access-control.groups.table.edit": "Edit",
-   "admin.access-control.groups.table.edit": "Deasaich",
+  "admin.access-control.groups.table.edit": "Deasaich",
 
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "Deasaich \"{{name}}\"",
 
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
-   "admin.access-control.groups.table.edit.buttons.remove": "Dubh às \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Dubh às \"{{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": "Cha lorgar buidhnean aig a bheil seo nan ainm no seo mar UUID",
 
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-   "admin.access-control.groups.notification.deleted.success": "Chaidh am buidheann \"{{name}}\" a dhubhadh às",
+  "admin.access-control.groups.notification.deleted.success": "Chaidh am buidheann \"{{name}}\" a dhubhadh às",
 
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-   "admin.access-control.groups.notification.deleted.failure.title": "Cha deach am buidheann \"{{name}}\" a dhubhadh às",
+  "admin.access-control.groups.notification.deleted.failure.title": "Cha deach am buidheann \"{{name}}\" a dhubhadh às",
 
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Adhbhar: \"{{cause}}\"",
@@ -525,13 +529,13 @@
   "admin.access-control.groups.form.groupName": "Ainm Buidhinn",
 
   // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
-   "admin.access-control.groups.form.groupCommunity": "Coimhearsnachd no Cruinneachadh",
+  "admin.access-control.groups.form.groupCommunity": "Coimhearsnachd no Cruinneachadh",
 
   // "admin.access-control.groups.form.groupDescription": "Description",
-   "admin.access-control.groups.form.groupDescription": "Cunntas",
+  "admin.access-control.groups.form.groupDescription": "Cunntas",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
-   "admin.access-control.groups.form.notification.created.success": "Chaidh Buidheann \"{{name}}\" a chruthachadh",
+  "admin.access-control.groups.form.notification.created.success": "Chaidh Buidheann \"{{name}}\" a chruthachadh",
 
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "Cha deach Buidheann \"{{name}}\" a chruthachadh",
@@ -540,13 +544,13 @@
   "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Cha deach Buidheann air a bheil \"{{name}}\" a chruthachadh. Dèan cinnteach nach eil an t-ainm ga chleachdadh mu thràth.",
 
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
-    "admin.access-control.groups.form.notification.edited.failure": "Cha deach Buidheann \"{{name}}\" a dheasachadh",
+  "admin.access-control.groups.form.notification.edited.failure": "Cha deach Buidheann \"{{name}}\" a dheasachadh",
 
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "An t-ainm \"{{name}}\"ga chleachdadh mu thràth!",
 
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
-   "admin.access-control.groups.form.notification.edited.success": "Chaidh Buidheann \"{{name}}\" a dheasachadh",
+  "admin.access-control.groups.form.notification.edited.success": "Chaidh Buidheann \"{{name}}\" a dheasachadh",
 
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Dubh às Buidheann",
@@ -555,7 +559,7 @@
   "admin.access-control.groups.form.delete-group.modal.header": "Dubh às Buidheann \"{{ dsoName }}\"",
 
   // "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": "A bheil thu cinnteach gu bheil thu airson Buidheann \"{{ dsoName }}\" a dhubhadh às",
+  "admin.access-control.groups.form.delete-group.modal.info": "A bheil thu cinnteach gu bheil thu airson Buidheann \"{{ dsoName }}\" a dhubhadh às",
 
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "Cansail",
@@ -567,7 +571,7 @@
   "admin.access-control.groups.form.notification.deleted.success": "Chaidh buidheann \"{{ name }}\" a dhubhadh às",
 
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
-   "admin.access-control.groups.form.notification.deleted.failure.title": "Cha deach buidheann \"{{ name }}\" a dhubhadh às",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Cha deach buidheann \"{{ name }}\" a dhubhadh às",
 
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "Adhbhar: \"{{ cause }}\"",
@@ -579,37 +583,37 @@
   "admin.access-control.groups.form.members-list.search.head": "Cuir-ris E-Dhaoine",
 
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-   "admin.access-control.groups.form.members-list.button.see-all": "Brobhs na h-Uile",
+  "admin.access-control.groups.form.members-list.button.see-all": "Brobhs na h-Uile",
 
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Buill An-dràsta",
 
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
-    "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "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.scope.email": "Post-d (ceart)",
 
   // "admin.access-control.groups.form.members-list.search.button": "Search",
-   "admin.access-control.groups.form.members-list.search.button": "Rannsaich",
+  "admin.access-control.groups.form.members-list.search.button": "Rannsaich",
 
   // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "ID",
 
   // "admin.access-control.groups.form.members-list.table.name": "Name",
-    "admin.access-control.groups.form.members-list.table.name": "Ainm",
+  "admin.access-control.groups.form.members-list.table.name": "Ainm",
 
   // "admin.access-control.groups.form.members-list.table.identity": "Identity",
-   "admin.access-control.groups.form.members-list.table.identity": "Dearbh-aithne",
+  "admin.access-control.groups.form.members-list.table.identity": "Dearbh-aithne",
 
   // "admin.access-control.groups.form.members-list.table.email": "Email",
-    "admin.access-control.groups.form.members-list.table.email": "Post-d",
+  "admin.access-control.groups.form.members-list.table.email": "Post-d",
 
   // "admin.access-control.groups.form.members-list.table.netid": "NetID",
   "admin.access-control.groups.form.members-list.table.netid": "ID-Lìn",
 
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-    "admin.access-control.groups.form.members-list.table.edit": "Thoir às / Cuir-ris",
+  "admin.access-control.groups.form.members-list.table.edit": "Thoir às / Cuir-ris",
 
   // "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": "Thoir às ball air a bheil an t-ainm \"{{name}}\"",
@@ -627,31 +631,31 @@
   "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Cha deach ball \"{{name}}\" a thoirt às",
 
   // "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": "Cuir-ris ball air a bheil an t-ainm \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Cuir-ris ball air a bheil an t-ainm \"{{name}}\"",
 
   // "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": "Chan eil buidheann beò ann an-dràsta; cuir a-steach ainm an toiseach.",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Chan eil buidheann beò ann an-dràsta; cuir a-steach ainm an toiseach.",
 
   // "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": "Chan eil buill sa bhuidheann fhathast; rannsaich agus cuir-ris.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Chan eil buill sa bhuidheann fhathast; rannsaich agus cuir-ris.",
 
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
-   "admin.access-control.groups.form.members-list.no-items": "Cha deach E-Dhaoine a lorg san rannsachadh ud",
+  "admin.access-control.groups.form.members-list.no-items": "Cha deach E-Dhaoine a lorg san rannsachadh ud",
 
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
-   "admin.access-control.groups.form.subgroups-list.notification.failure": "Chaidh rudeigin ceàrr: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Chaidh rudeigin ceàrr: \"{{cause}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Buidhnean",
 
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
-   "admin.access-control.groups.form.subgroups-list.search.head": "Cuir-ris Fo-bhuidheann",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Cuir-ris Fo-bhuidheann",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-    "admin.access-control.groups.form.subgroups-list.button.see-all": "Brobhs na h-Uile",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Brobhs na h-Uile",
 
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
-   "admin.access-control.groups.form.subgroups-list.headSubgroups": "Fo-bhuidhnean An-dràsta",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Fo-bhuidhnean An-dràsta",
 
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "Rannsaich",
@@ -666,7 +670,7 @@
   "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Cruinneachadh/Coimhearsnachd",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
-   "admin.access-control.groups.form.subgroups-list.table.edit": "Thoir às / Cuir-ris",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Thoir às / Cuir-ris",
 
   // "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": "Thoir às fo-bhuidheann air a bheil an t-ainm \"{{name}}\"",
@@ -681,81 +685,484 @@
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Chaidh am fo-bhuidheann \"{{name}}\" a chur-ris",
 
   // "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": "Cha deach am fo-bhuidheann \"{{name}}\" a chur-ris",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Cha deach am fo-bhuidheann \"{{name}}\" a chur-ris",
 
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-   "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Chaidh am fo-bhuidheann \"{{name}}\" a dhubhadh às",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Chaidh am fo-bhuidheann \"{{name}}\" a dhubhadh às",
 
   // "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": "Cha deach am fo-bhuidheann \"{{name}}\" a dhubhadh às",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Cha deach am fo-bhuidheann \"{{name}}\" a dhubhadh às",
 
   // "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": "Chan eil buidheann beò ann an-dràsta; cuir a-steach ainm an toiseach.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Chan eil buidheann beò ann an-dràsta; cuir a-steach ainm an toiseach.",
 
   // "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": "Seo am buidheann an-dràsta; cha ghabh a chur-ris.",
 
   // "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": "Cha deach buidhnean a lorg aig a bheil seo nan ainm no seo mar UUID",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Cha deach buidhnean a lorg aig a bheil seo nan ainm no seo mar 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": "Chan eil fo-bhuidhnean sa bhuidheann fhathast.",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Chan eil fo-bhuidhnean sa bhuidheann fhathast.",
 
   // "admin.access-control.groups.form.return": "Back",
-   "admin.access-control.groups.form.return": "Air ais",
+  "admin.access-control.groups.form.return": "Air ais",
 
 
 
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
-    "admin.search.breadcrumbs": "Rannsachadh Rianachd",
+  "admin.search.breadcrumbs": "Rannsachadh Rianachd",
 
   // "admin.search.collection.edit": "Edit",
-    "admin.search.collection.edit": "Deasaich",
+  "admin.search.collection.edit": "Deasaich",
 
   // "admin.search.community.edit": "Edit",
-    "admin.search.community.edit": "Deasaich",
+  "admin.search.community.edit": "Deasaich",
 
   // "admin.search.item.delete": "Delete",
-   "admin.search.item.delete": "Dubh às",
+  "admin.search.item.delete": "Dubh às",
 
   // "admin.search.item.edit": "Edit",
-    "admin.search.item.edit": "Deasaich",
+  "admin.search.item.edit": "Deasaich",
 
   // "admin.search.item.make-private": "Make Private",
-   "admin.search.item.make-private": "Dèan Prìobhaideach",
+  "admin.search.item.make-private": "Dèan Prìobhaideach",
 
   // "admin.search.item.make-public": "Make Public",
   "admin.search.item.make-public": "Dèan Poblach",
 
   // "admin.search.item.move": "Move",
-   "admin.search.item.move": "Gluais",
+  "admin.search.item.move": "Gluais",
 
   // "admin.search.item.reinstate": "Reinstate",
-   "admin.search.item.reinstate": "Cuir air ais ann",
+  "admin.search.item.reinstate": "Cuir air ais ann",
 
   // "admin.search.item.withdraw": "Withdraw",
-   "admin.search.item.withdraw": "Thoir air falbh",
+  "admin.search.item.withdraw": "Thoir air falbh",
 
   // "admin.search.title": "Administrative Search",
   "admin.search.title": "Rannsachadh Rianachd",
 
   // "administrativeView.search.results.head": "Administrative Search",
-   "administrativeView.search.results.head": "Rannsachadh Rianachd",
+  "administrativeView.search.results.head": "Rannsachadh Rianachd",
 
 
 
 
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-    "admin.workflow.breadcrumbs": "Rianaich Sruth-obrach",
+  "admin.workflow.breadcrumbs": "Rianaich Sruth-obrach",
 
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "Rianaich Sruth-obrach",
 
   // "admin.workflow.item.workflow": "Workflow",
-   "admin.workflow.item.workflow": "Sruth-obrach",
+  "admin.workflow.item.workflow": "Sruth-obrach",
 
   // "admin.workflow.item.delete": "Delete",
-   "admin.workflow.item.delete": "Dubh às",
+  "admin.workflow.item.delete": "Dubh às",
 
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Cuir air ais",
@@ -763,7 +1170,7 @@
 
 
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-   "admin.metadata-import.breadcrumbs": "Steach-ghluais Metadata",
+  "admin.metadata-import.breadcrumbs": "Steach-ghluais Metadata",
 
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Steach-ghluais Metadata",
@@ -772,16 +1179,16 @@
   "admin.metadata-import.page.header": "Steach-ghluais Metadata",
 
   // "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
+  // TODO New key - Add a translation
   "admin.metadata-import.page.help": "Is urrainn dhut faidhlichean CSV sa bheil baids obrachaidhean metadata air faidhlichean a leigeil às no a bhrobhsadh an seo",
 
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-   // TODO New key - Add a translation
-   "admin.metadata-import.page.dropMsg": "Leig às metadata CSV airson a steach-ghluasad",
+  // TODO New key - Add a translation
+  "admin.metadata-import.page.dropMsg": "Leig às metadata CSV airson a steach-ghluasad",
 
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   // TODO New key - Add a translation
-  "admin.metadata-import.page.dropMsgReplace": "Leig às airson a chur an àite metadata CSV agus a steach-ghluasad", 
+  "admin.metadata-import.page.dropMsgReplace": "Leig às airson a chur an àite metadata CSV agus a steach-ghluasad",
 
   // "admin.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Air Ais",
@@ -790,19 +1197,19 @@
   "admin.metadata-import.page.button.proceed": "Air adhart",
 
   // "admin.metadata-import.page.error.addFile": "Select file first!",
-   "admin.metadata-import.page.error.addFile": "Tagh faidhle an toiseach!",
+  "admin.metadata-import.page.error.addFile": "Tagh faidhle an toiseach!",
 
 
 
 
   // "auth.errors.invalid-user": "Invalid email address or password.",
-   "auth.errors.invalid-user": "Seòladh post-d no facal-faire neo-bhrìgheil.",
+  "auth.errors.invalid-user": "Seòladh post-d no facal-faire neo-bhrìgheil.",
 
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-   "auth.messages.expired": "Tha an seisean seachad. Log a-steach a-rithist.",
+  "auth.messages.expired": "Tha an seisean seachad. Log a-steach a-rithist.",
 
   // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
-   "auth.messages.token-refresh-failed": "Cha do dh'obraich an t-ùrachadh air an t-seisean. Log a-steach a-rithist.",
+  "auth.messages.token-refresh-failed": "Cha do dh'obraich an t-ùrachadh air an t-seisean. Log a-steach a-rithist.",
 
 
 
@@ -818,24 +1225,24 @@
   "bitstream.edit.authorizations.title": "Deasaich Poileasaidhean a' bhitstream",
 
   // "bitstream.edit.return": "Back",
-    "bitstream.edit.return": "Air ais",
+  "bitstream.edit.return": "Air ais",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
-   "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "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": "Ma thogras tu, thoir cunntas goirid air an fhaidhle, mar eisimpleir \"<i>Prìomh artaigil</i>\" no \"<i>Dàta deuchainn</i>\".",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.description.hint": "Ma thogras tu, thoir cunntas goirid air an fhaidhle, mar eisimpleir \"<i>Prìomh artaigil</i>\" no \"<i>Dàta deuchainn</i>\".",
 
   // "bitstream.edit.form.description.label": "Description",
-   "bitstream.edit.form.description.label": "Cunntas",
+  "bitstream.edit.form.description.label": "Cunntas",
 
   // "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": "A' chiad latha bho bheil cothrom ceadaichte. <b>Cha ghabh an deit seo atharrachadh air an fhoirm seo.</b> Gus deit-bacaidh a sheatadh airson bitstream, rach gu tab <i>Inbhe Nì</i>, cliog air <i>Barantasan...</i>, cruthaich no deasaich poileasaidh <i>LEUGH</i> a' bhitstream, agus seat an <i>Deit-tòiseachaidh</i> mar a tha thu ga iarraidh.",
 
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
-   "bitstream.edit.form.embargo.label": "Bacadh gu deit sònraichte",
+  "bitstream.edit.form.embargo.label": "Bacadh gu deit sònraichte",
 
   // "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
@@ -845,7 +1252,7 @@
   "bitstream.edit.form.fileName.label": "Ainm-faidhle",
 
   // "bitstream.edit.form.newFormat.label": "Describe new format",
-   "bitstream.edit.form.newFormat.label": "Thoir cunntas air fòrmat ùr",
+  "bitstream.edit.form.newFormat.label": "Thoir cunntas air fòrmat ùr",
 
   // "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": "Am prògram a chleachd thu gus am faidhle a chruthachadh, agus àireamh an dreach (mar eisimpleir, \"<i>ACMESoft SuperApp dreach 1.5</i>\").",
@@ -857,52 +1264,52 @@
   "bitstream.edit.form.selectedFormat.hint": "Mura bheil am fòrmat san liosta gu h-àrd, <b>tagh \"chan eil am fòrmat san liosta\" gu h-àrd</b> agus thoir cunntas air fo \"Thoir cunntas air fòrmat ùr\".",
 
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-   "bitstream.edit.form.selectedFormat.label": "Fòrmat Taghte",
+  "bitstream.edit.form.selectedFormat.label": "Fòrmat Taghte",
 
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-   "bitstream.edit.form.selectedFormat.unknown": "Chan eil am fòrmat san liosta",
+  "bitstream.edit.form.selectedFormat.unknown": "Chan eil am fòrmat san liosta",
 
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-    "bitstream.edit.notifications.error.format.title": "Bha mearachd ann a' sàbhaladh fòrmat a' bhitstream",
+  "bitstream.edit.notifications.error.format.title": "Bha mearachd ann a' sàbhaladh fòrmat a' bhitstream",
 
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
-    "bitstream.edit.notifications.saved.content": "Chaidh na h-atharraichean air a' bhitstream seo a shàbhaladh.",
+  "bitstream.edit.notifications.saved.content": "Chaidh na h-atharraichean air a' bhitstream seo a shàbhaladh.",
 
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "Shàbhaileadh Bitstream",
 
   // "bitstream.edit.title": "Edit bitstream",
-   "bitstream.edit.title": "Deasaich bitstream",
+  "bitstream.edit.title": "Deasaich bitstream",
 
   // "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": "Tha cothrom agad air an fhaidhle seo mu thràth. Ma tha thu airson a luchdachadh a-nuas, cliog ",
+  "bitstream-request-a-copy.alert.canDownload1": "Tha cothrom agad air an fhaidhle seo mu thràth. Ma tha thu airson a luchdachadh a-nuas, cliog ",
 
   // "bitstream-request-a-copy.alert.canDownload2": "here",
-    "bitstream-request-a-copy.alert.canDownload2": "an seo",
+  "bitstream-request-a-copy.alert.canDownload2": "an seo",
 
   // "bitstream-request-a-copy.header": "Request a copy of the file",
-   "bitstream-request-a-copy.header": "Iarr copaidh den fhaidhle",
+  "bitstream-request-a-copy.header": "Iarr copaidh den fhaidhle",
 
   // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
-   "bitstream-request-a-copy.intro": "Cuir a-steach am fiosrachadh a leanas agus iarr copaidh den nì a leanas: ",
+  "bitstream-request-a-copy.intro": "Cuir a-steach am fiosrachadh a leanas agus iarr copaidh den nì a leanas: ",
 
   // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
-   "bitstream-request-a-copy.intro.bitstream.one": "Ag iarraidh an fhaidhle a leanas: ",
-  
+  "bitstream-request-a-copy.intro.bitstream.one": "Ag iarraidh an fhaidhle a leanas: ",
+
   // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
-   "bitstream-request-a-copy.intro.bitstream.all": "Ag iarraidh nam faidhlichean gu lèir. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Ag iarraidh nam faidhlichean gu lèir. ",
 
   // "bitstream-request-a-copy.name.label": "Name *",
   "bitstream-request-a-copy.name.label": "Ainm *",
 
   // "bitstream-request-a-copy.name.error": "The name is required",
-   "bitstream-request-a-copy.name.error": "Tha an t-ainm riatanach",
+  "bitstream-request-a-copy.name.error": "Tha an t-ainm riatanach",
 
   // "bitstream-request-a-copy.email.label": "Your e-mail address *",
-   "bitstream-request-a-copy.email.label": "An seòladh post-d agad *",
+  "bitstream-request-a-copy.email.label": "An seòladh post-d agad *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
-   "bitstream-request-a-copy.email.hint": "Tha an seòladh post-d seo ga chleachdadh airson am faidhle a chur.",
+  "bitstream-request-a-copy.email.hint": "Tha an seòladh post-d seo ga chleachdadh airson am faidhle a chur.",
 
   // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
   "bitstream-request-a-copy.email.error": "Cuir ann seòladh post-d brìgheil.",
@@ -911,31 +1318,31 @@
   "bitstream-request-a-copy.allfiles.label": "Faidhlichean",
 
   // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
-    "bitstream-request-a-copy.files-all-false.label": "Am faidhle a chaidh iarraidh a-mhàin",
+  "bitstream-request-a-copy.files-all-false.label": "Am faidhle a chaidh iarraidh a-mhàin",
 
   // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
   // TODO New key - Add a translation
-   "bitstream-request-a-copy.files-all-true.label": "Tha cothrom air na faidhlichean gu lèir (den nì seo) cuingealaichte",
+  "bitstream-request-a-copy.files-all-true.label": "Tha cothrom air na faidhlichean gu lèir (den nì seo) cuingealaichte",
 
   // "bitstream-request-a-copy.message.label": "Message",
-   "bitstream-request-a-copy.message.label": "Brath",
+  "bitstream-request-a-copy.message.label": "Brath",
 
   // "bitstream-request-a-copy.return": "Back",
-   "bitstream-request-a-copy.return": "Air ais",
+  "bitstream-request-a-copy.return": "Air ais",
 
   // "bitstream-request-a-copy.submit": "Request copy",
   "bitstream-request-a-copy.submit": "Iarr copaidh",
 
   // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
-   "bitstream-request-a-copy.submit.success": "Chaidh an t-iarrtas airson an nì a chur a-steach.",
+  "bitstream-request-a-copy.submit.success": "Chaidh an t-iarrtas airson an nì a chur a-steach.",
 
   // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
-   "bitstream-request-a-copy.submit.error": "Chaidh rudeigin ceàrr a' cur iarrtas a-steach airson an nì.",
+  "bitstream-request-a-copy.submit.error": "Chaidh rudeigin ceàrr a' cur iarrtas a-steach airson an nì.",
 
 
 
   // "browse.comcol.by.author": "By Author",
-    "browse.comcol.by.author": "A Rèir Ùghdar",
+  "browse.comcol.by.author": "A Rèir Ùghdar",
 
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "A Rèir Deit Foillseachaidh",
@@ -944,31 +1351,31 @@
   "browse.comcol.by.subject": "A Rèir Cuspair",
 
   // "browse.comcol.by.title": "By Title",
-   "browse.comcol.by.title": "A Rèir Tiotal",
+  "browse.comcol.by.title": "A Rèir Tiotal",
 
   // "browse.comcol.head": "Browse",
-   "browse.comcol.head": "Brobhs",
+  "browse.comcol.head": "Brobhs",
 
   // "browse.empty": "No items to show.",
-    "browse.empty": "Chan eil nithean ri shealltainn.",
+  "browse.empty": "Chan eil nithean ri shealltainn.",
 
   // "browse.metadata.author": "Author",
-    "browse.metadata.author": "Ùghdar",
+  "browse.metadata.author": "Ùghdar",
 
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "Deit Foillseachaidh",
 
   // "browse.metadata.subject": "Subject",
-    "browse.metadata.subject": "Cuspair",
+  "browse.metadata.subject": "Cuspair",
 
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Tiotal",
 
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-    "browse.metadata.author.breadcrumbs": "Brobhs a rèir Ùghdar",
+  "browse.metadata.author.breadcrumbs": "Brobhs a rèir Ùghdar",
 
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-   "browse.metadata.dateissued.breadcrumbs": "Brobhs a rèir Deit",
+  "browse.metadata.dateissued.breadcrumbs": "Brobhs a rèir Deit",
 
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Brobhs a rèir Cuspair",
@@ -980,22 +1387,22 @@
   "browse.next.button": "Air adhart",
 
   // "browse.previous.button": "Previous",
-    "browse.previous.button": "Air ais",
+  "browse.previous.button": "Air ais",
 
   // "browse.startsWith.choose_start": "(Choose start)",
-   "browse.startsWith.choose_start": "(Tagh toiseach)",
+  "browse.startsWith.choose_start": "(Tagh toiseach)",
 
   // "browse.startsWith.choose_year": "(Choose year)",
-    "browse.startsWith.choose_year": "(Tagh bliadhna)",
+  "browse.startsWith.choose_year": "(Tagh bliadhna)",
 
   // "browse.startsWith.choose_year.label": "Choose the issue year",
-    "browse.startsWith.choose_year.label": "Tagh bliadhna an fhoillseachaidh",
+  "browse.startsWith.choose_year.label": "Tagh bliadhna an fhoillseachaidh",
 
   // "browse.startsWith.jump": "Jump to a point in the index:",
-   "browse.startsWith.jump": "Leum gu àite sa chlàr-amais:",
+  "browse.startsWith.jump": "Leum gu àite sa chlàr-amais:",
 
   // "browse.startsWith.months.april": "April",
-   "browse.startsWith.months.april": "Giblean",
+  "browse.startsWith.months.april": "Giblean",
 
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "Lùnastal",
@@ -1004,16 +1411,16 @@
   "browse.startsWith.months.december": "Dùbhlachd",
 
   // "browse.startsWith.months.february": "February",
-   "browse.startsWith.months.february": "Gearran",
+  "browse.startsWith.months.february": "Gearran",
 
   // "browse.startsWith.months.january": "January",
-   "browse.startsWith.months.january": "Faoilleach",
+  "browse.startsWith.months.january": "Faoilleach",
 
   // "browse.startsWith.months.july": "July",
-   "browse.startsWith.months.july": "Iuchar",
+  "browse.startsWith.months.july": "Iuchar",
 
   // "browse.startsWith.months.june": "June",
-   "browse.startsWith.months.june": "Ògmhios",
+  "browse.startsWith.months.june": "Ògmhios",
 
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "Màrt",
@@ -1031,13 +1438,13 @@
   "browse.startsWith.months.november": "Samhain",
 
   // "browse.startsWith.months.october": "October",
-   "browse.startsWith.months.october": "Dàmhair",
+  "browse.startsWith.months.october": "Dàmhair",
 
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "Sultain",
 
   // "browse.startsWith.submit": "Browse",
-   "browse.startsWith.submit": "Brobhs",
+  "browse.startsWith.submit": "Brobhs",
 
   // "browse.startsWith.type_date": "Or type in a date (year-month) and click 'Browse'",
   "browse.startsWith.type_date": "No taidhp deit (bliadhna-mìos) agus cliog air 'Brobhs'",
@@ -1049,11 +1456,11 @@
   "browse.startsWith.type_text": "Taidhp a' chiad grunnan litrichean agus cliog air putan Brobhs",
 
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-   "browse.title": "A' brobhsadh {{ collection }} a rèir {{ field }} {{ value }}",
+  "browse.title": "A' brobhsadh {{ collection }} a rèir {{ field }} {{ value }}",
 
 
   // "chips.remove": "Remove chip",
-    "chips.remove": "Thoir às sgealb",
+  "chips.remove": "Thoir às sgealb",
 
 
 
@@ -1061,31 +1468,31 @@
   "collection.create.head": "Cruthaich Cruinneachadh",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
-   "collection.create.notifications.success": "Chaidh an Cruinneachadh a chruthachadh",
+  "collection.create.notifications.success": "Chaidh an Cruinneachadh a chruthachadh",
 
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-   "collection.create.sub-head": "Cruthaich Cruinneachadh do Choimhearsnachd {{ parent }}",
+  "collection.create.sub-head": "Cruthaich Cruinneachadh do Choimhearsnachd {{ parent }}",
 
   // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "Eagraich Cruinneachadh: {{collection}}",
 
   // "collection.delete.cancel": "Cancel",
-   "collection.delete.cancel": "Cansail",
+  "collection.delete.cancel": "Cansail",
 
   // "collection.delete.confirm": "Confirm",
-   "collection.delete.confirm": "Dearbh",
+  "collection.delete.confirm": "Dearbh",
 
   // "collection.delete.processing": "Deleting",
-    "collection.delete.processing": "A' dubhadh às",
+  "collection.delete.processing": "A' dubhadh às",
 
   // "collection.delete.head": "Delete Collection",
-   "collection.delete.head": "Dùbh às Cruinneachadh",
+  "collection.delete.head": "Dùbh às Cruinneachadh",
 
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "Cha ghabhadh cruinneachadh a dhubhadh às",
 
   // "collection.delete.notification.success": "Successfully deleted collection",
-   "collection.delete.notification.success": "Chaidh cruinneachadh a dhubhadh às",
+  "collection.delete.notification.success": "Chaidh cruinneachadh a dhubhadh às",
 
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "A bheil thu cinnteach gu bheil thu airson cruinneachadh  \"{{ dso }}\" a dhubhadh às",
@@ -1093,10 +1500,10 @@
 
 
   // "collection.edit.delete": "Delete this collection",
-    "collection.edit.delete": "Dubh às an cruinneachadh seo",
+  "collection.edit.delete": "Dubh às an cruinneachadh seo",
 
   // "collection.edit.head": "Edit Collection",
-   "collection.edit.head": "Deasaich Cruinneachadh",
+  "collection.edit.head": "Deasaich Cruinneachadh",
 
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Deasaich Cruinneachadh",
@@ -1111,13 +1518,13 @@
   "collection.edit.tabs.item-mapper.title": "Deasachadh Cruinneachaidh - Mapair Nithean",
 
   // "collection.edit.item-mapper.cancel": "Cancel",
-   "collection.edit.item-mapper.cancel": "Cansail",
+  "collection.edit.item-mapper.cancel": "Cansail",
 
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-    "collection.edit.item-mapper.collection": "Cruinneachadh: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Cruinneachadh: \"<b>{{name}}</b>\"",
 
   // "collection.edit.item-mapper.confirm": "Map selected items",
-   "collection.edit.item-mapper.confirm": "Map nithean taghte",
+  "collection.edit.item-mapper.confirm": "Map nithean taghte",
 
   // "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
@@ -1145,10 +1552,10 @@
   "collection.edit.item-mapper.notifications.unmap.error.content": "Bha mearachdan ann a' toirt air falbh mapadh {{amount}} nithean.",
 
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-   "collection.edit.item-mapper.notifications.unmap.error.head": "Thoir às mearachdan mapaidh",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Thoir às mearachdan mapaidh",
 
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-   "collection.edit.item-mapper.notifications.unmap.success.content": "Chaidh mapadh {{amount}} nithean a thoirt às.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Chaidh mapadh {{amount}} nithean a thoirt às.",
 
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Mapadh air a thoirt às",
@@ -1161,32 +1568,32 @@
   "collection.edit.item-mapper.search-form.placeholder": "Rannsaich nithean...",
 
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-   "collection.edit.item-mapper.tabs.browse": "Brobhs nithean mapaichte",
+  "collection.edit.item-mapper.tabs.browse": "Brobhs nithean mapaichte",
 
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Map nithean ùra",
 
 
   // "collection.edit.logo.delete.title": "Delete logo",
-   "collection.edit.logo.delete.title": "Dubh às suaicheantas",
+  "collection.edit.logo.delete.title": "Dubh às suaicheantas",
 
   // "collection.edit.logo.delete-undo.title": "Undo delete",
   "collection.edit.logo.delete-undo.title": "Neo-dhèan an dubhadh às",
 
   // "collection.edit.logo.label": "Collection logo",
-   "collection.edit.logo.label": "Suaicheantas cruinneachaidh",
+  "collection.edit.logo.label": "Suaicheantas cruinneachaidh",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
   "collection.edit.logo.notifications.add.error": "Cha deach suaicheantas Cruinneachaidh a luchdachadh suas. Dearbh an t-susbaint mus feuch thu a-rithist.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
-   "collection.edit.logo.notifications.add.success": "Chaidh suaicheantas Cruinneachaidh a luchdachadh suas.",
+  "collection.edit.logo.notifications.add.success": "Chaidh suaicheantas Cruinneachaidh a luchdachadh suas.",
 
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "Dhubhadh às suaicheantas",
 
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
-    "collection.edit.logo.notifications.delete.success.content": "Chaidh suaicheantas a' chruinneachaidh a dhubhadh às",
+  "collection.edit.logo.notifications.delete.success.content": "Chaidh suaicheantas a' chruinneachaidh a dhubhadh às",
 
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "Mearachd ann a' dubhadh às suaicheantas",
@@ -1215,7 +1622,7 @@
   "collection.edit.tabs.authorizations.head": "Barantasan",
 
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-    "collection.edit.tabs.authorizations.title": "Deasachadh Cruinneachaidh - Barantasan",
+  "collection.edit.tabs.authorizations.title": "Deasachadh Cruinneachaidh - Barantasan",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Deasaich Metadata",
@@ -1224,39 +1631,39 @@
   "collection.edit.tabs.metadata.title": "Deasachadh Cruinneachaidh - Metadata",
 
   // "collection.edit.tabs.roles.head": "Assign Roles",
-     "collection.edit.tabs.roles.head": "Sònraich Dreuchdan",
+  "collection.edit.tabs.roles.head": "Sònraich Dreuchdan",
 
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-   "collection.edit.tabs.roles.title": "Deasachadh Cruinneachaidh - Dreuchdan",
+  "collection.edit.tabs.roles.title": "Deasachadh Cruinneachaidh - Dreuchdan",
 
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
-   "collection.edit.tabs.source.external": "Tha an cruinneachadh seo a' togail na susbaint bho stòr a-muigh",
+  "collection.edit.tabs.source.external": "Tha an cruinneachadh seo a' togail na susbaint bho stòr a-muigh",
 
   // "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": "Feumaidh tu id seata den chruinneachadh-amais a thoirt.",
 
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-   "collection.edit.tabs.source.form.harvestType": "Susbaint ga togail",
+  "collection.edit.tabs.source.form.harvestType": "Susbaint ga togail",
 
   // "collection.edit.tabs.source.form.head": "Configure an external source",
   "collection.edit.tabs.source.form.head": "Rèitich stòr a-muigh",
 
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-   "collection.edit.tabs.source.form.metadataConfigId": "Fòrmat Metadata",
+  "collection.edit.tabs.source.form.metadataConfigId": "Fòrmat Metadata",
 
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.oaiSetId": "Id seat OAI sònraichte",
 
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-    "collection.edit.tabs.source.form.oaiSource": "Solaraiche OAI",
+  "collection.edit.tabs.source.form.oaiSource": "Solaraiche OAI",
 
   // "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": "Tog metadata agus bitstreaman (feum air taic ORE)",
 
   // "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": "Tog metadata agus iomraidhean air bitstreaman (feum air taic ORE)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Tog metadata agus iomraidhean air bitstreaman (feum air taic ORE)",
 
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Tog metadata a-mhàin",
@@ -1271,7 +1678,7 @@
   "collection.edit.tabs.source.notifications.discarded.title": "Chuireadh às do na h-atharraichean",
 
   // "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": "Cha deach na h-atharraichean a shàbhaladh. Dèan cinnteach gu bheil gach raon brìgheil mus sàbhail thu e.",
+  "collection.edit.tabs.source.notifications.invalid.content": "Cha deach na h-atharraichean a shàbhaladh. Dèan cinnteach gu bheil gach raon brìgheil mus sàbhail thu e.",
 
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata neo-bhrìgheil",
@@ -1283,7 +1690,7 @@
   "collection.edit.tabs.source.notifications.saved.title": "Stòr Susbaint air a shàbhaladh",
 
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-   "collection.edit.tabs.source.title": "Deasachadh Cruinneachaidh - Stòr Susbaint",
+  "collection.edit.tabs.source.title": "Deasachadh Cruinneachaidh - Stòr Susbaint",
 
 
 
@@ -1294,28 +1701,28 @@
   "collection.edit.template.breadcrumbs": "Teamplaid nì",
 
   // "collection.edit.template.cancel": "Cancel",
-   "collection.edit.template.cancel": "Cansail",
+  "collection.edit.template.cancel": "Cansail",
 
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "Dubh às",
 
   // "collection.edit.template.edit-button": "Edit",
-   "collection.edit.template.edit-button": "Deasaich",
+  "collection.edit.template.edit-button": "Deasaich",
 
   // "collection.edit.template.error": "An error occurred retrieving the template item",
   "collection.edit.template.error": "Bha mearachd ann a' faighinn air ais teamplaid an nì",
 
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-    "collection.edit.template.head": "Deasaich Teamplaid Nì do Chruinneachadh \"{{ collection }}\"",
+  "collection.edit.template.head": "Deasaich Teamplaid Nì do Chruinneachadh \"{{ collection }}\"",
 
   // "collection.edit.template.label": "Template item",
-    "collection.edit.template.label": "Teamplaid nì",
+  "collection.edit.template.label": "Teamplaid nì",
 
   // "collection.edit.template.loading": "Loading template item...",
   "collection.edit.template.loading": "A' luchdachadh teamplaid nì...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
-   "collection.edit.template.notifications.delete.error": "Cha deach teamplaid an nì a dhubhadh às",
+  "collection.edit.template.notifications.delete.error": "Cha deach teamplaid an nì a dhubhadh às",
 
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
   "collection.edit.template.notifications.delete.success": "Chaidh teamplaid an nì a dhubhadh às",
@@ -1332,19 +1739,19 @@
   "collection.form.description": "Teacsa tòiseachaidh (HTML)",
 
   // "collection.form.errors.title.required": "Please enter a collection name",
-   "collection.form.errors.title.required": "Cuir ann ainm cruinneachaidh",
+  "collection.form.errors.title.required": "Cuir ann ainm cruinneachaidh",
 
   // "collection.form.license": "License",
-   "collection.form.license": "Cead",
+  "collection.form.license": "Cead",
 
   // "collection.form.provenance": "Provenance",
-    "collection.form.provenance": "Stòr",
+  "collection.form.provenance": "Stòr",
 
   // "collection.form.rights": "Copyright text (HTML)",
-   "collection.form.rights": "Teacsa dlighe-sgrìobhaidh  (HTML)",
+  "collection.form.rights": "Teacsa dlighe-sgrìobhaidh  (HTML)",
 
   // "collection.form.tableofcontents": "News (HTML)",
-    "collection.form.tableofcontents": "Naidheachdan (HTML)",
+  "collection.form.tableofcontents": "Naidheachdan (HTML)",
 
   // "collection.form.title": "Name",
   "collection.form.title": "Ainm",
@@ -1364,116 +1771,116 @@
   "collection.page.browse.recent.head": "Cur-a-steachan Ùra",
 
   // "collection.page.browse.recent.empty": "No items to show",
-   "collection.page.browse.recent.empty": "Chan eil nithean ri shealltainn",
+  "collection.page.browse.recent.empty": "Chan eil nithean ri shealltainn",
 
   // "collection.page.edit": "Edit this collection",
-   "collection.page.edit": "Deasaich an cruinneachadh seo",
+  "collection.page.edit": "Deasaich an cruinneachadh seo",
 
   // "collection.page.handle": "Permanent URI for this collection",
-   "collection.page.handle": " URI maireannach don chruinneachadh seo",
+  "collection.page.handle": " URI maireannach don chruinneachadh seo",
 
   // "collection.page.license": "License",
   "collection.page.license": "Cead",
 
   // "collection.page.news": "News",
-    "collection.page.news": "Naidheachdan",
+  "collection.page.news": "Naidheachdan",
 
 
 
   // "collection.select.confirm": "Confirm selected",
-    "collection.select.confirm": "Dearbh taghadh",
+  "collection.select.confirm": "Dearbh taghadh",
 
   // "collection.select.empty": "No collections to show",
-   "collection.select.empty": "Chan eil cruinneachaidhean ri shealltainn",
+  "collection.select.empty": "Chan eil cruinneachaidhean ri shealltainn",
 
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Tiotal",
 
 
   // "collection.source.controls.head": "Harvest Controls",
-   "collection.source.controls.head": "Riaghladairean Togail",
-  
+  "collection.source.controls.head": "Riaghladairean Togail",
+
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
-    "collection.source.controls.test.submit.error": "Chaidh rudeigin ceàrr a' tòiseachadh feuchainn an t-seataidh",
-  
+  "collection.source.controls.test.submit.error": "Chaidh rudeigin ceàrr a' tòiseachadh feuchainn an t-seataidh",
+
   // "collection.source.controls.test.failed": "The script to test the settings has failed",
-   "collection.source.controls.test.failed": "Chan do dh'obraich an sgriobt airson feuchainn an t-seataidh",
-  
+  "collection.source.controls.test.failed": "Chan do dh'obraich an sgriobt airson feuchainn an t-seataidh",
+
   // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
   "collection.source.controls.test.completed": "Chrìochnaich an sgriobt airson feuchainn an t-seataidh",
-  
+
   // "collection.source.controls.test.submit": "Test configuration",
   "collection.source.controls.test.submit": "Rèiteachadh feuchainn",
-  
+
   // "collection.source.controls.test.running": "Testing configuration...",
-   "collection.source.controls.test.running": "A' feuchainn rèiteachadh...",
-  
+  "collection.source.controls.test.running": "A' feuchainn rèiteachadh...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
   "collection.source.controls.import.submit.success": "Thòisich an steach-ghluasad",
-  
+
   // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
   "collection.source.controls.import.submit.error": "Chaidh rudeigin ceàrr a' tòiseachadh an steach-ghluasaid",
-  
+
   // "collection.source.controls.import.submit": "Import now",
   "collection.source.controls.import.submit": "Steach-ghluais a-nis",
-  
+
   // "collection.source.controls.import.running": "Importing...",
   "collection.source.controls.import.running": "A' steach-ghluasad...",
-  
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
-   "collection.source.controls.import.failed": "Bha mearachd anns an steach-ghluasad",
-  
+  "collection.source.controls.import.failed": "Bha mearachd anns an steach-ghluasad",
+
   // "collection.source.controls.import.completed": "The import completed",
   "collection.source.controls.import.completed": "Tha an steach-ghluasad dèante",
-  
+
   // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
-   "collection.source.controls.reset.submit.success": "Thòisich an t-ath-sheatadh agus an t-ath-steach-ghluasad",
-  
+  "collection.source.controls.reset.submit.success": "Thòisich an t-ath-sheatadh agus an t-ath-steach-ghluasad",
+
   // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
   "collection.source.controls.reset.submit.error": "Chaidh rudeigin ceàrr a' tòiseachadh an ath-sheataidh agus an ath-steach-ghluasaid",
-  
+
   // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
   "collection.source.controls.reset.failed": "Bha mearachd san ath-sheatadh agus san ath-steach-ghluasad",
-  
+
   // "collection.source.controls.reset.completed": "The reset and reimport completed",
-   "collection.source.controls.reset.completed": "Tha an t-ath-sheatadh agus an t-ath-steach-ghluasad dèante",
-  
+  "collection.source.controls.reset.completed": "Tha an t-ath-sheatadh agus an t-ath-steach-ghluasad dèante",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
-   "collection.source.controls.reset.submit": "Ath-sheat agus ath-steach-ghluais",
-  
+  "collection.source.controls.reset.submit": "Ath-sheat agus ath-steach-ghluais",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
   "collection.source.controls.reset.running": "Ag ath-sheatadh agus ag ath-steach-ghluasad...",
-  
+
   // "collection.source.controls.harvest.status": "Harvest status:",
-   "collection.source.controls.harvest.status": "Inbhe togail:",
-  
+  "collection.source.controls.harvest.status": "Inbhe togail:",
+
   // "collection.source.controls.harvest.start": "Harvest start time:",
   "collection.source.controls.harvest.start": "Àm-tòiseachaidh togail:",
-  
+
   // "collection.source.controls.harvest.last": "Last time harvested:",
   // TODO New key - Add a translation
   "collection.source.controls.harvest.last": "Uair an togail mu dheireadh:",
-  
+
   // "collection.source.controls.harvest.message": "Harvest info:",
   "collection.source.controls.harvest.message": "Fiosrachadh togail:",
-  
+
   // "collection.source.controls.harvest.no-information": "N/A",
-   "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": "Chaidh an seatadh ud fheuchainn agus cha do dh'obraich e.",
 
   // "collection.source.update.notifications.error.title": "Server Error",
-   "collection.source.update.notifications.error.title": "Mearachd Frithealaiche",
+  "collection.source.update.notifications.error.title": "Mearachd Frithealaiche",
 
 
 
   // "communityList.breadcrumbs": "Community List",
-    "communityList.breadcrumbs": "Liosta Coimhearsnachd",
+  "communityList.breadcrumbs": "Liosta Coimhearsnachd",
 
   // "communityList.tabTitle": "Community List",
-   "communityList.tabTitle": "Liosta Coimhearsnachd",
+  "communityList.tabTitle": "Liosta Coimhearsnachd",
 
   // "communityList.title": "List of Communities",
   "communityList.title": "Liosta Choimhearsnachdan",
@@ -1487,10 +1894,10 @@
   "community.create.head": "Cruthaich Coimhearsnachd",
 
   // "community.create.notifications.success": "Successfully created the Community",
-   "community.create.notifications.success": "Chaidh a' Choimhearsnachd a chruthachadh",
+  "community.create.notifications.success": "Chaidh a' Choimhearsnachd a chruthachadh",
 
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
-   "community.create.sub-head": "Cruthaich Fo-choimhearsnachd do Choimhearsnachd {{ parent }}",
+  "community.create.sub-head": "Cruthaich Fo-choimhearsnachd do Choimhearsnachd {{ parent }}",
 
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Eagraich Coimhearsnachd: {{community}}",
@@ -1499,35 +1906,35 @@
   "community.delete.cancel": "Cansail",
 
   // "community.delete.confirm": "Confirm",
-   "community.delete.confirm": "Dearbh",
+  "community.delete.confirm": "Dearbh",
 
   // "community.delete.processing": "Deleting...",
-    "community.delete.processing": "A' dubhadh às...",
+  "community.delete.processing": "A' dubhadh às...",
 
   // "community.delete.head": "Delete Community",
-   "community.delete.head": "Dubh às Coimhearsnachd",
+  "community.delete.head": "Dubh às Coimhearsnachd",
 
   // "community.delete.notification.fail": "Community could not be deleted",
-   "community.delete.notification.fail": "Cha ghabhadh a' choimhearsnachd dubhadh às",
+  "community.delete.notification.fail": "Cha ghabhadh a' choimhearsnachd dubhadh às",
 
   // "community.delete.notification.success": "Successfully deleted community",
-   "community.delete.notification.success": "Chaidh a' choimhearsnachd a dhubhadh às",
+  "community.delete.notification.success": "Chaidh a' choimhearsnachd a dhubhadh às",
 
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "A bheil thu cinnteach gu bheil thu airson coimhearsnachd \"{{ dso }}\" a dhubhadh às",
 
   // "community.edit.delete": "Delete this community",
-   "community.edit.delete": "Dubh às a' choimhearsnachd seo",
+  "community.edit.delete": "Dubh às a' choimhearsnachd seo",
 
   // "community.edit.head": "Edit Community",
-   "community.edit.head": "Deasaich Coimhearsnachd",
+  "community.edit.head": "Deasaich Coimhearsnachd",
 
   // "community.edit.breadcrumbs": "Edit Community",
-   "community.edit.breadcrumbs": "Deasaich Coimhearsnachd",
+  "community.edit.breadcrumbs": "Deasaich Coimhearsnachd",
 
 
   // "community.edit.logo.delete.title": "Delete logo",
-   "community.edit.logo.delete.title": "Dubh às suaicheantas",
+  "community.edit.logo.delete.title": "Dubh às suaicheantas",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
   "community.edit.logo.delete-undo.title": "Neo-dhèan an dubhadh às",
@@ -1548,7 +1955,7 @@
   "community.edit.logo.notifications.delete.success.content": "Chaidh suaicheantas na coimhearsnachd a dhubhadh às",
 
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-   "community.edit.logo.notifications.delete.error.title": "Mearachd a' dubhadh às suaicheantas",
+  "community.edit.logo.notifications.delete.error.title": "Mearachd a' dubhadh às suaicheantas",
 
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Leig às Suaicheantas Coimhearsnachd airson a luchdachadh suas",
@@ -1559,7 +1966,7 @@
   "community.edit.notifications.success": "Chaidh a' Choimhearsnachd a dheasachadh",
 
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
-   "community.edit.notifications.unauthorized": "Chan eil còir agad an t-atharrachadh seo a dhèanamh",
+  "community.edit.notifications.unauthorized": "Chan eil còir agad an t-atharrachadh seo a dhèanamh",
 
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Bha mearachd ann a' deasachadh na Coimhearsnachd",
@@ -1570,16 +1977,16 @@
 
 
   // "community.edit.tabs.curate.head": "Curate",
-    "community.edit.tabs.curate.head": "Eagraich",
+  "community.edit.tabs.curate.head": "Eagraich",
 
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-   "community.edit.tabs.curate.title": "Deasachadh Coimhearsnachd - Eagraich",
+  "community.edit.tabs.curate.title": "Deasachadh Coimhearsnachd - Eagraich",
 
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Deasaich Metadata",
 
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-   "community.edit.tabs.metadata.title": "Deasachadh Coimhearsnachd - Metadata",
+  "community.edit.tabs.metadata.title": "Deasachadh Coimhearsnachd - Metadata",
 
   // "community.edit.tabs.roles.head": "Assign Roles",
   "community.edit.tabs.roles.head": "Sònraich Dreuchdan",
@@ -1588,10 +1995,10 @@
   "community.edit.tabs.roles.title": "Deasachadh Coimhearsnachd - Dreuchdan",
 
   // "community.edit.tabs.authorizations.head": "Authorizations",
-   "community.edit.tabs.authorizations.head": "Barantasan",
+  "community.edit.tabs.authorizations.head": "Barantasan",
 
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-   "community.edit.tabs.authorizations.title": "Deasachadh Coimhearsnachd - Barantasan",
+  "community.edit.tabs.authorizations.title": "Deasachadh Coimhearsnachd - Barantasan",
 
 
 
@@ -1601,41 +2008,41 @@
 
 
   // "comcol-role.edit.no-group": "None",
-    "comcol-role.edit.no-group": "Chan eil gin",
+  "comcol-role.edit.no-group": "Chan eil gin",
 
   // "comcol-role.edit.create": "Create",
-   "comcol-role.edit.create": "Cruthaich",
+  "comcol-role.edit.create": "Cruthaich",
 
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "Cuingealaich",
 
   // "comcol-role.edit.delete": "Delete",
-   "comcol-role.edit.delete": "Dubh às",
+  "comcol-role.edit.delete": "Dubh às",
 
 
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Rianairean",
 
   // "comcol-role.edit.collection-admin.name": "Administrators",
-   "comcol-role.edit.collection-admin.name": "Rianairean",
+  "comcol-role.edit.collection-admin.name": "Rianairean",
 
 
   // "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": "Is urrainn rianairean coimhearsnachd fo-choimhearsnachdan no cruinneachaidhean a chruthachadh, agus stiùireadh nam fo-choimhearsnachdan agus nan cruinneachaidhean sin a dhèanamh no a shònrachadh. Cuideachd, co-dhùinidh iad cò as urrainn nithean a chur a-steach gu fo-chruinneachaidhean, nì metadata a dheasachadh (an dèidh cur a-steach), agus nithean a chur-ris (a mhapadh) bho chruinneachaidhean eile (le cead).",
 
   // "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": "Co-dhùinidh rianairean cruinneachaidh cò as urrainn nithean a chur a-steach dhan chruinneachadh, nì metadata a dheasachadh (an dèidh cur a-steach), agus nithean a chur-ris (a mhapadh) bho chruinneachaidhean eile (le cead a' chruinneachaidh sin).",
+  "comcol-role.edit.collection-admin.description": "Co-dhùinidh rianairean cruinneachaidh cò as urrainn nithean a chur a-steach dhan chruinneachadh, nì metadata a dheasachadh (an dèidh cur a-steach), agus nithean a chur-ris (a mhapadh) bho chruinneachaidhean eile (le cead a' chruinneachaidh sin).",
 
 
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Luchd-cur-a-steach",
 
   // "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": "Tha cead aig E-Dhaoine agus Buidhnean nithean ùra a chur a-steach don chruinneachadh seo.",
+  "comcol-role.edit.submitters.description": "Tha cead aig E-Dhaoine agus Buidhnean nithean ùra a chur a-steach don chruinneachadh seo.",
 
 
   // "comcol-role.edit.item_read.name": "Default item read access",
-   "comcol-role.edit.item_read.name": "Cothrom gnàthach leughadh nì",
+  "comcol-role.edit.item_read.name": "Cothrom gnàthach leughadh nì",
 
   // "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
@@ -1659,7 +2066,7 @@
 
 
   // "comcol-role.edit.editor.name": "Editors",
-   "comcol-role.edit.editor.name": "Deasaichean",
+  "comcol-role.edit.editor.name": "Deasaichean",
 
   // "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
@@ -1675,7 +2082,7 @@
 
 
   // "comcol-role.edit.reviewer.name": "Reviewers",
-   "comcol-role.edit.reviewer.name": "Ath-sgrùdairean",
+  "comcol-role.edit.reviewer.name": "Ath-sgrùdairean",
 
   // "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
@@ -1687,37 +2094,37 @@
   "community.form.abstract": "Cunntas Goirid",
 
   // "community.form.description": "Introductory text (HTML)",
-   "community.form.description": "Teacsa tòiseachaidh (HTML)",
+  "community.form.description": "Teacsa tòiseachaidh (HTML)",
 
   // "community.form.errors.title.required": "Please enter a community name",
-    "community.form.errors.title.required": "Cuir a-steach ainm coimhearsnachd",
+  "community.form.errors.title.required": "Cuir a-steach ainm coimhearsnachd",
 
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "Teacsa dlighe-sgrìobhaidh (HTML)",
 
   // "community.form.tableofcontents": "News (HTML)",
-   "community.form.tableofcontents": "Naidheachdan (HTML)",
+  "community.form.tableofcontents": "Naidheachdan (HTML)",
 
   // "community.form.title": "Name",
-   "community.form.title": "Ainm",
+  "community.form.title": "Ainm",
 
   // "community.page.edit": "Edit this community",
-    "community.page.edit": "Deasaich a' choimhearsnachd seo",
+  "community.page.edit": "Deasaich a' choimhearsnachd seo",
 
   // "community.page.handle": "Permanent URI for this community",
   "community.page.handle": "URI maireannach don choimhearsnachd seo",
 
   // "community.page.license": "License",
-   "community.page.license": "Cead",
+  "community.page.license": "Cead",
 
   // "community.page.news": "News",
-   "community.page.news": "Naidheachdan",
+  "community.page.news": "Naidheachdan",
 
   // "community.all-lists.head": "Subcommunities and Collections",
-    "community.all-lists.head": "Fo-choimhearsnachdan agus Cruinneachaidhean",
+  "community.all-lists.head": "Fo-choimhearsnachdan agus Cruinneachaidhean",
 
   // "community.sub-collection-list.head": "Collections of this Community",
-   "community.sub-collection-list.head": "Cruinneachaidhean na Coimhearsnachd seo",
+  "community.sub-collection-list.head": "Cruinneachaidhean na Coimhearsnachd seo",
 
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Coimhearsnachdan na Coimhearsnachd seo",
@@ -1734,10 +2141,10 @@
   "cookies.consent.app.opt-out.description": "Tha an app seo air a luchdachadh gu gnàthach (ach chan fheum thu aontachadh ris)",
 
   // "cookies.consent.app.opt-out.title": "(opt-out)",
-   "cookies.consent.app.opt-out.title": "(gun aontachadh ris)",
+  "cookies.consent.app.opt-out.title": "(gun aontachadh ris)",
 
   // "cookies.consent.app.purpose": "purpose",
-   "cookies.consent.app.purpose": "adhbhar",
+  "cookies.consent.app.purpose": "adhbhar",
 
   // "cookies.consent.app.required.description": "This application is always required",
   "cookies.consent.app.required.description": "Tha am prògram seo riatanach an-còmhnaidh",
@@ -1746,7 +2153,7 @@
   "cookies.consent.app.required.title": "(riatanach an-còmhnaidh)",
 
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
-    "cookies.consent.update": "Tha atharraichean ann bho thadhail thu mu dheireadh; ùraich do chead.",
+  "cookies.consent.update": "Tha atharraichean ann bho thadhail thu mu dheireadh; ùraich do chead.",
 
   // "cookies.consent.close": "Close",
   "cookies.consent.close": "Dùin",
@@ -1758,13 +2165,13 @@
   "cookies.consent.content-notice.description": "Bidh sinn a' cruinneachadh agus a' cleachdadh fiosrachadh pearsanta airson nan adhbharan seo: <strong>Dearbhadh, Roghainnean, Buidheachas agus Staitistigs</strong>. <br/> Airson tuilleadh fiosrachaidh, leugh am {Poileasaidhprìobhaideachd}.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
-   "cookies.consent.content-notice.learnMore": "Customaich",
+  "cookies.consent.content-notice.learnMore": "Customaich",
 
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
   "cookies.consent.content-modal.description": "An seo is urrainn dhut am fiosrachadh a chruinnicheas sinn ort fhaicinn agus a chustomachadh.",
 
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-   "cookies.consent.content-modal.privacy-policy.name": "poileasaidh prìobhaideachd",
+  "cookies.consent.content-modal.privacy-policy.name": "poileasaidh prìobhaideachd",
 
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Gus tuilleadh fhaighinn a-mach, leugh am {privacyPolicy}.",
@@ -1778,14 +2185,14 @@
   "cookies.consent.app.title.authentication": "Dearbhadh",
 
   // "cookies.consent.app.description.authentication": "Required for signing you in",
-   "cookies.consent.app.description.authentication": "Riatanach airson do logadh a-steach",
+  "cookies.consent.app.description.authentication": "Riatanach airson do logadh a-steach",
 
 
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Roghainnean",
 
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
-    "cookies.consent.app.description.preferences": "Riatanach airson do roghainnean a shàbhaladh",
+  "cookies.consent.app.description.preferences": "Riatanach airson do roghainnean a shàbhaladh",
 
 
 
@@ -1809,14 +2216,14 @@
   "cookies.consent.purpose.functional": "Fuincseanach",
 
   // "cookies.consent.purpose.statistical": "Statistical",
-    "cookies.consent.purpose.statistical": "Staitistigeil",
+  "cookies.consent.purpose.statistical": "Staitistigeil",
 
 
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Dearbh Ceangalan ann am Metadata",
+  "curation-task.task.checklinks.label": "Dearbh Ceangalan ann am Metadata",
 
   // "curation-task.task.noop.label": "NOOP",
-   "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "NOOP",
 
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "Profaidhl Fhòrmatan Bitstream",
@@ -1829,25 +2236,25 @@
   "curation-task.task.translate.label": "Eadar-theangair Microsoft ",
 
   // "curation-task.task.vscan.label": "Virus Scan",
-   "curation-task.task.vscan.label": "Sgan air Bhìorasan",
+  "curation-task.task.vscan.label": "Sgan air Bhìorasan",
 
 
 
   // "curation.form.task-select.label": "Task:",
-    "curation.form.task-select.label": "Obair:",
+  "curation.form.task-select.label": "Obair:",
 
   // "curation.form.submit": "Start",
   "curation.form.submit": "Tòisich",
 
   // "curation.form.submit.success.head": "The curation task has been started successfully",
-   "curation.form.submit.success.head": "Thòisich an obair eagrachaidh",
+  "curation.form.submit.success.head": "Thòisich an obair eagrachaidh",
 
   // "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": "Thèid d' ath-stiùireadh chun na duilleig pròiseas cho-fhreagraich.",
 
   // "curation.form.submit.error.head": "Running the curation task failed",
-    "curation.form.submit.error.head": "Cha do dh'obraich an obair eagrachaidh",
+  "curation.form.submit.error.head": "Cha do dh'obraich an obair eagrachaidh",
 
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Bha mearachd ann a' tòiseachadh an obair eagrachaidh.",
@@ -1921,16 +2328,16 @@
   "dso-selector.edit.item.head": "Deasaich nì",
 
   // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
-    "dso-selector.error.title": "Bha mearachd ann a' rannsachadh airson {{ type }}",
+  "dso-selector.error.title": "Bha mearachd ann a' rannsachadh airson {{ type }}",
 
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-   "dso-selector.export-metadata.dspaceobject.head": "Mach-ghluais metadata bho",
+  "dso-selector.export-metadata.dspaceobject.head": "Mach-ghluais metadata bho",
 
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Cha deach {{ type }} a lorg",
 
   // "dso-selector.placeholder": "Search for a {{ type }}",
-   "dso-selector.placeholder": "Rannsaich airson {{ type }}",
+  "dso-selector.placeholder": "Rannsaich airson {{ type }}",
 
   // "dso-selector.select.collection.head": "Select a collection",
   "dso-selector.select.collection.head": "Tagh cruinneachadh",
@@ -1947,7 +2354,7 @@
 
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
-    "confirmation-modal.export-metadata.header": "Mach-ghluais metadata airson {{ dsoName }}",
+  "confirmation-modal.export-metadata.header": "Mach-ghluais metadata airson {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "A bheil thu cinnteach gu bheil thu airson metadata airson {{ dsoName }} a mach-ghluasad",
@@ -1987,22 +2394,22 @@
   "error.community": "Mearachd a' faighinn coimhearsnachd",
 
   // "error.identifier": "No item found for the identifier",
-   "error.identifier": "Cha deach nì a lorg don aithnichear",
+  "error.identifier": "Cha deach nì a lorg don aithnichear",
 
   // "error.default": "Error",
-   "error.default": "Mearachd",
+  "error.default": "Mearachd",
 
   // "error.item": "Error fetching item",
-    "error.item": "Mearachd a' faighinn nì",
+  "error.item": "Mearachd a' faighinn nì",
 
   // "error.items": "Error fetching items",
   "error.items": "Mearachd a' faighinn nithean",
 
   // "error.objects": "Error fetching objects",
-   "error.objects": "Mearachd a' faighinn oibseactan",
+  "error.objects": "Mearachd a' faighinn oibseactan",
 
   // "error.recent-submissions": "Error fetching recent submissions",
-   "error.recent-submissions": "Mearachd a' faighinn chur-a-steachan ùra",
+  "error.recent-submissions": "Mearachd a' faighinn chur-a-steachan ùra",
 
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Mearachd a' faighinn toraidhean rannsachaidh",
@@ -2010,22 +2417,22 @@
   // "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.",
   // TODO New key - Add a translation
   "error.invalid-search-query": "Chan eil a' cheist rannsachaidh brìgheil. Thoir sùil air <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" targaid=\"_bàn\">Solr query syntax</a> sàr chleachdadh airson tuilleadh fiosrachaidh air a' mhearachd seo.",
- 
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Mearachd a' faighinn fo-chruinneachaidhean",
 
   // "error.sub-communities": "Error fetching sub-communities",
-   "error.sub-communities": "Mearachd a' faighinn fo-choimhearsnachdan",
+  "error.sub-communities": "Mearachd a' faighinn fo-choimhearsnachdan",
 
   // "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": "Bha mearachd ann a' tòiseachadh na h-earrainn; thoir sùil air rèiteachadh an fhoirm steach-chuir. Tha mion-fhiosrachadh fo : <br> <br>", 
+  "error.submission.sections.init-form-error": "Bha mearachd ann a' tòiseachadh na h-earrainn; thoir sùil air rèiteachadh an fhoirm steach-chuir. Tha mion-fhiosrachadh fo : <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Mearachd a' faighinn choimhearsnachdan sàr-ìre",
 
   // "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": "Feumaidh tu an cead seo a thoirt gus crìoch a chur air a' chur-a-steach. Mura h-urrainn dhut cead a thoirt an-dràsta is urrainn dhut an obair a shàbhaladh agus tilleadh aig àm eile no an cur-a-steach a thoirt air falbh.",
+  "error.validation.license.notgranted": "Feumaidh tu an cead seo a thoirt gus crìoch a chur air a' chur-a-steach. Mura h-urrainn dhut cead a thoirt an-dràsta is urrainn dhut an obair a shàbhaladh agus tilleadh aig àm eile no an cur-a-steach a thoirt air falbh.",
 
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   // TODO New key - Add a translation
@@ -2056,24 +2463,24 @@
   "footer.copyright": "dlighe-sgrìobhaidh © 2002-{{ year }}",
 
   // "footer.link.dspace": "DSpace software",
-   "footer.link.dspace": "Bathar-bog DSpace",
+  "footer.link.dspace": "Bathar-bog DSpace",
 
   // "footer.link.lyrasis": "LYRASIS",
-   "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "LYRASIS",
 
   // "footer.link.cookies": "Cookie settings",
-   "footer.link.cookies": "Seatadh chriomagan",
+  "footer.link.cookies": "Seatadh chriomagan",
 
   // "footer.link.privacy-policy": "Privacy policy",
-   "footer.link.privacy-policy": "Poileasaidh prìobhaideachd",
+  "footer.link.privacy-policy": "Poileasaidh prìobhaideachd",
 
   // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"Aonta Neach-cleachdaidh Deireannach",
+  "footer.link.end-user-agreement": "Aonta Neach-cleachdaidh Deireannach",
 
 
 
   // "forgot-email.form.header": "Forgot Password",
-    "forgot-email.form.header": "Dìochuimhne air Facal-faire",
+  "forgot-email.form.header": "Dìochuimhne air Facal-faire",
 
   // "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
@@ -2101,7 +2508,7 @@
   "forgot-email.form.success.content": "Chaidh post-d a chur gu {{ email }} sa bheil URL sònraichte agus tuilleadh stiùiridh.",
 
   // "forgot-email.form.error.head": "Error when trying to register email",
-   "forgot-email.form.error.head": "Mearachd ann a' clàradh post-d",
+  "forgot-email.form.error.head": "Mearachd ann a' clàradh post-d",
 
   // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
   "forgot-email.form.error.content": "Bha mearachd ann a' clàradh seòladh a' phuist-d a leanas: {{ email }}",
@@ -2112,16 +2519,16 @@
   "forgot-password.title": "Dìochuimhne air Facal-faire",
 
   // "forgot-password.form.head": "Forgot Password",
-   "forgot-password.form.head": "Dìochuimhne air Facal-faire",
+  "forgot-password.form.head": "Dìochuimhne air Facal-faire",
 
   // "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": "Cuir facal-faire ùr sa bhogsa gu h-ìosal, agus dearbh e le bhith ga thaidhpeadh a-rithist san dàrna bogsa. Bu chòir co-dhiù sia caractaran a bhith ann.",
+  "forgot-password.form.info": "Cuir facal-faire ùr sa bhogsa gu h-ìosal, agus dearbh e le bhith ga thaidhpeadh a-rithist san dàrna bogsa. Bu chòir co-dhiù sia caractaran a bhith ann.",
 
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Tèarainteachd",
 
   // "forgot-password.form.identification.header": "Identify",
-    "forgot-password.form.identification.header": "Aithnich",
+  "forgot-password.form.identification.header": "Aithnich",
 
   // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "Seòladh post-d: ",
@@ -2137,7 +2544,7 @@
   "forgot-password.form.error.empty-password": "Cuir facal-faire sa bhogsa gu h-ìosal.",
 
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-   "forgot-password.form.error.matching-passwords": "Chan eil na faclan-faire a' maidseadh.",
+  "forgot-password.form.error.matching-passwords": "Chan eil na faclan-faire a' maidseadh.",
 
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
   "forgot-password.form.error.password-length": "Bu chòir co-dhiù 6 caractaran a bhith san fhacal-faire.",
@@ -2149,7 +2556,7 @@
   "forgot-password.form.notification.success.content": "Chaidh am facal-faire ath-sheatadh. Chaidh do logadh a-steach mar an neach-cleachdaidh cruthaichte.",
 
   // "forgot-password.form.notification.success.title": "Password reset completed",
-   "forgot-password.form.notification.success.title": "Facal-faire air ath-sheatadh",
+  "forgot-password.form.notification.success.title": "Facal-faire air ath-sheatadh",
 
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Cuir a-steach facal-faire",
@@ -2166,7 +2573,7 @@
   "form.cancel": "Cansail",
 
   // "form.clear": "Clear",
-    "form.clear": "Glan",
+  "form.clear": "Glan",
 
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Cliog an seo agus thoir an luach taghte air falbh",
@@ -2184,7 +2591,7 @@
   "form.edit-help": "Cliog an seo agus deasaich an luach taghte",
 
   // "form.first-name": "First name",
-   "form.first-name": "Ciad ainm",
+  "form.first-name": "Ciad ainm",
 
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Leag",
@@ -2196,29 +2603,26 @@
   "form.group-expand": "Leudaich",
 
   // "form.group-expand-help": "Click here to expand and add more elements",
-   "form.group-expand-help": "Cliog an seo gus leudachadh agus gus tuilleadh eileamaidean a chur-ris",
+  "form.group-expand-help": "Cliog an seo gus leudachadh agus gus tuilleadh eileamaidean a chur-ris",
 
   // "form.last-name": "Last name",
   "form.last-name": "Sloinneadh",
 
   // "form.loading": "Loading...",
-   "form.loading": "A' luchdachadh...",
+  "form.loading": "A' luchdachadh...",
 
   // "form.lookup": "Lookup",
   "form.lookup": "Lorg",
 
   // "form.lookup-help": "Click here to look up an existing relation",
-   "form.lookup-help": "Cliog an seo agus lorg dàimh a th' ann mu thràth",
+  "form.lookup-help": "Cliog an seo agus lorg dàimh a th' ann mu thràth",
 
   // "form.no-results": "No results found",
-   "form.no-results": "Cha deach toraidhean a lorg",
+  "form.no-results": "Cha deach toraidhean a lorg",
 
   // "form.no-value": "No value entered",
   "form.no-value": "Cha deach luach a chur a-steach",
 
-  // "form.other-information": {},
-    "form.other-information": {},
-
   // "form.remove": "Remove",
   "form.remove": "Thoir às",
 
@@ -2226,10 +2630,10 @@
   "form.save": "Sàbhail",
 
   // "form.save-help": "Save changes",
-   "form.save-help": "Sàbhail atharraichean",
+  "form.save-help": "Sàbhail atharraichean",
 
   // "form.search": "Search",
-   "form.search": "Rannsaich",
+  "form.search": "Rannsaich",
 
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Cliog an seo agus lorg co-fhreagartas a th' ann mu thràth",
@@ -2238,7 +2642,7 @@
   "form.submit": "Sàbhail",
 
   // "form.repeatable.sort.tip": "Drop the item in the new position",
-    "form.repeatable.sort.tip": "Leig às an nì san àite ùr",
+  "form.repeatable.sort.tip": "Leig às an nì san àite ùr",
 
 
 
@@ -2249,10 +2653,10 @@
   "grant-deny-request-copy.email.back": "Air ais",
 
   // "grant-deny-request-copy.email.message": "Message",
-   "grant-deny-request-copy.email.message": "Brath",
+  "grant-deny-request-copy.email.message": "Brath",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
-   "grant-deny-request-copy.email.message.empty": "Cuir ann brath",
+  "grant-deny-request-copy.email.message.empty": "Cuir ann brath",
 
   // "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.",
   // TODO New key - Add a translation
@@ -2274,13 +2678,13 @@
   "grant-deny-request-copy.grant": "Cuir copaidh",
 
   // "grant-deny-request-copy.header": "Document copy request",
-    "grant-deny-request-copy.header": "Iarrtas airson copaidh de sgrìobhainn",
+  "grant-deny-request-copy.header": "Iarrtas airson copaidh de sgrìobhainn",
 
   // "grant-deny-request-copy.home-page": "Take me to the home page",
   "grant-deny-request-copy.home-page": "Thoir mi chun na duilleig-dachaigh",
 
   // "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": "Mas tu aon de ùghdaran sgrìobhainn <a href='{{ url }}'>{{ name }}</a>, cleachd aon de na roghainnean gu h-ìosal agus freagair iarrtas an neach-cleachdaidh.",
+  "grant-deny-request-copy.intro1": "Mas tu aon de ùghdaran sgrìobhainn <a href='{{ url }}'>{{ name }}</a>, cleachd aon de na roghainnean gu h-ìosal agus freagair iarrtas an neach-cleachdaidh.",
 
   // "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": "An dèidh dhut roghainn a thaghadh, chì thu sampall freagairt post-d as urrainn dhut a dheasachadh.",
@@ -2301,13 +2705,13 @@
   "grant-request-copy.error": "Bha mearachd ann",
 
   // "grant-request-copy.header": "Grant document copy request",
-   "grant-request-copy.header": "Ceadaich copaidh de sgrìobhainn",
+  "grant-request-copy.header": "Ceadaich copaidh de sgrìobhainn",
 
   // "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": "Thèid am brath seo chun an neach a rinn an t-iarrtas. Bidh sgrìobhainn(ean) a chaidh iarraidh na chois.",
 
   // "grant-request-copy.success": "Successfully granted item request",
-    "grant-request-copy.success": "Chaidh an t-iarrtas airson nì a cheadachadh",
+  "grant-request-copy.success": "Chaidh an t-iarrtas airson nì a cheadachadh",
 
 
 
@@ -2315,19 +2719,19 @@
   "home.description": "",
 
   // "home.breadcrumbs": "Home",
-   "home.breadcrumbs": "Dachaigh",
+  "home.breadcrumbs": "Dachaigh",
 
   // "home.search-form.placeholder": "Search the repository ...",
-   "home.search-form.placeholder": "Rannsaich an t-ionad-tasgaidh ...",
+  "home.search-form.placeholder": "Rannsaich an t-ionad-tasgaidh ...",
 
   // "home.title": "Home",
-    "home.title": "Dachaigh",
+  "home.title": "Dachaigh",
 
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Coimhearsnachdan ann an DSpace",
 
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-   "home.top-level-communities.help": "Tagh coimhearsnachd agus brobhs na cruinneachaidhean.",
+  "home.top-level-communities.help": "Tagh coimhearsnachd agus brobhs na cruinneachaidhean.",
 
 
 
@@ -2350,16 +2754,16 @@
   "info.end-user-agreement.buttons.save": "Sàbhail",
 
   // "info.end-user-agreement.head": "End User Agreement",
-   "info.end-user-agreement.head": "Aonta Neach-cleachdaidh Deireannach",
+  "info.end-user-agreement.head": "Aonta Neach-cleachdaidh Deireannach",
 
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Aonta Neach-cleachdaidh Deireannach",
 
   // "info.privacy.breadcrumbs": "Privacy Statement",
-   "info.privacy.breadcrumbs": "Aithris Prìobhaideachd",
+  "info.privacy.breadcrumbs": "Aithris Prìobhaideachd",
 
   // "info.privacy.head": "Privacy Statement",
-   "info.privacy.head": "Aithris Prìobhaideachd",
+  "info.privacy.head": "Aithris Prìobhaideachd",
 
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Aithris Prìobhaideachd",
@@ -2378,12 +2782,12 @@
   "item.edit.authorizations.heading": "Leis an deasaichear seo is urrainn dhut poileasaidhean nì fhaicinn agus atharrachadh, agus poileasaidhean pàirtean fa leth de nithean atharrachadh: trusganan agus bitstreaman. Gu sìmplidh, 's e cointèanar airson thrusganan a th' ann an nì, agus 's e cointèanar airson bhitstreaman a th' ann an trusganan. Bidh poileasaidh CUIR-RIS/THOIR ÀS/LEUGH/SGRÌOBH aig cointèanaran, ach poileasaidhean LEUGH/SGRÌOBH a-mhàin aig bitstreaman.",
 
   // "item.edit.authorizations.title": "Edit item's Policies",
-   "item.edit.authorizations.title": "Deasaich Poileasaidhean nì",
+  "item.edit.authorizations.title": "Deasaich Poileasaidhean nì",
 
 
 
   // "item.badge.private": "Private",
-    "item.badge.private": "Prìobhaideach",
+  "item.badge.private": "Prìobhaideach",
 
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Air a thoirt air falbh",
@@ -2391,42 +2795,42 @@
 
 
   // "item.bitstreams.upload.bundle": "Bundle",
-   "item.bitstreams.upload.bundle": "Trusgan",
+  "item.bitstreams.upload.bundle": "Trusgan",
 
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-    "item.bitstreams.upload.bundle.placeholder": "Tagh trusgan",
+  "item.bitstreams.upload.bundle.placeholder": "Tagh trusgan",
 
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Cruthaich trusgan",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Chan eil trusganan san nì seo dhan gabh bitstream a luchdachadh suas.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
-   "item.bitstreams.upload.cancel": "Cansail",
+  "item.bitstreams.upload.cancel": "Cansail",
 
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
-   "item.bitstreams.upload.drop-message": "Leig às faidhle airson luchdachadh suas",
+  "item.bitstreams.upload.drop-message": "Leig às faidhle airson luchdachadh suas",
 
   // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "Nì: ",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
-   "item.bitstreams.upload.notifications.bundle.created.content": "Chaidh trusgan ùr a chruthachadh.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Chaidh trusgan ùr a chruthachadh.",
 
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-   "item.bitstreams.upload.notifications.bundle.created.title": "Chruthaicheadh trusgan",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Chruthaicheadh trusgan",
 
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-   "item.bitstreams.upload.notifications.upload.failed": "Cha do dh'obraich an luchdachadh suas. Dearbh an t-susbaint mus feuch thu a-rithist.",
+  "item.bitstreams.upload.notifications.upload.failed": "Cha do dh'obraich an luchdachadh suas. Dearbh an t-susbaint mus feuch thu a-rithist.",
 
   // "item.bitstreams.upload.title": "Upload bitstream",
-   "item.bitstreams.upload.title": "Luchdaich suas bitstream",
+  "item.bitstreams.upload.title": "Luchdaich suas bitstream",
 
 
 
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
-   "item.edit.bitstreams.bundle.edit.buttons.upload": "Luchdaich suas",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Luchdaich suas",
 
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
   "item.edit.bitstreams.bundle.displaying": "A' taisbeanadh an-dràsta {{ amount }} bitstreaman à {{ total }}.",
@@ -2435,16 +2839,16 @@
   "item.edit.bitstreams.bundle.load.all": "Luchdaich ({{ total }}) gu lèir",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-   "item.edit.bitstreams.bundle.load.more": "Luchdaich tuilleadh",
+  "item.edit.bitstreams.bundle.load.more": "Luchdaich tuilleadh",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
-    "item.edit.bitstreams.bundle.name": "TRUSGAN: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "TRUSGAN: {{ name }}",
 
   // "item.edit.bitstreams.discard-button": "Discard",
-    "item.edit.bitstreams.discard-button": "Cuir às",
+  "item.edit.bitstreams.discard-button": "Cuir às",
 
   // "item.edit.bitstreams.edit.buttons.download": "Download",
-    "item.edit.bitstreams.edit.buttons.download": "Luchdaich a-nuas",
+  "item.edit.bitstreams.edit.buttons.download": "Luchdaich a-nuas",
 
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
   "item.edit.bitstreams.edit.buttons.drag": "Slaod",
@@ -2453,16 +2857,16 @@
   "item.edit.bitstreams.edit.buttons.edit": "Deasaich",
 
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
-   "item.edit.bitstreams.edit.buttons.remove": "Thoir às",
+  "item.edit.bitstreams.edit.buttons.remove": "Thoir às",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-    "item.edit.bitstreams.edit.buttons.undo": "Neo-dhèan atharraichean",
+  "item.edit.bitstreams.edit.buttons.undo": "Neo-dhèan atharraichean",
 
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Chan eil bitstreaman san nì seo. Cliog am putan luchdaich suas agus cruthaich fear.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-   "item.edit.bitstreams.headers.actions": "Gnìomhan",
+  "item.edit.bitstreams.headers.actions": "Gnìomhan",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Trusgan",
@@ -2471,7 +2875,7 @@
   "item.edit.bitstreams.headers.description": "Cunntas",
 
   // "item.edit.bitstreams.headers.format": "Format",
-   "item.edit.bitstreams.headers.format": "Fòrmat",
+  "item.edit.bitstreams.headers.format": "Fòrmat",
 
   // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "Ainm",
@@ -2483,7 +2887,7 @@
   "item.edit.bitstreams.notifications.discarded.title": "Chuireadh às do na h-atharraichean",
 
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
-   "item.edit.bitstreams.notifications.move.failed.title": "Mearachd a' gluasad bhitstreaman",
+  "item.edit.bitstreams.notifications.move.failed.title": "Mearachd a' gluasad bhitstreaman",
 
   // "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
@@ -2525,16 +2929,16 @@
   "item.edit.delete.cancel": "Cansail",
 
   // "item.edit.delete.confirm": "Delete",
-   "item.edit.delete.confirm": "Dubh às",
+  "item.edit.delete.confirm": "Dubh às",
 
   // "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": "A bheil thu cinnteach gum bu chòir an nì seo a dhubhadh às buileach? An aire!: An-dràsta, cha bhiodh leac-uaighe air fhàgail.",
 
   // "item.edit.delete.error": "An error occurred while deleting the item",
-    "item.edit.delete.error": "Bha mearachd ann a' dubhadh às an nì seo",
+  "item.edit.delete.error": "Bha mearachd ann a' dubhadh às an nì seo",
 
   // "item.edit.delete.header": "Delete item: {{ id }}",
-   "item.edit.delete.header": "Dubh às nì: {{ id }}",
+  "item.edit.delete.header": "Dubh às nì: {{ id }}",
 
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "Chaidh a nì a dhubhadh às",
@@ -2554,29 +2958,29 @@
   "item.edit.tabs.mapper.head": "Mapair Cruinneachaidh",
 
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
-   "item.edit.tabs.item-mapper.title": "Deasachadh Nì - Mapair Cruinneachaidh",
+  "item.edit.tabs.item-mapper.title": "Deasachadh Nì - Mapair Cruinneachaidh",
 
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
-   "item.edit.item-mapper.buttons.add": "Map an nì gu cruinneachaidhean taghte",
+  "item.edit.item-mapper.buttons.add": "Map an nì gu cruinneachaidhean taghte",
 
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "Thoir às mapadh nì do chruinneachaidhean taghte",
 
   // "item.edit.item-mapper.cancel": "Cancel",
-   "item.edit.item-mapper.cancel": "Cansail",
+  "item.edit.item-mapper.cancel": "Cansail",
 
   // "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": "Seo am mapair nithean, an t-inneal a leigeas le rianairean an nì seo a mhapadh gu cruinneachaidhean eile. Is urrainn dhut rannsachadh airson chruinneachaidhean agus am mapadh, no an liosta de chruinneachaidhean dha bheil an nì air a mhapadh an-dràsta a bhrobhsadh.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-   "item.edit.item-mapper.head": "Item Mapper - Map Nì gu Cruinneachaidhean",
+  "item.edit.item-mapper.head": "Item Mapper - Map Nì gu Cruinneachaidhean",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Nì: \"<b>{{name}}</b>\"",
 
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
-   "item.edit.item-mapper.no-search": "Cuir a-steach ceist ri rannsachadh",
+  "item.edit.item-mapper.no-search": "Cuir a-steach ceist ri rannsachadh",
 
   // "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": "Bha mearachdan ann a' mapadh an nì gu {{amount}} cruinneachaidhean.",
@@ -2588,7 +2992,7 @@
   "item.edit.item-mapper.notifications.add.success.content": "Chaidh an nì a mhapadh gu {{amount}} cruinneachaidhean.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-    "item.edit.item-mapper.notifications.add.success.head": "Mapadh dèante",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapadh dèante",
 
   // "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": "Bha mearachdan ann a' toirt às a' mhapaidh gu {{amount}} cruinneachaidhean.",
@@ -2614,19 +3018,19 @@
 
 
   // "item.edit.metadata.add-button": "Add",
-    "item.edit.metadata.add-button": "Cuir-ris",
+  "item.edit.metadata.add-button": "Cuir-ris",
 
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Cuir às",
 
   // "item.edit.metadata.edit.buttons.edit": "Edit",
-    "item.edit.metadata.edit.buttons.edit": "Deasaich",
+  "item.edit.metadata.edit.buttons.edit": "Deasaich",
 
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Thoir às",
 
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
-   "item.edit.metadata.edit.buttons.undo": "Neo-dhèan atharraichean",
+  "item.edit.metadata.edit.buttons.undo": "Neo-dhèan atharraichean",
 
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Sguir a dheasachadh",
@@ -2638,10 +3042,10 @@
   "item.edit.metadata.headers.edit": "Deasaich",
 
   // "item.edit.metadata.headers.field": "Field",
-   "item.edit.metadata.headers.field": "Raon",
+  "item.edit.metadata.headers.field": "Raon",
 
   // "item.edit.metadata.headers.language": "Lang",
-   "item.edit.metadata.headers.language": "Cànan",
+  "item.edit.metadata.headers.language": "Cànan",
 
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Luach",
@@ -2650,10 +3054,10 @@
   "item.edit.metadata.metadatafield.invalid": "Tagh raon metadata brìgheil",
 
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-   "item.edit.metadata.notifications.discarded.content": "Chaidh cur às do na h-atharraichean.  Gus na h-atharraichean a chur air ais ann, cliog am putan 'Neo-dhèan'",
+  "item.edit.metadata.notifications.discarded.content": "Chaidh cur às do na h-atharraichean.  Gus na h-atharraichean a chur air ais ann, cliog am putan 'Neo-dhèan'",
 
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-   "item.edit.metadata.notifications.discarded.title": "Chuireadh às do na h-atharraichean",
+  "item.edit.metadata.notifications.discarded.title": "Chuireadh às do na h-atharraichean",
 
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Bha mearachd ann",
@@ -2668,10 +3072,10 @@
   "item.edit.metadata.notifications.outdated.content": "Chaidh an nì air a bheil thu ag obair atharrachadh le neach-cleachdaidh eile. Chaidh cur às do na h-atharraichean agad gus còmhstri a sheachnadh",
 
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-   "item.edit.metadata.notifications.outdated.title": "Atharraichean bho fheum",
+  "item.edit.metadata.notifications.outdated.title": "Atharraichean bho fheum",
 
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-   "item.edit.metadata.notifications.saved.content": "Chaidh na h-atharraichean air metadata an nì seo a shàbhaladh.",
+  "item.edit.metadata.notifications.saved.content": "Chaidh na h-atharraichean air metadata an nì seo a shàbhaladh.",
 
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Shàbhaileadh metadata",
@@ -2680,7 +3084,7 @@
   "item.edit.metadata.reinstate-button": "Neo-dhèan",
 
   // "item.edit.metadata.save-button": "Save",
-   "item.edit.metadata.save-button": "Sàbhail",
+  "item.edit.metadata.save-button": "Sàbhail",
 
 
 
@@ -2688,10 +3092,10 @@
   "item.edit.modify.overview.field": "Raon",
 
   // "item.edit.modify.overview.language": "Language",
-    "item.edit.modify.overview.language": "Cànan",
+  "item.edit.modify.overview.language": "Cànan",
 
   // "item.edit.modify.overview.value": "Value",
-   "item.edit.modify.overview.value": "Luach",
+  "item.edit.modify.overview.value": "Luach",
 
 
 
@@ -2699,10 +3103,10 @@
   "item.edit.move.cancel": "Air ais",
 
   // "item.edit.move.save-button": "Save",
-   "item.edit.move.save-button": "Sàbhail",
+  "item.edit.move.save-button": "Sàbhail",
 
   // "item.edit.move.discard-button": "Discard",
-   "item.edit.move.discard-button": "Cuir às",
+  "item.edit.move.discard-button": "Cuir às",
 
   // "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": "Tagh an cruinneachadh dha bheil thu airson an nì seo a ghluasad. Gus an liosta de chruinneachaidhean taisbeinte a ghiorrachadh, is urrainn dhut ceist rannsachaidh a chur dhan bhogsa.",
@@ -2711,7 +3115,7 @@
   "item.edit.move.error": "Bha mearachd ann a' feuchainn ris an nì a ghluasad",
 
   // "item.edit.move.head": "Move item: {{id}}",
-   "item.edit.move.head": "Gluais nì: {{id}}",
+  "item.edit.move.head": "Gluais nì: {{id}}",
 
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Sealbhaich poileasaidhean",
@@ -2720,7 +3124,7 @@
   "item.edit.move.inheritpolicies.description": "Sealbhaich poileasaidhean gnàthach cruinneachadh a' chinn-uidhe",
 
   // "item.edit.move.move": "Move",
-    "item.edit.move.move": "Gluais",
+  "item.edit.move.move": "Gluais",
 
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "A' gluasad...",
@@ -2732,7 +3136,7 @@
   "item.edit.move.success": "Chaidh an nì a ghluasad",
 
   // "item.edit.move.title": "Move item",
-   "item.edit.move.title": "Gluais nì",
+  "item.edit.move.title": "Gluais nì",
 
 
 
@@ -2740,7 +3144,7 @@
   "item.edit.private.cancel": "Cansail",
 
   // "item.edit.private.confirm": "Make it Private",
-   "item.edit.private.confirm": "Dèan prìobhaideach e",
+  "item.edit.private.confirm": "Dèan prìobhaideach e",
 
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
   "item.edit.private.description": "A bheil thu cinnteach gum bu chòir an nì seo a bhith prìobhaideach san tasglann?",
@@ -2752,35 +3156,35 @@
   "item.edit.private.header": "Dèan nì prìobhaideach: {{ id }}",
 
   // "item.edit.private.success": "The item is now private",
-   "item.edit.private.success": "Tha an nì prìobhaideach a-nis",
+  "item.edit.private.success": "Tha an nì prìobhaideach a-nis",
 
 
 
   // "item.edit.public.cancel": "Cancel",
-   "item.edit.public.cancel": "Cansail",
+  "item.edit.public.cancel": "Cansail",
 
   // "item.edit.public.confirm": "Make it Public",
-   "item.edit.public.confirm": "Dèan poblach e",
+  "item.edit.public.confirm": "Dèan poblach e",
 
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
   "item.edit.public.description": "A bheil thu cinnteach gum bu chòir an nì seo a bhith poblach san tasglann?",
 
   // "item.edit.public.error": "An error occurred while making the item public",
-   "item.edit.public.error": "Bha mearachd ann a' dèanamh an nì seo poblach",
+  "item.edit.public.error": "Bha mearachd ann a' dèanamh an nì seo poblach",
 
   // "item.edit.public.header": "Make item public: {{ id }}",
-   "item.edit.public.header": "Dèan nì poblach: {{ id }}",
+  "item.edit.public.header": "Dèan nì poblach: {{ id }}",
 
   // "item.edit.public.success": "The item is now public",
-   "item.edit.public.success": "Tha an nì poblach a-nis",
+  "item.edit.public.success": "Tha an nì poblach a-nis",
 
 
 
   // "item.edit.reinstate.cancel": "Cancel",
-   "item.edit.reinstate.cancel": "Cansail",
+  "item.edit.reinstate.cancel": "Cansail",
 
   // "item.edit.reinstate.confirm": "Reinstate",
-   "item.edit.reinstate.confirm": "Cuir air ais ann",
+  "item.edit.reinstate.confirm": "Cuir air ais ann",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "A bheil thu cinnteach gum bu chòir an nì seo a chur air ais anns an tasglann?",
@@ -2792,21 +3196,21 @@
   "item.edit.reinstate.header": "Cuir nì air ais ann: {{ id }}",
 
   // "item.edit.reinstate.success": "The item was reinstated successfully",
-   "item.edit.reinstate.success": "Chaidh an nì a chur air ais ann",
+  "item.edit.reinstate.success": "Chaidh an nì a chur air ais ann",
 
 
 
   // "item.edit.relationships.discard-button": "Discard",
-    "item.edit.relationships.discard-button": "Cuir às",
+  "item.edit.relationships.discard-button": "Cuir às",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "Cuir-ris",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
-   "item.edit.relationships.edit.buttons.remove": "Thoir às",
+  "item.edit.relationships.edit.buttons.remove": "Thoir às",
 
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-   "item.edit.relationships.edit.buttons.undo": "Neo-dhèan atharraichean",
+  "item.edit.relationships.edit.buttons.undo": "Neo-dhèan atharraichean",
 
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "Chan eil dàimhean ann",
@@ -2843,7 +3247,7 @@
 
 
   // "item.edit.return": "Back",
-   "item.edit.return": "Air ais",
+  "item.edit.return": "Air ais",
 
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
@@ -2853,7 +3257,7 @@
   "item.edit.tabs.bitstreams.title": "Deasachadh Nì - Bitstreaman",
 
   // "item.edit.tabs.curate.head": "Curate",
-   "item.edit.tabs.curate.head": "Eagraich",
+  "item.edit.tabs.curate.head": "Eagraich",
 
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Deasachadh Nì - Eagraich",
@@ -2865,7 +3269,7 @@
   "item.edit.tabs.metadata.title": "Deasachadh Nì -  Metadata",
 
   // "item.edit.tabs.relationships.head": "Relationships",
-   "item.edit.tabs.relationships.head": "Dàimhean",
+  "item.edit.tabs.relationships.head": "Dàimhean",
 
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "Deasachadh Nì - Dàimhean",
@@ -2880,16 +3284,16 @@
   "item.edit.tabs.status.buttons.delete.button": "Dubh às gu bràth",
 
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
-   "item.edit.tabs.status.buttons.delete.label": "Cuir às buileach don nì",
+  "item.edit.tabs.status.buttons.delete.label": "Cuir às buileach don nì",
 
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
-   "item.edit.tabs.status.buttons.mappedCollections.button": "Cruinneachaidhean mapaichte",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Cruinneachaidhean mapaichte",
 
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Manaids cruinneachaidhean mapaichte",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Gluais...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Helyezze át ezt az elemet egy másik gyűjteménybe",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Gluais nì gu cruinneachadh eile",
@@ -2898,37 +3302,37 @@
   "item.edit.tabs.status.buttons.private.button": "Dèan prìobhaideach e...",
 
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
-   "item.edit.tabs.status.buttons.private.label": "Dèan nì prìobhaideach",
+  "item.edit.tabs.status.buttons.private.label": "Dèan nì prìobhaideach",
 
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
   "item.edit.tabs.status.buttons.public.button": "Dèan poblach e..",
 
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
-   "item.edit.tabs.status.buttons.public.label": "Dèan nì poblach",
+  "item.edit.tabs.status.buttons.public.label": "Dèan nì poblach",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-    "item.edit.tabs.status.buttons.reinstate.button": "Cuir air ais ann...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Cuir air ais ann...",
 
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
-   "item.edit.tabs.status.buttons.reinstate.label": "Cuir nì air ais anns an ionad-tasgaidh",
+  "item.edit.tabs.status.buttons.reinstate.label": "Cuir nì air ais anns an ionad-tasgaidh",
 
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Chan eil cead agad an gnìomh seo a dhèanamh",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Thoir air falbh...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Thoir air falbh",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-    "item.edit.tabs.status.buttons.withdraw.label": "Thoir nì air falbh bhon ionad-tasgaidh",
+  "item.edit.tabs.status.buttons.withdraw.label": "Thoir nì air falbh bhon ionad-tasgaidh",
 
   // "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": "Fàilte don duilleig-manaidsidh. À seo is urrainn dhut nì a thoirt air falbh, a chur air ais ann, a ghluasad no a dhubhadh às. Faodaidh tu cuideachd metadata / bitstreaman ùrachadh no feadhainn ùra a chur-ris air na tabs eile.",
 
   // "item.edit.tabs.status.head": "Status",
-    "item.edit.tabs.status.head": "Inbhe",
+  "item.edit.tabs.status.head": "Inbhe",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
-   "item.edit.tabs.status.labels.handle": "Làmhrachan",
+  "item.edit.tabs.status.labels.handle": "Làmhrachan",
 
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "ID A-staigh Nì",
@@ -2936,14 +3340,14 @@
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Duilleag Nì",
 
-  // "item.edit.tabs.status.labels.lastModified": "Last Modified", 
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Atharraichte mu dheireadh",
 
   // "item.edit.tabs.status.title": "Item Edit -  Status",
-   "item.edit.tabs.status.title": "Deasachadh Nì -  Inbhe",
+  "item.edit.tabs.status.title": "Deasachadh Nì -  Inbhe",
 
   // "item.edit.tabs.versionhistory.head": "Version History",
-   "item.edit.tabs.versionhistory.head": "Eachdraidh Dhreachan",
+  "item.edit.tabs.versionhistory.head": "Eachdraidh Dhreachan",
 
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
   "item.edit.tabs.versionhistory.title": "Deasachadh Nì - Eachdraidh Dhreachan",
@@ -2961,10 +3365,10 @@
 
 
   // "item.edit.withdraw.cancel": "Cancel",
-   "item.edit.withdraw.cancel": "Cansail",
+  "item.edit.withdraw.cancel": "Cansail",
 
   // "item.edit.withdraw.confirm": "Withdraw",
-   "item.edit.withdraw.confirm": "Thoir air falbh",
+  "item.edit.withdraw.confirm": "Thoir air falbh",
 
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "A bheil thu cinnteach gum bu chòir an nì seo a thoirt air falbh bhon tasglann?",
@@ -2976,7 +3380,7 @@
   "item.edit.withdraw.header": "Thoir air falbh nì: {{ id }}",
 
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-   "item.edit.withdraw.success": "Chaidh an nì a thoirt air falbh",
+  "item.edit.withdraw.success": "Chaidh an nì a thoirt air falbh",
 
 
 
@@ -2984,10 +3388,10 @@
   "item.listelement.badge": "Nì",
 
   // "item.page.description": "Description",
-   "item.page.description": "Cunntas",
+  "item.page.description": "Cunntas",
 
   // "item.page.journal-issn": "Journal ISSN",
-   "item.page.journal-issn": "ISSN Diornal",
+  "item.page.journal-issn": "ISSN Diornal",
 
   // "item.page.journal-title": "Journal Title",
   "item.page.journal-title": "Tiotal Diornal",
@@ -2999,10 +3403,10 @@
   "item.page.titleprefix": "Nì: ",
 
   // "item.page.volume-title": "Volume Title",
-   "item.page.volume-title": "Tiotal Àireamh Diornal",
+  "item.page.volume-title": "Tiotal Àireamh Diornal",
 
   // "item.search.results.head": "Item Search Results",
-   "item.search.results.head": "Toraidhean Rannsachadh Nì",
+  "item.search.results.head": "Toraidhean Rannsachadh Nì",
 
   // "item.search.title": "Item Search",
   "item.search.title": "Rannsachadh Nì",
@@ -3013,7 +3417,7 @@
   "item.page.abstract": "Giorrachadh",
 
   // "item.page.author": "Authors",
-   "item.page.author": "Ùghdaran",
+  "item.page.author": "Ùghdaran",
 
   // "item.page.citation": "Citation",
   "item.page.citation": "Iomradh",
@@ -3022,7 +3426,7 @@
   "item.page.collections": "Cruinneachaidhean",
 
   // "item.page.collections.loading": "Loading...",
-    "item.page.collections.loading": "A' luchdachadh...",
+  "item.page.collections.loading": "A' luchdachadh...",
 
   // "item.page.collections.load-more": "Load more",
   "item.page.collections.load-more": "Luchdaich tuilleadh",
@@ -3043,13 +3447,13 @@
   "item.page.filesection.download": "Luchdaich a-nuas",
 
   // "item.page.filesection.format": "Format:",
-   "item.page.filesection.format": "Fòrmat:",
+  "item.page.filesection.format": "Fòrmat:",
 
   // "item.page.filesection.name": "Name:",
-   "item.page.filesection.name": "Ainm:",
+  "item.page.filesection.name": "Ainm:",
 
   // "item.page.filesection.size": "Size:",
-    "item.page.filesection.size": "Meud:",
+  "item.page.filesection.size": "Meud:",
 
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Artaigilean san diornal seo",
@@ -3061,7 +3465,7 @@
   "item.page.link.simple": "Duilleag shìmplidh nì",
 
   // "item.page.person.search.title": "Articles by this author",
-   "item.page.person.search.title": "Artaigilean leis an ùghdar seo",
+  "item.page.person.search.title": "Artaigilean leis an ùghdar seo",
 
   // "item.page.related-items.view-more": "Show {{ amount }} more",
   "item.page.related-items.view-more": "Seall {{ amount }} eile",
@@ -3073,13 +3477,13 @@
   "item.page.relationships.isAuthorOfPublication": "Foillseachaidhean",
 
   // "item.page.relationships.isJournalOfPublication": "Publications",
-    "item.page.relationships.isJournalOfPublication": "Foillseachaidhean",
+  "item.page.relationships.isJournalOfPublication": "Foillseachaidhean",
 
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-    "item.page.relationships.isOrgUnitOfPerson": "Ùghdaran",
+  "item.page.relationships.isOrgUnitOfPerson": "Ùghdaran",
 
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-    "item.page.relationships.isOrgUnitOfProject": "Pròiseactan Rannsachaidh",
+  "item.page.relationships.isOrgUnitOfProject": "Pròiseactan Rannsachaidh",
 
   // "item.page.subject": "Keywords",
   "item.page.subject": "Prìomh Fhaclan",
@@ -3091,25 +3495,25 @@
   "item.page.bitstreams.view-more": "Seall tuilleadh",
 
   // "item.page.bitstreams.collapse": "Collapse",
-   "item.page.bitstreams.collapse": "Leag",
+  "item.page.bitstreams.collapse": "Leag",
 
   // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Trusgan tùsail",
+  "item.page.filesection.original.bundle": "Trusgan tùsail",
 
   // "item.page.filesection.license.bundle" : "License bundle",
-   "item.page.filesection.license.bundle" : "Trusgan Cead",
+  "item.page.filesection.license.bundle": "Trusgan Cead",
 
   // "item.page.return": "Back",
-   "item.page.return": "Air ais",
+  "item.page.return": "Air ais",
 
   // "item.page.version.create": "Create new version",
-   "item.page.version.create": "Cruthaich dreach ùr",
+  "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": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
-    "item.preview.dc.identifier.uri": "Aithnichear:",
+  "item.preview.dc.identifier.uri": "Aithnichear:",
 
   // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "Ùghdaran:",
@@ -3118,13 +3522,13 @@
   "item.preview.dc.date.issued": "Deit foillseachaidh:",
 
   // "item.preview.dc.description.abstract": "Abstract:",
-   "item.preview.dc.description.abstract": "Giorrachadh:",
+  "item.preview.dc.description.abstract": "Giorrachadh:",
 
   // "item.preview.dc.identifier.other": "Other identifier:",
-   "item.preview.dc.identifier.other": "Aithnichear eile:",
+  "item.preview.dc.identifier.other": "Aithnichear eile:",
 
   // "item.preview.dc.language.iso": "Language:",
-    "item.preview.dc.language.iso": "Cànan:",
+  "item.preview.dc.language.iso": "Cànan:",
 
   // "item.preview.dc.subject": "Subjects:",
   "item.preview.dc.subject": "Cuspairean:",
@@ -3133,7 +3537,7 @@
   "item.preview.dc.title": "Tiotal:",
 
   // "item.preview.person.familyName": "Surname:",
-   "item.preview.person.familyName": "Sloinneadh:",
+  "item.preview.person.familyName": "Sloinneadh:",
 
   // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "Ainm:",
@@ -3145,16 +3549,16 @@
   "item.preview.project.funder.name": "Maoinichear:",
 
   // "item.preview.project.funder.identifier": "Funder Identifier:",
-    "item.preview.project.funder.identifier": "Aithnichear Maoinicheir:",
+  "item.preview.project.funder.identifier": "Aithnichear Maoinicheir:",
 
   // "item.preview.oaire.awardNumber": "Funding ID:",
-   "item.preview.oaire.awardNumber": "ID Maoineachaidh:",
+  "item.preview.oaire.awardNumber": "ID Maoineachaidh:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-    "item.preview.dc.title.alternative": "Acranaim:",
+  "item.preview.dc.title.alternative": "Acranaim:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
-    "item.preview.dc.coverage.spatial": "Dlighe-chomas:",
+  "item.preview.dc.coverage.spatial": "Dlighe-chomas:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
   "item.preview.oaire.fundingStream": "Sruth Maoineachaidh:",
@@ -3162,10 +3566,10 @@
 
 
   // "item.select.confirm": "Confirm selected",
-   "item.select.confirm": "Dearbh taghadh",
+  "item.select.confirm": "Dearbh taghadh",
 
   // "item.select.empty": "No items to show",
-   "item.select.empty": "Chan eil nithean ri shealltainn",
+  "item.select.empty": "Chan eil nithean ri shealltainn",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Ùghdar",
@@ -3174,7 +3578,7 @@
   "item.select.table.collection": "Cruinneachadh",
 
   // "item.select.table.title": "Title",
-   "item.select.table.title": "Tiotal",
+  "item.select.table.title": "Tiotal",
 
 
   // "item.version.history.empty": "There are no other versions for this item yet.",
@@ -3187,13 +3591,13 @@
   "item.version.history.return": "Air ais",
 
   // "item.version.history.selected": "Selected version",
-   "item.version.history.selected": "Dreach taghte",
+  "item.version.history.selected": "Dreach taghte",
 
   // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
   "item.version.history.selected.alert": "Tha thu a' sealltainn air dreach {{version}} den nì.",
 
   // "item.version.history.table.version": "Version",
-   "item.version.history.table.version": "Dreach",
+  "item.version.history.table.version": "Dreach",
 
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "Nì",
@@ -3202,25 +3606,25 @@
   "item.version.history.table.editor": "Deasaiche",
 
   // "item.version.history.table.date": "Date",
-   "item.version.history.table.date": "Deit",
+  "item.version.history.table.date": "Deit",
 
   // "item.version.history.table.summary": "Summary",
-   "item.version.history.table.summary": "Geàrr-chunntas",
+  "item.version.history.table.summary": "Geàrr-chunntas",
 
   // "item.version.history.table.workspaceItem": "Workspace item",
   "item.version.history.table.workspaceItem": "Nì raon-obrach",
 
   // "item.version.history.table.workflowItem": "Workflow item",
-    "item.version.history.table.workflowItem": "Nì sruth-obrach",
+  "item.version.history.table.workflowItem": "Nì sruth-obrach",
 
   // "item.version.history.table.actions": "Action",
-    "item.version.history.table.actions": "Gnìomh",
+  "item.version.history.table.actions": "Gnìomh",
 
   // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
-   "item.version.history.table.action.editWorkspaceItem": "Deasaich nì raon-obrach",
+  "item.version.history.table.action.editWorkspaceItem": "Deasaich nì raon-obrach",
 
   // "item.version.history.table.action.editSummary": "Edit summary",
-   "item.version.history.table.action.editSummary": "Deasaich geàrr-chunntas",
+  "item.version.history.table.action.editSummary": "Deasaich geàrr-chunntas",
 
   // "item.version.history.table.action.saveSummary": "Save summary edits",
   "item.version.history.table.action.saveSummary": "Sàbhail deasachadh geàrr-chunntais",
@@ -3229,13 +3633,13 @@
   "item.version.history.table.action.discardSummary": "Cuir às do dheasachadh geàrr-chunntais",
 
   // "item.version.history.table.action.newVersion": "Create new version from this one",
-    "item.version.history.table.action.newVersion": "Cruthaich dreach ùr bhon fhear seo",
+  "item.version.history.table.action.newVersion": "Cruthaich dreach ùr bhon fhear seo",
 
   // "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": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
+  "item.version.history.table.action.hasDraft": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3246,44 +3650,44 @@
   "item.version.create.modal.header": "Dreach ùr",
 
   // "item.version.create.modal.text": "Create a new version for this item",
-   "item.version.create.modal.text": "Cruthaich dreach ùr don nì seo",
+  "item.version.create.modal.text": "Cruthaich dreach ùr don nì seo",
 
   // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
   "item.version.create.modal.text.startingFrom": "a' tòiseachadh aig dreach {{version}}",
 
   // "item.version.create.modal.button.confirm": "Create",
-   "item.version.create.modal.button.confirm": "Cruthaich",
+  "item.version.create.modal.button.confirm": "Cruthaich",
 
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
-   "item.version.create.modal.button.confirm.tooltip": "Cruthaich dreach ùr",
+  "item.version.create.modal.button.confirm.tooltip": "Cruthaich dreach ùr",
 
   // "item.version.create.modal.button.cancel": "Cancel",
-   "item.version.create.modal.button.cancel": "Cansail",
+  "item.version.create.modal.button.cancel": "Cansail",
 
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
-    "item.version.create.modal.button.cancel.tooltip": "Na cruthaich dreach ùr",
+  "item.version.create.modal.button.cancel.tooltip": "Na cruthaich dreach ùr",
 
   // "item.version.create.modal.form.summary.label": "Summary",
   "item.version.create.modal.form.summary.label": "Geàrr-chunntas",
 
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
-   "item.version.create.modal.form.summary.placeholder": "Cuir a-steach an geàrr-chunntas don dreach ùr",
+  "item.version.create.modal.form.summary.placeholder": "Cuir a-steach an geàrr-chunntas don dreach ùr",
 
   // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
-   "item.version.create.notification.success" : "Chaidh dreach ùr a chruthachadh le àireamh dreach {{version}}",
+  "item.version.create.notification.success": "Chaidh dreach ùr a chruthachadh le àireamh dreach {{version}}",
 
   // "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.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" : "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
+  "item.version.create.notification.inProgress": "Cha ghabh dreach ùr a chruthachadh oir tha cur-a-steach a' tachairt ann an eachdraidh nan dreachan",
 
 
   // "item.version.delete.modal.header": "Delete version",
-   "item.version.delete.modal.header": "Dubh às dreach",
+  "item.version.delete.modal.header": "Dubh às dreach",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
-   "item.version.delete.modal.text": "A bheil thu airson dreach {{version}} a dhubhadh às?",
+  "item.version.delete.modal.text": "A bheil thu airson dreach {{version}} a dhubhadh às?",
 
   // "item.version.delete.modal.button.confirm": "Delete",
   "item.version.delete.modal.button.confirm": "Dubh às",
@@ -3292,31 +3696,31 @@
   "item.version.delete.modal.button.confirm.tooltip": "Dubh às an dreach seo",
 
   // "item.version.delete.modal.button.cancel": "Cancel",
-   "item.version.delete.modal.button.cancel": "Cansail",
+  "item.version.delete.modal.button.cancel": "Cansail",
 
   // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
   "item.version.delete.modal.button.cancel.tooltip": "Na dubh às an dreach seo",
 
   // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
-   "item.version.delete.notification.success" : "Chaidh dreach àireamh {{version}} a dhubhadh às",
+  "item.version.delete.notification.success": "Chaidh dreach àireamh {{version}} a dhubhadh às",
 
   // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
-   "item.version.delete.notification.failure" : "Cha deach dreach àireamh {{version}} a dhubhadh às",
+  "item.version.delete.notification.failure": "Cha deach dreach àireamh {{version}} a dhubhadh às",
 
 
   // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
-   "item.version.edit.notification.success" : "Chaidh geàrr-chunntas dreach àireamh {{version}} atharrachadh",
+  "item.version.edit.notification.success": "Chaidh geàrr-chunntas dreach àireamh {{version}} atharrachadh",
 
   // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
-   "item.version.edit.notification.failure" : "Cha deach geàrr-chunntas dreach àireamh {{version}} atharrachadh",
+  "item.version.edit.notification.failure": "Cha deach geàrr-chunntas dreach àireamh {{version}} atharrachadh",
 
 
 
   // "journal.listelement.badge": "Journal",
-    "journal.listelement.badge": "Diornal",
+  "journal.listelement.badge": "Diornal",
 
   // "journal.page.description": "Description",
-   "journal.page.description": "Cunntas",
+  "journal.page.description": "Cunntas",
 
   // "journal.page.edit": "Edit this item",
   "journal.page.edit": "Deasaich an nì seo",
@@ -3325,16 +3729,16 @@
   "journal.page.editor": "Àrd-dheasaiche",
 
   // "journal.page.issn": "ISSN",
-   "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
 
   // "journal.page.publisher": "Publisher",
-   "journal.page.publisher": "Foillsichear",
+  "journal.page.publisher": "Foillsichear",
 
   // "journal.page.titleprefix": "Journal: ",
-   "journal.page.titleprefix": "Diornal: ",
+  "journal.page.titleprefix": "Diornal: ",
 
   // "journal.search.results.head": "Journal Search Results",
-    "journal.search.results.head": "Toraidhean Rannsachaidh Diornal",
+  "journal.search.results.head": "Toraidhean Rannsachaidh Diornal",
 
   // "journal.search.title": "Journal Search",
   "journal.search.title": "Rannsachadh Diornal",
@@ -3348,10 +3752,10 @@
   "journalissue.page.description": "Cunntas",
 
   // "journalissue.page.edit": "Edit this item",
-   "journalissue.page.edit": "Deasaich an nì seo",
+  "journalissue.page.edit": "Deasaich an nì seo",
 
   // "journalissue.page.issuedate": "Issue Date",
-    "journalissue.page.issuedate": "Deit Foillseachaidh",
+  "journalissue.page.issuedate": "Deit Foillseachaidh",
 
   // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "ISSN Diornal",
@@ -3363,10 +3767,10 @@
   "journalissue.page.keyword": "Prìomh Fhaclan",
 
   // "journalissue.page.number": "Number",
-   "journalissue.page.number": "Àireamh",
+  "journalissue.page.number": "Àireamh",
 
   // "journalissue.page.titleprefix": "Journal Issue: ",
-   "journalissue.page.titleprefix": "Deasachadh Diornal: ",
+  "journalissue.page.titleprefix": "Deasachadh Diornal: ",
 
 
 
@@ -3374,38 +3778,38 @@
   "journalvolume.listelement.badge": "Àireamh Diornal",
 
   // "journalvolume.page.description": "Description",
-   "journalvolume.page.description": "Cunntas",
+  "journalvolume.page.description": "Cunntas",
 
   // "journalvolume.page.edit": "Edit this item",
-   "journalvolume.page.edit": "Deasaich an nì seo",
+  "journalvolume.page.edit": "Deasaich an nì seo",
 
   // "journalvolume.page.issuedate": "Issue Date",
-    "journalvolume.page.issuedate": "Deit Foillseachaidh",
+  "journalvolume.page.issuedate": "Deit Foillseachaidh",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-   "journalvolume.page.titleprefix": "Àireamh Diornal: ",
+  "journalvolume.page.titleprefix": "Àireamh Diornal: ",
 
   // "journalvolume.page.volume": "Volume",
-    "journalvolume.page.volume": "Àireamh Diornal",
+  "journalvolume.page.volume": "Àireamh Diornal",
 
 
   // "iiifsearchable.listelement.badge": "Document Media",
-    "iiifsearchable.listelement.badge": "Meadhanan Sgrìobhainn",
+  "iiifsearchable.listelement.badge": "Meadhanan Sgrìobhainn",
 
   // "iiifsearchable.page.titleprefix": "Document: ",
-   "iiifsearchable.page.titleprefix": "Sgrìobhainn: ",
+  "iiifsearchable.page.titleprefix": "Sgrìobhainn: ",
 
   // "iiifsearchable.page.doi": "Permanent Link: ",
-   "iiifsearchable.page.doi": "Ceangal Maireannach: ",
+  "iiifsearchable.page.doi": "Ceangal Maireannach: ",
 
   // "iiifsearchable.page.issue": "Issue: ",
-   "iiifsearchable.page.issue": "Deasachadh Diornal: ",
+  "iiifsearchable.page.issue": "Deasachadh Diornal: ",
 
   // "iiifsearchable.page.description": "Description: ",
-   "iiifsearchable.page.description": "Cunntas: ",
+  "iiifsearchable.page.description": "Cunntas: ",
 
   // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
-   "iiifviewer.fullscreen.notice": "Cleachd làn-sgrion airson sealladh nas fheàrr.",
+  "iiifviewer.fullscreen.notice": "Cleachd làn-sgrion airson sealladh nas fheàrr.",
 
   // "iiif.listelement.badge": "Image Media",
   "iiif.listelement.badge": "Meadhanan Ìomhaigh",
@@ -3430,19 +3834,19 @@
   "loading.bitstreams": "A' luchdachadh bhitstreaman...",
 
   // "loading.browse-by": "Loading items...",
-   "loading.browse-by": "A' luchdachadh nithean...",
+  "loading.browse-by": "A' luchdachadh nithean...",
 
   // "loading.browse-by-page": "Loading page...",
-   "loading.browse-by-page": "A' luchdachadh duilleag...",
+  "loading.browse-by-page": "A' luchdachadh duilleag...",
 
   // "loading.collection": "Loading collection...",
-   "loading.collection": "A'luchdachadh cruinneachadh...",
+  "loading.collection": "A'luchdachadh cruinneachadh...",
 
   // "loading.collections": "Loading collections...",
   "loading.collections": "A' luchdachadh chruinneachaidhean...",
 
   // "loading.content-source": "Loading content source...",
-    "loading.content-source": "A' luchdachadh stòr susbaint...",
+  "loading.content-source": "A' luchdachadh stòr susbaint...",
 
   // "loading.community": "Loading community...",
   "loading.community": "A' luchdachadh coimhearsnachd...",
@@ -3451,7 +3855,7 @@
   "loading.default": "A' luchdachadh...",
 
   // "loading.item": "Loading item...",
-   "loading.item": "A' luchdachadh nì...",
+  "loading.item": "A' luchdachadh nì...",
 
   // "loading.items": "Loading items...",
   "loading.items": "A' luchdachadh nithean...",
@@ -3460,10 +3864,10 @@
   "loading.mydspace-results": "A' luchdachadh nithean...",
 
   // "loading.objects": "Loading...",
-   "loading.objects": "A' luchdachadh...",
+  "loading.objects": "A' luchdachadh...",
 
   // "loading.recent-submissions": "Loading recent submissions...",
-   "loading.recent-submissions": "A' luchdachadh chur-a-steachan ùra...",
+  "loading.recent-submissions": "A' luchdachadh chur-a-steachan ùra...",
 
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "A' luchdachadh toraidhean rannsachaidh...",
@@ -3480,7 +3884,7 @@
 
 
   // "login.form.email": "Email address",
-    "login.form.email": "Seòladh post-d",
+  "login.form.email": "Seòladh post-d",
 
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "An do dhìochuimhnich thu d' fhacal-faire?",
@@ -3489,13 +3893,13 @@
   "login.form.header": "Log a-steach gu DSpace",
 
   // "login.form.new-user": "New user? Click here to register.",
-    "login.form.new-user": "Neach-cleachdaidh ùr? Cliog an seo agus clàraich.",
+  "login.form.new-user": "Neach-cleachdaidh ùr? Cliog an seo agus clàraich.",
 
   // "login.form.or-divider": "or",
-    "login.form.or-divider": "no",
+  "login.form.or-divider": "no",
 
   // "login.form.password": "Password",
-   "login.form.password": "Facal-faire",
+  "login.form.password": "Facal-faire",
 
   // "login.form.shibboleth": "Log in with Shibboleth",
   // TODO New key - Add a translation
@@ -3505,7 +3909,7 @@
   "login.form.submit": "Log a-steach",
 
   // "login.title": "Login",
-   "login.title": "Ainm-loga",
+  "login.title": "Ainm-loga",
 
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Ainm-loga",
@@ -3513,7 +3917,7 @@
 
 
   // "logout.form.header": "Log out from DSpace",
-   "logout.form.header": "Log a-mach à DSpace",
+  "logout.form.header": "Log a-mach à DSpace",
 
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Log a-mach",
@@ -3531,7 +3935,7 @@
   "menu.header.image.logo": "Suaicheantas ionaid-tasgaidh",
 
   // "menu.header.admin.description": "Management menu",
-   "menu.header.admin.description": "Clàr-iùil manaidsidh",
+  "menu.header.admin.description": "Clàr-iùil manaidsidh",
 
 
 
@@ -3542,44 +3946,56 @@
   "menu.section.access_control_authorizations": "Barantasan",
 
   // "menu.section.access_control_groups": "Groups",
-   "menu.section.access_control_groups": "Buidhnean",
+  "menu.section.access_control_groups": "Buidhnean",
 
   // "menu.section.access_control_people": "People",
-   "menu.section.access_control_people": "Daoine",
+  "menu.section.access_control_people": "Daoine",
 
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
-   "menu.section.admin_search": "Rannsachadh Rianachd",
+  "menu.section.admin_search": "Rannsachadh Rianachd",
 
 
 
   // "menu.section.browse_community": "This Community",
-   "menu.section.browse_community": "A' Choimhearsnachd seo",
+  "menu.section.browse_community": "A' Choimhearsnachd seo",
 
   // "menu.section.browse_community_by_author": "By Author",
-    "menu.section.browse_community_by_author": "A rèir Ùghdar",
+  "menu.section.browse_community_by_author": "A rèir Ùghdar",
 
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-    "menu.section.browse_community_by_issue_date": "A rèir deit Foillseachaidh",
+  "menu.section.browse_community_by_issue_date": "A rèir deit Foillseachaidh",
 
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "A rèir Tiotal",
 
   // "menu.section.browse_global": "All of DSpace",
-   "menu.section.browse_global": "DSpace gu lèir",
+  "menu.section.browse_global": "DSpace gu lèir",
 
   // "menu.section.browse_global_by_author": "By Author",
-    "menu.section.browse_global_by_author": "A rèir Ùghdar",
+  "menu.section.browse_global_by_author": "A rèir Ùghdar",
 
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-   "menu.section.browse_global_by_dateissued": "A rèir Deit Foillseachaidh",
+  "menu.section.browse_global_by_dateissued": "A rèir Deit Foillseachaidh",
 
   // "menu.section.browse_global_by_subject": "By Subject",
-   "menu.section.browse_global_by_subject": "A rèir Cuspair",
+  "menu.section.browse_global_by_subject": "A rèir Cuspair",
 
   // "menu.section.browse_global_by_title": "By Title",
-    "menu.section.browse_global_by_title": "A rèir Tiotal",
+  "menu.section.browse_global_by_title": "A rèir Tiotal",
 
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Coimhearsnachdan & Cruinneachaidhean",
@@ -3587,55 +4003,59 @@
 
 
   // "menu.section.control_panel": "Control Panel",
-   "menu.section.control_panel": "Pannal Riaghlaidh",
+  "menu.section.control_panel": "Pannal Riaghlaidh",
 
   // "menu.section.curation_task": "Curation Task",
-   "menu.section.curation_task": "Obair Eagrachaidh",
+  "menu.section.curation_task": "Obair Eagrachaidh",
 
 
 
   // "menu.section.edit": "Edit",
-    "menu.section.edit": "Deasaich",
+  "menu.section.edit": "Deasaich",
 
   // "menu.section.edit_collection": "Collection",
-    "menu.section.edit_collection": "Cruinneachadh",
+  "menu.section.edit_collection": "Cruinneachadh",
 
   // "menu.section.edit_community": "Community",
-    "menu.section.edit_community": "Coimhearsnachd",
+  "menu.section.edit_community": "Coimhearsnachd",
 
   // "menu.section.edit_item": "Item",
-    "menu.section.edit_item": "Nì",
+  "menu.section.edit_item": "Nì",
 
 
 
   // "menu.section.export": "Export",
-   "menu.section.export": "Mach-ghluais",
+  "menu.section.export": "Mach-ghluais",
 
   // "menu.section.export_collection": "Collection",
-   "menu.section.export_collection": "Cruinneachadh",
+  "menu.section.export_collection": "Cruinneachadh",
 
   // "menu.section.export_community": "Community",
-   "menu.section.export_community": "Coimhearsnachd",
+  "menu.section.export_community": "Coimhearsnachd",
 
   // "menu.section.export_item": "Item",
-   "menu.section.export_item": "Nì",
+  "menu.section.export_item": "Nì",
 
   // "menu.section.export_metadata": "Metadata",
-   "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata": "Metadata",
 
 
 
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": " Earrann clàr-iùil Riaghladh Cothruim",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
-    "menu.section.icon.admin_search": "Earrann clàr-iùil rannsachadh rianachd",
+  "menu.section.icon.admin_search": "Earrann clàr-iùil rannsachadh rianachd",
 
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Earrann clàr-iùil Pannal Riaghlaidh",
 
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
-   "menu.section.icon.curation_tasks": "Earrann clàr-iùil Obair Eagrachaidh",
+  "menu.section.icon.curation_tasks": "Earrann clàr-iùil Obair Eagrachaidh",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Deasaich earrann clàir-iùil",
@@ -3644,28 +4064,28 @@
   "menu.section.icon.export": "Mach-ghluais earrann clàir-iùil",
 
   // "menu.section.icon.find": "Find menu section",
-   "menu.section.icon.find": "Lorg earrann clàir-iùil",
+  "menu.section.icon.find": "Lorg earrann clàir-iùil",
 
   // "menu.section.icon.import": "Import menu section",
-   "menu.section.icon.import": "Steach-ghluais earrann clàir-iùil",
+  "menu.section.icon.import": "Steach-ghluais earrann clàir-iùil",
 
   // "menu.section.icon.new": "New menu section",
-   "menu.section.icon.new": "Earrann clàr-iùil ùr",
+  "menu.section.icon.new": "Earrann clàr-iùil ùr",
 
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Prìnich bàr-taoibh",
 
   // "menu.section.icon.processes": "Processes menu section",
-    "menu.section.icon.processes": "Earrann clàr-iùil phròiseasan",
+  "menu.section.icon.processes": "Earrann clàr-iùil phròiseasan",
 
   // "menu.section.icon.registries": "Registries menu section",
-    "menu.section.icon.registries": "Earrann clàr-iùil chlàr-lannan",
+  "menu.section.icon.registries": "Earrann clàr-iùil chlàr-lannan",
 
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-   "menu.section.icon.statistics_task": "Earrann clàr-iùil Obair Staitistigs",
+  "menu.section.icon.statistics_task": "Earrann clàr-iùil Obair Staitistigs",
 
   // "menu.section.icon.workflow": "Administer workflow menu section",
-   "menu.section.icon.workflow": "Rianaich earrann clàr-iùil sruth-obrach",
+  "menu.section.icon.workflow": "Rianaich earrann clàr-iùil sruth-obrach",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Neo-phrìnich bàr-taoibh",
@@ -3673,7 +4093,7 @@
 
 
   // "menu.section.import": "Import",
-   "menu.section.import": "Steach-ghluais",
+  "menu.section.import": "Steach-ghluais",
 
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Steach-ghluasad Baids (ZIP)",
@@ -3684,22 +4104,22 @@
 
 
   // "menu.section.new": "New",
-   "menu.section.new": "Ùr",
+  "menu.section.new": "Ùr",
 
   // "menu.section.new_collection": "Collection",
-    "menu.section.new_collection": "Cruinneachadh",
+  "menu.section.new_collection": "Cruinneachadh",
 
   // "menu.section.new_community": "Community",
-   "menu.section.new_community": "Coimhearsnachd",
+  "menu.section.new_community": "Coimhearsnachd",
 
   // "menu.section.new_item": "Item",
-   "menu.section.new_item": "Nì",
+  "menu.section.new_item": "Nì",
 
   // "menu.section.new_item_version": "Item Version",
-   "menu.section.new_item_version": "Dreach Nì",
+  "menu.section.new_item_version": "Dreach Nì",
 
   // "menu.section.new_process": "Process",
-    "menu.section.new_process": "Pròiseas",
+  "menu.section.new_process": "Pròiseas",
 
 
 
@@ -3712,15 +4132,15 @@
 
 
   // "menu.section.processes": "Processes",
-    "menu.section.processes": "Pròiseasan",
+  "menu.section.processes": "Pròiseasan",
 
 
 
   // "menu.section.registries": "Registries",
-   "menu.section.registries": "Clàr-lannan",
+  "menu.section.registries": "Clàr-lannan",
 
   // "menu.section.registries_format": "Format",
-   "menu.section.registries_format": "Fòrmat",
+  "menu.section.registries_format": "Fòrmat",
 
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadata",
@@ -3728,15 +4148,18 @@
 
 
   // "menu.section.statistics": "Statistics",
-    "menu.section.statistics": "Staitistigs",
+  "menu.section.statistics": "Staitistigs",
 
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Obair Staitistigs",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
-   "menu.section.toggle.access_control": "Suids earrann Riaghladh Cothruim",
+  "menu.section.toggle.access_control": "Suids earrann Riaghladh Cothruim",
 
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Suids earrann Pannal Riaghlaidh",
@@ -3745,7 +4168,7 @@
   "menu.section.toggle.curation_task": "Suids earrann Obair Eagrachaidh",
 
   // "menu.section.toggle.edit": "Toggle Edit section",
-    "menu.section.toggle.edit": "Suids earrann Deasachaidh",
+  "menu.section.toggle.edit": "Suids earrann Deasachaidh",
 
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "Suids earrann Mach-ghluasaid",
@@ -3754,10 +4177,10 @@
   "menu.section.toggle.find": "Suids earrann Lorg",
 
   // "menu.section.toggle.import": "Toggle Import section",
-   "menu.section.toggle.import": "Suids earrann Steach-ghluasaid",
+  "menu.section.toggle.import": "Suids earrann Steach-ghluasaid",
 
   // "menu.section.toggle.new": "Toggle New section",
-   "menu.section.toggle.new": "Suids earrann Ùr",
+  "menu.section.toggle.new": "Suids earrann Ùr",
 
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Suids earrann Chlàr-lannan",
@@ -3767,11 +4190,11 @@
 
 
   // "menu.section.workflow": "Administer Workflow",
-   "menu.section.workflow": "Rianaich Sruth-obrach",
+  "menu.section.workflow": "Rianaich Sruth-obrach",
 
 
   // "mydspace.breadcrumbs": "MyDSpace",
-    "mydspace.breadcrumbs": "MoDSpace",
+  "mydspace.breadcrumbs": "MoDSpace",
 
   // "mydspace.description": "",
   "mydspace.description": "",
@@ -3786,7 +4209,7 @@
   "mydspace.messages.description-placeholder": "Cuir am brath an seo...",
 
   // "mydspace.messages.hide-msg": "Hide message",
-    "mydspace.messages.hide-msg": "Cleith brath",
+  "mydspace.messages.hide-msg": "Cleith brath",
 
   // "mydspace.messages.mark-as-read": "Mark as read",
   // TODO New key - Add a translation
@@ -3803,22 +4226,22 @@
   "mydspace.messages.no-messages": "Chan tàinig brathan fhathast.",
 
   // "mydspace.messages.send-btn": "Send",
-   "mydspace.messages.send-btn": "Cuir",
+  "mydspace.messages.send-btn": "Cuir",
 
   // "mydspace.messages.show-msg": "Show message",
-    "mydspace.messages.show-msg": "Seall brath",
+  "mydspace.messages.show-msg": "Seall brath",
 
   // "mydspace.messages.subject-placeholder": "Subject...",
-   "mydspace.messages.subject-placeholder": "Cuspair...",
+  "mydspace.messages.subject-placeholder": "Cuspair...",
 
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
-   "mydspace.messages.submitter-help": "Tagh an roghainn seo agus cuir brath chun an riaghladair.",
+  "mydspace.messages.submitter-help": "Tagh an roghainn seo agus cuir brath chun an riaghladair.",
 
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Brathan",
 
   // "mydspace.messages.to": "To",
-   "mydspace.messages.to": "Gu",
+  "mydspace.messages.to": "Gu",
 
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "Steach-chur ùr",
@@ -3833,28 +4256,28 @@
   "mydspace.results.head": "Do chur-a-steachan",
 
   // "mydspace.results.no-abstract": "No Abstract",
-   "mydspace.results.no-abstract": "Chan eil Giorrachadh ann",
+  "mydspace.results.no-abstract": "Chan eil Giorrachadh ann",
 
   // "mydspace.results.no-authors": "No Authors",
-   "mydspace.results.no-authors": "Chan eil Ùghdaran ann",
+  "mydspace.results.no-authors": "Chan eil Ùghdaran ann",
 
   // "mydspace.results.no-collections": "No Collections",
-   "mydspace.results.no-collections": "Chan eil Cruinneachaidhean ann",
+  "mydspace.results.no-collections": "Chan eil Cruinneachaidhean ann",
 
   // "mydspace.results.no-date": "No Date",
-   "mydspace.results.no-date": "Chan eil Deit ann",
+  "mydspace.results.no-date": "Chan eil Deit ann",
 
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Chan eil Faidhlichean ann",
 
   // "mydspace.results.no-results": "There were no items to show",
-    "mydspace.results.no-results": "Cha robh nithean ri shealltainn",
+  "mydspace.results.no-results": "Cha robh nithean ri shealltainn",
 
   // "mydspace.results.no-title": "No title",
-   "mydspace.results.no-title": "Chan eil tiotal ann",
+  "mydspace.results.no-title": "Chan eil tiotal ann",
 
   // "mydspace.results.no-uri": "No Uri",
-    "mydspace.results.no-uri": "Chan eil Uri ann",
+  "mydspace.results.no-uri": "Chan eil Uri ann",
 
   // "mydspace.search-form.placeholder": "Search in mydspace...",
   // TODO New key - Add a translation
@@ -3866,20 +4289,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",
@@ -3901,7 +4324,7 @@
   "mydspace.upload.upload-successful": "Chruthaicheadh nì raon-obrach ùr. Cliog {{here}} agus deasaich e.",
 
   // "mydspace.view-btn": "View",
-   "mydspace.view-btn": "Sealladh",
+  "mydspace.view-btn": "Sealladh",
 
 
 
@@ -3915,7 +4338,7 @@
   "nav.language": "Suidseadh cànain",
 
   // "nav.login": "Log In",
-   "nav.login": "Log A-steach",
+  "nav.login": "Log A-steach",
 
   // "nav.logout": "User profile menu and Log Out",
   // TODO New key - Add a translation
@@ -3928,25 +4351,25 @@
   "nav.mydspace": "MoDSpace",
 
   // "nav.profile": "Profile",
-    "nav.profile": "Iomradh Neach-cleachdaidh",
+  "nav.profile": "Iomradh Neach-cleachdaidh",
 
   // "nav.search": "Search",
   "nav.search": "Rannsaich",
 
   // "nav.statistics.header": "Statistics",
-   "nav.statistics.header": "Staitistigs",
+  "nav.statistics.header": "Staitistigs",
 
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "Sguir a ghabhail riochd E-Neach",
 
   // "nav.toggle" : "Toggle navigation",
-   "nav.toggle" : "Suids iùil",
+  "nav.toggle": "Suids iùil",
 
   // "nav.user.description" : "User profile bar",
-   "nav.user.description" : "Bàr-iomraidh neach-cleachdaidh",
+  "nav.user.description": "Bàr-iomraidh neach-cleachdaidh",
 
   // "none.listelement.badge": "Item",
-   "none.listelement.badge": "Nì",
+  "none.listelement.badge": "Nì",
 
 
   // "orgunit.listelement.badge": "Organizational Unit",
@@ -3962,7 +4385,7 @@
   "orgunit.page.dateestablished": "Deit stèidheachaidh",
 
   // "orgunit.page.description": "Description",
-   "orgunit.page.description": "Cunntas",
+  "orgunit.page.description": "Cunntas",
 
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "Deasaich an nì seo",
@@ -3976,7 +4399,7 @@
 
 
   // "pagination.options.description": "Pagination options",
-   "pagination.options.description": "Roghainnean duilleagachaidh",
+  "pagination.options.description": "Roghainnean duilleagachaidh",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Toraidhean Gach Duilleag",
@@ -3985,15 +4408,15 @@
   "pagination.showing.detail": "{{ range }} de {{ total }}",
 
   // "pagination.showing.label": "Now showing ",
-   "pagination.showing.label": "A' sealltainn ",
+  "pagination.showing.label": "A' sealltainn ",
 
   // "pagination.sort-direction": "Sort Options",
-    "pagination.sort-direction": "Roghainnean seòrsachaidh",
+  "pagination.sort-direction": "Roghainnean seòrsachaidh",
 
 
 
   // "person.listelement.badge": "Person",
-   "person.listelement.badge": "Neach",
+  "person.listelement.badge": "Neach",
 
   // "person.listelement.no-title": "No name found",
   "person.listelement.no-title": "Cha deach ainm a lorg",
@@ -4008,25 +4431,25 @@
   "person.page.email": "Seòladh Post-d",
 
   // "person.page.firstname": "First Name",
-    "person.page.firstname": "Ciad Ainm",
+  "person.page.firstname": "Ciad Ainm",
 
   // "person.page.jobtitle": "Job Title",
-   "person.page.jobtitle": "Tiotal Obrach",
+  "person.page.jobtitle": "Tiotal Obrach",
 
   // "person.page.lastname": "Last Name",
-   "person.page.lastname": "Sloinneadh",
+  "person.page.lastname": "Sloinneadh",
 
   // "person.page.link.full": "Show all metadata",
-    "person.page.link.full": "Seall metadata gu lèir",
+  "person.page.link.full": "Seall metadata gu lèir",
 
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
 
   // "person.page.staffid": "Staff ID",
-   "person.page.staffid": "ID Obrach",
+  "person.page.staffid": "ID Obrach",
 
   // "person.page.titleprefix": "Person: ",
-   "person.page.titleprefix": "Neach: ",
+  "person.page.titleprefix": "Neach: ",
 
   // "person.search.results.head": "Person Search Results",
   // TODO New key - Add a translation
@@ -4042,128 +4465,128 @@
   "process.new.select-parameters": "Parameatairean",
 
   // "process.new.cancel": "Cancel",
-   "process.new.cancel": "Cansail",
+  "process.new.cancel": "Cansail",
 
   // "process.new.submit": "Save",
-   "process.new.submit": "Sàbhail",
+  "process.new.submit": "Sàbhail",
 
   // "process.new.select-script": "Script",
-   "process.new.select-script": "Sgriobt",
+  "process.new.select-script": "Sgriobt",
 
   // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "Tagh sgriobt...",
 
   // "process.new.select-script.required": "Script is required",
-   "process.new.select-script.required": "Feum air sgriobt",
+  "process.new.select-script.required": "Feum air sgriobt",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-   "process.new.parameter.file.upload-button": "Tagh faidhle...",
+  "process.new.parameter.file.upload-button": "Tagh faidhle...",
 
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Tagh faidhle",
 
   // "process.new.parameter.string.required": "Parameter value is required",
-    "process.new.parameter.string.required": "Feum air luach parameatair",
+  "process.new.parameter.string.required": "Feum air luach parameatair",
 
   // "process.new.parameter.type.value": "value",
-   "process.new.parameter.type.value": "luach",
+  "process.new.parameter.type.value": "luach",
 
   // "process.new.parameter.type.file": "file",
-   "process.new.parameter.type.file": "faidhle",
+  "process.new.parameter.type.file": "faidhle",
 
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "Tha na parameatairean a leanas riatanach ach fhathast a dhìth:",
 
   // "process.new.notification.success.title": "Success",
-   "process.new.notification.success.title": "Dh'obraich sin",
+  "process.new.notification.success.title": "Dh'obraich sin",
 
   // "process.new.notification.success.content": "The process was successfully created",
-   "process.new.notification.success.content": "Chaidh am pròiseas a chruthachadh",
+  "process.new.notification.success.content": "Chaidh am pròiseas a chruthachadh",
 
   // "process.new.notification.error.title": "Error",
-   "process.new.notification.error.title": "Mearachd",
+  "process.new.notification.error.title": "Mearachd",
 
   // "process.new.notification.error.content": "An error occurred while creating this process",
-   "process.new.notification.error.content": "Bha mearachd ann a' cruthachadh a' phròiseas seo",
+  "process.new.notification.error.content": "Bha mearachd ann a' cruthachadh a' phròiseas seo",
 
   // "process.new.header": "Create a new process",
-   "process.new.header": "Cruthaich pròiseas ùr",
+  "process.new.header": "Cruthaich pròiseas ùr",
 
   // "process.new.title": "Create a new process",
-   "process.new.title": "Cruthaich pròiseas ùr",
+  "process.new.title": "Cruthaich pròiseas ùr",
 
   // "process.new.breadcrumbs": "Create a new process",
-   "process.new.breadcrumbs": "Cruthaich pròiseas ùr",
+  "process.new.breadcrumbs": "Cruthaich pròiseas ùr",
 
 
 
   // "process.detail.arguments" : "Arguments",
-   "process.detail.arguments" : "Argamaidean",
+  "process.detail.arguments": "Argamaidean",
 
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Chan eil argamaidean sa phròiseas seo",
+  "process.detail.arguments.empty": "Chan eil argamaidean sa phròiseas seo",
 
   // "process.detail.back" : "Back",
-  "process.detail.back" : "Air ais",
+  "process.detail.back": "Air ais",
 
   // "process.detail.output" : "Process Output",
-    "process.detail.output" : "Mach-chur Pròiseas",
+  "process.detail.output": "Mach-chur Pròiseas",
 
   // "process.detail.logs.button": "Retrieve process output",
-   "process.detail.logs.button": "Faigh mach-chur pròiseas air ais",
+  "process.detail.logs.button": "Faigh mach-chur pròiseas air ais",
 
   // "process.detail.logs.loading": "Retrieving",
-   "process.detail.logs.loading": "A' faighinn air ais",
+  "process.detail.logs.loading": "A' faighinn air ais",
 
   // "process.detail.logs.none": "This process has no output",
-   "process.detail.logs.none": "Chan eil mach-chur aig a' phròiseas seo",
+  "process.detail.logs.none": "Chan eil mach-chur aig a' phròiseas seo",
 
   // "process.detail.output-files" : "Output Files",
-   "process.detail.output-files" : "Faidhlichean Mach-chuir",
+  "process.detail.output-files": "Faidhlichean Mach-chuir",
 
   // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "Chan eil faidhlichean mach-chuir sa phròiseas seo",
+  "process.detail.output-files.empty": "Chan eil faidhlichean mach-chuir sa phròiseas seo",
 
   // "process.detail.script" : "Script",
-  "process.detail.script" : "Sgriobt",
-  
+  "process.detail.script": "Sgriobt",
+
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Pròiseas: {{ id }} - {{ name }}",
+  "process.detail.title": "Pròiseas: {{ id }} - {{ name }}",
 
   // "process.detail.start-time" : "Start time",
-   "process.detail.start-time" : "Uair tòiseachaidh",
+  "process.detail.start-time": "Uair tòiseachaidh",
 
   // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Uair crìochnachaidh",
+  "process.detail.end-time": "Uair crìochnachaidh",
 
   // "process.detail.status" : "Status",
-  "process.detail.status" : "Inbhe",
+  "process.detail.status": "Inbhe",
 
   // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Cruthaich pròiseas coltach",
+  "process.detail.create": "Cruthaich pròiseas coltach",
 
 
 
   // "process.overview.table.finish" : "Finish time (UTC)",
-  "process.overview.table.finish" : "Uair crìochnachaidh (UTC)",
+  "process.overview.table.finish": "Uair crìochnachaidh (UTC)",
 
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "ID Pròiseas",
+  "process.overview.table.id": "ID Pròiseas",
 
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Ainm",
+  "process.overview.table.name": "Ainm",
 
   // "process.overview.table.start" : "Start time (UTC)",
-  "process.overview.table.start" : "Uair tòiseachaidh (UTC)",
+  "process.overview.table.start": "Uair tòiseachaidh (UTC)",
 
   // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Inbhe",
+  "process.overview.table.status": "Inbhe",
 
   // "process.overview.table.user" : "User",
-   "process.overview.table.user" : "Neach-cleachdaidh",
+  "process.overview.table.user": "Neach-cleachdaidh",
 
   // "process.overview.title": "Processes Overview",
-    "process.overview.title": "Tar-shealladh air Pròiseasan",
+  "process.overview.title": "Tar-shealladh air Pròiseasan",
 
   // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "Tar-shealladh air Pròiseasan",
@@ -4173,49 +4596,49 @@
 
 
   // "profile.breadcrumbs": "Update Profile",
-   "profile.breadcrumbs": "Ùraich Iomradh Neach-cleachdaidh",
+  "profile.breadcrumbs": "Ùraich Iomradh Neach-cleachdaidh",
 
   // "profile.card.identify": "Identify",
-   "profile.card.identify": "Aithnichear",
+  "profile.card.identify": "Aithnichear",
 
   // "profile.card.security": "Security",
-    "profile.card.security": "Tèarainteachd",
+  "profile.card.security": "Tèarainteachd",
 
   // "profile.form.submit": "Save",
-   "profile.form.submit": "Sàbhail",
+  "profile.form.submit": "Sàbhail",
 
   // "profile.groups.head": "Authorization groups you belong to",
-   "profile.groups.head": "Buidhnean barantachaidh sa bheil thu",
+  "profile.groups.head": "Buidhnean barantachaidh sa bheil thu",
 
   // "profile.head": "Update Profile",
-   "profile.head": "Ùraich Iomradh Neach-cleachdaidh",
+  "profile.head": "Ùraich Iomradh Neach-cleachdaidh",
 
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-   "profile.metadata.form.error.firstname.required": "Tha Ciad Ainm riatanach",
+  "profile.metadata.form.error.firstname.required": "Tha Ciad Ainm riatanach",
 
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-   "profile.metadata.form.error.lastname.required": "Tha Sloinneadh riatanach",
+  "profile.metadata.form.error.lastname.required": "Tha Sloinneadh riatanach",
 
   // "profile.metadata.form.label.email": "Email Address",
-    "profile.metadata.form.label.email": "Seòladh Post-d",
+  "profile.metadata.form.label.email": "Seòladh Post-d",
 
   // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "Ciad Ainm",
 
   // "profile.metadata.form.label.language": "Language",
-   "profile.metadata.form.label.language": "Cànan",
+  "profile.metadata.form.label.language": "Cànan",
 
   // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "Sloinneadh",
 
   // "profile.metadata.form.label.phone": "Contact Telephone",
-   "profile.metadata.form.label.phone": "Àireamh Fòn",
+  "profile.metadata.form.label.phone": "Àireamh Fòn",
 
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
   "profile.metadata.form.notifications.success.content": "Chaidh na h-atharraichean air iomradh an neach-cleachdaidh a shàbhaladh.",
 
   // "profile.metadata.form.notifications.success.title": "Profile saved",
-    "profile.metadata.form.notifications.success.title": "Shàbhaileadh Iomradh an Neach-cleachdaidh",
+  "profile.metadata.form.notifications.success.title": "Shàbhaileadh Iomradh an Neach-cleachdaidh",
 
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
   "profile.notifications.warning.no-changes.content": "Cha deach Iomradh an Neach-cleachdaidh atharrachadh.",
@@ -4224,72 +4647,72 @@
   "profile.notifications.warning.no-changes.title": "Chan eil atharraichean ann",
 
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-   "profile.security.form.error.matching-passwords": "Chan eil na faclan-faire a' maidseadh.",
+  "profile.security.form.error.matching-passwords": "Chan eil na faclan-faire a' maidseadh.",
 
   // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-   "profile.security.form.error.password-length": "Bu chòir co-dhiù 6 caractaran a bhith san fhacal-faire.",
+  "profile.security.form.error.password-length": "Bu chòir co-dhiù 6 caractaran a bhith san fhacal-faire.",
 
   // "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": "Ma thogras tu, faodaidh tu facal-faire ùr a chur dhan bhogsa gu h-ìosal, agus a dhearbhadh le bhith ga thaidhpeadh a-rithist san dàrna bogsa. Bu chòir co-dhiù sia caractaran a bhith ann.",
 
   // "profile.security.form.label.password": "Password",
-   "profile.security.form.label.password": "Facal-faire",
+  "profile.security.form.label.password": "Facal-faire",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Ath-thaidhp gus a dhearbhadh",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
-   "profile.security.form.notifications.success.content": "Chaidh na h-atharraichean air an fhacal-faire a shàbhaladh.",
+  "profile.security.form.notifications.success.content": "Chaidh na h-atharraichean air an fhacal-faire a shàbhaladh.",
 
   // "profile.security.form.notifications.success.title": "Password saved",
-   "profile.security.form.notifications.success.title": "Shàbhaileadh facal-faire",
+  "profile.security.form.notifications.success.title": "Shàbhaileadh facal-faire",
 
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-   "profile.security.form.notifications.error.title": "Mearachd ag atharrachadh fhaclan-faire",
+  "profile.security.form.notifications.error.title": "Mearachd ag atharrachadh fhaclan-faire",
 
   // "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": "Feumaidh co-dhiù 6 caractaran a bhith san fhacal-faire.",
+  "profile.security.form.notifications.error.not-long-enough": "Feumaidh co-dhiù 6 caractaran a bhith san fhacal-faire.",
 
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-   "profile.security.form.notifications.error.not-same": "Chan eil na faclan-faire co-ionann.",
+  "profile.security.form.notifications.error.not-same": "Chan eil na faclan-faire co-ionann.",
 
   // "profile.title": "Update Profile",
-   "profile.title": "Ùraich Iomradh Neach-cleachdaidh",
+  "profile.title": "Ùraich Iomradh Neach-cleachdaidh",
 
 
 
   // "project.listelement.badge": "Research Project",
-    "project.listelement.badge": "Pròiseact Rannsachaidh",
+  "project.listelement.badge": "Pròiseact Rannsachaidh",
 
   // "project.page.contributor": "Contributors",
-   "project.page.contributor": "Compàirtichean",
+  "project.page.contributor": "Compàirtichean",
 
   // "project.page.description": "Description",
-   "project.page.description": "Cunntas",
+  "project.page.description": "Cunntas",
 
   // "project.page.edit": "Edit this item",
-   "project.page.edit": "Deasaich an nì seo",
+  "project.page.edit": "Deasaich an nì seo",
 
   // "project.page.expectedcompletion": "Expected Completion",
-   "project.page.expectedcompletion": "Deit a bhios dùil ris",
+  "project.page.expectedcompletion": "Deit a bhios dùil ris",
 
   // "project.page.funder": "Funders",
-    "project.page.funder": "Maoinichearan",
+  "project.page.funder": "Maoinichearan",
 
   // "project.page.id": "ID",
-   "project.page.id": "ID",
+  "project.page.id": "ID",
 
   // "project.page.keyword": "Keywords",
-   "project.page.keyword": "Prìomh Fhaclan",
+  "project.page.keyword": "Prìomh Fhaclan",
 
   // "project.page.status": "Status",
-   "project.page.status": "Inbhe",
+  "project.page.status": "Inbhe",
 
   // "project.page.titleprefix": "Research Project: ",
-   "project.page.titleprefix": "Pròiseact Rannsachaidh: ",
+  "project.page.titleprefix": "Pròiseact Rannsachaidh: ",
 
   // "project.search.results.head": "Project Search Results",
-   "project.search.results.head": "Toraidheadh Pròiseact Rannsachaidh",
+  "project.search.results.head": "Toraidheadh Pròiseact Rannsachaidh",
 
 
 
@@ -4297,35 +4720,35 @@
   "publication.listelement.badge": "Foillseachadh",
 
   // "publication.page.description": "Description",
-   "publication.page.description": "Cunntas",
+  "publication.page.description": "Cunntas",
 
   // "publication.page.edit": "Edit this item",
-   "publication.page.edit": "Deasaich an nì seo",
+  "publication.page.edit": "Deasaich an nì seo",
 
   // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "ISSN Diornal",
 
   // "publication.page.journal-title": "Journal Title",
-   "publication.page.journal-title": "Tiotal Diornal",
+  "publication.page.journal-title": "Tiotal Diornal",
 
   // "publication.page.publisher": "Publisher",
-    "publication.page.publisher": "Foillsichear",
+  "publication.page.publisher": "Foillsichear",
 
   // "publication.page.titleprefix": "Publication: ",
-    "publication.page.titleprefix": "Foillseachadh: ",
+  "publication.page.titleprefix": "Foillseachadh: ",
 
   // "publication.page.volume-title": "Volume Title",
-   "publication.page.volume-title": "Tiotal Àireamh Diornal",
+  "publication.page.volume-title": "Tiotal Àireamh Diornal",
 
   // "publication.search.results.head": "Publication Search Results",
-   "publication.search.results.head": "Toraidhean Rannsachadh Foillseachaidh",
+  "publication.search.results.head": "Toraidhean Rannsachadh Foillseachaidh",
 
   // "publication.search.title": "Publication Search",
-   "publication.search.title": "Rannsachadh Foillseachaidh",
+  "publication.search.title": "Rannsachadh Foillseachaidh",
 
 
   // "media-viewer.next": "Next",
-   "media-viewer.next": "Air adhart",
+  "media-viewer.next": "Air adhart",
 
   // "media-viewer.previous": "Previous",
   "media-viewer.previous": "Air ais",
@@ -4338,40 +4761,40 @@
   "register-email.title": "Clàradh neach-cleachdaidh ùr",
 
   // "register-page.create-profile.header": "Create Profile",
-   "register-page.create-profile.header": "Cruthaich Iomradh Neach-cleachdaidh",
+  "register-page.create-profile.header": "Cruthaich Iomradh Neach-cleachdaidh",
 
   // "register-page.create-profile.identification.header": "Identify",
-   "register-page.create-profile.identification.header": "Aithnich",
+  "register-page.create-profile.identification.header": "Aithnich",
 
   // "register-page.create-profile.identification.email": "Email Address",
-   "register-page.create-profile.identification.email": "Seòladh Post-d",
+  "register-page.create-profile.identification.email": "Seòladh Post-d",
 
   // "register-page.create-profile.identification.first-name": "First Name *",
-    "register-page.create-profile.identification.first-name": "Ciad Ainm *",
+  "register-page.create-profile.identification.first-name": "Ciad Ainm *",
 
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
   "register-page.create-profile.identification.first-name.error": "Cuir ann Ciad Ainm",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-   "register-page.create-profile.identification.last-name": "Sloinneadh *",
+  "register-page.create-profile.identification.last-name": "Sloinneadh *",
 
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-   "register-page.create-profile.identification.last-name.error": "Cuir ann Sloinneadh",
+  "register-page.create-profile.identification.last-name.error": "Cuir ann Sloinneadh",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-    "register-page.create-profile.identification.contact": "Àireamh Fòn",
+  "register-page.create-profile.identification.contact": "Àireamh Fòn",
 
   // "register-page.create-profile.identification.language": "Language",
-    "register-page.create-profile.identification.language": "Cànan",
+  "register-page.create-profile.identification.language": "Cànan",
 
   // "register-page.create-profile.security.header": "Security",
-   "register-page.create-profile.security.header": "Tèarainteachd",
+  "register-page.create-profile.security.header": "Tèarainteachd",
 
   // "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": "Cuir facal-faire dhan bhogsa gu h-ìosal, agus dearbh e le bhith ga thaidhpeadh a-rithist san dàrna bogsa. Bu chòir co-dhiù sia caractaran a bhith ann.",
 
   // "register-page.create-profile.security.label.password": "Password *",
-    "register-page.create-profile.security.label.password": "Facal-faire *",
+  "register-page.create-profile.security.label.password": "Facal-faire *",
 
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
   "register-page.create-profile.security.label.passwordrepeat": "Ath-thaidhp gus a dhearbhadh *",
@@ -4380,10 +4803,10 @@
   "register-page.create-profile.security.error.empty-password": "Cuir facal-faire dhan bhogsa gu h-ìosal.",
 
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
-   "register-page.create-profile.security.error.matching-passwords": "Chan eil na faclan-faire a' maidseadh.",
+  "register-page.create-profile.security.error.matching-passwords": "Chan eil na faclan-faire a' maidseadh.",
 
   // "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": "Bu chòir co-dhiù 6 caractaran a bhith san fhacal-faire.",
+  "register-page.create-profile.security.error.password-length": "Bu chòir co-dhiù 6 caractaran a bhith san fhacal-faire.",
 
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Crìochnaich Clàradh",
@@ -4392,23 +4815,23 @@
   "register-page.create-profile.submit.error.content": "Chaidh rudeigin ceàrr a' clàradh neach-cleachdaidh ùr.",
 
   // "register-page.create-profile.submit.error.head": "Registration failed",
-    "register-page.create-profile.submit.error.head": "Cha do dh'obraich an clàradh",
+  "register-page.create-profile.submit.error.head": "Cha do dh'obraich an clàradh",
 
   // "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": "Dh'obraich an clàradh. Chaidh do logadh a-steach mar an neach-cleachdaidh cruthaichte.",
+  "register-page.create-profile.submit.success.content": "Dh'obraich an clàradh. Chaidh do logadh a-steach mar an neach-cleachdaidh cruthaichte.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Clàradh crìochnaichte",
 
 
   // "register-page.registration.header": "New user registration",
-   "register-page.registration.header": "Clàradh neach-cleachdaidh ùr",
+  "register-page.registration.header": "Clàradh neach-cleachdaidh ùr",
 
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-    "register-page.registration.info": "Clàraich cunntas aig cruinneachaidhean airson ùrachaidhean puist-d fhaighinn, agus nithen ùra a chur a-steach gu DSpace.",
+  "register-page.registration.info": "Clàraich cunntas aig cruinneachaidhean airson ùrachaidhean puist-d fhaighinn, agus nithen ùra a chur a-steach gu DSpace.",
 
   // "register-page.registration.email": "Email Address *",
-   "register-page.registration.email": "Seòladh Post-d *",
+  "register-page.registration.email": "Seòladh Post-d *",
 
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Cuir ann seòladh post-d",
@@ -4420,10 +4843,10 @@
   "register-page.registration.email.hint": "Thèid an seòladh seo a dhearbhadh agus a chleachdadh mar d' ainm-loga.",
 
   // "register-page.registration.submit": "Register",
-   "register-page.registration.submit": "Clàraich",
+  "register-page.registration.submit": "Clàraich",
 
   // "register-page.registration.success.head": "Verification email sent",
-    "register-page.registration.success.head": "Chuireadh post-d dearbhaidh",
+  "register-page.registration.success.head": "Chuireadh post-d dearbhaidh",
 
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "register-page.registration.success.content": "Chaidh post-d a chur gu {{ email }} sa bheil URL sònraichte agus tuilleadh stiùiridh.",
@@ -4432,7 +4855,7 @@
   "register-page.registration.error.head": "Mearachd a' clàradh post-d",
 
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
-   "register-page.registration.error.content": "Bha mearachd ann a' clàradh a' phuist-d a leanas: {{ email }}",
+  "register-page.registration.error.content": "Bha mearachd ann a' clàradh a' phuist-d a leanas: {{ email }}",
 
 
 
@@ -4441,28 +4864,28 @@
   "relationships.add.error.relationship-type.content": "Cha deach maids freagarrach a lorg airson seòrsa dàimh {{ type }} eadar an dà nì",
 
   // "relationships.add.error.server.content": "The server returned an error",
-   "relationships.add.error.server.content": "Thill am frithealaiche mearachd",
+  "relationships.add.error.server.content": "Thill am frithealaiche mearachd",
 
   // "relationships.add.error.title": "Unable to add relationship",
-   "relationships.add.error.title": "Cha ghabhadh dàimh a chur-ris",
+  "relationships.add.error.title": "Cha ghabhadh dàimh a chur-ris",
 
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Ùghdaran",
 
   // "relationships.isAuthorOf.Person": "Authors (persons)",
-   "relationships.isAuthorOf.Person": "Ùghdaran (daoine)",
+  "relationships.isAuthorOf.Person": "Ùghdaran (daoine)",
 
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "Ùghdaran (aonadan eagrachaidh)",
 
   // "relationships.isIssueOf": "Journal Issues",
-   "relationships.isIssueOf": "Deasachaidhean Diornal",
+  "relationships.isIssueOf": "Deasachaidhean Diornal",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-   "relationships.isJournalIssueOf": "Deasachadh Diornal",
+  "relationships.isJournalIssueOf": "Deasachadh Diornal",
 
   // "relationships.isJournalOf": "Journals",
-    "relationships.isJournalOf": "Diornalan",
+  "relationships.isJournalOf": "Diornalan",
 
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Aonadan eagrachaidh",
@@ -4471,16 +4894,16 @@
   "relationships.isPersonOf": "Ùghdaran",
 
   // "relationships.isProjectOf": "Research Projects",
-   "relationships.isProjectOf": "Pròiseactan Rannsachaidh",
+  "relationships.isProjectOf": "Pròiseactan Rannsachaidh",
 
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Foillseachaidhean",
 
   // "relationships.isPublicationOfJournalIssue": "Articles",
-    "relationships.isPublicationOfJournalIssue": "Artaigilean",
+  "relationships.isPublicationOfJournalIssue": "Artaigilean",
 
   // "relationships.isSingleJournalOf": "Journal",
-    "relationships.isSingleJournalOf": "Diornal",
+  "relationships.isSingleJournalOf": "Diornal",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Àireamh Diornal",
@@ -4495,14 +4918,14 @@
   "relationships.isContributorOf.OrgUnit": "Compàirtiche (Aonad Eagrachaidh)",
 
   // "relationships.isContributorOf.Person": "Contributor",
-    "relationships.isContributorOf.Person": "Compàirtiche",
+  "relationships.isContributorOf.Person": "Compàirtiche",
 
   // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
-   "relationships.isFundingAgencyOf.OrgUnit": "Maoinichear",
+  "relationships.isFundingAgencyOf.OrgUnit": "Maoinichear",
 
 
   // "repository.image.logo": "Repository logo",
-   "repository.image.logo": "Suaicheantas ionad-tasgaidh",
+  "repository.image.logo": "Suaicheantas ionad-tasgaidh",
 
   // "repository.title.prefix": "DSpace Angular :: ",
   // TODO New key - Add a translation
@@ -4517,52 +4940,52 @@
   "resource-policies.add.button": "Cuir-ris",
 
   // "resource-policies.add.for.": "Add a new policy",
-   "resource-policies.add.for.": "Cuir-ris poileasaidh ùr",
+  "resource-policies.add.for.": "Cuir-ris poileasaidh ùr",
 
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
-   "resource-policies.add.for.bitstream": "Cuir-ris poileasaidh Bitstream ùr",
+  "resource-policies.add.for.bitstream": "Cuir-ris poileasaidh Bitstream ùr",
 
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
-   "resource-policies.add.for.bundle": "Cuir-ris poileasaidh Trusgan ùr",
+  "resource-policies.add.for.bundle": "Cuir-ris poileasaidh Trusgan ùr",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
   "resource-policies.add.for.item": "Cuir-ris poileasaidh Nì ùr",
 
   // "resource-policies.add.for.community": "Add a new Community policy",
-   "resource-policies.add.for.community": "Cuir-ris poileasaidh Coimhearsnachd ùr",
+  "resource-policies.add.for.community": "Cuir-ris poileasaidh Coimhearsnachd ùr",
 
   // "resource-policies.add.for.collection": "Add a new Collection policy",
-    "resource-policies.add.for.collection": "Cuir-ris poileasaidh Cruinneachadh ùr",
+  "resource-policies.add.for.collection": "Cuir-ris poileasaidh Cruinneachadh ùr",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
-    "resource-policies.create.page.heading": "Cruthaich poileasaidh goireas ùr do",
+  "resource-policies.create.page.heading": "Cruthaich poileasaidh goireas ùr do",
 
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
-    "resource-policies.create.page.failure.content": "Bha mearachd ann a' cruthachadh poileasaidh a' ghoireis.",
+  "resource-policies.create.page.failure.content": "Bha mearachd ann a' cruthachadh poileasaidh a' ghoireis.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "Dh'obraich sin",
 
   // "resource-policies.create.page.title": "Create new resource policy",
-    "resource-policies.create.page.title": "Cruthaich poileasaidh goireas ùr",
+  "resource-policies.create.page.title": "Cruthaich poileasaidh goireas ùr",
 
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Dubh às taghadh",
 
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
-    "resource-policies.delete.btn.title": "Dubh às poileasaidhean goireis taghte",
+  "resource-policies.delete.btn.title": "Dubh às poileasaidhean goireis taghte",
 
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
-    "resource-policies.delete.failure.content": "Bha mearachd ann a' dubhadh às phoileasaidhean goireis taghte.",
+  "resource-policies.delete.failure.content": "Bha mearachd ann a' dubhadh às phoileasaidhean goireis taghte.",
 
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "Dh'obraich sin",
 
   // "resource-policies.edit.page.heading": "Edit resource policy ",
-    "resource-policies.edit.page.heading": "Deasaich poileasaidh goireis ",
+  "resource-policies.edit.page.heading": "Deasaich poileasaidh goireis ",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-   "resource-policies.edit.page.failure.content": "Bha mearachd ann a' deasachadh poileasaidh a' ghoireis.",
+  "resource-policies.edit.page.failure.content": "Bha mearachd ann a' deasachadh poileasaidh a' ghoireis.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Dh'obraich sin",
@@ -4578,7 +5001,7 @@
   "resource-policies.form.action-type.required": "Feumaidh tu gnìomh poileasaidh a' ghoireis a thaghadh.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-   "resource-policies.form.eperson-group-list.label": "An e-neach no am buidheann a gheibh an cead",
+  "resource-policies.form.eperson-group-list.label": "An e-neach no am buidheann a gheibh an cead",
 
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "Tagh",
@@ -4587,19 +5010,19 @@
   "resource-policies.form.eperson-group-list.tab.eperson": "Rannsaich airson e-Neach",
 
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
-    "resource-policies.form.eperson-group-list.tab.group": "Rannsaich airson buidheann",
+  "resource-policies.form.eperson-group-list.tab.group": "Rannsaich airson buidheann",
 
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
-   "resource-policies.form.eperson-group-list.table.headers.action": "Gnìomh",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Gnìomh",
 
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
 
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
-   "resource-policies.form.eperson-group-list.table.headers.name": "Ainm",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Ainm",
 
   // "resource-policies.form.date.end.label": "End Date",
-   "resource-policies.form.date.end.label": "Deit Crìochnachaidh",
+  "resource-policies.form.date.end.label": "Deit Crìochnachaidh",
 
   // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "Deit Tòiseachaidh",
@@ -4608,7 +5031,7 @@
   "resource-policies.form.description.label": "Cunntas",
 
   // "resource-policies.form.name.label": "Name",
-   "resource-policies.form.name.label": "Ainm",
+  "resource-policies.form.name.label": "Ainm",
 
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Tagh an seòrsa poileasaidh",
@@ -4623,7 +5046,7 @@
   "resource-policies.table.headers.date.end": "Deit Crìochnachaidh",
 
   // "resource-policies.table.headers.date.start": "Start Date",
-    "resource-policies.table.headers.date.start": "Deit Tòiseachaidh",
+  "resource-policies.table.headers.date.start": "Deit Tòiseachaidh",
 
   // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "Deasaich",
@@ -4638,16 +5061,16 @@
   "resource-policies.table.headers.eperson": "E-Neach",
 
   // "resource-policies.table.headers.group": "Group",
-   "resource-policies.table.headers.group": "Buidheann",
+  "resource-policies.table.headers.group": "Buidheann",
 
   // "resource-policies.table.headers.id": "ID",
-    "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "ID",
 
   // "resource-policies.table.headers.name": "Name",
-   "resource-policies.table.headers.name": "Ainm",
+  "resource-policies.table.headers.name": "Ainm",
 
   // "resource-policies.table.headers.policyType": "type",
-    "resource-policies.table.headers.policyType": "seòrsa",
+  "resource-policies.table.headers.policyType": "seòrsa",
 
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
   "resource-policies.table.headers.title.for.bitstream": "Poileasaidhean airson Bitstream",
@@ -4670,44 +5093,44 @@
   "search.description": "",
 
   // "search.switch-configuration.title": "Show",
-   "search.switch-configuration.title": "Seall",
+  "search.switch-configuration.title": "Seall",
 
   // "search.title": "Search",
   "search.title": "Rannsaich",
 
   // "search.breadcrumbs": "Search",
-   "search.breadcrumbs": "Rannsaich",
+  "search.breadcrumbs": "Rannsaich",
 
   // "search.search-form.placeholder": "Search the repository ...",
-    "search.search-form.placeholder": "Rannsaich an t-ionad-tasgaidh ...",
+  "search.search-form.placeholder": "Rannsaich an t-ionad-tasgaidh ...",
 
 
   // "search.filters.applied.f.author": "Author",
-   "search.filters.applied.f.author": "Ùghdar",
+  "search.filters.applied.f.author": "Ùghdar",
 
   // "search.filters.applied.f.dateIssued.max": "End date",
-   "search.filters.applied.f.dateIssued.max": "Deit Crìochnachaidh",
+  "search.filters.applied.f.dateIssued.max": "Deit Crìochnachaidh",
 
   // "search.filters.applied.f.dateIssued.min": "Start date",
-   "search.filters.applied.f.dateIssued.min": "Deit Tòiseachaidh",
+  "search.filters.applied.f.dateIssued.min": "Deit Tòiseachaidh",
 
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-   "search.filters.applied.f.dateSubmitted": "Deit cur-a-steach",
+  "search.filters.applied.f.dateSubmitted": "Deit cur-a-steach",
 
   // "search.filters.applied.f.discoverable": "Private",
-   "search.filters.applied.f.discoverable": "Prìobhaideach",
+  "search.filters.applied.f.discoverable": "Prìobhaideach",
 
   // "search.filters.applied.f.entityType": "Item Type",
-   "search.filters.applied.f.entityType": "Seòrsa Nì",
+  "search.filters.applied.f.entityType": "Seòrsa Nì",
 
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-   "search.filters.applied.f.has_content_in_original_bundle": "Tha faidhlichean ann",
+  "search.filters.applied.f.has_content_in_original_bundle": "Tha faidhlichean ann",
 
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Seòrsa",
 
   // "search.filters.applied.f.namedresourcetype": "Status",
-   "search.filters.applied.f.namedresourcetype": "Inbhe",
+  "search.filters.applied.f.namedresourcetype": "Inbhe",
 
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Cuspair",
@@ -4716,21 +5139,21 @@
   "search.filters.applied.f.submitter": "Neach-cur-a-steach",
 
   // "search.filters.applied.f.jobTitle": "Job Title",
-   "search.filters.applied.f.jobTitle": "Tiotal Obrach",
+  "search.filters.applied.f.jobTitle": "Tiotal Obrach",
 
   // "search.filters.applied.f.birthDate.max": "End birth date",
-   "search.filters.applied.f.birthDate.max": "Deit breith mu dheireadh",
+  "search.filters.applied.f.birthDate.max": "Deit breith mu dheireadh",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-   "search.filters.applied.f.birthDate.min": "Ciad deit breith",
+  "search.filters.applied.f.birthDate.min": "Ciad deit breith",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
-   "search.filters.applied.f.withdrawn": "Air a thoirt air falbh",
+  "search.filters.applied.f.withdrawn": "Air a thoirt air falbh",
 
 
 
   // "search.filters.filter.author.head": "Author",
-    "search.filters.filter.author.head": "Ùghdar",
+  "search.filters.filter.author.head": "Ùghdar",
 
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Ainm ùghdair",
@@ -4739,175 +5162,175 @@
   "search.filters.filter.author.label": "Rannsaich ainm ùghdair",
 
   // "search.filters.filter.birthDate.head": "Birth Date",
-    "search.filters.filter.birthDate.head": "Deit Breith",
+  "search.filters.filter.birthDate.head": "Deit Breith",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-    "search.filters.filter.birthDate.placeholder": "Deit Breith",
+  "search.filters.filter.birthDate.placeholder": "Deit Breith",
 
   // "search.filters.filter.birthDate.label": "Search birth date",
-    "search.filters.filter.birthDate.label": "Rannsaich deit breith",
+  "search.filters.filter.birthDate.label": "Rannsaich deit breith",
 
   // "search.filters.filter.collapse": "Collapse filter",
   "search.filters.filter.collapse": "Leag fioltair",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
-   "search.filters.filter.creativeDatePublished.head": "Deit Foillseachaidh",
+  "search.filters.filter.creativeDatePublished.head": "Deit Foillseachaidh",
 
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-   "search.filters.filter.creativeDatePublished.placeholder": "Deit Foillseachaidh",
+  "search.filters.filter.creativeDatePublished.placeholder": "Deit Foillseachaidh",
 
   // "search.filters.filter.creativeDatePublished.label": "Search date published",
-   "search.filters.filter.creativeDatePublished.label": "Rannsaich deit foillseachaidh",
+  "search.filters.filter.creativeDatePublished.label": "Rannsaich deit foillseachaidh",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
-   "search.filters.filter.creativeWorkEditor.head": "Deasaiche",
+  "search.filters.filter.creativeWorkEditor.head": "Deasaiche",
 
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-   "search.filters.filter.creativeWorkEditor.placeholder": "Deasaiche",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Deasaiche",
 
   // "search.filters.filter.creativeWorkEditor.label": "Search editor",
-   "search.filters.filter.creativeWorkEditor.label": "Rannsaich deasaiche",
+  "search.filters.filter.creativeWorkEditor.label": "Rannsaich deasaiche",
 
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
-    "search.filters.filter.creativeWorkKeywords.head": "Cuspair",
+  "search.filters.filter.creativeWorkKeywords.head": "Cuspair",
 
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-    "search.filters.filter.creativeWorkKeywords.placeholder": "Cuspair",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Cuspair",
 
   // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
-    "search.filters.filter.creativeWorkKeywords.label": "Rannsaich cuspair",
+  "search.filters.filter.creativeWorkKeywords.label": "Rannsaich cuspair",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Foillsichear",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-    "search.filters.filter.creativeWorkPublisher.placeholder": "Foillsichear",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Foillsichear",
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
-   "search.filters.filter.creativeWorkPublisher.label": "Rannsaich foillsichear",
+  "search.filters.filter.creativeWorkPublisher.label": "Rannsaich foillsichear",
 
   // "search.filters.filter.dateIssued.head": "Date",
-   "search.filters.filter.dateIssued.head": "Deit",
+  "search.filters.filter.dateIssued.head": "Deit",
 
   // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.max.placeholder": "Deit As Motha",
 
   // "search.filters.filter.dateIssued.max.label": "End",
-    "search.filters.filter.dateIssued.max.label": "Deireadh",
+  "search.filters.filter.dateIssued.max.label": "Deireadh",
 
   // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
-   "search.filters.filter.dateIssued.min.placeholder": "Deit As Lugha",
+  "search.filters.filter.dateIssued.min.placeholder": "Deit As Lugha",
 
   // "search.filters.filter.dateIssued.min.label": "Start",
-    "search.filters.filter.dateIssued.min.label": "Toiseach",
+  "search.filters.filter.dateIssued.min.label": "Toiseach",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-   "search.filters.filter.dateSubmitted.head": "Deit cur-a-steach",
+  "search.filters.filter.dateSubmitted.head": "Deit cur-a-steach",
 
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-    "search.filters.filter.dateSubmitted.placeholder": "Deit cur-a-steach",
+  "search.filters.filter.dateSubmitted.placeholder": "Deit cur-a-steach",
 
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
-   "search.filters.filter.dateSubmitted.label": "Rannsaich deit cur-a-steach",
+  "search.filters.filter.dateSubmitted.label": "Rannsaich deit cur-a-steach",
 
   // "search.filters.filter.discoverable.head": "Private",
-   "search.filters.filter.discoverable.head": "Prìobhaideach",
+  "search.filters.filter.discoverable.head": "Prìobhaideach",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-    "search.filters.filter.withdrawn.head": "Air a thoirt air falbh",
+  "search.filters.filter.withdrawn.head": "Air a thoirt air falbh",
 
   // "search.filters.filter.entityType.head": "Item Type",
-    "search.filters.filter.entityType.head": "Seòrsa Nì",
+  "search.filters.filter.entityType.head": "Seòrsa Nì",
 
   // "search.filters.filter.entityType.placeholder": "Item Type",
-    "search.filters.filter.entityType.placeholder": "Seòrsa Nì",
+  "search.filters.filter.entityType.placeholder": "Seòrsa Nì",
 
   // "search.filters.filter.entityType.label": "Search item type",
   "search.filters.filter.entityType.label": "Rannsaich seòrsa nì",
 
   // "search.filters.filter.expand": "Expand filter",
-    "search.filters.filter.expand": "Leudaich fioltair",
+  "search.filters.filter.expand": "Leudaich fioltair",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-    "search.filters.filter.has_content_in_original_bundle.head": "Tha faidhlichean ann",
+  "search.filters.filter.has_content_in_original_bundle.head": "Tha faidhlichean ann",
 
   // "search.filters.filter.itemtype.head": "Type",
-   "search.filters.filter.itemtype.head": "Seòrsa",
+  "search.filters.filter.itemtype.head": "Seòrsa",
 
   // "search.filters.filter.itemtype.placeholder": "Type",
-   "search.filters.filter.itemtype.placeholder": "Seòrsa",
+  "search.filters.filter.itemtype.placeholder": "Seòrsa",
 
   // "search.filters.filter.itemtype.label": "Search type",
-    "search.filters.filter.itemtype.label": "Rannsaich seòrsa",
+  "search.filters.filter.itemtype.label": "Rannsaich seòrsa",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Tiotal Obrach",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-    "search.filters.filter.jobTitle.placeholder": "Tiotal Obrach",
+  "search.filters.filter.jobTitle.placeholder": "Tiotal Obrach",
 
   // "search.filters.filter.jobTitle.label": "Search job title",
-   "search.filters.filter.jobTitle.label": "Rannsaich tiotal obrach",
+  "search.filters.filter.jobTitle.label": "Rannsaich tiotal obrach",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
-   "search.filters.filter.knowsLanguage.head": "Cànan aithnichte",
+  "search.filters.filter.knowsLanguage.head": "Cànan aithnichte",
 
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-   "search.filters.filter.knowsLanguage.placeholder": "Cànan aithnichte",
+  "search.filters.filter.knowsLanguage.placeholder": "Cànan aithnichte",
 
   // "search.filters.filter.knowsLanguage.label": "Search known language",
-    "search.filters.filter.knowsLanguage.label": "Rannsaich cànan aithnichte",
+  "search.filters.filter.knowsLanguage.label": "Rannsaich cànan aithnichte",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
-    "search.filters.filter.namedresourcetype.head": "Inbhe",
+  "search.filters.filter.namedresourcetype.head": "Inbhe",
 
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
-    "search.filters.filter.namedresourcetype.placeholder": "Inbhe",
+  "search.filters.filter.namedresourcetype.placeholder": "Inbhe",
 
   // "search.filters.filter.namedresourcetype.label": "Search status",
   "search.filters.filter.namedresourcetype.label": "Rannsaich inbhe",
 
   // "search.filters.filter.objectpeople.head": "People",
-    "search.filters.filter.objectpeople.head": "Daoine",
+  "search.filters.filter.objectpeople.head": "Daoine",
 
   // "search.filters.filter.objectpeople.placeholder": "People",
-    "search.filters.filter.objectpeople.placeholder": "Daoine",
+  "search.filters.filter.objectpeople.placeholder": "Daoine",
 
   // "search.filters.filter.objectpeople.label": "Search people",
   "search.filters.filter.objectpeople.label": "Rannsaich daoine",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
-   "search.filters.filter.organizationAddressCountry.head": "Dùthaich",
+  "search.filters.filter.organizationAddressCountry.head": "Dùthaich",
 
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Dùthaich",
 
   // "search.filters.filter.organizationAddressCountry.label": "Search country",
-   "search.filters.filter.organizationAddressCountry.label": "Rannsaich dùthaich",
+  "search.filters.filter.organizationAddressCountry.label": "Rannsaich dùthaich",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
-   "search.filters.filter.organizationAddressLocality.head": "Baile",
+  "search.filters.filter.organizationAddressLocality.head": "Baile",
 
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-    "search.filters.filter.organizationAddressLocality.placeholder": "Baile",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Baile",
 
   // "search.filters.filter.organizationAddressLocality.label": "Search city",
   "search.filters.filter.organizationAddressLocality.label": "Rannsaich baile",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-   "search.filters.filter.organizationFoundingDate.head": "Deit Stèidheachaidh",
+  "search.filters.filter.organizationFoundingDate.head": "Deit Stèidheachaidh",
 
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-   "search.filters.filter.organizationFoundingDate.placeholder": "Deit Stèidheachaidh",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Deit Stèidheachaidh",
 
   // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
-   "search.filters.filter.organizationFoundingDate.label": "Rannsaich deit stèidheachaidh",
+  "search.filters.filter.organizationFoundingDate.label": "Rannsaich deit stèidheachaidh",
 
   // "search.filters.filter.scope.head": "Scope",
-   "search.filters.filter.scope.head": "Leudachd",
+  "search.filters.filter.scope.head": "Leudachd",
 
   // "search.filters.filter.scope.placeholder": "Scope filter",
-   "search.filters.filter.scope.placeholder": "Fioltair leudachd",
+  "search.filters.filter.scope.placeholder": "Fioltair leudachd",
 
   // "search.filters.filter.scope.label": "Search scope filter",
   "search.filters.filter.scope.label": "Rannsaich fioltair leudachd",
@@ -4916,36 +5339,36 @@
   "search.filters.filter.show-less": "Leag",
 
   // "search.filters.filter.show-more": "Show more",
-   "search.filters.filter.show-more": "Seall tuilleadh",
+  "search.filters.filter.show-more": "Seall tuilleadh",
 
   // "search.filters.filter.subject.head": "Subject",
-    "search.filters.filter.subject.head": "Cuspair",
+  "search.filters.filter.subject.head": "Cuspair",
 
   // "search.filters.filter.subject.placeholder": "Subject",
-    "search.filters.filter.subject.placeholder": "Cuspair",
+  "search.filters.filter.subject.placeholder": "Cuspair",
 
   // "search.filters.filter.subject.label": "Search subject",
-   "search.filters.filter.subject.label": "Rannsaich cuspair",
+  "search.filters.filter.subject.label": "Rannsaich cuspair",
 
   // "search.filters.filter.submitter.head": "Submitter",
-   "search.filters.filter.submitter.head": "Neach-cur-a-steach",
+  "search.filters.filter.submitter.head": "Neach-cur-a-steach",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-   "search.filters.filter.submitter.placeholder": "Neach-cur-a-steach",
+  "search.filters.filter.submitter.placeholder": "Neach-cur-a-steach",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-   "search.filters.filter.submitter.label": "Rannsaich neach-cur-a-steach",
+  "search.filters.filter.submitter.label": "Rannsaich neach-cur-a-steach",
 
 
 
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-   "search.filters.entityType.JournalIssue": "Deasachadh Diornal",
+  "search.filters.entityType.JournalIssue": "Deasachadh Diornal",
 
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-    "search.filters.entityType.JournalVolume": "Àireamh Diornal",
+  "search.filters.entityType.JournalVolume": "Àireamh Diornal",
 
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
-    "search.filters.entityType.OrgUnit": "Aonad Eagrachaidh",
+  "search.filters.entityType.OrgUnit": "Aonad Eagrachaidh",
 
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Tha",
@@ -4957,10 +5380,10 @@
   "search.filters.discoverable.true": "Chan eil",
 
   // "search.filters.discoverable.false": "Yes",
-   "search.filters.discoverable.false": "Tha",
+  "search.filters.discoverable.false": "Tha",
 
   // "search.filters.withdrawn.true": "Yes",
-   "search.filters.withdrawn.true": "Tha",
+  "search.filters.withdrawn.true": "Tha",
 
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Chan eil",
@@ -4978,10 +5401,10 @@
 
 
   // "search.form.search": "Search",
-    "search.form.search": "Rannsaich",
+  "search.form.search": "Rannsaich",
 
   // "search.form.search_dspace": "All repository",
-   "search.form.search_dspace": "Ionad-tasgaidh gu lèir",
+  "search.form.search_dspace": "Ionad-tasgaidh gu lèir",
 
   // "search.form.scope.all": "All of DSpace",
   "search.form.scope.all": "DSpace gu lèir",
@@ -4989,50 +5412,50 @@
 
 
   // "search.results.head": "Search Results",
-    "search.results.head": "Toraidhean Rannsachaidh",
+  "search.results.head": "Toraidhean Rannsachaidh",
 
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "Cha do thill an rannsachadh toraidhean. Duilgheadas a' lorg na tha thu a' sireadh? Feuch",
 
   // "search.results.no-results-link": "quotes around it",
-   "search.results.no-results-link": "cromagan turrach timcheall air",
+  "search.results.no-results-link": "cromagan turrach timcheall air",
 
   // "search.results.empty": "Your search returned no results.",
-   "search.results.empty": "Cha do thill an rannsachadh toraidhean.",
+  "search.results.empty": "Cha do thill an rannsachadh toraidhean.",
 
 
   // "default.search.results.head": "Search Results",
-   "default.search.results.head": "Toraidhean Rannsachaidh",
+  "default.search.results.head": "Toraidhean Rannsachaidh",
 
 
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Air ais gu toraidhean",
 
   // "search.sidebar.filters.title": "Filters",
-   "search.sidebar.filters.title": "Fioltairean",
+  "search.sidebar.filters.title": "Fioltairean",
 
   // "search.sidebar.open": "Search Tools",
-   "search.sidebar.open": "Innealan Rannsachaidh",
+  "search.sidebar.open": "Innealan Rannsachaidh",
 
   // "search.sidebar.results": "results",
   "search.sidebar.results": "toraidhean",
 
   // "search.sidebar.settings.rpp": "Results per page",
-    "search.sidebar.settings.rpp": "Toraidhean gach duilleag",
+  "search.sidebar.settings.rpp": "Toraidhean gach duilleag",
 
   // "search.sidebar.settings.sort-by": "Sort By",
-    "search.sidebar.settings.sort-by": "Seòrsaich a rèir",
+  "search.sidebar.settings.sort-by": "Seòrsaich a rèir",
 
   // "search.sidebar.settings.title": "Settings",
-   "search.sidebar.settings.title": "Seatadh",
+  "search.sidebar.settings.title": "Seatadh",
 
 
 
   // "search.view-switch.show-detail": "Show detail",
-    "search.view-switch.show-detail": "Seall mion-fhiosrachadh",
+  "search.view-switch.show-detail": "Seall mion-fhiosrachadh",
 
   // "search.view-switch.show-grid": "Show as grid",
-    "search.view-switch.show-grid": "Seall mar chliath",
+  "search.view-switch.show-grid": "Seall mar chliath",
 
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Seall mar liosta",
@@ -5040,34 +5463,34 @@
 
 
   // "sorting.ASC": "Ascending",
-   "sorting.ASC": "A' dìreadh",
+  "sorting.ASC": "A' dìreadh",
 
   // "sorting.DESC": "Descending",
-   "sorting.DESC": "A' teàrnadh",
+  "sorting.DESC": "A' teàrnadh",
 
   // "sorting.dc.title.ASC": "Title Ascending",
-   "sorting.dc.title.ASC": "Tiotalan a' Dìreadh",
+  "sorting.dc.title.ASC": "Tiotalan a' Dìreadh",
 
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Tiotalan a' Teàrnadh",
 
   // "sorting.score.ASC": "Least Relevant",
-    "sorting.score.ASC": "Buntanas as Lugha",
+  "sorting.score.ASC": "Buntanas as Lugha",
 
   // "sorting.score.DESC": "Most Relevant",
-   "sorting.score.DESC": "Buntanas as Motha",
+  "sorting.score.DESC": "Buntanas as Motha",
 
   // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
   "sorting.dc.date.issued.ASC": "Dèit Cur-a-mach a' Dìreadh",
 
   // "sorting.dc.date.issued.DESC": "Date Issued Descending",
-    "sorting.dc.date.issued.DESC": "Dèit Cur-a-mach a' Teàrnadh",
+  "sorting.dc.date.issued.DESC": "Dèit Cur-a-mach a' Teàrnadh",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-   "sorting.dc.date.accessioned.ASC": "Deit Cuir-ris a' Dìreadh",
+  "sorting.dc.date.accessioned.ASC": "Deit Cuir-ris a' Dìreadh",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-   "sorting.dc.date.accessioned.DESC": "Deit Cuir-ris a' Teàrnadh",
+  "sorting.dc.date.accessioned.DESC": "Deit Cuir-ris a' Teàrnadh",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
   "sorting.lastModified.ASC": "Atharraichte mu Dheireadh a' Dìreadh",
@@ -5077,37 +5500,37 @@
 
 
   // "statistics.title": "Statistics",
-   "statistics.title": "Staitistigs",
+  "statistics.title": "Staitistigs",
 
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "Staitistigs airson {{ scope }}",
 
   // "statistics.breadcrumbs": "Statistics",
-   "statistics.breadcrumbs": "Staitistigs",
+  "statistics.breadcrumbs": "Staitistigs",
 
   // "statistics.page.no-data": "No data available",
-   "statistics.page.no-data": "Chan eil dàta ri fhaighinn",
+  "statistics.page.no-data": "Chan eil dàta ri fhaighinn",
 
   // "statistics.table.no-data": "No data available",
-    "statistics.table.no-data": "Chan eil dàta ri fhaighinn",
+  "statistics.table.no-data": "Chan eil dàta ri fhaighinn",
 
   // "statistics.table.title.TotalVisits": "Total visits",
-    "statistics.table.title.TotalVisits": "Tadhail gu lèir",
+  "statistics.table.title.TotalVisits": "Tadhail gu lèir",
 
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-   "statistics.table.title.TotalVisitsPerMonth": "Tadhail gu lèir sa mhìos",
+  "statistics.table.title.TotalVisitsPerMonth": "Tadhail gu lèir sa mhìos",
 
   // "statistics.table.title.TotalDownloads": "File Visits",
-   "statistics.table.title.TotalDownloads": "Tadhail air Faidhle",
+  "statistics.table.title.TotalDownloads": "Tadhail air Faidhle",
 
   // "statistics.table.title.TopCountries": "Top country views",
-   "statistics.table.title.TopCountries": "Seallaidhean as trice a rèir dùthaich",
+  "statistics.table.title.TopCountries": "Seallaidhean as trice a rèir dùthaich",
 
   // "statistics.table.title.TopCities": "Top city views",
   "statistics.table.title.TopCities": "Seallaidhean as trice a rèir baile",
 
   // "statistics.table.header.views": "Views",
-    "statistics.table.header.views": "Seallaidhean",
+  "statistics.table.header.views": "Seallaidhean",
 
 
 
@@ -5115,40 +5538,40 @@
   "submission.edit.breadcrumbs": "Deasaich Cur-a-steach",
 
   // "submission.edit.title": "Edit Submission",
-   "submission.edit.title": "Deasaich Cur-a-steach",
+  "submission.edit.title": "Deasaich Cur-a-steach",
 
   // "submission.general.cancel": "Cancel",
-   "submission.general.cancel": "Cansail",
+  "submission.general.cancel": "Cansail",
 
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-   "submission.general.cannot_submit": "Chan eil còir agad cur-a-steach ùr a dhèanamh.",
+  "submission.general.cannot_submit": "Chan eil còir agad cur-a-steach ùr a dhèanamh.",
 
   // "submission.general.deposit": "Deposit",
-      "submission.general.deposit": "Taisg",
+  "submission.general.deposit": "Taisg",
 
   // "submission.general.discard.confirm.cancel": "Cancel",
-    "submission.general.discard.confirm.cancel": "Cansail",
+  "submission.general.discard.confirm.cancel": "Cansail",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Cha ghabh an t-obrachadh seo neo-dhèanamh. A bheil thu cinnteach?",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
-   "submission.general.discard.confirm.submit": "Tha, tha mi cinnteach",
+  "submission.general.discard.confirm.submit": "Tha, tha mi cinnteach",
 
   // "submission.general.discard.confirm.title": "Discard submission",
-   "submission.general.discard.confirm.title": "Cur às do chur-a-steach",
+  "submission.general.discard.confirm.title": "Cur às do chur-a-steach",
 
   // "submission.general.discard.submit": "Discard",
-    "submission.general.discard.submit": "Cuir às",
+  "submission.general.discard.submit": "Cuir às",
 
   // "submission.general.info.saved": "Saved",
-    "submission.general.info.saved": "Air a shàbhaladh",
+  "submission.general.info.saved": "Air a shàbhaladh",
 
   // "submission.general.info.pending-changes": "Unsaved changes",
   "submission.general.info.pending-changes": "Atharraichean nach eil air an sàbhaladh",
 
   // "submission.general.save": "Save",
-   "submission.general.save": "Sàbhail",
+  "submission.general.save": "Sàbhail",
 
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Sàbhail airson àm eile",
@@ -5158,49 +5581,49 @@
   "submission.import-external.page.title": "Steach-ghluais metadata bho stòr a-muigh",
 
   // "submission.import-external.title": "Import metadata from an external source",
-   "submission.import-external.title": "Steach-ghluais metadata bho stòr a-muigh",
+  "submission.import-external.title": "Steach-ghluais metadata bho stòr a-muigh",
 
   // "submission.import-external.title.Journal": "Import a journal from an external source",
-   "submission.import-external.title.Journal": "Steach-ghluais diornal bho stòr a-muigh",
+  "submission.import-external.title.Journal": "Steach-ghluais diornal bho stòr a-muigh",
 
   // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
-   "submission.import-external.title.JournalIssue": "Steach-ghluais deasachadh diornal bho stòr a-muigh",
+  "submission.import-external.title.JournalIssue": "Steach-ghluais deasachadh diornal bho stòr a-muigh",
 
   // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
-   "submission.import-external.title.JournalVolume": "Steach-ghluais àireamh diornal bho stòr a-muigh", 
+  "submission.import-external.title.JournalVolume": "Steach-ghluais àireamh diornal bho stòr a-muigh",
 
   // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
   "submission.import-external.title.OrgUnit": "Steach-ghluais foillsichear bho stòr a-muigh",
 
   // "submission.import-external.title.Person": "Import a person from an external source",
-   "submission.import-external.title.Person": "Steach-ghluais neach bho stòr a-muigh",
+  "submission.import-external.title.Person": "Steach-ghluais neach bho stòr a-muigh",
 
   // "submission.import-external.title.Project": "Import a project from an external source",
-   "submission.import-external.title.Project": "Steach-ghluais pròiseact bho stòr a-muigh",
+  "submission.import-external.title.Project": "Steach-ghluais pròiseact bho stòr a-muigh",
 
   // "submission.import-external.title.Publication": "Import a publication from an external source",
-   "submission.import-external.title.Publication": "Steach-ghluais foillseachadh bho stòr a-muigh",
+  "submission.import-external.title.Publication": "Steach-ghluais foillseachadh bho stòr a-muigh",
 
   // "submission.import-external.title.none": "Import metadata from an external source",
-    "submission.import-external.title.none": "Steach-ghluais metadata bho stòr a-muigh",
+  "submission.import-external.title.none": "Steach-ghluais metadata bho stòr a-muigh",
 
   // "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": "Cuir ann ceist gu h-àrd gus nithean a lorg bhon lìon airson steach-ghluasad gu DSpace.",
+  "submission.import-external.page.hint": "Cuir ann ceist gu h-àrd gus nithean a lorg bhon lìon airson steach-ghluasad gu DSpace.",
 
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "Air ais gu MoDSpace",
 
   // "submission.import-external.search.placeholder": "Search the external source",
-   "submission.import-external.search.placeholder": "Rannsaich an stòr a-muigh",
+  "submission.import-external.search.placeholder": "Rannsaich an stòr a-muigh",
 
   // "submission.import-external.search.button": "Search",
-    "submission.import-external.search.button": "Rannsaich",
+  "submission.import-external.search.button": "Rannsaich",
 
   // "submission.import-external.search.button.hint": "Write some words to search",
-    "submission.import-external.search.button.hint": "Sgrìobh faclan airson rannsachadh",
+  "submission.import-external.search.button.hint": "Sgrìobh faclan airson rannsachadh",
 
   // "submission.import-external.search.source.hint": "Pick an external source",
-    "submission.import-external.search.source.hint": "Tagh stòr a-muigh",
+  "submission.import-external.search.source.hint": "Tagh stòr a-muigh",
 
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
@@ -5221,7 +5644,7 @@
   "submission.import-external.source.openAIREFunding": "Maoineachadh OpenAIRE API",
 
   // "submission.import-external.source.orcid": "ORCID",
-   "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "ORCID",
 
   // "submission.import-external.source.pubmed": "Pubmed",
   // TODO New key - Add a translation
@@ -5231,7 +5654,7 @@
   "submission.import-external.source.lcname": "Leabharlann Ainmean Còmhdhail",
 
   // "submission.import-external.preview.title": "Item Preview",
-   "submission.import-external.preview.title": "Ro-shealladh Nì",
+  "submission.import-external.preview.title": "Ro-shealladh Nì",
 
   // "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": "Chaidh am metadata gu h-ìosal a steach-ghluasad bho stòr a-muigh. Bidh e ro-lìonte nuair a thòisicheas tu an cur-a-steach.",
@@ -5240,7 +5663,7 @@
   "submission.import-external.preview.button.import": "Tòisich Cur-a-steach",
 
   // "submission.import-external.preview.error.import.title": "Submission error",
-   "submission.import-external.preview.error.import.title": "Mearachd sa chur-a-steach",
+  "submission.import-external.preview.error.import.title": "Mearachd sa chur-a-steach",
 
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   // TODO New key - Add a translation
@@ -5256,7 +5679,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Steach-ghluais ùghdar iomallach",
 
   // "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": "Steach-ghluais diornal iomallach",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Steach-ghluais diornal iomallach",
 
   // "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": "Steach-ghluais deasachadh diornal iomallach",
@@ -5265,37 +5688,37 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Steach-ghluais àireamh diornal iomallach",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-   "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Pròiseact",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Pròiseact",
 
   // "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": "Chuireadh-ris Eintitidh Ùr!",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-   "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Pròiseact",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Pròiseact",
 
   // "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": "Maoineachadh OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Maoineachadh OpenAIRE API",
 
   // "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": "Steach-ghluais Ùghdar Iomallach",
 
   // "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": "Chaidh ùghdar ionadail a chur ris an taghadh",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Chaidh ùghdar ionadail a chur ris an taghadh",
 
   // "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": "Chaidh ùghdar a-muigh a steach-ghluasad agus a chur ris an taghadh ",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Chaidh ùghdar a-muigh a steach-ghluasad agus a chur ris an taghadh ",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Ùghdarras",
 
   // "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": "Steach-ghluais mar steach-chur ùghdarras ionadail ùr",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Steach-ghluais mar steach-chur ùghdarras ionadail ùr",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
-    "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cansail",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cansail",
 
   // "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": "Tagh cruinneachadh dhan tèid steach-churan ùra a steach-ghluasad",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Tagh cruinneachadh dhan tèid steach-churan ùra a steach-ghluasad",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entitidhean",
@@ -5307,25 +5730,25 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "A' steach-ghluasad bho Ainm LC",
 
   // "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": "A' steach-ghluasad bho ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "A' steach-ghluasad bho ORCID",
 
   // "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": "A' steach-ghluasad bho Diornal Sherpa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "A' steach-ghluasad bho Diornal Sherpa",
 
   // "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": "A' steach-ghluasad bho Fhoillsichear Sherpa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "A' steach-ghluasad bho Fhoillsichear Sherpa",
 
   // "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": "A' steach-ghluasad bho PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "A' steach-ghluasad bho 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": "A' steach-ghluasad bho arXiv",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
-    "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Steach-ghluais",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Steach-ghluais",
 
   // "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": "Steach-ghluais Diornal Iomallach",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Steach-ghluais Diornal Iomallach",
 
   // "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": "Chaidh diornal ionadail a chur ris an taghadh",
@@ -5334,16 +5757,16 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Chaidh diornal a-muigh a steach-ghluasad agus a chur ris an taghadh",
 
   // "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": "Steach-ghluais Deasachadh Diornal Iomallach",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Steach-ghluais Deasachadh Diornal Iomallach",
 
   // "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": "Chaidh deasachadh diornal ionadail a chur ris an taghadh",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Chaidh deasachadh diornal ionadail a chur ris an taghadh",
 
   // "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": "Chaidh deasachadh diornal a-muigh a steach-ghluasad agus a chur ris an taghadh",
 
   // "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": "Steach-ghluais Àireamh Diornal Iomallach",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Steach-ghluais Àireamh Diornal Iomallach",
 
   // "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": "Chaidh àireamh diornal ionadail a chur ris an taghadh",
@@ -5355,115 +5778,115 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Tagh maids ionadail:",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Dì-thagh na h-uile",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Dì-thagh na h-uile",
 
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-    "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Dì-thagh duilleag",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Dì-thagh duilleag",
 
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-    "submission.sections.describe.relationship-lookup.search-tab.loading": "A' luchdachadh...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "A' luchdachadh...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Ceist rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-    "submission.sections.describe.relationship-lookup.search-tab.search": "Rach",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Rach",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-    "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Rannsaich...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Rannsaich...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
-   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Tagh na h-uile",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Tagh na h-uile",
 
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
-    "submission.sections.describe.relationship-lookup.search-tab.select-page": "Tagh duilleag",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Tagh duilleag",
 
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "Thaghadh {{ size }} nithean",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Ùghdaran Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Ùghdaran Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Diornalan Ionadail({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Pròiseactan Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Pròiseactan Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-    "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Foillseachaidhean Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Foillseachaidhean Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Ùghdaran Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Ùghdaran Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-    "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Aonadan Eagrachaidh Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Aonadan Eagrachaidh Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pasgain Dàta Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pasgain Dàta Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Faidhlichean Dàta Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Faidhlichean Dàta Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Diornalan Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Diornalan Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Deasachaidhean Diornal Ionadail ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Deasachaidhean Diornal Ionadail ({{ 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": "Deasachaidhean Diornal Ionadail ({{ 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": "Àireamhan Diornal Ionadail ({{ 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": "Àireamhan Diornal Ionadail ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Àireamhan Diornal Ionadail ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Diornalan 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": "Foillsichearan Sherpa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Foillsichearan Sherpa ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
-    "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "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 }})",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Ainmean LC  ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Ainmean LC  ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
-    "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ 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.arxiv": "arXiv ({{ count }})",
+  "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.isFundingAgencyOfPublication": "Rannsaich airson Bhuidhnean Maoineachaidh",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Rannsaich airson Bhuidhnean Maoineachaidh",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-    "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Rannsaich airson Maoineachadh",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Rannsaich airson Maoineachadh",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Rannsaich airson Aonadan Eagrachaidh",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Rannsaich airson Aonadan Eagrachaidh",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Maoineachadh OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Maoineachadh OpenAIRE API",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Pròiseactan",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Pròiseactan",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
-   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Maoinichear a' Phròiseact",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Maoinichear a' Phròiseact",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
   "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Maoineachadh OpenAIRE API",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Pròiseact",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Pròiseact",
 
   // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
-   "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Pròiseactan",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Pròiseactan",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Maoinichear a' Phròiseact",
@@ -5472,62 +5895,62 @@
 
 
   // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
-    "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Rannsaich...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Rannsaich...",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-    "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Taghadh An-dràsta ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Taghadh An-dràsta ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
-    "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Deasachaidhean Diornal",
-  
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Deasachaidhean Diornal",
+
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Deasachaidhean Diornal",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Deasachaidhean Diornal",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Àireamhan Diornal",
-  
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Àireamhan Diornal",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Àireamhan Diornal",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
-   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Diornalan",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Diornalan",
 
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-    "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Ùghdaran",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Ùghdaran",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-    "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Buidheann Maoineachaidh",
-  
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Buidheann Maoineachaidh",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-    "submission.sections.describe.relationship-lookup.title.Project": "Pròiseactan",
+  "submission.sections.describe.relationship-lookup.title.Project": "Pròiseactan",
 
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
-    "submission.sections.describe.relationship-lookup.title.Publication": "Foillseachaidhean",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Foillseachaidhean",
 
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-   "submission.sections.describe.relationship-lookup.title.Person": "Ùghdaran",
+  "submission.sections.describe.relationship-lookup.title.Person": "Ùghdaran",
 
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-   "submission.sections.describe.relationship-lookup.title.OrgUnit": "Aonadan Eagrachaidh",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Aonadan Eagrachaidh",
 
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-   "submission.sections.describe.relationship-lookup.title.DataPackage": "Pasgain Dàta",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pasgain Dàta",
 
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-   "submission.sections.describe.relationship-lookup.title.DataFile": "Faidhlichean Dàta",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Faidhlichean Dàta",
 
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Buidheann Maoineachaidh",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Buidheann Maoineachaidh",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Maoineachadh",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Maoineachadh",
 
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Prìomh Aonad Eagrachaidh",
 
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
-    "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Suids Clàr-teàrnaidh",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Suids Clàr-teàrnaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Seatadh",
@@ -5536,16 +5959,16 @@
   "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Tha an taghadh falamh an-dràsta .",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-    "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Ùghdaran Taghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Ùghdaran Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Diornalan Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Àireamh Diornal Taghte",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Àireamh Diornal Taghte",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Pròiseactan Taghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Pròiseactan Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Foillseachaidhean Taghte",
@@ -5557,17 +5980,17 @@
   "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Aonadan Eagrachaidh Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pasgain Dàta Thaghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pasgain Dàta Thaghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
-    "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Faidhlichean Dàta Taghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Faidhlichean Dàta Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-    "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Diornalan Taghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Diornalan Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Deasachadh Diornal Taghte",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Àireamh Diornal Taghte",
 
@@ -5576,69 +5999,69 @@
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Maoineachadh Taghte",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Deasachadh Diornal Taghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Deasachadh Diornal Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Aonad Eagrachaidh Taghte",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Aonad Eagrachaidh Taghte",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Toraidhean Rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Toraidhean Rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Toraidhean Rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-    "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Toraidhean Rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Toraidhean Rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-    "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Toraidhean Rannsachaidh",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-    "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Toraidhean Rannsachaidh",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Toraidhean Rannsachaidh",
 
-  // "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": "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": "A bheil thu airson \"{{ value }}\" a shàbhaladh mar ainm diofraichte don neach seo airson gum faigh thu fhèin agus daoine eile a chleachdadh airson chur-a-steachan ri thighinn? Mura bheil, is urrainn dhut fhathast a chleachdadh airson a' chur-a-steach seo.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Sàbhail ainm diofraichte ùr",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Cleachd airson a' chur-a-steach seo a-mhàin",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Cleachd airson a' chur-a-steach seo a-mhàin",
 
   // "submission.sections.ccLicense.type": "License Type",
-    "submission.sections.ccLicense.type": "Seòrsa Cead",
+  "submission.sections.ccLicense.type": "Seòrsa Cead",
 
   // "submission.sections.ccLicense.select": "Select a license type…",
-   "submission.sections.ccLicense.select": "Tagh seòrsa cead…",
+  "submission.sections.ccLicense.select": "Tagh seòrsa cead…",
 
   // "submission.sections.ccLicense.change": "Change your license type…",
-   "submission.sections.ccLicense.change": "Atharraich an seòrsa cead…",
+  "submission.sections.ccLicense.change": "Atharraich an seòrsa cead…",
 
   // "submission.sections.ccLicense.none": "No licenses available",
-    "submission.sections.ccLicense.none": "Chan eil ceadan ri fhaighinn",
+  "submission.sections.ccLicense.none": "Chan eil ceadan ri fhaighinn",
 
   // "submission.sections.ccLicense.option.select": "Select an option…",
-    "submission.sections.ccLicense.option.select": "Tagh roghainn…",
+  "submission.sections.ccLicense.option.select": "Tagh roghainn…",
 
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
-   "submission.sections.ccLicense.link": "Thagh thu an cead a leanas:",
+  "submission.sections.ccLicense.link": "Thagh thu an cead a leanas:",
 
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-   "submission.sections.ccLicense.confirmation": "Tha mi a' toirt a' chead gu h-àrd",
+  "submission.sections.ccLicense.confirmation": "Tha mi a' toirt a' chead gu h-àrd",
 
   // "submission.sections.general.add-more": "Add more",
-    "submission.sections.general.add-more": "Cuir-ris tuilleadh",
+  "submission.sections.general.add-more": "Cuir-ris tuilleadh",
 
   // "submission.sections.general.collection": "Collection",
-    "submission.sections.general.collection": "Cruinneachadh",
+  "submission.sections.general.collection": "Cruinneachadh",
 
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
   "submission.sections.general.deposit_error_notice": "Bha duilgheadas ann a' cur a-steach an nì seo; feuch a-rithist aig àm eile.",
@@ -5653,36 +6076,36 @@
   "submission.sections.general.discard_success_notice": "Chaidh cur às don chur-a-steach.",
 
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-   "submission.sections.general.metadata-extracted": "Chaidh metadata ùr às-tharraing agus a chur ris an earrainn <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted": "Chaidh metadata ùr às-tharraing agus a chur ris an earrainn <strong>{{sectionId}}</strong>.",
 
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
-   "submission.sections.general.metadata-extracted-new-section": "Chaidh earrann ùr <strong>{{sectionId}}</strong> a chur ris a' chur-a-steach.",
+  "submission.sections.general.metadata-extracted-new-section": "Chaidh earrann ùr <strong>{{sectionId}}</strong> a chur ris a' chur-a-steach.",
 
   // "submission.sections.general.no-collection": "No collection found",
-    "submission.sections.general.no-collection": "Cha deach cruinneachadh a lorg",
+  "submission.sections.general.no-collection": "Cha deach cruinneachadh a lorg",
 
   // "submission.sections.general.no-sections": "No options available",
-    "submission.sections.general.no-sections": "Chan eil roghainnean ann",
+  "submission.sections.general.no-sections": "Chan eil roghainnean ann",
 
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-   "submission.sections.general.save_error_notice": "Bha duilgheadas ann a' sàbhaladh an nì; feuch a-rithist aig àm eile.",
+  "submission.sections.general.save_error_notice": "Bha duilgheadas ann a' sàbhaladh an nì; feuch a-rithist aig àm eile.",
 
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "Shàbhaileadh an cur-a-steach.",
 
   // "submission.sections.general.search-collection": "Search for a collection",
-    "submission.sections.general.search-collection": "Rannsaich airson cruinneachadh",
+  "submission.sections.general.search-collection": "Rannsaich airson cruinneachadh",
 
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-   "submission.sections.general.sections_not_valid": "Tha earrannan neo-chrìochnaichte ann.",
+  "submission.sections.general.sections_not_valid": "Tha earrannan neo-chrìochnaichte ann.",
 
 
 
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-   "submission.sections.submit.progressbar.CClicense": "Cead-cleachdaidh cruthachail",
+  "submission.sections.submit.progressbar.CClicense": "Cead-cleachdaidh cruthachail",
 
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-   "submission.sections.submit.progressbar.describe.recycle": "Ath-chuairtich",
+  "submission.sections.submit.progressbar.describe.recycle": "Ath-chuairtich",
 
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Thoir cunntas",
@@ -5691,7 +6114,7 @@
   "submission.sections.submit.progressbar.describe.stepone": "Thoir cunntas",
 
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-   "submission.sections.submit.progressbar.describe.steptwo": "Thoir cunntas",
+  "submission.sections.submit.progressbar.describe.steptwo": "Thoir cunntas",
 
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   // TODO New key - Add a translation
@@ -5701,79 +6124,79 @@
   "submission.sections.submit.progressbar.license": "Taisg cead",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
-    "submission.sections.submit.progressbar.upload": "Luchdaich suas faidhlichean",
+  "submission.sections.submit.progressbar.upload": "Luchdaich suas faidhlichean",
 
 
 
   // "submission.sections.status.errors.title": "Errors",
-   "submission.sections.status.errors.title": "Mearachdan",
+  "submission.sections.status.errors.title": "Mearachdan",
 
   // "submission.sections.status.valid.title": "Valid",
-    "submission.sections.status.valid.title": "Brìgheil",
+  "submission.sections.status.valid.title": "Brìgheil",
 
   // "submission.sections.status.warnings.title": "Warnings",
-   "submission.sections.status.warnings.title": "Rabhaidhean",
+  "submission.sections.status.warnings.title": "Rabhaidhean",
 
   // "submission.sections.status.errors.aria": "has errors",
-   "submission.sections.status.errors.aria": "mearachdan ann",
+  "submission.sections.status.errors.aria": "mearachdan ann",
 
   // "submission.sections.status.valid.aria": "is valid",
-    "submission.sections.status.valid.aria": "brìgheil",
+  "submission.sections.status.valid.aria": "brìgheil",
 
   // "submission.sections.status.warnings.aria": "has warnings",
-   "submission.sections.status.warnings.aria": "rabhaidhean ann",
+  "submission.sections.status.warnings.aria": "rabhaidhean ann",
 
   // "submission.sections.toggle.open": "Open section",
-    "submission.sections.toggle.open": "Fosgail earrann",
+  "submission.sections.toggle.open": "Fosgail earrann",
 
   // "submission.sections.toggle.close": "Close section",
-    "submission.sections.toggle.close": "Dùin earrann",
+  "submission.sections.toggle.close": "Dùin earrann",
 
   // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
-   "submission.sections.toggle.aria.open": "Leudaich earrann {{sectionHeader}}",
+  "submission.sections.toggle.aria.open": "Leudaich earrann {{sectionHeader}}",
 
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
-    "submission.sections.toggle.aria.close": "Leag earrann {{sectionHeader}}",
+  "submission.sections.toggle.aria.close": "Leag earrann {{sectionHeader}}",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
-   "submission.sections.upload.delete.confirm.cancel": "Cansail",
+  "submission.sections.upload.delete.confirm.cancel": "Cansail",
 
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
-   "submission.sections.upload.delete.confirm.info": "Cha ghabh an t-obrachadh seo neo-dhèanamh. A bheil thu cinnteach?",
+  "submission.sections.upload.delete.confirm.info": "Cha ghabh an t-obrachadh seo neo-dhèanamh. A bheil thu cinnteach?",
 
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
-   "submission.sections.upload.delete.confirm.submit": "Tha, tha mi cinnteach",
+  "submission.sections.upload.delete.confirm.submit": "Tha, tha mi cinnteach",
 
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-   "submission.sections.upload.delete.confirm.title": "Dubh às bitstream",
+  "submission.sections.upload.delete.confirm.title": "Dubh às bitstream",
 
   // "submission.sections.upload.delete.submit": "Delete",
-    "submission.sections.upload.delete.submit": "Dubh às",
+  "submission.sections.upload.delete.submit": "Dubh às",
 
   // "submission.sections.upload.download.title": "Download bitstream",
-   "submission.sections.upload.download.title": "Luchdaich a-nuas bitstream",
+  "submission.sections.upload.download.title": "Luchdaich a-nuas bitstream",
 
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Leig às faidhlichean agus ceangail iad ris an nì",
 
   // "submission.sections.upload.edit.title": "Edit bitstream",
-    "submission.sections.upload.edit.title": "Deasaich bitstream",
+  "submission.sections.upload.edit.title": "Deasaich bitstream",
 
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   // TODO New key - Add a translation
   "submission.sections.upload.form.access-condition-label": "Seòrsa cumha air cothrom",
 
   // "submission.sections.upload.form.date-required": "Date is required.",
-    "submission.sections.upload.form.date-required": "Tha deit riatanach.",
+  "submission.sections.upload.form.date-required": "Tha deit riatanach.",
 
   // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
-   "submission.sections.upload.form.date-required-from": "Tha deit bho bheil cothrom ga thoirt riatanach.",
+  "submission.sections.upload.form.date-required-from": "Tha deit bho bheil cothrom ga thoirt riatanach.",
 
   // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
   "submission.sections.upload.form.date-required-until": "Tha deit gu bheil cothrom ga thoirt riatanach.",
 
   // "submission.sections.upload.form.from-label": "Grant access from",
-   "submission.sections.upload.form.from-label": "Thoir cothrom bho",
+  "submission.sections.upload.form.from-label": "Thoir cothrom bho",
 
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Bho",
@@ -5782,13 +6205,13 @@
   "submission.sections.upload.form.group-label": "Buidheann",
 
   // "submission.sections.upload.form.group-required": "Group is required.",
-    "submission.sections.upload.form.group-required": "Tha buidheann riatanach.",
+  "submission.sections.upload.form.group-required": "Tha buidheann riatanach.",
 
   // "submission.sections.upload.form.until-label": "Grant access until",
-    "submission.sections.upload.form.until-label": "Thoir cothrom gu",
+  "submission.sections.upload.form.until-label": "Thoir cothrom gu",
 
   // "submission.sections.upload.form.until-placeholder": "Until",
-    "submission.sections.upload.form.until-placeholder": "Gu",
+  "submission.sections.upload.form.until-placeholder": "Gu",
 
   // "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": "Bidh cothrom air na faidhlichean a chaidh a luchdachadh gu cruinneachadh {{collectionName}} a rèir a' bhuidhinn/nam buidhnean a leanas:",
@@ -5797,26 +6220,26 @@
   // TODO New key - Add a translation
   "submission.sections.upload.header.policy.default.withlist": "Thoir fa-near gum bi cothrom air faidhlichean a chaidh a luchdachadh gu cruinneachadh {{collectionName}}, cho math ris na chaidh a cho-dhùnadh airson an fhaidhle air leth, aig a' bhuidheann/na buidhnean a leanas:",
 
-  // "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": "An seo gheibh thu na faidhlichean gu lèir san nì an-dràsta. Is urrainn dhut metadata an fhaidhle ùrachadh agus cothrom fhaighinn air cumhachan no <strong>faidhlichean eile a luchdachadh suas le bhith gan slaodadh agus gan leigeil às air feadh na duilleig</strong>",
 
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Chan eil",
 
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-   "submission.sections.upload.no-file-uploaded": "Cha deach faidhle a luchdachadh suas fhathast.",
+  "submission.sections.upload.no-file-uploaded": "Cha deach faidhle a luchdachadh suas fhathast.",
 
   // "submission.sections.upload.save-metadata": "Save metadata",
-   "submission.sections.upload.save-metadata": "Sàbhail metadata",
+  "submission.sections.upload.save-metadata": "Sàbhail metadata",
 
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Cansail",
 
   // "submission.sections.upload.upload-failed": "Upload failed",
-   "submission.sections.upload.upload-failed": "Cha do dh'obraich an luchdachadh suas",
+  "submission.sections.upload.upload-failed": "Cha do dh'obraich an luchdachadh suas",
 
   // "submission.sections.upload.upload-successful": "Upload successful",
-    "submission.sections.upload.upload-successful": "Dh'obraich an luchdachadh suas",
+  "submission.sections.upload.upload-successful": "Dh'obraich an luchdachadh suas",
 
 
 
@@ -5824,24 +6247,24 @@
   "submission.submit.breadcrumbs": "Cur-a-steach ùr",
 
   // "submission.submit.title": "New submission",
-   "submission.submit.title": "Cur-a-steach ùr",
+  "submission.submit.title": "Cur-a-steach ùr",
 
 
 
   // "submission.workflow.generic.delete": "Delete",
-   "submission.workflow.generic.delete": "Dubh às",
+  "submission.workflow.generic.delete": "Dubh às",
 
   // "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": "Ma tha thu airson cur às don nì seo, tagh \"Dubh às\".  An uair sin thèid iarraidh ort a dhearbhadh.",
+  "submission.workflow.generic.delete-help": "Ma tha thu airson cur às don nì seo, tagh \"Dubh às\".  An uair sin thèid iarraidh ort a dhearbhadh.",
 
   // "submission.workflow.generic.edit": "Edit",
-    "submission.workflow.generic.edit": "Deasaich",
+  "submission.workflow.generic.edit": "Deasaich",
 
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-   "submission.workflow.generic.edit-help": "Tagh an roghainn seo gus metadata an nì atharrachadh.",
+  "submission.workflow.generic.edit-help": "Tagh an roghainn seo gus metadata an nì atharrachadh.",
 
   // "submission.workflow.generic.view": "View",
-   "submission.workflow.generic.view": "Seall ri",
+  "submission.workflow.generic.view": "Seall ri",
 
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Tagh an roghainn seo agus seall ri metadata an nì.",
@@ -5855,25 +6278,25 @@
   "submission.workflow.tasks.claimed.approve_help": "Ma rinn thu ath-sgrùdadh air an nì seo, 's e freagarrach airson a dhol dhan chruinneachadh, tagh  \"Aontaich\".",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
-   "submission.workflow.tasks.claimed.edit": "Deasaich",
+  "submission.workflow.tasks.claimed.edit": "Deasaich",
 
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Tagh an roghainn seo gus metadata an nì atharrachadh.",
 
   // "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": "Cuir an t-adhbhar airson an cur-a-steach a dhiùltadh dhan bhogsa gu h-ìosal, ag innse an urrainn dhan neach-cur-a-steach duilgheadas a chur ceart agus a chur a-steach a-rithist.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Cuir an t-adhbhar airson an cur-a-steach a dhiùltadh dhan bhogsa gu h-ìosal, ag innse an urrainn dhan neach-cur-a-steach duilgheadas a chur ceart agus a chur a-steach a-rithist.",
 
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
-   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Thoir cunntas air adhbhar an diùltaidh",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Thoir cunntas air adhbhar an diùltaidh",
 
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-    "submission.workflow.tasks.claimed.reject.reason.submit": "Diùlt nì",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Diùlt nì",
 
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
-   "submission.workflow.tasks.claimed.reject.reason.title": "Adhbhar",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Adhbhar",
 
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
-   "submission.workflow.tasks.claimed.reject.submit": "Diùlt",
+  "submission.workflow.tasks.claimed.reject.submit": "Diùlt",
 
   // "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": "Ma rinn thu ath-sgrùdadh air an nì seo, 's tu smaoineachadh <strong>nach eil</strong> e freagarrach airson a dhol dhan chruinneachadh, tagh \"Diùlt\".  Thèid iarraidh ort an uair sin brath a chur ann ag innse carson nach eil an nì freagarrach agus am bu chòir an neach-cur-a-steach rudeigin atharrachaadh agus a chur a-steach a-rithist.",
@@ -5887,16 +6310,16 @@
 
 
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-    "submission.workflow.tasks.generic.error": "Bha mearachd ann a' dèanamh...",
+  "submission.workflow.tasks.generic.error": "Bha mearachd ann a' dèanamh...",
 
   // "submission.workflow.tasks.generic.processing": "Processing...",
-   "submission.workflow.tasks.generic.processing": "A' pròiseasadh...",
+  "submission.workflow.tasks.generic.processing": "A' pròiseasadh...",
 
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-    "submission.workflow.tasks.generic.submitter": "Neach-cur-a-steach",
+  "submission.workflow.tasks.generic.submitter": "Neach-cur-a-steach",
 
   // "submission.workflow.tasks.generic.success": "Operation successful",
-   "submission.workflow.tasks.generic.success": "Dh'obraich an t-obrachadh",
+  "submission.workflow.tasks.generic.success": "Dh'obraich an t-obrachadh",
 
 
 
@@ -5904,10 +6327,10 @@
   "submission.workflow.tasks.pool.claim": "Gabh",
 
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-   "submission.workflow.tasks.pool.claim_help": "Sònraich an obair seo dhut fhèin.",
+  "submission.workflow.tasks.pool.claim_help": "Sònraich an obair seo dhut fhèin.",
 
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-   "submission.workflow.tasks.pool.hide-detail": "Cleith mion-fhiosrachadh",
+  "submission.workflow.tasks.pool.hide-detail": "Cleith mion-fhiosrachadh",
 
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Seall mion-fhiosrachadh",
@@ -5918,7 +6341,7 @@
   "thumbnail.default.alt": "Mion-dhealbh",
 
   // "thumbnail.default.placeholder": "No Thumbnail Available",
-    "thumbnail.default.placeholder": "Chan eil Mion-dhealbh ri Fhaighinn",
+  "thumbnail.default.placeholder": "Chan eil Mion-dhealbh ri Fhaighinn",
 
   // "thumbnail.project.alt": "Project Logo",
   "thumbnail.project.alt": "Suaicheantas Pròiseact",
@@ -5927,7 +6350,7 @@
   "thumbnail.project.placeholder": "Ìomhaigh Gleidheadair-àite Pròiseact",
 
   // "thumbnail.orgunit.alt": "OrgUnit Logo",
-    "thumbnail.orgunit.alt": "Suaicheantas OrgUnit",
+  "thumbnail.orgunit.alt": "Suaicheantas OrgUnit",
 
   // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
   "thumbnail.orgunit.placeholder": "Ìomhaigh Gleidheadair-àite OrgUnit",
@@ -5936,7 +6359,7 @@
   "thumbnail.person.alt": "Dealbh Iomraidh",
 
   // "thumbnail.person.placeholder": "No Profile Picture Available",
-    "thumbnail.person.placeholder": "Chan eil Dealbh Iomraidh ri Fhaighinn",
+  "thumbnail.person.placeholder": "Chan eil Dealbh Iomraidh ri Fhaighinn",
 
 
 
@@ -5946,7 +6369,7 @@
 
 
   // "vocabulary-treeview.header": "Hierarchical tree view",
-   "vocabulary-treeview.header": "Sealladh craobh rangach",
+  "vocabulary-treeview.header": "Sealladh craobh rangach",
 
   // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "Luchdaich tuilleadh",
@@ -5955,13 +6378,13 @@
   "vocabulary-treeview.search.form.reset": "Ath-sheat",
 
   // "vocabulary-treeview.search.form.search": "Search",
-   "vocabulary-treeview.search.form.search": "Rannsaich",
+  "vocabulary-treeview.search.form.search": "Rannsaich",
 
   // "vocabulary-treeview.search.no-result": "There were no items to show",
-    "vocabulary-treeview.search.no-result": "Cha robh nithean ri shealltainn",
+  "vocabulary-treeview.search.no-result": "Cha robh nithean ri shealltainn",
 
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-    "vocabulary-treeview.tree.description.nsi": "Clar-amais Saidheans Nirribhidh",
+  "vocabulary-treeview.tree.description.nsi": "Clar-amais Saidheans Nirribhidh",
 
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Rannsaich Seòrsaichean Cuspair",
@@ -5969,23 +6392,23 @@
 
 
   // "uploader.browse": "browse",
-    "uploader.browse": "brobhs",
+  "uploader.browse": "brobhs",
 
   // "uploader.drag-message": "Drag & Drop your files here",
-   "uploader.drag-message": "Slaod & Leig às na faidhlichean an seo",
+  "uploader.drag-message": "Slaod & Leig às na faidhlichean an seo",
 
   // "uploader.delete.btn-title": "Delete",
   "uploader.delete.btn-title": "Dubh às",
 
   // "uploader.or": ", or ",
-    "uploader.or": ", no ",
+  "uploader.or": ", no ",
 
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
-   "uploader.processing": "A' pròiseasadh",
+  "uploader.processing": "A' pròiseasadh",
 
   // "uploader.queue-length": "Queue length",
-    "uploader.queue-length": "Faid Ciutha",
+  "uploader.queue-length": "Faid Ciutha",
 
   // "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": "Tagh na seòrsaichean dha bheil thu airson metadata bhiortail a shàbhaladh mar metadata fìor",
@@ -6008,44 +6431,44 @@
   "workflow-item.edit.breadcrumbs": "Deasaich nì-sruth-obrach",
 
   // "workflow-item.edit.title": "Edit workflowitem",
-    "workflow-item.edit.title": "Deasaich nì-sruth-obrach",
+  "workflow-item.edit.title": "Deasaich nì-sruth-obrach",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
-   "workflow-item.delete.notification.success.title": "Air a dhubhadh às",
+  "workflow-item.delete.notification.success.title": "Air a dhubhadh às",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
   "workflow-item.delete.notification.success.content": "Chaidh an nì sruth-obrach seo a dhubhadh às",
 
   // "workflow-item.delete.notification.error.title": "Something went wrong",
-   "workflow-item.delete.notification.error.title": "Chaidh rudeigin ceàrr",
+  "workflow-item.delete.notification.error.title": "Chaidh rudeigin ceàrr",
 
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
   "workflow-item.delete.notification.error.content": "Cha ghabhadh an nì sruth-obrach a dhubhadh às",
 
   // "workflow-item.delete.title": "Delete workflow item",
-   "workflow-item.delete.title": "Dubh às nì sruth-obrach",
+  "workflow-item.delete.title": "Dubh às nì sruth-obrach",
 
   // "workflow-item.delete.header": "Delete workflow item",
-   "workflow-item.delete.header": "Dubh às nì sruth-obrach   ",
+  "workflow-item.delete.header": "Dubh às nì sruth-obrach   ",
 
   // "workflow-item.delete.button.cancel": "Cancel",
-    "workflow-item.delete.button.cancel": "Cansail",
+  "workflow-item.delete.button.cancel": "Cansail",
 
   // "workflow-item.delete.button.confirm": "Delete",
-   "workflow-item.delete.button.confirm": "Dubh às",
+  "workflow-item.delete.button.confirm": "Dubh às",
 
 
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
-   "workflow-item.send-back.notification.success.title": "Air a thilleadh gu neach-cur-a-steach",
+  "workflow-item.send-back.notification.success.title": "Air a thilleadh gu neach-cur-a-steach",
 
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
   "workflow-item.send-back.notification.success.content": "Chaidh an nì sruth-obrach seo a thilleadh chun an neach-cur-a-steach",
 
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-    "workflow-item.send-back.notification.error.title": "Chaidh rudeigin ceàrr",
+  "workflow-item.send-back.notification.error.title": "Chaidh rudeigin ceàrr",
 
   // "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": "Cha ghabhadh an nì sruth-obrach a thilleadh chun an neach-cur-a-steach",
+  "workflow-item.send-back.notification.error.content": "Cha ghabhadh an nì sruth-obrach a thilleadh chun an neach-cur-a-steach",
 
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
   "workflow-item.send-back.title": "Till nì sruth-obrach chun an neach-cur-a-steach",
@@ -6054,24 +6477,24 @@
   "workflow-item.send-back.header": "Till nì sruth-obrach chun an neach-cur-a-steach",
 
   // "workflow-item.send-back.button.cancel": "Cancel",
-   "workflow-item.send-back.button.cancel": "Cansail",
+  "workflow-item.send-back.button.cancel": "Cansail",
 
   // "workflow-item.send-back.button.confirm": "Send back",
-   "workflow-item.send-back.button.confirm": "Till",
+  "workflow-item.send-back.button.confirm": "Till",
 
   // "workflow-item.view.breadcrumbs": "Workflow View",
-   "workflow-item.view.breadcrumbs": "Sealladh Sruth-obrach",
+  "workflow-item.view.breadcrumbs": "Sealladh Sruth-obrach",
 
 
   // "idle-modal.header": "Session will expire soon",
-   "idle-modal.header": "Thig an seisean gu crìoch a dh'aithghearr",
+  "idle-modal.header": "Thig an seisean gu crìoch a dh'aithghearr",
 
   // "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": "Air adhbharan tèarainteachd, bidh seiseanan neach-cleachdaidh a' tighinn gu crìoch an dèidh {{ timeToExpire }} mionaidean nan tàmh. Thig an seisean gu crìoch a dh'aithghearr. A bheil thu airson a leudachadh no airson logadh a-mach?",
 
   // "idle-modal.log-out": "Log out",
-   "idle-modal.log-out": "Log a-mach",
+  "idle-modal.log-out": "Log a-mach",
 
   // "idle-modal.extend-session": "Extend session"
-    "idle-modal.extend-session": "Leudaich seisean"
+  "idle-modal.extend-session": "Leudaich seisean",
 }
diff --git a/src/assets/i18n/hi.json5 b/src/assets/i18n/hi.json5
index 13d0b10cb2..b4e23856bf 100644
--- a/src/assets/i18n/hi.json5
+++ b/src/assets/i18n/hi.json5
@@ -1,4536 +1,4969 @@
 {
-  "401.help": "आप इस पृष्ठ का प्रयोग करने की अनुमति नहीं हैं। होम पेज पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।", 
- 
+  "401.help": "आप इस पृष्ठ का प्रयोग करने की अनुमति नहीं हैं। होम पेज पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।",
 
-  "401.link.home-page": "मुझे होम पेज पर ले चलो", 
- 
 
-  "401.unauthorized": "अनधिकृत", 
- 
+  "401.link.home-page": "मुझे होम पेज पर ले चलो",
 
-  "403.forbidden": "वर्जित", 
- 
 
-  "403.help": "आपको इस पृष्ठ का अभिगमन करने की अनुमति नहीं है। होम पेज पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।", 
- 
+  "401.unauthorized": "अनधिकृत",
 
-  "403.link.home-page": "मुझे होम पेज पर ले चलो", 
- 
 
-  "404.help": "आप जिस पेज की तलाश कर रहे हैं, वह हमें नहीं मिल रहा है। हो सकता है कि पृष्ठ को स्थानांतरित या हटा दिया गया हो। होम पेज पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।", 
+  "403.forbidden": "वर्जित",
 
-  "404.link.home-page": "मुझे होम पेज पर ले जाएं", 
 
-  "404.page-not-found": "पृष्ठ नहीं मिला", 
+  "403.help": "आपको इस पृष्ठ का अभिगमन करने की अनुमति नहीं है। होम पेज पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।",
 
-  "500.help": "रखरखाव डाउनटाइम या क्षमता समस्याओं के कारण सर्वर अस्थायी रूप से आपके अनुरोध को पूर्ण करने में असमर्थ है। कृपया बाद में पुन: प्रयास करें।  ", 
 
-  "500.link.home-page": "मुझे होम पेज पर ले चलो", 
+  "403.link.home-page": "मुझे होम पेज पर ले चलो",
 
-  "500.page-internal-server-error": "सेवा उप्लब्ध् नहीं है", 
 
-  "access-status.embargo.listelement.badge": "प्रतिबंध", 
+  "404.help": "आप जिस पेज की तलाश कर रहे हैं, वह हमें नहीं मिल रहा है। हो सकता है कि पृष्ठ को स्थानांतरित या हटा दिया गया हो। होम पेज पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।",
 
-  "access-status.metadata.only.listelement.badge": "केवल मेटाडेटा", 
+  "404.link.home-page": "मुझे होम पेज पर ले जाएं",
 
-  "access-status.open.access.listelement.badge": "खुली पहुंच", 
+  "404.page-not-found": "पृष्ठ नहीं मिला",
 
-  "access-status.restricted.listelement.badge": "प्रतिबंधित", 
+  "500.help": "रखरखाव डाउनटाइम या क्षमता समस्याओं के कारण सर्वर अस्थायी रूप से आपके अनुरोध को पूर्ण करने में असमर्थ है। कृपया बाद में पुन: प्रयास करें।  ",
 
-  "access-status.unknown.listelement.badge": "अपरिचित", 
+  "500.link.home-page": "मुझे होम पेज पर ले चलो",
 
-  "admin.access-control.epeople.actions.delete": "ई-व्यक्ति हटाएं", 
+  "500.page-internal-server-error": "सेवा उप्लब्ध् नहीं है",
 
-  "admin.access-control.epeople.actions.impersonate": "प्रतिरूपण ई-व्यक्ति", 
+  "access-status.embargo.listelement.badge": "प्रतिबंध",
 
-  "admin.access-control.epeople.actions.reset": "पासवर्ड रीसेट करें", 
+  "access-status.metadata.only.listelement.badge": "केवल मेटाडेटा",
 
-  "admin.access-control.epeople.actions.stop-impersonating": "ई-व्यक्ति का रूप धारण करना बंद करें", 
+  "access-status.open.access.listelement.badge": "खुली पहुंच",
 
-  "admin.access-control.epeople.breadcrumbs": "ई लोग", 
+  "access-status.restricted.listelement.badge": "प्रतिबंधित",
 
-  "admin.access-control.epeople.button.add": "ई-व्यक्ति जोड़ें", 
+  "access-status.unknown.listelement.badge": "अपरिचित",
 
-  "admin.access-control.epeople.button.see-all": "सब कुछ ब्राउज़ करें", 
+  "admin.access-control.epeople.actions.delete": "ई-व्यक्ति हटाएं",
 
-  "admin.access-control.epeople.form.canLogIn": "लॉग इन कर सकते हैं", 
+  "admin.access-control.epeople.actions.impersonate": "प्रतिरूपण ई-व्यक्ति",
 
-  "admin.access-control.epeople.form.create": "ई-व्यक्ति बनाएं", 
+  "admin.access-control.epeople.actions.reset": "पासवर्ड रीसेट करें",
 
-  "admin.access-control.epeople.form.edit": "ई-व्यक्ति संपादित करें", 
+  "admin.access-control.epeople.actions.stop-impersonating": "ई-व्यक्ति का रूप धारण करना बंद करें",
 
-  "admin.access-control.epeople.form.email": "ईमेल", 
+  "admin.access-control.epeople.breadcrumbs": "ई लोग",
 
-  "admin.access-control.epeople.form.emailHint": "वैध ई-मेल पता होना चाहिए", 
+  "admin.access-control.epeople.button.add": "ई-व्यक्ति जोड़ें",
 
-  "admin.access-control.epeople.form.firstName": "प्रथम नाम", 
+  "admin.access-control.epeople.button.see-all": "सब कुछ ब्राउज़ करें",
 
-  "admin.access-control.epeople.form.goToGroups": "समूहों में जोड़ें", 
+  "admin.access-control.epeople.form.canLogIn": "लॉग इन कर सकते हैं",
 
-  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "इन समूहों के सदस्य:", 
+  "admin.access-control.epeople.form.create": "ई-व्यक्ति बनाएं",
 
-  "admin.access-control.epeople.form.lastName": "उपनाम", 
+  "admin.access-control.epeople.form.edit": "ई-व्यक्ति संपादित करें",
 
-  "admin.access-control.epeople.form.memberOfNoGroups": "यह ई-व्यक्ति किसी भी समूह का सदस्य नहीं है", 
+  "admin.access-control.epeople.form.email": "ईमेल",
 
-  "admin.access-control.epeople.form.notification.created.failure": "\"{{name}}\" ई-व्यक्ति बनाने में विफल", 
+  "admin.access-control.epeople.form.emailHint": "वैध ई-मेल पता होना चाहिए",
 
-  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "\"{{email}}\" ईमेल पहले से प्रयोग में होने के कारण \"{{name}}\" ई-व्यक्ति बनाना विफल हुआ। ", 
+  "admin.access-control.epeople.form.firstName": "प्रथम नाम",
 
-  "admin.access-control.epeople.form.notification.created.success": "\"{{name}}\" ई-व्यक्ति सफलतापूर्वक बनाया गया  ", 
+  "admin.access-control.epeople.form.goToGroups": "समूहों में जोड़ें",
 
-  "admin.access-control.epeople.form.notification.deleted.failure": "ई-व्यक्ति \"{{name}}\" को हटाने में विफल", 
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "इन समूहों के सदस्य:",
 
-  "admin.access-control.epeople.form.notification.deleted.success": "ई-व्यक्ति \"{{name}}\" को सफलतापूर्वक हटा दिया गया", 
+  "admin.access-control.epeople.form.lastName": "उपनाम",
 
-  "admin.access-control.epeople.form.notification.edited.failure": "\"{{name}}\" ई-व्यक्ति संपादित करने में विफल", 
+  "admin.access-control.epeople.form.memberOfNoGroups": "यह ई-व्यक्ति किसी भी समूह का सदस्य नहीं है",
 
-  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "ई-व्यक्ति \"{{name}}\", ईमेल \"{{email}}\" पहले से प्रयोग में संपादित करने में विफल।", 
+  "admin.access-control.epeople.form.notification.created.failure": "\"{{name}}\" ई-व्यक्ति बनाने में विफल",
 
-  "admin.access-control.epeople.form.notification.edited.success": "ई-व्यक्ति \"{{name}}\" को सफलतापूर्वक संपादित किया गया", 
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "\"{{email}}\" ईमेल पहले से प्रयोग में होने के कारण \"{{name}}\" ई-व्यक्ति बनाना विफल हुआ। ",
 
-  "admin.access-control.epeople.form.requireCertificate": "प्रमाण पत्र की आवश्यकता है", 
+  "admin.access-control.epeople.form.notification.created.success": "\"{{name}}\" ई-व्यक्ति सफलतापूर्वक बनाया गया  ",
 
-  "admin.access-control.epeople.form.return": "वापस", 
+  "admin.access-control.epeople.form.notification.deleted.failure": "ई-व्यक्ति \"{{name}}\" को हटाने में विफल",
 
-  "admin.access-control.epeople.form.table.collectionOrCommunity": "संग्रह/समुदाय", 
+  "admin.access-control.epeople.form.notification.deleted.success": "ई-व्यक्ति \"{{name}}\" को सफलतापूर्वक हटा दिया गया",
 
-  "admin.access-control.epeople.form.table.id": "पहचान", 
+  "admin.access-control.epeople.form.notification.edited.failure": "\"{{name}}\" ई-व्यक्ति संपादित करने में विफल",
 
-  "admin.access-control.epeople.form.table.name": "नाम", 
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "ई-व्यक्ति \"{{name}}\", ईमेल \"{{email}}\" पहले से प्रयोग में संपादित करने में विफल।",
 
-  "admin.access-control.epeople.head": "ई लोग", 
+  "admin.access-control.epeople.form.notification.edited.success": "ई-व्यक्ति \"{{name}}\" को सफलतापूर्वक संपादित किया गया",
 
-  "admin.access-control.epeople.no-items": "कोई ई-लोग दिखाने के लिए नहीं।", 
+  "admin.access-control.epeople.form.requireCertificate": "प्रमाण पत्र की आवश्यकता है",
 
-  "admin.access-control.epeople.notification.deleted.failure": "ई-व्यक्ति को हटाने में विफल: \"{{name}}\"", 
+  "admin.access-control.epeople.form.return": "वापस",
 
-  "admin.access-control.epeople.notification.deleted.success": "ई-व्यक्ति को सफलतापूर्वक हटाया गया: \"{{name}}\"", 
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "संग्रह/समुदाय",
 
-  "admin.access-control.epeople.search.button": "खोजें", 
+  "admin.access-control.epeople.form.table.id": "पहचान",
 
-  "admin.access-control.epeople.search.head": "खोजें", 
+  "admin.access-control.epeople.form.table.name": "नाम",
 
-  "admin.access-control.epeople.search.placeholder": "लोगों को खोजें...", 
+  "admin.access-control.epeople.head": "ई लोग",
 
-  "admin.access-control.epeople.search.scope.email": "ईमेल (सटीक)", 
+  "admin.access-control.epeople.no-items": "कोई ई-लोग दिखाने के लिए नहीं।",
 
-  "admin.access-control.epeople.search.scope.metadata": "मेटाडेटा", 
+  "admin.access-control.epeople.notification.deleted.failure": "ई-व्यक्ति को हटाने में विफल: \"{{name}}\"",
 
-  "admin.access-control.epeople.table.edit": "संपादित करें", 
+  "admin.access-control.epeople.notification.deleted.success": "ई-व्यक्ति को सफलतापूर्वक हटाया गया: \"{{name}}\"",
 
-  "admin.access-control.epeople.table.edit.buttons.edit": "\"{{name}}\" संपादित करें", 
+  "admin.access-control.epeople.search.button": "खोजें",
 
-  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "आप इस समूह को संपादित करने के लिए अधिकृत नहीं हैं", 
+  "admin.access-control.epeople.search.head": "खोजें",
 
-  "admin.access-control.epeople.table.edit.buttons.remove": "\"{{name}}\" मिटाएं", 
+  "admin.access-control.epeople.search.placeholder": "लोगों को खोजें...",
 
-  "admin.access-control.epeople.table.email": "ईमेल (सटीक)", 
+  "admin.access-control.epeople.search.scope.email": "ईमेल (सटीक)",
 
-  "admin.access-control.epeople.table.id": "पहचान", 
+  "admin.access-control.epeople.search.scope.metadata": "मेटाडेटा",
 
-  "admin.access-control.epeople.table.name": "नाम", 
+  "admin.access-control.epeople.table.edit": "संपादित करें",
 
-  "admin.access-control.epeople.title": "ई लोग", 
+  "admin.access-control.epeople.table.edit.buttons.edit": "\"{{name}}\" संपादित करें",
 
-  "admin.access-control.groups.addGroup.breadcrumbs": "नया समूह", 
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "आप इस समूह को संपादित करने के लिए अधिकृत नहीं हैं",
 
-  "admin.access-control.groups.breadcrumbs": "समूह", 
+  "admin.access-control.epeople.table.edit.buttons.remove": "\"{{name}}\" मिटाएं",
 
-  "admin.access-control.groups.button.add": "समूह जोड़ें", 
+  "admin.access-control.epeople.table.email": "ईमेल (सटीक)",
 
-  "admin.access-control.groups.button.see-all": "सब कुछ ब्राउज़ करें", 
+  "admin.access-control.epeople.table.id": "पहचान",
 
-  "admin.access-control.groups.form.actions.delete": "समूह हटाएं", 
+  "admin.access-control.epeople.table.name": "नाम",
 
-  "admin.access-control.groups.form.alert.permanent": "यह समूह स्थायी है, इसलिए इसे संपादित या हटाया नहीं जा सकता है। आप अभी भी इस  पृष्ठ का उपयोग करके समूह के सदस्यों को जोड़ और हटा सकते हैं।", 
+  "admin.access-control.epeople.title": "ई लोग",
 
-  "admin.access-control.groups.form.alert.workflowGroup": "इस समूह को संशोधित या हटाया नहीं जा सकता क्योंकि \"{{name}}\" {{comcol}}  प्रस्तुतीकरण और कार्यप्रवाह प्रक्रिया में एक भूमिका से संबंधित है। आप इसे हटाने के लिए {{comcol}} संपादन पृष्ठ पर <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> टैब का प्रयोग कर सकते है। आप अभी भी इस पेज का उपयोग करके समूह के सदस्यों को जोड़ और हटा सकते हैं।", 
+  "admin.access-control.groups.addGroup.breadcrumbs": "नया समूह",
 
-  "admin.access-control.groups.form.delete-group.modal.cancel": "रद्द करें", 
+  "admin.access-control.groups.breadcrumbs": "समूह",
 
-  "admin.access-control.groups.form.delete-group.modal.confirm": "हटाएं", 
+  "admin.access-control.groups.button.add": "समूह जोड़ें",
 
-  "admin.access-control.groups.form.delete-group.modal.header": "\"{{dsoName}}\" समूह हटाएं", 
+  "admin.access-control.groups.button.see-all": "सब कुछ ब्राउज़ करें",
 
-  "admin.access-control.groups.form.delete-group.modal.info": "क्या आप वाकई \"{{dsoName}}\" समूह को हटाना चाहते हैं", 
+  "admin.access-control.groups.form.actions.delete": "समूह हटाएं",
 
-  "admin.access-control.groups.form.groupCommunity": "समुदाय या संग्रह", 
+  "admin.access-control.groups.form.alert.permanent": "यह समूह स्थायी है, इसलिए इसे संपादित या हटाया नहीं जा सकता है। आप अभी भी इस  पृष्ठ का उपयोग करके समूह के सदस्यों को जोड़ और हटा सकते हैं।",
 
-  "admin.access-control.groups.form.groupDescription": "विवरण", 
+  "admin.access-control.groups.form.alert.workflowGroup": "इस समूह को संशोधित या हटाया नहीं जा सकता क्योंकि \"{{name}}\" {{comcol}}  प्रस्तुतीकरण और कार्यप्रवाह प्रक्रिया में एक भूमिका से संबंधित है। आप इसे हटाने के लिए {{comcol}} संपादन पृष्ठ पर <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> टैब का प्रयोग कर सकते है। आप अभी भी इस पेज का उपयोग करके समूह के सदस्यों को जोड़ और हटा सकते हैं।",
 
-  "admin.access-control.groups.form.groupName": "समूह का नाम", 
+  "admin.access-control.groups.form.delete-group.modal.cancel": "रद्द करें",
 
-  "admin.access-control.groups.form.head.create": "समूह बनाएँ", 
+  "admin.access-control.groups.form.delete-group.modal.confirm": "हटाएं",
 
-  "admin.access-control.groups.form.head.edit": "समूह संपादित करें", 
+  "admin.access-control.groups.form.delete-group.modal.header": "\"{{dsoName}}\" समूह हटाएं",
 
-  "admin.access-control.groups.form.members-list.button.see-all": "सब कुछ ब्राउज़ करें", 
+  "admin.access-control.groups.form.delete-group.modal.info": "क्या आप वाकई \"{{dsoName}}\" समूह को हटाना चाहते हैं",
 
-  "admin.access-control.groups.form.members-list.head": "ई लोग", 
+  "admin.access-control.groups.form.groupCommunity": "समुदाय या संग्रह",
 
-  "admin.access-control.groups.form.members-list.headMembers": "वर्तमान सदस्य", 
+  "admin.access-control.groups.form.groupDescription": "विवरण",
 
-  "admin.access-control.groups.form.members-list.no-items": "उस खोज में कोई ई-लोग नहीं मिले", 
+  "admin.access-control.groups.form.groupName": "समूह का नाम",
 
-  "admin.access-control.groups.form.members-list.no-members-yet": "समूह में अभी तक कोई सदस्य नहीं है, सदस्य खोजें और जोड़ें।", 
+  "admin.access-control.groups.form.head.create": "समूह बनाएँ",
 
-  "admin.access-control.groups.form.members-list.notification.failure.addMember": "सदस्य जोड़ने में विफल: \"{{name}}\"", 
+  "admin.access-control.groups.form.head.edit": "समूह संपादित करें",
 
-  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "सदस्य को हटाने में विफल: \"{{name}}\"", 
+  "admin.access-control.groups.form.members-list.button.see-all": "सब कुछ ब्राउज़ करें",
 
-  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "पहले एक नाम प्रस्तुत करें, कोई वर्तमान सक्रिय समूह नहीं है।", 
+  "admin.access-control.groups.form.members-list.head": "ई लोग",
 
-  "admin.access-control.groups.form.members-list.notification.success.addMember": "\"{{name}}\" सदस्य सफलतापूर्वक जोड़ा गया", 
+  "admin.access-control.groups.form.members-list.headMembers": "वर्तमान सदस्य",
 
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "\"{{name}}\" सदस्य को सफलतापूर्वक हटाया गया", 
+  "admin.access-control.groups.form.members-list.no-items": "उस खोज में कोई ई-लोग नहीं मिले",
 
-  "admin.access-control.groups.form.members-list.search.button": "खोजें", 
+  "admin.access-control.groups.form.members-list.no-members-yet": "समूह में अभी तक कोई सदस्य नहीं है, सदस्य खोजें और जोड़ें।",
 
-  "admin.access-control.groups.form.members-list.search.head": "ई-लोगों को जोड़ें", 
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "सदस्य जोड़ने में विफल: \"{{name}}\"",
 
-  "admin.access-control.groups.form.members-list.search.scope.email": "ईमेल (सटीक)", 
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "सदस्य को हटाने में विफल: \"{{name}}\"",
 
-  "admin.access-control.groups.form.members-list.search.scope.metadata": "मेटाडेटा", 
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "पहले एक नाम प्रस्तुत करें, कोई वर्तमान सक्रिय समूह नहीं है।",
 
-  "admin.access-control.groups.form.members-list.table.edit": "हटाएं / जोड़ें", 
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "\"{{name}}\" सदस्य सफलतापूर्वक जोड़ा गया",
 
-  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "\"{{name}}\" नाम वाले सदस्य को जोड़ें", 
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "\"{{name}}\" सदस्य को सफलतापूर्वक हटाया गया",
 
-  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "\"{{name}}\" नाम वाले सदस्य को हटाएं", 
+  "admin.access-control.groups.form.members-list.search.button": "खोजें",
 
-  "admin.access-control.groups.form.members-list.table.email": "ईमेल", 
+  "admin.access-control.groups.form.members-list.search.head": "ई-लोगों को जोड़ें",
 
-  "admin.access-control.groups.form.members-list.table.id": "पहचान", 
+  "admin.access-control.groups.form.members-list.search.scope.email": "ईमेल (सटीक)",
 
-  "admin.access-control.groups.form.members-list.table.identity": "पहचान", 
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "मेटाडेटा",
 
-  "admin.access-control.groups.form.members-list.table.name": "नाम", 
+  "admin.access-control.groups.form.members-list.table.edit": "हटाएं / जोड़ें",
 
-  "admin.access-control.groups.form.members-list.table.netid": "NetID", 
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "\"{{name}}\" नाम वाले सदस्य को जोड़ें",
 
-  "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" समूह बनाने में विफल", 
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "\"{{name}}\" नाम वाले सदस्य को हटाएं",
 
-  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "\"{{name}}\" नाम के साथ समूह बनाने में विफल, सुनिश्चित करें कि नाम पहले से उपयोग में नहीं है।", 
+  "admin.access-control.groups.form.members-list.table.email": "ईमेल",
 
-  "admin.access-control.groups.form.notification.created.success": "\"{{name}}\" समूह सफलतापूर्वक बनाया गया", 
+  "admin.access-control.groups.form.members-list.table.id": "पहचान",
 
-  "admin.access-control.groups.form.notification.deleted.failure.content": "कारण: \"{{ cause }}\"", 
+  "admin.access-control.groups.form.members-list.table.identity": "पहचान",
 
-  "admin.access-control.groups.form.notification.deleted.failure.title": "\"{{ name }}\" समूह को हटाने में विफल", 
+  "admin.access-control.groups.form.members-list.table.name": "नाम",
 
-  "admin.access-control.groups.form.notification.deleted.success": "\"{{ name }}\" समूह को सफलतापूर्वक हटाया गया", 
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
 
-  "admin.access-control.groups.form.notification.edited.failure": "\"{{name}}\" समूह को संपादित करने में विफल", 
+  "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" समूह बनाने में विफल",
 
-  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "\"{{name}}\" नाम पहले से प्रयोग में है!", 
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "\"{{name}}\" नाम के साथ समूह बनाने में विफल, सुनिश्चित करें कि नाम पहले से उपयोग में नहीं है।",
 
-  "admin.access-control.groups.form.notification.edited.success": "\"{{name}}\" समूह को सफलतापूर्वक संपादित किया गया", 
+  "admin.access-control.groups.form.notification.created.success": "\"{{name}}\" समूह सफलतापूर्वक बनाया गया",
 
-  "admin.access-control.groups.form.return": "वापस", 
+  "admin.access-control.groups.form.notification.deleted.failure.content": "कारण: \"{{ cause }}\"",
 
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "सभी ब्राउज़ करें", 
+  "admin.access-control.groups.form.notification.deleted.failure.title": "\"{{ name }}\" समूह को हटाने में विफल",
 
-  "admin.access-control.groups.form.subgroups-list.head": "समूह", 
+  "admin.access-control.groups.form.notification.deleted.success": "\"{{ name }}\" समूह को सफलतापूर्वक हटाया गया",
 
-  "admin.access-control.groups.form.subgroups-list.headSubgroups": "वर्तमान उपसमूह", 
+  "admin.access-control.groups.form.notification.edited.failure": "\"{{name}}\" समूह को संपादित करने में विफल",
 
-  "admin.access-control.groups.form.subgroups-list.no-items": "इसके नाम से कोई समूह नहीं मिला या यह UUID के रूप में नहीं है", 
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "\"{{name}}\" नाम पहले से प्रयोग में है!",
 
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "समूह में अभी तक कोई उपसमूह नहीं है।", 
+  "admin.access-control.groups.form.notification.edited.success": "\"{{name}}\" समूह को सफलतापूर्वक संपादित किया गया",
 
-  "admin.access-control.groups.form.subgroups-list.notification.failure": "कुछ गलत हुआ: \"{{cause}}\"", 
+  "admin.access-control.groups.form.return": "वापस",
 
-  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "उपसमूह जोड़ने में विफल: \"{{name}}\"", 
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "सभी ब्राउज़ करें",
 
-  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "\"{{name}}\" उपसमूह को हटाने में विफल", 
+  "admin.access-control.groups.form.subgroups-list.head": "समूह",
 
-  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "कोई वर्तमान सक्रिय समूह नहीं है, पहले एक नाम प्रस्तुत करें।", 
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "वर्तमान उपसमूह",
 
-  "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.notification.success.addSubgroup": "उपसमूह सफलतापूर्वक जोड़ा गया: \"{{name}}\"", 
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "समूह में अभी तक कोई उपसमूह नहीं है।",
 
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "\"{{name}}\" उपसमूह को सफलतापूर्वक हटाया गया", 
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "कुछ गलत हुआ: \"{{cause}}\"",
 
-  "admin.access-control.groups.form.subgroups-list.search.button": "खोजें", 
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "उपसमूह जोड़ने में विफल: \"{{name}}\"",
 
-  "admin.access-control.groups.form.subgroups-list.search.head": "उपसमूह जोड़ें", 
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "\"{{name}}\" उपसमूह को हटाने में विफल",
 
-  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "संग्रह/समुदाय", 
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "कोई वर्तमान सक्रिय समूह नहीं है, पहले एक नाम प्रस्तुत करें।",
 
-  "admin.access-control.groups.form.subgroups-list.table.edit": "हटाएं / जोड़ें", 
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "यह वर्तमान समूह है, जोड़ा नहीं जा सकता।",
 
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "\"{{name}}\" नाम से उपसमूह जोड़ें", 
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "उपसमूह सफलतापूर्वक जोड़ा गया: \"{{name}}\"",
 
-  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "\"{{name}}\" नाम से उपसमूह हटाएं", 
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "\"{{name}}\" उपसमूह को सफलतापूर्वक हटाया गया",
 
-  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "वर्तमान समूह", 
+  "admin.access-control.groups.form.subgroups-list.search.button": "खोजें",
 
-  "admin.access-control.groups.form.subgroups-list.table.id": "पहचान", 
+  "admin.access-control.groups.form.subgroups-list.search.head": "उपसमूह जोड़ें",
 
-  "admin.access-control.groups.form.subgroups-list.table.name": "नाम", 
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "संग्रह/समुदाय",
 
-  "admin.access-control.groups.head": "समूह", 
+  "admin.access-control.groups.form.subgroups-list.table.edit": "हटाएं / जोड़ें",
 
-  "admin.access-control.groups.no-items": "इसके नाम से कोई समूह नहीं मिला या यह UUID के रूप में नहीं है", 
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "\"{{name}}\" नाम से उपसमूह जोड़ें",
 
-  "admin.access-control.groups.notification.deleted.failure.content": "कारण: \"{{cause}}\"", 
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "\"{{name}}\" नाम से उपसमूह हटाएं",
 
-  "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" समूह को हटाने में विफल", 
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "वर्तमान समूह",
 
-  "admin.access-control.groups.notification.deleted.success": "समूह \"{{name}}\" को सफलतापूर्वक हटाया गया", 
+  "admin.access-control.groups.form.subgroups-list.table.id": "पहचान",
 
-  "admin.access-control.groups.search.button": "खोजें", 
+  "admin.access-control.groups.form.subgroups-list.table.name": "नाम",
 
-  "admin.access-control.groups.search.head": "समूह खोजें", 
+  "admin.access-control.groups.head": "समूह",
 
-  "admin.access-control.groups.search.placeholder": "समूह खोजें...", 
+  "admin.access-control.groups.no-items": "इसके नाम से कोई समूह नहीं मिला या यह UUID के रूप में नहीं है",
 
-  "admin.access-control.groups.singleGroup.breadcrumbs": "समूह संपादित करें", 
+  "admin.access-control.groups.notification.deleted.failure.content": "कारण: \"{{cause}}\"",
 
-  "admin.access-control.groups.table.collectionOrCommunity": "संग्रह/समुदाय", 
+  "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" समूह को हटाने में विफल",
 
-  "admin.access-control.groups.table.edit": "संपादित करें", 
+  "admin.access-control.groups.notification.deleted.success": "समूह \"{{name}}\" को सफलतापूर्वक हटाया गया",
 
-  "admin.access-control.groups.table.edit.buttons.edit": "\"{{name}}\" संपादित करें", 
+  "admin.access-control.groups.search.button": "खोजें",
 
-  "admin.access-control.groups.table.edit.buttons.remove": "\"{{name}}\" हटाएं", 
+  "admin.access-control.groups.search.head": "समूह खोजें",
 
-  "admin.access-control.groups.table.id": "पहचान", 
+  "admin.access-control.groups.search.placeholder": "समूह खोजें...",
 
-  "admin.access-control.groups.table.members": "सदस्य", 
+  "admin.access-control.groups.singleGroup.breadcrumbs": "समूह संपादित करें",
 
-  "admin.access-control.groups.table.name": "नाम", 
+  "admin.access-control.groups.table.collectionOrCommunity": "संग्रह/समुदाय",
 
-  "admin.access-control.groups.title": "समूह", 
+  "admin.access-control.groups.table.edit": "संपादित करें",
 
-  "admin.access-control.groups.title.addGroup": "नया समूह", 
+  "admin.access-control.groups.table.edit.buttons.edit": "\"{{name}}\" संपादित करें",
 
-  "admin.access-control.groups.title.singleGroup": "समूह संपादित करें", 
+  "admin.access-control.groups.table.edit.buttons.remove": "\"{{name}}\" हटाएं",
 
-  "admin.curation-tasks.breadcrumbs": "प्रणाली क्यूरेशन कार्य", 
 
-  "admin.curation-tasks.header": "प्रणाली क्यूरेशन कार्य", 
+  //"admin.reports.collections.title": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.title": "Collection Filter Report",
 
-  "admin.curation-tasks.title": "प्रणाली क्यूरेशन कार्य", 
+  //"admin.reports.collections.breadcrumbs": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.breadcrumbs": "Collection Filter Report",
 
-  "admin.metadata-import.breadcrumbs": "मेटाडेटा आयात करें", 
+  //"admin.reports.collections.head": "Collection Filter Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.head": "Collection Filter Report",
 
-  "admin.metadata-import.page.button.proceed": "आगे बढ़ें", 
+  //"admin.reports.button.show-collections": "Show Collections",
+  // TODO New key - Add a translation
+  "admin.reports.button.show-collections": "Show Collections",
 
-  "admin.metadata-import.page.button.return": "वापस", 
+  //"admin.reports.collections.collections-report": "Collection Report",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collections-report": "Collection Report",
 
-  "admin.metadata-import.page.dropMsg": "आयात करने के लिए मेटाडेटा CSV छोड़ें", 
+  //"admin.reports.collections.item-results": "Item Results",
+  // TODO New key - Add a translation
+  "admin.reports.collections.item-results": "Item Results",
 
-  "admin.metadata-import.page.dropMsgReplace": "आयात करने के लिए मेटाडेटा CSV को बदलने के लिए ड्रॉप करें", 
+  //"admin.reports.collections.community": "Community",
+  // TODO New key - Add a translation
+  "admin.reports.collections.community": "Community",
 
-  "admin.metadata-import.page.error.addFile": "पहले फ़ाइल का चयन करें!", 
+  //"admin.reports.collections.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.collections.collection": "Collection",
 
-  "admin.metadata-import.page.header": "मेटाडेटा आयात करें", 
+  //"admin.reports.collections.nb_items": "Nb. Items",
+  // TODO New key - Add a translation
+  "admin.reports.collections.nb_items": "Nb. Items",
 
-  "admin.metadata-import.page.help": "आप उन CSV फ़ाइलों को छोड़ या ब्राउज़ कर सकते हैं जिनमें फ़ाइलों पर बैच मेटाडेटा संचालन शामिल हैं", 
+  //"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.metadata-import.page.validateOnly": "केवल मान्य करें", 
 
-  "admin.metadata-import.page.validateOnly.hint": "चुनी गयी CSV फाइल को उप्लोअडिंग उपरांत पुष्टिकृत किया जाएगा। आपको पाए गए परिवर्तनों की रिपोर्ट प्राप्त होगी, लेकिन कोई भी परिवर्तन सहेजा नहीं जाएगा।", 
+  //"admin.reports.items.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
 
-  "admin.metadata-import.title": "मेटाडेटा आयात करें", 
+  //"admin.reports.items.breadcrumbs": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.breadcrumbs": "Metadata Query Report",
 
-  "admin.registries.bitstream-formats.breadcrumbs": "प्रारूप रजिस्ट्री", 
+  //"admin.reports.items.head": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.head": "Metadata Query Report",
 
-  "admin.registries.bitstream-formats.create.breadcrumbs": "बिटस्ट्रीम प्रारूप", 
+  //"admin.reports.items.run": "Run Item Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.run": "Run Item Query",
 
-  "admin.registries.bitstream-formats.create.failure.content": "नया बिटस्ट्रीम प्रारूप बनाते समय एक त्रुटि हुई।", 
+  //"admin.reports.items.section.collectionSelector": "Collection Selector",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.collectionSelector": "Collection Selector",
 
-  "admin.registries.bitstream-formats.create.failure.head": "असफलता", 
+  //"admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.metadataFieldQueries": "Metadata Field Queries",
 
-  "admin.registries.bitstream-formats.create.head": "बिटस्ट्रीम प्रारूप बनाएं", 
+  //"admin.reports.items.predefinedQueries": "Predefined Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.predefinedQueries": "Predefined Queries",
 
-  "admin.registries.bitstream-formats.create.new": "एक नया बिटस्ट्रीम प्रारूप जोड़ें", 
+  //"admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
+  // TODO New key - Add a translation
+  "admin.reports.items.section.limitPaginateQueries": "Limit/Paginate Queries",
 
-  "admin.registries.bitstream-formats.create.success.content": "नया बिटस्ट्रीम स्वरूप सफलतापूर्वक बनाया गया।", 
+  //"admin.reports.items.limit": "Limit/",
+  // TODO New key - Add a translation
+  "admin.reports.items.limit": "Limit/",
 
-  "admin.registries.bitstream-formats.create.success.head": "सफलता", 
+  //"admin.reports.items.wholeRepo": "Whole Repository",
+  // TODO New key - Add a translation
+  "admin.reports.items.wholeRepo": "Whole Repository",
 
-  "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} प्रारूप (प्रारूपों) को निकालने में विफल", 
+  //"admin.reports.items.anyField": "Any field",
+  // TODO New key - Add a translation
+  "admin.reports.items.anyField": "Any field",
 
-  "admin.registries.bitstream-formats.delete.failure.head": "असफलता", 
+  //"admin.reports.items.predicate.exists": "exists",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.exists": "exists",
 
-  "admin.registries.bitstream-formats.delete.success.amount": "{{ amount}} प्रारूप (प्रारूपों) को सफलतापूर्वक हटा दिया गया हैं|", 
+  //"admin.reports.items.predicate.doesNotExist": "does not exist",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotExist": "does not exist",
 
-  "admin.registries.bitstream-formats.delete.success.head": "सफलता", 
+  //"admin.reports.items.predicate.equals": "equals",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.equals": "equals",
 
-  "admin.registries.bitstream-formats.description": "बिटस्ट्रीम प्रारूपों की यह सूची ज्ञात स्वरूपों और उनके समर्थन स्तर के बारे में जानकारी प्रदान करती है।", 
+  //"admin.reports.items.predicate.doesNotEqual": "does not equal",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotEqual": "does not equal",
 
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "बिटस्ट्रीम प्रारूप", 
+  //"admin.reports.items.predicate.like": "like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.like": "like",
 
-  "admin.registries.bitstream-formats.edit.description.hint": "", 
+  //"admin.reports.items.predicate.notLike": "not like",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.notLike": "not like",
 
-  "admin.registries.bitstream-formats.edit.description.label": "विवरण", 
+  //"admin.reports.items.predicate.contains": "contains",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.contains": "contains",
 
-  "admin.registries.bitstream-formats.edit.extensions.hint": "एक्सटेंशन का उपयोग अपलोड की गई फ़ाइलों के प्रारूप को स्वचालित रूप से पहचानने के लिए किया जाता है। आप प्रत्येक प्रारूप के लिए कई एक्सटेंशन दर्ज कर सकते हैं।", 
+  //"admin.reports.items.predicate.doesNotContain": "does not contain",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotContain": "does not contain",
 
-  "admin.registries.bitstream-formats.edit.extensions.label": "फाइल एक्सटेंशन", 
+  //"admin.reports.items.predicate.matches": "matches",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.matches": "matches",
 
-  "admin.registries.bitstream-formats.edit.extensions.placeholder": "बिंदु के बिना फ़ाइल एक्सटेंशन दर्ज करें", 
+  //"admin.reports.items.predicate.doesNotMatch": "does not match",
+  // TODO New key - Add a translation
+  "admin.reports.items.predicate.doesNotMatch": "does not match",
 
-  "admin.registries.bitstream-formats.edit.failure.content": "बिटस्ट्रीम प्रारूप को संपादित करते समय एक त्रुटि हुई।", 
+  //"admin.reports.items.preset.new": "New Query",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.new": "New Query",
 
-  "admin.registries.bitstream-formats.edit.failure.head": "असफलता", 
+  //"admin.reports.items.preset.hasNoTitle": "Has No Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasNoTitle": "Has No Title",
 
-  "admin.registries.bitstream-formats.edit.head": "बिटस्ट्रीम प्रारूप: {{ format }}", 
+  //"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.registries.bitstream-formats.edit.internal.hint": "आंतरिक के रूप में चिह्नित प्रारूप उपयोगकर्ता से छिपे हुए हैं, और प्रशासनिक उद्देश्यों के लिए उपयोग किए जाते हैं।", 
+  //"admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasCompoundSubject": "Has compound subject",
 
-  "admin.registries.bitstream-formats.edit.internal.label": "आंतरिक", 
+  //"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.registries.bitstream-formats.edit.mimetype.hint": "इस प्रारूप से जुड़े MIME प्रकार का अद्वितीय होना आवश्यक नहीं है।", 
+  //"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.registries.bitstream-formats.edit.mimetype.label": "माइम (MIME) प्रकार", 
+  //"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.registries.bitstream-formats.edit.shortDescription.hint": "इस प्रारूप के लिए एक अनूठा नाम, (जैसे माइक्रोसॉफ्ट वर्ड एक्सपी या माइक्रोसॉफ्ट वर्ड 2000)", 
+  //"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.registries.bitstream-formats.edit.shortDescription.label": "नाम", 
+  //"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.registries.bitstream-formats.edit.success.content": "बिटस्ट्रीम प्रारूप सफलतापूर्वक संपादित किया गया।", 
+  //"admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
+  // TODO New key - Add a translation
+  "admin.reports.items.preset.hasEmptyMetadata": "Has empty metadata",
 
-  "admin.registries.bitstream-formats.edit.success.head": "सफलता", 
+  //"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.registries.bitstream-formats.edit.supportLevel.hint": "इस प्रारूप के लिए आपकी संस्था द्वारा दिए गए समर्थन का स्तर।", 
+  //"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.registries.bitstream-formats.edit.supportLevel.label": "समर्थन स्तर", 
+  //"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.registries.bitstream-formats.head": "बिटस्ट्रीम प्रारूप रजिस्ट्री", 
+  //"admin.reports.items.number": "No.",
+  // TODO New key - Add a translation
+  "admin.reports.items.number": "No.",
 
-  "admin.registries.bitstream-formats.no-items": "दिखाने के लिए कोई बिटस्ट्रीम प्रारूप नहीं।", 
+  //"admin.reports.items.id": "UUID",
+  // TODO New key - Add a translation
+  "admin.reports.items.id": "UUID",
 
-  "admin.registries.bitstream-formats.table.delete": "चयनित हटाएं", 
+  //"admin.reports.items.collection": "Collection",
+  // TODO New key - Add a translation
+  "admin.reports.items.collection": "Collection",
 
-  "admin.registries.bitstream-formats.table.deselect-all": "सभी को अचयनित करें", 
+  //"admin.reports.items.handle": "URI",
+  // TODO New key - Add a translation
+  "admin.reports.items.handle": "URI",
 
-  "admin.registries.bitstream-formats.table.internal": "आंतरिक", 
+  //"admin.reports.items.title": "Title",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Title",
 
-  "admin.registries.bitstream-formats.table.mimetype": "माइम (MIME) प्रकार", 
 
-  "admin.registries.bitstream-formats.table.name": "नाम", 
+  //"admin.reports.commons.filters": "Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters": "Filters",
 
-  "admin.registries.bitstream-formats.table.return": "पीछे", 
+  //"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.registries.bitstream-formats.table.supportLevel.head": "समर्थन स्तर", 
+  //"admin.reports.commons.previous-page": "Prev Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.previous-page": "Prev Page",
 
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "परिचित", 
+  //"admin.reports.commons.next-page": "Next Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.next-page": "Next Page",
 
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "समर्थित", 
+  //"admin.reports.commons.page": "Page",
+  // TODO New key - Add a translation
+  "admin.reports.commons.page": "Page",
 
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "अज्ञात", 
+  //"admin.reports.commons.of": "of",
+  // TODO New key - Add a translation
+  "admin.reports.commons.of": "of",
 
-  "admin.registries.bitstream-formats.title": "बिटस्ट्रीम प्रारूप रजिस्ट्री", 
+  //"admin.reports.commons.export": "Export for Metadata Update",
+  // TODO New key - Add a translation
+  "admin.reports.commons.export": "Export for Metadata Update",
 
-  "admin.registries.metadata.breadcrumbs": "मेटाडेटा रजिस्ट्री", 
+  //"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.registries.metadata.description": "मेटाडेटा रजिस्ट्री संग्रहालय में उपलब्ध सभी मेटाडेटा फ़ील्ड की एक सूची रखता है। इन क्षेत्रों को कई स्कीमाओं में विभाजित किया जा सकता है। हालांकि, डीस्पेस को योग्य डबलिन कोर स्कीमा की आवश्यकता है।", 
+  //"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.registries.metadata.form.create": "मेटाडेटा स्कीमा बनाएं", 
+  //"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.registries.metadata.form.edit": "मेटाडेटा स्कीमा संपादित करें", 
 
-  "admin.registries.metadata.form.name": "नाम", 
+  //"admin.reports.commons.filters.property": "Item Property Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property": "Item Property Filters",
 
-  "admin.registries.metadata.form.namespace": "नाम स्थान", 
+  //"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.registries.metadata.head": "मेटाडेटा रजिस्ट्री", 
+  //"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.registries.metadata.schemas.no-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.registries.metadata.schemas.table.delete": "चयनित हटाएं", 
+  //"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.registries.metadata.schemas.table.id": "पहचान", 
+  //"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.registries.metadata.schemas.table.name": "नाम", 
+  //"admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
 
-  "admin.registries.metadata.schemas.table.namespace": "नाम स्थान", 
+  //"admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bitstream": "Basic Bitstream Filters",
 
-  "admin.registries.metadata.title": "मेटाडेटा रजिस्ट्री", 
+  //"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.registries.schema.breadcrumbs": "मेटाडेटा स्कीमा", 
+  //"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.registries.schema.description": "यह \"{{namespace}}\" के लिए मेटाडेटा स्कीमा है।", 
+  //"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.registries.schema.fields.head": "स्कीमा मेटाडेटा फ़ील्ड", 
+  //"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.registries.schema.fields.no-items": "दिखाने के लिए कोई मेटाडेटा फ़ील्ड नहीं है|", 
+  //"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.registries.schema.fields.table.delete": "चयनित हटाएं", 
+  //"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.registries.schema.fields.table.field": " फील्ड", 
+  //"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.registries.schema.fields.table.scopenote": "कार्यक्षेत्र नोट", 
+  //"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.registries.schema.form.create": "मेटाडेटा फ़ील्ड बनाएं", 
+  //"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.registries.schema.form.edit": "मेटाडेटा फ़ील्ड संपादित करें", 
+  //"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.registries.schema.form.element": "तत्व", 
+  //"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.registries.schema.form.qualifier": "क्वालीफायर", 
+  //"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.registries.schema.form.scopenote": "कार्यक्षेत्र नोट", 
+  //"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.registries.schema.head": "मेटाडेटा स्कीमा", 
+  //"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.registries.schema.notification.created": "\"{{prefix}}\" मेटाडेटा स्कीमा सफलतापूर्वक बनाया गया", 
+  //"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.registries.schema.notification.deleted.failure": "{{amount}} मेटाडेटा स्कीमा हटाने में विफल", 
+  //"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.registries.schema.notification.deleted.success": "{{amount}} मेटाडेटा स्कीमा सफलतापूर्वक हटा दिए गए", 
+  //"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.registries.schema.notification.edited": "\"{{prefix}}\" मेटाडेटा स्कीमा को सफलतापूर्वक संपादित किया गया", 
+  //"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.registries.schema.notification.failure": "त्रुटि", 
+  //"admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.bundle": "Bitstream Bundle Filters",
 
-  "admin.registries.schema.notification.field.created": "\"{{field}}\" मेटाडेटा फ़ील्ड को सफलतापूर्वक बनाया गया", 
+  //"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.registries.schema.notification.field.deleted.failure": "{{amount}} मेटाडेटा फ़ील्ड हटाने में विफल", 
+  //"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.registries.schema.notification.field.deleted.success": "{{amount}} मेटाडेटा फ़ील्ड को सफलतापूर्वक हटाया गया", 
+  //"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.registries.schema.notification.field.edited": "\"{{field}}\" मेटाडेटा फ़ील्ड को सफलतापूर्वक संपादित किया गया", 
+  //"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.registries.schema.notification.success": "सफलता", 
+  //"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.registries.schema.return": "वापस", 
+  //"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.registries.schema.title": "मेटाडेटा स्कीमा रजिस्ट्री", 
+  //"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.search.breadcrumbs": "प्रशासनिक खोज", 
+  //"admin.reports.commons.filters.permission": "Permission Filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.permission": "Permission Filters",
 
-  "admin.search.collection.edit": "संपादित करें", 
+  //"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.search.community.edit": "संपादित करें", 
+  //"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.search.item.delete": "हटाएं", 
+  //"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.search.item.edit": "संपादित करें", 
+  //"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.search.item.make-private": "खोजे न जाने योग्य बनाएं", 
+  //"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.search.item.make-public": "खोजने योग्य बनाएं", 
+  //"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.item.move": "स्थान परिवर्तन", 
 
-  "admin.search.item.reinstate": "पुनर्स्थापित करें", 
+  "admin.curation-tasks.breadcrumbs": "प्रणाली क्यूरेशन कार्य",
 
-  "admin.search.item.withdraw": "वापस लेना", 
+  "admin.access-control.groups.table.id": "पहचान",
 
-  "admin.search.title": "प्रशासनिक खोज", 
+  "admin.access-control.groups.table.members": "सदस्य",
 
-  "admin.workflow.breadcrumbs": "कार्यप्रवाह व्यवस्थापित करें", 
+  "admin.access-control.groups.table.name": "नाम",
 
-  "admin.workflow.item.delete": "हटाएं", 
+  "admin.access-control.groups.title": "समूह",
 
-  "admin.workflow.item.send-back": "वापस भेजे", 
+  "admin.access-control.groups.title.addGroup": "नया समूह",
 
-  "admin.workflow.item.workflow": "कार्यप्रवाह", 
+  "admin.access-control.groups.title.singleGroup": "समूह संपादित करें",
 
-  "admin.workflow.title": "कार्यप्रवाह व्यवस्थापित करें", 
+  "admin.curation-tasks.breadcrumbs": "प्रणाली क्यूरेशन कार्य",
 
-  "administrativeView.search.results.head": "प्रशासनिक खोज", 
+  "admin.curation-tasks.header": "प्रणाली क्यूरेशन कार्य",
 
-  "auth.errors.invalid-user": "अमान्य ई - मेल पता अथवा पासवर्ड।", 
+  "admin.curation-tasks.title": "प्रणाली क्यूरेशन कार्य",
 
-  "auth.messages.expired": "आपका सत्र समाप्त हो गया है। कृपया फिर लॉगिन करें।", 
+  "admin.metadata-import.breadcrumbs": "मेटाडेटा आयात करें",
 
-  "auth.messages.token-refresh-failed": "आपका सत्र टोकन रीफ़्रेश करना विफल रहा। कृपया फिर लॉगिन करें।", 
+  "admin.metadata-import.page.button.proceed": "आगे बढ़ें",
 
-  "bitstream-request-a-copy.alert.canDownload1": "आपके पास पहले से ही इस फ़ाइल तक पहुंच है। अगर आप फ़ाइल डाउनलोड करना चाहते हैं, तो क्लिक करें", 
+  "admin.metadata-import.page.button.return": "वापस",
 
-  "bitstream-request-a-copy.alert.canDownload2": "यहां", 
+  "admin.metadata-import.page.dropMsg": "आयात करने के लिए मेटाडेटा CSV छोड़ें",
 
-  "bitstream-request-a-copy.allfiles.label": "फ़ाइलें", 
+  "admin.metadata-import.page.dropMsgReplace": "आयात करने के लिए मेटाडेटा CSV को बदलने के लिए ड्रॉप करें",
 
-  "bitstream-request-a-copy.email.error": "कृपया वैध ई - मेल एड्रेस डालें।", 
+  "admin.metadata-import.page.error.addFile": "पहले फ़ाइल का चयन करें!",
 
-  "bitstream-request-a-copy.email.hint": "इस ईमेल पते का उपयोग फ़ाइल भेजने के लिए किया जाता है।", 
+  "admin.metadata-import.page.header": "मेटाडेटा आयात करें",
 
-  "bitstream-request-a-copy.email.label": "आपका ईमेल पता *", 
+  "admin.metadata-import.page.help": "आप उन CSV फ़ाइलों को छोड़ या ब्राउज़ कर सकते हैं जिनमें फ़ाइलों पर बैच मेटाडेटा संचालन शामिल हैं",
 
-  "bitstream-request-a-copy.files-all-false.label": "केवल अनुरोधित फ़ाइल", 
+  "admin.metadata-import.page.validateOnly": "केवल मान्य करें",
 
-  "bitstream-request-a-copy.files-all-true.label": "सभी फ़ाइलें (इस आइटम की) प्रतिबंधित पहुंच में हैं", 
+  "admin.metadata-import.page.validateOnly.hint": "चुनी गयी CSV फाइल को उप्लोअडिंग उपरांत पुष्टिकृत किया जाएगा। आपको पाए गए परिवर्तनों की रिपोर्ट प्राप्त होगी, लेकिन कोई भी परिवर्तन सहेजा नहीं जाएगा।",
 
-  "bitstream-request-a-copy.header": "फ़ाइल की एक प्रति का अनुरोध करें", 
+  "admin.metadata-import.title": "मेटाडेटा आयात करें",
 
-  "bitstream-request-a-copy.intro": "निम्नलिखित मद के लिए एक प्रति का अनुरोध करने के लिए निम्नलिखित जानकारी दर्ज करें:", 
+  "admin.registries.bitstream-formats.breadcrumbs": "प्रारूप रजिस्ट्री",
 
-  "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ", 
+  "admin.registries.bitstream-formats.create.breadcrumbs": "बिटस्ट्रीम प्रारूप",
 
-  "bitstream-request-a-copy.intro.bitstream.other": null, 
+  "admin.registries.bitstream-formats.create.failure.content": "नया बिटस्ट्रीम प्रारूप बनाते समय एक त्रुटि हुई।",
 
-  "bitstream-request-a-copy.intro.bitstream.zero": null, 
+  "admin.registries.bitstream-formats.create.failure.head": "असफलता",
 
-  "bitstream-request-a-copy.intro.bitstream.all": "सभी फाइलों का अनुरोध।", 
+  "admin.registries.bitstream-formats.create.head": "बिटस्ट्रीम प्रारूप बनाएं",
 
-  "bitstream-request-a-copy.message.label": "संदेश", 
+  "admin.registries.bitstream-formats.create.new": "एक नया बिटस्ट्रीम प्रारूप जोड़ें",
 
-  "bitstream-request-a-copy.name.error": "नाम आवश्यक है", 
+  "admin.registries.bitstream-formats.create.success.content": "नया बिटस्ट्रीम स्वरूप सफलतापूर्वक बनाया गया।",
 
-  "bitstream-request-a-copy.name.label": "नाम *", 
+  "admin.registries.bitstream-formats.create.success.head": "सफलता",
 
-  "bitstream-request-a-copy.return": "वापस", 
+  "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} प्रारूप (प्रारूपों) को निकालने में विफल",
 
-  "bitstream-request-a-copy.submit": "प्रति अनुरोध ", 
+  "admin.registries.bitstream-formats.delete.failure.head": "असफलता",
 
-  "bitstream-request-a-copy.submit.error": "आइटम अनुरोध प्रस्तुत करने में कोई गड़बड़ी हुई|", 
+  "admin.registries.bitstream-formats.delete.success.amount": "{{ amount}} प्रारूप (प्रारूपों) को सफलतापूर्वक हटा दिया गया हैं|",
 
-  "bitstream-request-a-copy.submit.success": "आइटम अनुरोध सफलतापूर्वक प्रस्तुत किया गया।  ", 
+  "admin.registries.bitstream-formats.delete.success.head": "सफलता",
 
-  "bitstream.download.page": "अब {{bitstream}} डाउनलोड हो रहा है...", 
+  "admin.registries.bitstream-formats.description": "बिटस्ट्रीम प्रारूपों की यह सूची ज्ञात स्वरूपों और उनके समर्थन स्तर के बारे में जानकारी प्रदान करती है।",
 
-  "bitstream.download.page.back": "वापस", 
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "बिटस्ट्रीम प्रारूप",
 
-  "bitstream.edit.authorizations.link": "बिटस्ट्रीम की नीतियां संपादित करें", 
+  "admin.registries.bitstream-formats.edit.description.hint": "",
 
-  "bitstream.edit.authorizations.title": "बिटस्ट्रीम की नीतियां संपादित करें", 
+  "admin.registries.bitstream-formats.edit.description.label": "विवरण",
 
-  "bitstream.edit.bitstream": "बिटस्ट्रीम: ", 
+  "admin.registries.bitstream-formats.edit.extensions.hint": "एक्सटेंशन का उपयोग अपलोड की गई फ़ाइलों के प्रारूप को स्वचालित रूप से पहचानने के लिए किया जाता है। आप प्रत्येक प्रारूप के लिए कई एक्सटेंशन दर्ज कर सकते हैं।",
 
-  "bitstream.edit.form.description.hint": "वैकल्पिक रूप से, फ़ाइल का संक्षिप्त विवरण प्रदान करें, उदाहरण के लिए \"<i>मुख्य लेख</i>\" या \"<i>डेटा रीडिंग का प्रयोग करें</i>\"।", 
+  "admin.registries.bitstream-formats.edit.extensions.label": "फाइल एक्सटेंशन",
 
-  "bitstream.edit.form.description.label": "विवरण", 
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "बिंदु के बिना फ़ाइल एक्सटेंशन दर्ज करें",
 
-  "bitstream.edit.form.embargo.hint": "पहला दिन जब से प्रवेश की अनुमति है। <b>इस फॉर्म पर इस तिथि को संशोधित नहीं किया जा सकता है।</b> बिटस्ट्रीम के लिए एक प्रतिबंध तिथि निर्धारित करने के लिए, <i>आइटम स्थिति</i> टैब पर जाएं, <i>प्राधिकरण...</i> पर क्लिक करें, बिटस्ट्रीम की <i>READ</i> नीति बनाएं या संपादित करें, और वांछित के रूप में <i>प्रारंभ तिथि</i> सेट करें।", 
+  "admin.registries.bitstream-formats.edit.failure.content": "बिटस्ट्रीम प्रारूप को संपादित करते समय एक त्रुटि हुई।",
 
-  "bitstream.edit.form.embargo.label": "विशिष्ट तिथि तक प्रतिबंध", 
+  "admin.registries.bitstream-formats.edit.failure.head": "असफलता",
 
-  "bitstream.edit.form.fileName.hint": "बिटस्ट्रीम के लिए फ़ाइल नाम बदलें। ध्यान दें कि यह प्रदर्शन बिटस्ट्रीम URL को बदल देगा, लेकिन पुराने लिंक तब तक हल होंगे जब तक अनुक्रम आईडी नहीं बदलेगा।", 
+  "admin.registries.bitstream-formats.edit.head": "बिटस्ट्रीम प्रारूप: {{ format }}",
 
-  "bitstream.edit.form.fileName.label": "फ़ाइल का नाम", 
+  "admin.registries.bitstream-formats.edit.internal.hint": "आंतरिक के रूप में चिह्नित प्रारूप उपयोगकर्ता से छिपे हुए हैं, और प्रशासनिक उद्देश्यों के लिए उपयोग किए जाते हैं।",
 
-  "bitstream.edit.form.iiifHeight.hint": "कैनवास की चौड़ाई आमतौर पर छवि की चौड़ाई से मेल खाना चाहिए।", 
+  "admin.registries.bitstream-formats.edit.internal.label": "आंतरिक",
 
-  "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height", 
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "इस प्रारूप से जुड़े MIME प्रकार का अद्वितीय होना आवश्यक नहीं है।",
 
-  "bitstream.edit.form.iiifLabel.hint": "इस छवि के लिए कैनवास लेबल। यदि प्रदान नहीं किया गया है तो डिफ़ॉल्ट लेबल का उपयोग किया जाएगा।", 
+  "admin.registries.bitstream-formats.edit.mimetype.label": "माइम (MIME) प्रकार",
 
-  "bitstream.edit.form.iiifLabel.label": "आईआईआईएफ लेबल", 
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "इस प्रारूप के लिए एक अनूठा नाम, (जैसे माइक्रोसॉफ्ट वर्ड एक्सपी या माइक्रोसॉफ्ट वर्ड 2000)",
 
-  "bitstream.edit.form.iiifToc.hint": "यहां शब्द जोड़ने से यह सामग्री श्रेणी की एक नई तालिका की शुरुआत होगी।", 
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "नाम",
 
-  "bitstream.edit.form.iiifToc.label": "आईआईआईएफ सामग्री तालिका", 
+  "admin.registries.bitstream-formats.edit.success.content": "बिटस्ट्रीम प्रारूप सफलतापूर्वक संपादित किया गया।",
 
-  "bitstream.edit.form.iiifWidth.hint": "कैनवास की चौड़ाई आमतौर पर छवि की चौड़ाई से मेल खाना चाहिए।", 
+  "admin.registries.bitstream-formats.edit.success.head": "सफलता",
 
-  "bitstream.edit.form.iiifWidth.label": "आईआईआईएफ कैनवास चौड़ाई", 
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "इस प्रारूप के लिए आपकी संस्था द्वारा दिए गए समर्थन का स्तर।",
 
-  "bitstream.edit.form.newFormat.hint": "फ़ाइल बनाने के लिए आपके द्वारा उपयोग किया जाने वाला एप्लिकेशन, और संस्करण संख्या (उदाहरण के लिए, \"<i>ACMESoft SuperApp संस्करण 1.5</i>\")।", 
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "समर्थन स्तर",
 
-  "bitstream.edit.form.newFormat.label": "नए प्रारूप का वर्णन करें", 
+  "admin.registries.bitstream-formats.head": "बिटस्ट्रीम प्रारूप रजिस्ट्री",
 
-  "bitstream.edit.form.primaryBitstream.label": "प्राथमिक बिटस्ट्रीम", 
+  "admin.registries.bitstream-formats.no-items": "दिखाने के लिए कोई बिटस्ट्रीम प्रारूप नहीं।",
 
-  "bitstream.edit.form.selectedFormat.hint": "यदि प्रारूप उपरोक्त सूची में नहीं है, तो <b>उपरोक्त \"प्रारूप सूची में नहीं है\" चुनें</b> और \"नए प्रारूप का वर्णन करें\" के तहत इसका वर्णन करें।", 
+  "admin.registries.bitstream-formats.table.delete": "चयनित हटाएं",
 
-  "bitstream.edit.form.selectedFormat.label": "चयनित प्रारूप", 
+  "admin.registries.bitstream-formats.table.deselect-all": "सभी को अचयनित करें",
 
-  "bitstream.edit.form.selectedFormat.unknown": "प्रारूप सूची में नहीं है", 
+  "admin.registries.bitstream-formats.table.internal": "आंतरिक",
 
-  "bitstream.edit.notifications.error.format.title": "बिटस्ट्रीम के प्रारूप को सहेजते समय एक त्रुटि हुई", 
+  "admin.registries.bitstream-formats.table.mimetype": "माइम (MIME) प्रकार",
 
-  "bitstream.edit.notifications.saved.content": "इस बिटस्ट्रीम में आपके परिवर्तन सहेजे गए।", 
+  "admin.registries.bitstream-formats.table.name": "नाम",
 
-  "bitstream.edit.notifications.saved.title": "बिटस्ट्रीम सहेजा गया", 
+  "admin.registries.bitstream-formats.table.return": "पीछे",
 
-  "bitstream.edit.return": "वापस", 
+  "admin.registries.bitstream-formats.table.supportLevel.head": "समर्थन स्तर",
 
-  "bitstream.edit.title": "बिटस्ट्रीम संपादित करें", 
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "परिचित",
 
-  "browse.back.all-results": "सभी ब्राउज़ परिणाम", 
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "समर्थित",
 
-  "browse.comcol.by.author": "लेखक द्वारा", 
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "अज्ञात",
 
-  "browse.comcol.by.dateissued": "जारी करने की तिथि के द्वारा", 
+  "admin.registries.bitstream-formats.title": "बिटस्ट्रीम प्रारूप रजिस्ट्री",
 
-  "browse.comcol.by.subject": "विषय द्वारा", 
+  "admin.registries.metadata.breadcrumbs": "मेटाडेटा रजिस्ट्री",
 
-  "browse.comcol.by.title": "शीर्षक के द्वारा", 
+  "admin.registries.metadata.description": "मेटाडेटा रजिस्ट्री संग्रहालय में उपलब्ध सभी मेटाडेटा फ़ील्ड की एक सूची रखता है। इन क्षेत्रों को कई स्कीमाओं में विभाजित किया जा सकता है। हालांकि, डीस्पेस को योग्य डबलिन कोर स्कीमा की आवश्यकता है।",
 
-  "browse.comcol.head": "ब्राउज़", 
+  "admin.registries.metadata.form.create": "मेटाडेटा स्कीमा बनाएं",
 
-  "browse.empty": "दिखाने के लिए कोई आइटम नहीं है।", 
+  "admin.registries.metadata.form.edit": "मेटाडेटा स्कीमा संपादित करें",
 
-  "browse.metadata.author": "लेखक", 
+  "admin.registries.metadata.form.name": "नाम",
 
-  "browse.metadata.author.breadcrumbs": "लेखक द्वारा ब्राउज़ करें", 
+  "admin.registries.metadata.form.namespace": "नाम स्थान",
 
-  "browse.metadata.dateissued": "जारी करने की तिथि", 
+  "admin.registries.metadata.head": "मेटाडेटा रजिस्ट्री",
 
-  "browse.metadata.dateissued.breadcrumbs": "तिथि द्वारा ब्राउज़ करें", 
+  "admin.registries.metadata.schemas.no-items": "दिखाने के लिए कोई मेटाडेटा स्कीमा नहीं है।",
 
-  "browse.metadata.subject": "विषय", 
+  "admin.registries.metadata.schemas.table.delete": "चयनित हटाएं",
 
-  "browse.metadata.subject.breadcrumbs": "विषय द्वारा ब्राउज़ करें", 
+  "admin.registries.metadata.schemas.table.id": "पहचान",
 
-  "browse.metadata.title": "शीर्षक", 
+  "admin.registries.metadata.schemas.table.name": "नाम",
 
-  "browse.metadata.title.breadcrumbs": "शीर्षक द्वारा ब्राउज़ करें", 
+  "admin.registries.metadata.schemas.table.namespace": "नाम स्थान",
 
-  "browse.startsWith": ", {{ startWith }} से शुरू होता है", 
+  "admin.registries.metadata.title": "मेटाडेटा रजिस्ट्री",
 
-  "browse.startsWith.choose_start": "(प्रारंभ चुनें)", 
+  "admin.registries.schema.breadcrumbs": "मेटाडेटा स्कीमा",
 
-  "browse.startsWith.choose_year": "(वर्ष चुनें)", 
+  "admin.registries.schema.description": "यह \"{{namespace}}\" के लिए मेटाडेटा स्कीमा है।",
 
-  "browse.startsWith.choose_year.label": "जारी करने का वर्ष चुने", 
+  "admin.registries.schema.fields.head": "स्कीमा मेटाडेटा फ़ील्ड",
 
-  "browse.startsWith.jump": "साल या महीने के हिसाब से नतीजे फ़िल्टर करें", 
+  "admin.registries.schema.fields.no-items": "दिखाने के लिए कोई मेटाडेटा फ़ील्ड नहीं है|",
 
-  "browse.startsWith.months.april": "अप्रैल", 
+  "admin.registries.schema.fields.table.delete": "चयनित हटाएं",
 
-  "browse.startsWith.months.august": "अगस्त", 
+  "admin.registries.schema.fields.table.field": " फील्ड",
 
-  "browse.startsWith.months.december": "दिसंबर", 
+  "admin.registries.schema.fields.table.scopenote": "कार्यक्षेत्र नोट",
 
-  "browse.startsWith.months.february": "फ़रवरी", 
+  "admin.registries.schema.form.create": "मेटाडेटा फ़ील्ड बनाएं",
 
-  "browse.startsWith.months.january": "जनवरी", 
+  "admin.registries.schema.form.edit": "मेटाडेटा फ़ील्ड संपादित करें",
 
-  "browse.startsWith.months.july": "जुलाई", 
+  "admin.registries.schema.form.element": "तत्व",
 
-  "browse.startsWith.months.june": "जून", 
+  "admin.registries.schema.form.qualifier": "क्वालीफायर",
 
-  "browse.startsWith.months.march": "मार्च", 
+  "admin.registries.schema.form.scopenote": "कार्यक्षेत्र नोट",
 
-  "browse.startsWith.months.may": "मई", 
+  "admin.registries.schema.head": "मेटाडेटा स्कीमा",
 
-  "browse.startsWith.months.none": "(महीना चुनें)", 
+  "admin.registries.schema.notification.created": "\"{{prefix}}\" मेटाडेटा स्कीमा सफलतापूर्वक बनाया गया",
 
-  "browse.startsWith.months.none.label": "प्रकाशन माह चुनें", 
+  "admin.registries.schema.notification.deleted.failure": "{{amount}} मेटाडेटा स्कीमा हटाने में विफल",
 
-  "browse.startsWith.months.november": "नवंबर", 
+  "admin.registries.schema.notification.deleted.success": "{{amount}} मेटाडेटा स्कीमा सफलतापूर्वक हटा दिए गए",
 
-  "browse.startsWith.months.october": "अक्टूबर", 
+  "admin.registries.schema.notification.edited": "\"{{prefix}}\" मेटाडेटा स्कीमा को सफलतापूर्वक संपादित किया गया",
 
-  "browse.startsWith.months.september": "सितंबर", 
+  "admin.registries.schema.notification.failure": "त्रुटि",
 
-  "browse.startsWith.submit": "ब्राउज़", 
+  "admin.registries.schema.notification.field.created": "\"{{field}}\" मेटाडेटा फ़ील्ड को सफलतापूर्वक बनाया गया",
 
-  "browse.startsWith.type_date": "दिनांक के अनुसार परिणाम फ़िल्टर करें", 
+  "admin.registries.schema.notification.field.deleted.failure": "{{amount}} मेटाडेटा फ़ील्ड हटाने में विफल",
 
-  "browse.startsWith.type_date.label": "या एक तिथि (वर्ष-माह) टाइप करें और ब्राउज़ बटन पर क्लिक करें", 
+  "admin.registries.schema.notification.field.deleted.success": "{{amount}} मेटाडेटा फ़ील्ड को सफलतापूर्वक हटाया गया",
 
-  "browse.startsWith.type_text": "पहले कुछ अक्षर लिखकर परिणाम फ़िल्टर करें", 
+  "admin.registries.schema.notification.field.edited": "\"{{field}}\" मेटाडेटा फ़ील्ड को सफलतापूर्वक संपादित किया गया",
 
-  "browse.title": "{{ collection }} को {{ field }}{{ startsWith }} {{ value }} द्वारा ब्राउज़ करें\n", 
+  "admin.registries.schema.notification.success": "सफलता",
 
-  "browse.title.page": "{{ collection }} को {{ field }} {{ value }} द्वारा ब्राउज़ करना", 
+  "admin.registries.schema.return": "वापस",
 
-  "chips.remove": "चिप निकालें", 
+  "admin.registries.schema.title": "मेटाडेटा स्कीमा रजिस्ट्री",
 
-  "collection.create.head": "एक संग्रह बनाएं", 
+  "admin.search.breadcrumbs": "प्रशासनिक खोज",
 
-  "collection.create.notifications.success": "संग्रह सफलतापूर्वक बनाया गया", 
+  "admin.search.collection.edit": "संपादित करें",
 
-  "collection.create.sub-head": "{{ parent }} समुदाय के लिए एक संग्रह बनाएं", 
+  "admin.search.community.edit": "संपादित करें",
 
-  "collection.curate.header": "क्यूरेट संग्रह: {{collection}}", 
+  "admin.search.item.delete": "हटाएं",
 
-  "collection.delete.cancel": "रद्द करें", 
+  "admin.search.item.edit": "संपादित करें",
 
-  "collection.delete.confirm": "पुष्टि करें", 
+  "admin.search.item.make-private": "खोजे न जाने योग्य बनाएं",
 
-  "collection.delete.head": "संग्रह हटाएं", 
+  "admin.search.item.make-public": "खोजने योग्य बनाएं",
 
-  "collection.delete.notification.fail": "संग्रह हटाया नहीं जा सका", 
+  "admin.search.item.move": "स्थान परिवर्तन",
 
-  "collection.delete.notification.success": "संग्रह को सफलतापूर्वक हटाया गया", 
+  "admin.search.item.reinstate": "पुनर्स्थापित करें",
 
-  "collection.delete.processing": "हटाया जा रहा है", 
+  "admin.search.item.withdraw": "वापस लेना",
 
-  "collection.delete.text": "क्या आप वाकई \"{{ dso }}\" संग्रह हटाना चाहते हैं", 
+  "admin.search.title": "प्रशासनिक खोज",
 
-  "collection.edit.breadcrumbs": "संग्रह संपादित करें", 
+  "admin.workflow.breadcrumbs": "कार्यप्रवाह व्यवस्थापित करें",
 
-  "collection.edit.delete": "इस संग्रह को हटाएं", 
+  "admin.workflow.item.delete": "हटाएं",
 
-  "collection.edit.head": "संग्रह संपादित करें", 
+  "admin.workflow.item.send-back": "वापस भेजे",
 
-  "collection.edit.item-mapper.cancel": "रद्द करें", 
+  "admin.workflow.item.workflow": "कार्यप्रवाह",
 
-  "collection.edit.item-mapper.collection": "संग्रह: \"<b>{{name}}</b>\"", 
+  "admin.workflow.title": "कार्यप्रवाह व्यवस्थापित करें",
 
-  "collection.edit.item-mapper.confirm": "चयनित आइटम मैप करें", 
+  "administrativeView.search.results.head": "प्रशासनिक खोज",
 
-  "collection.edit.item-mapper.description": "यह आइटम मैपर उपकरण है जो संग्रह प्रशासकों को इस संग्रह में अन्य संग्रह से आइटम मैप करने की अनुमति देता है। आप अन्य संग्रहों से आइटम खोज सकते हैं और उन्हें मैप कर सकते हैं, या वर्तमान में मैप किए गए आइटम की सूची ब्राउज़ कर सकते हैं।", 
+  "auth.errors.invalid-user": "अमान्य ई - मेल पता अथवा पासवर्ड।",
 
-  "collection.edit.item-mapper.head": "आइटम मैपर - अन्य संग्रहों से आइटम मैप करें", 
+  "auth.messages.expired": "आपका सत्र समाप्त हो गया है। कृपया फिर लॉगिन करें।",
 
-  "collection.edit.item-mapper.no-search": "कृपया खोजने के लिए एक प्रश्न दर्ज करें", 
+  "auth.messages.token-refresh-failed": "आपका सत्र टोकन रीफ़्रेश करना विफल रहा। कृपया फिर लॉगिन करें।",
 
-  "collection.edit.item-mapper.notifications.map.error.content": "{{amount}} आइटम की मैपिंग में त्रुटियां हुईं।", 
+  "bitstream-request-a-copy.alert.canDownload1": "आपके पास पहले से ही इस फ़ाइल तक पहुंच है। अगर आप फ़ाइल डाउनलोड करना चाहते हैं, तो क्लिक करें",
 
-  "collection.edit.item-mapper.notifications.map.error.head": "संलग्न करने में त्रुटियां", 
+  "bitstream-request-a-copy.alert.canDownload2": "यहां",
 
-  "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} आइटम सफलतापूर्वक मैप किए गए।", 
+  "bitstream-request-a-copy.allfiles.label": "फ़ाइलें",
 
-  "collection.edit.item-mapper.notifications.map.success.head": "मैपिंग पूरी हुई", 
+  "bitstream-request-a-copy.email.error": "कृपया वैध ई - मेल एड्रेस डालें।",
 
-  "collection.edit.item-mapper.notifications.unmap.error.content": "{{amount}} आइटम की मैपिंग निकालने में त्रुटियां हुईं।", 
+  "bitstream-request-a-copy.email.hint": "इस ईमेल पते का उपयोग फ़ाइल भेजने के लिए किया जाता है।",
 
-  "collection.edit.item-mapper.notifications.unmap.error.head": "मैपिंग त्रुटियां हटाएं", 
+  "bitstream-request-a-copy.email.label": "आपका ईमेल पता *",
 
-  "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} आइटम की मैपिंग सफलतापूर्वक निकाल दी गई।", 
+  "bitstream-request-a-copy.files-all-false.label": "केवल अनुरोधित फ़ाइल",
 
-  "collection.edit.item-mapper.notifications.unmap.success.head": "मैपिंग हटाना पूर्ण हुआ", 
+  "bitstream-request-a-copy.files-all-true.label": "सभी फ़ाइलें (इस आइटम की) प्रतिबंधित पहुंच में हैं",
 
-  "collection.edit.item-mapper.remove": "चयनित आइटम मैपिंग हटाएं", 
+  "bitstream-request-a-copy.header": "फ़ाइल की एक प्रति का अनुरोध करें",
 
-  "collection.edit.item-mapper.search-form.placeholder": "आइटम खोजें...", 
+  "bitstream-request-a-copy.intro": "निम्नलिखित मद के लिए एक प्रति का अनुरोध करने के लिए निम्नलिखित जानकारी दर्ज करें:",
 
-  "collection.edit.item-mapper.tabs.browse": "मैप किए गए आइटम ब्राउज़ करें", 
+  "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
 
-  "collection.edit.item-mapper.tabs.map": "नए आइटम मैप करें", 
+  "bitstream-request-a-copy.intro.bitstream.other": null,
 
-  "collection.edit.item.authorizations.load-bundle-button": "और बंडल लोड करें", 
+  "bitstream-request-a-copy.intro.bitstream.zero": null,
 
-  "collection.edit.item.authorizations.load-more-button": "और लोड करें", 
+  "bitstream-request-a-copy.intro.bitstream.all": "सभी फाइलों का अनुरोध।",
 
-  "collection.edit.item.authorizations.show-bitstreams-button": "बंडल के लिए बिटस्ट्रीम नीतियां दिखाएं", 
+  "bitstream-request-a-copy.message.label": "संदेश",
 
-  "collection.edit.logo.delete-undo.title": "हटाना रद्द करें ", 
+  "bitstream-request-a-copy.name.error": "नाम आवश्यक है",
 
-  "collection.edit.logo.delete.title": "चिन्ह हटाएं", 
+  "bitstream-request-a-copy.name.label": "नाम *",
 
-  "collection.edit.logo.label": "संग्रह चिन्ह", 
+  "bitstream-request-a-copy.return": "वापस",
 
-  "collection.edit.logo.notifications.add.error": "संग्रह लोगो अपलोड करना विफल रहा। कृपया पुनः प्रयास करने से पहले सामग्री को सत्यापित करें।", 
+  "bitstream-request-a-copy.submit": "प्रति अनुरोध ",
 
-  "collection.edit.logo.notifications.add.success": "संग्रह चिन्ह को सफलतापूर्वक अपलोड हुआ। ", 
+  "bitstream-request-a-copy.submit.error": "आइटम अनुरोध प्रस्तुत करने में कोई गड़बड़ी हुई|",
 
-  "collection.edit.logo.notifications.delete.error.title": "चिन्ह हटाने में त्रुटि", 
+  "bitstream-request-a-copy.submit.success": "आइटम अनुरोध सफलतापूर्वक प्रस्तुत किया गया।  ",
 
-  "collection.edit.logo.notifications.delete.success.content": "संग्रह चिन्ह सफलतापूर्वक हटा दिया गया", 
+  "bitstream.download.page": "अब {{bitstream}} डाउनलोड हो रहा है...",
 
-  "collection.edit.logo.notifications.delete.success.title": "चिन्ह हटा दिया गया", 
+  "bitstream.download.page.back": "वापस",
 
-  "collection.edit.logo.upload": "अपलोड करने के लिए संग्रह लोगो छोड़ें", 
+  "bitstream.edit.authorizations.link": "बिटस्ट्रीम की नीतियां संपादित करें",
 
-  "collection.edit.notifications.success": "संग्रह को सफलतापूर्वक संपादित किया गया", 
+  "bitstream.edit.authorizations.title": "बिटस्ट्रीम की नीतियां संपादित करें",
 
-  "collection.edit.return": "वापस", 
+  "bitstream.edit.bitstream": "बिटस्ट्रीम: ",
 
-  "collection.edit.tabs.authorizations.head": "प्राधिकरण", 
+  "bitstream.edit.form.description.hint": "वैकल्पिक रूप से, फ़ाइल का संक्षिप्त विवरण प्रदान करें, उदाहरण के लिए \"<i>मुख्य लेख</i>\" या \"<i>डेटा रीडिंग का प्रयोग करें</i>\"।",
 
-  "collection.edit.tabs.authorizations.title": "संग्रह संपादन - प्राधिकरण", 
+  "bitstream.edit.form.description.label": "विवरण",
 
-  "collection.edit.tabs.curate.head": "क्यूरेट", 
+  "bitstream.edit.form.embargo.hint": "पहला दिन जब से प्रवेश की अनुमति है। <b>इस फॉर्म पर इस तिथि को संशोधित नहीं किया जा सकता है।</b> बिटस्ट्रीम के लिए एक प्रतिबंध तिथि निर्धारित करने के लिए, <i>आइटम स्थिति</i> टैब पर जाएं, <i>प्राधिकरण...</i> पर क्लिक करें, बिटस्ट्रीम की <i>READ</i> नीति बनाएं या संपादित करें, और वांछित के रूप में <i>प्रारंभ तिथि</i> सेट करें।",
 
-  "collection.edit.tabs.curate.title": "संग्रह संपादन - क्यूरेट", 
+  "bitstream.edit.form.embargo.label": "विशिष्ट तिथि तक प्रतिबंध",
 
-  "collection.edit.tabs.item-mapper.title": "संग्रह संपादन - आइटम मैपर", 
+  "bitstream.edit.form.fileName.hint": "बिटस्ट्रीम के लिए फ़ाइल नाम बदलें। ध्यान दें कि यह प्रदर्शन बिटस्ट्रीम URL को बदल देगा, लेकिन पुराने लिंक तब तक हल होंगे जब तक अनुक्रम आईडी नहीं बदलेगा।",
 
-  "collection.edit.tabs.mapper.head": "आइटम मैपर", 
+  "bitstream.edit.form.fileName.label": "फ़ाइल का नाम",
 
-  "collection.edit.tabs.metadata.head": "मेटाडेटा संपादित करें", 
+  "bitstream.edit.form.iiifHeight.hint": "कैनवास की चौड़ाई आमतौर पर छवि की चौड़ाई से मेल खाना चाहिए।",
 
-  "collection.edit.tabs.metadata.title": "संग्रह संपादन के लिए मेटाडेटा", 
+  "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
 
-  "collection.edit.tabs.roles.head": "भूमिकाएँ निर्दिष्ट करें", 
+  "bitstream.edit.form.iiifLabel.hint": "इस छवि के लिए कैनवास लेबल। यदि प्रदान नहीं किया गया है तो डिफ़ॉल्ट लेबल का उपयोग किया जाएगा।",
 
-  "collection.edit.tabs.roles.title": "संग्रह संपादन - भूमिकाएं", 
+  "bitstream.edit.form.iiifLabel.label": "आईआईआईएफ लेबल",
 
-  "collection.edit.tabs.source.external": "यह संग्रह अपनी सामग्री को बाहरी स्रोत से एकत्रित करता है", 
+  "bitstream.edit.form.iiifToc.hint": "यहां शब्द जोड़ने से यह सामग्री श्रेणी की एक नई तालिका की शुरुआत होगी।",
 
-  "collection.edit.tabs.source.form.errors.oaiSource.required": "आपको लक्ष्य संग्रह की एक निर्धारित आईडी प्रदान करनी होगी।", 
+  "bitstream.edit.form.iiifToc.label": "आईआईआईएफ सामग्री तालिका",
 
-  "collection.edit.tabs.source.form.harvestType": "सामग्री हार्वेस्ट की जा रही है  ", 
+  "bitstream.edit.form.iiifWidth.hint": "कैनवास की चौड़ाई आमतौर पर छवि की चौड़ाई से मेल खाना चाहिए।",
 
-  "collection.edit.tabs.source.form.head": "बाहरी स्रोत कॉन्फ़िगर करें", 
+  "bitstream.edit.form.iiifWidth.label": "आईआईआईएफ कैनवास चौड़ाई",
 
-  "collection.edit.tabs.source.form.metadataConfigId": "मेटाडेटा प्रारूप", 
+  "bitstream.edit.form.newFormat.hint": "फ़ाइल बनाने के लिए आपके द्वारा उपयोग किया जाने वाला एप्लिकेशन, और संस्करण संख्या (उदाहरण के लिए, \"<i>ACMESoft SuperApp संस्करण 1.5</i>\")।",
 
-  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id", 
+  "bitstream.edit.form.newFormat.label": "नए प्रारूप का वर्णन करें",
 
-  "collection.edit.tabs.source.form.oaiSource": "OAI प्रदाता", 
+  "bitstream.edit.form.primaryBitstream.label": "प्राथमिक बिटस्ट्रीम",
 
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "हार्वेस्ट मेटाडेटा और बिटस्ट्रीम (ORE समर्थन की आवश्यकता है)", 
+  "bitstream.edit.form.selectedFormat.hint": "यदि प्रारूप उपरोक्त सूची में नहीं है, तो <b>उपरोक्त \"प्रारूप सूची में नहीं है\" चुनें</b> और \"नए प्रारूप का वर्णन करें\" के तहत इसका वर्णन करें।",
 
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "हार्वेस्ट मेटाडेटा और बिटस्ट्रीम के संदर्भ (ORE समर्थन की आवश्यकता है)", 
+  "bitstream.edit.form.selectedFormat.label": "चयनित प्रारूप",
 
-  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "केवल मेटाडेटा प्राप्त करें", 
+  "bitstream.edit.form.selectedFormat.unknown": "प्रारूप सूची में नहीं है",
 
-  "collection.edit.tabs.source.head": "सामग्री स्रोत", 
+  "bitstream.edit.notifications.error.format.title": "बिटस्ट्रीम के प्रारूप को सहेजते समय एक त्रुटि हुई",
 
-  "collection.edit.tabs.source.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें", 
+  "bitstream.edit.notifications.saved.content": "इस बिटस्ट्रीम में आपके परिवर्तन सहेजे गए।",
 
-  "collection.edit.tabs.source.notifications.discarded.title": "परिवर्तन रद्द किये गए", 
+  "bitstream.edit.notifications.saved.title": "बिटस्ट्रीम सहेजा गया",
 
-  "collection.edit.tabs.source.notifications.invalid.content": "आपके परिवर्तन सहेजे नहीं गए थे। कृपया सुनिश्चित करें कि आपके द्वारा सहेजने से पहले सभी फ़ील्ड मान्य हैं।", 
+  "bitstream.edit.return": "वापस",
 
-  "collection.edit.tabs.source.notifications.invalid.title": "अमान्य मेटाडेटा ", 
+  "bitstream.edit.title": "बिटस्ट्रीम संपादित करें",
 
-  "collection.edit.tabs.source.notifications.saved.content": "इस संग्रह के सामग्री स्रोत में आपके परिवर्तन सहेजे गए थे।", 
+  "browse.back.all-results": "सभी ब्राउज़ परिणाम",
 
-  "collection.edit.tabs.source.notifications.saved.title": "सामग्री स्रोत सहेजा गया", 
+  "browse.comcol.by.author": "लेखक द्वारा",
 
-  "collection.edit.tabs.source.title": "संग्रह संपादन के लिए सामग्री स्रोत", 
+  "browse.comcol.by.dateissued": "जारी करने की तिथि के द्वारा",
 
-  "collection.edit.template.add-button": "जोड़ें", 
+  "browse.comcol.by.subject": "विषय द्वारा",
 
-  "collection.edit.template.breadcrumbs": "टेम्पलेट आइटम", 
+  "browse.comcol.by.title": "शीर्षक के द्वारा",
 
-  "collection.edit.template.cancel": "रद्द करें", 
+  "browse.comcol.head": "ब्राउज़",
 
-  "collection.edit.template.delete-button": "हटाएं", 
+  "browse.empty": "दिखाने के लिए कोई आइटम नहीं है।",
 
-  "collection.edit.template.edit-button": "संपादित करें", 
+  "browse.metadata.author": "लेखक",
 
-  "collection.edit.template.error": "टेम्पलेट आइटम प्राप्त करने में त्रुटि हुई", 
+  "browse.metadata.author.breadcrumbs": "लेखक द्वारा ब्राउज़ करें",
 
-  "collection.edit.template.head": "संग्रह के लिए टेम्पलेट आइटम संपादित करें \"{{ collection }}\"", 
+  "browse.metadata.dateissued": "जारी करने की तिथि",
 
-  "collection.edit.template.label": "टेम्पलेट आइटम", 
+  "browse.metadata.dateissued.breadcrumbs": "तिथि द्वारा ब्राउज़ करें",
 
-  "collection.edit.template.loading": "टेम्प्लेट आइटम लोड हो रहा है...", 
+  "browse.metadata.subject": "विषय",
 
-  "collection.edit.template.notifications.delete.error": "आइटम टेम्पलेट हटाने में विफल", 
+  "browse.metadata.subject.breadcrumbs": "विषय द्वारा ब्राउज़ करें",
 
-  "collection.edit.template.notifications.delete.success": "आइटम टेम्प्लेट को सफलतापूर्वक हटाया गया", 
+  "browse.metadata.title": "शीर्षक",
 
-  "collection.edit.template.title": "आइटम संपादन टेम्पलेट", 
+  "browse.metadata.title.breadcrumbs": "शीर्षक द्वारा ब्राउज़ करें",
 
-  "collection.form.abstract": "संक्षिप्त वर्णन", 
+  "browse.startsWith": ", {{ startWith }} से शुरू होता है",
 
-  "collection.form.description": "परिचयात्मक पाठ (एचटीएमएल)", 
+  "browse.startsWith.choose_start": "(प्रारंभ चुनें)",
 
-  "collection.form.entityType": "इकाई प्रकार", 
+  "browse.startsWith.choose_year": "(वर्ष चुनें)",
 
-  "collection.form.errors.title.required": "कृपया संग्रह का नाम दर्ज करें ", 
+  "browse.startsWith.choose_year.label": "जारी करने का वर्ष चुने",
 
-  "collection.form.license": "अनुज्ञाप‍त्र", 
+  "browse.startsWith.jump": "साल या महीने के हिसाब से नतीजे फ़िल्टर करें",
 
-  "collection.form.provenance": "उत्पत्ति", 
+  "browse.startsWith.months.april": "अप्रैल",
 
-  "collection.form.rights": "कॉपीराइट टेक्स्ट (एचटीएमएल)", 
+  "browse.startsWith.months.august": "अगस्त",
 
-  "collection.form.tableofcontents": "समाचार (एचटीएमएल)", 
+  "browse.startsWith.months.december": "दिसंबर",
 
-  "collection.form.title": "नाम", 
+  "browse.startsWith.months.february": "फ़रवरी",
 
-  "collection.listelement.badge": "संग्रह", 
+  "browse.startsWith.months.january": "जनवरी",
 
-  "collection.page.browse.recent.empty": "दिखाने के लिए कोई आइटम नहीं", 
+  "browse.startsWith.months.july": "जुलाई",
 
-  "collection.page.browse.recent.head": "हाल की प्रस्तुतियाँ", 
+  "browse.startsWith.months.june": "जून",
 
-  "collection.page.edit": "इस संग्रह को संपादित करें", 
+  "browse.startsWith.months.march": "मार्च",
 
-  "collection.page.handle": "इस संग्रह के लिए स्थायी यूआरआई (URI)", 
+  "browse.startsWith.months.may": "मई",
 
-  "collection.page.license": "अनुज्ञाप‍त्र", 
+  "browse.startsWith.months.none": "(महीना चुनें)",
 
-  "collection.page.license (Copy)": "अनुज्ञाप‍त्र", 
+  "browse.startsWith.months.none.label": "प्रकाशन माह चुनें",
 
-  "collection.page.news": "समाचार", 
+  "browse.startsWith.months.november": "नवंबर",
 
-  "collection.select.confirm": "चयनित होने की पुष्टि करें", 
+  "browse.startsWith.months.october": "अक्टूबर",
 
-  "collection.select.empty": "दिखाने के लिए कोई संग्रह नहीं है", 
+  "browse.startsWith.months.september": "सितंबर",
 
-  "collection.select.table.title": "शीर्षक", 
+  "browse.startsWith.submit": "ब्राउज़",
 
-  "collection.source.controls.harvest.last": "पिछला हार्वेस्ट:", 
+  "browse.startsWith.type_date": "दिनांक के अनुसार परिणाम फ़िल्टर करें",
 
-  "collection.source.controls.harvest.message": "Harvest info:", 
+  "browse.startsWith.type_date.label": "या एक तिथि (वर्ष-माह) टाइप करें और ब्राउज़ बटन पर क्लिक करें",
 
-  "collection.source.controls.harvest.no-information": "लागू नहीं", 
+  "browse.startsWith.type_text": "पहले कुछ अक्षर लिखकर परिणाम फ़िल्टर करें",
 
-  "collection.source.controls.harvest.start": "हार्वेस्ट शुरू होने का समय:", 
+  "browse.title": "{{ collection }} को {{ field }}{{ startsWith }} {{ value }} द्वारा ब्राउज़ करें\n",
 
-  "collection.source.controls.harvest.status": "हार्वेस्ट स्थिति:", 
+  "browse.title.page": "{{ collection }} को {{ field }} {{ value }} द्वारा ब्राउज़ करना",
 
-  "collection.source.controls.head": "हार्वेस्ट नियंत्रण", 
+  "chips.remove": "चिप निकालें",
 
-  "collection.source.controls.import.completed": "आयात पूरा हुआ", 
+  "collection.create.head": "एक संग्रह बनाएं",
 
-  "collection.source.controls.import.failed": "आयात के दौरान एक त्रुटि हुई", 
+  "collection.create.notifications.success": "संग्रह सफलतापूर्वक बनाया गया",
 
-  "collection.source.controls.import.running": "आयात किया जा रहा है...", 
+  "collection.create.sub-head": "{{ parent }} समुदाय के लिए एक संग्रह बनाएं",
 
-  "collection.source.controls.import.submit": "अभी आयात करें", 
+  "collection.curate.header": "क्यूरेट संग्रह: {{collection}}",
 
-  "collection.source.controls.import.submit.error": "आयात शुरू करने में कुछ गलत हुआ", 
+  "collection.delete.cancel": "रद्द करें",
 
-  "collection.source.controls.import.submit.success": "आयात सफलतापूर्वक शुरू कर दिया गया है", 
+  "collection.delete.confirm": "पुष्टि करें",
 
-  "collection.source.controls.reset.completed": "रीसेट और पुनः आयात पूरा हुआ", 
+  "collection.delete.head": "संग्रह हटाएं",
 
-  "collection.source.controls.reset.failed": "रीसेट और पुन: आयात के दौरान एक त्रुटि हुई", 
+  "collection.delete.notification.fail": "संग्रह हटाया नहीं जा सका",
 
-  "collection.source.controls.reset.running": "रीसेट किया जा रहा है और फिर से आयात किया जा रहा है...", 
+  "collection.delete.notification.success": "संग्रह को सफलतापूर्वक हटाया गया",
 
-  "collection.source.controls.reset.submit": "रीसेट करें और पुनः आयात करें", 
+  "collection.delete.processing": "हटाया जा रहा है",
 
-  "collection.source.controls.reset.submit.error": "रीसेट शुरू करने और पुन: आयात करने में कुछ गलत हुआ", 
+  "collection.delete.text": "क्या आप वाकई \"{{ dso }}\" संग्रह हटाना चाहते हैं",
 
-  "collection.source.controls.reset.submit.success": "रीसेट और पुनः आयात सफलतापूर्वक शुरू किया गया है", 
+  "collection.edit.breadcrumbs": "संग्रह संपादित करें",
 
-  "collection.source.controls.test.completed": "सेटिंग्स का परीक्षण करने के लिए स्क्रिप्ट सफलतापूर्वक समाप्त हो गई है", 
+  "collection.edit.delete": "इस संग्रह को हटाएं",
 
-  "collection.source.controls.test.failed": "सेटिंग्स का परीक्षण करने की स्क्रिप्ट विफल हो गई है", 
+  "collection.edit.head": "संग्रह संपादित करें",
 
-  "collection.source.controls.test.running": "Testing configuration...", 
+  "collection.edit.item-mapper.cancel": "रद्द करें",
 
-  "collection.source.controls.test.submit": "परीक्षण विन्यास", 
+  "collection.edit.item-mapper.collection": "संग्रह: \"<b>{{name}}</b>\"",
 
-  "collection.source.controls.test.submit.error": "सेटिंग्स का परीक्षण शुरू करने में कुछ गलत हुआ", 
+  "collection.edit.item-mapper.confirm": "चयनित आइटम मैप करें",
 
-  "collection.source.update.notifications.error.content": "प्रदान की गई सेटिंग्स का परीक्षण किया गया है और काम नहीं किया है।", 
+  "collection.edit.item-mapper.description": "यह आइटम मैपर उपकरण है जो संग्रह प्रशासकों को इस संग्रह में अन्य संग्रह से आइटम मैप करने की अनुमति देता है। आप अन्य संग्रहों से आइटम खोज सकते हैं और उन्हें मैप कर सकते हैं, या वर्तमान में मैप किए गए आइटम की सूची ब्राउज़ कर सकते हैं।",
 
-  "collection.source.update.notifications.error.title": "सर्वर त्रुटि", 
+  "collection.edit.item-mapper.head": "आइटम मैपर - अन्य संग्रहों से आइटम मैप करें",
 
-  "comcol-role.edit.bitstream_read.anonymous-group": "आने वाली बिटस्ट्रीम के लिए डिफ़ॉल्ट पठन वर्तमान में बेनामी पर सेट है।", 
+  "collection.edit.item-mapper.no-search": "कृपया खोजने के लिए एक प्रश्न दर्ज करें",
 
-  "comcol-role.edit.bitstream_read.description": "सामुदायिक प्रशासक उप-समुदाय या संग्रह बना सकते हैं, और उन उप-समुदायों या संग्रहों के लिए प्रबंधन या प्रबंधन सौंप सकते हैं। इसके अलावा, वे तय करते हैं कि कौन किसी भी उप-संग्रह में आइटम प्रस्तुत कर सकता है, आइटम मेटाडेटा (प्रस्तुति के बाद) संपादित कर सकता है, और अन्य संग्रहों (प्राधिकरण के अधीन) से मौजूदा आइटम जोड़ सकता है (मैप)।", 
+  "collection.edit.item-mapper.notifications.map.error.content": "{{amount}} आइटम की मैपिंग में त्रुटियां हुईं।",
 
-  "comcol-role.edit.bitstream_read.name": "डिफ़ॉल्ट बिटस्ट्रीम पठन पहुंच", 
+  "collection.edit.item-mapper.notifications.map.error.head": "संलग्न करने में त्रुटियां",
 
-  "comcol-role.edit.collection-admin.description": "संग्रह व्यवस्थापक यह तय करते हैं कि संग्रह में आइटम कौन प्रस्तुत कर सकता है, आइटम मेटाडेटा संपादित कर सकता है (प्रस्तुति के बाद), और अन्य संग्रह से मौजूदा आइटम को इस संग्रह में जोड़ सकता है (उस संग्रह के लिए प्राधिकरण के अधीन)।", 
+  "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} आइटम सफलतापूर्वक मैप किए गए।",
 
-  "comcol-role.edit.collection-admin.name": "व्यवस्थापक", 
+  "collection.edit.item-mapper.notifications.map.success.head": "मैपिंग पूरी हुई",
 
-  "comcol-role.edit.community-admin.description": "सामुदायिक प्रशासक उप-समुदाय या संग्रह बना सकते हैं, और उन उप-समुदायों या संग्रहों के लिए प्रबंधन या प्रबंधन नियुक्त कर सकते हैं। इसके अलावा, वे तय करते हैं कि कौन किसी भी उप-संग्रह में आइटम प्रस्तुत कर सकता है, आइटम मेटाडेटा (सबमिशन के बाद) संपादित कर सकता है, और अन्य संग्रहों (प्राधिकरण के अधीन) से मौजूदा आइटम जोड़ सकता है (मैप)।", 
+  "collection.edit.item-mapper.notifications.unmap.error.content": "{{amount}} आइटम की मैपिंग निकालने में त्रुटियां हुईं।",
 
-  "comcol-role.edit.community-admin.name": "व्यवस्थापक", 
+  "collection.edit.item-mapper.notifications.unmap.error.head": "मैपिंग त्रुटियां हटाएं",
 
-  "comcol-role.edit.create": "बनाएं", 
+  "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} आइटम की मैपिंग सफलतापूर्वक निकाल दी गई।",
 
-  "comcol-role.edit.create.error.title": "'{{ role }}' भूमिका के लिए समूह बनाने में विफल", 
+  "collection.edit.item-mapper.notifications.unmap.success.head": "मैपिंग हटाना पूर्ण हुआ",
 
-  "comcol-role.edit.delete": "हटाएं", 
+  "collection.edit.item-mapper.remove": "चयनित आइटम मैपिंग हटाएं",
 
-  "comcol-role.edit.delete.error.title": "'{{ role }}' भूमिका के समूह को हटाने में विफल", 
+  "collection.edit.item-mapper.search-form.placeholder": "आइटम खोजें...",
 
-  "comcol-role.edit.editor.description": "संपादक आने वाले प्रस्तुतियों के मेटाडेटा को संपादित करने में सक्षम हैं, और फिर उन्हें स्वीकार या अस्वीकार कर सकते हैं।", 
+  "collection.edit.item-mapper.tabs.browse": "मैप किए गए आइटम ब्राउज़ करें",
 
-  "comcol-role.edit.editor.name": "संपादक", 
+  "collection.edit.item-mapper.tabs.map": "नए आइटम मैप करें",
 
-  "comcol-role.edit.finaleditor.description": "अंतिम संपादक आने वाले प्रस्तुति के मेटाडेटा को संपादित करने में सक्षम हैं, लेकिन उन्हें अस्वीकार नहीं कर पाएंगे।", 
+  "collection.edit.item.authorizations.load-bundle-button": "और बंडल लोड करें",
 
-  "comcol-role.edit.finaleditor.name": "अंतिम संपादक", 
+  "collection.edit.item.authorizations.load-more-button": "और लोड करें",
 
-  "comcol-role.edit.item_read.anonymous-group": "आने वाली वस्तुओं के लिए मानक पठन वर्तमान में बेनामी पर सेट है।", 
+  "collection.edit.item.authorizations.show-bitstreams-button": "बंडल के लिए बिटस्ट्रीम नीतियां दिखाएं",
 
-  "comcol-role.edit.item_read.description": "ई-लोग और समूह जो इस संग्रह में प्रस्तुत किए गए नए आइटम पढ़ सकते हैं। इस भूमिका में परिवर्तन पूर्वव्यापी नहीं हैं। सिस्टम में मौजूदा आइटम अभी भी उन लोगों द्वारा देखे जा सकेंगे जिनके पास जोड़ने के समय पढ़ने की पहुंच थी।", 
+  "collection.edit.logo.delete-undo.title": "हटाना रद्द करें ",
 
-  "comcol-role.edit.item_read.name": "डिफ़ॉल्ट आइटम पढ़ने की अनुमति", 
+  "collection.edit.logo.delete.title": "चिन्ह हटाएं",
 
-  "comcol-role.edit.no-group": "कोई भी नहीं", 
+  "collection.edit.logo.label": "संग्रह चिन्ह",
 
-  "comcol-role.edit.restrict": "प्रतिबंधित करें", 
+  "collection.edit.logo.notifications.add.error": "संग्रह लोगो अपलोड करना विफल रहा। कृपया पुनः प्रयास करने से पहले सामग्री को सत्यापित करें।",
 
-  "comcol-role.edit.reviewer.description": "समीक्षक आने वाली प्रस्तुतियाँ स्वीकार या अस्वीकार करने में सक्षम हैं। हालांकि, वे प्रस्तुति के मेटाडेटा को संपादित करने में सक्षम नहीं हैं।", 
+  "collection.edit.logo.notifications.add.success": "संग्रह चिन्ह को सफलतापूर्वक अपलोड हुआ। ",
 
-  "comcol-role.edit.reviewer.name": "समीक्षक", 
+  "collection.edit.logo.notifications.delete.error.title": "चिन्ह हटाने में त्रुटि",
 
-  "comcol-role.edit.submitters.description": "ई-व्यक्ति और समूह जिनके पास इस संग्रह में नए आइटम जमा करने की अनुमति है।", 
+  "collection.edit.logo.notifications.delete.success.content": "संग्रह चिन्ह सफलतापूर्वक हटा दिया गया",
 
-  "comcol-role.edit.submitters.name": "प्रस्तुतकर्ता", 
+  "collection.edit.logo.notifications.delete.success.title": "चिन्ह हटा दिया गया",
 
-  "community.all-lists.head": "उपसमुदाय और संग्रह", 
+  "collection.edit.logo.upload": "अपलोड करने के लिए संग्रह लोगो छोड़ें",
 
-  "community.create.head": "समुदाय बनाएं", 
+  "collection.edit.notifications.success": "संग्रह को सफलतापूर्वक संपादित किया गया",
 
-  "community.create.notifications.success": "समुदाय सफलतापूर्वक बनाया गया", 
+  "collection.edit.return": "वापस",
 
-  "community.create.sub-head": "{{parent }} समुदाय के लिए एक उप-समुदाय बनाएं", 
+  "collection.edit.tabs.authorizations.head": "प्राधिकरण",
 
-  "community.curate.header": "क्यूरेट समुदाय: {{community}}", 
+  "collection.edit.tabs.authorizations.title": "संग्रह संपादन - प्राधिकरण",
 
-  "community.delete.cancel": "रद्द करें", 
+  "collection.edit.tabs.curate.head": "क्यूरेट",
 
-  "community.delete.confirm": "पुष्टि करें", 
+  "collection.edit.tabs.curate.title": "संग्रह संपादन - क्यूरेट",
 
-  "community.delete.head": "समुदाय हटाएं", 
+  "collection.edit.tabs.item-mapper.title": "संग्रह संपादन - आइटम मैपर",
 
-  "community.delete.notification.fail": "समुदाय हटाया नहीं जा सका", 
+  "collection.edit.tabs.mapper.head": "आइटम मैपर",
 
-  "community.delete.notification.success": "समुदाय को सफलतापूर्वक हटाया गया", 
+  "collection.edit.tabs.metadata.head": "मेटाडेटा संपादित करें",
 
-  "community.delete.processing": "हटाया जा रहा है...", 
+  "collection.edit.tabs.metadata.title": "संग्रह संपादन के लिए मेटाडेटा",
 
-  "community.delete.text": "क्या आप वाकई \"{{dso }}\" समुदाय को हटाना चाहते हैं?", 
+  "collection.edit.tabs.roles.head": "भूमिकाएँ निर्दिष्ट करें",
 
-  "community.edit.breadcrumbs": "समुदाय संपादित करें", 
+  "collection.edit.tabs.roles.title": "संग्रह संपादन - भूमिकाएं",
 
-  "community.edit.delete": "इस समुदाय को हटाएं", 
+  "collection.edit.tabs.source.external": "यह संग्रह अपनी सामग्री को बाहरी स्रोत से एकत्रित करता है",
 
-  "community.edit.head": "समुदाय संपादित करें", 
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "आपको लक्ष्य संग्रह की एक निर्धारित आईडी प्रदान करनी होगी।",
 
-  "community.edit.logo.delete-undo.title": "हटाना पूर्ववत करें", 
+  "collection.edit.tabs.source.form.harvestType": "सामग्री हार्वेस्ट की जा रही है  ",
 
-  "community.edit.logo.delete.title": "चिन्ह हटाएं", 
+  "collection.edit.tabs.source.form.head": "बाहरी स्रोत कॉन्फ़िगर करें",
 
-  "community.edit.logo.label": "समुदाय चिन्ह", 
+  "collection.edit.tabs.source.form.metadataConfigId": "मेटाडेटा प्रारूप",
 
-  "community.edit.logo.notifications.add.error": "समुदाय का लोगो अपलोड करना विफल रहा। कृपया पुनः प्रयास करने से पहले सामग्री को सत्यापित करें।", 
+  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
 
-  "community.edit.logo.notifications.add.success": "समुदाय का चिन्ह अपलोड करना सफल रहा|", 
+  "collection.edit.tabs.source.form.oaiSource": "OAI प्रदाता",
 
-  "community.edit.logo.notifications.delete.error.title": "चिन्ह हटाने में त्रुटि", 
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "हार्वेस्ट मेटाडेटा और बिटस्ट्रीम (ORE समर्थन की आवश्यकता है)",
 
-  "community.edit.logo.notifications.delete.success.content": "समुदाय का चिन्ह सफलतापूर्वक हटा दिया गया", 
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "हार्वेस्ट मेटाडेटा और बिटस्ट्रीम के संदर्भ (ORE समर्थन की आवश्यकता है)",
 
-  "community.edit.logo.notifications.delete.success.title": "चिन्ह हटा दिया गया", 
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "केवल मेटाडेटा प्राप्त करें",
 
-  "community.edit.logo.upload": "अपलोड करने के लिए समुदाय का चिन्ह छोड़ें", 
+  "collection.edit.tabs.source.head": "सामग्री स्रोत",
 
-  "community.edit.notifications.error": "समुदाय संपादित करते समय एक त्रुटि हुई", 
+  "collection.edit.tabs.source.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें",
 
-  "community.edit.notifications.success": "समुदाय को सफलतापूर्वक संपादित किया गया", 
+  "collection.edit.tabs.source.notifications.discarded.title": "परिवर्तन रद्द किये गए",
 
-  "community.edit.notifications.unauthorized": "आपके पास यह परिवर्तन करने के विशेषाधिकार नहीं हैं", 
+  "collection.edit.tabs.source.notifications.invalid.content": "आपके परिवर्तन सहेजे नहीं गए थे। कृपया सुनिश्चित करें कि आपके द्वारा सहेजने से पहले सभी फ़ील्ड मान्य हैं।",
 
-  "community.edit.return": "वापस", 
+  "collection.edit.tabs.source.notifications.invalid.title": "अमान्य मेटाडेटा ",
 
-  "community.edit.tabs.authorizations.head": "अनुज्ञा", 
+  "collection.edit.tabs.source.notifications.saved.content": "इस संग्रह के सामग्री स्रोत में आपके परिवर्तन सहेजे गए थे।",
 
-  "community.edit.tabs.authorizations.title": "समुदाय संपादन - प्राधिकरण", 
+  "collection.edit.tabs.source.notifications.saved.title": "सामग्री स्रोत सहेजा गया",
 
-  "community.edit.tabs.curate.head": "क्यूरेट", 
+  "collection.edit.tabs.source.title": "संग्रह संपादन के लिए सामग्री स्रोत",
 
-  "community.edit.tabs.curate.title": "समुदाय संपादन - क्यूरेट ", 
+  "collection.edit.template.add-button": "जोड़ें",
 
-  "community.edit.tabs.metadata.head": "मेटाडेटा संपादित करें", 
+  "collection.edit.template.breadcrumbs": "टेम्पलेट आइटम",
 
-  "community.edit.tabs.metadata.title": "समुदाय संपादन - मेटाडेटा", 
+  "collection.edit.template.cancel": "रद्द करें",
 
-  "community.edit.tabs.roles.head": "भूमिकाएँ निर्दिष्ट करें", 
+  "collection.edit.template.delete-button": "हटाएं",
 
-  "community.edit.tabs.roles.title": "समुदाय संपादन - भूमिकाएँ ", 
+  "collection.edit.template.edit-button": "संपादित करें",
 
-  "community.form.abstract": "संक्षिप्त वर्णन", 
+  "collection.edit.template.error": "टेम्पलेट आइटम प्राप्त करने में त्रुटि हुई",
 
-  "community.form.description": "परिचयात्मक पाठ (एचटीएमएल)", 
+  "collection.edit.template.head": "संग्रह के लिए टेम्पलेट आइटम संपादित करें \"{{ collection }}\"",
 
-  "community.form.errors.title.required": "कृपया समुदाय का नाम दर्ज करें", 
+  "collection.edit.template.label": "टेम्पलेट आइटम",
 
-  "community.form.rights": "कॉपीराइट टेक्स्ट (एचटीएमएल)", 
+  "collection.edit.template.loading": "टेम्प्लेट आइटम लोड हो रहा है...",
 
-  "community.form.tableofcontents": "समाचार (एचटीएमएल)", 
+  "collection.edit.template.notifications.delete.error": "आइटम टेम्पलेट हटाने में विफल",
 
-  "community.form.title": "नाम", 
+  "collection.edit.template.notifications.delete.success": "आइटम टेम्प्लेट को सफलतापूर्वक हटाया गया",
 
-  "community.listelement.badge": "समुदाय", 
+  "collection.edit.template.title": "आइटम संपादन टेम्पलेट",
 
-  "community.page.edit": "इस समुदाय को संपादित करें", 
+  "collection.form.abstract": "संक्षिप्त वर्णन",
 
-  "community.page.handle": "इस समुदाय के लिए स्थायी यूआरआई (URI)", 
+  "collection.form.description": "परिचयात्मक पाठ (एचटीएमएल)",
 
-  "community.page.license": "अनुज्ञाप‍त्र", 
+  "collection.form.entityType": "इकाई प्रकार",
 
-  "community.page.news": "समाचार", 
+  "collection.form.errors.title.required": "कृपया संग्रह का नाम दर्ज करें ",
 
-  "community.sub-collection-list.head": "इस समुदाय के संग्रह", 
+  "collection.form.license": "अनुज्ञाप‍त्र",
 
-  "community.sub-community-list.head": "इस समुदाय के समुदाय", 
+  "collection.form.provenance": "उत्पत्ति",
 
-  "communityList.breadcrumbs": "समुदाय सूची", 
+  "collection.form.rights": "कॉपीराइट टेक्स्ट (एचटीएमएल)",
 
-  "communityList.showMore": "और दिखाएं", 
+  "collection.form.tableofcontents": "समाचार (एचटीएमएल)",
 
-  "communityList.tabTitle": "समुदाय सूची", 
+  "collection.form.title": "नाम",
 
-  "communityList.title": "समुदायों की सूची", 
+  "collection.listelement.badge": "संग्रह",
 
-  "confirmation-modal.delete-eperson.cancel": "रद्द करें", 
+  "collection.page.browse.recent.empty": "दिखाने के लिए कोई आइटम नहीं",
 
-  "confirmation-modal.delete-eperson.confirm": "हटाएं", 
+  "collection.page.browse.recent.head": "हाल की प्रस्तुतियाँ",
 
-  "confirmation-modal.delete-eperson.header": "\"{{ dsoName }}\" ई-व्यक्ति हटाएं", 
+  "collection.page.edit": "इस संग्रह को संपादित करें",
 
-  "confirmation-modal.delete-eperson.info": "क्या आप वाकई ई-व्यक्ति \"{{dsoName}}\" को हटाना चाहते हैं", 
+  "collection.page.handle": "इस संग्रह के लिए स्थायी यूआरआई (URI)",
 
-  "confirmation-modal.delete-profile.cancel": "रद्द करें", 
+  "collection.page.license": "अनुज्ञाप‍त्र",
 
-  "confirmation-modal.delete-profile.confirm": "हटाएं", 
+  "collection.page.license (Copy)": "अनुज्ञाप‍त्र",
 
-  "confirmation-modal.delete-profile.header": "प्रोफ़ाइल हटाएं", 
+  "collection.page.news": "समाचार",
 
-  "confirmation-modal.delete-profile.info": "क्या आप वाकई अपनी प्रोफ़ाइल हटाना चाहते हैं", 
+  "collection.select.confirm": "चयनित होने की पुष्टि करें",
 
-  "confirmation-modal.export-metadata.cancel": "रद्द करें", 
+  "collection.select.empty": "दिखाने के लिए कोई संग्रह नहीं है",
 
-  "confirmation-modal.export-metadata.confirm": "निर्यात करें", 
+  "collection.select.table.title": "शीर्षक",
 
-  "confirmation-modal.export-metadata.header": "{{ dsoName }} के लिए मेटाडेटा निर्यात करें", 
+  "collection.source.controls.harvest.last": "पिछला हार्वेस्ट:",
 
-  "confirmation-modal.export-metadata.info": "क्या आप वाकई {{ dsoName }} के लिए मेटाडेटा निर्यात करना चाहते हैं", 
+  "collection.source.controls.harvest.message": "Harvest info:",
 
-  "cookies.consent.accept-all": "सभी स्वीकार करें", 
+  "collection.source.controls.harvest.no-information": "लागू नहीं",
 
-  "cookies.consent.accept-selected": "चयनित को स्वीकार करें", 
+  "collection.source.controls.harvest.start": "हार्वेस्ट शुरू होने का समय:",
 
-  "cookies.consent.app.description.acknowledgement": "आपकी पावती और सहमति को सहेजने के लिए आवश्यक", 
+  "collection.source.controls.harvest.status": "हार्वेस्ट स्थिति:",
 
-  "cookies.consent.app.description.authentication": "आपको साइन इन करने के लिए आवश्यक", 
+  "collection.source.controls.head": "हार्वेस्ट नियंत्रण",
 
-  "cookies.consent.app.description.google-analytics": "हमें सांख्यिकीय जानकारी पर नज़र रखने की अनुमति देता है", 
+  "collection.source.controls.import.completed": "आयात पूरा हुआ",
 
-  "cookies.consent.app.description.preferences": "आपकी प्राथमिकताएं सहेजने के लिए आवश्यक", 
+  "collection.source.controls.import.failed": "आयात के दौरान एक त्रुटि हुई",
 
-  "cookies.consent.app.opt-out.description": "यह ऐप डिफ़ॉल्ट रूप से लोड होता है (लेकिन आप ऑप्ट आउट कर सकते हैं)", 
+  "collection.source.controls.import.running": "आयात किया जा रहा है...",
 
-  "cookies.consent.app.opt-out.title": "(बाहर निकलें)", 
+  "collection.source.controls.import.submit": "अभी आयात करें",
 
-  "cookies.consent.app.purpose": "उद्देश्य", 
+  "collection.source.controls.import.submit.error": "आयात शुरू करने में कुछ गलत हुआ",
 
-  "cookies.consent.app.required.description": "यह एप्लिकेशन हमेशा आवश्यक है", 
+  "collection.source.controls.import.submit.success": "आयात सफलतापूर्वक शुरू कर दिया गया है",
 
-  "cookies.consent.app.required.title": "(हमेशा आवश्यक)", 
+  "collection.source.controls.reset.completed": "रीसेट और पुनः आयात पूरा हुआ",
 
-  "cookies.consent.app.title.acknowledgement": "स्वीकृति", 
+  "collection.source.controls.reset.failed": "रीसेट और पुन: आयात के दौरान एक त्रुटि हुई",
 
-  "cookies.consent.app.title.authentication": "प्रमाणीकरण", 
+  "collection.source.controls.reset.running": "रीसेट किया जा रहा है और फिर से आयात किया जा रहा है...",
 
-  "cookies.consent.app.title.google-analytics": "गूगल एनालिटिक्स", 
+  "collection.source.controls.reset.submit": "रीसेट करें और पुनः आयात करें",
 
-  "cookies.consent.app.title.preferences": "प्राथमिकताएं", 
+  "collection.source.controls.reset.submit.error": "रीसेट शुरू करने और पुन: आयात करने में कुछ गलत हुआ",
 
-  "cookies.consent.close": "बंद करें", 
+  "collection.source.controls.reset.submit.success": "रीसेट और पुनः आयात सफलतापूर्वक शुरू किया गया है",
 
-  "cookies.consent.content-modal.description": "यहां आप हमारे द्वारा आपके बारे में एकत्रित की गई जानकारी को देख और अनुकूलित कर सकते हैं।", 
+  "collection.source.controls.test.completed": "सेटिंग्स का परीक्षण करने के लिए स्क्रिप्ट सफलतापूर्वक समाप्त हो गई है",
 
-  "cookies.consent.content-modal.privacy-policy.name": "गोपनीयता नीति", 
+  "collection.source.controls.test.failed": "सेटिंग्स का परीक्षण करने की स्क्रिप्ट विफल हो गई है",
 
-  "cookies.consent.content-modal.privacy-policy.text": "अधिक जानने के लिए, हमारी {privacyPolicy} पढ़ें।", 
+  "collection.source.controls.test.running": "Testing configuration...",
 
-  "cookies.consent.content-modal.title": "जानकारी जो हम एकत्र करते हैं", 
+  "collection.source.controls.test.submit": "परीक्षण विन्यास",
 
-  "cookies.consent.content-notice.description": "हम निम्नलिखित उद्देश्यों के लिए आपकी व्यक्तिगत जानकारी एकत्र और संसाधित करते हैं: <strong>प्रमाणीकरण, प्राथमिकताएं, पावती और सांख्यिकी</strong>। <br/> अधिक जानने के लिए, कृपया हमारी {privacyPolicy} पढ़ें।", 
+  "collection.source.controls.test.submit.error": "सेटिंग्स का परीक्षण शुरू करने में कुछ गलत हुआ",
 
-  "cookies.consent.content-notice.description.no-privacy": "हम निम्नलिखित उद्देश्यों के लिए आपकी व्यक्तिगत जानकारी एकत्र और संसाधित करते हैं: <strong>प्रमाणीकरण, प्राथमिकताएं, पावती और सांख्यिकी</strong>।", 
+  "collection.source.update.notifications.error.content": "प्रदान की गई सेटिंग्स का परीक्षण किया गया है और काम नहीं किया है।",
 
-  "cookies.consent.content-notice.learnMore": "अनुकूलित करें", 
+  "collection.source.update.notifications.error.title": "सर्वर त्रुटि",
 
-  "cookies.consent.decline": "अस्वीकार", 
+  "comcol-role.edit.bitstream_read.anonymous-group": "आने वाली बिटस्ट्रीम के लिए डिफ़ॉल्ट पठन वर्तमान में बेनामी पर सेट है।",
 
-  "cookies.consent.purpose.functional": "कार्यात्मक", 
+  "comcol-role.edit.bitstream_read.description": "सामुदायिक प्रशासक उप-समुदाय या संग्रह बना सकते हैं, और उन उप-समुदायों या संग्रहों के लिए प्रबंधन या प्रबंधन सौंप सकते हैं। इसके अलावा, वे तय करते हैं कि कौन किसी भी उप-संग्रह में आइटम प्रस्तुत कर सकता है, आइटम मेटाडेटा (प्रस्तुति के बाद) संपादित कर सकता है, और अन्य संग्रहों (प्राधिकरण के अधीन) से मौजूदा आइटम जोड़ सकता है (मैप)।",
 
-  "cookies.consent.purpose.statistical": "सांख्यिकीय", 
+  "comcol-role.edit.bitstream_read.name": "डिफ़ॉल्ट बिटस्ट्रीम पठन पहुंच",
 
-  "cookies.consent.update": "आपकी पिछली विज़िट के बाद से परिवर्तन हुए हैं, कृपया अपनी सहमति अपडेट करें।", 
+  "comcol-role.edit.collection-admin.description": "संग्रह व्यवस्थापक यह तय करते हैं कि संग्रह में आइटम कौन प्रस्तुत कर सकता है, आइटम मेटाडेटा संपादित कर सकता है (प्रस्तुति के बाद), और अन्य संग्रह से मौजूदा आइटम को इस संग्रह में जोड़ सकता है (उस संग्रह के लिए प्राधिकरण के अधीन)।",
 
-  "curation-task.task.checklinks.label": "मेटाडेटा में लिंक जांचें", 
+  "comcol-role.edit.collection-admin.name": "व्यवस्थापक",
 
-  "curation-task.task.noop.label": "NOOP", 
+  "comcol-role.edit.community-admin.description": "सामुदायिक प्रशासक उप-समुदाय या संग्रह बना सकते हैं, और उन उप-समुदायों या संग्रहों के लिए प्रबंधन या प्रबंधन नियुक्त कर सकते हैं। इसके अलावा, वे तय करते हैं कि कौन किसी भी उप-संग्रह में आइटम प्रस्तुत कर सकता है, आइटम मेटाडेटा (सबमिशन के बाद) संपादित कर सकता है, और अन्य संग्रहों (प्राधिकरण के अधीन) से मौजूदा आइटम जोड़ सकता है (मैप)।",
 
-  "curation-task.task.profileformats.label": "प्रोफ़ाइल बिटस्ट्रीम प्रारूप", 
+  "comcol-role.edit.community-admin.name": "व्यवस्थापक",
 
-  "curation-task.task.requiredmetadata.label": "आवश्यक मेटाडेटा की जाँच करें", 
+  "comcol-role.edit.create": "बनाएं",
 
-  "curation-task.task.translate.label": "माइक्रोसॉफ्ट अनुवादक", 
+  "comcol-role.edit.create.error.title": "'{{ role }}' भूमिका के लिए समूह बनाने में विफल",
 
-  "curation-task.task.vscan.label": "वायरस जाँच", 
+  "comcol-role.edit.delete": "हटाएं",
 
-  "curation.form.handle.hint": "संकेत: पूरी साइट पर कार्य चलाने के लिए [your-handle-prefix]/0 दर्ज करें (सभी कार्य इस क्षमता का समर्थन नहीं करते हैं)", 
+  "comcol-role.edit.delete.error.title": "'{{ role }}' भूमिका के समूह को हटाने में विफल",
 
-  "curation.form.handle.label": "हैंडल:", 
+  "comcol-role.edit.editor.description": "संपादक आने वाले प्रस्तुतियों के मेटाडेटा को संपादित करने में सक्षम हैं, और फिर उन्हें स्वीकार या अस्वीकार कर सकते हैं।",
 
-  "curation.form.submit": "शुरू करें", 
+  "comcol-role.edit.editor.name": "संपादक",
 
-  "curation.form.submit.error.content": "क्यूरेशन कार्य प्रारंभ करने का प्रयास करते समय कोई त्रुटि उत्पन्न हुई।", 
+  "comcol-role.edit.finaleditor.description": "अंतिम संपादक आने वाले प्रस्तुति के मेटाडेटा को संपादित करने में सक्षम हैं, लेकिन उन्हें अस्वीकार नहीं कर पाएंगे।",
 
-  "curation.form.submit.error.head": "क्यूरेशन टास्क चलाना विफल रहा", 
+  "comcol-role.edit.finaleditor.name": "अंतिम संपादक",
 
-  "curation.form.submit.error.invalid-handle": "इस ऑब्जेक्ट के लिए हैंडल निर्धारित नहीं किया जा सका", 
+  "comcol-role.edit.item_read.anonymous-group": "आने वाली वस्तुओं के लिए मानक पठन वर्तमान में बेनामी पर सेट है।",
 
-  "curation.form.submit.success.content": "आपको संबंधित प्रक्रिया पृष्ठ पर पुनः निर्देशित किया जाएगा।", 
+  "comcol-role.edit.item_read.description": "ई-लोग और समूह जो इस संग्रह में प्रस्तुत किए गए नए आइटम पढ़ सकते हैं। इस भूमिका में परिवर्तन पूर्वव्यापी नहीं हैं। सिस्टम में मौजूदा आइटम अभी भी उन लोगों द्वारा देखे जा सकेंगे जिनके पास जोड़ने के समय पढ़ने की पहुंच थी।",
 
-  "curation.form.submit.success.head": "क्यूरेशन कार्य सफलतापूर्वक शुरू किया गया है", 
+  "comcol-role.edit.item_read.name": "डिफ़ॉल्ट आइटम पढ़ने की अनुमति",
 
-  "curation.form.task-select.label": "कार्य:", 
+  "comcol-role.edit.no-group": "कोई भी नहीं",
 
-  "default-relationships.search.results.head": "खोज के परिणाम", 
+  "comcol-role.edit.restrict": "प्रतिबंधित करें",
 
-  "default.search.results.head": "खोज के परिणाम", 
+  "comcol-role.edit.reviewer.description": "समीक्षक आने वाली प्रस्तुतियाँ स्वीकार या अस्वीकार करने में सक्षम हैं। हालांकि, वे प्रस्तुति के मेटाडेटा को संपादित करने में सक्षम नहीं हैं।",
 
-  "deny-request-copy.email.message": "प्रिय {{ recipientName }}, \nआपके अनुरोध के प्रत्युत्तर में मुझे आपको यह बताते हुए खेद हो रहा है कि आपके द्वारा अनुरोधित फ़ाइल (फ़ाइलों) की एक प्रति, दस्तावेज़ के संबंध में भेजना संभव नहीं है: \"{{itemUrl }}\" ({{itemName }}), जिनमें से मैं एक लेखक हूँ।\n\nसाभार, \n{{ authorName }} <{{ authorEmail }}>", 
+  "comcol-role.edit.reviewer.name": "समीक्षक",
 
-  "deny-request-copy.email.subject": "दस्तावेज़ की प्रति का अनुरोध करें", 
+  "comcol-role.edit.submitters.description": "ई-व्यक्ति और समूह जिनके पास इस संग्रह में नए आइटम जमा करने की अनुमति है।",
 
-  "deny-request-copy.error": "त्रुटि पाई गई", 
+  "comcol-role.edit.submitters.name": "प्रस्तुतकर्ता",
 
-  "deny-request-copy.header": "दस्तावेज़ की प्रतिलिपि अनुरोध अस्वीकार करें", 
+  "community.all-lists.head": "उपसमुदाय और संग्रह",
 
-  "deny-request-copy.intro": "यह संदेश अनुरोध के आवेदक को भेजा जाएगा", 
+  "community.create.head": "समुदाय बनाएं",
 
-  "deny-request-copy.success": "आइटम अनुरोध को सफलतापूर्वक अस्वीकार कर दिया गया", 
+  "community.create.notifications.success": "समुदाय सफलतापूर्वक बनाया गया",
 
-  "dso-selector.claim.item.body": "ये मौजूदा प्रोफ़ाइल हैं जो आपसे संबंधित हो सकती हैं। यदि आप इनमें से किसी एक प्रोफाइल में खुद को पहचानते हैं, तो इसे चुनें और विवरण पृष्ठ पर, विकल्पों में से, इसका दावा करना चुनें। अन्यथा आप नीचे दिए गए बटन का उपयोग करके नए सिरे से एक नई प्रोफ़ाइल बना सकते हैं।", 
+  "community.create.sub-head": "{{parent }} समुदाय के लिए एक उप-समुदाय बनाएं",
 
-  "dso-selector.claim.item.create-from-scratch": "नया बनाएँ", 
+  "community.curate.header": "क्यूरेट समुदाय: {{community}}",
 
-  "dso-selector.claim.item.head": "प्रोफाइल टिप्स", 
+  "community.delete.cancel": "रद्द करें",
 
-  "dso-selector.claim.item.not-mine-label": "इनमें से कोई भी मेरा नहीं है", 
+  "community.delete.confirm": "पुष्टि करें",
 
-  "dso-selector.create.collection.head": "नया संग्रह", 
+  "community.delete.head": "समुदाय हटाएं",
 
-  "dso-selector.create.collection.sub-level": "में नया संग्रह बनाएं", 
+  "community.delete.notification.fail": "समुदाय हटाया नहीं जा सका",
 
-  "dso-selector.create.community.head": "नया समुदाय", 
+  "community.delete.notification.success": "समुदाय को सफलतापूर्वक हटाया गया",
 
-  "dso-selector.create.community.sub-level": "में नया समुदाय बनाएं", 
+  "community.delete.processing": "हटाया जा रहा है...",
 
-  "dso-selector.create.community.top-level": "नया शीर्ष-स्तरीय समुदाय बनाएं", 
+  "community.delete.text": "क्या आप वाकई \"{{dso }}\" समुदाय को हटाना चाहते हैं?",
 
-  "dso-selector.create.item.head": "नया आइटम", 
+  "community.edit.breadcrumbs": "समुदाय संपादित करें",
 
-  "dso-selector.create.item.sub-level": "में नया आइटम बनाएं", 
+  "community.edit.delete": "इस समुदाय को हटाएं",
 
-  "dso-selector.create.submission.head": "नवीन प्रस्तुतीकरण", 
+  "community.edit.head": "समुदाय संपादित करें",
 
-  "dso-selector.edit.collection.head": "संग्रह संपादित करें", 
+  "community.edit.logo.delete-undo.title": "हटाना पूर्ववत करें",
 
-  "dso-selector.edit.community.head": "समुदाय संपादित करें", 
+  "community.edit.logo.delete.title": "चिन्ह हटाएं",
 
-  "dso-selector.edit.item.head": "आइटम संपादित करें", 
+  "community.edit.logo.label": "समुदाय चिन्ह",
 
-  "dso-selector.error.title": "{{type }} खोजने में त्रुटि हुई", 
+  "community.edit.logo.notifications.add.error": "समुदाय का लोगो अपलोड करना विफल रहा। कृपया पुनः प्रयास करने से पहले सामग्री को सत्यापित करें।",
 
-  "dso-selector.export-metadata.dspaceobject.head": "से मेटाडेटा निर्यात करें", 
+  "community.edit.logo.notifications.add.success": "समुदाय का चिन्ह अपलोड करना सफल रहा|",
 
-  "dso-selector.no-results": "{{ type }} नहीं मिला", 
+  "community.edit.logo.notifications.delete.error.title": "चिन्ह हटाने में त्रुटि",
 
-  "dso-selector.placeholder": "{{ type }} खोजें", 
+  "community.edit.logo.notifications.delete.success.content": "समुदाय का चिन्ह सफलतापूर्वक हटा दिया गया",
 
-  "dso-selector.select.collection.head": "संग्रह का चयन करें", 
+  "community.edit.logo.notifications.delete.success.title": "चिन्ह हटा दिया गया",
 
-  "dso-selector.set-scope.community.button": "संपूर्ण डीस्पेस में खोजें ", 
+  "community.edit.logo.upload": "अपलोड करने के लिए समुदाय का चिन्ह छोड़ें",
 
-  "dso-selector.set-scope.community.head": "खोज का दायरा चुनें", 
+  "community.edit.notifications.error": "समुदाय संपादित करते समय एक त्रुटि हुई",
 
-  "dso-selector.set-scope.community.input-header": "समुदाय या संग्रह के लिए खोजें", 
+  "community.edit.notifications.success": "समुदाय को सफलतापूर्वक संपादित किया गया",
 
-  "dso.name.untitled": "शीर्षकहीन", 
+  "community.edit.notifications.unauthorized": "आपके पास यह परिवर्तन करने के विशेषाधिकार नहीं हैं",
 
-  "error-page.description.401": "अनधिकृत", 
+  "community.edit.return": "वापस",
 
-  "error-page.description.403": "अनधिकृत", 
+  "community.edit.tabs.authorizations.head": "अनुज्ञा",
 
-  "error-page.description.404": "पृष्ठ नहीं मिला", 
+  "community.edit.tabs.authorizations.title": "समुदाय संपादन - प्राधिकरण",
 
-  "error-page.description.500": "सेवा उप्लब्ध् नहीं है", 
+  "community.edit.tabs.curate.head": "क्यूरेट",
 
-  "error-page.orcid.generic-error": "ORCID के माध्यम से लॉगिन के दौरान एक त्रुटि हुई। सुनिश्चित करें कि आपने अपना ORCID खाता ईमेल पता डीस्पेस के साथ साझा किया है। यदि त्रुटि बनी रहती है, तो व्यवस्थापक से संपर्क करें", 
+  "community.edit.tabs.curate.title": "समुदाय संपादन - क्यूरेट ",
 
-  "error.bitstream": "बिटस्ट्रीम लाने में त्रुटि", 
+  "community.edit.tabs.metadata.head": "मेटाडेटा संपादित करें",
 
-  "error.browse-by": "आइटम लाने में त्रुटि", 
+  "community.edit.tabs.metadata.title": "समुदाय संपादन - मेटाडेटा",
 
-  "error.collection": "संग्रह लाने में त्रुटि", 
+  "community.edit.tabs.roles.head": "भूमिकाएँ निर्दिष्ट करें",
 
-  "error.collections": "संग्रह लाने में त्रुटि", 
+  "community.edit.tabs.roles.title": "समुदाय संपादन - भूमिकाएँ ",
 
-  "error.community": "समुदाय लाने में त्रुटि", 
+  "community.form.abstract": "संक्षिप्त वर्णन",
 
-  "error.default": "त्रुटि", 
+  "community.form.description": "परिचयात्मक पाठ (एचटीएमएल)",
 
-  "error.identifier": "पहचानकर्ता के लिए कोई आइटम नहीं मिला", 
+  "community.form.errors.title.required": "कृपया समुदाय का नाम दर्ज करें",
 
-  "error.invalid-search-query": "खोज क्वेरी मान्य नहीं है. कृपया इस त्रुटि के बारे में अधिक जानकारी के लिए <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> सर्वोत्तम अभ्यास देखें .", 
+  "community.form.rights": "कॉपीराइट टेक्स्ट (एचटीएमएल)",
 
-  "error.item": "आइटम लाने में त्रुटि", 
+  "community.form.tableofcontents": "समाचार (एचटीएमएल)",
 
-  "error.items": "आइटम लाने में त्रुटि", 
+  "community.form.title": "नाम",
 
-  "error.objects": "मदो को लाने में त्रुटि", 
+  "community.listelement.badge": "समुदाय",
 
-  "error.recent-submissions": "हाल ही की प्रस्तुतियां लाने में त्रुटि", 
+  "community.page.edit": "इस समुदाय को संपादित करें",
 
-  "error.search-results": "खोज परिणाम लाने में त्रुटि", 
+  "community.page.handle": "इस समुदाय के लिए स्थायी यूआरआई (URI)",
 
-  "error.sub-collections": "उप-संग्रह लाने में त्रुटि", 
+  "community.page.license": "अनुज्ञाप‍त्र",
 
-  "error.sub-communities": "उप-समुदाय लाने में त्रुटि", 
+  "community.page.news": "समाचार",
 
-  "error.submission.sections.init-form-error": "अनुभाग आरंभीकरण के दौरान त्रुटि हुई, कृपया अपने निविष्ट-फॉर्म विन्यास की जाँच करें। विवरण नीचे हैं: <br> <br>  ", 
+  "community.sub-collection-list.head": "इस समुदाय के संग्रह",
 
-  "error.top-level-communities": "शीर्ष-स्तरीय समुदायों को लाने में त्रुटि", 
+  "community.sub-community-list.head": "इस समुदाय के समुदाय",
 
-  "error.validation.emailTaken": "यह ई - मेल पहले ही लिया जा चुका हैं", 
+  "communityList.breadcrumbs": "समुदाय सूची",
 
-  "error.validation.filerequired": "फ़ाइल अपलोड अनिवार्य है", 
+  "communityList.showMore": "और दिखाएं",
 
-  "error.validation.groupExists": "यह समूह पहले से मौजूद है", 
+  "communityList.tabTitle": "समुदाय सूची",
 
-  "error.validation.license.notgranted": "अपना प्रस्तुतीकरण पूरा करने के लिए आपको यह अनुज्ञापत्र देना होगा। यदि आप इस समय यह अनुज्ञापत्र देने में असमर्थ हैं तो आप अपना काम सहेज सकते हैं और बाद में वापस आ सकते हैं या प्रस्तुतीकरण हटा सकते हैं।", 
+  "communityList.title": "समुदायों की सूची",
 
-  "error.validation.NotValidEmail": "यह ई-मेल वैध ईमेल नहीं है", 
+  "confirmation-modal.delete-eperson.cancel": "रद्द करें",
 
-  "error.validation.pattern": "यह इनपुट वर्तमान ढांचे द्वारा प्रतिबंधित है: {{ pattern }}.", 
+  "confirmation-modal.delete-eperson.confirm": "हटाएं",
 
-  "error.validation.required": "यह फ़ील्ड आवश्यक है", 
+  "confirmation-modal.delete-eperson.header": "\"{{ dsoName }}\" ई-व्यक्ति हटाएं",
 
-  "feed.description": "सिंडिकेशन फ़ीड", 
+  "confirmation-modal.delete-eperson.info": "क्या आप वाकई ई-व्यक्ति \"{{dsoName}}\" को हटाना चाहते हैं",
 
-  "file-section.error.header": "इस मद के लिए फ़ाइलें प्राप्त करने में त्रुटि", 
+  "confirmation-modal.delete-profile.cancel": "रद्द करें",
 
-  "footer.copyright": "कॉपीराइट © 2002-{{ year }}", 
+  "confirmation-modal.delete-profile.confirm": "हटाएं",
 
-  "footer.link.cookies": "कुकी सेटिंग", 
+  "confirmation-modal.delete-profile.header": "प्रोफ़ाइल हटाएं",
 
-  "footer.link.dspace": "डीस्पेस सॉफ्टवेयर", 
+  "confirmation-modal.delete-profile.info": "क्या आप वाकई अपनी प्रोफ़ाइल हटाना चाहते हैं",
 
-  "footer.link.end-user-agreement": "अंतिम उपयोगकर्ता समझौता", 
+  "confirmation-modal.export-metadata.cancel": "रद्द करें",
 
-  "footer.link.feedback": "प्रतिक्रिया भेजें", 
+  "confirmation-modal.export-metadata.confirm": "निर्यात करें",
 
-  "footer.link.lyrasis": "लाइरासिस", 
+  "confirmation-modal.export-metadata.header": "{{ dsoName }} के लिए मेटाडेटा निर्यात करें",
 
-  "footer.link.privacy-policy": "गोपनीयता नीति", 
+  "confirmation-modal.export-metadata.info": "क्या आप वाकई {{ dsoName }} के लिए मेटाडेटा निर्यात करना चाहते हैं",
 
-  "forgot-email.form.email": "ईमेल पता *", 
+  "cookies.consent.accept-all": "सभी स्वीकार करें",
 
-  "forgot-email.form.email.error.pattern": "कृपया एक मान्य ईमेल पता भरें", 
+  "cookies.consent.accept-selected": "चयनित को स्वीकार करें",
 
-  "forgot-email.form.email.error.required": "कृपया ईमेल पता भरें", 
+  "cookies.consent.app.description.acknowledgement": "आपकी पावती और सहमति को सहेजने के लिए आवश्यक",
 
-  "forgot-email.form.email.hint": "आगे के निर्देशों के साथ इस पते पर एक ईमेल भेजा जाएगा।", 
+  "cookies.consent.app.description.authentication": "आपको साइन इन करने के लिए आवश्यक",
 
-  "forgot-email.form.error.content": "निम्नलिखित ईमेल पते से जुड़े खाते के लिए पासवर्ड रीसेट करने का प्रयास करते समय एक त्रुटि हुई: {{ email }}", 
+  "cookies.consent.app.description.google-analytics": "हमें सांख्यिकीय जानकारी पर नज़र रखने की अनुमति देता है",
 
-  "forgot-email.form.error.head": "पासवर्ड रीसेट करने का प्रयास करते समय त्रुटि", 
+  "cookies.consent.app.description.preferences": "आपकी प्राथमिकताएं सहेजने के लिए आवश्यक",
 
-  "forgot-email.form.header": "पासवर्ड भूल गए", 
+  "cookies.consent.app.opt-out.description": "यह ऐप डिफ़ॉल्ट रूप से लोड होता है (लेकिन आप ऑप्ट आउट कर सकते हैं)",
 
-  "forgot-email.form.info": "खाते से संबद्ध ईमेल पता दर्ज करें।", 
+  "cookies.consent.app.opt-out.title": "(बाहर निकलें)",
 
-  "forgot-email.form.submit": "पासवर्ड रीसेट", 
+  "cookies.consent.app.purpose": "उद्देश्य",
 
-  "forgot-email.form.success.content": "{{email}} को एक विशेष यूआरएल और अन्य निर्देशों के साथ एक ईमेल भेजा गया है।", 
+  "cookies.consent.app.required.description": "यह एप्लिकेशन हमेशा आवश्यक है",
 
-  "forgot-email.form.success.head": "पासवर्ड रीसेट ईमेल भेजा गया", 
+  "cookies.consent.app.required.title": "(हमेशा आवश्यक)",
 
-  "forgot-password.form.card.security": "सुरक्षा", 
+  "cookies.consent.app.title.acknowledgement": "स्वीकृति",
 
-  "forgot-password.form.error.empty-password": "कृपया नीचे दिए गए बॉक्स में पासवर्ड दर्ज करें।", 
+  "cookies.consent.app.title.authentication": "प्रमाणीकरण",
 
-  "forgot-password.form.error.matching-passwords": "पासवर्ड एक - दूसरे से मिलते - जुलते नहीं हैं।", 
+  "cookies.consent.app.title.google-analytics": "गूगल एनालिटिक्स",
 
-  "forgot-password.form.error.password-length": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।", 
+  "cookies.consent.app.title.preferences": "प्राथमिकताएं",
 
-  "forgot-password.form.head": "पासवर्ड भूल गए", 
+  "cookies.consent.close": "बंद करें",
 
-  "forgot-password.form.identification.email": "ईमेल पता:", 
+  "cookies.consent.content-modal.description": "यहां आप हमारे द्वारा आपके बारे में एकत्रित की गई जानकारी को देख और अनुकूलित कर सकते हैं।",
 
-  "forgot-password.form.identification.header": "पहचान", 
+  "cookies.consent.content-modal.privacy-policy.name": "गोपनीयता नीति",
 
-  "forgot-password.form.info": "नीचे दिए गए बॉक्स में एक नया पासवर्ड दर्ज करें, और दूसरे बॉक्स में फिर से टाइप करके इसकी पुष्टि करें। यह कम से कम छह वर्ण लंबा होना चाहिए।", 
+  "cookies.consent.content-modal.privacy-policy.text": "अधिक जानने के लिए, हमारी {privacyPolicy} पढ़ें।",
 
-  "forgot-password.form.label.password": "पासवर्ड", 
+  "cookies.consent.content-modal.title": "जानकारी जो हम एकत्र करते हैं",
 
-  "forgot-password.form.label.passwordrepeat": "पुष्टि करने के लिए फिर से लिखें", 
+  "cookies.consent.content-notice.description": "हम निम्नलिखित उद्देश्यों के लिए आपकी व्यक्तिगत जानकारी एकत्र और संसाधित करते हैं: <strong>प्रमाणीकरण, प्राथमिकताएं, पावती और सांख्यिकी</strong>। <br/> अधिक जानने के लिए, कृपया हमारी {privacyPolicy} पढ़ें।",
 
-  "forgot-password.form.notification.error.title": "नया पासवर्ड सबमिट करने का प्रयास करते समय त्रुटि", 
+  "cookies.consent.content-notice.description.no-privacy": "हम निम्नलिखित उद्देश्यों के लिए आपकी व्यक्तिगत जानकारी एकत्र और संसाधित करते हैं: <strong>प्रमाणीकरण, प्राथमिकताएं, पावती और सांख्यिकी</strong>।",
 
-  "forgot-password.form.notification.success.content": "पासवर्ड रीसेट सफल रहा। आपको बनाए गए उपयोगकर्ता के रूप में लॉग इन किया गया है।", 
+  "cookies.consent.content-notice.learnMore": "अनुकूलित करें",
 
-  "forgot-password.form.notification.success.title": "पासवर्ड रीसेट पूरा हुआ", 
+  "cookies.consent.decline": "अस्वीकार",
 
-  "forgot-password.form.submit": "पासवर्ड सबमिट करें", 
+  "cookies.consent.purpose.functional": "कार्यात्मक",
 
-  "forgot-password.title": "पासवर्ड भूल गए", 
+  "cookies.consent.purpose.statistical": "सांख्यिकीय",
 
-  "form.add": "और जोड़ें", 
+  "cookies.consent.update": "आपकी पिछली विज़िट के बाद से परिवर्तन हुए हैं, कृपया अपनी सहमति अपडेट करें।",
 
-  "form.add-help": "वर्तमान प्रविष्टि जोड़ने और दूसरी प्रविष्टि जोड़ने के लिए यहां क्लिक करें", 
+  "curation-task.task.checklinks.label": "मेटाडेटा में लिंक जांचें",
 
-  "form.cancel": "रद्द करें", 
+  "curation-task.task.noop.label": "NOOP",
 
-  "form.clear": "साफ़ करें", 
+  "curation-task.task.profileformats.label": "प्रोफ़ाइल बिटस्ट्रीम प्रारूप",
 
-  "form.clear-help": "चयनित मान को हटाने के लिए यहां क्लिक करें", 
+  "curation-task.task.requiredmetadata.label": "आवश्यक मेटाडेटा की जाँच करें",
 
-  "form.discard": "खारिज करें", 
+  "curation-task.task.translate.label": "माइक्रोसॉफ्ट अनुवादक",
 
-  "form.drag": "खींचें (Drag)", 
+  "curation-task.task.vscan.label": "वायरस जाँच",
 
-  "form.edit": "संपादित करें", 
+  "curation.form.handle.hint": "संकेत: पूरी साइट पर कार्य चलाने के लिए [your-handle-prefix]/0 दर्ज करें (सभी कार्य इस क्षमता का समर्थन नहीं करते हैं)",
 
-  "form.edit-help": "चयनित मान संपादित करने के लिए यहां क्लिक करें", 
+  "curation.form.handle.label": "हैंडल:",
 
-  "form.first-name": "प्रथम नाम", 
+  "curation.form.submit": "शुरू करें",
 
-  "form.group-collapse": "संक्षिप्त करें", 
+  "curation.form.submit.error.content": "क्यूरेशन कार्य प्रारंभ करने का प्रयास करते समय कोई त्रुटि उत्पन्न हुई।",
 
-  "form.group-collapse-help": "संक्षिप्त करने के लिए यहां क्लिक करें", 
+  "curation.form.submit.error.head": "क्यूरेशन टास्क चलाना विफल रहा",
 
-  "form.group-expand": "विस्तृत करें", 
+  "curation.form.submit.error.invalid-handle": "इस ऑब्जेक्ट के लिए हैंडल निर्धारित नहीं किया जा सका",
 
-  "form.group-expand-help": "विस्तार करने और अधिक तत्व जोड़ने के लिए यहां क्लिक करें", 
+  "curation.form.submit.success.content": "आपको संबंधित प्रक्रिया पृष्ठ पर पुनः निर्देशित किया जाएगा।",
 
-  "form.last-name": "उपनाम", 
+  "curation.form.submit.success.head": "क्यूरेशन कार्य सफलतापूर्वक शुरू किया गया है",
 
-  "form.loading": "लोड हो रहा है...", 
+  "curation.form.task-select.label": "कार्य:",
 
-  "form.lookup": "देखो", 
+  "default-relationships.search.results.head": "खोज के परिणाम",
 
-  "form.lookup-help": "मौजूदा संबंध देखने के लिए यहां क्लिक करें", 
+  "default.search.results.head": "खोज के परिणाम",
 
-  "form.no-results": "कोई परिणाम नहीं मिला", 
+  "deny-request-copy.email.message": "प्रिय {{ recipientName }}, \nआपके अनुरोध के प्रत्युत्तर में मुझे आपको यह बताते हुए खेद हो रहा है कि आपके द्वारा अनुरोधित फ़ाइल (फ़ाइलों) की एक प्रति, दस्तावेज़ के संबंध में भेजना संभव नहीं है: \"{{itemUrl }}\" ({{itemName }}), जिनमें से मैं एक लेखक हूँ।\n\nसाभार, \n{{ authorName }} <{{ authorEmail }}>",
 
-  "form.no-value": "कोई मान दर्ज नहीं किया गया", 
+  "deny-request-copy.email.subject": "दस्तावेज़ की प्रति का अनुरोध करें",
 
-  "form.remove": "हटाएं", 
+  "deny-request-copy.error": "त्रुटि पाई गई",
 
-  "form.repeatable.sort.tip": "आइटम को नई स्थिति में छोड़ें", 
+  "deny-request-copy.header": "दस्तावेज़ की प्रतिलिपि अनुरोध अस्वीकार करें",
 
-  "form.save": "सहेजें", 
+  "deny-request-copy.intro": "यह संदेश अनुरोध के आवेदक को भेजा जाएगा",
 
-  "form.save-help": "परिवर्तन सहेजें", 
+  "deny-request-copy.success": "आइटम अनुरोध को सफलतापूर्वक अस्वीकार कर दिया गया",
 
-  "form.search": "खोजें", 
+  "dso-selector.claim.item.body": "ये मौजूदा प्रोफ़ाइल हैं जो आपसे संबंधित हो सकती हैं। यदि आप इनमें से किसी एक प्रोफाइल में खुद को पहचानते हैं, तो इसे चुनें और विवरण पृष्ठ पर, विकल्पों में से, इसका दावा करना चुनें। अन्यथा आप नीचे दिए गए बटन का उपयोग करके नए सिरे से एक नई प्रोफ़ाइल बना सकते हैं।",
 
-  "form.search-help": "मौजूदा पत्राचार देखने के लिए यहां क्लिक करें", 
+  "dso-selector.claim.item.create-from-scratch": "नया बनाएँ",
 
-  "form.submit": "सहेजें", 
+  "dso-selector.claim.item.head": "प्रोफाइल टिप्स",
 
-  "general.back": "वापस", 
+  "dso-selector.claim.item.not-mine-label": "इनमें से कोई भी मेरा नहीं है",
 
-  "general.cancel": "रद्द करें", 
+  "dso-selector.create.collection.head": "नया संग्रह",
 
-  "general.confirm": "क्या आपको यकीन है?", 
+  "dso-selector.create.collection.sub-level": "में नया संग्रह बनाएं",
 
-  "general.destroy": "हटाएं", 
+  "dso-selector.create.community.head": "नया समुदाय",
 
-  "general.edit": "संपादित करें", 
+  "dso-selector.create.community.sub-level": "में नया समुदाय बनाएं",
 
-  "general.new": "नया", 
+  "dso-selector.create.community.top-level": "नया शीर्ष-स्तरीय समुदाय बनाएं",
 
-  "grant-deny-request-copy.deny": "कॉपी न भेजें", 
+  "dso-selector.create.item.head": "नया आइटम",
 
-  "grant-deny-request-copy.email.back": "वापस", 
+  "dso-selector.create.item.sub-level": "में नया आइटम बनाएं",
 
-  "grant-deny-request-copy.email.message": "संदेश", 
+  "dso-selector.create.submission.head": "नवीन प्रस्तुतीकरण",
 
-  "grant-deny-request-copy.email.message.empty": "कृपया संदेश दर्ज करें", 
+  "dso-selector.edit.collection.head": "संग्रह संपादित करें",
 
-  "grant-deny-request-copy.email.permissions.info": "इन अनुरोधों का जवाब देने से बचने के लिए आप इस अवसर का उपयोग दस्तावेज़ पर पहुंच प्रतिबंधों पर पुनर्विचार करने के लिए कर सकते हैं। यदि आप रिपॉजिटरी व्यवस्थापकों से इन प्रतिबंधों को हटाने के लिए कहना चाहते हैं, तो कृपया नीचे दिए गए बॉक्स को चेक करें।", 
+  "dso-selector.edit.community.head": "समुदाय संपादित करें",
 
-  "grant-deny-request-copy.email.permissions.label": "ओपन एक्सेस में बदलें", 
+  "dso-selector.edit.item.head": "आइटम संपादित करें",
 
-  "grant-deny-request-copy.email.send": "भेजें", 
+  "dso-selector.error.title": "{{type }} खोजने में त्रुटि हुई",
 
-  "grant-deny-request-copy.email.subject": "विषय", 
+  "dso-selector.export-metadata.dspaceobject.head": "से मेटाडेटा निर्यात करें",
 
-  "grant-deny-request-copy.email.subject.empty": "कृपया एक विषय दर्ज करें", 
+  "dso-selector.no-results": "{{ type }} नहीं मिला",
 
-  "grant-deny-request-copy.grant": "प्रतिलिपि भेजें", 
+  "dso-selector.placeholder": "{{ type }} खोजें",
 
-  "grant-deny-request-copy.header": "दस्तावेज़ की प्रतिलिपि अनुरोध", 
+  "dso-selector.select.collection.head": "संग्रह का चयन करें",
 
-  "grant-deny-request-copy.home-page": "मुझे होम पेज पर ले जाएं", 
+  "dso-selector.set-scope.community.button": "संपूर्ण डीस्पेस में खोजें ",
 
-  "grant-deny-request-copy.intro1": "यदि आप <a href='{{ url }}'>{{ name }}</a> दस्तावेज़ के लेखकों में से एक हैं, तो कृपया उपयोगकर्ता के अनुरोध का जवाब देने के लिए नीचे दिए गए विकल्पों में से किसी एक का उपयोग करें।", 
+  "dso-selector.set-scope.community.head": "खोज का दायरा चुनें",
 
-  "grant-deny-request-copy.intro2": "एक विकल्प चुनने के बाद, आपको एक सुझाया गया ईमेल उत्तर प्रस्तुत किया जाएगा जिसे आप संपादित कर सकते हैं।", 
+  "dso-selector.set-scope.community.input-header": "समुदाय या संग्रह के लिए खोजें",
 
-  "grant-deny-request-copy.processed": "यह अनुरोध पहले ही संसाधित किया जा चुका है। होम पृष्ठ पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।", 
+  "dso.name.untitled": "शीर्षकहीन",
 
-  "grant-request-copy.email.message": "प्रिय {{ recipientName }}, \nआपके अनुरोध के प्रत्युत्तर में मुझे आपको \"{{ itemUrl }}\" ({{itemName }}) दस्तावेज़ से संबंधित फ़ाइल(ो), जिसका मैं एक लेखक हूं, की प्रति संलग्न करते हुए प्रसन्नता हो रही है।\n\nसाभार, \n{{ authorName }} <{{ authorEmail }}>", 
+  "error-page.description.401": "अनधिकृत",
 
-  "grant-request-copy.email.subject": "दस्तावेज़ की प्रति का अनुरोध करें", 
+  "error-page.description.403": "अनधिकृत",
 
-  "grant-request-copy.error": "एक त्रुटि हुई", 
+  "error-page.description.404": "पृष्ठ नहीं मिला",
 
-  "grant-request-copy.header": "दस्तावेज़ कॉपी अनुरोध प्रदान करें", 
+  "error-page.description.500": "सेवा उप्लब्ध् नहीं है",
 
-  "grant-request-copy.intro": "यह संदेश अनुरोध के आवेदक को भेजा जाएगा। अनुरोधित दस्तावेज संलग्न किए जाएंगे।", 
+  "error-page.orcid.generic-error": "ORCID के माध्यम से लॉगिन के दौरान एक त्रुटि हुई। सुनिश्चित करें कि आपने अपना ORCID खाता ईमेल पता डीस्पेस के साथ साझा किया है। यदि त्रुटि बनी रहती है, तो व्यवस्थापक से संपर्क करें",
 
-  "grant-request-copy.success": "आइटम अनुरोध सफलतापूर्वक स्वीकृत किया गया", 
+  "error.bitstream": "बिटस्ट्रीम लाने में त्रुटि",
 
-  "health-page.error.msg": "स्वास्थ्य जांच सेवा अस्थायी रूप से अनुपलब्ध है", 
+  "error.browse-by": "आइटम लाने में त्रुटि",
 
-  "health-page.heading": "स्वास्थ्य", 
+  "error.collection": "संग्रह लाने में त्रुटि",
 
-  "health-page.info-tab": "जानकारी", 
+  "error.collections": "संग्रह लाने में त्रुटि",
 
-  "health-page.property.status": "स्थिति कोड", 
+  "error.community": "समुदाय लाने में त्रुटि",
 
-  "health-page.section-info.app.title": "सॉफ्टवेयर बैकएंड", 
+  "error.default": "त्रुटि",
 
-  "health-page.section-info.java.title": "जावा", 
+  "error.identifier": "पहचानकर्ता के लिए कोई आइटम नहीं मिला",
 
-  "health-page.section.db.title": "डेटाबेस", 
+  "error.invalid-search-query": "खोज क्वेरी मान्य नहीं है. कृपया इस त्रुटि के बारे में अधिक जानकारी के लिए <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> सर्वोत्तम अभ्यास देखें .",
 
-  "health-page.section.geoIp.title": "जियोआईपी (GeoIp)", 
+  "error.item": "आइटम लाने में त्रुटि",
 
-  "health-page.section.no-issues": "कोई समस्या नहीं मिली", 
+  "error.items": "आइटम लाने में त्रुटि",
 
-  "health-page.section.solrAuthorityCore.title": "Sor: प्राधिकरण कोर", 
+  "error.objects": "मदो को लाने में त्रुटि",
 
-  "health-page.section.solrOaiCore.title": "Sor: oai कोर", 
+  "error.recent-submissions": "हाल ही की प्रस्तुतियां लाने में त्रुटि",
 
-  "health-page.section.solrSearchCore.title": "Sor: मूल खोज", 
+  "error.search-results": "खोज परिणाम लाने में त्रुटि",
 
-  "health-page.section.solrStatisticsCore.title": "Sor: सांख्यिकी कोर", 
+  "error.sub-collections": "उप-संग्रह लाने में त्रुटि",
 
-  "health-page.status": "स्थिति", 
+  "error.sub-communities": "उप-समुदाय लाने में त्रुटि",
 
-  "health-page.status-tab": "स्थिति", 
+  "error.submission.sections.init-form-error": "अनुभाग आरंभीकरण के दौरान त्रुटि हुई, कृपया अपने निविष्ट-फॉर्म विन्यास की जाँच करें। विवरण नीचे हैं: <br> <br>  ",
 
-  "health-page.status.error.info": "समस्याएं पाई गईं", 
+  "error.top-level-communities": "शीर्ष-स्तरीय समुदायों को लाने में त्रुटि",
 
-  "health-page.status.ok.info": "परिचालन", 
+  "error.validation.emailTaken": "यह ई - मेल पहले ही लिया जा चुका हैं",
 
-  "health-page.status.warning.info": "संभावित समस्याओं का पता चला", 
+  "error.validation.filerequired": "फ़ाइल अपलोड अनिवार्य है",
 
-  "health-page.title": "स्वास्थ्य", 
+  "error.validation.groupExists": "यह समूह पहले से मौजूद है",
 
-  "health.breadcrumbs": "स्वास्थ्य", 
+  "error.validation.license.notgranted": "अपना प्रस्तुतीकरण पूरा करने के लिए आपको यह अनुज्ञापत्र देना होगा। यदि आप इस समय यह अनुज्ञापत्र देने में असमर्थ हैं तो आप अपना काम सहेज सकते हैं और बाद में वापस आ सकते हैं या प्रस्तुतीकरण हटा सकते हैं।",
 
-  "hello": "नमस्ते", 
+  "error.validation.NotValidEmail": "यह ई-मेल वैध ईमेल नहीं है",
 
-  "home.breadcrumbs": "मुख्य पृष्ठ", 
+  "error.validation.pattern": "यह इनपुट वर्तमान ढांचे द्वारा प्रतिबंधित है: {{ pattern }}.",
 
-  "home.description": null, 
+  "error.validation.required": "यह फ़ील्ड आवश्यक है",
 
-  "home.search-form.placeholder": "संग्रहालय में खोजें...", 
+  "feed.description": "सिंडिकेशन फ़ीड",
 
-  "home.title": "मुख्य पृष्ठ", 
+  "file-section.error.header": "इस मद के लिए फ़ाइलें प्राप्त करने में त्रुटि",
 
-  "home.top-level-communities.head": "डीस्पेस में समुदाय", 
+  "footer.copyright": "कॉपीराइट © 2002-{{ year }}",
 
-  "home.top-level-communities.help": "किसी समुदाय के संग्रह ब्राउज़ करने के लिए उसे चुनें.", 
+  "footer.link.cookies": "कुकी सेटिंग",
 
-  "idle-modal.extend-session": "सत्र बढ़ाएँ", 
+  "footer.link.dspace": "डीस्पेस सॉफ्टवेयर",
 
-  "idle-modal.header": "सत्र जल्द ही समाप्त होगा", 
+  "footer.link.end-user-agreement": "अंतिम उपयोगकर्ता समझौता",
 
-  "idle-modal.info": "सुरक्षा कारणों से, उपयोगकर्ता सत्र {{timeToExpire}} मिनट की निष्क्रियता के बाद समाप्त हो जाते हैं। आपका सत्र जल्द ही समाप्त हो जाएगा। क्या आप इसे बढ़ाना चाहते हैं या लॉग आउट करना चाहते हैं?", 
+  "footer.link.feedback": "प्रतिक्रिया भेजें",
 
-  "idle-modal.log-out": "लॉग आउट", 
+  "footer.link.lyrasis": "लाइरासिस",
 
-  "iiif.listelement.badge": "छवि मीडिया", 
+  "footer.link.privacy-policy": "गोपनीयता नीति",
 
-  "iiif.page.description": "विवरण: ", 
+  "forgot-email.form.email": "ईमेल पता *",
 
-  "iiif.page.doi": "स्थायी लिंक: ", 
+  "forgot-email.form.email.error.pattern": "कृपया एक मान्य ईमेल पता भरें",
 
-  "iiif.page.issue": "अंक: ", 
+  "forgot-email.form.email.error.required": "कृपया ईमेल पता भरें",
 
-  "iiif.page.titleprefix": "छवि: ", 
+  "forgot-email.form.email.hint": "आगे के निर्देशों के साथ इस पते पर एक ईमेल भेजा जाएगा।",
 
-  "iiifsearchable.listelement.badge": "दस्तावेज़ मीडिया", 
+  "forgot-email.form.error.content": "निम्नलिखित ईमेल पते से जुड़े खाते के लिए पासवर्ड रीसेट करने का प्रयास करते समय एक त्रुटि हुई: {{ email }}",
 
-  "iiifsearchable.page.description": "विवरण: ", 
+  "forgot-email.form.error.head": "पासवर्ड रीसेट करने का प्रयास करते समय त्रुटि",
 
-  "iiifsearchable.page.doi": "स्थायी लिंक:", 
+  "forgot-email.form.header": "पासवर्ड भूल गए",
 
-  "iiifsearchable.page.issue": "अंक:", 
+  "forgot-email.form.info": "खाते से संबद्ध ईमेल पता दर्ज करें।",
 
-  "iiifsearchable.page.titleprefix": "दस्तावेज़: ", 
+  "forgot-email.form.submit": "पासवर्ड रीसेट",
 
-  "iiifviewer.fullscreen.notice": "बेहतर देखने के लिए पूर्ण स्क्रीन का उपयोग करें।", 
+  "forgot-email.form.success.content": "{{email}} को एक विशेष यूआरएल और अन्य निर्देशों के साथ एक ईमेल भेजा गया है।",
 
-  "info.end-user-agreement.accept": "मैंने पढ़ लिया है और मैं अंतिम उपयोगकर्ता अनुबंध से सहमत हूं", 
+  "forgot-email.form.success.head": "पासवर्ड रीसेट ईमेल भेजा गया",
 
-  "info.end-user-agreement.accept.error": "अंतिम उपयोगकर्ता अनुबंध को स्वीकार करते हुए एक त्रुटि उत्पन्न हुई", 
+  "forgot-password.form.card.security": "सुरक्षा",
 
-  "info.end-user-agreement.accept.success": "अंतिम उपयोगकर्ता अनुबंध को सफलतापूर्वक अपडेट किया गया", 
+  "forgot-password.form.error.empty-password": "कृपया नीचे दिए गए बॉक्स में पासवर्ड दर्ज करें।",
 
-  "info.end-user-agreement.breadcrumbs": "अंतिम उपयोगकर्ता समझौता", 
+  "forgot-password.form.error.matching-passwords": "पासवर्ड एक - दूसरे से मिलते - जुलते नहीं हैं।",
 
-  "info.end-user-agreement.buttons.cancel": "रद्द करें", 
+  "forgot-password.form.error.password-length": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।",
 
-  "info.end-user-agreement.buttons.save": "सहेजें", 
+  "forgot-password.form.head": "पासवर्ड भूल गए",
 
-  "info.end-user-agreement.head": "अंतिम उपयोगकर्ता समझौता", 
+  "forgot-password.form.identification.email": "ईमेल पता:",
 
-  "info.end-user-agreement.title": "अंतिम उपयोगकर्ता समझौता", 
+  "forgot-password.form.identification.header": "पहचान",
 
-  "info.feedback.breadcrumbs": "प्रतिपुष्टि", 
+  "forgot-password.form.info": "नीचे दिए गए बॉक्स में एक नया पासवर्ड दर्ज करें, और दूसरे बॉक्स में फिर से टाइप करके इसकी पुष्टि करें। यह कम से कम छह वर्ण लंबा होना चाहिए।",
 
-  "info.feedback.comments": "टिप्पणियाँ", 
+  "forgot-password.form.label.password": "पासवर्ड",
 
-  "info.feedback.create.success": "फ़ीडबैक सफलतापूर्वक भेजा गया!", 
+  "forgot-password.form.label.passwordrepeat": "पुष्टि करने के लिए फिर से लिखें",
 
-  "info.feedback.email_help": "इस पते का उपयोग आपकी प्रतिक्रिया पर अनुवर्ती कार्रवाई के लिए किया जाएगा।", 
+  "forgot-password.form.notification.error.title": "नया पासवर्ड सबमिट करने का प्रयास करते समय त्रुटि",
 
-  "info.feedback.email-label": "तुम्हारा ईमेल", 
+  "forgot-password.form.notification.success.content": "पासवर्ड रीसेट सफल रहा। आपको बनाए गए उपयोगकर्ता के रूप में लॉग इन किया गया है।",
 
-  "info.feedback.error.email.required": "मान्य ईमेल पता जरूरी है", 
+  "forgot-password.form.notification.success.title": "पासवर्ड रीसेट पूरा हुआ",
 
-  "info.feedback.error.message.required": "एक टिप्पणी आवश्यक है", 
+  "forgot-password.form.submit": "पासवर्ड सबमिट करें",
 
-  "info.feedback.head": "प्रतिपुष्टि", 
+  "forgot-password.title": "पासवर्ड भूल गए",
 
-  "info.feedback.info": "डीस्पेस सिस्टम के बारे में अपनी प्रतिक्रिया साझा करने के लिए धन्यवाद। आपकी टिप्पणियों की सराहना की जाती है!", 
+  "form.add": "और जोड़ें",
 
-  "info.feedback.page_help": "आपकी प्रतिक्रिया से संबंधित पेज", 
+  "form.add-help": "वर्तमान प्रविष्टि जोड़ने और दूसरी प्रविष्टि जोड़ने के लिए यहां क्लिक करें",
 
-  "info.feedback.page-label": "पृष्ठ", 
+  "form.cancel": "रद्द करें",
 
-  "info.feedback.send": "प्रतिक्रिया भेजें", 
+  "form.clear": "साफ़ करें",
 
-  "info.feedback.title": "प्रतिपुष्टि", 
+  "form.clear-help": "चयनित मान को हटाने के लिए यहां क्लिक करें",
 
-  "info.privacy.breadcrumbs": "गोपनीयता कथन", 
+  "form.discard": "खारिज करें",
 
-  "info.privacy.head": "गोपनीयता वाले कथन", 
+  "form.drag": "खींचें (Drag)",
 
-  "info.privacy.title": "गोपनीयता कथन", 
+  "form.edit": "संपादित करें",
 
-  "item.alerts.private": "यह आइटम खोजने योग्य नहीं है", 
+  "form.edit-help": "चयनित मान संपादित करने के लिए यहां क्लिक करें",
 
-  "item.alerts.withdrawn": "इस मद को वापस ले लिया गया है", 
+  "form.first-name": "प्रथम नाम",
 
-  "item.badge.private": "गैर-खोज योग्य", 
+  "form.group-collapse": "संक्षिप्त करें",
 
-  "item.badge.withdrawn": "वापस लिया गया", 
+  "form.group-collapse-help": "संक्षिप्त करने के लिए यहां क्लिक करें",
 
-  "item.bitstreams.upload.bundle": "बंडल", 
+  "form.group-expand": "विस्तृत करें",
 
-  "item.bitstreams.upload.bundle.new": "बंडल बनाएं", 
+  "form.group-expand-help": "विस्तार करने और अधिक तत्व जोड़ने के लिए यहां क्लिक करें",
 
-  "item.bitstreams.upload.bundle.placeholder": "एक बंडल का चयन करें अथवा नये बंडल नाम डालें", 
+  "form.last-name": "उपनाम",
 
-  "item.bitstreams.upload.bundles.empty": "इस आइटम में बिटस्ट्रीम अपलोड करने के लिए कोई बंडल नहीं है।", 
+  "form.loading": "लोड हो रहा है...",
 
-  "item.bitstreams.upload.cancel": "रद्द करें", 
+  "form.lookup": "देखो",
 
-  "item.bitstreams.upload.drop-message": "अपलोड करने के लिए एक फ़ाइल छोड़ें", 
+  "form.lookup-help": "मौजूदा संबंध देखने के लिए यहां क्लिक करें",
 
-  "item.bitstreams.upload.item": "आइटम: ", 
+  "form.no-results": "कोई परिणाम नहीं मिला",
 
-  "item.bitstreams.upload.notifications.bundle.created.content": "नया बंडल सफलतापूर्वक बनाया गया।", 
+  "form.no-value": "कोई मान दर्ज नहीं किया गया",
 
-  "item.bitstreams.upload.notifications.bundle.created.title": "बंडल बन गया", 
+  "form.remove": "हटाएं",
 
-  "item.bitstreams.upload.notifications.upload.failed": "अपलोड विफल रहा। कृपया पुनः प्रयास करने से पहले सामग्री को सत्यापित करें।", 
+  "form.repeatable.sort.tip": "आइटम को नई स्थिति में छोड़ें",
 
-  "item.bitstreams.upload.title": "बिटस्ट्रीम अपलोड करें", 
+  "form.save": "सहेजें",
 
-  "item.edit.authorizations.heading": "इस संपादक के साथ आप किसी आइटम की नीतियों को देख और बदल सकते हैं, साथ ही अलग-अलग आइटम घटकों (बंडल और बिटस्ट्रीम) की नीतियों को बदल सकते हैं। संक्षेप में, आइटम बंडलों का कंटेनर होता है, और बंडल बिटस्ट्रीम के कंटेनर होते हैं। कंटेनर में आमतौर पर जोड़ें/निकालें/पढ़ें/लिखें नीतियां होती हैं, जबकि बिटस्ट्रीम में केवल पढ़ने/लिखने की नीतियां होती हैं।", 
+  "form.save-help": "परिवर्तन सहेजें",
 
-  "item.edit.authorizations.title": "आइटम की नीतियां संपादित करें", 
+  "form.search": "खोजें",
 
-  "item.edit.bitstreams.bundle.displaying": "वर्तमान में {{ total }} की {{ amount }} बिटस्ट्रीम प्रदर्शित कर रहा है।", 
+  "form.search-help": "मौजूदा पत्राचार देखने के लिए यहां क्लिक करें",
 
-  "item.edit.bitstreams.bundle.edit.buttons.upload": "अपलोड", 
+  "form.submit": "सहेजें",
 
-  "item.edit.bitstreams.bundle.load.all": "({{ total }}) सभी लोड करें", 
+  "general.back": "वापस",
 
-  "item.edit.bitstreams.bundle.load.more": "और लोड करें", 
+  "general.cancel": "रद्द करें",
 
-  "item.edit.bitstreams.bundle.name": "बंडल: {{ name }}", 
+  "general.confirm": "क्या आपको यकीन है?",
 
-  "item.edit.bitstreams.discard-button": "रद्द करें", 
+  "general.destroy": "हटाएं",
 
-  "item.edit.bitstreams.edit.buttons.download": "डाउनलोड", 
+  "general.edit": "संपादित करें",
 
-  "item.edit.bitstreams.edit.buttons.drag": "खींचें (Drag)", 
+  "general.new": "नया",
 
-  "item.edit.bitstreams.edit.buttons.edit": "संपादित करें", 
+  "grant-deny-request-copy.deny": "कॉपी न भेजें",
 
-  "item.edit.bitstreams.edit.buttons.remove": "हटाएं", 
+  "grant-deny-request-copy.email.back": "वापस",
 
-  "item.edit.bitstreams.edit.buttons.undo": "परिवर्तन पूर्ववत करें", 
+  "grant-deny-request-copy.email.message": "संदेश",
 
-  "item.edit.bitstreams.empty": "इस आइटम में कोई बिटस्ट्रीम नहीं है। एक बनाने के लिए अपलोड बटन पर क्लिक करें।", 
+  "grant-deny-request-copy.email.message.empty": "कृपया संदेश दर्ज करें",
 
-  "item.edit.bitstreams.headers.actions": "गतिविधियां", 
+  "grant-deny-request-copy.email.permissions.info": "इन अनुरोधों का जवाब देने से बचने के लिए आप इस अवसर का उपयोग दस्तावेज़ पर पहुंच प्रतिबंधों पर पुनर्विचार करने के लिए कर सकते हैं। यदि आप रिपॉजिटरी व्यवस्थापकों से इन प्रतिबंधों को हटाने के लिए कहना चाहते हैं, तो कृपया नीचे दिए गए बॉक्स को चेक करें।",
 
-  "item.edit.bitstreams.headers.bundle": "बंडल", 
+  "grant-deny-request-copy.email.permissions.label": "ओपन एक्सेस में बदलें",
 
-  "item.edit.bitstreams.headers.description": "विवरण", 
+  "grant-deny-request-copy.email.send": "भेजें",
 
-  "item.edit.bitstreams.headers.format": "प्रारूप", 
+  "grant-deny-request-copy.email.subject": "विषय",
 
-  "item.edit.bitstreams.headers.name": "नाम", 
+  "grant-deny-request-copy.email.subject.empty": "कृपया एक विषय दर्ज करें",
 
-  "item.edit.bitstreams.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें", 
+  "grant-deny-request-copy.grant": "प्रतिलिपि भेजें",
 
-  "item.edit.bitstreams.notifications.discarded.title": "परिवर्तन रद्द किये गए", 
+  "grant-deny-request-copy.header": "दस्तावेज़ की प्रतिलिपि अनुरोध",
 
-  "item.edit.bitstreams.notifications.move.failed.title": "बिटस्ट्रीम ले जाने में त्रुटि", 
+  "grant-deny-request-copy.home-page": "मुझे होम पेज पर ले जाएं",
 
-  "item.edit.bitstreams.notifications.move.saved.content": "इस आइटम की बिटस्ट्रीम और बंडल में आपके द्वारा किए गए परिवर्तन सहेज लिए गए हैं।", 
+  "grant-deny-request-copy.intro1": "यदि आप <a href='{{ url }}'>{{ name }}</a> दस्तावेज़ के लेखकों में से एक हैं, तो कृपया उपयोगकर्ता के अनुरोध का जवाब देने के लिए नीचे दिए गए विकल्पों में से किसी एक का उपयोग करें।",
 
-  "item.edit.bitstreams.notifications.move.saved.title": "सहेजे गए परिवर्तनों को स्थानांतरित करें", 
+  "grant-deny-request-copy.intro2": "एक विकल्प चुनने के बाद, आपको एक सुझाया गया ईमेल उत्तर प्रस्तुत किया जाएगा जिसे आप संपादित कर सकते हैं।",
 
-  "item.edit.bitstreams.notifications.outdated.content": "जिस आइटम पर आप वर्तमान में काम कर रहे हैं, उसे किसी अन्य उपयोगकर्ता ने बदल दिया है। संघर्षों को रोकने के लिए आपके वर्तमान परिवर्तन खारिज कर दिए गए हैं", 
+  "grant-deny-request-copy.processed": "यह अनुरोध पहले ही संसाधित किया जा चुका है। होम पृष्ठ पर वापस जाने के लिए आप नीचे दिए गए बटन का उपयोग कर सकते हैं।",
 
-  "item.edit.bitstreams.notifications.outdated.title": "कालग्रस्त परिवर्तन", 
+  "grant-request-copy.email.message": "प्रिय {{ recipientName }}, \nआपके अनुरोध के प्रत्युत्तर में मुझे आपको \"{{ itemUrl }}\" ({{itemName }}) दस्तावेज़ से संबंधित फ़ाइल(ो), जिसका मैं एक लेखक हूं, की प्रति संलग्न करते हुए प्रसन्नता हो रही है।\n\nसाभार, \n{{ authorName }} <{{ authorEmail }}>",
 
-  "item.edit.bitstreams.notifications.remove.failed.title": "बिटस्ट्रीम हटाने में त्रुटि", 
+  "grant-request-copy.email.subject": "दस्तावेज़ की प्रति का अनुरोध करें",
 
-  "item.edit.bitstreams.notifications.remove.saved.content": "इस आइटम की बिटस्ट्रीम में आपके निष्कासन परिवर्तन सहेज लिए गए हैं।", 
+  "grant-request-copy.error": "एक त्रुटि हुई",
 
-  "item.edit.bitstreams.notifications.remove.saved.title": "हटाए जाने के बदलाव सहेजे गए", 
+  "grant-request-copy.header": "दस्तावेज़ कॉपी अनुरोध प्रदान करें",
 
-  "item.edit.bitstreams.reinstate-button": "पूर्ववत करें", 
+  "grant-request-copy.intro": "यह संदेश अनुरोध के आवेदक को भेजा जाएगा। अनुरोधित दस्तावेज संलग्न किए जाएंगे।",
 
-  "item.edit.bitstreams.save-button": "सहेजें", 
+  "grant-request-copy.success": "आइटम अनुरोध सफलतापूर्वक स्वीकृत किया गया",
 
-  "item.edit.bitstreams.upload-button": "अपलोड करें", 
+  "health-page.error.msg": "स्वास्थ्य जांच सेवा अस्थायी रूप से अनुपलब्ध है",
 
-  "item.edit.breadcrumbs": "आइटम संपादित करें", 
+  "health-page.heading": "स्वास्थ्य",
 
-  "item.edit.delete.cancel": "रद्द करें", 
+  "health-page.info-tab": "जानकारी",
 
-  "item.edit.delete.confirm": "हटाएं", 
+  "health-page.property.status": "स्थिति कोड",
 
-  "item.edit.delete.description": "क्या आप सुनिश्चित हैं कि यह आइटम पूरी तरह से हटा दिया जाना चाहिए? सावधानी: वर्तमान में कोई tombstone नहीं छोड़ा जाएगा।", 
+  "health-page.section-info.app.title": "सॉफ्टवेयर बैकएंड",
 
-  "item.edit.delete.error": "आइटम को हटाते समय कोई त्रुटि उत्पन्न हुई", 
+  "health-page.section-info.java.title": "जावा",
 
-  "item.edit.delete.header": "आइटम हटाएं: {{id}}", 
+  "health-page.section.db.title": "डेटाबेस",
 
-  "item.edit.delete.success": "आइटम हटा दिया गया है", 
+  "health-page.section.geoIp.title": "जियोआईपी (GeoIp)",
 
-  "item.edit.head": "आइटम संपादित करें", 
+  "health-page.section.no-issues": "कोई समस्या नहीं मिली",
 
-  "item.edit.item-mapper.buttons.add": "आइटम को चयनित संग्रहों में मैप करें", 
+  "health-page.section.solrAuthorityCore.title": "Solr: प्राधिकरण कोर",
 
-  "item.edit.item-mapper.buttons.remove": "चयनित संग्रहों के लिए आइटम की मैपिंग निकालें", 
+  "health-page.section.solrOaiCore.title": "Solr: oai कोर",
 
-  "item.edit.item-mapper.cancel": "रद्द करें", 
+  "health-page.section.solrSearchCore.title": "Solr: मूल खोज",
 
-  "item.edit.item-mapper.description": "यह आइटम मैपर टूल है जो प्रशासकों को इस आइटम को अन्य संग्रहों में मैप करने की अनुमति देता है। आप संग्रहों की खोज कर सकते हैं और उन्हें मैप कर सकते हैं, या उन संग्रहों की सूची ब्राउज़ कर सकते हैं जिनसे आइटम वर्तमान में मैप किया गया है।", 
+  "health-page.section.solrStatisticsCore.title": "Solr: सांख्यिकी कोर",
 
-  "item.edit.item-mapper.head": "आइटम मैपर - संग्रह के लिए आइटम मैप करें", 
+  "health-page.status": "स्थिति",
 
-  "item.edit.item-mapper.item": "आइटम: \"<b>{{name}}</b>\"", 
+  "health-page.status-tab": "स्थिति",
 
-  "item.edit.item-mapper.no-search": "खोज करने के लिए कृपया एक प्रश्न दर्ज करें", 
+  "health-page.status.error.info": "समस्याएं पाई गईं",
 
-  "item.edit.item-mapper.notifications.add.error.content": "{{amount}} आइटम को संग्रहों में मैप करने में त्रुटियाँ हुईं।", 
+  "health-page.status.ok.info": "परिचालन",
 
-  "item.edit.item-mapper.notifications.add.error.head": "मैपिंग त्रुटियाँ", 
+  "health-page.status.warning.info": "संभावित समस्याओं का पता चला",
 
-  "item.edit.item-mapper.notifications.add.success.content": "{{amount}} आइटम को संग्रह में सफलतापूर्वक मैप किया गया।", 
+  "health-page.title": "स्वास्थ्य",
 
-  "item.edit.item-mapper.notifications.add.success.head": "मैपिंग पूरी हुई", 
+  "health.breadcrumbs": "स्वास्थ्य",
 
-  "item.edit.item-mapper.notifications.remove.error.content": "मैपिंग को {{amount}} संग्रह से निकालने में त्रुटियां हुईं.", 
+  "hello": "नमस्ते",
 
-  "item.edit.item-mapper.notifications.remove.error.head": "मैपिंग हटाने में त्रुटियां", 
+  "home.breadcrumbs": "मुख्य पृष्ठ",
 
-  "item.edit.item-mapper.notifications.remove.success.content": "{{amount}} संग्रह में आइटम की मैपिंग सफलतापूर्वक निकाली गई।", 
+  "home.description": null,
 
-  "item.edit.item-mapper.notifications.remove.success.head": "मैपिंग को हटाना पूरा हुआ", 
+  "home.search-form.placeholder": "संग्रहालय में खोजें...",
 
-  "item.edit.item-mapper.search-form.placeholder": "संग्रह में खोजें...    ", 
+  "home.title": "मुख्य पृष्ठ",
 
-  "item.edit.item-mapper.tabs.browse": "मैप किए गए संग्रह ब्राउज़ करें", 
+  "home.top-level-communities.head": "डीस्पेस में समुदाय",
 
-  "item.edit.item-mapper.tabs.map": "नए संग्रहों को मैप करें", 
+  "home.top-level-communities.help": "किसी समुदाय के संग्रह ब्राउज़ करने के लिए उसे चुनें.",
 
-  "item.edit.metadata.add-button": "जोड़ें", 
+  "idle-modal.extend-session": "सत्र बढ़ाएँ",
 
-  "item.edit.metadata.discard-button": "रद्द करें", 
+  "idle-modal.header": "सत्र जल्द ही समाप्त होगा",
 
-  "item.edit.metadata.edit.buttons.edit": "संपादित करें", 
+  "idle-modal.info": "सुरक्षा कारणों से, उपयोगकर्ता सत्र {{timeToExpire}} मिनट की निष्क्रियता के बाद समाप्त हो जाते हैं। आपका सत्र जल्द ही समाप्त हो जाएगा। क्या आप इसे बढ़ाना चाहते हैं या लॉग आउट करना चाहते हैं?",
 
-  "item.edit.metadata.edit.buttons.remove": "हटाएं", 
+  "idle-modal.log-out": "लॉग आउट",
 
-  "item.edit.metadata.edit.buttons.undo": "परिवर्तन पूर्ववत करें", 
+  "iiif.listelement.badge": "छवि मीडिया",
 
-  "item.edit.metadata.edit.buttons.unedit": "संपादन बंद करें", 
+  "iiif.page.description": "विवरण: ",
 
-  "item.edit.metadata.empty": "आइटम में वर्तमान में कोई मेटाडेटा नहीं है। मेटाडेटा मान जोड़ना प्रारंभ करने के लिए जोड़ें पर क्लिक करें।", 
+  "iiif.page.doi": "स्थायी लिंक: ",
 
-  "item.edit.metadata.headers.edit": "संपादित करें", 
+  "iiif.page.issue": "अंक: ",
 
-  "item.edit.metadata.headers.field": "फील्ड", 
+  "iiif.page.titleprefix": "छवि: ",
 
-  "item.edit.metadata.headers.language": "भाषा", 
+  "iiifsearchable.listelement.badge": "दस्तावेज़ मीडिया",
 
-  "item.edit.metadata.headers.value": "मान", 
+  "iiifsearchable.page.description": "विवरण: ",
 
-  "item.edit.metadata.metadatafield.invalid": "कृपया वैध मेटाडेटा फ़ील्ड चुनें", 
+  "iiifsearchable.page.doi": "स्थायी लिंक:",
 
-  "item.edit.metadata.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें", 
+  "iiifsearchable.page.issue": "अंक:",
 
-  "item.edit.metadata.notifications.discarded.title": "परिवर्तन रद्द किये गए", 
+  "iiifsearchable.page.titleprefix": "दस्तावेज़: ",
 
-  "item.edit.metadata.notifications.error.title": "एक त्रुटि पाई गई", 
+  "iiifviewer.fullscreen.notice": "बेहतर देखने के लिए पूर्ण स्क्रीन का उपयोग करें।",
 
-  "item.edit.metadata.notifications.invalid.content": "आपके परिवर्तन सहेजे नहीं गए थे। कृपया सुनिश्चित करें कि आपके द्वारा सहेजने से पहले सभी फ़ील्ड मान्य हैं।", 
+  "info.end-user-agreement.accept": "मैंने पढ़ लिया है और मैं अंतिम उपयोगकर्ता अनुबंध से सहमत हूं",
 
-  "item.edit.metadata.notifications.invalid.title": "मेटाडेटा अमान्य", 
+  "info.end-user-agreement.accept.error": "अंतिम उपयोगकर्ता अनुबंध को स्वीकार करते हुए एक त्रुटि उत्पन्न हुई",
 
-  "item.edit.metadata.notifications.outdated.content": "जिस आइटम पर आप वर्तमान में काम कर रहे हैं, उसे किसी अन्य उपयोगकर्ता ने बदल दिया है। संघर्षों को रोकने के लिए आपके वर्तमान परिवर्तन खारिज कर दिए गए हैं", 
+  "info.end-user-agreement.accept.success": "अंतिम उपयोगकर्ता अनुबंध को सफलतापूर्वक अपडेट किया गया",
 
-  "item.edit.metadata.notifications.outdated.title": "पुराना बदल गया", 
+  "info.end-user-agreement.breadcrumbs": "अंतिम उपयोगकर्ता समझौता",
 
-  "item.edit.metadata.notifications.saved.content": "इस आइटम के मेटाडेटा में आपके परिवर्तन सहेजे गए थे।", 
+  "info.end-user-agreement.buttons.cancel": "रद्द करें",
 
-  "item.edit.metadata.notifications.saved.title": "मेटाडेटा सहेजा गया", 
+  "info.end-user-agreement.buttons.save": "सहेजें",
 
-  "item.edit.metadata.reinstate-button": "पूर्ववत करें", 
+  "info.end-user-agreement.head": "अंतिम उपयोगकर्ता समझौता",
 
-  "item.edit.metadata.save-button": "सहेजें", 
+  "info.end-user-agreement.title": "अंतिम उपयोगकर्ता समझौता",
 
-  "item.edit.modify.overview.field": "फ़ील्ड", 
+  "info.feedback.breadcrumbs": "प्रतिपुष्टि",
 
-  "item.edit.modify.overview.language": "भाषा", 
+  "info.feedback.comments": "टिप्पणियाँ",
 
-  "item.edit.modify.overview.value": "मान", 
+  "info.feedback.create.success": "फ़ीडबैक सफलतापूर्वक भेजा गया!",
 
-  "item.edit.move.cancel": "वापस", 
+  "info.feedback.email_help": "इस पते का उपयोग आपकी प्रतिक्रिया पर अनुवर्ती कार्रवाई के लिए किया जाएगा।",
 
-  "item.edit.move.description": "उस संग्रह का चयन करें जिसमें आप इस आइटम को ले जाना चाहते हैं। प्रदर्शित संग्रहों की सूची को छोटा करने के लिए, आप बॉक्स में खोज क्वेरी दर्ज कर सकते हैं।", 
+  "info.feedback.email-label": "तुम्हारा ईमेल",
 
-  "item.edit.move.discard-button": "रद्द करें", 
+  "info.feedback.error.email.required": "मान्य ईमेल पता जरूरी है",
 
-  "item.edit.move.error": "आइटम को स्थानांतरित करने का प्रयास करते समय कोई त्रुटि उत्पन्न हुई", 
+  "info.feedback.error.message.required": "एक टिप्पणी आवश्यक है",
 
-  "item.edit.move.head": "आइटम का स्थान परिवर्तन: {{id}}", 
+  "info.feedback.head": "प्रतिपुष्टि",
 
-  "item.edit.move.inheritpolicies.checkbox": "नीतियां विरासत में लो", 
+  "info.feedback.info": "डीस्पेस सिस्टम के बारे में अपनी प्रतिक्रिया साझा करने के लिए धन्यवाद। आपकी टिप्पणियों की सराहना की जाती है!",
 
-  "item.edit.move.inheritpolicies.description": "गंतव्य संग्रह की डिफ़ॉल्ट नीतियों को इनहेरिट करें", 
+  "info.feedback.page_help": "आपकी प्रतिक्रिया से संबंधित पेज",
 
-  "item.edit.move.move": "स्थान परिवर्तन", 
+  "info.feedback.page-label": "पृष्ठ",
 
-  "item.edit.move.processing": "चल रहा है...", 
+  "info.feedback.send": "प्रतिक्रिया भेजें",
 
-  "item.edit.move.save-button": "सहेजें", 
+  "info.feedback.title": "प्रतिपुष्टि",
 
-  "item.edit.move.search.placeholder": "संग्रह देखने के लिए एक खोज क्वेरी दर्ज करें", 
+  "info.privacy.breadcrumbs": "गोपनीयता कथन",
 
-  "item.edit.move.success": "आइटम को सफलतापूर्वक स्थानांतरित कर दिया गया है", 
+  "info.privacy.head": "गोपनीयता वाले कथन",
 
-  "item.edit.move.title": "आइटम स्थानांतरण", 
+  "info.privacy.title": "गोपनीयता कथन",
 
-  "item.edit.private.cancel": "रद्द करें", 
+  "item.alerts.private": "यह आइटम खोजने योग्य नहीं है",
 
-  "item.edit.private.confirm": "इसे गैर-खोज योग्य बनाएं", 
+  "item.alerts.withdrawn": "इस मद को वापस ले लिया गया है",
 
-  "item.edit.private.description": "क्या आप सुनिश्चित हैं कि इस आइटम को संग्रह में खोजने योग्य नहीं बनाया जाना चाहिए?", 
+  "item.badge.private": "गैर-खोज योग्य",
 
-  "item.edit.private.error": "आइटम को गैर-खोज योग्य बनाते समय एक त्रुटि हुई", 
+  "item.badge.withdrawn": "वापस लिया गया",
 
-  "item.edit.private.header": "आइटम को खोजने योग्य न बनाएं: {{ id }}", 
+  "item.bitstreams.upload.bundle": "बंडल",
 
-  "item.edit.private.success": "आइटम अब खोजने योग्य नहीं है", 
+  "item.bitstreams.upload.bundle.new": "बंडल बनाएं",
 
-  "item.edit.public.cancel": "रद्द करें", 
+  "item.bitstreams.upload.bundle.placeholder": "एक बंडल का चयन करें अथवा नये बंडल नाम डालें",
 
-  "item.edit.public.confirm": "इसे खोजने योग्य बनाएं", 
+  "item.bitstreams.upload.bundles.empty": "इस आइटम में बिटस्ट्रीम अपलोड करने के लिए कोई बंडल नहीं है।",
 
-  "item.edit.public.description": "क्या आप इस आइटम को संग्रह में खोजने योग्य बनाने के लिए सुनिश्चित हैं?", 
+  "item.bitstreams.upload.cancel": "रद्द करें",
 
-  "item.edit.public.error": "आइटम को खोजने योग्य बनाते समय एक त्रुटि हुई", 
+  "item.bitstreams.upload.drop-message": "अपलोड करने के लिए एक फ़ाइल छोड़ें",
 
-  "item.edit.public.header": "आइटम को खोजने योग्य बनाएं: {{ id }}", 
+  "item.bitstreams.upload.item": "आइटम: ",
 
-  "item.edit.public.success": "आइटम अब खोजने योग्य है", 
+  "item.bitstreams.upload.notifications.bundle.created.content": "नया बंडल सफलतापूर्वक बनाया गया।",
 
-  "item.edit.reinstate.cancel": "रद्द करें", 
+  "item.bitstreams.upload.notifications.bundle.created.title": "बंडल बन गया",
 
-  "item.edit.reinstate.confirm": "पुनर्स्थापित करें", 
+  "item.bitstreams.upload.notifications.upload.failed": "अपलोड विफल रहा। कृपया पुनः प्रयास करने से पहले सामग्री को सत्यापित करें।",
 
-  "item.edit.reinstate.description": "क्या आप इस आइटम को संग्रह में पुनर्स्थापित करने के लिए सुनिश्चित हैं?", 
+  "item.bitstreams.upload.title": "बिटस्ट्रीम अपलोड करें",
 
-  "item.edit.reinstate.error": "आइटम को पुनर्स्थापित करते समय एक त्रुटि हुई", 
+  "item.edit.authorizations.heading": "इस संपादक के साथ आप किसी आइटम की नीतियों को देख और बदल सकते हैं, साथ ही अलग-अलग आइटम घटकों (बंडल और बिटस्ट्रीम) की नीतियों को बदल सकते हैं। संक्षेप में, आइटम बंडलों का कंटेनर होता है, और बंडल बिटस्ट्रीम के कंटेनर होते हैं। कंटेनर में आमतौर पर जोड़ें/निकालें/पढ़ें/लिखें नीतियां होती हैं, जबकि बिटस्ट्रीम में केवल पढ़ने/लिखने की नीतियां होती हैं।",
 
-  "item.edit.reinstate.header": "पुनर्स्थापित आइटम: {{ id }}", 
+  "item.edit.authorizations.title": "आइटम की नीतियां संपादित करें",
 
-  "item.edit.reinstate.success": "आइटम को सफलतापूर्वक बहाल कर दिया गया", 
+  "item.edit.bitstreams.bundle.displaying": "वर्तमान में {{ total }} की {{ amount }} बिटस्ट्रीम प्रदर्शित कर रहा है।",
 
-  "item.edit.relationships.discard-button": "रद्द करें", 
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "अपलोड",
 
-  "item.edit.relationships.edit.buttons.add": "जोड़ें", 
+  "item.edit.bitstreams.bundle.load.all": "({{ total }}) सभी लोड करें",
 
-  "item.edit.relationships.edit.buttons.remove": "हटाएं", 
+  "item.edit.bitstreams.bundle.load.more": "और लोड करें",
 
-  "item.edit.relationships.edit.buttons.undo": "परिवर्तन रद्द किये गए", 
+  "item.edit.bitstreams.bundle.name": "बंडल: {{ name }}",
 
-  "item.edit.relationships.no-entity-type": "इस आइटम के लिए संबंध सक्षम करने के लिए 'dspace.entity.type' मेटाडेटा जोड़ें", 
+  "item.edit.bitstreams.discard-button": "रद्द करें",
 
-  "item.edit.relationships.no-relationships": "कोई रिश्ता नहीं", 
+  "item.edit.bitstreams.edit.buttons.download": "डाउनलोड",
 
-  "item.edit.relationships.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें", 
+  "item.edit.bitstreams.edit.buttons.drag": "खींचें (Drag)",
 
-  "item.edit.relationships.notifications.discarded.title": "परिवर्तन रद्द किये गए", 
+  "item.edit.bitstreams.edit.buttons.edit": "संपादित करें",
 
-  "item.edit.relationships.notifications.failed.title": "संबंध संपादित करने में त्रुटि", 
+  "item.edit.bitstreams.edit.buttons.remove": "हटाएं",
 
-  "item.edit.relationships.notifications.outdated.content": "जिस आइटम पर आप वर्तमान में काम कर रहे हैं, उसे किसी अन्य उपयोगकर्ता ने बदल दिया है। संघर्षों को रोकने के लिए आपके वर्तमान परिवर्तन खारिज कर दिए गए हैं", 
+  "item.edit.bitstreams.edit.buttons.undo": "परिवर्तन पूर्ववत करें",
 
-  "item.edit.relationships.notifications.outdated.title": "परिवर्तन पुराना", 
+  "item.edit.bitstreams.empty": "इस आइटम में कोई बिटस्ट्रीम नहीं है। एक बनाने के लिए अपलोड बटन पर क्लिक करें।",
 
-  "item.edit.relationships.notifications.saved.content": "इस आइटम के संबंधों में आपके परिवर्तन सहेज लिए गए थे|", 
+  "item.edit.bitstreams.headers.actions": "गतिविधियां",
 
-  "item.edit.relationships.notifications.saved.title": "रिश्ते सहेजे गए", 
+  "item.edit.bitstreams.headers.bundle": "बंडल",
 
-  "item.edit.relationships.reinstate-button": "पूर्ववत करें", 
+  "item.edit.bitstreams.headers.description": "विवरण",
 
-  "item.edit.relationships.save-button": "सहेजें", 
+  "item.edit.bitstreams.headers.format": "प्रारूप",
 
-  "item.edit.return": "वापस", 
+  "item.edit.bitstreams.headers.name": "नाम",
 
-  "item.edit.tabs.bitstreams.head": "बिटस्ट्रीम", 
+  "item.edit.bitstreams.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें",
 
-  "item.edit.tabs.bitstreams.title": "आइटम संपादन - बिटस्ट्रीम", 
+  "item.edit.bitstreams.notifications.discarded.title": "परिवर्तन रद्द किये गए",
 
-  "item.edit.tabs.curate.head": "क्यूरेट", 
+  "item.edit.bitstreams.notifications.move.failed.title": "बिटस्ट्रीम ले जाने में त्रुटि",
 
-  "item.edit.tabs.curate.title": "आइटम संपादन - क्यूरेट ", 
+  "item.edit.bitstreams.notifications.move.saved.content": "इस आइटम की बिटस्ट्रीम और बंडल में आपके द्वारा किए गए परिवर्तन सहेज लिए गए हैं।",
 
-  "item.edit.tabs.disabled.tooltip": "आप इस टैब में प्रवेश करने के लिए अधिकृत नहीं हैं", 
+  "item.edit.bitstreams.notifications.move.saved.title": "सहेजे गए परिवर्तनों को स्थानांतरित करें",
 
-  "item.edit.tabs.item-mapper.title": "आइटम संपादन - संग्रह मैपर", 
+  "item.edit.bitstreams.notifications.outdated.content": "जिस आइटम पर आप वर्तमान में काम कर रहे हैं, उसे किसी अन्य उपयोगकर्ता ने बदल दिया है। संघर्षों को रोकने के लिए आपके वर्तमान परिवर्तन खारिज कर दिए गए हैं",
 
-  "item.edit.tabs.mapper.head": "संग्रह मैपर", 
+  "item.edit.bitstreams.notifications.outdated.title": "कालग्रस्त परिवर्तन",
 
-  "item.edit.tabs.metadata.head": "मेटाडेटा", 
+  "item.edit.bitstreams.notifications.remove.failed.title": "बिटस्ट्रीम हटाने में त्रुटि",
 
-  "item.edit.tabs.metadata.title": "आइटम संपादन - मेटाडेटा", 
+  "item.edit.bitstreams.notifications.remove.saved.content": "इस आइटम की बिटस्ट्रीम में आपके निष्कासन परिवर्तन सहेज लिए गए हैं।",
 
-  "item.edit.tabs.relationships.head": "संबंध", 
+  "item.edit.bitstreams.notifications.remove.saved.title": "हटाए जाने के बदलाव सहेजे गए",
 
-  "item.edit.tabs.relationships.title": "आइटम संपादन - संबंध", 
+  "item.edit.bitstreams.reinstate-button": "पूर्ववत करें",
 
-  "item.edit.tabs.status.buttons.authorizations.button": "प्राधिकरण...", 
+  "item.edit.bitstreams.save-button": "सहेजें",
 
-  "item.edit.tabs.status.buttons.authorizations.label": "आइटम की प्राधिकरण नीतियां संपादित करें", 
+  "item.edit.bitstreams.upload-button": "अपलोड करें",
 
-  "item.edit.tabs.status.buttons.delete.button": "स्थायी रूप से हटाना", 
+  "item.edit.breadcrumbs": "आइटम संपादित करें",
 
-  "item.edit.tabs.status.buttons.delete.label": "आइटम को पूरी तरह से मिटाएं", 
+  "item.edit.delete.cancel": "रद्द करें",
 
-  "item.edit.tabs.status.buttons.mappedCollections.button": "मैप किए गए संग्रह", 
+  "item.edit.delete.confirm": "हटाएं",
 
-  "item.edit.tabs.status.buttons.mappedCollections.label": "मैप किए गए संग्रह प्रबंधित करें", 
+  "item.edit.delete.description": "क्या आप सुनिश्चित हैं कि यह आइटम पूरी तरह से हटा दिया जाना चाहिए? सावधानी: वर्तमान में कोई tombstone नहीं छोड़ा जाएगा।",
 
-  "item.edit.tabs.status.buttons.move.button": "स्थान परिवर्तन...", 
+  "item.edit.delete.error": "आइटम को हटाते समय कोई त्रुटि उत्पन्न हुई",
 
-  "item.edit.tabs.status.buttons.move.label": "आइटम को दूसरे संग्रह में ले जाएं", 
+  "item.edit.delete.header": "आइटम हटाएं: {{id}}",
 
-  "item.edit.tabs.status.buttons.private.button": "इसे गैर-खोज योग्य बनाएं...", 
+  "item.edit.delete.success": "आइटम हटा दिया गया है",
 
-  "item.edit.tabs.status.buttons.private.label": "आइटम को गैर-खोज योग्य बनाएं", 
+  "item.edit.head": "आइटम संपादित करें",
 
-  "item.edit.tabs.status.buttons.public.button": "इसे खोजने योग्य बनाएं...", 
+  "item.edit.item-mapper.buttons.add": "आइटम को चयनित संग्रहों में मैप करें",
 
-  "item.edit.tabs.status.buttons.public.label": "आइटम को खोजने योग्य बनाएं", 
+  "item.edit.item-mapper.buttons.remove": "चयनित संग्रहों के लिए आइटम की मैपिंग निकालें",
 
-  "item.edit.tabs.status.buttons.reinstate.button": "पुनर्स्थापित करें...", 
+  "item.edit.item-mapper.cancel": "रद्द करें",
 
-  "item.edit.tabs.status.buttons.reinstate.label": "आइटम को संग्रह में पुनर्स्थापित करें", 
+  "item.edit.item-mapper.description": "यह आइटम मैपर टूल है जो प्रशासकों को इस आइटम को अन्य संग्रहों में मैप करने की अनुमति देता है। आप संग्रहों की खोज कर सकते हैं और उन्हें मैप कर सकते हैं, या उन संग्रहों की सूची ब्राउज़ कर सकते हैं जिनसे आइटम वर्तमान में मैप किया गया है।",
 
-  "item.edit.tabs.status.buttons.unauthorized": "आप इस क्रिया को करने के लिए अधिकृत नहीं हैं", 
+  "item.edit.item-mapper.head": "आइटम मैपर - संग्रह के लिए आइटम मैप करें",
 
-  "item.edit.tabs.status.buttons.withdraw.button": "वापस लें...", 
+  "item.edit.item-mapper.item": "आइटम: \"<b>{{name}}</b>\"",
 
-  "item.edit.tabs.status.buttons.withdraw.label": "संग्रहालय से आइटम वापस लेना", 
+  "item.edit.item-mapper.no-search": "खोज करने के लिए कृपया एक प्रश्न दर्ज करें",
 
-  "item.edit.tabs.status.description": "आइटम प्रबंधन पृष्ठ पर आपका स्वागत है। यहां से आप आइटम को वापस ले सकते हैं, बहाल कर सकते हैं, स्थानांतरित कर सकते हैं या हटा सकते हैं। आप अन्य टैब पर नए मेटाडेटा / बिटस्ट्रीम को भी अपडेट या जोड़ सकते हैं।", 
+  "item.edit.item-mapper.notifications.add.error.content": "{{amount}} आइटम को संग्रहों में मैप करने में त्रुटियाँ हुईं।",
 
-  "item.edit.tabs.status.head": "स्थिति", 
+  "item.edit.item-mapper.notifications.add.error.head": "मैपिंग त्रुटियाँ",
 
-  "item.edit.tabs.status.labels.handle": "हैंडल", 
+  "item.edit.item-mapper.notifications.add.success.content": "{{amount}} आइटम को संग्रह में सफलतापूर्वक मैप किया गया।",
 
-  "item.edit.tabs.status.labels.id": "आइटम का आंतरिक आईडी", 
+  "item.edit.item-mapper.notifications.add.success.head": "मैपिंग पूरी हुई",
 
-  "item.edit.tabs.status.labels.itemPage": "आइटम पृष्ठ", 
+  "item.edit.item-mapper.notifications.remove.error.content": "मैपिंग को {{amount}} संग्रह से निकालने में त्रुटियां हुईं.",
 
-  "item.edit.tabs.status.labels.lastModified": "अंतिम संशोधित", 
+  "item.edit.item-mapper.notifications.remove.error.head": "मैपिंग हटाने में त्रुटियां",
 
-  "item.edit.tabs.status.title": "आइटम संपादन - स्थिति", 
+  "item.edit.item-mapper.notifications.remove.success.content": "{{amount}} संग्रह में आइटम की मैपिंग सफलतापूर्वक निकाली गई।",
 
-  "item.edit.tabs.versionhistory.head": "संस्करण इतिहास", 
+  "item.edit.item-mapper.notifications.remove.success.head": "मैपिंग को हटाना पूरा हुआ",
 
-  "item.edit.tabs.versionhistory.title": "आइटम संपादन - संस्करण इतिहास  ", 
+  "item.edit.item-mapper.search-form.placeholder": "संग्रह में खोजें...    ",
 
-  "item.edit.tabs.versionhistory.under-construction": "इस उपयोगकर्ता इंटरफ़ेस में अभी तक नए संस्करण संपादित करना या जोड़ना संभव नहीं है।", 
+  "item.edit.item-mapper.tabs.browse": "मैप किए गए संग्रह ब्राउज़ करें",
 
-  "item.edit.tabs.view.head": "आइटम देखें", 
+  "item.edit.item-mapper.tabs.map": "नए संग्रहों को मैप करें",
 
-  "item.edit.tabs.view.title": "आइटम संपादन - देखें", 
+  "item.edit.metadata.add-button": "जोड़ें",
 
-  "item.edit.withdraw.cancel": "रद्द करें", 
+  "item.edit.metadata.discard-button": "रद्द करें",
 
-  "item.edit.withdraw.confirm": "वापस ले", 
+  "item.edit.metadata.edit.buttons.edit": "संपादित करें",
 
-  "item.edit.withdraw.description": "क्या आप सुनिश्चित हैं कि इस आइटम को संग्रह से वापस ले लिया जाना चाहिए?", 
+  "item.edit.metadata.edit.buttons.remove": "हटाएं",
 
-  "item.edit.withdraw.error": "आइटम वापस लेते समय एक त्रुटि हुई", 
+  "item.edit.metadata.edit.buttons.undo": "परिवर्तन पूर्ववत करें",
 
-  "item.edit.withdraw.header": "आइटम वापस ले: {{ id }}", 
+  "item.edit.metadata.edit.buttons.unedit": "संपादन बंद करें",
 
-  "item.edit.withdraw.success": "आइटम सफलतापूर्वक वापस ले लिया गया", 
+  "item.edit.metadata.empty": "आइटम में वर्तमान में कोई मेटाडेटा नहीं है। मेटाडेटा मान जोड़ना प्रारंभ करने के लिए जोड़ें पर क्लिक करें।",
 
-  "item.listelement.badge": "आइटम", 
+  "item.edit.metadata.headers.edit": "संपादित करें",
 
-  "item.orcid.return": "वापस", 
+  "item.edit.metadata.headers.field": "फील्ड",
 
-  "item.page.abstract": "सारांश", 
+  "item.edit.metadata.headers.language": "भाषा",
 
-  "item.page.author": "लेखक", 
+  "item.edit.metadata.headers.value": "मान",
 
-  "item.page.bitstreams.collapse": "संक्षिप्त करें", 
+  "item.edit.metadata.metadatafield.invalid": "कृपया वैध मेटाडेटा फ़ील्ड चुनें",
 
-  "item.page.bitstreams.view-more": "और दिखाएं", 
+  "item.edit.metadata.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें",
 
-  "item.page.citation": "उद्धरण", 
+  "item.edit.metadata.notifications.discarded.title": "परिवर्तन रद्द किये गए",
 
-  "item.page.claim.button": "दावा", 
+  "item.edit.metadata.notifications.error.title": "एक त्रुटि पाई गई",
 
-  "item.page.claim.tooltip": "इस आइटम को प्रोफ़ाइल के रूप में दावा करें", 
+  "item.edit.metadata.notifications.invalid.content": "आपके परिवर्तन सहेजे नहीं गए थे। कृपया सुनिश्चित करें कि आपके द्वारा सहेजने से पहले सभी फ़ील्ड मान्य हैं।",
 
-  "item.page.collections": "संग्रह", 
+  "item.edit.metadata.notifications.invalid.title": "मेटाडेटा अमान्य",
 
-  "item.page.collections.load-more": "और लोड करें", 
+  "item.edit.metadata.notifications.outdated.content": "जिस आइटम पर आप वर्तमान में काम कर रहे हैं, उसे किसी अन्य उपयोगकर्ता ने बदल दिया है। संघर्षों को रोकने के लिए आपके वर्तमान परिवर्तन खारिज कर दिए गए हैं",
 
-  "item.page.collections.loading": "लोड हो रहा है...", 
+  "item.edit.metadata.notifications.outdated.title": "पुराना बदल गया",
 
-  "item.page.date": "दिनांक", 
+  "item.edit.metadata.notifications.saved.content": "इस आइटम के मेटाडेटा में आपके परिवर्तन सहेजे गए थे।",
 
-  "item.page.description": "विवरण", 
+  "item.edit.metadata.notifications.saved.title": "मेटाडेटा सहेजा गया",
 
-  "item.page.edit": "इस आइटम को संपादित करें", 
+  "item.edit.metadata.reinstate-button": "पूर्ववत करें",
 
-  "item.page.files": "फ़ाइलें", 
+  "item.edit.metadata.save-button": "सहेजें",
 
-  "item.page.filesection.description": "विवरण:", 
+  "item.edit.modify.overview.field": "फ़ील्ड",
 
-  "item.page.filesection.download": "डाउनलोड", 
+  "item.edit.modify.overview.language": "भाषा",
 
-  "item.page.filesection.format": "प्रारूप:", 
+  "item.edit.modify.overview.value": "मान",
 
-  "item.page.filesection.license.bundle": "लाइसेंस बंडल", 
+  "item.edit.move.cancel": "वापस",
 
-  "item.page.filesection.name": "नाम:", 
+  "item.edit.move.description": "उस संग्रह का चयन करें जिसमें आप इस आइटम को ले जाना चाहते हैं। प्रदर्शित संग्रहों की सूची को छोटा करने के लिए, आप बॉक्स में खोज क्वेरी दर्ज कर सकते हैं।",
 
-  "item.page.filesection.original.bundle": "मूल बंडल", 
+  "item.edit.move.discard-button": "रद्द करें",
 
-  "item.page.filesection.size": "आकार:", 
+  "item.edit.move.error": "आइटम को स्थानांतरित करने का प्रयास करते समय कोई त्रुटि उत्पन्न हुई",
 
-  "item.page.journal-issn": "जर्नल आईएसएसएन (ISSN)", 
+  "item.edit.move.head": "आइटम का स्थान परिवर्तन: {{id}}",
 
-  "item.page.journal-title": "पत्रिका शीर्षक", 
+  "item.edit.move.inheritpolicies.checkbox": "नीतियां विरासत में लो",
 
-  "item.page.journal.search.title": "इस पत्रिका में लेख", 
+  "item.edit.move.inheritpolicies.description": "गंतव्य संग्रह की डिफ़ॉल्ट नीतियों को इनहेरिट करें",
 
-  "item.page.link.full": "संपूर्ण आइटम पृष्ठ", 
+  "item.edit.move.move": "स्थान परिवर्तन",
 
-  "item.page.link.simple": "साधारण आइटम पृष्ठ", 
+  "item.edit.move.processing": "चल रहा है...",
 
-  "item.page.orcid.title": "ORCID", 
+  "item.edit.move.save-button": "सहेजें",
 
-  "item.page.orcid.tooltip": "ORCID सेटिंग पृष्ठ खोलें", 
+  "item.edit.move.search.placeholder": "संग्रह देखने के लिए एक खोज क्वेरी दर्ज करें",
 
-  "item.page.person.search.title": "इस लेखक के लेख", 
+  "item.edit.move.success": "आइटम को सफलतापूर्वक स्थानांतरित कर दिया गया है",
 
-  "item.page.publisher": "प्रकाशक", 
+  "item.edit.move.title": "आइटम स्थानांतरण",
 
-  "item.page.related-items.view-less": "{{ amount }} पिछला छिपाएं ", 
+  "item.edit.private.cancel": "रद्द करें",
 
-  "item.page.related-items.view-more": "{{ amount }} और दिखाएं", 
+  "item.edit.private.confirm": "इसे गैर-खोज योग्य बनाएं",
 
-  "item.page.relationships.isAuthorOfPublication": "प्रकाशन", 
+  "item.edit.private.description": "क्या आप सुनिश्चित हैं कि इस आइटम को संग्रह में खोजने योग्य नहीं बनाया जाना चाहिए?",
 
-  "item.page.relationships.isJournalOfPublication": "प्रकाशन", 
+  "item.edit.private.error": "आइटम को गैर-खोज योग्य बनाते समय एक त्रुटि हुई",
 
-  "item.page.relationships.isOrgUnitOfPerson": "लेखक", 
+  "item.edit.private.header": "आइटम को खोजने योग्य न बनाएं: {{ id }}",
 
-  "item.page.relationships.isOrgUnitOfProject": "अनुसंधान परियोजना", 
+  "item.edit.private.success": "आइटम अब खोजने योग्य नहीं है",
 
-  "item.page.return": "वापस", 
+  "item.edit.public.cancel": "रद्द करें",
 
-  "item.page.subject": "खोजशब्द", 
+  "item.edit.public.confirm": "इसे खोजने योग्य बनाएं",
 
-  "item.page.titleprefix": "आइटम: ", 
+  "item.edit.public.description": "क्या आप इस आइटम को संग्रह में खोजने योग्य बनाने के लिए सुनिश्चित हैं?",
 
-  "item.page.uri": "URI", 
+  "item.edit.public.error": "आइटम को खोजने योग्य बनाते समय एक त्रुटि हुई",
 
-  "item.page.version.create": "नया संस्करण बनाएं", 
+  "item.edit.public.header": "आइटम को खोजने योग्य बनाएं: {{ id }}",
 
-  "item.page.version.hasDraft": "नया संस्करण नहीं बनाया जा सकता क्योंकि संस्करण इतिहास में एक प्रगतिशील प्रस्तुति है ", 
+  "item.edit.public.success": "आइटम अब खोजने योग्य है",
 
-  "item.page.volume-title": "अंक शीर्षक", 
+  "item.edit.reinstate.cancel": "रद्द करें",
 
-  "item.preview.dc.contributor.author": "लेखक:", 
+  "item.edit.reinstate.confirm": "पुनर्स्थापित करें",
 
-  "item.preview.dc.coverage.spatial": "अधिकार - क्षेत्र:", 
+  "item.edit.reinstate.description": "क्या आप इस आइटम को संग्रह में पुनर्स्थापित करने के लिए सुनिश्चित हैं?",
 
-  "item.preview.dc.date.issued": "प्रकाशन की तारीख:", 
+  "item.edit.reinstate.error": "आइटम को पुनर्स्थापित करते समय एक त्रुटि हुई",
 
-  "item.preview.dc.description.abstract": "सारांश:", 
+  "item.edit.reinstate.header": "पुनर्स्थापित आइटम: {{ id }}",
 
-  "item.preview.dc.identifier.one": null, 
+  "item.edit.reinstate.success": "आइटम को सफलतापूर्वक बहाल कर दिया गया",
 
-  "item.preview.dc.identifier.other": "Other identifier:", 
+  "item.edit.relationships.discard-button": "रद्द करें",
 
-  "item.preview.dc.identifier.zero": "अन्य पहचानकर्ता:", 
+  "item.edit.relationships.edit.buttons.add": "जोड़ें",
 
-  "item.preview.dc.identifier.doi": "डीओआई (DOI)", 
+  "item.edit.relationships.edit.buttons.remove": "हटाएं",
 
-  "item.preview.dc.identifier.isbn": "ISBN", 
+  "item.edit.relationships.edit.buttons.undo": "परिवर्तन रद्द किये गए",
 
-  "item.preview.dc.identifier.uri": "पहचानकर्ता:", 
+  "item.edit.relationships.no-entity-type": "इस आइटम के लिए संबंध सक्षम करने के लिए 'dspace.entity.type' मेटाडेटा जोड़ें",
 
-  "item.preview.dc.language.iso": "भाषा:", 
+  "item.edit.relationships.no-relationships": "कोई रिश्ता नहीं",
 
-  "item.preview.dc.relation.ispartof": "पत्रिका या श्रृंखला", 
+  "item.edit.relationships.notifications.discarded.content": "आपके परिवर्तन खारिज कर दिए गए थे। अपने परिवर्तनों को बहाल करने के लिए 'पूर्ववत करें' बटन पर क्लिक करें",
 
-  "item.preview.dc.relation.issn": "ISSN", 
+  "item.edit.relationships.notifications.discarded.title": "परिवर्तन रद्द किये गए",
 
-  "item.preview.dc.subject": "विषय:", 
+  "item.edit.relationships.notifications.failed.title": "संबंध संपादित करने में त्रुटि",
 
-  "item.preview.dc.title": "शीर्षक:", 
+  "item.edit.relationships.notifications.outdated.content": "जिस आइटम पर आप वर्तमान में काम कर रहे हैं, उसे किसी अन्य उपयोगकर्ता ने बदल दिया है। संघर्षों को रोकने के लिए आपके वर्तमान परिवर्तन खारिज कर दिए गए हैं",
 
-  "item.preview.dc.title.alternative": "परिवर्णी शब्द:", 
+  "item.edit.relationships.notifications.outdated.title": "परिवर्तन पुराना",
 
-  "item.preview.dc.type": "प्रकार:", 
+  "item.edit.relationships.notifications.saved.content": "इस आइटम के संबंधों में आपके परिवर्तन सहेज लिए गए थे|",
 
-  "item.preview.oaire.awardNumber": "निधि पहचान:", 
+  "item.edit.relationships.notifications.saved.title": "रिश्ते सहेजे गए",
 
-  "item.preview.oaire.citation.issue": "अंक", 
+  "item.edit.relationships.reinstate-button": "पूर्ववत करें",
 
-  "item.preview.oaire.citation.volume": "खंड", 
+  "item.edit.relationships.save-button": "सहेजें",
 
-  "item.preview.oaire.fundingStream": "निधि धारा:", 
+  "item.edit.return": "वापस",
 
-  "item.preview.person.familyName": "उपनाम:", 
+  "item.edit.tabs.bitstreams.head": "बिटस्ट्रीम",
 
-  "item.preview.person.givenName": "नाम:", 
+  "item.edit.tabs.bitstreams.title": "आइटम संपादन - बिटस्ट्रीम",
 
-  "item.preview.person.identifier.orcid": "ORCID:", 
+  "item.edit.tabs.curate.head": "क्यूरेट",
 
-  "item.preview.project.funder.identifier": "निधिदाता की पहचान:", 
+  "item.edit.tabs.curate.title": "आइटम संपादन - क्यूरेट ",
 
-  "item.preview.project.funder.name": "निधिदाता:", 
+  "item.edit.tabs.disabled.tooltip": "आप इस टैब में प्रवेश करने के लिए अधिकृत नहीं हैं",
 
-  "item.search.results.head": "आइटम खोज परिणाम", 
+  "item.edit.tabs.item-mapper.title": "आइटम संपादन - संग्रह मैपर",
 
-  "item.search.title": "आइटम खोज", 
+  "item.edit.tabs.mapper.head": "संग्रह मैपर",
 
-  "item.select.confirm": "चयनित की पुष्टि करें", 
+  "item.edit.tabs.metadata.head": "मेटाडेटा",
 
-  "item.select.empty": "दिखाने के लिए कोई आइटम नहीं है", 
+  "item.edit.tabs.metadata.title": "आइटम संपादन - मेटाडेटा",
 
-  "item.select.table.author": "लेखक", 
+  "item.edit.tabs.relationships.head": "संबंध",
 
-  "item.select.table.collection": "संग्रह", 
+  "item.edit.tabs.relationships.title": "आइटम संपादन - संबंध",
 
-  "item.select.table.title": "शीर्षक", 
+  "item.edit.tabs.status.buttons.authorizations.button": "प्राधिकरण...",
 
-  "item.truncatable-part.show-less": "संक्षिप्त करें", 
+  "item.edit.tabs.status.buttons.authorizations.label": "आइटम की प्राधिकरण नीतियां संपादित करें",
 
-  "item.truncatable-part.show-more": "और दिखाएं", 
+  "item.edit.tabs.status.buttons.delete.button": "स्थायी रूप से हटाना",
 
-  "item.version.create.modal.button.cancel": "रद्द करें", 
+  "item.edit.tabs.status.buttons.delete.label": "आइटम को पूरी तरह से मिटाएं",
 
-  "item.version.create.modal.button.cancel.tooltip": "नया संस्करण न बनाएं", 
+  "item.edit.tabs.status.buttons.mappedCollections.button": "मैप किए गए संग्रह",
 
-  "item.version.create.modal.button.confirm": "बनाएं", 
+  "item.edit.tabs.status.buttons.mappedCollections.label": "मैप किए गए संग्रह प्रबंधित करें",
 
-  "item.version.create.modal.button.confirm.tooltip": "नया संस्करण बनाएं", 
+  "item.edit.tabs.status.buttons.move.button": "स्थान परिवर्तन...",
 
-  "item.version.create.modal.form.summary.label": "Summary", 
+  "item.edit.tabs.status.buttons.move.label": "आइटम को दूसरे संग्रह में ले जाएं",
 
-  "item.version.create.modal.form.summary.placeholder": "नए संस्करण के लिए सारांश डालें", 
+  "item.edit.tabs.status.buttons.private.button": "इसे गैर-खोज योग्य बनाएं...",
 
-  "item.version.create.modal.header": "नया संस्करण", 
+  "item.edit.tabs.status.buttons.private.label": "आइटम को गैर-खोज योग्य बनाएं",
 
-  "item.version.create.modal.submitted.header": "नया संस्करण बनाया जा रहा है...", 
+  "item.edit.tabs.status.buttons.public.button": "इसे खोजने योग्य बनाएं...",
 
-  "item.version.create.modal.submitted.text": "नया संस्करण बनाया जा रहा है। यदि आइटम में बहुत अधिक संबंध हैं तो इसमें कुछ समय लग सकता है।", 
+  "item.edit.tabs.status.buttons.public.label": "आइटम को खोजने योग्य बनाएं",
 
-  "item.version.create.modal.text": "इस आइटम के लिए एक नया संस्करण बनाएं", 
+  "item.edit.tabs.status.buttons.reinstate.button": "पुनर्स्थापित करें...",
 
-  "item.version.create.modal.text.startingFrom": "{{version}} संस्करण से प्रारंभ", 
+  "item.edit.tabs.status.buttons.reinstate.label": "आइटम को संग्रह में पुनर्स्थापित करें",
 
-  "item.version.create.notification.failure": "नया संस्करण नहीं बनाया गया है", 
+  "item.edit.tabs.status.buttons.unauthorized": "आप इस क्रिया को करने के लिए अधिकृत नहीं हैं",
 
-  "item.version.create.notification.inProgress": "एक नया संस्करण नहीं बनाया जा सकता क्योंकि संस्करण इतिहास में एक प्रगतिशील प्रस्तुति है", 
+  "item.edit.tabs.status.buttons.withdraw.button": "वापस लें...",
 
-  "item.version.create.notification.success": "संस्करण संख्या {{version}} के साथ नया संस्करण बनाया गया है", 
+  "item.edit.tabs.status.buttons.withdraw.label": "संग्रहालय से आइटम वापस लेना",
 
-  "item.version.delete.modal.button.cancel": "रद्द करें", 
+  "item.edit.tabs.status.description": "आइटम प्रबंधन पृष्ठ पर आपका स्वागत है। यहां से आप आइटम को वापस ले सकते हैं, बहाल कर सकते हैं, स्थानांतरित कर सकते हैं या हटा सकते हैं। आप अन्य टैब पर नए मेटाडेटा / बिटस्ट्रीम को भी अपडेट या जोड़ सकते हैं।",
 
-  "item.version.delete.modal.button.cancel.tooltip": "इस संस्करण को न हटाएं", 
+  "item.edit.tabs.status.head": "स्थिति",
 
-  "item.version.delete.modal.button.confirm": "हटाएं", 
+  "item.edit.tabs.status.labels.handle": "हैंडल",
 
-  "item.version.delete.modal.button.confirm.tooltip": "इस संस्करण को हटाएं", 
+  "item.edit.tabs.status.labels.id": "आइटम का आंतरिक आईडी",
 
-  "item.version.delete.modal.header": "संस्करण हटाएं", 
+  "item.edit.tabs.status.labels.itemPage": "आइटम पृष्ठ",
 
-  "item.version.delete.modal.text": "क्या आप संस्करण {{version}} को हटाना चाहते हैं?", 
+  "item.edit.tabs.status.labels.lastModified": "अंतिम संशोधित",
 
-  "item.version.delete.notification.failure": "संस्करण संख्या {{version}} को हटाया नहीं गया है", 
+  "item.edit.tabs.status.title": "आइटम संपादन - स्थिति",
 
-  "item.version.delete.notification.success": "संस्करण संख्या {{version}} हटा दिया गया है", 
+  "item.edit.tabs.versionhistory.head": "संस्करण इतिहास",
 
-  "item.version.edit.notification.failure": "संस्करण संख्या {{version}} का सारांश नहीं बदला गया है", 
+  "item.edit.tabs.versionhistory.title": "आइटम संपादन - संस्करण इतिहास  ",
 
-  "item.version.edit.notification.success": "संस्करण संख्या {{version}} का सारांश बदल दिया गया है", 
+  "item.edit.tabs.versionhistory.under-construction": "इस उपयोगकर्ता इंटरफ़ेस में अभी तक नए संस्करण संपादित करना या जोड़ना संभव नहीं है।",
 
-  "item.version.history.empty": "इस आइटम के लिए अभी तक कोई अन्य संस्करण नहीं हैं।", 
+  "item.edit.tabs.view.head": "आइटम देखें",
 
-  "item.version.history.head": "संस्करण इतिहास", 
+  "item.edit.tabs.view.title": "आइटम संपादन - देखें",
 
-  "item.version.history.return": "वापस", 
+  "item.edit.withdraw.cancel": "रद्द करें",
 
-  "item.version.history.selected": "चयनित संस्करण", 
+  "item.edit.withdraw.confirm": "वापस ले",
 
-  "item.version.history.selected.alert": "आप वर्तमान में आइटम का {{version}} संस्करण देख रहे हैं।", 
+  "item.edit.withdraw.description": "क्या आप सुनिश्चित हैं कि इस आइटम को संग्रह से वापस ले लिया जाना चाहिए?",
 
-  "item.version.history.table.action.deleteVersion": "संस्करण हटाएं", 
+  "item.edit.withdraw.error": "आइटम वापस लेते समय एक त्रुटि हुई",
 
-  "item.version.history.table.action.discardSummary": "सारांश सम्पादनों को रद्द करें", 
+  "item.edit.withdraw.header": "आइटम वापस ले: {{ id }}",
 
-  "item.version.history.table.action.editSummary": "सारांश संपादित करें", 
+  "item.edit.withdraw.success": "आइटम सफलतापूर्वक वापस ले लिया गया",
 
-  "item.version.history.table.action.editWorkspaceItem": "कार्यक्षेत्र आइटम संपादित करें", 
+  "item.listelement.badge": "आइटम",
 
-  "item.version.history.table.action.hasDraft": "एक नया संस्करण नहीं बनाया जा सकता क्योंकि संस्करण इतिहास में एक प्रगतिशील प्रस्तुति है", 
+  "item.orcid.return": "वापस",
 
-  "item.version.history.table.action.newVersion": "इससे नया संस्करण बनाएं", 
+  "item.page.abstract": "सारांश",
 
-  "item.version.history.table.action.saveSummary": "सारांश संपादन सहेजें", 
+  "item.page.author": "लेखक",
 
-  "item.version.history.table.actions": "गतिविधि", 
+  "item.page.bitstreams.collapse": "संक्षिप्त करें",
 
-  "item.version.history.table.date": "तारीख", 
+  "item.page.bitstreams.view-more": "और दिखाएं",
 
-  "item.version.history.table.editor": "संपादक", 
+  "item.page.citation": "उद्धरण",
 
-  "item.version.history.table.item": "आइटम", 
+  "item.page.claim.button": "दावा",
 
-  "item.version.history.table.summary": "सारांश", 
+  "item.page.claim.tooltip": "इस आइटम को प्रोफ़ाइल के रूप में दावा करें",
 
-  "item.version.history.table.version": "संस्करण", 
+  "item.page.collections": "संग्रह",
 
-  "item.version.history.table.workflowItem": "कार्यप्रवाह आइटम", 
+  "item.page.collections.load-more": "और लोड करें",
 
-  "item.version.history.table.workspaceItem": "कार्यक्षेत्र आइटम", 
+  "item.page.collections.loading": "लोड हो रहा है...",
 
-  "item.version.notice": "यह इस आइटम का नवीनतम संस्करण नहीं है। नवीनतम संस्करण <a href='{{destination}}'>यहां</a> पाया जा सकता है।", 
+  "item.page.date": "दिनांक",
 
-  "journal-relationships.search.results.head": "पत्रिका खोज परिणाम", 
+  "item.page.description": "विवरण",
 
-  "journal.listelement.badge": "पत्रिका", 
+  "item.page.edit": "इस आइटम को संपादित करें",
 
-  "journal.page.description": "विवरण", 
+  "item.page.files": "फ़ाइलें",
 
-  "journal.page.edit": "इस आइटम को संपादित करें", 
+  "item.page.filesection.description": "विवरण:",
 
-  "journal.page.editor": "मुख्या संपादक", 
+  "item.page.filesection.download": "डाउनलोड",
 
-  "journal.page.issn": "ISSN", 
+  "item.page.filesection.format": "प्रारूप:",
 
-  "journal.page.publisher": "प्रकाशक", 
+  "item.page.filesection.license.bundle": "लाइसेंस बंडल",
 
-  "journal.page.titleprefix": "पत्रिका: ", 
+  "item.page.filesection.name": "नाम:",
 
-  "journal.search.results.head": "पत्रिका खोज परिणाम", 
+  "item.page.filesection.original.bundle": "मूल बंडल",
 
-  "journal.search.title": "पत्रिका खोज", 
+  "item.page.filesection.size": "आकार:",
 
-  "journalissue.listelement.badge": "पत्रिका अंक", 
+  "item.page.journal-issn": "जर्नल आईएसएसएन (ISSN)",
 
-  "journalissue.page.description": "विवरण", 
+  "item.page.journal-title": "पत्रिका शीर्षक",
 
-  "journalissue.page.edit": "इस आइटम को संपादित करें", 
+  "item.page.journal.search.title": "इस पत्रिका में लेख",
 
-  "journalissue.page.issuedate": "जारी करने की तिथि", 
+  "item.page.link.full": "संपूर्ण आइटम पृष्ठ",
 
-  "journalissue.page.journal-issn": "पत्रिका ISSN", 
+  "item.page.link.simple": "साधारण आइटम पृष्ठ",
 
-  "journalissue.page.journal-title": "पत्रिका का शीर्षक", 
+  "item.page.orcid.title": "ORCID",
 
-  "journalissue.page.keyword": "खोजशब्द", 
+  "item.page.orcid.tooltip": "ORCID सेटिंग पृष्ठ खोलें",
 
-  "journalissue.page.number": "संख्या", 
+  "item.page.person.search.title": "इस लेखक के लेख",
 
-  "journalissue.page.titleprefix": "पत्रिका अंक:", 
+  "item.page.publisher": "प्रकाशक",
 
-  "journalvolume.listelement.badge": "पत्रिका खंड", 
+  "item.page.related-items.view-less": "{{ amount }} पिछला छिपाएं ",
 
-  "journalvolume.page.description": "विवरण", 
+  "item.page.related-items.view-more": "{{ amount }} और दिखाएं",
 
-  "journalvolume.page.edit": "इस आइटम को संपादित करें", 
+  "item.page.relationships.isAuthorOfPublication": "प्रकाशन",
 
-  "journalvolume.page.issuedate": "जारी करने की तिथि", 
+  "item.page.relationships.isJournalOfPublication": "प्रकाशन",
 
-  "journalvolume.page.titleprefix": "पत्रिका खंड: ", 
+  "item.page.relationships.isOrgUnitOfPerson": "लेखक",
 
-  "journalvolume.page.volume": "खंड", 
+  "item.page.relationships.isOrgUnitOfProject": "अनुसंधान परियोजना",
 
-  "layouts.application.about": "के संबंध में", 
+  "item.page.return": "वापस",
 
-  "layouts.application.account": "खाता", 
+  "item.page.subject": "खोजशब्द",
 
-  "layouts.application.app_store": "ऐप स्टोर", 
+  "item.page.titleprefix": "आइटम: ",
 
-  "layouts.application.imprint": "छाप", 
+  "item.page.uri": "URI",
 
-  "layouts.application.logout": "लॉग आउट", 
+  "item.page.version.create": "नया संस्करण बनाएं",
 
-  "layouts.application.my_mails": "मेरे मेल", 
+  "item.page.version.hasDraft": "नया संस्करण नहीं बनाया जा सकता क्योंकि संस्करण इतिहास में एक प्रगतिशील प्रस्तुति है ",
 
-  "layouts.application.press": "प्रेस", 
+  "item.page.volume-title": "अंक शीर्षक",
 
-  "layouts.application.preview": "पूर्वावलोकन", 
+  "item.preview.dc.contributor.author": "लेखक:",
 
-  "layouts.application.profile": "प्रोफ़ाइल", 
+  "item.preview.dc.coverage.spatial": "अधिकार - क्षेत्र:",
 
-  "layouts.application.sign_in": "लॉग इन करें", 
+  "item.preview.dc.date.issued": "प्रकाशन की तारीख:",
 
-  "layouts.application.sign_up": "पंजीकृत करें ", 
+  "item.preview.dc.description.abstract": "सारांश:",
 
-  "loading.bitstream": "बिटस्ट्रीम लोड हो रहा है...", 
+  "item.preview.dc.identifier.one": null,
 
-  "loading.bitstreams": "बिटस्ट्रीम लोड हो रहा है...", 
+  "item.preview.dc.identifier.other": "Other identifier:",
 
-  "loading.browse-by": "लोड हो रहा है आइटम...", 
+  "item.preview.dc.identifier.zero": "अन्य पहचानकर्ता:",
 
-  "loading.browse-by-page": "पृष्ठ लोड हो रहा है...", 
+  "item.preview.dc.identifier.doi": "डीओआई (DOI)",
 
-  "loading.collection": "संग्रह लोड हो रहा है...", 
+  "item.preview.dc.identifier.isbn": "ISBN",
 
-  "loading.collections": "संग्रह लोड हो रहे हैं...", 
+  "item.preview.dc.identifier.uri": "पहचानकर्ता:",
 
-  "loading.community": "समुदाय लोड हो रहा है...", 
+  "item.preview.dc.language.iso": "भाषा:",
 
-  "loading.content-source": "सामग्री स्रोत लोड हो रहा है...", 
+  "item.preview.dc.relation.ispartof": "पत्रिका या श्रृंखला",
 
-  "loading.default": "लोड हो रहा है...", 
+  "item.preview.dc.relation.issn": "ISSN",
 
-  "loading.item": "आइटम लोड हो रहा है...", 
+  "item.preview.dc.subject": "विषय:",
 
-  "loading.items": "आइटम लोड हो रहे हैं...", 
+  "item.preview.dc.title": "शीर्षक:",
 
-  "loading.mydspace-results": "आइटम लोड हो रहे हैं...", 
+  "item.preview.dc.title.alternative": "परिवर्णी शब्द:",
 
-  "loading.objects": "लोड हो रहा है...", 
+  "item.preview.dc.type": "प्रकार:",
 
-  "loading.recent-submissions": "हाल ही की प्रस्तुतियाँ लोड हो रही हैं...", 
+  "item.preview.oaire.awardNumber": "निधि पहचान:",
 
-  "loading.search-results": "खोज परिणाम लोड हो रहे हैं...", 
+  "item.preview.oaire.citation.issue": "अंक",
 
-  "loading.sub-collections": "उप-संग्रह लोड हो रहा है...", 
+  "item.preview.oaire.citation.volume": "खंड",
 
-  "loading.sub-communities": "उप-समुदाय लोड हो रहे हैं...", 
+  "item.preview.oaire.fundingStream": "निधि धारा:",
 
-  "loading.top-level-communities": "शीर्ष-स्तरीय समुदाय लोड हो रहे हैं...", 
+  "item.preview.person.familyName": "उपनाम:",
 
-  "login.breadcrumbs": "लॉग इन करें", 
+  "item.preview.person.givenName": "नाम:",
 
-  "login.form.email": "ईमेल पता", 
+  "item.preview.person.identifier.orcid": "ORCID:",
 
-  "login.form.forgot-password": "क्या आप अपना पासवर्ड भूल गए हैं?", 
+  "item.preview.project.funder.identifier": "निधिदाता की पहचान:",
 
-  "login.form.header": "कृपया डीस्पेस में लॉग इन करें", 
+  "item.preview.project.funder.name": "निधिदाता:",
 
-  "login.form.new-user": "नया उपयोगकर्ता? पंजीकरण करने के लिए यहां क्लिक करें।", 
+  "item.search.results.head": "आइटम खोज परिणाम",
 
-  "login.form.oidc": "ओआईडीसी (OIDC) के साथ लॉग इन करें", 
+  "item.search.title": "आइटम खोज",
 
-  "login.form.or-divider": "अथवा", 
+  "item.select.confirm": "चयनित की पुष्टि करें",
 
-  "login.form.orcid": "ORCID के साथ लॉग इन करें", 
+  "item.select.empty": "दिखाने के लिए कोई आइटम नहीं है",
 
-  "login.form.password": "पासवर्ड", 
+  "item.select.table.author": "लेखक",
 
-  "login.form.shibboleth": "शिबोलेथ के साथ लॉग इन करें", 
+  "item.select.table.collection": "संग्रह",
 
-  "login.form.submit": "लॉग इन करें", 
+  "item.select.table.title": "शीर्षक",
 
-  "login.title": "लॉग इन करें", 
+  "item.truncatable-part.show-less": "संक्षिप्त करें",
 
-  "logout.form.header": "डीस्पेस से लॉग आउट करें", 
+  "item.truncatable-part.show-more": "और दिखाएं",
 
-  "logout.form.submit": "लॉग आउट करें", 
+  "item.version.create.modal.button.cancel": "रद्द करें",
 
-  "logout.title": "लॉग आउट", 
+  "item.version.create.modal.button.cancel.tooltip": "नया संस्करण न बनाएं",
 
-  "media-viewer.next": "अगला", 
+  "item.version.create.modal.button.confirm": "बनाएं",
 
-  "media-viewer.playlist": "प्लेलिस्ट", 
+  "item.version.create.modal.button.confirm.tooltip": "नया संस्करण बनाएं",
 
-  "media-viewer.previous": "पिछला", 
+  "item.version.create.modal.form.summary.label": "Summary",
 
-  "menu.header.admin": "प्रबंधन", 
+  "item.version.create.modal.form.summary.placeholder": "नए संस्करण के लिए सारांश डालें",
 
-  "menu.header.admin.description": "प्रबंधन मेनू", 
+  "item.version.create.modal.header": "नया संस्करण",
 
-  "menu.header.image.logo": "संग्रहालय चिन्ह", 
+  "item.version.create.modal.submitted.header": "नया संस्करण बनाया जा रहा है...",
 
-  "menu.section.access_control": "अभिगम नियंत्रण", 
+  "item.version.create.modal.submitted.text": "नया संस्करण बनाया जा रहा है। यदि आइटम में बहुत अधिक संबंध हैं तो इसमें कुछ समय लग सकता है।",
 
-  "menu.section.access_control_authorizations": "प्राधिकरण", 
+  "item.version.create.modal.text": "इस आइटम के लिए एक नया संस्करण बनाएं",
 
-  "menu.section.access_control_groups": "समूह", 
+  "item.version.create.modal.text.startingFrom": "{{version}} संस्करण से प्रारंभ",
 
-  "menu.section.access_control_people": "लोग", 
+  "item.version.create.notification.failure": "नया संस्करण नहीं बनाया गया है",
 
-  "menu.section.admin_search": "व्यवस्थापक खोज", 
+  "item.version.create.notification.inProgress": "एक नया संस्करण नहीं बनाया जा सकता क्योंकि संस्करण इतिहास में एक प्रगतिशील प्रस्तुति है",
 
-  "menu.section.browse_community": "यह समुदाय", 
+  "item.version.create.notification.success": "संस्करण संख्या {{version}} के साथ नया संस्करण बनाया गया है",
 
-  "menu.section.browse_community_by_author": "लेखक द्वारा", 
+  "item.version.delete.modal.button.cancel": "रद्द करें",
 
-  "menu.section.browse_community_by_issue_date": "जारी करने की तिथि के अनुसार", 
+  "item.version.delete.modal.button.cancel.tooltip": "इस संस्करण को न हटाएं",
 
-  "menu.section.browse_community_by_title": "शीर्षक के द्वारा", 
+  "item.version.delete.modal.button.confirm": "हटाएं",
 
-  "menu.section.browse_global": "सम्पूर्ण डीस्पेस", 
+  "item.version.delete.modal.button.confirm.tooltip": "इस संस्करण को हटाएं",
 
-  "menu.section.browse_global_by_author": "लेखक द्वारा", 
+  "item.version.delete.modal.header": "संस्करण हटाएं",
 
-  "menu.section.browse_global_by_dateissued": "जारी करने की तिथि के द्वारा", 
+  "item.version.delete.modal.text": "क्या आप संस्करण {{version}} को हटाना चाहते हैं?",
 
-  "menu.section.browse_global_by_subject": "विषय द्वारा", 
+  "item.version.delete.notification.failure": "संस्करण संख्या {{version}} को हटाया नहीं गया है",
 
-  "menu.section.browse_global_by_title": "शीर्षक द्वारा", 
+  "item.version.delete.notification.success": "संस्करण संख्या {{version}} हटा दिया गया है",
 
-  "menu.section.browse_global_communities_and_collections": "समुदाय और संग्रह", 
+  "item.version.edit.notification.failure": "संस्करण संख्या {{version}} का सारांश नहीं बदला गया है",
 
-  "menu.section.control_panel": "नियंत्रण कक्ष", 
+  "item.version.edit.notification.success": "संस्करण संख्या {{version}} का सारांश बदल दिया गया है",
 
-  "menu.section.curation_task": "क्यूरेशन टास्क", 
+  "item.version.history.empty": "इस आइटम के लिए अभी तक कोई अन्य संस्करण नहीं हैं।",
 
-  "menu.section.edit": "संपादित करें", 
+  "item.version.history.head": "संस्करण इतिहास",
 
-  "menu.section.edit_collection": "संग्रह", 
+  "item.version.history.return": "वापस",
 
-  "menu.section.edit_community": "समुदाय", 
+  "item.version.history.selected": "चयनित संस्करण",
 
-  "menu.section.edit_item": "आइटम", 
+  "item.version.history.selected.alert": "आप वर्तमान में आइटम का {{version}} संस्करण देख रहे हैं।",
 
-  "menu.section.export": "निर्यात करें", 
+  "item.version.history.table.action.deleteVersion": "संस्करण हटाएं",
 
-  "menu.section.export_collection": "संग्रह", 
+  "item.version.history.table.action.discardSummary": "सारांश सम्पादनों को रद्द करें",
 
-  "menu.section.export_community": "समुदाय", 
+  "item.version.history.table.action.editSummary": "सारांश संपादित करें",
 
-  "menu.section.export_item": "आइटम", 
+  "item.version.history.table.action.editWorkspaceItem": "कार्यक्षेत्र आइटम संपादित करें",
 
-  "menu.section.export_metadata": "मेटाडेटा", 
+  "item.version.history.table.action.hasDraft": "एक नया संस्करण नहीं बनाया जा सकता क्योंकि संस्करण इतिहास में एक प्रगतिशील प्रस्तुति है",
 
-  "menu.section.health": "स्वास्थ्य", 
+  "item.version.history.table.action.newVersion": "इससे नया संस्करण बनाएं",
 
-  "menu.section.icon.access_control": "अभिगम नियंत्रण मेन्यू अनुभाग", 
+  "item.version.history.table.action.saveSummary": "सारांश संपादन सहेजें",
 
-  "menu.section.icon.admin_search": "व्यवस्थापक खोज मेनू अनुभाग", 
+  "item.version.history.table.actions": "गतिविधि",
 
-  "menu.section.icon.control_panel": "नियंत्रण कक्ष मेन्यू अनुभाग", 
+  "item.version.history.table.date": "तारीख",
 
-  "menu.section.icon.curation_tasks": "अवधि कार्य मेनू अनुभाग", 
+  "item.version.history.table.editor": "संपादक",
 
-  "menu.section.icon.edit": "मेन्यू अनुभाग संपादित करें", 
+  "item.version.history.table.item": "आइटम",
 
-  "menu.section.icon.export": "निर्यात मेनू अनुभाग", 
+  "item.version.history.table.summary": "सारांश",
 
-  "menu.section.icon.find": "मेनू अनुभाग खोजें", 
+  "item.version.history.table.version": "संस्करण",
 
-  "menu.section.icon.health": "स्वास्थ्य जांच मेनू अनुभाग", 
+  "item.version.history.table.workflowItem": "कार्यप्रवाह आइटम",
 
-  "menu.section.icon.import": "आयात मेनू अनुभाग", 
+  "item.version.history.table.workspaceItem": "कार्यक्षेत्र आइटम",
 
-  "menu.section.icon.new": "नया मेनू अनुभाग", 
+  "item.version.notice": "यह इस आइटम का नवीनतम संस्करण नहीं है। नवीनतम संस्करण <a href='{{destination}}'>यहां</a> पाया जा सकता है।",
 
-  "menu.section.icon.pin": "साइडबार पिन करें", 
+  "journal-relationships.search.results.head": "पत्रिका खोज परिणाम",
 
-  "menu.section.icon.processes": "प्रक्रिया स्वास्थ्य", 
+  "journal.listelement.badge": "पत्रिका",
 
-  "menu.section.icon.registries": "रजिस्ट्रियां मेन्यू अनुभाग", 
+  "journal.page.description": "विवरण",
 
-  "menu.section.icon.statistics_task": "सांख्यिकी कार्य मेनू अनुभाग", 
+  "journal.page.edit": "इस आइटम को संपादित करें",
 
-  "menu.section.icon.unpin": "साइडबार अनपिन करें", 
+  "journal.page.editor": "मुख्या संपादक",
 
-  "menu.section.icon.workflow": "कार्यप्रवाह मेनू अनुभाग का व्यवस्थापन करें", 
+  "journal.page.issn": "ISSN",
 
-  "menu.section.import": "आयात", 
+  "journal.page.publisher": "प्रकाशक",
 
-  "menu.section.import_batch": "खेप आयात (ZIP)", 
+  "journal.page.titleprefix": "पत्रिका: ",
 
-  "menu.section.import_metadata": "मेटाडाटा ", 
+  "journal.search.results.head": "पत्रिका खोज परिणाम",
 
-  "menu.section.new": "नया", 
+  "journal.search.title": "पत्रिका खोज",
 
-  "menu.section.new_collection": "संग्रह", 
+  "journalissue.listelement.badge": "पत्रिका अंक",
 
-  "menu.section.new_community": "समुदाय", 
+  "journalissue.page.description": "विवरण",
 
-  "menu.section.new_item": "आइटम", 
+  "journalissue.page.edit": "इस आइटम को संपादित करें",
 
-  "menu.section.new_item_version": "आइटम संस्करण", 
+  "journalissue.page.issuedate": "जारी करने की तिथि",
 
-  "menu.section.new_process": "प्रक्रिया", 
+  "journalissue.page.journal-issn": "पत्रिका ISSN",
 
-  "menu.section.pin": "साइडबार नत्थी करें", 
+  "journalissue.page.journal-title": "पत्रिका का शीर्षक",
 
-  "menu.section.processes": "प्रक्रियाएं", 
+  "journalissue.page.keyword": "खोजशब्द",
 
-  "menu.section.registries": "रजिस्ट्री", 
+  "journalissue.page.number": "संख्या",
 
-  "menu.section.registries_format": "प्रारूप", 
+  "journalissue.page.titleprefix": "पत्रिका अंक:",
 
-  "menu.section.registries_metadata": "मेटाडाटा", 
+  "journalvolume.listelement.badge": "पत्रिका खंड",
 
-  "menu.section.statistics": "सांख्यिकी", 
+  "journalvolume.page.description": "विवरण",
 
-  "menu.section.statistics_task": "सांख्यिकी कार्य", 
+  "journalvolume.page.edit": "इस आइटम को संपादित करें",
 
-  "menu.section.toggle.access_control": "अभिगम नियंत्रण अनुभाग टॉगल करें", 
+  "journalvolume.page.issuedate": "जारी करने की तिथि",
 
-  "menu.section.toggle.control_panel": "नियंत्रण कक्ष अनुभाग टॉगल करें", 
+  "journalvolume.page.titleprefix": "पत्रिका खंड: ",
 
-  "menu.section.toggle.curation_task": "क्यूरेशन कार्य अनुभाग टॉगल करें  ", 
+  "journalvolume.page.volume": "खंड",
 
-  "menu.section.toggle.edit": "संपादन कार्य अनुभाग टॉगल करें  ", 
+  "layouts.application.about": "के संबंध में",
 
-  "menu.section.toggle.export": "निर्यात कार्य अनुभाग टॉगल करें  ", 
+  "layouts.application.account": "खाता",
 
-  "menu.section.toggle.find": "अनुभाग खोजें टॉगल करें", 
+  "layouts.application.app_store": "ऐप स्टोर",
 
-  "menu.section.toggle.import": "आयात अनुभाग टॉगल करें", 
+  "layouts.application.imprint": "छाप",
 
-  "menu.section.toggle.new": "नया अनुभाग टॉगल करें", 
+  "layouts.application.logout": "लॉग आउट",
 
-  "menu.section.toggle.registries": "रजिस्ट्री अनुभाग टॉगल करें", 
+  "layouts.application.my_mails": "मेरे मेल",
 
-  "menu.section.toggle.statistics_task": "सांख्यिकी कार्य अनुभाग टॉगल करें", 
+  "layouts.application.press": "प्रेस",
 
-  "menu.section.unpin": "साइडबार अनपिन करें", 
+  "layouts.application.preview": "पूर्वावलोकन",
 
-  "menu.section.workflow": "कार्यप्रवाह व्यवस्थापित करें", 
+  "layouts.application.profile": "प्रोफ़ाइल",
 
-  "metadata-export-search.submit.error": "निर्यात प्रारंभ करना विफल रहा", 
+  "layouts.application.sign_in": "लॉग इन करें",
 
-  "metadata-export-search.submit.success": "निर्यात सफलतापूर्वक शुरू किया गया था", 
+  "layouts.application.sign_up": "पंजीकृत करें ",
 
-  "metadata-export-search.tooltip": "खोज परिणामों को CSV के रूप में निर्यात करें", 
+  "loading.bitstream": "बिटस्ट्रीम लोड हो रहा है...",
 
-  "mydspace.breadcrumbs": "मेरा डीस्पेस", 
+  "loading.bitstreams": "बिटस्ट्रीम लोड हो रहा है...",
 
-  "mydspace.description": null, 
+  "loading.browse-by": "लोड हो रहा है आइटम...",
 
-  "mydspace.general.text-here": "यहां", 
+  "loading.browse-by-page": "पृष्ठ लोड हो रहा है...",
 
-  "mydspace.messages.controller-help": "आइटम के प्रस्तुतकर्ता को संदेश भेजने के लिए इस विकल्प का चयन करें।", 
+  "loading.collection": "संग्रह लोड हो रहा है...",
 
-  "mydspace.messages.description-placeholder": "अपना संदेश यहां डालें...", 
+  "loading.collections": "संग्रह लोड हो रहे हैं...",
 
-  "mydspace.messages.hide-msg": "संदेश छुपाएं", 
+  "loading.community": "समुदाय लोड हो रहा है...",
 
-  "mydspace.messages.mark-as-read": "पढ़ा गया के रूप में चिह्नित करें", 
+  "loading.content-source": "सामग्री स्रोत लोड हो रहा है...",
 
-  "mydspace.messages.mark-as-unread": "अपठित के रूप में चिह्नित करें", 
+  "loading.default": "लोड हो रहा है...",
 
-  "mydspace.messages.no-content": "कोई सामग्री नहीं है।", 
+  "loading.item": "आइटम लोड हो रहा है...",
 
-  "mydspace.messages.no-messages": "अभी तक कोई संदेश नहीं।", 
+  "loading.items": "आइटम लोड हो रहे हैं...",
 
-  "mydspace.messages.send-btn": "भेजें", 
+  "loading.mydspace-results": "आइटम लोड हो रहे हैं...",
 
-  "mydspace.messages.show-msg": "संदेश दिखाएँ", 
+  "loading.objects": "लोड हो रहा है...",
 
-  "mydspace.messages.subject-placeholder": "विषय...", 
+  "loading.recent-submissions": "हाल ही की प्रस्तुतियाँ लोड हो रही हैं...",
 
-  "mydspace.messages.submitter-help": "नियंत्रक को संदेश भेजने के लिए इस विकल्प का चयन करें।", 
+  "loading.search-results": "खोज परिणाम लोड हो रहे हैं...",
 
-  "mydspace.messages.title": "संदेश", 
+  "loading.sub-collections": "उप-संग्रह लोड हो रहा है...",
 
-  "mydspace.messages.to": "तक", 
+  "loading.sub-communities": "उप-समुदाय लोड हो रहे हैं...",
 
-  "mydspace.new-submission": "नया प्रस्तुतीकरण", 
+  "loading.top-level-communities": "शीर्ष-स्तरीय समुदाय लोड हो रहे हैं...",
 
-  "mydspace.new-submission-external": "बाहरी स्रोत से मेटाडेटा आयात करें", 
+  "login.breadcrumbs": "लॉग इन करें",
 
-  "mydspace.new-submission-external-short": "मेटाडेटा आयात करें", 
+  "login.form.email": "ईमेल पता",
 
-  "mydspace.results.head": "आपकी प्रस्तुतियाँ", 
+  "login.form.forgot-password": "क्या आप अपना पासवर्ड भूल गए हैं?",
 
-  "mydspace.results.no-abstract": "कोई सार नहीं", 
+  "login.form.header": "कृपया डीस्पेस में लॉग इन करें",
 
-  "mydspace.results.no-authors": "कोई लेखक नहीं", 
+  "login.form.new-user": "नया उपयोगकर्ता? पंजीकरण करने के लिए यहां क्लिक करें।",
 
-  "mydspace.results.no-collections": "कोई संग्रह नहीं", 
+  "login.form.oidc": "ओआईडीसी (OIDC) के साथ लॉग इन करें",
 
-  "mydspace.results.no-date": "कोई तारीख नहीं", 
+  "login.form.or-divider": "अथवा",
 
-  "mydspace.results.no-files": "कोई फाइल नहीं", 
+  "login.form.orcid": "ORCID के साथ लॉग इन करें",
 
-  "mydspace.results.no-results": "दिखाने के लिए कोई आइटम नहीं थे", 
+  "login.form.password": "पासवर्ड",
 
-  "mydspace.results.no-title": "कोई शीर्षक नहीं", 
+  "login.form.shibboleth": "शिबोलेथ के साथ लॉग इन करें",
 
-  "mydspace.results.no-uri": "Uri नहीं है", 
+  "login.form.submit": "लॉग इन करें",
 
-  "mydspace.search-form.placeholder": "मेरे डीस्पेस में खोजें...", 
+  "login.title": "लॉग इन करें",
 
-  "mydspace.show.workflow": "कार्यप्रवाह कार्य", 
+  "logout.form.header": "डीस्पेस से लॉग आउट करें",
 
-  "mydspace.show.workspace": "आपकी प्रस्तुतियां", 
+  "logout.form.submit": "लॉग आउट करें",
 
-  "mydspace.status.archived": "संग्रहीत", 
+  "logout.title": "लॉग आउट",
 
-  "mydspace.status.validation": "सत्यापन", 
+  "media-viewer.next": "अगला",
 
-  "mydspace.status.waiting-for-controller": "नियंत्रक की प्रतीक्षा कर रहा है", 
+  "media-viewer.playlist": "प्लेलिस्ट",
 
-  "mydspace.status.workflow": "कार्यप्रवाह", 
+  "media-viewer.previous": "पिछला",
 
-  "mydspace.status.workspace": "कार्यस्थान", 
+  "menu.header.admin": "प्रबंधन",
 
-  "mydspace.title": "मेरा डीस्पेस", 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "menu.section.reports": "Reports",
 
-  "mydspace.upload.upload-failed": "नया कार्यस्थान बनाने में त्रुटि. कृपया पुनः प्रयास करने से पहले अपलोड की गई सामग्री को सत्यापित करें।", 
+  // "menu.section.reports.collections": "Filtered Collections",
+  // TODO New key - Add a translation
+  "menu.section.reports.collections": "Filtered Collections",
 
-  "mydspace.upload.upload-failed-manyentries": "असंसाधित फ़ाइल। बहुत अधिक प्रविष्टियों का पता लगाया लेकिन फ़ाइल के लिए केवल एक की अनुमति दी।", 
+  // "menu.section.reports.queries": "Metadata Query",
+  // TODO New key - Add a translation
+  "menu.section.reports.queries": "Metadata Query",
 
-  "mydspace.upload.upload-failed-moreonefile": "असंसाधित अनुरोध। केवल एक फ़ाइल की अनुमति है।", 
+  "menu.section.admin_search": "व्यवस्थापक खोज",
 
-  "mydspace.upload.upload-multiple-successful": "{{qty}} नए कार्यक्षेत्र आइटम बनाए गए।", 
+  "menu.header.admin.description": "प्रबंधन मेनू",
 
-  "mydspace.upload.upload-successful": "नया कार्यस्थान आइटम बनाया गया। इसे संपादित करने के लिए {{here}} क्लिक करें।", 
+  "menu.header.image.logo": "संग्रहालय चिन्ह",
 
-  "mydspace.view-btn": "देखें", 
+  "menu.section.access_control": "अभिगम नियंत्रण",
 
-  "nav.browse.header": "सम्पूर्ण डीस्पेस", 
+  "menu.section.access_control_authorizations": "प्राधिकरण",
 
-  "nav.community-browse.header": "समुदाय द्वारा", 
+  "menu.section.access_control_groups": "समूह",
 
-  "nav.language": "भाषा स्विच", 
+  "menu.section.access_control_people": "लोग",
 
-  "nav.login": "लॉग इन करें", 
+  "menu.section.admin_search": "व्यवस्थापक खोज",
 
-  "nav.logout": "उपयोगकर्ता प्रोफ़ाइल मेनू और लॉग आउट", 
+  "menu.section.browse_community": "यह समुदाय",
 
-  "nav.main.description": "मुख्य नेविगेशन बार", 
+  "menu.section.browse_community_by_author": "लेखक द्वारा",
 
-  "nav.mydspace": "मेरा डीस्पेस", 
+  "menu.section.browse_community_by_issue_date": "जारी करने की तिथि के अनुसार",
 
-  "nav.profile": "प्रोफ़ाइल", 
+  "menu.section.browse_community_by_title": "शीर्षक के द्वारा",
 
-  "nav.search": "खोजें", 
+  "menu.section.browse_global": "सम्पूर्ण डीस्पेस",
 
-  "nav.statistics.header": "सांख्यिकी", 
+  "menu.section.browse_global_by_author": "लेखक द्वारा",
 
-  "nav.stop-impersonating": "ई-व्यक्ति का रूप धारण करना बंद करें", 
+  "menu.section.browse_global_by_dateissued": "जारी करने की तिथि के द्वारा",
 
-  "nav.toggle": "नेविगेशन टॉगल करें", 
+  "menu.section.browse_global_by_subject": "विषय द्वारा",
 
-  "nav.user.description": "उपयोगकर्ता प्रोफ़ाइल बार", 
+  "menu.section.browse_global_by_title": "शीर्षक द्वारा",
 
-  "none.listelement.badge": "आइटम", 
+  "menu.section.browse_global_communities_and_collections": "समुदाय और संग्रह",
 
-  "orgunit.listelement.badge": "संगठित इकाई", 
+  "menu.section.control_panel": "नियंत्रण कक्ष",
 
-  "orgunit.page.city": "शहर", 
+  "menu.section.curation_task": "क्यूरेशन टास्क",
 
-  "orgunit.page.country": "देश", 
+  "menu.section.edit": "संपादित करें",
 
-  "orgunit.page.dateestablished": "स्थापना की तिथि", 
+  "menu.section.edit_collection": "संग्रह",
 
-  "orgunit.page.description": "विवरण", 
+  "menu.section.edit_community": "समुदाय",
 
-  "orgunit.page.edit": "इस आइटम को संपादित करें", 
+  "menu.section.edit_item": "आइटम",
 
-  "orgunit.page.id": "पहचान", 
+  "menu.section.export": "निर्यात करें",
 
-  "orgunit.page.titleprefix": "संगठनात्मक इकाइयाँ: ", 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
 
-  "pagination.next.button": "अगला", 
+  "menu.section.icon.admin_search": "व्यवस्थापक खोज मेनू अनुभाग",
 
-  "pagination.next.button.disabled.tooltip": "परिणामों के और पृष्ठ नहीं", 
+  "menu.section.export_collection": "संग्रह",
 
-  "pagination.options.description": "पृष्ठांकन के विकल्प", 
+  "menu.section.export_community": "समुदाय",
 
-  "pagination.previous.button": "पिछला", 
+  "menu.section.export_item": "आइटम",
 
-  "pagination.results-per-page": "प्रति पृष्ठ परिणाम", 
+  "menu.section.export_metadata": "मेटाडेटा",
 
-  "pagination.showing.detail": "{{ range }} में से {{ total }}", 
+  "menu.section.health": "स्वास्थ्य",
 
-  "pagination.showing.label": "अब दिखा रहे हैं", 
+  "menu.section.icon.access_control": "अभिगम नियंत्रण मेन्यू अनुभाग",
 
-  "pagination.sort-direction": "क्रमबद्ध विकल्प", 
+  "menu.section.icon.admin_search": "व्यवस्थापक खोज मेनू अनुभाग",
 
-  "person-relationships.search.results.head": "व्यक्ति खोज परिणाम", 
+  "menu.section.icon.control_panel": "नियंत्रण कक्ष मेन्यू अनुभाग",
 
-  "person.listelement.badge": "व्यक्ति", 
+  "menu.section.icon.curation_tasks": "अवधि कार्य मेनू अनुभाग",
 
-  "person.listelement.no-title": "कोई नाम नहीं मिला", 
+  "menu.section.icon.edit": "मेन्यू अनुभाग संपादित करें",
 
-  "person.orcid.registry.auth": "ORCID प्राधिकरण", 
+  "menu.section.icon.export": "निर्यात मेनू अनुभाग",
 
-  "person.orcid.registry.queue": "ORCID रजिस्ट्री कतार", 
+  "menu.section.icon.find": "मेनू अनुभाग खोजें",
 
-  "person.orcid.sync.setting": "ORCID तुल्यकालन सेटिंग्स", 
+  "menu.section.icon.health": "स्वास्थ्य जांच मेनू अनुभाग",
 
-  "person.page.birthdate": "जन्म तिथि", 
+  "menu.section.icon.import": "आयात मेनू अनुभाग",
 
-  "person.page.edit": "इस आइटम को संपादित करें", 
+  "menu.section.icon.new": "नया मेनू अनुभाग",
 
-  "person.page.email": "ईमेल पता", 
+  "menu.section.icon.pin": "साइडबार पिन करें",
 
-  "person.page.firstname": "पहला नाम", 
+  "menu.section.icon.processes": "प्रक्रिया स्वास्थ्य",
 
-  "person.page.jobtitle": "नौकरी का शीर्षक", 
+  "menu.section.icon.registries": "रजिस्ट्रियां मेन्यू अनुभाग",
 
-  "person.page.lastname": "उपनाम", 
+  "menu.section.icon.statistics_task": "सांख्यिकी कार्य मेनू अनुभाग",
 
-  "person.page.link.full": "सभी मेटाडेटा दिखाएं", 
+  "menu.section.icon.unpin": "साइडबार अनपिन करें",
 
-  "person.page.name": "नाम", 
+  "menu.section.icon.workflow": "कार्यप्रवाह मेनू अनुभाग का व्यवस्थापन करें",
 
-  "person.page.orcid": "ORCID", 
+  "menu.section.import": "आयात",
 
-  "person.page.orcid.create": "एक ORCID आईडी बनाएं", 
+  "menu.section.import_batch": "खेप आयात (ZIP)",
 
-  "person.page.orcid.funding-preferences": "वित्त पोषण प्राथमिकताएं", 
+  "menu.section.import_metadata": "मेटाडाटा ",
 
-  "person.page.orcid.grant-authorizations": "अनुदान प्राधिकरण", 
+  "menu.section.new": "नया",
 
-  "person.page.orcid.granted-authorizations": "स्वीकृत प्राधिकरण", 
+  "menu.section.new_collection": "संग्रह",
 
-  "person.page.orcid.link": "ORCID आईडी से जोड़े", 
+  "menu.section.new_community": "समुदाय",
 
-  "person.page.orcid.link.error.message": "प्रोफ़ाइल को ORCID से जोड़ते समय कोई गड़बड़ी हुई। यदि समस्या बनी रहती है, तो व्यवस्थापक से संपर्क करें।", 
+  "menu.section.new_item": "आइटम",
 
-  "person.page.orcid.link.processing": "प्रोफ़ाइल को ORCID से लिंक किया जा रहा है...", 
+  "menu.section.new_item_version": "आइटम संस्करण",
 
-  "person.page.orcid.missing-authorizations": "गुम अनुमति", 
+  "menu.section.new_process": "प्रक्रिया",
 
-  "person.page.orcid.missing-authorizations-message": "निम्नलिखित प्राधिकरण गायब हैं:", 
+  "menu.section.pin": "साइडबार नत्थी करें",
 
-  "person.page.orcid.no-missing-authorizations-message": "आपको आपके संस्थान द्वारा सभी फ़ंक्शन का उपयोग करने के लिए एक्सेस अधिकार दिए गए हैं, इसलिए यह बॉक्स खाली है!", 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
-  "person.page.orcid.no-orcid-message": "अभी तक कोई ORCID iD संबद्ध नहीं है। नीचे दिए गए बटन पर क्लिक करके इस प्रोफाइल को ओआरसीआईडी खाते से लिंक करना संभव है।", 
+  "menu.section.toggle.access_control": "अभिगम नियंत्रण अनुभाग टॉगल करें",
 
-  "person.page.orcid.orcid-not-linked-message": "इस प्रोफ़ाइल की ORCID iD ({{orcid }}) अभी तक ORCID रजिस्ट्री पर किसी खाते से कनेक्ट नहीं हुई है या कनेक्शन की समय-सीमा समाप्त हो गई है।", 
+  "menu.section.processes": "प्रक्रियाएं",
 
-  "person.page.orcid.profile-preferences": "प्रोफाइल प्राथमिकताएं", 
+  "menu.section.registries": "रजिस्ट्री",
 
-  "person.page.orcid.publications-preferences": "प्रकाशन प्राथमिकताएं", 
+  "menu.section.registries_format": "प्रारूप",
 
-  "person.page.orcid.remove-orcid-message": "यदि आपको अपना ORCID हटाना है, तो कृपया संग्रहालय व्यवस्थापक से संपर्क करें", 
+  "menu.section.registries_metadata": "मेटाडाटा",
 
-  "person.page.orcid.save.preference.changes": "सेटिंग अद्यतन करें", 
+  "menu.section.statistics": "सांख्यिकी",
 
-  "person.page.orcid.scope.activities-update": "अपनी शोध गतिविधियों को जोड़ें/अपडेट करें", 
+  "menu.section.statistics_task": "सांख्यिकी कार्य",
 
-  "person.page.orcid.scope.authenticate": "अपना ORCID आईडी प्राप्त करें", 
+  "menu.section.toggle.access_control": "अभिगम नियंत्रण अनुभाग टॉगल करें",
 
-  "person.page.orcid.scope.person-update": "अपने बारे में अन्य जानकारी जोड़ें/अपडेट करें", 
+  "menu.section.toggle.control_panel": "नियंत्रण कक्ष अनुभाग टॉगल करें",
 
-  "person.page.orcid.scope.read-limited": "विश्वसनीय पक्षों पर सेट दृश्यता के साथ अपनी जानकारी पढ़ें", 
+  "menu.section.toggle.curation_task": "क्यूरेशन कार्य अनुभाग टॉगल करें  ",
 
-  "person.page.orcid.sync-fundings.all": "सारे निधि स्त्रोत ", 
+  "menu.section.toggle.edit": "संपादन कार्य अनुभाग टॉगल करें  ",
 
-  "person.page.orcid.sync-fundings.disabled": "अक्षम", 
+  "menu.section.toggle.export": "निर्यात कार्य अनुभाग टॉगल करें  ",
 
-  "person.page.orcid.sync-fundings.mine": "मेरे निधि स्त्रोत ", 
+  "menu.section.toggle.find": "अनुभाग खोजें टॉगल करें",
 
-  "person.page.orcid.sync-fundings.my_selected": "चयनित निधि स्त्रोत", 
+  "menu.section.toggle.import": "आयात अनुभाग टॉगल करें",
 
-  "person.page.orcid.sync-profile.affiliation": "संबद्धता", 
+  "menu.section.toggle.new": "नया अनुभाग टॉगल करें",
 
-  "person.page.orcid.sync-profile.biographical": "जीवनी डेटा", 
+  "menu.section.toggle.registries": "रजिस्ट्री अनुभाग टॉगल करें",
 
-  "person.page.orcid.sync-profile.education": "शिक्षण", 
+  "menu.section.toggle.statistics_task": "सांख्यिकी कार्य अनुभाग टॉगल करें",
 
-  "person.page.orcid.sync-profile.identifiers": "पहचानकर्ता", 
+  "menu.section.unpin": "साइडबार अनपिन करें",
 
-  "person.page.orcid.sync-publications.all": "सभी प्रकाशन", 
+  "menu.section.workflow": "कार्यप्रवाह व्यवस्थापित करें",
 
-  "person.page.orcid.sync-publications.disabled": "निर्योग्य", 
+  "metadata-export-search.submit.error": "निर्यात प्रारंभ करना विफल रहा",
 
-  "person.page.orcid.sync-publications.mine": "मेरे प्रकाशन", 
+  "metadata-export-search.submit.success": "निर्यात सफलतापूर्वक शुरू किया गया था",
 
-  "person.page.orcid.sync-publications.my_selected": "चयनित प्रकाशन", 
+  "metadata-export-search.tooltip": "खोज परिणामों को CSV के रूप में निर्यात करें",
 
-  "person.page.orcid.sync-queue.description.affiliation": "संबद्धता", 
+  "mydspace.breadcrumbs": "मेरा डीस्पेस",
 
-  "person.page.orcid.sync-queue.description.country": "देश", 
+  "mydspace.description": null,
 
-  "person.page.orcid.sync-queue.description.education": "शिक्षण", 
+  "mydspace.general.text-here": "यहां",
 
-  "person.page.orcid.sync-queue.description.external_ids": "बाहरी आईडी", 
+  "mydspace.messages.controller-help": "आइटम के प्रस्तुतकर्ता को संदेश भेजने के लिए इस विकल्प का चयन करें।",
 
-  "person.page.orcid.sync-queue.description.keywords": "खोजशब्द", 
+  "mydspace.messages.description-placeholder": "अपना संदेश यहां डालें...",
 
-  "person.page.orcid.sync-queue.description.other_names": "अन्य नाम", 
+  "mydspace.messages.hide-msg": "संदेश छुपाएं",
 
-  "person.page.orcid.sync-queue.description.qualification": "योग्यता", 
+  "mydspace.messages.mark-as-read": "पढ़ा गया के रूप में चिह्नित करें",
 
-  "person.page.orcid.sync-queue.description.researcher_urls": "अनुसंधानकर्ता यूआरएल (URLs)", 
+  "mydspace.messages.mark-as-unread": "अपठित के रूप में चिह्नित करें",
 
-  "person.page.orcid.sync-queue.discard": "परिवर्तन छोड़ें और ORCID रजिस्ट्री के साथ सिंक्रनाइज़ न करें", 
+  "mydspace.messages.no-content": "कोई सामग्री नहीं है।",
 
-  "person.page.orcid.sync-queue.discard.error": "ORCID कतार रिकॉर्ड को हटाना विफल रहा", 
+  "mydspace.messages.no-messages": "अभी तक कोई संदेश नहीं।",
 
-  "person.page.orcid.sync-queue.discard.success": "ORCID कतार रिकॉर्ड को सफलतापूर्वक खारिज कर दिया गया है", 
+  "mydspace.messages.send-btn": "भेजें",
 
-  "person.page.orcid.sync-queue.empty-message": "ORCID रजिस्ट्री कतार खाली है", 
+  "mydspace.messages.show-msg": "संदेश दिखाएँ",
 
-  "person.page.orcid.sync-queue.send": "ORCID रजिस्ट्री के साथ सिंक्रनाइज़ करें", 
+  "mydspace.messages.subject-placeholder": "विषय...",
 
-  "person.page.orcid.sync-queue.send.bad-request-error": "ORCID को प्रस्तुतीकरण विफल हुआ क्योंकि ORCID रजिस्ट्री को भेजा गया संसाधन मान्य नहीं है", 
+  "mydspace.messages.submitter-help": "नियंत्रक को संदेश भेजने के लिए इस विकल्प का चयन करें।",
 
-  "person.page.orcid.sync-queue.send.conflict-error": "ORCID को प्रस्तुतीकरण विफल रहा क्योंकि संसाधन ORCID रजिस्ट्री पर पहले से मौजूद है", 
+  "mydspace.messages.title": "संदेश",
 
-  "person.page.orcid.sync-queue.send.error": "ORCID को प्रस्तुतीकरण विफल रहा", 
+  "mydspace.messages.to": "तक",
 
-  "person.page.orcid.sync-queue.send.not-found-warning": "संसाधन अब ORCID रजिस्ट्री पर मौजूद नहीं है।", 
+  "mydspace.new-submission": "नया प्रस्तुतीकरण",
 
-  "person.page.orcid.sync-queue.send.success": "ORCID को प्रस्तुतीकरण सफलतापूर्वक पूरा किया गया ", 
+  "mydspace.new-submission-external": "बाहरी स्रोत से मेटाडेटा आयात करें",
 
-  "person.page.orcid.sync-queue.send.unauthorized-error.content": "फिर से आवश्यक अनुमतियां देने के लिए <a href='{{orcid}}'>यहां</a> क्लिक करें। यदि समस्या बनी रहती है, तो व्यवस्थापक से संपर्क करें।", 
+  "mydspace.new-submission-external-short": "मेटाडेटा आयात करें",
 
-  "person.page.orcid.sync-queue.send.unauthorized-error.title": "ORCID को प्रस्तुतीकरण अनुपलब्ध प्राधिकरणों के कारण विफल रहा।", 
+  "mydspace.results.head": "आपकी प्रस्तुतियाँ",
 
-  "person.page.orcid.sync-queue.send.validation-error": "जिस डेटा को आप ORCID के साथ सिंक्रोनाइज़ करना चाहते हैं वह मान्य नहीं है", 
+  "mydspace.results.no-abstract": "कोई सार नहीं",
 
-  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "राशि की मुद्रा आवश्यक है", 
+  "mydspace.results.no-authors": "कोई लेखक नहीं",
 
-  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "अमान्य 2 अंक ISO 3166 देश", 
+  "mydspace.results.no-collections": "कोई संग्रह नहीं",
 
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "संगठनों को स्पष्ट करने के लिए एक पहचानकर्ता की आवश्यकता है। समर्थित आईडी जीआरआईडी, रिंगगोल्ड, कानूनी इकाई पहचानकर्ता (एलईआई) और क्रॉसरेफ फंडर रजिस्ट्री पहचानकर्ता हैं", 
+  "mydspace.results.no-date": "कोई तारीख नहीं",
 
-  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "संगठन के पहचानकर्ताओं को एक मूल्य की आवश्यकता है", 
+  "mydspace.results.no-files": "कोई फाइल नहीं",
 
-  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "संगठन पहचानकर्ताओं में से एक का स्रोत अमान्य है। समर्थित स्रोत हैं RINGGOLD, GRID, LEI और FUNDREF", 
+  "mydspace.results.no-results": "दिखाने के लिए कोई आइटम नहीं थे",
 
-  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "संगठन के पहचानकर्ताओं को स्रोत की आवश्यकता होती है", 
+  "mydspace.results.no-title": "कोई शीर्षक नहीं",
 
-  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "भेजे जाने वाले संसाधन के लिए कम से कम एक पहचानकर्ता की आवश्यकता होती है", 
+  "mydspace.results.no-uri": "Uri नहीं है",
 
-  "person.page.orcid.sync-queue.send.validation-error.funder.required": "धन की आवश्यकता है", 
+  "mydspace.search-form.placeholder": "मेरे डीस्पेस में खोजें...",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "भेजे जाने वाले संगठन को पते की आवश्यकता है", 
+  "mydspace.show.workflow": "कार्यप्रवाह कार्य",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "भेजे जाने वाले संगठन के पते के लिए एक शहर की आवश्यकता है", 
+  "mydspace.show.workspace": "आपकी प्रस्तुतियां",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "भेजे जाने वाले संगठन के पते के लिए मान्य 2 अंकों वाला ISO 3166 देश होना चाहिए", 
+  "mydspace.status.mydspaceArchived": "संग्रहीत",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "संगठन का नाम आवश्यक है", 
+  "mydspace.status.mydspaceValidation": "सत्यापन",
 
-  "person.page.orcid.sync-queue.send.validation-error.organization.required": "संगठन की आवश्यकता है", 
+  "mydspace.status.mydspaceWaitingController": "नियंत्रक की प्रतीक्षा कर रहा है",
 
-  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "प्रकाशन की तारीख 1900 . के एक साल बाद की होनी चाहिए", 
+  "mydspace.status.mydspaceWorkflow": "कार्यप्रवाह",
 
-  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "प्रारंभ दिनांक आवश्यक है", 
+  "mydspace.status.mydspaceWorkspace": "कार्यस्थान",
 
-  "person.page.orcid.sync-queue.send.validation-error.title.required": "शीर्षक आवश्यक है", 
+  "mydspace.title": "मेरा डीस्पेस",
 
-  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type आवश्यक है", 
+  "mydspace.upload.upload-failed": "नया कार्यस्थान बनाने में त्रुटि. कृपया पुनः प्रयास करने से पहले अपलोड की गई सामग्री को सत्यापित करें।",
 
-  "person.page.orcid.sync-queue.table.header.action": "कार्रवाई", 
+  "mydspace.upload.upload-failed-manyentries": "असंसाधित फ़ाइल। बहुत अधिक प्रविष्टियों का पता लगाया लेकिन फ़ाइल के लिए केवल एक की अनुमति दी।",
 
-  "person.page.orcid.sync-queue.table.header.description": "विवरण", 
+  "mydspace.upload.upload-failed-moreonefile": "असंसाधित अनुरोध। केवल एक फ़ाइल की अनुमति है।",
 
-  "person.page.orcid.sync-queue.table.header.type": "प्रकार", 
+  "mydspace.upload.upload-multiple-successful": "{{qty}} नए कार्यक्षेत्र आइटम बनाए गए।",
 
-  "person.page.orcid.sync-queue.tooltip.affiliation": "संबद्धता", 
+  "mydspace.upload.upload-successful": "नया कार्यस्थान आइटम बनाया गया। इसे संपादित करने के लिए {{here}} क्लिक करें।",
 
-  "person.page.orcid.sync-queue.tooltip.country": "देश", 
+  "mydspace.view-btn": "देखें",
 
-  "person.page.orcid.sync-queue.tooltip.delete": "इस प्रविष्टि को ORCID रजिस्ट्री से निकालें", 
+  "nav.browse.header": "सम्पूर्ण डीस्पेस",
 
-  "person.page.orcid.sync-queue.tooltip.education": "शिक्षा", 
+  "nav.community-browse.header": "समुदाय द्वारा",
 
-  "person.page.orcid.sync-queue.tooltip.external_ids": "बाहरी पहचानकर्ता", 
+  "nav.language": "भाषा स्विच",
 
-  "person.page.orcid.sync-queue.tooltip.insert": "ORCID रजिस्ट्री में नई प्रविष्टि जोड़ें", 
+  "nav.login": "लॉग इन करें",
 
-  "person.page.orcid.sync-queue.tooltip.keywords": "खोजशब्द", 
+  "nav.logout": "उपयोगकर्ता प्रोफ़ाइल मेनू और लॉग आउट",
 
-  "person.page.orcid.sync-queue.tooltip.other_names": "अन्य नाम", 
+  "nav.main.description": "मुख्य नेविगेशन बार",
 
-  "person.page.orcid.sync-queue.tooltip.project": "परियोजना", 
+  "nav.mydspace": "मेरा डीस्पेस",
 
-  "person.page.orcid.sync-queue.tooltip.publication": "प्रकाशन", 
+  "nav.profile": "प्रोफ़ाइल",
 
-  "person.page.orcid.sync-queue.tooltip.qualification": "योग्यता", 
+  "nav.search": "खोजें",
 
-  "person.page.orcid.sync-queue.tooltip.researcher_urls": "अनुसंधानकर्ता url", 
+  "nav.statistics.header": "सांख्यिकी",
 
-  "person.page.orcid.sync-queue.tooltip.update": "ORCID रजिस्ट्री पर इस प्रविष्टि को अद्यतन करें", 
+  "nav.stop-impersonating": "ई-व्यक्ति का रूप धारण करना बंद करें",
 
-  "person.page.orcid.synchronization-mode": "तुल्यकालन प्रणाली", 
+  "nav.toggle": "नेविगेशन टॉगल करें",
 
-  "person.page.orcid.synchronization-mode-funding-message": "चुनें कि आपकी लिंक की गई परियोजना संस्थाओं को आपके ORCID रिकॉर्ड की फंडिंग जानकारी की सूची में भेजना है या नहीं।", 
+  "nav.user.description": "उपयोगकर्ता प्रोफ़ाइल बार",
 
-  "person.page.orcid.synchronization-mode-message": "कृपया ORCID के साथ तुल्यकालन (सिंक्रोनाइजेशन) विकल्प चुनें। विकल्पों में \"मानव चलित\" (आपको अपना डेटा अपने आप ORCID को भेजना होगा), या \"बैच\" (सिस्टम आपके डेटा को एक निर्धारित स्क्रिप्ट के माध्यम से ORCID को भेजेगा)।", 
+  "none.listelement.badge": "आइटम",
 
-  "person.page.orcid.synchronization-mode-profile-message": "क्या आपका जैविक डेटा या व्यक्तिगत पहचानकर्ता आपके ओआरसीआईडी रिकॉर्ड में भेजना है?", 
+  "orgunit.listelement.badge": "संगठित इकाई",
 
-  "person.page.orcid.synchronization-mode-publication-message": "चुनें कि आपकी लिंक की गई प्रकाशन इकाइयों को आपके ORCID रिकॉर्ड की कार्यों की सूची में भेजना है या नहीं।", 
+  "orgunit.page.city": "शहर",
 
-  "person.page.orcid.synchronization-mode.batch": "बैच", 
+  "orgunit.page.country": "देश",
 
-  "person.page.orcid.synchronization-mode.label": "तुल्यकालन प्रणाली", 
+  "orgunit.page.dateestablished": "स्थापना की तिथि",
 
-  "person.page.orcid.synchronization-mode.manual": "मानव चलित", 
+  "orgunit.page.description": "विवरण",
 
-  "person.page.orcid.synchronization-settings-update.error": "तुल्यकालन सेटिंग्स का अद्यतन विफल रहा ", 
+  "orgunit.page.edit": "इस आइटम को संपादित करें",
 
-  "person.page.orcid.synchronization-settings-update.success": "तुल्यकालन सेटिंग्स को सफलतापूर्वक अपडेट कर दिया गया है", 
+  "orgunit.page.id": "पहचान",
 
-  "person.page.orcid.unlink": "ORCID से अलग करें", 
+  "orgunit.page.titleprefix": "संगठनात्मक इकाइयाँ: ",
 
-  "person.page.orcid.unlink.error": "प्रोफ़ाइल और ORCID रजिस्ट्री को अलग करते समय त्रुटि उत्पन्न हुई। पुनः प्रयास करें", 
+  "pagination.next.button": "अगला",
 
-  "person.page.orcid.unlink.processing": "संसाधित किया जा रहा है...", 
+  "pagination.next.button.disabled.tooltip": "परिणामों के और पृष्ठ नहीं",
 
-  "person.page.orcid.unlink.success": "प्रोफ़ाइल और ORCID रजिस्ट्री के बीच वियोग सफल रहा", 
+  "pagination.options.description": "पृष्ठांकन के विकल्प",
 
-  "person.page.staffid": "कर्मचारी की पहचान", 
+  "pagination.previous.button": "पिछला",
 
-  "person.page.titleprefix": "व्यक्ति: ", 
+  "pagination.results-per-page": "प्रति पृष्ठ परिणाम",
 
-  "person.search.results.head": "व्यक्ति खोज परिणाम", 
+  "pagination.showing.detail": "{{ range }} में से {{ total }}",
 
-  "person.search.title": "व्यक्ति की खोज", 
+  "pagination.showing.label": "अब दिखा रहे हैं",
 
-  "process.detail.arguments": "बहस", 
+  "pagination.sort-direction": "क्रमबद्ध विकल्प",
 
-  "process.detail.arguments.empty": "इस प्रक्रिया में कोई तर्क नहीं है", 
+  "person-relationships.search.results.head": "व्यक्ति खोज परिणाम",
 
-  "process.detail.back": "वापस", 
+  "person.listelement.badge": "व्यक्ति",
 
-  "process.detail.create": "समान प्रक्रिया बनाएं", 
+  "person.listelement.no-title": "कोई नाम नहीं मिला",
 
-  "process.detail.end-time": "समाप्ति समय", 
+  "person.orcid.registry.auth": "ORCID प्राधिकरण",
 
-  "process.detail.logs.button": "प्रक्रिया उत्पाद प्राप्त करें ", 
+  "person.orcid.registry.queue": "ORCID रजिस्ट्री कतार",
 
-  "process.detail.logs.loading": "पुन: र्प्राप्ति जारी है", 
+  "person.orcid.sync.setting": "ORCID तुल्यकालन सेटिंग्स",
 
-  "process.detail.logs.none": "इस प्रक्रिया का कोई उत्पादन नहीं है", 
+  "person.page.birthdate": "जन्म तिथि",
 
-  "process.detail.output": "प्रक्रिया उत्पाद", 
+  "person.page.edit": "इस आइटम को संपादित करें",
 
-  "process.detail.output-files": "आउटपुट फ़ाइलें", 
+  "person.page.email": "ईमेल पता",
 
-  "process.detail.output-files.empty": "इस प्रक्रिया में कोई फाइल उत्पादित नहीं हुई है", 
+  "person.page.firstname": "पहला नाम",
 
-  "process.detail.script": "स्क्रिप्ट", 
+  "person.page.jobtitle": "नौकरी का शीर्षक",
 
-  "process.detail.start-time": "प्रारंभ समय", 
+  "person.page.lastname": "उपनाम",
 
-  "process.detail.status": "स्थिति", 
+  "person.page.link.full": "सभी मेटाडेटा दिखाएं",
 
-  "process.detail.title": "प्रक्रिया: {{ id }} - {{ name }}", 
+  "person.page.name": "नाम",
 
-  "process.new.breadcrumbs": "नई प्रक्रिया बनाएं", 
+  "person.page.orcid": "ORCID",
 
-  "process.new.cancel": "रद्द करें", 
+  "person.page.orcid.create": "एक ORCID आईडी बनाएं",
 
-  "process.new.header": "नई प्रक्रिया बनाएं", 
+  "person.page.orcid.funding-preferences": "वित्त पोषण प्राथमिकताएं",
 
-  "process.new.notification.error.content": "इस प्रक्रिया को बनाते समय एक त्रुटि हुई", 
+  "person.page.orcid.grant-authorizations": "अनुदान प्राधिकरण",
 
-  "process.new.notification.error.title": "त्रुटि", 
+  "person.page.orcid.granted-authorizations": "स्वीकृत प्राधिकरण",
 
-  "process.new.notification.success.content": "प्रक्रिया सफलतापूर्वक बनाई गई", 
+  "person.page.orcid.link": "ORCID आईडी से जोड़े",
 
-  "process.new.notification.success.title": "सफलता", 
+  "person.page.orcid.link.error.message": "प्रोफ़ाइल को ORCID से जोड़ते समय कोई गड़बड़ी हुई। यदि समस्या बनी रहती है, तो व्यवस्थापक से संपर्क करें।",
 
-  "process.new.parameter.file.required": "कृपया एक फ़ाइल चुनें", 
+  "person.page.orcid.link.processing": "प्रोफ़ाइल को ORCID से लिंक किया जा रहा है...",
 
-  "process.new.parameter.file.upload-button": "फ़ाइल का चयन करें...", 
+  "person.page.orcid.missing-authorizations": "गुम अनुमति",
 
-  "process.new.parameter.required.missing": "निम्नलिखित पैरामीटर आवश्यक हैं लेकिन अभी भी गायब हैं:", 
+  "person.page.orcid.missing-authorizations-message": "निम्नलिखित प्राधिकरण गायब हैं:",
 
-  "process.new.parameter.string.required": "पैरामीटर मान आवश्यक है", 
+  "person.page.orcid.no-missing-authorizations-message": "आपको आपके संस्थान द्वारा सभी फ़ंक्शन का उपयोग करने के लिए एक्सेस अधिकार दिए गए हैं, इसलिए यह बॉक्स खाली है!",
 
-  "process.new.parameter.type.file": "फ़ाइल", 
+  "person.page.orcid.no-orcid-message": "अभी तक कोई ORCID iD संबद्ध नहीं है। नीचे दिए गए बटन पर क्लिक करके इस प्रोफाइल को ओआरसीआईडी खाते से लिंक करना संभव है।",
 
-  "process.new.parameter.type.value": "मान", 
+  "person.page.orcid.orcid-not-linked-message": "इस प्रोफ़ाइल की ORCID iD ({{orcid }}) अभी तक ORCID रजिस्ट्री पर किसी खाते से कनेक्ट नहीं हुई है या कनेक्शन की समय-सीमा समाप्त हो गई है।",
 
-  "process.new.select-parameters": "मापदंड", 
+  "person.page.orcid.profile-preferences": "प्रोफाइल प्राथमिकताएं",
 
-  "process.new.select-script": "स्क्रिप्ट", 
+  "person.page.orcid.publications-preferences": "प्रकाशन प्राथमिकताएं",
 
-  "process.new.select-script.placeholder": "स्क्रिप्ट चुनें...", 
+  "person.page.orcid.remove-orcid-message": "यदि आपको अपना ORCID हटाना है, तो कृपया संग्रहालय व्यवस्थापक से संपर्क करें",
 
-  "process.new.select-script.required": "स्क्रिप्ट की आवश्यकता है", 
+  "person.page.orcid.save.preference.changes": "सेटिंग अद्यतन करें",
 
-  "process.new.submit": "सहेजें", 
+  "person.page.orcid.scope.activities-update": "अपनी शोध गतिविधियों को जोड़ें/अपडेट करें",
 
-  "process.new.title": "एक नई प्रक्रिया बनाएं", 
+  "person.page.orcid.scope.authenticate": "अपना ORCID आईडी प्राप्त करें",
 
-  "process.overview.breadcrumbs": "प्रक्रियाओं का अवलोकन", 
+  "person.page.orcid.scope.person-update": "अपने बारे में अन्य जानकारी जोड़ें/अपडेट करें",
 
-  "process.overview.new": "नया", 
+  "person.page.orcid.scope.read-limited": "विश्वसनीय पक्षों पर सेट दृश्यता के साथ अपनी जानकारी पढ़ें",
 
-  "process.overview.table.finish": "समाप्ति समय (UTC)", 
+  "person.page.orcid.sync-fundings.all": "सारे निधि स्त्रोत ",
 
-  "process.overview.table.id": "प्रक्रिया पहचान क्रमांक", 
+  "person.page.orcid.sync-fundings.disabled": "अक्षम",
 
-  "process.overview.table.name": "नाम", 
+  "person.page.orcid.sync-fundings.mine": "मेरे निधि स्त्रोत ",
 
-  "process.overview.table.start": "प्रारंभ समय (UTC)", 
+  "person.page.orcid.sync-fundings.my_selected": "चयनित निधि स्त्रोत",
 
-  "process.overview.table.status": "स्थिति", 
+  "person.page.orcid.sync-profile.affiliation": "संबद्धता",
 
-  "process.overview.table.user": "उपयोगकर्ता", 
+  "person.page.orcid.sync-profile.biographical": "जीवनी डेटा",
 
-  "process.overview.title": "प्रक्रिया अवलोकन", 
+  "person.page.orcid.sync-profile.education": "शिक्षण",
 
-  "profile.breadcrumbs": "प्रोफ़ाइल को नवीनतम बनाएं", 
+  "person.page.orcid.sync-profile.identifiers": "पहचानकर्ता",
 
-  "profile.card.identify": "पहचान", 
+  "person.page.orcid.sync-publications.all": "सभी प्रकाशन",
 
-  "profile.card.researcher": "अनुसंधानकर्ता प्रोफाइल", 
+  "person.page.orcid.sync-publications.disabled": "निर्योग्य",
 
-  "profile.card.security": "सुरक्षा", 
+  "person.page.orcid.sync-publications.mine": "मेरे प्रकाशन",
 
-  "profile.form.submit": "सहेजें", 
+  "person.page.orcid.sync-publications.my_selected": "चयनित प्रकाशन",
 
-  "profile.groups.head": "आप जिस प्राधिकरण समूह से संबंधित हैं", 
+  "person.page.orcid.sync-queue.description.affiliation": "संबद्धता",
 
-  "profile.head": "प्रोफ़ाइल को नवीनतम बनाएं", 
+  "person.page.orcid.sync-queue.description.country": "देश",
 
-  "profile.metadata.form.error.firstname.required": "पहला नाम आवश्यक है", 
+  "person.page.orcid.sync-queue.description.education": "शिक्षण",
 
-  "profile.metadata.form.error.lastname.required": "उपनाम आवश्यक है", 
+  "person.page.orcid.sync-queue.description.external_ids": "बाहरी आईडी",
 
-  "profile.metadata.form.label.email": "ईमेल पता", 
+  "person.page.orcid.sync-queue.description.keywords": "खोजशब्द",
 
-  "profile.metadata.form.label.firstname": "पहला नाम", 
+  "person.page.orcid.sync-queue.description.other_names": "अन्य नाम",
 
-  "profile.metadata.form.label.language": "भाषा", 
+  "person.page.orcid.sync-queue.description.qualification": "योग्यता",
 
-  "profile.metadata.form.label.lastname": "उपनाम", 
+  "person.page.orcid.sync-queue.description.researcher_urls": "अनुसंधानकर्ता यूआरएल (URLs)",
 
-  "profile.metadata.form.label.phone": "संपर्क टेलीफोन", 
+  "person.page.orcid.sync-queue.discard": "परिवर्तन छोड़ें और ORCID रजिस्ट्री के साथ सिंक्रनाइज़ न करें",
 
-  "profile.metadata.form.notifications.success.content": "प्रोफ़ाइल में आपके परिवर्तन सहेजे गए थे।", 
+  "person.page.orcid.sync-queue.discard.error": "ORCID कतार रिकॉर्ड को हटाना विफल रहा",
 
-  "profile.metadata.form.notifications.success.title": "प्रोफाइल सहेजा गया", 
+  "person.page.orcid.sync-queue.discard.success": "ORCID कतार रिकॉर्ड को सफलतापूर्वक खारिज कर दिया गया है",
 
-  "profile.notifications.warning.no-changes.content": "प्रोफाइल में कोई बदलाव नहीं किया गया।", 
+  "person.page.orcid.sync-queue.empty-message": "ORCID रजिस्ट्री कतार खाली है",
 
-  "profile.notifications.warning.no-changes.title": "कोई बदलाव नहीं", 
+  "person.page.orcid.sync-queue.send": "ORCID रजिस्ट्री के साथ सिंक्रनाइज़ करें",
 
-  "profile.security.form.error.matching-passwords": "पासवर्ड एक - दूसरे से मिलते - जुलते नहीं हैं।", 
+  "person.page.orcid.sync-queue.send.bad-request-error": "ORCID को प्रस्तुतीकरण विफल हुआ क्योंकि ORCID रजिस्ट्री को भेजा गया संसाधन मान्य नहीं है",
 
-  "profile.security.form.error.password-length": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।", 
+  "person.page.orcid.sync-queue.send.conflict-error": "ORCID को प्रस्तुतीकरण विफल रहा क्योंकि संसाधन ORCID रजिस्ट्री पर पहले से मौजूद है",
 
-  "profile.security.form.info": "वैकल्पिक रूप से, आप नीचे दिए गए बॉक्स में नया पासवर्ड दर्ज कर सकते हैं, और इसे दूसरे बॉक्स में फिर से टाइप करके इसकी पुष्टि करें। यह कम से कम छह वर्ण लंबा होना चाहिए।", 
+  "person.page.orcid.sync-queue.send.error": "ORCID को प्रस्तुतीकरण विफल रहा",
 
-  "profile.security.form.label.password": "पासवर्ड", 
+  "person.page.orcid.sync-queue.send.not-found-warning": "संसाधन अब ORCID रजिस्ट्री पर मौजूद नहीं है।",
 
-  "profile.security.form.label.passwordrepeat": "पुष्टि करने के लिए फिर से लिखें", 
+  "person.page.orcid.sync-queue.send.success": "ORCID को प्रस्तुतीकरण सफलतापूर्वक पूरा किया गया ",
 
-  "profile.security.form.notifications.error.not-long-enough": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।", 
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "फिर से आवश्यक अनुमतियां देने के लिए <a href='{{orcid}}'>यहां</a> क्लिक करें। यदि समस्या बनी रहती है, तो व्यवस्थापक से संपर्क करें।",
 
-  "profile.security.form.notifications.error.not-same": "प्रदान किए गए पासवर्ड समान नहीं हैं।", 
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "ORCID को प्रस्तुतीकरण अनुपलब्ध प्राधिकरणों के कारण विफल रहा।",
 
-  "profile.security.form.notifications.error.title": "पासवर्ड बदलने में त्रुटि", 
+  "person.page.orcid.sync-queue.send.validation-error": "जिस डेटा को आप ORCID के साथ सिंक्रोनाइज़ करना चाहते हैं वह मान्य नहीं है",
 
-  "profile.security.form.notifications.success.content": "पासवर्ड में आपके परिवर्तन सहेजे गए थे।", 
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "राशि की मुद्रा आवश्यक है",
 
-  "profile.security.form.notifications.success.title": "पासवर्ड सहेजा गया", 
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "अमान्य 2 अंक ISO 3166 देश",
 
-  "profile.special.groups.head": "विशेष समूह प्राधिकरण जिनसे आप संबंधित हैं", 
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "संगठनों को स्पष्ट करने के लिए एक पहचानकर्ता की आवश्यकता है। समर्थित आईडी जीआरआईडी, रिंगगोल्ड, कानूनी इकाई पहचानकर्ता (एलईआई) और क्रॉसरेफ फंडर रजिस्ट्री पहचानकर्ता हैं",
 
-  "profile.title": "प्रोफ़ाइल को नवीनतम बनाएं", 
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "संगठन के पहचानकर्ताओं को एक मूल्य की आवश्यकता है",
 
-  "project-relationships.search.results.head": "परियोजना खोज परिणाम", 
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "संगठन पहचानकर्ताओं में से एक का स्रोत अमान्य है। समर्थित स्रोत हैं RINGGOLD, GRID, LEI और FUNDREF",
 
-  "project.listelement.badge": "अनुसंधान परियोजना", 
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "संगठन के पहचानकर्ताओं को स्रोत की आवश्यकता होती है",
 
-  "project.page.contributor": "योगदानकर्ता", 
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "भेजे जाने वाले संसाधन के लिए कम से कम एक पहचानकर्ता की आवश्यकता होती है",
 
-  "project.page.description": "विवरण", 
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "धन की आवश्यकता है",
 
-  "project.page.edit": "इस आइटम को संपादित करें", 
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "भेजे जाने वाले संगठन को पते की आवश्यकता है",
 
-  "project.page.expectedcompletion": "पूरा होने की उम्मीद", 
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "भेजे जाने वाले संगठन के पते के लिए एक शहर की आवश्यकता है",
 
-  "project.page.funder": "निधिदाता", 
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "भेजे जाने वाले संगठन के पते के लिए मान्य 2 अंकों वाला ISO 3166 देश होना चाहिए",
 
-  "project.page.id": "पहचान", 
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "संगठन का नाम आवश्यक है",
 
-  "project.page.keyword": "खोजशब्द", 
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "संगठन की आवश्यकता है",
 
-  "project.page.status": "स्थिति", 
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "प्रकाशन की तारीख 1900 . के एक साल बाद की होनी चाहिए",
 
-  "project.page.titleprefix": "अनुसंधान परियोजना:", 
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "प्रारंभ दिनांक आवश्यक है",
 
-  "project.search.results.head": "परियोजना खोज परिणाम", 
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "शीर्षक आवश्यक है",
 
-  "publication-relationships.search.results.head": "प्रकाशन खोज परिणाम", 
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "dc.type आवश्यक है",
 
-  "publication.listelement.badge": "प्रकाशन", 
+  "person.page.orcid.sync-queue.table.header.action": "कार्रवाई",
 
-  "publication.page.description": "विवरण", 
+  "person.page.orcid.sync-queue.table.header.description": "विवरण",
 
-  "publication.page.edit": "इस आइटम को संपादित करें", 
+  "person.page.orcid.sync-queue.table.header.type": "प्रकार",
 
-  "publication.page.journal-issn": "पत्रिका ISSN", 
+  "person.page.orcid.sync-queue.tooltip.affiliation": "संबद्धता",
 
-  "publication.page.journal-title": "पत्रिका शीर्षक", 
+  "person.page.orcid.sync-queue.tooltip.country": "देश",
 
-  "publication.page.publisher": "प्रकाशक", 
+  "person.page.orcid.sync-queue.tooltip.delete": "इस प्रविष्टि को ORCID रजिस्ट्री से निकालें",
 
-  "publication.page.titleprefix": "प्रकाशन:", 
+  "person.page.orcid.sync-queue.tooltip.education": "शिक्षा",
 
-  "publication.page.volume-title": "अंक शीर्षक", 
+  "person.page.orcid.sync-queue.tooltip.external_ids": "बाहरी पहचानकर्ता",
 
-  "publication.search.results.head": "प्रकाशन खोज परिणाम", 
+  "person.page.orcid.sync-queue.tooltip.insert": "ORCID रजिस्ट्री में नई प्रविष्टि जोड़ें",
 
-  "publication.search.title": "प्रकाशन खोज", 
+  "person.page.orcid.sync-queue.tooltip.keywords": "खोजशब्द",
 
-  "register-email.title": "नया उपयोगकर्ता पंजीकरण", 
+  "person.page.orcid.sync-queue.tooltip.other_names": "अन्य नाम",
 
-  "register-page.create-profile.header": "प्रोफ़ाइल बनाएं", 
+  "person.page.orcid.sync-queue.tooltip.project": "परियोजना",
 
-  "register-page.create-profile.identification.contact": "संपर्क टेलीफोन", 
+  "person.page.orcid.sync-queue.tooltip.publication": "प्रकाशन",
 
-  "register-page.create-profile.identification.email": "ईमेल पता", 
+  "person.page.orcid.sync-queue.tooltip.qualification": "योग्यता",
 
-  "register-page.create-profile.identification.first-name": "पहला नाम *", 
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "अनुसंधानकर्ता url",
 
-  "register-page.create-profile.identification.first-name.error": "कृपया पहला नाम भरें", 
+  "person.page.orcid.sync-queue.tooltip.update": "ORCID रजिस्ट्री पर इस प्रविष्टि को अद्यतन करें",
 
-  "register-page.create-profile.identification.header": "पहचान करें ", 
+  "person.page.orcid.synchronization-mode": "तुल्यकालन प्रणाली",
 
-  "register-page.create-profile.identification.language": "भाषा", 
+  "person.page.orcid.synchronization-mode-funding-message": "चुनें कि आपकी लिंक की गई परियोजना संस्थाओं को आपके ORCID रिकॉर्ड की फंडिंग जानकारी की सूची में भेजना है या नहीं।",
 
-  "register-page.create-profile.identification.last-name": "उपनाम *", 
+  "person.page.orcid.synchronization-mode-message": "कृपया ORCID के साथ तुल्यकालन (सिंक्रोनाइजेशन) विकल्प चुनें। विकल्पों में \"मानव चलित\" (आपको अपना डेटा अपने आप ORCID को भेजना होगा), या \"बैच\" (सिस्टम आपके डेटा को एक निर्धारित स्क्रिप्ट के माध्यम से ORCID को भेजेगा)।",
 
-  "register-page.create-profile.identification.last-name.error": "कृपया अंतिम नाम भरें", 
+  "person.page.orcid.synchronization-mode-profile-message": "क्या आपका जैविक डेटा या व्यक्तिगत पहचानकर्ता आपके ओआरसीआईडी रिकॉर्ड में भेजना है?",
 
-  "register-page.create-profile.security.error.empty-password": "कृपया नीचे दिए गए बॉक्स में पासवर्ड दर्ज करें।", 
+  "person.page.orcid.synchronization-mode-publication-message": "चुनें कि आपकी लिंक की गई प्रकाशन इकाइयों को आपके ORCID रिकॉर्ड की कार्यों की सूची में भेजना है या नहीं।",
 
-  "register-page.create-profile.security.error.matching-passwords": "पासवर्ड एक - दूसरे से मिलते - जुलते नहीं हैं।", 
+  "person.page.orcid.synchronization-mode.batch": "बैच",
 
-  "register-page.create-profile.security.error.password-length": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।", 
+  "person.page.orcid.synchronization-mode.label": "तुल्यकालन प्रणाली",
 
-  "register-page.create-profile.security.header": "सुरक्षा", 
+  "person.page.orcid.synchronization-mode.manual": "मानव चलित",
 
-  "register-page.create-profile.security.info": "कृपया नीचे दिए गए बॉक्स में पासवर्ड दर्ज करें, और दूसरे बॉक्स में फिर से टाइप करके इसकी पुष्टि करें। यह कम से कम छह वर्ण लंबा होना चाहिए।", 
+  "person.page.orcid.synchronization-settings-update.error": "तुल्यकालन सेटिंग्स का अद्यतन विफल रहा ",
 
-  "register-page.create-profile.security.label.password": "पासवर्ड *", 
+  "person.page.orcid.synchronization-settings-update.success": "तुल्यकालन सेटिंग्स को सफलतापूर्वक अपडेट कर दिया गया है",
 
-  "register-page.create-profile.security.label.passwordrepeat": "पुष्टि करने के लिए फिर से लिखें *", 
+  "person.page.orcid.unlink": "ORCID से अलग करें",
 
-  "register-page.create-profile.submit": "पंजीकरण पूर्ण करें", 
+  "person.page.orcid.unlink.error": "प्रोफ़ाइल और ORCID रजिस्ट्री को अलग करते समय त्रुटि उत्पन्न हुई। पुनः प्रयास करें",
 
-  "register-page.create-profile.submit.error.content": "नया उपयोगकर्ता पंजीकृत करते समय कुछ गलत हुआ।", 
+  "person.page.orcid.unlink.processing": "संसाधित किया जा रहा है...",
 
-  "register-page.create-profile.submit.error.head": "पंजीकरण विफल रहा", 
+  "person.page.orcid.unlink.success": "प्रोफ़ाइल और ORCID रजिस्ट्री के बीच वियोग सफल रहा",
 
-  "register-page.create-profile.submit.success.content": "पंजीकरण सफल रहा। आपको बनाए गए उपयोगकर्ता के रूप में लॉग इन किया गया है।", 
+  "person.page.staffid": "कर्मचारी की पहचान",
 
-  "register-page.create-profile.submit.success.head": "पंजीकरण पूर्ण", 
+  "person.page.titleprefix": "व्यक्ति: ",
 
-  "register-page.registration.email": "ईमेल पता *", 
+  "person.search.results.head": "व्यक्ति खोज परिणाम",
 
-  "register-page.registration.email.error.pattern": "कृपया ईमेल पता भरें", 
+  "person.search.title": "व्यक्ति की खोज",
 
-  "register-page.registration.email.error.required": "कृपया ईमेल पता भरें", 
+  "process.detail.arguments": "बहस",
 
-  "register-page.registration.email.hint": "यह पता सत्यापित किया जाएगा और आपके लॉगिन नाम के रूप में उपयोग किया जाएगा।", 
+  "process.detail.arguments.empty": "इस प्रक्रिया में कोई तर्क नहीं है",
 
-  "register-page.registration.error.content": "निम्न ईमेल पता पंजीकृत करते समय एक त्रुटि हुई: {{ email }}", 
+  "process.detail.back": "वापस",
 
-  "register-page.registration.error.head": "ईमेल पंजीकृत करने का प्रयास करते समय त्रुटि", 
+  "process.detail.create": "समान प्रक्रिया बनाएं",
 
-  "register-page.registration.header": "नया उपयोगकर्ता पंजीकरण", 
+  "process.detail.end-time": "समाप्ति समय",
 
-  "register-page.registration.info": "डीस्पेस में नई प्रस्तुति तथा ईमेल द्वारा संग्रह अद्यतन की जानकारी हेतु सदस्यता के लिए नया खता पंजीकृत करें", 
+  "process.detail.logs.button": "प्रक्रिया उत्पाद प्राप्त करें ",
 
-  "register-page.registration.submit": "पंजीकृत करें ", 
+  "process.detail.logs.loading": "पुन: र्प्राप्ति जारी है",
 
-  "register-page.registration.success.content": "{{ email }} को एक विशेष यूआरएल और अन्य निर्देशों के साथ एक ईमेल भेजा गया है।", 
+  "process.detail.logs.none": "इस प्रक्रिया का कोई उत्पादन नहीं है",
 
-  "register-page.registration.success.head": "सत्यापन ईमेल भेज दिया गया है", 
+  "process.detail.output": "प्रक्रिया उत्पाद",
 
-  "relationships.add.error.relationship-type.content": "दो मदों के बीच {{type }} संबंध प्रकार के लिए कोई उपयुक्त मिलान नहीं पाया जा सका", 
+  "process.detail.output-files": "आउटपुट फ़ाइलें",
 
-  "relationships.add.error.server.content": "सर्वर ने त्रुटि लौटाई", 
+  "process.detail.output-files.empty": "इस प्रक्रिया में कोई फाइल उत्पादित नहीं हुई है",
 
-  "relationships.add.error.title": "संबंध जोड़ने में असमर्थ", 
+  "process.detail.script": "स्क्रिप्ट",
 
-  "relationships.isAuthorOf": "लेखक", 
+  "process.detail.start-time": "प्रारंभ समय",
 
-  "relationships.isAuthorOf.OrgUnit": "लेखक (संगठनात्मक इकाइयां)", 
+  "process.detail.status": "स्थिति",
 
-  "relationships.isAuthorOf.Person": "लेखक (व्यक्ति)", 
+  "process.detail.title": "प्रक्रिया: {{ id }} - {{ name }}",
 
-  "relationships.isContributorOf": "योगदानकर्ता", 
+  "process.new.breadcrumbs": "नई प्रक्रिया बनाएं",
 
-  "relationships.isContributorOf.OrgUnit": "योगदानकर्ता (संगठनात्मक इकाई)", 
+  "process.new.cancel": "रद्द करें",
 
-  "relationships.isContributorOf.Person": "योगदान देने वाला", 
+  "process.new.header": "नई प्रक्रिया बनाएं",
 
-  "relationships.isFundingAgencyOf.OrgUnit": "निधिदाता", 
+  "process.new.notification.error.content": "इस प्रक्रिया को बनाते समय एक त्रुटि हुई",
 
-  "relationships.isIssueOf": "पत्रिका अंक", 
+  "process.new.notification.error.title": "त्रुटि",
 
-  "relationships.isJournalIssueOf": "पत्रिका अंक", 
+  "process.new.notification.success.content": "प्रक्रिया सफलतापूर्वक बनाई गई",
 
-  "relationships.isJournalOf": "पत्रिकाएं", 
+  "process.new.notification.success.title": "सफलता",
 
-  "relationships.isOrgUnitOf": "संगठनात्मक इकाइयाँ", 
+  "process.new.parameter.file.required": "कृपया एक फ़ाइल चुनें",
 
-  "relationships.isPersonOf": "लेखक", 
+  "process.new.parameter.file.upload-button": "फ़ाइल का चयन करें...",
 
-  "relationships.isProjectOf": "अनुसंधान परियोजना", 
+  "process.new.parameter.required.missing": "निम्नलिखित पैरामीटर आवश्यक हैं लेकिन अभी भी गायब हैं:",
 
-  "relationships.isPublicationOf": "प्रकाशन", 
+  "process.new.parameter.string.required": "पैरामीटर मान आवश्यक है",
 
-  "relationships.isPublicationOfJournalIssue": "लेख", 
+  "process.new.parameter.type.file": "फ़ाइल",
 
-  "relationships.isSingleJournalOf": "पत्रिका", 
+  "process.new.parameter.type.value": "मान",
 
-  "relationships.isSingleVolumeOf": "पत्रिका खंड", 
+  "process.new.select-parameters": "मापदंड",
 
-  "relationships.isVolumeOf": "पत्रिका खंड", 
+  "process.new.select-script": "स्क्रिप्ट",
 
-  "repository.image.logo": "संग्राहलय चिन्ह", 
+  "process.new.select-script.placeholder": "स्क्रिप्ट चुनें...",
 
-  "repository.title.prefix": "डीस्पेस एंग्युलर::", 
+  "process.new.select-script.required": "स्क्रिप्ट की आवश्यकता है",
 
-  "repository.title.prefixDSpace": "डीस्पेस एंग्यूलर ::", 
+  "process.new.submit": "सहेजें",
 
-  "researcher.profile.action.processing": "संसाधित किया जा रहा है...", 
+  "process.new.title": "एक नई प्रक्रिया बनाएं",
 
-  "researcher.profile.associated": "शोधकर्ता प्रोफ़ाइल संबद्ध", 
+  "process.overview.breadcrumbs": "प्रक्रियाओं का अवलोकन",
 
-  "researcher.profile.change-visibility.fail": "प्रोफ़ाइल दृश्यता बदलते समय एक अनपेक्षित त्रुटि उत्पन्न होती है", 
+  "process.overview.new": "नया",
 
-  "researcher.profile.create.fail": "शोधकर्ता प्रोफ़ाइल निर्माण के दौरान एक त्रुटि उत्पन्न होती है", 
+  "process.overview.table.finish": "समाप्ति समय (UTC)",
 
-  "researcher.profile.create.new": "नया बनाएं", 
+  "process.overview.table.id": "प्रक्रिया पहचान क्रमांक",
 
-  "researcher.profile.create.success": "अनुसंधानकर्ता प्रोफ़ाइल सफलतापूर्वक बनाई गई", 
+  "process.overview.table.name": "नाम",
 
-  "researcher.profile.delete": "हटाएं", 
+  "process.overview.table.start": "प्रारंभ समय (UTC)",
 
-  "researcher.profile.expose": "खुलासा", 
+  "process.overview.table.status": "स्थिति",
 
-  "researcher.profile.hide": "छिपाना", 
+  "process.overview.table.user": "उपयोगकर्ता",
 
-  "researcher.profile.not.associated": "अनुसंधानकर्ता प्रोफ़ाइल अभी तक सम्बंधित नहीं है ", 
+  "process.overview.title": "प्रक्रिया अवलोकन",
 
-  "researcher.profile.private.visibility": "निजी", 
+  "profile.breadcrumbs": "प्रोफ़ाइल को नवीनतम बनाएं",
 
-  "researcher.profile.public.visibility": "सार्वजनिक", 
+  "profile.card.identify": "पहचान",
 
-  "researcher.profile.status": "दर्जा:", 
+  "profile.card.researcher": "अनुसंधानकर्ता प्रोफाइल",
 
-  "researcher.profile.view": "देखें", 
+  "profile.card.security": "सुरक्षा",
 
-  "researcherprofile.claim.not-authorized": "आप इस मद पर दावा करने के लिए अधिकृत नहीं हैं। अधिक जानकारी के लिए व्यवस्थापक से संपर्क करें।", 
+  "profile.form.submit": "सहेजें",
 
-  "researcherprofile.error.claim.body": "प्रोफ़ाइल का दावा करते समय एक त्रुटि हुई, कृपया बाद में पुन: प्रयास करें", 
+  "profile.groups.head": "आप जिस प्राधिकरण समूह से संबंधित हैं",
 
-  "researcherprofile.error.claim.title": "त्रुटि", 
+  "profile.head": "प्रोफ़ाइल को नवीनतम बनाएं",
 
-  "researcherprofile.success.claim.body": "प्रोफ़ाइल पर सफलतापूर्वक दावा किया गया", 
+  "profile.metadata.form.error.firstname.required": "पहला नाम आवश्यक है",
 
-  "researcherprofile.success.claim.title": "सफलता", 
+  "profile.metadata.form.error.lastname.required": "उपनाम आवश्यक है",
 
-  "resource-policies.add.button": "जोड़ें", 
+  "profile.metadata.form.label.email": "ईमेल पता",
 
-  "resource-policies.add.for.": "नई नीति जोड़ें", 
+  "profile.metadata.form.label.firstname": "पहला नाम",
 
-  "resource-policies.add.for.bitstream": "एक नई बिटस्ट्रीम नीति जोड़ें", 
+  "profile.metadata.form.label.language": "भाषा",
 
-  "resource-policies.add.for.bundle": "नई बंडल नीति जोड़ें", 
+  "profile.metadata.form.label.lastname": "उपनाम",
 
-  "resource-policies.add.for.collection": "एक नई संग्रह नीति जोड़ें", 
+  "profile.metadata.form.label.phone": "संपर्क टेलीफोन",
 
-  "resource-policies.add.for.community": "नई सामुदायिक नीति जोड़ें", 
+  "profile.metadata.form.notifications.success.content": "प्रोफ़ाइल में आपके परिवर्तन सहेजे गए थे।",
 
-  "resource-policies.add.for.item": "नई आइटम नीति जोड़ें", 
+  "profile.metadata.form.notifications.success.title": "प्रोफाइल सहेजा गया",
 
-  "resource-policies.create.page.failure.content": "संसाधन नीति बनाते समय कोई त्रुटि उत्पन्न हुई।", 
+  "profile.notifications.warning.no-changes.content": "प्रोफाइल में कोई बदलाव नहीं किया गया।",
 
-  "resource-policies.create.page.heading": "के लिए नई संसाधन नीति बनाएं", 
+  "profile.notifications.warning.no-changes.title": "कोई बदलाव नहीं",
 
-  "resource-policies.create.page.success.content": "संचालन सफल रहा", 
+  "profile.security.form.error.matching-passwords": "पासवर्ड एक - दूसरे से मिलते - जुलते नहीं हैं।",
 
-  "resource-policies.create.page.title": "नई संसाधन नीति बनाएं", 
+  "profile.security.form.error.password-length": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।",
 
-  "resource-policies.delete.btn": "चयनित को हटाएं", 
+  "profile.security.form.info": "वैकल्पिक रूप से, आप नीचे दिए गए बॉक्स में नया पासवर्ड दर्ज कर सकते हैं, और इसे दूसरे बॉक्स में फिर से टाइप करके इसकी पुष्टि करें। यह कम से कम छह वर्ण लंबा होना चाहिए।",
 
-  "resource-policies.delete.btn.title": "चयनित संसाधन नीतियां हटाएं", 
+  "profile.security.form.label.password": "पासवर्ड",
 
-  "resource-policies.delete.failure.content": "चयनित संसाधन नीतियों को हटाते समय एक त्रुटि उत्पन्न हुई।", 
+  "profile.security.form.label.passwordrepeat": "पुष्टि करने के लिए फिर से लिखें",
 
-  "resource-policies.delete.success.content": "संचालन सफल रहा", 
+  "profile.security.form.notifications.error.not-long-enough": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।",
 
-  "resource-policies.edit.page.failure.content": "संसाधन नीति संपादित करते समय कोई त्रुटि उत्पन्न हुई।", 
+  "profile.security.form.notifications.error.not-same": "प्रदान किए गए पासवर्ड समान नहीं हैं।",
 
-  "resource-policies.edit.page.heading": "संसाधन नीति संपादित करें", 
+  "profile.security.form.notifications.error.title": "पासवर्ड बदलने में त्रुटि",
 
-  "resource-policies.edit.page.other-failure.content": "संसाधन नीति संपादित करते समय कोई त्रुटि उत्पन्न हुई। लक्ष्य (ई-व्यक्ति या समूह) का सफलतापूर्वक अद्यतन कर दिया गया है।", 
+  "profile.security.form.notifications.success.content": "पासवर्ड में आपके परिवर्तन सहेजे गए थे।",
 
-  "resource-policies.edit.page.success.content": "संचालन सफल रहा", 
+  "profile.security.form.notifications.success.title": "पासवर्ड सहेजा गया",
 
-  "resource-policies.edit.page.target-failure.content": "संसाधन नीति के लक्ष्य (ई-व्यक्ति या समूह) को संपादित करते समय कोई त्रुटि उत्पन्न हुई।", 
+  "profile.special.groups.head": "विशेष समूह प्राधिकरण जिनसे आप संबंधित हैं",
 
-  "resource-policies.edit.page.title": "संसाधन नीति संपादित करें", 
+  "profile.title": "प्रोफ़ाइल को नवीनतम बनाएं",
 
-  "resource-policies.form.action-type.label": "क्रिया प्रकार चुनें", 
+  "project-relationships.search.results.head": "परियोजना खोज परिणाम",
 
-  "resource-policies.form.action-type.required": "आपको संसाधन नीति कार्रवाई का चयन करना होगा।", 
+  "project.listelement.badge": "अनुसंधान परियोजना",
 
-  "resource-policies.form.date.end.label": "अंतिम तिथि", 
+  "project.page.contributor": "योगदानकर्ता",
 
-  "resource-policies.form.date.start.label": "आरंभ करने की तिथि", 
+  "project.page.description": "विवरण",
 
-  "resource-policies.form.description.label": "विवरण", 
+  "project.page.edit": "इस आइटम को संपादित करें",
 
-  "resource-policies.form.eperson-group-list.label": "वह व्यक्ति या समूह जिसे अनुमति दी जाएगी", 
+  "project.page.expectedcompletion": "पूरा होने की उम्मीद",
 
-  "resource-policies.form.eperson-group-list.modal.close": "ठीक है", 
+  "project.page.funder": "निधिदाता",
 
-  "resource-policies.form.eperson-group-list.modal.header": "प्रकार नहीं बदल सकता", 
+  "project.page.id": "पहचान",
 
-  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "समूह को ई-व्यक्ति से बदलना संभव नहीं है।", 
+  "project.page.keyword": "खोजशब्द",
 
-  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "ई-व्यक्ति को समूह से बदलना संभव नहीं है।", 
+  "project.page.status": "स्थिति",
 
-  "resource-policies.form.eperson-group-list.modal.text2": "वर्तमान संसाधन नीति हटाएं और वांछित प्रकार के साथ एक नई बनाएं।", 
+  "project.page.titleprefix": "अनुसंधान परियोजना:",
 
-  "resource-policies.form.eperson-group-list.select.btn": "चयन करें", 
+  "project.search.results.head": "परियोजना खोज परिणाम",
 
-  "resource-policies.form.eperson-group-list.tab.eperson": "ई-व्यक्ति के लिए खोजें", 
+  "publication-relationships.search.results.head": "प्रकाशन खोज परिणाम",
 
-  "resource-policies.form.eperson-group-list.tab.group": "एक समूह खोजें", 
+  "publication.listelement.badge": "प्रकाशन",
 
-  "resource-policies.form.eperson-group-list.table.headers.action": "गतिविधि", 
+  "publication.page.description": "विवरण",
 
-  "resource-policies.form.eperson-group-list.table.headers.id": "पहचान", 
+  "publication.page.edit": "इस आइटम को संपादित करें",
 
-  "resource-policies.form.eperson-group-list.table.headers.name": "नाम", 
+  "publication.page.journal-issn": "पत्रिका ISSN",
 
-  "resource-policies.form.name.label": "नाम", 
+  "publication.page.journal-title": "पत्रिका शीर्षक",
 
-  "resource-policies.form.policy-type.label": "नीति प्रकार चुनें", 
+  "publication.page.publisher": "प्रकाशक",
 
-  "resource-policies.form.policy-type.required": "आपको संसाधन नीति प्रकार का चयन करना होगा।", 
+  "publication.page.titleprefix": "प्रकाशन:",
 
-  "resource-policies.table.headers.action": "गतिविधि", 
+  "publication.page.volume-title": "अंक शीर्षक",
 
-  "resource-policies.table.headers.date.end": "अंतिम तिथि", 
+  "publication.search.results.head": "प्रकाशन खोज परिणाम",
 
-  "resource-policies.table.headers.date.start": "आरंभ तिथि", 
+  "publication.search.title": "प्रकाशन खोज",
 
-  "resource-policies.table.headers.edit": "संपादित करें", 
+  "register-email.title": "नया उपयोगकर्ता पंजीकरण",
 
-  "resource-policies.table.headers.edit.group": "समूह संपादित करें", 
+  "register-page.create-profile.header": "प्रोफ़ाइल बनाएं",
 
-  "resource-policies.table.headers.edit.policy": "नीति संपादित करें", 
+  "register-page.create-profile.identification.contact": "संपर्क टेलीफोन",
 
-  "resource-policies.table.headers.eperson": "ई-व्यक्ति", 
+  "register-page.create-profile.identification.email": "ईमेल पता",
 
-  "resource-policies.table.headers.group": "समूह", 
+  "register-page.create-profile.identification.first-name": "पहला नाम *",
 
-  "resource-policies.table.headers.id": "पहचान", 
+  "register-page.create-profile.identification.first-name.error": "कृपया पहला नाम भरें",
 
-  "resource-policies.table.headers.name": "नाम", 
+  "register-page.create-profile.identification.header": "पहचान करें ",
 
-  "resource-policies.table.headers.policyType": "प्रकार", 
+  "register-page.create-profile.identification.language": "भाषा",
 
-  "resource-policies.table.headers.title.for.bitstream": "बिटस्ट्रीम के लिए नीतियां", 
+  "register-page.create-profile.identification.last-name": "उपनाम *",
 
-  "resource-policies.table.headers.title.for.bundle": "बंडल के लिए नीतियां", 
+  "register-page.create-profile.identification.last-name.error": "कृपया अंतिम नाम भरें",
 
-  "resource-policies.table.headers.title.for.collection": "संग्रह के लिए नीतियां", 
+  "register-page.create-profile.security.error.empty-password": "कृपया नीचे दिए गए बॉक्स में पासवर्ड दर्ज करें।",
 
-  "resource-policies.table.headers.title.for.community": "समुदाय के लिए नीतियां", 
+  "register-page.create-profile.security.error.matching-passwords": "पासवर्ड एक - दूसरे से मिलते - जुलते नहीं हैं।",
 
-  "resource-policies.table.headers.title.for.item": "आइटम के लिए नीतियां", 
+  "register-page.create-profile.security.error.password-length": "पासवर्ड कम से कम 6 अक्षर लंबा होना चाहिए।",
 
-  "search.breadcrumbs": "खोजें", 
+  "register-page.create-profile.security.header": "सुरक्षा",
 
-  "search.description": null, 
+  "register-page.create-profile.security.info": "कृपया नीचे दिए गए बॉक्स में पासवर्ड दर्ज करें, और दूसरे बॉक्स में फिर से टाइप करके इसकी पुष्टि करें। यह कम से कम छह वर्ण लंबा होना चाहिए।",
 
-  "search.filters.applied.f.author": "लेखक", 
+  "register-page.create-profile.security.label.password": "पासवर्ड *",
 
-  "search.filters.applied.f.birthDate.max": "अंतिम जन्म तिथि", 
+  "register-page.create-profile.security.label.passwordrepeat": "पुष्टि करने के लिए फिर से लिखें *",
 
-  "search.filters.applied.f.birthDate.min": "जन्म तिथि प्रारंभ करें", 
+  "register-page.create-profile.submit": "पंजीकरण पूर्ण करें",
 
-  "search.filters.applied.f.dateIssued.max": "अंतिम तिथि", 
+  "register-page.create-profile.submit.error.content": "नया उपयोगकर्ता पंजीकृत करते समय कुछ गलत हुआ।",
 
-  "search.filters.applied.f.dateIssued.min": "आरंभ करने की तिथि", 
+  "register-page.create-profile.submit.error.head": "पंजीकरण विफल रहा",
 
-  "search.filters.applied.f.dateSubmitted": "प्रस्तुत करने की तारीख", 
+  "register-page.create-profile.submit.success.content": "पंजीकरण सफल रहा। आपको बनाए गए उपयोगकर्ता के रूप में लॉग इन किया गया है।",
 
-  "search.filters.applied.f.discoverable": "गैर-खोज योग्य", 
+  "register-page.create-profile.submit.success.head": "पंजीकरण पूर्ण",
 
-  "search.filters.applied.f.entityType": "आइटम का प्रकार", 
+  "register-page.registration.email": "ईमेल पता *",
 
-  "search.filters.applied.f.has_content_in_original_bundle": "फ़ाइलें हैं", 
+  "register-page.registration.email.error.pattern": "कृपया ईमेल पता भरें",
 
-  "search.filters.applied.f.itemtype": "प्रकार", 
+  "register-page.registration.email.error.required": "कृपया ईमेल पता भरें",
 
-  "search.filters.applied.f.jobTitle": "नौकरी का शीर्षक", 
+  "register-page.registration.email.hint": "यह पता सत्यापित किया जाएगा और आपके लॉगिन नाम के रूप में उपयोग किया जाएगा।",
 
-  "search.filters.applied.f.namedresourcetype": "स्थिति", 
+  "register-page.registration.error.content": "निम्न ईमेल पता पंजीकृत करते समय एक त्रुटि हुई: {{ email }}",
 
-  "search.filters.applied.f.subject": "विषय", 
+  "register-page.registration.error.head": "ईमेल पंजीकृत करने का प्रयास करते समय त्रुटि",
 
-  "search.filters.applied.f.submitter": "प्रस्तुतकर्ता", 
+  "register-page.registration.header": "नया उपयोगकर्ता पंजीकरण",
 
-  "search.filters.applied.f.withdrawn": "वापस लिया गया", 
+  "register-page.registration.info": "डीस्पेस में नई प्रस्तुति तथा ईमेल द्वारा संग्रह अद्यतन की जानकारी हेतु सदस्यता के लिए नया खता पंजीकृत करें",
 
-  "search.filters.discoverable.false": "हाँ", 
+  "register-page.registration.submit": "पंजीकृत करें ",
 
-  "search.filters.discoverable.true": "नहीं", 
+  "register-page.registration.success.content": "{{ email }} को एक विशेष यूआरएल और अन्य निर्देशों के साथ एक ईमेल भेजा गया है।",
 
-  "search.filters.entityType.JournalIssue": "पत्रिका अंक", 
+  "register-page.registration.success.head": "सत्यापन ईमेल भेज दिया गया है",
 
-  "search.filters.entityType.JournalVolume": "पत्रिका खंड", 
+  "relationships.add.error.relationship-type.content": "दो मदों के बीच {{type }} संबंध प्रकार के लिए कोई उपयुक्त मिलान नहीं पाया जा सका",
 
-  "search.filters.entityType.OrgUnit": "संगठित इकाई", 
+  "relationships.add.error.server.content": "सर्वर ने त्रुटि लौटाई",
 
-  "search.filters.filter.author.head": "लेखक", 
+  "relationships.add.error.title": "संबंध जोड़ने में असमर्थ",
 
-  "search.filters.filter.author.label": "लेखक का नाम खोजें", 
+  "relationships.isAuthorOf": "लेखक",
 
-  "search.filters.filter.author.placeholder": "लेखक का नाम", 
+  "relationships.isAuthorOf.OrgUnit": "लेखक (संगठनात्मक इकाइयां)",
 
-  "search.filters.filter.birthDate.head": "जन्म तिथि", 
+  "relationships.isAuthorOf.Person": "लेखक (व्यक्ति)",
 
-  "search.filters.filter.birthDate.label": "जन्म तिथि खोजें", 
+  "relationships.isContributorOf": "योगदानकर्ता",
 
-  "search.filters.filter.birthDate.placeholder": "जन्म तिथि", 
+  "relationships.isContributorOf.OrgUnit": "योगदानकर्ता (संगठनात्मक इकाई)",
 
-  "search.filters.filter.collapse": "फ़िल्टर संक्षिप्त करें", 
+  "relationships.isContributorOf.Person": "योगदान देने वाला",
 
-  "search.filters.filter.creativeDatePublished.head": "प्रकाशित तिथि", 
+  "relationships.isFundingAgencyOf.OrgUnit": "निधिदाता",
 
-  "search.filters.filter.creativeDatePublished.label": "प्रकाशित तिथि पर खोजें", 
+  "relationships.isIssueOf": "पत्रिका अंक",
 
-  "search.filters.filter.creativeDatePublished.placeholder": "प्रकाशित तिथि", 
+  "relationships.isJournalIssueOf": "पत्रिका अंक",
 
-  "search.filters.filter.creativeWorkEditor.head": "संपादक", 
+  "relationships.isJournalOf": "पत्रिकाएं",
 
-  "search.filters.filter.creativeWorkEditor.label": "संपादक खोजें", 
+  "relationships.isOrgUnitOf": "संगठनात्मक इकाइयाँ",
 
-  "search.filters.filter.creativeWorkEditor.placeholder": "संपादक", 
+  "relationships.isPersonOf": "लेखक",
 
-  "search.filters.filter.creativeWorkKeywords.head": "विषय", 
+  "relationships.isProjectOf": "अनुसंधान परियोजना",
 
-  "search.filters.filter.creativeWorkKeywords.label": "विषय खोजें", 
+  "relationships.isPublicationOf": "प्रकाशन",
 
-  "search.filters.filter.creativeWorkKeywords.placeholder": "विषय", 
+  "relationships.isPublicationOfJournalIssue": "लेख",
 
-  "search.filters.filter.creativeWorkPublisher.head": "प्रकाशक", 
+  "relationships.isSingleJournalOf": "पत्रिका",
 
-  "search.filters.filter.creativeWorkPublisher.label": "प्रकाशक खोजें", 
+  "relationships.isSingleVolumeOf": "पत्रिका खंड",
 
-  "search.filters.filter.creativeWorkPublisher.placeholder": "प्रकाशक", 
+  "relationships.isVolumeOf": "पत्रिका खंड",
 
-  "search.filters.filter.dateIssued.head": "तिथि", 
+  "repository.image.logo": "संग्राहलय चिन्ह",
 
-  "search.filters.filter.dateIssued.max.label": "अंत", 
+  "repository.title.prefix": "डीस्पेस एंग्युलर::",
 
-  "search.filters.filter.dateIssued.max.placeholder": "अधिकतम तिथि", 
+  "repository.title.prefixDSpace": "डीस्पेस एंग्यूलर ::",
 
-  "search.filters.filter.dateIssued.min.label": "शुरू करें", 
+  "researcher.profile.action.processing": "संसाधित किया जा रहा है...",
 
-  "search.filters.filter.dateIssued.min.placeholder": "न्यूनतम तिथि", 
+  "researcher.profile.associated": "शोधकर्ता प्रोफ़ाइल संबद्ध",
 
-  "search.filters.filter.dateSubmitted.head": "प्रस्तुत करने की तारीख", 
+  "researcher.profile.change-visibility.fail": "प्रोफ़ाइल दृश्यता बदलते समय एक अनपेक्षित त्रुटि उत्पन्न होती है",
 
-  "search.filters.filter.dateSubmitted.label": "खोज की तारीख जमा की गई", 
+  "researcher.profile.create.fail": "शोधकर्ता प्रोफ़ाइल निर्माण के दौरान एक त्रुटि उत्पन्न होती है",
 
-  "search.filters.filter.dateSubmitted.placeholder": "प्रस्तुत करने की तारीख", 
+  "researcher.profile.create.new": "नया बनाएं",
 
-  "search.filters.filter.discoverable.head": "गैर-खोज योग्य", 
+  "researcher.profile.create.success": "अनुसंधानकर्ता प्रोफ़ाइल सफलतापूर्वक बनाई गई",
 
-  "search.filters.filter.entityType.head": "आइटम का प्रकार", 
+  "researcher.profile.delete": "हटाएं",
 
-  "search.filters.filter.entityType.label": "आइटम प्रकार खोजें", 
+  "researcher.profile.expose": "खुलासा",
 
-  "search.filters.filter.entityType.placeholder": "आइटम का प्रकार", 
+  "researcher.profile.hide": "छिपाना",
 
-  "search.filters.filter.expand": "फ़िल्टर का विस्तार करें", 
+  "researcher.profile.not.associated": "अनुसंधानकर्ता प्रोफ़ाइल अभी तक सम्बंधित नहीं है ",
 
-  "search.filters.filter.has_content_in_original_bundle.head": "फ़ाइलें हैं", 
+  "researcher.profile.private.visibility": "निजी",
 
-  "search.filters.filter.itemtype.head": "प्रकार", 
+  "researcher.profile.public.visibility": "सार्वजनिक",
 
-  "search.filters.filter.itemtype.label": "खोज प्रकार", 
+  "researcher.profile.status": "दर्जा:",
 
-  "search.filters.filter.itemtype.placeholder": "प्रकार", 
+  "researcher.profile.view": "देखें",
 
-  "search.filters.filter.jobTitle.head": "नौकरी का शीर्षक", 
+  "researcherprofile.claim.not-authorized": "आप इस मद पर दावा करने के लिए अधिकृत नहीं हैं। अधिक जानकारी के लिए व्यवस्थापक से संपर्क करें।",
 
-  "search.filters.filter.jobTitle.label": "नौकरी का शीर्षक खोजें", 
+  "researcherprofile.error.claim.body": "प्रोफ़ाइल का दावा करते समय एक त्रुटि हुई, कृपया बाद में पुन: प्रयास करें",
 
-  "search.filters.filter.jobTitle.placeholder": "नौकरी का शीर्षक", 
+  "researcherprofile.error.claim.title": "त्रुटि",
 
-  "search.filters.filter.knowsLanguage.head": "ज्ञात भाषा", 
+  "researcherprofile.success.claim.body": "प्रोफ़ाइल पर सफलतापूर्वक दावा किया गया",
 
-  "search.filters.filter.knowsLanguage.label": "ज्ञात भाषा खोजें", 
+  "researcherprofile.success.claim.title": "सफलता",
 
-  "search.filters.filter.knowsLanguage.placeholder": "ज्ञात भाषा", 
+  "resource-policies.add.button": "जोड़ें",
 
-  "search.filters.filter.namedresourcetype.head": "स्थिति", 
+  "resource-policies.add.for.": "नई नीति जोड़ें",
 
-  "search.filters.filter.namedresourcetype.label": "खोज स्थिति", 
+  "resource-policies.add.for.bitstream": "एक नई बिटस्ट्रीम नीति जोड़ें",
 
-  "search.filters.filter.namedresourcetype.placeholder": "स्थिति", 
+  "resource-policies.add.for.bundle": "नई बंडल नीति जोड़ें",
 
-  "search.filters.filter.objectpeople.head": "लोग", 
+  "resource-policies.add.for.collection": "एक नई संग्रह नीति जोड़ें",
 
-  "search.filters.filter.objectpeople.label": "लोगों को खोजें", 
+  "resource-policies.add.for.community": "नई सामुदायिक नीति जोड़ें",
 
-  "search.filters.filter.objectpeople.placeholder": "लोग", 
+  "resource-policies.add.for.item": "नई आइटम नीति जोड़ें",
 
-  "search.filters.filter.organizationAddressCountry.head": "देश", 
+  "resource-policies.create.page.failure.content": "संसाधन नीति बनाते समय कोई त्रुटि उत्पन्न हुई।",
 
-  "search.filters.filter.organizationAddressCountry.label": "देश खोजें", 
+  "resource-policies.create.page.heading": "के लिए नई संसाधन नीति बनाएं",
 
-  "search.filters.filter.organizationAddressCountry.placeholder": "देश", 
+  "resource-policies.create.page.success.content": "संचालन सफल रहा",
 
-  "search.filters.filter.organizationAddressLocality.head": "शहर", 
+  "resource-policies.create.page.title": "नई संसाधन नीति बनाएं",
 
-  "search.filters.filter.organizationAddressLocality.label": "शहर खोजें", 
+  "resource-policies.delete.btn": "चयनित को हटाएं",
 
-  "search.filters.filter.organizationAddressLocality.placeholder": "शहर", 
+  "resource-policies.delete.btn.title": "चयनित संसाधन नीतियां हटाएं",
 
-  "search.filters.filter.organizationFoundingDate.head": "स्थापना तिथि", 
+  "resource-policies.delete.failure.content": "चयनित संसाधन नीतियों को हटाते समय एक त्रुटि उत्पन्न हुई।",
 
-  "search.filters.filter.organizationFoundingDate.label": "खोज तिथि मिली", 
+  "resource-policies.delete.success.content": "संचालन सफल रहा",
 
-  "search.filters.filter.organizationFoundingDate.placeholder": "स्थापना तिथि", 
+  "resource-policies.edit.page.failure.content": "संसाधन नीति संपादित करते समय कोई त्रुटि उत्पन्न हुई।",
 
-  "search.filters.filter.scope.head": "क्षेत्र", 
+  "resource-policies.edit.page.heading": "संसाधन नीति संपादित करें",
 
-  "search.filters.filter.scope.label": "खोज क्षेत्र फ़िल्टर", 
+  "resource-policies.edit.page.other-failure.content": "संसाधन नीति संपादित करते समय कोई त्रुटि उत्पन्न हुई। लक्ष्य (ई-व्यक्ति या समूह) का सफलतापूर्वक अद्यतन कर दिया गया है।",
 
-  "search.filters.filter.scope.placeholder": "स्कोप फिल्टर", 
+  "resource-policies.edit.page.success.content": "संचालन सफल रहा",
 
-  "search.filters.filter.show-less": "संक्षिप्त करें", 
+  "resource-policies.edit.page.target-failure.content": "संसाधन नीति के लक्ष्य (ई-व्यक्ति या समूह) को संपादित करते समय कोई त्रुटि उत्पन्न हुई।",
 
-  "search.filters.filter.show-more": "और दिखाएं", 
+  "resource-policies.edit.page.title": "संसाधन नीति संपादित करें",
 
-  "search.filters.filter.subject.head": "विषय", 
+  "resource-policies.form.action-type.label": "क्रिया प्रकार चुनें",
 
-  "search.filters.filter.subject.label": "विषय खोजें", 
+  "resource-policies.form.action-type.required": "आपको संसाधन नीति कार्रवाई का चयन करना होगा।",
 
-  "search.filters.filter.subject.placeholder": "विषय", 
+  "resource-policies.form.date.end.label": "अंतिम तिथि",
 
-  "search.filters.filter.submitter.head": "प्रस्तुतकर्ता", 
+  "resource-policies.form.date.start.label": "आरंभ करने की तिथि",
 
-  "search.filters.filter.submitter.label": "प्रस्तुतकर्ता को खोजें", 
+  "resource-policies.form.description.label": "विवरण",
 
-  "search.filters.filter.submitter.placeholder": "प्रस्तुतकर्ता", 
+  "resource-policies.form.eperson-group-list.label": "वह व्यक्ति या समूह जिसे अनुमति दी जाएगी",
 
-  "search.filters.filter.withdrawn.head": "वापस लिया गया", 
+  "resource-policies.form.eperson-group-list.modal.close": "ठीक है",
 
-  "search.filters.has_content_in_original_bundle.false": "नहीं", 
+  "resource-policies.form.eperson-group-list.modal.header": "प्रकार नहीं बदल सकता",
 
-  "search.filters.has_content_in_original_bundle.true": "हाँ", 
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "समूह को ई-व्यक्ति से बदलना संभव नहीं है।",
 
-  "search.filters.head": "फिल्टर", 
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "ई-व्यक्ति को समूह से बदलना संभव नहीं है।",
 
-  "search.filters.reset": "फ़िल्टर रीसेट करें", 
+  "resource-policies.form.eperson-group-list.modal.text2": "वर्तमान संसाधन नीति हटाएं और वांछित प्रकार के साथ एक नई बनाएं।",
 
-  "search.filters.search.submit": "प्रस्तुत करें", 
+  "resource-policies.form.eperson-group-list.select.btn": "चयन करें",
 
-  "search.filters.withdrawn.false": "नहीं", 
+  "resource-policies.form.eperson-group-list.tab.eperson": "ई-व्यक्ति के लिए खोजें",
 
-  "search.filters.withdrawn.true": "हाँ", 
+  "resource-policies.form.eperson-group-list.tab.group": "एक समूह खोजें",
 
-  "search.form.scope.all": "सम्पूर्ण डीस्पेस", 
+  "resource-policies.form.eperson-group-list.table.headers.action": "गतिविधि",
 
-  "search.form.search": "खोजें", 
+  "resource-policies.form.eperson-group-list.table.headers.id": "पहचान",
 
-  "search.form.search_dspace": "सम्पूर्ण संग्रहालय", 
+  "resource-policies.form.eperson-group-list.table.headers.name": "नाम",
 
-  "search.results.empty": "आपकी खोज ने कोई परिणाम नहीं दिया।", 
+  "resource-policies.form.name.label": "नाम",
 
-  "search.results.head": "खोज के परिणाम", 
+  "resource-policies.form.policy-type.label": "नीति प्रकार चुनें",
 
-  "search.results.no-results": "आपकी खोज का कोई परिणाम नहीं निकला। आप जो खोज रहे हैं उसे ढूंढने में परेशानी हो रही है? डालने का प्रयास करें", 
+  "resource-policies.form.policy-type.required": "आपको संसाधन नीति प्रकार का चयन करना होगा।",
 
-  "search.results.no-results-link": "इसके चारों ओर उद्धरण", 
+  "resource-policies.table.headers.action": "गतिविधि",
 
-  "search.results.view-result": "देखें", 
+  "resource-policies.table.headers.date.end": "अंतिम तिथि",
 
-  "search.search-form.placeholder": "संग्रहालय में खोजें ...", 
+  "resource-policies.table.headers.date.start": "आरंभ तिथि",
 
-  "search.sidebar.close": "परिणामों पर वापस जाएं", 
+  "resource-policies.table.headers.edit": "संपादित करें",
 
-  "search.sidebar.filters.title": "फिल्टर", 
+  "resource-policies.table.headers.edit.group": "समूह संपादित करें",
 
-  "search.sidebar.open": "खोज उपकरण", 
+  "resource-policies.table.headers.edit.policy": "नीति संपादित करें",
 
-  "search.sidebar.results": "परिणाम", 
+  "resource-policies.table.headers.eperson": "ई-व्यक्ति",
 
-  "search.sidebar.settings.rpp": "प्रति पृष्ठ परिणाम", 
+  "resource-policies.table.headers.group": "समूह",
 
-  "search.sidebar.settings.sort-by": "द्वारा क्रमबद्ध करें", 
+  "resource-policies.table.headers.id": "पहचान",
 
-  "search.sidebar.settings.title": "समायोजन", 
+  "resource-policies.table.headers.name": "नाम",
 
-  "search.switch-configuration.title": "दिखाएँ", 
+  "resource-policies.table.headers.policyType": "प्रकार",
 
-  "search.title": "खोजें", 
+  "resource-policies.table.headers.title.for.bitstream": "बिटस्ट्रीम के लिए नीतियां",
 
-  "search.view-switch.show-detail": "विवरण दिखाएँ", 
+  "resource-policies.table.headers.title.for.bundle": "बंडल के लिए नीतियां",
 
-  "search.view-switch.show-grid": "ग्रिड के रूप में दिखाएं", 
+  "resource-policies.table.headers.title.for.collection": "संग्रह के लिए नीतियां",
 
-  "search.view-switch.show-list": "सूची के रूप में दिखाएं", 
+  "resource-policies.table.headers.title.for.community": "समुदाय के लिए नीतियां",
 
-  "sorting.ASC": "आरोही", 
+  "resource-policies.table.headers.title.for.item": "आइटम के लिए नीतियां",
 
-  "sorting.dc.date.accessioned.ASC": "परिग्रहण तिथि आरोही", 
+  "search.breadcrumbs": "खोजें",
 
-  "sorting.dc.date.accessioned.DESC": "परिग्रहण तिथि अवरोही", 
+  "search.description": null,
 
-  "sorting.dc.date.issued.ASC": "जारी तिथि आरोही", 
+  "search.filters.applied.f.author": "लेखक",
 
-  "sorting.dc.date.issued.DESC": "जारी दिनांक अवरोही", 
+  "search.filters.applied.f.birthDate.max": "अंतिम जन्म तिथि",
 
-  "sorting.dc.title.ASC": "शीर्षक आरोही", 
+  "search.filters.applied.f.birthDate.min": "जन्म तिथि प्रारंभ करें",
 
-  "sorting.dc.title.DESC": "शीर्षक अवरोही", 
+  "search.filters.applied.f.dateIssued.max": "अंतिम तिथि",
 
-  "sorting.DESC": "अवरोही", 
+  "search.filters.applied.f.dateIssued.min": "आरंभ करने की तिथि",
 
-  "sorting.lastModified.ASC": "अंतिम संशोधित आरोही", 
+  "search.filters.applied.f.dateSubmitted": "प्रस्तुत करने की तारीख",
 
-  "sorting.lastModified.DESC": "अंतिम संशोधित अवरोही", 
+  "search.filters.applied.f.discoverable": "गैर-खोज योग्य",
 
-  "sorting.score.ASC": "न्यूनतम प्रासंगिक", 
+  "search.filters.applied.f.entityType": "आइटम का प्रकार",
 
-  "sorting.score.DESC": "सबसे अधिक प्रासंगिक", 
+  "search.filters.applied.f.has_content_in_original_bundle": "फ़ाइलें हैं",
 
-  "statistics.breadcrumbs": "सांख्यिकी", 
+  "search.filters.applied.f.itemtype": "प्रकार",
 
-  "statistics.header": "{{ scope }} के आंकड़े", 
+  "search.filters.applied.f.jobTitle": "नौकरी का शीर्षक",
 
-  "statistics.page.no-data": "कोई डेटा उपलब्ध नहीं", 
+  "search.filters.applied.f.namedresourcetype": "स्थिति",
 
-  "statistics.table.header.views": "दौरे", 
+  "search.filters.applied.f.subject": "विषय",
 
-  "statistics.table.no-data": "कोई डेटा उपलब्ध नहीं", 
+  "search.filters.applied.f.submitter": "प्रस्तुतकर्ता",
 
-  "statistics.table.title.TopCities": "शीर्ष शहर के दृश्य", 
+  "search.filters.applied.f.withdrawn": "वापस लिया गया",
 
-  "statistics.table.title.TopCountries": "शीर्ष दर्शक देश", 
+  "search.filters.discoverable.false": "हाँ",
 
-  "statistics.table.title.TotalDownloads": "फ़ाइल का दौरा", 
+  "search.filters.discoverable.true": "नहीं",
 
-  "statistics.table.title.TotalVisits": "कुल दौरा", 
+  "search.filters.entityType.JournalIssue": "पत्रिका अंक",
 
-  "statistics.table.title.TotalVisitsPerMonth": "प्रति माह कुल विज़िट", 
+  "search.filters.entityType.JournalVolume": "पत्रिका खंड",
 
-  "statistics.title": "सांख्यिकी", 
+  "search.filters.entityType.OrgUnit": "संगठित इकाई",
 
-  "submission.edit.breadcrumbs": "प्रस्तुति सम्पादित करें", 
+  "search.filters.filter.author.head": "लेखक",
 
-  "submission.edit.title": "प्रस्तुति संपादित करें", 
+  "search.filters.filter.author.label": "लेखक का नाम खोजें",
 
-  "submission.general.cancel": "रद्द करें", 
+  "search.filters.filter.author.placeholder": "लेखक का नाम",
 
-  "submission.general.cannot_submit": "आपको नई प्रस्तुति करने का विशेषाधिकार नहीं है।", 
+  "search.filters.filter.birthDate.head": "जन्म तिथि",
 
-  "submission.general.deposit": "जमा", 
+  "search.filters.filter.birthDate.label": "जन्म तिथि खोजें",
 
-  "submission.general.discard.confirm.cancel": "रद्द करें", 
+  "search.filters.filter.birthDate.placeholder": "जन्म तिथि",
 
-  "submission.general.discard.confirm.info": "यह कार्रवाई पूर्ववत नहीं की जा सकती। क्या आपको यकीन है?", 
+  "search.filters.filter.collapse": "फ़िल्टर संक्षिप्त करें",
 
-  "submission.general.discard.confirm.submit": "हां मुझे यकीन है", 
+  "search.filters.filter.creativeDatePublished.head": "प्रकाशित तिथि",
 
-  "submission.general.discard.confirm.title": "प्रस्तुति रद्द करें", 
+  "search.filters.filter.creativeDatePublished.label": "प्रकाशित तिथि पर खोजें",
 
-  "submission.general.discard.submit": "रद्द करें", 
+  "search.filters.filter.creativeDatePublished.placeholder": "प्रकाशित तिथि",
 
-  "submission.general.info.pending-changes": "बदलाव जो सहेजे नहीं गए", 
+  "search.filters.filter.creativeWorkEditor.head": "संपादक",
 
-  "submission.general.info.saved": "सहेजा गया", 
+  "search.filters.filter.creativeWorkEditor.label": "संपादक खोजें",
 
-  "submission.general.save": "सहेजें", 
+  "search.filters.filter.creativeWorkEditor.placeholder": "संपादक",
 
-  "submission.general.save-later": "बाद के लिए सहेजें", 
+  "search.filters.filter.creativeWorkKeywords.head": "विषय",
 
-  "submission.import-external.back-to-my-dspace": "मेरे डीस्पेस पर वापस जाएं ", 
+  "search.filters.filter.creativeWorkKeywords.label": "विषय खोजें",
 
-  "submission.import-external.page.hint": "डीस्पेस में आयात करने के लिए वेब से आइटम खोजने के लिए ऊपर एक क्वेरी दर्ज करें।", 
+  "search.filters.filter.creativeWorkKeywords.placeholder": "विषय",
 
-  "submission.import-external.page.title": "बाहरी स्रोत से मेटाडेटा आयात करें", 
+  "search.filters.filter.creativeWorkPublisher.head": "प्रकाशक",
 
-  "submission.import-external.preview.button.import": "प्रस्तुत करना प्रारंभ करें", 
+  "search.filters.filter.creativeWorkPublisher.label": "प्रकाशक खोजें",
 
-  "submission.import-external.preview.error.import.body": "बाहरी स्रोत प्रविष्टि आयात प्रक्रिया के दौरान कोई त्रुटि उत्पन्न होती है।", 
+  "search.filters.filter.creativeWorkPublisher.placeholder": "प्रकाशक",
 
-  "submission.import-external.preview.error.import.title": "प्रस्तुत करने में त्रुटि", 
+  "search.filters.filter.dateIssued.head": "तिथि",
 
-  "submission.import-external.preview.subtitle": "नीचे दिया गया मेटाडेटा बाहरी स्रोत से आयात किया गया था। जब आप प्रस्तुति शुरू करेंगे तो यह पहले से भर जाएगा।", 
+  "search.filters.filter.dateIssued.max.label": "अंत",
 
-  "submission.import-external.preview.title": "आइटम पूर्वावलोकन", 
+  "search.filters.filter.dateIssued.max.placeholder": "अधिकतम तिथि",
 
-  "submission.import-external.preview.title.Journal": "पत्रिका पूर्वावलोकन", 
+  "search.filters.filter.dateIssued.min.label": "शुरू करें",
 
-  "submission.import-external.preview.title.none": "आइटम पूर्वावलोकन", 
+  "search.filters.filter.dateIssued.min.placeholder": "न्यूनतम तिथि",
 
-  "submission.import-external.preview.title.OrgUnit": "संगठनात्मक इकाई पूर्वावलोकन", 
+  "search.filters.filter.dateSubmitted.head": "प्रस्तुत करने की तारीख",
 
-  "submission.import-external.preview.title.Person": "व्यक्ति पूर्वावलोकन", 
+  "search.filters.filter.dateSubmitted.label": "खोज की तारीख जमा की गई",
 
-  "submission.import-external.preview.title.Project": "परियोजना पूर्वावलोकन", 
+  "search.filters.filter.dateSubmitted.placeholder": "प्रस्तुत करने की तारीख",
 
-  "submission.import-external.preview.title.Publication": "प्रकाशन पूर्वावलोकन", 
+  "search.filters.filter.discoverable.head": "गैर-खोज योग्य",
 
-  "submission.import-external.search.button": "खोजें", 
+  "search.filters.filter.entityType.head": "आइटम का प्रकार",
 
-  "submission.import-external.search.button.hint": "खोजने के लिए कुछ शब्द लिखें", 
+  "search.filters.filter.entityType.label": "आइटम प्रकार खोजें",
 
-  "submission.import-external.search.placeholder": "बाहरी स्रोत खोजें", 
+  "search.filters.filter.entityType.placeholder": "आइटम का प्रकार",
 
-  "submission.import-external.search.source.hint": "बाहरी स्रोत चुनें", 
+  "search.filters.filter.expand": "फ़िल्टर का विस्तार करें",
 
-  "submission.import-external.source.ads": "NASA/ADS", 
+  "search.filters.filter.has_content_in_original_bundle.head": "फ़ाइलें हैं",
 
-  "submission.import-external.source.arxiv": "arXiv", 
+  "search.filters.filter.itemtype.head": "प्रकार",
 
-  "submission.import-external.source.cinii": "CiNii", 
+  "search.filters.filter.itemtype.label": "खोज प्रकार",
 
-  "submission.import-external.source.crossref": "CrossRef", 
+  "search.filters.filter.itemtype.placeholder": "प्रकार",
 
-  "submission.import-external.source.epo": "यूरोपीय पेटेंट कार्यालय", 
+  "search.filters.filter.jobTitle.head": "नौकरी का शीर्षक",
 
-  "submission.import-external.source.lcname": "लाइब्रेरी ऑफ़ कांग्रेस के नाम", 
+  "search.filters.filter.jobTitle.label": "नौकरी का शीर्षक खोजें",
 
-  "submission.import-external.source.loading": "लोड हो रहा है...", 
+  "search.filters.filter.jobTitle.placeholder": "नौकरी का शीर्षक",
 
-  "submission.import-external.source.openAIREFunding": "OpenAIRE API का वित्तपोषण", 
+  "search.filters.filter.knowsLanguage.head": "ज्ञात भाषा",
 
-  "submission.import-external.source.orcid": "ORCID", 
+  "search.filters.filter.knowsLanguage.label": "ज्ञात भाषा खोजें",
 
-  "submission.import-external.source.orcidWorks": "ORCID", 
+  "search.filters.filter.knowsLanguage.placeholder": "ज्ञात भाषा",
 
-  "submission.import-external.source.pubmed": "पबमेड (Pubmed)", 
+  "search.filters.filter.namedresourcetype.head": "स्थिति",
 
-  "submission.import-external.source.pubmedeu": "पबमेड (Pubmed) यूरोप", 
+  "search.filters.filter.namedresourcetype.label": "खोज स्थिति",
 
-  "submission.import-external.source.scielo": "SciELO", 
+  "search.filters.filter.namedresourcetype.placeholder": "स्थिति",
 
-  "submission.import-external.source.scopus": "स्कोपस", 
+  "search.filters.filter.objectpeople.head": "लोग",
 
-  "submission.import-external.source.sherpaJournal": "शेरपा पत्रिकाएं", 
+  "search.filters.filter.objectpeople.label": "लोगों को खोजें",
 
-  "submission.import-external.source.sherpaJournalIssn": "ISSN द्वारा शेरपा पत्रिकाएं  ", 
+  "search.filters.filter.objectpeople.placeholder": "लोग",
 
-  "submission.import-external.source.sherpaPublisher": "शेरपा प्रकाशक", 
+  "search.filters.filter.organizationAddressCountry.head": "देश",
 
-  "submission.import-external.source.vufind": "VuFind", 
+  "search.filters.filter.organizationAddressCountry.label": "देश खोजें",
 
-  "submission.import-external.source.wos": "वेब ऑफ़ साइंस", 
+  "search.filters.filter.organizationAddressCountry.placeholder": "देश",
 
-  "submission.import-external.title": "बाहरी स्रोत से मेटाडेटा आयात करें", 
+  "search.filters.filter.organizationAddressLocality.head": "शहर",
 
-  "submission.import-external.title.Journal": "किसी बाहरी स्रोत से पत्रिका आयात करें", 
+  "search.filters.filter.organizationAddressLocality.label": "शहर खोजें",
 
-  "submission.import-external.title.JournalIssue": "किसी बाहरी स्रोत से पत्रिका अंक आयात करें   ", 
+  "search.filters.filter.organizationAddressLocality.placeholder": "शहर",
 
-  "submission.import-external.title.JournalVolume": "किसी बाहरी स्रोत से पत्रिका अंक आयात करें", 
+  "search.filters.filter.organizationFoundingDate.head": "स्थापना तिथि",
 
-  "submission.import-external.title.none": "बाहरी स्रोत से मेटाडेटा आयात करें", 
+  "search.filters.filter.organizationFoundingDate.label": "खोज तिथि मिली",
 
-  "submission.import-external.title.OrgUnit": "किसी बाहरी स्रोत से प्रकाशक आयात करें", 
+  "search.filters.filter.organizationFoundingDate.placeholder": "स्थापना तिथि",
 
-  "submission.import-external.title.Person": "किसी व्यक्ति को बाहरी स्रोत से आयात करें", 
+  "search.filters.filter.scope.head": "क्षेत्र",
 
-  "submission.import-external.title.Project": "किसी बाहरी स्रोत से प्रोजेक्ट आयात करें", 
+  "search.filters.filter.scope.label": "खोज क्षेत्र फ़िल्टर",
 
-  "submission.import-external.title.Publication": "किसी बाहरी स्रोत से प्रकाशन आयात करें", 
+  "search.filters.filter.scope.placeholder": "स्कोप फिल्टर",
 
-  "submission.sections.accesses.form.access-condition-hint": "आइटम जमा करने के बाद उस पर लागू करने के लिए प्रयोग शर्त का चयन करें", 
+  "search.filters.filter.show-less": "संक्षिप्त करें",
 
-  "submission.sections.accesses.form.access-condition-label": "पहुँच स्थिति प्रकार", 
+  "search.filters.filter.show-more": "और दिखाएं",
 
-  "submission.sections.accesses.form.date-required": "तिथि आवश्यक है।", 
+  "search.filters.filter.subject.head": "विषय",
 
-  "submission.sections.accesses.form.date-required-from": "तिथि से अनुदान पहुंच आवश्यक है।", 
+  "search.filters.filter.subject.label": "विषय खोजें",
 
-  "submission.sections.accesses.form.date-required-until": "तिथि तक पहुंच प्रदान करना आवश्यक है।", 
+  "search.filters.filter.subject.placeholder": "विषय",
 
-  "submission.sections.accesses.form.discoverable-description": "चयनित होने पर, यह आइटम खोज/ब्राउज़ में खोजने योग्य होगा। अचयनित होने पर, आइटम केवल सीधे लिंक के माध्यम से उपलब्ध होगा और कभी भी खोज/ब्राउज़ में दिखाई नहीं देगा। ", 
+  "search.filters.filter.submitter.head": "प्रस्तुतकर्ता",
 
-  "submission.sections.accesses.form.discoverable-label": "खोज योग्य", 
+  "search.filters.filter.submitter.label": "प्रस्तुतकर्ता को खोजें",
 
-  "submission.sections.accesses.form.from-hint": "उस तिथि का चयन करें जिससे संबंधित एक्सेस शर्त लागू की गई है", 
+  "search.filters.filter.submitter.placeholder": "प्रस्तुतकर्ता",
 
-  "submission.sections.accesses.form.from-label": "अभिगमन आरम्भ तिथि", 
+  "search.filters.filter.withdrawn.head": "वापस लिया गया",
 
-  "submission.sections.accesses.form.from-placeholder": "से", 
+  "search.filters.has_content_in_original_bundle.false": "नहीं",
 
-  "submission.sections.accesses.form.group-label": "समूह", 
+  "search.filters.has_content_in_original_bundle.true": "हाँ",
 
-  "submission.sections.accesses.form.group-required": "समूह की आवश्यकता है।", 
+  "search.filters.head": "फिल्टर",
 
-  "submission.sections.accesses.form.until-hint": "उस तिथि का चयन करें जब तक संबंधित पहुंच की शर्त लागू नहीं होती है", 
+  "search.filters.reset": "फ़िल्टर रीसेट करें",
 
-  "submission.sections.accesses.form.until-label": "तक पहुंच प्रदान करें", 
+  "search.filters.search.submit": "प्रस्तुत करें",
 
-  "submission.sections.accesses.form.until-placeholder": "तक", 
+  "search.filters.withdrawn.false": "नहीं",
 
-  "submission.sections.ccLicense.change": "अपना लाइसेंस प्रकार बदलें…", 
+  "search.filters.withdrawn.true": "हाँ",
 
-  "submission.sections.ccLicense.confirmation": "मैं ऊपर लाइसेंस प्रदान करता हूं", 
+  "search.form.scope.all": "सम्पूर्ण डीस्पेस",
 
-  "submission.sections.ccLicense.link": "आपने निम्न लाइसेंस का चयन किया है:", 
+  "search.form.search": "खोजें",
 
-  "submission.sections.ccLicense.none": "कोई लाइसेंस उपलब्ध नहीं", 
+  "search.form.search_dspace": "सम्पूर्ण संग्रहालय",
 
-  "submission.sections.ccLicense.option.select": "कोई विकल्प चुनें…", 
+  "search.results.empty": "आपकी खोज ने कोई परिणाम नहीं दिया।",
 
-  "submission.sections.ccLicense.select": "एक लाइसेंस प्रकार चुनें…", 
+  "search.results.head": "खोज के परिणाम",
 
-  "submission.sections.ccLicense.type": "अनुज्ञाप‍त्र के प्रकार ", 
+  "search.results.no-results": "आपकी खोज का कोई परिणाम नहीं निकला। आप जो खोज रहे हैं उसे ढूंढने में परेशानी हो रही है? डालने का प्रयास करें",
 
-  "submission.sections.describe.relationship-lookup.close": "बंद करना", 
+  "search.results.no-results-link": "इसके चारों ओर उद्धरण",
 
-  "submission.sections.describe.relationship-lookup.external-source.added": "चयन में स्थानीय प्रविष्टि को सफलतापूर्वक जोड़ा गया", 
+  "search.results.view-result": "देखें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "रिमोट उपकरण आयात करें", 
+  "search.search-form.placeholder": "संग्रहालय में खोजें ...",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "दूरस्थ घटना आयात करें", 
+  "search.sidebar.close": "परिणामों पर वापस जाएं",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "सुदूर निधि आयात करें", 
+  "search.sidebar.filters.title": "फिल्टर",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "दूरस्थ लेखक आयात करें", 
+  "search.sidebar.open": "खोज उपकरण",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "परियोजना", 
+  "search.sidebar.results": "परिणाम",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "दूरस्थ पत्रिका आयात करें", 
+  "search.sidebar.settings.rpp": "प्रति पृष्ठ परिणाम",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "दूरस्थ पत्रिका प्रकाशन आयात करें", 
+  "search.sidebar.settings.sort-by": "द्वारा क्रमबद्ध करें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "दूरस्थ जर्नल वॉल्यूम आयात करें", 
+  "search.sidebar.settings.title": "समायोजन",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "दूरस्थ आइटम आयात करें", 
+  "search.switch-configuration.title": "दिखाएँ",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "दूरस्थ संगठनात्मक इकाई आयात करें", 
+  "search.title": "खोजें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "रिमोट पेटेंट आयात करें", 
+  "search.view-switch.show-detail": "विवरण दिखाएँ",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "दूरस्थ व्यक्ति आयात करें", 
+  "search.view-switch.show-grid": "ग्रिड के रूप में दिखाएं",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "दूरस्थ उत्पाद आयात करें", 
+  "search.view-switch.show-list": "सूची के रूप में दिखाएं",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "दूरस्थ परियोजना आयात करें", 
+  "sorting.ASC": "आरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "दूरस्थ प्रकाशन आयात करें", 
+  "sorting.dc.date.accessioned.ASC": "परिग्रहण तिथि आरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "प्राधिकरण", 
+  "sorting.dc.date.accessioned.DESC": "परिग्रहण तिथि अवरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "नई स्थानीय प्राधिकरण प्रविष्टि के रूप में आयात करें", 
+  "sorting.dc.date.issued.ASC": "जारी तिथि आरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "रद्द करें", 
+  "sorting.dc.date.issued.DESC": "जारी दिनांक अवरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "नई प्रविष्टियों को आयात करने के लिए संग्रह का चयन करें", 
+  "sorting.dc.title.ASC": "शीर्षक आरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "इकाइयां", 
+  "sorting.dc.title.DESC": "शीर्षक अवरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "नई स्थानीय इकाई के रूप में आयात करें", 
+  "sorting.DESC": "अवरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "arXiv से आयात किया जा रहा है", 
+  "sorting.lastModified.ASC": "अंतिम संशोधित आरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "एलसी नाम से आयात करना", 
+  "sorting.lastModified.DESC": "अंतिम संशोधित अवरोही",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "OpenAIRE API का वित्तपोषण", 
+  "sorting.score.ASC": "न्यूनतम प्रासंगिक",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID से आयात करना", 
+  "sorting.score.DESC": "सबसे अधिक प्रासंगिक",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "पबमेड से आयात करना", 
+  "statistics.breadcrumbs": "सांख्यिकी",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "शेरपा पत्रिका से आयात", 
+  "statistics.header": "{{ scope }} के आंकड़े",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "शेरपा प्रकाशक से आयात करना", 
+  "statistics.page.no-data": "कोई डेटा उपलब्ध नहीं",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "आयात करें", 
+  "statistics.table.header.views": "दौरे",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "स्थानीय लेखक को चयन में सफलतापूर्वक जोड़ा गया", 
+  "statistics.table.no-data": "कोई डेटा उपलब्ध नहीं",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "चयन में बाहरी लेखक को सफलतापूर्वक आयात और जोड़ा गया", 
+  "statistics.table.title.TopCities": "शीर्ष शहर के दृश्य",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "दूरस्थ लेखक आयात करें", 
+  "statistics.table.title.TopCountries": "शीर्ष दर्शक देश",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "नई इकाई जोड़ी गई!", 
+  "statistics.table.title.TotalDownloads": "फ़ाइल का दौरा",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "परियोजना", 
+  "statistics.table.title.TotalVisits": "कुल दौरा",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "चयन में स्थानीय पत्रिका अंक को सफलतापूर्वक जोड़ा गया", 
+  "statistics.table.title.TotalVisitsPerMonth": "प्रति माह कुल विज़िट",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "चयन में बाहरी जर्नल अंक को सफलतापूर्वक आयात और जोड़ा गया", 
+  "statistics.title": "सांख्यिकी",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "रिमोट जर्नल इश्यू आयात करें", 
+  "submission.edit.breadcrumbs": "प्रस्तुति सम्पादित करें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "स्थानीय पत्रिका अंक को चयन में सफलतापूर्वक जोड़ा गया", 
+  "submission.edit.title": "प्रस्तुति संपादित करें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "चयन में बाहरी पत्रिका अंक को सफलतापूर्वक आयात कर जोड़ा गया", 
+  "submission.general.cancel": "रद्द करें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "रिमोट जर्नल वॉल्यूम आयात करें", 
+  "submission.general.cannot_submit": "आपको नई प्रस्तुति करने का विशेषाधिकार नहीं है।",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "स्थानीय पत्रिका को चयन में सफलतापूर्वक जोड़ा गया", 
+  "submission.general.deposit": "जमा",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "चयन में बाहरी जर्नल को सफलतापूर्वक आयात और जोड़ा गया", 
+  "submission.general.discard.confirm.cancel": "रद्द करें",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "दूरस्थ पत्रिका आयात करें", 
+  "submission.general.discard.confirm.info": "यह कार्रवाई पूर्ववत नहीं की जा सकती। क्या आपको यकीन है?",
 
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "एक स्थानीय मैच चुनें:", 
+  "submission.general.discard.confirm.submit": "हां मुझे यकीन है",
 
-  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "एक नया नाम प्रकार सहेजें", 
+  "submission.general.discard.confirm.title": "प्रस्तुति रद्द करें",
 
-  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "क्या आप \"{{ value }}\" को इस व्यक्ति के लिए एक नाम प्रकार के रूप में सहेजना चाहते हैं ताकि आप और अन्य इसे भविष्य में प्रस्तुतीकरण के लिए पुन: उपयोग कर सकें? यदि आप नहीं करते हैं तो भी आप इस प्रस्तुतीकरण के लिए इसका उपयोग कर सकते हैं।", 
+  "submission.general.discard.submit": "रद्द करें",
 
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "इस प्रस्तुति के लिए ही प्रयोग करें", 
+  "submission.general.info.pending-changes": "बदलाव जो सहेजे नहीं गए",
 
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "सभी को अचिन्हिंत करें", 
+  "submission.general.info.saved": "सहेजा गया",
 
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "पृष्ठ का चयन रद्द करें", 
+  "submission.general.save": "सहेजें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "लोड हो रहा है...", 
+  "submission.general.save-later": "बाद के लिए सहेजें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "खोज क्वेरी", 
+  "submission.import-external.back-to-my-dspace": "मेरे डीस्पेस पर वापस जाएं ",
 
-  "submission.sections.describe.relationship-lookup.search-tab.search": "जाओ", 
+  "submission.import-external.page.hint": "डीस्पेस में आयात करने के लिए वेब से आइटम खोजने के लिए ऊपर एक क्वेरी दर्ज करें।",
 
-  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "खोज...", 
+  "submission.import-external.page.title": "बाहरी स्रोत से मेटाडेटा आयात करें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.select-all": "सबका चयन करें", 
+  "submission.import-external.preview.button.import": "प्रस्तुत करना प्रारंभ करें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.select-page": "पृष्ठ का चयन करें", 
+  "submission.import-external.preview.error.import.body": "बाहरी स्रोत प्रविष्टि आयात प्रक्रिया के दौरान कोई त्रुटि उत्पन्न होती है।",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})", 
+  "submission.import-external.preview.error.import.title": "प्रस्तुत करने में त्रुटि",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "({{ count }}) स्थानीय डेटा फ़ाइलें", 
+  "submission.import-external.preview.subtitle": "नीचे दिया गया मेटाडेटा बाहरी स्रोत से आयात किया गया था। जब आप प्रस्तुति शुरू करेंगे तो यह पहले से भर जाएगा।",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "({{ count }}) स्थानीय डेटा पैकेज", 
+  "submission.import-external.preview.title": "आइटम पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "({{ count }}) स्थानीय लेखक", 
+  "submission.import-external.preview.title.Journal": "पत्रिका पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "संगठनात्मक इकाइयों के लिए खोजें", 
+  "submission.import-external.preview.title.none": "आइटम पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "परियोजना के निधिदाता", 
+  "submission.import-external.preview.title.OrgUnit": "संगठनात्मक इकाई पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "निधिदाता संस्थाओ के लिए खोजें", 
+  "submission.import-external.preview.title.Person": "व्यक्ति पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "अनुदान की खोज करें ", 
+  "submission.import-external.preview.title.Project": "परियोजना पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "({{ count }}) स्थानीय पत्रिका प्रकाशन", 
+  "submission.import-external.preview.title.Publication": "प्रकाशन पूर्वावलोकन",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "({{ count }}) स्थानीय पत्रिकाएं", 
+  "submission.import-external.search.button": "खोजें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "({{ count }}) स्थानीय पत्रिका खंड", 
+  "submission.import-external.search.button.hint": "खोजने के लिए कुछ शब्द लिखें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "परियोजनाएं", 
+  "submission.import-external.search.placeholder": "बाहरी स्रोत खोजें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "({{ count }}) स्थानीय पत्रिकाएं", 
+  "submission.import-external.search.source.hint": "बाहरी स्रोत चुनें",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "({{ count }}) स्थानीय पत्रिका मुद्दे", 
+  "submission.import-external.source.ads": "NASA/ADS",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "({{ count }}) स्थानीय पत्रिका खंड", 
+  "submission.import-external.source.arxiv": "arXiv",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "({{ count }}) एलसी नाम", 
+  "submission.import-external.source.cinii": "CiNii",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "OpenAIRE API का वित्तपोषण", 
+  "submission.import-external.source.crossref": "CrossRef",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})", 
+  "submission.import-external.source.epo": "यूरोपीय पेटेंट कार्यालय",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "({{ count }}) स्थानीय संगठनात्मक इकाइयाँ ", 
+  "submission.import-external.source.lcname": "लाइब्रेरी ऑफ़ कांग्रेस के नाम",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "({{ count }}) स्थानीय लेखक", 
+  "submission.import-external.source.loading": "लोड हो रहा है...",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "({{ count }}) स्थानीय परियोजनाएं", 
+  "submission.import-external.source.openAIREFunding": "OpenAIRE API का वित्तपोषण",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "({{ count }}) स्थानीय प्रकाशन", 
+  "submission.import-external.source.orcid": "ORCID",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "({{ count }}) पबमेड (Pubmed)", 
+  "submission.import-external.source.orcidWorks": "ORCID",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "({{ count }}) शेरपा पत्रिका", 
+  "submission.import-external.source.pubmed": "पबमेड (Pubmed)",
 
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "({{ count }}) शेरपा प्रकाशक", 
+  "submission.import-external.source.pubmedeu": "पबमेड (Pubmed) यूरोप",
 
-  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "ड्रॉपडाउन टॉगल करें", 
+  "submission.import-external.source.scielo": "SciELO",
 
-  "submission.sections.describe.relationship-lookup.selected": "चयनित {{ size }} आइटम", 
+  "submission.import-external.source.scopus": "स्कोपस",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "आपका चयन वर्तमान में खाली है।", 
+  "submission.import-external.source.sherpaJournal": "शेरपा पत्रिकाएं",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "खोज...", 
+  "submission.import-external.source.sherpaJournalIssn": "ISSN द्वारा शेरपा पत्रिकाएं  ",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.settings": "समायोजन", 
+  "submission.import-external.source.sherpaPublisher": "शेरपा प्रकाशक",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "वर्तमान चयन ({{ count }})", 
+  "submission.import-external.source.vufind": "VuFind",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title": "खोज के परिणाम", 
+  "submission.import-external.source.wos": "वेब ऑफ़ साइंस",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "खोज के परिणाम", 
+  "submission.import-external.title": "बाहरी स्रोत से मेटाडेटा आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "खोज के परिणाम", 
+  "submission.import-external.title.Journal": "किसी बाहरी स्रोत से पत्रिका आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "चयनित डेटा फ़ाइलें", 
+  "submission.import-external.title.JournalIssue": "किसी बाहरी स्रोत से पत्रिका अंक आयात करें   ",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "चयनित डेटा पैकेज", 
+  "submission.import-external.title.JournalVolume": "किसी बाहरी स्रोत से पत्रिका अंक आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "खोज के परिणाम", 
+  "submission.import-external.title.none": "बाहरी स्रोत से मेटाडेटा आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "चयनित लेखक", 
+  "submission.import-external.title.OrgUnit": "किसी बाहरी स्रोत से प्रकाशक आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "चयनित संगठनात्मक इकाई", 
+  "submission.import-external.title.Person": "किसी व्यक्ति को बाहरी स्रोत से आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "चयनित फंडिंग एजेंसी", 
+  "submission.import-external.title.Project": "किसी बाहरी स्रोत से प्रोजेक्ट आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "चयनित अनुदान", 
+  "submission.import-external.title.Publication": "किसी बाहरी स्रोत से प्रकाशन आयात करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "चयनित अंक", 
+  "submission.sections.accesses.form.access-condition-hint": "आइटम जमा करने के बाद उस पर लागू करने के लिए प्रयोग शर्त का चयन करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "चयनित पत्रिकाएं", 
+  "submission.sections.accesses.form.access-condition-label": "पहुँच स्थिति प्रकार",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "चयनित पत्रिका खंड", 
+  "submission.sections.accesses.form.date-required": "तिथि आवश्यक है।",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "परियोजना", 
+  "submission.sections.accesses.form.date-required-from": "तिथि से अनुदान पहुंच आवश्यक है।",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "चयनित पत्रिकाएं", 
+  "submission.sections.accesses.form.date-required-until": "तिथि तक पहुंच प्रदान करना आवश्यक है।",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "चयनित अंक", 
+  "submission.sections.accesses.form.discoverable-description": "चयनित होने पर, यह आइटम खोज/ब्राउज़ में खोजने योग्य होगा। अचयनित होने पर, आइटम केवल सीधे लिंक के माध्यम से उपलब्ध होगा और कभी भी खोज/ब्राउज़ में दिखाई नहीं देगा। ",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "चयनित पत्रिका खंड", 
+  "submission.sections.accesses.form.discoverable-label": "खोज योग्य",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "खोज के परिणाम", 
+  "submission.sections.accesses.form.from-hint": "उस तिथि का चयन करें जिससे संबंधित एक्सेस शर्त लागू की गई है",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "OpenAIRE API का वित्तपोषण", 
+  "submission.sections.accesses.form.from-label": "अभिगमन आरम्भ तिथि",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "खोज के परिणाम", 
+  "submission.sections.accesses.form.from-placeholder": "से",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "खोज के परिणाम", 
+  "submission.sections.accesses.form.group-label": "समूह",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "चयनित संगठनात्मक इकाइयाँ", 
+  "submission.sections.accesses.form.group-required": "समूह की आवश्यकता है।",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "चयनित लेखक", 
+  "submission.sections.accesses.form.until-hint": "उस तिथि का चयन करें जब तक संबंधित पहुंच की शर्त लागू नहीं होती है",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "चयनित परियोजनाएं", 
+  "submission.sections.accesses.form.until-label": "तक पहुंच प्रदान करें",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "चयनित प्रकाशन", 
+  "submission.sections.accesses.form.until-placeholder": "तक",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "खोज के परिणाम", 
+  "submission.sections.ccLicense.change": "अपना लाइसेंस प्रकार बदलें…",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "खोज के परिणाम", 
+  "submission.sections.ccLicense.confirmation": "मैं ऊपर लाइसेंस प्रदान करता हूं",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "खोज के परिणाम", 
+  "submission.sections.ccLicense.link": "आपने निम्न लाइसेंस का चयन किया है:",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "खोज के परिणाम", 
+  "submission.sections.ccLicense.none": "कोई लाइसेंस उपलब्ध नहीं",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "खोज के परिणाम", 
+  "submission.sections.ccLicense.option.select": "कोई विकल्प चुनें…",
 
-  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "खोज के परिणाम", 
+  "submission.sections.ccLicense.select": "एक लाइसेंस प्रकार चुनें…",
 
-  "submission.sections.describe.relationship-lookup.title.DataFile": "डेटा फ़ाइलें", 
+  "submission.sections.ccLicense.type": "अनुज्ञाप‍त्र के प्रकार ",
 
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "डेटा पैकेज", 
+  "submission.sections.describe.relationship-lookup.close": "बंद करना",
 
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "निधिकरण संस्था", 
+  "submission.sections.describe.relationship-lookup.external-source.added": "चयन में स्थानीय प्रविष्टि को सफलतापूर्वक जोड़ा गया",
 
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "लेखक", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "रिमोट उपकरण आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "जनक संगठनात्मक इकाई", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "दूरस्थ घटना आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "परियोजना के निधिदाता", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "सुदूर निधि आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "निधिकरण संस्था", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "दूरस्थ लेखक आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "निधिकरण", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "परियोजना",
 
-  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "पत्रिका के मुद्दे", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "दूरस्थ पत्रिका आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "पत्रिकाएं", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "दूरस्थ पत्रिका प्रकाशन आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "पत्रिका खंड", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "दूरस्थ जर्नल वॉल्यूम आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "परियोजनाएं", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "दूरस्थ आइटम आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "पत्रिका प्रकाशन", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "दूरस्थ संगठनात्मक इकाई आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "पत्रिका खंड", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "रिमोट पेटेंट आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "संगठनात्मक इकाइयाँ", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "दूरस्थ व्यक्ति आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.Person": "लेखक", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "दूरस्थ उत्पाद आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.Project": "परियोजनाएं", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "दूरस्थ परियोजना आयात करें",
 
-  "submission.sections.describe.relationship-lookup.title.Publication": "प्रकाशन", 
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "दूरस्थ प्रकाशन आयात करें",
 
-  "submission.sections.general.add-more": "और जोड़ें", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "प्राधिकरण",
 
-  "submission.sections.general.cannot_deposit": "फ़ॉर्म में त्रुटियों के कारण जमा पूरा नहीं किया जा सकता है।<br>कृपया जमा को पूरा करने के लिए सभी आवश्यक फ़ील्ड भरें।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "नई स्थानीय प्राधिकरण प्रविष्टि के रूप में आयात करें",
 
-  "submission.sections.general.collection": "संग्रह", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "रद्द करें",
 
-  "submission.sections.general.deposit_error_notice": "आइटम प्रस्तुत करते समय एक समस्या हुई थी, कृपया बाद में फिर से प्रयास करें।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "नई प्रविष्टियों को आयात करने के लिए संग्रह का चयन करें",
 
-  "submission.sections.general.deposit_success_notice": "प्रस्तुति को सफलतापूर्वक जमा किया गया।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "इकाइयां",
 
-  "submission.sections.general.discard_error_notice": "आइटम को हटाते समय एक समस्या हुई थी, कृपया बाद में फिर से प्रयास करें।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "नई स्थानीय इकाई के रूप में आयात करें",
 
-  "submission.sections.general.discard_success_notice": "प्रस्तुति सफलतापूर्वक रद्द करी गयी। ", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "arXiv से आयात किया जा रहा है",
 
-  "submission.sections.general.metadata-extracted": "नया मेटाडेटा निकाला गया है और <strong>{{sectionId}}</strong> अनुभाग में जोड़ा गया है।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "एलसी नाम से आयात करना",
 
-  "submission.sections.general.metadata-extracted-new-section": "सबमिशन में नया <strong>{{sectionId}}</strong> अनुभाग जोड़ा गया है।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "OpenAIRE API का वित्तपोषण",
 
-  "submission.sections.general.no-collection": "कोई संग्रह नहीं मिला", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID से आयात करना",
 
-  "submission.sections.general.no-sections": "कोई विकल्प उपलब्ध नहीं", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "पबमेड से आयात करना",
 
-  "submission.sections.general.save_error_notice": "आइटम सहेजते समय एक समस्या हुई थी, कृपया बाद में पुन: प्रयास करें।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "शेरपा पत्रिका से आयात",
 
-  "submission.sections.general.save_success_notice": "प्रस्तुतीकरण सफलतापूर्वक सहेजा गया।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "शेरपा प्रकाशक से आयात करना",
 
-  "submission.sections.general.search-collection": "संग्रह के लिए खोजें", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "आयात करें",
 
-  "submission.sections.general.sections_not_valid": "अपूर्ण खंड हैं।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "स्थानीय लेखक को चयन में सफलतापूर्वक जोड़ा गया",
 
-  "submission.sections.license.granted-label": "मैं उपरोक्त लाइसेंस की पुष्टि करता हूं", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "चयन में बाहरी लेखक को सफलतापूर्वक आयात और जोड़ा गया",
 
-  "submission.sections.license.notgranted": "आपको अनुज्ञापत्र स्वीकार करना होगा", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "दूरस्थ लेखक आयात करें",
 
-  "submission.sections.license.required": "आपको लाइसेंस स्वीकार करना होगा", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "नई इकाई जोड़ी गई!",
 
-  "submission.sections.sherpa-policy.title-empty": "प्रकाशक नीति की कोई जानकारी उपलब्ध नहीं है। अगर आपके काम में संबधित आईएसएसएन है, तो कृपया संबंधित प्रकाशक की खुली पहुंच (ओपन एक्सेस) नीतियों को देखने के लिए इसे ऊपर दर्ज करें।", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "परियोजना",
 
-  "submission.sections.sherpa.error.message": "शेरपा जानकारी प्राप्त करने में त्रुटि हुई थी", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "चयन में स्थानीय पत्रिका अंक को सफलतापूर्वक जोड़ा गया",
 
-  "submission.sections.sherpa.publication.information": "प्रकाशन की जानकारी", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "चयन में बाहरी जर्नल अंक को सफलतापूर्वक आयात और जोड़ा गया",
 
-  "submission.sections.sherpa.publication.information.issns": "ISSNs", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "रिमोट जर्नल इश्यू आयात करें",
 
-  "submission.sections.sherpa.publication.information.publishers": "प्रकाशक", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "स्थानीय पत्रिका अंक को चयन में सफलतापूर्वक जोड़ा गया",
 
-  "submission.sections.sherpa.publication.information.romeoPub": "रोमियो पब", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "चयन में बाहरी पत्रिका अंक को सफलतापूर्वक आयात कर जोड़ा गया",
 
-  "submission.sections.sherpa.publication.information.title": "शीर्षक", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "रिमोट जर्नल वॉल्यूम आयात करें",
 
-  "submission.sections.sherpa.publication.information.url": "यूआरएल (URL)", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "स्थानीय पत्रिका को चयन में सफलतापूर्वक जोड़ा गया",
 
-  "submission.sections.sherpa.publication.information.zetoPub": "ज़ेटो पब (Zeto Pub)", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "चयन में बाहरी जर्नल को सफलतापूर्वक आयात और जोड़ा गया",
 
-  "submission.sections.sherpa.publisher.policy": "प्रकाशक नीति", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "दूरस्थ पत्रिका आयात करें",
 
-  "submission.sections.sherpa.publisher.policy.conditions": "स्थितियाँ", 
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "एक स्थानीय मैच चुनें:",
 
-  "submission.sections.sherpa.publisher.policy.description": "नीचे दी गई जानकारी शेरपा रोमियो के माध्यम से मिली। आपके प्रकाशक की नीतियों के आधार पर, यह इस बारे में सलाह देता है कि क्या प्रतिबंध आवश्यक हो सकता है और/या आपको कौन सी फाइलें अपलोड करने की अनुमति है। यदि आपके कोई प्रश्न हैं, तो कृपया पाद लेख में फ़ीडबैक फ़ॉर्म के माध्यम से अपने साइट व्यवस्थापक से संपर्क करें।", 
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "एक नया नाम प्रकार सहेजें",
 
-  "submission.sections.sherpa.publisher.policy.embargo": "प्रतिबंध", 
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "क्या आप \"{{ value }}\" को इस व्यक्ति के लिए एक नाम प्रकार के रूप में सहेजना चाहते हैं ताकि आप और अन्य इसे भविष्य में प्रस्तुतीकरण के लिए पुन: उपयोग कर सकें? यदि आप नहीं करते हैं तो भी आप इस प्रस्तुतीकरण के लिए इसका उपयोग कर सकते हैं।",
 
-  "submission.sections.sherpa.publisher.policy.license": "अनुज्ञाप‍त्र", 
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "इस प्रस्तुति के लिए ही प्रयोग करें",
 
-  "submission.sections.sherpa.publisher.policy.location": "स्थान", 
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "सभी को अचिन्हिंत करें",
 
-  "submission.sections.sherpa.publisher.policy.more.information": "अधिक जानकारी के लिए, कृपया निम्नलिखित लिंक देखें:", 
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "पृष्ठ का चयन रद्द करें",
 
-  "submission.sections.sherpa.publisher.policy.noembargo": "कोई प्रतिबंध नहीं", 
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "लोड हो रहा है...",
 
-  "submission.sections.sherpa.publisher.policy.nolocation": "कोई भी नहीं", 
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "खोज क्वेरी",
 
-  "submission.sections.sherpa.publisher.policy.openaccess": "इस पत्रिका की नीति द्वारा अनुमत ओपन एक्सेस पाथवे लेख संस्करण द्वारा नीचे सूचीबद्ध हैं। अधिक जानकारी के लिए पथ पर क्लिक करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.search": "जाओ",
 
-  "submission.sections.sherpa.publisher.policy.prerequisites": "पूर्वापेक्षाएँ", 
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "खोज...",
 
-  "submission.sections.sherpa.publisher.policy.refresh": "ताज़ा करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "सबका चयन करें",
 
-  "submission.sections.sherpa.publisher.policy.version": "संस्करण", 
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "पृष्ठ का चयन करें",
 
-  "submission.sections.sherpa.record.information": "दस्तावेज की जानकारी", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
 
-  "submission.sections.sherpa.record.information.date.created": "बनाने की तिथि", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "({{ count }}) स्थानीय डेटा फ़ाइलें",
 
-  "submission.sections.sherpa.record.information.date.modified": "अंतिम बार संशोधित", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "({{ count }}) स्थानीय डेटा पैकेज",
 
-  "submission.sections.sherpa.record.information.id": "पहचान", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "({{ count }}) स्थानीय लेखक",
 
-  "submission.sections.sherpa.record.information.uri": "यूआरआई (URI)", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "संगठनात्मक इकाइयों के लिए खोजें",
 
-  "submission.sections.status.errors.aria": "इसमें त्रुटियां हैं", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "परियोजना के निधिदाता",
 
-  "submission.sections.status.errors.title": "त्रुटियाँ", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "निधिदाता संस्थाओ के लिए खोजें",
 
-  "submission.sections.status.info.aria": "अतिरिक्त जानकारी", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "अनुदान की खोज करें ",
 
-  "submission.sections.status.info.title": "अतिरिक्त जानकारी", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "({{ count }}) स्थानीय पत्रिका प्रकाशन",
 
-  "submission.sections.status.valid.aria": "यह सही है", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "({{ count }}) स्थानीय पत्रिकाएं",
 
-  "submission.sections.status.valid.title": "वैध", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "({{ count }}) स्थानीय पत्रिका खंड",
 
-  "submission.sections.status.warnings.aria": "चेतावनियाँ हैं", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "परियोजनाएं",
 
-  "submission.sections.status.warnings.title": "चेतावनी", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "({{ count }}) स्थानीय पत्रिकाएं",
 
-  "submission.sections.submit.progressbar.accessCondition": "आइटम पहुंच की शर्तें", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "({{ count }}) स्थानीय पत्रिका मुद्दे",
 
-  "submission.sections.submit.progressbar.CClicense": "क्रिएटिव कामन्स लाइसेंस", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "({{ count }}) स्थानीय पत्रिका खंड",
 
-  "submission.sections.submit.progressbar.describe.recycle": "पुनर्चक्रण", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "({{ count }}) एलसी नाम",
 
-  "submission.sections.submit.progressbar.describe.stepcustom": "वर्णन करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "OpenAIRE API का वित्तपोषण",
 
-  "submission.sections.submit.progressbar.describe.stepone": "वर्णन करना", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
 
-  "submission.sections.submit.progressbar.describe.steptwo": "वर्णन करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "({{ count }}) स्थानीय संगठनात्मक इकाइयाँ ",
 
-  "submission.sections.submit.progressbar.detect-duplicate": "संभावित दोहराव", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "({{ count }}) स्थानीय लेखक",
 
-  "submission.sections.submit.progressbar.license": "जमा करने के लिए अनुज्ञापत्र ", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "({{ count }}) स्थानीय परियोजनाएं",
 
-  "submission.sections.submit.progressbar.sherpaPolicies": "प्रकाशक खुली पहुँच नीति की जानकारी", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "({{ count }}) स्थानीय प्रकाशन",
 
-  "submission.sections.submit.progressbar.sherpapolicy": "शेरपा नीतियां", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "({{ count }}) पबमेड (Pubmed)",
 
-  "submission.sections.submit.progressbar.upload": "फाइलें अपलोड करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "({{ count }}) शेरपा पत्रिका",
 
-  "submission.sections.toggle.aria.close": "{{sectionHeader}} सेक्शन को छोटा करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "({{ count }}) शेरपा प्रकाशक",
 
-  "submission.sections.toggle.aria.open": "{{sectionHeader}} सेक्शन को विस्तृत करें", 
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "ड्रॉपडाउन टॉगल करें",
 
-  "submission.sections.toggle.close": "खंड बंद करें", 
+  "submission.sections.describe.relationship-lookup.selected": "चयनित {{ size }} आइटम",
 
-  "submission.sections.toggle.open": "खुला खंड", 
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "आपका चयन वर्तमान में खाली है।",
 
-  "submission.sections.upload.delete.confirm.cancel": "रद्द करें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "खोज...",
 
-  "submission.sections.upload.delete.confirm.info": "यह कार्रवाई पूर्ववत नहीं की जा सकती। क्या आपको यकीन है?", 
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "समायोजन",
 
-  "submission.sections.upload.delete.confirm.submit": "हां मुझे यकीन है", 
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "वर्तमान चयन ({{ count }})",
 
-  "submission.sections.upload.delete.confirm.title": "बिटस्ट्रीम हटाएं", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "खोज के परिणाम",
 
-  "submission.sections.upload.delete.submit": "हटाएं", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "खोज के परिणाम",
 
-  "submission.sections.upload.download.title": "बिटस्ट्रीम डाउनलोड करें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "खोज के परिणाम",
 
-  "submission.sections.upload.drop-message": "आइटम के साथ संलग्न करने के लिए फ़ाइलें छोड़ें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "चयनित डेटा फ़ाइलें",
 
-  "submission.sections.upload.edit.title": "बिटस्ट्रीम संपादित करें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "चयनित डेटा पैकेज",
 
-  "submission.sections.upload.form.access-condition-hint": "आइटम जमा होने के बाद बिटस्ट्रीम पर लागू करने के लिए एक एक्सेस शर्त का चयन करें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "खोज के परिणाम",
 
-  "submission.sections.upload.form.access-condition-label": "पहुँच स्थिति प्रकार", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "चयनित लेखक",
 
-  "submission.sections.upload.form.date-required": "तिथि आवश्यक है।", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "चयनित संगठनात्मक इकाई",
 
-  "submission.sections.upload.form.date-required-from": "अभिगमन आरम्भ तिथि आवश्यक है।", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "चयनित फंडिंग एजेंसी",
 
-  "submission.sections.upload.form.date-required-until": "तिथि तक प्रवेश प्रदान करना आवश्यक है।", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "चयनित अनुदान",
 
-  "submission.sections.upload.form.from-hint": "उस तिथि का चयन करें जिससे संबंधित पहुंच शर्त लागू करि जाएगी", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "चयनित अंक",
 
-  "submission.sections.upload.form.from-label": "से पहुंच प्रदान करें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "चयनित पत्रिकाएं",
 
-  "submission.sections.upload.form.from-placeholder": "से", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "चयनित पत्रिका खंड",
 
-  "submission.sections.upload.form.group-label": "समूह", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "परियोजना",
 
-  "submission.sections.upload.form.group-required": "समूह की आवश्यकता है।", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "चयनित पत्रिकाएं",
 
-  "submission.sections.upload.form.until-hint": "उस तिथि का चयन करें जब तक संबंधित पहुंच शर्त लागू नहीं हो जाती", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "चयनित अंक",
 
-  "submission.sections.upload.form.until-label": "अभिगमन अंत तिथि ", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "चयनित पत्रिका खंड",
 
-  "submission.sections.upload.form.until-placeholder": "तक", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "खोज के परिणाम",
 
-  "submission.sections.upload.header.policy.default.nolist": "{{CollectionName}} संग्रह में अपलोड की गई फ़ाइलें निम्न समूह (समूहों) के अनुसार पहुंच योग्य होंगी:", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "OpenAIRE API का वित्तपोषण",
 
-  "submission.sections.upload.header.policy.default.withlist": "कृपया ध्यान दें कि {{collectionName}} संग्रह में अपलोड की गई फ़ाइलें निम्न समूह (समूहों) के साथ एकल फ़ाइल के लिए स्पष्ट रूप से तय की गई फ़ाइलों के अतिरिक्त पहुंच योग्य होंगी:", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "खोज के परिणाम",
 
-  "submission.sections.upload.info": "यहां आपको आइटम में वर्तमान में सभी फाइलें मिलेंगी। आप फ़ाइल मेटाडेटा और एक्सेस शर्तों को अपडेट कर सकते हैं या <strong>अतिरिक्त फ़ाइलें अपलोड कर सकते हैं बस उन्हें पृष्ठ में हर जगह खींच कर छोड़ सकते हैं</strong>", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "खोज के परिणाम",
 
-  "submission.sections.upload.no-entry": "नहीं", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "चयनित संगठनात्मक इकाइयाँ",
 
-  "submission.sections.upload.no-file-uploaded": "अभी तक कोई फ़ाइल अपलोड नहीं हुई है|", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "चयनित लेखक",
 
-  "submission.sections.upload.save-metadata": "मेटाडेटा सहेजें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "चयनित परियोजनाएं",
 
-  "submission.sections.upload.undo": "रद्द करें", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "चयनित प्रकाशन",
 
-  "submission.sections.upload.upload-failed": "अपलोड विफल", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "खोज के परिणाम",
 
-  "submission.sections.upload.upload-successful": "अपलोड सफल", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "खोज के परिणाम",
 
-  "submission.submit.breadcrumbs": "नया प्रस्तुतीकरण", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "खोज के परिणाम",
 
-  "submission.submit.title": "नया प्रस्तुतीकरण", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "खोज के परिणाम",
 
-  "submission.workflow.generic.delete": "हटाएं", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "खोज के परिणाम",
 
-  "submission.workflow.generic.delete-help": "यदि आप इस आइटम को त्यागना चाहते हैं, तो \"हटाएं\" चुनें। फिर आपको इसकी पुष्टि करने के लिए कहा जाएगा।", 
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "खोज के परिणाम",
 
-  "submission.workflow.generic.edit": "संपादित करें", 
+  "submission.sections.describe.relationship-lookup.title.DataFile": "डेटा फ़ाइलें",
 
-  "submission.workflow.generic.edit-help": "आइटम का मेटाडेटा बदलने के लिए इस विकल्प का चयन करें।", 
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "डेटा पैकेज",
 
-  "submission.workflow.generic.view": "देखें", 
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "निधिकरण संस्था",
 
-  "submission.workflow.generic.view-help": "आइटम का मेटाडेटा देखने के लिए इस विकल्प का चयन करें।", 
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "लेखक",
 
-  "submission.workflow.tasks.claimed.approve": "स्वीकृत करें", 
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "जनक संगठनात्मक इकाई",
 
-  "submission.workflow.tasks.claimed.approve_help": "यदि आपने आइटम की समीक्षा की है और यह संग्रह में शामिल करने के लिए उपयुक्त है, तो \"स्वीकृत करें\" चुनें।", 
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "परियोजना के निधिदाता",
 
-  "submission.workflow.tasks.claimed.edit": "संपादित करें", 
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "निधिकरण संस्था",
 
-  "submission.workflow.tasks.claimed.edit_help": "आइटम का मेटाडेटा बदलने के लिए इस विकल्प का चयन करें।", 
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "निधिकरण",
 
-  "submission.workflow.tasks.claimed.reject_help": "यदि आपने आइटम की समीक्षा की है और पाया है कि यह संग्रह में शामिल करने के लिए उपयुक्त <strong>नहीं</strong> है,  तो \"अस्वीकार करें\" चुनें। फिर आपको एक संदेश दर्ज करने के लिए कहा जाएगा जो यह दर्शाता है कि आइटम अनुपयुक्त क्यों है, और क्या जमाकर्ता को कुछ बदलना चाहिए और फिर से सबमिट करना चाहिए।", 
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "पत्रिका के मुद्दे",
 
-  "submission.workflow.tasks.claimed.reject.reason.info": "कृपया नीचे दिए गए बॉक्स में प्रस्तुति को अस्वीकार करने का अपना कारण दर्ज करें, यह इंगित करते हुए कि क्या प्रस्तुतकर्ता किसी समस्या को ठीक कर सकता है और फिर से प्रस्तुत कर सकता है।  ", 
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "पत्रिकाएं",
 
-  "submission.workflow.tasks.claimed.reject.reason.placeholder": "अस्वीकार करने का कारण बताएं", 
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "पत्रिका खंड",
 
-  "submission.workflow.tasks.claimed.reject.reason.submit": "आइटम अस्वीकार करें", 
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "परियोजनाएं",
 
-  "submission.workflow.tasks.claimed.reject.reason.title": "कारण", 
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "पत्रिका प्रकाशन",
 
-  "submission.workflow.tasks.claimed.reject.submit": "अस्वीकार करें", 
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "पत्रिका खंड",
 
-  "submission.workflow.tasks.claimed.return": "पूल में वापस करें ", 
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "संगठनात्मक इकाइयाँ",
 
-  "submission.workflow.tasks.claimed.return_help": "कार्य को पूल में लौटाएं ताकि कोई अन्य उपयोगकर्ता कार्य कर सके।", 
+  "submission.sections.describe.relationship-lookup.title.Person": "लेखक",
 
-  "submission.workflow.tasks.generic.error": "ऑपरेशन के दौरान हुई गड़बड़ी...", 
+  "submission.sections.describe.relationship-lookup.title.Project": "परियोजनाएं",
 
-  "submission.workflow.tasks.generic.processing": "संसाधित किया जा रहा है...", 
+  "submission.sections.describe.relationship-lookup.title.Publication": "प्रकाशन",
 
-  "submission.workflow.tasks.generic.submitter": "प्रस्तुतकर्ता", 
+  "submission.sections.general.add-more": "और जोड़ें",
 
-  "submission.workflow.tasks.generic.success": "संचालन सफल रहा", 
+  "submission.sections.general.cannot_deposit": "फ़ॉर्म में त्रुटियों के कारण जमा पूरा नहीं किया जा सकता है।<br>कृपया जमा को पूरा करने के लिए सभी आवश्यक फ़ील्ड भरें।",
 
-  "submission.workflow.tasks.pool.claim": "दावा करें", 
+  "submission.sections.general.collection": "संग्रह",
 
-  "submission.workflow.tasks.pool.claim_help": "यह कार्य स्वयं को सौंपें।", 
+  "submission.sections.general.deposit_error_notice": "आइटम प्रस्तुत करते समय एक समस्या हुई थी, कृपया बाद में फिर से प्रयास करें।",
 
-  "submission.workflow.tasks.pool.hide-detail": "विवरण छुपाएं", 
+  "submission.sections.general.deposit_success_notice": "प्रस्तुति को सफलतापूर्वक जमा किया गया।",
 
-  "submission.workflow.tasks.pool.show-detail": "विवरण दिखाएँ", 
+  "submission.sections.general.discard_error_notice": "आइटम को हटाते समय एक समस्या हुई थी, कृपया बाद में फिर से प्रयास करें।",
 
-  "submission.workspace.generic.view": "देखें", 
+  "submission.sections.general.discard_success_notice": "प्रस्तुति सफलतापूर्वक रद्द करी गयी। ",
 
-  "submission.workspace.generic.view-help": "आइटम का मेटाडेटा देखने के लिए इस विकल्प का चयन करें।", 
+  "submission.sections.general.metadata-extracted": "नया मेटाडेटा निकाला गया है और <strong>{{sectionId}}</strong> अनुभाग में जोड़ा गया है।",
 
-  "thumbnail.default.alt": "थंबनेल चित्र", 
+  "submission.sections.general.metadata-extracted-new-section": "सबमिशन में नया <strong>{{sectionId}}</strong> अनुभाग जोड़ा गया है।",
 
-  "thumbnail.default.placeholder": "कोई थंबनेल उपलब्ध नहीं", 
+  "submission.sections.general.no-collection": "कोई संग्रह नहीं मिला",
 
-  "thumbnail.orgunit.alt": "संगठन इकाई चिन्ह", 
+  "submission.sections.general.no-sections": "कोई विकल्प उपलब्ध नहीं",
 
-  "thumbnail.orgunit.placeholder": "संगठन इकाई स्थानधारक छवि", 
+  "submission.sections.general.save_error_notice": "आइटम सहेजते समय एक समस्या हुई थी, कृपया बाद में पुन: प्रयास करें।",
 
-  "thumbnail.person.alt": "प्रोफ़ाइल चित्र", 
+  "submission.sections.general.save_success_notice": "प्रस्तुतीकरण सफलतापूर्वक सहेजा गया।",
 
-  "thumbnail.person.placeholder": "कोई प्रोफ़ाइल चित्र उपलब्ध नहीं है", 
+  "submission.sections.general.search-collection": "संग्रह के लिए खोजें",
 
-  "thumbnail.project.alt": "परियोजना चिन्ह ", 
+  "submission.sections.general.sections_not_valid": "अपूर्ण खंड हैं।",
 
-  "thumbnail.project.placeholder": "परियोजना स्थानधारक छवि", 
+  "submission.sections.license.granted-label": "मैं उपरोक्त लाइसेंस की पुष्टि करता हूं",
 
-  "title": "डीस्पेस", 
+  "submission.sections.license.notgranted": "आपको अनुज्ञापत्र स्वीकार करना होगा",
 
-  "uploader.browse": "ब्राउज़ करें", 
+  "submission.sections.license.required": "आपको लाइसेंस स्वीकार करना होगा",
 
-  "uploader.delete.btn-title": "हटाएं", 
+  "submission.sections.sherpa-policy.title-empty": "प्रकाशक नीति की कोई जानकारी उपलब्ध नहीं है। अगर आपके काम में संबधित आईएसएसएन है, तो कृपया संबंधित प्रकाशक की खुली पहुंच (ओपन एक्सेस) नीतियों को देखने के लिए इसे ऊपर दर्ज करें।",
 
-  "uploader.drag-message": "अपनी फ़ाइलों को यहाँ खींचें और छोड़ें", 
+  "submission.sections.sherpa.error.message": "शेरपा जानकारी प्राप्त करने में त्रुटि हुई थी",
 
-  "uploader.or": ", अथवा", 
+  "submission.sections.sherpa.publication.information": "प्रकाशन की जानकारी",
 
-  "uploader.processing": "प्रसंस्करण", 
+  "submission.sections.sherpa.publication.information.issns": "ISSNs",
 
-  "uploader.queue-length": "कतार की लंबाई", 
+  "submission.sections.sherpa.publication.information.publishers": "प्रकाशक",
 
-  "virtual-metadata.delete-item.info": "उन प्रकारों का चयन करें जिनके लिए आप वर्चुअल मेटाडेटा को वास्तविक मेटाडेटा के रूप में सहेजना चाहते हैं", 
+  "submission.sections.sherpa.publication.information.romeoPub": "रोमियो पब",
 
-  "virtual-metadata.delete-item.modal-head": "इस संबंध का आभासी मेटाडेटा", 
+  "submission.sections.sherpa.publication.information.title": "शीर्षक",
 
-  "virtual-metadata.delete-relationship.modal-head": "वे आइटम चुनें जिनके लिए आप आभासी मेटाडेटा को वास्तविक मेटाडेटा के रूप में सहेजना चाहते हैं", 
+  "submission.sections.sherpa.publication.information.url": "यूआरएल (URL)",
 
-  "vocabulary-treeview.header": "श्रेणीबद्ध वृक्ष दृश्य", 
+  "submission.sections.sherpa.publication.information.zetoPub": "ज़ेटो पब (Zeto Pub)",
 
-  "vocabulary-treeview.load-more": "और लोड करें", 
+  "submission.sections.sherpa.publisher.policy": "प्रकाशक नीति",
 
-  "vocabulary-treeview.search.form.reset": "रीसेट", 
+  "submission.sections.sherpa.publisher.policy.conditions": "स्थितियाँ",
 
-  "vocabulary-treeview.search.form.search": "खोज", 
+  "submission.sections.sherpa.publisher.policy.description": "नीचे दी गई जानकारी शेरपा रोमियो के माध्यम से मिली। आपके प्रकाशक की नीतियों के आधार पर, यह इस बारे में सलाह देता है कि क्या प्रतिबंध आवश्यक हो सकता है और/या आपको कौन सी फाइलें अपलोड करने की अनुमति है। यदि आपके कोई प्रश्न हैं, तो कृपया पाद लेख में फ़ीडबैक फ़ॉर्म के माध्यम से अपने साइट व्यवस्थापक से संपर्क करें।",
 
-  "vocabulary-treeview.search.no-result": "दिखाने के लिए कोई आइटम नहीं थे", 
+  "submission.sections.sherpa.publisher.policy.embargo": "प्रतिबंध",
 
-  "vocabulary-treeview.tree.description.nsi": "नॉर्वेजियन साइंस इंडेक्स", 
+  "submission.sections.sherpa.publisher.policy.license": "अनुज्ञाप‍त्र",
 
-  "vocabulary-treeview.tree.description.srsc": "अनुसंधान विषय श्रेणियाँ", 
+  "submission.sections.sherpa.publisher.policy.location": "स्थान",
 
-  "workflow-item.delete.button.cancel": "रद्द करें", 
+  "submission.sections.sherpa.publisher.policy.more.information": "अधिक जानकारी के लिए, कृपया निम्नलिखित लिंक देखें:",
 
-  "workflow-item.delete.button.confirm": "हटाएं", 
+  "submission.sections.sherpa.publisher.policy.noembargo": "कोई प्रतिबंध नहीं",
 
-  "workflow-item.delete.header": "कार्यप्रवाह आइटम हटाएं", 
+  "submission.sections.sherpa.publisher.policy.nolocation": "कोई भी नहीं",
 
-  "workflow-item.delete.notification.error.content": "कार्यप्रवाह आइटम हटाया नहीं जा सका", 
+  "submission.sections.sherpa.publisher.policy.openaccess": "इस पत्रिका की नीति द्वारा अनुमत ओपन एक्सेस पाथवे लेख संस्करण द्वारा नीचे सूचीबद्ध हैं। अधिक जानकारी के लिए पथ पर क्लिक करें",
 
-  "workflow-item.delete.notification.error.title": "कुछ गलत हो गया", 
+  "submission.sections.sherpa.publisher.policy.prerequisites": "पूर्वापेक्षाएँ",
 
-  "workflow-item.delete.notification.success.content": "यह कार्यप्रवाह आइटम सफलतापूर्वक हटा दिया गया था", 
+  "submission.sections.sherpa.publisher.policy.refresh": "ताज़ा करें",
 
-  "workflow-item.delete.notification.success.title": "हटाए गए", 
+  "submission.sections.sherpa.publisher.policy.version": "संस्करण",
 
-  "workflow-item.delete.title": "कार्यप्रवाह आइटम हटाएं", 
+  "submission.sections.sherpa.record.information": "दस्तावेज की जानकारी",
 
-  "workflow-item.edit.breadcrumbs": "कार्यप्रवाह वस्तु संपादित करें", 
+  "submission.sections.sherpa.record.information.date.created": "बनाने की तिथि",
 
-  "workflow-item.edit.title": "कार्यप्रवाह आइटम संपादित करें", 
+  "submission.sections.sherpa.record.information.date.modified": "अंतिम बार संशोधित",
 
-  "workflow-item.send-back.button.cancel": "रद्द करें", 
+  "submission.sections.sherpa.record.information.id": "पहचान",
 
-  "workflow-item.send-back.button.confirm": "वापस भेजे", 
+  "submission.sections.sherpa.record.information.uri": "यूआरआई (URI)",
 
-  "workflow-item.send-back.header": "कार्यप्रवाह आइटम को वापस प्रस्तुतकर्ता को भेजें", 
+  "submission.sections.status.errors.aria": "इसमें त्रुटियां हैं",
 
-  "workflow-item.send-back.notification.error.content": "कार्यप्रवाह आइटम को सबमिटर को वापस नहीं भेजा जा सका", 
+  "submission.sections.status.errors.title": "त्रुटियाँ",
 
-  "workflow-item.send-back.notification.error.title": "कुछ गलत हो गया", 
+  "submission.sections.status.info.aria": "अतिरिक्त जानकारी",
 
-  "workflow-item.send-back.notification.success.content": "यह कार्यप्रवाह आइटम सफलतापूर्वक सबमिट करने वाले को वापस भेज दिया गया था", 
+  "submission.sections.status.info.title": "अतिरिक्त जानकारी",
 
-  "workflow-item.send-back.notification.success.title": "प्रस्तुतकर्ता को वापस भेजा गया", 
+  "submission.sections.status.valid.aria": "यह सही है",
 
-  "workflow-item.send-back.title": "कार्यप्रवाह आइटम को वापस प्रस्तुतिकर्ता को भेजें", 
+  "submission.sections.status.valid.title": "वैध",
 
-  "workflow-item.view.breadcrumbs": "कार्यप्रवाह दृश्य", 
+  "submission.sections.status.warnings.aria": "चेतावनियाँ हैं",
 
-  "workflow.search.results.head": "कार्यप्रवाह कार्य", 
+  "submission.sections.status.warnings.title": "चेतावनी",
 
-  "workflowAdmin.search.results.head": "कार्यप्रवाह व्यवस्थापित करें", 
+  "submission.sections.submit.progressbar.accessCondition": "आइटम पहुंच की शर्तें",
 
-  "workspace-item.view.breadcrumbs": "कार्यक्षेत्र दृश्य", 
+  "submission.sections.submit.progressbar.CClicense": "क्रिएटिव कामन्स लाइसेंस",
 
-  "workspace-item.view.title": "कार्यक्षेत्र दृश्य", 
+  "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.license": "जमा करने के लिए अनुज्ञापत्र ",
+
+  "submission.sections.submit.progressbar.sherpaPolicies": "प्रकाशक खुली पहुँच नीति की जानकारी",
+
+  "submission.sections.submit.progressbar.sherpapolicy": "शेरपा नीतियां",
+
+  "submission.sections.submit.progressbar.upload": "फाइलें अपलोड करें",
+
+  "submission.sections.toggle.aria.close": "{{sectionHeader}} सेक्शन को छोटा करें",
+
+  "submission.sections.toggle.aria.open": "{{sectionHeader}} सेक्शन को विस्तृत करें",
+
+  "submission.sections.toggle.close": "खंड बंद करें",
+
+  "submission.sections.toggle.open": "खुला खंड",
+
+  "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-hint": "आइटम जमा होने के बाद बिटस्ट्रीम पर लागू करने के लिए एक एक्सेस शर्त का चयन करें",
+
+  "submission.sections.upload.form.access-condition-label": "पहुँच स्थिति प्रकार",
+
+  "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-hint": "उस तिथि का चयन करें जिससे संबंधित पहुंच शर्त लागू करि जाएगी",
+
+  "submission.sections.upload.form.from-label": "से पहुंच प्रदान करें",
+
+  "submission.sections.upload.form.from-placeholder": "से",
+
+  "submission.sections.upload.form.group-label": "समूह",
+
+  "submission.sections.upload.form.group-required": "समूह की आवश्यकता है।",
+
+  "submission.sections.upload.form.until-hint": "उस तिथि का चयन करें जब तक संबंधित पहुंच शर्त लागू नहीं हो जाती",
+
+  "submission.sections.upload.form.until-label": "अभिगमन अंत तिथि ",
+
+  "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.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.tasks.claimed.approve": "स्वीकृत करें",
+
+  "submission.workflow.tasks.claimed.approve_help": "यदि आपने आइटम की समीक्षा की है और यह संग्रह में शामिल करने के लिए उपयुक्त है, तो \"स्वीकृत करें\" चुनें।",
+
+  "submission.workflow.tasks.claimed.edit": "संपादित करें",
+
+  "submission.workflow.tasks.claimed.edit_help": "आइटम का मेटाडेटा बदलने के लिए इस विकल्प का चयन करें।",
+
+  "submission.workflow.tasks.claimed.reject_help": "यदि आपने आइटम की समीक्षा की है और पाया है कि यह संग्रह में शामिल करने के लिए उपयुक्त <strong>नहीं</strong> है,  तो \"अस्वीकार करें\" चुनें। फिर आपको एक संदेश दर्ज करने के लिए कहा जाएगा जो यह दर्शाता है कि आइटम अनुपयुक्त क्यों है, और क्या जमाकर्ता को कुछ बदलना चाहिए और फिर से सबमिट करना चाहिए।",
+
+  "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.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": "आइटम का मेटाडेटा देखने के लिए इस विकल्प का चयन करें।",
+
+  "thumbnail.default.alt": "थंबनेल चित्र",
+
+  "thumbnail.default.placeholder": "कोई थंबनेल उपलब्ध नहीं",
+
+  "thumbnail.orgunit.alt": "संगठन इकाई चिन्ह",
+
+  "thumbnail.orgunit.placeholder": "संगठन इकाई स्थानधारक छवि",
+
+  "thumbnail.person.alt": "प्रोफ़ाइल चित्र",
+
+  "thumbnail.person.placeholder": "कोई प्रोफ़ाइल चित्र उपलब्ध नहीं है",
+
+  "thumbnail.project.alt": "परियोजना चिन्ह ",
+
+  "thumbnail.project.placeholder": "परियोजना स्थानधारक छवि",
+
+  "title": "डीस्पेस",
+
+  "uploader.browse": "ब्राउज़ करें",
+
+  "uploader.delete.btn-title": "हटाएं",
+
+  "uploader.drag-message": "अपनी फ़ाइलों को यहाँ खींचें और छोड़ें",
+
+  "uploader.or": ", अथवा",
+
+  "uploader.processing": "प्रसंस्करण",
+
+  "uploader.queue-length": "कतार की लंबाई",
+
+  "virtual-metadata.delete-item.info": "उन प्रकारों का चयन करें जिनके लिए आप वर्चुअल मेटाडेटा को वास्तविक मेटाडेटा के रूप में सहेजना चाहते हैं",
+
+  "virtual-metadata.delete-item.modal-head": "इस संबंध का आभासी मेटाडेटा",
+
+  "virtual-metadata.delete-relationship.modal-head": "वे आइटम चुनें जिनके लिए आप आभासी मेटाडेटा को वास्तविक मेटाडेटा के रूप में सहेजना चाहते हैं",
+
+  "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": "नॉर्वेजियन साइंस इंडेक्स",
+
+  "vocabulary-treeview.tree.description.srsc": "अनुसंधान विषय श्रेणियाँ",
+
+  "workflow-item.delete.button.cancel": "रद्द करें",
+
+  "workflow-item.delete.button.confirm": "हटाएं",
+
+  "workflow-item.delete.header": "कार्यप्रवाह आइटम हटाएं",
+
+  "workflow-item.delete.notification.error.content": "कार्यप्रवाह आइटम हटाया नहीं जा सका",
+
+  "workflow-item.delete.notification.error.title": "कुछ गलत हो गया",
+
+  "workflow-item.delete.notification.success.content": "यह कार्यप्रवाह आइटम सफलतापूर्वक हटा दिया गया था",
+
+  "workflow-item.delete.notification.success.title": "हटाए गए",
+
+  "workflow-item.delete.title": "कार्यप्रवाह आइटम हटाएं",
+
+  "workflow-item.edit.breadcrumbs": "कार्यप्रवाह वस्तु संपादित करें",
+
+  "workflow-item.edit.title": "कार्यप्रवाह आइटम संपादित करें",
+
+  "workflow-item.send-back.button.cancel": "रद्द करें",
+
+  "workflow-item.send-back.button.confirm": "वापस भेजे",
+
+  "workflow-item.send-back.header": "कार्यप्रवाह आइटम को वापस प्रस्तुतकर्ता को भेजें",
+
+  "workflow-item.send-back.notification.error.content": "कार्यप्रवाह आइटम को सबमिटर को वापस नहीं भेजा जा सका",
+
+  "workflow-item.send-back.notification.error.title": "कुछ गलत हो गया",
+
+  "workflow-item.send-back.notification.success.content": "यह कार्यप्रवाह आइटम सफलतापूर्वक सबमिट करने वाले को वापस भेज दिया गया था",
+
+  "workflow-item.send-back.notification.success.title": "प्रस्तुतकर्ता को वापस भेजा गया",
+
+  "workflow-item.send-back.title": "कार्यप्रवाह आइटम को वापस प्रस्तुतिकर्ता को भेजें",
+
+  "workflow-item.view.breadcrumbs": "कार्यप्रवाह दृश्य",
+
+  "workflow.search.results.head": "कार्यप्रवाह कार्य",
+
+  "workflowAdmin.search.results.head": "कार्यप्रवाह व्यवस्थापित करें",
+
+  "workspace-item.view.breadcrumbs": "कार्यक्षेत्र दृश्य",
+
+  "workspace-item.view.title": "कार्यक्षेत्र दृश्य",
+
+  "workspace.search.results.head": "आपकी प्रस्तुतियाँ",
 
-  "workspace.search.results.head": "आपकी प्रस्तुतियाँ"
-  
 }
diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5
index 62f7fa569a..e1ae33e85b 100644
--- a/src/assets/i18n/hu.json5
+++ b/src/assets/i18n/hu.json5
@@ -1,5149 +1,9137 @@
 {
-  
+
   // "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": "Nincs jogosultsága az oldal eléréséhez. Az alábbi gombbal vissza tud lépni a főoldalra.",
-  
+
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Vissza a főoldalra",
-  
+
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "jogosulatlan",
-  
-  
-  
+
+
+
   // "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": "Nincs jogosultsága az oldal eléréséhez. Az alábbi gombbal vissza tud lépni a főoldalra.",
-  
+
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Vissza a főoldalra",
-  
+
   // "403.forbidden": "forbidden",
   "403.forbidden": "elérhetetlen",
-  
-  
-  
-  // "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. ",
+
+  // "500.page-internal-server-error": "Service Unavailable",
   "404.help": "A keresett oldal nem található. Az oldalt elköltöztették, vagy letörölték. Az alsó gombbal visszakerülhet a honlapra ",
-  
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "404.help": "A szerver ideiglenesen nem tudja kiszolgálni a kérését, karbantartás vagy más technikai okok miatt. Próbálja meg később.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "404.help": "Vissza a főoldalra",
+
+
+  // "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 Source message changed - Revise the translation
+  "404.help": "A keresett oldal nem található. Az oldalt elköltöztették, vagy letörölték. Az alsó gombbal visszakerülhet a honlapra ",
+
   // "404.link.home-page": "Take me to the home page",
-  "404.link.home-page": "Vissza a honlapra",
-  
+  "404.link.home-page": "Vissza a főoldalra",
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "oldal nem található",
-  
+
+  // "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",
+  "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",
+
+  // "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": "Metadata only",
+
+  // "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": "Restricted",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Unknown",
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Karbantartási feladatok",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   "admin.curation-tasks.title": "Karbantartási feladatok",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   "admin.curation-tasks.header": "Karbantartási feladatok",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "Formátum regiszter",
-  
+
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.create.breadcrumbs": "Bitfolyam formátum",
-  
+
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
   "admin.registries.bitstream-formats.create.failure.content": "Bitfolyam létrehozása közben hiba történt",
-  
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Nem sikerült",
-  
+
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
   "admin.registries.bitstream-formats.create.head": "Bitfolyam formátum létrehozása",
-  
+
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
   "admin.registries.bitstream-formats.create.new": "Bitfolyam formátum hozzáadása.",
-  
+
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "Új bitfolyam formátum sikeresen létrehozva.",
-  
+
   // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "Sikerült",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "A {{ amount }} formátum(ok) törlése nem sikerült",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "Nem sikerült",
-  
+
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "A {{ amount }} formátum(ok) sikeresen törölve",
-  
+
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Sikerült",
-  
+
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "Ez a bitfolyam formátum lista ismert formátumokról és azok támogatásáról nyújt információt.",
-  
+
   // "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": "Bitstream formátum",
+
   // "admin.registries.bitstream-formats.edit.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
-  
+
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.description.label": "Leírás",
-  
+
   // "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": "A kiterjesztések olyan állomány kiterjesztések, amelyek arra használhatók, hogy automatikusan azonosítsák a feltöltött állomány formátumát. Minden formátumhoz megadhat több kiterjesztést.",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "Állomány kiterjesztés",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Írja be az állomány kiterjesztését a pont nélkül",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.content": "Bitfolyam szerkesztése közben hiba történt.",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Nem sikerült",
-  
+
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
   "admin.registries.bitstream-formats.edit.head": "Bitfolyam formátum: {{ 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": "Belsőként megjelölt formátumokat a felhasználó nem láthat, ezek adminisztratív célokat szolgálnak.",
-  
+
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
   "admin.registries.bitstream-formats.edit.internal.label": "Belső",
-  
+
   // "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": "Az ehhez a formátumhoz társított MIME típus nem kell, hogy egyedi legyen.",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Típus",
-  
+
   // "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": "Egyedi név ennek a formátumnak, (pl. Microsoft Word XP vagy Microsoft Word 2000)",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Név",
-  
+
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
   "admin.registries.bitstream-formats.edit.success.content": "Bitfolyam formátum szerkesztése sikerült.",
-  
+
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Sikerült",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "Intézménye ilyen szintű támogatást biztosít ennek a formátumnak.",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Támogatási szint",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "Bitfolyam formátum leíró adatbázis",
-  
+
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Nincs látható bitfolyam formátum.",
-  
+
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Kiválasztottak törlése",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "Valamennyi kiválasztás megszüntetése",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "belső",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "MIME típus",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Név",
-  
-  // "admin.registries.bitstream-formats.table.return": "Return",
+  // "admin.registries.bitstream-formats.table.id" : "ID",
+  "admin.registries.bitstream-formats.table.id": "ID",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Vissza",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Ismert",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Támogatott",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Ismeretlen",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Támogatási szint",
-  
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitfolyam formátum leíró adatbázis",
-  
-  
-  
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Bitfolyam formátum leíró adatbázis",
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Metaadat leíró adatbázis",
-  
+
   // "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": "A metaadat leíró adatbázis tartalmazza a tárban fellelhető valamennyi metaadat mező listáját. Ezek a mezők több sémára oszthatók. Viszont a DSpace a minősített Dublin Core sémát kéri.",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "Metaadat séma létrehozása",
-  
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "Metaadat séma szerkesztése",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "Név",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "Névhely",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Metaadat leíró adatbázis",
-  
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Nincs elérhető metaadat séma.",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Kiválasztottak törlése",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "Azonosító",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Név",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Névhely",
-  
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace Angular :: Metaadat leíró adatbázis",
-  
-  
-  
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Metaadat leíró adatbázis",
+
+
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Metaadat séma",
-  
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Ez a metaadat séma a következőhöz \"{{namespace}}\".",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Séma metaadat mezők",
-  
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Nincs elérhető metaadat mező.",
-  
+
   // "admin.registries.schema.fields.table.delete": "Delete selected",
   "admin.registries.schema.fields.table.delete": "Kiválasztások törlése",
-  
+
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Mező",
-  
+  // "admin.registries.schema.fields.table.id" : "ID",
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Cél megjegyzés",
-  
+
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "Metaadat mező létrehozása",
-  
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
   "admin.registries.schema.form.edit": "metaadat mező szerkesztése",
-  
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Elem",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "Minősítő",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "Cél megjegyzés",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Metaadat Séma",
-  
+
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "Metaadat séma létrehozása sikerült \"{{prefix}}\"",
-  
+
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "A {{amount}} metaadat sémák törlése nem sikerült",
-  
+
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.success": "A {{amount}} metaadat sémák törlése sikerült",
-  
+
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Metaadat séma szerkesztése sikerült \"{{prefix}}\"",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Hiba",
-  
+
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.created": "Metaadat mező létrehozva\"{{field}}\"",
-  
+
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "A{{amount}} metaadat mezők törlése nem sikerült",
-  
+
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "A{{amount}} metaadat mezők törlése sikerült",
-  
+
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "metaadat mező szerkesztése sikerült\"{{field}}\"",
-  
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Sikerült",
-  
-  // "admin.registries.schema.return": "Return",
+
+  // "admin.registries.schema.return": "Back",
   "admin.registries.schema.return": "Vissza",
-  
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace Angular :: Metaadat Séma leíró adatbázis",
-  
-  
-  
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Metaadat Séma leíró adatbázis",
+
+
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "EPerson törlése",
-  
+
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
   "admin.access-control.epeople.actions.impersonate": "EPerson megszemélyesítése",
-  
+
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Jelszó visszaállítása",
-  
+
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "EPerson megszemélyesítésének befejezése",
-  
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "ESzemély",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "ESzemély",
+
   // "admin.access-control.epeople.head": "EPeople",
-  "admin.access-control.epeople.head": "EPeople",
-  
+  "admin.access-control.epeople.head": "ESzemély",
+
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Keresés",
-  
+
   // "admin.access-control.epeople.button.see-all": "Browse All",
   "admin.access-control.epeople.button.see-all": "Valamennyi böngészése",
-  
+
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metaadat",
-  
+
   // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
   "admin.access-control.epeople.search.scope.email": "E-mail (pontosan)",
-  
+
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Keresés",
-  
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Személy keresése...",
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
   "admin.access-control.epeople.button.add": "EPerson hozzáadása",
-  
+
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "Azonosító",
-  
+
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Név",
-  
+
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
   "admin.access-control.epeople.table.email": "E-mail (pontosan)",
-  
+
   // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "Szerkesztés",
-  
+
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "Szerkesztés \"{{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": "Nincs jogosultsága a csoport szerkesztéséhez",
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Törlés \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  "admin.access-control.epeople.no-items": "Nincs elérhető EPeople.",
-  
+  "admin.access-control.epeople.no-items": "Nincs elérhető ESzemély.",
+
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  "admin.access-control.epeople.form.create": "EPerson létrehozása",
-  
+  "admin.access-control.epeople.form.create": "ESzemély létrehozása",
+
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  // TODO Source message changed - Revise the translation
-  "admin.access-control.epeople.form.edit": "EPerson szerkesztése",
-  
+  "admin.access-control.epeople.form.edit": "ESzemély szerkesztése",
+
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "Keresztnév",
-  
+
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Családnév",
-  
+
   // "admin.access-control.epeople.form.email": "E-mail",
   "admin.access-control.epeople.form.email": "E-mail",
-  
+
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
   "admin.access-control.epeople.form.emailHint": "Érvényes e-mail cím kell, hogy legyen",
-  
+
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Bejelentkezhet",
-  
+
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Tanúsítvány szükséges",
-  
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Vissza",
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "EPerson \"{{name}} sikeresen létrehozva\"",
-  
+
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "EPerson \"{{name}}létrehozása nem sikerült\"",
-  
+
   // "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": "EPerson \"{{name}}\" létrehozása nem sikerült, email \"{{email}}\" már használatban van.",
-  
+
   // "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": "EPerson \"{{name}}\" szerkesztése nem sikerült, email \"{{email}}\" már használatban van.",
-  
+
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "EPerson \"{{name}}\" szerkesztése sikerült",
-  
+
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.failure": "EPerson \"{{name}}\" szerkesztése nem sikerült",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "Sikeresen törölve: EPerson \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "Nem sikerült törülni: EPerson \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Tagja a következő csoportoknak:",
-  
+
   // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "Azonosító",
-  
+
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Név",
-  
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Gyűjtemény/Közösség",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  "admin.access-control.epeople.form.memberOfNoGroups": "Ez azEPerson egyetlen csoportnak sem tagja",
-  
+  "admin.access-control.epeople.form.memberOfNoGroups": "Ez az ESzemély egyetlen csoportnak sem tagja",
+
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Hozzáadás csoportokhoz",
-  
+
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.failure": "EPerson: \"{{name}}\" törlése nem sikerült",
-  
+  "admin.access-control.epeople.notification.deleted.failure": "ESzemély: \"{{name}}\" törlése nem sikerült",
+
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "EPerson: \"{{name}}\" törlése sikerült",
-  
-  
-  
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace Angular :: Csoportok",
-  
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Csoport szerkesztése",
-  
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Új csoport",
-  
+  "admin.access-control.epeople.notification.deleted.success": "ESzemély: \"{{name}}\" törlése sikerült",
+
+
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Csoportok",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Csoportok",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Csoport szerkesztése",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Csoport szerkesztése",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Új csoport",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Új csoport",
+
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Csoportok",
-  
+
   // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "Csoport hozzáadása",
-  
+
   // "admin.access-control.groups.search.head": "Search groups",
   "admin.access-control.groups.search.head": "Csoportok keresése",
-  
+
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "valamennyi böngészése",
-  
+
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Keresés",
-  
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Csoport keresése...",
+
   // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "Azonosító",
-  
+
   // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "Név",
-  
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Gyűjtemény/Közösség",
+
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Tagok",
-  
+
   // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "Szerkesztés",
-  
+
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "Szerkesztés \"{{name}}\"",
-  
+
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.remove": "Törlés \"{{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": "Egyetlen csoport sem tartalmazza nevében, vagy UUID-ként ezt",
-  
+
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "\"{{name}}\" csoport törlése sikerült",
-  
+
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  // TODO Source message changed - Revise the translation
   "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" csoport törlése nem sikerült",
-  
+
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Ok: \"{{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": "Ez a csoport állandó, nem szerkeszthető vagy törölhető. Ugyanakor a csoporttagság szerkeszthető.",
-  
+
   // "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": "A csoport nem módosítható vagy törölhető, mert használva van egy szerepkörben vagy egy folyamatban a(z) \"{{name}}\" {{comcol}} helyen. Törölheti a <a href='{{comcolEditRolesRoute}}'>\"szerepkör hozzárendelése\"</a> fülön a szerkesztés oldalon: {{comcol}}. Ugyanakkor ezen az oldalon, szerkesztheti a csoporttagokat.",
-  
+
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Csoport létrehozása",
-  
+
   // "admin.access-control.groups.form.head.edit": "Edit group",
   "admin.access-control.groups.form.head.edit": "Csoport szerkesztése",
-  
+
   // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "Csoport neve",
-  
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Közösség vagy Gyűjtemény",
+
   // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "Leírás",
-  
+
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "\"{{name}}\" csoport létrehozása sikerült",
-  
+
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" csoport létrehozása nem sikerült",
-  
+
   // "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": "Nem sikerült csoport létrehozása a következő névvel: \"{{name}}\", győződjön meg róla, hogy a név nincs már használatban.",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "Nem sikerült szerkeszteni a csoportot \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "A(z) \"{{name}}\" név már foglalt!",
-  
+
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "Sikeresen szerkesztett csoport: \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Csoport törlése",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
   "admin.access-control.groups.form.delete-group.modal.header": "Csoport törlése: \"{{ dsoName }}\"",
-  
+
   // "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": "Biztos törli a csoportot: \"{{ dsoName }}\"",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "Mégsem",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "Törlés",
-  
+
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.success": "Csoport sikeresen törölve: \"{{ name }}\"",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.title": "Nem sikerült törölni a csoportot: \"{{ name }}\"",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "Ok: \"{{ cause }}\"",
-  
+
   // "admin.access-control.groups.form.members-list.head": "EPeople",
   "admin.access-control.groups.form.members-list.head": "EPeople",
-  
+
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
   "admin.access-control.groups.form.members-list.search.head": "EPeople hozzáadása",
-  
+
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.members-list.button.see-all": "Valamennyi böngészése",
-  
+
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Jelenlegi tagok",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
   "admin.access-control.groups.form.members-list.search.scope.metadata": "Metaadat",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
   "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (pontosan)",
-  
+
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Keresés",
-  
+
   // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "Azonosító",
-  
+
   // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "Név",
-  
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identitás",
+
+  // "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",
   "admin.access-control.groups.form.members-list.table.edit": "Törlés / Hozzáadás",
-  
+
   // "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": "A\"{{name}}\" nevű tag törlése",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.addMember": "A: \"{{name}}\" tag sikeresen hozzáadva",
-  
+
   // "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": "A: \"{{name}}\" tag hozzáadása nem sikerült",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.deleteMember": "A: \"{{name}}\" tag törlése sikerült",
-  
+
   // "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": "A: \"{{name}}\" tag törlése nem sikerült",
-  
+
   // "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": "Tag hozzáadása a következő névvel: \"{{name}}\"",
-  
+
   // "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": "Nincs jelenleg aktív csoport, előbb adjon meg egy nevet.",
-  
+
   // "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": "A csoportnak még nincs egy tagja sem, keressen s adjon hozzá.",
-  
+
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
   "admin.access-control.groups.form.members-list.no-items": "Ez a keresés nem talált EPeople-t",
-  
+
   // "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": "Valami nem sikerült: \"{{cause}}\"",
+
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Csoportok",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
   "admin.access-control.groups.form.subgroups-list.search.head": "Alcsoport hozzáadása",
-  
+
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.subgroups-list.button.see-all": "valamennyi böngészése",
-  
+
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
   "admin.access-control.groups.form.subgroups-list.headSubgroups": "jelenlegi alcsoportok",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "keresés",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
   "admin.access-control.groups.form.subgroups-list.table.id": "Azonosító",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Név",
-  
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Gyűjtemény/Közösség",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Törlés / Hozzáadás",
-  
+
   // "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": "A következő nevű \"{{name}}\" alcsoport törlése",
-  
+
   // "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.buttons.add": "A következő nevű \"{{name}}\" alcsoport hozzáadása",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Jelenlegi csoport",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "A: \"{{name}}\" alcsoport sikeresen hozzáadva",
-  
+
   // "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": "A: \"{{name}}\" alcsoport hozzáadása nem sikerült",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "A: \"{{name}}\" alcsoport sikeresen törölve",
-  
+
   // "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": "A: \"{{name}}\" alcsoport törlése nem sikerült",
-  
+
   // "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": "jelenleg nincs aktív csoport, előbb adjon meg egy nevet.",
-  
+
   // "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": "Ez a jelenlegi csoport, nem lehet hozzáadni.",
-  
+
   // "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": "Egyetlen csoport neve vagy UUID-je sem tartalmazza ezt",
-  
+
   // "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": "A csoportnak még nincsenek alcsoportjai.",
-  
-  // "admin.access-control.groups.form.return": "Return to groups",
-  "admin.access-control.groups.form.return": "Vissza a csoportokhoz",
-  
-  
-  
+
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "Vissza",
+
+  // "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.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.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.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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Adminisztratív keresés",
-  
+
   // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "Szerkesztés",
-  
+
   // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "Szerkesztés",
-  
+
   // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "Törlés",
-  
+
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Szerkesztés",
-  
-  // "admin.search.item.make-private": "Make Private",
-  "admin.search.item.make-private": "legyen privát",
-  
-  // "admin.search.item.make-public": "Make Public",
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "Legyen privát",
+
+  // "admin.search.item.make-public": "Make discoverable",
   "admin.search.item.make-public": "Legyen nyilvános",
-  
+
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "Költöztetés",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Visszaállítás",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Visszavonás",
-  
+
   // "admin.search.title": "Administrative Search",
   "admin.search.title": "Adminisztratív keresés",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Adminisztratív keresés",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "Munkafolyamat irányítása",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "Munkafolyamat irányítása",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "Munkafolyamat",
-  
+
+  // "admin.workflow.item.workspace": "Workspace",
+  // TODO New key - Add a translation
+  "admin.workflow.item.workspace": "Workspace",
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Törlés",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Visszaküldés",
-  
-  
-  
+
+  // "admin.workflow.item.policies": "Policies",
+  // TODO New key - Add a translation
+  "admin.workflow.item.policies": "Policies",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  // TODO New key - Add a translation
+  "admin.workflow.item.supervision": "Supervision",
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Metaadat importálása",
-  
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  // TODO New key - Add a translation
+  "admin.batch-import.breadcrumbs": "Import Batch",
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Metaadat importálása",
-  
+
+  // "admin.batch-import.title": "Import Batch",
+  // TODO New key - Add a translation
+  "admin.batch-import.title": "Import Batch",
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Metaadat importálása",
-  
+
+  // "admin.batch-import.page.header": "Import Batch",
+  // TODO New key - Add a translation
+  "admin.batch-import.page.header": "Import Batch",
+
   // "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": "Becsatolhat vagy kikereshet CSV fájlokat, amelyek az itt tárolt fájlokra vonatkozó műveleteket tárolnak",
-  
+
+  // "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.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "Húzzon ide egy metaadat CSV-t az importáláshoz",
-  
+
+  // "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.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "Húzzon ide egy metaadat CSV-t az importálás felülírásához",
-  
-  // "admin.metadata-import.page.button.return": "Return",
+
+  // "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.metadata-import.page.button.return": "Back",
   "admin.metadata-import.page.button.return": "Vissza",
-  
+
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Folytassa",
-  
+
+  // "admin.metadata-import.page.button.select-collection": "Select Collection",
+  "admin.metadata-import.page.button.select-collection": "Gyűjtemény kiválasztása",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Előbb válassza ki a fájlt!",
-  
-  
-  
-  
+
+  // "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.metadata-import.page.validateOnly": "Validate Only",
+  // TODO New key - Add a translation
+  "admin.metadata-import.page.validateOnly": "Validate Only",
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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.",
+
+  // "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.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.review.label": "Review",
+  // TODO New key - Add a translation
+  "advanced-workflow-action.rating.form.review.label": "Review",
+
+  // "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.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-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.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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-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.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.",
+
+  // "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.remove": "remove",
+  // TODO New key - Add a translation
+  "admin.batch-import.page.remove": "remove",
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
-  "auth.errors.invalid-user": "Érvénytelen email cím, vagy jelszó.",
-  
+  "auth.errors.invalid-user": "Érvénytelen e-mail cím, vagy jelszó.",
+
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Az idő lejárt. Kérjük, lépjen be újra.",
-  
-  
-  
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  // TODO New key - Add a translation
+  "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+
+
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  // TODO New key - Add a translation
+  "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+
+  // "bitstream.download.page.back": "Back" ,
+  // TODO New key - Add a translation
+  "bitstream.download.page.back": "Back" ,
+
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  // TODO New key - Add a translation
+  "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  // TODO New key - Add a translation
+  "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+
+  // "bitstream.edit.return": "Back",
+  // TODO New key - Add a translation
+  "bitstream.edit.return": "Back",
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "Bitfolyam: ",
-  
+
   // "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": "Választhatóan megadhatja az állomány rövid leírását, például \"<i>Fő cikk</i>\" vagy \"<i>Kísérleti adatok</i>\".",
-  
+
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Leírás",
-  
+
   // "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": "Ettől a naptól engedélyezett a hozzáférés. <b>Ez a dátum ebben a formában nem módosítható.</b> Ha a bitfolyamhoz embargó dátumot óhajt beállítani, akkor ide: <i>Tárgy Státus</i> fül, kattintson: <i>Engedélyezés...</i>, hozza létre, vagy szerkessze a bitfolyam <i>OLVASÁS</i> engedélyezését és állítsa be a  <i>Kezdő Dátum</i> kívánsága szerint.",
-  
+
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
   "bitstream.edit.form.embargo.label": "Embargo egy megadott dátumig",
-  
+
   // "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": "Változtassa meg a bitfolyam állomány nevét. Ez megváltoztatja a bitfolyam URL-t is, de a régi linkek meg mindig működni fognak, hacsak a szakasz azonosító meg nem változik.",
-  
+
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Állománynév",
-  
+
   // "bitstream.edit.form.newFormat.label": "Describe new format",
   "bitstream.edit.form.newFormat.label": "Új formátum leírása",
-  
+
   // "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": "A program, amellyel az állományt létrehozta és a verzió száma (például, \"<i>ACMESoft SuperApp version 1.5</i>\").",
-  
+
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
   "bitstream.edit.form.primaryBitstream.label": "Elsődleges bitfolyam",
-  
+
   // "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": "Amennyiben a formátum nem található a fentebbi listán, <b>válassza \"formátum nincs a listán\" feljebb</b> majd írja le \"Új formátum leírása\".",
-  
+
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Kiválasztott formátum",
-  
+
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
   "bitstream.edit.form.selectedFormat.unknown": "Formátum nincs a listán",
-  
+
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Bitfolyam formátum mentése közben hiba történt",
-  
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+
+  // "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifToc.hint": "Adding text here makes this the start of a new table of contents range.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  // TODO New key - Add a translation
+  "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "A bitfolyamban eszközölt változtatások elmentve.",
-  
+
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "Bitfolyam elmentve",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Bitfolyam szerkesztése",
-  
-  
-  
+
+  // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
+  // TODO New key - Add a translation
+  "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.canDownload2": "here",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.alert.canDownload2": "here",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.header": "Request a copy of the file",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.name.label": "Name *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.name.error": "The name is required",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.email.label": "Your e-mail address *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.allfiles.label": "Files",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.message.label": "Message",
+
+  // "bitstream-request-a-copy.return": "Back",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.return": "Back",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.submit": "Request copy",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  // TODO New key - Add a translation
+  "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+
+
+
+  // "browse.back.all-results": "All browse results",
+  // TODO New key - Add a translation
+  "browse.back.all-results": "All browse results",
+
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Szerző szerint",
-  
+
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "Megjelenés dátuma szerint",
-  
+
   // "browse.comcol.by.subject": "By Subject",
-  "browse.comcol.by.subject": "Tárgy szerint",
-  
+  "browse.comcol.by.subject": "Tárgyszó szerint",
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Cím szerint",
-  
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Böngészés",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "Nincs elérhető tárgy.",
-  
+
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "Szerző",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "Megjelenés dátuma",
-  
+
   // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "Tárgy",
-  
+
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Cím",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Böngészés szerző szerint",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   "browse.metadata.dateissued.breadcrumbs": "Böngészés dátum szerint",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  "browse.metadata.subject.breadcrumbs": "Böngészés tárgy szerint",
-  
+  "browse.metadata.subject.breadcrumbs": "Böngészés tárgyszó szerint",
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Böngészés cím szerint",
-  
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Következő",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Előző",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  // TODO New key - Add a translation
+  "pagination.next.button.disabled.tooltip": "No more pages of results",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  // TODO New key - Add a translation
+  "browse.startsWith": ", starting with {{ startsWith }}",
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Válassza a kezdést)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Válassza az évet)",
-  
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  "browse.startsWith.jump": "Ugrás a tartalom egy pontjához:",
-  
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  // TODO New key - Add a translation
+  "browse.startsWith.choose_year.label": "Choose the issue year",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Eremények szűrése év vagy hónap szerint",
+
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Április",
-  
+
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "Augusztus",
-  
+
   // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "December",
-  
+
   // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "Február",
-  
+
   // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "Január",
-  
+
   // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "Július",
-  
+
   // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "Június",
-  
+
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "Március",
-  
+
   // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "Május",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Válasszon hónapot)",
-  
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  // TODO New key - Add a translation
+  "browse.startsWith.months.none.label": "Choose the issue month",
+
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "Október",
-  
+
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "Szeptember",
-  
-  // "browse.startsWith.submit": "Go",
-  "browse.startsWith.submit": "Indít",
-  
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  "browse.startsWith.type_date": "Vagy írjon be egy dátumot (év-hónap):",
-  
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  "browse.startsWith.type_text": "Vagy írja be az első betűket:",
-  
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Böngészés {{ collection }} szerint {{ field }} {{ value }}",
-  
-  
+
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "Böngészés",
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Eredmények szűrése dátum szerint",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  // TODO New key - Add a translation
+  "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Eredmények szűrése az első pár betű alapján",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "{{ collection }} böngészése, {{ field }} {{ value }} szerint",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "{{ collection }} böngészése, {{ field }} {{ value }} szerint",
+
+
+  // "search.browse.item-back": "Back to Results",
+  // TODO New key - Add a translation
+  "search.browse.item-back": "Back to Results",
+
+
   // "chips.remove": "Remove chip",
-  "chips.remove": "Vegye ki a chipet",
-  
-  
-  
+  "chips.remove": "Chip eltávolítása",
+
+
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  // TODO New key - Add a translation
+  "claimed-approved-search-result-list-element.title": "Approved",
+
+  // "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-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",
+
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Hozzon létre egy gyűjteményt",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   "collection.create.notifications.success": "Guűjtemény sikeresen létrehozva",
-  
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Hozzon létre gyűjteményt a közösség számára {{ parent }}",
-  
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "Gyűjtemény gondozója: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Mégse",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Mehet",
-  
+
+  // "collection.delete.processing": "Deleting",
+  // TODO New key - Add a translation
+  "collection.delete.processing": "Deleting",
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Gyűjtemény törlése",
-  
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "Gyűjteményt nem sikerült törölni",
-  
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "Gyűjtemény törölve",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Biztos benne, hogy törölni szeretné a gyűjteményt \"{{ dso }}\"",
-  
-  
-  
+
+
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Törölje ezt a gyűjteményt",
-  
+
   // "collection.edit.head": "Edit Collection",
   "collection.edit.head": "Gyűjtemény szerkesztése",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Gyűjtemény szerkesztése",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "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.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Mégse",
-  
+
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   "collection.edit.item-mapper.collection": "Gyűjtemény: \"<b>{{name}}</b>\"",
-  
+
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Térképezze a kiválasztott tárgyakat",
-  
+
   // "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": "Ez a tárgytérképező eszköz, amellyel a gyűjtemények kezelői térképezhetnek más gyűjteményekből tárgyakat. Kereshet más gyűjteményekből tárgyakat és térképezheti azokat, vagy böngészheti a jelenleg térképezett tárgyakat.",
-  
+
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
   "collection.edit.item-mapper.head": "Tárgytérképező - Térképezzen más gyűjteményekből tárgyakat",
-  
+
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
   "collection.edit.item-mapper.no-search": "Írja be a keresőszót",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.error.content": "A {{amount}} tárgyak térképezésekor hiba történt.",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "Térképezési hibák",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.success.content": "A {{amount}} tárgyak térképezése sikerült.",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Térképezés befejezve",
-  
+
   // "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": "A {{amount}} tárgyak térképezésének törlésekor hiba történt.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Térképezési hibák törlése",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
   "collection.edit.item-mapper.notifications.unmap.success.content": "A {{amount}} tárgyak térképezése sikeresen törölve.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Térképezés törlése befejeződött",
-  
+
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Kiválasztott térgyak térképezésének törlése",
-  
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  // TODO New key - Add a translation
+  "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Térképezett tárgyak böngészése",
-  
+
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Új tárgyak térképezése",
-  
-  
-  
+
+
+  // "collection.edit.logo.delete.title": "Delete logo",
+  // TODO New key - Add a translation
+  "collection.edit.logo.delete.title": "Delete logo",
+
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  // TODO New key - Add a translation
+  "collection.edit.logo.delete-undo.title": "Undo delete",
+
   // "collection.edit.logo.label": "Collection logo",
   "collection.edit.logo.label": "Gyűjtemény logo",
-  
+
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
   "collection.edit.logo.notifications.add.error": "Gyűjtemény logo feltöltése nem sikerült. Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
-  
+
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
   "collection.edit.logo.notifications.add.success": "Gyűjtemény logo feltöltése sikerült.",
-  
+
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "Logo törölve",
-  
+
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Gyűjteménylogo sikeresen törölve",
-  
+
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "Logo törlése közben hiba történt",
-  
+
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Feltöltéshez húzza ide a gyűjtemény Logót",
-  
-  
-  
+
+
+
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Gyűjtemény szerkesztése sikerült",
-  
-  // "collection.edit.return": "Return",
+
+  // "collection.edit.return": "Back",
   "collection.edit.return": "Vissza",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Gondozás",
-  
+
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
   "collection.edit.tabs.curate.title": "Gyűjtemény szerkesztés - gondozás",
-  
+
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "További csomagok betöltése",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Továbbiak betöltése",
+
+  // "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.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Metaadat szerkesztés",
-  
+
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
   "collection.edit.tabs.metadata.title": "Gyűjtemény szerkesztés - Metaadat",
-  
+
   // "collection.edit.tabs.roles.head": "Assign Roles",
   "collection.edit.tabs.roles.head": "Jogok hozzárendelése",
-  
+
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
   "collection.edit.tabs.roles.title": "Gyűjtemény szerkesztése - Jogok",
-  
+
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
   "collection.edit.tabs.source.external": "Ez a gyűjtemény külső forrásból gyűjti be tartalmát",
-  
+
   // "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": "Beállított azonosítót kell megadnia a célgyűjteményhez.",
-  
+
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
   "collection.edit.tabs.source.form.harvestType": "Tartalom begyűjtése folyamatban",
-  
+
   // "collection.edit.tabs.source.form.head": "Configure an external source",
   "collection.edit.tabs.source.form.head": "Külső forrás beállítása",
-  
+
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
   "collection.edit.tabs.source.form.metadataConfigId": "Metaadat formátum",
-  
+
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "OAI sajátos beállított azonosító",
-  
+
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
   "collection.edit.tabs.source.form.oaiSource": "OAI szolgáltató",
-  
+
   // "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": "Metaadat és bitfolyam begyűjtése (ORE támogatás szükséges)",
-  
+
   // "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": "metaadatok és referenciák begyűjtése bitfolyamhoz (ORE támogatás szükséges)",
-  
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Csupán metaadatok begyűjtése",
-  
+
   // "collection.edit.tabs.source.head": "Content Source",
   "collection.edit.tabs.source.head": "Tartalom forrása",
-  
+
   // "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": "Változtatások elvetve. Visszaállításukhoz kattintson a 'Visszaállítás' gombra",
-  
-  // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  "collection.edit.tabs.source.notifications.discarded.title": "Változtatások elvetve",
-  
+
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "collection.edit.tabs.source.notifications.discarded.title": "Változások elvetve",
+
   // "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": "Változtatások nincsenek mentve. Kérjük, ellenőrizze, hogy valamennyi mező érvényes, mielőtt mentene.",
-  
+
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
   "collection.edit.tabs.source.notifications.invalid.title": "Metaadat érvénytelen",
-  
+
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "A gyűjtemény tartalmának forrásával kapcsolatos változtatásai elmentve.",
-  
+
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
   "collection.edit.tabs.source.notifications.saved.title": "Tartalom forrása elmentve",
-  
+
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Gyűjtemény szerkesztés - tartalom forrása",
-  
-  
-  
+
+
+
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Hozzáad",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "Elemsablon",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "Mégsem",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "Töröl",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "Szerkeszt",
-  
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  // TODO New key - Add a translation
+  "collection.edit.template.error": "An error occurred retrieving the template item",
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
   "collection.edit.template.head": "Gyűjtemény elemsablon szerkesztése: \"{{ collection }}\"",
-  
+
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Elemsablon",
-  
+
+  // "collection.edit.template.loading": "Loading template item...",
+  // TODO New key - Add a translation
+  "collection.edit.template.loading": "Loading template item...",
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Nem sikerült törölni az elemsablont",
-  
+
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
   "collection.edit.template.notifications.delete.success": "Sikeresen töröltük az elemsablont",
-  
+
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Elemsablon szerkesztése",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Rövid leírás",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "Bevezető szöveg (HTML)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "Adja meg a gyűjtemény nevét",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "Engedély",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "Eredet",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "Szerzői jog szövege (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Hírek (HTML)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "Név",
-  
-  
-  
+
+  // "collection.form.entityType": "Entity Type",
+  // TODO New key - Add a translation
+  "collection.form.entityType": "Entity Type",
+
+
+
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Gyűjtemény",
-  
-  
-  
+
+
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Friss feltöltések",
-  
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "Nincs tárgy",
-  
+
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Gyűjtemény szerkesztése",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   "collection.page.handle": "Állandó URI ehhez a gyűjteményhez",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "Engedély",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Hírek",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Kiválasztás igazolása",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Nincs gyűjtemény",
-  
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Cím",
-  
-  
-  
+
+
+  // "collection.source.controls.head": "Harvest Controls",
+  // TODO New key - Add a translation
+  "collection.source.controls.head": "Harvest Controls",
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  // TODO New key - Add a translation
+  "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  // TODO New key - Add a translation
+  "collection.source.controls.test.failed": "The script to test the settings has failed",
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  // TODO New key - Add a translation
+  "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  // "collection.source.controls.test.submit": "Test configuration",
+  // TODO New key - Add a translation
+  "collection.source.controls.test.submit": "Test configuration",
+  // "collection.source.controls.test.running": "Testing configuration...",
+  // TODO New key - Add a translation
+  "collection.source.controls.test.running": "Testing configuration...",
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  // TODO New key - Add a translation
+  "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  // TODO New key - Add a translation
+  "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  // "collection.source.controls.import.submit": "Import now",
+  // TODO New key - Add a translation
+  "collection.source.controls.import.submit": "Import now",
+  // "collection.source.controls.import.running": "Importing...",
+  // TODO New key - Add a translation
+  "collection.source.controls.import.running": "Importing...",
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  // TODO New key - Add a translation
+  "collection.source.controls.import.failed": "An error occurred during the import",
+  // "collection.source.controls.import.completed": "The import completed",
+  // TODO New key - Add a translation
+  "collection.source.controls.import.completed": "The import completed",
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  // TODO New key - Add a translation
+  "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  // TODO New key - Add a translation
+  "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  // TODO New key - Add a translation
+  "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  // TODO New key - Add a translation
+  "collection.source.controls.reset.completed": "The reset and reimport completed",
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  // TODO New key - Add a translation
+  "collection.source.controls.reset.submit": "Reset and reimport",
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  // TODO New key - Add a translation
+  "collection.source.controls.reset.running": "Resetting and reimporting...",
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  // TODO New key - Add a translation
+  "collection.source.controls.harvest.status": "Harvest status:",
+  // "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.last": "Last time harvested:",
+  // TODO New key - Add a translation
+  "collection.source.controls.harvest.last": "Last time harvested:",
+  // "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",
+  // TODO New key - Add a translation
+  "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": "A megadott beállításokat ellenőriztük és nem működnek.",
-  
+
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Szerverhiba",
-  
-  
-  
-  // "communityList.tabTitle": "DSpace - Community List",
+
+
+
+  // "communityList.breadcrumbs": "Community List",
+  // TODO New key - Add a translation
+  "communityList.breadcrumbs": "Community List",
+
+  // "communityList.tabTitle": "Community List",
   "communityList.tabTitle": "DSpace - Közösség lista",
-  
+
   // "communityList.title": "List of Communities",
-  "communityList.title": "Közösségek listája",
-  
+  "communityList.title": "Kategóriák listája",
+
   // "communityList.showMore": "Show More",
-  "communityList.showMore": "Mutasson többet",
-  
-  
-  
+  "communityList.showMore": "Tovább",
+
+
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Hozzon létre egy közösséget",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   "community.create.notifications.success": "Közösség sikeresen létrehozva",
-  
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Hozzon létre egy alközösséget a közösségben {{ parent }}",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Közösség gondozása: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Mégse",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Igazolja",
-  
+
+  // "community.delete.processing": "Deleting...",
+  // TODO New key - Add a translation
+  "community.delete.processing": "Deleting...",
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Közösség törlése",
-  
+
   // "community.delete.notification.fail": "Community could not be deleted",
   "community.delete.notification.fail": "Közösség törlése nem sikerült",
-  
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "SKözösség sikeresen törölve",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "Biztos benne, hogy törölni szeretné a közösséget \"{{ dso }}\"",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Törölje ezt a közösséget",
-  
+
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Közösség szerkesztése",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Közösség szerkesztése",
-  
-  
+
+
+  // "community.edit.logo.delete.title": "Delete logo",
+  // TODO New key - Add a translation
+  "community.edit.logo.delete.title": "Delete logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  // TODO New key - Add a translation
+  "community.edit.logo.delete-undo.title": "Undo delete",
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Közösségi logo",
-  
+
   // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Közösségi logo feltöltése nem sikerült Kérjük, ellenőrizze a tartalmat, mielőtt újra próbálkozna.",
-  
+
   // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
   "community.edit.logo.notifications.add.success": "Közösségi logo feltöltve.",
-  
+
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "Logo törölve",
-  
+
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "A közösség logóját sikeresen törölte",
-  
+
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Logo törlése közben hiba történt",
-  
+
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Feltöltéshez húzza ide a közösségi logót",
-  
-  
-  
+
+
+
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Közösség szerkesztése sikerült",
-  
+
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Nincs meg a szükséges jogosultsága a változtatáshoz",
-  
+
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Hiba történt a közösség szerkesztésekor",
-  
-  // "community.edit.return": "Return",
+
+  // "community.edit.return": "Back",
   "community.edit.return": "Vissza",
-  
-  
-  
+
+
+
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Gondozás",
-  
+
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Közösség szerkesztés - Gondozás",
-  
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Metaadat szerkesztés",
-  
+
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
   "community.edit.tabs.metadata.title": "Közösség szerkesztése - Metaadat",
-  
+
   // "community.edit.tabs.roles.head": "Assign Roles",
   "community.edit.tabs.roles.head": "Feladatok kijelölése",
-  
+
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
   "community.edit.tabs.roles.title": "Közösség szerkesztése - Feladatok",
-  
+
   // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "Jogosultásgok",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Közösségi szerkesztés - Jogosultásgok",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Közösség",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
-  "comcol-role.edit.no-group": "Egyik sem",
-  
+  "comcol-role.edit.no-group": "Semmi",
+
   // "comcol-role.edit.create": "Create",
-  "comcol-role.edit.create": "Hozzon létre",
-  
+  "comcol-role.edit.create": "Létrehoz",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  // TODO New key - Add a translation
+  "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+
   // "comcol-role.edit.restrict": "Restrict",
-  "comcol-role.edit.restrict": "Korlátozzon",
-  
+  "comcol-role.edit.restrict": "Korlátoz",
+
   // "comcol-role.edit.delete": "Delete",
-  "comcol-role.edit.delete": "Törölje",
-  
-  
+  "comcol-role.edit.delete": "Töröl",
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  // TODO New key - Add a translation
+  "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   "comcol-role.edit.community-admin.name": "Adminisztrátorok",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Adminisztrátorok",
-  
-  
+
+
   // "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": "A közösségek adminisztrátorai létrehozhatnak alközösségeket vagy gyűjteményeket, irányíthatják azokat, vagy kijelölhetik azok irányítását. Továbbá ők döntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
-  
+  "comcol-role.edit.community-admin.description": "A közösségek adminisztrátorai létrehozhatnak alkategóriákat vagy gyűjteményeket, irányíthatják azokat, vagy kijelölhetik azok irányítását. Továbbá ők döntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
+
   // "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": "A közösségek adminisztrátorai  öntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
-  
-  
+
+
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Feltöltők",
-  
+
   // "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": "E-People és csoportok akik feltölthetnek új tárgyakat ebbe a gyűjteménybe.",
-  
-  
+
+
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Alapbeállított tárgy olvasási hozzáférés",
-  
+
   // "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": "Azon E-People és csoportok, amelyek olvashatják az ebbe a gyűjteménybe feltöltött tárgyakat. Az ebben a tekintetben végrehajtott változtatások nem visszamenő érvényűek. A meglévő tárgyak olvashatók maradnak mindazok számára, akik a feltöltés idején rendelkeztek ezzel a hozzáféréssel.",
-  
+
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "Beérkező tárgyak olvasási alapbeállítása jelenleg Névtelen.",
-  
-  
+
+
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Bitfolyam olvasási hozzáférés alapbeállítás",
-  
+
   // "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": "A közösségek adminisztrátorai létrehozhatnak alközösségeket vagy gyűjteményeket, irányíthatják azokat, vagy kijelölhetik azok irányítását. Továbbá ők döntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
-  
+  "comcol-role.edit.bitstream_read.description": "A közösségek adminisztrátorai létrehozhatnak alkategóriákat vagy gyűjteményeket, irányíthatják azokat, vagy kijelölhetik azok irányítását. Továbbá ők döntik el ki tölthet fel tárgyakat bármely algyűjteménybe, ki szerkesztheti a tárgyak metaadatait (feltöltést követően) és ki adhat hozzá (térképezhet) létező tárgyakat más gyűjteményekből (felhatalmazás szükséges).",
+
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "Beérkező bitfolyamok olvasási alapbeállítása jelenleg Névtelen.",
-  
-  
+
+
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Szerkesztők",
-  
+
   // "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": "Szerkesztők szerkeszthetik a beérkező feltöltések metaadatait és elfogadhatják, vagy elutasíthatják azokat.",
-  
-  
+
+
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Végső szerkesztők",
-  
+
   // "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": "Végső szerkesztők szerkeszthetik a beérkező feltöltések metaadatait de nem utasíthatják el azokat.",
-  
-  
+
+
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Lektorálók",
-  
+
   // "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": "A lektorálók elfogadhatják, vagy elutasíthatják a beérkező feltöltéseket, de nem szerkeszthetik azok metaadatait.",
-  
-  
-  
+
+
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  // TODO New key - Add a translation
+  "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+
+  // "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.",
+
+
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Rövid leírás",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "Bevezető szöveg (HTML)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "Kérjük adjon meg egy közösség nevet",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "Szerzői jog szövege (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Hírek (HTML)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "Név",
-  
+
   // "community.page.edit": "Edit this community",
   "community.page.edit": "Közösség szerkesztése",
-  
+
   // "community.page.handle": "Permanent URI for this community",
-  "community.page.handle": "Állandó URI ehhez a közösséghez",
-  
+  "community.page.handle": "Állandó link (URI) ehhez a kategóriához",
+
   // "community.page.license": "License",
   "community.page.license": "Engedély",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Hírek",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
-  "community.all-lists.head": "Alközösségek és gyűjtemények",
-  
+  "community.all-lists.head": "Alkategóriák és gyűjtemények",
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Ennek a közösségnek a gyűjteményei",
-  
+
   // "community.sub-community-list.head": "Communities of this Community",
-  "community.sub-community-list.head": "Ennek a közösségnek a közösségei",
-  
-  
-  
+  "community.sub-community-list.head": "Ennek a kategóriának az alkategóriái",
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Mind elfogad",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   "cookies.consent.accept-selected": "Kiválasztottat elfogad",
-  
+
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
   "cookies.consent.app.opt-out.description": "Ez az app alaból betöltődik (de letilthatja)",
-  
+
   // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(letilt)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   "cookies.consent.app.purpose": "cél",
-  
+
   // "cookies.consent.app.required.description": "This application is always required",
   "cookies.consent.app.required.description": "Ez egy szükséges alkalmazás",
-  
+
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(mindig szükséges)",
-  
+
+  // "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.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.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Változások történtek az utolsó látogatása óta, frissítse a beleegyezését.",
-  
+
   // "cookies.consent.close": "Close",
   "cookies.consent.close": "Bezár",
-  
+
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Elutasít",
-  
+
+  // "cookies.consent.ok": "That's ok",
+  // TODO New key - Add a translation
+  "cookies.consent.ok": "That's ok",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Mentés",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Cookie elfogadása",
+
   // "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": "Mi gyűjtjük és feldolgozzuk a személyes adatait a következő célból: <strong>Hitelesítés, Beállítások, Elismerés és Statisztikák</strong>. <br/> Részletekért olvassa el: {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.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Személyreszab",
-  
+
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
   "cookies.consent.content-modal.description": "Itt láthatja és személyre szabhatja az Önről gyűjtött adatokat.",
-  
+
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
-  "cookies.consent.content-modal.privacy-policy.name": "Adatvédelmi irányelvek",
-  
+  "cookies.consent.content-modal.privacy-policy.name": "Adatvédelmi nyilatkozat",
+
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Továbbiakért olvassa el: {privacyPolicy}.",
-  
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Gyűjtött adatok",
-  
-  
-  
+
+  // "cookies.consent.content-modal.services": "services",
+  // TODO New key - Add a translation
+  "cookies.consent.content-modal.services": "services",
+
+  // "cookies.consent.content-modal.service": "service",
+  // TODO New key - Add a translation
+  "cookies.consent.content-modal.service": "service",
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Hitelesítés",
-  
+
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Szükséges a beléptetéséhez",
-  
-  
+
+
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Beállítások",
-  
+
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Szükséges a beállítások mentéséhez",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Elismerés",
-  
+
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Szükséges az elismerésének és beleegyezésének a mentéséhez",
-  
-  
-  
+
+
+
   // "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": "Engedélyezi statisztikai adatok gyűjtését",
-  
-  
-  
+
+
+
+  // "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.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funkcionális",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Statisztikai",
-  
-  
+
+  // "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.sharing": "Sharing",
+  // TODO New key - Add a translation
+  "cookies.consent.purpose.sharing": "Sharing",
+
+  // "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.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Hivatkozások ellenőrzése a metaadatokban",
-  
+  "curation-task.task.checklinks.label": "Hivatkozások ellenőrzése a metaadatokban",
+
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
-  
+
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "A profil bitfolyam formátumai",
-  
+
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "Szükséges metaadatok ellenőrzése",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "Microsoft fordító",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virus ellenőrzés",
-  
-  
-  
+
+  // "curation-task.task.registerdoi.label": "Register DOI",
+  // TODO New key - Add a translation
+  "curation-task.task.registerdoi.label": "Register DOI",
+
+
+
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Feladat:",
-  
+
   // "curation.form.submit": "Start",
   "curation.form.submit": "Start",
-  
+
   // "curation.form.submit.success.head": "The curation task has been started successfully",
   "curation.form.submit.success.head": "A kurátor feladat siskersen elkezdődött",
-  
+
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "Át lesz irányítva a megfelelő folyamatoldalra.",
-  
+
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "A kurátor feladat futtatása sikertelen",
-  
+
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Hiba történt a kurátor feladat elindításakor.",
-  
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  // TODO New key - Add a translation
+  "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+
   // "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": "Hint: Írja be a(z) [your-handle-prefix]/0 hogy futtasson egy feladatok az egész oldalon (nem minden feladat alakalmas a futtatásra)",
-  
-  
-  
+
+
+
+  // "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 }}>",
+  // TODO New key - Add a translation
+  "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.subject": "Request copy of document",
+  // TODO New key - Add a translation
+  "deny-request-copy.email.subject": "Request copy of document",
+
+  // "deny-request-copy.error": "An error occurred",
+  // TODO New key - Add a translation
+  "deny-request-copy.error": "An error occurred",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  // TODO New key - Add a translation
+  "deny-request-copy.header": "Deny document copy request",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  // TODO New key - Add a translation
+  "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  // TODO New key - Add a translation
+  "deny-request-copy.success": "Successfully denied item request",
+
+
+
+  // "dso.name.untitled": "Untitled",
+  // TODO New key - Add a translation
+  "dso.name.untitled": "Untitled",
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Új gyűjtemény",
-  
+
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "Új közösség létrehozása benne",
-  
+
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Új közösség",
-  
+
+  // "dso-selector.create.community.or-divider": "or",
+  // TODO New key - Add a translation
+  "dso-selector.create.community.or-divider": "or",
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Hozzon létre új közösséget benne",
-  
+
   // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "Hozzon létre csúcsszintű közösséget",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Új tárgy",
-  
+
   // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "Új elem létrehozása, itt",
-  
+
   // "dso-selector.create.submission.head": "New submission",
   "dso-selector.create.submission.head": "Új beküldés",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Szerkessze a gyűjteményt",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "Szerkessze a közösséget",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Szerkessze a tárgyat",
-  
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  // TODO New key - Add a translation
+  "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Metaadat exportálása innen",
-  
+
+  // "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.import-batch.dspaceobject.head": "Import batch from",
+  // TODO New key - Add a translation
+  "dso-selector.import-batch.dspaceobject.head": "Import batch from",
+
   // "dso-selector.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Nincs {{ type }} találat",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Keressen egy {{ type }}",
-  
-  
-  
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  // TODO New key - Add a translation
+  "dso-selector.select.collection.head": "Select a collection",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  // TODO New key - Add a translation
+  "dso-selector.set-scope.community.head": "Select a search scope",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Keresés a teljes DSpaceben",
+
+  // "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.input-header": "Search for a community or collection",
+  // TODO New key - Add a translation
+  "dso-selector.set-scope.community.input-header": "Search for a community or collection",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  // TODO New key - Add a translation
+  "dso-selector.claim.item.head": "Profile tips",
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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.not-mine-label": "None of these are mine",
+  // TODO New key - Add a translation
+  "dso-selector.claim.item.not-mine-label": "None of these are mine",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  // TODO New key - Add a translation
+  "dso-selector.claim.item.create-from-scratch": "Create a new one",
+
+  // "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 ↻",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  // TODO New key - Add a translation
+  "supervision-group-selector.header": "Supervision Group Selector",
+
+  // "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.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.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.observer": "OBSERVER",
+  // TODO New key - Add a translation
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+
+  // "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.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "supervision-group-selector.button.cancel": "Cancel",
+
+  // "supervision-group-selector.button.save": "Save",
+  // TODO New key - Add a translation
+  "supervision-group-selector.button.save": "Save",
+
+  // "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.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.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.failure.title": "Error",
+  // TODO New key - Add a translation
+  "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",
+  // TODO New key - Add a translation
+  "supervision-group-selector.notification.create.already-existing": "A supervision order already exists on this item for selected group",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Metaadat exportálásának célja {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "Biztos benne, hogy exportálni szeretné a metaadatok a követkő céllal: {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "Mégsem",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   "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.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.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "confirmation-modal.export-batch.cancel": "Cancel",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  // TODO New key - Add a translation
+  "confirmation-modal.export-batch.confirm": "Export",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "EPerson törlése \"{{ dsoName }}\"",
-  
+
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.info": "Biztos benne, hogy törli: EPerson \"{{ dsoName }}\"",
-  
+
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "Mégsem",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Töröl",
-  
-  
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-profile.header": "Delete Profile",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-profile.cancel": "Cancel",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-profile.confirm": "Delete",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-subscription.header": "Delete Subscription",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-subscription.cancel": "Cancel",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  // TODO New key - Add a translation
+  "confirmation-modal.delete-subscription.confirm": "Delete",
+
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Bitfolyam megjelenítése közben hiba történt",
-  
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Tárgy megjelenítése közben hiba történt",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "Gyűjtemény megjelenítése közben hiba történt",
-  
+
   // "error.collections": "Error fetching collections",
   "error.collections": "Gyűjtemények megjelenítése közben hiba történt",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "Közösség megjelenítése közben hiba történty",
-  
+
   // "error.identifier": "No item found for the identifier",
   "error.identifier": "Ehhez az azonosítóhoz nem találtunk tárgyat",
-  
+
   // "error.default": "Error",
   "error.default": "Hiba",
-  
+
   // "error.item": "Error fetching item",
   "error.item": "Tárgy megjelenítésekor hiba történt",
-  
+
   // "error.items": "Error fetching items",
   "error.items": "Tárgyak megjelenítésekor hiba történt",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "Tárgyak megjelenítésekor hiba történt",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "Friss feltöltések megjelenítésekor hiba történt",
-  
+
   // "error.search-results": "Error fetching search results",
   "error.search-results": "keresési eredmények megjelenítésekor hiba történt",
-  
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Algyűjtemények megjelenítésekor hiba történt",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
-  "error.sub-communities": "Alközösségek megjelenítésekor hiba történt",
-  
+  "error.sub-communities": "Alkategóriák megjelenítésekor hiba történt",
+
   // "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": "Szakasz kezdőértékének megadásakor hiba történt, kérjük ellenőrizze az adatbeviteli forma beállításait. Részletek alább : <br> <br>",
-  
+
   // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Csúcsszintű közösségek megjelenítésekor hiba történt",
-  
+  "error.top-level-communities": "Hiba a csúcsszintű kategóriák megjelenítésekor",
+
   // "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": "ezt az engedélyt meg kell adnia ahhoz, hogy befejezze a feltöltést. Ha jelenleg ez nem lehetséges, elmentheti az eddigi munkát és később folytathatja, vagy törölheti a feltöltést.",
-  
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Ezt a bevitelt korlátozza a jelenlegi útvonal: {{ pattern }}.",
-  
+
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Az állomány feltöltése kötelező",
-  
-  
-  
+
+  // "error.validation.required": "This field is required",
+  // TODO New key - Add a translation
+  "error.validation.required": "This field is required",
+
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  // TODO New key - Add a translation
+  "error.validation.NotValidEmail": "This E-mail is not a valid email",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  // TODO New key - Add a translation
+  "error.validation.emailTaken": "This E-mail is already taken",
+
+  // "error.validation.groupExists": "This group already exists",
+  // TODO New key - Add a translation
+  "error.validation.groupExists": "This group already exists",
+
+
+  // "feed.description": "Syndication feed",
+  // TODO New key - Add a translation
+  "feed.description": "Syndication feed",
+
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Hiba történ az elemhez tartozó fájlok beszerzésekor",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "szerzői jog © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "DSpace szoftver",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   "footer.link.cookies": "Süti beállítások",
-  
+
   // "footer.link.privacy-policy": "Privacy policy",
-  "footer.link.privacy-policy": "Privacy policy",
-  
+  "footer.link.privacy-policy": "Adatvédelmi nyilatkozat",
+
   // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"End User Agreement",
-  
-  
-  
+  "footer.link.end-user-agreement": "Felhasználói feltételek",
+
+  // "footer.link.feedback":"Send Feedback",
+  "footer.link.feedback": "Visszajelzés küldése",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Elfelejtettem a jelszót",
-  
-  // "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": "Lépjen be a Fiók létrehozásába, hogy feliratkozhasson gyűjtemények e-mail értesítésére, és új elemeket tölthessen fel a DSpace-be.",
-  
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Írja be a fiókhoz rendelt e-mail címet.",
+
   // "forgot-email.form.email": "Email Address *",
-  "forgot-email.form.email": "Email Cím *",
-  
+  "forgot-email.form.email": "E-mail cím *",
+
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Írjon be egy e-mail címet",
-  
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Írjon be egy érvényes e-mail címet",
-  
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  "forgot-email.form.email.hint": "Ellenőrizni fogjuk a címet és ezt fogja használni a bejelentkezéshez.",
-  
-  // "forgot-email.form.submit": "Submit",
-  "forgot-email.form.submit": "Beküld",
-  
-  // "forgot-email.form.success.head": "Verification email sent",
-  "forgot-email.form.success.head": "Ellenőrző e-mail kiküldve",
-  
+
+  // "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.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "Elküldtünk egy e-mailt erre a címre további utasításokkal.",
+
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Jelszó visszaállítása",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "Jelszóvisszaállító e-mail küldve",
+
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "Egy levél ki lett küldve a(z) {{ email }} címre, ami tartalmaz egy speciális hivatkozást a következő lépéshez.",
-  
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  "forgot-email.form.error.head": "Hiba történt az e-mail cím regisztrációjánál",
-  
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Hiba történt a következő e-mail cím regisztrációjánál: {{ email }}",
-  
-  
-  
+
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "Hiba történt a jelszó visszaállításakor",
+
+  // "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-password.title": "Forgot Password",
   "forgot-password.title": "Elfelejtettem a jelszót",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "Elfelejtettem a jelszót",
-  
-  // "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": "Írjon be egy új jelszót a lenti mezőbe, és igazolja a második mezőbe újraírva azt. Legalább hat karakter hosszú kell legyen.",
-  
+
+  // "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": "Írjon be egy új jelszót a lenti mezőbe, és igazolja a második mezőbe újraírva azt.",
+
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Biztonság",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "Azonosítás",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "E-mail cím: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Jelszó",
-  
+
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Írja újra a visszaigazoláshoz",
-  
+
   // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
   "forgot-password.form.error.empty-password": "Írja be a jelszót a lenti mezőbe.",
-  
+
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "A jelszavak nem egyeznek.",
-  
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length": "A jelszó legalább 6 karakter hosszú kell legyen.",
-  
+
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Hiba történt a jelszó beküldésekor",
-  
+
   // "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": "A jelszóvisszaállítás sikeres volt. Beléphet a létrehozott felhasználóval.",
-  
+
   // "forgot-password.form.notification.success.title": "Password reset completed",
   "forgot-password.form.notification.success.title": "Jelszóvisszaállítás befejeződött",
-  
+
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Jelszó beküldése",
-  
-  
-  
-  // "form.add": "Add",
-  "form.add": "Hozzáadás",
-  
+
+
+  // "form.add": "Add more",
+  "form.add": "Továbbiak hozzáadása",
+
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "Kattintson ide a beírt adatok hozzáadásához, majd újabb megadásához",
-  
+
   // "form.cancel": "Cancel",
   "form.cancel": "Mégse",
-  
+
   // "form.clear": "Clear",
   "form.clear": "Töröl",
-  
+
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Kattintson ide a kiválasztott érték törléséhez",
-  
+
+  // "form.discard": "Discard",
+  "form.discard": "Elvet",
+
+  // "form.drag": "Drag",
+  // TODO New key - Add a translation
+  "form.drag": "Drag",
+
   // "form.edit": "Edit",
   "form.edit": "Szerkeszt",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "Kattintson ide a kiválasztott érték szerkesztéséhez",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "Keresztnév",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Kicsinyít",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Kattintson ide a kicsinyítéshez",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "Felnagyít",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "Kattintson ide, hogy felnagyítsa s újabb elemeket adjon hozzá",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "Családnév",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "Betöltés...",
-  
+
   // "form.lookup": "Lookup",
   "form.lookup": "Keresse ki",
-  
+
   // "form.lookup-help": "Click here to look up an existing relation",
   "form.lookup-help": "Kattintson ide egy meglévő kapcsolat kikereséséhez",
-  
+
   // "form.no-results": "No results found",
   "form.no-results": "Nincs találat",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Nem adott meg értéket",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "Törlés",
-  
+
   // "form.save": "Save",
   "form.save": "Mentés",
-  
+
   // "form.save-help": "Save changes",
   "form.save-help": "Változtatások mentése",
-  
+
   // "form.search": "Search",
   "form.search": "Keresés",
-  
+
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Kattintson ide egy meglévő levelezés kikereséséhez",
-  
-  // "form.submit": "Submit",
-  "form.submit": "Feltöltés",
-  
-  
-  
+
+  // "form.submit": "Save",
+  "form.submit": "Ment",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  // TODO New key - Add a translation
+  "form.repeatable.sort.tip": "Drop the item in the new position",
+
+
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.deny": "Don't send copy",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.back": "Back",
+
+  // "grant-deny-request-copy.email.message": "Message",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.message": "Message",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.message.empty": "Please enter a message",
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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.label": "Change to open access",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.permissions.label": "Change to open access",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.send": "Send",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.subject": "Subject",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.grant": "Send copy",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.header": "Document copy request",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  // TODO New key - Add a translation
+  "grant-deny-request-copy.home-page": "Take me to the 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.",
+  // TODO New key - Add a translation
+  "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.intro2": "After choosing an option, you will be presented with a suggested email reply which you may edit.",
+  // TODO New key - Add a translation
+  "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.processed": "This request has already been processed. You can use the button below to get back to the home page.",
+  // TODO New key - Add a translation
+  "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-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 }}>",
+  // TODO New key - Add a translation
+  "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.subject": "Request copy of document",
+  // TODO New key - Add a translation
+  "grant-request-copy.email.subject": "Request copy of document",
+
+  // "grant-request-copy.error": "An error occurred",
+  // TODO New key - Add a translation
+  "grant-request-copy.error": "An error occurred",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  // TODO New key - Add a translation
+  "grant-request-copy.header": "Grant document copy request",
+
+  // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
+  // TODO New key - Add a translation
+  "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.success": "Successfully granted item request",
+  // TODO New key - Add a translation
+  "grant-request-copy.success": "Successfully granted item request",
+
+
+  // "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.status-tab" : "Status",
+  // TODO New key - Add a translation
+  "health-page.status-tab": "Status",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  // TODO New key - Add a translation
+  "health-page.error.msg": "The health check service is temporarily unavailable",
+
+  // "health-page.property.status": "Status code",
+  // TODO New key - Add a translation
+  "health-page.property.status": "Status code",
+
+  // "health-page.section.db.title": "Database",
+  // TODO New key - Add a translation
+  "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",
+  // TODO New key - Add a translation
+  "health-page.section-info.app.title": "Application Backend",
+
+  // "health-page.section-info.java.title": "Java",
+  // TODO New key - Add a translation
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  // TODO New key - Add a translation
+  "health-page.status": "Status",
+
+  // "health-page.status.ok.info": "Operational",
+  // TODO New key - Add a translation
+  "health-page.status.ok.info": "Operational",
+
+  // "health-page.status.error.info": "Problems detected",
+  // TODO New key - Add a translation
+  "health-page.status.error.info": "Problems detected",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  // TODO New key - Add a translation
+  "health-page.status.warning.info": "Possible issues detected",
+
+  // "health-page.title": "Health",
+  // TODO New key - Add a translation
+  "health-page.title": "Health",
+
+  // "health-page.section.no-issues": "No issues detected",
+  // TODO New key - Add a translation
+  "health-page.section.no-issues": "No issues detected",
+
+
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
-  "home.breadcrumbs": "Haza",
-  
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace Angular :: Haza",
-  
+  "home.breadcrumbs": "Főoldal",
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Keresés az adattárban ...",
+
+  // "home.title": "Home",
+  "home.title": "Főoldal",
+
   // "home.top-level-communities.head": "Communities in DSpace",
-  "home.top-level-communities.head": "Közösségek a DSpace-en",
-  
+  "home.top-level-communities.head": "Kategóriák",
+
   // "home.top-level-communities.help": "Select a community to browse its collections.",
-  "home.top-level-communities.help": "Válasszon ki egy közösséget, hogy böngéssze a gyűjteményeit.",
-  
-  
-  
+  "home.top-level-communities.help": "Válasszon ki egy kategóriát, hogy böngéssze a gyűjteményeit.",
+
+
+
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "Elolvastam és elfogadom a felhasználói feltételeket",
-  
+
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
   "info.end-user-agreement.accept.error": "Hiba történt a felhasználói feltételek elfogadásakor",
-  
+
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
   "info.end-user-agreement.accept.success": "Sikeresen frissítette a felhasználói feltételeket",
-  
+
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
   "info.end-user-agreement.breadcrumbs": "Felhasználói feltételek",
-  
+
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "Mégsem",
-  
+
   // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "Mentés",
-  
+
   // "info.end-user-agreement.head": "End User Agreement",
   "info.end-user-agreement.head": "Felhasználói feltételek",
-  
+
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Felhasználói feltételek",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Adatvédelmi nyilatkozat",
-  
+
   // "info.privacy.head": "Privacy Statement",
   "info.privacy.head": "Adatvédelmi nyilatkozat",
-  
+
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Adatvédelmi nyilatkozat",
-  
-  
-  
-  // "item.alerts.private": "This item is private",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  // TODO New key - Add a translation
+  "info.feedback.breadcrumbs": "Feedback",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Visszajelzés",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Visszajelzés",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  // TODO New key - Add a translation
+  "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  // TODO New key - Add a translation
+  "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Visszajelzés küldése",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Megjegyzések",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Az e-mail címe",
+
+  // "info.feedback.create.success" : "Feedback Sent Successfully!",
+  // TODO New key - Add a translation
+  "info.feedback.create.success": "Feedback Sent Successfully!",
+
+  // "info.feedback.error.email.required" : "A valid email address is required",
+  // TODO New key - Add a translation
+  "info.feedback.error.email.required": "A valid email address is required",
+
+  // "info.feedback.error.message.required" : "A comment is required",
+  // TODO New key - Add a translation
+  "info.feedback.error.message.required": "A comment is required",
+
+  // "info.feedback.page-label" : "Page",
+  // TODO New key - Add a translation
+  "info.feedback.page-label": "Page",
+
+  // "info.feedback.page_help" : "Tha page related to your feedback",
+  // TODO New key - Add a translation
+  "info.feedback.page_help": "Tha page related to your feedback",
+
+
+
+  // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Ez az elem privát",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Ez az elem vissza lett vonva",
-  
-  
-  
+
+
+
   // "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": "Evvel a szerkesztővel megnézheti vagy szerkesztheti egy elem jogosutságát, és szerkesztheti egy egyedi elem componenseinek jogosutságát: bundles és bitstreams. Röviden, egy elem a kötegek gyűjteménye, és a kötegek a bitsteramek gyűjteménye. A kötegeknek többnyire van ADD/REMOVE/READ/WRITE jogosultsága, miközben a bitstreameknek csak READ/WRITE jogosultsága.",
-  
+
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Jogosultásgok elem szerkesztése",
-  
-  
-  
-  // "item.badge.private": "Private",
+
+
+
+  // "item.badge.private": "Non-discoverable",
   "item.badge.private": "Privát",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Visszavont",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Csomag",
-  
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  "item.bitstreams.upload.bundle.placeholder": "Válasszon ki egy csomagot",
-  
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "Válasszon ki egy csomagot vagy írjon be egy új nevet",
+
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Hozzon létre csomagot",
-  
+
   // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Ez a tárgy nem tartalmaz csomagot, ahova bitfolyamot lehetne feltölteni.",
-  
+
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "Mégse",
-  
+
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "Húzza ide a feltöltendő állományt",
-  
+
   // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "Tárgy: ",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Új csomag sikeresen létrehozva.",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
   "item.bitstreams.upload.notifications.bundle.created.title": "Csomag létrehozva",
-  
+
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
   "item.bitstreams.upload.notifications.upload.failed": "Feltöltés nem sikerült. Kérjük ellenőrizze a tartalmát, mielőtt újra próbálkozna.",
-  
+
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Bitfolyam feltöltése",
-  
-  
-  
+
+
+
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Feltöltés",
-  
+
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
   "item.edit.bitstreams.bundle.displaying": "Jelenleg látható {{ amount }} Bitfolyam ennyiből: {{ total }}.",
-  
+
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "Valamennyi betöltése ({{ total }})",
-  
+
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Több betöltése",
-  
+
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "CSOMAG: {{ name }}",
-  
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Elvetés",
-  
+
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "Letöltés",
-  
+
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
   "item.edit.bitstreams.edit.buttons.drag": "Húzni",
-  
+
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "Szerkesztés",
-  
+
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "Eltávolítás",
-  
+
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Változtatások vissza",
-  
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Ez a tárgy nem tartalmaz bitfolyamot. Kattintson a feltöltés gombra, hogy hozzon létre egyet.",
-  
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Műveletek",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Csomag",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "Leírás",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   "item.edit.bitstreams.headers.format": "Formátum",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "Név",
-  
+
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.bitstreams.notifications.discarded.content": "Változtatásai elvetve. Visszaállításukhoz kattintson a 'visszaállítás' gombra",
-  
+
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "Változtatások elvetve",
-  
+
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Bitfolyam elmozdítása közben hiba történt",
-  
+
   // "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": "Művelete megváltoztatja a tárgy bitfolyamát és a csomagok el vannak mentve.",
-  
+
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
   "item.edit.bitstreams.notifications.move.saved.title": "Változtatások elmozdítása elmentve",
-  
+
   // "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": "A tárgyat amin jelenleg dolgozik egy másik felhasználó módosította. A jelenlegi változtatásokat elvetettük, hogy megelőzzük a konfliktusokat",
-  
+
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Változtatások idejemúltak",
-  
+
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
   "item.edit.bitstreams.notifications.remove.failed.title": "Bitfolyam törlése közben hiba történt",
-  
+
   // "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": "Az ön eltávolító változtatásai ennek a tárgynak a bitfolyamában el vannak mentve.",
-  
+
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "Eltávolító változtatások mentve",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   "item.edit.bitstreams.reinstate-button": "Visszaváltoztatás",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "Mentés",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Feltöltés",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Mégse",
-  
+
   // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "Törlés",
-  
+
   // "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": "Biztos benne, hogy ezt a tárgyat teljesen törölni óhajtja? Figyelem: jelenleg nem marad sírkő.",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Tárgy törlése közben hiba történt",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "Tárgy törlése: {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "Tárgy törölve",
-  
+
   // "item.edit.head": "Edit Item",
   "item.edit.head": "Tárgy szerkesztése",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "Tárgy szerkesztése",
-  
-  
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  // TODO New key - Add a translation
+  "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "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.identifiers.doi.status.UNKNOWN": "Unknown",
+  // TODO New key - Add a translation
+  "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+
+  // "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_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.IS_REGISTERED": "Registered",
+  // TODO New key - Add a translation
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+
+  // "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.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_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_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.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.DELETED": "Deleted",
+  // TODO New key - Add a translation
+  "item.edit.identifiers.doi.status.DELETED": "Deleted",
+
+  // "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.MINTED": "Minted (not registered)",
+  // TODO New key - Add a translation
+  "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+
+  // "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.button": "Register DOI...",
+  // TODO New key - Add a translation
+  "item.edit.tabs.status.buttons.register-doi.button": "Register 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.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.confirm": "Confirm",
+  // TODO New key - Add a translation
+  "item.edit.register-doi.confirm": "Confirm",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.edit.register-doi.cancel": "Cancel",
+
+  // "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.error": "Error registering DOI",
+  // TODO New key - Add a translation
+  "item.edit.register-doi.error": "Error registering 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.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Térképezze a tárgyat a kiválasztott gyűjteményekhez",
-  
+
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "Törölje a tárgy térképezését a kiválasztott gyűjteményekhez",
-  
+
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Mégse",
-  
+
   // "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": "Ez a térképező eszköz, amellyel az adminisztrátorok ezt a tárgyat más gyűjteményekhez térképezhetik. Kereshet gyűjteményeket amelyekhez térképezze, vagy böngészheti azon gyűjtemények listáját, amelyhez jelenleg hozzá van térképezve..",
-  
+
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Tárgytérképező - Térképezze a tárgyat gyűjteményekhez",
-  
+
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Tárgy: \"<b>{{name}}</b>\"",
-  
+
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Kérjük írja be a keresett szót",
-  
+
   // "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": "A tárgynak a {{amount}} gyűjteményekhez való térképezésekor hiba történt.",
-  
+
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Térképezési hibák",
-  
+
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.success.content": "Tárgy sikeresen térképezve {{amount}} gyűjteményhez.",
-  
+
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Térképezés befejeződött",
-  
+
   // "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": "A {{amount}} gyűjteményekhez való térképezés eltávolításakor hiba történt.",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "Térképezési hibák eltávolítása",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.remove.success.content": "A {{amount}} gyűjteményhez való térképezés sikeresen eltávolítva.",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Térképezés eltávolítása befejeződött",
-  
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  // TODO New key - Add a translation
+  "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Böngéssze a térképezett gyűjteményeket",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Térképezzen új gyűjteményeket",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Hozzáadás",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Elvetés",
-  
+
+  // "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.drag": "Drag to reorder",
+  // TODO New key - Add a translation
+  "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Szerkesztés",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Eltávolítás",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "Változtatások elvetése",
-  
+
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Szerkesztés leállítása",
-  
+
+  // "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.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Az elem jelenleg nem tartalmaz metaadatot. Kattintson a Hozzáad-ra metaadatok hozzáadásához.",
-  
+
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Szerkesztés",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   "item.edit.metadata.headers.field": "Mező",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Nyelv",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Érték",
-  
+
+  // "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.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Kérjük válasszon egy érvényes metaadat mezőt",
-  
+
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Módosításai elvetve. Visszaállításukhoz kattintson a 'Visszaállítás' gombra",
-  
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  "item.edit.metadata.notifications.discarded.title": "Módosítva elvetve",
-  
+
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "item.edit.metadata.notifications.discarded.title": "Módosítás elvetve",
+
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Hiba történt",
-  
+
   // "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": "Módosításai nincsenek elmentve, Kérjük mentés előtt ellenőrizze, hogy valamennyi mező érvényes.",
-  
+
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Érvénytelen metaadat",
-  
+
   // "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": "A tárgyon amin dolgozik egy másik felhasználó módosításokat eszközölt. Az ön módosításait elvetettük, hogy megelőzzük a konfliktust",
-  
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  "item.edit.metadata.notifications.outdated.title": "Módosítva idejemúlt",
-  
+
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "item.edit.metadata.notifications.outdated.title": "Módosítás idejemúlt",
+
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
   "item.edit.metadata.notifications.saved.content": "A tárgy metaadataiban eszközölt módosításai elmentve.",
-  
+
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metaadat elmentve",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Visszaállítás",
-  
+
+  // "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.save-button": "Save",
   "item.edit.metadata.save-button": "Mentés",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Mező",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "Nyelv",
-  
+
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Érték",
-  
-  
-  
-  // "item.edit.move.cancel": "Cancel",
-  "item.edit.move.cancel": "Mégse",
-  
+
+
+
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "Vissza",
+
+  // "item.edit.move.save-button": "Save",
+  // TODO New key - Add a translation
+  "item.edit.move.save-button": "Save",
+
+  // "item.edit.move.discard-button": "Discard",
+  // TODO New key - Add a translation
+  "item.edit.move.discard-button": "Discard",
+
   // "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": "Válassza ki a gyűjteményt amelyhez ezt a tárgyat hozzá kívánja adni. A látható gyűjtemények listájának szűkítéséhez írjon be keresőszót a mezőbe.",
-  
+
   // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "Tárgy mozgatásakor hiba történt",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "Tárgy mozgatása: {{id}}",
-  
+
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Szabályzatok öröklése",
-  
+
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Örökölje a célgyűjtemény alapértelmezett szabályzatát",
-  
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Mozgatás",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "Mozgatás...",
-  
+
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Írjon be keresőszót hogy gyűjteményeket találjon",
-  
+
   // "item.edit.move.success": "The item has been moved successfully",
   "item.edit.move.success": "Tárgy mozgatása sikerült",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Tárgy mozgatása",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Mégse",
-  
-  // "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": "Legyen privát",
-  
-  // "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": "Biztos legyen ez a tárgy privát ebben az archívumban?",
-  
-  // "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",
+  // TODO Source message changed - Revise the translation
   "item.edit.private.error": "A tárgy privát beállí1tása közben hiba történt",
-  
-  // "item.edit.private.header": "Make item private: {{ id }}",
-  "item.edit.private.header": "Legyen a tárgy privát: {{ id }}",
-  
-  // "item.edit.private.success": "The item is now private",
+
+  // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  // TODO New key - Add a translation
+  "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+
+  // "item.edit.private.success": "The item is now non-discoverable",
+  // TODO Source message changed - Revise the translation
   "item.edit.private.success": "Ezx a tárgy most privát",
-  
-  
-  
+
+
+
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Mégse",
-  
-  // "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": "legyen nyilvános",
-  
-  // "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": "ABiztos legyen ez a tárgy nyilvános ebben az archívumban?",
-  
-  // "item.edit.public.error": "An error occurred while making the item public",
+
+  // "item.edit.public.error": "An error occurred while making the item discoverable",
+  // TODO Source message changed - Revise the translation
   "item.edit.public.error": "Tárgy nyilvánossá tétele közben hiba történt",
-  
-  // "item.edit.public.header": "Make item public: {{ id }}",
-  "item.edit.public.header": "MLegyen a tárgy nyilvános: {{ id }}",
-  
-  // "item.edit.public.success": "The item is now public",
+
+  // "item.edit.public.header": "Make item discoverable: {{ id }}",
+  // TODO New key - Add a translation
+  "item.edit.public.header": "Make item discoverable: {{ id }}",
+
+  // "item.edit.public.success": "The item is now discoverable",
+  // TODO Source message changed - Revise the translation
   "item.edit.public.success": "A tárgy most nyilvános",
-  
-  
-  
+
+
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Mégse",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "Visszaállítás",
-  
+
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "Biztos vissza akarja állítani ezt a tárgyat az archívumba?",
-  
+
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Tárgy visszaállítása közben hiba történt",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "Tárgy visszaállítása: {{ id }}",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Tárgy visszaállítása sikerült",
-  
-  
-  
+
+
+
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Elvetés",
-  
+
   // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "Hozzáad",
-  
+
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Eltávolítás",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
   "item.edit.relationships.edit.buttons.undo": "Visszamódosítás",
-  
+
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "Nincs kapcsolat",
-  
+
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.relationships.notifications.discarded.content": "Módosításai elvetve. Visszaállításukhoz kattintson a 'Visszaállítás' gombra",
-  
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Módosítások elvetve",
-  
+
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
-  // TODO Source message changed - Revise the translation
-  "item.edit.relationships.notifications.failed.title": "Kapcsolat törlésekor hiba történt",
-  
+  "item.edit.relationships.notifications.failed.title": "Hiba a kapcsolat szerkesztésekor",
+
   // "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": "A tárgyon amin dolgozik egy másik felhasználó módosításokat eszközölt. Az ön módosításait elvetettük, hogy megelőzzük a konfliktust",
-  
+
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Módosítások idejétmúltak",
-  
+
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
   "item.edit.relationships.notifications.saved.content": "A tárgy kapcsolataiban eszközölt módosításai elmentve.",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "Kapcsolatok elmentve",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "Visszaállítás",
-  
+
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Mentés",
-  
+
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Adja hozzá a 'dspace.entity.type' metaadatot ezen elem hivatkozásánek engedélyezéséhez",
-  
-  
-  
+
+
+  // "item.edit.return": "Back",
+  // TODO New key - Add a translation
+  "item.edit.return": "Back",
+
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Bitfolyamok",
-  
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Tárgy szerkesztése - Bitfolyamok",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Gondozás",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Tárgy szerkesztése - Gondozás",
-  
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metaadat",
-  
+
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
   "item.edit.tabs.metadata.title": "Tárgy szerkesztése -  Metaadat",
-  
+
   // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "Kapcsolatok",
-  
+
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "Tárgy szerkesztése - kapcsolatok",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Engedélyezés...",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
   "item.edit.tabs.status.buttons.authorizations.label": "Szerkessze a tárgy engedélyezési szabályait",
-  
+
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
   "item.edit.tabs.status.buttons.delete.button": "Véglegesen töröl",
-  
+
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Tárgy teljes kitörlése",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.button": "Térképezett gyűjtemények",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Térképezett gyűjtemények szervezése",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+
+  // "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": "Elmozdítás...",
-  
+
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Tárgy másik gyűjteménybe költöztetése",
-  
-  // "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": "Legyen privát...",
-  
-  // "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": "Legyen a tárgy privát",
-  
-  // "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": "Legyen nyilvános...",
-  
-  // "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": "Legyen a tárgy nyilvános",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Visszaállí1tás...",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Tárgy visszaállítása az adattárba",
-  
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  // TODO New key - Add a translation
+  "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.withdraw.button": "Visszavonás...",
-  
+
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Tárgy visszavonása az adattárból",
-  
+
   // "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": "Üdvözöljük a tárgyak szervezése oldalon. Itt visszavonhat, visszaállíthat, költöztethet vagy törölhet tárgyakat. Ugyanitt frissíthet metaadatokat illetve bitfolyamokat a többi fülnél, vagy újakat adhat hozzá",
-  
+
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Állapot",
-  
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Mutató",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Tárgy belső azonosító",
-  
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Tárgy oldala",
-  
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Utoljára módosították",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "Tárgy szerkesztése -  Állapot",
-  
+
   // "item.edit.tabs.versionhistory.head": "Version History",
   "item.edit.tabs.versionhistory.head": "Változatok története",
-  
+
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
   "item.edit.tabs.versionhistory.title": "Tárgy szerkesztése - Változatok története",
-  
+
   // "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áltozatok szerkesztése, vagy újak hozzáadása ezen a felületen még nem lehetséges.",
-  
+
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "Tárgy megtekintése",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Tárgy szerkesztése -  Megtekintés",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Mégse",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "Visszavonás",
-  
+
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "Biztosan vissza akarja vonni ezt a tárgyat az archívumból?",
-  
+
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Tárgy visszavonásakor hiba történt",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "Tárgy visszavonása: {{ id }}",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Tárgy visszavonása sikerült",
-  
-  
-  
+
+  // "item.orcid.return": "Back",
+  // TODO New key - Add a translation
+  "item.orcid.return": "Back",
+
+
   // "item.listelement.badge": "Item",
-  "item.listelement.badge": "Elem",
-  
+  "item.listelement.badge": "Tétel",
+
   // "item.page.description": "Description",
   "item.page.description": "Leírás",
-  
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Elem szerkesztése",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "Folyóirat ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   "item.page.journal-title": "Folyóirat címe",
-  
+
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "Kiadó",
-  
+
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Elem: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Kötet címe",
-  
+
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Elem keresésének eredménye",
-  
-  // "item.search.title": "DSpace Angular :: Item Search",
+
+  // "item.search.title": "Item Search",
+  // TODO Source message changed - Revise the translation
   "item.search.title": "DSpace Angular :: Elem Keresése",
-  
-  
-  
+
+  // "item.truncatable-part.show-more": "Show more",
+  // TODO New key - Add a translation
+  "item.truncatable-part.show-more": "Show more",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  // TODO New key - Add a translation
+  "item.truncatable-part.show-less": "Collapse",
+
+  // "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.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.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+
+  // "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.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.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.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.remove-tooltip": "Remove supervision group",
+  // TODO New key - Add a translation
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+
+
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Kivonat",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Szerzők",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "Idézések",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Gyűjtemények",
-  
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Betöltés...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Továbbiak betöltése",
+
   // "item.page.date": "Date",
   "item.page.date": "Dátum",
-  
+
   // "item.page.edit": "Edit this item",
   "item.page.edit": "Elem szerkesztése",
-  
+
   // "item.page.files": "Files",
   "item.page.files": "Állományok",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Leírás:",
-  
+
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Letöltés",
-  
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Formátum:",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "Név:",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Méret:",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Cikkek ebben a kiadványban",
-  
+
   // "item.page.link.full": "Full item page",
-  "item.page.link.full": "Teljes tárgy oldala",
-  
+  "item.page.link.full": "A tétel részletes nézete",
+
   // "item.page.link.simple": "Simple item page",
-  "item.page.link.simple": "Egyszerű tárgy oldala",
-  
+  "item.page.link.simple": "A tétel rövid nézete",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  // TODO New key - Add a translation
+  "item.page.orcid.tooltip": "Open ORCID setting page",
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Cikkek ettől a szerzőtől",
-  
+
   // "item.page.related-items.view-more": "Show {{ amount }} more",
   "item.page.related-items.view-more": "Mutasson {{ amount }} többet",
-  
+
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
   "item.page.related-items.view-less": "Rejtse el az utolsó {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   "item.page.relationships.isAuthorOfPublication": "Publikációk",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   "item.page.relationships.isJournalOfPublication": "Publikációk",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "Szerzők",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   "item.page.relationships.isOrgUnitOfProject": "Kutatási projektek",
-  
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "Kulcsszavak",
-  
+
   // "item.page.uri": "URI",
   "item.page.uri": "URI",
-  
+
   // "item.page.bitstreams.view-more": "Show more",
-  "item.page.bitstreams.view-more": "Mutass többet",
-  
+  "item.page.bitstreams.view-more": "Tovább",
+
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Bezár",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Eredeti csomag",
-  
+  "item.page.filesection.original.bundle": "Eredeti csomag",
+
   // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.license.bundle" : "Licenccsomag",
-  
+  "item.page.filesection.license.bundle": "Licenccsomag",
+
+  // "item.page.return": "Back",
+  "item.page.return": "Vissza",
+
+  // "item.page.version.create": "Create new version",
+  // 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",
+  // 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.claim.button": "Claim",
+  // TODO New key - Add a translation
+  "item.page.claim.button": "Claim",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  // TODO New key - Add a translation
+  "item.page.claim.tooltip": "Claim this item as profile",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Azonosító:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "Szerzők:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "Kiadás dátuma:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "Kivonat:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "Más azonosító:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "Nyelv:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   "item.preview.dc.subject": "Téma:",
-  
+
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Cím:",
-  
+
+  // "item.preview.dc.type": "Type:",
+  // TODO New key - Add a translation
+  "item.preview.dc.type": "Type:",
+
+  // "item.preview.oaire.citation.issue" : "Issue",
+  // TODO New key - Add a translation
+  "item.preview.oaire.citation.issue": "Issue",
+
+  // "item.preview.oaire.citation.volume" : "Volume",
+  // TODO New key - Add a translation
+  "item.preview.oaire.citation.volume": "Volume",
+
+  // "item.preview.dc.relation.issn" : "ISSN",
+  // TODO New key - Add a translation
+  "item.preview.dc.relation.issn": "ISSN",
+
+  // "item.preview.dc.identifier.isbn" : "ISBN",
+  // TODO New key - Add a translation
+  "item.preview.dc.identifier.isbn": "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  // TODO New key - Add a translation
+  "item.preview.dc.identifier": "Identifier:",
+
+  // "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  // TODO New key - Add a translation
+  "item.preview.dc.relation.ispartof": "Journal or Serie",
+
+  // "item.preview.dc.identifier.doi" : "DOI",
+  // TODO New key - Add a translation
+  "item.preview.dc.identifier.doi": "DOI",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Keresztnév:",
-  
+
   // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "Vezetéknév:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+  // "item.preview.project.funder.name": "Funder:",
+  // TODO New key - Add a translation
+  "item.preview.project.funder.name": "Funder:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  // TODO New key - Add a translation
+  "item.preview.project.funder.identifier": "Funder Identifier:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  // TODO New key - Add a translation
+  "item.preview.oaire.awardNumber": "Funding ID:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  // TODO New key - Add a translation
+  "item.preview.dc.title.alternative": "Acronym:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  // TODO New key - Add a translation
+  "item.preview.dc.coverage.spatial": "Jurisdiction:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  // TODO New key - Add a translation
+  "item.preview.oaire.fundingStream": "Funding Stream:",
+
+
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Kiválasztás igazolása",
-  
+
   // "item.select.empty": "No items to show",
   "item.select.empty": "Nincs megtekinthető tárgy",
-  
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Szerző",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "Gyűjtemény",
-  
+
   // "item.select.table.title": "Title",
   "item.select.table.title": "Cím",
-  
-  
+
+
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Ennek a tárgynak még nincs más változata.",
-  
+
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Változatok története",
-  
-  // "item.version.history.return": "Return",
+
+  // "item.version.history.return": "Back",
+  // TODO Source message changed - Revise the translation
   "item.version.history.return": "Vissza",
-  
+
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Kiválasztott változat",
-  
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  // TODO New key - Add a translation
+  "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Változat",
-  
+
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "Tárgy",
-  
+
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "Kiadó",
-  
+
   // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "Dátum",
-  
+
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Összefoglaló",
-  
-  
-  
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  // TODO New key - Add a translation
+  "item.version.history.table.workspaceItem": "Workspace item",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
+  // TODO New key - Add a translation
+  "item.version.history.table.workflowItem": "Workflow item",
+
+  // "item.version.history.table.actions": "Action",
+  // TODO New key - Add a translation
+  "item.version.history.table.actions": "Action",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  // TODO New key - Add a translation
+  "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  // TODO New key - Add a translation
+  "item.version.history.table.action.editSummary": "Edit summary",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  // TODO New key - Add a translation
+  "item.version.history.table.action.saveSummary": "Save summary edits",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  // TODO New key - Add a translation
+  "item.version.history.table.action.discardSummary": "Discard summary edits",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  // TODO New key - Add a translation
+  "item.version.history.table.action.newVersion": "Create new version from this one",
+
+  // "item.version.history.table.action.deleteVersion": "Delete version",
+  // 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",
+  // 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.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   "item.version.notice": "Ez nem ennek a tárgynak a legutóbbi változata. A legutóbbi változat megtalálható itt <a href='{{destination}}'>here</a>.",
-  
-  
-  
+
+
+  // "item.version.create.modal.header": "New version",
+  // TODO New key - Add a translation
+  "item.version.create.modal.header": "New version",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  // TODO New key - Add a translation
+  "item.version.create.modal.text": "Create a new version for this item",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  // TODO New key - Add a translation
+  "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  // TODO New key - Add a translation
+  "item.version.create.modal.button.confirm": "Create",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  // TODO New key - Add a translation
+  "item.version.create.modal.button.confirm.tooltip": "Create new version",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.version.create.modal.button.cancel": "Cancel",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  // TODO New key - Add a translation
+  "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  // TODO New key - Add a translation
+  "item.version.create.modal.form.summary.label": "Summary",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  // TODO New key - Add a translation
+  "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  // TODO New key - Add a translation
+  "item.version.create.modal.submitted.header": "Creating new version...",
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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.notification.success" : "New version has been created with version number {{version}}",
+  // TODO New key - Add a translation
+  "item.version.create.notification.success": "New version has been created with version number {{version}}",
+
+  // "item.version.create.notification.failure" : "New version has not been created",
+  // 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",
+  // 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.delete.modal.header": "Delete version",
+  // TODO New key - Add a translation
+  "item.version.delete.modal.header": "Delete version",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  // TODO New key - Add a translation
+  "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  // TODO New key - Add a translation
+  "item.version.delete.modal.button.confirm": "Delete",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  // TODO New key - Add a translation
+  "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "item.version.delete.modal.button.cancel": "Cancel",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  // TODO New key - Add a translation
+  "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+
+  // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
+  // TODO New key - Add a translation
+  "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+
+  // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
+  // TODO New key - Add a translation
+  "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+
+
+  // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
+  // TODO New key - Add a translation
+  "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+
+  // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  // TODO New key - Add a translation
+  "item.version.edit.notification.failure": "The summary of version number {{version}} has not been changed",
+
+
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.add-button": "Add",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.discard-button": "Discard",
+
+  // "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.drag": "Drag to reorder",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+
+  // "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.remove": "Remove",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+
+  // "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.unedit": "Stop editing",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+
+  // "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.headers.edit": "Edit",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.headers.edit": "Edit",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.headers.field": "Field",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.headers.language": "Lang",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.headers.value": "Value",
+
+  // "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.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.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.title": "Changed discarded",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Changed discarded",
+
+  // "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.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.title": "Metadata invalid",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+
+  // "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.title": "Changed outdated",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Changed outdated",
+
+  // "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.title": "Metadata saved",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.reinstate-button": "Undo",
+
+  // "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.save-button": "Save",
+  // TODO New key - Add a translation
+  "itemtemplate.edit.metadata.save-button": "Save",
+
+
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Folyóirat",
-  
+
   // "journal.page.description": "Description",
   "journal.page.description": "Leírás",
-  
+
   // "journal.page.edit": "Edit this item",
   "journal.page.edit": "Elem szerkesztése",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Főszerkesztő",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Kiadó",
-  
+
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Folyóirat: ",
-  
+
   // "journal.search.results.head": "Journal Search Results",
-  "journal.search.results.head": "Folyóirat keresési eredmények",
-  
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace Angular :: Folyóirat keresés",
-  
-  
-  
+  "journal.search.results.head": "Folyóirat keresés eredménye",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Folyóirat keresés eredménye",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Folyóirat keresés",
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Folyóirat szám",
-  
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Leírás",
-  
+
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Elem szerkesztése",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Megjelenés dátuma",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "Folyóirat ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   "journalissue.page.journal-title": "Folyóirat címe",
-  
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "Kulcsszavak",
-  
+
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Szám",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Folyóirat száma: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Folyóirat kötet",
-  
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Leírás",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "Elem szerkesztése",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Megjelenés dátuma",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   "journalvolume.page.titleprefix": "Folyóirat kötet: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Kötet",
-  
-  
-  
+
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  // TODO New key - Add a translation
+  "iiifsearchable.listelement.badge": "Document Media",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  // TODO New key - Add a translation
+  "iiifsearchable.page.titleprefix": "Document: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  // TODO New key - Add a translation
+  "iiifsearchable.page.doi": "Permanent Link: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  // TODO New key - Add a translation
+  "iiifsearchable.page.issue": "Issue: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  // TODO New key - Add a translation
+  "iiifsearchable.page.description": "Description: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  // TODO New key - Add a translation
+  "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+
+  // "iiif.listelement.badge": "Image Media",
+  // TODO New key - Add a translation
+  "iiif.listelement.badge": "Image Media",
+
+  // "iiif.page.titleprefix": "Image: ",
+  // TODO New key - Add a translation
+  "iiif.page.titleprefix": "Image: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  // TODO New key - Add a translation
+  "iiif.page.doi": "Permanent Link: ",
+
+  // "iiif.page.issue": "Issue: ",
+  // TODO New key - Add a translation
+  "iiif.page.issue": "Issue: ",
+
+  // "iiif.page.description": "Description: ",
+  // TODO New key - Add a translation
+  "iiif.page.description": "Description: ",
+
+
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Bitfolyam betöltése...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "Bitfolyamok betöltése...",
-  
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Tárgy betöltése...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Oldal betöltése...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "Gyűjtemény betöltése...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "Gyűjtemények betöltése...",
-  
+
   // "loading.content-source": "Loading content source...",
   "loading.content-source": "tartalom forrásának betöltése...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "Közösség betöltése...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "Betöltés...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "Tárgy betöltése...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "Tárgyak betöltése...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "Tárgyak betöltése...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "betöltés...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "Legújabb feltöltések betöltése...",
-  
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "keresési eredmények betöltése...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "Algyűjtemények betöltése...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities": "Alközösségek betöltése...",
-  
+  "loading.sub-communities": "Alkategóriák betöltése...",
+
   // "loading.top-level-communities": "Loading top-level communities...",
-  "loading.top-level-communities": "Csúcsszintű közösségek betöltése...",
-  
-  
-  
+  "loading.top-level-communities": "Csúcsszintű kategóriák betöltése...",
+
+
+
   // "login.form.email": "Email address",
-  "login.form.email": "Email cím",
-  
+  "login.form.email": "E-mail cím",
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "Elfelejtette a jelszót?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Lépjen be a DSpace-re",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user": "Új felhasználó? Kattintson ide a regisztráláshoz.",
-  
+  "login.form.new-user": "Új felhasználó? Regisztráljon.",
+
   // "login.form.or-divider": "or",
   "login.form.or-divider": "vagy",
-  
+
+  // "login.form.oidc": "Log in with OIDC",
+  // TODO New key - Add a translation
+  "login.form.oidc": "Log in with OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  // TODO New key - Add a translation
+  "login.form.orcid": "Log in with ORCID",
+
   // "login.form.password": "Password",
   "login.form.password": "Jelszó",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "Lépjen be Shibboleth-el",
-  
+
   // "login.form.submit": "Log in",
-  "login.form.submit": "Belépés",
-  
+  "login.form.submit": "Bejelentkezés",
+
   // "login.title": "Login",
-  "login.title": "Belépés",
-  
+  "login.title": "Bejelentkezés",
+
   // "login.breadcrumbs": "Login",
-  "login.breadcrumbs": "Belépés",
-  
-  
-  
+  "login.breadcrumbs": "Bejelentkezés",
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Kilépés a DSpace-ből",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Kilépés",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Kilépés",
-  
-  
-  
-  // "menu.header.admin": "Admin",
+
+
+
+  // "menu.header.admin": "Management",
+  // TODO Source message changed - Revise the translation
   "menu.header.admin": "Admin",
-  
+
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Adattár logo",
-  
-  
-  
+
+  // "menu.header.admin.description": "Management menu",
+  // TODO New key - Add a translation
+  "menu.header.admin.description": "Management menu",
+
+
+
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Hozzáférési kontroll",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Engedélyezések",
-  
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "csoportok",
-  
+
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Emberek",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
   "menu.section.admin_search": "Admin keresés",
-  
-  
-  
+
+
+
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "ez a közösség",
-  
+
   // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "Szerző szerint",
-  
+
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "Megjelenés dátuma szerint",
-  
+
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Cím szerint",
-  
+
   // "menu.section.browse_global": "All of DSpace",
-  "menu.section.browse_global": "A teljes DSpace",
-  
+  "menu.section.browse_global": "Böngészés",
+
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "Szerző szerint",
-  
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "Megjelenés dátuma szerint",
-  
+
   // "menu.section.browse_global_by_subject": "By Subject",
-  "menu.section.browse_global_by_subject": "Tárgy szerint",
-  
+  "menu.section.browse_global_by_subject": "Tárgyszó szerint",
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Cím szerint",
-  
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  "menu.section.browse_global_communities_and_collections": "Közösségek & Gyűjtemények",
-  
-  
-  
+  "menu.section.browse_global_communities_and_collections": "Kategóriák & Gyűjtemények",
+
+
+
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Vezérlőpult",
-  
+
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Gondozási feladat",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Szerkesztés",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Gyűjtemény",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "Közösség",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Tárgy",
-  
-  
-  
+
+
+
   // "menu.section.export": "Export",
   "menu.section.export": "Export",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "Gyűjtemény",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "Közösség",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "Tárgy",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metaadat",
-  
-  
-  
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  // TODO New key - Add a translation
+  "menu.section.export_batch": "Batch Export (ZIP)",
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Hozzáférés kontroll menü felület",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Admin keresés menü felület",
-  
+
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Vezérlőpult menü felület",
-  
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  "menu.section.icon.curation_task": "Gondozási feladat menü felület",
-  
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.curation_tasks": "Curation Task menu section",
+
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Szerkesztés menü felület",
-  
+
   // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "Export menü felület",
-  
+
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Keresés menü felület",
-  
+
+  // "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.import": "Import menu section",
   "menu.section.icon.import": "Import menü felület",
-  
+
   // "menu.section.icon.new": "New menu section",
   "menu.section.icon.new": "Új menü felület",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Oldalsáv rögzítése",
-  
-  // "menu.section.icon.processes": "Processes menu section",
+
+  // "menu.section.icon.processes": "Processes Health",
+  // TODO Source message changed - Revise the translation
   "menu.section.icon.processes": "Menü felület feldolgozása",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Leíró adatbázis menü felület",
-  
+
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "Statisztikai feladatok menü felület",
-  
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.workflow": "Administer workflow menu section",
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Oldalbár rögzítés megszüntetése",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Csomag Import (ZIP)",
-  
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metaadat",
-  
-  
-  
+
+
+
   // "menu.section.new": "New",
   "menu.section.new": "Új",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Gyűjtemény",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "Közösség",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "Tárgy",
-  
+
   // "menu.section.new_item_version": "Item Version",
   "menu.section.new_item_version": "Tárgy változat",
-  
+
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Folyamat",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Oldalsáv rögzítése",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Oldalsáv rögzítés megszüntetése",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Folyamatok",
-  
-  
-  
+
+  // "menu.section.health": "Health",
+  // TODO New key - Add a translation
+  "menu.section.health": "Health",
+
+
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Leíró adatbázisok",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formátum",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metaadat",
-  
-  
-  
+
+
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Statisztikák",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Statisztikai feladatok",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Váltás a Hozzáférés kontrol felületre",
-  
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Váltás a Vezérlőpult felületre",
-  
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "Gondozási feladat felületre váltás",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Szerkesztés felületre váltás",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "Export felületre váltás",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "Kereső felületre váltás",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "Import felületre váltás",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "Új felületre váltás",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Leíró adatbázisok felületre váltás",
-  
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Statisztikai feladatok felületre váltás",
-  
-  
+
+
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Munkafolyamat irányítása",
-  
-  
+
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  // TODO New key - Add a translation
+  "metadata-export-search.tooltip": "Export search results as CSV",
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  // TODO New key - Add a translation
+  "metadata-export-search.submit.success": "The export was started successfully",
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  // TODO New key - Add a translation
+  "metadata-export-search.submit.error": "Starting the export has failed",
+
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  // TODO New key - Add a translation
+  "mydspace.breadcrumbs": "MyDSpace",
+
   // "mydspace.description": "",
   "mydspace.description": "",
-  
-  // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here": "itt",
-  
+
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Válassza ezt, hogy üzenjen a tárgy feltöltőjének.",
-  
+
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Írja ide az üzenetét...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "Rejtse el az üzenetet",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "Jelölje meg elolvasottként",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "Jelölje meg el nem olvasottként",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Nincs tartalom.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Még nincs üzenet.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "Elküld",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "Üzenetet megjelenít",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "Tárgy...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "Válassza ezt, hogy üzenjen a kontrollernek.",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Üzenetek",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "Címzett",
-  
+
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "Új feltöltés",
-  
+
   // "mydspace.new-submission-external": "Import metadata from external source",
   "mydspace.new-submission-external": "Metaadat importálása külső forrásból",
-  
+
   // "mydspace.new-submission-external-short": "Import metadata",
   "mydspace.new-submission-external-short": "Metaadat importálása",
-  
+
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "Az ön feltöltései",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Nincs kivonat",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "Nincsenek szerzők",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   "mydspace.results.no-collections": "Nincs gyűjtemény",
-  
+
   // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "Nincs dátum",
-  
+
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Nincs állomány",
-  
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "Nincs megjeleníthető tárgy",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Nincs cím",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Nincs Uri",
-  
-  // "mydspace.show.workflow": "All tasks",
+
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  // TODO New key - Add a translation
+  "mydspace.search-form.placeholder": "Search in mydspace...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  // TODO Source message changed - Revise the translation
   "mydspace.show.workflow": "Valamennyi feladat",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Az ön feltöltései",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Tárolva",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Érvényesítés",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Várakozás a kontrollerre",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Munkafolyamat",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Munkafelület",
-  
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  // TODO New key - Add a translation
+  "mydspace.show.supervisedWorkspace": "Supervised items",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Tárolva",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Érvényesítés",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Várakozás a kontrollerre",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Munkafolyamat",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Munkafelület",
+
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
-  
+
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Új munkafelület létrehozásakor hiba történt. Kérjük ellenőrizze a tartalmat mielőtt újra próbálkozna.",
-  
+
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
   "mydspace.upload.upload-failed-manyentries": "Feldolgozhatalan fájl. Több elem észlelve, de fájlonként csak egy engedélyezve.",
-  
+
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
   "mydspace.upload.upload-failed-moreonefile": "Feldolgozhatalan kérés. Csak egy fájl van engedélyezve.",
-  
+
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} Új munkafelület tárgyak létrehozva.",
-  
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  "mydspace.upload.upload-successful": "Új munkafelület tárgy létrehozva. Kattintson {{here}} hogy szerkessze.",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Megtekintés",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
-  "nav.browse.header": "A teljes DSpace",
-  
+  "nav.browse.header": "Böngészés",
+
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Közösség szerint",
-  
+
+  // "nav.context-help-toggle": "Toggle context help",
+  // TODO New key - Add a translation
+  "nav.context-help-toggle": "Toggle context help",
+
   // "nav.language": "Language switch",
   "nav.language": "Nyelvváltás",
-  
+
   // "nav.login": "Log In",
-  "nav.login": "Belépés",
-  
+  "nav.login": "Bejelentkezés",
+
+  // "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.logout": "Log Out",
   "nav.logout": "Kilépés",
-  
+
+  // "nav.main.description": "Main navigation bar",
+  // TODO New key - Add a translation
+  "nav.main.description": "Main navigation bar",
+
   // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
   "nav.profile": "Profil",
-  
+
   // "nav.search": "Search",
   "nav.search": "Keresés",
-  
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Statisztika",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "EPerson megszemélyesítésének leállítása",
-  
-  
-  
+
+  // "nav.subscriptions" : "Subscriptions",
+  // TODO New key - Add a translation
+  "nav.subscriptions": "Subscriptions",
+
+  // "nav.toggle" : "Toggle navigation",
+  // TODO New key - Add a translation
+  "nav.toggle": "Toggle navigation",
+
+  // "nav.user.description" : "User profile bar",
+  // TODO New key - Add a translation
+  "nav.user.description": "User profile bar",
+
+  // "none.listelement.badge": "Item",
+  // TODO New key - Add a translation
+  "none.listelement.badge": "Item",
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Szervezeti egység",
-  
+
+  // "orgunit.listelement.no-title": "Untitled",
+  // TODO New key - Add a translation
+  "orgunit.listelement.no-title": "Untitled",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Város",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "Ország",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Alapítási dátum",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "Leírás",
-  
+
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "Elem szerkesztése",
-  
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "Azonosító",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Szervezeti egység: ",
-  
-  
-  
+
+
+
+  // "pagination.options.description": "Pagination options",
+  // TODO New key - Add a translation
+  "pagination.options.description": "Pagination options",
+
   // "pagination.results-per-page": "Results Per Page",
-  "pagination.results-per-page": "Eredmények oldalanként",
-  
+  "pagination.results-per-page": "Találatok oldalanként",
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} ennyiből {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Jelenleg látható ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Rendszerezési lehetőségek",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Személy",
-  
+
   // "person.listelement.no-title": "No name found",
   "person.listelement.no-title": "A névre nincs találat",
-  
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Születés dátuma",
-  
+
   // "person.page.edit": "Edit this item",
   "person.page.edit": "Elem szerkesztése",
-  
+
   // "person.page.email": "Email Address",
-  "person.page.email": "Email cím",
-  
+  "person.page.email": "E-mail cím",
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "Keresztnév",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "Munkakör",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Családnév",
-  
+
+  // "person.page.name": "Name",
+  // TODO New key - Add a translation
+  "person.page.name": "Name",
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "valamennyi metaadat megjelenítése",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "Személyzeti azonosító",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "Személy: ",
-  
+
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Személy keresési eredmények",
-  
-  // "person.search.title": "DSpace Angular :: Person Search",
+
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Személy keresési eredménye",
+
+  // "person.search.title": "Person Search",
+  // TODO Source message changed - Revise the translation
   "person.search.title": "DSpace Angular :: Személy keresése",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Paraméterek",
-  
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Mégsem",
-  
-  // "process.new.submit": "Submit",
+
+  // "process.new.submit": "Save",
+  // TODO Source message changed - Revise the translation
   "process.new.submit": "Beküld",
-  
+
   // "process.new.select-script": "Script",
   "process.new.select-script": "Szkript",
-  
+
   // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "Szkript kiválasztása...",
-  
+
   // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "Szkript szükséges",
-  
+
   // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "Fájl kiválasztása...",
-  
+
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Kérem válasszon egy fájlt",
-  
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "Szüséges egy paraméter érték",
-  
+
   // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "érték",
-  
+
   // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "fájl",
-  
+
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "A következő paraméter szükséges:",
-  
+
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Sikerült",
-  
+
   // "process.new.notification.success.content": "The process was successfully created",
   "process.new.notification.success.content": "A folyamat sikeresen létrehozva",
-  
+
   // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "Hiba",
-  
+
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Hiba történt a folyamat létrehozásakor",
-  
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Új folyamat létrehozása",
-  
+
   // "process.new.title": "Create a new process",
   "process.new.title": "Új folyamat létrehozása",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Új folyamat létrehozása",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "Érvek",
-  
+  "process.detail.arguments": "Érvek",
+
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Ez a folyamat nem tartalmaz érveket",
-  
+  "process.detail.arguments.empty": "Ez a folyamat nem tartalmaz érveket",
+
   // "process.detail.back" : "Back",
-  "process.detail.back" : "Vissza",
-  
+  "process.detail.back": "Vissza",
+
   // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Folyamat eredménye",
-  
+  "process.detail.output": "Folyamat eredménye",
+
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Folyamatkimenet lekérése",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "Lekérés",
-  
+
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Ennek a folyamatnak nincs kimenete",
-  
+
   // "process.detail.output-files" : "Output Files",
-  "process.detail.output-files" : "Kimeneti fájlok",
-  
+  "process.detail.output-files": "Kimeneti fájlok",
+
   // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "Ennek a folyamatnak nincsenek kimeneti fájljai",
-  
+  "process.detail.output-files.empty": "Ennek a folyamatnak nincsenek kimeneti fájljai",
+
   // "process.detail.script" : "Script",
-  "process.detail.script" : "Szkript",
-  
+  "process.detail.script": "Szkript",
+
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Folyamat: {{ id }} - {{ name }}",
-  
+  "process.detail.title": "Folyamat: {{ id }} - {{ name }}",
+
   // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Kezdési idő",
-  
+  "process.detail.start-time": "Kezdési idő",
+
   // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Végzési idő",
-  
+  "process.detail.end-time": "Végzési idő",
+
   // "process.detail.status" : "Status",
-  "process.detail.status" : "Állapot",
-  
+  "process.detail.status": "Állapot",
+
   // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Hasonló folyamat létrehozása",
-  
-  
-  
-  // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish" : "Végzési idő",
-  
+  "process.detail.create": "Hasonló folyamat létrehozása",
+
+  // "process.detail.actions": "Actions",
+  // TODO New key - Add a translation
+  "process.detail.actions": "Actions",
+
+  // "process.detail.delete.button": "Delete process",
+  // TODO New key - Add a translation
+  "process.detail.delete.button": "Delete process",
+
+  // "process.detail.delete.header": "Delete process",
+  // TODO New key - Add a translation
+  "process.detail.delete.header": "Delete process",
+
+  // "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.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "process.detail.delete.cancel": "Cancel",
+
+  // "process.detail.delete.confirm": "Delete process",
+  // TODO New key - Add a translation
+  "process.detail.delete.confirm": "Delete process",
+
+  // "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.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.overview.table.finish" : "Finish time (UTC)",
+  // TODO Source message changed - Revise the translation
+  "process.overview.table.finish": "Végzési idő",
+
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "Folyamat ID",
-  
+  "process.overview.table.id": "Folyamat ID",
+
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Név",
-  
-  // "process.overview.table.start" : "Start time",
-  "process.overview.table.start" : "Kezdési idő",
-  
+  "process.overview.table.name": "Név",
+
+  // "process.overview.table.start" : "Start time (UTC)",
+  // TODO Source message changed - Revise the translation
+  "process.overview.table.start": "Kezdési idő",
+
   // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Állapot",
-  
+  "process.overview.table.status": "Állapot",
+
   // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Felhasználó",
-  
+  "process.overview.table.user": "Felhasználó",
+
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Folyaamt áttekintő",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "Folyamat áttekintő",
-  
+
   // "process.overview.new": "New",
   "process.overview.new": "Új",
-  
-  
+
+  // "process.overview.table.actions": "Actions",
+  // TODO New key - Add a translation
+  "process.overview.table.actions": "Actions",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  // TODO New key - Add a translation
+  "process.overview.delete": "Delete {{count}} processes",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  // TODO New key - Add a translation
+  "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.",
+  // 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.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.header": "Delete processes",
+  // TODO New key - Add a translation
+  "process.overview.delete.header": "Delete processes",
+
+  // "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.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.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",
+
+
+
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profil frissítése",
-  
+
   // "profile.card.identify": "Identify",
   "profile.card.identify": "Azonosít",
-  
+
   // "profile.card.security": "Security",
   "profile.card.security": "Biztonság",
-  
-  // "profile.form.submit": "Update Profile",
+
+  // "profile.form.submit": "Save",
+  // TODO Source message changed - Revise the translation
   "profile.form.submit": "Profil frissítése",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Felhatalmazási csoportok amelyekhez ön tartozik",
-  
+
+  // "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.head": "Update Profile",
   "profile.head": "Profil frissítése",
-  
+
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Keresztnév kötelező",
-  
+
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
   "profile.metadata.form.error.lastname.required": "Családnév kötelező",
-  
+
   // "profile.metadata.form.label.email": "Email Address",
-  "profile.metadata.form.label.email": "Email cím",
-  
+  "profile.metadata.form.label.email": "E-mail cím",
+
   // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "Keresztnév",
-  
+
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "Nyelv",
-  
+
   // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "Családnév",
-  
+
   // "profile.metadata.form.label.phone": "Contact Telephone",
   "profile.metadata.form.label.phone": "Telefonos elérhetőség",
-  
+
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
   "profile.metadata.form.notifications.success.content": "Profilmódosítások elmentve.",
-  
+
   // "profile.metadata.form.notifications.success.title": "Profile saved",
   "profile.metadata.form.notifications.success.title": "Profil elmentve",
-  
+
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
   "profile.notifications.warning.no-changes.content": "Profil nem módosult.",
-  
+
   // "profile.notifications.warning.no-changes.title": "No changes",
   "profile.notifications.warning.no-changes.title": "Nincs változtatás",
-  
+
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "A jelszavak nem találnak.",
-  
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "A jelszó legalább 6 karakter hosszú kell, hogy legyen",
-  
-  // "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": "Opcionálisan beírhatja jelszavát az alsó mezőbe majd igazolhatja azt, beírva a második mezőbe. Legalább hat karakter hosszú kell, hogy legyen.",
-  
+
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Jelszó",
-  
+
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Írja be újra a jelszót",
-  
+
+  // "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.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Jelszó módosítása elmentve.",
-  
+
   // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "Jelszó elmentve",
-  
+
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Jelszó megváltoztatásakor hiba történt",
-  
-  // "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": "A jelszó legalább 8 karakter kell, hogy legyen.",
-  
+
+  // "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.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "A megadott jelszavak nem azonosak.",
-  
+
+  // "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.title": "Update Profile",
   "profile.title": "Profil frissítése",
-  
-  
-  
+
+  // "profile.card.researcher": "Researcher Profile",
+  // TODO New key - Add a translation
+  "profile.card.researcher": "Researcher Profile",
+
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Kutatási projekt",
-  
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Közreműködők",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "Leírás",
-  
+
   // "project.page.edit": "Edit this item",
   "project.page.edit": "Elem szerkesztése",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Várható befejezés",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "Támogatók",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "Azonosító",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Kulcsszavak",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "Állapot",
-  
+
   // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "Kutatási projekt: ",
-  
+
   // "project.search.results.head": "Project Search Results",
-  "project.search.results.head": "Projekt keresési eredmények",
-  
-  
-  
+  "project.search.results.head": "Projekt keresési eredménye",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Projekt keresési eredménye",
+
+
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publikáció",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "Leírás",
-  
+
   // "publication.page.edit": "Edit this item",
   "publication.page.edit": "Elem szerkesztése",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "Folyóirat ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   "publication.page.journal-title": "Folyóirat címe",
-  
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Kiadó",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publikáció: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Kötet címe",
-  
+
   // "publication.search.results.head": "Publication Search Results",
-  "publication.search.results.head": "Publikáció keresési eredmények",
-  
-  // "publication.search.title": "DSpace Angular :: Publication Search",
+  "publication.search.results.head": "Publikáció keresés eredménye",
+
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Publikáció keresés eredménye",
+
+  // "publication.search.title": "Publication Search",
+  // TODO Source message changed - Revise the translation
   "publication.search.title": "DSpace Angular :: Publikáció keresése",
-  
-  
+
+
+  // "media-viewer.next": "Next",
+  // TODO New key - Add a translation
+  "media-viewer.next": "Next",
+
+  // "media-viewer.previous": "Previous",
+  // TODO New key - Add a translation
+  "media-viewer.previous": "Previous",
+
+  // "media-viewer.playlist": "Playlist",
+  // TODO New key - Add a translation
+  "media-viewer.playlist": "Playlist",
+
+
   // "register-email.title": "New user registration",
   "register-email.title": "Új felhasználó regisztrálása",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "Profil létrehozása",
-  
+
   // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "Azonosítás",
-  
+
   // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "E-mail cím",
-  
+
   // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "Keresztnév *",
-  
+
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
   "register-page.create-profile.identification.first-name.error": "Írja be a keresztnevet",
-  
+
   // "register-page.create-profile.identification.last-name": "Last Name *",
   "register-page.create-profile.identification.last-name": "Családnév *",
-  
+
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
   "register-page.create-profile.identification.last-name.error": "Írja be a családnevet",
-  
+
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "Telefonszám",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "Nyelv",
-  
+
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Biztonság",
-  
-  // "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": "Írjon be egy jelszót a lenti mezőbe, és írja be újra az alatta levőbe. Legalább hat karakter hosszú kell legyen.",
-  
+
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Jelszó *",
-  
+
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
   "register-page.create-profile.security.label.passwordrepeat": "Jelszó visszaigazolása *",
-  
+
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
   "register-page.create-profile.security.error.empty-password": "Írja be a jelszót a lenti mezőbe.",
-  
+
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "A jelszavak nem egyeznek.",
-  
-  // "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": "A jelszó legalább 6 karakter hosszú kell legyen.",
-  
+
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Regisztráció befejezése",
-  
+
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
   "register-page.create-profile.submit.error.content": "Hiba történt a regisztrációs folyamat során.",
-  
+
   // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "Hibás regisztráció",
-  
+
   // "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": "Sikeres regisztráció. Beléphet a létrehozott felhasználóval.",
-  
+
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Sikeres regisztráció",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Új felhasználó regisztrálása",
-  
+
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
   "register-page.registration.info": "Hozzon létre egy felhasználót, hogy feliratkozhasson gyűjtemények e-mail értesítésére, és új elemeket tölthessen fel a DSpace-be.",
-  
+
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "E-mail cím *",
-  
+
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Töltse ki az e-mail címet",
-  
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Írjon be egy érvényes e-mail címet",
-  
+
+  // "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-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.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Az e-mail cím ellenőrizve lesz és evvel tud belépni a rendszerbe.",
-  
+
   // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "Regisztráció",
-  
+
   // "register-page.registration.success.head": "Verification email sent",
   "register-page.registration.success.head": "Ellenőrző e-mail elküldve",
-  
+
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "register-page.registration.success.content": "Egy e-mail elküldve a(z) {{ email }} címre, tartalmaz egy speciális címet a további utasításokhoz.",
-  
+
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Hiba történt az e-mail cím regisztrációjakor",
-  
+
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Hiba történt a következő e-mail cím regisztrációjakor: {{ 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.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.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.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.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.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.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",
+
   // "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.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.title": "Unable to add relationship",
   // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
-  
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Szerzők",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   "relationships.isAuthorOf.Person": "Szerzők (személye)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "Szerzők (szervezeti egységek)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Folyóirat számok",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Folyóirat szám",
-  
+
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Folyóiratok",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Szervezeti egységek",
-  
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "Szerzők",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   "relationships.isProjectOf": "Kutatási projektek",
-  
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Publikációk",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "Cikkek",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   "relationships.isSingleJournalOf": "Folyóirat",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Folyóirat kötet",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Folyóirat kötetek",
-  
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Közreműködők",
-  
-  
-  
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Hozzájáruló (Szervezet)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Hozzájáruló",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  // TODO New key - Add a translation
+  "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Adattár logó",
+
+  // "repository.title.prefix": "DSpace Angular :: ",
+  "repository.title.prefix": "EDA ",
+
+  // "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title.prefixDSpace": "EDA ",
+
+
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Hozzáad",
-  
+
   // "resource-policies.add.for.": "Add a new policy",
   "resource-policies.add.for.": "Új szabály",
-  
+
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
   "resource-policies.add.for.bitstream": "Új Bitstream szabály",
-  
+
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
   "resource-policies.add.for.bundle": "Új Bundle szabály",
-  
+
   // "resource-policies.add.for.item": "Add a new Item policy",
   "resource-policies.add.for.item": "Új elem szabály",
-  
+
   // "resource-policies.add.for.community": "Add a new Community policy",
   "resource-policies.add.for.community": "Új közösségi szabály hozzáadása",
-  
+
   // "resource-policies.add.for.collection": "Add a new Collection policy",
   "resource-policies.add.for.collection": "Új gyűjtemény szabály hozzáadása",
-  
+
   // "resource-policies.create.page.heading": "Create new resource policy for ",
   "resource-policies.create.page.heading": "Új erőforráa szabály ...",
-  
+
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
   "resource-policies.create.page.failure.content": "Hiba történt az erőforrás szabály létrehozásakor.",
-  
+
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "A művelet sikeres",
-  
+
   // "resource-policies.create.page.title": "Create new resource policy",
   "resource-policies.create.page.title": "Új erőforráa szabály",
-  
+
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Kijelöltek törlése",
-  
+
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
   "resource-policies.delete.btn.title": "Kijelölt erőforrás szabályok törlése",
-  
+
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
   "resource-policies.delete.failure.content": "Hiba történt az erőforrás szabályok törlésekor.",
-  
+
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "A művelet sikeres",
-  
+
   // "resource-policies.edit.page.heading": "Edit resource policy ",
   "resource-policies.edit.page.heading": "Erőfforás szabály szerkesztése ",
-  
+
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Hiba történt az erőforrás szabály szerkesztésekor.",
-  
+
+  // "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.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.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "A művelet sikeres",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   "resource-policies.edit.page.title": "Erőfforás szabály szerkesztése",
-  
+
   // "resource-policies.form.action-type.label": "Select the action type",
   "resource-policies.form.action-type.label": "Művelet típus kiválasztása",
-  
+
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
   "resource-policies.form.action-type.required": "Ki kell válasszon egy műveletet.",
-  
+
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
   // TODO Source message changed - Revise the translation
   "resource-policies.form.eperson-group-list.label": "Az eperson vagy csoport amihez rendeli a jogosultságot",
-  
+
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "Kiválaszt",
-  
+
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
   "resource-policies.form.eperson-group-list.tab.eperson": "ePerson keresése",
-  
+
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Csoport keresése",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
   "resource-policies.form.eperson-group-list.table.headers.action": "Művelet",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "Név",
-  
+
+  // "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.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.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.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.close": "Ok",
+  // TODO New key - Add a translation
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "Végső dátum",
-  
+
   // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "Kezdő dátum",
-  
+
   // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "Leírás",
-  
+
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Név",
-  
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Szabály típus kiválasztása",
-  
+
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
   "resource-policies.form.policy-type.required": "Ki kell válasszon egy szabálytípust.",
-  
+
   // "resource-policies.table.headers.action": "Action",
   "resource-policies.table.headers.action": "Művelet",
-  
+
   // "resource-policies.table.headers.date.end": "End Date",
   "resource-policies.table.headers.date.end": "Végső dátum",
-  
+
   // "resource-policies.table.headers.date.start": "Start Date",
   "resource-policies.table.headers.date.start": "Kezdő dátum",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "Szerkeszt",
-  
+
   // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "Csoport módosítása",
-  
+
   // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "Szabály módosítása",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Csoport",
-  
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
-  
+
   // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "Név",
-  
+
   // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "típus",
-  
+
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
   "resource-policies.table.headers.title.for.bitstream": "Bitstream szabály",
-  
+
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
   "resource-policies.table.headers.title.for.bundle": "Bundle szabály",
-  
+
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
   "resource-policies.table.headers.title.for.item": "Elem szabály",
-  
+
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
   "resource-policies.table.headers.title.for.community": "Közösségi szabályok",
-  
+
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Gyűjtemény szabályok",
-  
-  
-  
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Megtekintés",
-  
-  // "search.title": "DSpace Angular :: Search",
+
+  // "search.title": "Search",
+  // TODO Source message changed - Revise the translation
   "search.title": "DSpace Angular :: Keresés",
-  
+
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Keresés",
-  
-  
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Keresés az adattárban ...",
+
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Szerző",
-  
+
   // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "Végső dátum",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Kezdő dátum",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Feltöltés dátuma",
-  
-  // "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": "Privát",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "Tárgy típusa",
-  
+
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-  "search.filters.applied.f.has_content_in_original_bundle": "Állományokat tartalmaz",
-  
+  "search.filters.applied.f.has_content_in_original_bundle": "Fájlokat tartalmaz",
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Típus",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "Állapot",
-  
+
   // "search.filters.applied.f.subject": "Subject",
-  "search.filters.applied.f.subject": "Tárgy",
-  
+  "search.filters.applied.f.subject": "Tárgyszó",
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "Feltöltő",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Munkakör",
-  
+
   // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "Születési dátum vége",
-  
+
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Születési dátum eleje",
-  
+
+  // "search.filters.applied.f.supervisedBy": "Supervised by",
+  // TODO New key - Add a translation
+  "search.filters.applied.f.supervisedBy": "Supervised by",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Visszavonva",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Szerző",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Szerző neve",
-  
+
+  // "search.filters.filter.author.label": "Search author name",
+  // TODO New key - Add a translation
+  "search.filters.filter.author.label": "Search author name",
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Születési dátum",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Születési dátum",
-  
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  // TODO New key - Add a translation
+  "search.filters.filter.birthDate.label": "Search birth date",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  // TODO New key - Add a translation
+  "search.filters.filter.collapse": "Collapse filter",
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Publikálás dátuma",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "Publikálás dátuma",
-  
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  // TODO New key - Add a translation
+  "search.filters.filter.creativeDatePublished.label": "Search date published",
+
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Szerkesztő",
-  
+
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Szerkesztő",
-  
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  // TODO New key - Add a translation
+  "search.filters.filter.creativeWorkEditor.label": "Search editor",
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Tárgy",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Tárgy",
-  
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  // TODO New key - Add a translation
+  "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Kiadó",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Kiadó",
-  
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  // TODO New key - Add a translation
+  "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Dátum",
-  
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  // TODO Source message changed - Revise the translation
   "search.filters.filter.dateIssued.max.placeholder": "Minimum Dátum",
-  
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  // TODO New key - Add a translation
+  "search.filters.filter.dateIssued.max.label": "End",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  // TODO Source message changed - Revise the translation
   "search.filters.filter.dateIssued.min.placeholder": "Maximum Dátum",
-  
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  // TODO New key - Add a translation
+  "search.filters.filter.dateIssued.min.label": "Start",
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Feltöltés dátuma",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Feltöltés dátuma",
-  
-  // "search.filters.filter.discoverable.head": "Private",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  // TODO New key - Add a translation
+  "search.filters.filter.dateSubmitted.label": "Search date submitted",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  // TODO Source message changed - Revise the translation
   "search.filters.filter.discoverable.head": "Privát",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "Visszavonva",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Tárgy típusa",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Tárgy típusa",
-  
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  // TODO New key - Add a translation
+  "search.filters.filter.entityType.label": "Search item type",
+
+  // "search.filters.filter.expand": "Expand filter",
+  // TODO New key - Add a translation
+  "search.filters.filter.expand": "Expand filter",
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Állományokat tartalmaz",
-  
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Típus",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Típus",
-  
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  // TODO New key - Add a translation
+  "search.filters.filter.itemtype.label": "Search type",
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Munkakör",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Munkakör",
-  
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  // TODO New key - Add a translation
+  "search.filters.filter.jobTitle.label": "Search job title",
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Ismert nyelv",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Ismert nyelv",
-  
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  // TODO New key - Add a translation
+  "search.filters.filter.knowsLanguage.label": "Search known language",
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Állapot",
-  
+
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Állapot",
-  
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  // TODO New key - Add a translation
+  "search.filters.filter.namedresourcetype.label": "Search status",
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Emberek",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Emberek",
-  
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  // TODO New key - Add a translation
+  "search.filters.filter.objectpeople.label": "Search people",
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Országy",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Ország",
-  
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  // TODO New key - Add a translation
+  "search.filters.filter.organizationAddressCountry.label": "Search country",
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Város",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Város",
-  
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  // TODO New key - Add a translation
+  "search.filters.filter.organizationAddressLocality.label": "Search city",
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Alapítás dátuma",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Alapítás dátuma",
-  
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  // TODO New key - Add a translation
+  "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Célja",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Cél szűrő",
-  
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  // TODO New key - Add a translation
+  "search.filters.filter.scope.label": "Search scope filter",
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Összevon",
-  
+
   // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more": "Többet megjelenít",
-  
+  "search.filters.filter.show-more": "Tovább",
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Tárgy",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Tárgy",
-  
+
+  // "search.filters.filter.subject.label": "Search subject",
+  // TODO New key - Add a translation
+  "search.filters.filter.subject.label": "Search subject",
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Feltöltő",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Feltöltő",
-  
-  
-  
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  // TODO New key - Add a translation
+  "search.filters.filter.submitter.label": "Search submitter",
+
+  // "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.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",
+  // TODO New key - Add a translation
+  "search.filters.filter.supervisedBy.label": "Search Supervised By",
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Folyóirat száma",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   "search.filters.entityType.JournalVolume": "JFolyóirat kötet",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Szervezeti egység",
-  
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Igen",
-  
+
   // "search.filters.has_content_in_original_bundle.false": "No",
   "search.filters.has_content_in_original_bundle.false": "Nem",
-  
+
   // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "Nem",
-  
+
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Igen",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Igen",
-  
+
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Nem",
-  
-  
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Szűrők",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Szűrők visszaállítása",
-  
-  
-  
+
+  // "search.filters.search.submit": "Submit",
+  // TODO New key - Add a translation
+  "search.filters.search.submit": "Submit",
+
+
+
   // "search.form.search": "Search",
-  "search.form.search": "keresés",
-  
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Keres a DSpace-en",
-  
-  // "search.form.search_mydspace": "Search MyDSpace",
-  "search.form.search_mydspace": "Keres a MyDSpace-en",
-  
-  
-  
+  "search.form.search": "Keresés",
+
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Teljes adattár",
+
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "A teljes EDA",
+
+
+
   // "search.results.head": "Search Results",
   "search.results.head": "Keresési eredmények",
-  
+
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "A keresésnek nincs eredménye. Nem találja amit keres? Próbálja",
-  
+
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "idézőjelek közé írni",
-  
+
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "A keresésnek nincs eredménye.",
-  
-  
-  
+
+  // "search.results.view-result": "View",
+  // TODO New key - Add a translation
+  "search.results.view-result": "View",
+
+  // "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",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Keresés eredménye",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Keresés eredménye",
+
+
   // "search.sidebar.close": "Back to results",
-  "search.sidebar.close": "Vissza a szűrőkhöz",
-  
+  "search.sidebar.close": "Vissza a találatokhoz",
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Szűrők",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Kereső eszközök",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "eredmények",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Eredmények oldalanként",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Rendszerezés eszerint",
-  
+
   // "search.sidebar.settings.title": "Settings",
-  "search.sidebar.settings.title": "Állítások",
-  
-  
-  
+  "search.sidebar.settings.title": "Beállítások",
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Részletek megjelenítése",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "Megjelenítés rácsként",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Megjelenítés listaként",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Növekvő",
-  
+
   // "sorting.DESC": "Descending",
   "sorting.DESC": "Csökkenő",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Cím növekvő sorrendben",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Cím csökkenő sorrendben",
-  
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Relevancia",
-  
-  
-  
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Legkevésbé releváns",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "Leginkább releváns",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Megjelenés dátuma szerint növekvő",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Megjelenés dátuma szerint csökkenő",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Hozzáférés dátuma szerint növekvő",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Hozzáférés dátuma szerint csökkenő",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Utoljára módosított növekvő",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Utoljára módosított növekvő csökkenő",
+
+
   // "statistics.title": "Statistics",
   "statistics.title": "Statisztikák",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "Statisztikák: {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "Statisztikák",
-  
+
   // "statistics.page.no-data": "No data available",
   "statistics.page.no-data": "Nincsenek adatok",
-  
+
   // "statistics.table.no-data": "No data available",
   "statistics.table.no-data": "Nincsenek adatok",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   "statistics.table.title.TotalVisits": "Összes látogatás",
-  
+
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "Összes látogató a hónapban",
-  
+
   // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "Fájl elérések",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   "statistics.table.title.TopCountries": "Elérések országok szerint",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   "statistics.table.title.TopCities": "Elérések városok szerint",
-  
+
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Látogatások",
-  
-  
-  
+
+
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  // TODO New key - Add a translation
+  "submission.edit.breadcrumbs": "Edit Submission",
+
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Feltöltés szerkesztése",
-  
+
+  // "submission.general.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "submission.general.cancel": "Cancel",
+
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "Önnek nincs új feltöltéshez szükséges privilégiuma.",
-  
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Adattár",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Mégse",
-  
+
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Ezt a műveletet nem lehet visszaváltoztatni. Biztos benne?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Igen, biztos vagyok",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   "submission.general.discard.confirm.title": "Feltöltés elvetése",
-  
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Elvetés",
-  
+
+  // "submission.general.info.saved": "Saved",
+  // TODO New key - Add a translation
+  "submission.general.info.saved": "Saved",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  // TODO New key - Add a translation
+  "submission.general.info.pending-changes": "Unsaved changes",
+
   // "submission.general.save": "Save",
   "submission.general.save": "Mentés",
-  
+
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Mentés későbbre",
-  
-  
+
+
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Metaadatok importálása külső forrásból",
-  
+
   // "submission.import-external.title": "Import metadata from an external source",
   "submission.import-external.title": "Metaadatok importálása külső forrásból",
-  
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.Journal": "Import a journal from an external source",
+
+  // "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.JournalVolume": "Import a journal volume from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.Person": "Import a person from an external source",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.Project": "Import a project from an external source",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.Publication": "Import a publication from an external source",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  // TODO New key - Add a translation
+  "submission.import-external.title.none": "Import metadata from an external source",
+
   // "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": "Írjon be egy lekérést hogy elemeket találjon a web-en amiket importálhat DSpace-be.",
-  
+
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "Vissza a MyDSpacehez",
-  
+
   // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "Külső forrás keresése",
-  
+
   // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "Keresés",
-  
+
   // "submission.import-external.search.button.hint": "Write some words to search",
   "submission.import-external.search.button.hint": "Írjon be keresési szavakat",
-  
+
   // "submission.import-external.search.source.hint": "Pick an external source",
   "submission.import-external.search.source.hint": "Válasszon egy külső forrást",
-  
+
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
-  
+
+  // "submission.import-external.source.ads": "NASA/ADS",
+  // TODO New key - Add a translation
+  "submission.import-external.source.ads": "NASA/ADS",
+
+  // "submission.import-external.source.cinii": "CiNii",
+  // TODO New key - Add a translation
+  "submission.import-external.source.cinii": "CiNii",
+
+  // "submission.import-external.source.crossref": "CrossRef",
+  // TODO New key - Add a translation
+  "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",
+  // TODO New key - Add a translation
+  "submission.import-external.source.scielo": "SciELO",
+
+  // "submission.import-external.source.scopus": "Scopus",
+  // TODO New key - Add a translation
+  "submission.import-external.source.scopus": "Scopus",
+
+  // "submission.import-external.source.vufind": "VuFind",
+  // TODO New key - Add a translation
+  "submission.import-external.source.vufind": "VuFind",
+
+  // "submission.import-external.source.wos": "Web Of Science",
+  // TODO New key - Add a translation
+  "submission.import-external.source.wos": "Web Of Science",
+
+  // "submission.import-external.source.orcidWorks": "ORCID",
+  // TODO New key - Add a translation
+  "submission.import-external.source.orcidWorks": "ORCID",
+
+  // "submission.import-external.source.epo": "European Patent Office (EPO)",
+  // TODO New key - Add a translation
+  "submission.import-external.source.epo": "European Patent Office (EPO)",
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Betöltés ...",
-  
+
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  // TODO New key - Add a translation
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  // TODO New key - Add a translation
+  "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
-  
+
   // "submission.import-external.source.pubmed": "Pubmed",
   "submission.import-external.source.pubmed": "Pubmed",
-  
+
+  // "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  // TODO New key - Add a translation
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Library of Congress Names",
-  
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Elem előnézet",
-  
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  // TODO New key - Add a translation
+  "submission.import-external.preview.title.Publication": "Publication Preview",
+
+  // "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.Journal": "Journal Preview",
+  // TODO New key - Add a translation
+  "submission.import-external.preview.title.Journal": "Journal Preview",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  // TODO New key - Add a translation
+  "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  // TODO New key - Add a translation
+  "submission.import-external.preview.title.Person": "Person Preview",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  // TODO New key - Add a translation
+  "submission.import-external.preview.title.Project": "Project Preview",
+
   // "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": "A lentebbi metaadat importálva a külső forrásból. Ki lesz töltve ha elkezdi a beküldési folyamatot.",
-  
+
   // "submission.import-external.preview.button.import": "Start submission",
   "submission.import-external.preview.button.import": "Beküldés elkezdése",
-  
+
   // "submission.import-external.preview.error.import.title": "Submission error",
   "submission.import-external.preview.error.import.title": "Beküldési hiba",
-  
+
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Hiba történt a külső forrásból történő importálás folyamán.",
-  
+
   // "submission.sections.describe.relationship-lookup.close": "Close",
   "submission.sections.describe.relationship-lookup.close": "Bezárás",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
   "submission.sections.describe.relationship-lookup.external-source.added": "Helyi bevitel sikeresen hozzáadva a kiválasztotthoz",
-  
+
   // "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.Journal": "Import remote journal",
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Távoli folyóirat importálása",
-  
+
   // "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": "Távoli folyóiratszám importálása",
-  
+
   // "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": "Távoli folyóiratkötet importálása",
-  
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+
+  // "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.Event": "Import remote event",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Import remote product",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Import remote equipment",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Import remote organizational unit",
+  // TODO New key - Add a translation
+  "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.Funding": "Import remote fund",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Import remote fund",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Import remote person",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Import remote patent",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Import remote project",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Import remote publication",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "New Entity Added!",
+  // TODO New key - Add a translation
+  "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.title": "Project",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+
   // "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.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.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.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoritás",
-  
+
   // "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": "Importál új helyi autoritás bevitelként",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Mégse",
-  
+
   // "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": "Válasszon ki gyűjteményt, amelyhez az új bevitelt importálja",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entitások",
-  
+
   // "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": "ÍÚj entitásként importál",
-  
+
   // "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": "LC Nnévről importál",
-  
+
   // "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": "ORCID-ról importál",
-  
+
   // "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": "Sherpa Journal-ról importál",
-  
+
   // "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": "Sherpa Publisher-ről importál",
-  
+
   // "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-ről importál",
-  
+
   // "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-ről importál",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importál",
-  
+
   // "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": "Távoli folyóiratot importál",
-  
+
   // "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": "Helyi folyóirat sikeresen hozzáadva a kiválasztotthoz",
-  
+
   // "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": "Külső folyóirat sikeresen importálva és hozzáadva a kiválasztotthoz",
-  
+
   // "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": "Távoli folyóiratszám importálása",
-  
+
   // "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": "Helyi folyóirat sikeresen hozzáadva a kiválasztotthoz",
-  
+
   // "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": "Távoli folyóirat sikeresen importálva és hozzáadva a kiválasztotthoz",
-  
+
   // "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": "Távoli folyóiratkötet importálása",
-  
+
   // "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": "Helyi folyóiratkötet sikeresen hozzáadva a kiválasztotthoz",
-  
+
   // "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": "Külső folyóiratkötet sikeresen importálva és hozzáadva a kiválasztotthoz",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Válasszon ki helyi megfelelést:",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Valamennyi kiválasztás megszüntetése",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Oldal kiválasztásának megszüntetése",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
   "submission.sections.describe.relationship-lookup.search-tab.loading": "Betöltés...",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Keresett szó",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "Mehet",
-  
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Valamennyi kiválasztása",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "Oldal választása",
-  
+
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "Kiválasztott {{ size }} tárgyak",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Helyi szerzők ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Helyi folyóiratok ({{ count }})",
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Helyi projektek ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Helyi kiadványok ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Helyi szerzők ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Helyi szervezeti egységek ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Helyi adat csomagok ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Helyi adatállományok ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Helyi folyóiratok ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Helyi folyóiratszámok ({{ 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": "Helyi folyóiratszámok ({{ 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": "Helyi folyóiratkötetek ({{ 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": "Helyi folyóiratkötetek ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa folyóiratok ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa kiadók ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "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 }})",
   "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 }})",
   "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.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.isFundingAgencyOfPublication": "Támogató szervezetek keresése",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Támogatás keresése",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Intézményi egységek kereséset",
-  
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+
+  // "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.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+
+
+
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  // TODO New key - Add a translation
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Jelenleg kiválasztott ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Folyóirat számok",
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Folyóirat számok",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Folyóirat kötetek",
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Folyóirat kötetek",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Folyóiratok",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Szerzők",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Támogató szervezet",
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projektek",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
   "submission.sections.describe.relationship-lookup.title.Publication": "Kiadványok",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
   "submission.sections.describe.relationship-lookup.title.Person": "Szerzők",
-  
+
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
   "submission.sections.describe.relationship-lookup.title.OrgUnit": "Szervezeti egységek",
-  
+
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Adatcsomagok",
-  
+
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
   "submission.sections.describe.relationship-lookup.title.DataFile": "Adatállományok",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Támogató szervezet",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Támogatás",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Szülő szervezeti egység",
-  
+
+  // "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.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Lenyíló menü váltás",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Beállítások",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
   "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Amit kiválasztott az jelenleg üres.",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Kiválasztott szerzők",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Választott folyóirat",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Választott folyóirat kötet",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Választott projektek",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Választott kiadványok",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Választott szerzők",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
   "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Választott szervezeti egységek",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Választott adatcsomagok",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Választott adatfájlok",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Választott folyóiratok",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Választott szám",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Választott folyóirat kötet",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Választott támogató szervezet",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Választott támogatás",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Választott szám",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Választott szervezeti egység",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Keresési eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Keresése eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Keresése eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Keresése eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Keresése eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Keresése eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Keresés eredménye",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Keresése eredmények",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Keresés eredménye",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Keresés eredménye",
+
   // "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": "Óhajtja-e elmenteni \"{{ value }}\" névváltozatként ennek a személynek, hogy később ön is és mások is újrahasználhassák feltöltéshez? Amennyiben nem, még mindig használhatja ehhez a feltöltéshez.",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Mentsen el új névvariánst",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Használja csak ehhez a feltöltéshez",
-  
+
   // "submission.sections.ccLicense.type": "License Type",
   "submission.sections.ccLicense.type": "Licenc típus",
-  
+
   // "submission.sections.ccLicense.select": "Select a license type…",
   "submission.sections.ccLicense.select": "Válasszon ki egy licenc típust…",
-  
+
   // "submission.sections.ccLicense.change": "Change your license type…",
   "submission.sections.ccLicense.change": "Válassza ki a licenc típusát…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   "submission.sections.ccLicense.none": "Nincs elérhető licenc",
-  
+
   // "submission.sections.ccLicense.option.select": "Select an option…",
   "submission.sections.ccLicense.option.select": "Válasszon ki valamit…",
-  
+
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
   "submission.sections.ccLicense.link": "A következő licencet választotta ki:",
-  
+
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "Engedélyezem a lentebbi licencet",
-  
+
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Több hozzáadása",
-  
+
+  // "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.collection": "Collection",
   "submission.sections.general.collection": "Gyűjtemény",
-  
+
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
   "submission.sections.general.deposit_error_notice": "Tárgy feltöltésekor probléma keletkezett, kérjük próbálja újra később.",
-  
+
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
   "submission.sections.general.deposit_success_notice": "Feltöltés sikeresen elraktározva.",
-  
+
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
   "submission.sections.general.discard_error_notice": "Tárgy elvetésekor probléma keletkezett, kérjük próbálja újra később.",
-  
+
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Feltöltés sikeresen elvetve.",
-  
+
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
   "submission.sections.general.metadata-extracted": "Új metaadat kivonva és hozzáadva a <strong>{{sectionId}}</strong> szakaszhoz.",
-  
+
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
   "submission.sections.general.metadata-extracted-new-section": "Új <strong>{{sectionId}}</strong> szakasz lett hozzáadva a feltöltéshez.",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Nem található gyűjtemény",
-  
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Nincs elérhető opció",
-  
+
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
   "submission.sections.general.save_error_notice": "Tárgy elmentésekor probléma keletkezett, kérjük próbálja újra később.",
-  
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "Feltöltés sikeresen elmentve.",
-  
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "Gyűjtemény keresése",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Egyes szakaszok nem teljesek.",
-  
-  
-  
+
+  // "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.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_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.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.submit.progressbar.accessCondition": "Item access conditions",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+
   // "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.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Reciklál",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Leír",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Leír",
-  
+
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Leír",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Potenciális duplázódás",
-  
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.identifiers": "Identifiers",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Engedély raktározása",
-  
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  // TODO New key - Add a translation
+  "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Állományok feltöltése",
-  
-  
-  
+
+  // "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.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.status.errors.title": "Errors",
+  // TODO New key - Add a translation
+  "submission.sections.status.errors.title": "Errors",
+
+  // "submission.sections.status.valid.title": "Valid",
+  // TODO New key - Add a translation
+  "submission.sections.status.valid.title": "Valid",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  // TODO New key - Add a translation
+  "submission.sections.status.warnings.title": "Warnings",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  // TODO New key - Add a translation
+  "submission.sections.status.errors.aria": "has errors",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  // TODO New key - Add a translation
+  "submission.sections.status.valid.aria": "is valid",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  // TODO New key - Add a translation
+  "submission.sections.status.warnings.aria": "has warnings",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  // TODO New key - Add a translation
+  "submission.sections.status.info.title": "Additional Information",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  // TODO New key - Add a translation
+  "submission.sections.status.info.aria": "Additional Information",
+
+  // "submission.sections.toggle.open": "Open section",
+  // TODO New key - Add a translation
+  "submission.sections.toggle.open": "Open section",
+
+  // "submission.sections.toggle.close": "Close section",
+  // TODO New key - Add a translation
+  "submission.sections.toggle.close": "Close section",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  // TODO New key - Add a translation
+  "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  // TODO New key - Add a translation
+  "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Mégse",
-  
+
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.sections.upload.delete.confirm.info": "Ezt a műveletet nem lehet visszaváltoztatni. Biztos benne?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Igen, biztos",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "Bitfolyam törlése",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Törlés",
-  
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.download.title": "Download bitstream",
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Húzza ide az állományokat, hogy a tárgyhoz csatolja",
-  
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  // TODO New key - Add a translation
+  "submission.sections.upload.edit.title": "Edit bitstream",
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Elérhetőségi feltétel típusa",
-  
+
+  // "submission.sections.upload.form.access-condition-hint": "Select an access condition to apply on the bitstream once the item is deposited",
+  // TODO New key - Add a translation
+  "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.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Dátum kötelező.",
-  
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  // TODO New key - Add a translation
+  "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  // TODO New key - Add a translation
+  "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Elérhetőség megadása innen",
-  
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  // TODO New key - Add a translation
+  "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Innen",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Csoport",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "Csoport kötelező.",
-  
+
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Elérhetőséget engedélyez eddig",
-  
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  // TODO New key - Add a translation
+  "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Eddig",
-  
+
   // "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": "A {{collectionName}} feltöltött állományok elérhetők lesznek a következő csoport(ok) szerint:",
-  
+
   // "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": "Kérjük, vegye figyelembe, hogy a {{collectionName}} gyűjteménybe feltöltött állományok elérhetők lesznek, azon kívül amit az egyedi állományokról kifejezetten eldöntött, a következő csoport(ok)ban:",
-  
-  // "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": "Itt megtalálja a tárgyban lévő valamennyi állományt. Frissítheti az állomány metaadatait és hozzáférési feltételeit vagy <strong>feltölthet további állományokat azzal, hogy behúzza azokat bárhova az oldalra</strong>",
-  
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Nem",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "Még nincs feltöltött állomány.",
-  
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "Metaadat elmentése",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Mégse",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "Feltöltés nem sikerült",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Feltöltés sikerült",
-  
-  
-  
-  // "submission.submit.title": "Submission",
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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-label": "Discoverable",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.discoverable-label": "Discoverable",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.access-condition-label": "Access condition type",
+
+  // "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.access-condition-hint": "Select an access condition to apply on the item once it is deposited",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.date-required": "Date is required.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.from-label": "Grant access from",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.from-placeholder": "From",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.group-label": "Group",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.group-required": "Group is required.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.until-label": "Grant access until",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  // TODO New key - Add a translation
+  "submission.sections.accesses.form.until-placeholder": "Until",
+
+  // "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.required": "You must accept the license",
+  // TODO New key - Add a translation
+  "submission.sections.license.required": "You must accept the license",
+
+  // "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.sherpa.publication.information": "Publication information",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publication.information": "Publication information",
+
+  // "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.issns": "ISSNs",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publication.information.issns": "ISSNs",
+
+  // "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.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.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.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.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.version": "Version",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publisher.policy.version": "Version",
+
+  // "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.nolocation": "None",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publisher.policy.nolocation": "None",
+
+  // "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.prerequisites": "Prerequisites",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+
+  // "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.conditions": "Conditions",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+
+  // "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.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.modified": "Last Modified",
+  // TODO New key - Add a translation
+  "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+
+  // "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.submit.breadcrumbs": "New submission",
+  // TODO New key - Add a translation
+  "submission.submit.breadcrumbs": "New submission",
+
+  // "submission.submit.title": "New submission",
+  // TODO Source message changed - Revise the translation
   "submission.submit.title": "Beküldés",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Töröl",
-  
+
   // "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": "Ha el óhajtja vetni a tárgyat, válassz a  \"Töröl\" gombot.  Majd döntését igazolja.",
-  
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Szerkesztés",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
   "submission.workflow.generic.edit-help": "Válassza ezt, hogy módosítsa a tárgy metaadatait.",
-  
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "Megtekint",
-  
+
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Válassza ezt, hogy megtekintse a tárgy metaadatait.",
-  
-  
-  
+
+
+  // "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-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-help": "",
+  // TODO New key - Add a translation
+  "submission.workflow.generic.submit_score-help": "",
+
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Jóváhagy",
-  
+
   // "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": "Ha ellenőrizte a tárgyat és gyűjteménybe foglalásra alkalmas, válassza a \"Jóváhagy\" gombot.",
-  
+
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Szerkeszt",
-  
+
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Válassza ezt, hogy módosítsa a tárgy metaadatait.",
-  
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  // TODO New key - Add a translation
+  "submission.workflow.tasks.claimed.decline": "Decline",
+
+  // "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.",
   "submission.workflow.tasks.claimed.reject.reason.info": "Kérjük az alábbi mezőben jelölje meg az okot amiért a feltöltést visszautasítja és pontosítsa, amennyiben a feltöltő megoldhat valamilyen gondot és újra feltöltheti.",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Írja le az elutasítás okát",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
   "submission.workflow.tasks.claimed.reject.reason.submit": "Tárgy elutasítása",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "Ok",
-  
+
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
   "submission.workflow.tasks.claimed.reject.submit": "Elutasítás",
-  
+
   // "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": "Amennyiben ellenőrizte a tárgyat és úgy találta, hogy az <strong>nem</strong> alkalmas arra, hogy a gyűjteménybe foglalják, válassza az \"Elutasítás\" gombot.  Utána szükséges lesz beírni egy üzenetet, amelyben megjelöli, miért nem alkalmas a tárgy és hogy a feltöltő változtathat-e valamit, hogy utána újra feltölthesse.",
-  
+
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Vissza a készlethez",
-  
+
   // "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": "Vigye a feladatot vissza a készletbe, hogy más felhasználó elvégezhesse azt.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Művelet közben hiba keletkezett...",
-  
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "Feldolgozás...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   "submission.workflow.tasks.generic.submitter": "Feltöltő",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Művelet sikeres",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Követelés",
-  
+
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Ossza ki a feladatot önmagának.",
-  
+
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
   "submission.workflow.tasks.pool.hide-detail": "Részletek elrejtése",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Részletek felfedése",
-  
-  
-  
+
+
+  // "submission.workspace.generic.view": "View",
+  // TODO New key - Add a translation
+  "submission.workspace.generic.view": "View",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  // TODO New key - Add a translation
+  "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+
+
+  // "subscriptions.title": "Subscriptions",
+  // TODO New key - Add a translation
+  "subscriptions.title": "Subscriptions",
+
+  // "subscriptions.item": "Subscriptions for items",
+  // TODO New key - Add a translation
+  "subscriptions.item": "Subscriptions for items",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  // TODO New key - Add a translation
+  "subscriptions.collection": "Kategóriafeliratkozások",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  // TODO New key - Add a translation
+  "subscriptions.community": "Kategóriafeliratkozások",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  // TODO New key - Add a translation
+  "subscriptions.subscription_type": "Subscription type",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  // TODO New key - Add a translation
+  "subscriptions.frequency": "Subscription frequency",
+
+  // "subscriptions.frequency.D": "Daily",
+  // TODO New key - Add a translation
+  "subscriptions.frequency.D": "Daily",
+
+  // "subscriptions.frequency.M": "Monthly",
+  // TODO New key - Add a translation
+  "subscriptions.frequency.M": "Monthly",
+
+  // "subscriptions.frequency.W": "Weekly",
+  // TODO New key - Add a translation
+  "subscriptions.frequency.W": "Weekly",
+
+  // "subscriptions.tooltip": "Subscribe",
+  // TODO New key - Add a translation
+  "subscriptions.tooltip": "Subscribe",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  // TODO New key - Add a translation
+  "subscriptions.modal.title": "Subscriptions",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  // TODO New key - Add a translation
+  "subscriptions.modal.type-frequency": "Type and frequency",
+
+  // "subscriptions.modal.close": "Close",
+  // TODO New key - Add a translation
+  "subscriptions.modal.close": "Close",
+
+  // "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.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.frequency.D": "Daily",
+  // TODO New key - Add a translation
+  "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+
+  // "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.M": "Monthly",
+  // TODO New key - Add a translation
+  "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+
+  // "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.processing": "Processing...",
+  // TODO New key - Add a translation
+  "subscriptions.modal.new-subscription-form.processing": "Processing...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  // TODO New key - Add a translation
+  "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  // TODO New key - Add a translation
+  "subscriptions.modal.delete.success": "Subscription deleted successfully",
+
+  // "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.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.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.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.table.dso": "Subject",
+  // TODO New key - Add a translation
+  "subscriptions.table.dso": "Subject",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  // TODO New key - Add a translation
+  "subscriptions.table.subscription_type": "Subscription Type",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  // TODO New key - Add a translation
+  "subscriptions.table.subscription_frequency": "Subscription Frequency",
+
+  // "subscriptions.table.action": "Action",
+  // TODO New key - Add a translation
+  "subscriptions.table.action": "Action",
+
+  // "subscriptions.table.edit": "Edit",
+  // TODO New key - Add a translation
+  "subscriptions.table.edit": "Edit",
+
+  // "subscriptions.table.delete": "Delete",
+  // TODO New key - Add a translation
+  "subscriptions.table.delete": "Delete",
+
+  // "subscriptions.table.not-available": "Not available",
+  // TODO New key - Add a translation
+  "subscriptions.table.not-available": "Not available",
+
+  // "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.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 New key - Add a translation
+  "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.",
+
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Thumbnail kép",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Kép nélkül",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Projekt Logo",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  // TODO New key - Add a translation
+  "thumbnail.project.placeholder": "Project Placeholder Image",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "OrgUnit Logo",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  // TODO New key - Add a translation
+  "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Profilkép",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  // TODO New key - Add a translation
+  "thumbnail.person.placeholder": "No Profile Picture Available",
+
+
+
   // "title": "DSpace",
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Hierarchikus fa nézet",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "Továbbiak betöltése",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "Reset",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Keresés",
-  
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "Nincsenek megjelenítendő elemek",
-  
+
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
   "vocabulary-treeview.tree.description.nsi": "Norvégiai tudományos index",
-  
+
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Kutatási tárgy kategóriák",
-  
-  
-  
+
+  // "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",
+
   // "uploader.browse": "browse",
   "uploader.browse": "böngészés",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Húzza ide az állományokat",
-  
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Töröl",
+
   // "uploader.or": ", or ",
-  // TODO Source message changed - Revise the translation
   "uploader.or": ", vagy",
-  
+
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
   "uploader.processing": "Feldolgozás",
-  
+
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Sor hossza",
-  
+
   // "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": "Válassza ki azokat a típusokat, amelyekhez óhajtja a virtuális metaadatok elmentését valódi metaadatokként",
-  
+
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
   "virtual-metadata.delete-item.modal-head": "Ennek a kapcsolatnak a virtuális metaadatai",
-  
+
   // "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": "Válassza ki azokat a tárgyakat, amelyekhez óhajtja a virtuális metaadatok elmentését valódi metaadatokként",
-  
-  
-  
+
+
+
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  // TODO New key - Add a translation
+  "supervisedWorkspace.search.results.head": "Supervised Items",
+
+  // "workspace.search.results.head": "Your submissions",
+  // TODO New key - Add a translation
+  "workspace.search.results.head": "Your submissions",
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Munkafolyamat szervezése",
-  
-  
-  
+
+  // "workflow.search.results.head": "Workflow tasks",
+  // TODO New key - Add a translation
+  "workflow.search.results.head": "Workflow tasks",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  // TODO New key - Add a translation
+  "supervision.search.results.head": "Workflow and Workspace tasks",
+
+
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  // TODO New key - Add a translation
+  "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  // TODO New key - Add a translation
+  "workflow-item.edit.title": "Edit workflowitem",
+
   // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "Törölve",
-  
+
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
   "workflow-item.delete.notification.success.content": "Munkafolyamat elem sikeresen törölve",
-  
+
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Valami hiba keletkezett",
-  
+
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
   "workflow-item.delete.notification.error.content": "Munkafolyamat elem törlése nem sikerült",
-  
+
   // "workflow-item.delete.title": "Delete workflow item",
   "workflow-item.delete.title": "Munkafolyamat elem törlése",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   "workflow-item.delete.header": "Munkafolyamat elem törlése",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "Mégse",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Töröl",
-  
-  
+
+
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Visszaküldve a feladónak",
-  
+
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
   "workflow-item.send-back.notification.success.content": "Munkafolyamat elem sikeresen visszaküldve a feladónak",
-  
+
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Valami hiba keletkezett",
-  
+
   // "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": "Munkafolyamat elem visszaküldése a feladónak nem sikerült",
-  
+
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
   "workflow-item.send-back.title": "Munkafolyamt elemet visszaküld a feladónak",
-  
+
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
   "workflow-item.send-back.header": "Munkafolyamt elemet visszaküld a feladónak",
-  
+
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Mégse",
-  
-  // "workflow-item.send-back.button.confirm": "Send back"
+
+  // "workflow-item.send-back.button.confirm": "Send back",
   // TODO Source message changed - Revise the translation
   "workflow-item.send-back.button.confirm": "Visszaküld",
-  
 
-}
\ No newline at end of file
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  // TODO New key - Add a translation
+  "workflow-item.view.breadcrumbs": "Workflow View",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  // TODO New key - Add a translation
+  "workspace-item.view.breadcrumbs": "Workspace View",
+
+  // "workspace-item.view.title": "Workspace View",
+  // TODO New key - Add a translation
+  "workspace-item.view.title": "Workspace View",
+
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  // TODO New key - Add a translation
+  "workflow-item.advanced.title": "Advanced workflow",
+
+
+  // "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.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.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.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.title": "Select Reviewer",
+  // TODO New key - Add a translation
+  "workflow-item.selectrevieweraction.title": "Select Reviewer",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  // TODO New key - Add a translation
+  "workflow-item.selectrevieweraction.header": "Select Reviewer",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  // TODO New key - Add a translation
+  "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+
+
+  // "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.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.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.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.title": "Rate this item",
+  // TODO New key - Add a translation
+  "workflow-item.scorereviewaction.title": "Rate this item",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  // TODO New key - Add a translation
+  "workflow-item.scorereviewaction.header": "Rate this item",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "workflow-item.scorereviewaction.button.cancel": "Cancel",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  // TODO New key - Add a translation
+  "workflow-item.scorereviewaction.button.confirm": "Confirm",
+
+  // "idle-modal.header": "Session will expire soon",
+  // TODO New key - Add a translation
+  "idle-modal.header": "Session will expire soon",
+
+  // "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?",
+  // TODO New key - Add a translation
+  "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.log-out": "Log out",
+  // TODO New key - Add a translation
+  "idle-modal.log-out": "Log out",
+
+  // "idle-modal.extend-session": "Extend session",
+  // TODO New key - Add a translation
+  "idle-modal.extend-session": "Extend session",
+
+  // "researcher.profile.action.processing" : "Processing...",
+  // TODO New key - Add a translation
+  "researcher.profile.action.processing": "Processing...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  // TODO New key - Add a translation
+  "researcher.profile.associated": "Researcher profile associated",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  // TODO New key - Add a translation
+  "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+
+  // "researcher.profile.create.new": "Create new",
+  // TODO New key - Add a translation
+  "researcher.profile.create.new": "Create new",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  // TODO New key - Add a translation
+  "researcher.profile.create.success": "Researcher profile created successfully",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  // TODO New key - Add a translation
+  "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+
+  // "researcher.profile.delete": "Delete",
+  // TODO New key - Add a translation
+  "researcher.profile.delete": "Delete",
+
+  // "researcher.profile.expose": "Expose",
+  // TODO New key - Add a translation
+  "researcher.profile.expose": "Expose",
+
+  // "researcher.profile.hide": "Hide",
+  // TODO New key - Add a translation
+  "researcher.profile.hide": "Hide",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  // TODO New key - Add a translation
+  "researcher.profile.not.associated": "Researcher profile not yet associated",
+
+  // "researcher.profile.view": "View",
+  // TODO New key - Add a translation
+  "researcher.profile.view": "View",
+
+  // "researcher.profile.private.visibility" : "PRIVATE",
+  // TODO New key - Add a translation
+  "researcher.profile.private.visibility": "PRIVATE",
+
+  // "researcher.profile.public.visibility" : "PUBLIC",
+  // TODO New key - Add a translation
+  "researcher.profile.public.visibility": "PUBLIC",
+
+  // "researcher.profile.status": "Status:",
+  // TODO New key - Add a translation
+  "researcher.profile.status": "Status:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  // TODO New key - Add a translation
+  "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+
+  // "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  // TODO New key - Add a translation
+  "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+
+  // "researcherprofile.error.claim.title" : "Error",
+  // TODO New key - Add a translation
+  "researcherprofile.error.claim.title": "Error",
+
+  // "researcherprofile.success.claim.body" : "Profile claimed with success",
+  // TODO New key - Add a translation
+  "researcherprofile.success.claim.body": "Profile claimed with success",
+
+  // "researcherprofile.success.claim.title" : "Success",
+  // TODO New key - Add a translation
+  "researcherprofile.success.claim.title": "Success",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  // TODO New key - Add a translation
+  "person.page.orcid.create": "Create an ORCID ID",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  // TODO New key - Add a translation
+  "person.page.orcid.granted-authorizations": "Granted authorizations",
+
+  // "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  // TODO New key - Add a translation
+  "person.page.orcid.grant-authorizations": "Grant authorizations",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  // TODO New key - Add a translation
+  "person.page.orcid.link": "Connect to ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  // TODO New key - Add a translation
+  "person.page.orcid.link.processing": "Linking profile to ORCID...",
+
+  // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
+  // TODO New key - Add a translation
+  "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.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.",
+  // TODO New key - Add a translation
+  "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.unlink": "Disconnect from ORCID",
+  // TODO New key - Add a translation
+  "person.page.orcid.unlink": "Disconnect from ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  // TODO New key - Add a translation
+  "person.page.orcid.unlink.processing": "Processing...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  // TODO New key - Add a translation
+  "person.page.orcid.missing-authorizations": "Missing authorizations",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  // TODO New key - Add a translation
+  "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+
+  // "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.",
+  // TODO New key - Add a translation
+  "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-orcid-message": "No ORCID iD associated yet. By clicking on the button below it is possible to link this profile with an ORCID account.",
+  // TODO New key - Add a translation
+  "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.profile-preferences": "Profile preferences",
+  // TODO New key - Add a translation
+  "person.page.orcid.profile-preferences": "Profile preferences",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  // TODO New key - Add a translation
+  "person.page.orcid.funding-preferences": "Funding preferences",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  // TODO New key - Add a translation
+  "person.page.orcid.publications-preferences": "Publication preferences",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  // TODO New key - Add a translation
+  "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  // TODO New key - Add a translation
+  "person.page.orcid.save.preference.changes": "Update settings",
+
+  // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-profile.affiliation": "Affiliation",
+
+  // "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-profile.biographical": "Biographical data",
+
+  // "person.page.orcid.sync-profile.education" : "Education",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-profile.education": "Education",
+
+  // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-profile.identifiers": "Identifiers",
+
+  // "person.page.orcid.sync-fundings.all" : "All fundings",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-fundings.all": "All fundings",
+
+  // "person.page.orcid.sync-fundings.mine" : "My fundings",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-fundings.mine": "My fundings",
+
+  // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+
+  // "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-fundings.disabled": "Disabled",
+
+  // "person.page.orcid.sync-publications.all" : "All publications",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-publications.all": "All publications",
+
+  // "person.page.orcid.sync-publications.mine" : "My publications",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-publications.mine": "My publications",
+
+  // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-publications.my_selected": "Selected publications",
+
+  // "person.page.orcid.sync-publications.disabled" : "Disabled",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-publications.disabled": "Disabled",
+
+  // "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+
+  // "person.page.orcid.sync-queue.table.header.type" : "Type",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.table.header.type": "Type",
+
+  // "person.page.orcid.sync-queue.table.header.description" : "Description",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.table.header.description": "Description",
+
+  // "person.page.orcid.sync-queue.table.header.action" : "Action",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.table.header.action": "Action",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.country": "Country",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.education": "Educations",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.external_ids": "External ids",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.other_names": "Other names",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.description.keywords": "Keywords",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.project": "Project",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.education": "Education",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.country": "Country",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+
+  // "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+
+  // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
+  // TODO New key - Add a translation
+  "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.content": "Click <a href='{{orcid}}'>here</a> to grant again the required permissions. If the problem persists, contact the administrator",
+  // TODO New key - Add a translation
+  "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.bad-request-error": "The submission to ORCID failed because the resource sent to ORCID registry is not valid",
+  // TODO New key - Add a translation
+  "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.error": "The submission to ORCID failed",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+
+  // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
+  // TODO New key - Add a translation
+  "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.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
+  // TODO New key - Add a translation
+  "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.success": "The submission to ORCID was completed successfully",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+
+  // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
+  // TODO New key - Add a translation
+  "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.amount-currency.required": "The amount's currency is required",
+  // TODO New key - Add a translation
+  "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.external-id.required": "The resource to be sent requires at least one identifier",
+  // TODO New key - Add a translation
+  "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.title.required": "The title is required",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+
+  // "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "The dc.type is required",
+
+  // "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "The start date is required",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+
+  // "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Invalid 2 digits ISO 3166 country",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+  // TODO New key - Add a translation
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
+
+  // "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "The organization's name is required",
+  // TODO New key - Add a translation
+  "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.publication.date-invalid" : "The publication date must be one year after 1900",
+  // TODO New key - Add a translation
+  "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.organization.address-required": "The organization to be sent requires an address",
+  // TODO New key - Add a translation
+  "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.city-required": "The address of the organization to be sent requires a city",
+  // TODO New key - Add a translation
+  "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.country-required": "The address of the organization to be sent requires a valid 2 digits ISO 3166 country",
+  // TODO New key - Add a translation
+  "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.disambiguated-organization.required": "An identifier to disambiguate organizations is required. Supported ids are GRID, Ringgold, Legal Entity identifiers (LEIs) and Crossref Funder Registry identifiers",
+  // TODO New key - Add a translation
+  "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.value-required": "The organization's identifiers requires a value",
+  // TODO New key - Add a translation
+  "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.disambiguation-source.required": "The organization's identifiers requires a source",
+  // TODO New key - Add a translation
+  "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.invalid": "The source of one of the organization identifiers is invalid. Supported sources are RINGGOLD, GRID, LEI and FUNDREF",
+  // TODO New key - Add a translation
+  "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.synchronization-mode": "Synchronization mode",
+  // TODO New key - Add a translation
+  "person.page.orcid.synchronization-mode": "Synchronization mode",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  // TODO New key - Add a translation
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  // TODO New key - Add a translation
+  "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+
+  // "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 New key - Add a translation
+  "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-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
+  // TODO New key - Add a translation
+  "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-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
+  // TODO New key - Add a translation
+  "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-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
+  // TODO New key - Add a translation
+  "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-settings-update.success": "The synchronization settings have been updated successfully",
+  // TODO New key - Add a translation
+  "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  // TODO New key - Add a translation
+  "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  // TODO New key - Add a translation
+  "person.page.orcid.synchronization-mode.manual": "Manual",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  // TODO New key - Add a translation
+  "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  // TODO New key - Add a translation
+  "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  // TODO New key - Add a translation
+  "person.page.orcid.scope.activities-update": "Add/update your research activities",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  // TODO New key - Add a translation
+  "person.page.orcid.scope.person-update": "Add/update other information about you",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  // TODO New key - Add a translation
+  "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  // TODO New key - Add a translation
+  "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  // TODO New key - Add a translation
+  "person.orcid.sync.setting": "ORCID Synchronization settings",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  // TODO New key - Add a translation
+  "person.orcid.registry.queue": "ORCID Registry Queue",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  // TODO New key - Add a translation
+  "person.orcid.registry.auth": "ORCID Authorizations",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Friss feltöltések",
+
+  // "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",
+
+
+  // "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.countdown.prefix": "In",
+  // TODO New key - Add a translation
+  "system-wide-alert-banner.countdown.prefix": "In",
+
+  // "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.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.minutes": "{{minutes}} minute(s):",
+  // TODO New key - Add a translation
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+
+
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  // TODO New key - Add a translation
+  "menu.section.system-wide-alert": "System-wide Alert",
+
+  // "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.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.cancel": "Cancel",
+  // TODO New key - Add a translation
+  "system-wide-alert.form.cancel": "Cancel",
+
+  // "system-wide-alert.form.save": "Save",
+  // TODO New key - Add a translation
+  "system-wide-alert.form.save": "Save",
+
+  // "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.inactive": "INACTIVE",
+  // TODO New key - Add a translation
+  "system-wide-alert.form.label.inactive": "INACTIVE",
+
+  // "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.label.message": "Alert message",
+  // TODO New key - Add a translation
+  "system-wide-alert.form.label.message": "Alert message",
+
+  // "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.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.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.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.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.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.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",
+
+  // "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.title": "System-wide Alerts",
+  // TODO New key - Add a translation
+  "admin.system-wide-alert.title": "System-wide Alerts",
+
+
+}
diff --git a/src/assets/i18n/it.json5 b/src/assets/i18n/it.json5
new file mode 100644
index 0000000000..0960b9fae1
--- /dev/null
+++ b/src/assets/i18n/it.json5
@@ -0,0 +1,7856 @@
+{
+
+  // "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": "Non sei autorizzato ad accedere a questa pagina. Puoi usare il pulsante qui sotto per tornare alla home page.",
+
+  // "401.link.home-page": "Take me to the home page",
+  "401.link.home-page": "Torna alla home page",
+
+  // "401.unauthorized": "unauthorized",
+  "401.unauthorized": "Non autorizzato",
+
+
+
+  // "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": "Non si dispone dell'autorizzazione per accedere a questa pagina. Puoi usare il pulsante qui sotto per tornare alla home page.",
+
+  // "403.link.home-page": "Take me to the home page",
+  "403.link.home-page": "Torna alla home page",
+
+  // "403.forbidden": "forbidden",
+  "403.forbidden": "vietato",
+
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Servizio non disponibile",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "Il server non è temporaneamente in grado di soddisfare la richiesta a causa di tempi di inattività di manutenzione o problemi di capacità. Riprova più tardi.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Torna alla 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. ",
+  "404.help": "Non riusciamo a trovare la pagina che stai cercando. La pagina potrebbe essere stata spostata o eliminata. Puoi usare il pulsante qui sotto per tornare alla home page.",
+
+  // "404.link.home-page": "Take me to the home page",
+  "404.link.home-page": "Torna alla home page",
+
+  // "404.page-not-found": "page not found",
+  "404.page-not-found": "Pagina non trovata",
+
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401": "non autorizzato",
+
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403": "accesso negato",
+
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Servizio non disponibile",
+
+  // "error-page.description.404": "page not found",
+  "error-page.description.404": "Pagina non trovata",
+
+  // "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": "Si è verificato un errore con il login via ORCID. Verifica di avere condiviso il tuo account ORCID con DSpace. Se l'errore persiste, contatta l'amministratore",
+
+  // "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": "Solo 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": "Limitato",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Sconosciuto",
+
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+  "admin.curation-tasks.breadcrumbs": "Curation task del sistema",
+
+  // "admin.curation-tasks.title": "System curation tasks",
+  "admin.curation-tasks.title": "Curation task del sistema",
+
+  // "admin.curation-tasks.header": "System curation tasks",
+  "admin.curation-tasks.header": "Curation task del sistema",
+
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+  "admin.registries.bitstream-formats.breadcrumbs": "Formattare il registro",
+
+  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Formato del bitstream",
+
+  // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
+  "admin.registries.bitstream-formats.create.failure.content": "Si è verificato un errore durante la creazione del nuovo formato bitstream.",
+
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Fallimento",
+
+  // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
+  "admin.registries.bitstream-formats.create.head": "Crea formato Bitstream",
+
+  // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
+  "admin.registries.bitstream-formats.create.new": "Aggiungere un nuovo formato bitstream",
+
+  // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
+  "admin.registries.bitstream-formats.create.success.content": "Il nuovo formato bitstream è stato creato correttamente.",
+
+  // "admin.registries.bitstream-formats.create.success.head": "Success",
+  "admin.registries.bitstream-formats.create.success.head": "Successo",
+
+  // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Impossibile rimuovere i formati {{ amount }}",
+
+  // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
+  "admin.registries.bitstream-formats.delete.failure.head": "Fallimento",
+
+  // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
+  "admin.registries.bitstream-formats.delete.success.amount": "Rimosso con successo i formati {{ amount }}",
+
+  // "admin.registries.bitstream-formats.delete.success.head": "Success",
+  "admin.registries.bitstream-formats.delete.success.head": "Successo",
+
+  // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
+  "admin.registries.bitstream-formats.description": "Questo elenco di formati bitstream fornisce informazioni sui formati noti e sul loro livello di supporto.",
+
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formato bitstream",
+
+  // "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+
+  // "admin.registries.bitstream-formats.edit.description.label": "Description",
+  "admin.registries.bitstream-formats.edit.description.label": "Descrizione",
+
+  // "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": "Le estensioni sono estensioni di file che vengono utilizzate per identificare automaticamente il formato dei file caricati. È possibile immettere diverse estensioni per ogni formato.",
+
+  // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Estensione",
+
+  // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Inserisci un'estensione di file senza il punto",
+
+  // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
+  "admin.registries.bitstream-formats.edit.failure.content": "Si è verificato un errore durante la modifica del formato bitstream.",
+
+  // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
+  "admin.registries.bitstream-formats.edit.failure.head": "Fallimento",
+
+  // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
+  "admin.registries.bitstream-formats.edit.head": "Formato Bitstream: {{ 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": "I formati contrassegnati come interni sono nascosti all'utente e utilizzati per scopi amministrativi.",
+
+  // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
+  "admin.registries.bitstream-formats.edit.internal.label": "Interno",
+
+  // "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": "Non è necessario che il tipo MIME associato a questo formato sia univoco.",
+
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Tipo MIME",
+
+  // "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": "Un nome univoco per questo formato (ad esempio, Microsoft Word XP o Microsoft Word 2000)",
+
+  // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
+  "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": "Il formato bitstream è stato modificato correttamente.",
+
+  // "admin.registries.bitstream-formats.edit.success.head": "Success",
+  "admin.registries.bitstream-formats.edit.success.head": "Successo",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Il livello di supporto che la vostra istituzione si impegna a dare a questo formato.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Livello di supporto",
+
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "Registro di sistema del formato Bitstream",
+
+  // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
+  "admin.registries.bitstream-formats.no-items": "Nessun formato bitstream da mostrare.",
+
+  // "admin.registries.bitstream-formats.table.delete": "Delete selected",
+  "admin.registries.bitstream-formats.table.delete": "Elimina selezionato",
+
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Deseleziona tutto",
+
+  // "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "interno",
+
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Tipo MIME",
+
+  // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Nome",
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "ID",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
+  "admin.registries.bitstream-formats.table.return": "Indietro",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conosciuto",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Sostenuto",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Sconosciuto",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Livello di supporto",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Registro di sistema del formato Bitstream",
+
+
+
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  "admin.registries.metadata.breadcrumbs": "Registro dei metadati",
+
+  // "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": "Il Registro dei metadati mantiene un elenco di tutti i campi di metadati disponibili nel repository. Questi campi possono essere suddivisi tra più schemi. Tuttavia, DSpace richiede lo schema Dublin Core qualificato.",
+
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Creare un Metadata Schema",
+
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Modificare il Metadata Schema",
+
+  // "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Nome",
+
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "Namespace",
+
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "Registro dei metadati",
+
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "Nessun Metadata Schema da mostrare.",
+
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Elimina selezionato",
+
+  // "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "ID",
+
+  // "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "Nome",
+
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "Namespace",
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Registro dei metadati",
+
+
+
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
+  "admin.registries.schema.breadcrumbs": "Metadata Schema",
+
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "Questo è il Metadata Schema per \"{{namespace}}.",
+
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "Campi dei metadati dello schema",
+
+  // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
+  "admin.registries.schema.fields.no-items": "Nessun campo di metadati da mostrare.",
+
+  // "admin.registries.schema.fields.table.delete": "Delete selected",
+  "admin.registries.schema.fields.table.delete": "Elimina selezionato",
+
+  // "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.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "Nota di ambito",
+
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Creare un campo di metadati",
+
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Modificare il campo dei metadati",
+
+  // "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Elemento",
+
+  // "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Qualificatore",
+
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Nota di ambito",
+
+  // "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "Metadata Schema",
+
+  // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.created": "Metadata Schema creato correttamente \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.failure": "Impossibile eliminare il Metadata Schema {{amount}}",
+
+  // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
+  "admin.registries.schema.notification.deleted.success": "Metadata Schema {{amount}} eliminato correttamente",
+
+  // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
+  "admin.registries.schema.notification.edited": "Schema di metadati modificato correttamente \"{{prefix}}\"",
+
+  // "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Errore",
+
+  // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.created": "Campo dei metadati creato correttamente \"{{field}}\"",
+
+  // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.failure": "Impossibile eliminare i campi di metadati {{amount}}",
+
+  // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
+  "admin.registries.schema.notification.field.deleted.success": "Campi di metadati {{amount}} eliminati correttamente",
+
+  // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
+  "admin.registries.schema.notification.field.edited": "Campo dei metadati modificato correttamente \"{{field}}\"",
+
+  // "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "Successo",
+
+  // "admin.registries.schema.return": "Back",
+  "admin.registries.schema.return": "Indietro",
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Registro del Metadata Schema",
+
+
+
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+  "admin.access-control.epeople.actions.delete": "Eliminare EPerson",
+
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+  "admin.access-control.epeople.actions.impersonate": "Impersonare EPerson",
+
+  // "admin.access-control.epeople.actions.reset": "Reset password",
+  "admin.access-control.epeople.actions.reset": "Reimposta password",
+
+  // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
+  "admin.access-control.epeople.actions.stop-impersonating": "Smetti di impersonare EPerson",
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "EPeople",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "EPeople",
+
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "EPeople",
+
+  // "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Ricerca",
+
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "Sfoglia tutto",
+
+  // "admin.access-control.epeople.search.scope.metadata": "Metadata",
+  "admin.access-control.epeople.search.scope.metadata": "Metadati",
+
+  // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
+  "admin.access-control.epeople.search.scope.email": "E-mail (esatta)",
+
+  // "admin.access-control.epeople.search.button": "Search",
+  "admin.access-control.epeople.search.button": "Ricerca",
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Cerca persone...",
+
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Aggiungi EPerson",
+
+  // "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "ID",
+
+  // "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "Nome",
+
+  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "E-mail (esatta)",
+
+  // "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Editare",
+
+  // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Modifica \"{{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": "Non sei autorizzato a modificare questo gruppo",
+
+  // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Eliminare \"{{name}}\"",
+
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "Nessuna EPersona da mostrare.",
+
+  // "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Crea EPersona",
+
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Modifica EPersona",
+
+  // "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Nome di battesimo",
+
+  // "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Cognome",
+
+  // "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "Posta elettronica",
+
+  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "Deve essere un indirizzo e-mail valido",
+
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Può accedere",
+
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Richiede certificato",
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Indietro",
+
+  // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.success": "EPerson creato con successo \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Impossibile creare EPerson \"{{name}}\"",
+
+  // "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": "Impossibile creare EPerson \"{{name}}\",  email \"{{email}}\" già in uso.",
+
+  // "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": "Impossibile modificare EPerson \"{{name}}\", email \"{{email}}\" già in uso.",
+
+  // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.success": "EPerson modificato con successo \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Impossibile modificare EPerson \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "EPerson eliminato con successo \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Impossibile eliminare EPerson \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro dei seguenti gruppi:",
+
+  // "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "ID",
+
+  // "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "Nome",
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "collection/Community",
+
+  // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Questo EPerson non è membro di alcun gruppo",
+
+  // "admin.access-control.epeople.form.goToGroups": "Add to groups",
+  "admin.access-control.epeople.form.goToGroups": "Aggiungi ai gruppi",
+
+  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Impossibile eliminare l'EPerson: \"{{name}}\"",
+
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "EPerson eliminata con successo: \"{{name}}\"",
+
+
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Gruppi",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Gruppi",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Modifica gruppo",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Modifica gruppo",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Nuovo Gruppo",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nuovo Gruppo",
+
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Gruppi/Ruoli",
+
+  // "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Aggiungi gruppo",
+
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Gruppi di ricerca",
+
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Sfoglia tutti",
+
+  // "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Ricerca",
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Cerca gruppi...",
+
+  // "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": "Nome",
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+
+  // "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Membri",
+
+  // "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Editare",
+
+  // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.edit": "Modifica \"{{name}}\"",
+
+  // "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",
+
+  // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "Gruppo eliminato con successo \"{{name}}\"",
+
+  // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Impossibile eliminare il gruppo \"{{name}}\"",
+
+  // "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": "Questo gruppo è permanente, quindi non può essere modificato o eliminato. Puoi comunque aggiungere e rimuovere membri del gruppo utilizzando questa pagina.",
+
+  // "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": "Questo gruppo non può essere modificato o eliminato perché corrisponde a un ruolo nella submission e processo del workflow nel \"{{name}}\"  {{comcol}}. Puoi eliminarlo dal Tab <a href='{{comcolEditRolesRoute}}'>\"assegna ruoli\"</a> nella pagina di modifica {{comcol}}. Puoi ancora aggiungere e rimuovere membri del gruppo da questa pagina.",
+
+  // "admin.access-control.groups.form.head.create": "Create group",
+  "admin.access-control.groups.form.head.create": "Crea gruppo",
+
+  // "admin.access-control.groups.form.head.edit": "Edit group",
+  "admin.access-control.groups.form.head.edit": "Modifica gruppo",
+
+  // "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Nome del gruppo",
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Community o collection",
+
+  // "admin.access-control.groups.form.groupDescription": "Description",
+  "admin.access-control.groups.form.groupDescription": "Descrizione",
+
+  // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Gruppo creato con successo \"{{name}}\"",
+
+  // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Impossibile creare il gruppo \"{{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.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Impossibile creare il Gruppo con nome: \"{{name}}\", assicurarsi che il nome non sia già in uso.",
+
+  // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "Impossibile modificare il gruppo \"{{name}}\"",
+
+  // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\" già in uso!",
+
+  // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.success": "Gruppo modificato correttamente \"{{name}}\"",
+
+  // "admin.access-control.groups.form.actions.delete": "Delete Group",
+  "admin.access-control.groups.form.actions.delete": "Elimina gruppo",
+
+  // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.header": "Elimina gruppo \"{{ dsoName }}\"",
+
+  // "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": "Sei sicuro di voler eliminare gruppo \"{{ dsoName }}\"",
+
+  // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Annulla",
+
+  // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Cancellare",
+
+  // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "Gruppo eliminato con successo \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Impossibile eliminare il gruppo \"{{ name }}\"",
+
+  // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
+
+  // "admin.access-control.groups.form.members-list.head": "EPeople",
+  "admin.access-control.groups.form.members-list.head": "EPeople",
+
+  // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
+  "admin.access-control.groups.form.members-list.search.head": "Aggiungi EPeople",
+
+  // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.members-list.button.see-all": "Sfoglia tutto",
+
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "Membri attuali",
+
+  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadati",
+
+  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (esatta)",
+
+  // "admin.access-control.groups.form.members-list.search.button": "Search",
+  "admin.access-control.groups.form.members-list.search.button": "Ricerca",
+
+  // "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+
+  // "admin.access-control.groups.form.members-list.table.name": "Name",
+  "admin.access-control.groups.form.members-list.table.name": "Nome",
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identità",
+
+  // "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",
+  "admin.access-control.groups.form.members-list.table.edit": "Rimuovi / Aggiungi",
+
+  // "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": "Rimuovi membro con nome \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Membro aggiunto con successo: \"{{name}}\"",
+
+  // "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": "Impossibile aggiungere il membro: \"{{name}}\"",
+
+  // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Membro eliminato con successo: \"{{name}}\"",
+
+  // "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": "Impossibile eliminare il membro: \"{{name}}\"",
+
+  // "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": "Aggiungi membro con nome \"{{name}}\"",
+
+  // "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": "Nessun gruppo corrente attivo, invia prima un nome.",
+
+  // "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": "Ancora nessun membro del gruppo, cercali e aggiungili.",
+
+  // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
+  "admin.access-control.groups.form.members-list.no-items": "Nessun EPeople trovato in quella ricerca",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Qualcosa è andato storto: \"{{cause}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.head": "Groups",
+  "admin.access-control.groups.form.subgroups-list.head": "Gruppi",
+
+  // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Aggiungi sottogruppo",
+
+  // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Sfoglia tutto",
+
+  // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Sottogruppi attuali",
+
+  // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Ricerca",
+
+  // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+
+  // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Nome",
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "collection/Community",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Rimuovi / Aggiungi",
+
+  // "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": "Rimuovi sottogruppo con nome \"{{name}}\"",
+
+  // "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.buttons.add": "Aggiungi sottogruppo con nome \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Gruppo attuale",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Sottogruppo aggiunto con successo: \"{{name}}\"",
+
+  // "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": "Impossibile aggiungere il sottogruppo: \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Sottogruppo eliminato con successo: \"{{name}}\"",
+
+  // "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": "Impossibile eliminare il sottogruppo: \"{{name}}\"",
+
+  // "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": "Al momento nessun gruppo attivo, invia prima un nome.",
+
+  // "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": "Questo è il gruppo corrente, non può essere aggiunto.",
+
+  // "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": "Nessun gruppo trovato con questo nel loro nome o questo come 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": "Nessun sottogruppo ancora nel gruppo.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  "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.",
+  "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.",
+  "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.",
+  "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",
+
+  // "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Editare",
+
+  // "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Editare",
+
+  // "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Cancellare",
+
+  // "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Editare",
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "Rendi privato",
+
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "Rendi pubblico",
+
+  // "admin.search.item.move": "Move",
+  "admin.search.item.move": "Sposta",
+
+  // "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Reintegrare",
+
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Ritirare",
+
+  // "admin.search.title": "Administrative Search",
+  "admin.search.title": "Ricerca amministrativa",
+
+  // "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Ricerca amministrativa",
+
+
+
+
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Amministrare il flusso di lavoro",
+
+  // "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Amministrare il flusso di lavoro",
+
+  // "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "Flusso di lavoro",
+
+  // "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.workspace": "Workspace",
+
+  // "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Cancellare",
+
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Rinviare",
+
+  // "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.policies": "Policy",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisione",
+
+
+
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+  "admin.metadata-import.breadcrumbs": "Importare metadati",
+
+  // "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",
+  "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",
+  "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 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",
+  "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",
+  "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": "Rilasciare per sostituire i metadati CSV da importare",
+
+  // "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",
+
+  // "admin.metadata-import.page.button.proceed": "Proceed",
+  "admin.metadata-import.page.button.proceed": "Procedere",
+
+  // "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!",
+  "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",
+
+  // "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": "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",
+  "advanced-workflow-action.rating.form.rating.label": "Valutazione",
+
+  // "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",
+  "advanced-workflow-action.rating.form.review.label": "Revisione",
+
+  // "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",
+  "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",
+  "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",
+  "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",
+  "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",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+
+  // "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",
+  "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",
+  "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",
+  "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)",
+  "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",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Ricerca",
+
+  // "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": "Nome",
+
+  // "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",
+  "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": "Rimuovi / Aggiungi",
+
+  // "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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.",
+  "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.",
+  "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",
+  "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.",
+  "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.",
+  "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",
+  "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.",
+
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "La sessione è scaduta. Effettua nuovamente l'accesso.",
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "Aggiornamento del token di sessione non riuscito. Effettua nuovamente l'accesso.",
+
+
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  "bitstream.download.page": "Sto scaricando {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "bitstream.download.page.back": "Indietro",
+
+
+  // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Modificare i criteri di bitstream",
+
+  // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Modificare i criteri di bitstream",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Indietro",
+
+  // "bitstream.edit.bitstream": "Bitstream: ",
+  "bitstream.edit.bitstream": "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>\".",
+  "bitstream.edit.form.description.hint": "Facoltativamente, fornire una breve descrizione del file, ad esempio \"<i>Articolo principale</i>\" o \"<i>Dati dell'esperimento </i>\".",
+
+  // "bitstream.edit.form.description.label": "Description",
+  "bitstream.edit.form.description.label": "Descrizione",
+
+  // "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": "Si tratta del primo giorno da cui è consentito l'accesso. <b>Questa data non può essere modificata in questo form.</b> Per impostare una data di embargo per un bitstream, vai alla scheda <i>Item Status</i> fare clic su <i>Autorizzazioni... </i>creare o modifica la policy del <i>READ</i> e imposta la <i>Start Date</i> come desiderato.",
+
+  // "bitstream.edit.form.embargo.label": "Embargo until specific date",
+  "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.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Filename",
+
+  // "bitstream.edit.form.newFormat.label": "Describe new format",
+  "bitstream.edit.form.newFormat.label": "Descrivi il nuovo formato",
+
+  // "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": "L'applicazione utilizzata per creare il file e il numero di versione (ad esempio \"<i>ACMESoft SuperApp versione 1.5</i>\").",
+
+  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+
+  // "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": "Se il formato non è presente nell'elenco precedente, <b>selezionare \"formato  non presente in elenco\"  sopra</b> e descriverlo in \"Descrivi nuovo formato.",
+
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Formato selezionato",
+
+  // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
+  "bitstream.edit.form.selectedFormat.unknown": "Formato non presente nell'elenco",
+
+  // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
+  "bitstream.edit.notifications.error.format.title": "Si è verificato un errore durante il salvataggio del formato del bitstream",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "Etichetta IIIF",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Etichetta canvas per questa immagine. Se non viene fornita, verrà utilizzata l'etichetta predefinita.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "Sommario 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": "L'aggiunta di testo qui rende questo l'inizio di un nuovo intervallo di sommario.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "Larghezza area di lavoro IIIF",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "La larghezza dell'area di lavoro deve in genere corrispondere alla larghezza dell'immagine.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "Altezza area di lavoro IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "L'altezza dell'area di lavoro deve in genere corrispondere all'altezza dell'immagine.",
+
+
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "Le modifiche apportate a questo bitstream sono state salvate.",
+
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Bitstream salvato",
+
+  // "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Modifica bitstream",
+
+  // "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": "Hai già accesso a questo file. Se si desidera scaricare il file, fare clic su",
+
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "qui",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Richiedi una copia del file",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Inserisci le seguenti informazioni per richiedere una copia per l'item seguente: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Richiesta del seguente file: ",
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Richiesta di tutti i file.",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Nome *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Il nome è obbligatorio",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Il tuo indirizzo e-mail *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Questo indirizzo e-mail viene utilizzato per l'invio del file.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "Inserisci un indirizzo email valido.",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "File",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Solo il file richiesto",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Tutti i file (di questo item) in accesso limitato",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Messaggio",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Indietro",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Richiedi copia",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "La richiesta di invio è stata inviata correttamente.",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Qualcosa è andato storto con l'invio della richiesta dell'item.",
+
+
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Tutti i risultati",
+
+  // "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "Per Autore",
+
+  // "browse.comcol.by.dateissued": "By Issue Date",
+  "browse.comcol.by.dateissued": "Per data di pubblicazione",
+
+  // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "Per argomento",
+
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "Per titolo",
+
+  // "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Sfogliare",
+
+  // "browse.empty": "No items to show.",
+  "browse.empty": "Nessun item da mostrare.",
+
+  // "browse.metadata.author": "Author",
+  "browse.metadata.author": "Autore",
+
+  // "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Data di pubblicazione",
+
+  // "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Subject",
+
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Titolo",
+
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Sfoglia per Autore",
+
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Sfoglia per Data",
+
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Sfoglia per Argomento",
+
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Sfoglia per Titolo",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Avanti",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Precedente",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Non ci sono ulteriori pagine di risultati",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", inizia per {{ startsWith }}",
+
+  // "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(Scegli start)",
+
+  // "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(Scegli l'anno)",
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Scegli l'anno di pubblicazione",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Filtra i risultati per anno o mese",
+
+  // "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "Aprile",
+
+  // "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "Agosto",
+
+  // "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "Dicembre",
+
+  // "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "Febbraio",
+
+  // "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "Gennaio",
+
+  // "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "Luglio",
+
+  // "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "Giugno",
+
+  // "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "Marzo",
+
+  // "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "Maggio",
+
+  // "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Scegli il mese)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Scegli il mese di pubblicazione",
+
+  // "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "Novembre",
+
+  // "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "Ottobre",
+
+  // "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "Settembre",
+
+  // "browse.startsWith.submit": "Browse",
+  "browse.startsWith.submit": "Sfogliare",
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Filtra per data",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "Oppure digita una data (anno-mese) e clicca sul pulsante Sfoglia",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Per filtrare i risultati inizia a digitare le prime lettere",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Mostra il contenuto di {{ collection }} per {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Mostra il contenuto di {{ collection }} per {{ field }} {{ value }}",
+
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Torna ai risultati",
+
+
+  // "chips.remove": "Remove chip",
+  "chips.remove": "Rimuovere il chip",
+
+
+  // "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",
+  "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",
+  "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": "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 }}",
+
+  // "collection.curate.header": "Curate Collection: {{collection}}",
+  "collection.curate.header": "Curate della collezione: {{collection}}",
+
+  // "collection.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Annulla",
+
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Confermare",
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Eliminazione",
+
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Elimina collection",
+
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "Impossibile eliminare la collection",
+
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "collection eliminata correttamente",
+
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "Sei sicuro di voler eliminare la collection \"{{ dso }}\"",
+
+
+
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Elimina questa collection",
+
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Modifica collection",
+
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "Modifica collection",
+
+
+
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.mapper.head": "Mapper dell' Item",
+
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Modifica collection - Mapper dell'item",
+
+  // "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Annulla",
+
+  // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.collection": "Collezione: \"<b>{{name}}</b>\"",
+
+  // "collection.edit.item-mapper.confirm": "Map selected items",
+  "collection.edit.item-mapper.confirm": "Mappare gli item selezionati",
+
+  // "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": "Si tratta dello strumento di mapping degli item che consente agli amministratori della collection di mappare gli item di altre collections in questa collection. È possibile cercare item di altre collections e mapparli o sfogliare l'elenco degli item attualmente mappati.",
+
+  // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Item Mapper - Mappa item di altre collections",
+
+  // "collection.edit.item-mapper.no-search": "Please enter a query to search",
+  "collection.edit.item-mapper.no-search": "Inserisci una query per avviare la ricerca",
+
+  // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.error.content": "Si sono verificati errori per la mappatura degli item {{amount}}.",
+
+  // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+  "collection.edit.item-mapper.notifications.map.error.head": "Errori di mappatura",
+
+  // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+  "collection.edit.item-mapper.notifications.map.success.content": "Mappato correttamente gli item {{amount}}.",
+
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mappatura completata",
+
+  // "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": "Si sono verificati errori per la rimozione dei mapping degli item {{amount}}.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Rimuovere gli errori di mappatura",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Rimosse con successo le mappature degli item {{amount}}.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Rimuovere la mappatura completata",
+
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Rimuovere i mapping degli item selezionati",
+
+  // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Cerca item...",
+
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Sfoglia gli item mappati",
+
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "Mappare nuovi item",
+
+
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Annulla eliminazione",
+
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Elimina logo",
+
+  // "collection.edit.logo.label": "Collection logo",
+  "collection.edit.logo.label": "Logo della collection",
+
+  // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+  "collection.edit.logo.notifications.add.error": "Caricamento del logo della collection non riuscito. Verifica il contenuto prima di riprovare.",
+
+  // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+  "collection.edit.logo.notifications.add.success": "Caricamento del logo della collection riuscito.",
+
+  // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "collection.edit.logo.notifications.delete.success.title": "Logo cancellato",
+
+  // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+  "collection.edit.logo.notifications.delete.success.content": "Eliminato con successo il logo della collection",
+
+  // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "collection.edit.logo.notifications.delete.error.title": "Errore durante l'eliminazione del logo",
+
+  // "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",
+
+  // "collection.edit.return": "Back",
+  "collection.edit.return": "Indietro",
+
+
+
+  // "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Curate",
+
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Modifica collection - Curate",
+
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+  "collection.edit.tabs.authorizations.head": "Autorizzazioni",
+
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+  "collection.edit.tabs.authorizations.title": "Collection Edit - Autorizzazioni",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Carica più bundles",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "collection.edit.item.authorizations.load-more-button": "Carica più risorse",
+
+  // "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",
+
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Modifica collection - Metadati",
+
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Assegna ruoli",
+
+  // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
+  "collection.edit.tabs.roles.title": "Modifica collection - Ruoli",
+
+  // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
+  "collection.edit.tabs.source.external": "Questa collection raccoglie il suo contenuto da una fonte esterna",
+
+  // "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": "È necessario fornire un ID impostato della collection di destinazione.",
+
+  // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
+  "collection.edit.tabs.source.form.harvestType": "Contenuto che è stato harvestato",
+
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Configurare un'origine esterna",
+
+  // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
+  "collection.edit.tabs.source.form.metadataConfigId": "Formato dei metadati",
+
+  // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+  "collection.edit.tabs.source.form.oaiSetId": "ID set specifico OAI",
+
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+
+  // "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": "Harvest metadati e flussi di bit (richiede il supporto ORE)",
+
+  // "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": "Harvest di metadati e riferimenti a bitstream (richiede il supporto ORE)",
+
+  // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvesta solo metadati",
+
+  // "collection.edit.tabs.source.head": "Content Source",
+  "collection.edit.tabs.source.head": "Origine del contenuto",
+
+  // "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": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
+
+  // "collection.edit.tabs.source.notifications.discarded.title": "Changes discarded",
+  "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.",
+
+  // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
+  "collection.edit.tabs.source.notifications.invalid.title": "Metadati non validi",
+
+  // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
+  "collection.edit.tabs.source.notifications.saved.content": "Le modifiche apportate all'origine di contenuto della collection sono state salvate.",
+
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Origine contenuto salvata",
+
+  // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
+  "collection.edit.tabs.source.title": "Modifica collection - Origine contenuto",
+
+
+
+  // "collection.edit.template.add-button": "Add",
+  "collection.edit.template.add-button": "Aggiungere",
+
+  // "collection.edit.template.breadcrumbs": "Item template",
+  "collection.edit.template.breadcrumbs": "Modello di Item",
+
+  // "collection.edit.template.cancel": "Cancel",
+  "collection.edit.template.cancel": "Annulla",
+
+  // "collection.edit.template.delete-button": "Delete",
+  "collection.edit.template.delete-button": "Cancellare",
+
+  // "collection.edit.template.edit-button": "Edit",
+  "collection.edit.template.edit-button": "Editare",
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Si è verificato un errore durante il recupero del modello dell' Item",
+
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+  "collection.edit.template.head": "Modifica item modello per la collection \"{{ collection }}\"",
+
+  // "collection.edit.template.label": "Template item",
+  "collection.edit.template.label": "Template per Item",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Caricamento del Template per Item...",
+
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+  "collection.edit.template.notifications.delete.error": "Impossibile eliminare il Template dell' Item",
+
+  // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
+  "collection.edit.template.notifications.delete.success": "Eliminato correttamente il Template dell' Item",
+
+  // "collection.edit.template.title": "Edit Template Item",
+  "collection.edit.template.title": "Modifica Template dell' Item",
+
+
+
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Breve descrizione",
+
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Testo introduttivo (HTML)",
+
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Inserisci il nome di una collection",
+
+  // "collection.form.license": "License",
+  "collection.form.license": "Licenza",
+
+  // "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Provenienza",
+
+  // "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Testo protetto da copyright (HTML)",
+
+  // "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "News (HTML)",
+
+  // "collection.form.title": "Name",
+  "collection.form.title": "Nome",
+
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Tipo di entità",
+
+
+
+  // "collection.listelement.badge": "Collection",
+  "collection.listelement.badge": "collection",
+
+
+
+  // "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head": "submissions recenti",
+
+  // "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.recent.empty": "Nessun item da mostrare",
+
+  // "collection.page.edit": "Edit this collection",
+  "collection.page.edit": "Modifica questa collection",
+
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "URI permanente per questa collection",
+
+  // "collection.page.license": "License",
+  "collection.page.license": "Licenza",
+
+  // "collection.page.news": "News",
+  "collection.page.news": "News",
+
+
+
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Conferma selezionato",
+
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "Nessuna collection da mostrare",
+
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "Titolo",
+
+
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Controlli del Harvester",
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Qualcosa è andato storto con l'avvio del test delle impostazioni",
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "Lo script per testare le impostazioni non è riuscito",
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "Lo script per testare le impostazioni è stato completato correttamente",
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Configurazione di prova",
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Configurazione di test...",
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "L'importazione è stata avviata correttamente",
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Qualcosa è andato storto con l'avvio dell'importazione",
+  // "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Importa ora",
+  // "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Importazione...",
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Si è verificato un errore durante l'importazione",
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "L'importazione completata",
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "Il ripristino e la reimportazione sono stati avviati correttamente",
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Qualcosa è andato storto con l'avvio del ripristino e della reimportazione",
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Si è verificato un errore durante il ripristino e la reimportazione",
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Il ripristino e la reimportazione completati",
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Reimpostazione e reimportazione",
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Reimpostazione e reimportazione...",
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Stato dell'harvest:",
+  // "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:",
+  "collection.source.controls.harvest.last": "Ulimo harvest effettuato:",
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Harvest info:",
+  // "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.no-information": "N/D",
+
+
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "Le impostazioni fornite sono state testate e non hanno funzionato.",
+
+  // "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Errore del server",
+
+
+
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Elenco della Community",
+
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Elenco della Community",
+
+  // "communityList.title": "List of Communities",
+  "communityList.title": "Elenco delle Community",
+
+  // "communityList.showMore": "Show More",
+  "communityList.showMore": "Mostra di più",
+
+
+
+  // "community.create.head": "Create a Community",
+  "community.create.head": "Crea una Community",
+
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Community creata con successo",
+
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Creare una sotto-Community per la Community {{ parent }}",
+
+  // "community.curate.header": "Curate Community: {{community}}",
+  "community.curate.header": "Curate della Community: {{community}}",
+
+  // "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Annulla",
+
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Conferma",
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Eliminazione...",
+
+  // "community.delete.head": "Delete Community",
+  "community.delete.head": "Elimina la community",
+
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "Impossibile eliminare la community",
+
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Community eliminata con successo",
+
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "Sei sicuro di voler eliminare la community \"{{ dso }}\"",
+
+  // "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Elimina questa community",
+
+  // "community.edit.head": "Edit Community",
+  "community.edit.head": "Modifica la community",
+
+  // "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Modifica la community",
+
+
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Elimina logo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Annulla l'eliminazione",
+
+  // "community.edit.logo.label": "Community logo",
+  "community.edit.logo.label": "Logo della community",
+
+  // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
+  "community.edit.logo.notifications.add.error": "Caricamento del logo della community non riuscito. Verifica il contenuto prima di riprovare.",
+
+  // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
+  "community.edit.logo.notifications.add.success": "Il logo della community è stato caricato con successo.",
+
+  // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+  "community.edit.logo.notifications.delete.success.title": "Logo eliminato",
+
+  // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+  "community.edit.logo.notifications.delete.success.content": "Il logo della community è stato eliminato con successo",
+
+  // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
+  "community.edit.logo.notifications.delete.error.title": "Errore durante l'eliminazione del logo",
+
+  // "community.edit.logo.upload": "Drop a Community Logo to upload",
+  "community.edit.logo.upload": "Rilascia un logo della community da caricare",
+
+
+
+  // "community.edit.notifications.success": "Successfully edited the Community",
+  "community.edit.notifications.success": "La community è stata modificata con successo",
+
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+  "community.edit.notifications.unauthorized": "Non si dispone dei privilegi per apportare questa modifica",
+
+  // "community.edit.notifications.error": "An error occured while editing the Community",
+  "community.edit.notifications.error": "Si è verificato un errore durante la modifica della community",
+
+  // "community.edit.return": "Back",
+  "community.edit.return": "Indietro",
+
+
+
+  // "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Curate",
+
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Modifica community - Curate",
+
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Modifica metadati",
+
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Modifica community - Metadati",
+
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Assegna ruoli",
+
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Modifica community - Ruoli",
+
+  // "community.edit.tabs.authorizations.head": "Authorizations",
+  "community.edit.tabs.authorizations.head": "Autorizzazioni",
+
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+  "community.edit.tabs.authorizations.title": "Modifica community - Autorizzazioni",
+
+
+
+  // "community.listelement.badge": "Community",
+  "community.listelement.badge": "Community",
+
+
+
+  // "comcol-role.edit.no-group": "None",
+  "comcol-role.edit.no-group": "Nessuno",
+
+  // "comcol-role.edit.create": "Create",
+  "comcol-role.edit.create": "Crea",
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Non è stato possibile creare un gruppo per il ruolo '{{ role }}'",
+
+  // "comcol-role.edit.restrict": "Restrict",
+  "comcol-role.edit.restrict": "Restringi",
+
+  // "comcol-role.edit.delete": "Delete",
+  "comcol-role.edit.delete": "Cancella",
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "Non è stato possibile cancellare il ruolo '{{ role }}' del gruppo",
+
+
+  // "comcol-role.edit.community-admin.name": "Administrators",
+  "comcol-role.edit.community-admin.name": "Amministratori",
+
+  // "comcol-role.edit.collection-admin.name": "Administrators",
+  "comcol-role.edit.collection-admin.name": "Amministratori",
+
+
+  // "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": "Gli amministratori della community possono creare sotto-community o collections e gestire o assegnare la loro gestione. Inoltre, decidono chi può depositare item in qualsiasi sotto-collections, modificare i metadati degli item (dopo l'invio) e aggiungere (mappare) item esistenti da altre collections (previa autorizzazione).",
+
+  // "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": "Gli amministratori della collection decidono chi può depositare item nella collection, modificare i metadati dell'item (dopo l'invio) e aggiungere (mappare) item da altre collections a questa collection (soggetto all'autorizzazione per tale collection).",
+
+
+  // "comcol-role.edit.submitters.name": "Submitters",
+  "comcol-role.edit.submitters.name": "Submitters",
+
+  // "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": "E-People e Gruppi che dispongono dell'autorizzazione per depositare nuovi item in questa collection.",
+
+
+  // "comcol-role.edit.item_read.name": "Default item read access",
+  "comcol-role.edit.item_read.name": "Accesso di sola lettura per gli item",
+
+  // "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": "E-People e gruppi in grado di leggere i nuovi item depositati in questa collection. Le modifiche a questo ruolo non sono retroattive. Gli item esistenti nel sistema saranno ancora visualizzabili da coloro che avevano accesso in sola lettura al momento della loro archiviazione.",
+
+  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
+  "comcol-role.edit.item_read.anonymous-group": "L'accesso di sola lettura per gli item depositati è attualmente impostata su Anonimo.",
+
+
+  // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
+  "comcol-role.edit.bitstream_read.name": "Accesso di sola lettura per il bitstream",
+
+  // "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": "Gli amministratori della community possono creare sotto-community o collections e gestire o assegnare la loro gestione. Inoltre, decidono chi può depositare item in qualsiasi sotto-collections, modificare i metadati degli item (dopo l'invio) e aggiungere (mappare) item esistenti da altre collections (previa autorizzazione).",
+
+  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
+  "comcol-role.edit.bitstream_read.anonymous-group": "L'accesso di sola lettura per i bitstreams depositati è attualmente impostata su Anonimo.",
+
+
+  // "comcol-role.edit.editor.name": "Editors",
+  "comcol-role.edit.editor.name": "Editor",
+
+  // "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": "Gli editor possono modificare i metadati delle submissions depositate e quindi accettarli o rifiutarli.",
+
+
+  // "comcol-role.edit.finaleditor.name": "Final editors",
+  "comcol-role.edit.finaleditor.name": "Editor finali",
+
+  // "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": "Gli editor finali sono in grado di modificare i metadati delle submissions depositate, ma non saranno in grado di rifiutarli.",
+
+
+  // "comcol-role.edit.reviewer.name": "Reviewers",
+  "comcol-role.edit.reviewer.name": "Revisori",
+
+  // "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": "I revisori sono in grado di accettare o rifiutare le submissions depositate. Tuttavia, non sono in grado di modificare i metadati della submission.",
+
+
+  // "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.",
+  "comcol-role.edit.scorereviewers.description": "I valutatori possono assegnare un punteggio ai contributi in entrata, questo definirà se il contributo verrà rifiutato o meno.",
+
+
+
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "Breve descrizione",
+
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Testo introduttivo (HTML)",
+
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Inserisci il nome di una community",
+
+  // "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Testo protetto da copyright (HTML)",
+
+  // "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "News (HTML)",
+
+  // "community.form.title": "Name",
+  "community.form.title": "Nome",
+
+  // "community.page.edit": "Edit this community",
+  "community.page.edit": "Modifica questa community",
+
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "URI permanente di questa Community",
+
+  // "community.page.license": "License",
+  "community.page.license": "Licenza",
+
+  // "community.page.news": "News",
+  "community.page.news": "News",
+
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Sub-community e collections",
+
+  // "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head": "Collections di questa community",
+
+  // "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head": "Communities di questa Community",
+
+
+
+  // "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Accetta tutto",
+
+  // "cookies.consent.accept-selected": "Accept selected",
+  "cookies.consent.accept-selected": "Accetta la selezione",
+
+  // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
+  "cookies.consent.app.opt-out.description": "Questa app è caricata con impostazione predefinita (ma puoi disattivare)",
+
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(opt-out)",
+
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "scopo",
+
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Questa applicazione è sempre richiesta",
+
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(sempre obbligatorio)",
+
+  // "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",
+  "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.",
+
+  // "cookies.consent.close": "Close",
+  "cookies.consent.close": "Chiudere",
+
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Declinare",
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Accetta",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Salvare",
+
+  // "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 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>.",
+  "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",
+
+  // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
+  "cookies.consent.content-modal.description": "Qui puoi vedere e personalizzare le informazioni che raccogliamo su di te.",
+
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "Informativa sulla privacy",
+
+  // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Per saperne di più, leggi la nostra {privacyPolicy}.",
+
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Informazioni che raccogliamo",
+
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "servizi",
+
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "servizio",
+
+  // "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Autenticazione",
+
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication": "Necessario per l'accesso",
+
+
+  // "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Preferenze",
+
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "Necessario per salvare le tue preferenze",
+
+
+
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Riconoscimento",
+
+  // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
+  "cookies.consent.app.description.acknowledgement": "Necessario per salvare i riconoscimenti e i consensi",
+
+
+
+  // "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-analytics": "Google Analitica",
+
+  // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
+  "cookies.consent.app.description.google-analytics": "Ci permette di tracciare i dati statistici",
+
+
+
+  // "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": "Utilizziamo il servizio Google reCAPTCHA nelle fasi di registrazione e recupero password",
+
+
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Funzionale",
+
+  // "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Statistico",
+
+  // "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",
+  "curation-task.task.citationpage.label": "Genera una pagina di citazioni",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Controllare i collegamenti nei metadati",
+
+  // "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.noop.label": "NOOP",
+
+  // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Formati Bitstream del profilo",
+
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Verifica la disponibilità di metadati richiesti",
+
+  // "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Microsoft Translator",
+
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "Scansione antivirus",
+
+  // "curation-task.task.register-doi.label": "Register DOI",
+  "curation-task.task.register-doi.label": "Registra DOI",
+
+
+
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Task:",
+
+  // "curation.form.submit": "Start",
+  "curation.form.submit": "Inizio",
+
+  // "curation.form.submit.success.head": "The curation task has been started successfully",
+  "curation.form.submit.success.head": "La curation task è stata avviata correttamente",
+
+  // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
+  "curation.form.submit.success.content": "Verrai reindirizzato alla pagina del processo corrispondente.",
+
+  // "curation.form.submit.error.head": "Running the curation task failed",
+  "curation.form.submit.error.head": "Esecuzione della curation task non riuscita",
+
+  // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
+  "curation.form.submit.error.content": "Si è verificato un errore durante il tentativo di avviare la curation task",
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "Non è stato possibile determinare l'handle per questo oggetto",
+
+  // "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": "Suggerimento: Inserisci [your-handle-prefix]/0 per eseguire il task in tutto il sito (non tutti i task supportano questa funzionalità)",
+
+
+
+  // "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": "Gentile {{ recipientName }},\nIn risposta alla tua richiesta, mi dispiace informarti che non è possibile inviarti una copia del file(s) richiesto, riguardante il documento: \"{{ itemUrl }}\" ({{ itemName }}), di cui sono uno degli autori. \n\nCordiali saluti,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Richiedi copia del documento",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Si è verificato un errore",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Nega richiesta di copia del documento",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Questo messaggio verrà inviato al richiedente della richiesta",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Richiesta di item rifiutata con successo",
+
+
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Untitled",
+
+
+
+  // "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Nuova collection",
+
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Creare una nuova collection in",
+
+  // "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Nuova Community",
+
+  // "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",
+
+  // "dso-selector.create.community.top-level": "Create a new top-level community",
+  "dso-selector.create.community.top-level": "Creare una nuova community di primo livello",
+
+  // "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Nuovo articolo",
+
+  // "dso-selector.create.item.sub-level": "Create a new item in",
+  "dso-selector.create.item.sub-level": "Creare un nuovo item in",
+
+  // "dso-selector.create.submission.head": "New submission",
+  "dso-selector.create.submission.head": "Nuova submission",
+
+  // "dso-selector.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Modifica collection",
+
+  // "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Modifica Community",
+
+  // "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Modifica item",
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Si è verificato un errore durante la ricerca di un {{ type }}",
+
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Esportare metadati da",
+
+  // "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",
+  "dso-selector.import-batch.dspaceobject.head": "Importa batch da",
+
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "Nessun {{ type }} trovato",
+
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Cerca un {{ type }}",
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Seleziona una collection",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Selezionare un ambito di ricerca",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Cerca in tutto DSpace",
+
+  // "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",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Suggerimenti per il profilo",
+
+  // "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": "Questi sono profili esistenti che potrebbero essere correlati a te. Se ti riconosci in uno di questi profili, selezionalo e, nella pagina dei dettagli, tra le opzioni, scegli di collegarlo. In caso contrario, puoi creare un nuovo profilo cliccando il pulsante qui sotto.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Nessuno di questi è il mio profilo",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Crea uno nuovo profilo",
+
+  // "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",
+  "supervision-group-selector.header": "Selezione del gruppo di supervisione",
+
+  // "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",
+  "supervision-group-selector.select.type-of-order.option.none": "NESSUNO",
+
+  // "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",
+  "supervision-group-selector.select.type-of-order.option.observer": "OSSERVATORE",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Seleziona un gruppo",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Annulla",
+
+  // "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",
+  "supervision-group-selector.select.type-of-order.error": "Seleziona un tipo di ordine",
+
+  // "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 }}",
+  "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",
+  "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",
+  "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 }}",
+
+  // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Sei sicuro di voler esportare i metadati per {{ dsoName }}",
+
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Annulla",
+
+  // "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Export",
+
+  // "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 }}",
+  "confirmation-modal.export-batch.info": "Sei sicuro di voler esportare batch (ZIP) per {{ dsoName }}?",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Annulla",
+
+  // "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 }}\"",
+
+  // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Sei sicuro di voler eliminare l'EPerson \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Annulla",
+
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Elimina",
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Elimina il profilo",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Sei sicuro di voler eliminare il tuo profilo",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Annulla",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Elimina",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  // TODO Source message changed - Revise the translation
+  "confirmation-modal.delete-subscription.header": "Elimina iscrizione per \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Sei sicuro di voler eliminare l'iscrizione per \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Annulla",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Elimina",
+
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Errore durante il recupero del bitstream",
+
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "Errore durante il recupero degli item",
+
+  // "error.collection": "Error fetching collection",
+  "error.collection": "Errore durante il recupero della collection",
+
+  // "error.collections": "Error fetching collections",
+  "error.collections": "Errore durante il recupero delle collections",
+
+  // "error.community": "Error fetching community",
+  "error.community": "Errore durante il recupero della community",
+
+  // "error.identifier": "No item found for the identifier",
+  "error.identifier": "Nessun item trovato per l'identificatore",
+
+  // "error.default": "Error",
+  "error.default": "Errore",
+
+  // "error.item": "Error fetching item",
+  "error.item": "Errore durante il recupero dell'item",
+
+  // "error.items": "Error fetching items",
+  "error.items": "Errore durante il recupero degli item",
+
+  // "error.objects": "Error fetching objects",
+  "error.objects": "Errore durante il recupero degli oggetti",
+
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "Errore durante il recupero delle submissions recenti",
+
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "Errore durante il recupero dei risultati della ricerca",
+
+  // "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": "La query di ricerca non è valida. Controllare <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a> per ulteriori informazioni riguardo questo errore.",
+
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "Errore durante il recupero delle sottoreti",
+
+  // "error.sub-communities": "Error fetching sub-communities",
+  "error.sub-communities": "Errore durante il recupero delle sottocomitarie",
+
+  // "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": "Si è verificato un errore durante l'inizializzazione della sezione, controllare la configurazione dell'input-form. Dettagli: <br> <br>",
+
+  // "error.top-level-communities": "Error fetching top-level communities",
+  "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 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 }}.",
+  "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",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Questo campo è obbligatorio",
+
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Questa e-mail non è un'e-mail valida",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Questa e-mail è già in uso",
+
+  // "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Gruppo già esistente",
+
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Syndication feed",
+
+
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "Errore durante il recupero dei file per questo item",
+
+
+
+  // "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "copyright © 2002-{{ year }}",
+
+  // "footer.link.dspace": "DSpace software",
+  "footer.link.dspace": "Software DSpace",
+
+  // "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "LYRASIS",
+
+  // "footer.link.cookies": "Cookie settings",
+  "footer.link.cookies": "Impostazioni dei cookie",
+
+  // "footer.link.privacy-policy": "Privacy policy",
+  "footer.link.privacy-policy": "Informativa sulla privacy",
+
+  // "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement": "Accordo con l'utente finale",
+
+  // "footer.link.feedback":"Send Feedback",
+  "footer.link.feedback": "Invia Feedback",
+
+
+
+  // "forgot-email.form.header": "Forgot Password",
+  "forgot-email.form.header": "Password dimenticata",
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Inserisci l'indirizzo email associato all'account.",
+
+  // "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "Indirizzo email *",
+
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "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",
+  "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.",
+  "forgot-email.form.email.hint": "Una email con ulteriori indicazioni sarà invita a questo indrizzo.",
+
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Reimposta la password",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "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",
+  "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 }}",
+  "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 }}",
+
+
+
+  // "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Password dimenticata",
+
+  // "forgot-password.form.head": "Forgot Password",
+  "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.",
+  "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",
+
+  // "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Identifica",
+
+  // "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "Indirizzo email: ",
+
+  // "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Password",
+
+  // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
+  "forgot-password.form.label.passwordrepeat": "Digita nuovamente per confermare",
+
+  // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
+  "forgot-password.form.error.empty-password": "Inserisci una password nella casella qui sotto.",
+
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+  "forgot-password.form.error.matching-passwords": "Le password non corrispondono.",
+
+  // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
+  "forgot-password.form.notification.error.title": "Errore durante il tentativo di inviare una nuova password",
+
+  // "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": "La password è stata reimpostata con successo. Hai effettuato l'accesso come l'utente che è stato creato.",
+
+  // "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "La password è stata reimpostata",
+
+  // "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Invia password",
+
+
+  // "form.add": "Add more",
+  "form.add": "Aggiungi altro",
+
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Clicca qui per aggiungere la voce corrente e per aggiungerne un'altra",
+
+  // "form.cancel": "Cancel",
+  "form.cancel": "Annulla",
+
+  // "form.clear": "Clear",
+  "form.clear": "Pulisci",
+
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Clicca qui per rimuovere il valore selezionato",
+
+  // "form.discard": "Discard",
+  "form.discard": "Annulla",
+
+  // "form.drag": "Drag",
+  "form.drag": "Trascina",
+
+  // "form.edit": "Edit",
+  "form.edit": "Edita",
+
+  // "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Clicca qui per modificare il valore selezionato",
+
+  // "form.first-name": "First name",
+  "form.first-name": "Nome",
+
+  // "form.group.add": "Add",
+  "form.group.add": "Aggiungi",
+
+  // "form.group.close": "Close",
+  "form.group.close": "Chiudi",
+
+  // "form.group.set": "Set",
+  "form.group.set": "Set",
+
+  // "form.last-name": "Last name",
+  "form.last-name": "Cognome",
+
+  // "form.loading": "Loading...",
+  "form.loading": "Caricamento...",
+
+  // "form.lookup": "Lookup",
+  "form.lookup": "Ricerca",
+
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Clicca qui per cercare una relazione già esistente",
+
+  // "form.no-results": "No results found",
+  "form.no-results": "Nessun risultato trovato",
+
+  // "form.no-value": "No value entered",
+  "form.no-value": "Non è stato inserito nessun valore",
+
+  // "form.other-information": "",
+  "form.other-information": "",
+
+  // "form.remove": "Remove",
+  "form.remove": "Rimuovi",
+
+  // "form.save": "Save",
+  "form.save": "Salva",
+
+  // "form.save-help": "Save changes",
+  "form.save-help": "Salva le modifiche",
+
+  // "form.search": "Search",
+  "form.search": "Ricerca",
+
+  // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Clicca qui per cercare una corrispondenza già esistente",
+
+  // "form.submit": "Save",
+  "form.submit": "Salva",
+
+  // "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",
+
+
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Non inviare una copia",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Indietro",
+
+  // "grant-deny-request-copy.email.message": "Message",
+  "grant-deny-request-copy.email.message": "Messaggio",
+
+  // "grant-deny-request-copy.email.message.empty": "Please enter a message",
+  "grant-deny-request-copy.email.message.empty": "Inserisci un messaggio",
+
+  // "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": "In questa fase è possibile riconsiderare le restrizioni di accesso al documento, in modo da evitare di dover rispondere a tali richieste. Se desideri chiedere agli amministratori del repository di rimuovere queste restrizioni, seleziona la casella qui sotto.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Modifica in open access",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Invia",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Subject",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Inserisci un subject",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Invia una copia",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Richiedi una copia del documento",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Torna alla 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": "Se sei uno degli autori del documento <a href='{{ url }}'>{{ name }}</a> seleziona una delle seguenti opzioni per rispondere alla richiesta dell'utente.",
+
+  // "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": "Dopo aver scelto un'opzione, ti verrà suggerita una risposta e-mail che potrai modificare.",
+
+  // "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": "Questa richiesta è già stata elaborata. Puoi cliccare il pulsante qui sotto per tornare alla home page.",
+
+
+
+  // "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": "Gentile {{ recipientName }},\nin tisposta alla tua richiesta, ho il piacere di inviarti come allegato una copia del file riferito al documento: \"{{ itemUrl }}\" ({{ itemName }}), di cui sono l'autore.\n\nUn cordiale saluto,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Richiedi una copia del documento",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Si è verificato un errore",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Richiedi una copia del documento di sovvenzione",
+
+  // "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": "Questo messaggio verrà inviato a chi ha effettuato la richiesta. VErranno allegati i documenti richiesti.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Richiesta dell'item concessa con successo",
+
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Health",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Health",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Informazioni",
+
+  // "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",
+  "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",
+  "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",
+  "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": "Backend dell'applicativo",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Stato",
+
+  // "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",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Sono stati rilevati dei potenziali problemi",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Health",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Nessun problema rilevato",
+
+
+  // "home.description": "",
+  "home.description": "",
+
+  // "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Home",
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Cerca nel repository ...",
+
+  // "home.title": "Home",
+  "home.title": "Home",
+
+  // "home.top-level-communities.head": "Communities in DSpace",
+  "home.top-level-communities.head": "DSpace Communities",
+
+  // "home.top-level-communities.help": "Search for a collection",
+  "home.top-level-communities.help": "Cerca una collection",
+
+
+
+  // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
+  "info.end-user-agreement.accept": "Ho letto e accetto l'Accordo con l'utente finale",
+
+  // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
+  "info.end-user-agreement.accept.error": "Si è verificato un errore durante l'accettazione dell'Accordo con l'utente finale",
+
+  // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
+  "info.end-user-agreement.accept.success": "L'Accordo con l'utente finale è stato aggiornato con successo",
+
+  // "info.end-user-agreement.breadcrumbs": "End User Agreement",
+  "info.end-user-agreement.breadcrumbs": "Accordo con l'utente finale",
+
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Annulla",
+
+  // "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Salva",
+
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Accordo con l'utente finale",
+
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Accordo con l'utente finale",
+
+  // "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Informativa sulla privacy",
+
+  // "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Informativa sulla privacy",
+
+  // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Informativa sulla privacy",
+
+  // "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": "Grazie per aver condiviso il tuo feedback sul DSpace. I vostri commenti sono importanti!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Questo indirizzo verrà utilizzato per dare una risposta al tuo feedback.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Invia feedback",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Commenti",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "La tua email",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Feedback inviato con successo!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Inserire un un indirizzo email valido",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Inserire un commento",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "Pagina",
+
+  // "info.feedback.page_help": "Tha page related to your feedback",
+  "info.feedback.page_help": "In questa pagina trovi i tuoi feedback",
+
+
+
+  // "item.alerts.private": "This item is non-discoverable",
+  "item.alerts.private": "Questo item è privato",
+
+  // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Questo item è stato rimosso",
+
+
+
+  // "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 questo editor puoi vedere e modificare le policies di un item, e anche modificare le policies dei singoli componenti dell'item: bundles e bitstreams. Un item è il contenitore di bundles, e i bundles sono contenitori di bitstreams. I contenitori riportano solitamente le policies di ADD/REMOVE/READ/WRITE, mentre i bitstreams hanno solamente policies di READ/WRITE.",
+
+  // "item.edit.authorizations.title": "Edit item's Policies",
+  "item.edit.authorizations.title": "Modificare le policies dell'item",
+
+
+
+  // "item.badge.private": "Non-discoverable",
+  "item.badge.private": "Privato",
+
+  // "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn": "Rimosso",
+
+
+
+  // "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "Bundle",
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "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.",
+  "item.bitstreams.upload.bundles.empty": "Questo item non contiene alcun bundle in cui caricare un bitstream.",
+
+  // "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Annulla",
+
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Rilascia un file da caricare",
+
+  // "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Item:",
+
+  // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Il nuovo bundle è stato creato con successo.",
+
+  // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Bundle creato",
+
+  // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
+  "item.bitstreams.upload.notifications.upload.failed": "Caricamento non riuscito. Verifica il contenuto prima di riprovare.",
+
+  // "item.bitstreams.upload.title": "Upload bitstream",
+  "item.bitstreams.upload.title": "Carica bitstream",
+
+
+
+  // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Carica",
+
+  // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
+  "item.edit.bitstreams.bundle.displaying": "Attualmente sono visualizzati {{ amount }} bitstream su {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Carica tutto ({{ total }})",
+
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Carica più risorse",
+
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Annulla",
+
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Download",
+
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Trascina",
+
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Edita",
+
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Rimuovi",
+
+  // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
+  "item.edit.bitstreams.edit.buttons.undo": "Annullare le modifiche",
+
+  // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
+  "item.edit.bitstreams.empty": "Questo item non contiene bitstreams. Fai clic sul pulsante di caricamento per crearne uno.",
+
+  // "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Azioni",
+
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Bundle",
+
+  // "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Descrizione",
+
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Formato",
+
+  // "item.edit.bitstreams.headers.name": "Name",
+  "item.edit.bitstreams.headers.name": "Nome",
+
+  // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.bitstreams.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
+
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Modifiche annullate",
+
+  // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
+  "item.edit.bitstreams.notifications.move.failed.title": "Errore durante lo spostamento dei bitstreams",
+
+  // "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": "Le modifiche di spostamento dei bitstream e dei bundle di questo item sono state salvate.",
+
+  // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
+  "item.edit.bitstreams.notifications.move.saved.title": "Spostamento delle modifiche salvato",
+
+  // "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": "L'item su cui stai attualmente lavorando è stato modificato da un altro utente. Le modifiche correnti verranno eliminate per evitare conflitti",
+
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Modifiche obsolete",
+
+  // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Errore durante l'eliminazione del bitstream",
+
+  // "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": "Le modifiche apportate alla rimozione dei bitstreams di questo item sono state salvate.",
+
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Annullamento delle modifiche salvato",
+
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Annulla",
+
+  // "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Salva",
+
+  // "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button": "Carica",
+
+
+
+  // "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Annulla",
+
+  // "item.edit.delete.confirm": "Delete",
+  "item.edit.delete.confirm": "Elimina",
+
+  // "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": "Sei sicuro che questo item debba essere eliminato definitivamente? Attenzione: attualmente, non verrà lasciato alcun placeholder.",
+
+  // "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Si è verificato un errore durante la cancellazione dell'item",
+
+  // "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Elimina item: {{ id }}",
+
+  // "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "L'item è stato eliminato",
+
+  // "item.edit.head": "Edit Item",
+  "item.edit.head": "Modifica item",
+
+  // "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Modifica item",
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "Non sei autorizzato ad accedere a questa tab",
+
+
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "collection Mapper",
+
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Modifica item - Mapper Collection",
+
+  // "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",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "In coda per la registrazione",
+
+  // "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",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registrato",
+
+  // "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)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Assegnato (aggiornamento in coda)",
+
+  // "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",
+  "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",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "In coda per l'eliminazione",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Eliminato",
+
+  // "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)",
+  "item.edit.identifiers.doi.status.MINTED": "Creato (non registrato)",
+
+  // "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...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registra DOI...",
+
+  // "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",
+  "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",
+  "item.edit.register-doi.confirm": "Conferma",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Annulla",
+
+  // "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",
+  "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",
+  "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",
+
+  // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
+  "item.edit.item-mapper.buttons.remove": "Rimuovere il mapping degli item per le collections selezionate",
+
+  // "item.edit.item-mapper.cancel": "Cancel",
+  "item.edit.item-mapper.cancel": "Annulla",
+
+  // "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": "Si tratta dello strumento di mapping degli item che consente agli amministratori di mappare questo item in altre collections. È possibile cercare le collections e mapparle, o sfogliare l'elenco delle collections in cui è attualmente mappato l'item.",
+
+  // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
+  "item.edit.item-mapper.head": "Item Mapper - Mappa l'item nelle collections",
+
+  // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
+
+  // "item.edit.item-mapper.no-search": "Please enter a query to search",
+  "item.edit.item-mapper.no-search": "Inserisci una query per avviare la ricerca",
+
+  // "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": "Si sono verificati degli errori nella mappatura dell'item in {{amount}} collections.",
+
+  // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
+  "item.edit.item-mapper.notifications.add.error.head": "Errori di mappatura",
+
+  // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.add.success.content": "L'item è stato mappato correttamente in {{amount}} collections.",
+
+  // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
+  "item.edit.item-mapper.notifications.add.success.head": "Mappatura completata",
+
+  // "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": "Si sono verificati degli errori nella rimozione del mapping da {{amount}} collections.",
+
+  // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
+  "item.edit.item-mapper.notifications.remove.error.head": "Gli errori di mappatura sono stati rimossi",
+
+  // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
+  "item.edit.item-mapper.notifications.remove.success.content": "L'item mappato è stato rimosso correttamente da {{amount}} collections.",
+
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Rimozione della mappatura completata",
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Cerca collections...",
+
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Sfoglia le collections mappate",
+
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "Mappa le nuove collections",
+
+
+
+  // "item.edit.metadata.add-button": "Add",
+  "item.edit.metadata.add-button": "Aggiungi",
+
+  // "item.edit.metadata.discard-button": "Discard",
+  "item.edit.metadata.discard-button": "Annulla",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Conferma",
+
+  // "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",
+
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Rimuovi",
+
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Annullare le modifiche",
+
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "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",
+  "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.",
+
+  // "item.edit.metadata.headers.edit": "Edit",
+  "item.edit.metadata.headers.edit": "Edita",
+
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Campo",
+
+  // "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Lang",
+
+  // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Valore",
+
+  // "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",
+
+  // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "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",
+  "item.edit.metadata.notifications.discarded.title": "Modifiche eliminate",
+
+  // "item.edit.metadata.notifications.error.title": "An error occurred",
+  "item.edit.metadata.notifications.error.title": "Si è verificato un errore",
+
+  // "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": "Le modifiche non sono state salvate. Assicurati che tutti i campi siano corretti prima di salvare.",
+
+  // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "item.edit.metadata.notifications.invalid.title": "Metadati non validi",
+
+  // "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": "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",
+  "item.edit.metadata.notifications.outdated.title": "Modifiche obsolete",
+
+  // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
+  "item.edit.metadata.notifications.saved.content": "Le modifiche apportate ai metadati di questo item sono state salvate.",
+
+  // "item.edit.metadata.notifications.saved.title": "Metadata saved",
+  "item.edit.metadata.notifications.saved.title": "Metadati salvati",
+
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Annulla",
+
+  // "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",
+
+
+
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Campo",
+
+  // "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Lingua",
+
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Valore",
+
+
+
+  // "item.edit.move.cancel": "Back",
+  "item.edit.move.cancel": "Indietro",
+
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Salva",
+
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Annulla",
+
+  // "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": "Seleziona la collection in cui desideri spostare questo item. Per restringere l'elenco delle collections visualizzate è possibile effettuare una ricerca.",
+
+  // "item.edit.move.error": "An error occurred when attempting to move the item",
+  "item.edit.move.error": "Si è verificato un errore durante il tentativo di spostare l'item",
+
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Sposta l'item: {{id}}",
+
+  // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
+  "item.edit.move.inheritpolicies.checkbox": "Ereditare i criteri",
+
+  // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
+  "item.edit.move.inheritpolicies.description": "Ereditare i criteri predefiniti dell'insieme di destinazione",
+
+  // "item.edit.move.move": "Move",
+  "item.edit.move.move": "Sposta",
+
+  // "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Sposta...",
+
+  // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
+  "item.edit.move.search.placeholder": "Effettuare una ricerca per collections",
+
+  // "item.edit.move.success": "The item has been moved successfully",
+  "item.edit.move.success": "L'item è stato spostato correttamente",
+
+  // "item.edit.move.title": "Move item",
+  "item.edit.move.title": "Sposta item",
+
+
+
+  // "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Annulla",
+
+  // "item.edit.private.confirm": "Make it non-discoverable",
+  "item.edit.private.confirm": "Rendilo privato",
+
+  // "item.edit.private.description": "Are you sure this item should be made non-discoverable in the archive?",
+  "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",
+  "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 }}",
+
+  // "item.edit.private.success": "The item is now non-discoverable",
+  "item.edit.private.success": "L'item è ora privato",
+
+
+
+  // "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "Annulla",
+
+  // "item.edit.public.confirm": "Make it discoverable",
+  "item.edit.public.confirm": "Rendilo pubblico",
+
+  // "item.edit.public.description": "Are you sure this item should be made discoverable in the archive?",
+  "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",
+  "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",
+  "item.edit.public.success": "L'item è ora pubblico",
+
+
+
+  // "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Annulla",
+
+  // "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Ripristina",
+
+  // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
+  "item.edit.reinstate.description": "Sei sicuro che questo item debba essere ripristinato nell'archivio?",
+
+  // "item.edit.reinstate.error": "An error occurred while reinstating the item",
+  "item.edit.reinstate.error": "Si è verificato un errore durante il ripristino dell'item",
+
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Ripristina l'item: {{ id }}",
+
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "L'item è stato ripristinato correttamente",
+
+
+
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Annulla",
+
+  // "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Aggiungi",
+
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Rimuovi",
+
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Annullare le modifiche",
+
+  // "item.edit.relationships.no-relationships": "No relationships",
+  "item.edit.relationships.no-relationships": "Nessuna relazione",
+
+  // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "item.edit.relationships.notifications.discarded.content": "Le modifiche sono state annullate. Per ripristinarle, fai clic sul pulsante \"Annulla\"",
+
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Modifiche annullate",
+
+  // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
+  "item.edit.relationships.notifications.failed.title": "Errore nella modifica delle relazioni",
+
+  // "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": "L'item su cui stai attualmente lavorando è stato modificato da un altro utente. Le modifiche correnti verranno eliminate per evitare conflitti",
+
+  // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
+  "item.edit.relationships.notifications.outdated.title": "Modifiche obsolete",
+
+  // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
+  "item.edit.relationships.notifications.saved.content": "Le modifiche apportate alle relazioni di questo item sono state salvate.",
+
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Relazioni salvate",
+
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Annulla",
+
+  // "item.edit.relationships.save-button": "Save",
+  "item.edit.relationships.save-button": "Salva",
+
+  // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
+  "item.edit.relationships.no-entity-type": "Aggiungi i metadati 'dspace.entity.type' per abilitare le relazioni per questo item",
+
+
+  // "item.edit.return": "Back",
+  "item.edit.return": "Indietro",
+
+
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Bitstreams",
+
+  // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
+  "item.edit.tabs.bitstreams.title": "Modifica item - Bitstreams",
+
+  // "item.edit.tabs.curate.head": "Curate",
+  "item.edit.tabs.curate.head": "Curate",
+
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
+  "item.edit.tabs.curate.title": "Modifica item - Curate",
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curate Item: {{item}}",
+
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "Metadati",
+
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Modifica item - Metadati",
+
+  // "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Relazioni",
+
+  // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Modifica item - Relazioni",
+
+  // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
+  "item.edit.tabs.status.buttons.authorizations.button": "Autorizzazioni...",
+
+  // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
+  "item.edit.tabs.status.buttons.authorizations.label": "Modificare i criteri di autorizzazione degli item",
+
+  // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
+  "item.edit.tabs.status.buttons.delete.button": "Elimina definitivamente",
+
+  // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
+  "item.edit.tabs.status.buttons.delete.label": "Rimuovere completamente l'item",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "collections mappate",
+
+  // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
+  "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",
+  "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...",
+  "item.edit.tabs.status.buttons.private.button": "Rendilo privato...",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
+  "item.edit.tabs.status.buttons.private.label": "Rendere l'item privato",
+
+  // "item.edit.tabs.status.buttons.public.button": "Make it discoverable...",
+  "item.edit.tabs.status.buttons.public.button": "Rendilo pubblico...",
+
+  // "item.edit.tabs.status.buttons.public.label": "Make item discoverable",
+  "item.edit.tabs.status.buttons.public.label": "Rendere l'item pubblico",
+
+  // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
+  "item.edit.tabs.status.buttons.reinstate.button": "Ripristino...",
+
+  // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
+  "item.edit.tabs.status.buttons.reinstate.label": "Ripristinare l'item nel repository",
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "Non sei autorizzato a eseguire questa azione",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "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",
+
+  // "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": "Benvenuti nella pagina di gestione degli item. Da qui è possibile rimuovere, ripristinare, spostare o eliminare l'item. È inoltre possibile aggiornare o aggiungere nuovi metadati / bitstream nelle altre schede.",
+
+  // "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "Stato",
+
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "Gestisci",
+
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "ID interno dell'item",
+
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Pagina dell'item",
+
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Ultima modifica",
+
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Modifica item - Stato",
+
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Cronologia delle versioni",
+
+  // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
+  "item.edit.tabs.versionhistory.title": "Modifica item - Cronologia delle versioni",
+
+  // "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": "La modifica o l'aggiunta di nuove versioni non è ancora possibile in questa interfaccia utente.",
+
+  // "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Visualizza item",
+
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "Modifica item - Visualizza",
+
+
+
+  // "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Annulla",
+
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Rimuovi",
+
+  // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
+  "item.edit.withdraw.description": "Sei sicuro che questo articolo debba essere rimosso dall'archivio?",
+
+  // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
+  "item.edit.withdraw.error": "Si è verificato un errore durante la rimozione dell'item",
+
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Item rimosso: {{ id }}",
+
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "L'item è stato rimosso con successo",
+
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Indietro",
+
+
+  // "item.listelement.badge": "Item",
+  "item.listelement.badge": "Item",
+
+  // "item.page.description": "Description",
+  "item.page.description": "Descrizione",
+
+  // "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "ISSN",
+
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Titolo del periodico",
+
+  // "item.page.publisher": "Publisher",
+  "item.page.publisher": "Editore",
+
+  // "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Item: ",
+
+  // "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Titolo del volume",
+
+  // "item.search.results.head": "Item Search Results",
+  "item.search.results.head": "Risultati della ricerca degli item",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "Ricerca articoli",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Mostra di più",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Riduci",
+
+  // "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+  // TODO New key - Add a translation
+  "item.qa-event-notification.check.notification-info": "There are {{num}} pending suggestions related to your account",
+
+  // "item.qa-event-notification-info.check.button": "View",
+  // TODO New key - Add a translation
+  "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": "Elimina l'ordine di supervisione",
+
+  // "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",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Annulla",
+
+  // "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}}\"",
+  "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}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Impossibile eliminare l'ordine di supervisione \"{{name}}\"",
+
+  // "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",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Rimuovi gruppo di supervisione",
+
+
+
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "Abstract",
+
+  // "item.page.author": "Authors",
+  "item.page.author": "Autori",
+
+  // "item.page.citation": "Citation",
+  "item.page.citation": "Citazione",
+
+  // "item.page.collections": "Collections",
+  "item.page.collections": "collections",
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Caricamento...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Carica più risorse",
+
+  // "item.page.date": "Date",
+  "item.page.date": "Data",
+
+  // "item.page.edit": "Edit this item",
+  "item.page.edit": "Modifica questo item",
+
+  // "item.page.files": "Files",
+  "item.page.files": "File",
+
+  // "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Descrizione:",
+
+  // "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "Download",
+
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Formato:",
+
+  // "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Nome:",
+
+  // "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Dimensione:",
+
+  // "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Articoli in questo periodico",
+
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "Mostra tutti i metadati",
+
+  // "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "Visualizzazione ridotta",
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Apri la pagina delle impostazioni ORCID",
+
+  // "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Articoli di questo autore",
+
+  // "item.page.related-items.view-more": "Show {{ amount }} more",
+  "item.page.related-items.view-more": "Mostra altri {{ amount }} ",
+
+  // "item.page.related-items.view-less": "Hide last {{ amount }}",
+  "item.page.related-items.view-less": "Nascondi l'ultimo {{ amount }}",
+
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Pubblicazioni",
+
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Pubblicazioni",
+
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Autori",
+
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Progetti di ricerca",
+
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "Keywords",
+
+  // "item.page.uri": "URI",
+  "item.page.uri": "URI",
+
+  // "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Mostra di più",
+
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Riduci",
+
+  // "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.filesection.original.bundle": "Original bundle",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "License bundle",
+
+  // "item.page.return": "Back",
+  "item.page.return": "Indietro",
+
+  // "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": "Impossibile creare una nuova versione perché è presente un'submission in corso nella cronologia delle versioni",
+
+  // "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Collega",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Collega questo item come profilo",
+
+  // "item.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Identificativo:",
+
+  // "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Autori:",
+
+  // "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Data di pubblicazione:",
+
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Abstract:",
+
+  // "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Altri identificativi:",
+
+  // "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Lingua:",
+
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Soggetti:",
+
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Titolo:",
+
+  // "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Tipologia:",
+
+  // "item.preview.oaire.citation.issue": "Issue",
+  "item.preview.oaire.citation.issue": "Fascicolo",
+
+  // "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.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
+
+  // "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "Identificativo:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Periodico or Serie",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Cognome:",
+
+  // "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Nome:",
+
+  // "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": " Finanziatore:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Indentificativo del finanziatore:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "ID del finanziamento:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Acronimo:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Giurisdizione:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Flusso di finanziamento:",
+
+
+
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Conferma la selezione",
+
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "Nessun item da mostrare",
+
+  // "item.select.table.author": "Author",
+  "item.select.table.author": "Autore",
+
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "collection",
+
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "Titolo",
+
+
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Non ci sono ancora altre versioni per questo item.",
+
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "Cronologia delle versioni",
+
+  // "item.version.history.return": "Back",
+  "item.version.history.return": "Indietro",
+
+  // "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Versione selezionata",
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Stai attualmente visualizzando la versione {{version}} dell'item.",
+
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Versione",
+
+  // "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Item",
+
+  // "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Editor",
+
+  // "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Data",
+
+  // "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Riepilogo",
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Workspace item",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Workflow item",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Azione",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Modificare il workspace item",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Modifica riepilogo",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Salva le modifiche del riepilogo",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Elimina le modifiche del riepilogo",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Crea una nuova versione da qui",
+
+  // "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": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
+
+
+  // "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": "Questa non è la versione più recente di questo item. Puoi trovare l'ultima versione <a href='{{destination}}'>qui</a>.",
+
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Nuova versione",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Crea una nuova versione per questo item",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "a partire dalla versione {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Crea",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Crea una nuova versione",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Annulla",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Non creare una nuova versione",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Riepilogo",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Inserire un riepilogo per la nuova versione",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Creazione della nuova versione...",
+
+  // "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": "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}}",
+  "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",
+  "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": "Non è possibile creare una nuova versione perchè c'è già una submission in progress nella cronologia delle versioni",
+
+
+  // "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Elimina versione",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Vuoi eliminare la versione {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Elimina",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Elimina questa versione",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Annulla",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "Non eliminare questa versione",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "La versione numero {{version}} è stata eliminata",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "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",
+  "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",
+  "item.version.edit.notification.failure": "Il riepilogo della versione numero {{version}} non è stato modificato",
+
+
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Aggiungi",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Elimina",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Conferma",
+
+  // "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",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Modifica",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Rimuovi",
+
+  // "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",
+  "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.",
+  "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",
+  "itemtemplate.edit.metadata.headers.edit": "Modifica",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Campo",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Lingua",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valore",
+
+  // "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",
+  "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",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Le tue modifiche sono state eliminate. Per riprtinarle, cliccare sul tasto 'Annulla'",
+
+  // "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",
+  "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.",
+  "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",
+  "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",
+  "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": "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.",
+  "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",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadati salvati",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Annulla",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Annulla riordinamento",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Salva",
+
+
+
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Periodico",
+
+  // "journal.page.description": "Description",
+  "journal.page.description": "Descrizione",
+
+  // "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Modifica questo item",
+
+  // "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Redattore Capo",
+
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
+
+  // "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Editore",
+
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Periodico: ",
+
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "Risultati della ricerca Periodici",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Risultati della ricerca Periodici",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Ricerca Periodici",
+
+
+
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Fascicolo del periodico",
+
+  // "journalissue.page.description": "Description",
+  "journalissue.page.description": "Descrizione",
+
+  // "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Modifica questo item",
+
+  // "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Data di pubblicazione",
+
+  // "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ISSN",
+
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Titolo del periodico",
+
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Keywords",
+
+  // "journalissue.page.number": "Number",
+  "journalissue.page.number": "Numero",
+
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Fascicolo del periodico: ",
+
+
+
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Volume del periodico",
+
+  // "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Descrizione",
+
+  // "journalvolume.page.edit": "Edit this item",
+  "journalvolume.page.edit": "Modifica questo item",
+
+  // "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Data di pubblicazione",
+
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Volume del periodico: ",
+
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Volume",
+
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Allegati",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Documento: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Link Permanente: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Item:",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Descrizione: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Usa lo schermo intero per una migliore visualizzazione.",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Immagini multimediali",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Immagine: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Link Permanente: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Item: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Descrizione: ",
+
+
+  // "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Caricamento bitstream...",
+
+  // "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Caricamento bitstream...",
+
+  // "loading.browse-by": "Loading items...",
+  "loading.browse-by": "Caricamento articoli...",
+
+  // "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Caricamento pagina...",
+
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "Caricamento collezione...",
+
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "Caricamento collezioni...",
+
+  // "loading.content-source": "Loading content source...",
+  "loading.content-source": "Caricamento contenuto originale...",
+
+  // "loading.community": "Loading community...",
+  "loading.community": "Caricamento community...",
+
+  // "loading.default": "Loading...",
+  "loading.default": "Caricamento...",
+
+  // "loading.item": "Loading item...",
+  "loading.item": "Caricamento articolo...",
+
+  // "loading.items": "Loading items...",
+  "loading.items": "Caricamento articoli...",
+
+  // "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Caricamento articoli...",
+
+  // "loading.objects": "Loading...",
+  "loading.objects": "Caricamento...",
+
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "Caricamento immissioni recenti...",
+
+  // "loading.search-results": "Loading search results...",
+  "loading.search-results": "Caricamento risultati della ricerca...",
+
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "Caricamento sotto-collezioni...",
+
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Caricamento sotto-comunità...",
+
+  // "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities": "Caricamento di community di primo livello...",
+
+
+
+  // "login.form.email": "Email address",
+  "login.form.email": "Indirizzo email",
+
+  // "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "Hai dimenticato la password?",
+
+  // "login.form.header": "Please log in to DSpace",
+  "login.form.header": "Accedi a DSpace",
+
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "Nuovo utente? Clicca qui per registrarti.",
+
+  // "login.form.or-divider": "or",
+  "login.form.or-divider": "oppure",
+
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Accedi con OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Accedi con ORCID",
+
+  // "login.form.password": "Password",
+  "login.form.password": "Password",
+
+  // "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Accedi con Shibboleth",
+
+  // "login.form.submit": "Log in",
+  "login.form.submit": "Accedi",
+
+  // "login.title": "Login",
+  "login.title": "Accesso",
+
+  // "login.breadcrumbs": "Login",
+  "login.breadcrumbs": "Accesso",
+
+
+
+  // "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "Disconnettersi da DSpace",
+
+  // "logout.form.submit": "Log out",
+  "logout.form.submit": "Esci",
+
+  // "logout.title": "Logout",
+  "logout.title": "Logout",
+
+
+
+  // "menu.header.admin": "Management",
+  "menu.header.admin": "Gestione",
+
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "Logo del repository",
+
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Menu di gestione",
+
+
+
+  // "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Controllo di accesso",
+
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Autorizzazioni",
+
+  // "menu.section.access_control_groups": "Groups",
+  "menu.section.access_control_groups": "Gruppi",
+
+  // "menu.section.access_control_people": "People",
+  "menu.section.access_control_people": "Persone",
+
+
+
+  // "menu.section.admin_search": "Admin Search",
+  "menu.section.admin_search": "Ricerca admin",
+
+
+
+  // "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Questa Community",
+
+  // "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "Per Autore",
+
+  // "menu.section.browse_community_by_issue_date": "By Issue Date",
+  "menu.section.browse_community_by_issue_date": "Per data di pubblicazione",
+
+  // "menu.section.browse_community_by_title": "By Title",
+  "menu.section.browse_community_by_title": "Per titolo",
+
+  // "menu.section.browse_global": "All of DSpace",
+  // TODO New key - Add a translation
+  "menu.section.browse_global": "Tutto DSpace",
+
+  // "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",
+  "menu.section.browse_global_by_dateissued": "Per data di pubblicazione",
+
+  // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "Per argomento",
+
+  // "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",
+  "menu.section.communities_and_collections": "Community & Collezioni",
+
+
+
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Pannello di controllo",
+
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "Curation Task",
+
+
+
+  // "menu.section.edit": "Edit",
+  "menu.section.edit": "Modificare",
+
+  // "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Collezione",
+
+  // "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Community",
+
+  // "menu.section.edit_item": "Item",
+  "menu.section.edit_item": "Articolo",
+
+
+
+  // "menu.section.export": "Export",
+  "menu.section.export": "Esporta",
+
+  // "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Collezione",
+
+  // "menu.section.export_community": "Community",
+  "menu.section.export_community": "Community",
+
+  // "menu.section.export_item": "Item",
+  "menu.section.export_item": "Articolo",
+
+  // "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata": "Metadati",
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Batch Export (ZIP)",
+
+
+  // "menu.section.icon.access_control": "Access Control menu section",
+  "menu.section.icon.access_control": "Sezione del menu Controllo di accesso",
+
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Sezione del menu di ricerca dell'amministratore",
+
+  // "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Sezione del menu del Pannello di controllo",
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Sezione del menu Curation task",
+
+  // "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Modifica sezione menu",
+
+  // "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Sezione del menu Esporta",
+
+  // "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Trova sezione menu",
+
+  // "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",
+
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Nuova sezione menu",
+
+  // "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Fissa la barra laterale",
+
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "Processi",
+
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Sezione del menu Registri",
+
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Sezione del menu Task statistiche",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Amministrare la sezione del menu del flusso di lavoro",
+
+  // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Rimuovi la barra laterale",
+
+
+
+  // "menu.section.import": "Import",
+  "menu.section.import": "Importazione",
+
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Importazione batch (ZIP)",
+
+  // "menu.section.import_metadata": "Metadata",
+  "menu.section.import_metadata": "Metadata",
+
+
+
+  // "menu.section.new": "New",
+  "menu.section.new": "Nuovo",
+
+  // "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Collezione",
+
+  // "menu.section.new_community": "Community",
+  "menu.section.new_community": "Community",
+
+  // "menu.section.new_item": "Item",
+  "menu.section.new_item": "Item",
+
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Versione dell'item",
+
+  // "menu.section.new_process": "Process",
+  "menu.section.new_process": "Processo",
+
+
+
+  // "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Pin barra laterale",
+
+  // "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin": "Rimuovere la barra laterale",
+
+
+
+  // "menu.section.processes": "Processes",
+  "menu.section.processes": "Processi",
+
+  // "menu.section.health": "Health",
+  "menu.section.health": "Salute",
+
+
+
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "Registri",
+
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Formato",
+
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "Metadati",
+
+
+
+  // "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Statistica",
+
+  // "menu.section.statistics_task": "Statistics Task",
+  "menu.section.statistics_task": "Statistiche",
+
+
+
+  // "menu.section.toggle.access_control": "Toggle Access Control section",
+  "menu.section.toggle.access_control": "Attiva/disattiva la sezione Controllo accessi",
+
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Attiva/disattiva la sezione Pannello di controllo",
+
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Attiva/disattiva la sezione Curation task",
+
+  // "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Attiva/disattiva sezione Modifica",
+
+  // "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Attiva/disattiva la sezione Esporta",
+
+  // "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Attiva/disattiva la sezione Trova",
+
+  // "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Attiva/disattiva la sezione Importa",
+
+  // "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Attiva/disattiva Nuova sezione",
+
+  // "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Attiva/disattiva la sezione Registri",
+
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task": "Attiva/disattiva la sezione Task statistiche",
+
+
+  // "menu.section.workflow": "Administer Workflow",
+  "menu.section.workflow": "Amministrare il flusso di lavoro",
+
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Esporta i risultati in CSV",
+  // "metadata-export-search.submit.success": "The export was started successfully",
+  "metadata-export-search.submit.success": "L'export è iniziato con successo",
+  // "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "L'export è fallito",
+
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "MyDSpace",
+
+  // "mydspace.description": "",
+  "mydspace.description": "Mio spazio personale",
+
+  // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
+  "mydspace.messages.controller-help": "Selezionare questa opzione per inviare un messaggio al mittente dell'item.",
+
+  // "mydspace.messages.description-placeholder": "Insert your message here...",
+  "mydspace.messages.description-placeholder": "Inserisci qui il tuo messaggio...",
+
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Nascondi messaggio",
+
+  // "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Contrassegna come letto",
+
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Contrassegna come non letto",
+
+  // "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Nessun contenuto.",
+
+  // "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Nessun messaggio ancora.",
+
+  // "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Invia",
+
+  // "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Mostra messaggio",
+
+  // "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Oggetto...",
+
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Selezionare questa opzione per inviare un messaggio al controller.",
+
+  // "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Messaggi",
+
+  // "mydspace.messages.to": "To",
+  "mydspace.messages.to": "A",
+
+  // "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Nuova immissione",
+
+  // "mydspace.new-submission-external": "Import metadata from external source",
+  "mydspace.new-submission-external": "Importare metadati da un'origine esterna",
+
+  // "mydspace.new-submission-external-short": "Import metadata",
+  "mydspace.new-submission-external-short": "Importare metadati",
+
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "I tuoi contributi",
+
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Nessun abstract",
+
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Nessun autore",
+
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "Nessuna collezione",
+
+  // "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Nessuna data",
+
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Nessun file",
+
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "Non c'erano oggetti da mostrare",
+
+  // "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Nessun titolo",
+
+  // "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "Nessun URI",
+
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Cerca in mydspace...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
+  "mydspace.show.workflow": "Workflow Tasks",
+
+  // "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "I tuoi contributi",
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Item supervisionati",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Archiviati",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Convalida",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "In attesa del controllo",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
+
+  // "mydspace.title": "MyDSpace",
+  "mydspace.title": "MyDSpace",
+
+  // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
+  "mydspace.upload.upload-failed": "Errore durante la creazione di una nuova area di lavoro. Verifica il contenuto caricato prima di riprovare.",
+
+  // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
+  "mydspace.upload.upload-failed-manyentries": "File non elaborabile. Rilevate troppe voci ma ne è consentita solo una per il file.",
+
+  // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
+  "mydspace.upload.upload-failed-moreonefile": "Richiesta non elaborabile. È consentito un solo file.",
+
+  // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} nuovi item dell'area di lavoro creati.",
+
+  // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Vista",
+
+
+
+  // "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Tutto DSpace",
+
+  // "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "Per Community",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Attivare la guida contestuale",
+
+  // "nav.language": "Language switch",
+  "nav.language": "Cambio di lingua",
+
+  // "nav.login": "Log In",
+  "nav.login": "Accedi",
+
+  // "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",
+  "nav.logout": "Disconnetti",
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Barra di navigazione principale",
+
+  // "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "MyDSpace",
+
+  // "nav.profile": "Profile",
+  "nav.profile": "Profilo",
+
+  // "nav.search": "Search",
+  "nav.search": "Ricerca",
+
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Invia ricerca",
+
+
+  // "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Statistica",
+
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+  "nav.stop-impersonating": "Smetti di impersonare EPerson",
+
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscription",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Attivare la navigazione",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "Barra del profilo utente",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Item",
+
+
+  // "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Unità organizzativa",
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Senza titolo",
+
+  // "orgunit.page.city": "City",
+  "orgunit.page.city": "Città",
+
+  // "orgunit.page.country": "Country",
+  "orgunit.page.country": "Paese",
+
+  // "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Data stabilita",
+
+  // "orgunit.page.description": "Description",
+  "orgunit.page.description": "Descrizione",
+
+  // "orgunit.page.edit": "Edit this item",
+  "orgunit.page.edit": "Modifica questo item",
+
+  // "orgunit.page.id": "ID",
+  "orgunit.page.id": "ID",
+
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Unità organizzativa: ",
+
+
+
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Opzioni di impaginazione",
+
+  // "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "Risultati per pagina",
+
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} di {{ total }}",
+
+  // "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "Ora in mostra ",
+
+  // "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction": "Opzioni di ordinamento",
+
+
+
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "Persona",
+
+  // "person.listelement.no-title": "No name found",
+  "person.listelement.no-title": "Nessun nome trovato",
+
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Data di nascita",
+
+  // "person.page.edit": "Edit this item",
+  "person.page.edit": "Modifica questo item",
+
+  // "person.page.email": "Email Address",
+  "person.page.email": "Indirizzo email",
+
+  // "person.page.firstname": "First Name",
+  "person.page.firstname": "Nome di battesimo",
+
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Titolo di lavoro",
+
+  // "person.page.lastname": "Last Name",
+  "person.page.lastname": "Cognome",
+
+  // "person.page.name": "Name",
+  "person.page.name": "Nome",
+
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Mostra tutti i metadati",
+
+  // "person.page.orcid": "ORCID",
+  "person.page.orcid": "ORCID",
+
+  // "person.page.staffid": "Staff ID",
+  "person.page.staffid": "ID personale",
+
+  // "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Persona: ",
+
+  // "person.search.results.head": "Person Search Results",
+  "person.search.results.head": "Risultati della ricerca per persona",
+
+  // "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",
+
+
+
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Parametri",
+
+  // "process.new.cancel": "Cancel",
+  "process.new.cancel": "Annulla",
+
+  // "process.new.submit": "Save",
+  "process.new.submit": "Salvare",
+
+  // "process.new.select-script": "Script",
+  "process.new.select-script": "Script",
+
+  // "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Scegli uno script...",
+
+  // "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Lo script è obbligatorio",
+
+  // "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Seleziona file...",
+
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Seleziona un file",
+
+  // "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Il valore del parametro è obbligatorio",
+
+  // "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "valore",
+
+  // "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "file",
+
+  // "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",
+
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "Il processo è stato creato con successo",
+
+  // "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Errore",
+
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "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",
+  "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",
+
+  // "process.new.title": "Create a new process",
+  "process.new.title": "Creare un nuovo processo",
+
+  // "process.new.breadcrumbs": "Create a new process",
+  "process.new.breadcrumbs": "Creare un nuovo processo",
+
+
+
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Parametri",
+
+  // "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",
+  "process.detail.back": "Indietro",
+
+  // "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",
+
+  // "process.detail.logs.loading": "Retrieving",
+  "process.detail.logs.loading": "Recupero",
+
+  // "process.detail.logs.none": "This process has no output",
+  "process.detail.logs.none": "Questo processo non ha output",
+
+  // "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",
+  "process.detail.output-files.empty": "Questo processo non contiene nessun file di output",
+
+  // "process.detail.script": "Script",
+  "process.detail.script": "Script",
+
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Processo: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Orario di inizio",
+
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Orario di fine",
+
+  // "process.detail.status": "Status",
+  "process.detail.status": "Stato",
+
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "Crea un processo analogo",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Azioni",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Elimina processo",
+
+  // "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?",
+  "process.detail.delete.body": "Sei sicuro di voler eliminare il processo corrente?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Annulla",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Elimina processo",
+
+  // "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",
+  "process.detail.delete.error": "Qualcosa è andato storto durante l'elininazione del processo",
+
+
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Orario di fine (UTC)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID del processo",
+
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "Nome",
+
+  // "process.overview.table.start": "Start time (UTC)",
+  "process.overview.table.start": "Orario di inizio (UTC)",
+
+  // "process.overview.table.status": "Status",
+  "process.overview.table.status": "Stato",
+
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "Utente",
+
+  // "process.overview.title": "Processes Overview",
+  "process.overview.title": "Panoramica dei processi",
+
+  // "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Panoramica dei processi",
+
+  // "process.overview.new": "New",
+  "process.overview.new": "Nuovo",
+
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Azioni",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Elimina {{count}} processi",
+
+  // "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.",
+  "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)?",
+  "process.overview.delete.body": "Sei sicuro di voler eliminare {{count}} processo/i?",
+
+  // "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Elimina processi",
+
+  // "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. ",
+  "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",
+  "process.bulk.delete.success": "{{count}} processi sono stati eliminati con successo",
+
+
+
+  // "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Aggiorna profilo",
+
+  // "profile.card.identify": "Identify",
+  "profile.card.identify": "Identificare",
+
+  // "profile.card.security": "Security",
+  "profile.card.security": "Sicurezza",
+
+  // "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",
+  "profile.special.groups.head": "Gruppi speciali di autorizzazione a cui appartieni",
+
+  // "profile.head": "Update Profile",
+  "profile.head": "Aggiorna profilo",
+
+  // "profile.metadata.form.error.firstname.required": "First Name is required",
+  "profile.metadata.form.error.firstname.required": "Il nome è obbligatorio",
+
+  // "profile.metadata.form.error.lastname.required": "Last Name is required",
+  "profile.metadata.form.error.lastname.required": "Il cognome è obbligatorio",
+
+  // "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "Indirizzo e-mail",
+
+  // "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Nome",
+
+  // "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Lingua",
+
+  // "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Cognome",
+
+  // "profile.metadata.form.label.phone": "Contact Telephone",
+  "profile.metadata.form.label.phone": "Telefono di contatto",
+
+  // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
+  "profile.metadata.form.notifications.success.content": "Le modifiche apportate al profilo sono state salvate.",
+
+  // "profile.metadata.form.notifications.success.title": "Profile saved",
+  "profile.metadata.form.notifications.success.title": "Profilo salvato",
+
+  // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
+  "profile.notifications.warning.no-changes.content": "Non sono state apportate modifiche al Profilo.",
+
+  // "profile.notifications.warning.no-changes.title": "No changes",
+  "profile.notifications.warning.no-changes.title": "Nessuna modifica",
+
+  // "profile.security.form.error.matching-passwords": "The passwords do not match.",
+  "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.",
+  "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",
+
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Ridigitare per confermare",
+
+  // "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.",
+
+  // "profile.security.form.notifications.success.title": "Password saved",
+  "profile.security.form.notifications.success.title": "Password salvata",
+
+  // "profile.security.form.notifications.error.title": "Error changing passwords",
+  "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.",
+  "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.",
+  "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",
+
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Profilo del ricercatore",
+
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Risultati della ricerca: Progetti",
+
+  // "project.page.contributor": "Contributors",
+  "project.page.contributor": "Progetto di ricerca",
+
+  // "project.page.description": "Description",
+  "project.page.description": "Collaboratori",
+
+  // "project.page.edit": "Edit this item",
+  "project.page.edit": "Descrizione",
+
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Modifica questo item",
+
+  // "project.page.funder": "Funders",
+  "project.page.funder": "Completamento previsto",
+
+  // "project.page.id": "ID",
+  "project.page.id": "Finanziatori",
+
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "ID",
+
+  // "project.page.status": "Status",
+  "project.page.status": "Parole chiave",
+
+  // "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Progetto di ricerca: ",
+
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "Risultati della ricerca per progetti",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Risultati della ricerca per progetti",
+
+
+
+  // "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Pubblicazione",
+
+  // "publication.page.description": "Description",
+  "publication.page.description": "Descrizione",
+
+  // "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Modifica questo item",
+
+  // "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ISSN Periodico",
+
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Titolo del Periodico",
+
+  // "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Editore",
+
+  // "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 per pubblicazioni",
+
+  // "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",
+
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Avanti",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Precedente",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Playlist",
+
+
+  // "register-email.title": "New user registration",
+  "register-email.title": "Registrazione nuovo utente",
+
+  // "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Crea profilo",
+
+  // "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Identificare",
+
+  // "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "Indirizzo e-mail",
+
+  // "register-page.create-profile.identification.first-name": "First Name *",
+  "register-page.create-profile.identification.first-name": "Nome *",
+
+  // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
+  "register-page.create-profile.identification.first-name.error": "Inserire un nome",
+
+  // "register-page.create-profile.identification.last-name": "Last Name *",
+  "register-page.create-profile.identification.last-name": "Cognome *",
+
+  // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
+  "register-page.create-profile.identification.last-name.error": "Inserire un cognome",
+
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
+  "register-page.create-profile.identification.contact": "Telefono di contatto",
+
+  // "register-page.create-profile.identification.language": "Language",
+  "register-page.create-profile.identification.language": "Lingua",
+
+  // "register-page.create-profile.security.header": "Security",
+  "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.",
+  "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 *",
+
+  // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
+  "register-page.create-profile.security.label.passwordrepeat": "Ridigitare per confermare *",
+
+  // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
+  "register-page.create-profile.security.error.empty-password": "Inserisci una password nella casella qui sotto.",
+
+  // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
+  "register-page.create-profile.security.error.matching-passwords": "Le password non corrispondono.",
+
+  // "register-page.create-profile.submit": "Complete Registration",
+  "register-page.create-profile.submit": "Registrazione completa",
+
+  // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
+  "register-page.create-profile.submit.error.content": "Qualcosa è andato storto durante la registrazione di un nuovo utente.",
+
+  // "register-page.create-profile.submit.error.head": "Registration failed",
+  "register-page.create-profile.submit.error.head": "Registrazione non riuscita",
+
+  // "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": "La registrazione è andata a buon fine. Hai effettuato l'accesso come utente creato.",
+
+  // "register-page.create-profile.submit.success.head": "Registration completed",
+  "register-page.create-profile.submit.success.head": "Registrazione completata",
+
+
+  // "register-page.registration.header": "New user registration",
+  "register-page.registration.header": "Registrazione nuovo utente",
+
+  // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
+  "register-page.registration.info": "Registra un account per iscriverti alle collezioni per gli aggiornamenti via e-mail e invia nuovi item a DSpace.",
+
+  // "register-page.registration.email": "Email Address *",
+  "register-page.registration.email": "Indirizzo e-mail *",
+
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+  "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.",
+  "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 }}",
+  "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.",
+
+  // "register-page.registration.submit": "Register",
+  "register-page.registration.submit": "Registrati",
+
+  // "register-page.registration.success.head": "Verification email sent",
+  "register-page.registration.success.head": "Email di verifica inviata",
+
+  // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "register-page.registration.success.content": "È stata inviata un'e-mail a {{ email }} contenente un URL speciale e ulteriori istruzioni.",
+
+  // "register-page.registration.error.head": "Error when trying to register email",
+  "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 }}",
+  "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",
+  "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.",
+  "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 }}",
+  "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",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Aprire le impostazioni dei 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": "Si è verificato un errore durante la verifica reCaptcha",
+
+  // "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",
+  "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",
+
+  // "relationships.add.error.server.content": "The server returned an error",
+  "relationships.add.error.server.content": "Il server ha restituito un errore",
+
+  // "relationships.add.error.title": "Unable to add relationship",
+  "relationships.add.error.title": "Impossibile aggiungere relazione",
+
+  // "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Autori",
+
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+  "relationships.isAuthorOf.Person": "Autori (persone)",
+
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+  "relationships.isAuthorOf.OrgUnit": "Autori (struttura)",
+
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Fascicolo Periodico",
+
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Fascicolo Periodico",
+
+  // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Periodico",
+
+  // "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Strutture",
+
+  // "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Autori",
+
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Progetti di ricerca",
+
+  // "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Pubblicazioni",
+
+  // "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Articoli",
+
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Periodico",
+
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Volume del Periodico",
+
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Volumi di Periodico",
+
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Collaboratori",
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Collaboratore (Struttura)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Collaboratore",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Finanziatore",
+
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Logo del repository",
+
+  // "repository.title.prefix": "DSpace Angular :: ",
+  "repository.title.prefix": "DSpace Angular :: ",
+
+  // "repository.title.prefixDSpace": "DSpace Angular ::",
+  "repository.title.prefixDSpace": "DSpace Angular ::",
+
+
+  // "resource-policies.add.button": "Add",
+  "resource-policies.add.button": "Aggiungi",
+
+  // "resource-policies.add.for.": "Add a new policy",
+  "resource-policies.add.for.": "Aggiungi una nuova policy",
+
+  // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
+  "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 una nuova policy di Bundle",
+
+  // "resource-policies.add.for.item": "Add a new Item policy",
+  "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": "Aggiungi una nuova policy di community",
+
+  // "resource-policies.add.for.collection": "Add a new Collection policy",
+  "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 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 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 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 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 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 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 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.",
+  "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.",
+  "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",
+
+  // "resource-policies.edit.page.title": "Edit resource policy",
+  "resource-policies.edit.page.title": "Modifica criterio risorse",
+
+  // "resource-policies.form.action-type.label": "Select the action type",
+  "resource-policies.form.action-type.label": "Selezionare il tipo di azione",
+
+  // "resource-policies.form.action-type.required": "You must select the resource policy action.",
+  "resource-policies.form.action-type.required": "È necessario selezionare l'azione del criterio delle risorse.",
+
+  // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
+  "resource-policies.form.eperson-group-list.label": "L'eperson o il gruppo a cui verrà concessa l'autorizzazione",
+
+  // "resource-policies.form.eperson-group-list.select.btn": "Select",
+  "resource-policies.form.eperson-group-list.select.btn": "Seleziona",
+
+  // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Cerca un ePerson",
+
+  // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
+  "resource-policies.form.eperson-group-list.tab.group": "Cerca un gruppo",
+
+  // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Azione",
+
+  // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+
+  // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Nome",
+
+  // "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.",
+  "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.",
+  "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.",
+  "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",
+
+  // "resource-policies.form.date.end.label": "End Date",
+  "resource-policies.form.date.end.label": "Data di fine",
+
+  // "resource-policies.form.date.start.label": "Start Date",
+  "resource-policies.form.date.start.label": "Data di inizio",
+
+  // "resource-policies.form.description.label": "Description",
+  "resource-policies.form.description.label": "Descrizione",
+
+  // "resource-policies.form.name.label": "Name",
+  "resource-policies.form.name.label": "Nome",
+
+  // "resource-policies.form.policy-type.label": "Select the policy type",
+  "resource-policies.form.policy-type.label": "Selezionare il tipo di criterio",
+
+  // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
+  "resource-policies.form.policy-type.required": "È necessario selezionare il tipo di criterio risorsa.",
+
+  // "resource-policies.table.headers.action": "Action",
+  "resource-policies.table.headers.action": "Azione",
+
+  // "resource-policies.table.headers.date.end": "End Date",
+  "resource-policies.table.headers.date.end": "Data di fine",
+
+  // "resource-policies.table.headers.date.start": "Start Date",
+  "resource-policies.table.headers.date.start": "Data di inizio",
+
+  // "resource-policies.table.headers.edit": "Edit",
+  "resource-policies.table.headers.edit": "Modifica",
+
+  // "resource-policies.table.headers.edit.group": "Edit group",
+  "resource-policies.table.headers.edit.group": "Modifica gruppo",
+
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
+  "resource-policies.table.headers.edit.policy": "Modifica criterio",
+
+  // "resource-policies.table.headers.eperson": "EPerson",
+  "resource-policies.table.headers.eperson": "EPerson",
+
+  // "resource-policies.table.headers.group": "Group",
+  "resource-policies.table.headers.group": "Gruppo",
+
+  // "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.id": "ID",
+
+  // "resource-policies.table.headers.name": "Name",
+  "resource-policies.table.headers.name": "Nome",
+
+  // "resource-policies.table.headers.policyType": "type",
+  "resource-policies.table.headers.policyType": "tipo",
+
+  // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
+  "resource-policies.table.headers.title.for.bitstream": "Criteri per Bitstream",
+
+  // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
+  "resource-policies.table.headers.title.for.bundle": "Criteri per Bundle",
+
+  // "resource-policies.table.headers.title.for.item": "Policies for Item",
+  "resource-policies.table.headers.title.for.item": "Criteri per l'item",
+
+  // "resource-policies.table.headers.title.for.community": "Policies for Community",
+  "resource-policies.table.headers.title.for.community": "Politiche per la community",
+
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+  "resource-policies.table.headers.title.for.collection": "Criteri per la collezione",
+
+
+
+  // "search.description": "",
+  "search.description": "",
+
+  // "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Mostra",
+
+  // "search.title": "Search",
+  "search.title": "Cerca",
+
+  // "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Cerca",
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Cerca nel repository ...",
+
+
+  // "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "Autore",
+
+  // "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "Data di fine",
+
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "Data di inizio",
+
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Data di invio",
+
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
+  "search.filters.applied.f.discoverable": "Privato",
+
+  // "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Tipo di item",
+
+  // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
+  "search.filters.applied.f.has_content_in_original_bundle": "Ha file",
+
+  // "search.filters.applied.f.itemtype": "Type",
+  "search.filters.applied.f.itemtype": "Tipo",
+
+  // "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "Stato",
+
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "Soggetto",
+
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Submitter",
+
+  // "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Ruolo",
+
+  // "search.filters.applied.f.birthDate.max": "End birth date",
+  "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",
+  "search.filters.applied.f.supervisedBy": "Supervisionato da",
+
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Ritirato",
+
+
+
+  // "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "Autore",
+
+  // "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "Nome autore",
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Cerca nome autore",
+
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Data di nascita",
+
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Data di nascita",
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Cerca data di nascita",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Comprimi filtro",
+
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Data di pubblicazione",
+
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Data di pubblicazione",
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Data di ricerca pubblicata",
+
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "Editor",
+
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Editor di ricerca",
+
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Oggetto",
+
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Oggetto",
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Oggetto della ricerca",
+
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Editore",
+
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Editore",
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Cerca editore",
+
+  // "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "Data",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Data massima",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Fine",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Data minima",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Inizio",
+
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Data inviata",
+
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Data di invio",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Data di ricerca inviata",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
+  "search.filters.filter.discoverable.head": "Privato",
+
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Ritirato",
+
+  // "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Tipo di item",
+
+  // "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Tipo di item",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Cerca tipo di item",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Espandi filtro",
+
+  // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
+  "search.filters.filter.has_content_in_original_bundle.head": "Ha file",
+
+  // "search.filters.filter.itemtype.head": "Type",
+  "search.filters.filter.itemtype.head": "Tipo",
+
+  // "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Tipo",
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Tipo di ricerca",
+
+  // "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Titolo di lavoro",
+
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Titolo di lavoro",
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Cerca titolo di lavoro",
+
+  // "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Lingua nota",
+
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Lingua nota",
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Cerca nella lingua nota",
+
+  // "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Stato",
+
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Stato",
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Cerca stato",
+
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Ricercatori",
+
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Ricercatori",
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Cerca Ricercatori",
+
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "Paese",
+
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Paese",
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Cerca paese",
+
+  // "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Città",
+
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Città",
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Cerca città",
+
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Data di fondazione",
+
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Data di fondazione",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Data di ricerca fondata",
+
+  // "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "Ambito",
+
+  // "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "Filtro ambito",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Filtro ambito di ricerca",
+
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "Comprimi",
+
+  // "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "Mostra altro",
+
+  // "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "Oggetto",
+
+  // "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "Oggetto",
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Oggetto della ricerca",
+
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Mittente",
+
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Mittente",
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Mittente della ricerca",
+
+  // "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",
+  "search.filters.filter.supervisedBy.head": "Supervisionato da",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisionato da",
+
+  // "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",
+
+
+
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Fascicolo Periodico",
+
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Volume del Periodico",
+
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Struttura",
+
+  // "search.filters.has_content_in_original_bundle.true": "Yes",
+  "search.filters.has_content_in_original_bundle.true": "Si",
+
+  // "search.filters.has_content_in_original_bundle.false": "No",
+  "search.filters.has_content_in_original_bundle.false": "No",
+
+  // "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "No",
+
+  // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Si",
+
+  // "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Si",
+
+  // "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false": "No",
+
+
+  // "search.filters.head": "Filters",
+  "search.filters.head": "Filtri",
+
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "Ripristina filtri",
+
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Invia",
+
+
+
+  // "search.form.search": "Search",
+  "search.form.search": "Cerca",
+
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Tutto il portale",
+
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Tutto DSpace",
+
+
+
+  // "search.results.head": "Search Results",
+  "search.results.head": "Risultati della ricerca",
+
+  // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
+  "search.results.no-results": "La ricerca non ha prodotto alcun risultato. Hai problemi a trovare quello che cerchi? Prova a inserire",
+
+  // "search.results.no-results-link": "quotes around it",
+  "search.results.no-results-link": "le virgolette",
+
+  // "search.results.empty": "Your search returned no results.",
+  "search.results.empty": "La tua ricerca non ha prodotto risultati.",
+
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Vedi",
+
+  // "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",
+  "default-relationships.search.results.head": "Risultati della ricerca",
+
+
+  // "search.sidebar.close": "Back to results",
+  "search.sidebar.close": "Ritorna ai risultati",
+
+  // "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "Filtri",
+
+  // "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "Strumenti per la ricerca",
+
+  // "search.sidebar.results": "results",
+  "search.sidebar.results": "risultati",
+
+  // "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "Risultati per pagina",
+
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "Ordina per",
+
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "Impostazioni",
+
+
+
+  // "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Mostra dettagli",
+
+  // "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "Visualizzazioni a griglia",
+
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "Visualizzazione a lista",
+
+
+
+  // "sorting.ASC": "Ascending",
+  "sorting.ASC": "Crescente",
+
+  // "sorting.DESC": "Descending",
+  "sorting.DESC": "Decrescente",
+
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "Titolo crescente",
+
+  // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "Titolo decrescente",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Minor rilevanza",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "Maggior rilevanza",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Data di pubblicazione Ascendente",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Data di pubblicazione Discendente",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Data di accesso Ascendente",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Data di accesso Discendente",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Ultima modifica Ascendente",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Ultima modifica Discendente",
+
+
+  // "statistics.title": "Statistics",
+  "statistics.title": "Statistiche",
+
+  // "statistics.header": "Statistics for {{ scope }}",
+  "statistics.header": "Statistiche per {{ scope }}",
+
+  // "statistics.breadcrumbs": "Statistics",
+  "statistics.breadcrumbs": "Statistiche",
+
+  // "statistics.page.no-data": "No data available",
+  "statistics.page.no-data": "Nessun dato disponibile",
+
+  // "statistics.table.no-data": "No data available",
+  "statistics.table.no-data": "Nessun dato disponibile",
+
+  // "statistics.table.title.TotalVisits": "Total visits",
+  "statistics.table.rppublicationsReports.title.TotalVisits": "Visite totali",
+
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+  "statistics.table.title.TotalVisitsPerMonth": "Visite totali al mese",
+
+  // "statistics.table.title.TotalDownloads": "File Visits",
+  "statistics.table.title.TotalDownloads": "Download",
+
+  // "statistics.table.title.TopCountries": "Top country views",
+  "statistics.table.title.TopCountries": "Migliori nazioni",
+
+  // "statistics.table.title.TopCities": "Top city views",
+  "statistics.table.title.TopCities": "Migliori città",
+
+  // "statistics.table.header.views": "Views",
+  "statistics.table.header.views": "Visite",
+
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(il nome dell'oggetto non può essere caricato)",
+
+
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Modifica immissione",
+
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Modifica immissione",
+
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Annulla",
+
+  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit": "Non hai i privilegi per fare una nuova immissione.",
+
+  // "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Deposito",
+
+  // "submission.general.discard.confirm.cancel": "Cancel",
+  "submission.general.discard.confirm.cancel": "Annulla",
+
+  // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.general.discard.confirm.info": "Questa operazione non può essere annullata. Sei sicuro?",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Sì, sono sicuro",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Elimina l'invio",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Scarta",
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Salvato",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Modifiche non salvate",
+
+  // "submission.general.save": "Save",
+  "submission.general.save": "Salva",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "Salva per dopo",
+
+
+  // "submission.import-external.page.title": "Import metadata from an external source",
+  "submission.import-external.page.title": "Importare metadati da un'origine esterna",
+
+  // "submission.import-external.title": "Import metadata from an external source",
+  "submission.import-external.title": "Importare metadati da un'origine esterna",
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importare un journal da un'origine esterna",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importare un fascicolo di periodico da una fonte esterna",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importare un volume di periodico da un'origine esterna",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importare un editore da una fonte esterna",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importare una persona da una fonte esterna",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importare un progetto da una fonte esterna",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importare una pubblicazione da una fonte esterna",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importare metadati da un'origine esterna",
+
+  // "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": "Immettere una query sopra per trovare item dal Web da importare in DSpace.",
+
+  // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
+  "submission.import-external.back-to-my-dspace": "Torna a MyDSpace",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
+  "submission.import-external.search.placeholder": "Cerca nell'origine esterna",
+
+  // "submission.import-external.search.button": "Search",
+  "submission.import-external.search.button": "Cerca",
+
+  // "submission.import-external.search.button.hint": "Write some words to search",
+  "submission.import-external.search.button.hint": "Scrivi alcune parole per cercare",
+
+  // "submission.import-external.search.source.hint": "Pick an external source",
+  "submission.import-external.search.source.hint": "Scegli un'origine esterna",
+
+  // "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": "Ufficio europeo dei brevetti (UEB)",
+
+  // "submission.import-external.source.loading": "Loading ...",
+  "submission.import-external.source.loading": "Caricamento ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+  "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "Finanziamento dell'API OpenAIRE",
+
+  // "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcid": "ORCID",
+
+  // "submission.import-external.source.pubmed": "Pubmed",
+  "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",
+  "submission.import-external.source.lcname": "Nomi della Biblioteca del Congresso",
+
+  // "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",
+  "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",
+  "submission.import-external.preview.title.OrgUnit": "Anteprima struttura",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Anteprima persona",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Anteprima progetto",
+
+  // "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": "I metadati riportati di seguito sono stati importati da un'origine esterna. Sarà precompilato quando inizierà l'immissione.",
+
+  // "submission.import-external.preview.button.import": "Start submission",
+  "submission.import-external.preview.button.import": "Avvia immissione",
+
+  // "submission.import-external.preview.error.import.title": "Submission error",
+  "submission.import-external.preview.error.import.title": "Errore di immissione",
+
+  // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
+  "submission.import-external.preview.error.import.body": "Si verifica un errore durante il processo di importazione della voce di origine esterna.",
+
+  // "submission.sections.describe.relationship-lookup.close": "Close",
+  "submission.sections.describe.relationship-lookup.close": "Chiudi",
+
+  // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Aggiunta con successo della voce locale alla selezione",
+
+  // "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": "Importa autore remoto",
+
+  // "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": "Importa Periodico remoto",
+
+  // "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": "Importare fascicolo periodico remoto",
+
+  // "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": "Importa volume periodico remoto",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "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",
+  "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",
+
+  // "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": "Importa prodotto remoto",
+
+  // "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": "Importare apparecchiature remote",
+
+  // "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": "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",
+
+  // "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": "Importa persona remota",
+
+  // "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": "Importa brevetto remoto",
+
+  // "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": "Importa progetto remoto",
+
+  // "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": "Importa pubblicazione remota",
+
+  // "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": "Nuova entità aggiunta!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Progetto",
+
+  // "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": "Finanziamento dell'API OpenAIRE",
+
+  // "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": "Importa autore remoto",
+
+  // "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": "Aggiunto con successo autore locale alla selezione",
+
+  // "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": "Importato e aggiunto con successo autore esterno alla selezione",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autorità",
+
+  // "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": "Importa come nuova voce dell'autorità locale",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Annulla",
+
+  // "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": "Selezionare una collezione in cui importare nuove voci",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entità",
+
+  // "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": "Importa come nuova entità locale",
+
+  // "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": "Importazione da 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": "Importazione da ORCID",
+
+  // "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": "Importazione da Sherpa Journal",
+
+  // "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": "Importazione da Sherpa Publisher",
+
+  // "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": "Importazione da 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": "Importazione da arXiv",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importa",
+
+  // "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": "Importa Periodico remoto",
+
+  // "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": "Aggiunta con successo del journal locale alla selezione",
+
+  // "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": "Importato e aggiunto con successo journal esterno alla selezione",
+
+  // "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": "Importa Fascicolo Periodico remoto",
+
+  // "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": "Aggiunto con successo il numero del periodico locale alla selezione",
+
+  // "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": "Importato e aggiunto con successo il numero del journal esterno alla selezione",
+
+  // "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": "Importa volume di giornale remoto",
+
+  // "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": "Aggiunto con successo volume del journal locale alla selezione",
+
+  // "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": "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:",
+  "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",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deseleziona pagina",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Caricamento...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Query di ricerca",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Vai",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Cerca...",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Seleziona tutto",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Seleziona pagina",
+
+  // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autori locali ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Progetti locali ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autori locali ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unità organizzative locali ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pacchetti di dati locali ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "File di dati locali ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ 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": "Local Journal Issues ({{ 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": "Local Journal Volumes ({{ 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": "Local Journal Volumes ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "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 }})",
+  "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 }})",
+  "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 }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nomi LC ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ 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.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.isFundingAgencyOfPublication": "Ricerca di agenzie di finanziamento",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Cerca finanziamenti",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Ricerca di unità organizzative",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Finanziamento dell'API OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Progetti",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Funder of the Project",
+  "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",
+  "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",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Progetti",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Progetti",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Finanziatore del Progetto",
+
+
+
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Cerca...",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Selezione corrente ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Fascicolo Periodico",
+  // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Fascicolo Periodico",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volume Periodico",
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volume Periodico",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Periodico",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autori",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agenzia di finanziamento",
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+  "submission.sections.describe.relationship-lookup.title.Project": "Progetti",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Pubblicazioni",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autori",
+
+  // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Unità organizzative",
+
+  // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pacchetti di dati",
+
+  // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "File di dati",
+
+  // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agenzia di finanziamento",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finanziatore",
+
+  // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Unità organizzativa padre",
+
+  // "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": "Attiva dropdown",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Impostazioni",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "La selezione è attualmente vuota.",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autori selezionati",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Riviste selezionate",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Volume del Periodico selezionato",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Progetti selezionati",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Pubblicazioni selezionate",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autori selezionati",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unità organizzative selezionate",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pacchetti di dati selezionati",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "File di dati selezionati",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Riviste selezionate",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Fascicolo selezionato",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume journal selezionato",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agenzia di finanziamento selezionata",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Finanziamento selezionato",
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Fascicolo selezionato",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Unità organizzativa selezionata",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Risultati della ricerca",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Risultati della ricerca",
+
+  // "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.",
+  "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",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Salva una nuova variante del nome",
+
+  // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Utilizzare solo per questa immissione",
+
+  // "submission.sections.ccLicense.type": "License Type",
+  "submission.sections.ccLicense.type": "Tipo di licenza",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+  "submission.sections.ccLicense.select": "Selezionare un tipo di licenza...",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+  "submission.sections.ccLicense.change": "Modificare il tipo di licenza...",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+  "submission.sections.ccLicense.none": "Nessuna licenza disponibile",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+  "submission.sections.ccLicense.option.select": "Seleziona un'opzione...",
+
+  // "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",
+
+  // "submission.sections.general.add-more": "Add more",
+  "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.",
+  "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.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'item, riprova più tardi.",
+
+  // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
+  "submission.sections.general.deposit_success_notice": "Immissione depositata con successo.",
+
+  // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
+  "submission.sections.general.discard_error_notice": "Si è verificato un problema durante l'eliminazione dell'item, riprova più tardi.",
+
+  // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
+  "submission.sections.general.discard_success_notice": "Immissione scartata correttamente.",
+
+  // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
+  "submission.sections.general.metadata-extracted": "Nuovi metadati sono stati estratti e aggiunti alla sezione <strong>{{sectionId}}</strong>.",
+
+  // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
+  "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> sezione è stata aggiunta all'invio.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "Nessuna collezione trovata",
+
+  // "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 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.",
+  "submission.sections.general.save_success_notice": "Immissione salvata correttamente.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Cerca una collezione",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Ci sono sezioni incomplete.",
+
+  // "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.",
+  "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.",
+  "submission.sections.identifiers.no_doi": "Non sono stati generati DOI per questo item.",
+
+  // "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": "Altri identificativi: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Condizioni di accesso all'item",
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+  "submission.sections.submit.progressbar.CClicense": "Licenza Creative commons",
+
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Ricicla",
+
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Descrivi",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Descrivi",
+
+  // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
+  "submission.sections.submit.progressbar.describe.steptwo": "Descrivi",
+
+  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
+  "submission.sections.submit.progressbar.detect-duplicate": "Potenziali duplicati",
+
+  // "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",
+  "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",
+  "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.",
+  "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",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Valido",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Avvertenze",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "presenta errori",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "è valido",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "ha avvisi",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Informazioni aggiuntive",
+
+  // "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",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Chiudi sezione",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Espandi la sezione {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Comprimi la sezione {{sectionHeader}}",
+
+  // "submission.sections.upload.delete.confirm.cancel": "Cancel",
+  "submission.sections.upload.delete.confirm.cancel": "Annulla",
+
+  // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
+  "submission.sections.upload.delete.confirm.info": "Questa operazione non può essere annullata. Sei sicuro?",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Sì, ne sono sicuro",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Elimina bitstream",
+
+  // "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Elimina",
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Scarica bitstream",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Rilascia i file per allegarli all'item",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Modifica bitstream",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Tipo di condizione di accesso",
+
+  // "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": "Selezionare una condizione di accesso da applicare sul bitstream una volta depositato l'articolo",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Data obbligatoria.",
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "È richiesto concedere l'accesso dalla data.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "Concedi l'accesso fino a quando la data è richiesta.",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+  "submission.sections.upload.form.from-label": "Concedere l'accesso da",
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Selezionare la data a partire dalla quale viene applicata la relativa condizione di accesso",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "Da",
+
+  // "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Gruppo",
+
+  // "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Il gruppo è obbligatorio.",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+  "submission.sections.upload.form.until-label": "Concedi l'accesso fino a",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Selezionare la data fino alla quale viene applicata la relativa condizione di accesso",
+
+  // "submission.sections.upload.form.until-placeholder": "Until",
+  "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):",
+  "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):",
+  "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>",
+  "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",
+
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Nessun file ancora caricato.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Salva metadati",
+
+  // "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Annulla",
+
+  // "submission.sections.upload.upload-failed": "Upload failed",
+  "submission.sections.upload.upload-failed": "Caricamento non riuscito",
+
+  // "submission.sections.upload.upload-successful": "Upload successful",
+  "submission.sections.upload.upload-successful": "Caricamento riuscito",
+
+  // "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": "Una volta selezionato, questo item sarà individuabile nella ricerca/navigazione. Se deselezionato, l'item sarà disponibile solo tramite un collegamento diretto e non apparirà mai nella ricerca / navigazione.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Individuabile",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Tipo di condizione di accesso",
+
+  // "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": "Selezionare una condizione di accesso da applicare all'articolo una volta depositato",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "Data obbligatoria.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "Concedere l'accesso dalla data è obbligatorio.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "Concedi l'accesso fino a quando la data è richiesta.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Concedere l'accesso da",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Selezionare la data a partire dalla quale viene applicata la relativa condizione di accesso",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Da",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Gruppo",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Il gruppo è obbligatorio.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Concedi l'accesso fino a",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Selezionare la data fino alla quale viene applicata la relativa condizione di accesso",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Fino a quando",
+
+  // "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",
+  "submission.sections.license.required": "È necessario accettare la licenza",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "È necessario accettare la licenza",
+
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informazioni sulla pubblicazione",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Titolo",
+
+  // "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": "Editore",
+
+  // "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": "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.",
+  "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",
+  "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:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Per maggiori informazioni si prega di consultare il seguente link:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versione",
+
+  // "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": "Nessun embargo",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nessuno",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licenza",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisiti",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Località",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Condizioni",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Ricarica",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informazioni sulla registrazione",
+
+  // "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": "Data di creazione",
+
+  // "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",
+  "submission.sections.sherpa.record.information.uri": "URI",
+
+  // "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",
+
+
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Nuova immissione",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Nuova immissione",
+
+
+
+  // "submission.workflow.generic.delete": "Delete",
+  "submission.workflow.generic.delete": "Elimina",
+
+  // "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",
+  "submission.workflow.generic.edit": "Modifica",
+
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Selezionare questa opzione per modificare i metadati dell'item.",
+
+  // "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Visualizza",
+
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Selezionare questa opzione per visualizzare i metadati dell'item.",
+
+
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Seleziona revisore",
+
+  // "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": "Valuta",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
+
+
+  // "submission.workflow.tasks.claimed.approve": "Approve",
+  "submission.workflow.tasks.claimed.approve": "Approva",
+
+  // "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 hai esaminato l'item ed è adatto per l'inclusione nella collezione, seleziona \"Approva\".",
+
+  // "submission.workflow.tasks.claimed.edit": "Edit",
+  "submission.workflow.tasks.claimed.edit": "Modifica",
+
+  // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
+  "submission.workflow.tasks.claimed.edit_help": "Selezionare questa opzione per modificare i metadati dell'item.",
+
+  // "submission.workflow.tasks.claimed.decline": "Decline",
+  "submission.workflow.tasks.claimed.decline": "Rifiuta",
+
+  // "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": "Se hai esaminato l'item e hai scoperto che <strong>non</strong> è adatto per essere inserito nella collezione, seleziona \"Rifiuta\".  Ti verrà quindi chiesto di inserire un messaggio che indichi perché l'item non è adatto e se chi ha inviato l'item deve cambiare qualcosa e inviarlo di nuovo.",
+
+  // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Descrivi il motivo del rifiuto",
+
+  // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Rifiuta l'item",
+
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Motivo",
+
+  // "submission.workflow.tasks.claimed.reject.submit": "Reject",
+  "submission.workflow.tasks.claimed.reject.submit": "Rifiuta",
+
+  // "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": "Se l'item esaminato <strong>non</strong> è adatto per essere inserito nella collezione, seleziona \"Rifiuta\".  Ti verrà quindi chiesto di inserire un messaggio che indichi perché l'item non è adatto e se chi ha inviato l'item deve cambiare qualcosa e inviarlo di nuovo.",
+
+  // "submission.workflow.tasks.claimed.return": "Return to pool",
+  "submission.workflow.tasks.claimed.return": "Restituisci al pool",
+
+  // "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": "Restituire il task al pool in modo che un altro utente possa prenderlo in carico.",
+
+
+
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "Si è verificato un errore durante l'operazione...",
+
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Elaborazione...",
+
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Operatore",
+
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "Operazione riuscita",
+
+
+
+  // "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Associa",
+
+  // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
+  "submission.workflow.tasks.pool.claim_help": "Assegnati il task.",
+
+  // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
+  "submission.workflow.tasks.pool.hide-detail": "Nascondi dettaglio",
+
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Mostra dettagli",
+
+
+  // "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Elenco",
+
+  // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Seleziona questa opzione per vedere i metadata dell'item.",
+
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Sottoscrizioni",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Sottoscrizioni per articoli",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Sottoscrizioni per collezioni",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Sottoscrizioni per community",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tipo di sottoscrizione",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Frequenza di sottoscrizione",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Giornaliero",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Mensile",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Settimanale",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Sottoscrivi",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Sottoscrizioni",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipo e frequenza",
+
+  // "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",
+  "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",
+  "subscriptions.modal.new-subscription-form.type.content": "Contenuto",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Giornaliero",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Settimanale",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensile",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Invia",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "Elaborazione...",
+
+  // "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",
+  "subscriptions.modal.delete.success": "Sottoscrizione eliminata con successo",
+
+  // "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",
+  "subscriptions.modal.create.error": "Si è verificato un errore durante la creazione della sottoscrizione",
+
+  // "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",
+  "subscriptions.modal.update.error": "Si è verificato un errore durante l'aggiornamento della sottoscrizione",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Oggetto",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tipo di sottoscrizione",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Frequenza di sottoscrizione",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Azione",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Modifica",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Elimina",
+
+  // "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",
+  "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.",
+  "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",
+  "thumbnail.default.alt": "Immagine di anteprima",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Nessuna immagine disponibile",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Logo del progetto",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Immagine segnaposto progetto",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Logo Struttura",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Immagine segnaposto Struttura",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Immagine del profilo",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Nessuna immagine del profilo disponibile",
+
+
+
+  // "title": "DSpace",
+  "title": "DSpace",
+
+
+
+  // "vocabulary-treeview.header": "Hierarchical tree view",
+  "vocabulary-treeview.header": "Visualizzazione gerarchica ad albero",
+
+  // "vocabulary-treeview.load-more": "Load more",
+  "vocabulary-treeview.load-more": "Carica di più",
+
+  // "vocabulary-treeview.search.form.reset": "Reset",
+  "vocabulary-treeview.search.form.reset": "Cancella",
+
+  // "vocabulary-treeview.search.form.search": "Search",
+  "vocabulary-treeview.search.form.search": "Cerca",
+
+  // "vocabulary-treeview.search.no-result": "There were no items to show",
+  "vocabulary-treeview.search.no-result": "Non ci sono item da mostrare",
+
+  // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.nsi": "Il Norwegian Science Index",
+
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+  "vocabulary-treeview.tree.description.srsc": "Categorie di argomenti di ricerca",
+
+  // "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",
+
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Trascina e rilascia i tuoi file qui",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Elimina",
+
+  // "uploader.or": ", or ",
+  "uploader.or": ", oppure ",
+
+  // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
+  "uploader.processing": "Elaborazione dei file caricati... (è ora possibile chiudere questa pagina)",
+
+  // "uploader.queue-length": "Queue length",
+  "uploader.queue-length": "Lunghezza coda",
+
+  // "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": "Selezionare i tipi per i quali vuoi salvare i metadati virtuali come metadati reali",
+
+  // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
+  "virtual-metadata.delete-item.modal-head": "I metadati virtuali di questa relazione",
+
+  // "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": "Selezionare gli item per i quali si desidera salvare i metadati virtuali come metadati reali",
+
+
+
+  // "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",
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Gestire il workflow",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Task del workflow",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Task del workflow e del workspace",
+
+
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Modifica l'item del workflow",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Modifica l'item del workflow",
+
+  // "workflow-item.delete.notification.success.title": "Deleted",
+  "workflow-item.delete.notification.success.title": "Eliminato",
+
+  // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
+  "workflow-item.delete.notification.success.content": "Questo item del workflow è stato eliminato correttamente",
+
+  // "workflow-item.delete.notification.error.title": "Something went wrong",
+  "workflow-item.delete.notification.error.title": "Qualcosa è andato storto",
+
+  // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
+  "workflow-item.delete.notification.error.content": "Impossibile eliminare l'item del workflow",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+  "workflow-item.delete.title": "Elimina item del workflow",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+  "workflow-item.delete.header": "Elimina item del workflow",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
+  "workflow-item.delete.button.cancel": "Annulla",
+
+  // "workflow-item.delete.button.confirm": "Delete",
+  "workflow-item.delete.button.confirm": "Elimina",
+
+
+  // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
+  "workflow-item.send-back.notification.success.title": "Inviato all'operatore",
+
+  // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
+  "workflow-item.send-back.notification.success.content": "Questo item del workflow è stato rinviato correttamente all'operatore",
+
+  // "workflow-item.send-back.notification.error.title": "Something went wrong",
+  "workflow-item.send-back.notification.error.title": "Qualcosa è andato storto",
+
+  // "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": "Impossibile inviare l'item del workflow all'operatore",
+
+  // "workflow-item.send-back.title": "Send workflow item back to submitter",
+  "workflow-item.send-back.title": "Invia l'item del workflow all'operatore",
+
+  // "workflow-item.send-back.header": "Send workflow item back to submitter",
+  "workflow-item.send-back.header": "Invia l'item del workflow all'operatore",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
+  "workflow-item.send-back.button.cancel": "Annulla",
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "Invia indietro",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Vista workflow",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Vista Workspace",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Vista Workspace",
+
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Workflow avanzato",
+
+
+  // "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",
+  "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",
+  "workflow-item.selectrevieweraction.notification.error.title": "Qualcosa è andato storto",
+
+  // "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",
+  "workflow-item.selectrevieweraction.title": "Seleziona revisore",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Seleziona revisore",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Annulla",
+
+  // "workflow-item.selectrevieweraction.button.confirm": "Confirm",
+  "workflow-item.selectrevieweraction.button.confirm": "Conferma",
+
+
+  // "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",
+  "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",
+  "workflow-item.scorereviewaction.notification.error.title": "Qualcosa è andato storto",
+
+  // "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",
+  "workflow-item.scorereviewaction.title": "Valuta questo item",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Valuta questo item",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Annulla",
+
+  // "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",
+
+  // "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": "Per motivi di sicurezza, le sessioni utente scadono dopo {{ timeToExpire }} minuti di inattività. La sessione scadrà presto. Vuoi estenderla o disconnetterti?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Logout",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Estendi sessione",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Elaborazione...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Profilo ricercatore associato",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Si è verificato un errore inaspettato durante il cambio della visibilità del profilo",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Crea nuovo",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Profilo del ricercatore creato con successo",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Si è verificato un errore durante la creazione del profilo del ricercatore",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Elimina",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Mostra",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Nascondi",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Profilo del ricercatore non ancora associato",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Visualizza",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVATO",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PUBBLICO",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Stato:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "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",
+  "researcherprofile.error.claim.body": "Si è verificato un errore durante l'associazione del profilo, prova più tardi",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Errore",
+
+  // "researcherprofile.success.claim.body": "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Profilo associato con successo",
+
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Successo",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Creare un ID ORCID",
+
+  // "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Autorizzazioni concesse",
+
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Concedere autorizzazioni",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Connettersi all'ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Collega il profilo a 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": "Si è verifcato un errore nel connettere il profilo a ORCID. Se il problema persiste, contattare l'amministratore",
+
+  // "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'ORCID ID di questo profilo ({{ orcid }}) non è ancora stato collegato a un account del registro ORCID o la connessione è scaduta.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Disconnessione da ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "Elaborazione...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Autorizzazioni mancanti",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Non si dispone delle seguenti autorizzazioni:",
+
+  // "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": "Benissimo! Questa casella è vuota, quindi hai concesso tutti i diritti di accesso per utilizzare tutte le funzioni offerte dalla tua istituzione.",
+
+  // "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": "Nessun ORCID ID ancora associato. Cliccando sul pulsante qui sotto è possibile collegare questo profilo con un account ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Preferenze del profilo",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Preferenze di finanziamento",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Preferenze di pubblicazione",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Se vuoi rimuovere l'ORCID, contatta l'amministratore del repository",
+
+  // "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Impostazioni di aggiornamento",
+
+  // "person.page.orcid.sync-profile.affiliation": "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Affiliazione",
+
+  // "person.page.orcid.sync-profile.biographical": "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Riferimenti biografici",
+
+  // "person.page.orcid.sync-profile.education": "Education",
+  "person.page.orcid.sync-profile.education": "Educazione",
+
+  // "person.page.orcid.sync-profile.identifiers": "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Identificativi",
+
+  // "person.page.orcid.sync-fundings.all": "All fundings",
+  "person.page.orcid.sync-fundings.all": "Tutti i finanziamenti",
+
+  // "person.page.orcid.sync-fundings.mine": "My fundings",
+  "person.page.orcid.sync-fundings.mine": "I miei finanziamenti",
+
+  // "person.page.orcid.sync-fundings.my_selected": "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Finanziamenti selezionati",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Disabilitato",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Tutte le pubblicazioni",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "Le mie pubblicazioni",
+
+  // "person.page.orcid.sync-publications.my_selected": "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Pubblicazioni selezionate",
+
+  // "person.page.orcid.sync-publications.disabled": "Disabled",
+  "person.page.orcid.sync-publications.disabled": "Disabilitato",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "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",
+  "person.page.orcid.sync-queue.discard.error": "L'eliminazione del record della coda ORCID non è riuscita",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "Il record della coda ORCID è stato eliminato correttamente",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "Il Registro di sistema della coda ORCID è vuoto",
+
+  // "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": "Descrizione",
+
+  // "person.page.orcid.sync-queue.table.header.action": "Action",
+  "person.page.orcid.sync-queue.table.header.action": "Azione",
+
+  // "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Affiliazioni",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "Paese",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Istruzione",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "ID esterni",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Altri nomi",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualifiche",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL ricercatore",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Parole chiave",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Aggiungere una nuova voce nel Registro ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Aggiorna questa voce nel Registro ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Rimuovere questa voce dal Registro ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Pubblicazione",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Progetto",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliazione",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Istruzione",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificazione",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Altro nome",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Paese",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Parola chiave",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identificatore esterno",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL ricercatore",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "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.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "L'immissione a ORCID non è riuscita a causa di autorizzazioni mancanti.",
+
+  // "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": "Clicca <a href='{{orcid}}'>qui</a> per ottenere di nuovo i permessi necessari. Se il problema persiste contatta l'amministratore",
+
+  // "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": "L'immissione a ORCID non è riuscito perché la risorsa inviata al Registro ORCID non è valida",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "L'immissione a ORCID non è riuscita",
+
+  // "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": "L'immissione a ORCID non è riuscita perché la risorsa è già presente nel 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": "La risorsa non esiste più nel registro ORCID.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "L'immissione a ORCID è stata completata con successo",
+
+  // "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": "I dati che si desidera sincronizzare con ORCID non sono validi",
+
+  // "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 valuta dell'importo è obbligatoria",
+
+  // "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 risorsa da inviare richiede almeno un identificatore",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "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",
+  "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",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "La data di inizio è obbligatoria",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Il finanziatore è obbligatorio",
+
+  // "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": "Codice del paese non valido (formato a due cifre 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": "L'organizzazione è obbligatoria",
+
+  // "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": "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",
+  "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",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "L'organizzazione da inviare richiede un indirizzo",
+
+  // "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'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",
+  "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",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "È necessario un identificatore per disambiguare le organizzazioni. Gli ID supportati sono gli identificativi della persona giuridica (LEI), GRID, Ringgold e gli identificatori del Registro finanziatore 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": "Gli identificatori dell'organizzazione richiedono un valore",
+
+  // "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": "Gli identificatori dell'organizzazione richiedono un'origine",
+
+  // "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": "L'origine di uno degli identificatori dell'organizzazione non è valida. Le fonti supportate sono RINGGOLD, GRID, LEI e FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Sincronizzazione",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Batch",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "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).",
+  "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.",
+
+  // "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": "Scegli se sincronizzare le tue Pubblicazioni con la lista dei tuoi lavori sul profilo 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": "Scegli se sincronizzare le tue informazioni bibliografiche o identificativi personali con il tuo profilo ORCID.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "Le impostazioni di sincronizzazione sono state aggiornate correttamente",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "L'aggiornamento delle impostazioni di sincronizzazione non è riuscito",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manuale",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Ottieni il tuo ORCID ID",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Leggi le tue informazioni con visibilità impostata su Parti attendibili",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Aggiungi/aggiorna le tue attività di ricerca",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Aggiungi/aggiorna le tue informazioni",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "La disconnessione tra il profilo e il registro ORCID è riuscita",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Si è verificato un errore durante la disconnessione tra il profilo e il Registro di sistema ORCID. Riprova",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Impostazioni di sincronizzazione ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Coda registro ORCID",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorizzazioni ORCID",
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Immissioni recenti",
+
+  // "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",
+  "system-wide-alert-banner.retrieval.error": "Qualcosa è andato storto nel recupero del banner di allarme di sistema",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Tra",
+
+  // "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",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} ore e",
+
+  // "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",
+  "menu.section.system-wide-alert": "Allarme di sistema",
+
+  // "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",
+  "system-wide-alert-form.retrieval.error": "Qualcosa è andato storto nel recupero dell'allarme di sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Annulla",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Salva",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ATTIVO",
+
+  // "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",
+  "system-wide-alert.form.error.message": "L'allarme di sistema deve avere un messaggio",
+
+  // "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",
+  "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.",
+  "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",
+  "system-wide-alert.form.label.preview": "Anteprima dell'allarme di sistema",
+
+  // "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",
+  "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",
+  "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",
+  "system-wide-alert.form.create.error": "Qualcosa è andato storto nella creazione dell'allarme di sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Allarmi di sistema",
+
+  // "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 bfe0ae186d..c74c8636c7 100644
--- a/src/assets/i18n/ja.json5
+++ b/src/assets/i18n/ja.json5
@@ -1,6748 +1,7164 @@
 {
-  
+
   // "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.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",
-  
-  
-  
+
+
+
   // "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.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.forbidden": "forbidden",
   // TODO New key - Add a translation
   "403.forbidden": "forbidden",
-  
-  
-  
+
+
+
   // "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.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.page-not-found": "page not found",
   // TODO New key - Add a translation
   "404.page-not-found": "page not found",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.title": "System curation tasks",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.header": "System curation tasks",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  
+
   // "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.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.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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.success.head": "Success",
-  
+
   // "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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.success.head": "Success",
-  
+
   // "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.edit.breadcrumbs": "Bitstream format",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  
+
   // "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.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.label": "File extensions",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  
+
   // "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.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.label": "Internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  
+
   // "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.label": "MIME Type",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
+
   // "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.label": "Name",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.success.head": "Success",
-  
+
   // "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.label": "Support level",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  
+
   // "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.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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  
+
   // "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.internal": "internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.internal": "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.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.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.return": "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.SUPPORTED": "Supported",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "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.head": "Support Level",
   // 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",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   // TODO New key - Add a translation
   "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.",
   // 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.form.create": "Create metadata schema",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.create": "Create metadata schema",
-  
+
   // "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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.name": "Name",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.namespace": "Namespace",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   // TODO New key - Add a translation
   "admin.registries.metadata.head": "Metadata Registry",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.delete": "Delete 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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.name": "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.schema.breadcrumbs": "Metadata schema",
   // TODO New key - Add a translation
   "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
+
   // "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.fields.head": "Schema metadata fields",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.head": "Schema metadata fields",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.delete": "Delete selected",
-  
+
   // "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.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  
+
   // "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.edit": "Edit metadata field",
   // TODO New key - Add a translation
   "admin.registries.schema.form.edit": "Edit metadata field",
-  
+
   // "admin.registries.schema.form.element": "Element",
   // TODO New key - Add a translation
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   // TODO New key - Add a translation
   "admin.registries.schema.form.qualifier": "Qualifier",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.form.scopenote": "Scope Note",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   // TODO New key - Add a translation
   "admin.registries.schema.head": "Metadata Schema",
-  
+
   // "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.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.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.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.failure": "Error",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.failure": "Error",
-  
+
   // "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.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.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.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.success": "Success",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.success": "Success",
-  
+
   // "admin.registries.schema.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.schema.return": "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.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.impersonate": "Impersonate EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
+
   // "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.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.title": "DSpace Angular :: EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.head": "EPeople",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.head": "Search",
-  
+
   // "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.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.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.button": "Search",
-  
+
   // "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.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.email": "E-mail (exact)",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
+
   // "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{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.form.create": "Create EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.create": "Create EPerson",
-  
+
   // "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.firstName": "First name",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.firstName": "First name",
-  
+
   // "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.email": "E-mail",
   // TODO New key - Add a 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.canLogIn": "Can log in",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.goToGroups": "Add to groups",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
+
   // "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.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.groups.title": "DSpace Angular :: Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
+
   // "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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.head": "Groups",
-  
+
   // "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.search.head": "Search groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.head": "Search groups",
-  
+
   // "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.search.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.button": "Search",
-  
+
   // "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.members": "Members",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.members": "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{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.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.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.content": "Cause: \"{{cause}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.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.edit": "Edit group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.head.edit": "Edit group",
-  
+
   // "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.groupDescription": "Description",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.groupDescription": "Description",
-  
+
   // "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.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.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.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.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.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.actions.delete": "Delete Group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
+
   // "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.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.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.confirm": "Delete",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-subgroups-yet": "No subgroups in group yet.",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.collection.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.collection.edit": "Edit",
-  
+
   // "admin.search.community.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.community.edit": "Edit",
-  
+
   // "admin.search.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.search.item.delete": "Delete",
-  
+
   // "admin.search.item.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.item.edit": "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-public": "Make Public",
   // TODO New key - Add a translation
   "admin.search.item.make-public": "Make Public",
-  
+
   // "admin.search.item.move": "Move",
   // TODO New key - Add a translation
   "admin.search.item.move": "Move",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   // TODO New key - Add a translation
   "admin.search.item.reinstate": "Reinstate",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   // TODO New key - Add a translation
   "admin.search.item.withdraw": "Withdraw",
-  
+
   // "admin.search.title": "Administrative Search",
   // TODO New key - Add a translation
   "admin.search.title": "Administrative Search",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   // TODO New key - Add a translation
   "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.breadcrumbs": "Administer Workflow",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.title": "Administer Workflow",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
-  
+
   // "admin.workflow.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.workflow.item.delete": "Delete",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   // TODO New key - Add a translation
   "admin.workflow.item.send-back": "Send back",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.title": "Import Metadata",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.page.header": "Import Metadata",
-  
+
   // "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.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.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.button.return": "Return",
   // TODO New key - Add a translation
   "admin.metadata-import.page.button.return": "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.error.addFile": "Select file first!",
   // TODO New key - Add a translation
   "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
+
+
+
+
   // "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.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.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   // TODO New key - Add a translation
   "bitstream.edit.bitstream": "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.label": "Description",
   // TODO New key - Add a translation
   "bitstream.edit.form.description.label": "Description",
-  
+
   // "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.label": "Embargo until specific date",
   // TODO New key - Add a translation
   "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
+
   // "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.label": "Filename",
   // TODO New key - Add a translation
   "bitstream.edit.form.fileName.label": "Filename",
-  
+
   // "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.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.primaryBitstream.label": "Primary bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
+
   // "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.label": "Selected Format",
   // TODO New key - Add a translation
   "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
+
   // "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.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.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.title": "Bitstream saved",
   // TODO New key - Add a translation
   "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
+
+
+
   // "browse.comcol.by.author": "By Author",
   // TODO New key - Add a translation
   "browse.comcol.by.author": "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.subject": "By Subject",
   // TODO New key - Add a translation
   "browse.comcol.by.subject": "By Subject",
-  
+
   // "browse.comcol.by.title": "By Title",
   // TODO New key - Add a translation
   "browse.comcol.by.title": "By Title",
-  
+
   // "browse.comcol.head": "Browse",
   // TODO New key - Add a translation
   "browse.comcol.head": "Browse",
-  
+
   // "browse.empty": "No items to show.",
   // TODO New key - Add a translation
   "browse.empty": "No items to show.",
-  
+
   // "browse.metadata.author": "Author",
   // TODO New key - Add a translation
   "browse.metadata.author": "Author",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued": "Issue Date",
-  
+
   // "browse.metadata.subject": "Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject": "Subject",
-  
+
   // "browse.metadata.title": "Title",
   // TODO New key - Add a translation
   "browse.metadata.title": "Title",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   // TODO New key - Add a translation
   "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   // TODO New key - Add a translation
   "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_start": "(Choose start)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_year": "(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.months.april": "April",
   // TODO New key - Add a translation
   "browse.startsWith.months.april": "April",
-  
+
   // "browse.startsWith.months.august": "August",
   // TODO New key - Add a translation
   "browse.startsWith.months.august": "August",
-  
+
   // "browse.startsWith.months.december": "December",
   // TODO New key - Add a translation
   "browse.startsWith.months.december": "December",
-  
+
   // "browse.startsWith.months.february": "February",
   // TODO New key - Add a translation
   "browse.startsWith.months.february": "February",
-  
+
   // "browse.startsWith.months.january": "January",
   // TODO New key - Add a translation
   "browse.startsWith.months.january": "January",
-  
+
   // "browse.startsWith.months.july": "July",
   // TODO New key - Add a translation
   "browse.startsWith.months.july": "July",
-  
+
   // "browse.startsWith.months.june": "June",
   // TODO New key - Add a translation
   "browse.startsWith.months.june": "June",
-  
+
   // "browse.startsWith.months.march": "March",
   // TODO New key - Add a translation
   "browse.startsWith.months.march": "March",
-  
+
   // "browse.startsWith.months.may": "May",
   // TODO New key - Add a translation
   "browse.startsWith.months.may": "May",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   // TODO New key - Add a translation
   "browse.startsWith.months.none": "(Choose month)",
-  
+
   // "browse.startsWith.months.november": "November",
   // TODO New key - Add a translation
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   // TODO New key - Add a translation
   "browse.startsWith.months.october": "October",
-  
+
   // "browse.startsWith.months.september": "September",
   // TODO New key - Add a translation
   "browse.startsWith.months.september": "September",
-  
+
   // "browse.startsWith.submit": "Go",
   // TODO New key - Add a translation
   "browse.startsWith.submit": "Go",
-  
+
   // "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_text": "Or enter first few letters:",
   // TODO New key - Add a translation
   "browse.startsWith.type_text": "Or enter first few letters:",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   // TODO New key - Add a translation
   "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   // TODO New key - Add a translation
   "chips.remove": "Remove chip",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   // TODO New key - Add a translation
   "collection.create.head": "Create a Collection",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   // TODO New key - Add a translation
   "collection.create.notifications.success": "Successfully created the Collection",
-  
+
   // "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.curate.header": "Curate Collection: {{collection}}",
   // TODO New key - Add a translation
   "collection.curate.header": "Curate Collection: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.delete.cancel": "Cancel",
-  
+
   // "collection.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "collection.delete.confirm": "Confirm",
-  
+
   // "collection.delete.head": "Delete Collection",
   // TODO New key - Add a translation
   "collection.delete.head": "Delete Collection",
-  
+
   // "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.success": "Successfully deleted collection",
   // TODO New key - Add a translation
   "collection.delete.notification.success": "Successfully deleted collection",
-  
+
   // "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.edit.delete": "Delete this collection",
   // TODO New key - Add a translation
   "collection.edit.delete": "Delete this collection",
-  
+
   // "collection.edit.head": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.head": "Edit Collection",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "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.item-mapper.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.cancel": "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.confirm": "Map selected items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.confirm": "Map selected items",
-  
+
   // "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.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.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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.remove": "Remove selected item mappings",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  
+
   // "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.map": "Map new items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.tabs.map": "Map new items",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   // TODO New key - Add a translation
   "collection.edit.logo.label": "Collection logo",
-  
+
   // "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.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.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.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.error.title": "Error deleting logo",
   // TODO New key - Add a translation
   "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+
   // "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.notifications.success": "Successfully edited the Collection",
   // TODO New key - Add a translation
   "collection.edit.notifications.success": "Successfully edited the Collection",
-  
+
   // "collection.edit.return": "Return",
   // TODO New key - Add a translation
   "collection.edit.return": "Return",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "collection.edit.tabs.curate.head": "Curate",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "collection.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "collection.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.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.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.harvestType": "Content being harvested",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
+
   // "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.metadataConfigId": "Metadata Format",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
+
   // "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.oaiSource": "OAI Provider",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
+
   // "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_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_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.head": "Content Source",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.head": "Content Source",
-  
+
   // "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.title": "Changed discarded",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Content Source saved",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
+
   // "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.template.add-button": "Add",
   // TODO New key - Add a translation
   "collection.edit.template.add-button": "Add",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   // TODO New key - Add a translation
   "collection.edit.template.breadcrumbs": "Item template",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.template.cancel": "Cancel",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   // TODO New key - Add a translation
   "collection.edit.template.delete-button": "Delete",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   // TODO New key - Add a translation
   "collection.edit.template.edit-button": "Edit",
-  
+
   // "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.label": "Template item",
   // TODO New key - Add a translation
   "collection.edit.template.label": "Template item",
-  
+
   // "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.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.title": "Edit Template Item",
   // TODO New key - Add a translation
   "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "collection.form.abstract": "Short Description",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "collection.form.description": "Introductory 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.license": "License",
   // TODO New key - Add a translation
   "collection.form.license": "License",
-  
+
   // "collection.form.provenance": "Provenance",
   // TODO New key - Add a translation
   "collection.form.provenance": "Provenance",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "collection.form.rights": "Copyright text (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "collection.form.tableofcontents": "News (HTML)",
-  
+
   // "collection.form.title": "Name",
   // TODO New key - Add a translation
   "collection.form.title": "Name",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   // 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.edit": "Edit this collection",
   // TODO New key - Add a translation
   "collection.page.edit": "Edit this collection",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   // TODO New key - Add a translation
   "collection.page.handle": "Permanent URI for this collection",
-  
+
   // "collection.page.license": "License",
   // TODO New key - Add a translation
   "collection.page.license": "License",
-  
+
   // "collection.page.news": "News",
   // TODO New key - Add a translation
   "collection.page.news": "News",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "collection.select.confirm": "Confirm selected",
-  
+
   // "collection.select.empty": "No collections to show",
   // TODO New key - Add a translation
   "collection.select.empty": "No collections to show",
-  
+
   // "collection.select.table.title": "Title",
   // TODO New key - Add a translation
   "collection.select.table.title": "Title",
-  
-  
-  
+
+
+
   // "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.title": "Server Error",
   // TODO New key - Add a translation
   "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
+
+
+
   // "communityList.tabTitle": "DSpace - Community List",
   // TODO New key - Add a translation
   "communityList.tabTitle": "DSpace - Community List",
-  
+
   // "communityList.title": "List of Communities",
   // TODO New key - Add a translation
   "communityList.title": "List of Communities",
-  
+
   // "communityList.showMore": "Show More",
   // TODO New key - Add a translation
   "communityList.showMore": "Show More",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   // TODO New key - Add a translation
   "community.create.head": "Create a Community",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   // TODO New key - Add a translation
   "community.create.notifications.success": "Successfully created the Community",
-  
+
   // "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.curate.header": "Curate Community: {{community}}",
   // TODO New key - Add a translation
   "community.curate.header": "Curate Community: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "community.delete.cancel": "Cancel",
-  
+
   // "community.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "community.delete.confirm": "Confirm",
-  
+
   // "community.delete.head": "Delete Community",
   // TODO New key - Add a translation
   "community.delete.head": "Delete Community",
-  
+
   // "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.success": "Successfully deleted community",
   // TODO New key - Add a translation
   "community.delete.notification.success": "Successfully deleted community",
-  
+
   // "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.edit.delete": "Delete this community",
   // TODO New key - Add a translation
   "community.edit.delete": "Delete this community",
-  
+
   // "community.edit.head": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.head": "Edit Community",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.breadcrumbs": "Edit Community",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   // TODO New key - Add a translation
   "community.edit.logo.label": "Community logo",
-  
+
   // "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.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.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.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.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.notifications.success": "Successfully edited the Community",
   // TODO New key - Add a translation
   "community.edit.notifications.success": "Successfully edited the Community",
-  
+
   // "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.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "community.edit.tabs.curate.head": "Curate",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "community.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "community.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   // TODO New key - Add a translation
   "community.listelement.badge": "Community",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   // TODO New key - Add a translation
   "comcol-role.edit.no-group": "None",
-  
+
   // "comcol-role.edit.create": "Create",
   // TODO New key - Add a translation
   "comcol-role.edit.create": "Create",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   // TODO New key - Add a translation
   "comcol-role.edit.restrict": "Restrict",
-  
+
   // "comcol-role.edit.delete": "Delete",
   // TODO New key - Add a translation
   "comcol-role.edit.delete": "Delete",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.community-admin.name": "Administrators",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
+
+
   // "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.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.submitters.name": "Submitters",
   // TODO New key - Add a translation
   "comcol-role.edit.submitters.name": "Submitters",
-  
+
   // "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.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.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.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.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.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.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.editor.name": "Editors",
   // TODO New key - Add a translation
   "comcol-role.edit.editor.name": "Editors",
-  
+
   // "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.finaleditor.name": "Final editors",
   // TODO New key - Add a translation
   "comcol-role.edit.finaleditor.name": "Final editors",
-  
+
   // "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.reviewer.name": "Reviewers",
   // TODO New key - Add a translation
   "comcol-role.edit.reviewer.name": "Reviewers",
-  
+
   // "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.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "community.form.abstract": "Short Description",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "community.form.description": "Introductory 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.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "community.form.rights": "Copyright text (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "community.form.tableofcontents": "News (HTML)",
-  
+
   // "community.form.title": "Name",
   // TODO New key - Add a translation
   "community.form.title": "Name",
-  
+
   // "community.page.edit": "Edit this community",
   // TODO New key - Add a translation
   "community.page.edit": "Edit this community",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   // TODO New key - Add a translation
   "community.page.handle": "Permanent URI for this community",
-  
+
   // "community.page.license": "License",
   // TODO New key - Add a translation
   "community.page.license": "License",
-  
+
   // "community.page.news": "News",
   // TODO New key - Add a translation
   "community.page.news": "News",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   // 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",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   // TODO New key - Add a translation
   "cookies.consent.accept-all": "Accept all",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   // TODO New key - Add a translation
   "cookies.consent.accept-selected": "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.title": "(opt-out)",
   // TODO New key - Add a translation
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   // TODO New key - Add a translation
   "cookies.consent.app.purpose": "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.title": "(always required)",
   // TODO New key - Add a translation
   "cookies.consent.app.required.title": "(always required)",
-  
+
   // "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.close": "Close",
   // TODO New key - Add a translation
   "cookies.consent.close": "Close",
-  
+
   // "cookies.consent.decline": "Decline",
   // TODO New key - Add a translation
   "cookies.consent.decline": "Decline",
-  
+
   // "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.learnMore": "Customize",
   // TODO New key - Add a translation
   "cookies.consent.content-notice.learnMore": "Customize",
-  
+
   // "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.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.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.title": "Information that we collect",
   // TODO New key - Add a translation
   "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   // TODO New key - Add a translation
   "cookies.consent.app.title.authentication": "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.title.preferences": "Preferences",
   // TODO New key - Add a translation
   "cookies.consent.app.title.preferences": "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.title.acknowledgement": "Acknowledgement",
   // TODO New key - Add a translation
   "cookies.consent.app.title.acknowledgement": "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.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.purpose.functional": "Functional",
   // TODO New key - Add a translation
   "cookies.consent.purpose.functional": "Functional",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   // TODO New key - Add a translation
   "cookies.consent.purpose.statistical": "Statistical",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
+
   // "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.requiredmetadata.label": "Check for Required Metadata",
   // TODO New key - Add a translation
   "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   // TODO New key - Add a translation
   "curation-task.task.translate.label": "Microsoft Translator",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   // TODO New key - Add a translation
   "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   // TODO New key - Add a translation
   "curation.form.task-select.label": "Task:",
-  
+
   // "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.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.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.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.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)",
   // 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)",
-  
-  
-  
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   // TODO New key - Add a translation
   "dso-selector.create.collection.head": "New collection",
-  
+
   // "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.community.head": "New community",
   // TODO New key - Add a translation
   "dso-selector.create.community.head": "New community",
-  
+
   // "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.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.item.head": "New item",
   // TODO New key - Add a translation
   "dso-selector.create.item.head": "New item",
-  
+
   // "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.submission.head": "New submission",
   // TODO New key - Add a translation
   "dso-selector.create.submission.head": "New submission",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   // TODO New key - Add a translation
   "dso-selector.edit.collection.head": "Edit collection",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   // TODO New key - Add a translation
   "dso-selector.edit.community.head": "Edit community",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   // TODO New key - Add a translation
   "dso-selector.edit.item.head": "Edit item",
-  
+
   // "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.no-results": "No {{ type }} found",
   // TODO New key - Add a translation
   "dso-selector.no-results": "No {{ type }} found",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   // TODO New key - Add a translation
   "dso-selector.placeholder": "Search for a {{ type }}",
-  
-  
-  
+
+
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.cancel": "Cancel",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.confirm": "Export",
-  
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   // TODO New key - Add a translation
   "error.bitstream": "Error fetching bitstream",
-  
+
   // "error.browse-by": "Error fetching items",
   // TODO New key - Add a translation
   "error.browse-by": "Error fetching items",
-  
+
   // "error.collection": "Error fetching collection",
   // TODO New key - Add a translation
   "error.collection": "Error fetching collection",
-  
+
   // "error.collections": "Error fetching collections",
   // TODO New key - Add a translation
   "error.collections": "Error fetching collections",
-  
+
   // "error.community": "Error fetching community",
   // TODO New key - Add a translation
   "error.community": "Error fetching community",
-  
+
   // "error.identifier": "No item found for the identifier",
   // TODO New key - Add a translation
   "error.identifier": "No item found for the identifier",
-  
+
   // "error.default": "Error",
   // TODO New key - Add a translation
   "error.default": "Error",
-  
+
   // "error.item": "Error fetching item",
   // TODO New key - Add a translation
   "error.item": "Error fetching item",
-  
+
   // "error.items": "Error fetching items",
   // TODO New key - Add a translation
   "error.items": "Error fetching items",
-  
+
   // "error.objects": "Error fetching objects",
   // TODO New key - Add a translation
   "error.objects": "Error fetching objects",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   // TODO New key - Add a translation
   "error.recent-submissions": "Error fetching recent submissions",
-  
+
   // "error.search-results": "Error fetching search results",
   // TODO New key - Add a translation
   "error.search-results": "Error fetching search results",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   // TODO New key - Add a translation
   "error.sub-collections": "Error fetching sub-collections",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   // TODO New key - Add a translation
   "error.sub-communities": "Error fetching 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.top-level-communities": "Error fetching top-level communities",
   // TODO New key - Add a translation
   "error.top-level-communities": "Error fetching 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.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.filerequired": "The file upload is mandatory",
   // TODO New key - Add a translation
   "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
+
+
+
   // "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",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   // TODO New key - Add a translation
   "footer.copyright": "copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   // TODO New key - Add a translation
   "footer.link.dspace": "DSpace software",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   // TODO New key - Add a translation
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   // TODO New key - Add a translation
   "footer.link.cookies": "Cookie settings",
-  
+
   // "footer.link.privacy-policy": "Privacy policy",
   // 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.end-user-agreement": "End User Agreement",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-email.form.header": "Forgot Password",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "forgot-email.form.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Submit",
   // TODO New key - Add a translation
   "forgot-email.form.submit": "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.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-password.title": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.title": "Forgot Password",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.form.head": "Forgot Password",
-  
+
   // "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.card.security": "Security",
   // TODO New key - Add a translation
   "forgot-password.form.card.security": "Security",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   // TODO New key - Add a translation
   "forgot-password.form.identification.header": "Identify",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   // TODO New key - Add a translation
   "forgot-password.form.identification.email": "Email address: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   // TODO New key - Add a translation
   "forgot-password.form.label.password": "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.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.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.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.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.title": "Password reset completed",
   // TODO New key - Add a translation
   "forgot-password.form.notification.success.title": "Password reset completed",
-  
+
   // "forgot-password.form.submit": "Submit password",
   // TODO New key - Add a translation
   "forgot-password.form.submit": "Submit password",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   // TODO New key - Add a translation
   "form.add": "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.cancel": "Cancel",
   // TODO New key - Add a translation
   "form.cancel": "Cancel",
-  
+
   // "form.clear": "Clear",
   // TODO New key - Add a translation
   "form.clear": "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.edit": "Edit",
   // TODO New key - Add a translation
   "form.edit": "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.first-name": "First name",
   // TODO New key - Add a translation
   "form.first-name": "First name",
-  
+
   // "form.group-collapse": "Collapse",
   // TODO New key - Add a translation
   "form.group-collapse": "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-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.last-name": "Last name",
   // TODO New key - Add a translation
   "form.last-name": "Last name",
-  
+
   // "form.loading": "Loading...",
   // TODO New key - Add a translation
   "form.loading": "Loading...",
-  
+
   // "form.lookup": "Lookup",
   // TODO New key - Add a translation
   "form.lookup": "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.no-results": "No results found",
   // TODO New key - Add a translation
   "form.no-results": "No results found",
-  
+
   // "form.no-value": "No value entered",
   // TODO New key - Add a translation
   "form.no-value": "No value entered",
-  
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   // TODO New key - Add a translation
   "form.remove": "Remove",
-  
+
   // "form.save": "Save",
   // TODO New key - Add a translation
   "form.save": "Save",
-  
+
   // "form.save-help": "Save changes",
   // TODO New key - Add a translation
   "form.save-help": "Save changes",
-  
+
   // "form.search": "Search",
   // TODO New key - Add a translation
   "form.search": "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.submit": "Submit",
   // TODO New key - Add a translation
   "form.submit": "Submit",
-  
-  
-  
+
+
+
   // "home.description": "",
   // TODO New key - Add a translation
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   // TODO New key - Add a translation
   "home.breadcrumbs": "Home",
-  
+
   // "home.title": "DSpace Angular :: Home",
   // TODO New key - Add a translation
   "home.title": "DSpace Angular :: Home",
-  
+
   // "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.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.",
-  
-  
-  
+
+
+
   // "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.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.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.breadcrumbs": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
+
   // "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.save": "Save",
   // TODO New key - Add a translation
   "info.end-user-agreement.buttons.save": "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.title": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.title": "End User Agreement",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.breadcrumbs": "Privacy Statement",
-  
+
   // "info.privacy.head": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.head": "Privacy Statement",
-  
+
   // "info.privacy.title": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.title": "Privacy Statement",
-  
-  
-  
+
+
+
   // "item.alerts.private": "This item is private",
   // TODO New key - Add a translation
   "item.alerts.private": "This item is private",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   // TODO New key - Add a translation
   "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
+
+
+
   // "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.title": "Edit item's Policies",
   // TODO New key - Add a translation
   "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   // TODO New key - Add a translation
   "item.badge.private": "Private",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle": "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.new": "Create bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle.new": "Create bundle",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "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": "This item doesn't contain any bundles to upload a bitstream to.",
+
   // "item.bitstreams.upload.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.bitstreams.upload.cancel": "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.item": "Item: ",
   // TODO New key - Add a translation
   "item.bitstreams.upload.item": "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.title": "Created bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
+
   // "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.title": "Upload bitstream",
   // TODO New key - Add a translation
   "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
+
+
+
   // "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.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.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.more": "Load more",
   // TODO New key - Add a translation
   "item.edit.bitstreams.bundle.load.more": "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.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.bitstreams.discard-button": "Discard",
-  
+
   // "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.drag": "Drag",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.drag": "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.remove": "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.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.headers.actions": "Actions",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.description": "Description",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.name": "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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Move changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
+
   // "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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.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.title": "Removal changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.bitstreams.reinstate-button": "Undo",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.bitstreams.save-button": "Save",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   // TODO New key - Add a translation
   "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.delete.cancel": "Cancel",
-  
+
   // "item.edit.delete.confirm": "Delete",
   // TODO New key - Add a translation
   "item.edit.delete.confirm": "Delete",
-  
+
   // "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.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.header": "Delete item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.delete.header": "Delete item: {{ 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.head": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.head": "Edit Item",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.breadcrumbs": "Edit Item",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "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.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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.item-mapper.cancel": "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.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.item": "Item: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
   "item.edit.item-mapper.item": "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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.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.map": "Map new collections",
   // TODO New key - Add a translation
   "item.edit.item-mapper.tabs.map": "Map new collections",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   // TODO New key - Add a translation
   "item.edit.metadata.add-button": "Add",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.metadata.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.remove": "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.unedit": "Stop editing",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  
+
   // "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.headers.edit": "Edit",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.edit": "Edit",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.field": "Field",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.language": "Lang",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.value": "Value",
-  
+
   // "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.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.title": "Changed discarded",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Changed outdated",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  
+
   // "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.title": "Metadata saved",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.metadata.reinstate-button": "Undo",
-  
+
   // "item.edit.metadata.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.metadata.save-button": "Save",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   // TODO New key - Add a translation
   "item.edit.modify.overview.field": "Field",
-  
+
   // "item.edit.modify.overview.language": "Language",
   // TODO New key - Add a translation
   "item.edit.modify.overview.language": "Language",
-  
+
   // "item.edit.modify.overview.value": "Value",
   // TODO New key - Add a translation
   "item.edit.modify.overview.value": "Value",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.move.cancel": "Cancel",
-  
+
   // "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.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.head": "Move item: {{id}}",
   // TODO New key - Add a translation
   "item.edit.move.head": "Move item: {{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.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.move": "Move",
   // TODO New key - Add a translation
   "item.edit.move.move": "Move",
-  
+
   // "item.edit.move.processing": "Moving...",
   // TODO New key - Add a translation
   "item.edit.move.processing": "Moving...",
-  
+
   // "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.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.title": "Move item",
   // TODO New key - Add a translation
   "item.edit.move.title": "Move item",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.private.cancel": "Cancel",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   // TODO New key - Add a translation
   "item.edit.private.confirm": "Make it Private",
-  
+
   // "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.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.public.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.public.cancel": "Cancel",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   // TODO New key - Add a translation
   "item.edit.public.confirm": "Make it Public",
-  
+
   // "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.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.reinstate.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.reinstate.cancel": "Cancel",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   // TODO New key - Add a translation
   "item.edit.reinstate.confirm": "Reinstate",
-  
+
   // "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.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.header": "Reinstate item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.reinstate.header": "Reinstate item: {{ 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.relationships.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.relationships.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.relationships.edit.buttons.remove": "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.no-relationships": "No relationships",
   // TODO New key - Add a translation
   "item.edit.relationships.no-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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.title": "Relationships saved",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.relationships.reinstate-button": "Undo",
-  
+
   // "item.edit.relationships.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.relationships.save-button": "Save",
-  
+
   // "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.tabs.bitstreams.head": "Bitstreams",
   // TODO New key - Add a translation
   "item.edit.tabs.bitstreams.head": "Bitstreams",
-  
+
   // "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.curate.head": "Curate",
   // TODO New key - Add a translation
   "item.edit.tabs.curate.head": "Curate",
-  
+
   // "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.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.relationships.head": "Relationships",
   // TODO New key - Add a translation
   "item.edit.tabs.relationships.head": "Relationships",
-  
+
   // "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.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.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.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.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.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.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.move.button": "Move...",
+
+  // "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...",
-  
+  "item.edit.tabs.status.buttons.move.button": "Verplaats dit item naar een andere collectie",
+
   // "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.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.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.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.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.reinstate.button": "Reinstate...",
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  
+
   // "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.withdraw.button": "Withdraw...",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+
   // "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.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.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.itemPage": "Item Page",
   // TODO New key - Add a translation
   "item.edit.tabs.status.labels.itemPage": "Item Page",
-  
+
   // "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.title": "Item Edit -  Status",
   // TODO New key - Add a translation
   "item.edit.tabs.status.title": "Item Edit -  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.title": "Item Edit - Version History",
   // TODO New key - Add a translation
   "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
+
   // "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.view.head": "View Item",
   // TODO New key - Add a translation
   "item.edit.tabs.view.head": "View Item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   // TODO New key - Add a translation
   "item.edit.tabs.view.title": "Item Edit -  View",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.withdraw.cancel": "Cancel",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   // TODO New key - Add a translation
   "item.edit.withdraw.confirm": "Withdraw",
-  
+
   // "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.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.header": "Withdraw item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.withdraw.header": "Withdraw item: {{ 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.listelement.badge": "Item",
   // TODO New key - Add a translation
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   // TODO New key - Add a translation
   "item.page.description": "Description",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "item.page.journal-issn": "Journal ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "item.page.journal-title": "Journal Title",
-  
+
   // "item.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "item.page.publisher": "Publisher",
-  
+
   // "item.page.titleprefix": "Item: ",
   // TODO New key - Add a translation
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "item.page.volume-title": "Volume Title",
-  
+
   // "item.search.results.head": "Item Search Results",
   // TODO New key - Add a translation
   "item.search.results.head": "Item Search Results",
-  
+
   // "item.search.title": "DSpace Angular :: Item Search",
   // TODO New key - Add a translation
   "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   // TODO New key - Add a translation
   "item.page.abstract": "Abstract",
-  
+
   // "item.page.author": "Authors",
   // TODO New key - Add a translation
   "item.page.author": "Authors",
-  
+
   // "item.page.citation": "Citation",
   // TODO New key - Add a translation
   "item.page.citation": "Citation",
-  
+
   // "item.page.collections": "Collections",
   // TODO New key - Add a translation
   "item.page.collections": "Collections",
-  
+
   // "item.page.date": "Date",
   // TODO New key - Add a translation
   "item.page.date": "Date",
-  
+
   // "item.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "item.page.edit": "Edit this item",
-  
+
   // "item.page.files": "Files",
   // TODO New key - Add a translation
   "item.page.files": "Files",
-  
+
   // "item.page.filesection.description": "Description:",
   // TODO New key - Add a translation
   "item.page.filesection.description": "Description:",
-  
+
   // "item.page.filesection.download": "Download",
   // TODO New key - Add a translation
   "item.page.filesection.download": "Download",
-  
+
   // "item.page.filesection.format": "Format:",
   // TODO New key - Add a translation
   "item.page.filesection.format": "Format:",
-  
+
   // "item.page.filesection.name": "Name:",
   // TODO New key - Add a translation
   "item.page.filesection.name": "Name:",
-  
+
   // "item.page.filesection.size": "Size:",
   // TODO New key - Add a translation
   "item.page.filesection.size": "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.link.full": "Full item page",
   // TODO New key - Add a translation
   "item.page.link.full": "Full item page",
-  
+
   // "item.page.link.simple": "Simple item page",
   // TODO New key - Add a translation
   "item.page.link.simple": "Simple item page",
-  
+
   // "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.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-less": "Hide last {{ amount }}",
   // TODO New key - Add a translation
   "item.page.related-items.view-less": "Hide last {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isAuthorOfPublication": "Publications",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isJournalOfPublication": "Publications",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
+
   // "item.page.subject": "Keywords",
   // TODO New key - Add a translation
   "item.page.subject": "Keywords",
-  
+
   // "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.collapse": "Collapse",
   // TODO New key - Add a translation
   "item.page.bitstreams.collapse": "Collapse",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
-  
+  "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.filesection.license.bundle": "License bundle",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.uri": "Identifier:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   // TODO New key - Add a translation
   "item.preview.dc.contributor.author": "Authors:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   // TODO New key - Add a translation
   "item.preview.dc.date.issued": "Published date:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   // TODO New key - Add a translation
   "item.preview.dc.description.abstract": "Abstract:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.other": "Other identifier:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   // TODO New key - Add a translation
   "item.preview.dc.language.iso": "Language:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   // TODO New key - Add a translation
   "item.preview.dc.subject": "Subjects:",
-  
+
   // "item.preview.dc.title": "Title:",
   // TODO New key - Add a translation
   "item.preview.dc.title": "Title:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   // TODO New key - Add a translation
   "item.preview.person.familyName": "Surname:",
-  
+
   // "item.preview.person.givenName": "Name:",
   // TODO New key - Add a translation
   "item.preview.person.givenName": "Name:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "item.select.confirm": "Confirm selected",
-  
+
   // "item.select.empty": "No items to show",
   // TODO New key - Add a translation
   "item.select.empty": "No items to show",
-  
+
   // "item.select.table.author": "Author",
   // TODO New key - Add a translation
   "item.select.table.author": "Author",
-  
+
   // "item.select.table.collection": "Collection",
   // TODO New key - Add a translation
   "item.select.table.collection": "Collection",
-  
+
   // "item.select.table.title": "Title",
   // TODO New key - Add a translation
   "item.select.table.title": "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.head": "Version History",
   // TODO New key - Add a translation
   "item.version.history.head": "Version History",
-  
+
   // "item.version.history.return": "Return",
   // TODO New key - Add a translation
   "item.version.history.return": "Return",
-  
+
   // "item.version.history.selected": "Selected version",
   // TODO New key - Add a translation
   "item.version.history.selected": "Selected version",
-  
+
   // "item.version.history.table.version": "Version",
   // TODO New key - Add a translation
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
   // TODO New key - Add a translation
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   // TODO New key - Add a translation
   "item.version.history.table.editor": "Editor",
-  
+
   // "item.version.history.table.date": "Date",
   // TODO New key - Add a translation
   "item.version.history.table.date": "Date",
-  
+
   // "item.version.history.table.summary": "Summary",
   // TODO New key - Add a translation
   "item.version.history.table.summary": "Summary",
-  
-  
-  
+
+
+
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   // 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>.",
-  
-  
-  
+
+
+
   // "journal.listelement.badge": "Journal",
   // TODO New key - Add a translation
   "journal.listelement.badge": "Journal",
-  
+
   // "journal.page.description": "Description",
   // TODO New key - Add a translation
   "journal.page.description": "Description",
-  
+
   // "journal.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journal.page.edit": "Edit this item",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   // TODO New key - Add a translation
   "journal.page.editor": "Editor-in-Chief",
-  
+
   // "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.titleprefix": "Journal: ",
   // TODO New key - Add a translation
   "journal.page.titleprefix": "Journal: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   // TODO New key - Add a translation
   "journalissue.listelement.badge": "Journal Issue",
-  
+
   // "journalissue.page.description": "Description",
   // TODO New key - Add a translation
   "journalissue.page.description": "Description",
-  
+
   // "journalissue.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalissue.page.edit": "Edit this item",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalissue.page.issuedate": "Issue Date",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "journalissue.page.journal-issn": "Journal ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "journalissue.page.journal-title": "Journal Title",
-  
+
   // "journalissue.page.keyword": "Keywords",
   // TODO New key - Add a translation
   "journalissue.page.keyword": "Keywords",
-  
+
   // "journalissue.page.number": "Number",
   // TODO New key - Add a translation
   "journalissue.page.number": "Number",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   // TODO New key - Add a translation
   "journalissue.page.titleprefix": "Journal Issue: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   // TODO New key - Add a translation
   "journalvolume.listelement.badge": "Journal Volume",
-  
+
   // "journalvolume.page.description": "Description",
   // TODO New key - Add a translation
   "journalvolume.page.description": "Description",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalvolume.page.edit": "Edit this item",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalvolume.page.issuedate": "Issue Date",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   // TODO New key - Add a translation
   "journalvolume.page.titleprefix": "Journal Volume: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   // TODO New key - Add a translation
   "journalvolume.page.volume": "Volume",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   // TODO New key - Add a translation
   "loading.bitstream": "Loading bitstream...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   // TODO New key - Add a translation
   "loading.bitstreams": "Loading bitstreams...",
-  
+
   // "loading.browse-by": "Loading items...",
   // TODO New key - Add a translation
   "loading.browse-by": "Loading items...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   // TODO New key - Add a translation
   "loading.browse-by-page": "Loading page...",
-  
+
   // "loading.collection": "Loading collection...",
   // TODO New key - Add a translation
   "loading.collection": "Loading collection...",
-  
+
   // "loading.collections": "Loading collections...",
   // TODO New key - Add a translation
   "loading.collections": "Loading collections...",
-  
+
   // "loading.content-source": "Loading content source...",
   // TODO New key - Add a translation
   "loading.content-source": "Loading content source...",
-  
+
   // "loading.community": "Loading community...",
   // TODO New key - Add a translation
   "loading.community": "Loading community...",
-  
+
   // "loading.default": "Loading...",
   // TODO New key - Add a translation
   "loading.default": "Loading...",
-  
+
   // "loading.item": "Loading item...",
   // TODO New key - Add a translation
   "loading.item": "Loading item...",
-  
+
   // "loading.items": "Loading items...",
   // TODO New key - Add a translation
   "loading.items": "Loading items...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   // TODO New key - Add a translation
   "loading.mydspace-results": "Loading items...",
-  
+
   // "loading.objects": "Loading...",
   // TODO New key - Add a translation
   "loading.objects": "Loading...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   // TODO New key - Add a translation
   "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.sub-collections": "Loading sub-collections...",
   // TODO New key - Add a translation
   "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.top-level-communities": "Loading top-level communities...",
   // TODO New key - Add a translation
   "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.forgot-password": "Have you forgotten your password?",
   // TODO New key - Add a translation
   "login.form.forgot-password": "Have you forgotten your 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.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.or-divider": "or",
   // TODO New key - Add a translation
   "login.form.or-divider": "or",
-  
+
   // "login.form.password": "Password",
   // TODO New key - Add a translation
   "login.form.password": "Password",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   // TODO New key - Add a translation
   "login.form.shibboleth": "Log in with Shibboleth",
-  
+
   // "login.form.submit": "Log in",
   // TODO New key - Add a translation
   "login.form.submit": "Log in",
-  
+
   // "login.title": "Login",
   // TODO New key - Add a translation
   "login.title": "Login",
-  
+
   // "login.breadcrumbs": "Login",
   // TODO New key - Add a translation
   "login.breadcrumbs": "Login",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   // TODO New key - Add a translation
   "logout.form.header": "Log out from DSpace",
-  
+
   // "logout.form.submit": "Log out",
   // TODO New key - Add a translation
   "logout.form.submit": "Log out",
-  
+
   // "logout.title": "Logout",
   // TODO New key - Add a translation
   "logout.title": "Logout",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   // TODO New key - Add a translation
   "menu.header.admin": "Admin",
-  
+
   // "menu.header.image.logo": "Repository logo",
   // TODO New key - Add a translation
   "menu.header.image.logo": "Repository logo",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   // TODO New key - Add a translation
   "menu.section.access_control": "Access Control",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   // TODO New key - Add a translation
   "menu.section.access_control_authorizations": "Authorizations",
-  
+
   // "menu.section.access_control_groups": "Groups",
   // TODO New key - Add a translation
   "menu.section.access_control_groups": "Groups",
-  
+
   // "menu.section.access_control_people": "People",
   // TODO New key - Add a translation
   "menu.section.access_control_people": "People",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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.browse_community": "This Community",
   // TODO New key - Add a translation
   "menu.section.browse_community": "This 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_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_title": "By Title",
   // TODO New key - Add a translation
   "menu.section.browse_community_by_title": "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_by_author": "By Author",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_author": "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_subject": "By Subject",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_subject": "By Subject",
-  
+
   // "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_communities_and_collections": "Communities & Collections",
   // TODO New key - Add a translation
   "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   // TODO New key - Add a translation
   "menu.section.control_panel": "Control Panel",
-  
+
   // "menu.section.curation_task": "Curation Task",
   // TODO New key - Add a translation
   "menu.section.curation_task": "Curation Task",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   // TODO New key - Add a translation
   "menu.section.edit": "Edit",
-  
+
   // "menu.section.edit_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.edit_collection": "Collection",
-  
+
   // "menu.section.edit_community": "Community",
   // TODO New key - Add a translation
   "menu.section.edit_community": "Community",
-  
+
   // "menu.section.edit_item": "Item",
   // TODO New key - Add a translation
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "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_community": "Community",
   // TODO New key - Add a translation
   "menu.section.export_community": "Community",
-  
+
   // "menu.section.export_item": "Item",
   // TODO New key - Add a translation
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "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.control_panel": "Control Panel menu section",
   // TODO New key - Add a translation
   "menu.section.icon.control_panel": "Control Panel menu section",
-  
+
   // "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.edit": "Edit menu section",
   // TODO New key - Add a translation
   "menu.section.icon.edit": "Edit menu section",
-  
+
   // "menu.section.icon.export": "Export menu section",
   // TODO New key - Add a translation
   "menu.section.icon.export": "Export menu section",
-  
+
   // "menu.section.icon.find": "Find menu section",
   // TODO New key - Add a translation
   "menu.section.icon.find": "Find menu section",
-  
+
   // "menu.section.icon.import": "Import menu section",
   // TODO New key - Add a translation
   "menu.section.icon.import": "Import menu section",
-  
+
   // "menu.section.icon.new": "New menu section",
   // TODO New key - Add a translation
   "menu.section.icon.new": "New menu section",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.pin": "Pin sidebar",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   // TODO New key - Add a translation
   "menu.section.icon.processes": "Processes menu section",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   // TODO New key - Add a translation
   "menu.section.icon.registries": "Registries menu section",
-  
+
   // "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.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   // TODO New key - Add a translation
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   // TODO New key - Add a translation
   "menu.section.import_batch": "Batch 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_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.new_collection": "Collection",
-  
+
   // "menu.section.new_community": "Community",
   // TODO New key - Add a translation
   "menu.section.new_community": "Community",
-  
+
   // "menu.section.new_item": "Item",
   // TODO New key - Add a translation
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   // TODO New key - Add a translation
   "menu.section.new_item_version": "Item Version",
-  
+
   // "menu.section.new_process": "Process",
   // TODO New key - Add a translation
   "menu.section.new_process": "Process",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.pin": "Pin sidebar",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   // TODO New key - Add a translation
   "menu.section.processes": "Processes",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   // TODO New key - Add a translation
   "menu.section.registries": "Registries",
-  
+
   // "menu.section.registries_format": "Format",
   // TODO New key - Add a translation
   "menu.section.registries_format": "Format",
-  
+
   // "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_task": "Statistics Task",
   // TODO New key - Add a translation
   "menu.section.statistics_task": "Statistics Task",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
   "menu.section.toggle.access_control": "Toggle Access Control 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.curation_task": "Toggle Curation Task section",
   // TODO New key - Add a translation
   "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   // TODO New key - Add a translation
   "menu.section.toggle.edit": "Toggle Edit section",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   // TODO New key - Add a translation
   "menu.section.toggle.export": "Toggle Export section",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   // TODO New key - Add a translation
   "menu.section.toggle.find": "Toggle Find section",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   // TODO New key - Add a translation
   "menu.section.toggle.import": "Toggle Import section",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   // TODO New key - Add a translation
   "menu.section.toggle.new": "Toggle New section",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   // TODO New key - Add a translation
   "menu.section.toggle.registries": "Toggle Registries section",
-  
+
   // "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.workflow": "Administer Workflow",
   // TODO New key - Add a translation
   "menu.section.workflow": "Administer Workflow",
-  
-  
+
+
   // "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.description-placeholder": "Insert your message here...",
   // TODO New key - Add a translation
   "mydspace.messages.description-placeholder": "Insert your message here...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   // TODO New key - Add a translation
   "mydspace.messages.hide-msg": "Hide message",
-  
+
   // "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-unread": "Mark as unread",
   // TODO New key - Add a translation
   "mydspace.messages.mark-as-unread": "Mark as unread",
-  
+
   // "mydspace.messages.no-content": "No content.",
   // TODO New key - Add a translation
   "mydspace.messages.no-content": "No content.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   // TODO New key - Add a translation
   "mydspace.messages.no-messages": "No messages yet.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   // TODO New key - Add a translation
   "mydspace.messages.send-btn": "Send",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   // TODO New key - Add a translation
   "mydspace.messages.show-msg": "Show message",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   // TODO New key - Add a translation
   "mydspace.messages.subject-placeholder": "Subject...",
-  
+
   // "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.title": "Messages",
   // TODO New key - Add a translation
   "mydspace.messages.title": "Messages",
-  
+
   // "mydspace.messages.to": "To",
   // TODO New key - Add a translation
   "mydspace.messages.to": "To",
-  
+
   // "mydspace.new-submission": "New submission",
   // TODO New key - Add a translation
   "mydspace.new-submission": "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-short": "Import metadata",
   // TODO New key - Add a translation
   "mydspace.new-submission-external-short": "Import metadata",
-  
+
   // "mydspace.results.head": "Your submissions",
   // TODO New key - Add a translation
   "mydspace.results.head": "Your submissions",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   // TODO New key - Add a translation
   "mydspace.results.no-abstract": "No Abstract",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   // TODO New key - Add a translation
   "mydspace.results.no-authors": "No Authors",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   // TODO New key - Add a translation
   "mydspace.results.no-collections": "No Collections",
-  
+
   // "mydspace.results.no-date": "No Date",
   // TODO New key - Add a translation
   "mydspace.results.no-date": "No Date",
-  
+
   // "mydspace.results.no-files": "No Files",
   // TODO New key - Add a translation
   "mydspace.results.no-files": "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-title": "No title",
   // TODO New key - Add a translation
   "mydspace.results.no-title": "No title",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   // TODO New key - Add a translation
   "mydspace.results.no-uri": "No Uri",
-  
+
   // "mydspace.show.workflow": "All tasks",
   // TODO New key - Add a translation
   "mydspace.show.workflow": "All tasks",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   // 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.validation": "Validation",
+  "mydspace.status.mydspaceArchived": "Archived",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceValidation": "Validation",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
-  
-  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
-  
-  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "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
   "mydspace.title": "MyDSpace",
-  
+
   // "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-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-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-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.view-btn": "View",
   // TODO New key - Add a translation
   "mydspace.view-btn": "View",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   // TODO New key - Add a translation
   "nav.browse.header": "All of DSpace",
-  
+
   // "nav.community-browse.header": "By Community",
   // TODO New key - Add a translation
   "nav.community-browse.header": "By Community",
-  
+
   // "nav.language": "Language switch",
   // TODO New key - Add a translation
   "nav.language": "Language switch",
-  
+
   // "nav.login": "Log In",
   // TODO New key - Add a translation
   "nav.login": "Log In",
-  
+
   // "nav.logout": "Log Out",
   // TODO New key - Add a translation
   "nav.logout": "Log Out",
-  
+
   // "nav.mydspace": "MyDSpace",
   // TODO New key - Add a translation
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
   // TODO New key - Add a translation
   "nav.profile": "Profile",
-  
+
   // "nav.search": "Search",
   // TODO New key - Add a translation
   "nav.search": "Search",
-  
+
   // "nav.statistics.header": "Statistics",
   // TODO New key - Add a translation
   "nav.statistics.header": "Statistics",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   // TODO New key - Add a translation
   "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   // TODO New key - Add a translation
   "orgunit.listelement.badge": "Organizational Unit",
-  
+
   // "orgunit.page.city": "City",
   // TODO New key - Add a translation
   "orgunit.page.city": "City",
-  
+
   // "orgunit.page.country": "Country",
   // TODO New key - Add a translation
   "orgunit.page.country": "Country",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   // TODO New key - Add a translation
   "orgunit.page.dateestablished": "Date established",
-  
+
   // "orgunit.page.description": "Description",
   // TODO New key - Add a translation
   "orgunit.page.description": "Description",
-  
+
   // "orgunit.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "orgunit.page.edit": "Edit this item",
-  
+
   // "orgunit.page.id": "ID",
   // TODO New key - Add a translation
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   // TODO New key - Add a translation
   "orgunit.page.titleprefix": "Organizational Unit: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   // TODO New key - Add a translation
   "pagination.results-per-page": "Results Per Page",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   // TODO New key - Add a translation
   "pagination.showing.detail": "{{ range }} of {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   // TODO New key - Add a translation
   "pagination.showing.label": "Now showing ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   // TODO New key - Add a translation
   "pagination.sort-direction": "Sort Options",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   // TODO New key - Add a translation
   "person.listelement.badge": "Person",
-  
+
   // "person.listelement.no-title": "No name found",
   // TODO New key - Add a translation
   "person.listelement.no-title": "No name found",
-  
+
   // "person.page.birthdate": "Birth Date",
   // TODO New key - Add a translation
   "person.page.birthdate": "Birth Date",
-  
+
   // "person.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "person.page.edit": "Edit this item",
-  
+
   // "person.page.email": "Email Address",
   // TODO New key - Add a translation
   "person.page.email": "Email Address",
-  
+
   // "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.lastname": "Last Name",
   // TODO New key - Add a translation
   "person.page.lastname": "Last Name",
-  
+
   // "person.page.link.full": "Show all metadata",
   // TODO New key - Add a translation
   "person.page.link.full": "Show all 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.titleprefix": "Person: ",
   // TODO New key - Add a translation
   "person.page.titleprefix": "Person: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   // TODO New key - Add a translation
   "process.new.select-parameters": "Parameters",
-  
+
   // "process.new.cancel": "Cancel",
   // TODO New key - Add a translation
   "process.new.cancel": "Cancel",
-  
+
   // "process.new.submit": "Submit",
   // TODO New key - Add a translation
   "process.new.submit": "Submit",
-  
+
   // "process.new.select-script": "Script",
   // TODO New key - Add a translation
   "process.new.select-script": "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.required": "Script is required",
   // TODO New key - Add a translation
   "process.new.select-script.required": "Script is 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.required": "Please select a file",
   // TODO New key - Add a translation
   "process.new.parameter.file.required": "Please select a file",
-  
+
   // "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.type.value": "value",
   // TODO New key - Add a translation
   "process.new.parameter.type.value": "value",
-  
+
   // "process.new.parameter.type.file": "file",
   // TODO New key - Add a translation
   "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.notification.success.title": "Success",
   // TODO New key - Add a translation
   "process.new.notification.success.title": "Success",
-  
+
   // "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.error.title": "Error",
   // TODO New key - Add a translation
   "process.new.notification.error.title": "Error",
-  
+
   // "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.header": "Create a new process",
   // TODO New key - Add a translation
   "process.new.header": "Create a new process",
-  
+
   // "process.new.title": "Create a new process",
   // TODO New key - Add a translation
   "process.new.title": "Create a new process",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   // TODO New key - Add a translation
   "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
-  
+  "process.detail.arguments": "Arguments",
+
   // "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": "This process doesn't contain any arguments",
+
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
-  
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
   "process.detail.logs.button": "Retrieve process output",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   // TODO New key - Add a translation
   "process.detail.logs.loading": "Retrieving",
-  
+
   // "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.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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
-  
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
+  "process.detail.end-time": "Finish time",
+
   // "process.detail.status" : "Status",
   // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
+  "process.detail.status": "Status",
+
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
+  "process.detail.create": "Create similar process",
+
+
+
   // "process.overview.table.finish" : "Finish time",
   // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
+  "process.overview.table.finish": "Finish time",
+
   // "process.overview.table.id" : "Process ID",
   // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
+  "process.overview.table.id": "Process ID",
+
   // "process.overview.table.name" : "Name",
   // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name": "Name",
+
   // "process.overview.table.start" : "Start time",
   // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
-  
+  "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.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.title": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.title": "Processes Overview",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.breadcrumbs": "Processes Overview",
-  
+
   // "process.overview.new": "New",
   // TODO New key - Add a translation
   "process.overview.new": "New",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   // TODO New key - Add a translation
   "profile.breadcrumbs": "Update Profile",
-  
+
   // "profile.card.identify": "Identify",
   // TODO New key - Add a translation
   "profile.card.identify": "Identify",
-  
+
   // "profile.card.security": "Security",
   // TODO New key - Add a translation
   "profile.card.security": "Security",
-  
+
   // "profile.form.submit": "Update Profile",
   // TODO New key - Add a translation
   "profile.form.submit": "Update Profile",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   // TODO New key - Add a translation
   "profile.groups.head": "Authorization groups you belong to",
-  
+
   // "profile.head": "Update Profile",
   // TODO New key - Add a translation
   "profile.head": "Update Profile",
-  
+
   // "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.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.label.email": "Email Address",
   // TODO New key - Add a translation
   "profile.metadata.form.label.email": "Email Address",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   // TODO New key - Add a translation
   "profile.metadata.form.label.firstname": "First Name",
-  
+
   // "profile.metadata.form.label.language": "Language",
   // TODO New key - Add a translation
   "profile.metadata.form.label.language": "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.phone": "Contact Telephone",
   // TODO New key - Add a translation
   "profile.metadata.form.label.phone": "Contact Telephone",
-  
+
   // "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.title": "Profile saved",
   // TODO New key - Add a translation
   "profile.metadata.form.notifications.success.title": "Profile saved",
-  
+
   // "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.title": "No changes",
   // TODO New key - Add a translation
   "profile.notifications.warning.no-changes.title": "No changes",
-  
+
   // "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.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.label.password": "Password",
   // TODO New key - Add a translation
   "profile.security.form.label.password": "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.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.title": "Password saved",
   // TODO New key - Add a translation
   "profile.security.form.notifications.success.title": "Password saved",
-  
+
   // "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.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.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.title": "Update Profile",
   // TODO New key - Add a translation
   "profile.title": "Update Profile",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   // TODO New key - Add a translation
   "project.listelement.badge": "Research Project",
-  
+
   // "project.page.contributor": "Contributors",
   // TODO New key - Add a translation
   "project.page.contributor": "Contributors",
-  
+
   // "project.page.description": "Description",
   // TODO New key - Add a translation
   "project.page.description": "Description",
-  
+
   // "project.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "project.page.edit": "Edit this item",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   // TODO New key - Add a translation
   "project.page.expectedcompletion": "Expected Completion",
-  
+
   // "project.page.funder": "Funders",
   // TODO New key - Add a translation
   "project.page.funder": "Funders",
-  
+
   // "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.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.search.results.head": "Project Search Results",
   // TODO New key - Add a translation
   "project.search.results.head": "Project Search Results",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   // TODO New key - Add a translation
   "publication.listelement.badge": "Publication",
-  
+
   // "publication.page.description": "Description",
   // TODO New key - Add a translation
   "publication.page.description": "Description",
-  
+
   // "publication.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "publication.page.edit": "Edit this item",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "publication.page.journal-issn": "Journal ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "publication.page.journal-title": "Journal Title",
-  
+
   // "publication.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "publication.page.publisher": "Publisher",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   // TODO New key - Add a translation
   "publication.page.titleprefix": "Publication: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "publication.page.volume-title": "Volume Title",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   // TODO New key - Add a translation
   "publication.search.results.head": "Publication Search Results",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   // TODO New key - Add a translation
   "publication.search.title": "DSpace Angular :: Publication Search",
-  
-  
+
+
   // "register-email.title": "New user registration",
   // TODO New key - Add a translation
   "register-email.title": "New user registration",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   // TODO New key - Add a translation
   "register-page.create-profile.header": "Create Profile",
-  
+
   // "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.email": "Email Address",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.email": "Email Address",
-  
+
   // "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.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.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.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.contact": "Contact Telephone",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.contact": "Contact Telephone",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.language": "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.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.label.password": "Password *",
   // TODO New key - Add a translation
   "register-page.create-profile.security.label.password": "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.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.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.submit": "Complete Registration",
   // TODO New key - Add a translation
   "register-page.create-profile.submit": "Complete Registration",
-  
+
   // "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.head": "Registration failed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.error.head": "Registration failed",
-  
+
   // "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.head": "Registration completed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   // TODO New key - Add a translation
   "register-page.registration.header": "New user registration",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "register-page.registration.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Register",
   // TODO New key - Add a translation
   "register-page.registration.submit": "Register",
-  
+
   // "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.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.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.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 }}",
-  
-  
-  
+
+
+
   // "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.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.title": "Unable to add relationship",
   // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
-  
+
   // "relationships.isAuthorOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isAuthorOf": "Authors",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.Person": "Authors (persons)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   // TODO New key - Add a translation
   "relationships.isIssueOf": "Journal Issues",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   // TODO New key - Add a translation
   "relationships.isJournalIssueOf": "Journal Issue",
-  
+
   // "relationships.isJournalOf": "Journals",
   // TODO New key - Add a translation
   "relationships.isJournalOf": "Journals",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   // TODO New key - Add a translation
   "relationships.isOrgUnitOf": "Organizational Units",
-  
+
   // "relationships.isPersonOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isPersonOf": "Authors",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   // TODO New key - Add a translation
   "relationships.isProjectOf": "Research Projects",
-  
+
   // "relationships.isPublicationOf": "Publications",
   // TODO New key - Add a translation
   "relationships.isPublicationOf": "Publications",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   // TODO New key - Add a translation
   "relationships.isPublicationOfJournalIssue": "Articles",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   // TODO New key - Add a translation
   "relationships.isSingleJournalOf": "Journal",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   // TODO New key - Add a translation
   "relationships.isSingleVolumeOf": "Journal Volume",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   // TODO New key - Add a translation
   "relationships.isVolumeOf": "Journal Volumes",
-  
+
   // "relationships.isContributorOf": "Contributors",
   // TODO New key - Add a translation
   "relationships.isContributorOf": "Contributors",
-  
-  
-  
+
+
+
   // "resource-policies.add.button": "Add",
   // TODO New key - Add a translation
   "resource-policies.add.button": "Add",
-  
+
   // "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.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.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.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.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.collection": "Add a new Collection policy",
   // TODO New key - Add a translation
   "resource-policies.add.for.collection": "Add a new Collection policy",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.create.page.success.content": "Operation successful",
-  
+
   // "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.delete.btn": "Delete selected",
   // TODO New key - Add a translation
   "resource-policies.delete.btn": "Delete selected",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.delete.success.content": "Operation successful",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.edit.page.success.content": "Operation successful",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   // TODO New key - Add a translation
   "resource-policies.edit.page.title": "Edit resource policy",
-  
+
   // "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.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.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.select.btn": "Select",
   // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
+
   // "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.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.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.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.date.end.label": "End Date",
   // TODO New key - Add a translation
   "resource-policies.form.date.end.label": "End Date",
-  
+
   // "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.description.label": "Description",
   // TODO New key - Add a translation
   "resource-policies.form.description.label": "Description",
-  
+
   // "resource-policies.form.name.label": "Name",
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
-  
+
   // "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.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.table.headers.action": "Action",
   // TODO New key - Add a translation
   "resource-policies.table.headers.action": "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.start": "Start Date",
   // TODO New key - Add a translation
   "resource-policies.table.headers.date.start": "Start Date",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit": "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.policy": "Edit policy",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit.policy": "Edit policy",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   // TODO New key - Add a translation
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
   // TODO New key - Add a translation
   "resource-policies.table.headers.group": "Group",
-  
+
   // "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.policyType": "type",
   // TODO New key - Add a translation
   "resource-policies.table.headers.policyType": "type",
-  
+
   // "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.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.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.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.collection": "Policies for Collection",
   // TODO New key - Add a translation
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
+
+
+
   // "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.title": "DSpace Angular :: Search",
   // TODO New key - Add a translation
   "search.title": "DSpace Angular :: Search",
-  
+
   // "search.breadcrumbs": "Search",
   // TODO New key - Add a translation
   "search.breadcrumbs": "Search",
-  
-  
+
+
   // "search.filters.applied.f.author": "Author",
   // TODO New key - Add a translation
   "search.filters.applied.f.author": "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.min": "Start date",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateIssued.min": "Start date",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateSubmitted": "Date submitted",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   // TODO New key - Add a translation
   "search.filters.applied.f.discoverable": "Private",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.entityType": "Item Type",
-  
+
   // "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.itemtype": "Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.itemtype": "Type",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   // TODO New key - Add a translation
   "search.filters.applied.f.namedresourcetype": "Status",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   // TODO New key - Add a translation
   "search.filters.applied.f.subject": "Subject",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   // TODO New key - Add a translation
   "search.filters.applied.f.submitter": "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.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.min": "Start birth date",
   // TODO New key - Add a translation
   "search.filters.applied.f.birthDate.min": "Start birth date",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   // TODO New key - Add a translation
   "search.filters.filter.author.head": "Author",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   // TODO New key - Add a translation
   "search.filters.filter.author.placeholder": "Author name",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.head": "Birth Date",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.placeholder": "Birth Date",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.head": "Date Published",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  
+
   // "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.creativeWorkKeywords.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  
+
   // "search.filters.filter.dateIssued.head": "Date",
   // TODO New key - Add a translation
   "search.filters.filter.dateIssued.head": "Date",
-  
+
   // "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.min.placeholder": "Maximum Date",
   // TODO New key - Add a translation
   "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.head": "Date submitted",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   // TODO New key - Add a translation
   "search.filters.filter.discoverable.head": "Private",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.filter.withdrawn.head": "Withdrawn",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.head": "Item Type",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.placeholder": "Item Type",
-  
+
   // "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.itemtype.head": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.head": "Type",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.placeholder": "Type",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.head": "Job Title",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.placeholder": "Job Title",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.head": "Known language",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  
+
   // "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.objectpeople.head": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.head": "People",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.placeholder": "People",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.head": "Country",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.head": "City",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   // TODO New key - Add a translation
   "search.filters.filter.scope.head": "Scope",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   // TODO New key - Add a translation
   "search.filters.filter.scope.placeholder": "Scope filter",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   // TODO New key - Add a translation
   "search.filters.filter.show-less": "Collapse",
-  
+
   // "search.filters.filter.show-more": "Show more",
   // TODO New key - Add a translation
   "search.filters.filter.show-more": "Show more",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.subject.head": "Subject",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.subject.placeholder": "Subject",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.head": "Submitter",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.placeholder": "Submitter",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalIssue": "Journal Issue",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalVolume": "Journal Volume",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   // TODO New key - Add a translation
   "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
+
   // "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.false": "No",
   // TODO New key - Add a translation
   "search.filters.has_content_in_original_bundle.false": "No",
-  
+
   // "search.filters.discoverable.true": "No",
   // TODO New key - Add a translation
   "search.filters.discoverable.true": "No",
-  
+
   // "search.filters.discoverable.false": "Yes",
   // TODO New key - Add a translation
   "search.filters.discoverable.false": "Yes",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   // TODO New key - Add a translation
   "search.filters.withdrawn.true": "Yes",
-  
+
   // "search.filters.withdrawn.false": "No",
   // TODO New key - Add a translation
   "search.filters.withdrawn.false": "No",
-  
-  
+
+
   // "search.filters.head": "Filters",
   // TODO New key - Add a translation
   "search.filters.head": "Filters",
-  
+
   // "search.filters.reset": "Reset filters",
   // TODO New key - Add a translation
   "search.filters.reset": "Reset filters",
-  
-  
-  
+
+
+
   // "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.results.head": "Search Results",
   // TODO New key - Add a translation
   "search.results.head": "Search Results",
-  
+
   // "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-link": "quotes around it",
   // TODO New key - Add a translation
   "search.results.no-results-link": "quotes around it",
-  
+
   // "search.results.empty": "Your search returned no results.",
   // TODO New key - Add a translation
   "search.results.empty": "Your search returned no results.",
-  
-  
-  
+
+
+
   // "search.sidebar.close": "Back to results",
   // TODO New key - Add a translation
   "search.sidebar.close": "Back to results",
-  
+
   // "search.sidebar.filters.title": "Filters",
   // TODO New key - Add a translation
   "search.sidebar.filters.title": "Filters",
-  
+
   // "search.sidebar.open": "Search Tools",
   // TODO New key - Add a translation
   "search.sidebar.open": "Search Tools",
-  
+
   // "search.sidebar.results": "results",
   // TODO New key - Add a translation
   "search.sidebar.results": "results",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   // TODO New key - Add a translation
   "search.sidebar.settings.rpp": "Results per page",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   // TODO New key - Add a translation
   "search.sidebar.settings.sort-by": "Sort By",
-  
+
   // "search.sidebar.settings.title": "Settings",
   // TODO New key - Add a translation
   "search.sidebar.settings.title": "Settings",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   // TODO New key - Add a translation
   "search.view-switch.show-detail": "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-list": "Show as list",
   // TODO New key - Add a translation
   "search.view-switch.show-list": "Show as list",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   // TODO New key - Add a translation
   "sorting.ASC": "Ascending",
-  
+
   // "sorting.DESC": "Descending",
   // TODO New key - Add a translation
   "sorting.DESC": "Descending",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   // TODO New key - Add a translation
   "sorting.dc.title.ASC": "Title Ascending",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   // TODO New key - Add a translation
   "sorting.dc.title.DESC": "Title Descending",
-  
+
   // "sorting.score.DESC": "Relevance",
   // TODO New key - Add a translation
   "sorting.score.DESC": "Relevance",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
   // TODO New key - Add a translation
   "statistics.title": "Statistics",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   // TODO New key - Add a translation
   "statistics.header": "Statistics for {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   // TODO New key - Add a translation
   "statistics.breadcrumbs": "Statistics",
-  
+
   // "statistics.page.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.page.no-data": "No data available",
-  
+
   // "statistics.table.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.table.no-data": "No data available",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalVisits": "Total visits",
-  
+
   // "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.TotalDownloads": "File Visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalDownloads": "File Visits",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCountries": "Top country views",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCities": "Top city views",
-  
+
   // "statistics.table.header.views": "Views",
   // TODO New key - Add a translation
   "statistics.table.header.views": "Views",
-  
-  
-  
+
+
+
   // "submission.edit.title": "Edit Submission",
   // TODO New key - Add a translation
   "submission.edit.title": "Edit Submission",
-  
+
   // "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.deposit": "Deposit",
   // TODO New key - Add a translation
   "submission.general.deposit": "Deposit",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.cancel": "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.submit": "Yes, I'm sure",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.title": "Discard submission",
-  
+
   // "submission.general.discard.submit": "Discard",
   // TODO New key - Add a translation
   "submission.general.discard.submit": "Discard",
-  
+
   // "submission.general.save": "Save",
   // TODO New key - Add a translation
   "submission.general.save": "Save",
-  
+
   // "submission.general.save-later": "Save for later",
   // TODO New key - Add a translation
   "submission.general.save-later": "Save for 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.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.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.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.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.button": "Search",
   // TODO New key - Add a translation
   "submission.import-external.search.button": "Search",
-  
+
   // "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.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.source.arxiv": "arXiv",
   // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   // TODO New key - Add a translation
   "submission.import-external.source.loading": "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.sherpaPublisher": "SHERPA Publishers",
   // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   // TODO New key - Add a translation
   "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.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",
   // TODO New key - Add a translation
   "submission.import-external.preview.title": "Item Preview",
-  
+
   // "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.button.import": "Start submission",
   // TODO New key - Add a translation
   "submission.import-external.preview.button.import": "Start submission",
-  
+
   // "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.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.sections.describe.relationship-lookup.close": "Close",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.close": "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.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.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 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 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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 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.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.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 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.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.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.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.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-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.loading": "Loading...",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.loading": "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.search": "Go",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
+
   // "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-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.selected": "Selected {{ size }} items",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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",
   // 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.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.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.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.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.JournalIssue": "Journal Issues",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
+
   // "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.JournalVolume": "Journal Volumes",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
+
   // "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.isAuthorOfPublication": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
+
   // "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.Project": "Projects",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
+
   // "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.Person": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
+
   // "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.DataPackage": "Data Packages",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
+
   // "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.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.isFundingOfPublication": "Funding",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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": "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": "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.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.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.ccLicense.type": "License Type",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.type": "License 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.change": "Change your license type…",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.change": "Change your license type…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.none": "No licenses available",
-  
+
   // "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.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.confirmation": "I grant the license above",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
+
   // "submission.sections.general.add-more": "Add more",
   // TODO New key - Add a translation
   "submission.sections.general.add-more": "Add more",
-  
+
   // "submission.sections.general.collection": "Collection",
   // TODO New key - Add a translation
   "submission.sections.general.collection": "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_success_notice": "Submission deposited successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  
+
   // "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_success_notice": "Submission discarded successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  
+
   // "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-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.no-collection": "No collection found",
   // TODO New key - Add a translation
   "submission.sections.general.no-collection": "No collection 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.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_success_notice": "Submission saved successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  
+
   // "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.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.submit.progressbar.CClicense": "Creative commons license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
+
   // "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.stepcustom": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  
+
   // "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.steptwo": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.license": "Deposit license",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.upload": "Upload files",
-  
-  
-  
+
+
+
   // "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.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.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.title": "Delete bitstream",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.submit": "Delete",
-  
+
   // "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.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.date-required": "Date is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.date-required": "Date is required.",
-  
+
   // "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-placeholder": "From",
   // TODO New key - Add a translation
   "submission.sections.upload.form.from-placeholder": "From",
-  
+
   // "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-required": "Group is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.group-required": "Group is 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-placeholder": "Until",
   // TODO New key - Add a translation
   "submission.sections.upload.form.until-placeholder": "Until",
-  
+
   // "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.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.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>",
   // 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 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.no-entry": "No",
   // TODO New key - Add a translation
   "submission.sections.upload.no-entry": "No",
-  
+
   // "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.save-metadata": "Save metadata",
   // TODO New key - Add a translation
   "submission.sections.upload.save-metadata": "Save metadata",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   // TODO New key - Add a translation
   "submission.sections.upload.undo": "Cancel",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-failed": "Upload failed",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-successful": "Upload successful",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   // TODO New key - Add a translation
   "submission.submit.title": "Submission",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   // TODO New key - Add a translation
   "submission.workflow.generic.delete": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.generic.edit": "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.view": "View",
   // TODO New key - Add a translation
   "submission.workflow.generic.view": "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.tasks.claimed.approve": "Approve",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.approve": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.edit": "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.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.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.submit": "Reject item",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  
+
   // "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.submit": "Reject",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  
+
   // "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.return": "Return to pool",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.return": "Return to pool",
-  
+
   // "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.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.processing": "Processing...",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.processing": "Processing...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.submitter": "Submitter",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.success": "Operation successful",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.claim": "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.hide-detail": "Hide detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.show-detail": "Show detail",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   // TODO New key - Add a translation
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   // TODO New key - Add a translation
   "vocabulary-treeview.header": "Hierarchical tree view",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   // TODO New key - Add a translation
   "vocabulary-treeview.load-more": "Load more",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.reset": "Reset",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.search": "Search",
-  
+
   // "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.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.srsc": "Research Subject Categories",
   // TODO New key - Add a translation
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   // TODO New key - Add a translation
   "uploader.browse": "browse",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   // TODO New key - Add a translation
   "uploader.drag-message": "Drag & Drop your files here",
-  
+
   // "uploader.or": ", or ",
   // TODO New key - Add a translation
   "uploader.or": ", 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.queue-length": "Queue length",
   // TODO New key - Add a translation
   "uploader.queue-length": "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.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-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",
-  
-  
-  
+
+
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   // TODO New key - Add a translation
   "workflowAdmin.search.results.head": "Administer 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.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.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.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.title": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.title": "Delete workflow item",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.header": "Delete workflow item",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.delete.button.cancel": "Cancel",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   // TODO New key - Add a translation
   "workflow-item.delete.button.confirm": "Delete",
-  
-  
+
+
   // "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.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.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.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.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.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.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.send-back.button.cancel": "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",
 
-}
\ No newline at end of file
+
+}
diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5
index 63e7374ed0..d6ec02437c 100644
--- a/src/assets/i18n/kk.json5
+++ b/src/assets/i18n/kk.json5
@@ -109,7 +109,7 @@
   "admin.registries.bitstream-formats.delete.failure.head": "Сәтсіздік",
 
   // "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.amount": "{{ amount }} пішімі (лері) сәтті жойылды",
 
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Сәтті",
@@ -157,7 +157,7 @@
   "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)",
-  "admin.registries.bitstream-formats.edit.shortDescription.hint":"Бұл форматтың ерекше атауы,(e.g. Microsoft Word XP or Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Бұл форматтың ерекше атауы,(e.g. Microsoft Word XP or Microsoft Word 2000)",
 
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Аты",
@@ -194,6 +194,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Аты",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Қайтару",
@@ -202,7 +204,7 @@
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Белгілі",
 
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED":"Қолдау",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Қолдау",
 
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Белгісіз",
@@ -211,8 +213,7 @@
   "admin.registries.bitstream-formats.table.supportLevel.head": "Қолдау деңгейі",
 
   // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
-  // TODO Source message changed - Revise the translation
-  "admin.registries.bitstream-formats.title": "DSpace Angular ::Бит ағыны форматтарының тізілімі",
+  "admin.registries.bitstream-formats.title": "Бит ағыны форматтарының тізілімі",
 
 
 
@@ -226,7 +227,7 @@
   "admin.registries.metadata.form.create": "Метадеректер схемасын құру",
 
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
-  "admin.registries.metadata.form.edit":"Метадеректер схемасын өңдеу",
+  "admin.registries.metadata.form.edit": "Метадеректер схемасын өңдеу",
 
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "Аты",
@@ -238,7 +239,7 @@
   "admin.registries.metadata.head": "Метадеректер тізілімі",
 
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
-  "admin.registries.metadata.schemas.no-items":"Көрсету үшін метадеректер схемасы жоқ",
+  "admin.registries.metadata.schemas.no-items": "Көрсету үшін метадеректер схемасы жоқ",
 
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Жою таңдалған",
@@ -253,13 +254,12 @@
   "admin.registries.metadata.schemas.table.namespace": "Аттар кеңістігі",
 
   // "admin.registries.metadata.title": "Metadata Registry",
-  // TODO Source message changed - Revise the translation
-  "admin.registries.metadata.title": "DSpace Angular :: Метадеректер тізілімі",
+  "admin.registries.metadata.title": "Метадеректер тізілімі",
 
 
 
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  "admin.registries.schema.breadcrumbs":"Метадеректер схемасы",
+  "admin.registries.schema.breadcrumbs": "Метадеректер схемасы",
 
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Бұл \" {{аттар кеңістігі}} \" үшін метадеректер схемасы.",
@@ -275,6 +275,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Өріс",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Қолдану саласы бойынша ескертпе",
@@ -319,21 +321,19 @@
   "admin.registries.schema.notification.field.deleted.failure": "Жою мүмкін емес {{amount}}метадеректер өрісі",
 
   // "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.deleted.success": "Сәтті жойылды {{amount}} метадеректер өрісі",
 
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "Сәтті өңделген метадеректер өрісі\"{{field}}\"",
 
   // "admin.registries.schema.notification.success": "Success",
-  "admin.registries.schema.notification.success": "Успех",
+  "admin.registries.schema.notification.success": "Сәтті",
 
   // "admin.registries.schema.return": "Back",
-  // TODO Source message changed - Revise the translation
   "admin.registries.schema.return": "Қайтару",
 
   // "admin.registries.schema.title": "Metadata Schema Registry",
-  // TODO Source message changed - Revise the translation
-  "admin.registries.schema.title": "DSpace Angular:: метадеректер тізбегінің тізілімі",
+  "admin.registries.schema.title": "Метадеректер тізбегінің тізілімі",
 
 
 
@@ -350,12 +350,10 @@
   "admin.access-control.epeople.actions.stop-impersonating": "Адам туралы ойлауды доғарыңыз",
 
   // "admin.access-control.epeople.breadcrumbs": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Адамдар",
 
   // "admin.access-control.epeople.title": "EPeople",
-  // TODO Source message changed - Revise the translation
-  "admin.access-control.epeople.title": "DSpace Angular :: Адамдар",
+  "admin.access-control.epeople.title": "Адамдар",
 
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "Адамдар",
@@ -376,8 +374,7 @@
   "admin.access-control.epeople.search.button": "Іздеу",
 
   // "admin.access-control.epeople.search.placeholder": "Search people...",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Адамдарды іздеу...",
 
   // "admin.access-control.epeople.button.add": "Add EPerson",
   "admin.access-control.epeople.button.add": "Адамды қосу",
@@ -398,8 +395,7 @@
   "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",
-  // TODO New key - Add a translation
-  "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}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Жою\"{{name}}\"",
@@ -432,8 +428,7 @@
   "admin.access-control.epeople.form.requireCertificate": "Сертификат қажет",
 
   // "admin.access-control.epeople.form.return": "Back",
-  // TODO New key - Add a translation
-  "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}}\"",
   "admin.access-control.epeople.form.notification.created.success": "Сәтті құрылған Эпперсон \"{{name}}\"",
@@ -451,7 +446,7 @@
   "admin.access-control.epeople.form.notification.edited.success": "Сәтті өңделген адам \"{{name}}\"",
 
   // "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.edited.failure": "Адамды өңдеу мүмкін емес\"{{name}}\"",
 
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "Сәтті жойылған тұлға \"{{name}}\"",
@@ -469,8 +464,7 @@
   "admin.access-control.epeople.form.table.name": "Аты",
 
   // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
-  // TODO New key - Add a translation
-  "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",
   "admin.access-control.epeople.form.memberOfNoGroups": "Бұл адам ешқандай топтың мүшесі емес",
@@ -487,28 +481,22 @@
 
 
   // "admin.access-control.groups.title": "Groups",
-  // TODO Source message changed - Revise the translation
-  "admin.access-control.groups.title": "DSpace Angular :: Топтар",
+  "admin.access-control.groups.title": "Топтар",
 
   // "admin.access-control.groups.breadcrumbs": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Топтар",
 
   // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Топты өңдеу",
 
   // "admin.access-control.groups.title.singleGroup": "Edit Group",
-  // TODO Source message changed - Revise the translation
-  "admin.access-control.groups.title.singleGroup": "DSpace Angular:: редакциялау тобы",
+  "admin.access-control.groups.title.singleGroup": "Топты редакциялау",
 
   // "admin.access-control.groups.title.addGroup": "New Group",
-  // TODO Source message changed - Revise the translation
-  "admin.access-control.groups.title.addGroup": "DSpace Angular :: Жаңа топ",
+  "admin.access-control.groups.title.addGroup": "Жаңа топ қосу",
 
   // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Жаңы топ",
 
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Топтар",
@@ -526,8 +514,7 @@
   "admin.access-control.groups.search.button": "Іздеу",
 
   // "admin.access-control.groups.search.placeholder": "Search groups...",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Топты іздеу...",
 
   // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "Жеке куәлік",
@@ -536,8 +523,7 @@
   "admin.access-control.groups.table.name": "Аты",
 
   // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Жинақ/Қауымдастық",
 
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Қатысушылар",
@@ -581,11 +567,10 @@
   "admin.access-control.groups.form.groupName": "Топтың атауы",
 
   // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Жинақ немесе Қауымдастық",
 
   // "admin.access-control.groups.form.groupDescription": "Description",
-  "admin.access-control.groups.form.groupDescription":"Сипаттама",
+  "admin.access-control.groups.form.groupDescription": "Сипаттама",
 
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "Сәтті құрылған топ \"{{name}}\"",
@@ -657,28 +642,25 @@
   "admin.access-control.groups.form.members-list.table.name": "Аты",
 
   // "admin.access-control.groups.form.members-list.table.identity": "Identity",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
   "admin.access-control.groups.form.members-list.table.netid": "NetID",
 
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
-  "admin.access-control.groups.form.members-list.table.edit": "Жою/ 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}}\"",
   "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}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.addMember":"Сәтті қосылған мүше: \"{{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}}\"",
-  "admin.access-control.groups.form.members-list.notification.failure.addMember":"Қатысушыны қосу мүмкін емес: \"{{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}}\"",
   "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Сәтті қашықтағы мүше: \"{{name}}\"",
@@ -705,7 +687,7 @@
   "admin.access-control.groups.form.subgroups-list.head": "Топтар",
 
   // "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.search.head": "Кіші топты қосу",
 
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.subgroups-list.button.see-all": "Барлығын Қарау",
@@ -723,8 +705,7 @@
   "admin.access-control.groups.form.subgroups-list.table.name": "Аты",
 
   // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
-  // TODO New key - Add a translation
-  "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",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Жою / Қосу",
@@ -733,7 +714,6 @@
   "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 Source message changed - Revise the translation
   "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Атауы бар кіші топты қосыңыз \"{{name}}\"",
 
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
@@ -764,11 +744,415 @@
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Топта әлі кіші топтар жоқ.",
 
   // "admin.access-control.groups.form.return": "Back",
-  // TODO Source message changed - Revise the translation
   "admin.access-control.groups.form.return": "Топтарға оралу",
 
 
 
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Әкімшілік іздеу",
 
@@ -776,7 +1160,7 @@
   "admin.search.collection.edit": "Өңдеу",
 
   // "admin.search.community.edit": "Edit",
-  "admin.search.community.edit":"Өңдеу",
+  "admin.search.community.edit": "Өңдеу",
 
   // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "Жою",
@@ -796,7 +1180,7 @@
   "admin.search.item.move": "Жылжыту",
 
   // "admin.search.item.reinstate": "Reinstate",
-  "admin.search.item.reinstate":"Қалпына келтіру",
+  "admin.search.item.reinstate": "Қалпына келтіру",
 
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Шақыру",
@@ -856,50 +1240,40 @@
   "admin.metadata-import.page.error.addFile": "Алдымен файлды таңдаңыз!",
 
   // "admin.metadata-import.page.validateOnly": "Validate Only",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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 файлы тексеріледі. Сіз анықталған өзгерістер туралы есеп аласыз, бірақ ешқандай өзгеріс сақталмайды.",
 
 
 
 
   // "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.",
-  // TODO New key - Add a translation
-  "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}}..." ,
-  // TODO New key - Add a translation
-  "bitstream.download.page": "Now downloading {{bitstream}}..." ,
+  "bitstream.download.page": "Қазір жүктеу {{bitstream}}..." ,
 
   // "bitstream.download.page.back": "Back" ,
-  // TODO New key - Add a translation
-  "bitstream.download.page.back": "Back" ,
+  "bitstream.download.page.back": "Артқа" ,
 
 
   // "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-  // TODO New key - Add a translation
-  "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.link": "Бит ағынының саясатын өңдеу",
 
   // "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
-  // TODO New key - Add a translation
-  "bitstream.edit.authorizations.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Бит ағынының саясатын өңдеу",
 
   // "bitstream.edit.return": "Back",
-  // TODO New key - Add a translation
-  "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Артқа",
 
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "Битстрим: ",
@@ -944,36 +1318,28 @@
   "bitstream.edit.notifications.error.format.title": "Бит ағынының форматын сақтау кезінде қате пайда болды",
 
   // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Бұл кескінге арналған кенеп жапсырмасы. Егер көрсетілмесе, әдепкі белгі қолданылады.",
 
   // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "IIIF Кенептің ені",
 
   // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "Кенептің ені әдетте кескіннің еніне сәйкес келуі керек.",
 
   // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "IIIF Кенептің биіктігі",
 
   // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "Кенептің биіктігі әдетте кескіннің биіктігіне сәйкес келуі керек.",
 
 
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
@@ -986,85 +1352,66 @@
   "bitstream.edit.title": "Бит ағынын өзгерту",
 
   // "bitstream-request-a-copy.alert.canDownload1": "You already have access to this file. If you want to download the file, click ",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "мында",
 
   // "bitstream-request-a-copy.header": "Request a copy of the file",
-  // TODO New key - Add a translation
-  "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: ",
-  // TODO New key - Add a translation
-  "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: ",
-  // TODO New key - Add a translation
-  "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. ",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Барлық файлдарды сұрау. ",
 
   // "bitstream-request-a-copy.name.label": "Name *",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "Аты *",
 
   // "bitstream-request-a-copy.name.error": "The name is required",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "Аты міндетті",
 
   // "bitstream-request-a-copy.email.label": "Your e-mail address *",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "Сіздің электрондық пошта мекенжайыңыз *",
 
   // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Хабарлар",
 
   // "bitstream-request-a-copy.return": "Back",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Артқа",
 
   // "bitstream-request-a-copy.submit": "Request copy",
-  // TODO New key - Add a translation
-  "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Көшірмесін сұрау",
 
   // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Барлық қарау нәтижелері",
 
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Авторы",
@@ -1109,20 +1456,16 @@
   "browse.metadata.title.breadcrumbs": "Тақырыбы бойынша қарау",
 
   // "pagination.next.button": "Next",
-  // TODO New key - Add a translation
-  "pagination.next.button": "Next",
+  "pagination.next.button": "Келесі",
 
   // "pagination.previous.button": "Previous",
-  // TODO New key - Add a translation
-  "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Алдыңғысы",
 
   // "pagination.next.button.disabled.tooltip": "No more pages of results",
-  // TODO New key - Add a translation
-  "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Нәтижелері бар беттер жоқ",
 
   // "browse.startsWith": ", starting with {{ startsWith }}",
-  // TODO New key - Add a translation
-  "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", {{ startsWith }} деп басталуымен",
 
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(басталуын таңдаңыз)",
@@ -1131,12 +1474,10 @@
   "browse.startsWith.choose_year": "(Жылды таңдаңыз)",
 
   // "browse.startsWith.choose_year.label": "Choose the issue year",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Шығарылған жылын таңдаңыз",
 
   // "browse.startsWith.jump": "Filter results by year or month",
-  // TODO Source message changed - Revise the translation
-  "browse.startsWith.jump": "Индекстегі нүктеге өту:",
+  "browse.startsWith.jump": "Нәтижелерді жылдар немесе айлар бойынша сүзу",
 
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Сәуір",
@@ -1169,8 +1510,7 @@
   "browse.startsWith.months.none": "(Айды таңдаңыз)",
 
   // "browse.startsWith.months.none.label": "Choose the issue month",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Шығарылған айды таңдаңыз",
 
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "Қараша",
@@ -1182,28 +1522,22 @@
   "browse.startsWith.months.september": "Қыркүйек",
 
   // "browse.startsWith.submit": "Browse",
-  // TODO Source message changed - Revise the translation
-  "browse.startsWith.submit": "Go",
+  "browse.startsWith.submit": "Алға",
 
   // "browse.startsWith.type_date": "Filter results by date",
-  // TODO Source message changed - Revise the translation
   "browse.startsWith.type_date": "Немесе күнді енгізіңіз (жыл-ай):",
 
   // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "Немесе күнді (жыл-ай) енгізіп, Шолу батырманы басыңыз.",
 
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
-  // TODO Source message changed - Revise the translation
   "browse.startsWith.type_text": "Немесе алғашқы бірнеше әріптерді енгізіңіз:",
 
   // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
-  // TODO Source message changed - Revise the translation
   "browse.title": "{{collection}} {{field}} {{value}} бойынша қараңыз",
 
   // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  // TODO New key - Add a translation
-  "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "{{ collection }} -ны {{ field }} {{ value }} бойынша қараңыз",
 
 
   // "chips.remove": "Remove chip",
@@ -1230,8 +1564,7 @@
   "collection.delete.confirm": "Растау",
 
   // "collection.delete.processing": "Deleting",
-  // TODO New key - Add a translation
-  "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "Өшірудемін",
 
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Топтаманы жою",
@@ -1310,8 +1643,7 @@
   "collection.edit.item-mapper.remove": "Таңдалған элементтердің салыстыруларын жою",
 
   // "collection.edit.item-mapper.search-form.placeholder": "Search items...",
-  // TODO New key - Add a translation
-  "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",
   "collection.edit.item-mapper.tabs.browse": "Салыстырылған элементтерді қарау",
@@ -1321,12 +1653,10 @@
 
 
   // "collection.edit.logo.delete.title": "Delete logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Логотипті өшіру",
 
   // "collection.edit.logo.delete-undo.title": "Undo delete",
-  // TODO New key - Add a translation
-  "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Өшірмеу",
 
   // "collection.edit.logo.label": "Collection logo",
   "collection.edit.logo.label": "Топтама логотипі",
@@ -1355,7 +1685,6 @@
   "collection.edit.notifications.success": "Сәтті өзгертілген топтама",
 
   // "collection.edit.return": "Back",
-  // TODO Source message changed - Revise the translation
   "collection.edit.return": "Қайтару",
 
 
@@ -1373,16 +1702,13 @@
   "collection.edit.tabs.authorizations.title": "Топтаманы өзгерту - Авторизациялар",
 
   // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // 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": "Бума үшін бит ағынының саясатын көрсету",
 
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Метадеректерді өңдеу",
@@ -1468,8 +1794,7 @@
   "collection.edit.template.edit-button": "Өзгерту",
 
   // "collection.edit.template.error": "An error occurred retrieving the template item",
-  // TODO New key - Add a translation
-  "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 }}\"",
   "collection.edit.template.head": "Топтамаға арналған үлгі элементін өзгерту \"{{ collection }}\"",
@@ -1478,8 +1803,7 @@
   "collection.edit.template.label": "Үлгі элементі",
 
   // "collection.edit.template.loading": "Loading template item...",
-  // TODO New key - Add a translation
-  "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "Үлгі элементін жүктеу...",
 
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Элемент үлгісін жою мүмкін емес",
@@ -1517,8 +1841,7 @@
   "collection.form.title": "Атауы",
 
   // "collection.form.entityType": "Entity Type",
-  // TODO New key - Add a translation
-  "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Нысан түрі",
 
 
 
@@ -1537,8 +1860,7 @@
   "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",
   "collection.page.license": "Лицензия",
@@ -1559,74 +1881,73 @@
 
 
   // "collection.source.controls.head": "Harvest Controls",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Сынақ конфигурациясы",
+
   // "collection.source.controls.test.running": "Testing configuration...",
-  // TODO New key - Add a translation
-  "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "Тестілеу конфигурациясы...",
+
   // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.submit": "Import now",
+  "collection.source.controls.import.submit": "Қазір импорттаңыз",
+
   // "collection.source.controls.import.running": "Importing...",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.running": "Importing...",
+  "collection.source.controls.import.running": "Импорт...",
+
   // "collection.source.controls.import.failed": "An error occurred during the import",
-  // TODO New key - Add a translation
-  "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Импорттау кезінде қате кетті",
+
   // "collection.source.controls.import.completed": "The import completed",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "Қалпына келтіру және қайта импорттау аяқталды",
+
   // "collection.source.controls.reset.submit": "Reset and reimport",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Қалпына келтіру және қайта импорттау",
+
   // "collection.source.controls.reset.running": "Resetting and reimporting...",
-  // TODO New key - Add a translation
-  "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Қалпына келтіру және қайта импорттау...",
+
   // "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": "Өнім мәртебесі:",
+
   // "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": "Өнім жинаудың басталу уақыты:",
+
   // "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": "Соңғы рет өнім жиналды:",
+
   // "collection.source.controls.harvest.message": "Harvest info:",
-  // TODO New key - Add a translation
-  "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Өнім хабары:",
+
   // "collection.source.controls.harvest.no-information": "N/A",
-  // TODO New key - Add a translation
-  "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.",
@@ -1638,15 +1959,14 @@
 
 
   // "communityList.breadcrumbs": "Community List",
-  // TODO New key - Add a translation
-  "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Қауымдастықтар тізімі",
 
   // "communityList.tabTitle": "Community List",
   // TODO Source message changed - Revise the translation
-  "communityList.tabTitle": "DSpace - Қауымдастық Тізімі",
+  "communityList.tabTitle": " Қауымдастық Тізімі",
 
   // "communityList.title": "List of Communities",
-  "communityList.title": "Қауымдастықтар Тізімі",
+  "communityList.title": "Қауымдастықтар тізімі",
 
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Көбірек Көрсету",
@@ -1672,8 +1992,7 @@
   "community.delete.confirm": "Растау",
 
   // "community.delete.processing": "Deleting...",
-  // TODO New key - Add a translation
-  "community.delete.processing": "Deleting...",
+  "community.delete.processing": "Жоюда...",
 
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Қауымдастықты Жою",
@@ -1694,16 +2013,14 @@
   "community.edit.head": "Қауымдастықты Өзгерту",
 
   // "community.edit.breadcrumbs": "Edit Community",
-  "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Қауымдастықты өңдеу",
 
 
   // "community.edit.logo.delete.title": "Delete logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Логотипті жою",
 
   // "community.edit.logo.delete-undo.title": "Undo delete",
-  // TODO New key - Add a translation
-  "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Өшірмеу",
 
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Қауымдастық логотипі",
@@ -1775,108 +2092,84 @@
 
 
   // "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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": "Қауымдастық әкімшілері ішкі қауымдастықтарды немесе коллекцияларды құра алады және оларды басқара алады немесе сол ішкі қауымдастықтарға немесе коллекцияларға басқару тағайындай алады. Сонымен қатар, олар кез-келген кірістірілген коллекцияларға элементтерді кім жібере алатындығын, элементтердің метадеректерін өңдеуді (жібергеннен кейін) және басқа коллекциялардан бар элементтерді қосуды (сәйкестендіруді) шешеді (авторизация жағдайында).",
 
   // "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": "Рецензенттер келіп түскен материалдарды қабылдауы немесе қабылдамауы мүмкін. Алайда, олар жіберу метадеректерін өңдей алмайды.",
 
 
 
@@ -1922,16 +2215,13 @@
 
 
   // "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)",
   "cookies.consent.app.opt-out.title": "(opt-out)",
@@ -1958,8 +2248,7 @@
   "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>.",
-  // 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": "Біз сіздің жеке мәліметтеріңізді келесі мақсаттар үшін жинаймыз және өңдейміз: <strong>Аутентификация, Қалаулар, Растау және статистикасы</strong>.",
 
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Баптау",
@@ -2017,7 +2306,7 @@
 
 
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Метадеректердегі Сілтемелерді Тексеріңіз",
+  "curation-task.task.checklinks.label": "Метадеректердегі Сілтемелерді Тексеріңіз",
 
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP бағдарлама тілі",
@@ -2055,8 +2344,7 @@
   "curation.form.submit.error.content": "Тапсырманы іске қосу кезіндегі қателік.",
 
   // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
-  // TODO New key - Add a translation
-  "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:",
   "curation.form.handle.label": "Қалам:",
@@ -2067,34 +2355,27 @@
 
 
   // "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 }}>",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Құжаттың көшірмесін сұрау",
 
   // "deny-request-copy.error": "An error occurred",
-  // TODO New key - Add a translation
-  "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Қате кетті",
 
   // "deny-request-copy.header": "Deny document copy request",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Бөлікке сұраныс сәтті қабылданбады",
 
 
 
   // "dso.name.untitled": "Untitled",
-  // TODO New key - Add a translation
-  "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Атауы жоқ",
 
 
 
@@ -2132,8 +2413,7 @@
   "dso-selector.edit.item.head": "Элементті өзгерту",
 
   // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
-  // TODO New key - Add a translation
-  "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",
   "dso-selector.export-metadata.dspaceobject.head": "Метадеректерді экспорттау",
@@ -2145,36 +2425,28 @@
   "dso-selector.placeholder": "{{ type }} іздеу",
 
   // "dso-selector.select.collection.head": "Select a collection",
-  // TODO New key - Add a translation
-  "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Жинақты таңдаңыз",
 
   // "dso-selector.set-scope.community.head": "Select a search scope",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "DSpace арқылы іздеу",
 
   // "dso-selector.set-scope.community.input-header": "Search for a community or collection",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Жаңасын жасаңыз",
 
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "{{ dsoName }} метадеректерін экспорттау",
@@ -2183,10 +2455,10 @@
   "confirmation-modal.export-metadata.info": "{{ dsoName }} метадеректерін экспорттағыңыз келетініне сенімдісіз бе",
 
   // "confirmation-modal.export-metadata.cancel": "Cancel",
-  "confirmation-modal.export-metadata.cancel":"Болдырмау",
+  "confirmation-modal.export-metadata.cancel": "Болдырмау",
 
   // "confirmation-modal.export-metadata.confirm": "Export",
-  "confirmation-modal.export-metadata.confirm":"Экспорт",
+  "confirmation-modal.export-metadata.confirm": "Экспорт",
 
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "EPerson \"{{ dsoName }}\" жою",
@@ -2201,20 +2473,16 @@
   "confirmation-modal.delete-eperson.confirm": "Жою",
 
   // "confirmation-modal.delete-profile.header": "Delete Profile",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Алып тастау",
 
   // "confirmation-modal.delete-profile.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Жою",
 
 
   // "error.bitstream": "Error fetching bitstream",
@@ -2245,26 +2513,25 @@
   "error.items": "Элементтерді алу қатесі",
 
   // "error.objects": "Error fetching objects",
-  "error.objects":"Нысандарды алу қатесі",
+  "error.objects": "Нысандарды алу қатесі",
 
   // "error.recent-submissions": "Error fetching recent submissions",
-  "error.recent-submissions":"Соңғы жіберілімдерді алу қатесі",
+  "error.recent-submissions": "Соңғы жіберілімдерді алу қатесі",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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 query syntax</a> осы қате туралы қосымша ақпарат алу үшін нұсқаулықпен танысыңыз.",
 
   // "error.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections":"Ішкі жинақтарды алу қатесі",
+  "error.sub-collections": "Ішкі жинақтарды алу қатесі",
 
   // "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>",
-  "error.submission.sections.init-form-error":"Бөлімді инициализациялау кезінде қате орын алды, енгізу пішінінің конфигурациясын тексеріңіз. Мәліметтер төменде берілген: <br> <br>",
+  "error.submission.sections.init-form-error": "Бөлімді инициализациялау кезінде қате орын алды, енгізу пішінінің конфигурациясын тексеріңіз. Мәліметтер төменде берілген: <br> <br>",
 
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Жоғары деңгейлі қауымдастықтарды алу қатесі",
@@ -2279,25 +2546,20 @@
   "error.validation.filerequired": "Файлды жүктеп салу міндетті",
 
   // "error.validation.required": "This field is required",
-  // TODO New key - Add a translation
-  "error.validation.required": "This field is required",
+  "error.validation.required": "Бұл өріс міндетті болып табылады",
 
   // "error.validation.NotValidEmail": "This E-mail is not a valid email",
-  // TODO New key - Add a translation
-  "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Бұл электрондық пошта жарамды емес",
 
   // "error.validation.emailTaken": "This E-mail is already taken",
-  // TODO New key - Add a translation
-  "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Бұл электрондық пошта қазірдің өзінде жіберілді",
 
   // "error.validation.groupExists": "This group already exists",
-  // TODO New key - Add a translation
-  "error.validation.groupExists": "This group already exists",
+  "error.validation.groupExists": "Бұл топ қазірдің өзінде бар",
 
 
   // "feed.description": "Syndication feed",
-  // TODO New key - Add a translation
-  "feed.description": "Syndication feed",
+  "feed.description": "Синдикация арнасы",
 
 
   // "file-section.error.header": "Error obtaining files for this item",
@@ -2321,11 +2583,10 @@
   "footer.link.privacy-policy": "Құпиялылық саясаты",
 
   // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"Соңғы пайдаланушы келісімі",
+  "footer.link.end-user-agreement": "Соңғы пайдаланушы келісімі",
 
   // "footer.link.feedback":"Send Feedback",
-  // TODO New key - Add a translation
-  "footer.link.feedback":"Send Feedback",
+  "footer.link.feedback": "Пікір жіберу",
 
 
 
@@ -2333,8 +2594,7 @@
   "forgot-email.form.header": "Парольді Ұмыттыңыз Ба",
 
   // "forgot-email.form.info": "Enter the email address associated with the account.",
-  // TODO Source message changed - Revise the translation
-  "forgot-email.form.info": "Электрондық пошта жаңартуларына арналған жинақтарға жазылу және DSpace қызметіне жаңа элементтерді жіберу үшін тіркелгіні тіркеңіз.",
+  "forgot-email.form.info": "Тіркелгіге қатысты электрондық пошта мекенжайын енгізіңіз.",
 
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "Электрондық пошта *",
@@ -2346,27 +2606,22 @@
   "forgot-email.form.email.error.pattern": "Жарамды электрондық пошта мекенжайын толтырыңыз",
 
   // "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": "Бұл мекенжай тексеріледі және сіздің логин атыңыз ретінде пайдаланылады.",
 
   // "forgot-email.form.submit": "Reset password",
-  // TODO Source message changed - Revise the translation
   "forgot-email.form.submit": "Жіберу",
 
   // "forgot-email.form.success.head": "Password reset email sent",
-  // TODO Source message changed - Revise the translation
   "forgot-email.form.success.head": "Растау электрондық поштасы жіберілді",
 
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "Арнайы URL мекенжайы және қосымша нұсқаулары бар электрондық пошта {{ email }} мекенжайына жіберілді.",
 
   // "forgot-email.form.error.head": "Error when trying to reset password",
-  // TODO Source message changed - Revise the translation
   "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 }}",
-  // 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": "Келесі электрондық пошта мекенжайына байланысты есептік жазбаның құпия сөзін қалпына келтіру кезінде қате пайда болды: {{ email }}",
 
 
 
@@ -2401,7 +2656,7 @@
   "forgot-password.form.error.matching-passwords": "Құпия сөздер сәйкес келмейді.",
 
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length":"Құпия сөз кемінде 6 таңбадан тұруы керек.",
+  "forgot-password.form.error.password-length": "Құпия сөз кемінде 6 таңбадан тұруы керек.",
 
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Жаңа құпия сөзді жіберу әрекеті кезіндегі қате",
@@ -2434,12 +2689,10 @@
   "form.clear-help": "Таңдалған мәнді жою үшін осы жерді басыңыз",
 
   // "form.discard": "Discard",
-  // TODO New key - Add a translation
-  "form.discard": "Discard",
+  "form.discard": "Тастау",
 
   // "form.drag": "Drag",
-  // TODO New key - Add a translation
-  "form.drag": "Drag",
+  "form.drag": "Сүйреп апарыңыз",
 
   // "form.edit": "Edit",
   "form.edit": "Өзгерту",
@@ -2480,9 +2733,6 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Мәні енгізілмеді",
 
-  // "form.other-information": {},
-  "form.other-information": {},
-
   // "form.remove": "Remove",
   "form.remove": "Өшіру",
 
@@ -2503,177 +2753,135 @@
   "form.submit": "Жіберу",
 
   // "form.repeatable.sort.tip": "Drop the item in the new position",
-  // TODO New key - Add a translation
-  "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Элементті жаңа орынға қойыңыз",
 
 
 
   // "grant-deny-request-copy.deny": "Don't send copy",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Көшірмесін жібермеңіз",
 
   // "grant-deny-request-copy.email.back": "Back",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Артқа",
 
   // "grant-deny-request-copy.email.message": "Message",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.email.message": "Message",
+  "grant-deny-request-copy.email.message": "Хабарлар",
 
   // "grant-deny-request-copy.email.message.empty": "Please enter a message",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Жіберу",
 
   // "grant-deny-request-copy.email.subject": "Subject",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Тақырыбы",
 
   // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Көшірмесін жіберу",
 
   // "grant-deny-request-copy.header": "Document copy request",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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.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 }}>",
-  // TODO New key - Add a translation
-  "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": "Құрметті {{ recipientName }},\nСіздің сұрауыңызға жауап ретінде Мен сізге құжатқа қатысты файлдың көшірмесін тіркемеде жібергеніме қуаныштымын: \"{{ itemUrl }}\" ({{ itemName }}), оның авторы мен.\n\nІзгі тілектермен,\n{{ authorName }} <{{ authorEmail }}>",
 
   // "grant-request-copy.email.subject": "Request copy of document",
-  // TODO New key - Add a translation
-  "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Құжаттың көшірмесін сұрау",
 
   // "grant-request-copy.error": "An error occurred",
-  // TODO New key - Add a translation
-  "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Қате кетті",
 
   // "grant-request-copy.header": "Grant document copy request",
-  // TODO New key - Add a translation
-  "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Құжаттың көшірмесін ұсынуға сұрау салу",
 
   // "grant-request-copy.intro": "This message will be sent to the applicant of the request. The requested document(s) will be attached.",
-  // TODO New key - Add a translation
-  "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": "Бұл хабарлама өтініш берушіге жіберіледі. Сұралған құжат(тар) қоса беріледі.",
 
   // "grant-request-copy.success": "Successfully granted item request",
-  // TODO New key - Add a translation
-  "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Өнімге сәтті сұраныс",
 
 
   // "health.breadcrumbs": "Health",
-  // TODO New key - Add a translation
-  "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Күйі",
 
   // "health-page.heading" : "Health",
-  // TODO New key - Add a translation
-  "health-page.heading" : "Health",
+  "health-page.heading": "Күйі",
 
   // "health-page.info-tab" : "Info",
-  // TODO New key - Add a translation
-  "health-page.info-tab" : "Info",
+  "health-page.info-tab": "Ақпарат",
 
   // "health-page.status-tab" : "Status",
-  // TODO New key - Add a translation
-  "health-page.status-tab" : "Status",
+  "health-page.status-tab": "Мәртебесі",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
-  // TODO New key - Add a translation
-  "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "Тексеру қызметі уақытша қол жетімді емес",
 
   // "health-page.property.status": "Status code",
-  // TODO New key - Add a translation
-  "health-page.property.status": "Status code",
+  "health-page.property.status": "Күй коды",
 
   // "health-page.section.db.title": "Database",
-  // TODO New key - Add a translation
-  "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Дереккөз",
 
   // "health-page.section.geoIp.title": "GeoIp",
-  // TODO New key - Add a translation
   "health-page.section.geoIp.title": "GeoIp",
 
-  // "health-page.section.solrAuthorityCore.title": "Sor: authority core",
-  // TODO New key - Add a translation
-  "health-page.section.solrAuthorityCore.title": "Sor: authority core",
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
+  "health-page.section.solrAuthorityCore.title": "Solr: биліктің өзегі",
 
-  // "health-page.section.solrOaiCore.title": "Sor: oai core",
-  // TODO New key - Add a translation
-  "health-page.section.solrOaiCore.title": "Sor: oai core",
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
+  "health-page.section.solrOaiCore.title": "Solr: oai өзегі",
 
-  // "health-page.section.solrSearchCore.title": "Sor: search core",
-  // TODO New key - Add a translation
-  "health-page.section.solrSearchCore.title": "Sor: search core",
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
+  "health-page.section.solrSearchCore.title": "Solr: іздеу өзегі",
 
-  // "health-page.section.solrStatisticsCore.title": "Sor: statistics core",
-  // TODO New key - Add a translation
-  "health-page.section.solrStatisticsCore.title": "Sor: statistics core",
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: статистиканың өзегі",
 
   // "health-page.section-info.app.title": "Application Backend",
-  // TODO New key - Add a translation
-  "health-page.section-info.app.title": "Application Backend",
+  "health-page.section-info.app.title": "Қосымшаның серверлік бөлігі",
 
   // "health-page.section-info.java.title": "Java",
-  // TODO New key - Add a translation
   "health-page.section-info.java.title": "Java",
 
   // "health-page.status": "Status",
-  // TODO New key - Add a translation
-  "health-page.status": "Status",
+  "health-page.status": "Күйі мәртебесі",
 
   // "health-page.status.ok.info": "Operational",
-  // TODO New key - Add a translation
-  "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Жақсы күйде",
 
   // "health-page.status.error.info": "Problems detected",
-  // TODO New key - Add a translation
-  "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Анықталған мәселелер",
 
   // "health-page.status.warning.info": "Possible issues detected",
-  // TODO New key - Add a translation
-  "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Анықталған мүмкін проблемалар",
 
   // "health-page.title": "Health",
-  // TODO New key - Add a translation
-  "health-page.title": "Health",
+  "health-page.title": "Күйі",
 
   // "health-page.section.no-issues": "No issues detected",
-  // TODO New key - Add a translation
-  "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Ешқандай проблема табылған жоқ",
 
 
   // "home.description": "",
@@ -2683,11 +2891,9 @@
   "home.breadcrumbs": "Басты",
 
   // "home.search-form.placeholder": "Search the repository ...",
-  // TODO New key - Add a translation
-  "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Репозиторидең іздеу ...",
 
   // "home.title": "Home",
-  // TODO Source message changed - Revise the translation
   "home.title": "Басты",
 
   // "home.top-level-communities.head": "Communities in DSpace",
@@ -2708,7 +2914,7 @@
   "info.end-user-agreement.accept.success": "Соңғы пайдаланушы келісімі сәтті жаңартылды",
 
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  "info.end-user-agreement.breadcrumbs":"Соңғы пайдаланушы келісімі",
+  "info.end-user-agreement.breadcrumbs": "Соңғы пайдаланушы келісімі",
 
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "Болдырмау",
@@ -2732,61 +2938,47 @@
   "info.privacy.title": "Құпиялылық туралы мәлімдеме",
 
   // "info.feedback.breadcrumbs": "Feedback",
-  // TODO New key - Add a translation
-  "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Кері байланыс",
 
   // "info.feedback.head": "Feedback",
-  // TODO New key - Add a translation
-  "info.feedback.head": "Feedback",
+  "info.feedback.head": "Кері байланыс",
 
   // "info.feedback.title": "Feedback",
-  // TODO New key - Add a translation
-  "info.feedback.title": "Feedback",
+  "info.feedback.title": "Кері байланыс",
 
   // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
-  // TODO New key - Add a translation
-  "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "DSpace жүйесі туралы пікіріңізді бөліскеніңіз үшін рахмет. Біз сіздің пікірлеріңізді бағалаймыз!",
 
   // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
-  // TODO New key - Add a translation
-  "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Бұл мекен-жай сіздің пікірлеріңізді бақылау үшін қолданылады.",
 
   // "info.feedback.send": "Send Feedback",
-  // TODO New key - Add a translation
-  "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Пікір жіберу",
 
   // "info.feedback.comments": "Comments",
-  // TODO New key - Add a translation
-  "info.feedback.comments": "Comments",
+  "info.feedback.comments": "Түсініктеме",
 
   // "info.feedback.email-label": "Your Email",
-  // TODO New key - Add a translation
-  "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "Сіздің пошта",
 
   // "info.feedback.create.success" : "Feedback Sent Successfully!",
-  // TODO New key - Add a translation
-  "info.feedback.create.success" : "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Кері Байланыс Сәтті Жіберілді!",
 
   // "info.feedback.error.email.required" : "A valid email address is required",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "info.feedback.error.message.required" : "A comment is required",
+  "info.feedback.error.message.required": "Түсініктеме қажет",
 
   // "info.feedback.page-label" : "Page",
-  // TODO New key - Add a translation
-  "info.feedback.page-label" : "Page",
+  "info.feedback.page-label": "Бет",
 
   // "info.feedback.page_help" : "Tha page related to your feedback",
-  // TODO New key - Add a translation
-  "info.feedback.page_help" : "Tha page related to your feedback",
+  "info.feedback.page_help": "Сіздің пікіріңізге байланысты бет",
 
 
 
   // "item.alerts.private": "This item is non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.alerts.private": "Бұл элемент жеке",
 
   // "item.alerts.withdrawn": "This item has been withdrawn",
@@ -2821,7 +3013,7 @@
   // "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.",
+  // "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",
@@ -2831,7 +3023,7 @@
   "item.bitstreams.upload.drop-message": "Жүктеп салу үшін файлды тастаңыз",
 
   // "item.bitstreams.upload.item": "Item: ",
-  "item.bitstreams.upload.item":"Элемент:",
+  "item.bitstreams.upload.item": "Элемент:",
 
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Жаңа топтама сәтті жасалды.",
@@ -2857,7 +3049,7 @@
   "item.edit.bitstreams.bundle.load.all": "Барлығын жүктеу ({{ total }})",
 
   // "item.edit.bitstreams.bundle.load.more": "Load more",
-  "item.edit.bitstreams.bundle.load.more":"Көбірек жүктеңіз",
+  "item.edit.bitstreams.bundle.load.more": "Көбірек жүктеңіз",
 
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "БАНДЛ: {{ name }}",
@@ -2881,10 +3073,10 @@
   "item.edit.bitstreams.edit.buttons.undo": "Өзгерістерді болдырмау",
 
   // "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.empty": "Бұл элементте биттік ағындар жоқ. Біреуін жасау үшін жүктеп салу түймесін басыңыз.",
 
   // "item.edit.bitstreams.headers.actions": "Actions",
-  "item.edit.bitstreams.headers.actions":"Әрекеттер",
+  "item.edit.bitstreams.headers.actions": "Әрекеттер",
 
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Бума",
@@ -2896,7 +3088,7 @@
   "item.edit.bitstreams.headers.format": "Формат",
 
   // "item.edit.bitstreams.headers.name": "Name",
-  "item.edit.bitstreams.headers.name":"Аты",
+  "item.edit.bitstreams.headers.name": "Аты",
 
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.bitstreams.notifications.discarded.content": "Өзгертулеріңіз жойылды. Өзгерістерді қалпына келтіру үшін 'Болдырмау' түймесін басыңыз",
@@ -2964,8 +3156,7 @@
   "item.edit.breadcrumbs": "Элементті өңдеу",
 
   // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
-  // TODO New key - Add a translation
-  "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",
@@ -2981,13 +3172,13 @@
   "item.edit.item-mapper.buttons.remove": "Таңдалған жинақтар үшін элементтің салыстыруын жою",
 
   // "item.edit.item-mapper.cancel": "Cancel",
-  "item.edit.item-mapper.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.",
   "item.edit.item-mapper.description": "Бұл әкімшілерге осы элементті басқа жинақтармен салыстыруға мүмкіндік беретін элементті салыстыру құралы. Жинақтарды іздеуге және оларды салыстыруға немесе элемент қазіргі уақытта салыстырылған жинақтар тізімін шолуға болады.",
 
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  "item.edit.item-mapper.head":"Элемент салыстырушы - Элементті коллекциялармен салыстыру",
+  "item.edit.item-mapper.head": "Элемент салыстырушы - Элементті коллекциялармен салыстыру",
 
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Элемент: \"<b>{{name}}</b>\"",
@@ -3005,7 +3196,7 @@
   "item.edit.item-mapper.notifications.add.success.content": "Элемент {{amount}} жинаққа сәтті салыстырылды.",
 
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  "item.edit.item-mapper.notifications.add.success.head":"Карталау аяқталды",
+  "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.",
   "item.edit.item-mapper.notifications.remove.error.content": "{{amount}} жинаққа салыстыруды жою кезінде қателер орын алды.",
@@ -3020,8 +3211,7 @@
   "item.edit.item-mapper.notifications.remove.success.head": "Карталауды жою аяқталды",
 
   // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
-  // TODO New key - Add a translation
-  "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",
   "item.edit.item-mapper.tabs.browse": "Карталанған жинақтарды шолу",
@@ -3062,7 +3252,7 @@
   "item.edit.metadata.headers.language": "Тіл",
 
   // "item.edit.metadata.headers.value": "Value",
-  "item.edit.metadata.headers.value": "құн",
+  "item.edit.metadata.headers.value": "Құны",
 
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Жарамды метадеректер өрісін таңдаңыз",
@@ -3098,7 +3288,7 @@
   "item.edit.metadata.reinstate-button": "Болдырмау",
 
   // "item.edit.metadata.save-button": "Save",
-  "item.edit.metadata.save-button":"Сақтау",
+  "item.edit.metadata.save-button": "Сақтау",
 
 
 
@@ -3114,16 +3304,13 @@
 
 
   // "item.edit.move.cancel": "Back",
-  // TODO Source message changed - Revise the translation
-  "item.edit.move.cancel": "Cancel",
+  "item.edit.move.cancel": "Артқа",
 
   // "item.edit.move.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Сақтау",
 
   // "item.edit.move.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "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.",
   "item.edit.move.description": "Осы элементті жылжытқыңыз келетін коллекцияны таңдаңыз. Көрсетілген жинақтардың тізімін тарылту үшін өріске іздеу сұрауын енгізуге болады.",
@@ -3158,26 +3345,21 @@
 
 
   // "item.edit.private.cancel": "Cancel",
-  "item.edit.private.cancel":"Болдырмау",
+  "item.edit.private.cancel": "Болдырмау",
 
   // "item.edit.private.confirm": "Make it non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.confirm": "Мұны жеке жаса",
 
   // "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": "Сіз бұл затты мұрағатта жабу керек екеніне сенімдісіз бе?",
 
   // "item.edit.private.error": "An error occurred while making the item non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.error": "Элементті жабу кезінде қате пайда болды",
 
   // "item.edit.private.header": "Make item non-discoverable: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.private.header": "Make item non-discoverable: {{ id }}",
+  "item.edit.private.header": "Элементті табу мүмкін емес: {{ id }}",
 
   // "item.edit.private.success": "The item is now non-discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.private.success": "Тауар қазір жеке",
 
 
@@ -3186,23 +3368,18 @@
   "item.edit.public.cancel": "Болдырмау",
 
   // "item.edit.public.confirm": "Make it discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.confirm": "Мұны көпшілікке жария ету",
 
   // "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": "Сіз бұл материалды мұрағатта жариялау керек екеніне сенімдісіз бе?",
 
   // "item.edit.public.error": "An error occurred while making the item discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.error": "Элементті жариялау кезінде қате пайда болды",
 
   // "item.edit.public.header": "Make item discoverable: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.public.header": "Make item discoverable: {{ id }}",
+  "item.edit.public.header": "Элементті анықтауға қол жетімді етіңіз: {{ id }}",
 
   // "item.edit.public.success": "The item is now discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.public.success": "Тауар қазір көпшілікке қол жетімді",
 
 
@@ -3214,7 +3391,6 @@
   "item.edit.reinstate.confirm": "Қалпына келтіру",
 
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
-  // TODO Source message changed - Revise the translation
   "item.edit.reinstate.description": "Сіз бұл элементті мұрағатта қалпына келтіру керек екеніне сенімдісіз бе?",
 
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
@@ -3232,7 +3408,7 @@
   "item.edit.relationships.discard-button": "Тастау",
 
   // "item.edit.relationships.edit.buttons.add": "Add",
-  "item.edit.relationships.edit.buttons.add":"Қосу",
+  "item.edit.relationships.edit.buttons.add": "Қосу",
 
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Жою",
@@ -3265,7 +3441,7 @@
   "item.edit.relationships.notifications.saved.title": "Сақталған қатынастар",
 
   // "item.edit.relationships.reinstate-button": "Undo",
-  "item.edit.relationships.reinstate-button":"Болдырмау",
+  "item.edit.relationships.reinstate-button": "Болдырмау",
 
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Сақтау",
@@ -3275,8 +3451,7 @@
 
 
   // "item.edit.return": "Back",
-  // TODO New key - Add a translation
-  "item.edit.return": "Back",
+  "item.edit.return": "Артқа",
 
 
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
@@ -3307,10 +3482,10 @@
   "item.edit.tabs.status.buttons.authorizations.button": "Рұқсат...",
 
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  "item.edit.tabs.status.buttons.authorizations.label":"Элементті авторизациялау саясатын өзгерту",
+  "item.edit.tabs.status.buttons.authorizations.label": "Элементті авторизациялау саясатын өзгерту",
 
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  "item.edit.tabs.status.buttons.delete.button":"Біржола жою",
+  "item.edit.tabs.status.buttons.delete.button": "Біржола жою",
 
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Элементті толығымен алып тастаңыз",
@@ -3321,26 +3496,22 @@
   // "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...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Ысыру...",
 
   // "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 non-discoverable...",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.private.button": "Мұны жеке етіңіз...",
 
   // "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": "Затты жеке ету",
 
   // "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.label": "Make item discoverable",
-  // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.buttons.public.label": "Өнімді жалпыға қол жетімді ету",
 
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
@@ -3350,20 +3521,19 @@
   "item.edit.tabs.status.buttons.reinstate.label": "Сақтау ішіндегі элементті қалпына келтіру",
 
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
-  // TODO New key - Add a translation
-  "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...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Шегінуге...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "бұл тармақты алып тастаңыз",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  "item.edit.tabs.status.buttons.withdraw.label": "Қоймадан тауарды алып қою",
+  "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.",
   "item.edit.tabs.status.description": "Тауарларды басқару бетіне қош келдіңіз. Осы жерден элементті алып тастауға, қалпына келтіруге, жылжытуға немесе жоюға болады. Басқа қойындыларда жаңа метадеректерді / бит ағындарын жаңартуға немесе қосуға болады.",
 
   // "item.edit.tabs.status.head": "Status",
-  "item.edit.tabs.status.head":"Мәртебе",
+  "item.edit.tabs.status.head": "Мәртебе",
 
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Қалам",
@@ -3416,8 +3586,7 @@
   "item.edit.withdraw.success": "Тауар сәтті алынды",
 
   // "item.orcid.return": "Back",
-  // TODO New key - Add a translation
-  "item.orcid.return": "Back",
+  "item.orcid.return": "Артқа",
 
 
   // "item.listelement.badge": "Item",
@@ -3445,16 +3614,13 @@
   "item.search.results.head": "Өнімді іздеу нәтижелері",
 
   // "item.search.title": "Item Search",
-  // TODO Source message changed - Revise the translation
-  "item.search.title": "DSpace Angular :: элементтерді іздеу",
+  "item.search.title": "Элементтерді іздеу",
 
   // "item.truncatable-part.show-more": "Show more",
-  // TODO New key - Add a translation
-  "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Толығырақ көрсету",
 
   // "item.truncatable-part.show-less": "Collapse",
-  // TODO New key - Add a translation
-  "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Жинақтау",
 
 
 
@@ -3465,18 +3631,16 @@
   "item.page.author": "Авторлар",
 
   // "item.page.citation": "Citation",
-  "item.page.citation":"Дәйексөз",
+  "item.page.citation": "Дәйексөз",
 
   // "item.page.collections": "Collections",
   "item.page.collections": "Жинақтар",
 
   // "item.page.collections.loading": "Loading...",
-  // TODO New key - Add a translation
-  "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "Жүктелуде...",
 
   // "item.page.collections.load-more": "Load more",
-  // TODO New key - Add a translation
-  "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Толығырақ жүктеу",
 
   // "item.page.date": "Date",
   "item.page.date": "Кездесуге",
@@ -3512,12 +3676,10 @@
   "item.page.link.simple": "Тауардың қарапайым беті",
 
   // "item.page.orcid.title": "ORCID",
-  // TODO New key - Add a translation
   "item.page.orcid.title": "ORCID",
 
   // "item.page.orcid.tooltip": "Open ORCID setting page",
-  // TODO New key - Add a translation
-  "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "ORCID параметрлері бетін ашыңыз",
 
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Осы автордың мақалалары",
@@ -3553,36 +3715,31 @@
   "item.page.bitstreams.collapse": "Коллапс",
 
   // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Түпнұсқа жинақ",
+  "item.page.filesection.original.bundle": "Түпнұсқа жинақ",
 
   // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.license.bundle" : "Лицензиялық пакет",
+  "item.page.filesection.license.bundle": "Лицензиялық пакет",
 
   // "item.page.return": "Back",
-  // TODO New key - Add a translation
-  "item.page.return": "Back",
+  "item.page.return": "Артқа",
 
   // "item.page.version.create": "Create new version",
-  // TODO New key - Add a translation
-  "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",
-  // 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": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
 
   // "item.page.claim.button": "Claim",
-  // TODO New key - Add a translation
-  "item.page.claim.button": "Claim",
+  "item.page.claim.button": "Талабы",
 
   // "item.page.claim.tooltip": "Claim this item as profile",
-  // TODO New key - Add a translation
-  "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Бұл элементті профиль ретінде көрсетіңіз",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Идентификатор:",
 
   // "item.preview.dc.contributor.author": "Authors:",
-  "item.preview.dc.contributor.author":"Авторлар:",
+  "item.preview.dc.contributor.author": "Авторлар:",
 
   // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "Жарияланған күні:",
@@ -3603,36 +3760,28 @@
   "item.preview.dc.title": "Атауы:",
 
   // "item.preview.dc.type": "Type:",
-  // TODO New key - Add a translation
-  "item.preview.dc.type": "Type:",
+  "item.preview.dc.type": "Типі:",
 
   // "item.preview.oaire.citation.issue" : "Issue",
-  // TODO New key - Add a translation
-  "item.preview.oaire.citation.issue" : "Issue",
+  "item.preview.oaire.citation.issue": "Шығарылымы",
 
   // "item.preview.oaire.citation.volume" : "Volume",
-  // TODO New key - Add a translation
-  "item.preview.oaire.citation.volume" : "Volume",
+  "item.preview.oaire.citation.volume": "Көлемі",
 
   // "item.preview.dc.relation.issn" : "ISSN",
-  // TODO New key - Add a translation
-  "item.preview.dc.relation.issn" : "ISSN",
+  "item.preview.dc.relation.issn": "ISSN",
 
   // "item.preview.dc.identifier.isbn" : "ISBN",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.isbn" : "ISBN",
+  "item.preview.dc.identifier.isbn": "ISBN",
 
   // "item.preview.dc.identifier": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier": "Identifier:",
+  "item.preview.dc.identifier": "Идентификатор:",
 
   // "item.preview.dc.relation.ispartof" : "Journal or Serie",
-  // TODO New key - Add a translation
-  "item.preview.dc.relation.ispartof" : "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Журнал немесе серия",
 
   // "item.preview.dc.identifier.doi" : "DOI",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.doi" : "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
 
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Тегі:",
@@ -3644,28 +3793,22 @@
   "item.preview.person.identifier.orcid": "ORCID:",
 
   // "item.preview.project.funder.name": "Funder:",
-  // TODO New key - Add a translation
-  "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Демеуші:",
 
   // "item.preview.project.funder.identifier": "Funder Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Демеуші идентификаторы:",
 
   // "item.preview.oaire.awardNumber": "Funding ID:",
-  // TODO New key - Add a translation
-  "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "Қаржыландыру сәйкестендіргіші:",
 
   // "item.preview.dc.title.alternative": "Acronym:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Акроним:",
 
   // "item.preview.dc.coverage.spatial": "Jurisdiction:",
-  // TODO New key - Add a translation
-  "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Юрисдикция:",
 
   // "item.preview.oaire.fundingStream": "Funding Stream:",
-  // TODO New key - Add a translation
-  "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Қаржыландыру ағыны:",
 
 
 
@@ -3673,7 +3816,7 @@
   "item.select.confirm": "Таңдауды растау",
 
   // "item.select.empty": "No items to show",
-  "item.select.empty":"Көрсету үшін элементтер жоқ",
+  "item.select.empty": "Көрсету үшін элементтер жоқ",
 
   // "item.select.table.author": "Author",
   "item.select.table.author": "Автор",
@@ -3699,8 +3842,7 @@
   "item.version.history.selected": "Таңдалған нұсқа",
 
   // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
-  // TODO New key - Add a translation
-  "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",
   "item.version.history.table.version": "Нұсқа",
@@ -3712,50 +3854,40 @@
   "item.version.history.table.editor": "Редакторы",
 
   // "item.version.history.table.date": "Date",
-  "item.version.history.table.date":"Кездесуге",
+  "item.version.history.table.date": "Кездесуге",
 
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Қысқаша мазмұны",
 
   // "item.version.history.table.workspaceItem": "Workspace item",
-  // TODO New key - Add a translation
-  "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Жұмыс аймағының элементі",
 
   // "item.version.history.table.workflowItem": "Workflow item",
-  // TODO New key - Add a translation
-  "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Жұмыс процесінің элементі",
 
   // "item.version.history.table.actions": "Action",
-  // TODO New key - Add a translation
-  "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Әрекет",
 
   // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
-  // TODO New key - Add a translation
-  "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Жұмыс аймағының элементін өңдеу",
 
   // "item.version.history.table.action.editSummary": "Edit summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Қорытындыны өзгерту",
 
   // "item.version.history.table.action.saveSummary": "Save summary edits",
-  // TODO New key - Add a translation
-  "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Қорытынды түзетулерді сақтау",
 
   // "item.version.history.table.action.discardSummary": "Discard summary edits",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // 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": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған бағынымдар бар",
 
 
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
@@ -3763,102 +3895,78 @@
 
 
   // "item.version.create.modal.header": "New version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Жаңа нұсқа",
 
   // "item.version.create.modal.text": "Create a new version for this item",
-  // TODO New key - Add a translation
-  "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}}",
-  // TODO New key - Add a translation
-  "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "{{version}} нұсқасынан бастап",
 
   // "item.version.create.modal.button.confirm": "Create",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Құру",
 
   // "item.version.create.modal.button.confirm.tooltip": "Create new version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Жаңа нұсқаны жасау",
 
   // "item.version.create.modal.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Алып тастау",
 
   // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Жаңа нұсқаны жасамаңыз",
 
   // "item.version.create.modal.form.summary.label": "Summary",
-  // TODO New key - Add a translation
-  "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Түйіндеме",
 
   // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
-  // TODO New key - Add a translation
-  "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Жаңа нұсқаның қысқаша мазмұнын салыңыз",
 
   // "item.version.create.modal.submitted.header": "Creating new version...",
-  // TODO New key - Add a translation
-  "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Жаңа нұсқасын жасау...",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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}}",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // 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": "Жаңа нұсқаны жасау мүмкін емес, өйткені нұсқа тарихында аяқталмаған жіберу бар",
 
 
   // "item.version.delete.modal.header": "Delete version",
-  // TODO New key - Add a translation
-  "item.version.delete.modal.header": "Delete version",
+  "item.version.delete.modal.header": "Нұсқаны өшіру",
 
   // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Жою",
 
   // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
-  // TODO New key - Add a translation
-  "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Бұл нұсқаны жою",
 
   // "item.version.delete.modal.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
+  "item.version.edit.notification.failure": "Нұсқа нөмірінің қысқаша сипаттамасы {{version}} өзгертілген жоқ",
 
 
 
@@ -3881,18 +3989,16 @@
   "journal.page.publisher": "Баспагер",
 
   // "journal.page.titleprefix": "Journal: ",
-  "journal.page.titleprefix": "Күнделік:",
+  "journal.page.titleprefix": "Журнал:",
 
   // "journal.search.results.head": "Journal Search Results",
-  "journal.search.results.head":"Журналдағы іздеу нәтижелері",
+  "journal.search.results.head": "Журналдағы іздеу нәтижелері",
 
   // "journal-relationships.search.results.head": "Journal Search Results",
-  // TODO New key - Add a translation
-  "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Журналдағы іздеу нәтижелері",
 
   // "journal.search.title": "Journal Search",
-  // TODO Source message changed - Revise the translation
-  "journal.search.title": "DSpace Angular :: Журналдағы іздеу",
+  "journal.search.title": "Журналдағы іздеу",
 
 
 
@@ -3909,13 +4015,13 @@
   "journalissue.page.issuedate": "Шығарылған күні",
 
   // "journalissue.page.journal-issn": "Journal ISSN",
-  "journalissue.page.journal-issn":"ISSN журналы",
+  "journalissue.page.journal-issn": "ISSN журналы",
 
   // "journalissue.page.journal-title": "Journal Title",
   "journalissue.page.journal-title": "Журнал атауы",
 
   // "journalissue.page.keyword": "Keywords",
-  "journalissue.page.keyword":"Түйінді сөздер",
+  "journalissue.page.keyword": "Түйінді сөздер",
 
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Саны",
@@ -3926,7 +4032,7 @@
 
 
   // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge":"Журнал көлемі",
+  "journalvolume.listelement.badge": "Журнал көлемі",
 
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Сипаттама",
@@ -3938,55 +4044,44 @@
   "journalvolume.page.issuedate": "Шығарылған күні",
 
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix":"Журнал көлемі:",
+  "journalvolume.page.titleprefix": "Журнал көлемі:",
 
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Көлемі",
 
 
   // "iiifsearchable.listelement.badge": "Document Media",
-  // TODO New key - Add a translation
-  "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Құжаттың медиасы",
 
   // "iiifsearchable.page.titleprefix": "Document: ",
-  // TODO New key - Add a translation
-  "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Құжат: ",
 
   // "iiifsearchable.page.doi": "Permanent Link: ",
-  // TODO New key - Add a translation
-  "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "Тұрақты сілтеме: ",
 
   // "iiifsearchable.page.issue": "Issue: ",
-  // TODO New key - Add a translation
-  "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Шығарылымы: ",
 
   // "iiifsearchable.page.description": "Description: ",
-  // TODO New key - Add a translation
-  "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Сипаттамасы: ",
 
   // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
-  // TODO New key - Add a translation
-  "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Анық көру үшін толық экранды пайдаланыңыз.",
 
   // "iiif.listelement.badge": "Image Media",
-  // TODO New key - Add a translation
-  "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Белгіше",
 
   // "iiif.page.titleprefix": "Image: ",
-  // TODO New key - Add a translation
-  "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Суреті: ",
 
   // "iiif.page.doi": "Permanent Link: ",
-  // TODO New key - Add a translation
-  "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "Тұрақты сілтеме: ",
 
   // "iiif.page.issue": "Issue: ",
-  // TODO New key - Add a translation
-  "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Шығарылымы: ",
 
   // "iiif.page.description": "Description: ",
-  // TODO New key - Add a translation
-  "iiif.page.description": "Description: ",
+  "iiif.page.description": "Сипаттамасы: ",
 
 
   // "loading.bitstream": "Loading bitstream...",
@@ -4005,7 +4100,7 @@
   "loading.collection": "Жинақты жүктеу...",
 
   // "loading.collections": "Loading collections...",
-  "loading.collections":"Топтамаларды жүктеу...",
+  "loading.collections": "Топтамаларды жүктеу...",
 
   // "loading.content-source": "Loading content source...",
   "loading.content-source": "Мазмұн көзін жүктеу...",
@@ -4026,7 +4121,7 @@
   "loading.mydspace-results": "Заттарды жүктеу...",
 
   // "loading.objects": "Loading...",
-  "loading.objects":"Жүктеу...",
+  "loading.objects": "Жүктеу...",
 
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "Соңғы жіберілімдер жүктелуде...",
@@ -4038,7 +4133,7 @@
   "loading.sub-collections": "Ішкі жинақтар жүктелуде...",
 
   // "loading.sub-communities": "Loading sub-communities...",
-  "loading.sub-communities":"Қосымша қауымдастықтар жүктелуде...",
+  "loading.sub-communities": "Қосымша қауымдастықтар жүктелуде...",
 
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Жоғарғы деңгейдегі қауымдастықтар жүктелуде...",
@@ -4049,27 +4144,25 @@
   "login.form.email": "Электрондық пошта",
 
   // "login.form.forgot-password": "Have you forgotten your password?",
-  "login.form.forgot-password":"Сіз парольді ұмыттыңыз ба?",
+  "login.form.forgot-password": "Сіз парольді ұмыттыңыз ба?",
 
   // "login.form.header": "Please log in to DSpace",
-  "login.form.header":"DSpace жүйесіне кіріңіз",
+  "login.form.header": "DSpace жүйесіне кіріңіз",
 
   // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user":"Жаңа пайдаланушы? Тіркелу үшін осы жерді басыңыз.",
+  "login.form.new-user": "Жаңа пайдаланушы? Тіркелу үшін осы жерді басыңыз.",
 
   // "login.form.or-divider": "or",
   "login.form.or-divider": "немесе",
 
   // "login.form.oidc": "Log in with OIDC",
-  // TODO New key - Add a translation
-  "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "OIDC-пен кіру",
 
   // "login.form.orcid": "Log in with ORCID",
-  // TODO New key - Add a translation
-  "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "ORCID-пен кіру",
 
   // "login.form.password": "Password",
-  "login.form.password":"Пароль",
+  "login.form.password": "Пароль",
 
   // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "Шибболетпен кіру",
@@ -4092,7 +4185,7 @@
   "logout.form.submit": "Шығу",
 
   // "logout.title": "Logout",
-  "logout.title":"Шығу",
+  "logout.title": "Шығу",
 
 
 
@@ -4104,8 +4197,7 @@
   "menu.header.image.logo": "Репозиторий логотипі",
 
   // "menu.header.admin.description": "Management menu",
-  // TODO New key - Add a translation
-  "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Басқару мәзірі",
 
 
 
@@ -4113,7 +4205,7 @@
   "menu.section.access_control": "Қатынасты басқару",
 
   // "menu.section.access_control_authorizations": "Authorizations",
-  "menu.section.access_control_authorizations":"Рұқсаттар",
+  "menu.section.access_control_authorizations": "Рұқсаттар",
 
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Топтар",
@@ -4122,9 +4214,21 @@
   "menu.section.access_control_people": "Адамдар",
 
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
-  "menu.section.admin_search":"Әкімші іздеу",
+  "menu.section.admin_search": "Әкімші іздеу",
 
 
 
@@ -4161,7 +4265,7 @@
 
 
   // "menu.section.control_panel": "Control Panel",
-  "menu.section.control_panel":"Басқару панелі",
+  "menu.section.control_panel": "Басқару панелі",
 
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Тапсырма",
@@ -4169,7 +4273,7 @@
 
 
   // "menu.section.edit": "Edit",
-  "menu.section.edit":"Өңдеу",
+  "menu.section.edit": "Өңдеу",
 
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Жинақ",
@@ -4202,6 +4306,10 @@
   // "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.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Әкімші іздеу мәзірі бөлімі",
 
@@ -4209,8 +4317,7 @@
   "menu.section.icon.control_panel": "Басқару тақтасының мәзір бөлімі",
 
   // "menu.section.icon.curation_tasks": "Curation Task menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Кураторлық тапсырмалар мәзірінің бөлімі",
 
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Өңдеу мәзір бөлімі",
@@ -4222,8 +4329,7 @@
   "menu.section.icon.find": "Мәзір бөлімін табу",
 
   // "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": "Жағдайды тексеру мәзірінің бөлімі",
 
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Импорттау мәзірі бөлімі",
@@ -4235,8 +4341,7 @@
   "menu.section.icon.pin": "Бүйірлік тақтаны бекіту",
 
   // "menu.section.icon.processes": "Processes Health",
-  // TODO Source message changed - Revise the translation
-  "menu.section.icon.processes": "Процесстер мәзірі бөлімі",
+  "menu.section.icon.processes": "Процесстердің жағдайы",
 
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Тіркеулер мәзірі бөлімі",
@@ -4245,8 +4350,7 @@
   "menu.section.icon.statistics_task": "Статистика тапсырмалары мәзірі бөлімі",
 
   // "menu.section.icon.workflow": "Administer workflow menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Мәзір бөлімі жұмыс процесін басқару",
 
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Бүйірлік тақтаны босату",
@@ -4293,11 +4397,10 @@
 
 
   // "menu.section.processes": "Processes",
-  "menu.section.processes": "процестер",
+  "menu.section.processes": "Процестер",
 
   // "menu.section.health": "Health",
-  // TODO New key - Add a translation
-  "menu.section.health": "Health",
+  "menu.section.health": "Жағдайы",
 
 
 
@@ -4319,6 +4422,9 @@
   "menu.section.statistics_task": "Статистика тапсырмасы",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Қатынасты басқару бөлімін ауыстырып-қосқыш",
@@ -4350,31 +4456,28 @@
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Статистика тапсырмасы бөлімін ауыстыру",
 
-
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "Жұмыс процесін басқару",
 
 
   // "metadata-export-search.tooltip": "Export search results as CSV",
-  // TODO New key - Add a translation
-  "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Іздеу нәтижелерін CSV форматында экспорттау",
+
   // "metadata-export-search.submit.success": "The export was started successfully",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "metadata-export-search.submit.error": "Starting the export has failed",
+  "metadata-export-search.submit.error": "Экспортты іске қосу мүмкін емес",
 
 
   // "mydspace.breadcrumbs": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Ортам",
 
   // "mydspace.description": "",
   "mydspace.description": "",
 
   // "mydspace.general.text-here": "here",
-  "mydspace.general.text-here":"Мұнда",
+  "mydspace.general.text-here": "Мұнда",
 
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Элемент жіберушіге хабарлама жіберу үшін осы опцияны таңдаңыз.",
@@ -4392,7 +4495,7 @@
   "mydspace.messages.mark-as-unread": "Оқылмаған деп белгілеу",
 
   // "mydspace.messages.no-content": "No content.",
-  "mydspace.messages.no-content":"Мазмұн жоқ.",
+  "mydspace.messages.no-content": "Мазмұны жоқ.",
 
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Әлі хабарлар жоқ.",
@@ -4410,7 +4513,7 @@
   "mydspace.messages.submitter-help": "Контроллерге хабарлама жіберу үшін осы опцияны таңдаңыз.",
 
   // "mydspace.messages.title": "Messages",
-  "mydspace.messages.title":"Хабарлар",
+  "mydspace.messages.title": "Хабарлар",
 
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "Кімге",
@@ -4452,33 +4555,31 @@
   "mydspace.results.no-uri": "Uri жоқ",
 
   // "mydspace.search-form.placeholder": "Search in mydspace...",
-  // TODO New key - Add a translation
-  "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Өз ортадан іздеу...",
 
   // "mydspace.show.workflow": "Workflow tasks",
-  // TODO Source message changed - Revise the translation
-  "mydspace.show.workflow": "Барлық тапсырмалар",
+  "mydspace.show.workflow": "Жұмыс процесінің міндеттері",
 
   // "mydspace.show.workspace": "Your Submissions",
-  "mydspace.show.workspace":"Сіздің өтініштеріңіз",
+  "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",
+  "mydspace.title": "MyDSpace",
 
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Жаңа жұмыс кеңістігін жасау қатесі. Қайталаудан бұрын жүктеп салынған мазмұнды тексеріңіз.",
@@ -4513,15 +4614,13 @@
   "nav.login": "Кіру",
 
   // "nav.logout": "User profile menu and Log Out",
-  // TODO Source message changed - Revise the translation
-  "nav.logout":   "Шығу",
+  "nav.logout": "Пайдаланушы профилі мәзірі және шығу",
 
   // "nav.main.description": "Main navigation bar",
-  // TODO New key - Add a translation
-  "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Басты навигация жолағы",
 
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Менім DSpace",
 
   // "nav.profile": "Profile",
   "nav.profile": "Профиль",
@@ -4536,16 +4635,13 @@
   "nav.stop-impersonating": "Eperson атын шығаруды тоқтатыңыз",
 
   // "nav.toggle" : "Toggle navigation",
-  // TODO New key - Add a translation
-  "nav.toggle" : "Toggle navigation",
+  "nav.toggle": "Навигацияны ауыстыру",
 
   // "nav.user.description" : "User profile bar",
-  // TODO New key - Add a translation
-  "nav.user.description" : "User profile bar",
+  "nav.user.description": "Пайдаланушы профилі тақтасы",
 
   // "none.listelement.badge": "Item",
-  // TODO New key - Add a translation
-  "none.listelement.badge": "Item",
+  "none.listelement.badge": "Элемент",
 
 
   // "orgunit.listelement.badge": "Organizational Unit",
@@ -4561,7 +4657,7 @@
   "orgunit.page.dateestablished": "Орнатылған күні",
 
   // "orgunit.page.description": "Description",
-  "orgunit.page.description":"Сипаттамасы",
+  "orgunit.page.description": "Сипаттамасы",
 
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "Осы элементті өңдеу",
@@ -4575,8 +4671,7 @@
 
 
   // "pagination.options.description": "Pagination options",
-  // TODO New key - Add a translation
-  "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Бетті бөлу нұсқалары",
 
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Әр беттегі нәтижелер",
@@ -4596,7 +4691,7 @@
   "person.listelement.badge": "Адам",
 
   // "person.listelement.no-title": "No name found",
-  "person.listelement.no-title":"Ешқандай атау табылмады",
+  "person.listelement.no-title": "Ешқандай атау табылмады",
 
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Туылған күні",
@@ -4608,7 +4703,7 @@
   "person.page.email": "Электрондық мекенжайы",
 
   // "person.page.firstname": "First Name",
-  "person.page.firstname":"Имя",
+  "person.page.firstname": "Аты",
 
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "Жұмыс атауы",
@@ -4617,8 +4712,7 @@
   "person.page.lastname": "Фамилия",
 
   // "person.page.name": "Name",
-  // TODO New key - Add a translation
-  "person.page.name": "Name",
+  "person.page.name": "Аты",
 
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Барлық метамәліметті көрсету",
@@ -4630,23 +4724,21 @@
   "person.page.staffid": "Қызметкерлердің жеке куәлігі",
 
   // "person.page.titleprefix": "Person: ",
-  "person.page.titleprefix":"Адам: ",
+  "person.page.titleprefix": "Адам: ",
 
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Тұлға іздеу нәтижелері",
 
   // "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": "Тұлға іздеу нәтижелері",
 
   // "person.search.title": "Person Search",
-  // TODO Source message changed - Revise the translation
-  "person.search.title": "DSpace Angular :: Адамды іздеу",
+  "person.search.title": "Адамды іздеу",
 
 
 
   // "process.new.select-parameters": "Parameters",
-  "process.new.select-parameters":"Параметрлер",
+  "process.new.select-parameters": "Параметрлер",
 
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Болдырмау",
@@ -4665,10 +4757,10 @@
   "process.new.select-script.required": "Сценарий қажет",
 
   // "process.new.parameter.file.upload-button": "Select file...",
-  "process.new.parameter.file.upload-button":"Файлды таңдау...",
+  "process.new.parameter.file.upload-button": "Файлды таңдау...",
 
   // "process.new.parameter.file.required": "Please select a file",
-  "process.new.parameter.file.required":"Файлды таңдаңыз",
+  "process.new.parameter.file.required": "Файлды таңдаңыз",
 
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "Параметр мәні қажет",
@@ -4706,16 +4798,16 @@
 
 
   // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" :"Аргументтер",
+  "process.detail.arguments": "Аргументтер",
 
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Бұл процесс ешқандай аргументтерді қамтымайды",
+  "process.detail.arguments.empty": "Бұл процесс ешқандай аргументтерді қамтымайды",
 
   // "process.detail.back" : "Back",
-  "process.detail.back" : "Артқа",
+  "process.detail.back": "Артқа",
 
   // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Процесс шығысы",
+  "process.detail.output": "Процесс шығысы",
 
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Процесс шығысын шығарып алу",
@@ -4727,127 +4819,109 @@
   "process.detail.logs.none": "Бұл процесте нәтиже жоқ",
 
   // "process.detail.output-files" : "Output Files",
-  "process.detail.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.output-files.empty": "Бұл процесте ешқандай шығыс файлдары жоқ",
 
   // "process.detail.script" : "Script",
-  "process.detail.script" : "Сценарий",
+  "process.detail.script": "Сценарий",
 
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" :"Процесс: {{ id }} - {{ name }}",
+  "process.detail.title": "Процесс: {{ id }} - {{ name }}",
 
   // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Бастау уақыты",
+  "process.detail.start-time": "Бастау уақыты",
 
   // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Аяқтау уақыты",
+  "process.detail.end-time": "Аяқтау уақыты",
 
   // "process.detail.status" : "Status",
-  "process.detail.status" : "Мәртебе",
+  "process.detail.status": "Мәртебе",
 
   // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Ұқсас процесті жасау",
+  "process.detail.create": "Ұқсас процесті жасау",
 
   // "process.detail.actions": "Actions",
-  // TODO New key - Add a translation
-  "process.detail.actions": "Actions",
+  "process.detail.actions": "Әрекеттер",
 
   // "process.detail.delete.button": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Процесс жою",
 
   // "process.detail.delete.header": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Процесс жою",
 
   // "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": "Ағымдағы процесті жойғыңыз келетініне сенімдісіз бе?",
 
   // "process.detail.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Алып тастау",
 
   // "process.detail.delete.confirm": "Delete process",
-  // TODO New key - Add a translation
-  "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Процесс жою.",
 
   // "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": "Процесс сәтті жойылды.",
 
   // "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": "Процесс жойылған кезде бірдеңе дұрыс болмады",
 
 
 
   // "process.overview.table.finish" : "Finish time (UTC)",
-  // TODO Source message changed - Revise the translation
-  "process.overview.table.finish" :"Аяқтау уақыты",
+  "process.overview.table.finish": "Аяқтау уақыты (UTC)",
 
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" :"Процесс идентификаторы",
+  "process.overview.table.id": "Процесс идентификаторы",
 
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" :"Аты",
+  "process.overview.table.name": "Аты",
 
   // "process.overview.table.start" : "Start time (UTC)",
   // TODO Source message changed - Revise the translation
-  "process.overview.table.start" : "Бастау уақыты",
+  "process.overview.table.start": "Бастау уақыты",
 
   // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Мәртебе",
+  "process.overview.table.status": "Мәртебе",
 
   // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Пайдаланушы",
+  "process.overview.table.user": "Пайдаланушы",
 
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Процестерге шолу",
 
   // "process.overview.breadcrumbs": "Processes Overview",
-  "process.overview.breadcrumbs":"Процестерге шолу",
+  "process.overview.breadcrumbs": "Процестерге шолу",
 
   // "process.overview.new": "New",
   "process.overview.new": "Жаңа",
 
   // "process.overview.table.actions": "Actions",
-  // TODO New key - Add a translation
-  "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Әрекеттер",
 
   // "process.overview.delete": "Delete {{count}} processes",
-  // TODO New key - Add a translation
-  "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "{{count}} процестерді жою",
 
   // "process.overview.delete.clear": "Clear delete selection",
-  // TODO New key - Add a translation
-  "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.",
-  // 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}} процестер жойылады. Жоюдың толық аяқталғанын күтіңіз. Бұл біраз уақытты алуы мүмкін екенін ескеріңіз.",
 
   // "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": "Сіз {{count}} процесс(тер) жойғыңыз келетініне сенімдісіз бе?",
 
   // "process.overview.delete.header": "Delete processes",
-  // TODO New key - Add a translation
-  "process.overview.delete.header": "Delete processes",
+  "process.overview.delete.header": "Процесті жою",
 
   // "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": "Процесті жою қатесі",
 
   // "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": "{{processId}} идентификаторы бар Процесс жойылмады. Қалған процестер әлі де жойылады. ",
 
   // "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}} процестер сәтті жойылды",
 
 
 
@@ -4855,21 +4929,19 @@
   "profile.breadcrumbs": "Профильді жаңарту",
 
   // "profile.card.identify": "Identify",
-  "profile.card.identify":"Анықтау",
+  "profile.card.identify": "Анықтау",
 
   // "profile.card.security": "Security",
   "profile.card.security": "Қауіпсіздік",
 
   // "profile.form.submit": "Save",
-  // TODO Source message changed - Revise the translation
   "profile.form.submit": "Профильді жаңарту",
 
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Сіз тиесілі авторизация топтары",
 
   // "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": "Авторизация сіз тиесілі арнайы топтар",
 
   // "profile.head": "Update Profile",
   "profile.head": "Профильді жаңарту",
@@ -4920,7 +4992,7 @@
   "profile.security.form.label.password": "Құпия сөз",
 
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  "profile.security.form.label.passwordrepeat":"Растау үшін қайта теріңіз",
+  "profile.security.form.label.passwordrepeat": "Растау үшін қайта теріңіз",
 
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Құпия сөзге енгізілген өзгертулеріңіз сақталды.",
@@ -4938,14 +5010,13 @@
   "profile.security.form.notifications.error.not-same": "Берілген құпия сөздер бірдей емес.",
 
   // "profile.title": "Update Profile",
-  "profile.title":"Профильді жаңарту",
+  "profile.title": "Профильді жаңарту",
 
   // "profile.card.researcher": "Researcher Profile",
-  // TODO New key - Add a translation
-  "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Зерттеуші профилі",
 
   // "project.listelement.badge": "Research Project",
-  "project.listelement.badge":"Зерттеу жобасы",
+  "project.listelement.badge": "Зерттеу жобасы",
 
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Қалымдар",
@@ -4978,8 +5049,7 @@
   "project.search.results.head": "Жобаны іздеу нәтижелері",
 
   // "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": "Жобаны іздеу нәтижелері",
 
 
 
@@ -5011,32 +5081,27 @@
   "publication.search.results.head": "Жарияланымдарды іздеу нәтижелері",
 
   // "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": "Жарияланымды іздеу нәтижелері",
 
   // "publication.search.title": "Publication Search",
-  // TODO Source message changed - Revise the translation
-  "publication.search.title": "DSpace Angular :: Жарияланымдарды іздеу",
+  "publication.search.title": "Жарияланымдарды іздеу",
 
 
   // "media-viewer.next": "Next",
-  // TODO New key - Add a translation
-  "media-viewer.next": "Next",
+  "media-viewer.next": "Келесісі",
 
   // "media-viewer.previous": "Previous",
-  // TODO New key - Add a translation
-  "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Алдыңғы",
 
   // "media-viewer.playlist": "Playlist",
-  // TODO New key - Add a translation
-  "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Ойнату тізімі",
 
 
   // "register-email.title": "New user registration",
   "register-email.title": "Жаңа пайдаланушыны тіркеу",
 
   // "register-page.create-profile.header": "Create Profile",
-  "register-page.create-profile.header":"Профиль жасау",
+  "register-page.create-profile.header": "Профиль жасау",
 
   // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "Анықтау",
@@ -5051,10 +5116,10 @@
   "register-page.create-profile.identification.first-name.error": "Аты-жөніңізді толтырыңыз",
 
   // "register-page.create-profile.identification.last-name": "Last Name *",
-  "register-page.create-profile.identification.last-name":"Тек *",
+  "register-page.create-profile.identification.last-name": "Тек *",
 
   // "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.last-name.error": "Тегін енгізіңіз",
 
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "Байланыс телефоны",
@@ -5072,7 +5137,7 @@
   "register-page.create-profile.security.label.password": "Пароль *",
 
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
-  "register-page.create-profile.security.label.passwordrepeat":"Растау үшін қайта енгізіңіз*",
+  "register-page.create-profile.security.label.passwordrepeat": "Растау үшін қайта енгізіңіз*",
 
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
   "register-page.create-profile.security.error.empty-password": "Төмендегі өріске құпия сөзді енгізіңіз.",
@@ -5093,17 +5158,17 @@
   "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.",
-  "register-page.create-profile.submit.success.content":"Тіркеу сәтті өтті. Сіз құрылған пайдаланушы ретінде кірдіңіз.",
+  "register-page.create-profile.submit.success.content": "Тіркеу сәтті өтті. Сіз құрылған пайдаланушы ретінде кірдіңіз.",
 
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  "register-page.create-profile.submit.success.head":"Тіркеу аяқталды",
+  "register-page.create-profile.submit.success.head": "Тіркеу аяқталды",
 
 
   // "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.",
-  "register-page.registration.info":"Электрондық пошта арқылы жаңартулар алу және DSpace-ке жаңа өнімдер жіберу үшін жинақтарға жазылу үшін есептік жазбаны тіркеңіз.",
+  "register-page.registration.info": "Электрондық пошта арқылы жаңартулар алу және DSpace-ке жаңа өнімдер жіберу үшін жинақтарға жазылу үшін есептік жазбаны тіркеңіз.",
 
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "Электрондық пошта мекенжайы *",
@@ -5115,7 +5180,7 @@
   "register-page.registration.email.error.pattern": "Жарамды электрондық пошта мекенжайын енгізіңіз",
 
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
-  "register-page.registration.email.hint":"Бұл мекен-жай тексеріліп, сіздің логиніңіз ретінде пайдаланылады.",
+  "register-page.registration.email.hint": "Бұл мекен-жай тексеріліп, сіздің логиніңіз ретінде пайдаланылады.",
 
   // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "Тіркелу",
@@ -5130,12 +5195,12 @@
   "register-page.registration.error.head": "Электрондық поштаны тіркеу кезінде қате",
 
   // "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.content": "Келесі электрондық пошта мекенжайын тіркеу кезінде қате пайда болды: {{ email }}",
 
 
 
   // "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.relationship-type.content": "Екі элемент арасындағы байланыс түрі {{ type }} үшін сәйкес сәйкестікті табу мүмкін емес",
 
   // "relationships.add.error.server.content": "The server returned an error",
   "relationships.add.error.server.content": "Сервер қате туралы хабарламаны қайтарды",
@@ -5144,7 +5209,7 @@
   "relationships.add.error.title": "Байланыс қосу мүмкін емес",
 
   // "relationships.isAuthorOf": "Authors",
-  "relationships.isAuthorOf":"Авторлар",
+  "relationships.isAuthorOf": "Авторлар",
 
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   "relationships.isAuthorOf.Person": "Авторлар (тұлғалар)",
@@ -5156,7 +5221,7 @@
   "relationships.isIssueOf": "Журналдың шығарылымдары",
 
   // "relationships.isJournalIssueOf": "Journal Issue",
-  "relationships.isJournalIssueOf":"Журнал шығару",
+  "relationships.isJournalIssueOf": "Журнал шығару",
 
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Күнделіктер",
@@ -5177,7 +5242,7 @@
   "relationships.isPublicationOfJournalIssue": "Мақалалар",
 
   // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf":"Күнделік",
+  "relationships.isSingleJournalOf": "Күнделік",
 
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Журнал көлемі",
@@ -5199,14 +5264,12 @@
 
 
   // "repository.image.logo": "Repository logo",
-  "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Репозиторий логотипі",
 
   // "repository.title.prefix": "DSpace Angular :: ",
-  // TODO New key - Add a translation
   "repository.title.prefix": "DSpace Angular :: ",
 
   // "repository.title.prefixDSpace": "DSpace Angular ::",
-  // TODO New key - Add a translation
   "repository.title.prefixDSpace": "DSpace Angular ::",
 
 
@@ -5223,13 +5286,13 @@
   "resource-policies.add.for.bundle": "Жаңа пакет саясатын қосу",
 
   // "resource-policies.add.for.item": "Add a new Item policy",
-  "resource-policies.add.for.item":"Жаңа элемент саясатын қосу",
+  "resource-policies.add.for.item": "Жаңа элемент саясатын қосу",
 
   // "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",
-  "resource-policies.add.for.collection":"Жаңа деректерді жинау саясатын қосу",
+  "resource-policies.add.for.collection": "Жаңа деректерді жинау саясатын қосу",
 
   // "resource-policies.create.page.heading": "Create new resource policy for ",
   "resource-policies.create.page.heading": "Ресурстарға қатысты жаңа саясат құру ",
@@ -5238,7 +5301,7 @@
   "resource-policies.create.page.failure.content": "Ресурстық саясатты құру кезінде қате пайда болды.",
 
   // "resource-policies.create.page.success.content": "Operation successful",
-  "resource-policies.create.page.success.content":"Операция сәтті өтті",
+  "resource-policies.create.page.success.content": "Операция сәтті өтті",
 
   // "resource-policies.create.page.title": "Create new resource policy",
   "resource-policies.create.page.title": "Ресурстар саласында жаңа саясат құру",
@@ -5259,15 +5322,13 @@
   "resource-policies.edit.page.heading": "Ресурстар саясатын өзгерту",
 
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
-  "resource-policies.edit.page.failure.content":"Ресурстар саясатын өңдеуде қате пайда болды.",
+  "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.",
-  // 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": "Ресурстар саясатының мақсатты нысанын (тұлғаны немесе топты) өңдеу кезінде қате пайда болды.",
 
   // "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": "Ресурстар саясатын өңдеу кезінде қате пайда болды. Мақсат (адам немесе топ) сәтті жаңартылды.",
 
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Операция сәтті өтті",
@@ -5279,7 +5340,7 @@
   "resource-policies.form.action-type.label": "Әрекет түрін таңдаңыз",
 
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
-  "resource-policies.form.action-type.required":"Сіз ресурстар саясатының әрекетін таңдауыңыз керек.",
+  "resource-policies.form.action-type.required": "Сіз ресурстар саясатының әрекетін таңдауыңыз керек.",
 
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
   "resource-policies.form.eperson-group-list.label": "Рұқсат берілетін тұлға немесе топ",
@@ -5291,7 +5352,7 @@
   "resource-policies.form.eperson-group-list.tab.eperson": "Адамды іздеу",
 
   // "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.tab.group": "Топты іздеу",
 
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
   "resource-policies.form.eperson-group-list.table.headers.action": "Әрекет",
@@ -5303,30 +5364,25 @@
   "resource-policies.form.eperson-group-list.table.headers.name": "Аты",
 
   // "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": "Түрін өзгерту мүмкін емес",
 
   // "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": "Адамды топпен алмастыру мүмкін емес.",
 
   // "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": "Топты 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": "Ағымдағы ресурстар саясатын жойып, дұрыс түрімен жаңасын жасаңыз.",
 
   // "resource-policies.form.eperson-group-list.modal.close": "Ok",
-  // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.modal.close": "Ok",
 
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "Аяқталу күні",
 
   // "resource-policies.form.date.start.label": "Start Date",
-  "resource-policies.form.date.start.label":"Басталу күні",
+  "resource-policies.form.date.start.label": "Басталу күні",
 
   // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "Сипаттама",
@@ -5397,15 +5453,13 @@
   "search.switch-configuration.title": "Көрсету",
 
   // "search.title": "Search",
-  // TODO Source message changed - Revise the translation
-  "search.title": "DSpace Angular :: Іздеу",
+  "search.title": "Іздеу",
 
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Іздеу",
 
   // "search.search-form.placeholder": "Search the repository ...",
-  // TODO New key - Add a translation
-  "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": " Репозиторидең іздеу ...",
 
 
   // "search.filters.applied.f.author": "Author",
@@ -5421,20 +5475,19 @@
   "search.filters.applied.f.dateSubmitted": "Ұсыну күні",
 
   // "search.filters.applied.f.discoverable": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.applied.f.discoverable": "Жеке",
 
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "Өнім түрі",
 
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
-  "search.filters.applied.f.has_content_in_original_bundle":"Файлдар бар",
+  "search.filters.applied.f.has_content_in_original_bundle": "Файлдар бар",
 
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Түрі",
 
   // "search.filters.applied.f.namedresourcetype": "Status",
-  "search.filters.applied.f.namedresourcetype":"Мәртебе",
+  "search.filters.applied.f.namedresourcetype": "Мәртебе",
 
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Тақырып",
@@ -5449,7 +5502,7 @@
   "search.filters.applied.f.birthDate.max": "Соңғы туған күні",
 
   // "search.filters.applied.f.birthDate.min": "Start birth date",
-  "search.filters.applied.f.birthDate.min":"Бастауыш туған күні",
+  "search.filters.applied.f.birthDate.min": "Бастауыш туған күні",
 
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Алып тасталынды",
@@ -5463,22 +5516,19 @@
   "search.filters.filter.author.placeholder": "Автордың аты",
 
   // "search.filters.filter.author.label": "Search author name",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Іздеу авторының аты",
 
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Туған күні",
 
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  "search.filters.filter.birthDate.placeholder":"Туған күні",
+  "search.filters.filter.birthDate.placeholder": "Туған күні",
 
   // "search.filters.filter.birthDate.label": "Search birth date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Туған күнді іздеу",
 
   // "search.filters.filter.collapse": "Collapse filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Сүзгіні кішірейту",
 
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Жарияланған күні",
@@ -5487,8 +5537,7 @@
   "search.filters.filter.creativeDatePublished.placeholder": "Жарияланған күні",
 
   // "search.filters.filter.creativeDatePublished.label": "Search date published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Жарияланған күнімен іздеу",
 
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Редактор",
@@ -5497,8 +5546,7 @@
   "search.filters.filter.creativeWorkEditor.placeholder": "Редактор",
 
   // "search.filters.filter.creativeWorkEditor.label": "Search editor",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Редакторды іздеу",
 
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Тақырып",
@@ -5507,37 +5555,31 @@
   "search.filters.filter.creativeWorkKeywords.placeholder": "Тақырыбы",
 
   // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Іздеу тақырыбы",
 
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Баспагер",
 
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  "search.filters.filter.creativeWorkPublisher.placeholder":"Баспагер",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Баспагер",
 
   // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Баспагерді іздеу",
 
   // "search.filters.filter.dateIssued.head": "Date",
-  "search.filters.filter.dateIssued.head": "Кездесуге",
+  "search.filters.filter.dateIssued.head": "Күн",
 
   // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
-  // TODO Source message changed - Revise the translation
-  "search.filters.filter.dateIssued.max.placeholder": "Ең төменгі күн",
+  "search.filters.filter.dateIssued.max.placeholder": "Ең жоғары күн",
 
   // "search.filters.filter.dateIssued.max.label": "End",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Соңы",
 
   // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
-  // TODO Source message changed - Revise the translation
-  "search.filters.filter.dateIssued.min.placeholder":"Максималды күн",
+  "search.filters.filter.dateIssued.min.placeholder": "Минималды күн",
 
   // "search.filters.filter.dateIssued.min.label": "Start",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Бастау",
 
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Жіберілген күні",
@@ -5546,15 +5588,13 @@
   "search.filters.filter.dateSubmitted.placeholder": "Ұсыну күні",
 
   // "search.filters.filter.dateSubmitted.label": "Search date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Жіберілген күнімен сұрау салу",
 
   // "search.filters.filter.discoverable.head": "Non-discoverable",
-  // TODO Source message changed - Revise the translation
   "search.filters.filter.discoverable.head": "Жеке",
 
   // "search.filters.filter.withdrawn.head": "Withdrawn",
-  "search.filters.filter.withdrawn.head": "Отозванный",
+  "search.filters.filter.withdrawn.head": "Алынған",
 
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Өнім түрі",
@@ -5563,12 +5603,10 @@
   "search.filters.filter.entityType.placeholder": "Өнім түрі",
 
   // "search.filters.filter.entityType.label": "Search item type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Іздеу элементінің түрі",
 
   // "search.filters.filter.expand": "Expand filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Сүзгіні жаю",
 
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Файлдар бар",
@@ -5577,21 +5615,19 @@
   "search.filters.filter.itemtype.head": "Түрі",
 
   // "search.filters.filter.itemtype.placeholder": "Type",
-  "search.filters.filter.itemtype.placeholder":"Түрі",
+  "search.filters.filter.itemtype.placeholder": "Түрі",
 
   // "search.filters.filter.itemtype.label": "Search type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Түрі бойынша іздеу",
 
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Лауазымы",
 
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  "search.filters.filter.jobTitle.placeholder":"Лауазымы",
+  "search.filters.filter.jobTitle.placeholder": "Лауазымы",
 
   // "search.filters.filter.jobTitle.label": "Search job title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Лауазым атауын іздеу",
 
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Белгілі тіл",
@@ -5600,8 +5636,7 @@
   "search.filters.filter.knowsLanguage.placeholder": "Белгілі тіл",
 
   // "search.filters.filter.knowsLanguage.label": "Search known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Белгілі тілде іздеу",
 
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Мәртебе",
@@ -5610,8 +5645,7 @@
   "search.filters.filter.namedresourcetype.placeholder": "Мәртебе",
 
   // "search.filters.filter.namedresourcetype.label": "Search status",
-  // TODO New key - Add a translation
-  "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Іздеу мәртебесі",
 
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Адамдар",
@@ -5620,8 +5654,7 @@
   "search.filters.filter.objectpeople.placeholder": "Адамдар",
 
   // "search.filters.filter.objectpeople.label": "Search people",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Тұлғаны іздеу",
 
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Ел",
@@ -5630,8 +5663,7 @@
   "search.filters.filter.organizationAddressCountry.placeholder": "Ел",
 
   // "search.filters.filter.organizationAddressCountry.label": "Search country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Елді іздеу",
 
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Қала",
@@ -5640,8 +5672,7 @@
   "search.filters.filter.organizationAddressLocality.placeholder": "Қаласы",
 
   // "search.filters.filter.organizationAddressLocality.label": "Search city",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Қаланы іздеу",
 
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Құрылған күні",
@@ -5650,8 +5681,7 @@
   "search.filters.filter.organizationFoundingDate.placeholder": "Құрылған күні",
 
   // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Құрылған күні бойынша іздеу",
 
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Қолдану саласы",
@@ -5660,34 +5690,31 @@
   "search.filters.filter.scope.placeholder": "Ауқым сүзгісі",
 
   // "search.filters.filter.scope.label": "Search scope filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.label": "Search scope filter",
+  "search.filters.filter.scope.label": "Іздеу аумағының сүзгісі",
 
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Коллапс",
 
   // "search.filters.filter.show-more": "Show more",
-  "search.filters.filter.show-more":"Көбірек көрсету",
+  "search.filters.filter.show-more": "Көбірек көрсету",
 
   // "search.filters.filter.subject.head": "Subject",
-  "search.filters.filter.subject.head":"Тақырып",
+  "search.filters.filter.subject.head": "Тақырып",
 
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Тақырып",
 
   // "search.filters.filter.subject.label": "Search subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Іздеу тақырыбы",
 
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Жіберуші",
 
   // "search.filters.filter.submitter.placeholder": "Submitter",
-  "search.filters.filter.submitter.placeholder":"Жіберуші",
+  "search.filters.filter.submitter.placeholder": "Жіберуші",
 
   // "search.filters.filter.submitter.label": "Search submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Іздеу жіберушіні",
 
 
 
@@ -5695,10 +5722,10 @@
   "search.filters.entityType.JournalIssue": "Журналдың нөмірі",
 
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  "search.filters.entityType.JournalVolume":"Журнал көлемі",
+  "search.filters.entityType.JournalVolume": "Журнал көлемі",
 
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
-  "search.filters.entityType.OrgUnit":"Ұйымдастыру бөлімшесі",
+  "search.filters.entityType.OrgUnit": "Ұйымдастыру бөлімшесі",
 
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Иә",
@@ -5720,27 +5747,24 @@
 
 
   // "search.filters.head": "Filters",
-  "search.filters.head":"Сүзгілер",
+  "search.filters.head": "Сүзгілер",
 
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Сүзгілерді қалпына келтіру",
 
   // "search.filters.search.submit": "Submit",
-  // TODO New key - Add a translation
-  "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Орындау",
 
 
 
   // "search.form.search": "Search",
-  "search.form.search":"Іздеу",
+  "search.form.search": "Іздеу",
 
   // "search.form.search_dspace": "All repository",
-  // TODO Source message changed - Revise the translation
-  "search.form.search_dspace": "Іздеу кеңістігі",
+  "search.form.search_dspace": "Бүкіл репозиторий",
 
   // "search.form.scope.all": "All of DSpace",
-  // TODO New key - Add a translation
-  "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Бүкіл DSpace",
 
 
 
@@ -5757,20 +5781,16 @@
   "search.results.empty": "Сіздің іздеуіңіз нәтиже бермеді.",
 
   // "search.results.view-result": "View",
-  // TODO New key - Add a translation
-  "search.results.view-result": "View",
+  "search.results.view-result": "Көрінісі",
 
   // "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": "Сұрауды орындау кезінде қате пайда болды, кейінірек қайталап көріңіз",
 
   // "default.search.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "default.search.results.head": "Search Results",
+  "default.search.results.head": "Іздеу нәтижелері",
 
   // "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": "Іздеу нәтижелері",
 
 
   // "search.sidebar.close": "Back to results",
@@ -5783,7 +5803,7 @@
   "search.sidebar.open": "Іздеу құралдары",
 
   // "search.sidebar.results": "results",
-  "search.sidebar.results":"нәтижелер",
+  "search.sidebar.results": "нәтижелер",
 
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Беттегі нәтижелер",
@@ -5820,40 +5840,32 @@
   "sorting.dc.title.DESC": "Кему тақырыбы",
 
   // "sorting.score.ASC": "Least Relevant",
-  // TODO New key - Add a translation
-  "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Ең Аз Өзекті",
 
   // "sorting.score.DESC": "Most Relevant",
-  // TODO Source message changed - Revise the translation
-  "sorting.score.DESC": "Өзектілігі",
+  "sorting.score.DESC": "Өзектілігі көбірек",
 
   // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
-  // TODO New key - Add a translation
-  "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Өсу бойынша шығарылған күні",
 
   // "sorting.dc.date.issued.DESC": "Date Issued Descending",
-  // TODO New key - Add a translation
-  "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Кему бойынша шығарылған күні",
 
   // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-  // TODO New key - Add a translation
-  "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Өсу бойынша қол жеткізу күні",
 
   // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-  // TODO New key - Add a translation
-  "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Кему бойынша қол жеткізу күні",
 
   // "sorting.lastModified.ASC": "Last modified Ascending",
-  // TODO New key - Add a translation
-  "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Өсу бойынша соңғы өзгеріс",
 
   // "sorting.lastModified.DESC": "Last modified Descending",
-  // TODO New key - Add a translation
-  "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Кему бойынша соңғы өзгеріс",
 
 
   // "statistics.title": "Statistics",
-  "statistics.title":"Статистика",
+  "statistics.title": "Статистика",
 
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "{{ scope }} үшін статистика",
@@ -5888,15 +5900,13 @@
 
 
   // "submission.edit.breadcrumbs": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Жіберуді өңдеу",
 
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Жіберуді өңдеу",
 
   // "submission.general.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Алып тастау",
 
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "Сізде жаңа қойылым жасау артықшылығы жоқ.",
@@ -5908,7 +5918,7 @@
   "submission.general.discard.confirm.cancel": "Болдырмау",
 
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
-  "submission.general.discard.confirm.info":"Бұл операцияны болдырмау мүмкін емес. Сен сенімді?",
+  "submission.general.discard.confirm.info": "Бұл операцияны болдырмау мүмкін емес. Сен сенімді?",
 
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Ия, мен сенімдімін",
@@ -5920,12 +5930,10 @@
   "submission.general.discard.submit": "Тастау",
 
   // "submission.general.info.saved": "Saved",
-  // TODO New key - Add a translation
-  "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Сақталған",
 
   // "submission.general.info.pending-changes": "Unsaved changes",
-  // TODO New key - Add a translation
-  "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Сақталмаған өзгерістер",
 
   // "submission.general.save": "Save",
   "submission.general.save": "Сақтау",
@@ -5935,42 +5943,34 @@
 
 
   // "submission.import-external.page.title": "Import metadata from an external source",
-  "submission.import-external.page.title":"Метадеректерді сыртқы көзден импорттау",
+  "submission.import-external.page.title": "Метадеректерді сыртқы көзден импорттау",
 
   // "submission.import-external.title": "Import metadata from an external source",
-  "submission.import-external.title":"Метадеректерді сыртқы көзден импорттау",
+  "submission.import-external.title": "Метадеректерді сыртқы көзден импорттау",
 
   // "submission.import-external.title.Journal": "Import a journal from an external source",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Журнал шығарылымын сыртқы көзден импорттаңыз",
 
   // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.",
   "submission.import-external.page.hint": "Ғарышқа импорттау үшін интернеттен элементтерді табу үшін жоғарыдағы сұрауды енгізіңіз.",
@@ -5994,67 +5994,55 @@
   "submission.import-external.source.arxiv": "arXiv",
 
   // "submission.import-external.source.ads": "NASA/ADS",
-  // TODO New key - Add a translation
   "submission.import-external.source.ads": "NASA/ADS",
 
   // "submission.import-external.source.cinii": "CiNii",
-  // TODO New key - Add a translation
   "submission.import-external.source.cinii": "CiNii",
 
   // "submission.import-external.source.crossref": "CrossRef",
-  // TODO New key - Add a translation
   "submission.import-external.source.crossref": "CrossRef",
 
   // "submission.import-external.source.scielo": "SciELO",
-  // TODO New key - Add a translation
   "submission.import-external.source.scielo": "SciELO",
 
   // "submission.import-external.source.scopus": "Scopus",
-  // TODO New key - Add a translation
   "submission.import-external.source.scopus": "Scopus",
 
   // "submission.import-external.source.vufind": "VuFind",
-  // TODO New key - Add a translation
   "submission.import-external.source.vufind": "VuFind",
 
   // "submission.import-external.source.wos": "Web Of Science",
-  // TODO New key - Add a translation
-  "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.wos": "Ғылым Желісі",
 
   // "submission.import-external.source.orcidWorks": "ORCID",
-  // TODO New key - Add a translation
   "submission.import-external.source.orcidWorks": "ORCID",
 
   // "submission.import-external.source.epo": "European Patent Office (EPO)",
-  // TODO New key - Add a translation
-  "submission.import-external.source.epo": "European Patent Office (EPO)",
+  "submission.import-external.source.epo": "Еуропалық патенттік ведомство (ЕПВ)",
 
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Жүктеу...",
 
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  "submission.import-external.source.sherpaJournal": "ШЕРПА күнделіктері",
+  "submission.import-external.source.sherpaJournal": "ШЕРПА журналдары",
 
   // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "SHERPA журналдағы ISSN",
 
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "ШЕРПА баспасы",
 
   // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-  // TODO New key - Add a translation
-  "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "OpenAIRE API қаржыландыру",
 
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ОРКИД",
 
   // "submission.import-external.source.pubmed": "Pubmed",
-  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmed": "Жарияланған",
 
   // "submission.import-external.source.pubmedeu": "Pubmed Europe",
-  // TODO New key - Add a translation
-  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.pubmedeu": "Жарияланған Еуропа",
 
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Конгресс Кітапханасының Атаулары",
@@ -6063,28 +6051,22 @@
   "submission.import-external.preview.title": "Элементті алдын-ала қарау",
 
   // "submission.import-external.preview.title.Publication": "Publication Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Жарияланымдарды алдын ала қарау",
 
   // "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": "Элементті алдын ала қарау",
 
   // "submission.import-external.preview.title.Journal": "Journal Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Журналды алдын ала қарау",
 
   // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Мекемені алдын ала қарау",
 
   // "submission.import-external.preview.title.Person": "Person Preview",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Жобаны алдын ала қарау",
 
   // "submission.import-external.preview.title.Project": "Project Preview",
-  // TODO New key - Add a translation
-  "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.",
   "submission.import-external.preview.subtitle": "Төмендегі метадеректер сыртқы көзден импортталды. Сіз жіберуді бастаған кезде ол алдын-ала толтырылады.",
@@ -6102,7 +6084,7 @@
   "submission.sections.describe.relationship-lookup.close": "Жабу",
 
   // "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.added": "Үлгіге жергілікті жазба сәтті қосылды",
 
   // "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": "Қашықтағы авторды импорттау",
@@ -6117,60 +6099,46 @@
   "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Журналдың қашықтағы томын импорттау",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-  // TODO New key - Add a translation
-  "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",
-  // 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": "Қашықтағы элементті импорттау",
 
   // "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Import remote event",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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!",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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 API",
 
   // "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": "Қашықтағы авторды импорттау",
@@ -6188,7 +6156,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Импорт жергілікті биліктің жаңа жазбасы ретінде",
 
   // "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.cancel": "Болдырмау",
 
   // "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": "Жаңа жазбаларды импорттау үшін коллекцияны таңдаңыз",
@@ -6200,7 +6168,7 @@
   "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",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname":"LC Name-ден импорттау",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "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": "ORCID-тен Импорт",
@@ -6257,7 +6225,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Бетті таңдаудан бас тарту",
 
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  "submission.sections.describe.relationship-lookup.search-tab.loading":"Жүктеу...",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Жүктеу...",
 
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Іздеу сұранысы",
@@ -6266,8 +6234,7 @@
   "submission.sections.describe.relationship-lookup.search-tab.search": "Бару",
 
   // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-  // TODO New key - Add a translation
-  "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",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Барлығын таңдау",
@@ -6283,6 +6250,7 @@
 
   // "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Жергілікті жобалар ({{ count }})",
 
@@ -6306,19 +6274,21 @@
 
   // "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 }})",
   "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 }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Жергілікті журнал томдары ({{ count }})",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal":"Sherpa журналдары ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "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": "Sherpa Publishers ({{ 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.orcid": "ORCID ({{ count }})",
@@ -6327,7 +6297,7 @@
   "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.pubmed":"PubMed ({{ 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.arxiv": "arXiv ({{ count }})",
@@ -6336,56 +6306,50 @@
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Қаржыландыру агенттіктерін іздеу",
 
   // "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.isFundingOfPublication": "Қаржыландыруды іздеу",
 
   // "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",
-  // TODO New key - Add a translation
-  "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",
 
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Демеуші OpenAIRE API",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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...",
-  // TODO New key - Add a translation
-  "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 }})",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title":"Ағымдағы таңдау ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Ағымдағы таңдау ({{ count }})",
 
   // "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",
-  "submission.sections.describe.relationship-lookup.title.JournalIssue":"Журналдың шығарылымдары",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Журналдың шығарылымдары",
 
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication":"Журнал томдары",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Журнал томдары",
+
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Журнал томдары",
 
@@ -6397,6 +6361,7 @@
 
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Қаржыландыру агенттігі",
+
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Жобалар",
 
@@ -6416,7 +6381,7 @@
   "submission.sections.describe.relationship-lookup.title.DataFile": "Деректер файлдары",
 
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.Funding Agency":"Қаржыландыру агенттігі",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Қаржыландыру агенттігі",
 
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Қаржыландыру",
@@ -6441,11 +6406,12 @@
 
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Таңдаулы жобалар",
 
   // "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.Publication": "Таңдамалы Жарияланымдар",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Таңдалған авторлар",
@@ -6464,14 +6430,16 @@
 
   // "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",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume":"Журналдың таңдалған көлемі",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Журналдың таңдалған көлемі",
 
   // "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",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Таңдалған қаржыландыру",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Таңдалған шығарылым",
 
@@ -6479,7 +6447,7 @@
   "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Таңдалған ұйымдастыру бөлімі",
 
   // "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.sherpaJournal": "Іздеу нәтижелері",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Іздеу нәтижелері",
@@ -6517,7 +6485,7 @@
   // "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.",
+  // "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": "Сіз \"{{ value }}\" сол адамға арналған атау опциясы ретінде сақтағыңыз келе ме, сондықтан сіз және басқалар оны болашақ жіберу үшін қайта пайдалана аласыз ба? Егер жоқ болса, сіз оны осы жіберу үшін пайдалана аласыз.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -6551,8 +6519,7 @@
   "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.",
-  // 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": "Пішіндегі қателіктерге байланысты Депозит аяқталуы мүмкін емес.<br>Депозитті аяқтау үшін барлық қажетті өрістерді толтырыңыз.",
 
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Жинақ",
@@ -6591,7 +6558,7 @@
   "submission.sections.general.search-collection": "Коллекцияны іздеу",
 
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  "submission.sections.general.sections_not_valid":"Толық емес бөлімдер бар.",
+  "submission.sections.general.sections_not_valid": "Толық емес бөлімдер бар.",
 
 
 
@@ -6620,67 +6587,53 @@
   "submission.sections.submit.progressbar.license": "Депозиттік лицензия",
 
   // "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": "Sherpa саясаттары",
 
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Файлдарды жүктеу",
 
   // "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": "Баспагердің ашық қол жеткізу саясаты туралы ақпарат",
 
 
   // "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": "Баспагердің саясаты туралы ақпарат жоқ. Егер сіздің жұмысыңыз ISSN-мен байланысты болса, баспагердің кез-келген тиісті ашық кіру саясатымен танысу үшін оны жоғарыда енгізіңіз.",
 
   // "submission.sections.status.errors.title": "Errors",
   "submission.sections.status.errors.title": "Қателер",
 
   // "submission.sections.status.valid.title": "Valid",
-  // TODO New key - Add a translation
-  "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Жарамды",
 
   // "submission.sections.status.warnings.title": "Warnings",
-  // TODO New key - Add a translation
-  "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Ескертулер",
 
   // "submission.sections.status.errors.aria": "has errors",
-  // TODO New key - Add a translation
-  "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "қателер бар",
 
   // "submission.sections.status.valid.aria": "is valid",
-  // TODO New key - Add a translation
-  "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "жарамды болып табылады",
 
   // "submission.sections.status.warnings.aria": "has warnings",
-  // TODO New key - Add a translation
-  "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "ескертулер бар",
 
   // "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": "Қосымша ақпарат",
 
   // "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": "Қосымша ақпарат",
 
   // "submission.sections.toggle.open": "Open section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Бөлімді ашу",
 
   // "submission.sections.toggle.close": "Close section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Бөлімді жабу",
 
   // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Бөлімді ашу {{sectionHeader}}",
 
   // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
-  // TODO New key - Add a translation
-  "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Бөлімді кішірейту {{sectionHeader}}",
 
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Болдырмау",
@@ -6710,26 +6663,22 @@
   "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",
-  // TODO New key - Add a translation
-  "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.",
   "submission.sections.upload.form.date-required": "Күні міндетті.",
 
   // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
   "submission.sections.upload.form.from-label": "Қатынауды ұсыну бірі",
 
   // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
-  // TODO New key - Add a translation
-  "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",
   "submission.sections.upload.form.from-placeholder": "Кімнен",
@@ -6744,11 +6693,10 @@
   "submission.sections.upload.form.until-label": "Рұқсат беруге болғанша",
 
   // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
-  // TODO New key - Add a translation
-  "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",
-  "submission.sections.upload.form.until-placeholder":"Әзірге",
+  "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):",
   "submission.sections.upload.header.policy.default.nolist": "{{collectionName}} жинағына жүктелген файлдар келесі топқа (топтарға) сәйкес қол жетімді болады:",
@@ -6756,11 +6704,11 @@
   // "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 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": "Мұнда сіз осы элементтегі барлық файлдарды таба аласыз. Файл метадеректерін және кіру шарттарын жаңартуға немесе <strong>қосымша файлдарды оларды</strong>бетінде сүйреп апару арқылы жүктеуге болады.",
 
   // "submission.sections.upload.no-entry": "No",
-  "submission.sections.upload.no-entry":"Жоқ",
+  "submission.sections.upload.no-entry": "Жоқ",
 
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "Файл әлі жүктелмеген.",
@@ -6778,191 +6726,145 @@
   "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Анықталатын",
 
   // "submission.sections.accesses.form.access-condition-label": "Access condition type",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "Бастап",
 
   // "submission.sections.accesses.form.group-label": "Group",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Топ",
 
   // "submission.sections.accesses.form.group-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "Топ қажет.",
 
   // "submission.sections.accesses.form.until-label": "Grant access until",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Осы уақытқа дейін",
 
   // "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": "Мен жоғарыда аталған лицензияны растаймын",
 
   // "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": "Лицензияны қабылдау керек",
 
   // "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": "Лицензияны қабылдау керек",
 
 
   // "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": "Жарияланым туралы ақпарат",
 
   // "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": "Атауы",
 
   // "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.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": "Баспагер",
 
   // "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.romeoPub": "Romeo Баспагер",
 
   // "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.publication.information.zetoPub": "Zeto Баспагер",
 
   // "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": "Баспагердің саясаты",
 
   // "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": "Төмендегі ақпарат Шерпа Ромео арқылы табылды. Баспагердің саясатына сүйене отырып, ол сізге эмбарго қажет пе және / немесе қандай файлдарды жүктеуге рұқсат етілгені туралы ұсыныстар береді. Егер сізде сұрақтар туындаса, төменгі деректемедегі кері байланыс нысаны арқылы веб-сайтыңыздың әкімшісіне хабарласыңыз.",
 
   // "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": "Осы журналдың саясатымен рұқсат етілген ашық қол жетімділік жолдары төменде мақалалардың нұсқалары бойынша бөлінген. Толығырақ көру үшін жолды нұқыңыз",
 
   // "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": "Қосымша ақпарат алу үшін келесі сілтемелерге өтіңіз:",
 
   // "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": "Нұсқа",
 
   // "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.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": "Эмбарго Жоқ",
 
   // "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": "Ешкім",
 
   // "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": "Лицензия",
 
   // "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": "Алғышарттар",
 
   // "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": "Орналасқан жері",
 
   // "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": "Шарттары",
 
   // "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": "Жаңарту",
 
   // "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": "Жазуға арналған ақпарат",
 
   // "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": "Құрылған күні",
 
   // "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": "Соңғы өзгеріс",
 
   // "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": "Шерпе туралы ақпарат алу кезінде қате пайда болды",
 
 
 
   // "submission.submit.breadcrumbs": "New submission",
-  // TODO New key - Add a translation
-  "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Жаңа көрініс",
 
   // "submission.submit.title": "New submission",
-  // TODO Source message changed - Revise the translation
-  "submission.submit.title":"Бағыну",
+  "submission.submit.title": "Жаңа көрініс",
 
 
 
@@ -6990,7 +6892,7 @@
   "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\".",
-  "submission.workflow.tasks.claimed.approve_help":"Егер сіз тауармен танысқан болсаңыз және ол коллекцияға қосуға жарамды болса, \"Мақұлдау\" таңдаңыз.",
+  "submission.workflow.tasks.claimed.approve_help": "Егер сіз тауармен танысқан болсаңыз және ол коллекцияға қосуға жарамды болса, \"Мақұлдау\" таңдаңыз.",
 
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Редакциялау",
@@ -7052,45 +6954,35 @@
 
 
   // "submission.workspace.generic.view": "View",
-  // TODO New key - Add a translation
-  "submission.workspace.generic.view": "View",
+  "submission.workspace.generic.view": "Көрініс",
 
   // "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
-  // TODO New key - Add a translation
-  "submission.workspace.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workspace.generic.view-help": "Элемент метадеректерін көру үшін осы параметрді таңдаңыз.",
 
 
   // "thumbnail.default.alt": "Thumbnail Image",
-  // TODO New key - Add a translation
-  "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Кішірейтілген сурет",
 
   // "thumbnail.default.placeholder": "No Thumbnail Available",
-  // TODO New key - Add a translation
-  "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Нобайлар Жоқ",
 
   // "thumbnail.project.alt": "Project Logo",
-  // TODO New key - Add a translation
-  "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Жобаның логотипі",
 
   // "thumbnail.project.placeholder": "Project Placeholder Image",
-  // TODO New key - Add a translation
-  "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Жобаның толтырғыш суреті",
 
   // "thumbnail.orgunit.alt": "OrgUnit Logo",
-  // TODO New key - Add a translation
-  "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Ұйым бөлімшесінің логотипі",
 
   // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
-  // TODO New key - Add a translation
-  "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Мекеме бірлігін толтырушы суреті",
 
   // "thumbnail.person.alt": "Profile Picture",
-  // TODO New key - Add a translation
-  "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Профиль суреті",
 
   // "thumbnail.person.placeholder": "No Profile Picture Available",
-  // TODO New key - Add a translation
-  "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Профиль Суреті Қол Жетімді Емес",
 
 
 
@@ -7129,8 +7021,7 @@
   "uploader.drag-message": "Файлдарды осында сүйреңіз",
 
   // "uploader.delete.btn-title": "Delete",
-  // TODO New key - Add a translation
-  "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Жою",
 
   // "uploader.or": ", or ",
   "uploader.or": ", немесе ",
@@ -7154,28 +7045,24 @@
 
 
   // "workspace.search.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Сіздің жазылымдарыңыз",
 
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "Жұмыс процесін басқару",
 
   // "workflow.search.results.head": "Workflow tasks",
-  // TODO New key - Add a translation
-  "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Жұмыс процесінің міндеттері",
 
 
 
   // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
-  // TODO New key - Add a translation
-  "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Жұмыс процесінің элементін өңдеу",
 
   // "workflow-item.edit.title": "Edit workflowitem",
-  // TODO New key - Add a translation
-  "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Жұмыс процесінің элементін өңдеу",
 
   // "workflow-item.delete.notification.success.title": "Deleted",
-  "workflow-item.delete.notification.success.title":"Жойылды",
+  "workflow-item.delete.notification.success.title": "Жойылды",
 
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
   "workflow-item.delete.notification.success.content": "Жұмыс процесінің бұл элементі сәтті жойылды",
@@ -7221,526 +7108,396 @@
   "workflow-item.send-back.button.cancel": "Алып тастау",
 
   // "workflow-item.send-back.button.confirm": "Send back",
-  // TODO Source message changed - Revise the translation
   "workflow-item.send-back.button.confirm": "Кері жіберу",
 
   // "workflow-item.view.breadcrumbs": "Workflow View",
-  // TODO New key - Add a translation
-  "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Жұмыс процесін көру",
 
   // "workspace-item.view.breadcrumbs": "Workspace View",
-  // TODO New key - Add a translation
-  "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Жұмыс аймағының түрі",
 
   // "workspace-item.view.title": "Workspace View",
-  // TODO New key - Add a translation
-  "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Жұмыс аймағының түрі",
 
   // "idle-modal.header": "Session will expire soon",
-  // TODO New key - Add a translation
-  "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?",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Шығу",
 
   // "idle-modal.extend-session": "Extend session",
-  // TODO New key - Add a translation
-  "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Сеансты ұзарту",
 
   // "researcher.profile.action.processing" : "Processing...",
-  // TODO New key - Add a translation
-  "researcher.profile.action.processing" : "Processing...",
+  "researcher.profile.action.processing": "Процессте...",
 
   // "researcher.profile.associated": "Researcher profile associated",
-  // TODO New key - Add a translation
-  "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Зерттеушінің байланысты профилі",
 
   // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Жаңасың құру",
 
   // "researcher.profile.create.success": "Researcher profile created successfully",
-  // TODO New key - Add a translation
-  "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Зерттеуші профилі сәтті жасалды",
 
   // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
-  // TODO New key - Add a translation
-  "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Зерттеуші профилін құру кезінде қате пайда болады",
 
   // "researcher.profile.delete": "Delete",
-  // TODO New key - Add a translation
-  "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Жою",
 
   // "researcher.profile.expose": "Expose",
-  // TODO New key - Add a translation
-  "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Ашу",
 
   // "researcher.profile.hide": "Hide",
-  // TODO New key - Add a translation
-  "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Жасыру",
 
   // "researcher.profile.not.associated": "Researcher profile not yet associated",
-  // TODO New key - Add a translation
-  "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Зерттеуші профилі әлі байланысты емес",
 
   // "researcher.profile.view": "View",
-  // TODO New key - Add a translation
-  "researcher.profile.view": "View",
+  "researcher.profile.view": "Қөрімдігі",
 
   // "researcher.profile.private.visibility" : "PRIVATE",
-  // TODO New key - Add a translation
-  "researcher.profile.private.visibility" : "PRIVATE",
+  "researcher.profile.private.visibility": "ЖАСЫРЫН",
 
   // "researcher.profile.public.visibility" : "PUBLIC",
-  // TODO New key - Add a translation
-  "researcher.profile.public.visibility" : "PUBLIC",
+  "researcher.profile.public.visibility": "АШЫҚ",
 
   // "researcher.profile.status": "Status:",
-  // TODO New key - Add a translation
-  "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).",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "researcherprofile.error.claim.body" : "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Профильді толтыру кезінде қате пайда болды, кейінірек қайталап көріңіз",
 
   // "researcherprofile.error.claim.title" : "Error",
-  // TODO New key - Add a translation
-  "researcherprofile.error.claim.title" : "Error",
+  "researcherprofile.error.claim.title": "Қате",
 
   // "researcherprofile.success.claim.body" : "Profile claimed with success",
-  // TODO New key - Add a translation
-  "researcherprofile.success.claim.body" : "Profile claimed with success",
+  "researcherprofile.success.claim.body": "Сәтті мәлімделген Профиль",
 
   // "researcherprofile.success.claim.title" : "Success",
-  // TODO New key - Add a translation
-  "researcherprofile.success.claim.title" : "Success",
+  "researcherprofile.success.claim.title": "Сәтті",
 
   // "person.page.orcid.create": "Create an ORCID ID",
-  // TODO New key - Add a translation
-  "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "ORCID ID құру",
 
   // "person.page.orcid.granted-authorizations": "Granted authorizations",
-  // TODO New key - Add a translation
-  "person.page.orcid.granted-authorizations": "Granted authorizations",
+  "person.page.orcid.granted-authorizations": "Рұқсат берілген",
 
   // "person.page.orcid.grant-authorizations" : "Grant authorizations",
-  // TODO New key - Add a translation
-  "person.page.orcid.grant-authorizations" : "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Рұқсат беру",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
-  // TODO New key - Add a translation
-  "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "ORCID идентификаторына қосылу",
 
   // "person.page.orcid.link.processing": "Linking profile to ORCID...",
-  // TODO New key - Add a translation
-  "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Профильді ORCID-ке байланыстыру...",
 
   // "person.page.orcid.link.error.message": "Something went wrong while connecting the profile with ORCID. If the problem persists, contact the administrator.",
-  // TODO New key - Add a translation
-  "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": "Профильді ORCID-ке қосқан кезде бірдеңе дұрыс болмады. Егер мәселе шешілмесе, әкімшіге хабарласыңыз.",
 
   // "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.",
-  // TODO New key - Add a translation
-  "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 идентификаторы ({{ orcid }}) әлі ORCID тізіліміндегі есептік жазбаға қосылмаған немесе қосылу мерзімі аяқталған.",
 
   // "person.page.orcid.unlink": "Disconnect from ORCID",
-  // TODO New key - Add a translation
-  "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "ORCID өшіру",
 
   // "person.page.orcid.unlink.processing": "Processing...",
   "person.page.orcid.unlink.processing": "Процессте...",
 
   // "person.page.orcid.missing-authorizations": "Missing authorizations",
-  // TODO New key - Add a translation
-  "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Рұқсаттары жоқ",
 
   // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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.",
-  // TODO New key - Add a translation
-  "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 идентификаторы әлі қосылмаған. Төмендегі батырманы басу арқылы сіз бұл Профильді ORCID тіркелгісімен байланыстыра аласыз.",
 
   // "person.page.orcid.profile-preferences": "Profile preferences",
-  // TODO New key - Add a translation
-  "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Профиль параметрлері",
 
   // "person.page.orcid.funding-preferences": "Funding preferences",
-  // TODO New key - Add a translation
-  "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Қаржыландырудағы артықшылықтар",
 
   // "person.page.orcid.publications-preferences": "Publication preferences",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Егер сізге ORCID жою қажет болса, репозиторий әкімшісіне хабарласыңыз",
 
   // "person.page.orcid.save.preference.changes": "Update settings",
-  // TODO New key - Add a translation
-  "person.page.orcid.save.preference.changes": "Update settings",
+  "person.page.orcid.save.preference.changes": "Параметрлерді жаңарту",
 
   // "person.page.orcid.sync-profile.affiliation" : "Affiliation",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-profile.affiliation" : "Affiliation",
+  "person.page.orcid.sync-profile.affiliation": "Филиалы",
 
   // "person.page.orcid.sync-profile.biographical" : "Biographical data",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-profile.biographical" : "Biographical data",
+  "person.page.orcid.sync-profile.biographical": "Өмірбаяндық мәліметтер",
 
   // "person.page.orcid.sync-profile.education" : "Education",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-profile.education" : "Education",
+  "person.page.orcid.sync-profile.education": "Білімі",
 
   // "person.page.orcid.sync-profile.identifiers" : "Identifiers",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-profile.identifiers" : "Identifiers",
+  "person.page.orcid.sync-profile.identifiers": "Идентификатор",
 
   // "person.page.orcid.sync-fundings.all" : "All fundings",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-fundings.all" : "All fundings",
+  "person.page.orcid.sync-fundings.all": "Барлық құралдар",
 
   // "person.page.orcid.sync-fundings.mine" : "My fundings",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-fundings.mine" : "My fundings",
+  "person.page.orcid.sync-fundings.mine": "Менің қаражатым",
 
   // "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-fundings.my_selected" : "Selected fundings",
+  "person.page.orcid.sync-fundings.my_selected": "Таңдалған құралдар",
 
   // "person.page.orcid.sync-fundings.disabled" : "Disabled",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-fundings.disabled" : "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Қолжетімсіз",
 
   // "person.page.orcid.sync-publications.all" : "All publications",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-publications.all" : "All publications",
+  "person.page.orcid.sync-publications.all": "Барлық жарияланымдар",
 
   // "person.page.orcid.sync-publications.mine" : "My publications",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-publications.mine" : "My publications",
+  "person.page.orcid.sync-publications.mine": "Менің жарияланымдарым",
 
   // "person.page.orcid.sync-publications.my_selected" : "Selected publications",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-publications.my_selected" : "Selected publications",
+  "person.page.orcid.sync-publications.my_selected": "Таңдаулы басылымдар",
 
   // "person.page.orcid.sync-publications.disabled" : "Disabled",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.discard" : "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Өзгерісті болдырмаңыз және ORCID тізілімімен синхрондамаңыз",
 
   // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "ORCID кезегінің жазбасын жою мүмкін емес",
 
   // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "ORCID кезегінің жазбасы сәтті жойылды",
 
   // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "ORCID кезегінің тізілімі бос",
 
   // "person.page.orcid.sync-queue.table.header.type" : "Type",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.description.affiliation": "Affiliations",
+  "person.page.orcid.sync-queue.description.affiliation": "Филиалы",
 
   // "person.page.orcid.sync-queue.description.country": "Country",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "ЕЛ",
 
   // "person.page.orcid.sync-queue.description.education": "Educations",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "Қосымша ids",
 
   // "person.page.orcid.sync-queue.description.other_names": "Other names",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "ORCID тізіліміне жаңа жазба қосыңыз",
 
   // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Бұл жазбаны ORCID тізіліміне жаңартыңыз",
 
   // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Бұл жазбаны ORCID тізілімінен жойыңыз",
 
   // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Жарияланымдар",
 
   // "person.page.orcid.sync-queue.tooltip.project": "Project",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Проект",
 
   // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Филиалы",
 
   // "person.page.orcid.sync-queue.tooltip.education": "Education",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Білімі",
 
   // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "Ел",
 
   // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.send" : "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "ORCID тізілімімен синхрондау",
 
   // "person.page.orcid.sync-queue.send.unauthorized-error.title": "The submission to ORCID failed for missing authorizations.",
-  // TODO New key - Add a translation
-  "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-ке жіберу сәтсіз аяқталды.",
 
   // "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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-ке жіберу сәтсіз аяқталды, өйткені ORCID тізіліміне жіберілген ресурс жарамсыз",
 
   // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "ORCID-ке жіберу сәтсіз аяқталды",
 
   // "person.page.orcid.sync-queue.send.conflict-error": "The submission to ORCID failed because the resource is already present on the ORCID registry",
-  // TODO New key - Add a translation
-  "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-ке жіберу сәтсіз аяқталды, өйткені ресурс ORCID тізілімінде бар",
 
   // "person.page.orcid.sync-queue.send.not-found-warning": "The resource does not exists anymore on the ORCID registry.",
-  // TODO New key - Add a translation
-  "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": "Ресурс енді ORCID тізілімінде жоқ.",
 
   // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
-  // TODO New key - Add a translation
-  "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "ORCID-ке жіберу сәтті аяқталды",
 
   // "person.page.orcid.sync-queue.send.validation-error": "The data that you want to synchronize with ORCID is not valid",
-  // TODO New key - Add a translation
-  "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": "ORCID-пен синхрондағыңыз келетін деректер жарамсыз",
 
   // "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "The amount's currency is required",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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": "Жарамсыз 2 сандық ISO 3166 елі",
 
   // "person.page.orcid.sync-queue.send.validation-error.organization.required": "The organization is required",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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": "Жіберілетін ұйымның мекен-жайы жарамды болуы керек 2 санық 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",
-  // TODO New key - Add a translation
-  "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, заңды тұлға идентификаторлары (LEI) және Crossref демеушілер тізілімінің идентификаторлары",
 
   // "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "The organization's identifiers requires a value",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.synchronization-mode": "Synchronization mode",
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",һ
+  "person.page.orcid.synchronization-mode": "Синхрондау режимі",
 
   // "person.page.orcid.synchronization-mode.batch": "Batch",
-  // TODO New key - Add a translation
-  "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Партия",
 
   // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
-  // TODO New key - Add a translation
-  "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).",
-  // TODO New key - Add a translation
-  "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": "Orcid-пен синхрондау қалай жүретінін таңдаңыз. Опцияларға \"Қолмен\" (деректерді ORCID-ке қолмен жіберу керек) немесе \"пакеттік\" (жүйе жоспарланған сценарий арқылы деректерді ORCID-ке жібереді) кіреді.",
 
   // "person.page.orcid.synchronization-mode-funding-message": "Select whether to send your linked Project entities to your ORCID record's list of funding information.",
-  // TODO New key - Add a translation
-  "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": "Сізге қатысты жоба нысандарын ORCID жазбаңызды қаржыландыру туралы ақпарат тізіміне жіберуді таңдаңыз.",
 
   // "person.page.orcid.synchronization-mode-publication-message": "Select whether to send your linked Publication entities to your ORCID record's list of works.",
-  // TODO New key - Add a translation
-  "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": "Қатысты жариялау нысандарын ORCID жазбаңыздың жұмыс тізіміне жіберу керек пе, жоқ па, соны таңдаңыз.",
 
   // "person.page.orcid.synchronization-mode-profile-message": "Select whether to send your biographical data or personal identifiers to your ORCID record.",
-  // TODO New key - Add a translation
-  "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": "Оқу жоспарын немесе жеке куәліктерді ORCID жазбаңызға жіберуді таңдаңыз.",
 
   // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "ORCID iD алу",
 
   // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "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",
-  // TODO New key - Add a translation
-  "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "Профиль мен ORCID тізілімі арасындағы ажырату сәтті өтті",
 
   // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
-  // TODO New key - Add a translation
-  "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Профиль мен ORCID тізілімі арасында өшіру кезінде қате пайда болды. Қайта көріңіз",
 
   // "person.orcid.sync.setting": "ORCID Synchronization settings",
-  // TODO New key - Add a translation
-  "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "ORCID синхрондау параметрлері",
 
   // "person.orcid.registry.queue": "ORCID Registry Queue",
-  // TODO New key - Add a translation
-  "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "ORCID тіркеу кезегі",
 
   // "person.orcid.registry.auth": "ORCID Authorizations",
-  // TODO New key - Add a translation
-  "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "ORCID Ауторизациясы",
 
   // "home.recent-submissions.head": "Recent Submissions",
-  // TODO New key - Add a translation
-  "home.recent-submissions.head": "Recent Submissions",
-
-
+  "home.recent-submissions.head": "Соңғы материалдар",
 
 }
diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5
index 8aea8da6e5..f5fb47777d 100644
--- a/src/assets/i18n/lv.json5
+++ b/src/assets/i18n/lv.json5
@@ -168,6 +168,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nosaukums",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Return",
   "admin.registries.bitstream-formats.table.return": "Atgriezties",
@@ -249,6 +251,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Lauks",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Jomas Piezīme",
@@ -699,6 +703,409 @@
 
 
 
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Administratīvā Meklēšana",
 
@@ -1676,7 +2083,7 @@
 
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
 
   // "curation-task.task.noop.label": "NOOP",
   // TODO New key - Add a translation
@@ -1899,7 +2306,7 @@
 
   // "footer.link.end-user-agreement":"End User Agreement",
   // TODO New key - Add a translation
-  "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement": "End User Agreement",
 
 
 
@@ -2065,9 +2472,6 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Vērtība netika ievadīta",
 
-  // "form.other-information": {},
-  "form.other-information": {},
-
   // "form.remove": "Remove",
   "form.remove": "Dzēst",
 
@@ -2192,7 +2596,7 @@
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Izveidot kopienu",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Materiālā nav neviena kopiena ko augšupielādēt bitu straumē.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -2668,7 +3072,7 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Pārvaldīt piesaistītās kolekcijas",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Pārvieto...",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
@@ -2692,8 +3096,8 @@
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Atjaunot materiālu repozitorijā",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Atsaukt...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Izņemiet šo vienumu",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Izņemiet materiālu no repozitorijas",
@@ -2764,10 +3168,6 @@
   // TODO New key - Add a translation
   "item.page.description": "Description",
 
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-
   // "item.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "item.page.journal-issn": "Journal ISSN",
@@ -2881,11 +3281,11 @@
 
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
+  "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.filesection.license.bundle": "License bundle",
 
   // "item.preview.dc.identifier.uri": "Identifier:",
   // TODO New key - Add a translation
@@ -3182,7 +3582,17 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Personas",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
   "menu.section.admin_search": "Administratora Meklēšana",
@@ -3263,6 +3673,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Piekļuves kontroles izvēlnes sadaļa",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Administratoru meklēšanas izvēlnes sadaļa",
 
@@ -3368,6 +3782,9 @@
   "menu.section.statistics_task": "Statistikas Uzdevumi",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Pārslēgt Piekļuvas Kontronles sadaļu",
@@ -3495,20 +3912,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",
@@ -3735,19 +4152,19 @@
 
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
+  "process.detail.arguments": "Arguments",
 
   // "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": "This process doesn't contain any arguments",
 
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
@@ -3763,61 +4180,61 @@
 
   // "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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
+  "process.detail.end-time": "Finish time",
 
   // "process.detail.status" : "Status",
   // TODO New key - Add a translation
-  "process.detail.status" : "Status",
+  "process.detail.status": "Status",
 
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
+  "process.detail.create": "Create similar process",
 
 
 
   // "process.overview.table.finish" : "Finish time",
   // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
+  "process.overview.table.finish": "Finish time",
 
   // "process.overview.table.id" : "Process ID",
   // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
+  "process.overview.table.id": "Process ID",
 
   // "process.overview.table.name" : "Name",
   // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
+  "process.overview.table.name": "Name",
 
   // "process.overview.table.start" : "Start time",
   // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
+  "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.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.title": "Processes Overview",
   // TODO New key - Add a translation
@@ -5217,7 +5634,7 @@
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
 
-  // "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": "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": "Vai vēlaties saglabāt \"{{ value }}\" kā vārda variantu šai personai, lai jūs un citi varētu to izmantot turpmākai iesniegšanai? Ja nē, jūs joprojām varat to izmantot šai iesniegšanai.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -5375,7 +5792,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": "Lūdzu, ņemiet vērā, ka augšupielādētie faili kolekcijā {{collectionName}} būs pieejami papildus tam, kas ir skaidri noteikts par atsevišķu failu, ar šādām grupām:",
 
-  // "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": "Šeit atradīsit visus failus, kas pašlaik atrodas materiālā. Varat atjaunināt failu metadatus un piekļuves nosacījumus vai <strong>augšupielādēt papildu failus, vienkārši ievelkot un atstājot tos visur lapā</strong>",
 
   // "submission.sections.upload.no-entry": "No",
@@ -5620,7 +6037,7 @@
 
   // "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",
 
 
 }
diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5
index 1c6d4c7e60..6c8403b972 100644
--- a/src/assets/i18n/nl.json5
+++ b/src/assets/i18n/nl.json5
@@ -1,6003 +1,6417 @@
 {
-  
+
   // "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.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",
-  
-  
-  
+
+
+
   // "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.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.forbidden": "forbidden",
   // TODO New key - Add a translation
   "403.forbidden": "forbidden",
-  
-  
-  
+
+
+
   // "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": "De pagina die u zoekt kan niet gevonden worden. De pagina werd mogelijk verplaatst of verwijderd. U kan onderstaande knop gebruiken om terug naar de homepagina te gaan. ",
-  
+
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Terug naar de homepagina",
-  
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "Pagina niet gevonden",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.title": "System curation tasks",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.header": "System curation tasks",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
+
   // "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.failure.content": "An error occurred while creating the new bitstream format.",
   "admin.registries.bitstream-formats.create.failure.content": "Er is een fout opgetreden bij het maken van het nieuwe bitstream-formaat.",
-  
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Gefaald",
-  
+
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
   "admin.registries.bitstream-formats.create.head": "Maak een bitstream-formaat aan",
-  
+
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
   "admin.registries.bitstream-formats.create.new": "Voeg een nieuw bitstream-formaat toe",
-  
+
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "Het nieuwe bitstream-formaat is aangemaakt.",
-  
+
   // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "Succes",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "Het verwijderen van {{ amount }} forma(a)t(en) is mislukt.",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "Gefaald",
-  
+
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "{{ amount }} Forma(a)t(en) zijn succesvol verwijderd.",
-  
+
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Succes",
-  
+
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "Deze lijst van bitstream-formaten biedt informatie over de formaten die in deze repository zijn toegelaten en op welke manier ze ondersteund worden. De term Bitstream wordt in DSpace gebruikt om een bestand aan te duiden dat samen met metadata onderdeel uitmaakt van een item. De naam bitstream duidt op het feit dat het bestand achterliggend wordt opgeslaan zonder bestandsextensie.",
-  
+
   // "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.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
-  
+
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.description.label": "Beschrijving",
-  
+
   // "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": "Extensies zijn bestandsextensies die worden gebruikt om automatisch het formaat van geuploade bestanden te bepalen. U kunt meerdere extensies voor een formaat invullen.",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "Bestandsextensies",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
   // TODO Source message changed - Revise the translation
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Vul een bestandsextensie toe zonder de punt",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.content": "Er is een fout opgetreden bij het bewerken van het bitstream-formaat.",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Gefaald",
-  
+
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
   "admin.registries.bitstream-formats.edit.head": "Bitstream-formaat: {{ 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": "Formaten die als intern gemarkeerd zijn, worden niet getoond aan de gebruiker en zijn bedoeld voor administratieve doeleinden.",
-  
+
   // "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.",
   "admin.registries.bitstream-formats.edit.mimetype.hint": "Het MIME type dat bij dit formaat hoort. Het hoeft niet uniek te zijn.",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
+
   // "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": "Een unieke naam voor dit formaat (b.v. Microsoft Word XP of Microsoft Word 2000)",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Naam",
-  
+
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
   "admin.registries.bitstream-formats.edit.success.content": "Het bitstream-formaat is bewerkt.",
-  
+
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Succes",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "Het niveau van ondersteuning dat uw instituut belooft te bieden voor dit formaat.",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Ondersteuningsniveau",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "Bitstream-formaat Register",
-  
+
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Geen bitstream-formaten om te tonen.",
-  
+
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Verwijder geselecteerde",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "De-selecteer alle",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "intern",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Naam",
-  
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
+
   // "admin.registries.bitstream-formats.table.return": "Return",
   "admin.registries.bitstream-formats.table.return": "Terug",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Bekend",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Ondersteund",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Onbekend",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Ondersteuningsniveau",
-  
+
   // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Formaat Register",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   // TODO New key - Add a translation
   "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.",
   "admin.registries.metadata.description": "Het metadataregister omvat de lijst van alle metadatavelden die beschikbaar zijn in het systeem. Deze velden kunnen verspreid zijn over verschillende metadataschema's. Het qualified Dublin Core schema (dc) is een verplicht schema en kan niet worden verwijderd.",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "Maak een metadata schema aan",
-  
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "Bewerk een metadata schema",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "Naam",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "Namespace",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Metadataregister",
-  
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Er kunnen geen metadataschema's getoond worden.",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Verwijder geselecteerde",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Naam",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  
+
   // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
   "admin.registries.metadata.title": "DSpace Angular :: Metadataregister",
-  
-  
-  
+
+
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   // TODO New key - Add a translation
   "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Dit is het metadataschema voor \"{{namespace}}\".",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Schema metadatavelden",
-  
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Er kunnen geen metadatavelden getoond worden.",
-  
+
   // "admin.registries.schema.fields.table.delete": "Delete selected",
   "admin.registries.schema.fields.table.delete": "Verwijder geselecteerde",
-  
+
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Veld",
-  
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Opmerking over bereik",
-  
+
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "Maak een metadataveld aan",
-  
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
   "admin.registries.schema.form.edit": "Bewerk metadataveld",
-  
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "Qualifier",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "Opmerking over het bereik",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Metadataschema",
-  
+
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "Metadataschema \"{{prefix}}\" is aangemaakt",
-  
+
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "Het verwijderen van {{amount}} metadataschemas is mislukt",
-  
+
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.success": "{{amount}} Metadataschemas verwijderd",
-  
+
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Metadataschema \"{{prefix}}\" is bewerkt",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Fout",
-  
+
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.created": "Metadataveld \"{{field}}\" is aangemaakt",
-  
+
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "Het verwijderen van {{amount}} metadatavelden is mislukt",
-  
+
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "{{amount}} Metadatavelden verwijderd",
-  
+
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "Metadataveld \"{{field}}\" is bewerkt",
-  
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Succes",
-  
+
   // "admin.registries.schema.return": "Return",
   "admin.registries.schema.return": "Terug",
-  
+
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
   "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Register",
-  
-  
-  
+
+
+
   // "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.impersonate": "Impersonate EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
+
   // "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.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.title": "DSpace Angular :: EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.head": "EPeople",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.head": "Search",
-  
+
   // "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.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.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.button": "Search",
-  
+
   // "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.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.email": "E-mail (exact)",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
+
   // "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{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.form.create": "Create EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.create": "Create EPerson",
-  
+
   // "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.firstName": "First name",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.firstName": "First name",
-  
+
   // "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.email": "E-mail",
   // TODO New key - Add a 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.canLogIn": "Can log in",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.goToGroups": "Add to groups",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
+
   // "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.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.groups.title": "DSpace Angular :: Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
+
   // "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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.head": "Groups",
-  
+
   // "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.search.head": "Search groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.head": "Search groups",
-  
+
   // "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.search.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.button": "Search",
-  
+
   // "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.members": "Members",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.members": "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{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.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.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.content": "Cause: \"{{cause}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.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.edit": "Edit group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.head.edit": "Edit group",
-  
+
   // "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.groupDescription": "Description",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.groupDescription": "Description",
-  
+
   // "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.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.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.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.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.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.actions.delete": "Delete Group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
+
   // "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.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.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.confirm": "Delete",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-subgroups-yet": "No subgroups in group yet.",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.collection.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.collection.edit": "Edit",
-  
+
   // "admin.search.community.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.community.edit": "Edit",
-  
+
   // "admin.search.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.search.item.delete": "Delete",
-  
+
   // "admin.search.item.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.item.edit": "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-public": "Make Public",
   // TODO New key - Add a translation
   "admin.search.item.make-public": "Make Public",
-  
+
   // "admin.search.item.move": "Move",
   // TODO New key - Add a translation
   "admin.search.item.move": "Move",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   // TODO New key - Add a translation
   "admin.search.item.reinstate": "Reinstate",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   // TODO New key - Add a translation
   "admin.search.item.withdraw": "Withdraw",
-  
+
   // "admin.search.title": "Administrative Search",
   // TODO New key - Add a translation
   "admin.search.title": "Administrative Search",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   // TODO New key - Add a translation
   "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.breadcrumbs": "Administer Workflow",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.title": "Administer Workflow",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
-  
+
   // "admin.workflow.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.workflow.item.delete": "Delete",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   // TODO New key - Add a translation
   "admin.workflow.item.send-back": "Send back",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.title": "Import Metadata",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.page.header": "Import Metadata",
-  
+
   // "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.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.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.button.return": "Return",
   // TODO New key - Add a translation
   "admin.metadata-import.page.button.return": "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.error.addFile": "Select file first!",
   // TODO New key - Add a translation
   "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
+
+
+
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Ongeldig e-mailadres of wachtwoord.",
-  
+
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Uw sessie is vervallen. Gelieve opnieuw aan te melden.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   // TODO New key - Add a translation
   "bitstream.edit.bitstream": "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.label": "Description",
   // TODO New key - Add a translation
   "bitstream.edit.form.description.label": "Description",
-  
+
   // "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.label": "Embargo until specific date",
   // TODO New key - Add a translation
   "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
+
   // "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.label": "Filename",
   // TODO New key - Add a translation
   "bitstream.edit.form.fileName.label": "Filename",
-  
+
   // "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.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.primaryBitstream.label": "Primary bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
+
   // "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.label": "Selected Format",
   // TODO New key - Add a translation
   "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
+
   // "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.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.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.title": "Bitstream saved",
   // TODO New key - Add a translation
   "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
+
+
+
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Op auteur",
-  
+
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "Op datum van uitgave",
-  
+
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Op onderwerp",
-  
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Op titel",
-  
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Blader",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "Geen items om te tonen.",
-  
+
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "Auteur",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "Datum van uitgave",
-  
+
   // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "Onderwerp",
-  
+
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Titel",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   // TODO New key - Add a translation
   "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   // TODO New key - Add a translation
   "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Kies begin)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Kies jaar)",
-  
+
   // "browse.startsWith.jump": "Jump to a point in the index:",
   "browse.startsWith.jump": "Ga naar een plaats in de index:",
-  
+
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "April",
-  
+
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "Augustus",
-  
+
   // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "December",
-  
+
   // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "Februari",
-  
+
   // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "Januari",
-  
+
   // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "Juli",
-  
+
   // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "Juni",
-  
+
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "Maart",
-  
+
   // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "Mei",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Kies maand)",
-  
+
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "Oktober",
-  
+
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "September",
-  
+
   // "browse.startsWith.submit": "Go",
   "browse.startsWith.submit": "Ga",
-  
+
   // "browse.startsWith.type_date": "Or type in a date (year-month):",
   "browse.startsWith.type_date": "Of type een datum (jaar-maand):",
-  
+
   // "browse.startsWith.type_text": "Or enter first few letters:",
   "browse.startsWith.type_text": "Or vul de eerste paar letters in:",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title": "Verken {{ collection }} volgens {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Verwijder chip",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Maak een collectie aan",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   // TODO New key - Add a translation
   "collection.create.notifications.success": "Successfully created the Collection",
-  
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Maak een collectie voor de community {{ parent }}",
-  
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
   // TODO New key - Add a translation
   "collection.curate.header": "Curate Collection: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Annuleer",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Bevestig",
-  
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Verwijder Collectie",
-  
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "De collectie kon niet verwijderd worden",
-  
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "De collectie is verwijderd",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "Weet u zeker dat u de collectie \"{{ dso }}\" wilt verwijderen?",
-  
-  
-  
+
+
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Verwijder deze collectie",
-  
+
   // "collection.edit.head": "Edit Collection",
   "collection.edit.head": "Bewerk de collectie",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "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.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Annuleer",
-  
+
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   "collection.edit.item-mapper.collection": "Collectie: \"<b>{{name}}</b>\"",
-  
+
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Map de geselecteerde items",
-  
+
   // "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": "Dit is de item mapper, waarmee collectiebeheerders items van andere collecties kunnen mappen naar deze collectie. U kunt items van andere collecties zoeken en mappen of de bladeren door de lijst met al gemapte items.",
-  
+
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
   "collection.edit.item-mapper.head": "Item mapper - Map items uit andere collecties",
-  
+
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
   "collection.edit.item-mapper.no-search": "Vul een zoekterm in om te zoeken",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.error.content": "Er is een fout opgetreden bij het mappen van {{amount}} items.",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "Mapping fouten ",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.success.content": "Er zijn {{amount}} items gemapt.",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Mapping afgerond",
-  
+
   // "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": "Er zijn fouten opgetreden bij het verwijderen van de mapping van {{amount}} items.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Fouten bij het verwijderen van mappings",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
   "collection.edit.item-mapper.notifications.unmap.success.content": "De mappings van {{amount}} items zijn verwijderd.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Verwijderen van mappings afgerond",
-  
+
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Verwijder de geselecteerde item mappings",
-  
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Blader door gemapte items",
-  
+
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Map nieuwe items",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   // TODO New key - Add a translation
   "collection.edit.logo.label": "Collection logo",
-  
+
   // "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.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.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.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.error.title": "Error deleting logo",
   // TODO New key - Add a translation
   "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+
   // "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.notifications.success": "Successfully edited the Collection",
   // TODO New key - Add a translation
   "collection.edit.notifications.success": "Successfully edited the Collection",
-  
+
   // "collection.edit.return": "Return",
   // TODO New key - Add a translation
   "collection.edit.return": "Return",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "collection.edit.tabs.curate.head": "Curate",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "collection.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "collection.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.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.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.harvestType": "Content being harvested",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
+
   // "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.metadataConfigId": "Metadata Format",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
+
   // "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.oaiSource": "OAI Provider",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
+
   // "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_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_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.head": "Content Source",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.head": "Content Source",
-  
+
   // "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.title": "Changed discarded",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Content Source saved",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
+
   // "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.template.add-button": "Add",
   // TODO New key - Add a translation
   "collection.edit.template.add-button": "Add",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   // TODO New key - Add a translation
   "collection.edit.template.breadcrumbs": "Item template",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.template.cancel": "Cancel",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   // TODO New key - Add a translation
   "collection.edit.template.delete-button": "Delete",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   // TODO New key - Add a translation
   "collection.edit.template.edit-button": "Edit",
-  
+
   // "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.label": "Template item",
   // TODO New key - Add a translation
   "collection.edit.template.label": "Template item",
-  
+
   // "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.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.title": "Edit Template Item",
   // TODO New key - Add a translation
   "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Korte beschrijving",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "Inleidende tekst (HTML)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "Vul alstublieft een collectienaam in",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "Licentie",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "Herkomst",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "Auteursrechten-tekst (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Nieuws (HTML)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "Naam",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   // TODO New key - Add a translation
   "collection.listelement.badge": "Collection",
-  
-  
-  
+
+
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Recent toegevoegd",
-  
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "Geen items om te tonen",
-  
+
   // "collection.page.edit": "Edit this collection",
   // TODO New key - Add a translation
   "collection.page.edit": "Edit this collection",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   "collection.page.handle": "Permanente URI voor deze collectie",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "Licentie",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Nieuws",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Bevestig uw keuze",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Geen collecties om te tonen",
-  
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Titel",
-  
-  
-  
+
+
+
   // "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.title": "Server Error",
   // TODO New key - Add a translation
   "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
+
+
+
   // "communityList.tabTitle": "DSpace - Community List",
   // TODO New key - Add a translation
   "communityList.tabTitle": "DSpace - Community List",
-  
+
   // "communityList.title": "List of Communities",
   // TODO New key - Add a translation
   "communityList.title": "List of Communities",
-  
+
   // "communityList.showMore": "Show More",
   // TODO New key - Add a translation
   "communityList.showMore": "Show More",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Maak een community aan",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   // TODO New key - Add a translation
   "community.create.notifications.success": "Successfully created the Community",
-  
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Maak een sub-community voor community {{ parent }}",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
   // TODO New key - Add a translation
   "community.curate.header": "Curate Community: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Annuleer",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Bevestig",
-  
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Verwijder community",
-  
+
   // "community.delete.notification.fail": "Community could not be deleted",
   "community.delete.notification.fail": "De community kon niet verwijderd worden",
-  
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "Community succesvol verwijderd",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "Weet u zeker dat u community \"{{ dso }}\" wilt verwijderen?",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Verwijder deze community",
-  
+
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Bewerk community",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.breadcrumbs": "Edit Community",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   // TODO New key - Add a translation
   "community.edit.logo.label": "Community logo",
-  
+
   // "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.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.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.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.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.notifications.success": "Successfully edited the Community",
   // TODO New key - Add a translation
   "community.edit.notifications.success": "Successfully edited the Community",
-  
+
   // "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.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "community.edit.tabs.curate.head": "Curate",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "community.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "community.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   // TODO New key - Add a translation
   "community.listelement.badge": "Community",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   // TODO New key - Add a translation
   "comcol-role.edit.no-group": "None",
-  
+
   // "comcol-role.edit.create": "Create",
   // TODO New key - Add a translation
   "comcol-role.edit.create": "Create",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   // TODO New key - Add a translation
   "comcol-role.edit.restrict": "Restrict",
-  
+
   // "comcol-role.edit.delete": "Delete",
   // TODO New key - Add a translation
   "comcol-role.edit.delete": "Delete",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.community-admin.name": "Administrators",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
+
+
   // "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.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.submitters.name": "Submitters",
   // TODO New key - Add a translation
   "comcol-role.edit.submitters.name": "Submitters",
-  
+
   // "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.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.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.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.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.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.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.editor.name": "Editors",
   // TODO New key - Add a translation
   "comcol-role.edit.editor.name": "Editors",
-  
+
   // "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.finaleditor.name": "Final editors",
   // TODO New key - Add a translation
   "comcol-role.edit.finaleditor.name": "Final editors",
-  
+
   // "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.reviewer.name": "Reviewers",
   // TODO New key - Add a translation
   "comcol-role.edit.reviewer.name": "Reviewers",
-  
+
   // "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.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Korte beschrijving",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "Inleidende tekst (HTML)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "Vul alstublieft een communitynaam in",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "Auteursrechten-tekst (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Nieuws (HTML)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "Naam",
-  
+
   // "community.page.edit": "Edit this community",
   // TODO New key - Add a translation
   "community.page.edit": "Edit this community",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   "community.page.handle": "Permanente URI voor deze community",
-  
+
   // "community.page.license": "License",
   "community.page.license": "Licentie",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Nieuws",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Subcommunities en collecties",
-  
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Collecties in deze community",
-  
+
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Communities in deze community",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   // TODO New key - Add a translation
   "cookies.consent.accept-all": "Accept all",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   // TODO New key - Add a translation
   "cookies.consent.accept-selected": "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.title": "(opt-out)",
   // TODO New key - Add a translation
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   // TODO New key - Add a translation
   "cookies.consent.app.purpose": "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.title": "(always required)",
   // TODO New key - Add a translation
   "cookies.consent.app.required.title": "(always required)",
-  
+
   // "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.close": "Close",
   // TODO New key - Add a translation
   "cookies.consent.close": "Close",
-  
+
   // "cookies.consent.decline": "Decline",
   // TODO New key - Add a translation
   "cookies.consent.decline": "Decline",
-  
+
   // "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.learnMore": "Customize",
   // TODO New key - Add a translation
   "cookies.consent.content-notice.learnMore": "Customize",
-  
+
   // "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.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.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.title": "Information that we collect",
   // TODO New key - Add a translation
   "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   // TODO New key - Add a translation
   "cookies.consent.app.title.authentication": "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.title.preferences": "Preferences",
   // TODO New key - Add a translation
   "cookies.consent.app.title.preferences": "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.title.acknowledgement": "Acknowledgement",
   // TODO New key - Add a translation
   "cookies.consent.app.title.acknowledgement": "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.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.purpose.functional": "Functional",
   // TODO New key - Add a translation
   "cookies.consent.purpose.functional": "Functional",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   // TODO New key - Add a translation
   "cookies.consent.purpose.statistical": "Statistical",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
+
   // "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.requiredmetadata.label": "Check for Required Metadata",
   // TODO New key - Add a translation
   "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   // TODO New key - Add a translation
   "curation-task.task.translate.label": "Microsoft Translator",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   // TODO New key - Add a translation
   "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   // TODO New key - Add a translation
   "curation.form.task-select.label": "Task:",
-  
+
   // "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.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.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.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.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)",
   // 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)",
-  
-  
-  
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nieuwe collectie",
-  
+
   // "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.community.head": "New community",
   "dso-selector.create.community.head": "Nieuwe community",
-  
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Maak een nieuwe community in",
-  
+
   // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "Maak een nieuwe community op het hoogste niveau",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Nieuw item",
-  
+
   // "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.submission.head": "New submission",
   // TODO New key - Add a translation
   "dso-selector.create.submission.head": "New submission",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Bewerk collectie",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "Bewerk community",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Bewerk item",
-  
+
   // "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.no-results": "No {{ type }} found",
   "dso-selector.no-results": "Geen {{ type }} gevonden",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Zoek een {{ type }}",
-  
-  
-  
+
+
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.cancel": "Cancel",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.confirm": "Export",
-  
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   // TODO New key - Add a translation
   "error.bitstream": "Error fetching bitstream",
-  
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Fout bij het ophalen van items",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "Fout bij het ophalen van een collectie",
-  
+
   // "error.collections": "Error fetching collections",
   "error.collections": "Fout bij het ophalen van de collecties",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "Fout bij het ophalen van een community",
-  
+
   // "error.identifier": "No item found for the identifier",
   "error.identifier": "Geen item gevonden voor deze identifier",
-  
+
   // "error.default": "Error",
   "error.default": "Fout",
-  
+
   // "error.item": "Error fetching item",
   "error.item": "Fout bij het ophalen van het item",
-  
+
   // "error.items": "Error fetching items",
   "error.items": "Fout bij het ophalen van items",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "Fout bij het ophalen van objecten",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "Fout bij het ophalen van recent toegevoegde items",
-  
+
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Fout bij het ophalen van zoekresultaten",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Fout bij het ophalen van sub-collecties",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   "error.sub-communities": "Fout bij het ophalen van 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>",
   "error.submission.sections.init-form-error": "Er is een fout opgetreden bij het initialiseren van deze sectie. Controleer de configuratie van het invoerformulier. Details: <br> <br>",
-  
+
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Fout bij het inladen van communities op het hoogste niveau",
-  
+
   // "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": "U moet de invoerlicentie goedkeuren om de invoer af te werken. Indien u deze licentie momenteel niet kan of mag goedkeuren, kunt u uw werk opslaan en de invoer later afwerken. U kunt dit nieuwe item ook verwijderen indien u niet voldoet aan de vereisten van de invoerlicentie.",
-  
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Deze invoer wordt ingeperkt door dit patroon: {{ pattern }}.",
-  
+
   // "error.validation.filerequired": "The file upload is mandatory",
   // TODO New key - Add a translation
   "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
+
+
+
   // "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",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "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.privacy-policy": "Privacy policy",
   // 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.end-user-agreement": "End User Agreement",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-email.form.header": "Forgot Password",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "forgot-email.form.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Submit",
   // TODO New key - Add a translation
   "forgot-email.form.submit": "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.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-password.title": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.title": "Forgot Password",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.form.head": "Forgot Password",
-  
+
   // "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.card.security": "Security",
   // TODO New key - Add a translation
   "forgot-password.form.card.security": "Security",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   // TODO New key - Add a translation
   "forgot-password.form.identification.header": "Identify",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   // TODO New key - Add a translation
   "forgot-password.form.identification.email": "Email address: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   // TODO New key - Add a translation
   "forgot-password.form.label.password": "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.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.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.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.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.title": "Password reset completed",
   // TODO New key - Add a translation
   "forgot-password.form.notification.success.title": "Password reset completed",
-  
+
   // "forgot-password.form.submit": "Submit password",
   // TODO New key - Add a translation
   "forgot-password.form.submit": "Submit password",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   // TODO New key - Add a translation
   "form.add": "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.cancel": "Cancel",
   "form.cancel": "Annuleer",
-  
+
   // "form.clear": "Clear",
   "form.clear": "Maak leeg",
-  
+
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Klik hier om de geselecteerde waarde the verwijderen",
-  
+
   // "form.edit": "Edit",
   "form.edit": "Bewerk",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "Klik hier om de geselecteerde waarde te bewerken",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "Voornaam",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Inklappen",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Klik hier op in te klappen",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "Uitklappen",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "Klik hier om uit te klappen en om meer onderdelen toe te voegen",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "Achternaam",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "Inladen...",
-  
+
   // "form.lookup": "Lookup",
   // TODO New key - Add a translation
   "form.lookup": "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.no-results": "No results found",
   "form.no-results": "Geen resultaten gevonden",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Geen waarde ingevoerd",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "Verwijder",
-  
+
   // "form.save": "Save",
   "form.save": "Bewaar",
-  
+
   // "form.save-help": "Save changes",
   "form.save-help": "Veranderingen opslaan",
-  
+
   // "form.search": "Search",
   "form.search": "Zoek",
-  
+
   // "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.submit": "Submit",
   "form.submit": "Verstuur",
-  
-  
-  
+
+
+
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   // TODO New key - Add a translation
   "home.breadcrumbs": "Home",
-  
+
   // "home.title": "DSpace Angular :: Home",
   "home.title": "DSpace Angular :: Home",
-  
+
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Communities in DSpace",
-  
+
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Selecteer een community om diens collecties te verkennen.",
-  
-  
-  
+
+
+
   // "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.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.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.breadcrumbs": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
+
   // "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.save": "Save",
   // TODO New key - Add a translation
   "info.end-user-agreement.buttons.save": "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.title": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.title": "End User Agreement",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.breadcrumbs": "Privacy Statement",
-  
+
   // "info.privacy.head": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.head": "Privacy Statement",
-  
+
   // "info.privacy.title": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.title": "Privacy Statement",
-  
-  
-  
+
+
+
   // "item.alerts.private": "This item is private",
   // TODO New key - Add a translation
   "item.alerts.private": "This item is private",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   // TODO New key - Add a translation
   "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
+
+
+
   // "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.title": "Edit item's Policies",
   // TODO New key - Add a translation
   "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   // TODO New key - Add a translation
   "item.badge.private": "Private",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle": "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.new": "Create bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle.new": "Create bundle",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "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": "This item doesn't contain any bundles to upload a bitstream to.",
+
   // "item.bitstreams.upload.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.bitstreams.upload.cancel": "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.item": "Item: ",
   // TODO New key - Add a translation
   "item.bitstreams.upload.item": "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.title": "Created bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
+
   // "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.title": "Upload bitstream",
   // TODO New key - Add a translation
   "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
+
+
+
   // "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.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.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.more": "Load more",
   // TODO New key - Add a translation
   "item.edit.bitstreams.bundle.load.more": "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.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.bitstreams.discard-button": "Discard",
-  
+
   // "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.drag": "Drag",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.drag": "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.remove": "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.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.headers.actions": "Actions",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.description": "Description",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.name": "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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Move changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
+
   // "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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.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.title": "Removal changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.bitstreams.reinstate-button": "Undo",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.bitstreams.save-button": "Save",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   // TODO New key - Add a translation
   "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Annuleer",
-  
+
   // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "Verwijder",
-  
+
   // "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": "Weet u zeker dat dit item geheel verwijderd moet worden? Pas op: er zal geen tombstone overblijven.",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Er is een fout opgetreden bij het verwijderen van het item",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "Verwijder item: {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "Het item is verwijderd",
-  
+
   // "item.edit.head": "Edit Item",
   "item.edit.head": "Bewerk item",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.breadcrumbs": "Edit Item",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "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.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Map dit item naar de geselecteerde collecties",
-  
+
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "Verwijder de mapping van de item naar de geselecteerde collecties",
-  
+
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Annuleer",
-  
+
   // "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": "Dit is de item mapper, waarmee collectiebeheerders dit item kunnen mappen naar andere collecties. U kunt collecties zoeken en mappen of bladeren door de lijst waar dit item al naar is gemapt.",
-  
+
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Item mapper - Map een item naar collecties",
-  
+
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  
+
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Vul een zoekterm in om te zoeken",
-  
+
   // "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": "Er zijn fouten opgetreden bij het mappen van het item naar {{amount}} collecties.",
-  
+
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Mapping fouten",
-  
+
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.success.content": "Het item is naar {{amount}} collecties gemapt.",
-  
+
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Mapping afgerond",
-  
+
   // "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": "Er zijn fouten opgetreden bij het verwijderen van de mapping naar {{amount}} collecties.",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "Fouten bij het verwijderen van mappings",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.remove.success.content": "De mapping van dit item naar {{amount}} collecties is verwijderd.",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Verwijderen van mapping afgerond",
-  
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Blader door gemapte collecties",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Map een nieuwe collectie",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Voeg toe",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Annuleer",
-  
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Bewerk",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Verwijder",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "Maak wijzigingen ongedaan",
-  
+
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Stop met bewerken",
-  
+
   // "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.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Bewerk",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   "item.edit.metadata.headers.field": "Veld",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Taal",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Waarde",
-  
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Kies een geldig metadataveld",
-  
+
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Uw wijzigingen zijn geannuleerd. Klik 'maak ongedaan' om ze terug te halen.",
-  
+
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
   "item.edit.metadata.notifications.discarded.title": "Wijzingen geannuleerd",
-  
+
   // "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.invalid.content": "Your changes were not saved. Please make sure all fields are valid before you save.",
   "item.edit.metadata.notifications.invalid.content": "Uw wijzingen zijn niet opgeslagen. Controleer of alle velden geldig zijn voor u opslaat.",
-  
+
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Ongeldige 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",
   "item.edit.metadata.notifications.outdated.content": "Het item waar u aan werkt is gewijzigd door een andere gebruiker. Uw huidige wijzigingen worden geannuleerd om conflicten te voorkomen.",
-  
+
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
   "item.edit.metadata.notifications.outdated.title": "Wijzigingen verouderd",
-  
+
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
   "item.edit.metadata.notifications.saved.content": "Uw wijzingen in de metadata van dit item zijn opgeslagen.",
-  
+
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadata opgeslagen",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Maak ongedaan",
-  
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Opslaan",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Veld",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "Taal",
-  
+
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Waarde",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   "item.edit.move.cancel": "Annuleer",
-  
+
   // "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": "Kies de collectie waar u dit item naartoe wilt verplaatsen. Om de lijst met collecties in te perken kunt een zoekterm invullen in het zoekveld.",
-  
+
   // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "Er is een fout opgetreden bij het verplaatsen van het item",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "Verplaats item: {{id}}",
-  
+
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Erf policies",
-  
+
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Neem de standaard policies van de doelcollectie over",
-  
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Verplaats",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "Bezig ...",
-  
+
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Vul een zoekterm in om collecties te zoeken",
-  
+
   // "item.edit.move.success": "The item has been moved successfully",
   "item.edit.move.success": "Het item is verplaatst",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Verplaats item",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "Annuleer",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   "item.edit.private.confirm": "Maak privé",
-  
+
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
   "item.edit.private.description": "Weet u zeker dat dit item privé moet worden in het archief?",
-  
+
   // "item.edit.private.error": "An error occurred while making the item private",
   "item.edit.private.error": "Er is een fout opgetreden bij het privé maken van het item",
-  
+
   // "item.edit.private.header": "Make item private: {{ id }}",
   "item.edit.private.header": "Maak item privé: {{ id }}",
-  
+
   // "item.edit.private.success": "The item is now private",
   "item.edit.private.success": "Dit item is nu privé",
-  
-  
-  
+
+
+
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "Annuleer",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   "item.edit.public.confirm": "Maak openbaar",
-  
+
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
   "item.edit.public.description": "Weet u zeker dat dit item openbaar moet worden in het archief?",
-  
+
   // "item.edit.public.error": "An error occurred while making the item public",
   "item.edit.public.error": "Er is een fout opgetreden bij het openbaar maken van het item",
-  
+
   // "item.edit.public.header": "Make item public: {{ id }}",
   "item.edit.public.header": "Maak item openbaar: {{ id }}",
-  
+
   // "item.edit.public.success": "The item is now public",
   "item.edit.public.success": "Het item is nu openbaar",
-  
-  
-  
+
+
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Annuleer",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "Zet terug",
-  
+
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "Weet u zeker dat dit item weer teruggezet moet worden in het archief?",
-  
+
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Er is een fout opgetreden bij het terugzetten van het item",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "Zet item terug: {{ id }}",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Het item is teruggezet",
-  
-  
-  
+
+
+
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Annuleer",
-  
+
   // "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.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Verwijder",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
   "item.edit.relationships.edit.buttons.undo": "Maak wijzigingen ongedaan",
-  
+
   // "item.edit.relationships.no-relationships": "No relationships",
   // TODO New key - Add a translation
   "item.edit.relationships.no-relationships": "No relationships",
-  
+
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.relationships.notifications.discarded.content": "Uw wijzigingen zijn ongedaan gemaakt. Klik 'maak ongedaan' om ze weer terug te halen.",
-  
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Wijzingen geannuleerd",
-  
+
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   // TODO Source message changed - Revise the translation
   "item.edit.relationships.notifications.failed.title": "Er is een fout opgetreden bij het verwijderen van een relatie",
-  
+
   // "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": "Het item waar u aan werkt is gewijzigd door een andere gebruiker. Uw huidige wijzigingen zijn ongedaan gemaakt om conflicten te voorkomen.",
-  
+
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Wijzingen verouderd",
-  
+
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
   "item.edit.relationships.notifications.saved.content": "Uw wijzingen in de relaties van dit item zijn opgeslagen.",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "Relaties opgeslagen",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "Maak ongedaan",
-  
+
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Opslaan",
-  
+
   // "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.tabs.bitstreams.head": "Bitstreams",
   // TODO Source message changed - Revise the translation
   "item.edit.tabs.bitstreams.head": "Item bitstreams",
-  
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Item bewerken - Bitstreams",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Beheer",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Item bewerken - Beheer",
-  
+
   // "item.edit.tabs.metadata.head": "Metadata",
   // TODO Source message changed - Revise the translation
   "item.edit.tabs.metadata.head": "Item metadata",
-  
+
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
   "item.edit.tabs.metadata.title": "Item bewerken -  Metadata",
-  
+
   // "item.edit.tabs.relationships.head": "Relationships",
   // TODO Source message changed - Revise the translation
   "item.edit.tabs.relationships.head": "Item relaties",
-  
+
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "Item bewerken - relaties",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Autorisaties ..",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
   "item.edit.tabs.status.buttons.authorizations.label": "Bewerk de autorisatieregels",
-  
+
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
   "item.edit.tabs.status.buttons.delete.button": "Permanent verwijderen",
-  
+
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Verwijderen het item geheel",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.button": "Gemapte collecties",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Beheer gemapte collecties",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Verplaats ..",
-  
+
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Verplaats het item naar een andere collectie",
-  
+
   // "item.edit.tabs.status.buttons.private.button": "Make it private...",
   "item.edit.tabs.status.buttons.private.button": "Maak privé ...",
-  
+
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
   "item.edit.tabs.status.buttons.private.label": "Maak het item privé",
-  
+
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
   "item.edit.tabs.status.buttons.public.button": "Maak openbaar ..",
-  
+
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
   "item.edit.tabs.status.buttons.public.label": "Maak het item openbaar",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Zet terug ...",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Zet het item terug in het repository",
-  
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Trek terug ...",
-  
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "onttrek hierdie item",
+
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Trek het item terug uit het repository",
-  
+
   // "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": "Welkom op de itembeheerpagina. Hier kunt u het item terugtrekken, terugzetten, verplaatsen of verwijderen. Onder de andere tabbladen kunt u metadata / bitstreams bewerken of toevoegen.",
-  
+
   // "item.edit.tabs.status.head": "Status",
   // TODO Source message changed - Revise the translation
   "item.edit.tabs.status.head": "Item status",
-  
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Handle",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Intern Item ID",
-  
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Itempagina",
-  
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Laatst gewijzigd",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "Item bewerken -  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.title": "Item Edit - Version History",
   // TODO New key - Add a translation
   "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
+
   // "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.view.head": "View Item",
   "item.edit.tabs.view.head": "Bekijk het item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Item bewerken -  Bekijk",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Annuleer",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "Trek terug",
-  
+
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "Weet u zeker dat dit item uit het archief moet worden teruggetrokken?",
-  
+
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Er is een fout opgetreden bij het terugtrekken van het item",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "Item terugtrekken: {{ id }}",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Het item is teruggetrokken",
-  
-  
-  
+
+
+
   // "item.listelement.badge": "Item",
   // TODO New key - Add a translation
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   // TODO New key - Add a translation
   "item.page.description": "Description",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "item.page.journal-issn": "Journal ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "item.page.journal-title": "Journal Title",
-  
+
   // "item.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "item.page.publisher": "Publisher",
-  
+
   // "item.page.titleprefix": "Item: ",
   // TODO New key - Add a translation
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "item.page.volume-title": "Volume Title",
-  
+
   // "item.search.results.head": "Item Search Results",
   // TODO New key - Add a translation
   "item.search.results.head": "Item Search Results",
-  
+
   // "item.search.title": "DSpace Angular :: Item Search",
   // TODO New key - Add a translation
   "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Abstract",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Auteur",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "Citeren als",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Collecties",
-  
+
   // "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.files": "Files",
   "item.page.files": "Bestanden",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Beschrijving:",
-  
+
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "Download",
-  
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Formaat:",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "Naam:",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Grootte:",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Artikelen in dit tijdschrift",
-  
+
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "Volledige itemweergave",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Eenvoudige itemweergave",
-  
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Artikelen van deze auteur",
-  
+
   // "item.page.related-items.view-more": "Show {{ amount }} more",
   // TODO Source message changed - Revise the translation
   "item.page.related-items.view-more": "Bekijk meer",
-  
+
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
   // TODO Source message changed - Revise the translation
   "item.page.related-items.view-less": "Bekijk minder",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isAuthorOfPublication": "Publications",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isJournalOfPublication": "Publications",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "Trefwoorden",
-  
+
   // "item.page.uri": "URI",
   "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.collapse": "Collapse",
   // TODO New key - Add a translation
   "item.page.bitstreams.collapse": "Collapse",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
-  
+  "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.filesection.license.bundle": "License bundle",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.uri": "Identifier:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   // TODO New key - Add a translation
   "item.preview.dc.contributor.author": "Authors:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   // TODO New key - Add a translation
   "item.preview.dc.date.issued": "Published date:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   // TODO New key - Add a translation
   "item.preview.dc.description.abstract": "Abstract:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.other": "Other identifier:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   // TODO New key - Add a translation
   "item.preview.dc.language.iso": "Language:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   // TODO New key - Add a translation
   "item.preview.dc.subject": "Subjects:",
-  
+
   // "item.preview.dc.title": "Title:",
   // TODO New key - Add a translation
   "item.preview.dc.title": "Title:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   // TODO New key - Add a translation
   "item.preview.person.familyName": "Surname:",
-  
+
   // "item.preview.person.givenName": "Name:",
   // TODO New key - Add a translation
   "item.preview.person.givenName": "Name:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Bevestig selectie",
-  
+
   // "item.select.empty": "No items to show",
   "item.select.empty": "Geen items om te tonen",
-  
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Auteur",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "Collectie",
-  
+
   // "item.select.table.title": "Title",
   "item.select.table.title": "Titel",
-  
-  
+
+
   // "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.head": "Version History",
   // TODO New key - Add a translation
   "item.version.history.head": "Version History",
-  
+
   // "item.version.history.return": "Return",
   // TODO New key - Add a translation
   "item.version.history.return": "Return",
-  
+
   // "item.version.history.selected": "Selected version",
   // TODO New key - Add a translation
   "item.version.history.selected": "Selected version",
-  
+
   // "item.version.history.table.version": "Version",
   // TODO New key - Add a translation
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
   // TODO New key - Add a translation
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   // TODO New key - Add a translation
   "item.version.history.table.editor": "Editor",
-  
+
   // "item.version.history.table.date": "Date",
   // TODO New key - Add a translation
   "item.version.history.table.date": "Date",
-  
+
   // "item.version.history.table.summary": "Summary",
   // TODO New key - Add a translation
   "item.version.history.table.summary": "Summary",
-  
-  
-  
+
+
+
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   // 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>.",
-  
-  
-  
+
+
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Tijdschrift",
-  
+
   // "journal.page.description": "Description",
   "journal.page.description": "Beschrijving",
-  
+
   // "journal.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journal.page.edit": "Edit this item",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Hoofdredacteur",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Uitgever",
-  
+
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Tijdschrift: ",
-  
+
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Tijdschrift zoekresultaten",
-  
+
   // "journal.search.title": "DSpace Angular :: Journal Search",
   "journal.search.title": "DSpace Angular :: Tijdschrift zoeken",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Tijdschriftaflevering",
-  
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Beschrijving",
-  
+
   // "journalissue.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalissue.page.edit": "Edit this item",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Datum van uitgave",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "Tijdschrift ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   "journalissue.page.journal-title": "Tijdschrifttitel",
-  
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "Trefwoorden",
-  
+
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Nummer",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Tijdschriftaflevering: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Tijdschriftjaargang",
-  
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Beschrijving",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalvolume.page.edit": "Edit this item",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Datum van uitgave",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   "journalvolume.page.titleprefix": "Tijdschriftjaargang: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Jaargang",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   // TODO New key - Add a translation
   "loading.bitstream": "Loading bitstream...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   // TODO New key - Add a translation
   "loading.bitstreams": "Loading bitstreams...",
-  
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Items worden ingeladen...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Pagina wordt ingeladen...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "Collectie wordt ingeladen...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "Collecties worden ingeladen...",
-  
+
   // "loading.content-source": "Loading content source...",
   // TODO New key - Add a translation
   "loading.content-source": "Loading content source...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "Community wordt ingeladen...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "Laden...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "Item wordt ingeladen...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "Items worden ingeladen...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "Items worden ingeladen...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "Laden...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "Recent toegevoegde items worden ingeladen...",
-  
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "Zoekresultaten worden ingeladen...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "De sub-collecties worden ingeladen...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   "loading.sub-communities": "De sub-communities worden ingeladen...",
-  
+
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Inladen van de communities op het hoogste niveau...",
-  
-  
-  
+
+
+
   // "login.form.email": "Email address",
   "login.form.email": "Email adres",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "Bent u uw wachtwoord vergeten?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Gelieve in te loggen in DSpace",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Nieuwe gebruiker? Gelieve u hier te registreren",
-  
+
   // "login.form.or-divider": "or",
   // TODO New key - Add a translation
   "login.form.or-divider": "or",
-  
+
   // "login.form.password": "Password",
   "login.form.password": "Wachtwoord",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   // TODO New key - Add a translation
   "login.form.shibboleth": "Log in with Shibboleth",
-  
+
   // "login.form.submit": "Log in",
   "login.form.submit": "Aanmelden",
-  
+
   // "login.title": "Login",
   "login.title": "Aanmelden",
-  
+
   // "login.breadcrumbs": "Login",
   // TODO New key - Add a translation
   "login.breadcrumbs": "Login",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "Afmelden in DSpace",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Afmelden",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Afmelden",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   "menu.header.admin": "Beheer",
-  
+
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Repository logo",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Toegangscontrole",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorisaties",
-  
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Groepen",
-  
+
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Personen",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Verslagen",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Gefilterde collecties",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Metagegevensquery",
+
   // "menu.section.admin_search": "Admin Search",
   // TODO New key - Add a translation
   "menu.section.admin_search": "Admin Search",
-  
-  
-  
+
+
+
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Deze community",
-  
+
   // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "Op auteur",
-  
+
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "Op datum van uitgave",
-  
+
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Op titel",
-  
+
   // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "Heel DSpace",
-  
+
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "Op auteur",
-  
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "Op datum van uitgave",
-  
+
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Op onderwerp",
-  
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Op titel",
-  
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Communities & Collecties",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Controlepaneel",
-  
+
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Beheertaak",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Bewerk",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Collectie",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "Community",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "menu.section.export": "Export",
   "menu.section.export": "Exporteer",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "Collectie",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "Community",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Menusectie toegangscontrole",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "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.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Menusectie controlepaneel",
-  
+
   // "menu.section.icon.curation_task": "Curation Task menu section",
   "menu.section.icon.curation_task": "Menusectie beheertaken",
-  
+
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Menusectie bewerkingen",
-  
+
   // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "Menusectie export",
-  
+
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Menusectie vinden",
-  
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Menusectie import",
-  
+
   // "menu.section.icon.new": "New menu section",
   "menu.section.icon.new": "Menusectie nieuw",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Zijbalk vastzetten",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   // TODO New key - Add a translation
   "menu.section.icon.processes": "Processes menu section",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Menusectie registers",
-  
+
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "Menusectie statistiektaken",
-  
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Zijbalk losmaken",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Batch import (ZIP)",
-  
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.new": "New",
   "menu.section.new": "Nieuw",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Collectie",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "Community",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   "menu.section.new_item_version": "Item versie",
-  
+
   // "menu.section.new_process": "Process",
   // TODO New key - Add a translation
   "menu.section.new_process": "Process",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Zijbalk vastzetten",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Zijbalk losmaken",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   // TODO New key - Add a translation
   "menu.section.processes": "Processes",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Registers",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formaten",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Statistieken",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Statistiektaken",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Sectie Toegangscontrole aan/uit",
-  
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Sectie Controlepaneel aan/uit",
-  
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "Sectie Beheertaken aan/uit",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Sectie Bewerk aan/uit",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "Sectie Export aan/uit",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "Sectie Vind aan/uit",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "Sectie Import aan/uit",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "Sectie Nieuw aan/uit",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Sectie registers aan/uit",
-  
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "Sectie statistiektaken aan/uit",
-  
-  
+
+
   // "menu.section.workflow": "Administer Workflow",
   // TODO New key - Add a translation
   "menu.section.workflow": "Administer Workflow",
-  
-  
+
+
   // "mydspace.description": "",
   "mydspace.description": "",
-  
+
   // "mydspace.general.text-here": "here",
   // TODO Source message changed - Revise the translation
   "mydspace.general.text-here": "HIER",
-  
+
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Kies deze optie om een bericht te sturen naar de indiener van het item.",
-  
+
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": " Vul hier uw bericht in...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "Verberg bericht",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "Markeer als gelezen",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "Markeer als ongelezen",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Geen inhoud.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Nog geen berichten.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "Verstuur",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "Toon bericht",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "Onderwerp...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "Kies deze optie om een bericht te sturen naar de controlleur.",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Berichten",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "Aan",
-  
+
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "Nieuwe 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-short": "Import metadata",
   // TODO New key - Add a translation
   "mydspace.new-submission-external-short": "Import metadata",
-  
+
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "Uw submissions",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Geen abstract",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "Geen auteurs",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   "mydspace.results.no-collections": "Geen collecties",
-  
+
   // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "Geen datum",
-  
+
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Geen bestanden",
-  
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "Er zijn geen items om getoond te worden",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Geen titel",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Geen URI",
-  
+
   // "mydspace.show.workflow": "All tasks",
   "mydspace.show.workflow": "Alle taken",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Uw Submissions",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Opgeslagen",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validatie",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Wachten op controlleur",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Workflow",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Workspace",
-  
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Opgeslagen",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Validatie",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Wachten op controlleur",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Workspace",
+
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
-  
+
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Er is een fout opgetreden bij het aanmaken van de nieuwe workspace. Controleer alstublieft de inhoud voordat u het opnieuw probeert.",
-  
+
   // "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-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-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} nieuwe workspace items aangemaakt.",
-  
+
   // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
   "mydspace.upload.upload-successful": "Nieuw workspace item aangemaakt. Klik {{here}} om het te bewerken.",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Bekijk",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "Heel DSpace",
-  
+
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Per community",
-  
+
   // "nav.language": "Language switch",
   "nav.language": "Verander van taal",
-  
+
   // "nav.login": "Log In",
   "nav.login": "Log In",
-  
+
   // "nav.logout": "Log Out",
   "nav.logout": "Log Uit",
-  
+
   // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
   // TODO New key - Add a translation
   "nav.profile": "Profile",
-  
+
   // "nav.search": "Search",
   "nav.search": "Zoek",
-  
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Statistieken",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   // TODO New key - Add a translation
   "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organisatie-onderdeel",
-  
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Plaats",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "Land",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Stichtingsdatum",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "Beschrijving",
-  
+
   // "orgunit.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "orgunit.page.edit": "Edit this item",
-  
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Organisatie-onderdeel: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Resultaten per pagina",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} van {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Resultaten ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Sorteermogelijkheden",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Persoon",
-  
+
   // "person.listelement.no-title": "No name found",
   // TODO New key - Add a translation
   "person.listelement.no-title": "No name found",
-  
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Geboortedatum",
-  
+
   // "person.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "person.page.edit": "Edit this item",
-  
+
   // "person.page.email": "Email Address",
   "person.page.email": "Emailadres",
-  
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "Voornaam",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "Functie",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Achternaam",
-  
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Toon alle metadata",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "Personeels-ID",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "Persoon: ",
-  
+
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Zoekresultaten Persoon",
-  
+
   // "person.search.title": "DSpace Angular :: Person Search",
   "person.search.title": "DSpace Angular :: Persoon zoeken",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   // TODO New key - Add a translation
   "process.new.select-parameters": "Parameters",
-  
+
   // "process.new.cancel": "Cancel",
   // TODO New key - Add a translation
   "process.new.cancel": "Cancel",
-  
+
   // "process.new.submit": "Submit",
   // TODO New key - Add a translation
   "process.new.submit": "Submit",
-  
+
   // "process.new.select-script": "Script",
   // TODO New key - Add a translation
   "process.new.select-script": "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.required": "Script is required",
   // TODO New key - Add a translation
   "process.new.select-script.required": "Script is 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.required": "Please select a file",
   // TODO New key - Add a translation
   "process.new.parameter.file.required": "Please select a file",
-  
+
   // "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.type.value": "value",
   // TODO New key - Add a translation
   "process.new.parameter.type.value": "value",
-  
+
   // "process.new.parameter.type.file": "file",
   // TODO New key - Add a translation
   "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.notification.success.title": "Success",
   // TODO New key - Add a translation
   "process.new.notification.success.title": "Success",
-  
+
   // "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.error.title": "Error",
   // TODO New key - Add a translation
   "process.new.notification.error.title": "Error",
-  
+
   // "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.header": "Create a new process",
   // TODO New key - Add a translation
   "process.new.header": "Create a new process",
-  
+
   // "process.new.title": "Create a new process",
   // TODO New key - Add a translation
   "process.new.title": "Create a new process",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   // TODO New key - Add a translation
   "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
-  
+  "process.detail.arguments": "Arguments",
+
   // "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": "This process doesn't contain any arguments",
+
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
-  
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
   "process.detail.logs.button": "Retrieve process output",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   // TODO New key - Add a translation
   "process.detail.logs.loading": "Retrieving",
-  
+
   // "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.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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
-  
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
+  "process.detail.end-time": "Finish time",
+
   // "process.detail.status" : "Status",
   // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
+  "process.detail.status": "Status",
+
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
+  "process.detail.create": "Create similar process",
+
+
+
   // "process.overview.table.finish" : "Finish time",
   // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
+  "process.overview.table.finish": "Finish time",
+
   // "process.overview.table.id" : "Process ID",
   // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
+  "process.overview.table.id": "Process ID",
+
   // "process.overview.table.name" : "Name",
   // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name": "Name",
+
   // "process.overview.table.start" : "Start time",
   // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
-  
+  "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.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.title": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.title": "Processes Overview",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.breadcrumbs": "Processes Overview",
-  
+
   // "process.overview.new": "New",
   // TODO New key - Add a translation
   "process.overview.new": "New",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   // TODO New key - Add a translation
   "profile.breadcrumbs": "Update Profile",
-  
+
   // "profile.card.identify": "Identify",
   // TODO New key - Add a translation
   "profile.card.identify": "Identify",
-  
+
   // "profile.card.security": "Security",
   // TODO New key - Add a translation
   "profile.card.security": "Security",
-  
+
   // "profile.form.submit": "Update Profile",
   // TODO New key - Add a translation
   "profile.form.submit": "Update Profile",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   // TODO New key - Add a translation
   "profile.groups.head": "Authorization groups you belong to",
-  
+
   // "profile.head": "Update Profile",
   // TODO New key - Add a translation
   "profile.head": "Update Profile",
-  
+
   // "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.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.label.email": "Email Address",
   // TODO New key - Add a translation
   "profile.metadata.form.label.email": "Email Address",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   // TODO New key - Add a translation
   "profile.metadata.form.label.firstname": "First Name",
-  
+
   // "profile.metadata.form.label.language": "Language",
   // TODO New key - Add a translation
   "profile.metadata.form.label.language": "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.phone": "Contact Telephone",
   // TODO New key - Add a translation
   "profile.metadata.form.label.phone": "Contact Telephone",
-  
+
   // "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.title": "Profile saved",
   // TODO New key - Add a translation
   "profile.metadata.form.notifications.success.title": "Profile saved",
-  
+
   // "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.title": "No changes",
   // TODO New key - Add a translation
   "profile.notifications.warning.no-changes.title": "No changes",
-  
+
   // "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.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.label.password": "Password",
   // TODO New key - Add a translation
   "profile.security.form.label.password": "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.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.title": "Password saved",
   // TODO New key - Add a translation
   "profile.security.form.notifications.success.title": "Password saved",
-  
+
   // "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.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.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.title": "Update Profile",
   // TODO New key - Add a translation
   "profile.title": "Update Profile",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Onderzoeksproject",
-  
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Contributors",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "Beschrijving",
-  
+
   // "project.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "project.page.edit": "Edit this item",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Verwachte afronding",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "Funders",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "ID",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Trefwoorden",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "Status",
-  
+
   // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "Onderzoeksproject: ",
-  
+
   // "project.search.results.head": "Project Search Results",
   // TODO New key - Add a translation
   "project.search.results.head": "Project Search Results",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publicatie",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "Beschrijving",
-  
+
   // "publication.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "publication.page.edit": "Edit this item",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "Tijdschrift ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   "publication.page.journal-title": "Tijdschrifttitel",
-  
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Uitgever",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publicatie: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Jaargangtitel",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Publicatie zoekresultaten",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   "publication.search.title": "DSpace Angular :: Publicatie zoeken",
-  
-  
+
+
   // "register-email.title": "New user registration",
   // TODO New key - Add a translation
   "register-email.title": "New user registration",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   // TODO New key - Add a translation
   "register-page.create-profile.header": "Create Profile",
-  
+
   // "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.email": "Email Address",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.email": "Email Address",
-  
+
   // "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.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.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.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.contact": "Contact Telephone",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.contact": "Contact Telephone",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.language": "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.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.label.password": "Password *",
   // TODO New key - Add a translation
   "register-page.create-profile.security.label.password": "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.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.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.submit": "Complete Registration",
   // TODO New key - Add a translation
   "register-page.create-profile.submit": "Complete Registration",
-  
+
   // "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.head": "Registration failed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.error.head": "Registration failed",
-  
+
   // "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.head": "Registration completed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   // TODO New key - Add a translation
   "register-page.registration.header": "New user registration",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "register-page.registration.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Register",
   // TODO New key - Add a translation
   "register-page.registration.submit": "Register",
-  
+
   // "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.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.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.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 }}",
-  
-  
-  
+
+
+
   // "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.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.title": "Unable to add relationship",
   // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
-  
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Auteurs",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.Person": "Authors (persons)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Tijdschriftafleveringen",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Tijdschriftaflevering",
-  
+
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Tijdschriften",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Organisatie-onderdelen",
-  
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "Auteurs",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   "relationships.isProjectOf": "Onderzoeksprojecten",
-  
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Publicaties",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "Artikelen",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   "relationships.isSingleJournalOf": "Tijdschrift",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Tijdschriftjaargang",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Tijdschriftjaargangen",
-  
+
   // "relationships.isContributorOf": "Contributors",
   // TODO New key - Add a translation
   "relationships.isContributorOf": "Contributors",
-  
-  
-  
+
+
+
   // "resource-policies.add.button": "Add",
   // TODO New key - Add a translation
   "resource-policies.add.button": "Add",
-  
+
   // "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.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.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.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.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.collection": "Add a new Collection policy",
   // TODO New key - Add a translation
   "resource-policies.add.for.collection": "Add a new Collection policy",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.create.page.success.content": "Operation successful",
-  
+
   // "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.delete.btn": "Delete selected",
   // TODO New key - Add a translation
   "resource-policies.delete.btn": "Delete selected",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.delete.success.content": "Operation successful",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.edit.page.success.content": "Operation successful",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   // TODO New key - Add a translation
   "resource-policies.edit.page.title": "Edit resource policy",
-  
+
   // "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.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.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.select.btn": "Select",
   // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
+
   // "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.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.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.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.date.end.label": "End Date",
   // TODO New key - Add a translation
   "resource-policies.form.date.end.label": "End Date",
-  
+
   // "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.description.label": "Description",
   // TODO New key - Add a translation
   "resource-policies.form.description.label": "Description",
-  
+
   // "resource-policies.form.name.label": "Name",
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
-  
+
   // "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.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.table.headers.action": "Action",
   // TODO New key - Add a translation
   "resource-policies.table.headers.action": "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.start": "Start Date",
   // TODO New key - Add a translation
   "resource-policies.table.headers.date.start": "Start Date",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit": "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.policy": "Edit policy",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit.policy": "Edit policy",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   // TODO New key - Add a translation
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
   // TODO New key - Add a translation
   "resource-policies.table.headers.group": "Group",
-  
+
   // "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.policyType": "type",
   // TODO New key - Add a translation
   "resource-policies.table.headers.policyType": "type",
-  
+
   // "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.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.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.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.collection": "Policies for Collection",
   // TODO New key - Add a translation
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Toon",
-  
+
   // "search.title": "DSpace Angular :: Search",
   "search.title": "DSpace Angular :: Zoek",
-  
+
   // "search.breadcrumbs": "Search",
   // TODO New key - Add a translation
   "search.breadcrumbs": "Search",
-  
-  
+
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Auteur",
-  
+
   // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "Einddatum",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Startdatum",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Indiendatum",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   // TODO New key - Add a translation
   "search.filters.applied.f.discoverable": "Private",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "Soort item",
-  
+
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Heeft bestanden",
-  
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Type",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "Status",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Onderwerp",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "Indiener",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
   // TODO New key - Add a translation
   "search.filters.applied.f.jobTitle": "Job Title",
-  
+
   // "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.min": "Start birth date",
   // TODO New key - Add a translation
   "search.filters.applied.f.birthDate.min": "Start birth date",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Auteur",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Auteursnaam",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Geboortedatum",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Geboortedatum",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Datum van uitgave",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "Datum van uitgave",
-  
+
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Redacteur",
-  
+
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Redacteur",
-  
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Onderwerp",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Onderwerp",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Uitgever",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Uitgever",
-  
+
   // "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": "Vroegste Datum",
-  
+
   // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.min.placeholder": "Laatste Datum",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Indiendatum",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Indiendatum",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   // TODO New key - Add a translation
   "search.filters.filter.discoverable.head": "Private",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.filter.withdrawn.head": "Withdrawn",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Soort item",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Soort item",
-  
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Heeft bestanden",
-  
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Type",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Type",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Functienaam",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Functienaam",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Kent taal",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Kent taal",
-  
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Status",
-  
+
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Status",
-  
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Personen",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Personen",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Land",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Land",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Plaats",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Plaats",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Oprichtingsdatum",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Oprichtingsdatum",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Bereik",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Bereikfilter",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Inklappen",
-  
+
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "Toon meer",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Onderwerp",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Onderwerp",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Indiener",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Indiener",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalIssue": "Journal Issue",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalVolume": "Journal Volume",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   // TODO New key - Add a translation
   "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
+
   // "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.false": "No",
   // TODO New key - Add a translation
   "search.filters.has_content_in_original_bundle.false": "No",
-  
+
   // "search.filters.discoverable.true": "No",
   // TODO New key - Add a translation
   "search.filters.discoverable.true": "No",
-  
+
   // "search.filters.discoverable.false": "Yes",
   // TODO New key - Add a translation
   "search.filters.discoverable.false": "Yes",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   // TODO New key - Add a translation
   "search.filters.withdrawn.true": "Yes",
-  
+
   // "search.filters.withdrawn.false": "No",
   // TODO New key - Add a translation
   "search.filters.withdrawn.false": "No",
-  
-  
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Filters",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Filters verwijderen",
-  
-  
-  
+
+
+
   // "search.form.search": "Search",
   "search.form.search": "Zoek",
-  
+
   // "search.form.search_dspace": "Search DSpace",
   "search.form.search_dspace": "Zoek in DSpace",
-  
+
   // "search.form.search_mydspace": "Search MyDSpace",
   "search.form.search_mydspace": "Zoek in MyDSpace",
-  
-  
-  
+
+
+
   // "search.results.head": "Search Results",
   "search.results.head": "Zoekresultaten",
-  
+
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "Er waren geen resultaten voor deze zoekopdracht. Kunt u niet vinden wat u zoekt? Probeer het met ",
-  
+
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "aanhalingstekens om uw zoekterm",
-  
+
   // "search.results.empty": "Your search returned no results.",
   // TODO New key - Add a translation
   "search.results.empty": "Your search returned no results.",
-  
-  
-  
+
+
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Terug naar de resultaten",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Filters",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Zoekmogelijkheden",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "resultaten",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Resultaten per pagina",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Sorteer volgens",
-  
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Instellingen",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Toon detail",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "Toon in raster",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Toon als lijst",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   // TODO New key - Add a translation
   "sorting.ASC": "Ascending",
-  
+
   // "sorting.DESC": "Descending",
   // TODO New key - Add a translation
   "sorting.DESC": "Descending",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Oplopend op titel",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Aflopend op titel",
-  
+
   // "sorting.score.DESC": "Relevance",
   "sorting.score.DESC": "Relevantie",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
   // TODO New key - Add a translation
   "statistics.title": "Statistics",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   // TODO New key - Add a translation
   "statistics.header": "Statistics for {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   // TODO New key - Add a translation
   "statistics.breadcrumbs": "Statistics",
-  
+
   // "statistics.page.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.page.no-data": "No data available",
-  
+
   // "statistics.table.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.table.no-data": "No data available",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalVisits": "Total visits",
-  
+
   // "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.TotalDownloads": "File Visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalDownloads": "File Visits",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCountries": "Top country views",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCities": "Top city views",
-  
+
   // "statistics.table.header.views": "Views",
   // TODO New key - Add a translation
   "statistics.table.header.views": "Views",
-  
-  
-  
+
+
+
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Bewerk submission",
-  
+
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "U heeft niet voldoende rechten om een nieuwe submission in te dienen.",
-  
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Dien in",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Annuleer",
-  
+
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Deze handeling kan niet ongedaan worden gemaakt. Weet u het zeker?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Ja, ik weet het zeker",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   "submission.general.discard.confirm.title": "Annuleer submission",
-  
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Annuleer",
-  
+
   // "submission.general.save": "Save",
   "submission.general.save": "Opslaan",
-  
+
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Bewaar voor 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.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.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.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.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.button": "Search",
   // TODO New key - Add a translation
   "submission.import-external.search.button": "Search",
-  
+
   // "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.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.source.arxiv": "arXiv",
   // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   // TODO New key - Add a translation
   "submission.import-external.source.loading": "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.sherpaPublisher": "SHERPA Publishers",
   // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   // TODO New key - Add a translation
   "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.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",
   // TODO New key - Add a translation
   "submission.import-external.preview.title": "Item Preview",
-  
+
   // "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.button.import": "Start submission",
   // TODO New key - Add a translation
   "submission.import-external.preview.button.import": "Start submission",
-  
+
   // "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.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.sections.describe.relationship-lookup.close": "Close",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.close": "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.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.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 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 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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 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.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.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 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.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.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.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.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-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.loading": "Loading...",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.loading": "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.search": "Go",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
+
   // "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-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.selected": "Selected {{ size }} items",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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",
   // 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.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.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.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.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.JournalIssue": "Journal Issues",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
+
   // "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.JournalVolume": "Journal Volumes",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
+
   // "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.isAuthorOfPublication": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
+
   // "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.Project": "Projects",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
+
   // "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.Person": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
+
   // "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.DataPackage": "Data Packages",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
+
   // "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.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.isFundingOfPublication": "Funding",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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": "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": "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.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.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.ccLicense.type": "License Type",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.type": "License 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.change": "Change your license type…",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.change": "Change your license type…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.none": "No licenses available",
-  
+
   // "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.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.confirmation": "I grant the license above",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
+
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Voeg meer toe",
-  
+
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Collectie",
-  
+
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
   "submission.sections.general.deposit_error_notice": "Er is een probleem opgetreden bij het indienen van het item. Probeer het later nog eens.",
-  
+
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
   "submission.sections.general.deposit_success_notice": "Submission ingediend.",
-  
+
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
   "submission.sections.general.discard_error_notice": "Er is een probleem opgetreden bij het annuleren van de submission. Probeer het later nog eens.",
-  
+
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Submission geannuleerd.",
-  
+
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
   "submission.sections.general.metadata-extracted": "Er zijn nieuwe metadata gevonden en toegevoegd aan de <strong>{{sectionId}}</strong> sectie.",
-  
+
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
   "submission.sections.general.metadata-extracted-new-section": "De nieuwe sectie <strong>{{sectionId}}</strong> is toegevoegd aaan de submission.",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Geen collectie gevonden",
-  
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Geen opties beschikbaar",
-  
+
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
   "submission.sections.general.save_error_notice": "Er is een probleem opgetreden bij het bewaren van het item. Probeer het later nog eens.",
-  
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "Submission is opgeslagen.",
-  
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "Zoek een collectie",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Sommige secties zijn onvolledig.",
-  
-  
-  
+
+
+
   // "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.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Recycle",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Beschrijf",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Beschrijf",
-  
+
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Beschrijf",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Mogelijke verdubbeling",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Deposit licentie",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Upload bestanden",
-  
-  
-  
+
+
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Annuleer",
-  
+
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.sections.upload.delete.confirm.info": "Deze handeling kan niet ongedaan worden gemaakt. Weet u het zeker?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Ja, ik weet het zeker",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "Verwijder bitstream",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Verwijder",
-  
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Sleep bestanden om ze toe te voegen aan het item",
-  
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Soort toegangsrecht",
-  
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "De datum is verplicht.",
-  
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   // TODO Source message changed - Revise the translation
   "submission.sections.upload.form.from-label": "Toegang vanaf",
-  
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "Van",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Groep",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "Groep is verplicht.",
-  
+
   // "submission.sections.upload.form.until-label": "Grant access until",
   // TODO Source message changed - Revise the translation
   "submission.sections.upload.form.until-label": "Toegang tot",
-  
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Tot",
-  
+
   // "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": "Bestanden in de collectie {{collectionName}} zullen toegankelijk zijn volgens deze groep(en):",
-  
+
   // "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": "Let op: bestanden in de collectie {{collectionName}} zullen niet alleen toegankelijk zijn volgens de expliciet toegekende rechten per bestand, maar ook volgens de volgende groep(en):",
-  
-  // "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": "Hier vindt u alle bestanden van het item. U kunt de metadata en toegangsrechten bewerken of <strong>meer bestanden toevoegen door ze naar deze pagina te slepen.</strong>",
-  
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Nee",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "Nog geen bestand geupload.",
-  
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "Bewaar metadata",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Annuleer",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "Upload mislukt",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Upload geslaagd",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   "submission.submit.title": "Submission",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Verwijder",
-  
+
   // "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": "Als u dit item wilt verwijderen, kies \"Verwijder\". Er zal gevraagd worden dit te bevestigen.",
-  
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Bewerk",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
   "submission.workflow.generic.edit-help": "Kies deze optie om de metadata van het item te bewerken.",
-  
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "Bekijk",
-  
+
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Kies deze optie om de metadata van het item te bekijken.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Accepteer",
-  
+
   // "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": "Als u het item gecontroleerd heeft en het geschikt is om in de collectie te worden opgenomen, kiest u \"Accepteer\".",
-  
+
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Bewerk",
-  
+
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Kies deze optie om de metadata van het item te bewerken.",
-  
+
   // "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": "Vul uw reden om dit item te weigeren. Geef hierbij aan of de indiener het probleem kan verhelpen en het item opnieuw kan indienen.",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Reden voor weigering",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
   "submission.workflow.tasks.claimed.reject.reason.submit": "Weiger item",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "Reden",
-  
+
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
   "submission.workflow.tasks.claimed.reject.submit": "Weiger",
-  
+
   // "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": "Als u het item gecontroleerd heeft en heeft geconstateerd dat het <strong>niet</strong> geschikt is om opgenomen te worden, kies dan \"Weiger\". Er zal gevraagd worden om de reden van de weigering te geven. Ook kunt u aangeven of de indiener iets kan wijzigen en opnieuw indienen.",
-  
+
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Terug naar pool",
-  
+
   // "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": "Stuur de taak terug naar de pool, zodat iemand anders de taak kan uitvoeren.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "Er is een fout opgetreden tijdens de verwerking...",
-  
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "Bezig met verwerken...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   "submission.workflow.tasks.generic.submitter": "Indiener",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Verwerking geslaagd",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Claim",
-  
+
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Ken uzelf deze taak toe.",
-  
+
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
   "submission.workflow.tasks.pool.hide-detail": "Verberg detail",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Toon detail",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   // TODO New key - Add a translation
   "vocabulary-treeview.header": "Hierarchical tree view",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   // TODO New key - Add a translation
   "vocabulary-treeview.load-more": "Load more",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.reset": "Reset",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.search": "Search",
-  
+
   // "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.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.srsc": "Research Subject Categories",
   // TODO New key - Add a translation
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   "uploader.browse": "blader",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Sleep uw bestanden hierheen",
-  
+
   // "uploader.or": ", or ",
   // TODO Source message changed - Revise the translation
   "uploader.or": ", of",
-  
+
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
   "uploader.processing": "Bezig",
-  
+
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Queue lengte",
-  
+
   // "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.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-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",
-  
-  
-  
+
+
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   // TODO New key - Add a translation
   "workflowAdmin.search.results.head": "Administer 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.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.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.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.title": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.title": "Delete workflow item",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.header": "Delete workflow item",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.delete.button.cancel": "Cancel",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   // TODO New key - Add a translation
   "workflow-item.delete.button.confirm": "Delete",
-  
-  
+
+
   // "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.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.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.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.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.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.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.send-back.button.cancel": "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",
 
-}
\ No newline at end of file
+
+}
diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5
index bfe0ae186d..951389e1e5 100644
--- a/src/assets/i18n/pl.json5
+++ b/src/assets/i18n/pl.json5
@@ -1,6748 +1,3048 @@
 {
-  
-  // "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.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",
-  
-  
-  
-  // "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.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.forbidden": "forbidden",
-  // TODO New key - Add a translation
-  "403.forbidden": "forbidden",
-  
-  
-  
-  // "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.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.page-not-found": "page not found",
-  // TODO New key - Add a translation
-  "404.page-not-found": "page not found",
-  
-  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
-  // "admin.curation-tasks.title": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.title": "System curation tasks",
-  
-  // "admin.curation-tasks.header": "System curation tasks",
-  // TODO New key - Add a translation
-  "admin.curation-tasks.header": "System curation tasks",
-  
-  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
-  // "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.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.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  
-  // "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.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.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.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.create.success.head": "Success",
-  
-  // "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.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  
-  // "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.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.delete.success.head": "Success",
-  
-  // "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.edit.breadcrumbs": "Bitstream format",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  
-  // "admin.registries.bitstream-formats.edit.description.hint": "",
-  // TODO New key - Add a translation
+  "401.help": "Nie masz uprawnień do dostępu do tej strony. Możesz użyć przycisku poniżej, aby powrócić do strony głównej.",
+  "401.link.home-page": "Zabierz mnie na stronę główną",
+  "401.unauthorized": "nieautoryzowany",
+  "403.help": "Nie masz uprawnień do dostępu do tej strony. Możesz użyć przycisku poniżej, aby wrócić do strony głównej.",
+  "403.link.home-page": "Zabierz mnie na stronę główną",
+  "403.forbidden": "zabroniony",
+  "404.help": "Nie możemy znaleźć strony, której szukasz. Strona mogła zostać przeniesiona lub usunięta. Możesz użyć przycisku poniżej, aby powrócić do strony głównej. ",
+  "404.link.home-page": "Zabierz mnie na stronę główną",
+  "404.page-not-found": "strona nie została znaleziona",
+  "admin.curation-tasks.breadcrumbs": "Systemowe zadania administracyjne",
+  "admin.curation-tasks.title": "Systemowe zadania administracyjne",
+  "admin.curation-tasks.header": "Systemowe zadania administracyjne",
+  "admin.registries.bitstream-formats.breadcrumbs": "Rejestr formatów",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Format strumienia bitów",
+  "admin.registries.bitstream-formats.create.failure.content": "Wystąpił błąd podczas tworzenia nowego formatu strumienia bitów.",
+  "admin.registries.bitstream-formats.create.failure.head": "Nie udało się",
+  "admin.registries.bitstream-formats.create.head": "Utwórz nowy format",
+  "admin.registries.bitstream-formats.create.new": "Dodaj nowy format",
+  "admin.registries.bitstream-formats.create.success.content": "Nowy format strumienia bitów został pomyślnie utworzony.",
+  "admin.registries.bitstream-formats.create.success.head": "Udało się",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Nie udało się usunąć {{ amount }} formatu(ów)",
+  "admin.registries.bitstream-formats.delete.failure.head": "Nie udało się",
+  "admin.registries.bitstream-formats.delete.success.amount": "Udało się usunąć {{ amount }} formatu(ów)",
+  "admin.registries.bitstream-formats.delete.success.head": "Udało się",
+  "admin.registries.bitstream-formats.description": "Na liście formatów wyświetlono informacje o obsługiwanych formatach i czy są one wspierane przez system.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Format strumienia bitów",
   "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.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.label": "File extensions",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  
-  // "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.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.head": "Failure",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  
-  // "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.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.label": "Internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  
-  // "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.label": "MIME Type",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
-  // "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.label": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  
-  // "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.head": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.success.head": "Success",
-  
-  // "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.label": "Support level",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  
-  // "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.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.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  
-  // "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.internal": "internal",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.internal": "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.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.name": "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.supportLevel.KNOWN": "Known",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "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.UNKNOWN": "Unknown",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "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.title": "DSpace Angular :: Bitstream Format Registry",
-  // TODO New key - Add a translation
-  "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  
-  
-  
-  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  // TODO New key - Add a translation
-  "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.",
-  // 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.form.create": "Create metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.create": "Create metadata schema",
-  
-  // "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.name": "Name",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.name": "Name",
-  
-  // "admin.registries.metadata.form.namespace": "Namespace",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.form.namespace": "Namespace",
-  
-  // "admin.registries.metadata.head": "Metadata Registry",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.head": "Metadata Registry",
-  
-  // "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.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.metadata.schemas.table.delete": "Delete selected",
-  
-  // "admin.registries.metadata.schemas.table.id": "ID",
-  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.edit.description.label": "Opis",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Rozszerzenia to rozszerzenia plików, które są używane do automatycznej identyfikacji formatu przesyłanych plików. Możesz wprowadzić kilka rozszerzeń dla każdego formatu.",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Rozszerzenia plików",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Wprowadź rozszerzenie pliku bez kropki",
+  "admin.registries.bitstream-formats.edit.failure.content": "Wystąpił błąd podczas edycji formatu pliku.",
+  "admin.registries.bitstream-formats.edit.failure.head": "Nie udało się",
+  "admin.registries.bitstream-formats.edit.head": "Format plików: {{ format }}",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Formaty oznaczone jako wewnętrzne są ukryte przed użytkownikiem i wykorzystywane do celów administracyjnych.",
+  "admin.registries.bitstream-formats.edit.internal.label": "Wewnętrzny",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Typ MIME powiązany z tym formatem, nie musi być unikalny.",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Typ MIME",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Unikalna nazwa dla tego formatu, (np. Microsoft Word XP lub Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Nazwa",
+  "admin.registries.bitstream-formats.edit.success.content": "Format strumienia bitów został pomyślnie edytowany.",
+  "admin.registries.bitstream-formats.edit.success.head": "Udało się",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Poziom wsparcia, jaki Twoja instytucja deklaruje dla tego formatu.",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Obsługiwany format",
+  "admin.registries.bitstream-formats.head": "Rejestr formatów",
+  "admin.registries.bitstream-formats.no-items": "Brak formatów plików do wyświetlenia.",
+  "admin.registries.bitstream-formats.table.delete": "Usuń zaznaczone",
+  "admin.registries.bitstream-formats.table.deselect-all": "Odznacz wszystkie",
+  "admin.registries.bitstream-formats.table.internal": "wewnętrzne",
+  "admin.registries.bitstream-formats.table.mimetype": "Typ MIME",
+  "admin.registries.bitstream-formats.table.name": "Nazwa",
+  "admin.registries.bitstream-formats.table.return": "Powrót",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Znane",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Wspierane",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Nieznane",
+  "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.form.create": "Utwórz schemat metadanych",
+  "admin.registries.metadata.form.edit": "Edytuj schemat metadanych",
+  "admin.registries.metadata.form.name": "Nazwa",
+  "admin.registries.metadata.form.namespace": "Nazwa schematu",
+  "admin.registries.metadata.head": "Rejestr metadanych",
+  "admin.registries.metadata.schemas.no-items": "Brak rejestrów metadanych do pokazania.",
+  "admin.registries.metadata.schemas.table.delete": "Usuń zaznaczone",
   "admin.registries.metadata.schemas.table.id": "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.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.schema.breadcrumbs": "Metadata schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
-  // "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.fields.head": "Schema metadata fields",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.head": "Schema metadata fields",
-  
-  // "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.table.delete": "Delete selected",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.delete": "Delete selected",
-  
-  // "admin.registries.schema.fields.table.field": "Field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.fields.table.field": "Field",
-  
-  // "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.form.create": "Create metadata field",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.create": "Create metadata field",
-  
-  // "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.element": "Element",
-  // TODO New key - Add a translation
+  "admin.registries.metadata.schemas.table.name": "Nazwa",
+  "admin.registries.metadata.schemas.table.namespace": "Nazwa schematu",
+  "admin.registries.metadata.title": "Rejestr metadanych",
+  "admin.registries.schema.breadcrumbs": "Schemat metadanych",
+  "admin.registries.schema.description": "Ten schemat metadanych jest stworzony na podstawie \"{{namespace}}\".",
+  "admin.registries.schema.fields.head": "Pola schematu metadanych",
+  "admin.registries.schema.fields.no-items": "Brak pól metadanych do pokazania.",
+  "admin.registries.schema.fields.table.delete": "Usuń zaznaczone",
+  "admin.registries.schema.fields.table.field": "Pole",
+  "admin.registries.schema.fields.table.scopenote": "Uwagi",
+  "admin.registries.schema.form.create": "Stwórz pole metadanych",
+  "admin.registries.schema.form.edit": "Edytuj pole metadanych",
   "admin.registries.schema.form.element": "Element",
-  
-  // "admin.registries.schema.form.qualifier": "Qualifier",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.qualifier": "Qualifier",
-  
-  // "admin.registries.schema.form.scopenote": "Scope Note",
-  // TODO New key - Add a translation
-  "admin.registries.schema.form.scopenote": "Scope Note",
-  
-  // "admin.registries.schema.head": "Metadata Schema",
-  // TODO New key - Add a translation
-  "admin.registries.schema.head": "Metadata Schema",
-  
-  // "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.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.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.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.failure": "Error",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.failure": "Error",
-  
-  // "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.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.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.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.success": "Success",
-  // TODO New key - Add a translation
-  "admin.registries.schema.notification.success": "Success",
-  
-  // "admin.registries.schema.return": "Return",
-  // TODO New key - Add a translation
-  "admin.registries.schema.return": "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.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.impersonate": "Impersonate EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
-  // "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.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.title": "DSpace Angular :: EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
-  // "admin.access-control.epeople.head": "EPeople",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.head": "EPeople",
-  
-  // "admin.access-control.epeople.search.head": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.head": "Search",
-  
-  // "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.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.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.search.button": "Search",
-  
-  // "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.table.id": "ID",
-  // TODO New key - Add a translation
+  "admin.registries.schema.form.qualifier": "Kwalifikator",
+  "admin.registries.schema.form.scopenote": "Uwagi",
+  "admin.registries.schema.head": "Schemat metadanych",
+  "admin.registries.schema.notification.created": "Udało się utworzyć schemat metdanych \"{{prefix}}\"",
+  "admin.registries.schema.notification.deleted.failure": "Nie udało się usunąć {{amount}} schematów metadanych",
+  "admin.registries.schema.notification.deleted.success": "Udało się usunąć {{amount}} schematów metadanych",
+  "admin.registries.schema.notification.edited": "Udało się edytować schemat metadanych \"{{prefix}}\"",
+  "admin.registries.schema.notification.failure": "Błąd",
+  "admin.registries.schema.notification.field.created": "Udało się utworzyć pole metadanych \"{{field}}\"",
+  "admin.registries.schema.notification.field.deleted.failure": "Nie udało się usunąć {{amount}} pól metadanych",
+  "admin.registries.schema.notification.field.deleted.success": "Udało się usunąć {{amount}} pól metadanych",
+  "admin.registries.schema.notification.field.edited": "SUdało się edytować pole metadanych \"{{field}}\"",
+  "admin.registries.schema.notification.success": "Udało się",
+  "admin.registries.schema.return": "Powrót",
+  "admin.registries.schema.title": "Rejestr schematów metadanych",
+  "admin.access-control.epeople.actions.delete": "Usuń użytkownika",
+  "admin.access-control.epeople.actions.impersonate": "Personifikuj użytkownika",
+  "admin.access-control.epeople.actions.reset": "Zresetuj hasło",
+  "admin.access-control.epeople.actions.stop-impersonating": "Przestań personifikować użytkownika",
+  "admin.access-control.epeople.breadcrumbs": "Użytkownicy",
+  "admin.access-control.epeople.title": "Użytkownicy",
+  "admin.access-control.epeople.head": "Użytkownicy",
+  "admin.access-control.epeople.search.head": "Wyszukaj",
+  "admin.access-control.epeople.button.see-all": "Przeglądaj wszystko",
+  "admin.access-control.epeople.search.scope.metadata": "Metadane",
+  "admin.access-control.epeople.search.scope.email": "E-mail",
+  "admin.access-control.epeople.search.button": "Wyszukaj",
+  "admin.access-control.epeople.search.placeholder": "Wyszukaj użytkownika...",
+  "admin.access-control.epeople.button.add": "Dodaj użytkownika",
   "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.email": "E-mail (exact)",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
-  // "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.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.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{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.form.create": "Create EPerson",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.create": "Create EPerson",
-  
-  // "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.firstName": "First name",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.firstName": "First name",
-  
-  // "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.email": "E-mail",
-  // TODO New key - Add a translation
+  "admin.access-control.epeople.table.name": "Nazwa",
+  "admin.access-control.epeople.table.email": "E-mail",
+  "admin.access-control.epeople.table.edit": "Edytuj",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Edytuj \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Brak uprawnień do edycji wybranej grupy",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Usuń \"{{name}}\"",
+  "admin.access-control.epeople.no-items": "Brak użytkowników do wyświetlenia.",
+  "admin.access-control.epeople.form.create": "Utwórz użytkownika",
+  "admin.access-control.epeople.form.edit": "Edytuj użytkownika",
+  "admin.access-control.epeople.form.firstName": "Imię",
+  "admin.access-control.epeople.form.lastName": "Nazwisko",
   "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.canLogIn": "Can log in",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
-  // "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.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.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.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.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.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.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.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.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.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.table.id": "ID",
-  // TODO New key - Add a translation
+  "admin.access-control.epeople.form.emailHint": "Adres e-mail musi być poprawny",
+  "admin.access-control.epeople.form.canLogIn": "Możliwość zalogowania",
+  "admin.access-control.epeople.form.requireCertificate": "Wymagany certyfikat",
+  "admin.access-control.epeople.form.return": "Powrót",
+  "admin.access-control.epeople.form.notification.created.success": "Udało się utworzyć użytkownika \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure": "Nie udało się utworzyć użytkownika \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Nie udało się utworzyć użytkownika \"{{name}}\", email \"{{email}}\" już w użyciu.",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Nie udało się utworzyć użytkownika \"{{name}}\", email \"{{email}}\" już w użyciu.",
+  "admin.access-control.epeople.form.notification.edited.success": "Udało się edytować użytkownika \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Nie udało się edytować użytkownika \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Udało się usunąć użytkownika \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Nie udało się usunąć użytkownika \"{{name}}\"",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Członek grup:",
   "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.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.goToGroups": "Add to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
-  // "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.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.groups.title": "DSpace Angular :: Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
-  // "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.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.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.head": "Groups",
-  
-  // "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.search.head": "Search groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.head": "Search groups",
-  
-  // "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.search.button": "Search",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.search.button": "Search",
-  
-  // "admin.access-control.groups.table.id": "ID",
-  // TODO New key - Add a translation
+  "admin.access-control.epeople.form.table.name": "Nazwa",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Zbiór/kolekcja",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Ten użytkownik nie jest członkiem żadnej grupy",
+  "admin.access-control.epeople.form.goToGroups": "Dodaj do grup",
+  "admin.access-control.epeople.notification.deleted.failure": "Nie udało się usunąć użytkownika: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Udało się usunąć użytkownika: \"{{name}}\"",
+  "admin.access-control.groups.title": "Grupy",
+  "admin.access-control.groups.breadcrumbs": "Grupy",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Edytuj grupę",
+  "admin.access-control.groups.title.singleGroup": "Edytuj grupę",
+  "admin.access-control.groups.title.addGroup": "Nowa grupa",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Nowa grupa",
+  "admin.access-control.groups.head": "Grupy/role",
+  "admin.access-control.groups.button.add": "Dodaj grupę",
+  "admin.access-control.groups.search.head": "Szukaj grup",
+  "admin.access-control.groups.button.see-all": "Przeszukaj wszystko",
+  "admin.access-control.groups.search.button": "Wyszukaj",
+  "admin.access-control.groups.search.placeholder": "Wyszukaj grupy...",
   "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.members": "Members",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.members": "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.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.remove": "Delete \"{{name}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{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.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.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.content": "Cause: \"{{cause}}\"",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.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.edit": "Edit group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.head.edit": "Edit group",
-  
-  // "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.groupDescription": "Description",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.groupDescription": "Description",
-  
-  // "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.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.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.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.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.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.actions.delete": "Delete Group",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
-  // "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.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.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.confirm": "Delete",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
-  // "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.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.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.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.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.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.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.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.table.id": "ID",
-  // TODO New key - Add a translation
+  "admin.access-control.groups.table.name": "Nazwa",
+  "admin.access-control.groups.table.collectionOrCommunity": "Zbiór/kolekcja",
+  "admin.access-control.groups.table.members": "Członkowie",
+  "admin.access-control.groups.table.edit": "Edytuj",
+  "admin.access-control.groups.table.edit.buttons.edit": "Edytuj \"{{name}}\"",
+  "admin.access-control.groups.no-items": "Nie znaleziono grup z podaną frazą lub podanym UUID",
+  "admin.access-control.groups.notification.deleted.success": "Udało się usunąć grupę \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Nie udało się usunąć grupy \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.failure.content": "Powód: \"{{cause}}\"",
+  "admin.access-control.groups.form.alert.permanent": "Ta grupa jest stała, więc nie może być edytowana ani usunięta. Nadal możesz dodawać i usuwać członków grupy za pomocą tej strony.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Ta grupa nie może być edytowana lub usunięta, ponieważ odnosi się do roli lub bierze udział w procesie \"{{name}}\" {{comcol}}. Możesz ją usunąć ze strony <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> edycji {{comcol}}. Wciąż może dodawać i usuwać członków tej grupy, korzystając z tej strony.",
+  "admin.access-control.groups.form.head.create": "Utwórz grupę",
+  "admin.access-control.groups.form.head.edit": "Edytuj grupę",
+  "admin.access-control.groups.form.groupName": "Nazwa grupy",
+  "admin.access-control.groups.form.groupCommunity": "Zbiór lub kolekcja",
+  "admin.access-control.groups.form.groupDescription": "Opis",
+  "admin.access-control.groups.form.notification.created.success": "Udało się utworzyć grupę \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure": "Nie udało się utworzyć grupy \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Nie udało się utworzyć grupy o nazwie: \"{{name}}\", upewnij się, że nazwa nie jest już używana.",
+  "admin.access-control.groups.form.notification.edited.failure": "Nie udało się edytować grupy \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nazwa \"{{name}}\" już w użyciu!",
+  "admin.access-control.groups.form.notification.edited.success": "Udało się edytować grupę \"{{name}}\"",
+  "admin.access-control.groups.form.actions.delete": "Usuń grupę",
+  "admin.access-control.groups.form.delete-group.modal.header": "Usuń grupę \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Czy na pewno chcesz usunąć grupę \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Anuluj",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Usuń",
+  "admin.access-control.groups.form.notification.deleted.success": "Udało się usunąć grupę \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Nie udało się usunąć grupy \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Powód: \"{{ cause }}\"",
+  "admin.access-control.groups.form.members-list.head": "Użytkownik",
+  "admin.access-control.groups.form.members-list.search.head": "Dodaj użytkownika",
+  "admin.access-control.groups.form.members-list.button.see-all": "Pokaż wszystkich",
+  "admin.access-control.groups.form.members-list.headMembers": "Aktualni członkowie",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadane",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail",
+  "admin.access-control.groups.form.members-list.search.button": "Wyszukaj",
   "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.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.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.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.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.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.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.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.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.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-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.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.head": "Groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
-  // "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.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.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.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.table.id": "ID",
-  // TODO New key - Add a translation
+  "admin.access-control.groups.form.members-list.table.name": "Nazwa",
+  "admin.access-control.groups.form.members-list.table.identity": "Tożsamość",
+  "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.edit": "Usuń / Dodaj",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Usuń użytkownika o nazwie \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Udało się dodać użytkownika o nazwie: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Nie udało się dodać użytkownika o nazwie: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Udało się usunąć użytkownika o nazwie: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Nie udało się usunąć użytkownika o nazwie: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Dodaj użytkownika o nazwie \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Brak aktywnej grupy, najpierw wpisz nazwę grupy.",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Brak użytkowników w grupie, wyszukaj ich i dodaj.",
+  "admin.access-control.groups.form.members-list.no-items": "Nie znaleziono użytkowników podczas wyszukiwania",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Coś poszło nie tak: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.head": "Grupy",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Dodaj podgrupę",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Przeglądaj wszystkie",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Aktualne podgrupy",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Wyszukaj",
   "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.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.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.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.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.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.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.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.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.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.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-subgroups-yet": "No subgroups in group yet.",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
-  // "admin.access-control.groups.form.return": "Return to groups",
-  // TODO New key - Add a translation
-  "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
-  // "admin.search.breadcrumbs": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.breadcrumbs": "Administrative Search",
-  
-  // "admin.search.collection.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.collection.edit": "Edit",
-  
-  // "admin.search.community.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.community.edit": "Edit",
-  
-  // "admin.search.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.search.item.delete": "Delete",
-  
-  // "admin.search.item.edit": "Edit",
-  // TODO New key - Add a translation
-  "admin.search.item.edit": "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-public": "Make Public",
-  // TODO New key - Add a translation
-  "admin.search.item.make-public": "Make Public",
-  
-  // "admin.search.item.move": "Move",
-  // TODO New key - Add a translation
-  "admin.search.item.move": "Move",
-  
-  // "admin.search.item.reinstate": "Reinstate",
-  // TODO New key - Add a translation
-  "admin.search.item.reinstate": "Reinstate",
-  
-  // "admin.search.item.withdraw": "Withdraw",
-  // TODO New key - Add a translation
-  "admin.search.item.withdraw": "Withdraw",
-  
-  // "admin.search.title": "Administrative Search",
-  // TODO New key - Add a translation
-  "admin.search.title": "Administrative Search",
-  
-  // "administrativeView.search.results.head": "Administrative Search",
-  // TODO New key - Add a translation
-  "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
-  // "admin.workflow.breadcrumbs": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.breadcrumbs": "Administer Workflow",
-  
-  // "admin.workflow.title": "Administer Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.title": "Administer Workflow",
-  
-  // "admin.workflow.item.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "admin.workflow.item.workflow": "Workflow",
-  
-  // "admin.workflow.item.delete": "Delete",
-  // TODO New key - Add a translation
-  "admin.workflow.item.delete": "Delete",
-  
-  // "admin.workflow.item.send-back": "Send back",
-  // TODO New key - Add a translation
-  "admin.workflow.item.send-back": "Send back",
-  
-  
-  
-  // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
-  // "admin.metadata-import.title": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.title": "Import Metadata",
-  
-  // "admin.metadata-import.page.header": "Import Metadata",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.header": "Import Metadata",
-  
-  // "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.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.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.button.return": "Return",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.button.return": "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.error.addFile": "Select file first!",
-  // TODO New key - Add a translation
-  "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
-  // "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.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.",
-  
-  
-  
-  // "bitstream.edit.bitstream": "Bitstream: ",
-  // TODO New key - Add a translation
-  "bitstream.edit.bitstream": "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.label": "Description",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.description.label": "Description",
-  
-  // "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.label": "Embargo until specific date",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
-  // "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.label": "Filename",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.fileName.label": "Filename",
-  
-  // "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.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.primaryBitstream.label": "Primary bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
-  // "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.label": "Selected Format",
-  // TODO New key - Add a translation
-  "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
-  // "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.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.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.title": "Bitstream saved",
-  // TODO New key - Add a translation
-  "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
-  // "bitstream.edit.title": "Edit bitstream",
-  // TODO New key - Add a translation
-  "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
-  // "browse.comcol.by.author": "By Author",
-  // TODO New key - Add a translation
-  "browse.comcol.by.author": "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.subject": "By Subject",
-  // TODO New key - Add a translation
-  "browse.comcol.by.subject": "By Subject",
-  
-  // "browse.comcol.by.title": "By Title",
-  // TODO New key - Add a translation
-  "browse.comcol.by.title": "By Title",
-  
-  // "browse.comcol.head": "Browse",
-  // TODO New key - Add a translation
-  "browse.comcol.head": "Browse",
-  
-  // "browse.empty": "No items to show.",
-  // TODO New key - Add a translation
-  "browse.empty": "No items to show.",
-  
-  // "browse.metadata.author": "Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author": "Author",
-  
-  // "browse.metadata.dateissued": "Issue Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued": "Issue Date",
-  
-  // "browse.metadata.subject": "Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject": "Subject",
-  
-  // "browse.metadata.title": "Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title": "Title",
-  
-  // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  // TODO New key - Add a translation
-  "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
-  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  // TODO New key - Add a translation
-  "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
-  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  // TODO New key - Add a translation
-  "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
-  // "browse.metadata.title.breadcrumbs": "Browse by Title",
-  // TODO New key - Add a translation
-  "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
-  // "browse.startsWith.choose_start": "(Choose start)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_start": "(Choose start)",
-  
-  // "browse.startsWith.choose_year": "(Choose year)",
-  // TODO New key - Add a translation
-  "browse.startsWith.choose_year": "(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.months.april": "April",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.april": "April",
-  
-  // "browse.startsWith.months.august": "August",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.august": "August",
-  
-  // "browse.startsWith.months.december": "December",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.december": "December",
-  
-  // "browse.startsWith.months.february": "February",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.february": "February",
-  
-  // "browse.startsWith.months.january": "January",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.january": "January",
-  
-  // "browse.startsWith.months.july": "July",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.july": "July",
-  
-  // "browse.startsWith.months.june": "June",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.june": "June",
-  
-  // "browse.startsWith.months.march": "March",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.march": "March",
-  
-  // "browse.startsWith.months.may": "May",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.may": "May",
-  
-  // "browse.startsWith.months.none": "(Choose month)",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.none": "(Choose month)",
-  
-  // "browse.startsWith.months.november": "November",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.november": "November",
-  
-  // "browse.startsWith.months.october": "October",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.october": "October",
-  
-  // "browse.startsWith.months.september": "September",
-  // TODO New key - Add a translation
-  "browse.startsWith.months.september": "September",
-  
-  // "browse.startsWith.submit": "Go",
-  // TODO New key - Add a translation
-  "browse.startsWith.submit": "Go",
-  
-  // "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_text": "Or enter first few letters:",
-  // TODO New key - Add a translation
-  "browse.startsWith.type_text": "Or enter first few letters:",
-  
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  // TODO New key - Add a translation
-  "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  
-  
-  // "chips.remove": "Remove chip",
-  // TODO New key - Add a translation
-  "chips.remove": "Remove chip",
-  
-  
-  
-  // "collection.create.head": "Create a Collection",
-  // TODO New key - Add a translation
-  "collection.create.head": "Create a Collection",
-  
-  // "collection.create.notifications.success": "Successfully created the Collection",
-  // TODO New key - Add a translation
-  "collection.create.notifications.success": "Successfully created the Collection",
-  
-  // "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.curate.header": "Curate Collection: {{collection}}",
-  // TODO New key - Add a translation
-  "collection.curate.header": "Curate Collection: {{collection}}",
-  
-  // "collection.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.delete.cancel": "Cancel",
-  
-  // "collection.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "collection.delete.confirm": "Confirm",
-  
-  // "collection.delete.head": "Delete Collection",
-  // TODO New key - Add a translation
-  "collection.delete.head": "Delete Collection",
-  
-  // "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.success": "Successfully deleted collection",
-  // TODO New key - Add a translation
-  "collection.delete.notification.success": "Successfully deleted collection",
-  
-  // "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.edit.delete": "Delete this collection",
-  // TODO New key - Add a translation
-  "collection.edit.delete": "Delete this collection",
-  
-  // "collection.edit.head": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.head": "Edit Collection",
-  
-  // "collection.edit.breadcrumbs": "Edit Collection",
-  // TODO New key - Add a translation
-  "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
-  // "collection.edit.tabs.mapper.head": "Item Mapper",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.mapper.head": "Item Mapper",
-  
-  // "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.item-mapper.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.cancel": "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.confirm": "Map selected items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.confirm": "Map selected items",
-  
-  // "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.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.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.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.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.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.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  
-  // "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.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.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.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.remove": "Remove selected item mappings",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  
-  // "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.map": "Map new items",
-  // TODO New key - Add a translation
-  "collection.edit.item-mapper.tabs.map": "Map new items",
-  
-  
-  
-  // "collection.edit.logo.label": "Collection logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.label": "Collection logo",
-  
-  // "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.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.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.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.error.title": "Error deleting logo",
-  // TODO New key - Add a translation
-  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
-  // "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.notifications.success": "Successfully edited the Collection",
-  // TODO New key - Add a translation
-  "collection.edit.notifications.success": "Successfully edited the Collection",
-  
-  // "collection.edit.return": "Return",
-  // TODO New key - Add a translation
-  "collection.edit.return": "Return",
-  
-  
-  
-  // "collection.edit.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.curate.head": "Curate",
-  
-  // "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.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.authorizations.head": "Authorizations",
-  
-  // "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.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.roles.head": "Assign Roles",
-  
-  // "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.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.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.harvestType": "Content being harvested",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
-  // "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.metadataConfigId": "Metadata Format",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
-  // "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.oaiSource": "OAI Provider",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
-  // "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_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_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.head": "Content Source",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.head": "Content Source",
-  
-  // "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.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
-  // "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.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
-  // "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.title": "Content Source saved",
-  // TODO New key - Add a translation
-  "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
-  // "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.template.add-button": "Add",
-  // TODO New key - Add a translation
-  "collection.edit.template.add-button": "Add",
-  
-  // "collection.edit.template.breadcrumbs": "Item template",
-  // TODO New key - Add a translation
-  "collection.edit.template.breadcrumbs": "Item template",
-  
-  // "collection.edit.template.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "collection.edit.template.cancel": "Cancel",
-  
-  // "collection.edit.template.delete-button": "Delete",
-  // TODO New key - Add a translation
-  "collection.edit.template.delete-button": "Delete",
-  
-  // "collection.edit.template.edit-button": "Edit",
-  // TODO New key - Add a translation
-  "collection.edit.template.edit-button": "Edit",
-  
-  // "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.label": "Template item",
-  // TODO New key - Add a translation
-  "collection.edit.template.label": "Template item",
-  
-  // "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.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.title": "Edit Template Item",
-  // TODO New key - Add a translation
-  "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
-  // "collection.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "collection.form.abstract": "Short Description",
-  
-  // "collection.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.description": "Introductory 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.license": "License",
-  // TODO New key - Add a translation
-  "collection.form.license": "License",
-  
-  // "collection.form.provenance": "Provenance",
-  // TODO New key - Add a translation
-  "collection.form.provenance": "Provenance",
-  
-  // "collection.form.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.rights": "Copyright text (HTML)",
-  
-  // "collection.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "collection.form.tableofcontents": "News (HTML)",
-  
-  // "collection.form.title": "Name",
-  // TODO New key - Add a translation
-  "collection.form.title": "Name",
-  
-  
-  
-  // "collection.listelement.badge": "Collection",
-  // 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.edit": "Edit this collection",
-  // TODO New key - Add a translation
-  "collection.page.edit": "Edit this collection",
-  
-  // "collection.page.handle": "Permanent URI for this collection",
-  // TODO New key - Add a translation
-  "collection.page.handle": "Permanent URI for this collection",
-  
-  // "collection.page.license": "License",
-  // TODO New key - Add a translation
-  "collection.page.license": "License",
-  
-  // "collection.page.news": "News",
-  // TODO New key - Add a translation
-  "collection.page.news": "News",
-  
-  
-  
-  // "collection.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "collection.select.confirm": "Confirm selected",
-  
-  // "collection.select.empty": "No collections to show",
-  // TODO New key - Add a translation
-  "collection.select.empty": "No collections to show",
-  
-  // "collection.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "collection.select.table.title": "Title",
-  
-  
-  
-  // "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.title": "Server Error",
-  // TODO New key - Add a translation
-  "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
-  // "communityList.tabTitle": "DSpace - Community List",
-  // TODO New key - Add a translation
-  "communityList.tabTitle": "DSpace - Community List",
-  
-  // "communityList.title": "List of Communities",
-  // TODO New key - Add a translation
-  "communityList.title": "List of Communities",
-  
-  // "communityList.showMore": "Show More",
-  // TODO New key - Add a translation
-  "communityList.showMore": "Show More",
-  
-  
-  
-  // "community.create.head": "Create a Community",
-  // TODO New key - Add a translation
-  "community.create.head": "Create a Community",
-  
-  // "community.create.notifications.success": "Successfully created the Community",
-  // TODO New key - Add a translation
-  "community.create.notifications.success": "Successfully created the Community",
-  
-  // "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.curate.header": "Curate Community: {{community}}",
-  // TODO New key - Add a translation
-  "community.curate.header": "Curate Community: {{community}}",
-  
-  // "community.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "community.delete.cancel": "Cancel",
-  
-  // "community.delete.confirm": "Confirm",
-  // TODO New key - Add a translation
-  "community.delete.confirm": "Confirm",
-  
-  // "community.delete.head": "Delete Community",
-  // TODO New key - Add a translation
-  "community.delete.head": "Delete Community",
-  
-  // "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.success": "Successfully deleted community",
-  // TODO New key - Add a translation
-  "community.delete.notification.success": "Successfully deleted community",
-  
-  // "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.edit.delete": "Delete this community",
-  // TODO New key - Add a translation
-  "community.edit.delete": "Delete this community",
-  
-  // "community.edit.head": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.head": "Edit Community",
-  
-  // "community.edit.breadcrumbs": "Edit Community",
-  // TODO New key - Add a translation
-  "community.edit.breadcrumbs": "Edit Community",
-  
-  
-  // "community.edit.logo.label": "Community logo",
-  // TODO New key - Add a translation
-  "community.edit.logo.label": "Community logo",
-  
-  // "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.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.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.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.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.notifications.success": "Successfully edited the Community",
-  // TODO New key - Add a translation
-  "community.edit.notifications.success": "Successfully edited the Community",
-  
-  // "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.tabs.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "community.edit.tabs.curate.head": "Curate",
-  
-  // "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.metadata.head": "Edit Metadata",
-  // TODO New key - Add a translation
-  "community.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
-  // TODO New key - Add a translation
-  "community.edit.tabs.roles.head": "Assign Roles",
-  
-  // "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.authorizations.head": "Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.head": "Authorizations",
-  
-  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  // TODO New key - Add a translation
-  "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
-  // "community.listelement.badge": "Community",
-  // TODO New key - Add a translation
-  "community.listelement.badge": "Community",
-  
-  
-  
-  // "comcol-role.edit.no-group": "None",
-  // TODO New key - Add a translation
-  "comcol-role.edit.no-group": "None",
-  
-  // "comcol-role.edit.create": "Create",
-  // TODO New key - Add a translation
-  "comcol-role.edit.create": "Create",
-  
-  // "comcol-role.edit.restrict": "Restrict",
-  // TODO New key - Add a translation
-  "comcol-role.edit.restrict": "Restrict",
-  
-  // "comcol-role.edit.delete": "Delete",
-  // TODO New key - Add a translation
-  "comcol-role.edit.delete": "Delete",
-  
-  
-  // "comcol-role.edit.community-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.community-admin.name": "Administrators",
-  
-  // "comcol-role.edit.collection-admin.name": "Administrators",
-  // TODO New key - Add a translation
-  "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
-  // "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.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.submitters.name": "Submitters",
-  // TODO New key - Add a translation
-  "comcol-role.edit.submitters.name": "Submitters",
-  
-  // "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.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.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.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.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.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.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.editor.name": "Editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.editor.name": "Editors",
-  
-  // "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.finaleditor.name": "Final editors",
-  // TODO New key - Add a translation
-  "comcol-role.edit.finaleditor.name": "Final editors",
-  
-  // "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.reviewer.name": "Reviewers",
-  // TODO New key - Add a translation
-  "comcol-role.edit.reviewer.name": "Reviewers",
-  
-  // "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.",
-  
-  
-  
-  // "community.form.abstract": "Short Description",
-  // TODO New key - Add a translation
-  "community.form.abstract": "Short Description",
-  
-  // "community.form.description": "Introductory text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.description": "Introductory 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.rights": "Copyright text (HTML)",
-  // TODO New key - Add a translation
-  "community.form.rights": "Copyright text (HTML)",
-  
-  // "community.form.tableofcontents": "News (HTML)",
-  // TODO New key - Add a translation
-  "community.form.tableofcontents": "News (HTML)",
-  
-  // "community.form.title": "Name",
-  // TODO New key - Add a translation
-  "community.form.title": "Name",
-  
-  // "community.page.edit": "Edit this community",
-  // TODO New key - Add a translation
-  "community.page.edit": "Edit this community",
-  
-  // "community.page.handle": "Permanent URI for this community",
-  // TODO New key - Add a translation
-  "community.page.handle": "Permanent URI for this community",
-  
-  // "community.page.license": "License",
-  // TODO New key - Add a translation
-  "community.page.license": "License",
-  
-  // "community.page.news": "News",
-  // TODO New key - Add a translation
-  "community.page.news": "News",
-  
-  // "community.all-lists.head": "Subcommunities and Collections",
-  // 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",
-  
-  
-  
-  // "cookies.consent.accept-all": "Accept all",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-all": "Accept all",
-  
-  // "cookies.consent.accept-selected": "Accept selected",
-  // TODO New key - Add a translation
-  "cookies.consent.accept-selected": "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.title": "(opt-out)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.opt-out.title": "(opt-out)",
-  
-  // "cookies.consent.app.purpose": "purpose",
-  // TODO New key - Add a translation
-  "cookies.consent.app.purpose": "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.title": "(always required)",
-  // TODO New key - Add a translation
-  "cookies.consent.app.required.title": "(always required)",
-  
-  // "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.close": "Close",
-  // TODO New key - Add a translation
-  "cookies.consent.close": "Close",
-  
-  // "cookies.consent.decline": "Decline",
-  // TODO New key - Add a translation
-  "cookies.consent.decline": "Decline",
-  
-  // "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.learnMore": "Customize",
-  // TODO New key - Add a translation
-  "cookies.consent.content-notice.learnMore": "Customize",
-  
-  // "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.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.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.title": "Information that we collect",
-  // TODO New key - Add a translation
-  "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
-  // "cookies.consent.app.title.authentication": "Authentication",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.authentication": "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.title.preferences": "Preferences",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.preferences": "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.title.acknowledgement": "Acknowledgement",
-  // TODO New key - Add a translation
-  "cookies.consent.app.title.acknowledgement": "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.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.purpose.functional": "Functional",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.functional": "Functional",
-  
-  // "cookies.consent.purpose.statistical": "Statistical",
-  // TODO New key - Add a translation
-  "cookies.consent.purpose.statistical": "Statistical",
-  
-  
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
-  // "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.requiredmetadata.label": "Check for Required Metadata",
-  // TODO New key - Add a translation
-  "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
-  // "curation-task.task.translate.label": "Microsoft Translator",
-  // TODO New key - Add a translation
-  "curation-task.task.translate.label": "Microsoft Translator",
-  
-  // "curation-task.task.vscan.label": "Virus Scan",
-  // TODO New key - Add a translation
-  "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
-  // "curation.form.task-select.label": "Task:",
-  // TODO New key - Add a translation
-  "curation.form.task-select.label": "Task:",
-  
-  // "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.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.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.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.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)",
-  // 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)",
-  
-  
-  
-  // "dso-selector.create.collection.head": "New collection",
-  // TODO New key - Add a translation
-  "dso-selector.create.collection.head": "New collection",
-  
-  // "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.community.head": "New community",
-  // TODO New key - Add a translation
-  "dso-selector.create.community.head": "New community",
-  
-  // "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.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.item.head": "New item",
-  // TODO New key - Add a translation
-  "dso-selector.create.item.head": "New item",
-  
-  // "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.submission.head": "New submission",
-  // TODO New key - Add a translation
-  "dso-selector.create.submission.head": "New submission",
-  
-  // "dso-selector.edit.collection.head": "Edit collection",
-  // TODO New key - Add a translation
-  "dso-selector.edit.collection.head": "Edit collection",
-  
-  // "dso-selector.edit.community.head": "Edit community",
-  // TODO New key - Add a translation
-  "dso-selector.edit.community.head": "Edit community",
-  
-  // "dso-selector.edit.item.head": "Edit item",
-  // TODO New key - Add a translation
-  "dso-selector.edit.item.head": "Edit item",
-  
-  // "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.no-results": "No {{ type }} found",
-  // TODO New key - Add a translation
-  "dso-selector.no-results": "No {{ type }} found",
-  
-  // "dso-selector.placeholder": "Search for a {{ type }}",
-  // TODO New key - Add a translation
-  "dso-selector.placeholder": "Search for a {{ type }}",
-  
-  
-  
-  // "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.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.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.cancel": "Cancel",
-  
-  // "confirmation-modal.export-metadata.confirm": "Export",
-  // TODO New key - Add a translation
-  "confirmation-modal.export-metadata.confirm": "Export",
-  
-  // "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.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.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
-  // "confirmation-modal.delete-eperson.confirm": "Delete",
-  // TODO New key - Add a translation
-  "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
-  // "error.bitstream": "Error fetching bitstream",
-  // TODO New key - Add a translation
-  "error.bitstream": "Error fetching bitstream",
-  
-  // "error.browse-by": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.browse-by": "Error fetching items",
-  
-  // "error.collection": "Error fetching collection",
-  // TODO New key - Add a translation
-  "error.collection": "Error fetching collection",
-  
-  // "error.collections": "Error fetching collections",
-  // TODO New key - Add a translation
-  "error.collections": "Error fetching collections",
-  
-  // "error.community": "Error fetching community",
-  // TODO New key - Add a translation
-  "error.community": "Error fetching community",
-  
-  // "error.identifier": "No item found for the identifier",
-  // TODO New key - Add a translation
-  "error.identifier": "No item found for the identifier",
-  
-  // "error.default": "Error",
-  // TODO New key - Add a translation
-  "error.default": "Error",
-  
-  // "error.item": "Error fetching item",
-  // TODO New key - Add a translation
-  "error.item": "Error fetching item",
-  
-  // "error.items": "Error fetching items",
-  // TODO New key - Add a translation
-  "error.items": "Error fetching items",
-  
-  // "error.objects": "Error fetching objects",
-  // TODO New key - Add a translation
-  "error.objects": "Error fetching objects",
-  
-  // "error.recent-submissions": "Error fetching recent submissions",
-  // TODO New key - Add a translation
-  "error.recent-submissions": "Error fetching recent submissions",
-  
-  // "error.search-results": "Error fetching search results",
-  // TODO New key - Add a translation
-  "error.search-results": "Error fetching search results",
-  
-  // "error.sub-collections": "Error fetching sub-collections",
-  // TODO New key - Add a translation
-  "error.sub-collections": "Error fetching sub-collections",
-  
-  // "error.sub-communities": "Error fetching sub-communities",
-  // TODO New key - Add a translation
-  "error.sub-communities": "Error fetching 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.top-level-communities": "Error fetching top-level communities",
-  // TODO New key - Add a translation
-  "error.top-level-communities": "Error fetching 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.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.filerequired": "The file upload is mandatory",
-  // TODO New key - Add a translation
-  "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
-  // "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",
-  
-  
-  
-  // "footer.copyright": "copyright © 2002-{{ year }}",
-  // TODO New key - Add a translation
-  "footer.copyright": "copyright © 2002-{{ year }}",
-  
-  // "footer.link.dspace": "DSpace software",
-  // TODO New key - Add a translation
-  "footer.link.dspace": "DSpace software",
-  
-  // "footer.link.lyrasis": "LYRASIS",
-  // TODO New key - Add a translation
-  "footer.link.lyrasis": "LYRASIS",
-  
-  // "footer.link.cookies": "Cookie settings",
-  // TODO New key - Add a translation
-  "footer.link.cookies": "Cookie settings",
-  
-  // "footer.link.privacy-policy": "Privacy policy",
-  // 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",
-  
-  
-  
-  // "forgot-email.form.header": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-email.form.header": "Forgot Password",
-  
-  // "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.email": "Email Address *",
-  // TODO New key - Add a translation
-  "forgot-email.form.email": "Email Address *",
-  
-  // "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.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.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.submit": "Submit",
-  // TODO New key - Add a translation
-  "forgot-email.form.submit": "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.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-password.title": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.title": "Forgot Password",
-  
-  // "forgot-password.form.head": "Forgot Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.head": "Forgot Password",
-  
-  // "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.card.security": "Security",
-  // TODO New key - Add a translation
-  "forgot-password.form.card.security": "Security",
-  
-  // "forgot-password.form.identification.header": "Identify",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.header": "Identify",
-  
-  // "forgot-password.form.identification.email": "Email address: ",
-  // TODO New key - Add a translation
-  "forgot-password.form.identification.email": "Email address: ",
-  
-  // "forgot-password.form.label.password": "Password",
-  // TODO New key - Add a translation
-  "forgot-password.form.label.password": "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.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.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.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.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.title": "Password reset completed",
-  // TODO New key - Add a translation
-  "forgot-password.form.notification.success.title": "Password reset completed",
-  
-  // "forgot-password.form.submit": "Submit password",
-  // TODO New key - Add a translation
-  "forgot-password.form.submit": "Submit password",
-  
-  
-  
-  // "form.add": "Add",
-  // TODO New key - Add a translation
-  "form.add": "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.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "form.cancel": "Cancel",
-  
-  // "form.clear": "Clear",
-  // TODO New key - Add a translation
-  "form.clear": "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.edit": "Edit",
-  // TODO New key - Add a translation
-  "form.edit": "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.first-name": "First name",
-  // TODO New key - Add a translation
-  "form.first-name": "First name",
-  
-  // "form.group-collapse": "Collapse",
-  // TODO New key - Add a translation
-  "form.group-collapse": "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-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.last-name": "Last name",
-  // TODO New key - Add a translation
-  "form.last-name": "Last name",
-  
-  // "form.loading": "Loading...",
-  // TODO New key - Add a translation
-  "form.loading": "Loading...",
-  
-  // "form.lookup": "Lookup",
-  // TODO New key - Add a translation
-  "form.lookup": "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.no-results": "No results found",
-  // TODO New key - Add a translation
-  "form.no-results": "No results found",
-  
-  // "form.no-value": "No value entered",
-  // TODO New key - Add a translation
-  "form.no-value": "No value entered",
-  
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
-  
-  // "form.remove": "Remove",
-  // TODO New key - Add a translation
-  "form.remove": "Remove",
-  
-  // "form.save": "Save",
-  // TODO New key - Add a translation
-  "form.save": "Save",
-  
-  // "form.save-help": "Save changes",
-  // TODO New key - Add a translation
-  "form.save-help": "Save changes",
-  
-  // "form.search": "Search",
-  // TODO New key - Add a translation
-  "form.search": "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.submit": "Submit",
-  // TODO New key - Add a translation
-  "form.submit": "Submit",
-  
-  
-  
-  // "home.description": "",
-  // TODO New key - Add a translation
-  "home.description": "",
-  
-  // "home.breadcrumbs": "Home",
-  // TODO New key - Add a translation
-  "home.breadcrumbs": "Home",
-  
-  // "home.title": "DSpace Angular :: Home",
-  // TODO New key - Add a translation
-  "home.title": "DSpace Angular :: Home",
-  
-  // "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.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.",
-  
-  
-  
-  // "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.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.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.breadcrumbs": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
-  // "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.save": "Save",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.buttons.save": "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.title": "End User Agreement",
-  // TODO New key - Add a translation
-  "info.end-user-agreement.title": "End User Agreement",
-  
-  // "info.privacy.breadcrumbs": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.breadcrumbs": "Privacy Statement",
-  
-  // "info.privacy.head": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.head": "Privacy Statement",
-  
-  // "info.privacy.title": "Privacy Statement",
-  // TODO New key - Add a translation
-  "info.privacy.title": "Privacy Statement",
-  
-  
-  
-  // "item.alerts.private": "This item is private",
-  // TODO New key - Add a translation
-  "item.alerts.private": "This item is private",
-  
-  // "item.alerts.withdrawn": "This item has been withdrawn",
-  // TODO New key - Add a translation
-  "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
-  // "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.title": "Edit item's Policies",
-  // TODO New key - Add a translation
-  "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
-  // "item.badge.private": "Private",
-  // TODO New key - Add a translation
-  "item.badge.private": "Private",
-  
-  // "item.badge.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
-  // "item.bitstreams.upload.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle": "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.new": "Create bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.bundle.new": "Create bundle",
-  
-  // "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.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.cancel": "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.item": "Item: ",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.item": "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.title": "Created bundle",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
-  // "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.title": "Upload bitstream",
-  // TODO New key - Add a translation
-  "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
-  // "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.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.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.more": "Load more",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.bundle.load.more": "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.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.discard-button": "Discard",
-  
-  // "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.drag": "Drag",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.drag": "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.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.edit.buttons.remove": "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.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.headers.actions": "Actions",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.actions": "Actions",
-  
-  // "item.edit.bitstreams.headers.bundle": "Bundle",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.bundle": "Bundle",
-  
-  // "item.edit.bitstreams.headers.description": "Description",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.description": "Description",
-  
-  // "item.edit.bitstreams.headers.format": "Format",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.format": "Format",
-  
-  // "item.edit.bitstreams.headers.name": "Name",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.headers.name": "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.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
-  // "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.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.title": "Move changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
-  // "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.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
-  // "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.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.title": "Removal changes saved",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
-  // "item.edit.bitstreams.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.reinstate-button": "Undo",
-  
-  // "item.edit.bitstreams.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.save-button": "Save",
-  
-  // "item.edit.bitstreams.upload-button": "Upload",
-  // TODO New key - Add a translation
-  "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
-  // "item.edit.delete.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.delete.cancel": "Cancel",
-  
-  // "item.edit.delete.confirm": "Delete",
-  // TODO New key - Add a translation
-  "item.edit.delete.confirm": "Delete",
-  
-  // "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.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.header": "Delete item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.delete.header": "Delete item: {{ 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.head": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.head": "Edit Item",
-  
-  // "item.edit.breadcrumbs": "Edit Item",
-  // TODO New key - Add a translation
-  "item.edit.breadcrumbs": "Edit Item",
-  
-  
-  // "item.edit.tabs.mapper.head": "Collection Mapper",
-  // TODO New key - Add a translation
-  "item.edit.tabs.mapper.head": "Collection Mapper",
-  
-  // "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.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.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.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.cancel": "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.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.item": "Item: \"<b>{{name}}</b>\"",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.item": "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.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.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.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.head": "Mapping completed",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  
-  // "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.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.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.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.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.map": "Map new collections",
-  // TODO New key - Add a translation
-  "item.edit.item-mapper.tabs.map": "Map new collections",
-  
-  
-  
-  // "item.edit.metadata.add-button": "Add",
-  // TODO New key - Add a translation
-  "item.edit.metadata.add-button": "Add",
-  
-  // "item.edit.metadata.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.metadata.discard-button": "Discard",
-  
-  // "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.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.remove": "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.unedit": "Stop editing",
-  // TODO New key - Add a translation
-  "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  
-  // "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.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.edit": "Edit",
-  
-  // "item.edit.metadata.headers.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.field": "Field",
-  
-  // "item.edit.metadata.headers.language": "Lang",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.language": "Lang",
-  
-  // "item.edit.metadata.headers.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.metadata.headers.value": "Value",
-  
-  // "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.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.title": "Changed discarded",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  
-  // "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.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.title": "Metadata invalid",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  
-  // "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.title": "Changed outdated",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  
-  // "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.title": "Metadata saved",
-  // TODO New key - Add a translation
-  "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  
-  // "item.edit.metadata.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.metadata.reinstate-button": "Undo",
-  
-  // "item.edit.metadata.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.metadata.save-button": "Save",
-  
-  
-  
-  // "item.edit.modify.overview.field": "Field",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.field": "Field",
-  
-  // "item.edit.modify.overview.language": "Language",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.language": "Language",
-  
-  // "item.edit.modify.overview.value": "Value",
-  // TODO New key - Add a translation
-  "item.edit.modify.overview.value": "Value",
-  
-  
-  
-  // "item.edit.move.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.move.cancel": "Cancel",
-  
-  // "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.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.head": "Move item: {{id}}",
-  // TODO New key - Add a translation
-  "item.edit.move.head": "Move item: {{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.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.move": "Move",
-  // TODO New key - Add a translation
-  "item.edit.move.move": "Move",
-  
-  // "item.edit.move.processing": "Moving...",
-  // TODO New key - Add a translation
-  "item.edit.move.processing": "Moving...",
-  
-  // "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.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.title": "Move item",
-  // TODO New key - Add a translation
-  "item.edit.move.title": "Move item",
-  
-  
-  
-  // "item.edit.private.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.private.cancel": "Cancel",
-  
-  // "item.edit.private.confirm": "Make it Private",
-  // TODO New key - Add a translation
-  "item.edit.private.confirm": "Make it Private",
-  
-  // "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.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.public.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.public.cancel": "Cancel",
-  
-  // "item.edit.public.confirm": "Make it Public",
-  // TODO New key - Add a translation
-  "item.edit.public.confirm": "Make it Public",
-  
-  // "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.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.reinstate.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.cancel": "Cancel",
-  
-  // "item.edit.reinstate.confirm": "Reinstate",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.confirm": "Reinstate",
-  
-  // "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.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.header": "Reinstate item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.reinstate.header": "Reinstate item: {{ 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.relationships.discard-button": "Discard",
-  // TODO New key - Add a translation
-  "item.edit.relationships.discard-button": "Discard",
-  
-  // "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.remove": "Remove",
-  // TODO New key - Add a translation
-  "item.edit.relationships.edit.buttons.remove": "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.no-relationships": "No relationships",
-  // TODO New key - Add a translation
-  "item.edit.relationships.no-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.title": "Changes discarded",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  
-  // "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.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.title": "Changes outdated",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  
-  // "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.title": "Relationships saved",
-  // TODO New key - Add a translation
-  "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  
-  // "item.edit.relationships.reinstate-button": "Undo",
-  // TODO New key - Add a translation
-  "item.edit.relationships.reinstate-button": "Undo",
-  
-  // "item.edit.relationships.save-button": "Save",
-  // TODO New key - Add a translation
-  "item.edit.relationships.save-button": "Save",
-  
-  // "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.tabs.bitstreams.head": "Bitstreams",
-  // TODO New key - Add a translation
-  "item.edit.tabs.bitstreams.head": "Bitstreams",
-  
-  // "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.curate.head": "Curate",
-  // TODO New key - Add a translation
-  "item.edit.tabs.curate.head": "Curate",
-  
-  // "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.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.relationships.head": "Relationships",
-  // TODO New key - Add a translation
-  "item.edit.tabs.relationships.head": "Relationships",
-  
-  // "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.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.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.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.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.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.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.move.button": "Move...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.move.button": "Move...",
-  
-  // "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.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.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.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.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.reinstate.button": "Reinstate...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  
-  // "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.withdraw.button": "Withdraw...",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  
-  // "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.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.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.itemPage": "Item Page",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.labels.itemPage": "Item Page",
-  
-  // "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.title": "Item Edit -  Status",
-  // TODO New key - Add a translation
-  "item.edit.tabs.status.title": "Item Edit -  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.title": "Item Edit - Version History",
-  // TODO New key - Add a translation
-  "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
-  // "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.view.head": "View Item",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.head": "View Item",
-  
-  // "item.edit.tabs.view.title": "Item Edit -  View",
-  // TODO New key - Add a translation
-  "item.edit.tabs.view.title": "Item Edit -  View",
-  
-  
-  
-  // "item.edit.withdraw.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.cancel": "Cancel",
-  
-  // "item.edit.withdraw.confirm": "Withdraw",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.confirm": "Withdraw",
-  
-  // "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.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.header": "Withdraw item: {{ id }}",
-  // TODO New key - Add a translation
-  "item.edit.withdraw.header": "Withdraw item: {{ 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.listelement.badge": "Item",
-  // TODO New key - Add a translation
-  "item.listelement.badge": "Item",
-  
-  // "item.page.description": "Description",
-  // TODO New key - Add a translation
-  "item.page.description": "Description",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
-  // "item.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "item.page.journal-issn": "Journal ISSN",
-  
-  // "item.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "item.page.journal-title": "Journal Title",
-  
-  // "item.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "item.page.publisher": "Publisher",
-  
-  // "item.page.titleprefix": "Item: ",
-  // TODO New key - Add a translation
-  "item.page.titleprefix": "Item: ",
-  
-  // "item.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "item.page.volume-title": "Volume Title",
-  
-  // "item.search.results.head": "Item Search Results",
-  // TODO New key - Add a translation
-  "item.search.results.head": "Item Search Results",
-  
-  // "item.search.title": "DSpace Angular :: Item Search",
-  // TODO New key - Add a translation
-  "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
-  // "item.page.abstract": "Abstract",
-  // TODO New key - Add a translation
-  "item.page.abstract": "Abstract",
-  
-  // "item.page.author": "Authors",
-  // TODO New key - Add a translation
-  "item.page.author": "Authors",
-  
-  // "item.page.citation": "Citation",
-  // TODO New key - Add a translation
-  "item.page.citation": "Citation",
-  
-  // "item.page.collections": "Collections",
-  // TODO New key - Add a translation
-  "item.page.collections": "Collections",
-  
-  // "item.page.date": "Date",
-  // TODO New key - Add a translation
-  "item.page.date": "Date",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
-  // "item.page.files": "Files",
-  // TODO New key - Add a translation
-  "item.page.files": "Files",
-  
-  // "item.page.filesection.description": "Description:",
-  // TODO New key - Add a translation
-  "item.page.filesection.description": "Description:",
-  
-  // "item.page.filesection.download": "Download",
-  // TODO New key - Add a translation
-  "item.page.filesection.download": "Download",
-  
-  // "item.page.filesection.format": "Format:",
-  // TODO New key - Add a translation
-  "item.page.filesection.format": "Format:",
-  
-  // "item.page.filesection.name": "Name:",
-  // TODO New key - Add a translation
-  "item.page.filesection.name": "Name:",
-  
-  // "item.page.filesection.size": "Size:",
-  // TODO New key - Add a translation
-  "item.page.filesection.size": "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.link.full": "Full item page",
-  // TODO New key - Add a translation
-  "item.page.link.full": "Full item page",
-  
-  // "item.page.link.simple": "Simple item page",
-  // TODO New key - Add a translation
-  "item.page.link.simple": "Simple item page",
-  
-  // "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.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-less": "Hide last {{ amount }}",
-  // TODO New key - Add a translation
-  "item.page.related-items.view-less": "Hide last {{ amount }}",
-  
-  // "item.page.relationships.isAuthorOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isAuthorOfPublication": "Publications",
-  
-  // "item.page.relationships.isJournalOfPublication": "Publications",
-  // TODO New key - Add a translation
-  "item.page.relationships.isJournalOfPublication": "Publications",
-  
-  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
-  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  // TODO New key - Add a translation
-  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
-  // "item.page.subject": "Keywords",
-  // TODO New key - Add a translation
-  "item.page.subject": "Keywords",
-  
-  // "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.collapse": "Collapse",
-  // TODO New key - Add a translation
-  "item.page.bitstreams.collapse": "Collapse",
-  
-  // "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.preview.dc.identifier.uri": "Identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.uri": "Identifier:",
-  
-  // "item.preview.dc.contributor.author": "Authors:",
-  // TODO New key - Add a translation
-  "item.preview.dc.contributor.author": "Authors:",
-  
-  // "item.preview.dc.date.issued": "Published date:",
-  // TODO New key - Add a translation
-  "item.preview.dc.date.issued": "Published date:",
-  
-  // "item.preview.dc.description.abstract": "Abstract:",
-  // TODO New key - Add a translation
-  "item.preview.dc.description.abstract": "Abstract:",
-  
-  // "item.preview.dc.identifier.other": "Other identifier:",
-  // TODO New key - Add a translation
-  "item.preview.dc.identifier.other": "Other identifier:",
-  
-  // "item.preview.dc.language.iso": "Language:",
-  // TODO New key - Add a translation
-  "item.preview.dc.language.iso": "Language:",
-  
-  // "item.preview.dc.subject": "Subjects:",
-  // TODO New key - Add a translation
-  "item.preview.dc.subject": "Subjects:",
-  
-  // "item.preview.dc.title": "Title:",
-  // TODO New key - Add a translation
-  "item.preview.dc.title": "Title:",
-  
-  // "item.preview.person.familyName": "Surname:",
-  // TODO New key - Add a translation
-  "item.preview.person.familyName": "Surname:",
-  
-  // "item.preview.person.givenName": "Name:",
-  // TODO New key - Add a translation
-  "item.preview.person.givenName": "Name:",
-  
-  // "item.preview.person.identifier.orcid": "ORCID:",
-  // TODO New key - Add a translation
-  "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
-  // "item.select.confirm": "Confirm selected",
-  // TODO New key - Add a translation
-  "item.select.confirm": "Confirm selected",
-  
-  // "item.select.empty": "No items to show",
-  // TODO New key - Add a translation
-  "item.select.empty": "No items to show",
-  
-  // "item.select.table.author": "Author",
-  // TODO New key - Add a translation
-  "item.select.table.author": "Author",
-  
-  // "item.select.table.collection": "Collection",
-  // TODO New key - Add a translation
-  "item.select.table.collection": "Collection",
-  
-  // "item.select.table.title": "Title",
-  // TODO New key - Add a translation
-  "item.select.table.title": "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.head": "Version History",
-  // TODO New key - Add a translation
-  "item.version.history.head": "Version History",
-  
-  // "item.version.history.return": "Return",
-  // TODO New key - Add a translation
-  "item.version.history.return": "Return",
-  
-  // "item.version.history.selected": "Selected version",
-  // TODO New key - Add a translation
-  "item.version.history.selected": "Selected version",
-  
-  // "item.version.history.table.version": "Version",
-  // TODO New key - Add a translation
-  "item.version.history.table.version": "Version",
-  
-  // "item.version.history.table.item": "Item",
-  // TODO New key - Add a translation
-  "item.version.history.table.item": "Item",
-  
-  // "item.version.history.table.editor": "Editor",
-  // TODO New key - Add a translation
-  "item.version.history.table.editor": "Editor",
-  
-  // "item.version.history.table.date": "Date",
-  // TODO New key - Add a translation
-  "item.version.history.table.date": "Date",
-  
-  // "item.version.history.table.summary": "Summary",
-  // TODO New key - Add a translation
-  "item.version.history.table.summary": "Summary",
-  
-  
-  
-  // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
-  // 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>.",
-  
-  
-  
-  // "journal.listelement.badge": "Journal",
-  // TODO New key - Add a translation
-  "journal.listelement.badge": "Journal",
-  
-  // "journal.page.description": "Description",
-  // TODO New key - Add a translation
-  "journal.page.description": "Description",
-  
-  // "journal.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journal.page.edit": "Edit this item",
-  
-  // "journal.page.editor": "Editor-in-Chief",
-  // TODO New key - Add a translation
-  "journal.page.editor": "Editor-in-Chief",
-  
-  // "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.titleprefix": "Journal: ",
-  // TODO New key - Add a translation
-  "journal.page.titleprefix": "Journal: ",
-  
-  // "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",
-  
-  
-  
-  // "journalissue.listelement.badge": "Journal Issue",
-  // TODO New key - Add a translation
-  "journalissue.listelement.badge": "Journal Issue",
-  
-  // "journalissue.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalissue.page.description": "Description",
-  
-  // "journalissue.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalissue.page.edit": "Edit this item",
-  
-  // "journalissue.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalissue.page.issuedate": "Issue Date",
-  
-  // "journalissue.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-issn": "Journal ISSN",
-  
-  // "journalissue.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "journalissue.page.journal-title": "Journal Title",
-  
-  // "journalissue.page.keyword": "Keywords",
-  // TODO New key - Add a translation
-  "journalissue.page.keyword": "Keywords",
-  
-  // "journalissue.page.number": "Number",
-  // TODO New key - Add a translation
-  "journalissue.page.number": "Number",
-  
-  // "journalissue.page.titleprefix": "Journal Issue: ",
-  // TODO New key - Add a translation
-  "journalissue.page.titleprefix": "Journal Issue: ",
-  
-  
-  
-  // "journalvolume.listelement.badge": "Journal Volume",
-  // TODO New key - Add a translation
-  "journalvolume.listelement.badge": "Journal Volume",
-  
-  // "journalvolume.page.description": "Description",
-  // TODO New key - Add a translation
-  "journalvolume.page.description": "Description",
-  
-  // "journalvolume.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "journalvolume.page.edit": "Edit this item",
-  
-  // "journalvolume.page.issuedate": "Issue Date",
-  // TODO New key - Add a translation
-  "journalvolume.page.issuedate": "Issue Date",
-  
-  // "journalvolume.page.titleprefix": "Journal Volume: ",
-  // TODO New key - Add a translation
-  "journalvolume.page.titleprefix": "Journal Volume: ",
-  
-  // "journalvolume.page.volume": "Volume",
-  // TODO New key - Add a translation
-  "journalvolume.page.volume": "Volume",
-  
-  
-  
-  // "loading.bitstream": "Loading bitstream...",
-  // TODO New key - Add a translation
-  "loading.bitstream": "Loading bitstream...",
-  
-  // "loading.bitstreams": "Loading bitstreams...",
-  // TODO New key - Add a translation
-  "loading.bitstreams": "Loading bitstreams...",
-  
-  // "loading.browse-by": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.browse-by": "Loading items...",
-  
-  // "loading.browse-by-page": "Loading page...",
-  // TODO New key - Add a translation
-  "loading.browse-by-page": "Loading page...",
-  
-  // "loading.collection": "Loading collection...",
-  // TODO New key - Add a translation
-  "loading.collection": "Loading collection...",
-  
-  // "loading.collections": "Loading collections...",
-  // TODO New key - Add a translation
-  "loading.collections": "Loading collections...",
-  
-  // "loading.content-source": "Loading content source...",
-  // TODO New key - Add a translation
-  "loading.content-source": "Loading content source...",
-  
-  // "loading.community": "Loading community...",
-  // TODO New key - Add a translation
-  "loading.community": "Loading community...",
-  
-  // "loading.default": "Loading...",
-  // TODO New key - Add a translation
-  "loading.default": "Loading...",
-  
-  // "loading.item": "Loading item...",
-  // TODO New key - Add a translation
-  "loading.item": "Loading item...",
-  
-  // "loading.items": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.items": "Loading items...",
-  
-  // "loading.mydspace-results": "Loading items...",
-  // TODO New key - Add a translation
-  "loading.mydspace-results": "Loading items...",
-  
-  // "loading.objects": "Loading...",
-  // TODO New key - Add a translation
-  "loading.objects": "Loading...",
-  
-  // "loading.recent-submissions": "Loading recent submissions...",
-  // TODO New key - Add a translation
-  "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.sub-collections": "Loading sub-collections...",
-  // TODO New key - Add a translation
-  "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.top-level-communities": "Loading top-level communities...",
-  // TODO New key - Add a translation
-  "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.forgot-password": "Have you forgotten your password?",
-  // TODO New key - Add a translation
-  "login.form.forgot-password": "Have you forgotten your 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.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.or-divider": "or",
-  // TODO New key - Add a translation
-  "login.form.or-divider": "or",
-  
-  // "login.form.password": "Password",
-  // TODO New key - Add a translation
-  "login.form.password": "Password",
-  
-  // "login.form.shibboleth": "Log in with Shibboleth",
-  // TODO New key - Add a translation
-  "login.form.shibboleth": "Log in with Shibboleth",
-  
-  // "login.form.submit": "Log in",
-  // TODO New key - Add a translation
-  "login.form.submit": "Log in",
-  
-  // "login.title": "Login",
-  // TODO New key - Add a translation
-  "login.title": "Login",
-  
-  // "login.breadcrumbs": "Login",
-  // TODO New key - Add a translation
-  "login.breadcrumbs": "Login",
-  
-  
-  
-  // "logout.form.header": "Log out from DSpace",
-  // TODO New key - Add a translation
-  "logout.form.header": "Log out from DSpace",
-  
-  // "logout.form.submit": "Log out",
-  // TODO New key - Add a translation
-  "logout.form.submit": "Log out",
-  
-  // "logout.title": "Logout",
-  // TODO New key - Add a translation
-  "logout.title": "Logout",
-  
-  
-  
-  // "menu.header.admin": "Admin",
-  // TODO New key - Add a translation
-  "menu.header.admin": "Admin",
-  
-  // "menu.header.image.logo": "Repository logo",
-  // TODO New key - Add a translation
-  "menu.header.image.logo": "Repository logo",
-  
-  
-  
-  // "menu.section.access_control": "Access Control",
-  // TODO New key - Add a translation
-  "menu.section.access_control": "Access Control",
-  
-  // "menu.section.access_control_authorizations": "Authorizations",
-  // TODO New key - Add a translation
-  "menu.section.access_control_authorizations": "Authorizations",
-  
-  // "menu.section.access_control_groups": "Groups",
-  // TODO New key - Add a translation
-  "menu.section.access_control_groups": "Groups",
-  
-  // "menu.section.access_control_people": "People",
-  // TODO New key - Add a translation
-  "menu.section.access_control_people": "People",
-  
-  
-  
-  // "menu.section.admin_search": "Admin Search",
-  // TODO New key - Add a translation
-  "menu.section.admin_search": "Admin Search",
-  
-  
-  
-  // "menu.section.browse_community": "This Community",
-  // TODO New key - Add a translation
-  "menu.section.browse_community": "This 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_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_title": "By Title",
-  // TODO New key - Add a translation
-  "menu.section.browse_community_by_title": "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_by_author": "By Author",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_author": "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_subject": "By Subject",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_by_subject": "By Subject",
-  
-  // "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_communities_and_collections": "Communities & Collections",
-  // TODO New key - Add a translation
-  "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  
-  
-  
-  // "menu.section.control_panel": "Control Panel",
-  // TODO New key - Add a translation
-  "menu.section.control_panel": "Control Panel",
-  
-  // "menu.section.curation_task": "Curation Task",
-  // TODO New key - Add a translation
-  "menu.section.curation_task": "Curation Task",
-  
-  
-  
-  // "menu.section.edit": "Edit",
-  // TODO New key - Add a translation
-  "menu.section.edit": "Edit",
-  
-  // "menu.section.edit_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.edit_collection": "Collection",
-  
-  // "menu.section.edit_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.edit_community": "Community",
-  
-  // "menu.section.edit_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.edit_item": "Item",
-  
-  
-  
-  // "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_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.export_community": "Community",
-  
-  // "menu.section.export_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.export_item": "Item",
-  
-  // "menu.section.export_metadata": "Metadata",
-  // TODO New key - Add a translation
-  "menu.section.export_metadata": "Metadata",
-  
-  
-  
-  // "menu.section.icon.access_control": "Access Control menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.access_control": "Access Control 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.control_panel": "Control Panel menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.control_panel": "Control Panel menu section",
-  
-  // "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.edit": "Edit menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.edit": "Edit menu section",
-  
-  // "menu.section.icon.export": "Export menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.export": "Export menu section",
-  
-  // "menu.section.icon.find": "Find menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.find": "Find menu section",
-  
-  // "menu.section.icon.import": "Import menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.import": "Import menu section",
-  
-  // "menu.section.icon.new": "New menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.new": "New menu section",
-  
-  // "menu.section.icon.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.pin": "Pin sidebar",
-  
-  // "menu.section.icon.processes": "Processes menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.processes": "Processes menu section",
-  
-  // "menu.section.icon.registries": "Registries menu section",
-  // TODO New key - Add a translation
-  "menu.section.icon.registries": "Registries menu section",
-  
-  // "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.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.icon.unpin": "Unpin sidebar",
-  
-  
-  
-  // "menu.section.import": "Import",
-  // TODO New key - Add a translation
-  "menu.section.import": "Import",
-  
-  // "menu.section.import_batch": "Batch Import (ZIP)",
-  // TODO New key - Add a translation
-  "menu.section.import_batch": "Batch 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_collection": "Collection",
-  // TODO New key - Add a translation
-  "menu.section.new_collection": "Collection",
-  
-  // "menu.section.new_community": "Community",
-  // TODO New key - Add a translation
-  "menu.section.new_community": "Community",
-  
-  // "menu.section.new_item": "Item",
-  // TODO New key - Add a translation
-  "menu.section.new_item": "Item",
-  
-  // "menu.section.new_item_version": "Item Version",
-  // TODO New key - Add a translation
-  "menu.section.new_item_version": "Item Version",
-  
-  // "menu.section.new_process": "Process",
-  // TODO New key - Add a translation
-  "menu.section.new_process": "Process",
-  
-  
-  
-  // "menu.section.pin": "Pin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.pin": "Pin sidebar",
-  
-  // "menu.section.unpin": "Unpin sidebar",
-  // TODO New key - Add a translation
-  "menu.section.unpin": "Unpin sidebar",
-  
-  
-  
-  // "menu.section.processes": "Processes",
-  // TODO New key - Add a translation
-  "menu.section.processes": "Processes",
-  
-  
-  
-  // "menu.section.registries": "Registries",
-  // TODO New key - Add a translation
-  "menu.section.registries": "Registries",
-  
-  // "menu.section.registries_format": "Format",
-  // TODO New key - Add a translation
-  "menu.section.registries_format": "Format",
-  
-  // "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_task": "Statistics Task",
-  // TODO New key - Add a translation
-  "menu.section.statistics_task": "Statistics Task",
-  
-  
-  
-  // "menu.section.toggle.access_control": "Toggle Access Control section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.access_control": "Toggle Access Control 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.curation_task": "Toggle Curation Task section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  
-  // "menu.section.toggle.edit": "Toggle Edit section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.edit": "Toggle Edit section",
-  
-  // "menu.section.toggle.export": "Toggle Export section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.export": "Toggle Export section",
-  
-  // "menu.section.toggle.find": "Toggle Find section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.find": "Toggle Find section",
-  
-  // "menu.section.toggle.import": "Toggle Import section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.import": "Toggle Import section",
-  
-  // "menu.section.toggle.new": "Toggle New section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.new": "Toggle New section",
-  
-  // "menu.section.toggle.registries": "Toggle Registries section",
-  // TODO New key - Add a translation
-  "menu.section.toggle.registries": "Toggle Registries section",
-  
-  // "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.workflow": "Administer Workflow",
-  // TODO New key - Add a translation
-  "menu.section.workflow": "Administer Workflow",
-  
-  
-  // "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.description-placeholder": "Insert your message here...",
-  // TODO New key - Add a translation
-  "mydspace.messages.description-placeholder": "Insert your message here...",
-  
-  // "mydspace.messages.hide-msg": "Hide message",
-  // TODO New key - Add a translation
-  "mydspace.messages.hide-msg": "Hide message",
-  
-  // "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-unread": "Mark as unread",
-  // TODO New key - Add a translation
-  "mydspace.messages.mark-as-unread": "Mark as unread",
-  
-  // "mydspace.messages.no-content": "No content.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-content": "No content.",
-  
-  // "mydspace.messages.no-messages": "No messages yet.",
-  // TODO New key - Add a translation
-  "mydspace.messages.no-messages": "No messages yet.",
-  
-  // "mydspace.messages.send-btn": "Send",
-  // TODO New key - Add a translation
-  "mydspace.messages.send-btn": "Send",
-  
-  // "mydspace.messages.show-msg": "Show message",
-  // TODO New key - Add a translation
-  "mydspace.messages.show-msg": "Show message",
-  
-  // "mydspace.messages.subject-placeholder": "Subject...",
-  // TODO New key - Add a translation
-  "mydspace.messages.subject-placeholder": "Subject...",
-  
-  // "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.title": "Messages",
-  // TODO New key - Add a translation
-  "mydspace.messages.title": "Messages",
-  
-  // "mydspace.messages.to": "To",
-  // TODO New key - Add a translation
-  "mydspace.messages.to": "To",
-  
-  // "mydspace.new-submission": "New submission",
-  // TODO New key - Add a translation
-  "mydspace.new-submission": "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-short": "Import metadata",
-  // TODO New key - Add a translation
-  "mydspace.new-submission-external-short": "Import metadata",
-  
-  // "mydspace.results.head": "Your submissions",
-  // TODO New key - Add a translation
-  "mydspace.results.head": "Your submissions",
-  
-  // "mydspace.results.no-abstract": "No Abstract",
-  // TODO New key - Add a translation
-  "mydspace.results.no-abstract": "No Abstract",
-  
-  // "mydspace.results.no-authors": "No Authors",
-  // TODO New key - Add a translation
-  "mydspace.results.no-authors": "No Authors",
-  
-  // "mydspace.results.no-collections": "No Collections",
-  // TODO New key - Add a translation
-  "mydspace.results.no-collections": "No Collections",
-  
-  // "mydspace.results.no-date": "No Date",
-  // TODO New key - Add a translation
-  "mydspace.results.no-date": "No Date",
-  
-  // "mydspace.results.no-files": "No Files",
-  // TODO New key - Add a translation
-  "mydspace.results.no-files": "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-title": "No title",
-  // TODO New key - Add a translation
-  "mydspace.results.no-title": "No title",
-  
-  // "mydspace.results.no-uri": "No Uri",
-  // TODO New key - Add a translation
-  "mydspace.results.no-uri": "No Uri",
-  
-  // "mydspace.show.workflow": "All tasks",
-  // TODO New key - Add a translation
-  "mydspace.show.workflow": "All tasks",
-  
-  // "mydspace.show.workspace": "Your Submissions",
-  // TODO New key - Add a translation
-  "mydspace.show.workspace": "Your Submissions",
-  
-  // "mydspace.status.archived": "Archived",
-  // TODO New key - Add a translation
-  "mydspace.status.archived": "Archived",
-  
-  // "mydspace.status.validation": "Validation",
-  // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
-  
-  // "mydspace.status.workflow": "Workflow",
-  // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
-  
-  // "mydspace.status.workspace": "Workspace",
-  // TODO New key - Add a translation
-  "mydspace.status.workspace": "Workspace",
-  
-  // "mydspace.title": "MyDSpace",
-  // TODO New key - Add a translation
-  "mydspace.title": "MyDSpace",
-  
-  // "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-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-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-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.view-btn": "View",
-  // TODO New key - Add a translation
-  "mydspace.view-btn": "View",
-  
-  
-  
-  // "nav.browse.header": "All of DSpace",
-  // TODO New key - Add a translation
-  "nav.browse.header": "All of DSpace",
-  
-  // "nav.community-browse.header": "By Community",
-  // TODO New key - Add a translation
-  "nav.community-browse.header": "By Community",
-  
-  // "nav.language": "Language switch",
-  // TODO New key - Add a translation
-  "nav.language": "Language switch",
-  
-  // "nav.login": "Log In",
-  // TODO New key - Add a translation
-  "nav.login": "Log In",
-  
-  // "nav.logout": "Log Out",
-  // TODO New key - Add a translation
-  "nav.logout": "Log Out",
-  
-  // "nav.mydspace": "MyDSpace",
-  // TODO New key - Add a translation
-  "nav.mydspace": "MyDSpace",
-  
-  // "nav.profile": "Profile",
-  // TODO New key - Add a translation
-  "nav.profile": "Profile",
-  
-  // "nav.search": "Search",
-  // TODO New key - Add a translation
-  "nav.search": "Search",
-  
-  // "nav.statistics.header": "Statistics",
-  // TODO New key - Add a translation
-  "nav.statistics.header": "Statistics",
-  
-  // "nav.stop-impersonating": "Stop impersonating EPerson",
-  // TODO New key - Add a translation
-  "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
-  // "orgunit.listelement.badge": "Organizational Unit",
-  // TODO New key - Add a translation
-  "orgunit.listelement.badge": "Organizational Unit",
-  
-  // "orgunit.page.city": "City",
-  // TODO New key - Add a translation
-  "orgunit.page.city": "City",
-  
-  // "orgunit.page.country": "Country",
-  // TODO New key - Add a translation
-  "orgunit.page.country": "Country",
-  
-  // "orgunit.page.dateestablished": "Date established",
-  // TODO New key - Add a translation
-  "orgunit.page.dateestablished": "Date established",
-  
-  // "orgunit.page.description": "Description",
-  // TODO New key - Add a translation
-  "orgunit.page.description": "Description",
-  
-  // "orgunit.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "orgunit.page.edit": "Edit this item",
-  
-  // "orgunit.page.id": "ID",
-  // TODO New key - Add a translation
-  "orgunit.page.id": "ID",
-  
-  // "orgunit.page.titleprefix": "Organizational Unit: ",
-  // TODO New key - Add a translation
-  "orgunit.page.titleprefix": "Organizational Unit: ",
-  
-  
-  
-  // "pagination.results-per-page": "Results Per Page",
-  // TODO New key - Add a translation
-  "pagination.results-per-page": "Results Per Page",
-  
-  // "pagination.showing.detail": "{{ range }} of {{ total }}",
-  // TODO New key - Add a translation
-  "pagination.showing.detail": "{{ range }} of {{ total }}",
-  
-  // "pagination.showing.label": "Now showing ",
-  // TODO New key - Add a translation
-  "pagination.showing.label": "Now showing ",
-  
-  // "pagination.sort-direction": "Sort Options",
-  // TODO New key - Add a translation
-  "pagination.sort-direction": "Sort Options",
-  
-  
-  
-  // "person.listelement.badge": "Person",
-  // TODO New key - Add a translation
-  "person.listelement.badge": "Person",
-  
-  // "person.listelement.no-title": "No name found",
-  // TODO New key - Add a translation
-  "person.listelement.no-title": "No name found",
-  
-  // "person.page.birthdate": "Birth Date",
-  // TODO New key - Add a translation
-  "person.page.birthdate": "Birth Date",
-  
-  // "person.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "person.page.edit": "Edit this item",
-  
-  // "person.page.email": "Email Address",
-  // TODO New key - Add a translation
-  "person.page.email": "Email Address",
-  
-  // "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.lastname": "Last Name",
-  // TODO New key - Add a translation
-  "person.page.lastname": "Last Name",
-  
-  // "person.page.link.full": "Show all metadata",
-  // TODO New key - Add a translation
-  "person.page.link.full": "Show all 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.titleprefix": "Person: ",
-  // TODO New key - Add a translation
-  "person.page.titleprefix": "Person: ",
-  
-  // "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",
-  
-  
-  
-  // "process.new.select-parameters": "Parameters",
-  // TODO New key - Add a translation
-  "process.new.select-parameters": "Parameters",
-  
-  // "process.new.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "process.new.cancel": "Cancel",
-  
-  // "process.new.submit": "Submit",
-  // TODO New key - Add a translation
-  "process.new.submit": "Submit",
-  
-  // "process.new.select-script": "Script",
-  // TODO New key - Add a translation
-  "process.new.select-script": "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.required": "Script is required",
-  // TODO New key - Add a translation
-  "process.new.select-script.required": "Script is 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.required": "Please select a file",
-  // TODO New key - Add a translation
-  "process.new.parameter.file.required": "Please select a file",
-  
-  // "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.type.value": "value",
-  // TODO New key - Add a translation
-  "process.new.parameter.type.value": "value",
-  
-  // "process.new.parameter.type.file": "file",
-  // TODO New key - Add a translation
-  "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.notification.success.title": "Success",
-  // TODO New key - Add a translation
-  "process.new.notification.success.title": "Success",
-  
-  // "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.error.title": "Error",
-  // TODO New key - Add a translation
-  "process.new.notification.error.title": "Error",
-  
-  // "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.header": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.header": "Create a new process",
-  
-  // "process.new.title": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.title": "Create a new process",
-  
-  // "process.new.breadcrumbs": "Create a new process",
-  // TODO New key - Add a translation
-  "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
-  // "process.detail.arguments" : "Arguments",
-  // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
-  
-  // "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.logs.button": "Retrieve process output",
-  // TODO New key - Add a translation
-  "process.detail.logs.button": "Retrieve process output",
-  
-  // "process.detail.logs.loading": "Retrieving",
-  // TODO New key - Add a translation
-  "process.detail.logs.loading": "Retrieving",
-  
-  // "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.output-files" : "Output Files",
-  // TODO New key - Add a translation
-  "process.detail.output-files" : "Output Files",
-  
-  // "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.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.start-time" : "Start time",
-  // TODO New key - Add a translation
-  "process.detail.start-time" : "Start time",
-  
-  // "process.detail.end-time" : "Finish time",
-  // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
-  // "process.detail.status" : "Status",
-  // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
-  // "process.detail.create" : "Create similar process",
-  // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
-  // "process.overview.table.finish" : "Finish time",
-  // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
-  // "process.overview.table.id" : "Process ID",
-  // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
-  // "process.overview.table.name" : "Name",
-  // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
-  // "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.title": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.title": "Processes Overview",
-  
-  // "process.overview.breadcrumbs": "Processes Overview",
-  // TODO New key - Add a translation
-  "process.overview.breadcrumbs": "Processes Overview",
-  
-  // "process.overview.new": "New",
-  // TODO New key - Add a translation
-  "process.overview.new": "New",
-  
-  
-  // "profile.breadcrumbs": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.breadcrumbs": "Update Profile",
-  
-  // "profile.card.identify": "Identify",
-  // TODO New key - Add a translation
-  "profile.card.identify": "Identify",
-  
-  // "profile.card.security": "Security",
-  // TODO New key - Add a translation
-  "profile.card.security": "Security",
-  
-  // "profile.form.submit": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.form.submit": "Update Profile",
-  
-  // "profile.groups.head": "Authorization groups you belong to",
-  // TODO New key - Add a translation
-  "profile.groups.head": "Authorization groups you belong to",
-  
-  // "profile.head": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.head": "Update Profile",
-  
-  // "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.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.label.email": "Email Address",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.email": "Email Address",
-  
-  // "profile.metadata.form.label.firstname": "First Name",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.firstname": "First Name",
-  
-  // "profile.metadata.form.label.language": "Language",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.language": "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.phone": "Contact Telephone",
-  // TODO New key - Add a translation
-  "profile.metadata.form.label.phone": "Contact Telephone",
-  
-  // "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.title": "Profile saved",
-  // TODO New key - Add a translation
-  "profile.metadata.form.notifications.success.title": "Profile saved",
-  
-  // "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.title": "No changes",
-  // TODO New key - Add a translation
-  "profile.notifications.warning.no-changes.title": "No changes",
-  
-  // "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.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.label.password": "Password",
-  // TODO New key - Add a translation
-  "profile.security.form.label.password": "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.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.title": "Password saved",
-  // TODO New key - Add a translation
-  "profile.security.form.notifications.success.title": "Password saved",
-  
-  // "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.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.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.title": "Update Profile",
-  // TODO New key - Add a translation
-  "profile.title": "Update Profile",
-  
-  
-  
-  // "project.listelement.badge": "Research Project",
-  // TODO New key - Add a translation
-  "project.listelement.badge": "Research Project",
-  
-  // "project.page.contributor": "Contributors",
-  // TODO New key - Add a translation
-  "project.page.contributor": "Contributors",
-  
-  // "project.page.description": "Description",
-  // TODO New key - Add a translation
-  "project.page.description": "Description",
-  
-  // "project.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "project.page.edit": "Edit this item",
-  
-  // "project.page.expectedcompletion": "Expected Completion",
-  // TODO New key - Add a translation
-  "project.page.expectedcompletion": "Expected Completion",
-  
-  // "project.page.funder": "Funders",
-  // TODO New key - Add a translation
-  "project.page.funder": "Funders",
-  
-  // "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.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.search.results.head": "Project Search Results",
-  // TODO New key - Add a translation
-  "project.search.results.head": "Project Search Results",
-  
-  
-  
-  // "publication.listelement.badge": "Publication",
-  // TODO New key - Add a translation
-  "publication.listelement.badge": "Publication",
-  
-  // "publication.page.description": "Description",
-  // TODO New key - Add a translation
-  "publication.page.description": "Description",
-  
-  // "publication.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "publication.page.edit": "Edit this item",
-  
-  // "publication.page.journal-issn": "Journal ISSN",
-  // TODO New key - Add a translation
-  "publication.page.journal-issn": "Journal ISSN",
-  
-  // "publication.page.journal-title": "Journal Title",
-  // TODO New key - Add a translation
-  "publication.page.journal-title": "Journal Title",
-  
-  // "publication.page.publisher": "Publisher",
-  // TODO New key - Add a translation
-  "publication.page.publisher": "Publisher",
-  
-  // "publication.page.titleprefix": "Publication: ",
-  // TODO New key - Add a translation
-  "publication.page.titleprefix": "Publication: ",
-  
-  // "publication.page.volume-title": "Volume Title",
-  // TODO New key - Add a translation
-  "publication.page.volume-title": "Volume Title",
-  
-  // "publication.search.results.head": "Publication Search Results",
-  // TODO New key - Add a translation
-  "publication.search.results.head": "Publication Search Results",
-  
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  // TODO New key - Add a translation
-  "publication.search.title": "DSpace Angular :: Publication Search",
-  
-  
-  // "register-email.title": "New user registration",
-  // TODO New key - Add a translation
-  "register-email.title": "New user registration",
-  
-  // "register-page.create-profile.header": "Create Profile",
-  // TODO New key - Add a translation
-  "register-page.create-profile.header": "Create Profile",
-  
-  // "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.email": "Email Address",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.email": "Email Address",
-  
-  // "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.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.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.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.contact": "Contact Telephone",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.contact": "Contact Telephone",
-  
-  // "register-page.create-profile.identification.language": "Language",
-  // TODO New key - Add a translation
-  "register-page.create-profile.identification.language": "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.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.label.password": "Password *",
-  // TODO New key - Add a translation
-  "register-page.create-profile.security.label.password": "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.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.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.submit": "Complete Registration",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit": "Complete Registration",
-  
-  // "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.head": "Registration failed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.error.head": "Registration failed",
-  
-  // "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.head": "Registration completed",
-  // TODO New key - Add a translation
-  "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
-  // "register-page.registration.header": "New user registration",
-  // TODO New key - Add a translation
-  "register-page.registration.header": "New user registration",
-  
-  // "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.email": "Email Address *",
-  // TODO New key - Add a translation
-  "register-page.registration.email": "Email Address *",
-  
-  // "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.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.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.submit": "Register",
-  // TODO New key - Add a translation
-  "register-page.registration.submit": "Register",
-  
-  // "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.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.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.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 }}",
-  
-  
-  
-  // "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.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.title": "Unable to add relationship",
-  // TODO New key - Add a translation
-  "relationships.add.error.title": "Unable to add relationship",
-  
-  // "relationships.isAuthorOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf": "Authors",
-  
-  // "relationships.isAuthorOf.Person": "Authors (persons)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.Person": "Authors (persons)",
-  
-  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  // TODO New key - Add a translation
-  "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
-  // "relationships.isIssueOf": "Journal Issues",
-  // TODO New key - Add a translation
-  "relationships.isIssueOf": "Journal Issues",
-  
-  // "relationships.isJournalIssueOf": "Journal Issue",
-  // TODO New key - Add a translation
-  "relationships.isJournalIssueOf": "Journal Issue",
-  
-  // "relationships.isJournalOf": "Journals",
-  // TODO New key - Add a translation
-  "relationships.isJournalOf": "Journals",
-  
-  // "relationships.isOrgUnitOf": "Organizational Units",
-  // TODO New key - Add a translation
-  "relationships.isOrgUnitOf": "Organizational Units",
-  
-  // "relationships.isPersonOf": "Authors",
-  // TODO New key - Add a translation
-  "relationships.isPersonOf": "Authors",
-  
-  // "relationships.isProjectOf": "Research Projects",
-  // TODO New key - Add a translation
-  "relationships.isProjectOf": "Research Projects",
-  
-  // "relationships.isPublicationOf": "Publications",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOf": "Publications",
-  
-  // "relationships.isPublicationOfJournalIssue": "Articles",
-  // TODO New key - Add a translation
-  "relationships.isPublicationOfJournalIssue": "Articles",
-  
-  // "relationships.isSingleJournalOf": "Journal",
-  // TODO New key - Add a translation
-  "relationships.isSingleJournalOf": "Journal",
-  
-  // "relationships.isSingleVolumeOf": "Journal Volume",
-  // TODO New key - Add a translation
-  "relationships.isSingleVolumeOf": "Journal Volume",
-  
-  // "relationships.isVolumeOf": "Journal Volumes",
-  // TODO New key - Add a translation
-  "relationships.isVolumeOf": "Journal Volumes",
-  
-  // "relationships.isContributorOf": "Contributors",
-  // TODO New key - Add a translation
-  "relationships.isContributorOf": "Contributors",
-  
-  
-  
-  // "resource-policies.add.button": "Add",
-  // TODO New key - Add a translation
-  "resource-policies.add.button": "Add",
-  
-  // "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.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.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.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.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.collection": "Add a new Collection policy",
-  // TODO New key - Add a translation
-  "resource-policies.add.for.collection": "Add a new Collection policy",
-  
-  // "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.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.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.create.page.success.content": "Operation successful",
-  
-  // "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.delete.btn": "Delete selected",
-  // TODO New key - Add a translation
-  "resource-policies.delete.btn": "Delete selected",
-  
-  // "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.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.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.delete.success.content": "Operation successful",
-  
-  // "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.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.success.content": "Operation successful",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.success.content": "Operation successful",
-  
-  // "resource-policies.edit.page.title": "Edit resource policy",
-  // TODO New key - Add a translation
-  "resource-policies.edit.page.title": "Edit resource policy",
-  
-  // "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.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.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.select.btn": "Select",
-  // TODO New key - Add a translation
-  "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
-  // "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.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.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.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.date.end.label": "End Date",
-  // TODO New key - Add a translation
-  "resource-policies.form.date.end.label": "End Date",
-  
-  // "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.description.label": "Description",
-  // TODO New key - Add a translation
-  "resource-policies.form.description.label": "Description",
-  
-  // "resource-policies.form.name.label": "Name",
-  // TODO New key - Add a translation
-  "resource-policies.form.name.label": "Name",
-  
-  // "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.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.table.headers.action": "Action",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.action": "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.start": "Start Date",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.date.start": "Start Date",
-  
-  // "resource-policies.table.headers.edit": "Edit",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit": "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.policy": "Edit policy",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.edit.policy": "Edit policy",
-  
-  // "resource-policies.table.headers.eperson": "EPerson",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.eperson": "EPerson",
-  
-  // "resource-policies.table.headers.group": "Group",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.group": "Group",
-  
-  // "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.policyType": "type",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.policyType": "type",
-  
-  // "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.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.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.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.collection": "Policies for Collection",
-  // TODO New key - Add a translation
-  "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
-  // "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.title": "DSpace Angular :: Search",
-  // TODO New key - Add a translation
-  "search.title": "DSpace Angular :: Search",
-  
-  // "search.breadcrumbs": "Search",
-  // TODO New key - Add a translation
-  "search.breadcrumbs": "Search",
-  
-  
-  // "search.filters.applied.f.author": "Author",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.author": "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.min": "Start date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateIssued.min": "Start date",
-  
-  // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.dateSubmitted": "Date submitted",
-  
-  // "search.filters.applied.f.discoverable": "Private",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.discoverable": "Private",
-  
-  // "search.filters.applied.f.entityType": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.entityType": "Item Type",
-  
-  // "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.itemtype": "Type",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.itemtype": "Type",
-  
-  // "search.filters.applied.f.namedresourcetype": "Status",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.namedresourcetype": "Status",
-  
-  // "search.filters.applied.f.subject": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.subject": "Subject",
-  
-  // "search.filters.applied.f.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.submitter": "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.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.min": "Start birth date",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.birthDate.min": "Start birth date",
-  
-  // "search.filters.applied.f.withdrawn": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
-  // "search.filters.filter.author.head": "Author",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.head": "Author",
-  
-  // "search.filters.filter.author.placeholder": "Author name",
-  // TODO New key - Add a translation
-  "search.filters.filter.author.placeholder": "Author name",
-  
-  // "search.filters.filter.birthDate.head": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.head": "Birth Date",
-  
-  // "search.filters.filter.birthDate.placeholder": "Birth Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.birthDate.placeholder": "Birth Date",
-  
-  // "search.filters.filter.creativeDatePublished.head": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.head": "Date Published",
-  
-  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  
-  // "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.creativeWorkKeywords.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  
-  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  
-  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  
-  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  // TODO New key - Add a translation
-  "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  
-  // "search.filters.filter.dateIssued.head": "Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.head": "Date",
-  
-  // "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.min.placeholder": "Maximum Date",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  
-  // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.head": "Date submitted",
-  
-  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  // TODO New key - Add a translation
-  "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  
-  // "search.filters.filter.discoverable.head": "Private",
-  // TODO New key - Add a translation
-  "search.filters.filter.discoverable.head": "Private",
-  
-  // "search.filters.filter.withdrawn.head": "Withdrawn",
-  // TODO New key - Add a translation
-  "search.filters.filter.withdrawn.head": "Withdrawn",
-  
-  // "search.filters.filter.entityType.head": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.head": "Item Type",
-  
-  // "search.filters.filter.entityType.placeholder": "Item Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.entityType.placeholder": "Item Type",
-  
-  // "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.itemtype.head": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.head": "Type",
-  
-  // "search.filters.filter.itemtype.placeholder": "Type",
-  // TODO New key - Add a translation
-  "search.filters.filter.itemtype.placeholder": "Type",
-  
-  // "search.filters.filter.jobTitle.head": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.head": "Job Title",
-  
-  // "search.filters.filter.jobTitle.placeholder": "Job Title",
-  // TODO New key - Add a translation
-  "search.filters.filter.jobTitle.placeholder": "Job Title",
-  
-  // "search.filters.filter.knowsLanguage.head": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.head": "Known language",
-  
-  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  // TODO New key - Add a translation
-  "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  
-  // "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.objectpeople.head": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.head": "People",
-  
-  // "search.filters.filter.objectpeople.placeholder": "People",
-  // TODO New key - Add a translation
-  "search.filters.filter.objectpeople.placeholder": "People",
-  
-  // "search.filters.filter.organizationAddressCountry.head": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.head": "Country",
-  
-  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  
-  // "search.filters.filter.organizationAddressLocality.head": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.head": "City",
-  
-  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  
-  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  
-  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  // TODO New key - Add a translation
-  "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  
-  // "search.filters.filter.scope.head": "Scope",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.head": "Scope",
-  
-  // "search.filters.filter.scope.placeholder": "Scope filter",
-  // TODO New key - Add a translation
-  "search.filters.filter.scope.placeholder": "Scope filter",
-  
-  // "search.filters.filter.show-less": "Collapse",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-less": "Collapse",
-  
-  // "search.filters.filter.show-more": "Show more",
-  // TODO New key - Add a translation
-  "search.filters.filter.show-more": "Show more",
-  
-  // "search.filters.filter.subject.head": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.head": "Subject",
-  
-  // "search.filters.filter.subject.placeholder": "Subject",
-  // TODO New key - Add a translation
-  "search.filters.filter.subject.placeholder": "Subject",
-  
-  // "search.filters.filter.submitter.head": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.head": "Submitter",
-  
-  // "search.filters.filter.submitter.placeholder": "Submitter",
-  // TODO New key - Add a translation
-  "search.filters.filter.submitter.placeholder": "Submitter",
-  
-  
-  
-  // "search.filters.entityType.JournalIssue": "Journal Issue",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalIssue": "Journal Issue",
-  
-  // "search.filters.entityType.JournalVolume": "Journal Volume",
-  // TODO New key - Add a translation
-  "search.filters.entityType.JournalVolume": "Journal Volume",
-  
-  // "search.filters.entityType.OrgUnit": "Organizational Unit",
-  // TODO New key - Add a translation
-  "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
-  // "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.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.has_content_in_original_bundle.false": "No",
-  
-  // "search.filters.discoverable.true": "No",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.true": "No",
-  
-  // "search.filters.discoverable.false": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.discoverable.false": "Yes",
-  
-  // "search.filters.withdrawn.true": "Yes",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.true": "Yes",
-  
-  // "search.filters.withdrawn.false": "No",
-  // TODO New key - Add a translation
-  "search.filters.withdrawn.false": "No",
-  
-  
-  // "search.filters.head": "Filters",
-  // TODO New key - Add a translation
-  "search.filters.head": "Filters",
-  
-  // "search.filters.reset": "Reset filters",
-  // TODO New key - Add a translation
-  "search.filters.reset": "Reset filters",
-  
-  
-  
-  // "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.results.head": "Search Results",
-  // TODO New key - Add a translation
-  "search.results.head": "Search Results",
-  
-  // "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-link": "quotes around it",
-  // TODO New key - Add a translation
-  "search.results.no-results-link": "quotes around it",
-  
-  // "search.results.empty": "Your search returned no results.",
-  // TODO New key - Add a translation
-  "search.results.empty": "Your search returned no results.",
-  
-  
-  
-  // "search.sidebar.close": "Back to results",
-  // TODO New key - Add a translation
-  "search.sidebar.close": "Back to results",
-  
-  // "search.sidebar.filters.title": "Filters",
-  // TODO New key - Add a translation
-  "search.sidebar.filters.title": "Filters",
-  
-  // "search.sidebar.open": "Search Tools",
-  // TODO New key - Add a translation
-  "search.sidebar.open": "Search Tools",
-  
-  // "search.sidebar.results": "results",
-  // TODO New key - Add a translation
-  "search.sidebar.results": "results",
-  
-  // "search.sidebar.settings.rpp": "Results per page",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.rpp": "Results per page",
-  
-  // "search.sidebar.settings.sort-by": "Sort By",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.sort-by": "Sort By",
-  
-  // "search.sidebar.settings.title": "Settings",
-  // TODO New key - Add a translation
-  "search.sidebar.settings.title": "Settings",
-  
-  
-  
-  // "search.view-switch.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "search.view-switch.show-detail": "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-list": "Show as list",
-  // TODO New key - Add a translation
-  "search.view-switch.show-list": "Show as list",
-  
-  
-  
-  // "sorting.ASC": "Ascending",
-  // TODO New key - Add a translation
-  "sorting.ASC": "Ascending",
-  
-  // "sorting.DESC": "Descending",
-  // TODO New key - Add a translation
-  "sorting.DESC": "Descending",
-  
-  // "sorting.dc.title.ASC": "Title Ascending",
-  // TODO New key - Add a translation
-  "sorting.dc.title.ASC": "Title Ascending",
-  
-  // "sorting.dc.title.DESC": "Title Descending",
-  // TODO New key - Add a translation
-  "sorting.dc.title.DESC": "Title Descending",
-  
-  // "sorting.score.DESC": "Relevance",
-  // TODO New key - Add a translation
-  "sorting.score.DESC": "Relevance",
-  
-  
-  
-  // "statistics.title": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.title": "Statistics",
-  
-  // "statistics.header": "Statistics for {{ scope }}",
-  // TODO New key - Add a translation
-  "statistics.header": "Statistics for {{ scope }}",
-  
-  // "statistics.breadcrumbs": "Statistics",
-  // TODO New key - Add a translation
-  "statistics.breadcrumbs": "Statistics",
-  
-  // "statistics.page.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.page.no-data": "No data available",
-  
-  // "statistics.table.no-data": "No data available",
-  // TODO New key - Add a translation
-  "statistics.table.no-data": "No data available",
-  
-  // "statistics.table.title.TotalVisits": "Total visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalVisits": "Total visits",
-  
-  // "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.TotalDownloads": "File Visits",
-  // TODO New key - Add a translation
-  "statistics.table.title.TotalDownloads": "File Visits",
-  
-  // "statistics.table.title.TopCountries": "Top country views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCountries": "Top country views",
-  
-  // "statistics.table.title.TopCities": "Top city views",
-  // TODO New key - Add a translation
-  "statistics.table.title.TopCities": "Top city views",
-  
-  // "statistics.table.header.views": "Views",
-  // TODO New key - Add a translation
-  "statistics.table.header.views": "Views",
-  
-  
-  
-  // "submission.edit.title": "Edit Submission",
-  // TODO New key - Add a translation
-  "submission.edit.title": "Edit Submission",
-  
-  // "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.deposit": "Deposit",
-  // TODO New key - Add a translation
-  "submission.general.deposit": "Deposit",
-  
-  // "submission.general.discard.confirm.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.cancel": "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.submit": "Yes, I'm sure",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  
-  // "submission.general.discard.confirm.title": "Discard submission",
-  // TODO New key - Add a translation
-  "submission.general.discard.confirm.title": "Discard submission",
-  
-  // "submission.general.discard.submit": "Discard",
-  // TODO New key - Add a translation
-  "submission.general.discard.submit": "Discard",
-  
-  // "submission.general.save": "Save",
-  // TODO New key - Add a translation
-  "submission.general.save": "Save",
-  
-  // "submission.general.save-later": "Save for later",
-  // TODO New key - Add a translation
-  "submission.general.save-later": "Save for 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.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.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.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.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.button": "Search",
-  // TODO New key - Add a translation
-  "submission.import-external.search.button": "Search",
-  
-  // "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.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.source.arxiv": "arXiv",
-  // TODO New key - Add a translation
-  "submission.import-external.source.arxiv": "arXiv",
-  
-  // "submission.import-external.source.loading": "Loading ...",
-  // TODO New key - Add a translation
-  "submission.import-external.source.loading": "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.sherpaPublisher": "SHERPA Publishers",
-  // TODO New key - Add a translation
-  "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
-  // "submission.import-external.source.orcid": "ORCID",
-  // TODO New key - Add a translation
-  "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.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",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.title": "Item Preview",
-  
-  // "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.button.import": "Start submission",
-  // TODO New key - Add a translation
-  "submission.import-external.preview.button.import": "Start submission",
-  
-  // "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.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.sections.describe.relationship-lookup.close": "Close",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.close": "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.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.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 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 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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 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.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.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 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.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.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.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.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-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.loading": "Loading...",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "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.search": "Go",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
-  // "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-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.selected": "Selected {{ size }} items",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
-  // "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.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.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.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.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.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.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.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.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.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.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.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.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.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",
-  // 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.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.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.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.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.JournalIssue": "Journal Issues",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
-  // "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.JournalVolume": "Journal Volumes",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
-  // "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.isAuthorOfPublication": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
-  // "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.Project": "Projects",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
-  // "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.Person": "Authors",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
-  // "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.DataPackage": "Data Packages",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
-  // "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.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.isFundingOfPublication": "Funding",
-  // TODO New key - Add a translation
-  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
-  // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.ccLicense.type": "License Type",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.type": "License 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.change": "Change your license type…",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.change": "Change your license type…",
-  
-  // "submission.sections.ccLicense.none": "No licenses available",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.none": "No licenses available",
-  
-  // "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.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.confirmation": "I grant the license above",
-  // TODO New key - Add a translation
-  "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
-  // "submission.sections.general.add-more": "Add more",
-  // TODO New key - Add a translation
-  "submission.sections.general.add-more": "Add more",
-  
-  // "submission.sections.general.collection": "Collection",
-  // TODO New key - Add a translation
-  "submission.sections.general.collection": "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_success_notice": "Submission deposited successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  
-  // "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_success_notice": "Submission discarded successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  
-  // "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-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.no-collection": "No collection found",
-  // TODO New key - Add a translation
-  "submission.sections.general.no-collection": "No collection 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.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_success_notice": "Submission saved successfully.",
-  // TODO New key - Add a translation
-  "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  
-  // "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.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.submit.progressbar.CClicense": "Creative commons license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
-  // "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.stepcustom": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  
-  // "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.steptwo": "Describe",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  
-  // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  
-  // "submission.sections.submit.progressbar.license": "Deposit license",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.license": "Deposit license",
-  
-  // "submission.sections.submit.progressbar.upload": "Upload files",
-  // TODO New key - Add a translation
-  "submission.sections.submit.progressbar.upload": "Upload files",
-  
-  
-  
-  // "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.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.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.title": "Delete bitstream",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  
-  // "submission.sections.upload.delete.submit": "Delete",
-  // TODO New key - Add a translation
-  "submission.sections.upload.delete.submit": "Delete",
-  
-  // "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.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.date-required": "Date is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.date-required": "Date is required.",
-  
-  // "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-placeholder": "From",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.from-placeholder": "From",
-  
-  // "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-required": "Group is required.",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.group-required": "Group is 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-placeholder": "Until",
-  // TODO New key - Add a translation
-  "submission.sections.upload.form.until-placeholder": "Until",
-  
-  // "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.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.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>",
-  // 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 just dragging & dropping them everywhere in the page</strong>",
-  
-  // "submission.sections.upload.no-entry": "No",
-  // TODO New key - Add a translation
-  "submission.sections.upload.no-entry": "No",
-  
-  // "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.save-metadata": "Save metadata",
-  // TODO New key - Add a translation
-  "submission.sections.upload.save-metadata": "Save metadata",
-  
-  // "submission.sections.upload.undo": "Cancel",
-  // TODO New key - Add a translation
-  "submission.sections.upload.undo": "Cancel",
-  
-  // "submission.sections.upload.upload-failed": "Upload failed",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-failed": "Upload failed",
-  
-  // "submission.sections.upload.upload-successful": "Upload successful",
-  // TODO New key - Add a translation
-  "submission.sections.upload.upload-successful": "Upload successful",
-  
-  
-  
-  // "submission.submit.title": "Submission",
-  // TODO New key - Add a translation
-  "submission.submit.title": "Submission",
-  
-  
-  
-  // "submission.workflow.generic.delete": "Delete",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.delete": "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.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.edit": "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.view": "View",
-  // TODO New key - Add a translation
-  "submission.workflow.generic.view": "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.tasks.claimed.approve": "Approve",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.approve": "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.edit": "Edit",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.edit": "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.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.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.submit": "Reject item",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  
-  // "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.submit": "Reject",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  
-  // "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.return": "Return to pool",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.claimed.return": "Return to pool",
-  
-  // "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.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.processing": "Processing...",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.processing": "Processing...",
-  
-  // "submission.workflow.tasks.generic.submitter": "Submitter",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.submitter": "Submitter",
-  
-  // "submission.workflow.tasks.generic.success": "Operation successful",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.generic.success": "Operation successful",
-  
-  
-  
-  // "submission.workflow.tasks.pool.claim": "Claim",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.claim": "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.hide-detail": "Hide detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  
-  // "submission.workflow.tasks.pool.show-detail": "Show detail",
-  // TODO New key - Add a translation
-  "submission.workflow.tasks.pool.show-detail": "Show detail",
-  
-  
-  
-  // "title": "DSpace",
-  // TODO New key - Add a translation
-  "title": "DSpace",
-  
-  
-  
-  // "vocabulary-treeview.header": "Hierarchical tree view",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.header": "Hierarchical tree view",
-  
-  // "vocabulary-treeview.load-more": "Load more",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.load-more": "Load more",
-  
-  // "vocabulary-treeview.search.form.reset": "Reset",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.reset": "Reset",
-  
-  // "vocabulary-treeview.search.form.search": "Search",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.search.form.search": "Search",
-  
-  // "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.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.srsc": "Research Subject Categories",
-  // TODO New key - Add a translation
-  "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
-  // "uploader.browse": "browse",
-  // TODO New key - Add a translation
-  "uploader.browse": "browse",
-  
-  // "uploader.drag-message": "Drag & Drop your files here",
-  // TODO New key - Add a translation
-  "uploader.drag-message": "Drag & Drop your files here",
-  
-  // "uploader.or": ", or ",
-  // TODO New key - Add a translation
-  "uploader.or": ", 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.queue-length": "Queue length",
-  // TODO New key - Add a translation
-  "uploader.queue-length": "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.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-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",
-  
-  
-  
-  // "workflowAdmin.search.results.head": "Administer Workflow",
-  // TODO New key - Add a translation
-  "workflowAdmin.search.results.head": "Administer 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.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.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.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.title": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.title": "Delete workflow item",
-  
-  // "workflow-item.delete.header": "Delete workflow item",
-  // TODO New key - Add a translation
-  "workflow-item.delete.header": "Delete workflow item",
-  
-  // "workflow-item.delete.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.cancel": "Cancel",
-  
-  // "workflow-item.delete.button.confirm": "Delete",
-  // TODO New key - Add a translation
-  "workflow-item.delete.button.confirm": "Delete",
-  
-  
-  // "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.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.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.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.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.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.button.cancel": "Cancel",
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.cancel": "Cancel",
-  
-  // "workflow-item.send-back.button.confirm": "Send back"
-  // TODO New key - Add a translation
-  "workflow-item.send-back.button.confirm": "Send back"
-  
+  "admin.access-control.groups.form.subgroups-list.table.name": "Nazwa",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Zbiór/kolekcja",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Usuń / Dodaj",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Usuń podgrupę o nazwie \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Dodaj podgrupę o nazwie \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Aktualna grupa",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Udało się dodać podgrupę: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Nie udało się dodać podgrupy: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Udało się usunąć podgrupę: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Nie udało się usunąć podgrupy: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Brak aktywnej grupy, najpierw wpisz nazwę grupy.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Ta grupa jest już stworzona i nie może zostać dodana pononwie.",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Nie znaleziono grup z tą nazwą lub UUID",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Brak podgrup w grupie.",
+  "admin.access-control.groups.form.return": "Powrót",
 
-}
\ No newline at end of file
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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": "Wyszukiwanie administracyjne",
+  "admin.search.collection.edit": "Edytuj",
+  "admin.search.community.edit": "Edytuj",
+  "admin.search.item.delete": "Usuń",
+  "admin.search.item.edit": "Edytuj",
+  "admin.search.item.make-private": "Ukryj",
+  "admin.search.item.make-public": "Upublicznij",
+  "admin.search.item.move": "Przenieś",
+  "admin.search.item.reinstate": "Zmień instancję",
+  "admin.search.item.withdraw": "Wycofane",
+  "admin.search.title": "Wyszukiwanie administracyjne",
+  "administrativeView.search.results.head": "Wyszukiwanie administracyjne",
+  "admin.workflow.breadcrumbs": "Zarządzaj procesem",
+  "admin.workflow.title": "Zarządzaj procesem",
+  "admin.workflow.item.workflow": "Proces",
+  "admin.workflow.item.delete": "Usuń",
+  "admin.workflow.item.send-back": "Odeślij z powrotem",
+  "admin.metadata-import.breadcrumbs": "Importuj metadane",
+  "admin.metadata-import.title": "Importuj metadane",
+  "admin.metadata-import.page.header": "Importuj metadane",
+  "admin.metadata-import.page.help": "Tutaj możesz zaimportować pliki CSV, w których znajdują się metadane do operacji wsadowej. Zaimportuj je poprzez upuszczenie ich lub znajdź je na swoim komputerze",
+  "admin.metadata-import.page.dropMsg": "Upuść plik w formacie CSV",
+  "admin.metadata-import.page.dropMsgReplace": "Upuść, aby zastąpić metadane w formacie CSV do importu",
+  "admin.metadata-import.page.button.return": "Powrót",
+  "admin.metadata-import.page.button.proceed": "Zastosuj",
+  "admin.metadata-import.page.error.addFile": "Najpierw wybierz plik!",
+  "auth.errors.invalid-user": "Niewłaściwy adres e-mail lub hasło.",
+  "auth.messages.expired": "Twoja sesja wygasła. Zaloguj się ponownie.",
+  "auth.messages.token-refresh-failed": "Odświeżenie sesji nie powiodło się. Zaloguj się ponownie.",
+  "bitstream.download.page": "Pobieranie {{bitstream}}...",
+  "bitstream.download.page.back": "Powrót",
+  "bitstream.edit.authorizations.link": "Edytuj polityki plików",
+  "bitstream.edit.authorizations.title": "Edytuj polityki plików",
+  "bitstream.edit.return": "Powrót",
+  "bitstream.edit.bitstream": "Pliki: ",
+  "bitstream.edit.form.description.hint": "Opcjonalnie wprowadź krótki opis pliku, np.: \"<i>Główna część artykułu</i>\" lub \"<i>Dane z eksperymentu</i>\".",
+  "bitstream.edit.form.description.label": "Opis",
+  "bitstream.edit.form.embargo.hint": "Pierwszy dzień, od kiedy dostęp zostanie udzielony. <b>Tej daty nie może być edytować w tym formularzu.</b> Aby wybrać okres embarga czasowego, wybierz <i>Status pozycji</i> tab, kliknij <i>Autoryzacje...</i>, stwórz lub edytuj plik <i>PRZEYCZTAJ</i> zasady i wybierz określoną <i>Datę początkową</i>.",
+  "bitstream.edit.form.embargo.label": "Embargo do wybranej daty",
+  "bitstream.edit.form.fileName.hint": "Zmiana nazwy pliku dla strumienia bitów. Zauważ, że zmieni to wyświetlany adres URL strumienia bitów, ale stare linki nadal będą działać, o ile nie zmieni się identyfikator sekwencji.",
+  "bitstream.edit.form.fileName.label": "Nazwa pliku",
+  "bitstream.edit.form.newFormat.label": "Opisz nowy format",
+  "bitstream.edit.form.newFormat.hint": "Program, którego użyto do stworzenia pliku i numer wersji (np.: \"<i>ACMESoft SuperApp version 1.5</i>\").",
+  "bitstream.edit.form.primaryBitstream.label": "Pierwotny plik",
+  "bitstream.edit.form.selectedFormat.hint": "Jeśli formatu nie ma na powyższej liście, <b>wybierz \"format not in list\" above</b> i opisz jako \"Describe new format\".",
+  "bitstream.edit.form.selectedFormat.label": "Wybrany format",
+  "bitstream.edit.form.selectedFormat.unknown": "Tego formatu nie ma na liście",
+  "bitstream.edit.notifications.error.format.title": "Wystąpił błąd podczas zapisu formatu pliku",
+  "bitstream.edit.notifications.saved.content": "Zmiany w pliku zostały zapisane.",
+  "bitstream.edit.notifications.saved.title": "Plik został zapisany",
+  "bitstream.edit.title": "Edytuj plik",
+  "bitstream-request-a-copy.alert.canDownload1": "Masz już dostęp do tego pliki. Jeśli chcesz go pobrać, kliknij ",
+  "bitstream-request-a-copy.alert.canDownload2": "tutaj",
+  "bitstream-request-a-copy.header": "Wystąp o kopię wybranego pliku",
+  "bitstream-request-a-copy.intro": "Wpisz następujące informacje, aby wystąpić o kopię tej pozycji: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Wystąpienie o dostęp do następujących plików: ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Wystąpienie o dostęp do wszystkich plików. ",
+  "bitstream-request-a-copy.name.label": "Imię *",
+  "bitstream-request-a-copy.name.error": "Imię jest wymagane",
+  "bitstream-request-a-copy.email.label": "Adres e-mail *",
+  "bitstream-request-a-copy.email.hint": "Plik zostanie przesłany na podany adres e-mail",
+  "bitstream-request-a-copy.email.error": "Proszę wprowadzić prawidłowy adres e-mail",
+  "bitstream-request-a-copy.allfiles.label": "Pliki",
+  "bitstream-request-a-copy.files-all-false.label": "Tylko plik, dla którego wystąpiono o dostęp",
+  "bitstream-request-a-copy.files-all-true.label": "Wszystkie pliki (w tej pozycji) z ograniczonym dostępem",
+  "bitstream-request-a-copy.message.label": "Wiadomość",
+  "bitstream-request-a-copy.return": "Powrót",
+  "bitstream-request-a-copy.submit": "Wystąp o kopię",
+  "bitstream-request-a-copy.submit.success": "Wystąpienie o dostęp do pliku zostało przesłane.",
+  "bitstream-request-a-copy.submit.error": "Coś poszło nie tak podczas wysyłania wystąpienia o dostęp do pliku",
+  "browse.comcol.by.author": "wg autorów",
+  "browse.comcol.by.dateissued": "wg daty wydania",
+  "browse.comcol.by.subject": "wg tematu",
+  "browse.comcol.by.title": "wg tytułu",
+  "browse.comcol.head": "Przeglądaj",
+  "browse.empty": "Brak rekordów do wyświetlenia.",
+  "browse.metadata.author": "Autor",
+  "browse.metadata.dateissued": "Data wydania",
+  "browse.metadata.subject": "Temat",
+  "browse.metadata.title": "Tytuł",
+  "browse.metadata.author.breadcrumbs": "Przeglądaj wg autorów",
+  "browse.metadata.dateissued.breadcrumbs": "Przeglądaj wg daty wydania",
+  "browse.metadata.subject.breadcrumbs": "Przeglądaj wg tematów",
+  "browse.metadata.title.breadcrumbs": "Przeglądaj wg tytułów",
+  "browse.startsWith.choose_start": "(Wybierz start)",
+  "browse.startsWith.choose_year": "(Wybierz rok)",
+  "browse.startsWith.choose_year.label": "Wybierz rok wydania",
+  "browse.startsWith.jump": "Przejdź do miejsca w indeksie:",
+  "browse.startsWith.months.april": "kwiecień",
+  "browse.startsWith.months.august": "sierpień",
+  "browse.startsWith.months.december": "grudzień",
+  "browse.startsWith.months.february": "luty",
+  "browse.startsWith.months.january": "styczeń",
+  "browse.startsWith.months.july": "lipiec",
+  "browse.startsWith.months.june": "czerwiec",
+  "browse.startsWith.months.march": "marzec",
+  "browse.startsWith.months.may": "maj",
+  "browse.startsWith.months.none": "(wybierz miesiąc)",
+  "browse.startsWith.months.none.label": "Wybierz miesiąc wydania",
+  "browse.startsWith.months.november": "listopad",
+  "browse.startsWith.months.october": "październik",
+  "browse.startsWith.months.september": "wrzesień",
+  "browse.startsWith.submit": "Zastosuj",
+  "browse.startsWith.type_date": "Lub wybierz datę (rok-miesiąc) i kliknij 'Przeglądaj'",
+  "browse.startsWith.type_date.label": "Lub wybierz datę (rok-miesiąc) i kliknij przycisk przeglądania",
+  "browse.startsWith.type_text": "Wpisz kilka pierwszych liter i kliknij przycisk przeglądania",
+  "browse.title": "Przeglądaj {{ collection }} wg {{ field }} {{ value }}",
+  "chips.remove": "Usuń chip",
+  "collection.create.head": "Utwórz kolekcję",
+  "collection.create.notifications.success": "Udało się utworzyć kolekcję",
+  "collection.create.sub-head": "Udało się utworzyć kolekcję dla zbioru {{ parent }}",
+  "collection.curate.header": "Administrator kolekcji: {{collection}}",
+  "collection.delete.cancel": "Anuluj",
+  "collection.delete.confirm": "Zatwierdź",
+  "collection.delete.processing": "Usuwanie",
+  "collection.delete.head": "Usuń kolekcję",
+  "collection.delete.notification.fail": "Kolekcja nie może być usunięt",
+  "collection.delete.notification.success": "Udało się usunąć kolekcję",
+  "collection.delete.text": "Czy na pewno chcesz usunąć kolekcję \"{{ dso }}\"",
+  "collection.edit.delete": "Usuń kolekcję",
+  "collection.edit.head": "Edytuj kolekcję",
+  "collection.edit.breadcrumbs": "Edytuj kolekcję",
+  "collection.edit.tabs.mapper.head": "Item Mapper",
+  "collection.edit.tabs.item-mapper.title": "Edytuj kolekcję - Item Mapper",
+  "collection.edit.item-mapper.cancel": "Anuluj",
+  "collection.edit.item-mapper.collection": "Kolekcja: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.confirm": "Mapuj wybrane elementy",
+  "collection.edit.item-mapper.description": "To jest narzędzie mapowania elementów, które pozwala administratorom kolekcji mapować elementy z innych kolekcji do tej kolekcji. Możesz wyszukiwać elementy z innych kolekcji i mapować je lub przeglądać listę aktualnie zmapowanych elementów.",
+  "collection.edit.item-mapper.head": "Item Mapper - Mapuj pozycje z innych kolekcji",
+  "collection.edit.item-mapper.no-search": "Wpisz co chcesz wyszukać",
+  "collection.edit.item-mapper.notifications.map.error.content": "Wystąpiły błędy podczas mapowania {{amount}} pozycji.",
+  "collection.edit.item-mapper.notifications.map.error.head": "Mapowanie błędów",
+  "collection.edit.item-mapper.notifications.map.success.content": "Udało się zmapować {{amount}} pozycji.",
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapowanie zakończone",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Błędy wystąpiły podczas usuwania mapowania z {{amount}} elementów.",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Usuń błędy mapowania",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Udało się usunąć błędy mapowania z {{amount}} elementów.",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Usuwanie mapowania zakończone",
+  "collection.edit.item-mapper.remove": "Usuń wybrane mapowanie elementów",
+  "collection.edit.item-mapper.search-form.placeholder": "Wyszukaj pozycje...",
+  "collection.edit.item-mapper.tabs.browse": "Wyszukaj mapowane elementy",
+  "collection.edit.item-mapper.tabs.map": "Mapuj nowe elementy",
+  "collection.edit.logo.delete.title": "Usuń",
+  "collection.edit.logo.delete-undo.title": "Cofnij usunięcie",
+  "collection.edit.logo.label": "Logo kolekcji",
+  "collection.edit.logo.notifications.add.error": "Przesyłanie logo kolekcji nie powiodło się. Proszę zweryfikować zawartość przed ponowną ",
+  "collection.edit.logo.notifications.add.success": "Udało się przesłać logo kolekcji.",
+  "collection.edit.logo.notifications.delete.success.title": "Logo usunięte",
+  "collection.edit.logo.notifications.delete.success.content": "Udało się usunąć logo kolekcji",
+  "collection.edit.logo.notifications.delete.error.title": "Błąd podczas usuwania loga",
+  "collection.edit.logo.upload": "Upuść logo kolekcji, aby je wgrać",
+  "collection.edit.notifications.success": "Udało się edytować kolekcję",
+  "collection.edit.return": "Powrót",
+  "collection.edit.tabs.curate.head": "Kurator",
+  "collection.edit.tabs.curate.title": "Edytowanie kolekcji - kurator",
+  "collection.edit.tabs.authorizations.head": "Autoryzacje",
+  "collection.edit.tabs.authorizations.title": "Edytowanie kolekcji - autoryzacje",
+  "collection.edit.tabs.metadata.head": "Edytuj metadane",
+  "collection.edit.tabs.metadata.title": "Edytowanie kolekcji - metadane",
+  "collection.edit.tabs.roles.head": "Przypisz role",
+  "collection.edit.tabs.roles.title": "Edytowanie kolekcji - role",
+  "collection.edit.tabs.source.external": "Ta kolekcja pobiera swoją zawartość z zewnętrznego źródła",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Musisz wskazać id docelowej kolekcji.",
+  "collection.edit.tabs.source.form.harvestType": "Odczytywanie zawartości",
+  "collection.edit.tabs.source.form.head": "Skonfiguruj zewnętrzne źródło",
+  "collection.edit.tabs.source.form.metadataConfigId": "Format metadanych",
+  "collection.edit.tabs.source.form.oaiSetId": "Określony zestaw ID OAI",
+  "collection.edit.tabs.source.form.oaiSource": "Dostawca OAI",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Odczytaj metadane i pliki (wymaga wsparcia ORE)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Odczytaj metadane i bibliografię (wymaga wsparcia ORE)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Odczytaj tylko metadane",
+  "collection.edit.tabs.source.head": "Źródło treści",
+  "collection.edit.tabs.source.notifications.discarded.content": "Twoje zmiany zostały odrzucone. Aby odzyskać swoje zmiany wybierz 'Powrót'",
+  "collection.edit.tabs.source.notifications.discarded.title": "Zmiany odrzucone",
+  "collection.edit.tabs.source.notifications.invalid.content": "Zmiany nie zostały zapisane. Sprawdź czy wszystkie pola są wypełnione poprawne przed zapisem.",
+  "collection.edit.tabs.source.notifications.invalid.title": "Nieprawidłowe metadane",
+  "collection.edit.tabs.source.notifications.saved.content": "Zmiany wprowadzone w kolekcji zostały zapisane.",
+  "collection.edit.tabs.source.notifications.saved.title": "Źródło treści zapisane",
+  "collection.edit.tabs.source.title": "Collection Edit - Źródło treści",
+  "collection.edit.template.add-button": "Dodaj",
+  "collection.edit.template.breadcrumbs": "Szablon pozycji",
+  "collection.edit.template.cancel": "Anuluj",
+  "collection.edit.template.delete-button": "Usuń",
+  "collection.edit.template.edit-button": "Edytuj",
+  "collection.edit.template.error": "Wystąpił błąd podczas odzyskiwania szablonu pozycji",
+  "collection.edit.template.head": "Edytuj szablon dla kolekcji \"{{ collection }}\"",
+  "collection.edit.template.label": "Szablon pozycji",
+  "collection.edit.template.loading": "ładowanie szablonu pozycji...",
+  "collection.edit.template.notifications.delete.error": "Nie udało się usunąć szablonu pozycji",
+  "collection.edit.template.notifications.delete.success": "Udało się usunąć szablon pozycji",
+  "collection.edit.template.title": "Edytuj szablon pozycji",
+  "collection.form.abstract": "Opis skrócony",
+  "collection.form.description": "Tekst powitalny (HTML)",
+  "collection.form.errors.title.required": "Wpisz nazwę kolekcji",
+  "collection.form.license": "Licencja",
+  "collection.form.provenance": "Pochodzenie",
+  "collection.form.rights": "Tekst praw autorskich (HTML)",
+  "collection.form.tableofcontents": "Wiadomości (HTML)",
+  "collection.form.title": "Nazwa",
+  "collection.form.entityType": "Typ danych",
+  "collection.page.browse.recent.head": "Ostatnie zgłoszenia",
+  "collection.page.browse.recent.empty": "Brak pozycji do wyświetlenia",
+  "collection.page.edit": "Edytuj kolekcję",
+  "collection.page.handle": "Stały URI dla kolekcji",
+  "collection.page.license": "Licencja",
+  "collection.page.news": "Wiadomości",
+  "collection.select.confirm": "Zaakceptuj zaznaczone",
+  "collection.select.empty": "Brak kolekcji do wyświetlenia",
+  "collection.select.table.title": "Tytuł",
+  "collection.source.controls.head": "Kontrolki odczytywania",
+  "collection.source.controls.test.submit.error": "Coś poszło nie tak podczas rozpoczynania testów ustawień",
+  "collection.source.controls.test.failed": "Scenariusz testowy ustawień nie zadziałał",
+  "collection.source.controls.test.completed": "Scenariusz testowy ustawień został zakończony",
+  "collection.source.controls.test.submit": "Konfiguracja testowa",
+  "collection.source.controls.test.running": "Testowanie konfiguracji...",
+  "collection.source.controls.import.submit.success": "Import został rozpoczęty",
+  "collection.source.controls.import.submit.error": "Coś poszło nie tak podczas rozpoczynania importu",
+  "collection.source.controls.import.submit": "Importuj teraz",
+  "collection.source.controls.import.running": "Importowanie...",
+  "collection.source.controls.import.failed": "Wystąpił błąd podczas importu",
+  "collection.source.controls.import.completed": "Import zakończony",
+  "collection.source.controls.reset.submit.success": "Reset ustawień i powtórny import zostały rozpoczęte poprawnie",
+  "collection.source.controls.reset.submit.error": "Coś poszło nie tak podczas rozpoczynania zresetowanego, powtórnego importu",
+  "collection.source.controls.reset.failed": "Wystąpił błąd podczas resetowania ustawień i ponownego importu",
+  "collection.source.controls.reset.completed": "Reset ustawień i powtórny import zostały zakończone",
+  "collection.source.controls.reset.submit": "Resetowanie i powtórny import",
+  "collection.source.controls.reset.running": "Resetowanie i powtórny import...",
+  "collection.source.controls.harvest.status": "Status odczytywania:",
+  "collection.source.controls.harvest.start": "Czas rozpoczęcia odczytywania:",
+  "collection.source.controls.harvest.last": "Czas ostatniego odczytywania:",
+  "collection.source.controls.harvest.message": "Informacje nt. odczytywania:",
+  "collection.source.controls.harvest.no-information": "bd.",
+  "collection.source.update.notifications.error.content": "Te ustawienia zostały przetestowane i nie działają.",
+  "collection.source.update.notifications.error.title": "Błąd serwera",
+  "communityList.breadcrumbs": "Lista zbiorów",
+  "communityList.tabTitle": "Lista zbiorów",
+  "communityList.title": "Lista zbiorów",
+  "communityList.showMore": "Pokaż więcej",
+  "community.create.head": "Utwórz zbiór",
+  "community.create.notifications.success": "Udało się utworzyć zbiór",
+  "community.create.sub-head": "Utwórz podzbiór dla zbioru {{ parent }}",
+  "community.curate.header": "Zarządzaj zbiorem: {{community}}",
+  "community.delete.cancel": "Anuluj",
+  "community.delete.confirm": "Potwierdź",
+  "community.delete.processing": "Usuwanie...",
+  "community.delete.head": "Usuń zbiór",
+  "community.delete.notification.fail": "Zbiór nie może być usunięty",
+  "community.delete.notification.success": "Udało się usunąć zbiór",
+  "community.delete.text": "Czy na pewno chcesz usunąć zbiór \"{{ dso }}\"",
+  "community.edit.delete": "Usuń ten zbiór",
+  "community.edit.head": "Edytuj zbiór",
+  "community.edit.breadcrumbs": "Edytuj zbiór",
+  "community.edit.logo.delete.title": "Usuń logo",
+  "community.edit.logo.delete-undo.title": "Cofnij usunięcie",
+  "community.edit.logo.label": "Logo zbioru",
+  "community.edit.logo.notifications.add.error": "Przesłanie loga zbioru nie powiodło się. Sprawdź czy wszystkie parametry są odpowiednie przed próbą ponownego przesłania.",
+  "community.edit.logo.notifications.add.success": "Przesłanie loga powiodło się.",
+  "community.edit.logo.notifications.delete.success.title": "Logo usunięte",
+  "community.edit.logo.notifications.delete.success.content": "Usunięcie loga zbioru powiodło się",
+  "community.edit.logo.notifications.delete.error.title": "Błąd podczas usuwania loga",
+  "community.edit.logo.upload": "Upuść logo zbioru, aby je przesłać",
+  "community.edit.notifications.success": "Udało się edytować zbiór",
+  "community.edit.notifications.unauthorized": "Nie masz uprawnień, aby wykonać te zmiany",
+  "community.edit.notifications.error": "Wystąpił błąd podczas edycji zbioru",
+  "community.edit.return": "Cofnij",
+  "community.edit.tabs.curate.head": "Administruj",
+  "community.edit.tabs.curate.title": "Edycja zbioru - administrator",
+  "community.edit.tabs.metadata.head": "Edytuj metadane",
+  "community.edit.tabs.metadata.title": "Edycja zbioru - metadane",
+  "community.edit.tabs.roles.head": "Przypisz role",
+  "community.edit.tabs.roles.title": "Edycja zbioru - role",
+  "community.edit.tabs.authorizations.head": "Uprawnienia",
+  "community.edit.tabs.authorizations.title": "Edycja zbioru - uprawnienia",
+  "community.listelement.badge": "Zbiór",
+  "comcol-role.edit.no-group": "Brak",
+  "comcol-role.edit.create": "Utwórz",
+  "comcol-role.edit.restrict": "Ogranicz",
+  "comcol-role.edit.delete": "Usuń",
+  "comcol-role.edit.community-admin.name": "Administratorzy",
+  "comcol-role.edit.collection-admin.name": "Administratorzy",
+  "comcol-role.edit.community-admin.description": "Administratorzy zbioru mogą tworzyć podzbiory lub kolekcje i zarządzać nimi lub przydzielać zarządzanie tymi podzbiorami lub kolekcji innym użytkownikom. Ponadto decydują, kto może przesyłać elementy do dowolnych podkolekcji, edytować metadane pozycji (po przesłaniu) i dodawać (mapować) istniejące pozycje z innych kolekcji (z zastrzeżeniem autoryzacji).",
+  "comcol-role.edit.collection-admin.description": "Administratorzy kolekcji decydują o tym, kto może przesyłać pozycje do kolekcji, edytować metadane pozycji (po ich przesłaniu) oraz dodawać (mapować) istniejące elementy z innych kolekcji do tej kolekcji (z zastrzeżeniem uprawnień dla danej kolekcji).",
+  "comcol-role.edit.submitters.name": "Zgłaszający",
+  "comcol-role.edit.submitters.description": "Użytkownicy i grupy, którzy mają uprawnienia do przesyłania nowych pozycji do tej kolekcji.",
+  "comcol-role.edit.item_read.name": "Domyślny dostęp do odczytu pozycji",
+  "comcol-role.edit.item_read.description": "Użytkownicy i grupy, które mogą odczytywać nowe pozycje zgłoszone do tej kolekcji. Zmiany w tej roli nie działają wstecz. Istniejące pozycje w systemie będą nadal widoczne dla osób, które miały dostęp do odczytu w momencie ich dodania.",
+  "comcol-role.edit.item_read.anonymous-group": "Domyślny odczyt dla nowych pozycji jest obecnie ustawiony na Anonimowy.",
+  "comcol-role.edit.bitstream_read.name": "Domyślny dostęp do oczytu plików",
+  "comcol-role.edit.bitstream_read.description": "Administratorzy zbiorów mogą tworzyć podzbiory lub kolekcje, a także zarządzać nimi. Ponadto decydują o tym, kto może przesyłać elementy do podkolekcji, edytować metadane pozycji (po ich przesłaniu) oraz dodawać (mapować) istniejące pozycje z innych kolekcji (pod warunkiem posiadania odpowiednich uprawnień).",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Domyślny status odczytu dla nowych plików to Anonimowy.",
+  "comcol-role.edit.editor.name": "Redaktorzy",
+  "comcol-role.edit.editor.description": "Redaktorzy mogą edytować metadane nowych pozycji, a następnie akceptować je lub odrzucać.",
+  "comcol-role.edit.finaleditor.name": "Redaktorzy końcowi",
+  "comcol-role.edit.finaleditor.description": "Redaktorzy końcowi mogą edytować metadane nowych pozycji, ale nie mogę odrzucać pozycji.",
+  "comcol-role.edit.reviewer.name": "Recenzenci",
+  "comcol-role.edit.reviewer.description": "Recenzenci mogą akceptować lub odrzucać nowe pozycje, ale nie mogę edytować ich metadanych.",
+  "community.form.abstract": "Opis skrócony",
+  "community.form.description": "Wstęp (HTML)",
+  "community.form.errors.title.required": "Wprowadź nazwę zbioru",
+  "community.form.rights": "Prawa autoskie (HTML)",
+  "community.form.tableofcontents": "Wiadomości (HTML)",
+  "community.form.title": "Nazwa",
+  "community.page.edit": "Edytuj ten zbiór",
+  "community.page.handle": "Stały URI zbioru",
+  "community.page.license": "Licencja",
+  "community.page.news": "Wiadomości",
+  "community.all-lists.head": "Podzbiory i kolekcje",
+  "community.sub-collection-list.head": "Kolekcje w tym zbiorze",
+  "community.sub-community-list.head": "Kolekcje w tym zbiorze",
+  "cookies.consent.accept-all": "Zaakceptuj wszystko",
+  "cookies.consent.accept-selected": "Zaakceptuj wybrane",
+  "cookies.consent.app.opt-out.description": "Aplikacja jest domyślnie włączona (możesz ją wyłączyć)",
+  "cookies.consent.app.opt-out.title": "(możesz ją wyłaczyć)",
+  "cookies.consent.app.purpose": "cel",
+  "cookies.consent.app.required.description": "Ta aplikacja jest zawsze wymagana",
+  "cookies.consent.app.required.title": "(zawsze wymagana)",
+  "cookies.consent.update": "Od ostatniej wizyty zostały wprowadzone zmiany. Zweryfikuj swoje zgody.",
+  "cookies.consent.close": "Zamknij",
+  "cookies.consent.decline": "Odrzuć",
+  "cookies.consent.content-notice.description": "Zbieramy i przetwarzamy Twoje dane do następujących celów: <strong>weryfikacja, preferencje, zgody i statystyka</strong>. <br/> Jeśli chcesz się dowiedzieć więcej, przycztaj naszą {privacyPolicy}.",
+  "cookies.consent.content-notice.learnMore": "Dostosuj",
+  "cookies.consent.content-modal.description": "Tutaj są wyświetlane informacje, które zbieramy o Tobie. Możesz je dostosować według swojego uznania.",
+  "cookies.consent.content-modal.privacy-policy.name": "polityka prywatności",
+  "cookies.consent.content-modal.privacy-policy.text": "Aby dowiedzieć się więcej przeczytaj naszą {privacyPolicy}.",
+  "cookies.consent.content-modal.title": "Informacje, które zbieramy",
+  "cookies.consent.app.title.authentication": "Logowanie",
+  "cookies.consent.app.description.authentication": "Musisz się zalogować",
+  "cookies.consent.app.title.preferences": "Preferencje",
+  "cookies.consent.app.description.preferences": "Wymagane, aby zapisać Twoje preferencje",
+  "cookies.consent.app.title.acknowledgement": "Zgody",
+  "cookies.consent.app.description.acknowledgement": "Wymagane, aby zapisać Twoje preferencje",
+  "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.description.google-analytics": "Pozwól na śledzenie do celów statystycznych",
+  "cookies.consent.purpose.functional": "Funkcjonalne",
+  "cookies.consent.purpose.statistical": "Statystyczne",
+  "curation-task.task.checklinks.label": "Sprawdź odnośniki w metadanych",
+  "curation-task.task.noop.label": "NOOP",
+  "curation-task.task.profileformats.label": "Profil formatów plików",
+  "curation-task.task.requiredmetadata.label": "Sprawdź poprawność wymaganych metadanych",
+  "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.vscan.label": "Skan antywirusowy",
+  "curation.form.task-select.label": "Zadanie:",
+  "curation.form.submit": "Start",
+  "curation.form.submit.success.head": "Udało się rozpocząć zadanie administratora",
+  "curation.form.submit.success.content": "Zostaniesz przeniesiony na stronę procesu.",
+  "curation.form.submit.error.head": "Nie udało się się zakończyć zadania administratora",
+  "curation.form.submit.error.content": "Wystąpił błąd podczas rozpoczynania zadania administracyjnego.",
+  "curation.form.handle.label": "Automatyzacja:",
+  "curation.form.handle.hint": "Wskazówka: Wpisz [prefix swojego identyfikatora]/0, aby zautomatyzować zadanie (nie wszystkie zadania mogą wspierać tę funkcję)",
+  "deny-request-copy.email.message": "Drogi użytkowniku {{ recipientName }},\nW odpowiedzi na Państwa zapytanie, przykro mi poinformować, że to niemożliwe, aby przestać kopię pliku, o który Państwo prosili: \"{{ itemUrl }}\" ({{ itemName }}), którego jestem autorem.\n\nPozdrawiam serdecznie,\n{{ authorName }} <{{ authorEmail }}>",
+  "deny-request-copy.email.subject": "Wystąp o kopię dokumentu",
+  "deny-request-copy.error": "Wystąpił błąd",
+  "deny-request-copy.header": "Odrzuć prośbę o przesłanie kopii dokumentu",
+  "deny-request-copy.intro": "Ta wiadomość zostanie przesłana do osoby, która wystąpiła o dostęp",
+  "deny-request-copy.success": "Z powodzeniem odrzucono prośbę o udostępnienie pozycji",
+  "dso.name.untitled": "Brak tytułu",
+  "dso-selector.claim.item.head": "Wskazówki profilu",
+  "dso-selector.claim.item.body": "Istnieją profile, które mogą odnosić się do Ciebie. Jeśli, któryś z tych profilów jest Twój, wybierz go i przejdź do szczegółów, z opcji wybierz opcję przypisania profilu. W innym przypadku możesz utworzyć nowy profil z szablonu, wybierając przycisk poniżej.",
+  "dso-selector.claim.item.create-from-scratch": "Utwórz nowy",
+  "dso-selector.claim.item.not-mine-label": "Żaden nie jest mój",
+  "dso-selector.create.collection.head": "Nowa kolekcja",
+  "dso-selector.create.collection.sub-level": "Utwórz nową kolekcję w",
+  "dso-selector.create.community.head": "Nowy zbiór",
+  "dso-selector.create.community.sub-level": "Utwórz nowy zbiór",
+  "dso-selector.create.community.top-level": "Utwórz nowy nadrzędny zbiór",
+  "dso-selector.create.item.head": "Nowa pozycja",
+  "dso-selector.create.item.sub-level": "Utwórz nową pozycję w",
+  "dso-selector.create.submission.head": "Nowe zgłoszenie",
+  "dso-selector.edit.collection.head": "Edytuj kolekcję",
+  "dso-selector.edit.community.head": "Edytuj zbiór",
+  "dso-selector.edit.item.head": "Edytuj pozycję",
+  "dso-selector.error.title": "Wystąpił błąd podczas wyszukiwania typu {{ type }}",
+  "dso-selector.export-metadata.dspaceobject.head": "Eksportuj metadane z",
+  "dso-selector.no-results": "Nie znaleziono {{ type }}",
+  "dso-selector.placeholder": "Wyszukaj {{ type }}",
+  "dso-selector.select.collection.head": "Wybierz kolekcję",
+  "dso-selector.set-scope.community.head": "Wybierz wyszukiwanie zakresu",
+  "dso-selector.set-scope.community.button": "Wyszukaj w całym DSpace",
+  "dso-selector.set-scope.community.input-header": "Wyszukaj zbiór lub kolekcję",
+  "confirmation-modal.export-metadata.header": "Eksportuj metadane z {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Czy na pewno chcesz eksportować metadane z {{ dsoName }}",
+  "confirmation-modal.export-metadata.cancel": "Anuluj",
+  "confirmation-modal.export-metadata.confirm": "Eksportuj",
+  "confirmation-modal.delete-eperson.header": "Usuń użytkownika \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Czy na pewno chcesz usunąć użytkownika \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.cancel": "Anuluj",
+  "confirmation-modal.delete-eperson.confirm": "Usuń",
+  "error.bitstream": "Wystąpił błąd podczas tworzenia plików",
+  "error.browse-by": "Wystąpił błąd podczas tworzenia pozycji",
+  "error.collection": "Wystąpił błąd podczas tworzenia kolekcji",
+  "error.collections": "Wystąpił błąd podczas tworzenia kolekcji",
+  "error.community": "Wystąpił błąd podczas tworzenia ziboru",
+  "error.identifier": "Nie znaleziono pozycji z podanym identyfikatorem",
+  "error.default": "Błąd",
+  "error.item": "Wystąpił błąd podczas tworzenia pozycji",
+  "error.items": "Wystąpił błąd podczas tworzenia pozycji",
+  "error.objects": "Wystąpił błąd podczas tworzenia obiektów",
+  "error.recent-submissions": "Wystąpił błąd podczas tworzenia ostatniego zgłoszenia",
+  "error.search-results": "Wystąpił błąd podczas tworzenia wyników wyszukiwania",
+  "error.sub-collections": "Wystąpił błąd podczas tworzenia podkolekcji",
+  "error.sub-communities": "Wystąpił błąd podczas tworzenia podzbiorów",
+  "error.submission.sections.init-form-error": "Wystąpił błąd w czasie inicjalizacji sekcji, sprawdź konfigurację. Szczegóły poniżej: <br> <br>",
+  "error.top-level-communities": "Błąd podczas pobierania nadrzędnego zbioru",
+  "error.validation.license.notgranted": "Musisz wyrazić tę zgodę, aby przesłać swoje zgłoszenie. Jeśli nie możesz wyrazić zgody w tym momencie, możesz zapisać swoją pracę i wrócić do niej później lub usunąć zgłoszenie.",
+  "error.validation.pattern": "Te dane wejściowe są ograniczone przez aktualny wzór: {{ pattern }}.",
+  "error.validation.filerequired": "Przesłanie pliku jest obowiązkowe",
+  "error.validation.required": "Pole jest wymagane",
+  "error.validation.NotValidEmail": "E-mail nie jest poprawny",
+  "error.validation.emailTaken": "E-mail jest już zarejestrowany",
+  "error.validation.groupExists": "Ta grupa już istnieje",
+  "file-section.error.header": "Błąd podczas uzyskiwania plików dla tej pozycji",
+  "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.link.dspace": "oprogramowanie DSpace",
+  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.cookies": "Ustawienia plików cookies",
+  "footer.link.privacy-policy": "Polityka prywatności",
+  "footer.link.end-user-agreement": "Umowa użytkownika",
+  "forgot-email.form.header": "Nie pamiętam hasła",
+  "forgot-email.form.info": "Zarejestruj się, aby otrzymywać wiadomości o nowych pozycjach w obserowanych kolekcjach, a także przesyłać nowe pozycje do repozytorium.",
+  "forgot-email.form.email": "Adres e-mail *",
+  "forgot-email.form.email.error.required": "Uzupełnij adres e-mail",
+  "forgot-email.form.email.error.pattern": "Uzupełnij prawidłowy adres e-mail",
+  "forgot-email.form.email.hint": "Ten adres e-mail będzie zweryfikowany i będziesz go używać jako swój login.",
+  "forgot-email.form.submit": "Wyślij",
+  "forgot-email.form.success.head": "Wysłano wiadomość weryfikacyjną",
+  "forgot-email.form.success.content": "Wiadomość została wysłana na adres e-mail {{ email }}. Zawiera ona unikatowy link i dalsze instrukcje postępowania.",
+  "forgot-email.form.error.head": "Błąd podczas rejestracji adresu e-mail",
+  "forgot-email.form.error.content": "Wystąpił błąd poczas próby rejestracji tego adresu e-mail: {{ email }}",
+  "forgot-password.title": "Nie pamiętam hasła",
+  "forgot-password.form.head": "Nie pamiętam hasła",
+  "forgot-password.form.info": "Wpisz nowe hasło w polu poniżej i potwierdź je wpisując je ponownie w drugim polu. Hasło powinno mieć co najmniej sześć znaków.",
+  "forgot-password.form.card.security": "Bezpieczeństwo",
+  "forgot-password.form.identification.header": "Identifikacja",
+  "forgot-password.form.identification.email": "Adres e-mail: ",
+  "forgot-password.form.label.password": "Hasło",
+  "forgot-password.form.label.passwordrepeat": "Potwierdź hasło",
+  "forgot-password.form.error.empty-password": "Wpisz hasło poniżej.",
+  "forgot-password.form.error.matching-passwords": "Hasła nie są identyczne.",
+  "forgot-password.form.notification.error.title": "Błąd podczas próby ustawienia nowego hasła",
+  "forgot-password.form.notification.success.content": "Resetowanie hasła udało się. Zalogowano jako stworzony przed momemntem użytkownik.",
+  "forgot-password.form.notification.success.title": "Resetowanie hasła udane",
+  "forgot-password.form.submit": "Wpisz hasło",
+  "form.add": "Dodaj",
+  "form.add-help": "Wybierz ten przycisk, aby dodać aktualny wpis lub dodać następny",
+  "form.cancel": "Anuluj",
+  "form.clear": "Wyczyść",
+  "form.clear-help": "Kliknij tutaj, aby usunąć wybraną wartość",
+  "form.discard": "Odrzuć",
+  "form.drag": "Przeciągnij",
+  "form.edit": "Edytuj",
+  "form.edit-help": "Kliknij tutaj, aby edytować wybraną wartość",
+  "form.first-name": "Imię",
+  "form.last-name": "Nazwisko",
+  "form.loading": "Ładowanie...",
+  "form.lookup": "Przeglądaj",
+  "form.lookup-help": "Kliknij tutaj, aby zobaczyć istniejące powiązania",
+  "form.no-results": "Nie znaleziono rezultatów",
+  "form.no-value": "Nie wprowadzono wartości",
+  "form.remove": "Usuń",
+  "form.save": "Zapisz",
+  "form.save-help": "Zapisz zmiany",
+  "form.search": "Wyszukaj",
+  "form.search-help": "Kliknij tutaj, aby wyszukać w istniejących komentarzach",
+  "form.submit": "Zapisz",
+  "form.repeatable.sort.tip": "Upuść nową pozycję w nowym miejscu",
+  "grant-deny-request-copy.deny": "Nie przesyłaj kopii",
+  "grant-deny-request-copy.email.back": "Cofnij",
+  "grant-deny-request-copy.email.message": "Wiadomości",
+  "grant-deny-request-copy.email.message.empty": "Proszę wprowadzić wiadomość",
+  "grant-deny-request-copy.email.permissions.info": "W tym miejscu możesz przemyśleć ograniczenie dostępu do dokumentu, aby odpowiadać na mniej próśb o dostęp. Jeśli chcesz wystąpić do administratorów reposytorium o zniesienie restrykcji, zaznacz okienko poniżej.",
+  "grant-deny-request-copy.email.permissions.label": "Ustaw jako otwarty dostęp",
+  "grant-deny-request-copy.email.send": "Wyślij",
+  "grant-deny-request-copy.email.subject": "Temat",
+  "grant-deny-request-copy.email.subject.empty": "Wpisz temat",
+  "grant-deny-request-copy.grant": "Wyślij kopię",
+  "grant-deny-request-copy.header": "Prośba o przesłanie kopii dokumentu",
+  "grant-deny-request-copy.home-page": "Zabierz mnie na stronę główną",
+  "grant-deny-request-copy.intro1": "Jeśli jesteś jednym z autorów dokumentu <a href='{{ url }}'>{{ name }}</a>, wybierz jedną z poniższych opcji, aby odpowiedzieć zapytaniu użytkownika.",
+  "grant-deny-request-copy.intro2": "Po wybraniu opcji, zostaną wyświetlone sugerowane odpowiedzi, które można edytować.",
+  "grant-deny-request-copy.processed": "Ta prośba jest już procesowana. Możesz użyć przycisku poniżej, aby wrócić do strony głównej.",
+  "grant-request-copy.email.message": "Drogi użytkowniku {{ recipientName }},\nW odpowiedzi na Państwa zapytanie, miło mi poinformować, że w załączniku przesyłam kopię dokumentu, o który Państwo prosili: \"{{ itemUrl }}\" ({{ itemName }}), którego jestem autorem.\n\nPozdrawiam serdecznie,\n{{ authorName }} <{{ authorEmail }}>",
+  "grant-request-copy.email.subject": "Prośba o kopię dokumentu",
+  "grant-request-copy.error": "Wystąpił błąd",
+  "grant-request-copy.header": "Zezwól na wysłanie kopii dokumentu",
+  "grant-request-copy.intro": "To wiadomość zostanie wysłana do osoby, która wystąpiła o dostęp. Wskazane dokumenty zostaną dołączone jako załącznik.",
+  "grant-request-copy.success": "Prośba o dostęp do dokumentu została przyjęta",
+  "home.description": "",
+  "home.breadcrumbs": "Strona główna",
+  "home.search-form.placeholder": "Przeszukaj repozytorium...",
+  "home.title": "Strona główna",
+  "home.top-level-communities.head": "Zbiory w DSpace",
+  "home.top-level-communities.help": "Przeszukaj kolekcje",
+  "info.end-user-agreement.accept": "Przeczytałem/am i akceptuję umowę użytkownika",
+  "info.end-user-agreement.accept.error": "Błąd wystąpił podczas akceptowania umowy użytkownika",
+  "info.end-user-agreement.accept.success": "Udało się zaktualizować umowę użytkownika",
+  "info.end-user-agreement.breadcrumbs": "Umowa użytkownika",
+  "info.end-user-agreement.buttons.cancel": "Anuluj",
+  "info.end-user-agreement.buttons.save": "Zapisz",
+  "info.end-user-agreement.head": "Umowa użytkownika",
+  "info.end-user-agreement.title": "Umowa użytkownika",
+  "info.privacy.breadcrumbs": "Oświadczenie polityki prywatności",
+  "info.privacy.head": "Oświadczenie polityki prywatności",
+  "info.privacy.title": "Oświadczenie polityki prywatności",
+  "item.alerts.private": "Ta pozycja jest prywatna",
+  "item.alerts.withdrawn": "Ta pozycja została wycofana",
+  "item.edit.authorizations.heading": "Za pomocą tego edytora możesz przeglądać i zmieniać polityki dla danej pozycji, a także zmieniać polityki dla poszczególnych części pozycji: paczek i strumieni bitów. W skrócie, pozycja jest kontenerem pakietów, a pakiety są kontenerami strumieni bitów. Kontenery zazwyczaj mają polityki ADD/REMOVE/READ/WRITE, natomiast strumienie bitów mają tylko polityki READ/WRITE.",
+  "item.edit.authorizations.title": "Edytuj politykę tej pozycji",
+  "item.badge.private": "Prywatny status publikacji",
+  "item.badge.withdrawn": "Wycofane publikacje",
+  "item.bitstreams.upload.bundle": "Pakiet",
+  "item.bitstreams.upload.bundle.placeholder": "Wybierz pakiet",
+  "item.bitstreams.upload.bundle.new": "Utworz pakiet",
+  "item.bitstreams.upload.bundles.empty": "Ta pozycja nie zawiera żadnych pakietów, do których można przesłać strumień bitów.",
+  "item.bitstreams.upload.cancel": "Anuluj",
+  "item.bitstreams.upload.drop-message": "Upuść plik, aby przesłać",
+  "item.bitstreams.upload.item": "Pozycja: ",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Udało się utworzyć nowy pakiet.",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Utwórz pakiet",
+  "item.bitstreams.upload.notifications.upload.failed": "Zweryfikuj pliki przed spróbowaniem ponownie.",
+  "item.bitstreams.upload.title": "Prześlij strumień bitów",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Prześlij",
+  "item.edit.bitstreams.bundle.displaying": "Obecnie wyświetlono {{ amount }} plików z {{ total }}.",
+  "item.edit.bitstreams.bundle.load.all": "Załaduj wszystkie ({{ total }})",
+  "item.edit.bitstreams.bundle.load.more": "Załaduj więcej",
+  "item.edit.bitstreams.bundle.name": "PACZKA: {{ name }}",
+  "item.edit.bitstreams.discard-button": "Odrzuć",
+  "item.edit.bitstreams.edit.buttons.download": "Pobierz",
+  "item.edit.bitstreams.edit.buttons.drag": "Przeciągnij",
+  "item.edit.bitstreams.edit.buttons.edit": "Edytuj",
+  "item.edit.bitstreams.edit.buttons.remove": "Usuń",
+  "item.edit.bitstreams.edit.buttons.undo": "Cofnij zmiany",
+  "item.edit.bitstreams.empty": "Ta pozycja nie zawiera żadnych strumieni bitów. Wybierz strumienie do załadowania, aby je utworzyć.",
+  "item.edit.bitstreams.headers.actions": "Akcje",
+  "item.edit.bitstreams.headers.bundle": "Paczka",
+  "item.edit.bitstreams.headers.description": "Opis",
+  "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.name": "Nazwa",
+  "item.edit.bitstreams.notifications.discarded.content": "Twoje zmiany zostały odrzucone. Aby je przywrócić, wybierz przycisk 'Cofnij'",
+  "item.edit.bitstreams.notifications.discarded.title": "Zmiany odrzucone",
+  "item.edit.bitstreams.notifications.move.failed.title": "Błąd podczas przenoszenia plików",
+  "item.edit.bitstreams.notifications.move.saved.content": "Zmiany pozycji dla pliku tej pozycji oraz jego paczki zostały zapisane.",
+  "item.edit.bitstreams.notifications.move.saved.title": "Zmiana pozycji została zapisana",
+  "item.edit.bitstreams.notifications.outdated.content": "Pozycja została w międzyczasie zmieniona przez innego użytkownika. Twoje zmiany zostały cofnięte, aby uniknąć ewentualnych konfliktów",
+  "item.edit.bitstreams.notifications.outdated.title": "Zmiany nieaktualne",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Błąd podczas usuwania pliku",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Twoje zmiany dotyczące usunięcia plików z tej pozycji zostały zapisane.",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Zmiany dotyczące usunięcia zapisane",
+  "item.edit.bitstreams.reinstate-button": "Cofnij",
+  "item.edit.bitstreams.save-button": "Zapisz",
+  "item.edit.bitstreams.upload-button": "Prześlij",
+  "item.edit.delete.cancel": "Anuluj",
+  "item.edit.delete.confirm": "Usuń",
+  "item.edit.delete.description": "Czy jesteś pewien, że ta pozycja powinna zostać całkowicie usunięta? Ostrożnie: Teraz nie pozostanie po tej pozycji żaden ślad.",
+  "item.edit.delete.error": "Błąd wystąpił podczas usuwania pozycji",
+  "item.edit.delete.header": "Usuń pozycję: {{ id }}",
+  "item.edit.delete.success": "Ta pozycja została usunięta",
+  "item.edit.head": "Edytuj pozycję",
+  "item.edit.breadcrumbs": "Edytuj pozycję",
+  "item.edit.tabs.disabled.tooltip": "Nie masz dostępu do tej strony",
+  "item.edit.tabs.mapper.head": "Mapper kolekcji",
+  "item.edit.tabs.item-mapper.title": "Edytowanie pozycji - Mapper kolekcji",
+  "item.edit.item-mapper.buttons.add": "Mapowanie pozycji do wybranych kolekcji",
+  "item.edit.item-mapper.buttons.remove": "Usuń mapowanie pozycji do wybranych kolekcji",
+  "item.edit.item-mapper.cancel": "Anuluj",
+  "item.edit.item-mapper.description": "To jest narzędzie do mapowania elementów, które pozwala administratorom mapować tę pozycję do innych kolekcji. Możesz wyszukiwać kolekcje i je mapować lub przeglądać listę kolekcji, do których dana pozycja jest aktualnie zmapowana.",
+  "item.edit.item-mapper.head": "Mapper pozycji - Mapowanie pozycji do kolekcji",
+  "item.edit.item-mapper.item": "Pozycja: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.no-search": "Wpisz zapytanie, które chcesz wyszukać",
+  "item.edit.item-mapper.notifications.add.error.content": "Wystąpiły błędy dla mapowania pozycji w {{amount}} kolekcjach.",
+  "item.edit.item-mapper.notifications.add.error.head": "Błędy mapowania",
+  "item.edit.item-mapper.notifications.add.success.content": "Udało się zmapować elementy dla {{amount}} kolekcji.",
+  "item.edit.item-mapper.notifications.add.success.head": "Mapowanie zakończone",
+  "item.edit.item-mapper.notifications.remove.error.content": "Wystąpiły błędy podczas usuwania mapowania do {{amount}} kolekcji.",
+  "item.edit.item-mapper.notifications.remove.error.head": "Usunięcie mapowania błędów",
+  "item.edit.item-mapper.notifications.remove.success.content": "Udało się usunąć mapowanie pozycji w {{amount}} kolekcjach.",
+  "item.edit.item-mapper.notifications.remove.success.head": "Usuwanie mapowania zakończone",
+  "item.edit.item-mapper.search-form.placeholder": "Przeszukaj kolekcje...",
+  "item.edit.item-mapper.tabs.browse": "Przeglądaj zmapowane kolekcje",
+  "item.edit.item-mapper.tabs.map": "Mapuj nowe kolekcje",
+  "item.edit.metadata.add-button": "Dodaj",
+  "item.edit.metadata.discard-button": "Odrzuć",
+  "item.edit.metadata.edit.buttons.edit": "Edytuj",
+  "item.edit.metadata.edit.buttons.remove": "Usuń",
+  "item.edit.metadata.edit.buttons.undo": "Cofnij zmiany",
+  "item.edit.metadata.edit.buttons.unedit": "Zatrzymaj edycję",
+  "item.edit.metadata.empty": "Ta pozycja nie zawiera żadnych metadanych. Wybierz Dodaj, aby dodać metadane.",
+  "item.edit.metadata.headers.edit": "Edytuj",
+  "item.edit.metadata.headers.field": "Pole",
+  "item.edit.metadata.headers.language": "Język",
+  "item.edit.metadata.headers.value": "Wartość",
+  "item.edit.metadata.metadatafield.invalid": "Wybierz aktualne pole metadanych",
+  "item.edit.metadata.notifications.discarded.content": "Twoje zmiany zostały odrzucone. Aby wgrać je ponownie wybierz przycisk 'Cofnij'",
+  "item.edit.metadata.notifications.discarded.title": "Zmiany odrzucone",
+  "item.edit.metadata.notifications.error.title": "Wystąpił błąd",
+  "item.edit.metadata.notifications.invalid.content": "Twoje zmiany nie zostały zapisane. Przed zapisaniem upewnij się, że wszystkie pola są wypełnione prawidłowo.",
+  "item.edit.metadata.notifications.invalid.title": "Nieprawidłowe metadane",
+  "item.edit.metadata.notifications.outdated.content": "Pozycja została w międzyczasie zmieniona przez innego użytkownika. Twoje zmiany zostały cofnięte, aby zapobiec ewentualnym konfliktom",
+  "item.edit.metadata.notifications.outdated.title": "Zmiany nieaktualne",
+  "item.edit.metadata.notifications.saved.content": "Twoje zmiany metadanych tej pozycji zostały zapisane.",
+  "item.edit.metadata.notifications.saved.title": "Metadane zostały zapisane",
+  "item.edit.metadata.reinstate-button": "Cofnij",
+  "item.edit.metadata.save-button": "Zapisz",
+  "item.edit.modify.overview.field": "Pole",
+  "item.edit.modify.overview.language": "Język",
+  "item.edit.modify.overview.value": "Wartość",
+  "item.edit.move.cancel": "Anuluj",
+  "item.edit.move.save-button": "Zapisz",
+  "item.edit.move.discard-button": "Odrzuć",
+  "item.edit.move.description": "Wybierz kolekcję, do której chcesz przenieść tę pozycję. Aby zawęzić listę wyświetlanych kolekcji, możesz wprowadzić zapytanie w polu wyszukiwania.",
+  "item.edit.move.error": "Wystąpił błąd podczas przenoszenia pozycji",
+  "item.edit.move.head": "Przenieś pozycję: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Dziedziczenie polityk",
+  "item.edit.move.inheritpolicies.description": "Dziedzczenie domyślnych polityk z kolekcji docelowej",
+  "item.edit.move.move": "Przenieś",
+  "item.edit.move.processing": "Przenoszenie...",
+  "item.edit.move.search.placeholder": "Wpisz zapytanie, aby wyszukać w kolekcjach",
+  "item.edit.move.success": "Pozycja została przeniesiona",
+  "item.edit.move.title": "Przenieś pozycję",
+  "item.edit.private.cancel": "Anuluj",
+  "item.edit.private.confirm": "Ukryj",
+  "item.edit.private.description": "Czy chcesz ukryć tę pozycję?",
+  "item.edit.private.error": "Wystąpił błąd podczas ukrywania pozycji",
+  "item.edit.private.header": "Ukryj pozycję: {{ id }}",
+  "item.edit.private.success": "Pozycja jest teraz ukryta",
+  "item.edit.public.cancel": "Anuluj",
+  "item.edit.public.confirm": "Upublicznij",
+  "item.edit.public.description": "Czy chcesz upublicznić tę pozycję?",
+  "item.edit.public.error": "Wystąpił błąd podczas upubliczniania pozycji",
+  "item.edit.public.header": "Upublicznij pozycję: {{ id }}",
+  "item.edit.public.success": "Pozycja jest teraz publiczna",
+  "item.edit.reinstate.cancel": "Anuluj",
+  "item.edit.reinstate.confirm": "Przywróć",
+  "item.edit.reinstate.description": "Czy chcesz przywrócić tę pozycję?",
+  "item.edit.reinstate.error": "Wystąpił błąd podczas przywracania pozycji",
+  "item.edit.reinstate.header": "Przywróć pozycję: {{ id }}",
+  "item.edit.reinstate.success": "Pozycja została przywrócona",
+  "item.edit.relationships.discard-button": "Odrzuć",
+  "item.edit.relationships.edit.buttons.add": "Dodaj",
+  "item.edit.relationships.edit.buttons.remove": "Usuń",
+  "item.edit.relationships.edit.buttons.undo": "Cofnij zmiany",
+  "item.edit.relationships.no-relationships": "Brak relacji",
+  "item.edit.relationships.notifications.discarded.content": "Twoje zmiany zostały cofnięte. Aby przywrócić zmiany wybierz przycisk 'Cofnij'",
+  "item.edit.relationships.notifications.discarded.title": "Zmiany zostały cofnięte",
+  "item.edit.relationships.notifications.failed.title": "Wystąpił błąd podczas edytowania relacji",
+  "item.edit.relationships.notifications.outdated.content": "Ta pozycja została właśnie zmieniona przez innego użytkownika. Twoje zmiany zostały cofnięte, aby uniknąć konfliktów",
+  "item.edit.relationships.notifications.outdated.title": "Zmiany są nieaktualne",
+  "item.edit.relationships.notifications.saved.content": "Twoje zmiany w relacjach tej pozycji zostały zapisane.",
+  "item.edit.relationships.notifications.saved.title": "Relacje zostały zapisane",
+  "item.edit.relationships.reinstate-button": "Cofnij",
+  "item.edit.relationships.save-button": "Zapisz",
+  "item.edit.relationships.no-entity-type": "Dodaj metadaną 'dspace.entity.type', aby umożliwić dodawanie relacji do pozycji",
+  "item.edit.return": "Cofnij",
+  "item.edit.tabs.bitstreams.head": "Pliki",
+  "item.edit.tabs.bitstreams.title": "Edycja pozycji - pliki",
+  "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.relationships.head": "Relacje",
+  "item.edit.tabs.relationships.title": "Edycja pozycja - relacje",
+  "item.edit.tabs.status.buttons.authorizations.button": "Dostępy...",
+  "item.edit.tabs.status.buttons.authorizations.label": "Określu dostęp do pozycji",
+  "item.edit.tabs.status.buttons.delete.button": "Usuń permanentnie",
+  "item.edit.tabs.status.buttons.delete.label": "Usuń pozycję permanentnie",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Zmapowane kolekcje",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Zarządzaj mapowanymi kolekcjami",
+  "item.edit.tabs.status.buttons.move.button": "Przenieś...",
+  "item.edit.tabs.status.buttons.move.label": "Przenieś pozycję do innej kolekcji",
+  "item.edit.tabs.status.buttons.private.button": "Ukryj...",
+  "item.edit.tabs.status.buttons.private.label": "Ukry pozycję",
+  "item.edit.tabs.status.buttons.public.button": "Upublicznij...",
+  "item.edit.tabs.status.buttons.public.label": "Upublicznij pozycję",
+  "item.edit.tabs.status.buttons.reinstate.button": "Przywróć...",
+  "item.edit.tabs.status.buttons.reinstate.label": "Przywróć pozycję",
+  "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.withdraw.button": "Wycofaj...",
+  "item.edit.tabs.status.buttons.withdraw.label": "Wycofaj z repozytorium",
+  "item.edit.tabs.status.description": "Witamy na stronie zarządzania pozycjami. Z tego miejsca możesz wycofać, przywrócić, przenieść lub usunąć daną pozycję. Możesz również aktualizować lub dodawać nowe metadane lub pliki..",
+  "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.labels.handle": "Identyfikator",
+  "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.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.withdraw.cancel": "Anuluj",
+  "item.edit.withdraw.confirm": "Wycofaj",
+  "item.edit.withdraw.description": "Czy na pewno chcesz wycofać pozycję?",
+  "item.edit.withdraw.error": "Wystąpił błąd podczas wycofywania pozycji",
+  "item.edit.withdraw.header": "Wycofaj pozycję: {{ id }}",
+  "item.edit.withdraw.success": "Pozycja została wycofana",
+  "item.listelement.badge": "Pozycja",
+  "item.page.description": "Opis",
+  "item.page.journal-issn": "ISSN czasopisma",
+  "item.page.journal-title": "Tytuł czasopisma",
+  "item.page.publisher": "Wydawca",
+  "item.page.titleprefix": "Pozycja: ",
+  "item.page.volume-title": "Tytuł tomu",
+  "item.search.results.head": "Wyniki wyszukiwania pozycji",
+  "item.search.title": "Wyszukiwanie pozycji",
+  "item.page.abstract": "Abstrakt",
+  "item.page.author": "Autorzy",
+  "item.page.citation": "Cytowanie",
+  "item.page.collections": "Kolekcje",
+  "item.page.collections.loading": "Ładowanie...",
+  "item.page.collections.load-more": "Załaduj więcej",
+  "item.page.date": "Data",
+  "item.page.edit": "Edytuj pozycję",
+  "item.page.files": "Pliki",
+  "item.page.filesection.description": "Opis:",
+  "item.page.filesection.download": "Pobierz",
+  "item.page.filesection.format": "Format:",
+  "item.page.filesection.name": "Nazwa:",
+  "item.page.filesection.size": "Rozmiar:",
+  "item.page.journal.search.title": "Artykuły w czasopiśmie",
+  "item.page.link.full": "Zobacz szczegóły",
+  "item.page.link.simple": "Uproszczony widok",
+  "item.page.person.search.title": "Artykuły tego autora",
+  "item.page.related-items.view-more": "Pokaż o {{ amount }} więcej",
+  "item.page.related-items.view-less": "Ukryj {{ amount }}",
+  "item.page.relationships.isAuthorOfPublication": "Publikacje",
+  "item.page.relationships.isJournalOfPublication": "Publikacje",
+  "item.page.relationships.isOrgUnitOfPerson": "Autorzy",
+  "item.page.relationships.isOrgUnitOfProject": "Projekty naukowe",
+  "item.page.subject": "Słowa kluczowe",
+  "item.page.uri": "URI",
+  "item.page.bitstreams.view-more": "Pokaż więcej",
+  "item.page.bitstreams.collapse": "Pokaż mniej",
+  "item.page.filesection.original.bundle": "Oryginalne pliki",
+  "item.page.filesection.license.bundle": "Licencja",
+  "item.page.return": "Powrót",
+  "item.page.version.create": "Utwórz nową wersję",
+  "item.page.version.hasDraft": "Nowa wersja nie może zostać utworzona, ponieważ istnieje już oczekujące na akceptację zgłoszenie dokumentu tego pliku",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.relation.ispartof": "Czasopismo lub seria",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.uri": "Identyfikator:",
+  "item.preview.dc.contributor.author": "Autorzy:",
+  "item.preview.dc.date.issued": "Data publikacji:",
+  "item.preview.dc.description.abstract": "Abstrakt:",
+  "item.preview.dc.identifier.other": "Inny identyfikator:",
+  "item.preview.dc.language.iso": "Język:",
+  "item.preview.dc.title": "Tytuł:",
+  "item.preview.dc.title.alternative": "Tytuł alternatywny",
+  "item.preview.dc.type": "Typ:",
+  "item.preview.dc.identifier": "Identyfikator:",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.oaire.citation.issue": "Numer wydania",
+  "item.preview.oaire.citation.volume": "Numer tomu",
+  "item.preview.person.familyName": "Nazwisko:",
+  "item.preview.person.givenName": "Nazwa:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.name": "Fundator:",
+  "item.preview.project.funder.identifier": "Identyfikator fundatora:",
+  "item.preview.oaire.awardNumber": "ID finansowania:",
+  "item.preview.dc.coverage.spatial": "Jurysdykcja:",
+  "item.preview.oaire.fundingStream": "Źródło finansowania:",
+  "item.select.confirm": "Potwierdź zaznaczone",
+  "item.select.empty": "Brak pozycji do wyświetlenia",
+  "item.select.table.author": "Autor",
+  "item.select.table.collection": "Kolekcja",
+  "item.select.table.title": "Tytuł",
+  "item.version.history.empty": "Jeszcze nie ma innych wersji tej pozycji.",
+  "item.version.history.head": "Poprzednie wersje",
+  "item.version.history.return": "Powrót",
+  "item.version.history.selected": "Wybrane wersje",
+  "item.version.history.selected.alert": "W tym momencie wyświetlono wersję {{version}} pozycji.",
+  "item.version.history.table.version": "Wersja",
+  "item.version.history.table.item": "Pozycja",
+  "item.version.history.table.editor": "Redaktor",
+  "item.version.history.table.date": "Data",
+  "item.version.history.table.summary": "Podsumowanie",
+  "item.version.history.table.workspaceItem": "Wersja robocza",
+  "item.version.history.table.workflowItem": "Pozycja workflow",
+  "item.version.history.table.actions": "Akcja",
+  "item.version.history.table.action.editWorkspaceItem": "Edytuj wersję roboczą pozycji",
+  "item.version.history.table.action.editSummary": "Edytuj podsumowanie",
+  "item.version.history.table.action.saveSummary": "Zapisz edycje podsumowania",
+  "item.version.history.table.action.discardSummary": "Odrzuć edycje podsumowania",
+  "item.version.history.table.action.newVersion": "Utwórz nową wersję z tej wersji",
+  "item.version.history.table.action.deleteVersion": "Wersja usunięta",
+  "item.version.history.table.action.hasDraft": "Nowa wersja nie może zostać utworzona, ponieważ istnieje już oczekujące na akceptację zgłoszenie dokumentu tego pliku",
+  "item.version.notice": "To nie jest najnowsza wersja tej pozycji. Najnowsza wersja jest dostępna <a href='{{destination}}'>tutaj</a>.",
+  "item.version.create.modal.header": "Nowa wersja",
+  "item.version.create.modal.text": "Utwórz nową wersję tej pozycji",
+  "item.version.create.modal.text.startingFrom": "zaczynając od wersji {{version}}",
+  "item.version.create.modal.button.confirm": "Utwórz",
+  "item.version.create.modal.button.confirm.tooltip": "Utwórz nową wersję",
+  "item.version.create.modal.button.cancel": "Anuluj",
+  "item.version.create.modal.button.cancel.tooltip": "Nie stwarzaj nowej wersji",
+  "item.version.create.modal.form.summary.label": "Podsumowanie",
+  "item.version.create.modal.form.summary.placeholder": "Wprowadź podsumowanie nowej wersji",
+  "item.version.create.notification.success": "Nowa wersja została utworzona z numerem {{version}}",
+  "item.version.create.notification.failure": "Nowa wersja nie została utworzona",
+  "item.version.create.notification.inProgress": "Nowa wersja nie może być utworzona, ponieważ propozycja innej wersji jest już złożona do zaakceptowania",
+  "item.version.delete.modal.header": "Usuń wersję",
+  "item.version.delete.modal.text": "Czy chcesz usunąć wersję {{version}}?",
+  "item.version.delete.modal.button.confirm": "Usuń",
+  "item.version.delete.modal.button.confirm.tooltip": "Usuń wersję",
+  "item.version.delete.modal.button.cancel": "Anuluj",
+  "item.version.delete.modal.button.cancel.tooltip": "Nie usuwaj tej wersji",
+  "item.version.delete.notification.success": "Wersja {{version}} została usunięta",
+  "item.version.delete.notification.failure": "Wersja {{version}} nie została usunięta",
+  "item.version.edit.notification.success": "Podsumowanie wersji {{version}} zostało zmienione",
+  "item.version.edit.notification.failure": "Podsumowanie wersji {{version}} nie zostało zmienione",
+  "journal.listelement.badge": "Czasopismo",
+  "journal.page.description": "Opis",
+  "journal.page.edit": "Edytuj tę pozycję",
+  "journal.page.editor": "Redaktor naczelny",
+  "journal.page.issn": "ISSN",
+  "journal.page.publisher": "Wydawca",
+  "journal.page.titleprefix": "Czasopismo: ",
+  "journal.search.results.head": "Wyniki wyszukiwania czasopism",
+  "journal.search.title": "Wyszukiwanie czasopism",
+  "journalissue.listelement.badge": "Numer czasopisma",
+  "journalissue.page.description": "Opis",
+  "journalissue.page.edit": "Edytuj pozycję",
+  "journalissue.page.issuedate": "Data wydania",
+  "journalissue.page.journal-issn": "ISSN czasopisma",
+  "journalissue.page.journal-title": "Tytuł czasopisma",
+  "journalissue.page.keyword": "Słowa kluczowe",
+  "journalissue.page.number": "Numer",
+  "journalissue.page.titleprefix": "Wydanie czasopisma: ",
+  "journalvolume.listelement.badge": "Numer tomu czasopisma",
+  "journalvolume.page.description": "Opis",
+  "journalvolume.page.edit": "Edytuj pozycję",
+  "journalvolume.page.issuedate": "Data wydania",
+  "journalvolume.page.titleprefix": "Numer tomu czasopisma: ",
+  "journalvolume.page.volume": "Numer wydania",
+  "iiifsearchable.listelement.badge": "Multimedia dokumentu",
+  "iiifsearchable.page.titleprefix": "Dokument: ",
+  "iiifsearchable.page.doi": "Stały link: ",
+  "iiifsearchable.page.issue": "Wydanie: ",
+  "iiifsearchable.page.description": "Opis: ",
+  "iiifviewer.fullscreen.notice": "Wyświetl na pełnym ekranie dla lepszego widoku.",
+  "iiif.listelement.badge": "Multimedia obrazu",
+  "iiif.page.titleprefix": "Obraz: ",
+  "iiif.page.doi": "Stały link: ",
+  "iiif.page.issue": "Numer wydania: ",
+  "iiif.page.description": "Opis: ",
+  "loading.bitstream": "Ładowanie pliku...",
+  "loading.bitstreams": "Ładowanie plików...",
+  "loading.browse-by": "Ładowanie pozycji...",
+  "loading.browse-by-page": "Ładowanie strony...",
+  "loading.collection": "Ładowanie kolekcji...",
+  "loading.collections": "Ładowanie kolekcji...",
+  "loading.content-source": "Ładowanie źródła treści...",
+  "loading.community": "Ładowanie zbioru...",
+  "loading.default": "Ładowanie...",
+  "loading.item": "Ładowanie pozycji...",
+  "loading.items": "Ładowanie pozycji...",
+  "loading.mydspace-results": "Ładowanie pozycji...",
+  "loading.objects": "Ładowanie...",
+  "loading.recent-submissions": "Ładowanie ostatnich zgłoszeń...",
+  "loading.search-results": "Ładowanie wyników wyszukiwania...",
+  "loading.sub-collections": "Ładowanie podkolekcji...",
+  "loading.sub-communities": "Ładowanie podzbioru...",
+  "loading.top-level-communities": "Ładowanie zbioru wyszego szczebla...",
+  "login.form.email": "Adres e-mail",
+  "login.form.forgot-password": "Nie pamiętasz hasła?",
+  "login.form.header": "Zaloguj się do DSpace",
+  "login.form.new-user": "Nie masz konta? Zarejestruj się.",
+  "login.form.or-divider": "lub",
+  "login.form.orcid": "Zaloguj za pomocą ORCID",
+  "login.form.oidc": "Zaloguj za pomocą OIDC",
+  "login.form.password": "Hasło",
+  "login.form.shibboleth": "Zaloguj za pomocą Shibboleth",
+  "login.form.submit": "Zaloguj się",
+  "login.title": "Zaloguj",
+  "login.breadcrumbs": "Zaloguj",
+  "logout.form.header": "Wyloguj się z DSpace",
+  "logout.form.submit": "Wyloguj się",
+  "logout.title": "Wylogowywanie",
+  "menu.header.admin": "Panel administracyjny",
+  "menu.header.image.logo": "Logo repozytorium",
+  "menu.header.admin.description": "Menu administratora",
+  "menu.section.access_control": "Uprawnienia",
+  "menu.section.access_control_authorizations": "Dostępy",
+  "menu.section.access_control_groups": "Grupy",
+  "menu.section.access_control_people": "Użytkownicy",
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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": "Wyszukiwanie administracyjne",
+  "menu.section.browse_community": "Ten zbiór",
+  "menu.section.browse_community_by_author": "Wg autorów",
+  "menu.section.browse_community_by_issue_date": "Wg daty wydania",
+  "menu.section.browse_community_by_title": "Wg tytułów",
+  "menu.section.browse_global": "Wszystko na DSpace",
+  "menu.section.browse_global_by_author": "Wg autorów",
+  "menu.section.browse_global_by_dateissued": "Wg daty wydania",
+  "menu.section.browse_global_by_subject": "Wg tematu",
+  "menu.section.browse_global_by_title": "Wg tytułu",
+  "menu.section.browse_global_communities_and_collections": "Zbiory i kolekcje",
+  "menu.section.control_panel": "Panel sterowania",
+  "menu.section.curation_task": "Zadanie administracyjne",
+  "menu.section.edit": "Edytuj",
+  "menu.section.edit_collection": "Kolekcja",
+  "menu.section.edit_community": "Zbiór",
+  "menu.section.edit_item": "Pozycja",
+  "menu.section.export": "Eksport",
+  "menu.section.export_collection": "Kolekcja",
+  "menu.section.export_community": "Zbiór",
+  "menu.section.export_item": "Pozycja",
+  "menu.section.export_metadata": "Metadane",
+  "menu.section.icon.access_control": "Sekcja menu Uprawnienia",
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
+  "menu.section.icon.admin_search": "Sekcja menu Wyszukiwanie administracyjne",
+  "menu.section.icon.control_panel": "Sekcja menu Panel sterowania",
+  "menu.section.icon.curation_tasks": "Sekcja menu Zadanie administracyjne",
+  "menu.section.icon.edit": "Sekcja menu Edycja",
+  "menu.section.icon.export": "Sekcja menu Eksport",
+  "menu.section.icon.find": "Sekcja menu Wyszukiwanie",
+  "menu.section.icon.import": "Sekcja menu Import",
+  "menu.section.icon.new": "Sekcja menu Dodaj",
+  "menu.section.icon.pin": "Przypnij boczny pasek",
+  "menu.section.icon.processes": "Sekcja menu Procesy",
+  "menu.section.icon.registries": "Sekcja menu Rejestry",
+  "menu.section.icon.statistics_task": "Sekcja menu Zadanie statystyczne",
+  "menu.section.icon.workflow": "Sekcja menu Zarządzanie workflow",
+  "menu.section.icon.unpin": "Odepnij boczny pasek",
+  "menu.section.import": "Import",
+  "menu.section.import_batch": "Import masowy (ZIP)",
+  "menu.section.import_metadata": "Metadane",
+  "menu.section.new": "Dodaj",
+  "menu.section.new_collection": "Kolekcja",
+  "menu.section.new_community": "Zbiór",
+  "menu.section.new_item": "Pozycja",
+  "menu.section.new_item_version": "Wersja pozycji",
+  "menu.section.new_process": "Proces",
+  "menu.section.pin": "Przypnij pasek boczny",
+  "menu.section.unpin": "Odepnij pasek boczny",
+  "menu.section.processes": "Procesy",
+  "menu.section.registries": "Rejestry",
+  "menu.section.registries_format": "Formaty",
+  "menu.section.registries_metadata": "Metadane",
+  "menu.section.statistics": "Statystyki",
+  "menu.section.statistics_task": "Zadanie statystyczne",
+  "menu.section.toggle.access_control": "Przełącz sekcję Uprawnienia",
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  "menu.section.toggle.control_panel": "Przełącz sekcję Panel sterowania",
+  "menu.section.toggle.curation_task": "Przełącz sekcję Zadanie kuratora",
+  "menu.section.toggle.edit": "Przełącz sekcję Edytuj",
+  "menu.section.toggle.export": "Przełącz sekcję Eksport",
+  "menu.section.toggle.find": "Przełącz sekcję Wyszukiwanie",
+  "menu.section.toggle.import": "Przełącz sekcję Import",
+  "menu.section.toggle.new": "Przełącz nową sekcję",
+  "menu.section.toggle.registries": "Przełącz sekcję Rejestry",
+  "menu.section.toggle.statistics_task": "Przełącz sekcję Zadanie statystyczne",
+  "menu.section.workflow": "Zarządzaj Workflow",
+  "mydspace.breadcrumbs": "Mój DSpace",
+  "mydspace.description": "",
+  "mydspace.messages.controller-help": "Wybierz tę opcję, aby przesłać wiadomość do zgłaszającego.",
+  "mydspace.messages.description-placeholder": "Wpisz swoją wiadomość tutaj...",
+  "mydspace.messages.hide-msg": "Ukryj wiadomość",
+  "mydspace.messages.mark-as-read": "Oznacz jako przeczytane",
+  "mydspace.messages.mark-as-unread": "Oznacz jako nieprzeczytane",
+  "mydspace.messages.no-content": "Brak treści.",
+  "mydspace.messages.no-messages": "Brak wiadomości.",
+  "mydspace.messages.send-btn": "Wysłano",
+  "mydspace.messages.show-msg": "Pokaż wiadomość",
+  "mydspace.messages.subject-placeholder": "Temat...",
+  "mydspace.messages.submitter-help": "Wybierz tę opcję, aby przesłać wiadomość do osoby kontrolującej.",
+  "mydspace.messages.title": "Wiadomości",
+  "mydspace.messages.to": "Do",
+  "mydspace.new-submission": "Nowe zgłoszenie",
+  "mydspace.new-submission-external": "Import medatanych z zewnętrznego źródła",
+  "mydspace.new-submission-external-short": "Import metadanych",
+  "mydspace.results.head": "Twoje zadania",
+  "mydspace.results.no-abstract": "Brak abstraktu",
+  "mydspace.results.no-authors": "Brak autorów",
+  "mydspace.results.no-collections": "Brak kolekcji",
+  "mydspace.results.no-date": "Brak daty",
+  "mydspace.results.no-files": "Brak plików",
+  "mydspace.results.no-results": "Brak pozycji do wyświetlenia",
+  "mydspace.results.no-title": "Brak tytułu",
+  "mydspace.results.no-uri": "Brak Uri",
+  "mydspace.search-form.placeholder": "Wyszukaj w mydspace...",
+  "mydspace.show.workflow": "Wszystkie zadania",
+  "mydspace.show.workspace": "Twoje zadania",
+  "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.",
+  "mydspace.upload.upload-failed-moreonefile": "Zapytanie niemożliwe do przetworzenia. Tylko jeden plik jest dopuszczalny.",
+  "mydspace.upload.upload-multiple-successful": "Utworzono {{qty}} przestrzeni roboczych.",
+  "mydspace.view-btn": "Widok",
+  "nav.browse.header": "Cały DSpace",
+  "nav.community-browse.header": "Wg zbiorów",
+  "nav.language": "Zmień język",
+  "nav.login": "Zaloguj",
+  "nav.logout": "Menu profilu użytkownika i wylogowywanie",
+  "nav.main.description": "Główny pasek nawigacji",
+  "nav.mydspace": "Mój DSpace",
+  "nav.profile": "Profil",
+  "nav.search": "Wyszukiwanie",
+  "nav.statistics.header": "Statystyki",
+  "nav.stop-impersonating": "Przestań impersonifikować użytkownika",
+  "nav.toggle": "Przełącz nawigację",
+  "nav.user.description": "Pasek profilu użytkownika",
+  "none.listelement.badge": "Pozycja",
+  "person.listelement.badge": "Osoba",
+  "person.listelement.no-title": "Nie znaleziono imienia",
+  "person.page.birthdate": "Data urodzenia",
+  "person.page.edit": "Edytuj pozycję",
+  "person.page.email": "Adres e-mail",
+  "person.page.firstname": "Imię",
+  "person.page.jobtitle": "Stanowisko",
+  "person.page.lastname": "Nazwisko",
+  "person.page.link.full": "Pokaż wszystkie metadane",
+  "person.page.orcid": "ORCID",
+  "person.page.orcid.create": "Utwórz ORCID ID",
+  "person.page.orcid.granted-authorizations": "Udzielone dostępy",
+  "person.page.orcid.grant-authorizations": "Udziel dostępu",
+  "person.page.orcid.link": "Połącz z ORCID ID",
+  "person.page.orcid.orcid-not-linked-message": "ORCID iD tego profilu ({{ orcid }}) nie jest połączony z bazą ORCID lub połączenie wygasło.",
+  "person.page.orcid.unlink": "Odepnij z ORCID",
+  "person.page.orcid.unlink.processing": "Procesowanie...",
+  "person.page.orcid.missing-authorizations": "Brak dostępów",
+  "person.page.orcid.missing-authorizations-message": "Brakuj następujących dostępów:",
+  "person.page.orcid.no-missing-authorizations-message": "Świetnie! To miejsce jest puste, co oznacza, że masz dostęp do wszystkich uprawnień, które są dostępne w Twojej instytucji.",
+  "person.page.orcid.no-orcid-message": "Brak przypisanego ORCID iD. Poprez wybranie przycisku poniżej możesz powiązać ten profil wraz z kontem ORCID.",
+  "person.page.orcid.profile-preferences": "Preferencje profilu",
+  "person.page.orcid.funding-preferences": "Preferencje finansowania",
+  "person.page.orcid.publications-preferences": "Preferencje publikacji",
+  "person.page.orcid.remove-orcid-message": "Jeśli chcesz usunąć Twój ORCID, skontaktuj się z administratorem repozytorium",
+  "person.page.orcid.save.preference.changes": "Aktualizuj ustawienia",
+  "person.page.orcid.sync-profile.affiliation": "Afiliacja",
+  "person.page.orcid.sync-profile.biographical": "Biografia",
+  "person.page.orcid.sync-profile.education": "Edukacja",
+  "person.page.orcid.sync-profile.identifiers": "Identyfikatory",
+  "person.page.orcid.sync-fundings.all": "Wszystkie źrodła finansowania",
+  "person.page.orcid.sync-fundings.mine": "Moje źrodła finansowania",
+  "person.page.orcid.sync-fundings.my_selected": "Wybrane źródła finansowania",
+  "person.page.orcid.sync-fundings.disabled": "Nieaktywne",
+  "person.page.orcid.sync-publications.all": "Wszystkie publikacje",
+  "person.page.orcid.sync-publications.mine": "Moje publikacje",
+  "person.page.orcid.sync-publications.my_selected": "Wybrane publikacje",
+  "person.page.orcid.sync-publications.disabled": "Nieaktywne",
+  "person.page.orcid.sync-queue.discard": "Odrzuć zmianę i nie synchronizuj z ORCID",
+  "person.page.orcid.sync-queue.discard.error": "Rekord kolejki ORCID nie został odrzucony",
+  "person.page.orcid.sync-queue.discard.success": "Rekord kolejki ORCID został odrzucony",
+  "person.page.orcid.sync-queue.empty-message": "Rejestr kolejki w ORCID jest pusty",
+  "person.page.orcid.sync-queue.description.affiliation": "Afiliacje",
+  "person.page.orcid.sync-queue.description.country": "Kraj",
+  "person.page.orcid.sync-queue.description.education": "Edukacja",
+  "person.page.orcid.sync-queue.description.external_ids": "Zewnętrzne identyfikatory",
+  "person.page.orcid.sync-queue.description.other_names": "Inne imiona",
+  "person.page.orcid.sync-queue.description.qualification": "Kwalifikacje",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL naukowca",
+  "person.page.orcid.sync-queue.description.keywords": "Słowa kluczowe",
+  "person.page.orcid.sync-queue.tooltip.insert": "Dodaj nowy wpis w rejestrze ORCID",
+  "person.page.orcid.sync-queue.tooltip.update": "Aktualizuj ten wpis w rejestrze ORCID",
+  "person.page.orcid.sync-queue.tooltip.delete": "Usuń ten wpis z rejestru ORCID",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publikacja",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Afiliacja",
+  "person.page.orcid.sync-queue.tooltip.education": "Edukacja",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Kwalifikacje",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Inna nazwa",
+  "person.page.orcid.sync-queue.tooltip.country": "Kraj",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Słowa kluczowe",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Zewnętrzny identyfikator",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL naukowca",
+  "person.page.orcid.sync-queue.send": "Synchronizuj z rejestrem ORCID",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Wysłanie zgłoszenia do ORCID nieudane z powodu braku uprawnień.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Wybierz <a href='{{orcid}}'>here</a>, aby wystąpić o niezbędne uprawnienia. Jeśli problem wciąż występuje, skontaktuj się z administratorem",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Wysłanie zgłoszenia do ORCID nie powiodło się ponieważ źródła wysłane do rejestru ORCID nie jest poprawne",
+  "person.page.orcid.sync-queue.send.error": "Wysłanie zgłoszenia do ORCID nie powiodło się",
+  "person.page.orcid.sync-queue.send.conflict-error": "Zgłoszenie do ORCID nie powiodło się, ponieważ ta pozycja jest już dodana do rejestru ORCID",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Pozycja nie istnieje już w rejestrze ORCID.",
+  "person.page.orcid.sync-queue.send.success": "Zgłoszenie do ORCID zostało zakończone pomyślnie",
+  "person.page.orcid.sync-queue.send.validation-error": "Dane, które chcesz zsynchronizować z ORCID nie są poprawne",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Waluta jest wymagana",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Aby wysłać pozycję, należy podać przynajmniej jeden identyfikator",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Tytuł jest wymagany",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Typ jest wymagany",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Data początkowa jest wymagana",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Instytucja finansująca jest wymagana",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Instytucja jest wymagana",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Nazwa instytucji jest wymagana",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Aby wysłać instytucję, należy podać adres",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Aby wysłać adres, należy podać miasto",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Aby wysłać adres, należy podać kraj",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Wymagany jest identyfikator umożliwiający rozróżnienie instytucji. Obsługiwane identyfikatory to GRID, Ringgold, kod LEI oraz identyfikatory z rejestru instytucji finansujących Crossref.",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Należy uzupełnić wartość w identyfikatorze instytucji",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Należy uzupełnić źródło w identyfikatorze instytucji",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Źródło jednego z identyfikatorów organizcji jest niepoprawne. Wspierane źródła to RINGGOLD, GRID, LEI and FUNDREF",
+  "person.page.orcid.synchronization-mode": "Tryb synchronizacji",
+  "person.page.orcid.synchronization-mode.batch": "Wsad",
+  "person.page.orcid.synchronization-mode.label": "Tryb synchronizacji",
+  "person.page.orcid.synchronization-mode-message": "Włącz tryb 'Manual' synchronizacja, aby wyłaczyć tryb synchronizacji wsadowej, wtedy dane do rejestru ORCID będą musiały zostać wysłane ręcznie",
+  "person.page.orcid.synchronization-settings-update.success": "Opcje synchronizacji zostały zaktualizowane",
+  "person.page.orcid.synchronization-settings-update.error": "Opcje synchronizacji nie zostały zaktualizowane",
+  "person.page.orcid.synchronization-mode.manual": "Ręczna",
+  "person.page.orcid.scope.authenticate": "Uzyskaj swój ORCID iD",
+  "person.page.orcid.scope.read-limited": "Przeczytaj informacje o ustawieniach widoczności z firmami trzeciami",
+  "person.page.orcid.scope.activities-update": "Dodaj/aktualizuj swoje aktywności naukowe",
+  "person.page.orcid.scope.person-update": "Dodaj/aktualizuj inne informacje o Tobie",
+  "person.page.orcid.unlink.success": "Odłączenie Twojego profilu od rejestru ORCID powiodło się",
+  "person.page.orcid.unlink.error": "Wystąpił błąd podczas odłączania Twojego profilu od rejestru ORCID. Spróbuj ponownie",
+  "person.page.staffid": "ID pracownika",
+  "person.page.titleprefix": "Osoba: ",
+  "person.search.results.head": "Wyniki wyszukiwania użytkowników",
+  "person.search.title": "Wyniki wyszukiwania użytkowników",
+  "process.new.select-parameters": "Parametry",
+  "process.new.cancel": "Anuluj",
+  "process.new.submit": "Zapisz",
+  "process.new.select-script": "Skrypt",
+  "process.new.select-script.placeholder": "Wybierz skrypt...",
+  "process.new.select-script.required": "Skrypt jest wymagany",
+  "process.new.parameter.file.upload-button": "Wybierz plik...",
+  "process.new.parameter.file.required": "Proszę wybrać plik",
+  "process.new.parameter.string.required": "Wartość parametru jest wymagana",
+  "process.new.parameter.type.value": "wartość",
+  "process.new.parameter.type.file": "plik",
+  "process.new.parameter.required.missing": "Te parametry są wymagane, ale nie zostały uzupełnione:",
+  "process.new.notification.success.title": "Udało się",
+  "process.new.notification.success.content": "Udało się stworzyć proces",
+  "process.new.notification.error.title": "Błąd",
+  "process.new.notification.error.content": "Wystąpił błąd podczas tworzenia procesu",
+  "process.new.header": "Utwórz nowy proces",
+  "process.new.title": "Utwórz nowy proces",
+  "process.new.breadcrumbs": "Utwórz nowy proces",
+  "process.detail.arguments": "Argumenty",
+  "process.detail.arguments.empty": "Do tego procesu nie zostały przypisane żadne argumenty",
+  "process.detail.back": "Cofnij",
+  "process.detail.output": "Dane wyjściowe procesu",
+  "process.detail.logs.button": "Odzyskaj dane wyjściowe procesu",
+  "process.detail.logs.loading": "Odzyskiwanie",
+  "process.detail.logs.none": "Ten proces nie ma danych wyjściowych",
+  "process.detail.output-files": "Pliki",
+  "process.detail.output-files.empty": "Ten proces nie ma żadnych plików danych wyjściowych",
+  "process.detail.script": "Skrypt",
+  "process.detail.title": "Proces: {{ id }} - {{ name }}",
+  "process.detail.start-time": "Czas rozpoczęcia procesu",
+  "process.detail.end-time": "Czas zakończenia procesu",
+  "process.detail.status": "Status",
+  "process.detail.create": "Stwórz podobny proces",
+  "process.overview.table.finish": "Czas zakończenia (UTC)",
+  "process.overview.table.id": "Identyfikator procesu",
+  "process.overview.table.name": "Nazwa",
+  "process.overview.table.start": "Czas rozpoczęcia (UTC)",
+  "process.overview.table.status": "Status",
+  "process.overview.table.user": "Użytkownik",
+  "process.overview.title": "Przegląd procesów",
+  "process.overview.breadcrumbs": "Przegląd procesów",
+  "process.overview.new": "Nowy",
+  "profile.breadcrumbs": "Zaktualizuj profil",
+  "profile.card.identify": "Dane",
+  "profile.card.security": "Bezpieczeństwo",
+  "profile.form.submit": "Zaktualizuj profil",
+  "profile.groups.head": "Posiadane uprawnienia do kolekcji",
+  "profile.head": "Zaktualizuj profil",
+  "profile.metadata.form.error.firstname.required": "Imię jest wymagane",
+  "profile.metadata.form.error.lastname.required": "Nazwisko jest wymagane",
+  "profile.metadata.form.label.email": "Adres e-mail",
+  "profile.metadata.form.label.firstname": "Imię",
+  "profile.metadata.form.label.language": "Język",
+  "profile.metadata.form.label.lastname": "Nazwisko",
+  "profile.metadata.form.label.phone": "Telefon kontaktowy",
+  "profile.metadata.form.notifications.success.content": "Zmiany w profilu zostały zapisane.",
+  "profile.metadata.form.notifications.success.title": "Profil zapisany",
+  "profile.notifications.warning.no-changes.content": "Nie dokonano żadnych zmian w profilu.",
+  "profile.notifications.warning.no-changes.title": "Brak zmian",
+  "profile.security.form.error.matching-passwords": "Hasła nie są identyczne.",
+  "profile.security.form.info": "Możesz wprowadzić nowe hasło w polu poniżej i zatwierdzić poprzez ponowne wpisanie. Hasło musi mieć przynajmniej 6 znaków.",
+  "profile.security.form.label.password": "Hasło",
+  "profile.security.form.label.passwordrepeat": "Potwierdź hasło",
+  "profile.security.form.notifications.success.content": "Twoje zmiany w haśle zostały zapisane.",
+  "profile.security.form.notifications.success.title": "Hasło zapisane",
+  "profile.security.form.notifications.error.title": "Błąd podczas próby zmiany hasła",
+  "profile.security.form.notifications.error.not-same": "Hasła nie są identyczne.",
+  "profile.title": "Zaktualizuj profil",
+  "profile.card.researcher": "Profil naukowca",
+  "project.listelement.badge": "Projekt badawczy",
+  "project.page.contributor": "Autorzy",
+  "project.page.description": "Opis",
+  "project.page.edit": "Edytuj pozycję",
+  "project.page.expectedcompletion": "Spodziewany termin zakończenia",
+  "project.page.funder": "Instytucje finansujące",
+  "project.page.id": "ID",
+  "project.page.keyword": "Słowa kluczowe",
+  "project.page.status": "Status",
+  "project.page.titleprefix": "Projekt badawczy: ",
+  "project.search.results.head": "Wyniki wyszukiwania projektów",
+  "publication.listelement.badge": "Publikacja",
+  "publication.page.description": "Opis",
+  "publication.page.edit": "Edytuj pozycję",
+  "publication.page.journal-issn": "ISSN czasopisma",
+  "publication.page.journal-title": "Tytuł czasopisma",
+  "publication.page.publisher": "Wydawca",
+  "publication.page.titleprefix": "Publikacja: ",
+  "publication.page.volume-title": "Tytuł tomu",
+  "publication.search.results.head": "Wyniki wyszukiwania publikacji",
+  "publication.search.title": "Wyszukiwanie publikacji",
+  "media-viewer.next": "Nowy",
+  "media-viewer.previous": "Poprzedni",
+  "media-viewer.playlist": "Playlista",
+  "register-email.title": "Rejestracja nowego użytkownika",
+  "register-page.create-profile.header": "Stwórz profil",
+  "register-page.create-profile.identification.header": "Dane",
+  "register-page.create-profile.identification.email": "Adres e-mail",
+  "register-page.create-profile.identification.first-name": "Imię *",
+  "register-page.create-profile.identification.first-name.error": "Wpisz imię",
+  "register-page.create-profile.identification.last-name": "Nazwisko *",
+  "register-page.create-profile.identification.last-name.error": "Wpisz nazwisko",
+  "register-page.create-profile.identification.contact": "Telefon kontaktowy",
+  "register-page.create-profile.identification.language": "Język",
+  "register-page.create-profile.security.header": "Bezpieczeństwo",
+  "register-page.create-profile.security.info": "Wprowadź nowe hasło w polu poniżej i zatwierdź poprzez ponowne wpisanie w drugim polu. Hasło musi mieć przynajmniej 6 znaków.",
+  "register-page.create-profile.security.label.password": "Hasło *",
+  "register-page.create-profile.security.label.passwordrepeat": "Potwierdź hasło *",
+  "register-page.create-profile.security.error.empty-password": "Wprowadź hasło w polu poniżej.",
+  "register-page.create-profile.security.error.matching-passwords": "Hasła nie są identyczne.",
+  "register-page.create-profile.submit": "Rejestracja zakończona",
+  "register-page.create-profile.submit.error.content": "Coś się nie udało podczas rejestracji nowego użytkownika.",
+  "register-page.create-profile.submit.error.head": "Rejestracja nie powiodła się",
+  "register-page.create-profile.submit.success.content": "Rejestracja powiodła się. Zalogowano jako stworzony użytkownik.",
+  "register-page.create-profile.submit.success.head": "Rejestracja zakończona",
+  "register-page.registration.header": "Rejestracja nowego użytkownika",
+  "register-page.registration.info": "Zarejestruj się, aby otrzymywać wiadomości o nowych pozycjach w obserowanych kolekcjach, a także przesyłać nowe pozycje do repozytorium.",
+  "register-page.registration.email": "Adres e-mail *",
+  "register-page.registration.email.error.required": "Wypełnij adres e-mail",
+  "register-page.registration.email.error.pattern": "Wypełnij poprawny adres e-mail",
+  "register-page.registration.email.hint": "Ten adres e-mail będzie zweryfikowany i będziesz go używać jako swój login.",
+  "register-page.registration.submit": "Zarejestruj się",
+  "register-page.registration.success.head": "Wiadomość weryfikacyjna zostałą wysłana",
+  "register-page.registration.success.content": "Wiadomość została wysłana na adres e-mail {{ email }}. Zawiera ona unikatowy link i dalsze instrukcje postępowania.",
+  "register-page.registration.error.head": "Błąd podczas próby rejestracji adresu e-mail",
+  "register-page.registration.error.content": "Błąd podczas próby rejestracji adresu e-mail: {{ email }}",
+  "relationships.add.error.relationship-type.content": "Nie znaleziono dopasowania dla typu relacji {{ type }} pomiędzy dwoma pozycjami",
+  "relationships.add.error.server.content": "Błąd serwera",
+  "relationships.add.error.title": "Nie można dodać relacji",
+  "relationships.isAuthorOf": "Autorzy",
+  "relationships.isAuthorOf.Person": "Autorzy (osoby)",
+  "relationships.isAuthorOf.OrgUnit": "Autorzy (jednostki organizacyjne)",
+  "relationships.isIssueOf": "Numery czasopisma",
+  "relationships.isJournalIssueOf": "Numer czasopisma",
+  "relationships.isJournalOf": "Czasopisma",
+  "relationships.isOrgUnitOf": "Jednostki organizacyjne",
+  "relationships.isPersonOf": "Autorzy",
+  "relationships.isProjectOf": "Projekty badawcze",
+  "relationships.isPublicationOf": "Publikacje",
+  "relationships.isPublicationOfJournalIssue": "Artykuły",
+  "relationships.isSingleJournalOf": "Czasopismo",
+  "relationships.isSingleVolumeOf": "Tom czasopisma",
+  "relationships.isVolumeOf": "Tomy czasopisma",
+  "relationships.isContributorOf": "Autorzy",
+  "relationships.isContributorOf.OrgUnit": "Autor (Jednostka organizacyjna)",
+  "relationships.isContributorOf.Person": "Autor",
+  "relationships.isFundingAgencyOf.OrgUnit": "Instytucja finansująca",
+  "repository.image.logo": "Logo repozytorium",
+  "repository.title.prefix": "DSpace Angular :: ",
+  "researcher.profile.action.processing": "Procesowanie...",
+  "researcher.profile.associated": "Przypisanie profilu badacza",
+  "researcher.profile.create.new": "Utwórz nowy",
+  "researcher.profile.create.success": "Profil badacza został utworzony",
+  "researcher.profile.create.fail": "Wystąpił błąd poczas tworzenia profilu badacza.",
+  "researcher.profile.delete": "Usuń",
+  "researcher.profile.expose": "Ujawnij",
+  "researcher.profile.hide": "Ukryj",
+  "researcher.profile.not.associated": "Profil badacza nie został jeszcze przypisany",
+  "researcher.profile.view": "Widok",
+  "researcher.profile.private.visibility": "PRYWATNY",
+  "researcher.profile.public.visibility": "PUBLICZNY",
+  "researcher.profile.status": "Status:",
+  "researcherprofile.claim.not-authorized": "Nie masz uprawnień, aby wystąpić o tę pozycję. Aby otrzymać więcej szczegółów, skontaktuj się z administratorami.",
+  "researcherprofile.error.claim.body": "Wystąpił błąd podczas wystąpienia z prośbą o przypisanie profilu. Spróbuj ponownie później.",
+  "researcherprofile.error.claim.title": "Błąd",
+  "researcherprofile.success.claim.body": "Wystąpienie z prośbą o przypisanie profilu udane",
+  "researcherprofile.success.claim.title": "Sukces",
+  "repository.title.prefixDSpace": "DSpace Angular ::",
+  "resource-policies.add.button": "Dodaj",
+  "resource-policies.add.for.": "Dodaj nową politykę",
+  "resource-policies.add.for.bitstream": "Dodaj nową politykę dla plików",
+  "resource-policies.add.for.bundle": "Dodaj nową politykę paczek",
+  "resource-policies.add.for.item": "Dodaj nową politykę pozycji",
+  "resource-policies.add.for.community": "Dodaj nową politykę zbioru",
+  "resource-policies.add.for.collection": "Dodaj nową politykę kolekcji",
+  "resource-policies.create.page.heading": "Utwórz nową politykę zasobu dla ",
+  "resource-policies.create.page.failure.content": "Wystąpił błąd podczas dodawania polityki zasobów.",
+  "resource-policies.create.page.success.content": "Działanie powiodło się",
+  "resource-policies.create.page.title": "Utwórz nową politykę zasobu",
+  "resource-policies.delete.btn": "Usuń zaznaczone",
+  "resource-policies.delete.btn.title": "Usuń zaznaczone polityki zasobów",
+  "resource-policies.delete.failure.content": "Wystąpił błąd podczas usuwania wybranych polityk zasobów.",
+  "resource-policies.delete.success.content": "Działanie powiodło się",
+  "resource-policies.edit.page.heading": "Edytuj politykę zasobu ",
+  "resource-policies.edit.page.failure.content": "Wystąpił błąd poczas edytowania polityki zasobu.",
+  "resource-policies.edit.page.success.content": "Działanie udało się",
+  "resource-policies.edit.page.title": "Edytuj politykę zasobu",
+  "resource-policies.form.action-type.label": "Wybierz ten typ akcji",
+  "resource-policies.form.action-type.required": "Musisz wybrać akcję polityki zasobu.",
+  "resource-policies.form.eperson-group-list.label": "Użytkownik lub grupa, która otrzyma uprawnienia.",
+  "resource-policies.form.eperson-group-list.select.btn": "Wybierz",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Wyszukaj użytkownika",
+  "resource-policies.form.eperson-group-list.tab.group": "Wyszukaj grupę",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Akcja",
+  "resource-policies.form.eperson-group-list.table.headers.id": "ID",
+  "resource-policies.form.eperson-group-list.table.headers.name": "Nazwa",
+  "resource-policies.form.date.end.label": "Data zakończenia",
+  "resource-policies.form.date.start.label": "Data rozpoczęcia",
+  "resource-policies.form.description.label": "Opis",
+  "resource-policies.form.name.label": "Nazwa",
+  "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",
+  "resource-policies.table.headers.date.end": "Data zakończenia",
+  "resource-policies.table.headers.date.start": "Data rozpoczęcia",
+  "resource-policies.table.headers.edit": "Edytuj",
+  "resource-policies.table.headers.edit.group": "Edytuj grupę",
+  "resource-policies.table.headers.edit.policy": "Edytuj politykę",
+  "resource-policies.table.headers.eperson": "Użytkownik",
+  "resource-policies.table.headers.group": "Grupa",
+  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.name": "Nazwa",
+  "resource-policies.table.headers.policyType": "typ",
+  "resource-policies.table.headers.title.for.bitstream": "Polityki dla plików",
+  "resource-policies.table.headers.title.for.bundle": "Polityki dla paczek",
+  "resource-policies.table.headers.title.for.item": "Polityki dla pozycji",
+  "resource-policies.table.headers.title.for.community": "Polityki dla zbioru",
+  "resource-policies.table.headers.title.for.collection": "Polityki dla kolekcji",
+  "search.description": "",
+  "search.switch-configuration.title": "Pokaż",
+  "search.title": "Szukaj",
+  "search.breadcrumbs": "Szukaj",
+  "search.search-form.placeholder": "Szukaj w repozytorium...",
+  "search.filters.applied.f.author": "Autor",
+  "search.filters.applied.f.dateIssued.max": "Data zakończenia",
+  "search.filters.applied.f.dateIssued.min": "Data rozpoczęcia",
+  "search.filters.applied.f.dateSubmitted": "Data zgłoszenia",
+  "search.filters.applied.f.discoverable": "Ukryty",
+  "search.filters.applied.f.entityType": "Typ pozycji",
+  "search.filters.applied.f.has_content_in_original_bundle": "Ma przypisane pliki",
+  "search.filters.applied.f.itemtype": "Typ",
+  "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.subject": "Temat",
+  "search.filters.applied.f.submitter": "Zgłaszający",
+  "search.filters.applied.f.jobTitle": "Stanowisko",
+  "search.filters.applied.f.birthDate.max": "Data zakończenia tworzenia",
+  "search.filters.applied.f.birthDate.min": "Data rozpoczęcia tworzenia",
+  "search.filters.applied.f.withdrawn": "Wycofane",
+  "search.filters.filter.author.head": "Autor",
+  "search.filters.filter.author.placeholder": "Autor",
+  "search.filters.filter.author.label": "Wyszukaj autora",
+  "search.filters.filter.birthDate.head": "Data urodzenia",
+  "search.filters.filter.birthDate.placeholder": "Data urodzenia",
+  "search.filters.filter.birthDate.label": "Wyszukaj datę urodzenia",
+  "search.filters.filter.collapse": "Ukryj filtr",
+  "search.filters.filter.creativeDatePublished.head": "Data opublikowania",
+  "search.filters.filter.creativeDatePublished.placeholder": "Data opublikowania",
+  "search.filters.filter.creativeDatePublished.label": "Wyszukaj datę opublikowania",
+  "search.filters.filter.creativeWorkEditor.head": "Redaktor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Redaktor",
+  "search.filters.filter.creativeWorkEditor.label": "Wyszukaj redaktora",
+  "search.filters.filter.creativeWorkKeywords.head": "Słowo kluczowe",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Słowo kluczowe",
+  "search.filters.filter.creativeWorkKeywords.label": "Wyszukaj temat",
+  "search.filters.filter.creativeWorkPublisher.head": "Wydawca",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Wydawca",
+  "search.filters.filter.creativeWorkPublisher.label": "Wyszukaj wydawcę",
+  "search.filters.filter.dateIssued.head": "Data",
+  "search.filters.filter.dateIssued.max.placeholder": "Data maksymalna",
+  "search.filters.filter.dateIssued.max.label": "Koniec",
+  "search.filters.filter.dateIssued.min.placeholder": "Data minimalna",
+  "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateSubmitted.head": "Data zgłoszenia",
+  "search.filters.filter.dateSubmitted.placeholder": "Data zgłoszenia",
+  "search.filters.filter.dateSubmitted.label": "Wyszukaj datę zgłoszenia",
+  "search.filters.filter.discoverable.head": "Ukryty",
+  "search.filters.filter.withdrawn.head": "Wycofane",
+  "search.filters.filter.entityType.head": "Typ pozycji",
+  "search.filters.filter.entityType.placeholder": "Typ pozycji",
+  "search.filters.filter.entityType.label": "Wyszukaj typ pozycji",
+  "search.filters.filter.expand": "Rozwiń filtr",
+  "search.filters.filter.has_content_in_original_bundle.head": "Ma przypisane pliki",
+  "search.filters.filter.itemtype.head": "Typ",
+  "search.filters.filter.itemtype.placeholder": "Typ",
+  "search.filters.filter.itemtype.label": "Wyszukaj typ",
+  "search.filters.filter.jobTitle.head": "Stanowisko",
+  "search.filters.filter.jobTitle.placeholder": "Stanowisko",
+  "search.filters.filter.jobTitle.label": "Wyszukaj stanowisko",
+  "search.filters.filter.knowsLanguage.head": "Znajomość języka",
+  "search.filters.filter.knowsLanguage.placeholder": "Znajomość języka",
+  "search.filters.filter.knowsLanguage.label": "Wyszukaj wg znajomości języka",
+  "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.label": "Wyszukaj status",
+  "search.filters.filter.objectpeople.head": "Osoby",
+  "search.filters.filter.objectpeople.placeholder": "Osoby",
+  "search.filters.filter.objectpeople.label": "Wyszukaj użytkowników",
+  "search.filters.filter.organizationAddressCountry.head": "Kraj",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Kraj",
+  "search.filters.filter.organizationAddressCountry.label": "Wyszukaj kraj",
+  "search.filters.filter.organizationAddressLocality.head": "Miasto",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Miasto",
+  "search.filters.filter.organizationAddressLocality.label": "Wyszukaj miasto",
+  "search.filters.filter.organizationFoundingDate.head": "Data założenia",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Data założenia",
+  "search.filters.filter.organizationFoundingDate.label": "Wyszukaj datę założenia",
+  "search.filters.filter.scope.head": "Zakres",
+  "search.filters.filter.scope.placeholder": "Filtr zakresu",
+  "search.filters.filter.scope.label": "Wyszukaj filtr zakresu",
+  "search.filters.filter.show-less": "Pokaż mniej",
+  "search.filters.filter.show-more": "Pokaż więcej",
+  "search.filters.filter.subject.head": "Temat",
+  "search.filters.filter.subject.placeholder": "Temat",
+  "search.filters.filter.subject.label": "Wyszukaj temat",
+  "search.filters.filter.submitter.head": "Zgłaszający",
+  "search.filters.filter.submitter.placeholder": "Zgłaszający",
+  "search.filters.filter.submitter.label": "Wyszukaj zgłaszającego",
+  "search.filters.entityType.JournalIssue": "Numer czasopisma",
+  "search.filters.entityType.JournalVolume": "Tom czasopisma",
+  "search.filters.entityType.OrgUnit": "Jednostka organizacyjna",
+  "search.filters.has_content_in_original_bundle.true": "Tak",
+  "search.filters.has_content_in_original_bundle.false": "Nie",
+  "search.filters.discoverable.true": "Nie",
+  "search.filters.discoverable.false": "Tak",
+  "search.filters.withdrawn.true": "Tak",
+  "search.filters.withdrawn.false": "Nie",
+  "search.filters.head": "Filtry",
+  "search.filters.reset": "Resetuj filtry",
+  "search.filters.search.submit": "Zastosuj",
+  "search.form.search": "Wyszukaj",
+  "search.form.search_dspace": "W repozytorium",
+  "search.form.scope.all": "W całym DSpace",
+  "search.results.head": "Wyniki wyszukiwania",
+  "default.search.results.head": "Wyniki wyszukiwania",
+  "search.results.no-results": "Twoj wyszukiwanie nie zwróciło żadnych rezultatów. Masz problem ze znalezieniem tego czego szukasz? Spróbuj użyć",
+  "search.results.no-results-link": "fraz podobnych do Twojego wyszukiwania",
+  "search.results.empty": "Twoje wyszukiwanie nie zwróciło żadnych rezultatów.",
+  "search.sidebar.close": "Wróć do wyników wyszukiwania",
+  "search.sidebar.filters.title": "Filtry",
+  "search.sidebar.open": "Narzędzia wyszukiwania",
+  "search.sidebar.results": "wyniki",
+  "search.sidebar.settings.rpp": "Wyników na stronie",
+  "search.sidebar.settings.sort-by": "Sortuj według",
+  "search.sidebar.settings.title": "Ustawienia",
+  "search.view-switch.show-detail": "Wyświetl widok szczegółowy",
+  "search.view-switch.show-grid": "Wyświetl jako siatkę",
+  "search.view-switch.show-list": "Wyświetl jako listę",
+  "sorting.ASC": "Rosnąco",
+  "sorting.DESC": "Malejąco",
+  "sorting.dc.title.ASC": "Tytułami rosnąco",
+  "sorting.dc.title.DESC": "Tytułami malejąco",
+  "sorting.score.ASC": "Najmniej trafne",
+  "sorting.score.DESC": "Najbardziej trafne",
+  "sorting.dc.date.issued.ASC": "Data wydania rosnąco",
+  "sorting.dc.date.issued.DESC": "Data wydania malejąco",
+  "sorting.dc.date.accessioned.ASC": "Data dostępu rosnąco",
+  "sorting.dc.date.accessioned.DESC": "Data dostępu malejąco",
+  "sorting.lastModified.ASC": "Ostatnia modyfikacja rosnąco",
+  "sorting.lastModified.DESC": "Ostatnia modyfikacja malejąco",
+  "statistics.title": "Statystyki",
+  "statistics.header": "Statystyki dla {{ scope }}",
+  "statistics.breadcrumbs": "Statystyki",
+  "statistics.page.no-data": "Brak dostępnych danych",
+  "statistics.table.no-data": "Brak dostępnych danych",
+  "statistics.table.header.views": "Wyświetlenia",
+  "submission.edit.breadcrumbs": "Edytuj zgłoszenie",
+  "submission.edit.title": "Edytuj zgłoszenie",
+  "submission.general.cancel": "Anuluj",
+  "submission.general.cannot_submit": "Nie masz uprawnień, aby utworzyć nowe zgłoszenie.",
+  "submission.general.deposit": "Deponuj",
+  "submission.general.discard.confirm.cancel": "Anuluj",
+  "submission.general.discard.confirm.info": "Czy na pewno? To działanie nie może zostać cofnięte.",
+  "submission.general.discard.confirm.submit": "Tak, na pewno",
+  "submission.general.discard.confirm.title": "Odrzuć zgłoszenie",
+  "submission.general.discard.submit": "Odrzuć",
+  "submission.general.info.saved": "Zapisane",
+  "submission.general.info.pending-changes": "Niezapisane zmiany",
+  "submission.general.save": "Zapisz",
+  "submission.general.save-later": "Zapisz wersję roboczą",
+  "submission.import-external.page.title": "Importuj metdane z zewnętrznego źródła",
+  "submission.import-external.title": "Importuj metadane z zewnętrznego źródła",
+  "submission.import-external.title.Journal": "Importuj czasopismo z zewnętrznego źródła",
+  "submission.import-external.title.JournalIssue": "Importuj numer czasopisma z zewnętrznego źródła",
+  "submission.import-external.title.JournalVolume": "Importuj tom czasopisma z zewnętrznego źródła",
+  "submission.import-external.title.OrgUnit": "Importuj wydawcę z zewnętrznego źródła",
+  "submission.import-external.title.Person": "Importuj osobę z zewnętrznego źródła",
+  "submission.import-external.title.Project": "Importuj projekt z zewnętrznego źródła",
+  "submission.import-external.title.Publication": "Importuj publikację z zewnętrznego źródła",
+  "submission.import-external.title.none": "Importuj metadane z zewnętrznego źródła",
+  "submission.import-external.page.hint": "Enter a query above to find items from the web to import in to DSpace.",
+  "submission.import-external.back-to-my-dspace": "Powrót do MyDSpace",
+  "submission.import-external.search.placeholder": "Wyszukaj zewnętrzne źródła danych",
+  "submission.import-external.search.button": "Szukaj",
+  "submission.import-external.search.button.hint": "Zacznij wpisywać frazę, aby wyszukać",
+  "submission.import-external.search.source.hint": "Wybierz zewnętrzne źródło",
+  "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.loading": "ładowanie...",
+  "submission.import-external.source.sherpaJournal": "Czasopisma w SHERPA",
+  "submission.import-external.source.sherpaJournalIssn": "Czasopisma w SHERPA wg ISSN",
+  "submission.import-external.source.sherpaPublisher": "Wydawcy w SHERPA",
+  "submission.import-external.source.openAIREFunding": "Finansowanie OpenAIRE API",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.lcname": "Nazwy Biblioteki Kongresu",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "Scopus",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.source.epo": "Europejski Urząd Patentowy (EPO)",
+  "submission.import-external.preview.title.Journal": "Podgląd czasopisma",
+  "submission.import-external.preview.title.OrgUnit": "Podgląd organizacji",
+  "submission.import-external.preview.title.Person": "Podgląd osoby",
+  "submission.import-external.preview.title.Project": "Podgląd projektu",
+  "submission.import-external.preview.title.Publication": "Podgląd publikacji",
+  "submission.import-external.preview.subtitle": "Metadane poniżej zostały zaimportowane z zewnętrznego źródła. Niektóre pola zostaną uzupełnione automatycznie, kiedy rozpoczniesz zgłaszanie pozycji.",
+  "submission.import-external.preview.button.import": "Rozpocznij zgłoszenie",
+  "submission.import-external.preview.error.import.title": "Błąd zgłoszenia",
+  "submission.import-external.preview.error.import.body": "Wystąpił błąd podczas procesu importowania pozycji z zewnętrznego źródła.",
+  "submission.sections.describe.relationship-lookup.close": "Zamknij",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Udało się dodać wpis do selekcji",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Importuj zdalnego autora",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Importuj zdalne czasopismo",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importuj zdalny numer czasopisma",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importuj zdalny tom czasopisma",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projekt",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Nowy typ danych dodany!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projekt",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Finansowanie OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importuj zdalnego autora",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Importuj zdalną osobę",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Importuj zdalny produkt",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Importuj zdalną aparaturę badawczą",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Importuj zdalne wydarzenie",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Importuj zdalną instytucję finansującą",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Importuj zdalnego wydawcę",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Importuj zdalnie patent",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Importuj zdalnie projekt",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Importuj zdalnie publikację",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Udało się dodać autora do selekcji",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Udało się zaimportować i dodać zewnętrznego autora do selekcji",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Nadrzędność",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Importuj jako nową, lokalną, nadrzędną pozycję",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Anuluj",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Wybierz kolekcję do zaimportowania nowych pozycji",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Typ danych",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Importuj jako nowy lokalny typ danych",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Importuj z LC Name",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Importuj z ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Importuj z Sherpa Journal",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Importuj z Sherpa Publisher",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Importuj z PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Importuj z arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importuj zdalne czasopismo",
+  "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.new-entity": "Successfully imported and added external journal to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.title": "Importuj zdalny numer czasopisma",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Udało się dodać lokalne czasopismo do zaznaczenia",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Udało się zaimportować i dodać czasopismo zewnętrzne do zaznaczenia",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.title": "Importuj zdalny numer czasopisma",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Udało się dodać lokalny numer czasopismo do zaznaczenia",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Udało się zaimportować i dodać zewnętrzny numer czasopisma do zaznaczenia",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Wybierz lokalne powiązanie:",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Odznacz wszystko",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Odznacz stronę",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Ładowanie...",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Wyszukaj zapytanie",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Zastosuj",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Wyszukaj...",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Zaznacz wszystko",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Zaznacz stronę",
+  "submission.sections.describe.relationship-lookup.selected": "Zaznacz {{ size }} pozycji",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autorzy lokalni ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Czasopisma lokalne ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projekty lokalne ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publikacje lokalne ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autorzy lokalni ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Lokalne jednostki organizacyjne ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Lokalne paczki danych ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Lokalne pliki danych ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Lokalne czasopisma ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Lokalne numery czasopism ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Lokalne numery czasopism ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Lokalne tomy czasopism ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Lokalne tomy czasopism ({{ count }})",
+  "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 }})",
+  "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 }})",
+  "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": "Wyszukaj instytucje finansujące",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Wyszukaj finansowanie",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Wyszukaj jednostki organizacyjne",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Finansowanie OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projekty",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Instytucja finansująca projekt",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Finansowanie OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projekt",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projekty",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Instytucja finansująca projekt",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Wyszukaj...",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Aktualne zaznaczenie ({{ count }})",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Numery czasopisma",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Numery czasopisma",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Tomy czasopisma",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Tomy czasopisma",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Czasopisma",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autorzy",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Instytucja finansująca",
+  "submission.sections.describe.relationship-lookup.title.Project": "Projekty",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Publikacje",
+  "submission.sections.describe.relationship-lookup.title.Person": "Autorzy",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Jednostki organizacyjne",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Paczki danych",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Pliki danych",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Instytucja finansująca",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finansowanie",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Nadrzędna jednostka organizacyjna",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Przełącz na listę rozwijaną",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ustawienia",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Twoje zaznaczenie jest puste.",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Wybrani autorzy",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Wybrane czasopisma",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Wybrane tomy czasopisma",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Wybrane projekty",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Wybrane publikacje",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Wybrani autorzy",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Wybrane jednostki organizacyjne",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Wybrane pakiety danych",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Wybrane pliki danych",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Wybrane czasopisma",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Wybrany numer wydania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Wybrany tom czasopisma",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Wybrane instytucje finansujące",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Wybrane finansowanie",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Wybrany numer wydania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Wybrana jednostka organizacyjna",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Wyniki wyszukiwania",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Czy chcesz zapisać \"{{ value }}\" jako wariant imienia dla tego użytkownika, aby Ty lub inni użytkownicy mogli używać tego wariantu w przyszłych zgłoszeniach?. Jeśli nie, nadal możesz użyć tego wariantu w tym zgłoszeniu.",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Zapisz nowy wariant imienia",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Użyj tylko w tym zgłoszeniu",
+  "submission.sections.ccLicense.type": "Typ licencji",
+  "submission.sections.ccLicense.select": "Wybierz typ licencji…",
+  "submission.sections.ccLicense.change": "Zmień typ licencji…",
+  "submission.sections.ccLicense.none": "Brak dostępnych licencji",
+  "submission.sections.ccLicense.option.select": "Wybierz opcję…",
+  "submission.sections.ccLicense.link": "Wybrano licencję:",
+  "submission.sections.ccLicense.confirmation": "Udzielam powyższej licencji",
+  "submission.sections.general.add-more": "Dodaj więcej",
+  "submission.sections.general.collection": "Kolekcja",
+  "submission.sections.general.deposit_error_notice": "Wystąpił błąd podczas zgłaszania pozycji. Spróbuj ponownie później.",
+  "submission.sections.general.deposit_success_notice": "Udało się wprowadzić pozycję.",
+  "submission.sections.general.discard_error_notice": "Wystąpił błąd podczas odrzucania pozycji. Spróbuj ponownie później.",
+  "submission.sections.general.discard_success_notice": "Udało się odrzucić pozycję.",
+  "submission.sections.general.metadata-extracted": "Nowe metadane zostany rozpakowane i dodane do sekcji <strong>{{sectionId}}</strong>.",
+  "submission.sections.general.metadata-extracted-new-section": "Nowa sekcja <strong>{{sectionId}}</strong> została dodana do zgłoszenia.",
+  "submission.sections.general.no-collection": "Nie znaleziono kolekcji",
+  "submission.sections.general.no-sections": "Opcje niedostępne",
+  "submission.sections.general.save_error_notice": "Wystąpił błąd podczas zapisywania numeru. Spróbuj ponownie później. Po odświeżeniu strony niezapisane zmiany mogą zostać utracone.",
+  "submission.sections.general.save_success_notice": "Udało się zapisać zgłoszenie.",
+  "submission.sections.general.search-collection": "Szukaj kolekcji",
+  "submission.sections.general.sections_not_valid": "Niektóre sekcje są niekompletne.",
+  "submission.sections.submit.progressbar.CClicense": "Licencja Creative Commons",
+  "submission.sections.submit.progressbar.describe.recycle": "Odzyskaj",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Opisz",
+  "submission.sections.submit.progressbar.describe.stepone": "Opisz",
+  "submission.sections.submit.progressbar.describe.steptwo": "Opisz",
+  "submission.sections.submit.progressbar.detect-duplicate": "Potencjalne duplikaty",
+  "submission.sections.submit.progressbar.license": "Zdeponuj licencję",
+  "submission.sections.submit.progressbar.upload": "Prześlij pliki",
+  "submission.sections.status.errors.title": "Błędy",
+  "submission.sections.status.valid.title": "Poprawność",
+  "submission.sections.status.warnings.title": "Ostrzeżenia",
+  "submission.sections.status.errors.aria": "ma błędy",
+  "submission.sections.status.valid.aria": "jest poprawne",
+  "submission.sections.status.warnings.aria": "ma ostrzeżenia",
+  "submission.sections.toggle.open": "Otwórz sekcję",
+  "submission.sections.toggle.close": "Zamknij sekcję",
+  "submission.sections.toggle.aria.open": "Rozwiń sekcję {{sectionHeader}}",
+  "submission.sections.toggle.aria.close": "Zwiń sekcję {{sectionHeader}}",
+  "submission.sections.upload.delete.confirm.cancel": "Anuluj",
+  "submission.sections.upload.delete.confirm.info": "Czy na pewno? To działanie nie może zostać cofnięte.",
+  "submission.sections.upload.delete.confirm.submit": "Tak, na pewno",
+  "submission.sections.upload.delete.confirm.title": "Usuń plik",
+  "submission.sections.upload.delete.submit": "Usuń",
+  "submission.sections.upload.download.title": "Pobierz plik",
+  "submission.sections.upload.drop-message": "Upuść pliki, aby załączyć je do tej pozycji",
+  "submission.sections.upload.edit.title": "Edytuj plik",
+  "submission.sections.upload.form.access-condition-label": "Typ dostępu",
+  "submission.sections.upload.form.date-required": "Data jest wymagana.",
+  "submission.sections.upload.form.date-required-from": "Data przyznania dostępu od jest wymagana.",
+  "submission.sections.upload.form.date-required-until": "Data przyznania dostępu do jest wymagana.",
+  "submission.sections.upload.form.from-label": "Pozwól na dostęp od",
+  "submission.sections.upload.form.from-placeholder": "Od",
+  "submission.sections.upload.form.group-label": "Grupa",
+  "submission.sections.upload.form.group-required": "Grupa jest wymagana",
+  "submission.sections.upload.form.until-label": "Pozwól na dostęp do",
+  "submission.sections.upload.form.until-placeholder": "Do",
+  "submission.sections.upload.header.policy.default.nolist": "Pliki wgrane do kolekcji {{collectionName}} będą dostępne dla poniższych grup:",
+  "submission.sections.upload.header.policy.default.withlist": "Zwróć uwagę na to, że pliki w kolekcji {{collectionName}} będą dostępne dla poniższych grup, z wyjątkiem tych, które zostały wyłączone z dostępu:",
+  "submission.sections.upload.info": "Tutaj znajdują się wszystkie pliki dodane w tym momencie do pozycji. Możesz zaktualizować metadane pliku i warunki dostępu lub <strong>przesłać dodatkowe pliki, przeciągając i opuszczając je gdziekolwiek na tej stronie</strong>",
+  "submission.sections.upload.no-entry": "Nie",
+  "submission.sections.upload.no-file-uploaded": "Pliki nie zostały jeszcze wgrane.",
+  "submission.sections.upload.save-metadata": "Zapisz metadane",
+  "submission.sections.upload.undo": "Anuluj",
+  "submission.sections.upload.upload-failed": "Przesyłanie nieudane",
+  "submission.sections.upload.upload-successful": "Przesyłanie udane",
+  "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.edit": "Edytuj",
+  "submission.workflow.generic.edit-help": "Wybierz tę opcję, aby zmienić metadane pozycji.",
+  "submission.workflow.generic.view": "Podgląd",
+  "submission.workflow.generic.view-help": "Wybierz tę opcję, aby wyświetlić metadane pozycji.",
+  "submission.workflow.tasks.claimed.approve": "Zatwierdź",
+  "submission.workflow.tasks.claimed.approve_help": "Jeśli ta pozycja ma zostać zatwierdzona i wprowadzona do kolekcji, wybierz \"Approve\".",
+  "submission.workflow.tasks.claimed.edit": "Edytuj",
+  "submission.workflow.tasks.claimed.edit_help": "Wybierz tę opcję, aby zmienić metadane pozycji.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Proszę wpisać powód odrzucenia zgłoszenia w poniższe pole, wskazując, czy zgłaszający może poprawić problem i ponownie przesłać zgłoszenie.",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Opisz powód odrzucenia zgłoszenia",
+  "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.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...",
+  "submission.workflow.tasks.generic.processing": "Procesowanie...",
+  "submission.workflow.tasks.generic.submitter": "Zgłaszający",
+  "submission.workflow.tasks.generic.success": "Udało się",
+  "submission.workflow.tasks.pool.claim": "Podejmij pracę",
+  "submission.workflow.tasks.pool.claim_help": "Przypisz to zadanie do siebie.",
+  "submission.workflow.tasks.pool.hide-detail": "Ukryj szczegóły",
+  "submission.workflow.tasks.pool.show-detail": "Pokaż szczegóły",
+  "thumbnail.default.alt": "Miniatura",
+  "thumbnail.default.placeholder": "Brak miniatury",
+  "thumbnail.project.alt": "Logo projektu",
+  "thumbnail.project.placeholder": "Obraz zastępczy projketu",
+  "thumbnail.orgunit.alt": "Logo jednostki organizacyjnej",
+  "thumbnail.orgunit.placeholder": "Obraz zastępczy jednostki organizacyjnej",
+  "thumbnail.person.alt": "Zdjęcie profilowe",
+  "thumbnail.person.placeholder": "Brak zdjęcia profilowego",
+  "title": "DSpace",
+  "vocabulary-treeview.header": "Widok drzewka",
+  "vocabulary-treeview.load-more": "Pokaż więcej",
+  "vocabulary-treeview.search.form.reset": "Resetuj",
+  "vocabulary-treeview.search.form.search": "Szukaj",
+  "vocabulary-treeview.search.no-result": "Brak pozycji do wyświetlenia",
+  "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
+  "vocabulary-treeview.tree.description.srsc": "Kategorie tematów badań",
+  "uploader.browse": "wyszukaj na swoim urządzeniu",
+  "uploader.drag-message": "Przeciągnij i upuść pliki tutaj",
+  "uploader.delete.btn-title": "Usuń",
+  "uploader.or": ", lub ",
+  "uploader.processing": "Procesowanie",
+  "uploader.queue-length": "Długość kolejki",
+  "virtual-metadata.delete-item.info": "Wybierz typy, dla których chcesz zapisać wirtualne metadane jako rzeczywiste metadane",
+  "virtual-metadata.delete-item.modal-head": "Wirtualne metadane tego powiązania",
+  "virtual-metadata.delete-relationship.modal-head": "Wybierz pozycje, dla których chcesz zapisać wirtualne metadane jako rzeczywiste metadane",
+  "workflowAdmin.search.results.head": "Zarządzaj procesami",
+  "workflow-item.edit.breadcrumbs": "Edytuj pozycję procesu",
+  "workflow-item.edit.title": "Edytuj pozycję procesu",
+  "workflow-item.delete.notification.success.title": "Usunięte",
+  "workflow-item.delete.notification.success.content": "Ten element procesu został usunięty",
+  "workflow-item.delete.notification.error.title": "Coś poszło nie tak",
+  "workflow-item.delete.notification.error.content": "Ten element procesu nie mógł zostać usunięty",
+  "workflow-item.delete.title": "Usuń element procesu",
+  "workflow-item.delete.header": "Usuń element procesu",
+  "workflow-item.delete.button.cancel": "Anuluj",
+  "workflow-item.delete.button.confirm": "Usuń",
+  "workflow-item.send-back.notification.success.title": "SOdeślij do zgłaszającego",
+  "workflow-item.send-back.notification.success.content": "Ten element procesu został odesłany do zgłaszającego",
+  "workflow-item.send-back.notification.error.title": "Coś poszło nie tak",
+  "workflow-item.send-back.notification.error.content": "Ten element procesu nie mógł zostać odesłany do zgłaszającego",
+  "workflow-item.send-back.title": "Odeślij element procesu do zgłaszającego",
+  "workflow-item.send-back.header": "Odeślij element procesu do zgłaszającego",
+  "workflow-item.send-back.button.cancel": "Anuluj",
+  "workflow-item.send-back.button.confirm": "Odeślij",
+  "workflow-item.view.breadcrumbs": "Widok procesu",
+  "idle-modal.header": "Sesja wkrótce wygaśnie",
+  "idle-modal.info": "Ze względów bezpieczeństwa sesja wygaśnie po {{ timeToExpire }} minutach nieaktywności. Twoja sesja wkrótce wygaśnie. Czy chcesz ją przedłużyć albo wylogować się?",
+  "idle-modal.log-out": "Wyloguj",
+  "idle-modal.extend-session": "Wydłuż sesję",
+  "workspace.search.results.head": "Twoje zadania",
+  "orgunit.listelement.badge": "Jednostka organizacyjna",
+  "orgunit.page.city": "Miasto",
+  "orgunit.page.country": "Kraj",
+  "orgunit.page.dateestablished": "Data założenia",
+  "orgunit.page.description": "Opis",
+  "orgunit.page.edit": "Edytuj pozycję",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Jednostka organizacyjna: ",
+  "pagination.options.description": "Opcje strony",
+  "pagination.results-per-page": "Wyników na stronę",
+  "pagination.showing.detail": "{{ range }} z {{ total }}",
+  "pagination.showing.label": "Teraz wyświetlane ",
+  "pagination.sort-direction": "Opcje sortowania",
+  "cookies.consent.purpose.sharing": "Udostępnianie",
+  "item.preview.dc.identifier.issn": "ISSN",
+  "500.page-internal-server-error": "Usługa niedostępna",
+  "500.help": "Serwer jest tymczasowo niezdolny do obsługi Twojego żądania z powodu przestoju konserwacyjnego lub problemów z przepustowością. Prosimy spróbować ponownie później.",
+  "500.link.home-page": "Zabierz mnie na stronę główną",
+  "error-page.description.401": "brak autoryzacji",
+  "error-page.description.403": "brak dostępu",
+  "error-page.description.500": "usługa niedostępna",
+  "error-page.description.404": "nie znaleziono strony",
+  "error-page.orcid.generic-error": "Podczas logowania za pomocą ORCID wystąpił błąd. Upewnij się, że udostępniłeś DSpace adres e-mail swojego konta ORCID. Jeśli błąd nadal występuje, skontaktuj się z administratorem",
+  "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.metadata.only.listelement.badge": "Tylko metadane",
+  "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.restricted.listelement.badge": "Brak dostępu",
+  "access-status.unknown.listelement.badge": "Nieznane",
+  "admin.access-control.groups.table.edit.buttons.remove": "Usuń \"{{name}}\"",
+  "admin.metadata-import.page.validateOnly": "Tylko waliduj",
+  "admin.metadata-import.page.validateOnly.hint": "Po wybraniu tej opcji przesłany plik CSV zostanie poddany walidacji. Otrzymasz raport o wykrytych zmianach, ale żadne zmiany nie zostaną zapisane.",
+  "bitstream.edit.form.iiifLabel.label": "Etykieta canvyIIIF",
+  "bitstream.edit.form.iiifLabel.hint": "Etykieta dla tego obrazu. Jeśli nie została dostarczona, zostanie użyta domyślna etykieta.",
+  "bitstream.edit.form.iiifToc.label": "Spis treści IIIF",
+  "bitstream.edit.form.iiifToc.hint": "Dodanie tekstu tutaj zapoczątkuje nowy zakres spisu treści.",
+  "bitstream.edit.form.iiifWidth.label": "Szerokość canvy IIIF",
+  "bitstream.edit.form.iiifWidth.hint": "Szerokość canvy jest zwykle równa szerokości obrazu.",
+  "bitstream.edit.form.iiifHeight.label": "Wysokość canvy IIIF",
+  "bitstream.edit.form.iiifHeight.hint": "Wysokość canvy jest zwykle równa szerokości obrazu.",
+  "browse.back.all-results": "Wszystkie wyniki wyszukiwania",
+  "pagination.next.button": "Następny",
+  "pagination.previous.button": "Poprzedni",
+  "pagination.next.button.disabled.tooltip": "Brak więcej stron z wynikami wyszukiwania",
+  "browse.startsWith": ", zaczyna się od {{ startsWith }}",
+  "browse.title.page": "Przeszukiwanie {{ collection }} wg {{ field }} {{ value }}",
+  "collection.edit.item.authorizations.load-bundle-button": "Załaduj więcej paczek",
+  "collection.edit.item.authorizations.load-more-button": "Załaduj więcej",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Pokaż polityki plików dla paczek",
+  "comcol-role.edit.create.error.title": "Nie udało się utworzyć grupy dla roli '{{ role }}'",
+  "curation.form.submit.error.invalid-handle": "Nie ustalono identyfikatora dla tego obiektu",
+  "confirmation-modal.delete-profile.header": "Usuń profil",
+  "confirmation-modal.delete-profile.info": "Czy na pewno chcesz usunąć profil",
+  "confirmation-modal.delete-profile.cancel": "Anuluj",
+  "confirmation-modal.delete-profile.confirm": "Usuń",
+  "error.invalid-search-query": "Zapytanie nie jest poprawne. Wejdź na <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Solr query syntax</a>, aby dowiedzieć się o najlepszych praktykach i dodatkowych informacjach o tym błędzie.",
+  "feed.description": "Aktualności",
+  "footer.link.feedback": "Prześlij uwagi",
+  "form.group-collapse": "Zwiń",
+  "form.group-collapse-help": "Kliknij tutaj, aby zwinąć",
+  "form.group-expand": "Rozwiń",
+  "form.group-expand-help": "Kliknij tutaj, aby rozwinąć",
+  "health.breadcrumbs": "Stan systemu",
+  "health-page.heading": "Stan systemu",
+  "health-page.info-tab": "Informacje",
+  "health-page.status-tab": "Status",
+  "health-page.error.msg": "Serwis stanu systemu jest tymczasowo niedostępny",
+  "health-page.property.status": "Kod statusu",
+  "health-page.section.db.title": "Baza danych",
+  "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.solrAuthorityCore.title": "Autentykacja",
+  "health-page.section.solrOaiCore.title": "OAI",
+  "health-page.section.solrSearchCore.title": "Wyszukiwarka",
+  "health-page.section.solrStatisticsCore.title": "Statystyki",
+  "health-page.section-info.app.title": "Backend aplikacji",
+  "health-page.section-info.java.title": "Java",
+  "health-page.status": "Status",
+  "health-page.status.ok.info": "operacyjny",
+  "health-page.status.error.info": "Wykryte problemy",
+  "health-page.status.warning.info": "Wykryte potencjalne problemy",
+  "health-page.title": "Stan systemu",
+  "health-page.section.no-issues": "Nie wykryto żadnych problemów",
+  "info.feedback.breadcrumbs": "Uwagi",
+  "info.feedback.head": "Uwagi",
+  "info.feedback.title": "Uwagi",
+  "info.feedback.info": "Dziękujemy za podzielenie się opinią na temat systemu DSpace. Doceniamy Twój wkład w lepsze działanie systemu!",
+  "info.feedback.email_help": "Ten adres zostanie użyty, aby przesłać odpowiedź na uwagi.",
+  "info.feedback.send": "Prześlij uwagi",
+  "info.feedback.comments": "Komentarz",
+  "info.feedback.email-label": "Twoj adres e-mail",
+  "info.feedback.create.success": "Uwagi przesłane!",
+  "info.feedback.error.email.required": "Poprawny adres e-mail jest wymagany",
+  "info.feedback.error.message.required": "Treść komentarza jest wymagana",
+  "info.feedback.page-label": "Strona",
+  "info.feedback.page_help": "Ta strona odnosi się do uwag.",
+  "item.orcid.return": "Powrót",
+  "item.truncatable-part.show-more": "Pokaż więcej",
+  "item.truncatable-part.show-less": "Pokaż mniej",
+  "item.page.orcid.title": "ORCID",
+  "item.page.orcid.tooltip": "Otwórz ustawienia ORCID",
+  "item.page.claim.button": "Podejmij pracę",
+  "item.page.claim.tooltip": "Podejmij pracę jako profil",
+  "item.version.create.modal.submitted.header": "Tworzenie nowej wersji...",
+  "item.version.create.modal.submitted.text": "Nowa wersja została utworzona. Mogło to trwać chwilę, jeśli pozycja ma wiele powiązań.",
+  "journal-relationships.search.results.head": "Wyniki wyszukiwania czasopism",
+  "menu.section.icon.health": "Sekcja menu Stan systemu",
+  "menu.section.health": "Stan systemu",
+  "metadata-export-search.tooltip": "Eksportuj wyniki wyszukiwania w formacie CSV",
+  "metadata-export-search.submit.success": "Eksport rozpoczął się",
+  "metadata-export-search.submit.error": "Eksport nie rozpoczął się",
+  "person.page.name": "Nazwa",
+  "person-relationships.search.results.head": "Wyniki wyszukiwania osób",
+  "profile.special.groups.head": "Autoryzacja do specjalnych grup, do których należysz",
+  "project-relationships.search.results.head": "Wyniki wyszukiwania projektów",
+  "publication-relationships.search.results.head": "Wyniki wyszukiwania publikacji",
+  "resource-policies.edit.page.target-failure.content": "Wystąpił błąd podczas edycji (użytkownika lub grupy) związany z polityką zasobu.",
+  "resource-policies.edit.page.other-failure.content": "Wystąpił błąd podczas edycji polityki zasobu. Użytkownik lub grupa zostały zaktualizowane pomyślnie.",
+  "resource-policies.form.eperson-group-list.modal.header": "Nie można zmienić typu",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Nie można zastąpić użytkownika grupą.",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Nie można zastąpić grupy użytkownikiem.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Usuń obecną polityke zasobu i stwórz nową o określonym typie.",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "search.results.view-result": "Widok",
+  "default-relationships.search.results.head": "Wyniki wyszukiwania",
+  "statistics.table.title.TotalVisits": "Wyświetlnia ogółem",
+  "statistics.table.title.TotalVisitsPerMonth": "Wyświetlenia w miesiącu",
+  "statistics.table.title.TotalDownloads": "Pobrania",
+  "statistics.table.title.TopCountries": "Wyświetlenia wg krajów",
+  "statistics.table.title.TopCities": "Wyświetlenia wg miast",
+  "submission.import-external.preview.title": "Podgląd pozycji",
+  "submission.import-external.preview.title.none": "Podgląd pozycji",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Import pozycji zdalnie",
+  "submission.sections.general.cannot_deposit": "Nie można zakończyć deponowania, ponieważ w formularzu wystąpiły błędy.<br>Aby zakończyć deponowanie, wypełnij wszystkie obowiązkowe pola.",
+  "submission.sections.submit.progressbar.accessCondition": "Warunki dostępu do pozycji",
+  "submission.sections.submit.progressbar.sherpapolicy": "Polityki Sherpa",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informacje o polityce open access wydawcy.",
+  "submission.sections.status.info.title": "Dodatkowe informacje",
+  "submission.sections.status.info.aria": "Dodatkowe informacje",
+  "submission.sections.upload.form.access-condition-hint": "Wybierz w jaki sposób pliki dla tej pozycji po jest zdeponowaniu będą mogły być udostępnione",
+  "submission.sections.upload.form.from-hint": "Wybierz datę, od której ma zostać zastosowany warunek dostępu",
+  "submission.sections.upload.form.until-hint": "Wybierz datę, do której ma zostać zastosowany warunek dostępu",
+  "submission.sections.accesses.form.discoverable-description": "Jeśli checkbox jest zaznaczony, pozycja będzie wyświetlana w wynikach wyszukiwania. Jeśli checkbox jest odznaczony, dostęp do pozycji będzie dostępny tylko przez bezpośredni link, pozycja nie będzie wyświetlana w wynikach wyszukiwania.",
+  "submission.sections.accesses.form.discoverable-label": "Niemożliwe do wyszukania",
+  "submission.sections.accesses.form.access-condition-label": "Typ warunku dostępu",
+  "submission.sections.accesses.form.access-condition-hint": "Wybierz warunek dostępu, aby przypisać go do pozycji, kiedy zostanie zdeponowany.",
+  "submission.sections.accesses.form.date-required": "Data jest wymagana.",
+  "submission.sections.accesses.form.date-required-from": "Początkowa data przyznania dostępu jest wymagana.",
+  "submission.sections.accesses.form.date-required-until": "Końcowa data przyznania dostępu jest wymagana.",
+  "submission.sections.accesses.form.from-label": "Udziel dostępu od",
+  "submission.sections.accesses.form.from-hint": "Wybierz datę, od kiedy zostanie przyznany dostęp do tej pozycji",
+  "submission.sections.accesses.form.from-placeholder": "Od",
+  "submission.sections.accesses.form.group-label": "Grupa",
+  "submission.sections.accesses.form.group-required": "Grupa jest wymagana.",
+  "submission.sections.accesses.form.until-label": "Udziel dostępu do",
+  "submission.sections.accesses.form.until-hint": "Wybierz datę, do kiedy zostanie przyznany dostęp do tej pozycji",
+  "submission.sections.accesses.form.until-placeholder": "Do",
+  "submission.sections.sherpa.publication.information": "Informacje o publikacji",
+  "submission.sections.sherpa.publication.information.title": "Tytuł",
+  "submission.sections.sherpa.publication.information.issns": "Numery ISSN",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.publishers": "Wydawca",
+  "submission.sections.sherpa.publication.information.romeoPub": "Wydawca Romeo",
+  "submission.sections.sherpa.publication.information.zetoPub": "Wydawca Zeto",
+  "submission.sections.sherpa.publisher.policy": "Polityka wydawnicza",
+  "submission.sections.sherpa.publisher.policy.description": "Poniższe informacje zostały znalezione za pośrednictwem Sherpa Romeo. W oparciu o politykę Twojego wydawcy, zawiera ona porady dotyczące tego, czy embargo może być konieczne i/lub jakie pliki możesz przesłać. Jeśli masz pytania, skontaktuj się z administratorem strony poprzez formularz.",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Rodzaje Open Access dozwolone przez politykę wydawniczą tego czasopisma są wymienione poniżej. Kliknij na wybrany rodzaj, aby przejść do szczegółowego widoku",
+  "submission.sections.sherpa.publisher.policy.more.information": "Aby uzuyskać więcej informacji, kliknij tutaj:",
+  "submission.sections.sherpa.publisher.policy.version": "Wersja",
+  "submission.sections.sherpa.publisher.policy.embargo": "Embargo",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Brak embargo",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Brak",
+  "submission.sections.sherpa.publisher.policy.license": "Licencja",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Wymagania wstępne",
+  "submission.sections.sherpa.publisher.policy.location": "Lokalizacja",
+  "submission.sections.sherpa.publisher.policy.conditions": "Wymagania",
+  "submission.sections.sherpa.publisher.policy.refresh": "Odśwież",
+  "submission.sections.sherpa.record.information": "Informacje o rekordzie",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.date.created": "Data utworzenia",
+  "submission.sections.sherpa.record.information.date.modified": "Ostatnia modyfikacja",
+  "submission.sections.sherpa.record.information.uri": "URI",
+  "submission.sections.sherpa.error.message": "Wystąpił błąd podczas pobierania informacji z Sherpa",
+  "submission.workspace.generic.view": "Podgląd",
+  "submission.workspace.generic.view-help": "Wybierz tę opcje, aby zobaczyć metadane.",
+  "workflow.search.results.head": "Zadania na workflow",
+  "workspace-item.view.breadcrumbs": "Widok wersji roboczej",
+  "workspace-item.view.title": "Widok wersji roboczej",
+  "researcher.profile.change-visibility.fail": "Wystąpił niespodziewany błąd podczas zmiany widoczności profilu",
+  "person.page.orcid.link.processing": "Łączenie profilu z ORCID...",
+  "person.page.orcid.link.error.message": "Coś poszło nie tak podczas łączenia z ORCID. Jeśli problem będzie się powtarzał, skontaktuj się z administratorem.",
+  "person.page.orcid.sync-queue.table.header.type": "Typ",
+  "person.page.orcid.sync-queue.table.header.description": "Opis",
+  "person.page.orcid.sync-queue.table.header.action": "Akcja",
+  "person.page.orcid.sync-queue.tooltip.project": "Projekt",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "Niewłaściwy dwuznakowy kod kraju ISO 3166",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Wymagana data publikacji to co najmniej rok po 1900",
+  "person.page.orcid.synchronization-mode-funding-message": "Wybierz, czy chcesz wysłać swoje projekty na swoją listę informacji o projektach w profilu ORCID.",
+  "person.page.orcid.synchronization-mode-publication-message": "Wybierz, czy chcesz wysłać swoje publikacje na swoją listę informacji o publikacjach w profilu ORCID.",
+  "person.page.orcid.synchronization-mode-profile-message": "Wybierz, czy chcesz wysłać swoje dane bibliograficzne lub osobiste identyfikatory do swojego profilu ORCID.",
+  "person.orcid.sync.setting": "Ustawienia synchronizacji z ORCID",
+  "person.orcid.registry.queue": "Kolejka rejestru z ORCID",
+  "person.orcid.registry.auth": "Autoryzacje z ORCID",
+  "home.recent-submissions.head": "Najnowsze publikacje",
+  "submission.sections.sherpa-policy.title-empty": "Nie wybrano ISSN i informacje o polityce wydawniczej czasopisma są niedostępne",
+  "admin.batch-import.breadcrumbs": "Import zbiorczy",
+  "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.error.addFile": "Najpierw wybierz plik (ZIP)",
+  "admin.batch-import.page.header": "Import masowy",
+  "admin.batch-import.page.help": "Wybierz kolekcję do zaimportowania kolekcji. Potem, upuść lub przeszukaj plik SAF, który zawiera pozycje do importu",
+  "admin.batch-import.page.remove": "usuń",
+  "admin.batch-import.page.validateOnly.hint": "Jeśli wybrano, importowany plik ZIP będzie walidowany. Otrzymasz raport ze zmianami, ale żadne zmiany nie zostaną wykonane zapisane.",
+  "collection.form.correctionSubmissionDefinition": "Wzór zgłoszenia do prośby o korektę",
+  "comcol-role.edit.delete.error.title": "Nie udało się usunąć roli '{{ role }}' dla grup",
+  "confirmation-modal.export-batch.header": "Eksport maasowy (ZIP) {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Czy na pewno chcesz wyeksportować plik ZIP z {{ dsoName }}",
+  "dso-selector.export-batch.dspaceobject.head": "Eksport masowy (ZIP) z",
+  "menu.section.export_batch": "Eksport masowy (ZIP)",
+  "nav.user-profile-menu-and-logout": "Profil użytkownika i wylogowywanie",
+  "process.detail.actions": "Akcje",
+  "process.detail.delete.body": "Czy na pewno chcesz usunąć bieżący proces?",
+  "process.detail.delete.button": "Usuń proces",
+  "process.detail.delete.cancel": "Anuluj",
+  "process.detail.delete.confirm": "Usuń proces",
+  "process.detail.delete.error": "Nie udało się usunąć procesu",
+  "process.detail.delete.header": "Usuń proces",
+  "process.detail.delete.success": "Proces został usunięty.",
+  "admin.batch-import.title": "Masowy import",
+  "admin.metadata-import.page.button.select-collection": "Wybierz kolekcję",
+  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.schema.fields.table.id": "ID",
+  "cookies.consent.app.description.google-recaptcha": "Podczas rejestracji i odzyskiwania hasła używamy narzędzia google reCAPTCHA",
+  "cookies.consent.app.disable-all.description": "Przełącz, aby zaakceptować lub odrzucić wszystkie",
+  "cookies.consent.app.disable-all.title": "Akceptowacja lub odrzucenie wszystkich",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.content-modal.service": "usługa",
+  "cookies.consent.content-modal.services": "usługi",
+  "cookies.consent.content-notice.description.no-privacy": "Zbieramy i przetwarzamy Twoje dane w celu: <strong>autentykacji, ustawień preferencji i zgód oraz do celów statystycznych</strong>.",
+  "cookies.consent.content-notice.title": "Zgoda na ciasteczka",
+  "cookies.consent.ok": "Zgadzam się",
+  "cookies.consent.purpose.registration-password-recovery": "Rejestracja i odzyskiwanie hasła",
+  "cookies.consent.save": "Zapisz",
+  "curation-task.task.citationpage.label": "Generuj stronę z cytowaniem",
+  "dso-selector.import-batch.dspaceobject.head": "Import masowy z",
+  "orgunit.listelement.no-title": "Brak tytyłu",
+  "process.bulk.delete.error.body": "Proces z ID {{processId}} nie może być usunięty. Pozostałe procesy zostaną usunięte.",
+  "process.bulk.delete.error.head": "Błąd podczas usuwania procesu",
+  "process.bulk.delete.success": "{{count}} proces/y został/y usunięte",
+  "process.overview.delete": "Usuń {{count}} proces/y",
+  "process.overview.delete.body": "Czy na pewno usunąć {{count}} proces/y?",
+  "process.overview.delete.clear": "Wyczyść selekcję procesów do usunięcia",
+  "process.overview.delete.header": "Usuń procesy",
+  "process.overview.delete.processing": "{{count}} procesów zostanie usuniętych. Poczekaj, gdy usuwanie się zakończy. Może to zająć chwilę.",
+  "process.overview.table.actions": "Akcje",
+  "profile.security.form.label.current-password": "Aktualne hasło",
+  "profile.security.form.notifications.error.change-failed": "Wystąpił błąd podczas próby zmiany hasła. Sprawdź czy aktualne hasło jest prawidłowe.",
+  "profile.security.form.notifications.error.general": "Uzupełnij wymagane pola dla bezpieczeństwa na formularzu",
+  "register-page.registration.error.recaptcha": "Wystąpił błąd podczas próby autentykacji przez reCAPTCHA",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Aby się zarejestrować, musisz zaakceptować ciasteczka dla <b>rejestracji i odzyskiwania hasła</b> (Google reCaptcha).",
+  "register-page.registration.google-recaptcha.notification.message.error": "Wystąpił błąd podczas weryfikacji reCaptcha",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Weryfikacja wygasła. Zweryfikuj ponownie.",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Otwórz ustawienia plików cookies",
+  "search.results.response.500": "Wystąpił błąd podczas wysyłania zapytania. Spróbuj ponownie później",
+  "submission.sections.license.granted-label": "Potwierdzam akceptację powyższej licencji",
+  "submission.sections.license.notgranted": "Najpierw musisz zaakceptować licencję",
+  "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 dae60803f5..157da4c8a2 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. ",
 
@@ -56,7 +54,7 @@
   "access-status.embargo.listelement.badge": "Embargo",
 
   // "access-status.metadata.only.listelement.badge": "Metadata only",
- "access-status.metadata.only.listelement.badge": "Somente Metadadados",
+  "access-status.metadata.only.listelement.badge": "Somente Metadadados",
 
   // "access-status.open.access.listelement.badge": "Open Access",
   "access-status.open.access.listelement.badge": "Acesso aberto (Open Access)",
@@ -70,18 +68,6 @@
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Tarefas de Curadoria do Sistema",
 
-  // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Tarefas de Curadoria do Sistema",
-
-  // "admin.curation-tasks.header": "System curation tasks",
-  "admin.curation-tasks.header": "Tarefas de Curadoria do Sistema",
-
-  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  "admin.registries.bitstream-formats.breadcrumbs": "Formatar registro",
-
-  // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Formatar Bitstream",
-
   // "admin.curation-tasks.title": "System curation tasks",
   "admin.curation-tasks.title": "Tarefas de curadoria do sistema",
 
@@ -205,6 +191,9 @@
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
 
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "ID",
+
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Voltar",
 
@@ -280,6 +269,9 @@
   // "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.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Nota de escopo",
 
@@ -337,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",
 
@@ -361,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",
 
@@ -425,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",
 
@@ -456,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:",
 
@@ -745,6 +758,418 @@
   // "admin.access-control.groups.form.return": "Back",
   "admin.access-control.groups.form.return": "Voltar",
 
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.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.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.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",
 
@@ -790,45 +1215,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": "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.",
 
@@ -838,12 +1410,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",
@@ -863,7 +1434,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",
@@ -896,6 +1467,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",
 
@@ -920,7 +1494,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.",
 
@@ -944,6 +1517,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. ",
 
@@ -998,6 +1572,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",
 
@@ -1028,6 +1608,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",
 
@@ -1109,15 +1695,33 @@
   // "browse.startsWith.type_text": "Filter results by typing the first few letters",
   "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",
 
@@ -1176,7 +1780,7 @@
   "collection.edit.item-mapper.confirm": "Mapear itens selecionados",
 
   // "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": "Esta é a ferramenta de mapeação de itens que permite administradores de coleções a mapear itens de outras coleções nesta. VoCẽ pode busca-los em outras coleções para mapeá-los, ou navegar na lista dos itens atualmente mapeados.",
+  "collection.edit.item-mapper.description": "Esta é a ferramenta de mapeação de itens que permite administradores de coleções a mapear itens de outras coleções nesta. Você pode buscar em outras coleções para mapear, ou navegar na lista dos itens atualmente mapeados.",
 
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
   "collection.edit.item-mapper.head": "Mapeador de Itens - Mapear itens em Outras Coleções",
@@ -1211,8 +1815,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",
@@ -1230,7 +1834,7 @@
   "collection.edit.logo.label": "Logotipo de Coleção",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
-  "collection.edit.logo.notifications.add.error": "Falha ao carregar o logotipo da coleção. Verifique o ficheiro antes de tentar de novo.",
+  "collection.edit.logo.notifications.add.error": "Falha ao carregar o logotipo da coleção. Verifique o arquivo antes de tentar de novo.",
 
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
   "collection.edit.logo.notifications.add.success": "O logotipo da coleção foi carregado com sucesso.",
@@ -1250,9 +1854,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",
 
@@ -1376,7 +1986,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",
 
@@ -1436,48 +2045,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",
 
@@ -1586,6 +2217,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",
 
@@ -1652,7 +2289,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",
 
@@ -1662,27 +2298,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",
@@ -1717,11 +2355,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",
@@ -1744,6 +2382,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.",
 
@@ -1753,6 +2397,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}.",
 
@@ -1774,6 +2427,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",
 
@@ -1798,17 +2457,29 @@
   // "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",
-  "curation-task.task.citationpage.label":  "Gerar página de citação",
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery", (Auto-Translated)
+  "cookies.consent.purpose.registration-password-recovery": "Registro e recuperação de senha",
 
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Verificar links em metadados",
+  // "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": "Verificar links em metadados",
 
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
@@ -1825,6 +2496,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:",
 
@@ -1873,6 +2547,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",
 
@@ -1882,6 +2559,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",
 
@@ -1912,6 +2592,12 @@
   // "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": "Exportar Lote (ZIP) de",
+
+  // "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",
   "dso-selector.no-results": "Nenhum(a) {{ type }} encontrado(a)",
 
@@ -1927,6 +2613,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",
 
@@ -1942,6 +2631,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 }}",
 
@@ -1954,6 +2685,18 @@
   // "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": "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": "Você tem certeza que deseja exportar o lote (ZIP) para {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Cancelar",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportar",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "Apagar EPerson \"{{ dsoName }}\"",
 
@@ -1978,6 +2721,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",
 
@@ -2050,6 +2805,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",
 
@@ -2071,11 +2847,11 @@
   // "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":"Termos de Uso",
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "Termos de Uso",
 
-  // "footer.link.feedback":"Send Feedback",
-  "footer.link.feedback":"Enviar uma Sugestão",
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Enviar uma Sugestão",
 
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Esqueci a Senha",
@@ -2089,8 +2865,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.",
@@ -2212,8 +2988,23 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Nenhum valor informado",
 
-  // "form.other-information": {},
-  "form.other-information": {},
+  // "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",
@@ -2233,6 +3024,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",
 
@@ -2242,8 +3036,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",
@@ -2294,8 +3088,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",
@@ -2303,14 +3097,14 @@
   // "health.breadcrumbs": "Health",
   "health.breadcrumbs": "Saúde",
 
-  // "health-page.heading" : "Health",
-  "health-page.heading" : "Saúde",
+  // "health-page.heading": "Health",
+  "health-page.heading": "Saúde",
 
-  // "health-page.info-tab" : "Info",
-  "health-page.info-tab" : "Informação",
+  // "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.status-tab": "Status",
 
   // "health-page.error.msg": "The health check service is temporarily unavailable",
   "health-page.error.msg": "O serviço de verificação de integridade está temporariamente indisponível",
@@ -2324,17 +3118,17 @@
   // "health-page.section.geoIp.title": "GeoIp",
   "health-page.section.geoIp.title": "GeoIp",
 
-  // "health-page.section.solrAuthorityCore.title": "Sor: authority core",
+  // "health-page.section.solrAuthorityCore.title": "Solr: authority core",
   "health-page.section.solrAuthorityCore.title": "Solr: authority core",
 
-  // "health-page.section.solrOaiCore.title": "Sor: oai core",
+  // "health-page.section.solrOaiCore.title": "Solr: oai core",
   "health-page.section.solrOaiCore.title": "Solr: oai core",
 
-  // "health-page.section.solrSearchCore.title": "Sor: search core",
+  // "health-page.section.solrSearchCore.title": "Solr: search core",
   "health-page.section.solrSearchCore.title": "Solr: core pesquisa",
 
-  // "health-page.section.solrStatisticsCore.title": "Sor: statistics core",
-  "health-page.section.solrStatisticsCore.title": "Soilr: estatisticas core",
+  // "health-page.section.solrStatisticsCore.title": "Solr: statistics core",
+  "health-page.section.solrStatisticsCore.title": "Solr: estatisticas core",
 
   // "health-page.section-info.app.title": "Application Backend",
   "health-page.section-info.app.title": "Aplicação de Backend",
@@ -2402,6 +3196,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",
 
@@ -2435,20 +3232,20 @@
   // "info.feedback.email-label": "Your Email",
   "info.feedback.email-label": "Seu Email",
 
-  // "info.feedback.create.success" : "Feedback Sent Successfully!",
-  "info.feedback.create.success" : "Sugestão Enviada com Sucesso!",
+  // "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" : "Um endereço de email válido é requerido",
+  // "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" : "Um comentário é requerido",
+  // "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" : "Página",
+  // "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" : "A página relacionada a sua sugestão",
+  // "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",
   "item.alerts.private": "Este item é privado",
@@ -2457,12 +3254,12 @@
   "item.alerts.withdrawn": "Este item foi recebido",
 
   // "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": "Com este editor pode ver e alterar as políticas de um item, assim como alterar políticas de componentes individuais do item: pacotes e ficheiros. Em resumo, um item contém pacotes, e os pacotes contêm de ficheiros. Os pacotes possuem usualmente políticas de ADICIONAR/REMOVER/LER/ESCREVER enquanto que os ficheiros apenas políticas de LER/ESCREVER.",
+  "item.edit.authorizations.heading": "Com este editor pode ver e alterar as políticas de um item, assim como alterar políticas de componentes individuais do item: pacotes e arquivos. Em resumo, um item contém pacotes, e os pacotes contêm de arquivos. Os pacotes possuem usualmente políticas de ADICIONAR/REMOVER/LER/ESCREVER enquanto que os arquivos apenas políticas de LER/ESCREVER.",
 
   // "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",
@@ -2477,7 +3274,7 @@
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Criar pacote",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Este item não possui um pacote para poder receber o bitstream.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -2618,13 +3415,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)",
 
@@ -2685,6 +3544,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",
 
@@ -2697,6 +3562,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.",
 
@@ -2712,6 +3580,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",
 
@@ -2745,6 +3616,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",
 
@@ -2799,37 +3673,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",
@@ -2910,6 +3784,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",
 
@@ -2940,8 +3823,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Gerenciar coleções mapeadas",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Mover...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Mova este item para uma coleção diferente",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Mover item para outra coleção",
@@ -2967,8 +3850,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Você não está autorizado a realizar esta ação",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "retirar este item",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Retirar item do repositório",
@@ -3063,6 +3946,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",
 
@@ -3153,11 +4060,11 @@
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Fechar",
 
-  // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Pacote Original",
+  // "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" : "Licença do Pacote",
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "Licença do Pacote",
 
   // "item.page.return": "Back",
   "item.page.return": "Voltar",
@@ -3201,26 +4108,29 @@
   // "item.preview.dc.type": "Type:",
   "item.preview.dc.type": "Tipo:",
 
-  // "item.preview.oaire.citation.issue" : "Issue",
-  "item.preview.oaire.citation.issue" : "Questão",
+  // "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.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.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.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.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,14 +4270,14 @@
   // "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" : "Uma nova versão foi criada com o número de versão {{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" : "A nova versão não foi criada",
+  // "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" : "Não é possível criar uma nova versão porque há uma submissão em andamento no histórico de versões",
+  // "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": "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",
   "item.version.delete.modal.header": "Apagar versão",
@@ -3387,17 +4297,98 @@
   // "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" : "Versão número {{version}} foi apagada",
+  // "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" : "Versão número {{version}} não foi apagada",
+  // "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" : "O resumo da versão número {{version}} foi alterado",
+  // "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" : "O resumo da versão número {{version}} não foi alterado",
+  // "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",
@@ -3484,8 +4475,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: ",
@@ -3503,8 +4493,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: ",
@@ -3575,9 +4564,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",
 
@@ -3623,12 +4609,24 @@
   // "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",
 
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Pessoas",
 
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Relatórios",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Coleções filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consultas de metadados",
+
   // "menu.section.admin_search": "Admin Search",
   "menu.section.admin_search": "Pesquisa Administrativa",
 
@@ -3656,6 +4654,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",
 
@@ -3695,9 +4699,16 @@
   // "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",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Seção do menu de busca administrativa",
 
@@ -3797,6 +4808,10 @@
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarefas de Estatísticas",
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Alternar Seção Controle de Acesso",
 
@@ -3832,8 +4847,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",
 
@@ -3843,9 +4860,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.",
 
@@ -3924,26 +4938,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",
@@ -3972,14 +4989,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",
@@ -3993,25 +5016,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.toggle" : "Alternar navegação",
+  // "nav.subscriptions": "Subscriptions", (Auto-Translated)
+  "nav.subscriptions": "Assinaturas",
 
-  // "nav.user.description" : "User profile bar",
-  "nav.user.description" : "Barra de perfil do usuário",
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Alternar navegação",
+
+  // "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",
 
@@ -4144,6 +5175,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",
 
@@ -4153,17 +5187,17 @@
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Criar novo processo",
 
-  // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "Argumentos",
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Argumentos",
 
-  // "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.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" : "Voltar",
+  // "process.detail.back": "Back",
+  "process.detail.back": "Voltar",
 
-  // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Saída do Processo",
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "Saída do Processo",
 
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Recuperar a saída do processo",
@@ -4174,29 +5208,29 @@
   // "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" : "Arquivos de saída",
+  // "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" : "Este processo não contém nenhum arquivo de saída",
+  // "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.script": "Script",
 
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Processo: {{ id }} - {{ name }}",
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Processo: {{ id }} - {{ name }}",
 
-  // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Hora de Início",
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Hora de Início",
 
-  // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Hora de Fim",
+  // "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.status": "Status",
 
-  // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Criar processo similar",
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "Criar processo similar",
 
   // "process.detail.actions": "Actions",
   "process.detail.actions": "Ações",
@@ -4222,23 +5256,23 @@
   // "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" : "Hora de Fim (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" : "ID do Processo",
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID do Processo",
 
-  // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Nome",
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "Nome",
 
-  // "process.overview.table.start" : "Start time (UTC)",
-  "process.overview.table.start" : "Hora de Início (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.status": "Status",
 
-  // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Usuário",
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "Usuário",
 
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Visão geral dos processos",
@@ -4342,6 +5376,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.",
 
@@ -4351,6 +5388,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.",
 
@@ -4516,8 +5556,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.",
@@ -4537,6 +5580,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",
 
@@ -4603,11 +5670,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",
@@ -4837,6 +5904,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",
 
@@ -4921,7 +5991,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",
@@ -5047,6 +6117,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",
 
@@ -5068,6 +6150,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",
 
@@ -5215,6 +6312,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",
 
@@ -5224,8 +6324,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",
@@ -5267,8 +6367,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",
@@ -5318,6 +6417,9 @@
   // "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",
 
@@ -5409,8 +6511,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",
@@ -5515,16 +6616,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",
@@ -5570,6 +6668,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 }})",
 
@@ -5593,11 +6692,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 }})",
 
@@ -5637,6 +6738,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",
 
@@ -5657,11 +6761,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",
 
@@ -5673,6 +6779,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",
 
@@ -5700,6 +6807,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",
 
@@ -5717,6 +6827,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",
 
@@ -5740,6 +6851,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",
 
@@ -5748,6 +6860,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",
 
@@ -5793,7 +6906,7 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados da pesquisa",
 
-  // "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": "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": "Você gostaria de salvar \"{{ value }}\" como uma variante de nome para esta pessoa para que você e outros possam reutilizá-lo para futuras submissões? Se você não fizer isso, ainda poderá usá-lo para esta submissão.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -5868,6 +6981,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",
 
@@ -5889,6 +7020,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",
 
@@ -6009,7 +7143,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": "Por favor note que arquivos enviados a coleção {{collectionName}} serão acessíveis, de acordo com o que está explicitamente definido no arquivo, no(s) seguinte(s) grupo(s):",
 
-  // "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": "Aqui vocẽ encontra todos os arquivos que estão atualmente no item. Você pode atualizar os metadados do arquivo e condições de acesso ou <strong>enviar arquivos adicionais apenas arrastando os arquivos em qualquer lugar da página</strong>",
 
   // "submission.sections.upload.no-entry": "No",
@@ -6034,8 +7168,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",
@@ -6075,16 +7208,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":  "Você deve aceitar a licença",
-
+  // "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",
@@ -6173,8 +7305,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",
@@ -6188,6 +7320,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",
 
@@ -6200,6 +7344,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.",
 
@@ -6254,6 +7404,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",
 
@@ -6302,6 +7560,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",
 
@@ -6314,8 +7575,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",
@@ -6329,6 +7590,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",
 
@@ -6338,6 +7602,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",
 
@@ -6401,6 +7668,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",
 
@@ -6413,8 +7755,8 @@
   // "idle-modal.extend-session": "Extend session",
   "idle-modal.extend-session": "Estender sessão",
 
-  // "researcher.profile.action.processing" : "Processing...",
-  "researcher.profile.action.processing" : "Processando...",
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "Processando...",
 
   // "researcher.profile.associated": "Researcher profile associated",
   "researcher.profile.associated": "Perfil do pesquisador associado",
@@ -6446,11 +7788,11 @@
   // "researcher.profile.view": "View",
   "researcher.profile.view": "Ver",
 
-  // "researcher.profile.private.visibility" : "PRIVATE",
-  "researcher.profile.private.visibility" : "PRIVADO",
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVADO",
 
-  // "researcher.profile.public.visibility" : "PUBLIC",
-  "researcher.profile.public.visibility" : "PÚBLICO",
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PÚBLICO",
 
   // "researcher.profile.status": "Status:",
   "researcher.profile.status": "Status:",
@@ -6458,17 +7800,17 @@
   // "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" : "Ocorreu um erro ao reivindicar o perfil, tente novamente mais tarde",
+  // "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" : "Erro",
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Erro",
 
-  // "researcherprofile.success.claim.body" : "Profile claimed with success",
-  "researcherprofile.success.claim.body" : "Perfil reivindicado com sucesso",
+  // "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" : "Successo",
+  // "researcherprofile.success.claim.title": "Success",
+  "researcherprofile.success.claim.title": "Successo",
 
   // "person.page.orcid.create": "Create an ORCID ID",
   "person.page.orcid.create": "Criar um ORCID ID",
@@ -6476,8 +7818,8 @@
   // "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" : "Conceder autorizações",
+  // "person.page.orcid.grant-authorizations": "Grant authorizations",
+  "person.page.orcid.grant-authorizations": "Conceder autorizações",
 
   // "person.page.orcid.link": "Connect to ORCID ID",
   "person.page.orcid.link": "Conectar ao ORCID ID",
@@ -6524,44 +7866,44 @@
   // "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" : "Afiliação",
+  // "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" : "Dados biográficos",
+  // "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" : "Educação",
+  // "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" : "Identificadores",
+  // "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" : "Todos financiamentos",
+  // "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" : "Meus financiamentos",
+  // "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" : "Financiamentos selecionados",
+  // "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" : "Desabilitado",
+  // "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" : "Todas publicações",
+  // "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" : "Minhas publicações",
+  // "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" : "Publicações selecionadas",
+  // "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" : "Desabilitado",
+  // "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" : "Descarte a alteração e não sincronize com o registro ORCID",
+  // "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",
   "person.page.orcid.sync-queue.discard.error": "Falha ao descartar o registro da fila ORCID",
@@ -6572,14 +7914,14 @@
   // "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" : "Tipo",
+  // "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" : "Descrição",
+  // "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" : "Ação",
+  // "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",
   "person.page.orcid.sync-queue.description.affiliation": "Afiliação",
@@ -6644,8 +7986,8 @@
   // "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" : "Sincronize com o registro ORCID",
+  // "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.",
   "person.page.orcid.sync-queue.send.unauthorized-error.title": "A submissão ao ORCID falhou por falta de autorizações.",
@@ -6698,8 +8040,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": "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" : "A data de publicação deve ser um ano após 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",
   "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "O endereço da organização a ser enviado exige uma endereço",
@@ -6776,10 +8118,156 @@
   // "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",
 }
diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5
index b96d1171e1..9e6d678622 100644
--- a/src/assets/i18n/pt-PT.json5
+++ b/src/assets/i18n/pt-PT.json5
@@ -1,5340 +1,8249 @@
 {
 
-// NOTE 1 - Doesn't exist on en_EN
-
-// "repository.title.prefixDSpace": "DSpace ::",
-"repository.title.prefixDSpace": "DSpace ::",
-
-// "collection.edit.item-mapper-search-form.placeholder": "Search Item to Map...",
-"collection.edit.item-mapper-search-form.placeholder": "Pesquisar Item a Mapear...",
-
-// "idle.modal.header":"Your Session is About to Expire!",
-"idle.modal.header":"A sua sessão está prestes a expirar!",
-
-// "idle.modal.info":"Your session is about to expire, would you like to logout or continue the session?",
-"idle.modal.info":"A sua sessão está prestes a expirar, pretende sair ou continuar a sessão?",
-
-// "idle.modal.log-out":"Logout",
-"idle.modal.log-out":"Sair",
-
-// "idle.modal.extend-session":"Continue Session",
-"idle.modal.extend-session":"Continuar a Sessão",
-
-
-
-
-
-// NOTE 2 - Add to other languages - needed for OpenAIRE compliance - relations between entities
-
-// "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": "Nova Entidade Adicionada!",
-
-// "item.preview.project.funder.name": "Funder",
-"item.preview.project.funder.name": "Financiador",
-
-// "item.preview.project.funder.identifier": "Funder Identifier",
-"item.preview.project.funder.identifier": "Identificador do Financiador",
-
-// "item.preview.oaire.awardNumber": "Funding ID",
-"item.preview.oaire.awardNumber": "ID de Financiamento",
-
-// "item.preview.dc.title.alternative": "Acronym",
-"item.preview.dc.title.alternative": "Acrónimo",
-
-// "item.preview.dc.coverage.spatial": "Jurisdiction",
-"item.preview.dc.coverage.spatial": "Jurisdição",
-
-// "item.preview.oaire.fundingStream": "Funding Stream",
-"item.preview.oaire.fundingStream": "Linha de Financiamento",
-
-// "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
-"submission.import-external.source.openAIREFunding": "Financiamento API OpenAIRE",
-
-// "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
-"submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projeto",
-
-// "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
-"submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projeto",
-
-// "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": "Financiamento API OpenAIRE",
-
-// "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
-"submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Financiamento API OpenAIRE",
-
-// "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
-"submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamento API OpenAIRE",
-
-// "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projeto",
-"submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projeto",
-
-// "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
-"submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projetos",
-
-// "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
-"submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projetos",
-
-// "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
-"relationships.isContributorOf.OrgUnit": "Contribuidor (Unidade organizacional)",
-
-// "relationships.isContributorOf.Person": "Contributor",
-"relationships.isContributorOf.Person": "Contribuidor",
-
-// "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
-"submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador de Projeto",
-
-// "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 de Projeto",
-
-// "relationships.isFundingAgencyOf.OrgUnit": "Funder",
-"relationships.isFundingAgencyOf.OrgUnit": "Financiador",
-
-
-
-
-
-
-
-
-// Other strings 
-
-//"submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
-"submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Pesquisar...",
-
-// "submission.general.info.saved": "Saved",
-"submission.general.info.saved": "Informação Guardada",
-
-// "bitstream.edit.authorizations.link": "Edit bitstream's Policies",
-"bitstream.edit.authorizations.link": "Editar Polítcas de Ficheiros",
-
-// "bitstream.edit.return": "Back",
-"bitstream.edit.return": "Voltar",
-
-// "submission.edit.breadcrumbs": "Edit Submission",
-"submission.edit.breadcrumbs": "Editar Submissão",
-
-// "search.filters.filter.subject.label": "Search subject",
-"search.filters.filter.subject.label": "Pesquisar Assunto",
-
-// "search.filters.filter.entityType.label": "Search item type",
-"search.filters.filter.entityType.label": "Pesquisar Tipo",
-
-// "search.filters.filter.author.label": "Search author name",
-"search.filters.filter.author.label": "Pesquisar Autor",
-
-// "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
-"sorting.dc.date.accessioned.ASC": "Data de Disponibilização Ascendente",
-
-// "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
-"sorting.dc.date.accessioned.DESC": "Data de Disponibilização Descendente",
-
-// "search.search-form.placeholder": "Search the repository ...",
-"search.search-form.placeholder": "Pesquisar ...",
-
-//  "item.edit.item-mapper.search-form.placeholder": "Search collections...",
-"item.edit.item-mapper.search-form.placeholder": "Pesquisar coleções...",
-
-// "item.edit.return": "Back",
-"item.edit.return": "Voltar",
-
-// "repository.title.prefix": "DSpace Angular :: ",
-"repository.title.prefix": "DSpace ::",
-
-
-// "thumbnail.person.placeholder": "No Profile Picture Available",
-"thumbnail.person.placeholder": "Sem Fotografia de Perfil",
-
-// "admin.access-control.groups.breadcrumbs": "Groups",
-"admin.access-control.groups.breadcrumbs": "Grupos",
-
-// "admin.access-control.groups.search.placeholder": "Search groups...",
-"admin.access-control.groups.search.placeholder": "Pesquisar Grupos...",
-
-// "admin.access-control.epeople.breadcrumbs": "EPeople",
-"admin.access-control.epeople.breadcrumbs": "Utilizador",
-
-// "admin.access-control.epeople.search.placeholder": "Search people...",
-"admin.access-control.epeople.search.placeholder": "Pesquisar Utilizadores...",
-
-// "admin.access-control.epeople.form.return": "Back",
-"admin.access-control.epeople.form.return": "Voltar",
-
-//  "submission.submit.breadcrumbs": "New submission",
-"submission.submit.breadcrumbs": "Nova Submissão",
-
-// "search.filters.filter.namedresourcetype.label": "Search status",
-"search.filters.filter.namedresourcetype.label": "Pesquisar Estado",
-
-// "sorting.dc.date.issued.ASC": "Date Issued Ascending",
-"sorting.dc.date.issued.ASC": "Data de Publicação Ascendente",
-
-// "sorting.dc.date.issued.DESC": "Date Issued Descending",
-"sorting.dc.date.issued.DESC": "Data de Publicação Descendente",
-
-// "sorting.score.ASC": "Least Relevant",
-"sorting.score.ASC": "Menos Relevante",
-
-// "search.filters.filter.dateIssued.min.label": "Start",
-"search.filters.filter.dateIssued.min.label": "Início",
-
-// "search.filters.filter.dateIssued.max.label": "End",
-"search.filters.filter.dateIssued.max.label": "Fim",
-
-// "search.filters.search.submit": "Submit",
-"search.filters.search.submit": "Enviar",
-
-// "default.search.results.head": "Search Results",
-"default.search.results.head": "Resultados da Pesquisa",
-
-// "communityList.breadcrumbs": "Community List",
-"communityList.breadcrumbs": "Lista de Comunidades",
-
-// "browse.previous.button": "Previous",
-"browse.previous.button": "Anterior",
-
-// "browse.next.button": "Next",
-"browse.next.button": "Próximo",
-
-// "pagination.options.description": "Pagination options",
-"pagination.options.description": "Opções de Paginação",
-
-// "mydspace.breadcrumbs": "MyDSpace",
-"mydspace.breadcrumbs": "Área Pessoal",
-
-// "thumbnail.default.placeholder": "No Thumbnail Available",
-"thumbnail.default.placeholder": "Sem Miniatura",
-
-// "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
-"submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pesquisar ...",
-
-// "home.search-form.placeholder": "Search the repository ...",
-"home.search-form.placeholder": "Pesquisar ...",
-
-// "mydspace.search-form.placeholder": "Search in mydspace...",
-"mydspace.search-form.placeholder": "Pesquisar na Área Pessoal ...",
-
-
-// OLD strings
+  // Dspace v7.x > i18n pt-PT > last reviewed 16-06-2023
 
   // "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. Use o botão abaixo para regressar à página inicial.",
-  
+  "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.",
+
   // "401.link.home-page": "Take me to the home page",
-  "401.link.home-page": "Regresso à página inicial",
-  
+  "401.link.home-page": "Voltar à página de início",
+
   // "401.unauthorized": "unauthorized",
-   "401.unauthorized": "Não Autorizado",
-  
+  "401.unauthorized": "Não 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": "Não está autorizado a aceder a esta página. Use o botão abaixo para regressar à página inicial.",
-  
+  "403.help": "Não possui permissões para aceder a esta página. Pode utilizar o botão em baixo para voltar à página de início.",
+
   // "403.link.home-page": "Take me to the home page",
-  "403.link.home-page": "Regresso à página inicial",
-  
+  "403.link.home-page": "Voltar à página de início",
+
   // "403.forbidden": "forbidden",
-  "403.forbidden": "Não Autorizado",
-  
+  "403.forbidden": "Proibido",
+
+  // "500.page-internal-server-error": "Service Unavailable",
+  "500.page-internal-server-error": "Serviço indisponível",
+
+  // "500.help": "The server is temporarily unable to service your request due to maintenance downtime or capacity problems. Please try again later.",
+  "500.help": "O servidor encontra-se temporariamete indisponível para responder ao seu pedido, devido a processos de manutenção em curso ou capacidade de resposta. Por favor tente mais tarde.",
+
+  // "500.link.home-page": "Take me to the home page",
+  "500.link.home-page": "Voltar à página de início",
+
   // "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 pudemos encontrar a página pela qual procura. A página pode ter sido movida ou apagada. Você pode utilizar o botão abaixo para voltar a página inicial. ",
-  
+  "404.help": "Não encontramos a página que procura. A página pode ter sido movida ou eliminada. Pode utilizar o botão em baixo para voltar à página de início. ",
+
   // "404.link.home-page": "Take me to the home page",
-  "404.link.home-page": "Leve-me a página inicial",
-  
+  "404.link.home-page": "Voltar à página de início",
+
   // "404.page-not-found": "page not found",
-  "404.page-not-found": "Página não encontrada",
-  
+  "404.page-not-found": "página não encontrada",
+
+  // "error-page.description.401": "unauthorized",
+  "error-page.description.401": "Não autorizado",
+
+  // "error-page.description.403": "forbidden",
+  "error-page.description.403": "Proibido",
+
+  // "error-page.description.500": "Service Unavailable",
+  "error-page.description.500": "Serviço indisponível",
+
+  // "error-page.description.404": "page not found",
+  "error-page.description.404": "página não 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": "Ocorreu um erro com a sua autenticação via ORCID. Certifique-se que partilhou o seu endereço de email associado à sua conta ORCID com o repositório. Se o erro persistir, por favor contacte o administrador do sistema.",
+
+  // "access-status.embargo.listelement.badge": "Embargo",
+  "access-status.embargo.listelement.badge": "Embargado",
+
+  // "access-status.metadata.only.listelement.badge": "Metadata only",
+  "access-status.metadata.only.listelement.badge": "Apenas Metadados",
+
+  // "access-status.open.access.listelement.badge": "Open Access",
+  "access-status.open.access.listelement.badge": "Acesso Aberto",
+
+  // "access-status.restricted.listelement.badge": "Restricted",
+  "access-status.restricted.listelement.badge": "Acesso Restrito",
+
+  // "access-status.unknown.listelement.badge": "Unknown",
+  "access-status.unknown.listelement.badge": "Desconhecido",
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  "admin.curation-tasks.breadcrumbs": "Tarefas de Curadoria",
-  
+  "admin.curation-tasks.breadcrumbs": "Tarefas de curadoria",
+
   // "admin.curation-tasks.title": "System curation tasks",
-  "admin.curation-tasks.title": "Tarefas de Curadoria",
-  
+  "admin.curation-tasks.title": "Tarefas de curadoria",
+
   // "admin.curation-tasks.header": "System curation tasks",
-  "admin.curation-tasks.header": "Tarefas de Curadoria",
-  
+  "admin.curation-tasks.header": "Tarefas de curadoria",
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  "admin.registries.bitstream-formats.breadcrumbs": "Registo de Formatos de Ficheiro",
-  
+  "admin.registries.bitstream-formats.breadcrumbs": "Registo de formatos",
+
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
-  "admin.registries.bitstream-formats.create.breadcrumbs": "Registo de Formatos de Ficheiro",
-  
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Registo de formatos de ficheiro",
+
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
-  "admin.registries.bitstream-formats.create.failure.content": "Um erro ocorreu durante a criação do novo formato de ficheiro.",
-  
+  "admin.registries.bitstream-formats.create.failure.content": "Ocorreu um erro durante a criação do novo formato de ficheiro.",
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Falha",
-  
+
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
-  "admin.registries.bitstream-formats.create.head": "Criar formato de Ficheiro",
-  
+  "admin.registries.bitstream-formats.create.head": "Criar formato de ficheiro",
+
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
   "admin.registries.bitstream-formats.create.new": "Adicionar um novo formato de ficheiro",
-  
+
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "O novo formato de ficheiro foi criado com sucesso.",
-  
+
   // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "Sucesso",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "Falha ao remover {{ amount }} formato(s)",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "Falha",
-  
+
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "Removeu {{ amount }} formato(s) com sucesso",
-  
+
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Sucesso",
-  
+
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
-  "admin.registries.bitstream-formats.description": "Esta lista de formatos de ficheiro apresenta informações sobre formatos de ficheiros conhecidos e os seus níveis de suporte.",
-  
+  "admin.registries.bitstream-formats.description": "Esta lista de formatos de ficheiro apresenta informações sobre formatos conhecidos e os seus níveis de suporte.",
+
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formatos de Ficheiro",
-  
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Formatos de ficheiro",
+
   // "admin.registries.bitstream-formats.edit.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
-  
+
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.description.label": "Descrição",
-  
+
   // "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": "Extensões são extensões de ficheiro que são usadas para identificar automaticamente o formato dos ficheiros enviados. Pode informar várias extensões para cada formato.",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "Extensões de ficheiro",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
   "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.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.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.",
-  
+  "admin.registries.bitstream-formats.edit.internal.hint": "Formatos marcados como internos são ocultos para o utilizador, usados por motivos administrativos.",
+
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
   "admin.registries.bitstream-formats.edit.internal.label": "Interno",
-  
+
   // "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": "O MIME type associado a este formato não tem que ser único.",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
+
   // "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": "Um nome único para este formato (exemplo. Microsoft Word XP ou Microsoft Word 2000)",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "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.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Sucesso",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "O nível de suporte que a sua instituição promete para este formato.",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Nível de suporte",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
-  "admin.registries.bitstream-formats.head": "Registo de Formato de Ficheiro",
-  
+  "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.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Apagar selecionado(s)",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "Desselecionar todos",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "Interno",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Nome",
-  
-  // "admin.registries.bitstream-formats.table.return": "Return",
+
+  // "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.id": "ID",
+
+  // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Voltar",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Conhecido",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
-  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Com suporte",
-  
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Suportado",
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Desconhecido",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
-  "admin.registries.bitstream-formats.table.supportLevel.head": "Nível de Suporte",
-  
-  // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  "admin.registries.bitstream-formats.title": "DSpace :: Registo de Formato de Ficheiro",
-  
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Nível de suporte",
+
+  // "admin.registries.bitstream-formats.title": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.title": "Registo de formatos de ficheiro",
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
-  "admin.registries.metadata.breadcrumbs": "Registo de Metadados",
-  
+  "admin.registries.metadata.breadcrumbs": "Registo de metadados",
+
   // "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": "O registo de metadados mantém a lista de todos os campos de metadados disponíveis no repositório. Estes campos podem ser divididos em multiplos esquemas. No entanto, o DSpace requer esquemas de Dublin Core qualificados.",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
-  "admin.registries.metadata.form.create": "Criar Esquema de Metadados",
-  
+  "admin.registries.metadata.form.create": "Criar esquema de metadados",
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "Editar esquema de metadados",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "Nome",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "Namespace",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
-  "admin.registries.metadata.head": "Registo de Metadados",
-  
+  "admin.registries.metadata.head": "Registo de metadados",
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Nenhum esquema de metadados para mostrar.",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Apagar selecionado(s)",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "ID",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "Nome",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Namespace",
-  
-  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
-  "admin.registries.metadata.title": "DSpace :: Registo de Metadados",
-  
+
+  // "admin.registries.metadata.title": "Metadata Registry",
+  "admin.registries.metadata.title": "Registo de metadados",
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
-  "admin.registries.schema.breadcrumbs": "Esquema de Metadados",
-  
+  "admin.registries.schema.breadcrumbs": "Esquema de metadados",
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Este é o esquema de metadados para \"{{namespace}}\".",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
-  "admin.registries.schema.fields.head": "Campos do Esquema de Metadados",
-  
+  "admin.registries.schema.fields.head": "Campos do esquema de metadados",
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Nenhum campo de metadado para exibir.",
-  
+
   // "admin.registries.schema.fields.table.delete": "Delete selected",
   "admin.registries.schema.fields.table.delete": "Apagar selecionado(s)",
-  
+
   // "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.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Descrição",
-  
+
   // "admin.registries.schema.form.create": "Create metadata field",
-  "admin.registries.schema.form.create": "Criar Elemento de Metadado",
-  
+  "admin.registries.schema.form.create": "Criar elemento de metadados",
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
-  "admin.registries.schema.form.edit": "Editar Campo de Metadados",
-  
+  "admin.registries.schema.form.edit": "Editar campo de metadados",
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Elemento",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "Qualificador",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
-  "admin.registries.schema.form.scopenote": "Nota de Âmbito",
-  
+  "admin.registries.schema.form.scopenote": "Nota de âmbito",
+
   // "admin.registries.schema.head": "Metadata Schema",
-  "admin.registries.schema.head": "Esquema de Metadados",
-  
+  "admin.registries.schema.head": "Esquema de metadados",
+
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "Criou o esquema de metadados \"{{prefix}}\" com sucesso",
-  
+
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "Falhou ao apagar {{amount}} esquema(s) de metadados",
-  
+
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.success": "Apagou {{amount}} esquema(s) de metadados com sucesso",
-  
+
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Editou o esquema de metadados \"{{prefix}}\" com sucesso",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Erro",
-  
+
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.created": "Criou o campo de metadado \"{{field}}\" com sucesso",
-  
+
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "Falhou ao apagar {{amount}} campo(s) de metadados",
-  
+
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "Apagou {{amount}} campo(s) de metadados com sucesso",
-  
+
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
-  "admin.registries.schema.notification.field.edited": "Editou o campo de metadodo \"{{field}}\" com sucesso",
-  
+  "admin.registries.schema.notification.field.edited": "Editou o campo de metadado \"{{field}}\" com sucesso",
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Sucesso",
-  
-  // "admin.registries.schema.return": "Return",
+
+  // "admin.registries.schema.return": "Back",
   "admin.registries.schema.return": "Voltar",
-  
-  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
-  "admin.registries.schema.title": "DSpace :: Registo de Esquema de Metadados",
-  
-  
-  
+
+  // "admin.registries.schema.title": "Metadata Schema Registry",
+  "admin.registries.schema.title": "Registo de esquemas de metadados",
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
-  "admin.access-control.epeople.actions.delete": "Apagar Utilizador",
-  
+  "admin.access-control.epeople.actions.delete": "Apagar utilizador",
+
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  "admin.access-control.epeople.actions.impersonate": "Assumir o papel do Utilizador",
-  
+  "admin.access-control.epeople.actions.impersonate": "Assumir papel de utilizador",
+
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Redefinir password",
-  
+
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
-  "admin.access-control.epeople.actions.stop-impersonating": "Deixar de assumir o papel do Utilizador",
-  
-  // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  "admin.access-control.epeople.title": "DSpace :: Utilizador",
-  
+  "admin.access-control.epeople.actions.stop-impersonating": "Deixar de assumir o papel de utilizador",
+
+  // "admin.access-control.epeople.breadcrumbs": "EPeople",
+  "admin.access-control.epeople.breadcrumbs": "Utilizadores",
+
+  // "admin.access-control.epeople.title": "EPeople",
+  "admin.access-control.epeople.title": "Utilizadores",
+
   // "admin.access-control.epeople.head": "EPeople",
-  "admin.access-control.epeople.head": "Utilizador",
-  
+  "admin.access-control.epeople.head": "Utilizadores",
+
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Pesquisar",
-  
+
   // "admin.access-control.epeople.button.see-all": "Browse All",
-  "admin.access-control.epeople.button.see-all": "Pesquisar Todos",
-  
+  "admin.access-control.epeople.button.see-all": "Pesquisar tudo",
+
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "admin.access-control.epeople.search.scope.metadata": "Metadados",
-  
+
   // "admin.access-control.epeople.search.scope.email": "E-mail (exact)",
   "admin.access-control.epeople.search.scope.email": "Email (exato)",
-  
+
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Pesquisar",
-  
+
+  // "admin.access-control.epeople.search.placeholder": "Search people...",
+  "admin.access-control.epeople.search.placeholder": "Pesquisar utilizadores...",
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
-  "admin.access-control.epeople.button.add": "Adicionar Utilizador",
-  
+  "admin.access-control.epeople.button.add": "Adicionar utilizador",
+
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "ID",
-  
+
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "Nome",
-  
+
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
   "admin.access-control.epeople.table.email": "Email (exato)",
-  
+
   // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "Editar",
-  
+
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "Editar \"{{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": "Não possui autorização para editar este grupo",
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Apagar \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
-  "admin.access-control.epeople.no-items": "Sem Utilizadores para mostrar.",
-  
+  "admin.access-control.epeople.no-items": "Sem utilizadores para mostrar.",
+
   // "admin.access-control.epeople.form.create": "Create EPerson",
-  "admin.access-control.epeople.form.create": "Criar Utilizador",
-  
+  "admin.access-control.epeople.form.create": "Criar utilizador",
+
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
-  "admin.access-control.epeople.form.edit": "Editar Utilizador",
-  
+  "admin.access-control.epeople.form.edit": "Editar utilizador",
+
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "Nome",
-  
+
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Apelido",
-  
+
   // "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": "Deve conter um email válido",
-  
+
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Pode iniciar sessão",
-  
+
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Requer certificado",
-  
+
+  // "admin.access-control.epeople.form.return": "Back",
+  "admin.access-control.epeople.form.return": "Voltar",
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "Utilizador criado com sucesso \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "Falha ao criar o Utilizador \"{{name}}\"",
-  
+
   // "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": "Falha ao criar o Utilizador \"{{name}}\", o email \"{{email}}\" já está registado no repositório.",
-  
+
   // "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": "Falha ao editar o Utilizador \"{{name}}\", o email \"{{email}}\" já está registado no repositório.",
-  
+
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "Utilizador editado com successo \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.failure": "Falha ao editor Utilizador \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.success": "Utilizador apagado com sucesso \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.deleted.success": "Utilizador removido com sucesso \"{{name}}\"",
+
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
-  "admin.access-control.epeople.form.notification.deleted.failure": "Falha ao apagar Utilizador \"{{name}}\"",
-  
+  "admin.access-control.epeople.form.notification.deleted.failure": "Falha ao remover o utilizador \"{{name}}\"",
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Membro dos grupos:",
-  
+
   // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "ID",
-  
+
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "Nome",
-  
+
+  // "admin.access-control.epeople.form.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Coleção/Comunidade",
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
-  "admin.access-control.epeople.form.memberOfNoGroups": "Este Utilizador não é membro de nenhum grupo",
-  
+  "admin.access-control.epeople.form.memberOfNoGroups": "Este utilizador não é membro de nenhum grupo",
+
   // "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": "Falha ao apagar utilizador: \"{{name}}\"",
+
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
-  "admin.access-control.epeople.notification.deleted.success": "Utilizador apagado com sucesso: \"{{name}}\"",
-  
-  
-  
-  // "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  "admin.access-control.groups.title": "DSpace :: Grupos",
-  
-  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
-  "admin.access-control.groups.title.singleGroup": "DSpace :: Editar Grupo",
-  
-  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
-  "admin.access-control.groups.title.addGroup": "DSpace :: Novo Grupo",
-  
+  "admin.access-control.epeople.notification.deleted.success": "Utilizador removido com sucesso: \"{{name}}\"",
+
+  // "admin.access-control.groups.title": "Groups",
+  "admin.access-control.groups.title": "Grupos",
+
+  // "admin.access-control.groups.breadcrumbs": "Groups",
+  "admin.access-control.groups.breadcrumbs": "Grupos",
+
+  // "admin.access-control.groups.singleGroup.breadcrumbs": "Edit Group",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Editar grupo",
+
+  // "admin.access-control.groups.title.singleGroup": "Edit Group",
+  "admin.access-control.groups.title.singleGroup": "Editar grupo",
+
+  // "admin.access-control.groups.title.addGroup": "New Group",
+  "admin.access-control.groups.title.addGroup": "Novo grupo",
+
+  // "admin.access-control.groups.addGroup.breadcrumbs": "New Group",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Novo grupo",
+
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Grupos",
-  
+
   // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "Adicionar grupo",
-  
+
   // "admin.access-control.groups.search.head": "Search groups",
   "admin.access-control.groups.search.head": "Pesquisar grupos",
-  
+
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "Percorrer todos",
-  
+
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Pesquisar",
-  
+
+  // "admin.access-control.groups.search.placeholder": "Search groups...",
+  "admin.access-control.groups.search.placeholder": "Pesquisar grupos...",
+
   // "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": "Nome",
-  
+
+  // "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.table.collectionOrCommunity": "Coleção/Comunidade",
+
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Membros",
-  
+
   // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "Editar",
-  
+
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "Editar \"{{name}}\"",
-  
+
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.remove": "Apagar \"{{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": "Não foram encontrados grupos através do nome ou o UUID",
-  
+
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
-  "admin.access-control.groups.notification.deleted.success": "Grupo apagado com sucesso \"{{name}}\"",
-  
+  "admin.access-control.groups.notification.deleted.success": "Grupo removido com sucesso \"{{name}}\"",
+
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
-  "admin.access-control.groups.notification.deleted.failure.title": "Falha ao apagar grupo \"{{name}}\"",
-  
+  "admin.access-control.groups.notification.deleted.failure.title": "Falha ao remover grupo \"{{name}}\"",
+
   // "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 é permanente, não pode ser editado ou apagado. Pode adicionar ou remover membros do grupo nesta página.",
-  
+  "admin.access-control.groups.form.alert.permanent": "Este grupo é permanente, não pode ser editado ou apagado. Pode adicionar ou remover membros deste grupo nesta página.",
+
   // "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": "Este grupo não pode ser editado ou apagado porque corresponde a um papel no workflow de submissão em \"{{name}}\" {{comcol}}. Pode apagá-lo na aba <a href='{{comcolEditRolesRoute}}'>\"Atribuir Papéis\"</a> na edição da página {{comcol}}. Pode adicionar ou remover membros nesta página.",
-  
+  "admin.access-control.groups.form.alert.workflowGroup": "Este grupo não pode ser editado ou apagado porque corresponde a um papel no 'workflow' de depósito em \"{{name}}\" {{comcol}}. Pode apagá-lo na aba <a href='{{comcolEditRolesRoute}}'>\"Atribuir Papéis\"</a> na edição da página {{comcol}}. Pode adicionar ou remover membros nesta página.",
+
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Criar grupo",
-  
+
   // "admin.access-control.groups.form.head.edit": "Edit group",
   "admin.access-control.groups.form.head.edit": "Editar grupo",
-  
+
   // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "Nome do grupo",
-  
+
+  // "admin.access-control.groups.form.groupCommunity": "Community or Collection",
+  "admin.access-control.groups.form.groupCommunity": "Comunidade ou Coleção",
+
   // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "Descrição",
-  
+
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "Grupo criado com sucesso \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "Falha ao criar grupo \"{{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.",
   "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Falha ao criar o grupo com o nome: \"{{name}}\", verifique se o nome do grupo já está a ser utilizado.",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "Falha ao editar grupo \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Nome \"{{name}}\" já utilizado!",
-  
+
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "Grupo editado com sucesso \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Apagar grupo",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
   "admin.access-control.groups.form.delete-group.modal.header": "Apagar grupo \"{{ dsoName }}\"",
-  
+
   // "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": "Pretende mesmo apagar o grupo \"{{ dsoName }}\"",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "Cancelar",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "Apagar",
-  
+
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.success": "Grupo apagado com sucesso \"{{ name }}\"",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.title": "Falha ao apagar grupo \"{{ name }}\"",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "Causa: \"{{ cause }}\"",
-  
+
   // "admin.access-control.groups.form.members-list.head": "EPeople",
   "admin.access-control.groups.form.members-list.head": "Utilizador",
-  
+
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
-  "admin.access-control.groups.form.members-list.search.head": "Adicionar Utilizador",
-  
+  "admin.access-control.groups.form.members-list.search.head": "Adicionar utilizador",
+
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
-  "admin.access-control.groups.form.members-list.button.see-all": "Percorrer TODOS",
-  
+  "admin.access-control.groups.form.members-list.button.see-all": "Percorrer todos",
+
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Membros atuais",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
   "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadados",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
-  "admin.access-control.groups.form.members-list.search.scope.email": "Email (exato)",
-  
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (completo)",
+
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Pesquisar",
-  
+
   // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "ID",
-  
+
   // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "Nome",
-  
+
+  // "admin.access-control.groups.form.members-list.table.identity": "Identity",
+  "admin.access-control.groups.form.members-list.table.identity": "Identidade",
+
+  // "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",
   "admin.access-control.groups.form.members-list.table.edit": "Remover / Adicionar",
-  
+
   // "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": "Remover o membro com nome \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.addMember": "Membro adicionado com sucesso: \"{{name}}\"",
-  
+
   // "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": "Falha ao adicionar membro: \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
-  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Membro apagado com sucesso: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Membro removido com sucesso: \"{{name}}\"",
+
   // "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": "Falha ao apagar membro: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Falha ao remover o membro: \"{{name}}\"",
+
   // "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": "Adicionar membro com o nome \"{{name}}\"",
-  
+
   // "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": "Sem grupos ativos, indique um nome primeiro.",
-  
+
   // "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": "Grupo sem membros, pesquise e adicione novos membros.",
-  
+
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
   "admin.access-control.groups.form.members-list.no-items": "Não foram encontrados Utilizadores nesta pesquisa",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "Algo correu mal: \"{{cause}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Grupos",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
   "admin.access-control.groups.form.subgroups-list.search.head": "Adicionar um subgrupo",
-  
+
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
-  "admin.access-control.groups.form.subgroups-list.button.see-all": "Percorrer Todos",
-  
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Percorrer todos",
+
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
   "admin.access-control.groups.form.subgroups-list.headSubgroups": "Subgrupos atuais",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "Pesquisar",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
   "admin.access-control.groups.form.subgroups-list.table.id": "ID",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "Nome",
-  
+
+  // "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Collection/Community",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Coleção/Comunidade",
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Remover / Adicionar",
-  
+
   // "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": "Remover subgrupo com o nome \"{{name}}\"",
-  
+
   // "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.buttons.add": "Adicionar subgrupo com o nome \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Grupo atual",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Subgrupo adicionado com sucesso: \"{{name}}\"",
-  
+
   // "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": "Falha ao adicionar subgrupo: \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
-  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo apagado com sucesso: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Subgrupo removido com sucesso: \"{{name}}\"",
+
   // "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": "Falha ao apagar subgrupo: \"{{name}}\"",
-  
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Falha ao remover o subgrupo: \"{{name}}\"",
+
   // "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": "Sem grupo ativo, indique um nome primeiro.",
-  
+
   // "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": "Este é o grupo atual, não pode ser adicionado.",
-  
+
   // "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": "Não foram encontrados grupos com este nome ou 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": "Este grupo não tem ainda subgrupos.",
-  
-  // "admin.access-control.groups.form.return": "Return to groups",
-  "admin.access-control.groups.form.return": "Retornar aos grupos",
-  
-  
-  
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Este grupo ainda não tem subgrupos.",
+
+  // "admin.access-control.groups.form.return": "Back",
+  "admin.access-control.groups.form.return": "Voltar",
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.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.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.search.breadcrumbs": "Administrative Search",
   "admin.search.breadcrumbs": "Pesquisa administrativa",
-  
+
   // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "Editar",
-  
+
   // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "Editar",
-  
+
   // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "Apagar",
-  
+
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Editar",
-  
-  // "admin.search.item.make-private": "Make Private",
-  "admin.search.item.make-private": "Tornar Privado",
-  
-  // "admin.search.item.make-public": "Make Public",
-  "admin.search.item.make-public": "Tornar Público",
-  
+
+  // "admin.search.item.make-private": "Make non-discoverable",
+  "admin.search.item.make-private": "Tornar privado",
+
+  // "admin.search.item.make-public": "Make discoverable",
+  "admin.search.item.make-public": "Tornar público",
+
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "Mover",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Reintegrar",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Retirar",
-  
+
   // "admin.search.title": "Administrative Search",
-  "admin.search.title": "Pesquisa Administrativa",
-  
+  "admin.search.title": "Pesquisa administrativa",
+
   // "administrativeView.search.results.head": "Administrative Search",
-  "administrativeView.search.results.head": "Pesquisa Administrativa",
-  
-  
-  
-  
+  "administrativeView.search.results.head": "Pesquisa administrativa",
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
-  "admin.workflow.breadcrumbs": "Gestão do Workflow",
-  
+  "admin.workflow.breadcrumbs": "Gestão do fluxo de trabalho",
+
   // "admin.workflow.title": "Administer Workflow",
-  "admin.workflow.title": "Gestão do Workflow",
-  
+  "admin.workflow.title": "Gestão do fluxo de trabalho",
+
   // "admin.workflow.item.workflow": "Workflow",
-  "admin.workflow.item.workflow": "Workflow",
-  
+  "admin.workflow.item.workflow": "Fluxo de trabalho",
+
+  // "admin.workflow.item.workspace": "Workspace",
+  "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",
+  "admin.workflow.item.policies": "Políticas",
+
+  // "admin.workflow.item.supervision": "Supervision",
+  "admin.workflow.item.supervision": "Supervisão",
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
-  "admin.metadata-import.breadcrumbs": "Importação de Metadados",
-  
+  "admin.metadata-import.breadcrumbs": "Importação de metadados",
+
+  // "admin.batch-import.breadcrumbs": "Import Batch",
+  "admin.batch-import.breadcrumbs": "Importação em lote (batch)",
+
   // "admin.metadata-import.title": "Import Metadata",
-  "admin.metadata-import.title": "Importação de Metadados",
-  
+  "admin.metadata-import.title": "Importação de metadados",
+
+  // "admin.batch-import.title": "Import Batch",
+  "admin.batch-import.title": "Importação em lote (batch)",
+
   // "admin.metadata-import.page.header": "Import Metadata",
-  "admin.metadata-import.page.header": "Importação de Metadados",
-  
+  "admin.metadata-import.page.header": "Importação de metadados",
+
+  // "admin.batch-import.page.header": "Import Batch",
+  "admin.batch-import.page.header": "Importação em lote (batch)",
+
   // "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": "Pode arrastar ou procurar ficheiros CSV que contenham operações em lote de metadados",
-  
+  "admin.metadata-import.page.help": "Pode arrastar ou procurar ficheiros .csv que contenham 'revisões' de metadados em 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 a qual pretende importar. Em seguida, largue ou selecione ficheiro .zip em formato Simple Archive Format (SAF) que inclua os itens 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": "É possível efetuar a importação com o carregamento de ficheiros ou através de URL. Utilize o botão de seleção em cima para definir a fonte de entrada",
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
-  "admin.metadata-import.page.dropMsg": "Arraste um ficheiro CSV com metadados para importar",
-  
+  "admin.metadata-import.page.dropMsg": "Arraste ficheiro .csv para importar metadados",
+
+  // "admin.batch-import.page.dropMsg": "Drop a batch ZIP to import",
+  "admin.batch-import.page.dropMsg": "Arraste ficheiro .zip para importação em lote",
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
-  "admin.metadata-import.page.dropMsgReplace": "Arraste um ficheiro CSV para substituir o atual",
-  
-  // "admin.metadata-import.page.button.return": "Return",
+  "admin.metadata-import.page.dropMsgReplace": "Arraste ficheiro .csv para substituir metadados a importar",
+
+  // "admin.batch-import.page.dropMsgReplace": "Drop to replace the batch ZIP to import",
+  "admin.batch-import.page.dropMsgReplace": "Arraste ficheiro .zip para substituir importação em lote",
+
+  // "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": "Selecione a coleção",
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Selecione um ficheiro!",
-  
-  
-  
-  
+
+  // "admin.metadata-import.page.error.addFileUrl": "Insert file url first!",
+  "admin.metadata-import.page.error.addFileUrl": "Insira primeiro o URL do ficheiro!",
+
+  // "admin.batch-import.page.error.addFile": "Select Zip file first!",
+  "admin.batch-import.page.error.addFile": "Selecione primeiro o ficheiro .zip!",
+
+  // "admin.metadata-import.page.toggle.upload": "Upload",
+  "admin.metadata-import.page.toggle.upload": "Carregar",
+
+  // "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": "Insira o URL do lote ZIP a importar",
+
+  // "admin.metadata-import.page.validateOnly": "Validate Only",
+  "admin.metadata-import.page.validateOnly": "Validar",
+
+  // "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 ficheiro .csv carregado será validado. Irá receber um relatório com as alterações detetadas, porém nenhuma será guardada.",
+
+  // "advanced-workflow-action.rating.form.rating.label": "Rating",
+  "advanced-workflow-action.rating.form.rating.label": "Classificação",
+
+  // "advanced-workflow-action.rating.form.rating.error": "You must rate the item",
+  "advanced-workflow-action.rating.form.rating.error": "Deve classificar o item",
+
+  // "advanced-workflow-action.rating.form.review.label": "Review",
+  "advanced-workflow-action.rating.form.review.label": "Rever",
+
+  // "advanced-workflow-action.rating.form.review.error": "You must enter a review to submit this rating",
+  "advanced-workflow-action.rating.form.review.error": "Deve introduzir uma revisão para submeter esta classificação",
+
+  // "advanced-workflow-action.rating.description": "Please select a rating below",
+  "advanced-workflow-action.rating.description": "Por favor selecione uma classificação em baixo",
+
+  // "advanced-workflow-action.rating.description-requiredDescription": "Please select a rating below and also add a review",
+  "advanced-workflow-action.rating.description-requiredDescription": "Por favor, selecione em baixo uma classificação e acrescente também uma revisão",
+
+  // "advanced-workflow-action.select-reviewer.description-single": "Please select a single reviewer below before submitting",
+  "advanced-workflow-action.select-reviewer.description-single": "Por favor, selecione um revisor único antes de submeter",
+
+  // "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, selecione um ou mais revisores antes de submeter",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "EPeople",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Add EPeople",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Adicionar utilizadores",
+
+  // "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": "Procurar tudo",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Current Members",
+  "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",
+  "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)",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.email": "E-mail (completo)",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Search",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.button": "Pesquisar",
+
+  // "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": "Nome",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identity",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.identity": "Identidade",
+
+  // "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.email": "Email",
+  "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.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": "Remover / Adicionar",
+
+  // "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": "Remover membro com o nome \"{{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": "Membro adicionado com sucessso: \"{{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": "Falha ao adicionar o membro: \"{{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": "Membro removido com sucesso: \"{{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": "Falha ao remover o membro: \"{{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": "Adicionar membro com nome \"{{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": "Atualmente sem grupo ativo, submeter um nome primeiro.",
+
+  // "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": "Ainda não existem membros no grupo, pesquisar e acrescentar.",
+
+  // "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": "Não foi encontrado nenhuma utilizador na pesquisa",
+
+  // "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "No reviewer selected.",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Sem 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 ficheiro .zip carregado será validado. Irá receber um relatório com as alterações detetadas, porém nenhuma será guardada.",
+
+  // "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 palavra-chave inválidos.",
-  
+
   // "auth.messages.expired": "Your session has expired. Please log in again.",
-  "auth.messages.expired": "Sua sessão expirou. Por favor entre novamente.",
-  
-  
-  
+  "auth.messages.expired": "A sua sessão expirou. Por favor, autentique-se novamente.",
+
+  // "auth.messages.token-refresh-failed": "Refreshing your session token failed. Please log in again.",
+  "auth.messages.token-refresh-failed": "A atualização do token da sua sessão falhou. Por favor, autentique-se novamente.",
+
+  // "bitstream.download.page": "Now downloading {{bitstream}}...",
+  "bitstream.download.page": "A descarregar {{bitstream}}...",
+
+  // "bitstream.download.page.back": "Back",
+  "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.title": "Edit bitstream's Policies",
+  "bitstream.edit.authorizations.title": "Editar políticas dos bitstreams",
+
+  // "bitstream.edit.return": "Back",
+  "bitstream.edit.return": "Voltar",
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "Ficheiros: ",
-  
+
   // "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": "Opcionalmente, pode indicar uma breve descrição do ficheiro, por exemplo \"<i>Texto Principal</i>\" ou \"<i>Dados da experiência</i>\".",
-  
+
   // "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>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>A data não pode ser alterada neste formulário.</b> Para definir uma data de embargo para um ficheiro, vá à aba <i>Estdo do Item</i>, clique em <i>Autorizações...</i>, crie ou edite a política <i>READ</i> do ficheiro, e definda uma <i>Data de Início</i>.",
-  
+
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
   "bitstream.edit.form.embargo.label": "Embargo até uma data específica",
-  
+
   // "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": "Altere o nome do ficheiro. Isto vai alterar o endereço de apresentação do ficheiro, mas o link antigo redireciona para o novo desde que não seja alterada a sequência dos identificadores.",
-  
+
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Nome do ficheiro",
-  
+
   // "bitstream.edit.form.newFormat.label": "Describe new format",
   "bitstream.edit.form.newFormat.label": "Descreva o novo formato",
-  
+
   // "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": "A aplicação usada para criar o ficheiro e a respetiva versão (por exemplo, \"<i>ACMESoft SuperApp versão 1.5</i>\").",
-  
+
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
   "bitstream.edit.form.primaryBitstream.label": "Ficheiro primário",
-  
+
   // "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": "Se o formato não está na lista abaixo, <b>escolha \"Formato não está na lista\" </b> e desreva-o em \"Descreva o novo formato\".",
-  
+  "bitstream.edit.form.selectedFormat.hint": "Se o formato não se encontrar listado, selecione por favor a opção <b> \"Formato não está na lista\" </b> e faculte detalhes em \"Descreva o novo formato\".",
+
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  "bitstream.edit.form.selectedFormat.label": "Formato Selecionado",
-  
+  "bitstream.edit.form.selectedFormat.label": "Formato selecionado",
+
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
-  "bitstream.edit.form.selectedFormat.unknown": "Formato não está na lista",
-  
+  "bitstream.edit.form.selectedFormat.unknown": "O formato não está na lista",
+
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
-  "bitstream.edit.notifications.error.format.title": "Ocorreu um erro ao guardar o formto do ficheiro",
-  
+  "bitstream.edit.notifications.error.format.title": "Ocorreu um erro ao guardar o formato do ficheiro",
+
+  // "bitstream.edit.notifications.error.primaryBitstream.title": "An error occurred saving the primary bitstream",
+  "bitstream.edit.notifications.error.primaryBitstream.title": "Ocorreu um erro ao guardar o ficheiro primário",
+
+  // "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+  "bitstream.edit.form.iiifLabel.label": "IIIF Label",
+
+  // "bitstream.edit.form.iiifLabel.hint": "Canvas label for this image. If not provided default label will be used.",
+  "bitstream.edit.form.iiifLabel.hint": "Etiqueta canvas para esta imagem. Se não for fornecida será utilizada uma etiqueta padrão.",
+
+  // "bitstream.edit.form.iiifToc.label": "IIIF Table of Contents",
+  "bitstream.edit.form.iiifToc.label": "Tabela de conteúdos 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": "Ao acrescentar texto aqui dá início a uma tabela de conteúdos.",
+
+  // "bitstream.edit.form.iiifWidth.label": "IIIF Canvas Width",
+  "bitstream.edit.form.iiifWidth.label": "Largura do canvas IIIF",
+
+  // "bitstream.edit.form.iiifWidth.hint": "The canvas width should usually match the image width.",
+  "bitstream.edit.form.iiifWidth.hint": "A largura do canvas normalmente deve corresponder à largura da imagem.",
+
+  // "bitstream.edit.form.iiifHeight.label": "IIIF Canvas Height",
+  "bitstream.edit.form.iiifHeight.label": "Altura do canvas IIIF",
+
+  // "bitstream.edit.form.iiifHeight.hint": "The canvas height should usually match the image height.",
+  "bitstream.edit.form.iiifHeight.hint": "A altura do canvas normalmente deve corresponder à altura da imagem.",
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "As alterações aos ficheiro foram guardadas.",
-  
+
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "Ficheiro guardado",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Editar ficheiro",
-  
-  
-  
+
+  // "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": "Já tem acesso a este ficheiro. Se quiser descarregar o ficheiro, clique ",
+
+  // "bitstream-request-a-copy.alert.canDownload2": "here",
+  "bitstream-request-a-copy.alert.canDownload2": "aqui",
+
+  // "bitstream-request-a-copy.header": "Request a copy of the file",
+  "bitstream-request-a-copy.header": "Solicitar cópia ao autor",
+
+  // "bitstream-request-a-copy.intro": "Enter the following information to request a copy for the following item: ",
+  "bitstream-request-a-copy.intro": "Preencha a seguinte informação para solicitar uma cópia do ficheiro: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.one": "Requesting the following file: ",
+  "bitstream-request-a-copy.intro.bitstream.one": "Solicitar o seguinte ficheiro: ",
+
+  // "bitstream-request-a-copy.intro.bitstream.all": "Requesting all files. ",
+  "bitstream-request-a-copy.intro.bitstream.all": "Solicitar todos os ficheiros. ",
+
+  // "bitstream-request-a-copy.name.label": "Name *",
+  "bitstream-request-a-copy.name.label": "O seu nome *",
+
+  // "bitstream-request-a-copy.name.error": "The name is required",
+  "bitstream-request-a-copy.name.error": "O preenchimento do nome é um elemento obrigatório!",
+
+  // "bitstream-request-a-copy.email.label": "Your e-mail address *",
+  "bitstream-request-a-copy.email.label": "O seu endereço de correio eletrónico *",
+
+  // "bitstream-request-a-copy.email.hint": "This email address is used for sending the file.",
+  "bitstream-request-a-copy.email.hint": "Este endereço de correio eletrónico será utilizado para eventualmente proceder ao envio do ficheiro.",
+
+  // "bitstream-request-a-copy.email.error": "Please enter a valid email address.",
+  "bitstream-request-a-copy.email.error": "O preenchimento de um endereço de correio electrónico válido é um elemento obrigatório!",
+
+  // "bitstream-request-a-copy.allfiles.label": "Files",
+  "bitstream-request-a-copy.allfiles.label": "Ficheiro(s) pretendido(s):",
+
+  // "bitstream-request-a-copy.files-all-false.label": "Only the requested file",
+  "bitstream-request-a-copy.files-all-false.label": "Apenas o ficheiro solicitado",
+
+  // "bitstream-request-a-copy.files-all-true.label": "All files (of this item) in restricted access",
+  "bitstream-request-a-copy.files-all-true.label": "Todos os ficheiros (deste registo) em acesso restrito",
+
+  // "bitstream-request-a-copy.message.label": "Message",
+  "bitstream-request-a-copy.message.label": "Mensagem a enviar ao autor:",
+
+  // "bitstream-request-a-copy.return": "Back",
+  "bitstream-request-a-copy.return": "Voltar",
+
+  // "bitstream-request-a-copy.submit": "Request copy",
+  "bitstream-request-a-copy.submit": "Solicitar cópia ao autor",
+
+  // "bitstream-request-a-copy.submit.success": "The item request was submitted successfully.",
+  "bitstream-request-a-copy.submit.success": "O seu pedido de cópia foi enviado com sucesso!",
+
+  // "bitstream-request-a-copy.submit.error": "Something went wrong with submitting the item request.",
+  "bitstream-request-a-copy.submit.error": "Ocorreu algum erro no envio do pedido de cópia!",
+
+  // "browse.back.all-results": "All browse results",
+  "browse.back.all-results": "Todos os resultados",
+
   // "browse.comcol.by.author": "By Author",
-  "browse.comcol.by.author": "Por Autor",
-  
+  "browse.comcol.by.author": "Por autor",
+
   // "browse.comcol.by.dateissued": "By Issue Date",
-  "browse.comcol.by.dateissued": "Por Data de Publicação",
-  
+  "browse.comcol.by.dateissued": "Por data de publicação",
+
   // "browse.comcol.by.subject": "By Subject",
-  "browse.comcol.by.subject": "Por Assunto",
-  
+  "browse.comcol.by.subject": "Por assunto",
+
+  // "browse.comcol.by.srsc": "By Subject Category",
+  "browse.comcol.by.srsc": "Por vocabulário controlado (SRSC)",
+
   // "browse.comcol.by.title": "By Title",
-  "browse.comcol.by.title": "Por Título",
-  
+  "browse.comcol.by.title": "Por título",
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Navegar",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "Sem itens a exibir.",
-  
+
   // "browse.metadata.author": "Author",
-  "browse.metadata.author": "Autor",
-  
+  "browse.metadata.author": "autor",
+
   // "browse.metadata.dateissued": "Issue Date",
-  "browse.metadata.dateissued": "Data de Publicação",
-  
+  "browse.metadata.dateissued": "data de Publicação",
+
   // "browse.metadata.subject": "Subject",
-  "browse.metadata.subject": "Assunto",
-  
+  "browse.metadata.subject": "assunto",
+
   // "browse.metadata.title": "Title",
-  "browse.metadata.title": "Título",
-  
+  "browse.metadata.title": "título",
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
-  "browse.metadata.author.breadcrumbs": "Pesquisar por Autor",
-  
+  "browse.metadata.author.breadcrumbs": "Percorrer por autor",
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  "browse.metadata.dateissued.breadcrumbs": "Pesquisar por Data",
-  
+  "browse.metadata.dateissued.breadcrumbs": "Percorrer por data",
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  "browse.metadata.subject.breadcrumbs": "Pesquisar por Assunto",
-  
+  "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.title.breadcrumbs": "Browse by Title",
-  "browse.metadata.title.breadcrumbs": "Pesquisar por Título",
-  
+  "browse.metadata.title.breadcrumbs": "Percorrer por título",
+
+  // "pagination.next.button": "Next",
+  "pagination.next.button": "Próximo",
+
+  // "pagination.previous.button": "Previous",
+  "pagination.previous.button": "Anterior",
+
+  // "pagination.next.button.disabled.tooltip": "No more pages of results",
+  "pagination.next.button.disabled.tooltip": "Sem mais páginas de resultados",
+
+  // "browse.startsWith": ", starting with {{ startsWith }}",
+  "browse.startsWith": ", começado por {{ startsWith }}",
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Escolha o início)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Escolha o ano)",
-  
-  // "browse.startsWith.jump": "Jump to a point in the index:",
-  "browse.startsWith.jump": "Pular para um ponto do índice:",
-  
+
+  // "browse.startsWith.choose_year.label": "Choose the issue year",
+  "browse.startsWith.choose_year.label": "Escolha o ano",
+
+  // "browse.startsWith.jump": "Filter results by year or month",
+  "browse.startsWith.jump": "Filtrar resultados por ano ou mês",
+
   // "browse.startsWith.months.april": "April",
-  "browse.startsWith.months.april": "Abril",
-  
+  "browse.startsWith.months.april": "abril",
+
   // "browse.startsWith.months.august": "August",
-  "browse.startsWith.months.august": "Agosto",
-  
+  "browse.startsWith.months.august": "agosto",
+
   // "browse.startsWith.months.december": "December",
-  "browse.startsWith.months.december": "Dezembro",
-  
+  "browse.startsWith.months.december": "dezembro",
+
   // "browse.startsWith.months.february": "February",
-  "browse.startsWith.months.february": "Fevereiro",
-  
+  "browse.startsWith.months.february": "fevereiro",
+
   // "browse.startsWith.months.january": "January",
-  "browse.startsWith.months.january": "Janeiro",
-  
+  "browse.startsWith.months.january": "janeiro",
+
   // "browse.startsWith.months.july": "July",
-  "browse.startsWith.months.july": "Julho",
-  
+  "browse.startsWith.months.july": "julho",
+
   // "browse.startsWith.months.june": "June",
-  "browse.startsWith.months.june": "Junho",
-  
+  "browse.startsWith.months.june": "junho",
+
   // "browse.startsWith.months.march": "March",
-  "browse.startsWith.months.march": "Março",
-  
+  "browse.startsWith.months.march": "março",
+
   // "browse.startsWith.months.may": "May",
-  "browse.startsWith.months.may": "Maio",
-  
+  "browse.startsWith.months.may": "maio",
+
   // "browse.startsWith.months.none": "(Choose month)",
-  "browse.startsWith.months.none": "(escolha o mês)",
-  
+  "browse.startsWith.months.none": "(Escolha o mês)",
+
+  // "browse.startsWith.months.none.label": "Choose the issue month",
+  "browse.startsWith.months.none.label": "Escolha o mês",
+
   // "browse.startsWith.months.november": "November",
-  "browse.startsWith.months.november": "Novembro",
-  
+  "browse.startsWith.months.november": "novembro",
+
   // "browse.startsWith.months.october": "October",
-  "browse.startsWith.months.october": "Outubro",
-  
+  "browse.startsWith.months.october": "outubro",
+
   // "browse.startsWith.months.september": "September",
-  "browse.startsWith.months.september": "Setembro",
-  
-  // "browse.startsWith.submit": "Go",
+  "browse.startsWith.months.september": "setembro",
+
+  // "browse.startsWith.submit": "Browse",
   "browse.startsWith.submit": "Pesquisar",
-  
-  // "browse.startsWith.type_date": "Or type in a date (year-month):",
-  "browse.startsWith.type_date": "Ou indique uma data (ano-mês):",
-  
-  // "browse.startsWith.type_text": "Or enter first few letters:",
-  "browse.startsWith.type_text": "Ou indique as primeiras letras:",
-  
-  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  "browse.title": "Percorrer {{ collection }} por {{ field }} {{ value }}",
-  
-  
+
+  // "browse.startsWith.type_date": "Filter results by date",
+  "browse.startsWith.type_date": "Filtrar resultados por data",
+
+  // "browse.startsWith.type_date.label": "Or type in a date (year-month) and click on the Browse button",
+  "browse.startsWith.type_date.label": "ou indique uma data (ano-mês):",
+
+  // "browse.startsWith.type_text": "Filter results by typing the first few letters",
+  "browse.startsWith.type_text": "Filtrar resultados inserindo as primeiras letras",
+
+  // "browse.startsWith.input": "Filter",
+  "browse.startsWith.input": "Filtrar",
+
+  // "browse.taxonomy.button": "Browse",
+  "browse.taxonomy.button": "Pesquisar",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title": "Percorrer {{ collection }} por {{ field }}{{ startsWith }} {{ value }}",
+
+  // "browse.title.page": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title.page": "Percorrer {{ collection }} por {{ field }} {{ value }}",
+
+  // "search.browse.item-back": "Back to Results",
+  "search.browse.item-back": "Voltar aos resultados",
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Remover chip",
-  
-  
-  
+
+  // "claimed-approved-search-result-list-element.title": "Approved",
+  "claimed-approved-search-result-list-element.title": "Aprovado",
+
+  // "claimed-declined-search-result-list-element.title": "Rejected, sent back to submitter",
+  "claimed-declined-search-result-list-element.title": "Rejeitado, reenviado para o depositante",
+
+  // "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, reenviado para a área de trabalho do gestor de revisão",
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Criar uma coleção",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
-  "collection.create.notifications.success": "Coleção criado com sucesso",
-  
+  "collection.create.notifications.success": "Coleção criada com sucesso",
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
-  "collection.create.sub-head": "Criar uma Coleção na Comunidade {{ parent }}",
-  
+  "collection.create.sub-head": "Criar uma coleção na comunidade {{ parent }}",
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "Curadoria da coleção: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "Cancelar",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Confirmar",
-  
+
+  // "collection.delete.processing": "Deleting",
+  "collection.delete.processing": "A apagar",
+
   // "collection.delete.head": "Delete Collection",
-  "collection.delete.head": "Apagar Coleção",
-  
+  "collection.delete.head": "Apagar coleção",
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
-  "collection.delete.notification.fail": "Coleção não pôde ser apagada",
-  
+  "collection.delete.notification.fail": "Não foi possível apagar a coleção",
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "Apagou a coleção com sucesso",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
-  "collection.delete.text": "Você tem certeza que deseja apagar a coleção \"{{ dso }}?\"",
-  
-  
-  
+  "collection.delete.text": "Tem certeza que pretende apagar a coleção \"{{ dso }}?\"",
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Apagar esta coleção",
-  
+
   // "collection.edit.head": "Edit Collection",
-  "collection.edit.head": "Editar Coleção",
-  
+  "collection.edit.head": "Editar coleção",
+
   // "collection.edit.breadcrumbs": "Edit Collection",
-  "collection.edit.breadcrumbs": "Editar Coleção",
-  
-  
-  
+  "collection.edit.breadcrumbs": "Editar coleção",
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Mapeamentos",
-  
+
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
-  "collection.edit.tabs.item-mapper.title": "Editar Coleção - Mapeamentos",
-  
+  "collection.edit.tabs.item-mapper.title": "Editar coleção - mapeamentos",
+
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "Cancelar",
-  
+
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   "collection.edit.item-mapper.collection": "Coleção: \"<b>{{name}}</b>\"",
-  
+
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Mapear itens selecionados",
-  
+
   // "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": "Esta é a ferramenta de mapeamento de itens que permite aos administradores de coleções mapear itens de outras coleções nesta. Pode pesquisá-los noutras coleções para mapeá-los, ou navegar na lista dos itens atualmente mapeados.",
-  
+  "collection.edit.item-mapper.description": "Esta é a ferramenta de mapeamento de itens que permite aos administradores de coleções mapear itens de outras coleções para esta. Pode pesquisá-los noutras coleções para os mapear ou navegar na lista dos itens atualmente mapeados.",
+
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-  "collection.edit.item-mapper.head": "Mapeador de Itens - Mapear itens noutras Coleções",
-  
+  "collection.edit.item-mapper.head": "Mapeador de Itens - Mapear itens noutras coleções",
+
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
-  "collection.edit.item-mapper.no-search": "Por favor introduza um termo para pesquisar",
-  
+  "collection.edit.item-mapper.no-search": "Por favor introduza um termo para pesquisar!",
+
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.error.content": "Ocorreu erros ao mapear {{amount}} itens.",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-  "collection.edit.item-mapper.notifications.map.error.head": "Erros de mapeamento",
-  
+  "collection.edit.item-mapper.notifications.map.error.head": "Erros de mapeamento!",
+
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.success.content": "Mapeou {{amount}} itens com sucesso.",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Mapeamento completo",
-  
+
   // "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": "Ocorreram erros ao tentar remover os mapeamentos de {{amount}} item(ns).",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Erros de remoção de mapeamento",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Removeu os mapeamentps de {{amount}} item(ns) com sucesso.",
-  
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Removeu os mapeamentos de {{amount}} item(ns) com sucesso.",
+
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Remoção de mapeamentos completa",
-  
+
   // "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 items...",
+  "collection.edit.item-mapper.search-form.placeholder": "Pesquisar items...",
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Navegar por itens mapeados",
-  
+
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Mapear novos itens",
-  
-  
-  
+
+  // "collection.edit.logo.delete.title": "Delete logo",
+  "collection.edit.logo.delete.title": "Apagar logótipo",
+
+  // "collection.edit.logo.delete-undo.title": "Undo delete",
+  "collection.edit.logo.delete-undo.title": "Não apagar",
+
   // "collection.edit.logo.label": "Collection logo",
-  "collection.edit.logo.label": "Logotipo da Coleção",
-  
+  "collection.edit.logo.label": "Logótipo da coleção",
+
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
   "collection.edit.logo.notifications.add.error": "Falha ao carregar o logotipo da coleção. Verifique o ficheiro antes de tentar de novo.",
-  
+
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
   "collection.edit.logo.notifications.add.success": "O logotipo da coleção foi carregado com sucesso.",
-  
+
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "collection.edit.logo.notifications.delete.success.title": "Logo removido",
-  
+  "collection.edit.logo.notifications.delete.success.title": "Logótipo apagado",
+
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "O logotipo da coleção foi apagado com sucesso",
-  
+
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "Erro ao apagar o logotipo",
-  
+
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
-  "collection.edit.logo.upload": "Arraste um logotipo da coleção para carregar",
-  
-  
-  
+  "collection.edit.logo.upload": "Arraste um logótipo da coleção para carregar",
+
   // "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.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Curadoria",
-  
+
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
-  "collection.edit.tabs.curate.title": "Editar Coleção - Curadoria",
-  
+  "collection.edit.tabs.curate.title": "Editar coleção - Curadoria",
+
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Autorizações",
-  
+
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
-  "collection.edit.tabs.authorizations.title": "Editar Coleção - Autorizações",
-  
+  "collection.edit.tabs.authorizations.title": "Editar coleção - autorizações",
+
+  // "collection.edit.item.authorizations.load-bundle-button": "Load more bundles",
+  "collection.edit.item.authorizations.load-bundle-button": "Carregar mais pacotes",
+
+  // "collection.edit.item.authorizations.load-more-button": "Load more",
+  "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.tabs.metadata.head": "Edit Metadata",
-  "collection.edit.tabs.metadata.head": "Editar Metadados",
-  
+  "collection.edit.tabs.metadata.head": "Editar metadados",
+
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
-  "collection.edit.tabs.metadata.title": "Editar Coleção - Metadados",
-  
+  "collection.edit.tabs.metadata.title": "Editar coleção - metadados",
+
   // "collection.edit.tabs.roles.head": "Assign Roles",
-  "collection.edit.tabs.roles.head": "Atribuir Papéis",
-  
+  "collection.edit.tabs.roles.head": "Atribuir perfis",
+
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
-  "collection.edit.tabs.roles.title": "Editar Coleção - Papéis",
-  
+  "collection.edit.tabs.roles.title": "Editar coleção - perfis",
+
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
   "collection.edit.tabs.source.external": "Esta coleção agrega conteúdo de uma fonte externa",
-  
+
   // "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": "Deve indicar o identificador da coleção a ser agregado (set).",
-  
+
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  "collection.edit.tabs.source.form.harvestType": "Os conteúdo estão a ser agregados",
-  
+  "collection.edit.tabs.source.form.harvestType": "Os conteúdos estão a ser agregados",
+
   // "collection.edit.tabs.source.form.head": "Configure an external source",
   "collection.edit.tabs.source.form.head": "Configure uma fonte externa",
-  
+
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  "collection.edit.tabs.source.form.metadataConfigId": "Formato de Metadados",
-  
+  "collection.edit.tabs.source.form.metadataConfigId": "Formato de metadados",
+
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "ID do set OAI-PMH",
-  
+
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
   "collection.edit.tabs.source.form.oaiSource": "Endereço OAI-PMH base",
-  
+
   // "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": "Agregar metadados e ficheiros (requer suporet ORE)",
-  
+
   // "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": "Agregar metadados e referência aos ficheiros (requer suporte ORE)",
-  
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Agregar apenas metadados",
-  
+
   // "collection.edit.tabs.source.head": "Content Source",
-  "collection.edit.tabs.source.head": "Conteúdo fonte",
-  
+  "collection.edit.tabs.source.head": "Fonte externa",
+
   // "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": "As alterações foram ignoradas. Para regravar as alterações clique no botão ´Voltar'",
-  
-  // "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": "Alterações descartadas",
-  
+
   // "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": "As suas alterações não foram guardadas. Confirme se todos os campos estão válidos antes de guardar.",
-  
+
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
   "collection.edit.tabs.source.notifications.invalid.title": "Metadados inválidos",
-  
+
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "As alterações neta coleção foram guardadas.",
-  
+
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
   "collection.edit.tabs.source.notifications.saved.title": "Conteúdo fonte guardado",
-  
+
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
-  "collection.edit.tabs.source.title": "Editar Coleção - Conteúdo fonte",
-  
-  
-  
+  "collection.edit.tabs.source.title": "Editar coleção - conteúdo fonte",
+
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Adicionar",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
-  "collection.edit.template.breadcrumbs": "Template do Item",
-  
+  "collection.edit.template.breadcrumbs": "Template do item",
+
   // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "Cancelar",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "Apagar",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "Editar",
-  
+
+  // "collection.edit.template.error": "An error occurred retrieving the template item",
+  "collection.edit.template.error": "Ocorreu um erro na recuperação do template do item",
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
-  "collection.edit.template.head": "Editar Modelo do Item para a Coleção \"{{ collection }}\"",
-  
+  "collection.edit.template.head": "Editar template do item para a coleção \"{{ collection }}\"",
+
   // "collection.edit.template.label": "Template item",
-  "collection.edit.template.label": "Modelo do item",
-  
+  "collection.edit.template.label": "Template do item",
+
+  // "collection.edit.template.loading": "Loading template item...",
+  "collection.edit.template.loading": "A carregar o template do item...",
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Erro ao apagar o template do item",
-  
+
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
-  "collection.edit.template.notifications.delete.success": "Template do Item apagado com sucesso",
-  
+  "collection.edit.template.notifications.delete.success": "Template do item apagado com sucesso",
+
   // "collection.edit.template.title": "Edit Template Item",
-  "collection.edit.template.title": "Editar Modelo do Item",
-  
-  
-  
+  "collection.edit.template.title": "Editar template do item",
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Descrição curta",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "Texto introdutório (HTML)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "Por favor indique o nome da coleção",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "Licença",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "Proveniência",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "Texto sobre direitos de autor (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Notícias (HTML)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "Nome",
-  
-  
-  
+
+  // "collection.form.entityType": "Entity Type",
+  "collection.form.entityType": "Tipo de entidade",
+
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Coleção",
-  
-  
-  
+
   // "collection.page.browse.recent.head": "Recent Submissions",
-  "collection.page.browse.recent.head": "Submissões Recentes",
-  
+  "collection.page.browse.recent.head": "Entradas recentes",
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "Nenhum item a exibir",
-  
+
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Editar esta coleção",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
-  "collection.page.handle": "URI Permanente para esta coleção",
-  
+  "collection.page.handle": "URI permanente para esta coleção:",
+
   // "collection.page.license": "License",
   "collection.page.license": "Licença",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Notícias",
-  
-  
-  
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Confirmar seleção",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Nenhuma coleção a mostrar",
-  
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Título",
-  
-  
-  
+
+  // "collection.source.controls.head": "Harvest Controls",
+  "collection.source.controls.head": "Controlos de importação",
+
+  // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
+  "collection.source.controls.test.submit.error": "Algo correu mal ao inicar os testes das configurações",
+
+  // "collection.source.controls.test.failed": "The script to test the settings has failed",
+  "collection.source.controls.test.failed": "O script para testar as configurações falhou!",
+
+  // "collection.source.controls.test.completed": "The script to test the settings has successfully finished",
+  "collection.source.controls.test.completed": "O script para testar as configurações terminou com sucesso!",
+
+  // "collection.source.controls.test.submit": "Test configuration",
+  "collection.source.controls.test.submit": "Configuração de teste",
+
+  // "collection.source.controls.test.running": "Testing configuration...",
+  "collection.source.controls.test.running": "A testar as configurações...",
+
+  // "collection.source.controls.import.submit.success": "The import has been successfully initiated",
+  "collection.source.controls.import.submit.success": "A importação iniciou com sucesso.",
+
+  // "collection.source.controls.import.submit.error": "Something went wrong with initiating the import",
+  "collection.source.controls.import.submit.error": "Algo correu mal ao iniciar a 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": "Importar...",
+
+  // "collection.source.controls.import.failed": "An error occurred during the import",
+  "collection.source.controls.import.failed": "Ocorreu um erro durante a importação",
+
+  // "collection.source.controls.import.completed": "The import completed",
+  "collection.source.controls.import.completed": "A importação encontra-se completa",
+
+  // "collection.source.controls.reset.submit.success": "The reset and reimport has been successfully initiated",
+  "collection.source.controls.reset.submit.success": "A reposição e re-importação iniciou-se com sucesso",
+
+  // "collection.source.controls.reset.submit.error": "Something went wrong with initiating the reset and reimport",
+  "collection.source.controls.reset.submit.error": "Algo correu mal com a reposição e re-importação",
+
+  // "collection.source.controls.reset.failed": "An error occurred during the reset and reimport",
+  "collection.source.controls.reset.failed": "Ocorreu um erro durante a reposição e a re-importação",
+
+  // "collection.source.controls.reset.completed": "The reset and reimport completed",
+  "collection.source.controls.reset.completed": "A reposição e a re-importação encontram-se completas",
+
+  // "collection.source.controls.reset.submit": "Reset and reimport",
+  "collection.source.controls.reset.submit": "Repor e re-importar",
+
+  // "collection.source.controls.reset.running": "Resetting and reimporting...",
+  "collection.source.controls.reset.running": "Repor e re-importar...",
+
+  // "collection.source.controls.harvest.status": "Harvest status:",
+  "collection.source.controls.harvest.status": "Estado da importação:",
+
+  // "collection.source.controls.harvest.start": "Harvest start time:",
+  "collection.source.controls.harvest.start": "Hora de início da importação:",
+
+  // "collection.source.controls.harvest.last": "Last time harvested:",
+  "collection.source.controls.harvest.start": "Hora de fim da importação:",
+
+  // "collection.source.controls.harvest.message": "Harvest info:",
+  "collection.source.controls.harvest.message": "Informação sobre a importação:",
+
+  // "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": "As configurações providenciadas foram testadas mas não funcionam.",
-  
+
   // "collection.source.update.notifications.error.title": "Server Error",
-  "collection.source.update.notifications.error.title": "Erro no Servidor",
-  
-  
-  
-  // "communityList.tabTitle": "DSpace - Community List",
-  "communityList.tabTitle": "DSpace - Lista de Comunidades",
-  
+  "collection.source.update.notifications.error.title": "Erro no servidor",
+
+  // "communityList.breadcrumbs": "Community List",
+  "communityList.breadcrumbs": "Lista de comunidades",
+
+  // "communityList.tabTitle": "Community List",
+  "communityList.tabTitle": "Lista de comunidades",
+
   // "communityList.title": "List of Communities",
-  "communityList.title": "Lista de Comunidades",
-  
+  "communityList.title": "Lista de comunidades",
+
   // "communityList.showMore": "Show More",
-  "communityList.showMore": "Mostrar Mais",
-  
-  
-  
+  "communityList.showMore": "Mostrar mais",
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Criar uma comunidade",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   "community.create.notifications.success": "Comunidade criada com sucesso",
-  
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Criar uma Sub-Comunidade para Comunidade {{ parent }}",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
-  "community.curate.header": "Curar Comunidade: {{community}}",
-  
+  "community.curate.header": "Curar comunidade: {{community}}",
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "Cancelar",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Confirmar",
-  
+
+  // "community.delete.processing": "Deleting...",
+  "community.delete.processing": "A apagar...",
+
   // "community.delete.head": "Delete Community",
-  "community.delete.head": "Apagar Comunidade",
-  
+  "community.delete.head": "Apagar comunidade",
+
   // "community.delete.notification.fail": "Community could not be deleted",
-  "community.delete.notification.fail": "Não foi possível apagar a Comunidade",
-  
+  "community.delete.notification.fail": "Não foi possível apagar a comunidade",
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "Comunidade apagada com sucesso",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "Você tem certeza que quer apagar a comunidade \"{{ dso }}\"?",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Apagar esta comunidade",
-  
+
   // "community.edit.head": "Edit Community",
-  "community.edit.head": "Editar Comunidade",
-  
+  "community.edit.head": "Editar comunidade",
+
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Editar Comunidade",
-  
-  
+
+  // "community.edit.logo.delete.title": "Delete logo",
+  "community.edit.logo.delete.title": "Apagar logótipo",
+
+  // "community.edit.logo.delete-undo.title": "Undo delete",
+  "community.edit.logo.delete-undo.title": "Não apagar logótipo",
+
   // "community.edit.logo.label": "Community logo",
-  "community.edit.logo.label": "Logo da Comunidade",
-  
+  "community.edit.logo.label": "Logótipo da comunidade",
+
   // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
-  "community.edit.logo.notifications.add.error": "Falha ao carregar o logotipo da comunidade. Verifique o conteúdo antes de tentar de novo.",
-  
+  "community.edit.logo.notifications.add.error": "Falha ao carregar o logótipo da comunidade. Verifique o conteúdo antes de tentar de novo.",
+
   // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
-  "community.edit.logo.notifications.add.success": "Logotipo da comunindade carregado com sucesso.",
-  
+  "community.edit.logo.notifications.add.success": "Logótipo da comunindade carregado com sucesso.",
+
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
-  "community.edit.logo.notifications.delete.success.title": "Logotipo apagado",
-  
+  "community.edit.logo.notifications.delete.success.title": "Logótipo apagado",
+
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
-  "community.edit.logo.notifications.delete.success.content": "O logotipo da comuindade foi apagado com sucesso",
-  
+  "community.edit.logo.notifications.delete.success.content": "O logótipo da comuindade foi apagado com sucesso",
+
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  "community.edit.logo.notifications.delete.error.title": "Erro ao apagar o logotipo",
-  
+  "community.edit.logo.notifications.delete.error.title": "Erro ao apagar o logótipo",
+
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
-  "community.edit.logo.upload": "Arraste um logotipo da comunidade para carregar",
-  
-  
-  
+  "community.edit.logo.upload": "Arraste um logótipo da comunidade para carregar",
+
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Comunidade editada com sucesso",
-  
+
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Não tem os privilégios necessários para efetuar esta alteração",
-  
+
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Ocorreu um erro ao editar a comunidade",
-  
-  // "community.edit.return": "Return",
+
+  // "community.edit.return": "Back",
   "community.edit.return": "Voltar",
-  
-  
-  
+
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Curadoria",
-  
+
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
-  "community.edit.tabs.curate.title": "Editar Comunidade - Curadoria",
-  
+  "community.edit.tabs.curate.title": "Editar comunidade - curadoria",
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
-  "community.edit.tabs.metadata.head": "Editar Metadados",
-  
+  "community.edit.tabs.metadata.head": "Editar metadados",
+
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
-  "community.edit.tabs.metadata.title": "Editar Comunidade - Metadados",
-  
+  "community.edit.tabs.metadata.title": "Editar comunidade - metadados",
+
   // "community.edit.tabs.roles.head": "Assign Roles",
-  "community.edit.tabs.roles.head": "Atribuir Papéis",
-  
+  "community.edit.tabs.roles.head": "Atribuir perfis",
+
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
-  "community.edit.tabs.roles.title": "Editar Comunidade - Papéis",
-  
+  "community.edit.tabs.roles.title": "Editar comunidade - perfis",
+
   // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "Autorizações",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  "community.edit.tabs.authorizations.title": "Editar Comunidade - Autorizações",
-  
-  
-  
+  "community.edit.tabs.authorizations.title": "Editar comunidade - autorizações",
+
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Comunidade",
-  
-  
-  
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Nenhum",
-  
+
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "Criar",
-  
+
+  // "comcol-role.edit.create.error.title": "Failed to create a group for the '{{ role }}' role",
+  "comcol-role.edit.create.error.title": "Falha na criação de um grupo para o perfil '{{ role }}'",
+
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "Restrito",
-  
+
   // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "Apagar",
-  
-  
+
+  // "comcol-role.edit.delete.error.title": "Failed to delete the '{{ role }}' role's group",
+  "comcol-role.edit.delete.error.title": "Falha na remoção do '{{ role }}' nos perfis do grupo",
+
   // "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": "Os administradores de Comunidade podem criar sub-comunidades e coleções, assim como gerir ou delegar a gestão dessas sub-comunidade ou coleções. Além disso, decidem quem pode submeter itens em qualquer coleção, editar metadados (após submissão), e mapear itens de outras coleções (sujeito a autorização).",
-  
+  "comcol-role.edit.community-admin.description": "Os 'Administradores de comunidades' podem criar 'sub-comunidades' e/ou 'coleções', podem também gerir ou delegar a gestão dessas 'sub-comunidade' ou 'coleções'. Adicionalmente, decidem quem pode depositar itens em coleções, editar metadados (após o depósito) e mapear itens de outras coleções (sujeito a autorização).",
+
   // "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": "Os administradores de coleção decidem quem pode submeter itens a uma coleção, editar metadados (após submissão), e mapear itens de outras coleções (sujeito a autorização para essa coleção).",
-  
-  
+  "comcol-role.edit.collection-admin.description": "Os 'Administradores de coleção' decidem quem pode depositar itens a uma coleção, editar metadados (após o depósito), e mapear itens de outras coleções (sujeito a autorização para essa coleção).",
+
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Depositantes",
-  
+
   // "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": "Os Utilizadores e Grupos que possuem permissões de depósito nesta coleção.",
-  
-  
+  "comcol-role.edit.submitters.description": "Os 'Utilizadores' e 'Grupos' que possuem permissões de depósito nesta coleção.",
+
   // "comcol-role.edit.item_read.name": "Default item read access",
-  "comcol-role.edit.item_read.name": "acesso de Leitura Padrão ao item", 
-  
+  "comcol-role.edit.item_read.name": "Acesso de leitura ao item predefinido (DEFAULT_ITEM_READ)",
+
   // "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": "Utilizadores e Grupos que podem ver itens submetidos nesta coleção. As alterações a este papel não são retroativas. Os itens existentes no sistema ainda poderão ser vistos por aqueles que tiveram acesso de leitura no momento de sua adição.",
-  
+  "comcol-role.edit.item_read.description": "'Utilizadores' e 'Grupos' que podem ver itens depositados nesta coleção. As alterações feitas a este papel não são retroativas. Os itens existentes no sistema ainda poderão ser vistos por aqueles que tiveram acesso de leitura no momento da sua adição.",
+
   // "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 definição de Leitura padrão de novos itens está definida para Utilizadores Anónimos.",
-  
-  
+  "comcol-role.edit.item_read.anonymous-group": "A leitura de novos itens (Item Read) está predefinida para utilizadores anónimos.",
+
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
-  "comcol-role.edit.bitstream_read.name": "Leitura padrão de ficheiros",
-  
+  "comcol-role.edit.bitstream_read.name": "Leitura predefinida de ficheiros (DEFAULT_BITSTREAM_READ)",
+
   // "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 Comunidade podem criar sub-comunidades e coleções, assim como gerir ou delegar a gestão dessas sub-comunidade ou coleções. Além disso, decidem quem pode submeter itens em qualquer coleção, editar metadados (após submissão), e mapear itens de outras coleções (sujeito a autorização).",
-  
+  "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).",
+
   // "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 definição de Leitura padrão de novos ficheiros está definida para Utilizadores Anónimos.",
-  
-  
+  "comcol-role.edit.bitstream_read.anonymous-group": "A leitura de novos ficheiros (Bitstream Read) está predefinida para utilizadores anónimos.",
+
   // "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": "Os Editores podem editar os metadados, e depois aceitar ou rejeitar as submissões.",
-  
-  
+  "comcol-role.edit.editor.description": "Os 'Editores' podem aceitar ou rejeitar os depósitos e podem editar os seus metadados.",
+
   // "comcol-role.edit.finaleditor.name": "Final editors",
-  "comcol-role.edit.finaleditor.name": "Editores Finais",
-  
+  "comcol-role.edit.finaleditor.name": "Validadores 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": "Os Editores Finais podem editar os metadados de uma submissão, mas não os podem rejeitar.",
-  
-  
+  "comcol-role.edit.finaleditor.description": "Os 'Validadores finais' podem editar os metadados de um depósito, mas não os podem rejeitar.",
+
   // "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": "Os Revisores podem aceitar ou rejeitar as submissões enviadas. Contudo, não podem editar os metadados das submissões.",
-  
-  
-  
+  "comcol-role.edit.reviewer.description": "Os 'Revisores' podem aceitar ou rejeitar os depósitos, mas não podem editar os seus metadados.",
+
+  // "comcol-role.edit.scorereviewers.name": "Score Reviewers",
+  "comcol-role.edit.scorereviewers.name": "Pontuar revisores",
+
+  // "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": "Os 'Revisores' podem dar uma pontuação aos depósitos recebidos, isto irá determinar se o depósito será rejeitado ou não.",
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Descrição curta",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "Texto introdutório (HTML)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "Por favor indique um nome para a comunidade",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
-  "community.form.rights": "Texto de direito de cópia (HTML)",
-  
+  "community.form.rights": "Texto de Copyright (HTML)",
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Notícias (HTML)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "Nome",
-  
+
   // "community.page.edit": "Edit this community",
   "community.page.edit": "Editar esta comunidade",
-  
+
   // "community.page.handle": "Permanent URI for this community",
-  "community.page.handle": "URI Permanente desta comunidade",
-  
+  "community.page.handle": "URI permanente desta comunidade:",
+
   // "community.page.license": "License",
   "community.page.license": "Licença",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Notícias",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
-  "community.all-lists.head": "Sub-Comunidade e Coleções",
-  
+  "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": "Coleções desta comunidade",
+
   // "community.sub-community-list.head": "Communities of this Community",
-  "community.sub-community-list.head": "Comunidades desta Comunidade",
-  
-  
-  
+  "community.sub-community-list.head": "Comunidades desta comunidade",
+
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Aceitar todos",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   "cookies.consent.accept-selected": "Aceitar selecionados",
-  
+
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
   "cookies.consent.app.opt-out.description": "Esta aplicação é carregada por padrão (mas pode excluí-la)",
-  
+
   // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(excluir)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   "cookies.consent.app.purpose": "propósito",
-  
+
   // "cookies.consent.app.required.description": "This application is always required",
   "cookies.consent.app.required.description": "Esta aplicação é sempre necessária",
-  
+
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(sempre necessária)",
-  
+
+  // "cookies.consent.app.disable-all.description": "Use this switch to enable or disable all services.",
+  "cookies.consent.app.disable-all.description": "Utilize este interruptor para ativar ou desativar todos os serviços.",
+
+  // "cookies.consent.app.disable-all.title": "Enable or disable all services",
+  "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": "Existem alterações desde a sua última visita, atualize o seu consentimento.",
-  
+
   // "cookies.consent.close": "Close",
   "cookies.consent.close": "Fechar",
-  
+
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Rejeitar",
-  
+
+  // "cookies.consent.ok": "That's ok",
+  "cookies.consent.ok": "Concordo",
+
+  // "cookies.consent.save": "Save",
+  "cookies.consent.save": "Guardar",
+
+  // "cookies.consent.content-notice.title": "Cookie Consent",
+  "cookies.consent.content-notice.title": "Consentir 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 informação pessoal para os seguintes propósitos: <strong>Autenticação, Guardar Preferências, Termos de Uso e Estatísticas</strong>. <br/> To learn more, please read our {privacyPolicy}.",
-  
+  "cookies.consent.content-notice.description": "Recolhemos e processamos informação pessoal para os seguintes propósitos: <strong>Autenticação, Guardar Preferências, Termos de Uso e Estatísticas</strong>. <br/> Para saber mais, por favor leia a nossa {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": "Recolhemos e processamos as suas informações pessoais para os seguintes fins: <strong>Autenticação, Preferências, Reconhecimento e Estatísticas</strong>.",
+
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Pesonalizar",
-  
+
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
-  "cookies.consent.content-modal.description": "Aqui pode ver e personalizar a informação pessoal que coletamos sobre si.",
-  
+  "cookies.consent.content-modal.description": "Aqui pode ver e personalizar a informação pessoal que recolhemos sobre si.",
+
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
   "cookies.consent.content-modal.privacy-policy.name": "política de privacidade",
-  
+
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Para saber mais, leia a {privacyPolicy}.",
-  
+
   // "cookies.consent.content-modal.title": "Information that we collect",
-  "cookies.consent.content-modal.title": "Informação que coletamos",
-  
-  
-  
+  "cookies.consent.content-modal.title": "Informação que recolhemos",
+
+  // "cookies.consent.content-modal.services": "services",
+  "cookies.consent.content-modal.services": "serviços",
+
+  // "cookies.consent.content-modal.service": "service",
+  "cookies.consent.content-modal.service": "serviço",
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Autenticação",
-  
+
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Obrigatório para iniciar sessão",
-  
-  
+
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Preferências",
-  
+
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Obrigatório para guardar as suas preferências",
-  
-  
-  
+
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Termos de Uso",
-  
+
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
-  "cookies.consent.app.description.acknowledgement": "Requerido para guardar os Termos de uso e Consentimento",
-  
-  
-  
+  "cookies.consent.app.description.acknowledgement": "Obrigatório para guardar os nossos 'Termos de Uso' e 'Consentimentos'",
+
   // "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": "Permite-nos rastrear dados estatí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 o serviço Google reCAPTCHA durante o registo e recuperação de palavra-passe",
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Funcional",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "Estatísticos",
-  
-  
-  // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Verifica ligações nos metadados",
-  
+
+  // "cookies.consent.purpose.registration-password-recovery": "Registration and Password recovery",
+  "cookies.consent.purpose.registration-password-recovery": "Registo e recuperação de senha",
+
+  // "cookies.consent.purpose.sharing": "Sharing",
+  "cookies.consent.purpose.sharing": "Partilha",
+
+  // "curation-task.task.citationpage.label": "Generate Citation Page",
+  "curation-task.task.citationpage.label": "Gerar página de citações",
+
+  // "curation-task.task.checklinks.label": "Check Links in Metadata",
+  "curation-task.task.checklinks.label": "Verifica ligações nos metadados",
+
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
-  
+
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
-  "curation-task.task.profileformats.label": "Perfil dos Formatos de Ficheiro",
-  
+  "curation-task.task.profileformats.label": "Perfil dos formatos de ficheiro",
+
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "Verifica metadados obrigatórios",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "Tradutor Microsoft",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
-  "curation-task.task.vscan.label": "Scan de Vírus",
-  
-  
-  
+  "curation-task.task.vscan.label": "Scan de vírus",
+
+  // "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:",
-  
+
   // "curation.form.submit": "Start",
-  "curation.form.submit": "Início",
-  
+  "curation.form.submit": "Iniciar",
+
   // "curation.form.submit.success.head": "The curation task has been started successfully",
   "curation.form.submit.success.head": "A tarefa de curadoria iniciou com sucesso",
-  
+
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "Será redirecionado para a página correspondente ao processo.",
-  
+
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Falha ao executar a tarefa de curadoria",
-  
+
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Ocorreu um erro ao tentar iniciar a tarefa de curadoria.",
-  
+
+  // "curation.form.submit.error.invalid-handle": "Couldn't determine the handle for this object",
+  "curation.form.submit.error.invalid-handle": "Não foi possível determinar o handle para este objecto",
+
   // "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": "Dica: Introduza [o-seu-prefixo-handle]/0 para executar a tarefa em todo o repositório (nem todas as tarefas são compatíveis com esta opção)",
-  
-  
-  
+
+  // "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": "Caro {{ recipientName }}, Em resposta ao seu pedido, lamento informá-lo que não me é possível enviar-lhe uma cópia do(s) Ficheiro(s) que solicitou, relativamente ao documento: \"{{ itemUrl }}\" ({{ itemName }}), do qual sou autor.\n\n Com os melhores cumprimentos,\n {{ authorName }} <{{ authorEmail }}>",
+
+  // "deny-request-copy.email.subject": "Request copy of document",
+  "deny-request-copy.email.subject": "Solicitar cópia ao autor",
+
+  // "deny-request-copy.error": "An error occurred",
+  "deny-request-copy.error": "Ocorreu um erro!",
+
+  // "deny-request-copy.header": "Deny document copy request",
+  "deny-request-copy.header": "Declinar o pedido de cópia",
+
+  // "deny-request-copy.intro": "This message will be sent to the applicant of the request",
+  "deny-request-copy.intro": "Esta será a mensagem enviada ao requerente do pediodo de cópia:",
+
+  // "deny-request-copy.success": "Successfully denied item request",
+  "deny-request-copy.success": "Pedido de cópia recusado com sucesso!",
+
+  // "dso.name.untitled": "Untitled",
+  "dso.name.untitled": "Sem título",
+
+  // "dso.name.unnamed": "Unnamed",
+  "dso.name.unnamed": "Sem nome",
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Nova coleção",
-  
+
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "Criar nova coleção em",
-  
+
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Nova comunidade",
-  
+
+  // "dso-selector.create.community.or-divider": "or",
+  "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",
-  
+
   // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "Criar uma nova comunidade no nível superior",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Novo item",
-  
+
   // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "Criar um novo item em",
-  
+
   // "dso-selector.create.submission.head": "New submission",
-  "dso-selector.create.submission.head": "Nova submissão",
-  
+  "dso-selector.create.submission.head": "Novo depósito",
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Editar coleção",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "Editar comunidade",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Editar item",
-  
+
+  // "dso-selector.error.title": "An error occurred searching for a {{ type }}",
+  "dso-selector.error.title": "Ocorreu um erro ao procurar por um(a) {{ type }}",
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
-  "dso-selector.export-metadata.dspaceobject.head": "Exportar metadados de ",
-  
+  "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": "Exportar lote (ZIP) de",
+
+  // "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",
   "dso-selector.no-results": "Nenhum(a) {{ type }} encontrado(a)",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": "Pesquisar por um(a) {{ type }}",
-  
-  
-  
+
+  // "dso-selector.select.collection.head": "Select a collection",
+  "dso-selector.select.collection.head": "Selecione uma coleção",
+
+  // "dso-selector.set-scope.community.head": "Select a search scope",
+  "dso-selector.set-scope.community.head": "Selecione uma pesquisa",
+
+  // "dso-selector.set-scope.community.button": "Search all of DSpace",
+  "dso-selector.set-scope.community.button": "Pesquisar todo o repositório",
+
+  // "dso-selector.set-scope.community.or-divider": "or",
+  "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 por uma comunidade ou coleção",
+
+  // "dso-selector.claim.item.head": "Profile tips",
+  "dso-selector.claim.item.head": "Dicas de Perfil",
+
+  // "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": "Estes são os perfis existentes que poderão estar relacionados consigo. Se se identificar num destes perfis, selecione-o e na página de detalhes, entre as opções, pode reivindicá-lo. Caso contrário, pode criar um novo perfil de raiz, selecionando o botão em baixo.",
+
+  // "dso-selector.claim.item.not-mine-label": "None of these are mine",
+  "dso-selector.claim.item.not-mine-label": "Nenhum destes é meu",
+
+  // "dso-selector.claim.item.create-from-scratch": "Create a new one",
+  "dso-selector.claim.item.create-from-scratch": "Criar novo",
+
+  // "dso-selector.results-could-not-be-retrieved": "Something went wrong, please refresh again",
+  "dso-selector.results-could-not-be-retrieved": "Algo correu mal, por favor repita",
+
+  // "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.header": "Seletor de grupos de supervisão",
+
+  // "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.label": "Selecione um tipo de ordem",
+
+  // "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.none": "NENHUM",
+
+  // "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": "OBSERVADOR",
+
+  // "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.select.group.label": "Selecionar um grupo",
+
+  // "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.cancel": "Cancelar",
+
+  // "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.button.save": "Guardar",
+
+  // "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.type-of-order.error": "Por favor, selecione um tipo de ordem",
+
+  // "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.select.group.error": "Por favor selecione um grupo",
+
+  // "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "supervision-group-selector.notification.create.success.title": "Criada com sucesso ordem de supervisão para o grupo {{ name }}",
+
+  // "supervision-group-selector.notification.create.failure.title": "Error",
+  "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",
+  "supervision-group-selector.notification.create.already-existing": "Já existe uma ordem de supervisão sobre este item para grupo selecionado",
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportar metadados para {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "Pretende exportar metadados para {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "Cancelar",
-  
+
   // "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": "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": "Tem a certeza que quer exportar lote (ZIP) para {{ dsoName }}",
+
+  // "confirmation-modal.export-batch.cancel": "Cancel",
+  "confirmation-modal.export-batch.cancel": "Cancelar",
+
+  // "confirmation-modal.export-batch.confirm": "Export",
+  "confirmation-modal.export-batch.confirm": "Exportar",
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "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",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Apagar",
-  
-  
+
+  // "confirmation-modal.delete-profile.header": "Delete Profile",
+  "confirmation-modal.delete-profile.header": "Apagar perfil",
+
+  // "confirmation-modal.delete-profile.info": "Are you sure you want to delete your profile",
+  "confirmation-modal.delete-profile.info": "Tem certeza que pretende apagar o seu perfil",
+
+  // "confirmation-modal.delete-profile.cancel": "Cancel",
+  "confirmation-modal.delete-profile.cancel": "Cancelar",
+
+  // "confirmation-modal.delete-profile.confirm": "Delete",
+  "confirmation-modal.delete-profile.confirm": "Apagar",
+
+  // "confirmation-modal.delete-subscription.header": "Delete Subscription",
+  "confirmation-modal.delete-subscription.header": "Apagar subscrição",
+
+  // "confirmation-modal.delete-subscription.info": "Are you sure you want to delete subscription for \"{{ dsoName }}\"",
+  "confirmation-modal.delete-subscription.info": "Tem a certeza de que pretende apagar a subscrição de \"{{ dsoName }}\"",
+
+  // "confirmation-modal.delete-subscription.cancel": "Cancel",
+  "confirmation-modal.delete-subscription.cancel": "Cancelar",
+
+  // "confirmation-modal.delete-subscription.confirm": "Delete",
+  "confirmation-modal.delete-subscription.confirm": "Apagar",
+
   // "error.bitstream": "Error fetching bitstream",
-  "error.bitstream": "Erro ao aceder ao ficheiro",
-  
+  "error.bitstream": "Erro ao aceder ao ficheiro!",
+
   // "error.browse-by": "Error fetching items",
-  "error.browse-by": "Erro ao carregar itens",
-  
+  "error.browse-by": "Erro ao carregar itens!",
+
   // "error.collection": "Error fetching collection",
-  "error.collection": "Erro ao carregar coleção",
-  
+  "error.collection": "Erro ao carregar coleção!",
+
   // "error.collections": "Error fetching collections",
-  "error.collections": "Erro ao carregar coleções",
-  
+  "error.collections": "Erro ao carregar coleções!",
+
   // "error.community": "Error fetching community",
-  "error.community": "Erro ao carregar comunidade",
-  
+  "error.community": "Erro ao carregar comunidade!",
+
   // "error.identifier": "No item found for the identifier",
-  "error.identifier": "Nenhum item encontrado para o identificador",
-  
+  "error.identifier": "Nenhum item encontrado para o identificador!",
+
   // "error.default": "Error",
-  "error.default": "Erro",
-  
+  "error.default": "Erro!",
+
   // "error.item": "Error fetching item",
-  "error.item": "Erro ao carregar item",
-  
+  "error.item": "Erro ao carregar item!",
+
   // "error.items": "Error fetching items",
-  "error.items": "Erro ao carregar itens",
-  
+  "error.items": "Erro ao carregar itens!",
+
   // "error.objects": "Error fetching objects",
-  "error.objects": "Erro ao carregar objetos",
-  
+  "error.objects": "Erro ao carregar objetos!",
+
   // "error.recent-submissions": "Error fetching recent submissions",
-  "error.recent-submissions": "Erro ao carregar as submissões recentes",
-  
+  "error.recent-submissions": "Erro ao carregar depósitos recentes!",
+
   // "error.search-results": "Error fetching search results",
-  "error.search-results": "Erro ao carregar os resultados da pesquisa",
-  
+  "error.search-results": "Erro ao carregar os resultados da pesquisa!",
+
+  // "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 query da pesquisa não é válida! Por favor verifique <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.sub-collections": "Error fetching sub-collections",
-  "error.sub-collections": "Erro ao carregar sub-coleções",
-  
+  "error.sub-collections": "Erro ao carregar sub-coleções!",
+
   // "error.sub-communities": "Error fetching sub-communities",
-  "error.sub-communities": "Erro ao carregar sub-comunidade",
-  
+  "error.sub-communities": "Erro ao carregar sub-comunidade!",
+
   // "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": "Ocorreu um erro durante a Secção de inicialização, por favor verifique sua configuração de input-form. Detalhes estão abaixo : <br> <br>",
-  
+  "error.submission.sections.init-form-error": "Ocorreu um erro durante a seção de inicialização, por favor verifique sua configuração de 'input-form'. Detalhes estão abaixo : <br> <br>",
+
   // "error.top-level-communities": "Error fetching top-level communities",
-  "error.top-level-communities": "Erro ao carregar as comunidade de nível superior",
-  
+  "error.top-level-communities": "Erro ao carregar as comunidade de nível superior!",
+
   // "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": "Você deve concordar com esta licença para completar sua submissão. Se vocẽ não estiver de acordo com esta licença neste momento você pode salvar seu trabalho para continuar depois ou remover a submissão.",
-  
+  "error.validation.license.notgranted": "Deve concordar com esta licença para completar o depósito. Se não estiver de acordo com a licença ou pretende ponderar, pode guardar este trabalho e retomar posteriormente, ou remover definitivamente este depósito.",
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Este campo está restrito ao seguinte padrão: {{ pattern }}.",
-  
+
   // "error.validation.filerequired": "The file upload is mandatory",
-  "error.validation.filerequired": "O carregamento de ficheiros é obrigatório",
-  
-  
-  
+  "error.validation.filerequired": "O carregamento de ficheiros é obrigatório!",
+
+  // "error.validation.required": "This field is required",
+  "error.validation.required": "Este campo é de preenchimento obrigatório!",
+
+  // "error.validation.NotValidEmail": "This E-mail is not a valid email",
+  "error.validation.NotValidEmail": "Este endereço de correio electrónico não é válido!",
+
+  // "error.validation.emailTaken": "This E-mail is already taken",
+  "error.validation.emailTaken": "Este endereço de correio electrónico já se encontra atribuido!",
+
+  // "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",
+
+  // "error.validation.metadata.name.max-length": "This field may not contain more than 32 characters",
+  "error.validation.metadata.name.max-length": "Este campo não pode conter mais 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 não pode 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",
+  "error.validation.metadata.element.invalid-pattern": "Este campo não pode conter pontos, vírgulas ou espaços. Ao invés, utilize o campo 'Qualificador'",
+
+  // "error.validation.metadata.element.max-length": "This field may not contain more than 64 characters",
+  "error.validation.metadata.element.max-length": "Este campo não pode conter mais de 64 caracteres",
+
+  // "error.validation.metadata.qualifier.invalid-pattern": "This field cannot contain dots, commas or spaces",
+  "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",
+  "error.validation.metadata.qualifier.max-length": "Este campo não pode conter mais de 64 caracteres.",
+
+  // "feed.description": "Syndication feed",
+  "feed.description": "Feed",
+
   // "file-section.error.header": "Error obtaining files for this item",
-  "file-section.error.header": "Erro ao obter ficheiros para este item",
-  
-  
-  
+  "file-section.error.header": "Erro na obteção de ficheiros para este item!",
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
-  "footer.copyright": "copyright © 2002-{{ year }}",
-  
+  "footer.copyright": "Copyright © 2003-{{ year }}",
+
   // "footer.link.dspace": "DSpace software",
-  "footer.link.dspace": "Software DSpace",
-  
+  "footer.link.dspace": "Powered by DSpace",
+
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   "footer.link.cookies": "Configurações de Cookies",
-  
+
   // "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":"Termos de uso",
-  
-  
-  
+
+  // "footer.link.end-user-agreement": "End User Agreement",
+  "footer.link.end-user-agreement": "Termos de Uso",
+
+  // "footer.link.feedback": "Send Feedback",
+  "footer.link.feedback": "Contacte-nos",
+
   // "forgot-email.form.header": "Forgot Password",
-  "forgot-email.form.header": "Esqueci a palavra-chave",
-  
-  // "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": "Registe-se para subscrever notificações de novos itens nas coleções por email assim como submeter itens no repositório.",
-  
+  "forgot-email.form.header": "Esqueci a senha",
+
+  // "forgot-email.form.info": "Enter the email address associated with the account.",
+  "forgot-email.form.info": "Caso tenha esquecido a sua senha de acesso poderá recuperá-la, para o efeito basta introduzir em baixo o seu endereço de correio electrónico associado.",
+
   // "forgot-email.form.email": "Email Address *",
-  "forgot-email.form.email": "Endereço Eletrónico *",
-  
+  "forgot-email.form.email": "Endereço de correio eletrónico *",
+
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Indique um endereço de correio eletrónico",
-  
-  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
-  "forgot-email.form.email.error.pattern": "Indique um endereço de correio eletrónico válido",
-  
-  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
-  "forgot-email.form.email.hint": "Este endereço de correio eletrónico será validado e usado como o seu nome de Utilizador para autenticação.",
-  
-  // "forgot-email.form.submit": "Submit",
-  "forgot-email.form.submit": "Guardar",
-  
-  // "forgot-email.form.success.head": "Verification email sent",
-  "forgot-email.form.success.head": "Email de Confirmação enviado",
-  
+
+  // "forgot-email.form.email.error.not-email-form": "Please fill in a valid email address",
+  "forgot-email.form.email.error.not-email-form": "Indique um endereço de correio eletrónico válido",
+
+  // "forgot-email.form.email.hint": "An email will be sent to this address with a further instructions.",
+  "forgot-email.form.email.hint": "Será enviada uma mensagem para este endereço de correio electrónico com mais instruções",
+
+  // "forgot-email.form.submit": "Reset password",
+  "forgot-email.form.submit": "Repor senha de acesso",
+
+  // "forgot-email.form.success.head": "Password reset email sent",
+  "forgot-email.form.success.head": "Foi enviada mensagem para redefinição da senha de acesso",
+
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
-  "forgot-email.form.success.content": "Foi enviado uma mensagem para {{ email }} com instruções e um endereço de validação da sua conta de Utilizador.",
-  
-  // "forgot-email.form.error.head": "Error when trying to register email",
-  "forgot-email.form.error.head": "Erro ao tentar registar este email",
-  
-  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
-  "forgot-email.form.error.content": "Ocorreu um erro ao tentar registar o seguinte endereço de correio eletrónico: {{ email }}",
-  
-  
-  
+  "forgot-email.form.success.content": "Foi enviado uma mensagem para {{ email }} com instruções e um endereço para validação da sua conta de utilizador.",
+
+  // "forgot-email.form.error.head": "Error when trying to reset password",
+  "forgot-email.form.error.head": "Ocorreu um erro ao tentar redefinir a senha de acesso",
+
+  // "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": "Ocorreu um erro ao tentar redefinir a senha de acesso da conta associada com o seguinte endereço de email: {{ email }}",
+
   // "forgot-password.title": "Forgot Password",
-  "forgot-password.title": "Esqueci a palavra-chave",
-  
+  "forgot-password.title": "Esqueci a senha de acesso",
+
   // "forgot-password.form.head": "Forgot Password",
-  "forgot-password.form.head": "Esqueci a palavra-chave",
-  
-  // "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": "Introduza uma nova palavra-chave na caixa abaixo, e depois confirme introduzindo de novo na segunda caixa. Deverá ter pelo menos 6 caracteres.",
-  
+  "forgot-password.form.head": "Esqueci a Senha de acesso",
+
+  // "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": "Introduza uma nova senha na caixa em baixo, e depois confirme introduzindo de novo na segunda caixa. Deverá ter pelo menos 6 caracteres.",
+
   // "forgot-password.form.card.security": "Security",
-  "forgot-password.form.card.security": "Segurança",
-  
+  "forgot-password.form.card.security": "Senha de acesso",
+
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "Identificação",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
-  "forgot-password.form.identification.email": "Endereço eletrónico: ",
-  
+  "forgot-password.form.identification.email": "Endereço de correio eletrónico: ",
+
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Palavra-chave",
-  
+
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
-  "forgot-password.form.label.passwordrepeat": "Digite novamente para confirmar",
-  
+  "forgot-password.form.label.passwordrepeat": "Insira a senha novamente para confirmar",
+
   // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
-  "forgot-password.form.error.empty-password": "Indique uma palavra-chave na caixa abaixo.",
-  
+  "forgot-password.form.error.empty-password": "Indique uma senha na caixa abaixo.",
+
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
-  "forgot-password.form.error.matching-passwords": "As palavras-chave não coincidem.",
-  
-  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
-  "forgot-password.form.error.password-length": "A palavra-chave deve ter pelo menos 6 caracteres.",
-  
+  "forgot-password.form.error.matching-passwords": "As palavras de acesso não coincidem.",
+
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
-  "forgot-password.form.notification.error.title": "Erro ao submeter nova palavra-chave",
-  
+  "forgot-password.form.notification.error.title": "Erro ao submeter nova senha de acesso",
+
   // "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": "A recuperação da palavra-chave foi efetuada com sucesso. Foi iniciada sessão com o Utilizador criado.",
-  
+  "forgot-password.form.notification.success.content": "A recuperação da senha foi efetuada com sucesso. Foi iniciada sessão com o utilizador criado.",
+
   // "forgot-password.form.notification.success.title": "Password reset completed",
-  "forgot-password.form.notification.success.title": "recuperação da palavra-chave efetuada com sucesso",
-  
+  "forgot-password.form.notification.success.title": "Recuperação da senha efetuada com sucesso",
+
   // "forgot-password.form.submit": "Submit password",
-  "forgot-password.form.submit": "Enviar palavra-chave",
-  
-  
-  
-  // "form.add": "Add",
-  "form.add": "Adicionar",
-  
+  "forgot-password.form.submit": "Enviar senha",
+
+  // "form.add": "Add more",
+  "form.add": "Adicionar mais",
+
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "Clique aqui para submeter esta entrada e adicionar uma nova",
-  
+
   // "form.cancel": "Cancel",
   "form.cancel": "Cancelar",
-  
+
   // "form.clear": "Clear",
   "form.clear": "Limpar",
-  
+
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Clique aqui para apagar o valor selecionado",
-  
+
+  // "form.discard": "Discard",
+  "form.discard": "Cancelar",
+
+  // "form.drag": "Drag",
+  "form.drag": "Arrastar",
+
   // "form.edit": "Edit",
   "form.edit": "Editar",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "Clique aqui para editar o valor selecionado",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "Primeiro nome",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Esconder",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Clique aqui para esconder",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "Expandir",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "Clique aqui para expandir e adicionar mais elementos",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "Último nome",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "Carregando...",
-  
+
   // "form.lookup": "Lookup",
   "form.lookup": "Consulta",
-  
+
   // "form.lookup-help": "Click here to look up an existing relation",
-  "form.lookup-help": "Clique para consultar as relações existentes",
-  
+  "form.lookup-help": "Clique aqui para consultar relações existentes",
+
   // "form.no-results": "No results found",
   "form.no-results": "Nenhum resultado encontrado",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Nenhum valor informado",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
+
+  // "form.other-information.email": "Email",
+  "form.other-information.email": "Email",
+
+  // "form.other-information.first-name": "First Name",
+  "form.other-information.first-name": "Nome",
+
+  // "form.other-information.insolr": "In Solr Index",
+  "form.other-information.insolr": "No índice SOLR",
+
+  // "form.other-information.institution": "Institution",
+  "form.other-information.institution": "Instituição",
+
+  // "form.other-information.last-name": "Last Name",
+  "form.other-information.last-name": "Apelido",
+
+  // "form.other-information.orcid": "ORCID",
+  "form.other-information.orcid": "ORCID",
+
   // "form.remove": "Remove",
   "form.remove": "Apagar",
-  
+
   // "form.save": "Save",
-  "form.save": "Salvar",
-  
+  "form.save": "Guardar",
+
   // "form.save-help": "Save changes",
-  "form.save-help": "Salvar alterações",
-  
+  "form.save-help": "Guardar alterações",
+
   // "form.search": "Search",
   "form.search": "Pesquisar",
-  
+
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Clique aqui para procurar por uma correspondência",
-  
-  // "form.submit": "Submit",
+
+  // "form.submit": "Save",
   "form.submit": "Guardar",
-  
-  
-  
+
+  // "form.create": "Create",
+  "form.create": "Criar",
+
+  // "form.repeatable.sort.tip": "Drop the item in the new position",
+  "form.repeatable.sort.tip": "Largue o item na nova posição",
+
+  // "grant-deny-request-copy.deny": "Don't send copy",
+  "grant-deny-request-copy.deny": "Não enviar cópia",
+
+  // "grant-deny-request-copy.email.back": "Back",
+  "grant-deny-request-copy.email.back": "Voltar",
+
+  // "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 insira uma mensagem",
+
+  // "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": "Pode aproveitar esta ocasião para reconsiderar o tipo acesso atualmente associado ao documento, para evitar ter que responder a este tipo de pedidos. Se quiser retirar a restrição de acesso/embargo do documento, por favor preencha a seguinte caixa.",
+
+  // "grant-deny-request-copy.email.permissions.label": "Change to open access",
+  "grant-deny-request-copy.email.permissions.label": "Mudar para acesso aberto",
+
+  // "grant-deny-request-copy.email.send": "Send",
+  "grant-deny-request-copy.email.send": "Enviar",
+
+  // "grant-deny-request-copy.email.subject": "Subject",
+  "grant-deny-request-copy.email.subject": "Assunto:",
+
+  // "grant-deny-request-copy.email.subject.empty": "Please enter a subject",
+  "grant-deny-request-copy.email.subject.empty": "Por favor, introduza o assunto",
+
+  // "grant-deny-request-copy.grant": "Send copy",
+  "grant-deny-request-copy.grant": "Enviar cópia",
+
+  // "grant-deny-request-copy.header": "Document copy request",
+  "grant-deny-request-copy.header": "Pedido de cópia",
+
+  // "grant-deny-request-copy.home-page": "Take me to the home page",
+  "grant-deny-request-copy.home-page": "Voltar para página inicial",
+
+  // "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": "Se não é um dos autores do documento  <a href='{{ url }}'>{{ name }}</a>, por favor use uma seguintes opções para responder ao pedido do utilizador.",
+
+  // "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": "Depois de escolher uma opção, ser-lhe-á apresentado um um texto de resposta padrão que poderá editar.",
+
+  // "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": "Este pedido já foi processado. Pode utilizar o botão em baixo para voltar para a página principal.",
+
+  // "grant-request-copy.email.subject": "Request copy of document",
+  "grant-request-copy.email.subject": "Pedido de cópia de documento",
+
+  // "grant-request-copy.error": "An error occurred",
+  "grant-request-copy.error": "Ocorreu um erro",
+
+  // "grant-request-copy.header": "Grant document copy request",
+  "grant-request-copy.header": "Conceder cópia de documento",
+
+  // "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": "Esta mensagem será enviada ao requerente do pedido de cópia. Os ficheiros solicitado(s) serão anexado(s) à mensagem.",
+
+  // "grant-request-copy.success": "Successfully granted item request",
+  "grant-request-copy.success": "Pedido de cópia concedido com sucesso!",
+
+  // "health.breadcrumbs": "Health",
+  "health.breadcrumbs": "Diagnóstico do sistema",
+
+  // "health-page.heading": "Health",
+  "health-page.heading": "Diagnóstico do sistema",
+
+  // "health-page.info-tab": "Info",
+  "health-page.info-tab": "Info",
+
+  // "health-page.status-tab": "Status",
+  "health-page.status-tab": "Estado",
+
+  // "health-page.error.msg": "The health check service is temporarily unavailable",
+  "health-page.error.msg": "O serviço de diagnóstico está temporariamente indisponível",
+
+  // "health-page.property.status": "Status code",
+  "health-page.property.status": "Código Estado",
+
+  // "health-page.section.db.title": "Database",
+  "health-page.section.db.title": "Base de Dados",
+
+  // "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",
+  "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": "Aplicação Backend",
+
+  // "health-page.section-info.java.title": "Java",
+  "health-page.section-info.java.title": "Java",
+
+  // "health-page.status": "Status",
+  "health-page.status": "Estado",
+
+  // "health-page.status.ok.info": "Operational",
+  "health-page.status.ok.info": "Operacional",
+
+  // "health-page.status.error.info": "Problems detected",
+  "health-page.status.error.info": "Problemas detetados",
+
+  // "health-page.status.warning.info": "Possible issues detected",
+  "health-page.status.warning.info": "Possíveis problemas detetados",
+
+  // "health-page.title": "Health",
+  "health-page.title": "Diagnóstico do sistema",
+
+  // "health-page.section.no-issues": "No issues detected",
+  "health-page.section.no-issues": "Nenhum problema detetado",
+
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
-  "home.breadcrumbs": "Principal",
-  
-  // "home.title": "DSpace Angular :: Home",
-  "home.title": "DSpace :: Início",
-  
+  "home.breadcrumbs": "Página inicial",
+
+  //"home.search-form.placeholder": "Search the repository...",
+  "home.search-form.placeholder": "pesquisar no repositório...",
+
+  // "home.title": "Home",
+  "home.title": "Página inicial",
+
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Comunidades",
-  
+
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Selecione uma comunidade para navegar nas suas coleções",
-  
+
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
-  "info.end-user-agreement.accept": "Li e aceito os Termos de Uso",
-  
+  "info.end-user-agreement.accept": "Li e aceito os 'Termos de Uso'",
+
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
-  "info.end-user-agreement.accept.error": "Ocorreu um erro ao aceitar os Termos de Uso",
-  
+  "info.end-user-agreement.accept.error": "Ocorreu um erro ao aceitar os 'Termos de Uso'",
+
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
-  "info.end-user-agreement.accept.success": "Termos de Uso atualizados com sucesso",
-  
+  "info.end-user-agreement.accept.success": "'Termos de Uso' atualizados com sucesso",
+
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
   "info.end-user-agreement.breadcrumbs": "Termos de Uso",
-  
+
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "Cancelar",
-  
+
   // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "Guardar",
-  
+
   // "info.end-user-agreement.head": "End User Agreement",
-    "info.end-user-agreement.head": "Termos de Uso",
-  
+  "info.end-user-agreement.head": "Termos de Uso",
+
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Termos de Uso",
-  
+
+  //  "info.end-user-agreement.hosting-country": "the United States",
+  "info.end-user-agreement.hosting-country": "Portugal",
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Política de Privacidade",
-  
+
   // "info.privacy.head": "Privacy Statement",
   "info.privacy.head": "Política de Privacidade",
-  
+
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Política de Privacidade",
-  
-  
-  
-  // "item.alerts.private": "This item is private",
+
+  // "info.feedback.breadcrumbs": "Feedback",
+  "info.feedback.breadcrumbs": "Contacte-nos",
+
+  // "info.feedback.head": "Feedback",
+  "info.feedback.head": "Contacte-nos",
+
+  // "info.feedback.title": "Feedback",
+  "info.feedback.title": "Contacte-nos",
+
+  // "info.feedback.info": "Thanks for sharing your feedback about the DSpace system. Your comments are appreciated!",
+  "info.feedback.info": "Agradecemos de antemão pelo seu contacto e interesse, as suas mensagens, comentários ou sugestões são sempre bem-vindas!",
+
+  // "info.feedback.email_help": "This address will be used to follow up on your feedback.",
+  "info.feedback.email_help": "Este endereço de correio eletrónico será utilizado para dar seguimento à sua mensagem.",
+
+  // "info.feedback.send": "Send Feedback",
+  "info.feedback.send": "Enviar mensagem",
+
+  // "info.feedback.comments": "Comments",
+  "info.feedback.comments": "A sua mensagem",
+
+  // "info.feedback.email-label": "Your Email",
+  "info.feedback.email-label": "O seu endereço de correio electrónico:",
+
+  // "info.feedback.create.success": "Feedback Sent Successfully!",
+  "info.feedback.create.success": "Mensagem enviada com sucesso!",
+
+  // "info.feedback.error.email.required": "A valid email address is required",
+  "info.feedback.error.email.required": "Deve inserir um endereço de correio electrónico válido",
+
+  // "info.feedback.error.message.required": "A comment is required",
+  "info.feedback.error.message.required": "Deve inserir uma mensagem",
+
+  // "info.feedback.page-label": "Page",
+  "info.feedback.page-label": "Página/URL de contexo:",
+
+  // "info.feedback.page_help": "The page related to your feedback",
+  "info.feedback.page_help": "Esta é a página/URL que contextualiza o seu contacto.",
+
+  // "item.alerts.private": "This item is non-discoverable",
   "item.alerts.private": "Este item é privado",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Este item foi 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": "Com este editor pode ver e alterar as políticas de um item, assim como alterar políticas de componentes individuais do item: pacotes e ficheiros. Em resumo, um item contém pacotes, e os pacotes contêm de ficheiros. Os pacotes possuem usualmente políticas de ADICIONAR/REMOVER/LER/ESCREVER enquanto que os ficheiros apenas políticas de LER/ESCREVER.",
-  
+  "item.edit.authorizations.heading": "Com este editor pode ver e alterar as políticas de um item, bem como alterar políticas de componentes individuais do item: 'pacotes' (bundles) e 'ficheiros' (bitstreams). Em resumo, um item contém 'pacotes' e os pacotes contêm 'ficheiros'. Os pacotes usualmente possuem políticas de ADICIONAR/REMOVER/LER/ESCREVER, por outro lado, os ficheiros apenas possuem políticas de LER/ESCREVER.",
+
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Editar políticas dos itens",
-  
-  
-  
-  // "item.badge.private": "Private",
+
+  // "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": "Pacote",
-  
-  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
-  "item.bitstreams.upload.bundle.placeholder": "Selecione um pacote",
-  
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle or input new bundle name",
+  "item.bitstreams.upload.bundle.placeholder": "Selecione um pacote ou insira o nome de um pacote novo",
+
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Criar um pacote",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Este item não possui um pacote para poder receber os ficheiros.",
-  
+
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "Cancelar",
-  
+
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "Arraste um ficheiro para carregar",
-  
+
   // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "Item: ",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "O pacote foi criado com sucesso.",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
   "item.bitstreams.upload.notifications.bundle.created.title": "Pacote criado",
-  
+
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
-  "item.bitstreams.upload.notifications.upload.failed": "O carregamento falhou. Verifique o ficheiro antes de tentar carregar de novo.",
-  
+  "item.bitstreams.upload.notifications.upload.failed": "O carregamento falhou. Verifique os ficheiro antes de tentar carregar de novo.",
+
   // "item.bitstreams.upload.title": "Upload bitstream",
-  "item.bitstreams.upload.title": "Carregar ficheiro",
-  
-  
-  
+  "item.bitstreams.upload.title": "Carregar ficheiro(s)",
+
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Carregar",
-  
+
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
-  "item.edit.bitstreams.bundle.displaying": "A apresentar atualmente {{ amount }} ficheiros de {{ total }}.",
-  
+  "item.edit.bitstreams.bundle.displaying": "Atualmente a mostrar {{ amount }} ficheiros de {{ total }}.",
+
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "Carregar todos ({{ total }})",
-  
+
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Carregar mais",
-  
+
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "PACOTE: {{ name }}",
-  
+
   // "item.edit.bitstreams.discard-button": "Discard",
-  "item.edit.bitstreams.discard-button": "Descartar",
-  
+  "item.edit.bitstreams.discard-button": "Cancelar",
+
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "Descarregar",
-  
+
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
   "item.edit.bitstreams.edit.buttons.drag": "Arrastar",
-  
+
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "Editar",
-  
+
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "Remover",
-  
+
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
-  "item.edit.bitstreams.edit.buttons.undo": "Descartar alterações",
-  
+  "item.edit.bitstreams.edit.buttons.undo": "Cancelar alterações",
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Este item não possui ficheiros. Carregue um novo ficheiro.",
-  
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "Ações",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Pacote",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "Descrição",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   "item.edit.bitstreams.headers.format": "Formato",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "Nome",
-  
+
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.bitstreams.notifications.discarded.content": "As alterações foram descartadas. Para restabelecer as alterações clique no botão 'Voltar'",
-  
+
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "Alterações descartadas",
-  
+
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Erro ao mover ficheiros",
-  
+
   // "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": "A alteração dos ficheiros e pacotes foi guardada com sucesso.",
-  
+
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
   "item.edit.bitstreams.notifications.move.saved.title": "Alteração guardada",
-  
+
   // "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": "O item em que está a trabalhar foi alterado por outro Utilizador. As suas alterações serão descartadas para evitar conflitos",
-  
+
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Alterações desatualizadas",
-  
+
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
   "item.edit.bitstreams.notifications.remove.failed.title": "Erro ao apagar ficheiro",
-  
+
   // "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": "A alteração de remoção do ficheiro deste item foram guardadas.",
-  
+
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "Alterações de remoção guardadas",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
-  "item.edit.bitstreams.reinstate-button": "Descartar",
-  
+  "item.edit.bitstreams.reinstate-button": "Cancelar",
+
   // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "Guardar",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Carregar",
-  
-  
-  
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "Cancelar",
-  
+
   // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "Apagar",
-  
+
   // "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": "Você tem certeza que deseja apagar completamento este item? Atenção: No momento, nenhum vestígio restará.",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Ocorreu um erro ao apagar o item",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "Apagar item: {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "O item foi apagado",
-  
+
   // "item.edit.head": "Edit Item",
-  "item.edit.head": "Editar Item",
-  
+  "item.edit.head": "Editar item",
+
   // "item.edit.breadcrumbs": "Edit Item",
-  "item.edit.breadcrumbs": "Editar Item",
-  
-  
+  "item.edit.breadcrumbs": "Editar item",
+
+  // "item.edit.tabs.disabled.tooltip": "You're not authorized to access this tab",
+  "item.edit.tabs.disabled.tooltip": "Não está autorizado a aceder a esta área!",
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
-  "item.edit.tabs.mapper.head": "Mapeamento de Coleção",
-  
+  "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.tabs.item-mapper.title": "Editar item - Mapeamento de coleção",
+
+  // "item.edit.identifiers.doi.status.UNKNOWN": "Unknown",
+  "item.edit.identifiers.doi.status.UNKNOWN": "Desconhecido",
+
+  // "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Queued for registration",
+  "item.edit.identifiers.doi.status.TO_BE_REGISTERED": "Em fila de espera para registo",
+
+  // "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Queued for reservation",
+  "item.edit.identifiers.doi.status.TO_BE_RESERVED": "Em fila de espera para reserva",
+
+  // "item.edit.identifiers.doi.status.IS_REGISTERED": "Registered",
+  "item.edit.identifiers.doi.status.IS_REGISTERED": "Registado",
+
+  // "item.edit.identifiers.doi.status.IS_RESERVED": "Reserved",
+  "item.edit.identifiers.doi.status.IS_RESERVED": "Reservado",
+
+  // "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reserved (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_RESERVED": "Reservado (fila de espera atualizada)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registered (update queued)",
+  "item.edit.identifiers.doi.status.UPDATE_REGISTERED": "Registado (fila de espera atualizada)",
+
+  // "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Queued for update and registration",
+  "item.edit.identifiers.doi.status.UPDATE_BEFORE_REGISTRATION": "Em fila de espera para atualização e registo",
+
+  // "item.edit.identifiers.doi.status.TO_BE_DELETED": "Queued for deletion",
+  "item.edit.identifiers.doi.status.TO_BE_DELETED": "Em fila de espera para remoção",
+
+  // "item.edit.identifiers.doi.status.DELETED": "Deleted",
+  "item.edit.identifiers.doi.status.DELETED": "Removido",
+
+  // "item.edit.identifiers.doi.status.PENDING": "Pending (not registered)",
+  "item.edit.identifiers.doi.status.PENDING": "Pendente (não registado)",
+
+  // "item.edit.identifiers.doi.status.MINTED": "Minted (not registered)",
+  "item.edit.identifiers.doi.status.MINTED": "Criado (não registado)",
+
+  // "item.edit.tabs.status.buttons.register-doi.label": "Register a new or pending DOI",
+  "item.edit.tabs.status.buttons.register-doi.label": "Registar um novo DOI ou pendente",
+
+  // "item.edit.tabs.status.buttons.register-doi.button": "Register DOI...",
+  "item.edit.tabs.status.buttons.register-doi.button": "Registar DOI...",
+
+  // "item.edit.register-doi.header": "Register a new or pending DOI",
+  "item.edit.register-doi.header": "Registar 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",
+  "item.edit.register-doi.description": "Rever em baixo quaisquer identificadores e metadados pendentes e clicar em 'Confirmar' para prosseguir com o registo DOI ou 'Cancelar' para retroceder",
+
+  // "item.edit.register-doi.confirm": "Confirm",
+  "item.edit.register-doi.confirm": "Confirmar",
+
+  // "item.edit.register-doi.cancel": "Cancel",
+  "item.edit.register-doi.cancel": "Cancelar",
+
+  // "item.edit.register-doi.success": "DOI queued for registration successfully.",
+  "item.edit.register-doi.success": "DOI colocado em fila de espera para o registo com sucesso.",
+
+  // "item.edit.register-doi.error": "Error registering DOI",
+  "item.edit.register-doi.error": "Erro ao registar 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": "O seguinte DOI já foi criado e será colocado em fila de espera para registo 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)",
-  
+  "item.edit.item-mapper.buttons.add": "Mapear item para coleção(ões) selecionada(s)",
+
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
-  "item.edit.item-mapper.buttons.remove": "Remover mapeamento(s) do item da(s) coleção(ões) seleciona(s)",
-  
+  "item.edit.item-mapper.buttons.remove": "Remover mapeamento(s) na(s) coleção(ões) selecionada(s)",
+
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "Cancelar",
-  
+
   // "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": "Essa é a ferramenta de mapeamento de itens que permite que os administradores mapeiem esse item para outras coleções. Você pode procurar coleções e mapeá-las ou navegar na lista de coleções para as quais o item está atualmente mapeado.",
-  
+  "item.edit.item-mapper.description": "Esta ferramenta permite mapear itens para outras coleções. Pode procurar coleções e mapeá-las ou navegar na lista de coleções nas quais o item está atualmente mapeado.",
+
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
-  "item.edit.item-mapper.head": "Mapeador de Item - Mapear Itens em Coleções",
-  
+  "item.edit.item-mapper.head": "Mapeador de item - Mapear itens em coleções",
+
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
-  
+
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Insira um termo para efetuar a pesquisa",
-  
+
   // "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": "Ocorreram erros ao mapear o item em {{amount}} coleções.",
-  
+
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Erros de mapeamento",
-  
+
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.success.content": "Mapeou o item em {{amount}} coleções com sucesso.",
-  
+
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Mapeamento complesto",
-  
+
   // "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": "Ocorreram erros ao remover mapeamento do item em {{amount}} coleções.",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "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.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Completou a remoção de mapeamento",
-  
+
+  // "item.edit.item-mapper.search-form.placeholder": "Search collections...",
+  "item.edit.item-mapper.search-form.placeholder": "Pesquisar coleções...",
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Navegar nas coleções mapeadas",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Mapear novas coleções",
-  
-  
-  
+
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Adicionar",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
-  "item.edit.metadata.discard-button": "Descartar",
-  
+  "item.edit.metadata.discard-button": "Cancelar",
+
+  // "item.edit.metadata.edit.buttons.confirm": "Confirm",
+  "item.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "item.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "item.edit.metadata.edit.buttons.drag": "Arrastar para reordenar",
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Editar",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Apagar",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "Desfazer alterações",
-  
+
   // "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",
+  "item.edit.metadata.edit.buttons.virtual": "Este é um valor de metadados virtual, ou seja, um valor herdado de uma entidade relacionada. Não pode ser modificado diretamente. Adicionar ou remover a relação correspondente no separador '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 não possui metadados. Clique 'Adicionar' para adicionar metadados.",
-  
+
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Editar",
-  
+
   // "item.edit.metadata.headers.field": "Field",
-  "item.edit.metadata.headers.field": "Campo",
-  
+  "item.edit.metadata.headers.field": "Campo (metadado)",
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Idioma",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Valor",
-  
+
+  // "item.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "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",
-  
+
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.metadata.notifications.discarded.content": "Suas alterações foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
-  
-  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "item.edit.metadata.notifications.discarded.content": "As suas alterações foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
+
+  // "item.edit.metadata.notifications.discarded.title": "Changes discarded",
   "item.edit.metadata.notifications.discarded.title": "Mudança descartada",
-  
+
   // "item.edit.metadata.notifications.error.title": "An error occurred",
-  "item.edit.metadata.notifications.error.title": "Ocorreu um erro",
-  
+  "item.edit.metadata.notifications.error.title": "Ocorreu um erro!",
+
   // "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": "Suas alterações não foram salvas. Verifique se todos os campos são válidos antes de salvar.",
-  
+  "item.edit.metadata.notifications.invalid.content": "As suas alterações não foram guardadas! Verifique se todos os campos são válidos antes de guardar.",
+
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Metadado inválido",
-  
+
   // "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": "O item em que você está trabalhando foi alterado por outro usuário. Suas alterações atuais são descartadas para evitar conflitos",
-  
-  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "item.edit.metadata.notifications.outdated.content": "O registo em que está a trabalhar foi alterado por outro utilizador. As suas alterações serão descartadas para evitar conflitos",
+
+  // "item.edit.metadata.notifications.outdated.title": "Changes outdated",
   "item.edit.metadata.notifications.outdated.title": "Alteração desatualizada",
-  
+
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
-  "item.edit.metadata.notifications.saved.content": "Suas alterações nos metadados deste item foram salvas.",
-  
+  "item.edit.metadata.notifications.saved.content": "As alterações  que realizou nos metadados deste registo foram salvas.",
+
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadados salvos",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Desfazer",
-  
+
+  // "item.edit.metadata.reset-order-button": "Undo reorder",
+  "item.edit.metadata.reset-order-button": "Desfazer reordenamento",
+
   // "item.edit.metadata.save-button": "Save",
-  "item.edit.metadata.save-button": "Salvar",
-  
-  
-  
+  "item.edit.metadata.save-button": "Guardar",
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Campo",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "Idioma",
-  
+
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Valor",
-  
-  
-  
-  // "item.edit.move.cancel": "Cancel",
+
+  // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Cancelar",
-  
+
+  // "item.edit.move.save-button": "Save",
+  "item.edit.move.save-button": "Guardar",
+
+  // "item.edit.move.discard-button": "Discard",
+  "item.edit.move.discard-button": "Cancelar",
+
   // "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": "Selecione a coleção para a qual você deseja mover este item. Para restringir a lista de coleções exibidas, você pode inserir uma consulta de pesquisa na caixa.",
-  
+
   // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "Ocorreu um erro ao tentar mover o item",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "Mover item: {{id}}",
-  
+
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Herdar politicas",
-  
+
   // "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.move": "Move",
   "item.edit.move.move": "Mover",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "Movendo...",
-  
+
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Insira uma consulta para procurar coleções",
-  
+
   // "item.edit.move.success": "The item has been moved successfully",
   "item.edit.move.success": "O item foi movido com sucesso",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Mover item",
-  
-  
-  
+
   // "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?",
-  
-  // "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 privado o item: {{ 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?",
-  
-  // "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 público o item: {{ id }}",
-  
-  // "item.edit.public.success": "The item is now public",
-  "item.edit.public.success": "O item agora é público",
-  
-  
-  
+
+  // "item.edit.public.success": "The item is now discoverable",
+  "item.edit.public.success": "O item agora é público!",
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "Cancelar",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "Restabelecer",
-  
+
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "Tem certeza de que este item deve ser restabelecido no repositório?",
-  
+
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Ocorreu um erro ao restabelecer o item",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "Restabelecer item: {{ id }}",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "O item foi restabelecido com sucesso",
-  
-  
-  
+
   // "item.edit.relationships.discard-button": "Discard",
-  "item.edit.relationships.discard-button": "Descartar",
-  
+  "item.edit.relationships.discard-button": "Cancelar",
+
   // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "Adicionar",
-  
+
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Apagar",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
-  "item.edit.relationships.edit.buttons.undo": "Desfazer alterações",
-  
+  "item.edit.relationships.edit.buttons.undo": "Cancelar alterações",
+
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "Sem relações",
-  
+
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
-  "item.edit.relationships.notifications.discarded.content": "Suas alterações foram descartadas. Para restabelecer suas alterações, clique no botão 'Desfazer'",
-  
+  "item.edit.relationships.notifications.discarded.content": "Suas alterações foram canceladas. Para restabelecer suas alterações, clique no botão 'Cancelar'",
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  "item.edit.relationships.notifications.discarded.title": "Alterações descartadas",
-  
+  "item.edit.relationships.notifications.discarded.title": "Alterações canceladas",
+
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "Erro ao apagar relação",
-  
+
   // "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": "O item em que você está trabalhando foi alterado por outro usuário. Suas alterações atuais são descartadas para evitar conflitos",
-  
+
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Alterações desatualizadas",
-  
+
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
   "item.edit.relationships.notifications.saved.content": "Suas alterações nos relacionamentos deste item foram salvas.",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "Relacionamentos salvos",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "Desfazer",
-  
+
   // "item.edit.relationships.save-button": "Save",
-  "item.edit.relationships.save-button": "Salvar",
-  
+  "item.edit.relationships.save-button": "Guardar",
+
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
-  "item.edit.relationships.no-entity-type": "Adicione o metadado 'dspace.entity.type' para ativar relações neste item",
-  
-  
-  
+  "item.edit.relationships.no-entity-type": "Adicione o metadado 'dspace.entity.type' para ativar relações neste item!",
+
+  // "item.edit.return": "Back",
+  "item.edit.return": "Voltar",
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
-  "item.edit.tabs.bitstreams.head": "Ficheiros do Item",
-  
+  "item.edit.tabs.bitstreams.head": "Ficheiros do item",
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Editar Item - Ficheiros",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Curadoria",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
-  "item.edit.tabs.curate.title": "Editar Item - Curadoria",
-  
+  "item.edit.tabs.curate.title": "Editar item - Curadoria",
+
+  // "item.edit.curate.title": "Curate Item: {{item}}",
+  "item.edit.curate.title": "Curar item: {{item}}",
+
   // "item.edit.tabs.metadata.head": "Metadata",
-  "item.edit.tabs.metadata.head": "Metadados do Item",
-  
+  "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.relationships.head": "Relationships",
-  "item.edit.tabs.relationships.head": "Relações do Item",
-  
+  "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.status.buttons.authorizations.button": "Authorizations...",
-  "item.edit.tabs.status.buttons.authorizations.button": "Autorizações...",
-  
+  "item.edit.tabs.status.buttons.authorizations.button": "Permissões...",
+
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
-  "item.edit.tabs.status.buttons.authorizations.label": "Editar politicas de autorizações de item",
-  
+  "item.edit.tabs.status.buttons.authorizations.label": "Editar políticas de permissões de item",
+
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
-  "item.edit.tabs.status.buttons.delete.button": "Apagar permanentemente",
-  
+  "item.edit.tabs.status.buttons.delete.button": "Apagar definitivamente",
+
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Eliminar completamente o item",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.button": "Coleções mapeadas",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
-  "item.edit.tabs.status.buttons.mappedCollections.label": "Gerenciar coleções mapeadas",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Mover...",
-  
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Gerir coleções mapeadas",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Mover este item para outra coleção",
+
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Mover item para outra coleção",
-  
-  // "item.edit.tabs.status.buttons.private.button": "Make it private...",
-  "item.edit.tabs.status.buttons.private.button": "Tornar o item privado ...",
-  
-  // "item.edit.tabs.status.buttons.private.label": "Make item private",
+
+  // "item.edit.tabs.status.buttons.private.button": "Make it non-discoverable...",
+  "item.edit.tabs.status.buttons.private.button": "Tornar o item privado...",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item non-discoverable",
   "item.edit.tabs.status.buttons.private.label": "Tornar o item privado",
-  
-  // "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": "Tornar público o item...",
-  
-  // "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": "Tornar público o item",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Restabelecer...",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Restabelecer item no repositório",
-  
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Retirar...",
-  
+
+  // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
+  "item.edit.tabs.status.buttons.unauthorized": "Não possui autorizações para realizar esta ação!",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "Retirar este item",
+
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
-  "item.edit.tabs.status.buttons.withdraw.label": "Retirar item do repositório",
-  
+  "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 gerenciamento de itens. A partir daqui, você pode retirar, restabelecer, mover ou apagar o item. Você também pode atualizar ou adicionar novos metadados / bitstream nas outras guias.",
-  
+  "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.head": "Status",
-  "item.edit.tabs.status.head": "Estado do Item",
-  
+  "item.edit.tabs.status.head": "Estado do item",
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Handle",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
-  "item.edit.tabs.status.labels.id": "ID Interno do Item",
-  
+  "item.edit.tabs.status.labels.id": "ID Interno do item",
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
-  "item.edit.tabs.status.labels.itemPage": "Página do Item",
-  
+  "item.edit.tabs.status.labels.itemPage": "Página do item",
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Ultima alteração",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "Editar Item -  Estado",
-  
+
   // "item.edit.tabs.versionhistory.head": "Version History",
-  "item.edit.tabs.versionhistory.head": "Histórico de Versões",
-  
+  "item.edit.tabs.versionhistory.head": "Histórico de versões",
+
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  "item.edit.tabs.versionhistory.title": "Edições do Item - Histórico de Versões",
-  
+  "item.edit.tabs.versionhistory.title": "Edições do Item - Histórico de versões",
+
   // "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": "Editar ou adicionar novas versões ainda não é possível neste interface de Utilizador.",
-  
+  "item.edit.tabs.versionhistory.under-construction": "Editar ou adicionar novas versões ainda não é possível neste interface de utilizador.",
+
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "Visualizar Item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Editar Item -  Visualizar",
-  
-  
-  
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "Cancelar",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "Retirar",
-  
+
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "Tem certeza de que este item deve ser retirado do repositório?",
-  
+
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Ocorreu um erro ao retirar o item",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "Retirar item: {{ id }}",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
-  "item.edit.withdraw.success": "O item foi retirado com sucesso",
-  
-  
-  
+  "item.edit.withdraw.success": "O item foi retirado com sucesso!",
+
+  // "item.orcid.return": "Back",
+  "item.orcid.return": "Voltar",
+
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   "item.page.description": "Descrição",
-  
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Editar este item",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
-  "item.page.journal-issn": "ISSN da Revista",
-  
+  "item.page.journal-issn": "ISSN da revista",
+
   // "item.page.journal-title": "Journal Title",
-  "item.page.journal-title": "Título da Revista",
-  
+  "item.page.journal-title": "Título da revista",
+
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "Editora",
-  
+
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Título do Volume",
-  
+
   // "item.search.results.head": "Item Search Results",
-  "item.search.results.head": "Resultados da Pesquisa de Item",
-  
-  // "item.search.title": "DSpace Angular :: Item Search",
-  "item.search.title": "DSpace :: Pesquisa de Item",
-  
-  
-  
+  "item.search.results.head": "Resultados da pesquisa de item",
+
+  // "item.search.title": "Item Search",
+  "item.search.title": "Pesquisa de item",
+
+  // "item.truncatable-part.show-more": "Show more",
+  "item.truncatable-part.show-more": "Mostrar mais",
+
+  // "item.truncatable-part.show-less": "Collapse",
+  "item.truncatable-part.show-less": "Colapsar",
+
+  // "workflow-item.search.result.delete-supervision.modal.header": "Delete Supervision Order",
+  "workflow-item.search.result.delete-supervision.modal.header": "Eliminar ordem de supervisão",
+
+  // "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": "Tem a certeza de que quer remover a ordem de supervisão",
+
+  // "workflow-item.search.result.delete-supervision.modal.cancel": "Cancel",
+  "workflow-item.search.result.delete-supervision.modal.cancel": "Cancelar",
+
+  // "workflow-item.search.result.delete-supervision.modal.confirm": "Delete",
+  "workflow-item.search.result.delete-supervision.modal.confirm": "Remover",
+
+  // "workflow-item.search.result.notification.deleted.success": "Successfully deleted supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.success": "Ordem de supervisão removida com sucesso \"{{name}}\"",
+
+  // "workflow-item.search.result.notification.deleted.failure": "Failed to delete supervision order \"{{name}}\"",
+  "workflow-item.search.result.notification.deleted.failure": "Falha ao remover ordem de supervisão \"{{name}}\"",
+
+  // "workflow-item.search.result.list.element.supervised-by": "Supervised by:",
+  "workflow-item.search.result.list.element.supervised-by": "Supervisionado por:",
+
+  // "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remove supervision group",
+  "workflow-item.search.result.list.element.supervised.remove-tooltip": "Remover grupo de supervisão",
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Resumo",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Autores",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "Citação",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Coleções",
-  
+
+  // "item.page.collections.loading": "Loading...",
+  "item.page.collections.loading": "A carregar...",
+
+  // "item.page.collections.load-more": "Load more",
+  "item.page.collections.load-more": "Carregar mais",
+
   // "item.page.date": "Date",
   "item.page.date": "Data",
-  
+
   // "item.page.edit": "Edit this item",
   "item.page.edit": "Editar este item",
-  
+
   // "item.page.files": "Files",
   "item.page.files": "Ficheiros",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Descrição:",
-  
+
   // "item.page.filesection.download": "Download",
-  "item.page.filesection.download": "Baixar",
-  
+  "item.page.filesection.download": "Ver/Abrir",
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Formato:",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "Nome:",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Tamanho:",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Articles in this journal",
-  
+
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "Ver registo completo",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Ver registo simples",
-  
+
+  // "item.page.orcid.title": "ORCID",
+  "item.page.orcid.title": "ORCID",
+
+  // "item.page.orcid.tooltip": "Open ORCID setting page",
+  "item.page.orcid.tooltip": "Abrir página de configuração do ORCID",
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Artigos deste autor",
-  
+
   // "item.page.related-items.view-more": "Show {{ amount }} more",
   "item.page.related-items.view-more": "Mostrar mais {{ amount }}",
-  
+
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
   "item.page.related-items.view-less": "Ocultar último {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   "item.page.relationships.isAuthorOfPublication": "Publicações",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   "item.page.relationships.isJournalOfPublication": "Publicações",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "Autores",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  "item.page.relationships.isOrgUnitOfProject": "Projetos",
-  
+  "item.page.relationships.isOrgUnitOfProject": "Projetos de investigação",
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "Palavras-chave",
-  
+
   // "item.page.uri": "URI",
   "item.page.uri": "URI",
-  
+
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Ver mais",
-  
+
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Fechar",
-  
-  // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Principais",
-  
-  // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.license.bundle" : "Licença",
-  
+
+  // "item.page.filesection.original.bundle": "Original bundle",
+  "item.page.filesection.original.bundle": "Principais",
+
+  // "item.page.filesection.license.bundle": "License bundle",
+  "item.page.filesection.license.bundle": "Licença",
+
+  // "item.page.return": "Back",
+  "item.page.return": "Voltar",
+
+  // "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": "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",
+  "item.page.claim.button": "Reivindicar",
+
+  // "item.page.claim.tooltip": "Claim this item as profile",
+  "item.page.claim.tooltip": "Reivindicar este item como perfil",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Identificador:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "Autores:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "Data de publicação:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "Resumo:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "Outro identificador:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "Idioma:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   "item.preview.dc.subject": "Assunto:",
-  
+
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Título:",
-  
+
+  // "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.volume": "Volume",
+  "item.preview.oaire.citation.volume": "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:",
+  "itemm.preview.dc.identifier": "Identificador:",
+
+  // "item.preview.dc.relation.ispartof": "Journal or Serie",
+  "item.preview.dc.relation.ispartof": "Revista ou Série",
+
+  // "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.doi": "DOI",
+
+  // "item.preview.dc.publisher": "Publisher:",
+  "item.preview.dc.publisher": "Editora:",
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Apelido:",
-  
+
   // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "Nome:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID:",
-  
+
+  // "item.preview.project.funder.name": "Funder:",
+  "item.preview.project.funder.name": "Financiador:",
+
+  // "item.preview.project.funder.identifier": "Funder Identifier:",
+  "item.preview.project.funder.identifier": "Identificação do financiador:",
+
+  // "item.preview.oaire.awardNumber": "Funding ID:",
+  "item.preview.oaire.awardNumber": "ID do financiamento:",
+
+  // "item.preview.dc.title.alternative": "Acronym:",
+  "item.preview.dc.title.alternative": "Acrónimo:",
+
+  // "item.preview.dc.coverage.spatial": "Jurisdiction:",
+  "item.preview.dc.coverage.spatial": "Jurisdição:",
+
+  // "item.preview.oaire.fundingStream": "Funding Stream:",
+  "item.preview.oaire.fundingStream": "Linha de financiamento:",
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Confirmar seleção",
-  
+
   // "item.select.empty": "No items to show",
-  "item.select.empty": "Nenhum item para mostrar",
-  
+  "item.select.empty": "Nenhum item para mostrar.",
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Autor",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "Coleção",
-  
+
   // "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": "Não existem ainda outras versões deste item.",
-  
+  "item.version.history.empty": "Ainda não existem outras versões deste item.",
+
   // "item.version.history.head": "Version History",
-  "item.version.history.head": "Histórico de Versões",
-  
-  // "item.version.history.return": "Return",
+  "item.version.history.head": "Histórico de versões",
+
+  // "item.version.history.return": "Back",
   "item.version.history.return": "Voltar",
-  
+
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Versão selecionada",
-  
+
+  // "item.version.history.selected.alert": "You are currently viewing version {{version}} of the item.",
+  "item.version.history.selected.alert": "Está a ver a versão {{version}} do item.",
+
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Versão",
-  
+
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "Editor",
-  
+
   // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "Data",
-  
+
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Sumário",
-  
-  
-  
+
+  // "item.version.history.table.workspaceItem": "Workspace item",
+  "item.version.history.table.workspaceItem": "Área de trabalho do item",
+
+  // "item.version.history.table.workflowItem": "Workflow item",
+  "item.version.history.table.workflowItem": "Fluxo de trabalho do item",
+
+  // "item.version.history.table.actions": "Action",
+  "item.version.history.table.actions": "Ação",
+
+  // "item.version.history.table.action.editWorkspaceItem": "Edit workspace item",
+  "item.version.history.table.action.editWorkspaceItem": "Editar área de trabalho do item",
+
+  // "item.version.history.table.action.editSummary": "Edit summary",
+  "item.version.history.table.action.editSummary": "Editar sumário",
+
+  // "item.version.history.table.action.saveSummary": "Save summary edits",
+  "item.version.history.table.action.saveSummary": "Guardar alterações ao sumário",
+
+  // "item.version.history.table.action.discardSummary": "Discard summary edits",
+  "item.version.history.table.action.discardSummary": "Cancelar alterações ao sumário",
+
+  // "item.version.history.table.action.newVersion": "Create new version from this one",
+  "item.version.history.table.action.newVersion": "Criar uma nova versão deste",
+
+  // "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": "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>.",
   "item.version.notice": "Esta não é a última versão deste item. A última versão pode ser encontrada <a href='{{destination}}'>aqui</a>.",
-  
-  
-  
+
+  // "item.version.create.modal.header": "New version",
+  "item.version.create.modal.header": "Nova versão",
+
+  // "item.version.create.modal.text": "Create a new version for this item",
+  "item.version.create.modal.text": "Criar uma nova versão para este item",
+
+  // "item.version.create.modal.text.startingFrom": "starting from version {{version}}",
+  "item.version.create.modal.text.startingFrom": "Iniciar a partir da versão {{version}}",
+
+  // "item.version.create.modal.button.confirm": "Create",
+  "item.version.create.modal.button.confirm": "Criar",
+
+  // "item.version.create.modal.button.confirm.tooltip": "Create new version",
+  "item.version.create.modal.button.confirm.tooltip": "Criar uma nova versão",
+
+  // "item.version.create.modal.button.cancel": "Cancel",
+  "item.version.create.modal.button.cancel": "Cancelar",
+
+  // "item.version.create.modal.button.cancel.tooltip": "Do not create new version",
+  "item.version.create.modal.button.cancel.tooltip": "Não criar uma nova versão",
+
+  // "item.version.create.modal.form.summary.label": "Summary",
+  "item.version.create.modal.form.summary.label": "Sumário",
+
+  // "item.version.create.modal.form.summary.placeholder": "Insert the summary for the new version",
+  "item.version.create.modal.form.summary.placeholder": "Inserir o sumário para a nova versão",
+
+  // "item.version.create.modal.submitted.header": "Creating new version...",
+  "item.version.create.modal.submitted.header": "Criar uma nova versão...",
+
+  // "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á a ser criada. Isto pode demorar algum tempo se o item tiver muitas relações.",
+
+  // "item.version.create.notification.success": "New version has been created with version number {{version}}",
+  "item.version.create.notification.success": "Nova versão foi criada com o número {{version}}",
+
+  // "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": "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",
+  "item.version.delete.modal.header": "Remover versão",
+
+  // "item.version.delete.modal.text": "Do you want to delete version {{version}}?",
+  "item.version.delete.modal.text": "Pretende remover a versão {{version}}?",
+
+  // "item.version.delete.modal.button.confirm": "Delete",
+  "item.version.delete.modal.button.confirm": "Remover",
+
+  // "item.version.delete.modal.button.confirm.tooltip": "Delete this version",
+  "item.version.delete.modal.button.confirm.tooltip": "Remover esta versão",
+
+  // "item.version.delete.modal.button.cancel": "Cancel",
+  "item.version.delete.modal.button.cancel": "Cancelar",
+
+  // "item.version.delete.modal.button.cancel.tooltip": "Do not delete this version",
+  "item.version.delete.modal.button.cancel.tooltip": "Não remover esta versão",
+
+  // "item.version.delete.notification.success": "Version number {{version}} has been deleted",
+  "item.version.delete.notification.success": "A versão número {{version}} foi removida",
+
+  // "item.version.delete.notification.failure": "Version number {{version}} has not been deleted",
+  "item.version.delete.notification.failure": "A versão número {{version}} não foi removida",
+
+  // "item.version.edit.notification.success": "The summary of version number {{version}} has been changed",
+  "item.version.edit.notification.success": "O sumário 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": "O sumário da versão número {{version}} não foi alterado",
+
+  // "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.add-button": "Adicionar",
+
+  // "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.discard-button": "Rejeitar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirmar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Arrastar para reordenar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remover",
+
+  // "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Desfazer alterações",
+
+  // "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Parar edição",
+
+  // "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": "Atualmente o modelo do item não contém quaisquer metadados. Clique em 'Adicionar' para começar a adicionar um valor de metadados.",
+
+  // "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.edit": "Editar",
+
+  // "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.field": "Campo",
+
+  // "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.language": "Idioma",
+
+  // "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.headers.value": "Valor",
+
+  // "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.error": "ocorreu um erro ao validar o campo de metadados",
+
+  // "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Por favor, selecione um campo de metadados válido",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "As sua alterações foram descartadas. Para repor as suas alterações clique no botão 'Desfazer'",
+
+  // "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Alterações descartadas",
+
+  // "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "itemtemplate.edit.metadata.notifications.error.title": "Ocorreu um erro",
+
+  // "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": "As suas alterações não foram guardadas. Por favor, certifique-se de que todos os campos são válidos antes de os guardar.",
+
+  // "itemtemplate.edit.metadata.notifications.invalid.title": "Metadata invalid",
+  "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",
+  "itemtemplate.edit.metadata.notifications.outdated.content": "O modelo do item que está atualmente a trabalhar foi alterado por outro utilizador. As suas alterações serão descartadas para evitar conflitos",
+
+  // "itemtemplate.edit.metadata.notifications.outdated.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.outdated.title": "Alterações desatualizadas",
+
+  // "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.content": "As suas alterações aos metadados deste modelo de item foram guardadas.",
+
+  // "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadados guardados",
+
+  // "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reinstate-button": "Desfazer",
+
+  // "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.reset-order-button": "Desfazer reordenamento",
+
+  // "itemtemplate.edit.metadata.save-button": "Save",
+  "itemtemplate.edit.metadata.save-button": "Guardar",
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Revista",
-  
+
   // "journal.page.description": "Description",
   "journal.page.description": "Descrição",
-  
+
   // "journal.page.edit": "Edit this item",
   "journal.page.edit": "Editar este item",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Editor Chefe",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Editora",
-  
+
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Revista: ",
-  
+
   // "journal.search.results.head": "Journal Search Results",
-  "journal.search.results.head": "Resultado da Pesquisa de Revistas",
-  
-  // "journal.search.title": "DSpace Angular :: Journal Search",
-  "journal.search.title": "DSpace :: Pesquisa de Revistas",
-  
-  
-  
+  "journal.search.results.head": "Resultado da pesquisa de revistas",
+
+  // "journal-relationships.search.results.head": "Journal Search Results",
+  "journal-relationships.search.results.head": "Resultado da pesquisa de revistas",
+
+  // "journal.search.title": "Journal Search",
+  "journal.search.title": "Pesquisa de revistas",
+
   // "journalissue.listelement.badge": "Journal Issue",
-  "journalissue.listelement.badge": "Número",
-  
+  "journalissue.listelement.badge": "Número de revista",
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Descrição",
-  
+
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Editar este item",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
-  "journalissue.page.issuedate": "Data de Publicação",
-  
+  "journalissue.page.issuedate": "Data de publicação",
+
   // "journalissue.page.journal-issn": "Journal ISSN",
-  "journalissue.page.journal-issn": "ISSN da Revista",
-  
+  "journalissue.page.journal-issn": "ISSN da revista",
+
   // "journalissue.page.journal-title": "Journal Title",
-  "journalissue.page.journal-title": "Título da Revista",
-  
+  "journalissue.page.journal-title": "Título da revista",
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "Palavras-chave",
-  
+
   // "journalissue.page.number": "Number",
-  "journalissue.page.number": "Número de Páginas",
-  
+  "journalissue.page.number": "Número de páginas",
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
-  "journalissue.page.titleprefix": "Número da Revista: ",
-  
-  
-  
+  "journalissue.page.titleprefix": "Número de revista: ",
+
   // "journalvolume.listelement.badge": "Journal Volume",
-  "journalvolume.listelement.badge": "Volume da Revista",
-  
+  "journalvolume.listelement.badge": "Volume de revista",
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Descrição",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "Editar este item",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
-  "journalvolume.page.issuedate": "Data de Publicação",
-  
+  "journalvolume.page.issuedate": "Data de publicação",
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
-  "journalvolume.page.titleprefix": "Volume da Revista: ",
-  
+  "journalvolume.page.titleprefix": "Volume de revista: ",
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Volume",
-  
-  
-  
+
+  // "iiifsearchable.listelement.badge": "Document Media",
+  "iiifsearchable.listelement.badge": "Media do documeo",
+
+  // "iiifsearchable.page.titleprefix": "Document: ",
+  "iiifsearchable.page.titleprefix": "Documento: ",
+
+  // "iiifsearchable.page.doi": "Permanent Link: ",
+  "iiifsearchable.page.doi": "URI permanete: ",
+
+  // "iiifsearchable.page.issue": "Issue: ",
+  "iiifsearchable.page.issue": "Núemero: ",
+
+  // "iiifsearchable.page.description": "Description: ",
+  "iiifsearchable.page.description": "Descrição: ",
+
+  // "iiifviewer.fullscreen.notice": "Use full screen for better viewing.",
+  "iiifviewer.fullscreen.notice": "Utilize o ecrã completo para melhor visualização .",
+
+  // "iiif.listelement.badge": "Image Media",
+  "iiif.listelement.badge": "Media da imagem",
+
+  // "iiif.page.titleprefix": "Image: ",
+  "iiif.page.titleprefix": "Imagem: ",
+
+  // "iiif.page.doi": "Permanent Link: ",
+  "iiif.page.doi": "URI permanente: ",
+
+  // "iiif.page.issue": "Issue: ",
+  "iiif.page.issue": "Número: ",
+
+  // "iiif.page.description": "Description: ",
+  "iiif.page.description": "Description: ",
+
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "A carregar ficheiro...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "A carregar ficheiros...",
-  
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "A carregar itens...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "A carregar página...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "A carregar coleção...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "A carregar coleções...",
-  
+
   // "loading.content-source": "Loading content source...",
   "loading.content-source": "A carregar conteúdo da fonte...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "A carregar comunidade...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "A carregar...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "A carregar item...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "A carregar itens...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "A carregar itens...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "A carregar...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
-  "loading.recent-submissions": "A carregar submissões recentes...",
-  
+  "loading.recent-submissions": "A carregar depósitos recentes...",
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "A carregar resultados de pesquisa...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "A carregar sub-coleções...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   "loading.sub-communities": "A carregar sub-comunidades...",
-  
+
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "A carregar comunidades de nível superior...",
-  
-  
-  
+
   // "login.form.email": "Email address",
   "login.form.email": "Endereço de email",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "Esqueceu a palavra-chave?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Por favor entre no repositório",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
-  "login.form.new-user": "Novo Utilizador? Clique aqui para se registar.",
-  
+  "login.form.new-user": "Novo utilizador? Clique aqui para se registar.",
+
   // "login.form.or-divider": "or",
   "login.form.or-divider": "ou",
-  
+
+  // "login.form.oidc": "Log in with OIDC",
+  "login.form.oidc": "Entrar com OIDC",
+
+  // "login.form.orcid": "Log in with ORCID",
+  "login.form.orcid": "Entrar com ORCID",
+
   // "login.form.password": "Password",
   "login.form.password": "Palavra-chave",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
-  "login.form.shibboleth": "Entrar com Autenticação Federada",
-  
+  "login.form.shibboleth": "Entrar com autenticação federada",
+
   // "login.form.submit": "Log in",
   "login.form.submit": "Entrar",
-  
+
   // "login.title": "Login",
   "login.title": "Entrar",
-  
+
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Entrar",
-  
-  
-  
+
   // "logout.form.header": "Log out from DSpace",
-  "logout.form.header": "Sair do DSpace",
-  
+  "logout.form.header": "Sair do repositório",
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Sair",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Sair",
-  
-  
-  
-  // "menu.header.admin": "Admin",
+
+  // "menu.header.admin": "Management",
   "menu.header.admin": "Administração",
-  
+
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Logo do repositório",
-  
-  
-  
+
+  // "menu.header.admin.description": "Management menu",
+  "menu.header.admin.description": "Menu de administração",
+
   // "menu.section.access_control": "Access Control",
-  "menu.section.access_control": "Controle de Acesso",
-  
+  "menu.section.access_control": "Controlo de acesso",
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Autorizações",
-  
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Grupos",
-  
+
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Pessoas",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  "menu.section.reports": "Relatórios",
+
+  // "menu.section.reports.collections": "Filtered Collections",
+  "menu.section.reports.collections": "Coleções filtradas",
+
+  // "menu.section.reports.queries": "Metadata Query",
+  "menu.section.reports.queries": "Consultas de metadados",
+
   // "menu.section.admin_search": "Admin Search",
-  "menu.section.admin_search": "Pesquisa Administrativa",
-  
-  
-  
+  "menu.section.admin_search": "Pesquisa administrativa",
+
   // "menu.section.browse_community": "This Community",
-  "menu.section.browse_community": "Esta Comunidade",
-  
+  "menu.section.browse_community": "Esta comunidade",
+
   // "menu.section.browse_community_by_author": "By Author",
-  "menu.section.browse_community_by_author": "Por Autor",
-  
+  "menu.section.browse_community_by_author": "Por autor",
+
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
-  "menu.section.browse_community_by_issue_date": "Por Data de Publicação",
-  
+  "menu.section.browse_community_by_issue_date": "Por data de publicação",
+
   // "menu.section.browse_community_by_title": "By Title",
-  "menu.section.browse_community_by_title": "Por Título",
-  
+  "menu.section.browse_community_by_title": "Por título",
+
   // "menu.section.browse_global": "All of DSpace",
-  "menu.section.browse_global": "Percorrer",
-  
+  "menu.section.browse_global": "Percorrer repositório",
+
   // "menu.section.browse_global_by_author": "By Author",
-  "menu.section.browse_global_by_author": "Por Autor",
-  
+  "menu.section.browse_global_by_author": "Por autor",
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
-  "menu.section.browse_global_by_dateissued": "Por Data de Publicação",
-  
+  "menu.section.browse_global_by_dateissued": "Por data de publicação",
+
   // "menu.section.browse_global_by_subject": "By Subject",
-  "menu.section.browse_global_by_subject": "Por Assunto",
-  
+  "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_title": "By Title",
-  "menu.section.browse_global_by_title": "Por Título",
-  
+  "menu.section.browse_global_by_title": "Por título",
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  "menu.section.browse_global_communities_and_collections": "Comunidades e Coleções",
-  
-  
-  
+  "menu.section.browse_global_communities_and_collections": "Comunidades & Coleções",
+
   // "menu.section.control_panel": "Control Panel",
-  "menu.section.control_panel": "Painel de Controle",
-  
+  "menu.section.control_panel": "Painel de controle",
+
   // "menu.section.curation_task": "Curation Task",
-  "menu.section.curation_task": "Tarefas de Curadoria",
-  
-  
-  
+  "menu.section.curation_task": "Tarefas de curadoria",
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Editar",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Coleção",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "Comunidade",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Item",
-  
-  
-  
+
   // "menu.section.export": "Export",
   "menu.section.export": "Exportar",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "Coleção",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "Comunidade",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadados",
-  
-  
-  
+
+  // "menu.section.export_batch": "Batch Export (ZIP)",
+  "menu.section.export_batch": "Importaçã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",
-  
+  "menu.section.icon.access_control": "Secção do menu controle de acesso",
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
-  "menu.section.icon.admin_search": "Secção do menu de Pesquisa Administrativa",
-  
+  "menu.section.icon.admin_search": "Secção do menu pesquisa administrativa",
+
   // "menu.section.icon.control_panel": "Control Panel menu section",
-  "menu.section.icon.control_panel": "Secção do menu Painel de Controlo",
-  
-  // "menu.section.icon.curation_task": "Curation Task menu section",
-  "menu.section.icon.curation_task": "Secção do menu Tarefas de Curadoria",
-  
+  "menu.section.icon.control_panel": "Secção do menu painel de controlo",
+
+  // "menu.section.icon.curation_tasks": "Curation Task menu section",
+  "menu.section.icon.curation_tasks": "Secção do menu tarefas de curadoria",
+
   // "menu.section.icon.edit": "Edit menu section",
-  "menu.section.icon.edit": "Secção do menu Editar",
-  
+  "menu.section.icon.edit": "Secção do menu editar",
+
   // "menu.section.icon.export": "Export menu section",
-  "menu.section.icon.export": "Secção do menu Exportar",
-  
+  "menu.section.icon.export": "Secção do menu exportar",
+
   // "menu.section.icon.find": "Find menu section",
-  "menu.section.icon.find": "Secção do menu Pesquisar",
-  
+  "menu.section.icon.find": "Secção do menu pesquisar",
+
+  // "menu.section.icon.health": "Health check menu section",
+  "menu.section.icon.health": "Seção do menu diagnóstico do sistema",
+
   // "menu.section.icon.import": "Import menu section",
-  "menu.section.icon.import": "Secção do menu Importar",
-  
+  "menu.section.icon.import": "Secção do menu importar",
+
   // "menu.section.icon.new": "New menu section",
-  "menu.section.icon.new": "Secção do menu Novo",
-  
+  "menu.section.icon.new": "Secção do menu novo",
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Fixar barra lateral",
-  
-  // "menu.section.icon.processes": "Processes menu section",
-  "menu.section.icon.processes": "Secção do menu Processos",
-  
+
+  // "menu.section.icon.processes": "Processes Health",
+  "menu.section.icon.processes": "Processos diagnóstico",
+
   // "menu.section.icon.registries": "Registries menu section",
-  "menu.section.icon.registries": "Secção do menu Registos",
-  
+  "menu.section.icon.registries": "Secção do menu registos",
+
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
-  "menu.section.icon.statistics_task": "Secção do menu Tarefas de Estatísticas",
-  
+  "menu.section.icon.statistics_task": "Secção do menu tarefas de estatísticas",
+
+  // "menu.section.icon.workflow": "Administer workflow menu section",
+  "menu.section.icon.workflow": "Secção do menu de administração do fluxo de trabalho",
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Soltar barra lateral",
-  
-  
-  
+
   // "menu.section.import": "Import",
   "menu.section.import": "Importar",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
-  "menu.section.import_batch": "Importação em Lote (ZIP)",
-  
+  "menu.section.import_batch": "Importação em lote (ZIP)",
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadados",
-  
-  
-  
+
   // "menu.section.new": "New",
   "menu.section.new": "Novo",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Coleção",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "Comunidade",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
-  "menu.section.new_item_version": "Versão do Item",
-  
+  "menu.section.new_item_version": "Versão do item",
+
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Processos",
-  
-  
-  
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Fixar barra lateral",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Soltar barra lateral",
-  
-  
-  
+
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Processos",
-  
-  
-  
+
+  // "menu.section.health": "Health",
+  "menu.section.health": "Diagnóstico do sistema",
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Registos",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Formatos",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadados",
-  
-  
-  
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "Estatísticas",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "Tarefas de Estatísticas",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
+  "menu.section.statistics_task": "Tarefa de estatísticas",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
-  "menu.section.toggle.access_control": "Alternar Secção Controle de Acesso",
-  
+  "menu.section.toggle.access_control": "Alternar secção controle de acesso",
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
-  "menu.section.toggle.control_panel": "Alternar Secção Painel de COntrole",
-  
+  "menu.section.toggle.control_panel": "Alternar secção painel de controle",
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  "menu.section.toggle.curation_task": "Alternar Secção Tarefas de Curadoria",
-  
+  "menu.section.toggle.curation_task": "Alternar secção tarefas de curadoria",
+
   // "menu.section.toggle.edit": "Toggle Edit section",
-  "menu.section.toggle.edit": "Alternar Secção Editar",
-  
+  "menu.section.toggle.edit": "Alternar secção editar",
+
   // "menu.section.toggle.export": "Toggle Export section",
-  "menu.section.toggle.export": "Alternar Secção Exportar",
-  
+  "menu.section.toggle.export": "Alternar secção exportar",
+
   // "menu.section.toggle.find": "Toggle Find section",
-  "menu.section.toggle.find": "Alternar Secção Pesquisa",
-  
+  "menu.section.toggle.find": "Alternar secção pesquisa",
+
   // "menu.section.toggle.import": "Toggle Import section",
-  "menu.section.toggle.import": "Alternar Secção Importar",
-  
+  "menu.section.toggle.import": "Alternar secção importar",
+
   // "menu.section.toggle.new": "Toggle New section",
-  "menu.section.toggle.new": "Alternar Nova Secção",
-  
+  "menu.section.toggle.new": "Alternar nova secção",
+
   // "menu.section.toggle.registries": "Toggle Registries section",
-  "menu.section.toggle.registries": "Alternar Secção Registos",
-  
+  "menu.section.toggle.registries": "Alternar secção registos",
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
-  "menu.section.toggle.statistics_task": "Alternar Secção Tarefas de Estatísticas",
-  
-  
+  "menu.section.toggle.statistics_task": "Alternar secção tarefas de estatísticas",
+
   // "menu.section.workflow": "Administer Workflow",
-  "menu.section.workflow": "Gestão do Workflow",
-  
-  
+  "menu.section.workflow": "Gestão do fluxo de trabalho",
+
+  // "metadata-export-search.tooltip": "Export search results as CSV",
+  "metadata-export-search.tooltip": "Exportar resultados de pesquisa em 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": "O início da exportação falhou!",
+
+  // "mydspace.breadcrumbs": "MyDSpace",
+  "mydspace.breadcrumbs": "Área pessoal",
+
   // "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 depositante do item.",
-  
+
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Insira sua mensagem aqui...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "Ocultar mensagem",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "Marcar como lida",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "Marcar como não lida",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "Sem conteúdo",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Nenhuma mensagem ainda",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "Enviar",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "Mostrar mensagem",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "Assunto...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "Selecione esta opção para enviar uma mensagem ao controlador.",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Mensagens",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "Para",
-  
+
   // "mydspace.new-submission": "New submission",
-  "mydspace.new-submission": "Nova submissão",
-  
+  "mydspace.new-submission": "Novo depósito",
+
   // "mydspace.new-submission-external": "Import metadata from external source",
   "mydspace.new-submission-external": "Importar metadados de fontes externas",
-  
+
   // "mydspace.new-submission-external-short": "Import metadata",
   "mydspace.new-submission-external-short": "Importar metadados",
-  
+
   // "mydspace.results.head": "Your submissions",
-  "mydspace.results.head": "Minhas submissões",
-  
+  "mydspace.results.head": "Meus depósitos",
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Sem Resumo",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "Sem Autores",
-  
+
   // "mydspace.results.no-collections": "No Collections",
-  "mydspace.results.no-collections": "Sem Coleções",
-  
+  "mydspace.results.no-collections": "Sem coleções",
+
   // "mydspace.results.no-date": "No Date",
-  "mydspace.results.no-date": "Sem Data",
-  
+  "mydspace.results.no-date": "Sem data",
+
   // "mydspace.results.no-files": "No Files",
-  "mydspace.results.no-files": "Sem Ficheiros",
-  
+  "mydspace.results.no-files": "Sem ficheiros",
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "Não havia itens a mostrar",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Sem título",
-  
+
   // "mydspace.results.no-uri": "No Uri",
-  "mydspace.results.no-uri": "Sem Uri",
-  
-  // "mydspace.show.workflow": "All tasks",
+  "mydspace.results.no-uri": "Sem URI",
+
+  // "mydspace.search-form.placeholder": "Search in mydspace...",
+  "mydspace.search-form.placeholder": "Pesquisar na área pessoal...",
+
+  // "mydspace.show.workflow": "Workflow tasks",
   "mydspace.show.workflow": "Todas as tarefas",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
-  "mydspace.show.workspace": "Minhas Submissões",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arquivado",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Validação",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Esperando pelo controlador",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "Fluxo de trabalho",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Espaço de trabalho",
-  
+  "mydspace.show.workspace": "Meus depósitos",
+
+  // "mydspace.show.supervisedWorkspace": "Supervised items",
+  "mydspace.show.supervisedWorkspace": "Itens supervisionados",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Depósito aceite",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Em validação",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Aguarda validador",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Em fluxo de trabalho",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Depósito por terminar",
+
   // "mydspace.title": "MyDSpace",
-  "mydspace.title": "Área Pessoal",
-  
+  "mydspace.title": "Área pessoal",
+
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Erro ao criar novo espaço de trabalho. Por favor verifique o conteúdo enviado antes de tentar novamente.",
-  
+
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
   "mydspace.upload.upload-failed-manyentries": "Fichiero não processado. Detetadas demasiadas entradas quando apenas é permitido um para ficheiros.",
-  
+
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
   "mydspace.upload.upload-failed-moreonefile": "Pedido não processado. Apenas é permitido um ficheiro.",
-  
+
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} novo(s) item(ns) de espaço de trabalho criados.",
-  
-  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
-  "mydspace.upload.upload-successful": "Novo item de espaço de trabalho criado. Clique {{here}} para o editar.",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Ver",
-  
-  
-  
+
   // "nav.browse.header": "All of DSpace",
-  "nav.browse.header": "Tudo no DSpace",
-  
+  "nav.browse.header": "Tudo no repositório",
+
   // "nav.community-browse.header": "By Community",
-  "nav.community-browse.header": "Por Comunidade",
-  
+  "nav.community-browse.header": "Por comunidade",
+
+  // "nav.context-help-toggle": "Toggle context help",
+  "nav.context-help-toggle": "Alternar ajuda contextual",
+
   // "nav.language": "Language switch",
-  "nav.language": "Escolha de idioma",
-  
+  "nav.language": "Escolher idioma",
+
   // "nav.login": "Log In",
   "nav.login": "Entrar",
-  
+
+  // "nav.user-profile-menu-and-logout": "User profile menu and Log Out",
+  "nav.user-profile-menu-and-logout": "Menu perfil do utilizador e sair",
+
   // "nav.logout": "Log Out",
   "nav.logout": "Sair",
-  
+
+  // "nav.main.description": "Main navigation bar",
+  "nav.main.description": "Barra de naveção principal",
+
   // "nav.mydspace": "MyDSpace",
-  "nav.mydspace": "Área Pessoal",
-  
+  "nav.mydspace": "Área pessoal",
+
   // "nav.profile": "Profile",
   "nav.profile": "Perfil",
-  
+
   // "nav.search": "Search",
   "nav.search": "Pesquisar",
-  
+
+  // "nav.search.button": "Submit search",
+  "nav.search.button": "Pesquisar",
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "Estatísticas",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
-  "nav.stop-impersonating": "Deixar de assumir o papel do Utilizador",
-  
-  
-  
+  "nav.stop-impersonating": "Deixar de assumir o papel do utilizador",
+
+  // "nav.subscriptions": "Subscriptions",
+  "nav.subscriptions": "Subscrições de alertas",
+
+  // "nav.toggle": "Toggle navigation",
+  "nav.toggle": "Alternar a navegação",
+
+  // "nav.user.description": "User profile bar",
+  "nav.user.description": "Barra do perfil de utilizador",
+
+  // "none.listelement.badge": "Item",
+  "none.listelement.badge": "Item",
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organização",
-  
+
+  // "orgunit.listelement.no-title": "Untitled",
+  "orgunit.listelement.no-title": "Sem título",
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Cidade",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "País",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Data estabelecida",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "Descrição",
-  
+
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "Editar registo",
-  
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Organização: ",
-  
-  
-  
+
+  // "pagination.options.description": "Pagination options",
+  "pagination.options.description": "Opções de paginação",
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Resultados por página",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} de {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "A mostrar ",
-  
+
   // "pagination.sort-direction": "Sort Options",
-  "pagination.sort-direction": "Opções de Ordenação",
-  
-  
-  
+  "pagination.sort-direction": "Opções de ordenação",
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Pessoa",
-  
+
   // "person.listelement.no-title": "No name found",
   "person.listelement.no-title": "Nome não encontrado",
-  
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Data de nascimento",
-  
+
   // "person.page.edit": "Edit this item",
   "person.page.edit": "Editar este registo",
-  
+
   // "person.page.email": "Email Address",
   "person.page.email": "Endereço de Email",
-  
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "Primeiro Nome",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "Cargo",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Último Nome",
-  
+
+  // "person.page.name": "Name",
+  "person.page.name": "Nome",
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Mostrar todos os metadados",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "ID",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "Pessoa: ",
-  
+
   // "person.search.results.head": "Person Search Results",
-  "person.search.results.head": "Resultado da pesquisa de Pessoa",
-  
-  // "person.search.title": "DSpace Angular :: Person Search",
-  "person.search.title": "DSpace :: Pesquisar Pessoa",
-  
-  
-  
+  "person.search.results.head": "Resultados da pesquisa de pessoas",
+
+  // "person-relationships.search.results.head": "Person Search Results",
+  "person-relationships.search.results.head": "Resultados da pesquisa de pessoas",
+
+  // "person.search.title": "Person Search",
+  "person.search.title": "Pesquisar pessoa",
+
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parâmetros",
-  
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "Cancelar",
-  
-  // "process.new.submit": "Submit",
+
+  // "process.new.submit": "Save",
   "process.new.submit": "Guardar",
-  
+
   // "process.new.select-script": "Script",
   "process.new.select-script": "Script",
-  
+
   // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "Escolha um script...",
-  
+
   // "process.new.select-script.required": "Script is required",
-  "process.new.select-script.required": "É necessário um Script",
-  
+  "process.new.select-script.required": "É necessário um script",
+
   // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "Selecionar ficheiro...",
-  
+
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Selecione um ficheiro",
-  
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "É necessário um valor no parâmetro",
-  
+
   // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "valor",
-  
+
   // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "ficheiro",
-  
+
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "Falta indicar os seguintes parâmetros obrigatórios:",
-  
+
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Successo",
-  
+
   // "process.new.notification.success.content": "The process was successfully created",
   "process.new.notification.success.content": "O processo foi criado com successo",
-  
+
   // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "Erro",
-  
+
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Ocorreu um erro ao criar este processo",
-  
+
+  // "process.new.notification.error.max-upload.content": "The file exceeds the maximum upload size",
+  "process.new.notification.error.max-upload.content": "O ficheiro excede o tamanho máximo de carregamento!",
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Criar um novo processo",
-  
+
   // "process.new.title": "Create a new process",
   "process.new.title": "Criar um novo processo",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Criar um novo processo",
-  
-  
-  
-  // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "Argumentos",
-  
-  // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Este processo não contém argumentos",
-  
-  // "process.detail.back" : "Back",
-  "process.detail.back" : "Voltar",
-  
-  // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Output do Processo",
-  
+
+  // "process.detail.arguments": "Arguments",
+  "process.detail.arguments": "Argumentos",
+
+  // "process.detail.arguments.empty": "This process doesn't contain any arguments",
+  "process.detail.arguments.empty": "Este processo não contém argumentos",
+
+  // "process.detail.back": "Back",
+  "process.detail.back": "Voltar",
+
+  // "process.detail.output": "Process Output",
+  "process.detail.output": "Output do Processo",
+
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Recuperar output do processo",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "A recuperar",
-  
+
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Este processo não tem output",
-  
-  // "process.detail.output-files" : "Output Files",
-  "process.detail.output-files" : "Ficheiros do Output",
-  
-  // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "Este processo não possui nenhum ficheiro de output",
-  
-  // "process.detail.script" : "Script",
-  "process.detail.script" : "Script",
-  
-  // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Processo: {{ id }} - {{ name }}",
-  
-  // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Início",
-  
-  // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Fim",
-  
-  // "process.detail.status" : "Status",
-  "process.detail.status" : "Estado",
-  
-  // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Criar processo similar",
-  
-  
-  
-  // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish" : "Tempo de término",
-  
-  // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "ID do Processo",
-  
-  // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Nome",
-  
-  // "process.overview.table.start" : "Start time",
-  "process.overview.table.start" : "Início",
-  
-  // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Estado",
-  
-  // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Utilizador",
-  
+
+  // "process.detail.output-files": "Output Files",
+  "process.detail.output-files": "Ficheiros do Output",
+
+  // "process.detail.output-files.empty": "This process doesn't contain any output files",
+  "process.detail.output-files.empty": "Este processo não possui nenhum ficheiro de output",
+
+  // "process.detail.script": "Script",
+  "process.detail.script": "Script",
+
+  // "process.detail.title": "Process: {{ id }} - {{ name }}",
+  "process.detail.title": "Processo: {{ id }} - {{ name }}",
+
+  // "process.detail.start-time": "Start time",
+  "process.detail.start-time": "Início",
+
+  // "process.detail.end-time": "Finish time",
+  "process.detail.end-time": "Fim",
+
+  // "process.detail.status": "Status",
+  "process.detail.status": "Estado",
+
+  // "process.detail.create": "Create similar process",
+  "process.detail.create": "Criar processo similar",
+
+  // "process.detail.actions": "Actions",
+  "process.detail.actions": "Ações",
+
+  // "process.detail.delete.button": "Delete process",
+  "process.detail.delete.button": "Remover processo",
+
+  // "process.detail.delete.header": "Delete process",
+  "process.detail.delete.header": "Remover processo",
+
+  // "process.detail.delete.body": "Are you sure you want to delete the current process?",
+  "process.detail.delete.body": "Tem a certeza de que quer remover o processo actual?",
+
+  // "process.detail.delete.cancel": "Cancel",
+  "process.detail.delete.cancel": "Cancelar",
+
+  // "process.detail.delete.confirm": "Delete process",
+  "process.detail.delete.confirm": "Remover processo",
+
+  // "process.detail.delete.success": "The process was successfully deleted.",
+  "process.detail.delete.success": "O processo foi removido com sucesso.",
+
+  // "process.detail.delete.error": "Something went wrong when deleting the process",
+  "process.detail.delete.error": "Ocorreu algum erro ao remover o processo",
+
+  // "process.overview.table.finish": "Finish time (UTC)",
+  "process.overview.table.finish": "Hora de término (UTC)",
+
+  // "process.overview.table.id": "Process ID",
+  "process.overview.table.id": "ID do Processo",
+
+  // "process.overview.table.name": "Name",
+  "process.overview.table.name": "Nome",
+
+  // "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": "Estado",
+
+  // "process.overview.table.user": "User",
+  "process.overview.table.user": "Utilizador",
+
   // "process.overview.title": "Processes Overview",
-  "process.overview.title": "Resumo dos Processos",
-  
+  "process.overview.title": "Resumo dos processos",
+
   // "process.overview.breadcrumbs": "Processes Overview",
-  "process.overview.breadcrumbs": "Resumo dos Processos",
-  
+  "process.overview.breadcrumbs": "Resumo dos processos",
+
   // "process.overview.new": "New",
   "process.overview.new": "Novo",
-  
-  
+
+  // "process.overview.table.actions": "Actions",
+  "process.overview.table.actions": "Ações",
+
+  // "process.overview.delete": "Delete {{count}} processes",
+  "process.overview.delete": "Remover {{count}} processos",
+
+  // "process.overview.delete.clear": "Clear delete selection",
+  "process.overview.delete.clear": "Limpar selecção a remover",
+
+  // "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.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.header": "Delete processes",
+  "process.overview.delete.header": "Remover 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.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",
+
   // "profile.breadcrumbs": "Update Profile",
-  "profile.breadcrumbs": "Atualizar Perfil",
-  
+  "profile.breadcrumbs": "Atualizar perfil",
+
   // "profile.card.identify": "Identify",
   "profile.card.identify": "Identificação",
-  
+
   // "profile.card.security": "Security",
-  "profile.card.security": "Segurança",
-  
-  // "profile.form.submit": "Update Profile",
-  "profile.form.submit": "Atualizar Perfil",
-  
+  "profile.card.security": "Senha de acesso",
+
+  // "profile.form.submit": "Save",
+  "profile.form.submit": "Atualizar perfil",
+
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Os seus grupos",
-  
+
+  // "profile.special.groups.head": "Authorization special groups you belong to",
+  "profile.special.groups.head": "Autorização de grupos especiais aos quais pertence",
+
   // "profile.head": "Update Profile",
-  "profile.head": "Atualizar Perfil",
-  
+  "profile.head": "Atualizar perfil",
+
   // "profile.metadata.form.error.firstname.required": "First Name is required",
-  "profile.metadata.form.error.firstname.required": "O Nome é obrigatório",
-  
+  "profile.metadata.form.error.firstname.required": "O preenchimento do nome é um elemento obrigatório!",
+
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
-  "profile.metadata.form.error.lastname.required": "O Apelido é obrigatório",
-  
+  "profile.metadata.form.error.lastname.required": "O preenchiento do apelido é um elemento obrigatório!",
+
   // "profile.metadata.form.label.email": "Email Address",
   "profile.metadata.form.label.email": "Endereço de correio eletrónico",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "Nome",
-  
+
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "Idioma",
-  
+
   // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "Apelido",
-  
+
   // "profile.metadata.form.label.phone": "Contact Telephone",
   "profile.metadata.form.label.phone": "Contacto telefónico",
-  
+
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
   "profile.metadata.form.notifications.success.content": "As alterações ao perfil foram guardadas.",
-  
+
   // "profile.metadata.form.notifications.success.title": "Profile saved",
   "profile.metadata.form.notifications.success.title": "Perfil guardado",
-  
+
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
   "profile.notifications.warning.no-changes.content": "Não foram efetuadas alterações ao perfil.",
-  
+
   // "profile.notifications.warning.no-changes.title": "No changes",
   "profile.notifications.warning.no-changes.title": "Sem alterações",
-  
+
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
-  "profile.security.form.error.matching-passwords": "As palavras-chave não coincidem.",
-  
-  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
-  "profile.security.form.error.password-length": "A palavra-chave deve ter pelo menos 6 caracteres.",
-  
-  // "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": "Opcionalmente, pode incluir a nova palavra-chave na primeira caixa de texto e confirmar a mesma incluindo-a novamente na segunda caixa de texto. Deverá possuir pelo menos 6 caracteres.",
-  
+  "profile.security.form.error.matching-passwords": "As senhas não coincidem.",
+
+  // "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": "Opcionalmente, pode criar uma nova senha introduzindo-a primeira caixa de texto e confirmando-a na segunda caixa de texto.",
+
   // "profile.security.form.label.password": "Password",
-  "profile.security.form.label.password": "Palavra-chave",
-  
+  "profile.security.form.label.password": "Senha",
+
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
-  "profile.security.form.label.passwordrepeat": "Insira novamente para confirmar",
-  
+  "profile.security.form.label.passwordrepeat": "Insira novamente a senha para confirmar",
+
+  // "profile.security.form.label.current-password": "Current password",
+  "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": "As alterações à palavra-chave foram guardadas.",
-  
+  "profile.security.form.notifications.success.content": "As alterações da senha foram guardadas.",
+
   // "profile.security.form.notifications.success.title": "Password saved",
-  "profile.security.form.notifications.success.title": "Palavra-chave guardada",
-  
+  "profile.security.form.notifications.success.title": "Senha guardada",
+
   // "profile.security.form.notifications.error.title": "Error changing passwords",
-  "profile.security.form.notifications.error.title": "Erro ao mudar a palavra-chave",
-  
-  // "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": "A palavra-chave deve ter pelo menos 6 caracteres.",
-  
+  "profile.security.form.notifications.error.title": "Erro ao mudar 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.",
+  "profile.security.form.notifications.error.change-failed": "Ocorreu um erro ao tentar alterar a senha. Verifique se a senha atual está correcta.",
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
-  "profile.security.form.notifications.error.not-same": "As palavras-chave fornecidas não coincidem.",
-  
+  "profile.security.form.notifications.error.not-same": "As senhas fornecidas não coincidem.",
+
+  // "profile.security.form.notifications.error.general": "Please fill required fields of security form.",
+  "profile.security.form.notifications.error.general": "Por favor preencha os campos obrigatórios no formulário de segurança.",
+
   // "profile.title": "Update Profile",
-  "profile.title": "Atualizar Perfil",
-  
-  
-  
+  "profile.title": "Atualizar perfil",
+
+  // "profile.card.researcher": "Researcher Profile",
+  "profile.card.researcher": "Perfil do investigador",
+
   // "project.listelement.badge": "Research Project",
-  "project.listelement.badge": "Projeto de Investigação",
-  
+  "project.listelement.badge": "Projeto de investigação",
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Contribuidores",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "Descrição",
-  
+
   // "project.page.edit": "Edit this item",
   "project.page.edit": "Editar este item",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Conclusão esperada",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "Financiadores",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "ID",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Palavras-chave",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "Estado",
-  
+
   // "project.page.titleprefix": "Research Project: ",
-  "project.page.titleprefix": "Projeto de Investigação: ",
-  
+  "project.page.titleprefix": "Projeto de investigação: ",
+
   // "project.search.results.head": "Project Search Results",
-  "project.search.results.head": "Resultado da Pesquisa de Projetos",
-  
-  
-  
+  "project.search.results.head": "Resultados da pesquisa de projetos",
+
+  // "project-relationships.search.results.head": "Project Search Results",
+  "project-relationships.search.results.head": "Resultados da pesquisa de projetos",
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Publicação",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "Descrição",
-  
+
   // "publication.page.edit": "Edit this item",
   "publication.page.edit": "Editar este item",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
-  "publication.page.journal-issn": "ISSN do Periódico",
-  
+  "publication.page.journal-issn": "ISSN da revista",
+
   // "publication.page.journal-title": "Journal Title",
-  "publication.page.journal-title": "Título do Periódico",
-  
+  "publication.page.journal-title": "Título da revista",
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Editora",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Publicação: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Título do Volume",
-  
+
   // "publication.search.results.head": "Publication Search Results",
-  "publication.search.results.head": "Resultados da Busca de Publicação",
-  
-  // "publication.search.title": "DSpace Angular :: Publication Search",
-  "publication.search.title": "DSpace :: Busca de Publicações",
-  
-  
+  "publication.search.resuts.head": "Resultados da pesquisa de publicações",
+
+  // "publication-relationships.search.results.head": "Publication Search Results",
+  "publication-relationships.search.results.head": "Resultados da pesquisa de publicações",
+
+  // "publication.search.title": "Publication Search",
+  "publication.search.title": "Pesquisa de publicações",
+
+  // "media-viewer.next": "Next",
+  "media-viewer.next": "Próximo",
+
+  // "media-viewer.previous": "Previous",
+  "media-viewer.previous": "Anterior",
+
+  // "media-viewer.playlist": "Playlist",
+  "media-viewer.playlist": "Playlist",
+
   // "register-email.title": "New user registration",
-  "register-email.title": "Registo de Novo Utilizador",
-  
+  "register-email.title": "Registo de novo utilizador",
+
   // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "Criar perfil",
-  
+
   // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "Identificação",
-  
+
   // "register-page.create-profile.identification.email": "Email Address",
-  "register-page.create-profile.identification.email": "Endereço de Correio Eletrónico",
-  
+  "register-page.create-profile.identification.email": "Endereço de correio eletrónico",
+
   // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "Nome *",
-  
+
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
-  "register-page.create-profile.identification.first-name.error": "Inclua um Nome",
-  
+  "register-page.create-profile.identification.first-name.error": "Inclua um nome",
+
   // "register-page.create-profile.identification.last-name": "Last Name *",
   "register-page.create-profile.identification.last-name": "Apelido *",
-  
+
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
-  "register-page.create-profile.identification.last-name.error": "Inclua um Apelido",
-  
+  "register-page.create-profile.identification.last-name.error": "Inclua um apelido",
+
   // "register-page.create-profile.identification.contact": "Contact Telephone",
-  "register-page.create-profile.identification.contact": "Contacto Telefónico",
-  
+  "register-page.create-profile.identification.contact": "Contacto telefónico",
+
   // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "Idioma",
-  
+
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Segurança",
-  
-  // "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": "Insira uma palavra-chave na caixa abaixo, e confirme colocando-a de novo da segunda caixa. Deverá ter pelo menos 6 caracteres.",
-  
+
+  // "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": "Insira uma palavra-chave na caixa abaixo, e confirme colocando-a de novo da segunda caixa.",
+
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Palavra-chave *",
-  
+
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
   "register-page.create-profile.security.label.passwordrepeat": "Escreva novamente para confirmar *",
-  
+
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
   "register-page.create-profile.security.error.empty-password": "Inclua uma palavra-chave na caixa de texto abaixo.",
-  
+
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "As palavras-chave não coincidem.",
-  
-  // "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": "A palavra-chave deve possuir pelo menos 6 caracteres.",
-  
+
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Finalizar Registo",
-  
+
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
-  "register-page.create-profile.submit.error.content": "Ocorreu um erro ao registar o Utilizador.",
-  
+  "register-page.create-profile.submit.error.content": "Ocorreu um erro ao registar o utilizador.",
+
   // "register-page.create-profile.submit.error.head": "Registration failed",
-  "register-page.create-profile.submit.error.head": "Falha no Registo",
-  
+  "register-page.create-profile.submit.error.head": "Falha no registo",
+
   // "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": "O registo foi criado com sucesso. Foi iniciada sessão com o Utilizador criado.",
-  
+
   // "register-page.create-profile.submit.success.head": "Registration completed",
-  "register-page.create-profile.submit.success.head": "Registo Finalizado com Sucesso",
-  
-  
+  "register-page.create-profile.submit.success.head": "Registo finalizado com sucesso",
+
   // "register-page.registration.header": "New user registration",
-  "register-page.registration.header": "Registo de Novo Utilizador",
-  
+  "register-page.registration.header": "Registo de novo utilizador",
+
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
-  "register-page.registration.info": "Registe uma conta de Utilizador para subscrever novos conteúdos das coleções e depositar itens no repositório.",
-  
+  "register-page.registration.info": "Crie uma conta de utilizador para subscrever novos conteúdos das coleções e depositar itens no repositório.",
+
   // "register-page.registration.email": "Email Address *",
-  "register-page.registration.email": "Endereço de Correio Eletrónico *",
-  
+  "register-page.registration.email": "Endereço de correio eletrónico *",
+
   // "register-page.registration.email.error.required": "Please fill in an email address",
-  "register-page.registration.email.error.required": "Insira um endereço de email",
-  
-  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
-  "register-page.registration.email.error.pattern": "Insira um endereço de email válido",
-  
+  "register-page.registration.email.error.required": "Insira um endereço de correio eletrónico",
+
+  // "register-page.registration.email.error.not-email-form": "Please fill in a valid email address.",
+  "register-page.registration.email.error.not-email-form": "Insira um endereço de correio eletrónico válido.",
+
+  // "register-page.registration.email.error.not-valid-domain": "Use email with allowed domains: {{ domains }}",
+  "register-page.registration.email.error.not-valid-domain": "Usar endereço de correio eletrónico 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 de correio eletrónico será verificado e usado para iniciar sessão.",
-  
+
   // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "Registo",
-  
+
   // "register-page.registration.success.head": "Verification email sent",
-  "register-page.registration.success.head": "Email de verificação enviado",
-  
+  "register-page.registration.success.head": "Enviado email de verificação",
+
   // "register-page.registration.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "register-page.registration.success.content": "Foi enviado um email para {{ email }} com instruções e um endereço especial para confirmação.",
-  
+
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "Erro ao registar o endereço de correio eletrónico",
-  
+
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Ocorreu um erro ao registar o seguinte endereço de correio eletrónico: {{ email }}",
-  
-  
-  
+
+  // "register-page.registration.error.recaptcha": "Error when trying to authenticate with recaptcha",
+  "register-page.registration.error.recaptcha": "Ocorreu um 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.",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Para se registar deve aceitar o <b>registo e a senha de recuperação</b> (Google reCaptcha) cookies.",
+
+  // "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 endereço de e-mail não consta da lista de domínios que podem ser registados. Os domínios permitidos são {{ domains }}",
+
+  // "register-page.registration.google-recaptcha.open-cookie-settings": "Open cookie settings",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Configurações de Open 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": "Ocorreu um erro na verificação do reCaptcha",
+
+  // "register-page.registration.google-recaptcha.notification.message.expired": "Verification expired. Please verify again.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Verificação expirou. Por favor verifique novamente.",
+
+  // "register-page.registration.info.maildomain": "Accounts can be registered for mail addresses of the domains",
+  "register-page.registration.info.maildomain": "As contas podem ser registadas para os endereços de email os 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": "Não foi encontrado uma licação adequada no tipo de relação {{ type }} entre os dois itens",
-  
+
   // "relationships.add.error.server.content": "The server returned an error",
   "relationships.add.error.server.content": "O servidor devolveu um erro",
-  
+
   // "relationships.add.error.title": "Unable to add relationship",
   "relationships.add.error.title": "Não foi possível adicionar um relação",
-  
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Autores",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   "relationships.isAuthorOf.Person": "Autores (pessoas)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "Autores (Unidades organizacionais)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Fascículo",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Fascículo",
-  
+
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Periódicos",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
-  "relationships.isOrgUnitOf": "Unidades Organizacionais",
-  
+  "relationships.isOrgUnitOf": "Unidades organizacionais",
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "Autores",
-  
+
   // "relationships.isProjectOf": "Research Projects",
-  "relationships.isProjectOf": "Projetos de Investigação",
-  
+  "relationships.isProjectOf": "Projetos de investigação",
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Publicações",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "Artigos",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
-  "relationships.isSingleJournalOf": "Periódico",
-  
+  "relationships.isSingleJournalOf": "Revista",
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
-  "relationships.isSingleVolumeOf": "Volume do Periódico",
-  
+  "relationships.isSingleVolumeOf": "Volume de revista",
+
   // "relationships.isVolumeOf": "Journal Volumes",
-  "relationships.isVolumeOf": "Volumes do Periódico",
-  
+  "relationships.isVolumeOf": "Volumes da revista",
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Contribuidores",
-  
-  
-  
+
+  // "relationships.isContributorOf.OrgUnit": "Contributor (Organizational Unit)",
+  "relationships.isContributorOf.OrgUnit": "Colaborador (Unidade organizacional)",
+
+  // "relationships.isContributorOf.Person": "Contributor",
+  "relationships.isContributorOf.Person": "Contribuidor",
+
+  // "relationships.isFundingAgencyOf.OrgUnit": "Funder",
+  "relationships.isFundingAgencyOf.OrgUnit": "Financiador",
+
+  // "repository.image.logo": "Repository logo",
+  "repository.image.logo": "Logótipo do repositório",
+
+  // "repository.title": "DSpace Repository",
+  "repository.title": "Repositório :: ",
+
+  // "repository.title.prefix": "DSpace Repository :: ",
+  "repository.title.prefix": "Repositório :: ",
+
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Adicionar",
-  
+
   // "resource-policies.add.for.": "Add a new policy",
   "resource-policies.add.for.": "Adicionar nova política",
-  
+
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
   "resource-policies.add.for.bitstream": "Adicionar uma nova política de fichiero",
-  
+
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
   "resource-policies.add.for.bundle": "Adicionar uma nova política de pacote",
-  
+
   // "resource-policies.add.for.item": "Add a new Item policy",
   "resource-policies.add.for.item": "Adicionar uma nova política de Item",
-  
+
   // "resource-policies.add.for.community": "Add a new Community policy",
   "resource-policies.add.for.community": "Adicionar uma nova política de Comunidade",
-  
+
   // "resource-policies.add.for.collection": "Add a new Collection policy",
   "resource-policies.add.for.collection": "Adicionar uma nova política de Coleção",
-  
+
   // "resource-policies.create.page.heading": "Create new resource policy for ",
   "resource-policies.create.page.heading": "Criar uma nova política de recursos para ",
-  
+
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
   "resource-policies.create.page.failure.content": "Ocorreu um erro ao criar uma política de recursos.",
-  
+
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "Operação bem sucedida",
-  
+
   // "resource-policies.create.page.title": "Create new resource policy",
   "resource-policies.create.page.title": "Criar uma nova política de recursos",
-  
+
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Apagar selecionado",
-  
+
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
   "resource-policies.delete.btn.title": "Apagar política de recurso selecionada",
-  
+
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
   "resource-policies.delete.failure.content": "Ocorreu um erro ao apagar a política de recurso selecionada.",
-  
+
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "Operação bem sucedida",
-  
+
   // "resource-policies.edit.page.heading": "Edit resource policy ",
   "resource-policies.edit.page.heading": "Editar política de recurso ",
-  
+
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Ocorreu um erro ao editar a política de recurso.",
-  
+
+  // "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": "Ocorreu um erro durante a edição da (ePerson ou grupo) da política de recursos.",
+
+  // "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": "Ocorreu um erro durante a edição da política de recursos. A (ePerson ou grupo) foi actualizado com sucesso.",
+
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "Operação bem sucedida",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   "resource-policies.edit.page.title": "Editar política de recurso",
-  
+
   // "resource-policies.form.action-type.label": "Select the action type",
-  "resource-policies.form.action-type.label": "Seleccione o tipo de ação",
-  
+  "resource-policies.form.action-type.label": "Selecione o tipo de ação",
+
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
   "resource-policies.form.action-type.required": "Deve selecionar a ação da política de recurso.",
-  
+
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
-  "resource-policies.form.eperson-group-list.label": "O Utilizador ou grupo ao qual serão atribuídas as permissões",
-  
+  "resource-policies.form.eperson-group-list.label": "O utilizador ou grupo ao qual serão atribuídas as permissões",
+
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "Seleccionar",
-  
+
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
-  "resource-policies.form.eperson-group-list.tab.eperson": "Pesquisar um Utilizador",
-  
+  "resource-policies.form.eperson-group-list.tab.eperson": "Pesquisar um utilizador",
+
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Pesquisar um grupo",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
   "resource-policies.form.eperson-group-list.table.headers.action": "Ação",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.id": "ID",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "Nome",
-  
+
+  // "resource-policies.form.eperson-group-list.modal.header": "Cannot change type",
+  "resource-policies.form.eperson-group-list.modal.header": "Não pode mudar de tipo",
+
+  // "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": "Não é possível substituir um utilizador por um grupo.",
+
+  // "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": "Não é possível substituir um grupo por uma ePerson.",
+
+  // "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": "Eliminar a  política actual de recursos e criar uma nova política com o tipo desejado.",
+
+  // "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": "Data de Fim",
-  
+  "resource-policies.form.date.end.label": "Data de fim",
+
   // "resource-policies.form.date.start.label": "Start Date",
-  "resource-policies.form.date.start.label": "Data de Início",
-  
+  "resource-policies.form.date.start.label": "Data de início",
+
   // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "Descrição",
-  
+
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Nome",
-  
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
-  "resource-policies.form.policy-type.label": "Seleccione o tipo de política",
-  
+  "resource-policies.form.policy-type.label": "Selecione o tipo de política",
+
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
   "resource-policies.form.policy-type.required": "Deve selecionar um tipo de política de recurso.",
-  
+
   // "resource-policies.table.headers.action": "Action",
   "resource-policies.table.headers.action": "Ação",
-  
+
   // "resource-policies.table.headers.date.end": "End Date",
-  "resource-policies.table.headers.date.end": "Data de Fim",
-  
+  "resource-policies.table.headers.date.end": "Data de término",
+
   // "resource-policies.table.headers.date.start": "Start Date",
-  "resource-policies.table.headers.date.start": "Data de Início",
-  
+  "resource-policies.table.headers.date.start": "Data de início",
+
   // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "Editar",
-  
+
   // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "Editar grupo",
-  
+
   // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "Editar política",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   "resource-policies.table.headers.eperson": "Utilizador",
-  
+
   // "resource-policies.table.headers.group": "Group",
   "resource-policies.table.headers.group": "Grupo",
-  
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "ID",
-  
+
   // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "Nome",
-  
+
   // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "tipo",
-  
+
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
-  "resource-policies.table.headers.title.for.bitstream": "Política de Ficheiros",
-  
+  "resource-policies.table.headers.title.for.bitstream": "Política de ficheiros",
+
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
-  "resource-policies.table.headers.title.for.bundle": "Políticas para Pacote",
-  
+  "resource-policies.table.headers.title.for.bundle": "Políticas para pacote",
+
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
-  "resource-policies.table.headers.title.for.item": "Políticas para Item",
-  
+  "resource-policies.table.headers.title.for.item": "Políticas para item",
+
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
-  "resource-policies.table.headers.title.for.community": "Políticas para Comunidades",
-  
+  "resource-policies.table.headers.title.for.community": "Políticas para comunidade",
+
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  "resource-policies.table.headers.title.for.collection": "Políticas para Coleção",
-  
-  
-  
+  "resource-policies.table.headers.title.for.collection": "Políticas para coleção",
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Mostrar",
-  
-  // "search.title": "DSpace Angular :: Search",
-  "search.title": "DSpace :: Pesquisa",
-  
+
+  // "search.title": "Search",
+  "search.title": "Pesquisa",
+
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Pesquisar",
-  
-  
+
+  // "search.search-form.placeholder": "Search the repository ...",
+  "search.search-form.placeholder": "Pesquisar no repositório...",
+
   // "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": "Data final",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Data inicial",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
-  "search.filters.applied.f.dateSubmitted": "Data de submissão",
-  
-  // "search.filters.applied.f.discoverable": "Private",
+  "search.filters.applied.f.dateSubmitted": "Data de depósito",
+
+  // "search.filters.applied.f.discoverable": "Non-discoverable",
   "search.filters.applied.f.discoverable": "Privado",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
-  "search.filters.applied.f.entityType": "Tipo de Item",
-  
+  "search.filters.applied.f.entityType": "Tipo de item",
+
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Tem ficheiros",
-  
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tipo",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "Estado",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Assunto",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "Depositante",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "Cargo",
-  
+
   // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "Fim data de nascimento",
-  
+
   // "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",
+  "search.filters.applied.f.supervisedBy": "Supervisionado por",
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Retirado",
-  
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Autor",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Nome do autor",
-  
+
+  // "search.filters.filter.author.label": "Search author name",
+  "search.filters.filter.author.label": "Pesquisar por nome",
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Data de nascimento",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Data de nascimento",
-  
+
+  // "search.filters.filter.birthDate.label": "Search birth date",
+  "search.filters.filter.birthDate.label": "Procurar data de nascimento",
+
+  // "search.filters.filter.collapse": "Collapse filter",
+  "search.filters.filter.collapse": "Fechar filtro",
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Data de publicação",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "Data de publicação",
-  
+
+  // "search.filters.filter.creativeDatePublished.label": "Search date published",
+  "search.filters.filter.creativeDatePublished.label": "Procurar data de publicação",
+
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Editor",
-  
+
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
-  
+
+  // "search.filters.filter.creativeWorkEditor.label": "Search editor",
+  "search.filters.filter.creativeWorkEditor.label": "Procurar editor",
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Assunto",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Assunto",
-  
+
+  // "search.filters.filter.creativeWorkKeywords.label": "Search subject",
+  "search.filters.filter.creativeWorkKeywords.label": "Procurar assuntos",
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Editora",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Editora",
-  
+
+  // "search.filters.filter.creativeWorkPublisher.label": "Search publisher",
+  "search.filters.filter.creativeWorkPublisher.label": "Procurar editora",
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Data",
-  
-  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
-  "search.filters.filter.dateIssued.max.placeholder": "Data Mínima",
-  
-  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  "search.filters.filter.dateIssued.min.placeholder": "Data Máxima",
-  
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Data máxima",
+
+  // "search.filters.filter.dateIssued.max.label": "End",
+  "search.filters.filter.dateIssued.max.label": "Fim",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Data mínima",
+
+  // "search.filters.filter.dateIssued.min.label": "Start",
+  "search.filters.filter.dateIssued.min.label": "Início",
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
-  "search.filters.filter.dateSubmitted.head": "Data de submissão",
-  
+  "search.filters.filter.dateSubmitted.head": "Data de depósito",
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  "search.filters.filter.dateSubmitted.placeholder": "Data de submissão",
-  
-  // "search.filters.filter.discoverable.head": "Private",
+  "search.filters.filter.dateSubmitted.placeholder": "Data de depósito",
+
+  // "search.filters.filter.dateSubmitted.label": "Search date submitted",
+  "search.filters.filter.dateSubmitted.label": "Procurar data de depósito",
+
+  // "search.filters.filter.discoverable.head": "Non-discoverable",
   "search.filters.filter.discoverable.head": "Privado",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "Retirado",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
-  "search.filters.filter.entityType.head": "Tipo de Item",
-  
+  "search.filters.filter.entityType.head": "Tipo de item",
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
-  "search.filters.filter.entityType.placeholder": "Tipo de Item",
-  
+  "search.filters.filter.entityType.placeholder": "Tipo de item",
+
+  // "search.filters.filter.entityType.label": "Search item type",
+  "search.filters.filter.entityType.label": "Pesquisar por tipo",
+
+  // "search.filters.filter.expand": "Expand filter",
+  "search.filters.filter.expand": "Expandir filtro",
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
-  "search.filters.filter.has_content_in_original_bundle.head": "Tem Ficheiros",
-  
+  "search.filters.filter.has_content_in_original_bundle.head": "Tem ficheiros",
+
   // "search.filters.filter.itemtype.head": "Type",
-  "search.filters.filter.itemtype.head": "Tipo",
-  
+  "search.filters.filter.itemtype.head": "Tipo de item depositado",
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Tipo",
-  
+
+  // "search.filters.filter.itemtype.label": "Search type",
+  "search.filters.filter.itemtype.label": "Procurar por tipo",
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "Cargo",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "Cargo",
-  
+
+  // "search.filters.filter.jobTitle.label": "Search job title",
+  "search.filters.filter.jobTitle.label": "Procurar cargo",
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Idioma conhecido",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Idioma conhecido",
-  
+
+  // "search.filters.filter.knowsLanguage.label": "Search known language",
+  "search.filters.filter.knowsLanguage.label": "Procurar idiomas conhecidos",
+
   // "search.filters.filter.namedresourcetype.head": "Status",
-  "search.filters.filter.namedresourcetype.head": "Estado",
-  
+  "search.filters.filter.namedresourcetype.head": "Estado do depósito",
+
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Estado",
-  
+
+  // "search.filters.filter.namedresourcetype.label": "Search status",
+  "search.filters.filter.namedresourcetype.label": "Pesquisa por estado",
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "Pessoas",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "Pessoas",
-  
+
+  // "search.filters.filter.objectpeople.label": "Search people",
+  "search.filters.filter.objectpeople.label": "Procurar pessoas",
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "País",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "País",
-  
+
+  // "search.filters.filter.organizationAddressCountry.label": "Search country",
+  "search.filters.filter.organizationAddressCountry.label": "Procurar país",
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Cidade",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Cidade",
-  
+
+  // "search.filters.filter.organizationAddressLocality.label": "Search city",
+  "search.filters.filter.organizationAddressLocality.label": "Procurar cidade",
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  "search.filters.filter.organizationFoundingDate.head": "Data de Fundação",
-  
+  "search.filters.filter.organizationFoundingDate.head": "Data de fundação",
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  "search.filters.filter.organizationFoundingDate.placeholder": "Data de Fundação",
-  
+  "search.filters.filter.organizationFoundingDate.placeholder": "Data de fundação",
+
+  // "search.filters.filter.organizationFoundingDate.label": "Search date founded",
+  "search.filters.filter.organizationFoundingDate.label": "Procurar data de fundação",
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Âmbito",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
-  "search.filters.filter.scope.placeholder": "Filtrar Ãmbito",
-  
+  "search.filters.filter.scope.placeholder": "Filtrar âmbito",
+
+  // "search.filters.filter.scope.label": "Search scope filter",
+  "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-more": "Show more",
   "search.filters.filter.show-more": "Mostrar mais",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Assunto",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Assunto",
-  
+
+  // "search.filters.filter.subject.label": "Search subject",
+  "search.filters.filter.subject.label": "Pesquisar por assunto",
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Depositante",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Depositante",
-  
-  
-  
+
+  // "search.filters.filter.submitter.label": "Search submitter",
+  "search.filters.filter.submitter.label": "Procurar depositante",
+
+  // "search.filters.filter.show-tree": "Browse {{ name }} tree",
+  "search.filters.filter.show-tree": "Percorrer por hierarquia de {{ name }}",
+
+  // "search.filters.filter.supervisedBy.head": "Supervised By",
+  "search.filters.filter.supervisedBy.head": "Supervisionado por",
+
+  // "search.filters.filter.supervisedBy.placeholder": "Supervised By",
+  "search.filters.filter.supervisedBy.placeholder": "Supervisionado por",
+
+  // "search.filters.filter.supervisedBy.label": "Search Supervised By",
+  "search.filters.filter.supervisedBy.label": "Pesquisar supervisionado por",
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
-  "search.filters.entityType.JournalIssue": "Número de Revista",
-  
+  "search.filters.entityType.JournalIssue": "Número de revista",
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
-  "search.filters.entityType.JournalVolume": "Volume de Revista",
-  
+  "search.filters.entityType.JournalVolume": "Volume de revista",
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Organização",
-  
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Sim",
-  
+
   // "search.filters.has_content_in_original_bundle.false": "No",
   "search.filters.has_content_in_original_bundle.false": "Não",
-  
+
   // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "Não",
-  
+
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Sim",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Sim",
-  
+
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Não",
-  
-  
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtros",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Limpar filtros",
-  
-  
-  
+
+  // "search.filters.search.submit": "Submit",
+  "search.filters.search.submit": "Enviar",
+
   // "search.form.search": "Search",
   "search.form.search": "Pesquisar",
-  
-  // "search.form.search_dspace": "Search DSpace",
-  "search.form.search_dspace": "Pesquisar",
-  
-  // "search.form.search_mydspace": "Search MyDSpace",
-  "search.form.search_mydspace": "Pesquisar na Área Pessoal",
-  
-  
-  
+
+  // "search.form.search_dspace": "All repository",
+  "search.form.search_dspace": "Pesquisar tudo",
+
+  // "search.form.scope.all": "All of DSpace",
+  "search.form.scope.all": "Pesquisar tudo",
+
   // "search.results.head": "Search Results",
-  "search.results.head": "Resultados de Busca",
-  
+  "search.results.head": "Resultados da pesquisa",
+
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "Sua pesquisa não retornou resultados. Tem dificuldade em encontrar o que procura? Tente incluir ",
-  
+
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "os termos entre aspas",
-  
+
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "A sua pesquisa não retornou resultados.",
-  
-  
-  
+
+  // "search.results.view-result": "View",
+  "search.results.view-result": "Ver",
+
+  // "search.results.response.500": "An error occurred during query execution, please try again later",
+  "search.results.response.500": "Ocorreu um erro durante a execução da consulta, por favor tente novamente mais tarde",
+
+  // "default.search.results.head": "Search Results",
+  "default.search.results.head": "Resultados da pesquisa",
+
+  // "default-relationships.search.results.head": "Search Results",
+  "default-relationships.search.results.head": "Resultados da pesquisa",
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Voltar para os resultados",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Filtros",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Ferramentas de pesquisa",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "resultados",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Resultados por página",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Ordenar por",
-  
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Configurações",
-  
-  
-  
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Mostrar detalhes",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "Mostrar como grade",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Mostrar como lista",
-  
-  
-  
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Ascendente",
-  
+
   // "sorting.DESC": "Descending",
   "sorting.DESC": "Descendente",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
-  "sorting.dc.title.ASC": "Título Ascendente",
-  
+  "sorting.dc.title.ASC": "Título ascendente",
+
   // "sorting.dc.title.DESC": "Title Descending",
-  "sorting.dc.title.DESC": "Título Descendente",
-  
-  // "sorting.score.DESC": "Relevance",
-  "sorting.score.DESC": "Relevância",
-  
-  
-  
+  "sorting.dc.title.DESC": "Título descendente",
+
+  // "sorting.score.ASC": "Least Relevant",
+  "sorting.score.ASC": "Menos relevante",
+
+  // "sorting.score.DESC": "Most Relevant",
+  "sorting.score.DESC": "Mais relevante",
+
+  // "sorting.dc.date.issued.ASC": "Date Issued Ascending",
+  "sorting.dc.date.issued.ASC": "Data publicação ascendente",
+
+  // "sorting.dc.date.issued.DESC": "Date Issued Descending",
+  "sorting.dc.date.issued.DESC": "Data publicação descendente",
+
+  // "sorting.dc.date.accessioned.ASC": "Accessioned Date Ascending",
+  "sorting.dc.date.accessioned.ASC": "Data depósito ascendente",
+
+  // "sorting.dc.date.accessioned.DESC": "Accessioned Date Descending",
+  "sorting.dc.date.accessioned.DESC": "Data depósito descendente",
+
+  // "sorting.lastModified.ASC": "Last modified Ascending",
+  "sorting.lastModified.ASC": "Última alteração ascendente",
+
+  // "sorting.lastModified.DESC": "Last modified Descending",
+  "sorting.lastModified.DESC": "Última alteração descendente",
+
   // "statistics.title": "Statistics",
   "statistics.title": "Estatísticas",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "Estatísticas para {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "Estatísticas",
-  
+
   // "statistics.page.no-data": "No data available",
   "statistics.page.no-data": "Sem dados disponíveis",
-  
+
   // "statistics.table.no-data": "No data available",
   "statistics.table.no-data": "Sem dados disponíveis",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
-  "statistics.table.title.TotalVisits": "Total de Visitas",
-  
+  "statistics.table.title.TotalVisits": "Total de visitas",
+
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
-  "statistics.table.title.TotalVisitsPerMonth": "Total de Visitas por Mês",
-  
+  "statistics.table.title.TotalVisitsPerMonth": "Total de visitas por mês",
+
   // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "Downloads",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
-  "statistics.table.title.TopCountries": "Top de Consultas por País",
-  
+  "statistics.table.title.TopCountries": "Top de consultas por país",
+
   // "statistics.table.title.TopCities": "Top city views",
-  "statistics.table.title.TopCities": "Top de Consultas por Cidade",
-  
+  "statistics.table.title.TopCities": "Top de consultas por cidade",
+
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Consultas",
-  
-  
-  
+
+  // "statistics.table.no-name": "(object name could not be loaded)",
+  "statistics.table.no-name": "(não foi possível carregar o nome do objeto)",
+
+  // "submission.edit.breadcrumbs": "Edit Submission",
+  "submission.edit.breadcrumbs": "Editar depósito",
+
   // "submission.edit.title": "Edit Submission",
-  "submission.edit.title": "Editar Submissão",
-  
-  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
-  "submission.general.cannot_submit": "Você não tem privilégios para fazer uma nova submissão.",
-  
+  "submission.edit.title": "Editar depósito",
+
+  // "submission.general.cancel": "Cancel",
+  "submission.general.cancel": "Cancelar",
+
+  // "submission.general.cannot_submit": "You don't have permission to make a new submission.",
+  "submission.general.cannot_submit": "Não possui permissões para fazer um novo depósito.",
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Depositar",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Cancelar",
-  
+
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Esta operação não pode ser desfeita. Tem certeza?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Sim, tenho certeza",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
-  "submission.general.discard.confirm.title": "Cancelar submissão",
-  
+  "submission.general.discard.confirm.title": "Cancelar depósito",
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "Cancelar",
-  
+
+  // "submission.general.info.saved": "Saved",
+  "submission.general.info.saved": "Informação guardada",
+
+  // "submission.general.info.pending-changes": "Unsaved changes",
+  "submission.general.info.pending-changes": "Alterações não guardadas",
+
   // "submission.general.save": "Save",
   "submission.general.save": "Guardar",
-  
+
   // "submission.general.save-later": "Save for later",
-  "submission.general.save-later": "Guardar para continuar depois",
-  
-  
+  "submission.general.save-later": "Guardar e fechar",
+
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Importar metadados de uma fonte externa",
-  
+
   // "submission.import-external.title": "Import metadata from an external source",
   "submission.import-external.title": "Importar metadados de uma fonte externa",
-  
+
+  // "submission.import-external.title.Journal": "Import a journal from an external source",
+  "submission.import-external.title.Journal": "Importar revista de uma fonte externa",
+
+  // "submission.import-external.title.JournalIssue": "Import a journal issue from an external source",
+  "submission.import-external.title.JournalIssue": "Importar o número de um revista de um fonte externa",
+
+  // "submission.import-external.title.JournalVolume": "Import a journal volume from an external source",
+  "submission.import-external.title.JournalVolume": "Importar o volume de uma revista de fonte externa",
+
+  // "submission.import-external.title.OrgUnit": "Import a publisher from an external source",
+  "submission.import-external.title.OrgUnit": "Importar editora de uma fonte externa",
+
+  // "submission.import-external.title.Person": "Import a person from an external source",
+  "submission.import-external.title.Person": "Importar pessoa de uma fonte externa",
+
+  // "submission.import-external.title.Project": "Import a project from an external source",
+  "submission.import-external.title.Project": "Importar projeto de uma fonte externa",
+
+  // "submission.import-external.title.Publication": "Import a publication from an external source",
+  "submission.import-external.title.Publication": "Importar uma publicação de uma fonte externa",
+
+  // "submission.import-external.title.none": "Import metadata from an external source",
+  "submission.import-external.title.none": "Importar metadados de uma fonte externa",
+
   // "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": "Pesquise itens abaixo disponíveis na internet para que sejam importados para o repositório.",
-  
+
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "Voltar à Minha Área",
-  
+
   // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "Pesquisar em fonte externa",
-  
+
   // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "Pesquisar",
-  
+
   // "submission.import-external.search.button.hint": "Write some words to search",
   "submission.import-external.search.button.hint": "Escreva algumas palavras para pesquisar",
-  
+
   // "submission.import-external.search.source.hint": "Pick an external source",
   "submission.import-external.search.source.hint": "Selecione uma fonte externa",
-  
+
   // "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": "European Patent Office (EPO)",
+
   // "submission.import-external.source.loading": "Loading ...",
-  "submission.import-external.source.loading": "A Carregar ...",
-  
+  "submission.import-external.source.loading": "A carregar ...",
+
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  "submission.import-external.source.sherpaJournal": "Revistas do SHERPA",
-  
+  "submission.import-external.source.sherpaJournal": "Revistas Sherpa Romeo por nome",
+
+  // "submission.import-external.source.sherpaJournalIssn": "SHERPA Journals by ISSN",
+  "submission.import-external.source.sherpaJournalIssn": "Revistas Sherpa Romeo por ISSN",
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  "submission.import-external.source.sherpaPublisher": "Editores do SHERPA",
-  
+  "submission.import-external.source.sherpaPublisher": "Editoras Sherpa Romeo",
+
+  // "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.openAIREFunding": "Financiamento via API OpenAIRE",
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
-  
-  // "submission.import-external.source.pubmed": "Pubmed",
-  "submission.import-external.source.pubmed": "Pubmed",
-  
+
+  // "submission.import-external.source.pubmed": "PubMed",
+  "submission.import-external.source.pubmed": "PubMed",
+
+  // "submission.import-external.source.pubmedeu": "PubMed Europe",
+  "submission.import-external.source.pubmedeu": "PubMed Europa",
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Nomes da Library of Congress",
-  
+
   // "submission.import-external.preview.title": "Item Preview",
-  "submission.import-external.preview.title": "Prévisualização do Item",
-  
+  "submission.import-external.preview.title": "Pré-visualização do item",
+
+  // "submission.import-external.preview.title.Publication": "Publication Preview",
+  "submission.import-external.preview.title.Publication": "Pré-visualização da publicação",
+
+  // "submission.import-external.preview.title.none": "Item Preview",
+  "submission.import-external.preview.title.none": "Pré-visualização do item",
+
+  // "submission.import-external.preview.title.Journal": "Journal Preview",
+  "submission.import-external.preview.title.Journal": "Pré-visualização da revista",
+
+  // "submission.import-external.preview.title.OrgUnit": "Organizational Unit Preview",
+  "submission.import-external.preview.title.OrgUnit": "Pré-visualização da organização",
+
+  // "submission.import-external.preview.title.Person": "Person Preview",
+  "submission.import-external.preview.title.Person": "Pré-visualização dos dados pessoais a importar",
+
+  // "submission.import-external.preview.title.Project": "Project Preview",
+  "submission.import-external.preview.title.Project": "Pré-visualização do dados do projeto a importar",
+
   // "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": "Os metadados abaixo foram importados de uma fonte externa. Serão  pré-preenchidos quando iniciar a submissão.",
-  
+  "submission.import-external.preview.subtitle": "Os seguintes metadados foram importados de uma fonte externa. Serão  pré-preenchidos quando iniciar o depósito.",
+
   // "submission.import-external.preview.button.import": "Start submission",
-  "submission.import-external.preview.button.import": "Iniciar submissão",
-  
+  "submission.import-external.preview.button.import": "Iniciar depósito",
+
   // "submission.import-external.preview.error.import.title": "Submission error",
-  "submission.import-external.preview.error.import.title": "Erro na submissão",
-  
+  "submission.import-external.preview.error.import.title": "Erro no depósito",
+
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Ocorreu um erro durante o processo de importação de metadados de uma fonte externa.",
-  
+
   // "submission.sections.describe.relationship-lookup.close": "Close",
   "submission.sections.describe.relationship-lookup.close": "Fechar",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
   "submission.sections.describe.relationship-lookup.external-source.added": "Adicionada com sucesso uma entrada local à seleção",
-  
+
   // "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": "Importar autor remoto",
-  
+
   // "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": "Importar Informação Remota",
-  
+  "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",
-  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar Número de revista remoto",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Issue": "Importar número de revista remoto",
+
   // "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",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Importar volume de revista remoto",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Projeto",
+
+  // "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": "Importar item remoto",
+
+  // "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": "Importar evento remoto",
+
+  // "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": "Importar produto remoto",
+
+  // "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": "Importar equipamento remoto",
+
+  // "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": "Importar organização 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": "Importar financiamento remoto",
+
+  // "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": "Import remote 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": "Import remote 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": "Importar projeto remoto",
+
+  // "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": "Importar publicação remota",
+
+  // "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": "Nova entidade adicionada!",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Project",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Projeto",
+
+  // "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": "Financiamento API OpenAIRE",
+
   // "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": "Importar Autor remoto",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Importar autor remoto",
+
   // "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": "Adicionado com sucesso um autor local à seleção",
-  
+
   // "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": "Importado com sucesso e adicionado autor à seleção",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Autoridade",
-  
+
   // "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": "Importar como nova autoridade local",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancelar",
-  
+
   // "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": "Seleccione a coleção para onde pretende importar as novas entradas",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Selecione a coleção para onde pretende importar as novas entradas",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entidades",
-  
+
   // "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": "Importar como nova entidade local",
-  
+
   // "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": "A Importar de LC Name",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "A importar de 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": "A Importar do ORCID",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "A importar do ORCID",
+
   // "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": "A Importar Revista do Sherpa",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "A importar revista do Sherpa",
+
   // "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": "A Importar Editora do Sherpa",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "A importar editora do Sherpa",
+
   // "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": "A Importar da PubMed",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "A importar da 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": "A Importar do arXiv",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "A importar do arXiv",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Importar",
-  
+
   // "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": "Importar Revista Remota",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Importar revista remota",
+
   // "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": "Revista local adicionada com sucesso à seleção",
-  
+
   // "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": "Importado e adicionada com sucesso uma revista externa à seleção",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Importada e adicionada com sucesso uma revista externa à seleção",
+
   // "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 número de revista remota",
-  
+
   // "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": "Número de Revista Local adicionado com sucesso à seleção",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.local-entity": "Número de revista local adicionado 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",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Importado e adicionado um Número de Revista externa com sucesso à seleção",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Issue.added.new-entity": "Importado e adicionado um número de revista externa 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 remota",
-  
+
   // "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": "Volume de Revista Local adicionado com sucesso à seleção",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.local-entity": "Volume de revista local adicionado com sucesso à seleção",
+
   // "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": "Importado e adicionado um volume de Revista externa com sucesso à seleção",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal Volume.added.new-entity": "Importado e adicionado um volume de revista externa com sucesso à seleção",
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
-  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Seleccione uma correspondência local:",
-  
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Selecione uma correspondência local:",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deseleccionar todos",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselecionar todos",
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
-  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deseleccionar página",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselecionar página",
+
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
-  "submission.sections.describe.relationship-lookup.search-tab.loading": "A Carregar...",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "A carregar...",
+
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Termos da pesquisa",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "Pesquisar",
-  
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Pesquisar...",
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Selecionar todos",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "Selecionar página",
-  
+
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "Selecionados {{ size }} itens",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Autores locais ({{ count }})",
+
   // "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.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 }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Projetos locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicações Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Publicações locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Autores locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades Organizacionais Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Unidades organizacionais locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pacotes de Dados Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Pacotes de dados locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Ficheiros de Dados Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Ficheiros de dados locais ({{ count }})",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas Locais ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Revistas locais ({{ count }})",
+
   // "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.isJournalIssueOfPublication": "Números de revistas locais ({{ 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.JournalIssue": "Números de revista locais ({{ 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.isJournalVolumeOfPublication": "Volumes de revistas locais ({{ 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": "Volume de revista Local ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Volumes de revistas locais ({{ 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 do 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": "Editoras do Sherpa ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Nomes LC ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ 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.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.isFundingAgencyOfPublication": "Pesquisar Agências de Financiamento",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Pesquisar por agências de financiamento",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Pesquisar Financiamento",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Pesquisar por financiamento",
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
-  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Pesquisar Unidades Organizacionais",
-  
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Pesquisar por unidades organizacionais",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Via API OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Projetos",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Publicação do author",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Financiamento API OpenAIRE",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Project",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Projeto",
+
+  // "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projects",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Projetos",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Funder of the Project",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Financiador do projeto",
+
+  //"submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Search...",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Pesquisar...",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
-  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Seleção Atual ({{ count }})",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Seleção atual ({{ count }})",
+
   // "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.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.JournalIssue": "Pesquisar números de revista",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Volumes de Revistas",
 
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de Revistas",
-  
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Volumes de revistas",
+
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Revistas",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Autores",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agência de Financiamento",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Agência de financiamento",
 
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  "submission.sections.describe.relationship-lookup.title.Project": "Projetos",
-  
+  "submission.sections.describe.relationship-lookup.title.Project": "Pesquisar projetos",
+
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
   "submission.sections.describe.relationship-lookup.title.Publication": "Publicações",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  "submission.sections.describe.relationship-lookup.title.Person": "Autores",
-  
+  "submission.sections.describe.relationship-lookup.title.Person": "Pesquisar autores",
+
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
-  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Unidades Organizacionais",
-  
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Pesquisar unidades organizacionais",
+
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pacote de Dados",
-  
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Pacote de dados",
+
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
-  "submission.sections.describe.relationship-lookup.title.DataFile": "Ficheiros de Dados",
-  
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Ficheiros de dados",
+
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
-  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agência de Financiamento",
-  
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Agência de financiamento",
+
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Financiamento",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
-  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Organização Principal",
-  
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Organização principal",
+
+  // "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Publication",
+  "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 dropdown",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Configurações",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
   "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Não selecionou nenhum item.",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores Selecionados",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Autores selecionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas Selecionadas",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Revistas selecionadas",
+
   // "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.isJournalVolumeOfPublication": "Volume de revistas selecionadas",
 
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos Selecionados",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Projetos selecionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicações Selecionados",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Publicações selecionadas",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores Selecionados",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Autores selecionados",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades Organizacionais Selecionadas",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Unidades organizacionais selecionadas",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Pacotes de dados selecionados",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Ficheiros de dados selecionados",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas Selecionadas",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Revistas selecionadas",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número Selecionado",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Número 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",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Volume de revista selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agência de Financiamento selecionada",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Agência de financiamento selecionada",
+
   // "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": "Número Selecionado",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Número selecionado",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Organização Selecionada",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Organização selecionada",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados da Pesquisa",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Resultados da pesquisa",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados da Pesquisa",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Resultados da pesquisa",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados da Pesquisa",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Resultados da pesquisa",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados da Pesquisa",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Resultados da pesquisa",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados da Pesquisa",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Resultados da pesquisa",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados da Pesquisa",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Resultados da pesquisa",
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
-  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados da Pesquisa",
-  
-  // "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": "Pretende guardar \"{{ value }}\" como um nome alternativo para esta pessoa permitindo a sua reutilização por outros em futuras submissões? Se não, pode usar apenas nesta submissão.",
-  
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Resultados da pesquisa",
+
+  // "submission.sections.describe.relationship-lookup.selection-tab.title": "Search Results",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Resultados da pesquisa",
+
+  // "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": "Pretende guardar \"{{ value }}\" como um nome alternativo para esta pessoa permitindo a sua reutilização por si e outros em futuros depósitos? Se não, pode usar apenas neste depósito.",
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Guardar um Nome alternativo",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
-  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar apenas para esta submissão",
-  
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Usar apenas para este depósito",
+
   // "submission.sections.ccLicense.type": "License Type",
   "submission.sections.ccLicense.type": "Tipo de licença",
-  
+
   // "submission.sections.ccLicense.select": "Select a license type…",
-  "submission.sections.ccLicense.select": "Selecionar o tipo de licença…",
-  
+  "submission.sections.ccLicense.select": "Selecionar tipo de licença…",
+
   // "submission.sections.ccLicense.change": "Change your license type…",
-  "submission.sections.ccLicense.change": "Alterar o tipo de licença…",
-  
+  "submission.sections.ccLicense.change": "Alterar tipo de licença…",
+
   // "submission.sections.ccLicense.none": "No licenses available",
   "submission.sections.ccLicense.none": "Sem licenças disponíveis",
-  
+
   // "submission.sections.ccLicense.option.select": "Select an option…",
   "submission.sections.ccLicense.option.select": "Escolher uma opção…",
-  
+
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
   "submission.sections.ccLicense.link": "Escolheu a seguinte licença:",
-  
+
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
-  "submission.sections.ccLicense.confirmation": "Consedo a licença abaixo indicada",
-  
+  "submission.sections.ccLicense.confirmation": "Concedo a licença abaixo indicada",
+
   // "submission.sections.general.add-more": "Add more",
   "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.collection": "Collection",
   "submission.sections.general.collection": "Coleção",
-  
+
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
-  "submission.sections.general.deposit_error_notice": "Houve um problema durante a submissão do item, por favor tente novamente mais tarde.",
-  
+  "submission.sections.general.deposit_error_notice": "Ocorreu um problema durante o depósito do item, por favor tente novamente mais tarde.",
+
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  "submission.sections.general.deposit_success_notice": "Submissão depositada com sucesso.",
-  
+  "submission.sections.general.deposit_success_notice": "Depositado com sucesso.",
+
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
-  "submission.sections.general.discard_error_notice": "Houve um problema ao descartar o item, por favor tente novamente mais tarde.",
-  
+  "submission.sections.general.discard_error_notice": "Ocorreu um problema ao cancelar o item, por favor tente novamente mais tarde.",
+
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  "submission.sections.general.discard_success_notice": "Submissão descartada com sucesso.",
-  
+  "submission.sections.general.discard_success_notice": "Depósito cancelado com sucesso.",
+
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
-  "submission.sections.general.metadata-extracted": "Novos metadados foram extraídos e adicionados a Secção <strong>{{sectionId}}</strong>.",
-  
+  "submission.sections.general.metadata-extracted": "Novos metadados foram extraídos e adicionados à secção <strong>{{sectionId}}</strong>.",
+
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
   "submission.sections.general.metadata-extracted-new-section": "Nova Secção <strong>{{sectionId}}</strong> foi adicionada a dubmissão.",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
-  "submission.sections.general.no-collection": "Nenhuma coleção encontrada",
-  
+  "submission.sections.general.no-collection": "Não foi encontrada nenhuma coleção",
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Sem opções disponíveis",
-  
+
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
-  "submission.sections.general.save_error_notice": "Houve um problema ao salvar o item, por favor tente novamente mais tarde.",
-  
+  "submission.sections.general.save_error_notice": "Ocorreu um problema ao guardar o item, por favor tente novamente mais tarde.",
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  "submission.sections.general.save_success_notice": "Submissão salva com sucesso.",
-  
+  "submission.sections.general.save_success_notice": "Depósito guardado com sucesso.",
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "Pesquisar uma coleção",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
-  "submission.sections.general.sections_not_valid": "Há seções incompletas.",
-  
-  
-  
+  "submission.sections.general.sections_not_valid": "Subsistem seções incompletas.",
+
+  // "submission.sections.identifiers.info": "The following identifiers will be created for your item:",
+  "submission.sections.identifiers.info": "Serão criados os seguintes identificadores para o seu item:",
+
+  // "submission.sections.identifiers.no_handle": "No handles have been minted for this item.",
+  "submission.sections.identifiers.no_handle": "Não foram gerados 'handles' para este item.",
+
+  // "submission.sections.identifiers.no_doi": "No DOIs have been minted for this item.",
+  "submission.sections.identifiers.no_doi": "Não foram gerados DOIs para este item.",
+
+  // "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": "Outros identificadores: ",
+
+  // "submission.sections.submit.progressbar.accessCondition": "Item access conditions",
+  "submission.sections.submit.progressbar.accessCondition": "Condições de acesso do item",
+
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  "submission.sections.submit.progressbar.CClicense": "Licença Creative commons",
-  
+  "submission.sections.submit.progressbar.CClicense": "Associar uma licença Creative Commons",
+
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Reciclar",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Descrever",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Descrever",
-  
+
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Descrever",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  "submission.sections.submit.progressbar.detect-duplicate": "Duplicados em potencial",
-  
+  "submission.sections.submit.progressbar.detect-duplicate": "Potenciais duplicados",
+
+  // "submission.sections.submit.progressbar.identifiers": "Identifiers",
+  "submission.sections.submit.progressbar.identifiers": "Identificadores",
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
-  "submission.sections.submit.progressbar.license": "Depositar licença",
-  
+  "submission.sections.submit.progressbar.license": "Licença de distribuição não-exclusiva do repositório",
+
+  // "submission.sections.submit.progressbar.sherpapolicy": "Sherpa policies",
+  "submission.sections.submit.progressbar.sherpapolicy": "[Ajuda em contexto] Informação SHERPA sobre políticas de editoras e revistas face ao auto-arquivo em repositórios.",
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
-  "submission.sections.submit.progressbar.upload": "Enviar ficheiros",
-  
-  
-  
+  "submission.sections.submit.progressbar.upload": "Carregar ficheiro(s)",
+
+  // "submission.sections.submit.progressbar.sherpaPolicies": "Publisher open access policy information",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Informação sobre a política de auto arquivo dos editores",
+
+  // "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": "Não foi encontrada informação disponível sobre política desta editora. Se o seu trabalho tem um ISSN associado, por favor, introduza-o em cima para poder visualizar as políticas de auto arquivo associadas.",
+
+  // "submission.sections.status.errors.title": "Errors",
+  "submission.sections.status.errors.title": "Erros",
+
+  // "submission.sections.status.valid.title": "Valid",
+  "submission.sections.status.valid.title": "Válido",
+
+  // "submission.sections.status.warnings.title": "Warnings",
+  "submission.sections.status.warnings.title": "Avisos",
+
+  // "submission.sections.status.errors.aria": "has errors",
+  "submission.sections.status.errors.aria": "contém erros",
+
+  // "submission.sections.status.valid.aria": "is valid",
+  "submission.sections.status.valid.aria": "é válido",
+
+  // "submission.sections.status.warnings.aria": "has warnings",
+  "submission.sections.status.warnings.aria": "tem avisos",
+
+  // "submission.sections.status.info.title": "Additional Information",
+  "submission.sections.status.info.title": "Informação adicional",
+
+  // "submission.sections.status.info.aria": "Additional Information",
+  "submission.sections.status.info.aria": "Informação adicional",
+
+  // "submission.sections.toggle.open": "Open section",
+  "submission.sections.toggle.open": "Seção aberta",
+
+  // "submission.sections.toggle.close": "Close section",
+  "submission.sections.toggle.close": "Seção fechada",
+
+  // "submission.sections.toggle.aria.open": "Expand {{sectionHeader}} section",
+  "submission.sections.toggle.aria.open": "Expandir seção {{sectionHeader}}",
+
+  // "submission.sections.toggle.aria.close": "Collapse {{sectionHeader}} section",
+  "submission.sections.toggle.aria.close": "Fechar seção {{sectionHeader}}",
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "Cancelar",
-  
+
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.sections.upload.delete.confirm.info": "Esta operação é irreversível. Tem certeza?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Sim, tenho certeza",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  "submission.sections.upload.delete.confirm.title": "Remover bitstream",
-  
+  "submission.sections.upload.delete.confirm.title": "Remover ficheiro",
+
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Remover",
-  
+
+  // "submission.sections.upload.download.title": "Download bitstream",
+  "submission.sections.upload.download.title": "Descarregar ficheiro",
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
-  "submission.sections.upload.drop-message": "Arraste ficheiros para os anexar a este item",
-  
+  "submission.sections.upload.drop-message": "Arraste para aqui o(s) ficheiro(s) que pretende anexar a este registo",
+
+  // "submission.sections.upload.edit.title": "Edit bitstream",
+  "submission.sections.upload.edit.title": "Editar ficheiro",
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Tipo de condição de acesso",
-  
+
+  // "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": "Selecione um tipo de acesso a aplicar ao ficheiro assim que o item seja depositado",
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Data necessária.",
-  
+
+  // "submission.sections.upload.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.upload.form.date-required-from": "A data de início é obrigatória.",
+
+  // "submission.sections.upload.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.upload.form.date-required-until": "A data de fim é obrigatória.",
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Acesso permitido a partir de",
-  
+
+  // "submission.sections.upload.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.upload.form.from-hint": "Selecione a data a partir da qual o tipo de acesso é aplicável",
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "De",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Grupo",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "Grupo é necessário.",
-  
+
   // "submission.sections.upload.form.until-label": "Grant access until",
-  "submission.sections.upload.form.until-label": "Acesso permitido até",
-  
+  "submission.sections.upload.form.until-label": "conceder acesso até",
+
+  // "submission.sections.upload.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.upload.form.until-hint": "Selecione a data até a qual o tipo de acesso será aplicado",
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Até",
-  
+
   // "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": "Arquivos enviados na coleção {{collectionName}} serão acessiveis de acordo com o(s) seguinte(s) grupo(s):",
-  
+
   // "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": "Por favor note que os ficheiros enviados à coleção {{collectionName}} serão acessíveis, de acordo com o que está explicitamente definido no ficheiro, no(s) seguinte(s) grupo(s):",
-  
-  // "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": "Aqui encontra todos os ficheiros que estão atualmente no item. Pode atualizar os metadados do ficheiro e condições de acesso ou <strong>carregar ficheiros adicionais arrastando os ficheiros em qualquer lugar desta página</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": "Aqui encontra o(s) ficheiro(s) carregado(s) neste registo. Pode atualizar os metadados do(s) ficheiro(s), <strong>definir as suas condições de acesso ou carregar ficheiros adicionais arrastando-os em qualquer local da página.</strong>",
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Não",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
-  "submission.sections.upload.no-file-uploaded": "Nenhum ficheiro enviado ainda.",
-  
+  "submission.sections.upload.no-file-uploaded": "Nenhum ficheiro carregado!",
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "Guardar metadados",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "Cancelar",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "Falha no envio",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Enviado com sucesso",
-  
-  
-  
-  // "submission.submit.title": "Submission",
-  "submission.submit.title": "Submissão",
-  
-  
-  
+
+  // "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": "Quando selecionado, este item será pesquisável na pesquisa/navegação. Se não estiver selecionado, o item apenas estará disponível através uma ligação direta (link) e não aparecerá na pesquisa/navegação.",
+
+  // "submission.sections.accesses.form.discoverable-label": "Discoverable",
+  "submission.sections.accesses.form.discoverable-label": "Recuperável",
+
+  // "submission.sections.accesses.form.access-condition-label": "Access condition type",
+  "submission.sections.accesses.form.access-condition-label": "Tipo de  acesso",
+
+  // "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": "Selecione um tipo de acesso para aplicar ao item no momento do seu depósito ",
+
+  // "submission.sections.accesses.form.date-required": "Date is required.",
+  "submission.sections.accesses.form.date-required": "O preenchimento da data é obrigatório.",
+
+  // "submission.sections.accesses.form.date-required-from": "Grant access from date is required.",
+  "submission.sections.accesses.form.date-required-from": "O preenchimento da data de início é obrigatório.",
+
+  // "submission.sections.accesses.form.date-required-until": "Grant access until date is required.",
+  "submission.sections.accesses.form.date-required-until": "O preenchimento da data de término é obrigatório.",
+
+  // "submission.sections.accesses.form.from-label": "Grant access from",
+  "submission.sections.accesses.form.from-label": "Conceder acesso a partir de",
+
+  // "submission.sections.accesses.form.from-hint": "Select the date from which the related access condition is applied",
+  "submission.sections.accesses.form.from-hint": "Selecine a data a partir da qual o tipo de acesso é aplicável",
+
+  // "submission.sections.accesses.form.from-placeholder": "From",
+  "submission.sections.accesses.form.from-placeholder": "De",
+
+  // "submission.sections.accesses.form.group-label": "Group",
+  "submission.sections.accesses.form.group-label": "Grupo",
+
+  // "submission.sections.accesses.form.group-required": "Group is required.",
+  "submission.sections.accesses.form.group-required": "A indicação de um grupo é obrigátória.",
+
+  // "submission.sections.accesses.form.until-label": "Grant access until",
+  "submission.sections.accesses.form.until-label": "Conceder acesso até",
+
+  // "submission.sections.accesses.form.until-hint": "Select the date until which the related access condition is applied",
+  "submission.sections.accesses.form.until-hint": "Selecione a data até a qual o tipo de acesso é aplicável",
+
+  // "submission.sections.accesses.form.until-placeholder": "Until",
+  "submission.sections.accesses.form.until-placeholder": "Até",
+
+  // "submission.sections.license.granted-label": "I confirm the license above",
+  "submission.sections.license.granted-label": "Confirmo a licença",
+
+  // "submission.sections.license.required": "You must accept the license",
+  "submission.sections.license.required": "A aceitação da licença constitui um requisito",
+
+  // "submission.sections.license.notgranted": "You must accept the license",
+  "submission.sections.license.notgranted": "Deve aceitar a licença",
+
+  // "submission.sections.sherpa.publication.information": "Publication information",
+  "submission.sections.sherpa.publication.information": "Informação sobre a publicação",
+
+  // "submission.sections.sherpa.publication.information.title": "Title",
+  "submission.sections.sherpa.publication.information.title": "Título",
+
+  // "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.issns": "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": "Editora",
+
+  // "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": "Política da editora",
+
+  // "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": "A seguinte informação foi obtida através do diretório SHERPA, com base nas políticas disponíveis das editoras/revistas. Fornece informações úteis, sobre as versões dos ficheiros que deverá carregar em repositórios, bem como tipo de embargo ou restrições de acesso poderá ser aconselhável. As informações do SHERPA são fidedignas tanto quanto é do nosso conhecimento, mas não devem ser assumidas como aconselhamento jurídico. Se tiver dúvidas, por favor contacte o(s) administrador(es) do seu repositório através do formulário de feedback no rodapé.",
+
+  // "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": "As 'vias' de acesso aberto permitidas pela política desta revista estão listadas em baixo, tendo em consideração as versões do artigo (ex. 'Versão final publicada', 'Versão aceite do autor', 'Versão submetida'). Clique numa via para obter mais detalhes.",
+
+  // "submission.sections.sherpa.publisher.policy.more.information": "For more information, please see the following links:",
+  "submission.sections.sherpa.publisher.policy.more.information": "Para mais informações, consulte por favor os seguintes links:",
+
+  // "submission.sections.sherpa.publisher.policy.version": "Version",
+  "submission.sections.sherpa.publisher.policy.version": "Versão",
+
+  // "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": "Sem embargo",
+
+  // "submission.sections.sherpa.publisher.policy.nolocation": "None",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Nenhuma",
+
+  // "submission.sections.sherpa.publisher.policy.license": "License",
+  "submission.sections.sherpa.publisher.policy.license": "Licença",
+
+  // "submission.sections.sherpa.publisher.policy.prerequisites": "Prerequisites",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Pré-requisitos",
+
+  // "submission.sections.sherpa.publisher.policy.location": "Location",
+  "submission.sections.sherpa.publisher.policy.location": "Localização",
+
+  // "submission.sections.sherpa.publisher.policy.conditions": "Conditions",
+  "submission.sections.sherpa.publisher.policy.conditions": "Condições",
+
+  // "submission.sections.sherpa.publisher.policy.refresh": "Refresh",
+  "submission.sections.sherpa.publisher.policy.refresh": "Atualizar",
+
+  // "submission.sections.sherpa.record.information": "Record Information",
+  "submission.sections.sherpa.record.information": "Informação do registo",
+
+  // "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": "Data de Criação",
+
+  // "submission.sections.sherpa.record.information.date.modified": "Last Modified",
+  "submission.sections.sherpa.record.information.date.modified": "Última modificação",
+
+  // "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": "Ocorreu um erro na recuperação de informações do SHERPA",
+
+  // "submission.submit.breadcrumbs": "New submission",
+  "submission.submit.breadcrumbs": "Novos depósitos",
+
+  // "submission.submit.title": "New submission",
+  "submission.submit.title": "Novo depósito",
+
   // "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": "Remover",
+
+  // "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 rejeitar este item. Ser-lhe-á pedida confirmação.",
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Editar",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
-  "submission.workflow.generic.edit-help": "Selecione esta opção para modificar os metadados do item.",
-  
+  "submission.workflow.generic.edit-help": "Selecione esta opção para modificar os metadados do item",
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "Visualizar",
-  
+
   // "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.view-help": "Visualizar os metadados do item",
+
+  // "submission.workflow.generic.submit_select_reviewer": "Select Reviewer",
+  "submission.workflow.generic.submit_select_reviewer": "Selecionar 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": "Classificar",
+
+  // "submission.workflow.generic.submit_score-help": "",
+  "submission.workflow.generic.submit_score-help": "",
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "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 você revisou o item e este está adequado para inclusão na coleção, selecione \"Aprovar\".",
-  
+  "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.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Editar",
-  
+
   // "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",
+  "submission.workflow.tasks.claimed.decline": "Declinar",
+
+  // "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": "Informe o motivo da rejeição da submissão na caixa abaixo, indicando se o depositante pode corrigir algum problema e reenviar.",
-  
+  "submission.workflow.tasks.claimed.reject.reason.info": "Informe em seguida o motivo da rejeição do depósito, indicando se o depositante pode corrigir algum problema e reenviar o depósito.",
+
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Descreva o motivo da rejeição",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
   "submission.workflow.tasks.claimed.reject.reason.submit": "Rejeitar item",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "Motivo",
-  
+
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
   "submission.workflow.tasks.claimed.reject.submit": "Rejeitar",
-  
+
   // "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": "Se reviu o item e achou que ele <strong>não</strong> é adequado para inclusão na coleção, selecione \"Rejeitar\".  Deverá indicar numa mensagem o motivo da rejeição e se o depositante deve modificar algo e reenviar.",
-  
+  "submission.workflow.tasks.claimed.reject_help": "Se reviu o item e acha que <strong>não</strong> está em conformidade para inclusão na coleção, clique em 'Rejeitar'. Deverá indicar o motivo da rejeição e/ou se o depositante pode rever algo para o reenviar.",
+
   // "submission.workflow.tasks.claimed.return": "Return to pool",
-  "submission.workflow.tasks.claimed.return": "Voltar para a listagem",
-  
+  "submission.workflow.tasks.claimed.return": "Libertar tarefa",
+
   // "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": "Enviar a tarefa para a lista para que outra pessoa possa executar.",
-  
-  
-  
+  "submission.workflow.tasks.claimed.return_help": "Libertar esta tarefa para que outra pessoa a possa executar.",
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
-  "submission.workflow.tasks.generic.error": "Ocorreu um erro durante a operação...",
-  
+  "submission.workflow.tasks.generic.error": "ocorreu um erro durante a operação...",
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
-  "submission.workflow.tasks.generic.processing": "Processando...",
-  
+  "submission.workflow.tasks.generic.processing": "A processar...",
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
-  "submission.workflow.tasks.generic.submitter": "Submetedor",
-  
+  "submission.workflow.tasks.generic.submitter": "Depositante",
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "Operação realizada com sucesso",
-  
-  
-  
+
   // "submission.workflow.tasks.pool.claim": "Claim",
-  "submission.workflow.tasks.pool.claim": "Requerer",
-  
+  "submission.workflow.tasks.pool.claim": "Assumir tarefa",
+
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
-  "submission.workflow.tasks.pool.claim_help": "Atribua esta tarefa a si mesmo.",
-  
+  "submission.workflow.tasks.pool.claim_help": "Assumir esta tarefa",
+
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
   "submission.workflow.tasks.pool.hide-detail": "Ocultar detalhes",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Mostrar detalhes",
-  
-  
-  
+
+  // "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": "Selecione esta opção para ver os metadados do item.",
+
+  // "submitter.empty": "N/A",
+  "submitter.empty": "N/E",
+
+  // "subscriptions.title": "Subscriptions",
+  "subscriptions.title": "Subscrições de alertas",
+
+  // "subscriptions.item": "Subscriptions for items",
+  "subscriptions.item": "Subscrições para itens",
+
+  // "subscriptions.collection": "Subscriptions for collections",
+  "subscriptions.collection": "Subscrições para coleções",
+
+  // "subscriptions.community": "Subscriptions for communities",
+  "subscriptions.community": "Subscrições para comunidades",
+
+  // "subscriptions.subscription_type": "Subscription type",
+  "subscriptions.subscription_type": "Tipo de subscrição",
+
+  // "subscriptions.frequency": "Subscription frequency",
+  "subscriptions.frequency": "Frequência da subscrição",
+
+  // "subscriptions.frequency.D": "Daily",
+  "subscriptions.frequency.D": "Diária",
+
+  // "subscriptions.frequency.M": "Monthly",
+  "subscriptions.frequency.M": "Mensal",
+
+  // "subscriptions.frequency.W": "Weekly",
+  "subscriptions.frequency.W": "Semanal",
+
+  // "subscriptions.tooltip": "Subscribe",
+  "subscriptions.tooltip": "Subscrever",
+
+  // "subscriptions.modal.title": "Subscriptions",
+  "subscriptions.modal.title": "Subscrições de alertas",
+
+  // "subscriptions.modal.type-frequency": "Type and frequency",
+  "subscriptions.modal.type-frequency": "Tipo e frequência",
+
+  // "subscriptions.modal.close": "Close",
+  "subscriptions.modal.close": "Fechar",
+
+  // "subscriptions.modal.delete-info": "To remove this subscription, please visit the \"Subscriptions\" page under your user profile",
+  "subscriptions.modal.delete-info": "Para remover esta subscrição, por favor aceda à página de 'subscrições' debaixo do seu perfil de utilizador",
+
+  // "subscriptions.modal.new-subscription-form.type.content": "Content",
+  "subscriptions.modal.new-subscription-form.type.content": "Conteúdo",
+
+  // "subscriptions.modal.new-subscription-form.frequency.D": "Daily",
+  "subscriptions.modal.new-subscription-form.frequency.D": "Diária",
+
+  // "subscriptions.modal.new-subscription-form.frequency.W": "Weekly",
+  "subscriptions.modal.new-subscription-form.frequency.W": "Semanal",
+
+  // "subscriptions.modal.new-subscription-form.frequency.M": "Monthly",
+  "subscriptions.modal.new-subscription-form.frequency.M": "Mensal",
+
+  // "subscriptions.modal.new-subscription-form.submit": "Submit",
+  "subscriptions.modal.new-subscription-form.submit": "Submeter",
+
+  // "subscriptions.modal.new-subscription-form.processing": "Processing...",
+  "subscriptions.modal.new-subscription-form.processing": "A processar...",
+
+  // "subscriptions.modal.create.success": "Subscribed to {{ type }} successfully.",
+  "subscriptions.modal.create.success": "Subscrição para '{{ type }}' realizada com sucessso.",
+
+  // "subscriptions.modal.delete.success": "Subscription deleted successfully",
+  "subscriptions.modal.delete.success": "Subscrição removida com sucesso",
+
+  // "subscriptions.modal.update.success": "Subscription to {{ type }} updated successfully",
+  "subscriptions.modal.update.success": "Subscrição para '{{ type }}' atualizada com suceso",
+
+  // "subscriptions.modal.create.error": "An error occurs during the subscription creation",
+  "subscriptions.modal.create.error": "Ocorre um erro durante a criação da subscrição",
+
+  // "subscriptions.modal.delete.error": "An error occurs during the subscription delete",
+  "subscriptions.modal.delete.error": "Ocorre um erro durante a remoção da subscrição",
+
+  // "subscriptions.modal.update.error": "An error occurs during the subscription update",
+  "subscriptions.modal.update.error": "Ocorre um erro durante a atualização da subscrição",
+
+  // "subscriptions.table.dso": "Subject",
+  "subscriptions.table.dso": "Assunto",
+
+  // "subscriptions.table.subscription_type": "Subscription Type",
+  "subscriptions.table.subscription_type": "Tipo de subscrição",
+
+  // "subscriptions.table.subscription_frequency": "Subscription Frequency",
+  "subscriptions.table.subscription_frequency": "Frequência da subscrição",
+
+  // "subscriptions.table.action": "Action",
+  "subscriptions.table.action": "Ação",
+
+  // "subscriptions.table.edit": "Edit",
+  "subscriptions.table.edit": "Editar",
+
+  // "subscriptions.table.delete": "Delete",
+  "subscriptions.table.delete": "Remover",
+
+  // "subscriptions.table.not-available": "Not available",
+  "subscriptions.table.not-available": "Indisponível",
+
+  // "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": "O item subscrito foi removido ou atualmente não tem permissão para o visualizar",
+
+  // "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": "Neste momento, não tem quaisquer subscrições. Para subscrever atualizações por correio electrónico para uma 'Comunidade' ou 'Colecção', utilize o botão de 'Subscrição' na página do objeto.",
+
+  // "thumbnail.default.alt": "Thumbnail Image",
+  "thumbnail.default.alt": "Miniatura",
+
+  // "thumbnail.default.placeholder": "No Thumbnail Available",
+  "thumbnail.default.placeholder": "Miniatura indisponível",
+
+  // "thumbnail.project.alt": "Project Logo",
+  "thumbnail.project.alt": "Logótipo do projeto",
+
+  // "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Imagem do projeto",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Logótipo da unidade",
+
+  // "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+  "thumbnail.orgunit.placeholder": "Imagem da unidade",
+
+  // "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Foto do perfil",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Foto indisponível",
+
   // "title": "DSpace",
-  "title": "DSpace",
-  
-  
-  
+  "title": "Repositório",
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Vista hierárquica",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "Carregar mais",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "Redefinir",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
-  "vocabulary-treeview.search.form.search": "Pesquisar",
-  
+  "vocabulary-treeview.search.form.search": "pesquisar",
+
   // "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.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Categorias de Assuntos de Investigação",
-  
-  
-  
+
+  // "vocabulary-treeview.info": "Select a subject to add as search filter",
+  "vocabulary-treeview.info": "Selecione um assunto para adicionar como filtro de pesquisa",
+
   // "uploader.browse": "browse",
-  "uploader.browse": "Navegar",
-  
+  "uploader.browse": "navegue para o(s) carregar.",
+
   // "uploader.drag-message": "Drag & Drop your files here",
-  "uploader.drag-message": "Clique e arraste os seus ficheiros aqui",
-  
+  "uploader.drag-message": "Clique e arraste o(s) seu(s) ficheiro(s) para aqui",
+
+  // "uploader.delete.btn-title": "Delete",
+  "uploader.delete.btn-title": "Apagar",
+
   // "uploader.or": ", or ",
-  "uploader.or": ", ou",
-  
+  "uploader.or": " ou",
+
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
-  // TODO Source message changed - Revise the translation
-  "uploader.processing": "A Processar",
-  
+  "uploader.processing": "A processar o(s) ficheiro(s) carregado(s)... (agora é seguro fechar esta página)",
+
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Tamanho da fila",
-  
+
   // "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": "Selecione os tipos para os quais pretende guardar os metadados virtuais como metadados reais",
-  
+
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
   "virtual-metadata.delete-item.modal-head": "Os metadados virtuais desta relação",
-  
+
   // "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 tipos para os quais pretende guardar os metadados virtuais como metadados reais",
-  
-  
-  
+
+  // "supervisedWorkspace.search.results.head": "Supervised Items",
+  "supervisedWorkspace.search.results.head": "Itens supervisionados",
+
+  // "workspace.search.results.head": "Your submissions",
+  "workspace.search.results.head": "Os meus depósitos",
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
-  "workflowAdmin.search.results.head": "Gestão do Workflow",
-  
-  
-  
+  "workflowAdmin.search.results.head": "Gestão do fluxo de trabalho",
+
+  // "workflow.search.results.head": "Workflow tasks",
+  "workflow.search.results.head": "Tarefas em fluxo de trabalho",
+
+  // "supervision.search.results.head": "Workflow and Workspace tasks",
+  "supervision.search.results.head": "Depósitos e tarefas em áreas de trabalho",
+
+  // "workflow-item.edit.breadcrumbs": "Edit workflowitem",
+  "workflow-item.edit.breadcrumbs": "Editar item em fluxo de trabalho",
+
+  // "workflow-item.edit.title": "Edit workflowitem",
+  "workflow-item.edit.title": "Editar item em em fluxo de trabalho",
+
   // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "Apagado",
-  
+
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
-  "workflow-item.delete.notification.success.content": "Este item do workflow foi apagado com sucesso",
-  
+  "workflow-item.delete.notification.success.content": "Este item em fluxo de trabalho foi apagado com sucesso",
+
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Algo correu mal",
-  
+
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
-  "workflow-item.delete.notification.error.content": "Não foi possível apagar o item do workflow",
-  
+  "workflow-item.delete.notification.error.content": "Não foi possível apagar o item do fluxo de trabalho",
+
   // "workflow-item.delete.title": "Delete workflow item",
-  "workflow-item.delete.title": "Apagar Item do Workflow",
-  
+  "workflow-item.delete.title": "Apagar item do fluxo de trabalho",
+
   // "workflow-item.delete.header": "Delete workflow item",
-  "workflow-item.delete.header": "Apagar Item do Workflow",
-  
+  "workflow-item.delete.header": "Apagar item do fluxo de trabalho",
+
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "Cancelar",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Apagar",
-  
-  
+
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Devolver ao depositante",
-  
+
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
   "workflow-item.send-back.notification.success.content": "Este item foi devolvido ao depositante com sucesso",
-  
+
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
-  "workflow-item.send-back.notification.error.title": "Alguma coisa correu mal",
-  
+  "workflow-item.send-back.notification.error.title": "Algo correu mal",
+
   // "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": "Não foi pos´sivel enviar ao depositante este item do workflow",
-  
+  "workflow-item.send-back.notification.error.content": "Não foi possível reenviar ao depositante este item em workflow",
+
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
-  "workflow-item.send-back.title": "Enviar item do workflow para o depositante",
-  
+  "workflow-item.send-back.title": "Enviar item em fluxo de trabalho para o depositante",
+
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
-  "workflow-item.send-back.header": "Enviar item do workflow para o depositante",
-  
+  "workflow-item.send-back.header": "Enviar item em fluxo de trabalho para o depositante",
+
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "Cancelar",
-  
-  // "workflow-item.send-back.button.confirm": "Send back"
-  "workflow-item.send-back.button.confirm": "Devolver"
-  
+
+  // "workflow-item.send-back.button.confirm": "Send back",
+  "workflow-item.send-back.button.confirm": "Devolver",
+
+  // "workflow-item.view.breadcrumbs": "Workflow View",
+  "workflow-item.view.breadcrumbs": "Vista das tarefas",
+
+  // "workspace-item.view.breadcrumbs": "Workspace View",
+  "workspace-item.view.breadcrumbs": "Vista das tarefas",
+
+  // "workspace-item.view.title": "Workspace View",
+  "workspace-item.view.title": "Vista das tarefas",
+
+  // "workspace-item.delete.breadcrumbs": "Workspace Delete",
+  "workspace-item.delete.breadcrumbs": "Apagar da área de trabalho",
+
+  // "workspace-item.delete.header": "Delete workspace item",
+  "workspace-item.delete.header": "Apagar item da área de trabalho",
+
+  // "workspace-item.delete.button.confirm": "Delete",
+  "workspace-item.delete.button.confirm": "Apagar",
+
+  // "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": "Apagado",
+
+  // "workspace-item.delete.title": "This workspace item was successfully deleted",
+  "workspace-item.delete.title": "Este item foi removido, com êxito, da área de trabalho",
+
+  // "workspace-item.delete.notification.error.title": "Something went wrong",
+  "workspace-item.delete.notification.error.title": "Ocorreu um erro!",
+
+  // "workspace-item.delete.notification.error.content": "The workspace item could not be deleted",
+  "workspace-item.delete.notification.error.content": "Não foi possível remover o item da área de trabalho",
+
+  // "workflow-item.advanced.title": "Advanced workflow",
+  "workflow-item.advanced.title": "Fluxo de trabalho avançado",
+
+  // "workflow-item.selectrevieweraction.notification.success.title": "Selected reviewer",
+  "workflow-item.selectrevieweraction.notification.success.title": "Selecionar revisor",
+
+  // "workflow-item.selectrevieweraction.notification.success.content": "The reviewer for this workflow item has been successfully selected",
+  "workflow-item.selectrevieweraction.notification.success.content": "O revisor para o fluxo de trabalho deste item foi seleccionado com sucesso",
+
+  // "workflow-item.selectrevieweraction.notification.error.title": "Something went wrong",
+  "workflow-item.selectrevieweraction.notification.error.title": "Ocorreu algum erro!",
+
+  // "workflow-item.selectrevieweraction.notification.error.content": "Couldn't select the reviewer for this workflow item",
+  "workflow-item.selectrevieweraction.notification.error.content": "Não foi possível selecionar o revisor para o fluxo de trabalho deste item",
+
+  // "workflow-item.selectrevieweraction.title": "Select Reviewer",
+  "workflow-item.selectrevieweraction.title": "Selecionar revisor",
+
+  // "workflow-item.selectrevieweraction.header": "Select Reviewer",
+  "workflow-item.selectrevieweraction.header": "Selecionar revisor",
+
+  // "workflow-item.selectrevieweraction.button.cancel": "Cancel",
+  "workflow-item.selectrevieweraction.button.cancel": "Cancelar",
+
+  // "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": "Classificar revisão",
+
+  // "workflow-item.scorereviewaction.notification.success.content": "The rating for this item workflow item has been successfully submitted",
+  "workflow-item.scorereviewaction.notification.success.content": "A classificação para o fluxo de trabalho deste item foi submetida com sucesso",
+
+  // "workflow-item.scorereviewaction.notification.error.title": "Something went wrong",
+  "workflow-item.scorereviewaction.notification.error.title": "Ocorreu algum erro!",
+
+  // "workflow-item.scorereviewaction.notification.error.content": "Couldn't rate this item",
+  "workflow-item.scorereviewaction.notification.error.content": "Não foi possível classificar este item",
+
+  // "workflow-item.scorereviewaction.title": "Rate this item",
+  "workflow-item.scorereviewaction.title": "Classifique este item",
+
+  // "workflow-item.scorereviewaction.header": "Rate this item",
+  "workflow-item.scorereviewaction.header": "Classifique este item",
+
+  // "workflow-item.scorereviewaction.button.cancel": "Cancel",
+  "workflow-item.scorereviewaction.button.cancel": "Cancelar",
+
+  // "workflow-item.scorereviewaction.button.confirm": "Confirm",
+  "workflow-item.scorereviewaction.button.confirm": "Confirmar",
+
+  // "idle-modal.header": "Session will expire soon",
+  "idle-modal.header": "A sua sessão vai expirar em breve!",
+
+  // "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": "Por razões de segurança, as sessões de utilizador expiram depois de {{ timeToExpire }} minutos de inatividade. A sua sessão expira em breve. Gostaria de a prolongar ou sair?",
+
+  // "idle-modal.log-out": "Log out",
+  "idle-modal.log-out": "Desligar",
+
+  // "idle-modal.extend-session": "Extend session",
+  "idle-modal.extend-session": "Prolongar sessão",
+
+  // "researcher.profile.action.processing": "Processing...",
+  "researcher.profile.action.processing": "A processar...",
+
+  // "researcher.profile.associated": "Researcher profile associated",
+  "researcher.profile.associated": "Perfil do investigador associado",
+
+  // "researcher.profile.change-visibility.fail": "An unexpected error occurs while changing the profile visibility",
+  "researcher.profile.change-visibility.fail": "Ocorre um erro inesperado ao alterar a visibilidade do perfil",
+
+  // "researcher.profile.create.new": "Create new",
+  "researcher.profile.create.new": "Criar novo",
+
+  // "researcher.profile.create.success": "Researcher profile created successfully",
+  "researcher.profile.create.success": "Perfil do investigador criado com sucesso",
+
+  // "researcher.profile.create.fail": "An error occurs during the researcher profile creation",
+  "researcher.profile.create.fail": "Ocorre um erro durante a criação do perfil do investigador",
+
+  // "researcher.profile.delete": "Delete",
+  "researcher.profile.delete": "Remover",
+
+  // "researcher.profile.expose": "Expose",
+  "researcher.profile.expose": "Expor",
+
+  // "researcher.profile.hide": "Hide",
+  "researcher.profile.hide": "Esconder",
+
+  // "researcher.profile.not.associated": "Researcher profile not yet associated",
+  "researcher.profile.not.associated": "Perfil do investigador ainda não associado",
+
+  // "researcher.profile.view": "View",
+  "researcher.profile.view": "Ver",
+
+  // "researcher.profile.private.visibility": "PRIVATE",
+  "researcher.profile.private.visibility": "PRIVADO",
+
+  // "researcher.profile.public.visibility": "PUBLIC",
+  "researcher.profile.public.visibility": "PÚBLICO",
+
+  // "researcher.profile.status": "Status:",
+  "researcher.profile.status": "Estado:",
+
+  // "researcherprofile.claim.not-authorized": "You are not authorized to claim this item. For more details contact the administrator(s).",
+  "researcherprofile.claim.not-authorized": "Não possui autorização para reinvindicar este artigo. Para mais pormenores, contactar o(s) administrador(es).",
+
+  // "researcherprofile.error.claim.body": "An error occurred while claiming the profile, please try again later",
+  "researcherprofile.error.claim.body": "Ocorreu um erro ao reclamar o perfil, por favor tente novamente mais tarde",
+
+  // "researcherprofile.error.claim.title": "Error",
+  "researcherprofile.error.claim.title": "Erro",
+
+  // "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": "Sucesso",
+
+  // "person.page.orcid.create": "Create an ORCID ID",
+  "person.page.orcid.create": "Criar um ORCID ID",
+
+  // "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": "Conceder autorizações",
+
+  // "person.page.orcid.link": "Connect to ORCID ID",
+  "person.page.orcid.link": "Ligar ao ORCID ID",
+
+  // "person.page.orcid.link.processing": "Linking profile to ORCID...",
+  "person.page.orcid.link.processing": "Ligação do perfil ao 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": "Ocorreu algum problema ao ligar o perfil ao ORCID. Se o problema persistir, contacte o administrador.",
+
+  // "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": "O ORCID iD deste perfil ({{{ orcid }}) ainda não foi ligado a uma conta no registo do ORCID ou a ligação está expirada.",
+
+  // "person.page.orcid.unlink": "Disconnect from ORCID",
+  "person.page.orcid.unlink": "Desligar do ORCID",
+
+  // "person.page.orcid.unlink.processing": "Processing...",
+  "person.page.orcid.unlink.processing": "A processar...",
+
+  // "person.page.orcid.missing-authorizations": "Missing authorizations",
+  "person.page.orcid.missing-authorizations": "Autorizações em falta",
+
+  // "person.page.orcid.missing-authorizations-message": "The following authorizations are missing:",
+  "person.page.orcid.missing-authorizations-message": "Faltam as seguintes autorizações:",
+
+  // "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": "Óptimo! Esta caixa está vazia, pelo que lhe foram concedidas todos as permissões de acesso para utilizar todas as funções oferecidas pela sua instituição.",
+
+  // "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": "Ainda não foi associado nenhum ORCID iD. Ao clicar no botão abaixo, é possível ligar este perfil a uma conta ORCID.",
+
+  // "person.page.orcid.profile-preferences": "Profile preferences",
+  "person.page.orcid.profile-preferences": "Preferências de perfil",
+
+  // "person.page.orcid.funding-preferences": "Funding preferences",
+  "person.page.orcid.funding-preferences": "Preferências de financiamento",
+
+  // "person.page.orcid.publications-preferences": "Publication preferences",
+  "person.page.orcid.publications-preferences": "Preferências de publicações",
+
+  // "person.page.orcid.remove-orcid-message": "If you need to remove your ORCID, please contact the repository administrator",
+  "person.page.orcid.remove-orcid-message": "Se precisar de remover o seu ORCID, por favor contacte o administrador do repositório",
+
+  // "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": "Afiliação",
+
+  // "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": "Educação",
+
+  // "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": "Todos financiamentos",
+
+  // "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": "Financiamentos selecionados",
+
+  // "person.page.orcid.sync-fundings.disabled": "Disabled",
+  "person.page.orcid.sync-fundings.disabled": "Desligado",
+
+  // "person.page.orcid.sync-publications.all": "All publications",
+  "person.page.orcid.sync-publications.all": "Todas as publicações",
+
+  // "person.page.orcid.sync-publications.mine": "My publications",
+  "person.page.orcid.sync-publications.mine": "As minhas publicações",
+
+  // "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": "Desligado",
+
+  // "person.page.orcid.sync-queue.discard": "Discard the change and do not synchronize with the ORCID registry",
+  "person.page.orcid.sync-queue.discard": "Cancelar a alteração e não sincronizar com o registo ORCID",
+
+  // "person.page.orcid.sync-queue.discard.error": "The discarding of the ORCID queue record failed",
+  "person.page.orcid.sync-queue.discard.error": "A eliminação do registo da fila do ORCID falhou",
+
+  // "person.page.orcid.sync-queue.discard.success": "The ORCID queue record have been discarded successfully",
+  "person.page.orcid.sync-queue.discard.success": "O registo da fila do ORCID foi descartado com sucesso",
+
+  // "person.page.orcid.sync-queue.empty-message": "The ORCID queue registry is empty",
+  "person.page.orcid.sync-queue.empty-message": "O registo de filas do ORCID está vazio",
+
+  // "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": "Descrição",
+
+  // "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",
+  "person.page.orcid.sync-queue.description.affiliation": "Afiliações",
+
+  // "person.page.orcid.sync-queue.description.country": "Country",
+  "person.page.orcid.sync-queue.description.country": "País",
+
+  // "person.page.orcid.sync-queue.description.education": "Educations",
+  "person.page.orcid.sync-queue.description.education": "Educação",
+
+  // "person.page.orcid.sync-queue.description.external_ids": "External ids",
+  "person.page.orcid.sync-queue.description.external_ids": "IDs externos",
+
+  // "person.page.orcid.sync-queue.description.other_names": "Other names",
+  "person.page.orcid.sync-queue.description.other_names": "Outros nomes",
+
+  // "person.page.orcid.sync-queue.description.qualification": "Qualifications",
+  "person.page.orcid.sync-queue.description.qualification": "Qualificações",
+
+  // "person.page.orcid.sync-queue.description.researcher_urls": "Researcher urls",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URLS dos investigadores",
+
+  // "person.page.orcid.sync-queue.description.keywords": "Keywords",
+  "person.page.orcid.sync-queue.description.keywords": "Palavras-chave",
+
+  // "person.page.orcid.sync-queue.tooltip.insert": "Add a new entry in the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.insert": "Acrescentar uma nova entrada no registo ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.update": "Update this entry on the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.update": "Actualizar esta entrada no registo do ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.delete": "Remove this entry from the ORCID registry",
+  "person.page.orcid.sync-queue.tooltip.delete": "Remover esta entrada do registo do ORCID",
+
+  // "person.page.orcid.sync-queue.tooltip.publication": "Publication",
+  "person.page.orcid.sync-queue.tooltip.publication": "Publicação",
+
+  // "person.page.orcid.sync-queue.tooltip.project": "Project",
+  "person.page.orcid.sync-queue.tooltip.project": "Projeto",
+
+  // "person.page.orcid.sync-queue.tooltip.affiliation": "Affiliation",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Afiliação",
+
+  // "person.page.orcid.sync-queue.tooltip.education": "Education",
+  "person.page.orcid.sync-queue.tooltip.education": "Educação",
+
+  // "person.page.orcid.sync-queue.tooltip.qualification": "Qualification",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Qualificação",
+
+  // "person.page.orcid.sync-queue.tooltip.other_names": "Other name",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Outro nome",
+
+  // "person.page.orcid.sync-queue.tooltip.country": "Country",
+  "person.page.orcid.sync-queue.tooltip.country": "País",
+
+  // "person.page.orcid.sync-queue.tooltip.keywords": "Keyword",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Palavra-chave",
+
+  // "person.page.orcid.sync-queue.tooltip.external_ids": "External identifier",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Identificadores externos",
+
+  // "person.page.orcid.sync-queue.tooltip.researcher_urls": "Researcher url",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL do investigador",
+
+  // "person.page.orcid.sync-queue.send": "Synchronize with ORCID registry",
+  "person.page.orcid.sync-queue.send": "Sincronizar com o registo 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": "A submissão ao ORCID falhou por falta de autorizações.",
+
+  // "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": "Clique <a href='{{{orcid}}'>aqui</a> para conceder novamente as permissões necessárias. Se o problema persistir, por favor contacte o 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": "A submissão ao ORCID falhou porque o recurso enviado para o registo do ORCID não é válido",
+
+  // "person.page.orcid.sync-queue.send.error": "The submission to ORCID failed",
+  "person.page.orcid.sync-queue.send.error": "A submissão ao ORCID falhou",
+
+  // "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": "A submissão ao ORCID falhou porque o recurso já existe no registo do 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": "O recurso já não existe no registo do ORCID.",
+
+  // "person.page.orcid.sync-queue.send.success": "The submission to ORCID was completed successfully",
+  "person.page.orcid.sync-queue.send.success": "A submissão ao ORCID foi concluída com sucesso",
+
+  // "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": "Os dados que pretende sincronizar com ORCID não são válidos",
+
+  // "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": "O valor de financiamento é obrigatório",
+
+  // "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": "O recurso a ser enviado requer pelo menos um identificador",
+
+  // "person.page.orcid.sync-queue.send.validation-error.title.required": "The title is required",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "O título é obrigatório",
+
+  // "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": "O campo 'dc.type' é obrigatório",
+
+  // "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": "A data de início é obrigatória",
+
+  // "person.page.orcid.sync-queue.send.validation-error.funder.required": "The funder is required",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "O financiador é obrigatório",
+
+  // "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": "País inválido (2 dígitos 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": "A organização é obrigatória",
+
+  // "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": "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",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "A organização a ser enviada requer um endereço",
+
+  // "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": "O endereço da organização a enviar requer uma cidade",
+
+  // "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": "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.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",
+
+  // "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": "Os identificadores da organização requerem uma fonte",
+
+  // "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": "A fonte de um dos identificadores da organização é inválida. As fontes suportadas são RINGGOLD, GRID, LEI e FUNDREF",
+
+  // "person.page.orcid.synchronization-mode": "Synchronization mode",
+  "person.page.orcid.synchronization-mode": "Modo sincronização",
+
+  // "person.page.orcid.synchronization-mode.batch": "Batch",
+  "person.page.orcid.synchronization-mode.batch": "Lote",
+
+  // "person.page.orcid.synchronization-mode.label": "Synchronization mode",
+  "person.page.orcid.synchronization-mode.label": "Modo sincronização",
+
+  // "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": "Por favor, selecione a forma como deseja que a sincronização com ORCID ocorra. As opções incluem 'Manual' (deve enviar os seus dados para o ORCID manualmente), ou 'Batch' (o sistema enviará os seus dados para o ORCID através de um script agendado).",
+
+  // "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": "Selecione se pretende enviar as suas entidades ligadas de 'Projeto' para a lista de informação de financiamento do seu registo 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": "Selecione se pretende enviar as suas entidades ligadas de 'Publicação' associadas à lista de obras do seu registo 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": "Selecione se pretende enviar os seus dados biográficos ou identificadores pessoais para o seu registo ORCID.",
+
+  // "person.page.orcid.synchronization-settings-update.success": "The synchronization settings have been updated successfully",
+  "person.page.orcid.synchronization-settings-update.success": "As definições de sincronização foram atualizadas com sucesso",
+
+  // "person.page.orcid.synchronization-settings-update.error": "The update of the synchronization settings failed",
+  "person.page.orcid.synchronization-settings-update.error": "A atualização das definições de sincronização falhou",
+
+  // "person.page.orcid.synchronization-mode.manual": "Manual",
+  "person.page.orcid.synchronization-mode.manual": "Manual",
+
+  // "person.page.orcid.scope.authenticate": "Get your ORCID iD",
+  "person.page.orcid.scope.authenticate": "Obtenha o seu ORCID iD",
+
+  // "person.page.orcid.scope.read-limited": "Read your information with visibility set to Trusted Parties",
+  "person.page.orcid.scope.read-limited": "Leia a sua informação com visibilidade definida para 'Trusted Parties'",
+
+  // "person.page.orcid.scope.activities-update": "Add/update your research activities",
+  "person.page.orcid.scope.activities-update": "Acrescentar/actualizar as suas actividades de investigação",
+
+  // "person.page.orcid.scope.person-update": "Add/update other information about you",
+  "person.page.orcid.scope.person-update": "Adicionar/actualizar outras informações sobre si",
+
+  // "person.page.orcid.unlink.success": "The disconnection between the profile and the ORCID registry was successful",
+  "person.page.orcid.unlink.success": "A desconexão entre o perfil e o registo ORCID foi bem sucedida",
+
+  // "person.page.orcid.unlink.error": "An error occurred while disconnecting between the profile and the ORCID registry. Try again",
+  "person.page.orcid.unlink.error": "Ocorreu um erro ao desligar o perfil e o registo ORCID. Tente novamente.",
+
+  // "person.orcid.sync.setting": "ORCID Synchronization settings",
+  "person.orcid.sync.setting": "Definições de sincronização ORCID",
+
+  // "person.orcid.registry.queue": "ORCID Registry Queue",
+  "person.orcid.registry.queue": "Fila de registo ORCID",
+
+  // "person.orcid.registry.auth": "ORCID Authorizations",
+  "person.orcid.registry.auth": "Autorizações ORCID",
+
+  // "home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Entradas recentes",
+
+  // "listable-notification-object.default-message": "This object couldn't be retrieved",
+  "listable-notification-object.default-message": "Este objeto não pode ser recuperado",
+
+  // "system-wide-alert-banner.retrieval.error": "Something went wrong retrieving the system-wide alert banner",
+  "system-wide-alert-banner.retrieval.error": "Algo correu mal ao recuperar o 'banner' de alerta em todo o sistema",
+
+  // "system-wide-alert-banner.countdown.prefix": "In",
+  "system-wide-alert-banner.countdown.prefix": "Em",
+
+  // "system-wide-alert-banner.countdown.days": "{{days}} day(s),",
+  "system-wide-alert-banner.countdown.days": "{{dias}} dia(s),",
+
+  // "system-wide-alert-banner.countdown.hours": "{{hours}} hour(s) and",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} hora(s) e",
+
+  // "system-wide-alert-banner.countdown.minutes": "{{minutes}} minute(s):",
+  "system-wide-alert-banner.countdown.minutes": "{{minutos}} minuto(s):",
+
+  // "menu.section.system-wide-alert": "System-wide Alert",
+  "menu.section.system-wide-alert": "Alertas gerais do sistema",
+
+  // "system-wide-alert.form.header": "System-wide Alert",
+  "system-wide-alert.form.header": "Alertas gerais do sistema",
+
+  // "system-wide-alert-form.retrieval.error": "Something went wrong retrieving the system-wide alert",
+  "system-wide-alert-form.retrieval.error": "Algo correu mal ao recuperar o alerta geral do sistema",
+
+  // "system-wide-alert.form.cancel": "Cancel",
+  "system-wide-alert.form.cancel": "Cancelar",
+
+  // "system-wide-alert.form.save": "Save",
+  "system-wide-alert.form.save": "Guardar",
+
+  // "system-wide-alert.form.label.active": "ACTIVE",
+  "system-wide-alert.form.label.active": "ACTIVO",
+
+  // "system-wide-alert.form.label.inactive": "INACTIVE",
+  "system-wide-alert.form.label.inactive": "INACTIVO",
+
+  // "system-wide-alert.form.error.message": "The system wide alert must have a message",
+  "system-wide-alert.form.error.message": "O alerta geral do sistema deve conter uma mensagem",
+
+  // "system-wide-alert.form.label.message": "Alert message",
+  "system-wide-alert.form.label.message": "Mensagem de alerta",
+
+  // "system-wide-alert.form.label.countdownTo.enable": "Enable a countdown timer",
+  "system-wide-alert.form.label.countdownTo.enable": "Ativar um temporizador de contagem decrescente",
+
+  // "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.label.preview": "System-wide alert preview",
+  "system-wide-alert.form.label.preview": "Pré-visualização de alerta geral do sistema",
+
+  // "system-wide-alert.form.update.success": "The system-wide alert was successfully updated",
+  "system-wide-alert.form.update.success": "O alerta geral do sistema foi atualizado com sucesso",
+
+  // "system-wide-alert.form.update.error": "Something went wrong when updating the system-wide alert",
+  "system-wide-alert.form.update.error": "Algo correu mal ao atualizar o alerta geral do sistema",
+
+  // "system-wide-alert.form.create.success": "The system-wide alert was successfully created",
+  "system-wide-alert.form.create.success": "O alerta geral do sistema foi criado com sucesso",
+
+  // "system-wide-alert.form.create.error": "Something went wrong when creating the system-wide alert",
+  "system-wide-alert.form.create.error": "Algo correu mal ao criar o alerta geral do sistema",
+
+  // "admin.system-wide-alert.breadcrumbs": "System-wide Alerts",
+  "admin.system-wide-alert.breadcrumbs": "Alertas gerais do sistema",
+
+  // "admin.system-wide-alert.title": "System-wide Alerts",
+  "admin.system-wide-alert.title": "Alertas gerais do sistema",
+
+
+
+  // Other strings...
+  // Missing, Duplicate or Redundant ???
+
+  // NOT FOUND 16-06-2023
+
+  // "browse.metadata.srsc": "Subject Category",
+  "browse.metadata.srsc": "vocabulário controlado (SRSC)",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Depositado",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Em validação",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for Controller",
+  "mydspace.status.mydspaceWaitingController": "Aguarda validador",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "Em fluxo de trabalho",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "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",
+
+  // "datafile.listelement.badge": "Data file",
+  "datafile.listelement.badge": "Ficheiro de dados",
+
+  // "datapackage.listelement.badge": "Data package",
+  "datapackage.listelement.badge": "Pacote de dados",
+
+  // "browse.next.button": "Next",
+  "browse.next.button": "Próximo",
+
+  // "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",
+
+  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-successful": "Novo item de espaço de trabalho criado. Clique {{here}} para o editar.",
+
+  // "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": "A senha deve ter pelo menos 6 caracteres.",
+
+  // "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": "A senha deve possuir pelo menos 6 caracteres.",
+
+  // "search.form.search_mydspace": "Search MyDSpace",
+  "search.form.search_mydspace": "Pesquisar na área pessoal",
+
+  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "A senha deve ter pelo menos 6 caracteres.",
+
+  // "search.filters.entityType.Publication": "Publication",
+  "search.filters.entityType.Publication": "Publicação",
+
+  // "search.filters.entityType.Person": "Person",
+  "search.filters.entityType.Person": "Pessoa",
+
+  // "search.filters.entityType.Project": "Project",
+  "search.filters.entityType.Project": "Projeto",
+
+  // "search.filters.entityType.Journal": "Journal",
+  "search.filters.entityType.Journal": "Revista",
+
+  // "search.filters.entityType.DataFile": "Data File",
+  "search.filters.entityType.DataFile": "Ficheiro de dados",
+
+  // "forgot-email.form.google-recaptcha.must-accept-cookies": "Must accept cookies",
+  "forgot-email.form.google-recaptcha.must-accept-cookies": "Deve aceitar cookies",
+
+  // "forgot-email.form.google-recaptcha.open-cookie-settings": "Cookie settings",
+  "forgot-email.form.google-recaptcha.open-cookie-settings": "Configurar cookies",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Successfully imported and added external project to the selection",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.local-entity": "Importado com sucesso e adicionado autor à seleção",
+
+  // "orgunit.search.results.head": "Organizational Unit Search Results",
+  "orgunit.search.results.head": "Resultados da pesquisa de organizações",
+
+  // "orgunit-relationships.search.results.head": "Organizational Unit Search Results",
+  "orgunit-relationships.search.results.head": "Resultados da pesquisa de organizações",
+
+  // "journalissue.search.results.head": "Journal Issue Search Results",
+  "journalissue.search.results.head": "Resultados da pesquisa de números",
+
+  // "journalissue-relationships.search.results.head": "Journal Issue Search Results",
+  "journalissue-relationships.search.results.head": "Resultados da pesquisa de números",
+
+  // "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": "Caro {{ recipientName }},\nEm resposta ao seu pedido de cópia, tenho o prazer de lhe enviar em anexo uma cópia do(s) ficheiro(s) relativo(s) ao documento: \"{{ itemUrl }}\" ({{ itemName }}), do qual sou autor.\n\nCom os melhores cumprimentos,\n{{ authorName }} <{{ authorEmail }}>",
+
+  // "item.preview.dc.relation.eissn": "EISSN",
+  "item.preview.dc.relation.eissn": "EISSN",
+
+  // "item.preview.dc.identifier.eisbn": "EISBN",
+  "item.preview.dc.identifier.eisbn": "EISBN",
 
 }
diff --git a/src/assets/i18n/sr-cyr.json5 b/src/assets/i18n/sr-cyr.json5
new file mode 100644
index 0000000000..81b776529c
--- /dev/null
+++ b/src/assets/i18n/sr-cyr.json5
@@ -0,0 +1,2616 @@
+{
+  // 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.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..ebcc8aeb9a
--- /dev/null
+++ b/src/assets/i18n/sr-lat.json5
@@ -0,0 +1,2616 @@
+{
+  // 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.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 96008b96a6..8c3482764f 100644
--- a/src/assets/i18n/sv.json5
+++ b/src/assets/i18n/sv.json5
@@ -168,6 +168,8 @@
 
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "Namn",
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
 
   // "admin.registries.bitstream-formats.table.return": "Back",
   "admin.registries.bitstream-formats.table.return": "Tillbaka",
@@ -245,6 +247,8 @@
 
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Fält",
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
 
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Anmärkning (scope note)",
@@ -717,6 +721,410 @@
   "admin.access-control.groups.form.return": "Tillbaka",
 
 
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Admin sökning",
@@ -1013,7 +1421,7 @@
   // "pagination.previous.button": "Föregående",
   "pagination.previous.button": "Föregående",
 
- // "browse.startsWith.choose_start": "(Choose start)",
+  // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Välj startdatum)",
 
   // "browse.startsWith.choose_year": "(Välj årtal)",
@@ -1088,7 +1496,7 @@
 
 
 
- // "collection.create.head": "Create a Collection",
+  // "collection.create.head": "Create a Collection",
   "collection.create.head": "Skapa samling",
 
   // "collection.create.notifications.success": "Successfully created the Collection",
@@ -1414,7 +1822,7 @@
   "collection.select.table.title": "Titel",
 
 
- // "collection.source.controls.head": "Harvest Controls",
+  // "collection.source.controls.head": "Harvest Controls",
   "collection.source.controls.head": "Inställningar för höstning",
 
   // "collection.source.controls.test.submit.error": "Something went wrong with initiating the testing of the settings",
@@ -1829,7 +2237,7 @@
 
 
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Kontrollera länkar i metadata",
+  "curation-task.task.checklinks.label": "Kontrollera länkar i metadata",
 
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
@@ -1957,7 +2365,7 @@
 
 
 
- // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
+  // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Exportera metadata från {{ dsoName }}",
 
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
@@ -2080,10 +2488,10 @@
 
   // "footer.link.end-user-agreement":"End User Agreement",
   // TODO New key - Add a translation
-  "footer.link.end-user-agreement":"End User Agreement",
+  "footer.link.end-user-agreement": "End User Agreement",
 
   // "footer.link.feedback":"Send Feedback",
-  "footer.link.feedback":"Skicka feedback",
+  "footer.link.feedback": "Skicka feedback",
 
 
 
@@ -2228,9 +2636,6 @@
   // "form.no-value": "No value entered",
   "form.no-value": "Inget värde har angivits",
 
-  // "form.other-information": {},
-  "form.other-information": {},
-
   // "form.remove": "Remove",
   "form.remove": "Ta bort",
 
@@ -2400,19 +2805,19 @@
   "info.feedback.email-label": "Din e-postadress",
 
   // "info.feedback.create.success" : "Feedback Sent Successfully!",
-  "info.feedback.create.success" : "Feedback har skickats!",
+  "info.feedback.create.success": "Feedback har skickats!",
 
   // "info.feedback.error.email.required" : "A valid email address is required",
-  "info.feedback.error.email.required" : "Du måste ange en giltig e-postadress",
+  "info.feedback.error.email.required": "Du måste ange en giltig e-postadress",
 
   // "info.feedback.error.message.required" : "A comment is required",
-  "info.feedback.error.message.required" : "Du måste skriva en kommentar",
+  "info.feedback.error.message.required": "Du måste skriva en kommentar",
 
   // "info.feedback.page-label" : "Page",
-  "info.feedback.page-label" : "Sida",
+  "info.feedback.page-label": "Sida",
 
   // "info.feedback.page_help" : "Tha page related to your feedback",
-  "info.feedback.page_help" : "Den är sidan är relaterad till din feedback",
+  "info.feedback.page_help": "Den är sidan är relaterad till din feedback",
 
 
 
@@ -2449,7 +2854,7 @@
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Skapa bunt",
 
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Denna post innehåller inga buntar som man kan ladda upp filer i.",
 
   // "item.bitstreams.upload.cancel": "Cancel",
@@ -2739,7 +3144,7 @@
 
 
 
-   // "item.edit.move.cancel": "Back",
+  // "item.edit.move.cancel": "Back",
   "item.edit.move.cancel": "Tillbaka",
 
   // "item.edit.move.save-button": "Save",
@@ -2932,8 +3337,8 @@
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Hantera mappade samlingar",
 
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
-  "item.edit.tabs.status.buttons.move.button": "Flytta...",
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Flytta detta föremål till en annan samling",
 
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Flytta post till en annan samling",
@@ -2959,8 +3364,8 @@
   // "item.edit.tabs.status.buttons.unauthorized": "You're not authorized to perform this action",
   "item.edit.tabs.status.buttons.unauthorized": "Du saknar behörighet att utföra detta",
 
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Återkalla...",
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "dra tillbaka den här artikeln",
 
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Återkalla post från arkivet",
@@ -3138,11 +3543,11 @@
 
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
+  "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.filesection.license.bundle": "License bundle",
 
   // "item.page.return": "Back",
   "item.page.return": "Tillbaka",
@@ -3317,14 +3722,14 @@
   "item.version.create.modal.form.summary.placeholder": "Lägg till sammanfattning av den nya versionen",
 
   // "item.version.create.notification.success" : "New version has been created with version number {{version}}",
-  "item.version.create.notification.success" : "En ny version med nummer {{version}} har skapats",
+  "item.version.create.notification.success": "En ny version med nummer {{version}} har skapats",
 
   // "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.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",
   // 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 inprogress submission in the version history",
 
 
   // "item.version.delete.modal.header": "Delete version",
@@ -3346,17 +3751,17 @@
   "item.version.delete.modal.button.cancel.tooltip": "Radera inte denna version",
 
   // "item.version.delete.notification.success" : "Version number {{version}} has been deleted",
-  "item.version.delete.notification.success" : "Version {{version}} har raderats",
+  "item.version.delete.notification.success": "Version {{version}} har raderats",
 
   // "item.version.delete.notification.failure" : "Version number {{version}} has not been deleted",
-  "item.version.delete.notification.failure" : "Version {{version}} har inte raderats",
+  "item.version.delete.notification.failure": "Version {{version}} har inte raderats",
 
 
   // "item.version.edit.notification.success" : "The summary of version number {{version}} has been changed",
-  "item.version.edit.notification.success" : "Sammanfattningen av version {{version}} har ändrats",
+  "item.version.edit.notification.success": "Sammanfattningen av version {{version}} har ändrats",
 
   // "item.version.edit.notification.failure" : "The summary of version number {{version}} has not been changed",
-  "item.version.edit.notification.failure" : "Sammanfattningen av version {{version}} har inte ändrats",
+  "item.version.edit.notification.failure": "Sammanfattningen av version {{version}} har inte ändrats",
 
 
 
@@ -3617,6 +4022,18 @@
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "EPersoner",
 
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
@@ -3698,6 +4115,10 @@
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Åtkomstkontroll - meny",
 
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Admin sök - meny",
 
@@ -3753,7 +4174,7 @@
 
 
 
- // "menu.section.new": "New",
+  // "menu.section.new": "New",
   "menu.section.new": "Ny",
 
   // "menu.section.new_collection": "Collection",
@@ -3804,6 +4225,9 @@
   "menu.section.statistics_task": "Statistik uppgift",
 
 
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
 
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Växla till åtkomstkontroll",
@@ -3933,20 +4357,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",
@@ -4009,11 +4433,11 @@
 
   // "nav.toggle" : "Toggle navigation",
   // TODO New key - Add a translation
-  "nav.toggle" : "Toggle navigation",
+  "nav.toggle": "Toggle navigation",
 
   // "nav.user.description" : "User profile bar",
   // TODO New key - Add a translation
-  "nav.user.description" : "User profile bar",
+  "nav.user.description": "User profile bar",
 
   // "none.listelement.badge": "Item",
   // TODO New key - Add a translation
@@ -4199,19 +4623,19 @@
 
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
+  "process.detail.arguments": "Arguments",
 
   // "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": "This process doesn't contain any arguments",
 
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
@@ -4227,54 +4651,54 @@
 
   // "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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
+  "process.detail.end-time": "Finish time",
 
   // "process.detail.status" : "Status",
-  "process.detail.status" : "Status",
+  "process.detail.status": "Status",
 
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
+  "process.detail.create": "Create similar process",
 
 
 
   // "process.overview.table.finish" : "Finish time (UTC)",
-  "process.overview.table.finish" : "Sluttid (UTC)",
+  "process.overview.table.finish": "Sluttid (UTC)",
 
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "Process ID",
+  "process.overview.table.id": "Process ID",
 
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Namn",
+  "process.overview.table.name": "Namn",
 
   // "process.overview.table.start" : "Start time (UTC)",
-  "process.overview.table.start" : "Starttid (UTC)",
+  "process.overview.table.start": "Starttid (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" : "Användare",
+  "process.overview.table.user": "Användare",
 
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Processer översikt",
@@ -4566,7 +4990,7 @@
 
 
 
-   // "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": "No suitable match could be found for relationship type {{ type }} between the two items",
   "relationships.add.error.relationship-type.content": "Det gick inte att hitta något som matchade relationstyp {{ type }} mellan dessa poster",
 
   // "relationships.add.error.server.content": "The server returned an error",
@@ -5748,7 +6172,7 @@
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Sökresultat",
 
-  // "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": "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": "Vill du spara \"{{ value }}\" som en namnvariation för denna person? Om inte så kan du fortfarande använda det i detta bidrag.",
 
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
@@ -5950,7 +6374,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": "Notera att uppladdade filer i samlingen {{collectionName}} också kommer att vara åtkompliga för följande grupp(er):",
 
-  // "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": "Här visas samtliga filer som ingår i posten. Du kan uppdatera filernas metadata och villkor för åtkomst, samt <strong>ladda upp nya filer genom att dra och släppa dem här</strong>",
 
   // "submission.sections.upload.no-entry": "No",
@@ -6112,7 +6536,7 @@
 
 
 
- // "thumbnail.default.alt": "Thumbnail Image",
+  // "thumbnail.default.alt": "Thumbnail Image",
   "thumbnail.default.alt": "Bild (thumbnail)",
 
   // "thumbnail.default.placeholder": "No Thumbnail Available",
@@ -6277,6 +6701,6 @@
   "idle-modal.log-out": "Logga ut",
 
   // "idle-modal.extend-session": "Extend session"
-  "idle-modal.extend-session": "Fortsätt"
+  "idle-modal.extend-session": "Fortsätt",
 
 }
diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5
index bfe0ae186d..13a1f07b70 100644
--- a/src/assets/i18n/sw.json5
+++ b/src/assets/i18n/sw.json5
@@ -1,6748 +1,7164 @@
 {
-  
+
   // "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.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",
-  
-  
-  
+
+
+
   // "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.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.forbidden": "forbidden",
   // TODO New key - Add a translation
   "403.forbidden": "forbidden",
-  
-  
-  
+
+
+
   // "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.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.page-not-found": "page not found",
   // TODO New key - Add a translation
   "404.page-not-found": "page not found",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.breadcrumbs": "System curation tasks",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.title": "System curation tasks",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   // TODO New key - Add a translation
   "admin.curation-tasks.header": "System curation tasks",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.failure.head": "Failure",
-  
+
   // "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.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.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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.create.success.head": "Success",
-  
+
   // "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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.failure.head": "Failure",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.delete.success.head": "Success",
-  
+
   // "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.edit.breadcrumbs": "Bitstream format",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
-  
+
   // "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.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.label": "File extensions",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
-  
+
   // "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.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.head": "Failure",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.failure.head": "Failure",
-  
+
   // "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.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.label": "Internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.internal.label": "Internal",
-  
+
   // "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.label": "MIME Type",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
-  
+
   // "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.label": "Name",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
-  
+
   // "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.head": "Success",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.success.head": "Success",
-  
+
   // "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.label": "Support level",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
-  
+
   // "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.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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.delete": "Delete selected",
-  
+
   // "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.internal": "internal",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.internal": "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.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.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.return": "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.SUPPORTED": "Supported",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "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.head": "Support Level",
   // 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",
   // TODO New key - Add a translation
   "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   // TODO New key - Add a translation
   "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.",
   // 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.form.create": "Create metadata schema",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.create": "Create metadata schema",
-  
+
   // "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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.name": "Name",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   // TODO New key - Add a translation
   "admin.registries.metadata.form.namespace": "Namespace",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   // TODO New key - Add a translation
   "admin.registries.metadata.head": "Metadata Registry",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.delete": "Delete 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.name": "Name",
   // TODO New key - Add a translation
   "admin.registries.metadata.schemas.table.name": "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.schema.breadcrumbs": "Metadata schema",
   // TODO New key - Add a translation
   "admin.registries.schema.breadcrumbs": "Metadata schema",
-  
+
   // "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.fields.head": "Schema metadata fields",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.head": "Schema metadata fields",
-  
+
   // "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.table.delete": "Delete selected",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.delete": "Delete selected",
-  
+
   // "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.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.fields.table.scopenote": "Scope Note",
-  
+
   // "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.edit": "Edit metadata field",
   // TODO New key - Add a translation
   "admin.registries.schema.form.edit": "Edit metadata field",
-  
+
   // "admin.registries.schema.form.element": "Element",
   // TODO New key - Add a translation
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   // TODO New key - Add a translation
   "admin.registries.schema.form.qualifier": "Qualifier",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   // TODO New key - Add a translation
   "admin.registries.schema.form.scopenote": "Scope Note",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   // TODO New key - Add a translation
   "admin.registries.schema.head": "Metadata Schema",
-  
+
   // "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.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.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.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.failure": "Error",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.failure": "Error",
-  
+
   // "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.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.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.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.success": "Success",
   // TODO New key - Add a translation
   "admin.registries.schema.notification.success": "Success",
-  
+
   // "admin.registries.schema.return": "Return",
   // TODO New key - Add a translation
   "admin.registries.schema.return": "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.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.impersonate": "Impersonate EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
-  
+
   // "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.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.title": "DSpace Angular :: EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   // TODO New key - Add a translation
   "admin.access-control.epeople.head": "EPeople",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.head": "Search",
-  
+
   // "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.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.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.epeople.search.button": "Search",
-  
+
   // "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.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.email": "E-mail (exact)",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.email": "E-mail (exact)",
-  
+
   // "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{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.form.create": "Create EPerson",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.create": "Create EPerson",
-  
+
   // "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.firstName": "First name",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.firstName": "First name",
-  
+
   // "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.email": "E-mail",
   // TODO New key - Add a 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.canLogIn": "Can log in",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.canLogIn": "Can log in",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.goToGroups": "Add to groups",
   // TODO New key - Add a translation
   "admin.access-control.epeople.form.goToGroups": "Add to groups",
-  
+
   // "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.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.groups.title": "DSpace Angular :: Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.title": "DSpace Angular :: Groups",
-  
+
   // "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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.head": "Groups",
-  
+
   // "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.search.head": "Search groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.head": "Search groups",
-  
+
   // "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.search.button": "Search",
   // TODO New key - Add a translation
   "admin.access-control.groups.search.button": "Search",
-  
+
   // "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.members": "Members",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.members": "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.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.remove": "Delete \"{{name}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{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.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.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.content": "Cause: \"{{cause}}\"",
   // TODO New key - Add a translation
   "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{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.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.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.edit": "Edit group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.head.edit": "Edit group",
-  
+
   // "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.groupDescription": "Description",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.groupDescription": "Description",
-  
+
   // "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.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.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.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.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.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.actions.delete": "Delete Group",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.actions.delete": "Delete Group",
-  
+
   // "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.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.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.confirm": "Delete",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-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.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.head": "Groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.head": "Groups",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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-subgroups-yet": "No subgroups in group yet.",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "No subgroups in group yet.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   // TODO New key - Add a translation
   "admin.access-control.groups.form.return": "Return to groups",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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.collection.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.collection.edit": "Edit",
-  
+
   // "admin.search.community.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.community.edit": "Edit",
-  
+
   // "admin.search.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.search.item.delete": "Delete",
-  
+
   // "admin.search.item.edit": "Edit",
   // TODO New key - Add a translation
   "admin.search.item.edit": "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-public": "Make Public",
   // TODO New key - Add a translation
   "admin.search.item.make-public": "Make Public",
-  
+
   // "admin.search.item.move": "Move",
   // TODO New key - Add a translation
   "admin.search.item.move": "Move",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   // TODO New key - Add a translation
   "admin.search.item.reinstate": "Reinstate",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   // TODO New key - Add a translation
   "admin.search.item.withdraw": "Withdraw",
-  
+
   // "admin.search.title": "Administrative Search",
   // TODO New key - Add a translation
   "admin.search.title": "Administrative Search",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   // TODO New key - Add a translation
   "administrativeView.search.results.head": "Administrative Search",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.breadcrumbs": "Administer Workflow",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   // TODO New key - Add a translation
   "admin.workflow.title": "Administer Workflow",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   // TODO New key - Add a translation
   "admin.workflow.item.workflow": "Workflow",
-  
+
   // "admin.workflow.item.delete": "Delete",
   // TODO New key - Add a translation
   "admin.workflow.item.delete": "Delete",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   // TODO New key - Add a translation
   "admin.workflow.item.send-back": "Send back",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.breadcrumbs": "Import Metadata",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.title": "Import Metadata",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   // TODO New key - Add a translation
   "admin.metadata-import.page.header": "Import Metadata",
-  
+
   // "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.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.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.button.return": "Return",
   // TODO New key - Add a translation
   "admin.metadata-import.page.button.return": "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.error.addFile": "Select file first!",
   // TODO New key - Add a translation
   "admin.metadata-import.page.error.addFile": "Select file first!",
-  
-  
-  
-  
+
+
+
+
   // "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.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.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   // TODO New key - Add a translation
   "bitstream.edit.bitstream": "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.label": "Description",
   // TODO New key - Add a translation
   "bitstream.edit.form.description.label": "Description",
-  
+
   // "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.label": "Embargo until specific date",
   // TODO New key - Add a translation
   "bitstream.edit.form.embargo.label": "Embargo until specific date",
-  
+
   // "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.label": "Filename",
   // TODO New key - Add a translation
   "bitstream.edit.form.fileName.label": "Filename",
-  
+
   // "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.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.primaryBitstream.label": "Primary bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
-  
+
   // "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.label": "Selected Format",
   // TODO New key - Add a translation
   "bitstream.edit.form.selectedFormat.label": "Selected Format",
-  
+
   // "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.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.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.title": "Bitstream saved",
   // TODO New key - Add a translation
   "bitstream.edit.notifications.saved.title": "Bitstream saved",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   // TODO New key - Add a translation
   "bitstream.edit.title": "Edit bitstream",
-  
-  
-  
+
+
+
   // "browse.comcol.by.author": "By Author",
   // TODO New key - Add a translation
   "browse.comcol.by.author": "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.subject": "By Subject",
   // TODO New key - Add a translation
   "browse.comcol.by.subject": "By Subject",
-  
+
   // "browse.comcol.by.title": "By Title",
   // TODO New key - Add a translation
   "browse.comcol.by.title": "By Title",
-  
+
   // "browse.comcol.head": "Browse",
   // TODO New key - Add a translation
   "browse.comcol.head": "Browse",
-  
+
   // "browse.empty": "No items to show.",
   // TODO New key - Add a translation
   "browse.empty": "No items to show.",
-  
+
   // "browse.metadata.author": "Author",
   // TODO New key - Add a translation
   "browse.metadata.author": "Author",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued": "Issue Date",
-  
+
   // "browse.metadata.subject": "Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject": "Subject",
-  
+
   // "browse.metadata.title": "Title",
   // TODO New key - Add a translation
   "browse.metadata.title": "Title",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   // TODO New key - Add a translation
   "browse.metadata.author.breadcrumbs": "Browse by Author",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   // TODO New key - Add a translation
   "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   // TODO New key - Add a translation
   "browse.metadata.subject.breadcrumbs": "Browse by Subject",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   // TODO New key - Add a translation
   "browse.metadata.title.breadcrumbs": "Browse by Title",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_start": "(Choose start)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   // TODO New key - Add a translation
   "browse.startsWith.choose_year": "(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.months.april": "April",
   // TODO New key - Add a translation
   "browse.startsWith.months.april": "April",
-  
+
   // "browse.startsWith.months.august": "August",
   // TODO New key - Add a translation
   "browse.startsWith.months.august": "August",
-  
+
   // "browse.startsWith.months.december": "December",
   // TODO New key - Add a translation
   "browse.startsWith.months.december": "December",
-  
+
   // "browse.startsWith.months.february": "February",
   // TODO New key - Add a translation
   "browse.startsWith.months.february": "February",
-  
+
   // "browse.startsWith.months.january": "January",
   // TODO New key - Add a translation
   "browse.startsWith.months.january": "January",
-  
+
   // "browse.startsWith.months.july": "July",
   // TODO New key - Add a translation
   "browse.startsWith.months.july": "July",
-  
+
   // "browse.startsWith.months.june": "June",
   // TODO New key - Add a translation
   "browse.startsWith.months.june": "June",
-  
+
   // "browse.startsWith.months.march": "March",
   // TODO New key - Add a translation
   "browse.startsWith.months.march": "March",
-  
+
   // "browse.startsWith.months.may": "May",
   // TODO New key - Add a translation
   "browse.startsWith.months.may": "May",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   // TODO New key - Add a translation
   "browse.startsWith.months.none": "(Choose month)",
-  
+
   // "browse.startsWith.months.november": "November",
   // TODO New key - Add a translation
   "browse.startsWith.months.november": "November",
-  
+
   // "browse.startsWith.months.october": "October",
   // TODO New key - Add a translation
   "browse.startsWith.months.october": "October",
-  
+
   // "browse.startsWith.months.september": "September",
   // TODO New key - Add a translation
   "browse.startsWith.months.september": "September",
-  
+
   // "browse.startsWith.submit": "Go",
   // TODO New key - Add a translation
   "browse.startsWith.submit": "Go",
-  
+
   // "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_text": "Or enter first few letters:",
   // TODO New key - Add a translation
   "browse.startsWith.type_text": "Or enter first few letters:",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   // TODO New key - Add a translation
   "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   // TODO New key - Add a translation
   "chips.remove": "Remove chip",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   // TODO New key - Add a translation
   "collection.create.head": "Create a Collection",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   // TODO New key - Add a translation
   "collection.create.notifications.success": "Successfully created the Collection",
-  
+
   // "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.curate.header": "Curate Collection: {{collection}}",
   // TODO New key - Add a translation
   "collection.curate.header": "Curate Collection: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.delete.cancel": "Cancel",
-  
+
   // "collection.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "collection.delete.confirm": "Confirm",
-  
+
   // "collection.delete.head": "Delete Collection",
   // TODO New key - Add a translation
   "collection.delete.head": "Delete Collection",
-  
+
   // "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.success": "Successfully deleted collection",
   // TODO New key - Add a translation
   "collection.delete.notification.success": "Successfully deleted collection",
-  
+
   // "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.edit.delete": "Delete this collection",
   // TODO New key - Add a translation
   "collection.edit.delete": "Delete this collection",
-  
+
   // "collection.edit.head": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.head": "Edit Collection",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   // TODO New key - Add a translation
   "collection.edit.breadcrumbs": "Edit Collection",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   // TODO New key - Add a translation
   "collection.edit.tabs.mapper.head": "Item Mapper",
-  
+
   // "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.item-mapper.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.cancel": "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.confirm": "Map selected items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.confirm": "Map selected items",
-  
+
   // "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.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.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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.remove": "Remove selected item mappings",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.remove": "Remove selected item mappings",
-  
+
   // "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.map": "Map new items",
   // TODO New key - Add a translation
   "collection.edit.item-mapper.tabs.map": "Map new items",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   // TODO New key - Add a translation
   "collection.edit.logo.label": "Collection logo",
-  
+
   // "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.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.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.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.error.title": "Error deleting logo",
   // TODO New key - Add a translation
   "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
-  
+
   // "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.notifications.success": "Successfully edited the Collection",
   // TODO New key - Add a translation
   "collection.edit.notifications.success": "Successfully edited the Collection",
-  
+
   // "collection.edit.return": "Return",
   // TODO New key - Add a translation
   "collection.edit.return": "Return",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "collection.edit.tabs.curate.head": "Curate",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "collection.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "collection.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "collection.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.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.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.harvestType": "Content being harvested",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.harvestType": "Content being harvested",
-  
+
   // "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.metadataConfigId": "Metadata Format",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
-  
+
   // "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.oaiSource": "OAI Provider",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
-  
+
   // "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_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_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.head": "Content Source",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.head": "Content Source",
-  
+
   // "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.title": "Changed discarded",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Content Source saved",
   // TODO New key - Add a translation
   "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
-  
+
   // "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.template.add-button": "Add",
   // TODO New key - Add a translation
   "collection.edit.template.add-button": "Add",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   // TODO New key - Add a translation
   "collection.edit.template.breadcrumbs": "Item template",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   // TODO New key - Add a translation
   "collection.edit.template.cancel": "Cancel",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   // TODO New key - Add a translation
   "collection.edit.template.delete-button": "Delete",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   // TODO New key - Add a translation
   "collection.edit.template.edit-button": "Edit",
-  
+
   // "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.label": "Template item",
   // TODO New key - Add a translation
   "collection.edit.template.label": "Template item",
-  
+
   // "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.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.title": "Edit Template Item",
   // TODO New key - Add a translation
   "collection.edit.template.title": "Edit Template Item",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "collection.form.abstract": "Short Description",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "collection.form.description": "Introductory 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.license": "License",
   // TODO New key - Add a translation
   "collection.form.license": "License",
-  
+
   // "collection.form.provenance": "Provenance",
   // TODO New key - Add a translation
   "collection.form.provenance": "Provenance",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "collection.form.rights": "Copyright text (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "collection.form.tableofcontents": "News (HTML)",
-  
+
   // "collection.form.title": "Name",
   // TODO New key - Add a translation
   "collection.form.title": "Name",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   // 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.edit": "Edit this collection",
   // TODO New key - Add a translation
   "collection.page.edit": "Edit this collection",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   // TODO New key - Add a translation
   "collection.page.handle": "Permanent URI for this collection",
-  
+
   // "collection.page.license": "License",
   // TODO New key - Add a translation
   "collection.page.license": "License",
-  
+
   // "collection.page.news": "News",
   // TODO New key - Add a translation
   "collection.page.news": "News",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "collection.select.confirm": "Confirm selected",
-  
+
   // "collection.select.empty": "No collections to show",
   // TODO New key - Add a translation
   "collection.select.empty": "No collections to show",
-  
+
   // "collection.select.table.title": "Title",
   // TODO New key - Add a translation
   "collection.select.table.title": "Title",
-  
-  
-  
+
+
+
   // "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.title": "Server Error",
   // TODO New key - Add a translation
   "collection.source.update.notifications.error.title": "Server Error",
-  
-  
-  
+
+
+
   // "communityList.tabTitle": "DSpace - Community List",
   // TODO New key - Add a translation
   "communityList.tabTitle": "DSpace - Community List",
-  
+
   // "communityList.title": "List of Communities",
   // TODO New key - Add a translation
   "communityList.title": "List of Communities",
-  
+
   // "communityList.showMore": "Show More",
   // TODO New key - Add a translation
   "communityList.showMore": "Show More",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   // TODO New key - Add a translation
   "community.create.head": "Create a Community",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   // TODO New key - Add a translation
   "community.create.notifications.success": "Successfully created the Community",
-  
+
   // "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.curate.header": "Curate Community: {{community}}",
   // TODO New key - Add a translation
   "community.curate.header": "Curate Community: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "community.delete.cancel": "Cancel",
-  
+
   // "community.delete.confirm": "Confirm",
   // TODO New key - Add a translation
   "community.delete.confirm": "Confirm",
-  
+
   // "community.delete.head": "Delete Community",
   // TODO New key - Add a translation
   "community.delete.head": "Delete Community",
-  
+
   // "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.success": "Successfully deleted community",
   // TODO New key - Add a translation
   "community.delete.notification.success": "Successfully deleted community",
-  
+
   // "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.edit.delete": "Delete this community",
   // TODO New key - Add a translation
   "community.edit.delete": "Delete this community",
-  
+
   // "community.edit.head": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.head": "Edit Community",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   // TODO New key - Add a translation
   "community.edit.breadcrumbs": "Edit Community",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   // TODO New key - Add a translation
   "community.edit.logo.label": "Community logo",
-  
+
   // "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.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.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.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.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.notifications.success": "Successfully edited the Community",
   // TODO New key - Add a translation
   "community.edit.notifications.success": "Successfully edited the Community",
-  
+
   // "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.tabs.curate.head": "Curate",
   // TODO New key - Add a translation
   "community.edit.tabs.curate.head": "Curate",
-  
+
   // "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.metadata.head": "Edit Metadata",
   // TODO New key - Add a translation
   "community.edit.tabs.metadata.head": "Edit 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.roles.head": "Assign Roles",
   // TODO New key - Add a translation
   "community.edit.tabs.roles.head": "Assign Roles",
-  
+
   // "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.authorizations.head": "Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.head": "Authorizations",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   // TODO New key - Add a translation
   "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   // TODO New key - Add a translation
   "community.listelement.badge": "Community",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   // TODO New key - Add a translation
   "comcol-role.edit.no-group": "None",
-  
+
   // "comcol-role.edit.create": "Create",
   // TODO New key - Add a translation
   "comcol-role.edit.create": "Create",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   // TODO New key - Add a translation
   "comcol-role.edit.restrict": "Restrict",
-  
+
   // "comcol-role.edit.delete": "Delete",
   // TODO New key - Add a translation
   "comcol-role.edit.delete": "Delete",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.community-admin.name": "Administrators",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   // TODO New key - Add a translation
   "comcol-role.edit.collection-admin.name": "Administrators",
-  
-  
+
+
   // "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.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.submitters.name": "Submitters",
   // TODO New key - Add a translation
   "comcol-role.edit.submitters.name": "Submitters",
-  
+
   // "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.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.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.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.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.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.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.editor.name": "Editors",
   // TODO New key - Add a translation
   "comcol-role.edit.editor.name": "Editors",
-  
+
   // "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.finaleditor.name": "Final editors",
   // TODO New key - Add a translation
   "comcol-role.edit.finaleditor.name": "Final editors",
-  
+
   // "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.reviewer.name": "Reviewers",
   // TODO New key - Add a translation
   "comcol-role.edit.reviewer.name": "Reviewers",
-  
+
   // "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.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   // TODO New key - Add a translation
   "community.form.abstract": "Short Description",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   // TODO New key - Add a translation
   "community.form.description": "Introductory 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.rights": "Copyright text (HTML)",
   // TODO New key - Add a translation
   "community.form.rights": "Copyright text (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   // TODO New key - Add a translation
   "community.form.tableofcontents": "News (HTML)",
-  
+
   // "community.form.title": "Name",
   // TODO New key - Add a translation
   "community.form.title": "Name",
-  
+
   // "community.page.edit": "Edit this community",
   // TODO New key - Add a translation
   "community.page.edit": "Edit this community",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   // TODO New key - Add a translation
   "community.page.handle": "Permanent URI for this community",
-  
+
   // "community.page.license": "License",
   // TODO New key - Add a translation
   "community.page.license": "License",
-  
+
   // "community.page.news": "News",
   // TODO New key - Add a translation
   "community.page.news": "News",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   // 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",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   // TODO New key - Add a translation
   "cookies.consent.accept-all": "Accept all",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   // TODO New key - Add a translation
   "cookies.consent.accept-selected": "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.title": "(opt-out)",
   // TODO New key - Add a translation
   "cookies.consent.app.opt-out.title": "(opt-out)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   // TODO New key - Add a translation
   "cookies.consent.app.purpose": "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.title": "(always required)",
   // TODO New key - Add a translation
   "cookies.consent.app.required.title": "(always required)",
-  
+
   // "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.close": "Close",
   // TODO New key - Add a translation
   "cookies.consent.close": "Close",
-  
+
   // "cookies.consent.decline": "Decline",
   // TODO New key - Add a translation
   "cookies.consent.decline": "Decline",
-  
+
   // "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.learnMore": "Customize",
   // TODO New key - Add a translation
   "cookies.consent.content-notice.learnMore": "Customize",
-  
+
   // "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.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.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.title": "Information that we collect",
   // TODO New key - Add a translation
   "cookies.consent.content-modal.title": "Information that we collect",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   // TODO New key - Add a translation
   "cookies.consent.app.title.authentication": "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.title.preferences": "Preferences",
   // TODO New key - Add a translation
   "cookies.consent.app.title.preferences": "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.title.acknowledgement": "Acknowledgement",
   // TODO New key - Add a translation
   "cookies.consent.app.title.acknowledgement": "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.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.purpose.functional": "Functional",
   // TODO New key - Add a translation
   "cookies.consent.purpose.functional": "Functional",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   // TODO New key - Add a translation
   "cookies.consent.purpose.statistical": "Statistical",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
   // TODO New key - Add a translation
-  "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  
+  "curation-task.task.checklinks.label": "Check Links in Metadata",
+
   // "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.requiredmetadata.label": "Check for Required Metadata",
   // TODO New key - Add a translation
   "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   // TODO New key - Add a translation
   "curation-task.task.translate.label": "Microsoft Translator",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   // TODO New key - Add a translation
   "curation-task.task.vscan.label": "Virus Scan",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   // TODO New key - Add a translation
   "curation.form.task-select.label": "Task:",
-  
+
   // "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.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.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.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.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)",
   // 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)",
-  
-  
-  
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   // TODO New key - Add a translation
   "dso-selector.create.collection.head": "New collection",
-  
+
   // "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.community.head": "New community",
   // TODO New key - Add a translation
   "dso-selector.create.community.head": "New community",
-  
+
   // "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.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.item.head": "New item",
   // TODO New key - Add a translation
   "dso-selector.create.item.head": "New item",
-  
+
   // "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.submission.head": "New submission",
   // TODO New key - Add a translation
   "dso-selector.create.submission.head": "New submission",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   // TODO New key - Add a translation
   "dso-selector.edit.collection.head": "Edit collection",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   // TODO New key - Add a translation
   "dso-selector.edit.community.head": "Edit community",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   // TODO New key - Add a translation
   "dso-selector.edit.item.head": "Edit item",
-  
+
   // "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.no-results": "No {{ type }} found",
   // TODO New key - Add a translation
   "dso-selector.no-results": "No {{ type }} found",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   // TODO New key - Add a translation
   "dso-selector.placeholder": "Search for a {{ type }}",
-  
-  
-  
+
+
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.cancel": "Cancel",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   // TODO New key - Add a translation
   "confirmation-modal.export-metadata.confirm": "Export",
-  
+
   // "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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.cancel": "Cancel",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   // TODO New key - Add a translation
   "confirmation-modal.delete-eperson.confirm": "Delete",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   // TODO New key - Add a translation
   "error.bitstream": "Error fetching bitstream",
-  
+
   // "error.browse-by": "Error fetching items",
   // TODO New key - Add a translation
   "error.browse-by": "Error fetching items",
-  
+
   // "error.collection": "Error fetching collection",
   // TODO New key - Add a translation
   "error.collection": "Error fetching collection",
-  
+
   // "error.collections": "Error fetching collections",
   // TODO New key - Add a translation
   "error.collections": "Error fetching collections",
-  
+
   // "error.community": "Error fetching community",
   // TODO New key - Add a translation
   "error.community": "Error fetching community",
-  
+
   // "error.identifier": "No item found for the identifier",
   // TODO New key - Add a translation
   "error.identifier": "No item found for the identifier",
-  
+
   // "error.default": "Error",
   // TODO New key - Add a translation
   "error.default": "Error",
-  
+
   // "error.item": "Error fetching item",
   // TODO New key - Add a translation
   "error.item": "Error fetching item",
-  
+
   // "error.items": "Error fetching items",
   // TODO New key - Add a translation
   "error.items": "Error fetching items",
-  
+
   // "error.objects": "Error fetching objects",
   // TODO New key - Add a translation
   "error.objects": "Error fetching objects",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   // TODO New key - Add a translation
   "error.recent-submissions": "Error fetching recent submissions",
-  
+
   // "error.search-results": "Error fetching search results",
   // TODO New key - Add a translation
   "error.search-results": "Error fetching search results",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   // TODO New key - Add a translation
   "error.sub-collections": "Error fetching sub-collections",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   // TODO New key - Add a translation
   "error.sub-communities": "Error fetching 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.top-level-communities": "Error fetching top-level communities",
   // TODO New key - Add a translation
   "error.top-level-communities": "Error fetching 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.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.filerequired": "The file upload is mandatory",
   // TODO New key - Add a translation
   "error.validation.filerequired": "The file upload is mandatory",
-  
-  
-  
+
+
+
   // "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",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   // TODO New key - Add a translation
   "footer.copyright": "copyright © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   // TODO New key - Add a translation
   "footer.link.dspace": "DSpace software",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   // TODO New key - Add a translation
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   // TODO New key - Add a translation
   "footer.link.cookies": "Cookie settings",
-  
+
   // "footer.link.privacy-policy": "Privacy policy",
   // 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.end-user-agreement": "End User Agreement",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-email.form.header": "Forgot Password",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "forgot-email.form.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Submit",
   // TODO New key - Add a translation
   "forgot-email.form.submit": "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.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-password.title": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.title": "Forgot Password",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   // TODO New key - Add a translation
   "forgot-password.form.head": "Forgot Password",
-  
+
   // "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.card.security": "Security",
   // TODO New key - Add a translation
   "forgot-password.form.card.security": "Security",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   // TODO New key - Add a translation
   "forgot-password.form.identification.header": "Identify",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   // TODO New key - Add a translation
   "forgot-password.form.identification.email": "Email address: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   // TODO New key - Add a translation
   "forgot-password.form.label.password": "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.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.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.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.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.title": "Password reset completed",
   // TODO New key - Add a translation
   "forgot-password.form.notification.success.title": "Password reset completed",
-  
+
   // "forgot-password.form.submit": "Submit password",
   // TODO New key - Add a translation
   "forgot-password.form.submit": "Submit password",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   // TODO New key - Add a translation
   "form.add": "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.cancel": "Cancel",
   // TODO New key - Add a translation
   "form.cancel": "Cancel",
-  
+
   // "form.clear": "Clear",
   // TODO New key - Add a translation
   "form.clear": "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.edit": "Edit",
   // TODO New key - Add a translation
   "form.edit": "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.first-name": "First name",
   // TODO New key - Add a translation
   "form.first-name": "First name",
-  
+
   // "form.group-collapse": "Collapse",
   // TODO New key - Add a translation
   "form.group-collapse": "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-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.last-name": "Last name",
   // TODO New key - Add a translation
   "form.last-name": "Last name",
-  
+
   // "form.loading": "Loading...",
   // TODO New key - Add a translation
   "form.loading": "Loading...",
-  
+
   // "form.lookup": "Lookup",
   // TODO New key - Add a translation
   "form.lookup": "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.no-results": "No results found",
   // TODO New key - Add a translation
   "form.no-results": "No results found",
-  
+
   // "form.no-value": "No value entered",
   // TODO New key - Add a translation
   "form.no-value": "No value entered",
-  
-  // "form.other-information": {},
-  // TODO New key - Add a translation
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   // TODO New key - Add a translation
   "form.remove": "Remove",
-  
+
   // "form.save": "Save",
   // TODO New key - Add a translation
   "form.save": "Save",
-  
+
   // "form.save-help": "Save changes",
   // TODO New key - Add a translation
   "form.save-help": "Save changes",
-  
+
   // "form.search": "Search",
   // TODO New key - Add a translation
   "form.search": "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.submit": "Submit",
   // TODO New key - Add a translation
   "form.submit": "Submit",
-  
-  
-  
+
+
+
   // "home.description": "",
   // TODO New key - Add a translation
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   // TODO New key - Add a translation
   "home.breadcrumbs": "Home",
-  
+
   // "home.title": "DSpace Angular :: Home",
   // TODO New key - Add a translation
   "home.title": "DSpace Angular :: Home",
-  
+
   // "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.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.",
-  
-  
-  
+
+
+
   // "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.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.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.breadcrumbs": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.breadcrumbs": "End User Agreement",
-  
+
   // "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.save": "Save",
   // TODO New key - Add a translation
   "info.end-user-agreement.buttons.save": "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.title": "End User Agreement",
   // TODO New key - Add a translation
   "info.end-user-agreement.title": "End User Agreement",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.breadcrumbs": "Privacy Statement",
-  
+
   // "info.privacy.head": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.head": "Privacy Statement",
-  
+
   // "info.privacy.title": "Privacy Statement",
   // TODO New key - Add a translation
   "info.privacy.title": "Privacy Statement",
-  
-  
-  
+
+
+
   // "item.alerts.private": "This item is private",
   // TODO New key - Add a translation
   "item.alerts.private": "This item is private",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   // TODO New key - Add a translation
   "item.alerts.withdrawn": "This item has been withdrawn",
-  
-  
-  
+
+
+
   // "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.title": "Edit item's Policies",
   // TODO New key - Add a translation
   "item.edit.authorizations.title": "Edit item's Policies",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   // TODO New key - Add a translation
   "item.badge.private": "Private",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "item.badge.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle": "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.new": "Create bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.bundle.new": "Create bundle",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "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": "This item doesn't contain any bundles to upload a bitstream to.",
+
   // "item.bitstreams.upload.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.bitstreams.upload.cancel": "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.item": "Item: ",
   // TODO New key - Add a translation
   "item.bitstreams.upload.item": "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.title": "Created bundle",
   // TODO New key - Add a translation
   "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
-  
+
   // "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.title": "Upload bitstream",
   // TODO New key - Add a translation
   "item.bitstreams.upload.title": "Upload bitstream",
-  
-  
-  
+
+
+
   // "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.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.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.more": "Load more",
   // TODO New key - Add a translation
   "item.edit.bitstreams.bundle.load.more": "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.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.bitstreams.discard-button": "Discard",
-  
+
   // "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.drag": "Drag",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.drag": "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.bitstreams.edit.buttons.remove": "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.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.headers.actions": "Actions",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.actions": "Actions",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.bundle": "Bundle",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.description": "Description",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   // TODO New key - Add a translation
   "item.edit.bitstreams.headers.name": "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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Move changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
-  
+
   // "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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.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.title": "Removal changes saved",
   // TODO New key - Add a translation
   "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.bitstreams.reinstate-button": "Undo",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.bitstreams.save-button": "Save",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   // TODO New key - Add a translation
   "item.edit.bitstreams.upload-button": "Upload",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.delete.cancel": "Cancel",
-  
+
   // "item.edit.delete.confirm": "Delete",
   // TODO New key - Add a translation
   "item.edit.delete.confirm": "Delete",
-  
+
   // "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.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.header": "Delete item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.delete.header": "Delete item: {{ 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.head": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.head": "Edit Item",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   // TODO New key - Add a translation
   "item.edit.breadcrumbs": "Edit Item",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   // TODO New key - Add a translation
   "item.edit.tabs.mapper.head": "Collection Mapper",
-  
+
   // "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.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.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.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.item-mapper.cancel": "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.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.item": "Item: \"<b>{{name}}</b>\"",
   // TODO New key - Add a translation
   "item.edit.item-mapper.item": "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.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.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.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.head": "Mapping completed",
   // TODO New key - Add a translation
   "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
-  
+
   // "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.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.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.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.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.map": "Map new collections",
   // TODO New key - Add a translation
   "item.edit.item-mapper.tabs.map": "Map new collections",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   // TODO New key - Add a translation
   "item.edit.metadata.add-button": "Add",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.metadata.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.remove": "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.unedit": "Stop editing",
   // TODO New key - Add a translation
   "item.edit.metadata.edit.buttons.unedit": "Stop editing",
-  
+
   // "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.headers.edit": "Edit",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.edit": "Edit",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.field": "Field",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.language": "Lang",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   // TODO New key - Add a translation
   "item.edit.metadata.headers.value": "Value",
-  
+
   // "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.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.title": "Changed discarded",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.discarded.title": "Changed discarded",
-  
+
   // "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.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.title": "Metadata invalid",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
-  
+
   // "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.title": "Changed outdated",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.outdated.title": "Changed outdated",
-  
+
   // "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.title": "Metadata saved",
   // TODO New key - Add a translation
   "item.edit.metadata.notifications.saved.title": "Metadata saved",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.metadata.reinstate-button": "Undo",
-  
+
   // "item.edit.metadata.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.metadata.save-button": "Save",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   // TODO New key - Add a translation
   "item.edit.modify.overview.field": "Field",
-  
+
   // "item.edit.modify.overview.language": "Language",
   // TODO New key - Add a translation
   "item.edit.modify.overview.language": "Language",
-  
+
   // "item.edit.modify.overview.value": "Value",
   // TODO New key - Add a translation
   "item.edit.modify.overview.value": "Value",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.move.cancel": "Cancel",
-  
+
   // "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.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.head": "Move item: {{id}}",
   // TODO New key - Add a translation
   "item.edit.move.head": "Move item: {{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.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.move": "Move",
   // TODO New key - Add a translation
   "item.edit.move.move": "Move",
-  
+
   // "item.edit.move.processing": "Moving...",
   // TODO New key - Add a translation
   "item.edit.move.processing": "Moving...",
-  
+
   // "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.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.title": "Move item",
   // TODO New key - Add a translation
   "item.edit.move.title": "Move item",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.private.cancel": "Cancel",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   // TODO New key - Add a translation
   "item.edit.private.confirm": "Make it Private",
-  
+
   // "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.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.public.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.public.cancel": "Cancel",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   // TODO New key - Add a translation
   "item.edit.public.confirm": "Make it Public",
-  
+
   // "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.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.reinstate.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.reinstate.cancel": "Cancel",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   // TODO New key - Add a translation
   "item.edit.reinstate.confirm": "Reinstate",
-  
+
   // "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.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.header": "Reinstate item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.reinstate.header": "Reinstate item: {{ 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.relationships.discard-button": "Discard",
   // TODO New key - Add a translation
   "item.edit.relationships.discard-button": "Discard",
-  
+
   // "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.remove": "Remove",
   // TODO New key - Add a translation
   "item.edit.relationships.edit.buttons.remove": "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.no-relationships": "No relationships",
   // TODO New key - Add a translation
   "item.edit.relationships.no-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.title": "Changes discarded",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.discarded.title": "Changes discarded",
-  
+
   // "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.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.title": "Changes outdated",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.outdated.title": "Changes outdated",
-  
+
   // "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.title": "Relationships saved",
   // TODO New key - Add a translation
   "item.edit.relationships.notifications.saved.title": "Relationships saved",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   // TODO New key - Add a translation
   "item.edit.relationships.reinstate-button": "Undo",
-  
+
   // "item.edit.relationships.save-button": "Save",
   // TODO New key - Add a translation
   "item.edit.relationships.save-button": "Save",
-  
+
   // "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.tabs.bitstreams.head": "Bitstreams",
   // TODO New key - Add a translation
   "item.edit.tabs.bitstreams.head": "Bitstreams",
-  
+
   // "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.curate.head": "Curate",
   // TODO New key - Add a translation
   "item.edit.tabs.curate.head": "Curate",
-  
+
   // "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.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.relationships.head": "Relationships",
   // TODO New key - Add a translation
   "item.edit.tabs.relationships.head": "Relationships",
-  
+
   // "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.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.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.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.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.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.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.move.button": "Move...",
+
+  // "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...",
-  
+  "item.edit.tabs.status.buttons.move.button": "Bu Öğeyi farklı bir Koleksiyona taşıyın",
+
   // "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.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.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.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.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.reinstate.button": "Reinstate...",
   // TODO New key - Add a translation
   "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
-  
+
   // "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.withdraw.button": "Withdraw...",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
   // TODO New key - Add a translation
-  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  
+  "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+
   // "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.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.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.itemPage": "Item Page",
   // TODO New key - Add a translation
   "item.edit.tabs.status.labels.itemPage": "Item Page",
-  
+
   // "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.title": "Item Edit -  Status",
   // TODO New key - Add a translation
   "item.edit.tabs.status.title": "Item Edit -  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.title": "Item Edit - Version History",
   // TODO New key - Add a translation
   "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
-  
+
   // "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.view.head": "View Item",
   // TODO New key - Add a translation
   "item.edit.tabs.view.head": "View Item",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   // TODO New key - Add a translation
   "item.edit.tabs.view.title": "Item Edit -  View",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   // TODO New key - Add a translation
   "item.edit.withdraw.cancel": "Cancel",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   // TODO New key - Add a translation
   "item.edit.withdraw.confirm": "Withdraw",
-  
+
   // "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.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.header": "Withdraw item: {{ id }}",
   // TODO New key - Add a translation
   "item.edit.withdraw.header": "Withdraw item: {{ 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.listelement.badge": "Item",
   // TODO New key - Add a translation
   "item.listelement.badge": "Item",
-  
+
   // "item.page.description": "Description",
   // TODO New key - Add a translation
   "item.page.description": "Description",
-  
-  // "item.page.edit": "Edit this item",
-  // TODO New key - Add a translation
-  "item.page.edit": "Edit this item",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "item.page.journal-issn": "Journal ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "item.page.journal-title": "Journal Title",
-  
+
   // "item.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "item.page.publisher": "Publisher",
-  
+
   // "item.page.titleprefix": "Item: ",
   // TODO New key - Add a translation
   "item.page.titleprefix": "Item: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "item.page.volume-title": "Volume Title",
-  
+
   // "item.search.results.head": "Item Search Results",
   // TODO New key - Add a translation
   "item.search.results.head": "Item Search Results",
-  
+
   // "item.search.title": "DSpace Angular :: Item Search",
   // TODO New key - Add a translation
   "item.search.title": "DSpace Angular :: Item Search",
-  
-  
-  
+
+
+
   // "item.page.abstract": "Abstract",
   // TODO New key - Add a translation
   "item.page.abstract": "Abstract",
-  
+
   // "item.page.author": "Authors",
   // TODO New key - Add a translation
   "item.page.author": "Authors",
-  
+
   // "item.page.citation": "Citation",
   // TODO New key - Add a translation
   "item.page.citation": "Citation",
-  
+
   // "item.page.collections": "Collections",
   // TODO New key - Add a translation
   "item.page.collections": "Collections",
-  
+
   // "item.page.date": "Date",
   // TODO New key - Add a translation
   "item.page.date": "Date",
-  
+
   // "item.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "item.page.edit": "Edit this item",
-  
+
   // "item.page.files": "Files",
   // TODO New key - Add a translation
   "item.page.files": "Files",
-  
+
   // "item.page.filesection.description": "Description:",
   // TODO New key - Add a translation
   "item.page.filesection.description": "Description:",
-  
+
   // "item.page.filesection.download": "Download",
   // TODO New key - Add a translation
   "item.page.filesection.download": "Download",
-  
+
   // "item.page.filesection.format": "Format:",
   // TODO New key - Add a translation
   "item.page.filesection.format": "Format:",
-  
+
   // "item.page.filesection.name": "Name:",
   // TODO New key - Add a translation
   "item.page.filesection.name": "Name:",
-  
+
   // "item.page.filesection.size": "Size:",
   // TODO New key - Add a translation
   "item.page.filesection.size": "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.link.full": "Full item page",
   // TODO New key - Add a translation
   "item.page.link.full": "Full item page",
-  
+
   // "item.page.link.simple": "Simple item page",
   // TODO New key - Add a translation
   "item.page.link.simple": "Simple item page",
-  
+
   // "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.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-less": "Hide last {{ amount }}",
   // TODO New key - Add a translation
   "item.page.related-items.view-less": "Hide last {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isAuthorOfPublication": "Publications",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   // TODO New key - Add a translation
   "item.page.relationships.isJournalOfPublication": "Publications",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfPerson": "Authors",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   // TODO New key - Add a translation
   "item.page.relationships.isOrgUnitOfProject": "Research Projects",
-  
+
   // "item.page.subject": "Keywords",
   // TODO New key - Add a translation
   "item.page.subject": "Keywords",
-  
+
   // "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.collapse": "Collapse",
   // TODO New key - Add a translation
   "item.page.bitstreams.collapse": "Collapse",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
   // TODO New key - Add a translation
-  "item.page.filesection.original.bundle" : "Original bundle",
-  
+  "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.filesection.license.bundle": "License bundle",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.uri": "Identifier:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   // TODO New key - Add a translation
   "item.preview.dc.contributor.author": "Authors:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   // TODO New key - Add a translation
   "item.preview.dc.date.issued": "Published date:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   // TODO New key - Add a translation
   "item.preview.dc.description.abstract": "Abstract:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   // TODO New key - Add a translation
   "item.preview.dc.identifier.other": "Other identifier:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   // TODO New key - Add a translation
   "item.preview.dc.language.iso": "Language:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   // TODO New key - Add a translation
   "item.preview.dc.subject": "Subjects:",
-  
+
   // "item.preview.dc.title": "Title:",
   // TODO New key - Add a translation
   "item.preview.dc.title": "Title:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   // TODO New key - Add a translation
   "item.preview.person.familyName": "Surname:",
-  
+
   // "item.preview.person.givenName": "Name:",
   // TODO New key - Add a translation
   "item.preview.person.givenName": "Name:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   // TODO New key - Add a translation
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   // TODO New key - Add a translation
   "item.select.confirm": "Confirm selected",
-  
+
   // "item.select.empty": "No items to show",
   // TODO New key - Add a translation
   "item.select.empty": "No items to show",
-  
+
   // "item.select.table.author": "Author",
   // TODO New key - Add a translation
   "item.select.table.author": "Author",
-  
+
   // "item.select.table.collection": "Collection",
   // TODO New key - Add a translation
   "item.select.table.collection": "Collection",
-  
+
   // "item.select.table.title": "Title",
   // TODO New key - Add a translation
   "item.select.table.title": "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.head": "Version History",
   // TODO New key - Add a translation
   "item.version.history.head": "Version History",
-  
+
   // "item.version.history.return": "Return",
   // TODO New key - Add a translation
   "item.version.history.return": "Return",
-  
+
   // "item.version.history.selected": "Selected version",
   // TODO New key - Add a translation
   "item.version.history.selected": "Selected version",
-  
+
   // "item.version.history.table.version": "Version",
   // TODO New key - Add a translation
   "item.version.history.table.version": "Version",
-  
+
   // "item.version.history.table.item": "Item",
   // TODO New key - Add a translation
   "item.version.history.table.item": "Item",
-  
+
   // "item.version.history.table.editor": "Editor",
   // TODO New key - Add a translation
   "item.version.history.table.editor": "Editor",
-  
+
   // "item.version.history.table.date": "Date",
   // TODO New key - Add a translation
   "item.version.history.table.date": "Date",
-  
+
   // "item.version.history.table.summary": "Summary",
   // TODO New key - Add a translation
   "item.version.history.table.summary": "Summary",
-  
-  
-  
+
+
+
   // "item.version.notice": "This is not the latest version of this item. The latest version can be found <a href='{{destination}}'>here</a>.",
   // 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>.",
-  
-  
-  
+
+
+
   // "journal.listelement.badge": "Journal",
   // TODO New key - Add a translation
   "journal.listelement.badge": "Journal",
-  
+
   // "journal.page.description": "Description",
   // TODO New key - Add a translation
   "journal.page.description": "Description",
-  
+
   // "journal.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journal.page.edit": "Edit this item",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   // TODO New key - Add a translation
   "journal.page.editor": "Editor-in-Chief",
-  
+
   // "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.titleprefix": "Journal: ",
   // TODO New key - Add a translation
   "journal.page.titleprefix": "Journal: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   // TODO New key - Add a translation
   "journalissue.listelement.badge": "Journal Issue",
-  
+
   // "journalissue.page.description": "Description",
   // TODO New key - Add a translation
   "journalissue.page.description": "Description",
-  
+
   // "journalissue.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalissue.page.edit": "Edit this item",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalissue.page.issuedate": "Issue Date",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "journalissue.page.journal-issn": "Journal ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "journalissue.page.journal-title": "Journal Title",
-  
+
   // "journalissue.page.keyword": "Keywords",
   // TODO New key - Add a translation
   "journalissue.page.keyword": "Keywords",
-  
+
   // "journalissue.page.number": "Number",
   // TODO New key - Add a translation
   "journalissue.page.number": "Number",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   // TODO New key - Add a translation
   "journalissue.page.titleprefix": "Journal Issue: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   // TODO New key - Add a translation
   "journalvolume.listelement.badge": "Journal Volume",
-  
+
   // "journalvolume.page.description": "Description",
   // TODO New key - Add a translation
   "journalvolume.page.description": "Description",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "journalvolume.page.edit": "Edit this item",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   // TODO New key - Add a translation
   "journalvolume.page.issuedate": "Issue Date",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   // TODO New key - Add a translation
   "journalvolume.page.titleprefix": "Journal Volume: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   // TODO New key - Add a translation
   "journalvolume.page.volume": "Volume",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   // TODO New key - Add a translation
   "loading.bitstream": "Loading bitstream...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   // TODO New key - Add a translation
   "loading.bitstreams": "Loading bitstreams...",
-  
+
   // "loading.browse-by": "Loading items...",
   // TODO New key - Add a translation
   "loading.browse-by": "Loading items...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   // TODO New key - Add a translation
   "loading.browse-by-page": "Loading page...",
-  
+
   // "loading.collection": "Loading collection...",
   // TODO New key - Add a translation
   "loading.collection": "Loading collection...",
-  
+
   // "loading.collections": "Loading collections...",
   // TODO New key - Add a translation
   "loading.collections": "Loading collections...",
-  
+
   // "loading.content-source": "Loading content source...",
   // TODO New key - Add a translation
   "loading.content-source": "Loading content source...",
-  
+
   // "loading.community": "Loading community...",
   // TODO New key - Add a translation
   "loading.community": "Loading community...",
-  
+
   // "loading.default": "Loading...",
   // TODO New key - Add a translation
   "loading.default": "Loading...",
-  
+
   // "loading.item": "Loading item...",
   // TODO New key - Add a translation
   "loading.item": "Loading item...",
-  
+
   // "loading.items": "Loading items...",
   // TODO New key - Add a translation
   "loading.items": "Loading items...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   // TODO New key - Add a translation
   "loading.mydspace-results": "Loading items...",
-  
+
   // "loading.objects": "Loading...",
   // TODO New key - Add a translation
   "loading.objects": "Loading...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   // TODO New key - Add a translation
   "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.sub-collections": "Loading sub-collections...",
   // TODO New key - Add a translation
   "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.top-level-communities": "Loading top-level communities...",
   // TODO New key - Add a translation
   "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.forgot-password": "Have you forgotten your password?",
   // TODO New key - Add a translation
   "login.form.forgot-password": "Have you forgotten your 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.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.or-divider": "or",
   // TODO New key - Add a translation
   "login.form.or-divider": "or",
-  
+
   // "login.form.password": "Password",
   // TODO New key - Add a translation
   "login.form.password": "Password",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   // TODO New key - Add a translation
   "login.form.shibboleth": "Log in with Shibboleth",
-  
+
   // "login.form.submit": "Log in",
   // TODO New key - Add a translation
   "login.form.submit": "Log in",
-  
+
   // "login.title": "Login",
   // TODO New key - Add a translation
   "login.title": "Login",
-  
+
   // "login.breadcrumbs": "Login",
   // TODO New key - Add a translation
   "login.breadcrumbs": "Login",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   // TODO New key - Add a translation
   "logout.form.header": "Log out from DSpace",
-  
+
   // "logout.form.submit": "Log out",
   // TODO New key - Add a translation
   "logout.form.submit": "Log out",
-  
+
   // "logout.title": "Logout",
   // TODO New key - Add a translation
   "logout.title": "Logout",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   // TODO New key - Add a translation
   "menu.header.admin": "Admin",
-  
+
   // "menu.header.image.logo": "Repository logo",
   // TODO New key - Add a translation
   "menu.header.image.logo": "Repository logo",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   // TODO New key - Add a translation
   "menu.section.access_control": "Access Control",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   // TODO New key - Add a translation
   "menu.section.access_control_authorizations": "Authorizations",
-  
+
   // "menu.section.access_control_groups": "Groups",
   // TODO New key - Add a translation
   "menu.section.access_control_groups": "Groups",
-  
+
   // "menu.section.access_control_people": "People",
   // TODO New key - Add a translation
   "menu.section.access_control_people": "People",
-  
-  
-  
+
+
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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.browse_community": "This Community",
   // TODO New key - Add a translation
   "menu.section.browse_community": "This 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_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_title": "By Title",
   // TODO New key - Add a translation
   "menu.section.browse_community_by_title": "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_by_author": "By Author",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_author": "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_subject": "By Subject",
   // TODO New key - Add a translation
   "menu.section.browse_global_by_subject": "By Subject",
-  
+
   // "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_communities_and_collections": "Communities & Collections",
   // TODO New key - Add a translation
   "menu.section.browse_global_communities_and_collections": "Communities & Collections",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   // TODO New key - Add a translation
   "menu.section.control_panel": "Control Panel",
-  
+
   // "menu.section.curation_task": "Curation Task",
   // TODO New key - Add a translation
   "menu.section.curation_task": "Curation Task",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   // TODO New key - Add a translation
   "menu.section.edit": "Edit",
-  
+
   // "menu.section.edit_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.edit_collection": "Collection",
-  
+
   // "menu.section.edit_community": "Community",
   // TODO New key - Add a translation
   "menu.section.edit_community": "Community",
-  
+
   // "menu.section.edit_item": "Item",
   // TODO New key - Add a translation
   "menu.section.edit_item": "Item",
-  
-  
-  
+
+
+
   // "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_community": "Community",
   // TODO New key - Add a translation
   "menu.section.export_community": "Community",
-  
+
   // "menu.section.export_item": "Item",
   // TODO New key - Add a translation
   "menu.section.export_item": "Item",
-  
+
   // "menu.section.export_metadata": "Metadata",
   // TODO New key - Add a translation
   "menu.section.export_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   // TODO New key - Add a translation
   "menu.section.icon.access_control": "Access Control menu section",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "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.control_panel": "Control Panel menu section",
   // TODO New key - Add a translation
   "menu.section.icon.control_panel": "Control Panel menu section",
-  
+
   // "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.edit": "Edit menu section",
   // TODO New key - Add a translation
   "menu.section.icon.edit": "Edit menu section",
-  
+
   // "menu.section.icon.export": "Export menu section",
   // TODO New key - Add a translation
   "menu.section.icon.export": "Export menu section",
-  
+
   // "menu.section.icon.find": "Find menu section",
   // TODO New key - Add a translation
   "menu.section.icon.find": "Find menu section",
-  
+
   // "menu.section.icon.import": "Import menu section",
   // TODO New key - Add a translation
   "menu.section.icon.import": "Import menu section",
-  
+
   // "menu.section.icon.new": "New menu section",
   // TODO New key - Add a translation
   "menu.section.icon.new": "New menu section",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.pin": "Pin sidebar",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   // TODO New key - Add a translation
   "menu.section.icon.processes": "Processes menu section",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   // TODO New key - Add a translation
   "menu.section.icon.registries": "Registries menu section",
-  
+
   // "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.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.icon.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   // TODO New key - Add a translation
   "menu.section.import": "Import",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   // TODO New key - Add a translation
   "menu.section.import_batch": "Batch 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_collection": "Collection",
   // TODO New key - Add a translation
   "menu.section.new_collection": "Collection",
-  
+
   // "menu.section.new_community": "Community",
   // TODO New key - Add a translation
   "menu.section.new_community": "Community",
-  
+
   // "menu.section.new_item": "Item",
   // TODO New key - Add a translation
   "menu.section.new_item": "Item",
-  
+
   // "menu.section.new_item_version": "Item Version",
   // TODO New key - Add a translation
   "menu.section.new_item_version": "Item Version",
-  
+
   // "menu.section.new_process": "Process",
   // TODO New key - Add a translation
   "menu.section.new_process": "Process",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   // TODO New key - Add a translation
   "menu.section.pin": "Pin sidebar",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   // TODO New key - Add a translation
   "menu.section.unpin": "Unpin sidebar",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   // TODO New key - Add a translation
   "menu.section.processes": "Processes",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   // TODO New key - Add a translation
   "menu.section.registries": "Registries",
-  
+
   // "menu.section.registries_format": "Format",
   // TODO New key - Add a translation
   "menu.section.registries_format": "Format",
-  
+
   // "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_task": "Statistics Task",
   // TODO New key - Add a translation
   "menu.section.statistics_task": "Statistics Task",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   // TODO New key - Add a translation
   "menu.section.toggle.access_control": "Toggle Access Control 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.curation_task": "Toggle Curation Task section",
   // TODO New key - Add a translation
   "menu.section.toggle.curation_task": "Toggle Curation Task section",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   // TODO New key - Add a translation
   "menu.section.toggle.edit": "Toggle Edit section",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   // TODO New key - Add a translation
   "menu.section.toggle.export": "Toggle Export section",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   // TODO New key - Add a translation
   "menu.section.toggle.find": "Toggle Find section",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   // TODO New key - Add a translation
   "menu.section.toggle.import": "Toggle Import section",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   // TODO New key - Add a translation
   "menu.section.toggle.new": "Toggle New section",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   // TODO New key - Add a translation
   "menu.section.toggle.registries": "Toggle Registries section",
-  
+
   // "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.workflow": "Administer Workflow",
   // TODO New key - Add a translation
   "menu.section.workflow": "Administer Workflow",
-  
-  
+
+
   // "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.description-placeholder": "Insert your message here...",
   // TODO New key - Add a translation
   "mydspace.messages.description-placeholder": "Insert your message here...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   // TODO New key - Add a translation
   "mydspace.messages.hide-msg": "Hide message",
-  
+
   // "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-unread": "Mark as unread",
   // TODO New key - Add a translation
   "mydspace.messages.mark-as-unread": "Mark as unread",
-  
+
   // "mydspace.messages.no-content": "No content.",
   // TODO New key - Add a translation
   "mydspace.messages.no-content": "No content.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   // TODO New key - Add a translation
   "mydspace.messages.no-messages": "No messages yet.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   // TODO New key - Add a translation
   "mydspace.messages.send-btn": "Send",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   // TODO New key - Add a translation
   "mydspace.messages.show-msg": "Show message",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   // TODO New key - Add a translation
   "mydspace.messages.subject-placeholder": "Subject...",
-  
+
   // "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.title": "Messages",
   // TODO New key - Add a translation
   "mydspace.messages.title": "Messages",
-  
+
   // "mydspace.messages.to": "To",
   // TODO New key - Add a translation
   "mydspace.messages.to": "To",
-  
+
   // "mydspace.new-submission": "New submission",
   // TODO New key - Add a translation
   "mydspace.new-submission": "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-short": "Import metadata",
   // TODO New key - Add a translation
   "mydspace.new-submission-external-short": "Import metadata",
-  
+
   // "mydspace.results.head": "Your submissions",
   // TODO New key - Add a translation
   "mydspace.results.head": "Your submissions",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   // TODO New key - Add a translation
   "mydspace.results.no-abstract": "No Abstract",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   // TODO New key - Add a translation
   "mydspace.results.no-authors": "No Authors",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   // TODO New key - Add a translation
   "mydspace.results.no-collections": "No Collections",
-  
+
   // "mydspace.results.no-date": "No Date",
   // TODO New key - Add a translation
   "mydspace.results.no-date": "No Date",
-  
+
   // "mydspace.results.no-files": "No Files",
   // TODO New key - Add a translation
   "mydspace.results.no-files": "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-title": "No title",
   // TODO New key - Add a translation
   "mydspace.results.no-title": "No title",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   // TODO New key - Add a translation
   "mydspace.results.no-uri": "No Uri",
-  
+
   // "mydspace.show.workflow": "All tasks",
   // TODO New key - Add a translation
   "mydspace.show.workflow": "All tasks",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   // 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.validation": "Validation",
+  "mydspace.status.mydspaceArchived": "Archived",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
   // TODO New key - Add a translation
-  "mydspace.status.validation": "Validation",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
+  "mydspace.status.mydspaceValidation": "Validation",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
   // TODO New key - Add a translation
-  "mydspace.status.waiting-for-controller": "Waiting for controller",
-  
-  // "mydspace.status.workflow": "Workflow",
+  "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
   // TODO New key - Add a translation
-  "mydspace.status.workflow": "Workflow",
-  
-  // "mydspace.status.workspace": "Workspace",
+  "mydspace.status.mydspaceWorkflow": "Workflow",
+
+  // "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
   "mydspace.title": "MyDSpace",
-  
+
   // "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-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-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-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.view-btn": "View",
   // TODO New key - Add a translation
   "mydspace.view-btn": "View",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   // TODO New key - Add a translation
   "nav.browse.header": "All of DSpace",
-  
+
   // "nav.community-browse.header": "By Community",
   // TODO New key - Add a translation
   "nav.community-browse.header": "By Community",
-  
+
   // "nav.language": "Language switch",
   // TODO New key - Add a translation
   "nav.language": "Language switch",
-  
+
   // "nav.login": "Log In",
   // TODO New key - Add a translation
   "nav.login": "Log In",
-  
+
   // "nav.logout": "Log Out",
   // TODO New key - Add a translation
   "nav.logout": "Log Out",
-  
+
   // "nav.mydspace": "MyDSpace",
   // TODO New key - Add a translation
   "nav.mydspace": "MyDSpace",
-  
+
   // "nav.profile": "Profile",
   // TODO New key - Add a translation
   "nav.profile": "Profile",
-  
+
   // "nav.search": "Search",
   // TODO New key - Add a translation
   "nav.search": "Search",
-  
+
   // "nav.statistics.header": "Statistics",
   // TODO New key - Add a translation
   "nav.statistics.header": "Statistics",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   // TODO New key - Add a translation
   "nav.stop-impersonating": "Stop impersonating EPerson",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   // TODO New key - Add a translation
   "orgunit.listelement.badge": "Organizational Unit",
-  
+
   // "orgunit.page.city": "City",
   // TODO New key - Add a translation
   "orgunit.page.city": "City",
-  
+
   // "orgunit.page.country": "Country",
   // TODO New key - Add a translation
   "orgunit.page.country": "Country",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   // TODO New key - Add a translation
   "orgunit.page.dateestablished": "Date established",
-  
+
   // "orgunit.page.description": "Description",
   // TODO New key - Add a translation
   "orgunit.page.description": "Description",
-  
+
   // "orgunit.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "orgunit.page.edit": "Edit this item",
-  
+
   // "orgunit.page.id": "ID",
   // TODO New key - Add a translation
   "orgunit.page.id": "ID",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   // TODO New key - Add a translation
   "orgunit.page.titleprefix": "Organizational Unit: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   // TODO New key - Add a translation
   "pagination.results-per-page": "Results Per Page",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   // TODO New key - Add a translation
   "pagination.showing.detail": "{{ range }} of {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   // TODO New key - Add a translation
   "pagination.showing.label": "Now showing ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   // TODO New key - Add a translation
   "pagination.sort-direction": "Sort Options",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   // TODO New key - Add a translation
   "person.listelement.badge": "Person",
-  
+
   // "person.listelement.no-title": "No name found",
   // TODO New key - Add a translation
   "person.listelement.no-title": "No name found",
-  
+
   // "person.page.birthdate": "Birth Date",
   // TODO New key - Add a translation
   "person.page.birthdate": "Birth Date",
-  
+
   // "person.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "person.page.edit": "Edit this item",
-  
+
   // "person.page.email": "Email Address",
   // TODO New key - Add a translation
   "person.page.email": "Email Address",
-  
+
   // "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.lastname": "Last Name",
   // TODO New key - Add a translation
   "person.page.lastname": "Last Name",
-  
+
   // "person.page.link.full": "Show all metadata",
   // TODO New key - Add a translation
   "person.page.link.full": "Show all 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.titleprefix": "Person: ",
   // TODO New key - Add a translation
   "person.page.titleprefix": "Person: ",
-  
+
   // "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",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   // TODO New key - Add a translation
   "process.new.select-parameters": "Parameters",
-  
+
   // "process.new.cancel": "Cancel",
   // TODO New key - Add a translation
   "process.new.cancel": "Cancel",
-  
+
   // "process.new.submit": "Submit",
   // TODO New key - Add a translation
   "process.new.submit": "Submit",
-  
+
   // "process.new.select-script": "Script",
   // TODO New key - Add a translation
   "process.new.select-script": "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.required": "Script is required",
   // TODO New key - Add a translation
   "process.new.select-script.required": "Script is 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.required": "Please select a file",
   // TODO New key - Add a translation
   "process.new.parameter.file.required": "Please select a file",
-  
+
   // "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.type.value": "value",
   // TODO New key - Add a translation
   "process.new.parameter.type.value": "value",
-  
+
   // "process.new.parameter.type.file": "file",
   // TODO New key - Add a translation
   "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.notification.success.title": "Success",
   // TODO New key - Add a translation
   "process.new.notification.success.title": "Success",
-  
+
   // "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.error.title": "Error",
   // TODO New key - Add a translation
   "process.new.notification.error.title": "Error",
-  
+
   // "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.header": "Create a new process",
   // TODO New key - Add a translation
   "process.new.header": "Create a new process",
-  
+
   // "process.new.title": "Create a new process",
   // TODO New key - Add a translation
   "process.new.title": "Create a new process",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   // TODO New key - Add a translation
   "process.new.breadcrumbs": "Create a new process",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
   // TODO New key - Add a translation
-  "process.detail.arguments" : "Arguments",
-  
+  "process.detail.arguments": "Arguments",
+
   // "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": "This process doesn't contain any arguments",
+
   // "process.detail.back" : "Back",
   // TODO New key - Add a translation
-  "process.detail.back" : "Back",
-  
+  "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.logs.button": "Retrieve process output",
   // TODO New key - Add a translation
   "process.detail.logs.button": "Retrieve process output",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   // TODO New key - Add a translation
   "process.detail.logs.loading": "Retrieving",
-  
+
   // "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.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.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.script" : "Script",
   // TODO New key - Add a translation
-  "process.detail.script" : "Script",
-  
+  "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": "Process: {{ 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.end-time" : "Finish time",
   // TODO New key - Add a translation
-  "process.detail.end-time" : "Finish time",
-  
+  "process.detail.end-time": "Finish time",
+
   // "process.detail.status" : "Status",
   // TODO New key - Add a translation
-  "process.detail.status" : "Status",
-  
+  "process.detail.status": "Status",
+
   // "process.detail.create" : "Create similar process",
   // TODO New key - Add a translation
-  "process.detail.create" : "Create similar process",
-  
-  
-  
+  "process.detail.create": "Create similar process",
+
+
+
   // "process.overview.table.finish" : "Finish time",
   // TODO New key - Add a translation
-  "process.overview.table.finish" : "Finish time",
-  
+  "process.overview.table.finish": "Finish time",
+
   // "process.overview.table.id" : "Process ID",
   // TODO New key - Add a translation
-  "process.overview.table.id" : "Process ID",
-  
+  "process.overview.table.id": "Process ID",
+
   // "process.overview.table.name" : "Name",
   // TODO New key - Add a translation
-  "process.overview.table.name" : "Name",
-  
+  "process.overview.table.name": "Name",
+
   // "process.overview.table.start" : "Start time",
   // TODO New key - Add a translation
-  "process.overview.table.start" : "Start time",
-  
+  "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.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.title": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.title": "Processes Overview",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   // TODO New key - Add a translation
   "process.overview.breadcrumbs": "Processes Overview",
-  
+
   // "process.overview.new": "New",
   // TODO New key - Add a translation
   "process.overview.new": "New",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   // TODO New key - Add a translation
   "profile.breadcrumbs": "Update Profile",
-  
+
   // "profile.card.identify": "Identify",
   // TODO New key - Add a translation
   "profile.card.identify": "Identify",
-  
+
   // "profile.card.security": "Security",
   // TODO New key - Add a translation
   "profile.card.security": "Security",
-  
+
   // "profile.form.submit": "Update Profile",
   // TODO New key - Add a translation
   "profile.form.submit": "Update Profile",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   // TODO New key - Add a translation
   "profile.groups.head": "Authorization groups you belong to",
-  
+
   // "profile.head": "Update Profile",
   // TODO New key - Add a translation
   "profile.head": "Update Profile",
-  
+
   // "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.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.label.email": "Email Address",
   // TODO New key - Add a translation
   "profile.metadata.form.label.email": "Email Address",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   // TODO New key - Add a translation
   "profile.metadata.form.label.firstname": "First Name",
-  
+
   // "profile.metadata.form.label.language": "Language",
   // TODO New key - Add a translation
   "profile.metadata.form.label.language": "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.phone": "Contact Telephone",
   // TODO New key - Add a translation
   "profile.metadata.form.label.phone": "Contact Telephone",
-  
+
   // "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.title": "Profile saved",
   // TODO New key - Add a translation
   "profile.metadata.form.notifications.success.title": "Profile saved",
-  
+
   // "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.title": "No changes",
   // TODO New key - Add a translation
   "profile.notifications.warning.no-changes.title": "No changes",
-  
+
   // "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.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.label.password": "Password",
   // TODO New key - Add a translation
   "profile.security.form.label.password": "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.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.title": "Password saved",
   // TODO New key - Add a translation
   "profile.security.form.notifications.success.title": "Password saved",
-  
+
   // "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.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.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.title": "Update Profile",
   // TODO New key - Add a translation
   "profile.title": "Update Profile",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   // TODO New key - Add a translation
   "project.listelement.badge": "Research Project",
-  
+
   // "project.page.contributor": "Contributors",
   // TODO New key - Add a translation
   "project.page.contributor": "Contributors",
-  
+
   // "project.page.description": "Description",
   // TODO New key - Add a translation
   "project.page.description": "Description",
-  
+
   // "project.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "project.page.edit": "Edit this item",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   // TODO New key - Add a translation
   "project.page.expectedcompletion": "Expected Completion",
-  
+
   // "project.page.funder": "Funders",
   // TODO New key - Add a translation
   "project.page.funder": "Funders",
-  
+
   // "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.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.search.results.head": "Project Search Results",
   // TODO New key - Add a translation
   "project.search.results.head": "Project Search Results",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   // TODO New key - Add a translation
   "publication.listelement.badge": "Publication",
-  
+
   // "publication.page.description": "Description",
   // TODO New key - Add a translation
   "publication.page.description": "Description",
-  
+
   // "publication.page.edit": "Edit this item",
   // TODO New key - Add a translation
   "publication.page.edit": "Edit this item",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   // TODO New key - Add a translation
   "publication.page.journal-issn": "Journal ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   // TODO New key - Add a translation
   "publication.page.journal-title": "Journal Title",
-  
+
   // "publication.page.publisher": "Publisher",
   // TODO New key - Add a translation
   "publication.page.publisher": "Publisher",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   // TODO New key - Add a translation
   "publication.page.titleprefix": "Publication: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   // TODO New key - Add a translation
   "publication.page.volume-title": "Volume Title",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   // TODO New key - Add a translation
   "publication.search.results.head": "Publication Search Results",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   // TODO New key - Add a translation
   "publication.search.title": "DSpace Angular :: Publication Search",
-  
-  
+
+
   // "register-email.title": "New user registration",
   // TODO New key - Add a translation
   "register-email.title": "New user registration",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   // TODO New key - Add a translation
   "register-page.create-profile.header": "Create Profile",
-  
+
   // "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.email": "Email Address",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.email": "Email Address",
-  
+
   // "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.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.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.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.contact": "Contact Telephone",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.contact": "Contact Telephone",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   // TODO New key - Add a translation
   "register-page.create-profile.identification.language": "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.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.label.password": "Password *",
   // TODO New key - Add a translation
   "register-page.create-profile.security.label.password": "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.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.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.submit": "Complete Registration",
   // TODO New key - Add a translation
   "register-page.create-profile.submit": "Complete Registration",
-  
+
   // "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.head": "Registration failed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.error.head": "Registration failed",
-  
+
   // "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.head": "Registration completed",
   // TODO New key - Add a translation
   "register-page.create-profile.submit.success.head": "Registration completed",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   // TODO New key - Add a translation
   "register-page.registration.header": "New user registration",
-  
+
   // "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.email": "Email Address *",
   // TODO New key - Add a translation
   "register-page.registration.email": "Email Address *",
-  
+
   // "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.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.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.submit": "Register",
   // TODO New key - Add a translation
   "register-page.registration.submit": "Register",
-  
+
   // "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.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.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.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 }}",
-  
-  
-  
+
+
+
   // "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.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.title": "Unable to add relationship",
   // TODO New key - Add a translation
   "relationships.add.error.title": "Unable to add relationship",
-  
+
   // "relationships.isAuthorOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isAuthorOf": "Authors",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.Person": "Authors (persons)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   // TODO New key - Add a translation
   "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   // TODO New key - Add a translation
   "relationships.isIssueOf": "Journal Issues",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   // TODO New key - Add a translation
   "relationships.isJournalIssueOf": "Journal Issue",
-  
+
   // "relationships.isJournalOf": "Journals",
   // TODO New key - Add a translation
   "relationships.isJournalOf": "Journals",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   // TODO New key - Add a translation
   "relationships.isOrgUnitOf": "Organizational Units",
-  
+
   // "relationships.isPersonOf": "Authors",
   // TODO New key - Add a translation
   "relationships.isPersonOf": "Authors",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   // TODO New key - Add a translation
   "relationships.isProjectOf": "Research Projects",
-  
+
   // "relationships.isPublicationOf": "Publications",
   // TODO New key - Add a translation
   "relationships.isPublicationOf": "Publications",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   // TODO New key - Add a translation
   "relationships.isPublicationOfJournalIssue": "Articles",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   // TODO New key - Add a translation
   "relationships.isSingleJournalOf": "Journal",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   // TODO New key - Add a translation
   "relationships.isSingleVolumeOf": "Journal Volume",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   // TODO New key - Add a translation
   "relationships.isVolumeOf": "Journal Volumes",
-  
+
   // "relationships.isContributorOf": "Contributors",
   // TODO New key - Add a translation
   "relationships.isContributorOf": "Contributors",
-  
-  
-  
+
+
+
   // "resource-policies.add.button": "Add",
   // TODO New key - Add a translation
   "resource-policies.add.button": "Add",
-  
+
   // "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.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.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.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.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.collection": "Add a new Collection policy",
   // TODO New key - Add a translation
   "resource-policies.add.for.collection": "Add a new Collection policy",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.create.page.success.content": "Operation successful",
-  
+
   // "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.delete.btn": "Delete selected",
   // TODO New key - Add a translation
   "resource-policies.delete.btn": "Delete selected",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.delete.success.content": "Operation successful",
-  
+
   // "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.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.success.content": "Operation successful",
   // TODO New key - Add a translation
   "resource-policies.edit.page.success.content": "Operation successful",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   // TODO New key - Add a translation
   "resource-policies.edit.page.title": "Edit resource policy",
-  
+
   // "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.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.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.select.btn": "Select",
   // TODO New key - Add a translation
   "resource-policies.form.eperson-group-list.select.btn": "Select",
-  
+
   // "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.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.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.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.date.end.label": "End Date",
   // TODO New key - Add a translation
   "resource-policies.form.date.end.label": "End Date",
-  
+
   // "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.description.label": "Description",
   // TODO New key - Add a translation
   "resource-policies.form.description.label": "Description",
-  
+
   // "resource-policies.form.name.label": "Name",
   // TODO New key - Add a translation
   "resource-policies.form.name.label": "Name",
-  
+
   // "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.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.table.headers.action": "Action",
   // TODO New key - Add a translation
   "resource-policies.table.headers.action": "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.start": "Start Date",
   // TODO New key - Add a translation
   "resource-policies.table.headers.date.start": "Start Date",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit": "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.policy": "Edit policy",
   // TODO New key - Add a translation
   "resource-policies.table.headers.edit.policy": "Edit policy",
-  
+
   // "resource-policies.table.headers.eperson": "EPerson",
   // TODO New key - Add a translation
   "resource-policies.table.headers.eperson": "EPerson",
-  
+
   // "resource-policies.table.headers.group": "Group",
   // TODO New key - Add a translation
   "resource-policies.table.headers.group": "Group",
-  
+
   // "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.policyType": "type",
   // TODO New key - Add a translation
   "resource-policies.table.headers.policyType": "type",
-  
+
   // "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.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.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.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.collection": "Policies for Collection",
   // TODO New key - Add a translation
   "resource-policies.table.headers.title.for.collection": "Policies for Collection",
-  
-  
-  
+
+
+
   // "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.title": "DSpace Angular :: Search",
   // TODO New key - Add a translation
   "search.title": "DSpace Angular :: Search",
-  
+
   // "search.breadcrumbs": "Search",
   // TODO New key - Add a translation
   "search.breadcrumbs": "Search",
-  
-  
+
+
   // "search.filters.applied.f.author": "Author",
   // TODO New key - Add a translation
   "search.filters.applied.f.author": "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.min": "Start date",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateIssued.min": "Start date",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.applied.f.dateSubmitted": "Date submitted",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   // TODO New key - Add a translation
   "search.filters.applied.f.discoverable": "Private",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.entityType": "Item Type",
-  
+
   // "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.itemtype": "Type",
   // TODO New key - Add a translation
   "search.filters.applied.f.itemtype": "Type",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   // TODO New key - Add a translation
   "search.filters.applied.f.namedresourcetype": "Status",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   // TODO New key - Add a translation
   "search.filters.applied.f.subject": "Subject",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   // TODO New key - Add a translation
   "search.filters.applied.f.submitter": "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.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.min": "Start birth date",
   // TODO New key - Add a translation
   "search.filters.applied.f.birthDate.min": "Start birth date",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.applied.f.withdrawn": "Withdrawn",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   // TODO New key - Add a translation
   "search.filters.filter.author.head": "Author",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   // TODO New key - Add a translation
   "search.filters.filter.author.placeholder": "Author name",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.head": "Birth Date",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   // TODO New key - Add a translation
   "search.filters.filter.birthDate.placeholder": "Birth Date",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.head": "Date Published",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   // TODO New key - Add a translation
   "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
-  
+
   // "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.creativeWorkKeywords.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.head": "Subject",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.head": "Publisher",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   // TODO New key - Add a translation
   "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
-  
+
   // "search.filters.filter.dateIssued.head": "Date",
   // TODO New key - Add a translation
   "search.filters.filter.dateIssued.head": "Date",
-  
+
   // "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.min.placeholder": "Maximum Date",
   // TODO New key - Add a translation
   "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.head": "Date submitted",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   // TODO New key - Add a translation
   "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   // TODO New key - Add a translation
   "search.filters.filter.discoverable.head": "Private",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   // TODO New key - Add a translation
   "search.filters.filter.withdrawn.head": "Withdrawn",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.head": "Item Type",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   // TODO New key - Add a translation
   "search.filters.filter.entityType.placeholder": "Item Type",
-  
+
   // "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.itemtype.head": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.head": "Type",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   // TODO New key - Add a translation
   "search.filters.filter.itemtype.placeholder": "Type",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.head": "Job Title",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   // TODO New key - Add a translation
   "search.filters.filter.jobTitle.placeholder": "Job Title",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.head": "Known language",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   // TODO New key - Add a translation
   "search.filters.filter.knowsLanguage.placeholder": "Known language",
-  
+
   // "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.objectpeople.head": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.head": "People",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   // TODO New key - Add a translation
   "search.filters.filter.objectpeople.placeholder": "People",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.head": "Country",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressCountry.placeholder": "Country",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.head": "City",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   // TODO New key - Add a translation
   "search.filters.filter.organizationAddressLocality.placeholder": "City",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.head": "Date Founded",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   // TODO New key - Add a translation
   "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   // TODO New key - Add a translation
   "search.filters.filter.scope.head": "Scope",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   // TODO New key - Add a translation
   "search.filters.filter.scope.placeholder": "Scope filter",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   // TODO New key - Add a translation
   "search.filters.filter.show-less": "Collapse",
-  
+
   // "search.filters.filter.show-more": "Show more",
   // TODO New key - Add a translation
   "search.filters.filter.show-more": "Show more",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.subject.head": "Subject",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   // TODO New key - Add a translation
   "search.filters.filter.subject.placeholder": "Subject",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.head": "Submitter",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   // TODO New key - Add a translation
   "search.filters.filter.submitter.placeholder": "Submitter",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalIssue": "Journal Issue",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   // TODO New key - Add a translation
   "search.filters.entityType.JournalVolume": "Journal Volume",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   // TODO New key - Add a translation
   "search.filters.entityType.OrgUnit": "Organizational Unit",
-  
+
   // "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.false": "No",
   // TODO New key - Add a translation
   "search.filters.has_content_in_original_bundle.false": "No",
-  
+
   // "search.filters.discoverable.true": "No",
   // TODO New key - Add a translation
   "search.filters.discoverable.true": "No",
-  
+
   // "search.filters.discoverable.false": "Yes",
   // TODO New key - Add a translation
   "search.filters.discoverable.false": "Yes",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   // TODO New key - Add a translation
   "search.filters.withdrawn.true": "Yes",
-  
+
   // "search.filters.withdrawn.false": "No",
   // TODO New key - Add a translation
   "search.filters.withdrawn.false": "No",
-  
-  
+
+
   // "search.filters.head": "Filters",
   // TODO New key - Add a translation
   "search.filters.head": "Filters",
-  
+
   // "search.filters.reset": "Reset filters",
   // TODO New key - Add a translation
   "search.filters.reset": "Reset filters",
-  
-  
-  
+
+
+
   // "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.results.head": "Search Results",
   // TODO New key - Add a translation
   "search.results.head": "Search Results",
-  
+
   // "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-link": "quotes around it",
   // TODO New key - Add a translation
   "search.results.no-results-link": "quotes around it",
-  
+
   // "search.results.empty": "Your search returned no results.",
   // TODO New key - Add a translation
   "search.results.empty": "Your search returned no results.",
-  
-  
-  
+
+
+
   // "search.sidebar.close": "Back to results",
   // TODO New key - Add a translation
   "search.sidebar.close": "Back to results",
-  
+
   // "search.sidebar.filters.title": "Filters",
   // TODO New key - Add a translation
   "search.sidebar.filters.title": "Filters",
-  
+
   // "search.sidebar.open": "Search Tools",
   // TODO New key - Add a translation
   "search.sidebar.open": "Search Tools",
-  
+
   // "search.sidebar.results": "results",
   // TODO New key - Add a translation
   "search.sidebar.results": "results",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   // TODO New key - Add a translation
   "search.sidebar.settings.rpp": "Results per page",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   // TODO New key - Add a translation
   "search.sidebar.settings.sort-by": "Sort By",
-  
+
   // "search.sidebar.settings.title": "Settings",
   // TODO New key - Add a translation
   "search.sidebar.settings.title": "Settings",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   // TODO New key - Add a translation
   "search.view-switch.show-detail": "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-list": "Show as list",
   // TODO New key - Add a translation
   "search.view-switch.show-list": "Show as list",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   // TODO New key - Add a translation
   "sorting.ASC": "Ascending",
-  
+
   // "sorting.DESC": "Descending",
   // TODO New key - Add a translation
   "sorting.DESC": "Descending",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   // TODO New key - Add a translation
   "sorting.dc.title.ASC": "Title Ascending",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   // TODO New key - Add a translation
   "sorting.dc.title.DESC": "Title Descending",
-  
+
   // "sorting.score.DESC": "Relevance",
   // TODO New key - Add a translation
   "sorting.score.DESC": "Relevance",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
   // TODO New key - Add a translation
   "statistics.title": "Statistics",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   // TODO New key - Add a translation
   "statistics.header": "Statistics for {{ scope }}",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   // TODO New key - Add a translation
   "statistics.breadcrumbs": "Statistics",
-  
+
   // "statistics.page.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.page.no-data": "No data available",
-  
+
   // "statistics.table.no-data": "No data available",
   // TODO New key - Add a translation
   "statistics.table.no-data": "No data available",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalVisits": "Total visits",
-  
+
   // "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.TotalDownloads": "File Visits",
   // TODO New key - Add a translation
   "statistics.table.title.TotalDownloads": "File Visits",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCountries": "Top country views",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   // TODO New key - Add a translation
   "statistics.table.title.TopCities": "Top city views",
-  
+
   // "statistics.table.header.views": "Views",
   // TODO New key - Add a translation
   "statistics.table.header.views": "Views",
-  
-  
-  
+
+
+
   // "submission.edit.title": "Edit Submission",
   // TODO New key - Add a translation
   "submission.edit.title": "Edit Submission",
-  
+
   // "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.deposit": "Deposit",
   // TODO New key - Add a translation
   "submission.general.deposit": "Deposit",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.cancel": "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.submit": "Yes, I'm sure",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.submit": "Yes, I'm sure",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   // TODO New key - Add a translation
   "submission.general.discard.confirm.title": "Discard submission",
-  
+
   // "submission.general.discard.submit": "Discard",
   // TODO New key - Add a translation
   "submission.general.discard.submit": "Discard",
-  
+
   // "submission.general.save": "Save",
   // TODO New key - Add a translation
   "submission.general.save": "Save",
-  
+
   // "submission.general.save-later": "Save for later",
   // TODO New key - Add a translation
   "submission.general.save-later": "Save for 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.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.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.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.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.button": "Search",
   // TODO New key - Add a translation
   "submission.import-external.search.button": "Search",
-  
+
   // "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.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.source.arxiv": "arXiv",
   // TODO New key - Add a translation
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   // TODO New key - Add a translation
   "submission.import-external.source.loading": "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.sherpaPublisher": "SHERPA Publishers",
   // TODO New key - Add a translation
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   // TODO New key - Add a translation
   "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.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",
   // TODO New key - Add a translation
   "submission.import-external.preview.title": "Item Preview",
-  
+
   // "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.button.import": "Start submission",
   // TODO New key - Add a translation
   "submission.import-external.preview.button.import": "Start submission",
-  
+
   // "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.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.sections.describe.relationship-lookup.close": "Close",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.close": "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.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.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 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 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-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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 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.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.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 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.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.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.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.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-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.loading": "Loading...",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.loading": "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.search": "Go",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
-  
+
   // "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-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.selected": "Selected {{ size }} items",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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",
   // 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.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.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.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.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.JournalIssue": "Journal Issues",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
-  
+
   // "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.JournalVolume": "Journal Volumes",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
-  
+
   // "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.isAuthorOfPublication": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
-  
+
   // "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.Project": "Projects",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Project": "Projects",
-  
+
   // "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.Person": "Authors",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.Person": "Authors",
-  
+
   // "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.DataPackage": "Data Packages",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
-  
+
   // "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.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.isFundingOfPublication": "Funding",
   // TODO New key - Add a translation
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
-  
+
   // "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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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.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": "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": "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.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.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.ccLicense.type": "License Type",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.type": "License 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.change": "Change your license type…",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.change": "Change your license type…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.none": "No licenses available",
-  
+
   // "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.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.confirmation": "I grant the license above",
   // TODO New key - Add a translation
   "submission.sections.ccLicense.confirmation": "I grant the license above",
-  
+
   // "submission.sections.general.add-more": "Add more",
   // TODO New key - Add a translation
   "submission.sections.general.add-more": "Add more",
-  
+
   // "submission.sections.general.collection": "Collection",
   // TODO New key - Add a translation
   "submission.sections.general.collection": "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_success_notice": "Submission deposited successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
-  
+
   // "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_success_notice": "Submission discarded successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
-  
+
   // "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-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.no-collection": "No collection found",
   // TODO New key - Add a translation
   "submission.sections.general.no-collection": "No collection 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.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_success_notice": "Submission saved successfully.",
   // TODO New key - Add a translation
   "submission.sections.general.save_success_notice": "Submission saved successfully.",
-  
+
   // "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.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.submit.progressbar.CClicense": "Creative commons license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.CClicense": "Creative commons license",
-  
+
   // "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.stepcustom": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
-  
+
   // "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.steptwo": "Describe",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.describe.steptwo": "Describe",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.license": "Deposit license",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   // TODO New key - Add a translation
   "submission.sections.submit.progressbar.upload": "Upload files",
-  
-  
-  
+
+
+
   // "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.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.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.title": "Delete bitstream",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.confirm.title": "Delete bitstream",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   // TODO New key - Add a translation
   "submission.sections.upload.delete.submit": "Delete",
-  
+
   // "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.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.date-required": "Date is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.date-required": "Date is required.",
-  
+
   // "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-placeholder": "From",
   // TODO New key - Add a translation
   "submission.sections.upload.form.from-placeholder": "From",
-  
+
   // "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-required": "Group is required.",
   // TODO New key - Add a translation
   "submission.sections.upload.form.group-required": "Group is 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-placeholder": "Until",
   // TODO New key - Add a translation
   "submission.sections.upload.form.until-placeholder": "Until",
-  
+
   // "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.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.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>",
   // 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 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.no-entry": "No",
   // TODO New key - Add a translation
   "submission.sections.upload.no-entry": "No",
-  
+
   // "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.save-metadata": "Save metadata",
   // TODO New key - Add a translation
   "submission.sections.upload.save-metadata": "Save metadata",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   // TODO New key - Add a translation
   "submission.sections.upload.undo": "Cancel",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-failed": "Upload failed",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   // TODO New key - Add a translation
   "submission.sections.upload.upload-successful": "Upload successful",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   // TODO New key - Add a translation
   "submission.submit.title": "Submission",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   // TODO New key - Add a translation
   "submission.workflow.generic.delete": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.generic.edit": "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.view": "View",
   // TODO New key - Add a translation
   "submission.workflow.generic.view": "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.tasks.claimed.approve": "Approve",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.approve": "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.edit": "Edit",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.edit": "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.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.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.submit": "Reject item",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
-  
+
   // "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.submit": "Reject",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.reject.submit": "Reject",
-  
+
   // "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.return": "Return to pool",
   // TODO New key - Add a translation
   "submission.workflow.tasks.claimed.return": "Return to pool",
-  
+
   // "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.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.processing": "Processing...",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.processing": "Processing...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.submitter": "Submitter",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   // TODO New key - Add a translation
   "submission.workflow.tasks.generic.success": "Operation successful",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.claim": "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.hide-detail": "Hide detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.hide-detail": "Hide detail",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   // TODO New key - Add a translation
   "submission.workflow.tasks.pool.show-detail": "Show detail",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   // TODO New key - Add a translation
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   // TODO New key - Add a translation
   "vocabulary-treeview.header": "Hierarchical tree view",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   // TODO New key - Add a translation
   "vocabulary-treeview.load-more": "Load more",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.reset": "Reset",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   // TODO New key - Add a translation
   "vocabulary-treeview.search.form.search": "Search",
-  
+
   // "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.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.srsc": "Research Subject Categories",
   // TODO New key - Add a translation
   "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   // TODO New key - Add a translation
   "uploader.browse": "browse",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   // TODO New key - Add a translation
   "uploader.drag-message": "Drag & Drop your files here",
-  
+
   // "uploader.or": ", or ",
   // TODO New key - Add a translation
   "uploader.or": ", 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.queue-length": "Queue length",
   // TODO New key - Add a translation
   "uploader.queue-length": "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.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-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",
-  
-  
-  
+
+
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   // TODO New key - Add a translation
   "workflowAdmin.search.results.head": "Administer 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.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.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.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.title": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.title": "Delete workflow item",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   // TODO New key - Add a translation
   "workflow-item.delete.header": "Delete workflow item",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.delete.button.cancel": "Cancel",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   // TODO New key - Add a translation
   "workflow-item.delete.button.confirm": "Delete",
-  
-  
+
+
   // "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.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.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.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.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.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.button.cancel": "Cancel",
   // TODO New key - Add a translation
   "workflow-item.send-back.button.cancel": "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",
 
-}
\ No newline at end of file
+
+}
diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5
index 84e5e0f34b..e23e58cdd9 100644
--- a/src/assets/i18n/tr.json5
+++ b/src/assets/i18n/tr.json5
@@ -1,3085 +1,3498 @@
 {
-  
+
   // "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": "Bu sayfaya erişim yetkiniz bulunmamaktadır. Ana sayfaya dönmek için aşağıdaki butonu kullanabilirsiniz.",
-  
+
   // "401.link.home-page": "Take me to the home page",
   "401.link.home-page": "Beni ana sayfaya götür",
-  
+
   // "401.unauthorized": "unauthorized",
   "401.unauthorized": "yetkisiz",
-  
-  
-  
+
+
+
   // "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": "Bu sayfaya erişim yetkiniz bulunmamaktadır. Ana sayfaya dönmek için aşağıdaki butonu kullanabilirsiniz.",
-  
+
   // "403.link.home-page": "Take me to the home page",
   "403.link.home-page": "Beni ana sayfaya götür",
-  
+
   // "403.forbidden": "forbidden",
   "403.forbidden": "yasaklı",
-  
-  
-  
+
+
+
   // "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": "Aradığınız sayfayı bulamıyoruz. Sayfa taşınmış veya silinmiş olabilir. Ana sayfaya geri dönmek için aşağıdaki butonu kullanabilirsiniz. ",
-  
+
   // "404.link.home-page": "Take me to the home page",
   "404.link.home-page": "Beni ana sayfaya götür",
-  
+
   // "404.page-not-found": "page not found",
   "404.page-not-found": "sayfa bulunamadı",
-  
+
   // "admin.curation-tasks.breadcrumbs": "System curation tasks",
   "admin.curation-tasks.breadcrumbs": "Sistem iyileştirme görevleri",
-  
+
   // "admin.curation-tasks.title": "System curation tasks",
   "admin.curation-tasks.title": "Sistem iyileştirme görevleri",
-  
+
   // "admin.curation-tasks.header": "System curation tasks",
   "admin.curation-tasks.header": "Sistem iyileştirme görevleri",
-  
+
   // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
   "admin.registries.bitstream-formats.breadcrumbs": "Kayıt defterini biçimlendir",
-  
+
   // "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.create.breadcrumbs": "Bitstream biçimi",
-  
+
   // "admin.registries.bitstream-formats.create.failure.content": "An error occurred while creating the new bitstream format.",
   "admin.registries.bitstream-formats.create.failure.content": "Yeni bitstream biçimi oluşturulurken bir hata oluştu.",
-  
+
   // "admin.registries.bitstream-formats.create.failure.head": "Failure",
   "admin.registries.bitstream-formats.create.failure.head": "Aksama",
-  
+
   // "admin.registries.bitstream-formats.create.head": "Create Bitstream format",
   "admin.registries.bitstream-formats.create.head": "Vit akışı biçimi oluştur",
-  
+
   // "admin.registries.bitstream-formats.create.new": "Add a new bitstream format",
   "admin.registries.bitstream-formats.create.new": "Yeni bir bitstream biçimi ekleyin",
-  
+
   // "admin.registries.bitstream-formats.create.success.content": "The new bitstream format was successfully created.",
   "admin.registries.bitstream-formats.create.success.content": "Yeni bitstream biçimi başarıyla oluşturuldu.",
-  
+
   // "admin.registries.bitstream-formats.create.success.head": "Success",
   "admin.registries.bitstream-formats.create.success.head": "Başarılı",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.amount": "Failed to remove {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.failure.amount": "{{ amount }} biçim(ler) kaldırılamadı",
-  
+
   // "admin.registries.bitstream-formats.delete.failure.head": "Failure",
   "admin.registries.bitstream-formats.delete.failure.head": "Aksama",
-  
+
   // "admin.registries.bitstream-formats.delete.success.amount": "Successfully removed {{ amount }} format(s)",
   "admin.registries.bitstream-formats.delete.success.amount": "{{ amount }} biçim(ler) başarıyla kaldırıldı",
-  
+
   // "admin.registries.bitstream-formats.delete.success.head": "Success",
   "admin.registries.bitstream-formats.delete.success.head": "Başarılı",
-  
+
   // "admin.registries.bitstream-formats.description": "This list of bitstream formats provides information about known formats and their support level.",
   "admin.registries.bitstream-formats.description": "Bu bitstream biçimleri listesi, bilinen biçimler ve destek düzeyleri hakkında bilgi sağlar.",
-  
+
   // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
   "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream biçimi",
-  
+
   // "admin.registries.bitstream-formats.edit.description.hint": "",
   "admin.registries.bitstream-formats.edit.description.hint": "",
-  
+
   // "admin.registries.bitstream-formats.edit.description.label": "Description",
   "admin.registries.bitstream-formats.edit.description.label": "Tanımlama",
-  
+
   // "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": "Uzantılar, yüklenen dosyaların biçimini otomatik olarak tanımlamak için kullanılan dosya uzantılarıdır. Her biçim için birkaç uzantı girebilirsiniz.",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.label": "File extensions",
   "admin.registries.bitstream-formats.edit.extensions.label": "Dosya uzantıları",
-  
+
   // "admin.registries.bitstream-formats.edit.extensions.placeholder": "Enter a file extension without the dot",
   "admin.registries.bitstream-formats.edit.extensions.placeholder": "Nokta olmadan bir dosya uzantısı girin",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.content": "An error occurred while editing the bitstream format.",
   "admin.registries.bitstream-formats.edit.failure.content": "Bitstream biçimi düzenlenirken bir hata oluştu.",
-  
+
   // "admin.registries.bitstream-formats.edit.failure.head": "Failure",
   "admin.registries.bitstream-formats.edit.failure.head": "Aksama",
-  
+
   // "admin.registries.bitstream-formats.edit.head": "Bitstream format: {{ format }}",
   "admin.registries.bitstream-formats.edit.head": "Bitstream biçimi: {{ 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": "Dahili olarak işaretlenen biçimler, kullanıcıdan gizlenir ve yönetim amacıyla kullanılır.",
-  
+
   // "admin.registries.bitstream-formats.edit.internal.label": "Internal",
   "admin.registries.bitstream-formats.edit.internal.label": "Dahili",
-  
+
   // "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": "Bu biçimle ilişkili MIME biçimi benzersiz olması gerekmez.",
-  
+
   // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
   "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Biçimi",
-  
+
   // "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": "Bu biçim için benzersiz bir ad (ör. Microsoft Word XP veya Microsoft Word 2000)",
-  
+
   // "admin.registries.bitstream-formats.edit.shortDescription.label": "Name",
   "admin.registries.bitstream-formats.edit.shortDescription.label": "İsim",
-  
+
   // "admin.registries.bitstream-formats.edit.success.content": "The bitstream format was successfully edited.",
   "admin.registries.bitstream-formats.edit.success.content": "Bitstream biçimi başarıyla düzenlendi.",
-  
+
   // "admin.registries.bitstream-formats.edit.success.head": "Success",
   "admin.registries.bitstream-formats.edit.success.head": "Başarılı",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.hint": "The level of support your institution pledges for this format.",
   "admin.registries.bitstream-formats.edit.supportLevel.hint": "Kurumunuzun bu biçim için taahhüt ettiği destek düzeyi.",
-  
+
   // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
   "admin.registries.bitstream-formats.edit.supportLevel.label": "Destek seviyesi",
-  
+
   // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
   "admin.registries.bitstream-formats.head": "Bitstream Biçimi Kayıt Defteri",
-  
+
   // "admin.registries.bitstream-formats.no-items": "No bitstream formats to show.",
   "admin.registries.bitstream-formats.no-items": "Gösterilecek bitstream biçimi yok.",
-  
+
   // "admin.registries.bitstream-formats.table.delete": "Delete selected",
   "admin.registries.bitstream-formats.table.delete": "Silme seçildi",
-  
+
   // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
   "admin.registries.bitstream-formats.table.deselect-all": "Tüm seçimleri kaldır",
-  
+
   // "admin.registries.bitstream-formats.table.internal": "internal",
   "admin.registries.bitstream-formats.table.internal": "dahili",
-  
+
   // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
   "admin.registries.bitstream-formats.table.mimetype": "MIME Biçimi",
-  
+
   // "admin.registries.bitstream-formats.table.name": "Name",
   "admin.registries.bitstream-formats.table.name": "İsim",
-  
+  // TODO New key - Add a translation
+  "admin.registries.bitstream-formats.table.id": "ID",
+
   // "admin.registries.bitstream-formats.table.return": "Return",
   "admin.registries.bitstream-formats.table.return": "Geri Dön",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
   "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Biliniyor",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
   "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Destekleniyor",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
   "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Bilinmiyor",
-  
+
   // "admin.registries.bitstream-formats.table.supportLevel.head": "Support Level",
   "admin.registries.bitstream-formats.table.supportLevel.head": "Destek Seviyesi",
-  
+
   // "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Format Registry",
   "admin.registries.bitstream-formats.title": "DSpace Angular :: Bitstream Biçimi Kayıt Defteri ",
-  
-  
-  
+
+
+
   // "admin.registries.metadata.breadcrumbs": "Metadata registry",
   "admin.registries.metadata.breadcrumbs": "Metadata kayıt defteri",
-  
+
   // "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": "Metadata kayıt defteri, veri havuzda bulunan tüm metadata alanlarının bir listesini tutar. Bu alanlar birden çok şema arasında bölünebilir. Ancak, DSpace nitelikli Dublin Core şemasını gerektirir.",
-  
+
   // "admin.registries.metadata.form.create": "Create metadata schema",
   "admin.registries.metadata.form.create": "Metadata şeması oluştur",
-  
+
   // "admin.registries.metadata.form.edit": "Edit metadata schema",
   "admin.registries.metadata.form.edit": "Metadata şemasını düzenle",
-  
+
   // "admin.registries.metadata.form.name": "Name",
   "admin.registries.metadata.form.name": "İsim",
-  
+
   // "admin.registries.metadata.form.namespace": "Namespace",
   "admin.registries.metadata.form.namespace": "Ad Alanı",
-  
+
   // "admin.registries.metadata.head": "Metadata Registry",
   "admin.registries.metadata.head": "Metadata Kayıt Defteri",
-  
+
   // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
   "admin.registries.metadata.schemas.no-items": "Gösterilecek metadata alanı yok.",
-  
+
   // "admin.registries.metadata.schemas.table.delete": "Delete selected",
   "admin.registries.metadata.schemas.table.delete": "Silme Seçildi",
-  
+
   // "admin.registries.metadata.schemas.table.id": "ID",
   "admin.registries.metadata.schemas.table.id": "Kimlik",
-  
+
   // "admin.registries.metadata.schemas.table.name": "Name",
   "admin.registries.metadata.schemas.table.name": "İsim",
-  
+
   // "admin.registries.metadata.schemas.table.namespace": "Namespace",
   "admin.registries.metadata.schemas.table.namespace": "Ad Alanı",
-  
+
   // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
   "admin.registries.metadata.title": "DSpace Angular :: Metadata Kayıt Defteri",
-  
-  
-  
+
+
+
   // "admin.registries.schema.breadcrumbs": "Metadata schema",
   "admin.registries.schema.breadcrumbs": "Metadata şeması",
-  
+
   // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
   "admin.registries.schema.description": "Bu, \"{{namesapce}}\" için metadata şemasıdır.",
-  
+
   // "admin.registries.schema.fields.head": "Schema metadata fields",
   "admin.registries.schema.fields.head": "Şema metadata alanları",
-  
+
   // "admin.registries.schema.fields.no-items": "No metadata fields to show.",
   "admin.registries.schema.fields.no-items": "Gösterilecek metadata alanı yok.",
-  
+
   // "admin.registries.schema.fields.table.delete": "Delete selected",
   "admin.registries.schema.fields.table.delete": "Silme Seçildi",
-  
+
   // "admin.registries.schema.fields.table.field": "Field",
   "admin.registries.schema.fields.table.field": "Alan",
-  
+  // TODO New key - Add a translation
+  "admin.registries.schema.fields.table.id": "ID",
+
   // "admin.registries.schema.fields.table.scopenote": "Scope Note",
   "admin.registries.schema.fields.table.scopenote": "Kapsam Notu",
-  
+
   // "admin.registries.schema.form.create": "Create metadata field",
   "admin.registries.schema.form.create": "Metadata alanı oluştur",
-  
+
   // "admin.registries.schema.form.edit": "Edit metadata field",
   "admin.registries.schema.form.edit": "Metadata alanını düzenle",
-  
+
   // "admin.registries.schema.form.element": "Element",
   "admin.registries.schema.form.element": "Element",
-  
+
   // "admin.registries.schema.form.qualifier": "Qualifier",
   "admin.registries.schema.form.qualifier": "Niteleyici",
-  
+
   // "admin.registries.schema.form.scopenote": "Scope Note",
   "admin.registries.schema.form.scopenote": "Kapsam Notu",
-  
+
   // "admin.registries.schema.head": "Metadata Schema",
   "admin.registries.schema.head": "Metadata Şeması",
-  
+
   // "admin.registries.schema.notification.created": "Successfully created metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.created": "Metadata şeması \"{{prefix}}\" başarıyla oluşturuldu",
-  
+
   // "admin.registries.schema.notification.deleted.failure": "Failed to delete {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.failure": "{{amount}} metadata şeması silinemedi",
-  
+
   // "admin.registries.schema.notification.deleted.success": "Successfully deleted {{amount}} metadata schemas",
   "admin.registries.schema.notification.deleted.success": "{{amount}} metadata şeması başarıyla silindi",
-  
+
   // "admin.registries.schema.notification.edited": "Successfully edited metadata schema \"{{prefix}}\"",
   "admin.registries.schema.notification.edited": "Metadata şeması \"{{prefix}}\" başarıyla düzenlendi",
-  
+
   // "admin.registries.schema.notification.failure": "Error",
   "admin.registries.schema.notification.failure": "Hata",
-  
+
   // "admin.registries.schema.notification.field.created": "Successfully created metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.created": "\"{{field}}\" metadata alanı başarıyla oluşturuldu",
-  
+
   // "admin.registries.schema.notification.field.deleted.failure": "Failed to delete {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.failure": "{{amount}} metadata alanı silinemedi",
-  
+
   // "admin.registries.schema.notification.field.deleted.success": "Successfully deleted {{amount}} metadata fields",
   "admin.registries.schema.notification.field.deleted.success": "{{amount}} metadata alanı başarıyla silindi",
-  
+
   // "admin.registries.schema.notification.field.edited": "Successfully edited metadata field \"{{field}}\"",
   "admin.registries.schema.notification.field.edited": "Metadata alanı \"{{field}}\" başarıyla düzenlendi",
-  
+
   // "admin.registries.schema.notification.success": "Success",
   "admin.registries.schema.notification.success": "Başarılı",
-  
+
   // "admin.registries.schema.return": "Return",
   "admin.registries.schema.return": "Geri Dön",
-  
+
   // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
   "admin.registries.schema.title": "DSpace Angular :: Metadata Şeması Kayıt Defteri",
-  
-  
-  
+
+
+
   // "admin.access-control.epeople.actions.delete": "Delete EPerson",
   "admin.access-control.epeople.actions.delete": "E-Kişiyi Sil",
-  
+
   // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
   "admin.access-control.epeople.actions.impersonate": "E-Kişinin Kimliğine Bürün",
-  
+
   // "admin.access-control.epeople.actions.reset": "Reset password",
   "admin.access-control.epeople.actions.reset": "Parolayı sıfırla",
-  
+
   // "admin.access-control.epeople.actions.stop-impersonating": "Stop impersonating EPerson",
   "admin.access-control.epeople.actions.stop-impersonating": "E-Kişilerin kimliğine bürünmeyi durdurun",
-  
+
   // "admin.access-control.epeople.title": "DSpace Angular :: EPeople",
   "admin.access-control.epeople.title": "DSpace Angular :: E-kişiler",
-  
+
   // "admin.access-control.epeople.head": "EPeople",
   "admin.access-control.epeople.head": "E-Kişiler",
-  
+
   // "admin.access-control.epeople.search.head": "Search",
   "admin.access-control.epeople.search.head": "Ara",
-  
+
   // "admin.access-control.epeople.button.see-all": "Tümüne Gözat",
   "admin.access-control.epeople.button.see-all": "Browse All",
-  
+
   // "admin.access-control.epeople.search.scope.metadata": "Metadata",
   "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": "E-posta (tam)",
-  
+
   // "admin.access-control.epeople.search.button": "Search",
   "admin.access-control.epeople.search.button": "Ara",
-  
+
   // "admin.access-control.epeople.button.add": "Add EPerson",
   "admin.access-control.epeople.button.add": "E-Kişi Ekle",
-  
+
   // "admin.access-control.epeople.table.id": "ID",
   "admin.access-control.epeople.table.id": "Kimlik",
-  
+
   // "admin.access-control.epeople.table.name": "Name",
   "admin.access-control.epeople.table.name": "İsim",
-  
+
   // "admin.access-control.epeople.table.email": "E-mail (exact)",
   "admin.access-control.epeople.table.email": "E-posta (tam)",
-  
+
   // "admin.access-control.epeople.table.edit": "Edit",
   "admin.access-control.epeople.table.edit": "Düzenle",
-  
+
   // "admin.access-control.epeople.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.edit": "Düzenle \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.epeople.table.edit.buttons.remove": "Sil \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.no-items": "No EPeople to show.",
   "admin.access-control.epeople.no-items": "Gösterilecek E-Kişiler yok.",
-  
+
   // "admin.access-control.epeople.form.create": "Create EPerson",
   "admin.access-control.epeople.form.create": "E-Kişi Oluştur",
-  
+
   // "admin.access-control.epeople.form.edit": "Edit EPerson",
   "admin.access-control.epeople.form.edit": "E-Kişiyi Düzenle",
-  
+
   // "admin.access-control.epeople.form.firstName": "First name",
   "admin.access-control.epeople.form.firstName": "İsim",
-  
+
   // "admin.access-control.epeople.form.lastName": "Last name",
   "admin.access-control.epeople.form.lastName": "Soyadı",
-  
+
   // "admin.access-control.epeople.form.email": "E-mail",
   "admin.access-control.epeople.form.email": "E-posta",
-  
+
   // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
   "admin.access-control.epeople.form.emailHint": "Geçerli bir e-posta adresi olmalı",
-  
+
   // "admin.access-control.epeople.form.canLogIn": "Can log in",
   "admin.access-control.epeople.form.canLogIn": "Giriş yapabilir",
-  
+
   // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
   "admin.access-control.epeople.form.requireCertificate": "Sertifika gerektirir",
-  
+
   // "admin.access-control.epeople.form.notification.created.success": "Successfully created EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.success": "E-Kişi \"{{name}}\" başarıyla oluşturuldu",
-  
+
   // "admin.access-control.epeople.form.notification.created.failure": "Failed to create EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.created.failure": "E-Kişi \"{{name}}\" oluşturulamadı",
-  
+
   // "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": "E-Kişi \"{{name}}\" oluşturulamadı, e-posta \"{{email}}\" zaten kullanımda.",
-  
+
   // "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": "E-Kişi \"{{name}}\" düzenlenemedi, e-posta \"{{email}}\" zaten kullanımda.",
-  
+
   // "admin.access-control.epeople.form.notification.edited.success": "Successfully edited EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.success": "E-kişi \"{{name}}\" başarıyla düzenlendi",
-  
+
   // "admin.access-control.epeople.form.notification.edited.failure": "Failed to edit EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.edited.failure": "E-Kişi \"{{name}}\" düzenlenemedi",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.success": "Successfully deleted EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.success": "E-Kişi \"{{name}}\" başarıyla silindi",
-  
+
   // "admin.access-control.epeople.form.notification.deleted.failure": "Failed to delete EPerson \"{{name}}\"",
   "admin.access-control.epeople.form.notification.deleted.failure": "E-Kişi \"{{name}}\" silinemedi",
-  
+
   // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
   "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Bu grupların üyesi:",
-  
+
   // "admin.access-control.epeople.form.table.id": "ID",
   "admin.access-control.epeople.form.table.id": "Kimlik",
-  
+
   // "admin.access-control.epeople.form.table.name": "Name",
   "admin.access-control.epeople.form.table.name": "İsim",
-  
+
   // "admin.access-control.epeople.form.memberOfNoGroups": "This EPerson is not a member of any groups",
   "admin.access-control.epeople.form.memberOfNoGroups": "Bu E-Kişi herhangi bir grubun üyesi değil",
-  
+
   // "admin.access-control.epeople.form.goToGroups": "Add to groups",
   "admin.access-control.epeople.form.goToGroups": "Gruplar ekle",
-  
+
   // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.failure": "E-Kişi silinemedi: \"{{name}}\"",
-  
+
   // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
   "admin.access-control.epeople.notification.deleted.success": "E-Kişiler başarıyla silindi: \"{{name}}\"",
-  
-  
-  
+
+
+
   // "admin.access-control.groups.title": "DSpace Angular :: Groups",
   "admin.access-control.groups.title": "DSpace Angular :: Gruplar",
-  
+
   // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
   "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Grubu Düzenle",
-  
+
   // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
   "admin.access-control.groups.title.addGroup": "DSpace Angular :: Yeni Grup",
-  
+
   // "admin.access-control.groups.head": "Groups",
   "admin.access-control.groups.head": "Gruplar",
-  
+
   // "admin.access-control.groups.button.add": "Add group",
   "admin.access-control.groups.button.add": "Grup ekle",
-  
+
   // "admin.access-control.groups.search.head": "Search groups",
   "admin.access-control.groups.search.head": "Grupları ara",
-  
+
   // "admin.access-control.groups.button.see-all": "Browse all",
   "admin.access-control.groups.button.see-all": "Tümüne göz at",
-  
+
   // "admin.access-control.groups.search.button": "Search",
   "admin.access-control.groups.search.button": "Ara",
-  
+
   // "admin.access-control.groups.table.id": "ID",
   "admin.access-control.groups.table.id": "Kimlik",
-  
+
   // "admin.access-control.groups.table.name": "Name",
   "admin.access-control.groups.table.name": "İsim",
-  
+
   // "admin.access-control.groups.table.members": "Members",
   "admin.access-control.groups.table.members": "Üyeler",
-  
+
   // "admin.access-control.groups.table.edit": "Edit",
   "admin.access-control.groups.table.edit": "Düzenle",
-  
+
   // "admin.access-control.groups.table.edit.buttons.edit": "Edit \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.edit": "Düzenle \"{{name}}\"",
-  
+
   // "admin.access-control.groups.table.edit.buttons.remove": "Delete \"{{name}}\"",
   "admin.access-control.groups.table.edit.buttons.remove": "Sil \"{{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": "Bu adla veya bu UUID olarak hiçbir grup bulunamadı",
-  
+
   // "admin.access-control.groups.notification.deleted.success": "Successfully deleted group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.success": "\"{{name}}\" grubu başarıyla silindi",
-  
+
   // "admin.access-control.groups.notification.deleted.failure.title": "Failed to delete group \"{{name}}\"",
   "admin.access-control.groups.notification.deleted.failure.title": "\"{{name}}\" grubu silinemedi",
-  
+
   // "admin.access-control.groups.notification.deleted.failure.content": "Cause: \"{{cause}}\"",
   "admin.access-control.groups.notification.deleted.failure.content": "Sorun: \"{{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": "Bu grup kalıcıdır, bu nedenle düzenlenemez veya silinemez. Yine de bu sayfayı kullanarak grup üyeleri ekleyip kaldırabilirsiniz.",
-  
+
   // "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": "Bu grup, \"{{name}}\" {{comcol}} içindeki gönderim ve iş akışı sürecindeki bir role karşılık geldiği için değiştirilemez veya silinemez. Bunu, {{comcol}} düzenleme sayfasındaki <a href='{{comcolEditRolesRoute}}'>\"rol ata\"</a> sekmesinden silebilirsiniz. Yine de bu sayfayı kullanarak grup üyeleri ekleyip kaldırabilirsiniz.",
-  
+
   // "admin.access-control.groups.form.head.create": "Create group",
   "admin.access-control.groups.form.head.create": "Grup oluştur",
-  
+
   // "admin.access-control.groups.form.head.edit": "Edit group",
   "admin.access-control.groups.form.head.edit": "Grubu düzenle",
-  
+
   // "admin.access-control.groups.form.groupName": "Group name",
   "admin.access-control.groups.form.groupName": "Grup adı",
-  
+
   // "admin.access-control.groups.form.groupDescription": "Description",
   "admin.access-control.groups.form.groupDescription": "Açıklama",
-  
+
   // "admin.access-control.groups.form.notification.created.success": "Successfully created Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.success": "Grup \"{{name}}\" başarıyla oluşturuldu",
-  
+
   // "admin.access-control.groups.form.notification.created.failure": "Failed to create Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.created.failure": "\"{{name}}\" Grubu oluşturulamadı",
-  
+
   // "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": "Şu ada sahip Grup oluşturulamadı: \"{{name}}\", adın halihazırda kullanımda olmadığından emin olun.",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure": "Failed to edit Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.failure": "\"{{name}}\" Grubu düzenlenemedi",
-  
+
   // "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Name \"{{name}}\" already in use!",
   "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "\"{{name}}\" adı zaten kullanılıyor!",
-  
+
   // "admin.access-control.groups.form.notification.edited.success": "Successfully edited Group \"{{name}}\"",
   "admin.access-control.groups.form.notification.edited.success": "\"{{name}}\" Grubu başarıyla düzenlendi",
-  
+
   // "admin.access-control.groups.form.actions.delete": "Delete Group",
   "admin.access-control.groups.form.actions.delete": "Grubu Sil",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.header": "Delete Group \"{{ dsoName }}\"",
   "admin.access-control.groups.form.delete-group.modal.header": "\"{{ dsoName }}\" Grubunu Sil",
-  
+
   // "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 }}\" Grubunu silmek istediğinizden emin misiniz?",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.cancel": "Cancel",
   "admin.access-control.groups.form.delete-group.modal.cancel": "İptal",
-  
+
   // "admin.access-control.groups.form.delete-group.modal.confirm": "Delete",
   "admin.access-control.groups.form.delete-group.modal.confirm": "Sil",
-  
+
   // "admin.access-control.groups.form.notification.deleted.success": "Successfully deleted group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.success": "\"{{ name }}\" grubu başarıyla silindi",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.title": "Failed to delete group \"{{ name }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.title": "\"{{ name }}\" grubu silinemedi",
-  
+
   // "admin.access-control.groups.form.notification.deleted.failure.content": "Cause: \"{{ cause }}\"",
   "admin.access-control.groups.form.notification.deleted.failure.content": "Sorun: \"{{ cause }}\"",
-  
+
   // "admin.access-control.groups.form.members-list.head": "EPeople",
   "admin.access-control.groups.form.members-list.head": "E-Kişiler",
-  
+
   // "admin.access-control.groups.form.members-list.search.head": "Add EPeople",
   "admin.access-control.groups.form.members-list.search.head": "E-Kişiler Ekle",
-  
+
   // "admin.access-control.groups.form.members-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.members-list.button.see-all": "Tümüne Gözat",
-  
+
   // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
   "admin.access-control.groups.form.members-list.headMembers": "Mevcut Üyeler",
-  
+
   // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
   "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.scope.email": "E-posta (tam)",
-  
+
   // "admin.access-control.groups.form.members-list.search.button": "Search",
   "admin.access-control.groups.form.members-list.search.button": "Ara",
-  
+
   // "admin.access-control.groups.form.members-list.table.id": "ID",
   "admin.access-control.groups.form.members-list.table.id": "Kimlik",
-  
+
   // "admin.access-control.groups.form.members-list.table.name": "Name",
   "admin.access-control.groups.form.members-list.table.name": "İsim",
-  
+
   // "admin.access-control.groups.form.members-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.members-list.table.edit": "Kaldır / Ekle",
-  
+
   // "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}}\" adlı üyeyi kaldırın",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.addMember": "Successfully added member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.addMember": "Üye başarıyla eklendi: \"{{name}}\"",
-  
+
   // "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": "Üye eklenemedi: \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Successfully deleted member: \"{{name}}\"",
   "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Üye başarıyla silindi: \"{{name}}\"",
-  
+
   // "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": "Üye silinemedi: \"{{name}}\"",
-  
+
   // "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}}\" adlı üye ekleyin",
-  
+
   // "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": "Mevcut aktif grup yok, önce bir isim gönderin.",
-  
+
   // "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": "Henüz grupta üye yok, arayın ve ekleyin.",
-  
+
   // "admin.access-control.groups.form.members-list.no-items": "No EPeople found in that search",
   "admin.access-control.groups.form.members-list.no-items": "Bu aramada E-Kişiler bulunamadı",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.failure": "Something went wrong: \"{{cause}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.failure": "Bir şeyler yanlış gitti: \"{{cause}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.head": "Groups",
   "admin.access-control.groups.form.subgroups-list.head": "Gruplar",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.head": "Add Subgroup",
   "admin.access-control.groups.form.subgroups-list.search.head": "Alt Grup Ekle",
-  
+
   // "admin.access-control.groups.form.subgroups-list.button.see-all": "Browse All",
   "admin.access-control.groups.form.subgroups-list.button.see-all": "Tümüne Gözat",
-  
+
   // "admin.access-control.groups.form.subgroups-list.headSubgroups": "Current Subgroups",
   "admin.access-control.groups.form.subgroups-list.headSubgroups": "Mevcut Alt Gruplar",
-  
+
   // "admin.access-control.groups.form.subgroups-list.search.button": "Search",
   "admin.access-control.groups.form.subgroups-list.search.button": "Ara",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.id": "ID",
   "admin.access-control.groups.form.subgroups-list.table.id": "Kimlik",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.name": "Name",
   "admin.access-control.groups.form.subgroups-list.table.name": "İsim",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit": "Remove / Add",
   "admin.access-control.groups.form.subgroups-list.table.edit": "Kaldır / Ekle",
-  
+
   // "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}}\" adlı alt grubu kaldırın",
-  
+
   // "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.buttons.add": "\"{{name}}\" adlı alt grup ekleyin",
-  
+
   // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
   "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Mevcut grup",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Successfully added subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Alt grup başarıyla eklendi: \"{{name}}\"",
-  
+
   // "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": "Alt grup eklenemedi: \"{{name}}\"",
-  
+
   // "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Successfully deleted subgroup: \"{{name}}\"",
   "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Alt grup başarıyla silindi: \"{{name}}\"",
-  
+
   // "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": "Alt grup silinemedi: \"{{name}}\"",
-  
+
   // "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": "Aktif grup mevcut değil, önce bir isim gönderin.",
-  
+
   // "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": "Bu grup mevcut, eklenemez.",
-  
+
   // "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": "Bu adla veya bu UUID olarak hiçbir grup bulunamadı",
-  
+
   // "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": "Henüz grupta alt grup yok.",
-  
+
   // "admin.access-control.groups.form.return": "Return to groups",
   "admin.access-control.groups.form.return": "Gruplara dön",
-  
-  
-  
+
+  //"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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  //"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.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.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+  // TODO New key - Add a translation
+  "admin.reports.commons.filters.property.all_filters.tooltip": "This filter includes all items that matched ALL specified filters",
+
+  //"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",
   "admin.search.breadcrumbs": "Yönetimsel Arama",
-  
+
   // "admin.search.collection.edit": "Edit",
   "admin.search.collection.edit": "Düzenle",
-  
+
   // "admin.search.community.edit": "Edit",
   "admin.search.community.edit": "Düzenle",
-  
+
   // "admin.search.item.delete": "Delete",
   "admin.search.item.delete": "Sil",
-  
+
   // "admin.search.item.edit": "Edit",
   "admin.search.item.edit": "Düzenle",
-  
+
   // "admin.search.item.make-private": "Make Private",
   "admin.search.item.make-private": "Özel yap",
-  
+
   // "admin.search.item.make-public": "Make Public",
   "admin.search.item.make-public": "Ortak yap",
-  
+
   // "admin.search.item.move": "Move",
   "admin.search.item.move": "Taşı",
-  
+
   // "admin.search.item.reinstate": "Reinstate",
   "admin.search.item.reinstate": "Eski durumuna getir",
-  
+
   // "admin.search.item.withdraw": "Withdraw",
   "admin.search.item.withdraw": "Çekil",
-  
+
   // "admin.search.title": "Administrative Search",
   "admin.search.title": "Yönetimsel Arama",
-  
+
   // "administrativeView.search.results.head": "Administrative Search",
   "administrativeView.search.results.head": "Yönetimsel Arama",
-  
-  
-  
-  
+
+
+
+
   // "admin.workflow.breadcrumbs": "Administer Workflow",
   "admin.workflow.breadcrumbs": "İş Akışını Yönet",
-  
+
   // "admin.workflow.title": "Administer Workflow",
   "admin.workflow.title": "İş Akışını Yönet",
-  
+
   // "admin.workflow.item.workflow": "Workflow",
   "admin.workflow.item.workflow": "İş akışı",
-  
+
   // "admin.workflow.item.delete": "Delete",
   "admin.workflow.item.delete": "Sil",
-  
+
   // "admin.workflow.item.send-back": "Send back",
   "admin.workflow.item.send-back": "Geri gönder",
-  
-  
-  
+
+
+
   // "admin.metadata-import.breadcrumbs": "Import Metadata",
   "admin.metadata-import.breadcrumbs": "Metadataları İçe Aktar",
-  
+
   // "admin.metadata-import.title": "Import Metadata",
   "admin.metadata-import.title": "Metadataları İçe Aktar",
-  
+
   // "admin.metadata-import.page.header": "Import Metadata",
   "admin.metadata-import.page.header": "Metadataları İçe Aktar",
-  
+
   // "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": "Dosyalarda toplu metadata işlemleri içeren CSV dosyalarını buraya bırakabilir veya bunlara göz atabilirsiniz.",
-  
+
   // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
   "admin.metadata-import.page.dropMsg": "İçe aktarmak için bir metadata CSV'si bırakın",
-  
+
   // "admin.metadata-import.page.dropMsgReplace": "Drop to replace the metadata CSV to import",
   "admin.metadata-import.page.dropMsgReplace": "İçe aktarılacak CSV metadatalarını değiştirmek için bırakın",
-  
+
   // "admin.metadata-import.page.button.return": "Return",
   "admin.metadata-import.page.button.return": "Geri Dön",
-  
+
   // "admin.metadata-import.page.button.proceed": "Proceed",
   "admin.metadata-import.page.button.proceed": "Devam Et",
-  
+
   // "admin.metadata-import.page.error.addFile": "Select file first!",
   "admin.metadata-import.page.error.addFile": "Önce dosyayı seçin!",
-  
-  
-  
-  
+
+
+
+
   // "auth.errors.invalid-user": "Invalid email address or password.",
   "auth.errors.invalid-user": "Geçersiz e-posta adresi veya parola.",
-  
+
   // "auth.messages.expired": "Your session has expired. Please log in again.",
   "auth.messages.expired": "Oturumunuz sona erdi. Lütfen tekrar giriş yapın.",
-  
-  
-  
+
+
+
   // "bitstream.edit.bitstream": "Bitstream: ",
   "bitstream.edit.bitstream": "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>\".",
   "bitstream.edit.form.description.hint": "İsteğe bağlı olarak, dosyanın kısa bir açıklamasını sağlayın, örneğin \"<i>Ana makale</i>\" veya \"<i>Deneme veri okumaları</i>\".",
-  
+
   // "bitstream.edit.form.description.label": "Description",
   "bitstream.edit.form.description.label": "Açıklama",
-  
+
   // "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": "Erişime izin verilen ilk gün. <b>Bu tarih bu formda değiştirilemez.</b> Bir bitstream için bir ambargo tarihi ayarlamak için <i>Öğe Durumu</i> sekmesine gidin, <i>Yetkiler...</i>'i tıklayın., bitstreamın <i>OKU</i> politikasını oluşturun veya düzenleyin ve <i>Başlangıç ​​Tarihi</i>'ni istediğiniz gibi ayarlayın.",
-  
+  "bitstream.edit.form.embargo.hint": "Erişime izin verilen ilk gün. <b>Bu tarih bu formda değiştirilemez.</b> Bir bitstream için bir ambargo tarihi ayarlamak için <i>Öğe Durumu</i> sekmesine gidin, <i>Yetkiler...</i>'i tıklayın., bitstreamın <i>OKU</i> politikasını oluşturun veya düzenleyin ve <i>Başlangıç Tarihi</i>'ni istediğiniz gibi ayarlayın.",
+
   // "bitstream.edit.form.embargo.label": "Embargo until specific date",
   "bitstream.edit.form.embargo.label": "Belirli bir tarihe kadar ambargo",
-  
+
   // "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": "Bitstreamın dosya adını değiştirin. Bunun görünen bitstream URL'sini değiştireceğini, ancak dizi kimliği değişmediği sürece eski bağlantıların çözüleceğini unutmayın.",
-  
+
   // "bitstream.edit.form.fileName.label": "Filename",
   "bitstream.edit.form.fileName.label": "Dosya adı",
-  
+
   // "bitstream.edit.form.newFormat.label": "Describe new format",
   "bitstream.edit.form.newFormat.label": "Yeni biçimi tanımla",
-  
+
   // "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": "Dosyayı oluşturmak için kullandığınız uygulama ve sürüm numarası (örneğin, \"<i>ACMESoft SuperApp versiyon 1.5</i>\").",
-  
+
   // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
   "bitstream.edit.form.primaryBitstream.label": "Birincil bitstream",
-  
+
   // "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": "Biçim yukarıdaki listede yoksa, <b>select \"listede olmayan biçim\"i above</b> ve \"Yeni biçimi tanımla\" altında açıklayın.",
-  
+
   // "bitstream.edit.form.selectedFormat.label": "Selected Format",
   "bitstream.edit.form.selectedFormat.label": "Seçilen Biçim",
-  
+
   // "bitstream.edit.form.selectedFormat.unknown": "Format not in list",
   "bitstream.edit.form.selectedFormat.unknown": "Listede olmayan biçim",
-  
+
   // "bitstream.edit.notifications.error.format.title": "An error occurred saving the bitstream's format",
   "bitstream.edit.notifications.error.format.title": "Bitstreamın biçimi kaydedilirken bir hata oluştu",
-  
+
   // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
   "bitstream.edit.notifications.saved.content": "Bu bitstreamda yaptığınız değişiklikler kaydedildi.",
-  
+
   // "bitstream.edit.notifications.saved.title": "Bitstream saved",
   "bitstream.edit.notifications.saved.title": "Bitstream kaydedildi",
-  
+
   // "bitstream.edit.title": "Edit bitstream",
   "bitstream.edit.title": "Bitstreamı düzenle",
-  
-  
-  
+
+
+
   // "browse.comcol.by.author": "By Author",
   "browse.comcol.by.author": "Yazara Göre",
-  
+
   // "browse.comcol.by.dateissued": "By Issue Date",
   "browse.comcol.by.dateissued": "Yayın Tarihine Göre",
-  
+
   // "browse.comcol.by.subject": "By Subject",
   "browse.comcol.by.subject": "Konuya Göre",
-  
+
   // "browse.comcol.by.title": "By Title",
   "browse.comcol.by.title": "Başlığa Göre",
-  
+
   // "browse.comcol.head": "Browse",
   "browse.comcol.head": "Gözat",
-  
+
   // "browse.empty": "No items to show.",
   "browse.empty": "Gösterilecek öğe yok.",
-  
+
   // "browse.metadata.author": "Author",
   "browse.metadata.author": "Yazar",
-  
+
   // "browse.metadata.dateissued": "Issue Date",
   "browse.metadata.dateissued": "Yayın Tarihi",
-  
+
   // "browse.metadata.subject": "Subject",
   "browse.metadata.subject": "Konu",
-  
+
   // "browse.metadata.title": "Title",
   "browse.metadata.title": "Başlık",
-  
+
   // "browse.metadata.author.breadcrumbs": "Browse by Author",
   "browse.metadata.author.breadcrumbs": "Yazara Göre Gözat",
-  
+
   // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
   "browse.metadata.dateissued.breadcrumbs": "Tarihe Göre Gözat",
-  
+
   // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
   "browse.metadata.subject.breadcrumbs": "Konuya Göre Gözat",
-  
+
   // "browse.metadata.title.breadcrumbs": "Browse by Title",
   "browse.metadata.title.breadcrumbs": "Başlığa göre göz atın",
-  
+
   // "browse.startsWith.choose_start": "(Choose start)",
   "browse.startsWith.choose_start": "(Başlangıç seç)",
-  
+
   // "browse.startsWith.choose_year": "(Choose year)",
   "browse.startsWith.choose_year": "(Yıl seç)",
-  
+
   // "browse.startsWith.jump": "Jump to a point in the index:",
   "browse.startsWith.jump": "Dizinde bir noktaya atla:",
-  
+
   // "browse.startsWith.months.april": "April",
   "browse.startsWith.months.april": "Nisan",
-  
+
   // "browse.startsWith.months.august": "August",
   "browse.startsWith.months.august": "Ağustos",
-  
+
   // "browse.startsWith.months.december": "December",
   "browse.startsWith.months.december": "Aralık",
-  
+
   // "browse.startsWith.months.february": "February",
   "browse.startsWith.months.february": "Şubat",
-  
+
   // "browse.startsWith.months.january": "January",
   "browse.startsWith.months.january": "Ocak",
-  
+
   // "browse.startsWith.months.july": "July",
   "browse.startsWith.months.july": "Temmuz",
-  
+
   // "browse.startsWith.months.june": "June",
   "browse.startsWith.months.june": "Haziran",
-  
+
   // "browse.startsWith.months.march": "March",
   "browse.startsWith.months.march": "Mart",
-  
+
   // "browse.startsWith.months.may": "May",
   "browse.startsWith.months.may": "Mayıs",
-  
+
   // "browse.startsWith.months.none": "(Choose month)",
   "browse.startsWith.months.none": "(Ay seçin)",
-  
+
   // "browse.startsWith.months.november": "November",
   "browse.startsWith.months.november": "Kasım",
-  
+
   // "browse.startsWith.months.october": "October",
   "browse.startsWith.months.october": "Ekim",
-  
+
   // "browse.startsWith.months.september": "September",
   "browse.startsWith.months.september": "Eylül",
-  
+
   // "browse.startsWith.submit": "Go",
   "browse.startsWith.submit": "Git",
-  
+
   // "browse.startsWith.type_date": "Or type in a date (year-month):",
   "browse.startsWith.type_date": "Veya bir tarih yazın (yıl-ay):",
-  
+
   // "browse.startsWith.type_text": "Or enter first few letters:",
   "browse.startsWith.type_text": "Veya ilk birkaç harfi girin:",
-  
+
   // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
   "browse.title": "{{ field }} {{ value }} ile {{ collection }}'a göz atma",
-  
-  
+
+
   // "chips.remove": "Remove chip",
   "chips.remove": "Çipi kaldır",
-  
-  
-  
+
+
+
   // "collection.create.head": "Create a Collection",
   "collection.create.head": "Koleksiyon Oluştur",
-  
+
   // "collection.create.notifications.success": "Successfully created the Collection",
   "collection.create.notifications.success": "Koleksiyon başarıyla oluşturuldu",
-  
+
   // "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
   "collection.create.sub-head": "Komünite için Koleksiyon Oluşturun {{ parent }}",
-  
+
   // "collection.curate.header": "Curate Collection: {{collection}}",
   "collection.curate.header": "Koleksiyonu Düzenle: {{collection}}",
-  
+
   // "collection.delete.cancel": "Cancel",
   "collection.delete.cancel": "İptal",
-  
+
   // "collection.delete.confirm": "Confirm",
   "collection.delete.confirm": "Onayla",
-  
+
   // "collection.delete.head": "Delete Collection",
   "collection.delete.head": "Koleksiyonu sil",
-  
+
   // "collection.delete.notification.fail": "Collection could not be deleted",
   "collection.delete.notification.fail": "Koleksiyon silinemedi",
-  
+
   // "collection.delete.notification.success": "Successfully deleted collection",
   "collection.delete.notification.success": "Koleksiyon başarıyla silindi",
-  
+
   // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
   "collection.delete.text": "\"{{ dso }}\" koleksiyonunu silmek istediğinizden emin misiniz?",
-  
-  
-  
+
+
+
   // "collection.edit.delete": "Delete this collection",
   "collection.edit.delete": "Bu koleksiyonu sil",
-  
+
   // "collection.edit.head": "Edit Collection",
   "collection.edit.head": "Koleksiyonu Düzenle",
-  
+
   // "collection.edit.breadcrumbs": "Edit Collection",
   "collection.edit.breadcrumbs": "Koleksiyonu Düzenle",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.mapper.head": "Item Mapper",
   "collection.edit.tabs.mapper.head": "Öğe eşleştirici",
-  
+
   // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
   "collection.edit.tabs.item-mapper.title": "Koleksiyon Düzenleme - Öğe Eşleştirici",
-  
+
   // "collection.edit.item-mapper.cancel": "Cancel",
   "collection.edit.item-mapper.cancel": "İptal",
-  
+
   // "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
   "collection.edit.item-mapper.collection": "Koleksiyon: \"<b>{{name}}</b>\"",
-  
+
   // "collection.edit.item-mapper.confirm": "Map selected items",
   "collection.edit.item-mapper.confirm": "Seçilen öğeleri eşle",
-  
+
   // "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": "Bu, koleksiyon yöneticilerinin diğer koleksiyonlardaki öğeleri bu koleksiyona eşlemelerine olanak tanıyan öğe eşleyici aracıdır. Diğer koleksiyonlardaki öğeleri arayabilir ve bunları eşleyebilir veya şu anda eşlenmiş öğelerin listesine göz atabilirsiniz.",
-  
+
   // "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
   "collection.edit.item-mapper.head": "Öğe Eşleştirici - Diğer Koleksiyonlardaki Öğeleri Eşle",
-  
+
   // "collection.edit.item-mapper.no-search": "Please enter a query to search",
   "collection.edit.item-mapper.no-search": "Lütfen aramak için bir sorgu girin",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.error.content": "{{amount}} öğenin eşlenmesinde hatalar oluştu.",
-  
+
   // "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
   "collection.edit.item-mapper.notifications.map.error.head": "Eşleme hataları",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
   "collection.edit.item-mapper.notifications.map.success.content": "{{amount}} öğe başarıyla eşlendi.",
-  
+
   // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
   "collection.edit.item-mapper.notifications.map.success.head": "Eşleme tamamlandı",
-  
+
   // "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}} öğenin eşlemeleri kaldırılırken hatalar oluştu.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
   "collection.edit.item-mapper.notifications.unmap.error.head": "Eşleme hatalarını kaldır",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
   "collection.edit.item-mapper.notifications.unmap.success.content": "{{amount}} öğenin eşlemeleri başarıyla kaldırıldı.",
-  
+
   // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
   "collection.edit.item-mapper.notifications.unmap.success.head": "Eşlemeyi kaldır tamamlandı",
-  
+
   // "collection.edit.item-mapper.remove": "Remove selected item mappings",
   "collection.edit.item-mapper.remove": "Seçili öğe eşlemelerini kaldır",
-  
+
   // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
   "collection.edit.item-mapper.tabs.browse": "Eşlenen öğelere göz atın",
-  
+
   // "collection.edit.item-mapper.tabs.map": "Map new items",
   "collection.edit.item-mapper.tabs.map": "Yeni öğeleri işle",
-  
-  
-  
+
+
+
   // "collection.edit.logo.label": "Collection logo",
   "collection.edit.logo.label": "Koleksiyon logosu",
 
   // "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
   "collection.edit.logo.notifications.add.error": "Koleksiyon logosu yüklemesi başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
-  
+
   // "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
   "collection.edit.logo.notifications.add.success": "Koleksiyon logosu yüklemesi başarılı.",
-  
+
   // "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
   "collection.edit.logo.notifications.delete.success.title": "Logo silindi",
-  
+
   // "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
   "collection.edit.logo.notifications.delete.success.content": "Koleksiyonun logosunu başarıyla silindi",
-  
+
   // "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "collection.edit.logo.notifications.delete.error.title": "Logo silinirken hata",
-  
+
   // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
   "collection.edit.logo.upload": "Yüklenecek bir koleksiyon logosu bırakın",
-  
-  
-  
+
+
+
   // "collection.edit.notifications.success": "Successfully edited the Collection",
   "collection.edit.notifications.success": "Koleksiyon başarıyla düzenlendi.",
-  
+
   // "collection.edit.return": "Return",
   "collection.edit.return": "Dönüş",
-  
-  
-  
+
+
+
   // "collection.edit.tabs.curate.head": "Curate",
   "collection.edit.tabs.curate.head": "Kuratör",
-  
+
   // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
   "collection.edit.tabs.curate.title": "Koleksiyon düzenleme - Küratör",
-  
+
   // "collection.edit.tabs.authorizations.head": "Authorizations",
   "collection.edit.tabs.authorizations.head": "Yetkilendirmeler",
-  
+
   // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
   "collection.edit.tabs.authorizations.title": "Koleksiyon düzenleme - Yetkilendirmeler",
-  
+
   // "collection.edit.tabs.metadata.head": "Edit Metadata",
   "collection.edit.tabs.metadata.head": "Metadataları Düzenle",
-  
+
   // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
   "collection.edit.tabs.metadata.title": "Koleksiyon Düzenle - Metadatalar",
-  
+
   // "collection.edit.tabs.roles.head": "Assign Roles",
   "collection.edit.tabs.roles.head": "Rol atamak",
-  
+
   // "collection.edit.tabs.roles.title": "Collection Edit - Roles",
   "collection.edit.tabs.roles.title": "Koleksiyon düzenleme - Roller",
-  
+
   // "collection.edit.tabs.source.external": "This collection harvests its content from an external source",
   "collection.edit.tabs.source.external": "Bu koleksiyon içeriğini harici bir kaynaktan toplar",
-  
+
   // "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": "Hedef koleksiyonuna bir set kimliği sağlamalısınız.",
-  
+
   // "collection.edit.tabs.source.form.harvestType": "Content being harvested",
   "collection.edit.tabs.source.form.harvestType": "İçerik harmanlanıyor",
-  
+
   // "collection.edit.tabs.source.form.head": "Configure an external source",
   "collection.edit.tabs.source.form.head": "Harici bir kaynak yapılandır",
-  
+
   // "collection.edit.tabs.source.form.metadataConfigId": "Metadata Format",
   "collection.edit.tabs.source.form.metadataConfigId": "Metadata formatı",
-  
+
   // "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
   "collection.edit.tabs.source.form.oaiSetId": "OAI'ya Özel Set Kimliği",
-  
+
   // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
   "collection.edit.tabs.source.form.oaiSource": "OAI Sağlayıcısı",
-  
+
   // "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": "Metadatalarını ve bitstreamı topla (ORE desteği gerektirir)",
-  
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Harvest metadata and references to bitstreams (ORE desteği gerektirir)",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Metadatalarını ve referansları topla (ORE desteği gerektirir)",
-  
+
   // "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Harvest metadata only",
   "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Sadece metadatalarını topla",
-  
+
   // "collection.edit.tabs.source.head": "Content Source",
   "collection.edit.tabs.source.head": "İçerik Kaynağı",
-  
+
   // "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": "Değişiklikleriniz silindi. Değişikliklerinizi eski haline getirmek için 'Geri Al' düğmesine tıklayın.",
-  
+
   // "collection.edit.tabs.source.notifications.discarded.title": "Changed discarded",
   "collection.edit.tabs.source.notifications.discarded.title": "Silinenler değiştirildi.",
-  
+
   // "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": "Değişiklikleriniz kaydedilmedi. Lütfen kaydetmeden önce tüm alanların geçerli olduğundan emin olun.",
-  
+
   // "collection.edit.tabs.source.notifications.invalid.title": "Metadata invalid",
   "collection.edit.tabs.source.notifications.invalid.title": "Metadata geçersiz",
-  
+
   // "collection.edit.tabs.source.notifications.saved.content": "Your changes to this collection's content source were saved.",
   "collection.edit.tabs.source.notifications.saved.content": "Bu koleksiyonun içerik kaynağındaki değişiklikleriniz kaydedildi.",
-  
+
   // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
   "collection.edit.tabs.source.notifications.saved.title": "İçerik Kaynağı kaydedildi",
-  
+
   // "collection.edit.tabs.source.title": "Collection Edit - Content Source",
   "collection.edit.tabs.source.title": "Koleksiyon düzenleme - İçerik Kaynağı",
-  
-  
-  
+
+
+
   // "collection.edit.template.add-button": "Add",
   "collection.edit.template.add-button": "Ekle",
-  
+
   // "collection.edit.template.breadcrumbs": "Item template",
   "collection.edit.template.breadcrumbs": "Öğe şablonu",
-  
+
   // "collection.edit.template.cancel": "Cancel",
   "collection.edit.template.cancel": "İptal",
-  
+
   // "collection.edit.template.delete-button": "Delete",
   "collection.edit.template.delete-button": "Sil",
-  
+
   // "collection.edit.template.edit-button": "Edit",
   "collection.edit.template.edit-button": "Düzenle",
-  
+
   // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
   "collection.edit.template.head": "Koleksiyon için Sablon Öğesini Düzenleyin \"{{ collection }}\"",
-  
+
   // "collection.edit.template.label": "Template item",
   "collection.edit.template.label": "Şablon öğe",
-  
+
   // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
   "collection.edit.template.notifications.delete.error": "Öğe şablonu silme başarısız",
-  
+
   // "collection.edit.template.notifications.delete.success": "Successfully deleted the item template",
   "collection.edit.template.notifications.delete.success": "Öğe şablonu başarıyla silindi",
-  
+
   // "collection.edit.template.title": "Edit Template Item",
   "collection.edit.template.title": "Şablon Öğesini Düzenle",
-  
-  
-  
+
+
+
   // "collection.form.abstract": "Short Description",
   "collection.form.abstract": "Kısa Açıklama",
-  
+
   // "collection.form.description": "Introductory text (HTML)",
   "collection.form.description": "Tanıtım metni (HTML)",
-  
+
   // "collection.form.errors.title.required": "Please enter a collection name",
   "collection.form.errors.title.required": "Lütfen bir koleksiyon adı girin",
-  
+
   // "collection.form.license": "License",
   "collection.form.license": "Lisans",
-  
+
   // "collection.form.provenance": "Provenance",
   "collection.form.provenance": "Menşei",
-  
+
   // "collection.form.rights": "Copyright text (HTML)",
   "collection.form.rights": "Telif hakkı metni (HTML)",
-  
+
   // "collection.form.tableofcontents": "News (HTML)",
   "collection.form.tableofcontents": "Haberler (HTML)",
-  
+
   // "collection.form.title": "Name",
   "collection.form.title": "İsim",
-  
-  
-  
+
+
+
   // "collection.listelement.badge": "Collection",
   "collection.listelement.badge": "Koleksiyon",
-  
-  
-  
+
+
+
   // "collection.page.browse.recent.head": "Recent Submissions",
   "collection.page.browse.recent.head": "Son Başvurular",
-  
+
   // "collection.page.browse.recent.empty": "No items to show",
   "collection.page.browse.recent.empty": "Gösterilecek öğe yok",
-  
+
   // "collection.page.edit": "Edit this collection",
   "collection.page.edit": "Bu koleksiyonu düzenleyin",
-  
+
   // "collection.page.handle": "Permanent URI for this collection",
   "collection.page.handle": "Bu koleksiyon için kalıcı URI",
-  
+
   // "collection.page.license": "License",
   "collection.page.license": "Lisans",
-  
+
   // "collection.page.news": "News",
   "collection.page.news": "Haberler",
-  
-  
-  
+
+
+
   // "collection.select.confirm": "Confirm selected",
   "collection.select.confirm": "Seçilileri onayla",
-  
+
   // "collection.select.empty": "No collections to show",
   "collection.select.empty": "Gösterilecek koleksiyon yok",
-  
+
   // "collection.select.table.title": "Title",
   "collection.select.table.title": "Başlık",
-  
-  
-  
+
+
+
   // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
   "collection.source.update.notifications.error.content": "Sağlanan ayarlar test edildi ve işe yaramadı.",
-  
+
   // "collection.source.update.notifications.error.title": "Server Error",
   "collection.source.update.notifications.error.title": "Sunucu Hatası",
-  
-  
-  
+
+
+
   // "communityList.tabTitle": "DSpace - Community List",
   "communityList.tabTitle": "DSpace - Komünite Listesi",
-  
+
   // "communityList.title": "List of Communities",
   "communityList.title": "Komünitelerin Listesi",
-  
+
   // "communityList.showMore": "Show More",
   "communityList.showMore": "Daha fazla göster",
-  
-  
-  
+
+
+
   // "community.create.head": "Create a Community",
   "community.create.head": "Bir komünite oluştur",
-  
+
   // "community.create.notifications.success": "Successfully created the Community",
   "community.create.notifications.success": "Komünite başarıyla yaratıldı",
-  
+
   // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
   "community.create.sub-head": "Komünite için bir alt komünite oluşturun {{ parent }}",
-  
+
   // "community.curate.header": "Curate Community: {{community}}",
   "community.curate.header": "Kuratör komünitesi: {{community}}",
-  
+
   // "community.delete.cancel": "Cancel",
   "community.delete.cancel": "İptal",
-  
+
   // "community.delete.confirm": "Confirm",
   "community.delete.confirm": "Onayla",
-  
+
   // "community.delete.head": "Delete Community",
   "community.delete.head": "Komüniteyi sil",
-  
+
   // "community.delete.notification.fail": "Community could not be deleted",
   "community.delete.notification.fail": "Komünite silinemedi",
-  
+
   // "community.delete.notification.success": "Successfully deleted community",
   "community.delete.notification.success": "Komünite başarıyla silindi",
-  
+
   // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
   "community.delete.text": "Komüniteyi silmek istediğinize emin misiniz \"{{ dso }}\"",
-  
+
   // "community.edit.delete": "Delete this community",
   "community.edit.delete": "Bu komüniteyi sil",
-  
+
   // "community.edit.head": "Edit Community",
   "community.edit.head": "Komüniteyi düzenle",
-  
+
   // "community.edit.breadcrumbs": "Edit Community",
   "community.edit.breadcrumbs": "Komüniteyi düzenle",
-  
-  
+
+
   // "community.edit.logo.label": "Community logo",
   "community.edit.logo.label": "Komünite logosu",
-  
+
   // "community.edit.logo.notifications.add.error": "Uploading Community logo failed. Please verify the content before retrying.",
   "community.edit.logo.notifications.add.error": "Komünite logosu yüklemesi başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
-  
+
   // "community.edit.logo.notifications.add.success": "Upload Community logo successful.",
   "community.edit.logo.notifications.add.success": "Komünite logosunu başarılı yükle.",
-  
+
   // "community.edit.logo.notifications.delete.success.title": "Logo deleted",
   "community.edit.logo.notifications.delete.success.title": "Logo silindi",
-  
+
   // "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
   "community.edit.logo.notifications.delete.success.content": "Komünite logosu başarıyla silindi",
-  
+
   // "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
   "community.edit.logo.notifications.delete.error.title": "Logo silme hatası",
-  
+
   // "community.edit.logo.upload": "Drop a Community Logo to upload",
   "community.edit.logo.upload": "Yüklenecek bir komünite logosu bırak",
-  
-  
-  
+
+
+
   // "community.edit.notifications.success": "Successfully edited the Community",
   "community.edit.notifications.success": "Komünite başarıyla düzenlendi",
-  
+
   // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
   "community.edit.notifications.unauthorized": "Bu değişikliği yapmak için ayrıcalıklarınız yok",
-  
+
   // "community.edit.notifications.error": "An error occured while editing the Community",
   "community.edit.notifications.error": "Komüniteyi düzenlerken bir hata oluştu",
-  
+
   // "community.edit.return": "Return",
   "community.edit.return": "Dönüş",
-  
-  
-  
+
+
+
   // "community.edit.tabs.curate.head": "Curate",
   "community.edit.tabs.curate.head": "Kuratör",
-  
+
   // "community.edit.tabs.curate.title": "Community Edit - Curate",
   "community.edit.tabs.curate.title": "Komünite Düzenle - Küratör",
-  
+
   // "community.edit.tabs.metadata.head": "Edit Metadata",
   "community.edit.tabs.metadata.head": "Metadataları Düzenle",
-  
+
   // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
   "community.edit.tabs.metadata.title": "Komünite Düzenle - Metadatalar",
-  
+
   // "community.edit.tabs.roles.head": "Assign Roles",
   "community.edit.tabs.roles.head": "Rol atamak",
-  
+
   // "community.edit.tabs.roles.title": "Community Edit - Roles",
   "community.edit.tabs.roles.title": "Komünite Düzenle - Roller",
-  
+
   // "community.edit.tabs.authorizations.head": "Authorizations",
   "community.edit.tabs.authorizations.head": "Yetkilendirmeler",
-  
+
   // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
   "community.edit.tabs.authorizations.title": "Komünite Düzenle - Yetkilendirmeler",
-  
-  
-  
+
+
+
   // "community.listelement.badge": "Community",
   "community.listelement.badge": "Komünite",
-  
-  
-  
+
+
+
   // "comcol-role.edit.no-group": "None",
   "comcol-role.edit.no-group": "Hiçbiri",
-  
+
   // "comcol-role.edit.create": "Create",
   "comcol-role.edit.create": "Oluştur",
-  
+
   // "comcol-role.edit.restrict": "Restrict",
   "comcol-role.edit.restrict": "Kısıtla",
-  
+
   // "comcol-role.edit.delete": "Delete",
   "comcol-role.edit.delete": "Sil",
-  
-  
+
+
   // "comcol-role.edit.community-admin.name": "Yöneticiler",
   "comcol-role.edit.community-admin.name": "Administrators",
-  
+
   // "comcol-role.edit.collection-admin.name": "Administrators",
   "comcol-role.edit.collection-admin.name": "Yöneticiler",
-  
-  
+
+
   // "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": "Komünite yöneticileri alt komüniteler veya koleksiyonlar oluşturabilir ve bu alt komüniteler veya koleksiyonlar için yönetimi yönetebilir veya atayabilir. Ek olarak, kimsenin herhangi bir alt koleksiyona kimin gönderebileceğine, madde metadatalarını (sunulduktan sonra) düzenleyebileceğine karar verirler ve mevcut eşyaları diğer koleksiyonlardan (yetkilendirmeye tabi) ekleyin.",
-  
+
   // "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": "Koleksiyon yöneticileri, eşyaları koleksiyona kimin gönderebileceğine, öğe metadatalarını (gönderimden sonra) düzenleyebileceğine karar verir ve mevcut eşyaları diğer koleksiyonlardan (bu koleksiyon için yetkilendirmeye tabi) ekleyin.",
-  
-  
+
+
   // "comcol-role.edit.submitters.name": "Submitters",
   "comcol-role.edit.submitters.name": "Göndericiler",
-  
+
   // "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": "Bu koleksiyona yeni eşya gönderme iznine sahip olan E-insanlar ve gruplar.",
-  
-  
+
+
   // "comcol-role.edit.item_read.name": "Default item read access",
   "comcol-role.edit.item_read.name": "Varsayılan öğe okuma erişimi",
-  
+
   // "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": "Bu koleksiyona sunulan yeni eşyaları okuyabilen E-insanlar ve gruplar. Bu roldeki değişiklikler geriye dönük değildir. Sistemdeki mevcut eşyalar, eklemeleri sırasında erişimi okuyanlar tarafından görülebilir.",
-  
+
   // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
   "comcol-role.edit.item_read.anonymous-group": "Gelen öğeler için varsayılan okuma şu anda isimsiz olarak ayarlanmıştır.",
-  
-  
+
+
   // "comcol-role.edit.bitstream_read.name": "Default bitstream read access",
   "comcol-role.edit.bitstream_read.name": "Varsayılan bitstream okuma erişimi",
-  
+
   // "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": "Komünite yöneticileri alt komüniteler veya koleksiyonlar oluşturabilir ve bu alt komüniteler veya koleksiyonlar için yönetimi yönetebilir veya atayabilirler. Ek olarak, eşyaları herhangi bir alt koleksiyona kimin gönderebileceğine, öğe metadatalarını (sunulduktan sonra) düzenleyebilir ve harita) Diğer koleksiyonlardan gelen mevcut eşyalar (yetkilendirmeye tabi).",
-  
+
   // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
   "comcol-role.edit.bitstream_read.anonymous-group": "Gelen bitstream için varsayılan okuma şu anda anonim olarak ayarlanmıştır.",
-  
-  
+
+
   // "comcol-role.edit.editor.name": "Editors",
   "comcol-role.edit.editor.name": "Editörler",
-  
+
   // "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": "Editörler, gelen gönderilerin metadatalarını düzenleyebilir ve ardından onları kabul edebilir veya reddedebilir.",
-  
-  
+
+
   // "comcol-role.edit.finaleditor.name": "Final editors",
   "comcol-role.edit.finaleditor.name": "Son editörler",
-  
+
   // "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": "Nihai editörler gelen başvuruların metadatalarını düzenleyebilir, ancak onları reddedebilir.",
-  
-  
+
+
   // "comcol-role.edit.reviewer.name": "Reviewers",
   "comcol-role.edit.reviewer.name": "Yorumcular",
-  
+
   // "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": "Yorumcular gelen başvuruları kabul edebilir veya reddedebilirler. Ancak, gönderimin metadatalarını düzenleyemezler.",
-  
-  
-  
+
+
+
   // "community.form.abstract": "Short Description",
   "community.form.abstract": "Kısa Açıklama",
-  
+
   // "community.form.description": "Introductory text (HTML)",
   "community.form.description": "Tanıtım metni (HTML)",
-  
+
   // "community.form.errors.title.required": "Please enter a community name",
   "community.form.errors.title.required": "Lütfen bir komünite adı girin",
-  
+
   // "community.form.rights": "Copyright text (HTML)",
   "community.form.rights": "Telif Hakkı Metni (HTML)",
-  
+
   // "community.form.tableofcontents": "News (HTML)",
   "community.form.tableofcontents": "Haberler (HTML)",
-  
+
   // "community.form.title": "Name",
   "community.form.title": "İsim",
-  
+
   // "community.page.edit": "Edit this community",
   "community.page.edit": "Bu komüniteyi düzenle",
-  
+
   // "community.page.handle": "Permanent URI for this community",
   "community.page.handle": "Bu komünite için Kalıcı Uri",
-  
+
   // "community.page.license": "License",
   "community.page.license": "Lisans",
-  
+
   // "community.page.news": "News",
   "community.page.news": "Haberler",
-  
+
   // "community.all-lists.head": "Subcommunities and Collections",
   "community.all-lists.head": "Alt komüniteler ve koleksiyonlar",
-  
+
   // "community.sub-collection-list.head": "Collections of this Community",
   "community.sub-collection-list.head": "Bu komünitenin koleksiyonları",
-  
+
   // "community.sub-community-list.head": "Communities of this Community",
   "community.sub-community-list.head": "Bu komünitenin koleksiyonları",
-  
-  
-  
+
+
+
   // "cookies.consent.accept-all": "Accept all",
   "cookies.consent.accept-all": "Hepsini kabul et",
-  
+
   // "cookies.consent.accept-selected": "Accept selected",
   "cookies.consent.accept-selected": "Seçiliyi kabul et",
-  
+
   // "cookies.consent.app.opt-out.description": "This app is loaded by default (but you can opt out)",
   "cookies.consent.app.opt-out.description": "Bu uygulama varsayılan olarak yüklenir (ancak vazgeçebilirsiniz)",
-  
+
   // "cookies.consent.app.opt-out.title": "(opt-out)",
   "cookies.consent.app.opt-out.title": "(vazgeç)",
-  
+
   // "cookies.consent.app.purpose": "purpose",
   "cookies.consent.app.purpose": "amaç",
-  
+
   // "cookies.consent.app.required.description": "This application is always required",
   "cookies.consent.app.required.description": "Bu uygulama her zaman gereklidir",
-  
+
   // "cookies.consent.app.required.title": "(always required)",
   "cookies.consent.app.required.title": "(her zaman gerekli)",
-  
+
   // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
   "cookies.consent.update": "Son ziyaretinizden bu yana değişiklikler vardı, lütfen onayınızı güncelleyin.",
-  
+
   // "cookies.consent.close": "Close",
   "cookies.consent.close": "Kapat",
-  
+
   // "cookies.consent.decline": "Decline",
   "cookies.consent.decline": "Reddet",
-  
+
   // "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": "Kişisel bilgilerinizi aşağıdaki amaçlarla topluyor ve işleriz: <strong>Kimlik Doğrulama, Tercihler, Onay ve İstatistikler</strong>. <br/> Daha fazla bilgi için, lütfen okuyun {privacyPolicy}.",
-  
+
   // "cookies.consent.content-notice.learnMore": "Customize",
   "cookies.consent.content-notice.learnMore": "Özelleştir",
-  
+
   // "cookies.consent.content-modal.description": "Here you can see and customize the information that we collect about you.",
   "cookies.consent.content-modal.description": "Burada, sizin hakkınızda topladığımız bilgileri görebilir ve özelleştirebilirsiniz.",
-  
+
   // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
   "cookies.consent.content-modal.privacy-policy.name": "Gizlilik Politikası",
-  
+
   // "cookies.consent.content-modal.privacy-policy.text": "To learn more, please read our {privacyPolicy}.",
   "cookies.consent.content-modal.privacy-policy.text": "Daha fazla bilgi için, lütfen okuyun {privacyPolicy}.",
-  
+
   // "cookies.consent.content-modal.title": "Information that we collect",
   "cookies.consent.content-modal.title": "Topladığımız bilgiler",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.authentication": "Authentication",
   "cookies.consent.app.title.authentication": "Kimlik doğrulama",
-  
+
   // "cookies.consent.app.description.authentication": "Required for signing you in",
   "cookies.consent.app.description.authentication": "Kayıt olmak için gerekli",
-  
-  
+
+
   // "cookies.consent.app.title.preferences": "Preferences",
   "cookies.consent.app.title.preferences": "Tercihler",
-  
+
   // "cookies.consent.app.description.preferences": "Required for saving your preferences",
   "cookies.consent.app.description.preferences": "Tercihlerinizi kaydetmek için gerekli",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
   "cookies.consent.app.title.acknowledgement": "Onaylama",
-  
+
   // "cookies.consent.app.description.acknowledgement": "Required for saving your acknowledgements and consents",
   "cookies.consent.app.description.acknowledgement": "Teşekkürlerinizi ve onayları kurtarmak için gerekli",
-  
-  
-  
+
+
+
   // "cookies.consent.app.title.google-analytics": "Google Analytics",
   "cookies.consent.app.title.google-analytics": "Google Analitiği",
-  
+
   // "cookies.consent.app.description.google-analytics": "Allows us to track statistical data",
   "cookies.consent.app.description.google-analytics": "İstatistiksel verileri izlememize izin verir",
-  
-  
-  
+
+
+
   // "cookies.consent.purpose.functional": "Functional",
   "cookies.consent.purpose.functional": "Fonksiyonel",
-  
+
   // "cookies.consent.purpose.statistical": "Statistical",
   "cookies.consent.purpose.statistical": "İstatistiksel",
-  
-  
+
+
   // "curation-task.task.checklinks.label":  "Check Links in Metadata",
-  "curation-task.task.checklinks.label":  "Metadatalardaki Bağlantıları Kontrol Et",
-  
+  "curation-task.task.checklinks.label": "Metadatalardaki Bağlantıları Kontrol Et",
+
   // "curation-task.task.noop.label": "NOOP",
   "curation-task.task.noop.label": "NOOP",
-  
+
   // "curation-task.task.profileformats.label": "Profile Bitstream Formats",
   "curation-task.task.profileformats.label": "Profil Bitstream Formatları",
-  
+
   // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
   "curation-task.task.requiredmetadata.label": "Gerekli metadataları kontrol edin",
-  
+
   // "curation-task.task.translate.label": "Microsoft Translator",
   "curation-task.task.translate.label": "Microsoft Tercüman",
-  
+
   // "curation-task.task.vscan.label": "Virus Scan",
   "curation-task.task.vscan.label": "Virüs Taraması",
-  
-  
-  
+
+
+
   // "curation.form.task-select.label": "Task:",
   "curation.form.task-select.label": "Görev:",
-  
+
   // "curation.form.submit": "Start",
   "curation.form.submit": "Başlangıç",
-  
+
   // "curation.form.submit.success.head": "The curation task has been started successfully",
   "curation.form.submit.success.head": "Küratör görevi başarıyla başlatıldı",
-  
+
   // "curation.form.submit.success.content": "You will be redirected to the corresponding process page.",
   "curation.form.submit.success.content": "İlgili işlem sayfasına yönlendirileceksiniz.",
-  
+
   // "curation.form.submit.error.head": "Running the curation task failed",
   "curation.form.submit.error.head": "Küratörlük görevi başarısız oldu",
-  
+
   // "curation.form.submit.error.content": "An error occured when trying to start the curation task.",
   "curation.form.submit.error.content": "Küratörlük görevi başlatmaya çalışırken bir hata oluştu.",
-  
+
   // "curation.form.handle.label": "Handle:",
   "curation.form.handle.label": "Ele al:",
-  
+
   // "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": "İpucu: Gir [your-handle-prefix]/0 tüm sitede bir görevi çalıştırmak için (tüm görevler bu özelliği destekleyemez)",
-  
-  
-  
+
+
+
   // "dso-selector.create.collection.head": "New collection",
   "dso-selector.create.collection.head": "Yeni koleksiyon",
-  
+
   // "dso-selector.create.collection.sub-level": "Create a new collection in",
   "dso-selector.create.collection.sub-level": "Yeni bir koleksiyon oluşturun",
-  
+
   // "dso-selector.create.community.head": "New community",
   "dso-selector.create.community.head": "Yeni komünite",
-  
+
   // "dso-selector.create.community.sub-level": "Create a new community in",
   "dso-selector.create.community.sub-level": "Yeni bir komünite oluştur",
-  
+
   // "dso-selector.create.community.top-level": "Create a new top-level community",
   "dso-selector.create.community.top-level": "Yeni bir üst düzey komünite oluştur",
-  
+
   // "dso-selector.create.item.head": "New item",
   "dso-selector.create.item.head": "Yeni öğe",
-  
+
   // "dso-selector.create.item.sub-level": "Create a new item in",
   "dso-selector.create.item.sub-level": "İçinde yeni bir öğe oluşturun",
-  
+
   // "dso-selector.create.submission.head": "New submission",
   "dso-selector.create.submission.head": "Yeni başvuru",
-  
+
   // "dso-selector.edit.collection.head": "Edit collection",
   "dso-selector.edit.collection.head": "Koleksiyonu Düzenle",
-  
+
   // "dso-selector.edit.community.head": "Edit community",
   "dso-selector.edit.community.head": "Topluluğu Düzenle",
-  
+
   // "dso-selector.edit.item.head": "Edit item",
   "dso-selector.edit.item.head": "Ögeyi düzenle",
-  
+
   // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
   "dso-selector.export-metadata.dspaceobject.head": "Metadatalarını dışa aktar",
-  
+
   // "dso-selector.no-results": "No {{ type }} found ",
   "dso-selector.no-results": "Bulunamadı {{ type }} ",
-  
+
   // "dso-selector.placeholder": "Search for a {{ type }}",
   "dso-selector.placeholder": " Ara {{ type }}",
-  
-  
-  
+
+
+
   // "confirmation-modal.export-metadata.header": "Export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.header": "Metadatalarını dışa aktar {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.info": "Are you sure you want to export metadata for {{ dsoName }}",
   "confirmation-modal.export-metadata.info": "Metadataları dışarı aktarmak istediğinizden emin misiniz {{ dsoName }}",
-  
+
   // "confirmation-modal.export-metadata.cancel": "Cancel",
   "confirmation-modal.export-metadata.cancel": "İptal",
-  
+
   // "confirmation-modal.export-metadata.confirm": "Export",
   "confirmation-modal.export-metadata.confirm": "Dışarı aktar",
-  
+
   // "confirmation-modal.delete-eperson.header": "Delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.header": "EPerson'ı sil \"{{ dsoName }}\"",
-  
+
   // "confirmation-modal.delete-eperson.info": "Are you sure you want to delete EPerson \"{{ dsoName }}\"",
   "confirmation-modal.delete-eperson.info": "Eperson'u silmek istediğinize emin misiniz? \"{{ dsoName }}\"",
-  
+
   // "confirmation-modal.delete-eperson.cancel": "Cancel",
   "confirmation-modal.delete-eperson.cancel": "İptal",
-  
+
   // "confirmation-modal.delete-eperson.confirm": "Delete",
   "confirmation-modal.delete-eperson.confirm": "Sil",
-  
-  
+
+
   // "error.bitstream": "Error fetching bitstream",
   "error.bitstream": "Alınan bitstream hatası",
-  
+
   // "error.browse-by": "Error fetching items",
   "error.browse-by": "Alınan öğeler hatası",
-  
+
   // "error.collection": "Error fetching collection",
   "error.collection": "Alınan koleksiyon hatası",
-  
+
   // "error.collections": "Error fetching collections",
   "error.collections": "Alınan koleksiyonlar hatası",
-  
+
   // "error.community": "Error fetching community",
   "error.community": "Alınan komünite hatası",
-  
+
   // "error.identifier": "No item found for the identifier",
   "error.identifier": "Tanımlayıcı için ürün bulunamadı",
-  
+
   // "error.default": "Error",
   "error.default": "Hata",
-  
+
   // "error.item": "Error fetching item",
   "error.item": "Alınan öğe hatası",
-  
+
   // "error.items": "Error fetching items",
   "error.items": "Alınan öğeler hatası",
-  
+
   // "error.objects": "Error fetching objects",
   "error.objects": "Alınan nesneler hatası",
-  
+
   // "error.recent-submissions": "Error fetching recent submissions",
   "error.recent-submissions": "Son başvuruları alma hatası",
-  
+
   // "error.search-results": "Error fetching search results",
   "error.search-results": "Arama sonuçlarını alma hatası",
-  
+
   // "error.sub-collections": "Error fetching sub-collections",
   "error.sub-collections": "Alt koleksiyonları alma hatası",
-  
+
   // "error.sub-communities": "Error fetching sub-communities",
   "error.sub-communities": "Alt komüniteleri alma hatası",
-  
+
   // "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": "Bölüm başlatma sırasında bir hata oluştu, lütfen giriş formu yapılandırmanızı kontrol edin. Detaylar aşağıdadır : <br> <br>",
-  
+
   // "error.top-level-communities": "Error fetching top-level communities",
   "error.top-level-communities": "Üst düzey komüniteleri alma hatası",
-  
+
   // "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": "Gönderinizi tamamlamak için bu lisansı vermelisiniz. Bu lisansı şu anda veremiyorsanız, çalışmanızı kaydedebilir ve daha sonra geri gönderebilir veya gönderimi kaldırabilirsiniz.",
-  
+
   // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
   "error.validation.pattern": "Bu giriş mevcut modelle sınırlandırılmıştır.: {{ pattern }}.",
-  
+
   // "error.validation.filerequired": "The file upload is mandatory",
   "error.validation.filerequired": "Dosya yükleme zorunludur",
-  
-  
-  
+
+
+
   // "file-section.error.header": "Error obtaining files for this item",
   "file-section.error.header": "Bu öğe için dosyaları elde etme hatası",
-  
-  
-  
+
+
+
   // "footer.copyright": "copyright © 2002-{{ year }}",
   "footer.copyright": "telif hakkı © 2002-{{ year }}",
-  
+
   // "footer.link.dspace": "DSpace software",
   "footer.link.dspace": "DSpace yazılım",
-  
+
   // "footer.link.lyrasis": "LYRASIS",
   "footer.link.lyrasis": "LYRASIS",
-  
+
   // "footer.link.cookies": "Cookie settings",
   "footer.link.cookies": "Çerez Ayarları",
-  
+
   // "footer.link.privacy-policy": "Privacy policy",
   "footer.link.privacy-policy": "Gizlilik Politikası",
-  
+
   // "footer.link.end-user-agreement":"End User Agreement",
-  "footer.link.end-user-agreement":"Son Kullanıcı Sözleşmesi",
-  
-  
-  
+  "footer.link.end-user-agreement": "Son Kullanıcı Sözleşmesi",
+
+
+
   // "forgot-email.form.header": "Forgot Password",
   "forgot-email.form.header": "Parolanızı mı unuttunuz",
-  
+
   // "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": "E-posta güncellemeleri için koleksiyonlara abone olmak için bir hesap kaydedin ve DSPace'e yeni öğeler gönderin.",
-  
+
   // "forgot-email.form.email": "Email Address *",
   "forgot-email.form.email": "Eposta Adresi *",
-  
+
   // "forgot-email.form.email.error.required": "Please fill in an email address",
   "forgot-email.form.email.error.required": "Lütfen bir e-posta adresi giriniz",
-  
+
   // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
   "forgot-email.form.email.error.pattern": "Lütfen bir e-posta adresi giriniz",
-  
+
   // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
   "forgot-email.form.email.hint": "Bu adres, giriş adınız olarak doğrulanacak ve kullanılacaktır.",
-  
+
   // "forgot-email.form.submit": "Submit",
   "forgot-email.form.submit": "Kaydet",
-  
+
   // "forgot-email.form.success.head": "Verification email sent",
   "forgot-email.form.success.head": "Doğrulama e-postası gönderildi",
-  
+
   // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
   "forgot-email.form.success.content": "Özel bir URL ve daha fazla talimat içeren bir e posta bu {{ email }} mail adresin gönderildi. ",
-  
+
   // "forgot-email.form.error.head": "Error when trying to register email",
   "forgot-email.form.error.head": "E-postayı kaydetmeye çalışırken hata oluştu",
-  
+
   // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
   "forgot-email.form.error.content": "E-posta adresini kaydederken bir hata oluştu: {{ email }}",
-  
-  
-  
+
+
+
   // "forgot-password.title": "Forgot Password",
   "forgot-password.title": "Parolanızı mı unuttunuz",
-  
+
   // "forgot-password.form.head": "Forgot Password",
   "forgot-password.form.head": "Parolanızı mı unuttunuz",
-  
+
   // "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": "Aşağıdaki kutuya yeni bir parola girin ve tekrar ikinci kutuya yazarak onaylayın. En az altı karakter uzunluğunda olmalıdır.",
-  
+
   // "forgot-password.form.card.security": "Security",
   "forgot-password.form.card.security": "Güvenlik",
-  
+
   // "forgot-password.form.identification.header": "Identify",
   "forgot-password.form.identification.header": "Kimlik",
-  
+
   // "forgot-password.form.identification.email": "Email address: ",
   "forgot-password.form.identification.email": "E-posta adresi: ",
-  
+
   // "forgot-password.form.label.password": "Password",
   "forgot-password.form.label.password": "Parola",
-  
+
   // "forgot-password.form.label.passwordrepeat": "Retype to confirm",
   "forgot-password.form.label.passwordrepeat": "Doğrulamak için yeniden yazınız",
-  
+
   // "forgot-password.form.error.empty-password": "Please enter a password in the box below.",
   "forgot-password.form.error.empty-password": "Lütfen aşağıdaki kutuya bir parola girin.",
-  
+
   // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
   "forgot-password.form.error.matching-passwords": "Parolalar eşleşmiyor.",
-  
+
   // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
   "forgot-password.form.error.password-length": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
+
   // "forgot-password.form.notification.error.title": "Error when trying to submit new password",
   "forgot-password.form.notification.error.title": "Yeni parola göndermeye çalışırken hata oluştu",
-  
+
   // "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": "Parola sıfırlama başarılı oldu. Oluşturulan kullanıcı olarak giriş yaptınız.",
-  
+
   // "forgot-password.form.notification.success.title": "Password reset completed",
   "forgot-password.form.notification.success.title": "Parola sıfırlama tamamlandı",
-  
+
   // "forgot-password.form.submit": "Submit password",
   "forgot-password.form.submit": "Parolayı kaydet",
-  
-  
-  
+
+
+
   // "form.add": "Add",
   "form.add": "Ekle",
-  
+
   // "form.add-help": "Click here to add the current entry and to add another one",
   "form.add-help": "Geçerli girişi eklemek ve bir tane daha eklemek için buraya tıklayın.",
-  
+
   // "form.cancel": "Cancel",
   "form.cancel": "İptal",
-  
+
   // "form.clear": "Clear",
   "form.clear": "Temizle",
-  
+
   // "form.clear-help": "Click here to remove the selected value",
   "form.clear-help": "Seçilen değeri kaldırmak için buraya tıklayın",
-  
+
   // "form.edit": "Edit",
   "form.edit": "Düzenle",
-  
+
   // "form.edit-help": "Click here to edit the selected value",
   "form.edit-help": "Seçilen değeri düzenlemek için buraya tıklayın",
-  
+
   // "form.first-name": "First name",
   "form.first-name": "İlk adı",
-  
+
   // "form.group-collapse": "Collapse",
   "form.group-collapse": "Yığmak",
-  
+
   // "form.group-collapse-help": "Click here to collapse",
   "form.group-collapse-help": "Yığmak için buraya tıklayın",
-  
+
   // "form.group-expand": "Expand",
   "form.group-expand": "Uzat",
-  
+
   // "form.group-expand-help": "Click here to expand and add more elements",
   "form.group-expand-help": "Genişletmek ve daha fazla öğe eklemek için buraya tıklayın",
-  
+
   // "form.last-name": "Last name",
   "form.last-name": "Soyadı",
-  
+
   // "form.loading": "Loading...",
   "form.loading": "Yükleniyor...",
-  
+
   // "form.lookup": "Lookup",
   "form.lookup": "Yukarı Bak",
-  
+
   // "form.lookup-help": "Click here to look up an existing relation",
   "form.lookup-help": "Mevcut bir bağlantı aramak için buraya tıklayın",
-  
+
   // "form.no-results": "No results found",
   "form.no-results": "Sonuç bulunamadı",
-  
+
   // "form.no-value": "No value entered",
   "form.no-value": "Değer girilmez",
-  
-  // "form.other-information": {},
-  "form.other-information": {},
-  
+
   // "form.remove": "Remove",
   "form.remove": "Kaldır",
-  
+
   // "form.save": "Save",
   "form.save": "Kaydet",
-  
+
   // "form.save-help": "Save changes",
   "form.save-help": "Değişiklikleri kaydet",
-  
+
   // "form.search": "Search",
   "form.search": "Ara",
-  
+
   // "form.search-help": "Click here to look for an existing correspondence",
   "form.search-help": "Mevcut bir yazışma aramak için buraya tıklayın",
-  
+
   // "form.submit": "Submit",
   "form.submit": "Gönder",
-  
-  
-  
+
+
+
   // "home.description": "",
   "home.description": "",
-  
+
   // "home.breadcrumbs": "Home",
   "home.breadcrumbs": "Anasayfa",
-  
+
   // "home.title": "DSpace Angular :: Home",
   "home.title": "DSpace Açısal :: Anasayfa",
-  
+
   // "home.top-level-communities.head": "Communities in DSpace",
   "home.top-level-communities.head": "Dspace'deki Komüniteler",
-  
+
   // "home.top-level-communities.help": "Select a community to browse its collections.",
   "home.top-level-communities.help": "Koleksiyonlarına göz atmak için bir komünite seçin.",
- 
-  // "home.search-form.placeholder": "Search the repository ...", 
-  "home.search-form.placeholder": "Depoda ara ...", 
-  
-  
+
+  // "home.search-form.placeholder": "Search the repository ...",
+  "home.search-form.placeholder": "Depoda ara ...",
+
+
   // "info.end-user-agreement.accept": "I have read and I agree to the End User Agreement",
   "info.end-user-agreement.accept": "Okudum ve son kullanıcı sözleşmesini kabul ediyorum",
-  
+
   // "info.end-user-agreement.accept.error": "An error occurred accepting the End User Agreement",
   "info.end-user-agreement.accept.error": "Son kullanıcı sözleşmesini kabul eden bir hata oluştu",
-  
+
   // "info.end-user-agreement.accept.success": "Successfully updated the End User Agreement",
   "info.end-user-agreement.accept.success": "Son Kullanıcı Sözleşmesini başarıyla güncelledi",
-  
+
   // "info.end-user-agreement.breadcrumbs": "End User Agreement",
   "info.end-user-agreement.breadcrumbs": "Son Kullanıcı Sözleşmesi",
-  
+
   // "info.end-user-agreement.buttons.cancel": "Cancel",
   "info.end-user-agreement.buttons.cancel": "İptal",
-  
+
   // "info.end-user-agreement.buttons.save": "Save",
   "info.end-user-agreement.buttons.save": "Kaydet",
-  
+
   // "info.end-user-agreement.head": "End User Agreement",
   "info.end-user-agreement.head": "Son Kullanıcı Sözleşmesi",
-  
+
   // "info.end-user-agreement.title": "End User Agreement",
   "info.end-user-agreement.title": "Son Kullanıcı Sözleşmesi",
-  
+
   // "info.privacy.breadcrumbs": "Privacy Statement",
   "info.privacy.breadcrumbs": "Gizlilik bildirimi",
-  
+
   // "info.privacy.head": "Privacy Statement",
   "info.privacy.head": "Gizlilik bildirimi",
-  
+
   // "info.privacy.title": "Privacy Statement",
   "info.privacy.title": "Gizlilik bildirimi",
-  
-  
-  
+
+
+
   // "item.alerts.private": "This item is private",
   "item.alerts.private": "Bu öğe özel",
-  
+
   // "item.alerts.withdrawn": "This item has been withdrawn",
   "item.alerts.withdrawn": "Bu ürün geri çekildi",
-  
-  
-  
+
+
+
   // "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": "Bu editör ile bir öğenin politikalarını görüntüleyebilir ve değiştirebilirsiniz, ayrıca bireysel ürün bileşenlerinin politikalarını değiştirebilirsiniz: Paketler ve Bitstream. Kısaca, bir öğe bir paket konteynırıdır ve paketler bitstream konteynırıdır. Konteynerler genellikle, bitstream yalnızca okuma / yazma politikalarına sahip olur.",
-  
+
   // "item.edit.authorizations.title": "Edit item's Policies",
   "item.edit.authorizations.title": "Edit item's Politikalar",
-  
-  
-  
+
+
+
   // "item.badge.private": "Private",
   "item.badge.private": "Özel",
-  
+
   // "item.badge.withdrawn": "Withdrawn",
   "item.badge.withdrawn": "Çekilmiş",
-  
-  
-  
+
+
+
   // "item.bitstreams.upload.bundle": "Bundle",
   "item.bitstreams.upload.bundle": "Paket",
-  
+
   // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
   "item.bitstreams.upload.bundle.placeholder": "Bir paket seçin",
-  
+
   // "item.bitstreams.upload.bundle.new": "Create bundle",
   "item.bitstreams.upload.bundle.new": "Paket oluştur",
-  
-  // "item.bitstreams.upload.bundles.empty": "This item doesn\'t contain any bundles to upload a bitstream to.",
+
+  // "item.bitstreams.upload.bundles.empty": "This item doesn't contain any bundles to upload a bitstream to.",
   "item.bitstreams.upload.bundles.empty": "Bu öğe, bir bitstream yüklemek için herhangi bir paket içermiyor.",
-  
+
   // "item.bitstreams.upload.cancel": "Cancel",
   "item.bitstreams.upload.cancel": "İptal",
-  
+
   // "item.bitstreams.upload.drop-message": "Drop a file to upload",
   "item.bitstreams.upload.drop-message": "Yüklenecek bir dosya bırak",
-  
+
   // "item.bitstreams.upload.item": "Item: ",
   "item.bitstreams.upload.item": "Öğe: ",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.content": "Successfully created new bundle.",
   "item.bitstreams.upload.notifications.bundle.created.content": "Başarıyla yeni paket oluşturuldu.",
-  
+
   // "item.bitstreams.upload.notifications.bundle.created.title": "Created bundle",
   "item.bitstreams.upload.notifications.bundle.created.title": "Paket oluşturdu",
-  
+
   // "item.bitstreams.upload.notifications.upload.failed": "Upload failed. Please verify the content before retrying.",
   "item.bitstreams.upload.notifications.upload.failed": "Yükleme başarısız. Lütfen yeniden denemeden önce içeriği doğrulayın.",
-  
+
   // "item.bitstreams.upload.title": "Upload bitstream",
   "item.bitstreams.upload.title": "Bitstream yükle",
-  
-  
-  
+
+
+
   // "item.edit.bitstreams.bundle.edit.buttons.upload": "Upload",
   "item.edit.bitstreams.bundle.edit.buttons.upload": "Yükle",
-  
+
   // "item.edit.bitstreams.bundle.displaying": "Currently displaying {{ amount }} bitstreams of {{ total }}.",
   "item.edit.bitstreams.bundle.displaying": "Şu anda görüntülenen {{ amount }} bitstream {{ total }}.",
-  
+
   // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
   "item.edit.bitstreams.bundle.load.all": "Hepsini yükle ({{ total }})",
-  
+
   // "item.edit.bitstreams.bundle.load.more": "Load more",
   "item.edit.bitstreams.bundle.load.more": "Daha fazla yükle",
-  
+
   // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
   "item.edit.bitstreams.bundle.name": "PAKET: {{ name }}",
-  
+
   // "item.edit.bitstreams.discard-button": "Discard",
   "item.edit.bitstreams.discard-button": "Yoksay",
-  
+
   // "item.edit.bitstreams.edit.buttons.download": "Download",
   "item.edit.bitstreams.edit.buttons.download": "İndir",
-  
+
   // "item.edit.bitstreams.edit.buttons.drag": "Drag",
   "item.edit.bitstreams.edit.buttons.drag": "Sürükle",
-  
+
   // "item.edit.bitstreams.edit.buttons.edit": "Edit",
   "item.edit.bitstreams.edit.buttons.edit": "Düzenle",
-  
+
   // "item.edit.bitstreams.edit.buttons.remove": "Remove",
   "item.edit.bitstreams.edit.buttons.remove": "Kaldır",
 
   // "item.edit.bitstreams.edit.buttons.undo": "Undo changes",
   "item.edit.bitstreams.edit.buttons.undo": "Değişiklikleri geri al",
-  
+
   // "item.edit.bitstreams.empty": "This item doesn't contain any bitstreams. Click the upload button to create one.",
   "item.edit.bitstreams.empty": "Bu öge herhangi bir veri içermiyor. Bir tane oluşturmak için yükle düğmesini tıklayınız.",
-  
+
   // "item.edit.bitstreams.headers.actions": "Actions",
   "item.edit.bitstreams.headers.actions": "İşlemler",
-  
+
   // "item.edit.bitstreams.headers.bundle": "Bundle",
   "item.edit.bitstreams.headers.bundle": "Seri",
-  
+
   // "item.edit.bitstreams.headers.description": "Description",
   "item.edit.bitstreams.headers.description": "Açıklama",
-  
+
   // "item.edit.bitstreams.headers.format": "Format",
   "item.edit.bitstreams.headers.format": "Format",
-  
+
   // "item.edit.bitstreams.headers.name": "Name",
   "item.edit.bitstreams.headers.name": "Ad",
-  
+
   // "item.edit.bitstreams.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.bitstreams.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
-  
+
   // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
   "item.edit.bitstreams.notifications.discarded.title": "Değişiklikler silindi.",
-  
+
   // "item.edit.bitstreams.notifications.move.failed.title": "Error moving bitstreams",
   "item.edit.bitstreams.notifications.move.failed.title": "Veri taşınırken bir hata oluştu.",
-  
+
   // "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": "Bu öğenin bitstreamda ve paketlerinde yaptığınız değişiklikler kaydedildi.",
-  
+
   // "item.edit.bitstreams.notifications.move.saved.title": "Move changes saved",
   "item.edit.bitstreams.notifications.move.saved.title": "Değişiklikler kaydedildi.",
-  
+
   // "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": "Şu anda üzerinde çalıştığınız öğe başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi. ",
-  
+
   // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
   "item.edit.bitstreams.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
-  
+
   // "item.edit.bitstreams.notifications.remove.failed.title": "Error deleting bitstream",
   "item.edit.bitstreams.notifications.remove.failed.title": "Bitstream silinirken bir hata oluştu",
-  
+
   // "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": "Bu öğenin bitstreamda yaptığınız kaldırma değişiklikleri kaydedildi.",
-  
+
   // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
   "item.edit.bitstreams.notifications.remove.saved.title": "Kaldırma değişiklikleri kaydedildi.",
-  
+
   // "item.edit.bitstreams.reinstate-button": "Undo",
   "item.edit.bitstreams.reinstate-button": "Geri al",
-  
+
   // "item.edit.bitstreams.save-button": "Save",
   "item.edit.bitstreams.save-button": "Kaydet",
-  
+
   // "item.edit.bitstreams.upload-button": "Upload",
   "item.edit.bitstreams.upload-button": "Yükle",
-  
-  
-  
+
+
+
   // "item.edit.delete.cancel": "Cancel",
   "item.edit.delete.cancel": "İptal et",
-  
+
   // "item.edit.delete.confirm": "Delete",
   "item.edit.delete.confirm": "Sil",
-  
+
   // "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": "Bu öğeyi kalıcı olarak silmek istedğinizden emin misiniz? Silme işlemi gerçekleştikten sonra geri alınamaz. ",
-  
+
   // "item.edit.delete.error": "An error occurred while deleting the item",
   "item.edit.delete.error": "Silme işlemi sırasında bir hata oluştu.",
-  
+
   // "item.edit.delete.header": "Delete item: {{ id }}",
   "item.edit.delete.header": "Silinecek öğeler: {{ id }}",
-  
+
   // "item.edit.delete.success": "The item has been deleted",
   "item.edit.delete.success": "Öğe silindi.",
-  
+
   // "item.edit.head": "Edit Item",
   "item.edit.head": "Ögeleri düzenle",
-  
+
   // "item.edit.breadcrumbs": "Edit Item",
   "item.edit.breadcrumbs": "Ögeleri düzenle",
-  
-  
+
+
   // "item.edit.tabs.mapper.head": "Collection Mapper",
   "item.edit.tabs.mapper.head": "Koleksiyon eşleştiricisi",
-  
+
   // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
   "item.edit.tabs.item-mapper.title": "Öge düzenle- Koleksiyon eşleştiricisi",
-  
+
   // "item.edit.item-mapper.buttons.add": "Map item to selected collections",
   "item.edit.item-mapper.buttons.add": "Ögeyi seçili koleksiyonlarla eşleştir",
-  
+
   // "item.edit.item-mapper.buttons.remove": "Remove item's mapping for selected collections",
   "item.edit.item-mapper.buttons.remove": "Seçili koleksiyonların öge eşleştirmelerini kaldır",
-  
+
   // "item.edit.item-mapper.cancel": "Cancel",
   "item.edit.item-mapper.cancel": "İptal et",
-  
+
   // "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": "Öge eşleme aracı, yöneticilerin bu öğeyi diğer koleksiyonlarla eşleştirmesini ögeleri eşleştirmesini sağlar. Koleksiyonları arayabilir ve bunları eşleyebilir veya öğenin şu anda eşlendiği koleksiyonların listesine göz atabilirsiniz.",
-  
+
   // "item.edit.item-mapper.head": "Item Mapper - Map Item to Collections",
   "item.edit.item-mapper.head": "Öge eşleştirici - Ögeleri koleksiyonlarla eşleştirir",
-  
+
   // "item.edit.item-mapper.item": "Item: \"<b>{{name}}</b>\"",
   "item.edit.item-mapper.item": "Öge: \"<b>{{name}}</b>\"",
-  
+
   // "item.edit.item-mapper.no-search": "Please enter a query to search",
   "item.edit.item-mapper.no-search": "Lütfen arama yapmak için bir soru giriniz.",
-  
+
   // "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": "Ögelerin {{amount}} koleksiyonlarla eşleştirirken bir hata oluştu.",
-  
+
   // "item.edit.item-mapper.notifications.add.error.head": "Mapping errors",
   "item.edit.item-mapper.notifications.add.error.head": "Eşleştirme hataları",
-  
+
   // "item.edit.item-mapper.notifications.add.success.content": "Successfully mapped item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.add.success.content": "Ögeler {{amount}} koleksiyonlarla başarıyla eşleştirildi.",
-  
+
   // "item.edit.item-mapper.notifications.add.success.head": "Mapping completed",
   "item.edit.item-mapper.notifications.add.success.head": "Eşleştirme tamamlandı.",
-  
+
   // "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": "Ögelerin {{amount}} koleksiyonlarla eşleştirmeleri kaldırılırken bir hata oluştu.",
-  
+
   // "item.edit.item-mapper.notifications.remove.error.head": "Removal of mapping errors",
   "item.edit.item-mapper.notifications.remove.error.head": "Eşleştirme hatalarının kaldırılması",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.content": "Successfully removed mapping of item to {{amount}} collections.",
   "item.edit.item-mapper.notifications.remove.success.content": "Ögeler {{amount}} koleksiyonlarla eşleştirmeleri başarıyla kaldırıldı.",
-  
+
   // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
   "item.edit.item-mapper.notifications.remove.success.head": "Eşleştirmelerin kaldırılması tamamlandı.",
-  
+
   // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
   "item.edit.item-mapper.tabs.browse": "Eşleştirilen koleksiyonları ara",
-  
+
   // "item.edit.item-mapper.tabs.map": "Map new collections",
   "item.edit.item-mapper.tabs.map": "Yeni koleksiyonları eşleştir",
-  
-  
-  
+
+
+
   // "item.edit.metadata.add-button": "Add",
   "item.edit.metadata.add-button": "Ekle",
-  
+
   // "item.edit.metadata.discard-button": "Discard",
   "item.edit.metadata.discard-button": "Sil",
-  
+
   // "item.edit.metadata.edit.buttons.edit": "Edit",
   "item.edit.metadata.edit.buttons.edit": "Düzenle",
-  
+
   // "item.edit.metadata.edit.buttons.remove": "Remove",
   "item.edit.metadata.edit.buttons.remove": "Kaldır",
-  
+
   // "item.edit.metadata.edit.buttons.undo": "Undo changes",
   "item.edit.metadata.edit.buttons.undo": "Değişiklikleri geri al",
-  
+
   // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
   "item.edit.metadata.edit.buttons.unedit": "Düzenlemeyi bitir",
-  
+
   // "item.edit.metadata.empty": "The item currently doesn't contain any metadata. Click Add to start adding a metadata value.",
   "item.edit.metadata.empty": "Öğe şu anda herhangi bir metadata içermiyor. Bir metadata değeri eklemeye başlamak için Ekle'ye tıklayın.",
-  
+
   // "item.edit.metadata.headers.edit": "Edit",
   "item.edit.metadata.headers.edit": "Düzenle",
-  
+
   // "item.edit.metadata.headers.field": "Field",
   "item.edit.metadata.headers.field": "Alan",
-  
+
   // "item.edit.metadata.headers.language": "Lang",
   "item.edit.metadata.headers.language": "Dil",
-  
+
   // "item.edit.metadata.headers.value": "Value",
   "item.edit.metadata.headers.value": "Değer",
-  
+
   // "item.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
   "item.edit.metadata.metadatafield.invalid": "Lütfen geçerli bir metadata alanı seçin",
-  
+
   // "item.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.metadata.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
-  
+
   // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
   "item.edit.metadata.notifications.discarded.title": "Değişiklikler silindi",
-  
+
   // "item.edit.metadata.notifications.error.title": "An error occurred",
   "item.edit.metadata.notifications.error.title": "Bir hata oluştu",
-  
+
   // "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": "Değişiklikleriniz kaydedilmedi. Lütfen kaydetmeden önce tüm alanların geçerli olduğundan emin olun.",
-  
+
   // "item.edit.metadata.notifications.invalid.title": "Metadata invalid",
   "item.edit.metadata.notifications.invalid.title": "Metadata geçersiz",
-  
+
   // "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": "Şu anda üzerinde çalıştığınız öge başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi.",
-  
+
   // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
   "item.edit.metadata.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
-  
+
   // "item.edit.metadata.notifications.saved.content": "Your changes to this item's metadata were saved.",
   "item.edit.metadata.notifications.saved.content": "Ögenin metadatalarında yaptığınız değişiklikler kaydedildi.",
-  
+
   // "item.edit.metadata.notifications.saved.title": "Metadata saved",
   "item.edit.metadata.notifications.saved.title": "Metadatalar kaydedildi",
-  
+
   // "item.edit.metadata.reinstate-button": "Undo",
   "item.edit.metadata.reinstate-button": "Geri al",
-  
+
   // "item.edit.metadata.save-button": "Save",
   "item.edit.metadata.save-button": "Kaydet",
-  
-  
-  
+
+
+
   // "item.edit.modify.overview.field": "Field",
   "item.edit.modify.overview.field": "Alan",
-  
+
   // "item.edit.modify.overview.language": "Language",
   "item.edit.modify.overview.language": "Dil",
-  
+
   // "item.edit.modify.overview.value": "Value",
   "item.edit.modify.overview.value": "Değer",
-  
-  
-  
+
+
+
   // "item.edit.move.cancel": "Cancel",
   "item.edit.move.cancel": "İptal et",
-  
+
   // "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": "Bu öğeyi taşımak istediğiniz koleksiyonu seçin. Görüntülenen koleksiyonların listesini daraltmak için arama kısmına bir arama sorgusu girebilirsiniz.",
-  
+
   // "item.edit.move.error": "An error occurred when attempting to move the item",
   "item.edit.move.error": "Öğeyi taşımaya çalışırken bir hata oluştu",
-  
+
   // "item.edit.move.head": "Move item: {{id}}",
   "item.edit.move.head": "Kaldırılacak öge: {{id}}",
-  
+
   // "item.edit.move.inheritpolicies.checkbox": "Inherit policies",
   "item.edit.move.inheritpolicies.checkbox": "Poliçeyi devral",
-  
+
   // "item.edit.move.inheritpolicies.description": "Inherit the default policies of the destination collection",
   "item.edit.move.inheritpolicies.description": "Hedef koleksiyonun varsayılan poliçelerini devral",
-  
+
   // "item.edit.move.move": "Move",
   "item.edit.move.move": "Taşı",
-  
+
   // "item.edit.move.processing": "Moving...",
   "item.edit.move.processing": "Taşınıyor...",
-  
+
   // "item.edit.move.search.placeholder": "Enter a search query to look for collections",
   "item.edit.move.search.placeholder": "Lütfen koleksiyonları aramak için bir arama sorgusu giriniz.",
-  
+
   // "item.edit.move.success": "The item has been moved successfully",
   "item.edit.move.success": "Öge başarıyla taşındı",
-  
+
   // "item.edit.move.title": "Move item",
   "item.edit.move.title": "Ögeleri taşı",
-  
-  
-  
+
+
+
   // "item.edit.private.cancel": "Cancel",
   "item.edit.private.cancel": "İptal et",
-  
+
   // "item.edit.private.confirm": "Make it Private",
   "item.edit.private.confirm": "Gizli yap",
-  
+
   // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
   "item.edit.private.description": "Bu öğenin arşivde gizli yapılması gerektiğinden emin misiniz?",
-  
+
   // "item.edit.private.error": "An error occurred while making the item private",
   "item.edit.private.error": "Öge gizli yapılırken bir hata oluştu",
-  
+
   // "item.edit.private.header": "Make item private: {{ id }}",
   "item.edit.private.header": "Ögeyi gizli yap: {{ id }}",
-  
+
   // "item.edit.private.success": "The item is now private",
   "item.edit.private.success": "Öge gizlendi",
-  
-  
-  
+
+
+
   // "item.edit.public.cancel": "Cancel",
   "item.edit.public.cancel": "İptal et",
-  
+
   // "item.edit.public.confirm": "Make it Public",
   "item.edit.public.confirm": "Ögeyi herkese açık yap",
-  
+
   // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
   "item.edit.public.description": "Bu öğenin arşivde herkese açık yapılması gerektiğinden emin misiniz?",
-  
+
   // "item.edit.public.error": "An error occurred while making the item public",
   "item.edit.public.error": "Öge herkese açık yapılırken bir hata oluştu",
-  
+
   // "item.edit.public.header": "Make item public: {{ id }}",
   "item.edit.public.header": "Herkese açık yapılacak öge: {{ id }}",
-  
+
   // "item.edit.public.success": "The item is now public",
   "item.edit.public.success": "Öge herkese açık yapıldı",
-  
-  
-  
+
+
+
   // "item.edit.reinstate.cancel": "Cancel",
   "item.edit.reinstate.cancel": "İptal et",
-  
+
   // "item.edit.reinstate.confirm": "Reinstate",
   "item.edit.reinstate.confirm": "Getir yükle",
-  
+
   // "item.edit.reinstate.description": "Are you sure this item should be reinstated to the archive?",
   "item.edit.reinstate.description": "Bu öğenin arşive geri yüklenmesi gerektiğinden emin misiniz?",
-  
+
   // "item.edit.reinstate.error": "An error occurred while reinstating the item",
   "item.edit.reinstate.error": "Öğe geri yüklenirken bir hata oluştu",
-  
+
   // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
   "item.edit.reinstate.header": "Geri yüklenecek öge: {{ id  }}",
-  
+
   // "item.edit.reinstate.success": "The item was reinstated successfully",
   "item.edit.reinstate.success": "Öge başarıyla geri yüklendi",
-  
-  
-  
+
+
+
   // "item.edit.relationships.discard-button": "Discard",
   "item.edit.relationships.discard-button": "Sil",
-  
+
   // "item.edit.relationships.edit.buttons.add": "Add",
   "item.edit.relationships.edit.buttons.add": "Ekle",
-  
+
   // "item.edit.relationships.edit.buttons.remove": "Remove",
   "item.edit.relationships.edit.buttons.remove": "Kaldır",
-  
+
   // "item.edit.relationships.edit.buttons.undo": "Undo changes",
   "item.edit.relationships.edit.buttons.undo": "Değişiklikleri geri al",
-  
+
   // "item.edit.relationships.no-relationships": "No relationships",
   "item.edit.relationships.no-relationships": "İlişki yok",
-  
+
   // "item.edit.relationships.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
   "item.edit.relationships.notifications.discarded.content": "Yaptığınız değişiklikler silindi.Yaptığınız değişiklikleri geri yüklemek için 'Geri al' butonuna tıklayınız.",
-  
+
   // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
   "item.edit.relationships.notifications.discarded.title": "Değişiklikler silindi",
-  
+
   // "item.edit.relationships.notifications.failed.title": "Error editing relationships",
   "item.edit.relationships.notifications.failed.title": "İlişkileri düzenlemede hata",
-  
+
   // "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": "Şu anda üzerinde çalıştığınız öge başka bir kullanıcı tarafından değiştirildi.Mevcut değişiklikleriniz çakışma olmasını önlemek için silindi.",
-  
+
   // "item.edit.relationships.notifications.outdated.title": "Changes outdated",
   "item.edit.relationships.notifications.outdated.title": "Değişiklikler zaman aşımına uğradı.",
-  
+
   // "item.edit.relationships.notifications.saved.content": "Your changes to this item's relationships were saved.",
   "item.edit.relationships.notifications.saved.content": "Bu öğenin ilişkilerinde yaptığınız değişiklikler kaydedildi.",
-  
+
   // "item.edit.relationships.notifications.saved.title": "Relationships saved",
   "item.edit.relationships.notifications.saved.title": "İlişkiler kaydedildi",
-  
+
   // "item.edit.relationships.reinstate-button": "Undo",
   "item.edit.relationships.reinstate-button": "Geri al",
-  
+
   // "item.edit.relationships.save-button": "Save",
   "item.edit.relationships.save-button": "Kaydet",
-  
+
   // "item.edit.relationships.no-entity-type": "Add 'dspace.entity.type' metadata to enable relationships for this item",
   "item.edit.relationships.no-entity-type": "Bu öğe için ilişkileri etkinleştirmek için 'dspace.entity.type' metadatalarını ekleyin",
-  
-  
-  
+
+
+
   // "item.edit.tabs.bitstreams.head": "Bitstreams",
   "item.edit.tabs.bitstreams.head": "Bitstreamlar",
-  
+
   // "item.edit.tabs.bitstreams.title": "Item Edit - Bitstreams",
   "item.edit.tabs.bitstreams.title": "Öge düzenle - Bitstreamlar",
-  
+
   // "item.edit.tabs.curate.head": "Curate",
   "item.edit.tabs.curate.head": "Düzenleme",
-  
+
   // "item.edit.tabs.curate.title": "Item Edit - Curate",
   "item.edit.tabs.curate.title": "Öge düzenle  - Düzenleme",
-  
+
   // "item.edit.tabs.metadata.head": "Metadata",
   "item.edit.tabs.metadata.head": "Metadata",
-  
+
   // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
   "item.edit.tabs.metadata.title": "Öge düzenle -  Metadata",
-  
+
   // "item.edit.tabs.relationships.head": "Relationships",
   "item.edit.tabs.relationships.head": "İlişkiler",
-  
+
   // "item.edit.tabs.relationships.title": "Item Edit - Relationships",
   "item.edit.tabs.relationships.title": "Öge düzenle - İlişkiler",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
   "item.edit.tabs.status.buttons.authorizations.button": "Yetkilendiriliyor...",
-  
+
   // "item.edit.tabs.status.buttons.authorizations.label": "Edit item's authorization policies",
   "item.edit.tabs.status.buttons.authorizations.label": "Öğenin yetkilendirme politikalarını düzenle",
-  
+
   // "item.edit.tabs.status.buttons.delete.button": "Permanently delete",
   "item.edit.tabs.status.buttons.delete.button": "Kalıcı olarak sil",
-  
+
   // "item.edit.tabs.status.buttons.delete.label": "Completely expunge item",
   "item.edit.tabs.status.buttons.delete.label": "Ögeyi kalıcı olarak sil",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.button": "Mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.button": "Eşleştirilmiş koleksiyonlar",
-  
+
   // "item.edit.tabs.status.buttons.mappedCollections.label": "Manage mapped collections",
   "item.edit.tabs.status.buttons.mappedCollections.label": "Eşlenen koleksiyonları yönetin",
-  
-  // "item.edit.tabs.status.buttons.move.button": "Move...",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
   "item.edit.tabs.status.buttons.move.button": "Taşınıyor...",
-  
+
   // "item.edit.tabs.status.buttons.move.label": "Move item to another collection",
   "item.edit.tabs.status.buttons.move.label": "Öğeyi başka bir koleksiyona taşı",
-  
+
   // "item.edit.tabs.status.buttons.private.button": "Make it private...",
   "item.edit.tabs.status.buttons.private.button": "Gizleniyor...",
-  
+
   // "item.edit.tabs.status.buttons.private.label": "Make item private",
   "item.edit.tabs.status.buttons.private.label": "Ögeyi gizle",
-  
+
   // "item.edit.tabs.status.buttons.public.button": "Make it public...",
   "item.edit.tabs.status.buttons.public.button": "Öge herkese açık yapılıyor...",
-  
+
   // "item.edit.tabs.status.buttons.public.label": "Make item public",
   "item.edit.tabs.status.buttons.public.label": "Herkese açık yap",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.button": "Reinstate...",
   "item.edit.tabs.status.buttons.reinstate.button": "Geri yükleniyor...",
-  
+
   // "item.edit.tabs.status.buttons.reinstate.label": "Reinstate item into the repository",
   "item.edit.tabs.status.buttons.reinstate.label": "Öğeyi depoya geri yükle",
-  
-  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw...",
-  "item.edit.tabs.status.buttons.withdraw.button": "Çıkar...",
-  
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "bu öğeyi geri çek",
+
   // "item.edit.tabs.status.buttons.withdraw.label": "Withdraw item from the repository",
   "item.edit.tabs.status.buttons.withdraw.label": "Depodan öğeyi çıkar",
-  
+
   // "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": "Öğe yönetimi sayfasına hoş geldiniz. Buradan öğeyi  çıkarabilir, geri yükleyebilir, taşıyabilir veya silebilirsiniz. Diğer sekmelerde de güncelleyebilir veya yeni metadata / bit akışları ekleyebilirsiniz.",
-  
+
   // "item.edit.tabs.status.head": "Status",
   "item.edit.tabs.status.head": "Durum",
-  
+
   // "item.edit.tabs.status.labels.handle": "Handle",
   "item.edit.tabs.status.labels.handle": "Handle",
-  
+
   // "item.edit.tabs.status.labels.id": "Item Internal ID",
   "item.edit.tabs.status.labels.id": "Öge Dahili Kimliğ",
-  
+
   // "item.edit.tabs.status.labels.itemPage": "Item Page",
   "item.edit.tabs.status.labels.itemPage": "Öge sayfası",
-  
+
   // "item.edit.tabs.status.labels.lastModified": "Last Modified",
   "item.edit.tabs.status.labels.lastModified": "Son düzenleme",
-  
+
   // "item.edit.tabs.status.title": "Item Edit -  Status",
   "item.edit.tabs.status.title": "Öge düzenle -  Durum",
-  
+
   // "item.edit.tabs.versionhistory.head": "Version History",
   "item.edit.tabs.versionhistory.head": "Sürüm Geçmişi",
-  
+
   // "item.edit.tabs.versionhistory.title": "Item Edit - Version History",
   "item.edit.tabs.versionhistory.title": "Öge düzenle - Sürüm Geçmişi",
-  
+
   // "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": "Bu kullanıcı arayüzünde henüz yeni sürümleri düzenlemek veya eklemek mümkün değil.",
-  
+
   // "item.edit.tabs.view.head": "View Item",
   "item.edit.tabs.view.head": "Ürünü incele",
-  
+
   // "item.edit.tabs.view.title": "Item Edit -  View",
   "item.edit.tabs.view.title": "Öge düzenle -  incele",
-  
-  
-  
+
+
+
   // "item.edit.withdraw.cancel": "Cancel",
   "item.edit.withdraw.cancel": "İptal et",
-  
+
   // "item.edit.withdraw.confirm": "Withdraw",
   "item.edit.withdraw.confirm": "Çıkar",
-  
+
   // "item.edit.withdraw.description": "Are you sure this item should be withdrawn from the archive?",
   "item.edit.withdraw.description": "Bu öğenin arşivden çıkartılması gerektiğinden emin misiniz?",
-  
+
   // "item.edit.withdraw.error": "An error occurred while withdrawing the item",
   "item.edit.withdraw.error": "Öğe çıkartılırken bir hata oluştu",
-  
+
   // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
   "item.edit.withdraw.header": "Çıkarılan öge: {{ id }}",
-  
+
   // "item.edit.withdraw.success": "The item was withdrawn successfully",
   "item.edit.withdraw.success": "Öğe başarıyla çıkartıldı",
-  
-  
-  
+
+
+
   // "item.listelement.badge": "Item",
   "item.listelement.badge": "Öge",
-  
+
   // "item.page.description": "Description",
   "item.page.description": "Açıklama",
-  
-  // "item.page.edit": "Edit this item",
-  "item.page.edit": "Bu ögeyi düzenle",
-  
+
   // "item.page.journal-issn": "Journal ISSN",
   "item.page.journal-issn": "Süreli Yayın ISSN",
-  
+
   // "item.page.journal-title": "Journal Title",
   "item.page.journal-title": "Süreli Yayın başlığı",
-  
+
   // "item.page.publisher": "Publisher",
   "item.page.publisher": "Yayınevi",
-  
+
   // "item.page.titleprefix": "Item: ",
   "item.page.titleprefix": "Öge: ",
-  
+
   // "item.page.volume-title": "Volume Title",
   "item.page.volume-title": "Cilt Başlığı",
-  
+
   // "item.search.results.head": "Item Search Results",
   "item.search.results.head": "Öge Arama Sonuçları",
-  
+
   // "item.search.title": "DSpace Angular :: Item Search",
   "item.search.title": "DSpace Angular :: Öge Arama",
-  
-  
+
+
   // "item.page.abstract": "Abstract",
   "item.page.abstract": "Özet",
-  
+
   // "item.page.author": "Authors",
   "item.page.author": "Yazarlar",
-  
+
   // "item.page.citation": "Citation",
   "item.page.citation": "Alıntı",
-  
+
   // "item.page.collections": "Collections",
   "item.page.collections": "Koleksiyonlar",
-  
+
   // "item.page.date": "Date",
   "item.page.date": "Tarih",
-  
+
   // "item.page.edit": "Edit this item",
   "item.page.edit": "Bu öğeyi düzenle",
-  
+
   // "item.page.files": "Files",
   "item.page.files": "Dosyalar",
-  
+
   // "item.page.filesection.description": "Description:",
   "item.page.filesection.description": "Açıklama",
-  
+
   // "item.page.filesection.download": "Download",
   "item.page.filesection.download": "İndir",
-  
+
   // "item.page.filesection.format": "Format:",
   "item.page.filesection.format": "Format:",
-  
+
   // "item.page.filesection.name": "Name:",
   "item.page.filesection.name": "Ad:",
-  
+
   // "item.page.filesection.size": "Size:",
   "item.page.filesection.size": "Boyut:",
-  
+
   // "item.page.journal.search.title": "Articles in this journal",
   "item.page.journal.search.title": "Bu süreli yayındaki makaleler",
-  
+
   // "item.page.link.full": "Full item page",
   "item.page.link.full": "Tam öğe sayfası",
-  
+
   // "item.page.link.simple": "Simple item page",
   "item.page.link.simple": "Sadeleştirilmiş öğe sayfası",
-  
+
   // "item.page.person.search.title": "Articles by this author",
   "item.page.person.search.title": "Bu yazarın makaleleri",
-  
+
   // "item.page.related-items.view-more": "Show {{ amount }} more",
   "item.page.related-items.view-more": "Daha fazla göster {{ amount }}",
-  
+
   // "item.page.related-items.view-less": "Hide last {{ amount }}",
   "item.page.related-items.view-less": "Sonuncuyu gizle {{ amount }}",
-  
+
   // "item.page.relationships.isAuthorOfPublication": "Publications",
   "item.page.relationships.isAuthorOfPublication": "Yayınlar",
-  
+
   // "item.page.relationships.isJournalOfPublication": "Publications",
   "item.page.relationships.isJournalOfPublication": "Yayınlar",
-  
+
   // "item.page.relationships.isOrgUnitOfPerson": "Authors",
   "item.page.relationships.isOrgUnitOfPerson": "Yazarlar",
-  
+
   // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
   "item.page.relationships.isOrgUnitOfProject": "Araştırma projeleri",
-  
+
   // "item.page.subject": "Keywords",
   "item.page.subject": "Anahtar kelimeler",
-  
+
   // "item.page.uri": "URI",
   "item.page.uri": "URI",
-  
+
   // "item.page.bitstreams.view-more": "Show more",
   "item.page.bitstreams.view-more": "Daha fazla göster",
-  
+
   // "item.page.bitstreams.collapse": "Collapse",
   "item.page.bitstreams.collapse": "Daralt",
-  
+
   // "item.page.filesection.original.bundle" : "Original bundle",
-  "item.page.filesection.original.bundle" : "Orijinal seri",
-  
+  "item.page.filesection.original.bundle": "Orijinal seri",
+
   // "item.page.filesection.license.bundle" : "License bundle",
-  "item.page.filesection.license.bundle" : "Lisanslı seri",
-  
+  "item.page.filesection.license.bundle": "Lisanslı seri",
+
   // "item.preview.dc.identifier.uri": "Identifier:",
   "item.preview.dc.identifier.uri": "Belirteç:",
-  
+
   // "item.preview.dc.contributor.author": "Authors:",
   "item.preview.dc.contributor.author": "Yazarlar:",
-  
+
   // "item.preview.dc.date.issued": "Published date:",
   "item.preview.dc.date.issued": "Yayınlanma tarihi:",
-  
+
   // "item.preview.dc.description.abstract": "Abstract:",
   "item.preview.dc.description.abstract": "Özet:",
-  
+
   // "item.preview.dc.identifier.other": "Other identifier:",
   "item.preview.dc.identifier.other": "Diğer Belirteçler:",
-  
+
   // "item.preview.dc.language.iso": "Language:",
   "item.preview.dc.language.iso": "Dil:",
-  
+
   // "item.preview.dc.subject": "Subjects:",
   "item.preview.dc.subject": "Konular:",
-  
+
   // "item.preview.dc.title": "Title:",
   "item.preview.dc.title": "Başlık:",
-  
+
   // "item.preview.person.familyName": "Surname:",
   "item.preview.person.familyName": "Soyad:",
-  
+
   // "item.preview.person.givenName": "Name:",
   "item.preview.person.givenName": "Ad:",
-  
+
   // "item.preview.person.identifier.orcid": "ORCID:",
   "item.preview.person.identifier.orcid": "ORCID:",
-  
-  
+
+
   // "item.select.confirm": "Confirm selected",
   "item.select.confirm": "Seçileni onayla",
-  
+
   // "item.select.empty": "No items to show",
   "item.select.empty": "Gösterilecek öğe yok",
-  
+
   // "item.select.table.author": "Author",
   "item.select.table.author": "Yazar",
-  
+
   // "item.select.table.collection": "Collection",
   "item.select.table.collection": "Koleksiyon",
-  
+
   // "item.select.table.title": "Title",
   "item.select.table.title": "Başlık",
-  
-  
+
+
   // "item.version.history.empty": "There are no other versions for this item yet.",
   "item.version.history.empty": "Bu öğe için henüz başka sürüm yok.",
-  
+
   // "item.version.history.head": "Version History",
   "item.version.history.head": "Sürüm Geçmişi",
-  
+
   // "item.version.history.return": "Return",
   "item.version.history.return": "Geri dön",
-  
+
   // "item.version.history.selected": "Selected version",
   "item.version.history.selected": "Seçilen sürüm",
-  
+
   // "item.version.history.table.version": "Version",
   "item.version.history.table.version": "Sürüm",
-  
+
   // "item.version.history.table.item": "Item",
   "item.version.history.table.item": "Öge",
-  
+
   // "item.version.history.table.editor": "Editor",
   "item.version.history.table.editor": "Editör",
-  
+
   // "item.version.history.table.date": "Date",
   "item.version.history.table.date": "Tarih",
-  
+
   // "item.version.history.table.summary": "Summary",
   "item.version.history.table.summary": "Özet",
-  
-  
-  
+
+
+
   // "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": "Bu, bu öğenin en son sürümü değil. En son sürüm <a href='{{destination}}'>burada</a> bulunabilir.", 
-  
-  
-  
+  "item.version.notice": "Bu, bu öğenin en son sürümü değil. En son sürüm <a href='{{destination}}'>burada</a> bulunabilir.",
+
+
+
   // "journal.listelement.badge": "Journal",
   "journal.listelement.badge": "Süreli yayın",
-  
+
   // "journal.page.description": "Description",
   "journal.page.description": "Açıklama",
-  
+
   // "journal.page.edit": "Edit this item",
   "journal.page.edit": "Bu öğeyi düzenle",
-  
+
   // "journal.page.editor": "Editor-in-Chief",
   "journal.page.editor": "Genel Yayın Yönetmeni",
-  
+
   // "journal.page.issn": "ISSN",
   "journal.page.issn": "ISSN",
-  
+
   // "journal.page.publisher": "Publisher",
   "journal.page.publisher": "Yayınevi",
-  
+
   // "journal.page.titleprefix": "Journal: ",
   "journal.page.titleprefix": "Süreli yayın: ",
-  
+
   // "journal.search.results.head": "Journal Search Results",
   "journal.search.results.head": "Süreli Yayın Arama Sonuçları",
-  
+
   // "journal.search.title": "DSpace Angular :: Journal Search",
   "journal.search.title": "DSpace Angular :: Süreli Yayın Arama",
-  
-  
-  
+
+
+
   // "journalissue.listelement.badge": "Journal Issue",
   "journalissue.listelement.badge": "Süreli Yayın Sayısı",
-  
+
   // "journalissue.page.description": "Description",
   "journalissue.page.description": "Açıklama",
-  
+
   // "journalissue.page.edit": "Edit this item",
   "journalissue.page.edit": "Bu öğeyi düzenle",
-  
+
   // "journalissue.page.issuedate": "Issue Date",
   "journalissue.page.issuedate": "Yayın tarihi",
-  
+
   // "journalissue.page.journal-issn": "Journal ISSN",
   "journalissue.page.journal-issn": "Süreli yayın ISSN",
-  
+
   // "journalissue.page.journal-title": "Journal Title",
   "journalissue.page.journal-title": "Süreli yayın Başlığı",
-  
+
   // "journalissue.page.keyword": "Keywords",
   "journalissue.page.keyword": "Anahtar kelimeler",
-  
+
   // "journalissue.page.number": "Number",
   "journalissue.page.number": "Sayı",
-  
+
   // "journalissue.page.titleprefix": "Journal Issue: ",
   "journalissue.page.titleprefix": "Süreli yayın sayısı: ",
-  
-  
-  
+
+
+
   // "journalvolume.listelement.badge": "Journal Volume",
   "journalvolume.listelement.badge": "Süreli yayın cilti",
-  
+
   // "journalvolume.page.description": "Description",
   "journalvolume.page.description": "Açıklama",
-  
+
   // "journalvolume.page.edit": "Edit this item",
   "journalvolume.page.edit": "Bu öğeyi düzenle",
-  
+
   // "journalvolume.page.issuedate": "Issue Date",
   "journalvolume.page.issuedate": "Yayın tarihi",
-  
+
   // "journalvolume.page.titleprefix": "Journal Volume: ",
   "journalvolume.page.titleprefix": "Süreli yayın cilti: ",
-  
+
   // "journalvolume.page.volume": "Volume",
   "journalvolume.page.volume": "Cilt",
-  
-  
-  
+
+
+
   // "loading.bitstream": "Loading bitstream...",
   "loading.bitstream": "Bitstream yükleniyor...",
-  
+
   // "loading.bitstreams": "Loading bitstreams...",
   "loading.bitstreams": "Bitstream yükleniyor...",
-  
+
   // "loading.browse-by": "Loading items...",
   "loading.browse-by": "Bitstream yükleniyor...",
-  
+
   // "loading.browse-by-page": "Loading page...",
   "loading.browse-by-page": "Yükleme sayfası...",
-  
+
   // "loading.collection": "Loading collection...",
   "loading.collection": "Koleksiyon yükleniyor...",
-  
+
   // "loading.collections": "Loading collections...",
   "loading.collections": "Koleksiyon yükleniyor...",
-  
+
   // "loading.content-source": "Loading content source...",
   "loading.content-source": "İçerik kaynağı yükleniyor...",
-  
+
   // "loading.community": "Loading community...",
   "loading.community": "Komünite yükleniyor...",
-  
+
   // "loading.default": "Loading...",
   "loading.default": "Yükleniyor...",
-  
+
   // "loading.item": "Loading item...",
   "loading.item": "Ögeler yükleniyor...",
-  
+
   // "loading.items": "Loading items...",
   "loading.items": "Ögeler yükleniyor...",
-  
+
   // "loading.mydspace-results": "Loading items...",
   "loading.mydspace-results": "Ögeler yükleniyor...",
-  
+
   // "loading.objects": "Loading...",
   "loading.objects": "Yükleniyor...",
-  
+
   // "loading.recent-submissions": "Loading recent submissions...",
   "loading.recent-submissions": "Son gönderiler yükleniyor...",
-  
+
   // "loading.search-results": "Loading search results...",
   "loading.search-results": "Arama sonuçları yükleniyor...",
-  
+
   // "loading.sub-collections": "Loading sub-collections...",
   "loading.sub-collections": "Alt koleksiyonlar yükleniyor...",
-  
+
   // "loading.sub-communities": "Loading sub-communities...",
   "loading.sub-communities": "Alt komüniteler yükleniyor...",
-  
+
   // "loading.top-level-communities": "Loading top-level communities...",
   "loading.top-level-communities": "Üst düzey komüniteler yükleniyor...",
-  
-  
-  
+
+
+
   // "login.form.email": "Email address",
   "login.form.email": "E-posta adresi",
-  
+
   // "login.form.forgot-password": "Have you forgotten your password?",
   "login.form.forgot-password": "Parolanızı unuttunuz mu?",
-  
+
   // "login.form.header": "Please log in to DSpace",
   "login.form.header": "Lütfen DSpace'e giriş yapın",
-  
+
   // "login.form.new-user": "New user? Click here to register.",
   "login.form.new-user": "Yeni kullanıcı mısınız? Kayıt olmak için buraya tıklayın.",
-  
+
   // "login.form.or-divider": "or",
   "login.form.or-divider": "ya da",
-  
+
   // "login.form.password": "Password",
   "login.form.password": "Parola",
-  
+
   // "login.form.shibboleth": "Log in with Shibboleth",
   "login.form.shibboleth": "Shibboleth ile giriş yapın",
-  
+
   // "login.form.submit": "Log in",
   "login.form.submit": "Giriş yap",
-  
+
   // "login.title": "Login",
   "login.title": "Giriş",
-  
+
   // "login.breadcrumbs": "Login",
   "login.breadcrumbs": "Giriş",
-  
-  
-  
+
+
+
   // "logout.form.header": "Log out from DSpace",
   "logout.form.header": "DSpace'den çıkış yapın",
-  
+
   // "logout.form.submit": "Log out",
   "logout.form.submit": "Çıkış yap",
-  
+
   // "logout.title": "Logout",
   "logout.title": "Çıkış yap",
-  
-  
-  
+
+
+
   // "menu.header.admin": "Admin",
   "menu.header.admin": "Yönetici",
-  
+
   // "menu.header.image.logo": "Repository logo",
   "menu.header.image.logo": "Depo logosu",
-  
-  
-  
+
+
+
   // "menu.section.access_control": "Access Control",
   "menu.section.access_control": "Giriş kontrolü",
-  
+
   // "menu.section.access_control_authorizations": "Authorizations",
   "menu.section.access_control_authorizations": "Yetkilendirmeler",
-  
+
   // "menu.section.access_control_groups": "Groups",
   "menu.section.access_control_groups": "Gruplar",
-  
+
   // "menu.section.access_control_people": "People",
   "menu.section.access_control_people": "Kişiler",
-  
-  
-  
+
+  // "menu.section.reports": "Reports",
+  // TODO New key - Add a translation
+  "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",
   "menu.section.admin_search": "Yönetici araması",
-  
-  
-  
+
+
+
   // "menu.section.browse_community": "This Community",
   "menu.section.browse_community": "Bu Komünite",
-  
+
   // "menu.section.browse_community_by_author": "By Author",
   "menu.section.browse_community_by_author": "Yazara göre",
-  
+
   // "menu.section.browse_community_by_issue_date": "By Issue Date",
   "menu.section.browse_community_by_issue_date": "Yayın tarihine göre",
-  
+
   // "menu.section.browse_community_by_title": "By Title",
   "menu.section.browse_community_by_title": "Başlığa göre",
-  
+
   // "menu.section.browse_global": "All of DSpace",
   "menu.section.browse_global": "Tümü",
-  
+
   // "menu.section.browse_global_by_author": "By Author",
   "menu.section.browse_global_by_author": "Yazara göre",
-  
+
   // "menu.section.browse_global_by_dateissued": "By Issue Date",
   "menu.section.browse_global_by_dateissued": "Yayın tarihine göre",
-  
+
   // "menu.section.browse_global_by_subject": "By Subject",
   "menu.section.browse_global_by_subject": "Konuya göre",
-  
+
   // "menu.section.browse_global_by_title": "By Title",
   "menu.section.browse_global_by_title": "Başlığa göre",
-  
+
   // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
   "menu.section.browse_global_communities_and_collections": "Komüniteler ve Koleksiyonlar",
-  
-  
-  
+
+
+
   // "menu.section.control_panel": "Control Panel",
   "menu.section.control_panel": "Kontrol Paneli",
-  
+
   // "menu.section.curation_task": "Curation Task",
   "menu.section.curation_task": "Düzenleme görevi",
-  
-  
-  
+
+
+
   // "menu.section.edit": "Edit",
   "menu.section.edit": "Düzenle",
-  
+
   // "menu.section.edit_collection": "Collection",
   "menu.section.edit_collection": "Koleksiyon",
-  
+
   // "menu.section.edit_community": "Community",
   "menu.section.edit_community": "Komünite",
-  
+
   // "menu.section.edit_item": "Item",
   "menu.section.edit_item": "Öge",
-  
-  
-  
+
+
+
   // "menu.section.export": "Export",
   "menu.section.export": "Dışa aktar",
-  
+
   // "menu.section.export_collection": "Collection",
   "menu.section.export_collection": "Koleksiyon",
-  
+
   // "menu.section.export_community": "Community",
   "menu.section.export_community": "Komünite",
-  
+
   // "menu.section.export_item": "Item",
   "menu.section.export_item": "Öge",
-  
+
   // "menu.section.export_metadata": "Metadata",
   "menu.section.export_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.icon.access_control": "Access Control menu section",
   "menu.section.icon.access_control": "Erişim Kontrolü menüsü bölümü",
-  
+
+  //"menu.section.icon.reports": "Reports menu section",
+  // TODO New key - Add a translation
+  "menu.section.icon.reports": "Reports menu section",
+
   // "menu.section.icon.admin_search": "Admin search menu section",
   "menu.section.icon.admin_search": "Yönetici arama menüsü bölümü",
-  
+
   // "menu.section.icon.control_panel": "Control Panel menu section",
   "menu.section.icon.control_panel": "Kontrol Paneli menü bölümü",
-  
+
   // "menu.section.icon.curation_task": "Curation Task menu section",
   "menu.section.icon.curation_task": "Düzenleme Görevi menüsü bölümü",
-  
+
   // "menu.section.icon.edit": "Edit menu section",
   "menu.section.icon.edit": "Menü bölümünü düzenle",
-  
+
   // "menu.section.icon.export": "Export menu section",
   "menu.section.icon.export": "Menü bölümünü dışa aktar",
-  
+
   // "menu.section.icon.find": "Find menu section",
   "menu.section.icon.find": "Menü bölümünü bulun",
-  
+
   // "menu.section.icon.import": "Import menu section",
   "menu.section.icon.import": "Menü bölümünü içe aktar",
-  
+
   // "menu.section.icon.new": "New menu section",
   "menu.section.icon.new": "Yeni menü bölümü",
-  
+
   // "menu.section.icon.pin": "Pin sidebar",
   "menu.section.icon.pin": "Yan çubuğu sabitle",
-  
+
   // "menu.section.icon.processes": "Processes menu section",
   "menu.section.icon.processes": "İşlemler menüsü bölümü",
-  
+
   // "menu.section.icon.registries": "Registries menu section",
   "menu.section.icon.registries": "Kayıtlar menüsü bölümü",
-  
+
   // "menu.section.icon.statistics_task": "Statistics Task menu section",
   "menu.section.icon.statistics_task": "İstatistik Görev menüsü bölümü",
-  
+
   // "menu.section.icon.unpin": "Unpin sidebar",
   "menu.section.icon.unpin": "Kenar çubuğunu kaldır",
-  
-  
-  
+
+
+
   // "menu.section.import": "Import",
   "menu.section.import": "İçe aktar",
-  
+
   // "menu.section.import_batch": "Batch Import (ZIP)",
   "menu.section.import_batch": "Toplu İçe Aktarma (ZIP)",
-  
+
   // "menu.section.import_metadata": "Metadata",
   "menu.section.import_metadata": "Metadata",
 
@@ -3087,2041 +3500,2044 @@
 
   // "menu.section.new": "New",
   "menu.section.new": "Yeni",
-  
+
   // "menu.section.new_collection": "Collection",
   "menu.section.new_collection": "Koleksiyon",
-  
+
   // "menu.section.new_community": "Community",
   "menu.section.new_community": "Komünite",
-  
+
   // "menu.section.new_item": "Item",
   "menu.section.new_item": "Öğe",
-  
+
   // "menu.section.new_item_version": "Item Version",
   "menu.section.new_item_version": "Öğe Sürümü",
-  
+
   // "menu.section.new_process": "Process",
   "menu.section.new_process": "Süreç",
-  
-  
-  
+
+
+
   // "menu.section.pin": "Pin sidebar",
   "menu.section.pin": "Kenar çubuğunu sabitle",
-  
+
   // "menu.section.unpin": "Unpin sidebar",
   "menu.section.unpin": "Kenar çubuğunun sabitlemesini kaldır",
-  
-  
-  
+
+
+
   // "menu.section.processes": "Processes",
   "menu.section.processes": "Süreçler",
-  
-  
-  
+
+
+
   // "menu.section.registries": "Registries",
   "menu.section.registries": "Kayıt",
-  
+
   // "menu.section.registries_format": "Format",
   "menu.section.registries_format": "Format",
-  
+
   // "menu.section.registries_metadata": "Metadata",
   "menu.section.registries_metadata": "Metadata",
-  
-  
-  
+
+
+
   // "menu.section.statistics": "Statistics",
   "menu.section.statistics": "İstatistik",
-  
+
   // "menu.section.statistics_task": "Statistics Task",
   "menu.section.statistics_task": "İstatistiksel Görev",
-  
-  
-  
+
+
+  //"menu.section.toggle.reports": "Toggle Reports section",
+  // TODO New key - Add a translation
+  "menu.section.toggle.reports": "Toggle Reports section",
+
   // "menu.section.toggle.access_control": "Toggle Access Control section",
   "menu.section.toggle.access_control": "Erişim kontrolü bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.control_panel": "Toggle Control Panel section",
   "menu.section.toggle.control_panel": "Kontrol Paneli bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.curation_task": "Toggle Curation Task section",
   "menu.section.toggle.curation_task": "İyileştirme Görevi bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.edit": "Toggle Edit section",
   "menu.section.toggle.edit": "Düzenleme bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.export": "Toggle Export section",
   "menu.section.toggle.export": "Dışa Aktarma bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.find": "Toggle Find section",
   "menu.section.toggle.find": "Arama bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.import": "Toggle Import section",
   "menu.section.toggle.import": "İçe Aktarma bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.new": "Toggle New section",
   "menu.section.toggle.new": "Yeni bölümü aç/kapat",
-  
+
   // "menu.section.toggle.registries": "Toggle Registries section",
   "menu.section.toggle.registries": "Kayıtlar bölümünü aç/kapat",
-  
+
   // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
   "menu.section.toggle.statistics_task": "İstatistik Görev bölümünü aç/kapat",
-  
-  
+
+
   // "menu.section.workflow": "Administer Workflow",
   "menu.section.workflow": "İş Akışını Yönet",
-  
-  
+
+
   // "mydspace.description": "",
   "mydspace.description": "",
-  
+
   // "mydspace.general.text-here": "here",
   "mydspace.general.text-here": "Burada",
-  
+
   // "mydspace.messages.controller-help": "Select this option to send a message to item's submitter.",
   "mydspace.messages.controller-help": "Öğeyi gönderene bir mesaj göndermek için bu seçeneği seçin.",
-  
+
   // "mydspace.messages.description-placeholder": "Insert your message here...",
   "mydspace.messages.description-placeholder": "Mesajınızı buraya ekleyin...",
-  
+
   // "mydspace.messages.hide-msg": "Hide message",
   "mydspace.messages.hide-msg": "Mesajı gizle",
-  
+
   // "mydspace.messages.mark-as-read": "Mark as read",
   "mydspace.messages.mark-as-read": "Okundu olarak işaretle",
-  
+
   // "mydspace.messages.mark-as-unread": "Mark as unread",
   "mydspace.messages.mark-as-unread": "Okunmamış olarak işaretle",
-  
+
   // "mydspace.messages.no-content": "No content.",
   "mydspace.messages.no-content": "İçerik yok.",
-  
+
   // "mydspace.messages.no-messages": "No messages yet.",
   "mydspace.messages.no-messages": "Henüz mesaj yok.",
-  
+
   // "mydspace.messages.send-btn": "Send",
   "mydspace.messages.send-btn": "Gönder",
-  
+
   // "mydspace.messages.show-msg": "Show message",
   "mydspace.messages.show-msg": "Mesajı göster",
-  
+
   // "mydspace.messages.subject-placeholder": "Subject...",
   "mydspace.messages.subject-placeholder": "Konu...",
-  
+
   // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
   "mydspace.messages.submitter-help": "Kontrolöre mesaj göndermek için bu seçeneği seçin.",
-  
+
   // "mydspace.messages.title": "Messages",
   "mydspace.messages.title": "Mesajlar",
-  
+
   // "mydspace.messages.to": "To",
   "mydspace.messages.to": "-e",
-  
+
   // "mydspace.new-submission": "New submission",
   "mydspace.new-submission": "Yeni talep",
-  
+
   // "mydspace.new-submission-external": "Import metadata from external source",
   "mydspace.new-submission-external": "Harici kaynaktan metadataları içe aktar",
-  
+
   // "mydspace.new-submission-external-short": "Import metadata",
   "mydspace.new-submission-external-short": "Metadataları içeri aktar.",
-  
+
   // "mydspace.results.head": "Your submissions",
   "mydspace.results.head": "Gönderimleriniz",
-  
+
   // "mydspace.results.no-abstract": "No Abstract",
   "mydspace.results.no-abstract": "Özet yok",
-  
+
   // "mydspace.results.no-authors": "No Authors",
   "mydspace.results.no-authors": "Yazar yok.",
-  
+
   // "mydspace.results.no-collections": "No Collections",
   "mydspace.results.no-collections": "Koleksiyon yok",
-  
+
   // "mydspace.results.no-date": "No Date",
   "mydspace.results.no-date": "Tarih yok",
-  
+
   // "mydspace.results.no-files": "No Files",
   "mydspace.results.no-files": "Dosya yok",
-  
+
   // "mydspace.results.no-results": "There were no items to show",
   "mydspace.results.no-results": "Gösterilecek öğe yok.",
-  
+
   // "mydspace.results.no-title": "No title",
   "mydspace.results.no-title": "Başlık yok",
-  
+
   // "mydspace.results.no-uri": "No Uri",
   "mydspace.results.no-uri": "Uri yok",
-  
+
   // "mydspace.show.workflow": "All tasks",
   "mydspace.show.workflow": "Tüm görevler",
-  
+
   // "mydspace.show.workspace": "Your Submissions",
   "mydspace.show.workspace": "Gönderimleriniz",
-  
-  // "mydspace.status.archived": "Archived",
-  "mydspace.status.archived": "Arşivlendi",
-  
-  // "mydspace.status.validation": "Validation",
-  "mydspace.status.validation": "Doğrulama",
-  
-  // "mydspace.status.waiting-for-controller": "Waiting for controller",
-  "mydspace.status.waiting-for-controller": "Kontrolör bekleniyor",
-  
-  // "mydspace.status.workflow": "Workflow",
-  "mydspace.status.workflow": "İş akışı",
-  
-  // "mydspace.status.workspace": "Workspace",
-  "mydspace.status.workspace": "Çalışma alanı",
-  
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Arşivlendi",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Doğrulama",
+
+  // "mydspace.status.mydspaceWaitingController": "Waiting for reviewer",
+  "mydspace.status.mydspaceWaitingController": "Kontrolör bekleniyor",
+
+  // "mydspace.status.mydspaceWorkflow": "Workflow",
+  "mydspace.status.mydspaceWorkflow": "İş akışı",
+
+  // "mydspace.status.mydspaceWorkspace": "Workspace",
+  "mydspace.status.mydspaceWorkspace": "Çalışma alanı",
+
   // "mydspace.title": "MyDSpace",
   "mydspace.title": "MyDSpace",
-  
+
   // "mydspace.upload.upload-failed": "Error creating new workspace. Please verify the content uploaded before retry.",
   "mydspace.upload.upload-failed": "Yeni çalışma alanı oluşturulurken hata oluştu. Lütfen yeniden denemeden önce yüklenen içeriği doğrulayın.",
-  
+
   // "mydspace.upload.upload-failed-manyentries": "Unprocessable file. Detected too many entries but allowed only one for file.",
   "mydspace.upload.upload-failed-manyentries": "İşlenemeyen dosya. Çok fazla giriş algılandı fakat dosya için yalnızca bir girişe izin verildi.",
-  
+
   // "mydspace.upload.upload-failed-moreonefile": "Unprocessable request. Only one file is allowed.",
   "mydspace.upload.upload-failed-moreonefile": "İşlenemeyen istek. Yalnızca bir dosyaya izin verilir.",
-  
+
   // "mydspace.upload.upload-multiple-successful": "{{qty}} new workspace items created.",
   "mydspace.upload.upload-multiple-successful": "{{qty}} yeni çalışma alanı öğeleri oluşturuldu.",
-  
+
   // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
   "mydspace.upload.upload-successful": "Yeni çalışma alanı öğesi oluşturuldu. Düzenlemek için {{here}} tıklayın.",
-  
+
   // "mydspace.view-btn": "View",
   "mydspace.view-btn": "Görünüm",
-  
-  
-  
+
+
+
   // "nav.browse.header": "All of DSpace",
   "nav.browse.header": "DSpace'in tümü",
-  
+
   // "nav.community-browse.header": "By Community",
   "nav.community-browse.header": "Komünite tarafından",
-  
+
   // "nav.language": "Language switch",
   "nav.language": "Dil değiştirme",
-  
+
   // "nav.login": "Log In",
   "nav.login": "Giriş yap",
-  
+
   // "nav.logout": "Log Out",
   "nav.logout": "Çıkış yap",
-  
+
   // "nav.mydspace": "MyDSpace",
   "nav.mydspace": "BenimDSpace'im",
-  
+
   // "nav.profile": "Profile",
   "nav.profile": "Profil",
-  
+
   // "nav.search": "Search",
   "nav.search": "Arama",
-  
+
   // "nav.statistics.header": "Statistics",
   "nav.statistics.header": "İstatistik",
-  
+
   // "nav.stop-impersonating": "Stop impersonating EPerson",
   "nav.stop-impersonating": "EPerson'ı taklit etmeyi bırakın",
-  
-  
-  
+
+
+
   // "orgunit.listelement.badge": "Organizational Unit",
   "orgunit.listelement.badge": "Organizasyon Birimi",
-  
+
   // "orgunit.page.city": "City",
   "orgunit.page.city": "Şehir",
-  
+
   // "orgunit.page.country": "Country",
   "orgunit.page.country": "Ülke",
-  
+
   // "orgunit.page.dateestablished": "Date established",
   "orgunit.page.dateestablished": "Kuruluş tarihi",
-  
+
   // "orgunit.page.description": "Description",
   "orgunit.page.description": "Açıklama",
-  
+
   // "orgunit.page.edit": "Edit this item",
   "orgunit.page.edit": "Bu öğeyi düzenle",
-  
+
   // "orgunit.page.id": "ID",
   "orgunit.page.id": "Kimlik",
-  
+
   // "orgunit.page.titleprefix": "Organizational Unit: ",
   "orgunit.page.titleprefix": "Organizasyon Birimi: ",
-  
-  
-  
+
+
+
   // "pagination.results-per-page": "Results Per Page",
   "pagination.results-per-page": "Sayfa başına sonuç",
-  
+
   // "pagination.showing.detail": "{{ range }} of {{ total }}",
   "pagination.showing.detail": "{{ range }} / {{ total }}",
-  
+
   // "pagination.showing.label": "Now showing ",
   "pagination.showing.label": "Şimdi gösteriliyor ",
-  
+
   // "pagination.sort-direction": "Sort Options",
   "pagination.sort-direction": "Sıralama Seçenekleri",
-  
-  
-  
+
+
+
   // "person.listelement.badge": "Person",
   "person.listelement.badge": "Kişi",
-  
+
   // "person.listelement.no-title": "No name found",
   "person.listelement.no-title": "İsim bulunamadı",
-  
+
   // "person.page.birthdate": "Birth Date",
   "person.page.birthdate": "Doğum Tarihi",
-  
+
   // "person.page.edit": "Edit this item",
   "person.page.edit": "Bu öğeyi düzenle",
-  
+
   // "person.page.email": "Email Address",
   "person.page.email": "E-posta Adresi",
-  
+
   // "person.page.firstname": "First Name",
   "person.page.firstname": "Ad",
-  
+
   // "person.page.jobtitle": "Job Title",
   "person.page.jobtitle": "İş Adı",
-  
+
   // "person.page.lastname": "Last Name",
   "person.page.lastname": "Soyad",
-  
+
   // "person.page.link.full": "Show all metadata",
   "person.page.link.full": "Tüm metadata'yı göster",
-  
+
   // "person.page.orcid": "ORCID",
   "person.page.orcid": "ORCID",
-  
+
   // "person.page.staffid": "Staff ID",
   "person.page.staffid": "Personel Kimliği",
-  
+
   // "person.page.titleprefix": "Person: ",
   "person.page.titleprefix": "Kişi: ",
-  
+
   // "person.search.results.head": "Person Search Results",
   "person.search.results.head": "Kişi Arama Sonuçları",
-  
+
   // "person.search.title": "DSpace Angular :: Person Search",
   "person.search.title": "DSpace Angular :: Kişi Arama",
-  
-  
-  
+
+
+
   // "process.new.select-parameters": "Parameters",
   "process.new.select-parameters": "Parametreler",
-  
+
   // "process.new.cancel": "Cancel",
   "process.new.cancel": "İptal etmek",
-  
+
   // "process.new.submit": "Submit",
   "process.new.submit": "Göndermek",
-  
+
   // "process.new.select-script": "Script",
   "process.new.select-script": "Betik",
-  
+
   // "process.new.select-script.placeholder": "Choose a script...",
   "process.new.select-script.placeholder": "Betik Seçiniz...",
-  
+
   // "process.new.select-script.required": "Script is required",
   "process.new.select-script.required": "Betik gerekli",
-  
+
   // "process.new.parameter.file.upload-button": "Select file...",
   "process.new.parameter.file.upload-button": "Dosya seç...",
-  
+
   // "process.new.parameter.file.required": "Please select a file",
   "process.new.parameter.file.required": "Lütfen dosya seçiniz.",
-  
+
   // "process.new.parameter.string.required": "Parameter value is required",
   "process.new.parameter.string.required": "Parametre değeri gerekli",
-  
+
   // "process.new.parameter.type.value": "value",
   "process.new.parameter.type.value": "Değer",
-  
+
   // "process.new.parameter.type.file": "file",
   "process.new.parameter.type.file": "dosya",
-  
+
   // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
   "process.new.parameter.required.missing": "Aşağıdaki parametreler gerekli ancak yine de eksik:",
-  
+
   // "process.new.notification.success.title": "Success",
   "process.new.notification.success.title": "Başarı",
-  
+
   // "process.new.notification.success.content": "The process was successfully created",
   "process.new.notification.success.content": "Süreç başarıyla oluşturuldu",
-  
+
   // "process.new.notification.error.title": "Error",
   "process.new.notification.error.title": "Hata",
-  
+
   // "process.new.notification.error.content": "An error occurred while creating this process",
   "process.new.notification.error.content": "Bu süreç oluşturulurken bir hata oluştu",
-  
+
   // "process.new.header": "Create a new process",
   "process.new.header": "Yeni bir süreç oluştur",
-  
+
   // "process.new.title": "Create a new process",
   "process.new.title": "Yeni bir süreç oluştur",
-  
+
   // "process.new.breadcrumbs": "Create a new process",
   "process.new.breadcrumbs": "Yeni bir süreç oluştur",
-  
-  
-  
+
+
+
   // "process.detail.arguments" : "Arguments",
-  "process.detail.arguments" : "Argümanlar",
-  
+  "process.detail.arguments": "Argümanlar",
+
   // "process.detail.arguments.empty" : "This process doesn't contain any arguments",
-  "process.detail.arguments.empty" : "Bu süreç herhangi bir argüman içermiyor",
-  
+  "process.detail.arguments.empty": "Bu süreç herhangi bir argüman içermiyor",
+
   // "process.detail.back" : "Back",
-  "process.detail.back" : "Geri",
-  
+  "process.detail.back": "Geri",
+
   // "process.detail.output" : "Process Output",
-  "process.detail.output" : "Süreç Çıktısı",
-  
+  "process.detail.output": "Süreç Çıktısı",
+
   // "process.detail.logs.button": "Retrieve process output",
   "process.detail.logs.button": "Süreç çıktısını geri al",
-  
+
   // "process.detail.logs.loading": "Retrieving",
   "process.detail.logs.loading": "Geri almak",
-  
+
   // "process.detail.logs.none": "This process has no output",
   "process.detail.logs.none": "Bu sürecin çıktısı yok",
-  
+
   // "process.detail.output-files" : "Output Files",
-  "process.detail.output-files" : "Çıktı dosyaları",
-  
+  "process.detail.output-files": "Çıktı dosyaları",
+
   // "process.detail.output-files.empty" : "This process doesn't contain any output files",
-  "process.detail.output-files.empty" : "Bu süreç herhangi bir çıktı dosyası içermiyor",
-  
+  "process.detail.output-files.empty": "Bu süreç herhangi bir çıktı dosyası içermiyor",
+
   // "process.detail.script" : "Script",
-  "process.detail.script" : "Betik",
-  
+  "process.detail.script": "Betik",
+
   // "process.detail.title" : "Process: {{ id }} - {{ name }}",
-  "process.detail.title" : "Süreç: {{ id }} - {{ name }}",
-  
+  "process.detail.title": "Süreç: {{ id }} - {{ name }}",
+
   // "process.detail.start-time" : "Start time",
-  "process.detail.start-time" : "Başlangıç saati",
-  
+  "process.detail.start-time": "Başlangıç saati",
+
   // "process.detail.end-time" : "Finish time",
-  "process.detail.end-time" : "Bitiş zamanı",
-  
+  "process.detail.end-time": "Bitiş zamanı",
+
   // "process.detail.status" : "Status",
-  "process.detail.status" : "Durum",
-  
+  "process.detail.status": "Durum",
+
   // "process.detail.create" : "Create similar process",
-  "process.detail.create" : "Benzer süreç oluştur",
-  
-  
-  
+  "process.detail.create": "Benzer süreç oluştur",
+
+
+
   // "process.overview.table.finish" : "Finish time",
-  "process.overview.table.finish" : "Bitiş zamanı",
-  
+  "process.overview.table.finish": "Bitiş zamanı",
+
   // "process.overview.table.id" : "Process ID",
-  "process.overview.table.id" : "Süreç kimliği",
-  
+  "process.overview.table.id": "Süreç kimliği",
+
   // "process.overview.table.name" : "Name",
-  "process.overview.table.name" : "Ad",
-  
+  "process.overview.table.name": "Ad",
+
   // "process.overview.table.start" : "Start time",
-  "process.overview.table.start" : "Başlangıç zamanı",
-  
+  "process.overview.table.start": "Başlangıç zamanı",
+
   // "process.overview.table.status" : "Status",
-  "process.overview.table.status" : "Durum",
-  
+  "process.overview.table.status": "Durum",
+
   // "process.overview.table.user" : "User",
-  "process.overview.table.user" : "Kullanıcı",
-  
+  "process.overview.table.user": "Kullanıcı",
+
   // "process.overview.title": "Processes Overview",
   "process.overview.title": "Süreçlere Genel Bakış",
-  
+
   // "process.overview.breadcrumbs": "Processes Overview",
   "process.overview.breadcrumbs": "Süreçlere Genel Bakış",
-  
+
   // "process.overview.new": "New",
   "process.overview.new": "Yeni",
-  
-  
+
+
   // "profile.breadcrumbs": "Update Profile",
   "profile.breadcrumbs": "Profili Güncelle",
-  
+
   // "profile.card.identify": "Identify",
   "profile.card.identify": "Kimlik",
-  
+
   // "profile.card.security": "Security",
   "profile.card.security": "Güvenlik",
-  
+
   // "profile.form.submit": "Update Profile",
   "profile.form.submit": "Profili Güncelle",
-  
+
   // "profile.groups.head": "Authorization groups you belong to",
   "profile.groups.head": "Ait olduğunuz yetkilendirme grupları",
-  
+
   // "profile.head": "Update Profile",
   "profile.head": "Profili Güncelle",
-  
+
   // "profile.metadata.form.error.firstname.required": "First Name is required",
   "profile.metadata.form.error.firstname.required": "Ad gereklidir",
-  
+
   // "profile.metadata.form.error.lastname.required": "Last Name is required",
   "profile.metadata.form.error.lastname.required": "Soyadı gerekli",
-  
+
   // "profile.metadata.form.label.email": "Email Address",
   "profile.metadata.form.label.email": "E-posta Adresi",
-  
+
   // "profile.metadata.form.label.firstname": "First Name",
   "profile.metadata.form.label.firstname": "Ad",
-  
+
   // "profile.metadata.form.label.language": "Language",
   "profile.metadata.form.label.language": "Dil",
-  
+
   // "profile.metadata.form.label.lastname": "Last Name",
   "profile.metadata.form.label.lastname": "Soyadı",
-  
+
   // "profile.metadata.form.label.phone": "Contact Telephone",
   "profile.metadata.form.label.phone": "İletişim telefonu",
-  
+
   // "profile.metadata.form.notifications.success.content": "Your changes to the profile were saved.",
   "profile.metadata.form.notifications.success.content": "Profilde yaptığınız değişiklikler kaydedildi.",
-  
+
   // "profile.metadata.form.notifications.success.title": "Profile saved",
   "profile.metadata.form.notifications.success.title": "Profil kaydedildi",
-  
+
   // "profile.notifications.warning.no-changes.content": "No changes were made to the Profile.",
   "profile.notifications.warning.no-changes.content": "Profilde herhangi bir değişiklik yapılmadı.",
-  
+
   // "profile.notifications.warning.no-changes.title": "No changes",
   "profile.notifications.warning.no-changes.title": "Değişiklik yok",
-  
+
   // "profile.security.form.error.matching-passwords": "The passwords do not match.",
   "profile.security.form.error.matching-passwords": "Parolalar eşleşmiyor.",
-  
+
   // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
   "profile.security.form.error.password-length": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
+
   // "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": "İsteğe bağlı olarak aşağıdaki kutucuğa yeni bir parola girebilir ve ikinci kutucuğa tekrar yazarak onaylayabilirsiniz. En az altı karakter uzunluğunda olmalıdır.",
-  
+
   // "profile.security.form.label.password": "Password",
   "profile.security.form.label.password": "Parola",
-  
+
   // "profile.security.form.label.passwordrepeat": "Retype to confirm",
   "profile.security.form.label.passwordrepeat": "Doğrulamak için yeniden yazınız",
-  
+
   // "profile.security.form.notifications.success.content": "Your changes to the password were saved.",
   "profile.security.form.notifications.success.content": "Parola değişiklikleriniz kaydedildi.",
-  
+
   // "profile.security.form.notifications.success.title": "Password saved",
   "profile.security.form.notifications.success.title": "Parola kaydedildi",
-  
+
   // "profile.security.form.notifications.error.title": "Error changing passwords",
   "profile.security.form.notifications.error.title": "Parolalar değiştirilirken hata oluştu",
-  
+
   // "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": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
+
   // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
   "profile.security.form.notifications.error.not-same": "Sağlanan parolalar aynı değil.",
-  
+
   // "profile.title": "Update Profile",
   "profile.title": "Profili Güncelle",
-  
-  
-  
+
+
+
   // "project.listelement.badge": "Research Project",
   "project.listelement.badge": "Araştırma projesi",
-  
+
   // "project.page.contributor": "Contributors",
   "project.page.contributor": "Katkıda Bulunanlar",
-  
+
   // "project.page.description": "Description",
   "project.page.description": "Açıklama",
-  
+
   // "project.page.edit": "Edit this item",
   "project.page.edit": "Bu öğeyi düzenle",
-  
+
   // "project.page.expectedcompletion": "Expected Completion",
   "project.page.expectedcompletion": "Beklenen Tamamlanma",
-  
+
   // "project.page.funder": "Funders",
   "project.page.funder": "Fon Sağlayıcılar",
-  
+
   // "project.page.id": "ID",
   "project.page.id": "Kimlik",
-  
+
   // "project.page.keyword": "Keywords",
   "project.page.keyword": "Anahtar kelimeler",
-  
+
   // "project.page.status": "Status",
   "project.page.status": "Durum",
-  
+
   // "project.page.titleprefix": "Research Project: ",
   "project.page.titleprefix": "Araştırma Projesi: ",
-  
+
   // "project.search.results.head": "Project Search Results",
   "project.search.results.head": "Proje Arama Sonuçları",
-  
-  
-  
+
+
+
   // "publication.listelement.badge": "Publication",
   "publication.listelement.badge": "Yayın",
-  
+
   // "publication.page.description": "Description",
   "publication.page.description": "Açıklama",
-  
+
   // "publication.page.edit": "Edit this item",
   "publication.page.edit": "Bu öğeyi düzenle",
-  
+
   // "publication.page.journal-issn": "Journal ISSN",
   "publication.page.journal-issn": "Dergi ISSN",
-  
+
   // "publication.page.journal-title": "Journal Title",
   "publication.page.journal-title": "Dergi Başlığı",
-  
+
   // "publication.page.publisher": "Publisher",
   "publication.page.publisher": "Yayımcı",
-  
+
   // "publication.page.titleprefix": "Publication: ",
   "publication.page.titleprefix": "Yayın: ",
-  
+
   // "publication.page.volume-title": "Volume Title",
   "publication.page.volume-title": "Cilt Başlığı",
-  
+
   // "publication.search.results.head": "Publication Search Results",
   "publication.search.results.head": "Yayın Arama Sonuçları",
-  
+
   // "publication.search.title": "DSpace Angular :: Publication Search",
   "publication.search.title": "DSpace Angular :: Yayın Arama",
-  
-  
+
+
   // "register-email.title": "New user registration",
   "register-email.title": "Yeni kullanıcı kaydı",
-  
+
   // "register-page.create-profile.header": "Create Profile",
   "register-page.create-profile.header": "Profil oluştur",
-  
+
   // "register-page.create-profile.identification.header": "Identify",
   "register-page.create-profile.identification.header": "Tanımlamak",
-  
+
   // "register-page.create-profile.identification.email": "Email Address",
   "register-page.create-profile.identification.email": "E-posta Adresi",
-  
+
   // "register-page.create-profile.identification.first-name": "First Name *",
   "register-page.create-profile.identification.first-name": "Ad *",
-  
+
   // "register-page.create-profile.identification.first-name.error": "Please fill in a First Name",
   "register-page.create-profile.identification.first-name.error": "Lütfen bir ad girin",
-  
+
   // "register-page.create-profile.identification.last-name": "Last Name *",
   "register-page.create-profile.identification.last-name": "Soyadı *",
-  
+
   // "register-page.create-profile.identification.last-name.error": "Please fill in a Last Name",
   "register-page.create-profile.identification.last-name.error": "Lütfen bir soyadı girin",
-  
+
   // "register-page.create-profile.identification.contact": "Contact Telephone",
   "register-page.create-profile.identification.contact": "İletişim telefonu",
-  
+
   // "register-page.create-profile.identification.language": "Language",
   "register-page.create-profile.identification.language": "Dil",
-  
+
   // "register-page.create-profile.security.header": "Security",
   "register-page.create-profile.security.header": "Güvenlik",
-  
+
   // "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": "Lütfen aşağıdaki kutuya bir parola girin ve ikinci kutuya tekrar yazarak onaylayın. En az altı karakter uzunluğunda olmalıdır.",
-  
+
   // "register-page.create-profile.security.label.password": "Password *",
   "register-page.create-profile.security.label.password": "Parola *",
-  
+
   // "register-page.create-profile.security.label.passwordrepeat": "Retype to confirm *",
   "register-page.create-profile.security.label.passwordrepeat": "Doğrulamak için yeniden yazınız *",
-  
+
   // "register-page.create-profile.security.error.empty-password": "Please enter a password in the box below.",
   "register-page.create-profile.security.error.empty-password": "Lütfen aşağıdaki kutuya bir parola girin.",
-  
+
   // "register-page.create-profile.security.error.matching-passwords": "The passwords do not match.",
   "register-page.create-profile.security.error.matching-passwords": "Parolalar eşleşmiyor.",
-  
+
   // "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": "Parola en az 6 karakter uzunluğunda olmalıdır.",
-  
+
   // "register-page.create-profile.submit": "Complete Registration",
   "register-page.create-profile.submit": "Kaydı Tamamla",
-  
+
   // "register-page.create-profile.submit.error.content": "Something went wrong while registering a new user.",
   "register-page.create-profile.submit.error.content": "Yeni bir kullanıcı kaydedilirken bir şeyler ters gitti.",
-  
+
   // "register-page.create-profile.submit.error.head": "Registration failed",
   "register-page.create-profile.submit.error.head": "Kayıt başarısız",
-  
+
   // "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": "Kayıt başarıyla tamamlandı. Oluşturulan kullanıcı olarak giriş yaptınız",
-  
+
   // "register-page.create-profile.submit.success.head": "Registration completed",
   "register-page.create-profile.submit.success.head": "Kayıt tamamlandı",
-  
-  
+
+
   // "register-page.registration.header": "New user registration",
   "register-page.registration.header": "Yeni kullanıcı kaydı",
-  
+
   // "register-page.registration.info": "Register an account to subscribe to collections for email updates, and submit new items to DSpace.",
   "register-page.registration.info": "E-mail güncellemeleri için koleksiyonlara abone olup hesap açın. Ve DSapce’e yeni öğeler kaydetin.",
-  
+
   // "register-page.registration.email": "Email Address *",
   "register-page.registration.email": "E-posta Adresi *",
-  
+
   // "register-page.registration.email.error.required": "Please fill in an email address",
   "register-page.registration.email.error.required": "Lütfen bir e-posta adresi girin",
-  
+
   // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
   "register-page.registration.email.error.pattern": "Lütfen geçerli bir email adresi girin",
-  
+
   // "register-page.registration.email.hint": "This address will be verified and used as your login name.",
   "register-page.registration.email.hint": "Bu adres doğrulanacak ve oturum açma adınız olarak kullanılacaktır.",
-  
+
   // "register-page.registration.submit": "Register",
   "register-page.registration.submit": "Kayıt olmak",
-  
+
   // "register-page.registration.success.head": "Verification email sent",
   "register-page.registration.success.head": "Doğrulama e-postası gönderildi",
-  
+
   // "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 }} adresine özel bir URL ve daha fazla talimat içeren bir e-posta gönderildi.",
-  
+
   // "register-page.registration.error.head": "Error when trying to register email",
   "register-page.registration.error.head": "E-posta kaydetmeye çalışırken hata",
-  
+
   // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
   "register-page.registration.error.content": "Aşağıdaki e-posta adresi kaydedilirken bir hata oluştu: {{ email }}",
-  
-  
-  
+
+
+
   // "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": "İki öğe arasında {{ type }} ilişki türü için uygun bir eşleşme bulunamadı",
-  
+
   // "relationships.add.error.server.content": "The server returned an error",
   "relationships.add.error.server.content": "Sunucu bir hata verdi",
-  
+
   // "relationships.add.error.title": "Unable to add relationship",
   "relationships.add.error.title": "İlişki eklenemedi",
-  
+
   // "relationships.isAuthorOf": "Authors",
   "relationships.isAuthorOf": "Yazarlar",
-  
+
   // "relationships.isAuthorOf.Person": "Authors (persons)",
   "relationships.isAuthorOf.Person": "Yazarlar (kişiler)",
-  
+
   // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
   "relationships.isAuthorOf.OrgUnit": "Yazarlar (organizasyon birimleri)",
-  
+
   // "relationships.isIssueOf": "Journal Issues",
   "relationships.isIssueOf": "Dergi Sayıları",
-  
+
   // "relationships.isJournalIssueOf": "Journal Issue",
   "relationships.isJournalIssueOf": "Dergi Sayısı",
-  
+
   // "relationships.isJournalOf": "Journals",
   "relationships.isJournalOf": "Dergiler",
-  
+
   // "relationships.isOrgUnitOf": "Organizational Units",
   "relationships.isOrgUnitOf": "Organizasyon Birimleri",
-  
+
   // "relationships.isPersonOf": "Authors",
   "relationships.isPersonOf": "Yazarlar",
-  
+
   // "relationships.isProjectOf": "Research Projects",
   "relationships.isProjectOf": "Araştırma Projeleri",
-  
+
   // "relationships.isPublicationOf": "Publications",
   "relationships.isPublicationOf": "Yayınlar",
-  
+
   // "relationships.isPublicationOfJournalIssue": "Articles",
   "relationships.isPublicationOfJournalIssue": "Makaleler",
-  
+
   // "relationships.isSingleJournalOf": "Journal",
   "relationships.isSingleJournalOf": "Dergi",
-  
+
   // "relationships.isSingleVolumeOf": "Journal Volume",
   "relationships.isSingleVolumeOf": "Dergi Cilti",
-  
+
   // "relationships.isVolumeOf": "Journal Volumes",
   "relationships.isVolumeOf": "Dergi Ciltleri",
-  
+
   // "relationships.isContributorOf": "Contributors",
   "relationships.isContributorOf": "Katkıda Bulunanlar",
-  
-  
-  
+
+
+
   // "resource-policies.add.button": "Add",
   "resource-policies.add.button": "Ekle",
-  
+
   // "resource-policies.add.for.": "Add a new policy",
   "resource-policies.add.for.": "Yeni bir politika ekle",
-  
+
   // "resource-policies.add.for.bitstream": "Add a new Bitstream policy",
   "resource-policies.add.for.bitstream": "Yeni bir Bitstream ilkesi ekleyin",
-  
+
   // "resource-policies.add.for.bundle": "Add a new Bundle policy",
   "resource-policies.add.for.bundle": "Yeni bir Bundle ilkesi ekleyin",
-  
+
   // "resource-policies.add.for.item": "Add a new Item policy",
   "resource-policies.add.for.item": "Yeni bir öğe ilkesi ekleyin",
-  
+
   // "resource-policies.add.for.community": "Add a new Community policy",
   "resource-policies.add.for.community": "Yeni bir Komünite politikası ekle",
-  
+
   // "resource-policies.add.for.collection": "Add a new Collection policy",
   "resource-policies.add.for.collection": "Yeni bir Koleksiyon politikası ekle",
-  
+
   // "resource-policies.create.page.heading": "Create new resource policy for ",
   "resource-policies.create.page.heading": "Şunun için yeni kaynak ilkesi oluşturun: ",
-  
+
   // "resource-policies.create.page.failure.content": "An error occurred while creating the resource policy.",
   "resource-policies.create.page.failure.content": "Kaynak ilkesi oluşturulurken bir hata oluştu.",
-  
+
   // "resource-policies.create.page.success.content": "Operation successful",
   "resource-policies.create.page.success.content": "Operasyon başarılı",
-  
+
   // "resource-policies.create.page.title": "Create new resource policy",
   "resource-policies.create.page.title": "Yeni kaynak politikası oluştur",
-  
+
   // "resource-policies.delete.btn": "Delete selected",
   "resource-policies.delete.btn": "Seçileni sil",
-  
+
   // "resource-policies.delete.btn.title": "Delete selected resource policies",
   "resource-policies.delete.btn.title": "Seçili kaynak politikalarını sil",
-  
+
   // "resource-policies.delete.failure.content": "An error occurred while deleting selected resource policies.",
   "resource-policies.delete.failure.content": "Seçili kaynak ilkeleri silinirken bir hata oluştu.",
-  
+
   // "resource-policies.delete.success.content": "Operation successful",
   "resource-policies.delete.success.content": "İşlem başarılı",
-  
+
   // "resource-policies.edit.page.heading": "Edit resource policy ",
   "resource-policies.edit.page.heading": "Kaynak politikasını düzenle ",
-  
+
   // "resource-policies.edit.page.failure.content": "An error occurred while editing the resource policy.",
   "resource-policies.edit.page.failure.content": "Kaynak ilkesi düzenlenirken bir hata oluştu.",
-  
+
   // "resource-policies.edit.page.success.content": "Operation successful",
   "resource-policies.edit.page.success.content": "İşlem başarılı",
-  
+
   // "resource-policies.edit.page.title": "Edit resource policy",
   "resource-policies.edit.page.title": "Kaynak politikasını düzenle",
-  
+
   // "resource-policies.form.action-type.label": "Select the action type",
   "resource-policies.form.action-type.label": "Eylem türünü seçin",
-  
+
   // "resource-policies.form.action-type.required": "You must select the resource policy action.",
   "resource-policies.form.action-type.required": "Kaynak ilkesi eylemini seçmelisiniz.",
-  
+
   // "resource-policies.form.eperson-group-list.label": "The eperson or group that will be granted the permission",
   "resource-policies.form.eperson-group-list.label": "İzin verilecek e-kişi veya grup",
-  
+
   // "resource-policies.form.eperson-group-list.select.btn": "Select",
   "resource-policies.form.eperson-group-list.select.btn": "Seç",
-  
+
   // "resource-policies.form.eperson-group-list.tab.eperson": "Search for a ePerson",
   "resource-policies.form.eperson-group-list.tab.eperson": "e-kişi arayın",
-  
+
   // "resource-policies.form.eperson-group-list.tab.group": "Search for a group",
   "resource-policies.form.eperson-group-list.tab.group": "Grup arayın",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.action": "Action",
   "resource-policies.form.eperson-group-list.table.headers.action": "Eylem",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.id": "ID",
   "resource-policies.form.eperson-group-list.table.headers.id": "Kimlik",
-  
+
   // "resource-policies.form.eperson-group-list.table.headers.name": "Name",
   "resource-policies.form.eperson-group-list.table.headers.name": "Ad",
-  
+
   // "resource-policies.form.date.end.label": "End Date",
   "resource-policies.form.date.end.label": "Bitiş Tarihi",
-  
+
   // "resource-policies.form.date.start.label": "Start Date",
   "resource-policies.form.date.start.label": "Başlangıç tarihi",
-  
+
   // "resource-policies.form.description.label": "Description",
   "resource-policies.form.description.label": "Açıklama",
-  
+
   // "resource-policies.form.name.label": "Name",
   "resource-policies.form.name.label": "Ad",
-  
+
   // "resource-policies.form.policy-type.label": "Select the policy type",
   "resource-policies.form.policy-type.label": "Politika türünü seçin",
-  
+
   // "resource-policies.form.policy-type.required": "You must select the resource policy type.",
   "resource-policies.form.policy-type.required": "Kaynak ilkesi türünü seçmelisiniz.",
-  
+
   // "resource-policies.table.headers.action": "Action",
   "resource-policies.table.headers.action": "Eylem",
-  
+
   // "resource-policies.table.headers.date.end": "End Date",
   "resource-policies.table.headers.date.end": "Bitiş tarihi",
-  
+
   // "resource-policies.table.headers.date.start": "Start Date",
   "resource-policies.table.headers.date.start": "Başlangıç Tarihi",
-  
+
   // "resource-policies.table.headers.edit": "Edit",
   "resource-policies.table.headers.edit": "Düzenle",
-  
+
   // "resource-policies.table.headers.edit.group": "Edit group",
   "resource-policies.table.headers.edit.group": "Grubu düzenle",
-  
+
   // "resource-policies.table.headers.edit.policy": "Edit policy",
   "resource-policies.table.headers.edit.policy": "Politikayı düzenle",
-  
+
   // "resource-policies.table.headers.eperson": "E-kişi",
   "resource-policies.table.headers.eperson": "E-kişi",
-  
+
   // "resource-policies.table.headers.group": "Grup",
   "resource-policies.table.headers.group": "Grup",
-  
+
   // "resource-policies.table.headers.id": "ID",
   "resource-policies.table.headers.id": "Kimlik",
-  
+
   // "resource-policies.table.headers.name": "Name",
   "resource-policies.table.headers.name": "Ad",
-  
+
   // "resource-policies.table.headers.policyType": "type",
   "resource-policies.table.headers.policyType": "tür",
-  
+
   // "resource-policies.table.headers.title.for.bitstream": "Policies for Bitstream",
   "resource-policies.table.headers.title.for.bitstream": "BitStream Politikaları",
-  
+
   // "resource-policies.table.headers.title.for.bundle": "Policies for Bundle",
   "resource-policies.table.headers.title.for.bundle": "Bundle Politikaları",
-  
+
   // "resource-policies.table.headers.title.for.item": "Policies for Item",
   "resource-policies.table.headers.title.for.item": "Öğe Politikaları",
-  
+
   // "resource-policies.table.headers.title.for.community": "Policies for Community",
   "resource-policies.table.headers.title.for.community": "Komünite Politikaları",
-  
+
   // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
   "resource-policies.table.headers.title.for.collection": "Koleksiyon Politikaları",
-  
-  
-  
+
+
+
   // "search.description": "",
   "search.description": "",
-  
+
   // "search.switch-configuration.title": "Show",
   "search.switch-configuration.title": "Göster",
-  
+
   // "search.title": "DSpace Angular :: Search",
   "search.title": "DSpace Angular :: Ara",
-  
+
   // "search.breadcrumbs": "Search",
   "search.breadcrumbs": "Ara",
-  
-  
+
+
   // "search.filters.applied.f.author": "Author",
   "search.filters.applied.f.author": "Yazar",
-  
+
   // "search.filters.applied.f.dateIssued.max": "End date",
   "search.filters.applied.f.dateIssued.max": "Bitiş tarihi",
-  
+
   // "search.filters.applied.f.dateIssued.min": "Start date",
   "search.filters.applied.f.dateIssued.min": "Başlangıç Tarihi",
-  
+
   // "search.filters.applied.f.dateSubmitted": "Date submitted",
   "search.filters.applied.f.dateSubmitted": "Gönderilme tarihi",
-  
+
   // "search.filters.applied.f.discoverable": "Private",
   "search.filters.applied.f.discoverable": "Özel",
-  
+
   // "search.filters.applied.f.entityType": "Item Type",
   "search.filters.applied.f.entityType": "Öğe Türü",
-  
+
   // "search.filters.applied.f.has_content_in_original_bundle": "Has files",
   "search.filters.applied.f.has_content_in_original_bundle": "Has dosyaları",
-  
+
   // "search.filters.applied.f.itemtype": "Type",
   "search.filters.applied.f.itemtype": "Tür",
-  
+
   // "search.filters.applied.f.namedresourcetype": "Status",
   "search.filters.applied.f.namedresourcetype": "Durum",
-  
+
   // "search.filters.applied.f.subject": "Subject",
   "search.filters.applied.f.subject": "Konu",
-  
+
   // "search.filters.applied.f.submitter": "Submitter",
   "search.filters.applied.f.submitter": "Gönderen",
-  
+
   // "search.filters.applied.f.jobTitle": "Job Title",
   "search.filters.applied.f.jobTitle": "İş Adı",
-  
+
   // "search.filters.applied.f.birthDate.max": "End birth date",
   "search.filters.applied.f.birthDate.max": "Doğum Tarih Sonu",
-  
+
   // "search.filters.applied.f.birthDate.min": "Start birth date",
   "search.filters.applied.f.birthDate.min": "Doğum Tarih Başlangıcı",
-  
+
   // "search.filters.applied.f.withdrawn": "Withdrawn",
   "search.filters.applied.f.withdrawn": "Geri çekildi",
-  
-  
-  
+
+
+
   // "search.filters.filter.author.head": "Author",
   "search.filters.filter.author.head": "Yazar",
-  
+
   // "search.filters.filter.author.placeholder": "Author name",
   "search.filters.filter.author.placeholder": "Yazar adı",
-  
+
   // "search.filters.filter.birthDate.head": "Birth Date",
   "search.filters.filter.birthDate.head": "Doğum Tarihi",
-  
+
   // "search.filters.filter.birthDate.placeholder": "Birth Date",
   "search.filters.filter.birthDate.placeholder": "Doğum Tarihi",
-  
+
   // "search.filters.filter.creativeDatePublished.head": "Date Published",
   "search.filters.filter.creativeDatePublished.head": "Yayınlanma Tarihi",
-  
+
   // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
   "search.filters.filter.creativeDatePublished.placeholder": "Yayınlanma Tarihi",
-  
+
   // "search.filters.filter.creativeWorkEditor.head": "Editor",
   "search.filters.filter.creativeWorkEditor.head": "Editör",
-  
+
   // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
   "search.filters.filter.creativeWorkEditor.placeholder": "Editör",
-  
+
   // "search.filters.filter.creativeWorkKeywords.head": "Subject",
   "search.filters.filter.creativeWorkKeywords.head": "Konu",
-  
+
   // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
   "search.filters.filter.creativeWorkKeywords.placeholder": "Konu",
-  
+
   // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
   "search.filters.filter.creativeWorkPublisher.head": "Yayımcı",
-  
+
   // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
   "search.filters.filter.creativeWorkPublisher.placeholder": "Yayımcı",
-  
+
   // "search.filters.filter.dateIssued.head": "Date",
   "search.filters.filter.dateIssued.head": "Tarih",
 
   // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
   "search.filters.filter.dateIssued.max.placeholder": "En Erken Tarih",
-  
+
   // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
   "search.filters.filter.dateIssued.min.placeholder": "En Geç Tarih",
-  
+
   // "search.filters.filter.dateSubmitted.head": "Date submitted",
   "search.filters.filter.dateSubmitted.head": "Teslim Edilen Tarih",
-  
+
   // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
   "search.filters.filter.dateSubmitted.placeholder": "Teslim Edilen Tarih",
-  
+
   // "search.filters.filter.discoverable.head": "Private",
   "search.filters.filter.discoverable.head": "Özel",
-  
+
   // "search.filters.filter.withdrawn.head": "Withdrawn",
   "search.filters.filter.withdrawn.head": "Alınmış",
-  
+
   // "search.filters.filter.entityType.head": "Item Type",
   "search.filters.filter.entityType.head": "Materyal Türü",
-  
+
   // "search.filters.filter.entityType.placeholder": "Item Type",
   "search.filters.filter.entityType.placeholder": "Materyal Türü",
-  
+
   // "search.filters.filter.has_content_in_original_bundle.head": "Has files",
   "search.filters.filter.has_content_in_original_bundle.head": "Dosyalara Sahip",
-  
+
   // "search.filters.filter.itemtype.head": "Type",
   "search.filters.filter.itemtype.head": "Tür",
-  
+
   // "search.filters.filter.itemtype.placeholder": "Type",
   "search.filters.filter.itemtype.placeholder": "Tür",
-  
+
   // "search.filters.filter.jobTitle.head": "Job Title",
   "search.filters.filter.jobTitle.head": "İş Ünvanı",
-  
+
   // "search.filters.filter.jobTitle.placeholder": "Job Title",
   "search.filters.filter.jobTitle.placeholder": "İş Ünvanı",
-  
+
   // "search.filters.filter.knowsLanguage.head": "Known language",
   "search.filters.filter.knowsLanguage.head": "Bilinen Diller",
-  
+
   // "search.filters.filter.knowsLanguage.placeholder": "Known language",
   "search.filters.filter.knowsLanguage.placeholder": "Bilinen Diller",
-  
+
   // "search.filters.filter.namedresourcetype.head": "Status",
   "search.filters.filter.namedresourcetype.head": "Durum",
-  
+
   // "search.filters.filter.namedresourcetype.placeholder": "Status",
   "search.filters.filter.namedresourcetype.placeholder": "Durum",
-  
+
   // "search.filters.filter.objectpeople.head": "People",
   "search.filters.filter.objectpeople.head": "İnsanlar",
-  
+
   // "search.filters.filter.objectpeople.placeholder": "People",
   "search.filters.filter.objectpeople.placeholder": "İnsanlar",
-  
+
   // "search.filters.filter.organizationAddressCountry.head": "Country",
   "search.filters.filter.organizationAddressCountry.head": "Ülke",
-  
+
   // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
   "search.filters.filter.organizationAddressCountry.placeholder": "Ülke",
-  
+
   // "search.filters.filter.organizationAddressLocality.head": "City",
   "search.filters.filter.organizationAddressLocality.head": "Şehir",
-  
+
   // "search.filters.filter.organizationAddressLocality.placeholder": "City",
   "search.filters.filter.organizationAddressLocality.placeholder": "Şehir",
-  
+
   // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
   "search.filters.filter.organizationFoundingDate.head": "Bulunduğu Tarih",
-  
+
   // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
   "search.filters.filter.organizationFoundingDate.placeholder": "Bulunduğu Tarih",
-  
+
   // "search.filters.filter.scope.head": "Scope",
   "search.filters.filter.scope.head": "Kapsam",
-  
+
   // "search.filters.filter.scope.placeholder": "Scope filter",
   "search.filters.filter.scope.placeholder": "Kapsam Filtresi",
-  
+
   // "search.filters.filter.show-less": "Collapse",
   "search.filters.filter.show-less": "Yığılmış",
-  
+
   // "search.filters.filter.show-more": "Show more",
   "search.filters.filter.show-more": "Daha Fazla Göster",
-  
+
   // "search.filters.filter.subject.head": "Subject",
   "search.filters.filter.subject.head": "Konu",
-  
+
   // "search.filters.filter.subject.placeholder": "Subject",
   "search.filters.filter.subject.placeholder": "Konu",
-  
+
   // "search.filters.filter.submitter.head": "Submitter",
   "search.filters.filter.submitter.head": "Teslim Eden",
-  
+
   // "search.filters.filter.submitter.placeholder": "Submitter",
   "search.filters.filter.submitter.placeholder": "Teslim Eden",
-  
-  
-  
+
+
+
   // "search.filters.entityType.JournalIssue": "Journal Issue",
   "search.filters.entityType.JournalIssue": "Makale Konusu",
-  
+
   // "search.filters.entityType.JournalVolume": "Journal Volume",
   "search.filters.entityType.JournalVolume": "Cilt Sayısı",
-  
+
   // "search.filters.entityType.OrgUnit": "Organizational Unit",
   "search.filters.entityType.OrgUnit": "Ait Olduğu Organizasyon",
-  
+
   // "search.filters.has_content_in_original_bundle.true": "Yes",
   "search.filters.has_content_in_original_bundle.true": "Evet",
-  
+
   // "search.filters.has_content_in_original_bundle.false": "No",
   "search.filters.has_content_in_original_bundle.false": "Hayır",
-  
+
   // "search.filters.discoverable.true": "No",
   "search.filters.discoverable.true": "Hayır",
-  
+
   // "search.filters.discoverable.false": "Yes",
   "search.filters.discoverable.false": "Evet",
-  
+
   // "search.filters.withdrawn.true": "Yes",
   "search.filters.withdrawn.true": "Evet",
-  
+
   // "search.filters.withdrawn.false": "No",
   "search.filters.withdrawn.false": "Hayır",
-  
-  
+
+
   // "search.filters.head": "Filters",
   "search.filters.head": "Filtreler",
-  
+
   // "search.filters.reset": "Reset filters",
   "search.filters.reset": "Filtreleri Sıfırla",
-  
-  
-  
+
+
+
   // "search.form.search": "Search",
   "search.form.search": "Ara",
-  
+
   // "search.form.search_dspace": "Search DSpace",
   "search.form.search_dspace": "DSpace içinde Ara",
-  
+
   // "search.form.search_mydspace": "Search MyDSpace",
   "search.form.search_mydspace": "MyDSpace içinde Ara",
-  
-  
-  
+
+
+
   // "search.results.head": "Search Results",
   "search.results.head": "Sonuçları Ara",
-  
+
   // "search.results.no-results": "Your search returned no results. Having trouble finding what you're looking for? Try putting",
   "search.results.no-results": "Aramanız hiçbir sonuç vermedi. Aradığınızı bulmakta sorun mu yaşıyorsunuz? Bir daha deneyin.",
-  
+
   // "search.results.no-results-link": "quotes around it",
   "search.results.no-results-link": "Çevresindeki Alıntılar",
-  
+
   // "search.results.empty": "Your search returned no results.",
   "search.results.empty": "Aramanız hiçbir sonuç vermedi.",
-  
-  
-  
+
+
+
   // "search.sidebar.close": "Back to results",
   "search.sidebar.close": "Sonuçlara Dön",
-  
+
   // "search.sidebar.filters.title": "Filters",
   "search.sidebar.filters.title": "Filtreler",
-  
+
   // "search.sidebar.open": "Search Tools",
   "search.sidebar.open": "Araç Gereç Ara",
-  
+
   // "search.sidebar.results": "results",
   "search.sidebar.results": "Sonuçlar",
-  
+
   // "search.sidebar.settings.rpp": "Results per page",
   "search.sidebar.settings.rpp": "Sayfa Sonuçları",
-  
+
   // "search.sidebar.settings.sort-by": "Sort By",
   "search.sidebar.settings.sort-by": "Göre Sıralanmış",
-  
+
   // "search.sidebar.settings.title": "Settings",
   "search.sidebar.settings.title": "Ayarlar",
-  
-  
-  
+
+
+
   // "search.view-switch.show-detail": "Show detail",
   "search.view-switch.show-detail": "Detayları Göster",
-  
+
   // "search.view-switch.show-grid": "Show as grid",
   "search.view-switch.show-grid": "Ağ Dizge Olarak Göster",
-  
+
   // "search.view-switch.show-list": "Show as list",
   "search.view-switch.show-list": "Liste Olarak Göster",
-  
-  
-  
+
+
+
   // "sorting.ASC": "Ascending",
   "sorting.ASC": "Artan",
-  
+
   // "sorting.DESC": "Descending",
   "sorting.DESC": "Azalan",
-  
+
   // "sorting.dc.title.ASC": "Title Ascending",
   "sorting.dc.title.ASC": "Artan Başlıklar",
-  
+
   // "sorting.dc.title.DESC": "Title Descending",
   "sorting.dc.title.DESC": "Azalan Başlıklar",
-  
+
   // "sorting.score.DESC": "Relevance",
   "sorting.score.DESC": "Bağıntılı",
-  
-  
-  
+
+
+
   // "statistics.title": "Statistics",
   "statistics.title": "İstatistikler",
-  
+
   // "statistics.header": "Statistics for {{ scope }}",
   "statistics.header": "{{ scope }} için İstatistikler",
-  
+
   // "statistics.breadcrumbs": "Statistics",
   "statistics.breadcrumbs": "İstatistikler",
-  
+
   // "statistics.page.no-data": "No data available",
   "statistics.page.no-data": "Data Bulunamadı.",
-  
+
   // "statistics.table.no-data": "No data available",
   "statistics.table.no-data": "Data Bulunamadı.",
-  
+
   // "statistics.table.title.TotalVisits": "Total visits",
   "statistics.table.title.TotalVisits": "Toplam Ziyaretler",
-  
+
   // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
   "statistics.table.title.TotalVisitsPerMonth": "Aylık Toplam Ziyaretler",
-  
+
   // "statistics.table.title.TotalDownloads": "File Visits",
   "statistics.table.title.TotalDownloads": "Dosya Ziyaretleri",
-  
+
   // "statistics.table.title.TopCountries": "Top country views",
   "statistics.table.title.TopCountries": "En Çok Gösterilen Ülke",
-  
+
   // "statistics.table.title.TopCities": "Top city views",
   "statistics.table.title.TopCities": "En Çok Gösterilen Şehir",
-  
+
   // "statistics.table.header.views": "Views",
   "statistics.table.header.views": "Gösterilmeler",
-  
-  
-  
+
+
+
   // "submission.edit.title": "Edit Submission",
   "submission.edit.title": "Teslimi Düzenle",
-  
+
   // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
   "submission.general.cannot_submit": "Yeni bir teslim yapamazsınız.",
-  
+
   // "submission.general.deposit": "Deposit",
   "submission.general.deposit": "Tamamla",
-  
+
   // "submission.general.discard.confirm.cancel": "Cancel",
   "submission.general.discard.confirm.cancel": "Vazgeç",
-  
+
   // "submission.general.discard.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.general.discard.confirm.info": "Bu işlem geri alınamaz. Emin misiniz?",
-  
+
   // "submission.general.discard.confirm.submit": "Yes, I'm sure",
   "submission.general.discard.confirm.submit": "Evet eminim",
-  
+
   // "submission.general.discard.confirm.title": "Discard submission",
   "submission.general.discard.confirm.title": "Teslimi İptal Et",
-  
+
   // "submission.general.discard.submit": "Discard",
   "submission.general.discard.submit": "İptal",
-  
+
   // "submission.general.save": "Save",
   "submission.general.save": "Kaydet",
-  
+
   // "submission.general.save-later": "Save for later",
   "submission.general.save-later": "Sonrası İçin Kaydet",
-  
-  
+
+
   // "submission.import-external.page.title": "Import metadata from an external source",
   "submission.import-external.page.title": "Harici bir kaynaktan metadataları içe aktarın",
-  
+
   // "submission.import-external.title": "Import metadata from an external source",
   "submission.import-external.title": "Harici bir kaynaktan metadataları içe aktarın",
-  
+
   // "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": "Web'den DSpace'e içe aktarılacak öğeleri bulmak için yukarıya bir sorgu girin.",
-  
+
   // "submission.import-external.back-to-my-dspace": "Back to MyDSpace",
   "submission.import-external.back-to-my-dspace": "MyDSpace'e Geri Dön",
-  
+
   // "submission.import-external.search.placeholder": "Search the external source",
   "submission.import-external.search.placeholder": "Dış Kaynaktan Ara",
-  
+
   // "submission.import-external.search.button": "Search",
   "submission.import-external.search.button": "Ara",
-  
+
   // "submission.import-external.search.button.hint": "Write some words to search",
   "submission.import-external.search.button.hint": "Aramak için Kelime Girin",
-  
+
   // "submission.import-external.search.source.hint": "Pick an external source",
   "submission.import-external.search.source.hint": "Dış Kaynak Seçin",
-  
+
   // "submission.import-external.source.arxiv": "arXiv",
   "submission.import-external.source.arxiv": "arXiv",
-  
+
   // "submission.import-external.source.loading": "Loading ...",
   "submission.import-external.source.loading": "Yükleniyor ...",
-  
+
   // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
   "submission.import-external.source.sherpaJournal": "SHERPA Journals",
-  
+
   // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
   "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
-  
+
   // "submission.import-external.source.orcid": "ORCID",
   "submission.import-external.source.orcid": "ORCID",
-  
+
   // "submission.import-external.source.pubmed": "Pubmed",
   "submission.import-external.source.pubmed": "Pubmed",
-  
+
   // "submission.import-external.source.lcname": "Library of Congress Names",
   "submission.import-external.source.lcname": "Kongre İsimleri Kütüphanesi",
-  
+
   // "submission.import-external.preview.title": "Item Preview",
   "submission.import-external.preview.title": "Materyal Önizlenimi",
-  
+
   // "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": "Aşağıdaki metadatalar harici bir kaynaktan içe aktarıldı. Gönderime başladığınızda önceden doldurulacaktır.",
-  
+
   // "submission.import-external.preview.button.import": "Start submission",
   "submission.import-external.preview.button.import": "Gönderimi Başlat",
-  
+
   // "submission.import-external.preview.error.import.title": "Submission error",
   "submission.import-external.preview.error.import.title": "Gönderim Sırasında Hata",
-  
+
   // "submission.import-external.preview.error.import.body": "An error occurs during the external source entry import process.",
   "submission.import-external.preview.error.import.body": "Dış kaynak girişi içe aktarma işlemi sırasında bir hata oluştu.",
-  
+
   // "submission.sections.describe.relationship-lookup.close": "Close",
   "submission.sections.describe.relationship-lookup.close": "Kapat",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.added": "Successfully added local entry to the selection",
   "submission.sections.describe.relationship-lookup.external-source.added": "Giriş seçime başarıyla eklendi",
-  
+
   // "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": "Dış Kaynak Yazarı İçe Aktar",
-  
+
   // "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": "Dış Kaynak Makaleyi İçe Aktar",
-  
+
   // "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": "Dış Kaynak Makale Konusu İçe Aktar",
-  
+
   // "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": "Dış Kaynak Makale Cilt Sayısı İçe Aktar",
-  
+
   // "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": "Dış Kaynak Yazarı İçe Aktar",
-  
+
   // "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": "Yazar seçime başarıyla eklendi",
-  
+
   // "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": "Harici yazar başarıyla içe aktarıldı ve seçime eklendi",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Yetkili",
-  
+
   // "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": "Yeni bir yerel yetkili girişi olarak içe aktar",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Cancel",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "İptal",
-  
+
   // "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": "Yeni girişleri içe aktarmak için bir koleksiyon seçin",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Entities",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Varlıklar",
-  
+
   // "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": "Yeni bir yerel varlık olarak içe aktar",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "LC Adına göre İçe Aktar",
   "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.orcid": "Importing from ORCID",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "ORCID'den İçe Aktar",
-  
+
   // "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": "Sherpa Journal'den İçe Aktar",
-  
+
   // "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": "Sherpa Publisher'den İçe Aktar",
-  
+
   // "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'den İçe Aktar",
-  
+
   // "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'den İçe Aktar",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Import",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "İçe Aktar",
-  
+
   // "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": "Makaleyi Dışardan İçe Aktar",
-  
+
   // "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": " Makale seçime başarıyla eklendi",
-  
+
   // "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": "Harici makale başarıyla içe aktarıldı ve seçime eklendi",
-  
+
   // "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": "Dış Kaynak Makale Konusu İçe Aktar",
-  
+
   // "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": "Dış Kaynak Makale Konusu Başarıyla İçe Aktarıldı.",
-  
+
   // "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": "Başarıyla içe aktarıldı ve seçime harici makale sayısı eklendi",
-  
+
   // "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": "Dış Kaynak Makale Cilt Sayısı İçe Aktar",
-  
+
   // "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": "Dış Kaynak Makale Cilt Sayısı Başarıyla İçe Aktarıldı.",
-  
+
   // "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": "Harici makale cilti başarıyla içe aktarıldı ve seçime eklendi",
-  
+
   // "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Select a local match:",
   "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Yerel Eşleşmeyi Seç",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Tümünü Seçmeyi Bırak",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
   "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Sayfa Seçimin Bırak",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
   "submission.sections.describe.relationship-lookup.search-tab.loading": "Yükleniyor...",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
   "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Arama Sorgusu",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
   "submission.sections.describe.relationship-lookup.search-tab.search": "Git",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
   "submission.sections.describe.relationship-lookup.search-tab.select-all": "Hepsini Seç",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
   "submission.sections.describe.relationship-lookup.search-tab.select-page": "Sayfa Seç",
-  
+
   // "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
   "submission.sections.describe.relationship-lookup.selected": "{{ size }} boyutundaki Seçili Materyaller ",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": " Yerel Yazarlar({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Yerel Makaleler ({{ count }})",
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Local Projects ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Yerel Projeler ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Local Publications ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Yerel Yayınlar ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Local Authors ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Yerel Yazarlar ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Local Organizational Units ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Yerel Organizasyonlar({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Local Data Packages ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Yerel Veri Paketleri ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Local Data Files ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Yerel Veri Dosyaları ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Yerel Makaleler ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Local Journal Issues ({{ count }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Yerel Makale Konuları ({{ 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": "Yerel Makale Konuları ({{ 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": "Yerel Makale Cilt ({{ 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": "Yerel Makale Cilt ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
   "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 }})",
   "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 }})",
   "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 }})",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Adları ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ 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.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.isFundingAgencyOfPublication": "Finansman Kuruluşlarını Arama",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Search for Funding",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Finansman Arama",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Search for Organizational Units",
   "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Organizasyonları Arama",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
   "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Mevcut Seçim ({{ count }})",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Makale Konuları",
   // "submission.sections.describe.relationship-lookup.title.JournalIssue": "Journal Issues",
   "submission.sections.describe.relationship-lookup.title.JournalIssue": "Makale Konuları",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Makale Ciltleri",
   // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
   "submission.sections.describe.relationship-lookup.title.JournalVolume": "Makale Ciltleri",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
   "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Makaleler",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
   "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Yazarlar",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Finansman Kuruluşu",
   // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
   "submission.sections.describe.relationship-lookup.title.Project": "Projeler",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
   "submission.sections.describe.relationship-lookup.title.Publication": "Yayınlar",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
   "submission.sections.describe.relationship-lookup.title.Person": "Yazarlar",
-  
+
   // "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizational Units",
   "submission.sections.describe.relationship-lookup.title.OrgUnit": "Organizasyonlar",
-  
+
   // "submission.sections.describe.relationship-lookup.title.DataPackage": "Data Packages",
   "submission.sections.describe.relationship-lookup.title.DataPackage": "Veri Paketler",
-  
+
   // "submission.sections.describe.relationship-lookup.title.DataFile": "Data Files",
   "submission.sections.describe.relationship-lookup.title.DataFile": "Veri Dosyaları",
-  
+
   // "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
   "submission.sections.describe.relationship-lookup.title.Funding Agency": "Finansman Kuruluşu",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Funding",
   "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Finansman",
-  
+
   // "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Parent Organizational Unit",
   "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Ana Organizasyon",
-  
+
   // "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
   "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Açılır menüyü aç/kapat",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
   "submission.sections.describe.relationship-lookup.selection-tab.settings": "Ayarlar",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
   "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Mevcut seçiminiz boş. ",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Seçili Yazarlar",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Seçili Makaleler",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Seçili Makale Ciltleri",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Selected Projects",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Seçili Projeler",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Selected Publications",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Seçili Yayınlar",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Selected Authors",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Seçili Yazarlar",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Selected Organizational Units",
   "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Seçili Organizasyonlar",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Selected Data Packages",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Seçili Veri Paketleri",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Selected Data Files",
   "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Seçili Veri Dosyaları",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
   "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Seçili Makaleler",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Seçili Makale Konuları",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Selected Journal Volume",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Seçili Makale Ciltleri",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Selected Funding Agency",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Seçili Finansman Kuruluşu",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Selected Funding",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Seçili Finansman",
   // "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Selected Issue",
   "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Seçili Makale Konuları",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Selected Organizational Unit",
   "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Seçili Organizasyonlar",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Sonuçları Ara",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Sonuçları Ara",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Sonuçları Ara",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Sonuçları Ara",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Sonuçları Ara",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Sonuçları Ara",
-  
+
   // "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Search Results",
   "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Sonuçları Ara",
-  
-  // "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": "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": "Bu kişi için \"{{ value }}\" ilerideki gönderilerde kullanılabilmek için Yeni İsim olarak kaydedilsin mi? Bunu yapmazsanız, yine de bu gönderim için kullanabilirsiniz .",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
   "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Yeni İsim değişikliğini kaydet.",
-  
+
   // "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
   "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Sadece bu gönderim için kullan.",
-  
+
   // "submission.sections.ccLicense.type": "License Type",
   "submission.sections.ccLicense.type": "Lisans Türü",
-  
+
   // "submission.sections.ccLicense.select": "Select a license type…",
   "submission.sections.ccLicense.select": "Lisans Türünü Seç…",
-  
+
   // "submission.sections.ccLicense.change": "Change your license type…",
   "submission.sections.ccLicense.change": "Lisans Türünü Değiştir…",
-  
+
   // "submission.sections.ccLicense.none": "No licenses available",
   "submission.sections.ccLicense.none": "Lisans Mevcut Değil",
-  
+
   // "submission.sections.ccLicense.option.select": "Select an option…",
   "submission.sections.ccLicense.option.select": "Seçenek Seç…",
-  
+
   // "submission.sections.ccLicense.link": "You’ve selected the following license:",
   "submission.sections.ccLicense.link": "Seçtiğiniz Lisans Türü:",
-  
+
   // "submission.sections.ccLicense.confirmation": "I grant the license above",
   "submission.sections.ccLicense.confirmation": "Yukarıdaki lisansı veriyorum",
-  
+
   // "submission.sections.general.add-more": "Add more",
   "submission.sections.general.add-more": "Ekle",
-  
+
   // "submission.sections.general.collection": "Collection",
   "submission.sections.general.collection": "Koleksiyon",
-  
+
   // "submission.sections.general.deposit_error_notice": "There was an issue when submitting the item, please try again later.",
   "submission.sections.general.deposit_error_notice": "Öğe gönderilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
-  
+
   // "submission.sections.general.deposit_success_notice": "Submission deposited successfully.",
   "submission.sections.general.deposit_success_notice": "Gönderim başarıyla yatırıldı.",
-  
+
   // "submission.sections.general.discard_error_notice": "There was an issue when discarding the item, please try again later.",
   "submission.sections.general.discard_error_notice": "Öğe gönderilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
-  
+
   // "submission.sections.general.discard_success_notice": "Submission discarded successfully.",
   "submission.sections.general.discard_success_notice": "Gönderim başarıyla silindi.",
-  
+
   // "submission.sections.general.metadata-extracted": "New metadata have been extracted and added to the <strong>{{sectionId}}</strong> section.",
   "submission.sections.general.metadata-extracted": "Yeni metadatalar çıkarıldı ve <strong>{{sectionId}}</strong> bölümüne eklendi.",
-  
+
   // "submission.sections.general.metadata-extracted-new-section": "New <strong>{{sectionId}}</strong> section has been added to submission.",
   "submission.sections.general.metadata-extracted-new-section": "Gönderime yeni <strong>{{sectionId}}</strong> bölümü eklendi.",
-  
+
   // "submission.sections.general.no-collection": "No collection found",
   "submission.sections.general.no-collection": "Koleksiyon bulunamadı",
-  
+
   // "submission.sections.general.no-sections": "No options available",
   "submission.sections.general.no-sections": "Seçenekler Bulunamadı.",
-  
+
   // "submission.sections.general.save_error_notice": "There was an issue when saving the item, please try again later.",
   "submission.sections.general.save_error_notice": "Öğe kaydedilirken bir sorun oluştu, lütfen daha sonra tekrar deneyin.",
-  
+
   // "submission.sections.general.save_success_notice": "Submission saved successfully.",
   "submission.sections.general.save_success_notice": "Gönderim başarıyla kaydedildi.",
-  
+
   // "submission.sections.general.search-collection": "Search for a collection",
   "submission.sections.general.search-collection": "Koleksiyon ara",
-  
+
   // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
   "submission.sections.general.sections_not_valid": "Eksik bölümler var.",
-  
-  
-  
+
+
+
   // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
   "submission.sections.submit.progressbar.CClicense": "Yaratıcı Ortak Lisansları",
-  
+
   // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
   "submission.sections.submit.progressbar.describe.recycle": "Geri Dönüştür",
-  
+
   // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
   "submission.sections.submit.progressbar.describe.stepcustom": "Tanımla",
-  
+
   // "submission.sections.submit.progressbar.describe.stepone": "Describe",
   "submission.sections.submit.progressbar.describe.stepone": "Tanımla",
-  
+
   // "submission.sections.submit.progressbar.describe.steptwo": "Describe",
   "submission.sections.submit.progressbar.describe.steptwo": "Tanımla",
-  
+
   // "submission.sections.submit.progressbar.detect-duplicate": "Potential duplicates",
   "submission.sections.submit.progressbar.detect-duplicate": "Olası Kopyalar",
-  
+
   // "submission.sections.submit.progressbar.license": "Deposit license",
   "submission.sections.submit.progressbar.license": "Lisansı Yerleştir",
-  
+
   // "submission.sections.submit.progressbar.upload": "Upload files",
   "submission.sections.submit.progressbar.upload": "Dosyaları yükle",
-  
-  
-  
+
+
+
   // "submission.sections.upload.delete.confirm.cancel": "Cancel",
   "submission.sections.upload.delete.confirm.cancel": "İptal",
-  
+
   // "submission.sections.upload.delete.confirm.info": "This operation can't be undone. Are you sure?",
   "submission.sections.upload.delete.confirm.info": "Bu işlem geri alınamaz. Emin misin?",
-  
+
   // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
   "submission.sections.upload.delete.confirm.submit": "Evet eminim.",
-  
+
   // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
   "submission.sections.upload.delete.confirm.title": "Bitstreamı Sil",
-  
+
   // "submission.sections.upload.delete.submit": "Delete",
   "submission.sections.upload.delete.submit": "Sil",
-  
+
   // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
   "submission.sections.upload.drop-message": "Öğeye eklemek için dosyaları bırakın",
-  
+
   // "submission.sections.upload.form.access-condition-label": "Access condition type",
   "submission.sections.upload.form.access-condition-label": "Erişim Koşulu Türü",
-  
+
   // "submission.sections.upload.form.date-required": "Date is required.",
   "submission.sections.upload.form.date-required": "Tarih gerekli.",
-  
+
   // "submission.sections.upload.form.from-label": "Grant access from",
   "submission.sections.upload.form.from-label": "Şuradan erişim izni ver:",
-  
+
   // "submission.sections.upload.form.from-placeholder": "From",
   "submission.sections.upload.form.from-placeholder": "İtibaren",
-  
+
   // "submission.sections.upload.form.group-label": "Group",
   "submission.sections.upload.form.group-label": "Grup",
-  
+
   // "submission.sections.upload.form.group-required": "Group is required.",
   "submission.sections.upload.form.group-required": "Grup gerekli.",
-  
+
   // "submission.sections.upload.form.until-label": "Grant access until",
   "submission.sections.upload.form.until-label": "Şu tarihe kadar erişim izni ver:",
-  
+
   // "submission.sections.upload.form.until-placeholder": "Until",
   "submission.sections.upload.form.until-placeholder": "Kadar",
-  
+
   // "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}} koleksiyonuna yüklenen dosyalara aşağıdaki gruplara göre erişilebilir:",
-  
+
   // "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}} koleksiyonuna yüklenen dosyalara, tek dosya için açıkça karar verilenlere ek olarak aşağıdaki gruplarla erişilebilir olacağını lütfen unutmayın:",
-  
-  // "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": "Burada, o anda öğede bulunan tüm dosyaları bulacaksınız. Dosya metadatalarını güncelleyebilir ve koşullara erişebilir veya <strong>sayfanın her yerine sürükleyip bırakarak ek dosyalar yükleyebilirsiniz</strong>",
-  
+
   // "submission.sections.upload.no-entry": "No",
   "submission.sections.upload.no-entry": "Hayır",
-  
+
   // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
   "submission.sections.upload.no-file-uploaded": "Henüz dosya yüklenmedi.",
-  
+
   // "submission.sections.upload.save-metadata": "Save metadata",
   "submission.sections.upload.save-metadata": "Metadataları kaydet",
-  
+
   // "submission.sections.upload.undo": "Cancel",
   "submission.sections.upload.undo": "İptal",
-  
+
   // "submission.sections.upload.upload-failed": "Upload failed",
   "submission.sections.upload.upload-failed": "Yükleme Başarısız",
-  
+
   // "submission.sections.upload.upload-successful": "Upload successful",
   "submission.sections.upload.upload-successful": "Yükleme Başarılı",
-  
-  
-  
+
+
+
   // "submission.submit.title": "Submission",
   "submission.submit.title": "Gönder",
-  
-  
-  
+
+
+
   // "submission.workflow.generic.delete": "Delete",
   "submission.workflow.generic.delete": "Sil",
-  
+
   // "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": "Bu öğeyi atmak istiyorsanız, \"Sil\" öğesini seçin. Daha sonra onaylamanız istenecektir.",
-  
+
   // "submission.workflow.generic.edit": "Edit",
   "submission.workflow.generic.edit": "Değiştir",
-  
+
   // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
   "submission.workflow.generic.edit-help": "Öğenin metadatalarını değiştirmek için bu seçeneği belirleyin.",
-  
+
   // "submission.workflow.generic.view": "View",
   "submission.workflow.generic.view": "Göster",
-  
+
   // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
   "submission.workflow.generic.view-help": "Öğenin metadatalarını görüntülemek için bu seçeneği belirleyin.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.claimed.approve": "Approve",
   "submission.workflow.tasks.claimed.approve": "Kabul Et.",
-  
+
   // "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": "Öğeyi incelediyseniz ve koleksiyona dahil edilmeye uygunsa, \"Onayla\"yı seçin.",
-  
+
   // "submission.workflow.tasks.claimed.edit": "Edit",
   "submission.workflow.tasks.claimed.edit": "Değiştir",
-  
+
   // "submission.workflow.tasks.claimed.edit_help": "Select this option to change the item's metadata.",
   "submission.workflow.tasks.claimed.edit_help": "Öğenin metadatalarını değiştirmek için bu seçeneği belirleyin.",
-  
+
   // "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": "Lütfen gönderiyi reddetme nedeninizi aşağıdaki kutuya, gönderenin bir sorunu çözüp yeniden gönderip gönderemeyeceğini belirterek girin.",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.placeholder": "Describe the reason of reject",
   "submission.workflow.tasks.claimed.reject.reason.placeholder": "Reddetme nedenini açıklayın",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.submit": "Reject item",
   "submission.workflow.tasks.claimed.reject.reason.submit": "Materyali Reddet",
-  
+
   // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
   "submission.workflow.tasks.claimed.reject.reason.title": "Neden",
-  
+
   // "submission.workflow.tasks.claimed.reject.submit": "Reject",
   "submission.workflow.tasks.claimed.reject.submit": "Kabul Etme",
-  
+
   // "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": "Öğeyi incelediyseniz ve koleksiyona dahil edilmeye <strong>uygun olmadığını</strong> bulduysanız, \"Reddet\"i seçin. Ardından, öğenin neden uygun olmadığını ve gönderenin bir şeyi değiştirip yeniden göndermesi gerekip gerekmediğini belirten bir mesaj girmeniz istenecektir.",
-  
+
   // "submission.workflow.tasks.claimed.return": "Return to pool",
   "submission.workflow.tasks.claimed.return": "Havuza Dön",
-  
+
   // "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": "Başka bir kullanıcının görevi gerçekleştirebilmesi için görevi havuza geri döndürün.",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
   "submission.workflow.tasks.generic.error": "İşlem sırasında hata oluştu...",
-  
+
   // "submission.workflow.tasks.generic.processing": "Processing...",
   "submission.workflow.tasks.generic.processing": "İşleniyor...",
-  
+
   // "submission.workflow.tasks.generic.submitter": "Submitter",
   "submission.workflow.tasks.generic.submitter": "Gönderen",
-  
+
   // "submission.workflow.tasks.generic.success": "Operation successful",
   "submission.workflow.tasks.generic.success": "İşlem Başarılı",
-  
-  
-  
+
+
+
   // "submission.workflow.tasks.pool.claim": "Claim",
   "submission.workflow.tasks.pool.claim": "Talep Et",
-  
+
   // "submission.workflow.tasks.pool.claim_help": "Assign this task to yourself.",
   "submission.workflow.tasks.pool.claim_help": "Bu görevi kendinize atayın.",
-  
+
   // "submission.workflow.tasks.pool.hide-detail": "Hide detail",
   "submission.workflow.tasks.pool.hide-detail": "Detayları gizle",
-  
+
   // "submission.workflow.tasks.pool.show-detail": "Show detail",
   "submission.workflow.tasks.pool.show-detail": "Detayaları göster",
-  
-  
-  
+
+
+
   // "title": "DSpace",
   "title": "DSpace",
-  
-  
-  
+
+
+
   // "vocabulary-treeview.header": "Hierarchical tree view",
   "vocabulary-treeview.header": "Hiyerarşik ağaç görünümü",
-  
+
   // "vocabulary-treeview.load-more": "Load more",
   "vocabulary-treeview.load-more": "Daha Fazla Yükle",
-  
+
   // "vocabulary-treeview.search.form.reset": "Reset",
   "vocabulary-treeview.search.form.reset": "Sıfırla",
-  
+
   // "vocabulary-treeview.search.form.search": "Search",
   "vocabulary-treeview.search.form.search": "Ara",
-  
+
   // "vocabulary-treeview.search.no-result": "There were no items to show",
   "vocabulary-treeview.search.no-result": "Gösterilecek öğe yok",
-  
+
   // "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
   "vocabulary-treeview.tree.description.nsi": "The Norwegian Science Index",
-  
+
   // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
   "vocabulary-treeview.tree.description.srsc": "Araştırma Konusu Kategorileri",
-  
-  
-  
+
+
+
   // "uploader.browse": "browse",
   "uploader.browse": "Tara",
-  
+
   // "uploader.drag-message": "Drag & Drop your files here",
   "uploader.drag-message": "Dosyalarınızı buraya sürükleyip bırakın",
-  
+
   // "uploader.or": ", or ",
   "uploader.or": ", veya",
-  
+
   // "uploader.processing": "Processing uploaded file(s)... (it's now safe to close this page)",
   // TODO Source message changed - Revise the translation
   "uploader.processing": "İşleniyor",
-  
+
   // "uploader.queue-length": "Queue length",
   "uploader.queue-length": "Sıra Uzunluğu",
-  
+
   // "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": "Sanal metadataları gerçek metadatalar olarak kaydetmek istediğiniz türleri seçin",
-  
+
   // "virtual-metadata.delete-item.modal-head": "The virtual metadata of this relation",
   "virtual-metadata.delete-item.modal-head": "Bu ilişkinin sanal metadataları",
-  
+
   // "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": "Sanal metadatalarını gerçek metadatalar olarak kaydetmek istediğiniz öğeleri seçin",
-  
-  
-  
+
+
+
   // "workflowAdmin.search.results.head": "Administer Workflow",
   "workflowAdmin.search.results.head": "İş Akışını Yönet",
-  
-  
-  
+
+
+
   // "workflow-item.delete.notification.success.title": "Deleted",
   "workflow-item.delete.notification.success.title": "Silindi",
-  
+
   // "workflow-item.delete.notification.success.content": "This workflow item was successfully deleted",
   "workflow-item.delete.notification.success.content": "Bu iş akışı öğesi başarıyla silindi",
-  
+
   // "workflow-item.delete.notification.error.title": "Something went wrong",
   "workflow-item.delete.notification.error.title": "Bir şeyler yanlış gitti",
-  
+
   // "workflow-item.delete.notification.error.content": "The workflow item could not be deleted",
   "workflow-item.delete.notification.error.content": "İş akışı öğesi silinemedi",
-  
+
   // "workflow-item.delete.title": "Delete workflow item",
   "workflow-item.delete.title": "İş akışı öğesini sil",
-  
+
   // "workflow-item.delete.header": "Delete workflow item",
   "workflow-item.delete.header": "İş akışı öğesini sil",
-  
+
   // "workflow-item.delete.button.cancel": "Cancel",
   "workflow-item.delete.button.cancel": "İptal",
-  
+
   // "workflow-item.delete.button.confirm": "Delete",
   "workflow-item.delete.button.confirm": "Sil",
-  
-  
+
+
   // "workflow-item.send-back.notification.success.title": "Sent back to submitter",
   "workflow-item.send-back.notification.success.title": "Gönderene geri gönderildi",
-  
+
   // "workflow-item.send-back.notification.success.content": "This workflow item was successfully sent back to the submitter",
   "workflow-item.send-back.notification.success.content": "Bu iş akışı öğesi, gönderene başarıyla geri gönderildi",
-  
+
   // "workflow-item.send-back.notification.error.title": "Something went wrong",
   "workflow-item.send-back.notification.error.title": "Bir şeyler yanlış gitti",
-  
+
   // "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": "İş akışı öğesi, gönderene geri gönderilemedi",
-  
+
   // "workflow-item.send-back.title": "Send workflow item back to submitter",
   "workflow-item.send-back.title": "İş akışı öğesini gönderene geri gönder",
-  
+
   // "workflow-item.send-back.header": "Send workflow item back to submitter",
   "workflow-item.send-back.header": "İş akışı öğesini gönderene geri gönder",
-  
+
   // "workflow-item.send-back.button.cancel": "Cancel",
   "workflow-item.send-back.button.cancel": "İptal",
-  
+
   // "workflow-item.send-back.button.confirm": "Send back"
-  "workflow-item.send-back.button.confirm": "Geri Gönder"
+  "workflow-item.send-back.button.confirm": "Geri Gönder",
 
 }
diff --git a/src/assets/i18n/uk.json5 b/src/assets/i18n/uk.json5
new file mode 100644
index 0000000000..63377d8e51
--- /dev/null
+++ b/src/assets/i18n/uk.json5
@@ -0,0 +1,5890 @@
+{
+
+  // "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",
+
+  "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.",
+
+  "403.help": "Ви не маєте дозволу на доступ до цієї сторінки. Ви можете скористатися кнопкою нижче, щоб повернутися на головну сторінку.",
+
+  // "403.link.home-page": "Take me to the home page",
+
+  "403.link.home-page": "Перейти на головну сторінку",
+
+  // "403.forbidden": "forbidden",
+
+  "403.forbidden": "заборонено",
+
+
+
+  // "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",
+  "404.link.home-page": "Перейти на головну сторінку",
+
+  // "404.page-not-found": "page not found",
+  "404.page-not-found": "сторінка не знайдена",
+
+  // "admin.curation-tasks.breadcrumbs": "System curation tasks",
+
+  "admin.curation-tasks.breadcrumbs": "Управління системою",
+
+  // "admin.curation-tasks.title": "System curation tasks",
+
+  "admin.curation-tasks.title": "Управління системою",
+
+  // "admin.curation-tasks.header": "System curation tasks",
+
+  "admin.curation-tasks.header": "Управління системою",
+
+  // "admin.registries.bitstream-formats.breadcrumbs": "Format registry",
+
+  "admin.registries.bitstream-formats.breadcrumbs": "Реєстр форматів",
+
+  // "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.",
+  "admin.registries.bitstream-formats.create.failure.content": "Під час створення нового файлу сталася помилка.",
+
+  // "admin.registries.bitstream-formats.create.failure.head": "Failure",
+  "admin.registries.bitstream-formats.create.failure.head": "Крах",
+
+  // "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",
+  "admin.registries.bitstream-formats.create.new": "Додати новий формат файлу",
+
+  // "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",
+  "admin.registries.bitstream-formats.create.success.head": "Успішно",
+
+  // "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",
+  "admin.registries.bitstream-formats.delete.failure.head": "Крах",
+
+  // "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",
+  "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.",
+  "admin.registries.bitstream-formats.description": "Цей список форматів файлів містить інформацію про відомі формати та рівень їх підтримки.",
+
+  // "admin.registries.bitstream-formats.edit.breadcrumbs": "Bitstream format",
+
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Формат файлу",
+
+  // "admin.registries.bitstream-formats.edit.description.hint": "",
+  "admin.registries.bitstream-formats.edit.description.hint": "",
+
+  // "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.",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Розширення — це розширення файлів, які використовуються для автоматичного визначення формату завантажених файлів. Ви можете ввести кілька розширень для кожного формату.",
+
+  // "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",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Ввведіть розширення файлу без крапки",
+
+  // "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",
+  "admin.registries.bitstream-formats.edit.failure.head": "Крах",
+
+  // "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.",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Формати, позначені як внутрішні, приховані від користувача та використовуються в адміністративних цілях.",
+
+  // "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.",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Тип MIME, пов’язаний із цим форматом, не обов’язково має бути унікальним.",
+
+  // "admin.registries.bitstream-formats.edit.mimetype.label": "MIME Type",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Тип MIME ",
+
+  // "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": "Унікальна назва формату, (наприклад Microsoft Word XP or Microsoft Word 2000)",
+
+  // "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.",
+  "admin.registries.bitstream-formats.edit.success.content": "Формат файлу успішно відредаговано.",
+
+  // "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.",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Рівень підтримки, який ваша установа обіцяє для цього формату.",
+
+  // "admin.registries.bitstream-formats.edit.supportLevel.label": "Support level",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Рівень підтримки",
+
+  // "admin.registries.bitstream-formats.head": "Bitstream Format Registry",
+  "admin.registries.bitstream-formats.head": "Реєстр формату файлу",
+
+  // "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",
+  "admin.registries.bitstream-formats.table.delete": "Видалити видалене",
+
+  // "admin.registries.bitstream-formats.table.deselect-all": "Deselect all",
+  "admin.registries.bitstream-formats.table.deselect-all": "Зняти вибір із усіх",
+
+  // "admin.registries.bitstream-formats.table.internal": "internal",
+  "admin.registries.bitstream-formats.table.internal": "внутрішні",
+
+  // "admin.registries.bitstream-formats.table.mimetype": "MIME Type",
+  "admin.registries.bitstream-formats.table.mimetype": "Тип MIME",
+
+  // "admin.registries.bitstream-formats.table.name": "Name",
+  "admin.registries.bitstream-formats.table.name": "Ім'я",
+
+  // "admin.registries.bitstream-formats.table.return": "Return",
+  "admin.registries.bitstream-formats.table.return": "Повернутись",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Known",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Відомо",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Supported",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Підтримується",
+
+  // "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Unknown",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Невідомо",
+
+  // "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",
+  "admin.registries.bitstream-formats.title": "Репозитарій :: реєстр формату файлу",
+
+
+
+  // "admin.registries.metadata.breadcrumbs": "Metadata registry",
+  // TODO New key - Add a translation
+  "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.",
+  "admin.registries.metadata.description": "Реєстр метаданих підтримує список усіх полів метаданих, доступних у репозитарії. Ці поля можна розділити на кілька схем. Однак для ПЗ DSpace потрібна схема Dublin Core.",
+
+  // "admin.registries.metadata.form.create": "Create metadata schema",
+  "admin.registries.metadata.form.create": "Створити схему метаданих",
+
+  // "admin.registries.metadata.form.edit": "Edit metadata schema",
+  "admin.registries.metadata.form.edit": "Редагувати схему метаданих",
+
+  // "admin.registries.metadata.form.name": "Name",
+  "admin.registries.metadata.form.name": "Ім'я",
+
+  // "admin.registries.metadata.form.namespace": "Namespace",
+  "admin.registries.metadata.form.namespace": "Простір",
+
+  // "admin.registries.metadata.head": "Metadata Registry",
+  "admin.registries.metadata.head": "Реєстр метаданих",
+
+  // "admin.registries.metadata.schemas.no-items": "No metadata schemas to show.",
+  "admin.registries.metadata.schemas.no-items": "Немає схеми метаданих.",
+
+  // "admin.registries.metadata.schemas.table.delete": "Delete selected",
+  "admin.registries.metadata.schemas.table.delete": "Видалити виділене",
+
+  // "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.id": "Ідентифікатор",
+
+  // "admin.registries.metadata.schemas.table.name": "Name",
+  "admin.registries.metadata.schemas.table.name": "Ім'я",
+
+  // "admin.registries.metadata.schemas.table.namespace": "Namespace",
+  "admin.registries.metadata.schemas.table.namespace": "Простір",
+
+  // "admin.registries.metadata.title": "DSpace Angular :: Metadata Registry",
+  "admin.registries.metadata.title": "Репозитарій :: Реєстр метаданих",
+
+
+
+  // "admin.registries.schema.breadcrumbs": "Metadata schema",
+
+  "admin.registries.schema.breadcrumbs": "Схема метаданих",
+
+  // "admin.registries.schema.description": "This is the metadata schema for \"{{namespace}}\".",
+  "admin.registries.schema.description": "Це схема метаданих для \"{{namespace}}\".",
+
+  // "admin.registries.schema.fields.head": "Schema metadata fields",
+  "admin.registries.schema.fields.head": "Поля схеми метаданих",
+
+  // "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",
+  "admin.registries.schema.fields.table.delete": "Видалити виділене",
+
+  // "admin.registries.schema.fields.table.field": "Field",
+  "admin.registries.schema.fields.table.field": "Поле",
+
+  // "admin.registries.schema.fields.table.scopenote": "Scope Note",
+  "admin.registries.schema.fields.table.scopenote": "Примітка щодо сфери застосування",
+
+  // "admin.registries.schema.form.create": "Create metadata field",
+  "admin.registries.schema.form.create": "Створити поле метаданих",
+
+  // "admin.registries.schema.form.edit": "Edit metadata field",
+  "admin.registries.schema.form.edit": "Редагувати поле метаданих",
+
+  // "admin.registries.schema.form.element": "Element",
+  "admin.registries.schema.form.element": "Елементи",
+
+  // "admin.registries.schema.form.qualifier": "Qualifier",
+  "admin.registries.schema.form.qualifier": "Кваліфікатор",
+
+  // "admin.registries.schema.form.scopenote": "Scope Note",
+  "admin.registries.schema.form.scopenote": "Примітка щодо сфери застосування",
+
+  // "admin.registries.schema.head": "Metadata Schema",
+  "admin.registries.schema.head": "Схема метаданих",
+
+  // "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",
+  "admin.registries.schema.notification.deleted.failure": "Неможливо видалити {{amount}} схему метаданих",
+
+  // "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}}\"",
+  "admin.registries.schema.notification.edited": "Схема метаданих \"{{prefix}}\" успішно відредагована",
+
+  // "admin.registries.schema.notification.failure": "Error",
+  "admin.registries.schema.notification.failure": "Помилка",
+
+  // "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",
+  "admin.registries.schema.notification.field.deleted.failure": "Неможливо видалити  {{amount}} поле(я) метаданих",
+
+  // "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}}\"",
+  "admin.registries.schema.notification.field.edited": "\"{{field}}\" поле метаданих успішно відредаговано",
+
+  // "admin.registries.schema.notification.success": "Success",
+  "admin.registries.schema.notification.success": "Успіх",
+
+  // "admin.registries.schema.return": "Return",
+  "admin.registries.schema.return": "Повернутись",
+
+  // "admin.registries.schema.title": "DSpace Angular :: Metadata Schema Registry",
+  "admin.registries.schema.title": "Репозитарій :: реєстр схеми метаданих",
+
+
+
+  // "admin.access-control.epeople.actions.delete": "Delete EPerson",
+
+  "admin.access-control.epeople.actions.delete": "Видалити користувача",
+
+  // "admin.access-control.epeople.actions.impersonate": "Impersonate EPerson",
+
+  "admin.access-control.epeople.actions.impersonate": "Видати себе за користувача",
+
+  // "admin.access-control.epeople.actions.reset": "Скинути пароль",
+
+  "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": "Зупинити видавати себе за користувача",
+
+  // "admin.access-control.epeople.title": "Репозитарій :: EPeople",
+  "admin.access-control.epeople.title": "Репозитарій :: Користувачі",
+
+  // "admin.access-control.epeople.head": "EPeople",
+  "admin.access-control.epeople.head": "Користувачі",
+
+  // "admin.access-control.epeople.search.head": "Search",
+  "admin.access-control.epeople.search.head": "Шукати",
+
+  // "admin.access-control.epeople.button.see-all": "Browse All",
+  "admin.access-control.epeople.button.see-all": "Переглянути всі",
+
+  // "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)",
+  "admin.access-control.epeople.search.scope.email": "E-mail",
+
+  // "admin.access-control.epeople.search.button": "Шукати",
+  "admin.access-control.epeople.search.button": "Шукати",
+
+  // "admin.access-control.epeople.button.add": "Add EPerson",
+  "admin.access-control.epeople.button.add": "Додати користувача",
+
+  // "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.id": "ID",
+
+  // "admin.access-control.epeople.table.name": "Name",
+  "admin.access-control.epeople.table.name": "Ім'я",
+
+  // "admin.access-control.epeople.table.email": "E-mail (exact)",
+  "admin.access-control.epeople.table.email": "E-mail",
+
+  // "admin.access-control.epeople.table.edit": "Edit",
+  "admin.access-control.epeople.table.edit": "Редагувати",
+
+  // "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.remove": "Delete \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Видалити \"{{name}}\"",
+
+  // "admin.access-control.epeople.no-items": "No EPeople to show.",
+  "admin.access-control.epeople.no-items": "Користувачі відсутні.",
+
+  // "admin.access-control.epeople.form.create": "Create EPerson",
+  "admin.access-control.epeople.form.create": "Створити користувача",
+
+  // "admin.access-control.epeople.form.edit": "Edit EPerson",
+  "admin.access-control.epeople.form.edit": "Редагувати користувача",
+
+  // "admin.access-control.epeople.form.firstName": "First name",
+  "admin.access-control.epeople.form.firstName": "Ім'я",
+
+  // "admin.access-control.epeople.form.lastName": "Last name",
+  "admin.access-control.epeople.form.lastName": "Прізвище",
+
+  // "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.email": "E-mail",
+
+  // "admin.access-control.epeople.form.emailHint": "Must be valid e-mail address",
+  "admin.access-control.epeople.form.emailHint": "E-mail повинен бути правильний",
+
+  // "admin.access-control.epeople.form.canLogIn": "Can log in",
+  "admin.access-control.epeople.form.canLogIn": "Може увійти",
+
+  // "admin.access-control.epeople.form.requireCertificate": "Requires certificate",
+  "admin.access-control.epeople.form.requireCertificate": "Вимагати сертифікат",
+
+  // "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}}\"",
+  "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.",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Неможливо створити користувача \"{{name}}\", e-pasts \"{{email}}\" вже використовується.",
+
+  // "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}}\", e-pasts \"{{email}}\" вже використовується.",
+
+  // "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}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Неможливо відредагувати користувача \"{{name}}\"",
+
+  // "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}}\"",
+
+  "admin.access-control.epeople.form.notification.deleted.failure": "Неможливо видалити користувача \"{{name}}\"",
+
+  // "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Member of these groups:",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Член груп:",
+
+  // "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.id": "ID",
+
+  // "admin.access-control.epeople.form.table.name": "Name",
+  "admin.access-control.epeople.form.table.name": "Ім'я",
+
+  // "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",
+  "admin.access-control.epeople.form.goToGroups": "Додати до груп",
+
+  // "admin.access-control.epeople.notification.deleted.failure": "Failed to delete EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.failure": "Неможливо видалити користувача: \"{{name}}\"",
+
+  // "admin.access-control.epeople.notification.deleted.success": "Successfully deleted EPerson: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Користувача \"{{name}}\" успішно видалено",
+
+
+
+  // "admin.access-control.groups.title": "Репозитарій :: Групи",
+  "admin.access-control.groups.title": "Репозитарій :: Групи",
+
+  // "admin.access-control.groups.title.singleGroup": "DSpace Angular :: Edit Group",
+
+  "admin.access-control.groups.title.singleGroup": "Репозитарій :: Редагувати групу",
+
+  // "admin.access-control.groups.title.addGroup": "DSpace Angular :: New Group",
+
+  "admin.access-control.groups.title.addGroup": "Репозитарій :: Створити нову групу",
+
+  // "admin.access-control.groups.head": "Groups",
+  "admin.access-control.groups.head": "Групи",
+
+  // "admin.access-control.groups.button.add": "Add group",
+  "admin.access-control.groups.button.add": "Створити нову групу",
+
+  // "admin.access-control.groups.search.head": "Search groups",
+  "admin.access-control.groups.search.head": "Шукати групу",
+
+  // "admin.access-control.groups.button.see-all": "Browse all",
+  "admin.access-control.groups.button.see-all": "Переглянути всі",
+
+  // "admin.access-control.groups.search.button": "Search",
+  "admin.access-control.groups.search.button": "Шукати",
+
+  // "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": "Ім'я",
+
+  // "admin.access-control.groups.table.members": "Members",
+  "admin.access-control.groups.table.members": "Члени",
+
+  // "admin.access-control.groups.table.edit": "Edit",
+  "admin.access-control.groups.table.edit": "Редагувати",
+
+  // "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}}\"",
+  "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",
+  "admin.access-control.groups.no-items": "Групи не знайдено за Вашими критеріями ",
+
+  // "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}}\"",
+
+  "admin.access-control.groups.notification.deleted.failure.title": "Групу \"{{name}}\" видалити неможливо",
+
+  // "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.",
+
+  "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.",
+
+  "admin.access-control.groups.form.alert.workflowGroup": "Цю групу не можна змінити або видалити, оскільки вона відповідає за ролі в процесі подання чи опрацювання документів в \"{{name}}\" {{comcol}}. Ви можете видалити її <a href='{{comcolEditRolesRoute}}'>\"assign roles\"</a> на сторінці {{comcol}} вкладки Редагування. Ви все ще можете додавати та видаляти учасників групи за допомогою цієї сторінки.",
+
+  // "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",
+  "admin.access-control.groups.form.head.edit": "Редагувати групу",
+
+  // "admin.access-control.groups.form.groupName": "Group name",
+  "admin.access-control.groups.form.groupName": "Ім'я групи",
+
+  // "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}}\"",
+  "admin.access-control.groups.form.notification.created.success": "Група \"{{name}}\" успішно створена",
+
+  // "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.",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Неможливо створити групу: \"{{name}}\". Це ім'я вже зайняте .",
+
+  // "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}}\" вже використовується!",
+
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Ім'я \"{{name}}\" вже використовується!",
+
+  // "admin.access-control.groups.form.notification.edited.success": "Група \"{{name}}\" успішно відредагована",
+
+  "admin.access-control.groups.form.notification.edited.success": "Група \"{{name}}\" успішно відредагована",
+
+  // "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 }}\"",
+
+  "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 }}\"",
+
+  "admin.access-control.groups.form.delete-group.modal.info": "Ви впевнені, що хочете видалити групу \"{{ dsoName }}\"?",
+
+  // "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",
+
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Видалити",
+
+  // "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 }}\"",
+
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Неможливо видалити групу \"{{ name }}\"",
+
+  // "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",
+  "admin.access-control.groups.form.members-list.head": "Користувачі",
+
+  // "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",
+  "admin.access-control.groups.form.members-list.button.see-all": "Переглянути всіх",
+
+  // "admin.access-control.groups.form.members-list.headMembers": "Current Members",
+  "admin.access-control.groups.form.members-list.headMembers": "Поточні учасники групи",
+
+  // "admin.access-control.groups.form.members-list.search.scope.metadata": "Metadata",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Метадані",
+
+  // "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (exact)",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail",
+
+  // "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",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+
+  // "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.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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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.",
+  "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.",
+  "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",
+  "admin.access-control.groups.form.members-list.no-items": "Не знайдено жодного учасника групи",
+
+  // "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",
+  "admin.access-control.groups.form.subgroups-list.head": "Групи",
+
+  // "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",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Переглянути всі",
+
+  // "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",
+  "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.id": "ID",
+
+  // "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.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}}\"",
+  "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}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Додати підгрупу \"{{name}}\"",
+
+  // "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Current group",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Поточна група",
+
+  // "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}}\"",
+  "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}}\"",
+  "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}}\"",
+  "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.",
+  "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.",
+  "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",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Група не знайдена за критерієм імені чи 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": "Жодної підгрупи у групі немає.",
+
+  // "admin.access-control.groups.form.return": "Return to groups",
+  "admin.access-control.groups.form.return": "Повернутись до груп",
+
+
+
+  // "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.title": "Metadata Query Report",
+  // TODO New key - Add a translation
+  "admin.reports.items.title": "Metadata Query Report",
+
+  // "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.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": "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_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": "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_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_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_metadata.tooltip": "Item has metadata that is not accessible to Anonymous user",
+
+
+
+  // "admin.search.breadcrumbs": "Administrative Search",
+  "admin.search.breadcrumbs": "Пошук адміністратора",
+
+  // "admin.search.collection.edit": "Edit",
+  "admin.search.collection.edit": "Редагувати",
+
+  // "admin.search.community.edit": "Edit",
+  "admin.search.community.edit": "Редагувати",
+
+  // "admin.search.item.delete": "Delete",
+  "admin.search.item.delete": "Видалити",
+
+  // "admin.search.item.edit": "Edit",
+  "admin.search.item.edit": "Редагувати",
+
+  // "admin.search.item.make-private": "Make Private",
+  "admin.search.item.make-private": "Зробити приватним",
+
+  // "admin.search.item.make-public": "Make Public",
+  "admin.search.item.make-public": "Зробити публічним",
+
+  // "admin.search.item.move": "Move",
+  "admin.search.item.move": "Перемістити",
+
+  // "admin.search.item.reinstate": "Reinstate",
+  "admin.search.item.reinstate": "Відновити",
+
+  // "admin.search.item.withdraw": "Withdraw",
+  "admin.search.item.withdraw": "Вилучити",
+
+  // "admin.search.title": "Administrative Search",
+  "admin.search.title": "Пошук адміністратора",
+
+  // "administrativeView.search.results.head": "Administrative Search",
+  "administrativeView.search.results.head": "Пошук адміністратора",
+
+
+
+
+  // "admin.workflow.breadcrumbs": "Administer Workflow",
+  "admin.workflow.breadcrumbs": "Адміністрування робочого процесу",
+
+  // "admin.workflow.title": "Administer Workflow",
+  "admin.workflow.title": "Адміністрування робочого процесу",
+
+  // "admin.workflow.item.workflow": "Workflow",
+  "admin.workflow.item.workflow": "Робочий процес",
+
+  // "admin.workflow.item.delete": "Delete",
+  "admin.workflow.item.delete": "Видалити",
+
+  // "admin.workflow.item.send-back": "Send back",
+  "admin.workflow.item.send-back": "Повернути назад",
+
+
+
+  // "admin.metadata-import.breadcrumbs": "Import Metadata",
+
+  "admin.metadata-import.breadcrumbs": "Імпортувати метадані",
+
+  // "admin.metadata-import.title": "Import Metadata",
+
+  "admin.metadata-import.title": "Імпортувати метадані",
+
+  // "admin.metadata-import.page.header": "Import Metadata",
+
+  "admin.metadata-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": "Тут можна скинути або переглянути файли CSV, які містять пакетні операції з метаданими",
+
+  // "admin.metadata-import.page.dropMsg": "Drop a metadata CSV to import",
+
+  "admin.metadata-import.page.dropMsg": "Скинути метадані CSV для імпорту",
+
+  // "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",
+
+  "admin.metadata-import.page.button.return": "Повернутись",
+
+  // "admin.metadata-import.page.button.proceed": "Proceed",
+
+  "admin.metadata-import.page.button.proceed": "Продовжити",
+
+  // "admin.metadata-import.page.error.addFile": "Select file first!",
+
+  "admin.metadata-import.page.error.addFile": "Спочатку виберіть файл",
+
+
+
+
+  // "auth.errors.invalid-user": "Invalid email address or password.",
+  "auth.errors.invalid-user": "Неправильний емейл чи пароль.",
+
+  // "auth.messages.expired": "Your session has expired. Please log in again.",
+  "auth.messages.expired": "Час сесії вичерпано. Увійдіть знову.",
+
+
+
+  // "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>\".",
+  "bitstream.edit.form.description.hint": "За бажанням надайте, наприклад, короткий опис файлу, \"<i>Galvanais raksts</i>\" або \"<i>експериментальні читання даних</i>\".",
+
+  // "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.",
+  "bitstream.edit.form.embargo.hint": "Перший день, з якого доступ дозволено. <b>Ця дата може бути змінена у цій формі.</b> Для ембарго на цей файл перейдіть у вкладку <i>Статус документа(item)</i>, та клацніть <i>Авторизація...</i>, створіть чи відредагуйте політику доступу <i>Читання (READ)</i> та задайте <i>Дата старту</i>.",
+
+  // "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.",
+  "bitstream.edit.form.fileName.hint": "Змініть назву файла. Зверніть увагу, що це вплине на посилання. Проте мали б прцювати і старе посилання доки не зміниться ID документу.",
+
+  // "bitstream.edit.form.fileName.label": "Filename",
+  "bitstream.edit.form.fileName.label": "Ім'я файлу",
+
+  // "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>\").",
+  "bitstream.edit.form.newFormat.hint": "Програмне забезпечення та його версія, яке Ви використали при створенні файлу (наприклад, \"<i> ACMESoft SuperApp versija 1.5 </i>\").",
+
+  // "bitstream.edit.form.primaryBitstream.label": "Primary bitstream",
+  "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\".",
+  "bitstream.edit.form.selectedFormat.hint": "Якщо формату немає у переліку, будь ласка опишіть його.",
+
+  // "bitstream.edit.form.selectedFormat.label": "Selected Format",
+  "bitstream.edit.form.selectedFormat.label": "Вибрані формати",
+
+  // "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",
+  "bitstream.edit.notifications.error.format.title": "Сталась помилка при збереженні формату файла.",
+
+  // "bitstream.edit.notifications.saved.content": "Your changes to this bitstream were saved.",
+  "bitstream.edit.notifications.saved.content": "Зміни до цього файлу були збережені.",
+
+  // "bitstream.edit.notifications.saved.title": "Bitstream saved",
+  "bitstream.edit.notifications.saved.title": "Файл збережено",
+
+  // "bitstream.edit.title": "Edit bitstream",
+  "bitstream.edit.title": "Редагувати файл",
+
+
+
+  // "browse.comcol.by.author": "By Author",
+  "browse.comcol.by.author": "За автором",
+
+  // "browse.comcol.by.dateissued": "За датою",
+  "browse.comcol.by.dateissued": "За датою",
+
+  // "browse.comcol.by.subject": "By Subject",
+  "browse.comcol.by.subject": "За темою",
+
+  // "browse.comcol.by.title": "By Title",
+  "browse.comcol.by.title": "За назвою",
+
+  // "browse.comcol.head": "Browse",
+  "browse.comcol.head": "Переглянути",
+
+  // "browse.empty": "No items to show.",
+  "browse.empty": "Немає документів.",
+
+  // "browse.metadata.author": "Author",
+  "browse.metadata.author": "Автор",
+
+  // "browse.metadata.dateissued": "Issue Date",
+  "browse.metadata.dateissued": "Дата публікації",
+
+  // "browse.metadata.subject": "Subject",
+  "browse.metadata.subject": "Ключові слова",
+
+  // "browse.metadata.title": "Title",
+  "browse.metadata.title": "Назва",
+
+  // "browse.metadata.author.breadcrumbs": "Browse by Author",
+  "browse.metadata.author.breadcrumbs": "Переглянути за автором",
+
+  // "browse.metadata.dateissued.breadcrumbs": "Browse by Date",
+  "browse.metadata.dateissued.breadcrumbs": "Переглянути за датою",
+
+  // "browse.metadata.subject.breadcrumbs": "Browse by Subject",
+  "browse.metadata.subject.breadcrumbs": "Переглянути за ключовими словами",
+
+  // "browse.metadata.title.breadcrumbs": "Browse by Title",
+  "browse.metadata.title.breadcrumbs": "Переглянути за назвою",
+
+  // "browse.startsWith.choose_start": "(Choose start)",
+  "browse.startsWith.choose_start": "(виберіть початок)",
+
+  // "browse.startsWith.choose_year": "(Choose year)",
+  "browse.startsWith.choose_year": "(виберіть рік)",
+
+  // "browse.startsWith.jump": "Jump to a point in the index:",
+  "browse.startsWith.jump": "Перейти на індекс:",
+
+  // "browse.startsWith.months.april": "April",
+  "browse.startsWith.months.april": "Квітень",
+
+  // "browse.startsWith.months.august": "August",
+  "browse.startsWith.months.august": "Серпень",
+
+  // "browse.startsWith.months.december": "December",
+  "browse.startsWith.months.december": "Грудень",
+
+  // "browse.startsWith.months.february": "February",
+  "browse.startsWith.months.february": "Лютий",
+
+  // "browse.startsWith.months.january": "January",
+  "browse.startsWith.months.january": "Січень",
+
+  // "browse.startsWith.months.july": "July",
+  "browse.startsWith.months.july": "Липень",
+
+  // "browse.startsWith.months.june": "June",
+  "browse.startsWith.months.june": "Червень",
+
+  // "browse.startsWith.months.march": "March",
+  "browse.startsWith.months.march": "Березень",
+
+  // "browse.startsWith.months.may": "May",
+  "browse.startsWith.months.may": "Травень",
+
+  // "browse.startsWith.months.none": "(Choose month)",
+  "browse.startsWith.months.none": "(Виберіть місяць)",
+
+  // "browse.startsWith.months.november": "November",
+  "browse.startsWith.months.november": "Листопад",
+
+  // "browse.startsWith.months.october": "October",
+  "browse.startsWith.months.october": "Жовтень",
+
+  // "browse.startsWith.months.september": "September",
+  "browse.startsWith.months.september": "Вересень",
+
+  // "browse.startsWith.submit": "Go",
+  "browse.startsWith.submit": "Перейти",
+
+  // "browse.startsWith.type_date": "Or type in a date (year-month):",
+  "browse.startsWith.type_date": "Або введіть дату (рік-місяць):",
+
+  // "browse.startsWith.type_text": "Or enter first few letters:",
+  "browse.startsWith.type_text": "Або введіть перші символи:",
+
+  // "browse.title": "Browsing {{ collection }} by {{ field }} {{ value }}",
+  "browse.title": "Перегляд {{ collection }} за {{ field }} {{ value }}",
+
+
+  // "chips.remove": "Remove chip",
+  // TODO "chips.remove": "Remove chip",
+  "chips.remove": "Remove chip",
+
+
+
+  // "collection.create.head": "Create a Collection",
+  "collection.create.head": "Створити зібрання",
+
+  // "collection.create.notifications.success": "Successfully created the Collection",
+  "collection.create.notifications.success": "Зібрання успішно створено",
+
+  // "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.delete.cancel": "Cancel",
+  "collection.delete.cancel": "Відмінити",
+
+  // "collection.delete.confirm": "Confirm",
+  "collection.delete.confirm": "Підтвердити",
+
+  // "collection.delete.head": "Delete Collection",
+  "collection.delete.head": "Видалити зібрання",
+
+  // "collection.delete.notification.fail": "Collection could not be deleted",
+  "collection.delete.notification.fail": "Зібрання не може бути видалене",
+
+  // "collection.delete.notification.success": "Successfully deleted collection",
+  "collection.delete.notification.success": "Зібрання успішно видалено",
+
+  // "collection.delete.text": "Are you sure you want to delete collection \"{{ dso }}\"",
+  "collection.delete.text": "Ви впевнені, що хочете видалити зібрання \"{{ dso }}\"?",
+
+
+
+  // "collection.edit.delete": "Delete this collection",
+  "collection.edit.delete": "Видалити це зібрання",
+
+  // "collection.edit.head": "Edit Collection",
+  "collection.edit.head": "Редагувати зібрання",
+
+  // "collection.edit.breadcrumbs": "Edit Collection",
+  "collection.edit.breadcrumbs": "Редагувати зібрання",
+
+
+
+  // "collection.edit.tabs.mapper.head": "Item Mapper",
+
+  "collection.edit.tabs.mapper.head": "Карта документа",
+
+  // "collection.edit.tabs.item-mapper.title": "Collection Edit - Item Mapper",
+
+  "collection.edit.tabs.item-mapper.title": "Редагування зібрання - Карта документа",
+
+  // "collection.edit.item-mapper.cancel": "Cancel",
+  "collection.edit.item-mapper.cancel": "Відмінити",
+
+  // "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",
+  "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.",
+  "collection.edit.item-mapper.description": "Це інструмент відображення елементів документа, який дозволяє адміністраторам колекції відображати елементи з інших колекцій у цю колекцію. Ви можете шукати елементи з інших колекцій і відображати їх, або переглядати список відображених елементів.",
+
+  // "collection.edit.item-mapper.head": " - Map Items from Other Collections",
+  "collection.edit.item-mapper.head": "Карта документа - карта документів з іншого зібрання",
+
+  // "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.",
+  "collection.edit.item-mapper.notifications.map.error.content": "Виникла помилка {{amount}} при відображені елементів документа.",
+
+  // "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.",
+  "collection.edit.item-mapper.notifications.map.success.content": "Документ {{amount}} успішно mapped.",
+
+  // "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+  // TODO "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed"
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+
+  // "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": "Виникла помилка mappings документа {{amount}}.",
+
+  // "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Видалити помилки mapping",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Успішно видалено mappings документа {{amount}}.",
+
+  // "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  // TODO "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+
+  // "collection.edit.item-mapper.remove": "Remove selected item mappings",
+  "collection.edit.item-mapper.remove": "Видалити mapping документа",
+
+  // "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+  "collection.edit.item-mapper.tabs.browse": "Переглянути елементи документа",
+
+  // "collection.edit.item-mapper.tabs.map": "Map new items",
+  "collection.edit.item-mapper.tabs.map": "mapping нових документів",
+
+
+
+  // "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.",
+  "collection.edit.logo.notifications.add.error": "Завантаження логотипу зібрання не вдалось.",
+
+  // "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",
+  "collection.edit.logo.notifications.delete.success.title": "Логотип видалено",
+
+  // "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",
+  "collection.edit.logo.notifications.delete.error.title": "Виникла помилка при видаленні логотипа",
+
+  // "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+  "collection.edit.logo.upload": "Виберіть логотип зібрання для завантаження",
+
+
+
+  // "collection.edit.notifications.success": "Successfully edited the Collection",
+  "collection.edit.notifications.success": "Зібрання успішно відредаговано",
+
+  // "collection.edit.return": "Return",
+  "collection.edit.return": "Повернутись",
+
+
+
+  // "collection.edit.tabs.curate.head": "Curate",
+  // TODO "collection.edit.tabs.curate.head": "Curate",
+  "collection.edit.tabs.curate.head": "Curate",
+
+  // "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  // TODO "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+  "collection.edit.tabs.curate.title": "Collection Edit - Curate",
+
+  // "collection.edit.tabs.authorizations.head": "Authorizations",
+
+  "collection.edit.tabs.authorizations.head": "Авторизація",
+
+  // "collection.edit.tabs.authorizations.title": "Collection Edit - Authorizations",
+
+  "collection.edit.tabs.authorizations.title": "Редагування зібрання - авторизація ",
+
+  // "collection.edit.tabs.metadata.head": "Edit Metadata",
+  "collection.edit.tabs.metadata.head": "Редагувати метадані",
+
+  // "collection.edit.tabs.metadata.title": "Collection Edit - Metadata",
+  "collection.edit.tabs.metadata.title": "Редагування зібрання - метадані",
+
+  // "collection.edit.tabs.roles.head": "Assign Roles",
+  "collection.edit.tabs.roles.head": "Призначити ролі",
+
+  // "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",
+  "collection.edit.tabs.source.external": "Вміст зібрання взято із зовнішнього джерела інформації",
+
+  // "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",
+  "collection.edit.tabs.source.form.harvestType": "Вміст отримано",
+
+  // "collection.edit.tabs.source.form.head": "Configure an external source",
+  "collection.edit.tabs.source.form.head": "Налаштувати зовнішні джерела інформації",
+
+  // "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 "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id"
+  "collection.edit.tabs.source.form.oaiSetId": "OAI specific set id",
+
+  // "collection.edit.tabs.source.form.oaiSource": "OAI Provider",
+  "collection.edit.tabs.source.form.oaiSource": "OAI Провайдер",
+
+  // "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)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Завантажити метадані та посилання на файли (потрібна ORE підтримка)",
+
+  // "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",
+  "collection.edit.tabs.source.head": "Джерело вмісту",
+
+  // "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",
+  "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.",
+  "collection.edit.tabs.source.notifications.invalid.content": "Ваші зміни не збережено. Перед збереженням переконайтеся, що всі поля правильно заповнені.",
+
+  // "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.",
+  "collection.edit.tabs.source.notifications.saved.content": "Ваші зміни до вмісту зібрання збережено.",
+
+  // "collection.edit.tabs.source.notifications.saved.title": "Content Source saved",
+  "collection.edit.tabs.source.notifications.saved.title": "Вміст джерела даних збереено",
+
+  // "collection.edit.tabs.source.title": " - Content Source",
+  "collection.edit.tabs.source.title": "Редагування зібрання - джерела даних",
+
+
+
+  // "collection.edit.template.add-button": "Add",
+
+  "collection.edit.template.add-button": "Додати",
+
+  // "collection.edit.template.breadcrumbs": "Item template",
+
+  "collection.edit.template.breadcrumbs": "Шаблон документа",
+
+  // "collection.edit.template.cancel": "Cancel",
+
+  "collection.edit.template.cancel": "Відмінити",
+
+  // "collection.edit.template.delete-button": "Delete",
+
+  "collection.edit.template.delete-button": "Видалити",
+
+  // "collection.edit.template.edit-button": "Edit",
+
+  "collection.edit.template.edit-button": "Редагувати",
+
+  // "collection.edit.template.head": "Edit Template Item for Collection \"{{ collection }}\"",
+
+  "collection.edit.template.head": "Редагувати шаблон документа зібрання \"{{ collection }}\"",
+
+  // "collection.edit.template.label": "Template item",
+
+  "collection.edit.template.label": "Шаблон документа",
+
+  // "collection.edit.template.notifications.delete.error": "Failed to delete the item template",
+
+  "collection.edit.template.notifications.delete.error": "Не вдалося видалити шаблон елемента",
+
+  // "collection.edit.template.notifications.delete.success": "Шаблон документа успішно видалено",
+
+  "collection.edit.template.notifications.delete.success": "Шаблон документа успішно видалено",
+
+  // "collection.edit.template.title": "Edit Template Item",
+
+  "collection.edit.template.title": "Редагувати шаблон документа",
+
+
+
+  // "collection.form.abstract": "Short Description",
+  "collection.form.abstract": "Короткий опис",
+
+  // "collection.form.description": "Introductory text (HTML)",
+  "collection.form.description": "Вступний текст (HTML)",
+
+  // "collection.form.errors.title.required": "Please enter a collection name",
+  "collection.form.errors.title.required": "Введіть назву зібрання",
+
+  // "collection.form.license": "License",
+  "collection.form.license": "Ліцензійна угода",
+
+  // "collection.form.provenance": "Provenance",
+  "collection.form.provenance": "Походження",
+
+  // "collection.form.rights": "Copyright text (HTML)",
+  "collection.form.rights": "Копірайт (HTML)",
+
+  // "collection.form.tableofcontents": "News (HTML)",
+  "collection.form.tableofcontents": "Новини (HTML)",
+
+  // "collection.form.title": "Name",
+  "collection.form.title": "Ім'я",
+
+
+
+  // "collection.listelement.badge": "Collection",
+
+  "collection.listelement.badge": "Зібрання",
+
+
+  //"home.recent-submissions.head": "Recent Submissions",
+  "home.recent-submissions.head": "Нові надходження",
+
+
+  //"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": "Логотип проекту",
+
+  // TODO  "thumbnail.project.placeholder": "Project Placeholder Image",
+  "thumbnail.project.placeholder": "Project Placeholder Image",
+
+  // "thumbnail.orgunit.alt": "OrgUnit Logo",
+  "thumbnail.orgunit.alt": "Логотип організації",
+
+  "thumbnail.orgunit.placeholder": "OrgUnit Placeholder Image",
+
+  //  "thumbnail.person.alt": "Profile Picture",
+  "thumbnail.person.alt": "Зображення профілю",
+
+  // "thumbnail.person.placeholder": "No Profile Picture Available",
+  "thumbnail.person.placeholder": "Зображення профілю відсутне",
+
+
+
+  // "collection.page.browse.recent.head": "Recent Submissions",
+  "collection.page.browse.recent.head": "Нові надходження",
+
+  // "collection.page.browse.recent.empty": "No items to show",
+  "collection.page.browse.recent.empty": "Немає документів",
+
+  // "collection.page.edit": "Edit this collection",
+
+  "collection.page.edit": "Редагувати зібрання",
+
+  // "collection.page.handle": "Permanent URI for this collection",
+  "collection.page.handle": "Постійне посилання зібрання",
+
+  // "collection.page.license": "License",
+  "collection.page.license": "Ліцензійна угода",
+
+  // "collection.page.news": "News",
+  "collection.page.news": "Новини",
+
+
+
+  // "collection.select.confirm": "Confirm selected",
+  "collection.select.confirm": "Підтвердити вибрані",
+
+  // "collection.select.empty": "No collections to show",
+  "collection.select.empty": "Зібрання відсутні",
+
+  // "collection.select.table.title": "Title",
+  "collection.select.table.title": "Назва",
+
+
+
+  // "collection.source.update.notifications.error.content": "The provided settings have been tested and didn't work.",
+  "collection.source.update.notifications.error.content": "Введені налаштування перевірені та не працюють.",
+
+  // "collection.source.update.notifications.error.title": "Server Error",
+  "collection.source.update.notifications.error.title": "Помилка роботи сервера, трясця його матері",
+
+
+
+  // "communityList.tabTitle": "DSpace - Community List",
+  "communityList.tabTitle": "Репозитарій - Фонди",
+
+  // "communityList.title": "List of Communities",
+  "communityList.title": "Перелік фондів",
+
+  // "communityList.showMore": "Show More",
+  "communityList.showMore": "Детальніше",
+
+
+
+  // "community.create.head": "Create a Community",
+  "community.create.head": "Створити фонд",
+
+  // "community.create.notifications.success": "Successfully created the Community",
+  "community.create.notifications.success": "Фонд успішно створено",
+
+  // "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
+  "community.create.sub-head": "Створити підфонд фонду {{ parent }}",
+
+  // "community.curate.header": "Curate Community: {{community}}",
+
+  "community.curate.header": "Основний фонд: {{community}}",
+
+  // "community.delete.cancel": "Cancel",
+  "community.delete.cancel": "Відмінити",
+
+  // "community.delete.confirm": "Confirm",
+  "community.delete.confirm": "Підтвердити",
+
+  // "community.delete.head": "Delete Community",
+  "community.delete.head": "Видалити фонд",
+
+  // "community.delete.notification.fail": "Community could not be deleted",
+  "community.delete.notification.fail": "Фонд не може бути видалено",
+
+  // "community.delete.notification.success": "Successfully deleted community",
+  "community.delete.notification.success": "Фонд успішно видалено",
+
+  // "community.delete.text": "Are you sure you want to delete community \"{{ dso }}\"",
+  "community.delete.text": "Ви впевнені, що хочете видалити фонд \"{{ dso }}\"",
+
+  // "community.edit.delete": "Delete this community",
+  "community.edit.delete": "Видалити цей фонд",
+
+  // "community.edit.head": "Edit Community",
+  "community.edit.head": "Редагувати фонд",
+
+  // "community.edit.breadcrumbs": "Edit Community",
+  "community.edit.breadcrumbs": "Редагувати фонд",
+
+
+  // "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.",
+  "community.edit.logo.notifications.add.error": "Помилка завантаження логотипу фонду. Перевірте все ще раз.",
+
+  // "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",
+  "community.edit.logo.notifications.delete.success.title": "Логотип видалено",
+
+  // "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",
+  "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",
+  "community.edit.notifications.success": "Фонд успішно відредаговано",
+
+  // "community.edit.notifications.unauthorized": "You do not have privileges to make this change",
+
+  "community.edit.notifications.unauthorized": "У Вас немає повноважень для змін",
+
+  // "community.edit.notifications.error": "An error occured while editing the Community",
+
+  "community.edit.notifications.error": "Виникла помилка при редагуванні фонду",
+
+  // "community.edit.return": "Return",
+  "community.edit.return": "Повернутись",
+
+
+
+  // "community.edit.tabs.curate.head": "Curate",
+  "community.edit.tabs.curate.head": "Основне/Curate",
+
+  // "community.edit.tabs.curate.title": "Community Edit - Curate",
+  "community.edit.tabs.curate.title": "Редагування фонду  - основне",
+
+  // "community.edit.tabs.metadata.head": "Edit Metadata",
+  "community.edit.tabs.metadata.head": "Реадгувати метадані",
+
+  // "community.edit.tabs.metadata.title": "Community Edit - Metadata",
+  "community.edit.tabs.metadata.title": "Редагування фонду - метадані",
+
+  // "community.edit.tabs.roles.head": "Assign Roles",
+  "community.edit.tabs.roles.head": "Призначити ролі",
+
+  // "community.edit.tabs.roles.title": "Community Edit - Roles",
+  "community.edit.tabs.roles.title": "Редаувати фонд - ролі",
+
+  // "community.edit.tabs.authorizations.head": "Authorizations",
+
+  "community.edit.tabs.authorizations.head": "Авторизація",
+
+  // "community.edit.tabs.authorizations.title": "Community Edit - Authorizations",
+
+  "community.edit.tabs.authorizations.title": "Редагування фонду - авторизація",
+
+
+
+  // "community.listelement.badge": "Community",
+
+  "community.listelement.badge": "Фонд",
+
+
+
+  // "comcol-role.edit.no-group": "None",
+
+  "comcol-role.edit.no-group": "Жодної",
+
+  // "comcol-role.edit.create": "Create",
+
+  "comcol-role.edit.create": "Створити",
+
+  // "comcol-role.edit.restrict": "Restrict",
+
+  "comcol-role.edit.restrict": "Обмежити",
+
+  // "comcol-role.edit.delete": "Delete",
+
+  "comcol-role.edit.delete": "Видалити",
+
+
+  // "comcol-role.edit.community-admin.name": "Administrators",
+
+  "comcol-role.edit.community-admin.name": "Адміністратори",
+
+  // "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": "Адміністратори фонду можуть створювати підфонди або зібрання, а також керувати цими. Крім того, вони вирішують, хто може надсилати документи до будь-якого зібрання, редагувати метадані документа (після надсилання) і додавати (відображати) існуючі елементи з інших зібрань(за умови наданих повноважень).",
+
+  // "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",
+
+  "comcol-role.edit.submitters.name": "Подавачі/Submitters",
+
+  // "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",
+
+  "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.",
+
+  "comcol-role.edit.item_read.description": "Користувачі та групи, які можуть читати нові документи, що надіслані до цього зібрання. Зміни цієї ролі не мають зворотної сили. Існуючі документи в системі все ще будуть доступні для перегляду тим, хто мав доступ для читання на момент їх додавання.",
+
+  // "comcol-role.edit.item_read.anonymous-group": "Default read for incoming items is currently set to Anonymous.",
+
+  "comcol-role.edit.item_read.anonymous-group": "Для групи Anonymous встановлено права документа на читання.",
+
+
+  // "comcol-role.edit.bitstream_read.name": "Доступ на читання для файла",
+
+  "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).",
+
+  "comcol-role.edit.bitstream_read.description": "Адміністратори фонду можуть створювати підфонди або зібрання, а також керувати ними. Крім того, вони вирішують, хто може надсилати документи до будь-якого зібрання, редагувати метадані документа (після надсилання) і додавати документи з інших колекцій (за умови наявності прав доступу)..",
+
+  // "comcol-role.edit.bitstream_read.anonymous-group": "Default read for incoming bitstreams is currently set to Anonymous.",
+
+  "comcol-role.edit.bitstream_read.anonymous-group": "Для групи Anonymous встановлено права файла на читання",
+
+
+  // "comcol-role.edit.editor.name": "Редактори",
+
+  "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.",
+
+  "comcol-role.edit.editor.description": "Редактори мають повноваження редагувати метадані, приймати та відхиляти їх, зокрема, для документів, що заносяться у репозитарій.",
+
+
+  // "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.",
+
+  "comcol-role.edit.finaleditor.description": "Остаточні редактори мають повноваження редагувати метадані, але не мають права відхилити документ.",
+
+
+  // "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.",
+
+  "comcol-role.edit.reviewer.description": "Рецензенти можуть приймати або відхиляти вхідні документи. Однак вони не можуть редагувати метадані.",
+
+
+
+  // "community.form.abstract": "Short Description",
+  "community.form.abstract": "Короткий опис",
+
+  // "community.form.description": "Introductory text (HTML)",
+  "community.form.description": "Вхідний текст (HTML)",
+
+  // "community.form.errors.title.required": "Please enter a community name",
+  "community.form.errors.title.required": "Будь ласка, введіть назву фонду",
+
+  // "community.form.rights": "Copyright text (HTML)",
+  "community.form.rights": "Копірайт (HTML)",
+
+  // "community.form.tableofcontents": "News (HTML)",
+  "community.form.tableofcontents": "Новини (HTML)",
+
+  // "community.form.title": "Name",
+  "community.form.title": "Ім'я",
+
+  // "community.page.edit": "Edit this community",
+
+  "community.page.edit": "Редагувати фонд",
+
+  // "community.page.handle": "Permanent URI for this community",
+  "community.page.handle": "Постійне посилання на фонд",
+
+  // "community.page.license": "License",
+  "community.page.license": "Ліцензійна угода",
+
+  // "community.page.news": "News",
+  "community.page.news": "Новини",
+
+  // "community.all-lists.head": "Subcommunities and Collections",
+  "community.all-lists.head": "Підфонди та зібрання",
+
+  // "community.sub-collection-list.head": "Collections of this Community",
+  "community.sub-collection-list.head": "Зібрання у цьому фонді",
+
+  // "community.sub-community-list.head": "Communities of this Community",
+  "community.sub-community-list.head": "Фонди, що знаходяться у цьому фонді",
+
+
+  // "cookies.consent.accept-all": "Accept all",
+  "cookies.consent.accept-all": "Прийняти все",
+
+  // "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)",
+  "cookies.consent.app.opt-out.description": "Цей додаток був завантажений по замовчуванню. Але Ви можете відмовитись від нього",
+
+  // "cookies.consent.app.opt-out.title": "(opt-out)",
+  "cookies.consent.app.opt-out.title": "(відмовитись)",
+
+  // "cookies.consent.app.purpose": "purpose",
+  "cookies.consent.app.purpose": "ціль",
+
+  // "cookies.consent.app.required.description": "This application is always required",
+  "cookies.consent.app.required.description": "Цей додаток завжди потрібний",
+
+  // "cookies.consent.app.required.title": "(always required)",
+  "cookies.consent.app.required.title": "(завжди потрібний)",
+
+  // "cookies.consent.update": "There were changes since your last visit, please update your consent.",
+  "cookies.consent.update": "З часу вашого останнього відвідування відбулися зміни, підтвердьте це.",
+
+  // "cookies.consent.close": "Close",
+  "cookies.consent.close": "Закрити",
+
+  // "cookies.consent.decline": "Decline",
+  "cookies.consent.decline": "Відхилити",
+
+  // "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.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.",
+  "cookies.consent.content-modal.description": "Тут ви можете переглянути та налаштувати збір інформаціїпро Вас.",
+
+  // "cookies.consent.content-modal.privacy-policy.name": "privacy policy",
+  "cookies.consent.content-modal.privacy-policy.name": "політика приватності",
+
+  // "cookies.consent.content-modal.privacy-policy.text": " {privacyPolicy}.",
+  "cookies.consent.content-modal.privacy-policy.text": "Детальніше - {privacyPolicy}.",
+
+  // "cookies.consent.content-modal.title": "Information that we collect",
+  "cookies.consent.content-modal.title": "Інформація, яку ми збираємо",
+
+  // "cookies.consent.app.title.authentication": "Authentication",
+  "cookies.consent.app.title.authentication": "Увійти",
+
+  // "cookies.consent.app.description.authentication": "Required for signing you in",
+  "cookies.consent.app.description.authentication": "Необхідно для входу",
+
+  // "cookies.consent.app.title.preferences": "Preferences",
+  "cookies.consent.app.title.preferences": "Налаштування",
+
+  // "cookies.consent.app.description.preferences": "Required for saving your preferences",
+  "cookies.consent.app.description.preferences": "Необхідно для збереження ваших налаштувань",
+
+  // "cookies.consent.app.title.acknowledgement": "Acknowledgement",
+  "cookies.consent.app.title.acknowledgement": "Підтвердження",
+
+  // "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",
+  "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": "Дозволяє нам відстежувати статистичні дані",
+
+  // "cookies.consent.purpose.functional": "Functional",
+  "cookies.consent.purpose.functional": "Функціональний",
+
+  // "cookies.consent.purpose.statistical": "Statistical",
+  "cookies.consent.purpose.statistical": "Статичний",
+
+
+  // "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.profileformats.label": "Profile Bitstream Formats",
+  "curation-task.task.profileformats.label": "Профіль форматів файлів",
+
+  // "curation-task.task.requiredmetadata.label": "Check for Required Metadata",
+  "curation-task.task.requiredmetadata.label": "Перевірте наявність необхідних метаданих",
+
+  // "curation-task.task.translate.label": "Microsoft Translator",
+  "curation-task.task.translate.label": "Microsoft Translator",
+
+  // "curation-task.task.vscan.label": "Virus Scan",
+  "curation-task.task.vscan.label": "Перевірка на віруси",
+
+
+
+  // "curation.form.task-select.label": "Task:",
+  "curation.form.task-select.label": "Завдання:",
+
+  // "curation.form.submit": "Start",
+  "curation.form.submit": "Почати",
+
+  // "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.",
+  "curation.form.submit.success.content": "Ви будете перенаправлені на сторінку відповідного процесу.",
+
+  // "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.",
+  "curation.form.submit.error.content": "Виникла помилка при спробі розпочати завдання.",
+
+  // "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": "Підказка: Введіть [your-handle-prefix]/0 для запуску завдання на весь сайт (не всі види завдань це підтримують)",
+
+
+
+  // "dso-selector.create.collection.head": "New collection",
+  "dso-selector.create.collection.head": "Нове зібрання",
+
+  // "dso-selector.create.collection.sub-level": "Create a new collection in",
+  "dso-selector.create.collection.sub-level": "Створити нове зібрання в",
+
+  // "dso-selector.create.community.head": "New community",
+  "dso-selector.create.community.head": "Новий фонд",
+
+  // "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",
+  "dso-selector.create.community.top-level": "Створити фонд верхнього рівня",
+
+  // "dso-selector.create.item.head": "New item",
+  "dso-selector.create.item.head": "Новий документ",
+
+  // "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.edit.collection.head": "Edit collection",
+  "dso-selector.edit.collection.head": "Редагувати зібрання",
+
+  // "dso-selector.edit.community.head": "Edit community",
+  "dso-selector.edit.community.head": "Редагувати фонд",
+
+  // "dso-selector.edit.item.head": "Edit item",
+  "dso-selector.edit.item.head": "Редагувати документ",
+
+  // "dso-selector.export-metadata.dspaceobject.head": "Export metadata from",
+  "dso-selector.export-metadata.dspaceobject.head": "Експорт метаданих з",
+
+  // "dso-selector.no-results": "No {{ type }} found",
+  "dso-selector.no-results": "{{ type }} не знайдено",
+
+  // "dso-selector.placeholder": "Search for a {{ type }}",
+  "dso-selector.placeholder": "Шукати {{ type }}",
+
+
+
+  // "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 }}",
+  "confirmation-modal.export-metadata.info": "Ви впевнені, що хочете експортувати метадані для {{ dsoName }}?",
+
+  // "confirmation-modal.export-metadata.cancel": "Cancel",
+  "confirmation-modal.export-metadata.cancel": "Скасувати",
+
+  // "confirmation-modal.export-metadata.confirm": "Export",
+  "confirmation-modal.export-metadata.confirm": "Скасувати",
+
+  // "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 }}\"",
+  "confirmation-modal.delete-eperson.info": "Ви впевнені, що хочете видалити користувача \"{{ dsoName }}\"?",
+
+  // "confirmation-modal.delete-eperson.cancel": "Cancel",
+  "confirmation-modal.delete-eperson.cancel": "Скасувати",
+
+  // "confirmation-modal.delete-eperson.confirm": "Delete",
+  "confirmation-modal.delete-eperson.confirm": "Видалити",
+
+
+  // "error.bitstream": "Error fetching bitstream",
+  "error.bitstream": "Виникла помилка при отриманні файлу",
+
+  // "error.browse-by": "Error fetching items",
+  "error.browse-by": "Виникла помилка при отриманні документа",
+
+  // "error.collection": "Error fetching collection",
+  "error.collection": "Виникла помилка при отриманні зібрання",
+
+  // "error.collections": "Error fetching collections",
+  "error.collections": "Виникла помилка при отриманні зібрань",
+
+  // "error.community": "Error fetching community",
+  "error.community": "Виникла помилка при отриманні фонду",
+
+  // "error.identifier": "No item found for the identifier",
+  "error.identifier": "Жодного документу не знайдено за вказаним ідентифікатором",
+
+  // "error.default": "Error",
+  "error.default": "Виникла якась помилка, шляк трафить",
+
+  // "error.item": "Error fetching item",
+  "error.item": "Виникла помилка при отриманні документа",
+
+  // "error.items": "Error fetching items",
+  "error.items": "Виникла помилка при отриманні документів",
+
+  // "error.objects": "Error fetching objects",
+  "error.objects": "Виникла помилка при отриманні об'єктів",
+
+  // "error.recent-submissions": "Error fetching recent submissions",
+  "error.recent-submissions": "Виникла помилка при отриманні останніх submissions ",
+
+  // "error.search-results": "Error fetching search results",
+  "error.search-results": "Виникла помилка при отриманні пошукових результатів",
+
+  // "error.sub-collections": "Error fetching sub-collections",
+  "error.sub-collections": "Виникла помилка при отриманні підзібрання",
+
+  // "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>",
+  "error.submission.sections.init-form-error": "Сталася помилка. Перевірте конфігурацію форми введення. Подробиці нижче: <br> <br>",
+
+  // "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.",
+  "error.validation.license.notgranted": "Ви повинні дати згоду на умови ліцензії, щоб завершити submission. Якщо ви не можете погодитись на умови ліцензії на даний момент, ви можете зберегти свою роботу та повернутися пізніше або видалити submission.",
+
+  // "error.validation.pattern": "This input is restricted by the current pattern: {{ pattern }}.",
+  "error.validation.pattern": "Вхідна інформація обмежена поточним шаблоном: {{ pattern }}.",
+
+  // "error.validation.filerequired": "The file upload is mandatory",
+  "error.validation.filerequired": "Завантаження файлу є обов'язковим",
+
+
+
+  // "file-section.error.header": "Error obtaining files for this item",
+  "file-section.error.header": "Помилка отримання файлів для цього документа",
+
+
+
+  // "footer.copyright": "copyright © 2002-{{ year }}",
+  "footer.copyright": "copyright © 2002-{{ year }}",
+
+  // "footer.link.dspace": "DSpace software",
+  //TODO Change your univer
+  "footer.link.dspace": "DSpace software and Lviv Polytechnic National University",
+
+  // "footer.link.lyrasis": "LYRASIS",
+  "footer.link.lyrasis": "LYRASIS",
+
+  // "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": "Угода користувача",
+
+
+
+  // "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.",
+  "forgot-email.form.info": "Зареєструйтесь для отримання повідомлень про нові надходження та отримайте можливість вносити документи.",
+
+  // "forgot-email.form.email": "Email Address *",
+  "forgot-email.form.email": "Email *",
+
+  // "forgot-email.form.email.error.required": "Please fill in an email address",
+  "forgot-email.form.email.error.required": "Введіть email",
+
+  // "forgot-email.form.email.error.pattern": "Please fill in a valid email address",
+  "forgot-email.form.email.error.pattern": "Ви повинні ввести правильний email",
+
+  // "forgot-email.form.email.hint": "This address will be verified and used as your login name.",
+  "forgot-email.form.email.hint": "Ми провіримо цей email. Використовуйте його для входу у репозитарій",
+
+  // "forgot-email.form.submit": "Submit",
+  "forgot-email.form.submit": "Надіслати",
+
+  // "forgot-email.form.success.head": "Verification email sent",
+  "forgot-email.form.success.head": "На Ваш email було надіслане повідомлення",
+
+  // "forgot-email.form.success.content": "An email has been sent to {{ email }} containing a special URL and further instructions.",
+  "forgot-email.form.success.content": "На {{ email }} було надіслане повідомлення, що містить спеціальне посилання та подальші інструкції.",
+
+  // "forgot-email.form.error.head": "Error when trying to register email",
+  "forgot-email.form.error.head": "Виникла помилка при реєстрації email",
+
+  // "forgot-email.form.error.content": "An error occured when registering the following email address: {{ email }}",
+  "forgot-email.form.error.content": "Виникла помилка при реєстрації email: {{ email }}",
+
+
+
+  // "forgot-password.title": "Forgot Password",
+  "forgot-password.title": "Забули пароль?",
+
+  // "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.",
+  "forgot-password.form.info": "Введіть новий пароль у поле нижче та підтвердьте його, ввівши його ще раз у друге поле. Він має містити щонайменше 6 символів.",
+
+  // "forgot-password.form.card.security": "Security",
+  "forgot-password.form.card.security": "Безпека",
+
+  // "forgot-password.form.identification.header": "Identify",
+  "forgot-password.form.identification.header": "Ідентифікація",
+
+  // "forgot-password.form.identification.email": "Email address: ",
+  "forgot-password.form.identification.email": "Email: ",
+
+  // "forgot-password.form.label.password": "Password",
+  "forgot-password.form.label.password": "Пароль",
+
+  // "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.",
+  "forgot-password.form.error.empty-password": "Введіть пароль у поле нижче.",
+
+  // "forgot-password.form.error.matching-passwords": "The passwords do not match.",
+  "forgot-password.form.error.matching-passwords": "Паролі не співпадають.",
+
+  // "forgot-password.form.error.password-length": "The password should be at least 6 characters long.",
+  "forgot-password.form.error.password-length": "Довжина пароля повинна становити не менше 6 символів.",
+
+  // "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.",
+  "forgot-password.form.notification.success.content": "Пароль успішно скинуто. Ви увійшли під щойно створеним користувачем.",
+
+  // "forgot-password.form.notification.success.title": "Password reset completed",
+  "forgot-password.form.notification.success.title": "Пароль скинуто успішно",
+
+  // "forgot-password.form.submit": "Submit password",
+  "forgot-password.form.submit": "Надіслати пароль",
+
+
+
+  // "form.add": "Add",
+  "form.add": "Додати",
+
+  // "form.add-help": "Click here to add the current entry and to add another one",
+  "form.add-help": "Натисніть тут, щоб додати поточний запис і додати інший",
+
+  // "form.cancel": "Cancel",
+  "form.cancel": "Скасувати",
+
+  // "form.clear": "Clear",
+  "form.clear": "Очистити",
+
+  // "form.clear-help": "Click here to remove the selected value",
+  "form.clear-help": "Натисніть тут, щоб видалити вибране значення",
+
+  // "form.edit": "Edit",
+  "form.edit": "Редагувати",
+
+  // "form.edit-help": "Click here to edit the selected value",
+  "form.edit-help": "Натисніть тут, щоб змінити вибране значення",
+
+  // "form.first-name": "First name",
+  "form.first-name": "Ім'я",
+
+  // "form.group-collapse": "Collapse",
+  "form.group-collapse": "Згорнути",
+
+  // "form.group-collapse-help": "Click here to collapse",
+  "form.group-collapse-help": "Натисніть тут щоб згорнути",
+
+  // "form.group-expand": "Expand",
+  "form.group-expand": "Розгорнути",
+
+  // "form.group-expand-help": "Click here to expand and add more elements",
+  "form.group-expand-help": "Натисніть тут, щоб розгорнути та додати більше елементів",
+
+  // "form.last-name": "Last name",
+  "form.last-name": "Прізвище",
+
+  // "form.loading": "Loading...",
+  "form.loading": "Вантажиться...",
+
+  // "form.lookup": "Lookup",
+  "form.lookup": "Пошук",
+
+  // "form.lookup-help": "Click here to look up an existing relation",
+  "form.lookup-help": "Клацніть тут, щоб знайти існуючий зв’язок",
+
+  // "form.no-results": "No results found",
+  "form.no-results": "Нічого не знайдено",
+
+  // "form.no-value": "No value entered",
+  "form.no-value": "Значення не введено",
+
+  // "form.remove": "Remove",
+  "form.remove": "Видалити",
+
+  // "form.save": "Save",
+  "form.save": "Зберегти",
+
+  // "form.save-help": "Save changes",
+  "form.save-help": "Зберегти зміни",
+
+  // "form.search": "Search",
+  "form.search": "Пошук",
+
+  // "form.search-help": "Click here to look for an existing correspondence",
+  "form.search-help": "Клацніть тут, щоб знайти наявне листування",
+
+  // "form.submit": "Submit",
+  "form.submit": "Надіслати",
+
+
+
+  // "home.description": "",
+  "home.description": "",
+
+  // "home.breadcrumbs": "Home",
+  "home.breadcrumbs": "Головна",
+
+  // "home.title": "DSpace Angular :: Home",
+  // TODO Change univer name
+  "home.title": "Репозитарій Львівської політехніки :: Головна",
+
+  // "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.",
+  "home.top-level-communities.help": "Виберіть фонд, щоб переглянути його зібрання.",
+
+
+
+  // "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",
+  "info.end-user-agreement.accept.error": "Виникла помилки при при фіксуванні Вашої згоди на користувацьку угоду",
+
+  // "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",
+  "info.end-user-agreement.breadcrumbs": "Користувацька угода",
+
+  // "info.end-user-agreement.buttons.cancel": "Cancel",
+  "info.end-user-agreement.buttons.cancel": "Відмінити",
+
+  // "info.end-user-agreement.buttons.save": "Save",
+  "info.end-user-agreement.buttons.save": "Зберегти",
+
+  // "info.end-user-agreement.head": "End User Agreement",
+  "info.end-user-agreement.head": "Користувацька угода",
+
+  // "info.end-user-agreement.title": "End User Agreement",
+  "info.end-user-agreement.title": "Користувацька угода",
+
+  // "info.privacy.breadcrumbs": "Privacy Statement",
+  "info.privacy.breadcrumbs": "Заява про конфіденційність",
+
+  // "info.privacy.head": "Privacy Statement",
+  "info.privacy.head": "Заява про конфіденційність",
+
+  // "info.privacy.title": "Privacy Statement",
+  "info.privacy.title": "Заява про конфіденційність",
+
+
+
+  // "item.alerts.private": "This item is private",
+  "item.alerts.private": "Доступ до документа закритий",
+
+  // "item.alerts.withdrawn": "This item has been withdrawn",
+  "item.alerts.withdrawn": "Цей документ було вилучено",
+
+
+
+  // "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",
+  "item.edit.authorizations.title": "Редагувати політики документа",
+
+
+
+  // "item.badge.private": "Private",
+  "item.badge.private": "Приватне",
+
+  // "item.badge.withdrawn": "Withdrawn",
+  "item.badge.withdrawn": "Вилучено",
+
+
+
+  // "item.bitstreams.upload.bundle": "Bundle",
+  "item.bitstreams.upload.bundle": "контейнер файлів",
+
+  // "item.bitstreams.upload.bundle.placeholder": "Select a bundle",
+  "item.bitstreams.upload.bundle.placeholder": "Виберіть контейнер файлів",
+
+  // "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.",
+  "item.bitstreams.upload.bundles.empty": "Цей документ не містить контейнеру файлів, щоб завантажити файл.",
+
+  // "item.bitstreams.upload.cancel": "Cancel",
+  "item.bitstreams.upload.cancel": "Відмінити",
+
+  // "item.bitstreams.upload.drop-message": "Drop a file to upload",
+  "item.bitstreams.upload.drop-message": "Виберіть файл для завантаження",
+
+  // "item.bitstreams.upload.item": "Item: ",
+  "item.bitstreams.upload.item": "Документ: ",
+
+  // "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",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Контейнер файлів створено.",
+
+  // "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",
+  "item.bitstreams.upload.title": "Завантажити файл",
+
+
+
+  // "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 }}.",
+  "item.edit.bitstreams.bundle.displaying": "Зараз відображаються {{ amount }}файли {{ total }}.",
+
+  // "item.edit.bitstreams.bundle.load.all": "Load all ({{ total }})",
+  "item.edit.bitstreams.bundle.load.all": "Завантажити все ({{ total }})",
+
+  // "item.edit.bitstreams.bundle.load.more": "Load more",
+  "item.edit.bitstreams.bundle.load.more": "Завантажити ще",
+
+  // "item.edit.bitstreams.bundle.name": "BUNDLE: {{ name }}",
+  "item.edit.bitstreams.bundle.name": "Контейнер файлів: {{ name }}",
+
+  // "item.edit.bitstreams.discard-button": "Discard",
+  "item.edit.bitstreams.discard-button": "Відхилити",
+
+  // "item.edit.bitstreams.edit.buttons.download": "Download",
+  "item.edit.bitstreams.edit.buttons.download": "Завантажити",
+
+  // "item.edit.bitstreams.edit.buttons.drag": "Drag",
+  "item.edit.bitstreams.edit.buttons.drag": "Перетягнути",
+
+  // "item.edit.bitstreams.edit.buttons.edit": "Edit",
+  "item.edit.bitstreams.edit.buttons.edit": "Редагувати",
+
+  // "item.edit.bitstreams.edit.buttons.remove": "Remove",
+  "item.edit.bitstreams.edit.buttons.remove": "Видалити",
+
+  // "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.",
+  "item.edit.bitstreams.empty": "Цей документ не містить жодного файлу. Клацніть для завантаження",
+
+  // "item.edit.bitstreams.headers.actions": "Actions",
+  "item.edit.bitstreams.headers.actions": "Дії",
+
+  // "item.edit.bitstreams.headers.bundle": "Bundle",
+  "item.edit.bitstreams.headers.bundle": "Контецнер файлів",
+
+  // "item.edit.bitstreams.headers.description": "Description",
+  "item.edit.bitstreams.headers.description": "Опис",
+
+  // "item.edit.bitstreams.headers.format": "Format",
+  "item.edit.bitstreams.headers.format": "Формат",
+
+  // "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",
+  "item.edit.bitstreams.notifications.discarded.content": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Назад-.",
+
+  // "item.edit.bitstreams.notifications.discarded.title": "Changes discarded",
+  "item.edit.bitstreams.notifications.discarded.title": "Зміни скасовано",
+
+  // "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.",
+  "item.edit.bitstreams.notifications.move.saved.content": "Зміни до документа збережені.",
+
+  // "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",
+  "item.edit.bitstreams.notifications.outdated.content": "Документ, над яким ви зараз працюєте, був змінений іншим користувачем. Ваші поточні зміни відхилено, щоб запобігти конфліктам",
+
+  // "item.edit.bitstreams.notifications.outdated.title": "Changes outdated",
+  "item.edit.bitstreams.notifications.outdated.title": "Зміни застаріли",
+
+  // "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.",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Ваші зміни до документа збережено.",
+
+  // "item.edit.bitstreams.notifications.remove.saved.title": "Removal changes saved",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Ваші зміни до документа збережено",
+
+  // "item.edit.bitstreams.reinstate-button": "Undo",
+  "item.edit.bitstreams.reinstate-button": "Назад",
+
+  // "item.edit.bitstreams.save-button": "Save",
+  "item.edit.bitstreams.save-button": "Зберегти",
+
+  // "item.edit.bitstreams.upload-button": "Upload",
+  "item.edit.bitstreams.upload-button": "Завантажити",
+
+
+
+  // "item.edit.delete.cancel": "Cancel",
+  "item.edit.delete.cancel": "Відмінити",
+
+  // "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.",
+  "item.edit.delete.description": "Ви впевнені, що цей документ потрібно повністю видалити? Застереження: можливості відновити не буде.",
+
+  // "item.edit.delete.error": "An error occurred while deleting the item",
+  "item.edit.delete.error": "Виникла помилка при видаленні документа",
+
+  // "item.edit.delete.header": "Delete item: {{ id }}",
+  "item.edit.delete.header": "Видалити документ: {{ id }}",
+
+  // "item.edit.delete.success": "The item has been deleted",
+  "item.edit.delete.success": "Документ видалено",
+
+  // "item.edit.head": "Edit Item",
+  "item.edit.head": "Редагувати документ",
+
+  // "item.edit.breadcrumbs": "Edit Item",
+  "item.edit.breadcrumbs": "Редагувати документ",
+
+
+  // "item.edit.tabs.mapper.head": "Collection Mapper",
+  "item.edit.tabs.mapper.head": "Карта зібрання",
+
+  // "item.edit.tabs.item-mapper.title": "Item Edit - Collection Mapper",
+  "item.edit.tabs.item-mapper.title": "Редагування документа - карта зібрання",
+
+  // "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",
+  "item.edit.item-mapper.buttons.remove": "Видалити карту документа для вибраного зібрання",
+
+  // "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.",
+  "item.edit.item-mapper.description": "Це інструмент карти документа, який дозволяє адміністраторам прив'язувати цей документ до інших зібрань. Ви можете шукати зібрання та прив'язувати їх, або переглядати список зібрань на які посилається документ.",
+
+  // "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>\"",
+  "item.edit.item-mapper.item": "Документ: \"<b>{{name}}</b>\"",
+
+  // "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.",
+  "item.edit.item-mapper.notifications.add.error.content": "Виникла помилка прив'язування документа до{{amount}} зібрання.",
+
+  // "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.",
+  "item.edit.item-mapper.notifications.add.success.content": "Документ успішно прив'язано до {{amount}} зібрання.",
+
+  // "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.",
+  "item.edit.item-mapper.notifications.remove.error.content": "Виникла помилка прив'язування документа до {{amount}} зібрання.",
+
+  // "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.",
+  "item.edit.item-mapper.notifications.remove.success.content": "Прив'язування документа до {{amount}} зібрання успішно видалено.",
+
+  // "item.edit.item-mapper.notifications.remove.success.head": "Removal of mapping completed",
+  "item.edit.item-mapper.notifications.remove.success.head": "Прив'язування видалено",
+
+  // "item.edit.item-mapper.tabs.browse": "Browse mapped collections",
+  "item.edit.item-mapper.tabs.browse": "Переглянути прив'язки зібрання",
+
+  // "item.edit.item-mapper.tabs.map": "Map new collections",
+  "item.edit.item-mapper.tabs.map": "Прив'язати нове зібрання",
+
+
+
+  // "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.buttons.edit": "Edit",
+  "item.edit.metadata.edit.buttons.edit": "Редагувати",
+
+  // "item.edit.metadata.edit.buttons.remove": "Remove",
+  "item.edit.metadata.edit.buttons.remove": "Видалити",
+
+  // "item.edit.metadata.edit.buttons.undo": "Undo changes",
+  "item.edit.metadata.edit.buttons.undo": "Відмінити зміни",
+
+  // "item.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "item.edit.metadata.edit.buttons.unedit": "Зупинити редагування",
+
+  // "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",
+  "item.edit.metadata.headers.edit": "Редагувати",
+
+  // "item.edit.metadata.headers.field": "Field",
+  "item.edit.metadata.headers.field": "Поле",
+
+  // "item.edit.metadata.headers.language": "Lang",
+  "item.edit.metadata.headers.language": "Мова",
+
+  // "item.edit.metadata.headers.value": "Value",
+  "item.edit.metadata.headers.value": "Значення",
+
+  // "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",
+  "item.edit.metadata.notifications.discarded.content": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Повернутись-.",
+
+  // "item.edit.metadata.notifications.discarded.title": "Changed discarded",
+  "item.edit.metadata.notifications.discarded.title": "Ваші зміни скасовано",
+
+  // "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.",
+  "item.edit.metadata.notifications.invalid.content": "Ваші зміни не збережено. Перед збереженням переконайтеся, що всі поля вірно заповнені.",
+
+  // "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",
+  "item.edit.metadata.notifications.outdated.content": "Документ, над яким ви зараз працюєте, був змінений іншим користувачем. Ваші поточні зміни відхилено, щоб запобігти конфліктам",
+
+  // "item.edit.metadata.notifications.outdated.title": "Changed outdated",
+  "item.edit.metadata.notifications.outdated.title": "Зміни застаріли",
+
+  // "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",
+  "item.edit.metadata.notifications.saved.title": "Метадані збережено",
+
+  // "item.edit.metadata.reinstate-button": "Undo",
+  "item.edit.metadata.reinstate-button": "Повернутись",
+
+  // "item.edit.metadata.save-button": "Save",
+  "item.edit.metadata.save-button": "Зберегти",
+
+
+
+  // "item.edit.modify.overview.field": "Field",
+  "item.edit.modify.overview.field": "Поле",
+
+  // "item.edit.modify.overview.language": "Language",
+  "item.edit.modify.overview.language": "Мова",
+
+  // "item.edit.modify.overview.value": "Value",
+  "item.edit.modify.overview.value": "Значення",
+
+
+
+  // "item.edit.move.cancel": "Cancel",
+  "item.edit.move.cancel": "Відмінити",
+
+  // "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",
+  "item.edit.move.error": "Під час спроби перемістити документ - сталася помилка",
+
+  // "item.edit.move.head": "Move item: {{id}}",
+  "item.edit.move.head": "Перемістити документ: {{id}}",
+
+  // "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",
+  "item.edit.move.inheritpolicies.description": "Наслідувати політики за замовчуванням цільового зібрання",
+
+  // "item.edit.move.move": "Move",
+  "item.edit.move.move": "Перенести",
+
+  // "item.edit.move.processing": "Moving...",
+  "item.edit.move.processing": "Переносимо...",
+
+  // "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",
+  "item.edit.move.success": "Документ успішно перенесено",
+
+  // "item.edit.move.title": "Move item",
+  "item.edit.move.title": "Перенести документ",
+
+
+
+  // "item.edit.private.cancel": "Cancel",
+  "item.edit.private.cancel": "Відмінити",
+
+  // "item.edit.private.confirm": "Make it Private",
+  "item.edit.private.confirm": "Закрити доступ",
+
+  // "item.edit.private.description": "Are you sure this item should be made private in the archive?",
+  "item.edit.private.description": "Ви впевнені, що хочете закрити доступ до документа?",
+
+  // "item.edit.private.error": "An error occurred while making the item private",
+  "item.edit.private.error": "Виникла помилка при закритті доступу до документа",
+
+  // "item.edit.private.header": "Make item private: {{ id }}",
+  "item.edit.private.header": "Закрити доступ документу: {{ id }}",
+
+  // "item.edit.private.success": "The item is now private",
+  "item.edit.private.success": "Доступ до документа закритий",
+
+
+
+  // "item.edit.public.cancel": "Cancel",
+  "item.edit.public.cancel": "ВІдмінити",
+
+  // "item.edit.public.confirm": "Make it Public",
+  "item.edit.public.confirm": "Зробити загальнодоступним",
+
+  // "item.edit.public.description": "Are you sure this item should be made public in the archive?",
+  "item.edit.public.description": "Ви впевнені, що хочете зробити вільним доступ до документа?",
+
+  // "item.edit.public.error": "An error occurred while making the item public",
+  "item.edit.public.error": "Виникла помилка при відкритті доступу до документа",
+
+  // "item.edit.public.header": "Make item public: {{ id }}",
+  "item.edit.public.header": "Зробити документ загальнодоступним: {{ id }}",
+
+  // "item.edit.public.success": "The item is now public",
+  "item.edit.public.success": "Документ тепер загальнодоступний",
+
+
+
+  // "item.edit.reinstate.cancel": "Cancel",
+  "item.edit.reinstate.cancel": "Відмінити",
+
+  // "item.edit.reinstate.confirm": "Reinstate",
+  "item.edit.reinstate.confirm": "Відновити",
+
+  // "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",
+  "item.edit.reinstate.error": "Виникла помилка при відновленні документа",
+
+  // "item.edit.reinstate.header": "Reinstate item: {{ id }}",
+  "item.edit.reinstate.header": "Відновлення документа: {{ id }}",
+
+  // "item.edit.reinstate.success": "The item was reinstated successfully",
+  "item.edit.reinstate.success": "Документ був успішно відновлений",
+
+
+
+  // "item.edit.relationships.discard-button": "Discard",
+  "item.edit.relationships.discard-button": "Відмінити",
+
+  // "item.edit.relationships.edit.buttons.add": "Add",
+  "item.edit.relationships.edit.buttons.add": "Додати",
+
+  // "item.edit.relationships.edit.buttons.remove": "Remove",
+  "item.edit.relationships.edit.buttons.remove": "Видалити",
+
+  // "item.edit.relationships.edit.buttons.undo": "Undo changes",
+  "item.edit.relationships.edit.buttons.undo": "Повернути зміни",
+
+  // "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",
+  "item.edit.relationships.notifications.discarded.content": "Ваші зміни скасовано. Щоб відновити зміни, натисніть кнопку -Повернутись-",
+
+  // "item.edit.relationships.notifications.discarded.title": "Changes discarded",
+  "item.edit.relationships.notifications.discarded.title": "Зміни скасовано",
+
+  // "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",
+  "item.edit.relationships.notifications.outdated.content": "Документ, над яким ви зараз працюєте, був змінений іншим користувачем. Ваші поточні зміни відхилено, щоб запобігти конфліктам",
+
+  // "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.",
+  "item.edit.relationships.notifications.saved.content": "Зміни до зв'язків документа успішно збережено.",
+
+  // "item.edit.relationships.notifications.saved.title": "Relationships saved",
+  "item.edit.relationships.notifications.saved.title": "Зв'язки збережено",
+
+  // "item.edit.relationships.reinstate-button": "Undo",
+  "item.edit.relationships.reinstate-button": "Повернутись",
+
+  // "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",
+  "item.edit.relationships.no-entity-type": "Додайте 'dspace.entity.type' для створення зв'язків для документа",
+
+
+
+  // "item.edit.tabs.bitstreams.head": "Bitstreams",
+  "item.edit.tabs.bitstreams.head": "Файли",
+
+  // "item.edit.tabs.bitstreams.title": "Редагування докумена - Файли",
+  "item.edit.tabs.bitstreams.title": "Редагування докумена - Файли",
+
+  // "item.edit.tabs.curate.head": "Curate",
+  // TODO translate
+  "item.edit.tabs.curate.head": "Curate",
+
+  // "item.edit.tabs.curate.title": "Item Edit - Curate",
+  // TODO translate
+  "item.edit.tabs.curate.title": "Редагування документа - Curate",
+
+  // "item.edit.tabs.metadata.head": "Metadata",
+  "item.edit.tabs.metadata.head": "Метадані",
+
+  // "item.edit.tabs.metadata.title": "Item Edit -  Metadata",
+  "item.edit.tabs.metadata.title": "Редагування документа - метадані",
+
+  // "item.edit.tabs.relationships.head": "Relationships",
+  "item.edit.tabs.relationships.head": "Зв'язки",
+
+  // "item.edit.tabs.relationships.title": "Редагування документа - зв'язки",
+  "item.edit.tabs.relationships.title": "Редагування документа - зв'язки",
+
+  // "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",
+  "item.edit.tabs.status.buttons.authorizations.label": "Редагувати політики доступу документа",
+
+  // "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",
+  "item.edit.tabs.status.buttons.delete.label": "Повністю видалити документ",
+
+  // "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",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Керувати прив'язаними зібраннями",
+
+  // "item.edit.tabs.status.buttons.move.button": "Move this Item to a different Collection",
+  "item.edit.tabs.status.buttons.move.button": "Перемістити цей елемент до іншої колекції",
+
+  // "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...",
+  "item.edit.tabs.status.buttons.private.button": "Закрити доступ...",
+
+  // "item.edit.tabs.status.buttons.private.label": "Make item private",
+  "item.edit.tabs.status.buttons.private.label": "Закрити доступ до документа",
+
+  // "item.edit.tabs.status.buttons.public.button": "Make it public...",
+  "item.edit.tabs.status.buttons.public.button": "Зробити загальнодоступним...",
+
+  // "item.edit.tabs.status.buttons.public.label": "Make item public",
+  "item.edit.tabs.status.buttons.public.label": "Зробити документ загальнодоступним",
+
+  // "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",
+  "item.edit.tabs.status.buttons.reinstate.label": "Відновити документ в репозиторій",
+
+  // "item.edit.tabs.status.buttons.withdraw.button": "Withdraw this item",
+  "item.edit.tabs.status.buttons.withdraw.button": "вилучити цей предмет",
+
+  // "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.",
+  "item.edit.tabs.status.description": "Вітаємо на сторінці керування документами. Тут ви можете вилучити, відновити, перемістити або видалити елемент. Ви також можете оновити або додати нові метадані чи файли на інших вкладках.",
+
+  // "item.edit.tabs.status.head": "Status",
+  "item.edit.tabs.status.head": "Статус",
+
+  // "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.handle": "Handle",
+
+  // "item.edit.tabs.status.labels.id": "Item Internal ID",
+  "item.edit.tabs.status.labels.id": "Внутрішнє ID",
+
+  // "item.edit.tabs.status.labels.itemPage": "Item Page",
+  "item.edit.tabs.status.labels.itemPage": "Сторінка документа",
+
+  // "item.edit.tabs.status.labels.lastModified": "Last Modified",
+  "item.edit.tabs.status.labels.lastModified": "Останні редагування",
+
+  // "item.edit.tabs.status.title": "Item Edit -  Status",
+  "item.edit.tabs.status.title": "Редагування документа - статус",
+
+  // "item.edit.tabs.versionhistory.head": "Version History",
+  "item.edit.tabs.versionhistory.head": "Історія версій",
+
+  // "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.",
+  "item.edit.tabs.versionhistory.under-construction": "Редагування або додавання нових версій ще неможливе в цьому інтерфейсі користувача.",
+
+  // "item.edit.tabs.view.head": "View Item",
+  "item.edit.tabs.view.head": "Перегляд документа",
+
+  // "item.edit.tabs.view.title": "Item Edit -  View",
+  "item.edit.tabs.view.title": "Редагування документа - перегляд",
+
+
+
+  // "item.edit.withdraw.cancel": "Cancel",
+  "item.edit.withdraw.cancel": "Відмінити",
+
+  // "item.edit.withdraw.confirm": "Withdraw",
+  "item.edit.withdraw.confirm": "Вилучити",
+
+  // "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",
+  "item.edit.withdraw.error": "Виникла помилка при вилученні документа",
+
+  // "item.edit.withdraw.header": "Withdraw item: {{ id }}",
+  "item.edit.withdraw.header": "Вилучити документ: {{ id }}",
+
+  // "item.edit.withdraw.success": "The item was withdrawn successfully",
+  "item.edit.withdraw.success": "Документ був успішно вилучений",
+
+
+
+  // "item.listelement.badge": "Item",
+  "item.listelement.badge": "Документ",
+
+  // "item.page.description": "Description",
+  "item.page.description": "Опис",
+
+  // "item.page.journal-issn": "Journal ISSN",
+  "item.page.journal-issn": "Номер ISSN",
+
+  // "item.page.journal-title": "Journal Title",
+  "item.page.journal-title": "Назва журналу",
+
+  // "item.page.publisher": "Publisher",
+  "item.page.publisher": "Видавець",
+
+  // "item.page.titleprefix": "Item: ",
+  "item.page.titleprefix": "Документ: ",
+
+  // "item.page.volume-title": "Volume Title",
+  "item.page.volume-title": "Назва тому",
+
+  // "item.search.results.head": "Результат пошуку за документами",
+  "item.search.results.head": "Результат пошуку за документами",
+
+  // "item.search.title": "DSpace Angular :: Item Search",
+  "item.search.title": "Репозитарій :: Пошук документів",
+
+
+
+  // "item.page.abstract": "Abstract",
+  "item.page.abstract": "Анотація",
+
+  // "item.page.author": "Authors",
+  "item.page.author": "Автори",
+
+  // "item.page.citation": "Citation",
+  "item.page.citation": "Бібліографічний опис",
+
+  // "item.page.collections": "Collections",
+  "item.page.collections": "Зібрання",
+
+  // "item.page.date": "Date",
+  "item.page.date": "Дата",
+
+  // "item.page.edit": "Edit this item",
+  "item.page.edit": "Редагувати цей документ",
+
+  // "item.page.files": "Files",
+  "item.page.files": "Файли",
+
+  // "item.page.filesection.description": "Description:",
+  "item.page.filesection.description": "Опис:",
+
+  // "item.page.filesection.download": "Download",
+  "item.page.filesection.download": "Завантажити",
+
+  // "item.page.filesection.format": "Format:",
+  "item.page.filesection.format": "Формат:",
+
+  // "item.page.filesection.name": "Name:",
+  "item.page.filesection.name": "Назва:",
+
+  // "item.page.filesection.size": "Size:",
+  "item.page.filesection.size": "Розмір:",
+
+  // "item.page.journal.search.title": "Articles in this journal",
+  "item.page.journal.search.title": "Публікації у цьому виданні",
+
+  // "item.page.link.full": "Full item page",
+  "item.page.link.full": "Повна інформація про документ",
+
+  // "item.page.link.simple": "Simple item page",
+  "item.page.link.simple": "Скорочена інформація про документ",
+
+  // "item.page.person.search.title": "Articles by this author",
+  "item.page.person.search.title": "Публікації за автором",
+
+  // "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 }}",
+  "item.page.related-items.view-less": "Приховати останні {{ amount }}",
+
+  // "item.page.relationships.isAuthorOfPublication": "Publications",
+  "item.page.relationships.isAuthorOfPublication": "Публікації",
+
+  // "item.page.relationships.isJournalOfPublication": "Publications",
+  "item.page.relationships.isJournalOfPublication": "Публікації",
+
+  // "item.page.relationships.isOrgUnitOfPerson": "Authors",
+  "item.page.relationships.isOrgUnitOfPerson": "Автори",
+
+  // "item.page.relationships.isOrgUnitOfProject": "Research Projects",
+  "item.page.relationships.isOrgUnitOfProject": "Дослідницькі проекти",
+
+  // "item.page.subject": "Keywords",
+  "item.page.subject": "Ключові слова",
+
+  // "item.page.uri": "URI",
+  "item.page.uri": "URI",
+
+  // "item.page.bitstreams.view-more": "Show more",
+  "item.page.bitstreams.view-more": "Показати більше",
+
+  // "item.page.bitstreams.collapse": "Collapse",
+  "item.page.bitstreams.collapse": "Згорнути",
+
+  // "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.preview.dc.identifier.uri": "Identifier:",
+  "item.preview.dc.identifier.uri": "Ідентифікатор:",
+
+  // "item.preview.dc.contributor.author": "Authors:",
+  "item.preview.dc.contributor.author": "Автори:",
+
+  // "item.preview.dc.date.issued": "Published date:",
+  "item.preview.dc.date.issued": "Дата публікації:",
+
+  // "item.preview.dc.description.abstract": "Abstract:",
+  "item.preview.dc.description.abstract": "Анотація:",
+
+  // "item.preview.dc.identifier.other": "Other identifier:",
+  "item.preview.dc.identifier.other": "Інший ідентифікатор:",
+
+  // "item.preview.dc.language.iso": "Language:",
+  "item.preview.dc.language.iso": "Мова:",
+
+  // "item.preview.dc.subject": "Subjects:",
+  "item.preview.dc.subject": "Ключові слова:",
+
+  // "item.preview.dc.title": "Title:",
+  "item.preview.dc.title": "Назва:",
+
+  // "item.preview.person.familyName": "Surname:",
+  "item.preview.person.familyName": "Прізвище:",
+
+  // "item.preview.person.givenName": "Name:",
+  "item.preview.person.givenName": "Ім'я:",
+
+  // "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+
+
+  // "item.select.confirm": "Confirm selected",
+  "item.select.confirm": "Підтвердити вибрані",
+
+  // "item.select.empty": "No items to show",
+  "item.select.empty": "Таких документів немає",
+
+  // "item.select.table.author": "Author",
+  "item.select.table.author": "Автор",
+
+  // "item.select.table.collection": "Collection",
+  "item.select.table.collection": "Зібрання",
+
+  // "item.select.table.title": "Title",
+  "item.select.table.title": "Назва",
+
+
+  // "item.version.history.empty": "There are no other versions for this item yet.",
+  "item.version.history.empty": "Іншої версії цього документу немає.",
+
+  // "item.version.history.head": "Version History",
+  "item.version.history.head": "Історія версій",
+
+  // "item.version.history.return": "Return",
+  "item.version.history.return": "Повернутись",
+
+  // "item.version.history.selected": "Selected version",
+  "item.version.history.selected": "Вибрана версія",
+
+  // "item.version.history.table.version": "Version",
+  "item.version.history.table.version": "Версія",
+
+  // "item.version.history.table.item": "Item",
+  "item.version.history.table.item": "Документ",
+
+  // "item.version.history.table.editor": "Editor",
+  "item.version.history.table.editor": "Редактор",
+
+  // "item.version.history.table.date": "Date",
+  "item.version.history.table.date": "Дата",
+
+  // "item.version.history.table.summary": "Summary",
+  "item.version.history.table.summary": "Анотація/Summary",
+
+
+
+  // "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>.",
+
+
+
+  // "journal.listelement.badge": "Journal",
+  "journal.listelement.badge": "Видання",
+
+  // "journal.page.description": "Description",
+  "journal.page.description": "Опис",
+
+  // "journal.page.edit": "Edit this item",
+  "journal.page.edit": "Редагувати цей документ",
+
+  // "journal.page.editor": "Editor-in-Chief",
+  "journal.page.editor": "Головний редактор",
+
+  // "journal.page.issn": "ISSN",
+  "journal.page.issn": "ISSN",
+
+  // "journal.page.publisher": "Publisher",
+  "journal.page.publisher": "Видавець",
+
+  // "journal.page.titleprefix": "Journal: ",
+  "journal.page.titleprefix": "Видання: ",
+
+  // "journal.search.results.head": "Journal Search Results",
+  "journal.search.results.head": "Пошук у виданні",
+
+  // "journal.search.title": "DSpace Angular :: Journal Search",
+  "journal.search.title": "Репозитарій :: пошук видання",
+
+
+
+  // "journalissue.listelement.badge": "Journal Issue",
+  "journalissue.listelement.badge": "Випуск видання",
+
+  // "journalissue.page.description": "Description",
+  "journalissue.page.description": "Опис",
+
+  // "journalissue.page.edit": "Edit this item",
+  "journalissue.page.edit": "Редагувати цей документ",
+
+  // "journalissue.page.issuedate": "Issue Date",
+  "journalissue.page.issuedate": "Дата випуску",
+
+  // "journalissue.page.journal-issn": "Journal ISSN",
+  "journalissue.page.journal-issn": "ISSN",
+
+  // "journalissue.page.journal-title": "Journal Title",
+  "journalissue.page.journal-title": "Назва видання",
+
+  // "journalissue.page.keyword": "Keywords",
+  "journalissue.page.keyword": "Ключові слова",
+
+  // "journalissue.page.number": "Number",
+  "journalissue.page.number": "Номер",
+
+  // "journalissue.page.titleprefix": "Journal Issue: ",
+  "journalissue.page.titleprefix": "Випуск видання: ",
+
+
+
+  // "journalvolume.listelement.badge": "Journal Volume",
+  "journalvolume.listelement.badge": "Том видання",
+
+  // "journalvolume.page.description": "Description",
+  "journalvolume.page.description": "Опис",
+
+  // "journalvolume.page.edit": "Edit this item",
+
+  "journalvolume.page.edit": "Редагувати цей документ",
+
+  // "journalvolume.page.issuedate": "Issue Date",
+  "journalvolume.page.issuedate": "Дата випуску",
+
+  // "journalvolume.page.titleprefix": "Journal Volume: ",
+  "journalvolume.page.titleprefix": "Том видання: ",
+
+  // "journalvolume.page.volume": "Volume",
+  "journalvolume.page.volume": "Том",
+
+
+
+  // "loading.bitstream": "Loading bitstream...",
+  "loading.bitstream": "Файл вантажится...",
+
+  // "loading.bitstreams": "Loading bitstreams...",
+  "loading.bitstreams": "Файли вантажаться...",
+
+  // "loading.browse-by": "Loading items...",
+  "loading.browse-by": "Документи вантажаться...",
+
+  // "loading.browse-by-page": "Loading page...",
+  "loading.browse-by-page": "Сторінка вантажится...",
+
+  // "loading.collection": "Loading collection...",
+  "loading.collection": "Зібрання вантажиться...",
+
+  // "loading.collections": "Loading collections...",
+  "loading.collections": "Зібрання вантажаться...",
+
+  // "loading.content-source": "Loading content source...",
+  "loading.content-source": "Джерело даних вантажиться...",
+
+  // "loading.community": "Loading community...",
+  "loading.community": "Фонд вантажиться...",
+
+  // "loading.default": "Loading...",
+  "loading.default": "Вантажиться...",
+
+  // "loading.item": "Loading item...",
+  "loading.item": "Документ вантажиться...",
+
+  // "loading.items": "Loading items...",
+  "loading.items": "Документи вантажаться...",
+
+  // "loading.mydspace-results": "Loading items...",
+  "loading.mydspace-results": "Документи вантажаться..",
+
+  // "loading.objects": "Loading...",
+  "loading.objects": "Вантажиться...",
+
+  // "loading.recent-submissions": "Loading recent submissions...",
+  "loading.recent-submissions": "Вантажаться останні підписки...",
+
+  // "loading.search-results": "Loading search results...",
+  "loading.search-results": "Результати вантажаться...",
+
+  // "loading.sub-collections": "Loading sub-collections...",
+  "loading.sub-collections": "Підзібрання вантажаться...",
+
+  // "loading.sub-communities": "Loading sub-communities...",
+  "loading.sub-communities": "Підфонди вантажаться...",
+
+  // "loading.top-level-communities": "Loading top-level communities...",
+  "loading.top-level-communities": "Фонди верхнього рівня вантажаться...",
+
+
+
+  // "login.form.email": "Email address",
+  "login.form.email": "Email",
+
+  // "login.form.forgot-password": "Have you forgotten your password?",
+  "login.form.forgot-password": "Забули пароль?",
+
+  // "login.form.header": "Please log in to DSpace",
+  "login.form.header": "Увійдіть у репозитарій",
+
+  // "login.form.new-user": "New user? Click here to register.",
+  "login.form.new-user": "Новий користувач? Зареєструйтесь.",
+
+  // "login.form.or-divider": "or",
+  "login.form.or-divider": "або",
+
+  // "login.form.password": "Password",
+  "login.form.password": "Пароль",
+
+  // "login.form.shibboleth": "Log in with Shibboleth",
+  "login.form.shibboleth": "Увійти через Shibboleth/наразі не підримується/",
+
+  // "login.form.submit": "Log in",
+  "login.form.submit": "Увійти",
+
+  // "login.title": "Login",
+  "login.title": "Користувач",
+
+  // "login.breadcrumbs": "Login",
+  "login.breadcrumbs": "Користувач",
+
+
+
+  // "logout.form.header": "Log out from DSpace",
+  "logout.form.header": "Вийти з репозиторію",
+
+  // "logout.form.submit": "Log out",
+  "logout.form.submit": "Вийти",
+
+  // "logout.title": "Logout",
+  "logout.title": "Вийти",
+
+
+
+  // "menu.header.admin": "Admin",
+  "menu.header.admin": "Адмін",
+
+  // "menu.header.image.logo": "Repository logo",
+  "menu.header.image.logo": "Логотип репозиторію",
+
+
+
+  // "menu.section.access_control": "Access Control",
+  "menu.section.access_control": "Контроль доступу",
+
+  // "menu.section.access_control_authorizations": "Authorizations",
+  "menu.section.access_control_authorizations": "Авторизація",
+
+  // "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.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",
+  "menu.section.admin_search": "Пошук адміністратора",
+
+
+
+  // "menu.section.browse_community": "This Community",
+  "menu.section.browse_community": "Цей фонд",
+
+  // "menu.section.browse_community_by_author": "By Author",
+  "menu.section.browse_community_by_author": "За автором",
+
+  // "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",
+  "menu.section.browse_community_by_title": "За назвою",
+
+  // "menu.section.browse_global": "All of DSpace",
+  "menu.section.browse_global": "Пошук за критеріями",
+
+  // "menu.section.browse_global_by_author": "By Author",
+  "menu.section.browse_global_by_author": "За автором",
+
+  // "menu.section.browse_global_by_dateissued": "By Issue Date",
+  "menu.section.browse_global_by_dateissued": "За датою видання",
+
+  // "menu.section.browse_global_by_subject": "By Subject",
+  "menu.section.browse_global_by_subject": "За ключовими словами",
+
+  // "menu.section.browse_global_by_title": "By Title",
+  "menu.section.browse_global_by_title": "За назвою",
+
+  // "menu.section.browse_global_communities_and_collections": "Communities & Collections",
+  "menu.section.browse_global_communities_and_collections": "Фонди та зібрання",
+
+
+
+  // "menu.section.control_panel": "Control Panel",
+  "menu.section.control_panel": "Панель управління",
+
+  // "menu.section.curation_task": "Curation Task",
+  "menu.section.curation_task": "Поточні завдання",
+
+
+
+  // "menu.section.edit": "Edit",
+  "menu.section.edit": "Редагувати",
+
+  // "menu.section.edit_collection": "Collection",
+  "menu.section.edit_collection": "Зібрання",
+
+  // "menu.section.edit_community": "Community",
+  "menu.section.edit_community": "Фонд",
+
+  // "menu.section.edit_item": "Item",
+  "menu.section.edit_item": "Документ",
+
+
+
+  // "menu.section.export": "Export",
+  "menu.section.export": "Експорт",
+
+  // "menu.section.export_collection": "Collection",
+  "menu.section.export_collection": "Зібрання",
+
+  // "menu.section.export_community": "Community",
+  "menu.section.export_community": "Фонд",
+
+  // "menu.section.export_item": "Item",
+  "menu.section.export_item": "Документ",
+
+  // "menu.section.export_metadata": "Metadata",
+  "menu.section.export_metadata": "Метадані",
+
+
+
+  // "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.reports": "Reports menu section",
+
+  // "menu.section.icon.admin_search": "Admin search menu section",
+  "menu.section.icon.admin_search": "Меню пошуку адміна",
+
+  // "menu.section.icon.control_panel": "Control Panel menu section",
+  "menu.section.icon.control_panel": "Меню панелі управління",
+
+  // "menu.section.icon.curation_task": "Curation Task menu section",
+  "menu.section.icon.curation_task": "Меню поточних завдань",
+
+  // "menu.section.icon.edit": "Edit menu section",
+  "menu.section.icon.edit": "Редагувати розділ меню",
+
+  // "menu.section.icon.export": "Export menu section",
+  "menu.section.icon.export": "Експорт розділу меню",
+
+  // "menu.section.icon.find": "Find menu section",
+  "menu.section.icon.find": "Знайти розділ меню",
+
+  // "menu.section.icon.import": "Import menu section",
+  "menu.section.icon.import": "Імпорт розділу меню",
+
+  // "menu.section.icon.new": "New menu section",
+  "menu.section.icon.new": "Новий розділ меню",
+
+  // "menu.section.icon.pin": "Pin sidebar",
+  "menu.section.icon.pin": "Закріпити бічну панель",
+
+  // "menu.section.icon.processes": "Processes menu section",
+
+  "menu.section.icon.processes": "Процеси розділу меню",
+
+  // "menu.section.icon.registries": "Registries menu section",
+  "menu.section.icon.registries": "Реєстр розділів меню",
+
+  // "menu.section.icon.statistics_task": "Statistics Task menu section",
+  "menu.section.icon.statistics_task": "Статистика розділу меню",
+
+  // "menu.section.icon.unpin": "Unpin sidebar",
+  "menu.section.icon.unpin": "Відкріпити бічну панель",
+
+
+
+  // "menu.section.import": "Import",
+  "menu.section.import": "Імпорт",
+
+  // "menu.section.import_batch": "Batch Import (ZIP)",
+  "menu.section.import_batch": "Імпорт контейнера файлів (ZIP)",
+
+  // "menu.section.import_metadata": "Metadata",
+  "menu.section.import_metadata": "Метадані",
+
+
+
+  // "menu.section.new": "New",
+  "menu.section.new": "Новий",
+
+  // "menu.section.new_collection": "Collection",
+  "menu.section.new_collection": "Зібрання",
+
+  // "menu.section.new_community": "Community",
+  "menu.section.new_community": "Фонд",
+
+  // "menu.section.new_item": "Item",
+  "menu.section.new_item": "Документ",
+
+  // "menu.section.new_item_version": "Item Version",
+  "menu.section.new_item_version": "Версія документа",
+
+  // "menu.section.new_process": "Process",
+
+  "menu.section.new_process": "Процес",
+
+
+
+  // "menu.section.pin": "Pin sidebar",
+  "menu.section.pin": "Закріпити бічне меню",
+
+  // "menu.section.unpin": "Unpin sidebar",
+  "menu.section.unpin": "Відкріпити бічне меню",
+
+
+
+  // "menu.section.processes": "Processes",
+  "menu.section.processes": "Процеси",
+
+
+
+  // "menu.section.registries": "Registries",
+  "menu.section.registries": "Реєстри",
+
+  // "menu.section.registries_format": "Format",
+  "menu.section.registries_format": "Формати",
+
+  // "menu.section.registries_metadata": "Metadata",
+  "menu.section.registries_metadata": "Метадані",
+
+
+
+  // "menu.section.statistics": "Statistics",
+  "menu.section.statistics": "Статистика",
+
+  // "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.reports": "Toggle Reports section",
+
+  // "menu.section.toggle.control_panel": "Toggle Control Panel section",
+  "menu.section.toggle.control_panel": "Переключити панель контролю доступу",
+
+  // "menu.section.toggle.curation_task": "Toggle Curation Task section",
+  "menu.section.toggle.curation_task": "Переключити розділ завдань",
+
+  // "menu.section.toggle.edit": "Toggle Edit section",
+  "menu.section.toggle.edit": "Переключити розділ редагування",
+
+  // "menu.section.toggle.export": "Toggle Export section",
+  "menu.section.toggle.export": "Переключити розділ експорту",
+
+  // "menu.section.toggle.find": "Toggle Find section",
+  "menu.section.toggle.find": "Переключити розділ пошуку",
+
+  // "menu.section.toggle.import": "Toggle Import section",
+  "menu.section.toggle.import": "Переключити розділ імпорту",
+
+  // "menu.section.toggle.new": "Toggle New section",
+  "menu.section.toggle.new": "Переключити новий розділ",
+
+  // "menu.section.toggle.registries": "Toggle Registries section",
+  "menu.section.toggle.registries": "Переключити розділ реєстрів",
+
+  // "menu.section.toggle.statistics_task": "Toggle Statistics Task section",
+  "menu.section.toggle.statistics_task": "Переключити розділ статистики",
+
+
+  // "menu.section.workflow": "Administer Workflow",
+
+  "menu.section.workflow": "Керування процесу подачі документа",
+
+
+  // "mydspace.description": "",
+  "mydspace.description": "",
+
+  // "mydspace.general.text-here": "here",
+
+  "mydspace.general.text-here": "тут",
+
+  // "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...",
+  "mydspace.messages.description-placeholder": "Введіть своє повідомлення ...",
+
+  // "mydspace.messages.hide-msg": "Hide message",
+  "mydspace.messages.hide-msg": "Приховати повідомлення",
+
+  // "mydspace.messages.mark-as-read": "Mark as read",
+  "mydspace.messages.mark-as-read": "Позначити як прочитане",
+
+  // "mydspace.messages.mark-as-unread": "Mark as unread",
+  "mydspace.messages.mark-as-unread": "Позначти як непрочитане",
+
+  // "mydspace.messages.no-content": "No content.",
+  "mydspace.messages.no-content": "Нема змісту.",
+
+  // "mydspace.messages.no-messages": "No messages yet.",
+  "mydspace.messages.no-messages": "Повідомлень немає.",
+
+  // "mydspace.messages.send-btn": "Send",
+  "mydspace.messages.send-btn": "Надіслати",
+
+  // "mydspace.messages.show-msg": "Show message",
+  "mydspace.messages.show-msg": "Показати повідомлення",
+
+  // "mydspace.messages.subject-placeholder": "Subject...",
+  "mydspace.messages.subject-placeholder": "Тема...",
+
+  // "mydspace.messages.submitter-help": "Select this option to send a message to controller.",
+  "mydspace.messages.submitter-help": "Виберіть цю опцію, щоб надіслати повідомлення на перевірку.",
+
+  // "mydspace.messages.title": "Messages",
+  "mydspace.messages.title": "Повідомлення",
+
+  // "mydspace.messages.to": "To",
+  "mydspace.messages.to": "До",
+
+  // "mydspace.new-submission": "New submission",
+  "mydspace.new-submission": "Надійшли нові документи",
+
+  // "mydspace.new-submission-external": "Import metadata from external source",
+
+  "mydspace.new-submission-external": "Імпортувати метадані зі зовнішнього джерела",
+
+  // "mydspace.new-submission-external-short": "Import metadata",
+
+  "mydspace.new-submission-external-short": "Імпортувати метадані",
+
+  // "mydspace.results.head": "Your submissions",
+  "mydspace.results.head": "Ваші відправлені документи",
+
+  // "mydspace.results.no-abstract": "No Abstract",
+  "mydspace.results.no-abstract": "Анотація відсутня",
+
+  // "mydspace.results.no-authors": "No Authors",
+  "mydspace.results.no-authors": "Автори відсутні",
+
+  // "mydspace.results.no-collections": "No Collections",
+  "mydspace.results.no-collections": "Відсутні зібрання",
+
+  // "mydspace.results.no-date": "No Date",
+  "mydspace.results.no-date": "Відсутня дата",
+
+  // "mydspace.results.no-files": "No Files",
+  "mydspace.results.no-files": "Відсутні файли",
+
+  // "mydspace.results.no-results": "There were no items to show",
+  "mydspace.results.no-results": "Документів не знайдено",
+
+  // "mydspace.results.no-title": "No title",
+  "mydspace.results.no-title": "Назва відсутня",
+
+  // "mydspace.results.no-uri": "No Uri",
+  "mydspace.results.no-uri": "Відсутнє покликання",
+
+  // "mydspace.show.workflow": "All tasks",
+  "mydspace.show.workflow": "Всі завдання",
+
+  // "mydspace.show.workspace": "Your Submissions",
+  "mydspace.show.workspace": "Ваші надіслані документи ",
+
+  // "mydspace.status.mydspaceArchived": "Archived",
+  "mydspace.status.mydspaceArchived": "Заархівовані",
+
+  // "mydspace.status.mydspaceValidation": "Validation",
+  "mydspace.status.mydspaceValidation": "Перевірка",
+
+  // "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",
+  "mydspace.title": "Моє середовище",
+
+  // "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.",
+
+  "mydspace.upload.upload-failed-manyentries": "Файл неможливо опрацювати. Виявлено забагато звернень, але дозволено лише одне для файлу..",
+
+  // "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.",
+  "mydspace.upload.upload-multiple-successful": "{{qty}} нових робочих середовищ створено.",
+
+  // "mydspace.upload.upload-successful": "New workspace item created. Click {{here}} for edit it.",
+  "mydspace.upload.upload-successful": "Створено нове робоче середовище. Клацніть {{here}} для редагування.",
+
+  // "mydspace.view-btn": "View",
+  "mydspace.view-btn": "Перегляд",
+
+
+
+  // "nav.browse.header": "All of DSpace",
+  "nav.browse.header": "Пошук за критеріями",
+
+  // "nav.community-browse.header": "By Community",
+  "nav.community-browse.header": "У фонді",
+
+  // "nav.language": "Language switch",
+  "nav.language": "Змінити мову",
+
+  // "nav.login": "Log In",
+  "nav.login": "Увійти",
+
+  // "nav.logout": "Log Out",
+  "nav.logout": "Вийти",
+
+  // "nav.mydspace": "MyDSpace",
+  "nav.mydspace": "Моє середовище",
+
+  // "nav.profile": "Profile",
+  "nav.profile": "Профіль",
+
+  // "nav.search": "Search",
+  "nav.search": "Пошук",
+
+  // "nav.statistics.header": "Statistics",
+  "nav.statistics.header": "Статистика",
+
+  // "nav.stop-impersonating": "Stop impersonating EPerson",
+
+  "nav.stop-impersonating": "Припиніть видавати себе за користувача",
+
+
+
+  // "orgunit.listelement.badge": "Organizational Unit",
+  "orgunit.listelement.badge": "Організаціна одиниця",
+
+  // "orgunit.page.city": "City",
+  "orgunit.page.city": "Місто",
+
+  // "orgunit.page.country": "Country",
+  "orgunit.page.country": "Країна",
+
+  // "orgunit.page.dateestablished": "Date established",
+  "orgunit.page.dateestablished": "Дата встановлення",
+
+  // "orgunit.page.description": "Description",
+  "orgunit.page.description": "Опис",
+
+  // "orgunit.page.edit": "Edit this item",
+
+  "orgunit.page.edit": "Редагувати цей документ",
+
+  // "orgunit.page.id": "ID",
+  "orgunit.page.id": "ID",
+
+  // "orgunit.page.titleprefix": "Organizational Unit: ",
+  "orgunit.page.titleprefix": "Організаціна одиниця: ",
+
+
+
+  // "pagination.results-per-page": "Results Per Page",
+  "pagination.results-per-page": "Результатів на сторінці",
+
+  // "pagination.showing.detail": "{{ range }} of {{ total }}",
+  "pagination.showing.detail": "{{ range }} з {{ total }}",
+
+  // "pagination.showing.label": "Now showing ",
+  "pagination.showing.label": "Зараз показуємо ",
+
+  // "pagination.sort-direction": "Sort Options",
+  "pagination.sort-direction": "Налаштування сортування",
+
+
+
+  // "person.listelement.badge": "Person",
+  "person.listelement.badge": "Користувач",
+
+  // "person.listelement.no-title": "No name found",
+
+  "person.listelement.no-title": "Ім'я не знайдено",
+
+  // "person.page.birthdate": "Birth Date",
+  "person.page.birthdate": "Дата народження",
+
+  // "person.page.edit": "Edit this item",
+
+  "person.page.edit": "Редагувати документ",
+
+  // "person.page.email": "Email Address",
+  "person.page.email": "Email",
+
+  // "person.page.firstname": "First Name",
+  "person.page.firstname": "Ім'я",
+
+  // "person.page.jobtitle": "Job Title",
+  "person.page.jobtitle": "Посада",
+
+  // "person.page.lastname": "Last Name",
+  "person.page.lastname": "Прізвище",
+
+  // "person.page.link.full": "Show all metadata",
+  "person.page.link.full": "Показати всі метадані",
+
+  // "person.page.orcid": "ORCID",
+  "person.page.orcid": "ORCID",
+
+  // "person.page.staffid": "Staff ID",
+  "person.page.staffid": "Персональний ID",
+
+  // "person.page.titleprefix": "Person: ",
+  "person.page.titleprefix": "Користувач: ",
+
+  // "person.search.results.head": "Person Search Results",
+  "person.search.results.head": "Результати пошуку користувача",
+
+  // "person.search.title": "DSpace Angular :: Person Search",
+  "person.search.title": "Репозиторій :: Користувацький пошук",
+
+
+
+  // "process.new.select-parameters": "Parameters",
+  "process.new.select-parameters": "Параметри",
+
+  // "process.new.cancel": "Cancel",
+  "process.new.cancel": "Відмінити",
+
+  // "process.new.submit": "Submit",
+  "process.new.submit": "Надіслати",
+
+  // "process.new.select-script": "Script",
+  "process.new.select-script": "Скрипт",
+
+  // "process.new.select-script.placeholder": "Choose a script...",
+  "process.new.select-script.placeholder": "Виберіть скрипт...",
+
+  // "process.new.select-script.required": "Script is required",
+  "process.new.select-script.required": "Потрібно вибрати скрипт",
+
+  // "process.new.parameter.file.upload-button": "Select file...",
+  "process.new.parameter.file.upload-button": "Виберіть файл...",
+
+  // "process.new.parameter.file.required": "Please select a file",
+  "process.new.parameter.file.required": "Виберіть файл",
+
+  // "process.new.parameter.string.required": "Parameter value is required",
+  "process.new.parameter.string.required": "Цей параметр є обв'язковим",
+
+  // "process.new.parameter.type.value": "value",
+  "process.new.parameter.type.value": "значення",
+
+  // "process.new.parameter.type.file": "file",
+  "process.new.parameter.type.file": "файл",
+
+  // "process.new.parameter.required.missing": "The following parameters are required but still missing:",
+  "process.new.parameter.required.missing": "Наступні параметри є обов’язковими, але все ще відсутні:",
+
+  // "process.new.notification.success.title": "Success",
+  "process.new.notification.success.title": "Успіх",
+
+  // "process.new.notification.success.content": "The process was successfully created",
+  "process.new.notification.success.content": "Процес успішно запущено",
+
+  // "process.new.notification.error.title": "Error",
+  "process.new.notification.error.title": "Виникла якась помилка, бодай би вона скисла",
+
+  // "process.new.notification.error.content": "An error occurred while creating this process",
+  "process.new.notification.error.content": "Виникла помилка при створенні процесу",
+
+  // "process.new.header": "Create a new process",
+  "process.new.header": "Створити новий процес",
+
+  // "process.new.title": "Create a new process",
+  "process.new.title": "Створити новий процес",
+
+  // "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.back" : "Back",
+  "process.detail.back": "Повернутись",
+
+  // "process.detail.output" : "Process Output",
+  "process.detail.output": "Прооцес завершено",
+
+  // "process.detail.logs.button": "Retrieve process output",
+  "process.detail.logs.button": "Отримати вихідні дані процесу",
+
+  // "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.overview.table.finish" : "Finish time",
+  "process.overview.table.finish": "Дата завершення",
+
+  // "process.overview.table.id" : "Process ID",
+  "process.overview.table.id": "ID процесу",
+
+  // "process.overview.table.name" : "Name",
+  "process.overview.table.name": "Назва",
+
+  // "process.overview.table.start" : "Start time",
+  "process.overview.table.start": "Дата старту",
+
+  // "process.overview.table.status" : "Status",
+  "process.overview.table.status": "Статус",
+
+  // "process.overview.table.user" : "User",
+  "process.overview.table.user": "Користувач",
+
+  // "process.overview.title": "Processes Overview",
+  "process.overview.title": "Огляд процесів",
+
+  // "process.overview.breadcrumbs": "Processes Overview",
+  "process.overview.breadcrumbs": "Огляд процесів",
+
+  // "process.overview.new": "New",
+  "process.overview.new": "Новий",
+
+
+  // "profile.breadcrumbs": "Update Profile",
+  "profile.breadcrumbs": "Оновити профіль",
+
+  // "profile.card.identify": "Identify",
+  "profile.card.identify": "Ідентифікувати",
+
+  // "profile.card.security": "Security",
+  "profile.card.security": "Безпека",
+
+  // "profile.form.submit": "Update Profile",
+  "profile.form.submit": "Оновити профіль",
+
+  // "profile.groups.head": "Authorization groups you belong to",
+  "profile.groups.head": "Групи до яких Ви належите",
+
+  // "profile.head": "Update Profile",
+  "profile.head": "Оновити профіль",
+
+  // "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",
+  "profile.metadata.form.error.lastname.required": "Прізвище є обов'язковим полем",
+
+  // "profile.metadata.form.label.email": "Email Address",
+  "profile.metadata.form.label.email": "Email",
+
+  // "profile.metadata.form.label.firstname": "First Name",
+  "profile.metadata.form.label.firstname": "Ім'я",
+
+  // "profile.metadata.form.label.language": "Language",
+  "profile.metadata.form.label.language": "Мова",
+
+  // "profile.metadata.form.label.lastname": "Last Name",
+  "profile.metadata.form.label.lastname": "Прізвище",
+
+  // "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.",
+  "profile.metadata.form.notifications.success.content": "Зміни до профілю збережені.",
+
+  // "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.",
+  "profile.notifications.warning.no-changes.content": "Не було змін до профілю.",
+
+  // "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.",
+  "profile.security.form.error.matching-passwords": "Паролі не співпадають.",
+
+  // "profile.security.form.error.password-length": "The password should be at least 6 characters long.",
+  "profile.security.form.error.password-length": "Довжина пароля повинна становити не менше 6 символів.",
+
+  // "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": "За бажанням ви можете ввести новий пароль у поле нижче та підтвердити його, ввівши його ще раз у друге поле. Він має містити щонайменше шість символів.",
+
+  // "profile.security.form.label.password": "Password",
+  "profile.security.form.label.password": "Пароль",
+
+  // "profile.security.form.label.passwordrepeat": "Retype to confirm",
+  "profile.security.form.label.passwordrepeat": "Повторіть",
+
+  // "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",
+  "profile.security.form.notifications.success.title": "Пароль збережено",
+
+  // "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.",
+  "profile.security.form.notifications.error.not-long-enough": "Пароль повинен містити щонайменше 6 символів.",
+
+  // "profile.security.form.notifications.error.not-same": "The provided passwords are not the same.",
+  "profile.security.form.notifications.error.not-same": "Паролі не співпадають.",
+
+  // "profile.title": "Update Profile",
+  "profile.title": "Оновити профіль",
+
+
+
+  // "project.listelement.badge": "Research Project",
+  "project.listelement.badge": "Дослідницький проект",
+
+  // "project.page.contributor": "Contributors",
+  "project.page.contributor": "Дописувачі",
+
+  // "project.page.description": "Description",
+  "project.page.description": "Опис",
+
+  // "project.page.edit": "Edit this item",
+
+  "project.page.edit": "Редагувати документ",
+
+  // "project.page.expectedcompletion": "Expected Completion",
+  "project.page.expectedcompletion": "Очікуване завершеня",
+
+  // "project.page.funder": "Funders",
+  "project.page.funder": "Фундатори",
+
+  // "project.page.id": "ID",
+  "project.page.id": "ID",
+
+  // "project.page.keyword": "Keywords",
+  "project.page.keyword": "Ключові слова",
+
+  // "project.page.status": "Status",
+  "project.page.status": "Статус",
+
+  // "project.page.titleprefix": "Research Project: ",
+  "project.page.titleprefix": "Досліницький проект: ",
+
+  // "project.search.results.head": "Project Search Results",
+  "project.search.results.head": "Результати пошуку за проектом",
+
+
+
+  // "publication.listelement.badge": "Publication",
+  "publication.listelement.badge": "Публікація",
+
+  // "publication.page.description": "Description",
+  "publication.page.description": "Опис",
+
+  // "publication.page.edit": "Edit this item",
+  "publication.page.edit": "Редагувати документ",
+
+  // "publication.page.journal-issn": "Journal ISSN",
+  "publication.page.journal-issn": "ISSN",
+
+  // "publication.page.journal-title": "Journal Title",
+  "publication.page.journal-title": "Назва видання",
+
+  // "publication.page.publisher": "Publisher",
+  "publication.page.publisher": "Видання",
+
+  // "publication.page.titleprefix": "Publication: ",
+  "publication.page.titleprefix": "Публікація: ",
+
+  // "publication.page.volume-title": "Volume Title",
+  "publication.page.volume-title": "Назва тому",
+
+  // "publication.search.results.head": "Publication Search Results",
+  "publication.search.results.head": "Результати пошуку",
+
+  // "publication.search.title": "DSpace Angular :: Publication Search",
+  "publication.search.title": "Репозиторій :: пощук публікацій",
+
+
+  // "register-email.title": "New user registration",
+  "register-email.title": "Реєстрація нового користувача",
+
+  // "register-page.create-profile.header": "Create Profile",
+  "register-page.create-profile.header": "Створити профіль",
+
+  // "register-page.create-profile.identification.header": "Identify",
+  "register-page.create-profile.identification.header": "Ідентифікувати",
+
+  // "register-page.create-profile.identification.email": "Email Address",
+  "register-page.create-profile.identification.email": "Email",
+
+  // "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",
+  "register-page.create-profile.identification.first-name.error": "Заповніть поле імені",
+
+  // "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",
+
+  "register-page.create-profile.identification.last-name.error": "Заповніть поле прізвища",
+
+  // "register-page.create-profile.identification.contact": "Contact Telephone",
+
+  "register-page.create-profile.identification.contact": "Номер телефону",
+
+  // "register-page.create-profile.identification.language": "Language",
+
+  "register-page.create-profile.identification.language": "Мова",
+
+  // "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.",
+
+  "register-page.create-profile.security.info": "Будь ласка, введіть пароль у поле нижче та підтвердьте його, ввівши його ще раз у друге поле. Він має містити щонайменше шість символів.",
+
+  // "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 *",
+
+  "register-page.create-profile.security.label.passwordrepeat": "Повторіть для ідтвердження *",
+
+  // "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.",
+
+  "register-page.create-profile.security.error.matching-passwords": "Паролі не співпадають.",
+
+  // "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": "Довжина пароля повинна бути не менше 6 символів.",
+
+  // "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.",
+
+  "register-page.create-profile.submit.error.content": "Щось пішло не так при реєстрації нового користувача.",
+
+  // "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.",
+
+  "register-page.create-profile.submit.success.content": "Реєстрація пройшла успішно. Ви увійшли як новий користувач.",
+
+  // "register-page.create-profile.submit.success.head": "Registration completed",
+
+  "register-page.create-profile.submit.success.head": "Реєстрацію завершено",
+
+
+  // "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.",
+
+  "register-page.registration.info": "Зареєструйтесь для отримання сповіщень про нові надходження та отримайте можливіть надсилати нові документи у репозиторій.",
+
+  // "register-page.registration.email": "Email Address *",
+
+  "register-page.registration.email": "Email *",
+
+  // "register-page.registration.email.error.required": "Please fill in an email address",
+
+  "register-page.registration.email.error.required": "Заповніть поле email",
+
+  // "register-page.registration.email.error.pattern": "Please fill in a valid email address",
+
+  "register-page.registration.email.error.pattern": "Введіть правильну емейл адресу",
+
+  // "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",
+
+  "register-page.registration.submit": "Реєстрація",
+
+  // "register-page.registration.success.head": "Verification email sent",
+
+  "register-page.registration.success.head": "email для підтвердження Вам надіслано",
+
+  // "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 для підтвердження Вам надіслано на вказану скриньку {{ email }}. Там Ви знайдете покликання для підтвердження адреми та подальші кроки.",
+
+  // "register-page.registration.error.head": "Error when trying to register email",
+
+  "register-page.registration.error.head": "Виникла помилка при реєстрації email",
+
+  // "register-page.registration.error.content": "An error occured when registering the following email address: {{ email }}",
+
+  "register-page.registration.error.content": "Виникла помилка при реєстрації email: {{ email }}",
+
+
+
+  // "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": "Не вдалося знайти відповідний тип відносин {{ type }} між двома документами",
+
+  // "relationships.add.error.server.content": "The server returned an error",
+
+  "relationships.add.error.server.content": "Сервер повідомив про помилку",
+
+  // "relationships.add.error.title": "Unable to add relationship",
+
+  "relationships.add.error.title": "Неможливо додати зв'язок",
+
+  // "relationships.isAuthorOf": "Authors",
+  "relationships.isAuthorOf": "Автори",
+
+  // "relationships.isAuthorOf.Person": "Authors (persons)",
+
+  "relationships.isAuthorOf.Person": "Автори",
+
+  // "relationships.isAuthorOf.OrgUnit": "Authors (organizational units)",
+
+  "relationships.isAuthorOf.OrgUnit": "Автори (структурна одиниця, наприклад університет)",
+
+  // "relationships.isIssueOf": "Journal Issues",
+  "relationships.isIssueOf": "Випуски видання",
+
+  // "relationships.isJournalIssueOf": "Journal Issue",
+  "relationships.isJournalIssueOf": "Випуск видання",
+
+  // "relationships.isJournalOf": "Journals",
+  "relationships.isJournalOf": "Видання",
+
+  // "relationships.isOrgUnitOf": "Organizational Units",
+  "relationships.isOrgUnitOf": "Структурні одиниці",
+
+  // "relationships.isPersonOf": "Authors",
+  "relationships.isPersonOf": "Автори",
+
+  // "relationships.isProjectOf": "Research Projects",
+  "relationships.isProjectOf": "Дослідницькі проекти",
+
+  // "relationships.isPublicationOf": "Publications",
+  "relationships.isPublicationOf": "Публікації",
+
+  // "relationships.isPublicationOfJournalIssue": "Articles",
+  "relationships.isPublicationOfJournalIssue": "Публікації",
+
+  // "relationships.isSingleJournalOf": "Journal",
+  "relationships.isSingleJournalOf": "Видання",
+
+  // "relationships.isSingleVolumeOf": "Journal Volume",
+  "relationships.isSingleVolumeOf": "Том видання",
+
+  // "relationships.isVolumeOf": "Journal Volumes",
+  "relationships.isVolumeOf": "Томи видання",
+
+  // "relationships.isContributorOf": "Contributors",
+  "relationships.isContributorOf": "Дописувачі",
+
+
+
+  // "resource-policies.add.button": "Add",
+
+  "resource-policies.add.button": "Додати",
+
+  // "resource-policies.add.for.": "Add a new policy",
+
+  "resource-policies.add.for.": "Додати нову політику",
+
+  // "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",
+
+  "resource-policies.add.for.bundle": "AДодати нову політику для контейнеру файлів",
+
+  // "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",
+
+  "resource-policies.add.for.community": "Додати нову політику для фонду",
+
+  // "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 ",
+
+  "resource-policies.create.page.heading": "Створити нову ресурсну політику для ",
+
+  // "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",
+
+  "resource-policies.create.page.success.content": "Операція пройшла успішно",
+
+  // "resource-policies.create.page.title": "Create new resource policy",
+
+  "resource-policies.create.page.title": "Створити нову ресурсну політику",
+
+  // "resource-policies.delete.btn": "Delete selected",
+
+  "resource-policies.delete.btn": "Видалити вибране",
+
+  // "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.",
+
+  "resource-policies.delete.failure.content": "Виникла помилка при видаленні вибраних ресурсних політик.",
+
+  // "resource-policies.delete.success.content": "Операція пройшла успішно",
+
+  "resource-policies.delete.success.content": "Операція пройшла успішно",
+
+  // "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.",
+
+  "resource-policies.edit.page.failure.content": "Виникла помилка при редагуванні ресурсної політики.",
+
+  // "resource-policies.edit.page.success.content": "Operation successful",
+
+  "resource-policies.edit.page.success.content": "Операція пройшла успішно",
+
+  // "resource-policies.edit.page.title": "Edit resource policy",
+
+  "resource-policies.edit.page.title": "Редагувати ресурсну політику",
+
+  // "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.",
+
+  "resource-policies.form.action-type.required": "Ви повинні вибрати дію політики ресурсів.",
+
+  // "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",
+
+  "resource-policies.form.eperson-group-list.select.btn": "Вибрати",
+
+  // "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",
+
+  "resource-policies.form.eperson-group-list.tab.group": "Шукати групу",
+
+  // "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.name": "Name",
+
+  "resource-policies.form.eperson-group-list.table.headers.name": "Назва",
+
+  // "resource-policies.form.date.end.label": "End Date",
+
+  "resource-policies.form.date.end.label": "Кінцева дата",
+
+  // "resource-policies.form.date.start.label": "Start Date",
+
+  "resource-policies.form.date.start.label": "Дата початку",
+
+  // "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.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.",
+
+  "resource-policies.form.policy-type.required": "Спочатку ви повинні вибрати тип політики ресурсів.",
+
+  // "resource-policies.table.headers.action": "Action",
+
+  "resource-policies.table.headers.action": "Дія",
+
+  // "resource-policies.table.headers.date.end": "End Date",
+
+  "resource-policies.table.headers.date.end": "Кінцева дата",
+
+  // "resource-policies.table.headers.date.start": "Start Date",
+
+  "resource-policies.table.headers.date.start": "Дата початку",
+
+  // "resource-policies.table.headers.edit": "Edit",
+
+  "resource-policies.table.headers.edit": "Редагувати",
+
+  // "resource-policies.table.headers.edit.group": "Edit group",
+
+  "resource-policies.table.headers.edit.group": "Редагувати групу",
+
+  // "resource-policies.table.headers.edit.policy": "Edit policy",
+
+  "resource-policies.table.headers.edit.policy": "Редагувати політику",
+
+  // "resource-policies.table.headers.eperson": "EPerson",
+
+  "resource-policies.table.headers.eperson": "Користувач",
+
+  // "resource-policies.table.headers.group": "Group",
+
+  "resource-policies.table.headers.group": "Група",
+
+  // "resource-policies.table.headers.id": "ID",
+
+  "resource-policies.table.headers.id": "ID",
+
+  // "resource-policies.table.headers.name": "Name",
+
+  "resource-policies.table.headers.name": "Назва",
+
+  // "resource-policies.table.headers.policyType": "type",
+
+  "resource-policies.table.headers.policyType": "Тип",
+
+  // "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",
+
+  "resource-policies.table.headers.title.for.bundle": "Політики для контейнера файлів",
+
+  // "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",
+
+  "resource-policies.table.headers.title.for.community": "Політики для фонду",
+
+  // "resource-policies.table.headers.title.for.collection": "Policies for Collection",
+
+  "resource-policies.table.headers.title.for.collection": "Політики для зібрання",
+
+
+
+  // "search.description": "",
+  "search.description": "",
+
+  // "search.switch-configuration.title": "Show",
+  "search.switch-configuration.title": "Показати",
+
+  // "search.title": "DSpace Angular :: Search",
+  "search.title": "Репозиторій :: Пошук",
+
+  // "search.breadcrumbs": "Search",
+  "search.breadcrumbs": "Шукати",
+
+
+  // "search.filters.applied.f.author": "Author",
+  "search.filters.applied.f.author": "Автор",
+
+  // "search.filters.applied.f.dateIssued.max": "End date",
+  "search.filters.applied.f.dateIssued.max": "Кінцева дата",
+
+  // "search.filters.applied.f.dateIssued.min": "Start date",
+  "search.filters.applied.f.dateIssued.min": "Дата початку",
+
+  // "search.filters.applied.f.dateSubmitted": "Date submitted",
+  "search.filters.applied.f.dateSubmitted": "Дата надсилання",
+
+  // "search.filters.applied.f.discoverable": "Private",
+  "search.filters.applied.f.discoverable": "Закритий",
+
+  // "search.filters.applied.f.entityType": "Item Type",
+  "search.filters.applied.f.entityType": "Тип документа",
+
+  // "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",
+  "search.filters.applied.f.itemtype": "Тип",
+
+  // "search.filters.applied.f.namedresourcetype": "Status",
+  "search.filters.applied.f.namedresourcetype": "Статус",
+
+  // "search.filters.applied.f.subject": "Subject",
+  "search.filters.applied.f.subject": "Ключові слова",
+
+  // "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.submitter": "Надсилач",
+
+  // "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.jobTitle": "Посада",
+
+  // "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.max": "End birth date",
+
+  // "search.filters.applied.f.birthDate.min": "Start birth date",
+  "search.filters.applied.f.birthDate.min": "Start birth date",
+
+  // "search.filters.applied.f.withdrawn": "Withdrawn",
+  "search.filters.applied.f.withdrawn": "Вилучено",
+
+
+
+  // "search.filters.filter.author.head": "Author",
+  "search.filters.filter.author.head": "Автор",
+
+  // "search.filters.filter.author.placeholder": "Author name",
+  "search.filters.filter.author.placeholder": "Ім'я автора",
+
+  // "search.filters.filter.birthDate.head": "Birth Date",
+  "search.filters.filter.birthDate.head": "Дата народження",
+
+  // "search.filters.filter.birthDate.placeholder": "Birth Date",
+  "search.filters.filter.birthDate.placeholder": "Дата народження",
+
+  // "search.filters.filter.creativeDatePublished.head": "Date Published",
+  "search.filters.filter.creativeDatePublished.head": "Дата публікації",
+
+  // "search.filters.filter.creativeDatePublished.placeholder": "Date Published",
+  "search.filters.filter.creativeDatePublished.placeholder": "Дата публікації",
+
+  // "search.filters.filter.creativeWorkEditor.head": "Editor",
+  "search.filters.filter.creativeWorkEditor.head": "Редактор",
+
+  // "search.filters.filter.creativeWorkEditor.placeholder": "Editor",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Редактор",
+
+  // "search.filters.filter.creativeWorkKeywords.head": "Subject",
+  "search.filters.filter.creativeWorkKeywords.head": "Ключові слова",
+
+  // "search.filters.filter.creativeWorkKeywords.placeholder": "Subject",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Ключові слова",
+
+  // "search.filters.filter.creativeWorkPublisher.head": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.head": "Видавець",
+
+  // "search.filters.filter.creativeWorkPublisher.placeholder": "Publisher",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Видавець",
+
+  // "search.filters.filter.dateIssued.head": "Date",
+  "search.filters.filter.dateIssued.head": "Дата",
+
+  // "search.filters.filter.dateIssued.max.placeholder": "Minimum Date",
+  "search.filters.filter.dateIssued.max.placeholder": "Мінімальна дата",
+
+  // "search.filters.filter.dateIssued.min.placeholder": "Maximum Date",
+  "search.filters.filter.dateIssued.min.placeholder": "Максимальна дата",
+
+  // "search.filters.filter.dateSubmitted.head": "Date submitted",
+  "search.filters.filter.dateSubmitted.head": "Дата надсилання",
+
+  // "search.filters.filter.dateSubmitted.placeholder": "Date submitted",
+  "search.filters.filter.dateSubmitted.placeholder": "Дата надсилання",
+
+  // "search.filters.filter.discoverable.head": "Private",
+  "search.filters.filter.discoverable.head": "Закритий",
+
+  // "search.filters.filter.withdrawn.head": "Withdrawn",
+  "search.filters.filter.withdrawn.head": "Вилучено",
+
+  // "search.filters.filter.entityType.head": "Item Type",
+  "search.filters.filter.entityType.head": "Тип документа",
+
+  // "search.filters.filter.entityType.placeholder": "Item Type",
+  "search.filters.filter.entityType.placeholder": "Тип документа",
+
+  // "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",
+  "search.filters.filter.itemtype.head": "Тип",
+
+  // "search.filters.filter.itemtype.placeholder": "Type",
+  "search.filters.filter.itemtype.placeholder": "Тип",
+
+  // "search.filters.filter.jobTitle.head": "Job Title",
+  "search.filters.filter.jobTitle.head": "Посада",
+
+  // "search.filters.filter.jobTitle.placeholder": "Job Title",
+  "search.filters.filter.jobTitle.placeholder": "Посада",
+
+  // "search.filters.filter.knowsLanguage.head": "Known language",
+  "search.filters.filter.knowsLanguage.head": "Known language",
+
+  // "search.filters.filter.knowsLanguage.placeholder": "Known language",
+  "search.filters.filter.knowsLanguage.placeholder": "Known language",
+
+  // "search.filters.filter.namedresourcetype.head": "Status",
+  "search.filters.filter.namedresourcetype.head": "Статус",
+
+  // "search.filters.filter.namedresourcetype.placeholder": "Status",
+  "search.filters.filter.namedresourcetype.placeholder": "Статус",
+
+  // "search.filters.filter.objectpeople.head": "People",
+  "search.filters.filter.objectpeople.head": "Користувачі",
+
+  // "search.filters.filter.objectpeople.placeholder": "People",
+  "search.filters.filter.objectpeople.placeholder": "Користувачі",
+
+  // "search.filters.filter.organizationAddressCountry.head": "Country",
+  "search.filters.filter.organizationAddressCountry.head": "Країна",
+
+  // "search.filters.filter.organizationAddressCountry.placeholder": "Country",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Країна",
+
+  // "search.filters.filter.organizationAddressLocality.head": "City",
+  "search.filters.filter.organizationAddressLocality.head": "Місто",
+
+  // "search.filters.filter.organizationAddressLocality.placeholder": "City",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Місто",
+
+  // "search.filters.filter.organizationFoundingDate.head": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.head": "Дата заснування",
+
+  // "search.filters.filter.organizationFoundingDate.placeholder": "Date Founded",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Дата заснування",
+
+  // "search.filters.filter.scope.head": "Scope",
+  "search.filters.filter.scope.head": "Область застосування",
+
+  // "search.filters.filter.scope.placeholder": "Scope filter",
+  "search.filters.filter.scope.placeholder": "Фільтр області застосування",
+
+  // "search.filters.filter.show-less": "Collapse",
+  "search.filters.filter.show-less": "Згорнути",
+
+  // "search.filters.filter.show-more": "Show more",
+  "search.filters.filter.show-more": "Детальніше",
+
+  // "search.filters.filter.subject.head": "Subject",
+  "search.filters.filter.subject.head": "Ключові слова",
+
+  // "search.filters.filter.subject.placeholder": "Subject",
+  "search.filters.filter.subject.placeholder": "Ключові слова",
+
+  // "search.filters.filter.submitter.head": "Submitter",
+  "search.filters.filter.submitter.head": "Користувач, який надсилає",
+
+  // "search.filters.filter.submitter.placeholder": "Submitter",
+  "search.filters.filter.submitter.placeholder": "Користувач, який надсилає",
+
+
+
+  // "search.filters.entityType.JournalIssue": "Journal Issue",
+  "search.filters.entityType.JournalIssue": "Випуск видання",
+
+  // "search.filters.entityType.JournalVolume": "Journal Volume",
+  "search.filters.entityType.JournalVolume": "Том видання",
+
+  // "search.filters.entityType.OrgUnit": "Organizational Unit",
+  "search.filters.entityType.OrgUnit": "Структурна одиниця",
+
+  // "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",
+  "search.filters.has_content_in_original_bundle.false": "Ні",
+
+  // "search.filters.discoverable.true": "No",
+  "search.filters.discoverable.true": "Ні",
+
+  // "search.filters.discoverable.false": "Yes",
+  "search.filters.discoverable.false": "Так",
+
+  // "search.filters.withdrawn.true": "Yes",
+  "search.filters.withdrawn.true": "Так",
+
+  // "search.filters.withdrawn.false": "No",
+  "search.filters.withdrawn.false": "Ні",
+
+
+  // "search.filters.head": "Filters",
+  "search.filters.head": "Фільтри",
+
+  // "search.filters.reset": "Reset filters",
+  "search.filters.reset": "Скинути фільтри",
+
+
+
+  // "search.form.search": "Search",
+  "search.form.search": "Пошук",
+
+  // "search.form.search_dspace": "Search DSpace",
+  "search.form.search_dspace": "Пошук у репозиторії",
+
+  // "search.form.search_mydspace": "Search MyDSpace",
+  "search.form.search_mydspace": "Шукати у своїх документах",
+
+
+
+  // "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",
+  "search.results.no-results": "Ваш пошук не дав результатів. Вам важко знайти те, що ви шукаєте? Спробуйте поставити",
+
+  // "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.sidebar.close": "Back to results",
+  "search.sidebar.close": "Повернутись до результатів",
+
+  // "search.sidebar.filters.title": "Filters",
+  "search.sidebar.filters.title": "Фільтри",
+
+  // "search.sidebar.open": "Search Tools",
+  "search.sidebar.open": "Засоби пошуку",
+
+  // "search.sidebar.results": "results",
+  "search.sidebar.results": "результатів",
+
+  // "search.sidebar.settings.rpp": "Results per page",
+  "search.sidebar.settings.rpp": "Результатів на сторінку",
+
+  // "search.sidebar.settings.sort-by": "Sort By",
+  "search.sidebar.settings.sort-by": "Сортувати за",
+
+  // "search.sidebar.settings.title": "Settings",
+  "search.sidebar.settings.title": "Налаштування",
+
+
+
+  // "search.view-switch.show-detail": "Show detail",
+  "search.view-switch.show-detail": "Показати деталі",
+
+  // "search.view-switch.show-grid": "Show as grid",
+  "search.view-switch.show-grid": "Показати у вигляді матриці",
+
+  // "search.view-switch.show-list": "Show as list",
+  "search.view-switch.show-list": "Показати як список",
+
+
+
+  // "sorting.ASC": "Ascending",
+
+  "sorting.ASC": "У порядку збільшення",
+
+  // "sorting.DESC": "Descending",
+
+  "sorting.DESC": "У порядку зменшення",
+
+  // "sorting.dc.title.ASC": "Title Ascending",
+  "sorting.dc.title.ASC": "У порядку збільшення за назвою",
+
+  // "sorting.dc.title.DESC": "Title Descending",
+  "sorting.dc.title.DESC": "У порядку зменшення за назвою",
+
+  // "sorting.score.DESC": "Relevance",
+  "sorting.score.DESC": "Актуальність",
+
+
+
+  // "statistics.title": "Statistics",
+
+  "statistics.title": "Статистика",
+
+  // "statistics.header": "Statistics for {{ scope }}",
+
+  "statistics.header": "Статистика для {{ scope }}",
+
+  // "statistics.breadcrumbs": "Statistics",
+
+  "statistics.breadcrumbs": "Статистика",
+
+  // "statistics.page.no-data": "No data available",
+
+  "statistics.page.no-data": "Дані відсутні",
+
+  // "statistics.table.no-data": "No data available",
+
+  "statistics.table.no-data": "Дані відсутні",
+
+  // "statistics.table.title.TotalVisits": "Total visits",
+
+  "statistics.table.title.TotalVisits": "Всього відвідувань",
+
+  // "statistics.table.title.TotalVisitsPerMonth": "Total visits per month",
+
+  "statistics.table.title.TotalVisitsPerMonth": "Всього відвідувань за місяць",
+
+  // "statistics.table.title.TotalDownloads": "File Visits",
+
+  "statistics.table.title.TotalDownloads": "Скачувань файлів",
+
+  // "statistics.table.title.TopCountries": "Top country views",
+
+  "statistics.table.title.TopCountries": "Топ за країнами",
+
+  // "statistics.table.title.TopCities": "Top city views",
+
+  "statistics.table.title.TopCities": "Топ за містами",
+
+  // "statistics.table.header.views": "Views",
+
+  "statistics.table.header.views": "Перегляди",
+
+
+
+  // "submission.edit.title": "Edit Submission",
+  "submission.edit.title": "Редагувати внесення нового документа",
+
+  // "submission.general.cannot_submit": "You have not the privilege to make a new submission.",
+  "submission.general.cannot_submit": "У Вас немає повноважень щоб внести новий документ.",
+
+  // "submission.general.deposit": "Deposit",
+  "submission.general.deposit": "Депозит",
+
+  // "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?",
+  "submission.general.discard.confirm.info": "Цю операцію неможливо відмінити. Ви впевнені?",
+
+  // "submission.general.discard.confirm.submit": "Yes, I'm sure",
+  "submission.general.discard.confirm.submit": "Так, я впевнений",
+
+  // "submission.general.discard.confirm.title": "Discard submission",
+  "submission.general.discard.confirm.title": "Скасувати надсилання документа",
+
+  // "submission.general.discard.submit": "Discard",
+  "submission.general.discard.submit": "Скасувати",
+
+  // "submission.general.save": "Save",
+  "submission.general.save": "Зберегти",
+
+  // "submission.general.save-later": "Save for later",
+  "submission.general.save-later": "Зберегти на потім",
+
+
+  // "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",
+
+  "submission.import-external.title": "Імпортувати метадані із зовнішніх джерел",
+
+  // "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",
+
+  "submission.import-external.back-to-my-dspace": "Повернутись до репозиторію",
+
+  // "submission.import-external.search.placeholder": "Search the external source",
+
+  "submission.import-external.search.placeholder": "Шукати зовнішнє джерело даних",
+
+  // "submission.import-external.search.button": "Search",
+
+  "submission.import-external.search.button": "Пошук",
+
+  // "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",
+
+  "submission.import-external.search.source.hint": "Виберіть зовнішнє джерело даних",
+
+  // "submission.import-external.source.arxiv": "arXiv",
+
+  "submission.import-external.source.arxiv": "arXiv",
+
+  // "submission.import-external.source.loading": "Loading ...",
+
+  "submission.import-external.source.loading": "Завантажуюсь ...",
+
+  // "submission.import-external.source.sherpaJournal": "SHERPA Journals",
+
+  "submission.import-external.source.sherpaJournal": "SHERPA видання",
+
+  // "submission.import-external.source.sherpaPublisher": "SHERPA Publishers",
+
+  "submission.import-external.source.sherpaPublisher": "SHERPA видавці",
+
+  // "submission.import-external.source.orcid": "ORCID",
+
+  "submission.import-external.source.orcid": "ORCID",
+
+  // "submission.import-external.source.pubmed": "Pubmed",
+
+  "submission.import-external.source.pubmed": "Pubmed",
+
+  // "submission.import-external.source.lcname": "Library of Congress Names",
+
+  "submission.import-external.source.lcname": "Бібліотека Congress Names",
+
+  // "submission.import-external.preview.title": "Item Preview",
+
+  "submission.import-external.preview.title": "Перегляд документа",
+
+  // "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",
+
+  "submission.import-external.preview.button.import": "Почати вносити документ",
+
+  // "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.",
+
+  "submission.import-external.preview.error.import.body": "Виникла помилка при імпорті даних.",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Локальний запис успішно додано",
+
+  // "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",
+  "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",
+  "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",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal Volume": "Імпорт віддаленого тому видання",
+
+  // "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",
+
+  "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",
+
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Локального автора успішно імпортовано та додано до вибраних",
+
+  // "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Authority",
+
+  // "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": "Import as a new local authority entry",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Виберіть зібрання, до якого потрібно імпортувати нові записи",
+
+  // "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",
+  "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",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Імпортувати з LC назвою",
+
+  // "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": "Імпортувати з ORCID",
+
+  // "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": "Імпортувати з Sherpa видання",
+
+  // "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": "Імпортувати з Sherpa видання",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Імпортувати з arXiv",
+
+  // "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",
+  "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",
+  "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",
+  "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",
+  "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",
+  "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",
+  "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",
+  "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",
+  "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",
+  "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:",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Виберіть локальний збіг",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Видалити позначення сторінки",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Пошуковий запит",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Вперед",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Виділити сторінку",
+
+  // "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 }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Локальні автори ({{ count }})",
+
+  // "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 }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Локальні проекти ({{ count }})",
+
+  // "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 }})",
+
+  "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 }})",
+
+  "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 }})",
+
+  "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 }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Локальні файли даних ({{ count }})",
+
+  // "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 }})",
+
+  "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 }})",
+
+  "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 }})",
+
+  "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 }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Локальні томи видань({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "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": "Sherpa видавці ({{ count }})",
+
+  // "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "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 }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC назви ({{ 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.isFundingAgencyOfPublication": "Пошук фінансових агентств",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Пошук структурних одиниць",
+
+  // "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.isJournalIssueOfPublication": "Journal Issues",
+
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Випуски видання",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Томи видання",
+
+  // "submission.sections.describe.relationship-lookup.title.JournalVolume": "Journal Volumes",
+
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Томи видання",
+
+  // "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Journals",
+
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Видання",
+
+  // "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Authors",
+
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Автори",
+
+  // "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Funding Agency",
+
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Фінансова агенція",
+
+  // "submission.sections.describe.relationship-lookup.title.Project": "Projects",
+
+  "submission.sections.describe.relationship-lookup.title.Project": "Проекти",
+
+  // "submission.sections.describe.relationship-lookup.title.Publication": "Publications",
+
+  "submission.sections.describe.relationship-lookup.title.Publication": "Публікації",
+
+  // "submission.sections.describe.relationship-lookup.title.Person": "Authors",
+
+  "submission.sections.describe.relationship-lookup.title.Person": "Автори",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Пакети даних",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Фінансова агенція",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Головна структурна одиниця",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Налаштування",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Вибрані автори",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Вибрані томи видання",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Вибрані публікації",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Вибрані структурні одиниці",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "ВИбрані файли даних",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Вибрані випуски",
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Вибрана фінансова агенція",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Вибрані випуски",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Результати пошуку",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Результати пошуку",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Результати пошуку",
+
+  // "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",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Результати пошуку",
+
+  // "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": "Чи бажаєте ви зберегти \"{{ value }}\" як варіант імені для цього користувача, щоб ви та інші могли повторно використовувати його для майбутніх надсилань? Якщо ви цього не зробите, ви можете використовувати його для цього надсилання.",
+
+  // "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",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Використовуйте тільки для даного надсилання документів",
+
+  // "submission.sections.ccLicense.type": "License Type",
+
+  "submission.sections.ccLicense.type": "Тип ліцензії",
+
+  // "submission.sections.ccLicense.select": "Select a license type…",
+
+  "submission.sections.ccLicense.select": "Биберіть тип ліцензії…",
+
+  // "submission.sections.ccLicense.change": "Change your license type…",
+
+  "submission.sections.ccLicense.change": "Змініть тип ліцензії…",
+
+  // "submission.sections.ccLicense.none": "No licenses available",
+
+  "submission.sections.ccLicense.none": "Нема ліцензії",
+
+  // "submission.sections.ccLicense.option.select": "Select an option…",
+
+  "submission.sections.ccLicense.option.select": "Виберіть опцію…",
+
+  // "submission.sections.ccLicense.link": "You’ve selected the following license:",
+
+  "submission.sections.ccLicense.link": "Ви вибрали ліцензію:",
+
+  // "submission.sections.ccLicense.confirmation": "I grant the license above",
+
+  "submission.sections.ccLicense.confirmation": "Я даю згоду на цю ліцензію",
+
+  // "submission.sections.general.add-more": "Add more",
+  "submission.sections.general.add-more": "Додати більше",
+
+  // "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.",
+  "submission.sections.general.deposit_error_notice": "Під час надсилання елемента виникла проблема. Повторіть спробу пізніше.",
+
+  // "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.",
+  "submission.sections.general.discard_error_notice": "Під час внесення документа виникла проблема. Повторіть спробу пізніше",
+
+  // "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.",
+  "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.",
+  "submission.sections.general.metadata-extracted-new-section": "Нова <strong>{{sectionId}}</strong> секція додана до подання документа.",
+
+  // "submission.sections.general.no-collection": "No collection found",
+  "submission.sections.general.no-collection": "Зібрання не знайдено",
+
+  // "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.",
+  "submission.sections.general.save_error_notice": "Під час збереження документа виникла проблема. Повторіть спробу пізніше.",
+
+  // "submission.sections.general.save_success_notice": "Submission saved successfully.",
+  "submission.sections.general.save_success_notice": "Подання успішно збережено.",
+
+  // "submission.sections.general.search-collection": "Search for a collection",
+  "submission.sections.general.search-collection": "Пошук зібрання",
+
+  // "submission.sections.general.sections_not_valid": "There are incomplete sections.",
+  "submission.sections.general.sections_not_valid": "Неповні розділи.",
+
+
+
+  // "submission.sections.submit.progressbar.CClicense": "Creative commons license",
+
+  "submission.sections.submit.progressbar.CClicense": "СС ліцензії",
+
+  // "submission.sections.submit.progressbar.describe.recycle": "Recycle",
+  "submission.sections.submit.progressbar.describe.recycle": "Переробити",
+
+  // "submission.sections.submit.progressbar.describe.stepcustom": "Describe",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Описати",
+
+  // "submission.sections.submit.progressbar.describe.stepone": "Describe",
+  "submission.sections.submit.progressbar.describe.stepone": "Описати",
+
+  // "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.detect-duplicate": "Можливі дублікати",
+
+  // "submission.sections.submit.progressbar.license": "Deposit license",
+  "submission.sections.submit.progressbar.license": "Ліцензія",
+
+  // "submission.sections.submit.progressbar.upload": "Upload files",
+  "submission.sections.submit.progressbar.upload": "Завантажені файли",
+
+
+
+  // "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?",
+  "submission.sections.upload.delete.confirm.info": "Ця операція не може бути відмінена. Ви впевнені?",
+
+  // "submission.sections.upload.delete.confirm.submit": "Yes, I'm sure",
+  "submission.sections.upload.delete.confirm.submit": "Так, я впевнений",
+
+  // "submission.sections.upload.delete.confirm.title": "Delete bitstream",
+  "submission.sections.upload.delete.confirm.title": "Видалити файл",
+
+  // "submission.sections.upload.delete.submit": "Delete",
+  "submission.sections.upload.delete.submit": "Видалити",
+
+  // "submission.sections.upload.drop-message": "Drop files to attach them to the item",
+  "submission.sections.upload.drop-message": "Перетягніть файли, щоб приєднати їх до документа",
+
+  // "submission.sections.upload.form.access-condition-label": "Access condition type",
+  "submission.sections.upload.form.access-condition-label": "Умови доступу",
+
+  // "submission.sections.upload.form.date-required": "Date is required.",
+  "submission.sections.upload.form.date-required": "Поле дати є обов'язковим для заповнення.",
+
+  // "submission.sections.upload.form.from-label": "Grant access from",
+
+  "submission.sections.upload.form.from-label": "Надати доступ з",
+
+  // "submission.sections.upload.form.from-placeholder": "From",
+  "submission.sections.upload.form.from-placeholder": "З",
+
+  // "submission.sections.upload.form.group-label": "Group",
+  "submission.sections.upload.form.group-label": "Група",
+
+  // "submission.sections.upload.form.group-required": "Group is required.",
+  "submission.sections.upload.form.group-required": "Група є обов'язковою.",
+
+  // "submission.sections.upload.form.until-label": "Grant access until",
+
+  "submission.sections.upload.form.until-label": "Надати доступ до",
+
+  // "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):",
+  "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):",
+  "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>",
+  "submission.sections.upload.info": "Тут ви знайдете всі файли, які зараз містяться в документі. Ви можете оновити метадані файлу та умови доступу або <strong>завантажити додаткові файли, просто перетягнувши їх сюди на сторінці</strong>",
+
+  // "submission.sections.upload.no-entry": "No",
+  "submission.sections.upload.no-entry": "Ні",
+
+  // "submission.sections.upload.no-file-uploaded": "No file uploaded yet.",
+  "submission.sections.upload.no-file-uploaded": "Наразі файл не завантажено.",
+
+  // "submission.sections.upload.save-metadata": "Save metadata",
+  "submission.sections.upload.save-metadata": "Зберегти метадані",
+
+  // "submission.sections.upload.undo": "Cancel",
+  "submission.sections.upload.undo": "Відмінити",
+
+  // "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.submit.title": "Submission",
+  "submission.submit.title": "Надсилання документів",
+
+
+
+  // "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.",
+  "submission.workflow.generic.delete-help": "Якщо ви хочете видалити цей елемент, виберіть \"Видалити\". Потім вас попросять підтвердити це.",
+
+  // "submission.workflow.generic.edit": "Edit",
+  "submission.workflow.generic.edit": "Редагувати",
+
+  // "submission.workflow.generic.edit-help": "Select this option to change the item's metadata.",
+  "submission.workflow.generic.edit-help": "Виберіть цю опцію для зміни метаданих документа.",
+
+  // "submission.workflow.generic.view": "View",
+  "submission.workflow.generic.view": "Перегляд",
+
+  // "submission.workflow.generic.view-help": "Select this option to view the item's metadata.",
+  "submission.workflow.generic.view-help": "Виберіть цю опцію для перегляду метаданих документа.",
+
+
+
+  // "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\".",
+  "submission.workflow.tasks.claimed.approve_help": "Якщо ви переглянули документ і він підходить для включення в зібрання, виберіть \"Затвердити\".",
+
+  // "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.",
+  "submission.workflow.tasks.claimed.edit_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": "Будь ласка, введіть причину відхилення надсилання документа в полі нижче, вказавши, чи може заявник вирішити проблему та повторно подати.",
+
+  // "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",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Вдхилити документ",
+
+  // "submission.workflow.tasks.claimed.reject.reason.title": "Reason",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Причина",
+
+  // "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.",
+  "submission.workflow.tasks.claimed.reject_help": "Якщо ви переглянули документ і виявили, що він <strong>не</strong> підходить для включення в зібрання, виберіть \"Відхилити\". Після цього вас попросять ввести інформацію про причину відхилення і чи повинен автор щось змінити та повторно подати.",
+
+  // "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.",
+  "submission.workflow.tasks.claimed.return_help": "Поверніть завдання до черги, щоб інший користувач міг виконати завдання.",
+
+
+
+  // "submission.workflow.tasks.generic.error": "Error occurred during operation...",
+  "submission.workflow.tasks.generic.error": "Виникла помилка...",
+
+  // "submission.workflow.tasks.generic.processing": "Processing...",
+  "submission.workflow.tasks.generic.processing": "Опрацювання...",
+
+  // "submission.workflow.tasks.generic.submitter": "Submitter",
+  "submission.workflow.tasks.generic.submitter": "Користувач, котрий надсилає",
+
+  // "submission.workflow.tasks.generic.success": "Operation successful",
+  "submission.workflow.tasks.generic.success": "Операція пройшла успішно",
+
+
+
+  // "submission.workflow.tasks.pool.claim": "Claim",
+  "submission.workflow.tasks.pool.claim": "Претензія",
+
+  // "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",
+  "submission.workflow.tasks.pool.hide-detail": "Приховати деталі",
+
+  // "submission.workflow.tasks.pool.show-detail": "Show detail",
+  "submission.workflow.tasks.pool.show-detail": "Показати деталі",
+
+
+
+  // "title": "DSpace",
+  "title": "Репозиторій",
+
+
+
+  // "vocabulary-treeview.header": "Hierarchical tree view",
+
+  "vocabulary-treeview.header": "Перегляд деревовидної структури",
+
+  // "vocabulary-treeview.load-more": "Load more",
+
+  "vocabulary-treeview.load-more": "Детальніше",
+
+  // "vocabulary-treeview.search.form.reset": "Reset",
+
+  "vocabulary-treeview.search.form.reset": "Скинути",
+
+  // "vocabulary-treeview.search.form.search": "Search",
+
+  "vocabulary-treeview.search.form.search": "Шукати",
+
+  // "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",
+
+  "vocabulary-treeview.tree.description.nsi": "Norwegian Science індекс",
+
+  // "vocabulary-treeview.tree.description.srsc": "Research Subject Categories",
+
+  "vocabulary-treeview.tree.description.srsc": "Категорії дослідницьких напрямків",
+
+
+
+  // "uploader.browse": "browse",
+  "uploader.browse": "перегляд",
+
+  // "uploader.drag-message": "Drag & Drop your files here",
+  "uploader.drag-message": "Перетягніть файли сюди",
+
+  // "uploader.or": ", or ",
+  // TODO Source message changed - Revise the translation
+  "uploader.or": ", або",
+
+  // "uploader.processing": "Processing",
+  "uploader.processing": "Опрацювання",
+
+  // "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",
+  "virtual-metadata.delete-item.info": "Виберіть типи, для яких ви хочете зберегти віртуальні метадані як справжні метадані",
+
+  // "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",
+  "virtual-metadata.delete-relationship.modal-head": "Виберіть документи, для яких ви хочете зберегти віртуальні метадані як справжні метадані",
+
+
+
+  // "workflowAdmin.search.results.head": "Administer Workflow",
+  "workflowAdmin.search.results.head": "Робочий процес адміністратора",
+
+
+
+  // "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",
+
+  "workflow-item.delete.notification.success.content": "Робочий процес внесення документа був успішно видалений",
+
+  // "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",
+
+  "workflow-item.delete.notification.error.content": "Документ з робочого процесу не може бути видалений",
+
+  // "workflow-item.delete.title": "Delete workflow item",
+
+  "workflow-item.delete.title": "Видалити документ з робочого процесу",
+
+  // "workflow-item.delete.header": "Delete workflow item",
+
+  "workflow-item.delete.header": "Видалити документ з робочого процесу",
+
+  // "workflow-item.delete.button.cancel": "Cancel",
+
+  "workflow-item.delete.button.cancel": "Відмінити",
+
+  // "workflow-item.delete.button.confirm": "Delete",
+
+  "workflow-item.delete.button.confirm": "Видалити",
+
+
+  // "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",
+
+  "workflow-item.send-back.notification.success.content": "Цей документ був відісланий назад до користувача, котрий надіслав цей документ",
+
+  // "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",
+
+  "workflow-item.send-back.notification.error.content": "Цей документ НЕ може біти відісланий назад до користувача, котрий надіслав цей документ",
+
+  // "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",
+
+  "workflow-item.send-back.header": "Надіслати документ назад до користувача, котрий його надіслав",
+
+  // "workflow-item.send-back.button.cancel": "Cancel",
+
+  "workflow-item.send-back.button.cancel": "Відмінити",
+
+  // "workflow-item.send-back.button.confirm": "Send back"
+
+  "workflow-item.send-back.button.confirm": "Надіслати назад",
+
+
+}
diff --git a/src/assets/i18n/vi.json5 b/src/assets/i18n/vi.json5
new file mode 100644
index 0000000000..f9fb33ebcb
--- /dev/null
+++ b/src/assets/i18n/vi.json5
@@ -0,0 +1,2541 @@
+{
+  "401.help": "Bạn không có quyền truy cập trang này. Bạn có thể sử dụng nút chức năng phía dưới để quay lại trang chủ.",
+  "401.link.home-page": "Đi tới trang chủ",
+  "401.unauthorized": "không có quyền truy cập",
+  "403.forbidden": "không được phép truy cập",
+  "403.help": "Bạn không có quyền truy cập trang này. Bạn có thể sử dụng nút chức năng phía dưới để quay lại trang chủ.",
+  "403.link.home-page": "Đi tới trang chủ",
+  "404.help": "Chúng tôi không tìm thấy trang mà bạn đang tìm kiếm. Trang này có thể đã được chuyển tới một địa chỉ khác hoặc đã bị xóa. Bạn có thể sử dụng nút chức năng phía dưới để quay lại trang chủ.",
+  "404.link.home-page": "Đi tới trang chủ",
+  "404.page-not-found": "không tìm thấy trang",
+  "500.help": "Máy chủ tạm thời không thể phục vụ yêu cầu của bạn do đang trong giai đoạn bảo trì hoặc vấn đề về dung lượng. Vui lòng thử lại sau.",
+  "500.link.home-page": "Đi tới trang chủ",
+  "500.page-internal-server-error": "Dịch vụ không sẵn sàng",
+  "access-status.embargo.listelement.badge": "Ngăn chặn",
+  "access-status.metadata.only.listelement.badge": "Chỉ siêu dữ liệu",
+  "access-status.open.access.listelement.badge": "Truy cập mở",
+  "access-status.restricted.listelement.badge": "Hạn chế",
+  "access-status.unknown.listelement.badge": "Không xác định",
+  "admin.curation-tasks.breadcrumbs": "Thu thập các tác vụ hệ thống",
+  "admin.curation-tasks.header": "Thu thập các tác vụ hệ thống",
+  "admin.curation-tasks.title": "Thu thập các tác vụ hệ thống",
+  "admin.registries.bitstream-formats.breadcrumbs": "Tạo định dạng",
+  "admin.registries.bitstream-formats.create.breadcrumbs": "Định dạng tệp tin",
+  "admin.registries.bitstream-formats.create.failure.content": "Đã xảy ra lỗi khi tạo định dạng tệp tin mới.",
+  "admin.registries.bitstream-formats.create.failure.head": "Không thành công",
+  "admin.registries.bitstream-formats.create.head": "Tạo định dạng tệp tin",
+  "admin.registries.bitstream-formats.create.new": "Thêm một định dạng tệp tin mới",
+  "admin.registries.bitstream-formats.create.success.content": "Định dạng tệp tin mới đã được tạo thành công.",
+  "admin.registries.bitstream-formats.create.success.head": "Thành công",
+  "admin.registries.bitstream-formats.delete.failure.amount": "Loại bỏ không thành công  {{ amount }} định dạng",
+  "admin.registries.bitstream-formats.delete.failure.head": "Không thành công",
+  "admin.registries.bitstream-formats.delete.success.amount": "Loại bỏ thành công {{ amount }} định dạng",
+  "admin.registries.bitstream-formats.delete.success.head": "Thành công",
+  "admin.registries.bitstream-formats.description": "Danh sách các định dạng tệp tin này cung cấp thông tin về các định dạng đã biết và mức hỗ trợ của chúng.",
+  "admin.registries.bitstream-formats.edit.breadcrumbs": "Định dạng tệp tin",
+  "admin.registries.bitstream-formats.edit.description.label": "Mô tả",
+  "admin.registries.bitstream-formats.edit.extensions.hint": "Tiện ích mở rộng là phần mở rộng tệp được sử dụng để tự động xác định định dạng của tệp được tải lên. Bạn có thể nhập một vài phần mở rộng cho mỗi định dạng.",
+  "admin.registries.bitstream-formats.edit.extensions.label": "Mở rộng tệp",
+  "admin.registries.bitstream-formats.edit.extensions.placeholder": "Nhập một phần mở rộng tệp không có dấu chấm",
+  "admin.registries.bitstream-formats.edit.failure.content": "Đã xảy ra lỗi khi chỉnh sửa định dạng tệp tin.",
+  "admin.registries.bitstream-formats.edit.failure.head": "Không thành công",
+  "admin.registries.bitstream-formats.edit.head": "Định dạng tệp tin: {{ format }}",
+  "admin.registries.bitstream-formats.edit.internal.hint": "Các định dạng được đánh dấu là nội bộ sẽ được ẩn đối với người dùng và được sử dụng cho các mục đích quản trị.",
+  "admin.registries.bitstream-formats.edit.internal.label": "Nội bộ",
+  "admin.registries.bitstream-formats.edit.mimetype.hint": "Kiểu MIME được liên kết với định dạng này không nhất thiết phải là duy nhất.",
+  "admin.registries.bitstream-formats.edit.mimetype.label": "Kiểu MIME",
+  "admin.registries.bitstream-formats.edit.shortDescription.hint": "Một tên duy nhất cho định dạng này (ví dụ: Microsoft Word XP hoặc Microsoft Word 2000)",
+  "admin.registries.bitstream-formats.edit.shortDescription.label": "Tên",
+  "admin.registries.bitstream-formats.edit.success.content": "Định dạng tệp tin đã được chỉnh sửa thành công.",
+  "admin.registries.bitstream-formats.edit.success.head": "Thành công",
+  "admin.registries.bitstream-formats.edit.supportLevel.hint": "Mức độ hỗ trợ mà đơn vị của bạn cam kết cho định dạng này.",
+  "admin.registries.bitstream-formats.edit.supportLevel.label": "Mức độ hỗ trợ",
+  "admin.registries.bitstream-formats.head": "Tạo định dạng tệp tin số",
+  "admin.registries.bitstream-formats.no-items": "Không có định dạng tệp tin nào để hiển thị.",
+  "admin.registries.bitstream-formats.table.delete": "Xóa các mục được chọn",
+  "admin.registries.bitstream-formats.table.deselect-all": "Bỏ chọn tất cả",
+  "admin.registries.bitstream-formats.table.id": "ID",
+  "admin.registries.bitstream-formats.table.internal": "nội bộ",
+  "admin.registries.bitstream-formats.table.mimetype": "Kiểu MIME",
+  "admin.registries.bitstream-formats.table.name": "Tên",
+  "admin.registries.bitstream-formats.table.return": "Quay lại",
+  "admin.registries.bitstream-formats.table.supportLevel.head": "Mức độ hỗ trợ",
+  "admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Đã xác định",
+  "admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Được hỗ trợ",
+  "admin.registries.bitstream-formats.table.supportLevel.UNKNOWN": "Không xác định",
+  "admin.registries.bitstream-formats.title": "Tạo định dạng tệp tin số",
+  "admin.registries.metadata.breadcrumbs": "Mẫu nhập liệu",
+  "admin.registries.metadata.description": "Tạo mẫu nhập liệu cho phép duy trì danh sách tất cả các trường thông tin mô tả có sẵn trong hệ thống. Các trường này có thể được phân ra cho nhiều lược đồ. Tuy nhiên DSpace yêu cầu đủ điều kiện cho lược đồ Dublin Core.",
+  "admin.registries.metadata.form.create": "Tạo lược đồ thông tin mô tả",
+  "admin.registries.metadata.form.edit": "Chỉnh sửa lược đồ thông tin mô tả",
+  "admin.registries.metadata.form.name": "Tên",
+  "admin.registries.metadata.form.namespace": "Tên miền",
+  "admin.registries.metadata.head": "Tạo mẫu nhập liệu",
+  "admin.registries.metadata.schemas.no-items": "Không có lược đồ thông tin mô tả nào để hiển thị.",
+  "admin.registries.metadata.schemas.table.delete": "Xóa các mục đã chọn",
+  "admin.registries.metadata.schemas.table.id": "ID",
+  "admin.registries.metadata.schemas.table.name": "Tên",
+  "admin.registries.metadata.schemas.table.namespace": "Tên miền",
+  "admin.registries.metadata.title": "Tạo mẫu nhập liệu",
+  "admin.registries.schema.breadcrumbs": "Lược đồ thông tin mô tả",
+  "admin.registries.schema.description": "Đây là lược đồ thông tin mô tả cho \"{{namespace}}\".",
+  "admin.registries.schema.fields.head": "Lược đồ các trường thông tin mô tả",
+  "admin.registries.schema.fields.no-items": "Không có trường thông tin mô tả nào để hiển thị.",
+  "admin.registries.schema.fields.table.delete": "Xóa các mục đã lựa chọn",
+  "admin.registries.schema.fields.table.field": "Trường",
+  "admin.registries.schema.fields.table.id": "ID",
+  "admin.registries.schema.fields.table.scopenote": "Ghi chú phạm vi",
+  "admin.registries.schema.form.create": "Tạo trường thông tin mô tả",
+  "admin.registries.schema.form.edit": "Chỉnh sửa trường thông tin mô tả",
+  "admin.registries.schema.form.element": "Yếu tố",
+  "admin.registries.schema.form.qualifier": "Đối tượng bổ trợ",
+  "admin.registries.schema.form.scopenote": "Ghi chú phạm vi",
+  "admin.registries.schema.head": "Lược đồ thông tin mô tả",
+  "admin.registries.schema.notification.created": "Tạo thành công lược đồ thông tin mô tả \"{{prefix}}\"",
+  "admin.registries.schema.notification.deleted.failure": "Xóa không thành công {{amount}} lược đồ thông tin mô tả",
+  "admin.registries.schema.notification.deleted.success": "Đã xóa thành công {{amount}} lược đồ thông tin mô tả",
+  "admin.registries.schema.notification.edited": "Chỉnh sửa thành công lược đồ thông tin mô tả \"{{prefix}}\"",
+  "admin.registries.schema.notification.failure": "Lỗi",
+  "admin.registries.schema.notification.field.created": "Tạo thành công trường thông tin mô tả \"{{field}}\"",
+  "admin.registries.schema.notification.field.deleted.failure": "Xóa không thành công {{amount}} trường thông tin mô tả",
+  "admin.registries.schema.notification.field.deleted.success": "Đã xóa thành công {{amount}} trường thông tin mô tả",
+  "admin.registries.schema.notification.field.edited": "Chỉnh sửa thành công trường thông tin mô tả \"{{field}}\"",
+  "admin.registries.schema.notification.success": "Thành công",
+  "admin.registries.schema.return": "Quay lại",
+  "admin.registries.schema.title": "Tạo lược đồ thông tin mô tả",
+  "admin.access-control.epeople.actions.delete": "Xóa người dùng",
+  "admin.access-control.epeople.actions.impersonate": "Mạo danh người dùng",
+  "admin.access-control.epeople.actions.reset": "Cài lại mật khẩu",
+  "admin.access-control.epeople.actions.stop-impersonating": "Dừng mạo danh người dùng",
+  "admin.access-control.epeople.breadcrumbs": "Người dùng",
+  "admin.access-control.epeople.button.add": "Thêm người dùng",
+  "admin.access-control.epeople.button.see-all": "Duyệt toàn bộ",
+  "admin.access-control.epeople.form.canLogIn": "Có thể đăng nhập",
+  "admin.access-control.epeople.form.create": "Tạo người dùng",
+  "admin.access-control.epeople.form.edit": "Chỉnh sửa người dùng",
+  "admin.access-control.epeople.form.email": "E-mail",
+  "admin.access-control.epeople.form.emailHint": "Phải là địa chỉ e-mail hợp lệ",
+  "admin.access-control.epeople.form.firstName": "Tên",
+  "admin.access-control.epeople.form.goToGroups": "Thêm vào nhóm",
+  "admin.access-control.epeople.form.groupsEPersonIsMemberOf": "Thành viên của các nhóm:",
+  "admin.access-control.epeople.form.lastName": "Họ",
+  "admin.access-control.epeople.form.memberOfNoGroups": "Người dùng không là thành viên của bất kỳ nhóm nào",
+  "admin.access-control.epeople.form.notification.created.failure": "Tạo không thành công người dùng \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.created.failure.emailInUse": "Tạo không thành công người dùng \"{{name}}\" email \"{{email}}\" đã được sử dụng.",
+  "admin.access-control.epeople.form.notification.created.success": "Tạo thành công người dùng \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.failure": "Xóa không thành công người dùng \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.deleted.success": "Xóa thành công người dùng \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure": "Chỉnh sửa không thành công người dùng \"{{name}}\"",
+  "admin.access-control.epeople.form.notification.edited.failure.emailInUse": "Chỉnh sửa không thành công người dùng \"{{name}}\" email \"{{email}}\" đã được sử dụng.",
+  "admin.access-control.epeople.form.notification.edited.success": "Chỉnh sửa thành công người dùng \"{{name}}\"",
+  "admin.access-control.epeople.form.requireCertificate": "Khóa tài khoản",
+  "admin.access-control.epeople.form.return": "Quay lại",
+  "admin.access-control.epeople.form.table.collectionOrCommunity": "Đơn vị/ Bộ sưu tập",
+  "admin.access-control.epeople.form.table.id": "ID",
+  "admin.access-control.epeople.form.table.name": "Tên",
+  "admin.access-control.epeople.head": "Người dùng",
+  "admin.access-control.epeople.no-items": "Không có người dùng nào để hiển thị.",
+  "admin.access-control.epeople.notification.deleted.failure": "Xóa không thành công người dùng: \"{{name}}\"",
+  "admin.access-control.epeople.notification.deleted.success": "Xóa thành công người dùng: \"{{name}}\"",
+  "admin.access-control.epeople.notification.resetpassword.success": "Thiết lập lại mật khẩu thành công cho người dùng: \"{{name}}\"",
+  "admin.access-control.epeople.search.button": "Tìm kiếm",
+  "admin.access-control.epeople.search.head": "Tìm kiếm",
+  "admin.access-control.epeople.search.placeholder": "Tìm kiếm người dùng...",
+  "admin.access-control.epeople.search.scope.email": "E-mail (chính xác)",
+  "admin.access-control.epeople.search.scope.metadata": "Siêu dữ liệu",
+  "admin.access-control.epeople.table.edit": "Chỉnh sửa",
+  "admin.access-control.epeople.table.edit.buttons.edit": "Chỉnh sửa \"{{name}}\"",
+  "admin.access-control.epeople.table.edit.buttons.edit-disabled": "Bạn không có quyền chỉnh sửa nhóm này",
+  "admin.access-control.epeople.table.edit.buttons.remove": "Xóa \"{{name}}\"",
+  "admin.access-control.epeople.table.email": "E-mail (chính xác)",
+  "admin.access-control.epeople.table.id": "ID",
+  "admin.access-control.epeople.table.name": "Tên",
+  "admin.access-control.epeople.title": "Người dùng",
+  "admin.access-control.groups.addGroup.breadcrumbs": "Tạo nhóm người dùng",
+  "admin.access-control.groups.breadcrumbs": "Nhóm người dùng",
+  "admin.access-control.groups.button.add": "Thêm nhóm người dùng",
+  "admin.access-control.groups.button.see-all": "Duyệt toàn bộ",
+  "admin.access-control.groups.form.actions.delete": "Xóa nhóm người dùng",
+  "admin.access-control.groups.form.alert.permanent": "Nhóm này là cố định vì vậy nó không thể bị chỉnh sửa hoặc xóa. Bạn vẫn có thể thêm và loại bỏ thành viên trong nhóm tại trang này.",
+  "admin.access-control.groups.form.alert.workflowGroup": "Không thể chỉnh sửa hoặc xóa nhóm này vì nó tương ứng với một vai trò trong quá trình gửi và quy trình xử lý trong \"{{name}}\" {{comcol}}. Bạn có thể xóa nó từ thẻ <a href='{{comcolEditRolesRoute}}'>assign roles</a> trên trang chỉnh sửa {{comcol}}. Bạn vẫn có thể thêm và loại bỏ thành viên nhóm bằng trang này.\"",
+  "admin.access-control.groups.form.delete-group.modal.cancel": "Hủy",
+  "admin.access-control.groups.form.delete-group.modal.confirm": "Xóa",
+  "admin.access-control.groups.form.delete-group.modal.header": "Xóa nhóm người dùng \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.delete-group.modal.info": "Bạn có chắc chắn rằng bạn muốn xóa nhóm người dùng \"{{ dsoName }}\"",
+  "admin.access-control.groups.form.groupCommunity": "Đơn vị hoặc Bộ sưu tập",
+  "admin.access-control.groups.form.groupDescription": "Mô tả",
+  "admin.access-control.groups.form.groupName": "Tên nhóm người dùng",
+  "admin.access-control.groups.form.head.create": "Tạo nhóm người dùng",
+  "admin.access-control.groups.form.head.edit": "Chỉnh sửa nhóm người dùng",
+  "admin.access-control.groups.form.members-list.button.see-all": "Duyệt toàn bộ",
+  "admin.access-control.groups.form.members-list.head": "Người dùng",
+  "admin.access-control.groups.form.members-list.headMembers": "Các thành viên hiện tại",
+  "admin.access-control.groups.form.members-list.no-items": "Không người dùng nào được tìm thấy trong tìm kiếm",
+  "admin.access-control.groups.form.members-list.no-members-yet": "Chưa có thành viên trong nhóm tìm kiếm và thêm thành viên vào nhóm.",
+  "admin.access-control.groups.form.members-list.notification.failure.addMember": "Thêm không thành công thành viên: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.deleteMember": "Xóa không thành công thành viên: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.failure.noActiveGroup": "Hiện tại không có nhóm hoạt động gửi một tên trước.",
+  "admin.access-control.groups.form.members-list.notification.success.addMember": "Thêm thành công thành viên: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.notification.success.deleteMember": "Xóa thành công thành viên: \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.search.button": "Tìm kiếm",
+  "admin.access-control.groups.form.members-list.search.head": "Thêm người dùng",
+  "admin.access-control.groups.form.members-list.search.scope.email": "E-mail (chính xác)",
+  "admin.access-control.groups.form.members-list.search.scope.metadata": "Siêu dữ liệu",
+  "admin.access-control.groups.form.members-list.table.edit": "Loại bỏ / Thêm",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.add": "Thêm thành viên với tên \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.edit.buttons.remove": "Loại bỏ thành viên với tên \"{{name}}\"",
+  "admin.access-control.groups.form.members-list.table.email": "Email",
+  "admin.access-control.groups.form.members-list.table.id": "ID",
+  "admin.access-control.groups.form.members-list.table.identity": "Định danh",
+  "admin.access-control.groups.form.members-list.table.name": "Tên",
+  "admin.access-control.groups.form.members-list.table.netid": "NetID",
+  "admin.access-control.groups.form.notification.created.failure": "Tạo không thành công nhóm người dùng \"{{name}}\"",
+  "admin.access-control.groups.form.notification.created.failure.groupNameInUse": "Tạo không thành công nhóm người dùng với tên: \"{{name}}\" đảm bảo tên này chưa được sử dụng\"",
+  "admin.access-control.groups.form.notification.created.success": "Tạo thành công nhóm người dùng \"{{name}}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.content": "Nguyên nhân: \"{{ cause }}\"",
+  "admin.access-control.groups.form.notification.deleted.failure.title": "Xóa không thành công nhóm người dùng \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.deleted.success": "Xóa thành công nhóm người dùng \"{{ name }}\"",
+  "admin.access-control.groups.form.notification.edited.failure": "Chỉnh sửa không thành công nhóm người dùng \"{{name}}\"",
+  "admin.access-control.groups.form.notification.edited.failure.groupNameInUse": "Tên \"{{name}}\" đã được sử dụng!\"",
+  "admin.access-control.groups.form.notification.edited.success": "Chỉnh sửa thành công nhóm người dùng \"{{name}}\"",
+  "admin.access-control.groups.form.return": "Quay lại",
+  "admin.access-control.groups.form.subgroups-list.button.see-all": "Duyệt toàn bộ",
+  "admin.access-control.groups.form.subgroups-list.head": "Nhóm người dùng",
+  "admin.access-control.groups.form.subgroups-list.headSubgroups": "Nhóm người dùng con hiện tại",
+  "admin.access-control.groups.form.subgroups-list.no-items": "Không tìm thấy nhóm nào có tên hoặc UUID như vậy",
+  "admin.access-control.groups.form.subgroups-list.no-subgroups-yet": "Chưa có nhóm người dùng con nào trong nhóm.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure": "Đã xảy ra sự cố: \"{{cause}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.addSubgroup": "Thêm không thành công nhóm người dùng con: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.deleteSubgroup": "Xóa không thành công nhóm người dùng con: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.noActiveGroup": "Hiện tại không có nhóm hoạt động gửi một tên trước.",
+  "admin.access-control.groups.form.subgroups-list.notification.failure.subgroupToAddIsActiveGroup": "Đây là nhóm hiện tại không thể thêm được.",
+  "admin.access-control.groups.form.subgroups-list.notification.success.addSubgroup": "Thêm thành công nhóm người dùng con: \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.notification.success.deleteSubgroup": "Loại bỏ thành công nhóm người dùng: \"{{name}}\" ra khỏi nhóm",
+  "admin.access-control.groups.form.subgroups-list.search.button": "Tìm kiếm",
+  "admin.access-control.groups.form.subgroups-list.search.head": "Thêm nhóm người dùng con",
+  "admin.access-control.groups.form.subgroups-list.table.collectionOrCommunity": "Đơn vị/ Bộ sưu tập",
+  "admin.access-control.groups.form.subgroups-list.table.edit": "Loại bỏ / Thêm",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.add": "Thêm nhóm người dùng con với tên \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.buttons.remove": "Loại bỏ nhóm người dùng con với tên \"{{name}}\"",
+  "admin.access-control.groups.form.subgroups-list.table.edit.currentGroup": "Nhóm người dùng hiện tại",
+  "admin.access-control.groups.form.subgroups-list.table.id": "ID",
+  "admin.access-control.groups.form.subgroups-list.table.name": "Tên",
+  "admin.access-control.groups.head": "Nhóm người dùng",
+  "admin.access-control.groups.no-items": "Không tìm thấy nhóm nào có tên hoặc UUID như vậy",
+  "admin.access-control.groups.notification.deleted.failure.content": "Nguyên nhân: \"{{cause}}\"",
+  "admin.access-control.groups.notification.deleted.failure.title": "Xóa không thành công nhóm \"{{name}}\"",
+  "admin.access-control.groups.notification.deleted.success": "Xóa thành công nhóm \"{{name}}\"",
+  "admin.access-control.groups.search.button": "Tìm kiếm",
+  "admin.access-control.groups.search.head": "Tìm kiếm nhóm người dùng",
+  "admin.access-control.groups.search.placeholder": "Tìm kiếm nhóm người dùng...",
+  "admin.access-control.groups.singleGroup.breadcrumbs": "Chỉnh sửa nhóm người dùng",
+  "admin.access-control.groups.table.collectionOrCommunity": "Đơn vị/ Bộ sưu tập",
+  "admin.access-control.groups.table.edit": "Chỉnh sửa",
+  "admin.access-control.groups.table.edit.buttons.edit": "Chỉnh sửa \"{{name}}\"",
+  "admin.access-control.groups.table.edit.buttons.remove": "Xóa \"{{name}}\"",
+  "admin.access-control.groups.table.id": "ID",
+  "admin.access-control.groups.table.members": "Thành viên",
+  "admin.access-control.groups.table.name": "Tên",
+  "admin.access-control.groups.title": "Nhóm người dùng",
+  "admin.access-control.groups.title.addGroup": "Tạo nhóm người dùng",
+  "admin.access-control.groups.title.singleGroup": "Chỉnh sửa nhóm người dùng",
+  "admin.search.breadcrumbs": "Tìm kiếm quản trị",
+  "admin.search.collection.edit": "Chỉnh sửa",
+  "admin.search.community.edit": "Chỉnh sửa",
+  "admin.search.item.delete": "Xóa",
+  "admin.search.item.edit": "Chỉnh sửa",
+  "admin.search.item.make-private": "Đặt làm tài liệu cá nhân",
+  "admin.search.item.make-public": "Đặt làm tài liệu công cộng",
+  "admin.search.item.move": "Di chuyển",
+  "admin.search.item.reinstate": "Khôi phục",
+  "admin.search.item.withdraw": "Ẩn",
+  "admin.search.title": "Tìm kiếm quản trị",
+  "administrativeView.search.results.head": "Tìm kiếm quản trị",
+  "admin.workflow.breadcrumbs": "Quản trị luồng công việc",
+  "admin.workflow.title": "Quản trị luồng công việc",
+  "admin.workflow.item.workflow": "Luồng công việc",
+  "admin.workflow.item.workspace": "Workspace",
+  "admin.workflow.item.delete": "Xóa",
+  "admin.workflow.item.send-back": "Gửi trở lại",
+  "admin.workflow.item.policies": "Policies",
+  "admin.workflow.item.supervision": "Supervision",
+  "admin.batch-import.breadcrumbs": "Nhập dữ liệu theo lô",
+  "admin.batch-import.page.dropMsg": "Kéo thả file ZIP để nhập vào",
+  "admin.batch-import.page.dropMsgReplace": "Kéo thả để thay thế file ZIP cần nhập vào",
+  "admin.batch-import.page.error.addFile": "Chọn file Zip đầu tiên!",
+  "admin.batch-import.page.header": "Nhập dữ liệu theo lô",
+  "admin.batch-import.page.help": "Chọn Bộ sưu tập để nhập dữ liệu. Sau đó kéo thả hoặc duyệt tới tệp tin định dạng zip có chứa các tài liệu cần nhập vào.",
+  "admin.batch-import.page.remove": "xóa",
+  "admin.batch-import.title": "Nhập dữ liệu theo lô",
+  "admin.batch-import.page.validateOnly.hint": "Nếu chọn tùy chọn \"Kiểm tra file ZIP tải lên\", hệ thống sẽ chạy một tiến trình kiểm tra việc nhập dữ liệu theo lô thay vì đổ trực tiếp dữ liệu lên hệ thống. Việc này giúp cán bộ xác nhận lại kết quả của quy trình nhập trước khi nhập dữ liệu chính thức. Bỏ chọn tùy chọn này để đổ lô tài liệu lên hệ thống.",
+  "admin.metadata-import.breadcrumbs": "Nhập thông tin mô tả",
+  "admin.metadata-import.page.button.proceed": "Tiếp tục",
+  "admin.metadata-import.page.button.return": "Quay lại",
+  "admin.metadata-import.page.button.select-collection": "Chọn Bộ sưu tập",
+  "admin.metadata-import.page.dropMsg": "Thả một tệp CSV để nhập thông tin mô tả",
+  "admin.metadata-import.page.dropMsgReplace": "Thả một tệp CSV để nhập thông tin mô tả thay thế",
+  "admin.metadata-import.page.error.addFile": "Lựa chọn tệp trước!",
+  "admin.metadata-import.page.header": "Nhập thông tin mô tả",
+  "admin.metadata-import.page.help": "Bạn có thể thả hoặc duyệt tới tệp CSV chứa hàng loạt các thông tin mô tả tại đây",
+  "admin.metadata-import.page.validateOnly": "Kiểm tra nhập lô siêu dữ liệu",
+  "admin.metadata-import.page.validateOnly.hint": "Nếu chọn tùy chọn \"Kiểm tra nhập lô siêu dữ liệu\", hệ thống sẽ chạy một tiến trình kiểm tra nhập lô siêu dữ liệu thay vì đổ trực tiếp dữ liệu lên hệ thống. Bỏ chọn tùy chọn này để tiến hành nhập dữ liệu chính thức.",
+  "admin.metadata-import.title": "Nhập thông tin mô tả",
+  "advanced-workflow-action.rating.form.rating.label": "Xếp hạng",
+  "advanced-workflow-action.rating.form.rating.error": "Bạn phải đánh giá tài liệu/ thực thế này",
+  "advanced-workflow-action.rating.form.review.label": "Kiểm duyệt",
+  "advanced-workflow-action.rating.form.review.error": "Bạn phải nhập nội dung đánh giá để gửi bản xếp hạng này",
+  "advanced-workflow-action.rating.description": "Vui lòng chọn một xếp hạng bên dưới",
+  "advanced-workflow-action.rating.description-requiredDescription": "Vui lòng chọn xếp hạng bên dưới và thêm đánh giá",
+  "advanced-workflow-action.select-reviewer.description-single": "Vui lòng chọn một người kiểm duyệt dưới đây trước khi tải tài liệu lên",
+  "advanced-workflow-action.select-reviewer.description-multiple": "Vui lòng chọn một hoặc nhiều người kiểm duyệt dưới đây trước khi tải tài liệu lên",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.head": "Người dùng",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.head": "Thêm người dùng",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.button.see-all": "Duyệt tất cả",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.headMembers": "Các thành viên hiện tại",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.search.scope.metadata": "Siêu dữ liệu",
+  "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": "Tìm kiếm",
+  "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.identity": "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": "Loại bỏ / Thêm",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.remove": "Loại bỏ người dùng \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.addMember": "Thêm thành công thành viên: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.addMember": "Không thể thêm thành viên: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.success.deleteMember": "Xóa thành công thành viên: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.deleteMember": "Không thể xóa thành viên: \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.table.edit.buttons.add": "Thêm thành viên \"{{name}}\"",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.notification.failure.noActiveGroup": "Không có nhóm hoạt động, gửi tên trước.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-members-yet": "Chưa có thành viên nào trong nhóm, tìm kiếm để thêm.",
+  "advanced-workflow-action-select-reviewer.groups.form.reviewers-list.no-items": "Không tìm thấy người dùng",
+  "advanced-workflow-action.select-reviewer.no-reviewer-selected.error": "Không có người kiểm duyệt nào được chọn.",
+  "auth.errors.invalid-user": "Địa chỉ email hoặc mật khẩu không hợp lệ.",
+  "auth.messages.expired": "Phiên của bạn đã hết hạn. Xin vui lòng đăng nhập lại.",
+  "auth.messages.token-refresh-failed": "Làm mới mã token phiên làm việc của bạn không thành công. Vui lòng đăng nhập lại.",
+  "bitstream.download.page": "Đang tải xuống {{bitstream}}... ",
+  "bitstream.download.page.back": "Quay lại",
+  "bitstream.edit.authorizations.link": "Chỉnh sửa chính sách của tệp tin",
+  "bitstream.edit.authorizations.title": "Chỉnh sửa chính sách của tệp tin",
+  "bitstream.edit.bitstream": "Tệp tin:",
+  "bitstream.edit.form.description.hint": "Tùy chọn cung cấp mô tả ngắn gọn về tệp ví dụ \"<i>Bài báo chính</i>\" or \"<i>Dữ liệu đọc thử nghiệm</i>\".",
+  "bitstream.edit.form.description.label": "Mô tả",
+  "bitstream.edit.form.embargo.hint": "Ngày đầu tiên được phép truy cập. <b>Ngày này không thể được chỉnh sửa trên biểu mẫu này.</b> Để thiết lập một ngày ngừng phục vụ tệp tin này đi tới thẻ <i>Trạng thái tài liệu</i> nhấp <i>Phân quyền...</i> tạo hoặc chỉnh sửa quyền <i>ĐỌC</i> của tệp tin và thiết lập <i>Ngày bắt đầu</i> như mong muốn.",
+  "bitstream.edit.form.embargo.label": "Ngừng phục vụ cho tới ngày",
+  "bitstream.edit.form.fileName.hint": "Thay đổi tên tệp cho tệp tin. Lưu ý rằng điều này sẽ thay đổi hiển thị URL tệp tin nhưng các liên kết cũ sẽ vẫn phân giải miễn là ID trình tự không thay đổi.",
+  "bitstream.edit.form.fileName.label": "Tên tệp",
+  "bitstream.edit.form.iiifHeight.hint": "Chiều cao của khung thường phải khớp với chiều cao của hình ảnh",
+  "bitstream.edit.form.iiifHeight.label": "Chiều cao ảnh",
+  "bitstream.edit.form.iiifLabel.hint": "Tên cho hình ảnh này. Nếu không được cung cấp tên mặc định sẽ được sử dụng.",
+  "bitstream.edit.form.iiifLabel.label": "Tên",
+  "bitstream.edit.form.iiifToc.hint": "Thêm mục lục mới",
+  "bitstream.edit.form.iiifToc.label": "Mục lục",
+  "bitstream.edit.form.iiifWidth.hint": "Chiều rộng của khung thường phải khớp với chiều rộng của hình",
+  "bitstream.edit.form.iiifWidth.label": "Chiều rộng khung",
+  "bitstream.edit.form.newFormat.hint": "Ứng dụng bạn đã sử dụng để tạo tệp và thông tin phiên bản (ví dụ \"<i>ACMESoft SuperApp phiên bản 1.5</i>\").",
+  "bitstream.edit.form.newFormat.label": "Mô tả định dạng mới",
+  "bitstream.edit.form.primaryBitstream.label": "Tệp tin chính",
+  "bitstream.edit.form.selectedFormat.hint": "Nếu định dạng không có trong danh sách trên <b>chọn \"định dạng không có trong danh sách\" trên</b> và mô tả nó dưới mục\"Mô tả định dạng mới\".",
+  "bitstream.edit.form.selectedFormat.label": "Định dạng đã chọn",
+  "bitstream.edit.form.selectedFormat.unknown": "Định dạng không có trong danh sách",
+  "bitstream.edit.notifications.error.format.title": "Đã xảy ra lỗi khi lưu định dạng của tệp tin",
+  "bitstream.edit.notifications.saved.content": "Thay đổi của bạn đối với tệp tin đã được lưu.",
+  "bitstream.edit.notifications.saved.title": "Đã lưu tệp tin",
+  "bitstream.edit.return": "Quay lại",
+  "bitstream.edit.title": "Chỉnh sửa tệp tin",
+  "bitstream-request-a-copy.alert.canDownload1": "Bạn đã có quyền truy cập tệp tin này. Nếu muốn tải tệp tin click ",
+  "bitstream-request-a-copy.alert.canDownload2": "vào đây",
+  "bitstream-request-a-copy.allfiles.label": "Các tệp tin",
+  "bitstream-request-a-copy.email.error": "Vui lòng nhập một địa chỉ email hợp lệ.",
+  "bitstream-request-a-copy.email.hint": "Địa chỉ email này đã được sử dụng để gửi tệp tin.",
+  "bitstream-request-a-copy.email.label": "Địa chỉ email của bạn *",
+  "bitstream-request-a-copy.files-all-false.label": "Chỉ tệp tin được yêu cầu",
+  "bitstream-request-a-copy.files-all-true.label": "Tất cả tệp tin của tài liệu này đều bị hạn chế quyền truy cập",
+  "bitstream-request-a-copy.header": "Yêu cầu bản sao",
+  "bitstream-request-a-copy.intro": "Nhập các thông tin dưới đây để yêu cầu bản sao của tài liệu:",
+  "bitstream-request-a-copy.intro.bitstream.all": "Yêu cầu tất cả các tệp tin.",
+  "bitstream-request-a-copy.intro.bitstream.one": "Yêu cầu các tệp tin sau:",
+  "bitstream-request-a-copy.message.label": "Tin nhắn",
+  "bitstream-request-a-copy.name.error": "Tên là bắt buộc",
+  "bitstream-request-a-copy.name.label": "Tên*",
+  "bitstream-request-a-copy.return": "Quay lại",
+  "bitstream-request-a-copy.submit": "Yêu cầu bản sao",
+  "bitstream-request-a-copy.submit.error": "Đã xảy ra lỗi trong quá trình gửi yêu cầu tài liệu.",
+  "bitstream-request-a-copy.submit.success": "Yêu cầu tài liệu đã được gửi thành công.",
+  "browse.back.all-results": "Tất cả kết quả",
+  "browse.comcol.by.author": "Tác giả",
+  "browse.comcol.by.dateissued": "Năm xuất bản",
+  "browse.comcol.by.subject": "Chủ đề",
+  "browse.comcol.by.title": "Nhan đề",
+  "browse.comcol.head": "Duyệt",
+  "browse.empty": "Không có tài liệu nào để hiển thị.",
+  "browse.metadata.author": "Tác giả",
+  "browse.metadata.author.breadcrumbs": "Duyệt theo tác giả",
+  "browse.metadata.dateissued": "Năm xuất bản",
+  "browse.metadata.dateissued.breadcrumbs": "Duyệt theo năm xuất bản",
+  "browse.metadata.subject": "Chủ đề",
+  "browse.metadata.subject.breadcrumbs": "Duyệt theo chủ đề",
+  "browse.metadata.title": "Nhan đề",
+  "browse.metadata.title.breadcrumbs": "Duyệt theo nhan đề",
+  "browse.metadata.topic": "Topic",
+  "browse.metadata.type": "Kiểu tài liệu",
+  "pagination.next.button": "Tiếp theo",
+  "pagination.previous.button": "Quay lại",
+  "pagination.next.button.disabled.tooltip": "Không còn trang kết quả khác",
+  "browse.startsWith.choose_year.label": "Chọn năm xuất bản",
+  "browse.startsWith.choose_year": "(Năm)",
+  "browse.startsWith.jump": "Chuyển tới một điểm trong chỉ mục:",
+  "browse.startsWith.months.april": "Tháng Tư",
+  "browse.startsWith.months.august": "Tháng Tám",
+  "browse.startsWith.months.december": "Tháng Mười hai",
+  "browse.startsWith.months.february": "Tháng Hai",
+  "browse.startsWith.months.january": "Tháng Một",
+  "browse.startsWith.months.july": "Tháng Bảy",
+  "browse.startsWith.months.june": "Tháng Sáu",
+  "browse.startsWith.months.march": "Tháng Ba",
+  "browse.startsWith.months.may": "Tháng Năm",
+  "browse.startsWith.months.none.label": "Chọn tháng xuất bản",
+  "browse.startsWith.months.none": "(Tháng)",
+  "browse.startsWith.months.november": "Tháng Mười một",
+  "browse.startsWith.months.october": "Tháng Mười",
+  "browse.startsWith.months.september": "Tháng Chín",
+  "browse.startsWith.submit": "Duyệt",
+  "browse.startsWith.type_date": "Hoặc nhập một ngày  (năm-tháng) và nhấp \"Duyệt\"",
+  "browse.startsWith.type_date.label": "Hoặc nhập một ngày  (năm-tháng) à nhấp Duyệt",
+  "browse.startsWith.type_text": "Nhập một vài ký tự đầu tiên và nhấp vào nút Duyệt",
+  "browse.title": "Duyệt {{ collection }} theo {{ field }}{{ startsWith }} {{ value }}",
+  "browse.title.page": "Duyệt {{ collection }} theo {{ field }} {{ value }}",
+  "search.browse.item-back": "Quay lại kết quả tìm kiếm",
+  "chips.remove": "Loại bỏ chip",
+  "claimed-approved-search-result-list-element.title": "Chấp nhận",
+  "claimed-declined-search-result-list-element.title": "Đã bị từ chối, đã gửi lại cho người nhập liệu",
+  "claimed-declined-task-search-result-list-element.title": "Bị từ chối, đã gửi lại tới người quản lý kiểm duyệt",
+  "collection.create.head": "Tạo một Bộ sưu tập",
+  "collection.create.notifications.success": "Tạo bộ sưu tập thành công",
+  "collection.create.sub-head": "Tạo một bộ sưu tập cho đơnn vị {{ parent }}",
+  "collection.curate.header": "Kiểm tra bộ sưu tập: {{collection}}",
+  "collection.delete.cancel": "Hủy",
+  "collection.delete.confirm": "Xác nhận",
+  "collection.delete.head": "Xóa bộ sưu tập",
+  "collection.delete.notification.fail": "Không thể xóa bộ sưu tập",
+  "collection.delete.notification.success": "Xóa bộ sưu tập thành công",
+  "collection.delete.processing": "Đang xóa",
+  "collection.delete.text": "Bạn có chắc chắn rằng bạn muốn xóa bộ sưu tập \"{{ dso }}\"",
+  "collection.edit.breadcrumbs": "Chỉnh sửa bộ sưu tập",
+  "collection.edit.delete": "Xóa bộ sưu tập này",
+  "collection.edit.head": "Chỉnh sửa bộ sưu tập",
+  "collection.edit.item.authorizations.load-bundle-button": "Hiển thị thêm các nhóm khác",
+  "collection.edit.item.authorizations.load-more-button": "Hiển thị thêm",
+  "collection.edit.item.authorizations.show-bitstreams-button": "Hiển thị chính sách phân quyền tệp tin đối với nhóm",
+  "collection.edit.item-mapper.cancel": "Hủy",
+  "collection.edit.item-mapper.collection": "Bộ sưu tập: \"<b>{{name}}</b>\"",
+  "collection.edit.item-mapper.confirm": "Ánh xạ những tài liệu đã chọn",
+  "collection.edit.item-mapper.description": "Đây là công cụ liên kết tài liệu cho phép người quản trị bộ sưu tập liên kết các tài liệu từ các bộ sưu tập khác vào bộ sưu tập này. Bạn có thể tìm kiếm các tài liệu từ các bộ sưu tập khác và liên kết chúng hoặc duyệt qua danh sách các tài liệu hiện đã được liên kết.",
+  "collection.edit.item-mapper.head": "Liên kết tài liệu - Liên kết tài liệu tới bộ sưu tập khác",
+  "collection.edit.item-mapper.no-search": "Vui lòng nhập truy vấn để tìm kiếm",
+  "collection.edit.item-mapper.notifications.map.error.content": "Đã xảy ra lỗi khi liên kết{{amount}} tài liệu.",
+  "collection.edit.item-mapper.notifications.map.error.head": "Lỗi liên kết",
+  "collection.edit.item-mapper.notifications.map.success.content": "Ánh xạ thành công {{amount}} tài liệu.",
+  "collection.edit.item-mapper.notifications.map.success.head": "Ánh xạ được hoàn thành",
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Đã xảy ra lỗi khi loại bỏ các liên kết của {{amount}} tài liệu.",
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Lỗi loại bỏ liên kết",
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Loại bỏ thành công các liên kết của {{amount}} tài liệu.",
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Hoàn thành loại bỏ liên kết",
+  "collection.edit.item-mapper.remove": "Loại bỏ các liên kết của tài liệu được chọn",
+  "collection.edit.item-mapper.search-form.placeholder": "Tìm kiếm tài liệu...",
+  "collection.edit.item-mapper.tabs.browse": "Duyệt các tài liệu được liên kết",
+  "collection.edit.item-mapper.tabs.map": "Liên kết tài liệu mới",
+  "collection.edit.logo.delete.title": "Xóa logo",
+  "collection.edit.logo.delete-undo.title": "Hoàn tác xóa",
+  "collection.edit.logo.label": "Logo bộ sưu tập",
+  "collection.edit.logo.notifications.add.error": "Tải lên không thành công logo bộ sưu tập. Vui lòng kiểm tra nội dung trước khi thử lại.",
+  "collection.edit.logo.notifications.add.success": "Tài thành công logo bộ sưu tập.",
+  "collection.edit.logo.notifications.delete.error.title": "Lỗi khi xóa logo",
+  "collection.edit.logo.notifications.delete.success.content": "Xóa thành công logo của bộ sưu tập",
+  "collection.edit.logo.notifications.delete.success.title": "Logo đã được xóa",
+  "collection.edit.logo.upload": "Thả một logo bộ sưu tập để tải lên",
+  "collection.edit.notifications.success": "Chỉnh sửa thành công bộ sưu tập",
+  "collection.edit.return": "Quay lại",
+  "collection.edit.tabs.authorizations.head": "Phân quyền",
+  "collection.edit.tabs.authorizations.title": "Chỉnh sửa bộ sưu tập - Phân quyền",
+  "collection.edit.tabs.curate.head": "Kiểm tra",
+  "collection.edit.tabs.curate.title": "Chỉnh sửa bộ sưu tập - Kiểm tra",
+  "collection.edit.tabs.item-mapper.title": "Chỉnh sửa bộ sưu tập - Liên kết tài liệu",
+  "collection.edit.tabs.mapper.head": "Liên kết tài liệu",
+  "collection.edit.tabs.metadata.head": "Chỉnh sửa thông tin mô tả",
+  "collection.edit.tabs.metadata.title": "Chỉnh sửa bộ sưu tập - Siêu dữ liệu",
+  "collection.edit.tabs.roles.head": "Gán quyền",
+  "collection.edit.tabs.roles.title": "Chỉnh sửa bộ sưu tập - Vai trò",
+  "collection.edit.tabs.source.external": "Bộ sưu tập này thu thập nội dung từ một nguồn bên ngoài",
+  "collection.edit.tabs.source.form.errors.oaiSource.required": "Bạn phải cung cấp một bộ id của bộ sưu tập đích.",
+  "collection.edit.tabs.source.form.harvestType": "Nội dung đang được thu thập",
+  "collection.edit.tabs.source.form.head": "Cấu hình nguồn bên ngoài",
+  "collection.edit.tabs.source.form.metadataConfigId": "Định dạng thông tin mô tả",
+  "collection.edit.tabs.source.form.oaiSetId": "ID của bộ OAI",
+  "collection.edit.tabs.source.form.oaiSource": "Nhà cung cấp OAI",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_BITSTREAMS": "Thu thập thông tin mô tả và tệp tin (yêu cầu hỗ trợ ORE)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_AND_REF": "Thu thập thông tin mô tả và tham chiếu đến tệp tin (yêu cầu hỗ trợ ORE)",
+  "collection.edit.tabs.source.form.options.harvestType.METADATA_ONLY": "Chỉ thu thập thông tin mô tả",
+  "collection.edit.tabs.source.head": "Nguồn nội dung",
+  "collection.edit.tabs.source.notifications.discarded.content": "Các thay đổi của bạn đã bị hủy. Để khôi phục các thay đổi hãy nhấp vào nút 'Hoàn tác'",
+  "collection.edit.tabs.source.notifications.discarded.title": "Các thay đổi đã bị hủy",
+  "collection.edit.tabs.source.notifications.invalid.content": "Các thay đổi chưa được lưu. Hãy đảm bảo rằng tất cả các trường đều hợp lệ trước khi lưu.",
+  "collection.edit.tabs.source.notifications.invalid.title": "Siêu dữ liệu không hợp lệ",
+  "collection.edit.tabs.source.notifications.saved.content": "Các thay đổi của bạn đối với nguồn nội dung của bộ sưu tập này đã được lưu.",
+  "collection.edit.tabs.source.notifications.saved.title": "Nguồn nội dung đã được lưu",
+  "collection.edit.tabs.source.title": "Chỉnh sửa bộ sưu tập - Nguồn nội dung",
+  "collection.edit.template.add-button": "Thêm",
+  "collection.edit.template.breadcrumbs": "Khung mẫu tài liệu",
+  "collection.edit.template.cancel": "Hủy",
+  "collection.edit.template.delete-button": "Xóa",
+  "collection.edit.template.edit-button": "Chỉnh sửa",
+  "collection.edit.template.error": "Đã xảy ra lỗi khi truy xuất khung mẫu tài liệu",
+  "collection.edit.template.head": "Chỉnh sửa khung mẫu tài liệu cho bộ sưu tập \"{{ collection }}\"",
+  "collection.edit.template.label": "Khung mẫu tài liệu",
+  "collection.edit.template.loading": "Đang tải khung mẫu tài liệu...",
+  "collection.edit.template.notifications.delete.error": "Xóa khung mẫu tài liệu không thành công",
+  "collection.edit.template.notifications.delete.success": "Xóa khung mẫu tài liệu thành công",
+  "collection.edit.template.title": "Chỉnh sửa khung mẫu tài liệu",
+  "collection.form.abstract": "Mô tả ngắn",
+  "collection.form.description": "Văn bản giới thiệu (HTML)",
+  "collection.form.entityType": "Loại thực thể",
+  "collection.form.errors.title.required": "Vui lòng nhập tên bộ sưu tập",
+  "collection.form.license": "Giấy phép",
+  "collection.form.provenance": "Nguồn gốc",
+  "collection.form.rights": "Bản quyền (HTML)",
+  "collection.form.tableofcontents": "Tin tức (HTML)",
+  "collection.form.title": "Tên",
+  "collection.listelement.badge": "Bộ sưu tập",
+  "collection.page.browse.recent.empty": "Không có biểu ghi nào để hiển thị",
+  "collection.page.browse.recent.head": "Những tài liệu tải lên gần đây",
+  "collection.page.edit": "Chỉnh sửa bộ sưu tập",
+  "collection.page.handle": "URL",
+  "collection.page.description.abstract": "Mô tả",
+  "collection.page.license": "Giấy phép",
+  "collection.page.news": "Tin tức",
+  "collection.select.confirm": "Xác nhận các mục đã chọn",
+  "collection.select.empty": "Không có bộ sưu tập nào để hiển thị",
+  "collection.select.table.title": "Nhan đề",
+  "collection.source.controls.harvest.last": "Lần thu thập trước:",
+  "collection.source.controls.harvest.message": "Thông tin thu thập:",
+  "collection.source.controls.harvest.no-information": "N/A",
+  "collection.source.controls.harvest.start": "Thời gian bắt đầu thu thập:",
+  "collection.source.controls.harvest.status": "Trạng thái thu thập:",
+  "collection.source.controls.head": "Quản lý thu thập:",
+  "collection.source.controls.import.completed": "Quá trình nhập liệu đã hoàn thành",
+  "collection.source.controls.import.failed": "Xảy ra lỗi trong quá trình nhập dữ liệu",
+  "collection.source.controls.import.running": "Đang nhập dữ liệu…",
+  "collection.source.controls.import.submit": "Nhập ngay",
+  "collection.source.controls.import.submit.error": "Xảy ra sự cố khi bắt đầu quá trình nhập dữ liệu",
+  "collection.source.controls.import.submit.success": "Quá trình nhập liệu đã được bắt đầu thành công",
+  "collection.source.controls.reset.completed": "Quá trình thiết lập và nhập lại dữ liệu đã hoàn tất",
+  "collection.source.controls.reset.failed": "Xảy ra sự cố trong quá trình thiết lập và nhập lại dữ liệu",
+  "collection.source.controls.reset.running": "Đang thiết lập và nhập lại dữ liệu",
+  "collection.source.controls.reset.submit": "Thiết lập và nhập lại dữ liệu",
+  "collection.source.controls.reset.submit.error": "Đã xảy ra lỗi khi bắt đầu thiết lập và nhập lại dữ liệu",
+  "collection.source.controls.reset.submit.success": "Quá trình thiết lập và nhập lại dữ liệu đã được bắt đầu thành công",
+  "collection.source.controls.test.completed": "Tập lệnh để kiểm tra cài đặt đã kết thúc thành công",
+  "collection.source.controls.test.failed": "Tập lệnh để kiểm tra cài đặt không thành công",
+  "collection.source.controls.test.running": "Cấu hình thử nghiệm…",
+  "collection.source.controls.test.submit": "Cấu hình thử nghiệm",
+  "collection.source.controls.test.submit.error": "Đã xảy ra lỗi khi bắt đầu cài đặt thử nghiệm",
+  "collection.source.update.notifications.error.content": "Các cài đặt đã được kiểm tra và không hoạt động.",
+  "collection.source.update.notifications.error.title": "Lỗi máy chủ",
+  "community.create.head": "Tạo đơn vị",
+  "community.create.notifications.success": "Tạo đơn vị thành công",
+  "community.create.sub-head": "Tạo một đơn vị con cho đơn vị {{ parent }}",
+  "community.curate.header": "Kiểm tra đơn vị: {{community}}",
+  "community.delete.cancel": "Hủy",
+  "community.delete.confirm": "Xác nhận",
+  "community.delete.head": "Xóa đơn vị",
+  "community.delete.notification.fail": "Không thể xóa đơn vị",
+  "community.delete.notification.success": "Xóa đơn vị thành công",
+  "community.delete.processing": "Đang xóa…",
+  "community.delete.text": "Bạn có chắc chắn muốn xóa đơn vị \"{{ dso }}\"",
+  "community.edit.breadcrumbs": "Chỉnh sửa đơn vị",
+  "community.edit.delete": "Xóa đơn vị này",
+  "community.edit.head": "Chỉnh sửa đơn vị",
+  "community.edit.logo.delete.title": "Xóa logo",
+  "community.edit.logo.delete-undo.title": "Hoàn tác xóa",
+  "community.edit.logo.label": "Logo đơn vị",
+  "community.edit.logo.notifications.add.error": "Tải lên không thành công thành công logo đơn vị. Vui lòng kiểm tra lại nội dung trước khi tải lại.",
+  "community.edit.logo.notifications.add.success": "Tài lên thành công logo đơn vị.",
+  "community.edit.logo.notifications.delete.error.title": "Lỗi khi xóa logo",
+  "community.edit.logo.notifications.delete.success.content": "Xóa thành công logo của đơn vị",
+  "community.edit.logo.notifications.delete.success.title": "Đã xóa logo",
+  "community.edit.logo.upload": "Thả một logo đơn vị để tải lên",
+  "community.edit.notifications.error": "Đã xảy ra lỗi khi chỉnh sửa đơn vị",
+  "community.edit.notifications.success": "Chỉnh sửa đơn vị thành công",
+  "community.edit.notifications.unauthorized": "Bạn không có quyền để thực hiện thay đổi này",
+  "community.edit.return": "Quay lại",
+  "community.edit.tabs.authorizations.head": "Phân quyền",
+  "community.edit.tabs.authorizations.title": "Chỉnh sửa đơn vị - Phân quyền",
+  "community.edit.tabs.curate.head": "Kiểm tra",
+  "community.edit.tabs.curate.title": "Chỉnh sửa đơn vị - Kiểm tra",
+  "community.edit.tabs.metadata.head": "Chỉnh sửa thông tin mô tả",
+  "community.edit.tabs.metadata.title": "Chỉnh sửa đơn vị - Siêu dữ liệu",
+  "community.edit.tabs.roles.head": "Gán quyền",
+  "community.edit.tabs.roles.title": "Chỉnh sửa đơn vị - Quyền",
+  "community.form.abstract": "Mô tả ngắn",
+  "community.form.description": "Văn bản giới thiệu (HTML)",
+  "community.form.errors.title.required": "Vui lòng nhập tên đơn vị",
+  "community.form.rights": "Thông tin bản quyền (HTML)",
+  "community.form.tableofcontents": "Tin tức (HTML)",
+  "community.form.title": "Tên",
+  "community.listelement.badge": "Đơn vị",
+  "community.page.edit": "Chỉnh sửa đơn vị",
+  "community.page.handle": "URL",
+  "community.page.license": "Giấy phép",
+  "community.page.news": "Tin tức",
+  "community.sub-collection-list.head": "Các bộ sưu tập của đơn vị này",
+  "community.sub-community-list.head": "Các đơn vị con của đơn vị này",
+  "communityList.breadcrumbs": "Danh sách đơn vị",
+  "communityList.showMore": "Hiển thị thêm",
+  "communityList.tabTitle": "Danh sách đơn vị",
+  "communityList.title": "Danh sách các đơn vị",
+  "comcol-role.edit.bitstream_read.anonymous-group": "Quyền đọc được mặc định cho các tài liệu hiện được đặt cho nhóm người dùng ẩn danh.",
+  "comcol-role.edit.bitstream_read.description": "Người có quyền đọc tệp tin có khả năng tải các tệp tin về máy tính cá nhân để sử dụng",
+  "comcol-role.edit.bitstream_read.name": "Quyền đọc tệp tin mặc định",
+  "comcol-role.edit.collection-admin.description": "Quản trị viên bộ sưu tập quyết định người  có thể tải tài liệu vào bộ sưu tập sửa thông tin mô tả của tài liệu (sau khi tải lên) và thêm (liên kết) tài liệu đã tồn tại từ bộ sưu tập khác (phụ thuộc phân quyền vào bộ sưu tập đó)",
+  "comcol-role.edit.collection-admin.name": "Quản trị",
+  "comcol-role.edit.community-admin.description": "Quản trị viên đơn vị có thể tạo đơn vị con hoặc bộ sưu tập và quản lý hoặc gán quyền quản lý cho những đơn vị con hoặc bộ sưu tập đó. Ngoài ra họ quyết định ai có thể tải các tài liệu vào bất kì bộ sưu tập nào chỉnh sửa thông tin thông tin mô tả của tài liệu (sau khi tải lên) và thêm (liên kết) các tài liệu đã tồn tại ở bộ sưu tập khác (phụ thuộc vào phân quyền)",
+  "comcol-role.edit.community-admin.name": "Quản trị",
+  "comcol-role.edit.create": "Tạo",
+  "comcol-role.edit.create.error.title": "Không tạo được nhóm có quyền '{{role }}'",
+  "comcol-role.edit.delete": "Xóa",
+  "comcol-role.edit.delete.error.title": "Không thể xóa nhóm có quyền '{{ role }}'",
+  "comcol-role.edit.editor.description": "Người biên tập có thể chỉnh sửa thông tin mô tả của tài liệu được tải lên, có thể chấp nhận hoặc từ chối tài liệu được tải lên.",
+  "comcol-role.edit.editor.name": "Người biên tập",
+  "comcol-role.edit.finaleditor.description": "Người biên tập cuối có thể chỉnh sửa thông tin mô tả của tài liệu được tải lên nhưng không thể từ chối tài liệu được tải lên.",
+  "comcol-role.edit.finaleditor.name": "Người biên tập cuối",
+  "comcol-role.edit.item_read.anonymous-group": "Quyền đọc được mặc định cho các tài liệu hiện được đặt cho nhóm người dùng ẩn danh.",
+  "comcol-role.edit.item_read.description": "Tài khoản người dùng và nhóm người dùng có thể đọc những tài liệu mới được tải lên bộ sưu tập này. Các thay đổi quyền này không có hiêu lực với những tài liệu đã được tải lên từ trước. Những tài liệu đã tồn tại trong hệ thống sẽ vẫn được xem bởi những người có quyền xem vào thời điểm chúng được bổ sung",
+  "comcol-role.edit.item_read.name": "Quyền đọc thông tin mô tả của tài liệu",
+  "comcol-role.edit.no-group": "Trống",
+  "comcol-role.edit.restrict": "Hạn chế",
+  "comcol-role.edit.reviewer.description": "Người kiểm duyệt có thể chấp nhận hoặc từ chối các tài liệu được tải lên. Tuy nhiên sẽ không thể chỉnh sửa thông tin mô tả của tài liệu.",
+  "comcol-role.edit.reviewer.name": "Người kiểm duyệt",
+  "comcol-role.edit.submitters.description": "Tài khoản người dùng và nhóm người dùng có quyền tải tài liệu mới vào bộ sưu tập này",
+  "comcol-role.edit.submitters.name": "Người tải lên",
+  "community.form.abstract": "Mô tả ngắn",
+  "community.form.description": "Văn bản giới thiệu (HTML)",
+  "community.form.errors.title.required": "Vui lòng nhập tên đơn vị",
+  "community.form.rights": "Thông tin bản quyền (HTML)",
+  "community.form.tableofcontents": "Tin tức (HTML)",
+  "community.form.title": "Tên",
+  "community.page.edit": "Chỉnh sửa đơn vị",
+  "community.page.handle": "URL",
+  "community.page.license": "Giấy phép",
+  "community.page.news": "Tin tức",
+  "community.all-lists.head": "Đơn vị con và bộ sưu tập",
+  "community.sub-collection-list.head": "Các bộ sưu tập của đơn vị này",
+  "community.sub-community-list.head": "Các đơn vị con của đơn vị này",
+  "cookies.consent.accept-all": "Chấp thuận tất cả",
+  "cookies.consent.accept-selected": "Chấp nhận các mục đã chọn",
+  "cookies.consent.app.description.acknowledgement": "Bắt buộc để lưu sự xác nhận và đồng ý của bạn",
+  "cookies.consent.app.description.authentication": "Bắt buộc để đăng nhập",
+  "cookies.consent.app.description.google-analytics": "Cho phép chúng tôi theo dõi dữ liệu thống kê",
+  "cookies.consent.app.description.google-recaptcha": "Chúng tôi sử dụng dịch vụ google reCAPTCHA trong quá trình đăng ký và khôi phục mật khẩu",
+  "cookies.consent.app.description.preferences": "Bắt buộc để lưu tùy chọn của bạn",
+  "cookies.consent.app.disable-all.description": "Sử dụng nút chuyển này để bật hoặc tắt tất cả dịch vụ.",
+  "cookies.consent.app.disable-all.title": "Bật hoặc tắt tất cả dịch vụ",
+  "cookies.consent.app.opt-out.description": "Ứng dụng này đã được tải theo mặc định (nhưng bạn có thể chọn không tham gia)",
+  "cookies.consent.app.purpose": "mục đích",
+  "cookies.consent.app.required.description": "Ứng dụng này luôn được yêu cầu",
+  "cookies.consent.app.title.acknowledgement": "Sự xác nhận",
+  "cookies.consent.app.title.authentication": "Xác thực",
+  "cookies.consent.app.title.google-analytics": "Google Analytics",
+  "cookies.consent.app.title.google-recaptcha": "Google reCaptcha",
+  "cookies.consent.app.title.preferences": "Cài đặt cá nhân",
+  "cookies.consent.close": "Đóng",
+  "cookies.consent.content-modal.description": "Tại đây bạn có thể xem và tùy chỉnh thông tin mà chúng tôi thu thập được về bạn.",
+  "cookies.consent.content-modal.privacy-policy.name": "chính sách bảo mật",
+  "cookies.consent.content-modal.privacy-policy.text": "Để biết thêm vui lòng đọc {privacyPolicy} của chúng tôi.",
+  "cookies.consent.content-modal.service": "dịch vụ",
+  "cookies.consent.content-modal.services": "các dịch vụ",
+  "cookies.consent.content-modal.title": "Thông tin mà chúng tôi thu thập",
+  "cookies.consent.content-notice.description": "Chúng tôi thu thập và xử lý thông tin các nhân của bạn cho các mục đích sau: <strong>Xác thực các ưa thích xác nhận và thống kê</strong>. <br/>Để biết thêm vui lòng đọc {privacyPolicy} của chúng tôi.",
+  "cookies.consent.content-notice.description.no-privacy": "Chúng tôi thu thập và xử lý thông tin cá nhân của bạn cho các mục đích sau: <strong>Xác thực Cài đặt cá nhân Xác nhận và Thống kê</strong>.",
+  "cookies.consent.content-notice.learnMore": "Tùy chỉnh",
+  "cookies.consent.content-notice.title": "Đồng ý sử dụng cookie",
+  "cookies.consent.decline": "Từ chối",
+  "cookies.consent.ok": "OK",
+  "cookies.consent.purpose.functional": "Chức năng",
+  "cookies.consent.purpose.registration-password-recovery": "Đăng ký và khôi phục mật khẩu",
+  "cookies.consent.purpose.sharing": "Chia sẻ",
+  "cookies.consent.purpose.statistical": "Thống kê",
+  "cookies.consent.save": "Lưu",
+  "cookies.consent.update": "Có 1 vài thay đổi từ lần ghé thăm cuối cùng của bạn vui lòng cập nhập sự đồng ý của bạn.",
+  "curation-task.task.checklinks.label": "\"Kiểm tra các link trong thông tin mô tả\"",
+  "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.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",
+  "curation.form.handle.hint": "Gợi ý: Nhập [your-handle-prefix]/0 để chạy một tác vụ trên toàn bộ trang (chú ý rằng không phải tất cả tác vụ đều hỗ trợ khả năng này)",
+  "curation.form.handle.label": "Handle:",
+  "curation.form.submit": "Bắt đầu",
+  "curation.form.submit.error.content": "Đã có lỗi xảy ra khi cố gắng khởi động tác vụ kiểm tra.",
+  "curation.form.submit.error.head": "Việc chạy tác vụ kiểm tra đã thất bại",
+  "curation.form.submit.error.invalid-handle": "Không thể xác định định danh của đối tượng này",
+  "curation.form.submit.success.content": "Bạn sẽ được điều hướng đến trang phản hồi quy trình.",
+  "curation.form.submit.success.head": "Tác vụ kiểm tra đã khởi động thành công",
+  "curation.form.task-select.label": "Tác vụ:",
+  "deny-request-copy.email.message": "Kính gửi {{ recipientName }}\n\nLiên quan đến yêu cầu của bạn Thư viện rất tiếc phải thông báo với bạn rằng chúng tôi không thể gửi cho bạn bản sao của (các) tệp bạn đã yêu cầu liên quan đến tài liệu: \"{{ itemUrl }}\" ({{ itemName }}).\n\nTrân trọng\n,{{ authorName}}<{{ authorEmail }}>",
+  "deny-request-copy.email.subject": "Yêu cầu bản sao tài liệu",
+  "deny-request-copy.error": "Đã xảy ra lỗi",
+  "deny-request-copy.header": "Từ chối yêu cầu bản sao tài liệu",
+  "deny-request-copy.intro": "Tin nhắn này sẽ được gửi đến người yêu cầu",
+  "deny-request-copy.success": "Từ chối thành công yêu cầu tài liệu",
+  "dso.name.untitled": "Không có nhan đề",
+  "dso-selector.claim.item.body": "Đây là những hồ sơ hiện có có thể liên quan đến bạn. Nếu bạn nhận ra mình ở một trong những hồ sơ này hãy chọn hồ sơ đó và trên trang chi tiết hãy chọn xác nhận hồ sơ. Nếu không bạn có thể tạo một hồ sơ mới từ đầu bằng cách sử dụng nút bên dưới.",
+  "dso-selector.claim.item.create-from-scratch": "Tạo hồ sơ mới",
+  "dso-selector.claim.item.head": "Mẹo quản lý hồ sơ",
+  "dso-selector.claim.item.not-mine-label": "Không có mục nào trong số này là của tôi",
+  "dso-selector.create.collection.head": "Bộ sưu tập mới",
+  "dso-selector.create.collection.sub-level": "Tạo một bộ sưu tập mới trong",
+  "dso-selector.create.community.head": "Đơn vị mới",
+  "dso-selector.create.community.or-divider": "hoặc",
+  "dso-selector.create.community.sub-level": "Tạo một đơn vị mới trong",
+  "dso-selector.create.community.top-level": "Tạo một đơn vị lớn",
+  "dso-selector.create.item.head": "Tài liệu mới",
+  "dso-selector.create.item.sub-level": "Tạo một tài liệu mới trong",
+  "dso-selector.create.submission.head": "Biên mục mới",
+  "dso-selector.create.topic.sub-level": "Tạo topic mới trong",
+  "dso-selector.create.topic.top-level": "Tạo topic lớn",
+  "dso-selector.edit.collection.head": "Chỉnh sửa bộ sưu tập",
+  "dso-selector.edit.community.head": "Chỉnh sửa đơn vị",
+  "dso-selector.edit.item.head": "Chỉnh sửa tài liệu",
+  "dso-selector.error.title": "Đã có lỗi xảy ra khi tìm kiếm kiểu tài liệu {{ type }}",
+  "dso-selector.export-batch.dspaceobject.head": "Xuất lô dữ liệu (định dạng file ZIP) từ",
+  "dso-selector.export-metadata.dspaceobject.head": "Xuất siêu dữ liệu từ",
+  "dso-selector.import-batch.dspaceobject.head": "Nhập lô dữ liệu từ",
+  "dso-selector.no-results": "Không tìm thấy kiểu {{ type }} nào",
+  "dso-selector.placeholder": "Tìm kiếm {{ type }}",
+  "dso-selector.results-could-not-be-retrieved": "Đã xảy ra lỗi vui lòng làm mới lại ↻",
+  "dso-selector.select.collection.head": "Chọn một bộ sưu tập",
+  "dso-selector.set-scope.community.button": "Tìm kiếm trên toàn hệ thống",
+  "dso-selector.set-scope.community.head": "Chọn một phạm vi tìm kiếm",
+  "dso-selector.set-scope.community.input-header": "Tìm kiếm một đơn vị hoặc bộ sưu tập",
+  "dso-selector.set-scope.community.or-divider": "hoặc",
+  "supervision-group-selector.header": "Supervision Group Selector",
+  "supervision-group-selector.select.type-of-order.label": "Select a type of Order",
+  "supervision-group-selector.select.type-of-order.option.none": "NONE",
+  "supervision-group-selector.select.type-of-order.option.editor": "EDITOR",
+  "supervision-group-selector.select.type-of-order.option.observer": "OBSERVER",
+  "supervision-group-selector.select.group.label": "Select a Group",
+  "supervision-group-selector.button.cancel": "Cancel",
+  "supervision-group-selector.button.save": "Save",
+  "supervision-group-selector.select.type-of-order.error": "Please select a type of order",
+  "supervision-group-selector.select.group.error": "Please select a group",
+  "supervision-group-selector.notification.create.success.title": "Successfully created supervision order for group {{ name }}",
+  "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",
+  "confirmation-modal.delete-eperson.cancel": "Hủy",
+  "confirmation-modal.delete-eperson.confirm": "Xóa",
+  "confirmation-modal.delete-eperson.header": "Xóa người dùng \"{{ dsoName }}\"",
+  "confirmation-modal.delete-eperson.info": "Bạn có chắc muốn xóa người dùng \"{{ dsoName }}\"",
+  "confirmation-modal.delete-profile.cancel": "Hủy",
+  "confirmation-modal.delete-profile.confirm": "Xóa",
+  "confirmation-modal.delete-profile.header": "Xóa hồ sơ",
+  "confirmation-modal.delete-profile.info": "Bạn có chắc chắn muốn xóa hồ sơ",
+  "confirmation-modal.export-batch.cancel": "Hủy",
+  "confirmation-modal.export-batch.confirm": "Xuất dữ liệu",
+  "confirmation-modal.export-batch.header": "Xuất lô dữ liệu (định dạng file ZIP) của tác giả {{ dsoName }}",
+  "confirmation-modal.export-batch.info": "Bạn có chắc chắn muốn xuất lô dữ liệu (định dạng file ZIP) của tác giả {{ dsoName }}",
+  "confirmation-modal.export-metadata.cancel": "Hủy",
+  "confirmation-modal.export-metadata.confirm": "Xuất dữ liệu",
+  "confirmation-modal.export-metadata.header": "Xuất thông tin mô tả tài liệu của đơn vị, bộ sưu tập {{ dsoName }}",
+  "confirmation-modal.export-metadata.info": "Bạn có chắc muốn xuất thông tin mô tả tài liệu của đơn vị, bộ sưu tập {{ dsoName }}",
+  "confirmation-modal.policies.cancel": "Hủy",
+  "confirmation-modal.policies.confirm": "Xác nhận",
+  "confirmation-modal.policies.header": "Chọn hướng phân quyền cho đối tượng đã di chuyển",
+  "confirmation-modal.policies.info": "Bạn muốn chọn hướng phân quyền cho đối tượng đã di chuyển",
+  "confirmation-modal.reset-password-eperson.cancel": "Hủy",
+  "confirmation-modal.reset-password-eperson.confirm": "Thiết lập lại mật khẩu",
+  "confirmation-modal.reset-password-eperson.info": "Bạn có chắc chắn muốn thiết lập lại mật khẩu cho người dùng \"{{ dsoName }}\"",
+  "error.bitstream": "Lỗi tìm kiếm tệp tin",
+  "error.browse-by": "Lỗi tìm kiếm tài liệu",
+  "error.collection": "Lỗi tìm kiếm bộ sưu tập",
+  "error.collections": "Lỗi tìm kiếm bộ sưu tập",
+  "error.community": "Lỗi tìm kiếm đơn vị",
+  "error.default": "Lỗi",
+  "error.identifier": "Không tìm thấy tài liệu nào cho định danh này",
+  "error.invalid-search-query": "Truy vấn tìm kiếm không hợp lệ. Vui lòng kiểm tra <a href=\"https://solr.apache.org/guide/query-syntax-and-parsing.html\" target=\"_blank\">Cú pháp truy vấn Solr</a> các phương pháp tốt nhất để biết thêm thông tin về lỗi này.",
+  "error.item": "Lỗi tìm kiếm tài liệu",
+  "error.items": "Lỗi tìm kiếm tài liệu",
+  "error.objects": "Lỗi tìm kiếm đối tượng",
+  "error.recent-submissions": "Lỗi tìm kiếm các tài liệu biên mục gần đây",
+  "error.search-results": "Lỗi tìm kiếm các kết quả tìm",
+  "error.sub-collections": "Lỗi tìm kiếm bộ sưu tập con",
+  "error.sub-communities": "Lỗi tìm kiếm đơn vị con",
+  "error.submission.sections.init-form-error": "Đã xảy ra lỗi khi khởi chạy các phần vui lòng kiểm tra cấu hình biểu mẫu đầu vào của bạn. Thông tin chi tiết ở bên dưới: <br> <br>",
+  "error.top-level-communities": "Lỗi tìm kiếm đơn vị lớn",
+  "error.validation.emailTaken": "Email này đã được sử dụng",
+  "error.validation.filerequired": "Bắt buộc phải tải tệp tin lên",
+  "error.validation.groupExists": "Nhóm này đã tồn tại",
+  "error.validation.license.notgranted": "Bạn phải đồng ý với giấy phép này để hoàn thành tài liệu biên mục của mình. Nếu hiện tại bạn không thể đồng ý giấy phép này bạn có thể lưu tài liệu biên mục của mình và quay lại sau hoặc xóa nội dung đã biên mục.",
+  "error.validation.NotValidEmail": "Email này không hợp lệ",
+  "error.validation.pattern": "Đầu vào này bị giới hạn bởi mẫu hiện tại: {{ pattern }}.",
+  "error.validation.required": "Đây là trường bắt buộc",
+  "error-page.description.401": "không có quyền truy cập",
+  "error-page.description.403": "không được phép truy cập",
+  "error-page.description.404": "không tìm thấy trang",
+  "error-page.description.500": "Dịch vụ không sẵn sàng",
+  "error-page.orcid.generic-error": "Đã xảy ra lỗi khi đăng nhập qua ORCID. Make sure you have shared your ORCID account email address with DSpace. If the error persists contact the administrator",
+  "feed.description": "Nguồn cấp dữ liệu tổng hợp",
+  "file-section.error.header": "Lỗi khi lấy tệp cho tài liệu này",
+  "footer.copyright": "bản quyền © 2002-{{ year }}",
+  "footer.link.cookies": "Cài đặt Cookie",
+  "footer.link.dspace": "Phần mềm thư viện số",
+  "footer.link.end-user-agreement": "Thỏa thuận bạn đọc",
+  "footer.link.feedback": "Gửi phản hồi",
+  "footer.link.lyrasis": "LYRASIS",
+  "footer.link.privacy-policy": "Chính sách riêng tư",
+  "forgot-email.form.email": "Địa chỉ Email *",
+  "forgot-email.form.email.error.pattern": "Vui lòng nhập một địa chỉ email hợp lệ",
+  "forgot-email.form.email.error.required": "Vui lòng nhập địa chỉ email",
+  "forgot-email.form.email.hint": "Địa chỉ email này sẽ được xác nhận và sử dụng như là tên đăng nhập.",
+  "forgot-email.form.error.content": "Đã xảy ra lỗi khi đăng kí địa chỉ email sau: {{ email }}",
+  "forgot-email.form.error.head": "Đã xảy ra lỗi khi đăng kí email",
+  "forgot-email.form.header": "Quên mật khẩu",
+  "forgot-email.form.info": "Nhập địa chỉ email mà để đăng kí cập nhật thông tin tài liệu mới trong các bộ sưu tập qua email và biên mục tài liệu mới vào thư viện số.",
+  "forgot-email.form.submit": "Lưu",
+  "forgot-email.form.success.content": "Một email đã được gửi tới địa chỉ {{ email }} trong đó có chứa URL và các hướng dẫn chi tiết hơn.",
+  "forgot-email.form.success.head": "Email xác nhận đã được gửi tới bạn",
+  "forgot-password.form.card.security": "Bảo mật",
+  "forgot-password.form.error.empty-password": "Vui lòng nhập mật khẩu mới trong ô dưới đây.",
+  "forgot-password.form.error.matching-passwords": "Hai mật khẩu không trùng khớp.",
+  "forgot-password.form.head": "Quên mật khẩu",
+  "forgot-password.form.identification.email": "Địa chỉ email:",
+  "forgot-password.form.identification.header": "Định danh",
+  "forgot-password.form.info": "Nhập mật khẩu mới trong ô dưới đây và xác nhận bằng cách nhập lại vào ô thứ hai. Mật khẩu nên chứa ít nhất 6 kí tự.",
+  "forgot-password.form.label.password": "Mật khẩu",
+  "forgot-password.form.label.passwordrepeat": "Nhập lại mật khẩu mới",
+  "forgot-password.form.notification.error.title": "Đã xảy ra lỗi khi gửi mật khẩu mới",
+  "forgot-password.form.notification.success.content": "Đã đặt lại mật khẩu thành công. Bạn đã được đăng nhập với tư cách là người dùng được tạo.",
+  "forgot-password.form.notification.success.title": "Hoàn thành đặt lại mật khẩu",
+  "forgot-password.form.submit": "Gửi mật khẩu",
+  "forgot-password.title": "Quên mật khẩu",
+  "form.add": "Thêm",
+  "form.add-help": "Nhấp vào đây để thêm mục hiện tại và một mục khác",
+  "form.cancel": "Hủy",
+  "form.clear": "Xóa",
+  "form.clear-help": "Nhấp vào đây để xóa giá trị đã chọn",
+  "form.discard": "Hủy bỏ",
+  "form.drag": "Kéo",
+  "form.edit": "Chỉnh sửa",
+  "form.edit-help": "Nhấp vào đây để chỉnh sửa giá trị đã chọn",
+  "form.first-name": "Tên",
+  "form.group-collapse": "Thu hẹp",
+  "form.group-collapse-help": "Nhấp vào đây để thu hẹp",
+  "form.group-expand": "Mở rộng",
+  "form.group-expand-help": "Nhấp vào đây để mở rộng và thêm các yếu tố khác",
+  "form.last-name": "Họ",
+  "form.loading": "Đang tải...",
+  "form.lookup": "Tìm kiếm",
+  "form.lookup-help": "Nhấp vào đây để tìm kiếm mối liên hệ đang tồn tại",
+  "form.no-results": "Không tìm thấy kết quả phù hợp",
+  "form.no-value": "Không có giá trị nào được nhập vào",
+  "form.remove": "Xóa",
+  "form.repeatable.sort.tip": "Thả tài liệu vào vị trí mới",
+  "form.save": "Lưu",
+  "form.save-help": "Lưu thay đổi",
+  "form.search": "Tìm kiếm",
+  "form.search-help": "Nhấp vào đây để tìm kiếm thư từ đang tồn tại",
+  "form.submit": "Lưu",
+  "grant-deny-request-copy.deny": "Không gửi bản sao",
+  "grant-deny-request-copy.email.back": "Quay lại",
+  "grant-deny-request-copy.email.message": "Tin nhắn",
+  "grant-deny-request-copy.email.message.empty": "Vui lòng nhập một tin nhắn",
+  "grant-deny-request-copy.email.permissions.info": "Bạn có thể nhân tiện dịp này để xem xét lại các hạn chế truy cập vào tài liệu để tránh phải trả lời các yêu cầu tương tự. Nếu bạn muốn yêu cầu quản trị hệ thống loại bỏ những hạn chế này vui lòng đánh dấu vào hộp bên dưới.",
+  "grant-deny-request-copy.email.permissions.label": "Chuyển thành truy cập mở",
+  "grant-deny-request-copy.email.send": "Gửi",
+  "grant-deny-request-copy.email.subject": "Chủ đề",
+  "grant-deny-request-copy.email.subject.empty": "Vui lòng nhập một chủ đề",
+  "grant-deny-request-copy.grant": "Gửi bản sao",
+  "grant-deny-request-copy.header": "Yêu cầu bản sao tài liệu",
+  "grant-deny-request-copy.home-page": "Đi tới trang chủ",
+  "grant-deny-request-copy.intro1": "Nếu bạn là một trong các tác giả của tài liệu <a href='{{ url }}'>{{ name }}</a> vui lòng sử dụng một trong các tùy chọn dưới đây để phản hồi yêu cầu của bạn đọc.",
+  "grant-deny-request-copy.intro2": "Sau khi chọn một tùy chọn bạn sẽ thấy một email gợi ý trả lời mà bạn có thể chỉnh sửa.",
+  "grant-deny-request-copy.processed": "Yêu cầu này đã được xử lý. Bạn có thể sử dụng nút bên dưới để quay lại trang chủ.",
+  "grant-request-copy.email.message": "Dear {{ recipientName }}\n\nLiên quan đến yêu cầu của bạn Thư viện đồng ý gửi cho bạn bản sao của (các) tệp bạn đã yêu cầu liên quan đến tài liệu: \"{{ itemUrl }}\" ({{ itemName }}).\n\n\nTrân trọng\n\n{{ authorName }} <{{ authorEmail }}>\n",
+  "grant-request-copy.email.subject": "Yêu cầu bản sao tài liệu",
+  "grant-request-copy.error": "Đã xảy ra lỗi",
+  "grant-request-copy.header": "Chấp nhận yêu cầu bản sao tài liệu",
+  "grant-request-copy.intro": "Tin nhắn này sẽ được gửi đến người gửi yêu cầu. (Các) tài liệu được yêu cầu sẽ được gửi kèm tin nhắn.",
+  "grant-request-copy.success": "Yêu cầu tài liệu đã được xử lý thành công",
+  "health.breadcrumbs": "Kiểm tra hệ thống",
+  "health-page.error.msg": "Dịch vụ kiểm tra hệ thống tạm thời không khả dụng",
+  "health-page.heading": "Kiểm tra hệ thống",
+  "health-page.info-tab": "Thông tin hệ thống",
+  "health-page.property.status": "Mã trạng thái",
+  "health-page.section.db.title": "Cơ sở dữ liệu",
+  "health-page.section.geoIp.title": "GeoIp",
+  "health-page.section.no-issues": "Không có vấn đề được phát hiện",
+  "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": "Ứng dụng Backend",
+  "health-page.section-info.java.title": "Java",
+  "health-page.status": "Trạng thái",
+  "health-page.status.error.info": "Các vấn đề được tìm thấy",
+  "health-page.status.ok.info": "Vận hành",
+  "health-page.status.warning.info": "Phát hiện các vấn đề có thể xảy ra",
+  "health-page.status-tab": "Trạng thái",
+  "health-page.title": "Kiểm tra hệ thống",
+  "home.description": "",
+  "home.breadcrumbs": "Trang chủ",
+  "home.search-form.placeholder": "Tìm kiếm kho lưu trữ",
+  "home.title": "Trang chủ",
+  "home.top-level-communities.head": "Danh sách đơn vị trong DSpace",
+  "home.top-level-communities.help": "Chọn một đơn vị để xem các bộ sưu tập của nó.",
+  "info.contact.breadcrumbs": "Thông tin liên hệ",
+  "info.contact.head": "Thông tin liên hệ",
+  "info.contact.title": "Thông tin liên hệ",
+  "info.end-user-agreement.accept": "Tôi đã đọc và đồng ý với Thỏa thuận bạn đọc",
+  "info.end-user-agreement.accept.error": "Đã xảy ra lỗi khi chấp nhận Thỏa thuận bạn đọc",
+  "info.end-user-agreement.accept.success": "Đã cập nhật thành công Thỏa thuận bạn đọc",
+  "info.end-user-agreement.breadcrumbs": "Thỏa thuận bạn đọc",
+  "info.end-user-agreement.buttons.cancel": "Hủy",
+  "info.end-user-agreement.buttons.save": "Lưu",
+  "info.end-user-agreement.head": "Thỏa thuận người dùng",
+  "info.end-user-agreement.title": "Thỏa thuận người dùng",
+  "info.feedback.breadcrumbs": "Phản hồi",
+  "info.feedback.comments": "Bình luận",
+  "info.feedback.create.success": "Gửi phản hồi thành công!",
+  "info.feedback.email_help": "Địa chỉ này sẽ được sử dụng để theo dõi phản hồi của bạn.",
+  "info.feedback.email-label": "Email",
+  "info.feedback.error.email.required": "Yêu cầu địa chỉ email hợp lệ",
+  "info.feedback.error.message.required": "Yêu cầu phải có nội dung bình luận",
+  "info.feedback.head": "Phản hồi",
+  "info.feedback.info": "Cảm ơn bạn đã chia sẽ phản hồi của mình tới Thư viện. Chúng tôi luôn trân trọng mọi ý kiến đóng góp của bạn!",
+  "info.feedback.page_help": "Trang liên kết với các phản hồi của bạn",
+  "info.feedback.page-label": "Trang",
+  "info.feedback.send": "Gửi phản hồi",
+  "info.feedback.title": "Phản hồi",
+  "info.help.head": "Trợ giúp",
+  "info.help.title": "Trợ giúp",
+  "info.privacy.breadcrumbs": "Cam kết bảo mật",
+  "info.privacy.head": "Cam kết bảo mật",
+  "info.privacy.title": "Cam kết bảo mật",
+  "item.alerts.private": "Đây là tài liệu cá nhân",
+  "item.alerts.withdrawn": "Tài liệu này đã được chuyển sang chế độ ẩn",
+  "item.badge.private": "Cá nhân",
+  "item.badge.withdrawn": "Ẩn",
+  "item.bitstreams.upload.bundle": "Gói tệp tin",
+  "item.bitstreams.upload.bundle.new": "Tạo gói tệp tin",
+  "item.bitstreams.upload.bundle.placeholder": "Chọn một gói tệp tin",
+  "item.bitstreams.upload.bundles.empty": "Tài liệu này không có gói tệp tin nào để tải tệp tin vào.",
+  "item.bitstreams.upload.cancel": "Hủy",
+  "item.bitstreams.upload.drop-message": "Thả tệp tin để tài lên",
+  "item.bitstreams.upload.item": "Tài liệu:",
+  "item.bitstreams.upload.notifications.bundle.created.content": "Tạo thành công gói tệp tin.",
+  "item.bitstreams.upload.notifications.bundle.created.title": "Đã tạo gói tệp tin",
+  "item.bitstreams.upload.notifications.upload.failed": "Tải lên thất bại. Vui lòng xác minh nội dung sau trước khi thực hiện lại.",
+  "item.bitstreams.upload.title": "Tải tệp tin lên",
+  "item.edit.authorizations.heading": "Với trình chỉnh sửa này bạn có thể xem và chỉnh sửa chính sách phân quyền của một tài liệu (item) cũng như các thành phần của tài liệu đó như: gói tệp tin (bundle) và tệp tin (bitstream). Các tài liệu có thể chứa nhiều gói và mỗi gói có thể chứa nhiều tệp tin. Tài liệu và gói tệp tin thường có các quyền là THÊM/XÓA/ĐỌC/CHỈNH SỬA còn tệp tin chỉ có quyền ĐỌC/CHỈNH SỬA.",
+  "item.edit.authorizations.title": "Chỉnh sửa chính sách phân quyền của tài liệu",
+  "item.edit.bitstreams.bundle.displaying": "Đang hiển thị {{ amount }} trong số {{ total }} tệp tin.",
+  "item.edit.bitstreams.bundle.edit.buttons.upload": "Tải lên",
+  "item.edit.bitstreams.bundle.load.all": "Tải tất cả ({{ total }})",
+  "item.edit.bitstreams.bundle.load.more": "Xem thêm",
+  "item.edit.bitstreams.bundle.name": "GÓI TỆP TIN: {{ name }}",
+  "item.edit.bitstreams.discard-button": "Hủy bỏ",
+  "item.edit.bitstreams.edit.buttons.download": "Tải xuống",
+  "item.edit.bitstreams.edit.buttons.drag": "Kéo",
+  "item.edit.bitstreams.edit.buttons.edit": "Chỉnh sửa",
+  "item.edit.bitstreams.edit.buttons.remove": "Xóa",
+  "item.edit.bitstreams.edit.buttons.undo": "Hoàn tác",
+  "item.edit.bitstreams.empty": "Tài liệu này không chứa tệp tin nào. Hãy nhập vào nút tải lên để tải tệp tin.",
+  "item.edit.bitstreams.headers.actions": "Hành động",
+  "item.edit.bitstreams.headers.bundle": "Gói tệp tin",
+  "item.edit.bitstreams.headers.description": "Mô tả",
+  "item.edit.bitstreams.headers.format": "Định dạng",
+  "item.edit.bitstreams.headers.name": "Tên",
+  "item.edit.bitstreams.notifications.discarded.content": "Các thay đổi của bạn đã bị hủy. Để khôi phục các thay đổi của bạn hãy nhấp vào nút 'Hoàn tác'",
+  "item.edit.bitstreams.notifications.discarded.title": "Các thay đổi đã bị hủy",
+  "item.edit.bitstreams.notifications.move.failed.title": "Đã xảy ra lỗi khi di chuyển tệp tin",
+  "item.edit.bitstreams.notifications.move.saved.content": "Các di chuyển của bạn đối với tệp tin và gói tệp tin của tài liệu này đã được lưu lại.",
+  "item.edit.bitstreams.notifications.move.saved.title": "Di chuyển đã được lưu lại",
+  "item.edit.bitstreams.notifications.outdated.content": "Tài liệu bạn đang mở cũng đang được chỉnh sửa bởi một người dùng khác. Vì vậy các thay đổi của bạn đã bị hủy bỏ để tránh xảy ra xung đột.",
+  "item.edit.bitstreams.notifications.outdated.title": "Các thay đổi không có hiệu lực",
+  "item.edit.bitstreams.notifications.remove.failed.title": "Đã xảy ra lỗi khi xóa tệp tin",
+  "item.edit.bitstreams.notifications.remove.saved.content": "Các thay đổi liên quan tới việc xóa tệp tin của tài liệu này đã được lưu lại.",
+  "item.edit.bitstreams.notifications.remove.saved.title": "Việc xóa tệp tin đã được lưu lại",
+  "item.edit.bitstreams.reinstate-button": "Hoàn tác",
+  "item.edit.bitstreams.save-button": "Lưu",
+  "item.edit.bitstreams.upload-button": "Tải lên",
+  "item.edit.breadcrumbs": "Chỉnh sửa tài liệu",
+  "item.edit.delete.cancel": "Hủy",
+  "item.edit.delete.confirm": "Xóa",
+  "item.edit.delete.description": "Bạn có chắc chắn muốn xóa tài liệu này? Cẩn trọng: Hành động này sẽ xóa vĩnh viễn tài liệu và không thể khôi phục lại.",
+  "item.edit.delete.error": "Đã xảy ra lỗi trong khi xóa tài liệu này",
+  "item.edit.delete.header": "Xóa tài liệu: {{ id }}",
+  "item.edit.delete.success": "Tài liệu đã được xóa thành công",
+  "item.edit.head": "Chỉnh sửa tài liệu",
+  "item.edit.item-mapper.buttons.add": "Liên kết tài liệu tới các bộ sưu tập đã chọn",
+  "item.edit.item-mapper.buttons.remove": "Xóa liên kết tài liệu với các bộ sưu tập đã chọn",
+  "item.edit.item-mapper.cancel": "Hủy",
+  "item.edit.item-mapper.description": "Đây là công cụ liên kết tài liệu cho phép quản trị viên có thể liên kết tài liệu này với các bộ sưu tập khác. Bạn có thể tìm kiếm các bộ sưu tập và thực hiện liên kết hoặc xem danh sách các bộ sưu tập mà tài liệu hiện đang được liên kết tới.",
+  "item.edit.item-mapper.head": "Liên kết tài liệu - Liên kết tài liệu tới Bộ sưu tập khác",
+  "item.edit.item-mapper.item": "Tài liệu: \"<b>{{name}}</b>\"",
+  "item.edit.item-mapper.no-search": "Vui lòng nhập một truy vấn để tìm kiếm",
+  "item.edit.item-mapper.notifications.add.error.content": "Đã xảy ra lỗi khi liên kết tài liệu này tới {{amount}} bộ sưu tập.",
+  "item.edit.item-mapper.notifications.add.error.head": "Xảy ra lỗi khi liên kết",
+  "item.edit.item-mapper.notifications.add.success.content": "Đã liên kết thành công tài liệu này tới {{amount}} bộ sưu tập.",
+  "item.edit.item-mapper.notifications.add.success.head": "Hoàn thành liên kết tài liệu",
+  "item.edit.item-mapper.notifications.remove.error.content": "Đã xảy ra lỗi khi xóa liên kết của tài liệu với {{amount}} bộ sưu tập.",
+  "item.edit.item-mapper.notifications.remove.error.head": "Lỗi khi xóa liên kết tài liệu",
+  "item.edit.item-mapper.notifications.remove.success.content": "Đã xóa thành công liên kết giữa tài liệu với {{amount}} bộ sưu tập.",
+  "item.edit.item-mapper.notifications.remove.success.head": "Hoàn thành xóa liên kết tài liệu",
+  "item.edit.item-mapper.search-form.placeholder": "Tìm kiếm bộ sưu tập",
+  "item.edit.item-mapper.tabs.browse": "Xem các bộ sưu tập đã liên kết",
+  "item.edit.item-mapper.tabs.map": "Liên kết với các bộ sưu tập mới",
+  "item.edit.metadata.add-button": "Thêm",
+  "item.edit.metadata.discard-button": "Hủy bỏ",
+  "item.edit.metadata.edit.buttons.edit": "Chỉnh sửa",
+  "item.edit.metadata.edit.buttons.remove": "Xóa",
+  "item.edit.metadata.edit.buttons.undo": "Hoàn tác",
+  "item.edit.metadata.edit.buttons.unedit": "Ngừng chỉnh sửa",
+  "item.edit.metadata.empty": "Bộ sưu tập này hiện không chứa trường thông tin mặc định nào. Nhập vào nút Thêm để bắt đầu thêm giá trị mặc định cho trường thông tin cho các tài liệu biên mục mới trong bộ sưu tập.",
+  "item.edit.metadata.headers.edit": "Chỉnh sửa",
+  "item.edit.metadata.headers.field": "Trường",
+  "item.edit.metadata.headers.language": "Ngôn ngữ",
+  "item.edit.metadata.headers.value": "Giá trị",
+  "item.edit.metadata.metadatafield.invalid": "Vui lòng chọn một trường thông tin mô tả hợp lệ",
+  "item.edit.metadata.notifications.discarded.content": "Các thay đổi của bạn đã bị hủy. Để khôi phục lại các thay đổi này hãy nhấp vào nút 'Hoàn tác'",
+  "item.edit.metadata.notifications.discarded.title": "Đã khôi phục",
+  "item.edit.metadata.notifications.error.title": "Đã có lỗi xảy ra",
+  "item.edit.metadata.notifications.invalid.content": "Các thay đổi của bạn không được lưu lại. Vui lòng đảm bảo rằng tất cả các trường là hợp lệ trước khi bạn lưu.",
+  "item.edit.metadata.notifications.invalid.title": "Siêu dữ liệu không hợp lệ",
+  "item.edit.metadata.notifications.outdated.content": "Tài liệu bạn đang mở cũng đang được chỉnh sửa bởi một người dùng khác. Vì vậy các thay đổi của bạn với tài liệu sẽ bị hủy bỏ để tránh xung đột xảy ra.",
+  "item.edit.metadata.notifications.outdated.title": "Thay đổi không có hiệu lực",
+  "item.edit.metadata.notifications.saved.content": "Các thay đổi của bạn với thông tin mô tả của tài liệu này đã được lưu lại.",
+  "item.edit.metadata.notifications.saved.title": "Đã lưu thông tin mô tả",
+  "item.edit.metadata.reinstate-button": "Hoàn tác",
+  "item.edit.metadata.save-button": "Lưu",
+  "item.edit.modify.overview.field": "Trường",
+  "item.edit.modify.overview.language": "Ngôn ngữ",
+  "item.edit.modify.overview.value": "Giá trị",
+  "item.edit.move.cancel": "Quay lại",
+  "item.edit.move.description": "Chọn bộ sưu tập mà bạn muốn chuyển tài liệu này tới. Để giới hạn danh sách bộ sưu tập đang hiển thị bạn có thể nhập từ khóa tìm kiếm trong ô dưới đây.",
+  "item.edit.move.discard-button": "Hủy bỏ",
+  "item.edit.move.error": "Đã xảy ra lỗi khi thực hiện di chuyển tài liệu này",
+  "item.edit.move.head": "Di chuyển tài liệu: {{id}}",
+  "item.edit.move.inheritpolicies.checkbox": "Kế thừa chính sách",
+  "item.edit.move.inheritpolicies.description": "Kế thừa chính sách mặc định của bộ sưu tập đích",
+  "item.edit.move.move": "Di chuyển",
+  "item.edit.move.processing": "Đang di chuyển...",
+  "item.edit.move.save-button": "Lưu",
+  "item.edit.move.search.placeholder": "Nhập một từ khóa để tìm kiếm bộ sưu tập",
+  "item.edit.move.success": "Tài liệu đã được di chuyển thành công",
+  "item.edit.move.title": "Di chuyển tài liệu",
+  "item.edit.private.cancel": "Hủy",
+  "item.edit.private.confirm": "Chuyển thành tài liệu cá nhân",
+  "item.edit.private.description": "Bạn có chắc chắn muốn chuyển tài liệu này thành tài liệu cá nhân trong thư viện số?",
+  "item.edit.private.error": "Đã có lỗi xảy ra trong khi chuyển tài liệu sang chế độ cá nhân",
+  "item.edit.private.header": "Chuyển tài liệu: {{ id }} thành tài liệu cá nhân",
+  "item.edit.private.success": "Tài liệu bây giờ đã trở thành tài liệu cá nhân",
+  "item.edit.public.cancel": "Hủy",
+  "item.edit.public.confirm": "Chuyển thành tài liệu công cộng",
+  "item.edit.public.description": "Bạn có chắc chắn muốn chuyển tài liệu này thành tài liệu công cộng trong thư viện số?",
+  "item.edit.public.error": "Đã có lỗi xảy ra trong khi chuyển tài liệu sang chế độ công cộng",
+  "item.edit.public.header": "Chuyển tài liệu: {{ id }} thành tài liệu công cộng",
+  "item.edit.public.success": "Tài liệu bây giờ đã trở thành tài liệu công cộng",
+  "item.edit.reinstate.cancel": "Hủy",
+  "item.edit.reinstate.confirm": "Khôi phục",
+  "item.edit.reinstate.description": "Bạn có chắc chắn tài liệu này nên được khôi phục trong thư viện số?",
+  "item.edit.reinstate.error": "Đã có lỗi xảy ra trong khi khôi phục tài liệu này",
+  "item.edit.reinstate.header": "Khôi phục tài liệu: {{ id }}",
+  "item.edit.reinstate.success": "Tài liệu này đã được khôi phục thành công",
+  "item.edit.relationships.discard-button": "Hủy bỏ",
+  "item.edit.relationships.edit.buttons.add": "Thêm",
+  "item.edit.relationships.edit.buttons.remove": "Xóa",
+  "item.edit.relationships.edit.buttons.undo": "Hoàn tác",
+  "item.edit.relationships.no-entity-type": "Thêm trường dữ liệu 'dspace.entity.type' để kích hoạt các mối quan hệ cho tài liệu này",
+  "item.edit.relationships.no-relationships": "Không có mối quan hệ nào",
+  "item.edit.relationships.notifications.discarded.content": "các thay đổi của bạn đã bị hủy bỏ. Để khôi phục các thay đổi này hãy nhấp vào nút 'Hoàn tác'",
+  "item.edit.relationships.notifications.discarded.title": "Các thay đổi đã bị hủy",
+  "item.edit.relationships.notifications.failed.title": "Lỗi khi chỉnh sửa mối quan hệ",
+  "item.edit.relationships.notifications.outdated.content": "Tài liệu bạn đang mở cũng đang được chỉnh sửa bởi một người dùng khác. Vì vậy các thay đổi của bạn đã bị hủy bỏ để tránh xảy ra xung đột.",
+  "item.edit.relationships.notifications.outdated.title": "Các thay đổi không có hiệu lực",
+  "item.edit.relationships.notifications.saved.content": "Các thay đổi của bạn đối với các mối quan hệ của tài liệu này đã được lưu lại.",
+  "item.edit.relationships.notifications.saved.title": "Mối quan hệ đã được lưu lại",
+  "item.edit.relationships.reinstate-button": "Hoàn tác",
+  "item.edit.relationships.save-button": "Lưu",
+  "item.edit.return": "Quay lại",
+  "item.edit.tabs.bitstreams.head": "Tệp tin",
+  "item.edit.tabs.bitstreams.title": "Chỉnh sửa tài liệu - Tệp tin",
+  "item.edit.tabs.curate.head": "Kiểm tra dữ liệu",
+  "item.edit.tabs.curate.title": "Chỉnh sửa tài liệu - Kiểm tra dữ liệu",
+  "item.edit.tabs.disabled.tooltip": "Bạn không có quyền truy cập vào tab này",
+  "item.edit.tabs.item-mapper.title": "Chỉnh sửa tài liệu - Liên kết bộ sưu tập",
+  "item.edit.tabs.mapper.head": "Liên kết bộ sưu tập",
+  "item.edit.tabs.metadata.head": "Siêu dữ liệu",
+  "item.edit.tabs.metadata.title": "Chỉnh sửa tài liệu - Siêu dữ liệu",
+  "item.edit.tabs.relationships.head": "Mối quan hệ",
+  "item.edit.tabs.relationships.title": "Chỉnh sửa tài liệu - Mối quan hệ",
+  "item.edit.tabs.status.buttons.authorizations.button": "Phân quyền tài liệu",
+  "item.edit.tabs.status.buttons.authorizations.label": "Chỉnh sửa chính sách phân quyền của tài liệu",
+  "item.edit.tabs.status.buttons.delete.button": "Xóa vĩnh viễn",
+  "item.edit.tabs.status.buttons.delete.label": "Xóa tài liệu",
+  "item.edit.tabs.status.buttons.mappedCollections.button": "Bộ sưu tập đã liên kết",
+  "item.edit.tabs.status.buttons.mappedCollections.label": "Kiểm tra bộ sưu tập đã liên kết",
+  "item.edit.tabs.status.buttons.move.button": "Di chuyển tài liệu",
+  "item.edit.tabs.status.buttons.move.label": "Di chuyển tài liệu tới bộ sưu tập khác",
+  "item.edit.tabs.status.buttons.private.button": "Chuyển thành tài liệu cá nhân",
+  "item.edit.tabs.status.buttons.private.label": "Chuyển thành tài liệu cá nhân",
+  "item.edit.tabs.status.buttons.public.button": "Chuyển thành tài liệu công cộng",
+  "item.edit.tabs.status.buttons.public.label": "Chuyển tài liệu thành công cộng",
+  "item.edit.tabs.status.buttons.reinstate.button": "Khôi phục",
+  "item.edit.tabs.status.buttons.reinstate.label": "Khôi phục tài liệu vào kho lưu trữ",
+  "item.edit.tabs.status.buttons.unauthorized": "Bạn không có quyền thực hiện hành động này",
+  "item.edit.tabs.status.buttons.withdraw.button": "Ẩn",
+  "item.edit.tabs.status.buttons.withdraw.label": "Ẩn tài liệu khỏi kho lưu trữ",
+  "item.edit.tabs.status.description": "Chào mừng bạn đến với trang quản lý tài liệu. Từ đây bạn có thể ẩn khôi phục di chuyển hoặc xóa tài liệu. Bạn cũng có thể cập nhật hoặc nhập thêm trường dữ liệu mới tải thêm tệp tin trên những tab khác.",
+  "item.edit.tabs.status.head": "Trạng thái",
+  "item.edit.tabs.status.labels.handle": "Handle",
+  "item.edit.tabs.status.labels.bundleName": "Bundle name",
+  "item.edit.tabs.status.labels.id": "ID tài liệu",
+  "item.edit.tabs.status.labels.itemPage": "Trang tài liệu",
+  "item.edit.tabs.status.labels.lastModified": "Chỉnh sửa lần cuối",
+  "item.edit.tabs.status.title": "Chỉnh sửa tài liệu -  Trạng thái",
+  "item.edit.tabs.versionhistory.head": "Lịch sử phiên bản",
+  "item.edit.tabs.versionhistory.title": "Chỉnh sửa tài liệu - Lịch sử phiên bản",
+  "item.edit.tabs.versionhistory.under-construction": "Chưa thể chỉnh sửa hoặc tạo thêm phiên bản trên giao diện người dùng này.",
+  "item.edit.tabs.view.head": "Xem tài liệu",
+  "item.edit.tabs.view.title": "Chỉnh sửa tài liệu - Xem",
+  "item.edit.withdraw.cancel": "Hủy",
+  "item.edit.withdraw.confirm": "Ẩn",
+  "item.edit.withdraw.description": "Bạn có chắc chắn muốn ẩn tài liệu này khỏi kho lưu trữ?",
+  "item.edit.withdraw.error": "Đã có lỗi xảy ra trong khi thực hiện ẩn tài liệu này",
+  "item.edit.withdraw.header": "Ẩn tài liệu: {{ id }}",
+  "item.edit.withdraw.success": "Tài liệu này đã được ẩn thành công",
+  "item.listelement.badge": "Tài liệu",
+  "item.orcid.return": "Quay lại",
+  "item.page.name": "Tên",
+  "item.page.abstract": "Tóm tắt",
+  "item.page.author": "Tác giả",
+  "item.page.bitstreams.collapse": "Thu hẹp",
+  "item.page.bitstreams.view-more": "Hiển thị thêm",
+  "item.page.citation": "Trích dẫn",
+  "item.page.claim.button": "Nhận nhiệm vụ",
+  "item.page.claim.tooltip": "Nhận nhiệm vụ tài liệu này",
+  "item.page.collections": "Bộ sưu tập",
+  "item.page.collections.loading": "Đang tải…",
+  "item.page.collections.load-more": "Xem thêm",
+  "item.page.date": "Năm xuất bản",
+  "item.page.description": "Mô tả",
+  "item.page.edit": "Chỉnh sửa tài liệu này",
+  "item.page.files": "Tệp tin",
+  "item.page.filesection.description": "Mô tả:",
+  "item.page.filesection.download": "Tải xuống",
+  "item.page.filesection.view": "Xem trực tuyến",
+  "item.page.filesection.format": "Định dạng:",
+  "item.page.filesection.license.bundle": "Tập tin giấy phép",
+  "item.page.filesection.name": "Tên:",
+  "item.page.filesection.original.bundle": "Tập tin chính của tài liệu",
+  "item.page.filesection.size": "Dung lượng:",
+  "item.page.journal.search.title": "Bài viết trong tạp chí này",
+  "item.page.journal-issn": "ISSN",
+  "item.page.journal-title": "Nhan đề tạp chí",
+  "item.page.link.full": "Hiển thị chi tiết",
+  "item.page.link.simple": "Hiển thị đơn giản",
+  "item.page.orcid.title": "ORCID",
+  "item.page.orcid.tooltip": "Mở trang cài đặt ORCID",
+  "item.page.person.search.title": "Bài viết của tác giả này",
+  "item.page.publisher": "Nhà xuất bản",
+  "item.page.related-items.view-less": "Ẩn {{ amount }} tài liệu cuối",
+  "item.page.related-items.view-more": "Hiển thị thêm {{ amount }} tài liệu",
+  "item.page.relationships.isAuthorOfPublication": "Ấn phẩm",
+  "item.page.relationships.isJournalOfPublication": "Ấn phẩm",
+  "item.page.relationships.isOrgUnitOfPerson": "Tác giả",
+  "item.page.relationships.isOrgUnitOfProject": "Dự án nghiên cứu",
+  "item.page.return": "Quay lại",
+  "item.page.subject": "Từ khóa chủ đề",
+  "item.page.titleprefix": "Tài liệu:",
+  "item.page.uri": "URL",
+  "item.page.version.create": "Tạo phiên bản mới",
+  "item.page.version.hasDraft": "Không thể tạo phiên bản mới vì có một phiên bản đang trong tiến trình tải lên",
+  "item.page.volume-title": "Nhan đề tập",
+  "item.preview.dc.contributor.author": "Tác giả:",
+  "item.preview.dc.coverage.spatial": "Quyền hạn:",
+  "item.preview.dc.date.issued": "Năm xuất bản:",
+  "item.preview.dc.description.abstract": "Tóm tắt:",
+  "item.preview.dc.identifier": "Định danh:",
+  "item.preview.dc.identifier.doi": "DOI",
+  "item.preview.dc.identifier.isbn": "ISBN",
+  "item.preview.dc.identifier.other": "Định danh khác:",
+  "item.preview.dc.identifier.uri": "Định danh:",
+  "item.preview.dc.language.iso": "Ngôn ngữ:",
+  "item.preview.dc.relation.ispartof": "Tạp chí hoặc Ấn phẩm định kỳ",
+  "item.preview.dc.relation.issn": "ISSN",
+  "item.preview.dc.subject": "Chủ đề:",
+  "item.preview.dc.title": "Nhan đề:",
+  "item.preview.dc.title.alternative": "Viết tắt:",
+  "item.preview.dc.type": "Loại hình tài liệu:",
+  "item.preview.oaire.awardNumber": "ID quỹ:",
+  "item.preview.oaire.citation.issue": "Kỳ ấn phẩm",
+  "item.preview.oaire.citation.volume": "Tập",
+  "item.preview.oaire.fundingStream": "Dòng quỹ:",
+  "item.preview.person.familyName": "Họ:",
+  "item.preview.person.givenName": "Tên:",
+  "item.preview.person.identifier.orcid": "ORCID:",
+  "item.preview.project.funder.identifier": "Định danh nhà tài trợ:",
+  "item.preview.project.funder.name": "Nhà tài trợ:",
+  "item.search.results.head": "Kết quả tìm kiếm tài liệu",
+  "item.search.title": "Tìm kiếm tài liệu",
+  "item.select.confirm": "Xác nhận cái đã chọn",
+  "item.select.empty": "Không có tài liệu để hiển thị",
+  "item.select.table.author": "Tác giả",
+  "item.select.table.collection": "Bộ sưu tập",
+  "item.select.table.title": "Nhan đề",
+  "item.truncatable-part.show-less": "Thu hẹp",
+  "item.truncatable-part.show-more": "Xem thêm",
+  "item.version.create.modal.button.cancel": "Hủy",
+  "item.version.create.modal.button.cancel.tooltip": "Không thể tạo phiên bản mới",
+  "item.version.create.modal.button.confirm": "Tạo",
+  "item.version.create.modal.button.confirm.tooltip": "Tạo phiên bản mới",
+  "item.version.create.modal.form.summary.label": "Thông tin tổng quan",
+  "item.version.create.modal.form.summary.placeholder": "Thêm thông tin mô tả cho phiên bản mới",
+  "item.version.create.modal.header": "Phiên bản mới",
+  "item.version.create.modal.submitted.header": "Tạp phiên bản mới…",
+  "item.version.create.modal.submitted.text": "Phiên bản mới đang được tạo. Có thể mất một chút thời gian để hoàn tất nếu tài liệu có nhiều mối quan hệ.",
+  "item.version.create.modal.text": "Tạo phiên bản mới cho tài liệu này",
+  "item.version.create.modal.text.startingFrom": "bắt đầu từ phiên bản {{version}}",
+  "item.version.create.notification.failure": "Phiên bản mới chưa được tạo",
+  "item.version.create.notification.inProgress": "Không thể tạo phiên bản mới vì có một phiên bản đang trong tiến trình tải lên",
+  "item.version.create.notification.success": "Phiên bản mới đã được tạo với mã số phiên bản là {{version}}",
+  "item.version.delete.modal.button.cancel": "Hủy",
+  "item.version.delete.modal.button.cancel.tooltip": "Không xóa phiên bản này",
+  "item.version.delete.modal.button.confirm": "Xóa",
+  "item.version.delete.modal.button.confirm.tooltip": "Xóa phiên bản này",
+  "item.version.delete.modal.header": "Xóa phiên bản",
+  "item.version.delete.modal.text": "Bạn có muốn xóa phiên bản {{version}}?",
+  "item.version.delete.notification.failure": "Phiên bản {{version}} chưa bị xóa",
+  "item.version.delete.notification.success": "Phiên bản {{version}} đã được xóa",
+  "item.version.edit.notification.failure": "Thông tin tổng quan của phiên bản {{version}} chưa được thay đổi",
+  "item.version.edit.notification.success": "Thông tin tổng quan của phiên bản {{version}} đã được thay đổi",
+  "item.version.history.empty": "Chưa có phiên bản nào khác của tài liệu này.",
+  "item.version.history.head": "Lịch sử phiên bản",
+  "item.version.history.return": "Quay lại",
+  "item.version.history.selected": "Phiên bản đã chọn",
+  "item.version.history.selected.alert": "Hiện tại bạn đang xem phiên bản {{version}} của tài liệu này.",
+  "item.version.history.table.action.deleteVersion": "Xóa phiên bản",
+  "item.version.history.table.action.discardSummary": "Hủy chỉnh sửa",
+  "item.version.history.table.action.editSummary": "Chỉnh sửa thông tin tổng quan",
+  "item.version.history.table.action.editWorkspaceItem": "Chỉnh sửa biểu ghi đang biên mục",
+  "item.version.history.table.action.hasDraft": "Không thể tạo phiên bản mới vì có một phiên bản đang trong tiến trình tải lên",
+  "item.version.history.table.action.newVersion": "Tạo phiên bản mới từ tài liệu này",
+  "item.version.history.table.action.saveSummary": "Lưu",
+  "item.version.history.table.actions": "Hành động",
+  "item.version.history.table.date": "Thời gian xuất bản",
+  "item.version.history.table.editor": "Người biên tập",
+  "item.version.history.table.item": "Tài liệu",
+  "item.version.history.table.summary": "Tóm tắt",
+  "item.version.history.table.version": "Phiên bản",
+  "item.version.history.table.workflowItem": "Đang kiểm duyệt",
+  "item.version.history.table.workspaceItem": "Đang biên mục",
+  "item.version.notice": "Đây không phải là phiên bản mới nhất của tài liệu này. Phiên bản mới nhất có thể xem <a href='{{destination}}'>tại đây</a>.",
+  "itemtemplate.edit.metadata.add-button": "Add",
+  "itemtemplate.edit.metadata.discard-button": "Discard",
+  "itemtemplate.edit.metadata.edit.buttons.confirm": "Confirm",
+  "itemtemplate.edit.metadata.edit.buttons.drag": "Drag to reorder",
+  "itemtemplate.edit.metadata.edit.buttons.edit": "Edit",
+  "itemtemplate.edit.metadata.edit.buttons.remove": "Remove",
+  "itemtemplate.edit.metadata.edit.buttons.undo": "Undo changes",
+  "itemtemplate.edit.metadata.edit.buttons.unedit": "Stop editing",
+  "itemtemplate.edit.metadata.empty": "The item template currently doesn't contain any metadata. Click Add to start adding a metadata value.",
+  "itemtemplate.edit.metadata.headers.edit": "Edit",
+  "itemtemplate.edit.metadata.headers.field": "Field",
+  "itemtemplate.edit.metadata.headers.language": "Lang",
+  "itemtemplate.edit.metadata.headers.value": "Value",
+  "itemtemplate.edit.metadata.metadatafield.error": "An error occurred validating the metadata field",
+  "itemtemplate.edit.metadata.metadatafield.invalid": "Please choose a valid metadata field",
+  "itemtemplate.edit.metadata.notifications.discarded.content": "Your changes were discarded. To reinstate your changes click the 'Undo' button",
+  "itemtemplate.edit.metadata.notifications.discarded.title": "Changes discarded",
+  "itemtemplate.edit.metadata.notifications.error.title": "An error occurred",
+  "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.title": "Metadata invalid",
+  "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.title": "Changes outdated",
+  "itemtemplate.edit.metadata.notifications.saved.content": "Your changes to this item template's metadata were saved.",
+  "itemtemplate.edit.metadata.notifications.saved.title": "Metadata saved",
+  "itemtemplate.edit.metadata.reinstate-button": "Undo",
+  "itemtemplate.edit.metadata.reset-order-button": "Undo reorder",
+  "itemtemplate.edit.metadata.save-button": "Save",
+  "journal.listelement.badge": "Tạp chí",
+  "journal.page.description": "Mô tả",
+  "journal.page.edit": "Chỉnh sửa tài liệu này",
+  "journal.page.editor": "Tổng biên tập",
+  "journal.page.issn": "ISSN",
+  "journal.page.publisher": "Nhà xuất bản",
+  "journal.page.titleprefix": "Tạp chí:",
+  "journal.search.results.head": "Kết quả tìm kiếm tạp chí",
+  "journal.search.title": "Tìm kiếm tạp chí",
+  "journalissue.listelement.badge": "Kỳ của tạp chí",
+  "journalissue.page.description": "Mô tả",
+  "journalissue.page.abstract": "Tóm tắt",
+  "journalissue.page.edit": "Chỉnh sửa tài liệu này",
+  "journalissue.page.issuedate": "Ngày xuất bản",
+  "journalissue.page.journal-issn": "ISSN",
+  "journalissue.page.journal-title": "Nhan đề tạp chí",
+  "journalissue.page.keyword": "Từ khóa chủ đề",
+  "journalissue.page.number": "Số lượng",
+  "journalissue.page.titleprefix": "Kỳ của tạp chí:",
+  "journal-relationships.search.results.head": "Kết quả tìm kiếm tạp chí",
+  "journalvolume.listelement.badge": "Tập của tạp chí",
+  "journalvolume.page.description": "Mô tả",
+  "journalvolume.page.edit": "Chỉnh sửa tài liệu này",
+  "journalvolume.page.issuedate": "Ngày xuất bản",
+  "journalvolume.page.titleprefix": "Tập của tạp chí:",
+  "journalvolume.page.volume": "Tập",
+  "iiif.listelement.badge": "Phương tiện hình ảnh",
+  "iiif.page.description": "Mô tả:",
+  "iiif.page.doi": "Đường dẫn cố định:",
+  "iiif.page.issue": "Vấn đề:",
+  "iiif.page.titleprefix": "Hình ảnh:",
+  "iiifsearchable.listelement.badge": "Phương tiện biểu ghi",
+  "iiifsearchable.page.description": "Mô tả:",
+  "iiifsearchable.page.doi": "Đường dẫn cố định:",
+  "iiifsearchable.page.issue": "Vấn đề:",
+  "iiifsearchable.page.titleprefix": "Tài liệu:",
+  "iiifviewer.fullscreen.notice": "Sử dụng chế độ toàn màn hình để xem tốt hơn.",
+  "loading.bitstream": "Đang tải tệp tin...",
+  "loading.bitstreams": "Đang tải tệp tin...",
+  "loading.browse-by": "Đang tải tài liệu...",
+  "loading.browse-by-page": "Đang tải trang...",
+  "loading.collection": "Đang tải bộ sưu tập...",
+  "loading.collections": "Đang tải bộ sưu tập...",
+  "loading.community": "Đang tải đơn vị...",
+  "loading.content-source": "Đang tải nguồn nội dung...",
+  "loading.default": "Đang tải...",
+  "loading.item": "Đang tải tài liệu...",
+  "loading.items": "Đang tải tài liệu...",
+  "loading.mydspace-results": "Đang tải tài liệu...",
+  "loading.objects": "Đang tải...",
+  "loading.recent-submissions": "Đang tải các tài liệu mới gần đây...",
+  "loading.search-results": "Đanh tải kết quả tìm kiếm...",
+  "loading.sub-collections": "Đang tải bộ sưu tập con...",
+  "loading.sub-communities": "Đang tải đơn vị con...",
+  "loading.top-level-communities": "Đang tải các đơn vị lớn...",
+  "login.breadcrumbs": "Đăng nhập",
+  "login.form.email": "Địa chỉ email",
+  "login.form.forgot-password": "Có phải bạn quên mật khẩu?",
+  "login.form.header": "Vui lòng đăng nhập vào DSpace",
+  "login.form.new-user": "Bạn là người dùng mới? \n Vui lòng nhấp vào đây để đăng kí.",
+  "login.form.oidc": "Đăng nhập với OIDC",
+  "login.form.orcid": "Đăng nhập với ORCID",
+  "login.form.or-divider": "hoặc",
+  "login.form.password": "Mật khẩu",
+  "login.form.shibboleth": "Đăng nhập bằng Shibboleth",
+  "login.form.submit": "Đăng nhập",
+  "login.title": "Đăng nhập",
+  "logout.form.header": "Đăng xuất khỏi DSpace",
+  "logout.form.submit": "Đăng xuất",
+  "logout.title": "Đăng xuất",
+  "menu.header.admin": "Quản trị",
+  "menu.header.admin.description": "Menu quản trị",
+  "menu.header.image.logo": "Logo của kho lưu trữ",
+  "menu.section.access_control": "Người dùng và nhóm người dùng",
+  "menu.section.access_control_authorizations": "Chính sách phân quyền",
+  "menu.section.access_control_groups": "Nhóm người dùng",
+  "menu.section.access_control_people": "Người dùng",
+  "menu.section.admin_search": "Tìm kiếm quản trị",
+  "menu.section.browse_community": "Đơn vị này",
+  "menu.section.browse_community_by_author": "Tác giả",
+  "menu.section.browse_community_by_issue_date": "Năm xuất bản",
+  "menu.section.browse_community_by_title": "Nhan đề",
+  "menu.section.browse_global": "Duyệt tìm",
+  "menu.section.browse_global_by_author": "Tác giả",
+  "menu.section.browse_global_by_dateissued": "Năm xuất bản",
+  "menu.section.browse_global_by_subject": "Chủ đề",
+  "menu.section.browse_global_by_title": "Nhan đề",
+  "menu.section.browse_global_communities_and_collections": "Đơn vị & Bộ sưu tập",
+  "menu.section.control_panel": "Bảng điều khiển",
+  "menu.section.curation_task": "Kiểm tra dữ liệu",
+  "menu.section.edit": "Chỉnh sửa",
+  "menu.section.edit_collection": "Bộ sưu tập",
+  "menu.section.edit_community": "Đơn vị",
+  "menu.section.edit_item": "Tài liệu",
+  "menu.section.export": "Trích xuất",
+  "menu.section.export_batch": "Xuất dữ liệu (ZIP)",
+  "menu.section.export_collection": "Bộ sưu tập",
+  "menu.section.export_community": "Đơn vị",
+  "menu.section.export_item": "Tài liệu",
+  "menu.section.export_metadata": "Siêu dữ liệu",
+  "menu.section.health": "Kiểm tra hệ thống",
+  "menu.section.icon.access_control": "Phần menu của mục Người dùng và Nhóm người dùng",
+  "menu.section.icon.admin_search": "Phần menu của mục Tìm kiếm quản trị",
+  "menu.section.icon.control_panel": "Phần menu của mục Bảng điều khiển",
+  "menu.section.icon.curation_tasks": "Phần menu của Nhiệm vụ kiểm tra",
+  "menu.section.icon.edit": "Phần menu của mục Chỉnh sửa",
+  "menu.section.icon.export": "Phần menu của mục Trích xuất dữ liệu",
+  "menu.section.icon.find": "Phần menu của mục Tìm kiếm",
+  "menu.section.icon.health": "Phần menu của mục Kiểm tra hệ thống",
+  "menu.section.icon.import": "Phần menu của mục Nhập dữ liệu",
+  "menu.section.icon.new": "Phần menu của mục Tạo mới",
+  "menu.section.icon.pin": "Ghim thanh quản trị",
+  "menu.section.icon.processes": "Phần menu của mục Tiến trình",
+  "menu.section.icon.registries": "Phần menu của mục Thống số chung",
+  "menu.section.icon.statistics_task": "Phần menu của mục Nhiệm vụ báo cáo thống kê",
+  "menu.section.icon.unpin": "Bỏ ghim thanh quản trị",
+  "menu.section.icon.workflow": "Phần menu của mục Quản trị luồng công việc",
+  "menu.section.import": "Nhập dữ liệu",
+  "menu.section.import_batch": "Nhập liệu theo lô (ZIP)",
+  "menu.section.import_metadata": "Siêu dữ liệu",
+  "menu.section.new": "Tạo mới",
+  "menu.section.new_collection": "Bộ sưu tập",
+  "menu.section.new_community": "Đơn vị",
+  "menu.section.new_item": "Tài liệu",
+  "menu.section.new_item_version": "Phiên bản tài liệu",
+  "menu.section.new_process": "Tiến trình",
+  "menu.section.pin": "Ghim thanh quản trị",
+  "menu.section.policies_metadata": "Chính sách phân quyền",
+  "menu.section.processes": "Tiến trình",
+  "menu.section.registries": "Thông số chung",
+  "menu.section.registries_format": "Định dạng tệp tin số",
+  "menu.section.registries_metadata": "Trường dữ liệu",
+  "menu.section.statistics": "Báo cáo thống kê",
+  "menu.section.statistics_admin": "Báo cáo thống kê",
+  "menu.section.statistics_admin_metadata": "Báo cáo thống kê",
+  "menu.section.statistics_task": "Nhiệm vụ báo cáo thống kê",
+  "menu.section.toggle.access_control": "Phần chuyển đổi Người dùng và Nhóm người dùng",
+  "menu.section.toggle.control_panel": "Phần chuyển đổi Bảng điều khiển",
+  "menu.section.toggle.curation_task": "Phần chuyển đổi Kiểm tra dữ liệu",
+  "menu.section.toggle.edit": "Phần chuyển đổi Chỉnh sửa",
+  "menu.section.toggle.export": "Phần chuyển đổi Trích xuất dữ liệu",
+  "menu.section.toggle.find": "Phần chuyển đổi Tìm kiếm",
+  "menu.section.toggle.import": "Phần chuyển đổi Nhập dữ liệu",
+  "menu.section.toggle.new": "Phần chuyển đổi Tạo mới",
+  "menu.section.toggle.registries": "Phần chuyển đổi thông số chung",
+  "menu.section.toggle.statistics_task": "Phần chuyển đổi Nhiệm vụ Báo cáo thống kê",
+  "menu.section.unpin": "Bỏ ghim thanh quản trị",
+  "menu.section.workflow": "Quản trị dòng công việc",
+  "metadata-export-search.submit.error": "Xảy ra lỗi trong quá trình xuất dữ liệu",
+  "metadata-export-search.submit.success": "Quá trình xuất dữ liệu đã được khởi chạy thành công",
+  "metadata-export-search.tooltip": "Xuất kết quả tìm kiếm ra CSV",
+  "mydspace.breadcrumbs": "Trang cá nhân",
+  "mydspace.messages.controller-help": "Chọn tùy chọn này để gửi tin nhắn tới người biên mục tài liệu.",
+  "mydspace.messages.description-placeholder": "Thêm tin nhắn của bạn tại đây...",
+  "mydspace.messages.hide-msg": "Ẩn tin nhắn",
+  "mydspace.messages.mark-as-read": "Đánh dấu đã đọc",
+  "mydspace.messages.mark-as-unread": "Đánh dấu chưa đọc",
+  "mydspace.messages.no-content": "Không có nội dung.",
+  "mydspace.messages.no-messages": "Không có tin nhắn nào.",
+  "mydspace.messages.send-btn": "Gửi",
+  "mydspace.messages.show-msg": "Hiển thị tin nhắn",
+  "mydspace.messages.subject-placeholder": "Chủ đề...",
+  "mydspace.messages.submitter-help": "Chọn tùy chọn này để gửi tin nhắn tới người quản trị.",
+  "mydspace.messages.title": "Tin nhắn",
+  "mydspace.messages.to": "Tới",
+  "mydspace.new-submission": "Tạo tài liệu mới",
+  "mydspace.new-submission-external": "Nhập thông tin mô tả từ nguồn bên ngoài",
+  "mydspace.new-submission-external-short": "Nhập thông tin mô tả",
+  "mydspace.results.head": "Tài liệu của tôi",
+  "mydspace.results.no-abstract": "Không có tóm tắt",
+  "mydspace.results.no-authors": "Không có tác giả",
+  "mydspace.results.no-collections": "Không có bộ sưu tập",
+  "mydspace.results.no-date": "Không có thời gian xuất bản",
+  "mydspace.results.no-files": "Không có tệp đính kèm",
+  "mydspace.results.no-results": "Không có tài liệu để hiển thị",
+  "mydspace.results.no-title": "Không có nhan đề",
+  "mydspace.results.no-uri": "Không có URL",
+  "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.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.",
+  "mydspace.upload.upload-failed-moreonefile": "Không thể xử lý yêu cầu. Chỉ cho phép một tệp tin duy nhất.",
+  "mydspace.upload.upload-multiple-successful": "Đã tạo {{qty}} mục không gian làm việc mới.",
+  "mydspace.view-btn": "Xem chi tiết",
+  "nav.browse.header": "Tất cả DSpace",
+  "nav.community-browse.header": "Theo Đơn vị",
+  "nav.language": "Chuyển ngôn ngữ",
+  "nav.login": "Đăng nhập",
+  "nav.logout": "Menu Hồ sơ cá nhân và Đăng xuất",
+  "nav.main.description": "Thanh điều hướng chính",
+  "nav.mydspace": "Trang cá nhân",
+  "nav.profile": "Hồ sơ cá nhân",
+  "nav.search": "Tìm kiếm",
+  "nav.statistics.header": "Báo cáo thống kê",
+  "nav.stop-impersonating": "Ngừng giả danh Người dùng",
+  "nav.toggle": "Điều hướng chuyển",
+  "nav.user.description": "Thanh hồ sơ người dùng",
+  "nav.user-profile-menu-and-logout": "Trình đơn Hồ sơ cá nhân và Đăng xuất",
+  "none.listelement.badge": "Tài liệu",
+  "orgunit.listelement.badge": "Đơn vị/Tổ chức",
+  "orgunit.listelement.no-title": "Không có nhan đề",
+  "orgunit.page.city": "Thành phố",
+  "orgunit.page.country": "Quốc gia",
+  "orgunit.page.dateestablished": "Ngày thành lập",
+  "orgunit.page.description": "Mô tả",
+  "orgunit.page.edit": "Chỉnh sửa tài liệu",
+  "orgunit.page.id": "ID",
+  "orgunit.page.titleprefix": "Đơn vị/Tổ chức",
+  "pagination.next.button": "Tiếp theo",
+  "pagination.next.button.disabled.tooltip": "Không còn trang kết quả khác",
+  "pagination.options.description": "Tùy chọn Phân trang",
+  "pagination.previous.button": "Quay lại",
+  "pagination.results-per-page": "Số kết quả/trang",
+  "pagination.showing.detail": "{{ range }} của tổng số {{ total }} kết quả",
+  "pagination.showing.label": "Đang hiển thị ",
+  "pagination.sort-direction": "Tùy chọn sắp xếp",
+  "person.listelement.badge": "Nhà nghiên cứu",
+  "person.listelement.no-title": "Không tìm thấy tên",
+  "person.orcid.registry.auth": "Được phép qua ORCID ",
+  "person.orcid.registry.queue": "Đang xếp hàng đợi đăng ký ORCID",
+  "person.orcid.sync.setting": "Thiết lập đồng bộ hóa với ORCID",
+  "person.page.birthdate": "Ngày sinh",
+  "person.page.edit": "Chỉnh sửa tài liệu",
+  "person.page.email": "Email",
+  "person.page.firstname": "Tên",
+  "person.page.jobtitle": "Chức vụ",
+  "person.page.abtract": "Tiểu sử",
+  "person.page.description": "Mô tả",
+  "person.page.lastname": "Họ",
+  "person.page.link.full": "Hiển thị chi tiết",
+  "person.page.name": "Tên",
+  "person.page.orcid": "ORCID",
+  "person.page.orcid.create": "Tạo một ID trên ORCID",
+  "person.page.orcid.funding-preferences": "Quỹ ưa thích",
+  "person.page.orcid.grant-authorizations": "Cấp quyền",
+  "person.page.orcid.granted-authorizations": "Quyền đã cấp",
+  "person.page.orcid.link": "Liên kết với ID ORCID",
+  "person.page.orcid.link.error.message": "Đã xảy ra lỗi khi kết nối hồ sơ với ORCID. Nếu sự cố vẫn tiếp tục xảy ra vui lòng liên hệ với quản trị viên.",
+  "person.page.orcid.link.processing": "Đang kết nối hồ sơ tới ORCID…",
+  "person.page.orcid.missing-authorizations": "Thiếu quyền",
+  "person.page.orcid.missing-authorizations-message": "Những quyền sau đang bị thiếu:",
+  "person.page.orcid.no-missing-authorizations-message": "Tuyệt! Ô này đang trống vì vậy bạn đã được cấp tất cả các quyền truy cập để sử dụng tất cả các chức năng do tổ chức của bạn cung cấp.",
+  "person.page.orcid.no-orcid-message": "Chưa có ID ORCID nào được liên kết. Bạn có thể click vào nút dưới đây để liên kết hồ sơ này với một tài khoản ORCID.",
+  "person.page.orcid.orcid-not-linked-message": "ID ORCID của hồ sơ này ({{ orcid }}) chưa được kết nối với tài khoản trên trang ORCID hoặc kết nối đã hết hạn.",
+  "person.page.orcid.profile-preferences": "Tham số của hồ sơ",
+  "person.page.orcid.publications-preferences": "Tham số của ấn phẩm",
+  "person.page.orcid.remove-orcid-message": "Nếu bạn cần xóa ORCID của bạn vui lòng liên hệ với quản trị viên.",
+  "person.page.orcid.save.preference.changes": "Cập nhật cài đặt",
+  "person.page.orcid.scope.activities-update": "Thêm/cập nhật các hoạt động nghiên cứu của bạn",
+  "person.page.orcid.scope.authenticate": "Lấy ID ORCID của bạn",
+  "person.page.orcid.scope.person-update": "Thêm/cập nhật thông tin cá nhân của bạn",
+  "person.page.orcid.scope.read-limited": "Thiết lập để cho phép Các bên Tin cậy (Trusted Parties) có khả năng đọc thông tin của bạn ",
+  "person.page.orcid.sync-fundings.all": "Tất cả quỹ",
+  "person.page.orcid.sync-fundings.disabled": "Đã ngừng kích hoạt",
+  "person.page.orcid.sync-fundings.mine": "Quỹ của tôi",
+  "person.page.orcid.sync-fundings.my_selected": "Quỹ đã chọn",
+  "person.page.orcid.synchronization-mode": "Chế độ đồng bộ",
+  "person.page.orcid.synchronization-mode.batch": "Theo lô",
+  "person.page.orcid.synchronization-mode.label": "Chế độ đồng bộ",
+  "person.page.orcid.synchronization-mode.manual": "Thủ công",
+  "person.page.orcid.synchronization-mode-funding-message": "Chọn gửi/không gửi các thực thể dự án của bạn đến danh sách các quỹ tài trợ trong bản ghi ORCID của bạn hay không.",
+  "person.page.orcid.synchronization-mode-message": "Vui lòng chọn phương thức đồng bộ hóa với ORCID. Các tùy chọn bao gồm \"Thủ công\" (bạn phải gửi dữ liệu của mình tới ORCID theo cách thủ công) hoặc \"Tự động\" (hệ thống sẽ gửi dữ liệu của bạn tới ORCID thông qua tập lệnh đã lên lịch).",
+  "person.page.orcid.synchronization-mode-profile-message": "Chọn gửi/ không gửi thông tin tiểu sử hoặc số định danh cá nhân tới hồ sơ ORCID của bạn.",
+  "person.page.orcid.synchronization-mode-publication-message": "Chọn gửi/ không gửi các thực thể Ấn phẩm tới danh sách các tác phẩm trong biểu ghi ORCID của bạn.",
+  "person.page.orcid.synchronization-settings-update.error": "Cập nhật cài đặt  đồng bộ hóa không thành công",
+  "person.page.orcid.synchronization-settings-update.success": "Cài đặt đồng bộ hóa đã được cập nhật thành công",
+  "person.page.orcid.sync-profile.affiliation": "Tổ chức",
+  "person.page.orcid.sync-profile.biographical": "Dữ liệu sinh trắc học",
+  "person.page.orcid.sync-profile.education": "Giáo dục",
+  "person.page.orcid.sync-profile.identifiers": "Định danh",
+  "person.page.orcid.sync-publications.all": "Tất cả ấn phẩm",
+  "person.page.orcid.sync-publications.disabled": "Đã ngừng kích hoạt",
+  "person.page.orcid.sync-publications.mine": "Ấn phẩm của tôi",
+  "person.page.orcid.sync-publications.my_selected": "Ấn phẩm đã chọn",
+  "person.page.orcid.sync-queue.description.affiliation": "Tổ chức",
+  "person.page.orcid.sync-queue.description.country": "Quốc gia",
+  "person.page.orcid.sync-queue.description.education": "Giáo dục",
+  "person.page.orcid.sync-queue.description.external_ids": "ID ngoài",
+  "person.page.orcid.sync-queue.description.keywords": "Từ khóa",
+  "person.page.orcid.sync-queue.description.other_names": "Tên khác",
+  "person.page.orcid.sync-queue.description.qualification": "Trình độ chuyên môn",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL nhà nghiên cứu",
+  "person.page.orcid.sync-queue.discard": "Hủy thay đổi và không đồng bộ với trang ORCID",
+  "person.page.orcid.sync-queue.discard.error": "Việc loại bỏ biểu ghi trong danh sách chờ của ORCID đã thất bại",
+  "person.page.orcid.sync-queue.discard.success": "Biểu ghi trong danh sách chờ của ORCID đã được hủy bỏ thành công",
+  "person.page.orcid.sync-queue.empty-message": "Danh sách chờ ORCID trống",
+  "person.page.orcid.sync-queue.send": "Đồng bộ với trang ORCID",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Đẩy dữ liệu lên ORCID không thành công vì tài nguyên này không hợp lệ",
+  "person.page.orcid.sync-queue.send.conflict-error": "Đẩy dữ liệu lên ORCID không thành công bởi vì tài nguyên này đã có trên trang ORCID",
+  "person.page.orcid.sync-queue.send.error": "Đẩy dữ liệu lên ORCID không thành công",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Tài nguyên không còn tồn tại trên ORCID.",
+  "person.page.orcid.sync-queue.send.success": "Đẩy dữ liệu lên ORCID thành công",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Nhấp <a href='{{orcid}}'>vào đây</a> để cấp lại các quyền bắt buộc. Nếu vấn đề vẫn còn tồn tại vui lòng liên hệ quản trị viên.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Đẩy dữ liệu lên ORCID không thành công do tài khoản của bạn không đủ các quyền cần thiết.",
+  "person.page.orcid.sync-queue.send.validation-error": "Dữ liệu bạn muốn đồng bộ với ORCID là dữ liệu không hợp lệ",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Đơn vị tiền tệ là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "2 ký tự mã quốc gia theo ISO 3166 là không hợp lệ",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Cần có số định danh (ID) để phân biệt giữa các tổ chức. ID được hỗ trợ là GRID Ringgold LEI và số định dang Cơ quan đăng ký Crossref Funder",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Định danh của tổ chức yêu cầu phải có một giá trị",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Nguồn của một trong các số định danh của tổ chức không hợp lệ. Các nguồn được hỗ trợ là RINGGOLD GRID LEI và FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Phải có một nguồn cho định danh của tổ chức",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Tài nguyên được gửi yêu cầu phải có ít nhất một định danh",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Nhà tài trợ là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Tổ chức này yêu cầu phải có địa chỉ",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Địa chỉ của tổ chức này phải là một thành phố",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Địa chỉ của tổ chức này phải là một mã quốc gia bao gồm 2 ký tự theo ISO 3166",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Tên của tổ chức là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Yêu cầu phải có tổ chức",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Năm xuất bản phải là năm sau năm 1900",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Ngày bắt đầu là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Nhan đề là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Trường dc.type là bắt buộc",
+  "person.page.orcid.sync-queue.table.header.action": "Hành động",
+  "person.page.orcid.sync-queue.table.header.description": "Mô tả",
+  "person.page.orcid.sync-queue.table.header.type": "Loại hình tài liệu",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Tổ chức",
+  "person.page.orcid.sync-queue.tooltip.country": "Quốc gia",
+  "person.page.orcid.sync-queue.tooltip.delete": "Loại bỏ mục này khỏi trang ORCID",
+  "person.page.orcid.sync-queue.tooltip.education": "Giáo dục",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Định danh ",
+  "person.page.orcid.sync-queue.tooltip.insert": "Thêm mục mới trong ORCID",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Từ khóa",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Tên khác",
+  "person.page.orcid.sync-queue.tooltip.project": "Dự án",
+  "person.page.orcid.sync-queue.tooltip.publication": "Ấn phẩm",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Trình độ chuyên môn",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL nhà nghiên cứu",
+  "person.page.orcid.sync-queue.tooltip.update": "Cập nhật mục này trên trang ORCID",
+  "person.page.orcid.unlink": "Ngắt kết nối khỏi ORCID",
+  "person.page.orcid.unlink.error": "Đã xảy ra lỗi khi ngắt kết nối giữa hồ sơ và ORCID. Vui lòng thử lại.",
+  "person.page.orcid.unlink.processing": "Đang xử lý…",
+  "person.page.orcid.unlink.success": "Đã ngắt kết nối giữa hồ sơ nhà nghiên cứu và trang ORCID thành công",
+  "person.page.staffid": "ID nhân viên",
+  "person.page.titleprefix": "Nhà nghiên cứu",
+  "person.search.results.head": "Kết quả tìm kiếm Nhà nghiên cứu",
+  "person.search.title": "Tìm kiếm Nhà nghiên cứu",
+  "person-relationships.search.results.head": "Kết quả tìm kiếm Tác giả/Nhà nghiên cứu",
+  "process.bulk.delete.error.body": "Không thể xóa tiến trình có ID {{ processId}}. Các tiến trình còn lại sẽ tiếp tục bị xóa.",
+  "process.bulk.delete.error.head": "Đã xảy ra lỗi khi xóa tiến trình",
+  "process.detail.actions": "Hành động",
+  "process.detail.arguments": "Tham số",
+  "process.detail.arguments.empty": "Tiến trình này không chứa bất kì tham số nào",
+  "process.detail.back": "Quay lại",
+  "process.detail.create": "Tạo tiến trình tương tự",
+  "process.detail.delete.body": "Bạn có chắc chắn muốn xóa tiến trình hiện tại?",
+  "process.detail.delete.button": "Xóa tiến trình",
+  "process.detail.delete.cancel": "Hủy",
+  "process.detail.delete.confirm": "Xóa tiến trình",
+  "process.detail.delete.error": "Đã xảy ra sự cố trong khi xóa tiến trình",
+  "process.detail.delete.header": "Xóa tiến trình",
+  "process.detail.delete.success": "Tiến trình đã được xóa thành công.",
+  "process.detail.end-time": "Thời gian kết thúc",
+  "process.detail.logs.button": "Tìm kiếm đầu ra của tiến trình",
+  "process.detail.logs.loading": "Đang tìm kiếm",
+  "process.detail.logs.none": "Tiến trình này không có đầu ra nào",
+  "process.detail.output": "Đầu ra của tiến trình",
+  "process.detail.output-files": "Tệp tin đầu ra",
+  "process.detail.output-files.empty": "Tiến trình này không chứa tệp tin đầu ra nào",
+  "process.detail.script": "Tập lệnh",
+  "process.detail.start-time": "Thời gian bắt đầu",
+  "process.detail.status": "Trạng thái",
+  "process.detail.title": "Tiến trình: {{ id }} - {{ name }}",
+  "process.new.breadcrumbs": "Tạo tiến trình mới",
+  "process.new.cancel": "Hủy",
+  "process.new.header": "Tạo tiến trình mới",
+  "process.new.notification.error.content": "Đã có lỗi xảy ra trong khi tạo tiến trình",
+  "process.new.notification.error.title": "Lỗi",
+  "process.new.notification.success.content": "Tiến trình đã được thực hiện thành công",
+  "process.new.notification.success.title": "Thành công",
+  "process.new.parameter.file.required": "Vui lòng chọn một tệp tin",
+  "process.new.parameter.file.upload-button": "Chọn tệp tin...",
+  "process.new.parameter.required.missing": "Các tham số bắt buộc sau đang bị thiếu:",
+  "process.new.parameter.string.required": "Giá trị tham số là bắt buộc",
+  "process.new.parameter.type.file": "tệp tin",
+  "process.new.parameter.type.value": "giá trị",
+  "process.new.select-parameters": "Tham số",
+  "process.new.select-script": "Tập lệnh",
+  "process.new.select-script.placeholder": "Chọn một tập lệnh...",
+  "process.new.select-script.required": "Tập lệnh là bắt buộc",
+  "process.new.submit": "Lưu",
+  "process.new.title": "Tạo tiến trình mới",
+  "process.overview.breadcrumbs": "Tiến trình tổng quan",
+  "process.overview.delete": "Xóa {{count}} tiến trình",
+  "process.overview.delete.body": "Bạn có chắc chắn muốn xóa {{count}} tiến trình?",
+  "process.overview.delete.clear": "Xóa các tiến trình đã chọn",
+  "process.overview.delete.header": "Xóa",
+  "process.overview.new": "Tạo mới",
+  "process.overview.table.actions": "Hành động",
+  "process.overview.table.finish": "Thời gian kết thúc",
+  "process.overview.table.id": "ID tiến trình",
+  "process.overview.table.name": "Tên",
+  "process.overview.table.start": "Thời gian bắt đầu",
+  "process.overview.table.status": "Trạng thái",
+  "process.overview.table.user": "Người dùng",
+  "process.overview.title": "Tổng quan tiến trình",
+  "profile.breadcrumbs": "Cập nhật hồ sơ",
+  "profile.card.identify": "Hồ sơ định danh",
+  "profile.card.researcher": "Định danh",
+  "profile.card.security": "Bảo mật",
+  "profile.form.submit": "Lưu",
+  "profile.groups.head": "Nhóm quyền của bạn",
+  "profile.head": "Cập nhật hồ sơ",
+  "profile.metadata.form.error.firstname.required": "Yêu cầu nhập Tên của người dùng",
+  "profile.metadata.form.error.lastname.required": "Yêu cầu nhập Họ của người dùng",
+  "profile.metadata.form.label.email": "Địa chỉ email",
+  "profile.metadata.form.label.firstname": "Tên",
+  "profile.metadata.form.label.language": "Ngôn ngữ",
+  "profile.metadata.form.label.lastname": "Họ",
+  "profile.metadata.form.label.phone": "Số điện thoại liên hệ",
+  "profile.metadata.form.notifications.success.content": "Cập nhật hồ sơ thành công .",
+  "profile.metadata.form.notifications.success.title": "Lưu hồ sơ",
+  "profile.notifications.warning.no-changes.content": "Không có thay đổi nào trên hồ sơ của bạn.",
+  "profile.notifications.warning.no-changes.title": "Không thay đổi",
+  "profile.security.form.error.matching-passwords": "Mật khẩu không khớp.",
+  "profile.security.form.info": "Nhập vào mật khẩu mới và xác nhận mật khẩu vào ô phía dưới. Độ dài tối thiểu của mật khẩu là 6 ký tự.",
+  "profile.security.form.label.current-password": "Mật khẩu hiện tại",
+  "profile.security.form.label.password": "Mật khẩu",
+  "profile.security.form.label.passwordrepeat": "Nhập lại mật khẩu để xác nhận",
+  "profile.security.form.notifications.error.change-failed": "Đã xảy ra lỗi khi thay đổi mật khẩu. Vui lòng kiểm tra lại tính chính xác của mật khẩu hiện tại.",
+  "profile.security.form.notifications.error.general": "Vui lòng điền vào các trường bắt buộc của biểu mẫu bảo mật.",
+  "profile.security.form.notifications.error.not-same": "Mật khẩu được cung cấp không giống nhau.",
+  "profile.security.form.notifications.error.title": "Thay đổi mật khẩu không thành công",
+  "profile.security.form.notifications.success.content": "Thay đổi mật khẩu thành công.",
+  "profile.security.form.notifications.success.title": "Đã lưu mật khẩu",
+  "profile.special.groups.head": "Phân quyền cho các nhóm đặc biệt mà bạn thuộc về",
+  "profile.title": "Cập nhật hồ sơ",
+  "project.listelement.badge": "Dự án nghiên cứu",
+  "project.page.contributor": "Người tham gia",
+  "project.page.description": "Mô tả",
+  "project.page.edit": "Chỉnh sửa tài liệu",
+  "project.page.expectedcompletion": "Dự kiến hoàn thành",
+  "project.page.funder": "Nhà tài trợ",
+  "project.page.id": "ID",
+  "project.page.keyword": "Từ khóa",
+  "project.page.status": "Trạng thái",
+  "project.page.titleprefix": "Dự án nghiên cứu:",
+  "project.search.results.head": "Kết quả tìm kiếm dự án",
+  "project-relationships.search.results.head": "Kết quả tìm kiếm dự án",
+  "publication.listelement.badge": "Ấn phẩm",
+  "publication.page.description": "Mô tả",
+  "publication.page.edit": "Chỉnh sửa tài liệu",
+  "publication.page.journal-issn": "ISSN tạp chí",
+  "publication.page.journal-title": "Nhan đề tạp chí",
+  "publication.page.publisher": "Nhà xuất bản",
+  "publication.page.titleprefix": "Ấn phẩm: ",
+  "publication.page.volume-title": "Nhan đề tập",
+  "publication.search.results.head": "Kết quả tìm kiếm ấn phẩm",
+  "publication.search.title": "Tìm kiếm ấn phẩm",
+  "publication-relationships.search.results.head": "Kết quả tìm kiếm ấn phẩm",
+  "media-viewer.next": "Tiếp theot",
+  "media-viewer.playlist": "Danh sách phát",
+  "media-viewer.previous": "Quay lại",
+  "register-email.title": "Đăng ký tài khoản mới",
+  "register-page.create-profile.header": "Tạo hồ sơ",
+  "register-page.create-profile.identification.contact": "Điện thoại liên hệ",
+  "register-page.create-profile.identification.email": "Địa chỉ email",
+  "register-page.create-profile.identification.first-name": "Tên *",
+  "register-page.create-profile.identification.first-name.error": "Nhập vào tên của người dùng",
+  "register-page.create-profile.identification.header": "Hồ sơ định danh",
+  "register-page.create-profile.identification.language": "Ngôn ngữ",
+  "register-page.create-profile.identification.last-name": "Họ *",
+  "register-page.create-profile.identification.last-name.error": "Nhập vào họ của người dùng",
+  "register-page.create-profile.security.error.empty-password": "Nhập mật khẩu vào ô phía dưới.",
+  "register-page.create-profile.security.error.matching-passwords": "Mật khẩu không khớp.",
+  "register-page.create-profile.security.header": "Bảo mật",
+  "register-page.create-profile.security.info": "Nhập vào mật khẩu mới và xác nhận mật khẩu vào ô phía dưới. Độ dài tối thiểu của mật khẩu là 6 ký tự.",
+  "register-page.create-profile.security.label.password": "Mật khẩu *",
+  "register-page.create-profile.security.label.passwordrepeat": "Nhập lại để xác nhận *",
+  "register-page.create-profile.submit": "Đăng ký thành công",
+  "register-page.create-profile.submit.error.content": "Đã có sự cố xảy ra khi đăng ký người dùng mới.",
+  "register-page.create-profile.submit.error.head": "Đăng ký lỗi",
+  "register-page.create-profile.submit.success.content": "Đăng ký thành công. Bạn đã đăng nhập với tư cách người dùng mới",
+  "register-page.create-profile.submit.success.head": "Đăng ký thành công",
+  "register-page.registration.email": "Địa chỉ email *",
+  "register-page.registration.email.error.pattern": "Vui lòng nhập một địa chỉ email hợp lệ",
+  "register-page.registration.email.error.required": "Vui lòng nhập vào địa chỉ email",
+  "register-page.registration.email.hint": "Địa chỉ này sẽ được xác minh và dùng làm tên đăng nhập của bạn.",
+  "register-page.registration.error.content": "Đã xảy ra lỗi khi đăng ký địa chỉ email sau: {{ email }}",
+  "register-page.registration.error.head": "Lỗi khi đăng ký email",
+  "register-page.registration.error.recaptcha": "Lỗi khi thực hiện xác minh bằng recaptcha",
+  "register-page.registration.google-recaptcha.must-accept-cookies": "Để đăng ký bạn phải chấp nhận cookie <b>Đăng ký và khôi phục mật khẩu</b> (Google reCaptcha).",
+  "register-page.registration.google-recaptcha.notification.message.error": "Xác minh đã hết hạn. Vui lòng xác minh lại.",
+  "register-page.registration.google-recaptcha.notification.message.expired": "Đã xảy ra lỗi trong quá trình xác minh reCaptcha",
+  "register-page.registration.google-recaptcha.notification.title": "Google reCaptcha",
+  "register-page.registration.google-recaptcha.open-cookie-settings": "Mở phần cài đặt cookie",
+  "register-page.registration.header": "Đăng ký người dùng mới",
+  "register-page.registration.info": "Đăng ký tài khoản để nhận cập nhật mới về bộ sưu tập qua email và theo dõi tài liệu mới trên DSpace.",
+  "register-page.registration.submit": "Đăng ký",
+  "register-page.registration.success.content": "Một email sẽ được gửi đến địa chỉ email {{ email }} chứa liên kết xác nhận và các hướng dẫn khác.",
+  "register-page.registration.success.head": "Gửi email xác nhận",
+  "relationships.add.error.relationship-type.content": "Không có kết quả nào phù hợp cho kiểu quan hệ {{ type }} giữa hai tài liệu",
+  "relationships.add.error.server.content": "Máy chủ trả về lỗi",
+  "relationships.add.error.title": "Không thể thêm mối quan hệ",
+  "relationships.isAuthorOf": "Tác giả",
+  "relationships.isAuthorOf.OrgUnit": "Tác giả (tổ chức)",
+  "relationships.isAuthorOf.Person": "Tác giả (người)",
+  "relationships.isContributorOf": "Người tham gia",
+  "relationships.isContributorOf.OrgUnit": "Người tham gia (Tổ chức)",
+  "relationships.isContributorOf.Person": "Người tham gia",
+  "relationships.isFundingAgencyOf.OrgUnit": "Nhà tài trợ",
+  "relationships.isIssueOf": "Số kỳ của tạp chí",
+  "relationships.isJournalIssueOf": "Số kỳ của tạp chí",
+  "relationships.isJournalOf": "Tạp chí",
+  "relationships.isOrgUnitOf": "Đơn vị tổ chức",
+  "relationships.isPersonOf": "Tác giả",
+  "relationships.isProjectOf": "Dự án nghiên cứu",
+  "relationships.isPublicationOf": "Ấn phẩm",
+  "relationships.isPublicationOfJournalIssue": "Bài báo",
+  "relationships.isSingleJournalOf": "Tạp chí",
+  "relationships.isSingleVolumeOf": "Số tập của tạp chí",
+  "relationships.isVolumeOf": "Số tập của tạp chí",
+  "repository.image.logo": "Logo lưu trữ",
+  "repository.title.prefix": "Digital Library ::",
+  "repository.title.prefixDSpace": "Digital Library ::",
+  "resource-policies.add.button": "Thêm",
+  "resource-policies.add.for.bitstream": "Thêm chính sách dữ liệu số mới",
+  "resource-policies.add.for.bundle": "Thêm chính sách gói dữ liệu mới",
+  "resource-policies.add.for.collection": "Thêm chính sách bộ sưu tập mới",
+  "resource-policies.add.for.community": "Thêm chính sách đơn vị mới",
+  "resource-policies.add.for.item": "Thêm chính sách tài liệu mới",
+  "resource-policies.create.page.failure.content": "Đã có lỗi xảy ra khi tạo chính sách tài nguyên.",
+  "resource-policies.create.page.heading": "Tạo chính sách tài nguyên mới cho",
+  "resource-policies.create.page.success.content": "Hành động thành công",
+  "resource-policies.create.page.title": "Tạp chính sách tài nguyên mới",
+  "resource-policies.delete.btn": "Xóa lựa chọn",
+  "resource-policies.delete.btn.title": "Xóa chính sách tài nguyên đã chọn",
+  "resource-policies.delete.failure.content": "Đã có lỗi xảy ra khi xóa chính sách tài nguyên đã lựa chọn.",
+  "resource-policies.delete.success.content": "Hành động thành công",
+  "resource-policies.edit.page.failure.content": "Đã có lỗi xảy ra khi chỉnh sửa chính sách tài nguyên.",
+  "resource-policies.edit.page.heading": "Chỉnh sửa chính sách tài nguyên",
+  "resource-policies.edit.page.other-failure.content": "Đã xảy ra lỗi khi chỉnh sửa chính sách phân quyền. Người dùng/ nhóm người dùng đã được cập nhật thành công.",
+  "resource-policies.edit.page.success.content": "Hành động thành công",
+  "resource-policies.edit.page.target-failure.content": "Đã xảy ra lỗi khi chỉnh sửa người dùng/ nhóm người dùng trong chính sách phân quyền.",
+  "resource-policies.edit.page.title": "Chỉnh sửa chính sách phân quyền",
+  "resource-policies.form.action-type.label": "Lựa chọn kiểu hành động",
+  "resource-policies.form.action-type.required": "Bạn cần phải lựa chọn hành động chính sách phân quyền.",
+  "resource-policies.form.date.end.label": "Ngày kết thúc",
+  "resource-policies.form.date.start.label": "Ngày bắt đầu",
+  "resource-policies.form.description.label": "Mô tả",
+  "resource-policies.form.eperson-group-list.label": "Người hoặc nhóm người dùng được cấp quyền",
+  "resource-policies.form.eperson-group-list.modal.close": "Ok",
+  "resource-policies.form.eperson-group-list.modal.header": "Không thể thay đổi kiểu",
+  "resource-policies.form.eperson-group-list.modal.text1.toEPerson": "Không thể thay thế nhóm người dùng bằng người dùng.",
+  "resource-policies.form.eperson-group-list.modal.text1.toGroup": "Không thể thay thế người dùng bằng nhóm người dùng.",
+  "resource-policies.form.eperson-group-list.modal.text2": "Xóa chính sách phân quyền hiện tại và tạo chính sách mới với kiểu mong muốn.",
+  "resource-policies.form.eperson-group-list.select.btn": "Lựa chọn",
+  "resource-policies.form.eperson-group-list.tab.eperson": "Tìm kiếm người dùng",
+  "resource-policies.form.eperson-group-list.tab.group": "Tìm kiếm một nhóm người dùng",
+  "resource-policies.form.eperson-group-list.table.headers.action": "Hành động",
+  "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.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",
+  "resource-policies.table.headers.date.end": "Ngày kết thúc",
+  "resource-policies.table.headers.date.start": "Ngày bắt đầu",
+  "resource-policies.table.headers.edit": "Chỉnh sửa",
+  "resource-policies.table.headers.edit.group": "Chỉnh sửa nhóm",
+  "resource-policies.table.headers.edit.policy": "Chỉnh sửa chính sách",
+  "resource-policies.table.headers.eperson": "Người dùng",
+  "resource-policies.table.headers.group": "Nhóm",
+  "resource-policies.table.headers.id": "ID",
+  "resource-policies.table.headers.name": "Tên",
+  "resource-policies.table.headers.policyType": "kiểu",
+  "resource-policies.table.headers.title.for.bitstream": "Chính sách tệp dữ liệu số",
+  "resource-policies.table.headers.title.for.bundle": "Chính sách gói dữ liệu số",
+  "resource-policies.table.headers.title.for.collection": "Chính sách bộ sưu tập",
+  "resource-policies.table.headers.title.for.community": "Chính sách đơn vị",
+  "resource-policies.table.headers.title.for.item": "Chính sách tài liệu",
+  "resource-policies.table.headers.title.for.topic": "Chính sách topic",
+  "search.breadcrumbs": "Tìm kiếm",
+  "search.browse.item-back": "Quay lại kết quả tìm kiếm",
+  "search.filters.applied.f.author": "Tác giả",
+  "search.filters.applied.f.birthDate.max": "Ngày sinh kết thúc",
+  "search.filters.applied.f.birthDate.min": "Ngày sinh bắt đầu",
+  "search.filters.applied.f.dateIssued.max": "Ngày kết thúc",
+  "search.filters.applied.f.dateIssued.min": "Ngày bắt đầu",
+  "search.filters.applied.f.dateSubmitted": "Ngày đăng",
+  "search.filters.applied.f.discoverable": "Tài liệu cá nhân",
+  "search.filters.applied.f.entityType": "Kiểu tài liệu",
+  "search.filters.applied.f.has_content_in_original_bundle": "Có tệp",
+  "search.filters.applied.f.itemtype": "Kiểu",
+  "search.filters.applied.f.jobTitle": "Chức danh",
+  "search.filters.applied.f.namedresourcetype": "Trạng thái",
+  "search.filters.applied.f.subject": "Chủ đề",
+  "search.filters.applied.f.submitter": "Người gửi",
+  "search.filters.applied.f.withdrawn": "Tài liệu ẩn",
+  "search.filters.discoverable.false": "Có",
+  "search.filters.discoverable.true": "Không",
+  "search.filters.entityType.JournalIssue": "Kỳ của tạp chí",
+  "search.filters.entityType.JournalVolume": "Số tập cảu tạp chí",
+  "search.filters.entityType.OrgUnit": "Đơn vị tổ chức",
+  "search.filters.filter.author.head": "Tác giả",
+  "search.filters.filter.author.label": "Tìm kiếm tên tác giả",
+  "search.filters.filter.author.placeholder": "Tên tác giả",
+  "search.filters.filter.birthDate.head": "Ngày sinh",
+  "search.filters.filter.birthDate.label": "Tìm kiếm ngày sinh",
+  "search.filters.filter.birthDate.placeholder": "Ngày sinh",
+  "search.filters.filter.collapse": "Thu hẹp bộ lọc",
+  "search.filters.filter.creativeDatePublished.head": "Ngày xuất bản",
+  "search.filters.filter.creativeDatePublished.label": "Tìm kiếm ngày xuất bản",
+  "search.filters.filter.creativeDatePublished.placeholder": "Ngày xuất bản",
+  "search.filters.filter.creativeWorkEditor.head": "Người biên tập",
+  "search.filters.filter.creativeWorkEditor.label": "Tìm kiếm người biên tập",
+  "search.filters.filter.creativeWorkEditor.placeholder": "Người biên tập",
+  "search.filters.filter.creativeWorkKeywords.head": "Chủ đề",
+  "search.filters.filter.creativeWorkKeywords.label": "Tìm kiếm chủ đề",
+  "search.filters.filter.creativeWorkKeywords.placeholder": "Chủ đề",
+  "search.filters.filter.creativeWorkPublisher.head": "Nhà xuất bản",
+  "search.filters.filter.creativeWorkPublisher.label": "Tìm kiếm nhà xuất bản",
+  "search.filters.filter.creativeWorkPublisher.placeholder": "Nhà xuất bản",
+  "search.filters.filter.dateIssued.head": "Thời gian xuất bản",
+  "search.filters.filter.dateIssued.max.label": "Kết thúc",
+  "search.filters.filter.dateIssued.max.placeholder": "Thời gian tối đa",
+  "search.filters.filter.dateIssued.min.label": "Bắt đầu",
+  "search.filters.filter.dateIssued.min.placeholder": "Thời gian tối thiểu",
+  "search.filters.filter.dateSubmitted.head": "Ngày gửi",
+  "search.filters.filter.dateSubmitted.label": "Tìm kiếm ngày gửi",
+  "search.filters.filter.dateSubmitted.placeholder": "Ngày gửi",
+  "search.filters.filter.discoverable.head": "Tài liệu cá nhân",
+  "search.filters.filter.entityType.head": "Kiểu thực thể",
+  "search.filters.filter.entityType.label": "Tìm kiếm kiểu thực thể",
+  "search.filters.filter.entityType.placeholder": "Kiểu thực thể",
+  "search.filters.filter.expand": "Mở rộng bộ lọc",
+  "search.filters.filter.has_content_in_original_bundle.head": "Có tệp",
+  "search.filters.filter.itemtype.head": "Kiểu tài liệu",
+  "search.filters.filter.itemtype.label": "Tìm kiếm kiểu tài liệu",
+  "search.filters.filter.itemtype.placeholder": "Kiểu tài liệu",
+  "search.filters.filter.jobTitle.head": "Chức danh",
+  "search.filters.filter.jobTitle.label": "Tìm kiếm chức danh",
+  "search.filters.filter.jobTitle.placeholder": "Chức danh",
+  "search.filters.filter.knowsLanguage.head": "Ngôn ngữ",
+  "search.filters.filter.knowsLanguage.label": "Tìm kiếm ngôn ngữ",
+  "search.filters.filter.knowsLanguage.placeholder": "Ngôn ngữ",
+  "search.filters.filter.namedresourcetype.head": "Trạng thái",
+  "search.filters.filter.namedresourcetype.label": "Tìm kiếm trạng thái",
+  "search.filters.filter.namedresourcetype.placeholder": "Trạng thái",
+  "search.filters.filter.objectpeople.head": "Người",
+  "search.filters.filter.objectpeople.label": "Tìm kiếm tên người",
+  "search.filters.filter.objectpeople.placeholder": "Người",
+  "search.filters.filter.organizationAddressCountry.head": "Quốc gia",
+  "search.filters.filter.organizationAddressCountry.label": "Tìm kiếm quốc gia",
+  "search.filters.filter.organizationAddressCountry.placeholder": "Quốc gia",
+  "search.filters.filter.organizationAddressLocality.head": "Thành phố",
+  "search.filters.filter.organizationAddressLocality.label": "Tìm kiếm thành phố",
+  "search.filters.filter.organizationAddressLocality.placeholder": "Thành phố",
+  "search.filters.filter.organizationFoundingDate.head": "Ngày thành lập",
+  "search.filters.filter.organizationFoundingDate.label": "Tìm kiếm ngày thành lập",
+  "search.filters.filter.organizationFoundingDate.placeholder": "Ngày thành lập",
+  "search.filters.filter.scope.head": "Phạm vi",
+  "search.filters.filter.scope.label": "Tìm kiếm phạm vi giới hạn",
+  "search.filters.filter.scope.placeholder": "phạm vi giới hạn",
+  "search.filters.filter.show-less": "Thu hẹp",
+  "search.filters.filter.show-more": "Xem thêm",
+  "search.filters.filter.show-tree": "Duyệt cây {{ name }}",
+  "search.filters.filter.subject.head": "Chủ đề",
+  "search.filters.filter.subject.label": "Tìm kiếm chủ đề",
+  "search.filters.filter.subject.placeholder": "Chủ đề",
+  "search.filters.filter.submitter.head": "Người gửi",
+  "search.filters.filter.submitter.label": "Tìm kiếm người gửi",
+  "search.filters.filter.submitter.placeholder": "Người gửi",
+  "search.filters.filter.withdrawn.head": "Tài liệu ẩn",
+  "search.filters.has_content_in_original_bundle.false": "Không",
+  "search.filters.has_content_in_original_bundle.true": "Có",
+  "search.filters.head": "Bộ lọc",
+  "search.filters.reset": "Làm mới bộ lọc",
+  "search.filters.search.submit": "Xác nhận",
+  "search.filters.withdrawn.false": "Không",
+  "search.filters.withdrawn.true": "Có",
+  "search.form.scope.all": "Toàn bộ thư viện",
+  "search.form.search": "Tìm kiếm",
+  "search.form.search_dspace": "tất cả kho lưu trữ",
+  "search.results.empty": "Tìm kiếm của bạn không trả về kết quả.",
+  "search.results.head": "Kết quả tìm kiếm",
+  "search.results.no-results": "Tìm kiếm của bạn không trả về kết quả. Bạn có gặp khó khăn khi thực hiện tìm kiếm? Hãy thử lại bằng cách",
+  "search.results.no-results-link": "đặt từ khóa tìm vào trong cặp dấu ngoặc kép",
+  "search.results.response.500": "Đã xảy ra lỗi trong khi thực hiện truy vấn vui lòng thử lại sau",
+  "search.results.view-result": "Xem",
+  "search.search-form.placeholder": "Từ khóa tìm kiếm",
+  "search.sidebar.close": "Quay lại kết quả tìm kiếm",
+  "search.sidebar.filters.title": "Bộ lọc",
+  "search.sidebar.open": "Công cụ tìm kiếm",
+  "search.sidebar.results": "kết quả",
+  "search.sidebar.settings.rpp": "Kết quả mỗi trang",
+  "search.sidebar.settings.sort-by": "Sắp xếp theo",
+  "search.sidebar.settings.title": "Cài đặt",
+  "search.switch-configuration.title": "Xem",
+  "search.title": "Tìm kiếm",
+  "search.view-switch.show-detail": "Xem chi tiết",
+  "search.view-switch.show-grid": "Hiển thị dưới dạng lưới",
+  "search.view-switch.show-list": "Hiển thị dưới dạng danh sách",
+  "sorting.ASC": "Tăng dần",
+  "sorting.dc.date.accessioned.ASC": "Tăng dần theo ngày lưu trữ",
+  "sorting.dc.date.accessioned.DESC": "Giảm dần theo ngày lưu trữ",
+  "sorting.dc.date.issued.ASC": "Tăng dần theo ngày",
+  "sorting.dc.date.issued.DESC": "Giảm dần theo ngày",
+  "sorting.dc.title.ASC": "Tăng dần theo nhan đề",
+  "sorting.dc.title.DESC": "Giảm dần theo nhan đề",
+  "sorting.DESC": "Giảm dần",
+  "sorting.lastModified.ASC": "Tăng dần theo lần chỉnh sửa cuối cùng",
+  "sorting.lastModified.DESC": "Giảm dần theo lần chỉnh sửa cuối cùng",
+  "sorting.score.ASC": "Liên quan ít nhất",
+  "sorting.score.DESC": "Liên quan nhiều nhất",
+  "statistics.breadcrumbs": "Thống kê",
+  "statistics.header": "Thống kê theo {{ scope }}",
+  "statistics.page.no-data": "Không có dữ liệu",
+  "statistics.table.header.views": "Xem",
+  "statistics.table.no-data": "Không có dữ liệu",
+  "statistics.table.title.TopCities": "Top thành phố xem nhiều nhất",
+  "statistics.table.title.TopCountries": "Top quốc gia xem nhiều nhất",
+  "statistics.table.title.TotalDownloads": "Truy cập tệp",
+  "statistics.table.title.TotalVisits": "Tổng số truy cập",
+  "statistics.table.title.TotalVisitsPerMonth": "Tổng số lượt truy cập theo từng tháng",
+  "statistics.title": "Thống kê",
+  "submission.edit.breadcrumbs": "Chỉnh sửa đăng ký",
+  "submission.edit.title": "Chỉnh sửa đăng ký",
+  "submission.general.cancel": "Hủy",
+  "submission.general.cannot_submit": "Bạn không có quyền chỉnh sửa đăng ký đã gửi .",
+  "submission.general.deposit": "Tải lên",
+  "submission.general.discard.confirm.cancel": "Hủy",
+  "submission.general.discard.confirm.info": "Không thể hoàn tác thao tác. Bạn có chắc chắn không?",
+  "submission.general.discard.confirm.submit": "Có tôi đồng ý",
+  "submission.general.discard.confirm.title": "Hủy đăng ký",
+  "submission.general.discard.submit": "Hủy",
+  "submission.general.info.pending-changes": "Thay đổi chưa được lưu",
+  "submission.general.info.saved": "Lưu",
+  "submission.general.save": "Lưu",
+  "submission.general.save-later": "Lưu lại",
+  "submission.import-external.back-to-my-dspace": "Trở lại thư viện số",
+  "submission.import-external.page.hint": "Nhập vào một truy vấn phía trên để tìm các tài liệu trên trang web để nhập vào thư viện số",
+  "submission.import-external.page.title": "Nhập thông tin mô tả từ nguồn bên ngoài",
+  "submission.import-external.preview.button.import": "Bắt đầu gửi",
+  "submission.import-external.preview.error.import.body": "Đã xảy ra lỗi trong quá trình nhập tài liệu từ nguồn bên ngoài",
+  "submission.import-external.preview.error.import.title": "Lỗi gửi đi",
+  "submission.import-external.preview.subtitle": "Siêu dữ liệu bên dưới được nhập từ nguồn bên ngoài. Nó sẽ được điền vào trước khi bạn gửi đi.",
+  "submission.import-external.preview.title": "Xem trước tài liệu",
+  "submission.import-external.preview.title.Journal": "Xem trước Tạp chí",
+  "submission.import-external.preview.title.none": "Xem trước tài liệu",
+  "submission.import-external.preview.title.OrgUnit": "Xem trước tổ chức",
+  "submission.import-external.preview.title.Person": "Xem trước Tác giả/nhà nghiên cứu",
+  "submission.import-external.preview.title.Project": "Xem trước dự án",
+  "submission.import-external.preview.title.Publication": "Xem trước ấn phẩm",
+  "submission.import-external.search.button": "Tìm kiếm",
+  "submission.import-external.search.button.hint": "Nhập một từ để tìm kiếm",
+  "submission.import-external.search.placeholder": "Tìm kiếm nguồn bên ngoài",
+  "submission.import-external.search.source.hint": "Chọn một nguồn bên ngoài",
+  "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.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",
+  "submission.import-external.source.loading": "Đang tải lên ...",
+  "submission.import-external.source.openAIREFunding": "Funding OpenAIRE API",
+  "submission.import-external.source.orcid": "ORCID",
+  "submission.import-external.source.orcidWorks": "ORCID",
+  "submission.import-external.source.pubmed": "Pubmed",
+  "submission.import-external.source.pubmedeu": "Pubmed Europe",
+  "submission.import-external.source.scielo": "SciELO",
+  "submission.import-external.source.scopus": "SciELO",
+  "submission.import-external.source.sherpaJournal": "Tạp chí SHERPA",
+  "submission.import-external.source.sherpaJournalIssn": "Số ISSN của tạp chí SHERPA",
+  "submission.import-external.source.sherpaPublisher": "Nhà xuất bản SHERPA",
+  "submission.import-external.source.vufind": "VuFind",
+  "submission.import-external.source.wos": "Web Of Science",
+  "submission.import-external.title": "Nhập thông tin mô tả từ nguồn bên ngoài",
+  "submission.import-external.title.Journal": "Nhập tạp chí từ nguồn bên ngoài",
+  "submission.import-external.title.JournalIssue": "Nhập kỳ ấn phẩm tạp chí từ nguồn bên ngoài",
+  "submission.import-external.title.JournalVolume": "Nhập một tập của tạp chí từ nguồn bên ngoài",
+  "submission.import-external.title.none": "Nhập thông tin mô tả từ nguồn bên ngoài",
+  "submission.import-external.title.OrgUnit": "Nhập nhà xuất bản từ nguồn bên ngoài",
+  "submission.import-external.title.Person": "Nhập một tác giả/ nhà nghiên cứu từ nguồn bên ngoài",
+  "submission.import-external.title.Project": "Nhập một dự án từ nguồn bên ngoài",
+  "submission.import-external.title.Publication": "Nhập một ấn phẩm từ nguồn bên ngoài",
+  "submission.sections.accesses.form.access-condition-hint": "Chọn chính sách phân quyền để áp dụng cho biểu ghi khi nó được nhập vào hệ thống.",
+  "submission.sections.accesses.form.access-condition-label": "Loại chính sách truy cập",
+  "submission.sections.accesses.form.date-required": "Thông tin thời gian là bắt buộc.",
+  "submission.sections.accesses.form.date-required-from": "Bắt buộc phải khai báo thời gian để xác định ngày bắt đầu cấp quyền truy cập",
+  "submission.sections.accesses.form.date-required-until": "Bắt buộc phải khai báo thời gian để xác định ngày bắt đầu cấp quyền truy cập",
+  "submission.sections.accesses.form.discoverable-description": "Khi được chọn biểu ghi này sẽ có thể được tìm thấy trong các chức năng tìm kiếm/duyệt. Khi bỏ chọn biểu ghi sẽ chỉ có sẵn qua đường dẫn trực tiếp và sẽ không bao giờ xuất hiện trong tìm kiếm/duyệt.",
+  "submission.sections.accesses.form.discoverable-label": "Có thể khám phá",
+  "submission.sections.accesses.form.from-hint": "Chọn ngày mà quyền được áp dụng",
+  "submission.sections.accesses.form.from-label": "Cấp quyền truy cập từ",
+  "submission.sections.accesses.form.from-placeholder": "Từ",
+  "submission.sections.accesses.form.group-label": "Nhóm",
+  "submission.sections.accesses.form.group-required": "Trường Nhóm là bắt buộc.",
+  "submission.sections.accesses.form.until-hint": "Chọn ngày mà quyền được áp dụng",
+  "submission.sections.accesses.form.until-label": "Cấp quyền truy cập cho đến khi",
+  "submission.sections.accesses.form.until-placeholder": "Cho tới khi",
+  "submission.sections.ccLicense.change": "Thay đổi loại giấy phép…",
+  "submission.sections.ccLicense.confirmation": "Tôi đồng ý với giấy phép ở trên",
+  "submission.sections.ccLicense.link": "Bạn có lựa chọn theo giấy phép này:",
+  "submission.sections.ccLicense.none": "Không có giấy phép nào",
+  "submission.sections.ccLicense.option.select": "Lựa chọn tùy chọn…",
+  "submission.sections.ccLicense.select": "Lựa chọn loại giấy phép…",
+  "submission.sections.ccLicense.type": "Loại giấy phép",
+  "submission.sections.describe.relationship-lookup.close": "Đóng",
+  "submission.sections.describe.relationship-lookup.external-source.added": "Thêm thành công tài liệu nội bộ vào mục đã chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Equipment": "Nhập thiết bị từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Event": "Nhập sự kiện từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Funding": "Nhập sự kiện từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isAuthorOfPublication": "Nhập tác giả từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.isProjectOfPublication": "Dự án",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Journal": "Nhập tạp chí từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.JournalIssue": "Nhập số kỳ của tạp chí từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.JournalVolume": "Nhập số tập của tạp chí từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.none": "Nhập tài liệu từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.OrgUnit": "Nhập tổ chức từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Patent": "Nhập bằng sáng chế từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Person": "Nhập tác giả/ nhà nghiên cứu từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Product": "Nhập tác giả/ nhà nghiên cứu từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Project": "Nhập dự án từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-button-title.Publication": "Nhập ấn phẩm từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority": "Kiểm soát",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.authority.new": "Nhập dưới dạng một kiểm soát nội bộ mới",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.cancel": "Hủy",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.collection": "Chọn một bộ sưu tập để thêm các tài liệu mới",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities": "Thực thể",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.entities.new": "Nhập vào một thực thể nội bộ mới",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.arxiv": "Nhập từ arXiv",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.lcname": "Nhập từ tên LC",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.orcid": "Nhập từ ORCID",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.pubmed": "Nhập từ PubMed",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaJournal": "Nhập từ tạp chí Sherpa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.head.sherpaPublisher": "Nhập từ nhà xuất bản Sherpa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.import": "Nhập liệu",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.local-entity": "Thêm thành công tác giả nội bộ bộ vào mục đã chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.added.new-entity": "Nhập thành công và thêm tác giả bên ngoài vào mục đã chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isAuthorOfPublication.title": "Nhập tác giả từ cơ sở dữ liệu từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.added.new-entity": "Thực thể mới đã được thêm!",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.isProjectOfPublication.title": "Dự án",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.local-entity": "Thêm thành công tạp chí đã chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.added.new-entity": "Nhập thành công tạp chí bên ngoài vào mục lựa chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.Journal.title": "Nhập tạp chí từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.JournalIssue.added.local-entity": "Thêm thành công số kỳ tạp chí nội bộ vào mục lựa chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.JournalIssue.added.new-entity": "Nhập thành công và thêm số kỳ của tạp chí bên ngoài vào mục lựa chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.JournalIssue.title": "Nhập số kỳ của tạp chí từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.JournalVolume.added.local-entity": "Thêm thành công số tập của tạp chí nội bộ vào mục lựa chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.JournalVolume.added.new-entity": "Nhập và thêm thành công số tập của tạp chí bên ngoài vào mục lựa chọn",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.JournalVolume.title": "Nhập số tập của tạp chí từ xa",
+  "submission.sections.describe.relationship-lookup.external-source.import-modal.select": "Chọn một phù hợp:",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Lưu một biến thể tên mới",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.content": "Bạn có muốn lưu \"{{ value }}\" làm tên biến thể cho người này để bạn và những người khác có thể sử dụng lại cho những lần gửi sau không? Nếu không bạn vẫn có thể sử dụng cho lần gửi này\"",
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Chỉ sử dụng cho lần gửi này",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Bỏ chọn tất cả",
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Bỏ chọn trang",
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Đang tải...",
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Tìm kiếm truy vấn",
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Đi",
+  "submission.sections.describe.relationship-lookup.search-tab.search-form.placeholder": "Tìm kiếm...",
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Lựa chọn tất cả",
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Lựa chọn trang",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.arxiv": "arXiv ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataFile": "Tệp dữ liệu nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.DataPackage": "Gói dữ liệu nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isAuthorOfPublication": "Tác giả nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isChildOrgUnitOf": "Tìm kiếm đơn vị tổ chức",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfProject": "Nhà tài trợ của dự án",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingAgencyOfPublication": "Tìm kiếm cơ quan cấp vốn",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isFundingOfPublication": "Tìm kiếm tài trợ",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalIssueOfPublication": "Số kỳ của tạp chí nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalOfPublication": "Tạp chí nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isJournalVolumeOfPublication": "Số tập của tạp chí nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isProjectOfPublication": "Dự án",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.isPublicationOfAuthor": "Ấn phẩm của tác giả",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Tạp chí nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalIssue": "Số kỳ của tạp chsi nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.JournalVolume": "Số tập của tạp chí nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "Tên LC  ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcid": "ORCID ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.OrgUnit": "Đơn vị tổ chức nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Person": "Tác giả nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Project": "Dự án nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Publication": "Ấn phẩm nội bộ ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.pubmed": "PubMed ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Tạp chí Sherpa ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Nhà xuất bản Sherpa  ({{ count }})",
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Chuyển đổi danh mục thả xuống",
+  "submission.sections.describe.relationship-lookup.selected": "Lựa chọn {{ size }} tài liệu",
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Lựa chọn  cảu bạn hiện đang trống.",
+  "submission.sections.describe.relationship-lookup.selection-tab.search-form.placeholder": "Tìm kiếm...",
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Cài đặt",
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Lựa chọn hiện tại ({{ count }})",
+  "submission.sections.describe.relationship-lookup.selection-tab.title": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.arxiv": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.crossref": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataFile": "Lựa chọn tệp dữ liệu",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.DataPackage": "Lựa chọn gói dữ liệu",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.epo": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isAuthorOfPublication": "Lựa chọn tác giả.",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isChildOrgUnitOf": "Lựa chọn đơn vị tổ chức",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingAgencyOfPublication": "Lựa chọn đơn vị tổ chức",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isFundingOfPublication": "Lựa chọn tài trợ",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalIssueOfPublication": "Lựa chọn kỳ của tạp chí",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalOfPublication": "Lựa chọn tạp chí",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isJournalVolumeOfPublication": "Lựa chọn số tập của tạp chí",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.isProjectOfPublication": "Dự án",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Lựa chọn tạp chí",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalIssue": "Lựa chọn số kỳ của tạp chí",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.JournalVolume": "Lựa chọn số tập của tạp chí",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.openAIREFunding": "Funding OpenAIRE API",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcid": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidv2": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.OrgUnit": "Lựa chọn đơn vị tổ chức",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Person": "Lựa chọn tác giả",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Project": "Lựa chọn dự án",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Publication": "Lựa chọn ấn phẩm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.pubmed": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scielo": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.scopus": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Lựa chọn kết quả",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.selection-tab.title.wos": "Kết quả tìm kiếm",
+  "submission.sections.describe.relationship-lookup.title.DataFile": "Tệp dữ liệu",
+  "submission.sections.describe.relationship-lookup.title.DataPackage": "Gói dữ liệu",
+  "submission.sections.describe.relationship-lookup.title.FundingAgency": "Đơn vị tài trợ",
+  "submission.sections.describe.relationship-lookup.title.isAuthorOfPublication": "Tác giả",
+  "submission.sections.describe.relationship-lookup.title.isChildOrgUnitOf": "Đơn vị tổ chức chính",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfProject": "Nhà tài trợ của dự án",
+  "submission.sections.describe.relationship-lookup.title.isFundingAgencyOfPublication": "Đơn vị tài trợ",
+  "submission.sections.describe.relationship-lookup.title.isFundingOfPublication": "Tài trợ",
+  "submission.sections.describe.relationship-lookup.title.isJournalIssueOfPublication": "Số kỳ của tạp chí",
+  "submission.sections.describe.relationship-lookup.title.isJournalOfPublication": "Tạp chí",
+  "submission.sections.describe.relationship-lookup.title.isJournalVolumeOfPublication": "Số tập cảu tạp chí",
+  "submission.sections.describe.relationship-lookup.title.isProjectOfPublication": "Dự án",
+  "submission.sections.describe.relationship-lookup.title.isPublicationOfAuthor": "Ấn phẩm",
+  "submission.sections.describe.relationship-lookup.title.JournalIssue": "Số kỳ của tạp chí",
+  "submission.sections.describe.relationship-lookup.title.JournalVolume": "Số tập của tạp chí",
+  "submission.sections.describe.relationship-lookup.title.OrgUnit": "Đơn vị tổ chức",
+  "submission.sections.describe.relationship-lookup.title.Person": "Tác giả",
+  "submission.sections.describe.relationship-lookup.title.Project": "Dự án",
+  "submission.sections.describe.relationship-lookup.title.Publication": "Ấn phẩm",
+  "submission.sections.general.add-more": "Thêm nhiều hơn",
+  "submission.sections.general.cannot_deposit": "Không thể hoàn tất quá trình nhập dữ liệu do lỗi trong biểu mẫu.<br>Vui lòng điền vào tất cả các trường bắt buộc để hoàn tất quá trình nhập liệu.",
+  "submission.sections.general.collection": "Bộ sưu tập",
+  "submission.sections.general.deposit_error_notice": "Đã xảy ra sự cố khi gửi tài liệu vui lòng thử lại sau.",
+  "submission.sections.general.deposit_success_notice": "Đã gửi thành công.",
+  "submission.sections.general.discard_error_notice": "Đã xảy ra sự cố khi hủy tài liệu vui lòng thử lại sau.",
+  "submission.sections.general.discard_success_notice": "Đã hủy thành công.",
+  "submission.sections.general.metadata-extracted": "Siêu dữ liệu mới đã được trích xuất và thêm vào phần <strong>{{sectionId}}</strong> phần.",
+  "submission.sections.general.metadata-extracted-new-section": " <strong>{{sectionId}}</strong> mới phần đã được thêm vào thông tin gửi đi.",
+  "submission.sections.general.no-collection": "Không tìm thấy bộ sưu tập",
+  "submission.sections.general.no-sections": "Không có tùy chọn",
+  "submission.sections.general.save_error_notice": "Đã xảy ra sự cố khi lưu tài liệu vui lòng thử lại sau.",
+  "submission.sections.general.save_success_notice": "Lưu thành công.",
+  "submission.sections.general.search-collection": "Tìm kiếm bộ sưu tập",
+  "submission.sections.general.sections_not_valid": "Không có phần nào hoàn thành.",
+  "submission.sections.license.granted-label": "Xác nhận giấy phép",
+  "submission.sections.license.notgranted": "Bạn phải chấp nhận giấy phép",
+  "submission.sections.license.required": "Bạn phải chấp nhận giấy phép",
+  "submission.sections.sherpa.error.message": "Đã xảy ra lỗi trong quá trình truy xuất thông tin",
+  "submission.sections.sherpa.publication.information": "Thông tin ấn phẩm",
+  "submission.sections.sherpa.publication.information.issns": "ISSNs",
+  "submission.sections.sherpa.publication.information.publishers": "Nhà xuất bản",
+  "submission.sections.sherpa.publication.information.romeoPub": "Romeo Pub",
+  "submission.sections.sherpa.publication.information.title": "Nhan đề",
+  "submission.sections.sherpa.publication.information.url": "URL",
+  "submission.sections.sherpa.publication.information.zetoPub": "Zeto Pub",
+  "submission.sections.sherpa.publisher.policy": "Chính sách của nhà xuất bản",
+  "submission.sections.sherpa.publisher.policy.conditions": "Điều kiện",
+  "submission.sections.sherpa.publisher.policy.description": "Thông tin dưới đây được tìm thấy thông qua Sherpa Romeo. Dựa trên các chính sách của nhà xuất bản của bạn hệ thống sẽ đưa ra lời khuyên về việc có cần thiết phải hạn chế hay không và/hoặc những tệp nào mà bạn được phép tải lên. Nếu bạn có thắc mắc vui lòng liên hệ với quản trị viên.",
+  "submission.sections.sherpa.publisher.policy.embargo": "Hạn chế",
+  "submission.sections.sherpa.publisher.policy.license": "Bản quyền",
+  "submission.sections.sherpa.publisher.policy.location": "Vị trí",
+  "submission.sections.sherpa.publisher.policy.more.information": "Để biết thêm thông tin vui lòng xem đường dẫn dưới đây:",
+  "submission.sections.sherpa.publisher.policy.noembargo": "Không hạn chế",
+  "submission.sections.sherpa.publisher.policy.nolocation": "Trống",
+  "submission.sections.sherpa.publisher.policy.openaccess": "Các đường dẫn truy cập mở được cho phép bởi chính sách của tạp chí này được liệt kê bên dưới theo phiên bản bài viết. Nhấp vào một đường dẫn để xem chi tiết",
+  "submission.sections.sherpa.publisher.policy.prerequisites": "Điều kiện cần",
+  "submission.sections.sherpa.publisher.policy.refresh": "Làm mới",
+  "submission.sections.sherpa.publisher.policy.version": "Phiên bản",
+  "submission.sections.sherpa.record.information": "Thông tin biểu ghi",
+  "submission.sections.sherpa.record.information.date.created": "Ngày tạo",
+  "submission.sections.sherpa.record.information.date.modified": "Lần chỉnh sửa gần nhất",
+  "submission.sections.sherpa.record.information.id": "ID",
+  "submission.sections.sherpa.record.information.uri": "URL",
+  "submission.sections.sherpa-policy.title-empty": "Không có chính sách của nhà xuất bản. Nếu tác phẩm của bạn có ISSN liên quan vui lòng nhập nó ở trên để xem các chính sách truy cập mở của nhà xuất bản (nếu có)",
+  "submission.sections.status.errors.aria": "có lỗi",
+  "submission.sections.status.errors.title": "Lỗi",
+  "submission.sections.status.info.aria": "Thông tin bổ sung",
+  "submission.sections.status.info.title": "Thông tin bổ sung",
+  "submission.sections.status.valid.aria": "là hợp lệ",
+  "submission.sections.status.valid.title": "Hợp lệ",
+  "submission.sections.status.warnings.aria": "có cảnh báo",
+  "submission.sections.status.warnings.title": "Cảnh báo",
+  "submission.sections.submit.progressbar.accessCondition": "Điều kiện truy cập biểu ghi",
+  "submission.sections.submit.progressbar.CClicense": "Bằng sáng chế",
+  "submission.sections.submit.progressbar.describe.recycle": "Tái chế",
+  "submission.sections.submit.progressbar.describe.stepcustom": "Mô tả",
+  "submission.sections.submit.progressbar.describe.stepone": "Mô tả",
+  "submission.sections.submit.progressbar.describe.steptwo": "Mô tả",
+  "submission.sections.submit.progressbar.detect-duplicate": "Các trùng lặp xảy ra",
+  "submission.sections.submit.progressbar.license": "Giấy phép tiền gửi",
+  "submission.sections.submit.progressbar.sherpaPolicies": "Chính sách truy cập mở của nhà xuất bản",
+  "submission.sections.submit.progressbar.sherpapolicy": "Chính sách",
+  "submission.sections.submit.progressbar.upload": "Tải tệp lên",
+  "submission.sections.toggle.aria.close": "Thu hẹp phần {{sectionHeader}}",
+  "submission.sections.toggle.aria.open": "Mở rộng phần {{sectionHeader}}",
+  "submission.sections.toggle.close": "Đóng phiên",
+  "submission.sections.toggle.open": "Mở phiên mới",
+  "submission.sections.upload.delete.confirm.cancel": "Hủy",
+  "submission.sections.upload.delete.confirm.info": "Không thể hoàn tác thao tác này. Bạn có chắc không?",
+  "submission.sections.upload.delete.confirm.submit": "Có tôi chắc chắn",
+  "submission.sections.upload.delete.confirm.title": "Xóa dữ liệu số",
+  "submission.sections.upload.delete.submit": "Xóa",
+  "submission.sections.upload.download.title": "Tải dữ liệu số",
+  "submission.sections.upload.drop-message": "Kéo tệp đính kèm vào tài liệu",
+  "submission.sections.upload.edit.title": "Chỉnh sửa dữ liệu số",
+  "submission.sections.upload.form.access-condition-hint": "Chọn quyền truy cập áp dụng trên tệp tin khi biểu ghi được biên mục vào hệ thống.",
+  "submission.sections.upload.form.access-condition-label": "Loại điều kiện truy cập",
+  "submission.sections.upload.form.date-required": "Ngày yêu cầu",
+  "submission.sections.upload.form.date-required-from": "Bắt buộc phải khai báo thời gian để xác định ngày bắt đầu cấp quyền truy cập",
+  "submission.sections.upload.form.date-required-until": "Bắt buộc phải khai báo thời gian để xác định ngày kết thúc cấp quyền truy cập",
+  "submission.sections.upload.form.from-hint": "Chọn ngày mà quyền được áp dụng",
+  "submission.sections.upload.form.from-label": "Cấp quyền truy cập từ",
+  "submission.sections.upload.form.from-placeholder": "Từ",
+  "submission.sections.upload.form.group-label": "Nhóm",
+  "submission.sections.upload.form.group-required": "Nhóm yêu cầu.",
+  "submission.sections.upload.form.until-hint": "Chọn ngày hết hạn quyền truy cập",
+  "submission.sections.upload.form.until-label": "Cấp quyền truy cập cho đến khi",
+  "submission.sections.upload.form.until-placeholder": "Đến khi",
+  "submission.sections.upload.header.policy.default.nolist": "Các tệp tải lên trong bộ sưu tập {{collectionName}} sẽ cso quyền truy cập thep các nhóm sau:",
+  "submission.sections.upload.header.policy.default.withlist": "Xin lưu ý rằng các tệp đã tải lên trong bộ sưu tập {{collectionName}} sẽ có thể truy cập được ngoài những gì được quyết định rõ ràng cho một tệp với (các) nhóm sau:",
+  "submission.sections.upload.info": "Tại đây bạn sẽ tìm thấy tất cả các tệp hiện có trong tài liệu. Bạn có thể cập nhật thông tin mô tả tệp và điều kiện truy cập hoặc <strong>tải lên tệp bổ sung chỉ cần kéo và thả chúng ở mọi nơi trong trang</strong>",
+  "submission.sections.upload.no-entry": "Không",
+  "submission.sections.upload.no-file-uploaded": "Không có tệp tải lên.",
+  "submission.sections.upload.save-metadata": "Lưu thông tin mô tả",
+  "submission.sections.upload.undo": "Hủy",
+  "submission.sections.upload.upload-failed": "Tải lên lỗi",
+  "submission.sections.upload.upload-successful": "Tải lên thành công",
+  "submission.submit.breadcrumbs": "Gửi mới",
+  "submission.submit.title": "Gửi mới",
+  "submission.workflow.generic.delete": "Xóa",
+  "submission.workflow.generic.delete-help": "Nếu bạn muốn hủy tài liệu này hãy chọn \"Delete\". Sau đó bạn sẽ được yêu cầu xác nhận.\"",
+  "submission.workflow.generic.edit": "Chỉnh sửa",
+  "submission.workflow.generic.edit-help": "Chọn tùy chọn này để thay đổi thông tin mô tả của tài liệu.",
+  "submission.workflow.generic.view": "Xem",
+  "submission.workflow.generic.view-help": "Chọn tùy chọn này để xem dữ liệu cảu tài liệu.",
+  "submission.workflow.tasks.claimed.approve": "Chấp nhận",
+  "submission.workflow.tasks.claimed.approve_help": "Nếu bạn đã xem xét tài liệu và thấy phù hợp để đưa vào bộ sưu tập hãy chọn \"Approve\".",
+  "submission.workflow.tasks.claimed.edit": "Chỉnh sửa",
+  "submission.workflow.tasks.claimed.edit_help": "Chọn tùy chọn này để thay đổi thông tin mô tả của tài liệu.",
+  "submission.workflow.tasks.claimed.reject.reason.info": "Vui lòng nhập lý do từ chối gửi của bạn vào ô bên dưới cho biết liệu người gửi có thể khắc phục sự cố và gửi lại hay không.",
+  "submission.workflow.tasks.claimed.reject.reason.placeholder": "Mô tả lý do từ chối",
+  "submission.workflow.tasks.claimed.reject.reason.submit": "Từ chối tài liệu",
+  "submission.workflow.tasks.claimed.reject.reason.title": "Lý do",
+  "submission.workflow.tasks.claimed.reject.submit": "Từ chối",
+  "submission.workflow.tasks.claimed.reject_help": "Nếu bạn đã xem xét tài liệu và thấy  <strong>không</strong> phù hợp để đưa vào bộ sưu tập hãy chọn \"Reject\". Sau đó bạn sẽ được yêu cầu nhập một thông báo cho biết lý do tại sao tài liệu đó không phù hợp và liệu người gửi có nên thay đổi điều gì đó và gửi lại hay không.",
+  "submission.workflow.tasks.claimed.return": "Trả lại nhiệm vụ",
+  "submission.workflow.tasks.claimed.return_help": "Trả tác vụ về nhóm để người dùng khác có thể thực hiện tác vụ.",
+  "submission.workflow.tasks.generic.error": "Đã xảy ra lỗi trong khi vận hành ...",
+  "submission.workflow.tasks.generic.processing": "Đang xử lý...",
+  "submission.workflow.tasks.generic.submitter": "Người gửi",
+  "submission.workflow.tasks.generic.success": "Hoạt động thành công",
+  "submission.workflow.tasks.pool.claim": "Nhận nhiệm vụ",
+  "submission.workflow.tasks.pool.claim_help": "Giao nhiệm vụ này cho chính bạn.",
+  "submission.workflow.tasks.pool.hide-detail": "Ẩn chi tiết",
+  "submission.workflow.tasks.pool.show-detail": "Xem chi tiết",
+  "submission.workspace.generic.view": "Xem",
+  "submission.workspace.generic.view-help": "Chọn tủy chọn để xem thông tin mô tả của tài liệu",
+  "thumbnail.default.alt": "Hình ảnh thu nhỏ",
+  "thumbnail.default.placeholder": "Không có ảnh thu nhỏ nào",
+  "thumbnail.orgunit.alt": "Logo Đơn vị tổ chức",
+  "thumbnail.orgunit.placeholder": "Hỉnh ảnh giữ chỗ của đơn vị tổ chức",
+  "thumbnail.person.alt": "Ảnh hồ sơ",
+  "thumbnail.person.placeholder": "Không có ảnh hồ sơ nào",
+  "thumbnail.project.alt": "Logo dự án",
+  "thumbnail.project.placeholder": "Hình ảnh giữ chỗ của dự án",
+  "title": "DSpace",
+  "vocabulary-treeview.header": "Chế độ xem phân cấp",
+  "vocabulary-treeview.info": "Chọn một chủ đề để thêm làm bộ lọc tìm kiếm",
+  "vocabulary-treeview.load-more": "Xem thêm",
+  "vocabulary-treeview.search.form.reset": "Khôi phục",
+  "vocabulary-treeview.search.form.search": "Tìm kiếm",
+  "vocabulary-treeview.search.no-result": "Không có tài liệu nào hiển thị",
+  "vocabulary-treeview.tree.description.nsi": "Chỉ số Norwegian Science",
+  "vocabulary-treeview.tree.description.srsc": "Danh mục chủ đề",
+  "uploader.browse": "duyệt",
+  "uploader.delete.btn-title": "Xóa",
+  "uploader.drag-message": "Kéo & thả tệp tại đây",
+  "uploader.processing": "Đang xử lý",
+  "uploader.queue-length": "Chiều dài hàng đợi",
+  "virtual-metadata.delete-item.info": "Chọn kiểu mà bạn muốn lưu thông tin mô tả ảo làm thông tin mô tả thực",
+  "virtual-metadata.delete-item.modal-head": "Siêu dữ liệu ảo của mối quan hệ này",
+  "virtual-metadata.delete-relationship.modal-head": "Chọn các tài liệu mà bạn muốn lưu thông tin mô tả ảo làm thông tin mô tả thực",
+  "supervisedWorkspace.search.results.head": "Supervised Items",
+  "workflow.search.results.head": "Tất cả nhiệm vụ",
+  "workflowAdmin.search.results.head": "Tiến trình làm việc của quản trị viên",
+  "workflow-item.delete.button.cancel": "Hủy",
+  "workflow-item.delete.button.confirm": "Xóa",
+  "workflow-item.delete.header": "Xóa tiến trình tài liệu",
+  "workflow-item.delete.notification.error.content": "Không thể xóa tiến trình  tài liệu",
+  "workflow-item.delete.notification.error.title": "Đã xảy ra lỗi",
+  "workflow-item.delete.notification.success.content": " Tiến trình tài liệu này đã được xóa thành công",
+  "workflow-item.delete.notification.success.title": "Xóa",
+  "workflow-item.delete.title": "Xóa tiến trình tài liệu",
+  "workflow-item.edit.breadcrumbs": "Chỉnh sửa tiến trình tài liệu",
+  "workflow-item.edit.title": "Xem tiến trình tài liệu",
+  "workflow-item.send-back.button.cancel": "Hủy",
+  "workflow-item.send-back.button.confirm": "Gửi lại",
+  "workflow-item.send-back.header": "Gửi lại tiến trình tài liệucho người gửi",
+  "workflow-item.send-back.notification.error.content": "Không thể gửi lại tiến trình tài liệu cho người gửi",
+  "workflow-item.send-back.notification.error.title": "Đã xảy ra lỗi",
+  "workflow-item.send-back.notification.success.content": "Tiến trình tài liệu này đã được gửi lại thành công cho người gửi",
+  "workflow-item.send-back.notification.success.title": "Đã gửi lại cho người gửi",
+  "workflow-item.send-back.title": "Gửi lại tiến trình tài liệu cho người gửi",
+  "workflow-item.view.breadcrumbs": "Xem tiến trình",
+  "workspace.search.results.head": "Biểu ghi bạn đã tải lên",
+  "workspace-item.view.breadcrumbs": "Xem các tài liệu đang biên mục dở dang",
+  "workspace-item.view.title": "Xem các tài liệu đang biên mục dở dang",
+  "idle-modal.extend-session": "Gia hạn phiên",
+  "idle-modal.header": "Phiên sẽ sớm hết hạn",
+  "idle-modal.info": "Vì lý do bảo mật các phiên của người dùng sẽ hết hạn sau {{timeToExpire}} phút không hoạt động. Phiên của bạn sẽ sớm hết hạn. Bạn muốn gia hạn hay đăng xuất?",
+  "idle-modal.log-out": "Đăng xuất",
+  "researcher.profile.action.processing": "Đang xử lý…",
+  "researcher.profile.associated": "Hồ sơ nhà nghiên cứu đã được liên kết",
+  "researcher.profile.change-visibility.fail": "Đã xảy ra lỗi khi thay đổi chế độ hiển thị hồ sơ",
+  "researcher.profile.create.fail": "Đã có lỗi xảy ra trong khi tạo hồ sơ nhà nghiên cứu",
+  "researcher.profile.create.new": "Tạo mới",
+  "researcher.profile.create.success": "Đã tạo thành công hồ sơ nhà nghiên cứu",
+  "researcher.profile.delete": "Xóa",
+  "researcher.profile.expose": "Hiển thị",
+  "researcher.profile.hide": "Ẩn",
+  "researcher.profile.not.associated": "Hồ sơ nhà nghiên cứu chưa được liên kết",
+  "researcher.profile.private.visibility": "CÁ NHÂN",
+  "researcher.profile.public.visibility": "CÔNG CỘNG",
+  "researcher.profile.status": "Trạng thái:",
+  "researcher.profile.view": "Xem",
+  "person.page.orcid": "ORCID",
+  "person.page.orcid.create": "Tạo một ID trên ORCID",
+  "person.page.orcid.funding-preferences": "Quỹ ưa thích",
+  "person.page.orcid.grant-authorizations": "Cấp quyền",
+  "person.page.orcid.granted-authorizations": "Quyền đã cấp",
+  "person.page.orcid.link": "Liên kết với ID ORCID",
+  "person.page.orcid.link.error.message": "Đã xảy ra lỗi khi kết nối hồ sơ với ORCID. Nếu sự cố vẫn tiếp tục xảy ra vui lòng liên hệ với quản trị viên.",
+  "person.page.orcid.link.processing": "Đang kết nối hồ sơ tới ORCID…",
+  "person.page.orcid.missing-authorizations": "Thiếu quyền",
+  "person.page.orcid.missing-authorizations-message": "Những quyền sau đang bị thiếu:",
+  "person.page.orcid.no-missing-authorizations-message": "Tuyệt! Ô này đang trống vì vậy bạn đã được cấp tất cả các quyền truy cập để sử dụng tất cả các chức năng do tổ chức của bạn cung cấp.",
+  "person.page.orcid.no-orcid-message": "Chưa có ID ORCID nào được liên kết. Bạn có thể click vào nút dưới đây để liên kết hồ sơ này với một tài khoản ORCID.",
+  "person.page.orcid.orcid-not-linked-message": "ID ORCID của hồ sơ này ({{ orcid }}) chưa được kết nối với tài khoản trên trang ORCID hoặc kết nối đã hết hạn.",
+  "person.page.orcid.profile-preferences": "Tham số của hồ sơ",
+  "person.page.orcid.publications-preferences": "Tham số của ấn phẩm",
+  "person.page.orcid.remove-orcid-message": "Nếu bạn cần xóa ORCID của bạn vui lòng liên hệ với quản trị viên.",
+  "person.page.orcid.save.preference.changes": "Cập nhật cài đặt",
+  "person.page.orcid.scope.activities-update": "Thêm/cập nhật các hoạt động nghiên cứu của bạn",
+  "person.page.orcid.scope.authenticate": "Lấy ID ORCID của bạn",
+  "person.page.orcid.scope.person-update": "Thêm/cập nhật thông tin cá nhân của bạn",
+  "person.page.orcid.scope.read-limited": "Thiết lập để cho phép Các bên Tin cậy (Trusted Parties) có khả năng đọc thông tin của bạn ",
+  "person.page.orcid.sync-fundings.all": "Tất cả quỹ",
+  "person.page.orcid.sync-fundings.disabled": "Đã ngừng kích hoạt",
+  "person.page.orcid.sync-fundings.mine": "Quỹ của tôi",
+  "person.page.orcid.sync-fundings.my_selected": "Quỹ đã chọn",
+  "person.page.orcid.synchronization-mode": "Chế độ đồng bộ",
+  "person.page.orcid.synchronization-mode.batch": "Theo lô",
+  "person.page.orcid.synchronization-mode.label": "Chế độ đồng bộ",
+  "person.page.orcid.synchronization-mode.manual": "Thủ công",
+  "person.page.orcid.synchronization-mode-funding-message": "Chọn gửi/không gửi các thực thể dự án của bạn đến danh sách các quỹ tài trợ trong bản ghi ORCID của bạn hay không.",
+  "person.page.orcid.synchronization-mode-message": "Vui lòng chọn phương thức đồng bộ hóa với ORCID. Các tùy chọn bao gồm \"Thủ công\" (bạn phải gửi dữ liệu của mình tới ORCID theo cách thủ công) hoặc \"Tự động\" (hệ thống sẽ gửi dữ liệu của bạn tới ORCID thông qua tập lệnh đã lên lịch).",
+  "person.page.orcid.synchronization-mode-profile-message": "Chọn gửi/ không gửi thông tin tiểu sử hoặc số định danh cá nhân tới hồ sơ ORCID của bạn.",
+  "person.page.orcid.synchronization-mode-publication-message": "Chọn gửi/ không gửi các thực thể Ấn phẩm tới danh sách các tác phẩm trong biểu ghi ORCID của bạn.",
+  "person.page.orcid.synchronization-settings-update.error": "Cập nhật cài đặt  đồng bộ hóa không thành công",
+  "person.page.orcid.synchronization-settings-update.success": "Cài đặt đồng bộ hóa đã được cập nhật thành công",
+  "person.page.orcid.sync-profile.affiliation": "Tổ chức",
+  "person.page.orcid.sync-profile.biographical": "Dữ liệu sinh trắc học",
+  "person.page.orcid.sync-profile.education": "Giáo dục",
+  "person.page.orcid.sync-profile.identifiers": "Định danh",
+  "person.page.orcid.sync-publications.all": "Tất cả ấn phẩm",
+  "person.page.orcid.sync-publications.disabled": "Đã ngừng kích hoạt",
+  "person.page.orcid.sync-publications.mine": "Ấn phẩm của tôi",
+  "person.page.orcid.sync-publications.my_selected": "Ấn phẩm đã chọn",
+  "person.page.orcid.sync-queue.description.affiliation": "Tổ chức",
+  "person.page.orcid.sync-queue.description.country": "Quốc gia",
+  "person.page.orcid.sync-queue.description.education": "Giáo dục",
+  "person.page.orcid.sync-queue.description.external_ids": "ID ngoài",
+  "person.page.orcid.sync-queue.description.keywords": "Từ khóa",
+  "person.page.orcid.sync-queue.description.other_names": "Tên khác",
+  "person.page.orcid.sync-queue.description.qualification": "Trình độ chuyên môn",
+  "person.page.orcid.sync-queue.description.researcher_urls": "URL nhà nghiên cứu",
+  "person.page.orcid.sync-queue.discard": "Hủy thay đổi và không đồng bộ với trang ORCID",
+  "person.page.orcid.sync-queue.discard.error": "Việc loại bỏ biểu ghi trong danh sách chờ của ORCID đã thất bại",
+  "person.page.orcid.sync-queue.discard.success": "Biểu ghi trong danh sách chờ của ORCID đã được hủy bỏ thành công",
+  "person.page.orcid.sync-queue.empty-message": "Danh sách chờ ORCID trống",
+  "person.page.orcid.sync-queue.send": "Đồng bộ với trang ORCID",
+  "person.page.orcid.sync-queue.send.bad-request-error": "Đẩy dữ liệu lên ORCID không thành công vì tài nguyên này không hợp lệ",
+  "person.page.orcid.sync-queue.send.conflict-error": "Đẩy dữ liệu lên ORCID không thành công bởi vì tài nguyên này đã có trên trang ORCID",
+  "person.page.orcid.sync-queue.send.error": "Đẩy dữ liệu lên ORCID không thành công",
+  "person.page.orcid.sync-queue.send.not-found-warning": "Tài nguyên không còn tồn tại trên ORCID.",
+  "person.page.orcid.sync-queue.send.success": "Đẩy dữ liệu lên ORCID thành công",
+  "person.page.orcid.sync-queue.send.unauthorized-error.content": "Nhấp <a href='{{orcid}}'>vào đây</a> để cấp lại các quyền bắt buộc. Nếu vấn đề vẫn còn tồn tại vui lòng liên hệ quản trị viên.",
+  "person.page.orcid.sync-queue.send.unauthorized-error.title": "Đẩy dữ liệu lên ORCID không thành công do tài khoản của bạn không đủ các quyền cần thiết.",
+  "person.page.orcid.sync-queue.send.validation-error": "Dữ liệu bạn muốn đồng bộ với ORCID là dữ liệu không hợp lệ",
+  "person.page.orcid.sync-queue.send.validation-error.amount-currency.required": "Đơn vị tiền tệ là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.country.invalid": "2 ký tự mã quốc gia theo ISO 3166 là không hợp lệ",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.required": "Cần có số định danh (ID) để phân biệt giữa các tổ chức. ID được hỗ trợ là GRID Ringgold LEI và số định dang Cơ quan đăng ký Crossref Funder",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguated-organization.value-required": "Định danh của tổ chức yêu cầu phải có một giá trị",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.invalid": "Nguồn của một trong các số định danh của tổ chức không hợp lệ. Các nguồn được hỗ trợ là RINGGOLD GRID LEI và FUNDREF",
+  "person.page.orcid.sync-queue.send.validation-error.disambiguation-source.required": "Phải có một nguồn cho định danh của tổ chức",
+  "person.page.orcid.sync-queue.send.validation-error.external-id.required": "Tài nguyên được gửi yêu cầu phải có ít nhất một định danh",
+  "person.page.orcid.sync-queue.send.validation-error.funder.required": "Nhà tài trợ là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.organization.address-required": "Tổ chức này yêu cầu phải có địa chỉ",
+  "person.page.orcid.sync-queue.send.validation-error.organization.city-required": "Địa chỉ của tổ chức này phải là một thành phố",
+  "person.page.orcid.sync-queue.send.validation-error.organization.country-required": "Địa chỉ của tổ chức này phải là một mã quốc gia bao gồm 2 ký tự theo ISO 3166",
+  "person.page.orcid.sync-queue.send.validation-error.organization.name-required": "Tên của tổ chức là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.organization.required": "Yêu cầu phải có tổ chức",
+  "person.page.orcid.sync-queue.send.validation-error.publication.date-invalid": "Năm xuất bản phải là năm sau năm 1900",
+  "person.page.orcid.sync-queue.send.validation-error.start-date.required": "Ngày bắt đầu là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.title.required": "Nhan đề là bắt buộc",
+  "person.page.orcid.sync-queue.send.validation-error.type.required": "Trường dc.type là bắt buộc",
+  "person.page.orcid.sync-queue.table.header.action": "Hành động",
+  "person.page.orcid.sync-queue.table.header.description": "Mô tả",
+  "person.page.orcid.sync-queue.table.header.type": "Loại hình tài liệu",
+  "person.page.orcid.sync-queue.tooltip.affiliation": "Tổ chức",
+  "person.page.orcid.sync-queue.tooltip.country": "Quốc gia",
+  "person.page.orcid.sync-queue.tooltip.delete": "Loại bỏ mục này khỏi trang ORCID",
+  "person.page.orcid.sync-queue.tooltip.education": "Giáo dục",
+  "person.page.orcid.sync-queue.tooltip.external_ids": "Định danh ",
+  "person.page.orcid.sync-queue.tooltip.insert": "Thêm mục mới trong ORCID",
+  "person.page.orcid.sync-queue.tooltip.keywords": "Từ khóa",
+  "person.page.orcid.sync-queue.tooltip.other_names": "Tên khác",
+  "person.page.orcid.sync-queue.tooltip.project": "Dự án",
+  "person.page.orcid.sync-queue.tooltip.publication": "Ấn phẩm",
+  "person.page.orcid.sync-queue.tooltip.qualification": "Trình độ chuyên môn",
+  "person.page.orcid.sync-queue.tooltip.researcher_urls": "URL nhà nghiên cứu",
+  "person.page.orcid.sync-queue.tooltip.update": "Cập nhật mục này trên trang ORCID",
+  "person.page.orcid.unlink": "Ngắt kết nối khỏi ORCID",
+  "person.page.orcid.unlink.error": "Đã xảy ra lỗi khi ngắt kết nối giữa hồ sơ và ORCID. Vui lòng thử lại.",
+  "person.page.orcid.unlink.processing": "Đang xử lý…",
+  "person.page.orcid.unlink.success": "Đã ngắt kết nối giữa hồ sơ nhà nghiên cứu và trang ORCID thành công",
+  "person.orcid.registry.auth": "Được phép qua ORCID ",
+  "person.orcid.registry.queue": "Đang xếp hàng đợi đăng ký ORCID",
+  "person.orcid.sync.setting": "Thiết lập đồng bộ hóa với ORCID",
+  "home.recent-submissions.head": "Các tài liệu tải lên gần đây",
+  "listable-notification-object.default-message": "Không thể truy xuất",
+  "system-wide-alert-banner.retrieval.error": "Đã xảy ra lỗi trong quá trình truy xuất cảnh báo hệ thống",
+  "system-wide-alert-banner.countdown.prefix": "Trong",
+  "system-wide-alert-banner.countdown.days": "{{days}} ngày",
+  "system-wide-alert-banner.countdown.hours": "{{hours}} giờ và",
+  "system-wide-alert-banner.countdown.minutes": "{{minutes}} phút:",
+  "menu.section.system-wide-alert": "Cảnh báo toàn hệ thống",
+  "system-wide-alert.form.header": "Cảnh báo toàn hệ thống",
+  "system-wide-alert-form.retrieval.error": "Đã xảy ra lỗi trong quá trình truy xuất cảnh báo trên toàn hệ thống",
+  "system-wide-alert.form.cancel": "Hủy",
+  "system-wide-alert.form.save": "Lưu",
+  "system-wide-alert.form.label.active": "HOẠT ĐỘNG",
+  "system-wide-alert.form.label.inactive": "KHÔNG HOẠT ĐỘNG",
+  "system-wide-alert.form.error.message": "Cảnh báo trên toàn hệ thống phải chứa một nội dung",
+  "system-wide-alert.form.label.message": "Nội dung cảnh báo",
+  "system-wide-alert.form.label.countdownTo.enable": "Kích hoạt thời gian tạm dừng máy chủ",
+  "system-wide-alert.form.label.countdownTo.hint": "Gợi ý: Thiết lập lịch tạm dừng máy chủ. Khi chức năng này được kích hoạt, có thể lựa chọn một ngày tạm dừng máy chủ trong tương lai và nội dung cảnh báo sẽ được đếm ngược tới ngày đã đặt. Khi bộ hẹn giờ này được kết thúc, nội dung này sẽ biến mất khỏi cảnh báo. Máy chủ sẽ không tự động tạm dừng.",
+  "system-wide-alert.form.label.preview": "Xem trước cảnh báo toàn hệ thống",
+  "system-wide-alert.form.update.success": "Cảnh báo toàn hệ thống đã được cập nhật thành công",
+  "system-wide-alert.form.update.error": "Đã xảy ra lỗi trong quá trình cập nhật cảnh báo toàn hệ thống",
+  "system-wide-alert.form.create.success": "Cảnh báo toàn hệ thống đã được tạo thành công",
+  "system-wide-alert.form.create.error": "Đã xảy ra lỗi trong quá trình tạo cảnh báo toàn hệ thống",
+  "admin.system-wide-alert.breadcrumbs": "Cảnh báo toàn hệ thống",
+  "admin.system-wide-alert.title": "Cảnh báo toàn hệ thống",
+}
\ No newline at end of file
diff --git a/src/assets/images/n-coar.png b/src/assets/images/n-coar.png
new file mode 100644
index 0000000000..5c4c741572
Binary files /dev/null and b/src/assets/images/n-coar.png differ
diff --git a/src/assets/images/qa-DSpaceUsers-logo.png b/src/assets/images/qa-DSpaceUsers-logo.png
new file mode 100644
index 0000000000..40b59feeaa
Binary files /dev/null and b/src/assets/images/qa-DSpaceUsers-logo.png differ
diff --git a/src/assets/images/qa-coar-notify-logo.png b/src/assets/images/qa-coar-notify-logo.png
new file mode 100644
index 0000000000..0ba021dfd2
Binary files /dev/null and b/src/assets/images/qa-coar-notify-logo.png differ
diff --git a/src/assets/images/qa-openaire-logo.png b/src/assets/images/qa-openaire-logo.png
new file mode 100644
index 0000000000..359fd73b84
Binary files /dev/null and b/src/assets/images/qa-openaire-logo.png differ
diff --git a/src/assets/images/ror-icon.svg b/src/assets/images/ror-icon.svg
new file mode 100644
index 0000000000..24735df519
--- /dev/null
+++ b/src/assets/images/ror-icon.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg height="100%" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;" version="1.1"
+     viewBox="0 0 156 111" width="100%"
+     xml:space="preserve" xmlns="http://www.w3.org/2000/svg"
+>
+    <g transform="matrix(1,0,0,1,-4.945,-4.16)">
+        <path d="M68.65,4.16L56.52,22.74L44.38,4.16L68.65,4.16Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path d="M119.41,4.16L107.28,22.74L95.14,4.16L119.41,4.16Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path d="M44.38,115.47L56.52,96.88L68.65,115.47L44.38,115.47Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path d="M95.14,115.47L107.28,96.88L119.41,115.47L95.14,115.47Z" style="fill:rgb(83,186,161);fill-rule:nonzero;"/>
+      <path
+        d="M145.53,63.71C149.83,62.91 153.1,61 155.33,57.99C157.57,54.98 158.68,51.32 158.68,47.03C158.68,43.47 158.06,40.51 156.83,38.13C155.6,35.75 153.93,33.86 151.84,32.45C149.75,31.05 147.31,30.04 144.53,29.44C141.75,28.84 138.81,28.54 135.72,28.54L112.16,28.54L112.16,47.37C111.97,46.82 111.77,46.28 111.55,45.74C109.92,41.79 107.64,38.42 104.71,35.64C101.78,32.86 98.32,30.72 94.3,29.23C90.29,27.74 85.9,26.99 81.14,26.99C76.38,26.99 72,27.74 67.98,29.23C63.97,30.72 60.5,32.86 57.57,35.64C54.95,38.13 52.85,41.1 51.27,44.54C51.04,42.07 50.46,39.93 49.53,38.13C48.3,35.75 46.63,33.86 44.54,32.45C42.45,31.05 40.01,30.04 37.23,29.44C34.45,28.84 31.51,28.54 28.42,28.54L4.87,28.54L4.87,89.42L18.28,89.42L18.28,65.08L24.9,65.08L37.63,89.42L53.71,89.42L38.24,63.71C42.54,62.91 45.81,61 48.04,57.99C48.14,57.85 48.23,57.7 48.33,57.56C48.31,58.03 48.3,58.5 48.3,58.98C48.3,63.85 49.12,68.27 50.75,72.22C52.38,76.17 54.66,79.54 57.59,82.32C60.51,85.1 63.98,87.24 68,88.73C72.01,90.22 76.4,90.97 81.16,90.97C85.92,90.97 90.3,90.22 94.32,88.73C98.33,87.24 101.8,85.1 104.73,82.32C107.65,79.54 109.93,76.17 111.57,72.22C111.79,71.69 111.99,71.14 112.18,70.59L112.18,89.42L125.59,89.42L125.59,65.08L132.21,65.08L144.94,89.42L161.02,89.42L145.53,63.71ZM36.39,50.81C35.67,51.73 34.77,52.4 33.68,52.83C32.59,53.26 31.37,53.52 30.03,53.6C28.68,53.69 27.41,53.73 26.2,53.73L18.29,53.73L18.29,39.89L27.06,39.89C28.26,39.89 29.5,39.98 30.76,40.15C32.02,40.32 33.14,40.65 34.11,41.14C35.08,41.63 35.89,42.33 36.52,43.25C37.15,44.17 37.47,45.4 37.47,46.95C37.47,48.6 37.11,49.89 36.39,50.81ZM98.74,66.85C97.85,69.23 96.58,71.29 94.91,73.04C93.25,74.79 91.26,76.15 88.93,77.13C86.61,78.11 84.01,78.59 81.15,78.59C78.28,78.59 75.69,78.1 73.37,77.13C71.05,76.16 69.06,74.79 67.39,73.04C65.73,71.29 64.45,69.23 63.56,66.85C62.67,64.47 62.23,61.85 62.23,58.98C62.23,56.17 62.67,53.56 63.56,51.15C64.45,48.74 65.72,46.67 67.39,44.92C69.05,43.17 71.04,41.81 73.37,40.83C75.69,39.86 78.28,39.37 81.15,39.37C84.02,39.37 86.61,39.86 88.93,40.83C91.25,41.8 93.24,43.17 94.91,44.92C96.57,46.67 97.85,48.75 98.74,51.15C99.63,53.56 100.07,56.17 100.07,58.98C100.07,61.85 99.63,64.47 98.74,66.85ZM143.68,50.81C142.96,51.73 142.06,52.4 140.97,52.83C139.88,53.26 138.66,53.52 137.32,53.6C135.97,53.69 134.7,53.73 133.49,53.73L125.58,53.73L125.58,39.89L134.35,39.89C135.55,39.89 136.79,39.98 138.05,40.15C139.31,40.32 140.43,40.65 141.4,41.14C142.37,41.63 143.18,42.33 143.81,43.25C144.44,44.17 144.76,45.4 144.76,46.95C144.76,48.6 144.4,49.89 143.68,50.81Z"
+        style="fill:rgb(32,40,38);fill-rule:nonzero;"/>
+    </g>
+</svg>
diff --git a/src/backend/api.ts b/src/backend/api.ts
index a2ef39711a..b84f06a960 100644
--- a/src/backend/api.ts
+++ b/src/backend/api.ts
@@ -1,16 +1,15 @@
+// Our API for demos only
+import { fakeDemoRedisCache } from './cache';
+import BITSTREAMS from './data/bitstreams.json';
+import BUNDLES from './data/bundles.json';
+import COLLECTIONS from './data/collections.json';
+import COMMUNITIES from './data/communities.json';
+import ITEMS from './data/items.json';
+import { fakeDataBase } from './db';
+
 const { Router } = require('express');
 const util = require('util');
 
-// Our API for demos only
-import { fakeDataBase } from './db';
-import { fakeDemoRedisCache } from './cache';
-
-import COMMUNITIES from './data/communities.json';
-import COLLECTIONS from './data/collections.json';
-import ITEMS from './data/items.json';
-import BUNDLES from './data/bundles.json';
-import BITSTREAMS from './data/bitstreams.json';
-
 // you would use cookies/token etc
 const USER_ID = 'f9d98cf1-1b96-464e-8755-bcc2a5c09077'; // hardcoded as an example
 
@@ -36,12 +35,12 @@ function toHALResponse(req, data, included?) {
   const result = {
     _embedded: data,
     _links: {
-      self: req.protocol + '://' + req.get('host') + req.originalUrl
-    }
+      self: req.protocol + '://' + req.get('host') + req.originalUrl,
+    },
   };
   if (included && Array.isArray(included) && included.length > 0) {
     Object.assign(result, {
-      included: included
+      included: included,
     });
   }
   return result;
diff --git a/src/backend/cache.ts b/src/backend/cache.ts
index 8e5570f0a2..db82ff75ae 100644
--- a/src/backend/cache.ts
+++ b/src/backend/cache.ts
@@ -11,5 +11,5 @@ export const fakeDemoRedisCache = {
     return cache;
   },
   set: (key, data) => fakeDemoRedisCache._cache[key] = data,
-  clear: () => fakeDemoRedisCache._cache = {}
+  clear: () => fakeDemoRedisCache._cache = {},
 };
diff --git a/src/backend/db.ts b/src/backend/db.ts
index ec8557f1b7..6bb2e2c08c 100644
--- a/src/backend/db.ts
+++ b/src/backend/db.ts
@@ -3,5 +3,5 @@ export const fakeDataBase = {
   get() {
     const res = { data: 'This fake data came from the db on the server.' };
     return Promise.resolve(res);
-  }
+  },
 };
diff --git a/src/config/advance-search-config.interface.ts b/src/config/advance-search-config.interface.ts
new file mode 100644
index 0000000000..092dc008fc
--- /dev/null
+++ b/src/config/advance-search-config.interface.ts
@@ -0,0 +1,4 @@
+export interface AdvancedSearchConfig {
+    enabled: boolean;
+    filter: string[];
+}
diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts
index ce9c8b3bf7..8d565d75ba 100644
--- a/src/config/app-config.interface.ts
+++ b/src/config/app-config.interface.ts
@@ -1,25 +1,33 @@
 import { InjectionToken } from '@angular/core';
 import { makeStateKey } from '@angular/platform-browser';
-import { Config } from './config.interface';
-import { ServerConfig } from './server-config.interface';
-import { CacheConfig } from './cache-config.interface';
-import { INotificationBoardOptions } from './notifications-config.interfaces';
-import { SubmissionConfig } from './submission-config.interface';
-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 { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
+import { ActuatorsConfig } from './actuators.config';
 import { AuthConfig } from './auth-config.interfaces';
-import { UIServerConfig } from './ui-server-config.interface';
-import { MediaViewerConfig } from './media-viewer-config.interface';
 import { BrowseByConfig } from './browse-by-config.interface';
 import { BundleConfig } from './bundle-config.interface';
-import { ActuatorsConfig } from './actuators.config';
-import { InfoConfig } from './info-config.interface';
+import { CacheConfig } from './cache-config.interface';
+import { CollectionPageConfig } from './collection-page-config.interface';
 import { CommunityListConfig } from './community-list-config.interface';
+import { CommunityPageConfig } from './community-page-config.interface';
+import { Config } from './config.interface';
+import { DiscoverySortConfig } from './discovery-sort.config';
+import { FilterVocabularyConfig } from './filter-vocabulary-config';
+import { FormConfig } from './form-config.interfaces';
 import { HomeConfig } from './homepage-config.interface';
+import { InfoConfig } from './info-config.interface';
+import { ItemConfig } from './item-config.interface';
+import { LangConfig } from './lang-config.interface';
 import { MarkdownConfig } from './markdown-config.interface';
+import { MediaViewerConfig } from './media-viewer-config.interface';
+import { INotificationBoardOptions } from './notifications-config.interfaces';
+import { QualityAssuranceConfig } from './quality-assurance.config';
+import { SearchConfig } from './search-page-config.interface';
+import { ServerConfig } from './server-config.interface';
+import { SubmissionConfig } from './submission-config.interface';
+import { SuggestionConfig } from './suggestion-config.interfaces';
+import { ThemeConfig } from './theme.config';
+import { UIServerConfig } from './ui-server-config.interface';
 
 interface AppConfig extends Config {
   ui: UIServerConfig;
@@ -37,13 +45,20 @@ interface AppConfig extends Config {
   communityList: CommunityListConfig;
   homePage: HomeConfig;
   item: ItemConfig;
+  community: CommunityPageConfig;
   collection: CollectionPageConfig;
   themes: ThemeConfig[];
   mediaViewer: MediaViewerConfig;
+  suggestion: SuggestionConfig[];
   bundle: BundleConfig;
   actuators: ActuatorsConfig
   info: InfoConfig;
   markdown: MarkdownConfig;
+  vocabularies: FilterVocabularyConfig[];
+  comcolSelectionSort: DiscoverySortConfig;
+  qualityAssuranceConfig: QualityAssuranceConfig;
+  search: SearchConfig;
+  notifyMetrics: AdminNotifyMetricsRow[];
 }
 
 /**
@@ -52,10 +67,10 @@ interface AppConfig extends Config {
  */
 const APP_CONFIG = new InjectionToken<AppConfig>('APP_CONFIG');
 
-const APP_CONFIG_STATE = makeStateKey('APP_CONFIG_STATE');
+const APP_CONFIG_STATE = makeStateKey<AppConfig>('APP_CONFIG_STATE');
 
 export {
-  AppConfig,
   APP_CONFIG,
-  APP_CONFIG_STATE
+  APP_CONFIG_STATE,
+  AppConfig,
 };
diff --git a/src/config/cache-config.interface.ts b/src/config/cache-config.interface.ts
index c535a96bb5..9d3fc168cb 100644
--- a/src/config/cache-config.interface.ts
+++ b/src/config/cache-config.interface.ts
@@ -1,10 +1,37 @@
-import { Config } from './config.interface';
 import { AutoSyncConfig } from './auto-sync-config.interface';
+import { Config } from './config.interface';
 
 export interface CacheConfig extends Config {
   msToLive: {
     default: number;
   };
+  // Cache-Control HTTP Header
   control: string;
   autoSync: AutoSyncConfig;
+  // In-memory caches of server-side rendered (SSR) content. These caches can be used to limit the frequency
+  // of re-generating SSR pages to improve performance.
+  serverSide: {
+    // Debug server-side caching.  Set to true to see cache hits/misses/refreshes in console logs.
+    debug: boolean,
+    // List of response headers to save into the cache
+    headers: string[],
+    // Cache specific to known bots.  Allows you to serve cached contents to bots only.
+    botCache: {
+      // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+      max: number;
+      // Amount of time after which cached pages are considered stale (in ms)
+      timeToLive: number;
+      // true = return page from cache after timeToLive expires. false = return a fresh page after timeToLive expires
+      allowStale: boolean;
+    },
+    // Cache specific to anonymous users. Allows you to serve cached content to non-authenticated users.
+    anonymousCache: {
+      // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+      max: number;
+      // Amount of time after which cached pages are considered stale (in ms)
+      timeToLive: number;
+      // true = return page from cache after timeToLive expires. false = return a fresh page after timeToLive expires
+      allowStale: boolean;
+    }
+  }
 }
diff --git a/src/config/collection-page-config.interface.ts b/src/config/collection-page-config.interface.ts
index c056df66ed..6b8352e686 100644
--- a/src/config/collection-page-config.interface.ts
+++ b/src/config/collection-page-config.interface.ts
@@ -1,7 +1,18 @@
 import { Config } from './config.interface';
 
+/**
+ * Collection Page Config
+ */
 export interface CollectionPageConfig extends Config {
+  searchSection: CollectionSearchSectionConfig;
   edit: {
     undoTimeout: number;
   };
 }
+
+/**
+ * Config related to the collection's search tab
+ */
+export interface CollectionSearchSectionConfig {
+  showSidebar: boolean;
+}
diff --git a/src/config/community-page-config.interface.ts b/src/config/community-page-config.interface.ts
new file mode 100644
index 0000000000..268f4d6a5e
--- /dev/null
+++ b/src/config/community-page-config.interface.ts
@@ -0,0 +1,15 @@
+import { Config } from './config.interface';
+
+/**
+ * Community Page Config
+ */
+export interface CommunityPageConfig extends Config {
+  searchSection: CommunitySearchSectionConfig;
+}
+
+/**
+ * Config related to the community's search tab
+ */
+export interface CommunitySearchSectionConfig {
+  showSidebar: boolean;
+}
diff --git a/src/config/config.server.ts b/src/config/config.server.ts
index 278cf4f1d5..69825b6409 100644
--- a/src/config/config.server.ts
+++ b/src/config/config.server.ts
@@ -1,14 +1,23 @@
-import * as colors from 'colors';
-import * as fs from 'fs';
-import * as yaml from 'js-yaml';
+import {
+  blue,
+  bold,
+  green,
+  red,
+} from 'colors';
+import {
+  existsSync,
+  readFileSync,
+  writeFileSync,
+} from 'fs';
+import { load } from 'js-yaml';
 import { join } from 'path';
 
+import { isNotEmpty } from '../app/shared/empty.util';
 import { AppConfig } from './app-config.interface';
 import { Config } from './config.interface';
+import { mergeConfig } from './config.util';
 import { DefaultAppConfig } from './default-app-config';
 import { ServerConfig } from './server-config.interface';
-import { mergeConfig } from './config.util';
-import { isNotEmpty } from '../app/shared/empty.util';
 
 const CONFIG_PATH = join(process.cwd(), 'config');
 
@@ -62,7 +71,7 @@ const getDefaultConfigPath = () => {
   // default to config/config.yml
   let defaultConfigPath = join(CONFIG_PATH, 'config.yml');
 
-  if (!fs.existsSync(defaultConfigPath)) {
+  if (!existsSync(defaultConfigPath)) {
     defaultConfigPath = join(CONFIG_PATH, 'config.yaml');
   }
 
@@ -95,11 +104,11 @@ const getEnvConfigFilePath = (env: Environment) => {
   // check if any environment variations of app config exist
   for (const envVariation of envVariations) {
     envLocalConfigPath = join(CONFIG_PATH, `config.${envVariation}.yml`);
-    if (fs.existsSync(envLocalConfigPath)) {
+    if (existsSync(envLocalConfigPath)) {
       break;
     }
     envLocalConfigPath = join(CONFIG_PATH, `config.${envVariation}.yaml`);
-    if (fs.existsSync(envLocalConfigPath)) {
+    if (existsSync(envLocalConfigPath)) {
       break;
     }
   }
@@ -110,8 +119,8 @@ const getEnvConfigFilePath = (env: Environment) => {
 const overrideWithConfig = (config: Config, pathToConfig: string) => {
   try {
     console.log(`Overriding app config with ${pathToConfig}`);
-    const externalConfig = fs.readFileSync(pathToConfig, 'utf8');
-    mergeConfig(config, yaml.load(externalConfig));
+    const externalConfig = readFileSync(pathToConfig, 'utf8');
+    mergeConfig(config, load(externalConfig));
   } catch (err) {
     console.error(err);
   }
@@ -155,7 +164,7 @@ const buildBaseUrl = (config: ServerConfig): void => {
     config.ssl ? 'https://' : 'http://',
     config.host,
     config.port && config.port !== 80 && config.port !== 443 ? `:${config.port}` : '',
-    config.nameSpace && config.nameSpace.startsWith('/') ? config.nameSpace : `/${config.nameSpace}`
+    config.nameSpace && config.nameSpace.startsWith('/') ? config.nameSpace : `/${config.nameSpace}`,
   ].join('');
 };
 
@@ -178,18 +187,18 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
 
   switch (env) {
     case 'production':
-      console.log(`Building ${colors.red.bold(`production`)} app config`);
+      console.log(`Building ${red.bold(`production`)} app config`);
       break;
     case 'test':
-      console.log(`Building ${colors.blue.bold(`test`)} app config`);
+      console.log(`Building ${blue.bold(`test`)} app config`);
       break;
     default:
-      console.log(`Building ${colors.green.bold(`development`)} app config`);
+      console.log(`Building ${green.bold(`development`)} app config`);
   }
 
   // override with default config
   const defaultConfigPath = getDefaultConfigPath();
-  if (fs.existsSync(defaultConfigPath)) {
+  if (existsSync(defaultConfigPath)) {
     overrideWithConfig(appConfig, defaultConfigPath);
   } else {
     console.warn(`Unable to find default config file at ${defaultConfigPath}`);
@@ -197,7 +206,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
 
   // override with env config
   const localConfigPath = getEnvConfigFilePath(env);
-  if (fs.existsSync(localConfigPath)) {
+  if (existsSync(localConfigPath)) {
     overrideWithConfig(appConfig, localConfigPath);
   } else {
     console.warn(`Unable to find env config file at ${localConfigPath}`);
@@ -206,7 +215,7 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   // override with external config if specified by environment variable `DSPACE_APP_CONFIG_PATH`
   const externalConfigPath = ENV('APP_CONFIG_PATH', true);
   if (isNotEmpty(externalConfigPath)) {
-    if (fs.existsSync(externalConfigPath)) {
+    if (existsSync(externalConfigPath)) {
       overrideWithConfig(appConfig, externalConfigPath);
     } else {
       console.warn(`Unable to find external config file at ${externalConfigPath}`);
@@ -236,9 +245,9 @@ export const buildAppConfig = (destConfigPath?: string): AppConfig => {
   buildBaseUrl(appConfig.rest);
 
   if (isNotEmpty(destConfigPath)) {
-    fs.writeFileSync(destConfigPath, JSON.stringify(appConfig, null, 2));
+    writeFileSync(destConfigPath, JSON.stringify(appConfig, null, 2));
 
-    console.log(`Angular ${colors.bold('config.json')} file generated correctly at ${colors.bold(destConfigPath)} \n`);
+    console.log(`Angular ${bold('config.json')} file generated correctly at ${bold(destConfigPath)} \n`);
   }
 
   return appConfig;
diff --git a/src/config/config.util.spec.ts b/src/config/config.util.spec.ts
index 2d1d8e1be7..dad16048c0 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', () => {
@@ -13,6 +13,7 @@ describe('Config Util', () => {
       expect(appConfig.ui.useProxies).toEqual(true);
 
       expect(appConfig.submission.autosave.metadata).toEqual([]);
+      expect(appConfig.submission.duplicateDetection.alwaysShowSection).toEqual(false);
 
       expect(appConfig.themes.length).toEqual(1);
       expect(appConfig.themes[0].name).toEqual('dspace');
@@ -22,7 +23,7 @@ describe('Config Util', () => {
 
       const rateLimiter = {
         windowMs: 5 * 50 * 1000, // 5 minutes
-        max: 1000
+        max: 1000,
       };
       appConfig.ui.rateLimiter = rateLimiter;
 
@@ -30,14 +31,14 @@ describe('Config Util', () => {
 
       const autoSaveMetadata = [
         'dc.author',
-        'dc.title'
+        'dc.title',
       ];
 
       appConfig.submission.autosave.metadata = autoSaveMetadata;
 
       const customTheme: HandleThemeConfig = {
         name: 'custom',
-        handle: '10673/1233'
+        handle: '10673/1233',
       };
 
       appConfig.themes.push(customTheme);
diff --git a/src/config/config.util.ts b/src/config/config.util.ts
index c45282269c..005606e70f 100644
--- a/src/config/config.util.ts
+++ b/src/config/config.util.ts
@@ -1,11 +1,13 @@
-import * as merge from 'deepmerge';
-
-import { environment } from '../environments/environment';
+import { all } from 'deepmerge';
 
 import { hasNoValue } from '../app/shared/empty.util';
-
+import { BASE_THEME_NAME } from '../app/shared/theme-support/theme.constants';
+import { environment } from '../environments/environment';
 import { AppConfig } from './app-config.interface';
-import { ThemeConfig } from './theme.model';
+import {
+  NamedThemeConfig,
+  ThemeConfig,
+} from './theme.config';
 
 /**
  * Extend Angular environment with app config.
@@ -26,11 +28,11 @@ const extendEnvironmentWithAppConfig = (env: any, appConfig: AppConfig): void =>
  */
 const mergeConfig = (destinationConfig: any, sourceConfig: AppConfig): void => {
   const mergeOptions = {
-    arrayMerge: (destinationArray, sourceArray, options) => sourceArray
+    arrayMerge: (destinationArray, sourceArray, options) => sourceArray,
   };
-  Object.assign(destinationConfig, merge.all([
+  Object.assign(destinationConfig, all([
     destinationConfig,
-    sourceConfig
+    sourceConfig,
   ], mergeOptions));
 };
 
@@ -43,12 +45,14 @@ const getDefaultThemeConfig = (): ThemeConfig => {
   return environment.themes.find((themeConfig: any) =>
     hasNoValue(themeConfig.regex) &&
     hasNoValue(themeConfig.handle) &&
-    hasNoValue(themeConfig.uuid)
-  );
+    hasNoValue(themeConfig.uuid),
+  ) ?? {
+    name: BASE_THEME_NAME,
+  } as NamedThemeConfig;
 };
 
 export {
   extendEnvironmentWithAppConfig,
+  getDefaultThemeConfig,
   mergeConfig,
-  getDefaultThemeConfig
 };
diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts
index f489abc53b..d148dee148 100644
--- a/src/config/default-app-config.ts
+++ b/src/config/default-app-config.ts
@@ -1,25 +1,32 @@
+import { AdminNotifyMetricsRow } from '../app/admin/admin-notify-dashboard/admin-notify-metrics/admin-notify-metrics.model';
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
+import { ActuatorsConfig } from './actuators.config';
 import { AppConfig } from './app-config.interface';
 import { AuthConfig } from './auth-config.interfaces';
 import { BrowseByConfig } from './browse-by-config.interface';
+import { BundleConfig } from './bundle-config.interface';
 import { CacheConfig } from './cache-config.interface';
 import { CollectionPageConfig } from './collection-page-config.interface';
+import { CommunityListConfig } from './community-list-config.interface';
+import { CommunityPageConfig } from './community-page-config.interface';
+import { DiscoverySortConfig } from './discovery-sort.config';
+import { FilterVocabularyConfig } from './filter-vocabulary-config';
 import { FormConfig } from './form-config.interfaces';
+import { HomeConfig } from './homepage-config.interface';
+import { InfoConfig } from './info-config.interface';
 import { ItemConfig } from './item-config.interface';
 import { LangConfig } from './lang-config.interface';
+import { MarkdownConfig } from './markdown-config.interface';
 import { MediaViewerConfig } from './media-viewer-config.interface';
 import { INotificationBoardOptions } from './notifications-config.interfaces';
+import { QualityAssuranceConfig } from './quality-assurance.config';
+import { SearchConfig } from './search-page-config.interface';
 import { ServerConfig } from './server-config.interface';
 import { SubmissionConfig } from './submission-config.interface';
-import { ThemeConfig } from './theme.model';
+import { SuggestionConfig } from './suggestion-config.interfaces';
+import { ThemeConfig } from './theme.config';
 import { UIServerConfig } from './ui-server-config.interface';
-import { BundleConfig } from './bundle-config.interface';
-import { ActuatorsConfig } from './actuators.config';
-import { InfoConfig } from './info-config.interface';
-import { CommunityListConfig } from './community-list-config.interface';
-import { HomeConfig } from './homepage-config.interface';
-import { MarkdownConfig } from './markdown-config.interface';
 
 export class DefaultAppConfig implements AppConfig {
   production = false;
@@ -39,7 +46,7 @@ export class DefaultAppConfig implements AppConfig {
     // The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
-      max: 500 // limit each IP to 500 requests per windowMs
+      max: 500, // limit each IP to 500 requests per windowMs
     },
 
     // Trust X-FORWARDED-* headers from proxies
@@ -57,21 +64,46 @@ export class DefaultAppConfig implements AppConfig {
   };
 
   actuators: ActuatorsConfig = {
-    endpointPath: '/actuator/health'
+    endpointPath: '/actuator/health',
   };
 
   // Caching settings
   cache: CacheConfig = {
     // NOTE: how long should objects be cached for by default
     msToLive: {
-      default: 15 * 60 * 1000 // 15 minutes
+      default: 15 * 60 * 1000, // 15 minutes
     },
-    control: 'max-age=60', // revalidate browser
+    // Cache-Control HTTP Header
+    control: 'max-age=604800', // revalidate browser
     autoSync: {
       defaultTime: 0,
       maxBufferSize: 100,
-      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any // time in seconds
-    }
+      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any, // time in seconds
+    },
+    // In-memory cache of server-side rendered content
+    serverSide: {
+      debug: false,
+      // Link header is used for signposting functionality
+      headers: ['Link'],
+      // Cache specific to known bots.  Allows you to serve cached contents to bots only.
+      // Defaults to caching 1,000 pages. Each page expires after 1 day
+      botCache: {
+        // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+        max: 1000,
+        // Amount of time after which cached pages are considered stale (in ms)
+        timeToLive: 24 * 60 * 60 * 1000, // 1 day
+        allowStale: true,
+      },
+      // Cache specific to anonymous users. Allows you to serve cached content to non-authenticated users.
+      // Defaults to caching 0 pages. But, when enabled, each page expires after 10 seconds (to minimize anonymous users seeing out-of-date content)
+      anonymousCache: {
+        // Maximum number of pages (rendered via SSR) to cache. Setting max=0 disables the cache.
+        max: 0, // disabled by default
+        // Amount of time after which cached pages are considered stale (in ms)
+        timeToLive: 10 * 1000, // 10 seconds
+        allowStale: true,
+      },
+    },
   };
 
   // Authentication settings
@@ -81,23 +113,24 @@ export class DefaultAppConfig implements AppConfig {
       // the amount of time before the idle warning is shown
       timeUntilIdle: 15 * 60 * 1000, // 15 minutes
       // the amount of time the user has to react after the idle warning is shown before they are logged out.
-      idleGracePeriod: 5 * 60 * 1000 // 5 minutes
+      idleGracePeriod: 5 * 60 * 1000, // 5 minutes
     },
     // Authentication REST settings
     rest: {
       // If the rest token expires in less than this amount of time, it will be refreshed automatically.
       // This is independent from the idle warning.
-      timeLeftBeforeTokenRefresh: 2 * 60 * 1000 // 2 minutes
-    }
+      timeLeftBeforeTokenRefresh: 2 * 60 * 1000, // 2 minutes
+    },
   };
 
   // Form settings
   form: FormConfig = {
+    spellCheck: true,
     // NOTE: Map server-side validators to comparative Angular form validators
     validatorMap: {
       required: 'required',
-      regex: 'pattern'
-    }
+      regex: 'pattern',
+    },
   };
 
   // Notifications
@@ -109,7 +142,7 @@ export class DefaultAppConfig implements AppConfig {
     timeOut: 5000, // 5 second
     clickToClose: true,
     // NOTE: 'fade' | 'fromTop' | 'fromRight' | 'fromBottom' | 'fromLeft' | 'rotate' | 'scale'
-    animate: NotificationAnimationsType.Scale
+    animate: NotificationAnimationsType.Scale,
   };
 
   // Submission settings
@@ -121,10 +154,13 @@ export class DefaultAppConfig implements AppConfig {
        * NOTE: after how many time (milliseconds) submission is saved automatically
        * eg. timer: 5 * (1000 * 60); // 5 minutes
        */
-      timer: 0
+      timer: 0,
+    },
+    duplicateDetection: {
+      alwaysShowSection: false,
     },
     typeBind: {
-      field: 'dc.type'
+      field: 'dc.type',
     },
     icons: {
       metadata: [
@@ -133,19 +169,19 @@ export class DefaultAppConfig implements AppConfig {
          * {
          *    // NOTE: metadata name
          *    name: 'dc.author',
-         *    // NOTE: fontawesome (v5.x) icon classes and bootstrap utility classes can be used
+         *    // NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
          *    style: 'fa-user'
          * }
          */
         {
           name: 'dc.author',
-          style: 'fas fa-user'
+          style: 'fas fa-user',
         },
         // default configuration
         {
           name: 'default',
-          style: ''
-        }
+          style: '',
+        },
       ],
       authority: {
         confidence: [
@@ -153,32 +189,64 @@ export class DefaultAppConfig implements AppConfig {
            * NOTE: example of configuration
            * {
            *    // NOTE: confidence value
-           *    value: 'dc.author',
-           *    // NOTE: fontawesome (v4.x) icon classes and bootstrap utility classes can be used
-           *    style: 'fa-user'
+           *    value: 100,
+           *    // NOTE: fontawesome (v6.x) icon classes and bootstrap utility classes can be used
+           *    style: 'text-success',
+           *    icon: 'fa-circle-check'
+           *    // NOTE: the class configured in property style is used by default, the icon property could be used in component
+           *    //      configured to use a 'icon mode' display (mainly in edit-item page)
            * }
            */
           {
             value: 600,
-            style: 'text-success'
+            style: 'text-success',
+            icon: 'fa-circle-check',
           },
           {
             value: 500,
-            style: 'text-info'
+            style: 'text-info',
+            icon: 'fa-gear',
           },
           {
             value: 400,
-            style: 'text-warning'
+            style: 'text-warning',
+            icon: 'fa-circle-question',
+          },
+          {
+            value: 300,
+            style: 'text-muted',
+            icon: 'fa-circle-question',
+          },
+          {
+            value: 200,
+            style: 'text-muted',
+            icon: 'fa-circle-exclamation',
+          },
+          {
+            value: 100,
+            style: 'text-muted',
+            icon: 'fa-circle-stop',
+          },
+          {
+            value: 0,
+            style: 'text-muted',
+            icon: 'fa-ban',
+          },
+          {
+            value: -1,
+            style: 'text-muted',
+            icon: 'fa-circle-xmark',
           },
           // default configuration
           {
             value: 'default',
-            style: 'text-muted'
-          }
+            style: 'text-muted',
+            icon: 'fa-circle-xmark',
+          },
 
-        ]
-      }
-    }
+        ],
+      },
+    },
   };
 
   // Default Language in which the UI will be rendered if the user's browser language is not an active language
@@ -188,23 +256,30 @@ 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: 'ca', label: 'Català', active: true },
     { code: 'cs', label: 'Čeština', active: true },
     { code: 'de', label: 'Deutsch', active: true },
     { code: 'es', label: 'Español', 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: 'hu', label: 'Magyar', 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: 'sr-lat', label: 'Srpski (lat)', active: true },
     { code: 'fi', label: 'Suomi', active: true },
     { code: 'sv', label: 'Svenska', active: true },
     { 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: 'hi', label: 'हिंदी', active: true },
+    { code: 'el', label: 'Ελληνικά', active: true },
+    { code: 'sr-cyr', label: 'Српски', active: true },
+    { code: 'uk', label: 'Yкраї́нська', active: true },
   ];
 
   // Browse-By Pages
@@ -220,11 +295,11 @@ export class DefaultAppConfig implements AppConfig {
     // The number of entries in a paginated browse results list.
     // Rounded to the nearest size in the list of selectable sizes on the
     // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
-    pageSize: 20
+    pageSize: 20,
   };
 
   communityList: CommunityListConfig = {
-    pageSize: 20
+    pageSize: 20,
   };
 
   homePage: HomeConfig = {
@@ -235,26 +310,54 @@ export class DefaultAppConfig implements AppConfig {
       sortField: 'dc.date.accessioned',
     },
     topLevelCommunityList: {
-      pageSize: 5
-    }
+      pageSize: 5,
+    },
+    showDiscoverFilters: false,
   };
 
   // Item Config
   item: ItemConfig = {
     edit: {
-      undoTimeout: 10000 // 10 seconds
+      undoTimeout: 10000, // 10 seconds
     },
     // Show the item access status label in items lists
-    showAccessStatuses: false
+    showAccessStatuses: false,
+    bitstream: {
+      // Number of entries in the bitstream list in the item view page.
+      // Rounded to the nearest size in the list of selectable sizes on the
+      // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
+      pageSize: 5,
+    },
+  };
+
+  // Community Page Config
+  community: CommunityPageConfig = {
+    searchSection: {
+      showSidebar: true,
+    },
   };
 
   // Collection Page Config
   collection: CollectionPageConfig = {
+    searchSection: {
+      showSidebar: true,
+    },
     edit: {
-      undoTimeout: 10000 // 10 seconds
-    }
+      undoTimeout: 10000, // 10 seconds
+    },
   };
 
+  suggestion: SuggestionConfig[] = [
+    // {
+    //   // Use this configuration to map a suggestion import to a specific collection based on the suggestion type.
+    //   source: 'suggestionSource',
+    //   collectionId: 'collectionUUID'
+    // }
+    // This is used as a default fallback in case there aren't collections where to import the suggestion
+    // If not mapped the user will be allowed to import the suggestions only in the provided options, shown clicking the button "Approve and import"
+    // If not mapped and no options available for import the user won't be able to import the suggestions.
+  ];
+
   // Theme Config
   themes: ThemeConfig[] = [
     // Add additional themes here. In the case where multiple themes match a route, the first one
@@ -315,7 +418,7 @@ export class DefaultAppConfig implements AppConfig {
             'rel': 'icon',
             'href': 'assets/dspace/images/favicons/favicon.ico',
             'sizes': 'any',
-          }
+          },
         },
         {
           // Insert <link rel="icon" href="assets/dspace/images/favicons/favicon.svg" type="image/svg+xml"/> into the <head> of the page.
@@ -324,7 +427,7 @@ export class DefaultAppConfig implements AppConfig {
             'rel': 'icon',
             'href': 'assets/dspace/images/favicons/favicon.svg',
             'type': 'image/svg+xml',
-          }
+          },
         },
         {
           // Insert <link rel="apple-touch-icon" href="assets/dspace/images/favicons/apple-touch-icon.png"/> into the <head> of the page.
@@ -332,7 +435,7 @@ export class DefaultAppConfig implements AppConfig {
           attributes: {
             'rel': 'apple-touch-icon',
             'href': 'assets/dspace/images/favicons/apple-touch-icon.png',
-          }
+          },
         },
         {
           // Insert <link rel="manifest" href="assets/dspace/images/favicons/manifest.webmanifest"/> into the <head> of the page.
@@ -340,22 +443,22 @@ export class DefaultAppConfig implements AppConfig {
           attributes: {
             'rel': 'manifest',
             'href': 'assets/dspace/images/favicons/manifest.webmanifest',
-          }
+          },
         },
-      ]
+      ],
     },
   ];
   // The default bundles that should always be displayed when you edit or add a bundle even when no bundle has been
   // added to the item yet.
   bundle: BundleConfig = {
-    standardBundles: ['ORIGINAL', 'THUMBNAIL', 'LICENSE']
+    standardBundles: ['ORIGINAL', 'THUMBNAIL', 'LICENSE'],
   };
   // Whether to enable media viewer for image and/or video Bitstreams (i.e. Bitstreams whose MIME type starts with "image" or "video").
   // For images, this enables a gallery viewer where you can zoom or page through images.
   // For videos, this enables embedded video streaming
   mediaViewer: MediaViewerConfig = {
     image: false,
-    video: false
+    video: false,
   };
   // Whether the end-user-agreement and privacy policy feature should be enabled or not.
   // Disabling the end user agreement feature will result in:
@@ -367,7 +470,7 @@ export class DefaultAppConfig implements AppConfig {
   // - All mentions of the privacy policy being removed from the UI (e.g. in the footer)
   info: InfoConfig = {
     enableEndUserAgreement: true,
-    enablePrivacyStatement: true
+    enablePrivacyStatement: true,
   };
 
   // Whether to enable Markdown (https://commonmark.org/) and MathJax (https://www.mathjax.org/)
@@ -376,4 +479,111 @@ export class DefaultAppConfig implements AppConfig {
     enabled: false,
     mathjax: false,
   };
+
+  // Which vocabularies should be used for which search filters
+  // and whether to show the filter in the search sidebar
+  // Take a look at the filter-vocabulary-config.ts file for documentation on how the options are obtained
+  vocabularies: FilterVocabularyConfig[] = [
+    {
+      filter: 'subject',
+      vocabulary: 'srsc',
+      enabled: false,
+    },
+  ];
+
+  // Configuration that determines the metadata sorting of community and collection edition and creation when there are not a search query.
+  comcolSelectionSort: DiscoverySortConfig = {
+    sortField:'dc.title',
+    sortDirection:'ASC',
+  };
+
+  qualityAssuranceConfig: QualityAssuranceConfig = {
+    sourceUrlMapForProjectSearch: {
+      openaire: 'https://explore.openaire.eu/search/project?projectId=',
+    },
+    pageSize: 5,
+  };
+
+
+  search: SearchConfig = {
+    advancedFilters: {
+      enabled: false,
+      filter: ['title', 'author', 'subject', 'entityType'],
+    },
+  };
+
+  notifyMetrics: AdminNotifyMetricsRow[] = [
+    {
+      title: 'admin-notify-dashboard.received-ldn',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
+          config: 'NOTIFY.incoming.accepted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description',
+        },
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
+          config: 'NOTIFY.incoming.processed',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
+          config: 'NOTIFY.incoming.failure',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
+          config: 'NOTIFY.incoming.untrusted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.incoming.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description',
+        },
+      ],
+    },
+    {
+      title: 'admin-notify-dashboard.generated-ldn',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
+          config: 'NOTIFY.outgoing.delivered',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description',
+        },
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
+          config: 'NOTIFY.outgoing.queued',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description',
+        },
+        {
+          color: '#FDEEBB',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
+          config: 'NOTIFY.outgoing.queued_for_retry',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
+          config: 'NOTIFY.outgoing.failure',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.outgoing.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description',
+        },
+      ],
+    },
+  ];
 }
diff --git a/src/config/discovery-sort.config.ts b/src/config/discovery-sort.config.ts
new file mode 100644
index 0000000000..c0d5e5e391
--- /dev/null
+++ b/src/config/discovery-sort.config.ts
@@ -0,0 +1,14 @@
+import { Config } from './config.interface';
+
+/**
+ * Config that determines a metadata sorting config.
+ * It's created mainly to sort by metadata community and collection edition and creation
+ */
+export class DiscoverySortConfig implements Config {
+
+  public sortField: string;
+  /**
+   * ASC / DESC values expected
+   */
+  public sortDirection: string;
+}
diff --git a/src/config/filter-vocabulary-config.ts b/src/config/filter-vocabulary-config.ts
new file mode 100644
index 0000000000..54e57090c8
--- /dev/null
+++ b/src/config/filter-vocabulary-config.ts
@@ -0,0 +1,22 @@
+import { Config } from './config.interface';
+
+/**
+ * Configuration that can be used to enable a vocabulary tree to be used as search filter
+ */
+export interface FilterVocabularyConfig extends Config {
+  /**
+   * The name of the filter where the vocabulary tree should be used
+   * This is the name of the filter as it's configured in the facet in discovery.xml
+   * (can also be seen on the /server/api/discover/facets endpoint)
+   */
+  filter: string;
+  /**
+   * name of the vocabulary tree to use
+   * ( name of the file as stored in the dspace/config/controlled-vocabularies folder without file extension )
+   */
+  vocabulary: string;
+  /**
+   * Whether to show the vocabulary tree in the sidebar
+   */
+  enabled: boolean;
+}
diff --git a/src/config/form-config.interfaces.ts b/src/config/form-config.interfaces.ts
index e13fdc1c60..50769c2d2f 100644
--- a/src/config/form-config.interfaces.ts
+++ b/src/config/form-config.interfaces.ts
@@ -5,5 +5,6 @@ export interface ValidatorMap {
 }
 
 export interface FormConfig extends Config {
+  spellCheck: boolean;
   validatorMap: ValidatorMap;
 }
diff --git a/src/config/homepage-config.interface.ts b/src/config/homepage-config.interface.ts
index df5d29cfe0..48fd9077a9 100644
--- a/src/config/homepage-config.interface.ts
+++ b/src/config/homepage-config.interface.ts
@@ -1,7 +1,7 @@
 import { Config } from './config.interface';
 
 /**
- * Config that determines how the dropdown list of years are created for browse-by-date components
+ * Config that determines how the recentSubmissions list showing at home page
  */
 export interface HomeConfig extends Config {
   recentSubmissions: {
@@ -19,4 +19,8 @@ export interface HomeConfig extends Config {
   topLevelCommunityList: {
     pageSize: number;
   };
+  /*
+  * Enable or disable the Discover filters on the homepage
+  */
+  showDiscoverFilters: boolean;
 }
diff --git a/src/config/item-config.interface.ts b/src/config/item-config.interface.ts
index f842c37c05..35cb5260ae 100644
--- a/src/config/item-config.interface.ts
+++ b/src/config/item-config.interface.ts
@@ -6,4 +6,11 @@ export interface ItemConfig extends Config {
   };
   // This is used to show the access status label of items in results lists
   showAccessStatuses: boolean;
+
+  bitstream: {
+    // Number of entries in the bitstream list in the item view page.
+    // Rounded to the nearest size in the list of selectable sizes on the
+    // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
+    pageSize: number;
+  }
 }
diff --git a/src/config/notifications-config.interfaces.ts b/src/config/notifications-config.interfaces.ts
index 49cdf277c3..e57907c1bf 100644
--- a/src/config/notifications-config.interfaces.ts
+++ b/src/config/notifications-config.interfaces.ts
@@ -1,5 +1,5 @@
-import { Config } from './config.interface';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
+import { Config } from './config.interface';
 
 export interface INotificationBoardOptions extends Config {
   rtl: boolean;
diff --git a/src/config/quality-assurance.config.ts b/src/config/quality-assurance.config.ts
new file mode 100644
index 0000000000..7b2723f9d9
--- /dev/null
+++ b/src/config/quality-assurance.config.ts
@@ -0,0 +1,17 @@
+import { Config } from './config.interface';
+
+/**
+ * Config that determines a metadata sorting config.
+ * It's created mainly to sort by metadata community and collection edition and creation
+ */
+export class QualityAssuranceConfig implements Config {
+
+  /**
+   * Url for project search on quality assurance resource
+   */
+  public sourceUrlMapForProjectSearch: {[key: string]: string};
+  /**
+   * default count of QA sources to load
+   */
+  public pageSize: number;
+}
diff --git a/src/config/search-page-config.interface.ts b/src/config/search-page-config.interface.ts
new file mode 100644
index 0000000000..699e3fd61f
--- /dev/null
+++ b/src/config/search-page-config.interface.ts
@@ -0,0 +1,12 @@
+import { AdvancedSearchConfig } from './advance-search-config.interface';
+import { Config } from './config.interface';
+
+export interface SearchConfig extends Config {
+
+    /**
+     * List of standard filter to select in adding advanced Search
+     * Used by {@link UploadBitstreamComponent}.
+     */
+    advancedFilters: AdvancedSearchConfig;
+
+}
diff --git a/src/config/store/devtools.ts b/src/config/store/devtools.ts
index 5672efccd3..e71c2717ce 100644
--- a/src/config/store/devtools.ts
+++ b/src/config/store/devtools.ts
@@ -6,5 +6,5 @@ export const StoreDevModules = [
   StoreDevtoolsModule.instrument({
     maxAge: 1000,
     logOnly: false,
-  })
+  }),
 ];
diff --git a/src/config/submission-config.interface.ts b/src/config/submission-config.interface.ts
index a63af45e38..afc81a39e2 100644
--- a/src/config/submission-config.interface.ts
+++ b/src/config/submission-config.interface.ts
@@ -5,6 +5,10 @@ interface AutosaveConfig extends Config {
   timer: number;
 }
 
+interface DuplicateDetectionConfig extends Config {
+  alwaysShowSection: boolean;
+}
+
 interface TypeBindConfig extends Config {
   field: string;
 }
@@ -24,10 +28,12 @@ export interface MetadataIconConfig extends Config {
 export interface ConfidenceIconConfig extends Config {
   value: any;
   style: string;
+  icon: string;
 }
 
 export interface SubmissionConfig extends Config {
   autosave: AutosaveConfig;
+  duplicateDetection: DuplicateDetectionConfig;
   typeBind: TypeBindConfig;
   icons: IconsConfig;
 }
diff --git a/src/config/suggestion-config.interfaces.ts b/src/config/suggestion-config.interfaces.ts
new file mode 100644
index 0000000000..afd3a38c58
--- /dev/null
+++ b/src/config/suggestion-config.interfaces.ts
@@ -0,0 +1,6 @@
+import { Config } from './config.interface';
+
+export interface SuggestionConfig extends Config {
+  source: string;
+  collectionId: string;
+}
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..4c053bebb1 100644
--- a/src/config/theme.model.spec.ts
+++ b/src/config/theme.model.spec.ts
@@ -1,20 +1,29 @@
-import { HandleTheme, RegExTheme, Theme, UUIDTheme } from './theme.model';
+import { TestBed } from '@angular/core/testing';
+
+import { getCollectionModuleRoute } from '../app/collection-page/collection-page-routing-paths';
 import { getCommunityModuleRoute } from '../app/community-page/community-page-routing-paths';
+import { ConfigurationDataService } from '../app/core/data/configuration-data.service';
+import { Collection } from '../app/core/shared/collection.model';
+import { COLLECTION } from '../app/core/shared/collection.resource-type';
 import { Community } from '../app/core/shared/community.model';
 import { COMMUNITY } from '../app/core/shared/community.resource-type';
-import { getCollectionModuleRoute } from '../app/collection-page/collection-page-routing-paths';
-import { COLLECTION } from '../app/core/shared/collection.resource-type';
-import { Collection } from '../app/core/shared/collection.model';
 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 { ConfigurationDataServiceStub } from '../app/shared/testing/configuration-data.service.stub';
+import {
+  HandleTheme,
+  RegExTheme,
+  Theme,
+  UUIDTheme,
+} from '../app/shared/theme-support/theme.model';
 
 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 +32,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 +47,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 +62,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 +116,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 +131,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 +147,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 +164,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 +179,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/environments/environment.production.ts b/src/environments/environment.production.ts
index 09b5f19ade..e9028b2828 100644
--- a/src/environments/environment.production.ts
+++ b/src/environments/environment.production.ts
@@ -7,6 +7,6 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: true,
     async: true,
-    time: false
-  }
+    time: false,
+  },
 };
diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts
index edd1cb9109..0fc03f2a4c 100644
--- a/src/environments/environment.test.ts
+++ b/src/environments/environment.test.ts
@@ -1,5 +1,6 @@
 // This configuration is only used for unit tests, end-to-end tests use environment.production.ts
 import { BuildConfig } from 'src/config/build-config.interface';
+
 import { RestRequestMethod } from '../app/core/data/rest-request-method';
 import { NotificationAnimationsType } from '../app/shared/notifications/models/notification-animations-type';
 
@@ -10,7 +11,7 @@ export const environment: BuildConfig = {
   universal: {
     preboot: true,
     async: true,
-    time: false
+    time: false,
   },
 
   // Angular Universal server settings.
@@ -24,7 +25,7 @@ export const environment: BuildConfig = {
     // The rateLimiter settings limit each IP to a 'max' of 500 requests per 'windowMs' (1 minute).
     rateLimiter: {
       windowMs: 1 * 60 * 1000, // 1 minute
-      max: 500 // limit each IP to 500 requests per windowMs
+      max: 500, // limit each IP to 500 requests per windowMs
     },
     useProxies: true,
   },
@@ -36,11 +37,11 @@ export const environment: BuildConfig = {
     port: 443,
     // NOTE: Space is capitalized because 'namespace' is a reserved string in TypeScript
     nameSpace: '/api',
-    baseUrl: 'https://rest.com/api'
+    baseUrl: 'https://rest.com/api',
   },
 
   actuators: {
-    endpointPath: '/actuator/health'
+    endpointPath: '/actuator/health',
   },
 
   // Caching settings
@@ -54,8 +55,23 @@ export const environment: BuildConfig = {
     autoSync: {
       defaultTime: 0,
       maxBufferSize: 100,
-      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any // time in seconds
-    }
+      timePerMethod: { [RestRequestMethod.PATCH]: 3 } as any, // time in seconds
+    },
+    // In-memory cache of server-side rendered pages. Disabled in test environment (max=0)
+    serverSide: {
+      debug: false,
+      headers: ['Link'],
+      botCache: {
+        max: 0,
+        timeToLive: 24 * 60 * 60 * 1000, // 1 day
+        allowStale: true,
+      },
+      anonymousCache: {
+        max: 0,
+        timeToLive: 10 * 1000, // 10 seconds
+        allowStale: true,
+      },
+    },
   },
 
   // Authentication settings
@@ -78,11 +94,12 @@ export const environment: BuildConfig = {
 
   // Form settings
   form: {
+    spellCheck: true,
     // NOTE: Map server-side validators to comparative Angular form validators
     validatorMap: {
       required: 'required',
-      regex: 'pattern'
-    }
+      regex: 'pattern',
+    },
   },
 
   // Notifications
@@ -94,7 +111,7 @@ export const environment: BuildConfig = {
     timeOut: 5000,
     clickToClose: true,
     // NOTE: 'fade' | 'fromTop' | 'fromRight' | 'fromBottom' | 'fromLeft' | 'rotate' | 'scale'
-    animate: NotificationAnimationsType.Scale
+    animate: NotificationAnimationsType.Scale,
   },
 
   // Submission settings
@@ -103,51 +120,58 @@ export const environment: BuildConfig = {
       // NOTE: which metadata trigger an autosave
       metadata: ['dc.title', 'dc.identifier.doi', 'dc.identifier.pmid', 'dc.identifier.arxiv'],
       // NOTE: every how many minutes submission is saved automatically
-      timer: 5
+      timer: 5,
+    },
+    duplicateDetection: {
+      alwaysShowSection: false,
     },
     typeBind: {
-      field: 'dc.type'
+      field: 'dc.type',
     },
     icons: {
       metadata: [
         {
           name: 'mainField',
-          style: 'fas fa-user'
+          style: 'fas fa-user',
         },
         {
           name: 'relatedField',
-          style: 'fas fa-university'
+          style: 'fas fa-university',
         },
         {
           name: 'otherRelatedField',
-          style: 'fas fa-circle'
+          style: 'fas fa-circle',
         },
         {
           name: 'default',
-          style: ''
-        }
+          style: '',
+        },
       ],
       authority: {
         confidence: [
           {
             value: 600,
-            style: 'text-success'
+            style: 'text-success',
+            icon: 'fa-circle-check',
           },
           {
             value: 500,
-            style: 'text-info'
+            style: 'text-info',
+            icon: 'fa-gear',
           },
           {
             value: 400,
-            style: 'text-warning'
+            style: 'text-warning',
+            icon: 'fa-circle-question',
           },
           {
             value: 'default',
-            style: 'text-muted'
+            style: 'text-muted',
+            icon: 'fa-circle-xmark',
           },
-        ]
-      }
-    }
+        ],
+      },
+    },
   },
 
   // NOTE: will log all redux actions and transfers in console
@@ -194,6 +218,10 @@ export const environment: BuildConfig = {
     code: 'el',
     label: 'Ελληνικά',
     active: true,
+  }, {
+    code: 'disabled',
+    label: 'Disabled',
+    active: false,
   }],
 
   // Browse-By Pages
@@ -212,7 +240,7 @@ export const environment: BuildConfig = {
     pageSize: 20,
   },
   communityList: {
-    pageSize: 20
+    pageSize: 20,
   },
   homePage: {
     recentSubmissions: {
@@ -221,41 +249,56 @@ export const environment: BuildConfig = {
       sortField: 'dc.date.accessioned',
     },
     topLevelCommunityList: {
-      pageSize: 5
-    }
+      pageSize: 5,
+    },
+    showDiscoverFilters: false,
   },
   item: {
     edit: {
-      undoTimeout: 10000 // 10 seconds
+      undoTimeout: 10000, // 10 seconds
     },
     // Show the item access status label in items lists
-    showAccessStatuses: false
+    showAccessStatuses: false,
+    bitstream: {
+      // Number of entries in the bitstream list in the item view page.
+      // Rounded to the nearest size in the list of selectable sizes on the
+      // settings menu.  See pageSizeOptions in 'pagination-component-options.model.ts'.
+      pageSize: 5,
+    },
+  },
+  community: {
+    searchSection: {
+      showSidebar: true,
+    },
   },
   collection: {
+    searchSection: {
+      showSidebar: true,
+    },
     edit: {
-      undoTimeout: 10000 // 10 seconds
-    }
+      undoTimeout: 10000, // 10 seconds
+    },
   },
   themes: [
     {
       name: 'full-item-page-theme',
-      regex: 'items/aa6c6c83-3a83-4953-95d1-2bc2e67854d2/full'
+      regex: 'items/aa6c6c83-3a83-4953-95d1-2bc2e67854d2/full',
     },
     {
       name: 'error-theme',
-      regex: 'collections/aaaa.*'
+      regex: 'collections/aaaa.*',
     },
     {
       name: 'handle-theme',
-      handle: '10673/1233'
+      handle: '10673/1233',
     },
     {
       name: 'regex-theme',
-      regex: 'collections\/e8043bc2.*'
+      regex: 'collections\/e8043bc2.*',
     },
     {
       name: 'uuid-theme',
-      uuid: '0958c910-2037-42a9-81c7-dca80e3892b4'
+      uuid: '0958c910-2037-42a9-81c7-dca80e3892b4',
     },
     {
       name: 'base',
@@ -266,7 +309,7 @@ export const environment: BuildConfig = {
   },
   mediaViewer: {
     image: true,
-    video: true
+    video: true,
   },
   info: {
     enableEndUserAgreement: true,
@@ -276,4 +319,106 @@ export const environment: BuildConfig = {
     enabled: false,
     mathjax: false,
   },
+  comcolSelectionSort: {
+    sortField:'dc.title',
+    sortDirection:'ASC',
+  },
+  qualityAssuranceConfig: {
+    sourceUrlMapForProjectSearch: {
+      openaire: 'https://explore.openaire.eu/search/project?projectId=',
+    },
+    pageSize: 5,
+  },
+
+  vocabularies: [
+    {
+      filter: 'subject',
+      vocabulary: 'srsc',
+      enabled: true,
+    },
+  ],
+
+  suggestion: [],
+
+  search: {
+    advancedFilters: {
+      enabled: false,
+      filter: ['title', 'author', 'subject', 'entityType'],
+    },
+  },
+
+  notifyMetrics: [
+    {
+      title: 'admin-notify-dashboard.received-ldn',
+      boxes: [
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.accepted',
+          config: 'NOTIFY.incoming.accepted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.accepted.description',
+        },
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.processed',
+          config: 'NOTIFY.incoming.processed',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.processed.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.failure',
+          config: 'NOTIFY.incoming.failure',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.failure.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.untrusted',
+          config: 'NOTIFY.incoming.untrusted',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.untrusted.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.incoming.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.incoming.involvedItems.description',
+        },
+      ],
+    },
+    {
+      title: 'admin-notify-dashboard.generated-ldn',
+      boxes: [
+        {
+          color: '#D4EDDA',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.delivered',
+          config: 'NOTIFY.outgoing.delivered',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.delivered.description',
+        },
+        {
+          color: '#B8DAFF',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued',
+          config: 'NOTIFY.outgoing.queued',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued.description',
+        },
+        {
+          color: '#FDEEBB',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry',
+          config: 'NOTIFY.outgoing.queued_for_retry',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.queued_for_retry.description',
+        },
+        {
+          color: '#FDBBC7',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.failure',
+          config: 'NOTIFY.outgoing.failure',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.failure.description',
+        },
+        {
+          color: '#43515F',
+          title: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems',
+          textColor: '#fff',
+          config: 'NOTIFY.outgoing.involvedItems',
+          description: 'admin-notify-dashboard.NOTIFY.outgoing.involvedItems.description',
+        },
+      ],
+    },
+  ],
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index dc0e808be0..4aa175ebe6 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -12,8 +12,8 @@ export const environment: Partial<BuildConfig> = {
   universal: {
     preboot: false,
     async: true,
-    time: false
-  }
+    time: false,
+  },
 };
 
 /*
diff --git a/src/index.csr.html b/src/index.csr.html
deleted file mode 100644
index b1ef4343b1..0000000000
--- a/src/index.csr.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="UTF-8">
-  <base href="/">
-  <title>DSpace</title>
-  <meta name="viewport" content="width=device-width,minimum-scale=1">
-</head>
-
-<body>
-  <ds-app></ds-app>
-</body>
-
-<!-- this is needed for CSR fallback -->
-<script async src="client.js"></script>
-
-</html>
diff --git a/src/index.html b/src/index.html
index ddd448f289..565fc0439d 100644
--- a/src/index.html
+++ b/src/index.html
@@ -6,6 +6,7 @@
   <base href="/">
   <title>DSpace</title>
   <meta name="viewport" content="width=device-width,minimum-scale=1">
+  <meta http-equiv="cache-control" content="no-store">
 </head>
 
 <body>
diff --git a/src/main.browser.ts b/src/main.browser.ts
index d5efe828c3..09e535565e 100644
--- a/src/main.browser.ts
+++ b/src/main.browser.ts
@@ -4,48 +4,45 @@ import 'core-js/es/reflect';
 
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-import { load as loadWebFont } from 'webfontloader';
 
-import { hasValue } from './app/shared/empty.util';
-
-import { BrowserAppModule } from './modules/app/browser-app.module';
-
-import { environment } from './environments/environment';
 import { AppConfig } from './config/app-config.interface';
 import { extendEnvironmentWithAppConfig } from './config/config.util';
+import { environment } from './environments/environment';
+import { BrowserAppModule } from './modules/app/browser-app.module';
 
 const bootstrap = () => platformBrowserDynamic()
   .bootstrapModule(BrowserAppModule, {});
 
-const main = () => {
-  // Load fonts async
-  // https://github.com/typekit/webfontloader#configuration
-  loadWebFont({
-    google: {
-      families: ['Droid Sans']
-    }
-  });
+/**
+ * We use this to determine have been serven SSR HTML or not.
+ *
+ * At this point, {@link environment} may not be in sync with the configuration.
+ * Therefore, we cannot depend on it to determine how to bootstrap the app.
+ */
+const hasTransferState = document.querySelector('script#dspace-angular-state') !== null;
 
+const main = () => {
   if (environment.production) {
     enableProdMode();
   }
 
-  if (hasValue(environment.universal) && environment.universal.preboot) {
+  if (hasTransferState) {
+    // Configuration will be taken from transfer state during initialization
     return bootstrap();
   } else {
+    // Configuration must be fetched explicitly
     return fetch('assets/config.json')
       .then((response) => response.json())
       .then((appConfig: AppConfig) => {
         // extend environment with app config for browser when not prerendered
         extendEnvironmentWithAppConfig(environment, appConfig);
-
         return bootstrap();
       });
   }
 };
 
 // support async tag or hmr
-if (document.readyState === 'complete' && hasValue(environment.universal) && !environment.universal.preboot) {
+if (document.readyState === 'complete' && !hasTransferState) {
   main();
 } else {
   document.addEventListener('DOMContentLoaded', main);
diff --git a/src/main.server.ts b/src/main.server.ts
index 91425136f8..422fcd8146 100644
--- a/src/main.server.ts
+++ b/src/main.server.ts
@@ -1,14 +1,14 @@
 import 'core-js/es/reflect';
 import 'zone.js';
 import 'reflect-metadata';
-
-import { enableProdMode } from '@angular/core';
 /******************************************************************
  * Load `$localize` - not used for i18n in this project, we use ngx-translate.
  * It's used for localization of dates, numbers, currencies, etc.
  */
 import '@angular/localize/init';
 
+import { enableProdMode } from '@angular/core';
+
 import { environment } from './environments/environment';
 
 if (environment.production) {
@@ -16,5 +16,5 @@ if (environment.production) {
 }
 
 export { ServerAppModule } from './modules/app/server-app.module';
+export { renderModuleFactory } from '@angular/platform-server';
 export { ngExpressEngine } from '@nguniversal/express-engine';
-export { renderModule, renderModuleFactory } from '@angular/platform-server';
diff --git a/src/mirador-viewer/index.js b/src/mirador-viewer/config.default.js
similarity index 88%
rename from src/mirador-viewer/index.js
rename to src/mirador-viewer/config.default.js
index 6cc4303f1f..71df8adcc3 100644
--- a/src/mirador-viewer/index.js
+++ b/src/mirador-viewer/config.default.js
@@ -1,4 +1,17 @@
 import Mirador from 'mirador/dist/es/src/index';
+
+// You can modify this default Mirador configuration file. However,
+// you should consider creating a copy of this file named
+// 'config.local.js'. If that file exists it will be used to build
+// your local Mirador instance. This allows you to keep local
+// Mirador configuration separate from this default distribution
+// copy.
+
+// For an example of all Mirador configuration options, see
+// https://github.com/ProjectMirador/mirador/blob/master/src/config/settings.js
+
+// You can add or remove plugins. When adding new plugins be sure to also
+// import them into the project via your package.json dependencies.
 import miradorShareDialogPlugin from 'mirador-share-plugin/es/MiradorShareDialog';
 import miradorSharePlugin from 'mirador-share-plugin/es/miradorSharePlugin';
 import miradorDownloadPlugin from 'mirador-dl-plugin/es/miradorDownloadPlugin';
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index 6e3ebf5d37..46e575b53c 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -1,41 +1,54 @@
-import { HttpClient, HttpClientModule } from '@angular/common/http';
+import {
+  HttpClient,
+  HttpClientModule,
+} from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { BrowserModule, BrowserTransferStateModule, makeStateKey, TransferState } from '@angular/platform-browser';
+import {
+  BrowserModule,
+  BrowserTransferStateModule,
+  makeStateKey,
+  TransferState,
+} from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { REQUEST } from '@nguniversal/express-engine/tokens';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader';
-
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
 import { IdlePreloadModule } from 'angular-idle-preload';
+import {
+  Angulartics2GoogleTagManager,
+  Angulartics2RouterlessModule,
+} from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
-
 import { AppModule } from '../../app/app.module';
-import { ClientCookieService } from '../../app/core/services/client-cookie.service';
-import { CookieService } from '../../app/core/services/cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
-import { Angulartics2GoogleTagManager, Angulartics2RouterlessModule } from 'angulartics2';
-import { SubmissionService } from '../../app/submission/submission.service';
-import { StatisticsModule } from '../../app/statistics/statistics.module';
-import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
-import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
+import { AuthRequestService } from '../../app/core/auth/auth-request.service';
+import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service';
+import { LocaleService } from '../../app/core/locale/locale.service';
+import { BrowserReferrerService } from '../../app/core/services/browser.referrer.service';
 import {
   BrowserHardRedirectService,
   locationProvider,
-  LocationToken
+  LocationToken,
 } from '../../app/core/services/browser-hard-redirect.service';
-import { LocaleService } from '../../app/core/locale/locale.service';
+import { ClientCookieService } from '../../app/core/services/client-cookie.service';
+import { CookieService } from '../../app/core/services/cookie.service';
+import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
+import { ReferrerService } from '../../app/core/services/referrer.service';
+import { BrowserKlaroService } from '../../app/shared/cookies/browser-klaro.service';
+import { KlaroService } from '../../app/shared/cookies/klaro.service';
 import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
-import { AuthRequestService } from '../../app/core/auth/auth-request.service';
-import { BrowserAuthRequestService } from '../../app/core/auth/browser-auth-request.service';
+import { StatisticsModule } from '../../app/statistics/statistics.module';
+import { SubmissionService } from '../../app/submission/submission.service';
+import { TranslateBrowserLoader } from '../../ngx-translate-loaders/translate-browser.loader';
 import { BrowserInitService } from './browser-init.service';
 
 export const REQ_KEY = makeStateKey<string>('req');
 
 export function createTranslateLoader(transferState: TransferState, http: HttpClient) {
-  return new TranslateBrowserLoader(transferState, http, 'assets/i18n/', '.json5');
+  return new TranslateBrowserLoader(transferState, http, 'assets/i18n/', '.json');
 }
 
 export function getRequest(transferState: TransferState): any {
@@ -46,7 +59,7 @@ export function getRequest(transferState: TransferState): any {
   bootstrap: [AppComponent],
   imports: [
     BrowserModule.withServerTransition({
-      appId: 'dspace-angular'
+      appId: 'dspace-angular',
     }),
     HttpClientModule,
     // forRoot ensures the providers are only created once
@@ -59,37 +72,37 @@ export function getRequest(transferState: TransferState): any {
       loader: {
         provide: TranslateLoader,
         useFactory: (createTranslateLoader),
-        deps: [TransferState, HttpClient]
-      }
+        deps: [TransferState, HttpClient],
+      },
     }),
-    AppModule
+    AppModule,
   ],
   providers: [
     ...BrowserInitService.providers(),
     {
       provide: REQUEST,
       useFactory: getRequest,
-      deps: [TransferState]
+      deps: [TransferState],
     },
     {
       provide: AuthService,
-      useClass: AuthService
+      useClass: AuthService,
     },
     {
       provide: CookieService,
-      useClass: ClientCookieService
+      useClass: ClientCookieService,
     },
     {
       provide: KlaroService,
-      useClass: BrowserKlaroService
+      useClass: BrowserKlaroService,
     },
     {
       provide: SubmissionService,
-      useClass: SubmissionService
+      useClass: SubmissionService,
     },
     {
       provide: LocaleService,
-      useClass: LocaleService
+      useClass: LocaleService,
     },
     {
       provide: HardRedirectService,
@@ -101,17 +114,21 @@ export function getRequest(transferState: TransferState): any {
     },
     {
       provide: Angulartics2GoogleTagManager,
-      useClass: Angulartics2GoogleTagManager
+      useClass: Angulartics2GoogleTagManager,
     },
     {
       provide: AuthRequestService,
       useClass: BrowserAuthRequestService,
     },
+    {
+      provide: ReferrerService,
+      useClass: BrowserReferrerService,
+    },
     {
       provide: LocationToken,
       useFactory: locationProvider,
     },
-  ]
+  ],
 })
 export class BrowserAppModule {
 }
diff --git a/src/modules/app/browser-init.service.ts b/src/modules/app/browser-init.service.ts
index 1135de5e93..a4e907bbfb 100644
--- a/src/modules/app/browser-init.service.ts
+++ b/src/modules/app/browser-init.service.ts
@@ -5,36 +5,61 @@
  *
  * http://www.dspace.org/license/
  */
-import { InitService } from '../../app/init.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../app/app.reducer';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { TransferState } from '@angular/platform-browser';
-import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
-import { DefaultAppConfig } from '../../config/default-app-config';
-import { extendEnvironmentWithAppConfig } from '../../config/config.util';
-import { environment } from '../../environments/environment';
-import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
-import { Inject, Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  firstValueFrom,
+  Subscription,
+} from 'rxjs';
+import {
+  filter,
+  find,
+  map,
+} from 'rxjs/operators';
+
+import { logStartupMessage } from '../../../startup-message';
+import { AppState } from '../../app/app.reducer';
+import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
+import { AuthService } from '../../app/core/auth/auth.service';
+import { coreSelector } from '../../app/core/core.selectors';
+import { RootDataService } from '../../app/core/data/root-data.service';
 import { LocaleService } from '../../app/core/locale/locale.service';
+import { MetadataService } from '../../app/core/metadata/metadata.service';
+import { ServerCheckGuard } from '../../app/core/server-check/server-check.guard';
+import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
+import { InitService } from '../../app/init.service';
+import { KlaroService } from '../../app/shared/cookies/klaro.service';
+import { isNotEmpty } from '../../app/shared/empty.util';
+import { MenuService } from '../../app/shared/menu/menu.service';
+import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
 import { GoogleAnalyticsService } from '../../app/statistics/google-analytics.service';
-import { MetadataService } from '../../app/core/metadata/metadata.service';
-import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
-import { KlaroService } from '../../app/shared/cookies/klaro.service';
-import { AuthService } from '../../app/core/auth/auth.service';
-import { ThemeService } from '../../app/shared/theme-support/theme.service';
-import { StoreAction, StoreActionTypes } from '../../app/store.actions';
-import { coreSelector } from '../../app/core/core.selectors';
-import { find, map } from 'rxjs/operators';
-import { isNotEmpty } from '../../app/shared/empty.util';
-import { logStartupMessage } from '../../../startup-message';
+import {
+  StoreAction,
+  StoreActionTypes,
+} from '../../app/store.actions';
+import {
+  APP_CONFIG,
+  APP_CONFIG_STATE,
+  AppConfig,
+} from '../../config/app-config.interface';
+import { extendEnvironmentWithAppConfig } from '../../config/config.util';
+import { DefaultAppConfig } from '../../config/default-app-config';
+import { environment } from '../../environments/environment';
 
 /**
  * Performs client-side initialization.
  */
 @Injectable()
 export class BrowserInitService extends InitService {
+
+  sub: Subscription;
+
   constructor(
     protected store: Store<AppState>,
     protected correlationIdService: CorrelationIdService,
@@ -49,6 +74,9 @@ export class BrowserInitService extends InitService {
     protected klaroService: KlaroService,
     protected authService: AuthService,
     protected themeService: ThemeService,
+    protected menuService: MenuService,
+    private rootDataService: RootDataService,
+    protected serverCheckGuard: ServerCheckGuard,
   ) {
     super(
       store,
@@ -60,6 +88,7 @@ export class BrowserInitService extends InitService {
       metadata,
       breadcrumbsService,
       themeService,
+      menuService,
     );
   }
 
@@ -77,6 +106,7 @@ export class BrowserInitService extends InitService {
     return async () => {
       await this.loadAppState();
       this.checkAuthenticationToken();
+      this.externalAuthCheck();
       this.initCorrelationId();
 
       this.checkEnvironment();
@@ -110,7 +140,7 @@ export class BrowserInitService extends InitService {
     this.store.dispatch(new StoreAction(StoreActionTypes.REHYDRATE, state));
     return this.store.select(coreSelector).pipe(
       find((core: any) => isNotEmpty(core)),
-      map(() => true)
+      map(() => true),
     ).toPromise();
   }
 
@@ -131,4 +161,44 @@ export class BrowserInitService extends InitService {
   protected initGoogleAnalytics() {
     this.googleAnalyticsService.addTrackingIdToPage();
   }
+
+  /**
+   * During an external authentication flow invalidate the SSR transferState
+   * 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.authService.setExternalAuthStatus(false);
+    },
+    );
+
+    this.closeAuthCheckSubscription();
+  }
+
+  /**
+   * Unsubscribe the external authentication subscription
+   * when authentication is no longer blocking.
+   * @private
+   */
+  private closeAuthCheckSubscription() {
+    firstValueFrom(this.authenticationReady$()).then(() => {
+      this.sub.unsubscribe();
+    });
+  }
+
+  /**
+   * 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 fa529c4ad9..89e2142461 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -1,44 +1,58 @@
+import { XhrFactory } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { BrowserModule, TransferState } from '@angular/platform-browser';
+import {
+  BrowserModule,
+  TransferState,
+} from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { ServerModule, ServerTransferStateModule } from '@angular/platform-server';
-
-import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
-
-import { Angulartics2, Angulartics2GoogleAnalytics, Angulartics2GoogleTagManager } from 'angulartics2';
+import {
+  ServerModule,
+  ServerTransferStateModule,
+} from '@angular/platform-server';
+import {
+  TranslateLoader,
+  TranslateModule,
+} from '@ngx-translate/core';
+import {
+  Angulartics2,
+  Angulartics2GoogleAnalytics,
+  Angulartics2GoogleGlobalSiteTag,
+} from 'angulartics2';
 
 import { AppComponent } from '../../app/app.component';
-
 import { AppModule } from '../../app/app.module';
-import { TranslateServerLoader } from '../../ngx-translate-loaders/translate-server.loader';
-import { CookieService } from '../../app/core/services/cookie.service';
-import { ServerCookieService } from '../../app/core/services/server-cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
-import { ServerAuthService } from '../../app/core/auth/server-auth.service';
-import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
-import { SubmissionService } from '../../app/submission/submission.service';
-import { ServerSubmissionService } from '../../app/submission/server-submission.service';
-import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
-import { ServerLocaleService } from '../../app/core/locale/server-locale.service';
-import { LocaleService } from '../../app/core/locale/locale.service';
-import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
-import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
-import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
-import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock';
 import { AuthRequestService } from '../../app/core/auth/auth-request.service';
+import { ServerAuthService } from '../../app/core/auth/server-auth.service';
 import { ServerAuthRequestService } from '../../app/core/auth/server-auth-request.service';
+import { ForwardClientIpInterceptor } from '../../app/core/forward-client-ip/forward-client-ip.interceptor';
+import { LocaleService } from '../../app/core/locale/locale.service';
+import { ServerLocaleService } from '../../app/core/locale/server-locale.service';
+import { CookieService } from '../../app/core/services/cookie.service';
+import { HardRedirectService } from '../../app/core/services/hard-redirect.service';
+import { ReferrerService } from '../../app/core/services/referrer.service';
+import { ServerReferrerService } from '../../app/core/services/server.referrer.service';
+import { ServerCookieService } from '../../app/core/services/server-cookie.service';
+import { ServerHardRedirectService } from '../../app/core/services/server-hard-redirect.service';
+import { ServerXhrService } from '../../app/core/services/server-xhr.service';
+import { AngularticsProviderMock } from '../../app/shared/mocks/angulartics-provider.service.mock';
+import { Angulartics2Mock } from '../../app/shared/mocks/angulartics2.service.mock';
+import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
+import { ServerSubmissionService } from '../../app/submission/server-submission.service';
+import { SubmissionService } from '../../app/submission/submission.service';
+import { TranslateServerLoader } from '../../ngx-translate-loaders/translate-server.loader';
 import { ServerInitService } from './server-init.service';
 
 export function createTranslateLoader(transferState: TransferState) {
-  return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json5');
+  return new TranslateServerLoader(transferState, 'dist/server/assets/i18n/', '.json');
 }
 
 @NgModule({
   bootstrap: [AppComponent],
   imports: [
     BrowserModule.withServerTransition({
-      appId: 'dspace-angular'
+      appId: 'dspace-angular',
     }),
     NoopAnimationsModule,
     ServerTransferStateModule,
@@ -46,8 +60,8 @@ export function createTranslateLoader(transferState: TransferState) {
       loader: {
         provide: TranslateLoader,
         useFactory: (createTranslateLoader),
-        deps: [TransferState]
-      }
+        deps: [TransferState],
+      },
     }),
     AppModule,
     ServerModule,
@@ -56,31 +70,31 @@ export function createTranslateLoader(transferState: TransferState) {
     ...ServerInitService.providers(),
     {
       provide: Angulartics2,
-      useClass: Angulartics2Mock
+      useClass: Angulartics2Mock,
     },
     {
       provide: Angulartics2GoogleAnalytics,
-      useClass: AngularticsProviderMock
+      useClass: AngularticsProviderMock,
     },
     {
-      provide: Angulartics2GoogleTagManager,
-      useClass: AngularticsProviderMock
+      provide: Angulartics2GoogleGlobalSiteTag,
+      useClass: AngularticsProviderMock,
     },
     {
       provide: Angulartics2DSpace,
-      useClass: AngularticsProviderMock
+      useClass: AngularticsProviderMock,
     },
     {
       provide: AuthService,
-      useClass: ServerAuthService
+      useClass: ServerAuthService,
     },
     {
       provide: CookieService,
-      useClass: ServerCookieService
+      useClass: ServerCookieService,
     },
     {
       provide: SubmissionService,
-      useClass: ServerSubmissionService
+      useClass: ServerSubmissionService,
     },
     {
       provide: AuthRequestService,
@@ -88,19 +102,27 @@ export function createTranslateLoader(transferState: TransferState) {
     },
     {
       provide: LocaleService,
-      useClass: ServerLocaleService
+      useClass: ServerLocaleService,
     },
     // register ForwardClientIpInterceptor as HttpInterceptor
     {
       provide: HTTP_INTERCEPTORS,
       useClass: ForwardClientIpInterceptor,
-      multi: true
+      multi: true,
     },
     {
       provide: HardRedirectService,
       useClass: ServerHardRedirectService,
     },
-  ]
+    {
+      provide: XhrFactory,
+      useClass: ServerXhrService,
+    },
+    {
+      provide: ReferrerService,
+      useClass: ServerReferrerService,
+    },
+  ],
 })
 export class ServerAppModule {
 }
diff --git a/src/modules/app/server-init.service.ts b/src/modules/app/server-init.service.ts
index e93c692cd7..8849e8f00e 100644
--- a/src/modules/app/server-init.service.ts
+++ b/src/modules/app/server-init.service.ts
@@ -5,23 +5,31 @@
  *
  * http://www.dspace.org/license/
  */
-import { InitService } from '../../app/init.service';
-import { Store } from '@ngrx/store';
-import { AppState } from '../../app/app.reducer';
+import {
+  Inject,
+  Injectable,
+} from '@angular/core';
 import { TransferState } from '@angular/platform-browser';
-import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
-import { APP_CONFIG, APP_CONFIG_STATE, AppConfig } from '../../config/app-config.interface';
-import { environment } from '../../environments/environment';
-import { Inject, Injectable } from '@angular/core';
+import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
-import { LocaleService } from '../../app/core/locale/locale.service';
-import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
-import { MetadataService } from '../../app/core/metadata/metadata.service';
-import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
-import { CSSVariableService } from '../../app/shared/sass-helper/sass-helper.service';
-import { ThemeService } from '../../app/shared/theme-support/theme.service';
 import { take } from 'rxjs/operators';
 
+import { AppState } from '../../app/app.reducer';
+import { BreadcrumbsService } from '../../app/breadcrumbs/breadcrumbs.service';
+import { LocaleService } from '../../app/core/locale/locale.service';
+import { MetadataService } from '../../app/core/metadata/metadata.service';
+import { CorrelationIdService } from '../../app/correlation-id/correlation-id.service';
+import { InitService } from '../../app/init.service';
+import { MenuService } from '../../app/shared/menu/menu.service';
+import { ThemeService } from '../../app/shared/theme-support/theme.service';
+import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
+import {
+  APP_CONFIG,
+  APP_CONFIG_STATE,
+  AppConfig,
+} from '../../config/app-config.interface';
+import { environment } from '../../environments/environment';
+
 /**
  * Performs server-side initialization.
  */
@@ -37,8 +45,8 @@ export class ServerInitService extends InitService {
     protected angulartics2DSpace: Angulartics2DSpace,
     protected metadata: MetadataService,
     protected breadcrumbsService: BreadcrumbsService,
-    protected cssService: CSSVariableService,
     protected themeService: ThemeService,
+    protected menuService: MenuService,
   ) {
     super(
       store,
@@ -50,6 +58,7 @@ export class ServerInitService extends InitService {
       metadata,
       breadcrumbsService,
       themeService,
+      menuService,
     );
   }
 
diff --git a/src/ngx-translate-loaders/translate-browser.loader.ts b/src/ngx-translate-loaders/translate-browser.loader.ts
index 217f301bd5..48ccbc466a 100644
--- a/src/ngx-translate-loaders/translate-browser.loader.ts
+++ b/src/ngx-translate-loaders/translate-browser.loader.ts
@@ -1,11 +1,18 @@
-import { TranslateLoader } from '@ngx-translate/core';
 import { HttpClient } from '@angular/common/http';
 import { TransferState } from '@angular/platform-browser';
-import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
-import { hasValue } from '../app/shared/empty.util';
+import { TranslateLoader } from '@ngx-translate/core';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 import { map } from 'rxjs/operators';
-import { of as observableOf, Observable } from 'rxjs';
-import * as JSON5 from 'json5';
+
+import { hasValue } from '../app/shared/empty.util';
+import { environment } from '../environments/environment';
+import {
+  NGX_TRANSLATE_STATE,
+  NgxTranslateState,
+} from './ngx-translate-state';
 
 /**
  * A TranslateLoader for ngx-translate to retrieve i18n messages from the TransferState, or download
@@ -16,7 +23,7 @@ export class TranslateBrowserLoader implements TranslateLoader {
     protected transferState: TransferState,
     protected http: HttpClient,
     protected prefix?: string,
-    protected suffix?: string
+    protected suffix?: string,
   ) {
   }
 
@@ -34,10 +41,11 @@ 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(
-        map((json: any) => JSON5.parse(json))
+      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 4ba6ccd5e9..d86251e008 100644
--- a/src/ngx-translate-loaders/translate-server.loader.ts
+++ b/src/ngx-translate-loaders/translate-server.loader.ts
@@ -1,10 +1,15 @@
-import { TranslateLoader } from '@ngx-translate/core';
-import { Observable, of as observableOf } from 'rxjs';
-import * as fs from 'fs';
 import { TransferState } from '@angular/platform-browser';
-import { NGX_TRANSLATE_STATE, NgxTranslateState } from './ngx-translate-state';
+import { TranslateLoader } from '@ngx-translate/core';
+import { readFileSync } from 'fs';
+import {
+  Observable,
+  of as observableOf,
+} from 'rxjs';
 
-const JSON5 = require('json5').default;
+import {
+  NGX_TRANSLATE_STATE,
+  NgxTranslateState,
+} from './ngx-translate-state';
 
 /**
  * A TranslateLoader for ngx-translate to parse json5 files server-side, and store them in the
@@ -15,7 +20,7 @@ export class TranslateServerLoader implements TranslateLoader {
   constructor(
     protected transferState: TransferState,
     protected prefix: string = 'dist/assets/i18n/',
-    protected suffix: string = '.json'
+    protected suffix: string = '.json',
   ) {
   }
 
@@ -25,8 +30,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 = JSON5.parse(fs.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);
@@ -45,7 +51,7 @@ export class TranslateServerLoader implements TranslateLoader {
   protected storeInTransferState(lang: string, messages) {
     const prevState = this.transferState.get<NgxTranslateState>(NGX_TRANSLATE_STATE, {});
     const nextState = Object.assign({}, prevState, {
-      [lang]: messages
+      [lang]: messages,
     });
     this.transferState.set(NGX_TRANSLATE_STATE, nextState);
   }
diff --git a/src/polyfills.ts b/src/polyfills.ts
index e8ab71da80..9cde956bbb 100644
--- a/src/polyfills.ts
+++ b/src/polyfills.ts
@@ -48,11 +48,8 @@
 
 import 'core-js/es';
 import 'core-js/features/reflect';
-
 import 'zone.js';  // Included with Angular CLI.
-
 import 'reflect-metadata';
-
 /******************************************************************
  * Load `$localize` - not used for i18n in this project, we use ngx-translate.
  * It's used for localization of dates, numbers, currencies, etc.
diff --git a/src/robots.txt b/src/robots.txt.ejs
similarity index 97%
rename from src/robots.txt
rename to src/robots.txt.ejs
index 04cbb888e0..cd5e228b3a 100644
--- a/src/robots.txt
+++ b/src/robots.txt.ejs
@@ -1,7 +1,7 @@
 # The URL to the DSpace sitemaps
 # XML sitemap is listed first as it is preferred by most search engines
-Sitemap: /sitemap_index.xml
-Sitemap: /sitemap_index.html
+Sitemap: <%= origin %>/sitemap_index.xml
+Sitemap: <%= origin %>/sitemap_index.html
 
 ##########################
 # Default Access Group
diff --git a/src/styles/_bootstrap_variables.scss b/src/styles/_bootstrap_variables.scss
index 3b06efb9d5..c0da5ac020 100644
--- a/src/styles/_bootstrap_variables.scss
+++ b/src/styles/_bootstrap_variables.scss
@@ -1,51 +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;
+$enable-responsive-font-sizes: true !default;
+$enable-shadows: true !default;
 
-/** 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;
+/*** 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 ***/
+
+$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: $link-color !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: darken(#94BA65, 17%) !default;
+$ds-slider-handle-color: darken(#2B4E72, 17%) !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/_custom_variables.scss b/src/styles/_custom_variables.scss
index 2000e007a0..0dd1fd8e97 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)};
 
@@ -19,25 +19,57 @@
   --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: #{$cyan};
-  --ds-header-icon-color-hover: #{darken($white, 15%)};
-  --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,33 +90,60 @@
   --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);
   --ds-footer-padding: 0;
   --ds-footer-padding-bottom: 0;
   --ds-footer-logo-height: 50px;
+  --ds-footer-n-coar-height: 20px;
 
-  $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: #{darken($ds-breadcrumb-link-color, 30%)};
   --ds-breadcrumb-max-length: 200px;
 
-  --ds-slider-color: #{$green};
+  --ds-slider-color: #{$ds-slider-color};
   --ds-slider-handle-width: 18px;
+  --ds-slider-handle-color: #{$ds-slider-handle-color};
 
   --ds-search-form-scope-max-width: 150px;
 
+  --ds-context-x-offset: -16px;
+  --ds-context-help-icon-size: 16px;
+  --ds-context-help-tooltip-width: 300px;
+  --ds-context-help-tooltip-link-color: $white;
+
   --ds-gap: 0.25rem;
+
+  --ds-dso-edit-field-width: 210px;
+  --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};
+
+
+  --ds-item-page-img-field-default-inline-height: 24px;
+
+  --ds-qa-logo-width: 100px;
+
+  --ds-process-overview-table-nb-processes-badge-size: 0.5em;
+  --ds-process-overview-table-id-column-width: 120px;
+  --ds-process-overview-table-name-column-width: auto;
+  --ds-process-overview-table-user-column-width: 200px;
+  --ds-process-overview-table-info-column-width: 250px;
+  --ds-process-overview-table-actions-column-width: 80px;
 }
diff --git a/src/styles/_functions.scss b/src/styles/_functions.scss
index 4445b89727..37176f954a 100644
--- a/src/styles/_functions.scss
+++ b/src/styles/_functions.scss
@@ -1,12 +1,14 @@
+@use 'sass:math';
+
 @function calculateRem($size) {
-    $remSize: $size / 16px;
+    $remSize: math.div($size, 16px);
     @return $remSize;
 }
 
 
 @function strip-unit($number) {
     @if type-of($number) == 'number' and not unitless($number) {
-        @return $number / ($number * 0 + 1);
+        @return math.div($number , ($number * 0 + 1));
     }
     @return $number;
 }
diff --git a/src/styles/_global-styles.scss b/src/styles/_global-styles.scss
index 930384cf64..47e7d27f69 100644
--- a/src/styles/_global-styles.scss
+++ b/src/styles/_global-styles.scss
@@ -1,206 +1,449 @@
 html {
-  position: relative;
-  min-height: 100%;
+    position: relative;
+    min-height: 100%;
 }
 
 body {
-  overflow-x: hidden;
+    overflow-x: hidden;
 }
 
 // Sticky Footer
 .outer-wrapper {
-  display: flex;
-  margin: 0;
+    display: flex;
+    margin: 0;
 }
 
 .inner-wrapper {
-  flex: 1 1 auto;
-  flex-flow: column nowrap;
-  display: flex;
-  min-height: 100vh;
-  flex-direction: column;
-  width: 100%;
-  position: relative;
+    flex: 1 1 auto;
+    flex-flow: column nowrap;
+    display: flex;
+    min-height: 100vh;
+    flex-direction: column;
+    width: 100%;
+    position: relative;
 }
 
-.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);
+#main-content {
+    z-index: var(--ds-main-z-index);
+    flex: 1 1 100%;
 }
 
 .alert.hide {
-  padding: 0;
-  margin: 0;
-}
-
-ds-admin-sidebar {
-  position: fixed;
-  z-index: var(--ds-sidebar-z-index);
+    padding: 0;
+    margin: 0;
 }
 
 .sticky-top {
-  z-index: 0;
+    z-index: 0;
 }
 
 .media-viewer
-  .change-gallery
-  .ngx-gallery
-  ngx-gallery-preview.ngx-gallery-active {
-  right: 0;
-  left: auto;
-  width: calc(100% - 53px);
+.change-gallery
+.ngx-gallery
+ngx-gallery-preview.ngx-gallery-active {
+    right: 0;
+    left: auto;
+    width: calc(100% - 53px);
 }
 
 .ds-submission-reorder-dragging {
-  .ds-hint,
-  button {
-    display: none;
-  }
+    .ds-hint,
+    button {
+        display: none;
+    }
 }
 
 ngb-modal-backdrop {
-  // ng-bootsrap animates opacity, causing the fully opaque background to flash briefly before the transition starts
-  // animating background-color between transparent & a RGBA color instead looks smoother
-  &.fade {
-    opacity: 1 !important;
-    background-color: transparent;
-    transition: background-color 0.15s linear;
+    // ng-bootsrap animates opacity, causing the fully opaque background to flash briefly before the transition starts
+    // animating background-color between transparent & a RGBA color instead looks smoother
+    &.fade {
+        opacity: 1 !important;
+        background-color: transparent;
+        transition: background-color 0.15s linear;
 
-    &.show {
-      background-color: rgba(0, 0, 0, 0.5);
+        &.show {
+            background-color: rgba(0, 0, 0, 0.5);
+        }
     }
-  }
 }
 
 .dont-break-out {
-  /* These are technically the same, but use both */
-  overflow-wrap: break-word;
-  word-wrap: break-word;
+    /* These are technically the same, but use both */
+    overflow-wrap: break-word;
+    word-wrap: break-word;
 
-  -ms-word-break: break-all;
-  /* This is the dangerous one in WebKit, as it breaks things wherever */
-  word-break: break-all;
-  /* Instead use this non-standard one: */
-  word-break: break-word;
+    -ms-word-break: break-all;
+    /* This is the dangerous one in WebKit, as it breaks things wherever */
+    word-break: break-all;
+    /* Instead use this non-standard one: */
+    word-break: break-word;
 
-  /* Adds a hyphen where the word breaks, if supported (No Blink) */
-  -ms-hyphens: auto;
-  -moz-hyphens: auto;
-  -webkit-hyphens: auto;
-  hyphens: auto;
+    /* Adds a hyphen where the word breaks, if supported (No Blink) */
+    -ms-hyphens: auto;
+    -moz-hyphens: auto;
+    -webkit-hyphens: auto;
+    hyphens: auto;
 
 }
 
-.researcher-profile-switch button:focus{
-  outline: none !important;
+.researcher-profile-switch button:focus {
+    outline: none !important;
 }
-.researcher-profile-switch .switch.checked{
-  color: #fff;
+
+.researcher-profile-switch .switch.checked {
+    color: #fff;
 }
 
 /* Replicate default spacing look ~ preserveWhitespace=true
    To be used e.g. on a div containing buttons that should have a bit of spacing in between
  */
 .space-children-mr > :not(:last-child) {
-  margin-right: var(--ds-gap);
+    margin-right: var(--ds-gap);
 }
 
 /* Complement .space-children-mr when spaced elements are not on the same level */
 .mr-gap {
-  margin-right: var(--ds-gap);
+    margin-right: var(--ds-gap);
 }
 
 .ml-gap {
-  margin-left: var(--ds-gap);
+    margin-left: var(--ds-gap);
 }
 
 .custom-accordion .card-header button {
-  -webkit-box-shadow: none!important;
-  box-shadow: none!important;
-  width: 100%;
+    -webkit-box-shadow: none !important;
+    box-shadow: none !important;
+    width: 100%;
 }
+
 .custom-accordion .card:first-of-type {
-  border-bottom: var(--bs-card-border-width) solid var(--bs-card-border-color) !important;
-  border-bottom-left-radius: var(--bs-card-border-radius) !important;
-  border-bottom-right-radius: var(--bs-card-border-radius) !important;
+    border-bottom: var(--bs-card-border-width) solid var(--bs-card-border-color) !important;
+    border-bottom-left-radius: var(--bs-card-border-radius) !important;
+    border-bottom-right-radius: var(--bs-card-border-radius) !important;
 }
 
 ds-dynamic-form-control-container.d-none {
-  /* Ensures that form-control containers hidden and disabled by type binding collapse and let other fields in
-     the same row expand accordingly
-   */
-  visibility: collapse;
+    /* Ensures that form-control containers hidden and disabled by type binding collapse and let other fields in
+       the same row expand accordingly
+     */
+    visibility: collapse;
 }
 
 /* Used for dso administrative functionality */
 .btn-dark {
-  background-color: var(--ds-admin-sidebar-bg);
+    background-color: var(--ds-admin-sidebar-bg);
 }
 
 .preserve-line-breaks {
-  white-space: pre-line;
+    white-space: pre-line;
 }
 
 /* Thumbnail styles */
 .hide-placeholder-text {
-  .thumbnail-placeholder {
-    color: transparent !important;
-  }
+    .thumbnail-placeholder {
+        color: transparent !important;
+    }
 }
 
 /* Used to hide the thumbnail column in modals. */
 .hide-modal-thumbnail-column {
-  .modal-body ds-listable-object-component-loader div.row > div:first-child {
-    display: none;
-  }
-  .modal-body ds-listable-object-component-loader div.row > div:nth-child(2) {
-    flex: 0 0 100%;
-    max-width: 100%;
-  }
+    .modal-body ds-listable-object-component-loader div.row > div:first-child {
+        display: none;
+    }
+
+    .modal-body ds-listable-object-component-loader div.row > div:nth-child(2) {
+        flex: 0 0 100%;
+        max-width: 100%;
+    }
 }
 
 /* The font sizes used in "no thumbnail" placeholder */
 .thumb-font-0 {
-  .thumbnail-placeholder {
-    @media screen and (max-width: map-get($grid-breakpoints, lg)) {
-      font-size: 0.7rem;
-      padding: 0.2rem;
+    .thumbnail-placeholder {
+        @media screen and (max-width: map-get($grid-breakpoints, lg)) {
+            font-size: 0.7rem;
+            padding: 0.2rem;
+        }
+        @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+            font-size: 0.6rem;
+            padding: 0.1rem;
+        }
+        font-size: 0.4rem;
+        padding: 0.1rem;
     }
-    @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-      font-size: 0.6rem;
-      padding: 0.1rem;
-    }
-    font-size: 0.4rem;
-    padding: 0.1rem;
-  }
 }
+
 .thumb-font-1 {
-  .thumbnail-placeholder {
-    @media screen and (max-width: map-get($grid-breakpoints, sm)) {
-      font-size: 0.9rem;
-      padding: 0.1rem;
+    .thumbnail-placeholder {
+        @media screen and (max-width: map-get($grid-breakpoints, sm)) {
+            font-size: 0.9rem;
+            padding: 0.1rem;
+        }
+        @media screen and (max-width: 950px) {
+            font-size: 0.4rem;
+            padding: 0.1rem;
+        }
+        font-size: 0.5rem;
+        padding: 0.125rem;
     }
-    @media screen and (max-width: 950px) {
-      font-size: 0.4rem;
-      padding: 0.1rem;
-    }
-    font-size: 0.5rem;
-    padding: 0.125rem;
-  }
 }
+
 .thumb-font-2 {
-  .thumbnail-placeholder {
-    font-size: 0.9rem;
-    padding: 0.125rem;
-  }
+    .thumbnail-placeholder {
+        font-size: 0.9rem;
+        padding: 0.125rem;
+    }
 }
+
 .thumb-font-3 {
-  .thumbnail-placeholder {
-    font-size: 1.25rem;
-    padding: 0.5rem;
-  }
+    .thumbnail-placeholder {
+        font-size: 1.25rem;
+        padding: 0.5rem;
+    }
 }
 
+.btn.btn-link.btn-link-inline {
+    display: inline;
+    padding: 0;
 
+    &:not(:disabled){
+        &:hover, &:focus {
+            box-shadow: none;
+        }
+    }
+
+}
+
+.badge-validation {
+    background-color: #{map-get($theme-colors, warning)};
+}
+
+.badge-waiting-controller {
+    background-color: #{map-get($theme-colors, info)};
+}
+
+.badge-workspace {
+    background-color: #{map-get($theme-colors, primary)};
+}
+
+.badge-archived {
+    background-color: darken($green, 25);
+}
+
+.badge-workflow {
+    background-color: #{map-get($theme-colors, info)};
+}
+
+.badge-item-type {
+    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;
+}
+
+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;
+}
+
+/* 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); }
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/_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/test.ts b/src/test.ts
index 477195418b..0c1e301f46 100644
--- a/src/test.ts
+++ b/src/test.ts
@@ -1,21 +1,20 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js/testing';
+
 import { getTestBed } from '@angular/core/testing';
-import { MockStore } from '@ngrx/store/testing';
 import {
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
+  platformBrowserDynamicTesting,
 } from '@angular/platform-browser-dynamic/testing';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-
-declare const require: any;
+import { MockStore } from '@ngrx/store/testing';
 
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
   platformBrowserDynamicTesting(),
-  { teardown: { destroyAfterEach: false } }
+  { teardown: { destroyAfterEach: false } },
 );
 
 jasmine.getEnv().afterEach(() => {
@@ -24,8 +23,3 @@ jasmine.getEnv().afterEach(() => {
   // Close any leftover modals
   getTestBed().inject(NgbModal, null)?.dismissAll?.();
 });
-
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
index 6485ad98e6..0de3948305 100644
--- a/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/themes/custom/app/admin/admin-sidebar/admin-sidebar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin/admin-sidebar/admin-sidebar.component';
 
 /**
@@ -9,7 +10,7 @@ import { AdminSidebarComponent as BaseComponent } from '../../../../../app/admin
   // templateUrl: './admin-sidebar.component.html',
   templateUrl: '../../../../../app/admin/admin-sidebar/admin-sidebar.component.html',
   // styleUrls: ['./admin-sidebar.component.scss']
-  styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss']
+  styleUrls: ['../../../../../app/admin/admin-sidebar/admin-sidebar.component.scss'],
 })
 export class AdminSidebarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
new file mode 100644
index 0000000000..353a46c16d
--- /dev/null
+++ b/src/themes/custom/app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.ts
@@ -0,0 +1,17 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { EditBitstreamPageComponent as BaseComponent } from '../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
+
+@Component({
+  selector: 'ds-edit-bitstream-page',
+  // styleUrls: ['./edit-bitstream-page.component.scss'],
+  styleUrls: ['../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.scss'],
+  // templateUrl: './edit-bitstream-page.component.html',
+  templateUrl: '../../../../../app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class EditBitstreamPageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
index 32d00fc8b6..f446dbb6a8 100644
--- a/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
+++ b/src/themes/custom/app/breadcrumbs/breadcrumbs.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { BreadcrumbsComponent as BaseComponent } from '../../../../app/breadcrumbs/breadcrumbs.component';
 
 /**
@@ -9,7 +10,7 @@ import { BreadcrumbsComponent as BaseComponent } from '../../../../app/breadcrum
   // templateUrl: './breadcrumbs.component.html',
   templateUrl: '../../../../app/breadcrumbs/breadcrumbs.component.html',
   // styleUrls: ['./breadcrumbs.component.scss']
-  styleUrls: ['../../../../app/breadcrumbs/breadcrumbs.component.scss']
+  styleUrls: ['../../../../app/breadcrumbs/breadcrumbs.component.scss'],
 })
 export class BreadcrumbsComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts b/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
deleted file mode 100644
index 9fcf773350..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-date-page/browse-by-date-page.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByDatePageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date-page/browse-by-date-page.component';
-
-@Component({
-  selector: 'ds-browse-by-date-page',
-  // styleUrls: ['./browse-by-date-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  // templateUrl: './browse-by-date-page.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-
-export class BrowseByDatePageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.html b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.scss b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
new file mode 100644
index 0000000000..b07a946b87
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-date/browse-by-date.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByDateComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-date/browse-by-date.component';
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-date',
+  // styleUrls: ['./browse-by-date.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
+  // templateUrl: './browse-by-date.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+})
+@rendersBrowseBy(BrowseByDataType.Date, Context.Any, 'custom')
+export class BrowseByDateComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
deleted file mode 100644
index 9434ca936d..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByMetadataPageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
-
-@Component({
-  selector: 'ds-browse-by-metadata-page',
-  // styleUrls: ['./browse-by-metadata-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  // templateUrl: './browse-by-metadata-page.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-
-export class BrowseByMetadataPageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.html b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
new file mode 100644
index 0000000000..70d7d00dad
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-metadata/browse-by-metadata.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByMetadataComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component';
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-metadata',
+  // styleUrls: ['./browse-by-metadata.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
+  // templateUrl: './browse-by-metadata.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+})
+@rendersBrowseBy(BrowseByDataType.Metadata, Context.Any, 'custom')
+export class BrowseByMetadataComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts b/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
deleted file mode 100644
index e65997eaf4..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-switcher/browse-by-switcher.component.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseBySwitcherComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component';
-
-@Component({
-  selector: 'ds-browse-by-switcher',
-  // styleUrls: ['./browse-by-switcher.component.scss'],
-  // templateUrl: './browse-by-switcher.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-switcher/browse-by-switcher.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-export class BrowseBySwitcherComponent extends BaseComponent {}
-
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
new file mode 100644
index 0000000000..a33899f89e
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { BrowseByTaxonomyComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-taxonomy',
+  // templateUrl: './browse-by-taxonomy.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.html',
+  // styleUrls: ['./browse-by-taxonomy.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component.scss'],
+})
+@rendersBrowseBy(BrowseByDataType.Hierarchy, Context.Any, 'custom')
+export class BrowseByTaxonomyComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts b/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
deleted file mode 100644
index ed96a81110..0000000000
--- a/src/themes/custom/app/browse-by/browse-by-title-page/browse-by-title-page.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import { BrowseByTitlePageComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title-page/browse-by-title-page.component';
-
-@Component({
-  selector: 'ds-browse-by-title-page',
-  // styleUrls: ['./browse-by-title-page.component.scss'],
-  styleUrls: ['../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.scss'],
-  // templateUrl: './browse-by-title-page.component.html'
-  templateUrl: '../../../../../app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component.html'
-})
-
-/**
- * Component for determining what Browse-By component to use depending on the metadata (browse ID) provided
- */
-
-export class BrowseByTitlePageComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.html b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.scss b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
new file mode 100644
index 0000000000..e6a14b0041
--- /dev/null
+++ b/src/themes/custom/app/browse-by/browse-by-title/browse-by-title.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { BrowseByDataType } from '../../../../../app/browse-by/browse-by-switcher/browse-by-data-type';
+import { rendersBrowseBy } from '../../../../../app/browse-by/browse-by-switcher/browse-by-decorator';
+import { BrowseByTitleComponent as BaseComponent } from '../../../../../app/browse-by/browse-by-title/browse-by-title.component';
+import { Context } from '../../../../../app/core/shared/context.model';
+
+@Component({
+  selector: 'ds-browse-by-title',
+  // styleUrls: ['./browse-by-title.component.scss'],
+  styleUrls: ['../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.scss'],
+  // templateUrl: './browse-by-title.component.html',
+  templateUrl: '../../../../../app/browse-by/browse-by-metadata/browse-by-metadata.component.html',
+})
+@rendersBrowseBy(BrowseByDataType.Title, Context.Any, 'custom')
+export class BrowseByTitleComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/collection-page/collection-page.component.ts b/src/themes/custom/app/collection-page/collection-page.component.ts
index d91c7025d7..197cd23420 100644
--- a/src/themes/custom/app/collection-page/collection-page.component.ts
+++ b/src/themes/custom/app/collection-page/collection-page.component.ts
@@ -1,6 +1,13 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { CollectionPageComponent as BaseComponent} from '../../../../app/collection-page/collection-page.component';
-import { fadeIn, fadeInOut } from '../../../../app/shared/animations/fade';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { CollectionPageComponent as BaseComponent } from '../../../../app/collection-page/collection-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../app/shared/animations/fade';
 
 
 @Component({
@@ -12,8 +19,8 @@ import { fadeIn, fadeInOut } from '../../../../app/shared/animations/fade';
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 /**
  * This component represents a detail page for a single collection
diff --git a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
index ad9f515dcf..41e185629f 100644
--- a/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
+++ b/src/themes/custom/app/collection-page/edit-item-template-page/edit-item-template-page.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-  EditItemTemplatePageComponent as BaseComponent
-} from '../../../../../app/collection-page/edit-item-template-page/edit-item-template-page.component';
+
+import { EditItemTemplatePageComponent as BaseComponent } from '../../../../../app/collection-page/edit-item-template-page/edit-item-template-page.component';
 
 @Component({
   selector: 'ds-edit-item-template-page',
diff --git a/src/themes/custom/app/community-list-page/community-list-page.component.ts b/src/themes/custom/app/community-list-page/community-list-page.component.ts
index 1dbfa15b40..0aa7cbf88a 100644
--- a/src/themes/custom/app/community-list-page/community-list-page.component.ts
+++ b/src/themes/custom/app/community-list-page/community-list-page.component.ts
@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
+
 import { CommunityListPageComponent as BaseComponent } from '../../../../app/community-list-page/community-list-page.component';
 
 @Component({
   selector: 'ds-community-list-page',
   // styleUrls: ['./community-list-page.component.scss'],
   // templateUrl: './community-list-page.component.html'
-  templateUrl: '../../../../app/community-list-page/community-list-page.component.html'
+  templateUrl: '../../../../app/community-list-page/community-list-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
index 61b538d641..e9d0024631 100644
--- a/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
+++ b/src/themes/custom/app/community-list-page/community-list/community-list.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CommunityListComponent as BaseComponent } from '../../../../../app/community-list-page/community-list/community-list.component';
 
 /**
@@ -12,7 +13,7 @@ import { CommunityListComponent as BaseComponent } from '../../../../../app/comm
   selector: 'ds-community-list',
   // styleUrls: ['./community-list.component.scss'],
   // templateUrl: './community-list.component.html'
-  templateUrl: '../../../../../app/community-list-page/community-list/community-list.component.html'
+  templateUrl: '../../../../../app/community-list-page/community-list/community-list.component.html',
 })
 export class CommunityListComponent extends BaseComponent {}
 
diff --git a/src/themes/custom/app/community-page/community-page.component.ts b/src/themes/custom/app/community-page/community-page.component.ts
index ce7d85dddc..9975544d8c 100644
--- a/src/themes/custom/app/community-page/community-page.component.ts
+++ b/src/themes/custom/app/community-page/community-page.component.ts
@@ -1,5 +1,9 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { CommunityPageComponent as BaseComponent} from '../../../../app/community-page/community-page.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { CommunityPageComponent as BaseComponent } from '../../../../app/community-page/community-page.component';
 import { fadeInOut } from '../../../../app/shared/animations/fade';
 
 
@@ -10,7 +14,7 @@ import { fadeInOut } from '../../../../app/shared/animations/fade';
   // styleUrls: ['./community-page.component.scss']
   styleUrls: ['../../../../app/community-page/community-page.component.scss'],
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 /**
  * This component represents a detail page for a single community
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
new file mode 100644
index 0000000000..0dee3d5a4d
--- /dev/null
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { CommunityPageSubCollectionListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+
+@Component({
+  selector: 'ds-community-page-sub-collection-list',
+  // styleUrls: ['./community-page-sub-collection-list.component.scss'],
+  styleUrls: ['../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.scss'],
+  // templateUrl: './community-page-sub-collection-list.component.html',
+  templateUrl: '../../../../../app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component.html',
+})
+export class CommunityPageSubCollectionListComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
new file mode 100644
index 0000000000..ca4fc71e16
--- /dev/null
+++ b/src/themes/custom/app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { CommunityPageSubCommunityListComponent as BaseComponent } from '../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+
+@Component({
+  selector: 'ds-community-page-sub-community-list',
+  // styleUrls: ['./community-page-sub-community-list.component.scss'],
+  styleUrls: ['../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.scss'],
+  // templateUrl: './community-page-sub-community-list.component.html',
+  templateUrl: '../../../../../../../app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component.html',
+})
+export class CommunityPageSubCommunityListComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
deleted file mode 100644
index a228fe1071..0000000000
--- a/src/themes/custom/app/community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { CommunityPageSubCollectionListComponent as BaseComponent }
-  from '../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component';
-
-@Component({
-  selector: 'ds-community-page-sub-collection-list',
-  // styleUrls: ['./community-page-sub-collection-list.component.scss'],
-  styleUrls: ['../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component.scss'],
-  // templateUrl: './community-page-sub-collection-list.component.html',
-  templateUrl: '../../../../../app/community-page/sub-collection-list/community-page-sub-collection-list.component.html'
-})
-export class CommunityPageSubCollectionListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
deleted file mode 100644
index 1db265a844..0000000000
--- a/src/themes/custom/app/community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-import { CommunityPageSubCommunityListComponent as BaseComponent }
-  from '../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component';
-
-@Component({
-  selector: 'ds-community-page-sub-community-list',
-  // styleUrls: ['./community-page-sub-community-list.component.scss'],
-  styleUrls: ['../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component.scss'],
-  // templateUrl: './community-page-sub-community-list.component.html',
-  templateUrl: '../../../../../app/community-page/sub-community-list/community-page-sub-community-list.component.html'
-})
-export class CommunityPageSubCommunityListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
new file mode 100644
index 0000000000..761d72c75f
--- /dev/null
+++ b/src/themes/custom/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { DsoEditMetadataComponent as BaseComponent } from '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
+
+@Component({
+  selector: 'ds-dso-edit-metadata',
+  // styleUrls: ['./dso-edit-metadata.component.scss'],
+  styleUrls: ['../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss'],
+  // templateUrl: './dso-edit-metadata.component.html',
+  templateUrl: '../../../../../app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html',
+})
+export class DsoEditMetadataComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
index a9f23c25f6..e0e087601e 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component.ts
@@ -1,12 +1,9 @@
 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 {
-  JournalIssueComponent as BaseComponent
-} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { JournalIssueComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage, Context.Any, 'custom')
 @Component({
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
index 1a190dc2e8..255a438c82 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.ts
@@ -1,12 +1,9 @@
 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 {
-  JournalVolumeComponent as BaseComponent
-} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { JournalVolumeComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage, Context.Any, 'custom')
 @Component({
diff --git a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
index 7b64c1a35d..1e3b89ef0f 100644
--- a/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
+++ b/src/themes/custom/app/entity-groups/journal-entities/item-pages/journal/journal.component.ts
@@ -1,12 +1,9 @@
 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 {
-  JournalComponent as BaseComponent
-} from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { JournalComponent as BaseComponent } from '../../../../../../../app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage, Context.Any, 'custom')
 @Component({
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..783a3d15c2
--- /dev/null
+++ b/src/themes/custom/app/entity-groups/research-entities/item-pages/person/person.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { PersonComponent as BaseComponent } from '../../../../../../../app/entity-groups/research-entities/item-pages/person/person.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+
+@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..59fecd4800 100644
--- a/src/themes/custom/app/footer/footer.component.ts
+++ b/src/themes/custom/app/footer/footer.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
+
 import { FooterComponent as BaseComponent } from '../../../../app/footer/footer.component';
 
 @Component({
   selector: 'ds-footer',
-  // styleUrls: ['footer.component.scss'],
+  // styleUrls: ['./footer.component.scss'],
   styleUrls: ['../../../../app/footer/footer.component.scss'],
-  // templateUrl: 'footer.component.html'
-  templateUrl: '../../../../app/footer/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/forbidden/forbidden.component.ts b/src/themes/custom/app/forbidden/forbidden.component.ts
index 915cf651cb..8220851202 100644
--- a/src/themes/custom/app/forbidden/forbidden.component.ts
+++ b/src/themes/custom/app/forbidden/forbidden.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ForbiddenComponent as BaseComponent } from '../../../../app/forbidden/forbidden.component';
 
 
@@ -7,7 +8,7 @@ import { ForbiddenComponent as BaseComponent } from '../../../../app/forbidden/f
   // templateUrl: './forbidden.component.html',
   templateUrl: '../../../../app/forbidden/forbidden.component.html',
   // styleUrls: ['./forbidden.component.scss']
-  styleUrls: ['../../../../app/forbidden/forbidden.component.scss']
+  styleUrls: ['../../../../app/forbidden/forbidden.component.scss'],
 })
 /**
  * This component representing the `Forbidden` DSpace page.
diff --git a/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts b/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts
index 8eaa2bb0fa..a65b219ae9 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-email/forgot-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ForgotEmailComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-email/forgot-email.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ForgotEmailComponent as BaseComponent } from '../../../../../app/forgot
   // styleUrls: ['./forgot-email.component.scss'],
   styleUrls: ['../../../../../app/forgot-password/forgot-password-email/forgot-email.component.scss'],
   // templateUrl: './forgot-email.component.html'
-  templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html'
+  templateUrl: '../../../../../app/forgot-password/forgot-password-email/forgot-email.component.html',
 })
 /**
  * Component responsible the forgot password email step
diff --git a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
index d64d925f71..50241abf8c 100644
--- a/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
+++ b/src/themes/custom/app/forgot-password/forgot-password-form/forgot-password-form.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ForgotPasswordFormComponent as BaseComponent } from '../../../../../app
   // styleUrls: ['./forgot-password-form.component.scss'],
   styleUrls: ['../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component.scss'],
   // templateUrl: './forgot-password-form.component.html'
-  templateUrl: '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component.html'
+  templateUrl: '../../../../../app/forgot-password/forgot-password-form/forgot-password-form.component.html',
 })
 /**
  * Component for a user to enter a new password for a forgot token.
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..67e7dcfc8b 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
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/header-nav-wrapper/header-navbar-wrapper.component';
 
 /**
@@ -6,9 +7,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/header/header.component.ts b/src/themes/custom/app/header/header.component.ts
index 866072f3b6..92ac082b0d 100644
--- a/src/themes/custom/app/header/header.component.ts
+++ b/src/themes/custom/app/header/header.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
 
 /**
diff --git a/src/themes/custom/app/home-page/home-news/home-news.component.ts b/src/themes/custom/app/home-page/home-news/home-news.component.ts
index c9c070f6cf..8abc47f7b9 100644
--- a/src/themes/custom/app/home-page/home-news/home-news.component.ts
+++ b/src/themes/custom/app/home-page/home-news/home-news.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page
   // styleUrls: ['./home-news.component.scss'],
   styleUrls: ['../../../../../app/home-page/home-news/home-news.component.scss'],
   // templateUrl: './home-news.component.html'
-  templateUrl: '../../../../../app/home-page/home-news/home-news.component.html'
+  templateUrl: '../../../../../app/home-page/home-news/home-news.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/home-page/home-page.component.ts b/src/themes/custom/app/home-page/home-page.component.ts
index bf04216b14..fd8ec2faa5 100644
--- a/src/themes/custom/app/home-page/home-page.component.ts
+++ b/src/themes/custom/app/home-page/home-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { HomePageComponent as BaseComponent } from '../../../../app/home-page/home-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { HomePageComponent as BaseComponent } from '../../../../app/home-page/ho
   // styleUrls: ['./home-page.component.scss'],
   styleUrls: ['../../../../app/home-page/home-page.component.scss'],
   // templateUrl: './home-page.component.html'
-  templateUrl: '../../../../app/home-page/home-page.component.html'
+  templateUrl: '../../../../app/home-page/home-page.component.html',
 })
 export class HomePageComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.html b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.scss b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
new file mode 100644
index 0000000000..589191b0bf
--- /dev/null
+++ b/src/themes/custom/app/home-page/top-level-community-list/top-level-community-list.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+import { TopLevelCommunityListComponent as BaseComponent } from '../../../../../app/home-page/top-level-community-list/top-level-community-list.component';
+
+@Component({
+  selector: 'ds-top-level-community-list',
+  // styleUrls: ['./top-level-community-list.component.scss'],
+  styleUrls: ['../../../../../app/home-page/top-level-community-list/top-level-community-list.component.scss'],
+  // templateUrl: './top-level-community-list.component.html'
+  templateUrl: '../../../../../app/home-page/top-level-community-list/top-level-community-list.component.html',
+})
+
+export class TopLevelCommunityListComponent extends BaseComponent {}
+
diff --git a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
index 50e196bfaf..7098a97ad6 100644
--- a/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
+++ b/src/themes/custom/app/info/end-user-agreement/end-user-agreement.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/info/end-user-agreement/end-user-agreement.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { EndUserAgreementComponent as BaseComponent } from '../../../../../app/i
   // styleUrls: ['./end-user-agreement.component.scss'],
   styleUrls: ['../../../../../app/info/end-user-agreement/end-user-agreement.component.scss'],
   // templateUrl: './end-user-agreement.component.html'
-  templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html'
+  templateUrl: '../../../../../app/info/end-user-agreement/end-user-agreement.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.html b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.scss b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
new file mode 100644
index 0000000000..172357cc11
--- /dev/null
+++ b/src/themes/custom/app/info/feedback/feedback-form/feedback-form.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { FeedbackFormComponent as BaseComponent } from '../../../../../../app/info/feedback/feedback-form/feedback-form.component';
+
+@Component({
+  selector: 'ds-feedback-form',
+  // templateUrl: './feedback-form.component.html',
+  templateUrl: '../../../../../../app/info/feedback/feedback-form/feedback-form.component.html',
+  // styleUrls: ['./feedback-form.component.scss'],
+  styleUrls: ['../../../../../../app/info/feedback/feedback-form/feedback-form.component.scss'],
+})
+export class FeedbackFormComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/info/feedback/feedback.component.ts b/src/themes/custom/app/info/feedback/feedback.component.ts
index a0d46fba66..61e57bc930 100644
--- a/src/themes/custom/app/info/feedback/feedback.component.ts
+++ b/src/themes/custom/app/info/feedback/feedback.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { FeedbackComponent as BaseComponent } from '../../../../../app/info/feedback/feedback.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { FeedbackComponent as BaseComponent } from '../../../../../app/info/feed
   // styleUrls: ['./feedback.component.scss'],
   styleUrls: ['../../../../../app/info/feedback/feedback.component.scss'],
   // templateUrl: './feedback.component.html'
-  templateUrl: '../../../../../app/info/feedback/feedback.component.html'
+  templateUrl: '../../../../../app/info/feedback/feedback.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/info/privacy/privacy.component.ts b/src/themes/custom/app/info/privacy/privacy.component.ts
index f261c64c14..0901b89fdc 100644
--- a/src/themes/custom/app/info/privacy/privacy.component.ts
+++ b/src/themes/custom/app/info/privacy/privacy.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { PrivacyComponent as BaseComponent } from '../../../../../app/info/privacy/privacy.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { PrivacyComponent as BaseComponent } from '../../../../../app/info/priva
   // styleUrls: ['./privacy.component.scss'],
   styleUrls: ['../../../../../app/info/privacy/privacy.component.scss'],
   // templateUrl: './privacy.component.html'
-  templateUrl: '../../../../../app/info/privacy/privacy.component.html'
+  templateUrl: '../../../../../app/info/privacy/privacy.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/item-page/alerts/item-alerts.component.html b/src/themes/custom/app/item-page/alerts/item-alerts.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/alerts/item-alerts.component.scss b/src/themes/custom/app/item-page/alerts/item-alerts.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/alerts/item-alerts.component.ts b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
new file mode 100644
index 0000000000..b993055887
--- /dev/null
+++ b/src/themes/custom/app/item-page/alerts/item-alerts.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { ItemAlertsComponent as BaseComponent } from '../../../../../app/item-page/alerts/item-alerts.component';
+
+@Component({
+  selector: 'ds-item-alerts',
+  // templateUrl: './item-alerts.component.html',
+  templateUrl: '../../../../../app/item-page/alerts/item-alerts.component.html',
+  // styleUrls: ['./item-alerts.component.scss'],
+  styleUrls: ['../../../../../app/item-page/alerts/item-alerts.component.scss'],
+})
+export class ItemAlertsComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
deleted file mode 100644
index d6d7c4b8fb..0000000000
--- a/src/themes/custom/app/item-page/edit-item-page/item-metadata/item-metadata.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-import {
-  ItemMetadataComponent as BaseComponent
-} from '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component';
-
-@Component({
-  selector: 'ds-item-metadata',
-  // styleUrls: ['./item-metadata.component.scss'],
-  styleUrls: ['../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.scss'],
-  // templateUrl: './item-metadata.component.html',
-  templateUrl: '../../../../../../app/item-page/edit-item-page/item-metadata/item-metadata.component.html',
-})
-/**
- * Component for displaying an item's metadata edit page
- */
-export class ItemMetadataComponent extends BaseComponent {
-}
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.html b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
new file mode 100644
index 0000000000..bb911c5c91
--- /dev/null
+++ b/src/themes/custom/app/item-page/edit-item-page/item-status/item-status.component.ts
@@ -0,0 +1,23 @@
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { ItemStatusComponent as BaseComponent } from '../../../../../../app/item-page/edit-item-page/item-status/item-status.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../app/shared/animations/fade';
+
+@Component({
+  selector: 'ds-item-status',
+  // templateUrl: './item-status.component.html',
+  templateUrl: '../../../../../../app/item-page/edit-item-page/item-status/item-status.component.html',
+  changeDetection: ChangeDetectionStrategy.Default,
+  animations: [
+    fadeIn,
+    fadeInOut,
+  ],
+})
+export class ItemStatusComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.html b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.scss b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
new file mode 100644
index 0000000000..b44d1ebc88
--- /dev/null
+++ b/src/themes/custom/app/item-page/full/field-components/file-section/full-file-section.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { FullFileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component';
+
+@Component({
+  selector: 'ds-item-page-full-file-section',
+  // styleUrls: ['./full-file-section.component.scss'],
+  styleUrls: ['../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component.scss'],
+  // templateUrl: './full-file-section.component.html',
+  templateUrl: '../../../../../../../app/item-page/full/field-components/file-section/full-file-section.component.html',
+})
+export class FullFileSectionComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/full/full-item-page.component.ts b/src/themes/custom/app/item-page/full/full-item-page.component.ts
index 6385a27400..12a6fa1f40 100644
--- a/src/themes/custom/app/item-page/full/full-item-page.component.ts
+++ b/src/themes/custom/app/item-page/full/full-item-page.component.ts
@@ -1,6 +1,10 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { fadeInOut } from '../../../../../app/shared/animations/fade';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { FullItemPageComponent as BaseComponent } from '../../../../../app/item-page/full/full-item-page.component';
+import { fadeInOut } from '../../../../../app/shared/animations/fade';
 
 /**
  * This component renders a full item page.
@@ -14,7 +18,7 @@ import { FullItemPageComponent as BaseComponent } from '../../../../../app/item-
   // templateUrl: './full-item-page.component.html',
   templateUrl: '../../../../../app/item-page/full/full-item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class FullItemPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html b/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss b/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
new file mode 100644
index 0000000000..1be8ec8b03
--- /dev/null
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { MediaViewerImageComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
+
+@Component({
+  selector: 'ds-media-viewer-image',
+  // templateUrl: './media-viewer-image.component.html',
+  templateUrl: '../../../../../../app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.html',
+  // styleUrls: ['./media-viewer-image.component.scss'],
+  styleUrls: ['../../../../../../app/item-page/media-viewer/media-viewer-image/media-viewer-image.component.scss'],
+})
+export class MediaViewerImageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
new file mode 100644
index 0000000000..92a399214a
--- /dev/null
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { MediaViewerVideoComponent as BaseComponent } from '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+
+@Component({
+  selector: 'ds-media-viewer-video',
+  // templateUrl: './media-viewer-video.component.html',
+  templateUrl: '../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html',
+  // styleUrls: ['./media-viewer-video.component.scss'],
+  styleUrls: ['../../../../../../app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.scss'],
+})
+export class MediaViewerVideoComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.html b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.scss b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
new file mode 100644
index 0000000000..c54d384e01
--- /dev/null
+++ b/src/themes/custom/app/item-page/media-viewer/media-viewer.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { MediaViewerComponent as BaseComponent } from '../../../../../app/item-page/media-viewer/media-viewer.component';
+
+@Component({
+  selector: 'ds-media-viewer',
+  // templateUrl: './media-viewer.component.html',
+  templateUrl: '../../../../../app/item-page/media-viewer/media-viewer.component.html',
+  // styleUrls: ['./media-viewer.component.scss'],
+  styleUrls: ['../../../../../app/item-page/media-viewer/media-viewer.component.scss'],
+})
+export class MediaViewerComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts b/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts
index 7f36623b3a..d5c919a9b2 100644
--- a/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts
+++ b/src/themes/custom/app/item-page/simple/field-components/file-section/file-section.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { slideSidebarPadding } from '../../../../../../../app/shared/animations/slide';
+
 import { FileSectionComponent as BaseComponent } from '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component';
+import { slideSidebarPadding } from '../../../../../../../app/shared/animations/slide';
 
 @Component({
-    selector: 'ds-item-page-file-section',
-    // templateUrl: './file-section.component.html',
-    templateUrl: '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component.html',
-    animations: [slideSidebarPadding],
+  selector: 'ds-item-page-file-section',
+  // templateUrl: './file-section.component.html',
+  templateUrl: '../../../../../../../app/item-page/simple/field-components/file-section/file-section.component.html',
+  animations: [slideSidebarPadding],
 })
 export class FileSectionComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
new file mode 100644
index 0000000000..8805e195c4
--- /dev/null
+++ b/src/themes/custom/app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+import { ItemPageTitleFieldComponent as BaseComponent } from '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+
+@Component({
+  selector: 'ds-item-page-title-field',
+  // templateUrl: './item-page-title-field.component.html',
+  templateUrl: '../../../../../../../../app/item-page/simple/field-components/specific-field/title/item-page-title-field.component.html',
+})
+export class ItemPageTitleFieldComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/item-page/simple/item-page.component.ts b/src/themes/custom/app/item-page/simple/item-page.component.ts
index b535a29ead..1ee4d99be5 100644
--- a/src/themes/custom/app/item-page/simple/item-page.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-page.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ItemPageComponent as BaseComponent } from '../../../../../app/item-page/simple/item-page.component';
 import { fadeInOut } from '../../../../../app/shared/animations/fade';
 
@@ -14,7 +18,7 @@ import { fadeInOut } from '../../../../../app/shared/animations/fade';
   // templateUrl: './item-page.component.html',
   templateUrl: '../../../../../app/item-page/simple/item-page.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [fadeInOut]
+  animations: [fadeInOut],
 })
 export class ItemPageComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
index b07247731b..6844081472 100644
--- a/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/publication/publication.component.ts
@@ -1,8 +1,12 @@
-import { ChangeDetectionStrategy, 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 {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
 import { PublicationComponent as BaseComponent } from '../../../../../../../app/item-page/simple/item-types/publication/publication.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 /**
  * Component that represents a publication Item page
diff --git a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
index 1d1676e92f..8378183992 100644
--- a/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
+++ b/src/themes/custom/app/item-page/simple/item-types/untyped-item/untyped-item.component.ts
@@ -1,13 +1,13 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
+import { Context } from '../../../../../../../app/core/shared/context.model';
 import { Item } from '../../../../../../../app/core/shared/item.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 {
-  UntypedItemComponent as BaseComponent
-} from '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component';
+import { UntypedItemComponent as BaseComponent } from '../../../../../../../app/item-page/simple/item-types/untyped-item/untyped-item.component';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
 
 /**
  * Component that represents an untyped Item page
diff --git a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
new file mode 100644
index 0000000000..01c6c6e6f9
--- /dev/null
+++ b/src/themes/custom/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+import { MetadataRepresentationListComponent as BaseComponent } from '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
+
+@Component({
+  selector: 'ds-metadata-representation-list',
+  // templateUrl: './metadata-representation-list.component.html'
+  templateUrl: '../../../../../../app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html',
+})
+export class MetadataRepresentationListComponent 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..1a83892c24 100644
--- a/src/themes/custom/app/login-page/login-page.component.html
+++ b/src/themes/custom/app/login-page/login-page.component.html
@@ -3,8 +3,8 @@
     <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>
+      <ds-themed-log-in
+      [isStandalonePage]="true"></ds-themed-log-in>
     </div>
   </div>
 </div>
diff --git a/src/themes/custom/app/login-page/login-page.component.ts b/src/themes/custom/app/login-page/login-page.component.ts
index 2eb98a288e..ac624f4253 100644
--- a/src/themes/custom/app/login-page/login-page.component.ts
+++ b/src/themes/custom/app/login-page/login-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/login-page.component';
 
 /**
@@ -9,7 +10,7 @@ import { LoginPageComponent as BaseComponent } from '../../../../app/login-page/
   // styleUrls: ['./login-page.component.scss'],
   styleUrls: ['../../../../app/login-page/login-page.component.scss'],
   // templateUrl: './login-page.component.html'
-  templateUrl: '../../../../app/login-page/login-page.component.html'
+  templateUrl: '../../../../app/login-page/login-page.component.html',
 })
 export class LoginPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/logout-page/logout-page.component.ts b/src/themes/custom/app/logout-page/logout-page.component.ts
index 303abe9b2b..bcd53351e9 100644
--- a/src/themes/custom/app/logout-page/logout-page.component.ts
+++ b/src/themes/custom/app/logout-page/logout-page.component.ts
@@ -1,12 +1,13 @@
 import { Component } from '@angular/core';
-import { LogoutPageComponent as BaseComponent} from '../../../../app/logout-page/logout-page.component';
+
+import { LogoutPageComponent as BaseComponent } from '../../../../app/logout-page/logout-page.component';
 
 @Component({
   selector: 'ds-logout-page',
   // styleUrls: ['./logout-page.component.scss'],
   styleUrls: ['../../../../app/logout-page/logout-page.component.scss'],
   // templateUrl: './logout-page.component.html'
-  templateUrl: '../../../../app/logout-page/logout-page.component.html'
+  templateUrl: '../../../../app/logout-page/logout-page.component.html',
 })
 export class LogoutPageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
index 1fbe089bc4..a699b15cc5 100644
--- a/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
+++ b/src/themes/custom/app/lookup-by-id/objectnotfound/objectnotfound.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component';
 
 @Component({
@@ -7,7 +11,7 @@ import { ObjectNotFoundComponent as BaseComponent } from '../../../../../app/loo
   styleUrls: ['../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.scss'],
   // templateUrl: './objectnotfound.component.html',
   templateUrl: '../../../../../app/lookup-by-id/objectnotfound/objectnotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 
 /**
diff --git a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
index 11b4ee38e1..0f6cbccf4e 100644
--- a/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
+++ b/src/themes/custom/app/my-dspace-page/my-dspace-page.component.ts
@@ -1,7 +1,14 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { pushInOut } from '../../../../app/shared/animations/push';
-import { MyDSpacePageComponent as BaseComponent, SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-dspace-configuration.service';
+import {
+  MyDSpacePageComponent as BaseComponent,
+  SEARCH_CONFIG_SERVICE,
+} from '../../../../app/my-dspace-page/my-dspace-page.component';
+import { pushInOut } from '../../../../app/shared/animations/push';
 
 /**
  * This component represents the whole mydspace page
@@ -17,9 +24,9 @@ import { MyDSpaceConfigurationService } from '../../../../app/my-dspace-page/my-
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: MyDSpaceConfigurationService
-    }
-  ]
+      useClass: MyDSpaceConfigurationService,
+    },
+  ],
 })
 export class MyDSpacePageComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
index 3e11271bf0..1ea08ee971 100644
--- a/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
+++ b/src/themes/custom/app/navbar/expandable-navbar-section/expandable-navbar-section.component.ts
@@ -1,10 +1,9 @@
 import { Component } from '@angular/core';
-import {
-  ExpandableNavbarSectionComponent as BaseComponent
-} from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
+
+import { ExpandableNavbarSectionComponent as BaseComponent } from '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component';
 import { slide } from '../../../../../app/shared/animations/slide';
-import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
 import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
+import { rendersSectionForMenu } from '../../../../../app/shared/menu/menu-section.decorator';
 
 /**
  * Represents an expandable section in the navbar
@@ -15,7 +14,7 @@ import { MenuID } from '../../../../../app/shared/menu/menu-id.model';
   templateUrl: '../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.html',
   // styleUrls: ['./expandable-navbar-section.component.scss'],
   styleUrls: ['../../../../../app/navbar/expandable-navbar-section/expandable-navbar-section.component.scss'],
-  animations: [slide]
+  animations: [slide],
 })
 @rendersSectionForMenu(MenuID.PUBLIC, true)
 export class ExpandableNavbarSectionComponent extends BaseComponent {
diff --git a/src/themes/custom/app/navbar/navbar.component.ts b/src/themes/custom/app/navbar/navbar.component.ts
index e163f096e9..a4c2e4e41d 100644
--- a/src/themes/custom/app/navbar/navbar.component.ts
+++ b/src/themes/custom/app/navbar/navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
@@ -11,7 +12,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   styleUrls: ['../../../../app/navbar/navbar.component.scss'],
   // templateUrl: './navbar.component.html',
   templateUrl: '../../../../app/navbar/navbar.component.html',
-  animations: [slideMobileNav]
+  animations: [slideMobileNav],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/pagenotfound/pagenotfound.component.ts b/src/themes/custom/app/pagenotfound/pagenotfound.component.ts
index 71dc7332d4..cd65b088b4 100644
--- a/src/themes/custom/app/pagenotfound/pagenotfound.component.ts
+++ b/src/themes/custom/app/pagenotfound/pagenotfound.component.ts
@@ -1,4 +1,8 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { PageNotFoundComponent as BaseComponent } from '../../../../app/pagenotfound/pagenotfound.component';
 
 @Component({
@@ -7,7 +11,7 @@ import { PageNotFoundComponent as BaseComponent } from '../../../../app/pagenotf
   styleUrls: ['../../../../app/pagenotfound/pagenotfound.component.scss'],
   // templateUrl: './pagenotfound.component.html'
   templateUrl: '../../../../app/pagenotfound/pagenotfound.component.html',
-  changeDetection: ChangeDetectionStrategy.Default
+  changeDetection: ChangeDetectionStrategy.Default,
 })
 
 /**
diff --git a/src/themes/custom/app/profile-page/profile-page.component.ts b/src/themes/custom/app/profile-page/profile-page.component.ts
index f285b3618c..e912efb787 100644
--- a/src/themes/custom/app/profile-page/profile-page.component.ts
+++ b/src/themes/custom/app/profile-page/profile-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-page/profile-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ProfilePageComponent as BaseComponent } from '../../../../app/profile-p
   // styleUrls: ['./profile-page.component.scss'],
   styleUrls: ['../../../../app/profile-page/profile-page.component.scss'],
   // templateUrl: './profile-page.component.html'
-  templateUrl: '../../../../app/profile-page/profile-page.component.html'
+  templateUrl: '../../../../app/profile-page/profile-page.component.html',
 })
 /**
  * Component for a user to edit their profile information
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..b7b3798c21
--- /dev/null
+++ b/src/themes/custom/app/register-email-form/register-email-form.component.ts
@@ -0,0 +1,11 @@
+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/register-page/create-profile/create-profile.component.ts b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
index 0cffa3288d..1ab0ad2b21 100644
--- a/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
+++ b/src/themes/custom/app/register-page/create-profile/create-profile.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CreateProfileComponent as BaseComponent } from '../../../../../app/register-page/create-profile/create-profile.component';
 
 /**
@@ -9,7 +10,7 @@ import { CreateProfileComponent as BaseComponent } from '../../../../../app/regi
   // styleUrls: ['./create-profile.component.scss'],
   styleUrls: ['../../../../../app/register-page/create-profile/create-profile.component.scss'],
   // templateUrl: './create-profile.component.html'
-  templateUrl: '../../../../../app/register-page/create-profile/create-profile.component.html'
+  templateUrl: '../../../../../app/register-page/create-profile/create-profile.component.html',
 })
 export class CreateProfileComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/register-page/register-email/register-email.component.ts b/src/themes/custom/app/register-page/register-email/register-email.component.ts
index 66becd1b6b..36c341ba54 100644
--- a/src/themes/custom/app/register-page/register-email/register-email.component.ts
+++ b/src/themes/custom/app/register-page/register-email/register-email.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { RegisterEmailComponent as BaseComponent } from '../../../../../app/register-page/register-email/register-email.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { RegisterEmailComponent as BaseComponent } from '../../../../../app/regi
   // styleUrls: ['./register-email.component.scss'],
   styleUrls: ['../../../../../app/register-page/register-email/register-email.component.scss'],
   // templateUrl: './register-email.component.html'
-  templateUrl: '../../../../../app/register-page/register-email/register-email.component.html'
+  templateUrl: '../../../../../app/register-page/register-email/register-email.component.html',
 })
 /**
  * Component responsible the email registration step when registering as a new user
diff --git a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.html b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.scss b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.scss
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.scss
@@ -0,0 +1 @@
+
diff --git a/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
new file mode 100644
index 0000000000..ba6bd27caf
--- /dev/null
+++ b/src/themes/custom/app/request-copy/deny-request-copy/deny-request-copy.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { DenyRequestCopyComponent as BaseComponent } from 'src/app/request-copy/deny-request-copy/deny-request-copy.component';
+
+@Component({
+  selector: 'ds-deny-request-copy',
+  // styleUrls: ['./deny-request-copy.component.scss'],
+  styleUrls: [],
+  // templateUrl: './deny-request-copy.component.html',
+  templateUrl: './../../../../../app/request-copy/deny-request-copy/deny-request-copy.component.html',
+})
+export class DenyRequestCopyComponent
+  extends BaseComponent {
+}
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.html b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.scss b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
new file mode 100644
index 0000000000..55af8bf860
--- /dev/null
+++ b/src/themes/custom/app/request-copy/email-request-copy/email-request-copy.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { EmailRequestCopyComponent as BaseComponent } from 'src/app/request-copy/email-request-copy/email-request-copy.component';
+
+@Component({
+  selector: 'ds-email-request-copy',
+  // styleUrls: ['./email-request-copy.component.scss'],
+  styleUrls: [],
+  // templateUrl: './email-request-copy.component.html',
+  templateUrl: './../../../../../app/request-copy/email-request-copy/email-request-copy.component.html',
+})
+export class EmailRequestCopyComponent
+  extends BaseComponent {
+}
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.html b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.scss b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
new file mode 100644
index 0000000000..3a04d93a20
--- /dev/null
+++ b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+import { GrantRequestCopyComponent as BaseComponent } from 'src/app/request-copy/grant-request-copy/grant-request-copy.component';
+
+@Component({
+  selector: 'ds-grant-request-copy',
+  // styleUrls: ['./grant-request-copy.component.scss'],
+  styleUrls: [],
+  // templateUrl: './grant-request-copy.component.html',
+  templateUrl: './../../../../../app/request-copy/grant-request-copy/grant-request-copy.component.html',
+})
+export class GrantRequestCopyComponent
+  extends BaseComponent {
+}
diff --git a/src/themes/custom/app/root/root.component.ts b/src/themes/custom/app/root/root.component.ts
index 6b5b0c106f..ce936263e1 100644
--- a/src/themes/custom/app/root/root.component.ts
+++ b/src/themes/custom/app/root/root.component.ts
@@ -1,6 +1,7 @@
 import { Component } from '@angular/core';
-import { slideSidebarPadding } from '../../../../app/shared/animations/slide';
+
 import { RootComponent as BaseComponent } from '../../../../app/root/root.component';
+import { slideSidebarPadding } from '../../../../app/shared/animations/slide';
 
 @Component({
   selector: 'ds-root',
diff --git a/src/themes/custom/app/search-navbar/search-navbar.component.ts b/src/themes/custom/app/search-navbar/search-navbar.component.ts
index 3e4da0af7e..2bead7e102 100644
--- a/src/themes/custom/app/search-navbar/search-navbar.component.ts
+++ b/src/themes/custom/app/search-navbar/search-navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SearchNavbarComponent as BaseComponent } from '../../../../app/search-navbar/search-navbar.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { SearchNavbarComponent as BaseComponent } from '../../../../app/search-n
   // styleUrls: ['./search-navbar.component.scss'],
   styleUrls: ['../../../../app/search-navbar/search-navbar.component.scss'],
   // templateUrl: './search-navbar.component.html'
-  templateUrl: '../../../../app/search-navbar/search-navbar.component.html'
+  templateUrl: '../../../../app/search-navbar/search-navbar.component.html',
 })
 export class SearchNavbarComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/search-page/configuration-search-page.component.ts b/src/themes/custom/app/search-page/configuration-search-page.component.ts
index 159434c7a8..2e5801052c 100644
--- a/src/themes/custom/app/search-page/configuration-search-page.component.ts
+++ b/src/themes/custom/app/search-page/configuration-search-page.component.ts
@@ -1,8 +1,12 @@
-import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { pushInOut } from '../../../../app/shared/animations/push';
-import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import {
+  ChangeDetectionStrategy,
+  Component,
+} from '@angular/core';
+
 import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
 import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../app/search-page/configuration-search-page.component';
+import { pushInOut } from '../../../../app/shared/animations/push';
 
 @Component({
   selector: 'ds-configuration-search-page',
@@ -15,9 +19,9 @@ import { ConfigurationSearchPageComponent as BaseComponent } from '../../../../a
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
diff --git a/src/themes/custom/app/search-page/search-page.component.ts b/src/themes/custom/app/search-page/search-page.component.ts
index 44314b7183..51f8f85eb5 100644
--- a/src/themes/custom/app/search-page/search-page.component.ts
+++ b/src/themes/custom/app/search-page/search-page.component.ts
@@ -1,7 +1,8 @@
 import { Component } from '@angular/core';
-import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchPageComponent as BaseComponent } from '../../../../app/search-page/search-page.component';
 
 @Component({
   selector: 'ds-search-page',
@@ -11,9 +12,9 @@ import { SearchConfigurationService } from '../../../../app/core/shared/search/s
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 })
 
 /**
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..4409e63ecd 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
@@ -1,19 +1,21 @@
 import { Component } from '@angular/core';
+
 import {
-  AuthNavMenuComponent as BaseComponent,
-} from '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component';
-import { fadeInOut, fadeOut } from '../../../../../app/shared/animations/fade';
+  fadeInOut,
+  fadeOut,
+} from '../../../../../app/shared/animations/fade';
+import { AuthNavMenuComponent as BaseComponent } from '../../../../../app/shared/auth-nav-menu/auth-nav-menu.component';
 
 /**
  * Component representing the {@link AuthNavMenuComponent} of a page
  */
 @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]
+  animations: [fadeInOut, fadeOut],
 })
 export class AuthNavMenuComponent extends BaseComponent {
 }
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..e97a4e2eda
--- /dev/null
+++ b/src/themes/custom/app/shared/auth-nav-menu/user-menu/user-menu.component.ts
@@ -0,0 +1,16 @@
+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..8710a854f4
--- /dev/null
+++ b/src/themes/custom/app/shared/browse-by/browse-by.component.ts
@@ -0,0 +1,21 @@
+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/collection-dropdown/collection-dropdown.component.html b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.scss b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
new file mode 100644
index 0000000000..9bf6490ccb
--- /dev/null
+++ b/src/themes/custom/app/shared/collection-dropdown/collection-dropdown.component.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+import { CollectionDropdownComponent as BaseComponent } from '../../../../../app/shared/collection-dropdown/collection-dropdown.component';
+
+@Component({
+  selector: 'ds-collection-dropdown',
+  templateUrl: '../../../../../app/shared/collection-dropdown/collection-dropdown.component.html',
+  // templateUrl: './collection-dropdown.component.html',
+  styleUrls: ['../../../../../app/shared/collection-dropdown/collection-dropdown.component.scss'],
+  // styleUrls: ['./collection-dropdown.component.scss']
+})
+export class CollectionDropdownComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts b/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
index c6805175b0..b5af81bab4 100644
--- a/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
+++ b/src/themes/custom/app/shared/comcol-page-browse-by/comcol-page-browse-by.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ComcolPageBrowseByComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
+
+import { ComcolPageBrowseByComponent as BaseComponent } from '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component';
 
 /**
  * A component to display the "Browse By" section of a Community or Collection page
@@ -10,6 +11,6 @@ import { ComcolPageBrowseByComponent as BaseComponent} from '../../../../../app/
   // styleUrls: ['./comcol-page-browse-by.component.scss'],
   styleUrls: ['../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.scss'],
   // templateUrl: './comcol-page-browse-by.component.html'
-  templateUrl: '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html'
+  templateUrl: '../../../../../app/shared/comcol/comcol-page-browse-by/comcol-page-browse-by.component.html',
 })
 export class ComcolPageBrowseByComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
index ef68f1538f..8beb56b596 100644
--- a/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
+++ b/src/themes/custom/app/shared/comcol-page-handle/comcol-page-handle.component.ts
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ComcolPageHandleComponent as BaseComponent} from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
+
+import { ComcolPageHandleComponent as BaseComponent } from '../../../../../app/shared/comcol/comcol-page-handle/comcol-page-handle.component';
 
 
 /**
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
index 22d40ff539..a4315c9cf2 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    CreateCollectionParentSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+
+import { CreateCollectionParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
 
 @Component({
   selector: 'ds-create-collection-parent-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index 84fdd34c01..a13be63880 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -9,11 +9,11 @@
         <h3 class="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">or</span>
+                <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>
-        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
     </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
index 8b28ee1bb8..f46f4ee89e 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    CreateCommunityParentSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+
+import { CreateCommunityParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
 
 @Component({
   selector: 'ds-create-community-parent-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
index f8e3401454..e84fb2bf98 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.ts
@@ -1,13 +1,12 @@
-import {Component} from '@angular/core';
-import {
-    CreateItemParentSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { Component } from '@angular/core';
+
+import { CreateItemParentSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 @Component({
-    selector: 'ds-create-item-parent-selector',
-    // styleUrls: ['./create-item-parent-selector.component.scss'],
-    // templateUrl: './create-item-parent-selector.component.html',
-    templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
+  selector: 'ds-create-item-parent-selector',
+  // styleUrls: ['./create-item-parent-selector.component.scss'],
+  // templateUrl: './create-item-parent-selector.component.html',
+  templateUrl: '../../../../../../../app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component.html',
 })
 export class CreateItemParentSelectorComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
index 8f4a8dd5cd..a52987958e 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    EditCollectionSelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+
+import { EditCollectionSelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
 
 @Component({
   selector: 'ds-edit-collection-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
index 85d8797e66..54044f5d79 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.html
@@ -6,6 +6,6 @@
   </div>
   <div class="modal-body">
     <h5 *ngIf="header" class="px-2">{{header | translate}}</h5>
-    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" (onSelect)="selectObject($event)"></ds-dso-selector>
+    <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
   </div>
 </div>
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
index 79d52fc350..a89e702177 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component.ts
@@ -1,7 +1,6 @@
 import { Component } from '@angular/core';
-import {
-    EditCommunitySelectorComponent as BaseComponent
-} from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+
+import { EditCommunitySelectorComponent as BaseComponent } from '../../../../../../../app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 
 @Component({
   selector: 'ds-edit-item-selector',
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
index 398dbc933c..d2e4c4b05b 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component.ts
@@ -1,7 +1,5 @@
 import { Component } from '@angular/core';
-import {
-    EditItemSelectorComponent as BaseComponent
-} from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import { EditItemSelectorComponent as BaseComponent } from 'src/app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
 
 @Component({
   selector: 'ds-edit-item-selector',
diff --git a/src/themes/custom/app/shared/file-download-link/file-download-link.component.html b/src/themes/custom/app/shared/file-download-link/file-download-link.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/file-download-link/file-download-link.component.scss b/src/themes/custom/app/shared/file-download-link/file-download-link.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
new file mode 100644
index 0000000000..ddc51deb56
--- /dev/null
+++ b/src/themes/custom/app/shared/file-download-link/file-download-link.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { FileDownloadLinkComponent as BaseComponent } from '../../../../../app/shared/file-download-link/file-download-link.component';
+
+@Component({
+  selector: 'ds-file-download-link',
+  // templateUrl: './file-download-link.component.html',
+  templateUrl: '../../../../../app/shared/file-download-link/file-download-link.component.html',
+  // styleUrls: ['./file-download-link.component.scss'],
+  styleUrls: ['../../../../../app/shared/file-download-link/file-download-link.component.scss'],
+})
+export class FileDownloadLinkComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.scss b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
new file mode 100644
index 0000000000..39f28a9d7f
--- /dev/null
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -0,0 +1,30 @@
+import { Component } from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../../../../app/shared/animations/fade';
+import { DsDynamicLookupRelationExternalSourceTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+
+@Component({
+  selector: 'ds-dynamic-lookup-relation-external-source-tab',
+  // styleUrls: ['./dynamic-lookup-relation-external-source-tab.component.scss'],
+  styleUrls: ['../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.scss'],
+  // templateUrl: './dynamic-lookup-relation-external-source-tab.component.html',
+  templateUrl: '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+  animations: [
+    fadeIn,
+    fadeInOut,
+  ],
+})
+export class DsDynamicLookupRelationExternalSourceTabComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/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/themes/custom/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
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/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.scss b/src/themes/custom/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.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/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.ts b/src/themes/custom/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.ts
new file mode 100644
index 0000000000..5d77a44df4
--- /dev/null
+++ b/src/themes/custom/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.ts
@@ -0,0 +1,14 @@
+import { Component } from '@angular/core';
+
+import { ExternalSourceEntryImportModalComponent as BaseComponent } from '../../../../../../../../../../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';
+
+@Component({
+  selector: 'ds-external-source-entry-import-modal',
+  styleUrls: ['../../../../../../../../../../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.scss'],
+  // styleUrls: ['./external-source-entry-import-modal.component.scss'],
+  templateUrl: '../../../../../../../../../../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',
+  // templateUrl: './external-source-entry-import-modal.component.html'
+})
+export class ExternalSourceEntryImportModalComponent extends BaseComponent {
+
+}
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
new file mode 100644
index 0000000000..076d052c82
--- /dev/null
+++ b/src/themes/custom/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -0,0 +1,22 @@
+import { Component } from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { DsDynamicLookupRelationSearchTabComponent as BaseComponent } from '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+
+@Component({
+  selector: 'ds-dynamic-lookup-relation-search-tab',
+  // styleUrls: ['./dynamic-lookup-relation-search-tab.component.scss'],
+  styleUrls: ['../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss'],
+  // templateUrl: './dynamic-lookup-relation-search-tab.component.html',
+  templateUrl: '../../../../../../../../../app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+})
+export class DsDynamicLookupRelationSearchTabComponent 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..dcb13d2062
--- /dev/null
+++ b/src/themes/custom/app/shared/lang-switch/lang-switch.component.ts
@@ -0,0 +1,13 @@
+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/loading/loading.component.ts b/src/themes/custom/app/shared/loading/loading.component.ts
index fb1a291dc0..54fa5d87ed 100644
--- a/src/themes/custom/app/shared/loading/loading.component.ts
+++ b/src/themes/custom/app/shared/loading/loading.component.ts
@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
+
 import { LoadingComponent as BaseComponent } from '../../../../../app/shared/loading/loading.component';
 
 @Component({
   selector: 'ds-loading',
   styleUrls: ['../../../../../app/shared/loading/loading.component.scss'],
   // styleUrls: ['./loading.component.scss'],
-  templateUrl: '../../../../../app/shared/loading/loading.component.html'
+  templateUrl: '../../../../../app/shared/loading/loading.component.html',
   // templateUrl: './loading.component.html'
 })
 export class LoadingComponent 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..5570f5f572
--- /dev/null
+++ b/src/themes/custom/app/shared/log-in/log-in.component.ts
@@ -0,0 +1,13 @@
+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-collection/shared/badges/access-status-badge/access-status-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
new file mode 100644
index 0000000000..eb623aca8b
--- /dev/null
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { AccessStatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
+
+@Component({
+  selector: 'ds-access-status-badge',
+  // styleUrls: ['./access-status-badge.component.scss'],
+  // templateUrl: './access-status-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component.html',
+})
+export class AccessStatusBadgeComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
new file mode 100644
index 0000000000..ecd1a9a43b
--- /dev/null
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/badges.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { BadgesComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/badges.component';
+
+@Component({
+  selector: 'ds-badges',
+  // styleUrls: ['./badges.component.scss'],
+  styleUrls: ['../../../../../../../app/shared/object-collection/shared/badges/badges.component.scss'],
+  // templateUrl: './badges.component.html',
+  templateUrl: '../../../../../../../app/shared/object-collection/shared/badges/badges.component.html',
+})
+export class BadgesComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
new file mode 100644
index 0000000000..eadd9a9ad4
--- /dev/null
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+import { MyDSpaceStatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+
+@Component({
+  selector: 'ds-my-dspace-status-badge',
+  // styleUrls: ['./my-dspace-status-badge.component.scss'],
+  styleUrls: ['../../../../../../../../app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.scss'],
+  // templateUrl: './my-dspace-status-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component.html',
+})
+export class MyDSpaceStatusBadgeComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
new file mode 100644
index 0000000000..8b0f6b27f5
--- /dev/null
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/status-badge/status-badge.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { StatusBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/status-badge/status-badge.component';
+
+@Component({
+  selector: 'ds-status-badge',
+  // styleUrls: ['./status-badge.component.scss'],
+  // templateUrl: './status-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/status-badge/status-badge.component.html',
+})
+export class StatusBadgeComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.scss b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
new file mode 100644
index 0000000000..11e50b4d08
--- /dev/null
+++ b/src/themes/custom/app/shared/object-collection/shared/badges/type-badge/type-badge.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+import { TypeBadgeComponent as BaseComponent } from 'src/app/shared/object-collection/shared/badges/type-badge/type-badge.component';
+
+@Component({
+  selector: 'ds-type-badge',
+  // styleUrls: ['./type-badge.component.scss'],
+  // templateUrl: './type-badge.component.html',
+  templateUrl: '../../../../../../../../app/shared/object-collection/shared/badges/type-badge/type-badge.component.html',
+})
+export class TypeBadgeComponent 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..679aadb985
--- /dev/null
+++ b/src/themes/custom/app/shared/object-list/browse-entry-list-element/browse-entry-list-element.component.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+
+import { BrowseEntry } from '../../../../../../app/core/shared/browse-entry.model';
+import { Context } from '../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+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/collection-list-element/collection-list-element.component.ts b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
index 78ac59e7b8..1f60200411 100644
--- a/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/collection-list-element/collection-list-element.component.ts
@@ -1,14 +1,10 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
 
-import {Collection} from '../../../../../../app/core/shared/collection.model';
-import {
-  CollectionListElementComponent as BaseComponent
-} from '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component';
-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 { Collection } from '../../../../../../app/core/shared/collection.model';
+import { Context } from '../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../app/core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { CollectionListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component';
 
 @listableObjectComponent(Collection, ViewMode.ListElement, Context.Any, 'custom')
 
@@ -17,7 +13,7 @@ import {Context} from '../../../../../../app/core/shared/context.model';
   // styleUrls: ['./collection-list-element.component.scss'],
   styleUrls: ['../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.scss'],
   // templateUrl: './collection-list-element.component.html'
-  templateUrl: '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.html'
+  templateUrl: '../../../../../../app/shared/object-list/collection-list-element/collection-list-element.component.html',
 })
 /**
  * Component representing list element for a collection
diff --git a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
index 24e2cdcfa1..a5c3f3fc55 100644
--- a/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
+++ b/src/themes/custom/app/shared/object-list/community-list-element/community-list-element.component.ts
@@ -1,12 +1,10 @@
-import {Component} from '@angular/core';
+import { Component } from '@angular/core';
 
 import { Community } from '../../../../../../app/core/shared/community.model';
-import {
-  CommunityListElementComponent as BaseComponent
-} from '../../../../../../app/shared/object-list/community-list-element/community-list-element.component';
+import { Context } from '../../../../../../app/core/shared/context.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 { CommunityListElementComponent as BaseComponent } from '../../../../../../app/shared/object-list/community-list-element/community-list-element.component';
 
 @listableObjectComponent(Community,  ViewMode.ListElement, Context.Any, 'custom')
 
@@ -15,7 +13,7 @@ import {Context} from '../../../../../../app/core/shared/context.model';
   // styleUrls: ['./community-list-element.component.scss'],
   styleUrls: ['../../../../../../app/shared/object-list/community-list-element/community-list-element.component.scss'],
   // templateUrl: './community-list-element.component.html'
-  templateUrl: '../../../../../../app/shared/object-list/community-list-element/community-list-element.component.html'
+  templateUrl: '../../../../../../app/shared/object-list/community-list-element/community-list-element.component.html',
 })
 /**
  * Component representing a list element for a community
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..563ed1ec51 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
@@ -1,5 +1,6 @@
 import { Component } from '@angular/core';
-import { ObjectListComponent as BaseComponent} from '../../../../../app/shared/object-list/object-list.component';
+
+import { ObjectListComponent as BaseComponent } from '../../../../../app/shared/object-list/object-list.component';
 
 /**
  * A component to display the "Browse By" section of a Community or Collection page
@@ -9,8 +10,8 @@ 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: '../../../../../app/shared/object-list/object-list.component.html'
+  // templateUrl: './object-list.component.html'
+  templateUrl: '../../../../../app/shared/object-list/object-list.component.html',
 })
 
 export class ObjectListComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
new file mode 100644
index 0000000000..b88f57477e
--- /dev/null
+++ b/src/themes/custom/app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+
+import { Context } from '../../../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../../../app/core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../../../../../app/shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { ItemSearchResultListElementComponent as BaseComponent } from '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+
+@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.Any, 'custom')
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.Any, 'custom')
+@Component({
+  selector: 'ds-item-search-result-list-element',
+  // styleUrls: ['./item-search-result-list-element.component.scss'],
+  styleUrls: ['../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.scss'],
+  // templateUrl: './item-search-result-list-element.component.html',
+  templateUrl: '../../../../../../../../../app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component.html',
+})
+export class ItemSearchResultListElementComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.html b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts
new file mode 100644
index 0000000000..b37abbcc34
--- /dev/null
+++ b/src/themes/custom/app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component.ts
@@ -0,0 +1,19 @@
+import { Component } from '@angular/core';
+
+import { Context } from '../../../../../../../app/core/shared/context.model';
+import { ViewMode } from '../../../../../../../app/core/shared/view-mode.model';
+import { ItemSearchResult } from '../../../../../../../app/shared/object-collection/shared/item-search-result.model';
+import { listableObjectComponent } from '../../../../../../../app/shared/object-collection/shared/listable-object/listable-object.decorator';
+import { PublicationSidebarSearchListElementComponent as BaseComponent } from '../../../../../../../app/shared/object-list/sidebar-search-list-element/item-types/publication/publication-sidebar-search-list-element.component';
+
+@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModal, 'custom')
+@listableObjectComponent('PublicationSearchResult', ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'custom')
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModal, 'custom')
+@listableObjectComponent(ItemSearchResult, ViewMode.ListElement, Context.SideBarSearchModalCurrent, 'custom')
+@Component({
+  selector: 'ds-publication-sidebar-search-list-element',
+  // templateUrl: './publication-sidebar-search-list-element.component.html',
+  templateUrl: '../../../../../../../app/shared/object-list/sidebar-search-list-element/sidebar-search-list-element.component.html',
+})
+export class PublicationSidebarSearchListElementComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/results-back-button/results-back-button.component.html b/src/themes/custom/app/shared/results-back-button/results-back-button.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/results-back-button/results-back-button.component.scss b/src/themes/custom/app/shared/results-back-button/results-back-button.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts b/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
new file mode 100644
index 0000000000..d8e772fde1
--- /dev/null
+++ b/src/themes/custom/app/shared/results-back-button/results-back-button.component.ts
@@ -0,0 +1,12 @@
+import { Component } from '@angular/core';
+
+import { ResultsBackButtonComponent as BaseComponent } from '../../../../../app/shared/results-back-button/results-back-button.component';
+
+@Component({
+  selector: 'ds-results-back-button',
+  // styleUrls: ['./results-back-button.component.scss'],
+  styleUrls: ['../../../../../app/shared/results-back-button/results-back-button.component.scss'],
+  //templateUrl: './results-back-button.component.html',
+  templateUrl: '../../../../../app/shared/results-back-button/results-back-button.component.html',
+})
+export class ResultsBackButtonComponent extends BaseComponent {}
diff --git a/src/themes/custom/app/shared/search-form/search-form.component.html b/src/themes/custom/app/shared/search-form/search-form.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search-form/search-form.component.scss b/src/themes/custom/app/shared/search-form/search-form.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search-form/search-form.component.ts b/src/themes/custom/app/shared/search-form/search-form.component.ts
new file mode 100644
index 0000000000..76047b5909
--- /dev/null
+++ b/src/themes/custom/app/shared/search-form/search-form.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { SearchFormComponent as BaseComponent } from '../../../../../app/shared/search-form/search-form.component';
+
+@Component({
+  selector: 'ds-search-form',
+  // styleUrls: ['./search-form.component.scss'],
+  styleUrls: ['../../../../../app/shared/search-form/search-form.component.scss'],
+  // templateUrl: './search-form.component.html',
+  templateUrl: '../../../../../app/shared/search-form/search-form.component.html',
+})
+export class SearchFormComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.html b/src/themes/custom/app/shared/search/search-filters/search-filters.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.scss b/src/themes/custom/app/shared/search/search-filters/search-filters.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
new file mode 100644
index 0000000000..a68290a71b
--- /dev/null
+++ b/src/themes/custom/app/shared/search/search-filters/search-filters.component.ts
@@ -0,0 +1,31 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE_ATMIRE and NOTICE_ATMIRE files at the root of the source
+ * tree and available online at
+ *
+ * https://www.atmire.com/software-license/
+ */
+import { Component } from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchFiltersComponent as BaseComponent } from '../../../../../../app/shared/search/search-filters/search-filters.component';
+
+
+@Component({
+  selector: 'ds-search-filters',
+  // styleUrls: ['./search-filters.component.scss'],
+  styleUrls: ['../../../../../../app/shared/search/search-filters/search-filters.component.scss'],
+  // templateUrl: './search-filters.component.html',
+  templateUrl: '../../../../../../app/shared/search/search-filters/search-filters.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+
+})
+
+export class SearchFiltersComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/search/search-results/search-results.component.ts b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
index 5084d4d405..d35dc7ca28 100644
--- a/src/themes/custom/app/shared/search/search-results/search-results.component.ts
+++ b/src/themes/custom/app/shared/search/search-results/search-results.component.ts
@@ -1,6 +1,10 @@
-import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
 import { Component } from '@angular/core';
-import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade';
+
+import {
+  fadeIn,
+  fadeInOut,
+} from '../../../../../../app/shared/animations/fade';
+import { SearchResultsComponent as BaseComponent } from '../../../../../../app/shared/search/search-results/search-results.component';
 
 @Component({
   selector: 'ds-search-results',
@@ -9,8 +13,8 @@ import { fadeIn, fadeInOut } from '../../../../../../app/shared/animations/fade'
   // styleUrls: ['./search-results.component.scss'],
   animations: [
     fadeIn,
-    fadeInOut
-  ]
+    fadeInOut,
+  ],
 })
 export class SearchResultsComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
index e17c2425b5..d07456d7ef 100644
--- a/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
+++ b/src/themes/custom/app/shared/search/search-settings/search-settings.component.ts
@@ -6,11 +6,10 @@
  * https://www.atmire.com/software-license/
  */
 import { Component } from '@angular/core';
-import {
-  SearchSettingsComponent as BaseComponent,
-} from '../../../../../../app/shared/search/search-settings/search-settings.component';
-import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+
 import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchSettingsComponent as BaseComponent } from '../../../../../../app/shared/search/search-settings/search-settings.component';
 
 
 @Component({
@@ -22,9 +21,9 @@ import { SearchConfigurationService } from '../../../../../../app/core/shared/se
   providers: [
     {
       provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
+      useClass: SearchConfigurationService,
+    },
+  ],
 
 })
 
diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.html b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.scss b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
new file mode 100644
index 0000000000..dcb5305c7f
--- /dev/null
+++ b/src/themes/custom/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -0,0 +1,31 @@
+/**
+ * The contents of this file are subject to the license and copyright
+ * detailed in the LICENSE_ATMIRE and NOTICE_ATMIRE files at the root of the source
+ * tree and available online at
+ *
+ * https://www.atmire.com/software-license/
+ */
+import { Component } from '@angular/core';
+
+import { SearchConfigurationService } from '../../../../../../app/core/shared/search/search-configuration.service';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../../app/my-dspace-page/my-dspace-page.component';
+import { SearchSidebarComponent as BaseComponent } from '../../../../../../app/shared/search/search-sidebar/search-sidebar.component';
+
+
+@Component({
+  selector: 'ds-search-sidebar',
+  // styleUrls: ['./search-sidebar.component.scss'],
+  styleUrls: ['../../../../../../app/shared/search/search-sidebar/search-sidebar.component.scss'],
+  // templateUrl: './search-sidebar.component.html',
+  templateUrl: '../../../../../../app/shared/search/search-sidebar/search-sidebar.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService,
+    },
+  ],
+
+})
+
+export class SearchSidebarComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.html b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.scss b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
new file mode 100644
index 0000000000..22ae9cfc4c
--- /dev/null
+++ b/src/themes/custom/app/shared/starts-with/date/starts-with-date.component.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+
+import { StartsWithDateComponent as BaseComponent } from '../../../../../../app/shared/starts-with/date/starts-with-date.component';
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from '../../../../../../app/shared/starts-with/starts-with-decorator';
+
+@Component({
+  selector: 'ds-starts-with-date',
+  // styleUrls: ['./starts-with-date.component.scss'],
+  styleUrls: ['../../../../../../app/shared/starts-with/date/starts-with-date.component.scss'],
+  // templateUrl: './starts-with-date.component.html',
+  templateUrl: '../../../../../../app/shared/starts-with/date/starts-with-date.component.html',
+})
+@renderStartsWithFor(StartsWithType.date)
+export class StartsWithDateComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.html b/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.scss b/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts b/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts
new file mode 100644
index 0000000000..d9027f3e13
--- /dev/null
+++ b/src/themes/custom/app/shared/starts-with/text/starts-with-text.component.ts
@@ -0,0 +1,18 @@
+import { Component } from '@angular/core';
+
+import {
+  renderStartsWithFor,
+  StartsWithType,
+} from '../../../../../../app/shared/starts-with/starts-with-decorator';
+import { StartsWithTextComponent as BaseComponent } from '../../../../../../app/shared/starts-with/text/starts-with-text.component';
+
+@Component({
+  selector: 'ds-starts-with-text',
+  // styleUrls: ['./starts-with-text.component.scss'],
+  styleUrls: ['../../../../../../app/shared/starts-with/text/starts-with-text.component.scss'],
+  // templateUrl: './starts-with-text.component.html',
+  templateUrl: '../../../../../../app/shared/starts-with/text/starts-with-text.component.html',
+})
+@renderStartsWithFor(StartsWithType.text)
+export class StartsWithTextComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts b/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
index f3fa9d3e42..ba8e86e93c 100644
--- a/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/collection-statistics-page/collection-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CollectionStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/collection-statistics-page/collection-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { CollectionStatisticsPageComponent as BaseComponent } from '../../../../
   // styleUrls: ['./collection-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/collection-statistics-page/collection-statistics-page.component.scss'],
   // templateUrl: './collection-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts b/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
index 76aac6aa15..3e18999961 100644
--- a/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/community-statistics-page/community-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { CommunityStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/community-statistics-page/community-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { CommunityStatisticsPageComponent as BaseComponent } from '../../../../.
   // styleUrls: ['./community-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/community-statistics-page/community-statistics-page.component.scss'],
   // templateUrl: './community-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts b/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
index f2adbc9c21..fa7d4038e0 100644
--- a/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/item-statistics-page/item-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { ItemStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/item-statistics-page/item-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { ItemStatisticsPageComponent as BaseComponent } from '../../../../../app
   // styleUrls: ['./item-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/item-statistics-page/item-statistics-page.component.scss'],
   // templateUrl: './item-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts b/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
index 30dc6502ea..398a0eeece 100644
--- a/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
+++ b/src/themes/custom/app/statistics-page/site-statistics-page/site-statistics-page.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SiteStatisticsPageComponent as BaseComponent } from '../../../../../app/statistics-page/site-statistics-page/site-statistics-page.component';
 
 @Component({
@@ -6,7 +7,7 @@ import { SiteStatisticsPageComponent as BaseComponent } from '../../../../../app
   // styleUrls: ['./site-statistics-page.component.scss'],
   styleUrls: ['../../../../../app/statistics-page/site-statistics-page/site-statistics-page.component.scss'],
   // templateUrl: './site-statistics-page.component.html',
-  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html'
+  templateUrl: '../../../../../app/statistics-page/statistics-page/statistics-page.component.html',
 })
 
 /**
diff --git a/src/themes/custom/app/submission/edit/submission-edit.component.ts b/src/themes/custom/app/submission/edit/submission-edit.component.ts
index 88559d30b4..c87d4a8082 100644
--- a/src/themes/custom/app/submission/edit/submission-edit.component.ts
+++ b/src/themes/custom/app/submission/edit/submission-edit.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SubmissionEditComponent as BaseComponent } from '../../../../../app/submission/edit/submission-edit.component';
 
 /**
@@ -9,7 +10,7 @@ import { SubmissionEditComponent as BaseComponent } from '../../../../../app/sub
   // styleUrls: ['./submission-edit.component.scss'],
   styleUrls: ['../../../../../app/submission/edit/submission-edit.component.scss'],
   // templateUrl: './submission-edit.component.html'
-  templateUrl: '../../../../../app/submission/edit/submission-edit.component.html'
+  templateUrl: '../../../../../app/submission/edit/submission-edit.component.html',
 })
 export class SubmissionEditComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
index cf541b85c9..95f0c4dcae 100644
--- a/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
+++ b/src/themes/custom/app/submission/import-external/submission-import-external.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { fadeIn } from '../../../../../app/shared/animations/fade';
 import { SubmissionImportExternalComponent as BaseComponent } from '../../../../../app/submission/import-external/submission-import-external.component';
 
@@ -11,7 +12,7 @@ import { SubmissionImportExternalComponent as BaseComponent } from '../../../../
   styleUrls: ['../../../../../app/submission/import-external/submission-import-external.component.scss'],
   // templateUrl: './submission-import-external.component.html',
   templateUrl: '../../../../../app/submission/import-external/submission-import-external.component.html',
-  animations: [fadeIn]
+  animations: [fadeIn],
 })
 export class SubmissionImportExternalComponent extends BaseComponent {
 
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.html b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.scss b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
new file mode 100644
index 0000000000..72d43e4ff2
--- /dev/null
+++ b/src/themes/custom/app/submission/sections/upload/file/section-upload-file.component.ts
@@ -0,0 +1,16 @@
+import { Component } from '@angular/core';
+import { SubmissionSectionUploadFileComponent as BaseComponent } from 'src/app/submission/sections/upload/file/section-upload-file.component';
+
+/**
+ * This component represents a single bitstream contained in the submission
+ */
+@Component({
+  selector: 'ds-submission-upload-section-file',
+  // styleUrls: ['./section-upload-file.component.scss'],
+  styleUrls: ['../../../../../../../app/submission/sections/upload/file/section-upload-file.component.scss'],
+  // templateUrl: './section-upload-file.component.html'
+  templateUrl: '../../../../../../../app/submission/sections/upload/file/section-upload-file.component.html',
+})
+export class SubmissionSectionUploadFileComponent
+  extends BaseComponent {
+}
diff --git a/src/themes/custom/app/submission/submit/submission-submit.component.ts b/src/themes/custom/app/submission/submit/submission-submit.component.ts
index 05c3389cb7..dacecb8167 100644
--- a/src/themes/custom/app/submission/submit/submission-submit.component.ts
+++ b/src/themes/custom/app/submission/submit/submission-submit.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { SubmissionSubmitComponent as BaseComponent } from '../../../../../app/submission/submit/submission-submit.component';
 
 /**
@@ -9,7 +10,7 @@ import { SubmissionSubmitComponent as BaseComponent } from '../../../../../app/s
   // styleUrls: ['./submission-submit.component.scss'],
   styleUrls: ['../../../../../app/submission/submit/submission-submit.component.scss'],
   // templateUrl: './submission-submit.component.html'
-  templateUrl: '../../../../../app/submission/submit/submission-submit.component.html'
+  templateUrl: '../../../../../app/submission/submit/submission-submit.component.html',
 })
 export class SubmissionSubmitComponent extends BaseComponent {
 }
diff --git a/src/themes/custom/app/thumbnail/thumbnail.component.html b/src/themes/custom/app/thumbnail/thumbnail.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/thumbnail/thumbnail.component.scss b/src/themes/custom/app/thumbnail/thumbnail.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/thumbnail/thumbnail.component.ts b/src/themes/custom/app/thumbnail/thumbnail.component.ts
new file mode 100644
index 0000000000..8a3fb66fec
--- /dev/null
+++ b/src/themes/custom/app/thumbnail/thumbnail.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+import { ThumbnailComponent as BaseComponent } from '../../../../app/thumbnail/thumbnail.component';
+
+@Component({
+  selector: 'ds-thumbnail',
+  // styleUrls: ['./thumbnail.component.scss'],
+  styleUrls: ['../../../../app/thumbnail/thumbnail.component.scss'],
+  // templateUrl: './thumbnail.component.html',
+  templateUrl: '../../../../app/thumbnail/thumbnail.component.html',
+})
+export class ThumbnailComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 7c4831484f..2c34b197a8 100644
--- a/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,11 +1,12 @@
 import { Component } from '@angular/core';
+
 import { WorkflowItemDeleteComponent as BaseComponent } from '../../../../../app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
 
 @Component({
   selector: 'ds-workflow-item-delete',
   // styleUrls: ['workflow-item-delete.component.scss'],
   // templateUrl: './workflow-item-delete.component.html'
-  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html'
+  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to delete a workflow item
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..6615d41857 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
@@ -1,11 +1,15 @@
 import { Component } from '@angular/core';
+
 import { WorkflowItemSendBackComponent as BaseComponent } from '../../../../../app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
 
 @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'
+  templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html',
 })
 /**
  * Component representing a page to send back a workflow item to the submitter
diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.html b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.scss b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts
new file mode 100644
index 0000000000..2f6cc90f05
--- /dev/null
+++ b/src/themes/custom/app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component.ts
@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+import { WorkspaceItemsDeletePageComponent as BaseComponent } from '../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component';
+
+
+@Component({
+  selector: 'ds-workspaceitems-delete-page',
+  templateUrl: '../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html',
+})
+export class WorkspaceItemsDeletePageComponent extends BaseComponent {
+}
diff --git a/src/themes/custom/eager-theme.module.ts b/src/themes/custom/eager-theme.module.ts
index 4e3c6f8b46..3ac3f48dfc 100644
--- a/src/themes/custom/eager-theme.module.ts
+++ b/src/themes/custom/eager-theme.module.ts
@@ -1,49 +1,44 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { NgModule } from '@angular/core';
+
+import { ItemPageModule } from '../../app/item-page/item-page.module';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import { NavbarModule } from '../../app/navbar/navbar.module';
+import { RootModule } from '../../app/root.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../app/shared/shared.module';
-import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
-import { NavbarComponent } from './app/navbar/navbar.component';
-import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component';
+import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
+import { JournalIssueComponent } from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
+import { JournalVolumeComponent } from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
+import { PersonComponent } from './app/entity-groups/research-entities/item-pages/person/person.component';
+import { FooterComponent } from './app/footer/footer.component';
 import { HeaderComponent } from './app/header/header.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { SearchModule } from '../../app/shared/search/search.module';
-import { RootModule } from '../../app/root.module';
-import { NavbarModule } from '../../app/navbar/navbar.module';
+import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
+import { TopLevelCommunityListComponent } from './app/home-page/top-level-community-list/top-level-community-list.component';
 import { PublicationComponent } from './app/item-page/simple/item-types/publication/publication.component';
-import { ItemPageModule } from '../../app/item-page/item-page.module';
-import { FooterComponent } from './app/footer/footer.component';
-import { JournalComponent } from './app/entity-groups/journal-entities/item-pages/journal/journal.component';
-import {
-  JournalIssueComponent
-} from './app/entity-groups/journal-entities/item-pages/journal-issue/journal-issue.component';
-import {
-  JournalVolumeComponent
-} from './app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component';
 import { UntypedItemComponent } from './app/item-page/simple/item-types/untyped-item/untyped-item.component';
-import { ItemSharedModule } from '../../app/item-page/item-shared.module';
-import {
-    CreateCollectionParentSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
-import {
-    CreateCommunityParentSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import {
-    CreateItemParentSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
-import {
-    EditCollectionSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
-import {
-    EditCommunitySelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
-import {
-    EditItemSelectorComponent
-} from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
-
+import { NavbarComponent } from './app/navbar/navbar.component';
+import { SearchNavbarComponent } from './app/search-navbar/search-navbar.component';
+import { CollectionDropdownComponent } from './app/shared/collection-dropdown/collection-dropdown.component';
+import { CreateCollectionParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
+import { CreateCommunityParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
+import { CreateItemParentSelectorComponent } from './app/shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
+import { EditCollectionSelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import { EditCommunitySelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
+import { EditItemSelectorComponent } from './app/shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
+import { FileDownloadLinkComponent } from './app/shared/file-download-link/file-download-link.component';
+import { LangSwitchComponent } from './app/shared/lang-switch/lang-switch.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 { CollectionListElementComponent } from './app/shared/object-list/collection-list-element/collection-list-element.component';
 import { CommunityListElementComponent } from './app/shared/object-list/community-list-element/community-list-element.component';
-import { CollectionListElementComponent} from './app/shared/object-list/collection-list-element/collection-list-element.component';
-
+import { ItemSearchResultListElementComponent } from './app/shared/object-list/search-result-list-element/item-search-result/item-types/item/item-search-result-list-element.component';
+import { PublicationSidebarSearchListElementComponent } from './app/shared/object-list/sidebar-search-list-element/item-types/publication-sidebar-search-list-element.component';
+import { StartsWithDateComponent } from './app/shared/starts-with/date/starts-with-date.component';
+import { StartsWithTextComponent } from './app/shared/starts-with/text/starts-with-text.component';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
@@ -53,11 +48,19 @@ const ENTRY_COMPONENTS = [
   JournalComponent,
   JournalIssueComponent,
   JournalVolumeComponent,
+  PersonComponent,
   PublicationComponent,
   UntypedItemComponent,
-
   CommunityListElementComponent,
   CollectionListElementComponent,
+  CollectionDropdownComponent,
+  FileDownloadLinkComponent,
+  StartsWithDateComponent,
+  StartsWithTextComponent,
+  PublicationSidebarSearchListElementComponent,
+  ItemSearchResultListElementComponent,
+  TopLevelCommunityListComponent,
+  BrowseEntryListElementComponent,
 ];
 
 const DECLARATIONS = [
@@ -74,22 +77,28 @@ const DECLARATIONS = [
   EditCollectionSelectorComponent,
   EditCommunitySelectorComponent,
   EditItemSelectorComponent,
+  LogInComponent,
+  LangSwitchComponent,
 ];
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
     RootModule,
     NavbarModule,
+    SharedBrowseByModule,
+    ResultsBackButtonModule,
     ItemPageModule,
     ItemSharedModule,
+    DsoPageModule,
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({ provide: component })),
+  ],
+  exports: [
+    ItemSearchResultListElementComponent,
   ],
 })
 /**
diff --git a/src/themes/custom/lazy-theme.module.ts b/src/themes/custom/lazy-theme.module.ts
index d2ac0ae787..814313f46e 100644
--- a/src/themes/custom/lazy-theme.module.ts
+++ b/src/themes/custom/lazy-theme.module.ts
@@ -1,128 +1,152 @@
-import { NgModule } from '@angular/core';
+import { DragDropModule } from '@angular/cdk/drag-drop';
 import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
+import { NgxGalleryModule } from '@kolkov/ngx-gallery';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreRouterConnectingModule } from '@ngrx/router-store';
+import { StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { IdlePreloadModule } from 'angular-idle-preload';
+import { RequestCopyModule } from 'src/app/request-copy/request-copy.module';
+
 import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
+import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
 import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
 import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module';
-import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
+import { AppModule } from '../../app/app.module';
 import { BrowseByModule } from '../../app/browse-by/browse-by.module';
 import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module';
+import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
+import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
 import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
+import { CommunityPageModule } from '../../app/community-page/community-page.module';
 import { CoreModule } from '../../app/core/core.module';
-import { DragDropModule } from '@angular/cdk/drag-drop';
-import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
-import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
-import { IdlePreloadModule } from 'angular-idle-preload';
+import { DsoSharedModule } from '../../app/dso-shared/dso-shared.module';
 import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
+import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
+import { HomePageModule } from '../../app/home-page/home-page.module';
+import { InfoModule } from '../../app/info/info.module';
+import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
+import { ItemPageModule } from '../../app/item-page/item-page.module';
+import { ItemSharedModule } from '../../app/item-page/item-shared.module';
+import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
+import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
 import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
-import { MenuModule } from '../../app/shared/menu/menu.module';
 import { NavbarModule } from '../../app/navbar/navbar.module';
-import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { NotificationsModule } from '../../app/notifications/notifications.module';
 import { ProfilePageModule } from '../../app/profile-page/profile-page.module';
 import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
-import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
-import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { RootModule } from '../../app/root.module';
 import { SearchPageModule } from '../../app/search-page/search-page.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { ComcolModule } from '../../app/shared/comcol/comcol.module';
+import { DsoPageModule } from '../../app/shared/dso-page/dso-page.module';
+import { FormModule } from '../../app/shared/form/form.module';
+import { MenuModule } from '../../app/shared/menu/menu.module';
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { SearchModule } from '../../app/shared/search/search.module';
 import { SharedModule } from '../../app/shared/shared.module';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
-import { StoreModule } from '@ngrx/store';
-import { StoreRouterConnectingModule } from '@ngrx/router-store';
-import { TranslateModule } from '@ngx-translate/core';
-import { HomePageModule } from '../../app/home-page/home-page.module';
-import { AppModule } from '../../app/app.module';
-import { ItemPageModule } from '../../app/item-page/item-page.module';
-import { RouterModule } from '@angular/router';
-import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
-import { InfoModule } from '../../app/info/info.module';
 import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
-import { CommunityPageModule } from '../../app/community-page/community-page.module';
-import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
 import { SubmissionModule } from '../../app/submission/submission.module';
-import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
-import { SearchModule } from '../../app/shared/search/search.module';
-import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
-import { ComcolModule } from '../../app/shared/comcol/comcol.module';
-import { RootModule } from '../../app/root.module';
-import { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component';
-import { HomePageComponent } from './app/home-page/home-page.component';
-import { RootComponent } from './app/root/root.component';
-import { BrowseBySwitcherComponent } from './app/browse-by/browse-by-switcher/browse-by-switcher.component';
-import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component';
-import { SearchPageComponent } from './app/search-page/search-page.component';
-import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-page.component';
-import { EndUserAgreementComponent } from './app/info/end-user-agreement/end-user-agreement.component';
-import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component';
-import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
-import { ForbiddenComponent } from './app/forbidden/forbidden.component';
-import { PrivacyComponent } from './app/info/privacy/privacy.component';
-import {
-  CollectionStatisticsPageComponent
-} from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
-import {
-  CommunityStatisticsPageComponent
-} from './app/statistics-page/community-statistics-page/community-statistics-page.component';
-import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
-import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
-import { CommunityPageComponent } from './app/community-page/community-page.component';
+import { SystemWideAlertModule } from '../../app/system-wide-alert/system-wide-alert.module';
+import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
+import { EditBitstreamPageComponent } from './app/bitstream-page/edit-bitstream-page/edit-bitstream-page.component';
+import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
+import { BrowseByDateComponent } from './app/browse-by/browse-by-date/browse-by-date.component';
+import { BrowseByMetadataComponent } from './app/browse-by/browse-by-metadata/browse-by-metadata.component';
+import { BrowseByTaxonomyComponent } from './app/browse-by/browse-by-taxonomy/browse-by-taxonomy.component';
+import { BrowseByTitleComponent } from './app/browse-by/browse-by-title/browse-by-title.component';
 import { CollectionPageComponent } from './app/collection-page/collection-page.component';
-import { ItemPageComponent } from './app/item-page/simple/item-page.component';
-import { FullItemPageComponent } from './app/item-page/full/full-item-page.component';
-import { LoginPageComponent } from './app/login-page/login-page.component';
-import { LogoutPageComponent } from './app/logout-page/logout-page.component';
-import { CreateProfileComponent } from './app/register-page/create-profile/create-profile.component';
+import { EditItemTemplatePageComponent } from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
+import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
+import { CommunityListPageComponent } from './app/community-list-page/community-list-page.component';
+import { CommunityPageComponent } from './app/community-page/community-page.component';
+import { CommunityPageSubCollectionListComponent } from './app/community-page/sections/sub-com-col-section/sub-collection-list/community-page-sub-collection-list.component';
+import { CommunityPageSubCommunityListComponent } from './app/community-page/sections/sub-com-col-section/sub-community-list/community-page-sub-community-list.component';
+import { DsoEditMetadataComponent } from './app/dso-shared/dso-edit-metadata/dso-edit-metadata.component';
+import { ForbiddenComponent } from './app/forbidden/forbidden.component';
 import { ForgotEmailComponent } from './app/forgot-password/forgot-password-email/forgot-email.component';
 import { ForgotPasswordFormComponent } from './app/forgot-password/forgot-password-form/forgot-password-form.component';
-import { ProfilePageComponent } from './app/profile-page/profile-page.component';
-import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
-import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
-import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
-import {
-  SubmissionImportExternalComponent
-} from './app/submission/import-external/submission-import-external.component';
-import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
-import { WorkflowItemDeleteComponent
-} from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
-import {
-  WorkflowItemSendBackComponent
-} from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
-import { BreadcrumbsComponent } from './app/breadcrumbs/breadcrumbs.component';
+import { HomePageComponent } from './app/home-page/home-page.component';
+import { EndUserAgreementComponent } from './app/info/end-user-agreement/end-user-agreement.component';
 import { FeedbackComponent } from './app/info/feedback/feedback.component';
-import { CommunityListComponent } from './app/community-list-page/community-list/community-list.component';
-
-import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component';
+import { FeedbackFormComponent } from './app/info/feedback/feedback-form/feedback-form.component';
+import { PrivacyComponent } from './app/info/privacy/privacy.component';
+import { ItemAlertsComponent } from './app/item-page/alerts/item-alerts.component';
+import { ItemStatusComponent } from './app/item-page/edit-item-page/item-status/item-status.component';
+import { FullFileSectionComponent } from './app/item-page/full/field-components/file-section/full-file-section.component';
+import { FullItemPageComponent } from './app/item-page/full/full-item-page.component';
+import { MediaViewerComponent } from './app/item-page/media-viewer/media-viewer.component';
+import { MediaViewerImageComponent } from './app/item-page/media-viewer/media-viewer-image/media-viewer-image.component';
+import { MediaViewerVideoComponent } from './app/item-page/media-viewer/media-viewer-video/media-viewer-video.component';
+import { FileSectionComponent } from './app/item-page/simple/field-components/file-section/file-section.component';
+import { ItemPageTitleFieldComponent } from './app/item-page/simple/field-components/specific-field/title/item-page-title-field.component';
+import { ItemPageComponent } from './app/item-page/simple/item-page.component';
+import { MetadataRepresentationListComponent } from './app/item-page/simple/metadata-representation-list/metadata-representation-list.component';
+import { LoginPageComponent } from './app/login-page/login-page.component';
+import { LogoutPageComponent } from './app/logout-page/logout-page.component';
+import { ObjectNotFoundComponent } from './app/lookup-by-id/objectnotfound/objectnotfound.component';
+import { MyDSpacePageComponent } from './app/my-dspace-page/my-dspace-page.component';
+import { ExpandableNavbarSectionComponent } from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
+import { PageNotFoundComponent } from './app/pagenotfound/pagenotfound.component';
+import { ProfilePageComponent } from './app/profile-page/profile-page.component';
+import { RegisterEmailFormComponent } from './app/register-email-form/register-email-form.component';
+import { CreateProfileComponent } from './app/register-page/create-profile/create-profile.component';
+import { RegisterEmailComponent } from './app/register-page/register-email/register-email.component';
+import { DenyRequestCopyComponent } from './app/request-copy/deny-request-copy/deny-request-copy.component';
+import { EmailRequestCopyComponent } from './app/request-copy/email-request-copy/email-request-copy.component';
+import { GrantRequestCopyComponent } from './app/request-copy/grant-request-copy/grant-request-copy.component';
+import { RootComponent } from './app/root/root.component';
+import { ConfigurationSearchPageComponent } from './app/search-page/configuration-search-page.component';
+import { SearchPageComponent } from './app/search-page/search-page.component';
 import { AuthNavMenuComponent } from './app/shared/auth-nav-menu/auth-nav-menu.component';
-import {
-  ExpandableNavbarSectionComponent
-} from './app/navbar/expandable-navbar-section/expandable-navbar-section.component';
-import { ItemMetadataComponent } from './app/item-page/edit-item-page/item-metadata/item-metadata.component';
-import {
-  EditItemTemplatePageComponent
-} from './app/collection-page/edit-item-template-page/edit-item-template-page.component';
-import { LoadingComponent } from './app/shared/loading/loading.component';
-import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
-import { AdminSidebarComponent } from './app/admin/admin-sidebar/admin-sidebar.component';
+import { UserMenuComponent } from './app/shared/auth-nav-menu/user-menu/user-menu.component';
+import { BrowseByComponent } from './app/shared/browse-by/browse-by.component';
 import { ComcolPageBrowseByComponent } from './app/shared/comcol-page-browse-by/comcol-page-browse-by.component';
-import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
-import {
-  CommunityPageSubCommunityListComponent
-} from './app/community-page/sub-community-list/community-page-sub-community-list.component';
-import {
-  CommunityPageSubCollectionListComponent
-} from './app/community-page/sub-collection-list/community-page-sub-collection-list.component';
+import { ComcolPageHandleComponent } from './app/shared/comcol-page-handle/comcol-page-handle.component';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { ExternalSourceEntryImportModalComponent } from './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';
+import { DsDynamicLookupRelationSearchTabComponent } from './app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+import { LoadingComponent } from './app/shared/loading/loading.component';
+import { AccessStatusBadgeComponent } from './app/shared/object-collection/shared/badges/access-status-badge/access-status-badge.component';
+import { BadgesComponent } from './app/shared/object-collection/shared/badges/badges.component';
+import { MyDSpaceStatusBadgeComponent } from './app/shared/object-collection/shared/badges/my-dspace-status-badge/my-dspace-status-badge.component';
+import { StatusBadgeComponent } from './app/shared/object-collection/shared/badges/status-badge/status-badge.component';
+import { TypeBadgeComponent } from './app/shared/object-collection/shared/badges/type-badge/type-badge.component';
 import { ObjectListComponent } from './app/shared/object-list/object-list.component';
-
-import { BrowseByMetadataPageComponent } from './app/browse-by/browse-by-metadata-page/browse-by-metadata-page.component';
-import { BrowseByDatePageComponent } from './app/browse-by/browse-by-date-page/browse-by-date-page.component';
-import { BrowseByTitlePageComponent } from './app/browse-by/browse-by-title-page/browse-by-title-page.component';
+import { ResultsBackButtonComponent } from './app/shared/results-back-button/results-back-button.component';
+import { SearchFiltersComponent } from './app/shared/search/search-filters/search-filters.component';
+import { SearchResultsComponent } from './app/shared/search/search-results/search-results.component';
+import { SearchSettingsComponent } from './app/shared/search/search-settings/search-settings.component';
+import { SearchSidebarComponent } from './app/shared/search/search-sidebar/search-sidebar.component';
+import { SearchFormComponent } from './app/shared/search-form/search-form.component';
+import { CollectionStatisticsPageComponent } from './app/statistics-page/collection-statistics-page/collection-statistics-page.component';
+import { CommunityStatisticsPageComponent } from './app/statistics-page/community-statistics-page/community-statistics-page.component';
+import { ItemStatisticsPageComponent } from './app/statistics-page/item-statistics-page/item-statistics-page.component';
+import { SiteStatisticsPageComponent } from './app/statistics-page/site-statistics-page/site-statistics-page.component';
+import { SubmissionEditComponent } from './app/submission/edit/submission-edit.component';
+import { SubmissionImportExternalComponent } from './app/submission/import-external/submission-import-external.component';
+import { SubmissionSectionUploadFileComponent } from './app/submission/sections/upload/file/section-upload-file.component';
+import { SubmissionSubmitComponent } from './app/submission/submit/submission-submit.component';
+import { ThumbnailComponent } from './app/thumbnail/thumbnail.component';
+import { WorkflowItemDeleteComponent } from './app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component';
+import { WorkflowItemSendBackComponent } from './app/workflowitems-edit-page/workflow-item-send-back/workflow-item-send-back.component';
+import { WorkspaceItemsDeletePageComponent } from './app/workspace-items-delete-page/workspace-items-delete/workspace-items-delete.component';
 
 const DECLARATIONS = [
   FileSectionComponent,
   HomePageComponent,
   RootComponent,
-  BrowseBySwitcherComponent,
   CommunityListPageComponent,
   SearchPageComponent,
   ConfigurationSearchPageComponent,
+  SearchFormComponent,
   EndUserAgreementComponent,
   PageNotFoundComponent,
   ObjectNotFoundComponent,
@@ -153,11 +177,11 @@ const DECLARATIONS = [
   WorkflowItemSendBackComponent,
   BreadcrumbsComponent,
   FeedbackComponent,
+  FeedbackFormComponent,
   CommunityListComponent,
   ComcolPageHandleComponent,
   AuthNavMenuComponent,
   ExpandableNavbarSectionComponent,
-  ItemMetadataComponent,
   EditItemTemplatePageComponent,
   LoadingComponent,
   SearchResultsComponent,
@@ -165,11 +189,40 @@ const DECLARATIONS = [
   SearchSettingsComponent,
   ComcolPageBrowseByComponent,
   ObjectListComponent,
-  BrowseByMetadataPageComponent,
-  BrowseByDatePageComponent,
-  BrowseByTitlePageComponent,
-
-
+  BrowseByMetadataComponent,
+  BrowseByDateComponent,
+  BrowseByTitleComponent,
+  BrowseByTaxonomyComponent,
+  ExternalSourceEntryImportModalComponent,
+  SearchFiltersComponent,
+  SearchSidebarComponent,
+  BadgesComponent,
+  StatusBadgeComponent,
+  TypeBadgeComponent,
+  MyDSpaceStatusBadgeComponent,
+  AccessStatusBadgeComponent,
+  ResultsBackButtonComponent,
+  DsoEditMetadataComponent,
+  ItemAlertsComponent,
+  FullFileSectionComponent,
+  MetadataRepresentationListComponent,
+  DsDynamicLookupRelationSearchTabComponent,
+  DsDynamicLookupRelationExternalSourceTabComponent,
+  ItemPageTitleFieldComponent,
+  MediaViewerComponent,
+  MediaViewerImageComponent,
+  MediaViewerVideoComponent,
+  DenyRequestCopyComponent,
+  EmailRequestCopyComponent,
+  GrantRequestCopyComponent,
+  WorkspaceItemsDeletePageComponent,
+  ThumbnailComponent,
+  SubmissionSectionUploadFileComponent,
+  ItemStatusComponent,
+  EditBitstreamPageComponent,
+  UserMenuComponent,
+  BrowseByComponent,
+  RegisterEmailFormComponent,
 ];
 
 @NgModule({
@@ -189,8 +242,10 @@ const DECLARATIONS = [
     CommunityPageModule,
     CoreModule,
     DragDropModule,
+    ItemSharedModule,
     ItemPageModule,
     EditItemPageModule,
+    ItemVersionsModule,
     FormsModule,
     HomePageModule,
     HttpClientModule,
@@ -198,6 +253,7 @@ const DECLARATIONS = [
     InfoModule,
     JournalEntitiesModule,
     MenuModule,
+    DsoPageModule,
     MyDspaceSearchModule,
     NavbarModule,
     NgbModule,
@@ -208,6 +264,8 @@ const DECLARATIONS = [
     ScrollToModule,
     SearchPageModule,
     SharedModule,
+    SharedBrowseByModule,
+    ResultsBackButtonModule,
     StatisticsModule,
     StatisticsPageModule,
     StoreModule,
@@ -220,14 +278,17 @@ const DECLARATIONS = [
     FormsModule,
     ResourcePoliciesModule,
     ComcolModule,
+    DsoSharedModule,
+    SystemWideAlertModule,
+    NgxGalleryModule,
+    FormModule,
+    RequestCopyModule,
+    NotificationsModule,
   ],
   declarations: DECLARATIONS,
-  exports: [
-    CommunityPageSubCollectionListComponent
-  ]
 })
 
-  /**
+/**
    * This module serves as an index for all the components in this theme.
    * It should import all other modules, so the compiler knows where to find any components referenced
    * from a component in this theme
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 36e23e174a..7347b2ff24 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,5 +1,7 @@
 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
@@ -8,6 +10,7 @@ import { HeaderNavbarWrapperComponent as BaseComponent } from '../../../../app/h
   selector: 'ds-header-navbar-wrapper',
   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 0fd4d42518..51373e8cd1 100644
--- a/src/themes/dspace/app/header/header.component.html
+++ b/src/themes/dspace/app/header/header.component.html
@@ -1,24 +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">
+        <img id="header-logo" src="assets/images/dspace-logo.svg" [attr.alt]="'menu.header.image.logo' | translate"/>
       </a>
+      <nav *ngIf="(isMobile$ | async) !== true" 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">
-      <ds-search-navbar class="navbar-search"></ds-search-navbar>
-      <ds-lang-switch></ds-lang-switch>
-      <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>
+    <!-- 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>
+      <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) !== true">
+          <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 ab418865f1..5aae8af017 100644
--- a/src/themes/dspace/app/header/header.component.scss
+++ b/src/themes/dspace/app/header/header.component.scss
@@ -1,19 +1,28 @@
-@media screen and (min-width: map-get($grid-breakpoints, md)) {
-  nav.navbar {
-    display: none;
-  }
-  .header {
-    background-color: var(--ds-header-bg);
-  }
-}
+:host {
+  #main-site-header {
+    min-height: var(--ds-header-height);
 
-.navbar-brand img {
-  @media screen and (max-width: map-get($grid-breakpoints, md)) {
-    height: var(--ds-header-logo-height-xs);
+    @include media-breakpoint-up(md) {
+      height: var(--ds-header-height);
+    }
+
+    background-color: var(--ds-header-bg);
+
+    &-container {
+      min-height: var(--ds-header-height);
+    }
   }
-}
-.navbar-toggler .navbar-toggler-icon {
-  background-image: none !important;
-  line-height: 1.5;
-  color: var(--bs-link-color);
+
+  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..1e71ba6b20 100644
--- a/src/themes/dspace/app/header/header.component.ts
+++ b/src/themes/dspace/app/header/header.component.ts
@@ -1,4 +1,9 @@
-import { Component } from '@angular/core';
+import {
+  Component,
+  OnInit,
+} from '@angular/core';
+import { Observable } from 'rxjs';
+
 import { HeaderComponent as BaseComponent } from '../../../../app/header/header.component';
 
 /**
@@ -9,5 +14,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..29711c1bf6 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">
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..3c3aa8b445 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,6 +1,5 @@
 :host {
   display: block;
-  margin-top: calc(var(--ds-content-spacing) * -1);
 
   div.background-image-container {
     color: white;
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.ts b/src/themes/dspace/app/home-page/home-news/home-news.component.ts
index d4032011dc..bccb4aa9cb 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.ts
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.ts
@@ -1,10 +1,11 @@
 import { Component } from '@angular/core';
+
 import { HomeNewsComponent as BaseComponent } from '../../../../../app/home-page/home-news/home-news.component';
 
 @Component({
   selector: 'ds-home-news',
   styleUrls: ['./home-news.component.scss'],
-  templateUrl: './home-news.component.html'
+  templateUrl: './home-news.component.html',
 })
 
 /**
diff --git a/src/themes/dspace/app/navbar/navbar.component.html b/src/themes/dspace/app/navbar/navbar.component.html
index 512ef45265..f1c8c66847 100644
--- a/src/themes/dspace/app/navbar/navbar.component.html
+++ b/src/themes/dspace/app/navbar/navbar.component.html
@@ -1,20 +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="container h-100">
-    <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 navbar-navigation me-auto mb-2 mb-lg-0 h-100 d-flex align-items-center">
-        <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-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-themed-user-menu [inExpandableNavbar]="true"></ds-themed-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 1ad95cb8aa..32c65c8c97 100644
--- a/src/themes/dspace/app/navbar/navbar.component.scss
+++ b/src/themes/dspace/app/navbar/navbar.component.scss
@@ -1,57 +1,3 @@
-nav.navbar {
-  border-top: 1px var(--ds-header-navbar-border-top-color) solid;
-  border-bottom: 5px var(--bs-green) solid;
-  align-items: baseline;
-  color: var(--ds-header-icon-color);
-}
+: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) {
-    > .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/app/navbar/navbar.component.ts b/src/themes/dspace/app/navbar/navbar.component.ts
index 321351a933..506c146c6f 100644
--- a/src/themes/dspace/app/navbar/navbar.component.ts
+++ b/src/themes/dspace/app/navbar/navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component } from '@angular/core';
+
 import { NavbarComponent as BaseComponent } from '../../../../app/navbar/navbar.component';
 import { slideMobileNav } from '../../../../app/shared/animations/slide';
 
@@ -9,7 +10,7 @@ import { slideMobileNav } from '../../../../app/shared/animations/slide';
   selector: 'ds-navbar',
   styleUrls: ['./navbar.component.scss'],
   templateUrl: './navbar.component.html',
-  animations: [slideMobileNav]
+  animations: [slideMobileNav],
 })
 export class NavbarComponent extends BaseComponent {
 }
diff --git a/src/themes/dspace/eager-theme.module.ts b/src/themes/dspace/eager-theme.module.ts
index 5dd114cd72..51511ef7d7 100644
--- a/src/themes/dspace/eager-theme.module.ts
+++ b/src/themes/dspace/eager-theme.module.ts
@@ -1,21 +1,21 @@
-import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import { FormsModule } from '@angular/forms';
+import { NgModule } from '@angular/core';
+
+import { NavbarModule } from '../../app/navbar/navbar.module';
+import { RootModule } from '../../app/root.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
 import { SharedModule } from '../../app/shared/shared.module';
-import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
-import { NavbarComponent } from './app/navbar/navbar.component';
 import { HeaderComponent } from './app/header/header.component';
 import { HeaderNavbarWrapperComponent } from './app/header-nav-wrapper/header-navbar-wrapper.component';
-import { SearchModule } from '../../app/shared/search/search.module';
-import { RootModule } from '../../app/root.module';
-import { NavbarModule } from '../../app/navbar/navbar.module';
+import { HomeNewsComponent } from './app/home-page/home-news/home-news.component';
+import { NavbarComponent } from './app/navbar/navbar.component';
 
 /**
  * Add components that use a custom decorator to ENTRY_COMPONENTS as well as DECLARATIONS.
  * This will ensure that decorator gets picked up when the app loads
  */
-const ENTRY_COMPONENTS = [
-];
+const ENTRY_COMPONENTS = [];
 
 const DECLARATIONS = [
   ...ENTRY_COMPONENTS,
@@ -29,14 +29,14 @@ const DECLARATIONS = [
   imports: [
     CommonModule,
     SharedModule,
-    SearchModule,
-    FormsModule,
+    SharedBrowseByModule,
+    ResultsBackButtonModule,
     RootModule,
     NavbarModule,
   ],
   declarations: DECLARATIONS,
   providers: [
-    ...ENTRY_COMPONENTS.map((component) => ({ provide: component }))
+    ...ENTRY_COMPONENTS.map((component) => ({ provide: component })),
   ],
 })
 /**
diff --git a/src/themes/dspace/lazy-theme.module.ts b/src/themes/dspace/lazy-theme.module.ts
index a4e8027a15..e0d895ed3a 100644
--- a/src/themes/dspace/lazy-theme.module.ts
+++ b/src/themes/dspace/lazy-theme.module.ts
@@ -1,60 +1,54 @@
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
-import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
-import {
-  AdminWorkflowModuleModule
-} from '../../app/admin/admin-workflow-page/admin-workflow.module';
-import {
-  BitstreamFormatsModule
-} from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
-import { BrowseByModule } from '../../app/browse-by/browse-by.module';
-import {
-  CollectionFormModule
-} from '../../app/collection-page/collection-form/collection-form.module';
-import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
-import { CoreModule } from '../../app/core/core.module';
 import { DragDropModule } from '@angular/cdk/drag-drop';
-import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
-import { FormsModule } from '@angular/forms';
+import { CommonModule } from '@angular/common';
 import { HttpClientModule } from '@angular/common/http';
-import { IdlePreloadModule } from 'angular-idle-preload';
-import {
-  JournalEntitiesModule
-} from '../../app/entity-groups/journal-entities/journal-entities.module';
-import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
-import { MenuModule } from '../../app/shared/menu/menu.module';
-import { NavbarModule } from '../../app/navbar/navbar.module';
+import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { RouterModule } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { StoreRouterConnectingModule } from '@ngrx/router-store';
+import { StoreModule } from '@ngrx/store';
+import { TranslateModule } from '@ngx-translate/core';
+import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { IdlePreloadModule } from 'angular-idle-preload';
+import { ItemSharedModule } from 'src/app/item-page/item-shared.module';
+
+import { AdminRegistriesModule } from '../../app/admin/admin-registries/admin-registries.module';
+import { BitstreamFormatsModule } from '../../app/admin/admin-registries/bitstream-formats/bitstream-formats.module';
+import { AdminSearchModule } from '../../app/admin/admin-search-page/admin-search.module';
+import { AdminWorkflowModuleModule } from '../../app/admin/admin-workflow-page/admin-workflow.module';
+import { AppModule } from '../../app/app.module';
+import { BrowseByModule } from '../../app/browse-by/browse-by.module';
+import { BrowseByPageModule } from '../../app/browse-by/browse-by-page.module';
+import { CollectionFormModule } from '../../app/collection-page/collection-form/collection-form.module';
+import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
+import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
+import { CommunityFormModule } from '../../app/community-page/community-form/community-form.module';
+import { CommunityPageModule } from '../../app/community-page/community-page.module';
+import { CoreModule } from '../../app/core/core.module';
+import { JournalEntitiesModule } from '../../app/entity-groups/journal-entities/journal-entities.module';
+import { ResearchEntitiesModule } from '../../app/entity-groups/research-entities/research-entities.module';
+import { HomePageModule } from '../../app/home-page/home-page.module';
+import { InfoModule } from '../../app/info/info.module';
+import { EditItemPageModule } from '../../app/item-page/edit-item-page/edit-item-page.module';
+import { ItemPageModule } from '../../app/item-page/item-page.module';
+import { ItemVersionsModule } from '../../app/item-page/versions/item-versions.module';
+import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
+import { MyDspaceSearchModule } from '../../app/my-dspace-page/my-dspace-search.module';
+import { NavbarModule } from '../../app/navbar/navbar.module';
 import { ProfilePageModule } from '../../app/profile-page/profile-page.module';
 import { RegisterEmailFormModule } from '../../app/register-email-form/register-email-form.module';
-import {
-  ResearchEntitiesModule
-} from '../../app/entity-groups/research-entities/research-entities.module';
-import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
+import { RootModule } from '../../app/root.module';
 import { SearchPageModule } from '../../app/search-page/search-page.module';
+import { SharedBrowseByModule } from '../../app/shared/browse-by/shared-browse-by.module';
+import { ComcolModule } from '../../app/shared/comcol/comcol.module';
+import { MenuModule } from '../../app/shared/menu/menu.module';
+import { ResourcePoliciesModule } from '../../app/shared/resource-policies/resource-policies.module';
+import { ResultsBackButtonModule } from '../../app/shared/results-back-button/results-back-button.module';
+import { SearchModule } from '../../app/shared/search/search.module';
 import { SharedModule } from '../../app/shared/shared.module';
 import { StatisticsModule } from '../../app/statistics/statistics.module';
-import { StoreModule } from '@ngrx/store';
-import { StoreRouterConnectingModule } from '@ngrx/router-store';
-import { TranslateModule } from '@ngx-translate/core';
-import { HomePageModule } from '../../app/home-page/home-page.module';
-import { AppModule } from '../../app/app.module';
-import { ItemPageModule } from '../../app/item-page/item-page.module';
-import { RouterModule } from '@angular/router';
-import { CommunityListPageModule } from '../../app/community-list-page/community-list-page.module';
-import { InfoModule } from '../../app/info/info.module';
 import { StatisticsPageModule } from '../../app/statistics-page/statistics-page.module';
-import { CommunityPageModule } from '../../app/community-page/community-page.module';
-import { CollectionPageModule } from '../../app/collection-page/collection-page.module';
 import { SubmissionModule } from '../../app/submission/submission.module';
-import { MyDSpacePageModule } from '../../app/my-dspace-page/my-dspace-page.module';
-import { SearchModule } from '../../app/shared/search/search.module';
-import {
-  ResourcePoliciesModule
-} from '../../app/shared/resource-policies/resource-policies.module';
-import { ComcolModule } from '../../app/shared/comcol/comcol.module';
-import { RootModule } from '../../app/root.module';
 
 const DECLARATIONS = [
 ];
@@ -68,6 +62,8 @@ const DECLARATIONS = [
     RootModule,
     BitstreamFormatsModule,
     BrowseByModule,
+    BrowseByPageModule,
+    ResultsBackButtonModule,
     CollectionFormModule,
     CollectionPageModule,
     CommonModule,
@@ -76,8 +72,10 @@ const DECLARATIONS = [
     CommunityPageModule,
     CoreModule,
     DragDropModule,
+    ItemSharedModule,
     ItemPageModule,
     EditItemPageModule,
+    ItemVersionsModule,
     FormsModule,
     HomePageModule,
     HttpClientModule,
@@ -95,6 +93,7 @@ const DECLARATIONS = [
     ScrollToModule,
     SearchPageModule,
     SharedModule,
+    SharedBrowseByModule,
     StatisticsModule,
     StatisticsPageModule,
     StoreModule,
diff --git a/src/themes/dspace/styles/_global-styles.scss b/src/themes/dspace/styles/_global-styles.scss
index 3271f15bf2..5bd4c19bc0 100644
--- a/src/themes/dspace/styles/_global-styles.scss
+++ b/src/themes/dspace/styles/_global-styles.scss
@@ -17,16 +17,7 @@
     background-color: var(--bs-primary);
   }
 
-  h5 {
+  h4 {
     font-size: 1.1rem
   }
 }
-
-header {
-  .navbar-navigation > li {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: 100%;
-  }
-}
diff --git a/src/themes/dspace/styles/_theme_css_variable_overrides.scss b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
index e4b4b61f45..63a5535d95 100644
--- a/src/themes/dspace/styles/_theme_css_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_css_variable_overrides.scss
@@ -1,10 +1,28 @@
 // Override or add CSS variables for your theme here
 
 :root {
-  --ds-header-logo-height: 40px;
+
+  @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.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-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;
+
+  --ds-item-page-img-field-default-inline-height: 24px;
+  --ds-item-page-img-field-ror-inline-height: var(--ds-item-page-img-field-default-inline-height);
 }
 
diff --git a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
index 9257bc46dd..5bbcc98e04 100644
--- a/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
+++ b/src/themes/dspace/styles/_theme_sass_variable_overrides.scss
@@ -1,29 +1,87 @@
 // 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: #43515f !default;
-$green: #92C642 !default;
-$cyan: #207698 !default;
-$yellow: #ec9433 !default;
-$red: #CF4444 !default;
-$dark: #43515f !default;
+/*** SEMANTIC COLOR SCHEME ***/
 
-$gray-800: #343a40 !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:      #1e6f90;  // 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: (
+  // ...
+);
+
+
+/*** 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: #1e6f90;       // 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: #92c642;
+$ds-header-navbar-border-bottom-color: #92c642;
diff --git a/src/themes/eager-themes.module.ts b/src/themes/eager-themes.module.ts
index 4a46595f35..c4db7b582a 100644
--- a/src/themes/eager-themes.module.ts
+++ b/src/themes/eager-themes.module.ts
@@ -1,4 +1,5 @@
 import { NgModule } from '@angular/core';
+
 import { EagerThemeModule as DSpaceEagerThemeModule } from './dspace/eager-theme.module';
 // import { EagerThemeModule as CustomEagerThemeModule } from './custom/eager-theme.module';
 
diff --git a/tsconfig.json b/tsconfig.json
index 4eb577de0f..4ccd727a64 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,7 +20,8 @@
     "strictNullChecks": false,
     "skipDefaultLibCheck": true,
     "pretty": true,
-    "target": "es2015",
+    "allowSyntheticDefaultImports": true,
+    "target": "ES2022",
     "typeRoots": [
       "node_modules/@types",
       "src/typings.d.ts"
@@ -38,11 +39,16 @@
     "types": [
       "node",
       "jasmine"
-    ]
+    ],
+    "useDefineForClassFields": false,
+    "useUnknownInCatchVariables": true
   },
   "angularCompilerOptions": {
     "fullTemplateTypeCheck": true,
     "strictInjectionParameters": true,
     "strictInputAccessModifiers": true
-  }
+  },
+  "exclude": [
+    "cypress.config.ts"
+  ]
 }
diff --git a/tsconfig.server.json b/tsconfig.server.json
index d2fb2c9d40..c2f4c06a23 100644
--- a/tsconfig.server.json
+++ b/tsconfig.server.json
@@ -2,7 +2,7 @@
   "extends": "./tsconfig.app.json",
   "compilerOptions": {
     "outDir": "./out-tsc/app-server",
-    "target": "es2016",
+    "target": "ES2022",
     "types": [
       "node",
       "grecaptcha"
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 2c33d91afd..5a3b4910ae 100644
--- a/webpack/webpack.browser.ts
+++ b/webpack/webpack.browser.ts
@@ -13,14 +13,14 @@ module.exports = Object.assign({}, commonExports, {
     new CompressionPlugin({
       filename: '[path][base].gz',
       algorithm: 'gzip',
-      test: /\.(js|css|html|svg|json5)$/,
+      test: /\.(js|css|html|svg|json)$/,
       threshold: 10240,
       minRatio: 0.8,
     }),
     new CompressionPlugin({
       filename: '[path][base].br',
       algorithm: 'brotliCompress',
-      test: /\.(js|css|html|svg|json5)$/,
+      test: /\.(js|css|html|svg|json)$/,
       compressionOptions: {
         params: {
           [zlib.constants.BROTLI_PARAM_QUALITY]: 11,
diff --git a/webpack/webpack.common.ts b/webpack/webpack.common.ts
index 9228d41141..8d433edf39 100644
--- a/webpack/webpack.common.ts
+++ b/webpack/webpack.common.ts
@@ -1,8 +1,10 @@
-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');
 const sass = require('sass');
+const JSON5 = require('json5');
 
 export const copyWebpackOptions = {
   patterns: [
@@ -11,6 +13,21 @@ export const copyWebpackOptions = {
       to: path.join('assets', 'fonts'),
       force: undefined
     },
+    {
+      from: path.join(__dirname, '..', 'src', 'assets', '**', '*.json5').replace(/\\/g, '/'),
+      to({ absoluteFilename }) {
+        // 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]}${fileHash}.json`);
+        }
+      },
+      transform(content) {
+        return JSON.stringify(JSON5.parse(content.toString()));
+      }
+    },
     {
       from: path.join(__dirname, '..', 'src', 'assets'),
       to: 'assets',
@@ -32,8 +49,8 @@ export const copyWebpackOptions = {
       },
     },
     {
-      from: path.join(__dirname, '..', 'src', 'robots.txt'),
-      to: 'robots.txt'
+      from: path.join(__dirname, '..', 'src', 'robots.txt.ejs'),
+      to: 'assets/robots.txt.ejs'
     }
   ]
 };
@@ -62,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/webpack/webpack.mirador.config.ts b/webpack/webpack.mirador.config.ts
index c0083ded6e..7699cf1bdc 100644
--- a/webpack/webpack.mirador.config.ts
+++ b/webpack/webpack.mirador.config.ts
@@ -1,10 +1,13 @@
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const path = require('path');
+// @ts-ignore
+const fs = require('fs');
 
 module.exports = {
   mode: 'production',
   entry: {
-    mirador: './src/mirador-viewer/index.js'
+    mirador: fs.existsSync('./src/mirador-viewer/config.local.js')? './src/mirador-viewer/config.local.js' :
+      './src/mirador-viewer/config.default.js'
   },
   output: {
     path: path.resolve(__dirname, '..' , 'dist/iiif/mirador'),
diff --git a/yarn.lock b/yarn.lock
index 9542bfdbe1..849cbe2eda 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,142 +2,223 @@
 # yarn lockfile v1
 
 
-"@ampproject/remapping@1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-1.1.1.tgz#e220d0a5288b07afd6392a584d15921839e9da32"
-  integrity sha512-YVAcA4DKLOj296CF5SrQ8cYiMRiUGc2sqFpLxsDGWE34suHqhGP/5yMsDHKsrh8hs8I5TiRVXNwKPWQpX3iGjw==
+"@ampproject/remapping@2.2.0":
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.0.tgz"
+  integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
-    sourcemap-codec "1.4.8"
+    "@jridgewell/gen-mapping" "^0.1.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
-"@ampproject/remapping@^2.0.0", "@ampproject/remapping@^2.1.0":
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.1.2.tgz#4edca94973ded9630d20101cd8559cedb8d8bd34"
-  integrity sha512-hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg==
+"@ampproject/remapping@^2.1.0":
+  version "2.2.1"
+  resolved "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz"
+  integrity sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.0"
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
 
-"@angular-builders/custom-webpack@~13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-builders/custom-webpack/-/custom-webpack-13.1.0.tgz#854f1276204a6d3d52ad9bdab45c6ac362a158c8"
-  integrity sha512-qhtnAv1i7agk14zeKZZfXjrckYt37OZ+3tsTBLhf3ZFbwREK8L1SNi8xhZ1j1JLGsf2Dp0GEcZrSYeFDweo0WA==
+"@angular-builders/custom-webpack@~15.0.0":
+  version "15.0.0"
+  resolved "https://registry.npmjs.org/@angular-builders/custom-webpack/-/custom-webpack-15.0.0.tgz"
+  integrity sha512-i8ZQ7rJ+RTy73MivvIdNAa8sZpiDy9wHBetAEyYSlGtjaSB3lntEFtBw9edfyRkpbifw53QA/N5haOwox987/Q==
   dependencies:
-    "@angular-devkit/architect" ">=0.1300.0 < 0.1400.0"
-    "@angular-devkit/build-angular" "^13.0.0"
-    "@angular-devkit/core" "^13.0.0"
+    "@angular-devkit/architect" ">=0.1500.0 < 0.1600.0"
+    "@angular-devkit/build-angular" "^15.0.0"
+    "@angular-devkit/core" "^15.0.0"
     lodash "^4.17.15"
     ts-node "^10.0.0"
-    tsconfig-paths "^3.9.0"
+    tsconfig-paths "^4.1.0"
     webpack-merge "^5.7.3"
 
-"@angular-devkit/architect@0.1302.6", "@angular-devkit/architect@>=0.1300.0 < 0.1400.0":
-  version "0.1302.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1302.6.tgz#76c5c18580c1c387be01dd7bcbcb34a8b5ac62bd"
-  integrity sha512-NztzorUMfwJeRaT7SY00Y8WSqc2lQYuF11yNoyEm7Dae3V7VZ28rW2Z9RwibP27rYQL0RjSMaz2wKITHX2vOAw==
+"@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==
   dependencies:
-    "@angular-devkit/core" "13.2.6"
+    "@angular-devkit/core" "15.2.5"
     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==
+  dependencies:
+    "@angular-devkit/core" "15.2.6"
+    rxjs "6.6.7"
+
+"@angular-devkit/architect@0.1602.12":
+  version "0.1602.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1602.12.tgz#a430970acd4ad9f7cc23d41facc2c04ea5770f65"
+  integrity sha512-19Fwwfx+KvJ01SyI6cstRgqT9+cwer8Ro1T27t1JqlGyOX8tY3pV78ulwxy2+wCzPjR18V6W7cb7Cv6fyK4xog==
+  dependencies:
+    "@angular-devkit/core" "16.2.12"
+    rxjs "7.8.1"
+
 "@angular-devkit/architect@^0.1202.10":
-  version "0.1202.16"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1202.16.tgz#8d11fe26a1fb693b70043f98b8bcb7e4960adc62"
-  integrity sha512-VUGyAr+5RmlcPjo8mZSRJ/wkm3hCPn9PJyorAnc1IzrqD+XkgcDME86HP3YheLsOsc1Mn7j6Zh3T1rAclAWw/w==
+  version "0.1202.18"
+  resolved "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1202.18.tgz"
+  integrity sha512-C4ASKe+xBjl91MJyHDLt3z7ICPF9FU6B0CeJ1phwrlSHK9lmFG99WGxEj/Tc82+vHyPhajqS5XJ38KyVAPBGzA==
   dependencies:
-    "@angular-devkit/core" "12.2.16"
+    "@angular-devkit/core" "12.2.18"
     rxjs "6.6.7"
 
-"@angular-devkit/architect@^0.1301.0":
-  version "0.1301.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1301.4.tgz#2fc51bcae0dcb581c8be401e2fde7bbd10b43076"
-  integrity sha512-p6G8CEMnE+gYwxRyEttj3QGsuNJ3Kusi7iwBIzWyf2RpJSdGzXdwUEiRGg6iS0YHFr06/ZFfAWfnM2DQvNm4TA==
+"@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==
   dependencies:
-    "@angular-devkit/core" "13.1.4"
-    rxjs "6.6.7"
-
-"@angular-devkit/build-angular@^13.0.0", "@angular-devkit/build-angular@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-13.2.6.tgz#946cb6037dc311fc63f55665c1db03b0652167b4"
-  integrity sha512-Y2ojy6xbZ0kwScppcutLHBP8eW0qNOjburTISSBU/L5l/9FOeZ1E7yAreKuVu/qibZiLbSJfAhk+SLwhRHFSSQ==
-  dependencies:
-    "@ampproject/remapping" "1.1.1"
-    "@angular-devkit/architect" "0.1302.6"
-    "@angular-devkit/build-webpack" "0.1302.6"
-    "@angular-devkit/core" "13.2.6"
-    "@babel/core" "7.16.12"
-    "@babel/generator" "7.16.8"
-    "@babel/helper-annotate-as-pure" "7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "7.16.8"
-    "@babel/plugin-transform-async-to-generator" "7.16.8"
-    "@babel/plugin-transform-runtime" "7.16.10"
-    "@babel/preset-env" "7.16.11"
-    "@babel/runtime" "7.16.7"
-    "@babel/template" "7.16.7"
-    "@discoveryjs/json-ext" "0.5.6"
-    "@ngtools/webpack" "13.2.6"
-    ansi-colors "4.1.1"
-    babel-loader "8.2.3"
+    "@ampproject/remapping" "2.2.0"
+    "@angular-devkit/architect" "0.1502.5"
+    "@angular-devkit/build-webpack" "0.1502.5"
+    "@angular-devkit/core" "15.2.5"
+    "@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.5"
+    ansi-colors "4.1.3"
+    autoprefixer "10.4.13"
+    babel-loader "9.1.2"
     babel-plugin-istanbul "6.1.1"
-    browserslist "^4.9.1"
-    cacache "15.3.0"
-    circular-dependency-plugin "5.2.2"
-    copy-webpack-plugin "10.2.1"
-    core-js "3.20.3"
+    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.5.1"
-    esbuild-wasm "0.14.22"
-    glob "7.2.0"
-    https-proxy-agent "5.0.0"
-    inquirer "8.2.0"
-    jsonc-parser "3.0.0"
+    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.2"
-    less-loader "10.2.0"
+    less "4.1.3"
+    less-loader "11.1.0"
     license-webpack-plugin "4.0.2"
-    loader-utils "3.2.0"
-    mini-css-extract-plugin "2.5.3"
-    minimatch "3.0.4"
-    open "8.4.0"
+    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 "6.0.1"
+    parse5-html-rewriting-stream "7.0.0"
     piscina "3.2.0"
-    postcss "8.4.5"
-    postcss-import "14.0.2"
-    postcss-loader "6.2.1"
-    postcss-preset-env "7.2.3"
-    regenerator-runtime "0.13.9"
+    postcss "8.4.21"
+    postcss-loader "7.0.2"
     resolve-url-loader "5.0.0"
     rxjs "6.6.7"
-    sass "1.49.0"
-    sass-loader "12.4.0"
-    semver "7.3.5"
-    source-map-loader "3.0.1"
+    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"
-    stylus "0.56.0"
-    stylus-loader "6.2.0"
-    terser "5.11.0"
+    terser "5.16.3"
     text-table "0.2.0"
     tree-kill "1.2.2"
-    tslib "2.3.1"
-    webpack "5.67.0"
-    webpack-dev-middleware "5.3.0"
-    webpack-dev-server "4.7.3"
+    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.14.22"
+    esbuild "0.17.8"
 
-"@angular-devkit/build-webpack@0.1302.6":
-  version "0.1302.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1302.6.tgz#ab8e618f13d6611fa6b1356042e566e9449a87fe"
-  integrity sha512-TYEh2n9tPe932rEIgdiSpojOqtDppW2jzb/empVqCkLF7WUZsXKvTanttZC34L6R2VD6SAGWhb6JDg75ghUVYA==
+"@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==
   dependencies:
-    "@angular-devkit/architect" "0.1302.6"
+    "@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/core@12.2.16", "@angular-devkit/core@^12.2.10":
-  version "12.2.16"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-12.2.16.tgz#3a833fde6be1997f4961565da8bec1bb58fb8b8d"
-  integrity sha512-cnVtUYSET27B5mRIBp38mpKIX0iHv/hWKiPo74WCGrNwTgwmMHngjgQ4ySn/w1W4s8LL6TDW55ZkRdwyk8TVMQ==
+"@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"
+    rxjs "6.6.7"
+
+"@angular-devkit/core@12.2.18", "@angular-devkit/core@^12.2.17":
+  version "12.2.18"
+  resolved "https://registry.npmjs.org/@angular-devkit/core/-/core-12.2.18.tgz"
+  integrity sha512-GDLHGe9HEY5SRS+NrKr14C8aHsRCiBFkBFSSbeohgLgcgSXzZHFoU84nDWrl3KZNP8oqcUSv5lHu6dLcf2fnww==
   dependencies:
     ajv "8.6.2"
     ajv-formats "2.1.0"
@@ -146,1090 +227,1176 @@
     rxjs "6.6.7"
     source-map "0.7.3"
 
-"@angular-devkit/core@13.1.4":
-  version "13.1.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.1.4.tgz#b5b6ddd674ae351f83beff2e4a0d702096bdfd47"
-  integrity sha512-225Gjy4iVxh5Jo9njJnaG75M/Dt95UW+dEPCGWKV5E/++7UUlXlo9sNWq8x2vJm2nhtsPkpnXNOt4pW1mIDwqQ==
+"@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==
   dependencies:
-    ajv "8.8.2"
+    ajv "8.12.0"
     ajv-formats "2.1.1"
-    fast-json-stable-stringify "2.1.0"
-    magic-string "0.25.7"
+    jsonc-parser "3.2.0"
     rxjs "6.6.7"
-    source-map "0.7.3"
+    source-map "0.7.4"
 
-"@angular-devkit/core@13.2.6", "@angular-devkit/core@^13.0.0", "@angular-devkit/core@^13.1.0":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-13.2.6.tgz#7032a7c474efacc564511cff0c21d1636404e437"
-  integrity sha512-8h2mWdBTN/dYwZuzKMg2IODlOWMdbJcpQG4XVrkk9ejCPP+3aX5Aa3glCe/voN6eBNiRfs8YDM0jxmpN2aWVtg==
+"@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==
   dependencies:
-    ajv "8.9.0"
+    ajv "8.12.0"
     ajv-formats "2.1.1"
-    fast-json-stable-stringify "2.1.0"
-    magic-string "0.25.7"
+    jsonc-parser "3.2.0"
     rxjs "6.6.7"
-    source-map "0.7.3"
+    source-map "0.7.4"
 
-"@angular-devkit/schematics@12.2.16", "@angular-devkit/schematics@^12.2.10":
-  version "12.2.16"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-12.2.16.tgz#b1e9df5bcbb557199256f655bf839d447630ceec"
-  integrity sha512-ToyZBCGilSeeLmhAxmeJ0PykmbKLoME+uK78gC64xJtNu9e3oVnmog8b8g9Ay9hTwZJ96HvNa16po11Gfbbn6A==
+"@angular-devkit/core@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-16.2.12.tgz#5d40e8414d5da14a4281af519d32e1241b002c89"
+  integrity sha512-o6ziQs+EcEonFezrsA46jbZqkQrs4ckS1bAQj93g5ZjGtieUz8l/U3lclvKpL/iEzWkGVViSYuP2KyW2oqTDiQ==
   dependencies:
-    "@angular-devkit/core" "12.2.16"
+    ajv "8.12.0"
+    ajv-formats "2.1.1"
+    jsonc-parser "3.2.0"
+    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":
+  version "12.2.18"
+  resolved "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-12.2.18.tgz"
+  integrity sha512-bZ9NS5PgoVfetRC6WeQBHCY5FqPZ9y2TKHUo12sOB2YSL3tgWgh1oXyP8PtX34gasqsLjNULxEQsAQYEsiX/qQ==
+  dependencies:
+    "@angular-devkit/core" "12.2.18"
     ora "5.4.1"
     rxjs "6.6.7"
 
-"@angular-devkit/schematics@13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-13.2.6.tgz#c85778b73ede1fbcb6c3af7dde740cd0dc8bfb29"
-  integrity sha512-mPgSqdnZRuPSMeUA+T+mwVCrq2yhXpcYm1/Rjbhy09CyHs4wSrFv21WHCrE6shlvXpcmwr0n+I0DIeagAPmjUA==
+"@angular-devkit/schematics@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-16.2.12.tgz#9dbf287b2343059792c97bbfc60a3b52253c66f1"
+  integrity sha512-lf/Nz2o875pllxGNUcI2by4rctfRsOZOxvaLq2UaH6XG6Re9tqeNfn40a8qXrr9/IYntXnlvEid/pd9e8gFBIw==
   dependencies:
-    "@angular-devkit/core" "13.2.6"
-    jsonc-parser "3.0.0"
-    magic-string "0.25.7"
+    "@angular-devkit/core" "16.2.12"
+    jsonc-parser "3.2.0"
+    magic-string "0.30.1"
     ora "5.4.1"
-    rxjs "6.6.7"
+    rxjs "7.8.1"
 
-"@angular-eslint/builder@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/builder/-/builder-13.1.0.tgz#5351ab74dce519e5605c0cddc84e9ff1dc014eb9"
-  integrity sha512-RdyeetctnipVdCBrU/mipJ2XKiLC1yGmK1Sfbbgwu0s49CAdOArY/b+b8OU3yyy4EO1EGKQMlzs6F3wTYgiZCA==
+"@angular-eslint/builder@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/builder/-/builder-15.2.1.tgz"
+  integrity sha512-7x2DANebLRl997Mj4DhZrnz5+vnSjavGGveJ0mBuU7CEsL0ZYLftdRqL0e0HtU3ksseS7xpchD6OM08nkNgySw==
+
+"@angular-eslint/bundled-angular-compiler@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-15.2.1.tgz"
+  integrity sha512-LO7Am8eVCr7oh6a0VmKSL7K03CnQEQhFO7Wt/YtbfYOxVjrbwmYLwJn+wZPOT7A02t/BttOD/WXuDrOWtSMQ/Q==
+
+"@angular-eslint/eslint-plugin-template@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-15.2.1.tgz"
+  integrity sha512-IeiSLk6YxapFdH2z5o/O3R7VwtBd2T6fWmhLFPwDYMDknrwegnOjwswCdBplOccpUp0wqlCeGUx7LTsuzwaz7w==
   dependencies:
-    "@nrwl/devkit" "13.1.3"
+    "@angular-eslint/bundled-angular-compiler" "15.2.1"
+    "@angular-eslint/utils" "15.2.1"
+    "@typescript-eslint/type-utils" "5.48.2"
+    "@typescript-eslint/utils" "5.48.2"
+    aria-query "5.1.3"
+    axobject-query "3.1.1"
 
-"@angular-eslint/bundled-angular-compiler@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-13.1.0.tgz#5806625096441050d9b39b01d176f38d7549e9bc"
-  integrity sha512-0VSAZ3zrHkKdbvogQ4GLSf+lKojtPL3LXLlvXU9xNgNsqw68+gSNwaWd595tXoQCmpwWpTerKUbyIsGnPA7EYA==
-
-"@angular-eslint/eslint-plugin-template@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-13.1.0.tgz#b5b8cc839c5c32d5bd55ba47bb58a80c0c4c4c42"
-  integrity sha512-ceZAMjufE58aduOW/UwjrbCRWocYC0zOEJ2jUkPt6jlL8yzc+SC6UitO0VmMgUsCizHueav5/3gKy05xqwk/CA==
+"@angular-eslint/eslint-plugin@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-15.2.1.tgz"
+  integrity sha512-OM7b1kS4E4CkXjkaWN+lEzawh4VxY6l7FO1Cuk4s7iv3/YpZG3rJxIZBqnFLTixwrBuqw8y4FNBzF3eDgmFAUw==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "13.1.0"
-    "@typescript-eslint/experimental-utils" "5.11.0"
-    aria-query "^4.2.2"
-    axobject-query "^2.2.0"
+    "@angular-eslint/utils" "15.2.1"
+    "@typescript-eslint/utils" "5.48.2"
 
-"@angular-eslint/eslint-plugin@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/eslint-plugin/-/eslint-plugin-13.1.0.tgz#cb3a1d4dfff5334459c7f3b4b3a124c84673b833"
-  integrity sha512-WiggBWPhhpSjcYVHJiawCduCsydM/RPudUE8zxv0Nmj/APuzNgvUr6E//uYTrhNv9EIJoZutRovw7R4Y/yXj4Q==
+"@angular-eslint/schematics@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-15.2.1.tgz"
+  integrity sha512-0ZfBCejHWIcgy3J5kFs9sS/jqi8i5AptxggOwFySOlCLJ+CzNrktjD4jff1Zy8K/VLzY0Ci0BSZXvgWfP0k9Rg==
   dependencies:
-    "@angular-eslint/utils" "13.1.0"
-    "@typescript-eslint/experimental-utils" "5.11.0"
-
-"@angular-eslint/schematics@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/schematics/-/schematics-13.1.0.tgz#2d53e55db0f78460f8f79c64c42579ddbc93d8a1"
-  integrity sha512-/gVtkRP09cGhnUF3tr0phwNA5/ml94V3cqO8X4Z4QmyAaIwxuOJ0mJvWrVN7aurURxh9WoeWD/HXOvtC5igtpQ==
-  dependencies:
-    "@angular-eslint/eslint-plugin" "13.1.0"
-    "@angular-eslint/eslint-plugin-template" "13.1.0"
-    ignore "5.2.0"
+    "@angular-eslint/eslint-plugin" "15.2.1"
+    "@angular-eslint/eslint-plugin-template" "15.2.1"
+    ignore "5.2.4"
     strip-json-comments "3.1.1"
     tmp "0.2.1"
 
-"@angular-eslint/template-parser@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/template-parser/-/template-parser-13.1.0.tgz#5161dc061610212b730d929de9b3d7d365de8335"
-  integrity sha512-gKV+kms+kYm1HdToH3j4HL1RrjvMHscVkhwjoV1WbJColnfDivVAZ6/5/J92/A/8r7vJptQkftsbiaGKDyg47w==
+"@angular-eslint/template-parser@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-15.2.1.tgz"
+  integrity sha512-ViCi79gC2aKJecmYLkOT+QlT5WMRNXeYz0Dr9Pr8qXzIbY0oAWE7nOT5jkXwQ9oUk+ybtGCWHma5JVJWVJsIog==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "13.1.0"
-    eslint-scope "^5.1.0"
+    "@angular-eslint/bundled-angular-compiler" "15.2.1"
+    eslint-scope "^7.0.0"
 
-"@angular-eslint/utils@13.1.0":
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/@angular-eslint/utils/-/utils-13.1.0.tgz#3023c0c66d02a5e80dbcf5b11b1c4767f5811bd2"
-  integrity sha512-iLmYMXNk+1sFMIlYXN8/Z5UcNAOno38v10lzo4bMjCpzXKkMa0O2b+4qi+469iUJAU6RAZ5weUL+S2Wtlr0ooA==
+"@angular-eslint/utils@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.npmjs.org/@angular-eslint/utils/-/utils-15.2.1.tgz"
+  integrity sha512-++FneAJHxJqcSu0igVN6uOkSoHxlzgLoMBswuovYJy3UKwm33/T6WFku8++753Ca/JucIoR1gdUfO7SoSspMDg==
   dependencies:
-    "@angular-eslint/bundled-angular-compiler" "13.1.0"
-    "@typescript-eslint/experimental-utils" "5.11.0"
+    "@angular-eslint/bundled-angular-compiler" "15.2.1"
+    "@typescript-eslint/utils" "5.48.2"
 
-"@angular/animations@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-13.2.6.tgz#a8f0df5a79396dafb17c47f2a4e9e15e561ef3a1"
-  integrity sha512-DrjpKo68uR3lSLQQXosoTCbjKQS6IKRCpR14E2t8fo0AX8i2hkB8je4SrhdCyB7FgFN7l2kgUYo4Qa8+BOB+aA==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/cdk@^13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-13.2.6.tgz#4a5cf4b93ccad4123e09a6cbe2c880bb6f3242fe"
-  integrity sha512-epuXmaHqfukwPsYvIksbuHLXDtb6GALV2Vgv6W2asj4TorD584CeQTs0EcdPGmCzhGUYI8U8QV63WOxu9YFcNA==
+"@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==
   dependencies:
     tslib "^2.3.0"
   optionalDependencies:
-    parse5 "^5.0.0"
+    parse5 "^7.1.2"
 
-"@angular/cli@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-13.2.6.tgz#d532375ac65b7e6204f979756bf12dda8392cd74"
-  integrity sha512-xIjEaQI5sWemXXc7GXLm4u9UL5sjtrQL/y1PJvvk/Jsa8+kIT+MutOfZfC7zcdAh9fqHd8mokH3guFV8BJdFxA==
+"@angular/cli@^16.0.4":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-16.2.12.tgz#f5ce4eea5409f708963a59a4ab787d6c08196fe3"
+  integrity sha512-Pcbiraoqdw4rR2Ey5Ooy0ESLS1Ffbjkb6sPfinKRkHmAvyqsmlvkfbB/qK8GrzDSFSWvAKMMXRw9l8nbjvQEXg==
   dependencies:
-    "@angular-devkit/architect" "0.1302.6"
-    "@angular-devkit/core" "13.2.6"
-    "@angular-devkit/schematics" "13.2.6"
-    "@schematics/angular" "13.2.6"
+    "@angular-devkit/architect" "0.1602.12"
+    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/schematics" "16.2.12"
+    "@schematics/angular" "16.2.12"
     "@yarnpkg/lockfile" "1.1.0"
-    ansi-colors "4.1.1"
-    debug "4.3.3"
-    ini "2.0.0"
-    inquirer "8.2.0"
-    jsonc-parser "3.0.0"
-    npm-package-arg "8.1.5"
-    npm-pick-manifest "6.1.1"
-    open "8.4.0"
+    ansi-colors "4.1.3"
+    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.2"
     ora "5.4.1"
-    pacote "12.0.3"
-    resolve "1.22.0"
-    semver "7.3.5"
+    pacote "15.2.0"
+    resolve "1.22.2"
+    semver "7.5.4"
     symbol-observable "4.0.0"
-    uuid "8.3.2"
+    yargs "17.7.2"
 
-"@angular/common@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-13.2.6.tgz#cfb4e7d5173d22ed81e978cebfe19796db0759f8"
-  integrity sha512-t4XRb9db4UeRcPs5aHNtGuXRKSvGBlTEr0zzSeoKzHD9TCaO4dSDISh9obS9hThaPuBmPKRUHN5KE1HFmqnSHg==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/compiler-cli@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-13.2.6.tgz#929a32af9989c2bf1ee343bc37c72233a81d2c2c"
-  integrity sha512-QtlLKj3m6a2nkewFxhg+a3tQ2gEIBzMfI2c1laWUfAfJJ56phj79k8Z/kf2HQxypphWixyTK+ugpTlMdvvOquA==
+"@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==
   dependencies:
-    "@babel/core" "^7.17.2"
+    "@babel/core" "7.19.3"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
     chokidar "^3.0.0"
     convert-source-map "^1.5.1"
     dependency-graph "^0.11.0"
-    magic-string "^0.26.0"
+    magic-string "^0.27.0"
     reflect-metadata "^0.1.2"
     semver "^7.0.0"
-    sourcemap-codec "^1.4.8"
     tslib "^2.3.0"
     yargs "^17.2.1"
 
-"@angular/compiler@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-13.2.6.tgz#0de8e65fc4fe22273eff1e96917377919dbd2ab3"
-  integrity sha512-LHU29J2/c/03WHkwtzUSElTBsXbzkKdYARodnNfsFdLPsWhyvzO3cqlcZYteFJxEy3dVH+ZrYDjqQ9Sp17aIgA==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/core@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-13.2.6.tgz#685ca3b6de173f9671e251362a2c88f8685454f0"
-  integrity sha512-ctWsxuaSO3d3afLW+wkJSyiEIA2uhaTKNps9x5wz/oZJDaUDYVa4PM4x7/UHn2bXzBjXjN9LSW8h9F31iwmcTg==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/forms@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-13.2.6.tgz#fc0664bc0136a2cc5103dc0a62b12f3bc48cedd9"
-  integrity sha512-3IikvNtO0RBiGb2AWl8aYcE3ivXHPIJz+JOn9Wz9XXSkYx75D3GjuJlz+fVIgz+7Q7tJuS6Q2E5qat/ldeDmoA==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/language-service@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-13.2.6.tgz#ee417af8a814b531be54e82e73254c3f18793a3a"
-  integrity sha512-nhF8GvEyUKIaDFTIQ4RSPQwRng7XjEWQl2zz0B8ShvQsgF/zMLo7mAci9MXxkYBIejU1I07w32r2J90rkjsARA==
+"@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/localize@13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-13.2.6.tgz#12c702cfdd442f6ed37829f46d99e88f16064858"
-  integrity sha512-QyjOa8ptzLEFTGYTV5aFaEZ5I3fAZUU34P2+Xr9xYNn6Mv8JSoUPVZgaj3SDXxpW75Z6Xgzt841/qDe5/FYm6w==
+"@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==
   dependencies:
-    "@babel/core" "7.17.2"
-    glob "7.2.0"
+    "@babel/core" "7.19.3"
+    glob "8.1.0"
     yargs "^17.2.1"
 
-"@angular/platform-browser-dynamic@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-13.2.6.tgz#61e0ea0255982c604e596665b6c1c3441beab9b6"
-  integrity sha512-m77+pzwZw+4kiRhxzrj1kE3N1K82I8Xt+vEBKSL2Xv42hCX0T37erC6KlztFEDj4A68s5+/0C5vfwhEiDcr/Cw==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-browser@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-13.2.6.tgz#eef3ea0c715c319e7135f80d3432e5a980aefe10"
-  integrity sha512-Gc/1TqysW+P+K3NeQihmHWs4KF1mjJT20s06r+YcETnPP11uPk+UxQl7gJNsDV587DYO/wT3oISXVpRw4UJhdQ==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
-"@angular/platform-server@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-13.2.6.tgz#5bf391ff4a53ef478907303dd9cf277af12ac9e6"
-  integrity sha512-UkcPfQxbwws93XVDvMGdNzFJIbdiwVhkibwDjHfwj4Sp9MoWutkeEFShGgG/bIJUy4f6RmCBOS6+gP5qx3uaMQ==
+"@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==
   dependencies:
     domino "^2.1.2"
     tslib "^2.3.0"
     xhr2 "^0.2.0"
 
-"@angular/router@~13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-13.2.6.tgz#5755c109877d16cf16585a5fda2a059500a3506b"
-  integrity sha512-dA9vL4mPLp+iNegzuvm9FaEWirFI2ZK3WQgbdoxoIpneym+BxRTkNDzPcvEaqfUf7eDGRBqlWakFDrd+H2QEbg==
+"@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==
   dependencies:
     tslib "^2.3.0"
 
 "@assemblyscript/loader@^0.10.1":
   version "0.10.1"
-  resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06"
+  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.16.7", "@babel/code-frame@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.16.7.tgz#44416b6bd7624b998f5b1af5d470856c40138789"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+"@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.16.7"
+    "@babel/highlight" "^7.18.6"
 
-"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8", "@babel/compat-data@^7.17.0":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34"
-  integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng==
-
-"@babel/core@7.16.12":
-  version "7.16.12"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.16.12.tgz#5edc53c1b71e54881315923ae2aedea2522bb784"
-  integrity sha512-dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg==
+"@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/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.16.7"
-    "@babel/parser" "^7.16.12"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.10"
-    "@babel/types" "^7.16.8"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
-    source-map "^0.5.0"
+    "@babel/highlight" "^7.22.13"
+    chalk "^2.4.2"
 
-"@babel/core@7.17.2":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.2.tgz#2c77fc430e95139d816d39b113b31bf40fb22337"
-  integrity sha512-R3VH5G42VSDolRHyUO4V2cfag8WHcZyxdq5Z/m8Xyb92lW/Erm/6kM+XtRFGf3Mulre3mveni2NHfEUws8wSvw==
-  dependencies:
-    "@ampproject/remapping" "^2.0.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.2"
-    "@babel/parser" "^7.17.0"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
-    "@babel/types" "^7.17.0"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
-    semver "^6.3.0"
+"@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"
+  integrity sha512-/DYyDpeCfaVinT40FPGdkkb+lYSKvsVuMjDAG7jPOWWiM1ibOaB9CXJAlc4d1QpP/U2q2P9jbrSlClKSErd55g==
 
-"@babel/core@^7.12.3", "@babel/core@^7.17.2":
-  version "7.17.5"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.5.tgz#6cd2e836058c28f06a4ca8ee7ed955bbf37c8225"
-  integrity sha512-/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA==
+"@babel/core@7.19.3":
+  version "7.19.3"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.19.3.tgz"
+  integrity sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==
   dependencies:
     "@ampproject/remapping" "^2.1.0"
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helpers" "^7.17.2"
-    "@babel/parser" "^7.17.3"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.19.3"
+    "@babel/helper-compilation-targets" "^7.19.3"
+    "@babel/helper-module-transforms" "^7.19.0"
+    "@babel/helpers" "^7.19.0"
+    "@babel/parser" "^7.19.3"
+    "@babel/template" "^7.18.10"
+    "@babel/traverse" "^7.19.3"
+    "@babel/types" "^7.19.3"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
-    json5 "^2.1.2"
+    json5 "^2.2.1"
     semver "^6.3.0"
 
-"@babel/generator@7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.16.8.tgz#359d44d966b8cd059d543250ce79596f792f2ebe"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
+"@babel/core@7.20.12":
+  version "7.20.12"
+  resolved "https://registry.npmjs.org/@babel/core/-/core-7.20.12.tgz"
+  integrity sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==
   dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.16.8", "@babel/generator@^7.17.0", "@babel/generator@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.17.3.tgz#a2c30b0c4f89858cb87050c3ffdfd36bdf443200"
-  integrity sha512-+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg==
-  dependencies:
-    "@babel/types" "^7.17.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@7.16.7", "@babel/helper-annotate-as-pure@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz#bb2339a7534a9c128e3102024c60760a3a7f3862"
-  integrity sha512-s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz#38d138561ea207f0f69eb1626a418e4f7e6a580b"
-  integrity sha512-C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz#06e66c5f299601e6c7da350049315e83209d551b"
-  integrity sha512-mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA==
-  dependencies:
-    "@babel/compat-data" "^7.16.4"
-    "@babel/helper-validator-option" "^7.16.7"
-    browserslist "^4.17.5"
+    "@ampproject/remapping" "^2.1.0"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/generator" "^7.20.7"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helpers" "^7.20.7"
+    "@babel/parser" "^7.20.7"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.12"
+    "@babel/types" "^7.20.7"
+    convert-source-map "^1.7.0"
+    debug "^4.1.0"
+    gensync "^1.0.0-beta.2"
+    json5 "^2.2.2"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9"
-  integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg==
+"@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==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@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"
 
-"@babel/helper-create-regexp-features-plugin@^7.16.7":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1"
-  integrity sha512-awO2So99wG6KnlE+TPs6rn83gCz5WlEePJDTnLEqbchMVrBeAujURVphRdigsk094VhvZehFoNOihSlcBjwsXA==
+"@babel/generator@7.20.14", "@babel/generator@^7.20.7":
+  version "7.20.14"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.20.14.tgz"
+  integrity sha512-AEmuXHdcD3A52HHXxaTmYlb8q/xMEhoRP67B3T4Oq7lbmSoqroMZzjnGj3+i1io3pdnF8iBYVu4Ilj+c4hBxYg==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    regexpu-core "^5.0.1"
+    "@babel/types" "^7.20.7"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    jsesc "^2.5.1"
 
-"@babel/helper-define-polyfill-provider@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz#52411b445bdb2e676869e5a74960d2d3826d2665"
-  integrity sha512-J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA==
+"@babel/generator@^7.18.9", "@babel/generator@^7.19.3":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz"
+  integrity sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.13.0"
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/traverse" "^7.13.0"
+    "@babel/types" "^7.21.4"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
+"@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.23.0"
+    "@jridgewell/gen-mapping" "^0.3.2"
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jsesc "^2.5.1"
+
+"@babel/helper-annotate-as-pure@7.18.6", "@babel/helper-annotate-as-pure@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"
+  integrity sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==
+  dependencies:
+    "@babel/types" "^7.18.6"
+
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.18.6":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.9.tgz"
+  integrity sha512-yFQ0YCHoIqarl8BCRwBL8ulYUaZpz3bNsA7oFepAzee+8/+ImtADXNOmO5vJvsPff3qi+hvpkY/NYBTrBQgdNw==
+  dependencies:
+    "@babel/helper-explode-assignable-expression" "^7.18.6"
+    "@babel/types" "^7.18.9"
+
+"@babel/helper-compilation-targets@^7.17.7", "@babel/helper-compilation-targets@^7.18.9", "@babel/helper-compilation-targets@^7.19.3", "@babel/helper-compilation-targets@^7.20.0", "@babel/helper-compilation-targets@^7.20.7":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.21.4.tgz"
+  integrity sha512-Fa0tTuOXZ1iL8IeDFUWCzjZcn+sJGd9RZdH9esYVjEejGmzf+FFYQpMi/kZUk2kPy/q1H3/GPw7np8qar/stfg==
+  dependencies:
+    "@babel/compat-data" "^7.21.4"
+    "@babel/helper-validator-option" "^7.21.0"
+    browserslist "^4.21.3"
+    lru-cache "^5.1.1"
+    semver "^6.3.0"
+
+"@babel/helper-create-class-features-plugin@^7.18.6", "@babel/helper-create-class-features-plugin@^7.21.0":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.21.4.tgz"
+  integrity sha512-46QrX2CQlaFRF4TkwfTt6nJD7IHq8539cCL7SDpqWSDeJKY1xylKKY5F/33mJhLZ3mFvKv2gGrVS6NkyF6qs+Q==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-member-expression-to-functions" "^7.21.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+
+"@babel/helper-create-regexp-features-plugin@^7.18.6", "@babel/helper-create-regexp-features-plugin@^7.20.5":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.21.4.tgz"
+  integrity sha512-M00OuhU+0GyZ5iBBN9czjugzWrEq2vDpf/zCYHxxf93ul/Q5rv+a5h+/+0WnI1AebHNVtl5bFV0qsJoH23DbfA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    regexpu-core "^5.3.1"
+
+"@babel/helper-define-polyfill-provider@^0.3.3":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.3.tgz"
+  integrity sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==
+  dependencies:
+    "@babel/helper-compilation-targets" "^7.17.7"
+    "@babel/helper-plugin-utils" "^7.16.7"
     debug "^4.1.1"
     lodash.debounce "^4.0.8"
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz#ff484094a839bde9d89cd63cba017d7aae80ecd7"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
+"@babel/helper-environment-visitor@^7.18.9":
+  version "7.18.9"
+  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"
+  integrity sha512-eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-explode-assignable-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a"
-  integrity sha512-KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ==
+"@babel/helper-function-name@^7.18.9", "@babel/helper-function-name@^7.19.0", "@babel/helper-function-name@^7.21.0":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.21.0.tgz"
+  integrity sha512-HfK1aMRanKHpxemaY2gqBmL04iAPOPRj7DxtNbiDOrJK+gdwkiNRVpCpUJYbUT+aZyemKN8brqTOxzCaG6ExRg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/template" "^7.20.7"
+    "@babel/types" "^7.21.0"
 
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz#f1ec51551fb1c8956bc8dd95f38523b6cf375f8f"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
+"@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/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/template" "^7.22.15"
+    "@babel/types" "^7.23.0"
 
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
+"@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"
+  integrity sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz#86bcb19a77a509c7b77d0e22323ef588fa58c246"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
+"@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.16.7"
+    "@babel/types" "^7.22.5"
 
-"@babel/helper-member-expression-to-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz#42b9ca4b2b200123c3b7e726b0ae5153924905b0"
-  integrity sha512-VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q==
+"@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"
+  integrity sha512-Muu8cdZwNN6mRRNG6lAYErJ5X3bRevgYR2O8wN0yn7jJSnGDu6eG59RfT29JHxGUovyfrh6Pj0XzmR7drNVL3Q==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.21.0"
 
-"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz#25612a8091a999704461c8a222d0efec5d091437"
-  integrity sha512-LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg==
+"@babel/helper-module-imports@^7.18.6":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.21.4.tgz"
+  integrity sha512-orajc5T2PsRYUN3ZryCEFeMDYwyw09c/pZeaQEZPH0MpKzSvn3e0uXsDBu3k03VI+9DBiRo+l22BfKTpKwa/Wg==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.21.4"
 
-"@babel/helper-module-transforms@^7.16.7":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz#3c3b03cc6617e33d68ef5a27a67419ac5199ccd0"
-  integrity sha512-2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA==
+"@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":
+  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==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-simple-access" "^7.20.2"
+    "@babel/helper-split-export-declaration" "^7.18.6"
+    "@babel/helper-validator-identifier" "^7.19.1"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.2"
+    "@babel/types" "^7.21.2"
 
-"@babel/helper-optimise-call-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz#a34e3560605abbd31a18546bd2aad3e6d9a174f2"
-  integrity sha512-EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w==
+"@babel/helper-optimise-call-expression@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"
+  integrity sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5"
-  integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA==
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.16.7", "@babel/helper-plugin-utils@^7.18.6", "@babel/helper-plugin-utils@^7.18.9", "@babel/helper-plugin-utils@^7.19.0", "@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.20.2"
+  resolved "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.20.2.tgz"
+  integrity sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==
 
-"@babel/helper-remap-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3"
-  integrity sha512-fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw==
+"@babel/helper-remap-async-to-generator@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.9.tgz"
+  integrity sha512-dI7q50YKd8BAv3VEfgg7PS7yD3Rtbi2J1XMXaalXO0W0164hYLnh8zpjRS0mte9MfVp/tltvr/cfdXPvJr1opA==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-wrap-function" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-wrap-function" "^7.18.9"
+    "@babel/types" "^7.18.9"
 
-"@babel/helper-replace-supers@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz#e9f5f5f32ac90429c1a4bdec0f231ef0c2838ab1"
-  integrity sha512-y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw==
+"@babel/helper-replace-supers@^7.18.6", "@babel/helper-replace-supers@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.20.7.tgz"
+  integrity sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==
   dependencies:
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-member-expression-to-functions" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/traverse" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-member-expression-to-functions" "^7.20.7"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.20.7"
+    "@babel/types" "^7.20.7"
 
-"@babel/helper-simple-access@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7"
-  integrity sha512-ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g==
+"@babel/helper-simple-access@^7.20.2":
+  version "7.20.2"
+  resolved "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.20.2.tgz"
+  integrity sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==
   dependencies:
-    "@babel/types" "^7.16.7"
+    "@babel/types" "^7.20.2"
 
-"@babel/helper-skip-transparent-expression-wrappers@^7.16.0":
-  version "7.16.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09"
-  integrity sha512-+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw==
+"@babel/helper-skip-transparent-expression-wrappers@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.20.0.tgz"
+  integrity sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==
   dependencies:
-    "@babel/types" "^7.16.0"
+    "@babel/types" "^7.20.0"
 
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz#0b648c0c42da9d3920d85ad585f2778620b8726b"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
+"@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.16.7"
+    "@babel/types" "^7.18.6"
 
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz#e8c602438c4a8195751243da9031d1607d247cad"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/helper-validator-option@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz#b203ce62ce5fe153899b617c08957de860de4d23"
-  integrity sha512-TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ==
-
-"@babel/helper-wrap-function@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz#58afda087c4cd235de92f7ceedebca2c41274200"
-  integrity sha512-8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw==
+"@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/helper-function-name" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.16.8"
-    "@babel/types" "^7.16.8"
+    "@babel/types" "^7.22.5"
 
-"@babel/helpers@^7.16.7", "@babel/helpers@^7.17.2":
-  version "7.17.2"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.2.tgz#23f0a0746c8e287773ccd27c14be428891f63417"
-  integrity sha512-0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ==
-  dependencies:
-    "@babel/template" "^7.16.7"
-    "@babel/traverse" "^7.17.0"
-    "@babel/types" "^7.17.0"
+"@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/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.16.10.tgz#744f2eb81579d6eea753c227b0f570ad785aba88"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
+"@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"
+  integrity sha512-rmL/B8/f0mKS2baE9ZpyTcTavvEuWhTTW8amjzXNvYG4AwBsqTLikfXsEofsJEfKHf+HQVQbFOHy6o+4cnC/fQ==
+
+"@babel/helper-wrap-function@^7.18.9":
+  version "7.20.5"
+  resolved "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.20.5.tgz"
+  integrity sha512-bYMxIWK5mh+TgXGVqAtnu5Yn1un+v8DDZtqyzKRLUzrh70Eal2O3aZ7aPYiMADO4uKlkzOiRiZ6GX5q3qxvW9Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-function-name" "^7.19.0"
+    "@babel/template" "^7.18.10"
+    "@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":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/helpers/-/helpers-7.21.0.tgz"
+  integrity sha512-XXve0CBtOW0pd7MRzzmoyuSj0e3SEzj8pgyFxnTT1NJZL38BD1MK7yYrm8yefRPIDvNNe14xR4FdbHwpInD4rA==
+  dependencies:
+    "@babel/template" "^7.20.7"
+    "@babel/traverse" "^7.21.0"
+    "@babel/types" "^7.21.0"
+
+"@babel/highlight@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"
+  integrity sha512-u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.18.6"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.10.3", "@babel/parser@^7.14.7", "@babel/parser@^7.16.12", "@babel/parser@^7.16.7", "@babel/parser@^7.17.0", "@babel/parser@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.3.tgz#b07702b982990bf6fdc1da5049a23fece4c5c3d0"
-  integrity sha512-7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA==
-
-"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050"
-  integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg==
+"@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-plugin-utils" "^7.16.7"
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
 
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9"
-  integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
+"@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":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz"
+  integrity sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==
 
-"@babel/plugin-proposal-async-generator-functions@7.16.8", "@babel/plugin-proposal-async-generator-functions@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8"
-  integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ==
+"@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"
+  integrity sha512-Dgxsyg54Fx1d4Nge8UnvTrED63vrwOdPmyvPzlNN/boaliRP54pm3pGzZD1SJUwrBA+Cs/xdG8kXX6Mn/RfISQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-plugin-utils" "^7.18.6"
+
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.18.9":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.20.7.tgz"
+  integrity sha512-sbr9+wNE5aXMBBFBICk01tt7sBf2Oc9ikRFEcem/ZORup9IMUdNhW7/wVLEbbtlWOsEubJet46mHAL2C8+2jKQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
+    "@babel/plugin-proposal-optional-chaining" "^7.20.7"
+
+"@babel/plugin-proposal-async-generator-functions@7.20.7", "@babel/plugin-proposal-async-generator-functions@^7.20.1":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz"
+  integrity sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==
+  dependencies:
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0"
-  integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww==
+"@babel/plugin-proposal-class-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"
+  integrity sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-class-static-block@^7.16.7":
-  version "7.17.6"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.17.6.tgz#164e8fd25f0d80fa48c5a4d1438a6629325ad83c"
-  integrity sha512-X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA==
+"@babel/plugin-proposal-class-static-block@^7.18.6":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.21.0.tgz"
+  integrity sha512-XP5G9MWNUskFuP30IfFSEFB0Z6HzLIUcjYM4bYOPHXl7eiJ9HFv8tWj6TXTN5QODiEhDZAeI4hLok2iHFFV4hw==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.17.6"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz#c19c897eaa46b27634a00fee9fb7d829158704b2"
-  integrity sha512-I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg==
+"@babel/plugin-proposal-dynamic-import@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"
+  integrity sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163"
-  integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA==
+"@babel/plugin-proposal-export-namespace-from@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.9.tgz"
+  integrity sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8"
-  integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ==
+"@babel/plugin-proposal-json-strings@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"
+  integrity sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea"
-  integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg==
+"@babel/plugin-proposal-logical-assignment-operators@^7.18.9":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.20.7.tgz"
+  integrity sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99"
-  integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"
+  integrity sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9"
-  integrity sha512-vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw==
+"@babel/plugin-proposal-numeric-separator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"
+  integrity sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.16.7":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.17.3.tgz#d9eb649a54628a51701aef7e0ea3d17e2b9dd390"
-  integrity sha512-yuL5iQA/TbZn+RGAfxQXfi7CNLmKi1f8zInn4IgobuCWcAb7i+zj4TYzQ9l8cEzVyJ89PDGuqxK1xZpUDISesw==
+"@babel/plugin-proposal-object-rest-spread@^7.20.2":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz"
+  integrity sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==
   dependencies:
-    "@babel/compat-data" "^7.17.0"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/compat-data" "^7.20.5"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.16.7"
+    "@babel/plugin-transform-parameters" "^7.20.7"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf"
-  integrity sha512-eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA==
+"@babel/plugin-proposal-optional-catch-binding@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"
+  integrity sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a"
-  integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA==
+"@babel/plugin-proposal-optional-chaining@^7.18.9", "@babel/plugin-proposal-optional-chaining@^7.20.7":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz"
+  integrity sha512-p4zeefM72gpmEe2fkUr/OnOXpWEf8nAgk7ZYVqqfFiyIG7oFfVZcCrU64hWn5xp4tQ9LkV4bTIa5rD0KANpKNA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50"
-  integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw==
+"@babel/plugin-proposal-private-methods@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"
+  integrity sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.16.10"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-class-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-proposal-private-property-in-object@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce"
-  integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ==
+"@babel/plugin-proposal-private-property-in-object@^7.18.6":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0.tgz"
+  integrity sha512-ha4zfehbJjc5MmXBlHec1igel5TJXXLDDRbuJ4+XT2TJcyD9/V1919BA8gMvsdHcNMBy4WBUBiRb3nw/EQUtBw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-create-class-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-create-class-features-plugin" "^7.21.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.16.7", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2"
-  integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg==
+"@babel/plugin-proposal-unicode-property-regex@^7.18.6", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"
+  integrity sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz#a983fb1aeb2ec3f6ed042a210f640e90e786fe0d"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz"
   integrity sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-class-properties@^7.12.13":
   version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz#b5c987274c4a3a82b89714796931a6b53544ae10"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz"
   integrity sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
 "@babel/plugin-syntax-class-static-block@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz"
   integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz"
   integrity sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-export-namespace-from@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz#028964a9ba80dbc094c915c487ad7c4e7a66465a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"
   integrity sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-assertions@^7.20.0":
+  version "7.20.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.20.0.tgz"
+  integrity sha512-IUh1vakzNoWalR8ch/areW7qFopR2AEw03JlG7BbrDqmQ4X3q9uuipQwSGrUn7oGiemKjtSLDhNtQHzMHr1JdQ==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.19.0"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz"
   integrity sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-logical-assignment-operators@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz#ca91ef46303530448b906652bac2e9fe9941f699"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"
   integrity sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-nullish-coalescing-operator@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz#167ed70368886081f74b5c36c65a88c03b66d1a9"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz"
   integrity sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-numeric-separator@^7.10.4":
   version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz#b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"
   integrity sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==
   dependencies:
     "@babel/helper-plugin-utils" "^7.10.4"
 
 "@babel/plugin-syntax-object-rest-spread@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz#60e225edcbd98a640332a2e72dd3e66f1af55871"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz"
   integrity sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-catch-binding@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz#6111a265bcfb020eb9efd0fdfd7d26402b9ed6c1"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz"
   integrity sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-optional-chaining@^7.8.3":
   version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz#4f69c2ab95167e0180cd5336613f8c5788f7d48a"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz"
   integrity sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
 "@babel/plugin-syntax-private-property-in-object@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz"
   integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-top-level-await@^7.14.5":
   version "7.14.5"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  resolved "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz"
   integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
     "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154"
-  integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ==
+"@babel/plugin-transform-arrow-functions@^7.18.6":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.20.7.tgz"
+  integrity sha512-3poA5E7dzDomxj9WXWwuD6A5F3kc7VXwIJO+E+J8qtDtS+pXPAhrgEyh+9GBwBgPq1Z+bB+/JD60lp5jsN7JPQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-async-to-generator@7.16.8", "@babel/plugin-transform-async-to-generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808"
-  integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg==
+"@babel/plugin-transform-async-to-generator@7.20.7", "@babel/plugin-transform-async-to-generator@^7.18.6":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.20.7.tgz"
+  integrity sha512-Uo5gwHPT9vgnSXQxqGtpdufUiWp96gk7yiP4Mp5bm1QMkEmLXBO7PAGYbKoJ6DhAwiNkcHFBol/x5zZZkL/t0Q==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-remap-async-to-generator" "^7.16.8"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-remap-async-to-generator" "^7.18.9"
 
-"@babel/plugin-transform-block-scoped-functions@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620"
-  integrity sha512-JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg==
+"@babel/plugin-transform-block-scoped-functions@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"
+  integrity sha512-ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-block-scoping@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87"
-  integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ==
+"@babel/plugin-transform-block-scoping@^7.20.2":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.21.0.tgz"
+  integrity sha512-Mdrbunoh9SxwFZapeHVrwFmri16+oYotcZysSzhNIVDwIAb1UV+kvnxULSYq9J3/q5MDG+4X6w8QVgD1zhBXNQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-classes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00"
-  integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ==
+"@babel/plugin-transform-classes@^7.20.2":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.21.0.tgz"
+  integrity sha512-RZhbYTCEUAe6ntPehC4hlslPWosNHDox+vAs4On/mCLRLfoDVHf6hVEd7kuxr1RnHwJmxFfUM3cZiZRmPxJPXQ==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.16.7"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-optimise-call-expression" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
+    "@babel/helper-annotate-as-pure" "^7.18.6"
+    "@babel/helper-compilation-targets" "^7.20.7"
+    "@babel/helper-environment-visitor" "^7.18.9"
+    "@babel/helper-function-name" "^7.21.0"
+    "@babel/helper-optimise-call-expression" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-replace-supers" "^7.20.7"
+    "@babel/helper-split-export-declaration" "^7.18.6"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470"
-  integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw==
+"@babel/plugin-transform-computed-properties@^7.18.9":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.20.7.tgz"
+  integrity sha512-Lz7MvBK6DTjElHAmfu6bfANzKcxpyNPeYBGEafyA6E5HtRpjpZwU+u7Qrgz/2OR0z+5TvKYbPdphfSaAcZBrYQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/template" "^7.20.7"
 
-"@babel/plugin-transform-destructuring@^7.16.7":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz#c445f75819641788a27a0a3a759d9df911df6abc"
-  integrity sha512-dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg==
+"@babel/plugin-transform-destructuring@^7.20.2":
+  version "7.21.3"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.21.3.tgz"
+  integrity sha512-bp6hwMFzuiE4HqYEyoGJ/V2LeIWn+hLVKc4pnj++E5XQptwhtcGmSayM029d/j2X1bPKGTlsyPwAubuU22KhMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-dotall-regex@^7.16.7", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241"
-  integrity sha512-Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ==
+"@babel/plugin-transform-dotall-regex@^7.18.6", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"
+  integrity sha512-6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-duplicate-keys@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9"
-  integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw==
+"@babel/plugin-transform-duplicate-keys@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.9.tgz"
+  integrity sha512-d2bmXCtZXYc59/0SanQKbiWINadaJXqtvIQIzd4+hNwkWBgyCd5F/2t1kXoUdvPMrxzPvhK6EMQRROxsue+mfw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-exponentiation-operator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b"
-  integrity sha512-8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA==
+"@babel/plugin-transform-exponentiation-operator@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"
+  integrity sha512-wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-for-of@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c"
-  integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg==
+"@babel/plugin-transform-for-of@^7.18.8":
+  version "7.21.0"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.21.0.tgz"
+  integrity sha512-LlUYlydgDkKpIY7mcBWvyPPmMcOphEyYA27Ef4xpbh1IiDNLr0kZsos2nf92vz3IccvJI25QUwp86Eo5s6HmBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf"
-  integrity sha512-SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA==
+"@babel/plugin-transform-function-name@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.9.tgz"
+  integrity sha512-WvIBoRPaJQ5yVHzcnJFor7oS5Ls0PYixlTYE63lCj2RtdQEl15M68FXQlxnG6wdraJIXRdR7KI+hQ7q/9QjrCQ==
   dependencies:
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-compilation-targets" "^7.18.9"
+    "@babel/helper-function-name" "^7.18.9"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1"
-  integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ==
+"@babel/plugin-transform-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.9.tgz"
+  integrity sha512-IFQDSRoTPnrAIrI5zoZv73IFeZu2dhu6irxQjY9rNjTT53VmKg9fenjvoiOWOkJ6mm4jKVPtdMzBY98Fp4Z4cg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-member-expression-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384"
-  integrity sha512-mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw==
+"@babel/plugin-transform-member-expression-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"
+  integrity sha512-qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-modules-amd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
-  integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
+"@babel/plugin-transform-modules-amd@^7.19.6":
+  version "7.20.11"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.20.11.tgz"
+  integrity sha512-NuzCt5IIYOW0O30UvqktzHYR2ud5bOWbY0yaxWZ6G+aFzOMJvrs5YHNikrbdaT15+KNO31nPOy5Fim3ku6Zb5g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-modules-commonjs@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe"
-  integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA==
+"@babel/plugin-transform-modules-commonjs@^7.19.6":
+  version "7.21.2"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.21.2.tgz"
+  integrity sha512-Cln+Yy04Gxua7iPdj6nOV96smLGjpElir5YwzF0LBPKoPlLDNJePNlrGGaybAJkd0zKRnOVXOgizSqPYMNYkzA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-simple-access" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-module-transforms" "^7.21.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-simple-access" "^7.20.2"
 
-"@babel/plugin-transform-modules-systemjs@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7"
-  integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw==
+"@babel/plugin-transform-modules-systemjs@^7.19.6":
+  version "7.20.11"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.20.11.tgz"
+  integrity sha512-vVu5g9BPQKSFEmvt2TA4Da5N+QVS66EX21d8uoOihC+OCpUoGvzVsXeqFdtAEfVa5BILAeFt+U7yVmLbQnAJmw==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-identifier" "^7.16.7"
-    babel-plugin-dynamic-import-node "^2.3.3"
+    "@babel/helper-hoist-variables" "^7.18.6"
+    "@babel/helper-module-transforms" "^7.20.11"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-identifier" "^7.19.1"
 
-"@babel/plugin-transform-modules-umd@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618"
-  integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ==
+"@babel/plugin-transform-modules-umd@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"
+  integrity sha512-dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ==
   dependencies:
-    "@babel/helper-module-transforms" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-module-transforms" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252"
-  integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.19.1":
+  version "7.20.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.20.5.tgz"
+  integrity sha512-mOW4tTzi5iTLnw+78iEq3gr8Aoq4WNRGpmSlrogqaiCBoR1HFhpU4JkpQFOHfeYx3ReVIFWOQJS4aZBRvuZ6mA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.20.5"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-new-target@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244"
-  integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg==
+"@babel/plugin-transform-new-target@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"
+  integrity sha512-DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-object-super@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94"
-  integrity sha512-14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw==
+"@babel/plugin-transform-object-super@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"
+  integrity sha512-uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-replace-supers" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
+    "@babel/helper-replace-supers" "^7.18.6"
 
-"@babel/plugin-transform-parameters@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz#a1721f55b99b736511cb7e0152f61f17688f331f"
-  integrity sha512-AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw==
+"@babel/plugin-transform-parameters@^7.20.1", "@babel/plugin-transform-parameters@^7.20.7":
+  version "7.21.3"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.21.3.tgz"
+  integrity sha512-Wxc+TvppQG9xWFYatvCGPvZ6+SIUxQ2ZdiBP+PHYMIjnPXD+uThCshaz4NZOnODAtBjjcVQQ/3OKs9LW28purQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.20.2"
 
-"@babel/plugin-transform-property-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55"
-  integrity sha512-z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw==
+"@babel/plugin-transform-property-literals@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"
+  integrity sha512-cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-regenerator@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb"
-  integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q==
+"@babel/plugin-transform-regenerator@^7.18.6":
+  version "7.20.5"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.20.5.tgz"
+  integrity sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==
   dependencies:
-    regenerator-transform "^0.14.2"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    regenerator-transform "^0.15.1"
 
-"@babel/plugin-transform-reserved-words@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586"
-  integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg==
+"@babel/plugin-transform-reserved-words@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"
+  integrity sha512-oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-runtime@7.16.10":
-  version "7.16.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.16.10.tgz#53d9fd3496daedce1dd99639097fa5d14f4c7c2c"
-  integrity sha512-9nwTiqETv2G7xI4RvXHNfpGdr8pAA+Q/YtN3yLK7OoK7n9OibVm/xymJ838a9A6E/IciOLPj82lZk0fW6O4O7w==
+"@babel/plugin-transform-runtime@7.19.6":
+  version "7.19.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.19.6.tgz"
+  integrity sha512-PRH37lz4JU156lYFW1p8OxE5i7d6Sl/zV58ooyr+q1J1lnQPyg5tIiXlIwNVhJaY4W3TmOtdc8jqdXQcB1v5Yw==
   dependencies:
-    "@babel/helper-module-imports" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
+    "@babel/helper-module-imports" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.19.0"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a"
-  integrity sha512-hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg==
+"@babel/plugin-transform-shorthand-properties@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"
+  integrity sha512-eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-spread@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44"
-  integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg==
+"@babel/plugin-transform-spread@^7.19.0":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.20.7.tgz"
+  integrity sha512-ewBbHQ+1U/VnH1fxltbJqDeWBU1oNLG8Dj11uIv3xVf7nrQu0bPGe5Rf716r7K5Qz+SqtAOVswoVunoiBtGhxw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.20.0"
 
-"@babel/plugin-transform-sticky-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660"
-  integrity sha512-NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw==
+"@babel/plugin-transform-sticky-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"
+  integrity sha512-kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/plugin-transform-template-literals@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab"
-  integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA==
+"@babel/plugin-transform-template-literals@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.9.tgz"
+  integrity sha512-S8cOWfT82gTezpYOiVaGHrCbhlHgKhQt8XH5ES46P2XWmX92yisoZywf5km75wv5sYcXDUCLMmMxOLCtthDgMA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-typeof-symbol@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e"
-  integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ==
+"@babel/plugin-transform-typeof-symbol@^7.18.9":
+  version "7.18.9"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.9.tgz"
+  integrity sha512-SRfwTtF11G2aemAZWivL7PD+C9z52v9EvMqH9BuYbabyPuKUvSWks3oCg6041pT925L4zVFqaVBeECwsmlguEw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-escapes@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3"
-  integrity sha512-TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q==
+"@babel/plugin-transform-unicode-escapes@^7.18.10":
+  version "7.18.10"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.10.tgz"
+  integrity sha512-kKAdAI+YzPgGY/ftStBFXTI1LZFju38rYThnfMykS+IXy8BVx+res7s2fxf1l8I35DV2T97ezo6+SGrXz6B3iQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-plugin-utils" "^7.18.9"
 
-"@babel/plugin-transform-unicode-regex@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz#0f7aa4a501198976e25e82702574c34cfebe9ef2"
-  integrity sha512-oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q==
+"@babel/plugin-transform-unicode-regex@^7.18.6":
+  version "7.18.6"
+  resolved "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"
+  integrity sha512-gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
+    "@babel/helper-create-regexp-features-plugin" "^7.18.6"
+    "@babel/helper-plugin-utils" "^7.18.6"
 
-"@babel/preset-env@7.16.11":
-  version "7.16.11"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982"
-  integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g==
+"@babel/preset-env@7.20.2":
+  version "7.20.2"
+  resolved "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.20.2.tgz"
+  integrity sha512-1G0efQEWR1EHkKvKHqbG+IN/QdgwfByUpM5V5QroDzGV2t3S/WXNQd693cHiHTlCFMpr9B6FkPFXDA2lQcKoDg==
   dependencies:
-    "@babel/compat-data" "^7.16.8"
-    "@babel/helper-compilation-targets" "^7.16.7"
-    "@babel/helper-plugin-utils" "^7.16.7"
-    "@babel/helper-validator-option" "^7.16.7"
-    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-async-generator-functions" "^7.16.8"
-    "@babel/plugin-proposal-class-properties" "^7.16.7"
-    "@babel/plugin-proposal-class-static-block" "^7.16.7"
-    "@babel/plugin-proposal-dynamic-import" "^7.16.7"
-    "@babel/plugin-proposal-export-namespace-from" "^7.16.7"
-    "@babel/plugin-proposal-json-strings" "^7.16.7"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7"
-    "@babel/plugin-proposal-numeric-separator" "^7.16.7"
-    "@babel/plugin-proposal-object-rest-spread" "^7.16.7"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.16.7"
-    "@babel/plugin-proposal-optional-chaining" "^7.16.7"
-    "@babel/plugin-proposal-private-methods" "^7.16.11"
-    "@babel/plugin-proposal-private-property-in-object" "^7.16.7"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.16.7"
+    "@babel/compat-data" "^7.20.1"
+    "@babel/helper-compilation-targets" "^7.20.0"
+    "@babel/helper-plugin-utils" "^7.20.2"
+    "@babel/helper-validator-option" "^7.18.6"
+    "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.18.6"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-async-generator-functions" "^7.20.1"
+    "@babel/plugin-proposal-class-properties" "^7.18.6"
+    "@babel/plugin-proposal-class-static-block" "^7.18.6"
+    "@babel/plugin-proposal-dynamic-import" "^7.18.6"
+    "@babel/plugin-proposal-export-namespace-from" "^7.18.9"
+    "@babel/plugin-proposal-json-strings" "^7.18.6"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.18.9"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.18.6"
+    "@babel/plugin-proposal-numeric-separator" "^7.18.6"
+    "@babel/plugin-proposal-object-rest-spread" "^7.20.2"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.18.6"
+    "@babel/plugin-proposal-optional-chaining" "^7.18.9"
+    "@babel/plugin-proposal-private-methods" "^7.18.6"
+    "@babel/plugin-proposal-private-property-in-object" "^7.18.6"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.18.6"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
     "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
+    "@babel/plugin-syntax-import-assertions" "^7.20.0"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -1239,49 +1406,49 @@
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
     "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
     "@babel/plugin-syntax-top-level-await" "^7.14.5"
-    "@babel/plugin-transform-arrow-functions" "^7.16.7"
-    "@babel/plugin-transform-async-to-generator" "^7.16.8"
-    "@babel/plugin-transform-block-scoped-functions" "^7.16.7"
-    "@babel/plugin-transform-block-scoping" "^7.16.7"
-    "@babel/plugin-transform-classes" "^7.16.7"
-    "@babel/plugin-transform-computed-properties" "^7.16.7"
-    "@babel/plugin-transform-destructuring" "^7.16.7"
-    "@babel/plugin-transform-dotall-regex" "^7.16.7"
-    "@babel/plugin-transform-duplicate-keys" "^7.16.7"
-    "@babel/plugin-transform-exponentiation-operator" "^7.16.7"
-    "@babel/plugin-transform-for-of" "^7.16.7"
-    "@babel/plugin-transform-function-name" "^7.16.7"
-    "@babel/plugin-transform-literals" "^7.16.7"
-    "@babel/plugin-transform-member-expression-literals" "^7.16.7"
-    "@babel/plugin-transform-modules-amd" "^7.16.7"
-    "@babel/plugin-transform-modules-commonjs" "^7.16.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.16.7"
-    "@babel/plugin-transform-modules-umd" "^7.16.7"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8"
-    "@babel/plugin-transform-new-target" "^7.16.7"
-    "@babel/plugin-transform-object-super" "^7.16.7"
-    "@babel/plugin-transform-parameters" "^7.16.7"
-    "@babel/plugin-transform-property-literals" "^7.16.7"
-    "@babel/plugin-transform-regenerator" "^7.16.7"
-    "@babel/plugin-transform-reserved-words" "^7.16.7"
-    "@babel/plugin-transform-shorthand-properties" "^7.16.7"
-    "@babel/plugin-transform-spread" "^7.16.7"
-    "@babel/plugin-transform-sticky-regex" "^7.16.7"
-    "@babel/plugin-transform-template-literals" "^7.16.7"
-    "@babel/plugin-transform-typeof-symbol" "^7.16.7"
-    "@babel/plugin-transform-unicode-escapes" "^7.16.7"
-    "@babel/plugin-transform-unicode-regex" "^7.16.7"
+    "@babel/plugin-transform-arrow-functions" "^7.18.6"
+    "@babel/plugin-transform-async-to-generator" "^7.18.6"
+    "@babel/plugin-transform-block-scoped-functions" "^7.18.6"
+    "@babel/plugin-transform-block-scoping" "^7.20.2"
+    "@babel/plugin-transform-classes" "^7.20.2"
+    "@babel/plugin-transform-computed-properties" "^7.18.9"
+    "@babel/plugin-transform-destructuring" "^7.20.2"
+    "@babel/plugin-transform-dotall-regex" "^7.18.6"
+    "@babel/plugin-transform-duplicate-keys" "^7.18.9"
+    "@babel/plugin-transform-exponentiation-operator" "^7.18.6"
+    "@babel/plugin-transform-for-of" "^7.18.8"
+    "@babel/plugin-transform-function-name" "^7.18.9"
+    "@babel/plugin-transform-literals" "^7.18.9"
+    "@babel/plugin-transform-member-expression-literals" "^7.18.6"
+    "@babel/plugin-transform-modules-amd" "^7.19.6"
+    "@babel/plugin-transform-modules-commonjs" "^7.19.6"
+    "@babel/plugin-transform-modules-systemjs" "^7.19.6"
+    "@babel/plugin-transform-modules-umd" "^7.18.6"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.19.1"
+    "@babel/plugin-transform-new-target" "^7.18.6"
+    "@babel/plugin-transform-object-super" "^7.18.6"
+    "@babel/plugin-transform-parameters" "^7.20.1"
+    "@babel/plugin-transform-property-literals" "^7.18.6"
+    "@babel/plugin-transform-regenerator" "^7.18.6"
+    "@babel/plugin-transform-reserved-words" "^7.18.6"
+    "@babel/plugin-transform-shorthand-properties" "^7.18.6"
+    "@babel/plugin-transform-spread" "^7.19.0"
+    "@babel/plugin-transform-sticky-regex" "^7.18.6"
+    "@babel/plugin-transform-template-literals" "^7.18.9"
+    "@babel/plugin-transform-typeof-symbol" "^7.18.9"
+    "@babel/plugin-transform-unicode-escapes" "^7.18.10"
+    "@babel/plugin-transform-unicode-regex" "^7.18.6"
     "@babel/preset-modules" "^0.1.5"
-    "@babel/types" "^7.16.8"
-    babel-plugin-polyfill-corejs2 "^0.3.0"
-    babel-plugin-polyfill-corejs3 "^0.5.0"
-    babel-plugin-polyfill-regenerator "^0.3.0"
-    core-js-compat "^3.20.2"
+    "@babel/types" "^7.20.2"
+    babel-plugin-polyfill-corejs2 "^0.3.3"
+    babel-plugin-polyfill-corejs3 "^0.6.0"
+    babel-plugin-polyfill-regenerator "^0.4.1"
+    core-js-compat "^3.25.1"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.5":
   version "0.1.5"
-  resolved "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.5.tgz#ef939d6e7f268827e1841638dc6ff95515e115d9"
+  resolved "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.5.tgz"
   integrity sha512-A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -1290,71 +1457,87 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime-corejs3@^7.10.2":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz#d7dd49fb812f29c61c59126da3792d8740d4e284"
-  integrity sha512-ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ==
-  dependencies:
-    core-js-pure "^3.20.2"
-    regenerator-runtime "^0.13.4"
+"@babel/regjsgen@^0.8.0":
+  version "0.8.0"
+  resolved "https://registry.npmjs.org/@babel/regjsgen/-/regjsgen-0.8.0.tgz"
+  integrity sha512-x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==
 
-"@babel/runtime@7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.16.7.tgz#03ff99f64106588c9c403c6ecb8c3bafbbdff1fa"
-  integrity sha512-9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ==
+"@babel/runtime@7.20.13":
+  version "7.20.13"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.20.13.tgz"
+  integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    regenerator-runtime "^0.13.11"
 
-"@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.17.2", "@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":
+"@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.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.yarnpkg.com/@babel/runtime/-/runtime-7.17.2.tgz#66f68591605e59da47523c631416b18508779941"
+  resolved "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"
   integrity sha512-hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.10.2":
-  version "7.17.8"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2"
-  integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==
+"@babel/template@7.20.7", "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.20.7":
+  version "7.20.7"
+  resolved "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz"
+  integrity sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==
   dependencies:
-    regenerator-runtime "^0.13.4"
+    "@babel/code-frame" "^7.18.6"
+    "@babel/parser" "^7.20.7"
+    "@babel/types" "^7.20.7"
 
-"@babel/template@7.16.7", "@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.16.7.tgz#8d126c8701fde4d66b264b3eba3d96f07666d155"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+"@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.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/code-frame" "^7.22.13"
+    "@babel/parser" "^7.22.15"
+    "@babel/types" "^7.22.15"
 
-"@babel/traverse@^7.10.3", "@babel/traverse@^7.13.0", "@babel/traverse@^7.16.10", "@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0", "@babel/traverse@^7.17.3":
-  version "7.17.3"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.3.tgz#0ae0f15b27d9a92ba1f2263358ea7c4e7db47b57"
-  integrity sha512-5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw==
+"@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.23.2"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.23.2.tgz#329c7a06735e144a506bdb2cad0268b7f46f4ad8"
+  integrity sha512-azpe59SQ48qG6nu2CzcMLbxUudtN+dOM9kDbUqGq3HXUJRlo7i8fvPoxQUzYgLZ4cMVmuZgm8vvBpNeRhd6XSw==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.17.3"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.17.3"
-    "@babel/types" "^7.17.0"
+    "@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.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0", "@babel/types@^7.4.4":
-  version "7.17.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b"
-  integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw==
+"@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":
+  version "7.21.4"
+  resolved "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz"
+  integrity sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
+    "@babel/helper-string-parser" "^7.19.4"
+    "@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.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  resolved "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
   integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
 
 "@cspotcode/source-map-consumer@0.8.0":
@@ -1369,69 +1552,116 @@
   dependencies:
     "@cspotcode/source-map-consumer" "0.8.0"
 
-"@csstools/postcss-color-function@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.0.3.tgz#251c961a852c99e9aabdbbdbefd50e9a96e8a9ff"
-  integrity sha512-J26I69pT2B3MYiLY/uzCGKVJyMYVg9TCpXkWsRlt+Yfq+nELUEm72QXIMYXs4xA9cJA4Oqs2EylrfokKl3mJEQ==
+"@csstools/postcss-cascade-layers@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-cascade-layers/-/postcss-cascade-layers-1.1.1.tgz"
+  integrity sha512-+KdYrpKC5TgomQr2DlZF4lDEpHcoxnj5IGddYYfBWJAKfj1JtuHUIqMa+E1pJJ+z3kvDViWMqyqPlG4Ja7amQA==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.2"
+    postcss-selector-parser "^6.0.10"
+
+"@csstools/postcss-color-function@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-color-function/-/postcss-color-function-1.1.1.tgz"
+  integrity sha512-Bc0f62WmHdtRDjf5f3e2STwRAl89N2CLb+9iAwzrv4L2hncrbDwnQD9PCq0gtAt7pOI2leIV08HIBUd4jxD8cw==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-font-format-keywords@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.0.tgz#7e7df948a83a0dfb7eb150a96e2390ac642356a1"
-  integrity sha512-oO0cZt8do8FdVBX8INftvIA4lUrKUSCcWUf9IwH9IPWOgKT22oAZFXeHLoDK7nhB2SmkNycp5brxfNMRLIhd6Q==
+"@csstools/postcss-font-format-keywords@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-font-format-keywords/-/postcss-font-format-keywords-1.0.1.tgz"
+  integrity sha512-ZgrlzuUAjXIOc2JueK0X5sZDjCtgimVp/O5CEqTcs5ShWBa6smhWYbS0x5cVc/+rycTDbjjzoP0KTDnUneZGOg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-hwb-function@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.0.tgz#d6785c1c5ba8152d1d392c66f3a6a446c6034f6d"
-  integrity sha512-VSTd7hGjmde4rTj1rR30sokY3ONJph1reCBTUXqeW1fKwETPy1x4t/XIeaaqbMbC5Xg4SM/lyXZ2S8NELT2TaA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-ic-unit@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.0.tgz#f484db59fc94f35a21b6d680d23b0ec69b286b7f"
-  integrity sha512-i4yps1mBp2ijrx7E96RXrQXQQHm6F4ym1TOD0D69/sjDjZvQ22tqiEvaNw7pFZTUO5b9vWRHzbHzP9+UKuw+bA==
-  dependencies:
-    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-is-pseudo-class@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.1.tgz#472fff2cf434bdf832f7145b2a5491587e790c9e"
-  integrity sha512-Og5RrTzwFhrKoA79c3MLkfrIBYmwuf/X83s+JQtz/Dkk/MpsaKtqHV1OOzYkogQ+tj3oYp5Mq39XotBXNqVc3Q==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-
-"@csstools/postcss-normalize-display-values@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.0.tgz#ce698f688c28517447aedf15a9037987e3d2dc97"
-  integrity sha512-bX+nx5V8XTJEmGtpWTO6kywdS725t71YSLlxWt78XoHUbELWgoCXeOFymRJmL3SU1TLlKSIi7v52EWqe60vJTQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-"@csstools/postcss-oklab-function@^1.0.1":
+"@csstools/postcss-hwb-function@^1.0.2":
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.0.2.tgz#87cd646e9450347a5721e405b4f7cc35157b7866"
-  integrity sha512-QwhWesEkMlp4narAwUi6pgc6kcooh8cC7zfxa9LSQNYXqzcdNUtNBzbGc5nuyAVreb7uf5Ox4qH1vYT3GA1wOg==
+  resolved "https://registry.npmjs.org/@csstools/postcss-hwb-function/-/postcss-hwb-function-1.0.2.tgz"
+  integrity sha512-YHdEru4o3Rsbjmu6vHy4UKOXZD+Rn2zmkAmLRfPet6+Jz4Ojw8cbWxe1n42VaXQhD3CQUXXTooIy8OkVbUcL+w==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-ic-unit@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-ic-unit/-/postcss-ic-unit-1.0.1.tgz"
+  integrity sha512-Ot1rcwRAaRHNKC9tAqoqNZhjdYBzKk1POgWfhN4uCOE47ebGcLRqXjKkApVDpjifL6u2/55ekkpnFcp+s/OZUw==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-"@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.2.0":
+"@csstools/postcss-is-pseudo-class@^2.0.7":
+  version "2.0.7"
+  resolved "https://registry.npmjs.org/@csstools/postcss-is-pseudo-class/-/postcss-is-pseudo-class-2.0.7.tgz"
+  integrity sha512-7JPeVVZHd+jxYdULl87lvjgvWldYu+Bc62s9vD/ED6/QTGjy0jy0US/f6BG53sVMTBJ1lzKZFpYmofBN9eaRiA==
+  dependencies:
+    "@csstools/selector-specificity" "^2.0.0"
+    postcss-selector-parser "^6.0.10"
+
+"@csstools/postcss-nested-calc@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@csstools/postcss-nested-calc/-/postcss-nested-calc-1.0.0.tgz"
+  integrity sha512-JCsQsw1wjYwv1bJmgjKSoZNvf7R6+wuHDAbi5f/7MbFhl2d/+v+TvBTU4BJH3G1X1H87dHl0mh6TfYogbT/dJQ==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-normalize-display-values@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-normalize-display-values/-/postcss-normalize-display-values-1.0.1.tgz"
+  integrity sha512-jcOanIbv55OFKQ3sYeFD/T0Ti7AMXc9nM1hZWu8m/2722gOTxFg7xYu4RDLJLeZmPUVQlGzo4jhzvTUq3x4ZUw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-oklab-function@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-oklab-function/-/postcss-oklab-function-1.1.1.tgz"
+  integrity sha512-nJpJgsdA3dA9y5pgyb/UfEzE7W5Ka7u0CX0/HIMVBNWzWemdcTH3XwANECU6anWv/ao4vVNLTMxhiPNZsTK6iA==
+  dependencies:
+    "@csstools/postcss-progressive-custom-properties" "^1.1.0"
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-progressive-custom-properties@^1.1.0", "@csstools/postcss-progressive-custom-properties@^1.3.0":
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz#542292558384361776b45c85226b9a3a34f276fa"
+  resolved "https://registry.npmjs.org/@csstools/postcss-progressive-custom-properties/-/postcss-progressive-custom-properties-1.3.0.tgz"
   integrity sha512-ASA9W1aIy5ygskZYuWams4BzafD12ULvSypmaLJT2jvQ8G0M3I8PRQhC0h7mG0Z3LI05+agZjqSR9+K9yaQQjA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-"@cypress/request@^2.88.10":
-  version "2.88.10"
-  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.10.tgz#b66d76b07f860d3a4b8d7a0604d020c662752cce"
-  integrity sha512-Zp7F+R93N0yZyG34GutyTNr+okam7s/Fzc1+i3kcqOP8vk6OuajuE9qZJ6Rs+10/1JFtXFYMdyarnU1rZuJesg==
+"@csstools/postcss-stepped-value-functions@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@csstools/postcss-stepped-value-functions/-/postcss-stepped-value-functions-1.0.1.tgz"
+  integrity sha512-dz0LNoo3ijpTOQqEJLY8nyaapl6umbmDcgj4AD0lgVQ572b2eqA1iGZYTTWhrcrHztWDDRAX2DGYyw2VBjvCvQ==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-text-decoration-shorthand@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@csstools/postcss-text-decoration-shorthand/-/postcss-text-decoration-shorthand-1.0.0.tgz"
+  integrity sha512-c1XwKJ2eMIWrzQenN0XbcfzckOLLJiczqy+YvfGmzoVXd7pT9FfObiSEfzs84bpE/VqfpEuAZ9tCRbZkZxxbdw==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-trigonometric-functions@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/@csstools/postcss-trigonometric-functions/-/postcss-trigonometric-functions-1.0.2.tgz"
+  integrity sha512-woKaLO///4bb+zZC2s80l+7cm07M7268MsyG3M0ActXXEFi6SuhvriQYcb58iiKGbjwwIU7n45iRLEHypB47Og==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+"@csstools/postcss-unset-value@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/@csstools/postcss-unset-value/-/postcss-unset-value-1.0.2.tgz"
+  integrity sha512-c8J4roPBILnelAsdLr4XOAR/GsTm0GJi4XpcfvoWk3U6KiTCqiFYc63KhRMQQX35jYMp4Ao8Ij9+IZRgMfJp1g==
+
+"@csstools/selector-specificity@^2.0.0", "@csstools/selector-specificity@^2.0.2":
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz"
+  integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
+
+"@cypress/request@2.88.12":
+  version "2.88.12"
+  resolved "https://registry.yarnpkg.com/@cypress/request/-/request-2.88.12.tgz#ba4911431738494a85e93fb04498cb38bc55d590"
+  integrity sha512-tOn+0mDZxASFM+cuAP9szGUGPI1HwWVSvdzm7V4cCsPdFTx6qMj29CwaQmRAMIEhORIUBFBsYROYJcveK4uOjA==
   dependencies:
     aws-sign2 "~0.7.0"
     aws4 "^1.8.0"
@@ -1446,103 +1676,240 @@
     json-stringify-safe "~5.0.1"
     mime-types "~2.1.19"
     performance-now "^2.1.0"
-    qs "~6.5.2"
+    qs "~6.10.3"
     safe-buffer "^5.1.2"
-    tough-cookie "~2.5.0"
+    tough-cookie "^4.1.3"
     tunnel-agent "^0.6.0"
     uuid "^8.3.2"
 
 "@cypress/schematic@^1.5.0":
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/@cypress/schematic/-/schematic-1.6.0.tgz#7178702e94ec717b7ffc6b18b4d9ff7cd8a48d44"
-  integrity sha512-ENHceK21AANBCthaiQ4gJGEvHsqJ9wS3b9PjnlD4MKOMzqwU/WMrJAs/Xnxa6PGh3btB2w0xNN+0beeaf0KiCA==
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/@cypress/schematic/-/schematic-1.7.0.tgz"
+  integrity sha512-CouQrVlZ+uHVVBQtmNoMYU9LyoSAmQTOLDpVjrdTdMPpJH1mWnHCL5OCMt+FZLR+43KRiWEvDUjNqSza11oGsQ==
   dependencies:
     "@angular-devkit/architect" "^0.1202.10"
-    "@angular-devkit/core" "^12.2.10"
-    "@angular-devkit/schematics" "^12.2.10"
-    "@schematics/angular" "^12.2.10"
+    "@angular-devkit/core" "^12.2.17"
+    "@angular-devkit/schematics" "^12.2.17"
+    "@schematics/angular" "^12.2.17"
     jsonc-parser "^3.0.0"
     rxjs "~6.6.0"
 
 "@cypress/xvfb@^1.2.4":
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@cypress/xvfb/-/xvfb-1.2.4.tgz#2daf42e8275b39f4aa53c14214e557bd14e7748a"
+  resolved "https://registry.npmjs.org/@cypress/xvfb/-/xvfb-1.2.4.tgz"
   integrity sha512-skbBzPggOVYCbnGgV+0dmBdW/s77ZkAOXIC1knS8NagwDjBrNC1LuXtQJeiN6l+m7lzmHtaoUw/ctJKdqkG57Q==
   dependencies:
     debug "^3.1.0"
     lodash.once "^4.1.1"
 
-"@discoveryjs/json-ext@0.5.6", "@discoveryjs/json-ext@^0.5.0":
-  version "0.5.6"
-  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.6.tgz#d5e0706cf8c6acd8c6032f8d54070af261bbbb2f"
-  integrity sha512-ws57AidsDvREKrZKYffXddNkyaF14iHNHm8VQnZH6t99E8gczjNN0GpvcGny0imC80yQ0tHz1xVUKk/KFQSUyA==
+"@discoveryjs/json-ext@0.5.7", "@discoveryjs/json-ext@^0.5.0":
+  version "0.5.7"
+  resolved "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
+  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
 
 "@edsilv/http-status-codes@^1.0.3":
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz#a1b767c552ac43f2983ab2b9ee20e9c73b79960b"
+  resolved "https://registry.npmjs.org/@edsilv/http-status-codes/-/http-status-codes-1.0.3.tgz"
   integrity sha512-HLK2FS5sZqxPqD53D6hhZxC6C8THTVwlyZDZ7J0iWsrB8JmMA69m/CQuNKZc1kki9WSVeck2fXna26NL0SE7cg==
 
 "@emotion/hash@^0.8.0":
   version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@emotion/hash/-/hash-0.8.0.tgz#bbbff68978fefdbe68ccb533bc8cbe1d1afb5413"
+  resolved "https://registry.npmjs.org/@emotion/hash/-/hash-0.8.0.tgz"
   integrity sha512-kBJtf7PH6aWwZ6fka3zQ0p6SBYzx4fl1LoZXE2RrnYST9Xljm7WfKJrU4g/Xr3Beg72MLrp1AWNUmuYJTL7Cow==
 
-"@es-joy/jsdoccomment@~0.22.1":
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.22.1.tgz#3c86d458780231769215a795105bd3b03b2616f2"
-  integrity sha512-/WMkqLYfwCf0waCAMC8Eddt3iAOdghkDF5vmyKEu8pfO66KRFY1L15yks8mfgURiwOAOJpAQ3blvB3Znj6ZwBw==
+"@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 "~2.2.5"
+    esquery "^1.5.0"
+    jsdoc-type-pratt-parser "~4.0.0"
 
-"@eslint/eslintrc@^1.2.1":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6"
-  integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ==
+"@esbuild/android-arm64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.17.8.tgz#b3d5b65a3b2e073a6c7ee36b1f3c30c8f000315b"
+  integrity sha512-oa/N5j6v1svZQs7EIRPqR8f+Bf8g6HBDjD/xHC02radE/NjKHK7oQmtmLxPs1iVwYyvE+Kolo6lbpfEQ9xnhxQ==
+
+"@esbuild/android-arm@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-arm/-/android-arm-0.17.8.tgz#c41e496af541e175369d48164d0cf01a5f656cf6"
+  integrity sha512-0/rb91GYKhrtbeglJXOhAv9RuYimgI8h623TplY2X+vA4EXnk3Zj1fXZreJ0J3OJJu1bwmb0W7g+2cT/d8/l/w==
+
+"@esbuild/android-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/android-x64/-/android-x64-0.17.8.tgz#080fa67c29be77f5a3ca5ee4cc78d5bf927e3a3b"
+  integrity sha512-bTliMLqD7pTOoPg4zZkXqCDuzIUguEWLpeqkNfC41ODBHwoUgZ2w5JBeYimv4oP6TDVocoYmEhZrCLQTrH89bg==
+
+"@esbuild/darwin-arm64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/darwin-arm64/-/darwin-arm64-0.17.8.tgz#053622bf9a82f43d5c075b7818e02618f7b4a397"
+  integrity sha512-ghAbV3ia2zybEefXRRm7+lx8J/rnupZT0gp9CaGy/3iolEXkJ6LYRq4IpQVI9zR97ID80KJVoUlo3LSeA/sMAg==
+
+"@esbuild/darwin-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.8.tgz"
+  integrity sha512-n5WOpyvZ9TIdv2V1K3/iIkkJeKmUpKaCTdun9buhGRWfH//osmUjlv4Z5mmWdPWind/VGcVxTHtLfLCOohsOXw==
+
+"@esbuild/freebsd-arm64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.8.tgz#e6738d0081ba0721a5c6c674e84c6e7fcea61989"
+  integrity sha512-a/SATTaOhPIPFWvHZDoZYgxaZRVHn0/LX1fHLGfZ6C13JqFUZ3K6SMD6/HCtwOQ8HnsNaEeokdiDSFLuizqv5A==
+
+"@esbuild/freebsd-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/freebsd-x64/-/freebsd-x64-0.17.8.tgz#1855e562f2b730f4483f6e94086e9e2597feb4c3"
+  integrity sha512-xpFJb08dfXr5+rZc4E+ooZmayBW6R3q59daCpKZ/cDU96/kvDM+vkYzNeTJCGd8rtO6fHWMq5Rcv/1cY6p6/0Q==
+
+"@esbuild/linux-arm64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm64/-/linux-arm64-0.17.8.tgz#481da38952721a3fdb77c17a36ceaacc4270b5c5"
+  integrity sha512-v3iwDQuDljLTxpsqQDl3fl/yihjPAyOguxuloON9kFHYwopeJEf1BkDXODzYyXEI19gisEsQlG1bM65YqKSIww==
+
+"@esbuild/linux-arm@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-arm/-/linux-arm-0.17.8.tgz#18127072b270bb6321c6d11be20bfd30e0d6ad17"
+  integrity sha512-6Ij8gfuGszcEwZpi5jQIJCVIACLS8Tz2chnEBfYjlmMzVsfqBP1iGmHQPp7JSnZg5xxK9tjCc+pJ2WtAmPRFVA==
+
+"@esbuild/linux-ia32@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ia32/-/linux-ia32-0.17.8.tgz#ee400af7b3bc69e8ca2e593ca35156ffb9abd54f"
+  integrity sha512-8svILYKhE5XetuFk/B6raFYIyIqydQi+GngEXJgdPdI7OMKUbSd7uzR02wSY4kb53xBrClLkhH4Xs8P61Q2BaA==
+
+"@esbuild/linux-loong64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-loong64/-/linux-loong64-0.17.8.tgz#8c509d8a454693d39824b83b3f66c400872fce82"
+  integrity sha512-B6FyMeRJeV0NpyEOYlm5qtQfxbdlgmiGdD+QsipzKfFky0K5HW5Td6dyK3L3ypu1eY4kOmo7wW0o94SBqlqBSA==
+
+"@esbuild/linux-mips64el@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-mips64el/-/linux-mips64el-0.17.8.tgz#f2b0d36e63fb26bc3f95b203b6a80638292101ca"
+  integrity sha512-CCb67RKahNobjm/eeEqeD/oJfJlrWyw29fgiyB6vcgyq97YAf3gCOuP6qMShYSPXgnlZe/i4a8WFHBw6N8bYAA==
+
+"@esbuild/linux-ppc64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-ppc64/-/linux-ppc64-0.17.8.tgz#1e628be003e036e90423716028cc884fe5ba25bd"
+  integrity sha512-bytLJOi55y55+mGSdgwZ5qBm0K9WOCh0rx+vavVPx+gqLLhxtSFU0XbeYy/dsAAD6xECGEv4IQeFILaSS2auXw==
+
+"@esbuild/linux-riscv64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-riscv64/-/linux-riscv64-0.17.8.tgz#419a815cb4c3fb9f1b78ef5295f5b48b8bf6427a"
+  integrity sha512-2YpRyQJmKVBEHSBLa8kBAtbhucaclb6ex4wchfY0Tj3Kg39kpjeJ9vhRU7x4mUpq8ISLXRXH1L0dBYjAeqzZAw==
+
+"@esbuild/linux-s390x@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-s390x/-/linux-s390x-0.17.8.tgz#291c49ae5c3d11d226352755c0835911fe1a9e5c"
+  integrity sha512-QgbNY/V3IFXvNf11SS6exkpVcX0LJcob+0RWCgV9OiDAmVElnxciHIisoSix9uzYzScPmS6dJFbZULdSAEkQVw==
+
+"@esbuild/linux-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/linux-x64/-/linux-x64-0.17.8.tgz#03199d91c76faf80bd54104f5cbf0a489bc39f6a"
+  integrity sha512-mM/9S0SbAFDBc4OPoyP6SEOo5324LpUxdpeIUUSrSTOfhHU9hEfqRngmKgqILqwx/0DVJBzeNW7HmLEWp9vcOA==
+
+"@esbuild/netbsd-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/netbsd-x64/-/netbsd-x64-0.17.8.tgz#b436d767e1b21852f9ed212e2bb57f77203b0ae2"
+  integrity sha512-eKUYcWaWTaYr9zbj8GertdVtlt1DTS1gNBWov+iQfWuWyuu59YN6gSEJvFzC5ESJ4kMcKR0uqWThKUn5o8We6Q==
+
+"@esbuild/openbsd-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/openbsd-x64/-/openbsd-x64-0.17.8.tgz#d1481d8539e21d4729cd04a0450a26c2c8789e89"
+  integrity sha512-Vc9J4dXOboDyMXKD0eCeW0SIeEzr8K9oTHJU+Ci1mZc5njPfhKAqkRt3B/fUNU7dP+mRyralPu8QUkiaQn7iIg==
+
+"@esbuild/sunos-x64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/sunos-x64/-/sunos-x64-0.17.8.tgz#2cfb8126e079b2c00fd1bf095541e9f5c47877e4"
+  integrity sha512-0xvOTNuPXI7ft1LYUgiaXtpCEjp90RuBBYovdd2lqAFxje4sEucurg30M1WIm03+3jxByd3mfo+VUmPtRSVuOw==
+
+"@esbuild/win32-arm64@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-arm64/-/win32-arm64-0.17.8.tgz#7c6ecfd097ca23b82119753bf7072bbaefe51e3a"
+  integrity sha512-G0JQwUI5WdEFEnYNKzklxtBheCPkuDdu1YrtRrjuQv30WsYbkkoixKxLLv8qhJmNI+ATEWquZe/N0d0rpr55Mg==
+
+"@esbuild/win32-ia32@0.17.8":
+  version "0.17.8"
+  resolved "https://registry.yarnpkg.com/@esbuild/win32-ia32/-/win32-ia32-0.17.8.tgz#cffec63c3cb0ef8563a04df4e09fa71056171d00"
+  integrity sha512-Fqy63515xl20OHGFykjJsMnoIWS+38fqfg88ClvPXyDbLtgXal2DTlhb1TfTX34qWi3u4I7Cq563QcHpqgLx8w==
+
+"@esbuild/win32-x64@0.17.8":
+  version "0.17.8"
+  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==
+  dependencies:
+    eslint-visitor-keys "^3.3.0"
+
+"@eslint-community/regexpp@^4.4.0":
+  version "4.5.0"
+  resolved "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.5.0.tgz"
+  integrity sha512-vITaYzIcNmjn5tF5uxcZ/ft7/RXGrMUIS9HalWckEOF6ESiwXKoMzAQf2UW0aVd6rnOeExTJVd5hmWXucBKGXQ==
+
+"@eslint/eslintrc@^2.0.2":
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.0.2.tgz"
+  integrity sha512-3W4f5tDUra+pA+FzgugqL2pRimUTDJWKr7BINqOpkZrC0uYI0NIc0/JFgBROCU07HR6GieA5m3/rsPIhDmCXTQ==
   dependencies:
     ajv "^6.12.4"
     debug "^4.3.2"
-    espree "^9.3.1"
-    globals "^13.9.0"
+    espree "^9.5.1"
+    globals "^13.19.0"
     ignore "^5.2.0"
     import-fresh "^3.2.1"
     js-yaml "^4.1.0"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@fortawesome/fontawesome-free@^5.5.0":
-  version "5.15.4"
-  resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.15.4.tgz#ecda5712b61ac852c760d8b3c79c96adca5554e5"
-  integrity sha512-eYm8vijH/hpzr/6/1CJ/V/Eb1xQFW2nnUKArb3z+yUWv7HTwj6M7SP957oMjfZjAHU6qpoNc2wQvIxBLWYa/Jg==
+"@eslint/js@8.39.0":
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.39.0.tgz#58b536bcc843f4cd1e02a7e6171da5c040f4d44b"
+  integrity sha512-kf9RB0Fg7NZfap83B3QOqOGg9QmD9yBudqQXzzOtn3i4y7ZUXe5ONeW34Gwi+TxhH4mvj72R1Zc300KUMa9Bng==
 
-"@gar/promisify@^1.0.1":
+"@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.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==
+
+"@gar/promisify@^1.0.1", "@gar/promisify@^1.1.3":
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
+  resolved "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz"
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
-"@humanwhocodes/config-array@^0.9.2":
-  version "0.9.5"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7"
-  integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw==
+"@humanwhocodes/config-array@^0.11.8":
+  version "0.11.8"
+  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.8.tgz"
+  integrity sha512-UybHIJzJnR5Qc/MsD9Kr+RpO2h+/P1GhOwdiLPXK5TWk5sgTdu88bTD9UP+CKbPPh5Rni1u0GjAdYQLemG8g+g==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.1"
     debug "^4.1.1"
-    minimatch "^3.0.4"
+    minimatch "^3.0.5"
+
+"@humanwhocodes/module-importer@^1.0.1":
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz"
+  integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
 "@humanwhocodes/object-schema@^1.2.1":
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
+  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
-"@iiif/vocabulary@^1.0.20":
-  version "1.0.22"
-  resolved "https://registry.yarnpkg.com/@iiif/vocabulary/-/vocabulary-1.0.22.tgz#743d6cb1914e090137c56a4e44decbe7f8b21bdc"
-  integrity sha512-KOIZgRpDERMK4YGeSwPBNjpJETapMWp8pvEvSGUQkuTlqkiNLirZH65CIcEENZEL5A6mxrYLJX6okDYq7W1+RA==
+"@iiif/vocabulary@^1.0.26":
+  version "1.0.26"
+  resolved "https://registry.npmjs.org/@iiif/vocabulary/-/vocabulary-1.0.26.tgz"
+  integrity sha512-yOsMDg5C90iMfD5HSydoTDzmOM/ki5zGiu4DbHpzRueM7D+12IcDHeai2A8QvEroS8HCJl5M1Edbju5rOlPIpg==
 
 "@istanbuljs/load-nyc-config@^1.0.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz#fd3db1d59ecf7cf121e80650bb86712f9b55eced"
+  resolved "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz"
   integrity sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==
   dependencies:
     camelcase "^5.3.1"
@@ -1553,44 +1920,84 @@
 
 "@istanbuljs/schema@^0.1.2":
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
+  resolved "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
-"@jridgewell/resolve-uri@^3.0.3":
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz#68eb521368db76d040a6315cdb24bf2483037b9c"
-  integrity sha512-VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew==
-
-"@jridgewell/sourcemap-codec@^1.4.10":
-  version "1.4.11"
-  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.11.tgz#771a1d8d744eeb71b6adb35808e1a6c7b9b8c8ec"
-  integrity sha512-Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg==
-
-"@jridgewell/trace-mapping@^0.3.0":
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz#f6a0832dffd5b8a6aaa633b7d9f8e8e94c83a0c3"
-  integrity sha512-vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ==
+"@jridgewell/gen-mapping@^0.1.0":
+  version "0.1.1"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"
+  integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w==
   dependencies:
-    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/set-array" "^1.0.0"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
+"@jridgewell/gen-mapping@^0.3.0", "@jridgewell/gen-mapping@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.0", "@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.3.tgz"
+  integrity sha512-b+fsZXeLYi9fEULmfBrhxn4IrPlINf8fiNarzTof004v3lFdntdwa9PF7vFJqm3mg7s+ScJMxXaE3Acp1irZcg==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@1.4.14":
+  version "1.4.14"
+  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.15":
+  version "1.4.15"
+  resolved "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.18"
+  resolved "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.18.tgz"
+  integrity sha512-w+niJYzMHdd7USdiH2U6869nqhD2nbfZXND5Yp93qIbEmnDNk7PD48o+YchRVpzMU7M6jVCbenTR7PA1FLQ9pA==
+  dependencies:
+    "@jridgewell/resolve-uri" "3.1.0"
+    "@jridgewell/sourcemap-codec" "1.4.14"
+
 "@kolkov/ngx-gallery@^2.0.1":
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@kolkov/ngx-gallery/-/ngx-gallery-2.0.1.tgz#6c7903b4fc4719b093ef8a782aff731fe38ea320"
+  resolved "https://registry.npmjs.org/@kolkov/ngx-gallery/-/ngx-gallery-2.0.1.tgz"
   integrity sha512-mTigRy9Ha7bqCF/+GNKeW2Oe8ZILuM5GGMw+ZbvTQWq3X5hngeFFgv8GFG49Py3biX67kb0NhqCP+msLe4wbXQ==
   dependencies:
     tslib "^2.3.0"
 
+"@leichtgewicht/ip-codec@^2.0.1":
+  version "2.0.4"
+  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":
-  version "4.12.3"
-  resolved "https://registry.yarnpkg.com/@material-ui/core/-/core-4.12.3.tgz#80d665caf0f1f034e52355c5450c0e38b099d3ca"
-  integrity sha512-sdpgI/PL56QVsEJldwEe4FFaFTLUqN+rd7sSZiRCdx2E/C7z5yK0y/khAWVBH24tXwto7I1hCzNWfJGZIYJKnw==
+  version "4.12.4"
+  resolved "https://registry.npmjs.org/@material-ui/core/-/core-4.12.4.tgz"
+  integrity sha512-tr7xekNlM9LjA6pagJmL8QCgZXaubWUwkJnoYcMKd4gw/t4XiyvnTkjdGrUVicyB2BsdaAv1tvow45bPM4sSwQ==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/styles" "^4.11.4"
-    "@material-ui/system" "^4.12.1"
+    "@material-ui/styles" "^4.11.5"
+    "@material-ui/system" "^4.12.2"
     "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     "@types/react-transition-group" "^4.2.0"
     clsx "^1.0.4"
     hoist-non-react-statics "^3.3.2"
@@ -1599,33 +2006,33 @@
     react-is "^16.8.0 || ^17.0.0"
     react-transition-group "^4.4.0"
 
-"@material-ui/icons@^4.9.1":
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.2.tgz#b3a7353266519cd743b6461ae9fdfcb1b25eb4c5"
-  integrity sha512-fQNsKX2TxBmqIGJCSi3tGTO/gZ+eJgWmMJkgDiOfyNaunNaxcklJQFaFogYcFl0qFuaEz1qaXYXboa/bUXVSOQ==
+"@material-ui/icons@^4.11.3", "@material-ui/icons@^4.9.1":
+  version "4.11.3"
+  resolved "https://registry.yarnpkg.com/@material-ui/icons/-/icons-4.11.3.tgz#b0693709f9b161ce9ccde276a770d968484ecff1"
+  integrity sha512-IKHlyx6LDh8n19vzwH5RtHIOHl9Tu90aAAxcbWME6kp4dmvODM3UvOHJeMIDzUbd4muuJKHmlNoBN+mDY4XkBA==
   dependencies:
     "@babel/runtime" "^7.4.4"
 
 "@material-ui/lab@^4.0.0-alpha.53":
-  version "4.0.0-alpha.60"
-  resolved "https://registry.yarnpkg.com/@material-ui/lab/-/lab-4.0.0-alpha.60.tgz#5ad203aed5a8569b0f1753945a21a05efa2234d2"
-  integrity sha512-fadlYsPJF+0fx2lRuyqAuJj7hAS1tLDdIEEdov5jlrpb5pp4b+mRDUqQTUxi4inRZHS1bEXpU8QWUhO6xX88aA==
+  version "4.0.0-alpha.61"
+  resolved "https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz"
+  integrity sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     clsx "^1.0.4"
     prop-types "^15.7.2"
     react-is "^16.8.0 || ^17.0.0"
 
-"@material-ui/styles@^4.11.4":
-  version "4.11.4"
-  resolved "https://registry.yarnpkg.com/@material-ui/styles/-/styles-4.11.4.tgz#eb9dfccfcc2d208243d986457dff025497afa00d"
-  integrity sha512-KNTIZcnj/zprG5LW0Sao7zw+yG3O35pviHzejMdcSGCdWbiO8qzRgOYL8JAxAsWBKOKYwVZxXtHWaB5T2Kvxew==
+"@material-ui/styles@^4.11.5":
+  version "4.11.5"
+  resolved "https://registry.npmjs.org/@material-ui/styles/-/styles-4.11.5.tgz"
+  integrity sha512-o/41ot5JJiUsIETME9wVLAJrmIWL3j0R0Bj2kCOLbSfqEkKf0fmaPt+5vtblUh5eXr2S+J/8J3DaCb10+CzPGA==
   dependencies:
     "@babel/runtime" "^7.4.4"
     "@emotion/hash" "^0.8.0"
     "@material-ui/types" "5.1.0"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     clsx "^1.0.4"
     csstype "^2.5.2"
     hoist-non-react-statics "^3.3.2"
@@ -1639,133 +2046,140 @@
     jss-plugin-vendor-prefixer "^10.5.1"
     prop-types "^15.7.2"
 
-"@material-ui/system@^4.12.1":
-  version "4.12.1"
-  resolved "https://registry.yarnpkg.com/@material-ui/system/-/system-4.12.1.tgz#2dd96c243f8c0a331b2bb6d46efd7771a399707c"
-  integrity sha512-lUdzs4q9kEXZGhbN7BptyiS1rLNHe6kG9o8Y307HCvF4sQxbCgpL2qi+gUk+yI8a2DNk48gISEQxoxpgph0xIw==
+"@material-ui/system@^4.12.2":
+  version "4.12.2"
+  resolved "https://registry.npmjs.org/@material-ui/system/-/system-4.12.2.tgz"
+  integrity sha512-6CSKu2MtmiJgcCGf6nBQpM8fLkuB9F55EKfbdTC80NND5wpTmKzwdhLYLH3zL4cLlK0gVaaltW7/wMuyTnN0Lw==
   dependencies:
     "@babel/runtime" "^7.4.4"
-    "@material-ui/utils" "^4.11.2"
+    "@material-ui/utils" "^4.11.3"
     csstype "^2.5.2"
     prop-types "^15.7.2"
 
 "@material-ui/types@5.1.0":
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/@material-ui/types/-/types-5.1.0.tgz#efa1c7a0b0eaa4c7c87ac0390445f0f88b0d88f2"
+  resolved "https://registry.npmjs.org/@material-ui/types/-/types-5.1.0.tgz"
   integrity sha512-7cqRjrY50b8QzRSYyhSpx4WRw2YuO0KKIGQEVk5J8uoz2BanawykgZGoWEqKm7pVIbzFDN0SpPcVV4IhOFkl8A==
 
-"@material-ui/utils@^4.11.2":
-  version "4.11.2"
-  resolved "https://registry.yarnpkg.com/@material-ui/utils/-/utils-4.11.2.tgz#f1aefa7e7dff2ebcb97d31de51aecab1bb57540a"
-  integrity sha512-Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA==
+"@material-ui/utils@^4.11.3":
+  version "4.11.3"
+  resolved "https://registry.npmjs.org/@material-ui/utils/-/utils-4.11.3.tgz"
+  integrity sha512-ZuQPV4rBK/V1j2dIkSSEcH5uT6AaHuKWFfotADHsC0wVL1NLd2WkFCm4ZZbX33iO4ydl6V0GPngKm8HZQ2oujg==
   dependencies:
     "@babel/runtime" "^7.4.4"
     prop-types "^15.7.2"
     react-is "^16.8.0 || ^17.0.0"
 
 "@ng-bootstrap/ng-bootstrap@^11.0.0":
-  version "11.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.0.tgz#16855620bff7ab7b965d4f49907c44b0f5bd5020"
-  integrity sha512-qDnB0+jbpQ4wjXpM4NPRAtwmgTDUCjGavoeRDZHOvFfYvx/MBf1RTjZEqTJ1Yqq1pKP4BWpzxCgVTunfnpmsjA==
+  version "11.0.1"
+  resolved "https://registry.npmjs.org/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-11.0.1.tgz"
+  integrity sha512-xpXpW2x2S9ZQhEu5kCmEAFf8WvkVD+rcKb1NLQiLuiZgAQR7GXVexXy5Y+RIvTjAQmPEVyxaSgYiJA6sWNJLNw==
   dependencies:
     tslib "^2.3.0"
 
 "@ng-dynamic-forms/core@^15.0.0":
   version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-15.0.0.tgz#674a88c253aa100b30144bf7ebf518e24b72f553"
+  resolved "https://registry.npmjs.org/@ng-dynamic-forms/core/-/core-15.0.0.tgz"
   integrity sha512-JJ0w8WdOA+wsHyt/hwitGhv/e1j95/TlRS82vvZetP/Ip3kjvD/Ge8jbg4bEssIAXZjfBqS/Gy00Hxo4h57DgQ==
   dependencies:
     tslib "^2.0.0"
 
 "@ng-dynamic-forms/ui-ng-bootstrap@^15.0.0":
   version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-15.0.0.tgz#0ab5614bc2efccc4cddbb384865b66d4740bcd3d"
+  resolved "https://registry.npmjs.org/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-15.0.0.tgz"
   integrity sha512-b/+tOJxtDRMzoFA7KLA8JRxbAnXd8d8072/P6C+2xOMaG0Ttc1UUiNQOZ5w82y78nr0bZ63oFHSR0xzSVtMXnA==
   dependencies:
     tslib "^2.0.0"
 
-"@ngrx/effects@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-13.0.2.tgz#785e54459efaef70ed3754a33d9f4ddd0ff9f033"
-  integrity sha512-7yW/KCxlRatDkdEriSnORlOYX8+1QAWEjPulNmHSPwehkzTQ3fIPfRBQy8xP8bnjwvGxnEZNwQlU4q1KVYOfhg==
+"@ngrx/effects@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.npmjs.org/@ngrx/effects/-/effects-15.4.0.tgz"
+  integrity sha512-/8gHhOM9aeGaw8OG2LLwi4I4p84xzG0EU9TqWrvQcW74wn8sFZONjLvUte5YOzJ5502PPFFrfXSOc+lHnVAJUA==
   dependencies:
     tslib "^2.0.0"
 
-"@ngrx/router-store@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-13.0.2.tgz#e57084cd74071760378645417bba94805c8b4514"
-  integrity sha512-XrzHjrD2hhnXdGeIpQm/msN77hoAL/QD3ZYGFJs3yT5d3x/T3L1JFlra7wC0OlKJkOs6zAh5Kz9cJ94YO/TEtQ==
+"@ngrx/router-store@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.npmjs.org/@ngrx/router-store/-/router-store-15.4.0.tgz"
+  integrity sha512-uc8gx+SMr2gyly+WSBmGnpHTPsMVhenUG6skH3Qk67hrwdVG3SABjw3qdP4GibbfwwajMQ67sLaLY8PQZ5Sb2g==
   dependencies:
     tslib "^2.0.0"
 
-"@ngrx/store-devtools@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-13.0.2.tgz#2b412fe47894fbb0c2aec8c1402f150bc139d5e9"
-  integrity sha512-fcQ5A7cv9PONFvqlpFPXHswWjEflJvqrNt6wmywlxMtJDjkgzCHpvRiJqup/FiTosblRERoeZXN0oHW3Er3+rw==
+"@ngrx/store-devtools@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.npmjs.org/@ngrx/store-devtools/-/store-devtools-15.4.0.tgz"
+  integrity sha512-AqWRprSyS3u/vZlpsBOPMW1/0TZS2LE13/KpZedEY+RMCW+mi53esqgrdNGOB3Wr4vrI82Ar9fgaIm4TQO6LPg==
   dependencies:
     tslib "^2.0.0"
 
-"@ngrx/store@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-13.0.2.tgz#43f187956e07f33baed3e6215cd2fc59a06e9789"
-  integrity sha512-F7tsc3oCvKh+62MKiXTrvSeaxR41u4p8bch3BLjz12F37376rMuBnXf+V1thsPTZ6RB6aycAi821EQYVXFCXZg==
+"@ngrx/store@^15.4.0":
+  version "15.4.0"
+  resolved "https://registry.npmjs.org/@ngrx/store/-/store-15.4.0.tgz"
+  integrity sha512-OvCuNBHL8mAUnRTS6QSFm+IunspsYNu2cCwDovBNn7EGhxRuGihBeNoX47jCqWPHBFtokj4BlatDfpJ/yCh4xQ==
   dependencies:
     tslib "^2.0.0"
 
-"@ngtools/webpack@13.2.6", "@ngtools/webpack@^13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-13.2.6.tgz#8fe9c54dce13ec291eeef352ed773b77d1d0bed0"
-  integrity sha512-N8SvRV91+/57TcAfbghc0k0tKCukw/7KqbDaLPAQTGFekJ4xMGT3elMzOyBXTH3Hvp5HL8/hiBt2tG04qiMf+w==
+"@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==
 
-"@nguniversal/builders@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-13.0.2.tgz#735913203f800dbe108e9a07d9d9d5ded885be79"
-  integrity sha512-ydmR+JzZvhgFiqxOT5mIfCJH//LfFCaud6tPugvj/EHI+kVWFhEurR8wDHRMHGv2t+nYYtNFzTXt5EWGCMB/vA==
+"@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==
+
+"@nguniversal/builders@^15.2.1":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/builders/-/builders-15.2.1.tgz#0fe86d0f5af92910c728e44aa81620002857531b"
+  integrity sha512-6UbnJlgFv0KcEmYtw8lJ4B9DVpQcTyQd7vEpuvlOJ7RtcKwY+yUbmsEFnUusxM7y6NgZqiFDziAdJ796agySTQ==
   dependencies:
-    "@angular-devkit/architect" "^0.1301.0"
-    "@angular-devkit/core" "^13.1.0"
-    "@nguniversal/common" "13.0.2"
-    browser-sync "^2.26.7"
-    express "^4.17.1"
-    guess-parser "^0.4.12"
-    http-proxy-middleware "^2.0.0"
+    "@angular-devkit/architect" "~0.1502.0"
+    "@angular-devkit/core" "~15.2.0"
+    "@nguniversal/common" "15.2.1"
+    browser-sync "^2.27.10"
+    express "^4.18.2"
+    guess-parser "^0.4.22"
+    http-proxy-middleware "^2.0.6"
     ora "^5.1.0"
-    piscina "~3.1.0"
+    piscina "~3.2.0"
     rxjs "^6.5.5"
     tree-kill "^1.2.2"
 
-"@nguniversal/common@13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-13.0.2.tgz#a7923b9c3c3d469d4e1bb6804ac2f64f11251f28"
-  integrity sha512-HtjtPFmz/GhW2TnvxqdFdewL5NpTXYBA51U7RUjJtLs78xsW4rG3kfZEG20y6E3xn+++B0jJMfAx6Q+2cuRdig==
+"@nguniversal/common@15.2.1":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/common/-/common-15.2.1.tgz#6e3f6b3f46394c02e20a93f7721bcd660810c1a7"
+  integrity sha512-1m/YFx5FLJAm/ll7YZfUTFGPqsOaHkhwEv8aHIp8oc1CWf6K+agrfLIwzY39n18T3J0lrCL/8/9vR1tnId3A9g==
   dependencies:
     critters "0.0.16"
-    jsdom "19.0.0"
+    jsdom "21.1.0"
     tslib "^2.3.0"
 
-"@nguniversal/express-engine@^13.0.2":
-  version "13.0.2"
-  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-13.0.2.tgz#cf9483a13fc81380569286af3bab938a9cdc3ce4"
-  integrity sha512-4CUBAYeatF8hl01hNdt372ANHjFFuaZ8rAYX64LWJSrlnt5a33NAbbHzMnAESbeo4LOkdG0XFQPB9IGG1MN5qw==
+"@nguniversal/express-engine@^15.2.1":
+  version "15.2.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-15.2.1.tgz#4c99b77cc690e44aa6f25ea857838590c71e8237"
+  integrity sha512-LHQfntApCGvKREJ0MvhioM1TdWnYxqnYRgX3JoWaNVFPdVryhWLPv4RCjqV8QiMe5DQKd6Pc5J+VIhYX5hwjPQ==
   dependencies:
-    "@nguniversal/common" "13.0.2"
+    "@nguniversal/common" "15.2.1"
     tslib "^2.3.0"
 
-"@ngx-translate/core@^13.0.0":
-  version "13.0.0"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-13.0.0.tgz#60547cb8a0845a2a0abfde6b0bf5ec6516a63fd6"
-  integrity sha512-+tzEp8wlqEnw0Gc7jtVRAJ6RteUjXw6JJR4O65KlnxOmJrCGPI0xjV/lKRnQeU0w4i96PQs/jtpL921Wrb7PWg==
+"@ngx-translate/core@^14.0.0":
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-14.0.0.tgz#af421d0e1a28376843f0fed375cd2fae7630a5ff"
+  integrity sha512-UevdwNCXMRCdJv//0kC8h2eSfmi02r29xeE8E9gJ1Al4D4jEJ7eiLPdjslTMc21oJNGguqqWeEVjf64SFtvw2w==
   dependencies:
-    tslib "^2.0.0"
+    tslib "^2.3.0"
 
-"@nicky-lenaers/ngx-scroll-to@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@nicky-lenaers/ngx-scroll-to/-/ngx-scroll-to-9.0.0.tgz#c8b455e9968a6116323862d081762880f3492efc"
-  integrity sha512-eS0vyx8qX4UTMluRYc+sQF/vJHCnAKiufWrwQRme0VURwp+RdOoZDZpYrOPTxPfx6CVj72arTeV9auDYa0WKtA==
+"@nicky-lenaers/ngx-scroll-to@^14.0.0":
+  version "14.0.0"
+  resolved "https://registry.yarnpkg.com/@nicky-lenaers/ngx-scroll-to/-/ngx-scroll-to-14.0.0.tgz#178cb2c1781dd565841d940e1a678d6eda0796fc"
+  integrity sha512-nORagPmAQYDjB5jyQ3awGhbnKTKVARZUCK8FJIe46XjPQX2CI9+WBYvsdqq0CsNWVzCjhnC0Om6krzjOTrTHYQ==
+  dependencies:
+    tslib "^2.3.0"
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
   integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
@@ -1773,12 +2187,12 @@
 
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
-"@nodelib/fs.walk@^1.2.3":
+"@nodelib/fs.walk@^1.2.3", "@nodelib/fs.walk@^1.2.8":
   version "1.2.8"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
@@ -1786,365 +2200,255 @@
 
 "@npmcli/fs@^1.0.0":
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@npmcli/fs/-/fs-1.1.1.tgz#72f719fe935e687c56a4faecf3c03d06ba593257"
+  resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz"
   integrity sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==
   dependencies:
     "@gar/promisify" "^1.0.1"
     semver "^7.3.5"
 
-"@npmcli/git@^2.1.0":
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
-  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
+"@npmcli/fs@^2.1.0":
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz"
+  integrity sha512-yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==
   dependencies:
-    "@npmcli/promise-spawn" "^1.3.2"
-    lru-cache "^6.0.0"
-    mkdirp "^1.0.4"
-    npm-pick-manifest "^6.1.1"
+    "@gar/promisify" "^1.1.3"
+    semver "^7.3.5"
+
+"@npmcli/fs@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.0.tgz"
+  integrity sha512-7kZUAaLscfgbwBQRbvdMYaZOWyMEcPTH/tJjnyAWJ/dvvs9Ef+CERx/qJb9GExJpl1qipaDGn7KqHnFGGixd0w==
+  dependencies:
+    semver "^7.3.5"
+
+"@npmcli/git@^4.0.0":
+  version "4.0.4"
+  resolved "https://registry.npmjs.org/@npmcli/git/-/git-4.0.4.tgz"
+  integrity sha512-5yZghx+u5M47LghaybLCkdSyFzV/w4OuH12d96HO389Ik9CDsLaDZJVynSGGVJOLn6gy/k7Dz5XYcplM3uxXRg==
+  dependencies:
+    "@npmcli/promise-spawn" "^6.0.0"
+    lru-cache "^7.4.4"
+    npm-pick-manifest "^8.0.0"
+    proc-log "^3.0.0"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
     semver "^7.3.5"
-    which "^2.0.2"
+    which "^3.0.0"
 
-"@npmcli/installed-package-contents@^1.0.6":
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/@npmcli/installed-package-contents/-/installed-package-contents-1.0.7.tgz#ab7408c6147911b970a8abe261ce512232a3f4fa"
-  integrity sha512-9rufe0wnJusCQoLpV9ZPKIVP55itrM5BxOXs10DmdbRfgWtHy1LDyskbwRnBghuB0PrF7pNPOqREVtpz4HqzKw==
+"@npmcli/installed-package-contents@^2.0.1":
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.0.2.tgz"
+  integrity sha512-xACzLPhnfD51GKvTOOuNX2/V4G4mz9/1I2MfDoye9kBM3RYe5g2YbscsaGoTlaWqkxeiapBWyseULVKpSVHtKQ==
   dependencies:
-    npm-bundled "^1.1.1"
-    npm-normalize-package-bin "^1.0.1"
+    npm-bundled "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
 
 "@npmcli/move-file@^1.0.1":
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/move-file/-/move-file-1.1.2.tgz#1a82c3e372f7cae9253eb66d72543d6b8685c674"
+  resolved "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz"
   integrity sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==
   dependencies:
     mkdirp "^1.0.4"
     rimraf "^3.0.2"
 
-"@npmcli/node-gyp@^1.0.2":
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.3.tgz#a912e637418ffc5f2db375e93b85837691a43a33"
-  integrity sha512-fnkhw+fmX65kiLqk6E3BFLXNC26rUhK90zVwe2yncPliVT/Qos3xjhTLE59Df8KnPlcwIERXKVlU1bXoUQ+liA==
-
-"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz#42d4e56a8e9274fba180dabc0aea6e38f29274f5"
-  integrity sha512-QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg==
+"@npmcli/move-file@^2.0.0":
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz"
+  integrity sha512-mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==
   dependencies:
-    infer-owner "^1.0.4"
+    mkdirp "^1.0.4"
+    rimraf "^3.0.2"
 
-"@npmcli/run-script@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-2.0.0.tgz#9949c0cab415b17aaac279646db4f027d6f1e743"
-  integrity sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==
-  dependencies:
-    "@npmcli/node-gyp" "^1.0.2"
-    "@npmcli/promise-spawn" "^1.3.2"
-    node-gyp "^8.2.0"
-    read-package-json-fast "^2.0.1"
+"@npmcli/node-gyp@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz"
+  integrity sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==
 
-"@nrwl/cli@*", "@nrwl/cli@13.9.4":
-  version "13.9.4"
-  resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-13.9.4.tgz#bba8d1592191a2296223f42f61078f7ed197051e"
-  integrity sha512-jseYnaaifBpBCnj1ERFnOA9vfXOd3AciGgYTy8OdygMqLf1suUAjUEVIh6hlmtvMQojNezTT4a3eaIHz9lQDKA==
+"@npmcli/promise-spawn@^6.0.0", "@npmcli/promise-spawn@^6.0.1":
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-6.0.2.tgz"
+  integrity sha512-gGq0NJkIGSwdbUt4yhdF8ZrmkGKVz9vAdVzpOfnom+V8PLSmSOVhZwbNvZZS1EYcJN5hzzKBxmmVVAInM6HQLg==
   dependencies:
-    nx "13.9.4"
+    which "^3.0.0"
 
-"@nrwl/devkit@13.1.3":
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/devkit/-/devkit-13.1.3.tgz#8b119587984371a4caf0b3601a7481e04bac65a3"
-  integrity sha512-TAAsZJvVc/obeH0rZKY6miVhyM2GHGb8qIWp9MAIdLlXf4VDcNC7rxwb5OrGVSwuTTjqGYBGPUx0yEogOOJthA==
+"@npmcli/run-script@^6.0.0":
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/@npmcli/run-script/-/run-script-6.0.0.tgz"
+  integrity sha512-ql+AbRur1TeOdl1FY+RAwGW9fcr4ZwiVKabdvm93mujGREVuVLbdkXRJDrkTXSdCjaxYydr1wlA2v67jxWG5BQ==
   dependencies:
-    "@nrwl/tao" "13.1.3"
-    ejs "^3.1.5"
-    ignore "^5.0.4"
-    rxjs "^6.5.4"
-    semver "7.3.4"
-    tslib "^2.0.0"
-
-"@nrwl/tao@13.1.3":
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-13.1.3.tgz#5a88029b0aa9dfd4bca0a86d3dde2b608c468b36"
-  integrity sha512-/IwJgSgCBD1SaF+n8RuXX2OxDAh8ut/+P8pMswjm8063ac30UlAHjQ4XTYyskLH8uoUmNi2hNaGgHUrkwt7tQA==
-  dependencies:
-    chalk "4.1.0"
-    enquirer "~2.3.6"
-    fs-extra "^9.1.0"
-    jsonc-parser "3.0.0"
-    nx "13.1.3"
-    rxjs "^6.5.4"
-    rxjs-for-await "0.0.2"
-    semver "7.3.4"
-    tmp "~0.2.1"
-    tslib "^2.0.0"
-    yargs-parser "20.0.0"
-
-"@nrwl/tao@13.9.4":
-  version "13.9.4"
-  resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-13.9.4.tgz#f589b3a8c0e4ebb43e6e0acf1cfa76e66e852225"
-  integrity sha512-haJbuUku0JNf81H+VtGpAEQ6V2muyZ96sqxmUfnUe5ZoTvAX/pjSlHQaCWZuLzH9YzFP8KkjQb/lUepeEvSaFw==
-  dependencies:
-    nx "13.9.4"
+    "@npmcli/node-gyp" "^3.0.0"
+    "@npmcli/promise-spawn" "^6.0.0"
+    node-gyp "^9.0.0"
+    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.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1"
+  resolved "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.21.tgz"
   integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==
 
 "@react-dnd/asap@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/asap/-/asap-4.0.0.tgz#b300eeed83e9801f51bd66b0337c9a6f04548651"
-  integrity sha512-0XhqJSc6pPoNnf8DhdsPHtUhRzZALVzYMTzRwV4VI6DJNJ/5xxfL9OQUwb8IH5/2x7lSf7nAZrnzUD+16VyOVQ==
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/@react-dnd/asap/-/asap-4.0.1.tgz"
+  integrity sha512-kLy0PJDDwvwwTXxqTFNAAllPHD73AycE9ypWeln/IguoGBEbvFcPDbCV03G52bEcC5E+YgupBE0VzHGdC8SIXg==
 
 "@react-dnd/invariant@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/invariant/-/invariant-2.0.0.tgz#09d2e81cd39e0e767d7da62df9325860f24e517e"
+  resolved "https://registry.npmjs.org/@react-dnd/invariant/-/invariant-2.0.0.tgz"
   integrity sha512-xL4RCQBCBDJ+GRwKTFhGUW8GXa4yoDfJrPbLblc3U09ciS+9ZJXJ3Qrcs/x2IODOdIE5kQxvMmE2UKyqUictUw==
 
 "@react-dnd/shallowequal@^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz#a3031eb54129f2c66b2753f8404266ec7bf67f0a"
+  resolved "https://registry.npmjs.org/@react-dnd/shallowequal/-/shallowequal-2.0.0.tgz"
   integrity sha512-Pc/AFTdwZwEKJxFJvlxrSmGe/di+aAOBn60sremrpLo6VI/6cmiUYNNwlI5KNYttg7uypzA3ILPMPgxB2GYZEg==
 
-"@redux-saga/core@^1.1.3":
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/@redux-saga/core/-/core-1.1.3.tgz#3085097b57a4ea8db5528d58673f20ce0950f6a4"
-  integrity sha512-8tInBftak8TPzE6X13ABmEtRJGjtK17w7VUs7qV17S8hCO5S3+aUTWZ/DBsBJPdE8Z5jOPwYALyvofgq1Ws+kg==
+"@redux-saga/core@^1.2.3":
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/@redux-saga/core/-/core-1.2.3.tgz"
+  integrity sha512-U1JO6ncFBAklFTwoQ3mjAeQZ6QGutsJzwNBjgVLSWDpZTRhobUzuVDS1qH3SKGJD8fvqoaYOjp6XJ3gCmeZWgA==
   dependencies:
     "@babel/runtime" "^7.6.3"
-    "@redux-saga/deferred" "^1.1.2"
-    "@redux-saga/delay-p" "^1.1.2"
-    "@redux-saga/is" "^1.1.2"
-    "@redux-saga/symbols" "^1.1.2"
-    "@redux-saga/types" "^1.1.0"
+    "@redux-saga/deferred" "^1.2.1"
+    "@redux-saga/delay-p" "^1.2.1"
+    "@redux-saga/is" "^1.1.3"
+    "@redux-saga/symbols" "^1.1.3"
+    "@redux-saga/types" "^1.2.1"
     redux "^4.0.4"
     typescript-tuple "^2.2.1"
 
-"@redux-saga/deferred@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/deferred/-/deferred-1.1.2.tgz#59937a0eba71fff289f1310233bc518117a71888"
-  integrity sha512-908rDLHFN2UUzt2jb4uOzj6afpjgJe3MjICaUNO3bvkV/kN/cNeI9PMr8BsFXB/MR8WTAZQq/PlTq8Kww3TBSQ==
+"@redux-saga/deferred@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@redux-saga/deferred/-/deferred-1.2.1.tgz"
+  integrity sha512-cmin3IuuzMdfQjA0lG4B+jX+9HdTgHZZ+6u3jRAOwGUxy77GSlTi4Qp2d6PM1PUoTmQUR5aijlA39scWWPF31g==
 
-"@redux-saga/delay-p@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/delay-p/-/delay-p-1.1.2.tgz#8f515f4b009b05b02a37a7c3d0ca9ddc157bb355"
-  integrity sha512-ojc+1IoC6OP65Ts5+ZHbEYdrohmIw1j9P7HS9MOJezqMYtCDgpkoqB5enAAZrNtnbSL6gVCWPHaoaTY5KeO0/g==
+"@redux-saga/delay-p@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@redux-saga/delay-p/-/delay-p-1.2.1.tgz"
+  integrity sha512-MdiDxZdvb1m+Y0s4/hgdcAXntpUytr9g0hpcOO1XFVyyzkrDu3SKPgBFOtHn7lhu7n24ZKIAT1qtKyQjHqRd+w==
   dependencies:
-    "@redux-saga/symbols" "^1.1.2"
+    "@redux-saga/symbols" "^1.1.3"
 
-"@redux-saga/is@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/is/-/is-1.1.2.tgz#ae6c8421f58fcba80faf7cadb7d65b303b97e58e"
-  integrity sha512-OLbunKVsCVNTKEf2cH4TYyNbbPgvmZ52iaxBD4I1fTif4+MTXMa4/Z07L83zW/hTCXwpSZvXogqMqLfex2Tg6w==
+"@redux-saga/is@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/@redux-saga/is/-/is-1.1.3.tgz"
+  integrity sha512-naXrkETG1jLRfVfhOx/ZdLj0EyAzHYbgJWkXbB3qFliPcHKiWbv/ULQryOAEKyjrhiclmr6AMdgsXFyx7/yE6Q==
   dependencies:
-    "@redux-saga/symbols" "^1.1.2"
-    "@redux-saga/types" "^1.1.0"
+    "@redux-saga/symbols" "^1.1.3"
+    "@redux-saga/types" "^1.2.1"
 
-"@redux-saga/symbols@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@redux-saga/symbols/-/symbols-1.1.2.tgz#216a672a487fc256872b8034835afc22a2d0595d"
-  integrity sha512-EfdGnF423glv3uMwLsGAtE6bg+R9MdqlHEzExnfagXPrIiuxwr3bdiAwz3gi+PsrQ3yBlaBpfGLtDG8rf3LgQQ==
+"@redux-saga/symbols@^1.1.3":
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/@redux-saga/symbols/-/symbols-1.1.3.tgz"
+  integrity sha512-hCx6ZvU4QAEUojETnX8EVg4ubNLBFl1Lps4j2tX7o45x/2qg37m3c6v+kSp8xjDJY+2tJw4QB3j8o8dsl1FDXg==
 
-"@redux-saga/types@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@redux-saga/types/-/types-1.1.0.tgz#0e81ce56b4883b4b2a3001ebe1ab298b84237204"
-  integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg==
+"@redux-saga/types@^1.2.1":
+  version "1.2.1"
+  resolved "https://registry.npmjs.org/@redux-saga/types/-/types-1.2.1.tgz"
+  integrity sha512-1dgmkh+3so0+LlBWRhGA33ua4MYr7tUOj+a9Si28vUi0IUFNbff1T3sgpeDJI/LaC75bBYnQ0A3wXjn0OrRNBA==
 
 "@researchgate/react-intersection-observer@^1.0.0":
   version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz#0321d2dd609aaacdb9bace8004d99c72824fb142"
+  resolved "https://registry.npmjs.org/@researchgate/react-intersection-observer/-/react-intersection-observer-1.3.5.tgz"
   integrity sha512-aYlsex5Dd6BAHMJvJrUoFp8gzgMSL27xFvrxkVYW0bV1RMAapVsO+QeYLtTaSF/QCflktODodvv+wJm49oMnnQ==
 
-"@scarf/scarf@^1.1.0":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@scarf/scarf/-/scarf-1.1.1.tgz#d8b9f20037b3a37dbf8dcdc4b3b72f9285bfce35"
-  integrity sha512-VGbKDbk1RFIaSmdVb0cNjjWJoRWRI/Weo23AjRCC2nryO0iAS8pzsToJfPVPtVs74WHw4L1UTADNdIYRLkirZQ==
-
-"@schematics/angular@13.2.6":
-  version "13.2.6"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-13.2.6.tgz#48f5b6c58d2f26de913873549180122283b22f20"
-  integrity sha512-8NzHMX9+FSgaB0lJYxlTJv9OcBuolwZJqo9M/yX3RPSqSHghA33jWwgVbV551hBJOpbVEePerG1DQkIC99DXKA==
+"@schematics/angular@16.2.12":
+  version "16.2.12"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-16.2.12.tgz#13e00e7390903cfc00eb8d5c2e74986262aff6ec"
+  integrity sha512-rc6Dxo7yLnNhECxZyvwv3qL40GvMHw/gMeme8DUGN7zgcUdBJ7LOCURp7EZqOBghMVeeJvLrohitEbs9NhRLBA==
   dependencies:
-    "@angular-devkit/core" "13.2.6"
-    "@angular-devkit/schematics" "13.2.6"
+    "@angular-devkit/core" "16.2.12"
+    "@angular-devkit/schematics" "16.2.12"
+    jsonc-parser "3.2.0"
+
+"@schematics/angular@^12.2.17":
+  version "12.2.18"
+  resolved "https://registry.npmjs.org/@schematics/angular/-/angular-12.2.18.tgz"
+  integrity sha512-niRS9Ly9y8uI0YmTSbo8KpdqCCiZ/ATMZWeS2id5M8JZvfXbngwiqJvojdSol0SWU+n1W4iA+lJBdt4gSKlD5w==
+  dependencies:
+    "@angular-devkit/core" "12.2.18"
+    "@angular-devkit/schematics" "12.2.18"
     jsonc-parser "3.0.0"
 
-"@schematics/angular@^12.2.10":
-  version "12.2.16"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-12.2.16.tgz#0d0684f00ca704ec35eb132db3c6042754b0de0a"
-  integrity sha512-EITPMaRE7iCosf0nyZFOpxTDAiPD3qm4QUxHKcwIaJTrzi89nBoUubw8+pFy5/Gtpadww80YD8ODV64B1bPGMA==
+"@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:
-    "@angular-devkit/core" "12.2.16"
-    "@angular-devkit/schematics" "12.2.16"
-    jsonc-parser "3.0.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
 
-"@sindresorhus/is@^0.14.0":
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.14.0.tgz#9fb3a3cf3132328151f353de4632e01e52102bea"
-  integrity sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==
+"@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==
 
-"@socket.io/base64-arraybuffer@~1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@socket.io/base64-arraybuffer/-/base64-arraybuffer-1.0.2.tgz#568d9beae00b0d835f4f8c53fd55714986492e61"
-  integrity sha512-dOlCBKnDw4iShaIsH/bxujKTM18+2TOAsYz+KSc11Am38H4q5Xw8Bbz97ZYdrVNM+um3p7w86Bvvmcn9q+5+eQ==
-
-"@swc-node/core@^1.8.2":
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/@swc-node/core/-/core-1.8.2.tgz#950ad394a8e8385658e6a951ec554bbf61a1693e"
-  integrity sha512-IoJ7tGHQ6JOMSmFe4VhP64uLmFKMNasS0QEgUrLFQ0h/dTvpQMynnoGBEJoPL6LfsebZ/q4uKqbpWrth6/yrAA==
+"@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:
-    "@swc/core" "^1.2.119"
+    "@sigstore/bundle" "^1.1.0"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    make-fetch-happen "^11.0.1"
 
-"@swc-node/register@^1.4.2":
-  version "1.4.2"
-  resolved "https://registry.yarnpkg.com/@swc-node/register/-/register-1.4.2.tgz#98801cc5ad8792519511bd6ae31c01f40aa487a3"
-  integrity sha512-wLZz0J7BTO//1Eq7e4eBQjKF380Hr2eVemz849msQSKcVM1D7UJUt/dP2TinEVGx++/BXJ/0q37i6n9Iw0EM0w==
+"@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:
-    "@swc-node/core" "^1.8.2"
-    "@swc-node/sourcemap-support" "^0.1.11"
-    chalk "4"
-    debug "^4.3.3"
-    pirates "^4.0.4"
-    tslib "^2.3.1"
-    typescript "^4.5.3"
+    "@sigstore/protobuf-specs" "^0.2.0"
+    tuf-js "^1.1.7"
 
-"@swc-node/sourcemap-support@^0.1.11":
-  version "0.1.11"
-  resolved "https://registry.yarnpkg.com/@swc-node/sourcemap-support/-/sourcemap-support-0.1.11.tgz#50cda396baade0636e8f53596b7a66386490c06d"
-  integrity sha512-b+Mn3oQl+7nUSt7hPzIbY9B30YhcFo1PT4kd9P4QmD6raycmIealOAhAdZID/JevphzsOXHQB4OqJm7Yi5tMcA==
-  dependencies:
-    source-map-support "^0.5.21"
-
-"@swc/core-android-arm-eabi@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm-eabi/-/core-android-arm-eabi-1.2.160.tgz#f5aaf852e9d104b4ad58d34851bac3bd41a64a60"
-  integrity sha512-VzFP7tYgvpkUhd8wgyNtERqvoPBBDretyMFxAxPe2SxClaBs9Ka95PdiPPZalRq+vFCb/dFxD8Vhz+XO16Kpjg==
-
-"@swc/core-android-arm64@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-android-arm64/-/core-android-arm64-1.2.160.tgz#458f7e6aff52958e0764c34500528c18bbb31894"
-  integrity sha512-m+xqQaa7TqW3Vm9MUvITtdU8OlAc/9yT+TgOS4l8WlfFI87IDnLLfinKKEp+xfKwzYDdIsh+sC+jdGdIBTMB+Q==
-
-"@swc/core-darwin-arm64@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-arm64/-/core-darwin-arm64-1.2.160.tgz#34d48b449de0eae9fddd71b064d36aa5353f22cc"
-  integrity sha512-9bG70KYKvjNf7tZtjOu1h4kDZPtoidZptIXPGSHuUgJ1BbSJYpfRR5xAmq4k37+GqOjIPJp4+lSGQPa2HfejpA==
-
-"@swc/core-darwin-x64@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-darwin-x64/-/core-darwin-x64-1.2.160.tgz#109d92457df928717c73055f01c99ca88815000d"
-  integrity sha512-+b4HdKAVf/XPZ9DjgG2axGLbquPEuYwEP3zeWgbWn0s0FYQ7WTFxznf3YrTJE9MYadJeCOs3U80E2xVAtRRS9Q==
-
-"@swc/core-freebsd-x64@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-freebsd-x64/-/core-freebsd-x64-1.2.160.tgz#debdccce0129aa856e496f06981cc8e8271fcb41"
-  integrity sha512-E5agJwv+RVMoZ8FQIPSO5wLPDQx6jqcMpV207EB3pPaxPWGe4n3DH3vcibHp80RACDNdiaqo5lBeBnGJI4ithw==
-
-"@swc/core-linux-arm-gnueabihf@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.2.160.tgz#27669f1084c152153c017fc320b6a92cd6b71244"
-  integrity sha512-uCttZRNx+lWVhCYGC6/pGUej08g1SQc5am6R9NVFh111goytcdlPnC4jV8oWzq2QhDWkkKxLoP2CZOytzI4+0w==
-
-"@swc/core-linux-arm64-gnu@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.2.160.tgz#a8ecadee30639c298e9c2175099d55c1c82f912e"
-  integrity sha512-sB18roiv8m/zsY6tXLSrbUls0eKkSkxOEF0ennXVEtz97rMJ+WWnkOc8gI+rUpj3MHbVAIxyDNyyZU4cH5g1jQ==
-
-"@swc/core-linux-arm64-musl@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.2.160.tgz#1a2cf738c8a394fcb21fe91f13b1fb9c775cca0b"
-  integrity sha512-PJ7Ukb+BRR3pGYcUag8qRWOB11eByc5YLx/xAMSc3bRmaYW/oj6s8k+1DYiR//BAuNQdf14MpMFzDuWiDEUh7A==
-
-"@swc/core-linux-x64-gnu@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.2.160.tgz#f54c4e0510b69d68f56e681050b717991627ad68"
-  integrity sha512-wVh8Q86xz3t0y5zoUryWQ64bFG/YxdcykBgaog8lU9xkFb1KSqVRE9ia7aKA12/ZtAfpJZLRBleZxBAcaCg9FQ==
-
-"@swc/core-linux-x64-musl@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.2.160.tgz#6f8ec092d8b65a9750faf0a2323b52f39c5bd540"
-  integrity sha512-AnWdarl9WWuDdbc2AX1w76W1jaekSCokxRrWdSGUgQytaZRtybKZEgThvJCQDrSlYQD4XDOhhVRCurTvy4JsfQ==
-
-"@swc/core-win32-arm64-msvc@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.2.160.tgz#b4f226ab86e550762b5cc83d0ebe4cf43f1a3624"
-  integrity sha512-ScL27mZRTwEIqBIv9RY34nQvyBvhosiM5Lus4dCFmS71flPcAEv7hJgy4GE3YUQV0ryGNK9NaO43H8sAyNwKVQ==
-
-"@swc/core-win32-ia32-msvc@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.2.160.tgz#243bb5b15eab76f4c8f004381d63c6d72a8cef68"
-  integrity sha512-e75zbWlhlyrd5HdrYzELa6OlZxgyaVpJj+c9xMD95HcdklVbmsyt1vuqRxMyqaZUDLyehwwCDRX/ZeDme//M/A==
-
-"@swc/core-win32-x64-msvc@1.2.160":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.2.160.tgz#8708986433e891687bb4a836a683f90bc95e1fce"
-  integrity sha512-GAYT+WzYQY4sr17S21yJh4flJp/sQ62mAs6RfN89p7jIWgm0Bl/SooRl6ocsftTlnZm7K7QC8zmQVeNCWDCLPw==
-
-"@swc/core@^1.2.119", "@swc/core@^1.2.146":
-  version "1.2.160"
-  resolved "https://registry.yarnpkg.com/@swc/core/-/core-1.2.160.tgz#d91730a5021d4c8aef87855dde11fc8931496176"
-  integrity sha512-nXoC7HA+aY7AtBPsiqGXocoRLAzzA7MV+InWQtILN7Uru4hB9+rLnLCPc3zSdg7pgnxJLa1tHup1Rz7Vv6TcIQ==
-  optionalDependencies:
-    "@swc/core-android-arm-eabi" "1.2.160"
-    "@swc/core-android-arm64" "1.2.160"
-    "@swc/core-darwin-arm64" "1.2.160"
-    "@swc/core-darwin-x64" "1.2.160"
-    "@swc/core-freebsd-x64" "1.2.160"
-    "@swc/core-linux-arm-gnueabihf" "1.2.160"
-    "@swc/core-linux-arm64-gnu" "1.2.160"
-    "@swc/core-linux-arm64-musl" "1.2.160"
-    "@swc/core-linux-x64-gnu" "1.2.160"
-    "@swc/core-linux-x64-musl" "1.2.160"
-    "@swc/core-win32-arm64-msvc" "1.2.160"
-    "@swc/core-win32-ia32-msvc" "1.2.160"
-    "@swc/core-win32-x64-msvc" "1.2.160"
-
-"@szmarczak/http-timer@^1.1.2":
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-1.1.2.tgz#b1665e2c461a2cd92f4c1bbf50d5454de0d4b421"
-  integrity sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==
-  dependencies:
-    defer-to-connect "^1.0.1"
+"@socket.io/component-emitter@~3.1.0":
+  version "3.1.0"
+  resolved "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz"
+  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
 
 "@tootallnate/once@1":
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
+  resolved "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz"
   integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
 
 "@tootallnate/once@2":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-2.0.0.tgz#f544a148d3ab35801c1f633a7441fd87c2e484bf"
+  resolved "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz"
   integrity sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==
 
-"@trysound/sax@0.2.0":
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.2.0.tgz#cccaab758af56761eb7bf37af6f03f326dd798ad"
-  integrity sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==
-
 "@tsconfig/node10@^1.0.7":
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
-  integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+  version "1.0.9"
+  resolved "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz"
+  integrity sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==
 
 "@tsconfig/node12@^1.0.7":
-  version "1.0.9"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
-  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+  version "1.0.11"
+  resolved "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz"
+  integrity sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==
 
 "@tsconfig/node14@^1.0.0":
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
-  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz"
+  integrity sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==
 
 "@tsconfig/node16@^1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
-  integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz"
+  integrity sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==
+
+"@tufjs/canonical-json@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz"
+  integrity sha512-QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==
+
+"@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 "^9.0.0"
 
 "@types/body-parser@*":
   version "1.19.2"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.2.tgz#aea2059e28b7658639081347ac4fab3de166e6f0"
+  resolved "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.2.tgz"
   integrity sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==
   dependencies:
     "@types/connect" "*"
@@ -2152,24 +2456,19 @@
 
 "@types/bonjour@^3.5.9":
   version "3.5.10"
-  resolved "https://registry.yarnpkg.com/@types/bonjour/-/bonjour-3.5.10.tgz#0f6aadfe00ea414edc86f5d106357cda9701e275"
+  resolved "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.10.tgz"
   integrity sha512-p7ienRMiS41Nu2/igbJxxLDWrSZ0WxM8UQgCeO9KhoVF7cOVFkrKsiDr1EsJIla8vV3oEEjGcz11jc5yimhzZw==
   dependencies:
     "@types/node" "*"
 
 "@types/circular-json@^0.4.0":
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/@types/circular-json/-/circular-json-0.4.0.tgz#7401f7e218cfe87ad4c43690da5658b9acaf51be"
+  resolved "https://registry.npmjs.org/@types/circular-json/-/circular-json-0.4.0.tgz"
   integrity sha512-7+kYB7x5a7nFWW1YPBh3KxhwKfiaI4PbZ1RvzBU91LZy7lWJO822CI+pqzSre/DZ7KsCuMKdHnLHHFu8AyXbQg==
 
-"@types/component-emitter@^1.2.10":
-  version "1.2.11"
-  resolved "https://registry.yarnpkg.com/@types/component-emitter/-/component-emitter-1.2.11.tgz#50d47d42b347253817a39709fef03ce66a108506"
-  integrity sha512-SRXjM+tfsSlA9VuG8hGO2nft2p8zjXCK1VcC6N4NXbBbYbSia9kzCChYQajIjzIqOOOuh5Ock6MmV2oux4jDZQ==
-
 "@types/connect-history-api-fallback@^1.3.5":
   version "1.3.5"
-  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  resolved "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz"
   integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
   dependencies:
     "@types/express-serve-static-core" "*"
@@ -2177,177 +2476,157 @@
 
 "@types/connect@*":
   version "3.4.35"
-  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  resolved "https://registry.npmjs.org/@types/connect/-/connect-3.4.35.tgz"
   integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
   dependencies:
     "@types/node" "*"
 
 "@types/cookie@^0.4.1":
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  resolved "https://registry.npmjs.org/@types/cookie/-/cookie-0.4.1.tgz"
   integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
 "@types/cors@^2.8.12":
-  version "2.8.12"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
-  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
+  version "2.8.13"
+  resolved "https://registry.npmjs.org/@types/cors/-/cors-2.8.13.tgz"
+  integrity sha512-RG8AStHlUiV5ysZQKq97copd2UmVYw3/pRMLefISZ3S1hK104Cwm7iLQ3fTKx+lsUH2CE8FlLaYeEA2LSeqYUA==
+  dependencies:
+    "@types/node" "*"
 
 "@types/deep-freeze@0.1.2":
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.2.tgz#68e5379291910e82c2f0d1629732163c2aa662cc"
+  resolved "https://registry.npmjs.org/@types/deep-freeze/-/deep-freeze-0.1.2.tgz"
   integrity sha512-M6x29Vk4681dght4IMnPIcF1SNmeEm0c4uatlTFhp+++H1oDK1THEIzuCC2WeCBVhX+gU0NndsseDS3zaCtlcQ==
 
-"@types/eslint-scope@^3.7.0", "@types/eslint-scope@^3.7.3":
-  version "3.7.3"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.3.tgz#125b88504b61e3c8bc6f870882003253005c3224"
-  integrity sha512-PB3ldyrcnAicT35TWPs5IcwKD8S333HMaa2VVv4+wdvebJkjWuW/xESoB8IwRcog8HYVYamb1g/R31Qv5Bx03g==
+"@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/eslint-scope@^3.7.3":
+  version "3.7.4"
+  resolved "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.4.tgz"
+  integrity sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.4.1.tgz#c48251553e8759db9e656de3efc846954ac32304"
-  integrity sha512-GE44+DNEyxxh2Kc6ro/VkIj+9ma0pO0bwv9+uHSyBrikYOHr8zYcdPvnBOp1aw8s+CjRvuSx7CyWqRrNFQ59mA==
+  version "8.37.0"
+  resolved "https://registry.npmjs.org/@types/eslint/-/eslint-8.37.0.tgz"
+  integrity sha512-Piet7dG2JBuDIfohBngQ3rCt7MgO9xCO4xIMKxBThCq5PNRB91IjlJ10eJVwfoNtvTErmxLzwBZ7rHZtbOMmFQ==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
 "@types/estree@*", "@types/estree@^0.0.51":
   version "0.0.51"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.51.tgz#cfd70924a25a3fd32b218e5e420e6897e1ac4f40"
+  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.51.tgz"
   integrity sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==
 
-"@types/estree@^0.0.50":
-  version "0.0.50"
-  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
-
-"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.18":
-  version "4.17.28"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.28.tgz#c47def9f34ec81dc6328d0b1b5303d1ec98d86b8"
-  integrity sha512-P1BJAEAW3E2DJUlkgq4tOL3RyMunoWXqbSCygWo5ZIWTjUgN1YnaXWW4VWl/oc8vs/XoYibEGBKP0uZyF4AHig==
+"@types/express-serve-static-core@*", "@types/express-serve-static-core@^4.17.33":
+  version "4.17.33"
+  resolved "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.33.tgz"
+  integrity sha512-TPBqmR/HRYI3eC2E5hmiivIzv+bidAfXofM+sbonAGvyDhySGw9/PQZFt2BLOrjUUR++4eJVpx6KnLQK1Fk9tA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
-"@types/express@*", "@types/express@^4.17.13", "@types/express@^4.17.9":
-  version "4.17.13"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
-  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
+"@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==
   dependencies:
     "@types/body-parser" "*"
-    "@types/express-serve-static-core" "^4.17.18"
+    "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/file-saver@^2.0.1":
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/@types/file-saver/-/file-saver-2.0.5.tgz#9ee342a5d1314bb0928375424a2f162f97c310c7"
-  integrity sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==
-
 "@types/grecaptcha@^3.0.4":
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/grecaptcha/-/grecaptcha-3.0.4.tgz#3de601f3b0cd0298faf052dd5bd62aff64c2be2e"
+  resolved "https://registry.npmjs.org/@types/grecaptcha/-/grecaptcha-3.0.4.tgz"
   integrity sha512-7l1Y8DTGXkx/r4pwU1nMVAR+yD/QC+MCHKXAyEX/7JZhwcN1IED09aZ9vCjjkcGdhSQiu/eJqcXInpl6eEEEwg==
 
 "@types/hoist-non-react-statics@^3.3.0", "@types/hoist-non-react-statics@^3.3.1":
   version "3.3.1"
-  resolved "https://registry.yarnpkg.com/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz#1124aafe5118cb591977aeb1ceaaed1070eb039f"
+  resolved "https://registry.npmjs.org/@types/hoist-non-react-statics/-/hoist-non-react-statics-3.3.1.tgz"
   integrity sha512-iMIqiko6ooLrTh1joXodJK5X9xeEALT1kM5G3ZLhD3hszxBdIEd5C75U834D9mLcINgD4OyZf5uQXjkuYydWvA==
   dependencies:
     "@types/react" "*"
     hoist-non-react-statics "^3.3.0"
 
 "@types/http-proxy@^1.17.5", "@types/http-proxy@^1.17.8":
-  version "1.17.8"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.8.tgz#968c66903e7e42b483608030ee85800f22d03f55"
-  integrity sha512-5kPLG5BKpWYkw/LVOGWpiq3nEVqxiN32rTgI53Sk12/xHFQ2rG3ehI9IO+O3W2QoKeyB92dJkoka8SUm6BX1pA==
+  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==
   dependencies:
     "@types/node" "*"
 
-"@types/jasmine@*":
-  version "3.10.3"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.10.3.tgz#a89798b3d5a8bd23ca56e855a9aee3e5a93bdaaa"
-  integrity sha512-SWyMrjgdAUHNQmutvDcKablrJhkDLy4wunTme8oYLjKp41GnHGxMRXr2MQMvy/qy8H3LdzwQk9gH4hZ6T++H8g==
-
 "@types/jasmine@~3.6.0":
   version "3.6.11"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.6.11.tgz#4b1d77aa9dfc757407cb9e277216d8e83553f09d"
+  resolved "https://registry.npmjs.org/@types/jasmine/-/jasmine-3.6.11.tgz"
   integrity sha512-S6pvzQDvMZHrkBz2Mcn/8Du7cpr76PlRJBAoHnSDNbulULsH5dp0Gns+WRyNX5LHejz/ljxK4/vIHK/caHt6SQ==
 
-"@types/jasminewd2@~2.0.8":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@types/jasminewd2/-/jasminewd2-2.0.10.tgz#ae31c237aa6421bde30f1058b1d20f4577e54443"
-  integrity sha512-J7mDz7ovjwjc+Y9rR9rY53hFWKATcIkrr9DwQWmOas4/pnIPJTXawnzjwpHm3RSxz/e3ZVUvQ7cRbd5UQLo10g==
-  dependencies:
-    "@types/jasmine" "*"
-
 "@types/js-cookie@2.2.6":
   version "2.2.6"
-  resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
+  resolved "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.6.tgz"
   integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.4", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
-  version "7.0.9"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d"
-  integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ==
+"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
+  version "7.0.11"
+  resolved "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"
+  integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
 
 "@types/json5@^0.0.29":
   version "0.0.29"
-  resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
-  integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
+  resolved "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz"
+  integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==
 
-"@types/lodash@^4.14.165":
-  version "4.14.179"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.179.tgz#490ec3288088c91295780237d2497a3aa9dfb5c5"
-  integrity sha512-uwc1x90yCKqGcIOAT6DwOSuxnrAbpkdPsUOZtwrXb4D/6wZs+6qG7QnIawDuZWg0sWpxl+ltIKCaLoMlna678w==
+"@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/mime@^1":
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-1.3.2.tgz#93e25bf9ee75fe0fd80b594bc4feb0e862111b5a"
-  integrity sha512-YATxVxgRqNH6nHEIsvg6k2Boc1JHI9ZbH5iWFFv/MTkchz3b1ieGDa5T0a9RznNdI0KhVbdbWSN+KWWrQZRxTw==
+"@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":
-  version "17.0.21"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644"
-  integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ==
+"@types/node@*", "@types/node@>=10.0.0", "@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@^14.14.31", "@types/node@^14.14.9":
-  version "14.18.12"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.12.tgz#0d4557fd3b94497d793efd4e7d92df2f83b4ef24"
-  integrity sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==
+"@types/node@^16.18.39":
+  version "16.18.46"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.46.tgz#9f2102d0ba74a318fcbe170cbff5463f119eab59"
+  integrity sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0"
+  resolved "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz"
   integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==
 
 "@types/prop-types@*":
-  version "15.7.4"
-  resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11"
-  integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ==
-
-"@types/q@^0.0.32":
-  version "0.0.32"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
-  integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
+  version "15.7.5"
+  resolved "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz"
+  integrity sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==
 
 "@types/qs@*":
   version "6.9.7"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  resolved "https://registry.npmjs.org/@types/qs/-/qs-6.9.7.tgz"
   integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/range-parser@*":
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  resolved "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.4.tgz"
   integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
 
 "@types/react-redux@^7.1.20":
-  version "7.1.23"
-  resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.23.tgz#3c2bb1bcc698ae69d70735f33c5a8e95f41ac528"
-  integrity sha512-D02o3FPfqQlfu2WeEYwh3x2otYd2Dk1o8wAfsA0B1C2AJEFxE663Ozu7JzuWbznGgW248NaOF6wsqCGNq9d3qw==
+  version "7.1.25"
+  resolved "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.25.tgz"
+  integrity sha512-bAGh4e+w5D8dajd6InASVIyCo4pZLJ66oLb80F9OBLO1gKESbZcRCJpTT6uLXX+HAB57zw1WTdwJdAsewuTweg==
   dependencies:
     "@types/hoist-non-react-statics" "^3.3.0"
     "@types/react" "*"
@@ -2355,237 +2634,354 @@
     redux "^4.0.0"
 
 "@types/react-transition-group@^4.2.0":
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e"
-  integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==
+  version "4.4.5"
+  resolved "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz"
+  integrity sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==
   dependencies:
     "@types/react" "*"
 
 "@types/react@*":
-  version "17.0.39"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.39.tgz#d0f4cde092502a6db00a1cded6e6bf2abb7633ce"
-  integrity sha512-UVavlfAxDd/AgAacMa60Azl7ygyQNRwC/DsHZmKgNvPmRR5p70AJ5Q9EAmL2NWOJmeV+vVUI4IAP7GZrN8h8Ug==
+  version "17.0.57"
+  resolved "https://registry.npmjs.org/@types/react/-/react-17.0.57.tgz"
+  integrity sha512-e4msYpu5QDxzNrXDHunU/VPyv2M1XemGG/p7kfCjUiPtlLDCWLGQfgAMng6YyisWYxZ09mYdQlmMnyS0NfZdEg==
   dependencies:
     "@types/prop-types" "*"
     "@types/scheduler" "*"
     csstype "^3.0.2"
 
-"@types/retry@^0.12.0":
-  version "0.12.1"
-  resolved "https://registry.yarnpkg.com/@types/retry/-/retry-0.12.1.tgz#d8f1c0d0dc23afad6dc16a9e993a0865774b4065"
-  integrity sha512-xoDlM2S4ortawSWORYqsdU+2rxdh4LRW9ytc3zmT37RIKQh6IHyKwwtKhKis9ah8ol07DCkZxPt8BBvPjC6v4g==
+"@types/retry@0.12.0":
+  version "0.12.0"
+  resolved "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz"
+  integrity sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==
 
-"@types/sanitize-html@^2.6.2":
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-2.6.2.tgz#9c47960841b9def1e4c9dfebaaab010a3f6e97b9"
-  integrity sha512-7Lu2zMQnmHHQGKXVvCOhSziQMpa+R2hMHFefzbYoYMHeaXR0uXqNeOc3JeQQQ8/6Xa2Br/P1IQTLzV09xxAiUQ==
+"@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==
   dependencies:
-    htmlparser2 "^6.0.0"
+    htmlparser2 "^8.0.0"
 
 "@types/scheduler@*":
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39"
-  integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==
+  version "0.16.3"
+  resolved "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz"
+  integrity sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==
 
-"@types/selenium-webdriver@^3.0.0":
-  version "3.0.19"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.19.tgz#28ecede76f15b13553b4e86074d4cf9a0bbe49c4"
-  integrity sha512-OFUilxQg+rWL2FMxtmIgCkUDlJB6pskkpvmew7yeXfzzsOBb5rc+y2+DjHm+r3r1ZPPcJefK3DveNSYWGiy68g==
+"@types/semver@^7.3.12":
+  version "7.3.13"
+  resolved "https://registry.npmjs.org/@types/semver/-/semver-7.3.13.tgz"
+  integrity sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==
 
 "@types/serve-index@^1.9.1":
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/@types/serve-index/-/serve-index-1.9.1.tgz#1b5e85370a192c01ec6cec4735cf2917337a6278"
+  resolved "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.1.tgz"
   integrity sha512-d/Hs3nWDxNL2xAczmOVZNj92YZCS6RGxfBPjKzuu/XirCgXdpKEb88dYNbrYGint6IVWLNP+yonwVAuRC0T2Dg==
   dependencies:
     "@types/express" "*"
 
-"@types/serve-static@*":
-  version "1.13.10"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
-  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
+"@types/serve-static@*", "@types/serve-static@^1.13.10":
+  version "1.15.1"
+  resolved "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.1.tgz"
+  integrity sha512-NUo5XNiAdULrJENtJXZZ3fHtfMolzZwczzBbnAeBbqBwG+LaG6YaJtuwzwGSQZ2wsCrxjEhNNjAkKigy3n8teQ==
   dependencies:
-    "@types/mime" "^1"
+    "@types/mime" "*"
     "@types/node" "*"
 
 "@types/sinonjs__fake-timers@8.1.1":
   version "8.1.1"
-  resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz#b49c2c70150141a15e0fa7e79cf1f92a72934ce3"
+  resolved "https://registry.npmjs.org/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.1.tgz"
   integrity sha512-0kSuKjAS0TrGLJ0M/+8MaFkGsQhZpB6pxOmvS3K8FYI72K//YmdfoW9X2qPsAKh1mkwxGD5zib9s1FIFed6E8g==
 
 "@types/sizzle@^2.3.2":
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef"
+  resolved "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.3.tgz"
   integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
 
 "@types/sockjs@^0.3.33":
   version "0.3.33"
-  resolved "https://registry.yarnpkg.com/@types/sockjs/-/sockjs-0.3.33.tgz#570d3a0b99ac995360e3136fd6045113b1bd236f"
+  resolved "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.33.tgz"
   integrity sha512-f0KEEe05NvUnat+boPTZ0dgaLZ4SfSouXUgv5noUiefG2ajgKjmETo9ZJyuqsl7dfl2aHlLJUiki6B4ZYldiiw==
   dependencies:
     "@types/node" "*"
 
 "@types/stacktrace-js@^0.0.33":
   version "0.0.33"
-  resolved "https://registry.yarnpkg.com/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz#9b027370ca161b89798f308af77438802546cb39"
+  resolved "https://registry.npmjs.org/@types/stacktrace-js/-/stacktrace-js-0.0.33.tgz"
   integrity sha512-aqJ6QM9QThNL4dHBhwl1f9B0oDqiREkYLn9RldghUKsGeFWWGlCsqsRWxbh+hDvvmptMFqc4aIfFIGz9BBu8Qg==
 
-"@types/ws@^8.2.2":
-  version "8.5.2"
-  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.2.tgz#77e0c2e360e9579da930ffcfa53c5975ea3bdd26"
-  integrity sha512-VXI82ykONr5tacHEojnErTQk+KQSoYbW1NB6iz6wUwrNd+BqfkfggQNoNdCqhJSzbNumShPERbM+Pc5zpfhlbw==
+"@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==
   dependencies:
     "@types/node" "*"
 
+"@types/yargs-parser@*":
+  version "21.0.0"
+  resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-21.0.0.tgz#0c60e537fa790f5f9472ed2776c2b71ec117351b"
+  integrity sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==
+
+"@types/yargs@^17.0.0":
+  version "17.0.24"
+  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-17.0.24.tgz#b3ef8d50ad4aa6aecf6ddc97c580a00f5aa11902"
+  integrity sha512-6i0aC7jV6QzQB8ne1joVZ0eSFIstHsCrobmOtghM11yGlH0j43FKL2UhWdELkyps0zuf7qVTUVCCR+tgSlyLLw==
+  dependencies:
+    "@types/yargs-parser" "*"
+
 "@types/yauzl@^2.9.1":
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
-  integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
+  version "2.10.0"
+  resolved "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz"
+  integrity sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==
   dependencies:
     "@types/node" "*"
 
-"@typescript-eslint/eslint-plugin@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.11.0.tgz#3b866371d8d75c70f9b81535e7f7d3aa26527c7a"
-  integrity sha512-HJh33bgzXe6jGRocOj4FmefD7hRY4itgjzOrSs3JPrTNXsX7j5+nQPciAUj/1nZtwo2kAc3C75jZO+T23gzSGw==
+"@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==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.11.0"
-    "@typescript-eslint/type-utils" "5.11.0"
-    "@typescript-eslint/utils" "5.11.0"
-    debug "^4.3.2"
-    functional-red-black-tree "^1.0.1"
-    ignore "^5.1.8"
-    regexpp "^3.2.0"
-    semver "^7.3.5"
+    "@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"
+    debug "^4.3.4"
+    grapheme-splitter "^1.0.4"
+    ignore "^5.2.0"
+    natural-compare-lite "^1.4.0"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/experimental-utils@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.11.0.tgz#e7b2bfd57ddda47c3f658faad57655ed9e01fea0"
-  integrity sha512-EPvC/bU2n1LKtzKWP1AjGWkp7r8tJ8giVlZHIODo6q7SAd6J+/9vjtEKHK2G/Qp+D2IGPsQge+oadDR3CZcFtQ==
-  dependencies:
-    "@typescript-eslint/utils" "5.11.0"
-
 "@typescript-eslint/experimental-utils@^5.0.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.16.0.tgz#0b852567efa10660047f281cf004ed3db32866da"
-  integrity sha512-bitZtqO13XX64/UOQKoDbVg2H4VHzbHnWWlTRc7ofq7SuQyPCwEycF1Zmn5ZAMTJZ3p5uMS7xJGUdOtZK7LrNw==
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-5.59.6.tgz#9f4d81700dcea51a107658a44992ba1e4d8b4320"
+  integrity sha512-UIVfEaaHggOuhgqdpFlFQ7IN9UFMCiBR/N7uPBUyUlwNdJzYfAu9m4wbOj0b59oI/HSPW1N63Q7lsvfwTQY13w==
   dependencies:
-    "@typescript-eslint/utils" "5.16.0"
+    "@typescript-eslint/utils" "5.59.6"
 
-"@typescript-eslint/parser@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.11.0.tgz#b4fcaf65513f9b34bdcbffdda055724a5efb7e04"
-  integrity sha512-x0DCjetHZYBRovJdr3U0zG9OOdNXUaFLJ82ehr1AlkArljJuwEsgnud+Q7umlGDFLFrs8tU8ybQDFocp/eX8mQ==
+"@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==
   dependencies:
-    "@typescript-eslint/scope-manager" "5.11.0"
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/typescript-estree" "5.11.0"
-    debug "^4.3.2"
+    "@typescript-eslint/scope-manager" "5.59.1"
+    "@typescript-eslint/types" "5.59.1"
+    "@typescript-eslint/typescript-estree" "5.59.1"
+    debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.11.0.tgz#f5aef83ff253f457ecbee5f46f762298f0101e4b"
-  integrity sha512-z+K4LlahDFVMww20t/0zcA7gq/NgOawaLuxgqGRVKS0PiZlCTIUtX0EJbC0BK1JtR4CelmkPK67zuCgpdlF4EA==
+"@typescript-eslint/scope-manager@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.48.2.tgz"
+  integrity sha512-zEUFfonQid5KRDKoI3O+uP1GnrFd4tIHlvs+sTJXiWuypUWMuDaottkJuR612wQfOkjYbsaskSIURV9xo4f+Fw==
   dependencies:
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/visitor-keys" "5.11.0"
+    "@typescript-eslint/types" "5.48.2"
+    "@typescript-eslint/visitor-keys" "5.48.2"
 
-"@typescript-eslint/scope-manager@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz#7e7909d64bd0c4d8aef629cdc764b9d3e1d3a69a"
-  integrity sha512-P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ==
+"@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==
   dependencies:
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/visitor-keys" "5.16.0"
+    "@typescript-eslint/types" "5.58.0"
+    "@typescript-eslint/visitor-keys" "5.58.0"
 
-"@typescript-eslint/type-utils@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.11.0.tgz#58be0ba73d1f6ef8983d79f7f0bc2209b253fefe"
-  integrity sha512-wDqdsYO6ofLaD4DsGZ0jGwxp4HrzD2YKulpEZXmgN3xo4BHJwf7kq49JTRpV0Gx6bxkSUmc9s0EIK1xPbFFpIA==
+"@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/utils" "5.11.0"
-    debug "^4.3.2"
+    "@typescript-eslint/types" "5.59.1"
+    "@typescript-eslint/visitor-keys" "5.59.1"
+
+"@typescript-eslint/scope-manager@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.59.6.tgz#d43a3687aa4433868527cfe797eb267c6be35f19"
+  integrity sha512-gLbY3Le9Dxcb8KdpF0+SJr6EQ+hFGYFl6tVY8VxLPFDfUZC7BHFw+Vq7bM5lE9DwWPfx4vMWWTLGXgpc0mAYyQ==
+  dependencies:
+    "@typescript-eslint/types" "5.59.6"
+    "@typescript-eslint/visitor-keys" "5.59.6"
+
+"@typescript-eslint/type-utils@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.48.2.tgz"
+  integrity sha512-QVWx7J5sPMRiOMJp5dYshPxABRoZV1xbRirqSk8yuIIsu0nvMTZesKErEA3Oix1k+uvsk8Cs8TGJ6kQ0ndAcew==
+  dependencies:
+    "@typescript-eslint/typescript-estree" "5.48.2"
+    "@typescript-eslint/utils" "5.48.2"
+    debug "^4.3.4"
     tsutils "^3.21.0"
 
-"@typescript-eslint/types@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.11.0.tgz#ba345818a2540fdf2755c804dc2158517ab61188"
-  integrity sha512-cxgBFGSRCoBEhvSVLkKw39+kMzUKHlJGVwwMbPcTZX3qEhuXhrjwaZXWMxVfxDgyMm+b5Q5b29Llo2yow8Y7xQ==
-
-"@typescript-eslint/types@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.16.0.tgz#5827b011982950ed350f075eaecb7f47d3c643ee"
-  integrity sha512-oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g==
-
-"@typescript-eslint/typescript-estree@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.11.0.tgz#53f9e09b88368191e52020af77c312a4777ffa43"
-  integrity sha512-yVH9hKIv3ZN3lw8m/Jy5I4oXO4ZBMqijcXCdA4mY8ull6TPTAoQnKKrcZ0HDXg7Bsl0Unwwx7jcXMuNZc0m4lg==
+"@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==
   dependencies:
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/visitor-keys" "5.11.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@typescript-eslint/typescript-estree" "5.59.1"
+    "@typescript-eslint/utils" "5.59.1"
+    debug "^4.3.4"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/types@5.48.2":
+  version "5.48.2"
+  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.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.59.6.tgz#5a6557a772af044afe890d77c6a07e8c23c2460b"
+  integrity sha512-tH5lBXZI7T2MOUgOWFdVNUILsI02shyQvfzG9EJkoONWugCG77NDDa1EeDGw7oJ5IvsTAAGVV8I3Tk2PNu9QfA==
+
+"@typescript-eslint/typescript-estree@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.48.2.tgz"
+  integrity sha512-bibvD3z6ilnoVxUBFEgkO0k0aFvUc4Cttt0dAreEr+nrAHhWzkO83PEVVuieK3DqcgL6VAK5dkzK8XUVja5Zcg==
+  dependencies:
+    "@typescript-eslint/types" "5.48.2"
+    "@typescript-eslint/visitor-keys" "5.48.2"
+    debug "^4.3.4"
+    globby "^11.1.0"
     is-glob "^4.0.3"
-    semver "^7.3.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/typescript-estree@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz#32259459ec62f5feddca66adc695342f30101f61"
-  integrity sha512-SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ==
+"@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==
   dependencies:
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/visitor-keys" "5.16.0"
-    debug "^4.3.2"
-    globby "^11.0.4"
+    "@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.5"
+    semver "^7.3.7"
     tsutils "^3.21.0"
 
-"@typescript-eslint/utils@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.11.0.tgz#d91548ef180d74c95d417950336d9260fdbe1dc5"
-  integrity sha512-g2I480tFE1iYRDyMhxPAtLQ9HAn0jjBtipgTCZmd9I9s11OV8CTsG+YfFciuNDcHqm4csbAgC2aVZCHzLxMSUw==
+"@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"
+    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.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.59.6.tgz#2fb80522687bd3825504925ea7e1b8de7bb6251b"
+  integrity sha512-vW6JP3lMAs/Tq4KjdI/RiHaaJSO7IUsbkz17it/Rl9Q+WkQ77EOuOnlbaU8kKfVIOJxMhnRiBG+olE7f3M16DA==
+  dependencies:
+    "@typescript-eslint/types" "5.59.6"
+    "@typescript-eslint/visitor-keys" "5.59.6"
+    debug "^4.3.4"
+    globby "^11.1.0"
+    is-glob "^4.0.3"
+    semver "^7.3.7"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/utils@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.48.2.tgz"
+  integrity sha512-2h18c0d7jgkw6tdKTlNaM7wyopbLRBiit8oAxoP89YnuBOzCZ8g8aBCaCqq7h208qUTroL7Whgzam7UY3HVLow==
   dependencies:
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.11.0"
-    "@typescript-eslint/types" "5.11.0"
-    "@typescript-eslint/typescript-estree" "5.11.0"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.48.2"
+    "@typescript-eslint/types" "5.48.2"
+    "@typescript-eslint/typescript-estree" "5.48.2"
     eslint-scope "^5.1.1"
     eslint-utils "^3.0.0"
+    semver "^7.3.7"
 
-"@typescript-eslint/utils@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.16.0.tgz#42218b459d6d66418a4eb199a382bdc261650679"
-  integrity sha512-iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ==
+"@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==
   dependencies:
+    "@eslint-community/eslint-utils" "^4.2.0"
     "@types/json-schema" "^7.0.9"
-    "@typescript-eslint/scope-manager" "5.16.0"
-    "@typescript-eslint/types" "5.16.0"
-    "@typescript-eslint/typescript-estree" "5.16.0"
+    "@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"
-    eslint-utils "^3.0.0"
+    semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.11.0":
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.11.0.tgz#888542381f1a2ac745b06d110c83c0b261487ebb"
-  integrity sha512-E8w/vJReMGuloGxJDkpPlGwhxocxOpSVgSvjiLO5IxZPmxZF30weOeJYyPSEACwM+X4NziYS9q+WkN/2DHYQwA==
+"@typescript-eslint/utils@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.59.6.tgz#82960fe23788113fc3b1f9d4663d6773b7907839"
+  integrity sha512-vzaaD6EXbTS29cVH0JjXBdzMt6VBlv+hE31XktDRMX1j3462wZCJa7VzO2AxXEXcIl8GQqZPcOPuW/Z1tZVogg==
   dependencies:
-    "@typescript-eslint/types" "5.11.0"
-    eslint-visitor-keys "^3.0.0"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@types/json-schema" "^7.0.9"
+    "@types/semver" "^7.3.12"
+    "@typescript-eslint/scope-manager" "5.59.6"
+    "@typescript-eslint/types" "5.59.6"
+    "@typescript-eslint/typescript-estree" "5.59.6"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
 
-"@typescript-eslint/visitor-keys@5.16.0":
-  version "5.16.0"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz#f27dc3b943e6317264c7492e390c6844cd4efbbb"
-  integrity sha512-jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g==
+"@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:
-    "@typescript-eslint/types" "5.16.0"
-    eslint-visitor-keys "^3.0.0"
+    "@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"
+    eslint-scope "^5.1.1"
+    semver "^7.3.7"
+
+"@typescript-eslint/visitor-keys@5.48.2":
+  version "5.48.2"
+  resolved "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.48.2.tgz"
+  integrity sha512-z9njZLSkwmjFWUelGEwEbdf4NwKvfHxvGC0OcGN1Hp/XNDIcJ7D5DpPNPv6x6/mFvc1tQHsaWmpD/a4gOvvCJQ==
+  dependencies:
+    "@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==
+  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"
+    eslint-visitor-keys "^3.3.0"
+
+"@typescript-eslint/visitor-keys@5.59.6":
+  version "5.59.6"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.59.6.tgz#673fccabf28943847d0c8e9e8d008e3ada7be6bb"
+  integrity sha512-zEfbFLzB9ETcEJ4HZEEsCR9HHeNku5/Qw1jSS5McYJv5BR+ftYXwFFAH5Al+xkGaZEqowMwl7uoJjQb1YSPF8Q==
+  dependencies:
+    "@typescript-eslint/types" "5.59.6"
+    eslint-visitor-keys "^3.3.0"
 
 "@webassemblyjs/ast@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz"
   integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
   dependencies:
     "@webassemblyjs/helper-numbers" "1.11.1"
@@ -2593,22 +2989,22 @@
 
 "@webassemblyjs/floating-point-hex-parser@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  resolved "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz"
   integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
 
 "@webassemblyjs/helper-api-error@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz"
   integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
 
 "@webassemblyjs/helper-buffer@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz"
   integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
 
 "@webassemblyjs/helper-numbers@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz"
   integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
   dependencies:
     "@webassemblyjs/floating-point-hex-parser" "1.11.1"
@@ -2617,12 +3013,12 @@
 
 "@webassemblyjs/helper-wasm-bytecode@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz"
   integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
 
 "@webassemblyjs/helper-wasm-section@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  resolved "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz"
   integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2632,26 +3028,26 @@
 
 "@webassemblyjs/ieee754@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  resolved "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz"
   integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
 "@webassemblyjs/leb128@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  resolved "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.1.tgz"
   integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
 "@webassemblyjs/utf8@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  resolved "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.1.tgz"
   integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
 
 "@webassemblyjs/wasm-edit@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz"
   integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2665,7 +3061,7 @@
 
 "@webassemblyjs/wasm-gen@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz"
   integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2676,7 +3072,7 @@
 
 "@webassemblyjs/wasm-opt@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz"
   integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2686,7 +3082,7 @@
 
 "@webassemblyjs/wasm-parser@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz"
   integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
@@ -2698,32 +3094,32 @@
 
 "@webassemblyjs/wast-printer@1.11.1":
   version "1.11.1"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  resolved "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz"
   integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
   dependencies:
     "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webpack-cli/configtest@^1.1.1":
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.1.1.tgz#9f53b1b7946a6efc2a749095a4f450e2932e8356"
-  integrity sha512-1FBc1f9G4P/AxMqIgfZgeOTuRnwZMten8E7zap5zgpPInnCrP8D4Q81+4CWIch8i/Nf7nXjP0v6CjjbHOrXhKg==
+"@webpack-cli/configtest@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz"
+  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
 
-"@webpack-cli/info@^1.4.1":
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.4.1.tgz#2360ea1710cbbb97ff156a3f0f24556e0fc1ebea"
-  integrity sha512-PKVGmazEq3oAo46Q63tpMr4HipI3OPfP7LiNOEJg963RMgT0rqheag28NCML0o3GIzA3DmxP1ZIAv9oTX1CUIA==
+"@webpack-cli/info@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz"
+  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
   dependencies:
     envinfo "^7.7.3"
 
-"@webpack-cli/serve@^1.6.1":
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.6.1.tgz#0de2875ac31b46b6c5bb1ae0a7d7f0ba5678dffe"
-  integrity sha512-gNGTiTrjEVQ0OcVnzsRSqTxaBSr+dmTfm+qJsCDluky8uhdLWep7Gcr62QsAKHTMxjCS/8nEITsmFAhfIx+QSw==
+"@webpack-cli/serve@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz"
+  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
 
 "@wessberg/ts-evaluator@0.0.27":
   version "0.0.27"
-  resolved "https://registry.yarnpkg.com/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz#06e8b901d5e84f11199b9f84577c6426ae761767"
+  resolved "https://registry.npmjs.org/@wessberg/ts-evaluator/-/ts-evaluator-0.0.27.tgz"
   integrity sha512-7gOpVm3yYojUp/Yn7F4ZybJRxyqfMNf0LXK5KJiawbPfL0XTsJV+0mgrEDjOIR6Bi0OYk2Cyg4tjFu1r8MCZaA==
   dependencies:
     chalk "^4.1.0"
@@ -2733,32 +3129,32 @@
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  resolved "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz"
   integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
 
 "@xtuc/long@4.2.2":
   version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  resolved "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz"
   integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
 
 "@yarnpkg/lockfile@1.1.0":
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  resolved "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz"
   integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
 
-abab@^2.0.3, abab@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a"
-  integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==
+abab@^2.0.3, abab@^2.0.5, abab@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
 
-abbrev@1:
+abbrev@1, abbrev@^1.0.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
+  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:
   version "1.3.8"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  resolved "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz"
   integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
     mime-types "~2.1.34"
@@ -2766,86 +3162,82 @@ accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
 
 acorn-globals@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"
+  resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz"
   integrity sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==
   dependencies:
     acorn "^7.1.1"
     acorn-walk "^7.1.1"
 
+acorn-globals@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.npmjs.org/acorn-globals/-/acorn-globals-7.0.1.tgz"
+  integrity sha512-umOSDSDrfHbTNPuNpC2NSnnA3LUrqpevPb4T9jRx4MagXNS0rs+gwiTcAvqCRmsD6utzsrzNt+ebm00SNWiC3Q==
+  dependencies:
+    acorn "^8.1.0"
+    acorn-walk "^8.0.2"
+
 acorn-import-assertions@^1.7.6:
   version "1.8.0"
-  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
+  resolved "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz"
   integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
 
-acorn-jsx@^5.3.1:
+acorn-jsx@^5.3.2:
   version "5.3.2"
-  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn-walk@^7.1.1:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc"
+  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.1.1:
+acorn-walk@^8.0.0, acorn-walk@^8.0.2, acorn-walk@^8.1.1:
   version "8.2.0"
-  resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
+  resolved "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz"
   integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
 
 acorn@^7.1.1:
   version "7.4.1"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4, acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0:
-  version "8.7.0"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf"
-  integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ==
+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==
 
 adjust-sourcemap-loader@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz#fc4a0fd080f7d10471f30a7320f25560ade28c99"
+  resolved "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-4.0.0.tgz"
   integrity sha512-OXwN5b9pCUXNQHJpwwD2qP40byEmSgzj8B4ydSN0uMNYWiFmJ6x6KwUllMmfk8Rwu/HJDFR7U8ubsWBoN0Xp0A==
   dependencies:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
 
-adm-zip@^0.4.9:
-  version "0.4.16"
-  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
-  integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
-
-after@0.8.2:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
-  integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
+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.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
+  resolved "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
   dependencies:
     debug "4"
 
-agent-base@^4.3.0:
+agentkeepalive@^4.2.1:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
-  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
-  dependencies:
-    es6-promisify "^5.0.0"
-
-agentkeepalive@^4.1.3, agentkeepalive@^4.2.1:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-4.2.1.tgz#a7975cbb9f83b367f06c90cc51ff28fe7d499717"
-  integrity sha512-Zn4cw2NEqd+9fiSVWMscnjyQ1a8Yfoc5oBajLeo5w+YBHgDUcEBY2hS4YpTz6iN5f/2zQiktcuM6tS8x1p9dpA==
+  resolved "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.3.0.tgz"
+  integrity sha512-7Epl1Blf4Sy37j4v9f9FjICCh4+KAQOyXgHEwlyBiAQLbhKdq/i2QQU3amQalS/wPhdPzDXPL5DMR5bkn+YeWg==
   dependencies:
     debug "^4.1.0"
-    depd "^1.1.2"
+    depd "^2.0.0"
     humanize-ms "^1.2.1"
 
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
+  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
@@ -2853,33 +3245,43 @@ aggregate-error@^3.0.0:
 
 ajv-formats@2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.0.tgz#96eaf83e38d32108b66d82a9cb0cfa24886cdfeb"
+  resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.0.tgz"
   integrity sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==
   dependencies:
     ajv "^8.0.0"
 
 ajv-formats@2.1.1, ajv-formats@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520"
+  resolved "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz"
   integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==
   dependencies:
     ajv "^8.0.0"
 
-ajv-keywords@^3.4.1, ajv-keywords@^3.5.2:
+ajv-keywords@^3.5.2:
   version "3.5.2"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
 ajv-keywords@^5.0.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz#69d4d385a4733cdbeab44964a1170a88f87f0e16"
+  resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz"
   integrity sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==
   dependencies:
     fast-deep-equal "^3.1.3"
 
-ajv@8.6.2:
+ajv@8.12.0, ajv@^8.10.0, ajv@^8.8.0:
+  version "8.12.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1"
+  integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    json-schema-traverse "^1.0.0"
+    require-from-string "^2.0.2"
+    uri-js "^4.2.2"
+
+ajv@8.6.2, ajv@^8.0.0:
   version "8.6.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
+  resolved "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz"
   integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
   dependencies:
     fast-deep-equal "^3.1.1"
@@ -2887,27 +3289,7 @@ ajv@8.6.2:
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@8.8.2:
-  version "8.8.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.8.2.tgz#01b4fef2007a28bf75f0b7fc009f62679de4abbb"
-  integrity sha512-x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@8.9.0:
-  version "8.9.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.9.0.tgz#738019146638824dea25edcf299dcba1b0e7eb18"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
-ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.10.0, ajv@^6.12.3, 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==
@@ -2917,355 +3299,317 @@ ajv@^6.10.0, ajv@^6.12.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^8.0.0, ajv@^8.8.0:
-  version "8.10.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d"
-  integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    json-schema-traverse "^1.0.0"
-    require-from-string "^2.0.2"
-    uri-js "^4.2.2"
-
 angular-idle-preload@3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz#decace34d9fac1cb00000727a6dc5caafdb84e4d"
+  resolved "https://registry.npmjs.org/angular-idle-preload/-/angular-idle-preload-3.0.0.tgz"
   integrity sha512-W3P2m2B6MHdt1DVunH6H3VWkAZrG3ZwxGcPjedVvIyRhg/LmMtILoizHSxTXw3fsKIEdAPwGObXGpML9WD1jJA==
 
-angulartics2@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-12.0.0.tgz#d9440ff98d133ae02d97b991a32a711a5b88559f"
-  integrity sha512-hNjvOp/IvKD00Ix3zRGfGJUwwOhSM5RFhvM/iSBH7dvJKavCBWbI464PWshjXfRBbruangPUbJGhSLnoENNtmg==
+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==
   dependencies:
     tslib "^2.3.0"
 
-ansi-align@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.1.tgz#0cdf12e111ace773a86e9a1fad1225c43cb19a59"
-  integrity sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==
-  dependencies:
-    string-width "^4.1.0"
-
-ansi-colors@4.1.1, ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+ansi-colors@4.1.3, ansi-colors@^4.1.1:
+  version "4.1.3"
+  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
 
 ansi-escapes@^4.2.1, ansi-escapes@^4.3.0:
   version "4.3.2"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
 ansi-html-community@^0.0.8:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41"
+  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 sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+  integrity sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==
 
 ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.1.tgz"
+  integrity sha512-+O9Jct8wf++lXxxFc4hc8LsjaSq0HFzzL7cVsw8pRDIPdjKD2mT4ytDZlLuSBZ4cLKZFXIrMGO7DbQCtMJJMKw==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-regex@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-6.0.1.tgz#3183e38fae9a65d7cb5e53945cd5897d0260a06a"
-  integrity sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==
-
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
+  integrity sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==
 
 ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 anymatch@~3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
-  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  version "3.1.3"
+  resolved "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
 "aproba@^1.0.3 || ^2.0.0":
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  resolved "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz"
   integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-aproba@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
-
 arch@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/arch/-/arch-2.2.0.tgz#1bc47818f305764f23ab3306b0bfc086c5a29d11"
+  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.0"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-3.0.0.tgz#ba20bd6b553e31d62fc8c31bd23d22b95734390d"
-  integrity sha512-0GWpv50YSOcLXaN6/FAKY3vfRbllXWV2xvfA/oKJF8pzFhWXPV+yjhJXDBbjscDYowv7Yw1A3uigpzn5iEGTyw==
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz"
+  integrity sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==
   dependencies:
     delegates "^1.0.0"
     readable-stream "^3.6.0"
 
 arg@^4.1.0:
   version "4.1.3"
-  resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
+  resolved "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
 argparse@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  resolved "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz"
   integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
 
-aria-query@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"
-  integrity sha512-o/HelwhuKpTj/frsOsbNLNgnNGVIFsVP/SW2BSF14gVl7kAfMOJ6/8wUAUvG1R1NHKrfG+2sHZTu0yauT1qBrA==
+aria-query@5.1.3:
+  version "5.1.3"
+  resolved "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz"
+  integrity sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==
   dependencies:
-    "@babel/runtime" "^7.10.2"
-    "@babel/runtime-corejs3" "^7.10.2"
+    deep-equal "^2.0.5"
 
-arr-diff@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
-
-arr-flatten@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
-  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
-
-arr-union@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
+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==
+  dependencies:
+    call-bind "^1.0.2"
+    is-array-buffer "^3.0.1"
 
 array-flatten@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
-array-flatten@^2.1.0:
+array-flatten@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
+  resolved "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-includes@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9"
-  integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw==
+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==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
-    get-intrinsic "^1.1.1"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    get-intrinsic "^1.1.3"
     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 sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=
+  integrity sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==
   dependencies:
     array-uniq "^1.0.1"
 
 array-union@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
+  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-union@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/array-union/-/array-union-3.0.1.tgz#da52630d327f8b88cfbfb57728e2af5cd9b6b975"
-  integrity sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==
-
 array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
+  integrity sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==
 
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
-array.prototype.flat@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.5.tgz#07e0975d84bbc7c48cd1879d609e682598d33e13"
-  integrity sha512-KaYU+S+ndVqyUnignHftkwc58o3uVU1jzczILJ1tN2YaIZpFIKBiP/x/j97E5MVPsaCloPbqWLB/8qCTVvT2qg==
+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==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.0"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+    es-shim-unscopables "^1.0.0"
 
-arraybuffer.slice@~0.0.7:
-  version "0.0.7"
-  resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
-  integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
+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 sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
+  integrity sha512-3CYzex9M9FGQjCGMGyi6/31c8GJbgb0qGyrx5HWxPd0aCwh4cB2YjMb2Xf9UuoogrMrlO9cTqnB5rI5GHZTcUA==
 
 asn1@~0.2.3:
   version "0.2.6"
-  resolved "https://registry.yarnpkg.com/asn1/-/asn1-0.2.6.tgz#0d3a7bb6e64e02a90c0303b31f292868ea09a08d"
+  resolved "https://registry.npmjs.org/asn1/-/asn1-0.2.6.tgz"
   integrity sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==
   dependencies:
     safer-buffer "~2.1.0"
 
 assert-plus@1.0.0, assert-plus@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
-  integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
-
-assign-symbols@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+  resolved "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"
+  integrity sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==
 
 astral-regex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
 async-each-series@0.1.1:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-0.1.1.tgz#7617c1917401fd8ca4a28aadce3dbae98afeb432"
-  integrity sha1-dhfBkXQB/Yykooqtzj266Yr+tDI=
+  resolved "https://registry.npmjs.org/async-each-series/-/async-each-series-0.1.1.tgz"
+  integrity sha512-p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==
 
-async@1.5.2:
-  version "1.5.2"
-  resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
-  integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
-
-async@^2.6.2:
-  version "2.6.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
-  integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
+async@^2.6.0:
+  version "2.6.4"
+  resolved "https://registry.npmjs.org/async/-/async-2.6.4.tgz"
+  integrity sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==
   dependencies:
     lodash "^4.17.14"
 
 async@^3.2.0, async@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/async/-/async-3.2.3.tgz#ac53dafd3f4720ee9e8a160628f18ea91df196c9"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+  version "3.2.4"
+  resolved "https://registry.npmjs.org/async/-/async-3.2.4.tgz"
+  integrity sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==
 
 asynckit@^0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
-  integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
+  resolved "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"
+  integrity sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==
 
 at-least-node@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/at-least-node/-/at-least-node-1.0.0.tgz#602cd4b46e844ad4effc92a8011a3c46e0238dc2"
+  resolved "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
   integrity sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==
 
-atob@^2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
-  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
-
-autoprefixer@^10.4.2:
-  version "10.4.2"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-10.4.2.tgz#25e1df09a31a9fba5c40b578936b90d35c9d4d3b"
-  integrity sha512-9fOPpHKuDW1w/0EKfRmVnxTDt8166MAnLI3mgZ1JCnhNtYWxcJ6Ud5CO/AVOZi/AvFa8DY9RTy3h3+tFBlrrdQ==
+autoprefixer@10.4.13:
+  version "10.4.13"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.13.tgz"
+  integrity sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==
   dependencies:
-    browserslist "^4.19.1"
-    caniuse-lite "^1.0.30001297"
-    fraction.js "^4.1.2"
+    browserslist "^4.21.4"
+    caniuse-lite "^1.0.30001426"
+    fraction.js "^4.2.0"
     normalize-range "^0.1.2"
     picocolors "^1.0.0"
     postcss-value-parser "^4.2.0"
 
+autoprefixer@^10.4.13:
+  version "10.4.14"
+  resolved "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.14.tgz"
+  integrity sha512-FQzyfOsTlwVzjHxKEqRIAdJx9niO6VCBCoEwax/VLSoQF29ggECcPuBqUMZ+u8jCZOPSy8b8/8KnuFbp0SaFZQ==
+  dependencies:
+    browserslist "^4.21.5"
+    caniuse-lite "^1.0.30001464"
+    fraction.js "^4.2.0"
+    normalize-range "^0.1.2"
+    picocolors "^1.0.0"
+    postcss-value-parser "^4.2.0"
+
+available-typed-arrays@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz"
+  integrity sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==
+
 aws-sign2@~0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
-  integrity sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=
+  resolved "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz"
+  integrity sha512-08kcGqnYf/YmjoRhfxyu+CLxBjUtHLXLXX/vUfx9l2LYzG3c1m61nrpyFUZI6zeS+Li/wWMMidD9KgrqtGq3mA==
 
 aws4@^1.8.0:
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.11.0.tgz#d61f46d83b2519250e2784daf5b09479a8b41c59"
-  integrity sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==
+  version "1.12.0"
+  resolved "https://registry.npmjs.org/aws4/-/aws4-1.12.0.tgz"
+  integrity sha512-NmWvPnx0F1SfrQbYwOi7OeaNGokp9XhzNioJ/CSBs8Qa4vxug81mhJEAVZwxXuBmYB5KDRfMq/F3RR0BIU7sWg==
 
-axe-core@^4.3.3:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.4.1.tgz#7dbdc25989298f9ad006645cd396782443757413"
-  integrity sha512-gd1kmb21kwNuWr6BQz8fv6GNECPBnUasepcoLbekws23NVBLODdsClRZ+bQ8+9Uomf3Sm3+Vwn0oYG9NvwnJCw==
+axe-core@^4.7.2:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/axe-core/-/axe-core-4.7.2.tgz#040a7342b20765cb18bb50b628394c21bccc17a0"
+  integrity sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==
 
 axios@0.21.4:
   version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
+  resolved "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"
   integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
   dependencies:
     follow-redirects "^1.14.0"
 
-axios@^0.27.2:
-  version "0.27.2"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.27.2.tgz#207658cc8621606e586c85db4b41a750e756d972"
-  integrity sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==
+axios@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/axios/-/axios-1.6.0.tgz#f1e5292f26b2fd5c2e66876adc5b06cdbd7d2102"
+  integrity sha512-EZ1DYihju9pwVB+jg67ogm+Tmqc6JmhamRN6I4Zt8DfZu5lbcQGw3ozH9lFejSJgs/ibaef3A9PMXPLeefFGJg==
   dependencies:
-    follow-redirects "^1.14.9"
+    follow-redirects "^1.15.0"
     form-data "^4.0.0"
+    proxy-from-env "^1.1.0"
 
-axobject-query@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be"
-  integrity sha512-Td525n+iPOOyUQIeBfcASuG6uJsDOITl7Mds5gFyerkWiX7qhUTdYUBlSgNMyVqtSJqwpt1kXGLdUt6SykLMRA==
-
-babel-loader@8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.2.3.tgz#8986b40f1a64cacfcb4b8429320085ef68b1342d"
-  integrity sha512-n4Zeta8NC3QAsuyiizu0GkmRcQ6clkV9WFUnUf1iXP//IeSKbWjofW3UHyZVwlOB4y039YQKefawyTn64Zwbuw==
+axobject-query@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz"
+  integrity sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==
   dependencies:
-    find-cache-dir "^3.3.1"
-    loader-utils "^1.4.0"
-    make-dir "^3.1.0"
-    schema-utils "^2.6.5"
+    deep-equal "^2.0.5"
 
-babel-plugin-dynamic-import-node@^2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz#84fda19c976ec5c6defef57f9427b3def66e17a3"
-  integrity sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==
+babel-loader@9.1.2:
+  version "9.1.2"
+  resolved "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.2.tgz"
+  integrity sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==
   dependencies:
-    object.assign "^4.1.0"
+    find-cache-dir "^3.3.2"
+    schema-utils "^4.0.0"
 
 babel-plugin-istanbul@6.1.1:
   version "6.1.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz#fa88ec59232fd9b4e36dbbc540a8ec9a9b47da73"
+  resolved "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz"
   integrity sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==
   dependencies:
     "@babel/helper-plugin-utils" "^7.0.0"
@@ -3274,119 +3618,91 @@ babel-plugin-istanbul@6.1.1:
     istanbul-lib-instrument "^5.0.4"
     test-exclude "^6.0.0"
 
-babel-plugin-polyfill-corejs2@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz#440f1b70ccfaabc6b676d196239b138f8a2cfba5"
-  integrity sha512-v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w==
+babel-plugin-polyfill-corejs2@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz"
+  integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==
   dependencies:
-    "@babel/compat-data" "^7.13.11"
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
+    "@babel/compat-data" "^7.17.7"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.5.0:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.2.tgz#aabe4b2fa04a6e038b688c5e55d44e78cd3a5f72"
-  integrity sha512-G3uJih0XWiID451fpeFaYGVuxHEjzKTHtc9uGFEjR6hHrvNzeS/PX+LLLcetJcytsB5m4j+K3o/EpXJNb/5IEQ==
+babel-plugin-polyfill-corejs3@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.6.0.tgz"
+  integrity sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-    core-js-compat "^3.21.0"
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
+    core-js-compat "^3.25.1"
 
-babel-plugin-polyfill-regenerator@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz#2c0678ea47c75c8cc2fbb1852278d8fb68233990"
-  integrity sha512-Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A==
+babel-plugin-polyfill-regenerator@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.4.1.tgz"
+  integrity sha512-NtQGmyQDXjQqQ+IzRkBVwEOz9lQ4zxAQZgoAYEtU9dJjnl1Oc98qnN7jcp+bE7O7aYzVpavXE3/VKXNzUbh7aw==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.3.1"
-
-backo2@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
-  integrity sha1-MasayLEpNjRj41s+u2n038+6eUc=
+    "@babel/helper-define-polyfill-provider" "^0.3.3"
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base64-arraybuffer@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
-  integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
-
 base64-js@^1.2.0, base64-js@^1.3.1:
   version "1.5.1"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  resolved "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
 base64id@2.0.0, base64id@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  resolved "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz"
   integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
 
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
-
 basic-auth@~2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/basic-auth/-/basic-auth-2.0.1.tgz#b998279bf47ce38344b4f3cf916d4679bbf51e3a"
+  resolved "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"
   integrity sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==
   dependencies:
     safe-buffer "5.1.2"
 
 batch-processor@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/batch-processor/-/batch-processor-1.0.0.tgz#75c95c32b748e0850d10c2b168f6bdbe9891ace8"
-  integrity sha1-dclcMrdI4IUNEMKxaPa9vpiRrOg=
+  resolved "https://registry.npmjs.org/batch-processor/-/batch-processor-1.0.0.tgz"
+  integrity sha512-xoLQD8gmmR32MeuBHgH0Tzd5PuSZx71ZsbhVxOCRbgktZEPe4SQy7s9Z50uPp0F/f7iw2XmkHN2xkgbMfckMDA==
 
 batch@0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16"
-  integrity sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=
+  resolved "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz"
+  integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==
 
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
-  integrity sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=
+  resolved "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz"
+  integrity sha512-qeFIXtP4MSoi6NLqO12WfqARWWuCKi2Rn/9hJLEmtB5yTNr9DqFWkJRCf2qShWzPeAMRnOgCrq0sg/KLv5ES9w==
   dependencies:
     tweetnacl "^0.14.3"
 
 bent@~7.3.6:
   version "7.3.12"
-  resolved "https://registry.yarnpkg.com/bent/-/bent-7.3.12.tgz#e0a2775d4425e7674c64b78b242af4f49da6b035"
+  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@^3.1.3:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-3.2.0.tgz#a5fc298b81b9e0dca2e458824784b65c52ba588e"
-  integrity sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==
-
 big.js@^5.2.2:
   version "5.2.2"
-  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  resolved "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz"
   integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"
   integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
 
 bl@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  resolved "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"
   integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
   dependencies:
     buffer "^5.5.0"
@@ -3395,81 +3711,60 @@ bl@^4.1.0:
 
 blob-util@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/blob-util/-/blob-util-2.0.2.tgz#3b4e3c281111bb7f11128518006cdc60b403a1eb"
+  resolved "https://registry.npmjs.org/blob-util/-/blob-util-2.0.2.tgz"
   integrity sha512-T7JQa+zsXXEa6/8ZhHcQEW1UFfVM49Ts65uBkFL6fz2QmrElqmbajIDJvuA0tEhRe5eIjpV9ZF+0RfZR9voJFQ==
 
-blob@0.0.5:
-  version "0.0.5"
-  resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
-  integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
-
-blocking-proxy@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/blocking-proxy/-/blocking-proxy-1.0.1.tgz#81d6fd1fe13a4c0d6957df7f91b75e98dac40cb2"
-  integrity sha512-KE8NFMZr3mN2E0HcvCgRtX7DjhiIQrwle+nSVJVC/yqFb9+xznHl2ZcoBp2L9qzkI4t4cBFJ1efXF8Dwi132RA==
-  dependencies:
-    minimist "^1.2.0"
-
 bluebird@^3.7.2:
   version "3.7.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  resolved "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz"
   integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
-body-parser@1.19.2, body-parser@^1.19.0:
-  version "1.19.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.2.tgz#4714ccd9c157d44797b8b5607d72c0b89952f26e"
-  integrity sha512-SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==
+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==
   dependencies:
     bytes "3.1.2"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.8.1"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.9.7"
-    raw-body "2.4.3"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
     type-is "~1.6.18"
+    unpipe "1.0.0"
 
-bonjour@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/bonjour/-/bonjour-3.5.0.tgz#8e890a183d8ee9a2393b3844c691a42bcf7bc9f5"
-  integrity sha1-jokKGD2O6aI5OzhExpGkK897yfU=
+bonjour-service@^1.0.11:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.1.1.tgz"
+  integrity sha512-Z/5lQRMOG9k7W+FkeGTNjh7htqn/2LMnfOvBZ8pynNZCM9MwkQkI3zeI4oz09uWdcgmgHugVvBqxGg4VQJ5PCg==
   dependencies:
-    array-flatten "^2.1.0"
-    deep-equal "^1.0.1"
+    array-flatten "^2.1.2"
     dns-equal "^1.0.0"
-    dns-txt "^2.0.2"
-    multicast-dns "^6.0.1"
-    multicast-dns-service-types "^1.1.0"
+    fast-deep-equal "^3.1.3"
+    multicast-dns "^7.2.5"
 
 boolbase@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
-  integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
+  resolved "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz"
+  integrity sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==
 
-bootstrap@4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
-  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
+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==
 
-boxen@^5.0.0:
-  version "5.1.2"
-  resolved "https://registry.yarnpkg.com/boxen/-/boxen-5.1.2.tgz#788cb686fc83c1f486dfa8a40c68fc2b831d2b50"
-  integrity sha512-9gYgQKXx+1nP8mP7CzFyaUARhg7D3n1dF/FnErWmu9l6JvGpNUN278h0aSb+QjoiKSWG+iZ3uHrcqk0qrY9RQQ==
-  dependencies:
-    ansi-align "^3.0.0"
-    camelcase "^6.2.0"
-    chalk "^4.1.0"
-    cli-boxes "^2.2.1"
-    string-width "^4.2.2"
-    type-fest "^0.20.2"
-    widest-line "^3.1.0"
-    wrap-ansi "^7.0.0"
+bootstrap@^4.6.1:
+  version "4.6.2"
+  resolved "https://registry.npmjs.org/bootstrap/-/bootstrap-4.6.2.tgz"
+  integrity sha512-51Bbp/Uxr9aTuy6ca/8FbFloBUJZLHwnhTcnjIeRn2suQWsWzcuJhGjKDB5eppVte/8oCdOL3VuwxvZDUggwGQ==
 
 brace-expansion@^1.1.7:
   version "1.1.11"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
   integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
   dependencies:
     balanced-match "^1.0.0"
@@ -3477,76 +3772,61 @@ brace-expansion@^1.1.7:
 
 brace-expansion@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"
   integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
-  dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1, braces@^3.0.2, braces@~3.0.2:
+braces@^3.0.2, braces@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
   integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
     fill-range "^7.0.1"
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  resolved "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browser-sync-client@^2.27.7:
-  version "2.27.7"
-  resolved "https://registry.yarnpkg.com/browser-sync-client/-/browser-sync-client-2.27.7.tgz#e09dce1add876984cf8232de95d2332d29401a64"
-  integrity sha512-wKg9UP9a4sCIkBBAXUdbkdWFJzfSAQizGh+nC19W9y9zOo9s5jqeYRFUUbs7x5WKhjtspT+xetVp9AtBJ6BmWg==
+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==
   dependencies:
     etag "1.8.1"
     fresh "0.5.2"
     mitt "^1.1.3"
-    rxjs "^5.5.6"
 
-browser-sync-ui@^2.27.7:
-  version "2.27.7"
-  resolved "https://registry.yarnpkg.com/browser-sync-ui/-/browser-sync-ui-2.27.7.tgz#38cd65f7ba058544310591ad8ac2e7fdf29934f2"
-  integrity sha512-Bt4OQpx9p18OIzk0KKyu7jqlvmjacasUlk8ARY3uuIyiFWSBiRgr2i6XY8dEMF14DtbooaEBOpHEu9VCYvMcCw==
+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==
   dependencies:
     async-each-series "0.1.1"
+    chalk "4.1.2"
     connect-history-api-fallback "^1"
     immutable "^3"
     server-destroy "1.0.1"
-    socket.io-client "^2.4.0"
+    socket.io-client "^4.4.1"
     stream-throttle "^0.1.3"
 
-browser-sync@^2.26.7:
-  version "2.27.7"
-  resolved "https://registry.yarnpkg.com/browser-sync/-/browser-sync-2.27.7.tgz#65ec55d6c6e33283e505e06e5113bc32d9d0a8f0"
-  integrity sha512-9ElnnA/u+s2Jd+IgY+2SImB+sAEIteHsMG0NR96m7Ph/wztpvJCUpyC2on1KqmG9iAp941j+5jfmd34tEguGbg==
+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==
   dependencies:
-    browser-sync-client "^2.27.7"
-    browser-sync-ui "^2.27.7"
+    browser-sync-client "^2.29.1"
+    browser-sync-ui "^2.29.1"
     bs-recipes "1.3.4"
     bs-snippet-injector "^2.0.1"
+    chalk "4.1.2"
     chokidar "^3.5.1"
     connect "3.6.6"
     connect-history-api-fallback "^1"
     dev-ip "^1.0.1"
     easy-extender "^2.3.4"
-    eazy-logger "3.1.0"
+    eazy-logger "^4.0.1"
     etag "^1.8.1"
     fresh "^0.5.2"
     fs-extra "3.0.1"
@@ -3555,8 +3835,8 @@ browser-sync@^2.26.7:
     localtunnel "^2.0.1"
     micromatch "^4.0.2"
     opn "5.3.0"
-    portscanner "2.1.1"
-    qs "6.2.3"
+    portscanner "2.2.0"
+    qs "^6.11.0"
     raw-body "^2.3.2"
     resp-modifier "6.0.2"
     rx "4.1.0"
@@ -3564,95 +3844,92 @@ browser-sync@^2.26.7:
     serve-index "1.9.1"
     serve-static "1.13.2"
     server-destroy "1.0.1"
-    socket.io "2.4.0"
-    ua-parser-js "1.0.2"
-    yargs "^15.4.1"
+    socket.io "^4.4.1"
+    ua-parser-js "^1.0.33"
+    yargs "^17.3.1"
 
-browserslist@^4.0.0, browserslist@^4.14.5, browserslist@^4.16.6, browserslist@^4.17.5, browserslist@^4.19.1, browserslist@^4.9.1:
-  version "4.19.3"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.19.3.tgz#29b7caad327ecf2859485f696f9604214bedd383"
-  integrity sha512-XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg==
+browserslist@4.21.5, browserslist@^4.14.5, browserslist@^4.21.3, browserslist@^4.21.4, browserslist@^4.21.5:
+  version "4.21.5"
+  resolved "https://registry.npmjs.org/browserslist/-/browserslist-4.21.5.tgz"
+  integrity sha512-tUkiguQGW7S3IhB7N+c2MV/HZPSCPAAiYBZXLsBhFB/PCy6ZKKsZrmBayHV9fdGV/ARIfJ14NkxKzRDjvp7L6w==
   dependencies:
-    caniuse-lite "^1.0.30001312"
-    electron-to-chromium "^1.4.71"
-    escalade "^3.1.1"
-    node-releases "^2.0.2"
-    picocolors "^1.0.0"
-
-browserslist@^4.19.3:
-  version "4.20.0"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.0.tgz#35951e3541078c125d36df76056e94738a52ebe9"
-  integrity sha512-bnpOoa+DownbciXj0jVGENf8VYQnE2LNWomhYuCsMmmx9Jd9lwq0WXODuwpSsp8AVdKM2/HorrzxAfbKvWTByQ==
-  dependencies:
-    caniuse-lite "^1.0.30001313"
-    electron-to-chromium "^1.4.76"
-    escalade "^3.1.1"
-    node-releases "^2.0.2"
-    picocolors "^1.0.0"
-
-browserstack@^1.5.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.6.1.tgz#e051f9733ec3b507659f395c7a4765a1b1e358b3"
-  integrity sha512-GxtFjpIaKdbAyzHfFDKixKO8IBT7wR3NjbzrGc78nNs/Ciys9wU3/nBtsqsWv5nDSrdI5tz0peKuzCPuNXNUiw==
-  dependencies:
-    https-proxy-agent "^2.2.1"
+    caniuse-lite "^1.0.30001449"
+    electron-to-chromium "^1.4.284"
+    node-releases "^2.0.8"
+    update-browserslist-db "^1.0.10"
 
 bs-recipes@1.3.4:
   version "1.3.4"
-  resolved "https://registry.yarnpkg.com/bs-recipes/-/bs-recipes-1.3.4.tgz#0d2d4d48a718c8c044769fdc4f89592dc8b69585"
-  integrity sha1-DS1NSKcYyMBEdp/cT4lZLci2lYU=
+  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.yarnpkg.com/bs-snippet-injector/-/bs-snippet-injector-2.0.1.tgz#61b5393f11f52559ed120693100343b6edb04dd5"
-  integrity sha1-YbU5PxH1JVntEgaTEANDtu2wTdU=
+  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.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
-  integrity sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=
+  resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"
+  integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer-indexof@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/buffer-indexof/-/buffer-indexof-1.1.1.tgz#52fabcc6a606d1a00302802648ef68f639da268c"
-  integrity sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==
-
 buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
-  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
+  resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
   dependencies:
     base64-js "^1.3.1"
     ieee754 "^1.1.13"
 
-builtins@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/builtins/-/builtins-1.0.3.tgz#cb94faeb61c8696451db36534e1422f94f0aee88"
-  integrity sha1-y5T662HIaWRR2zZTThQi+U8K7og=
+builtins@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/builtins/-/builtins-5.0.1.tgz"
+  integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ==
+  dependencies:
+    semver "^7.0.0"
 
 bytes@3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+  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.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  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.yarnpkg.com/bytesish/-/bytesish-0.4.4.tgz#f3b535a0f1153747427aee27256748cff92347e6"
+  resolved "https://registry.npmjs.org/bytesish/-/bytesish-0.4.4.tgz"
   integrity sha512-i4uu6M4zuMUiyfZN4RU2+i9+peJh//pXhd9x1oSe1LBkZ3LEbCoygu8W0bXTukU1Jme2txKuotpCZRaC3FLxcQ==
 
-cacache@15.3.0, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
+cacache@17.0.4:
+  version "17.0.4"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-17.0.4.tgz"
+  integrity sha512-Z/nL3gU+zTUjz5pCA5vVjYM8pmaw2kxM7JEiE0fv3w77Wj+sFbi70CrBruUWH0uNcEdvLDixFpgA2JM4F4DBjA==
+  dependencies:
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^8.0.1"
+    lru-cache "^7.7.1"
+    minipass "^4.0.0"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
+
+cacache@^15.0.5:
   version "15.3.0"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.3.0.tgz#dc85380fb2f556fe3dda4c719bfa0ec875a7f1eb"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"
   integrity sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==
   dependencies:
     "@npmcli/fs" "^1.0.0"
@@ -3674,66 +3951,57 @@ cacache@15.3.0, cacache@^15.0.5, cacache@^15.2.0, cacache@^15.3.0:
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
-cacache@^13.0.1:
-  version "13.0.1"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
-  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
+cacache@^16.1.0:
+  version "16.1.3"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz"
+  integrity sha512-/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==
   dependencies:
-    chownr "^1.1.2"
-    figgy-pudding "^3.5.1"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    graceful-fs "^4.2.2"
+    "@npmcli/fs" "^2.1.0"
+    "@npmcli/move-file" "^2.0.0"
+    chownr "^2.0.0"
+    fs-minipass "^2.1.0"
+    glob "^8.0.1"
     infer-owner "^1.0.4"
-    lru-cache "^5.1.1"
-    minipass "^3.0.0"
+    lru-cache "^7.7.1"
+    minipass "^3.1.6"
     minipass-collect "^1.0.2"
     minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^0.5.1"
-    move-concurrently "^1.0.1"
-    p-map "^3.0.0"
+    minipass-pipeline "^1.2.4"
+    mkdirp "^1.0.4"
+    p-map "^4.0.0"
     promise-inflight "^1.0.1"
-    rimraf "^2.7.1"
-    ssri "^7.0.0"
-    unique-filename "^1.1.1"
+    rimraf "^3.0.2"
+    ssri "^9.0.0"
+    tar "^6.1.11"
+    unique-filename "^2.0.0"
 
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+cacache@^17.0.0:
+  version "17.0.5"
+  resolved "https://registry.npmjs.org/cacache/-/cacache-17.0.5.tgz"
+  integrity sha512-Y/PRQevNSsjAPWykl9aeGz8Pr+OI6BYM9fYDNMvOkuUiG9IhG4LEmaYrZZZvioMUEQ+cBCxT0v8wrnCURccyKA==
   dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
-
-cacheable-request@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-6.1.0.tgz#20ffb8bd162ba4be11e9567d823db651052ca912"
-  integrity sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==
-  dependencies:
-    clone-response "^1.0.2"
-    get-stream "^5.1.0"
-    http-cache-semantics "^4.0.0"
-    keyv "^3.0.0"
-    lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
-    responselike "^1.0.2"
+    "@npmcli/fs" "^3.1.0"
+    fs-minipass "^3.0.0"
+    glob "^9.3.1"
+    lru-cache "^7.7.1"
+    minipass "^4.0.0"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    p-map "^4.0.0"
+    promise-inflight "^1.0.1"
+    ssri "^10.0.0"
+    tar "^6.1.11"
+    unique-filename "^3.0.0"
 
 cachedir@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cachedir/-/cachedir-2.3.0.tgz#0c75892a052198f0b21c7c1804d8331edfcae0e8"
+  resolved "https://registry.npmjs.org/cachedir/-/cachedir-2.3.0.tgz"
   integrity sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==
 
 call-bind@^1.0.0, call-bind@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
   integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
   dependencies:
     function-bind "^1.1.1"
@@ -3741,79 +4009,43 @@ call-bind@^1.0.0, call-bind@^1.0.2:
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a"
-  integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==
-  dependencies:
-    pascal-case "^3.1.2"
-    tslib "^2.0.3"
-
-camelcase@^5.0.0, camelcase@^5.3.1:
+camelcase@^5.3.1:
   version "5.3.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
+  resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-camelcase@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
-  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
-
-caniuse-api@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
-  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-lite "^1.0.0"
-    lodash.memoize "^4.1.2"
-    lodash.uniq "^4.5.0"
-
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001165, caniuse-lite@^1.0.30001312:
-  version "1.0.30001312"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz#e11eba4b87e24d22697dae05455d5aea28550d5f"
-  integrity sha512-Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ==
-
-caniuse-lite@^1.0.30001297, caniuse-lite@^1.0.30001299, caniuse-lite@^1.0.30001313:
-  version "1.0.30001314"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001314.tgz#65c7f9fb7e4594fca0a333bec1d8939662377596"
-  integrity sha512-0zaSO+TnCHtHJIbpLroX7nsD+vYuOVjl3uzFbJO1wMVbuveJA0RK2WcQA9ZUIOiO0/ArMiMgHJLxfEZhQiC0kw==
+caniuse-lite@^1.0.30001426, caniuse-lite@^1.0.30001449, caniuse-lite@^1.0.30001464:
+  version "1.0.30001477"
+  resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001477.tgz"
+  integrity sha512-lZim4iUHhGcy5p+Ri/G7m84hJwncj+Kz7S5aD4hoQfslKZJgt0tHc/hafVbqHC5bbhHb+mrW2JOUHkI5KH7toQ==
 
 caseless@~0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
-  integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
+  resolved "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"
+  integrity sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==
 
 cerialize@0.1.18:
   version "0.1.18"
-  resolved "https://registry.yarnpkg.com/cerialize/-/cerialize-0.1.18.tgz#d0f4f1b61cec7e4ed16a3eda0cac2bc99787414d"
+  resolved "https://registry.npmjs.org/cerialize/-/cerialize-0.1.18.tgz"
   integrity sha512-C/hp4UoPrMK060251Pt/21axF9aL4ceJlg3+pThB68VghhRjOzBzy4f8R9AirXdNB4gpqgaV2deU3UaexInL5w==
   dependencies:
     typescript "^2.5.0"
 
-chalk@4, 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, chalk@~4.1.0:
   version "4.1.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
 
-chalk@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
-  dependencies:
-    ansi-styles "^4.1.0"
-    supports-color "^7.1.0"
-
-chalk@^1.1.1, chalk@^1.1.3:
+chalk@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
+  integrity sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==
   dependencies:
     ansi-styles "^2.2.1"
     escape-string-regexp "^1.0.2"
@@ -3821,9 +4053,9 @@ chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
@@ -3832,22 +4064,22 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1:
 
 chardet@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
+  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
 charenc@0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/charenc/-/charenc-0.0.2.tgz#c0a1d2f3a7092e03774bfa83f14c0fc5790a8667"
-  integrity sha1-wKHS86cJLgN3S/qD8UwPxXkKhmc=
+  resolved "https://registry.npmjs.org/charenc/-/charenc-0.0.2.tgz"
+  integrity sha512-yrLQ/yVUFXkzg7EDQsPieE/53+0RlaWTs+wBrvW36cyilJ2SaDWfl4Yj7MtLTXleV9uEKefbAGUPv2/iWSooRA==
 
 check-more-types@^2.24.0:
   version "2.24.0"
-  resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
-  integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
+  resolved "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz"
+  integrity sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==
 
 cheerio-select@^1.5.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.6.0.tgz#489f36604112c722afa147dedd0d4609c09e1696"
+  resolved "https://registry.npmjs.org/cheerio-select/-/cheerio-select-1.6.0.tgz"
   integrity sha512-eq0GdBvxVFbqWgmCm7M3XGs1I8oLy/nExUnh6oLqmBditPO9AqQJrkslDpMun/hZ0yyTs8L0m85OHp4ho6Qm9g==
   dependencies:
     css-select "^4.3.0"
@@ -3858,7 +4090,7 @@ cheerio-select@^1.5.0:
 
 cheerio@1.0.0-rc.10:
   version "1.0.0-rc.10"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.10.tgz#2ba3dcdfcc26e7956fc1f440e61d51c643379f3e"
+  resolved "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.10.tgz"
   integrity sha512-g0J0q/O6mW8z5zxQ3A8E8J1hUgp4SMOvEoW/x84OwyHKe/Zccz83PVT4y5Crcr530FV6NgmKI1qvGTKVl9XXVw==
   dependencies:
     cheerio-select "^1.5.0"
@@ -3869,9 +4101,9 @@ cheerio@1.0.0-rc.10:
     parse5-htmlparser2-tree-adapter "^6.0.1"
     tslib "^2.2.0"
 
-"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.3.0, chokidar@^3.4.2, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
+chokidar@3.5.3, "chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1, chokidar@^3.5.2, chokidar@^3.5.3:
   version "3.5.3"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  resolved "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
   dependencies:
     anymatch "~3.1.2"
@@ -3884,104 +4116,67 @@ cheerio@1.0.0-rc.10:
   optionalDependencies:
     fsevents "~2.3.2"
 
-chownr@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.4.tgz#6fc9d7b42d32a583596337666e7d08084da2cc6b"
-  integrity sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==
-
 chownr@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/chownr/-/chownr-2.0.0.tgz#15bfbe53d2eab4cf70f18a8cd68ebe5b3cb1dece"
+  resolved "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz"
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 chrome-trace-event@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  resolved "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz"
   integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
-ci-info@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46"
-  integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==
-
 ci-info@^3.2.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-3.3.0.tgz#b4ed1fb6818dea4803a55c623041f9165d2066b2"
-  integrity sha512-riT/3vI5YpVH6/qomlDnJow6TBee2PBKSEpx3O32EGPYbWGIRsIlGRms3Sm74wYE1JMo8RnO04Hb12+v1J5ICw==
-
-circular-dependency-plugin@5.2.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.2.2.tgz#39e836079db1d3cf2f988dc48c5188a44058b600"
-  integrity sha512-g38K9Cm5WRwlaH6g03B9OEz/0qRizI+2I7n+Gz+L5DxXJAPAiWQvwlYNm1V1jkdpUv95bOe/ASm2vfi/G560jQ==
+  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.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
+  resolved "https://registry.npmjs.org/circular-json/-/circular-json-0.5.9.tgz"
   integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-classnames@^2.2.5, classnames@^2.2.6:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e"
-  integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA==
-
-clean-css@^4.2.3:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.4.tgz#733bf46eba4e607c6891ea57c24a989356831178"
-  integrity sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==
-  dependencies:
-    source-map "~0.6.0"
+classnames@^2.2.6:
+  version "2.3.2"
+  resolved "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz"
+  integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
-cli-boxes@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-2.2.1.tgz#ddd5035d25094fce220e9cab40a45840a440318f"
-  integrity sha512-y4coMcylgSCdVinjiDBuR8PCC2bLjyGTwEmPb9NHR/QaNU6EUOXcTY/s6VjGMD6ENSEaeQYHCY0GNGS5jfMwPw==
-
 cli-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
-cli-progress@^3.8.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.10.0.tgz#63fd9d6343c598c93542fdfa3563a8b59887d78a"
-  integrity sha512-kLORQrhYCAtUPLZxqsAt2YJGOvRdt34+O6jl5cQGb7iF3dM55FQZlTR+rQyIK9JUcO9bBMwZsTlND+3dmFU2Cw==
+cli-progress@^3.12.0:
+  version "3.12.0"
+  resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.12.0.tgz#807ee14b66bcc086258e444ad0f19e7d42577942"
+  integrity sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==
   dependencies:
-    string-width "^4.2.0"
+    string-width "^4.2.3"
 
 cli-spinners@^2.5.0:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.1.tgz#adc954ebe281c37a6319bfa401e6dd2488ffb70d"
-  integrity sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==
+  version "2.8.0"
+  resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.8.0.tgz"
+  integrity sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ==
 
 cli-table3@~0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
-  integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
+  version "0.6.3"
+  resolved "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.3.tgz"
+  integrity sha512-w5Jac5SykAeZJKntOxJCrm63Eg5/4dhMWIcuTbo9rpE+brgaSZo0RuNJZeOyMgsUdhDeojvgyQLmjI+K50ZGyg==
   dependencies:
     string-width "^4.2.0"
   optionalDependencies:
-    colors "1.4.0"
+    "@colors/colors" "1.5.0"
 
 cli-truncate@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/cli-truncate/-/cli-truncate-2.1.0.tgz#c39e28bf05edcde5be3b98992a22deed5a2b93c7"
+  resolved "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz"
   integrity sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==
   dependencies:
     slice-ansi "^3.0.0"
@@ -3989,187 +4184,137 @@ cli-truncate@^2.1.0:
 
 cli-width@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
+  resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1"
-  integrity sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==
-  dependencies:
-    string-width "^4.2.0"
-    strip-ansi "^6.0.0"
-    wrap-ansi "^6.2.0"
-
 cliui@^7.0.2:
   version "7.0.4"
-  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz"
   integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
     string-width "^4.2.0"
     strip-ansi "^6.0.0"
     wrap-ansi "^7.0.0"
 
+cliui@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz"
+  integrity sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.1"
+    wrap-ansi "^7.0.0"
+
 clone-deep@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  resolved "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz"
   integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
   dependencies:
     is-plain-object "^2.0.4"
     kind-of "^6.0.2"
     shallow-clone "^3.0.0"
 
-clone-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
-  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
-  dependencies:
-    mimic-response "^1.0.0"
-
 clone@^1.0.2:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
+  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
+  integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==
 
-clsx@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/clsx/-/clsx-1.1.1.tgz#98b3134f9abbdf23b2663491ace13c5c03a73188"
-  integrity sha512-6/bPho624p3S2pMyvP5kKBPXnI3ufHLObBFCfgx+LkeR5lg2XYy2hqZqUf45ypD8COn2bhgGJSUE+l5dhNBieA==
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
+clsx@^1.0.4, 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==
 
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-support@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-colord@^2.9.1:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
-  integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
-
 colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16:
-  version "2.0.16"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da"
-  integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g==
+  version "2.0.19"
+  resolved "https://registry.npmjs.org/colorette/-/colorette-2.0.19.tgz"
+  integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ==
 
-colors@1.4.0:
+colors@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
+  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:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
+  resolved "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz"
   integrity sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==
   dependencies:
     delayed-stream "~1.0.0"
 
 commander@9.2.0:
   version "9.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-9.2.0.tgz#6e21014b2ed90d8b7c9647230d8b7a94a4a419a9"
+  resolved "https://registry.npmjs.org/commander/-/commander-9.2.0.tgz"
   integrity sha512-e2i4wANQiSXgnrBlIatyHtP1odfUp0BbV5Y5nEGbxtIrStkEOAAzCUirvLBNXHLr7kwLvJl6V+4V3XV9x7Wd9w==
 
 commander@^2.2.0, commander@^2.20.0:
   version "2.20.3"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068"
-  integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==
-
-commander@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-5.1.0.tgz#46abbd1652f8e059bddaef99bbdcb2ad9cf179ae"
-  integrity sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==
-
-commander@^6.1.0:
+commander@^6.1.0, commander@^6.2.1:
   version "6.2.1"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-6.2.1.tgz#0792eb682dfbc325999bb2b84fddddba110ac73c"
+  resolved "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz"
   integrity sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==
 
 commander@^7.0.0, commander@^7.2.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  resolved "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"
   integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
 
 comment-parser@1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b"
+  resolved "https://registry.npmjs.org/comment-parser/-/comment-parser-1.3.1.tgz"
   integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA==
 
 common-tags@^1.8.0:
   version "1.8.2"
-  resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
+  resolved "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz"
   integrity sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==
 
 commondir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
-  integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
-
-component-bind@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1"
-  integrity sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=
-
-component-emitter@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
-  integrity sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=
-
-component-emitter@^1.2.1, component-emitter@~1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
-component-inherit@0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143"
-  integrity sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=
+  resolved "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz"
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
 
 compressible@~2.0.16:
   version "2.0.18"
-  resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.18.tgz#af53cca6b070d4c3c0750fbd77286a6d7cc46fba"
+  resolved "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"
   integrity sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==
   dependencies:
     mime-db ">= 1.43.0 < 2"
 
 compression-webpack-plugin@^9.2.0:
   version "9.2.0"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz#57fd539d17c5907eebdeb4e83dcfe2d7eceb9ef6"
+  resolved "https://registry.npmjs.org/compression-webpack-plugin/-/compression-webpack-plugin-9.2.0.tgz"
   integrity sha512-R/Oi+2+UHotGfu72fJiRoVpuRifZT0tTC6UqFD/DUo+mv8dbOow9rVOuTvDv5nPPm3GZhHL/fKkwxwIHnJ8Nyw==
   dependencies:
     schema-utils "^4.0.0"
@@ -4177,7 +4322,7 @@ compression-webpack-plugin@^9.2.0:
 
 compression@^1.7.4:
   version "1.7.4"
-  resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
+  resolved "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
   dependencies:
     accepts "~1.3.5"
@@ -4190,30 +4335,23 @@ compression@^1.7.4:
 
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
   integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-configstore@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-5.0.1.tgz#d365021b5df4b98cdd187d6a3b0e3f6a7cc5ed96"
-  integrity sha512-aMKprgk5YhBNyH25hj8wGt2+D52Sw1DRRIzqBwLp2Ya9mFmY8KPvvtvmna8SxVR9JMZ4kzMD68N22vlaRpkeFA==
-  dependencies:
-    dot-prop "^5.2.0"
-    graceful-fs "^4.1.2"
-    make-dir "^3.0.0"
-    unique-string "^2.0.0"
-    write-file-atomic "^3.0.0"
-    xdg-basedir "^4.0.0"
-
-connect-history-api-fallback@^1, connect-history-api-fallback@^1.6.0:
+connect-history-api-fallback@^1:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
+  resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
 
+connect-history-api-fallback@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz"
+  integrity sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==
+
 connect@3.6.6:
   version "3.6.6"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
-  integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
+  resolved "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz"
+  integrity sha512-OO7axMmPpu/2XuX1+2Yrg0ddju31B6xLZMWkJ5rYBu4YRmRVlOjvlY6kw2FJKiAzyxGwnrDUAG4s1Pf0sbBMCQ==
   dependencies:
     debug "2.6.9"
     finalhandler "1.1.0"
@@ -4222,7 +4360,7 @@ connect@3.6.6:
 
 connect@^3.7.0:
   version "3.7.0"
-  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  resolved "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz"
   integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
   dependencies:
     debug "2.6.9"
@@ -4232,97 +4370,83 @@ connect@^3.7.0:
 
 console-control-strings@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
+  resolved "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz"
+  integrity sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==
 
 content-disposition@0.5.4:
   version "0.5.4"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  resolved "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz"
   integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
     safe-buffer "5.2.1"
 
 content-type@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
-  integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
 
 convert-source-map@^1.5.1, convert-source-map@^1.7.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+  version "1.9.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.5:
-  version "1.4.5"
-  resolved "https://registry.yarnpkg.com/cookie-parser/-/cookie-parser-1.4.5.tgz#3e572d4b7c0c80f9c61daf604e4336831b5d1d49"
-  integrity sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==
+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==
   dependencies:
-    cookie "0.4.0"
+    cookie "0.4.1"
     cookie-signature "1.0.6"
 
 cookie-signature@1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  resolved "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+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.4.2, cookie@~0.4.1:
+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.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  resolved "https://registry.npmjs.org/cookie/-/cookie-0.4.2.tgz"
   integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
 
 copy-anything@^2.0.1:
   version "2.0.6"
-  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-2.0.6.tgz#092454ea9584a7b7ad5573062b2a87f5900fc480"
+  resolved "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"
   integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
   dependencies:
     is-what "^3.14.1"
 
-copy-concurrently@^1.0.0:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/copy-concurrently/-/copy-concurrently-1.0.5.tgz#92297398cae34937fcafd6ec8139c18051f0b5e0"
-  integrity sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==
-  dependencies:
-    aproba "^1.1.1"
-    fs-write-stream-atomic "^1.0.8"
-    iferr "^0.1.5"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.0"
-
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-to-clipboard@^3:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/copy-to-clipboard/-/copy-to-clipboard-3.3.1.tgz#115aa1a9998ffab6196f93076ad6da3b913662ae"
-  integrity sha512-i13qo6kIHTTpCm8/Wup+0b1mVWETvu2kIMzKoK8FpkLkFxlt0znUAHcMzox+T8sPlqtZXq3CulEjQHsYiGFJUw==
+copy-to-clipboard@^3.3.1:
+  version "3.3.3"
+  resolved "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz"
+  integrity sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==
   dependencies:
     toggle-selection "^1.0.6"
 
-copy-webpack-plugin@10.2.1:
-  version "10.2.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-10.2.1.tgz#115a41f913070ac236a1b576066204cbf35341a1"
-  integrity sha512-nr81NhCAIpAWXGCK5thrKmfCQ6GDY0L5RN0U+BnIn/7Us55+UCex5ANNsNKmIVtDRnk0Ecf+/kzp9SUVrrBMLg==
+copy-webpack-plugin@11.0.0:
+  version "11.0.0"
+  resolved "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-11.0.0.tgz"
+  integrity sha512-fX2MWpamkW0hZxMEg0+mYnA40LTosOSa5TqZ9GYIBzyJa9C3QUaMPSE2xAi/buNr8u89SfD9wHSQVBzrRa/SOQ==
   dependencies:
-    fast-glob "^3.2.7"
+    fast-glob "^3.2.11"
     glob-parent "^6.0.1"
-    globby "^12.0.2"
+    globby "^13.1.1"
     normalize-path "^3.0.0"
     schema-utils "^4.0.0"
     serialize-javascript "^6.0.0"
 
 copy-webpack-plugin@^6.4.1:
   version "6.4.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz#138cd9b436dbca0a6d071720d5414848992ec47e"
+  resolved "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.4.1.tgz"
   integrity sha512-MXyPCjdPVx5iiWyl40Va3JGh27bKzOTNY3NjUTrosD2q7dR/cLD0013uqJ3BpFbUjyONINjb6qI7nDIJujrMbA==
   dependencies:
     cacache "^15.0.5"
@@ -4337,62 +4461,40 @@ copy-webpack-plugin@^6.4.1:
     serialize-javascript "^5.0.1"
     webpack-sources "^1.4.3"
 
-core-js-compat@^3.20.2, core-js-compat@^3.21.0:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.1.tgz#cac369f67c8d134ff8f9bd1623e3bc2c42068c82"
-  integrity sha512-gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g==
+core-js-compat@^3.25.1:
+  version "3.30.0"
+  resolved "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.30.0.tgz"
+  integrity sha512-P5A2h/9mRYZFIAP+5Ab8ns6083IyVpSclU74UNvbGVQ8VM7n3n3/g2yF3AkKQ9NXz2O+ioxLbEWKnDtgsFamhg==
   dependencies:
-    browserslist "^4.19.1"
-    semver "7.0.0"
+    browserslist "^4.21.5"
 
-core-js-pure@^3.20.2:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.21.1.tgz#8c4d1e78839f5f46208de7230cebfb72bc3bdb51"
-  integrity sha512-12VZfFIu+wyVbBebyHmRTuEE/tZrB4tJToWcwAMcsp3h4+sHR+fMJWbKpYiCRWlhFBq+KNyO8rIV9rTkeVmznQ==
-
-core-js@3.20.3:
-  version "3.20.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.20.3.tgz#c710d0a676e684522f3db4ee84e5e18a9d11d69a"
-  integrity sha512-vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag==
-
-core-js@^3.7.0:
-  version "3.21.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.21.1.tgz#f2e0ddc1fc43da6f904706e8e955bc19d06a0d94"
-  integrity sha512-FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig==
+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-util-is@1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
-  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"
+  integrity sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==
 
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
+  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cors@~2.8.5:
   version "2.8.5"
-  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  resolved "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"
   integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
   dependencies:
     object-assign "^4"
     vary "^1"
 
-cosmiconfig@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982"
-  integrity sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==
-  dependencies:
-    "@types/parse-json" "^4.0.0"
-    import-fresh "^3.1.0"
-    parse-json "^5.0.0"
-    path-type "^4.0.0"
-    yaml "^1.7.2"
-
 cosmiconfig@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d"
-  integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ==
+  version "7.1.0"
+  resolved "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz"
+  integrity sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==
   dependencies:
     "@types/parse-json" "^4.0.0"
     import-fresh "^3.2.1"
@@ -4402,12 +4504,12 @@ cosmiconfig@^7.0.0:
 
 create-require@^1.1.0:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
+  resolved "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 critters@0.0.16:
   version "0.0.16"
-  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.16.tgz#ffa2c5561a65b43c53b940036237ce72dcebfe93"
+  resolved "https://registry.npmjs.org/critters/-/critters-0.0.16.tgz"
   integrity sha512-JwjgmO6i3y6RWtLYmXwO5jMd+maZt8Tnfu7VVISmEWyQqfLpB8soBswf8/2bu6SBXxtKA68Al3c+qIG1ApT68A==
   dependencies:
     chalk "^4.1.0"
@@ -4419,14 +4521,14 @@ critters@0.0.16:
 
 cross-env@^7.0.3:
   version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  resolved "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz"
   integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     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.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
   dependencies:
     path-key "^3.1.0"
@@ -4435,101 +4537,52 @@ cross-spawn@^7.0.0, cross-spawn@^7.0.1, cross-spawn@^7.0.2, cross-spawn@^7.0.3:
 
 crypt@0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
-  integrity sha1-iNf/fsDfuG9xPch7u0LQRNPmxBs=
+  resolved "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"
+  integrity sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==
 
-crypto-random-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
-  integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
-
-css-blank-pseudo@^3.0.2, css-blank-pseudo@^3.0.3:
+css-blank-pseudo@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz#36523b01c12a25d812df343a32c322d2a2324561"
+  resolved "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-3.0.3.tgz"
   integrity sha512-VS90XWtsHGqoM0t4KpH053c4ehxZ2E6HtGI7x68YFV0pTo/QmkV/YFA+NnlvK8guxZVNWGQhVNJGC39Q8XF4OQ==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
 css-box-model@^1.2.0:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/css-box-model/-/css-box-model-1.2.1.tgz#59951d3b81fd6b2074a62d49444415b0d2b4d7c1"
+  resolved "https://registry.npmjs.org/css-box-model/-/css-box-model-1.2.1.tgz"
   integrity sha512-a7Vr4Q/kd/aw96bnJG332W9V9LkJO69JRcaCYDUqjp6/z0w6VcZjgAcTbgFxEPfBgdnAwlh3iwu+hLopa+flJw==
   dependencies:
     tiny-invariant "^1.0.6"
 
-css-declaration-sorter@^6.0.3:
-  version "6.1.4"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.4.tgz#b9bfb4ed9a41f8dcca9bf7184d849ea94a8294b4"
-  integrity sha512-lpfkqS0fctcmZotJGhnxkIyJWvBXgpyi2wsFd4J8VB7wzyrT6Ch/3Q+FMNJpjK4gu1+GN5khOnpU2ZVKrLbhCw==
-  dependencies:
-    timsort "^0.3.0"
-
-css-has-pseudo@^3.0.3, css-has-pseudo@^3.0.4:
+css-has-pseudo@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz#57f6be91ca242d5c9020ee3e51bbb5b89fc7af73"
+  resolved "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-3.0.4.tgz"
   integrity sha512-Vse0xpR1K9MNlp2j5w1pgWIJtm1a8qS0JwS9goFYcImjlHEmywP9VUF05aGBXzGpDJF86QXk4L0ypBmwPhGArw==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
-css-loader@6.5.1:
-  version "6.5.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.5.1.tgz#0c43d4fbe0d97f699c91e9818cb585759091d1b1"
-  integrity sha512-gEy2w9AnJNnD9Kuo4XAP9VflW/ujKoS9c/syO+uWMlm5igc7LysKzPXaDoR2vroROkSwsTS2tGr1yGGEbZOYZQ==
+css-loader@6.7.3:
+  version "6.7.3"
+  resolved "https://registry.npmjs.org/css-loader/-/css-loader-6.7.3.tgz"
+  integrity sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==
   dependencies:
     icss-utils "^5.1.0"
-    postcss "^8.2.15"
-    postcss-modules-extract-imports "^3.0.0"
-    postcss-modules-local-by-default "^4.0.0"
-    postcss-modules-scope "^3.0.0"
-    postcss-modules-values "^4.0.0"
-    postcss-value-parser "^4.1.0"
-    semver "^7.3.5"
-
-css-loader@^6.2.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.6.0.tgz#c792ad5510bd1712618b49381bd0310574fafbd3"
-  integrity sha512-FK7H2lisOixPT406s5gZM1S3l8GrfhEBT3ZiL2UX1Ng1XWs0y2GPllz/OTyvbaHe12VgQrIXIzuEGVlbUhodqg==
-  dependencies:
-    icss-utils "^5.1.0"
-    postcss "^8.4.5"
+    postcss "^8.4.19"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.2.0"
-    semver "^7.3.5"
+    semver "^7.3.8"
 
-css-minimizer-webpack-plugin@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz#ab78f781ced9181992fe7b6e4f3422e76429878f"
-  integrity sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==
-  dependencies:
-    cssnano "^5.0.6"
-    jest-worker "^27.0.2"
-    postcss "^8.3.5"
-    schema-utils "^4.0.0"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-
-css-prefers-color-scheme@^6.0.2, css-prefers-color-scheme@^6.0.3:
+css-prefers-color-scheme@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz#ca8a22e5992c10a5b9d315155e7caee625903349"
+  resolved "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-6.0.3.tgz"
   integrity sha512-4BqMbZksRkJQx2zAjrokiGMd07RqOa2IxIrrN10lyBe9xhn9DEvjUK79J6jkeiv9D9hQFXKb6g1jwU62jziJZA==
 
-css-select@^4.1.3, css-select@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd"
-  integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^5.1.0"
-    domhandler "^4.3.0"
-    domutils "^2.8.0"
-    nth-check "^2.0.1"
-
-css-select@^4.3.0:
+css-select@^4.2.0, css-select@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b"
+  resolved "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz"
   integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==
   dependencies:
     boolbase "^1.0.0"
@@ -4538,162 +4591,79 @@ css-select@^4.3.0:
     domutils "^2.8.0"
     nth-check "^2.0.1"
 
-css-tree@^1.1.2, css-tree@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
-  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
-  dependencies:
-    mdn-data "2.0.14"
-    source-map "^0.6.1"
-
 css-vendor@^2.0.8:
   version "2.0.8"
-  resolved "https://registry.yarnpkg.com/css-vendor/-/css-vendor-2.0.8.tgz#e47f91d3bd3117d49180a3c935e62e3d9f7f449d"
+  resolved "https://registry.npmjs.org/css-vendor/-/css-vendor-2.0.8.tgz"
   integrity sha512-x9Aq0XTInxrkuFeHKbYC7zWY8ai7qJ04Kxd9MnvbC1uO5DagxoHQjm4JvG+vCdXOoFtCjbL2XSZfxmoYa9uQVQ==
   dependencies:
     "@babel/runtime" "^7.8.3"
     is-in-browser "^1.0.2"
 
-css-what@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe"
-  integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw==
-
 css-what@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4"
+  resolved "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz"
   integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==
 
-css@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
-  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
-  dependencies:
-    inherits "^2.0.4"
-    source-map "^0.6.1"
-    source-map-resolve "^0.6.0"
-
-cssdb@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-5.1.0.tgz#ec728d5f5c0811debd0820cbebda505d43003400"
-  integrity sha512-/vqjXhv1x9eGkE/zO6o8ZOI7dgdZbLVLUGyVRbPgk6YipXbW87YzUCcO+Jrmi5bwJlAH6oD+MNeZyRgXea1GZw==
-
-cssdb@^6.4.0:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/cssdb/-/cssdb-6.4.1.tgz#a2b5955e3283d8df6b6bb86e4107fedaeec1521b"
-  integrity sha512-R70R/Q1fPlM1D6Y+Kpat0QjiY+aMsY2/8lekdVoYcJ7ZQs9kw71W78FdOMf8DFq975KHQf1089PNg1dLsbAhoA==
+cssdb@^7.1.0:
+  version "7.5.4"
+  resolved "https://registry.npmjs.org/cssdb/-/cssdb-7.5.4.tgz"
+  integrity sha512-fGD+J6Jlq+aurfE1VDXlLS4Pt0VtNlu2+YgfGOdMxRyl/HQ9bDiHTwSck1Yz8A97Dt/82izSK6Bp/4nVqacOsg==
 
 cssesc@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.2.0.tgz#2579d38b9217746f2cf9f938954a91e00418ded6"
-  integrity sha512-3N5Vcptj2pqVKpHVqH6ezOJvqikR2PdLTbTrsrhF61FbLRQuujAqZ2sKN5rvcMsb7hFjrNnjZT8CGEkxoN/Pwg==
-  dependencies:
-    css-declaration-sorter "^6.0.3"
-    cssnano-utils "^3.1.0"
-    postcss-calc "^8.2.3"
-    postcss-colormin "^5.3.0"
-    postcss-convert-values "^5.1.0"
-    postcss-discard-comments "^5.1.0"
-    postcss-discard-duplicates "^5.1.0"
-    postcss-discard-empty "^5.1.0"
-    postcss-discard-overridden "^5.1.0"
-    postcss-merge-longhand "^5.1.0"
-    postcss-merge-rules "^5.1.0"
-    postcss-minify-font-values "^5.1.0"
-    postcss-minify-gradients "^5.1.0"
-    postcss-minify-params "^5.1.0"
-    postcss-minify-selectors "^5.2.0"
-    postcss-normalize-charset "^5.1.0"
-    postcss-normalize-display-values "^5.1.0"
-    postcss-normalize-positions "^5.1.0"
-    postcss-normalize-repeat-style "^5.1.0"
-    postcss-normalize-string "^5.1.0"
-    postcss-normalize-timing-functions "^5.1.0"
-    postcss-normalize-unicode "^5.1.0"
-    postcss-normalize-url "^5.1.0"
-    postcss-normalize-whitespace "^5.1.0"
-    postcss-ordered-values "^5.1.0"
-    postcss-reduce-initial "^5.1.0"
-    postcss-reduce-transforms "^5.1.0"
-    postcss-svgo "^5.1.0"
-    postcss-unique-selectors "^5.1.0"
-
-cssnano-utils@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-3.1.0.tgz#95684d08c91511edfc70d2636338ca37ef3a6861"
-  integrity sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==
-
-cssnano@^5.0.6:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.1.0.tgz#cf977d660a5824d0d5542639ed1d4045afd84cbe"
-  integrity sha512-wWxave1wMlThGg4ueK98jFKaNqXnQd1nVZpSkQ9XvR+YymlzP1ofWqES1JkHtI250LksP9z5JH+oDcrKDJezAg==
-  dependencies:
-    cssnano-preset-default "^5.2.0"
-    lilconfig "^2.0.3"
-    yaml "^1.10.2"
-
-csso@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-4.2.0.tgz#ea3a561346e8dc9f546d6febedd50187cf389529"
-  integrity sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==
-  dependencies:
-    css-tree "^1.1.2"
-
 cssom@^0.4.4:
   version "0.4.4"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.4.4.tgz#5a66cf93d2d0b661d80bf6a44fb65f5c2e4e0a10"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz"
   integrity sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==
 
 cssom@^0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.5.0.tgz#d254fa92cd8b6fbd83811b9fbaed34663cc17c36"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz"
   integrity sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw==
 
 cssom@~0.3.6:
   version "0.3.8"
-  resolved "https://registry.yarnpkg.com/cssom/-/cssom-0.3.8.tgz#9f1276f5b2b463f2114d3f2c75250af8c1a36f4a"
+  resolved "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz"
   integrity sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==
 
 cssstyle@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz#ff665a0ddbdc31864b09647f34163443d90b0852"
+  resolved "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz"
   integrity sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==
   dependencies:
     cssom "~0.3.6"
 
 csstype@^2.5.2:
-  version "2.6.20"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.20.tgz#9229c65ea0b260cf4d3d997cb06288e36a8d6dda"
-  integrity sha512-/WwNkdXfckNgw6S5R125rrW8ez139lBHWouiBvX8dfMFtcn6V81REDqnH7+CRpRipfYlyU1CmOnOxrmGcFOjeA==
+  version "2.6.21"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-2.6.21.tgz"
+  integrity sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==
 
 csstype@^3.0.2:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33"
-  integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw==
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz"
+  integrity sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==
 
 custom-event@~1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
-  integrity sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=
+  resolved "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz"
+  integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
 
-cypress-axe@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-0.14.0.tgz#5f5e70fb36b8cb3ba73a8ba01e9262ff1268d5e2"
-  integrity sha512-7Rdjnko0MjggCmndc1wECAkvQBIhuy+DRtjF7bd5YPZRFvubfMNvrxfqD8PWQmxm7MZE0ffS4Xr43V6ZmvLopg==
+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@9.5.1:
-  version "9.5.1"
-  resolved "https://registry.yarnpkg.com/cypress/-/cypress-9.5.1.tgz#51162f3688cedf5ffce311b914ef49a7c1ece076"
-  integrity sha512-H7lUWB3Svr44gz1rNnj941xmdsCljXoJa2cDneAltjI9leKLMQLm30x6jLlpQ730tiVtIbW5HdUmBzPzwzfUQg==
+cypress@12.17.4:
+  version "12.17.4"
+  resolved "https://registry.yarnpkg.com/cypress/-/cypress-12.17.4.tgz#b4dadf41673058493fa0d2362faa3da1f6ae2e6c"
+  integrity sha512-gAN8Pmns9MA5eCDFSDJXWKUpaL3IDd89N9TtIupjYnzLSmlpVr+ZR+vb4U/qaMp+lB6tBvAmt7504c3Z4RU5KQ==
   dependencies:
-    "@cypress/request" "^2.88.10"
+    "@cypress/request" "2.88.12"
     "@cypress/xvfb" "^1.2.4"
-    "@types/node" "^14.14.31"
+    "@types/node" "^16.18.39"
     "@types/sinonjs__fake-timers" "8.1.1"
     "@types/sizzle" "^2.3.2"
     arch "^2.2.0"
@@ -4705,12 +4675,12 @@ cypress@9.5.1:
     check-more-types "^2.24.0"
     cli-cursor "^3.1.0"
     cli-table3 "~0.6.1"
-    commander "^5.1.0"
+    commander "^6.2.1"
     common-tags "^1.8.0"
     dayjs "^1.10.4"
-    debug "^4.3.2"
+    debug "^4.3.4"
     enquirer "^2.3.6"
-    eventemitter2 "^6.4.3"
+    eventemitter2 "6.4.7"
     execa "4.1.0"
     executable "^4.1.1"
     extract-zip "2.0.1"
@@ -4723,12 +4693,13 @@ cypress@9.5.1:
     listr2 "^3.8.3"
     lodash "^4.17.21"
     log-symbols "^4.0.0"
-    minimist "^1.2.5"
+    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"
     untildify "^4.0.0"
@@ -4736,206 +4707,156 @@ cypress@9.5.1:
 
 dashdash@^1.12.0:
   version "1.14.1"
-  resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"
-  integrity sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=
+  resolved "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"
+  integrity sha512-jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g==
   dependencies:
     assert-plus "^1.0.0"
 
 data-urls@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz#156485a72963a970f5d5821aaf642bef2bf2db9b"
+  resolved "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz"
   integrity sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==
   dependencies:
     abab "^2.0.3"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
 
-data-urls@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-3.0.1.tgz#597fc2ae30f8bc4dbcf731fcd1b1954353afc6f8"
-  integrity sha512-Ds554NeT5Gennfoo9KN50Vh6tpgtvYEwraYjejXnyTpu1C7oXKxdFk75REooENHE8ndTVOJuv+BEs4/J/xcozw==
+data-urls@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz"
+  integrity sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==
   dependencies:
-    abab "^2.0.3"
+    abab "^2.0.6"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^10.0.0"
+    whatwg-url "^11.0.0"
 
-date-format@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.4.tgz#b58036e29e74121fca3e1b3e0dc4a62c65faa233"
-  integrity sha512-/jyf4rhB17ge328HJuJjAcmRtCsGd+NDeAtahRBTaK6vSPR6MO5HlrAit3Nn7dVjaa6sowW0WXt8yQtLyZQFRg==
+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-format@^4.0.14:
+  version "4.0.14"
+  resolved "https://registry.npmjs.org/date-format/-/date-format-4.0.14.tgz"
+  integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
 
 dayjs@^1.10.4:
-  version "1.10.8"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.8.tgz#267df4bc6276fcb33c04a6735287e3f429abec41"
-  integrity sha512-wbNwDfBHHur9UOzNUjeKUOJ0fCb0a52Wx0xInmQ7Y8FstyajiV1NmK1e00cxsr9YrE9r7yAChE0VvpuY5Rnlow==
+  version "1.11.7"
+  resolved "https://registry.npmjs.org/dayjs/-/dayjs-1.11.7.tgz"
+  integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==
 
-debug-loader@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/debug-loader/-/debug-loader-0.0.1.tgz#44dc37e09e3c39e6af334681960f70a534a9d056"
-  integrity sha1-RNw34J48OeavM0aBlg9wpTSp0FY=
-  dependencies:
-    loader-utils "^0.2.12"
-
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
+debug@2.6.9, debug@^2.2.0:
   version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.3.3, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3, debug@~4.3.1, debug@~4.3.2:
-  version "4.3.3"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+  version "4.3.4"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
 debug@4.3.2:
   version "4.3.2"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  resolved "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz"
   integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
   dependencies:
     ms "2.1.2"
 
-debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
+debug@^3.1.0, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
+  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.3.4:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
-  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+decamelize@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9"
+  integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA==
+
+decimal.js@^10.2.1, decimal.js@^10.4.2:
+  version "10.4.3"
+  resolved "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz"
+  integrity sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==
+
+deep-equal@^2.0.5:
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.0.tgz"
+  integrity sha512-RdpzE0Hv4lhowpIUKKMJfeH6C1pXdtT1/it80ubgWqwI3qpuxUBpC1S4hnHg+zjnuOoDkzUtUCEEkG+XG5l3Mw==
   dependencies:
-    ms "2.1.2"
-
-debug@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
-  integrity sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==
-  dependencies:
-    ms "2.0.0"
-
-debug@~4.1.0:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
-decamelize@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
-
-decimal.js@^10.2.1, decimal.js@^10.3.1:
-  version "10.3.1"
-  resolved "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.3.1.tgz#d8c3a444a9c6774ba60ca6ad7261c3a94fd5e783"
-  integrity sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==
-
-decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
-
-decompress-response@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
-  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
-  dependencies:
-    mimic-response "^1.0.0"
-
-deep-equal@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/deep-equal/-/deep-equal-1.1.1.tgz#b5c98c942ceffaf7cb051e24e1434a25a2e6076a"
-  integrity sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==
-  dependencies:
-    is-arguments "^1.0.4"
-    is-date-object "^1.0.1"
-    is-regex "^1.0.4"
-    object-is "^1.0.1"
+    call-bind "^1.0.2"
+    es-get-iterator "^1.1.2"
+    get-intrinsic "^1.1.3"
+    is-arguments "^1.1.1"
+    is-array-buffer "^3.0.1"
+    is-date-object "^1.0.5"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    isarray "^2.0.5"
+    object-is "^1.1.5"
     object-keys "^1.1.1"
-    regexp.prototype.flags "^1.2.0"
-
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+    object.assign "^4.1.4"
+    regexp.prototype.flags "^1.4.3"
+    side-channel "^1.0.4"
+    which-boxed-primitive "^1.0.2"
+    which-collection "^1.0.1"
+    which-typed-array "^1.1.9"
 
 deep-freeze@0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84"
-  integrity sha1-OgsABd4YZygZ39OM0x+RF5yJPoQ=
+  resolved "https://registry.npmjs.org/deep-freeze/-/deep-freeze-0.0.1.tgz"
+  integrity sha512-Z+z8HiAvsGwmjqlphnHW5oz6yWlOwu6EQfFTjmeTWlDeda3FS2yv3jhq35TX/ewmsnqB+RX2IdsIOyjJCQN5tg==
 
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
+  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
-deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.2.2.tgz#44d2ea3679b8f4d4ffba33f03d865fc1e7bf4955"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
+deepmerge@^4.2.2, deepmerge@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 default-gateway@^6.0.3:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-6.0.3.tgz#819494c888053bdb743edbf343d6cdf7f2943a71"
+  resolved "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz"
   integrity sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==
   dependencies:
     execa "^5.0.0"
 
 defaults@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/defaults/-/defaults-1.0.3.tgz#c656051e9817d9ff08ed881477f3fe4019f3ef7d"
-  integrity sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz"
+  integrity sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==
   dependencies:
     clone "^1.0.2"
 
-defer-to-connect@^1.0.1:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-1.1.3.tgz#331ae050c08dcf789f8c83a7b81f0ed94f4ac591"
-  integrity sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==
-
 define-lazy-prop@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz#3f7ae421129bcaaac9bc74905c98a0009ec9ee7f"
+  resolved "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz"
   integrity sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==
 
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
+define-properties@^1.1.3, define-properties@^1.1.4:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz"
+  integrity sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==
   dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
+    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 sha1-wSyYHQZ4RshLyvhiz/kw2Qf/0ag=
+  integrity sha512-Z4fzpbIRjOu7lO5jCETSWoqUDVe0IPOlfugBsF6suen2LKDlVb4QZpKEM9P+buNJ4KI1eN7I083w/pbKUpsrWQ==
   dependencies:
     globby "^5.0.0"
     is-path-cwd "^1.0.0"
@@ -4945,138 +4866,116 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
-del@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/del/-/del-6.0.0.tgz#0b40d0332cea743f1614f818be4feb717714c952"
-  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
-  dependencies:
-    globby "^11.0.1"
-    graceful-fs "^4.2.4"
-    is-glob "^4.0.1"
-    is-path-cwd "^2.2.0"
-    is-path-inside "^3.0.2"
-    p-map "^4.0.0"
-    rimraf "^3.0.2"
-    slash "^3.0.0"
+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"
-  resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
-  integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
+  resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
+  integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
 
 delegates@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+  resolved "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz"
+  integrity sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==
 
-depd@2.0.0, depd@~2.0.0:
+depd@2.0.0, depd@^2.0.0, depd@~2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-depd@^1.1.2, depd@~1.1.2:
+depd@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9"
-  integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=
+  resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"
+  integrity sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==
 
 dependency-graph@^0.11.0:
   version "0.11.0"
-  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
+  resolved "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz"
   integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
 destroy@1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  resolved "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 destroy@~1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+  resolved "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"
+  integrity sha512-3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg==
 
 detect-node@^2.0.4:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  resolved "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz"
   integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
 dev-ip@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/dev-ip/-/dev-ip-1.0.1.tgz#a76a3ed1855be7a012bb8ac16cb80f3c00dc28f0"
-  integrity sha1-p2o+0YVb56ASu4rBbLgPPADcKPA=
+  resolved "https://registry.npmjs.org/dev-ip/-/dev-ip-1.0.1.tgz"
+  integrity sha512-LmVkry/oDShEgSZPNgqCIp2/TlqtExeGmymru3uCELnfyjY11IzpAproLYs+1X88fXO6DBoYP3ul2Xo2yz2j6A==
 
 di@^0.0.1:
   version "0.0.1"
-  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
-  integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
+  resolved "https://registry.npmjs.org/di/-/di-0.0.1.tgz"
+  integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
 
 diff@^4.0.1:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
+  resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz"
   integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==
 
 dir-glob@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
+  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
   integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
     path-type "^4.0.0"
 
-dlv@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/dlv/-/dlv-1.1.3.tgz#5c198a8a11453596e751494d49874bc7732f2e79"
-  integrity sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==
-
 dnd-core@^10.0.2:
   version "10.0.2"
-  resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-10.0.2.tgz#051dc119682ea1185622f954667670d3d5f6a574"
+  resolved "https://registry.npmjs.org/dnd-core/-/dnd-core-10.0.2.tgz"
   integrity sha512-PrxEjxF0+6Y1n1n1Z9hSWZ1tvnDXv9syL+BccV1r1RC08uWNsyetf8AnWmUF3NgYPwy0HKQJwTqGkZK+1NlaFA==
   dependencies:
     "@react-dnd/asap" "^4.0.0"
     "@react-dnd/invariant" "^2.0.0"
     redux "^4.0.4"
 
-dnd-multi-backend@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/dnd-multi-backend/-/dnd-multi-backend-5.1.1.tgz#0032761795c3df6a479989f002d8a7d92ad58094"
-  integrity sha512-+bdMsGAC1wlne4+AwTvr6eQ6Bp3St6hn0wp0BcpUMOMVTNM0S+n0Ha8S/qbpYK7XY+i0j439v+yaKO9g9aFvQg==
+dnd-multi-backend@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/dnd-multi-backend/-/dnd-multi-backend-5.0.1.tgz"
+  integrity sha512-BAOj6fIeGfZPA1LreehaV8mUD7Ww0EpaKqSDRrZ5mZXLWLIxFPPT3bIvpJhHUCt0+lTrOqkXu11Hudh+gHXNUA==
 
 dns-equal@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d"
-  integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
+  resolved "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"
+  integrity sha512-z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg==
 
-dns-packet@^1.3.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
-  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
+dns-packet@^5.2.2:
+  version "5.5.0"
+  resolved "https://registry.npmjs.org/dns-packet/-/dns-packet-5.5.0.tgz"
+  integrity sha512-USawdAUzRkV6xrqTjiAEp6M9YagZEzWcSUaZTcIFAiyQWW1SoI6KyId8y2+/71wbgHKQAKd+iupLv4YvEwYWvA==
   dependencies:
-    ip "^1.1.0"
-    safe-buffer "^5.0.1"
-
-dns-txt@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/dns-txt/-/dns-txt-2.0.2.tgz#b91d806f5d27188e4ab3e7d107d881a1cc4642b6"
-  integrity sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=
-  dependencies:
-    buffer-indexof "^1.0.0"
+    "@leichtgewicht/ip-codec" "^2.0.1"
 
 doctrine@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz"
   integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
   dependencies:
     esutils "^2.0.2"
 
 doctrine@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
   integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
 dom-helpers@^5.0.1:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/dom-helpers/-/dom-helpers-5.2.1.tgz#d9400536b2bf8225ad98fe052e029451ac40e902"
+  resolved "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz"
   integrity sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==
   dependencies:
     "@babel/runtime" "^7.8.7"
@@ -5084,257 +4983,200 @@ dom-helpers@^5.0.1:
 
 dom-serialize@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
-  integrity sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=
+  resolved "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz"
+  integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==
   dependencies:
     custom-event "~1.0.0"
     ent "~2.2.0"
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@^1.0.1:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
-  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^4.2.0"
-    entities "^2.0.0"
-
-dom-serializer@^1.3.2:
+dom-serializer@^1.0.1, dom-serializer@^1.3.2:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.4.1.tgz#de5d41b1aea290215dc45a6dae8adcf1d32e2d30"
+  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz"
   integrity sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==
   dependencies:
     domelementtype "^2.0.1"
     domhandler "^4.2.0"
     entities "^2.0.0"
 
-domelementtype@^2.0.1, domelementtype@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
-  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+dom-serializer@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz"
+  integrity sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.2"
+    entities "^4.2.0"
+
+domelementtype@^2.0.1, domelementtype@^2.2.0, domelementtype@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz"
+  integrity sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==
 
 domexception@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz#fb44aefba793e1574b0af6aed2801d057529f304"
+  resolved "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz"
   integrity sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==
   dependencies:
     webidl-conversions "^5.0.0"
 
 domexception@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domexception/-/domexception-4.0.0.tgz#4ad1be56ccadc86fc76d033353999a8037d03673"
+  resolved "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz"
   integrity sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==
   dependencies:
     webidl-conversions "^7.0.0"
 
-domhandler@^3.0.0, domhandler@^3.3.0:
+domhandler@^3.3.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
+  resolved "https://registry.npmjs.org/domhandler/-/domhandler-3.3.0.tgz"
   integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
   dependencies:
     domelementtype "^2.0.1"
 
-domhandler@^4.0.0, domhandler@^4.3.1:
+domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1:
   version "4.3.1"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c"
+  resolved "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz"
   integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==
   dependencies:
     domelementtype "^2.2.0"
 
-domhandler@^4.2.0, domhandler@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626"
-  integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g==
+domhandler@^5.0.1, domhandler@^5.0.2, domhandler@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz"
+  integrity sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==
   dependencies:
-    domelementtype "^2.2.0"
+    domelementtype "^2.3.0"
 
 domino@^2.1.2:
   version "2.1.6"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.6.tgz#fe4ace4310526e5e7b9d12c7de01b7f485a57ffe"
+  resolved "https://registry.npmjs.org/domino/-/domino-2.1.6.tgz"
   integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==
 
 dompurify@^2.0.11:
-  version "2.3.6"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.6.tgz#2e019d7d7617aacac07cbbe3d88ae3ad354cf875"
-  integrity sha512-OFP2u/3T1R5CEgWCEONuJ1a5+MFKnOYpkywpUSxv/dj1LeBT1erK+JwM7zK0ROy2BRhqVCf0LRw/kHqKuMkVGg==
+  version "2.4.5"
+  resolved "https://registry.npmjs.org/dompurify/-/dompurify-2.4.5.tgz"
+  integrity sha512-jggCCd+8Iqp4Tsz0nIvpcb22InKEBrGz5dw3EQJMs8HPJDsKbFIO3STYtAvCfDx26Muevn1MHVI0XxjgFfmiSA==
 
-domutils@^2.0.0, domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0:
+domutils@^2.4.2, domutils@^2.5.2, domutils@^2.8.0:
   version "2.8.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135"
+  resolved "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz"
   integrity sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.2.0"
     domhandler "^4.2.0"
 
-dot-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
-  integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
+domutils@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/domutils/-/domutils-3.0.1.tgz"
+  integrity sha512-z08c1l761iKhDFtfXO04C7kTdPBLi41zwOZl00WS8b5eiaebNpY00HKbztwBq+e3vyqWNwWF3mP9YLUeqIrF+Q==
   dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-dot-prop@^5.2.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz#90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"
-  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
-  dependencies:
-    is-obj "^2.0.0"
-
-dotenv@^8.2.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.6.0.tgz#061af664d19f7f4d8fc6e4ff9b584ce237adcb8b"
-  integrity sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==
-
-duplexer3@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
-  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
+    dom-serializer "^2.0.0"
+    domelementtype "^2.3.0"
+    domhandler "^5.0.1"
 
 duplexer@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
+  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.yarnpkg.com/easy-extender/-/easy-extender-2.3.4.tgz#298789b64f9aaba62169c77a2b3b64b4c9589b8f"
+  resolved "https://registry.npmjs.org/easy-extender/-/easy-extender-2.3.4.tgz"
   integrity sha512-8cAwm6md1YTiPpOvDULYJL4ZS6WfM5/cTeVVh4JsvyYZAoqlRVUpHL9Gr5Fy7HA6xcSZicUia3DeAgO3Us8E+Q==
   dependencies:
     lodash "^4.17.10"
 
-eazy-logger@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.1.0.tgz#b169eb56df714608fa114f164c8a2956bec9f0f3"
-  integrity sha512-/snsn2JqBtUSSstEl4R0RKjkisGHAhvYj89i7r3ytNUKW12y178KDZwXLXIgwDqLW6E/VRMT9qfld7wvFae8bQ==
+eazy-logger@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/eazy-logger/-/eazy-logger-4.0.1.tgz"
+  integrity sha512-2GSFtnnC6U4IEKhEI7+PvdxrmjJ04mdsj3wHZTFiw0tUtG4HCWzTr13ZYTk8XOGnA1xQMaDljoBOYlk3D/MMSw==
   dependencies:
-    tfunk "^4.0.0"
+    chalk "4.1.2"
 
 ecc-jsbn@~0.1.1:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
-  integrity sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=
+  resolved "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"
+  integrity sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==
   dependencies:
     jsbn "~0.1.0"
     safer-buffer "^2.1.0"
 
 ee-first@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  resolved "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-ejs@^3.1.5:
-  version "3.1.8"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.8.tgz#758d32910c78047585c7ef1f92f9ee041c1c190b"
-  integrity sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==
+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==
   dependencies:
     jake "^10.8.5"
 
-electron-to-chromium@^1.4.71:
-  version "1.4.75"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.75.tgz#d1ad9bb46f2f1bf432118c2be21d27ffeae82fdd"
-  integrity sha512-LxgUNeu3BVU7sXaKjUDD9xivocQLxFtq6wgERrutdY/yIOps3ODOZExK1jg8DTEg4U8TUCb5MLGeWFOYuxjF3Q==
-
-electron-to-chromium@^1.4.76:
-  version "1.4.81"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.81.tgz#a9ce8997232fb9fb0ec53de8931a85b18c0a7383"
-  integrity sha512-Gs7xVpIZ7tYYSDA+WgpzwpPvfGwUk3KSIjJ0akuj5XQHFdyQnsUoM76EA4CIHXNLPiVwTwOFay9RMb0ChG3OBw==
+electron-to-chromium@^1.4.284:
+  version "1.4.357"
+  resolved "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.357.tgz"
+  integrity sha512-UTkCbNTAcGXABmEnQrGcW4m3cG6fcyBfD4KDF0iyEAlbrGZiY9dmslyDAGOD1Kr5biN2F743Y30aRCOtau35Vw==
 
 element-resize-detector@^1.2.1:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/element-resize-detector/-/element-resize-detector-1.2.4.tgz#3e6c5982dd77508b5fa7e6d5c02170e26325c9b1"
+  resolved "https://registry.npmjs.org/element-resize-detector/-/element-resize-detector-1.2.4.tgz"
   integrity sha512-Fl5Ftk6WwXE0wqCgNoseKWndjzZlDCwuPTcoVZfCP9R3EHQF8qUtr3YUPNETegRBOKqQKPW3n4kiIWngGi8tKg==
   dependencies:
     batch-processor "1.0.0"
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-emojis-list@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
-  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
-
 emojis-list@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-3.0.0.tgz#5570662046ad29e2e916e71aae260abdff4f6a78"
+  resolved "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz"
   integrity sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==
 
 encodeurl@~1.0.1, encodeurl@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  resolved "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
-encoding@^0.1.12, encoding@^0.1.13:
+encoding@^0.1.13:
   version "0.1.13"
-  resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
+  resolved "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
   dependencies:
     iconv-lite "^0.6.2"
 
 end-of-stream@^1.1.0:
   version "1.4.4"
-  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"
+  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
   integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
   dependencies:
     once "^1.4.0"
 
-engine.io-client@~3.5.0:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-3.5.2.tgz#0ef473621294004e9ceebe73cef0af9e36f2f5fa"
-  integrity sha512-QEqIp+gJ/kMHeUun7f5Vv3bteRHppHH/FMBQX/esFj/fuYfjyUKWGMo3VCvIP/V8bE9KcjHmRZrhIz2Z9oNsDA==
+engine.io-client@~6.4.0:
+  version "6.4.0"
+  resolved "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.4.0.tgz"
+  integrity sha512-GyKPDyoEha+XZ7iEqam49vz6auPnNJ9ZBfy89f+rMMas8AuiMWOZ9PVzu8xb9ZC6rafUqiGHSCfu22ih66E+1g==
   dependencies:
-    component-emitter "~1.3.0"
-    component-inherit "0.0.3"
-    debug "~3.1.0"
-    engine.io-parser "~2.2.0"
-    has-cors "1.1.0"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    ws "~7.4.2"
-    xmlhttprequest-ssl "~1.6.2"
-    yeast "0.1.2"
-
-engine.io-parser@~2.2.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-2.2.1.tgz#57ce5611d9370ee94f99641b589f94c97e4f5da7"
-  integrity sha512-x+dN/fBH8Ro8TFwJ+rkB2AmuVw9Yu2mockR/p3W8f8YtExwFgDvBDi0GWyb4ZLkpahtDGZgtr3zLovanJghPqg==
-  dependencies:
-    after "0.8.2"
-    arraybuffer.slice "~0.0.7"
-    base64-arraybuffer "0.1.4"
-    blob "0.0.5"
-    has-binary2 "~1.0.2"
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+    engine.io-parser "~5.0.3"
+    ws "~8.11.0"
+    xmlhttprequest-ssl "~2.0.0"
 
 engine.io-parser@~5.0.3:
-  version "5.0.3"
-  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.0.3.tgz#ca1f0d7b11e290b4bfda251803baea765ed89c09"
-  integrity sha512-BtQxwF27XUNnSafQLvDi0dQ8s3i6VgzSoQMJacpIcGNrlUdfHSKbgm3jmjCVvQluGzqwujQMPAoMai3oYSTurg==
-  dependencies:
-    "@socket.io/base64-arraybuffer" "~1.0.2"
+  version "5.0.6"
+  resolved "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.0.6.tgz"
+  integrity sha512-tjuoZDMAdEhVnSFleYPCtdL2GXwVTGtNjoeJd9IhIG3C1xs9uwxqRNEu5WpnDZCaozwVlK/nuQhpodhXSIMaxw==
 
-engine.io@~3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-3.5.0.tgz#9d6b985c8a39b1fe87cd91eb014de0552259821b"
-  integrity sha512-21HlvPUKaitDGE4GXNtQ7PLP0Sz4aWLddMPw2VTyFz1FVZqu/kZsJUO8WNpKuE/OCL7nkfRaOui2ZCJloGznGA==
-  dependencies:
-    accepts "~1.3.4"
-    base64id "2.0.0"
-    cookie "~0.4.1"
-    debug "~4.1.0"
-    engine.io-parser "~2.2.0"
-    ws "~7.4.2"
-
-engine.io@~6.1.0:
-  version "6.1.3"
-  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.1.3.tgz#f156293d011d99a3df5691ac29d63737c3302e6f"
-  integrity sha512-rqs60YwkvWTLLnfazqgZqLa/aKo+9cueVfEi/dZ8PyGyaf8TLOxj++4QMIgeG3Gn0AhrWiFXvghsoY9L9h25GA==
+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==
   dependencies:
     "@types/cookie" "^0.4.1"
     "@types/cors" "^2.8.12"
@@ -5345,298 +5187,230 @@ engine.io@~6.1.0:
     cors "~2.8.5"
     debug "~4.3.1"
     engine.io-parser "~5.0.3"
-    ws "~8.2.3"
+    ws "~8.11.0"
 
-enhanced-resolve@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.5.0.tgz#2f3cfd84dbe3b487f18f2db2ef1e064a571ca5ec"
-  integrity sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==
-  dependencies:
-    graceful-fs "^4.1.2"
-    memory-fs "^0.5.0"
-    tapable "^1.0.0"
-
-enhanced-resolve@^5.8.3, enhanced-resolve@^5.9.2:
-  version "5.9.2"
-  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.9.2.tgz#0224dcd6a43389ebfb2d55efee517e5466772dd9"
-  integrity sha512-GIm3fQfwLJ8YZx2smuHpBKkXC1yOk+OBEmKckVyL0i/ea8mqDEykK3ld5dgH1QYPNyT/lIllxV2LULnxCHaHkA==
+enhanced-resolve@^5.10.0:
+  version "5.12.0"
+  resolved "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.12.0.tgz"
+  integrity sha512-QHTXI/sZQmko1cbDoNAa3mJ5qhWUUNAq3vR0/YiD379fWQrcfuoX1+HW2S0MTt7XmoPLapdaDKUtelUSPic7hQ==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
-enquirer@^2.3.6, enquirer@~2.3.6:
+enquirer@^2.3.6:
   version "2.3.6"
-  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
   integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
   dependencies:
     ansi-colors "^4.1.1"
 
 ent@~2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
-  integrity sha1-6WQhkyWiHQX0RGai9obtbOX13R0=
+  resolved "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
 
 entities@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  resolved "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^4.2.0, entities@^4.3.0, entities@^4.4.0:
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/entities/-/entities-4.4.0.tgz"
+  integrity sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==
+
 entities@~3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  resolved "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz"
   integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
 
 env-paths@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  resolved "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz"
   integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
 envinfo@^7.7.3:
   version "7.8.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  resolved "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz"
   integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
 err-code@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/err-code/-/err-code-2.0.3.tgz#23c2f3b756ffdfc608d30e27c9a941024807e7f9"
+  resolved "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"
   integrity sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==
 
-errno@^0.1.1, errno@^0.1.3:
+errno@^0.1.1:
   version "0.1.8"
-  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
+  resolved "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
 error-ex@^1.3.1:
   version "1.3.2"
-  resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
+  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
 error-stack-parser@^2.0.1:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/error-stack-parser/-/error-stack-parser-2.0.7.tgz#b0c6e2ce27d0495cf78ad98715e0cad1219abb57"
-  integrity sha512-chLOW0ZGRf4s8raLrDxa5sdkvPec5YdvwbFnqJme4rk0rFajP8mPtrDL1+I+CwrQDCjswDA5sREX7jYQDQs9vA==
+  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==
   dependencies:
-    stackframe "^1.1.1"
+    stackframe "^1.3.4"
 
-es-abstract@^1.19.0, es-abstract@^1.19.1:
-  version "1.19.1"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3"
-  integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w==
+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"
+    es-to-primitive "^1.2.1"
+    function.prototype.name "^1.1.5"
+    get-intrinsic "^1.2.0"
+    get-symbol-description "^1.0.0"
+    globalthis "^1.0.3"
+    gopd "^1.0.1"
+    has "^1.0.3"
+    has-property-descriptors "^1.0.0"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    internal-slot "^1.0.5"
+    is-array-buffer "^3.0.2"
+    is-callable "^1.2.7"
+    is-negative-zero "^2.0.2"
+    is-regex "^1.1.4"
+    is-shared-array-buffer "^1.0.2"
+    is-string "^1.0.7"
+    is-typed-array "^1.1.10"
+    is-weakref "^1.0.2"
+    object-inspect "^1.12.3"
+    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"
+    unbox-primitive "^1.0.2"
+    which-typed-array "^1.1.9"
+
+es-get-iterator@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz"
+  integrity sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==
   dependencies:
     call-bind "^1.0.2"
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    get-intrinsic "^1.1.1"
-    get-symbol-description "^1.0.0"
-    has "^1.0.3"
-    has-symbols "^1.0.2"
-    internal-slot "^1.0.3"
-    is-callable "^1.2.4"
-    is-negative-zero "^2.0.1"
-    is-regex "^1.1.4"
-    is-shared-array-buffer "^1.0.1"
+    get-intrinsic "^1.1.3"
+    has-symbols "^1.0.3"
+    is-arguments "^1.1.1"
+    is-map "^2.0.2"
+    is-set "^2.0.2"
     is-string "^1.0.7"
-    is-weakref "^1.0.1"
-    object-inspect "^1.11.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.4"
-    string.prototype.trimstart "^1.0.4"
-    unbox-primitive "^1.0.1"
+    isarray "^2.0.5"
+    stop-iteration-iterator "^1.0.0"
 
 es-module-lexer@^0.9.0:
   version "0.9.3"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.9.3.tgz#6f13db00cc38417137daf74366f535c8eb438f19"
+  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==
+  dependencies:
+    get-intrinsic "^1.1.3"
+    has "^1.0.3"
+    has-tostringtag "^1.0.0"
+
+es-shim-unscopables@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz"
+  integrity sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==
+  dependencies:
+    has "^1.0.3"
+
 es-to-primitive@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.1.tgz#e55cd4c9cdc188bcefb03b366c736323fc5c898a"
+  resolved "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz"
   integrity sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==
   dependencies:
     is-callable "^1.1.4"
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es6-promise@^4.0.3:
-  version "4.2.8"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
-  integrity sha512-HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==
+es6-promisify@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-7.0.0.tgz#9a710008dd6a4ab75a89e280bad787bfb749927b"
+  integrity sha512-ginqzK3J90Rd4/Yz7qRrqUeIpe3TwSXTPPZtPne7tGBPeAaQiU8qt4fpKApnxHcq1AwtUdHVg5P77x/yrggG8Q==
 
-es6-promisify@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
-  integrity sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=
-  dependencies:
-    es6-promise "^4.0.3"
+esbuild-wasm@0.17.8:
+  version "0.17.8"
+  resolved "https://registry.npmjs.org/esbuild-wasm/-/esbuild-wasm-0.17.8.tgz"
+  integrity sha512-zCmpxv95E0FuCmvdw1K836UHnj4EdiQnFfjTby35y3LAjRPtXMj3sbHDRHjbD8Mqg5lTwq3knacr/1qIFU51CQ==
 
-es6-promisify@^6.0.0:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.1.1.tgz#46837651b7b06bf6fff893d03f29393668d01621"
-  integrity sha512-HBL8I3mIki5C1Cc9QjKUenHtnG0A5/xA8Q/AllRcfiwl2CZFXGK7ddBiCoRwAix4i2KxcQfjtIVcrVbB3vbmwg==
-
-esbuild-android-arm64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.14.22.tgz#fb051169a63307d958aec85ad596cfc7d7770303"
-  integrity sha512-k1Uu4uC4UOFgrnTj2zuj75EswFSEBK+H6lT70/DdS4mTAOfs2ECv2I9ZYvr3w0WL0T4YItzJdK7fPNxcPw6YmQ==
-
-esbuild-darwin-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.14.22.tgz#615ea0a9de67b57a293a7128d7ac83ee307a856d"
-  integrity sha512-d8Ceuo6Vw6HM3fW218FB6jTY6O3r2WNcTAU0SGsBkXZ3k8SDoRLd3Nrc//EqzdgYnzDNMNtrWegK2Qsss4THhw==
-
-esbuild-darwin-arm64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.22.tgz#82054dcfcecb15ccfd237093b8008e7745a99ad9"
-  integrity sha512-YAt9Tj3SkIUkswuzHxkaNlT9+sg0xvzDvE75LlBo4DI++ogSgSmKNR6B4eUhU5EUUepVXcXdRIdqMq9ppeRqfw==
-
-esbuild-freebsd-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.22.tgz#778a818c5b078d5cdd6bb6c0e0797217d196999b"
-  integrity sha512-ek1HUv7fkXMy87Qm2G4IRohN+Qux4IcnrDBPZGXNN33KAL0pEJJzdTv0hB/42+DCYWylSrSKxk3KUXfqXOoH4A==
-
-esbuild-freebsd-arm64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.22.tgz#18da93b9f3db2e036f72383bfe73b28b73bb332c"
-  integrity sha512-zPh9SzjRvr9FwsouNYTqgqFlsMIW07O8mNXulGeQx6O5ApgGUBZBgtzSlBQXkHi18WjrosYfsvp5nzOKiWzkjQ==
-
-esbuild-linux-32@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.14.22.tgz#d0d5d9f5bb3536e17ac097e9512019c65b7c0234"
-  integrity sha512-SnpveoE4nzjb9t2hqCIzzTWBM0RzcCINDMBB67H6OXIuDa4KqFqaIgmTchNA9pJKOVLVIKd5FYxNiJStli21qg==
-
-esbuild-linux-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.14.22.tgz#2773d540971999ea7f38107ef92fca753f6a8c30"
-  integrity sha512-Zcl9Wg7gKhOWWNqAjygyqzB+fJa19glgl2JG7GtuxHyL1uEnWlpSMytTLMqtfbmRykIHdab797IOZeKwk5g0zg==
-
-esbuild-linux-arm64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.22.tgz#5d4480ce6d6bffab1dd76a23158f5a5ab33e7ba4"
-  integrity sha512-8q/FRBJtV5IHnQChO3LHh/Jf7KLrxJ/RCTGdBvlVZhBde+dk3/qS9fFsUy+rs3dEi49aAsyVitTwlKw1SUFm+A==
-
-esbuild-linux-arm@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.14.22.tgz#c6391b3f7c8fa6d3b99a7e893ce0f45f3a921eef"
-  integrity sha512-soPDdbpt/C0XvOOK45p4EFt8HbH5g+0uHs5nUKjHVExfgR7du734kEkXR/mE5zmjrlymk5AA79I0VIvj90WZ4g==
-
-esbuild-linux-mips64le@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.22.tgz#2c8dabac355c502e86c38f9f292b3517d8e181f3"
-  integrity sha512-SiNDfuRXhGh1JQLLA9JPprBgPVFOsGuQ0yDfSPTNxztmVJd8W2mX++c4FfLpAwxuJe183mLuKf7qKCHQs5ZnBQ==
-
-esbuild-linux-ppc64le@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.22.tgz#69d71b2820d5c94306072dac6094bae38e77d1c0"
-  integrity sha512-6t/GI9I+3o1EFm2AyN9+TsjdgWCpg2nwniEhjm2qJWtJyJ5VzTXGUU3alCO3evopu8G0hN2Bu1Jhz2YmZD0kng==
-
-esbuild-linux-riscv64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.22.tgz#c0ec0fc3a23624deebf657781550d2329cec4213"
-  integrity sha512-AyJHipZKe88sc+tp5layovquw5cvz45QXw5SaDgAq2M911wLHiCvDtf/07oDx8eweCyzYzG5Y39Ih568amMTCQ==
-
-esbuild-linux-s390x@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.22.tgz#ec2af4572d63336cfb27f5a5c851fb1b6617dd91"
-  integrity sha512-Sz1NjZewTIXSblQDZWEFZYjOK6p8tV6hrshYdXZ0NHTjWE+lwxpOpWeElUGtEmiPcMT71FiuA9ODplqzzSxkzw==
-
-esbuild-netbsd-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.22.tgz#0e283278e9fdbaa7f0930f93ee113d7759cd865e"
-  integrity sha512-TBbCtx+k32xydImsHxvFgsOCuFqCTGIxhzRNbgSL1Z2CKhzxwT92kQMhxort9N/fZM2CkRCPPs5wzQSamtzEHA==
-
-esbuild-openbsd-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.22.tgz#2a73bba04e16d8ef278fbe2be85248e12a2f2cc2"
-  integrity sha512-vK912As725haT313ANZZZN+0EysEEQXWC/+YE4rQvOQzLuxAQc2tjbzlAFREx3C8+uMuZj/q7E5gyVB7TzpcTA==
-
-esbuild-sunos-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.14.22.tgz#8fe03513b8b2e682a6d79d5e3ca5849651a3c1d8"
-  integrity sha512-/mbJdXTW7MTcsPhtfDsDyPEOju9EOABvCjeUU2OJ7fWpX/Em/H3WYDa86tzLUbcVg++BScQDzqV/7RYw5XNY0g==
-
-esbuild-wasm@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.14.22.tgz#9671d1355473b6688d00fe8ef6fa50274eff5465"
-  integrity sha512-FOSAM29GN1fWusw0oLMv6JYhoheDIh5+atC72TkJKfIUMID6yISlicoQSd9gsNSFsNBvABvtE2jR4JB1j4FkFw==
-
-esbuild-windows-32@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.14.22.tgz#a75df61e3e49df292a1842be8e877a3153ee644f"
-  integrity sha512-1vRIkuvPTjeSVK3diVrnMLSbkuE36jxA+8zGLUOrT4bb7E/JZvDRhvtbWXWaveUc/7LbhaNFhHNvfPuSw2QOQg==
-
-esbuild-windows-64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.14.22.tgz#d06cf8bbe4945b8bf95a730d871e54a22f635941"
-  integrity sha512-AxjIDcOmx17vr31C5hp20HIwz1MymtMjKqX4qL6whPj0dT9lwxPexmLj6G1CpR3vFhui6m75EnBEe4QL82SYqw==
-
-esbuild-windows-arm64@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.22.tgz#f8b1b05c548073be8413a5ecb12d7c2f6e717227"
-  integrity sha512-5wvQ+39tHmRhNpu2Fx04l7QfeK3mQ9tKzDqqGR8n/4WUxsFxnVLfDRBGirIfk4AfWlxk60kqirlODPoT5LqMUg==
-
-esbuild@0.14.22:
-  version "0.14.22"
-  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.14.22.tgz#2b55fde89d7aa5aaaad791816d58ff9dfc5ed085"
-  integrity sha512-CjFCFGgYtbFOPrwZNJf7wsuzesx8kqwAffOlbYcFDLFuUtP8xloK1GH+Ai13Qr0RZQf9tE7LMTHJ2iVGJ1SKZA==
+esbuild@0.17.8:
+  version "0.17.8"
+  resolved "https://registry.npmjs.org/esbuild/-/esbuild-0.17.8.tgz"
+  integrity sha512-g24ybC3fWhZddZK6R3uD2iF/RIPnRpwJAqLov6ouX3hMbY4+tKolP0VMF3zuIYCaXun+yHwS5IPQ91N2BT191g==
   optionalDependencies:
-    esbuild-android-arm64 "0.14.22"
-    esbuild-darwin-64 "0.14.22"
-    esbuild-darwin-arm64 "0.14.22"
-    esbuild-freebsd-64 "0.14.22"
-    esbuild-freebsd-arm64 "0.14.22"
-    esbuild-linux-32 "0.14.22"
-    esbuild-linux-64 "0.14.22"
-    esbuild-linux-arm "0.14.22"
-    esbuild-linux-arm64 "0.14.22"
-    esbuild-linux-mips64le "0.14.22"
-    esbuild-linux-ppc64le "0.14.22"
-    esbuild-linux-riscv64 "0.14.22"
-    esbuild-linux-s390x "0.14.22"
-    esbuild-netbsd-64 "0.14.22"
-    esbuild-openbsd-64 "0.14.22"
-    esbuild-sunos-64 "0.14.22"
-    esbuild-windows-32 "0.14.22"
-    esbuild-windows-64 "0.14.22"
-    esbuild-windows-arm64 "0.14.22"
+    "@esbuild/android-arm" "0.17.8"
+    "@esbuild/android-arm64" "0.17.8"
+    "@esbuild/android-x64" "0.17.8"
+    "@esbuild/darwin-arm64" "0.17.8"
+    "@esbuild/darwin-x64" "0.17.8"
+    "@esbuild/freebsd-arm64" "0.17.8"
+    "@esbuild/freebsd-x64" "0.17.8"
+    "@esbuild/linux-arm" "0.17.8"
+    "@esbuild/linux-arm64" "0.17.8"
+    "@esbuild/linux-ia32" "0.17.8"
+    "@esbuild/linux-loong64" "0.17.8"
+    "@esbuild/linux-mips64el" "0.17.8"
+    "@esbuild/linux-ppc64" "0.17.8"
+    "@esbuild/linux-riscv64" "0.17.8"
+    "@esbuild/linux-s390x" "0.17.8"
+    "@esbuild/linux-x64" "0.17.8"
+    "@esbuild/netbsd-x64" "0.17.8"
+    "@esbuild/openbsd-x64" "0.17.8"
+    "@esbuild/sunos-x64" "0.17.8"
+    "@esbuild/win32-arm64" "0.17.8"
+    "@esbuild/win32-ia32" "0.17.8"
+    "@esbuild/win32-x64" "0.17.8"
 
 escalade@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  resolved "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz"
   integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
 
-escape-goat@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675"
-  integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==
-
 escape-goat@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-3.0.0.tgz#e8b5fb658553fe8a3c4959c316c6ebb8c842b19c"
+  resolved "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz"
   integrity sha512-w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==
 
 escape-html@~1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  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:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 escodegen@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-2.0.0.tgz#5e32b12833e8aa8fa35e1bf0befa89380484c7dd"
+  resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz"
   integrity sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==
   dependencies:
     esprima "^4.0.1"
@@ -5646,226 +5420,291 @@ escodegen@^2.0.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-import-resolver-node@^0.3.6:
-  version "0.3.6"
-  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.6.tgz#4048b958395da89668252001dbd9eca6b83bacbd"
-  integrity sha512-0En0w03NRVMn9Uiyn8YRPDKvWjxCWkslUEhGNTdGx15RvPJYQ+lbOlqrlNI2vEAs4pDYK4f/HN2TbDmk5TP0iw==
-  dependencies:
-    debug "^3.2.7"
-    resolve "^1.20.0"
-
-eslint-module-utils@^2.7.2:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.7.3.tgz#ad7e3a10552fdd0642e1e55292781bd6e34876ee"
-  integrity sha512-088JEC7O3lDZM9xGe0RerkOMd0EjFl+Yvd1jPWIkMT5u3H9+HC34mWWPnqPrN13gieT9pBOO+Qt07Nb/6TresQ==
-  dependencies:
-    debug "^3.2.7"
-    find-up "^2.1.0"
-
-eslint-plugin-deprecation@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-deprecation/-/eslint-plugin-deprecation-1.3.2.tgz#a8125d28c56158cdfa1a685197e6be8ed86f189e"
-  integrity sha512-z93wbx9w7H/E3ogPw6AZMkkNJ6m51fTZRNZPNQqxQLmx+KKt7aLkMU9wN67s71i+VVHN4tLOZ3zT3QLbnlC0Mg==
+eslint-etc@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/eslint-etc/-/eslint-etc-5.2.1.tgz#43e2554a347677ebb6386c915f374918f2efcb87"
+  integrity sha512-lFJBSiIURdqQKq9xJhvSJFyPA+VeTh5xvk24e8pxVL7bwLBtGF60C/KRkLTMrvCZ6DA3kbPuYhLWY0TZMlqTsg==
   dependencies:
     "@typescript-eslint/experimental-utils" "^5.0.0"
+    tsutils "^3.17.1"
+    tsutils-etc "^1.4.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==
+  dependencies:
+    debug "^3.2.7"
+    is-core-module "^2.11.0"
+    resolve "^1.22.1"
+
+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==
+  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==
+  dependencies:
+    "@typescript-eslint/utils" "^5.57.0"
     tslib "^2.3.1"
     tsutils "^3.21.0"
 
-eslint-plugin-import@^2.25.4:
-  version "2.25.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1"
-  integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA==
-  dependencies:
-    array-includes "^3.1.4"
-    array.prototype.flat "^1.2.5"
-    debug "^2.6.9"
-    doctrine "^2.1.0"
-    eslint-import-resolver-node "^0.3.6"
-    eslint-module-utils "^2.7.2"
-    has "^1.0.3"
-    is-core-module "^2.8.0"
-    is-glob "^4.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.5"
-    resolve "^1.20.0"
-    tsconfig-paths "^3.12.0"
+eslint-plugin-import-newlines@^1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import-newlines/-/eslint-plugin-import-newlines-1.3.1.tgz#e21705667778e8134382b50079fbb2c8d3a2fcde"
+  integrity sha512-7vyhwliGm+CTwteRw2ym+IO9OaksGYmSt63elPPBM0QJ3zwRwMKtgHOSHVtdHlrSERRTVCsWtMO8dDdAdmHMXg==
 
-eslint-plugin-jsdoc@^38.0.6:
-  version "38.0.6"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-38.0.6.tgz#b26843bdc445202b9f0e3830bda39ec5aacbfa97"
-  integrity sha512-Wvh5ERLUL8zt2yLZ8LLgi8RuF2UkjDvD+ri1/i7yMpbfreK2S29B9b5JC7iBIoFR7KDaEWCLnUPHTqgwcXX1Sg==
+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==
   dependencies:
-    "@es-joy/jsdoccomment" "~0.22.1"
+    array-includes "^3.1.6"
+    array.prototype.flat "^1.3.1"
+    array.prototype.flatmap "^1.3.1"
+    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"
+    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"
+
+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.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"
-    regextras "^0.8.0"
-    semver "^7.3.5"
+    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==
+  dependencies:
+    eslint-utils "^3.0.0"
+    jsonc-eslint-parser "^2.0.4"
+    natural-compare "^1.4.0"
+
+eslint-plugin-lodash@^7.4.0:
+  version "7.4.0"
+  resolved "https://registry.npmjs.org/eslint-plugin-lodash/-/eslint-plugin-lodash-7.4.0.tgz"
+  integrity sha512-Tl83UwVXqe1OVeBRKUeWcfg6/pCW1GTRObbdnbEJgYwjxp5Q92MEWQaH9+dmzbRt6kvYU1Mp893E79nJiCSM8A==
+  dependencies:
+    lodash "^4.17.21"
+
+eslint-plugin-rxjs@^5.0.3:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-rxjs/-/eslint-plugin-rxjs-5.0.3.tgz#a7ec16549f0dd23051bb744fea5bc0cdf096131a"
+  integrity sha512-fcVkqLmYLRfRp+ShafjpUKuaZ+cw/sXAvM5dfSxiEr7M28QZ/NY7vaOr09FB4rSaZsQyLBnNPh5SL+4EgKjh8Q==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "^5.0.0"
+    common-tags "^1.8.0"
+    decamelize "^5.0.0"
+    eslint-etc "^5.1.0"
+    requireindex "~1.2.0"
+    rxjs-report-usage "^1.0.4"
+    tslib "^2.0.0"
+    tsutils "^3.0.0"
+    tsutils-etc "^1.4.1"
+
+eslint-plugin-simple-import-sort@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-10.0.0.tgz#cc4ceaa81ba73252427062705b64321946f61351"
+  integrity sha512-AeTvO9UCMSNzIHRkg8S6c3RPy5YEwKWSQPx3DYghLedo2ZQxowPFLGDN1AZ2evfg6r6mjBSZSLxLFsWSu3acsw==
+
 eslint-plugin-unused-imports@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz#d8db8c4d0cfa0637a8b51ce3fd7d1b6bc3f08520"
+  resolved "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-2.0.0.tgz"
   integrity sha512-3APeS/tQlTrFa167ThtP0Zm0vctjr4M44HMpeg1P4bK6wItarumq0Ma82xorMKdFsWpphQBlRPzw/pxiVELX1A==
   dependencies:
     eslint-rule-composer "^0.3.0"
 
 eslint-rule-composer@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz#79320c927b0c5c0d3d3d2b76c8b4a488f25bbaf9"
+  resolved "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz"
   integrity sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==
 
-eslint-scope@5.1.1, eslint-scope@^5.1.0, eslint-scope@^5.1.1:
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
-eslint-scope@^7.1.1:
+eslint-scope@^7.0.0:
   version "7.1.1"
-  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642"
+  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.1.tgz"
   integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw==
   dependencies:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
+eslint-scope@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.0.tgz#f21ebdafda02352f103634b96dd47d9f81ca117b"
+  integrity sha512-DYj5deGlHBfMt15J7rdtyKNq/Nqlv5KfU4iodrQ019XESsRnwXH9KAE0y3cwtUHDo2ob7CypAnCqefh6vioWRw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^5.2.0"
+
 eslint-utils@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz"
   integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
   dependencies:
     eslint-visitor-keys "^2.0.0"
 
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826"
-  integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA==
+eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.0.tgz"
+  integrity sha512-HPpKPUBQcAsZOsHAFwTtIKcYlCje62XB7SEAcxjtmW6TD1WVpkS6i6/hOVtTZIl4zGj/mBqpFVGvaDneik+VoQ==
 
-eslint@^8.2.0:
-  version "8.11.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.11.0.tgz#88b91cfba1356fc10bb9eb592958457dfe09fb37"
-  integrity sha512-/KRpd9mIRg2raGxHRGwW9ZywYNAClZrHjdueHcrVDuO3a6bj83eoTirCCk0M0yPwOjWYKHwRVRid+xK4F/GHgA==
+eslint@^8.39.0:
+  version "8.39.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.39.0.tgz#7fd20a295ef92d43809e914b70c39fd5a23cf3f1"
+  integrity sha512-mwiok6cy7KTW7rBpo05k6+p4YVZByLNjAZ/ACB9DRCu4YDRwjXI01tWHp6KAUWelsBetTxKK/2sHB0vdS8Z2Og==
   dependencies:
-    "@eslint/eslintrc" "^1.2.1"
-    "@humanwhocodes/config-array" "^0.9.2"
+    "@eslint-community/eslint-utils" "^4.2.0"
+    "@eslint-community/regexpp" "^4.4.0"
+    "@eslint/eslintrc" "^2.0.2"
+    "@eslint/js" "8.39.0"
+    "@humanwhocodes/config-array" "^0.11.8"
+    "@humanwhocodes/module-importer" "^1.0.1"
+    "@nodelib/fs.walk" "^1.2.8"
     ajv "^6.10.0"
     chalk "^4.0.0"
     cross-spawn "^7.0.2"
     debug "^4.3.2"
     doctrine "^3.0.0"
     escape-string-regexp "^4.0.0"
-    eslint-scope "^7.1.1"
-    eslint-utils "^3.0.0"
-    eslint-visitor-keys "^3.3.0"
-    espree "^9.3.1"
-    esquery "^1.4.0"
+    eslint-scope "^7.2.0"
+    eslint-visitor-keys "^3.4.0"
+    espree "^9.5.1"
+    esquery "^1.4.2"
     esutils "^2.0.2"
     fast-deep-equal "^3.1.3"
     file-entry-cache "^6.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^6.0.1"
-    globals "^13.6.0"
+    find-up "^5.0.0"
+    glob-parent "^6.0.2"
+    globals "^13.19.0"
+    grapheme-splitter "^1.0.4"
     ignore "^5.2.0"
     import-fresh "^3.0.0"
     imurmurhash "^0.1.4"
     is-glob "^4.0.0"
+    is-path-inside "^3.0.3"
+    js-sdsl "^4.1.4"
     js-yaml "^4.1.0"
     json-stable-stringify-without-jsonify "^1.0.1"
     levn "^0.4.1"
     lodash.merge "^4.6.2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     natural-compare "^1.4.0"
     optionator "^0.9.1"
-    regexpp "^3.2.0"
     strip-ansi "^6.0.1"
     strip-json-comments "^3.1.0"
     text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
 
 esm@^3.2.25:
   version "3.2.25"
-  resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.25.tgz#342c18c29d56157688ba5ce31f8431fbb795cc10"
+  resolved "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz"
   integrity sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA==
 
-espree@^9.3.1:
-  version "9.3.1"
-  resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd"
-  integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ==
+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==
   dependencies:
-    acorn "^8.7.0"
-    acorn-jsx "^5.3.1"
-    eslint-visitor-keys "^3.3.0"
+    acorn "^8.8.0"
+    acorn-jsx "^5.3.2"
+    eslint-visitor-keys "^3.4.0"
 
 esprima@^4.0.0, esprima@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
+  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
-esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+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"
 
 esrecurse@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@1.8.1, etag@^1.8.1, etag@~1.8.1:
   version "1.8.1"
-  resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  resolved "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter-asyncresource@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz#734ff2e44bf448e627f7748f905d6bdd57bdb65b"
+  resolved "https://registry.npmjs.org/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz"
   integrity sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==
 
-eventemitter2@^6.4.3:
-  version "6.4.5"
-  resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.5.tgz#97380f758ae24ac15df8353e0cc27f8b95644655"
-  integrity sha512-bXE7Dyc1i6oQElDG0jMRZJrRAn9QR2xyyFGmBdZleNmyQX0FqGYmhZIrIrpPfm/w//LTo4tVQGOGQcGCb5q9uw==
+eventemitter2@6.4.7:
+  version "6.4.7"
+  resolved "https://registry.npmjs.org/eventemitter2/-/eventemitter2-6.4.7.tgz"
+  integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==
 
 eventemitter3@^4.0.0:
   version "4.0.7"
-  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  resolved "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  resolved "https://registry.npmjs.org/events/-/events-3.3.0.tgz"
   integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 execa@4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
+  resolved "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"
   integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
   dependencies:
     cross-spawn "^7.0.0"
@@ -5880,7 +5719,7 @@ execa@4.1.0:
 
 execa@^5.0.0:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
+  resolved "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz"
   integrity sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==
   dependencies:
     cross-spawn "^7.0.3"
@@ -5895,123 +5734,77 @@ execa@^5.0.0:
 
 executable@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
+  resolved "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"
   integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
   dependencies:
     pify "^2.2.0"
 
-exit@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
-  integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
-
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
-  dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 express-rate-limit@^5.1.3:
   version "5.5.1"
-  resolved "https://registry.yarnpkg.com/express-rate-limit/-/express-rate-limit-5.5.1.tgz#110c23f6a65dfa96ab468eda95e71697bc6987a2"
+  resolved "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-5.5.1.tgz"
   integrity sha512-MTjE2eIbHv5DyfuFz4zLYWxpqVhEhkTiwFGuB74Q9CSou2WHO52nlE5y3Zlg6SIsiYUIPj6ifFxnkPz6O3sIUg==
 
-express-static-gzip@^2.1.5:
-  version "2.1.5"
-  resolved "https://registry.yarnpkg.com/express-static-gzip/-/express-static-gzip-2.1.5.tgz#e45b512ef5596a068c45f729d7e0cc0b429b08b4"
-  integrity sha512-bgiQ1fY7ltuUrSzg0WoN7ycoAd7r2VEw7durn/3k0jCMUC5wydF0K36ouIuJPE+MNDwK5uoSaVgIBVNemwxWgw==
+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==
   dependencies:
     serve-static "^1.14.1"
 
-express@^4.17.1:
-  version "4.17.3"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.3.tgz#f6c7302194a4fb54271b73a1fe7a06478c8f85a1"
-  integrity sha512-yuSQpz5I+Ch7gFrPCk4/c+dIBKlQUxtgwqzph132bsT6qhuzss6I8cLJQz7B3rFblzd6wtcI0ZbGltH/C4LjUg==
+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==
   dependencies:
     accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.2"
+    body-parser "1.20.1"
     content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.2"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
     fresh "0.5.2"
+    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
     proxy-addr "~2.0.7"
-    qs "6.9.7"
+    qs "6.11.0"
     range-parser "~1.2.1"
     safe-buffer "5.2.1"
-    send "0.17.2"
-    serve-static "1.14.2"
+    send "0.18.0"
+    serve-static "1.15.0"
     setprototypeof "1.2.0"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
-  dependencies:
-    assign-symbols "^1.0.0"
-    is-extendable "^1.0.1"
-
 extend@^3.0.0, extend@~3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.3:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 extract-zip@2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
+  resolved "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
   dependencies:
     debug "^4.1.1"
@@ -6020,25 +5813,20 @@ extract-zip@2.0.1:
   optionalDependencies:
     "@types/yauzl" "^2.9.1"
 
-extsprintf@1.3.0:
+extsprintf@1.3.0, extsprintf@^1.2.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
-  integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
-
-extsprintf@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
-  integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==
+  resolved "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"
+  integrity sha512-11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g==
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@3.2.7:
-  version "3.2.7"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
-  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
+fast-glob@^3.2.11, fast-glob@^3.2.4, fast-glob@^3.2.9:
+  version "3.2.12"
+  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.12.tgz"
+  integrity sha512-DVj4CQIYYow0BlaelwK1pHl5n5cRSJfM60UA0zK891sVInoPri2Ekj7+e1CT3/3qxXenpI+nBBmQAcJPJgaj4w==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
@@ -6046,120 +5834,113 @@ fast-glob@3.2.7:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.4, fast-glob@^3.2.7, fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.11.tgz#a1172ad95ceb8a16e20caa5c5e56480e5129c1d9"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-json-patch@^3.0.0-1:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.0.tgz#ec8cd9b9c4c564250ec8b9140ef7a55f70acaee6"
-  integrity sha512-IhpytlsVTRndz0hU5t0/MGzS/etxLlfrpG5V5M9mVbuj9TrJLWaMfsox9REM5rkuGX0T+5qjpe8XA1o0gZ42nA==
+fast-json-patch@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/fast-json-patch/-/fast-json-patch-3.1.1.tgz#85064ea1b1ebf97a3f7ad01e23f9337e72c66947"
+  integrity sha512-vf6IHUX2SBcA+5/+4883dsIjpBTqmfBjmYiWK1savxQmFk4JfBMLa7ynTYOs1Rolp/T1betJxHiGD3g1Mn8lUQ==
 
 fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  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.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fast-memoize@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.yarnpkg.com/fast-memoize/-/fast-memoize-2.5.2.tgz#79e3bb6a4ec867ea40ba0e7146816f6cdce9b57e"
+  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.12"
-  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2"
-  integrity sha512-On2N+BpYJ15xIC974QNVuYGMOlEVt4s0EOI3wwMqOmK1fdDY+FN/zltPV8vosq4ad4c/gJ1KHScUn/6AWIgiow==
+  version "1.0.16"
+  resolved "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
 
 fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.13.0.tgz#616760f88a7526bdfc596b7cab8c18938c36b98c"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+  version "1.15.0"
+  resolved "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz"
+  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
   dependencies:
     reusify "^1.0.4"
 
 faye-websocket@^0.11.3:
   version "0.11.4"
-  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  resolved "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz"
   integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
 fd-slicer@~1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e"
-  integrity sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=
+  resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz"
+  integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==
   dependencies:
     pend "~1.2.0"
 
-figgy-pudding@^3.5.1:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz#b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"
-  integrity sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==
-
 figures@^3.0.0, figures@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
+  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
   integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
-file-saver@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-2.0.5.tgz#d61cfe2ce059f414d899e9dd6d4107ee25670c38"
-  integrity sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==
-
 filelist@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/filelist/-/filelist-1.0.4.tgz#f78978a1e944775ff9e62e744424f215e58352b5"
+  resolved "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz"
   integrity sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==
   dependencies:
     minimatch "^5.0.1"
 
 filesize@^6.1.0:
   version "6.4.0"
-  resolved "https://registry.yarnpkg.com/filesize/-/filesize-6.4.0.tgz#914f50471dd66fdca3cefe628bd0cde4ef769bcd"
+  resolved "https://registry.npmjs.org/filesize/-/filesize-6.4.0.tgz"
   integrity sha512-mjFIpOHC4jbfcTfoh4rkWpI31mF7viw9ikj/JyLoKzqlwG/YsefKfvYlYhdYdg/9mtK2z1AzgN/0LvVQ3zdlSQ==
 
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
 fill-range@^7.0.1:
   version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
   integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
   dependencies:
     to-regex-range "^5.0.1"
 
 finalhandler@1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.0.tgz#ce0b6855b45853e791b2fcc680046d88253dd7f5"
-  integrity sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz"
+  integrity sha512-ejnvM9ZXYzp6PUPUyQBMBf0Co5VX2gr5H2VQe2Ui2jWXNlxv+PYZo8wpAymJNJdLsG1R4p+M4aynF8KuoUEwRw==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.1"
@@ -6169,9 +5950,9 @@ finalhandler@1.1.0:
     statuses "~1.3.1"
     unpipe "~1.0.0"
 
-finalhandler@1.1.2, finalhandler@~1.1.2:
+finalhandler@1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"
   integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
@@ -6182,85 +5963,77 @@ finalhandler@1.1.2, finalhandler@~1.1.2:
     statuses "~1.5.0"
     unpipe "~1.0.0"
 
-find-cache-dir@^3.3.1:
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "2.4.1"
+    parseurl "~1.3.3"
+    statuses "2.0.1"
+    unpipe "~1.0.0"
+
+find-cache-dir@^3.3.1, find-cache-dir@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.3.2.tgz#b30c5b6eff0730731aea9bbd9dbecbd80256d64b"
+  resolved "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz"
   integrity sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==
   dependencies:
     commondir "^1.0.1"
     make-dir "^3.0.2"
     pkg-dir "^4.1.0"
 
-find-up@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
-  integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
-  dependencies:
-    locate-path "^2.0.0"
-
 find-up@^4.0.0, find-up@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz"
   integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
   dependencies:
     locate-path "^5.0.0"
     path-exists "^4.0.0"
 
+find-up@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
 flat-cache@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
   integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
   dependencies:
     flatted "^3.1.0"
     rimraf "^3.0.2"
 
-flatted@^3.1.0, flatted@^3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.5.tgz#76c8584f4fc843db64702a6bd04ab7a8bd666da3"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+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.14.9"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7"
-  integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w==
+follow-redirects@^1.0.0, follow-redirects@^1.14.0, follow-redirects@^1.15.0:
+  version "1.15.5"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.5.tgz#54d4d6d062c0fa7d9d17feb008461550e3ba8020"
+  integrity sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==
 
-font-awesome@4.7.0:
-  version "4.7.0"
-  resolved "https://registry.yarnpkg.com/font-awesome/-/font-awesome-4.7.0.tgz#8fa8cf0411a1a31afd07b06d2902bb9fc815a133"
-  integrity sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM=
-
-for-in@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+for-each@^0.3.3:
+  version "0.3.3"
+  resolved "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz"
+  integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
+  dependencies:
+    is-callable "^1.1.3"
 
 forever-agent@~0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
-  integrity sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=
-
-fork-ts-checker-webpack-plugin@^6.0.3:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-6.5.0.tgz#0282b335fa495a97e167f69018f566ea7d2a2b5e"
-  integrity sha512-cS178Y+xxtIjEUorcHddKS7yCMlrDPV31mt47blKKRfMd70Kxu5xruAFE2o9sDY6wVC5deuob/u/alD04YYHnw==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    "@types/json-schema" "^7.0.5"
-    chalk "^4.1.0"
-    chokidar "^3.4.2"
-    cosmiconfig "^6.0.0"
-    deepmerge "^4.2.2"
-    fs-extra "^9.0.0"
-    glob "^7.1.6"
-    memfs "^3.1.2"
-    minimatch "^3.0.4"
-    schema-utils "2.7.0"
-    semver "^7.3.2"
-    tapable "^1.0.0"
+  resolved "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"
+  integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
 
 form-data@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz"
   integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==
   dependencies:
     asynckit "^0.4.0"
@@ -6269,7 +6042,7 @@ form-data@^3.0.0:
 
 form-data@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452"
+  resolved "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"
   integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==
   dependencies:
     asynckit "^0.4.0"
@@ -6278,7 +6051,7 @@ form-data@^4.0.0:
 
 form-data@~2.3.2:
   version "2.3.3"
-  resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6"
+  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"
@@ -6287,56 +6060,40 @@ form-data@~2.3.2:
 
 forwarded@0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  resolved "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"
   integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
-fraction.js@^4.1.2:
+fraction.js@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950"
+  resolved "https://registry.npmjs.org/fraction.js/-/fraction.js-4.2.0.tgz"
   integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
-  dependencies:
-    map-cache "^0.2.2"
-
 fresh@0.5.2, fresh@^0.5.2:
   version "0.5.2"
-  resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  resolved "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 fs-extra@3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291"
-  integrity sha1-N5TzeMWLNC6n27sjCVEJxLO2IpE=
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-3.0.1.tgz"
+  integrity sha512-V3Z3WZWVUYd8hoCL5xfXJCaHWYzmtwW5XWYSlLgERi8PWd8bx1kUHUk8L1BT57e49oKnDDD180mjfrHc1yA9rg==
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^0.22.1:
-  version "0.22.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.22.1.tgz#5fd6f8049dc976ca19eb2355d658173cabcce056"
-  integrity sha1-X9b4BJ3JdsoZ6yNV1lgXPKvM4FY=
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^2.1.0"
-    rimraf "^2.2.8"
-
-fs-extra@^10.0.0, fs-extra@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-10.0.1.tgz#27de43b4320e833f6867cc044bfce29fdf0ef3b8"
-  integrity sha512-NbdoVMZso2Lsrn/QwLXOy6rm0ufY2zEOKCDzJR/0kBsb0E6qed0P3iYK+Ath3BfvXEeu4JhEtXLgILx5psUfag==
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
   dependencies:
     graceful-fs "^4.2.0"
-    jsonfile "^6.0.1"
-    universalify "^2.0.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
 
-fs-extra@^9.0.0, fs-extra@^9.1.0:
+fs-extra@^9.1.0:
   version "9.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
+  resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"
   integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
   dependencies:
     at-least-node "^1.0.0"
@@ -6346,57 +6103,63 @@ fs-extra@^9.0.0, fs-extra@^9.1.0:
 
 fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
+  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz"
   integrity sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
-  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
-
-fs-write-stream-atomic@^1.0.8:
-  version "1.0.10"
-  resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
-  integrity sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=
+fs-minipass@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.1.tgz"
+  integrity sha512-MhaJDcFRTuLidHrIttu0RDGyyXs/IYHVmlcxfLAEFIWjc1vdLAkdwT7Ace2u7DbitWC0toKMl5eJZRYNVreIMw==
   dependencies:
-    graceful-fs "^4.1.2"
-    iferr "^0.1.5"
-    imurmurhash "^0.1.4"
-    readable-stream "1 || 2"
+    minipass "^4.0.0"
+
+fs-monkey@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.3.tgz"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fscreen@^1.0.1:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/fscreen/-/fscreen-1.2.0.tgz#1a8c88e06bc16a07b473ad96196fb06d6657f59e"
+  resolved "https://registry.npmjs.org/fscreen/-/fscreen-1.2.0.tgz"
   integrity sha512-hlq4+BU0hlPmwsFjwGGzZ+OZ9N/wq9Ljg/sq3pX+2CD7hrJsX9tJgWWK/wiNTFM212CLHWhicOoqwXyZGGetJg==
 
 fsevents@~2.3.2:
   version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
 
 function-bind@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-functional-red-black-tree@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
-
-gauge@^4.0.0:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.2.tgz#c3777652f542b6ef62797246e8c7caddecb32cc7"
-  integrity sha512-aSPRm2CvA9R8QyU5eXMFPd+cYkyxLsXHd2l5/FOH2V/eml//M04G6KZOmTap07O1PvEwNcl2NndyLfK8g3QrKA==
+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==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.19.0"
+    functions-have-names "^1.2.2"
+
+functions-have-names@^1.2.2:
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz"
+  integrity sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==
+
+gauge@^4.0.3:
+  version "4.0.4"
+  resolved "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz"
+  integrity sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==
   dependencies:
-    ansi-regex "^5.0.1"
     aproba "^1.0.3 || ^2.0.0"
     color-support "^1.1.3"
     console-control-strings "^1.1.0"
@@ -6408,101 +6171,107 @@ gauge@^4.0.0:
 
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
+  resolved "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"
   integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
 
-get-caller-file@^2.0.1, get-caller-file@^2.0.5:
+get-caller-file@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz"
+  integrity sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==
   dependencies:
     function-bind "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.3"
 
 get-package-type@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
+  resolved "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz"
   integrity sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==
 
-get-stdin@^9.0.0:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-9.0.0.tgz#3983ff82e03d56f1b2ea0d3e60325f39d703a575"
-  integrity sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==
-
-get-stream@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
-  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
-  dependencies:
-    pump "^3.0.0"
-
 get-stream@^5.0.0, get-stream@^5.1.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-5.2.0.tgz#4966a1795ee5ace65e706c4b7beb71257d6e22d3"
+  resolved "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"
   integrity sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==
   dependencies:
     pump "^3.0.0"
 
 get-stream@^6.0.0:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-6.0.1.tgz#a262d8eef67aced57c2852ad6167526a43cbf7b7"
+  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.yarnpkg.com/get-symbol-description/-/get-symbol-description-1.0.0.tgz#7fdb81c900101fbd564dd5f1a30af5aadc1e58d6"
+  resolved "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz"
   integrity sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==
   dependencies:
     call-bind "^1.0.2"
     get-intrinsic "^1.1.1"
 
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
 getos@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/getos/-/getos-3.2.1.tgz#0134d1f4e00eb46144c5a9c0ac4dc087cbb27dc5"
+  resolved "https://registry.npmjs.org/getos/-/getos-3.2.1.tgz"
   integrity sha512-U56CfOK17OKgTVqozZjUKNdkfEv6jk5WISBJ8SHoagjE6L69zOwl3Z+O8myjY9MEW3i2HPWQBt/LTbCgcC973Q==
   dependencies:
     async "^3.2.0"
 
 getpass@^0.1.1:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
-  integrity sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=
+  resolved "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"
+  integrity sha512-0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng==
   dependencies:
     assert-plus "^1.0.0"
 
 glob-parent@^5.1.1, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob-parent@^6.0.1:
+glob-parent@^6.0.1, glob-parent@^6.0.2:
   version "6.0.2"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz"
   integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
     is-glob "^4.0.3"
 
 glob-to-regexp@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  resolved "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.2.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@~7.2.0:
+glob@8.1.0, glob@^8.0.1:
+  version "8.1.0"
+  resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz"
+  integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^5.0.1"
+    once "^1.3.0"
+
+glob@^7.0.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    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.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
   integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
   dependencies:
     fs.realpath "^1.0.0"
@@ -6512,28 +6281,45 @@ glob@7.2.0, glob@^7.0.3, glob@^7.0.6, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glo
     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"
+  integrity sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    minimatch "^8.0.2"
+    minipass "^4.2.4"
+    path-scurry "^1.6.1"
+
 global-dirs@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/global-dirs/-/global-dirs-3.0.0.tgz#70a76fe84ea315ab37b1f5576cbde7d48ef72686"
-  integrity sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/global-dirs/-/global-dirs-3.0.1.tgz"
+  integrity sha512-NBcGGFbBA9s1VzD41QXDG+3++t9Mn5t1FpLdhESY6oKY4gYTFpX4wO3sqGUa0Srjtbfj3szX0RnemmrVRUdULA==
   dependencies:
     ini "2.0.0"
 
 globals@^11.1.0:
   version "11.12.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
+  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-globals@^13.6.0, globals@^13.9.0:
-  version "13.13.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-13.13.0.tgz#ac32261060d8070e2719dd6998406e27d2b5727b"
-  integrity sha512-EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A==
+globals@^13.19.0:
+  version "13.20.0"
+  resolved "https://registry.npmjs.org/globals/-/globals-13.20.0.tgz"
+  integrity sha512-Qg5QtVkCy/kv3FUSlu4ukeZDVf9ee0iXLAUYX13gbR17bnejFTzr4iS9bY7kwCf1NztRNm1t91fjOiyx4CSwPQ==
   dependencies:
     type-fest "^0.20.2"
 
-globby@^11.0.1, globby@^11.0.4:
+globalthis@^1.0.2, globalthis@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/globalthis/-/globalthis-1.0.3.tgz#5852882a52b80dc301b0660273e1ed082f0b6ccf"
+  integrity sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==
+  dependencies:
+    define-properties "^1.1.3"
+
+globby@^11.0.1, globby@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
+  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -6543,22 +6329,21 @@ globby@^11.0.1, globby@^11.0.4:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-globby@^12.0.0, globby@^12.0.2:
-  version "12.2.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-12.2.0.tgz#2ab8046b4fba4ff6eede835b29f678f90e3d3c22"
-  integrity sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==
+globby@^13.1.1:
+  version "13.1.4"
+  resolved "https://registry.npmjs.org/globby/-/globby-13.1.4.tgz"
+  integrity sha512-iui/IiiW+QrJ1X1hKH5qwlMQyv34wJAYwH1vrf8b9kBA4sNiif3gKsMHa+BrdnOpEudWjpotfa7LrTzB1ERS/g==
   dependencies:
-    array-union "^3.0.1"
     dir-glob "^3.0.1"
-    fast-glob "^3.2.7"
-    ignore "^5.1.9"
+    fast-glob "^3.2.11"
+    ignore "^5.2.0"
     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 sha1-69hGZ8oNuzMLmbz8aOrCvFQ3Dg0=
+  integrity sha512-HJRTIH2EeH44ka+LWig+EqT2ONSYpVlNfx6pyd592/VF1TbfljJ7elwie7oSwcViLGqOdWocSdu2txwBF9bjmQ==
   dependencies:
     array-union "^1.0.1"
     arrify "^1.0.0"
@@ -6567,51 +6352,46 @@ globby@^5.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
-got@^9.6.0:
-  version "9.6.0"
-  resolved "https://registry.yarnpkg.com/got/-/got-9.6.0.tgz#edf45e7d67f99545705de1f7bbeeeb121765ed85"
-  integrity sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
   dependencies:
-    "@sindresorhus/is" "^0.14.0"
-    "@szmarczak/http-timer" "^1.1.2"
-    cacheable-request "^6.0.0"
-    decompress-response "^3.3.0"
-    duplexer3 "^0.1.4"
-    get-stream "^4.1.0"
-    lowercase-keys "^1.0.1"
-    mimic-response "^1.0.1"
-    p-cancelable "^1.0.0"
-    to-readable-stream "^1.0.0"
-    url-parse-lax "^3.0.0"
+    get-intrinsic "^1.1.3"
 
-graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
-  version "4.2.9"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.9.tgz#041b05df45755e587a24942279b9d113146e1c96"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
-guess-parser@^0.4.12:
+grapheme-splitter@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.npmjs.org/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz"
+  integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==
+
+guess-parser@^0.4.22:
   version "0.4.22"
-  resolved "https://registry.yarnpkg.com/guess-parser/-/guess-parser-0.4.22.tgz#c26ab9e21b69bbc761960c5a1511476ae85428eb"
+  resolved "https://registry.npmjs.org/guess-parser/-/guess-parser-0.4.22.tgz"
   integrity sha512-KcUWZ5ACGaBM69SbqwVIuWGoSAgD+9iJnchR9j/IarVI1jHVeXv+bUXBIMeqVMSKt3zrn0Dgf9UpcOEpPBLbSg==
   dependencies:
     "@wessberg/ts-evaluator" "0.0.27"
 
 gzip-size@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-6.0.0.tgz#065367fd50c239c0671cbcbad5be3e2eeb10e462"
+  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.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
+  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 sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
+  integrity sha512-Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q==
 
 har-validator@~5.1.3:
   version "5.1.5"
@@ -6624,100 +6404,64 @@ har-validator@~5.1.3:
 has-ansi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
+  integrity sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==
   dependencies:
     ansi-regex "^2.0.0"
 
-has-bigints@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
-  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
-
-has-binary2@~1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
-  integrity sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==
-  dependencies:
-    isarray "2.0.1"
-
-has-cors@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/has-cors/-/has-cors-1.1.0.tgz#5e474793f7ea9843d1bb99c23eef49ff126fff39"
-  integrity sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=
+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"
+  integrity sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1, has-symbols@^1.0.2:
+has-property-descriptors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"
+  integrity sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==
+  dependencies:
+    get-intrinsic "^1.1.1"
+
+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-symbols@^1.0.2, has-symbols@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"
   integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-tostringtag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25"
+  resolved "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"
   integrity sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==
   dependencies:
     has-symbols "^1.0.2"
 
 has-unicode@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has-yarn@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/has-yarn/-/has-yarn-2.1.0.tgz#137e11354a7b5bf11aa5cb649cf0c6f3ff2b2e77"
-  integrity sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==
+  resolved "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz"
+  integrity sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==
 
 has@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
 hdr-histogram-js@^2.0.1:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz#0b860534655722b6e3f3e7dca7b78867cf43dcb5"
+  resolved "https://registry.npmjs.org/hdr-histogram-js/-/hdr-histogram-js-2.0.3.tgz"
   integrity sha512-Hkn78wwzWHNCp2uarhzQ2SGFLU3JY8SBDDd3TAABK4fc30wm+MuPOrg5QVFVfkKOQd6Bfz3ukJEI+q9sXEkK1g==
   dependencies:
     "@assemblyscript/loader" "^0.10.1"
@@ -6726,32 +6470,27 @@ hdr-histogram-js@^2.0.1:
 
 hdr-histogram-percentiles-obj@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c"
+  resolved "https://registry.npmjs.org/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz"
   integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==
 
-he@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
-
 hoist-non-react-statics@^3.3.0, hoist-non-react-statics@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz#ece0acaf71d62c2969c2ec59feff42a4b1a85b45"
+  resolved "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz"
   integrity sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==
   dependencies:
     react-is "^16.7.0"
 
-hosted-git-info@^4.0.1:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.1.0.tgz#827b82867e9ff1c8d0c4d9d53880397d2c86d224"
-  integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA==
+hosted-git-info@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz"
+  integrity sha512-r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==
   dependencies:
-    lru-cache "^6.0.0"
+    lru-cache "^7.5.1"
 
 hpack.js@^2.1.6:
   version "2.1.6"
-  resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
-  integrity sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=
+  resolved "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"
+  integrity sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==
   dependencies:
     inherits "^2.0.1"
     obuf "^1.0.0"
@@ -6760,71 +6499,38 @@ hpack.js@^2.1.6:
 
 html-encoding-sniffer@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz#42a6dc4fd33f00281176e8b23759ca4e4fa185f3"
+  resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"
   integrity sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==
   dependencies:
     whatwg-encoding "^1.0.5"
 
 html-encoding-sniffer@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz#2cb1a8cf0db52414776e5b2a7a04d5dd98158de9"
+  resolved "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz"
   integrity sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==
   dependencies:
     whatwg-encoding "^2.0.0"
 
 html-entities@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-2.3.2.tgz#760b404685cb1d794e4f4b744332e3b00dcfe488"
-  integrity sha512-c3Ab/url5ksaT0WyleslpBEthOzWhrjQbg75y7XUsfSzi3Dgzt0l8w5e7DylRn15MTlMMD58dTfzddNS2kcAjQ==
+  version "2.3.3"
+  resolved "https://registry.npmjs.org/html-entities/-/html-entities-2.3.3.tgz"
+  integrity sha512-DV5Ln36z34NNTDgnz0EWGBLZENelNAtkiFA4kyNOG2tDI6Mz1uSWiq1wAKdyjnJwyDiDO7Fa2SO1CTxPXL8VxA==
 
-html-escaper@^2.0.0, html-escaper@^2.0.2:
+html-escaper@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz#dfd60027da36a36dfcbe236262c00a5822681453"
+  resolved "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz"
   integrity sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==
 
-html-loader@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/html-loader/-/html-loader-1.3.2.tgz#5a72ebba420d337083497c9aba7866c9e1aee340"
-  integrity sha512-DEkUwSd0sijK5PF3kRWspYi56XP7bTNkyg5YWSzBdjaSDmvCufep5c4Vpb3PBf6lUL0YPtLwBfy9fL0t5hBAGA==
-  dependencies:
-    html-minifier-terser "^5.1.1"
-    htmlparser2 "^4.1.0"
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
-html-minifier-terser@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054"
-  integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==
-  dependencies:
-    camel-case "^4.1.1"
-    clean-css "^4.2.3"
-    commander "^4.1.1"
-    he "^1.2.0"
-    param-case "^3.0.3"
-    relateurl "^0.2.7"
-    terser "^4.6.3"
-
 html-parse-stringify@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2"
+  resolved "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz"
   integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==
   dependencies:
     void-elements "3.1.0"
 
-htmlparser2@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-4.1.0.tgz#9a4ef161f2e4625ebf7dfbe6c0a2f52d18a59e78"
-  integrity sha512-4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^3.0.0"
-    domutils "^2.0.0"
-    entities "^2.0.0"
-
 htmlparser2@^5.0.0:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7"
+  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz"
   integrity sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==
   dependencies:
     domelementtype "^2.0.1"
@@ -6832,9 +6538,9 @@ htmlparser2@^5.0.0:
     domutils "^2.4.2"
     entities "^2.0.0"
 
-htmlparser2@^6.0.0, htmlparser2@^6.1.0:
+htmlparser2@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz"
   integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
   dependencies:
     domelementtype "^2.0.1"
@@ -6842,30 +6548,29 @@ htmlparser2@^6.0.0, htmlparser2@^6.1.0:
     domutils "^2.5.2"
     entities "^2.0.0"
 
-http-cache-semantics@^4.0.0, http-cache-semantics@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390"
-  integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==
+htmlparser2@^8.0.0:
+  version "8.0.2"
+  resolved "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz"
+  integrity sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==
+  dependencies:
+    domelementtype "^2.3.0"
+    domhandler "^5.0.3"
+    domutils "^3.0.1"
+    entities "^4.4.0"
+
+http-cache-semantics@^4.1.0, http-cache-semantics@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz"
+  integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==
 
 http-deceiver@^1.2.7:
   version "1.2.7"
-  resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
-  integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
-
-http-errors@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.1.tgz#7c3f28577cbc8a207388455dbd62295ed07bd68c"
-  integrity sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.2.0"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.1"
+  resolved "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"
+  integrity sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==
 
 http-errors@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"
   integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
     depd "2.0.0"
@@ -6876,8 +6581,8 @@ http-errors@2.0.0:
 
 http-errors@~1.6.2:
   version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+  resolved "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"
+  integrity sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
@@ -6885,13 +6590,13 @@ http-errors@~1.6.2:
     statuses ">= 1.4.0 < 2"
 
 http-parser-js@>=0.5.1:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.5.tgz#d7c30d5d3c90d865b4a2e870181f9d6f22ac7ac5"
-  integrity sha512-x+JVEkO2PoM8qqpbPbOL3cqHPwerep7OwzK7Ay+sMQjKzaKCqWvjoXm5tqMP9tXWWTnTzAjIhXg+J99XYuPhPA==
+  version "0.5.8"
+  resolved "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"
+  integrity sha512-SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q==
 
 http-proxy-agent@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz#8a8c8ef7f5932ccf953c296ca8291b95aa74aa3a"
+  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz"
   integrity sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==
   dependencies:
     "@tootallnate/once" "1"
@@ -6900,7 +6605,7 @@ http-proxy-agent@^4.0.1:
 
 http-proxy-agent@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz#5129800203520d434f142bc78ff3c170800f2b43"
+  resolved "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz"
   integrity sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==
   dependencies:
     "@tootallnate/once" "2"
@@ -6909,7 +6614,7 @@ http-proxy-agent@^5.0.0:
 
 http-proxy-middleware@^1.0.5:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
+  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"
@@ -6918,10 +6623,10 @@ http-proxy-middleware@^1.0.5:
     is-plain-obj "^3.0.0"
     micromatch "^4.0.2"
 
-http-proxy-middleware@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-2.0.3.tgz#5df04f69a89f530c2284cd71eeaa51ba52243289"
-  integrity sha512-1bloEwnrHMnCoO/Gcwbz7eSVvW50KPES01PecpagI+YLNLci4AcuKJrujW4Mc3sBLpFxMSlsLNHS5Nl/lvrTPA==
+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==
   dependencies:
     "@types/http-proxy" "^1.17.8"
     http-proxy "^1.18.1"
@@ -6931,7 +6636,7 @@ http-proxy-middleware@^2.0.0:
 
 http-proxy@^1.18.1:
   version "1.18.1"
-  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  resolved "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz"
   integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
   dependencies:
     eventemitter3 "^4.0.0"
@@ -6941,7 +6646,7 @@ http-proxy@^1.18.1:
 http-signature@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1"
-  integrity sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=
+  integrity sha512-CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^1.2.2"
@@ -6949,157 +6654,139 @@ http-signature@~1.2.0:
 
 http-signature@~1.3.6:
   version "1.3.6"
-  resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.3.6.tgz#cb6fbfdf86d1c974f343be94e87f7fc128662cf9"
+  resolved "https://registry.npmjs.org/http-signature/-/http-signature-1.3.6.tgz"
   integrity sha512-3adrsD6zqo4GsTqtO7FyrejHNv+NgiIfAfv68+jVlFmSr9OGy7zrxONceFRLKvnnZA5jbxQBX1u9PpB6Wi32Gw==
   dependencies:
     assert-plus "^1.0.0"
     jsprim "^2.0.2"
     sshpk "^1.14.1"
 
-https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+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"
+  resolved "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"
+  integrity sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==
   dependencies:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^2.2.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
-  integrity sha512-OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==
-  dependencies:
-    agent-base "^4.3.0"
-    debug "^3.1.0"
-
-https@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
-  integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
-
 human-signals@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
+  resolved "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
 human-signals@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
+  resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz"
   integrity sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==
 
 humanize-ms@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
-  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  resolved "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz"
+  integrity sha512-Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==
   dependencies:
     ms "^2.0.0"
 
 hyphenate-style-name@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d"
+  resolved "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz"
   integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ==
 
 i18next@^19.5.0:
   version "19.9.2"
-  resolved "https://registry.yarnpkg.com/i18next/-/i18next-19.9.2.tgz#ea5a124416e3c5ab85fddca2c8e3c3669a8da397"
+  resolved "https://registry.npmjs.org/i18next/-/i18next-19.9.2.tgz"
   integrity sha512-0i6cuo6ER6usEOtKajUUDj92zlG+KArFia0857xxiEHAQcUwh/RtOQocui1LPJwunSYT574Pk64aNva1kwtxZg==
   dependencies:
     "@babel/runtime" "^7.12.0"
 
 icomcom-react@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/icomcom-react/-/icomcom-react-1.0.1.tgz#6c513655bc576621930e31d19ddb718c3b7439f4"
+  resolved "https://registry.npmjs.org/icomcom-react/-/icomcom-react-1.0.1.tgz"
   integrity sha512-Xbz81qZ+er8RYZ6DFMmXxCl9YjxNWngNfPANTSOvzYNrQDieYvBZi+nv1MspI/ze+PAzfHUrmDcUii5RGCUifg==
   dependencies:
     prop-types "^15.6.0"
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24, iconv-lite@^0.4.24:
   version "0.4.24"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   version "0.6.3"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz"
   integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
 icss-utils@^5.0.0, icss-utils@^5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-5.1.0.tgz#c6be6858abd013d768e98366ae47e25d5887b1ae"
+  resolved "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz"
   integrity sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==
 
 ieee754@^1.1.13:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  resolved "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-iferr@^0.1.5:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
-  integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
-
 ignore-by-default@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
-  integrity sha1-SMptcvbGo68Aqa1K5odr44ieKwk=
+  resolved "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz"
+  integrity sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==
 
-ignore-walk@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-4.0.1.tgz#fc840e8346cf88a3a9380c5b17933cd8f4d39fa3"
-  integrity sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==
+ignore-walk@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.2.tgz"
+  integrity sha512-ezmQ1Dg2b3jVZh2Dh+ar6Eu2MqNSTkyb32HU2MAQQQX9tKM3q/UQ/9lf03lQ5hW+fOeoMnwxwkleZ0xcNp0/qg==
   dependencies:
-    minimatch "^3.0.4"
+    minimatch "^7.4.2"
 
-ignore@5.2.0, ignore@^5.0.4, ignore@^5.1.8, ignore@^5.1.9, ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.0.tgz#6d3bac8fa7fe0d45d9f9be7bac2fc279577e345a"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
+ignore@5.2.4, ignore@^5.2.0:
+  version "5.2.4"
+  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz"
+  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
 
 image-size@~0.5.0:
   version "0.5.5"
-  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
-
-immediate@~3.0.5:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
-  integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
+  resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
+  integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==
 
 immutability-helper@^3.0.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/immutability-helper/-/immutability-helper-3.1.1.tgz#2b86b2286ed3b1241c9e23b7b21e0444f52f77b7"
+  resolved "https://registry.npmjs.org/immutability-helper/-/immutability-helper-3.1.1.tgz"
   integrity sha512-Q0QaXjPjwIju/28TsugCHNEASwoCcJSyJV3uO1sOIQGI0jKgm9f41Lvz0DZj3n46cNCyAZTsEYoY4C2bVRUzyQ==
 
 immutable@^3:
   version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
+  resolved "https://registry.npmjs.org/immutable/-/immutable-3.8.2.tgz"
+  integrity sha512-15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==
 
 immutable@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.0.0.tgz#b86f78de6adef3608395efb269a91462797e2c23"
-  integrity sha512-zIE9hX70qew5qTUjSS7wi1iwj/l7+m54KWU247nhM3v806UdGj1yDndXj+IOYxxtW9zyLI+xqFNZjTuDaLUqFw==
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/immutable/-/immutable-4.3.0.tgz"
+  integrity sha512-0AOCmOip+xgJwEVTQj1EfiDDOkPmuyllDuTuEX+DDXUgapLAsBIfkg3sxCYyCEA8mQqZrrxPUGjcOQ2JS3WLkg==
 
-import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
-  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
+  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
-import-lazy@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
-  integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
-
 import-local@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  resolved "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"
   integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
   dependencies:
     pkg-dir "^4.2.0"
@@ -7107,56 +6794,56 @@ import-local@^3.0.2:
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
-indexof@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
-  integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
-
 infer-owner@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  resolved "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz"
   integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
 inherits@2, inherits@2.0.4, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.3:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 inherits@2.0.3:
   version "2.0.3"
-  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
-  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"
+  integrity sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==
 
 ini@2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
+  resolved "https://registry.npmjs.org/ini/-/ini-2.0.0.tgz"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.4, ini@~1.3.0:
+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==
+
+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==
 
-inquirer@8.2.0:
-  version "8.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.0.tgz#f44f008dd344bbfc4b30031f45d984e034a3ac3a"
-  integrity sha512-0crLweprevJ02tTuA6ThpoAERAGyVILC4sS74uib58Xf/zSr1/ZWtmm7D5CI+bSQEaA04f0K7idaHpQbSWgiVQ==
+inquirer@8.2.4:
+  version "8.2.4"
+  resolved "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz"
+  integrity sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==
   dependencies:
     ansi-escapes "^4.2.1"
     chalk "^4.1.1"
@@ -7168,213 +6855,158 @@ inquirer@8.2.0:
     mute-stream "0.0.8"
     ora "^5.4.1"
     run-async "^2.4.0"
-    rxjs "^7.2.0"
+    rxjs "^7.5.5"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
+    wrap-ansi "^7.0.0"
 
-internal-slot@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/internal-slot/-/internal-slot-1.0.3.tgz#7347e307deeea2faac2ac6205d4bc7d34967f59c"
-  integrity sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==
+internal-slot@^1.0.4, internal-slot@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz"
+  integrity sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==
   dependencies:
-    get-intrinsic "^1.1.0"
+    get-intrinsic "^1.2.0"
     has "^1.0.3"
     side-channel "^1.0.4"
 
 interpret@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+  resolved "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz"
   integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
 
 intersection-observer@^0.10.0:
   version "0.10.0"
-  resolved "https://registry.yarnpkg.com/intersection-observer/-/intersection-observer-0.10.0.tgz#4d11d63c1ff67e21e62987be24d55218da1a1a69"
+  resolved "https://registry.npmjs.org/intersection-observer/-/intersection-observer-0.10.0.tgz"
   integrity sha512-fn4bQ0Xq8FTej09YC/jqKZwtijpvARlRp6wxL5WTA6yPe2YWSJ5RJh7Nm79rK2qB0wr6iDQzH60XGq5V/7u8YQ==
 
 invariant@^2.2.4:
   version "2.2.4"
-  resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
+  resolved "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz"
   integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==
   dependencies:
     loose-envify "^1.0.0"
 
-ip@^1.1.0, ip@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
-  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+ip@^2.0.0:
+  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"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
 ipaddr.js@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-2.0.1.tgz#eca256a7a877e917aeb368b0a7497ddf42ef81c0"
+  resolved "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.1.tgz"
   integrity sha512-1qTgH9NG+IIJ4yfKs2e6Pp1bZg8wbDbKHT21HrLIeYBTRLgMYKnMTPAuI3Lcs61nfx5h1xlXnbJtH1kX5/d/ng==
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-arguments@^1.0.4:
+is-arguments@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/is-arguments/-/is-arguments-1.1.1.tgz#15b3f88fda01f2a97fec84ca761a560f123efa9b"
+  resolved "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz"
   integrity sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==
   dependencies:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
+is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
+  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==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.2.0"
+    is-typed-array "^1.1.10"
+
 is-arrayish@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
+  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
+  integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
 is-bigint@^1.0.1:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3"
+  resolved "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz"
   integrity sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==
   dependencies:
     has-bigints "^1.0.1"
 
 is-binary-path@~2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"
   integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
   dependencies:
     binary-extensions "^2.0.0"
 
 is-boolean-object@^1.1.0:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.2.tgz#5c6dc200246dd9321ae4b885a114bb1f75f63719"
+  resolved "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz"
   integrity sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==
   dependencies:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-buffer@^1.1.5, is-buffer@~1.1.6:
+is-buffer@~1.1.6:
   version "1.1.6"
-  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.4.tgz#47301d58dd0259407865547853df6d61fe471945"
-  integrity sha512-nsuwtxZfMX67Oryl9LCQ+upnC0Z0BgpwntpS89m1H/TLF0zNfzfLMV/9Wa/6MZsj0acpEjAO0KF1xT6ZdLl95w==
-
-is-ci@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-ci/-/is-ci-2.0.0.tgz#6bc6334181810e04b5c22b3d589fdca55026404c"
-  integrity sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==
-  dependencies:
-    ci-info "^2.0.0"
+is-callable@^1.1.3, is-callable@^1.1.4, is-callable@^1.2.7:
+  version "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.yarnpkg.com/is-ci/-/is-ci-3.0.1.tgz#db6ecbed1bd659c43dac0f45661e7674103d1867"
+  resolved "https://registry.npmjs.org/is-ci/-/is-ci-3.0.1.tgz"
   integrity sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==
   dependencies:
     ci-info "^3.2.0"
 
-is-core-module@^2.8.0, is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.8.1.tgz#f59fdfca701d5879d0a6b100a40aa1560ce27211"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
+is-core-module@^2.11.0, is-core-module@^2.8.1:
+  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==
   dependencies:
     has "^1.0.3"
 
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-date-object@^1.0.1:
+is-date-object@^1.0.1, is-date-object@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.5.tgz#0841d5536e724c25597bf6ea62e1bd38298df31f"
+  resolved "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz"
   integrity sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
 is-docker@^2.0.0, is-docker@^2.1.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  resolved "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz"
   integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
-
-is-extendable@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
-  integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
-  dependencies:
-    is-plain-object "^2.0.4"
-
 is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
+  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-in-browser@^1.0.2, is-in-browser@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.yarnpkg.com/is-in-browser/-/is-in-browser-1.1.3.tgz#56ff4db683a078c6082eb95dad7dc62e1d04f835"
-  integrity sha1-Vv9NtoOgeMYILrldrX3GLh0E+DU=
+  resolved "https://registry.npmjs.org/is-in-browser/-/is-in-browser-1.1.3.tgz"
+  integrity sha512-FeXIBgG/CPGd/WUxuEyvgGTEfwiG9Z4EKGxjNMRqviiIIfsmgrpnHLffEDdwUHqNva1VEW91o3xBT/m8Elgl9g==
 
-is-installed-globally@^0.4.0, is-installed-globally@~0.4.0:
+is-installed-globally@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.4.0.tgz#9a0fd407949c30f86eb6959ef1b7994ed0b7b520"
+  resolved "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.4.0.tgz"
   integrity sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==
   dependencies:
     global-dirs "^3.0.0"
@@ -7382,64 +7014,47 @@ is-installed-globally@^0.4.0, is-installed-globally@~0.4.0:
 
 is-interactive@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-interactive/-/is-interactive-1.0.0.tgz#cea6e6ae5c870a7b0a0004070b7b587e0252912e"
+  resolved "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz"
   integrity sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==
 
 is-lambda@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-lambda/-/is-lambda-1.0.1.tgz#3d9877899e6a53efc0160504cde15f82e6f061d5"
-  integrity sha1-PZh3iZ5qU+/AFgUEzeFfgubwYdU=
+  resolved "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz"
+  integrity sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==
 
-is-negative-zero@^2.0.1:
+is-map@^2.0.1, is-map@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150"
-  integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==
+  resolved "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz"
+  integrity sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==
 
-is-npm@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-5.0.0.tgz#43e8d65cc56e1b67f8d47262cf667099193f45a8"
-  integrity sha512-WW/rQLOazUq+ST/bCAVBp/2oMERWLsR7OrKyt052dNDk4DHcDE0/7QSXITlmi+VBcV13DfIbysG3tZJm5RfdBA==
+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-number-like@^1.0.3:
   version "1.0.8"
-  resolved "https://registry.yarnpkg.com/is-number-like/-/is-number-like-1.0.8.tgz#2e129620b50891042e44e9bbbb30593e75cfbbe3"
+  resolved "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz"
   integrity sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==
   dependencies:
     lodash.isfinite "^3.3.2"
 
 is-number-object@^1.0.4:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.6.tgz#6a7aaf838c7f0686a50b4553f7e54a96494e89f0"
-  integrity sha512-bEVOqiRcvo3zO1+G2lVMy+gkkEm9Yh7cDMRusKKu5ZJKPUYSJwICTKZrNKHA2EbSP0Tu0+6B/emsYNHZyn6K8g==
+  version "1.0.7"
+  resolved "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz"
+  integrity sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==
   dependencies:
     has-tostringtag "^1.0.0"
 
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
-  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
 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 sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=
-
-is-path-cwd@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
-  integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
+  integrity sha512-cnS56eR9SPAscL77ik76ATVqoPARTqPIVkMDVxRaWH06zT+6+CzIroYRJ0VVvm0Z1zfAvxvz9i/D3Ppjaqt5Nw==
 
 is-path-in-cwd@^1.0.0:
   version "1.0.1"
@@ -7451,148 +7066,167 @@ is-path-in-cwd@^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 sha1-jvW33lBDej/cprToZe96pVy0gDY=
+  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.2, is-path-inside@^3.0.3:
   version "3.0.3"
-  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
+  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
 is-plain-obj@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  resolved "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz"
   integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
 
-is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-plain-object@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.0.0.tgz#4427f50ab3429e9025ea7d52e9043a9ef4159344"
+  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
   integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
 
 is-potential-custom-element-name@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz#171ed6f19e3ac554394edf78caa05784a45bebb5"
+  resolved "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz"
   integrity sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==
 
-is-regex@^1.0.4, is-regex@^1.1.4:
+is-regex@^1.1.4:
   version "1.1.4"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958"
+  resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
   integrity sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==
   dependencies:
     call-bind "^1.0.2"
     has-tostringtag "^1.0.0"
 
-is-shared-array-buffer@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6"
-  integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA==
+is-set@^2.0.1, is-set@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz"
+  integrity sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==
+
+is-shared-array-buffer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz"
+  integrity sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==
+  dependencies:
+    call-bind "^1.0.2"
 
 is-stream@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077"
+  resolved "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
   integrity sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==
 
 is-string@^1.0.5, is-string@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.7.tgz#0dd12bf2006f255bb58f695110eff7491eebc0fd"
+  resolved "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz"
   integrity sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==
   dependencies:
     has-tostringtag "^1.0.0"
 
 is-symbol@^1.0.2, is-symbol@^1.0.3:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  resolved "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz"
   integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
     has-symbols "^1.0.2"
 
-is-typedarray@^1.0.0, is-typedarray@~1.0.0:
+is-typed-array@^1.1.10, is-typed-array@^1.1.9:
+  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==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+
+is-typedarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
-  integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
+  resolved "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"
+  integrity sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==
 
 is-unicode-supported@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  resolved "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz"
   integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
 
-is-weakref@^1.0.1:
+is-weakmap@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz"
+  integrity sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==
+
+is-weakref@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2"
+  resolved "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz"
   integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==
   dependencies:
     call-bind "^1.0.2"
 
+is-weakset@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz"
+  integrity sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==
+  dependencies:
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.1"
+
 is-what@^3.14.1:
   version "3.14.1"
-  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
+  resolved "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"
   integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
 
-is-windows@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
-  integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
-
 is-wsl@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
-  integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
+  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"
+  integrity sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==
 
 is-wsl@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz"
   integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
   dependencies:
     is-docker "^2.0.0"
 
-is-yarn-global@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-yarn-global/-/is-yarn-global-0.3.0.tgz#d502d3382590ea3004893746754c89139973e232"
-  integrity sha512-VjSeb/lHmkoyd8ryPVIKvOCn4D1koMqY+vqyjjUfc3xyKtP4dYOxM44sZrnqQSzSds3xyOrUTLTC9LVCVgLngw==
+isarray@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz"
+  integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
-
-isarray@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.1.tgz#a37d94ed9cda2d59865c9f76fe596ee1f338741e"
-  integrity sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=
+  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isbinaryfile@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
-  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
+  version "4.0.10"
+  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==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
+  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-2.1.0.tgz#f065561096a3f1da2ef46272f815c840d87e0c89"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
-
-isobject@^3.0.0, isobject@^3.0.1:
+isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 isomorphic-unfetch@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz#87341d5f4f7b63843d468438128cb087b7c3e98f"
+  resolved "https://registry.npmjs.org/isomorphic-unfetch/-/isomorphic-unfetch-3.1.0.tgz"
   integrity sha512-geDJjpoZ8N0kWexiwkX8F9NkTsXhetLPVbZFQ+JTW239QNOwvB0gniuR1Wc6f0AMTn7/mFGyXvHTifrCp/GH8Q==
   dependencies:
     node-fetch "^2.6.1"
@@ -7600,23 +7234,23 @@ isomorphic-unfetch@^3.0.0:
 
 isstream@~0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
-  integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
+  resolved "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"
+  integrity sha512-Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g==
 
 istanbul-lib-coverage@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz#675f0ab69503fad4b1d849f736baaca803344f49"
+  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.5.tgz"
   integrity sha512-8aXznuEPCJvGnMSRft4udDRDtb1V3pkQkMMI5LI+6HuQz5oQ4J2UFn1H82raA3qJtyOLkkwVqICBQkjnGtn5mA==
 
 istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3"
+  resolved "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz"
   integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw==
 
 istanbul-lib-instrument@^5.0.4:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz#7b49198b657b27a730b8e9cb601f1e1bff24c59a"
-  integrity sha512-czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q==
+  version "5.2.1"
+  resolved "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz"
+  integrity sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==
   dependencies:
     "@babel/core" "^7.12.3"
     "@babel/parser" "^7.14.7"
@@ -7626,7 +7260,7 @@ istanbul-lib-instrument@^5.0.4:
 
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
+  resolved "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz"
   integrity sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==
   dependencies:
     istanbul-lib-coverage "^3.0.0"
@@ -7635,7 +7269,7 @@ istanbul-lib-report@^3.0.0:
 
 istanbul-lib-source-maps@^3.0.6:
   version "3.0.6"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz#284997c48211752ec486253da97e3879defba8c8"
+  resolved "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-3.0.6.tgz"
   integrity sha512-R47KzMtDJH6X4/YW9XTx+jrLnZnscW4VpNN+1PViSYTejLVPWv7oov+Duf8YQSPyVRUvueQqz1TcsC6mooZTXw==
   dependencies:
     debug "^4.1.1"
@@ -7645,16 +7279,16 @@ istanbul-lib-source-maps@^3.0.6:
     source-map "^0.6.1"
 
 istanbul-reports@^3.0.2:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/istanbul-reports/-/istanbul-reports-3.1.4.tgz#1b6f068ecbc6c331040aab5741991273e609e40c"
-  integrity sha512-r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw==
+  version "3.1.5"
+  resolved "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.5.tgz"
+  integrity sha512-nUsEMa9pBt/NOHqbcbeJEgqIlY/K7rVWUX6Lql2orY5e9roQOthbR3vtY4zzf2orPELg80fnxxk9zUyPlgwD1w==
   dependencies:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
 jake@^10.8.5:
   version "10.8.5"
-  resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.5.tgz#f2183d2c59382cb274226034543b9c03b8164c46"
+  resolved "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz"
   integrity sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==
   dependencies:
     async "^3.2.3"
@@ -7664,53 +7298,19 @@ jake@^10.8.5:
 
 jasmine-core@^3.6.0, jasmine-core@^3.8.0:
   version "3.99.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.99.1.tgz#5bfa4b2d76618868bfac4c8ff08bb26fffa4120d"
+  resolved "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.99.1.tgz"
   integrity sha512-Hu1dmuoGcZ7AfyynN3LsfruwMbxMALMka+YtZeGoLuDEySVmVAPaonkNoBRIw/ectu8b9tVQCJNgp4a4knp+tg==
 
-jasmine-core@~2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
-  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
-
 jasmine-marbles@0.9.2:
   version "0.9.2"
-  resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz#5adfee5f72c7f24270687fa64a6e8a8613ffa841"
+  resolved "https://registry.npmjs.org/jasmine-marbles/-/jasmine-marbles-0.9.2.tgz"
   integrity sha512-T7RjG4fRsdiGGzbQZ6Kj39qYt6O1/KIcR4FkUNsD3DUGkd/AzpwzN+xtk0DXlLWEz5BaVdK1SzMgQDVw879c4Q==
   dependencies:
     lodash "^4.17.20"
 
-jasmine-spec-reporter@~5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/jasmine-spec-reporter/-/jasmine-spec-reporter-5.0.2.tgz#b61288ab074ad440dc2477c4d42840b0e74a6b95"
-  integrity sha512-6gP1LbVgJ+d7PKksQBc2H0oDGNRQI3gKUsWlswKaQ2fif9X5gzhQcgM5+kiJGCQVurOG09jqNhk7payggyp5+g==
-  dependencies:
-    colors "1.4.0"
-
-jasmine@2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
-  integrity sha1-awicChFXax8W3xG4AUbZHU6Lij4=
-  dependencies:
-    exit "^0.1.2"
-    glob "^7.0.6"
-    jasmine-core "~2.8.0"
-
-jasminewd2@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
-  integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
-
-jest-worker@^25.4.0:
-  version "25.5.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz#2611d071b79cea0f43ee57a3d118593ac1547db1"
-  integrity sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
-jest-worker@^27.0.2, jest-worker@^27.4.5:
+jest-worker@^27.4.5:
   version "27.5.1"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz"
   integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
   dependencies:
     "@types/node" "*"
@@ -7719,17 +7319,22 @@ jest-worker@^27.0.2, jest-worker@^27.4.5:
 
 js-cookie@2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-2.2.1.tgz#69e106dc5d5806894562902aa5baec3744e9b2b8"
+  resolved "https://registry.npmjs.org/js-cookie/-/js-cookie-2.2.1.tgz"
   integrity sha512-HvdH2LzI/EAZcUwA8+0nKNtWHqS+ZmijLA30RwZA0bo7ToCckjK5MkGhjED9KoRcXO6BaGI3I9UIzSA1FKFPOQ==
 
+js-sdsl@^4.1.4:
+  version "4.4.0"
+  resolved "https://registry.npmjs.org/js-sdsl/-/js-sdsl-4.4.0.tgz"
+  integrity sha512-FfVSdx6pJ41Oa+CF7RDaFmTnCaFhua+SNYQX74riGOpl96x+2jQCqEfQ2bnXu/5DPCqlRuiqyvTJM0Qjz26IVg==
+
 "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
   version "3.14.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
   integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
@@ -7737,57 +7342,56 @@ js-yaml@^3.13.1:
 
 js-yaml@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz"
   integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
 
 jsbn@~0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
-  integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
+  resolved "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"
+  integrity sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==
 
-jsdoc-type-pratt-parser@~2.2.5:
-  version "2.2.5"
-  resolved "https://registry.yarnpkg.com/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-2.2.5.tgz#c9f93afac7ee4b5ed4432fe3f09f7d36b05ed0ff"
-  integrity sha512-2a6eRxSxp1BW040hFvaJxhsCMI9lT8QB8t14t+NY5tC5rckIR0U9cr2tjOeaFirmEOy6MHvmJnY7zTBHq431Lw==
+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@19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-19.0.0.tgz#93e67c149fe26816d38a849ea30ac93677e16b6a"
-  integrity sha512-RYAyjCbxy/vri/CfnjUWJQQtZ3LKlLnDqj+9XLNnJPgEGeirZs3hllKR20re8LUZ6o1b1X4Jat+Qd26zmP41+A==
+jsdom@21.1.0:
+  version "21.1.0"
+  resolved "https://registry.npmjs.org/jsdom/-/jsdom-21.1.0.tgz"
+  integrity sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==
   dependencies:
-    abab "^2.0.5"
-    acorn "^8.5.0"
-    acorn-globals "^6.0.0"
+    abab "^2.0.6"
+    acorn "^8.8.1"
+    acorn-globals "^7.0.0"
     cssom "^0.5.0"
     cssstyle "^2.3.0"
-    data-urls "^3.0.1"
-    decimal.js "^10.3.1"
+    data-urls "^3.0.2"
+    decimal.js "^10.4.2"
     domexception "^4.0.0"
     escodegen "^2.0.0"
     form-data "^4.0.0"
     html-encoding-sniffer "^3.0.0"
     http-proxy-agent "^5.0.0"
-    https-proxy-agent "^5.0.0"
+    https-proxy-agent "^5.0.1"
     is-potential-custom-element-name "^1.0.1"
-    nwsapi "^2.2.0"
-    parse5 "6.0.1"
-    saxes "^5.0.1"
+    nwsapi "^2.2.2"
+    parse5 "^7.1.1"
+    saxes "^6.0.0"
     symbol-tree "^3.2.4"
-    tough-cookie "^4.0.0"
-    w3c-hr-time "^1.0.2"
-    w3c-xmlserializer "^3.0.0"
+    tough-cookie "^4.1.2"
+    w3c-xmlserializer "^4.0.0"
     webidl-conversions "^7.0.0"
     whatwg-encoding "^2.0.0"
     whatwg-mimetype "^3.0.0"
-    whatwg-url "^10.0.0"
-    ws "^8.2.3"
+    whatwg-url "^11.0.0"
+    ws "^8.11.0"
     xml-name-validator "^4.0.0"
 
 jsdom@^16.4.0:
   version "16.7.0"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.7.0.tgz#918ae71965424b197c819f8183a754e18977b710"
+  resolved "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz"
   integrity sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==
   dependencies:
     abab "^2.0.5"
@@ -7820,95 +7424,98 @@ jsdom@^16.4.0:
 
 jsesc@^2.5.1:
   version "2.5.2"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-2.5.2.tgz#80564d2e483dacf6e8ef209650a67df3f0c283a4"
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
   integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
 
 jsesc@~0.5.0:
   version "0.5.0"
-  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
-  integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
+  resolved "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"
+  integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA==
 
-json-buffer@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
-  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
-
-json-parse-better-errors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
-  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
-
-json-parse-even-better-errors@^2.3.0:
+json-parse-even-better-errors@^2.3.0, json-parse-even-better-errors@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"
   integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
 
+json-parse-even-better-errors@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.0.tgz"
+  integrity sha512-iZbGHafX/59r39gPwVPRBGw0QQKnA7tte5pSMrhWOW7swGsVvVTjmfyAV9pNqk8YGT7tRCdxRu8uzcgZwoDooA==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema-traverse@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
+  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
 json-schema@0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.4.0.tgz#f7de4cf6efab838ebaeb3236474cbba5a1930ab5"
+  resolved "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz"
   integrity sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
 json-stringify-safe@~5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
-  integrity sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=
+  resolved "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
+  integrity sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==
 
-json5@^0.5.0:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821"
-  integrity sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=
-
-json5@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
-  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+json5@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz"
+  integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.2, json5@^2.1.3:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3"
-  integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==
+json5@^2.1.2, json5@^2.2.1, json5@^2.2.2, json5@^2.2.3:
+  version "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==
   dependencies:
-    minimist "^1.2.5"
+    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:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/jsonc-parser/-/jsonc-parser-3.0.0.tgz#abdd785701c7e7eaca8a9ec8cf070ca51a745a22"
+  resolved "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"
   integrity sha512-fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA==
 
-jsonfile@^2.1.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-2.4.0.tgz#3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"
-  integrity sha1-NzaitCi4e72gzIO1P6PWM6NcKug=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
+jsonc-parser@3.2.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==
 
 jsonfile@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66"
-  integrity sha1-pezG9l9T9mLEQVx2daAzHQmS7GY=
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-3.0.1.tgz"
+  integrity sha512-oBko6ZHlubVB5mRFkur5vgYR1UyqX+S6Y/oCfLhqNdcc2fYFlDpIoNc7AfKS1KOGcnNAkvsr0grLck9ANM815w==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
   optionalDependencies:
     graceful-fs "^4.1.6"
 
 jsonfile@^6.0.1:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-6.1.0.tgz#bc55b2634793c679ec6403094eb13698a6ec0aae"
+  resolved "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"
   integrity sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==
   dependencies:
     universalify "^2.0.0"
@@ -7917,13 +7524,13 @@ jsonfile@^6.0.1:
 
 jsonparse@^1.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
-  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+  resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz"
+  integrity sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==
 
-jsonschema@1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.4.0.tgz#1afa34c4bc22190d8e42271ec17ac8b3404f87b2"
-  integrity sha512-/YgW6pRMr6M7C+4o8kS+B/2myEpHCrxO4PEWnqJNBFMjn7EWXqlQ4tGwL6xTHeRplwuZmcAncdvfOad1nT2yMw==
+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"
@@ -7937,7 +7544,7 @@ jsprim@^1.2.2:
 
 jsprim@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/jsprim/-/jsprim-2.0.2.tgz#77ca23dbcd4135cd364800d22ff82c2185803d4d"
+  resolved "https://registry.npmjs.org/jsprim/-/jsprim-2.0.2.tgz"
   integrity sha512-gqXddjPqQ6G40VdnI6T6yObEC+pDNvyP95wdQhkWkg7crHH3km5qP1FsOXEkzEQwnz6gz5qGTn1c2Y52wP3OyQ==
   dependencies:
     assert-plus "1.0.0"
@@ -7946,95 +7553,85 @@ jsprim@^2.0.2:
     verror "1.10.0"
 
 jss-plugin-camel-case@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-camel-case/-/jss-plugin-camel-case-10.9.0.tgz#4921b568b38d893f39736ee8c4c5f1c64670aaf7"
-  integrity sha512-UH6uPpnDk413/r/2Olmw4+y54yEF2lRIV8XIZyuYpgPYTITLlPOsq6XB9qeqv+75SQSg3KLocq5jUBXW8qWWww==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-camel-case/-/jss-plugin-camel-case-10.10.0.tgz"
+  integrity sha512-z+HETfj5IYgFxh1wJnUAU8jByI48ED+v0fuTuhKrPR+pRBYS2EDwbusU8aFOpCdYhtRc9zhN+PJ7iNE8pAWyPw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     hyphenate-style-name "^1.0.3"
-    jss "10.9.0"
+    jss "10.10.0"
 
 jss-plugin-default-unit@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-default-unit/-/jss-plugin-default-unit-10.9.0.tgz#bb23a48f075bc0ce852b4b4d3f7582bc002df991"
-  integrity sha512-7Ju4Q9wJ/MZPsxfu4T84mzdn7pLHWeqoGd/D8O3eDNNJ93Xc8PxnLmV8s8ZPNRYkLdxZqKtm1nPQ0BM4JRlq2w==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-default-unit/-/jss-plugin-default-unit-10.10.0.tgz"
+  integrity sha512-SvpajxIECi4JDUbGLefvNckmI+c2VWmP43qnEy/0eiwzRUsafg5DVSIWSzZe4d2vFX1u9nRDP46WCFV/PXVBGQ==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.10.0"
 
 jss-plugin-global@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-global/-/jss-plugin-global-10.9.0.tgz#fc07a0086ac97aca174e37edb480b69277f3931f"
-  integrity sha512-4G8PHNJ0x6nwAFsEzcuVDiBlyMsj2y3VjmFAx/uHk/R/gzJV+yRHICjT4MKGGu1cJq2hfowFWCyrr/Gg37FbgQ==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-global/-/jss-plugin-global-10.10.0.tgz"
+  integrity sha512-icXEYbMufiNuWfuazLeN+BNJO16Ge88OcXU5ZDC2vLqElmMybA31Wi7lZ3lf+vgufRocvPj8443irhYRgWxP+A==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.10.0"
 
 jss-plugin-nested@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-nested/-/jss-plugin-nested-10.9.0.tgz#cc1c7d63ad542c3ccc6e2c66c8328c6b6b00f4b3"
-  integrity sha512-2UJnDrfCZpMYcpPYR16oZB7VAC6b/1QLsRiAutOt7wJaaqwCBvNsosLEu/fUyKNQNGdvg2PPJFDO5AX7dwxtoA==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-nested/-/jss-plugin-nested-10.10.0.tgz"
+  integrity sha512-9R4JHxxGgiZhurDo3q7LdIiDEgtA1bTGzAbhSPyIOWb7ZubrjQe8acwhEQ6OEKydzpl8XHMtTnEwHXCARLYqYA==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.10.0"
     tiny-warning "^1.0.2"
 
 jss-plugin-props-sort@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-props-sort/-/jss-plugin-props-sort-10.9.0.tgz#30e9567ef9479043feb6e5e59db09b4de687c47d"
-  integrity sha512-7A76HI8bzwqrsMOJTWKx/uD5v+U8piLnp5bvru7g/3ZEQOu1+PjHvv7bFdNO3DwNPC9oM0a//KwIJsIcDCjDzw==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-props-sort/-/jss-plugin-props-sort-10.10.0.tgz"
+  integrity sha512-5VNJvQJbnq/vRfje6uZLe/FyaOpzP/IH1LP+0fr88QamVrGJa0hpRRyAa0ea4U/3LcorJfBFVyC4yN2QC73lJg==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.10.0"
 
 jss-plugin-rule-value-function@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.9.0.tgz#379fd2732c0746fe45168011fe25544c1a295d67"
-  integrity sha512-IHJv6YrEf8pRzkY207cPmdbBstBaE+z8pazhPShfz0tZSDtRdQua5jjg6NMz3IbTasVx9FdnmptxPqSWL5tyJg==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-rule-value-function/-/jss-plugin-rule-value-function-10.10.0.tgz"
+  integrity sha512-uEFJFgaCtkXeIPgki8ICw3Y7VMkL9GEan6SqmT9tqpwM+/t+hxfMUdU4wQ0MtOiMNWhwnckBV0IebrKcZM9C0g==
   dependencies:
     "@babel/runtime" "^7.3.1"
-    jss "10.9.0"
+    jss "10.10.0"
     tiny-warning "^1.0.2"
 
 jss-plugin-vendor-prefixer@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.9.0.tgz#aa9df98abfb3f75f7ed59a3ec50a5452461a206a"
-  integrity sha512-MbvsaXP7iiVdYVSEoi+blrW+AYnTDvHTW6I6zqi7JcwXdc6I9Kbm234nEblayhF38EftoenbM+5218pidmC5gA==
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss-plugin-vendor-prefixer/-/jss-plugin-vendor-prefixer-10.10.0.tgz"
+  integrity sha512-UY/41WumgjW8r1qMCO8l1ARg7NHnfRVWRhZ2E2m0DMYsr2DD91qIXLyNhiX83hHswR7Wm4D+oDYNC1zWCJWtqg==
   dependencies:
     "@babel/runtime" "^7.3.1"
     css-vendor "^2.0.8"
-    jss "10.9.0"
+    jss "10.10.0"
 
 jss-rtl@^0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/jss-rtl/-/jss-rtl-0.3.0.tgz#386961615956f9655bd5e9ec7e9d08bef223e4af"
+  resolved "https://registry.npmjs.org/jss-rtl/-/jss-rtl-0.3.0.tgz"
   integrity sha512-rg9jJmP1bAyhNOAp+BDZgOP/lMm4+oQ76qGueupDQ68Wq+G+6SGvCZvhIEg8OHSONRWOwFT6skCI+APGi8DgmA==
   dependencies:
     rtl-css-js "^1.13.1"
 
-jss@10.9.0, jss@^10.3.0, jss@^10.5.1:
-  version "10.9.0"
-  resolved "https://registry.yarnpkg.com/jss/-/jss-10.9.0.tgz#7583ee2cdc904a83c872ba695d1baab4b59c141b"
-  integrity sha512-YpzpreB6kUunQBbrlArlsMpXYyndt9JATbt95tajx0t4MTJJcCJdd4hdNpHmOIDiUJrF/oX5wtVFrS3uofWfGw==
+jss@10.10.0, jss@^10.3.0, jss@^10.5.1:
+  version "10.10.0"
+  resolved "https://registry.npmjs.org/jss/-/jss-10.10.0.tgz"
+  integrity sha512-cqsOTS7jqPsPMjtKYDUpdFC0AbhYFLTcuGRqymgmdJIeQ8cH7+AgX7YSgQy79wXloZq2VvATYxUOUQEvS1V/Zw==
   dependencies:
     "@babel/runtime" "^7.3.1"
     csstype "^3.0.2"
     is-in-browser "^1.1.3"
     tiny-warning "^1.0.2"
 
-jszip@^3.1.3:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.1.tgz#bd63401221c15625a1228c556ca8a68da6fda3d9"
-  integrity sha512-ghL0tz1XG9ZEmRMcEN2vt7xabrDdqHHeykgARpmZ0BiIctWxM47Vt63ZO2dnp4QYt/xJVLLy5Zv1l/xRdh2byg==
-  dependencies:
-    lie "~3.3.0"
-    pako "~1.0.2"
-    readable-stream "~2.3.6"
-    set-immediate-shim "~1.0.1"
-
 juice@^8.0.0:
   version "8.1.0"
-  resolved "https://registry.yarnpkg.com/juice/-/juice-8.1.0.tgz#4ea23362522fe06418229943237ee3751a4fca70"
+  resolved "https://registry.npmjs.org/juice/-/juice-8.1.0.tgz"
   integrity sha512-FLzurJrx5Iv1e7CfBSZH68dC04EEvXvvVvPYB7Vx1WAuhCp1ZPIMtqxc+WTWxVkpTIC2Ach/GAv0rQbtGf6YMA==
   dependencies:
     cheerio "1.0.0-rc.10"
@@ -8045,17 +7642,17 @@ juice@^8.0.0:
 
 jwt-decode@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59"
+  resolved "https://registry.npmjs.org/jwt-decode/-/jwt-decode-3.1.2.tgz"
   integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A==
 
-karma-chrome-launcher@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.0.tgz#805a586799a4d05f4e54f72a204979f3f3066738"
-  integrity sha512-3dPs/n7vgz1rxxtynpzZTvb9y/GIaW8xjAwcIGttLbycqoFtI7yo1NGnQi6oFTherRE+GIhCAHZC4vEqWGhNvg==
+karma-chrome-launcher@~3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.2.0.tgz#eb9c95024f2d6dfbb3748d3415ac9b381906b9a9"
+  integrity sha512-rE9RkUPI7I9mAxByQWkGJFXfFD6lE4gC5nPuZdobf/QdTEJI6EU4yIay/cfU/xV4ZxlM5JiTv7zWYgA64NpS5Q==
   dependencies:
     which "^1.2.1"
 
-karma-coverage-istanbul-reporter@~3.0.2:
+karma-coverage-istanbul-reporter@~3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/karma-coverage-istanbul-reporter/-/karma-coverage-istanbul-reporter-3.0.3.tgz#f3b5303553aadc8e681d40d360dfdc19bc7e9fe9"
   integrity sha512-wE4VFhG/QZv2Y4CdAYWDbMmcAHeS926ZIji4z+FkB2aF/EposRb6DP6G5ncT/wXhqUfAb/d7kZrNKPonbvsATw==
@@ -8068,20 +7665,20 @@ karma-coverage-istanbul-reporter@~3.0.2:
 
 karma-jasmine-html-reporter@^1.5.0:
   version "1.7.0"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz#52c489a74d760934a1089bfa5ea4a8fcb84cc28b"
+  resolved "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz"
   integrity sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==
 
 karma-jasmine@~4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-4.0.1.tgz#b99e073b6d99a5196fc4bffc121b89313b0abd82"
-  integrity sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==
+  version "4.0.2"
+  resolved "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz"
+  integrity sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==
   dependencies:
     jasmine-core "^3.6.0"
 
 karma-mocha-reporter@2.2.5:
   version "2.2.5"
-  resolved "https://registry.yarnpkg.com/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz#15120095e8ed819186e47a0b012f3cd741895560"
-  integrity sha1-FRIAlejtgZGG5HoLAS8810GJVWA=
+  resolved "https://registry.npmjs.org/karma-mocha-reporter/-/karma-mocha-reporter-2.2.5.tgz"
+  integrity sha512-Hr6nhkIp0GIJJrvzY8JFeHpQZNseuIakGac4bpw8K1+5F0tLb6l7uvXRa8mt2Z+NVwYgCct4QAfp2R2QP6o00w==
   dependencies:
     chalk "^2.1.0"
     log-symbols "^2.1.0"
@@ -8089,15 +7686,15 @@ karma-mocha-reporter@2.2.5:
 
 karma-source-map-support@1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz#58526ceccf7e8730e56effd97a4de8d712ac0d6b"
+  resolved "https://registry.npmjs.org/karma-source-map-support/-/karma-source-map-support-1.4.0.tgz"
   integrity sha512-RsBECncGO17KAoJCYXjv+ckIz+Ii9NCi+9enk+rq6XC81ezYkb4/RHE6CTXdA7IOJqoF3wcaLfVG0CPmE5ca6A==
   dependencies:
     source-map-support "^0.5.5"
 
-karma@^6.3.14:
-  version "6.3.17"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.17.tgz#5d963fb52463b73e1b5892ecb54c8f21bb04ba1d"
-  integrity sha512-2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g==
+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==
   dependencies:
     "@colors/colors" "1.5.0"
     body-parser "^1.19.0"
@@ -8118,81 +7715,56 @@ karma@^6.3.14:
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
-    socket.io "^4.2.0"
+    socket.io "^4.4.1"
     source-map "^0.6.1"
     tmp "^0.2.1"
     ua-parser-js "^0.7.30"
     yargs "^16.1.1"
 
-keyv@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
-  integrity sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==
-  dependencies:
-    json-buffer "3.0.0"
-
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
+kind-of@^6.0.2:
   version "6.0.3"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
   integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
 
-klaro@^0.7.10:
+klaro@^0.7.18:
   version "0.7.18"
-  resolved "https://registry.yarnpkg.com/klaro/-/klaro-0.7.18.tgz#fef3a05fcd656451b941e11459f37d6c336e84c0"
+  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.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"
+  resolved "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz"
   integrity sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==
 
 klona@^2.0.4, klona@^2.0.5:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.5.tgz#d166574d90076395d9963aa7a928fabb8d76afbc"
-  integrity sha512-pJiBpiXMbt7dkzXe8Ghj/u4FfXOOa98fPW+bihOJ4SjnoijweJrNThJfd3ifXpXhREjpoF2mZVH1GfS9LV3kHQ==
+  version "2.0.6"
+  resolved "https://registry.npmjs.org/klona/-/klona-2.0.6.tgz"
+  integrity sha512-dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==
 
-latest-version@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/latest-version/-/latest-version-5.1.0.tgz#119dfe908fe38d15dfa43ecd13fa12ec8832face"
-  integrity sha512-weT+r0kTkRQdCdYCNtkMwWXQTMEswKrFBkm4ckQOMVhhqhIMI1UT2hMj+1iigIhgSZm5gTmrRXBNoGUgaTY1xA==
+launch-editor@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"
+  integrity sha512-JpDCcQnyAAzZZaZ7vEiSqL690w7dAEyLao+KC96zBplnYbJS7TYNjvM3M7y3dGz+v7aIsJk3hllWuc0kWAjyRQ==
   dependencies:
-    package-json "^6.3.0"
+    picocolors "^1.0.0"
+    shell-quote "^1.7.3"
 
 lazy-ass@^1.6.0:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/lazy-ass/-/lazy-ass-1.6.0.tgz#7999655e8646c17f089fdd187d150d3324d54513"
-  integrity sha1-eZllXoZGwX8In90YfRUNMyTVRRM=
+  resolved "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz"
+  integrity sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==
 
-less-loader@10.2.0:
-  version "10.2.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-10.2.0.tgz#97286d8797dc3dc05b1d16b0ecec5f968bdd4e32"
-  integrity sha512-AV5KHWvCezW27GT90WATaDnfXBv99llDbtaj4bshq6DvAihMdNjaPDcUMa6EXKLRF+P2opFenJp89BXg91XLYg==
+less-loader@11.1.0:
+  version "11.1.0"
+  resolved "https://registry.npmjs.org/less-loader/-/less-loader-11.1.0.tgz"
+  integrity sha512-C+uDBV7kS7W5fJlUjq5mPBeBVhYpTIm5gB09APT9o3n/ILeaXVsiSFTbZpTJCJwQ/Crczfn3DmfQFwxYusWFug==
   dependencies:
     klona "^2.0.4"
 
-less@4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/less/-/less-4.1.2.tgz#6099ee584999750c2624b65f80145f8674e4b4b0"
-  integrity sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==
+less@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.npmjs.org/less/-/less-4.1.3.tgz"
+  integrity sha512-w16Xk/Ta9Hhyei0Gpz9m7VS8F28nieJaL/VyShID7cYvP6IL5oHeL6p4TXSDJqZE/lNv0oJ2pGVjJsRkfwm5FA==
   dependencies:
     copy-anything "^2.0.1"
     parse-node-version "^1.0.1"
@@ -8203,12 +7775,12 @@ less@4.1.2:
     image-size "~0.5.0"
     make-dir "^2.1.0"
     mime "^1.4.1"
-    needle "^2.5.2"
+    needle "^3.1.0"
     source-map "~0.6.0"
 
 levn@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
   integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
     prelude-ls "^1.2.1"
@@ -8216,51 +7788,39 @@ levn@^0.4.1:
 
 levn@~0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
 license-webpack-plugin@4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz#1e18442ed20b754b82f1adeff42249b81d11aec6"
+  resolved "https://registry.npmjs.org/license-webpack-plugin/-/license-webpack-plugin-4.0.2.tgz"
   integrity sha512-771TFWFD70G1wLTC4oU2Cw4qvtmNrIw+wRvBtn+okgHl7slJVi7zfNcdmqDL72BojM30VNJ2UHylr1o77U37Jw==
   dependencies:
     webpack-sources "^3.0.0"
 
-lie@~3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
-  integrity sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==
-  dependencies:
-    immediate "~3.0.5"
-
-lilconfig@^2.0.3, lilconfig@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.4.tgz#f4507d043d7058b380b6a8f5cb7bcd4b34cee082"
-  integrity sha512-bfTIN7lEsiooCocSISTWXkiWJkRqtL9wYtYy+8EK3Y41qh3mpwPU0ycTOgjdY9ErwXCc8QyrQp82bdL0Xkm9yA==
-
 limiter@^1.0.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/limiter/-/limiter-1.1.5.tgz#8f92a25b3b16c6131293a0cc834b4a838a2aa7c2"
+  resolved "https://registry.npmjs.org/limiter/-/limiter-1.1.5.tgz"
   integrity sha512-FWWMIEOxz3GwUI4Ts/IvgVy6LPvoMPgjMdQ185nN6psJyBJ4yOpzqm695/h5umdLJg2vW3GR5iG11MAkR2AzJA==
 
 lines-and-columns@^1.1.6:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.2.4.tgz#eca284f75d2965079309dc0ad9255abb2ebc1632"
+  resolved "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz"
   integrity sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==
 
 linkify-it@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-4.0.1.tgz#01f1d5e508190d06669982ba31a7d9f56a5751ec"
+  resolved "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz"
   integrity sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==
   dependencies:
     uc.micro "^1.0.1"
 
 listr2@^3.8.3:
   version "3.14.0"
-  resolved "https://registry.yarnpkg.com/listr2/-/listr2-3.14.0.tgz#23101cc62e1375fd5836b248276d1d2b51fdbe9e"
+  resolved "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz"
   integrity sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==
   dependencies:
     cli-truncate "^2.1.0"
@@ -8273,38 +7833,19 @@ listr2@^3.8.3:
     wrap-ansi "^7.0.0"
 
 loader-runner@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
-  integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
+  version "4.3.0"
+  resolved "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
 
-loader-utils@3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-3.2.0.tgz#bcecc51a7898bee7473d4bc6b845b23af8304d4f"
-  integrity sha512-HVl9ZqccQihZ7JM85dco1MvO9G+ONvxoGa9rkhzFsneGLKSUg1gJf9bWzhRhcvm2qChhWpebQhP44qxjKIUCaQ==
-
-loader-utils@^0.2.12:
-  version "0.2.17"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
-  integrity sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=
-  dependencies:
-    big.js "^3.1.3"
-    emojis-list "^2.0.0"
-    json5 "^0.5.0"
-    object-assign "^4.0.1"
-
-loader-utils@^1.0.2, loader-utils@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.4.0.tgz#c579b5e34cb34b1a74edc6c1fb36bfa371d5a613"
-  integrity sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^3.0.0"
-    json5 "^1.0.1"
+loader-utils@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-3.2.1.tgz"
+  integrity sha512-ZvFw1KWS3GVyYBYb7qkmRM/WwL2TQQBxgCK62rlvm4WpVQ23Nb4tYjApUlfjrEGvOs7KHEsmyUn75OHZrJMWPw==
 
 loader-utils@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.2.tgz#d6e3b4fb81870721ae4e0868ab11dd638368c129"
-  integrity sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==
+  version "2.0.4"
+  resolved "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz"
+  integrity sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==
   dependencies:
     big.js "^5.2.2"
     emojis-list "^3.0.0"
@@ -8312,7 +7853,7 @@ loader-utils@^2.0.0:
 
 localtunnel@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/localtunnel/-/localtunnel-2.0.2.tgz#528d50087151c4790f89c2db374fe7b0a48501f0"
+  resolved "https://registry.npmjs.org/localtunnel/-/localtunnel-2.0.2.tgz"
   integrity sha512-n418Cn5ynvJd7m/N1d9WVJISLJF/ellZnfsLnx8WBWGzxv/ntNcFkJ1o6se5quUhCplfLGBNL5tYHiq5WF3Nug==
   dependencies:
     axios "0.21.4"
@@ -8320,66 +7861,55 @@ localtunnel@^2.0.1:
     openurl "1.1.1"
     yargs "17.1.1"
 
-locate-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
-  integrity sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=
-  dependencies:
-    p-locate "^2.0.0"
-    path-exists "^3.0.0"
-
 locate-path@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz"
   integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
     p-locate "^4.1.0"
 
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
 lodash.debounce@^4.0.8:
   version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
+  resolved "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz"
+  integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
 
 lodash.isfinite@^3.3.2:
   version "3.3.2"
-  resolved "https://registry.yarnpkg.com/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz#fb89b65a9a80281833f0b7478b3a5104f898ebb3"
-  integrity sha1-+4m2WpqAKBgz8LdHizpRBPiY67M=
-
-lodash.memoize@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
-  integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
+  resolved "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz"
+  integrity sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
 lodash.once@^4.1.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
-  integrity sha1-DdOXEhPHxW34gJd9UEyI+0cal6w=
-
-lodash.uniq@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
-  integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
+  resolved "https://registry.npmjs.org/lodash.once/-/lodash.once-4.1.1.tgz"
+  integrity sha512-Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==
 
 lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
 log-symbols@^2.1.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a"
+  resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz"
   integrity sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==
   dependencies:
     chalk "^2.0.1"
 
 log-symbols@^4.0.0, log-symbols@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz"
   integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
   dependencies:
     chalk "^4.1.0"
@@ -8387,7 +7917,7 @@ log-symbols@^4.0.0, log-symbols@^4.1.0:
 
 log-update@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-update/-/log-update-4.0.0.tgz#589ecd352471f2a1c0c570287543a64dfd20e0a1"
+  resolved "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz"
   integrity sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==
   dependencies:
     ansi-escapes "^4.3.0"
@@ -8396,170 +7926,180 @@ log-update@^4.0.0:
     wrap-ansi "^6.2.0"
 
 log4js@^6.4.1:
-  version "6.4.2"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.4.2.tgz#45ec783835acc525b397f52cf086e26994fe3b70"
-  integrity sha512-k80cggS2sZQLBwllpT1p06GtfvzMmSdUCkW96f0Hj83rKGJDAu2vZjt9B9ag2vx8Zz1IXzxoLgqvRJCdMKybGg==
+  version "6.9.1"
+  resolved "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz"
+  integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==
   dependencies:
-    date-format "^4.0.4"
-    debug "^4.3.3"
-    flatted "^3.2.5"
+    date-format "^4.0.14"
+    debug "^4.3.4"
+    flatted "^3.2.7"
     rfdc "^1.3.0"
-    streamroller "^3.0.4"
+    streamroller "^3.1.5"
 
 loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
+  resolved "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
   dependencies:
     js-tokens "^3.0.0 || ^4.0.0"
 
-lower-case@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"
-  integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==
-  dependencies:
-    tslib "^2.0.3"
-
-lowercase-keys@^1.0.0, lowercase-keys@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
-  integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
-
-lowercase-keys@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
-  integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
-
 lru-cache@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz"
   integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
   dependencies:
     yallist "^3.0.2"
 
 lru-cache@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
   integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^7.4.1:
-  version "7.4.4"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.4.4.tgz#a3dabc394ec07e2285af52fd24d0d74b3ac71c29"
-  integrity sha512-2XbUJmlpIbmc9JvNNmtLzHlF31srxoDxuiQiwBHic7RZyHyltbTdzoO6maRqpdEhOOG5GD80EXvzAU0wR15ccg==
+lru-cache@^7.14.1, lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1:
+  version "7.18.3"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz"
+  integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==
+
+lru-cache@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-9.0.1.tgz"
+  integrity sha512-C8QsKIN1UIXeOs3iWmiZ1lQY+EnKDojWd37fXy1aSbJvH4iSma1uy2OWuoB3m4SYRli5+CUjDv3Dij5DVoetmg==
 
 magic-string@0.25.7:
   version "0.25.7"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
+  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
   integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
   dependencies:
     sourcemap-codec "^1.4.4"
 
-magic-string@^0.26.0:
-  version "0.26.1"
-  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.26.1.tgz#ba9b651354fa9512474199acecf9c6dbe93f97fd"
-  integrity sha512-ndThHmvgtieXe8J/VGPjG+Apu7v7ItcD5mhEIvOscWjPF/ccOiLxHaSuCAS2G+3x4GKsAbT8u7zdyamupui8Tg==
+magic-string@0.29.0:
+  version "0.29.0"
+  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.29.0.tgz"
+  integrity sha512-WcfidHrDjMY+eLjlU+8OvwREqHwpgCeKVBUpQ3OhYYuvfaYCUgcbuBzappNzZvg/v8onU3oQj+BYpkOJe9Iw4Q==
   dependencies:
-    sourcemap-codec "^1.4.8"
+    "@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"
+  integrity sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.4.13"
 
 make-dir@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"
   integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
   dependencies:
     pify "^4.0.1"
     semver "^5.6.0"
 
-make-dir@^3.0.0, make-dir@^3.0.2, make-dir@^3.1.0:
+make-dir@^3.0.0, make-dir@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz#415e967046b3a7f1d185277d84aa58203726a13f"
+  resolved "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz"
   integrity sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==
   dependencies:
     semver "^6.0.0"
 
 make-error@^1.1.1:
   version "1.3.6"
-  resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
+  resolved "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^10.0.1:
-  version "10.0.5"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-10.0.5.tgz#006e0c5579224832c732c35b7bcc43c8602da775"
-  integrity sha512-0JQ0daMRDFEv14DelmcFlprdhSDNG7WEgInTjBeWYWZ78W0jfDqygZdPLhcrQ4s/G8skNhBrS4fiF6xA+YlFjQ==
+make-fetch-happen@^10.0.3:
+  version "10.2.1"
+  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz"
+  integrity sha512-NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==
   dependencies:
     agentkeepalive "^4.2.1"
-    cacache "^15.3.0"
+    cacache "^16.1.0"
     http-cache-semantics "^4.1.0"
     http-proxy-agent "^5.0.0"
     https-proxy-agent "^5.0.0"
     is-lambda "^1.0.1"
-    lru-cache "^7.4.1"
+    lru-cache "^7.7.1"
     minipass "^3.1.6"
     minipass-collect "^1.0.2"
-    minipass-fetch "^2.0.2"
+    minipass-fetch "^2.0.3"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
     negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^6.1.1"
-    ssri "^8.0.1"
+    socks-proxy-agent "^7.0.0"
+    ssri "^9.0.0"
 
-make-fetch-happen@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
-  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+make-fetch-happen@^11.0.0, make-fetch-happen@^11.0.1:
+  version "11.0.3"
+  resolved "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.0.3.tgz"
+  integrity sha512-oPLh5m10lRNNZDjJ2kP8UpboUx2uFXVaVweVe/lWut4iHWcQEmfqSVJt2ihZsFI8HbpwyyocaXbCAWf0g1ukIA==
   dependencies:
-    agentkeepalive "^4.1.3"
-    cacache "^15.2.0"
-    http-cache-semantics "^4.1.0"
-    http-proxy-agent "^4.0.1"
+    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 "^6.0.0"
-    minipass "^3.1.3"
-    minipass-collect "^1.0.2"
-    minipass-fetch "^1.3.2"
+    lru-cache "^7.7.1"
+    minipass "^4.0.0"
+    minipass-fetch "^3.0.0"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
-    negotiator "^0.6.2"
+    negotiator "^0.6.3"
     promise-retry "^2.0.1"
-    socks-proxy-agent "^6.0.0"
-    ssri "^8.0.0"
+    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.4"
-  resolved "https://registry.yarnpkg.com/manifesto.js/-/manifesto.js-4.2.4.tgz#996cb3bd638883ea8f447ad00b958f23aeb0a184"
-  integrity sha512-Kfa3RSFnWeLTmzpkRQu/WM1275cx859rzwQO0wiRVo3Kl3yjbyV7QPzZkLCqgaL76gOarfYe28t1EDytgGpL9A==
+  version "4.2.17"
+  resolved "https://registry.npmjs.org/manifesto.js/-/manifesto.js-4.2.17.tgz"
+  integrity sha512-UjctsJ2PkgwGDUQ/ZzvyObXJO/yiFYwiz49xrzkayi9fhrwUVC3Vc0aQyGm723BZTl5nKYJQ8YdEhJRp08xOtA==
   dependencies:
     "@edsilv/http-status-codes" "^1.0.3"
-    "@iiif/vocabulary" "^1.0.20"
+    "@iiif/vocabulary" "^1.0.26"
     isomorphic-unfetch "^3.0.0"
     lodash "^4.17.21"
 
-map-cache@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-markdown-it-mathjax3@^4.3.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/markdown-it-mathjax3/-/markdown-it-mathjax3-4.3.1.tgz#7ff1e79204074955d4dc38402a81f38f7030e614"
-  integrity sha512-IkM3Cuk4rtjy9VwLzWpgeitcwnEmK2eYJrztNRv1v7mwZaOLMTkgjJGT71GdJADrpvAEWhNn43EKtjynhEsaIQ==
+markdown-it-mathjax3@^4.3.2:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/markdown-it-mathjax3/-/markdown-it-mathjax3-4.3.2.tgz#1e34aa86f8560b283fd283008334adc2d6b05a37"
+  integrity sha512-TX3GW5NjmupgFtMJGRauioMbbkGsOXAAt1DZ/rzzYmTHqzkO1rNAdiMD4NiruurToPApn2kYy76x02QN26qr2w==
   dependencies:
     juice "^8.0.0"
     mathjax-full "^3.2.0"
 
 markdown-it@^13.0.1:
   version "13.0.1"
-  resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-13.0.1.tgz#c6ecc431cacf1a5da531423fc6a42807814af430"
+  resolved "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz"
   integrity sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==
   dependencies:
     argparse "^2.0.1"
@@ -8570,7 +8110,7 @@ markdown-it@^13.0.1:
 
 mathjax-full@^3.2.0:
   version "3.2.2"
-  resolved "https://registry.yarnpkg.com/mathjax-full/-/mathjax-full-3.2.2.tgz#43f02e55219db393030985d2b6537ceae82f1fa7"
+  resolved "https://registry.npmjs.org/mathjax-full/-/mathjax-full-3.2.2.tgz"
   integrity sha512-+LfG9Fik+OuI8SLwsiR02IVdjcnRCy5MufYLi0C3TdMT56L/pjB0alMVGgoWJF8pN9Rc7FESycZB9BMNWIid5w==
   dependencies:
     esm "^3.2.25"
@@ -8578,7 +8118,7 @@ mathjax-full@^3.2.0:
     mj-context-menu "^0.6.1"
     speech-rule-engine "^4.0.6"
 
-md5@^2.2.1:
+md5@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/md5/-/md5-2.3.0.tgz#c3da9a6aae3a30b46b7b0c349b87b110dc3bda4f"
   integrity sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==
@@ -8587,205 +8127,161 @@ md5@^2.2.1:
     crypt "0.0.2"
     is-buffer "~1.1.6"
 
-mdn-data@2.0.14:
-  version "2.0.14"
-  resolved "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.14.tgz#7113fc4281917d63ce29b43446f701e68c25ba50"
-  integrity sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==
-
 mdurl@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e"
+  resolved "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz"
   integrity sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==
 
 media-typer@0.3.0:
   version "0.3.0"
-  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  resolved "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
-memfs@^3.1.2, memfs@^3.2.2, memfs@^3.4.1:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.4.1.tgz#b78092f466a0dce054d63d39275b24c71d3f1305"
-  integrity sha512-1c9VPVvW5P7I85c35zAdEr1TD5+F11IToIHIlrVIcflfnzPkJa0ZoYEoEdYDP8KgPFoSZ/opDrUsAoZWym3mtw==
+memfs@^3.4.12, memfs@^3.4.3:
+  version "3.5.0"
+  resolved "https://registry.npmjs.org/memfs/-/memfs-3.5.0.tgz"
+  integrity sha512-yK6o8xVJlQerz57kvPROwTMgx5WtGwC2ZxDtOUsnGl49rHjYkfQoPNZPCKH73VdLE1BwBu/+Fx/NL8NYMUw2aA==
   dependencies:
-    fs-monkey "1.0.3"
+    fs-monkey "^1.0.3"
 
 "memoize-one@>=3.1.1 <6", memoize-one@^5.1.1:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e"
+  resolved "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz"
   integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==
 
-memory-fs@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/memory-fs/-/memory-fs-0.5.0.tgz#324c01288b88652966d161db77838720845a8e3c"
-  integrity sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==
-  dependencies:
-    errno "^0.1.3"
-    readable-stream "^2.0.1"
-
 mensch@^0.3.4:
   version "0.3.4"
-  resolved "https://registry.yarnpkg.com/mensch/-/mensch-0.3.4.tgz#770f91b46cb16ea5b204ee735768c3f0c491fecd"
+  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.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+  resolved "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-stream@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
   integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
 
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
+  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-merge@^1.2.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.1.tgz#38bebf80c3220a8a487b6fcfb3941bb11720c145"
-  integrity sha512-VjFo4P5Whtj4vsLzsYBu5ayHhoHJ0UqNm7ibvShmbmoz7tGi0vXaoJbGdB+GmDMLUdg8DpQXEIeVDAe8MaABvQ==
-
 methods@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  resolved "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 mhchemparser@^4.1.0:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/mhchemparser/-/mhchemparser-4.1.1.tgz#a2142fdab37a02ec8d1b48a445059287790becd5"
+  resolved "https://registry.npmjs.org/mhchemparser/-/mhchemparser-4.1.1.tgz"
   integrity sha512-R75CUN6O6e1t8bgailrF1qPq+HhVeFTM3XQ0uzI+mXTybmphy3b6h4NbLOYhemViQ3lUs+6CKRkC3Ws1TlYREA==
 
-micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
 micromatch@^4.0.2, micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
+  version "4.0.5"
+  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"
+  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
   dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.2"
+    picomatch "^2.3.1"
 
-mime-db@1.51.0:
-  version "1.51.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.51.0.tgz#d9ff62451859b18342d960850dc3cfb77e63fb0c"
-  integrity sha512-5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g==
-
-"mime-db@>= 1.43.0 < 2":
+mime-db@1.52.0, "mime-db@>= 1.43.0 < 2":
   version "1.52.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  resolved "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"
   integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
 
 mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24, mime-types@~2.1.34:
-  version "2.1.34"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.34.tgz#5a712f9ec1503511a945803640fafe09d3793c24"
-  integrity sha512-6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A==
+  version "2.1.35"
+  resolved "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
   dependencies:
-    mime-db "1.51.0"
+    mime-db "1.52.0"
 
 mime@1.4.1:
   version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
+  resolved "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
 mime@1.6.0, mime@^1.4.1:
   version "1.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mime@^2.4.6, mime@^2.5.2:
   version "2.6.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  resolved "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz"
   integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
+  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-mimic-response@^1.0.0, mimic-response@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
-  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
-
-mini-css-extract-plugin@2.5.3:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.5.3.tgz#c5c79f9b22ce9b4f164e9492267358dbe35376d9"
-  integrity sha512-YseMB8cs8U/KCaAGQoqYmfUuhhGW0a9p9XvWXrxVOkE3/IiISTLw4ALNt7JR5B2eYauFM+PQGSbXMDmVbR7Tfw==
+mini-css-extract-plugin@2.7.2:
+  version "2.7.2"
+  resolved "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.7.2.tgz"
+  integrity sha512-EdlUizq13o0Pd+uCp+WO/JpkLvHRVGt97RqfeGhXqAcorYo1ypJSpkV+WDT0vY/kmh/p7wRdJNJtuyK540PXDw==
   dependencies:
     schema-utils "^4.0.0"
 
 minimalistic-assert@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
+  resolved "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-minimatch@3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
-
-minimatch@^3.0.2, minimatch@^3.0.4:
+minimatch@^3.0.2, minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz"
   integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
   dependencies:
     brace-expansion "^1.1.7"
 
 minimatch@^5.0.1:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
-  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  version "5.1.6"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz"
+  integrity sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==
   dependencies:
     brace-expansion "^2.0.1"
 
-minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.6:
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
-  integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
+minimatch@^7.4.2:
+  version "7.4.6"
+  resolved "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz"
+  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+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"
+
+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.5, 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==
 
 minipass-collect@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  resolved "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz"
   integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
   dependencies:
     minipass "^3.0.0"
 
-minipass-fetch@^1.3.2, minipass-fetch@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.4.1.tgz#d75e0091daac1b0ffd7e9d41629faff7d0c1f1b6"
-  integrity sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==
-  dependencies:
-    minipass "^3.1.0"
-    minipass-sized "^1.0.3"
-    minizlib "^2.0.0"
-  optionalDependencies:
-    encoding "^0.1.12"
-
-minipass-fetch@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-2.0.3.tgz#688bbd0c2b019642778dc808b6950dd908d192b3"
-  integrity sha512-VA+eiiUtaIvpQJXISwE3OiMvQwAWrgKb97F0aXlCS1Ahikr8fEQq8m3Hf7Kv9KT3nokuHigJKsDMB6atU04olQ==
+minipass-fetch@^2.0.3:
+  version "2.1.2"
+  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz"
+  integrity sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==
   dependencies:
     minipass "^3.1.6"
     minipass-sized "^1.0.3"
@@ -8793,16 +8289,27 @@ minipass-fetch@^2.0.2:
   optionalDependencies:
     encoding "^0.1.13"
 
+minipass-fetch@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.1.tgz"
+  integrity sha512-t9/wowtf7DYkwz8cfMSt0rMwiyNIBXf5CKZ3S5ZMqRqMYT0oLTp0x1WorMI9WTwvaPg21r1JbFxJMum8JrLGfw==
+  dependencies:
+    minipass "^4.0.0"
+    minipass-sized "^1.0.3"
+    minizlib "^2.1.2"
+  optionalDependencies:
+    encoding "^0.1.13"
+
 minipass-flush@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  resolved "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz"
   integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
   dependencies:
     minipass "^3.0.0"
 
 minipass-json-stream@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz#7edbb92588fbfc2ff1db2fc10397acb7b6b44aa7"
+  resolved "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz"
   integrity sha512-ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==
   dependencies:
     jsonparse "^1.3.1"
@@ -8810,28 +8317,38 @@ minipass-json-stream@^1.0.1:
 
 minipass-pipeline@^1.2.2, minipass-pipeline@^1.2.4:
   version "1.2.4"
-  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz#68472f79711c084657c067c5c6ad93cddea8214c"
+  resolved "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"
   integrity sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==
   dependencies:
     minipass "^3.0.0"
 
 minipass-sized@^1.0.3:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/minipass-sized/-/minipass-sized-1.0.3.tgz#70ee5a7c5052070afacfbc22977ea79def353b70"
+  resolved "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz"
   integrity sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==
   dependencies:
     minipass "^3.0.0"
 
-minipass@^3.0.0, minipass@^3.1.0, minipass@^3.1.1, minipass@^3.1.3, minipass@^3.1.6:
-  version "3.1.6"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.6.tgz#3b8150aa688a711a1521af5e8779c1d3bb4f45ee"
-  integrity sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==
+minipass@^3.0.0, minipass@^3.1.1, minipass@^3.1.6:
+  version "3.3.6"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz"
+  integrity sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
+minipass@^4.0.0, minipass@^4.2.4:
+  version "4.2.8"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz"
+  integrity sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==
+
+minipass@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz"
+  integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+
+minizlib@^2.1.1, minizlib@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
+  resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"
   integrity sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==
   dependencies:
     minipass "^3.0.0"
@@ -8839,17 +8356,17 @@ minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
 
 mirador-dl-plugin@^0.13.0:
   version "0.13.0"
-  resolved "https://registry.yarnpkg.com/mirador-dl-plugin/-/mirador-dl-plugin-0.13.0.tgz#9a6cb0fa3c566a2a1ebe1ad9caa1ff590ff22689"
+  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.yarnpkg.com/mirador-share-plugin/-/mirador-share-plugin-0.11.0.tgz#13e2f654e38839044382acad42d9329e91a8cd5e"
+  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.yarnpkg.com/mirador/-/mirador-3.3.0.tgz#7a957a1db1a5388b2b8cafab00db4eb9f97557b9"
+  resolved "https://registry.npmjs.org/mirador/-/mirador-3.3.0.tgz"
   integrity sha512-BmGfRnWJ45B+vtiAwcFT7n9nKialfejE9UvuUK0NorO37ShArpsKr3yVSD4jQASwSR4DRRpPEG21jOk4WN7H3w==
   dependencies:
     "@material-ui/core" "^4.11.0"
@@ -8898,42 +8415,29 @@ mirador@^3.3.0:
 
 mitt@^1.1.3:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/mitt/-/mitt-1.2.0.tgz#cb24e6569c806e31bd4e3995787fe38a04fdf90d"
+  resolved "https://registry.npmjs.org/mitt/-/mitt-1.2.0.tgz"
   integrity sha512-r6lj77KlwqLhIUku9UWYes7KJtsczvolZkzp8hbaDPPaE24OmWl5s539Mytlj22siEQKosZ26qCBgda2PKwoJw==
 
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
-
 mj-context-menu@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.yarnpkg.com/mj-context-menu/-/mj-context-menu-0.6.1.tgz#a043c5282bf7e1cf3821de07b13525ca6f85aa69"
+  resolved "https://registry.npmjs.org/mj-context-menu/-/mj-context-menu-0.6.1.tgz"
   integrity sha512-7NO5s6n10TIV96d4g2uDpG7ZDpIhMh0QNfGdJw/W47JswFcosz457wqz/b5sAKvl12sxINGFCn80NZHKwxQEXA==
 
-mkdirp@^0.5.1, mkdirp@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+mkdirp@^0.5.5:
+  version "0.5.6"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    minimist "^1.2.5"
+    minimist "^1.2.6"
 
 mkdirp@^1.0.3, mkdirp@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
+  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.29.4:
-  version "2.29.4"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
-  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
-
 morgan@^1.10.0:
   version "1.10.0"
-  resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.10.0.tgz#091778abc1fc47cd3509824653dae1faab6b17d7"
+  resolved "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"
   integrity sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==
   dependencies:
     basic-auth "~2.0.1"
@@ -8942,396 +8446,325 @@ morgan@^1.10.0:
     on-finished "~2.3.0"
     on-headers "~1.0.2"
 
-move-concurrently@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
-  integrity sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=
-  dependencies:
-    aproba "^1.1.1"
-    copy-concurrently "^1.0.0"
-    fs-write-stream-atomic "^1.0.8"
-    mkdirp "^0.5.1"
-    rimraf "^2.5.4"
-    run-queue "^1.0.3"
-
 mrmime@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/mrmime/-/mrmime-1.0.0.tgz#14d387f0585a5233d291baba339b063752a2398b"
-  integrity sha512-a70zx7zFfVO7XpnQ2IX1Myh9yY4UYvfld/dikWRnsXxbyvMcfz+u6UfgNAtH+k2QqtJuzVpv6eLTx1G2+WKZbQ==
+  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.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.2:
+ms@2.1.2, ms@^2.0.0, ms@^2.1.1:
   version "2.1.2"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@2.1.3, ms@^2.0.0, ms@^2.1.1:
+ms@2.1.3:
   version "2.1.3"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  resolved "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-multicast-dns-service-types@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz#899f11d9686e5e05cb91b35d5f0e63b773cfc901"
-  integrity sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=
-
-multicast-dns@^6.0.1:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/multicast-dns/-/multicast-dns-6.2.3.tgz#a0ec7bd9055c4282f790c3c82f4e28db3b31b229"
-  integrity sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==
+multicast-dns@^7.2.5:
+  version "7.2.5"
+  resolved "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz"
+  integrity sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==
   dependencies:
-    dns-packet "^1.3.1"
+    dns-packet "^5.2.2"
     thunky "^1.0.2"
 
 mute-stream@0.0.8:
   version "0.0.8"
-  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nanoid@^3.1.30, nanoid@^3.3.1:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35"
-  integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==
+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.4:
-  version "3.3.4"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.4.tgz#730b67e3cd09e2deacf03c027c81c9d9dbc5e8ab"
-  integrity sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+natural-compare-lite@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz"
+  integrity sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==
 
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
-needle@^2.5.2:
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
-  integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
+needle@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/needle/-/needle-3.2.0.tgz"
+  integrity sha512-oUvzXnyLiVyVGoianLijF9O/RecZUf7TkBfimjGrLM4eQhXyeJwM6GeAWccwfQ9aa4gMCZKqhAOuLaMIcQxajQ==
   dependencies:
     debug "^3.2.6"
-    iconv-lite "^0.4.4"
+    iconv-lite "^0.6.3"
     sax "^1.2.4"
 
-negotiator@0.6.3, negotiator@^0.6.2, negotiator@^0.6.3:
+negotiator@0.6.3, negotiator@^0.6.3:
   version "0.6.3"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  resolved "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz"
   integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.6.2:
   version "2.6.2"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  resolved "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
-ng-mocks@^13.1.1:
-  version "13.1.1"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-13.1.1.tgz#e967dacc420c2ecec71826c5f24e0120186fad0b"
-  integrity sha512-LYi/1ccDwHKLwi4/hvUsmxBDeQ+n8BTdg5f1ujCDCO7OM9OVnqkQcRlBHHK+5iFtEn/aqa2QG3xU/qwIhnaL4w==
+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==
 
 ng2-file-upload@1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.4.0.tgz#8dea28d573234c52af474ad2a4001b335271e5c4"
+  resolved "https://registry.npmjs.org/ng2-file-upload/-/ng2-file-upload-1.4.0.tgz"
   integrity sha512-3J/KPU/tyh/ad6TFeUbrxX+SihUj0iOEt2Zsg4EX7mB3GFiQscXOfcUOxCkBtPWWWaqt3azrYbVGzsYa3/7NzQ==
   dependencies:
     tslib "^1.9.0"
 
-ng2-nouislider@^1.8.3:
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.8.3.tgz#c9c1ec77b6b5a909f87368ba799914208baa13a6"
-  integrity sha512-Vl8tHCcJ/ioJLAs2t6FBC35sZq1P/O5ZdqdFwYxOCOMVbILGWNg+2gWZIjFstvv9pqb/mVvVUYe6qGG/mA/RBQ==
-
-ngx-infinite-scroll@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-10.0.1.tgz#6f51f2f8775a7c50d1dd8bad125d4e748abbe880"
-  integrity sha512-7is0eJZ9kJPsaHohRmMhJ/QFHAW9jp9twO5HcHRvFM/Yl/R8QCiokgjwmH0/CR3MuxUanxfHZMfO3PbYTwlBEg==
-  dependencies:
-    "@scarf/scarf" "^1.1.0"
-    opencollective-postinstall "^2.0.2"
-
-ngx-mask@^13.1.7:
-  version "13.1.7"
-  resolved "https://registry.yarnpkg.com/ngx-mask/-/ngx-mask-13.1.7.tgz#9ef40354a83484aaf77aff74742cd0f43b4a65cd"
-  integrity sha512-zwGSEGt+WRlb31qMd92K25MCNUhfI2XKOMv+m5NypkZ+stONdBxAXjp8wA/1MJ46uYF5UYLmKPdkXloZBtOXQQ==
+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-moment@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-moment/-/ngx-moment-5.0.0.tgz#6500432a2fcda75fb236a632850e599db23c8177"
-  integrity sha512-LPpGPo4ccdh8RWnDbJdLTLGGGcwbRYMbn/j4PXM24754J7MZ0tgnBM+ncaVbwefUSSEMme8yMkNIxFiVxgOOvQ==
+ngx-infinite-scroll@^15.0.0:
+  version "15.0.0"
+  resolved "https://registry.yarnpkg.com/ngx-infinite-scroll/-/ngx-infinite-scroll-15.0.0.tgz#61bbf89f121a796880a4ad67fe785b406532b220"
+  integrity sha512-FSP5UphRdl47vW8f/dRnPAU+napzruAKizBX2HS7MH292Ca+va6IU0J5+UQQmO5rXod2RZV7UhJ6+7g4xLfs1A==
   dependencies:
-    tslib "^2.0.0"
+    tslib "^2.3.0"
 
-ngx-pagination@5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-5.0.0.tgz#a4b4c150a70aef17ccd825e4543e174a974bbd14"
-  integrity sha512-Ur0pTWRe2ZXoJ8impEzo0IZKxY5aEcQfSmL5uBqW1rHI2J6nfzgZAHsSLagKHFGchXq0PkRlDVVMcIaNxYJwvQ==
+ngx-mask@^13.1.7:
+  version "13.1.15"
+  resolved "https://registry.npmjs.org/ngx-mask/-/ngx-mask-13.1.15.tgz"
+  integrity sha512-fplyzkFa6lFTzPo/AHaI3TBQxTMdcqQClR9BLLAWTvCyDZkV28fLqWkpIpy0VvPc9ADogFpJJj7R1356mszjag==
+  dependencies:
+    tslib "^2.3.0"
+
+ngx-pagination@6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/ngx-pagination/-/ngx-pagination-6.0.3.tgz#083f77a5c9c3ebf5800fb57a280da71aacc10a18"
+  integrity sha512-lONjTQ7hFPh1SyhwDrRd5ZwM4NMGQ7bNR6vLrs6mrU0Z8Q1zCcWbf/pvyp4DOlGyd9uyZxRy2wUsSZLeIPjbAw==
+  dependencies:
+    tslib "^2.3.0"
 
 ngx-sortablejs@^11.1.0:
   version "11.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-sortablejs/-/ngx-sortablejs-11.1.0.tgz#14e50c48db908c1cb4b37722b28c2d3867c6140a"
+  resolved "https://registry.npmjs.org/ngx-sortablejs/-/ngx-sortablejs-11.1.0.tgz"
   integrity sha512-eM4dHwWSmXDcvF5gUmyMMQ0qqcqBXWCSZ9IRpqx4UkBKfo4N7pk/QuYh5io2fXVHWVFDaxW1yhn2FNpqxV6Jqw==
   dependencies:
     tslib "^2.0.0"
 
-ngx-ui-switch@^11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/ngx-ui-switch/-/ngx-ui-switch-11.0.1.tgz#c7f1e97ebe698f827a26f49951b50492b22c7839"
-  integrity sha512-N8QYT/wW+xJdyh/aeebTSLPA6Sgrwp69H6KAcW0XZueg/LF+FKiqyG6Po/gFHq2gDhLikwyJEMpny8sudTI08w==
+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"
 
 nice-napi@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b"
+  resolved "https://registry.npmjs.org/nice-napi/-/nice-napi-1.0.2.tgz"
   integrity sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==
   dependencies:
     node-addon-api "^3.0.0"
     node-gyp-build "^4.2.2"
 
-no-case@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
-  integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
-  dependencies:
-    lower-case "^2.0.2"
-    tslib "^2.0.3"
-
 node-addon-api@^3.0.0:
   version "3.2.1"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  resolved "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz"
   integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
 
 node-fetch@^2.6.0, node-fetch@^2.6.1:
-  version "2.6.7"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad"
-  integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==
+  version "2.6.9"
+  resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.9.tgz"
+  integrity sha512-DJm/CJkZkRjKKj4Zi4BsKVZh3ValV5IR5s7LVZnW+6YMh0W1BfNA8XSs6DLMGYlId5F3KnA70uu2qepcR08Qqg==
   dependencies:
     whatwg-url "^5.0.0"
 
-node-forge@^1.2.0:
+node-forge@^1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-1.3.1.tgz#be8da2af243b2417d5f646a770663a92b7e9ded3"
+  resolved "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz"
   integrity sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==
 
 node-gyp-build@^4.2.2:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.3.0.tgz#9f256b03e5826150be39c764bf51e993946d71a3"
-  integrity sha512-iWjXZvmboq0ja1pUGULQBexmxq8CV4xBhX7VDOTbL7ZR4FOowwY/VOtRxBN/yKxmdGoIp4j5ysNT4u3S2pDQ3Q==
+  version "4.6.0"
+  resolved "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.6.0.tgz"
+  integrity sha512-NTZVKn9IylLwUzaKjkas1e4u2DLNcV4rdYagA4PWdPwW87Bi7z+BznyKSRwS/761tV/lzCGXplWsiaMjLqP2zQ==
 
-node-gyp@^8.2.0:
-  version "8.4.1"
-  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
-  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
+node-gyp@^9.0.0:
+  version "9.3.1"
+  resolved "https://registry.npmjs.org/node-gyp/-/node-gyp-9.3.1.tgz"
+  integrity sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
     graceful-fs "^4.2.6"
-    make-fetch-happen "^9.1.0"
-    nopt "^5.0.0"
+    make-fetch-happen "^10.0.3"
+    nopt "^6.0.0"
     npmlog "^6.0.0"
     rimraf "^3.0.2"
     semver "^7.3.5"
     tar "^6.1.2"
     which "^2.0.2"
 
-node-releases@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.2.tgz#7139fe71e2f4f11b47d4d2986aaf8c48699e0c01"
-  integrity sha512-XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg==
+node-releases@^2.0.8:
+  version "2.0.10"
+  resolved "https://registry.npmjs.org/node-releases/-/node-releases-2.0.10.tgz"
+  integrity sha512-5GFldHPXVG/YZmFzJvKK2zDSzPKhEp0+ZR5SVaoSag9fsL5YgHbUHDfnG5494ISANDcK4KwPXAx2xqVEydmd7w==
 
-nodemon@^2.0.15:
-  version "2.0.15"
-  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.15.tgz#504516ce3b43d9dc9a955ccd9ec57550a31a8d4e"
-  integrity sha512-gdHMNx47Gw7b3kWxJV64NI+Q5nfl0y5DgDbiVtShiwa7Z0IZ07Ll4RLFo6AjrhzMtoEZn5PDE3/c2AbVsiCkpA==
+nodemon@^2.0.22:
+  version "2.0.22"
+  resolved "https://registry.yarnpkg.com/nodemon/-/nodemon-2.0.22.tgz#182c45c3a78da486f673d6c1702e00728daf5258"
+  integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==
   dependencies:
     chokidar "^3.5.2"
     debug "^3.2.7"
     ignore-by-default "^1.0.1"
-    minimatch "^3.0.4"
+    minimatch "^3.1.2"
     pstree.remy "^1.1.8"
     semver "^5.7.1"
+    simple-update-notifier "^1.0.7"
     supports-color "^5.5.0"
     touch "^3.1.0"
     undefsafe "^2.0.5"
-    update-notifier "^5.1.0"
 
-nopt@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88"
-  integrity sha512-Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==
+nopt@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz"
+  integrity sha512-ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==
   dependencies:
-    abbrev "1"
+    abbrev "^1.0.0"
 
 nopt@~1.0.10:
   version "1.0.10"
-  resolved "https://registry.yarnpkg.com/nopt/-/nopt-1.0.10.tgz#6ddd21bd2a31417b92727dd585f8a6f37608ebee"
-  integrity sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=
+  resolved "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"
+  integrity sha512-NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg==
   dependencies:
     abbrev "1"
 
+normalize-package-data@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz"
+  integrity sha512-h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==
+  dependencies:
+    hosted-git-info "^6.0.0"
+    is-core-module "^2.8.1"
+    semver "^7.3.5"
+    validate-npm-package-license "^3.0.4"
+
 normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-range@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
-  integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
+  resolved "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"
+  integrity sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==
 
-normalize-url@^4.1.0, normalize-url@^4.5.0:
+normalize-url@^4.5.0:
   version "4.5.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.1.tgz#0dd90cf1288ee1d1313b87081c9a5932ee48518a"
+  resolved "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.1.tgz"
   integrity sha512-9UZCFRHQdNrfTpGg8+1INIg93B6zE0aXMVFkw1WFwvO4SlZywU6aLg5Of0Ap/PgcbSw4LNxvMWXMeugwMCX0AA==
 
-normalize-url@^6.0.1:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
-  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
+nouislider@^15.7.1:
+  version "15.7.1"
+  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-15.7.1.tgz#77d55e47d9b4cd771728515713df43b489db9705"
+  integrity sha512-5N7C1ru/i8y3dg9+Z6ilj6+m1EfabvOoaRa7ztpxBSKKRZso4vA52DGSbBJjw5XLtFr/LZ9SgGAXqyVtlVHO5w==
 
-nouislider@^14.6.3:
-  version "14.7.0"
-  resolved "https://registry.yarnpkg.com/nouislider/-/nouislider-14.7.0.tgz#a71db0587c92567b6da1df57d251d3696d942362"
-  integrity sha512-4RtQ1+LHJKesDCNJrXkQcwXAWCrC2aggdLYMstS/G5fEWL+fXZbUA9pwVNHFghMGuFGRATlDLNInRaPeRKzpFQ==
-
-npm-bundled@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
-  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
+npm-bundled@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.0.tgz"
+  integrity sha512-Vq0eyEQy+elFpzsKjMss9kxqb9tG3YHg4dsyWuUENuzvSUWe1TCnW/vV9FkhvBk/brEDoDiVd+M1Btosa6ImdQ==
   dependencies:
-    npm-normalize-package-bin "^1.0.1"
+    npm-normalize-package-bin "^3.0.0"
 
-npm-install-checks@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/npm-install-checks/-/npm-install-checks-4.0.0.tgz#a37facc763a2fde0497ef2c6d0ac7c3fbe00d7b4"
-  integrity sha512-09OmyDkNLYwqKPOnbI8exiOZU2GVVmQp7tgez2BPi5OZC8M82elDAps7sxC4l//uSUtotWqoEIDwjRvWH4qz8w==
+npm-install-checks@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.1.0.tgz"
+  integrity sha512-udSGENih/5xKh3Ex+L0PtZcOt0Pa+6ppDLnpG5D49/EhMja3LupaY9E/DtJTxyFBwE09ot7Fc+H4DywnZNWTVA==
   dependencies:
     semver "^7.1.1"
 
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-package-arg@8.1.5, npm-package-arg@^8.0.1, npm-package-arg@^8.1.2, npm-package-arg@^8.1.5:
-  version "8.1.5"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
-  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
-  dependencies:
-    hosted-git-info "^4.0.1"
-    semver "^7.3.4"
-    validate-npm-package-name "^3.0.0"
-
-npm-packlist@^3.0.0:
+npm-normalize-package-bin@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-3.0.0.tgz#0370df5cfc2fcc8f79b8f42b37798dd9ee32c2a9"
-  integrity sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==
-  dependencies:
-    glob "^7.1.6"
-    ignore-walk "^4.0.1"
-    npm-bundled "^1.1.1"
-    npm-normalize-package-bin "^1.0.1"
+  resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.0.tgz"
+  integrity sha512-g+DPQSkusnk7HYXr75NtzkIP4+N81i3RPsGFidF3DzHd9MT9wWngmqoeg/fnHFz5MNdtG4w03s+QnhewSLTT2Q==
 
-npm-pick-manifest@6.1.1, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
-  integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
+npm-package-arg@10.1.0, npm-package-arg@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz"
+  integrity sha512-uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==
   dependencies:
-    npm-install-checks "^4.0.0"
-    npm-normalize-package-bin "^1.0.1"
-    npm-package-arg "^8.1.2"
-    semver "^7.3.4"
+    hosted-git-info "^6.0.0"
+    proc-log "^3.0.0"
+    semver "^7.3.5"
+    validate-npm-package-name "^5.0.0"
 
-npm-registry-fetch@^12.0.0:
-  version "12.0.2"
-  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-12.0.2.tgz#ae583bb3c902a60dae43675b5e33b5b1f6159f1e"
-  integrity sha512-Df5QT3RaJnXYuOwtXBXS9BWs+tHH2olvkCLh6jcR/b/u3DvPMlp3J0TvvYwplPKxHMOwfg287PYih9QqaVFoKA==
+npm-packlist@^7.0.0:
+  version "7.0.4"
+  resolved "https://registry.npmjs.org/npm-packlist/-/npm-packlist-7.0.4.tgz"
+  integrity sha512-d6RGEuRrNS5/N84iglPivjaJPxhDbZmlbTwTDX2IbcRHG5bZCdtysYMhwiPvcF4GisXHGn7xsxv+GQ7T/02M5Q==
   dependencies:
-    make-fetch-happen "^10.0.1"
-    minipass "^3.1.6"
-    minipass-fetch "^1.4.1"
+    ignore-walk "^6.0.0"
+
+npm-pick-manifest@8.0.1, npm-pick-manifest@^8.0.0:
+  version "8.0.1"
+  resolved "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-8.0.1.tgz"
+  integrity sha512-mRtvlBjTsJvfCCdmPtiu2bdlx8d/KXtF7yNXNWe7G0Z36qWA9Ny5zXsI2PfBZEv7SXgoxTmNaTzGSbbzDZChoA==
+  dependencies:
+    npm-install-checks "^6.0.0"
+    npm-normalize-package-bin "^3.0.0"
+    npm-package-arg "^10.0.0"
+    semver "^7.3.5"
+
+npm-registry-fetch@^14.0.0:
+  version "14.0.3"
+  resolved "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.3.tgz"
+  integrity sha512-YaeRbVNpnWvsGOjX2wk5s85XJ7l1qQBGAp724h8e2CZFFhMSuw9enom7K1mWVUtvXO1uUSFIAPofQK0pPN0ZcA==
+  dependencies:
+    make-fetch-happen "^11.0.0"
+    minipass "^4.0.0"
+    minipass-fetch "^3.0.0"
     minipass-json-stream "^1.0.1"
     minizlib "^2.1.2"
-    npm-package-arg "^8.1.5"
+    npm-package-arg "^10.0.0"
+    proc-log "^3.0.0"
 
 npm-run-path@^4.0.0, npm-run-path@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
+  resolved "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz"
   integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
   dependencies:
     path-key "^3.0.0"
 
 npmlog@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.1.tgz#06f1344a174c06e8de9c6c70834cfba2964bba17"
-  integrity sha512-BTHDvY6nrRHuRfyjt1MAufLxYdVXZfd099H4+i1f0lPywNQyI4foeNXJRObB/uy+TYqUW0vAD9gbdSOXPst7Eg==
+  version "6.0.2"
+  resolved "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz"
+  integrity sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==
   dependencies:
     are-we-there-yet "^3.0.0"
     console-control-strings "^1.1.0"
-    gauge "^4.0.0"
+    gauge "^4.0.3"
     set-blocking "^2.0.0"
 
 nth-check@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.1.tgz#2efe162f5c3da06a28959fbd3db75dbeea9f0fc2"
-  integrity sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz"
+  integrity sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==
   dependencies:
     boolbase "^1.0.0"
 
-nwsapi@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
-  integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
-
-nx@13.1.3:
-  version "13.1.3"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-13.1.3.tgz#0b2db9b5bc87a47fb3a90014d2b2abb44f568851"
-  integrity sha512-clM0NQhQKYkqcNz2E3uYRMLwhp2L/9dBhJhQi9XBX4IAyA2gWAomhRIlLm5Xxg3g4h1xwSpP3eJ5t89VikY8Pw==
-  dependencies:
-    "@nrwl/cli" "*"
-
-nx@13.9.4:
-  version "13.9.4"
-  resolved "https://registry.yarnpkg.com/nx/-/nx-13.9.4.tgz#d63305babbdcc66ebff70bbdfccc1ffca1378319"
-  integrity sha512-M/Vpf2j446lBsw/3g7AtlbjErswXftXNI+lT61vGBR6ydoSm7lQ/0HPWE9yeG5XK3pkJpRq5aW0EP01fda9BWw==
-  dependencies:
-    "@nrwl/cli" "13.9.4"
-    "@nrwl/tao" "13.9.4"
-    "@swc-node/register" "^1.4.2"
-    "@swc/core" "^1.2.146"
-    chalk "4.1.0"
-    enquirer "~2.3.6"
-    fast-glob "3.2.7"
-    fs-extra "^9.1.0"
-    ignore "^5.0.4"
-    jsonc-parser "3.0.0"
-    rxjs "^6.5.4"
-    rxjs-for-await "0.0.2"
-    semver "7.3.4"
-    tmp "~0.2.1"
-    tsconfig-paths "^3.9.0"
-    tslib "^2.3.0"
-    v8-compile-cache "2.3.0"
-    yargs-parser "20.0.0"
+nwsapi@^2.2.0, nwsapi@^2.2.2:
+  version "2.2.3"
+  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"
@@ -9341,150 +8774,140 @@ oauth-sign@~0.9.0:
 object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
+object-inspect@^1.12.3, 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==
 
-object-inspect@^1.11.0, object-inspect@^1.9.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0"
-  integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g==
-
-object-is@^1.0.1:
+object-is@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  resolved "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz"
   integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-object-keys@^1.0.12, object-keys@^1.1.1:
+object-keys@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
+  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
 object-path@^0.11.5:
   version "0.11.8"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.8.tgz#ed002c02bbdd0070b78a27455e8ae01fc14d4742"
+  resolved "https://registry.npmjs.org/object-path/-/object-path-0.11.8.tgz"
   integrity sha512-YJjNZrlXJFM42wTBn6zgOJVar9KFJvzx6sTWDte8sWZF//cnjl0BxHNpfZx+ZffXX63A9q0b1zsFiBX4g4X5KA==
 
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.1.0, object.assign@^4.1.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.2.tgz#0ed54a342eceb37b38ff76eb831a0e788cb63940"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.pick@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
-  dependencies:
-    isobject "^3.0.1"
-
-object.values@^1.1.5:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac"
-  integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg==
+object.assign@^4.1.4:
+  version "4.1.4"
+  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz"
+  integrity sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
-    es-abstract "^1.19.1"
+    define-properties "^1.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==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
+  resolved "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
 on-finished@2.4.1:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"
   integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
   dependencies:
     ee-first "1.1.1"
 
 on-finished@~2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+  resolved "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
   dependencies:
     ee-first "1.1.1"
 
 on-headers@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
+  resolved "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
 once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^5.1.0, onetime@^5.1.2:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
+  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
-open@8.4.0, open@^8.0.9:
+open@8.4.1:
+  version "8.4.1"
+  resolved "https://registry.npmjs.org/open/-/open-8.4.1.tgz"
+  integrity sha512-/4b7qZNhv6Uhd7jjnREh1NjnPxlTq+XNWPG88Ydkj5AILcA5m3ajvcg57pB24EQjKv0dK62XnDqk9c/hkIG5Kg==
+  dependencies:
+    define-lazy-prop "^2.0.0"
+    is-docker "^2.1.1"
+    is-wsl "^2.2.0"
+
+open@8.4.2:
+  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"
+
+open@^8.0.9:
   version "8.4.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.4.0.tgz#345321ae18f8138f82565a910fdc6b39e8c244f8"
+  resolved "https://registry.npmjs.org/open/-/open-8.4.0.tgz"
   integrity sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"
     is-wsl "^2.2.0"
 
-opencollective-postinstall@^2.0.2:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"
-  integrity sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==
-
 opener@^1.5.2:
   version "1.5.2"
-  resolved "https://registry.yarnpkg.com/opener/-/opener-1.5.2.tgz#5d37e1f35077b9dcac4301372271afdeb2a13598"
+  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.yarnpkg.com/openseadragon/-/openseadragon-2.4.2.tgz#f25d833d0ab9941599d65a3e2b44bec546c9f15c"
+  resolved "https://registry.npmjs.org/openseadragon/-/openseadragon-2.4.2.tgz"
   integrity sha512-398KbZwRtOYA6OmeWRY4Q0737NTacQ9Q6whmr9Lp1MNQO3p0eBz5LIASRne+4gwequcSM1vcHcjfy3dIndQziw==
 
 openurl@1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/openurl/-/openurl-1.1.1.tgz#3875b4b0ef7a52c156f0db41d4609dbb0f94b387"
-  integrity sha1-OHW0sO96UsFW8NtB1GCduw+Us4c=
+  resolved "https://registry.npmjs.org/openurl/-/openurl-1.1.1.tgz"
+  integrity sha512-d/gTkTb1i1GKz5k3XE3XFV/PxQ1k45zDqGP2OA7YhgsaLoqm6qRvARAZOFer1fcXritWlGBRCu/UgeS4HAnXAA==
 
 opn@5.3.0:
   version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
+  resolved "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz"
   integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
   dependencies:
     is-wsl "^1.1.0"
 
 optionator@^0.8.1:
   version "0.8.3"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
@@ -9496,7 +8919,7 @@ optionator@^0.8.1:
 
 optionator@^0.9.1:
   version "0.9.1"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
   integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
   dependencies:
     deep-is "^0.1.3"
@@ -9508,7 +8931,7 @@ optionator@^0.9.1:
 
 ora@5.4.1, ora@^5.1.0, ora@^5.4.1:
   version "5.4.1"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  resolved "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz"
   integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
   dependencies:
     bl "^4.1.0"
@@ -9521,146 +8944,122 @@ ora@5.4.1, ora@^5.1.0, ora@^5.4.1:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
-os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
+os-tmpdir@^1.0.2, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 ospath@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/ospath/-/ospath-1.2.2.tgz#1276639774a3f8ef2572f7fe4280e0ea4550c07b"
-  integrity sha1-EnZjl3Sj+O8lcvf+QoDg6kVQwHs=
+  resolved "https://registry.npmjs.org/ospath/-/ospath-1.2.2.tgz"
+  integrity sha512-o6E5qJV5zkAbIDNhGSIlyOhScKXgQrSRMilfph0clDfM0nEnBOlKlH4sWDmG95BW/CvwNz0vmm7dJVtU2KlMiA==
 
-p-cancelable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-1.1.0.tgz#d078d15a3af409220c886f1d9a0ca2e441ab26cc"
-  integrity sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==
+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@^1.1.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
-  integrity sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==
-  dependencies:
-    p-try "^1.0.0"
-
-p-limit@^2.2.0, p-limit@^2.3.0:
+p-limit@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz"
   integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
   dependencies:
     p-try "^2.0.0"
 
 p-limit@^3.0.2:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz"
   integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
   dependencies:
     yocto-queue "^0.1.0"
 
-p-locate@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
-  integrity sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=
-  dependencies:
-    p-limit "^1.1.0"
-
 p-locate@^4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz"
   integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
   dependencies:
     p-limit "^2.2.0"
 
-p-map@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
-  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
   dependencies:
-    aggregate-error "^3.0.0"
+    p-limit "^3.0.2"
 
 p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
+  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
 p-retry@^4.5.0:
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-4.6.1.tgz#8fcddd5cdf7a67a0911a9cf2ef0e5df7f602316c"
-  integrity sha512-e2xXGNhZOZ0lfgR9kL34iGlU8N/KO0xZnQxVEwdeOvpqNDQfdnxIYizvWtK8RglUa3bGqI8g0R/BdfzLMxRkiA==
+  version "4.6.2"
+  resolved "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz"
+  integrity sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==
   dependencies:
-    "@types/retry" "^0.12.0"
+    "@types/retry" "0.12.0"
     retry "^0.13.1"
 
-p-try@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
-  integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
+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.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  resolved "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz"
   integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
 
-package-json@^6.3.0:
-  version "6.5.0"
-  resolved "https://registry.yarnpkg.com/package-json/-/package-json-6.5.0.tgz#6feedaca35e75725876d0b0e64974697fed145b0"
-  integrity sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==
+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:
-    got "^9.6.0"
-    registry-auth-token "^4.0.0"
-    registry-url "^5.0.0"
-    semver "^6.2.0"
+    p-timeout "^3.0.0"
 
-pacote@12.0.3:
-  version "12.0.3"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.3.tgz#b6f25868deb810e7e0ddf001be88da2bcaca57c7"
-  integrity sha512-CdYEl03JDrRO3x18uHjBYA9TyoW8gy+ThVcypcDkxPtKlw76e4ejhYB6i9lJ+/cebbjpqPW/CijjqxwDTts8Ow==
+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" "^2.1.0"
-    "@npmcli/installed-package-contents" "^1.0.6"
-    "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^2.0.0"
-    cacache "^15.0.5"
-    chownr "^2.0.0"
-    fs-minipass "^2.1.0"
-    infer-owner "^1.0.4"
-    minipass "^3.1.3"
-    mkdirp "^1.0.3"
-    npm-package-arg "^8.0.1"
-    npm-packlist "^3.0.0"
-    npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^12.0.0"
+    "@npmcli/git" "^4.0.0"
+    "@npmcli/installed-package-contents" "^2.0.1"
+    "@npmcli/promise-spawn" "^6.0.1"
+    "@npmcli/run-script" "^6.0.0"
+    cacache "^17.0.0"
+    fs-minipass "^3.0.0"
+    minipass "^5.0.0"
+    npm-package-arg "^10.0.0"
+    npm-packlist "^7.0.0"
+    npm-pick-manifest "^8.0.0"
+    npm-registry-fetch "^14.0.0"
+    proc-log "^3.0.0"
     promise-retry "^2.0.1"
-    read-package-json-fast "^2.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.1.0"
+    read-package-json "^6.0.0"
+    read-package-json-fast "^3.0.0"
+    sigstore "^1.3.0"
+    ssri "^10.0.0"
+    tar "^6.1.11"
 
-pako@^1.0.3, pako@~1.0.2:
+pako@^1.0.3:
   version "1.0.11"
-  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
+  resolved "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
 
-param-case@^3.0.3:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
-  integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==
-  dependencies:
-    dot-case "^3.0.4"
-    tslib "^2.0.3"
-
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
 parse-json@^5.0.0:
   version "5.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-5.2.0.tgz#c76fc66dee54231c962b22bcc8a72cf2f99753cd"
+  resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz"
   integrity sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -9670,179 +9069,157 @@ parse-json@^5.0.0:
 
 parse-node-version@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
+  resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
 parse-srcset@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz#f2bd221f6cc970a938d88556abc589caaaa2bde1"
+  resolved "https://registry.npmjs.org/parse-srcset/-/parse-srcset-1.0.2.tgz"
   integrity sha512-/2qh0lav6CmI15FzA3i/2Bzk2zCgQhGMkvhOhKNcBVQ1ldgpbfiNTVslmooUmWJcADi1f1kIeynbDRVzNlfR6Q==
 
-parse5-html-rewriting-stream@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-6.0.1.tgz#de1820559317ab4e451ea72dba05fddfd914480b"
-  integrity sha512-vwLQzynJVEfUlURxgnf51yAJDQTtVpNyGD8tKi2Za7m+akukNHxCcUQMAa/mUGLhCeicFdpy7Tlvj8ZNKadprg==
+parse5-html-rewriting-stream@7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/parse5-html-rewriting-stream/-/parse5-html-rewriting-stream-7.0.0.tgz"
+  integrity sha512-mazCyGWkmCRWDI15Zp+UiCqMp/0dgEmkZRvhlsqqKYr4SsVm/TvnSpD9fCvqCA2zoWJcfRym846ejWBBHRiYEg==
   dependencies:
-    parse5 "^6.0.1"
-    parse5-sax-parser "^6.0.1"
+    entities "^4.3.0"
+    parse5 "^7.0.0"
+    parse5-sax-parser "^7.0.0"
 
 parse5-htmlparser2-tree-adapter@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  resolved "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz"
   integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
   dependencies:
     parse5 "^6.0.1"
 
-parse5-sax-parser@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5-sax-parser/-/parse5-sax-parser-6.0.1.tgz#98b4d366b5b266a7cd90b4b58906667af882daba"
-  integrity sha512-kXX+5S81lgESA0LsDuGjAlBybImAChYRMT+/uKCEXFBFOeEhS52qUCydGhU3qLRD8D9DVjaUo821WK7DM4iCeg==
+parse5-sax-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/parse5-sax-parser/-/parse5-sax-parser-7.0.0.tgz"
+  integrity sha512-5A+v2SNsq8T6/mG3ahcz8ZtQ0OUFTatxPbeidoMB7tkJSGDY3tdfl4MHovtLQHkEn5CGxijNWRQHhRQ6IRpXKg==
   dependencies:
-    parse5 "^6.0.1"
+    parse5 "^7.0.0"
 
 parse5@6.0.1, parse5@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
+  resolved "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
 
-parse5@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
-  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
-
-parseqs@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.6.tgz#8e4bb5a19d1cdc844a08ac974d34e273afa670d5"
-  integrity sha512-jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==
-
-parseuri@0.0.6:
-  version "0.0.6"
-  resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a"
-  integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow==
+parse5@^7.0.0, parse5@^7.1.1, parse5@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-7.1.2.tgz#0736bebbfd77793823240a23b7fc5e010b7f8e32"
+  integrity sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==
+  dependencies:
+    entities "^4.4.0"
 
 parseurl@~1.3.2, parseurl@~1.3.3:
   version "1.3.3"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  resolved "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-pascal-case@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
-  integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==
-  dependencies:
-    no-case "^3.0.4"
-    tslib "^2.0.3"
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-exists@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
-  integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
-
 path-exists@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  resolved "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz"
   integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  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 sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=
+  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.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
+path-scurry@^1.6.1:
+  version "1.6.4"
+  resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.6.4.tgz"
+  integrity sha512-Qp/9IHkdNiXJ3/Kon++At2nVpnhRiPq/aSvQN+H3U1WZbvNRK0RIQK/o4HMqPoXjpuGJUEWpHSs6Mnjxqh3TQg==
+  dependencies:
+    lru-cache "^9.0.0"
+    minipass "^5.0.0"
+
 path-to-regexp@0.1.7:
   version "0.1.7"
-  resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
+  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-pem@1.14.4:
-  version "1.14.4"
-  resolved "https://registry.yarnpkg.com/pem/-/pem-1.14.4.tgz#a68c70c6e751ccc5b3b5bcd7af78b0aec1177ff9"
-  integrity sha512-v8lH3NpirgiEmbOqhx0vwQTxwi0ExsiWBGYh0jYNq7K6mQuO4gI6UEFlr6fLAdv9TPXRt6GqiwE37puQdIDS8g==
+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==
   dependencies:
-    es6-promisify "^6.0.0"
-    md5 "^2.2.1"
-    os-tmpdir "^1.0.1"
+    es6-promisify "^7.0.0"
+    md5 "^2.3.0"
+    os-tmpdir "^1.0.2"
     which "^2.0.2"
 
 pend@~1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
-  integrity sha1-elfrVQpng/kRUzH89GY9XI4AelA=
+  resolved "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"
+  integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
 performance-now@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
-  integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
+  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.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  resolved "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz"
   integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
 
 picocolors@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  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.2.3:
+picomatch@2.3.1, picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  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:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+  integrity sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==
 
 pify@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  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 sha1-ITXW36ejWMBprJsXh3YogihFD/o=
+  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 sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+  integrity sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==
 
-pirates@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.5.tgz#feec352ea5c3268fb23a37c702ab1699f35a5f3b"
-  integrity sha512-8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ==
-
-piscina@3.2.0:
+piscina@3.2.0, piscina@~3.2.0:
   version "3.2.0"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.2.0.tgz#f5a1dde0c05567775690cccefe59d9223924d154"
+  resolved "https://registry.npmjs.org/piscina/-/piscina-3.2.0.tgz"
   integrity sha512-yn/jMdHRw+q2ZJhFhyqsmANcbF6V2QwmD84c6xRau+QpQOmtrBCoRGdvTfeuFDYXB5W2m6MfLkjkvQa9lUSmIA==
   dependencies:
     eventemitter-asyncresource "^1.0.0"
@@ -9851,226 +9228,147 @@ piscina@3.2.0:
   optionalDependencies:
     nice-napi "^1.0.2"
 
-piscina@~3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.1.0.tgz#2333636865b6cb69c5a370bbc499a98cabcf3e04"
-  integrity sha512-KTW4sjsCD34MHrUbx9eAAbuUSpVj407hQSgk/6Epkg0pbRBmv4a3UX7Sr8wxm9xYqQLnsN4mFOjqGDzHAdgKQg==
-  dependencies:
-    eventemitter-asyncresource "^1.0.0"
-    hdr-histogram-js "^2.0.1"
-    hdr-histogram-percentiles-obj "^3.0.0"
-  optionalDependencies:
-    nice-napi "^1.0.2"
-
 pkg-dir@^4.1.0, pkg-dir@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  resolved "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz"
   integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
   dependencies:
     find-up "^4.0.0"
 
 popper.js@1.16.1-lts:
   version "1.16.1-lts"
-  resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.16.1-lts.tgz#cf6847b807da3799d80ee3d6d2f90df8a3f50b05"
+  resolved "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1-lts.tgz"
   integrity sha512-Kjw8nKRl1m+VrSFCoVGPph93W/qrSO7ZkqPpTf7F4bk/sqcfWK019dWBUpE/fBOsOQY1dks/Bmcbfn1heM/IsA==
 
-portfinder@^1.0.28:
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz#67c4622852bd5374dd1dd900f779f53462fac778"
-  integrity sha512-Se+2isanIcEqf2XMHjyUKskczxbPH7dQnlMjXX6+dybayyHvAf/TCgyMRlzf/B6QDhAEFOGes0pzRo3by4AbMA==
+portscanner@2.2.0:
+  version "2.2.0"
+  resolved "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz"
+  integrity sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==
   dependencies:
-    async "^2.6.2"
-    debug "^3.1.1"
-    mkdirp "^0.5.5"
-
-portscanner@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/portscanner/-/portscanner-2.1.1.tgz#eabb409e4de24950f5a2a516d35ae769343fbb96"
-  integrity sha1-6rtAnk3iSVD1oqUW01rnaTQ/u5Y=
-  dependencies:
-    async "1.5.2"
+    async "^2.6.0"
     is-number-like "^1.0.3"
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
-
 postcss-apply@0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/postcss-apply/-/postcss-apply-0.12.0.tgz#11a47b271b14d81db97ed7f51a6c409d025a9c34"
+  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"
 
-postcss-attribute-case-insensitive@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.0.tgz#39cbf6babf3ded1e4abf37d09d6eda21c644105c"
-  integrity sha512-b4g9eagFGq9T5SWX4+USfVyjIb3liPnjhHHRMP7FMB2kFVpYyfEscV0wP3eaXhKlcHKUut8lt5BGoeylWA/dBQ==
+postcss-attribute-case-insensitive@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-5.0.2.tgz"
+  integrity sha512-XIidXV8fDr0kKt28vqki84fRK8VW8eTuIa4PChv2MqKuT6C9UjmSKzen6KaWhWEoYvwxFCa7n/tC1SZ3tyq4SQ==
   dependencies:
-    postcss-selector-parser "^6.0.2"
+    postcss-selector-parser "^6.0.10"
 
-postcss-calc@^8.2.3:
-  version "8.2.4"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-8.2.4.tgz#77b9c29bfcbe8a07ff6693dc87050828889739a5"
-  integrity sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==
-  dependencies:
-    postcss-selector-parser "^6.0.9"
-    postcss-value-parser "^4.2.0"
-
-postcss-cli@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-cli/-/postcss-cli-9.1.0.tgz#1a86404cbe848e370127b4bdf5cd2be83bc45ebe"
-  integrity sha512-zvDN2ADbWfza42sAnj+O2uUWyL0eRL1V+6giM2vi4SqTR3gTYy8XzcpfwccayF2szcUif0HMmXiEaDv9iEhcpw==
-  dependencies:
-    chokidar "^3.3.0"
-    dependency-graph "^0.11.0"
-    fs-extra "^10.0.0"
-    get-stdin "^9.0.0"
-    globby "^12.0.0"
-    picocolors "^1.0.0"
-    postcss-load-config "^3.0.0"
-    postcss-reporter "^7.0.0"
-    pretty-hrtime "^1.0.3"
-    read-cache "^1.0.0"
-    slash "^4.0.0"
-    yargs "^17.0.0"
-
-postcss-color-functional-notation@^4.2.1, postcss-color-functional-notation@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.2.tgz#f59ccaeb4ee78f1b32987d43df146109cc743073"
-  integrity sha512-DXVtwUhIk4f49KK5EGuEdgx4Gnyj6+t2jBSEmxvpIK9QI40tWrpS2Pua8Q7iIZWBrki2QOaeUdEaLPPa91K0RQ==
+postcss-clamp@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/postcss-clamp/-/postcss-clamp-4.1.0.tgz"
+  integrity sha512-ry4b1Llo/9zz+PKC+030KUnPITTJAHeOwjfAyyB60eT0AorGLdzp52s31OsPRHRf8NchkgFoG2y6fCfn1IV1Ow==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-hex-alpha@^8.0.2, postcss-color-hex-alpha@^8.0.3:
-  version "8.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.3.tgz#61a0fd151d28b128aa6a8a21a2dad24eebb34d52"
-  integrity sha512-fESawWJCrBV035DcbKRPAVmy21LpoyiXdPTuHUfWJ14ZRjY7Y7PA6P4g8z6LQGYhU1WAxkTxjIjurXzoe68Glw==
+postcss-color-functional-notation@^4.2.4:
+  version "4.2.4"
+  resolved "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-4.2.4.tgz"
+  integrity sha512-2yrTAUZUab9s6CpxkxC4rVgFEVaR6/2Pipvi6qcgvnYiVqZcbDHEoBDhrXzyb7Efh2CCfHQNtcqWcIruDTIUeg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-color-rebeccapurple@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.0.2.tgz#5d397039424a58a9ca628762eb0b88a61a66e079"
-  integrity sha512-SFc3MaocHaQ6k3oZaFwH8io6MdypkUtEy/eXzXEB1vEQlO3S3oDc/FSZA8AsS04Z25RirQhlDlHLh3dn7XewWw==
+postcss-color-hex-alpha@^8.0.4:
+  version "8.0.4"
+  resolved "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-8.0.4.tgz"
+  integrity sha512-nLo2DCRC9eE4w2JmuKgVA3fGL3d01kGq752pVALF68qpGLmx2Qrk91QTKkdUqqp45T1K1XV8IhQpcu1hoAQflQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-colormin@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.3.0.tgz#3cee9e5ca62b2c27e84fce63affc0cfb5901956a"
-  integrity sha512-WdDO4gOFG2Z8n4P8TWBpshnL3JpmNmJwdnfP2gbk2qBA8PWwOYcmjmI/t3CmMeL72a7Hkd+x/Mg9O2/0rD54Pg==
-  dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-    colord "^2.9.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-convert-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.1.0.tgz#f8d3abe40b4ce4b1470702a0706343eac17e7c10"
-  integrity sha512-GkyPbZEYJiWtQB0KZ0X6qusqFHUepguBCNFi9t5JJc7I2OTXG7C0twbTLvCfaKOLl3rSXmpAwV7W5txd91V84g==
+postcss-color-rebeccapurple@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-7.1.1.tgz"
+  integrity sha512-pGxkuVEInwLHgkNxUc4sdg4g3py7zUeCQ9sMfwyHAT+Ezk8a4OaaVZ8lIY5+oNqA/BXXgLyXv0+5wHP68R79hg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-custom-media@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-media/-/postcss-custom-media-8.0.0.tgz#1be6aff8be7dc9bf1fe014bde3b71b92bb4552f1"
-  integrity sha512-FvO2GzMUaTN0t1fBULDeIvxr5IvbDXcIatt6pnJghc736nqNgsGao5NT+5+WVLAQiTt6Cb3YUms0jiPaXhL//g==
-
-postcss-custom-properties@^12.1.2, postcss-custom-properties@^12.1.4:
-  version "12.1.4"
-  resolved "https://registry.yarnpkg.com/postcss-custom-properties/-/postcss-custom-properties-12.1.4.tgz#e3d8a8000f28094453b836dff5132385f2862285"
-  integrity sha512-i6AytuTCoDLJkWN/MtAIGriJz3j7UX6bV7Z5t+KgFz+dwZS15/mlTJY1S0kRizlk6ba0V8u8hN50Fz5Nm7tdZw==
+postcss-custom-media@^8.0.2:
+  version "8.0.2"
+  resolved "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-8.0.2.tgz"
+  integrity sha512-7yi25vDAoHAkbhAzX9dHx2yc6ntS4jQvejrNcC+csQJAXjj15e7VcWfMgLqBNAbOvqi5uIa9huOVwdHbf+sKqg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-custom-selectors@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-custom-selectors/-/postcss-custom-selectors-6.0.0.tgz#022839e41fbf71c47ae6e316cb0e6213012df5ef"
-  integrity sha512-/1iyBhz/W8jUepjGyu7V1OPcGbc636snN1yXEQCinb6Bwt7KxsiU7/bLQlp8GwAXzCh7cobBU5odNn/2zQWR8Q==
+postcss-custom-properties@^12.1.10:
+  version "12.1.11"
+  resolved "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-12.1.11.tgz"
+  integrity sha512-0IDJYhgU8xDv1KY6+VgUwuQkVtmYzRwu+dMjnmdMafXYv86SWqfxkc7qdDvWS38vsjaEtv8e0vGOUQrAiMBLpQ==
+  dependencies:
+    postcss-value-parser "^4.2.0"
+
+postcss-custom-selectors@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-6.0.3.tgz"
+  integrity sha512-fgVkmyiWDwmD3JbpCmB45SvvlCD6z9CG6Ie6Iere22W5aHea6oWa7EM2bpnv2Fj3I94L3VbtvX9KqwSi5aFzSg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
-postcss-dir-pseudo-class@^6.0.3, postcss-dir-pseudo-class@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.4.tgz#9afe49ea631f0cb36fa0076e7c2feb4e7e3f049c"
-  integrity sha512-I8epwGy5ftdzNWEYok9VjW9whC4xnelAtbajGv4adql4FIF09rnrxnA9Y8xSHN47y7gqFIv10C5+ImsLeJpKBw==
+postcss-dir-pseudo-class@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-6.0.5.tgz"
+  integrity sha512-eqn4m70P031PF7ZQIvSgy9RSJ5uI2171O/OO/zcRNYpJbvaeKFUlar1aJ7rmgiQtbm0FSPsRewjpdS0Oew7MPA==
   dependencies:
-    postcss-selector-parser "^6.0.9"
+    postcss-selector-parser "^6.0.10"
 
-postcss-discard-comments@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.1.0.tgz#87be4e0953bf599935837b940c701f8d4eca7d0b"
-  integrity sha512-L0IKF4jAshRyn03SkEO6ar/Ipz2oLywVbg2THf2EqqdNkBwmVMxuTR/RoAltOw4piiaLt3gCAdrbAqmTBInmhg==
-
-postcss-discard-duplicates@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz#9eb4fe8456706a4eebd6d3b7b777d07bad03e848"
-  integrity sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==
-
-postcss-discard-empty@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.1.0.tgz#7f51b16cd1b89f8180bbc7cee34d6cbabf2ef810"
-  integrity sha512-782T/buGgb3HOuHOJAHpdyKzAAKsv/BxWqsutnZ+QsiHEcDkY7v+6WWdturuBiSal6XMOO1p1aJvwXdqLD5vhA==
-
-postcss-discard-overridden@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz#7e8c5b53325747e9d90131bb88635282fb4a276e"
-  integrity sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==
-
-postcss-double-position-gradients@^3.0.4, postcss-double-position-gradients@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.1.tgz#a12cfdb7d11fa1a99ccecc747f0c19718fb37152"
-  integrity sha512-jM+CGkTs4FcG53sMPjrrGE0rIvLDdCrqMzgDC5fLI7JHDO7o6QG8C5TQBtExb13hdBdoH9C2QVbG4jo2y9lErQ==
+postcss-double-position-gradients@^3.1.2:
+  version "3.1.2"
+  resolved "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-3.1.2.tgz"
+  integrity sha512-GX+FuE/uBR6eskOK+4vkXgT6pDkexLokPaz/AbJna9s5Kzp/yl488pKPjhy0obB475ovfT1Wv8ho7U/cHNaRgQ==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-env-function@^4.0.4, postcss-env-function@^4.0.5:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-env-function/-/postcss-env-function-4.0.5.tgz#b9614d50abd91e4c88a114644a9766880dabe393"
-  integrity sha512-gPUJc71ji9XKyl0WSzAalBeEA/89kU+XpffpPxSaaaZ1c48OL36r1Ep5R6+9XAPkIiDlSvVAwP4io12q/vTcvA==
+postcss-env-function@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-4.0.6.tgz"
+  integrity sha512-kpA6FsLra+NqcFnL81TnsU+Z7orGtDTxcOhl6pwXeEq1yFPpRMkCDpHhrz8CFQDr/Wfm0jLiNQ1OsGGPjlqPwA==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-focus-visible@^6.0.3, postcss-focus-visible@^6.0.4:
+postcss-focus-visible@^6.0.4:
   version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz#50c9ea9afa0ee657fb75635fabad25e18d76bf9e"
+  resolved "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-6.0.4.tgz"
   integrity sha512-QcKuUU/dgNsstIK6HELFRT5Y3lbrMLEOwG+A4s5cA+fx3A3y/JTq3X9LaOj3OC3ALH0XqyrgQIgey/MIZ8Wczw==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
-postcss-focus-within@^5.0.3, postcss-focus-within@^5.0.4:
+postcss-focus-within@^5.0.4:
   version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz#5b1d2ec603195f3344b716c0b75f61e44e8d2e20"
+  resolved "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-5.0.4.tgz"
   integrity sha512-vvjDN++C0mu8jz4af5d52CB184ogg/sSxAFS+oUJQq2SuCe7T5U2iIsVJtsCp2d6R4j0jr5+q3rPkBVZkXD9fQ==
   dependencies:
     postcss-selector-parser "^6.0.9"
 
 postcss-font-variant@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz#efd59b4b7ea8bb06127f2d031bfbb7f24d32fa66"
+  resolved "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-5.0.0.tgz"
   integrity sha512-1fmkBaCALD72CK2a9i468mA/+tr9/1cBxRRMXOUaZqO43oWPR5imcyPjXwuv7PXbCid4ndlP5zWhidQVVa3hmA==
 
-postcss-gap-properties@^3.0.2, postcss-gap-properties@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-gap-properties/-/postcss-gap-properties-3.0.3.tgz#6401bb2f67d9cf255d677042928a70a915e6ba60"
-  integrity sha512-rPPZRLPmEKgLk/KlXMqRaNkYTUpE7YC+bOIQFN5xcu1Vp11Y4faIXv6/Jpft6FMnl6YRxZqDZG0qQOW80stzxQ==
+postcss-gap-properties@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-3.0.5.tgz"
+  integrity sha512-IuE6gKSdoUNcvkGIqdtjtcMtZIFyXZhmFd5RUlg97iVEvp1BZKV5ngsAjCjrVy+14uhGBQl9tzmi1Qwq4kqVOg==
 
-postcss-image-set-function@^4.0.4, postcss-image-set-function@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/postcss-image-set-function/-/postcss-image-set-function-4.0.6.tgz#bcff2794efae778c09441498f40e0c77374870a9"
-  integrity sha512-KfdC6vg53GC+vPd2+HYzsZ6obmPqOk6HY09kttU19+Gj1nC3S3XBVEXDHxkhxTohgZqzbUb94bKXvKDnYWBm/A==
+postcss-image-set-function@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-4.0.7.tgz"
+  integrity sha512-9T2r9rsvYzm5ndsBE8WgtrMlIT7VbtTfE7b3BQnudUqnBcBo7L758oc+o+pdj/dUV0l5wjwSdjeOH2DZtfv8qw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-import@14.0.2, postcss-import@^14.0.0:
-  version "14.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1"
-  integrity sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==
+postcss-import@^14.0.0:
+  version "14.1.0"
+  resolved "https://registry.npmjs.org/postcss-import/-/postcss-import-14.1.0.tgz"
+  integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw==
   dependencies:
     postcss-value-parser "^4.0.0"
     read-cache "^1.0.0"
@@ -10078,37 +9376,29 @@ postcss-import@14.0.2, postcss-import@^14.0.0:
 
 postcss-initial@^4.0.1:
   version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-4.0.1.tgz#529f735f72c5724a0fb30527df6fb7ac54d7de42"
+  resolved "https://registry.npmjs.org/postcss-initial/-/postcss-initial-4.0.1.tgz"
   integrity sha512-0ueD7rPqX8Pn1xJIjay0AZeIuDoF+V+VvMt/uOnn+4ezUKhZM/NokDeP6DwMNyIoYByuN/94IQnt5FEkaN59xQ==
 
-postcss-lab-function@^4.0.3, postcss-lab-function@^4.1.1:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-lab-function/-/postcss-lab-function-4.1.2.tgz#b75afe43ba9c1f16bfe9bb12c8109cabd55b5fc2"
-  integrity sha512-isudf5ldhg4fk16M8viAwAbg6Gv14lVO35N3Z/49NhbwPQ2xbiEoHgrRgpgQojosF4vF7jY653ktB6dDrUOR8Q==
+postcss-lab-function@^4.2.1:
+  version "4.2.1"
+  resolved "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-4.2.1.tgz"
+  integrity sha512-xuXll4isR03CrQsmxyz92LJB2xX9n+pZJ5jE9JgcnmsCammLyKdlzrBin+25dy6wIjfhJpKBAN80gsTlCgRk2w==
   dependencies:
     "@csstools/postcss-progressive-custom-properties" "^1.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-load-config@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-3.1.3.tgz#21935b2c43b9a86e6581a576ca7ee1bde2bd1d23"
-  integrity sha512-5EYgaM9auHGtO//ljHH+v/aC/TQ5LHXtL7bQajNAUBKUVKiYE8rYpFms7+V26D9FncaGe2zwCoPQsFKb5zF/Hw==
-  dependencies:
-    lilconfig "^2.0.4"
-    yaml "^1.10.2"
-
-postcss-loader@6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.2.1.tgz#0895f7346b1702103d30fdc66e4d494a93c008ef"
-  integrity sha512-WbbYpmAaKcux/P66bZ40bpWsBucjx/TTgVVzRZ9yUO8yQfVBlameJ0ZGVaPfH64hNSBh63a+ICP5nqOpBA0w+Q==
+postcss-loader@7.0.2:
+  version "7.0.2"
+  resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-7.0.2.tgz"
+  integrity sha512-fUJzV/QH7NXUAqV8dWJ9Lg4aTkDCezpTS5HgJ2DvqznexTbSTxgi/dTECvTZ15BwKTtk8G/bqI/QTu2HPd3ZCg==
   dependencies:
     cosmiconfig "^7.0.0"
     klona "^2.0.5"
-    semver "^7.3.5"
+    semver "^7.3.8"
 
 postcss-loader@^4.0.3:
   version "4.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-4.3.0.tgz#2c4de9657cd4f07af5ab42bd60a673004da1b8cc"
+  resolved "https://registry.npmjs.org/postcss-loader/-/postcss-loader-4.3.0.tgz"
   integrity sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==
   dependencies:
     cosmiconfig "^7.0.0"
@@ -10117,74 +9407,24 @@ postcss-loader@^4.0.3:
     schema-utils "^3.0.0"
     semver "^7.3.4"
 
-postcss-logical@^5.0.3, postcss-logical@^5.0.4:
+postcss-logical@^5.0.4:
   version "5.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-logical/-/postcss-logical-5.0.4.tgz#ec75b1ee54421acc04d5921576b7d8db6b0e6f73"
+  resolved "https://registry.npmjs.org/postcss-logical/-/postcss-logical-5.0.4.tgz"
   integrity sha512-RHXxplCeLh9VjinvMrZONq7im4wjWGlRJAqmAVLXyZaXwfDWP73/oq4NdIp+OZwhQUMj0zjqDfM5Fj7qby+B4g==
 
 postcss-media-minmax@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz#7140bddec173e2d6d657edbd8554a55794e2a5b5"
+  resolved "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-5.0.0.tgz"
   integrity sha512-yDUvFf9QdFZTuCUg0g0uNSHVlJ5X1lSzDZjPSFaiCWvjgsvu8vEVxtahPrLMinIDEEGnx6cBe6iqdx5YWz08wQ==
 
-postcss-merge-longhand@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.1.0.tgz#f716bffbf0bdfbde6ea78c36088e21559f8a0a95"
-  integrity sha512-Gr46srN2tsLD8fudKYoHO56RG0BLQ2nsBRnSZGY04eNBPwTeWa9KeHrbL3tOLAHyB2aliikycPH2TMJG1U+W6g==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    stylehacks "^5.1.0"
-
-postcss-merge-rules@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.1.0.tgz#a2d5117eba09c8686a5471d97bd9afcf30d1b41f"
-  integrity sha512-NecukEJovQ0mG7h7xV8wbYAkXGTO3MPKnXvuiXzOKcxoOodfTTKYjeo8TMhAswlSkjcPIBlnKbSFcTuVSDaPyQ==
-  dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-    cssnano-utils "^3.1.0"
-    postcss-selector-parser "^6.0.5"
-
-postcss-minify-font-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz#f1df0014a726083d260d3bd85d7385fb89d1f01b"
-  integrity sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-gradients@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.1.0.tgz#de0260a67a13b7b321a8adc3150725f2c6612377"
-  integrity sha512-J/TMLklkONn3LuL8wCwfwU8zKC1hpS6VcxFkNUNjmVt53uKqrrykR3ov11mdUYyqVMEx67slMce0tE14cE4DTg==
-  dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^3.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-params@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.1.0.tgz#e0b1f4e05cfd396682f612856485907e4064f25e"
-  integrity sha512-q67dcts4Hct6x8+JmhBgctHkbvUsqGIg2IItenjE63iZXMbhjr7AlVZkNnKtIGt/1Wsv7p/7YzeSII6Q+KPXRg==
-  dependencies:
-    browserslist "^4.16.6"
-    cssnano-utils "^3.1.0"
-    postcss-value-parser "^4.2.0"
-
-postcss-minify-selectors@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.2.0.tgz#17c2be233e12b28ffa8a421a02fc8b839825536c"
-  integrity sha512-vYxvHkW+iULstA+ctVNx0VoRAR4THQQRkG77o0oa4/mBS0OzGvvzLIvHDv/nNEM0crzN2WIyFU5X7wZhaUK3RA==
-  dependencies:
-    postcss-selector-parser "^6.0.5"
-
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz#cda1f047c0ae80c97dbe28c3e76a43b88025741d"
+  resolved "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz"
   integrity sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==
 
 postcss-modules-local-by-default@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz#ebbb54fae1598eecfdf691a02b3ff3b390a5a51c"
+  resolved "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.0.tgz"
   integrity sha512-sT7ihtmGSF9yhm6ggikHdV0hlziDTX7oFoXtuVWeDd3hHObNkcHRo9V3yg7vCAY7cONyxJC/XXCmmiHHcvX7bQ==
   dependencies:
     icss-utils "^5.0.0"
@@ -10193,294 +9433,156 @@ postcss-modules-local-by-default@^4.0.0:
 
 postcss-modules-scope@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz#9ef3151456d3bbfa120ca44898dfca6f2fa01f06"
+  resolved "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.0.0.tgz"
   integrity sha512-hncihwFA2yPath8oZ15PZqvWGkWf+XUfQgUGamS4LqoP1anQLOsOJw0vr7J7IwLpoY9fatA2qiGUGmuZL0Iqlg==
   dependencies:
     postcss-selector-parser "^6.0.4"
 
 postcss-modules-values@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz#d7c5e7e68c3bb3c9b27cbf48ca0bb3ffb4602c9c"
+  resolved "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz"
   integrity sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==
   dependencies:
     icss-utils "^5.0.0"
 
-postcss-nesting@^10.1.2:
-  version "10.1.3"
-  resolved "https://registry.yarnpkg.com/postcss-nesting/-/postcss-nesting-10.1.3.tgz#f0b1cd7ae675c697ab6a5a5ca1feea4784a2ef77"
-  integrity sha512-wUC+/YCik4wH3StsbC5fBG1s2Z3ZV74vjGqBFYtmYKlVxoio5TYGM06AiaKkQPPlkXWn72HKfS7Cw5PYxnoXSw==
+postcss-nesting@^10.2.0:
+  version "10.2.0"
+  resolved "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-10.2.0.tgz"
+  integrity sha512-EwMkYchxiDiKUhlJGzWsD9b2zvq/r2SSubcRrgP+jujMXFzqvANLt16lJANC+5uZ6hjI7lpRmI6O8JIl+8l1KA==
   dependencies:
-    postcss-selector-parser "^6.0.9"
-
-postcss-normalize-charset@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz#9302de0b29094b52c259e9b2cf8dc0879879f0ed"
-  integrity sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==
-
-postcss-normalize-display-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz#72abbae58081960e9edd7200fcf21ab8325c3da8"
-  integrity sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-positions@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.1.0.tgz#902a7cb97cf0b9e8b1b654d4a43d451e48966458"
-  integrity sha512-8gmItgA4H5xiUxgN/3TVvXRoJxkAWLW6f/KKhdsH03atg0cB8ilXnrB5PpSshwVu/dD2ZsRFQcR1OEmSBDAgcQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-repeat-style@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.0.tgz#f6d6fd5a54f51a741cc84a37f7459e60ef7a6398"
-  integrity sha512-IR3uBjc+7mcWGL6CtniKNQ4Rr5fTxwkaDHwMBDGGs1x9IVRkYIT/M4NelZWkAOBdV6v3Z9S46zqaKGlyzHSchw==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-string@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz#411961169e07308c82c1f8c55f3e8a337757e228"
-  integrity sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-timing-functions@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz#d5614410f8f0b2388e9f240aa6011ba6f52dafbb"
-  integrity sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-unicode@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.0.tgz#3d23aede35e160089a285e27bf715de11dc9db75"
-  integrity sha512-J6M3MizAAZ2dOdSjy2caayJLQT8E8K9XjLce8AUQMwOrCvjCHv24aLC/Lps1R1ylOfol5VIDMaM/Lo9NGlk1SQ==
-  dependencies:
-    browserslist "^4.16.6"
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-url@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz#ed9d88ca82e21abef99f743457d3729a042adcdc"
-  integrity sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==
-  dependencies:
-    normalize-url "^6.0.1"
-    postcss-value-parser "^4.2.0"
-
-postcss-normalize-whitespace@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.0.tgz#aed8b4580c9ad6e8eac034177291187ea16a059c"
-  integrity sha512-7O1FanKaJkpWFyCghFzIkLhehujV/frGkdofGLwhg5upbLyGsSfiTcZAdSzoPsSUgyPCkBkNMeWR8yVgPdQybg==
-  dependencies:
-    postcss-value-parser "^4.2.0"
+    "@csstools/selector-specificity" "^2.0.0"
+    postcss-selector-parser "^6.0.10"
 
 postcss-opacity-percentage@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.2.tgz#bd698bb3670a0a27f6d657cc16744b3ebf3b1145"
-  integrity sha512-lyUfF7miG+yewZ8EAk9XUBIlrHyUE6fijnesuz+Mj5zrIHIEw6KcIZSOk/elVMqzLvREmXB83Zi/5QpNRYd47w==
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/postcss-opacity-percentage/-/postcss-opacity-percentage-1.1.3.tgz"
+  integrity sha512-An6Ba4pHBiDtyVpSLymUUERMo2cU7s+Obz6BTrS+gxkbnSBNKSuD0AVUc+CpBMrpVPKKfoVz0WQCX+Tnst0i4A==
 
-postcss-ordered-values@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.1.0.tgz#04ef429e0991b0292bc918b135cd4c038f7b889f"
-  integrity sha512-wU4Z4D4uOIH+BUKkYid36gGDJNQtkVJT7Twv8qH6UyfttbbJWyw4/xIPuVEkkCtQLAJ0EdsNSh8dlvqkXb49TA==
+postcss-overflow-shorthand@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.4.tgz"
+  integrity sha512-otYl/ylHK8Y9bcBnPLo3foYFLL6a6Ak+3EQBPOTR7luMYCOsiVTUk1iLvNf6tVPNGXcoL9Hoz37kpfriRIFb4A==
   dependencies:
-    cssnano-utils "^3.1.0"
     postcss-value-parser "^4.2.0"
 
-postcss-overflow-shorthand@^3.0.2, postcss-overflow-shorthand@^3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-overflow-shorthand/-/postcss-overflow-shorthand-3.0.3.tgz#ebcfc0483a15bbf1b27fdd9b3c10125372f4cbc2"
-  integrity sha512-CxZwoWup9KXzQeeIxtgOciQ00tDtnylYIlJBBODqkgS/PU2jISuWOL/mYLHmZb9ZhZiCaNKsCRiLp22dZUtNsg==
-
 postcss-page-break@^3.0.4:
   version "3.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-page-break/-/postcss-page-break-3.0.4.tgz#7fbf741c233621622b68d435babfb70dd8c1ee5f"
+  resolved "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-3.0.4.tgz"
   integrity sha512-1JGu8oCjVXLa9q9rFTo4MbeeA5FMe00/9C7lN4va606Rdb+HkxXtXsmEDrIraQ11fGz/WvKWa8gMuCKkrXpTsQ==
 
-postcss-place@^7.0.3, postcss-place@^7.0.4:
-  version "7.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-place/-/postcss-place-7.0.4.tgz#eb026650b7f769ae57ca4f938c1addd6be2f62c9"
-  integrity sha512-MrgKeiiu5OC/TETQO45kV3npRjOFxEHthsqGtkh3I1rPbZSbXGD/lZVi9j13cYh+NA8PIAPyk6sGjT9QbRyvSg==
+postcss-place@^7.0.5:
+  version "7.0.5"
+  resolved "https://registry.npmjs.org/postcss-place/-/postcss-place-7.0.5.tgz"
+  integrity sha512-wR8igaZROA6Z4pv0d+bvVrvGY4GVHihBCBQieXFY3kuSuMyOmEnnfFzHl/tQuqHZkfkIVBEbDvYcFfHmpSet9g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-preset-env@7.2.3:
-  version "7.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.2.3.tgz#01b9b6eea0ff16c27a3d514f10105d56363428a6"
-  integrity sha512-Ok0DhLfwrcNGrBn8sNdy1uZqWRk/9FId0GiQ39W4ILop5GHtjJs8bu1MY9isPwHInpVEPWjb4CEcEaSbBLpfwA==
-  dependencies:
-    autoprefixer "^10.4.2"
-    browserslist "^4.19.1"
-    caniuse-lite "^1.0.30001299"
-    css-blank-pseudo "^3.0.2"
-    css-has-pseudo "^3.0.3"
-    css-prefers-color-scheme "^6.0.2"
-    cssdb "^5.0.0"
-    postcss-attribute-case-insensitive "^5.0.0"
-    postcss-color-functional-notation "^4.2.1"
-    postcss-color-hex-alpha "^8.0.2"
-    postcss-color-rebeccapurple "^7.0.2"
-    postcss-custom-media "^8.0.0"
-    postcss-custom-properties "^12.1.2"
-    postcss-custom-selectors "^6.0.0"
-    postcss-dir-pseudo-class "^6.0.3"
-    postcss-double-position-gradients "^3.0.4"
-    postcss-env-function "^4.0.4"
-    postcss-focus-visible "^6.0.3"
-    postcss-focus-within "^5.0.3"
-    postcss-font-variant "^5.0.0"
-    postcss-gap-properties "^3.0.2"
-    postcss-image-set-function "^4.0.4"
-    postcss-initial "^4.0.1"
-    postcss-lab-function "^4.0.3"
-    postcss-logical "^5.0.3"
-    postcss-media-minmax "^5.0.0"
-    postcss-nesting "^10.1.2"
-    postcss-overflow-shorthand "^3.0.2"
-    postcss-page-break "^3.0.4"
-    postcss-place "^7.0.3"
-    postcss-pseudo-class-any-link "^7.0.2"
-    postcss-replace-overflow-wrap "^4.0.0"
-    postcss-selector-not "^5.0.0"
-
 postcss-preset-env@^7.4.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-7.4.2.tgz#2ff3e4787bd9d89710659535855d6ce85ce6110b"
-  integrity sha512-AmOkb8AeNNQwE/z2fHl1iwOIt8J50V8WR0rmLagcgIDoqlJZWjV3NdtOPnLGco1oN8DZe+Ss5B9ULbBeS6HfeA==
+  version "7.8.3"
+  resolved "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-7.8.3.tgz"
+  integrity sha512-T1LgRm5uEVFSEF83vHZJV2z19lHg4yJuZ6gXZZkqVsqv63nlr6zabMH3l4Pc01FQCyfWVrh2GaUeCVy9Po+Aag==
   dependencies:
-    "@csstools/postcss-color-function" "^1.0.2"
-    "@csstools/postcss-font-format-keywords" "^1.0.0"
-    "@csstools/postcss-hwb-function" "^1.0.0"
-    "@csstools/postcss-ic-unit" "^1.0.0"
-    "@csstools/postcss-is-pseudo-class" "^2.0.0"
-    "@csstools/postcss-normalize-display-values" "^1.0.0"
-    "@csstools/postcss-oklab-function" "^1.0.1"
-    "@csstools/postcss-progressive-custom-properties" "^1.2.0"
-    autoprefixer "^10.4.2"
-    browserslist "^4.19.3"
+    "@csstools/postcss-cascade-layers" "^1.1.1"
+    "@csstools/postcss-color-function" "^1.1.1"
+    "@csstools/postcss-font-format-keywords" "^1.0.1"
+    "@csstools/postcss-hwb-function" "^1.0.2"
+    "@csstools/postcss-ic-unit" "^1.0.1"
+    "@csstools/postcss-is-pseudo-class" "^2.0.7"
+    "@csstools/postcss-nested-calc" "^1.0.0"
+    "@csstools/postcss-normalize-display-values" "^1.0.1"
+    "@csstools/postcss-oklab-function" "^1.1.1"
+    "@csstools/postcss-progressive-custom-properties" "^1.3.0"
+    "@csstools/postcss-stepped-value-functions" "^1.0.1"
+    "@csstools/postcss-text-decoration-shorthand" "^1.0.0"
+    "@csstools/postcss-trigonometric-functions" "^1.0.2"
+    "@csstools/postcss-unset-value" "^1.0.2"
+    autoprefixer "^10.4.13"
+    browserslist "^4.21.4"
     css-blank-pseudo "^3.0.3"
     css-has-pseudo "^3.0.4"
     css-prefers-color-scheme "^6.0.3"
-    cssdb "^6.4.0"
-    postcss-attribute-case-insensitive "^5.0.0"
-    postcss-color-functional-notation "^4.2.2"
-    postcss-color-hex-alpha "^8.0.3"
-    postcss-color-rebeccapurple "^7.0.2"
-    postcss-custom-media "^8.0.0"
-    postcss-custom-properties "^12.1.4"
-    postcss-custom-selectors "^6.0.0"
-    postcss-dir-pseudo-class "^6.0.4"
-    postcss-double-position-gradients "^3.1.0"
-    postcss-env-function "^4.0.5"
+    cssdb "^7.1.0"
+    postcss-attribute-case-insensitive "^5.0.2"
+    postcss-clamp "^4.1.0"
+    postcss-color-functional-notation "^4.2.4"
+    postcss-color-hex-alpha "^8.0.4"
+    postcss-color-rebeccapurple "^7.1.1"
+    postcss-custom-media "^8.0.2"
+    postcss-custom-properties "^12.1.10"
+    postcss-custom-selectors "^6.0.3"
+    postcss-dir-pseudo-class "^6.0.5"
+    postcss-double-position-gradients "^3.1.2"
+    postcss-env-function "^4.0.6"
     postcss-focus-visible "^6.0.4"
     postcss-focus-within "^5.0.4"
     postcss-font-variant "^5.0.0"
-    postcss-gap-properties "^3.0.3"
-    postcss-image-set-function "^4.0.6"
+    postcss-gap-properties "^3.0.5"
+    postcss-image-set-function "^4.0.7"
     postcss-initial "^4.0.1"
-    postcss-lab-function "^4.1.1"
+    postcss-lab-function "^4.2.1"
     postcss-logical "^5.0.4"
     postcss-media-minmax "^5.0.0"
-    postcss-nesting "^10.1.2"
+    postcss-nesting "^10.2.0"
     postcss-opacity-percentage "^1.1.2"
-    postcss-overflow-shorthand "^3.0.3"
+    postcss-overflow-shorthand "^3.0.4"
     postcss-page-break "^3.0.4"
-    postcss-place "^7.0.4"
-    postcss-pseudo-class-any-link "^7.1.1"
+    postcss-place "^7.0.5"
+    postcss-pseudo-class-any-link "^7.1.6"
     postcss-replace-overflow-wrap "^4.0.0"
-    postcss-selector-not "^5.0.0"
+    postcss-selector-not "^6.0.1"
     postcss-value-parser "^4.2.0"
 
-postcss-pseudo-class-any-link@^7.0.2, postcss-pseudo-class-any-link@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.1.tgz#534eb1dadd9945eb07830dbcc06fb4d5d865b8e0"
-  integrity sha512-JRoLFvPEX/1YTPxRxp1JO4WxBVXJYrSY7NHeak5LImwJ+VobFMwYDQHvfTXEpcn+7fYIeGkC29zYFhFWIZD8fg==
+postcss-pseudo-class-any-link@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-7.1.6.tgz"
+  integrity sha512-9sCtZkO6f/5ML9WcTLcIyV1yz9D1rf0tWc+ulKcvV30s0iZKS/ONyETvoWsr6vnrmW+X+KmuK3gV/w5EWnT37w==
   dependencies:
-    postcss-selector-parser "^6.0.9"
-
-postcss-reduce-initial@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.1.0.tgz#fc31659ea6e85c492fb2a7b545370c215822c5d6"
-  integrity sha512-5OgTUviz0aeH6MtBjHfbr57tml13PuedK/Ecg8szzd4XRMbYxH4572JFG067z+FqBIf6Zp/d+0581glkvvWMFw==
-  dependencies:
-    browserslist "^4.16.6"
-    caniuse-api "^3.0.0"
-
-postcss-reduce-transforms@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz#333b70e7758b802f3dd0ddfe98bb1ccfef96b6e9"
-  integrity sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==
-  dependencies:
-    postcss-value-parser "^4.2.0"
+    postcss-selector-parser "^6.0.10"
 
 postcss-replace-overflow-wrap@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz#d2df6bed10b477bf9c52fab28c568b4b29ca4319"
+  resolved "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-4.0.0.tgz"
   integrity sha512-KmF7SBPphT4gPPcKZc7aDkweHiKEEO8cla/GjcBK+ckKxiZslIu3C4GCRW3DNfL0o7yW7kMQu9xlZ1kXRXLXtw==
 
-postcss-reporter@^7.0.0:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-reporter/-/postcss-reporter-7.0.5.tgz#e55bd0fdf8d17e4f25fb55e9143fcd79349a2ceb"
-  integrity sha512-glWg7VZBilooZGOFPhN9msJ3FQs19Hie7l5a/eE6WglzYqVeH3ong3ShFcp9kDWJT1g2Y/wd59cocf9XxBtkWA==
-  dependencies:
-    picocolors "^1.0.0"
-    thenby "^1.3.4"
-
 postcss-responsive-type@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-responsive-type/-/postcss-responsive-type-1.0.0.tgz#bb2d57d830beb9586ec4fda7994f07e37953aad8"
-  integrity sha1-uy1X2DC+uVhuxP2nmU8H43lTqtg=
+  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@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-selector-not/-/postcss-selector-not-5.0.0.tgz#ac5fc506f7565dd872f82f5314c0f81a05630dc7"
-  integrity sha512-/2K3A4TCP9orP4TNS7u3tGdRFVKqz/E6pX3aGnriPG0jU78of8wsUcqE4QAhWEU0d+WnMSF93Ah3F//vUtK+iQ==
+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"
+  integrity sha512-1i9affjAe9xu/y9uqWH+tD4r6/hDaXJruk8xn2x1vzxC2U3J3LKO3zJW4CyxlNhA56pADJ/djpEwpH1RClI2rQ==
   dependencies:
-    balanced-match "^1.0.0"
+    postcss-selector-parser "^6.0.10"
 
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5, postcss-selector-parser@^6.0.9:
-  version "6.0.9"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f"
-  integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ==
+postcss-selector-parser@^6.0.10, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.9:
+  version "6.0.11"
+  resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.11.tgz"
+  integrity sha512-zbARubNdogI9j7WY4nQJBiNqQf3sLS3wCP4WfOidu+p28LofJqDH1tcXypGrcmMHhDk2t9wGhCsYe/+szLTy1g==
   dependencies:
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-svgo@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.1.0.tgz#0a317400ced789f233a28826e77523f15857d80d"
-  integrity sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==
-  dependencies:
-    postcss-value-parser "^4.2.0"
-    svgo "^2.7.0"
-
-postcss-unique-selectors@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.1.0.tgz#70a945da1b0599d00f617222a44ba1d82a676694"
-  integrity sha512-LmUhgGobtpeVJJHuogzjLRwJlN7VH+BL5c9GKMVJSS/ejoyePZkXvNsYUtk//F6vKOGK86gfRS0xH7fXQSDtvA==
-  dependencies:
-    postcss-selector-parser "^6.0.5"
-
 postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514"
+  resolved "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz"
   integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==
 
-postcss@8.4.5:
-  version "8.4.5"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.5.tgz#bae665764dfd4c6fcc24dc0fdf7e7aa00cc77f95"
-  integrity sha512-jBDboWM8qpaqwkMwItqTQTiFikhs/67OYVvblFFTM7MrZjt6yMKd6r2kgXizEbTTljacm4NldIlZnhbjr84QYg==
+postcss@8.4.21:
+  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.1.30"
+    nanoid "^3.3.4"
     picocolors "^1.0.0"
-    source-map-js "^1.0.1"
+    source-map-js "^1.0.2"
 
 postcss@^6.0.6:
   version "6.0.23"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
+  resolved "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz"
   integrity sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==
   dependencies:
     chalk "^2.4.1"
@@ -10489,77 +9591,59 @@ postcss@^6.0.6:
 
 postcss@^7.0.14:
   version "7.0.39"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.39.tgz#9624375d965630e2e1f2c02a935c82a59cb48309"
+  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.1, postcss@^8.2.15, postcss@^8.3.5, postcss@^8.3.7, postcss@^8.4.5:
-  version "8.4.7"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.7.tgz#f99862069ec4541de386bf57f5660a6c7a0875a8"
-  integrity sha512-L9Ye3r6hkkCeOETQX6iOaWZgjp3LL6Lpqm6EtgbKrgqGGteRMNb9vzBfRL96YOSu8o7x3MfIH9Mo5cPJFGrW6A==
+postcss@^8.2.14, postcss@^8.3.11, postcss@^8.3.7, postcss@^8.4, postcss@^8.4.19:
+  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.1"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.2.14:
-  version "8.4.8"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.8.tgz#dad963a76e82c081a0657d3a2f3602ce10c2e032"
-  integrity sha512-2tXEqGxrjvAO6U+CJzDL2Fk2kPHTv1jQsYkSoMeOis2SsYaXRO2COxTdQp99cYvif9JTXaAk9lYGc3VhJt7JPQ==
-  dependencies:
-    nanoid "^3.3.1"
-    picocolors "^1.0.0"
-    source-map-js "^1.0.2"
-
-postcss@^8.3.11:
-  version "8.4.16"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.16.tgz#33a1d675fac39941f5f445db0de4db2b6e01d43c"
-  integrity sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==
-  dependencies:
-    nanoid "^3.3.4"
+    nanoid "^3.3.6"
     picocolors "^1.0.0"
     source-map-js "^1.0.2"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
-
-prepend-http@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
-  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
+  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
 pretty-bytes@^5.3.0, pretty-bytes@^5.6.0:
   version "5.6.0"
-  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
   integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-hrtime@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz#b7e3ea42435a4c9b2759d99e0f201eb195802ee1"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
+proc-log@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/proc-log/-/proc-log-3.0.0.tgz"
+  integrity sha512-++Vn7NS4Xf9NacaU9Xq3URUuqZETPsf8L4j5/ckhaRYsfPeRyzGw+iDjFhV/Jr3uNmTvvddEJFWh5R1gRgUH8A==
 
 process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
+  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.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
-  integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
+  resolved "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"
+  integrity sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==
 
 promise-retry@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-2.0.1.tgz#ff747a13620ab57ba688f5fc67855410c370da22"
+  resolved "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz"
   integrity sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==
   dependencies:
     err-code "^2.0.2"
@@ -10567,55 +9651,24 @@ promise-retry@^2.0.1:
 
 prompts@~2.4.2:
   version "2.4.2"
-  resolved "https://registry.yarnpkg.com/prompts/-/prompts-2.4.2.tgz#7b57e73b3a48029ad10ebd44f74b01722a4cb069"
+  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.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2:
+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.yarnpkg.com/prop-types/-/prop-types-15.8.1.tgz#67d87bf1a694f48435cf332c24af10214a3140b5"
+  resolved "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz"
   integrity sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==
   dependencies:
     loose-envify "^1.4.0"
     object-assign "^4.1.1"
     react-is "^16.13.1"
 
-protractor-istanbul-plugin@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/protractor-istanbul-plugin/-/protractor-istanbul-plugin-2.0.0.tgz#f6271d2a5d6382488e86ff9fb7770f46a8b2c5e2"
-  integrity sha1-9icdKl1jgkiOhv+ft3cPRqiyxeI=
-  dependencies:
-    fs-extra "^0.22.1"
-    merge "^1.2.0"
-    q "^1.4.1"
-    uuid "^2.0.1"
-
-protractor@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/protractor/-/protractor-7.0.0.tgz#c3e263608bd72e2c2dc802b11a772711a4792d03"
-  integrity sha512-UqkFjivi4GcvUQYzqGYNe0mLzfn5jiLmO8w9nMhQoJRLhy2grJonpga2IWhI6yJO30LibWXJJtA4MOIZD2GgZw==
-  dependencies:
-    "@types/q" "^0.0.32"
-    "@types/selenium-webdriver" "^3.0.0"
-    blocking-proxy "^1.0.0"
-    browserstack "^1.5.1"
-    chalk "^1.1.3"
-    glob "^7.0.3"
-    jasmine "2.8.0"
-    jasminewd2 "^2.1.0"
-    q "1.4.1"
-    saucelabs "^1.5.0"
-    selenium-webdriver "3.6.0"
-    source-map-support "~0.4.0"
-    webdriver-js-extender "2.1.0"
-    webdriver-manager "^12.1.7"
-    yargs "^15.3.1"
-
 proxy-addr@~2.0.7:
   version "2.0.7"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  resolved "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"
   integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
   dependencies:
     forwarded "0.2.0"
@@ -10623,68 +9676,65 @@ proxy-addr@~2.0.7:
 
 proxy-from-env@1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee"
-  integrity sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=
+  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.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
+  resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
+  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
 psl@^1.1.28, psl@^1.1.33:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
-  integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
+  version "1.9.0"
+  resolved "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"
+  integrity sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==
 
 pstree.remy@^1.1.8:
   version "1.1.8"
-  resolved "https://registry.yarnpkg.com/pstree.remy/-/pstree.remy-1.1.8.tgz#c242224f4a67c21f686839bbdb4ac282b8373d3a"
+  resolved "https://registry.npmjs.org/pstree.remy/-/pstree.remy-1.1.8.tgz"
   integrity sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==
 
 pump@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  resolved "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz"
   integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
   dependencies:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
 punycode@^2.1.0, punycode@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
-
-pupa@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/pupa/-/pupa-2.1.1.tgz#f5e8fd4afc2c5d97828faa523549ed8744a20d62"
-  integrity sha512-l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A==
-  dependencies:
-    escape-goat "^2.0.0"
-
-q@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
-  integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
+  version "2.3.0"
+  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 sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
+  integrity sha512-kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw==
 
 qjobs@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  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.2.3:
-  version "6.2.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.2.3.tgz#1cfcb25c10a9b2b483053ff39f5dfc9233908cfe"
-  integrity sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=
+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==
+  dependencies:
+    side-channel "^1.0.4"
 
-qs@6.9.7:
-  version "6.9.7"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.7.tgz#4610846871485e1e048f44ae3b94033f0e675afe"
-  integrity sha512-IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==
+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==
+  dependencies:
+    side-channel "^1.0.4"
 
 qs@~6.5.2:
   version "6.5.3"
@@ -10693,44 +9743,34 @@ qs@~6.5.2:
 
 querystringify@^2.1.1:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
+  resolved "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
 raf-schd@^4.0.2:
   version "4.0.3"
-  resolved "https://registry.yarnpkg.com/raf-schd/-/raf-schd-4.0.3.tgz#5d6c34ef46f8b2a0e880a8fcdb743efc5bfdbc1a"
+  resolved "https://registry.npmjs.org/raf-schd/-/raf-schd-4.0.3.tgz"
   integrity sha512-tQkJl2GRWh83ui2DiPTJz9wEiMN20syf+5oKfB03yYP7ioZcJwsIK8FjrtLwH1m7C7e+Tt2yYBlrOpdT+dyeIQ==
 
 randombytes@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
   integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
   dependencies:
     safe-buffer "^5.1.0"
 
 range-parser@^1.2.1, range-parser@~1.2.0, range-parser@~1.2.1:
   version "1.2.1"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  resolved "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.3.tgz#8f80305d11c2a0a545c2d9d89d7a0286fcead43c"
-  integrity sha512-UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==
-  dependencies:
-    bytes "3.1.2"
-    http-errors "1.8.1"
-    iconv-lite "0.4.24"
-    unpipe "1.0.0"
-
-raw-body@^2.3.2:
+raw-body@2.5.1, raw-body@^2.3.2:
   version "2.5.1"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  resolved "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz"
   integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
     bytes "3.1.2"
@@ -10738,44 +9778,29 @@ raw-body@^2.3.2:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@0.5.1:
-  version "0.5.1"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
-  integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
-
-rc@^1.2.8:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 re-reselect@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/re-reselect/-/re-reselect-4.0.0.tgz#9ddec4c72c4d952f68caa5aa4b76a9ed38b75cac"
-  integrity sha512-wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA==
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz"
+  integrity sha512-xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA==
 
-re-resizable@6.9.1:
-  version "6.9.1"
-  resolved "https://registry.yarnpkg.com/re-resizable/-/re-resizable-6.9.1.tgz#6be082b55d02364ca4bfee139e04feebdf52441c"
-  integrity sha512-KRYAgr9/j1PJ3K+t+MBhlQ+qkkoLDJ1rs0z1heIWvYbCW/9Vq4djDU+QumJ3hQbwwtzXF6OInla6rOx6hhgRhQ==
+re-resizable@6.9.6:
+  version "6.9.6"
+  resolved "https://registry.npmjs.org/re-resizable/-/re-resizable-6.9.6.tgz"
+  integrity sha512-0xYKS5+Z0zk+vICQlcZW+g54CcJTTmHluA7JUUgvERDxnKAnytylcyPsA+BSFi759s5hPlHmBRegFrwXs2FuBQ==
   dependencies:
     fast-memoize "^2.5.1"
 
 react-aria-live@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/react-aria-live/-/react-aria-live-2.0.5.tgz#333480cb898d6963421bd86fe3cbd0ce54e37f08"
+  resolved "https://registry.npmjs.org/react-aria-live/-/react-aria-live-2.0.5.tgz"
   integrity sha512-rXiH1HNKJrr/UfVeGwA2aKY43r5WbjLs+AYB6/kJF1qny2hwxzQc1qewQmUpdQ5h8HAOTD8O/XlGcEHjqlCl0g==
   dependencies:
     uuid "^3.2.1"
 
 react-beautiful-dnd@^13.0.0:
-  version "13.1.0"
-  resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d"
-  integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA==
+  version "13.1.1"
+  resolved "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz"
+  integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==
   dependencies:
     "@babel/runtime" "^7.9.2"
     css-box-model "^1.2.0"
@@ -10785,40 +9810,40 @@ react-beautiful-dnd@^13.0.0:
     redux "^4.0.4"
     use-memo-one "^1.1.1"
 
-react-copy-to-clipboard@^5.0.1:
-  version "5.0.4"
-  resolved "https://registry.yarnpkg.com/react-copy-to-clipboard/-/react-copy-to-clipboard-5.0.4.tgz#42ec519b03eb9413b118af92d1780c403a5f19bf"
-  integrity sha512-IeVAiNVKjSPeGax/Gmkqfa/+PuMTBhutEvFUaMQLwE2tS0EXrAdgOpWDX26bWTXF3HrioorR7lr08NqeYUWQCQ==
+react-copy-to-clipboard@^5.0.1, react-copy-to-clipboard@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.npmjs.org/react-copy-to-clipboard/-/react-copy-to-clipboard-5.1.0.tgz"
+  integrity sha512-k61RsNgAayIJNoy9yDsYzDe/yAZAzEbEgcz3DZMhF686LEyukcE1hzurxe85JandPUG+yTfGVFzuEw3xt8WP/A==
   dependencies:
-    copy-to-clipboard "^3"
-    prop-types "^15.5.8"
+    copy-to-clipboard "^3.3.1"
+    prop-types "^15.8.1"
 
 react-dnd-html5-backend@^10.0.2:
   version "10.0.2"
-  resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-10.0.2.tgz#15cb9d2b923f43576a136df854e288cb5969784c"
+  resolved "https://registry.npmjs.org/react-dnd-html5-backend/-/react-dnd-html5-backend-10.0.2.tgz"
   integrity sha512-ny17gUdInZ6PIGXdzfwPhoztRdNVVvjoJMdG80hkDBamJBeUPuNF2Wv4D3uoQJLjXssX1+i9PhBqc7EpogClwQ==
   dependencies:
     dnd-core "^10.0.2"
 
 react-dnd-multi-backend@^5.0.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-dnd-multi-backend/-/react-dnd-multi-backend-5.1.1.tgz#1ddb243cea74e41efa3932e6403bb84d0a8cd11b"
-  integrity sha512-u085U6tIAfkFzaBhe0AhZZIhs9Ta1sRcp+S/A7JR81B1TjtPVLYIoTyqCO91wG1Iz5+MEVL88aYuRPayMY4HXQ==
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/react-dnd-multi-backend/-/react-dnd-multi-backend-5.0.1.tgz"
+  integrity sha512-E45T5xVl4CLt9QFV9ZMjWCGLyF16+B6B6FgbeZE9J5o0rvLHaCqyAJTelRDXtbSiSBPaDlN1STO86jkiD31AHA==
   dependencies:
-    dnd-multi-backend "^5.1.1"
+    dnd-multi-backend "^5.0.1"
     prop-types "^15.7.2"
-    react-dnd-preview "^5.1.1"
+    react-dnd-preview "^5.0.1"
 
-react-dnd-preview@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/react-dnd-preview/-/react-dnd-preview-5.1.1.tgz#90c4ad49e90d9abe39728b762d72132b8589b784"
-  integrity sha512-RryrwRRfF22kL8CQcYqDHt4WLbytRbVNXYnjPkyZKfGsXfQnY0j8OtxokTee4Ba3OkcSiSYQbLhDRFw9wiJj5g==
+react-dnd-preview@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.npmjs.org/react-dnd-preview/-/react-dnd-preview-5.0.1.tgz"
+  integrity sha512-wwUgk8jWuO4WMOoa+GviHoZyYAiXer6vsSW2aEhpz0gsde08O+4cI+j7DG7q9vYlBnljNutdQ1WjDV0VskZ4jQ==
   dependencies:
     prop-types "^15.7.2"
 
 react-dnd-touch-backend@^10.0.2:
   version "10.0.2"
-  resolved "https://registry.yarnpkg.com/react-dnd-touch-backend/-/react-dnd-touch-backend-10.0.2.tgz#90cb916655539b838d49b8895e1813f8b874b3b4"
+  resolved "https://registry.npmjs.org/react-dnd-touch-backend/-/react-dnd-touch-backend-10.0.2.tgz"
   integrity sha512-+lW/Ern0dKyHToD0oP+Wc/ZD6l7qJazosLqbjzL7OnPlig6WxdlrHkJylOLkeAdZj41fIJJ551Lb57pIL0CcPw==
   dependencies:
     "@react-dnd/invariant" "^2.0.0"
@@ -10826,7 +9851,7 @@ react-dnd-touch-backend@^10.0.2:
 
 react-dnd@^10.0.2:
   version "10.0.2"
-  resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-10.0.2.tgz#a6ad8eb3d9f2c573031f7ce05012e5c767a0b1fc"
+  resolved "https://registry.npmjs.org/react-dnd/-/react-dnd-10.0.2.tgz"
   integrity sha512-SC2Ymvntynhoqtf5zaFhZscm9xenCoMofilxPdlwUlaelAzmbl9fw82C4ZJ//+lNm3kWAKXjGDZg2/aWjKEAtg==
   dependencies:
     "@react-dnd/shallowequal" "^2.0.0"
@@ -10836,7 +9861,7 @@ react-dnd@^10.0.2:
 
 react-dom@^16.14.0:
   version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89"
+  resolved "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz"
   integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==
   dependencies:
     loose-envify "^1.1.0"
@@ -10844,49 +9869,48 @@ react-dom@^16.14.0:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
-react-draggable@4.4.3:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/react-draggable/-/react-draggable-4.4.3.tgz#0727f2cae5813e36b0e4962bf11b2f9ef2b406f3"
-  integrity sha512-jV4TE59MBuWm7gb6Ns3Q1mxX8Azffb7oTtDtBgFkxRvhDp38YAARmRplrj0+XGkhOJB5XziArX+4HUUABtyZ0w==
+react-draggable@4.4.5:
+  version "4.4.5"
+  resolved "https://registry.npmjs.org/react-draggable/-/react-draggable-4.4.5.tgz"
+  integrity sha512-OMHzJdyJbYTZo4uQE393fHcqqPYsEtkjfMgvCHr6rejT+Ezn4OZbNyGH50vv+SunC1RMvwOTSWkEODQLzw1M9g==
   dependencies:
-    classnames "^2.2.5"
-    prop-types "^15.6.0"
+    clsx "^1.1.1"
+    prop-types "^15.8.1"
 
 react-full-screen@^0.2.4:
   version "0.2.5"
-  resolved "https://registry.yarnpkg.com/react-full-screen/-/react-full-screen-0.2.5.tgz#bc79a5cdb9640d8b9b09e11a17fa54f6e6fa5789"
+  resolved "https://registry.npmjs.org/react-full-screen/-/react-full-screen-0.2.5.tgz"
   integrity sha512-LNkxjLWmiR+AwemSVdn/miUcBy8tHA6mDVS1qz1AM/DHNEtQbzkh5ok9A6g99502OqutQq1zBvCBGLV8rsB2tw==
   dependencies:
     "@types/react" "*"
     fscreen "^1.0.1"
 
 react-i18next@^11.7.0:
-  version "11.15.5"
-  resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-11.15.5.tgz#3de940a1c5a27956d8265663ca67494881f385e8"
-  integrity sha512-vBWuVEQgrhZrGKpyv8FmJ7Zs5jRQWl794Tte7yzJ0okZqqi3jd6j2pLYNg441WcREsbIOvWdiDXbY7W6E93p1A==
+  version "11.18.6"
+  resolved "https://registry.npmjs.org/react-i18next/-/react-i18next-11.18.6.tgz"
+  integrity sha512-yHb2F9BiT0lqoQDt8loZ5gWP331GwctHz9tYQ8A2EIEUu+CcEdjBLQWli1USG3RdWQt3W+jqQLg/d4rrQR96LA==
   dependencies:
     "@babel/runtime" "^7.14.5"
-    html-escaper "^2.0.2"
     html-parse-stringify "^3.0.1"
 
 react-image@^4.0.1:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/react-image/-/react-image-4.0.3.tgz#6fa722877660b67295298a914bff1ed87ad2cf83"
-  integrity sha512-19MUK9u1qaw9xys8XEsVkSpVhHctEBUeYFvrLTe1PN+4w5Co13AN2WA7xtBshPM6SthsOj77SlDrEAeOaJpf7g==
+  version "4.1.0"
+  resolved "https://registry.npmjs.org/react-image/-/react-image-4.1.0.tgz"
+  integrity sha512-qwPNlelQe9Zy14K2pGWSwoL+vHsAwmJKS6gkotekDgRpcnRuzXNap00GfibD3eEPYu3WCPlyIUUNzcyHOrLHjw==
 
 react-is@^16.13.1, react-is@^16.7.0:
   version "16.13.1"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
 "react-is@^16.8.0 || ^17.0.0", react-is@^17.0.2:
   version "17.0.2"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0"
+  resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"
   integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==
 
 react-mosaic-component@^4.0.1:
   version "4.1.1"
-  resolved "https://registry.yarnpkg.com/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz#48a34e5e5c16654075212666c2aebeb488bab9f2"
+  resolved "https://registry.npmjs.org/react-mosaic-component/-/react-mosaic-component-4.1.1.tgz"
   integrity sha512-HVlLvfYQ/AKmoKvw95Orx3Qyc7SNuS/QlAy+SkAVit1g9ipzXBGYoBg7RMXP5sF5w47CgYxA+1gT+fYRVf73jA==
   dependencies:
     classnames "^2.2.6"
@@ -10900,9 +9924,9 @@ react-mosaic-component@^4.0.1:
     uuid "^3.3.2"
 
 react-redux@^7.1.0, react-redux@^7.2.0:
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.6.tgz#49633a24fe552b5f9caf58feb8a138936ddfe9aa"
-  integrity sha512-10RPdsz0UUrRL1NZE0ejTkucnclYSgXp5q+tB5SWx2qeG2ZJQJyymgAhwKy73yiL/13btfB6fPr+rgbMAaZIAQ==
+  version "7.2.9"
+  resolved "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz"
+  integrity sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==
   dependencies:
     "@babel/runtime" "^7.15.4"
     "@types/react-redux" "^7.1.20"
@@ -10913,21 +9937,21 @@ react-redux@^7.1.0, react-redux@^7.2.0:
 
 react-resize-observer@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/react-resize-observer/-/react-resize-observer-1.1.1.tgz#641dfa2e0f4bd2549a8ab4bbbaf43b68f3dcaf76"
+  resolved "https://registry.npmjs.org/react-resize-observer/-/react-resize-observer-1.1.1.tgz"
   integrity sha512-3R+90Hou90Mr3wJYc+unsySC8Pn91V4nmjO32NKvUvjphRUbq9HisyLg7bDyGBE7xlMrrM6Fax7iNQaFdc/FYA==
 
 react-rnd@^10.1:
-  version "10.3.5"
-  resolved "https://registry.yarnpkg.com/react-rnd/-/react-rnd-10.3.5.tgz#b66e5e06f1eb6823e72eb4b552081b4b9241b139"
-  integrity sha512-LWJP+l5bp76sDPKrKM8pwGJifI6i3B5jHK4ONACczVMbR8ycNGA75ORRqpRuXGyKawUs68s1od05q8cqWgQXgw==
+  version "10.4.1"
+  resolved "https://registry.npmjs.org/react-rnd/-/react-rnd-10.4.1.tgz"
+  integrity sha512-0m887AjQZr6p2ADLNnipquqsDq4XJu/uqVqI3zuoGD19tRm6uB83HmZWydtkilNp5EWsOHbLGF4IjWMdd5du8Q==
   dependencies:
-    re-resizable "6.9.1"
-    react-draggable "4.4.3"
-    tslib "2.3.0"
+    re-resizable "6.9.6"
+    react-draggable "4.4.5"
+    tslib "2.3.1"
 
 react-sizeme@^2.6.7:
   version "2.6.12"
-  resolved "https://registry.yarnpkg.com/react-sizeme/-/react-sizeme-2.6.12.tgz#ed207be5476f4a85bf364e92042520499455453e"
+  resolved "https://registry.npmjs.org/react-sizeme/-/react-sizeme-2.6.12.tgz"
   integrity sha512-tL4sCgfmvapYRZ1FO2VmBmjPVzzqgHA7kI8lSJ6JS6L78jXFNRdOZFpXyK6P1NBZvKPPCZxReNgzZNUajAerZw==
   dependencies:
     element-resize-detector "^1.2.1"
@@ -10936,9 +9960,9 @@ react-sizeme@^2.6.7:
     throttle-debounce "^2.1.0"
 
 react-transition-group@^4.4.0:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470"
-  integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==
+  version "4.4.5"
+  resolved "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz"
+  integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==
   dependencies:
     "@babel/runtime" "^7.5.5"
     dom-helpers "^5.0.1"
@@ -10946,21 +9970,21 @@ react-transition-group@^4.4.0:
     prop-types "^15.6.2"
 
 react-virtualized-auto-sizer@^1.0.2:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.6.tgz#66c5b1c9278064c5ef1699ed40a29c11518f97ca"
-  integrity sha512-7tQ0BmZqfVF6YYEWcIGuoR3OdYe8I/ZFbNclFlGOC3pMqunkYF/oL30NCjSGl9sMEb17AnzixDz98Kqc3N76HQ==
+  version "1.0.13"
+  resolved "https://registry.npmjs.org/react-virtualized-auto-sizer/-/react-virtualized-auto-sizer-1.0.13.tgz"
+  integrity sha512-iazB2jnZz93jgjo66/rMlrshQ0M67Y7CRSGJRu/BkWH5H63OcC0YL6dBxJZ+etHDjZT6qnUm4PKRjOJx9yF51w==
 
 react-window@^1.8.5:
-  version "1.8.6"
-  resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.6.tgz#d011950ac643a994118632665aad0c6382e2a112"
-  integrity sha512-8VwEEYyjz6DCnGBsd+MgkD0KJ2/OXFULyDtorIiTz+QzwoP94tBoA7CnbtyXMm+cCeAUER5KJcPtWl9cpKbOBg==
+  version "1.8.8"
+  resolved "https://registry.npmjs.org/react-window/-/react-window-1.8.8.tgz"
+  integrity sha512-D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ==
   dependencies:
     "@babel/runtime" "^7.0.0"
     memoize-one ">=3.1.1 <6"
 
 react@^16.14.0:
   version "16.14.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d"
+  resolved "https://registry.npmjs.org/react/-/react-16.14.0.tgz"
   integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==
   dependencies:
     loose-envify "^1.1.0"
@@ -10969,23 +9993,33 @@ react@^16.14.0:
 
 read-cache@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
-  integrity sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=
+  resolved "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz"
+  integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==
   dependencies:
     pify "^2.3.0"
 
-read-package-json-fast@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
-  integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
+read-package-json-fast@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz"
+  integrity sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==
   dependencies:
-    json-parse-even-better-errors "^2.3.0"
-    npm-normalize-package-bin "^1.0.1"
+    json-parse-even-better-errors "^3.0.0"
+    npm-normalize-package-bin "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.1, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+read-package-json@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.1.tgz"
+  integrity sha512-AaHqXxfAVa+fNL07x8iAghfKOds/XXsu7zoouIVsbm7PEbQ3nMWXlvjcbrNLjElnUHWQtAo4QEa0RXuvD4XlpA==
+  dependencies:
+    glob "^9.3.0"
+    json-parse-even-better-errors "^3.0.0"
+    normalize-package-data "^5.0.0"
+    npm-normalize-package-bin "^3.0.0"
+
+readable-stream@^2.0.1:
+  version "2.3.8"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -10996,9 +10030,9 @@ read-package-json-fast@^2.0.1:
     util-deprecate "~1.0.1"
 
 readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.0.tgz#337bbda3adc0706bd3e024426a286d4b4b2c9198"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  version "3.6.2"
+  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
     inherits "^2.0.3"
     string_decoder "^1.1.1"
@@ -11006,159 +10040,108 @@ readable-stream@^3.0.6, readable-stream@^3.4.0, readable-stream@^3.6.0:
 
 readdirp@~3.6.0:
   version "3.6.0"
-  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  resolved "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"
   integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
 rechoir@^0.7.0:
   version "0.7.1"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz"
   integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
   dependencies:
     resolve "^1.9.0"
 
 redux-devtools-extension@^2.13.2:
   version "2.13.9"
-  resolved "https://registry.yarnpkg.com/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz#6b764e8028b507adcb75a1cae790f71e6be08ae7"
+  resolved "https://registry.npmjs.org/redux-devtools-extension/-/redux-devtools-extension-2.13.9.tgz"
   integrity sha512-cNJ8Q/EtjhQaZ71c8I9+BPySIBVEKssbPpskBfsXqb8HJ002A3KRVHfeRzwRo6mGPqsm7XuHTqNSNeS1Khig0A==
 
 redux-saga@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/redux-saga/-/redux-saga-1.1.3.tgz#9f3e6aebd3c994bbc0f6901a625f9a42b51d1112"
-  integrity sha512-RkSn/z0mwaSa5/xH/hQLo8gNf4tlvT18qXDNvedihLcfzh+jMchDgaariQoehCpgRltEm4zHKJyINEz6aqswTw==
+  version "1.2.3"
+  resolved "https://registry.npmjs.org/redux-saga/-/redux-saga-1.2.3.tgz"
+  integrity sha512-HDe0wTR5nhd8Xr5xjGzoyTbdAw6rjy1GDplFt3JKtKN8/MnkQSRqK/n6aQQhpw5NI4ekDVOaW+w4sdxPBaCoTQ==
   dependencies:
-    "@redux-saga/core" "^1.1.3"
+    "@redux-saga/core" "^1.2.3"
 
 redux-thunk@^2.3.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/redux-thunk/-/redux-thunk-2.4.1.tgz#0dd8042cf47868f4b29699941de03c9301a75714"
-  integrity sha512-OOYGNY5Jy2TWvTL1KgAlVy6dcx3siPJ1wTq741EPyUKfn6W6nChdICjZwCd0p8AZBs5kWpZlbkXW2nE/zjUa+Q==
+  version "2.4.2"
+  resolved "https://registry.npmjs.org/redux-thunk/-/redux-thunk-2.4.2.tgz"
+  integrity sha512-+P3TjtnP0k/FEjcBL5FZpoovtvrTNT/UXd4/sluaSyrURlSlhLSzEdfsTBW7WsKB6yPvgd7q/iZPICFjW4o57Q==
 
 redux@^4.0.0, redux@^4.0.4, redux@^4.0.5:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/redux/-/redux-4.1.2.tgz#140f35426d99bb4729af760afcf79eaaac407104"
-  integrity sha512-SH8PglcebESbd/shgf6mii6EIoRM0zrQyjcuQ+ojmfxjTtE0z9Y8pa62iA/OJ58qjP6j27uyW4kUF4jl/jd6sw==
+  version "4.2.1"
+  resolved "https://registry.npmjs.org/redux/-/redux-4.2.1.tgz"
+  integrity sha512-LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==
   dependencies:
     "@babel/runtime" "^7.9.2"
 
 reflect-metadata@^0.1.13, reflect-metadata@^0.1.2:
   version "0.1.13"
-  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.13.tgz#67ae3ca57c972a2aa1642b10fe363fe32d49dc08"
+  resolved "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.13.tgz"
   integrity sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
 
-regenerate-unicode-properties@^10.0.1:
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-10.0.1.tgz#7f442732aa7934a3740c779bb9b3340dccc1fb56"
-  integrity sha512-vn5DU6yg6h8hP/2OkQo3K7uVILvY4iu0oI4t3HFa81UPkhGJwkRwM10JEc3upjdhHjs/k8GJY1sRBhk5sr69Bw==
+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"
+  integrity sha512-d1VudCLoIGitcU/hEg2QqvyGZQmdC0Lf8BqdOMXGFSvJP4bNV1+XqbPQeHHLD51Jh4QJJ225dlIFvY4Ly6MXmQ==
   dependencies:
     regenerate "^1.4.2"
 
 regenerate@^1.4.2:
   version "1.4.2"
-  resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a"
+  resolved "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"
   integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A==
 
-regenerator-runtime@0.13.9, regenerator-runtime@^0.13.4:
-  version "0.13.9"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
-  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
+regenerator-runtime@^0.13.11, regenerator-runtime@^0.13.4:
+  version "0.13.11"
+  resolved "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz"
+  integrity sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==
 
-regenerator-transform@^0.14.2:
-  version "0.14.5"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz#c98da154683671c9c4dcb16ece736517e1b7feb4"
-  integrity sha512-eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw==
+regenerator-transform@^0.15.1:
+  version "0.15.1"
+  resolved "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.1.tgz"
+  integrity sha512-knzmNAcuyxV+gQCufkYcvOqX/qIIfHLv0u5x79kRxuGojfYVky1f15TzZEu2Avte8QGepvUNTnLskf8E6X6Vyg==
   dependencies:
     "@babel/runtime" "^7.8.4"
 
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
-
 regex-parser@^2.2.11:
   version "2.2.11"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58"
+  resolved "https://registry.npmjs.org/regex-parser/-/regex-parser-2.2.11.tgz"
   integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==
 
-regexp.prototype.flags@^1.2.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307"
-  integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ==
+regexp.prototype.flags@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz"
+  integrity sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==
   dependencies:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
+    functions-have-names "^1.2.2"
 
-regexpp@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
-  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
-
-regexpu-core@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-5.0.1.tgz#c531122a7840de743dcf9c83e923b5560323ced3"
-  integrity sha512-CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw==
+regexpu-core@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.3.2.tgz"
+  integrity sha512-RAM5FlZz+Lhmo7db9L298p2vHP5ZywrVXmVXpmAD9GuL5MPH6t9ROw1iA/wfHkQ76Qe7AaPF0nGuim96/IrQMQ==
   dependencies:
+    "@babel/regjsgen" "^0.8.0"
     regenerate "^1.4.2"
-    regenerate-unicode-properties "^10.0.1"
-    regjsgen "^0.6.0"
-    regjsparser "^0.8.2"
+    regenerate-unicode-properties "^10.1.0"
+    regjsparser "^0.9.1"
     unicode-match-property-ecmascript "^2.0.0"
-    unicode-match-property-value-ecmascript "^2.0.0"
+    unicode-match-property-value-ecmascript "^2.1.0"
 
-regextras@^0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/regextras/-/regextras-0.8.0.tgz#ec0f99853d4912839321172f608b544814b02217"
-  integrity sha512-k519uI04Z3SaY0fLX843MRXnDeG2+vHOFsyhiPZvNLe7r8rD2YNRjq4BQLZZ0oAr2NrtvZlICsXysGNFPGa3CQ==
-
-registry-auth-token@^4.0.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/registry-auth-token/-/registry-auth-token-4.2.1.tgz#6d7b4006441918972ccd5fedcd41dc322c79b250"
-  integrity sha512-6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw==
-  dependencies:
-    rc "^1.2.8"
-
-registry-url@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/registry-url/-/registry-url-5.1.0.tgz#e98334b50d5434b81136b44ec638d9c2009c5009"
-  integrity sha512-8acYXXTI0AkQv6RAOjE3vOaIXZkT9wo4LOFbBKYQEEnnMNBpKqdUrI6S4NT0KPIo/WVvJ5tE/X5LF/TQUf0ekw==
-  dependencies:
-    rc "^1.2.8"
-
-regjsgen@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.6.0.tgz#83414c5354afd7d6627b16af5f10f41c4e71808d"
-  integrity sha512-ozE883Uigtqj3bx7OhL1KNbCzGyW2NQZPl6Hs09WTvCuZD5sTI4JY58bkbQWa/Y9hxIsvJ3M8Nbf7j54IqeZbA==
-
-regjsparser@^0.8.2:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.8.4.tgz#8a14285ffcc5de78c5b95d62bbf413b6bc132d5f"
-  integrity sha512-J3LABycON/VNEu3abOviqGHuB/LOtOQj8SKmfP9anY5GfAVw/SPjwzSjxGjbZXIxbGfqTHtJw58C2Li/WkStmA==
+regjsparser@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.npmjs.org/regjsparser/-/regjsparser-0.9.1.tgz"
+  integrity sha512-dQUtn90WanSNl+7mQKcXAgZxvUe7Z0SqXlgzv0za4LwiUhyzBC58yQO3liFoUgu8GiJVInAhJjkj1N0EtQ5nkQ==
   dependencies:
     jsesc "~0.5.0"
 
-relateurl@^0.2.7:
-  version "0.2.7"
-  resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
 request-progress@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe"
-  integrity sha1-TKdUCBx/7GP1BeT6qCWqBs1mnb4=
+  resolved "https://registry.npmjs.org/request-progress/-/request-progress-3.0.0.tgz"
+  integrity sha512-MnWzEHHaxHO2iWiQuHrUPBi/1WeBf5PkxQqNyNvLl9VAYSdXkP8tQ3pBSeCPD+yw0v0Aq1zosWLz0BdeXpWwZg==
   dependencies:
     throttleit "^1.0.0"
 
@@ -11190,49 +10173,49 @@ request@^2.87.0:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
+  resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
-  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+requireindex@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
+  integrity sha512-L9jEkOi3ASd9PYit2cwRfyppc9NoABujTP8/5gFcbERmo5jUoAKovIC3fsF17pkTnGsrByysqX+Kxd2OTNI1ww==
 
 requires-port@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
-  integrity sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=
+  resolved "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
 
 reselect@^4.0.0:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.5.tgz#852c361247198da6756d07d9296c2b51eddb79f6"
-  integrity sha512-uVdlz8J7OO+ASpBYoz1Zypgx0KasCY20H+N8JD13oUMtPvSHQuscrHop4KbXrbsBcdB9Ds7lVK7eRkBIfO43vQ==
+  version "4.1.7"
+  resolved "https://registry.npmjs.org/reselect/-/reselect-4.1.7.tgz"
+  integrity sha512-Zu1xbUt3/OPwsXL46hvOOoQrap2azE7ZQbokq61BQfiXvhewsKDwhMeZjTX9sX0nvw1t/U5Audyn1I9P/m9z0A==
 
 resolve-cwd@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  resolved "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz"
   integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
   dependencies:
     resolve-from "^5.0.0"
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-from@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz"
   integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
 
 resolve-url-loader@5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz#ee3142fb1f1e0d9db9524d539cfa166e9314f795"
+  resolved "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-5.0.0.tgz"
   integrity sha512-uZtduh8/8srhBoMx//5bwqjQ+rfYOUq8zC9NrMUGtjBiGTtFJM42s58/36+hTqeqINcnYe08Nj3LkK9lW4N8Xg==
   dependencies:
     adjust-sourcemap-loader "^4.0.0"
@@ -11241,69 +10224,52 @@ resolve-url-loader@5.0.0:
     postcss "^8.2.14"
     source-map "0.6.1"
 
-resolve-url@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
-
-resolve@1.22.0, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.20.0, resolve@^1.9.0:
-  version "1.22.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+resolve@1.22.2, resolve@^1.1.7, resolve@^1.14.2, resolve@^1.22.1, 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==
   dependencies:
-    is-core-module "^2.8.1"
+    is-core-module "^2.11.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.yarnpkg.com/resp-modifier/-/resp-modifier-6.0.2.tgz#b124de5c4fbafcba541f48ffa73970f4aa456b4f"
-  integrity sha1-sSTeXE+6/LpUH0j/pzlw9KpFa08=
+  resolved "https://registry.npmjs.org/resp-modifier/-/resp-modifier-6.0.2.tgz"
+  integrity sha512-U1+0kWC/+4ncRFYqQWTx/3qkfE6a4B/h3XXgmXypfa0SPZ3t7cbbaFk297PjQS/yov24R18h6OZe6iZwj3NSLw==
   dependencies:
     debug "^2.2.0"
     minimatch "^3.0.2"
 
-responselike@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
-  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
-  dependencies:
-    lowercase-keys "^1.0.0"
-
 restore-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
   integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
 retry@^0.12.0:
   version "0.12.0"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
-  integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
+  resolved "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"
+  integrity sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==
 
 retry@^0.13.1:
   version "0.13.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.13.1.tgz#185b1587acf67919d63b357349e03537b2484658"
+  resolved "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz"
   integrity sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==
 
 reusify@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.0.4.tgz#90da382b1e126efc02146e90845a88db12925d76"
+  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.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.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.6.3:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -11312,50 +10278,50 @@ rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
 
 rimraf@^3.0.0, rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   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.15.0"
-  resolved "https://registry.yarnpkg.com/rtl-css-js/-/rtl-css-js-1.15.0.tgz#680ed816e570a9ebccba9e1cd0f202c6a8bb2dc0"
-  integrity sha512-99Cu4wNNIhrI10xxUaABHsdDqzalrSRTie4GeCmbGVuehm4oj+fIy8fTzB+16pmKe8Bv9rl+hxIBez6KxExTew==
+  version "1.16.1"
+  resolved "https://registry.npmjs.org/rtl-css-js/-/rtl-css-js-1.16.1.tgz"
+  integrity sha512-lRQgou1mu19e+Ya0LsTvKrVJ5TYUbqCVPAiImX3UfLTenarvPUl1QFdvu5Z3PYmHT9RCcwIfbjRQBntExyj3Zg==
   dependencies:
     "@babel/runtime" "^7.1.2"
 
 run-async@^2.4.0:
   version "2.4.1"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
+  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
+  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
 
-run-queue@^1.0.0, run-queue@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/run-queue/-/run-queue-1.0.3.tgz#e848396f057d223f24386924618e25694161ec47"
-  integrity sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=
-  dependencies:
-    aproba "^1.1.1"
-
 rx@4.1.0:
   version "4.1.0"
-  resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782"
-  integrity sha1-pfE/957zt0D+MKqAP7CfmIBdR4I=
-
-rxjs-for-await@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/rxjs-for-await/-/rxjs-for-await-0.0.2.tgz#26598a1d6167147cc192172970e7eed4e620384b"
-  integrity sha512-IJ8R/ZCFMHOcDIqoABs82jal00VrZx8Xkgfe7TOKoaRPAW5nH/VFlG23bXpeGdrmtqI9UobFPgUKgCuFc7Lncw==
+  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.yarnpkg.com/rxjs-report-usage/-/rxjs-report-usage-1.0.6.tgz#6e06034d9e1592e8a45bee877631638e4bac2576"
+  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"
@@ -11368,7 +10334,7 @@ rxjs-report-usage@^1.0.4:
 
 rxjs-spy@^8.0.2:
   version "8.0.2"
-  resolved "https://registry.yarnpkg.com/rxjs-spy/-/rxjs-spy-8.0.2.tgz#dd510bdb58d798e0bc23121ab67714dd6fd95f88"
+  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"
@@ -11378,158 +10344,142 @@ rxjs-spy@^8.0.2:
     rxjs-report-usage "^1.0.4"
     stacktrace-gps "^3.0.2"
 
-rxjs@6.6.7, rxjs@^6.5.4, rxjs@^6.5.5, rxjs@~6.6.0:
+rxjs@6.6.7, rxjs@^6.5.5, rxjs@~6.6.0:
   version "6.6.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^5.5.6:
-  version "5.5.12"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.12.tgz#6fa61b8a77c3d793dbaf270bee2f43f652d741cc"
-  integrity sha512-xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw==
-  dependencies:
-    symbol-observable "1.0.1"
-
-rxjs@^7.2.0, rxjs@^7.5.1:
-  version "7.5.4"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.4.tgz#3d6bd407e6b7ce9a123e76b1e770dc5761aa368d"
-  integrity sha512-h5M3Hk78r6wAheJF0a5YahB1yRQKCsZ4MsGdZ5O9ETbVtjPcScGfrMmoOq7EBsCRzd4BDkvDJ7ogP8Sz5tTFiQ==
+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"
 
-rxjs@^7.5.5:
-  version "7.5.5"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.5.tgz#2ebad89af0f560f460ad5cc4213219e1f7dd4e9f"
-  integrity sha512-sy+H0pQofO95VDmFLzyaw9xNJU4KTRSwQIGM6+iG3SypAtCiLDzpeG8sJrNCWn2Up9km+KhkvTdbkrdy+yzZdw==
+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==
   dependencies:
     tslib "^2.1.0"
 
-safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+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:
   version "5.1.2"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  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.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+safe-buffer@5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+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==
   dependencies:
-    ret "~0.1.10"
+    call-bind "^1.0.2"
+    get-intrinsic "^1.1.3"
+    is-regex "^1.1.4"
 
-"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.2, safer-buffer@~2.1.0:
+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.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sanitize-html@^2.7.2:
-  version "2.7.2"
-  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.7.2.tgz#54c5189af75e3237d996e4b9a5e3eaad12c7f7fc"
-  integrity sha512-DggSTe7MviO+K4YTCwprG6W1vsG+IIX67yp/QY55yQqKCJYSWzCA1rZbaXzkjoKeL9+jqwm56wD6srYLtUNivg==
+sanitize-html@^2.12.1:
+  version "2.12.1"
+  resolved "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-2.12.1.tgz#280a0f5c37305222921f6f9d605be1f6558914c7"
+  integrity sha512-Plh+JAn0UVDpBRP/xEjsk+xDCoOvMBwQUf/K+/cBAVuTbtX8bj2VB7S1sL1dssVpykqp0/KPSesHrqXtokVBpA==
   dependencies:
     deepmerge "^4.2.2"
     escape-string-regexp "^4.0.0"
-    htmlparser2 "^6.0.0"
+    htmlparser2 "^8.0.0"
     is-plain-object "^5.0.0"
     parse-srcset "^1.0.2"
     postcss "^8.3.11"
 
-sass-loader@12.4.0:
-  version "12.4.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.4.0.tgz#260b0d51a8a373bb8e88efc11f6ba5583fea0bcf"
-  integrity sha512-7xN+8khDIzym1oL9XyS6zP6Ges+Bo2B2xbPrjdMHEYyV3AQYhd/wXeru++3ODHF0zMjYmVadblSKrPrjEkL8mg==
+sass-loader@13.2.0:
+  version "13.2.0"
+  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-13.2.0.tgz"
+  integrity sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==
   dependencies:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
 sass-loader@^12.6.0:
   version "12.6.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.6.0.tgz#5148362c8e2cdd4b950f3c63ac5d16dbfed37bcb"
+  resolved "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz"
   integrity sha512-oLTaH0YCtX4cfnJZxKSLAyglED0naiYfNG1iXfU5w1LNZ+ukoA5DtyDIN5zmKVZwYNJP4KRc5Y3hkWga+7tYfA==
   dependencies:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass-resources-loader@^2.1.1:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.4.tgz#1a86fba499e74a88cb7ce95f0c98449f348d360e"
-  integrity sha512-hIQhBygYky+rLf+4cuoGYONZ623CEH4Swo1fs1WRJkukbqdvN1VIu2KCL59du6vX92bNELzNkGPLx+NorN73xA==
+sass-resources-loader@^2.2.5:
+  version "2.2.5"
+  resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.2.5.tgz#75131cdb26bae51fcffc007d8155d57b5e825ca7"
+  integrity sha512-po8rfETH9cOQACWxubT/1CCu77KjxwRtCDm6QAXZH99aUHBydwSoxdIjC40SGp/dcS/FkSNJl0j1VEojGZqlvQ==
   dependencies:
-    async "^3.2.0"
+    async "^3.2.3"
     chalk "^4.1.0"
     glob "^7.1.6"
     loader-utils "^2.0.0"
 
-sass@1.49.0:
-  version "1.49.0"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.49.0.tgz#65ec1b1d9a6bc1bae8d2c9d4b392c13f5d32c078"
-  integrity sha512-TVwVdNDj6p6b4QymJtNtRS2YtLJ/CqZriGg0eIAbAKMlN8Xy6kbv33FsEZSF7FufFFM705SQviHjjThfaQ4VNw==
+sass@1.58.1:
+  version "1.58.1"
+  resolved "https://registry.npmjs.org/sass/-/sass-1.58.1.tgz"
+  integrity sha512-bnINi6nPXbP1XNRaranMFEBZWUfdW/AF16Ql5+ypRxfTvCRTTKrLsMIakyDcayUt2t/RZotmL4kgJwNH5xO+bg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"
     source-map-js ">=0.6.2 <2.0.0"
 
-sass@~1.32.6:
-  version "1.32.13"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.13.tgz#8d29c849e625a415bce71609c7cf95e15f74ed00"
-  integrity sha512-dEgI9nShraqP7cXQH+lEXVf73WOPCse0QlFzSD8k+1TcOxCMwVXfQlr0jtoluZysQOyJGnfr21dLvYKDJq8HkA==
+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==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
+    immutable "^4.0.0"
+    source-map-js ">=0.6.2 <2.0.0"
 
-saucelabs@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/saucelabs/-/saucelabs-1.5.0.tgz#9405a73c360d449b232839919a86c396d379fd9d"
-  integrity sha512-jlX3FGdWvYf4Q3LFfFWS1QvPg3IGCGWxIc8QBFdPTbpTJnt/v17FHXYVAn7C8sHf1yUXo2c7yIM0isDryfYtHQ==
-  dependencies:
-    https-proxy-agent "^2.2.1"
-
-sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
+sax@>=0.6.0, 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==
 
 saxes@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz#eebab953fa3b7608dbe94e5dadb15c888fa6696d"
+  resolved "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz"
   integrity sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==
   dependencies:
     xmlchars "^2.2.0"
 
+saxes@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz"
+  integrity sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==
+  dependencies:
+    xmlchars "^2.2.0"
+
 scheduler@^0.19.1:
   version "0.19.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196"
+  resolved "https://registry.npmjs.org/scheduler/-/scheduler-0.19.1.tgz"
   integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-schema-utils@2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.0.tgz#17151f76d8eae67fbbf77960c33c676ad9f4efc7"
-  integrity sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==
-  dependencies:
-    "@types/json-schema" "^7.0.4"
-    ajv "^6.12.2"
-    ajv-keywords "^3.4.1"
-
-schema-utils@^2.6.5, schema-utils@^2.6.6:
-  version "2.7.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz#1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"
-  integrity sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==
-  dependencies:
-    "@types/json-schema" "^7.0.5"
-    ajv "^6.12.4"
-    ajv-keywords "^3.5.2"
-
 schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-3.1.1.tgz"
   integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
   dependencies:
     "@types/json-schema" "^7.0.8"
@@ -11538,7 +10488,7 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1:
 
 schema-utils@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-4.0.0.tgz#60331e9e3ae78ec5d16353c467c34b3a0a1d3df7"
+  resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-4.0.0.tgz"
   integrity sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==
   dependencies:
     "@types/json-schema" "^7.0.9"
@@ -11548,65 +10498,60 @@ schema-utils@^4.0.0:
 
 select-hose@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
-  integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
+  resolved "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"
+  integrity sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==
 
-selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/selenium-webdriver/-/selenium-webdriver-3.6.0.tgz#2ba87a1662c020b8988c981ae62cb2a01298eafc"
-  integrity sha512-WH7Aldse+2P5bbFBO4Gle/nuQOdVwpHMTL6raL3uuBj/vPG07k6uzt3aiahu352ONBr5xXh0hDlM3LhtXPOC4Q==
+selfsigned@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/selfsigned/-/selfsigned-2.1.1.tgz"
+  integrity sha512-GSL3aowiF7wa/WtSFwnUrludWFoNhftq8bUkH9pkzjpN2XSPOAYEgg6e0sS9s0rZwgJzJiQRPU18A6clnoW5wQ==
   dependencies:
-    jszip "^3.1.3"
-    rimraf "^2.5.4"
-    tmp "0.0.30"
-    xml2js "^0.4.17"
+    node-forge "^1"
 
-selfsigned@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-2.0.0.tgz#e927cd5377cbb0a1075302cff8df1042cc2bce5b"
-  integrity sha512-cUdFiCbKoa1mZ6osuJs2uDHrs0k0oprsKveFiiaBKCNq3SYyb5gs2HxhQyDNLCmL51ZZThqi4YNDpCK6GOP1iQ==
+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.3.8:
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.8.tgz#07a78feafb3f7b32347d725e33de7e2a2df67798"
+  integrity sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==
   dependencies:
-    node-forge "^1.2.0"
+    lru-cache "^6.0.0"
 
-semver-diff@^3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-3.1.1.tgz#05f77ce59f325e00e2706afd67bb506ddb1ca32b"
-  integrity sha512-GX0Ix/CJcHyB8c4ykpHGIAvLyOwOobtM/8d+TQkAd81/bEjgPHrfba41Vpesr7jX/t8Uh+R3EX9eAS5be+jQYg==
+semver@7.5.4, 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.3:
+  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:
-    semver "^6.3.0"
+    lru-cache "^6.0.0"
 
-semver@7.0.0:
+semver@^5.3.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:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
+
+semver@^7.5.1:
+  version "7.6.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d"
+  integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==
+  dependencies:
+    lru-cache "^6.0.0"
+
+semver@~7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.3.4:
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
-  integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@7.3.5, semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5:
-  version "7.3.5"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
-
-semver@^5.0.1, 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.2.0, semver@^6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-
 send@0.16.2:
   version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
+  resolved "https://registry.npmjs.org/send/-/send-0.16.2.tgz"
   integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
   dependencies:
     debug "2.6.9"
@@ -11623,28 +10568,9 @@ send@0.16.2:
     range-parser "~1.2.0"
     statuses "~1.4.0"
 
-send@0.17.2:
-  version "0.17.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.2.tgz#926622f76601c41808012c8bf1688fe3906f7820"
-  integrity sha512-UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww==
-  dependencies:
-    debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    etag "~1.8.1"
-    fresh "0.5.2"
-    http-errors "1.8.1"
-    mime "1.6.0"
-    ms "2.1.3"
-    on-finished "~2.3.0"
-    range-parser "~1.2.1"
-    statuses "~1.5.0"
-
 send@0.18.0:
   version "0.18.0"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
   integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
@@ -11661,31 +10587,24 @@ send@0.18.0:
     range-parser "~1.2.1"
     statuses "2.0.1"
 
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
 serialize-javascript@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz"
   integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
   dependencies:
     randombytes "^2.1.0"
 
-serialize-javascript@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
-  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+serialize-javascript@^6.0.0, serialize-javascript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.1.tgz"
+  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
   dependencies:
     randombytes "^2.1.0"
 
 serve-index@1.9.1, serve-index@^1.9.1:
   version "1.9.1"
-  resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
-  integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
+  resolved "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"
+  integrity sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==
   dependencies:
     accepts "~1.3.4"
     batch "0.6.1"
@@ -11697,7 +10616,7 @@ serve-index@1.9.1, serve-index@^1.9.1:
 
 serve-static@1.13.2:
   version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
+  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz"
   integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
   dependencies:
     encodeurl "~1.0.2"
@@ -11705,19 +10624,9 @@ serve-static@1.13.2:
     parseurl "~1.3.2"
     send "0.16.2"
 
-serve-static@1.14.2:
-  version "1.14.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.2.tgz#722d6294b1d62626d41b43a013ece4598d292bfa"
-  integrity sha512-+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ==
-  dependencies:
-    encodeurl "~1.0.2"
-    escape-html "~1.0.3"
-    parseurl "~1.3.3"
-    send "0.17.2"
-
-serve-static@^1.14.1:
+serve-static@1.15.0, serve-static@^1.14.1:
   version "1.15.0"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  resolved "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"
   integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
@@ -11727,66 +10636,56 @@ serve-static@^1.14.1:
 
 server-destroy@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/server-destroy/-/server-destroy-1.0.1.tgz#f13bf928e42b9c3e79383e61cc3998b5d14e6cdd"
-  integrity sha1-8Tv5KOQrnD55OD5hzDmYtdFObN0=
+  resolved "https://registry.npmjs.org/server-destroy/-/server-destroy-1.0.1.tgz"
+  integrity sha512-rb+9B5YBIEzYcD6x2VKidaa+cqYBJQKnU4oe4E3ANwRRN56yk/ua1YCJT1n21NTS8w6CcOclAKNP3PhdCXKYtQ==
 
 set-blocking@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-immediate-shim@~1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
+  integrity sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==
 
 setprototypeof@1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
+  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
 setprototypeof@1.2.0:
   version "1.2.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  resolved "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"
   integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 shallow-clone@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  resolved "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz"
   integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
   dependencies:
     kind-of "^6.0.2"
 
 shallowequal@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
+  resolved "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
+shell-quote@^1.7.3:
+  version "1.8.1"
+  resolved "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz"
+  integrity sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==
+
 side-channel@^1.0.4:
   version "1.0.4"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  resolved "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz"
   integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
   dependencies:
     call-bind "^1.0.0"
@@ -11795,12 +10694,30 @@ side-channel@^1.0.4:
 
 signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
-  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
   integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
+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/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"
+
+simple-update-notifier@^1.0.7:
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"
+  integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
+  dependencies:
+    semver "~7.0.0"
+
 sirv@^1.0.7:
   version "1.0.19"
-  resolved "https://registry.yarnpkg.com/sirv/-/sirv-1.0.19.tgz#1d73979b38c7fe91fcba49c85280daa9c2363b49"
+  resolved "https://registry.npmjs.org/sirv/-/sirv-1.0.19.tgz"
   integrity sha512-JuLThK3TnZG1TAKDwNIqNq6QA2afLOCcm+iE8D1Kj3GA40pSPsxQjjJl0J8X3tsR7T+CP1GavpzLwYkgVLWrZQ==
   dependencies:
     "@polka/url" "^1.0.0-next.20"
@@ -11809,22 +10726,22 @@ sirv@^1.0.7:
 
 sisteransi@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/sisteransi/-/sisteransi-1.0.5.tgz#134d681297756437cc05ca01370d3a7a571075ed"
+  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.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
+  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slash@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slash/-/slash-4.0.0.tgz#2422372176c4c6c5addb5e2ada885af984b396a7"
+  resolved "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz"
   integrity sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==
 
 slice-ansi@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-3.0.0.tgz#31ddc10930a1b7e0b67b08c96c2f49b77a789787"
+  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz"
   integrity sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==
   dependencies:
     ansi-styles "^4.0.0"
@@ -11833,7 +10750,7 @@ slice-ansi@^3.0.0:
 
 slice-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
   integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
     ansi-styles "^4.0.0"
@@ -11842,257 +10759,163 @@ slice-ansi@^4.0.0:
 
 slick@^1.12.2:
   version "1.12.2"
-  resolved "https://registry.yarnpkg.com/slick/-/slick-1.12.2.tgz#bd048ddb74de7d1ca6915faa4a57570b3550c2d7"
+  resolved "https://registry.npmjs.org/slick/-/slick-1.12.2.tgz"
   integrity sha512-4qdtOGcBjral6YIBCWJ0ljFSKNLz9KkhbWtuGvUyRowl1kxfuE1x/Z/aJcaiilpb3do9bl5K7/1h9XC5wWpY/A==
 
 smart-buffer@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.2.0.tgz#6e1d71fa4f18c05f7d0ff216dd16a481d0e8d9ae"
+  resolved "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz"
   integrity sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==
 
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+socket.io-adapter@~2.5.2:
+  version "2.5.2"
+  resolved "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz"
+  integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==
   dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
+    ws "~8.11.0"
 
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+socket.io-client@^4.4.1:
+  version "4.6.1"
+  resolved "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.6.1.tgz"
+  integrity sha512-5UswCV6hpaRsNg5kkEHVcbBIXEYoVbMQaHJBXJCyEQ+CiFPV1NIOY0XOFWG4XR4GZcB8Kn6AsRs/9cy9TbqVMQ==
   dependencies:
-    kind-of "^3.2.0"
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.2"
+    engine.io-client "~6.4.0"
+    socket.io-parser "~4.2.1"
 
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+socket.io-parser@~4.2.1:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.3.tgz#926bcc6658e2ae0883dc9dee69acbdc76e4e3667"
+  integrity sha512-JMafRntWVO2DCJimKsRTh/wnqVvO4hrfwOqtO7f+uzwsQMuxO6VwImtYxaQ+ieoyshWOTJyV0fA21lccEXRPpQ==
   dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-socket.io-adapter@~1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-1.1.2.tgz#ab3f0d6f66b8fc7fca3959ab5991f82221789be9"
-  integrity sha512-WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==
-
-socket.io-adapter@~2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.3.3.tgz#4d6111e4d42e9f7646e365b4f578269821f13486"
-  integrity sha512-Qd/iwn3VskrpNO60BeRyCyr8ZWw9CPZyitW4AQwmRZ8zCiyDiL+znRnWX6tDHXnWn1sJrM1+b6Mn6wEDJJ4aYQ==
-
-socket.io-client@2.4.0, socket.io-client@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io-client/-/socket.io-client-2.4.0.tgz#aafb5d594a3c55a34355562fc8aea22ed9119a35"
-  integrity sha512-M6xhnKQHuuZd4Ba9vltCLT9oa+YvTsP8j9NcEiLElfIg8KeYPyhWOes6x4t+LTAC8enQbE/995AdTem2uNyKKQ==
-  dependencies:
-    backo2 "1.0.2"
-    component-bind "1.0.0"
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    engine.io-client "~3.5.0"
-    has-binary2 "~1.0.2"
-    indexof "0.0.1"
-    parseqs "0.0.6"
-    parseuri "0.0.6"
-    socket.io-parser "~3.3.0"
-    to-array "0.1.4"
-
-socket.io-parser@~3.3.0:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.3.2.tgz#ef872009d0adcf704f2fbe830191a14752ad50b6"
-  integrity sha512-FJvDBuOALxdCI9qwRrO/Rfp9yfndRtc1jSgVgV8FDraihmSP/MLGD5PEuJrNfjALvcQ+vMDM/33AWOYP/JSjDg==
-  dependencies:
-    component-emitter "~1.3.0"
-    debug "~3.1.0"
-    isarray "2.0.1"
-
-socket.io-parser@~3.4.0:
-  version "3.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-3.4.1.tgz#b06af838302975837eab2dc980037da24054d64a"
-  integrity sha512-11hMgzL+WCLWf1uFtHSNvliI++tcRUWdoeYuwIl+Axvwy9z2gQM+7nJyN3STj1tLj5JyIUH8/gpDGxzAlDdi0A==
-  dependencies:
-    component-emitter "1.2.1"
-    debug "~4.1.0"
-    isarray "2.0.1"
-
-socket.io-parser@~4.0.4:
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.0.4.tgz#9ea21b0d61508d18196ef04a2c6b9ab630f4c2b0"
-  integrity sha512-t+b0SS+IxG7Rxzda2EVvyBZbvFPBCjJoyHuE0P//7OAsN23GItzDRdWa6ALxZI/8R5ygK7jAR6t028/z+7295g==
-  dependencies:
-    "@types/component-emitter" "^1.2.10"
-    component-emitter "~1.3.0"
+    "@socket.io/component-emitter" "~3.1.0"
     debug "~4.3.1"
 
-socket.io@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-2.4.0.tgz#01030a2727bd8eb2e85ea96d69f03692ee53d47e"
-  integrity sha512-9UPJ1UTvKayuQfVv2IQ3k7tCQC/fboDyIK62i99dAQIyHKaBsNdTpwHLgKJ6guRWxRtC9H+138UwpaGuQO9uWQ==
-  dependencies:
-    debug "~4.1.0"
-    engine.io "~3.5.0"
-    has-binary2 "~1.0.2"
-    socket.io-adapter "~1.1.0"
-    socket.io-client "2.4.0"
-    socket.io-parser "~3.4.0"
-
-socket.io@^4.2.0:
-  version "4.4.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.4.1.tgz#cd6de29e277a161d176832bb24f64ee045c56ab8"
-  integrity sha512-s04vrBswdQBUmuWJuuNTmXUVJhP0cVky8bBDhdkf8y0Ptsu7fKU2LuLbts9g+pdmAdyMMn8F/9Mf1/wbtUN0fg==
+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==
   dependencies:
     accepts "~1.3.4"
     base64id "~2.0.0"
     debug "~4.3.2"
-    engine.io "~6.1.0"
-    socket.io-adapter "~2.3.3"
-    socket.io-parser "~4.0.4"
+    engine.io "~6.4.1"
+    socket.io-adapter "~2.5.2"
+    socket.io-parser "~4.2.1"
 
-sockjs@^0.3.21:
+sockjs@^0.3.24:
   version "0.3.24"
-  resolved "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.24.tgz#c9bc8995f33a111bea0395ec30aa3206bdb5ccce"
+  resolved "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz"
   integrity sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==
   dependencies:
     faye-websocket "^0.11.3"
     uuid "^8.3.2"
     websocket-driver "^0.7.4"
 
-socks-proxy-agent@^6.0.0, socks-proxy-agent@^6.1.1:
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
-  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
+socks-proxy-agent@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz"
+  integrity sha512-Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==
   dependencies:
     agent-base "^6.0.2"
-    debug "^4.3.1"
-    socks "^2.6.1"
+    debug "^4.3.3"
+    socks "^2.6.2"
 
-socks@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.2.tgz#ec042d7960073d40d94268ff3bb727dc685f111a"
-  integrity sha512-zDZhHhZRY9PxRruRMR7kMhnf3I8hDs4S3f9RecfnGxvcBHQcKcIH/oUcEWffsfl1XxdYlA7nnlGbbTvPz9D8gA==
+socks@^2.6.2:
+  version "2.7.1"
+  resolved "https://registry.npmjs.org/socks/-/socks-2.7.1.tgz"
+  integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ==
   dependencies:
-    ip "^1.1.5"
+    ip "^2.0.0"
     smart-buffer "^4.2.0"
 
-sortablejs@1.13.0:
-  version "1.13.0"
-  resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.13.0.tgz#3ab2473f8c69ca63569e80b1cd1b5669b51269e9"
-  integrity sha512-RBJirPY0spWCrU5yCmWM1eFs/XgX2J5c6b275/YyxFRgnzPhKl/TDeU2hNR8Dt7ITq66NRPM4UlOt+e5O4CFHg==
+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==
 
 source-list-map@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  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.1, source-map-js@^1.0.2:
+"source-map-js@>=0.6.2 <2.0.0", source-map-js@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  resolved "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
-source-map-loader@3.0.1:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.1.tgz#9ae5edc7c2d42570934be4c95d1ccc6352eba52d"
-  integrity sha512-Vp1UsfyPvgujKQzi4pyDiTOnE3E4H+yHvkVRN3c/9PJmQS4CQJExvcDvaX/D+RV+xQben9HJ56jMJS3CgUeWyA==
+source-map-loader@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.npmjs.org/source-map-loader/-/source-map-loader-4.0.1.tgz"
+  integrity sha512-oqXpzDIByKONVY8g1NUPOTQhe0UTU5bWUl32GSkqK2LjJj0HmwTMVKxcUip0RgAYhY1mqgOxjbQM48a0mmeNfA==
   dependencies:
-    abab "^2.0.5"
+    abab "^2.0.6"
     iconv-lite "^0.6.3"
-    source-map-js "^1.0.1"
+    source-map-js "^1.0.2"
 
-source-map-resolve@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
-  integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-    resolve-url "^0.2.1"
-    source-map-url "^0.4.0"
-    urix "^0.1.0"
-
-source-map-resolve@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
-  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
-  dependencies:
-    atob "^2.1.2"
-    decode-uri-component "^0.2.0"
-
-source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.21, source-map-support@^0.5.5, source-map-support@~0.5.12, source-map-support@~0.5.20:
+source-map-support@0.5.21, source-map-support@^0.5.17, source-map-support@^0.5.5, source-map-support@~0.5.20:
   version "0.5.21"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@~0.4.0:
-  version "0.4.18"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
-  integrity sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==
-  dependencies:
-    source-map "^0.5.6"
-
-source-map-url@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
-  integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
-
 source-map@0.5.6:
   version "0.5.6"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
-  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+  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.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@0.7.3, source-map@^0.7.3, source-map@~0.7.2:
+source-map@0.7.3:
   version "0.7.3"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.5.0, source-map@^0.5.6:
-  version "0.5.7"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+source-map@0.7.4:
+  version "0.7.4"
+  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz"
+  integrity sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==
 
-sourcemap-codec@1.4.8, sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
+sourcemap-codec@^1.4.4:
   version "1.4.8"
-  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
+spdx-correct@^3.0.0:
+  version "3.2.0"
+  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz"
+  integrity sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==
+  dependencies:
+    spdx-expression-parse "^3.0.0"
+    spdx-license-ids "^3.0.0"
+
 spdx-exceptions@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz#3f28ce1a77a00372683eade4a433183527a2163d"
+  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
   integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
 
-spdx-expression-parse@^3.0.1:
+spdx-expression-parse@^3.0.0, spdx-expression-parse@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz#cf70f50482eefdc98e3ce0a6833e4a53ceeba679"
+  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
   integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
   dependencies:
     spdx-exceptions "^2.1.0"
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz#50c0d8c40a14ec1bf449bae69a0ea4685a9d9f95"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
+  version "3.0.13"
+  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.13.tgz"
+  integrity sha512-XkD+zwiqXHikFZm4AX/7JSCXA98U5Db4AFd5XUg/+9UNtnH75+Z9KxtpYiJZx36mUDVOwH83pl7yvCer6ewM3w==
 
 spdy-transport@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/spdy-transport/-/spdy-transport-3.0.0.tgz#00d4863a6400ad75df93361a1608605e5dcdcf31"
+  resolved "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz"
   integrity sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==
   dependencies:
     debug "^4.1.0"
@@ -12104,7 +10927,7 @@ spdy-transport@^3.0.0:
 
 spdy@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz#b74f466203a3eda452c02492b91fb9e84a27677b"
+  resolved "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz"
   integrity sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==
   dependencies:
     debug "^4.1.0"
@@ -12115,24 +10938,17 @@ spdy@^4.0.2:
 
 speech-rule-engine@^4.0.6:
   version "4.0.7"
-  resolved "https://registry.yarnpkg.com/speech-rule-engine/-/speech-rule-engine-4.0.7.tgz#b655dacbad3dae04acc0f7665e26ef258397dd09"
+  resolved "https://registry.npmjs.org/speech-rule-engine/-/speech-rule-engine-4.0.7.tgz"
   integrity sha512-sJrL3/wHzNwJRLBdf6CjJWIlxC04iYKkyXvYSVsWVOiC2DSkHmxsqOhEeMsBA9XK+CHuNcsdkbFDnoUfAsmp9g==
   dependencies:
     commander "9.2.0"
     wicked-good-xpath "1.3.0"
     xmldom-sre "0.1.31"
 
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
-
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  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"
@@ -12149,127 +10965,130 @@ sshpk@^1.14.1, sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^7.0.0:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.1.tgz#33e44f896a967158e3c63468e47ec46613b95b5f"
-  integrity sha512-w+daCzXN89PseTL99MkA+fxJEcU3wfaE/ah0i0lnOlpG1CYLJ2ZjzEry68YBKfLs4JfoTShrTEsJkAZuNZ/stw==
+ssri@^10.0.0:
+  version "10.0.3"
+  resolved "https://registry.npmjs.org/ssri/-/ssri-10.0.3.tgz"
+  integrity sha512-lJtX/BFPI/VEtxZmLfeh7pzisIs6micwZ3eruD3+ds9aPsXKlYpwDS2Q7omD6WC42WO9+bnUSzlMmfv8uK8meg==
   dependencies:
-    figgy-pudding "^3.5.1"
-    minipass "^3.1.1"
+    minipass "^4.0.0"
 
-ssri@^8.0.0, ssri@^8.0.1:
+ssri@^8.0.1:
   version "8.0.1"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
+  resolved "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz"
   integrity sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==
   dependencies:
     minipass "^3.1.1"
 
-stable@^0.1.8:
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
-  integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
+ssri@^9.0.0:
+  version "9.0.1"
+  resolved "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz"
+  integrity sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==
+  dependencies:
+    minipass "^3.1.1"
 
-stackframe@^1.1.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/stackframe/-/stackframe-1.2.1.tgz#1033a3473ee67f08e2f2fc8eba6aef4f845124e1"
-  integrity sha512-h88QkzREN/hy8eRdyNhhsO7RSJ5oyTqxxmmn0dzBIMUclZsjpfmrsg81vp8mjjAs2vAZ72nyWxRUwSwmh0e4xg==
+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.0.4"
-  resolved "https://registry.yarnpkg.com/stacktrace-gps/-/stacktrace-gps-3.0.4.tgz#7688dc2fc09ffb3a13165ebe0dbcaf41bcf0c69a"
-  integrity sha512-qIr8x41yZVSldqdqe6jciXEaSCKw1U8XTXpjDuy0ki/apyTn/r3w9hDAAQOhZdxvsC93H+WwwEu5cq5VemzYeg==
+  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.1.1"
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
-  dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
+    stackframe "^1.3.4"
 
 statuses@2.0.1:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  resolved "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
   integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
-  integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
+"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.3.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.3.1.tgz#faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"
-  integrity sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=
+  resolved "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"
+  integrity sha512-wuTCPGlJONk/a1kqZ4fQM2+908lC7fa7nPYpTC1EhnvqLX/IICbeP1OZGDtA374trpSq68YubKUMo8oRhN46yg==
 
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
+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==
+
+stop-iteration-iterator@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz"
+  integrity sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==
+  dependencies:
+    internal-slot "^1.0.4"
 
 stream-throttle@^0.1.3:
   version "0.1.3"
-  resolved "https://registry.yarnpkg.com/stream-throttle/-/stream-throttle-0.1.3.tgz#add57c8d7cc73a81630d31cd55d3961cfafba9c3"
-  integrity sha1-rdV8jXzHOoFjDTHNVdOWHPr7qcM=
+  resolved "https://registry.npmjs.org/stream-throttle/-/stream-throttle-0.1.3.tgz"
+  integrity sha512-889+B9vN9dq7/vLbGyuHeZ6/ctf5sNuGWsDy89uNxkFTAgzy0eK7+w5fL3KLNRTkLle7EgZGvHUphZW0Q26MnQ==
   dependencies:
     commander "^2.2.0"
     limiter "^1.0.5"
 
-streamroller@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.0.4.tgz#27ad87339d829483f89c5f33fd60ea6731e4183c"
-  integrity sha512-GI9NzeD+D88UFuIlJkKNDH/IsuR+qIN7Qh8EsmhoRZr9bQoehTraRgwtLUkZbpcAw+hLPfHOypmppz8YyGK68w==
+streamroller@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.npmjs.org/streamroller/-/streamroller-3.1.5.tgz"
+  integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==
   dependencies:
-    date-format "^4.0.4"
-    debug "^4.3.3"
-    fs-extra "^10.0.1"
+    date-format "^4.0.14"
+    debug "^4.3.4"
+    fs-extra "^8.1.0"
 
-string-replace-loader@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/string-replace-loader/-/string-replace-loader-3.1.0.tgz#11ac6ee76bab80316a86af358ab773193dd57a4f"
-  integrity sha512-5AOMUZeX5HE/ylKDnEa/KKBqvlnFmRZudSOjVJHxhoJg9QYTwl1rECx7SLR8BBH7tfxb4Rp7EM2XVfQFxIhsbQ==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
-"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string.prototype.trimend@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
-  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
+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==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
-string.prototype.trimstart@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
-  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
+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==
   dependencies:
     call-bind "^1.0.2"
-    define-properties "^1.1.3"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
+
+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==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.4"
+    es-abstract "^1.20.4"
 
 string_decoder@^1.1.1:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
   dependencies:
     safe-buffer "~5.2.0"
 
 string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
@@ -12277,219 +11096,131 @@ string_decoder@~1.1.1:
 strip-ansi@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
+  integrity sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==
   dependencies:
     ansi-regex "^2.0.0"
 
 strip-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"
+  integrity sha512-4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow==
   dependencies:
     ansi-regex "^3.0.0"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-ansi@^7.0.0:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-7.0.1.tgz#61740a08ce36b61e50e65653f07060d000975fb2"
-  integrity sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==
-  dependencies:
-    ansi-regex "^6.0.1"
-
 strip-bom@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
-  integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=
+  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz"
+  integrity sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==
 
 strip-final-newline@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"
+  resolved "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz"
   integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==
 
 strip-json-comments@3.1.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
-stylehacks@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.1.0.tgz#a40066490ca0caca04e96c6b02153ddc39913520"
-  integrity sha512-SzLmvHQTrIWfSgljkQCw2++C9+Ne91d/6Sp92I8c5uHTcy/PgeHamwITIbBW9wnFTY/3ZfSXR9HIL6Ikqmcu6Q==
-  dependencies:
-    browserslist "^4.16.6"
-    postcss-selector-parser "^6.0.4"
-
-stylus-loader@6.2.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-6.2.0.tgz#0ba499e744e7fb9d9b3977784c8639728a7ced8c"
-  integrity sha512-5dsDc7qVQGRoc6pvCL20eYgRUxepZ9FpeK28XhdXaIPP6kXr6nI1zAAKFQgP5OBkOfKaURp4WUpJzspg1f01Gg==
-  dependencies:
-    fast-glob "^3.2.7"
-    klona "^2.0.4"
-    normalize-path "^3.0.0"
-
-stylus@0.56.0:
-  version "0.56.0"
-  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.56.0.tgz#13fc85c48082db483c90d2530942fe8b0be988eb"
-  integrity sha512-Ev3fOb4bUElwWu4F9P9WjnnaSpc8XB9OFHSFZSKMFL1CE1oM+oFXWEgAqPmmZIyhBihuqIQlFsVTypiiS9RxeA==
-  dependencies:
-    css "^3.0.0"
-    debug "^4.3.2"
-    glob "^7.1.6"
-    safer-buffer "^2.1.2"
-    sax "~1.2.4"
-    source-map "^0.7.3"
-
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
+  integrity sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==
 
 supports-color@^5.3.0, supports-color@^5.4.0, supports-color@^5.5.0:
   version "5.5.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-color@^8.0.0, supports-color@^8.1.1:
   version "8.1.1"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz"
   integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
     has-flag "^4.0.0"
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-svgo@^2.7.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24"
-  integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==
-  dependencies:
-    "@trysound/sax" "0.2.0"
-    commander "^7.2.0"
-    css-select "^4.1.3"
-    css-tree "^1.1.3"
-    csso "^4.2.0"
-    picocolors "^1.0.0"
-    stable "^0.1.8"
-
-symbol-observable@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4"
-  integrity sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
-
 symbol-observable@4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
+  resolved "https://registry.npmjs.org/symbol-observable/-/symbol-observable-4.0.0.tgz"
   integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
 
 symbol-tree@^3.2.4:
   version "3.2.4"
-  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
+  resolved "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-tapable@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
-  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
-
 tapable@^2.1.1, tapable@^2.2.0:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  resolved "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz"
   integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
 
-tar@^6.0.2, tar@^6.1.0, tar@^6.1.2:
-  version "6.1.11"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
-  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
+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==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
-    minipass "^3.0.0"
+    minipass "^4.0.0"
     minizlib "^2.1.1"
     mkdirp "^1.0.3"
     yallist "^4.0.0"
 
-terser-webpack-plugin@^2.3.1:
-  version "2.3.8"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz#894764a19b0743f2f704e7c2a848c5283a696724"
-  integrity sha512-/fKw3R+hWyHfYx7Bv6oPqmk4HGQcrWLtV3X6ggvPuwPNHSnzvVV51z6OaaCOus4YLjutYGOz3pEpbhe6Up2s1w==
-  dependencies:
-    cacache "^13.0.1"
-    find-cache-dir "^3.3.1"
-    jest-worker "^25.4.0"
-    p-limit "^2.3.0"
-    schema-utils "^2.6.6"
-    serialize-javascript "^4.0.0"
-    source-map "^0.6.1"
-    terser "^4.6.12"
-    webpack-sources "^1.4.3"
-
 terser-webpack-plugin@^5.1.3:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.1.tgz#0320dcc270ad5372c1e8993fabbd927929773e54"
-  integrity sha512-GvlZdT6wPQKbDNW/GDQzZFg/j4vKU96yl2q6mcUkzKOgW4gwf1Z8cZToUCrz31XHlPWH8MVb1r2tFtdDtTGJ7g==
+  version "5.3.7"
+  resolved "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.7.tgz"
+  integrity sha512-AfKwIktyP7Cu50xNjXF/6Qb5lBNzYaWpU6YfoX3uZicTx0zTy0stDDCsvjDapKsSDvOeWo5MEq4TmdBy2cNoHw==
   dependencies:
+    "@jridgewell/trace-mapping" "^0.3.17"
     jest-worker "^27.4.5"
     schema-utils "^3.1.1"
-    serialize-javascript "^6.0.0"
-    source-map "^0.6.1"
-    terser "^5.7.2"
+    serialize-javascript "^6.0.1"
+    terser "^5.16.5"
 
-terser@5.11.0:
-  version "5.11.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.11.0.tgz#2da5506c02e12cd8799947f30ce9c5b760be000f"
-  integrity sha512-uCA9DLanzzWSsN1UirKwylhhRz3aKPInlfmpGfw8VN6jHsAtu8HJtIpeeHHK23rxnE/cDc+yvmq5wqkIC6Kn0A==
+terser@5.16.3:
+  version "5.16.3"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.16.3.tgz"
+  integrity sha512-v8wWLaS/xt3nE9dgKEWhNUFP6q4kngO5B8eYFUuebsu7Dw/UNAnpUod6UHo04jSSkv8TzKHjZDSd7EXdDQAl8Q==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
-terser@^4.6.12, terser@^4.6.3:
-  version "4.8.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.1.tgz#a00e5634562de2239fd404c649051bf6fc21144f"
-  integrity sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
-terser@^5.7.2:
-  version "5.12.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.12.0.tgz#728c6bff05f7d1dcb687d8eace0644802a9dae8a"
-  integrity sha512-R3AUhNBGWiFc77HXag+1fXpAxTAFRQTJemlJKjAgD9r8xXTpjNKqIXwHM/o7Rh+O0kUJtS3WQVdBeMKFk5sw9A==
+terser@^5.16.5:
+  version "5.16.9"
+  resolved "https://registry.npmjs.org/terser/-/terser-5.16.9.tgz"
+  integrity sha512-HPa/FdTB9XGI2H1/keLFZHxl6WNvAI4YalHGtDQTlMnJcoqSab1UwL4l1hGEhs6/GmLHBZIg/YgB++jcbzoOEg==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
     acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
     source-map-support "~0.5.20"
 
 test-exclude@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.yarnpkg.com/test-exclude/-/test-exclude-6.0.0.tgz#04a8698661d805ea6fa293b6cb9e63ac044ef15e"
+  resolved "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz"
   integrity sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==
   dependencies:
     "@istanbuljs/schema" "^0.1.2"
@@ -12498,159 +11229,110 @@ test-exclude@^6.0.0:
 
 text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
-
-tfunk@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tfunk/-/tfunk-4.0.0.tgz#de9399feaf2060901d590b7faad80fcd5443077e"
-  integrity sha512-eJQ0dGfDIzWNiFNYFVjJ+Ezl/GmwHaFTBTjrtqNPW0S7cuVDBrZrmzUz6VkMeCR4DZFqhd4YtLwsw3i2wYHswQ==
-  dependencies:
-    chalk "^1.1.3"
-    dlv "^1.1.3"
-
-thenby@^1.3.4:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/thenby/-/thenby-1.3.4.tgz#81581f6e1bb324c6dedeae9bfc28e59b1a2201cc"
-  integrity sha512-89Gi5raiWA3QZ4b2ePcEwswC3me9JIg+ToSgtE0JWeCynLnLxNr/f9G+xfo9K+Oj4AFdom8YNJjibIARTJmapQ==
+  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 throttle-debounce@^2.1.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/throttle-debounce/-/throttle-debounce-2.3.0.tgz#fd31865e66502071e411817e241465b3e9c372e2"
+  resolved "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-2.3.0.tgz"
   integrity sha512-H7oLPV0P7+jgvrk+6mwwwBDmxTaxnu9HMXmloNLXwnNO0ZxZ31Orah2n8lU1eMPvsaowP2CX+USCgyovXfdOFQ==
 
 throttleit@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
-  integrity sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=
+  resolved "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz"
+  integrity sha512-rkTVqu6IjfQ/6+uNuuc3sZek4CEYxTJom3IktzgdSxcZqdARuebbA/f4QmAxMQIxqq9ZLEUkSYqvuk1I6VKq4g==
 
 through@^2.3.6, through@^2.3.8:
   version "2.3.8"
-  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 thunky@^1.0.2:
   version "1.1.0"
-  resolved "https://registry.yarnpkg.com/thunky/-/thunky-1.1.0.tgz#5abaf714a9405db0504732bbccd2cedd9ef9537d"
+  resolved "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz"
   integrity sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==
 
-timsort@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
-  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
-
 tiny-invariant@^1.0.6:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tiny-invariant/-/tiny-invariant-1.2.0.tgz#a1141f86b672a9148c72e978a19a73b9b94a15a9"
-  integrity sha512-1Uhn/aqw5C6RI4KejVeTg6mIS7IqxnLJ8Mv2tV5rTc0qWobay7pDUz6Wi392Cnc8ak1H0F2cjoRzb2/AW4+Fvg==
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz"
+  integrity sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==
 
 tiny-warning@^1.0.2:
   version "1.0.3"
-  resolved "https://registry.yarnpkg.com/tiny-warning/-/tiny-warning-1.0.3.tgz#94a30db453df4c643d0fd566060d60a875d84754"
+  resolved "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz"
   integrity sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==
 
-tmp@0.0.30:
-  version "0.0.30"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.30.tgz#72419d4a8be7d6ce75148fd8b324e593a711c2ed"
-  integrity sha1-ckGdSovn1s51FI/YsyTlk6cRwu0=
-  dependencies:
-    os-tmpdir "~1.0.1"
-
 tmp@0.2.1, tmp@^0.2.1, tmp@~0.2.1:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz"
   integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
   dependencies:
     rimraf "^3.0.0"
 
 tmp@^0.0.33:
   version "0.0.33"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
+  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-array@0.1.4:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
-  integrity sha1-F+bBH3PdTz10zaek/zI46a2b+JA=
-
 to-fast-properties@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/to-object-path/-/to-object-path-0.3.0.tgz#297588b7b0e7e0ac08e04e672f85c1f4999e17af"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-readable-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/to-readable-stream/-/to-readable-stream-1.0.0.tgz#ce0aa0c2f3df6adf852efb404a783e77c0475771"
-  integrity sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
+  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
+  integrity sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==
 
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
-  dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
 toggle-selection@^1.0.6:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/toggle-selection/-/toggle-selection-1.0.6.tgz#6e45b1263f2017fa0acc7d89d78b15b8bf77da32"
-  integrity sha1-bkWxJj8gF/oKzH2J14sVuL932jI=
+  resolved "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz"
+  integrity sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==
 
 toidentifier@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  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.yarnpkg.com/totalist/-/totalist-1.1.0.tgz#a4d65a3e546517701e3e5c37a47a70ac97fe56df"
+  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.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
+  resolved "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz"
   integrity sha512-WBx8Uy5TLtOSRtIq+M03/sKDrXCLHxwDcquSP2c43Le03/9serjQBIztjRz6FkJez9D/hleyAXTBGLwwZUw9lA==
   dependencies:
     nopt "~1.0.10"
 
-tough-cookie@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.0.0.tgz#d822234eeca882f991f0f908824ad2622ddbece4"
-  integrity sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==
+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==
   dependencies:
     psl "^1.1.33"
     punycode "^2.1.1"
-    universalify "^0.1.2"
+    universalify "^0.2.0"
+    url-parse "^1.5.3"
+
+tough-cookie@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-4.1.3.tgz#97b9adb0728b42280aa3d814b6b999b2ff0318bf"
+  integrity sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==
+  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.yarnpkg.com/tough-cookie/-/tough-cookie-2.5.0.tgz#cd9fb2a0aa1d5a12b473bd9fb96fa3dcff65ade2"
+  resolved "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz"
   integrity sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==
   dependencies:
     psl "^1.1.28"
@@ -12658,39 +11340,28 @@ tough-cookie@~2.5.0:
 
 tr46@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.1.0.tgz#fa87aa81ca5d5941da8cbf1f9b749dc969a4e240"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz"
   integrity sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==
   dependencies:
     punycode "^2.1.1"
 
 tr46@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-3.0.0.tgz#555c4e297a950617e8eeddef633c87d4d9d6cbf9"
+  resolved "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz"
   integrity sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==
   dependencies:
     punycode "^2.1.1"
 
 tr46@~0.0.3:
   version "0.0.3"
-  resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a"
-  integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
+  resolved "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"
+  integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==
 
 tree-kill@1.2.2, tree-kill@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.2.tgz#4ca09a9092c88b73a7cdc5e8a01b507b0790a0cc"
+  resolved "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz"
   integrity sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==
 
-ts-loader@^5.2.0:
-  version "5.4.5"
-  resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-5.4.5.tgz#a0c1f034b017a9344cef0961bfd97cc192492b8b"
-  integrity sha512-XYsjfnRQCBum9AMRZpk2rTYSVpdZBpZK+kDh0TeT3kxmQNBDVIeUjdPjY5RZry4eIAb8XHc4gYSUiUWPYvzSRw==
-  dependencies:
-    chalk "^2.3.0"
-    enhanced-resolve "^4.0.0"
-    loader-utils "^1.0.2"
-    micromatch "^3.1.4"
-    semver "^5.0.1"
-
 ts-node@10.2.1, ts-node@^10.0.0:
   version "10.2.1"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.2.1.tgz#4cc93bea0a7aba2179497e65bb08ddfc198b3ab5"
@@ -12711,7 +11382,7 @@ ts-node@10.2.1, ts-node@^10.0.0:
 
 ts-node@^8.10.2:
   version "8.10.2"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-8.10.2.tgz#eee03764633b1234ddd37f8db9ec10b75ec7fb8d"
+  resolved "https://registry.npmjs.org/ts-node/-/ts-node-8.10.2.tgz"
   integrity sha512-ISJJGgkIpDdBhWVu3jufsWpK3Rzo7bdiIXJjQc0ynKxVOVcg2oIrf2H2cejminGrptVc6q6/uynAHNCuWGbpVA==
   dependencies:
     arg "^4.1.0"
@@ -12720,368 +11391,358 @@ ts-node@^8.10.2:
     source-map-support "^0.5.17"
     yn "3.1.1"
 
-tsconfig-paths@^3.12.0:
-  version "3.14.1"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
-  integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==
+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==
   dependencies:
     "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
+    json5 "^1.0.2"
     minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tsconfig-paths@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.12.0.tgz#19769aca6ee8f6a1a341e38c8fa45dd9fb18899b"
-  integrity sha512-e5adrnOYT6zqVnWqZu7i/BQ3BnhzvGbjEjejFXO20lKIKpwTaupkCPgEfv4GZK1IBciJUEhYs3J3p75FdaTFVg==
+tsconfig-paths@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz"
+  integrity sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==
   dependencies:
-    "@types/json5" "^0.0.29"
-    json5 "^1.0.1"
-    minimist "^1.2.0"
+    json5 "^2.2.2"
+    minimist "^1.2.6"
     strip-bom "^3.0.0"
 
-tslib@2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
-  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
-
-tslib@2.3.1, tslib@^2.0.0, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.3.1:
+tslib@2.3.1:
   version "2.3.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  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:
+  version "2.5.0"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-2.5.0.tgz"
+  integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
+
 tslib@^1.8.1, tslib@^1.9.0:
   version "1.14.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
+  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.2.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3"
-  integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==
+tsutils-etc@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/tsutils-etc/-/tsutils-etc-1.4.2.tgz#6d6a9f33aa61867d832e4a455b2cebb6b104ebfa"
+  integrity sha512-2Dn5SxTDOu6YWDNKcx1xu2YUy6PUeKrWZB/x2cQ8vY2+iz3JRembKn/iZ0JLT1ZudGNwQQvtFX9AwvRHbXuPUg==
+  dependencies:
+    "@types/yargs" "^17.0.0"
+    yargs "^17.0.0"
 
-tsutils@^3.21.0:
+tsutils@^3.0.0, tsutils@^3.17.1, tsutils@^3.21.0:
   version "3.21.0"
-  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  resolved "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz"
   integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
   dependencies:
     tslib "^1.8.1"
 
+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.4"
+    debug "^4.3.4"
+    make-fetch-happen "^11.1.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
-  integrity sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=
+  resolved "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"
+  integrity sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==
   dependencies:
     safe-buffer "^5.0.1"
 
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
-  resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
-  integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
+  resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"
+  integrity sha512-KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==
 
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
   integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
     prelude-ls "^1.2.1"
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
 type-fest@^0.20.2:
   version "0.20.2"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-fest@^0.21.3:
   version "0.21.3"
-  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  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.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  resolved "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     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==
+  dependencies:
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    is-typed-array "^1.1.9"
+
 typed-assert@^1.0.8:
   version "1.0.9"
-  resolved "https://registry.yarnpkg.com/typed-assert/-/typed-assert-1.0.9.tgz#8af9d4f93432c4970ec717e3006f33f135b06213"
+  resolved "https://registry.npmjs.org/typed-assert/-/typed-assert-1.0.9.tgz"
   integrity sha512-KNNZtayBCtmnNmbo5mG47p1XsCyrx6iVqomjcZnec/1Y5GGARaxPs6r49RnSPeUP3YjNYiU9sQHAtY4BBvnZwg==
 
-typedarray-to-buffer@^3.1.5:
-  version "3.1.5"
-  resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz#a97ee7a9ff42691b9f783ff1bc5112fe3fca9080"
-  integrity sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==
-  dependencies:
-    is-typedarray "^1.0.0"
-
 typescript-compare@^0.0.2:
   version "0.0.2"
-  resolved "https://registry.yarnpkg.com/typescript-compare/-/typescript-compare-0.0.2.tgz#7ee40a400a406c2ea0a7e551efd3309021d5f425"
+  resolved "https://registry.npmjs.org/typescript-compare/-/typescript-compare-0.0.2.tgz"
   integrity sha512-8ja4j7pMHkfLJQO2/8tut7ub+J3Lw2S3061eJLFQcvs3tsmJKp8KG5NtpLn7KcY2w08edF74BSVN7qJS0U6oHA==
   dependencies:
     typescript-logic "^0.0.0"
 
 typescript-logic@^0.0.0:
   version "0.0.0"
-  resolved "https://registry.yarnpkg.com/typescript-logic/-/typescript-logic-0.0.0.tgz#66ebd82a2548f2b444a43667bec120b496890196"
+  resolved "https://registry.npmjs.org/typescript-logic/-/typescript-logic-0.0.0.tgz"
   integrity sha512-zXFars5LUkI3zP492ls0VskH3TtdeHCqu0i7/duGt60i5IGPIpAHE/DWo5FqJ6EjQ15YKXrt+AETjv60Dat34Q==
 
 typescript-tuple@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.yarnpkg.com/typescript-tuple/-/typescript-tuple-2.2.1.tgz#7d9813fb4b355f69ac55032e0363e8bb0f04dad2"
+  resolved "https://registry.npmjs.org/typescript-tuple/-/typescript-tuple-2.2.1.tgz"
   integrity sha512-Zcr0lbt8z5ZdEzERHAMAniTiIKerFCMgd7yjq1fPnDJ43et/k9twIFQMUYff9k5oXcsQ0WpvFcgzK2ZKASoW6Q==
   dependencies:
     typescript-compare "^0.0.2"
 
 typescript@^2.5.0:
   version "2.9.2"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
-typescript@^4.5.3:
-  version "4.6.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c"
-  integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw==
-
-typescript@~4.5.5:
-  version "4.5.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.5.tgz#d8c953832d28924a9e3d37c73d729c846c5896f3"
-  integrity sha512-TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA==
-
-ua-parser-js@1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.2.tgz#e2976c34dbfb30b15d2c300b2a53eac87c57a775"
-  integrity sha512-00y/AXhx0/SsnI51fTc0rLRmafiGOM4/O+ny10Ps7f+j/b8p/ZY11ytMgznXkOVo4GQ+KwQG5UQLkLGirsACRg==
+typescript@~4.8.4:
+  version "4.8.4"
+  resolved "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz"
+  integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==
 
 ua-parser-js@^0.7.30:
-  version "0.7.31"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.31.tgz#649a656b191dffab4f21d5e053e27ca17cbff5c6"
-  integrity sha512-qLK/Xe9E2uzmYI3qLeOmI0tEOt+TBBQyUIAh4aAgU05FVYzeZrKUdkAZfBNVGRaHVgV0TDkdEngJSw/SyQchkQ==
+  version "0.7.35"
+  resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.35.tgz"
+  integrity sha512-veRf7dawaj9xaWEu9HoTVn5Pggtc/qj+kqTOFvNiN1l0YdxwC1kvel57UCjThjGa3BHBihE8/UJAHI+uQHmd/g==
+
+ua-parser-js@^1.0.33:
+  version "1.0.35"
+  resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz"
+  integrity sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==
 
 uc.micro@^1.0.1, uc.micro@^1.0.5:
   version "1.0.6"
-  resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.6.tgz#9c411a802a409a91fc6cf74081baba34b24499ac"
+  resolved "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz"
   integrity sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==
 
-unbox-primitive@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
-  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+unbox-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz"
+  integrity sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==
   dependencies:
-    function-bind "^1.1.1"
-    has-bigints "^1.0.1"
-    has-symbols "^1.0.2"
+    call-bind "^1.0.2"
+    has-bigints "^1.0.2"
+    has-symbols "^1.0.3"
     which-boxed-primitive "^1.0.2"
 
 undefsafe@^2.0.5:
   version "2.0.5"
-  resolved "https://registry.yarnpkg.com/undefsafe/-/undefsafe-2.0.5.tgz#38733b9327bdcd226db889fb723a6efd162e6e2c"
+  resolved "https://registry.npmjs.org/undefsafe/-/undefsafe-2.0.5.tgz"
   integrity sha512-WxONCrssBM8TSPRqN5EmsjVrsv4A8X12J4ArBiiayv3DyyG3ZlIg6yysuuSYdZsVz3TKcTg2fd//Ujd4CHV1iA==
 
 unfetch@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/unfetch/-/unfetch-4.2.0.tgz#7e21b0ef7d363d8d9af0fb929a5555f6ef97a3be"
+  resolved "https://registry.npmjs.org/unfetch/-/unfetch-4.2.0.tgz"
   integrity sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==
 
 unicode-canonical-property-names-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz#301acdc525631670d39f6146e0e77ff6bbdebddc"
+  resolved "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz"
   integrity sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==
 
 unicode-match-property-ecmascript@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz#54fd16e0ecb167cf04cf1f756bdcc92eba7976c3"
+  resolved "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz"
   integrity sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==
   dependencies:
     unicode-canonical-property-names-ecmascript "^2.0.0"
     unicode-property-aliases-ecmascript "^2.0.0"
 
-unicode-match-property-value-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz#1a01aa57247c14c568b89775a54938788189a714"
-  integrity sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==
+unicode-match-property-value-ecmascript@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.1.0.tgz"
+  integrity sha512-qxkjQt6qjg/mYscYMC0XKRn3Rh0wFPlfxB0xkt9CfyTvpX1Ra0+rAmdX2QyAobptSEvuy4RtpPRui6XkV+8wjA==
 
 unicode-property-aliases-ecmascript@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz#0a36cb9a585c4f6abd51ad1deddb285c165297c8"
-  integrity sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==
-
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
+  version "2.1.0"
+  resolved "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.1.0.tgz"
+  integrity sha512-6t3foTQI9qne+OZoVQB/8x8rk2k1eVy1gRXhV3oFQ5T6R1dqQ1xtin3XqSlx3+ATBkliTaR/hHyJBm+LVPNM8w==
 
 unique-filename@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz"
   integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
   dependencies:
     unique-slug "^2.0.0"
 
+unique-filename@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz"
+  integrity sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==
+  dependencies:
+    unique-slug "^3.0.0"
+
+unique-filename@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz"
+  integrity sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==
+  dependencies:
+    unique-slug "^4.0.0"
+
 unique-slug@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.2.tgz#baabce91083fc64e945b0f3ad613e264f7cd4e6c"
+  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz"
   integrity sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==
   dependencies:
     imurmurhash "^0.1.4"
 
-unique-string@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-2.0.0.tgz#39c6451f81afb2749de2b233e3f7c5e8843bd89d"
-  integrity sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==
+unique-slug@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz"
+  integrity sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==
   dependencies:
-    crypto-random-string "^2.0.0"
+    imurmurhash "^0.1.4"
 
-universalify@^0.1.0, universalify@^0.1.2:
+unique-slug@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz"
+  integrity sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==
+  dependencies:
+    imurmurhash "^0.1.4"
+
+universalify@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz"
   integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
 
+universalify@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz"
+  integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==
+
 universalify@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717"
+  resolved "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"
   integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==
 
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
+  resolved "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 untildify@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/untildify/-/untildify-4.0.0.tgz#2bc947b953652487e4600949fb091e3ae8cd919b"
+  resolved "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz"
   integrity sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
 
-update-notifier@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-5.1.0.tgz#4ab0d7c7f36a231dd7316cf7729313f0214d9ad9"
-  integrity sha512-ItnICHbeMh9GqUy31hFPrD1kcuZ3rpxDZbf4KUDavXwS0bW5m7SLbDQpGX3UYr072cbrF5hFUs3r5tUsPwjfHw==
+update-browserslist-db@^1.0.10:
+  version "1.0.10"
+  resolved "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.10.tgz"
+  integrity sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==
   dependencies:
-    boxen "^5.0.0"
-    chalk "^4.1.0"
-    configstore "^5.0.1"
-    has-yarn "^2.1.0"
-    import-lazy "^2.1.0"
-    is-ci "^2.0.0"
-    is-installed-globally "^0.4.0"
-    is-npm "^5.0.0"
-    is-yarn-global "^0.3.0"
-    latest-version "^5.1.0"
-    pupa "^2.1.1"
-    semver "^7.3.4"
-    semver-diff "^3.1.1"
-    xdg-basedir "^4.0.0"
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
 
 uri-js@^4.2.2:
   version "4.4.1"
-  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
-urix@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-url-parse-lax@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
-  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
-  dependencies:
-    prepend-http "^2.0.0"
-
-url-parse@^1.5.6:
+url-parse@^1.5.3:
   version "1.5.10"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.10.tgz#9d3c2f736c1d75dd3bd2be507dcc111f1e2ea9c1"
+  resolved "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz"
   integrity sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
 use-memo-one@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.2.tgz#0c8203a329f76e040047a35a1197defe342fab20"
-  integrity sha512-u2qFKtxLsia/r8qG0ZKkbytbztzRb317XCkT7yP8wxL0tZ/CzK2G+WWie5vWvpyeP7+YoPIwbJoIHJ4Ba4k0oQ==
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+  version "1.1.3"
+  resolved "https://registry.npmjs.org/use-memo-one/-/use-memo-one-1.1.3.tgz"
+  integrity sha512-g66/K7ZQGYrI6dy8GLpVcMsBp4s17xNkYJVSMvTEevGy3nDxHOfE6z8BVE22+5G5x7t3+bhzrlTDB7ObrEE0cQ==
 
 util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 utils-merge@1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
-
-uuid@8.3.2, uuid@^8.1.0, uuid@^8.3.2:
-  version "8.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
-  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
-
-uuid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
+  resolved "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 uuid@^3.2.1, uuid@^3.3.2:
   version "3.4.0"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-v8-compile-cache@2.3.0, v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+uuid@^8.1.0, uuid@^8.3.2:
+  version "8.3.2"
+  resolved "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
 
 valid-data-url@^3.0.0:
   version "3.0.1"
-  resolved "https://registry.yarnpkg.com/valid-data-url/-/valid-data-url-3.0.1.tgz#826c1744e71b5632e847dd15dbd45b9fb38aa34f"
+  resolved "https://registry.npmjs.org/valid-data-url/-/valid-data-url-3.0.1.tgz"
   integrity sha512-jOWVmzVceKlVVdwjNSenT4PbGghU0SBIizAev8ofZVgivk/TVHXSbNL8LP6M3spZvkR9/QolkyJavGSX5Cs0UA==
 
-validate-npm-package-name@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz#5fa912d81eb7d0c74afc140de7317f0ca7df437e"
-  integrity sha1-X6kS2B630MdK/BQN5zF/DKffQ34=
+validate-npm-package-license@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
+  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
   dependencies:
-    builtins "^1.0.3"
+    spdx-correct "^3.0.0"
+    spdx-expression-parse "^3.0.0"
+
+validate-npm-package-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz"
+  integrity sha512-YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==
+  dependencies:
+    builtins "^5.0.0"
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+  resolved "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 verror@1.10.0:
   version "1.10.0"
-  resolved "https://registry.yarnpkg.com/verror/-/verror-1.10.0.tgz#3a105ca17053af55d6e270c1f8288682e18da400"
-  integrity sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
+  resolved "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"
+  integrity sha512-ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw==
   dependencies:
     assert-plus "^1.0.0"
     core-util-is "1.0.2"
@@ -13089,60 +11750,60 @@ verror@1.10.0:
 
 void-elements@3.1.0:
   version "3.1.0"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"
-  integrity sha1-YU9/v42AHwu18GYfWy9XhXUOTwk=
+  resolved "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"
+  integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==
 
 void-elements@^2.0.0:
   version "2.0.1"
-  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
-  integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
+  resolved "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"
+  integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
 
 w3c-hr-time@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  resolved "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz"
   integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
     browser-process-hrtime "^1.0.0"
 
 w3c-xmlserializer@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz#3e7104a05b75146cc60f564380b7f683acf1020a"
+  resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"
   integrity sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==
   dependencies:
     xml-name-validator "^3.0.0"
 
-w3c-xmlserializer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-3.0.0.tgz#06cdc3eefb7e4d0b20a560a5a3aeb0d2d9a65923"
-  integrity sha512-3WFqGEgSXIyGhOmAFtlicJNMjEps8b1MG31NCA0/vOF9+nKMUW1ckhi9cnNHmf88Rzw5V+dwIwsm2C7X8k9aQg==
+w3c-xmlserializer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz"
+  integrity sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==
   dependencies:
     xml-name-validator "^4.0.0"
 
-watchpack@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.3.1.tgz#4200d9447b401156eeca7767ee610f8809bc9d25"
-  integrity sha512-x0t0JuydIo8qCNctdDrn1OzH/qDzk2+rdCOC3YzumZ42fiMqmQ7T3xQurykYMhYfHaPHTp4ZxAx2NfUo1K6QaA==
+watchpack@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.npmjs.org/watchpack/-/watchpack-2.4.0.tgz"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
 
 wbuf@^1.1.0, wbuf@^1.7.3:
   version "1.7.3"
-  resolved "https://registry.yarnpkg.com/wbuf/-/wbuf-1.7.3.tgz#c1d8d149316d3ea852848895cb6a0bfe887b87df"
+  resolved "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz"
   integrity sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==
   dependencies:
     minimalistic-assert "^1.0.0"
 
 wcwidth@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"
-  integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=
+  resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"
+  integrity sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==
   dependencies:
     defaults "^1.0.3"
 
 web-resource-inliner@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.yarnpkg.com/web-resource-inliner/-/web-resource-inliner-6.0.1.tgz#df0822f0a12028805fe80719ed52ab6526886e02"
+  resolved "https://registry.npmjs.org/web-resource-inliner/-/web-resource-inliner-6.0.1.tgz"
   integrity sha512-kfqDxt5dTB1JhqsCUQVFDj0rmY+4HLwGQIsLPbyrsN9y9WV/1oFDSx3BQ4GfCv9X+jVeQ7rouTqwK53rA/7t8A==
   dependencies:
     ansi-colors "^4.1.1"
@@ -13152,20 +11813,12 @@ web-resource-inliner@^6.0.1:
     node-fetch "^2.6.0"
     valid-data-url "^3.0.0"
 
-webdriver-js-extender@2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/webdriver-js-extender/-/webdriver-js-extender-2.1.0.tgz#57d7a93c00db4cc8d556e4d3db4b5db0a80c3bb7"
-  integrity sha512-lcUKrjbBfCK6MNsh7xaY2UAUmZwe+/ib03AjVOpFobX4O7+83BUveSrLfU0Qsyb1DaKJdQRbuU+kM9aZ6QUhiQ==
+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:
-    "@types/selenium-webdriver" "^3.0.0"
-    selenium-webdriver "^3.0.1"
-
-webdriver-manager@^12.1.7, webdriver-manager@^12.1.8:
-  version "12.1.8"
-  resolved "https://registry.yarnpkg.com/webdriver-manager/-/webdriver-manager-12.1.8.tgz#5e70e73eaaf53a0767d5745270addafbc5905fd4"
-  integrity sha512-qJR36SXG2VwKugPcdwhaqcLQOD7r8P2Xiv9sfNbfZrKBnX243iAkOueX1yAmeNgIKhJ3YAT/F2gq6IiEZzahsg==
-  dependencies:
-    adm-zip "^0.4.9"
+    adm-zip "^0.5.2"
     chalk "^1.1.1"
     del "^2.2.0"
     glob "^7.0.3"
@@ -13179,34 +11832,35 @@ webdriver-manager@^12.1.7, webdriver-manager@^12.1.8:
 
 webfontloader@1.6.28:
   version "1.6.28"
-  resolved "https://registry.yarnpkg.com/webfontloader/-/webfontloader-1.6.28.tgz#db786129253cb6e8eae54c2fb05f870af6675bae"
-  integrity sha1-23hhKSU8tujq5UwvsF+HCvZnW64=
+  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.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"
-  integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE=
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz"
+  integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==
 
 webidl-conversions@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz"
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
 webidl-conversions@^6.1.0:
   version "6.1.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
 
 webidl-conversions@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a"
+  resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz"
   integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==
 
-webpack-bundle-analyzer@^4.4.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.5.0.tgz#1b0eea2947e73528754a6f9af3e91b2b6e0f79d5"
-  integrity sha512-GUMZlM3SKwS8Z+CKeIFx7CVoHn3dXFcUAjT/dcZQQmfSZGvitPfMob2ipjai7ovFFqPvTqkEZ/leL4O0YOdAYQ==
+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"
@@ -13218,119 +11872,119 @@ webpack-bundle-analyzer@^4.4.0:
     ws "^7.3.1"
 
 webpack-cli@^4.2.0:
-  version "4.9.2"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.9.2.tgz#77c1adaea020c3f9e2db8aad8ea78d235c83659d"
-  integrity sha512-m3/AACnBBzK/kMTcxWHcZFPrw/eQuY4Df1TxvIWfWM2x7mRqBQCqKEd96oCUa9jkapLBaFfRce33eGDb4Pr7YQ==
+  version "4.10.0"
+  resolved "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz"
+  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
   dependencies:
     "@discoveryjs/json-ext" "^0.5.0"
-    "@webpack-cli/configtest" "^1.1.1"
-    "@webpack-cli/info" "^1.4.1"
-    "@webpack-cli/serve" "^1.6.1"
+    "@webpack-cli/configtest" "^1.2.0"
+    "@webpack-cli/info" "^1.5.0"
+    "@webpack-cli/serve" "^1.7.0"
     colorette "^2.0.14"
     commander "^7.0.0"
-    execa "^5.0.0"
+    cross-spawn "^7.0.3"
     fastest-levenshtein "^1.0.12"
     import-local "^3.0.2"
     interpret "^2.2.0"
     rechoir "^0.7.0"
     webpack-merge "^5.7.3"
 
-webpack-dev-middleware@5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.0.tgz#8fc02dba6e72e1d373eca361623d84610f27be7c"
-  integrity sha512-MouJz+rXAm9B1OTOYaJnn6rtD/lWZPy2ufQCH3BPs8Rloh/Du6Jze4p7AeLYHkVi0giJnYLaSGDC7S+GM9arhg==
+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==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.2.2"
+    memfs "^3.4.12"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-middleware@^5.3.0, webpack-dev-middleware@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.3.1.tgz#aa079a8dedd7e58bfeab358a9af7dab304cee57f"
-  integrity sha512-81EujCKkyles2wphtdrnPg/QqegC/AtqNH//mQkBYSMqwFVCQrxM6ktB2O/SPlZy7LqeEfTbV3cZARGQz6umhg==
+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==
   dependencies:
     colorette "^2.0.10"
-    memfs "^3.4.1"
+    memfs "^3.4.3"
     mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^4.0.0"
 
-webpack-dev-server@4.7.3:
-  version "4.7.3"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.3.tgz#4e995b141ff51fa499906eebc7906f6925d0beaa"
-  integrity sha512-mlxq2AsIw2ag016nixkzUkdyOE8ST2GTy34uKSABp1c4nhjZvH90D5ZRR+UOLSsG4Z3TFahAi72a3ymRtfRm+Q==
-  dependencies:
-    "@types/bonjour" "^3.5.9"
-    "@types/connect-history-api-fallback" "^1.3.5"
-    "@types/serve-index" "^1.9.1"
-    "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.2.2"
-    ansi-html-community "^0.0.8"
-    bonjour "^3.5.0"
-    chokidar "^3.5.2"
-    colorette "^2.0.10"
-    compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
-    default-gateway "^6.0.3"
-    del "^6.0.0"
-    express "^4.17.1"
-    graceful-fs "^4.2.6"
-    html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.0"
-    ipaddr.js "^2.0.1"
-    open "^8.0.9"
-    p-retry "^4.5.0"
-    portfinder "^1.0.28"
-    schema-utils "^4.0.0"
-    selfsigned "^2.0.0"
-    serve-index "^1.9.1"
-    sockjs "^0.3.21"
-    spdy "^4.0.2"
-    strip-ansi "^7.0.0"
-    webpack-dev-middleware "^5.3.0"
-    ws "^8.1.0"
-
-webpack-dev-server@^4.5.0:
-  version "4.7.4"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-4.7.4.tgz#d0ef7da78224578384e795ac228d8efb63d5f945"
-  integrity sha512-nfdsb02Zi2qzkNmgtZjkrMOcXnYZ6FLKcQwpxT7MvmHKc+oTtDsBju8j+NMyAygZ9GW1jMEUpy3itHtqgEhe1A==
+webpack-dev-server@4.11.1:
+  version "4.11.1"
+  resolved "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.11.1.tgz"
+  integrity sha512-lILVz9tAUy1zGFwieuaQtYiadImb5M3d+H+L1zDYalYoDl0cksAB1UNyuE5MMWJrG6zR1tXkCP2fitl7yoUJiw==
   dependencies:
     "@types/bonjour" "^3.5.9"
     "@types/connect-history-api-fallback" "^1.3.5"
     "@types/express" "^4.17.13"
     "@types/serve-index" "^1.9.1"
+    "@types/serve-static" "^1.13.10"
     "@types/sockjs" "^0.3.33"
-    "@types/ws" "^8.2.2"
+    "@types/ws" "^8.5.1"
     ansi-html-community "^0.0.8"
-    bonjour "^3.5.0"
+    bonjour-service "^1.0.11"
     chokidar "^3.5.3"
     colorette "^2.0.10"
     compression "^1.7.4"
-    connect-history-api-fallback "^1.6.0"
+    connect-history-api-fallback "^2.0.0"
     default-gateway "^6.0.3"
-    del "^6.0.0"
-    express "^4.17.1"
+    express "^4.17.3"
     graceful-fs "^4.2.6"
     html-entities "^2.3.2"
-    http-proxy-middleware "^2.0.0"
+    http-proxy-middleware "^2.0.3"
     ipaddr.js "^2.0.1"
     open "^8.0.9"
     p-retry "^4.5.0"
-    portfinder "^1.0.28"
+    rimraf "^3.0.2"
     schema-utils "^4.0.0"
-    selfsigned "^2.0.0"
+    selfsigned "^2.1.1"
     serve-index "^1.9.1"
-    sockjs "^0.3.21"
+    sockjs "^0.3.24"
     spdy "^4.0.2"
-    strip-ansi "^7.0.0"
     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==
+  dependencies:
+    "@types/bonjour" "^3.5.9"
+    "@types/connect-history-api-fallback" "^1.3.5"
+    "@types/express" "^4.17.13"
+    "@types/serve-index" "^1.9.1"
+    "@types/serve-static" "^1.13.10"
+    "@types/sockjs" "^0.3.33"
+    "@types/ws" "^8.5.1"
+    ansi-html-community "^0.0.8"
+    bonjour-service "^1.0.11"
+    chokidar "^3.5.3"
+    colorette "^2.0.10"
+    compression "^1.7.4"
+    connect-history-api-fallback "^2.0.0"
+    default-gateway "^6.0.3"
+    express "^4.17.3"
+    graceful-fs "^4.2.6"
+    html-entities "^2.3.2"
+    http-proxy-middleware "^2.0.3"
+    ipaddr.js "^2.0.1"
+    launch-editor "^2.6.0"
+    open "^8.0.9"
+    p-retry "^4.5.0"
+    rimraf "^3.0.2"
+    schema-utils "^4.0.0"
+    selfsigned "^2.1.1"
+    serve-index "^1.9.1"
+    sockjs "^0.3.24"
+    spdy "^4.0.2"
+    webpack-dev-middleware "^5.3.1"
+    ws "^8.13.0"
+
 webpack-merge@5.8.0, webpack-merge@^5.7.3:
   version "5.8.0"
-  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+  resolved "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.8.0.tgz"
   integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
   dependencies:
     clone-deep "^4.0.1"
@@ -13338,7 +11992,7 @@ webpack-merge@5.8.0, webpack-merge@^5.7.3:
 
 webpack-sources@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz"
   integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
   dependencies:
     source-list-map "^2.0.0"
@@ -13346,79 +12000,49 @@ webpack-sources@^1.4.3:
 
 webpack-sources@^3.0.0, webpack-sources@^3.2.3:
   version "3.2.3"
-  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  resolved "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz"
   integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
 
 webpack-subresource-integrity@5.1.0:
   version "5.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz#8b7606b033c6ccac14e684267cb7fb1f5c2a132a"
+  resolved "https://registry.npmjs.org/webpack-subresource-integrity/-/webpack-subresource-integrity-5.1.0.tgz"
   integrity sha512-sacXoX+xd8r4WKsy9MvH/q/vBtEHr86cpImXwyg74pFIpERKt6FmB8cXpeuh0ZLgclOlHI4Wcll7+R5L02xk9Q==
   dependencies:
     typed-assert "^1.0.8"
 
-webpack@5.67.0:
-  version "5.67.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.67.0.tgz#cb43ca2aad5f7cc81c4cd36b626e6b819805dbfd"
-  integrity sha512-LjFbfMh89xBDpUMgA1W9Ur6Rn/gnr2Cq1jjHFPo4v6a79/ypznSYbAyPgGhwsxBtMIaEmDD1oJoA7BEYw/Fbrw==
-  dependencies:
-    "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.50"
-    "@webassemblyjs/ast" "1.11.1"
-    "@webassemblyjs/wasm-edit" "1.11.1"
-    "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
-    acorn-import-assertions "^1.7.6"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.8.3"
-    es-module-lexer "^0.9.0"
-    eslint-scope "5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.9"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.1.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
-    webpack-sources "^3.2.3"
-
-webpack@^5.69.1:
-  version "5.70.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.70.0.tgz#3461e6287a72b5e6e2f4872700bc8de0d7500e6d"
-  integrity sha512-ZMWWy8CeuTTjCxbeaQI21xSswseF2oNOwc70QSKNePvmxE7XW36i7vpBMYZFAUHPwQiEbNGCEYIOOlyRbdGmxw==
+webpack@5.76.1:
+  version "5.76.1"
+  resolved "https://registry.npmjs.org/webpack/-/webpack-5.76.1.tgz"
+  integrity sha512-4+YIK4Abzv8172/SGqObnUjaIHjLEuUasz9EwQj/9xmPPkYJy2Mh03Q/lJfSD3YLzbxy5FeTq5Uw0323Oh6SJQ==
   dependencies:
     "@types/eslint-scope" "^3.7.3"
     "@types/estree" "^0.0.51"
     "@webassemblyjs/ast" "1.11.1"
     "@webassemblyjs/wasm-edit" "1.11.1"
     "@webassemblyjs/wasm-parser" "1.11.1"
-    acorn "^8.4.1"
+    acorn "^8.7.1"
     acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.9.2"
+    enhanced-resolve "^5.10.0"
     es-module-lexer "^0.9.0"
     eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.9"
-    json-parse-better-errors "^1.0.2"
+    json-parse-even-better-errors "^2.3.1"
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
     schema-utils "^3.1.0"
     tapable "^2.1.1"
     terser-webpack-plugin "^5.1.3"
-    watchpack "^2.3.1"
+    watchpack "^2.4.0"
     webpack-sources "^3.2.3"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
-  resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz#89ad5295bbf64b480abcba31e4953aca706f5760"
+  resolved "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz"
   integrity sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==
   dependencies:
     http-parser-js ">=0.5.1"
@@ -13427,52 +12051,52 @@ websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
 
 websocket-extensions@>=0.1.1:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42"
+  resolved "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz"
   integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==
 
 whatwg-encoding@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz#5abacf777c32166a51d085d6b4f3e7d27113ddb0"
+  resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz"
   integrity sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==
   dependencies:
     iconv-lite "0.4.24"
 
 whatwg-encoding@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz#e7635f597fd87020858626805a2729fa7698ac53"
+  resolved "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz"
   integrity sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==
   dependencies:
     iconv-lite "0.6.3"
 
 whatwg-mimetype@^2.3.0:
   version "2.3.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf"
+  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz"
   integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==
 
 whatwg-mimetype@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz#5fa1a7623867ff1af6ca3dc72ad6b8a4208beba7"
+  resolved "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz"
   integrity sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==
 
-whatwg-url@^10.0.0:
-  version "10.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-10.0.0.tgz#37264f720b575b4a311bd4094ed8c760caaa05da"
-  integrity sha512-CLxxCmdUby142H5FZzn4D8ikO1cmypvXVQktsgosNy4a4BHrDHeciBBGZhb0bNoR5/MltoCatso+vFjjGx8t0w==
+whatwg-url@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz"
+  integrity sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==
   dependencies:
     tr46 "^3.0.0"
     webidl-conversions "^7.0.0"
 
 whatwg-url@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"
-  integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0=
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz"
+  integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==
   dependencies:
     tr46 "~0.0.3"
     webidl-conversions "^3.0.0"
 
 whatwg-url@^8.0.0, whatwg-url@^8.5.0:
   version "8.7.0"
-  resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.7.0.tgz#656a78e510ff8f3937bc0bcbe9f5c0ac35941b77"
+  resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz"
   integrity sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==
   dependencies:
     lodash "^4.7.0"
@@ -13481,7 +12105,7 @@ whatwg-url@^8.0.0, whatwg-url@^8.5.0:
 
 which-boxed-primitive@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  resolved "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz"
   integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
   dependencies:
     is-bigint "^1.0.1"
@@ -13490,57 +12114,74 @@ which-boxed-primitive@^1.0.2:
     is-string "^1.0.5"
     is-symbol "^1.0.3"
 
-which-module@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
-  integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
+which-collection@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz"
+  integrity sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==
+  dependencies:
+    is-map "^2.0.1"
+    is-set "^2.0.1"
+    is-weakmap "^2.0.1"
+    is-weakset "^2.0.1"
+
+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"
+  integrity sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==
+  dependencies:
+    available-typed-arrays "^1.0.5"
+    call-bind "^1.0.2"
+    for-each "^0.3.3"
+    gopd "^1.0.1"
+    has-tostringtag "^1.0.0"
+    is-typed-array "^1.1.10"
 
 which@^1.2.1:
   version "1.3.1"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 which@^2.0.1, which@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
+which@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.npmjs.org/which/-/which-3.0.0.tgz"
+  integrity sha512-nla//68K9NU6yRiwDY/Q8aU6siKlSs64aEC7+IV56QoAuyQT2ovsJcgGYGyqMOmI/CGN1BOR6mM5EN0FBO+zyQ==
+  dependencies:
+    isexe "^2.0.0"
+
 wicked-good-xpath@1.3.0:
   version "1.3.0"
-  resolved "https://registry.yarnpkg.com/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz#81b0e95e8650e49c94b22298fff8686b5553cf6c"
+  resolved "https://registry.npmjs.org/wicked-good-xpath/-/wicked-good-xpath-1.3.0.tgz"
   integrity sha512-Gd9+TUn5nXdwj/hFsPVx5cuHHiF5Bwuc30jZ4+ronF1qHK5O7HD0sgmXWSEgwKquT3ClLoKPVbO6qGwVwLzvAw==
 
 wide-align@^1.1.5:
   version "1.1.5"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  resolved "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz"
   integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
     string-width "^1.0.2 || 2 || 3 || 4"
 
-widest-line@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/widest-line/-/widest-line-3.1.0.tgz#8292333bbf66cb45ff0de1603b136b7ae1496eca"
-  integrity sha512-NsmoXalsWVDMGupxZ5R08ka9flZjjiLvHVAWYOKtiKM8ujtZWr9cRffak+uSE48+Ob8ObalXpwyeUiyDD6QFgg==
-  dependencies:
-    string-width "^4.0.0"
-
 wildcard@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
+  resolved "https://registry.npmjs.org/wildcard/-/wildcard-2.0.0.tgz"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
 word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  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"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-6.2.0.tgz#e9393ba07102e6c91a3b221478f0257cd2856e53"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz"
   integrity sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==
   dependencies:
     ansi-styles "^4.0.0"
@@ -13549,7 +12190,7 @@ wrap-ansi@^6.2.0:
 
 wrap-ansi@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
     ansi-styles "^4.0.0"
@@ -13558,57 +12199,37 @@ wrap-ansi@^7.0.0:
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
-
-write-file-atomic@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-3.0.3.tgz#56bd5c5a5c70481cd19c571bd39ab965a5de56e8"
-  integrity sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==
-  dependencies:
-    imurmurhash "^0.1.4"
-    is-typedarray "^1.0.0"
-    signal-exit "^3.0.2"
-    typedarray-to-buffer "^3.1.5"
+  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.7"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.7.tgz#9e0ac77ee50af70d58326ecff7e85eb3fa375e67"
-  integrity sha512-KMvVuFzpKBuiIXW3E4u3mySRO2/mCHSyZDJQM5NQ9Q9KHWHWh0NHgfbRMLLrceUK5qAL4ytALJbpRMjixFZh8A==
+  version "7.5.9"
+  resolved "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz"
+  integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==
 
-ws@^8.1.0, ws@^8.2.3, ws@^8.4.2:
-  version "8.5.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.5.0.tgz#bfb4be96600757fe5382de12c670dab984a1ed4f"
-  integrity sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==
+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@~7.4.2:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
-  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
-
-ws@~8.2.3:
-  version "8.2.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.2.3.tgz#63a56456db1b04367d0b721a0b80cae6d8becbba"
-  integrity sha512-wBuoj1BDpC6ZQ1B7DWQBYVLphPWkm8i9Y0/3YdHjHKHiohOJ1ws+3OccDWtH+PoC9DZD5WOTrJvNbWvjS6JWaA==
-
-xdg-basedir@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
-  integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
+ws@~8.11.0:
+  version "8.11.0"
+  resolved "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
 
 xhr2@^0.2.0:
   version "0.2.1"
-  resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.2.1.tgz#4e73adc4f9cfec9cbd2157f73efdce3a5f108a93"
+  resolved "https://registry.npmjs.org/xhr2/-/xhr2-0.2.1.tgz"
   integrity sha512-sID0rrVCqkVNUn8t6xuv9+6FViXjUVXq8H5rWOH2rz9fDNQEd4g0EA2XlcEdJXRz5BMEn4O1pJFdT+z4YHhoWw==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
+  resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz"
   integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==
 
 xml-name-validator@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz#79a006e2e63149a8600f15430f0a4725d1524835"
+  resolved "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
   integrity sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==
 
 xml2js@^0.4.17:
@@ -13626,70 +12247,52 @@ xmlbuilder@~11.0.0:
 
 xmlchars@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
+  resolved "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
 xmldom-sre@0.1.31:
   version "0.1.31"
-  resolved "https://registry.yarnpkg.com/xmldom-sre/-/xmldom-sre-0.1.31.tgz#10860d5bab2c603144597d04bf2c4980e98067f4"
+  resolved "https://registry.npmjs.org/xmldom-sre/-/xmldom-sre-0.1.31.tgz"
   integrity sha512-f9s+fUkX04BxQf+7mMWAp5zk61pciie+fFLC9hX9UVvCeJQfNHRHXpeo5MPcR0EUf57PYLdt+ZO4f3Ipk2oZUw==
 
-xmlhttprequest-ssl@~1.6.2:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6"
-  integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q==
-
-y18n@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
-  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
+xmlhttprequest-ssl@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.0.0.tgz"
+  integrity sha512-QKxVRxiRACQcVuQEYFsI1hhkrMlrXHPegbbd1yn9UHOmRxY+si12nQYzri3vbzt8VdTTRviqcKxcyllFas5z2A==
 
 y18n@^5.0.5:
   version "5.0.8"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  resolved "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz"
   integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^3.0.2:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
 
 yallist@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.10.2, yaml@^1.7.2:
+yaml@^1.10.0:
   version "1.10.2"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  resolved "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz"
   integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
-yargs-parser@20.0.0:
-  version "20.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.0.0.tgz#c65a1daaa977ad63cebdd52159147b789a4e19a9"
-  integrity sha512-8eblPHTL7ZWRkyjIZJjnGf+TijiKJSwA24svzLRVvtgoi/RZiKa9fFQTrlx0OKLnyHSdt/enrdadji6WFfESVA==
-
-yargs-parser@^18.1.2:
-  version "18.1.3"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
-  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^20.2.2:
   version "20.2.9"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz"
   integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs-parser@^21.0.0:
-  version "21.0.1"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-21.0.1.tgz#0267f286c877a4f0f728fceb6f8a3e4cb95c6e35"
-  integrity sha512-9BK1jFpLzJROCI5TzwZL/TU4gqjK5xiHV/RfWLOahrjAko/e4DJkRDZQXfvqAsiZzzYhgAzbgz6lg48jcm4GLg==
+yargs-parser@^21.1.1:
+  version "21.1.1"
+  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz"
+  integrity sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==
 
 yargs@17.1.1:
   version "17.1.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.1.1.tgz#c2a8091564bdb196f7c0a67c1d12e5b85b8067ba"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-17.1.1.tgz"
   integrity sha512-c2k48R0PwKIqKhPMWjeiF6y2xY/gPMUlro0sgxqXpbOIohWiLNXWslsootttv7E1e73QPAMQSg5FeySbVcpsPQ==
   dependencies:
     cliui "^7.0.2"
@@ -13700,26 +12303,22 @@ yargs@17.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^15.3.1, yargs@^15.4.1:
-  version "15.4.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
-  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+yargs@17.7.2:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
+    cliui "^8.0.1"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.2"
+    string-width "^4.2.3"
+    y18n "^5.0.5"
+    yargs-parser "^21.1.1"
 
 yargs@^16.1.1:
   version "16.2.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  resolved "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz"
   integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
   dependencies:
     cliui "^7.0.2"
@@ -13730,45 +12329,53 @@ yargs@^16.1.1:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
-yargs@^17.0.0, yargs@^17.2.1:
-  version "17.3.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.3.1.tgz#da56b28f32e2fd45aefb402ed9c26f42be4c07b9"
-  integrity sha512-WUANQeVgjLbNsEmGk20f+nlHgOqzRFpiGWVaBrYGYIGANIIu3lWjoyi0fNlFmJkvfhCZ6BXINe7/W2O2bV4iaA==
+yargs@^17.0.0:
+  version "17.7.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.7.2.tgz#991df39aca675a192b816e1e0363f9d75d2aa269"
+  integrity sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==
   dependencies:
-    cliui "^7.0.2"
+    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.0.0"
+    yargs-parser "^21.1.1"
+
+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.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
-  integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=
+  resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz"
+  integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==
   dependencies:
     buffer-crc32 "~0.2.3"
     fd-slicer "~1.1.0"
 
-yeast@0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/yeast/-/yeast-0.1.2.tgz#008e06d8094320c372dbc2f8ed76a0ca6c8ac419"
-  integrity sha1-AI4G2AlDIMNy28L47XagymyKxBk=
-
 yn@3.1.1:
   version "3.1.1"
-  resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
+  resolved "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz"
   integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
 
 yocto-queue@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  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.5"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.5.tgz#ab0b449e91fadb5ebb2db189ffe1b7b6048dc8b1"
-  integrity sha512-D1/7VxEuQ7xk6z/kAROe4SUbd9CzxY4zOwVGnGHerd/SgLIVU5f4esDzQUsOCeArn933BZfWMKydH7l7dPEp0g==
+  version "0.11.8"
+  resolved "https://registry.npmjs.org/zone.js/-/zone.js-0.11.8.tgz"
+  integrity sha512-82bctBg2hKcEJ21humWIkXRlLBBmrc3nN7DFh5LGGhcyycO2S7FN8NmdvlcKaGFDNVL4/9kFLmwmInTavdJERA==
   dependencies:
     tslib "^2.3.0"